refactor: re-export more schemas (Task, Pagination, Logging, EmptyResult)

Continue progressive re-export from generated schemas:
- TaskSchema, TaskStatusNotificationParamsSchema
- PaginatedRequestParamsSchema
- GetPromptRequestParamsSchema
- LoggingMessageNotificationParamsSchema
- EmptyResultSchema (with .strict() transform in generate-schemas.ts)

Types.ts reduced from ~1358 to ~1299 lines (~4% further reduction).
Total reduction from original ~2600 lines: ~50%.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

Author: ochafik

scripts/generate-schemas.ts

@@ -97,6 +97,7 @@ const STRICT_SCHEMAS = [
     'JSONRPCNotificationSchema',
     'JSONRPCResultResponseSchema',
     'JSONRPCErrorResponseSchema',
+    'EmptyResultSchema',
 ];
 
 // =============================================================================

src/generated/sdk.schemas.ts

@@ -171,7 +171,7 @@ export const JSONRPCResponseSchema = z.union([JSONRPCResultResponseSchema, JSONR
  *
  * @category Common Types
  */
-export const EmptyResultSchema = ResultSchema;
+export const EmptyResultSchema = ResultSchema.strict();
 
 /* Cancellation */
 /**

src/generated/sdk.schemas.zod.test.ts

@@ -15,11 +15,11 @@ export type ProgressTokenSchemaInferredType = z.infer<typeof generated.ProgressT
 
 export type CursorSchemaInferredType = z.infer<typeof generated.CursorSchema>;
 
-export type RequestParamsSchemaInferredType = z.infer<typeof generated.RequestParamsSchema>;
-
 export type TaskMetadataSchemaInferredType = z.infer<typeof generated.TaskMetadataSchema>;
 
-export type RequestSchemaInferredType = z.infer<typeof generated.RequestSchema>;
+export type RelatedTaskMetadataSchemaInferredType = z.infer<typeof generated.RelatedTaskMetadataSchema>;
+
+export type RequestParamsSchemaInferredType = z.infer<typeof generated.RequestParamsSchema>;
 
 export type NotificationParamsSchemaInferredType = z.infer<typeof generated.NotificationParamsSchema>;
 
@@ -31,7 +31,7 @@ export type ErrorSchemaInferredType = z.infer<typeof generated.ErrorSchema>;
 
 export type RequestIdSchemaInferredType = z.infer<typeof generated.RequestIdSchema>;
 
-export type JSONRPCRequestSchemaInferredType = z.infer<typeof generated.JSONRPCRequestSchema>;
+export type RequestSchemaInferredType = z.infer<typeof generated.RequestSchema>;
 
 export type JSONRPCNotificationSchemaInferredType = z.infer<typeof generated.JSONRPCNotificationSchema>;
 
@@ -133,8 +133,6 @@ export type ToolSchemaInferredType = z.infer<typeof generated.ToolSchema>;
 
 export type TaskStatusSchemaInferredType = z.infer<typeof generated.TaskStatusSchema>;
 
-export type RelatedTaskMetadataSchemaInferredType = z.infer<typeof generated.RelatedTaskMetadataSchema>;
-
 export type TaskSchemaInferredType = z.infer<typeof generated.TaskSchema>;
 
 export type CreateTaskResultSchemaInferredType = z.infer<typeof generated.CreateTaskResultSchema>;
@@ -241,7 +239,7 @@ export type ReadResourceResultSchemaInferredType = z.infer<typeof generated.Read
 
 export type ListToolsResultSchemaInferredType = z.infer<typeof generated.ListToolsResultSchema>;
 
-export type JSONRPCMessageSchemaInferredType = z.infer<typeof generated.JSONRPCMessageSchema>;
+export type JSONRPCRequestSchemaInferredType = z.infer<typeof generated.JSONRPCRequestSchema>;
 
 export type URLElicitationRequiredErrorSchemaInferredType = z.infer<typeof generated.URLElicitationRequiredErrorSchema>;
 
@@ -281,6 +279,8 @@ export type ListResourcesResultSchemaInferredType = z.infer<typeof generated.Lis
 
 export type CallToolResultSchemaInferredType = z.infer<typeof generated.CallToolResultSchema>;
 
+export type JSONRPCMessageSchemaInferredType = z.infer<typeof generated.JSONRPCMessageSchema>;
+
 export type PromptMessageSchemaInferredType = z.infer<typeof generated.PromptMessageSchema>;
 
 export type SamplingMessageContentBlockSchemaInferredType = z.infer<typeof generated.SamplingMessageContentBlockSchema>;
@@ -305,12 +305,12 @@ expectType<spec.ProgressToken>({} as ProgressTokenSchemaInferredType);
 expectType<ProgressTokenSchemaInferredType>({} as spec.ProgressToken);
 expectType<spec.Cursor>({} as CursorSchemaInferredType);
 expectType<CursorSchemaInferredType>({} as spec.Cursor);
-expectType<spec.RequestParams>({} as RequestParamsSchemaInferredType);
-expectType<RequestParamsSchemaInferredType>({} as spec.RequestParams);
 expectType<spec.TaskMetadata>({} as TaskMetadataSchemaInferredType);
 expectType<TaskMetadataSchemaInferredType>({} as spec.TaskMetadata);
-expectType<spec.Request>({} as RequestSchemaInferredType);
-expectType<RequestSchemaInferredType>({} as spec.Request);
+expectType<spec.RelatedTaskMetadata>({} as RelatedTaskMetadataSchemaInferredType);
+expectType<RelatedTaskMetadataSchemaInferredType>({} as spec.RelatedTaskMetadata);
+expectType<spec.RequestParams>({} as RequestParamsSchemaInferredType);
+expectType<RequestParamsSchemaInferredType>({} as spec.RequestParams);
 expectType<spec.NotificationParams>({} as NotificationParamsSchemaInferredType);
 expectType<NotificationParamsSchemaInferredType>({} as spec.NotificationParams);
 expectType<spec.Notification>({} as NotificationSchemaInferredType);
@@ -321,8 +321,8 @@ expectType<spec.Error>({} as ErrorSchemaInferredType);
 expectType<ErrorSchemaInferredType>({} as spec.Error);
 expectType<spec.RequestId>({} as RequestIdSchemaInferredType);
 expectType<RequestIdSchemaInferredType>({} as spec.RequestId);
-expectType<spec.JSONRPCRequest>({} as JSONRPCRequestSchemaInferredType);
-expectType<JSONRPCRequestSchemaInferredType>({} as spec.JSONRPCRequest);
+expectType<spec.Request>({} as RequestSchemaInferredType);
+expectType<RequestSchemaInferredType>({} as spec.Request);
 expectType<spec.JSONRPCNotification>({} as JSONRPCNotificationSchemaInferredType);
 expectType<JSONRPCNotificationSchemaInferredType>({} as spec.JSONRPCNotification);
 expectType<spec.JSONRPCResultResponse>({} as JSONRPCResultResponseSchemaInferredType);
@@ -423,8 +423,6 @@ expectType<spec.Tool>({} as ToolSchemaInferredType);
 expectType<ToolSchemaInferredType>({} as spec.Tool);
 expectType<spec.TaskStatus>({} as TaskStatusSchemaInferredType);
 expectType<TaskStatusSchemaInferredType>({} as spec.TaskStatus);
-expectType<spec.RelatedTaskMetadata>({} as RelatedTaskMetadataSchemaInferredType);
-expectType<RelatedTaskMetadataSchemaInferredType>({} as spec.RelatedTaskMetadata);
 expectType<spec.Task>({} as TaskSchemaInferredType);
 expectType<TaskSchemaInferredType>({} as spec.Task);
 expectType<spec.CreateTaskResult>({} as CreateTaskResultSchemaInferredType);
@@ -531,8 +529,8 @@ expectType<spec.ReadResourceResult>({} as ReadResourceResultSchemaInferredType);
 expectType<ReadResourceResultSchemaInferredType>({} as spec.ReadResourceResult);
 expectType<spec.ListToolsResult>({} as ListToolsResultSchemaInferredType);
 expectType<ListToolsResultSchemaInferredType>({} as spec.ListToolsResult);
-expectType<spec.JSONRPCMessage>({} as JSONRPCMessageSchemaInferredType);
-expectType<JSONRPCMessageSchemaInferredType>({} as spec.JSONRPCMessage);
+expectType<spec.JSONRPCRequest>({} as JSONRPCRequestSchemaInferredType);
+expectType<JSONRPCRequestSchemaInferredType>({} as spec.JSONRPCRequest);
 expectType<spec.URLElicitationRequiredError>({} as URLElicitationRequiredErrorSchemaInferredType);
 expectType<URLElicitationRequiredErrorSchemaInferredType>({} as spec.URLElicitationRequiredError);
 expectType<spec.InitializeRequestParams>({} as InitializeRequestParamsSchemaInferredType);
@@ -571,6 +569,8 @@ expectType<spec.ListResourcesResult>({} as ListResourcesResultSchemaInferredType
 expectType<ListResourcesResultSchemaInferredType>({} as spec.ListResourcesResult);
 expectType<spec.CallToolResult>({} as CallToolResultSchemaInferredType);
 expectType<CallToolResultSchemaInferredType>({} as spec.CallToolResult);
+expectType<spec.JSONRPCMessage>({} as JSONRPCMessageSchemaInferredType);
+expectType<JSONRPCMessageSchemaInferredType>({} as spec.JSONRPCMessage);
 expectType<spec.PromptMessage>({} as PromptMessageSchemaInferredType);
 expectType<PromptMessageSchemaInferredType>({} as spec.PromptMessage);
 expectType<spec.SamplingMessageContentBlock>({} as SamplingMessageContentBlockSchemaInferredType);

src/types.ts

@@ -176,6 +176,15 @@ import {
     ToolResultContentSchema,
     // String schema
     StringSchemaSchema,
+    // Task schemas
+    TaskSchema,
+    TaskStatusNotificationParamsSchema,
+    // Request/Notification params schemas
+    PaginatedRequestParamsSchema,
+    GetPromptRequestParamsSchema,
+    LoggingMessageNotificationParamsSchema,
+    // EmptyResult (with .strict())
+    EmptyResultSchema,
 } from './generated/sdk.schemas.js';
 
 // Alias RequestParamsSchema to BaseRequestParamsSchema for internal use
@@ -308,6 +317,12 @@ export {
     ToolUseContentSchema,
     ToolResultContentSchema,
     StringSchemaSchema,
+    TaskSchema,
+    TaskStatusNotificationParamsSchema,
+    PaginatedRequestParamsSchema,
+    GetPromptRequestParamsSchema,
+    LoggingMessageNotificationParamsSchema,
+    EmptyResultSchema,
 };
 
 export const LATEST_PROTOCOL_VERSION = '2025-11-25';
@@ -405,13 +420,7 @@ export const JSONRPCMessageSchema = z.union([
 ]);
 export const JSONRPCResponseSchema = z.union([JSONRPCResultResponseSchema, JSONRPCErrorResponseSchema]);
 
-/* Empty result */
-/**
- * A response that indicates success but carries no data.
- */
-export const EmptyResultSchema = ResultSchema.strict();
-
-// Note: CancelledNotificationParamsSchema is re-exported from generated.
+// Note: EmptyResultSchema (with .strict()), CancelledNotificationParamsSchema are re-exported from generated.
 
 /* Cancellation */
 /**
@@ -655,51 +664,14 @@ export const ProgressNotificationParamsSchema = z.object({
 });
 // Note: ProgressNotificationSchema is re-exported from generated.
 
-export const PaginatedRequestParamsSchema = BaseRequestParamsSchema.extend({
-    /**
-     * An opaque token representing the current pagination position.
-     * If provided, the server should return results starting after this cursor.
-     */
-    cursor: CursorSchema.optional()
-});
-
 /* Pagination */
-// Note: PaginatedRequestSchema and PaginatedResultSchema are re-exported from generated.
+// Note: PaginatedRequestParamsSchema, PaginatedRequestSchema, PaginatedResultSchema
+// are re-exported from generated.
 
 /* Tasks */
-/**
- * A pollable state object associated with a request.
- */
-export const TaskSchema = z.object({
-    taskId: z.string(),
-    status: TaskStatusSchema,
-    /**
-     * Time in milliseconds to keep task results available after completion.
-     * If null, the task has unlimited lifetime until manually cleaned up.
-     */
-    ttl: z.union([z.number(), z.null()]),
-    /**
-     * ISO 8601 timestamp when the task was created.
-     */
-    createdAt: z.string(),
-    /**
-     * ISO 8601 timestamp when the task was last updated.
-     */
-    lastUpdatedAt: z.string(),
-    pollInterval: z.optional(z.number()),
-    /**
-     * Optional diagnostic message for failed tasks or other status information.
-     */
-    statusMessage: z.optional(z.string())
-});
-
-// Note: CreateTaskResultSchema, TaskStatusNotificationSchema, GetTaskResultSchema,
-// GetTaskPayloadResultSchema, ListTasksResultSchema, CancelTaskResultSchema are re-exported from generated.
-
-/**
- * Parameters for task status notification.
- */
-export const TaskStatusNotificationParamsSchema = NotificationsParamsSchema.merge(TaskSchema);
+// Note: TaskSchema, TaskStatusNotificationParamsSchema, CreateTaskResultSchema,
+// TaskStatusNotificationSchema, GetTaskResultSchema, GetTaskPayloadResultSchema,
+// ListTasksResultSchema, CancelTaskResultSchema are re-exported from generated.
 
 /* Resources */
 // Note: ResourceContentsSchema, TextResourceContentsSchema, BlobResourceContentsSchema
@@ -748,21 +720,7 @@ export const ResourceUpdatedNotificationParamsSchema = NotificationsParamsSchema
 // Note: PromptArgumentSchema, PromptSchema, ListPromptsRequestSchema, GetPromptRequestSchema
 // are re-exported from generated.
 
-// Note: ListPromptsResultSchema is re-exported from generated.
-
-/**
- * Parameters for a `prompts/get` request.
- */
-export const GetPromptRequestParamsSchema = BaseRequestParamsSchema.extend({
-    /**
-     * The name of the prompt or prompt template.
-     */
-    name: z.string(),
-    /**
-     * Arguments to use for templating the prompt.
-     */
-    arguments: z.record(z.string(), z.string()).optional()
-});
+// Note: ListPromptsResultSchema, GetPromptRequestParamsSchema are re-exported from generated.
 
 // Note: TextContentSchema, ImageContentSchema, AudioContentSchema are re-exported
 // from generated with Base64 validation for data fields.
@@ -874,25 +832,8 @@ export const SetLevelRequestParamsSchema = BaseRequestParamsSchema.extend({
      */
     level: LoggingLevelSchema
 });
-// Note: SetLevelRequestSchema, LoggingMessageNotificationSchema are re-exported from generated.
-
-/**
- * Parameters for a `notifications/message` notification.
- */
-export const LoggingMessageNotificationParamsSchema = NotificationsParamsSchema.extend({
-    /**
-     * The severity of this log message.
-     */
-    level: LoggingLevelSchema,
-    /**
-     * An optional name of the logger issuing this message.
-     */
-    logger: z.string().optional(),
-    /**
-     * The data to be logged, such as a string message or an object. Any JSON serializable type is allowed here.
-     */
-    data: z.unknown()
-});
+// Note: SetLevelRequestSchema, LoggingMessageNotificationSchema, LoggingMessageNotificationParamsSchema
+// are re-exported from generated.
 
 /* Sampling */
 // Note: ToolResultContentSchema is re-exported from generated.