open-multi-agent-kit 0.98.5 → 1.0.0

package/dist/core/mcp/client.d.ts

@@ -14,10 +14,23 @@
 import { type StdioTransportOptions } from "./stdio-transport.ts";
 /** Protocol revision this client implements. */
 export declare const MCP_PROTOCOL_VERSION = "2025-06-18";
+/**
+ * Protocol revisions this client accepts from a server. The handshake fails
+ * closed on any other value instead of guessing at forward compatibility.
+ */
+export declare const SUPPORTED_PROTOCOL_VERSIONS: readonly string[];
 /** Default per-request deadline. */
 export declare const DEFAULT_REQUEST_TIMEOUT_MS = 30000;
 /** Default handshake deadline. Servers that install on first run need more room than a normal call. */
 export declare const DEFAULT_HANDSHAKE_TIMEOUT_MS = 60000;
+/** Page ceiling for `tools/list` so a looping cursor cannot stall a session forever. */
+export declare const MAX_LIST_PAGES = 128;
+/** Tool ceiling across all `tools/list` pages for one server. */
+export declare const MAX_LIST_TOOLS = 4096;
+/** Overall `tools/list` deadline; per-request timeouts do not bound the total. */
+export declare const LIST_TOOLS_TIMEOUT_MS = 120000;
+/** In-flight request ceiling per server. */
+export declare const MAX_PENDING_REQUESTS = 128;
 export interface McpToolSchema {
     readonly name: string;
     readonly description?: string;
@@ -28,12 +41,11 @@ export interface McpTextBlock {
     readonly type: "text";
     readonly text: string;
 }
-export interface McpImageBlock {
+export type McpContentBlock = McpTextBlock | {
     readonly type: "image";
     readonly data: string;
     readonly mimeType: string;
-}
-export type McpContentBlock = McpTextBlock | McpImageBlock | {
+} | {
     readonly type: string;
     readonly [key: string]: unknown;
 };
@@ -68,26 +80,33 @@ export declare class McpClient {
     private closed;
     private exitReason;
     private info;
+    private lastProtocolErrorReason;
     private readonly options;
     constructor(options: McpClientOptions);
     get name(): string;
     get serverInfo(): McpServerInfo;
     get ready(): boolean;
-    /** Why the server is unusable, when it is. */
-    get failure(): string | undefined;
     /**
      * Spawn the server and complete the MCP handshake. Safe to await once; a
      * second call after a failure re-throws the recorded reason rather than
      * silently reusing a dead process.
      */
     connect(): Promise<void>;
+    private assertInitializeResult;
     /**
      * Protocol-level liveness probe. Rejects when the server is closed, dead,
      * or fails to answer within `timeoutMs`, so callers can tell a silently
      * killed process apart from a genuinely connected one.
      */
     ping(timeoutMs?: number): Promise<void>;
-    /** List the server's tools. Requires a completed handshake. */
+    /**
+     * List the server's tools. Requires a completed handshake.
+     *
+     * Pagination is bounded three ways — an overall deadline, a page count, and
+     * a tool count — and a repeated cursor is a protocol error, so a misbehaving
+     * server cannot keep the listing loop alive indefinitely. Duplicate tool
+     * names in one listing are rejected instead of silently overwritten.
+     */
     listTools(): Promise<McpToolSchema[]>;
     /**
      * Invoke a tool. A protocol-level failure rejects; a tool-level failure
@@ -97,6 +116,8 @@ export declare class McpClient {
     callTool(name: string, args: unknown, timeoutMs?: number): Promise<McpToolCallResult>;
     /** Terminate the server and reject anything still in flight. */
     close(): void;
+    /** Why the server is unusable, when it is; includes the latest decode failure. */
+    get failure(): string | undefined;
     private assertReady;
     private request;
     private handleMessage;

package/dist/core/mcp/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/core/mcp/client.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AASH,OAAO,EAAqB,KAAK,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAErF,gDAAgD;AAChD,eAAO,MAAM,oBAAoB,eAAe,CAAC;AACjD,oCAAoC;AACpC,eAAO,MAAM,0BAA0B,QAAS,CAAC;AACjD,uGAAuG;AACvG,eAAO,MAAM,4BAA4B,QAAS,CAAC;AAEnD,MAAM,WAAW,aAAa;IAC7B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC/C,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,YAAY;IAC5B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,aAAa;IAC7B,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,MAAM,eAAe,GAAG,YAAY,GAAG,aAAa,GAAG;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CAAE,CAAC;AAExH,MAAM,WAAW,iBAAiB;IACjC,QAAQ,CAAC,OAAO,EAAE,SAAS,eAAe,EAAE,CAAC;IAC7C,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,iBAAiB,CAAC,EAAE,OAAO,CAAC;CACrC;AAED,MAAM,WAAW,aAAa;IAC7B,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,WAAW,gBAAgB;IAChC,2CAA2C;IAC3C,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,SAAS,EAAE,qBAAqB,CAAC;IAC1C,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IACnC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IACrC,qDAAqD;IACrD,QAAQ,CAAC,UAAU,CAAC,EAAE;QAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;CAC1E;AAaD,qBAAa,SAAS;IACrB,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAoB;IAC9C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAwC;IAChE,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAS;IAC1C,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAS;IAC5C,OAAO,CAAC,MAAM,CAAK;IACnB,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,UAAU,CAAqB;IACvC,OAAO,CAAC,IAAI,CAAqB;IACjC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAmB;IAE3C,YAAY,OAAO,EAAE,gBAAgB,EAQpC;IAED,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED,IAAI,UAAU,IAAI,aAAa,CAE9B;IAED,IAAI,KAAK,IAAI,OAAO,CAEnB;IAED,8CAA8C;IAC9C,IAAI,OAAO,IAAI,MAAM,GAAG,SAAS,CAEhC;IAED;;;;OAIG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAuB7B;IAED;;;;OAIG;IACG,IAAI,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAG5C;IAED,+DAA+D;IACzD,SAAS,IAAI,OAAO,CAAC,aAAa,EAAE,CAAC,CAmB1C;IAED;;;;OAIG;IACG,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAU1F;IAED,gEAAgE;IAChE,KAAK,IAAI,IAAI,CAIZ;IAED,OAAO,CAAC,WAAW;IAKnB,OAAO,CAAC,OAAO;IAuBf,OAAO,CAAC,aAAa;IAcrB,OAAO,CAAC,UAAU;CAclB","sourcesContent":["/**\n * Minimal MCP client: initialize handshake, `tools/list`, `tools/call`.\n *\n * Deliberately dependency-free. The upstream SDK carries a full server\n * implementation, resource/prompt/sampling surfaces, and its own transport\n * stack; OMK needs a client for three methods, so the client is ~200 lines of\n * request correlation over a transport this repo already owns.\n *\n * Fail-closed contract:\n * - Every request has a deadline. A hung server rejects, it does not stall a turn.\n * - A transport exit rejects every in-flight request with the server's stderr tail.\n * - Calling before a completed handshake throws instead of guessing.\n */\n\nimport {\n\tformatJsonRpcError,\n\tisJsonRpcResponse,\n\ttype JsonRpcId,\n\ttype JsonRpcMessage,\n\ttype JsonRpcResponse,\n} from \"./protocol.ts\";\nimport { McpStdioTransport, type StdioTransportOptions } from \"./stdio-transport.ts\";\n\n/** Protocol revision this client implements. */\nexport const MCP_PROTOCOL_VERSION = \"2025-06-18\";\n/** Default per-request deadline. */\nexport const DEFAULT_REQUEST_TIMEOUT_MS = 30_000;\n/** Default handshake deadline. Servers that install on first run need more room than a normal call. */\nexport const DEFAULT_HANDSHAKE_TIMEOUT_MS = 60_000;\n\nexport interface McpToolSchema {\n\treadonly name: string;\n\treadonly description?: string;\n\treadonly inputSchema?: Record<string, unknown>;\n\treadonly title?: string;\n}\n\nexport interface McpTextBlock {\n\treadonly type: \"text\";\n\treadonly text: string;\n}\n\nexport interface McpImageBlock {\n\treadonly type: \"image\";\n\treadonly data: string;\n\treadonly mimeType: string;\n}\n\nexport type McpContentBlock = McpTextBlock | McpImageBlock | { readonly type: string; readonly [key: string]: unknown };\n\nexport interface McpToolCallResult {\n\treadonly content: readonly McpContentBlock[];\n\treadonly isError: boolean;\n\treadonly structuredContent?: unknown;\n}\n\nexport interface McpServerInfo {\n\treadonly name?: string;\n\treadonly version?: string;\n}\n\nexport interface McpClientOptions {\n\t/** Server label used in error messages. */\n\treadonly name: string;\n\treadonly transport: StdioTransportOptions;\n\treadonly requestTimeoutMs?: number;\n\treadonly handshakeTimeoutMs?: number;\n\t/** Client identity reported during the handshake. */\n\treadonly clientInfo?: { readonly name: string; readonly version: string };\n}\n\ninterface PendingRequest {\n\treadonly resolve: (result: unknown) => void;\n\treadonly reject: (error: Error) => void;\n\treadonly timer: ReturnType<typeof setTimeout>;\n\treadonly method: string;\n}\n\nfunction isRecord(value: unknown): value is Record<string, unknown> {\n\treturn typeof value === \"object\" && value !== null && !Array.isArray(value);\n}\n\nexport class McpClient {\n\tprivate readonly transport: McpStdioTransport;\n\tprivate readonly pending = new Map<JsonRpcId, PendingRequest>();\n\tprivate readonly requestTimeoutMs: number;\n\tprivate readonly handshakeTimeoutMs: number;\n\tprivate nextId = 1;\n\tprivate initialized = false;\n\tprivate closed = false;\n\tprivate exitReason: string | undefined;\n\tprivate info: McpServerInfo = {};\n\tprivate readonly options: McpClientOptions;\n\n\tconstructor(options: McpClientOptions) {\n\t\tthis.options = options;\n\t\tthis.requestTimeoutMs = options.requestTimeoutMs ?? DEFAULT_REQUEST_TIMEOUT_MS;\n\t\tthis.handshakeTimeoutMs = options.handshakeTimeoutMs ?? DEFAULT_HANDSHAKE_TIMEOUT_MS;\n\t\tthis.transport = new McpStdioTransport(options.transport, {\n\t\t\tonMessage: (message) => this.handleMessage(message),\n\t\t\tonExit: ({ code, signal }) => this.handleExit(code, signal),\n\t\t});\n\t}\n\n\tget name(): string {\n\t\treturn this.options.name;\n\t}\n\n\tget serverInfo(): McpServerInfo {\n\t\treturn this.info;\n\t}\n\n\tget ready(): boolean {\n\t\treturn this.initialized && !this.closed;\n\t}\n\n\t/** Why the server is unusable, when it is. */\n\tget failure(): string | undefined {\n\t\treturn this.exitReason;\n\t}\n\n\t/**\n\t * Spawn the server and complete the MCP handshake. Safe to await once; a\n\t * second call after a failure re-throws the recorded reason rather than\n\t * silently reusing a dead process.\n\t */\n\tasync connect(): Promise<void> {\n\t\tif (this.closed) throw new Error(this.exitReason ?? `MCP server \"${this.options.name}\" is closed`);\n\t\tif (this.initialized) return;\n\t\tthis.transport.start();\n\n\t\tconst result = await this.request(\n\t\t\t\"initialize\",\n\t\t\t{\n\t\t\t\tprotocolVersion: MCP_PROTOCOL_VERSION,\n\t\t\t\tcapabilities: {},\n\t\t\t\tclientInfo: this.options.clientInfo ?? { name: \"omk\", version: \"0.0.0\" },\n\t\t\t},\n\t\t\tthis.handshakeTimeoutMs,\n\t\t);\n\t\tif (isRecord(result) && isRecord(result.serverInfo)) {\n\t\t\tconst { name, version } = result.serverInfo;\n\t\t\tthis.info = {\n\t\t\t\tname: typeof name === \"string\" ? name : undefined,\n\t\t\t\tversion: typeof version === \"string\" ? version : undefined,\n\t\t\t};\n\t\t}\n\t\tthis.initialized = true;\n\t\tthis.transport.send({ jsonrpc: \"2.0\", method: \"notifications/initialized\" });\n\t}\n\n\t/**\n\t * Protocol-level liveness probe. Rejects when the server is closed, dead,\n\t * or fails to answer within `timeoutMs`, so callers can tell a silently\n\t * killed process apart from a genuinely connected one.\n\t */\n\tasync ping(timeoutMs?: number): Promise<void> {\n\t\tthis.assertReady();\n\t\tawait this.request(\"ping\", {}, timeoutMs);\n\t}\n\n\t/** List the server's tools. Requires a completed handshake. */\n\tasync listTools(): Promise<McpToolSchema[]> {\n\t\tthis.assertReady();\n\t\tconst tools: McpToolSchema[] = [];\n\t\tlet cursor: string | undefined;\n\t\tdo {\n\t\t\tconst result = await this.request(\"tools/list\", cursor ? { cursor } : {});\n\t\t\tif (!isRecord(result) || !Array.isArray(result.tools)) return tools;\n\t\t\tfor (const raw of result.tools) {\n\t\t\t\tif (!isRecord(raw) || typeof raw.name !== \"string\" || raw.name.length === 0) continue;\n\t\t\t\ttools.push({\n\t\t\t\t\tname: raw.name,\n\t\t\t\t\tdescription: typeof raw.description === \"string\" ? raw.description : undefined,\n\t\t\t\t\ttitle: typeof raw.title === \"string\" ? raw.title : undefined,\n\t\t\t\t\tinputSchema: isRecord(raw.inputSchema) ? raw.inputSchema : undefined,\n\t\t\t\t});\n\t\t\t}\n\t\t\tcursor = typeof result.nextCursor === \"string\" && result.nextCursor.length > 0 ? result.nextCursor : undefined;\n\t\t} while (cursor);\n\t\treturn tools;\n\t}\n\n\t/**\n\t * Invoke a tool. A protocol-level failure rejects; a tool-level failure\n\t * resolves with `isError: true`, matching MCP semantics so the model sees\n\t * the server's own error text instead of a harness exception.\n\t */\n\tasync callTool(name: string, args: unknown, timeoutMs?: number): Promise<McpToolCallResult> {\n\t\tthis.assertReady();\n\t\tconst result = await this.request(\"tools/call\", { name, arguments: args ?? {} }, timeoutMs);\n\t\tif (!isRecord(result)) return { content: [], isError: false };\n\t\tconst content = Array.isArray(result.content) ? (result.content as McpContentBlock[]) : [];\n\t\treturn {\n\t\t\tcontent,\n\t\t\tisError: result.isError === true,\n\t\t\tstructuredContent: result.structuredContent,\n\t\t};\n\t}\n\n\t/** Terminate the server and reject anything still in flight. */\n\tclose(): void {\n\t\tif (this.closed) return;\n\t\tthis.transport.close();\n\t\tthis.handleExit(null, null);\n\t}\n\n\tprivate assertReady(): void {\n\t\tif (this.closed) throw new Error(this.exitReason ?? `MCP server \"${this.options.name}\" is closed`);\n\t\tif (!this.initialized) throw new Error(`MCP server \"${this.options.name}\" is not initialized`);\n\t}\n\n\tprivate request(method: string, params: unknown, timeoutMs?: number): Promise<unknown> {\n\t\tif (this.closed) {\n\t\t\treturn Promise.reject(new Error(this.exitReason ?? `MCP server \"${this.options.name}\" is closed`));\n\t\t}\n\t\tconst id = this.nextId++;\n\t\tconst effectiveTimeout = timeoutMs ?? this.requestTimeoutMs;\n\t\treturn new Promise<unknown>((resolve, reject) => {\n\t\t\tconst timer = setTimeout(() => {\n\t\t\t\tthis.pending.delete(id);\n\t\t\t\treject(new Error(`MCP server \"${this.options.name}\" timed out after ${effectiveTimeout}ms on ${method}`));\n\t\t\t}, effectiveTimeout);\n\t\t\ttimer.unref?.();\n\t\t\tthis.pending.set(id, { resolve, reject, timer, method });\n\n\t\t\tconst sent = this.transport.send({ jsonrpc: \"2.0\", id, method, params });\n\t\t\tif (!sent) {\n\t\t\t\tthis.pending.delete(id);\n\t\t\t\tclearTimeout(timer);\n\t\t\t\treject(new Error(`MCP server \"${this.options.name}\" is not writable (${method})`));\n\t\t\t}\n\t\t});\n\t}\n\n\tprivate handleMessage(message: JsonRpcMessage): void {\n\t\tif (!isJsonRpcResponse(message)) return; // Server-initiated requests/notifications are not used yet.\n\t\tconst response: JsonRpcResponse = message;\n\t\tconst pending = this.pending.get(response.id);\n\t\tif (!pending) return;\n\t\tthis.pending.delete(response.id);\n\t\tclearTimeout(pending.timer);\n\t\tif (response.error) {\n\t\t\tpending.reject(new Error(`MCP server \"${this.options.name}\": ${formatJsonRpcError(response.error)}`));\n\t\t\treturn;\n\t\t}\n\t\tpending.resolve(response.result);\n\t}\n\n\tprivate handleExit(code: number | null, signal: string | null): void {\n\t\tif (this.closed) return;\n\t\tthis.closed = true;\n\t\tthis.initialized = false;\n\t\tconst detail = signal ? `signal ${signal}` : code === null ? \"spawn failure\" : `exit code ${code}`;\n\t\tconst stderr = this.transport.stderr.trim();\n\t\tthis.exitReason = `MCP server \"${this.options.name}\" stopped (${detail})${stderr ? `: ${stderr}` : \"\"}`;\n\t\tconst reason = new Error(this.exitReason);\n\t\tfor (const [id, pending] of this.pending) {\n\t\t\tclearTimeout(pending.timer);\n\t\t\tthis.pending.delete(id);\n\t\t\tpending.reject(reason);\n\t\t}\n\t}\n}\n"]}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/core/mcp/client.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Minimal MCP client: initialize handshake, `tools/list`, `tools/call`.\n *\n * Deliberately dependency-free. The upstream SDK carries a full server\n * implementation, resource/prompt/sampling surfaces, and its own transport\n * stack; OMK needs a client for three methods, so the client is ~200 lines of\n * request correlation over a transport this repo already owns.\n *\n * Fail-closed contract:\n * - Every request has a deadline. A hung server rejects, it does not stall a turn.\n * - A transport exit rejects every in-flight request with the server's stderr tail.\n * - Calling before a completed handshake throws instead of guessing.\n */\n\nimport {\n\tformatJsonRpcError,\n\tisJsonRpcResponse,\n\ttype JsonRpcId,\n\ttype JsonRpcMessage,\n\ttype JsonRpcResponse,\n} from \"./protocol.ts\";\nimport { McpStdioTransport, type StdioTransportOptions } from \"./stdio-transport.ts\";\n\n/** Protocol revision this client implements. */\nexport const MCP_PROTOCOL_VERSION = \"2025-06-18\";\n/**\n * Protocol revisions this client accepts from a server. The handshake fails\n * closed on any other value instead of guessing at forward compatibility.\n */\nexport const SUPPORTED_PROTOCOL_VERSIONS: readonly string[] = [\"2024-11-05\", MCP_PROTOCOL_VERSION];\n/** Default per-request deadline. */\nexport const DEFAULT_REQUEST_TIMEOUT_MS = 30_000;\n/** Default handshake deadline. Servers that install on first run need more room than a normal call. */\nexport const DEFAULT_HANDSHAKE_TIMEOUT_MS = 60_000;\n/** Page ceiling for `tools/list` so a looping cursor cannot stall a session forever. */\nexport const MAX_LIST_PAGES = 128;\n/** Tool ceiling across all `tools/list` pages for one server. */\nexport const MAX_LIST_TOOLS = 4096;\n/** Overall `tools/list` deadline; per-request timeouts do not bound the total. */\nexport const LIST_TOOLS_TIMEOUT_MS = 120_000;\n/** In-flight request ceiling per server. */\nexport const MAX_PENDING_REQUESTS = 128;\n\nexport interface McpToolSchema {\n\treadonly name: string;\n\treadonly description?: string;\n\treadonly inputSchema?: Record<string, unknown>;\n\treadonly title?: string;\n}\n\nexport interface McpTextBlock {\n\treadonly type: \"text\";\n\treadonly text: string;\n}\n\nexport type McpContentBlock =\n\t| McpTextBlock\n\t| { readonly type: \"image\"; readonly data: string; readonly mimeType: string }\n\t| { readonly type: string; readonly [key: string]: unknown };\n\nexport interface McpToolCallResult {\n\treadonly content: readonly McpContentBlock[];\n\treadonly isError: boolean;\n\treadonly structuredContent?: unknown;\n}\n\nexport interface McpServerInfo {\n\treadonly name?: string;\n\treadonly version?: string;\n}\n\nexport interface McpClientOptions {\n\t/** Server label used in error messages. */\n\treadonly name: string;\n\treadonly transport: StdioTransportOptions;\n\treadonly requestTimeoutMs?: number;\n\treadonly handshakeTimeoutMs?: number;\n\t/** Client identity reported during the handshake. */\n\treadonly clientInfo?: { readonly name: string; readonly version: string };\n}\n\ninterface PendingRequest {\n\treadonly resolve: (result: unknown) => void;\n\treadonly reject: (error: Error) => void;\n\treadonly timer: ReturnType<typeof setTimeout>;\n\treadonly method: string;\n}\n\nfunction isRecord(value: unknown): value is Record<string, unknown> {\n\treturn typeof value === \"object\" && value !== null && !Array.isArray(value);\n}\n\nexport class McpClient {\n\tprivate readonly transport: McpStdioTransport;\n\tprivate readonly pending = new Map<JsonRpcId, PendingRequest>();\n\tprivate readonly requestTimeoutMs: number;\n\tprivate readonly handshakeTimeoutMs: number;\n\tprivate nextId = 1;\n\tprivate initialized = false;\n\tprivate closed = false;\n\tprivate exitReason: string | undefined;\n\tprivate info: McpServerInfo = {};\n\tprivate lastProtocolErrorReason: string | undefined;\n\tprivate readonly options: McpClientOptions;\n\n\tconstructor(options: McpClientOptions) {\n\t\tthis.options = options;\n\t\tthis.requestTimeoutMs = options.requestTimeoutMs ?? DEFAULT_REQUEST_TIMEOUT_MS;\n\t\tthis.handshakeTimeoutMs = options.handshakeTimeoutMs ?? DEFAULT_HANDSHAKE_TIMEOUT_MS;\n\t\tthis.transport = new McpStdioTransport(options.transport, {\n\t\t\tonMessage: (message) => this.handleMessage(message),\n\t\t\tonDecodeError: (reason) => {\n\t\t\t\tthis.lastProtocolErrorReason = reason;\n\t\t\t},\n\t\t\tonExit: ({ code, signal }) => this.handleExit(code, signal),\n\t\t});\n\t}\n\n\tget name(): string {\n\t\treturn this.options.name;\n\t}\n\n\tget serverInfo(): McpServerInfo {\n\t\treturn this.info;\n\t}\n\n\tget ready(): boolean {\n\t\treturn this.initialized && !this.closed;\n\t}\n\n\t/**\n\t * Spawn the server and complete the MCP handshake. Safe to await once; a\n\t * second call after a failure re-throws the recorded reason rather than\n\t * silently reusing a dead process.\n\t */\n\tasync connect(): Promise<void> {\n\t\tif (this.closed) throw new Error(this.exitReason ?? `MCP server \"${this.options.name}\" is closed`);\n\t\tif (this.initialized) return;\n\t\tthis.transport.start();\n\n\t\tconst result = await this.request(\n\t\t\t\"initialize\",\n\t\t\t{\n\t\t\t\tprotocolVersion: MCP_PROTOCOL_VERSION,\n\t\t\t\tcapabilities: {},\n\t\t\t\tclientInfo: this.options.clientInfo ?? { name: \"omk\", version: \"0.0.0\" },\n\t\t\t},\n\t\t\tthis.handshakeTimeoutMs,\n\t\t);\n\t\tthis.assertInitializeResult(result);\n\t\tthis.initialized = true;\n\t\tthis.transport.send({ jsonrpc: \"2.0\", method: \"notifications/initialized\" });\n\t}\n\n\t// The handshake is a negotiation, not a formality: reject a response that\n\t// does not carry a protocol version this client actually supports.\n\tprivate assertInitializeResult(result: unknown): void {\n\t\tif (!isRecord(result) || typeof result.protocolVersion !== \"string\") {\n\t\t\tthrow new Error(\n\t\t\t\t`MCP server \"${this.options.name}\" returned an invalid initialize result (missing protocolVersion)`,\n\t\t\t);\n\t\t}\n\t\tif (!SUPPORTED_PROTOCOL_VERSIONS.includes(result.protocolVersion)) {\n\t\t\tthrow new Error(\n\t\t\t\t`MCP server \"${this.options.name}\" requested unsupported protocol version \"${result.protocolVersion}\"`,\n\t\t\t);\n\t\t}\n\t\tif (isRecord(result.serverInfo)) {\n\t\t\tconst { name, version } = result.serverInfo;\n\t\t\tthis.info = {\n\t\t\t\tname: typeof name === \"string\" ? name : undefined,\n\t\t\t\tversion: typeof version === \"string\" ? version : undefined,\n\t\t\t};\n\t\t}\n\t}\n\n\t/**\n\t * Protocol-level liveness probe. Rejects when the server is closed, dead,\n\t * or fails to answer within `timeoutMs`, so callers can tell a silently\n\t * killed process apart from a genuinely connected one.\n\t */\n\tasync ping(timeoutMs?: number): Promise<void> {\n\t\tthis.assertReady();\n\t\tawait this.request(\"ping\", {}, timeoutMs);\n\t}\n\n\t/**\n\t * List the server's tools. Requires a completed handshake.\n\t *\n\t * Pagination is bounded three ways — an overall deadline, a page count, and\n\t * a tool count — and a repeated cursor is a protocol error, so a misbehaving\n\t * server cannot keep the listing loop alive indefinitely. Duplicate tool\n\t * names in one listing are rejected instead of silently overwritten.\n\t */\n\tasync listTools(): Promise<McpToolSchema[]> {\n\t\tthis.assertReady();\n\t\tconst tools: McpToolSchema[] = [];\n\t\tconst seenNames = new Set<string>();\n\t\tconst seenCursors = new Set<string>();\n\t\tconst deadline = Date.now() + LIST_TOOLS_TIMEOUT_MS;\n\t\tlet cursor: string | undefined;\n\t\tconst fail = (what: string): never => {\n\t\t\tthrow new Error(`MCP server \"${this.options.name}\" ${what}`);\n\t\t};\n\t\tfor (let page = 0; page < MAX_LIST_PAGES; page++) {\n\t\t\tconst remainingMs = deadline - Date.now();\n\t\t\tif (remainingMs <= 0) fail(`tools/list exceeded ${LIST_TOOLS_TIMEOUT_MS}ms`);\n\t\t\tconst result = await this.request(\n\t\t\t\t\"tools/list\",\n\t\t\t\tcursor ? { cursor } : {},\n\t\t\t\tMath.min(remainingMs, this.requestTimeoutMs),\n\t\t\t);\n\t\t\tconst record = isRecord(result) ? result : fail(\"returned an invalid tools/list result\");\n\t\t\tconst rawTools = Array.isArray(record.tools) ? record.tools : fail(\"returned an invalid tools/list result\");\n\t\t\tfor (const raw of rawTools) {\n\t\t\t\tif (!isRecord(raw) || typeof raw.name !== \"string\" || raw.name.length === 0) continue;\n\t\t\t\tif (seenNames.has(raw.name)) fail(`listed duplicate tool \"${raw.name}\"`);\n\t\t\t\tseenNames.add(raw.name);\n\t\t\t\ttools.push({\n\t\t\t\t\tname: raw.name,\n\t\t\t\t\tdescription: typeof raw.description === \"string\" ? raw.description : undefined,\n\t\t\t\t\ttitle: typeof raw.title === \"string\" ? raw.title : undefined,\n\t\t\t\t\tinputSchema: isRecord(raw.inputSchema) ? raw.inputSchema : undefined,\n\t\t\t\t});\n\t\t\t\tif (tools.length > MAX_LIST_TOOLS) fail(`exceeded ${MAX_LIST_TOOLS} tools`);\n\t\t\t}\n\t\t\tconst next =\n\t\t\t\ttypeof record.nextCursor === \"string\" && record.nextCursor.length > 0 ? record.nextCursor : undefined;\n\t\t\tif (!next) return tools;\n\t\t\tif (seenCursors.has(next)) fail(\"repeated tools/list cursor\");\n\t\t\tseenCursors.add(next);\n\t\t\tcursor = next;\n\t\t}\n\t\treturn fail(`exceeded ${MAX_LIST_PAGES} tools/list pages`);\n\t}\n\n\t/**\n\t * Invoke a tool. A protocol-level failure rejects; a tool-level failure\n\t * resolves with `isError: true`, matching MCP semantics so the model sees\n\t * the server's own error text instead of a harness exception.\n\t */\n\tasync callTool(name: string, args: unknown, timeoutMs?: number): Promise<McpToolCallResult> {\n\t\tthis.assertReady();\n\t\tconst result = await this.request(\"tools/call\", { name, arguments: args ?? {} }, timeoutMs);\n\t\t// A non-object result is a protocol violation, not an empty success —\n\t\t// normalizing it would hide a broken server from the caller.\n\t\tif (!isRecord(result)) {\n\t\t\tthrow new Error(`MCP server \"${this.options.name}\" returned an invalid tools/call result`);\n\t\t}\n\t\tconst content = Array.isArray(result.content) ? (result.content as McpContentBlock[]) : [];\n\t\treturn {\n\t\t\tcontent,\n\t\t\tisError: result.isError === true,\n\t\t\tstructuredContent: result.structuredContent,\n\t\t};\n\t}\n\n\t/** Terminate the server and reject anything still in flight. */\n\tclose(): void {\n\t\tif (this.closed) return;\n\t\tthis.transport.close();\n\t\tthis.handleExit(null, null);\n\t}\n\n\t/** Why the server is unusable, when it is; includes the latest decode failure. */\n\tget failure(): string | undefined {\n\t\treturn this.exitReason ?? this.lastProtocolErrorReason;\n\t}\n\n\tprivate assertReady(): void {\n\t\tif (this.closed) throw new Error(this.exitReason ?? `MCP server \"${this.options.name}\" is closed`);\n\t\tif (!this.initialized) throw new Error(`MCP server \"${this.options.name}\" is not initialized`);\n\t}\n\n\tprivate request(method: string, params: unknown, timeoutMs?: number): Promise<unknown> {\n\t\tif (this.closed) {\n\t\t\treturn Promise.reject(new Error(this.exitReason ?? `MCP server \"${this.options.name}\" is closed`));\n\t\t}\n\t\tif (this.pending.size >= MAX_PENDING_REQUESTS) {\n\t\t\treturn Promise.reject(\n\t\t\t\tnew Error(`MCP server \"${this.options.name}\" has ${MAX_PENDING_REQUESTS} pending requests (${method})`),\n\t\t\t);\n\t\t}\n\t\tconst id = this.nextId++;\n\t\tconst effectiveTimeout = timeoutMs ?? this.requestTimeoutMs;\n\t\treturn new Promise<unknown>((resolve, reject) => {\n\t\t\tconst timer = setTimeout(() => {\n\t\t\t\tthis.pending.delete(id);\n\t\t\t\treject(new Error(`MCP server \"${this.options.name}\" timed out after ${effectiveTimeout}ms on ${method}`));\n\t\t\t}, effectiveTimeout);\n\t\t\ttimer.unref?.();\n\t\t\tthis.pending.set(id, { resolve, reject, timer, method });\n\t\t\tif (!this.transport.send({ jsonrpc: \"2.0\", id, method, params })) {\n\t\t\t\tthis.pending.delete(id);\n\t\t\t\tclearTimeout(timer);\n\t\t\t\treject(new Error(`MCP server \"${this.options.name}\" is not writable (${method})`));\n\t\t\t}\n\t\t});\n\t}\n\n\tprivate handleMessage(message: JsonRpcMessage): void {\n\t\tif (!isJsonRpcResponse(message)) return; // Server-initiated requests/notifications are not used yet.\n\t\tconst response: JsonRpcResponse = message;\n\t\tconst pending = this.pending.get(response.id);\n\t\tif (!pending) return;\n\t\tthis.pending.delete(response.id);\n\t\tclearTimeout(pending.timer);\n\t\tif (response.error) {\n\t\t\tpending.reject(new Error(`MCP server \"${this.options.name}\": ${formatJsonRpcError(response.error)}`));\n\t\t\treturn;\n\t\t}\n\t\tpending.resolve(response.result);\n\t}\n\n\tprivate handleExit(code: number | null, signal: string | null): void {\n\t\tif (this.closed) return;\n\t\tthis.closed = true;\n\t\tthis.initialized = false;\n\t\tconst detail = signal ? `signal ${signal}` : code === null ? \"spawn failure\" : `exit code ${code}`;\n\t\tconst stderr = this.transport.stderr.trim();\n\t\tthis.exitReason = `MCP server \"${this.options.name}\" stopped (${detail})${stderr ? `: ${stderr}` : \"\"}`;\n\t\tconst reason = new Error(this.exitReason);\n\t\tfor (const [id, pending] of this.pending) {\n\t\t\tclearTimeout(pending.timer);\n\t\t\tthis.pending.delete(id);\n\t\t\tpending.reject(reason);\n\t\t}\n\t}\n}\n"]}

package/dist/core/mcp/client.js

@@ -15,10 +15,23 @@ import { formatJsonRpcError, isJsonRpcResponse, } from "./protocol.js";
 import { McpStdioTransport } from "./stdio-transport.js";
 /** Protocol revision this client implements. */
 export const MCP_PROTOCOL_VERSION = "2025-06-18";
+/**
+ * Protocol revisions this client accepts from a server. The handshake fails
+ * closed on any other value instead of guessing at forward compatibility.
+ */
+export const SUPPORTED_PROTOCOL_VERSIONS = ["2024-11-05", MCP_PROTOCOL_VERSION];
 /** Default per-request deadline. */
 export const DEFAULT_REQUEST_TIMEOUT_MS = 30_000;
 /** Default handshake deadline. Servers that install on first run need more room than a normal call. */
 export const DEFAULT_HANDSHAKE_TIMEOUT_MS = 60_000;
+/** Page ceiling for `tools/list` so a looping cursor cannot stall a session forever. */
+export const MAX_LIST_PAGES = 128;
+/** Tool ceiling across all `tools/list` pages for one server. */
+export const MAX_LIST_TOOLS = 4096;
+/** Overall `tools/list` deadline; per-request timeouts do not bound the total. */
+export const LIST_TOOLS_TIMEOUT_MS = 120_000;
+/** In-flight request ceiling per server. */
+export const MAX_PENDING_REQUESTS = 128;
 function isRecord(value) {
     return typeof value === "object" && value !== null && !Array.isArray(value);
 }
@@ -32,6 +45,7 @@ export class McpClient {
     closed = false;
     exitReason;
     info = {};
+    lastProtocolErrorReason;
     options;
     constructor(options) {
         this.options = options;
@@ -39,6 +53,9 @@ export class McpClient {
         this.handshakeTimeoutMs = options.handshakeTimeoutMs ?? DEFAULT_HANDSHAKE_TIMEOUT_MS;
         this.transport = new McpStdioTransport(options.transport, {
             onMessage: (message) => this.handleMessage(message),
+            onDecodeError: (reason) => {
+                this.lastProtocolErrorReason = reason;
+            },
             onExit: ({ code, signal }) => this.handleExit(code, signal),
         });
     }
@@ -51,10 +68,6 @@ export class McpClient {
     get ready() {
         return this.initialized && !this.closed;
     }
-    /** Why the server is unusable, when it is. */
-    get failure() {
-        return this.exitReason;
-    }
     /**
      * Spawn the server and complete the MCP handshake. Safe to await once; a
      * second call after a failure re-throws the recorded reason rather than
@@ -71,15 +84,26 @@ export class McpClient {
             capabilities: {},
             clientInfo: this.options.clientInfo ?? { name: "omk", version: "0.0.0" },
         }, this.handshakeTimeoutMs);
-        if (isRecord(result) && isRecord(result.serverInfo)) {
+        this.assertInitializeResult(result);
+        this.initialized = true;
+        this.transport.send({ jsonrpc: "2.0", method: "notifications/initialized" });
+    }
+    // The handshake is a negotiation, not a formality: reject a response that
+    // does not carry a protocol version this client actually supports.
+    assertInitializeResult(result) {
+        if (!isRecord(result) || typeof result.protocolVersion !== "string") {
+            throw new Error(`MCP server "${this.options.name}" returned an invalid initialize result (missing protocolVersion)`);
+        }
+        if (!SUPPORTED_PROTOCOL_VERSIONS.includes(result.protocolVersion)) {
+            throw new Error(`MCP server "${this.options.name}" requested unsupported protocol version "${result.protocolVersion}"`);
+        }
+        if (isRecord(result.serverInfo)) {
             const { name, version } = result.serverInfo;
             this.info = {
                 name: typeof name === "string" ? name : undefined,
                 version: typeof version === "string" ? version : undefined,
             };
         }
-        this.initialized = true;
-        this.transport.send({ jsonrpc: "2.0", method: "notifications/initialized" });
     }
     /**
      * Protocol-level liveness probe. Rejects when the server is closed, dead,
@@ -90,28 +114,55 @@ export class McpClient {
         this.assertReady();
         await this.request("ping", {}, timeoutMs);
     }
-    /** List the server's tools. Requires a completed handshake. */
+    /**
+     * List the server's tools. Requires a completed handshake.
+     *
+     * Pagination is bounded three ways — an overall deadline, a page count, and
+     * a tool count — and a repeated cursor is a protocol error, so a misbehaving
+     * server cannot keep the listing loop alive indefinitely. Duplicate tool
+     * names in one listing are rejected instead of silently overwritten.
+     */
     async listTools() {
         this.assertReady();
         const tools = [];
+        const seenNames = new Set();
+        const seenCursors = new Set();
+        const deadline = Date.now() + LIST_TOOLS_TIMEOUT_MS;
         let cursor;
-        do {
-            const result = await this.request("tools/list", cursor ? { cursor } : {});
-            if (!isRecord(result) || !Array.isArray(result.tools))
-                return tools;
-            for (const raw of result.tools) {
+        const fail = (what) => {
+            throw new Error(`MCP server "${this.options.name}" ${what}`);
+        };
+        for (let page = 0; page < MAX_LIST_PAGES; page++) {
+            const remainingMs = deadline - Date.now();
+            if (remainingMs <= 0)
+                fail(`tools/list exceeded ${LIST_TOOLS_TIMEOUT_MS}ms`);
+            const result = await this.request("tools/list", cursor ? { cursor } : {}, Math.min(remainingMs, this.requestTimeoutMs));
+            const record = isRecord(result) ? result : fail("returned an invalid tools/list result");
+            const rawTools = Array.isArray(record.tools) ? record.tools : fail("returned an invalid tools/list result");
+            for (const raw of rawTools) {
                 if (!isRecord(raw) || typeof raw.name !== "string" || raw.name.length === 0)
                     continue;
+                if (seenNames.has(raw.name))
+                    fail(`listed duplicate tool "${raw.name}"`);
+                seenNames.add(raw.name);
                 tools.push({
                     name: raw.name,
                     description: typeof raw.description === "string" ? raw.description : undefined,
                     title: typeof raw.title === "string" ? raw.title : undefined,
                     inputSchema: isRecord(raw.inputSchema) ? raw.inputSchema : undefined,
                 });
+                if (tools.length > MAX_LIST_TOOLS)
+                    fail(`exceeded ${MAX_LIST_TOOLS} tools`);
             }
-            cursor = typeof result.nextCursor === "string" && result.nextCursor.length > 0 ? result.nextCursor : undefined;
-        } while (cursor);
-        return tools;
+            const next = typeof record.nextCursor === "string" && record.nextCursor.length > 0 ? record.nextCursor : undefined;
+            if (!next)
+                return tools;
+            if (seenCursors.has(next))
+                fail("repeated tools/list cursor");
+            seenCursors.add(next);
+            cursor = next;
+        }
+        return fail(`exceeded ${MAX_LIST_PAGES} tools/list pages`);
     }
     /**
      * Invoke a tool. A protocol-level failure rejects; a tool-level failure
@@ -121,8 +172,11 @@ export class McpClient {
     async callTool(name, args, timeoutMs) {
         this.assertReady();
         const result = await this.request("tools/call", { name, arguments: args ?? {} }, timeoutMs);
-        if (!isRecord(result))
-            return { content: [], isError: false };
+        // A non-object result is a protocol violation, not an empty success —
+        // normalizing it would hide a broken server from the caller.
+        if (!isRecord(result)) {
+            throw new Error(`MCP server "${this.options.name}" returned an invalid tools/call result`);
+        }
         const content = Array.isArray(result.content) ? result.content : [];
         return {
             content,
@@ -137,6 +191,10 @@ export class McpClient {
         this.transport.close();
         this.handleExit(null, null);
     }
+    /** Why the server is unusable, when it is; includes the latest decode failure. */
+    get failure() {
+        return this.exitReason ?? this.lastProtocolErrorReason;
+    }
     assertReady() {
         if (this.closed)
             throw new Error(this.exitReason ?? `MCP server "${this.options.name}" is closed`);
@@ -147,6 +205,9 @@ export class McpClient {
         if (this.closed) {
             return Promise.reject(new Error(this.exitReason ?? `MCP server "${this.options.name}" is closed`));
         }
+        if (this.pending.size >= MAX_PENDING_REQUESTS) {
+            return Promise.reject(new Error(`MCP server "${this.options.name}" has ${MAX_PENDING_REQUESTS} pending requests (${method})`));
+        }
         const id = this.nextId++;
         const effectiveTimeout = timeoutMs ?? this.requestTimeoutMs;
         return new Promise((resolve, reject) => {
@@ -156,8 +217,7 @@ export class McpClient {
             }, effectiveTimeout);
             timer.unref?.();
             this.pending.set(id, { resolve, reject, timer, method });
-            const sent = this.transport.send({ jsonrpc: "2.0", id, method, params });
-            if (!sent) {
+            if (!this.transport.send({ jsonrpc: "2.0", id, method, params })) {
                 this.pending.delete(id);
                 clearTimeout(timer);
                 reject(new Error(`MCP server "${this.options.name}" is not writable (${method})`));

package/dist/core/mcp/client.js.map

@@ -1 +1 @@
-{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/core/mcp/client.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,EACN,kBAAkB,EAClB,iBAAiB,GAIjB,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,iBAAiB,EAA8B,MAAM,sBAAsB,CAAC;AAErF,gDAAgD;AAChD,MAAM,CAAC,MAAM,oBAAoB,GAAG,YAAY,CAAC;AACjD,oCAAoC;AACpC,MAAM,CAAC,MAAM,0BAA0B,GAAG,MAAM,CAAC;AACjD,uGAAuG;AACvG,MAAM,CAAC,MAAM,4BAA4B,GAAG,MAAM,CAAC;AAkDnD,SAAS,QAAQ,CAAC,KAAc,EAAoC;IACnE,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAAA,CAC5E;AAED,MAAM,OAAO,SAAS;IACJ,SAAS,CAAoB;IAC7B,OAAO,GAAG,IAAI,GAAG,EAA6B,CAAC;IAC/C,gBAAgB,CAAS;IACzB,kBAAkB,CAAS;IACpC,MAAM,GAAG,CAAC,CAAC;IACX,WAAW,GAAG,KAAK,CAAC;IACpB,MAAM,GAAG,KAAK,CAAC;IACf,UAAU,CAAqB;IAC/B,IAAI,GAAkB,EAAE,CAAC;IAChB,OAAO,CAAmB;IAE3C,YAAY,OAAyB,EAAE;QACtC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,IAAI,0BAA0B,CAAC;QAC/E,IAAI,CAAC,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,IAAI,4BAA4B,CAAC;QACrF,IAAI,CAAC,SAAS,GAAG,IAAI,iBAAiB,CAAC,OAAO,CAAC,SAAS,EAAE;YACzD,SAAS,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC;YACnD,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC;SAC3D,CAAC,CAAC;IAAA,CACH;IAED,IAAI,IAAI,GAAW;QAClB,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC;IAAA,CACzB;IAED,IAAI,UAAU,GAAkB;QAC/B,OAAO,IAAI,CAAC,IAAI,CAAC;IAAA,CACjB;IAED,IAAI,KAAK,GAAY;QACpB,OAAO,IAAI,CAAC,WAAW,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC;IAAA,CACxC;IAED,8CAA8C;IAC9C,IAAI,OAAO,GAAuB;QACjC,OAAO,IAAI,CAAC,UAAU,CAAC;IAAA,CACvB;IAED;;;;OAIG;IACH,KAAK,CAAC,OAAO,GAAkB;QAC9B,IAAI,IAAI,CAAC,MAAM;YAAE,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,UAAU,IAAI,eAAe,IAAI,CAAC,OAAO,CAAC,IAAI,aAAa,CAAC,CAAC;QACnG,IAAI,IAAI,CAAC,WAAW;YAAE,OAAO;QAC7B,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;QAEvB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAChC,YAAY,EACZ;YACC,eAAe,EAAE,oBAAoB;YACrC,YAAY,EAAE,EAAE;YAChB,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,UAAU,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE;SACxE,EACD,IAAI,CAAC,kBAAkB,CACvB,CAAC;QACF,IAAI,QAAQ,CAAC,MAAM,CAAC,IAAI,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC;YACrD,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC,UAAU,CAAC;YAC5C,IAAI,CAAC,IAAI,GAAG;gBACX,IAAI,EAAE,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS;gBACjD,OAAO,EAAE,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS;aAC1D,CAAC;QACH,CAAC;QACD,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;QACxB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,2BAA2B,EAAE,CAAC,CAAC;IAAA,CAC7E;IAED;;;;OAIG;IACH,KAAK,CAAC,IAAI,CAAC,SAAkB,EAAiB;QAC7C,IAAI,CAAC,WAAW,EAAE,CAAC;QACnB,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,EAAE,SAAS,CAAC,CAAC;IAAA,CAC1C;IAED,+DAA+D;IAC/D,KAAK,CAAC,SAAS,GAA6B;QAC3C,IAAI,CAAC,WAAW,EAAE,CAAC;QACnB,MAAM,KAAK,GAAoB,EAAE,CAAC;QAClC,IAAI,MAA0B,CAAC;QAC/B,GAAG,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YAC1E,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;gBAAE,OAAO,KAAK,CAAC;YACpE,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;gBAChC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,OAAO,GAAG,CAAC,IAAI,KAAK,QAAQ,IAAI,GAAG,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC;oBAAE,SAAS;gBACtF,KAAK,CAAC,IAAI,CAAC;oBACV,IAAI,EAAE,GAAG,CAAC,IAAI;oBACd,WAAW,EAAE,OAAO,GAAG,CAAC,WAAW,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS;oBAC9E,KAAK,EAAE,OAAO,GAAG,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS;oBAC5D,WAAW,EAAE,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS;iBACpE,CAAC,CAAC;YACJ,CAAC;YACD,MAAM,GAAG,OAAO,MAAM,CAAC,UAAU,KAAK,QAAQ,IAAI,MAAM,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC;QAChH,CAAC,QAAQ,MAAM,EAAE;QACjB,OAAO,KAAK,CAAC;IAAA,CACb;IAED;;;;OAIG;IACH,KAAK,CAAC,QAAQ,CAAC,IAAY,EAAE,IAAa,EAAE,SAAkB,EAA8B;QAC3F,IAAI,CAAC,WAAW,EAAE,CAAC;QACnB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,IAAI,EAAE,EAAE,EAAE,SAAS,CAAC,CAAC;QAC5F,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;YAAE,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;QAC9D,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAE,MAAM,CAAC,OAA6B,CAAC,CAAC,CAAC,EAAE,CAAC;QAC3F,OAAO;YACN,OAAO;YACP,OAAO,EAAE,MAAM,CAAC,OAAO,KAAK,IAAI;YAChC,iBAAiB,EAAE,MAAM,CAAC,iBAAiB;SAC3C,CAAC;IAAA,CACF;IAED,gEAAgE;IAChE,KAAK,GAAS;QACb,IAAI,IAAI,CAAC,MAAM;YAAE,OAAO;QACxB,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;QACvB,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAAA,CAC5B;IAEO,WAAW,GAAS;QAC3B,IAAI,IAAI,CAAC,MAAM;YAAE,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,UAAU,IAAI,eAAe,IAAI,CAAC,OAAO,CAAC,IAAI,aAAa,CAAC,CAAC;QACnG,IAAI,CAAC,IAAI,CAAC,WAAW;YAAE,MAAM,IAAI,KAAK,CAAC,eAAe,IAAI,CAAC,OAAO,CAAC,IAAI,sBAAsB,CAAC,CAAC;IAAA,CAC/F;IAEO,OAAO,CAAC,MAAc,EAAE,MAAe,EAAE,SAAkB,EAAoB;QACtF,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YACjB,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,UAAU,IAAI,eAAe,IAAI,CAAC,OAAO,CAAC,IAAI,aAAa,CAAC,CAAC,CAAC;QACpG,CAAC;QACD,MAAM,EAAE,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;QACzB,MAAM,gBAAgB,GAAG,SAAS,IAAI,IAAI,CAAC,gBAAgB,CAAC;QAC5D,OAAO,IAAI,OAAO,CAAU,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,CAAC;YAChD,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC;gBAC9B,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;gBACxB,MAAM,CAAC,IAAI,KAAK,CAAC,eAAe,IAAI,CAAC,OAAO,CAAC,IAAI,qBAAqB,gBAAgB,SAAS,MAAM,EAAE,CAAC,CAAC,CAAC;YAAA,CAC1G,EAAE,gBAAgB,CAAC,CAAC;YACrB,KAAK,CAAC,KAAK,EAAE,EAAE,CAAC;YAChB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;YAEzD,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;YACzE,IAAI,CAAC,IAAI,EAAE,CAAC;gBACX,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;gBACxB,YAAY,CAAC,KAAK,CAAC,CAAC;gBACpB,MAAM,CAAC,IAAI,KAAK,CAAC,eAAe,IAAI,CAAC,OAAO,CAAC,IAAI,sBAAsB,MAAM,GAAG,CAAC,CAAC,CAAC;YACpF,CAAC;QAAA,CACD,CAAC,CAAC;IAAA,CACH;IAEO,aAAa,CAAC,OAAuB,EAAQ;QACpD,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC;YAAE,OAAO,CAAC,4DAA4D;QACrG,MAAM,QAAQ,GAAoB,OAAO,CAAC;QAC1C,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QAC9C,IAAI,CAAC,OAAO;YAAE,OAAO;QACrB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QACjC,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAC5B,IAAI,QAAQ,CAAC,KAAK,EAAE,CAAC;YACpB,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,eAAe,IAAI,CAAC,OAAO,CAAC,IAAI,MAAM,kBAAkB,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;YACtG,OAAO;QACR,CAAC;QACD,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IAAA,CACjC;IAEO,UAAU,CAAC,IAAmB,EAAE,MAAqB,EAAQ;QACpE,IAAI,IAAI,CAAC,MAAM;YAAE,OAAO;QACxB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;QACnB,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;QACzB,MAAM,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,UAAU,MAAM,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,aAAa,IAAI,EAAE,CAAC;QACnG,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QAC5C,IAAI,CAAC,UAAU,GAAG,eAAe,IAAI,CAAC,OAAO,CAAC,IAAI,cAAc,MAAM,IAAI,MAAM,CAAC,CAAC,CAAC,KAAK,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;QACxG,MAAM,MAAM,GAAG,IAAI,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC1C,KAAK,MAAM,CAAC,EAAE,EAAE,OAAO,CAAC,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YAC1C,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YAC5B,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YACxB,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACxB,CAAC;IAAA,CACD;CACD","sourcesContent":["/**\n * Minimal MCP client: initialize handshake, `tools/list`, `tools/call`.\n *\n * Deliberately dependency-free. The upstream SDK carries a full server\n * implementation, resource/prompt/sampling surfaces, and its own transport\n * stack; OMK needs a client for three methods, so the client is ~200 lines of\n * request correlation over a transport this repo already owns.\n *\n * Fail-closed contract:\n * - Every request has a deadline. A hung server rejects, it does not stall a turn.\n * - A transport exit rejects every in-flight request with the server's stderr tail.\n * - Calling before a completed handshake throws instead of guessing.\n */\n\nimport {\n\tformatJsonRpcError,\n\tisJsonRpcResponse,\n\ttype JsonRpcId,\n\ttype JsonRpcMessage,\n\ttype JsonRpcResponse,\n} from \"./protocol.ts\";\nimport { McpStdioTransport, type StdioTransportOptions } from \"./stdio-transport.ts\";\n\n/** Protocol revision this client implements. */\nexport const MCP_PROTOCOL_VERSION = \"2025-06-18\";\n/** Default per-request deadline. */\nexport const DEFAULT_REQUEST_TIMEOUT_MS = 30_000;\n/** Default handshake deadline. Servers that install on first run need more room than a normal call. */\nexport const DEFAULT_HANDSHAKE_TIMEOUT_MS = 60_000;\n\nexport interface McpToolSchema {\n\treadonly name: string;\n\treadonly description?: string;\n\treadonly inputSchema?: Record<string, unknown>;\n\treadonly title?: string;\n}\n\nexport interface McpTextBlock {\n\treadonly type: \"text\";\n\treadonly text: string;\n}\n\nexport interface McpImageBlock {\n\treadonly type: \"image\";\n\treadonly data: string;\n\treadonly mimeType: string;\n}\n\nexport type McpContentBlock = McpTextBlock | McpImageBlock | { readonly type: string; readonly [key: string]: unknown };\n\nexport interface McpToolCallResult {\n\treadonly content: readonly McpContentBlock[];\n\treadonly isError: boolean;\n\treadonly structuredContent?: unknown;\n}\n\nexport interface McpServerInfo {\n\treadonly name?: string;\n\treadonly version?: string;\n}\n\nexport interface McpClientOptions {\n\t/** Server label used in error messages. */\n\treadonly name: string;\n\treadonly transport: StdioTransportOptions;\n\treadonly requestTimeoutMs?: number;\n\treadonly handshakeTimeoutMs?: number;\n\t/** Client identity reported during the handshake. */\n\treadonly clientInfo?: { readonly name: string; readonly version: string };\n}\n\ninterface PendingRequest {\n\treadonly resolve: (result: unknown) => void;\n\treadonly reject: (error: Error) => void;\n\treadonly timer: ReturnType<typeof setTimeout>;\n\treadonly method: string;\n}\n\nfunction isRecord(value: unknown): value is Record<string, unknown> {\n\treturn typeof value === \"object\" && value !== null && !Array.isArray(value);\n}\n\nexport class McpClient {\n\tprivate readonly transport: McpStdioTransport;\n\tprivate readonly pending = new Map<JsonRpcId, PendingRequest>();\n\tprivate readonly requestTimeoutMs: number;\n\tprivate readonly handshakeTimeoutMs: number;\n\tprivate nextId = 1;\n\tprivate initialized = false;\n\tprivate closed = false;\n\tprivate exitReason: string | undefined;\n\tprivate info: McpServerInfo = {};\n\tprivate readonly options: McpClientOptions;\n\n\tconstructor(options: McpClientOptions) {\n\t\tthis.options = options;\n\t\tthis.requestTimeoutMs = options.requestTimeoutMs ?? DEFAULT_REQUEST_TIMEOUT_MS;\n\t\tthis.handshakeTimeoutMs = options.handshakeTimeoutMs ?? DEFAULT_HANDSHAKE_TIMEOUT_MS;\n\t\tthis.transport = new McpStdioTransport(options.transport, {\n\t\t\tonMessage: (message) => this.handleMessage(message),\n\t\t\tonExit: ({ code, signal }) => this.handleExit(code, signal),\n\t\t});\n\t}\n\n\tget name(): string {\n\t\treturn this.options.name;\n\t}\n\n\tget serverInfo(): McpServerInfo {\n\t\treturn this.info;\n\t}\n\n\tget ready(): boolean {\n\t\treturn this.initialized && !this.closed;\n\t}\n\n\t/** Why the server is unusable, when it is. */\n\tget failure(): string | undefined {\n\t\treturn this.exitReason;\n\t}\n\n\t/**\n\t * Spawn the server and complete the MCP handshake. Safe to await once; a\n\t * second call after a failure re-throws the recorded reason rather than\n\t * silently reusing a dead process.\n\t */\n\tasync connect(): Promise<void> {\n\t\tif (this.closed) throw new Error(this.exitReason ?? `MCP server \"${this.options.name}\" is closed`);\n\t\tif (this.initialized) return;\n\t\tthis.transport.start();\n\n\t\tconst result = await this.request(\n\t\t\t\"initialize\",\n\t\t\t{\n\t\t\t\tprotocolVersion: MCP_PROTOCOL_VERSION,\n\t\t\t\tcapabilities: {},\n\t\t\t\tclientInfo: this.options.clientInfo ?? { name: \"omk\", version: \"0.0.0\" },\n\t\t\t},\n\t\t\tthis.handshakeTimeoutMs,\n\t\t);\n\t\tif (isRecord(result) && isRecord(result.serverInfo)) {\n\t\t\tconst { name, version } = result.serverInfo;\n\t\t\tthis.info = {\n\t\t\t\tname: typeof name === \"string\" ? name : undefined,\n\t\t\t\tversion: typeof version === \"string\" ? version : undefined,\n\t\t\t};\n\t\t}\n\t\tthis.initialized = true;\n\t\tthis.transport.send({ jsonrpc: \"2.0\", method: \"notifications/initialized\" });\n\t}\n\n\t/**\n\t * Protocol-level liveness probe. Rejects when the server is closed, dead,\n\t * or fails to answer within `timeoutMs`, so callers can tell a silently\n\t * killed process apart from a genuinely connected one.\n\t */\n\tasync ping(timeoutMs?: number): Promise<void> {\n\t\tthis.assertReady();\n\t\tawait this.request(\"ping\", {}, timeoutMs);\n\t}\n\n\t/** List the server's tools. Requires a completed handshake. */\n\tasync listTools(): Promise<McpToolSchema[]> {\n\t\tthis.assertReady();\n\t\tconst tools: McpToolSchema[] = [];\n\t\tlet cursor: string | undefined;\n\t\tdo {\n\t\t\tconst result = await this.request(\"tools/list\", cursor ? { cursor } : {});\n\t\t\tif (!isRecord(result) || !Array.isArray(result.tools)) return tools;\n\t\t\tfor (const raw of result.tools) {\n\t\t\t\tif (!isRecord(raw) || typeof raw.name !== \"string\" || raw.name.length === 0) continue;\n\t\t\t\ttools.push({\n\t\t\t\t\tname: raw.name,\n\t\t\t\t\tdescription: typeof raw.description === \"string\" ? raw.description : undefined,\n\t\t\t\t\ttitle: typeof raw.title === \"string\" ? raw.title : undefined,\n\t\t\t\t\tinputSchema: isRecord(raw.inputSchema) ? raw.inputSchema : undefined,\n\t\t\t\t});\n\t\t\t}\n\t\t\tcursor = typeof result.nextCursor === \"string\" && result.nextCursor.length > 0 ? result.nextCursor : undefined;\n\t\t} while (cursor);\n\t\treturn tools;\n\t}\n\n\t/**\n\t * Invoke a tool. A protocol-level failure rejects; a tool-level failure\n\t * resolves with `isError: true`, matching MCP semantics so the model sees\n\t * the server's own error text instead of a harness exception.\n\t */\n\tasync callTool(name: string, args: unknown, timeoutMs?: number): Promise<McpToolCallResult> {\n\t\tthis.assertReady();\n\t\tconst result = await this.request(\"tools/call\", { name, arguments: args ?? {} }, timeoutMs);\n\t\tif (!isRecord(result)) return { content: [], isError: false };\n\t\tconst content = Array.isArray(result.content) ? (result.content as McpContentBlock[]) : [];\n\t\treturn {\n\t\t\tcontent,\n\t\t\tisError: result.isError === true,\n\t\t\tstructuredContent: result.structuredContent,\n\t\t};\n\t}\n\n\t/** Terminate the server and reject anything still in flight. */\n\tclose(): void {\n\t\tif (this.closed) return;\n\t\tthis.transport.close();\n\t\tthis.handleExit(null, null);\n\t}\n\n\tprivate assertReady(): void {\n\t\tif (this.closed) throw new Error(this.exitReason ?? `MCP server \"${this.options.name}\" is closed`);\n\t\tif (!this.initialized) throw new Error(`MCP server \"${this.options.name}\" is not initialized`);\n\t}\n\n\tprivate request(method: string, params: unknown, timeoutMs?: number): Promise<unknown> {\n\t\tif (this.closed) {\n\t\t\treturn Promise.reject(new Error(this.exitReason ?? `MCP server \"${this.options.name}\" is closed`));\n\t\t}\n\t\tconst id = this.nextId++;\n\t\tconst effectiveTimeout = timeoutMs ?? this.requestTimeoutMs;\n\t\treturn new Promise<unknown>((resolve, reject) => {\n\t\t\tconst timer = setTimeout(() => {\n\t\t\t\tthis.pending.delete(id);\n\t\t\t\treject(new Error(`MCP server \"${this.options.name}\" timed out after ${effectiveTimeout}ms on ${method}`));\n\t\t\t}, effectiveTimeout);\n\t\t\ttimer.unref?.();\n\t\t\tthis.pending.set(id, { resolve, reject, timer, method });\n\n\t\t\tconst sent = this.transport.send({ jsonrpc: \"2.0\", id, method, params });\n\t\t\tif (!sent) {\n\t\t\t\tthis.pending.delete(id);\n\t\t\t\tclearTimeout(timer);\n\t\t\t\treject(new Error(`MCP server \"${this.options.name}\" is not writable (${method})`));\n\t\t\t}\n\t\t});\n\t}\n\n\tprivate handleMessage(message: JsonRpcMessage): void {\n\t\tif (!isJsonRpcResponse(message)) return; // Server-initiated requests/notifications are not used yet.\n\t\tconst response: JsonRpcResponse = message;\n\t\tconst pending = this.pending.get(response.id);\n\t\tif (!pending) return;\n\t\tthis.pending.delete(response.id);\n\t\tclearTimeout(pending.timer);\n\t\tif (response.error) {\n\t\t\tpending.reject(new Error(`MCP server \"${this.options.name}\": ${formatJsonRpcError(response.error)}`));\n\t\t\treturn;\n\t\t}\n\t\tpending.resolve(response.result);\n\t}\n\n\tprivate handleExit(code: number | null, signal: string | null): void {\n\t\tif (this.closed) return;\n\t\tthis.closed = true;\n\t\tthis.initialized = false;\n\t\tconst detail = signal ? `signal ${signal}` : code === null ? \"spawn failure\" : `exit code ${code}`;\n\t\tconst stderr = this.transport.stderr.trim();\n\t\tthis.exitReason = `MCP server \"${this.options.name}\" stopped (${detail})${stderr ? `: ${stderr}` : \"\"}`;\n\t\tconst reason = new Error(this.exitReason);\n\t\tfor (const [id, pending] of this.pending) {\n\t\t\tclearTimeout(pending.timer);\n\t\t\tthis.pending.delete(id);\n\t\t\tpending.reject(reason);\n\t\t}\n\t}\n}\n"]}
+{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/core/mcp/client.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Minimal MCP client: initialize handshake, `tools/list`, `tools/call`.\n *\n * Deliberately dependency-free. The upstream SDK carries a full server\n * implementation, resource/prompt/sampling surfaces, and its own transport\n * stack; OMK needs a client for three methods, so the client is ~200 lines of\n * request correlation over a transport this repo already owns.\n *\n * Fail-closed contract:\n * - Every request has a deadline. A hung server rejects, it does not stall a turn.\n * - A transport exit rejects every in-flight request with the server's stderr tail.\n * - Calling before a completed handshake throws instead of guessing.\n */\n\nimport {\n\tformatJsonRpcError,\n\tisJsonRpcResponse,\n\ttype JsonRpcId,\n\ttype JsonRpcMessage,\n\ttype JsonRpcResponse,\n} from \"./protocol.ts\";\nimport { McpStdioTransport, type StdioTransportOptions } from \"./stdio-transport.ts\";\n\n/** Protocol revision this client implements. */\nexport const MCP_PROTOCOL_VERSION = \"2025-06-18\";\n/**\n * Protocol revisions this client accepts from a server. The handshake fails\n * closed on any other value instead of guessing at forward compatibility.\n */\nexport const SUPPORTED_PROTOCOL_VERSIONS: readonly string[] = [\"2024-11-05\", MCP_PROTOCOL_VERSION];\n/** Default per-request deadline. */\nexport const DEFAULT_REQUEST_TIMEOUT_MS = 30_000;\n/** Default handshake deadline. Servers that install on first run need more room than a normal call. */\nexport const DEFAULT_HANDSHAKE_TIMEOUT_MS = 60_000;\n/** Page ceiling for `tools/list` so a looping cursor cannot stall a session forever. */\nexport const MAX_LIST_PAGES = 128;\n/** Tool ceiling across all `tools/list` pages for one server. */\nexport const MAX_LIST_TOOLS = 4096;\n/** Overall `tools/list` deadline; per-request timeouts do not bound the total. */\nexport const LIST_TOOLS_TIMEOUT_MS = 120_000;\n/** In-flight request ceiling per server. */\nexport const MAX_PENDING_REQUESTS = 128;\n\nexport interface McpToolSchema {\n\treadonly name: string;\n\treadonly description?: string;\n\treadonly inputSchema?: Record<string, unknown>;\n\treadonly title?: string;\n}\n\nexport interface McpTextBlock {\n\treadonly type: \"text\";\n\treadonly text: string;\n}\n\nexport type McpContentBlock =\n\t| McpTextBlock\n\t| { readonly type: \"image\"; readonly data: string; readonly mimeType: string }\n\t| { readonly type: string; readonly [key: string]: unknown };\n\nexport interface McpToolCallResult {\n\treadonly content: readonly McpContentBlock[];\n\treadonly isError: boolean;\n\treadonly structuredContent?: unknown;\n}\n\nexport interface McpServerInfo {\n\treadonly name?: string;\n\treadonly version?: string;\n}\n\nexport interface McpClientOptions {\n\t/** Server label used in error messages. */\n\treadonly name: string;\n\treadonly transport: StdioTransportOptions;\n\treadonly requestTimeoutMs?: number;\n\treadonly handshakeTimeoutMs?: number;\n\t/** Client identity reported during the handshake. */\n\treadonly clientInfo?: { readonly name: string; readonly version: string };\n}\n\ninterface PendingRequest {\n\treadonly resolve: (result: unknown) => void;\n\treadonly reject: (error: Error) => void;\n\treadonly timer: ReturnType<typeof setTimeout>;\n\treadonly method: string;\n}\n\nfunction isRecord(value: unknown): value is Record<string, unknown> {\n\treturn typeof value === \"object\" && value !== null && !Array.isArray(value);\n}\n\nexport class McpClient {\n\tprivate readonly transport: McpStdioTransport;\n\tprivate readonly pending = new Map<JsonRpcId, PendingRequest>();\n\tprivate readonly requestTimeoutMs: number;\n\tprivate readonly handshakeTimeoutMs: number;\n\tprivate nextId = 1;\n\tprivate initialized = false;\n\tprivate closed = false;\n\tprivate exitReason: string | undefined;\n\tprivate info: McpServerInfo = {};\n\tprivate lastProtocolErrorReason: string | undefined;\n\tprivate readonly options: McpClientOptions;\n\n\tconstructor(options: McpClientOptions) {\n\t\tthis.options = options;\n\t\tthis.requestTimeoutMs = options.requestTimeoutMs ?? DEFAULT_REQUEST_TIMEOUT_MS;\n\t\tthis.handshakeTimeoutMs = options.handshakeTimeoutMs ?? DEFAULT_HANDSHAKE_TIMEOUT_MS;\n\t\tthis.transport = new McpStdioTransport(options.transport, {\n\t\t\tonMessage: (message) => this.handleMessage(message),\n\t\t\tonDecodeError: (reason) => {\n\t\t\t\tthis.lastProtocolErrorReason = reason;\n\t\t\t},\n\t\t\tonExit: ({ code, signal }) => this.handleExit(code, signal),\n\t\t});\n\t}\n\n\tget name(): string {\n\t\treturn this.options.name;\n\t}\n\n\tget serverInfo(): McpServerInfo {\n\t\treturn this.info;\n\t}\n\n\tget ready(): boolean {\n\t\treturn this.initialized && !this.closed;\n\t}\n\n\t/**\n\t * Spawn the server and complete the MCP handshake. Safe to await once; a\n\t * second call after a failure re-throws the recorded reason rather than\n\t * silently reusing a dead process.\n\t */\n\tasync connect(): Promise<void> {\n\t\tif (this.closed) throw new Error(this.exitReason ?? `MCP server \"${this.options.name}\" is closed`);\n\t\tif (this.initialized) return;\n\t\tthis.transport.start();\n\n\t\tconst result = await this.request(\n\t\t\t\"initialize\",\n\t\t\t{\n\t\t\t\tprotocolVersion: MCP_PROTOCOL_VERSION,\n\t\t\t\tcapabilities: {},\n\t\t\t\tclientInfo: this.options.clientInfo ?? { name: \"omk\", version: \"0.0.0\" },\n\t\t\t},\n\t\t\tthis.handshakeTimeoutMs,\n\t\t);\n\t\tthis.assertInitializeResult(result);\n\t\tthis.initialized = true;\n\t\tthis.transport.send({ jsonrpc: \"2.0\", method: \"notifications/initialized\" });\n\t}\n\n\t// The handshake is a negotiation, not a formality: reject a response that\n\t// does not carry a protocol version this client actually supports.\n\tprivate assertInitializeResult(result: unknown): void {\n\t\tif (!isRecord(result) || typeof result.protocolVersion !== \"string\") {\n\t\t\tthrow new Error(\n\t\t\t\t`MCP server \"${this.options.name}\" returned an invalid initialize result (missing protocolVersion)`,\n\t\t\t);\n\t\t}\n\t\tif (!SUPPORTED_PROTOCOL_VERSIONS.includes(result.protocolVersion)) {\n\t\t\tthrow new Error(\n\t\t\t\t`MCP server \"${this.options.name}\" requested unsupported protocol version \"${result.protocolVersion}\"`,\n\t\t\t);\n\t\t}\n\t\tif (isRecord(result.serverInfo)) {\n\t\t\tconst { name, version } = result.serverInfo;\n\t\t\tthis.info = {\n\t\t\t\tname: typeof name === \"string\" ? name : undefined,\n\t\t\t\tversion: typeof version === \"string\" ? version : undefined,\n\t\t\t};\n\t\t}\n\t}\n\n\t/**\n\t * Protocol-level liveness probe. Rejects when the server is closed, dead,\n\t * or fails to answer within `timeoutMs`, so callers can tell a silently\n\t * killed process apart from a genuinely connected one.\n\t */\n\tasync ping(timeoutMs?: number): Promise<void> {\n\t\tthis.assertReady();\n\t\tawait this.request(\"ping\", {}, timeoutMs);\n\t}\n\n\t/**\n\t * List the server's tools. Requires a completed handshake.\n\t *\n\t * Pagination is bounded three ways — an overall deadline, a page count, and\n\t * a tool count — and a repeated cursor is a protocol error, so a misbehaving\n\t * server cannot keep the listing loop alive indefinitely. Duplicate tool\n\t * names in one listing are rejected instead of silently overwritten.\n\t */\n\tasync listTools(): Promise<McpToolSchema[]> {\n\t\tthis.assertReady();\n\t\tconst tools: McpToolSchema[] = [];\n\t\tconst seenNames = new Set<string>();\n\t\tconst seenCursors = new Set<string>();\n\t\tconst deadline = Date.now() + LIST_TOOLS_TIMEOUT_MS;\n\t\tlet cursor: string | undefined;\n\t\tconst fail = (what: string): never => {\n\t\t\tthrow new Error(`MCP server \"${this.options.name}\" ${what}`);\n\t\t};\n\t\tfor (let page = 0; page < MAX_LIST_PAGES; page++) {\n\t\t\tconst remainingMs = deadline - Date.now();\n\t\t\tif (remainingMs <= 0) fail(`tools/list exceeded ${LIST_TOOLS_TIMEOUT_MS}ms`);\n\t\t\tconst result = await this.request(\n\t\t\t\t\"tools/list\",\n\t\t\t\tcursor ? { cursor } : {},\n\t\t\t\tMath.min(remainingMs, this.requestTimeoutMs),\n\t\t\t);\n\t\t\tconst record = isRecord(result) ? result : fail(\"returned an invalid tools/list result\");\n\t\t\tconst rawTools = Array.isArray(record.tools) ? record.tools : fail(\"returned an invalid tools/list result\");\n\t\t\tfor (const raw of rawTools) {\n\t\t\t\tif (!isRecord(raw) || typeof raw.name !== \"string\" || raw.name.length === 0) continue;\n\t\t\t\tif (seenNames.has(raw.name)) fail(`listed duplicate tool \"${raw.name}\"`);\n\t\t\t\tseenNames.add(raw.name);\n\t\t\t\ttools.push({\n\t\t\t\t\tname: raw.name,\n\t\t\t\t\tdescription: typeof raw.description === \"string\" ? raw.description : undefined,\n\t\t\t\t\ttitle: typeof raw.title === \"string\" ? raw.title : undefined,\n\t\t\t\t\tinputSchema: isRecord(raw.inputSchema) ? raw.inputSchema : undefined,\n\t\t\t\t});\n\t\t\t\tif (tools.length > MAX_LIST_TOOLS) fail(`exceeded ${MAX_LIST_TOOLS} tools`);\n\t\t\t}\n\t\t\tconst next =\n\t\t\t\ttypeof record.nextCursor === \"string\" && record.nextCursor.length > 0 ? record.nextCursor : undefined;\n\t\t\tif (!next) return tools;\n\t\t\tif (seenCursors.has(next)) fail(\"repeated tools/list cursor\");\n\t\t\tseenCursors.add(next);\n\t\t\tcursor = next;\n\t\t}\n\t\treturn fail(`exceeded ${MAX_LIST_PAGES} tools/list pages`);\n\t}\n\n\t/**\n\t * Invoke a tool. A protocol-level failure rejects; a tool-level failure\n\t * resolves with `isError: true`, matching MCP semantics so the model sees\n\t * the server's own error text instead of a harness exception.\n\t */\n\tasync callTool(name: string, args: unknown, timeoutMs?: number): Promise<McpToolCallResult> {\n\t\tthis.assertReady();\n\t\tconst result = await this.request(\"tools/call\", { name, arguments: args ?? {} }, timeoutMs);\n\t\t// A non-object result is a protocol violation, not an empty success —\n\t\t// normalizing it would hide a broken server from the caller.\n\t\tif (!isRecord(result)) {\n\t\t\tthrow new Error(`MCP server \"${this.options.name}\" returned an invalid tools/call result`);\n\t\t}\n\t\tconst content = Array.isArray(result.content) ? (result.content as McpContentBlock[]) : [];\n\t\treturn {\n\t\t\tcontent,\n\t\t\tisError: result.isError === true,\n\t\t\tstructuredContent: result.structuredContent,\n\t\t};\n\t}\n\n\t/** Terminate the server and reject anything still in flight. */\n\tclose(): void {\n\t\tif (this.closed) return;\n\t\tthis.transport.close();\n\t\tthis.handleExit(null, null);\n\t}\n\n\t/** Why the server is unusable, when it is; includes the latest decode failure. */\n\tget failure(): string | undefined {\n\t\treturn this.exitReason ?? this.lastProtocolErrorReason;\n\t}\n\n\tprivate assertReady(): void {\n\t\tif (this.closed) throw new Error(this.exitReason ?? `MCP server \"${this.options.name}\" is closed`);\n\t\tif (!this.initialized) throw new Error(`MCP server \"${this.options.name}\" is not initialized`);\n\t}\n\n\tprivate request(method: string, params: unknown, timeoutMs?: number): Promise<unknown> {\n\t\tif (this.closed) {\n\t\t\treturn Promise.reject(new Error(this.exitReason ?? `MCP server \"${this.options.name}\" is closed`));\n\t\t}\n\t\tif (this.pending.size >= MAX_PENDING_REQUESTS) {\n\t\t\treturn Promise.reject(\n\t\t\t\tnew Error(`MCP server \"${this.options.name}\" has ${MAX_PENDING_REQUESTS} pending requests (${method})`),\n\t\t\t);\n\t\t}\n\t\tconst id = this.nextId++;\n\t\tconst effectiveTimeout = timeoutMs ?? this.requestTimeoutMs;\n\t\treturn new Promise<unknown>((resolve, reject) => {\n\t\t\tconst timer = setTimeout(() => {\n\t\t\t\tthis.pending.delete(id);\n\t\t\t\treject(new Error(`MCP server \"${this.options.name}\" timed out after ${effectiveTimeout}ms on ${method}`));\n\t\t\t}, effectiveTimeout);\n\t\t\ttimer.unref?.();\n\t\t\tthis.pending.set(id, { resolve, reject, timer, method });\n\t\t\tif (!this.transport.send({ jsonrpc: \"2.0\", id, method, params })) {\n\t\t\t\tthis.pending.delete(id);\n\t\t\t\tclearTimeout(timer);\n\t\t\t\treject(new Error(`MCP server \"${this.options.name}\" is not writable (${method})`));\n\t\t\t}\n\t\t});\n\t}\n\n\tprivate handleMessage(message: JsonRpcMessage): void {\n\t\tif (!isJsonRpcResponse(message)) return; // Server-initiated requests/notifications are not used yet.\n\t\tconst response: JsonRpcResponse = message;\n\t\tconst pending = this.pending.get(response.id);\n\t\tif (!pending) return;\n\t\tthis.pending.delete(response.id);\n\t\tclearTimeout(pending.timer);\n\t\tif (response.error) {\n\t\t\tpending.reject(new Error(`MCP server \"${this.options.name}\": ${formatJsonRpcError(response.error)}`));\n\t\t\treturn;\n\t\t}\n\t\tpending.resolve(response.result);\n\t}\n\n\tprivate handleExit(code: number | null, signal: string | null): void {\n\t\tif (this.closed) return;\n\t\tthis.closed = true;\n\t\tthis.initialized = false;\n\t\tconst detail = signal ? `signal ${signal}` : code === null ? \"spawn failure\" : `exit code ${code}`;\n\t\tconst stderr = this.transport.stderr.trim();\n\t\tthis.exitReason = `MCP server \"${this.options.name}\" stopped (${detail})${stderr ? `: ${stderr}` : \"\"}`;\n\t\tconst reason = new Error(this.exitReason);\n\t\tfor (const [id, pending] of this.pending) {\n\t\t\tclearTimeout(pending.timer);\n\t\t\tthis.pending.delete(id);\n\t\t\tpending.reject(reason);\n\t\t}\n\t}\n}\n"]}

package/dist/core/mcp/manager.d.ts

@@ -34,6 +34,8 @@ export interface McpServerStatus {
     /** Failure reason when `state` is `failed`. Never contains configured env values. */
     readonly error?: string;
     readonly serverVersion?: string;
+    /** Tool names excluded because their descriptions carried prompt-injection payloads. */
+    readonly quarantinedTools?: readonly string[];
 }
 export interface McpManagerOptions {
     readonly servers: readonly McpServerConfig[];
@@ -62,7 +64,14 @@ export declare class McpManager {
     listToolDefinitions(): Promise<ToolDefinition<TSchema, McpToolDetails>[]>;
     /** Connect a single server by name. Returns its status either way. */
     connect(name: string): Promise<McpServerStatus>;
-    /** Terminate every connected server. Idempotent. */
+    /**
+     * Terminate every connected or connecting server. Idempotent.
+     *
+     * Bumping the generation invalidates any in-flight connect before its late
+     * completion can publish tools or flip the state back to `ready`, and the
+     * attempt's not-yet-published client is closed alongside the live one so no
+     * spawned process outlives the close.
+     */
     close(): void;
     /**
      * Verify that `ready` servers are actually alive with a protocol ping. A

package/dist/core/mcp/manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../../../src/core/mcp/manager.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,EAAE,SAAS,EAAE,KAAK,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/D,OAAO,EAA2B,KAAK,cAAc,EAAE,MAAM,YAAY,CAAC;AAE1E,MAAM,MAAM,cAAc,GAAG,MAAM,GAAG,YAAY,GAAG,OAAO,GAAG,QAAQ,CAAC;AAExE,MAAM,WAAW,eAAe;IAC/B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,IAAI,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAClC,QAAQ,CAAC,GAAG,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAChD,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IACtB,+DAA+D;IAC/D,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IACnC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,MAAM,CAAC;CACrC;AAED,MAAM,WAAW,eAAe;IAC/B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,KAAK,EAAE,cAAc,CAAC;IAC/B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,qFAAqF;IACrF,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC;CAChC;AAED,MAAM,WAAW,iBAAiB;IACjC,QAAQ,CAAC,OAAO,EAAE,SAAS,eAAe,EAAE,CAAC;IAC7C,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,UAAU,CAAC,EAAE;QAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IAC1E,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC;IAChC,qFAAqF;IACrF,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,gBAAgB,KAAK,SAAS,CAAC;CACjE;AAWD,qBAAa,UAAU;IACtB,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAoC;IAC7D,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAoB;IAE5C,YAAY,OAAO,EAAE,iBAAiB,EAMrC;IAED,uDAAuD;IACvD,IAAI,WAAW,IAAI,MAAM,EAAE,CAE1B;IAED,6EAA6E;IAC7E,MAAM,IAAI,eAAe,EAAE,CAQ1B;IAED;;;;OAIG;IACG,mBAAmB,IAAI,OAAO,CAAC,cAAc,CAAC,OAAO,EAAE,cAAc,CAAC,EAAE,CAAC,CAY9E;IAED,sEAAsE;IAChE,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CAapD;IAED,oDAAoD;IACpD,KAAK,IAAI,IAAI,CAOZ;IAED;;;;;;;;OAQG;IACG,WAAW,CAAC,OAAO,CAAC,EAAE;QAAE,aAAa,CAAC,EAAE,MAAM,CAAC;QAAC,eAAe,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC,CAa7G;YAEa,WAAW;IAazB,OAAO,CAAC,eAAe;YAiBT,cAAc;CAkC5B","sourcesContent":["/**\n * Lazy, crash-isolated MCP server manager.\n *\n * Design constraints that shaped this:\n * - A workspace can configure 25 servers. Spawning them all at startup would\n *   trade a 0.6s cold start for a multi-second one, so connection is lazy and\n *   only happens when tools are actually requested.\n * - One broken server must never take a session down. Every connect and every\n *   listing is isolated; a failure is recorded as server status and the other\n *   servers still contribute tools.\n * - Connect work is deduplicated: concurrent `listToolDefinitions()` calls\n *   share one in-flight connect per server.\n */\n\nimport type { TSchema } from \"typebox\";\nimport type { ToolDefinition } from \"../extensions/types.ts\";\nimport { McpClient, type McpClientOptions } from \"./client.ts\";\nimport { createMcpToolDefinition, type McpToolDetails } from \"./tools.ts\";\n\nexport type McpServerState = \"idle\" | \"connecting\" | \"ready\" | \"failed\";\n\nexport interface McpServerConfig {\n\treadonly name: string;\n\treadonly command: string;\n\treadonly args?: readonly string[];\n\treadonly env?: Readonly<Record<string, string>>;\n\treadonly cwd?: string;\n\t/** Skip this server without removing it from configuration. */\n\treadonly disabled?: boolean;\n\treadonly requestTimeoutMs?: number;\n\treadonly handshakeTimeoutMs?: number;\n}\n\nexport interface McpServerStatus {\n\treadonly name: string;\n\treadonly state: McpServerState;\n\treadonly toolCount: number;\n\t/** Failure reason when `state` is `failed`. Never contains configured env values. */\n\treadonly error?: string;\n\treadonly serverVersion?: string;\n}\n\nexport interface McpManagerOptions {\n\treadonly servers: readonly McpServerConfig[];\n\treadonly cwd?: string;\n\treadonly clientInfo?: { readonly name: string; readonly version: string };\n\treadonly callTimeoutMs?: number;\n\t/** Injected for tests so the manager can be exercised without spawning processes. */\n\treadonly createClient?: (options: McpClientOptions) => McpClient;\n}\n\ninterface ServerRuntime {\n\treadonly config: McpServerConfig;\n\tstate: McpServerState;\n\tclient?: McpClient;\n\ttools: ToolDefinition<TSchema, McpToolDetails>[];\n\terror?: string;\n\tconnecting?: Promise<void>;\n}\n\nexport class McpManager {\n\tprivate readonly runtimes = new Map<string, ServerRuntime>();\n\tprivate readonly options: McpManagerOptions;\n\n\tconstructor(options: McpManagerOptions) {\n\t\tthis.options = options;\n\t\tfor (const config of options.servers) {\n\t\t\tif (this.runtimes.has(config.name)) continue; // First definition wins; inventory already applies precedence.\n\t\t\tthis.runtimes.set(config.name, { config, state: \"idle\", tools: [] });\n\t\t}\n\t}\n\n\t/** Configured server names, in configuration order. */\n\tget serverNames(): string[] {\n\t\treturn [...this.runtimes.keys()];\n\t}\n\n\t/** Current status per server. Safe to call before any connection attempt. */\n\tstatus(): McpServerStatus[] {\n\t\treturn [...this.runtimes.values()].map((runtime) => ({\n\t\t\tname: runtime.config.name,\n\t\t\tstate: runtime.state,\n\t\t\ttoolCount: runtime.tools.length,\n\t\t\terror: runtime.error,\n\t\t\tserverVersion: runtime.client?.serverInfo.version,\n\t\t}));\n\t}\n\n\t/**\n\t * Connect every enabled server that has not been attempted yet, then return\n\t * the union of their tools. Servers are connected concurrently and failures\n\t * are isolated, so a partial result is the normal outcome, not an error.\n\t */\n\tasync listToolDefinitions(): Promise<ToolDefinition<TSchema, McpToolDetails>[]> {\n\t\tawait Promise.all([...this.runtimes.values()].map((runtime) => this.ensureConnected(runtime)));\n\t\tconst tools: ToolDefinition<TSchema, McpToolDetails>[] = [];\n\t\tconst seen = new Set<string>();\n\t\tfor (const runtime of this.runtimes.values()) {\n\t\t\tfor (const tool of runtime.tools) {\n\t\t\t\tif (seen.has(tool.name)) continue; // Namespacing makes this rare; keep it deterministic anyway.\n\t\t\t\tseen.add(tool.name);\n\t\t\t\ttools.push(tool);\n\t\t\t}\n\t\t}\n\t\treturn tools;\n\t}\n\n\t/** Connect a single server by name. Returns its status either way. */\n\tasync connect(name: string): Promise<McpServerStatus> {\n\t\tconst runtime = this.runtimes.get(name);\n\t\tif (!runtime) {\n\t\t\treturn { name, state: \"failed\", toolCount: 0, error: `Unknown MCP server \"${name}\"` };\n\t\t}\n\t\tawait this.ensureConnected(runtime);\n\t\treturn {\n\t\t\tname,\n\t\t\tstate: runtime.state,\n\t\t\ttoolCount: runtime.tools.length,\n\t\t\terror: runtime.error,\n\t\t\tserverVersion: runtime.client?.serverInfo.version,\n\t\t};\n\t}\n\n\t/** Terminate every connected server. Idempotent. */\n\tclose(): void {\n\t\tfor (const runtime of this.runtimes.values()) {\n\t\t\truntime.client?.close();\n\t\t\truntime.client = undefined;\n\t\t\truntime.tools = [];\n\t\t\tif (runtime.state === \"ready\" || runtime.state === \"connecting\") runtime.state = \"idle\";\n\t\t}\n\t}\n\n\t/**\n\t * Verify that `ready` servers are actually alive with a protocol ping. A\n\t * failed ping closes the client and marks the server `failed`, so a\n\t * silently killed process stops masquerading as connected. Servers already\n\t * `failed` are re-attempted only when `reconnectFailed` is set — callers\n\t * should gate that behind a slow cadence so a permanently broken server is\n\t * not respawned every probe. Idle servers stay idle: connection is lazy by\n\t * design, and a status probe must not spawn processes.\n\t */\n\tasync checkHealth(options?: { pingTimeoutMs?: number; reconnectFailed?: boolean }): Promise<McpServerStatus[]> {\n\t\tconst work: Promise<void>[] = [];\n\t\tfor (const runtime of this.runtimes.values()) {\n\t\t\tif (runtime.state === \"ready\" && runtime.client) {\n\t\t\t\twork.push(this.pingRuntime(runtime, options?.pingTimeoutMs));\n\t\t\t} else if (runtime.state === \"failed\" && options?.reconnectFailed && !runtime.config.disabled) {\n\t\t\t\truntime.state = \"idle\";\n\t\t\t\truntime.error = undefined;\n\t\t\t\twork.push(this.ensureConnected(runtime));\n\t\t\t}\n\t\t}\n\t\tawait Promise.all(work);\n\t\treturn this.status();\n\t}\n\n\tprivate async pingRuntime(runtime: ServerRuntime, timeoutMs?: number): Promise<void> {\n\t\ttry {\n\t\t\tawait runtime.client?.ping(timeoutMs);\n\t\t} catch (error) {\n\t\t\t// Isolation point: only this server transitions; the rest stay ready.\n\t\t\truntime.client?.close();\n\t\t\truntime.client = undefined;\n\t\t\truntime.tools = [];\n\t\t\truntime.state = \"failed\";\n\t\t\truntime.error = `health check failed: ${error instanceof Error ? error.message : String(error)}`;\n\t\t}\n\t}\n\n\tprivate ensureConnected(runtime: ServerRuntime): Promise<void> {\n\t\tif (runtime.config.disabled) {\n\t\t\truntime.state = \"failed\";\n\t\t\truntime.error = \"disabled by configuration\";\n\t\t\treturn Promise.resolve();\n\t\t}\n\t\tif (runtime.state === \"ready\" || runtime.state === \"failed\") return Promise.resolve();\n\t\tif (runtime.connecting) return runtime.connecting;\n\n\t\truntime.state = \"connecting\";\n\t\tconst attempt = this.connectRuntime(runtime).finally(() => {\n\t\t\truntime.connecting = undefined;\n\t\t});\n\t\truntime.connecting = attempt;\n\t\treturn attempt;\n\t}\n\n\tprivate async connectRuntime(runtime: ServerRuntime): Promise<void> {\n\t\tconst clientOptions: McpClientOptions = {\n\t\t\tname: runtime.config.name,\n\t\t\tclientInfo: this.options.clientInfo,\n\t\t\trequestTimeoutMs: runtime.config.requestTimeoutMs,\n\t\t\thandshakeTimeoutMs: runtime.config.handshakeTimeoutMs,\n\t\t\ttransport: {\n\t\t\t\tcommand: runtime.config.command,\n\t\t\t\targs: runtime.config.args,\n\t\t\t\tenv: runtime.config.env,\n\t\t\t\tcwd: runtime.config.cwd ?? this.options.cwd,\n\t\t\t},\n\t\t};\n\t\tconst client = this.options.createClient?.(clientOptions) ?? new McpClient(clientOptions);\n\t\ttry {\n\t\t\tawait client.connect();\n\t\t\tconst schemas = await client.listTools();\n\t\t\truntime.client = client;\n\t\t\truntime.tools = schemas.map((schema) =>\n\t\t\t\tcreateMcpToolDefinition(runtime.config.name, client, schema, {\n\t\t\t\t\tcallTimeoutMs: this.options.callTimeoutMs,\n\t\t\t\t}),\n\t\t\t);\n\t\t\truntime.state = \"ready\";\n\t\t\truntime.error = undefined;\n\t\t} catch (error) {\n\t\t\t// Isolation point: this server is out, every other server is unaffected.\n\t\t\tclient.close();\n\t\t\truntime.client = undefined;\n\t\t\truntime.tools = [];\n\t\t\truntime.state = \"failed\";\n\t\t\truntime.error = error instanceof Error ? error.message : String(error);\n\t\t}\n\t}\n}\n"]}
+{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../../../src/core/mcp/manager.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAE7D,OAAO,EAAE,SAAS,EAAE,KAAK,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/D,OAAO,EAA2B,KAAK,cAAc,EAAE,MAAM,YAAY,CAAC;AAE1E,MAAM,MAAM,cAAc,GAAG,MAAM,GAAG,YAAY,GAAG,OAAO,GAAG,QAAQ,CAAC;AAExE,MAAM,WAAW,eAAe;IAC/B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,IAAI,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAClC,QAAQ,CAAC,GAAG,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAChD,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IACtB,+DAA+D;IAC/D,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IACnC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,MAAM,CAAC;CACrC;AAED,MAAM,WAAW,eAAe;IAC/B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,KAAK,EAAE,cAAc,CAAC;IAC/B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,qFAAqF;IACrF,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC;IAChC,wFAAwF;IACxF,QAAQ,CAAC,gBAAgB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;CAC9C;AAED,MAAM,WAAW,iBAAiB;IACjC,QAAQ,CAAC,OAAO,EAAE,SAAS,eAAe,EAAE,CAAC;IAC7C,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,UAAU,CAAC,EAAE;QAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IAC1E,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC;IAChC,qFAAqF;IACrF,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,gBAAgB,KAAK,SAAS,CAAC;CACjE;AAiBD,qBAAa,UAAU;IACtB,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAoC;IAC7D,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAoB;IAE5C,YAAY,OAAO,EAAE,iBAAiB,EAMrC;IAED,uDAAuD;IACvD,IAAI,WAAW,IAAI,MAAM,EAAE,CAE1B;IAED,6EAA6E;IAC7E,MAAM,IAAI,eAAe,EAAE,CAS1B;IAED;;;;OAIG;IACG,mBAAmB,IAAI,OAAO,CAAC,cAAc,CAAC,OAAO,EAAE,cAAc,CAAC,EAAE,CAAC,CAY9E;IAED,sEAAsE;IAChE,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CAcpD;IAED;;;;;;;OAOG;IACH,KAAK,IAAI,IAAI,CAWZ;IAED;;;;;;;;OAQG;IACG,WAAW,CAAC,OAAO,CAAC,EAAE;QAAE,aAAa,CAAC,EAAE,MAAM,CAAC;QAAC,eAAe,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC,CAa7G;YAEa,WAAW;IAmBzB,OAAO,CAAC,eAAe;YAqBT,cAAc;CAiE5B","sourcesContent":["/**\n * Lazy, crash-isolated MCP server manager.\n *\n * Design constraints that shaped this:\n * - A workspace can configure 25 servers. Spawning them all at startup would\n *   trade a 0.6s cold start for a multi-second one, so connection is lazy and\n *   only happens when tools are actually requested.\n * - One broken server must never take a session down. Every connect and every\n *   listing is isolated; a failure is recorded as server status and the other\n *   servers still contribute tools.\n * - Connect work is deduplicated: concurrent `listToolDefinitions()` calls\n *   share one in-flight connect per server.\n */\n\nimport type { TSchema } from \"typebox\";\nimport type { ToolDefinition } from \"../extensions/types.ts\";\nimport { detectMcpDescriptorPromptInjection, MCP_QUARANTINE_PATTERN_SIGNAL_THRESHOLD } from \"../mcp-public-presets.ts\";\nimport { McpClient, type McpClientOptions } from \"./client.ts\";\nimport { createMcpToolDefinition, type McpToolDetails } from \"./tools.ts\";\n\nexport type McpServerState = \"idle\" | \"connecting\" | \"ready\" | \"failed\";\n\nexport interface McpServerConfig {\n\treadonly name: string;\n\treadonly command: string;\n\treadonly args?: readonly string[];\n\treadonly env?: Readonly<Record<string, string>>;\n\treadonly cwd?: string;\n\t/** Skip this server without removing it from configuration. */\n\treadonly disabled?: boolean;\n\treadonly requestTimeoutMs?: number;\n\treadonly handshakeTimeoutMs?: number;\n}\n\nexport interface McpServerStatus {\n\treadonly name: string;\n\treadonly state: McpServerState;\n\treadonly toolCount: number;\n\t/** Failure reason when `state` is `failed`. Never contains configured env values. */\n\treadonly error?: string;\n\treadonly serverVersion?: string;\n\t/** Tool names excluded because their descriptions carried prompt-injection payloads. */\n\treadonly quarantinedTools?: readonly string[];\n}\n\nexport interface McpManagerOptions {\n\treadonly servers: readonly McpServerConfig[];\n\treadonly cwd?: string;\n\treadonly clientInfo?: { readonly name: string; readonly version: string };\n\treadonly callTimeoutMs?: number;\n\t/** Injected for tests so the manager can be exercised without spawning processes. */\n\treadonly createClient?: (options: McpClientOptions) => McpClient;\n}\n\ninterface ServerRuntime {\n\treadonly config: McpServerConfig;\n\tstate: McpServerState;\n\tclient?: McpClient;\n\ttools: ToolDefinition<TSchema, McpToolDetails>[];\n\t/** Descriptor prompt-injection quarantines (namespaced tool names). */\n\tquarantinedTools: string[];\n\terror?: string;\n\tconnecting?: Promise<void>;\n\t/** Client owned by the in-flight connect attempt; not yet published. */\n\tpendingClient?: McpClient;\n\t/** Monotonic generation; a completed attempt may only publish when current. */\n\tgeneration: number;\n}\n\nexport class McpManager {\n\tprivate readonly runtimes = new Map<string, ServerRuntime>();\n\tprivate readonly options: McpManagerOptions;\n\n\tconstructor(options: McpManagerOptions) {\n\t\tthis.options = options;\n\t\tfor (const config of options.servers) {\n\t\t\tif (this.runtimes.has(config.name)) continue; // First definition wins; inventory already applies precedence.\n\t\t\tthis.runtimes.set(config.name, { config, state: \"idle\", tools: [], quarantinedTools: [], generation: 0 });\n\t\t}\n\t}\n\n\t/** Configured server names, in configuration order. */\n\tget serverNames(): string[] {\n\t\treturn [...this.runtimes.keys()];\n\t}\n\n\t/** Current status per server. Safe to call before any connection attempt. */\n\tstatus(): McpServerStatus[] {\n\t\treturn [...this.runtimes.values()].map((runtime) => ({\n\t\t\tname: runtime.config.name,\n\t\t\tstate: runtime.state,\n\t\t\ttoolCount: runtime.tools.length,\n\t\t\terror: runtime.error,\n\t\t\tserverVersion: runtime.client?.serverInfo.version,\n\t\t\t...(runtime.quarantinedTools.length > 0 ? { quarantinedTools: runtime.quarantinedTools } : {}),\n\t\t}));\n\t}\n\n\t/**\n\t * Connect every enabled server that has not been attempted yet, then return\n\t * the union of their tools. Servers are connected concurrently and failures\n\t * are isolated, so a partial result is the normal outcome, not an error.\n\t */\n\tasync listToolDefinitions(): Promise<ToolDefinition<TSchema, McpToolDetails>[]> {\n\t\tawait Promise.all([...this.runtimes.values()].map((runtime) => this.ensureConnected(runtime)));\n\t\tconst tools: ToolDefinition<TSchema, McpToolDetails>[] = [];\n\t\tconst seen = new Set<string>();\n\t\tfor (const runtime of this.runtimes.values()) {\n\t\t\tfor (const tool of runtime.tools) {\n\t\t\t\tif (seen.has(tool.name)) continue; // Namespacing makes this rare; keep it deterministic anyway.\n\t\t\t\tseen.add(tool.name);\n\t\t\t\ttools.push(tool);\n\t\t\t}\n\t\t}\n\t\treturn tools;\n\t}\n\n\t/** Connect a single server by name. Returns its status either way. */\n\tasync connect(name: string): Promise<McpServerStatus> {\n\t\tconst runtime = this.runtimes.get(name);\n\t\tif (!runtime) {\n\t\t\treturn { name, state: \"failed\", toolCount: 0, error: `Unknown MCP server \"${name}\"` };\n\t\t}\n\t\tawait this.ensureConnected(runtime);\n\t\treturn {\n\t\t\tname,\n\t\t\tstate: runtime.state,\n\t\t\ttoolCount: runtime.tools.length,\n\t\t\terror: runtime.error,\n\t\t\tserverVersion: runtime.client?.serverInfo.version,\n\t\t\t...(runtime.quarantinedTools.length > 0 ? { quarantinedTools: runtime.quarantinedTools } : {}),\n\t\t};\n\t}\n\n\t/**\n\t * Terminate every connected or connecting server. Idempotent.\n\t *\n\t * Bumping the generation invalidates any in-flight connect before its late\n\t * completion can publish tools or flip the state back to `ready`, and the\n\t * attempt's not-yet-published client is closed alongside the live one so no\n\t * spawned process outlives the close.\n\t */\n\tclose(): void {\n\t\tfor (const runtime of this.runtimes.values()) {\n\t\t\truntime.generation += 1;\n\t\t\truntime.client?.close();\n\t\t\truntime.client = undefined;\n\t\t\truntime.pendingClient?.close();\n\t\t\truntime.pendingClient = undefined;\n\t\t\truntime.tools = [];\n\t\t\truntime.quarantinedTools = [];\n\t\t\tif (runtime.state === \"ready\" || runtime.state === \"connecting\") runtime.state = \"idle\";\n\t\t}\n\t}\n\n\t/**\n\t * Verify that `ready` servers are actually alive with a protocol ping. A\n\t * failed ping closes the client and marks the server `failed`, so a\n\t * silently killed process stops masquerading as connected. Servers already\n\t * `failed` are re-attempted only when `reconnectFailed` is set — callers\n\t * should gate that behind a slow cadence so a permanently broken server is\n\t * not respawned every probe. Idle servers stay idle: connection is lazy by\n\t * design, and a status probe must not spawn processes.\n\t */\n\tasync checkHealth(options?: { pingTimeoutMs?: number; reconnectFailed?: boolean }): Promise<McpServerStatus[]> {\n\t\tconst work: Promise<void>[] = [];\n\t\tfor (const runtime of this.runtimes.values()) {\n\t\t\tif (runtime.state === \"ready\" && runtime.client) {\n\t\t\t\twork.push(this.pingRuntime(runtime, options?.pingTimeoutMs));\n\t\t\t} else if (runtime.state === \"failed\" && options?.reconnectFailed && !runtime.config.disabled) {\n\t\t\t\truntime.state = \"idle\";\n\t\t\t\truntime.error = undefined;\n\t\t\t\twork.push(this.ensureConnected(runtime));\n\t\t\t}\n\t\t}\n\t\tawait Promise.all(work);\n\t\treturn this.status();\n\t}\n\n\tprivate async pingRuntime(runtime: ServerRuntime, timeoutMs?: number): Promise<void> {\n\t\t// Pin the probed client: a close or reconnect during the ping must not let\n\t\t// this failure path dispose the replacement client.\n\t\tconst client = runtime.client;\n\t\tif (!client) return;\n\t\ttry {\n\t\t\tawait client.ping(timeoutMs);\n\t\t} catch (error) {\n\t\t\tif (runtime.client !== client) return; // A newer owner already handled it.\n\t\t\t// Isolation point: only this server transitions; the rest stay ready.\n\t\t\truntime.client = undefined;\n\t\t\tclient.close();\n\t\t\truntime.tools = [];\n\t\t\truntime.quarantinedTools = [];\n\t\t\truntime.state = \"failed\";\n\t\t\truntime.error = `health check failed: ${error instanceof Error ? error.message : String(error)}`;\n\t\t}\n\t}\n\n\tprivate ensureConnected(runtime: ServerRuntime): Promise<void> {\n\t\tif (runtime.config.disabled) {\n\t\t\truntime.state = \"failed\";\n\t\t\truntime.error = \"disabled by configuration\";\n\t\t\treturn Promise.resolve();\n\t\t}\n\t\tif (runtime.state === \"ready\" || runtime.state === \"failed\") return Promise.resolve();\n\t\tif (runtime.connecting) return runtime.connecting;\n\n\t\truntime.state = \"connecting\";\n\t\tconst generation = runtime.generation;\n\t\tconst attempt = this.connectRuntime(runtime, generation).finally(() => {\n\t\t\t// Only this attempt may clear its own in-flight markers; a newer\n\t\t\t// attempt's `connecting`/`pendingClient` belong to the newer generation.\n\t\t\tif (runtime.connecting === attempt) runtime.connecting = undefined;\n\t\t\tif (runtime.generation === generation) runtime.pendingClient = undefined;\n\t\t});\n\t\truntime.connecting = attempt;\n\t\treturn attempt;\n\t}\n\n\tprivate async connectRuntime(runtime: ServerRuntime, generation: number): Promise<void> {\n\t\tconst clientOptions: McpClientOptions = {\n\t\t\tname: runtime.config.name,\n\t\t\tclientInfo: this.options.clientInfo,\n\t\t\trequestTimeoutMs: runtime.config.requestTimeoutMs,\n\t\t\thandshakeTimeoutMs: runtime.config.handshakeTimeoutMs,\n\t\t\ttransport: {\n\t\t\t\tcommand: runtime.config.command,\n\t\t\t\targs: runtime.config.args,\n\t\t\t\tenv: runtime.config.env,\n\t\t\t\tcwd: runtime.config.cwd ?? this.options.cwd,\n\t\t\t},\n\t\t};\n\t\tconst client = this.options.createClient?.(clientOptions) ?? new McpClient(clientOptions);\n\t\t// Register before the first await so close() can dispose a client whose\n\t\t// connect() promise has not resolved yet.\n\t\truntime.pendingClient = client;\n\t\tconst isCurrent = () => runtime.generation === generation && runtime.pendingClient === client;\n\t\ttry {\n\t\t\tawait client.connect();\n\t\t\tif (!isCurrent()) {\n\t\t\t\t// close() or a newer attempt superseded this one mid-handshake.\n\t\t\t\tclient.close();\n\t\t\t\treturn;\n\t\t\t}\n\t\t\tconst schemas = await client.listTools();\n\t\t\tif (!isCurrent()) {\n\t\t\t\tclient.close();\n\t\t\t\treturn;\n\t\t\t}\n\t\t\truntime.client = client;\n\t\t\truntime.pendingClient = undefined;\n\t\t\t// 서술자 주입 스크리닝: MCP 도구 설명은 신뢰할 수 없는 제3자 입력이다.\n\t\t\t// admitPublicMcpServer와 동일 임계값(0.7)으로 차단 — 수입 시점에서 fail-closed.\n\t\t\tconst definitions = schemas.map((schema) =>\n\t\t\t\tcreateMcpToolDefinition(runtime.config.name, client, schema, {\n\t\t\t\t\tcallTimeoutMs: this.options.callTimeoutMs,\n\t\t\t\t}),\n\t\t\t);\n\t\t\tconst admitted: typeof definitions = [];\n\t\t\tconst quarantined: string[] = [];\n\t\t\tfor (const definition of definitions) {\n\t\t\t\tif (\n\t\t\t\t\tdetectMcpDescriptorPromptInjection(definition.description ?? \"\").patternSignal >\n\t\t\t\t\tMCP_QUARANTINE_PATTERN_SIGNAL_THRESHOLD\n\t\t\t\t) {\n\t\t\t\t\tquarantined.push(definition.name);\n\t\t\t\t} else {\n\t\t\t\t\tadmitted.push(definition);\n\t\t\t\t}\n\t\t\t}\n\t\t\truntime.tools = admitted;\n\t\t\truntime.quarantinedTools = quarantined;\n\t\t\truntime.state = \"ready\";\n\t\t\truntime.error = undefined;\n\t\t} catch (error) {\n\t\t\tclient.close();\n\t\t\tif (!isCurrent()) return; // The current generation owns the state now.\n\t\t\t// Isolation point: this server is out, every other server is unaffected.\n\t\t\truntime.client = undefined;\n\t\t\truntime.tools = [];\n\t\t\truntime.state = \"failed\";\n\t\t\truntime.error = error instanceof Error ? error.message : String(error);\n\t\t}\n\t}\n}\n"]}