clean up

Author: KKonstantinov

src/client/index.test.ts

@@ -822,7 +822,6 @@ describe('outputSchema validation', () => {
         server.setRequestHandler(CallToolRequestSchema, async request => {
             if (request.params.name === 'test-tool') {
                 return {
-                    content: [],
                     structuredContent: { result: 'success', count: 42 }
                 };
             }

src/client/index.ts

@@ -37,8 +37,7 @@ import {
     ElicitRequestSchema,
     type RequestGeneric,
     type NotificationGeneric,
-    type ResultGeneric,
-    Result
+    type Result
 } from '../types.js';
 import { AjvJsonSchemaValidator } from '../validation/ajv-provider.js';
 import type { JsonSchemaType, JsonSchemaValidator, jsonSchemaValidator } from '../validation/types.js';
@@ -151,7 +150,7 @@ export type ClientOptions = ProtocolOptions & {
 export class Client<
     RequestT extends RequestGeneric = RequestGeneric,
     NotificationT extends NotificationGeneric = NotificationGeneric,
-    ResultT extends ResultGeneric = Result
+    ResultT extends Result = Result
 > extends Protocol<ClientRequest | RequestT, ClientNotification | NotificationT, ClientResult | ResultT> {
     private _serverCapabilities?: ServerCapabilities;
     private _serverVersion?: Implementation;

src/server/index.ts

@@ -29,8 +29,7 @@ import {
     SUPPORTED_PROTOCOL_VERSIONS,
     type RequestGeneric,
     type NotificationGeneric,
-    type ResultGeneric,
-    Result
+    type Result
 } from '../types.js';
 import { AjvJsonSchemaValidator } from '../validation/ajv-provider.js';
 import type { JsonSchemaType, jsonSchemaValidator } from '../validation/types.js';
@@ -107,7 +106,7 @@ export type ServerOptions = ProtocolOptions & {
 export class Server<
     RequestT extends RequestGeneric = RequestGeneric,
     NotificationT extends NotificationGeneric = NotificationGeneric,
-    ResultT extends ResultGeneric = Result
+    ResultT extends Result = Result
 > extends Protocol<ServerRequest | RequestT, ServerNotification | NotificationT, ServerResult | ResultT> {
     private _clientCapabilities?: ClientCapabilities;
     private _clientVersion?: Implementation;

src/shared/protocol.ts

@@ -25,7 +25,7 @@ import {
     RequestInfo,
     type RequestGeneric,
     type NotificationGeneric,
-    type ResultGeneric
+    type Result
 } from '../types.js';
 import { Transport, TransportSendOptions } from './transport.js';
 import { AuthInfo } from '../server/auth/types.js';
@@ -176,7 +176,7 @@ type TimeoutInfo = {
 export abstract class Protocol<
     SendRequestT extends RequestGeneric,
     SendNotificationT extends NotificationGeneric,
-    SendResultT extends ResultGeneric
+    SendResultT extends Result
 > {
     private _transport?: Transport;
     private _requestMessageId = 0;

src/types.ts

@@ -95,14 +95,6 @@ export const ResultSchema = z
     })
     .catchall(z.unknown());
 
-/**
- * Generic result schema that allows any additional fields to be added to the result.
- *
- * Used in {@link JSONRPCResponseSchema} for generic shape matching.
- */
-export const ResultSchemaGeneric = z.intersection(ResultSchema, z.record(z.string(), z.unknown()).optional());
-
-export type ResultGeneric = ExpandRecursively<z.infer<typeof ResultSchemaGeneric>>;
 /**
  * A uniquely identifying ID for a request in JSON-RPC.
  */
@@ -140,7 +132,7 @@ export const JSONRPCResponseSchema = z
     .object({
         jsonrpc: z.literal(JSONRPC_VERSION),
         id: RequestIdSchema,
-        result: ResultSchemaGeneric
+        result: ResultSchema
     })
     .strict();