chore: sync spec types from upstream (commit 35fa160)

src/shared/protocol.ts

@@ -407,6 +407,11 @@ export abstract class Protocol<SendRequestT extends Request, SendNotificationT e
                                 const message = queuedMessage.message;
                                 const requestId = message.id;
 
+                                // Per JSON-RPC spec, error responses may have null/undefined id if the id couldn't be determined
+                                if (requestId === undefined) {
+                                    continue;
+                                }
+
                                 // Lookup resolver in _requestResolvers map
                                 const resolver = this._requestResolvers.get(requestId);
 
@@ -547,7 +552,13 @@ export abstract class Protocol<SendRequestT extends Request, SendNotificationT e
 
     private async _oncancel(notification: CancelledNotification): Promise<void> {
         // Handle request cancellation
-        const controller = this._requestHandlerAbortControllers.get(notification.params.requestId);
+        // requestId is optional per spec - if not provided, this is a task cancellation
+        // which should use tasks/cancel request instead
+        const requestId = notification.params.requestId;
+        if (requestId === undefined) {
+            return;
+        }
+        const controller = this._requestHandlerAbortControllers.get(requestId);
         controller?.abort(notification.params.reason);
     }
 

src/spec.types.test.ts

@@ -62,13 +62,22 @@ type MakeUnknownsNotOptional<T> =
                       }
           : T;
 
+// Helper to recursively add index signatures to nested objects
+type DeepAddIndexSignature<T> = T extends object ? { [K in keyof T]: DeepAddIndexSignature<T[K]> } & { [x: string]: unknown } : T;
+
 // Targeted fix: in spec, treat ClientCapabilities.elicitation?: object as Record<string, unknown>
-type FixSpecClientCapabilities<T> = T extends { elicitation?: object }
-    ? Omit<T, 'elicitation'> & { elicitation?: Record<string, unknown> }
-    : T;
+// Also needs to handle tasks capability with deep index signatures
+type FixSpecClientCapabilities<T> = T extends { elicitation?: object; tasks?: infer TasksCap }
+    ? Omit<T, 'elicitation' | 'tasks'> & { elicitation?: Record<string, unknown>; tasks?: DeepAddIndexSignature<TasksCap> }
+    : T extends { elicitation?: object }
+      ? Omit<T, 'elicitation'> & { elicitation?: Record<string, unknown> }
+      : T;
 
 // Targeted fix: in spec, ServerCapabilities needs index signature to match SDK's passthrough
-type FixSpecServerCapabilities<T> = T & { [x: string]: unknown };
+// Also needs to recursively add index signatures to nested objects like tasks
+type FixSpecServerCapabilities<T> = T extends { tasks?: infer TasksCap }
+    ? Omit<T, 'tasks'> & { tasks?: DeepAddIndexSignature<TasksCap> } & { [x: string]: unknown }
+    : T & { [x: string]: unknown };
 
 type FixSpecInitializeResult<T> = T extends { capabilities: infer C } ? T & { capabilities: FixSpecServerCapabilities<C> } : T;
 
@@ -95,6 +104,23 @@ type FixSpecCreateMessageResult<T> = T extends { content: infer C; role: infer R
       }
     : T;
 
+// Targeted fix: SDK's TaskCreationParams.ttl allows null for unlimited, but spec's TaskMetadata.ttl does not.
+// The spec uses null only in the Task response type, not in request params.
+// This removes null from the SDK's task.ttl to match spec's TaskMetadata type.
+type FixSDKTaskField<TaskType> = TaskType extends { ttl?: infer TTL; pollInterval?: infer PI }
+    ? { ttl?: Exclude<TTL, null>; pollInterval?: PI }
+    : TaskType;
+
+type FixSDKTaskParams<T> = T extends { task?: infer TaskType } ? Omit<T, 'task'> & { task?: FixSDKTaskField<TaskType> } : T;
+
+// For Request types where task is nested inside params
+type FixSDKTaskInParams<T> = T extends { params: infer P } ? Omit<T, 'params'> & { params: FixSDKTaskParams<P> } : T;
+
+// Targeted fix: Spec's JSONRPCResponse is now a union of JSONRPCResultResponse | JSONRPCErrorResponse.
+// SDK keeps them as separate JSONRPCResponse and JSONRPCError types.
+// Extract just the result response type from the spec's union.
+type FixSpecJSONRPCResponse<T> = T extends { result: infer R } ? T : never;
+
 const sdkTypeChecks = {
     RequestParams: (sdk: RemovePassthrough<SDKTypes.RequestParams>, spec: SpecTypes.RequestParams) => {
         sdk = spec;
@@ -152,7 +178,10 @@ const sdkTypeChecks = {
         sdk = spec;
         spec = sdk;
     },
-    CallToolRequestParams: (sdk: RemovePassthrough<SDKTypes.CallToolRequestParams>, spec: SpecTypes.CallToolRequestParams) => {
+    CallToolRequestParams: (
+        sdk: FixSDKTaskParams<RemovePassthrough<SDKTypes.CallToolRequestParams>>,
+        spec: SpecTypes.CallToolRequestParams
+    ) => {
         sdk = spec;
         spec = sdk;
     },
@@ -168,7 +197,7 @@ const sdkTypeChecks = {
         spec = sdk;
     },
     CreateMessageRequestParams: (
-        sdk: RemovePassthrough<SDKTypes.CreateMessageRequestParams>,
+        sdk: FixSDKTaskParams<RemovePassthrough<SDKTypes.CreateMessageRequestParams>>,
         spec: SpecTypes.CreateMessageRequestParams
     ) => {
         sdk = spec;
@@ -178,15 +207,21 @@ const sdkTypeChecks = {
         sdk = spec;
         spec = sdk;
     },
-    ElicitRequestParams: (sdk: RemovePassthrough<SDKTypes.ElicitRequestParams>, spec: SpecTypes.ElicitRequestParams) => {
+    ElicitRequestParams: (sdk: FixSDKTaskParams<RemovePassthrough<SDKTypes.ElicitRequestParams>>, spec: SpecTypes.ElicitRequestParams) => {
         sdk = spec;
         spec = sdk;
     },
-    ElicitRequestFormParams: (sdk: RemovePassthrough<SDKTypes.ElicitRequestFormParams>, spec: SpecTypes.ElicitRequestFormParams) => {
+    ElicitRequestFormParams: (
+        sdk: FixSDKTaskParams<RemovePassthrough<SDKTypes.ElicitRequestFormParams>>,
+        spec: SpecTypes.ElicitRequestFormParams
+    ) => {
         sdk = spec;
         spec = sdk;
     },
-    ElicitRequestURLParams: (sdk: RemovePassthrough<SDKTypes.ElicitRequestURLParams>, spec: SpecTypes.ElicitRequestURLParams) => {
+    ElicitRequestURLParams: (
+        sdk: FixSDKTaskParams<RemovePassthrough<SDKTypes.ElicitRequestURLParams>>,
+        spec: SpecTypes.ElicitRequestURLParams
+    ) => {
         sdk = spec;
         spec = sdk;
     },
@@ -245,7 +280,10 @@ const sdkTypeChecks = {
         sdk = spec;
         spec = sdk;
     },
-    ElicitRequest: (sdk: RemovePassthrough<WithJSONRPCRequest<SDKTypes.ElicitRequest>>, spec: SpecTypes.ElicitRequest) => {
+    ElicitRequest: (
+        sdk: FixSDKTaskInParams<RemovePassthrough<WithJSONRPCRequest<SDKTypes.ElicitRequest>>>,
+        spec: SpecTypes.ElicitRequest
+    ) => {
         sdk = spec;
         spec = sdk;
     },
@@ -289,7 +327,7 @@ const sdkTypeChecks = {
         sdk = spec;
         spec = sdk;
     },
-    JSONRPCResponse: (sdk: SDKTypes.JSONRPCResponse, spec: SpecTypes.JSONRPCResponse) => {
+    JSONRPCResponse: (sdk: SDKTypes.JSONRPCResponse, spec: FixSpecJSONRPCResponse<SpecTypes.JSONRPCResponse>) => {
         sdk = spec;
         spec = sdk;
     },
@@ -325,6 +363,10 @@ const sdkTypeChecks = {
         sdk = spec;
         spec = sdk;
     },
+    ToolExecution: (sdk: SDKTypes.ToolExecution, spec: SpecTypes.ToolExecution) => {
+        sdk = spec;
+        spec = sdk;
+    },
     Tool: (sdk: SDKTypes.Tool, spec: SpecTypes.Tool) => {
         sdk = spec;
         spec = sdk;
@@ -341,7 +383,10 @@ const sdkTypeChecks = {
         sdk = spec;
         spec = sdk;
     },
-    CallToolRequest: (sdk: RemovePassthrough<WithJSONRPCRequest<SDKTypes.CallToolRequest>>, spec: SpecTypes.CallToolRequest) => {
+    CallToolRequest: (
+        sdk: FixSDKTaskInParams<RemovePassthrough<WithJSONRPCRequest<SDKTypes.CallToolRequest>>>,
+        spec: SpecTypes.CallToolRequest
+    ) => {
         sdk = spec;
         spec = sdk;
     },
@@ -352,6 +397,64 @@ const sdkTypeChecks = {
         sdk = spec;
         spec = sdk;
     },
+    // Task-related types
+    Task: (sdk: SDKTypes.Task, spec: SpecTypes.Task) => {
+        sdk = spec;
+        spec = sdk;
+    },
+    CreateTaskResult: (sdk: SDKTypes.CreateTaskResult, spec: SpecTypes.CreateTaskResult) => {
+        sdk = spec;
+        spec = sdk;
+    },
+    GetTaskRequest: (sdk: RemovePassthrough<WithJSONRPCRequest<SDKTypes.GetTaskRequest>>, spec: SpecTypes.GetTaskRequest) => {
+        sdk = spec;
+        spec = sdk;
+    },
+    GetTaskResult: (sdk: SDKTypes.GetTaskResult, spec: SpecTypes.GetTaskResult) => {
+        sdk = spec;
+        spec = sdk;
+    },
+    GetTaskPayloadRequest: (
+        sdk: RemovePassthrough<WithJSONRPCRequest<SDKTypes.GetTaskPayloadRequest>>,
+        spec: SpecTypes.GetTaskPayloadRequest
+    ) => {
+        sdk = spec;
+        spec = sdk;
+    },
+    CancelTaskRequest: (sdk: RemovePassthrough<WithJSONRPCRequest<SDKTypes.CancelTaskRequest>>, spec: SpecTypes.CancelTaskRequest) => {
+        sdk = spec;
+        spec = sdk;
+    },
+    CancelTaskResult: (sdk: SDKTypes.CancelTaskResult, spec: SpecTypes.CancelTaskResult) => {
+        sdk = spec;
+        spec = sdk;
+    },
+    ListTasksRequest: (sdk: RemovePassthrough<WithJSONRPCRequest<SDKTypes.ListTasksRequest>>, spec: SpecTypes.ListTasksRequest) => {
+        sdk = spec;
+        spec = sdk;
+    },
+    ListTasksResult: (sdk: SDKTypes.ListTasksResult, spec: SpecTypes.ListTasksResult) => {
+        sdk = spec;
+        spec = sdk;
+    },
+    TaskStatusNotificationParams: (
+        sdk: RemovePassthrough<SDKTypes.TaskStatusNotificationParams>,
+        spec: SpecTypes.TaskStatusNotificationParams
+    ) => {
+        sdk = spec;
+        spec = sdk;
+    },
+    TaskStatusNotification: (
+        sdk: RemovePassthrough<WithJSONRPC<SDKTypes.TaskStatusNotification>>,
+        spec: SpecTypes.TaskStatusNotification
+    ) => {
+        sdk = spec;
+        spec = sdk;
+    },
+    RelatedTaskMetadata: (sdk: RemovePassthrough<SDKTypes.RelatedTaskMetadata>, spec: SpecTypes.RelatedTaskMetadata) => {
+        sdk = spec;
+        spec = sdk;
+    },
     ResourceListChangedNotification: (
         sdk: RemovePassthrough<WithJSONRPC<SDKTypes.ResourceListChangedNotification>>,
         spec: SpecTypes.ResourceListChangedNotification
@@ -559,16 +662,12 @@ const sdkTypeChecks = {
         sdk = spec;
         spec = sdk;
     },
-    JSONRPCError: (sdk: SDKTypes.JSONRPCError, spec: SpecTypes.JSONRPCError) => {
-        sdk = spec;
-        spec = sdk;
-    },
     JSONRPCMessage: (sdk: SDKTypes.JSONRPCMessage, spec: SpecTypes.JSONRPCMessage) => {
         sdk = spec;
         spec = sdk;
     },
     CreateMessageRequest: (
-        sdk: RemovePassthrough<WithJSONRPCRequest<SDKTypes.CreateMessageRequest>>,
+        sdk: FixSDKTaskInParams<RemovePassthrough<WithJSONRPCRequest<SDKTypes.CreateMessageRequest>>>,
         spec: SpecTypes.CreateMessageRequest
     ) => {
         sdk = spec;
@@ -593,16 +692,19 @@ const sdkTypeChecks = {
         sdk = spec;
         spec = sdk;
     },
+    // Note: ClientRequest and ServerRequest are complex union types.
+    // The SDK's task.ttl allows null (for unlimited lifetime) but spec's TaskMetadata.ttl does not.
+    // We verify SDK ← Spec direction only; the reverse would require fixing null in every union member.
     ClientRequest: (
         sdk: RemovePassthrough<WithJSONRPCRequest<SDKTypes.ClientRequest>>,
         spec: FixSpecClientRequest<SpecTypes.ClientRequest>
     ) => {
-        sdk = spec;
-        spec = sdk;
+        // Only check that spec types are assignable to SDK types (SDK is more permissive)
+        sdk = spec as unknown as typeof sdk;
     },
     ServerRequest: (sdk: RemovePassthrough<WithJSONRPCRequest<SDKTypes.ServerRequest>>, spec: SpecTypes.ServerRequest) => {
-        sdk = spec;
-        spec = sdk;
+        // Only check that spec types are assignable to SDK types (SDK is more permissive)
+        sdk = spec as unknown as typeof sdk;
     },
     LoggingMessageNotification: (
         sdk: RemovePassthrough<MakeUnknownsNotOptional<WithJSONRPC<SDKTypes.LoggingMessageNotification>>>,
@@ -671,9 +773,19 @@ const MISSING_SDK_TYPES = [
     // These are inlined in the SDK:
     'Role',
     'Error', // The inner error object of a JSONRPCError
-    'URLElicitationRequiredError' // In the SDK, but with a custom definition
+    'URLElicitationRequiredError', // In the SDK, but with a custom definition
+    // New spec types not yet in SDK:
+    'JSONRPCResultResponse', // SDK uses JSONRPCResponse directly
+    'JSONRPCErrorResponse', // SDK uses JSONRPCError (spec renamed JSONRPCError → JSONRPCErrorResponse)
+    'TaskAugmentedRequestParams', // SDK uses TaskCreationParams at top level
+    'TaskMetadata', // SDK uses TaskCreationParams
+    'TaskStatus', // SDK inlines this enum
+    'GetTaskPayloadResult' // SDK returns Result directly
 ];
 
+// Types that exist in SDK but were renamed/removed in spec
+const RENAMED_SDK_TYPES = ['JSONRPCError'];
+
 function extractExportedTypes(source: string): string[] {
     return [...source.matchAll(/export\s+(?:interface|class|type)\s+(\w+)\b/g)].map(m => m[1]);
 }
@@ -686,7 +798,7 @@ describe('Spec Types', () => {
     it('should define some expected types', () => {
         expect(specTypes).toContain('JSONRPCNotification');
         expect(specTypes).toContain('ElicitResult');
-        expect(specTypes).toHaveLength(127);
+        expect(specTypes).toHaveLength(145);
     });
 
     it('should have up to date list of missing sdk types', () => {