@code-yeongyu/senpi 2026.7.23 → 2026.7.24

package/dist/core/extensions/builtin/mcp/connection.js.map

@@ -1 +1 @@
-{"version":3,"file":"connection.js","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/mcp/connection.ts"],"names":[],"mappings":"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","sourcesContent":["import { UnauthorizedError } from \"@modelcontextprotocol/sdk/client/auth.js\";\nimport type { Client } from \"@modelcontextprotocol/sdk/client/index.js\";\nimport { OAuthFlowError } from \"./auth/oauth-errors.ts\";\nimport type { McpOAuthProvider } from \"./auth/oauth-provider.ts\";\nimport type {\n\tServerConnectionListener,\n\tServerConnectionOptions,\n\tServerConnectionState,\n\tServerConnectionStateChangedEvent,\n\tServerConnectionToolsChangedEvent,\n} from \"./connection-types.ts\";\nimport { diagnoseCapturedMcpConnectFailure, diagnoseMcpConnectFailure } from \"./diagnose.ts\";\nimport { ConnectError } from \"./errors.ts\";\nimport type { McpLogger } from \"./log.ts\";\nimport { subscribeMcpServerLogging } from \"./logging.ts\";\nimport { subscribeMcpListChanged } from \"./notifications.ts\";\nimport { subscribeMcpResourceUpdated } from \"./resources.ts\";\nimport {\n\tconnectMcpTransport,\n\tcreateMcpTransport,\n\ttype McpTransportConnection,\n\tshutdownMcpTransport,\n} from \"./transport.ts\";\nimport { type McpAsyncErrorSink, wrapAsync } from \"./wrap.ts\";\n\nexport type {\n\tServerConnectionOptions,\n\tServerConnectionState,\n\tServerConnectionStateChangedEvent,\n\tServerConnectionToolsChangedEvent,\n} from \"./connection-types.ts\";\n\nexport class ServerConnection {\n\treadonly serverName: string;\n\treadonly #logger: McpLogger;\n\treadonly #env: Record<string, string | undefined> | undefined;\n\treadonly #config: ServerConnectionOptions[\"config\"];\n\treadonly #authProvider: McpOAuthProvider | undefined;\n\t#state: ServerConnectionState;\n\t#generation = 0;\n\t#connection: McpTransportConnection | undefined;\n\t#pendingConnection: McpTransportConnection | undefined;\n\t#pendingConnect: Promise<Client> | undefined;\n\t#lastError: Error | undefined;\n\treadonly #stateListeners = new Set<ServerConnectionListener<ServerConnectionStateChangedEvent>>();\n\treadonly #toolsListeners = new Set<ServerConnectionListener<ServerConnectionToolsChangedEvent>>();\n\treadonly #shutdownConnections = new Map<McpTransportConnection, Promise<void>>();\n\n\tconstructor(options: ServerConnectionOptions) {\n\t\tthis.serverName = options.serverName;\n\t\tthis.#config = options.config;\n\t\tthis.#logger = options.logger;\n\t\tthis.#env = options.env;\n\t\tthis.#authProvider = options.authProvider;\n\t\tthis.#state = options.config.enabled ? \"idle\" : \"disabled\";\n\t}\n\n\tget state(): ServerConnectionState {\n\t\treturn this.#state;\n\t}\n\tget lastError(): Error | undefined {\n\t\treturn this.#lastError;\n\t}\n\tget generation(): number {\n\t\treturn this.#generation;\n\t}\n\n\trefreshCapturedDiagnostics(): void {\n\t\tconst current = this.#lastError;\n\t\tif (current === undefined) return;\n\t\tconst capturedError = diagnoseCapturedMcpConnectFailure({\n\t\t\tconfig: this.#config,\n\t\t\tcause: current,\n\t\t\tenv: this.#env,\n\t\t\tlogger: this.#logger,\n\t\t\tserverName: this.serverName,\n\t\t});\n\t\tif (capturedError !== null && capturedError.message !== current.message) {\n\t\t\tthis.#lastError = capturedError;\n\t\t}\n\t}\n\n\tget client(): Client {\n\t\tif (this.#connection === undefined) {\n\t\t\tthrow new ConnectError(`MCP server ${this.serverName} is not connected`, {\n\t\t\t\tphase: \"client\",\n\t\t\t\tserverName: this.serverName,\n\t\t\t});\n\t\t}\n\t\treturn this.#connection.client;\n\t}\n\n\tgetRootPid(): number | null {\n\t\treturn this.#connection?.getRootPid() ?? null;\n\t}\n\tconnect(): Promise<Client> {\n\t\tif (this.#state === \"disabled\") {\n\t\t\treturn Promise.reject(this.#connectError(`MCP server ${this.serverName} is disabled`, \"connect\"));\n\t\t}\n\t\tif (this.#state === \"connected\") return Promise.resolve(this.client);\n\t\tif (this.#pendingConnect) return this.#pendingConnect;\n\n\t\tconst generation = this.#generation;\n\t\tconst connection = this.#createTransportConnection(generation);\n\t\tthis.#pendingConnection = connection;\n\t\tthis.#setState(\"connecting\");\n\t\tthis.#pendingConnect = this.#connectTransport(connection, generation).finally(() => {\n\t\t\tif (this.#pendingConnect !== undefined && generation === this.#generation) this.#pendingConnect = undefined;\n\t\t\tif (this.#pendingConnection === connection) this.#pendingConnection = undefined;\n\t\t});\n\t\treturn this.#pendingConnect;\n\t}\n\n\tasync renew(): Promise<Client> {\n\t\tif (this.#state === \"disabled\") {\n\t\t\tthrow this.#connectError(`MCP server ${this.serverName} is disabled`, \"renew\");\n\t\t}\n\t\tthis.#generation++;\n\t\tthis.#pendingConnect = undefined;\n\t\tthis.#setState(\"idle\");\n\t\tawait this.#disposeOwnedConnections();\n\t\treturn this.connect();\n\t}\n\n\tbumpGeneration(): Promise<void> {\n\t\tthis.#generation++;\n\t\tthis.#pendingConnect = undefined;\n\t\tthis.#lastError = undefined;\n\t\tif (this.#state !== \"disabled\") this.#setState(\"idle\");\n\t\treturn this.#disposeOwnedConnections();\n\t}\n\n\tdisable(): Promise<void> {\n\t\tthis.#generation++;\n\t\tthis.#pendingConnect = undefined;\n\t\tthis.#lastError = undefined;\n\t\tthis.#setState(\"disabled\");\n\t\treturn this.#disposeOwnedConnections();\n\t}\n\n\tasync dispose(): Promise<void> {\n\t\tthis.#generation++;\n\t\tthis.#pendingConnect = undefined;\n\t\tthis.#setState(\"disabled\");\n\t\tawait this.#disposeOwnedConnections();\n\t}\n\n\tmarkDegraded(error: Error): void {\n\t\tthis.#markFailure(\"degraded\", error);\n\t}\n\tmarkSuspended(error?: Error): void {\n\t\tthis.#markFailure(\"suspended\", error);\n\t}\n\tmarkNeedsAuth(error?: Error): void {\n\t\tthis.#markFailure(\"needs_auth\", error);\n\t}\n\tmarkNeedsClientRegistration(error?: Error): void {\n\t\tthis.#markFailure(\"needs_client_registration\", error);\n\t}\n\n\tmarkToolsChanged(): void {\n\t\tthis.#emit(this.#toolsListeners, {\n\t\t\ttype: \"tools_changed\",\n\t\t\tserverName: this.serverName,\n\t\t\tgeneration: this.#generation,\n\t\t});\n\t}\n\n\tonStateChange(listener: ServerConnectionListener<ServerConnectionStateChangedEvent>): () => void {\n\t\tthis.#stateListeners.add(listener);\n\t\treturn () => this.#stateListeners.delete(listener);\n\t}\n\n\tonToolsChanged(listener: ServerConnectionListener<ServerConnectionToolsChangedEvent>): () => void {\n\t\tthis.#toolsListeners.add(listener);\n\t\treturn () => this.#toolsListeners.delete(listener);\n\t}\n\n\t#createTransportConnection(generation: number): McpTransportConnection {\n\t\tconst connection = createMcpTransport({\n\t\t\tauthProvider: this.#authProvider,\n\t\t\tconfig: this.#config,\n\t\t\tenv: this.#env,\n\t\t\tlogger: this.#logger,\n\t\t\tserverName: this.serverName,\n\t\t});\n\t\tconnection.transport.onclose = wrapAsync(\n\t\t\t\"connection.transport.onclose\",\n\t\t\t() => {\n\t\t\t\tif (this.#shutdownConnections.has(connection)) return;\n\t\t\t\tif (connection === this.#pendingConnection && this.#state === \"connecting\") {\n\t\t\t\t\tconst closeError = this.#connectError(`MCP server ${this.serverName} transport closed`, \"close\", true);\n\t\t\t\t\tconst capturedError = diagnoseCapturedMcpConnectFailure({\n\t\t\t\t\t\tconfig: this.#config,\n\t\t\t\t\t\tcause: closeError,\n\t\t\t\t\t\tenv: this.#env,\n\t\t\t\t\t\tlogger: this.#logger,\n\t\t\t\t\t\tserverName: this.serverName,\n\t\t\t\t\t});\n\t\t\t\t\tif (capturedError !== null) this.markDegraded(capturedError);\n\t\t\t\t\treturn;\n\t\t\t\t}\n\t\t\t\tif (connection !== this.#connection && connection !== this.#pendingConnection) return;\n\t\t\t\tif (generation === this.#generation && this.#state !== \"disabled\") {\n\t\t\t\t\tthis.markDegraded(this.#connectError(`MCP server ${this.serverName} transport closed`, \"close\", true));\n\t\t\t\t}\n\t\t\t},\n\t\t\tthis.#sink,\n\t\t);\n\t\treturn connection;\n\t}\n\n\tasync #connectTransport(connection: McpTransportConnection, generation: number): Promise<Client> {\n\t\ttry {\n\t\t\tawait connectMcpTransport(connection);\n\t\t} catch (error) {\n\t\t\tif (this.#pendingConnection === connection) this.#pendingConnection = undefined;\n\t\t\tawait this.#shutdown(connection);\n\t\t\tif (generation !== this.#generation || this.#state === \"disabled\") {\n\t\t\t\tthrow this.#connectError(`MCP server ${this.serverName} connect was superseded`, \"connect\", true);\n\t\t\t}\n\t\t\tif (isNeedsAuthError(error)) {\n\t\t\t\tconst authError = error instanceof Error ? error : new Error(String(error));\n\t\t\t\tthis.markNeedsAuth(authError);\n\t\t\t\tthrow authError;\n\t\t\t}\n\t\t\tconst connectError = await diagnoseMcpConnectFailure({\n\t\t\t\tconfig: this.#config,\n\t\t\t\tcause: error instanceof Error ? error : new Error(String(error)),\n\t\t\t\tenv: this.#env,\n\t\t\t\tlogger: this.#logger,\n\t\t\t\tserverName: this.serverName,\n\t\t\t});\n\t\t\tthis.markDegraded(connectError);\n\t\t\tthrow connectError;\n\t\t}\n\t\tif (generation !== this.#generation || this.#state === \"disabled\") {\n\t\t\tawait this.#shutdown(connection);\n\t\t\tthrow this.#connectError(`MCP server ${this.serverName} connect was superseded`, \"connect\", true);\n\t\t}\n\t\tif (this.#pendingConnection === connection) this.#pendingConnection = undefined;\n\t\tthis.#connection = connection;\n\t\tthis.#lastError = undefined;\n\t\t// Subscribe to list_changed on the fresh client (even if the server never\n\t\t// declared the capability) so dynamic catalog updates reach the service.\n\t\tsubscribeMcpListChanged(connection.client, () => this.markToolsChanged());\n\t\t// Resource updates ride the same refresh path: the service re-collects the\n\t\t// catalog (tools AND resources) on tools-changed.\n\t\tsubscribeMcpResourceUpdated(connection.client, () => this.markToolsChanged());\n\t\t// Server logging notifications (todo 42): RFC-5424 → the per-server\n\t\t// logger, filtered by config.logLevel, burst-capped.\n\t\tsubscribeMcpServerLogging(connection.client, { logLevel: this.#config.logLevel, logger: this.#logger });\n\t\tthis.#setState(\"connected\");\n\t\tthis.markToolsChanged();\n\t\treturn connection.client;\n\t}\n\n\tasync #disposeOwnedConnections(): Promise<void> {\n\t\tconst connections = new Set<McpTransportConnection>();\n\t\tconst connection = this.#connection;\n\t\tthis.#connection = undefined;\n\t\tif (connection !== undefined) connections.add(connection);\n\t\tconst pendingConnection = this.#pendingConnection;\n\t\tthis.#pendingConnection = undefined;\n\t\tif (pendingConnection !== undefined) connections.add(pendingConnection);\n\t\tawait Promise.all([...connections].map((item) => this.#shutdown(item)));\n\t}\n\n\tasync #shutdown(connection: McpTransportConnection): Promise<void> {\n\t\tconst pending = this.#shutdownConnections.get(connection);\n\t\tif (pending !== undefined) {\n\t\t\tawait pending;\n\t\t\treturn;\n\t\t}\n\t\tconst shutdown = (async () => {\n\t\t\tawait shutdownMcpTransport(connection);\n\t\t})();\n\t\tthis.#shutdownConnections.set(connection, shutdown);\n\t\ttry {\n\t\t\tawait shutdown;\n\t\t} finally {\n\t\t\tthis.#shutdownConnections.delete(connection);\n\t\t}\n\t}\n\n\t#setState(state: ServerConnectionState, error?: Error): void {\n\t\tif (this.#state === state) return;\n\t\tconst previousState = this.#state;\n\t\tthis.#state = state;\n\t\tthis.#emit(this.#stateListeners, {\n\t\t\ttype: \"state_changed\",\n\t\t\tserverName: this.serverName,\n\t\t\tpreviousState,\n\t\t\tstate,\n\t\t\tgeneration: this.#generation,\n\t\t\terror,\n\t\t});\n\t}\n\n\t#emit<TEvent>(listeners: Set<ServerConnectionListener<TEvent>>, event: TEvent): void {\n\t\tfor (const listener of listeners) {\n\t\t\tvoid wrapAsync(\"connection.event\", listener, this.#sink)(event);\n\t\t}\n\t}\n\n\t#markFailure(state: ServerConnectionState, error: Error | undefined): void {\n\t\tthis.#lastError = error;\n\t\tthis.#setState(state, error);\n\t}\n\n\t#connectError(message: string, phase: string, retriable?: true, cause?: unknown): ConnectError {\n\t\treturn new ConnectError(message, { cause, phase, retriable, serverName: this.serverName });\n\t}\n\n\tget #sink(): McpAsyncErrorSink {\n\t\treturn { logger: this.#logger };\n\t}\n}\n\nfunction isNeedsAuthError(error: unknown, depth = 0): boolean {\n\tif (error instanceof UnauthorizedError) return true;\n\tif (error instanceof OAuthFlowError) return error.terminal;\n\t// connectMcpTransport wraps the SDK error in a ConnectError; unwrap the cause.\n\tif (depth < 5 && error !== null && typeof error === \"object\" && \"cause\" in error) {\n\t\treturn isNeedsAuthError((error as { cause?: unknown }).cause, depth + 1);\n\t}\n\treturn false;\n}\n"]}
+{"version":3,"file":"connection.js","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/mcp/connection.ts"],"names":[],"mappings":"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","sourcesContent":["import { UnauthorizedError } from \"@modelcontextprotocol/sdk/client/auth.js\";\nimport type { Client } from \"@modelcontextprotocol/sdk/client/index.js\";\nimport { OAuthFlowError } from \"./auth/oauth-errors.ts\";\nimport type { McpOAuthProvider } from \"./auth/oauth-provider.ts\";\nimport type {\n\tServerConnectionListener,\n\tServerConnectionOptions,\n\tServerConnectionState,\n\tServerConnectionStateChangedEvent,\n\tServerConnectionToolsChangedEvent,\n} from \"./connection-types.ts\";\nimport { diagnoseCapturedMcpConnectFailure, diagnoseMcpConnectFailure } from \"./diagnose.ts\";\nimport { ConnectError } from \"./errors.ts\";\nimport type { McpLogger } from \"./log.ts\";\nimport { subscribeMcpServerLogging } from \"./logging.ts\";\nimport { subscribeMcpListChanged } from \"./notifications.ts\";\nimport { subscribeMcpResourceUpdated } from \"./resources.ts\";\nimport {\n\tconnectMcpTransport,\n\tcreateMcpTransport,\n\ttype McpTransportConnection,\n\tshutdownMcpTransport,\n} from \"./transport.ts\";\nimport { type McpAsyncErrorSink, wrapAsync } from \"./wrap.ts\";\n\nexport type {\n\tServerConnectionOptions,\n\tServerConnectionState,\n\tServerConnectionStateChangedEvent,\n\tServerConnectionToolsChangedEvent,\n} from \"./connection-types.ts\";\n\nexport class ServerConnection {\n\treadonly serverName: string;\n\treadonly #logger: McpLogger;\n\treadonly #env: Record<string, string | undefined> | undefined;\n\treadonly #config: ServerConnectionOptions[\"config\"];\n\treadonly #authProvider: McpOAuthProvider | undefined;\n\treadonly #elicitationUiProvider: ServerConnectionOptions[\"elicitationUiProvider\"];\n\t#state: ServerConnectionState;\n\t#generation = 0;\n\t#connection: McpTransportConnection | undefined;\n\t#pendingConnection: McpTransportConnection | undefined;\n\t#pendingConnect: Promise<Client> | undefined;\n\t#lastError: Error | undefined;\n\treadonly #stateListeners = new Set<ServerConnectionListener<ServerConnectionStateChangedEvent>>();\n\treadonly #toolsListeners = new Set<ServerConnectionListener<ServerConnectionToolsChangedEvent>>();\n\treadonly #shutdownConnections = new Map<McpTransportConnection, Promise<void>>();\n\n\tconstructor(options: ServerConnectionOptions) {\n\t\tthis.serverName = options.serverName;\n\t\tthis.#config = options.config;\n\t\tthis.#logger = options.logger;\n\t\tthis.#env = options.env;\n\t\tthis.#authProvider = options.authProvider;\n\t\tthis.#elicitationUiProvider = options.elicitationUiProvider;\n\t\tthis.#state = options.config.enabled ? \"idle\" : \"disabled\";\n\t}\n\n\tget state(): ServerConnectionState {\n\t\treturn this.#state;\n\t}\n\tget lastError(): Error | undefined {\n\t\treturn this.#lastError;\n\t}\n\tget generation(): number {\n\t\treturn this.#generation;\n\t}\n\n\trefreshCapturedDiagnostics(): void {\n\t\tconst current = this.#lastError;\n\t\tif (current === undefined) return;\n\t\tconst capturedError = diagnoseCapturedMcpConnectFailure({\n\t\t\tconfig: this.#config,\n\t\t\tcause: current,\n\t\t\tenv: this.#env,\n\t\t\tlogger: this.#logger,\n\t\t\tserverName: this.serverName,\n\t\t});\n\t\tif (capturedError !== null && capturedError.message !== current.message) {\n\t\t\tthis.#lastError = capturedError;\n\t\t}\n\t}\n\n\tget client(): Client {\n\t\tif (this.#connection === undefined) {\n\t\t\tthrow new ConnectError(`MCP server ${this.serverName} is not connected`, {\n\t\t\t\tphase: \"client\",\n\t\t\t\tserverName: this.serverName,\n\t\t\t});\n\t\t}\n\t\treturn this.#connection.client;\n\t}\n\n\tgetRootPid(): number | null {\n\t\treturn this.#connection?.getRootPid() ?? null;\n\t}\n\tconnect(): Promise<Client> {\n\t\tif (this.#state === \"disabled\") {\n\t\t\treturn Promise.reject(this.#connectError(`MCP server ${this.serverName} is disabled`, \"connect\"));\n\t\t}\n\t\tif (this.#state === \"connected\") return Promise.resolve(this.client);\n\t\tif (this.#pendingConnect) return this.#pendingConnect;\n\n\t\tconst generation = this.#generation;\n\t\tconst connection = this.#createTransportConnection(generation);\n\t\tthis.#pendingConnection = connection;\n\t\tthis.#setState(\"connecting\");\n\t\tthis.#pendingConnect = this.#connectTransport(connection, generation).finally(() => {\n\t\t\tif (this.#pendingConnect !== undefined && generation === this.#generation) this.#pendingConnect = undefined;\n\t\t\tif (this.#pendingConnection === connection) this.#pendingConnection = undefined;\n\t\t});\n\t\treturn this.#pendingConnect;\n\t}\n\n\tasync renew(): Promise<Client> {\n\t\tif (this.#state === \"disabled\") {\n\t\t\tthrow this.#connectError(`MCP server ${this.serverName} is disabled`, \"renew\");\n\t\t}\n\t\tthis.#generation++;\n\t\tthis.#pendingConnect = undefined;\n\t\tthis.#setState(\"idle\");\n\t\tawait this.#disposeOwnedConnections();\n\t\treturn this.connect();\n\t}\n\n\tbumpGeneration(): Promise<void> {\n\t\tthis.#generation++;\n\t\tthis.#pendingConnect = undefined;\n\t\tthis.#lastError = undefined;\n\t\tif (this.#state !== \"disabled\") this.#setState(\"idle\");\n\t\treturn this.#disposeOwnedConnections();\n\t}\n\n\tdisable(): Promise<void> {\n\t\tthis.#generation++;\n\t\tthis.#pendingConnect = undefined;\n\t\tthis.#lastError = undefined;\n\t\tthis.#setState(\"disabled\");\n\t\treturn this.#disposeOwnedConnections();\n\t}\n\n\tasync dispose(): Promise<void> {\n\t\tthis.#generation++;\n\t\tthis.#pendingConnect = undefined;\n\t\tthis.#setState(\"disabled\");\n\t\tawait this.#disposeOwnedConnections();\n\t}\n\n\tmarkDegraded(error: Error): void {\n\t\tthis.#markFailure(\"degraded\", error);\n\t}\n\tmarkSuspended(error?: Error): void {\n\t\tthis.#markFailure(\"suspended\", error);\n\t}\n\tmarkNeedsAuth(error?: Error): void {\n\t\tthis.#markFailure(\"needs_auth\", error);\n\t}\n\tmarkNeedsClientRegistration(error?: Error): void {\n\t\tthis.#markFailure(\"needs_client_registration\", error);\n\t}\n\n\tmarkToolsChanged(): void {\n\t\tthis.#emit(this.#toolsListeners, {\n\t\t\ttype: \"tools_changed\",\n\t\t\tserverName: this.serverName,\n\t\t\tgeneration: this.#generation,\n\t\t});\n\t}\n\n\tonStateChange(listener: ServerConnectionListener<ServerConnectionStateChangedEvent>): () => void {\n\t\tthis.#stateListeners.add(listener);\n\t\treturn () => this.#stateListeners.delete(listener);\n\t}\n\n\tonToolsChanged(listener: ServerConnectionListener<ServerConnectionToolsChangedEvent>): () => void {\n\t\tthis.#toolsListeners.add(listener);\n\t\treturn () => this.#toolsListeners.delete(listener);\n\t}\n\n\t#createTransportConnection(generation: number): McpTransportConnection {\n\t\tconst connection = createMcpTransport({\n\t\t\tauthProvider: this.#authProvider,\n\t\t\tconfig: this.#config,\n\t\t\tenv: this.#env,\n\t\t\telicitationUiProvider: this.#elicitationUiProvider,\n\t\t\tlogger: this.#logger,\n\t\t\tserverName: this.serverName,\n\t\t});\n\t\tconnection.transport.onclose = wrapAsync(\n\t\t\t\"connection.transport.onclose\",\n\t\t\t() => {\n\t\t\t\tif (this.#shutdownConnections.has(connection)) return;\n\t\t\t\tif (connection === this.#pendingConnection && this.#state === \"connecting\") {\n\t\t\t\t\tconst closeError = this.#connectError(`MCP server ${this.serverName} transport closed`, \"close\", true);\n\t\t\t\t\tconst capturedError = diagnoseCapturedMcpConnectFailure({\n\t\t\t\t\t\tconfig: this.#config,\n\t\t\t\t\t\tcause: closeError,\n\t\t\t\t\t\tenv: this.#env,\n\t\t\t\t\t\tlogger: this.#logger,\n\t\t\t\t\t\tserverName: this.serverName,\n\t\t\t\t\t});\n\t\t\t\t\tif (capturedError !== null) this.markDegraded(capturedError);\n\t\t\t\t\treturn;\n\t\t\t\t}\n\t\t\t\tif (connection !== this.#connection && connection !== this.#pendingConnection) return;\n\t\t\t\tif (generation === this.#generation && this.#state !== \"disabled\") {\n\t\t\t\t\tthis.markDegraded(this.#connectError(`MCP server ${this.serverName} transport closed`, \"close\", true));\n\t\t\t\t}\n\t\t\t},\n\t\t\tthis.#sink,\n\t\t);\n\t\treturn connection;\n\t}\n\n\tasync #connectTransport(connection: McpTransportConnection, generation: number): Promise<Client> {\n\t\ttry {\n\t\t\tawait connectMcpTransport(connection);\n\t\t} catch (error) {\n\t\t\tif (this.#pendingConnection === connection) this.#pendingConnection = undefined;\n\t\t\tawait this.#shutdown(connection);\n\t\t\tif (generation !== this.#generation || this.#state === \"disabled\") {\n\t\t\t\tthrow this.#connectError(`MCP server ${this.serverName} connect was superseded`, \"connect\", true);\n\t\t\t}\n\t\t\tif (isNeedsAuthError(error)) {\n\t\t\t\tconst authError = error instanceof Error ? error : new Error(String(error));\n\t\t\t\tthis.markNeedsAuth(authError);\n\t\t\t\tthrow authError;\n\t\t\t}\n\t\t\tconst connectError = await diagnoseMcpConnectFailure({\n\t\t\t\tconfig: this.#config,\n\t\t\t\tcause: error instanceof Error ? error : new Error(String(error)),\n\t\t\t\tenv: this.#env,\n\t\t\t\tlogger: this.#logger,\n\t\t\t\tserverName: this.serverName,\n\t\t\t});\n\t\t\tthis.markDegraded(connectError);\n\t\t\tthrow connectError;\n\t\t}\n\t\tif (generation !== this.#generation || this.#state === \"disabled\") {\n\t\t\tawait this.#shutdown(connection);\n\t\t\tthrow this.#connectError(`MCP server ${this.serverName} connect was superseded`, \"connect\", true);\n\t\t}\n\t\tif (this.#pendingConnection === connection) this.#pendingConnection = undefined;\n\t\tthis.#connection = connection;\n\t\tthis.#lastError = undefined;\n\t\t// Subscribe to list_changed on the fresh client (even if the server never\n\t\t// declared the capability) so dynamic catalog updates reach the service.\n\t\tsubscribeMcpListChanged(connection.client, () => this.markToolsChanged());\n\t\t// Resource updates ride the same refresh path: the service re-collects the\n\t\t// catalog (tools AND resources) on tools-changed.\n\t\tsubscribeMcpResourceUpdated(connection.client, () => this.markToolsChanged());\n\t\t// Server logging notifications (todo 42): RFC-5424 → the per-server\n\t\t// logger, filtered by config.logLevel, burst-capped.\n\t\tsubscribeMcpServerLogging(connection.client, { logLevel: this.#config.logLevel, logger: this.#logger });\n\t\tthis.#setState(\"connected\");\n\t\tthis.markToolsChanged();\n\t\treturn connection.client;\n\t}\n\n\tasync #disposeOwnedConnections(): Promise<void> {\n\t\tconst connections = new Set<McpTransportConnection>();\n\t\tconst connection = this.#connection;\n\t\tthis.#connection = undefined;\n\t\tif (connection !== undefined) connections.add(connection);\n\t\tconst pendingConnection = this.#pendingConnection;\n\t\tthis.#pendingConnection = undefined;\n\t\tif (pendingConnection !== undefined) connections.add(pendingConnection);\n\t\tawait Promise.all([...connections].map((item) => this.#shutdown(item)));\n\t}\n\n\tasync #shutdown(connection: McpTransportConnection): Promise<void> {\n\t\tconst pending = this.#shutdownConnections.get(connection);\n\t\tif (pending !== undefined) {\n\t\t\tawait pending;\n\t\t\treturn;\n\t\t}\n\t\tconst shutdown = (async () => {\n\t\t\tawait shutdownMcpTransport(connection);\n\t\t})();\n\t\tthis.#shutdownConnections.set(connection, shutdown);\n\t\ttry {\n\t\t\tawait shutdown;\n\t\t} finally {\n\t\t\tthis.#shutdownConnections.delete(connection);\n\t\t}\n\t}\n\n\t#setState(state: ServerConnectionState, error?: Error): void {\n\t\tif (this.#state === state) return;\n\t\tconst previousState = this.#state;\n\t\tthis.#state = state;\n\t\tthis.#emit(this.#stateListeners, {\n\t\t\ttype: \"state_changed\",\n\t\t\tserverName: this.serverName,\n\t\t\tpreviousState,\n\t\t\tstate,\n\t\t\tgeneration: this.#generation,\n\t\t\terror,\n\t\t});\n\t}\n\n\t#emit<TEvent>(listeners: Set<ServerConnectionListener<TEvent>>, event: TEvent): void {\n\t\tfor (const listener of listeners) {\n\t\t\tvoid wrapAsync(\"connection.event\", listener, this.#sink)(event);\n\t\t}\n\t}\n\n\t#markFailure(state: ServerConnectionState, error: Error | undefined): void {\n\t\tthis.#lastError = error;\n\t\tthis.#setState(state, error);\n\t}\n\n\t#connectError(message: string, phase: string, retriable?: true, cause?: unknown): ConnectError {\n\t\treturn new ConnectError(message, { cause, phase, retriable, serverName: this.serverName });\n\t}\n\n\tget #sink(): McpAsyncErrorSink {\n\t\treturn { logger: this.#logger };\n\t}\n}\n\nfunction isNeedsAuthError(error: unknown, depth = 0): boolean {\n\tif (error instanceof UnauthorizedError) return true;\n\tif (error instanceof OAuthFlowError) return error.terminal;\n\t// connectMcpTransport wraps the SDK error in a ConnectError; unwrap the cause.\n\tif (depth < 5 && error !== null && typeof error === \"object\" && \"cause\" in error) {\n\t\treturn isNeedsAuthError((error as { cause?: unknown }).cause, depth + 1);\n\t}\n\treturn false;\n}\n"]}

package/dist/core/extensions/builtin/mcp/elicitation.d.ts

@@ -6,6 +6,10 @@ export declare const MCP_CLIENT_ELICITATION_CAPABILITY: {
 };
 export declare const MCP_ELICITATION_TIMEOUT_MS: number;
 type ElicitationUi = Pick<ExtensionUIContext, "input" | "select" | "confirm">;
+export type McpElicitationUiProvider = () => ElicitationUi | undefined;
+export interface McpElicitationUiOwner {
+    getMcpElicitationUi(): ElicitationUi | undefined;
+}
 export interface ElicitationResponse {
     action: "accept" | "decline" | "cancel";
     content?: Record<string, string | number | boolean>;
@@ -17,10 +21,10 @@ interface ElicitProperty {
     description?: string;
     enum?: unknown[];
 }
-/** The extension points this at the live session UI (undefined in print mode). */
-export declare function setMcpElicitationUiProvider(provider: (() => ElicitationUi | undefined) | undefined): void;
+/** Legacy classic-session seam. Session-owned services pass themselves directly. */
+export declare function setMcpElicitationUiProvider(provider: McpElicitationUiProvider | undefined): void;
 /** Wire the elicitation/create handler onto a fresh client. */
-export declare function configureMcpElicitation(client: Client, timeoutMs?: number): void;
+export declare function configureMcpElicitation(client: Client, owner?: McpElicitationUiOwner | McpElicitationUiProvider | undefined, timeoutMs?: number): void;
 /** Exported for tests: drive the form directly with a scripted UI. */
 export declare function runElicitationForm(ui: ElicitationUi, message: string, requestedSchema: {
     properties?: Record<string, ElicitProperty>;

package/dist/core/extensions/builtin/mcp/elicitation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"elicitation.d.ts","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/mcp/elicitation.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,2CAA2C,CAAC;AAExE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAIzD,gFAAgF;AAChF,eAAO,MAAM,iCAAiC;aAAK,WAAW;CAAe,CAAC;AAE9E,eAAO,MAAM,0BAA0B,QAAgB,CAAC;AAExD,KAAK,aAAa,GAAG,IAAI,CAAC,kBAAkB,EAAE,OAAO,GAAG,QAAQ,GAAG,SAAS,CAAC,CAAC;AAE9E,MAAM,WAAW,mBAAmB;IACnC,MAAM,EAAE,QAAQ,GAAG,SAAS,GAAG,QAAQ,CAAC;IACxC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,CAAC;IAEpD,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACvB;AAED,UAAU,cAAc;IACvB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE,OAAO,EAAE,CAAC;CACjB;AAID,kFAAkF;AAClF,wBAAgB,2BAA2B,CAAC,QAAQ,EAAE,CAAC,MAAM,aAAa,GAAG,SAAS,CAAC,GAAG,SAAS,GAAG,IAAI,CAEzG;AAED,+DAA+D;AAC/D,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,GAAE,MAAmC,GAAG,IAAI,CAS5G;AAED,sEAAsE;AACtE,wBAAsB,kBAAkB,CACvC,EAAE,EAAE,aAAa,EACjB,OAAO,EAAE,MAAM,EACf,eAAe,EAAE;IAAE,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;CAAE,EACrF,SAAS,GAAE,MAAmC,GAC5C,OAAO,CAAC,mBAAmB,CAAC,CAY9B"}
+{"version":3,"file":"elicitation.d.ts","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/mcp/elicitation.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,2CAA2C,CAAC;AAExE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAIzD,gFAAgF;AAChF,eAAO,MAAM,iCAAiC;aAAK,WAAW;CAAe,CAAC;AAE9E,eAAO,MAAM,0BAA0B,QAAgB,CAAC;AAExD,KAAK,aAAa,GAAG,IAAI,CAAC,kBAAkB,EAAE,OAAO,GAAG,QAAQ,GAAG,SAAS,CAAC,CAAC;AAE9E,MAAM,MAAM,wBAAwB,GAAG,MAAM,aAAa,GAAG,SAAS,CAAC;AACvE,MAAM,WAAW,qBAAqB;IACrC,mBAAmB,IAAI,aAAa,GAAG,SAAS,CAAC;CACjD;AAED,MAAM,WAAW,mBAAmB;IACnC,MAAM,EAAE,QAAQ,GAAG,SAAS,GAAG,QAAQ,CAAC;IACxC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,CAAC;IAEpD,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACvB;AAED,UAAU,cAAc;IACvB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE,OAAO,EAAE,CAAC;CACjB;AAID,oFAAoF;AACpF,wBAAgB,2BAA2B,CAAC,QAAQ,EAAE,wBAAwB,GAAG,SAAS,GAAG,IAAI,CAEhG;AAED,+DAA+D;AAC/D,wBAAgB,uBAAuB,CACtC,MAAM,EAAE,MAAM,EACd,KAAK,GAAE,qBAAqB,GAAG,wBAAwB,GAAG,SAA4B,EACtF,SAAS,GAAE,MAAmC,GAC5C,IAAI,CASN;AAED,sEAAsE;AACtE,wBAAsB,kBAAkB,CACvC,EAAE,EAAE,aAAa,EACjB,OAAO,EAAE,MAAM,EACf,eAAe,EAAE;IAAE,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;CAAE,EACrF,SAAS,GAAE,MAAmC,GAC5C,OAAO,CAAC,mBAAmB,CAAC,CAY9B"}

package/dist/core/extensions/builtin/mcp/elicitation.js

@@ -15,19 +15,19 @@ import { safeTimer } from "./wrap.js";
 /** Declared empty on purpose: maximum server compatibility (form mode only). */
 export const MCP_CLIENT_ELICITATION_CAPABILITY = { elicitation: {} };
 export const MCP_ELICITATION_TIMEOUT_MS = 5 * 60 * 1000;
-let currentUi;
-/** The extension points this at the live session UI (undefined in print mode). */
+let legacyUiProvider;
+/** Legacy classic-session seam. Session-owned services pass themselves directly. */
 export function setMcpElicitationUiProvider(provider) {
-    currentUi = provider;
+    legacyUiProvider = provider;
 }
 /** Wire the elicitation/create handler onto a fresh client. */
-export function configureMcpElicitation(client, timeoutMs = MCP_ELICITATION_TIMEOUT_MS) {
+export function configureMcpElicitation(client, owner = legacyUiProvider, timeoutMs = MCP_ELICITATION_TIMEOUT_MS) {
     client.setRequestHandler(ElicitRequestSchema, async (request) => {
         const params = request.params;
         // URL mode is deliberately unsupported in v1 (form mode only).
         if (!("requestedSchema" in params))
             return { action: "decline" };
-        const ui = currentUi?.();
+        const ui = typeof owner === "function" ? owner() : owner?.getMcpElicitationUi();
         if (ui === undefined)
             return { action: "decline" };
         return await runElicitationForm(ui, params.message, params.requestedSchema, timeoutMs);

package/dist/core/extensions/builtin/mcp/elicitation.js.map

@@ -1 +1 @@
-{"version":3,"file":"elicitation.js","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/mcp/elicitation.ts"],"names":[],"mappings":"AAAA,6CAA6C;AAC7C,EAAE;AACF,4EAA4E;AAC5E,6EAA6E;AAC7E,6EAA6E;AAC7E,4EAA4E;AAC5E,8EAA8E;AAC9E,4EAA4E;AAC5E,6EAA6E;AAC7E,8EAA8E;AAC9E,qBAAqB;AAGrB,OAAO,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AAEzE,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEtC,gFAAgF;AAChF,MAAM,CAAC,MAAM,iCAAiC,GAAG,EAAE,WAAW,EAAE,EAAE,EAAW,CAAC;AAE9E,MAAM,CAAC,MAAM,0BAA0B,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC;AAkBxD,IAAI,SAAwD,CAAC;AAE7D,kFAAkF;AAClF,MAAM,UAAU,2BAA2B,CAAC,QAAuD;IAClG,SAAS,GAAG,QAAQ,CAAC;AACtB,CAAC;AAED,+DAA+D;AAC/D,MAAM,UAAU,uBAAuB,CAAC,MAAc,EAAE,SAAS,GAAW,0BAA0B;IACrG,MAAM,CAAC,iBAAiB,CAAC,mBAAmB,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;QAC/D,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;QAC9B,+DAA+D;QAC/D,IAAI,CAAC,CAAC,iBAAiB,IAAI,MAAM,CAAC;YAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;QACjE,MAAM,EAAE,GAAG,SAAS,EAAE,EAAE,CAAC;QACzB,IAAI,EAAE,KAAK,SAAS;YAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;QACnD,OAAO,MAAM,kBAAkB,CAAC,EAAE,EAAE,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,eAAe,EAAE,SAAS,CAAC,CAAC;IACxF,CAAC,CAAC,CAAC;AACJ,CAAC;AAED,sEAAsE;AACtE,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACvC,EAAiB,EACjB,OAAe,EACf,eAAqF,EACrF,SAAS,GAAW,0BAA0B;IAE9C,IAAI,KAAiC,CAAC;IACtC,MAAM,OAAO,GAAG,IAAI,OAAO,CAAsB,CAAC,OAAO,EAAE,EAAE;QAC5D,KAAK,GAAG,SAAS,CAAC,yBAAyB,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,EAAE;YAC5F,MAAM,EAAE,eAAe,CAAC,aAAa,CAAC;SACtC,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;IACH,IAAI,CAAC;QACJ,OAAO,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,WAAW,CAAC,EAAE,EAAE,OAAO,EAAE,eAAe,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;IACjF,CAAC;YAAS,CAAC;QACV,IAAI,KAAK,KAAK,SAAS;YAAE,YAAY,CAAC,KAAK,CAAC,CAAC;IAC9C,CAAC;AACF,CAAC;AAED,KAAK,UAAU,WAAW,CACzB,EAAiB,EACjB,OAAe,EACf,eAAqF;IAErF,MAAM,OAAO,GAA8C,EAAE,CAAC;IAC9D,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,eAAe,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC;IACzD,KAAK,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,UAAU,IAAI,EAAE,CAAC,EAAE,CAAC;QACjF,MAAM,KAAK,GAAG,GAAG,OAAO,MAAM,QAAQ,CAAC,KAAK,IAAI,IAAI,EAAE,CAAC;QACvD,IAAI,QAAQ,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YACjC,OAAO,CAAC,IAAI,CAAC,GAAG,MAAM,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,QAAQ,CAAC,WAAW,IAAI,IAAI,CAAC,CAAC;YACtE,SAAS;QACV,CAAC;QACD,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,QAAQ,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC9D,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;YACjE,IAAI,MAAM,KAAK,SAAS;gBAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;YACvD,OAAO,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC;YACvB,SAAS;QACV,CAAC;QACD,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,KAAK,CAAC,KAAK,EAAE,QAAQ,CAAC,WAAW,CAAC,CAAC;QAC3D,IAAI,MAAM,KAAK,SAAS,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACjD,IAAI,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC;gBAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;YACrD,SAAS;QACV,CAAC;QACD,IAAI,QAAQ,CAAC,IAAI,KAAK,QAAQ,IAAI,QAAQ,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YAC/D,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC;YAC9B,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC;gBAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;YAC3D,OAAO,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC;YACvB,SAAS;QACV,CAAC;QACD,OAAO,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC;IACxB,CAAC;IACD,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC;AACtC,CAAC","sourcesContent":["// MCP elicitation, form mode only (todo 41).\n//\n// The client declares the capability as an EMPTY object — Spring-AI servers\n// reject richer shapes (FieldCoding lesson from the comparison corpus) — and\n// answers elicitation/create requests mid tool-call by walking the requested\n// flat-primitive schema through sequential ctx.ui primitives (input/select/\n// confirm; NEVER ctx.ui.custom, which is undefined in RPC mode). Without a UI\n// (print mode) the request is declined immediately — spec-correct, no hang.\n// The whole form is bounded by a timeout that resolves to cancel so a wedged\n// dialog can never wedge the tool-call pipeline. URL mode is deliberately not\n// implemented in v1.\n\nimport type { Client } from \"@modelcontextprotocol/sdk/client/index.js\";\nimport { ElicitRequestSchema } from \"@modelcontextprotocol/sdk/types.js\";\nimport type { ExtensionUIContext } from \"../../types.ts\";\nimport { createMcpLogger } from \"./log.ts\";\nimport { safeTimer } from \"./wrap.ts\";\n\n/** Declared empty on purpose: maximum server compatibility (form mode only). */\nexport const MCP_CLIENT_ELICITATION_CAPABILITY = { elicitation: {} } as const;\n\nexport const MCP_ELICITATION_TIMEOUT_MS = 5 * 60 * 1000;\n\ntype ElicitationUi = Pick<ExtensionUIContext, \"input\" | \"select\" | \"confirm\">;\n\nexport interface ElicitationResponse {\n\taction: \"accept\" | \"decline\" | \"cancel\";\n\tcontent?: Record<string, string | number | boolean>;\n\t// SDK request handlers must return an index-signature-compatible result.\n\t[key: string]: unknown;\n}\n\ninterface ElicitProperty {\n\ttype?: string;\n\ttitle?: string;\n\tdescription?: string;\n\tenum?: unknown[];\n}\n\nlet currentUi: (() => ElicitationUi | undefined) | undefined;\n\n/** The extension points this at the live session UI (undefined in print mode). */\nexport function setMcpElicitationUiProvider(provider: (() => ElicitationUi | undefined) | undefined): void {\n\tcurrentUi = provider;\n}\n\n/** Wire the elicitation/create handler onto a fresh client. */\nexport function configureMcpElicitation(client: Client, timeoutMs: number = MCP_ELICITATION_TIMEOUT_MS): void {\n\tclient.setRequestHandler(ElicitRequestSchema, async (request) => {\n\t\tconst params = request.params;\n\t\t// URL mode is deliberately unsupported in v1 (form mode only).\n\t\tif (!(\"requestedSchema\" in params)) return { action: \"decline\" };\n\t\tconst ui = currentUi?.();\n\t\tif (ui === undefined) return { action: \"decline\" };\n\t\treturn await runElicitationForm(ui, params.message, params.requestedSchema, timeoutMs);\n\t});\n}\n\n/** Exported for tests: drive the form directly with a scripted UI. */\nexport async function runElicitationForm(\n\tui: ElicitationUi,\n\tmessage: string,\n\trequestedSchema: { properties?: Record<string, ElicitProperty>; required?: string[] },\n\ttimeoutMs: number = MCP_ELICITATION_TIMEOUT_MS,\n): Promise<ElicitationResponse> {\n\tlet timer: NodeJS.Timeout | undefined;\n\tconst timeout = new Promise<ElicitationResponse>((resolve) => {\n\t\ttimer = safeTimer(\"mcp.elicitation.timeout\", timeoutMs, () => resolve({ action: \"cancel\" }), {\n\t\t\tlogger: createMcpLogger(\"elicitation\"),\n\t\t});\n\t});\n\ttry {\n\t\treturn await Promise.race([collectForm(ui, message, requestedSchema), timeout]);\n\t} finally {\n\t\tif (timer !== undefined) clearTimeout(timer);\n\t}\n}\n\nasync function collectForm(\n\tui: ElicitationUi,\n\tmessage: string,\n\trequestedSchema: { properties?: Record<string, ElicitProperty>; required?: string[] },\n): Promise<ElicitationResponse> {\n\tconst content: Record<string, string | number | boolean> = {};\n\tconst required = new Set(requestedSchema.required ?? []);\n\tfor (const [name, property] of Object.entries(requestedSchema.properties ?? {})) {\n\t\tconst title = `${message} — ${property.title ?? name}`;\n\t\tif (property.type === \"boolean\") {\n\t\t\tcontent[name] = await ui.confirm(title, property.description ?? name);\n\t\t\tcontinue;\n\t\t}\n\t\tif (Array.isArray(property.enum) && property.enum.length > 0) {\n\t\t\tconst picked = await ui.select(title, property.enum.map(String));\n\t\t\tif (picked === undefined) return { action: \"decline\" };\n\t\t\tcontent[name] = picked;\n\t\t\tcontinue;\n\t\t}\n\t\tconst answer = await ui.input(title, property.description);\n\t\tif (answer === undefined || answer.length === 0) {\n\t\t\tif (required.has(name)) return { action: \"decline\" };\n\t\t\tcontinue;\n\t\t}\n\t\tif (property.type === \"number\" || property.type === \"integer\") {\n\t\t\tconst parsed = Number(answer);\n\t\t\tif (!Number.isFinite(parsed)) return { action: \"decline\" };\n\t\t\tcontent[name] = parsed;\n\t\t\tcontinue;\n\t\t}\n\t\tcontent[name] = answer;\n\t}\n\treturn { action: \"accept\", content };\n}\n"]}
+{"version":3,"file":"elicitation.js","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/mcp/elicitation.ts"],"names":[],"mappings":"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","sourcesContent":["// MCP elicitation, form mode only (todo 41).\n//\n// The client declares the capability as an EMPTY object — Spring-AI servers\n// reject richer shapes (FieldCoding lesson from the comparison corpus) — and\n// answers elicitation/create requests mid tool-call by walking the requested\n// flat-primitive schema through sequential ctx.ui primitives (input/select/\n// confirm; NEVER ctx.ui.custom, which is undefined in RPC mode). Without a UI\n// (print mode) the request is declined immediately — spec-correct, no hang.\n// The whole form is bounded by a timeout that resolves to cancel so a wedged\n// dialog can never wedge the tool-call pipeline. URL mode is deliberately not\n// implemented in v1.\n\nimport type { Client } from \"@modelcontextprotocol/sdk/client/index.js\";\nimport { ElicitRequestSchema } from \"@modelcontextprotocol/sdk/types.js\";\nimport type { ExtensionUIContext } from \"../../types.ts\";\nimport { createMcpLogger } from \"./log.ts\";\nimport { safeTimer } from \"./wrap.ts\";\n\n/** Declared empty on purpose: maximum server compatibility (form mode only). */\nexport const MCP_CLIENT_ELICITATION_CAPABILITY = { elicitation: {} } as const;\n\nexport const MCP_ELICITATION_TIMEOUT_MS = 5 * 60 * 1000;\n\ntype ElicitationUi = Pick<ExtensionUIContext, \"input\" | \"select\" | \"confirm\">;\n\nexport type McpElicitationUiProvider = () => ElicitationUi | undefined;\nexport interface McpElicitationUiOwner {\n\tgetMcpElicitationUi(): ElicitationUi | undefined;\n}\n\nexport interface ElicitationResponse {\n\taction: \"accept\" | \"decline\" | \"cancel\";\n\tcontent?: Record<string, string | number | boolean>;\n\t// SDK request handlers must return an index-signature-compatible result.\n\t[key: string]: unknown;\n}\n\ninterface ElicitProperty {\n\ttype?: string;\n\ttitle?: string;\n\tdescription?: string;\n\tenum?: unknown[];\n}\n\nlet legacyUiProvider: McpElicitationUiProvider | undefined;\n\n/** Legacy classic-session seam. Session-owned services pass themselves directly. */\nexport function setMcpElicitationUiProvider(provider: McpElicitationUiProvider | undefined): void {\n\tlegacyUiProvider = provider;\n}\n\n/** Wire the elicitation/create handler onto a fresh client. */\nexport function configureMcpElicitation(\n\tclient: Client,\n\towner: McpElicitationUiOwner | McpElicitationUiProvider | undefined = legacyUiProvider,\n\ttimeoutMs: number = MCP_ELICITATION_TIMEOUT_MS,\n): void {\n\tclient.setRequestHandler(ElicitRequestSchema, async (request) => {\n\t\tconst params = request.params;\n\t\t// URL mode is deliberately unsupported in v1 (form mode only).\n\t\tif (!(\"requestedSchema\" in params)) return { action: \"decline\" };\n\t\tconst ui = typeof owner === \"function\" ? owner() : owner?.getMcpElicitationUi();\n\t\tif (ui === undefined) return { action: \"decline\" };\n\t\treturn await runElicitationForm(ui, params.message, params.requestedSchema, timeoutMs);\n\t});\n}\n\n/** Exported for tests: drive the form directly with a scripted UI. */\nexport async function runElicitationForm(\n\tui: ElicitationUi,\n\tmessage: string,\n\trequestedSchema: { properties?: Record<string, ElicitProperty>; required?: string[] },\n\ttimeoutMs: number = MCP_ELICITATION_TIMEOUT_MS,\n): Promise<ElicitationResponse> {\n\tlet timer: NodeJS.Timeout | undefined;\n\tconst timeout = new Promise<ElicitationResponse>((resolve) => {\n\t\ttimer = safeTimer(\"mcp.elicitation.timeout\", timeoutMs, () => resolve({ action: \"cancel\" }), {\n\t\t\tlogger: createMcpLogger(\"elicitation\"),\n\t\t});\n\t});\n\ttry {\n\t\treturn await Promise.race([collectForm(ui, message, requestedSchema), timeout]);\n\t} finally {\n\t\tif (timer !== undefined) clearTimeout(timer);\n\t}\n}\n\nasync function collectForm(\n\tui: ElicitationUi,\n\tmessage: string,\n\trequestedSchema: { properties?: Record<string, ElicitProperty>; required?: string[] },\n): Promise<ElicitationResponse> {\n\tconst content: Record<string, string | number | boolean> = {};\n\tconst required = new Set(requestedSchema.required ?? []);\n\tfor (const [name, property] of Object.entries(requestedSchema.properties ?? {})) {\n\t\tconst title = `${message} — ${property.title ?? name}`;\n\t\tif (property.type === \"boolean\") {\n\t\t\tcontent[name] = await ui.confirm(title, property.description ?? name);\n\t\t\tcontinue;\n\t\t}\n\t\tif (Array.isArray(property.enum) && property.enum.length > 0) {\n\t\t\tconst picked = await ui.select(title, property.enum.map(String));\n\t\t\tif (picked === undefined) return { action: \"decline\" };\n\t\t\tcontent[name] = picked;\n\t\t\tcontinue;\n\t\t}\n\t\tconst answer = await ui.input(title, property.description);\n\t\tif (answer === undefined || answer.length === 0) {\n\t\t\tif (required.has(name)) return { action: \"decline\" };\n\t\t\tcontinue;\n\t\t}\n\t\tif (property.type === \"number\" || property.type === \"integer\") {\n\t\t\tconst parsed = Number(answer);\n\t\t\tif (!Number.isFinite(parsed)) return { action: \"decline\" };\n\t\t\tcontent[name] = parsed;\n\t\t\tcontinue;\n\t\t}\n\t\tcontent[name] = answer;\n\t}\n\treturn { action: \"accept\", content };\n}\n"]}

package/dist/core/extensions/builtin/mcp/expose/register.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"register.d.ts","sourceRoot":"","sources":["../../../../../../src/core/extensions/builtin/mcp/expose/register.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAGrE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oCAAoC,CAAC;AACnE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,KAAK,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEtE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAczD,MAAM,WAAW,cAAc;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACpB;AAGD,MAAM,MAAM,iBAAiB,GAAG,cAAc,CAAC,OAAO,EAAE,cAAc,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC;AAC7F,KAAK,MAAM,GAAG,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;AAExC,MAAM,WAAW,6BAA6B;IAC7C,QAAQ,CAAC,yBAAyB,CAAC,EAAE,OAAO,CAAC;CAC7C;AAED,wBAAgB,uBAAuB,CACtC,EAAE,EAAE,IAAI,CAAC,YAAY,EAAE,gBAAgB,GAAG,gBAAgB,GAAG,cAAc,CAAC,EAC5E,OAAO,EAAE,SAAS,mBAAmB,EAAE,EACvC,aAAa,EAAE,SAAS,mBAAmB,EAAE,EAC7C,IAAI,CAAC,EAAE,MAAM,EACb,OAAO,GAAE,6BAAkC,GACzC,IAAI,CAMN;AAED,MAAM,WAAW,oBAAoB;IACpC,QAAQ,CAAC,KAAK,EAAE,mBAAmB,CAAC;IACpC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;CACtB;AAED;;4BAE4B;AAC5B,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,SAAS,mBAAmB,EAAE,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,oBAAoB,EAAE,CAOjH;AAED,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,SAAS,mBAAmB,EAAE,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,iBAAiB,EAAE,CAEnH;AA2BD;4EAC4E;AAC5E,wBAAsB,sBAAsB,CAC3C,KAAK,EAAE,mBAAmB,EAC1B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,MAAM,EAAE,WAAW,GAAG,SAAS,EAC/B,QAAQ,EAAE,UAAU,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,GACnD,OAAO,CAAC,eAAe,CAAC,cAAc,GAAG,SAAS,CAAC,CAAC,CActD"}
+{"version":3,"file":"register.d.ts","sourceRoot":"","sources":["../../../../../../src/core/extensions/builtin/mcp/expose/register.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAGrE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oCAAoC,CAAC;AACnE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,KAAK,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEtE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAczD,MAAM,WAAW,cAAc;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACpB;AAGD,MAAM,MAAM,iBAAiB,GAAG,cAAc,CAAC,OAAO,EAAE,cAAc,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC;AAC7F,KAAK,MAAM,GAAG,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;AAExC,MAAM,WAAW,6BAA6B;IAC7C,QAAQ,CAAC,yBAAyB,CAAC,EAAE,OAAO,CAAC;CAC7C;AAED,wBAAgB,uBAAuB,CACtC,EAAE,EAAE,IAAI,CAAC,YAAY,EAAE,gBAAgB,GAAG,gBAAgB,GAAG,cAAc,CAAC,EAC5E,OAAO,EAAE,SAAS,mBAAmB,EAAE,EACvC,aAAa,EAAE,SAAS,mBAAmB,EAAE,EAC7C,IAAI,CAAC,EAAE,MAAM,EACb,OAAO,GAAE,6BAAkC,GACzC,IAAI,CAMN;AAED,MAAM,WAAW,oBAAoB;IACpC,QAAQ,CAAC,KAAK,EAAE,mBAAmB,CAAC;IACpC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;CACtB;AAED;;4BAE4B;AAC5B,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,SAAS,mBAAmB,EAAE,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,oBAAoB,EAAE,CAOjH;AAED,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,SAAS,mBAAmB,EAAE,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,iBAAiB,EAAE,CAEnH;AA2BD;4EAC4E;AAC5E,wBAAsB,sBAAsB,CAC3C,KAAK,EAAE,mBAAmB,EAC1B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,MAAM,EAAE,WAAW,GAAG,SAAS,EAC/B,QAAQ,EAAE,UAAU,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,GACnD,OAAO,CAAC,eAAe,CAAC,cAAc,GAAG,SAAS,CAAC,CAAC,CAetD"}

package/dist/core/extensions/builtin/mcp/expose/register.js

@@ -59,6 +59,7 @@ export async function executeMcpCatalogEntry(entry, args, signal, onUpdate) {
     }
     const guarded = await applyMcpOutputGuard(mapped.content, {
         agentDir: entry.agentDir,
+        artifacts: entry.artifacts,
         outputGuard: entry.outputGuard,
         server: entry.server,
     });

package/dist/core/extensions/builtin/mcp/expose/register.js.map

@@ -1 +1 @@
-{"version":3,"file":"register.js","sourceRoot":"","sources":["../../../../../../src/core/extensions/builtin/mcp/expose/register.ts"],"names":[],"mappings":"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","sourcesContent":["import type { AgentToolResult } from \"@earendil-works/pi-agent-core\";\nimport type { ImageContent, TextContent } from \"@earendil-works/pi-ai\";\nimport { Text } from \"@earendil-works/pi-tui\";\nimport type { Progress } from \"@modelcontextprotocol/sdk/types.js\";\nimport type { TSchema } from \"typebox\";\nimport type { ExtensionAPI, ToolDefinition } from \"../../../types.ts\";\nimport { registerToolsPreservingActiveSet } from \"../active-set.ts\";\nimport type { McpToolCatalogEntry } from \"../catalog.ts\";\nimport { ToolExecError } from \"../errors.ts\";\nimport { applyMcpOutputGuard } from \"../guard/output-guard.ts\";\nimport { ensureMcpToolCallConnection, withMcpRetriableFailedSendRetry, withMcpSessionExpiryRetry } from \"../health.ts\";\nimport { runMcpConnectionLifecycleCall } from \"../idle.ts\";\nimport {\n\tbuildMcpToolNames,\n\tconvertJsonSchemaToTypeBox,\n\ttype McpContentBlock,\n\ttype McpMappedContentBlock,\n\ttype McpToolResultLike,\n\tmapMcpToolResult,\n} from \"./schema-compat.ts\";\n\nexport interface McpToolDetails {\n\tserver: string;\n\ttool: string;\n\tpreview?: string;\n\tprogress?: Progress;\n}\n\ntype McpAgentContent = TextContent | ImageContent;\nexport type McpToolDefinition = ToolDefinition<TSchema, McpToolDetails | undefined, unknown>;\ntype WarnFn = (message: string) => void;\n\nexport interface McpCatalogRegistrationOptions {\n\treadonly refreshActiveSetWhenEmpty?: boolean;\n}\n\nexport function registerMcpCatalogTools(\n\tpi: Pick<ExtensionAPI, \"getActiveTools\" | \"setActiveTools\" | \"registerTool\">,\n\tentries: readonly McpToolCatalogEntry[],\n\tactiveEntries: readonly McpToolCatalogEntry[],\n\twarn?: WarnFn,\n\toptions: McpCatalogRegistrationOptions = {},\n): void {\n\tif (entries.length === 0 && activeEntries.length === 0 && options.refreshActiveSetWhenEmpty !== true) return;\n\tconst tools = buildMcpToolDefinitions(entries, warn);\n\tconst currentActive = pi.getActiveTools().filter((name) => !name.startsWith(\"mcp_\"));\n\tconst mcpNames = buildActiveToolNames(entries, activeEntries, warn);\n\tregisterToolsPreservingActiveSet(pi, tools, [...currentActive, ...mcpNames]);\n}\n\nexport interface McpNamedCatalogEntry {\n\treadonly entry: McpToolCatalogEntry;\n\treadonly name: string;\n}\n\n/** Pair each catalog entry with its stable, collision-resolved mcp tool name.\n * Shared by the full-tool builder and the Tier-B search catalog so names never\n * drift between the two. */\nexport function mapMcpCatalogNames(entries: readonly McpToolCatalogEntry[], warn?: WarnFn): McpNamedCatalogEntry[] {\n\tconst sorted = [...entries].sort(compareCatalogEntries);\n\tconst names = buildMcpToolNames(\n\t\tsorted.map((entry) => ({ serverName: entry.server, toolName: entry.tool })),\n\t\twarn,\n\t);\n\treturn sorted.map((entry, index) => ({ entry, name: names[index] ?? \"\" }));\n}\n\nexport function buildMcpToolDefinitions(entries: readonly McpToolCatalogEntry[], warn?: WarnFn): McpToolDefinition[] {\n\treturn mapMcpCatalogNames(entries, warn).map(({ entry, name }) => createMcpToolDefinition(entry, name));\n}\n\nfunction createMcpToolDefinition(entry: McpToolCatalogEntry, name: string): McpToolDefinition {\n\tconst converted = convertJsonSchemaToTypeBox(entry.schema);\n\tconst label = `${entry.server}/${entry.tool}`;\n\treturn {\n\t\tname,\n\t\tlabel,\n\t\tdescription: entry.description ?? `MCP tool ${label}`,\n\t\tparameters: converted.schema,\n\t\texecutionMode: \"parallel\",\n\t\tasync execute(_toolCallId, params, signal, onUpdate): Promise<AgentToolResult<McpToolDetails | undefined>> {\n\t\t\tconst args: Record<string, unknown> = isRecord(params) ? params : {};\n\t\t\treturn await executeMcpCatalogEntry(entry, args, signal, onUpdate);\n\t\t},\n\t\trenderCall(args, theme) {\n\t\t\treturn new Text(theme.fg(\"toolTitle\", theme.bold(`${name} ${previewArgs(args)}`.trim())), 0, 0);\n\t\t},\n\t\trenderResult(result, options, theme) {\n\t\t\tconst title = options.isPartial\n\t\t\t\t? `${name}: running`\n\t\t\t\t: `${name}: ${result.details?.preview ?? \"(empty result)\"}`;\n\t\t\treturn new Text(theme.fg(\"toolOutput\", title), 0, 0);\n\t\t},\n\t};\n}\n\n/** Full guarded call path for one catalog entry (lifecycle + retry + output\n * guard). Shared by direct/search tool definitions and the Tier-C proxy. */\nexport async function executeMcpCatalogEntry(\n\tentry: McpToolCatalogEntry,\n\targs: Record<string, unknown>,\n\tsignal: AbortSignal | undefined,\n\tonUpdate: Parameters<McpToolDefinition[\"execute\"]>[3],\n): Promise<AgentToolResult<McpToolDetails | undefined>> {\n\tconst label = `${entry.server}/${entry.tool}`;\n\tconst result = await callMcpTool(entry, args, signal, onUpdate, label);\n\tconst mapped = mapMcpToolResult(normalizeCallToolResult(result));\n\tif (!mapped.ok) {\n\t\tthrow new ToolExecError(mapped.error.message, { phase: \"call\", serverName: entry.server });\n\t}\n\tconst guarded = await applyMcpOutputGuard(mapped.content, {\n\t\tagentDir: entry.agentDir,\n\t\toutputGuard: entry.outputGuard,\n\t\tserver: entry.server,\n\t});\n\tconst content = toAgentContent(guarded);\n\treturn { content, details: { preview: previewContent(content), server: entry.server, tool: entry.tool } };\n}\n\nasync function callMcpTool(\n\tentry: McpToolCatalogEntry,\n\targs: Record<string, unknown>,\n\tsignal: AbortSignal | undefined,\n\tonUpdate: Parameters<McpToolDefinition[\"execute\"]>[3],\n\tlabel: string,\n): Promise<Awaited<ReturnType<McpToolCatalogEntry[\"connection\"][\"client\"][\"callTool\"]>>> {\n\ttry {\n\t\treturn await runMcpConnectionLifecycleCall(entry.connection, () =>\n\t\t\twithMcpSessionExpiryRetry(entry.connection, async () => {\n\t\t\t\tawait ensureMcpToolCallConnection(entry.connection, entry.ensureFresh);\n\t\t\t\tawait entry.ensureConnected?.();\n\t\t\t\treturn await withMcpRetriableFailedSendRetry(entry.connection, async () => {\n\t\t\t\t\treturn await entry.connection.client.callTool({ name: entry.tool, arguments: args }, undefined, {\n\t\t\t\t\t\tonprogress: (progress) => {\n\t\t\t\t\t\t\tonUpdate?.({\n\t\t\t\t\t\t\t\tcontent: [{ type: \"text\", text: formatProgress(label, progress) }],\n\t\t\t\t\t\t\t\tdetails: { progress, server: entry.server, tool: entry.tool },\n\t\t\t\t\t\t\t});\n\t\t\t\t\t\t},\n\t\t\t\t\t\tsignal,\n\t\t\t\t\t\ttimeout: entry.requestTimeoutMs,\n\t\t\t\t\t});\n\t\t\t\t});\n\t\t\t}),\n\t\t);\n\t} catch (error) {\n\t\tthrow new ToolExecError(`ToolExecError: ${errorLabel(error)}`, {\n\t\t\tcause: error,\n\t\t\tphase: \"call\",\n\t\t\tserverName: entry.server,\n\t\t});\n\t}\n}\n\nfunction normalizeCallToolResult(\n\tresult: Awaited<ReturnType<McpToolCatalogEntry[\"connection\"][\"client\"][\"callTool\"]>>,\n): McpToolResultLike {\n\tif (\"content\" in result || \"structuredContent\" in result || \"isError\" in result) {\n\t\tconst candidate = result as Record<string, unknown>;\n\t\tconst normalized: McpToolResultLike = {};\n\t\tif (isMcpContentBlockArray(candidate.content)) normalized.content = candidate.content;\n\t\tif (typeof candidate.isError === \"boolean\") normalized.isError = candidate.isError;\n\t\tif (\"structuredContent\" in candidate) normalized.structuredContent = candidate.structuredContent;\n\t\treturn normalized;\n\t}\n\treturn { structuredContent: result.toolResult };\n}\n\nfunction isMcpContentBlockArray(value: unknown): value is McpContentBlock[] {\n\treturn Array.isArray(value);\n}\n\nfunction toAgentContent(blocks: readonly McpMappedContentBlock[]): McpAgentContent[] {\n\treturn blocks.map((block) => {\n\t\tif (block.type === \"text\" || block.type === \"image\") return block;\n\t\treturn { type: \"text\", text: JSON.stringify(block) };\n\t});\n}\n\nfunction previewContent(content: readonly McpAgentContent[]): string {\n\treturn truncatePreview(\n\t\tcontent\n\t\t\t.map((block) => (block.type === \"text\" ? block.text : `[${block.mimeType} image]`))\n\t\t\t.join(\" \")\n\t\t\t.trim() || \"(empty result)\",\n\t);\n}\n\nfunction previewArgs(args: unknown): string {\n\tconst text = JSON.stringify(args);\n\treturn text === undefined ? \"\" : truncatePreview(text);\n}\n\nfunction isRecord(value: unknown): value is Record<string, unknown> {\n\treturn typeof value === \"object\" && value !== null && !Array.isArray(value);\n}\n\nfunction errorLabel(error: unknown): string {\n\treturn error instanceof Error ? `${error.name}: ${error.message}` : String(error);\n}\n\nfunction formatProgress(label: string, progress: Progress): string {\n\tconst total = progress.total === undefined ? \"\" : `/${progress.total}`;\n\tconst message = progress.message === undefined ? \"\" : ` ${progress.message}`;\n\treturn `${label} progress ${progress.progress}${total}${message}`.trim();\n}\n\nfunction truncatePreview(value: string): string {\n\treturn value.length <= 120 ? value : `${value.slice(0, 117)}...`;\n}\n\nfunction compareCatalogEntries(left: McpToolCatalogEntry, right: McpToolCatalogEntry): number {\n\treturn left.server.localeCompare(right.server) || left.tool.localeCompare(right.tool);\n}\n\nfunction buildActiveToolNames(\n\tentries: readonly McpToolCatalogEntry[],\n\tactiveEntries: readonly McpToolCatalogEntry[],\n\twarn?: WarnFn,\n): string[] {\n\tconst activeKeys = new Set(activeEntries.map(catalogEntryKey));\n\tconst sorted = [...entries].sort(compareCatalogEntries);\n\tconst names = buildMcpToolNames(\n\t\tsorted.map((entry) => ({ serverName: entry.server, toolName: entry.tool })),\n\t\twarn,\n\t);\n\treturn sorted\n\t\t.map((entry, index) => (activeKeys.has(catalogEntryKey(entry)) ? (names[index] ?? \"\") : \"\"))\n\t\t.filter((name) => name.length > 0)\n\t\t.sort();\n}\n\nfunction catalogEntryKey(entry: McpToolCatalogEntry): string {\n\treturn `${entry.server}\\0${entry.tool}`;\n}\n"]}
+{"version":3,"file":"register.js","sourceRoot":"","sources":["../../../../../../src/core/extensions/builtin/mcp/expose/register.ts"],"names":[],"mappings":"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","sourcesContent":["import type { AgentToolResult } from \"@earendil-works/pi-agent-core\";\nimport type { ImageContent, TextContent } from \"@earendil-works/pi-ai\";\nimport { Text } from \"@earendil-works/pi-tui\";\nimport type { Progress } from \"@modelcontextprotocol/sdk/types.js\";\nimport type { TSchema } from \"typebox\";\nimport type { ExtensionAPI, ToolDefinition } from \"../../../types.ts\";\nimport { registerToolsPreservingActiveSet } from \"../active-set.ts\";\nimport type { McpToolCatalogEntry } from \"../catalog.ts\";\nimport { ToolExecError } from \"../errors.ts\";\nimport { applyMcpOutputGuard } from \"../guard/output-guard.ts\";\nimport { ensureMcpToolCallConnection, withMcpRetriableFailedSendRetry, withMcpSessionExpiryRetry } from \"../health.ts\";\nimport { runMcpConnectionLifecycleCall } from \"../idle.ts\";\nimport {\n\tbuildMcpToolNames,\n\tconvertJsonSchemaToTypeBox,\n\ttype McpContentBlock,\n\ttype McpMappedContentBlock,\n\ttype McpToolResultLike,\n\tmapMcpToolResult,\n} from \"./schema-compat.ts\";\n\nexport interface McpToolDetails {\n\tserver: string;\n\ttool: string;\n\tpreview?: string;\n\tprogress?: Progress;\n}\n\ntype McpAgentContent = TextContent | ImageContent;\nexport type McpToolDefinition = ToolDefinition<TSchema, McpToolDetails | undefined, unknown>;\ntype WarnFn = (message: string) => void;\n\nexport interface McpCatalogRegistrationOptions {\n\treadonly refreshActiveSetWhenEmpty?: boolean;\n}\n\nexport function registerMcpCatalogTools(\n\tpi: Pick<ExtensionAPI, \"getActiveTools\" | \"setActiveTools\" | \"registerTool\">,\n\tentries: readonly McpToolCatalogEntry[],\n\tactiveEntries: readonly McpToolCatalogEntry[],\n\twarn?: WarnFn,\n\toptions: McpCatalogRegistrationOptions = {},\n): void {\n\tif (entries.length === 0 && activeEntries.length === 0 && options.refreshActiveSetWhenEmpty !== true) return;\n\tconst tools = buildMcpToolDefinitions(entries, warn);\n\tconst currentActive = pi.getActiveTools().filter((name) => !name.startsWith(\"mcp_\"));\n\tconst mcpNames = buildActiveToolNames(entries, activeEntries, warn);\n\tregisterToolsPreservingActiveSet(pi, tools, [...currentActive, ...mcpNames]);\n}\n\nexport interface McpNamedCatalogEntry {\n\treadonly entry: McpToolCatalogEntry;\n\treadonly name: string;\n}\n\n/** Pair each catalog entry with its stable, collision-resolved mcp tool name.\n * Shared by the full-tool builder and the Tier-B search catalog so names never\n * drift between the two. */\nexport function mapMcpCatalogNames(entries: readonly McpToolCatalogEntry[], warn?: WarnFn): McpNamedCatalogEntry[] {\n\tconst sorted = [...entries].sort(compareCatalogEntries);\n\tconst names = buildMcpToolNames(\n\t\tsorted.map((entry) => ({ serverName: entry.server, toolName: entry.tool })),\n\t\twarn,\n\t);\n\treturn sorted.map((entry, index) => ({ entry, name: names[index] ?? \"\" }));\n}\n\nexport function buildMcpToolDefinitions(entries: readonly McpToolCatalogEntry[], warn?: WarnFn): McpToolDefinition[] {\n\treturn mapMcpCatalogNames(entries, warn).map(({ entry, name }) => createMcpToolDefinition(entry, name));\n}\n\nfunction createMcpToolDefinition(entry: McpToolCatalogEntry, name: string): McpToolDefinition {\n\tconst converted = convertJsonSchemaToTypeBox(entry.schema);\n\tconst label = `${entry.server}/${entry.tool}`;\n\treturn {\n\t\tname,\n\t\tlabel,\n\t\tdescription: entry.description ?? `MCP tool ${label}`,\n\t\tparameters: converted.schema,\n\t\texecutionMode: \"parallel\",\n\t\tasync execute(_toolCallId, params, signal, onUpdate): Promise<AgentToolResult<McpToolDetails | undefined>> {\n\t\t\tconst args: Record<string, unknown> = isRecord(params) ? params : {};\n\t\t\treturn await executeMcpCatalogEntry(entry, args, signal, onUpdate);\n\t\t},\n\t\trenderCall(args, theme) {\n\t\t\treturn new Text(theme.fg(\"toolTitle\", theme.bold(`${name} ${previewArgs(args)}`.trim())), 0, 0);\n\t\t},\n\t\trenderResult(result, options, theme) {\n\t\t\tconst title = options.isPartial\n\t\t\t\t? `${name}: running`\n\t\t\t\t: `${name}: ${result.details?.preview ?? \"(empty result)\"}`;\n\t\t\treturn new Text(theme.fg(\"toolOutput\", title), 0, 0);\n\t\t},\n\t};\n}\n\n/** Full guarded call path for one catalog entry (lifecycle + retry + output\n * guard). Shared by direct/search tool definitions and the Tier-C proxy. */\nexport async function executeMcpCatalogEntry(\n\tentry: McpToolCatalogEntry,\n\targs: Record<string, unknown>,\n\tsignal: AbortSignal | undefined,\n\tonUpdate: Parameters<McpToolDefinition[\"execute\"]>[3],\n): Promise<AgentToolResult<McpToolDetails | undefined>> {\n\tconst label = `${entry.server}/${entry.tool}`;\n\tconst result = await callMcpTool(entry, args, signal, onUpdate, label);\n\tconst mapped = mapMcpToolResult(normalizeCallToolResult(result));\n\tif (!mapped.ok) {\n\t\tthrow new ToolExecError(mapped.error.message, { phase: \"call\", serverName: entry.server });\n\t}\n\tconst guarded = await applyMcpOutputGuard(mapped.content, {\n\t\tagentDir: entry.agentDir,\n\t\tartifacts: entry.artifacts,\n\t\toutputGuard: entry.outputGuard,\n\t\tserver: entry.server,\n\t});\n\tconst content = toAgentContent(guarded);\n\treturn { content, details: { preview: previewContent(content), server: entry.server, tool: entry.tool } };\n}\n\nasync function callMcpTool(\n\tentry: McpToolCatalogEntry,\n\targs: Record<string, unknown>,\n\tsignal: AbortSignal | undefined,\n\tonUpdate: Parameters<McpToolDefinition[\"execute\"]>[3],\n\tlabel: string,\n): Promise<Awaited<ReturnType<McpToolCatalogEntry[\"connection\"][\"client\"][\"callTool\"]>>> {\n\ttry {\n\t\treturn await runMcpConnectionLifecycleCall(entry.connection, () =>\n\t\t\twithMcpSessionExpiryRetry(entry.connection, async () => {\n\t\t\t\tawait ensureMcpToolCallConnection(entry.connection, entry.ensureFresh);\n\t\t\t\tawait entry.ensureConnected?.();\n\t\t\t\treturn await withMcpRetriableFailedSendRetry(entry.connection, async () => {\n\t\t\t\t\treturn await entry.connection.client.callTool({ name: entry.tool, arguments: args }, undefined, {\n\t\t\t\t\t\tonprogress: (progress) => {\n\t\t\t\t\t\t\tonUpdate?.({\n\t\t\t\t\t\t\t\tcontent: [{ type: \"text\", text: formatProgress(label, progress) }],\n\t\t\t\t\t\t\t\tdetails: { progress, server: entry.server, tool: entry.tool },\n\t\t\t\t\t\t\t});\n\t\t\t\t\t\t},\n\t\t\t\t\t\tsignal,\n\t\t\t\t\t\ttimeout: entry.requestTimeoutMs,\n\t\t\t\t\t});\n\t\t\t\t});\n\t\t\t}),\n\t\t);\n\t} catch (error) {\n\t\tthrow new ToolExecError(`ToolExecError: ${errorLabel(error)}`, {\n\t\t\tcause: error,\n\t\t\tphase: \"call\",\n\t\t\tserverName: entry.server,\n\t\t});\n\t}\n}\n\nfunction normalizeCallToolResult(\n\tresult: Awaited<ReturnType<McpToolCatalogEntry[\"connection\"][\"client\"][\"callTool\"]>>,\n): McpToolResultLike {\n\tif (\"content\" in result || \"structuredContent\" in result || \"isError\" in result) {\n\t\tconst candidate = result as Record<string, unknown>;\n\t\tconst normalized: McpToolResultLike = {};\n\t\tif (isMcpContentBlockArray(candidate.content)) normalized.content = candidate.content;\n\t\tif (typeof candidate.isError === \"boolean\") normalized.isError = candidate.isError;\n\t\tif (\"structuredContent\" in candidate) normalized.structuredContent = candidate.structuredContent;\n\t\treturn normalized;\n\t}\n\treturn { structuredContent: result.toolResult };\n}\n\nfunction isMcpContentBlockArray(value: unknown): value is McpContentBlock[] {\n\treturn Array.isArray(value);\n}\n\nfunction toAgentContent(blocks: readonly McpMappedContentBlock[]): McpAgentContent[] {\n\treturn blocks.map((block) => {\n\t\tif (block.type === \"text\" || block.type === \"image\") return block;\n\t\treturn { type: \"text\", text: JSON.stringify(block) };\n\t});\n}\n\nfunction previewContent(content: readonly McpAgentContent[]): string {\n\treturn truncatePreview(\n\t\tcontent\n\t\t\t.map((block) => (block.type === \"text\" ? block.text : `[${block.mimeType} image]`))\n\t\t\t.join(\" \")\n\t\t\t.trim() || \"(empty result)\",\n\t);\n}\n\nfunction previewArgs(args: unknown): string {\n\tconst text = JSON.stringify(args);\n\treturn text === undefined ? \"\" : truncatePreview(text);\n}\n\nfunction isRecord(value: unknown): value is Record<string, unknown> {\n\treturn typeof value === \"object\" && value !== null && !Array.isArray(value);\n}\n\nfunction errorLabel(error: unknown): string {\n\treturn error instanceof Error ? `${error.name}: ${error.message}` : String(error);\n}\n\nfunction formatProgress(label: string, progress: Progress): string {\n\tconst total = progress.total === undefined ? \"\" : `/${progress.total}`;\n\tconst message = progress.message === undefined ? \"\" : ` ${progress.message}`;\n\treturn `${label} progress ${progress.progress}${total}${message}`.trim();\n}\n\nfunction truncatePreview(value: string): string {\n\treturn value.length <= 120 ? value : `${value.slice(0, 117)}...`;\n}\n\nfunction compareCatalogEntries(left: McpToolCatalogEntry, right: McpToolCatalogEntry): number {\n\treturn left.server.localeCompare(right.server) || left.tool.localeCompare(right.tool);\n}\n\nfunction buildActiveToolNames(\n\tentries: readonly McpToolCatalogEntry[],\n\tactiveEntries: readonly McpToolCatalogEntry[],\n\twarn?: WarnFn,\n): string[] {\n\tconst activeKeys = new Set(activeEntries.map(catalogEntryKey));\n\tconst sorted = [...entries].sort(compareCatalogEntries);\n\tconst names = buildMcpToolNames(\n\t\tsorted.map((entry) => ({ serverName: entry.server, toolName: entry.tool })),\n\t\twarn,\n\t);\n\treturn sorted\n\t\t.map((entry, index) => (activeKeys.has(catalogEntryKey(entry)) ? (names[index] ?? \"\") : \"\"))\n\t\t.filter((name) => name.length > 0)\n\t\t.sort();\n}\n\nfunction catalogEntryKey(entry: McpToolCatalogEntry): string {\n\treturn `${entry.server}\\0${entry.tool}`;\n}\n"]}

package/dist/core/extensions/builtin/mcp/expose/session.d.ts

@@ -2,6 +2,7 @@ import type { ExtensionAPI } from "../../../types.ts";
 import type { McpCachedServerCatalog } from "../catalog-cache.ts";
 import type { ResolvedMcpConfig } from "../config-schema.ts";
 import type { ServerConnection } from "../connection.ts";
+import type { McpOutputArtifacts } from "../guard/output-guard.ts";
 import { type McpLogger } from "../log.ts";
 import type { McpPromptServer } from "../prompts.ts";
 import { type McpResourceServer } from "../resources.ts";
@@ -16,6 +17,7 @@ export interface McpDirectRegistrationEntry {
     readonly connection: ServerConnection;
     readonly logger: McpLogger;
     readonly agentDir?: string;
+    readonly artifacts?: McpOutputArtifacts;
     readonly cachedCatalog?: McpCachedServerCatalog;
     readonly ensureFresh?: () => Promise<void>;
     readonly ensureCachedToolConnected?: () => Promise<void>;

package/dist/core/extensions/builtin/mcp/expose/session.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../../../../../src/core/extensions/builtin/mcp/expose/session.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEtD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAClE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,EAAmB,KAAK,SAAS,EAAE,MAAM,WAAW,CAAC;AAC5D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,EAA0B,KAAK,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAEjF,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,eAAe,CAAC;AACnE,OAAO,EAAE,KAAK,oBAAoB,EAAyB,MAAM,aAAa,CAAC;AAE/E,MAAM,MAAM,sBAAsB,GAAG,oBAAoB,GAAG;IAC3D,eAAe,EAAE,iBAAiB,EAAE,CAAC;IACrC,aAAa,EAAE,eAAe,EAAE,CAAC;CACjC,CAAC;AAEF,MAAM,WAAW,0BAA0B;IAC1C,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,UAAU,EAAE,gBAAgB,CAAC;IACtC,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC;IAC3B,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,aAAa,CAAC,EAAE,sBAAsB,CAAC;IAChD,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3C,QAAQ,CAAC,yBAAyB,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CACzD;AAED,wBAAsB,sBAAsB,CAC3C,EAAE,EAAE,IAAI,CAAC,YAAY,EAAE,gBAAgB,GAAG,gBAAgB,GAAG,cAAc,CAAC,EAC5E,MAAM,EAAE,iBAAiB,EACzB,OAAO,EAAE,QAAQ,CAAC,0BAA0B,CAAC,EAC7C,OAAO,GAAE,6BAAkC,GACzC,OAAO,CAAC,sBAAsB,GAAG,SAAS,CAAC,CA2E7C"}
+{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../../../../../src/core/extensions/builtin/mcp/expose/session.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEtD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAClE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AACnE,OAAO,EAAmB,KAAK,SAAS,EAAE,MAAM,WAAW,CAAC;AAC5D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,EAA0B,KAAK,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAEjF,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,eAAe,CAAC;AACnE,OAAO,EAAE,KAAK,oBAAoB,EAAyB,MAAM,aAAa,CAAC;AAE/E,MAAM,MAAM,sBAAsB,GAAG,oBAAoB,GAAG;IAC3D,eAAe,EAAE,iBAAiB,EAAE,CAAC;IACrC,aAAa,EAAE,eAAe,EAAE,CAAC;CACjC,CAAC;AAEF,MAAM,WAAW,0BAA0B;IAC1C,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,UAAU,EAAE,gBAAgB,CAAC;IACtC,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC;IAC3B,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,SAAS,CAAC,EAAE,kBAAkB,CAAC;IACxC,QAAQ,CAAC,aAAa,CAAC,EAAE,sBAAsB,CAAC;IAChD,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3C,QAAQ,CAAC,yBAAyB,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CACzD;AAED,wBAAsB,sBAAsB,CAC3C,EAAE,EAAE,IAAI,CAAC,YAAY,EAAE,gBAAgB,GAAG,gBAAgB,GAAG,cAAc,CAAC,EAC5E,MAAM,EAAE,iBAAiB,EACzB,OAAO,EAAE,QAAQ,CAAC,0BAA0B,CAAC,EAC7C,OAAO,GAAE,6BAAkC,GACzC,OAAO,CAAC,sBAAsB,GAAG,SAAS,CAAC,CA8E7C"}

package/dist/core/extensions/builtin/mcp/expose/session.js

@@ -18,12 +18,14 @@ export async function registerDirectMcpTools(pi, config, entries, options = {})
             ? entry.connection.state === "connected"
                 ? await collectToolCatalog(entry.name, entry.connection, server.config, {
                     agentDir: entry.agentDir,
+                    artifacts: entry.artifacts,
                     ensureFresh: entry.ensureFresh,
                     outputGuard: config.settings.outputGuard,
                 })
                 : []
             : cachedToolsToCatalogEntries(entry.name, entry.cachedCatalog, entry.connection, server.config.requestTimeoutMs, entry.ensureCachedToolConnected ?? (() => entry.connection.connect().then(() => undefined)), {
                 agentDir: entry.agentDir,
+                artifacts: entry.artifacts,
                 ensureFresh: entry.ensureFresh,
                 outputGuard: config.settings.outputGuard,
             });
@@ -40,6 +42,7 @@ export async function registerDirectMcpTools(pi, config, entries, options = {})
         if (cachedResources.length > 0) {
             resourceServers.push({
                 agentDir: entry.agentDir,
+                artifacts: entry.artifacts,
                 connection: entry.connection,
                 outputGuard: config.settings.outputGuard,
                 requestTimeoutMs: server.config.requestTimeoutMs,

package/dist/core/extensions/builtin/mcp/expose/session.js.map

@@ -1 +1 @@
-{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../../../../src/core/extensions/builtin/mcp/expose/session.ts"],"names":[],"mappings":"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","sourcesContent":["import type { ExtensionAPI } from \"../../../types.ts\";\nimport { cachedToolsToCatalogEntries, collectToolCatalog, type McpToolCatalogEntry } from \"../catalog.ts\";\nimport type { McpCachedServerCatalog } from \"../catalog-cache.ts\";\nimport type { ResolvedMcpConfig } from \"../config-schema.ts\";\nimport type { ServerConnection } from \"../connection.ts\";\nimport { createMcpLogger, type McpLogger } from \"../log.ts\";\nimport type { McpPromptServer } from \"../prompts.ts\";\nimport { createMcpResourceTools, type McpResourceServer } from \"../resources.ts\";\nimport { computeMcpExposurePolicy } from \"./policy.ts\";\nimport type { McpCatalogRegistrationOptions } from \"./register.ts\";\nimport { type McpTierBRegistration, registerMcpTierBTools } from \"./tier-b.ts\";\n\nexport type McpSessionRegistration = McpTierBRegistration & {\n\tresourceServers: McpResourceServer[];\n\tpromptServers: McpPromptServer[];\n};\n\nexport interface McpDirectRegistrationEntry {\n\treadonly name: string;\n\treadonly connection: ServerConnection;\n\treadonly logger: McpLogger;\n\treadonly agentDir?: string;\n\treadonly cachedCatalog?: McpCachedServerCatalog;\n\treadonly ensureFresh?: () => Promise<void>;\n\treadonly ensureCachedToolConnected?: () => Promise<void>;\n}\n\nexport async function registerDirectMcpTools(\n\tpi: Pick<ExtensionAPI, \"getActiveTools\" | \"setActiveTools\" | \"registerTool\">,\n\tconfig: ResolvedMcpConfig,\n\tentries: Iterable<McpDirectRegistrationEntry>,\n\toptions: McpCatalogRegistrationOptions = {},\n): Promise<McpSessionRegistration | undefined> {\n\tconst registeredEntries: McpToolCatalogEntry[] = [];\n\tconst activeEntries: McpToolCatalogEntry[] = [];\n\tlet searchMode = false;\n\tconst proxyGateways: { server: string; entries: McpToolCatalogEntry[] }[] = [];\n\tconst resourceServers: McpResourceServer[] = [];\n\tconst promptServers: McpPromptServer[] = [];\n\tfor (const entry of entries) {\n\t\tconst server = config.servers[entry.name];\n\t\tif (server?.config === undefined) continue;\n\t\tconst catalog =\n\t\t\tentry.cachedCatalog === undefined\n\t\t\t\t? entry.connection.state === \"connected\"\n\t\t\t\t\t? await collectToolCatalog(entry.name, entry.connection, server.config, {\n\t\t\t\t\t\t\tagentDir: entry.agentDir,\n\t\t\t\t\t\t\tensureFresh: entry.ensureFresh,\n\t\t\t\t\t\t\toutputGuard: config.settings.outputGuard,\n\t\t\t\t\t\t})\n\t\t\t\t\t: []\n\t\t\t\t: cachedToolsToCatalogEntries(\n\t\t\t\t\t\tentry.name,\n\t\t\t\t\t\tentry.cachedCatalog,\n\t\t\t\t\t\tentry.connection,\n\t\t\t\t\t\tserver.config.requestTimeoutMs,\n\t\t\t\t\t\tentry.ensureCachedToolConnected ?? (() => entry.connection.connect().then(() => undefined)),\n\t\t\t\t\t\t{\n\t\t\t\t\t\t\tagentDir: entry.agentDir,\n\t\t\t\t\t\t\tensureFresh: entry.ensureFresh,\n\t\t\t\t\t\t\toutputGuard: config.settings.outputGuard,\n\t\t\t\t\t\t},\n\t\t\t\t\t);\n\t\tconst cachedPrompts = entry.cachedCatalog?.prompts ?? [];\n\t\tif (cachedPrompts.length > 0) {\n\t\t\tpromptServers.push({\n\t\t\t\tconnection: entry.connection,\n\t\t\t\tprompts: cachedPrompts,\n\t\t\t\trequestTimeoutMs: server.config.requestTimeoutMs,\n\t\t\t\tserver: entry.name,\n\t\t\t});\n\t\t}\n\t\tconst cachedResources = entry.cachedCatalog?.resources ?? [];\n\t\tif (cachedResources.length > 0) {\n\t\t\tresourceServers.push({\n\t\t\t\tagentDir: entry.agentDir,\n\t\t\t\tconnection: entry.connection,\n\t\t\t\toutputGuard: config.settings.outputGuard,\n\t\t\t\trequestTimeoutMs: server.config.requestTimeoutMs,\n\t\t\t\tresources: cachedResources,\n\t\t\t\tserver: entry.name,\n\t\t\t});\n\t\t}\n\t\tconst policy = computeMcpExposurePolicy(catalog, server.config, config.settings);\n\t\tfor (const warning of policy.warnings) entry.logger.warn(warning);\n\t\tif (policy.mode === \"search\") searchMode = true;\n\t\tif (policy.mode === \"proxy\") proxyGateways.push({ entries: [...policy.filteredEntries], server: entry.name });\n\t\tregisteredEntries.push(...policy.registeredEntries);\n\t\tactiveEntries.push(...policy.activeEntries);\n\t}\n\t// Skip touching the active set only when there is genuinely nothing to do.\n\tif (\n\t\tregisteredEntries.length === 0 &&\n\t\tactiveEntries.length === 0 &&\n\t\t!searchMode &&\n\t\tproxyGateways.length === 0 &&\n\t\toptions.refreshActiveSetWhenEmpty !== true\n\t) {\n\t\treturn undefined;\n\t}\n\tconst utilityTools = resourceServers.length > 0 ? createMcpResourceTools(() => resourceServers) : [];\n\tconst registration = registerMcpTierBTools(\n\t\tpi,\n\t\t{ activeEntries, proxyGateways, registeredEntries, searchMode, settings: config.settings, utilityTools },\n\t\t(message) => createMcpLogger(\"service\").warn(message),\n\t);\n\treturn { ...registration, promptServers, resourceServers };\n}\n"]}
+{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../../../../src/core/extensions/builtin/mcp/expose/session.ts"],"names":[],"mappings":"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","sourcesContent":["import type { ExtensionAPI } from \"../../../types.ts\";\nimport { cachedToolsToCatalogEntries, collectToolCatalog, type McpToolCatalogEntry } from \"../catalog.ts\";\nimport type { McpCachedServerCatalog } from \"../catalog-cache.ts\";\nimport type { ResolvedMcpConfig } from \"../config-schema.ts\";\nimport type { ServerConnection } from \"../connection.ts\";\nimport type { McpOutputArtifacts } from \"../guard/output-guard.ts\";\nimport { createMcpLogger, type McpLogger } from \"../log.ts\";\nimport type { McpPromptServer } from \"../prompts.ts\";\nimport { createMcpResourceTools, type McpResourceServer } from \"../resources.ts\";\nimport { computeMcpExposurePolicy } from \"./policy.ts\";\nimport type { McpCatalogRegistrationOptions } from \"./register.ts\";\nimport { type McpTierBRegistration, registerMcpTierBTools } from \"./tier-b.ts\";\n\nexport type McpSessionRegistration = McpTierBRegistration & {\n\tresourceServers: McpResourceServer[];\n\tpromptServers: McpPromptServer[];\n};\n\nexport interface McpDirectRegistrationEntry {\n\treadonly name: string;\n\treadonly connection: ServerConnection;\n\treadonly logger: McpLogger;\n\treadonly agentDir?: string;\n\treadonly artifacts?: McpOutputArtifacts;\n\treadonly cachedCatalog?: McpCachedServerCatalog;\n\treadonly ensureFresh?: () => Promise<void>;\n\treadonly ensureCachedToolConnected?: () => Promise<void>;\n}\n\nexport async function registerDirectMcpTools(\n\tpi: Pick<ExtensionAPI, \"getActiveTools\" | \"setActiveTools\" | \"registerTool\">,\n\tconfig: ResolvedMcpConfig,\n\tentries: Iterable<McpDirectRegistrationEntry>,\n\toptions: McpCatalogRegistrationOptions = {},\n): Promise<McpSessionRegistration | undefined> {\n\tconst registeredEntries: McpToolCatalogEntry[] = [];\n\tconst activeEntries: McpToolCatalogEntry[] = [];\n\tlet searchMode = false;\n\tconst proxyGateways: { server: string; entries: McpToolCatalogEntry[] }[] = [];\n\tconst resourceServers: McpResourceServer[] = [];\n\tconst promptServers: McpPromptServer[] = [];\n\tfor (const entry of entries) {\n\t\tconst server = config.servers[entry.name];\n\t\tif (server?.config === undefined) continue;\n\t\tconst catalog =\n\t\t\tentry.cachedCatalog === undefined\n\t\t\t\t? entry.connection.state === \"connected\"\n\t\t\t\t\t? await collectToolCatalog(entry.name, entry.connection, server.config, {\n\t\t\t\t\t\t\tagentDir: entry.agentDir,\n\t\t\t\t\t\t\tartifacts: entry.artifacts,\n\t\t\t\t\t\t\tensureFresh: entry.ensureFresh,\n\t\t\t\t\t\t\toutputGuard: config.settings.outputGuard,\n\t\t\t\t\t\t})\n\t\t\t\t\t: []\n\t\t\t\t: cachedToolsToCatalogEntries(\n\t\t\t\t\t\tentry.name,\n\t\t\t\t\t\tentry.cachedCatalog,\n\t\t\t\t\t\tentry.connection,\n\t\t\t\t\t\tserver.config.requestTimeoutMs,\n\t\t\t\t\t\tentry.ensureCachedToolConnected ?? (() => entry.connection.connect().then(() => undefined)),\n\t\t\t\t\t\t{\n\t\t\t\t\t\t\tagentDir: entry.agentDir,\n\t\t\t\t\t\t\tartifacts: entry.artifacts,\n\t\t\t\t\t\t\tensureFresh: entry.ensureFresh,\n\t\t\t\t\t\t\toutputGuard: config.settings.outputGuard,\n\t\t\t\t\t\t},\n\t\t\t\t\t);\n\t\tconst cachedPrompts = entry.cachedCatalog?.prompts ?? [];\n\t\tif (cachedPrompts.length > 0) {\n\t\t\tpromptServers.push({\n\t\t\t\tconnection: entry.connection,\n\t\t\t\tprompts: cachedPrompts,\n\t\t\t\trequestTimeoutMs: server.config.requestTimeoutMs,\n\t\t\t\tserver: entry.name,\n\t\t\t});\n\t\t}\n\t\tconst cachedResources = entry.cachedCatalog?.resources ?? [];\n\t\tif (cachedResources.length > 0) {\n\t\t\tresourceServers.push({\n\t\t\t\tagentDir: entry.agentDir,\n\t\t\t\tartifacts: entry.artifacts,\n\t\t\t\tconnection: entry.connection,\n\t\t\t\toutputGuard: config.settings.outputGuard,\n\t\t\t\trequestTimeoutMs: server.config.requestTimeoutMs,\n\t\t\t\tresources: cachedResources,\n\t\t\t\tserver: entry.name,\n\t\t\t});\n\t\t}\n\t\tconst policy = computeMcpExposurePolicy(catalog, server.config, config.settings);\n\t\tfor (const warning of policy.warnings) entry.logger.warn(warning);\n\t\tif (policy.mode === \"search\") searchMode = true;\n\t\tif (policy.mode === \"proxy\") proxyGateways.push({ entries: [...policy.filteredEntries], server: entry.name });\n\t\tregisteredEntries.push(...policy.registeredEntries);\n\t\tactiveEntries.push(...policy.activeEntries);\n\t}\n\t// Skip touching the active set only when there is genuinely nothing to do.\n\tif (\n\t\tregisteredEntries.length === 0 &&\n\t\tactiveEntries.length === 0 &&\n\t\t!searchMode &&\n\t\tproxyGateways.length === 0 &&\n\t\toptions.refreshActiveSetWhenEmpty !== true\n\t) {\n\t\treturn undefined;\n\t}\n\tconst utilityTools = resourceServers.length > 0 ? createMcpResourceTools(() => resourceServers) : [];\n\tconst registration = registerMcpTierBTools(\n\t\tpi,\n\t\t{ activeEntries, proxyGateways, registeredEntries, searchMode, settings: config.settings, utilityTools },\n\t\t(message) => createMcpLogger(\"service\").warn(message),\n\t);\n\treturn { ...registration, promptServers, resourceServers };\n}\n"]}

package/dist/core/extensions/builtin/mcp/guard/output-guard.d.ts

@@ -2,9 +2,17 @@ import type { McpSettings } from "../config-schema.ts";
 import type { McpMappedContentBlock } from "../expose/schema-compat.ts";
 export interface McpOutputGuardOptions {
     readonly agentDir?: string;
+    /** Owner of spill files for one MCP service/session. */
+    readonly artifacts?: McpOutputArtifacts;
     readonly server: string;
     readonly outputGuard?: McpSettings["outputGuard"];
 }
+/** Tracks the output artifacts owned by one MCP service. */
+export declare class McpOutputArtifacts {
+    #private;
+    track(path: string): void;
+    cleanup(): Promise<void>;
+}
 export declare function applyMcpOutputGuard(content: readonly McpMappedContentBlock[], options: McpOutputGuardOptions): Promise<readonly McpMappedContentBlock[]>;
-export declare function cleanupMcpOutputArtifacts(): Promise<void>;
+export declare function cleanupMcpOutputArtifacts(artifacts?: McpOutputArtifacts): Promise<void>;
 //# sourceMappingURL=output-guard.d.ts.map

package/dist/core/extensions/builtin/mcp/guard/output-guard.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"output-guard.d.ts","sourceRoot":"","sources":["../../../../../../src/core/extensions/builtin/mcp/guard/output-guard.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAExE,MAAM,WAAW,qBAAqB;IACrC,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,WAAW,CAAC,EAAE,WAAW,CAAC,aAAa,CAAC,CAAC;CAClD;AAgBD,wBAAsB,mBAAmB,CACxC,OAAO,EAAE,SAAS,qBAAqB,EAAE,EACzC,OAAO,EAAE,qBAAqB,GAC5B,OAAO,CAAC,SAAS,qBAAqB,EAAE,CAAC,CAW3C;AA8ED,wBAAsB,yBAAyB,IAAI,OAAO,CAAC,IAAI,CAAC,CAI/D"}
+{"version":3,"file":"output-guard.d.ts","sourceRoot":"","sources":["../../../../../../src/core/extensions/builtin/mcp/guard/output-guard.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAExE,MAAM,WAAW,qBAAqB;IACrC,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAC3B,wDAAwD;IACxD,QAAQ,CAAC,SAAS,CAAC,EAAE,kBAAkB,CAAC;IACxC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,WAAW,CAAC,EAAE,WAAW,CAAC,aAAa,CAAC,CAAC;CAClD;AAeD,4DAA4D;AAC5D,qBAAa,kBAAkB;;IAG9B,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAExB;IAEK,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAI7B;CACD;AAMD,wBAAsB,mBAAmB,CACxC,OAAO,EAAE,SAAS,qBAAqB,EAAE,EACzC,OAAO,EAAE,qBAAqB,GAC5B,OAAO,CAAC,SAAS,qBAAqB,EAAE,CAAC,CAW3C;AA8ED,wBAAsB,yBAAyB,CAAC,SAAS,GAAE,kBAAoC,GAAG,OAAO,CAAC,IAAI,CAAC,CAE9G"}

package/dist/core/extensions/builtin/mcp/guard/output-guard.js

@@ -5,7 +5,21 @@ const DEFAULT_MAX_BYTES = 50 * 1024;
 const DEFAULT_MAX_LINES = 2000;
 const PREVIEW_BYTE_BUDGET = 8192;
 let spillCounter = 0;
-const spilledFiles = new Set();
+/** Tracks the output artifacts owned by one MCP service. */
+export class McpOutputArtifacts {
+    #files = new Set();
+    track(path) {
+        this.#files.add(path);
+    }
+    async cleanup() {
+        const files = [...this.#files];
+        this.#files.clear();
+        await Promise.all(files.map((file) => rm(file, { force: true })));
+    }
+}
+// Legacy direct callers retain the historic process-wide owner. MCP services
+// pass their own owner so one session cannot remove another's spill files.
+const legacyArtifacts = new McpOutputArtifacts();
 export async function applyMcpOutputGuard(content, options) {
     const limits = outputGuardLimits(options.outputGuard);
     const payload = contentToPayload(content);
@@ -87,13 +101,11 @@ async function writePayload(payload, options) {
     const path = join(dir, `${safePathPart(options.server)}-${Date.now()}-${process.hrtime.bigint()}-${spillCounter++}.${payload.extension}`);
     await writeFile(path, payload.bytes, { mode: 0o600 });
     await chmod(path, 0o600);
-    spilledFiles.add(path);
+    (options.artifacts ?? legacyArtifacts).track(path);
     return path;
 }
-export async function cleanupMcpOutputArtifacts() {
-    const files = [...spilledFiles];
-    spilledFiles.clear();
-    await Promise.all(files.map((file) => rm(file, { force: true })));
+export async function cleanupMcpOutputArtifacts(artifacts = legacyArtifacts) {
+    await artifacts.cleanup();
 }
 function buildPreview(payload, limits) {
     const maxBytes = Math.min(PREVIEW_BYTE_BUDGET, Math.max(1024, Math.floor(limits.maxBytes / 2)));

package/dist/core/extensions/builtin/mcp/guard/output-guard.js.map

@@ -1 +1 @@
-{"version":3,"file":"output-guard.js","sourceRoot":"","sources":["../../../../../../src/core/extensions/builtin/mcp/guard/output-guard.ts"],"names":[],"mappings":"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","sourcesContent":["import { chmod, mkdir, rm, writeFile } from \"node:fs/promises\";\nimport { join } from \"node:path\";\nimport { getAgentDir } from \"../../../../../config.ts\";\nimport type { McpSettings } from \"../config-schema.ts\";\nimport type { McpMappedContentBlock } from \"../expose/schema-compat.ts\";\n\nexport interface McpOutputGuardOptions {\n\treadonly agentDir?: string;\n\treadonly server: string;\n\treadonly outputGuard?: McpSettings[\"outputGuard\"];\n}\n\ninterface Payload {\n\treadonly bytes: Buffer;\n\treadonly extension: string;\n\treadonly lineCount: number;\n\treadonly previewSource: string;\n\treadonly summary: string;\n}\n\nconst DEFAULT_MAX_BYTES = 50 * 1024;\nconst DEFAULT_MAX_LINES = 2000;\nconst PREVIEW_BYTE_BUDGET = 8192;\nlet spillCounter = 0;\nconst spilledFiles = new Set<string>();\n\nexport async function applyMcpOutputGuard(\n\tcontent: readonly McpMappedContentBlock[],\n\toptions: McpOutputGuardOptions,\n): Promise<readonly McpMappedContentBlock[]> {\n\tconst limits = outputGuardLimits(options.outputGuard);\n\tconst payload = contentToPayload(content);\n\tif (payload.bytes.byteLength <= limits.maxBytes && payload.lineCount <= limits.maxLines) return content;\n\tconst preview = buildPreview(payload, limits);\n\ttry {\n\t\tconst path = await writePayload(payload, options);\n\t\treturn [{ type: \"text\", text: spillMessage(payload, preview, path) }];\n\t} catch (error) {\n\t\treturn [{ type: \"text\", text: fallbackMessage(payload, preview, error) }];\n\t}\n}\n\nfunction outputGuardLimits(outputGuard: McpSettings[\"outputGuard\"]): { maxBytes: number; maxLines: number } {\n\treturn {\n\t\tmaxBytes: positiveInteger(outputGuard?.maxBytes) ?? DEFAULT_MAX_BYTES,\n\t\tmaxLines: positiveInteger(outputGuard?.maxLines) ?? DEFAULT_MAX_LINES,\n\t};\n}\n\nfunction positiveInteger(value: unknown): number | undefined {\n\treturn typeof value === \"number\" && Number.isFinite(value) && value > 0 ? Math.floor(value) : undefined;\n}\n\nfunction contentToPayload(content: readonly McpMappedContentBlock[]): Payload {\n\tif (content.length === 1) {\n\t\tconst binary = binaryPayload(content[0]);\n\t\tif (binary !== undefined) return binary;\n\t}\n\tconst text = content.map(textForBlock).join(\"\\n\");\n\tconst bytes = Buffer.from(text, \"utf8\");\n\treturn {\n\t\tbytes,\n\t\textension: \"txt\",\n\t\tlineCount: countLines(text),\n\t\tpreviewSource: text,\n\t\tsummary: `text output (${bytes.byteLength} bytes, ${countLines(text)} lines)`,\n\t};\n}\n\nfunction binaryPayload(block: McpMappedContentBlock): Payload | undefined {\n\tif ((block.type === \"image\" || block.type === \"audio\") && block.data.length > 0) {\n\t\tconst bytes = Buffer.from(block.data, \"base64\");\n\t\treturn {\n\t\t\tbytes,\n\t\t\textension: extensionForMime(block.mimeType),\n\t\t\tlineCount: 1,\n\t\t\tpreviewSource: `[${block.mimeType} binary output, ${bytes.byteLength} bytes]`,\n\t\t\tsummary: `${block.mimeType} binary output (${bytes.byteLength} bytes)`,\n\t\t};\n\t}\n\tif (block.type !== \"resource\" || !isRecord(block.resource)) return undefined;\n\tconst mimeType = typeof block.resource.mimeType === \"string\" ? block.resource.mimeType : \"application/octet-stream\";\n\tif (typeof block.resource.blob === \"string\") {\n\t\tconst bytes = Buffer.from(block.resource.blob, \"base64\");\n\t\treturn {\n\t\t\tbytes,\n\t\t\textension: extensionForMime(mimeType),\n\t\t\tlineCount: 1,\n\t\t\tpreviewSource: `[${mimeType} binary resource, ${bytes.byteLength} bytes]`,\n\t\t\tsummary: `${mimeType} binary resource (${bytes.byteLength} bytes)`,\n\t\t};\n\t}\n\tif (typeof block.resource.text === \"string\") {\n\t\tconst bytes = Buffer.from(block.resource.text, \"utf8\");\n\t\treturn {\n\t\t\tbytes,\n\t\t\textension: extensionForMime(mimeType),\n\t\t\tlineCount: countLines(block.resource.text),\n\t\t\tpreviewSource: block.resource.text,\n\t\t\tsummary: `${mimeType} resource (${bytes.byteLength} bytes, ${countLines(block.resource.text)} lines)`,\n\t\t};\n\t}\n\treturn undefined;\n}\n\nasync function writePayload(payload: Payload, options: McpOutputGuardOptions): Promise<string> {\n\tconst dir = join(options.agentDir ?? getAgentDir(), \"tmp\", \"mcp-out\");\n\tawait mkdir(dir, { recursive: true });\n\tconst path = join(\n\t\tdir,\n\t\t`${safePathPart(options.server)}-${Date.now()}-${process.hrtime.bigint()}-${spillCounter++}.${payload.extension}`,\n\t);\n\tawait writeFile(path, payload.bytes, { mode: 0o600 });\n\tawait chmod(path, 0o600);\n\tspilledFiles.add(path);\n\treturn path;\n}\n\nexport async function cleanupMcpOutputArtifacts(): Promise<void> {\n\tconst files = [...spilledFiles];\n\tspilledFiles.clear();\n\tawait Promise.all(files.map((file) => rm(file, { force: true })));\n}\n\nfunction buildPreview(payload: Payload, limits: { maxBytes: number; maxLines: number }): string {\n\tconst maxBytes = Math.min(PREVIEW_BYTE_BUDGET, Math.max(1024, Math.floor(limits.maxBytes / 2)));\n\tconst maxLines = Math.min(80, Math.max(2, Math.floor(limits.maxLines / 2)));\n\treturn trimBytes(headTailLines(payload.previewSource, maxLines), maxBytes);\n}\n\nfunction spillMessage(payload: Payload, preview: string, path: string): string {\n\treturn [\n\t\t`MCP tool output exceeded outputGuard; ${payload.summary}.`,\n\t\t`Full output saved to: ${path}`,\n\t\t\"Read the file in chunks instead of loading the entire file at once.\",\n\t\t\"Preview:\",\n\t\tpreview,\n\t].join(\"\\n\");\n}\n\nfunction fallbackMessage(payload: Payload, preview: string, error: unknown): string {\n\treturn [\n\t\t`Warning: failed to write MCP output spill file: ${errorLabel(error)}`,\n\t\t`MCP output truncated inline; ${payload.summary}.`,\n\t\t\"Preview:\",\n\t\tpreview,\n\t].join(\"\\n\");\n}\n\nfunction headTailLines(text: string, maxLines: number): string {\n\tconst lines = text.split(\"\\n\");\n\tif (lines.length <= maxLines) return text;\n\tconst headCount = Math.max(1, Math.floor(maxLines / 2));\n\tconst tailCount = Math.max(1, maxLines - headCount);\n\treturn [...lines.slice(0, headCount), \"[... truncated ...]\", ...lines.slice(-tailCount)].join(\"\\n\");\n}\n\nfunction trimBytes(text: string, maxBytes: number): string {\n\tif (Buffer.byteLength(text, \"utf8\") <= maxBytes) return text;\n\tlet result = text;\n\twhile (result.length > 0 && Buffer.byteLength(`${result}\\n[... truncated ...]`, \"utf8\") > maxBytes) {\n\t\tresult = result.slice(0, Math.max(0, result.length - 256));\n\t}\n\treturn `${result}\\n[... truncated ...]`;\n}\n\nfunction textForBlock(block: McpMappedContentBlock): string {\n\tif (block.type === \"text\") return block.text;\n\tif (block.type === \"image\" || block.type === \"audio\") {\n\t\treturn `[${block.mimeType} binary output, ${Buffer.byteLength(block.data, \"base64\")} bytes]`;\n\t}\n\treturn JSON.stringify(block);\n}\n\nfunction countLines(text: string): number {\n\treturn text.length === 0 ? 0 : text.split(\"\\n\").length;\n}\n\nfunction extensionForMime(mimeType: string): string {\n\tif (mimeType === \"image/png\") return \"png\";\n\tif (mimeType === \"image/jpeg\") return \"jpg\";\n\tif (mimeType === \"image/webp\") return \"webp\";\n\tif (mimeType === \"image/gif\") return \"gif\";\n\tif (mimeType === \"audio/mpeg\") return \"mp3\";\n\tif (mimeType === \"audio/wav\") return \"wav\";\n\tif (mimeType === \"application/json\") return \"json\";\n\tif (mimeType === \"application/pdf\") return \"pdf\";\n\tif (mimeType.startsWith(\"text/\")) return \"txt\";\n\treturn \"bin\";\n}\n\nfunction safePathPart(value: string): string {\n\treturn value.replace(/[^a-zA-Z0-9_-]/g, \"_\") || \"server\";\n}\n\nfunction errorLabel(error: unknown): string {\n\treturn error instanceof Error ? error.message : String(error);\n}\n\nfunction isRecord(value: unknown): value is Record<string, unknown> {\n\treturn typeof value === \"object\" && value !== null && !Array.isArray(value);\n}\n"]}
+{"version":3,"file":"output-guard.js","sourceRoot":"","sources":["../../../../../../src/core/extensions/builtin/mcp/guard/output-guard.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAoBvD,MAAM,iBAAiB,GAAG,EAAE,GAAG,IAAI,CAAC;AACpC,MAAM,iBAAiB,GAAG,IAAI,CAAC;AAC/B,MAAM,mBAAmB,GAAG,IAAI,CAAC;AACjC,IAAI,YAAY,GAAG,CAAC,CAAC;AAErB,4DAA4D;AAC5D,MAAM,OAAO,kBAAkB;IACrB,MAAM,GAAG,IAAI,GAAG,EAAU,CAAC;IAEpC,KAAK,CAAC,IAAY;QACjB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,OAAO;QACZ,MAAM,KAAK,GAAG,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC;QAC/B,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QACpB,MAAM,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;IACnE,CAAC;CACD;AAED,6EAA6E;AAC7E,2EAA2E;AAC3E,MAAM,eAAe,GAAG,IAAI,kBAAkB,EAAE,CAAC;AAEjD,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACxC,OAAyC,EACzC,OAA8B;IAE9B,MAAM,MAAM,GAAG,iBAAiB,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IACtD,MAAM,OAAO,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;IAC1C,IAAI,OAAO,CAAC,KAAK,CAAC,UAAU,IAAI,MAAM,CAAC,QAAQ,IAAI,OAAO,CAAC,SAAS,IAAI,MAAM,CAAC,QAAQ;QAAE,OAAO,OAAO,CAAC;IACxG,MAAM,OAAO,GAAG,YAAY,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAC9C,IAAI,CAAC;QACJ,MAAM,IAAI,GAAG,MAAM,YAAY,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAClD,OAAO,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;IACvE,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAChB,OAAO,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,eAAe,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;IAC3E,CAAC;AACF,CAAC;AAED,SAAS,iBAAiB,CAAC,WAAuC;IACjE,OAAO;QACN,QAAQ,EAAE,eAAe,CAAC,WAAW,EAAE,QAAQ,CAAC,IAAI,iBAAiB;QACrE,QAAQ,EAAE,eAAe,CAAC,WAAW,EAAE,QAAQ,CAAC,IAAI,iBAAiB;KACrE,CAAC;AACH,CAAC;AAED,SAAS,eAAe,CAAC,KAAc;IACtC,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AACzG,CAAC;AAED,SAAS,gBAAgB,CAAC,OAAyC;IAClE,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1B,MAAM,MAAM,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;QACzC,IAAI,MAAM,KAAK,SAAS;YAAE,OAAO,MAAM,CAAC;IACzC,CAAC;IACD,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAClD,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACxC,OAAO;QACN,KAAK;QACL,SAAS,EAAE,KAAK;QAChB,SAAS,EAAE,UAAU,CAAC,IAAI,CAAC;QAC3B,aAAa,EAAE,IAAI;QACnB,OAAO,EAAE,gBAAgB,KAAK,CAAC,UAAU,WAAW,UAAU,CAAC,IAAI,CAAC,SAAS;KAC7E,CAAC;AACH,CAAC;AAED,SAAS,aAAa,CAAC,KAA4B;IAClD,IAAI,CAAC,KAAK,CAAC,IAAI,KAAK,OAAO,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACjF,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QAChD,OAAO;YACN,KAAK;YACL,SAAS,EAAE,gBAAgB,CAAC,KAAK,CAAC,QAAQ,CAAC;YAC3C,SAAS,EAAE,CAAC;YACZ,aAAa,EAAE,IAAI,KAAK,CAAC,QAAQ,mBAAmB,KAAK,CAAC,UAAU,SAAS;YAC7E,OAAO,EAAE,GAAG,KAAK,CAAC,QAAQ,mBAAmB,KAAK,CAAC,UAAU,SAAS;SACtE,CAAC;IACH,CAAC;IACD,IAAI,KAAK,CAAC,IAAI,KAAK,UAAU,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC;QAAE,OAAO,SAAS,CAAC;IAC7E,MAAM,QAAQ,GAAG,OAAO,KAAK,CAAC,QAAQ,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,0BAA0B,CAAC;IACpH,IAAI,OAAO,KAAK,CAAC,QAAQ,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC7C,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QACzD,OAAO;YACN,KAAK;YACL,SAAS,EAAE,gBAAgB,CAAC,QAAQ,CAAC;YACrC,SAAS,EAAE,CAAC;YACZ,aAAa,EAAE,IAAI,QAAQ,qBAAqB,KAAK,CAAC,UAAU,SAAS;YACzE,OAAO,EAAE,GAAG,QAAQ,qBAAqB,KAAK,CAAC,UAAU,SAAS;SAClE,CAAC;IACH,CAAC;IACD,IAAI,OAAO,KAAK,CAAC,QAAQ,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC7C,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACvD,OAAO;YACN,KAAK;YACL,SAAS,EAAE,gBAAgB,CAAC,QAAQ,CAAC;YACrC,SAAS,EAAE,UAAU,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC;YAC1C,aAAa,EAAE,KAAK,CAAC,QAAQ,CAAC,IAAI;YAClC,OAAO,EAAE,GAAG,QAAQ,cAAc,KAAK,CAAC,UAAU,WAAW,UAAU,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS;SACrG,CAAC;IACH,CAAC;IACD,OAAO,SAAS,CAAC;AAClB,CAAC;AAED,KAAK,UAAU,YAAY,CAAC,OAAgB,EAAE,OAA8B;IAC3E,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,IAAI,WAAW,EAAE,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC;IACtE,MAAM,KAAK,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACtC,MAAM,IAAI,GAAG,IAAI,CAChB,GAAG,EACH,GAAG,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,GAAG,EAAE,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,YAAY,EAAE,IAAI,OAAO,CAAC,SAAS,EAAE,CACjH,CAAC;IACF,MAAM,SAAS,CAAC,IAAI,EAAE,OAAO,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;IACtD,MAAM,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACzB,CAAC,OAAO,CAAC,SAAS,IAAI,eAAe,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACnD,OAAO,IAAI,CAAC;AACb,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAAC,SAAS,GAAuB,eAAe;IAC9F,MAAM,SAAS,CAAC,OAAO,EAAE,CAAC;AAC3B,CAAC;AAED,SAAS,YAAY,CAAC,OAAgB,EAAE,MAA8C;IACrF,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,mBAAmB,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IAChG,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IAC5E,OAAO,SAAS,CAAC,aAAa,CAAC,OAAO,CAAC,aAAa,EAAE,QAAQ,CAAC,EAAE,QAAQ,CAAC,CAAC;AAC5E,CAAC;AAED,SAAS,YAAY,CAAC,OAAgB,EAAE,OAAe,EAAE,IAAY;IACpE,OAAO;QACN,yCAAyC,OAAO,CAAC,OAAO,GAAG;QAC3D,yBAAyB,IAAI,EAAE;QAC/B,qEAAqE;QACrE,UAAU;QACV,OAAO;KACP,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACd,CAAC;AAED,SAAS,eAAe,CAAC,OAAgB,EAAE,OAAe,EAAE,KAAc;IACzE,OAAO;QACN,mDAAmD,UAAU,CAAC,KAAK,CAAC,EAAE;QACtE,gCAAgC,OAAO,CAAC,OAAO,GAAG;QAClD,UAAU;QACV,OAAO;KACP,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACd,CAAC;AAED,SAAS,aAAa,CAAC,IAAY,EAAE,QAAgB;IACpD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC/B,IAAI,KAAK,CAAC,MAAM,IAAI,QAAQ;QAAE,OAAO,IAAI,CAAC;IAC1C,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC,CAAC;IACxD,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,QAAQ,GAAG,SAAS,CAAC,CAAC;IACpD,OAAO,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,SAAS,CAAC,EAAE,qBAAqB,EAAE,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACrG,CAAC;AAED,SAAS,SAAS,CAAC,IAAY,EAAE,QAAgB;IAChD,IAAI,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,QAAQ;QAAE,OAAO,IAAI,CAAC;IAC7D,IAAI,MAAM,GAAG,IAAI,CAAC;IAClB,OAAO,MAAM,CAAC,MAAM,GAAG,CAAC,IAAI,MAAM,CAAC,UAAU,CAAC,GAAG,MAAM,uBAAuB,EAAE,MAAM,CAAC,GAAG,QAAQ,EAAE,CAAC;QACpG,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,CAAC,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC;IAC5D,CAAC;IACD,OAAO,GAAG,MAAM,uBAAuB,CAAC;AACzC,CAAC;AAED,SAAS,YAAY,CAAC,KAA4B;IACjD,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM;QAAE,OAAO,KAAK,CAAC,IAAI,CAAC;IAC7C,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;QACtD,OAAO,IAAI,KAAK,CAAC,QAAQ,mBAAmB,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,EAAE,QAAQ,CAAC,SAAS,CAAC;IAC9F,CAAC;IACD,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;AAC9B,CAAC;AAED,SAAS,UAAU,CAAC,IAAY;IAC/B,OAAO,IAAI,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC;AACxD,CAAC;AAED,SAAS,gBAAgB,CAAC,QAAgB;IACzC,IAAI,QAAQ,KAAK,WAAW;QAAE,OAAO,KAAK,CAAC;IAC3C,IAAI,QAAQ,KAAK,YAAY;QAAE,OAAO,KAAK,CAAC;IAC5C,IAAI,QAAQ,KAAK,YAAY;QAAE,OAAO,MAAM,CAAC;IAC7C,IAAI,QAAQ,KAAK,WAAW;QAAE,OAAO,KAAK,CAAC;IAC3C,IAAI,QAAQ,KAAK,YAAY;QAAE,OAAO,KAAK,CAAC;IAC5C,IAAI,QAAQ,KAAK,WAAW;QAAE,OAAO,KAAK,CAAC;IAC3C,IAAI,QAAQ,KAAK,kBAAkB;QAAE,OAAO,MAAM,CAAC;IACnD,IAAI,QAAQ,KAAK,iBAAiB;QAAE,OAAO,KAAK,CAAC;IACjD,IAAI,QAAQ,CAAC,UAAU,CAAC,OAAO,CAAC;QAAE,OAAO,KAAK,CAAC;IAC/C,OAAO,KAAK,CAAC;AACd,CAAC;AAED,SAAS,YAAY,CAAC,KAAa;IAClC,OAAO,KAAK,CAAC,OAAO,CAAC,iBAAiB,EAAE,GAAG,CAAC,IAAI,QAAQ,CAAC;AAC1D,CAAC;AAED,SAAS,UAAU,CAAC,KAAc;IACjC,OAAO,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AAC/D,CAAC;AAED,SAAS,QAAQ,CAAC,KAAc;IAC/B,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAC7E,CAAC","sourcesContent":["import { chmod, mkdir, rm, writeFile } from \"node:fs/promises\";\nimport { join } from \"node:path\";\nimport { getAgentDir } from \"../../../../../config.ts\";\nimport type { McpSettings } from \"../config-schema.ts\";\nimport type { McpMappedContentBlock } from \"../expose/schema-compat.ts\";\n\nexport interface McpOutputGuardOptions {\n\treadonly agentDir?: string;\n\t/** Owner of spill files for one MCP service/session. */\n\treadonly artifacts?: McpOutputArtifacts;\n\treadonly server: string;\n\treadonly outputGuard?: McpSettings[\"outputGuard\"];\n}\n\ninterface Payload {\n\treadonly bytes: Buffer;\n\treadonly extension: string;\n\treadonly lineCount: number;\n\treadonly previewSource: string;\n\treadonly summary: string;\n}\n\nconst DEFAULT_MAX_BYTES = 50 * 1024;\nconst DEFAULT_MAX_LINES = 2000;\nconst PREVIEW_BYTE_BUDGET = 8192;\nlet spillCounter = 0;\n\n/** Tracks the output artifacts owned by one MCP service. */\nexport class McpOutputArtifacts {\n\treadonly #files = new Set<string>();\n\n\ttrack(path: string): void {\n\t\tthis.#files.add(path);\n\t}\n\n\tasync cleanup(): Promise<void> {\n\t\tconst files = [...this.#files];\n\t\tthis.#files.clear();\n\t\tawait Promise.all(files.map((file) => rm(file, { force: true })));\n\t}\n}\n\n// Legacy direct callers retain the historic process-wide owner. MCP services\n// pass their own owner so one session cannot remove another's spill files.\nconst legacyArtifacts = new McpOutputArtifacts();\n\nexport async function applyMcpOutputGuard(\n\tcontent: readonly McpMappedContentBlock[],\n\toptions: McpOutputGuardOptions,\n): Promise<readonly McpMappedContentBlock[]> {\n\tconst limits = outputGuardLimits(options.outputGuard);\n\tconst payload = contentToPayload(content);\n\tif (payload.bytes.byteLength <= limits.maxBytes && payload.lineCount <= limits.maxLines) return content;\n\tconst preview = buildPreview(payload, limits);\n\ttry {\n\t\tconst path = await writePayload(payload, options);\n\t\treturn [{ type: \"text\", text: spillMessage(payload, preview, path) }];\n\t} catch (error) {\n\t\treturn [{ type: \"text\", text: fallbackMessage(payload, preview, error) }];\n\t}\n}\n\nfunction outputGuardLimits(outputGuard: McpSettings[\"outputGuard\"]): { maxBytes: number; maxLines: number } {\n\treturn {\n\t\tmaxBytes: positiveInteger(outputGuard?.maxBytes) ?? DEFAULT_MAX_BYTES,\n\t\tmaxLines: positiveInteger(outputGuard?.maxLines) ?? DEFAULT_MAX_LINES,\n\t};\n}\n\nfunction positiveInteger(value: unknown): number | undefined {\n\treturn typeof value === \"number\" && Number.isFinite(value) && value > 0 ? Math.floor(value) : undefined;\n}\n\nfunction contentToPayload(content: readonly McpMappedContentBlock[]): Payload {\n\tif (content.length === 1) {\n\t\tconst binary = binaryPayload(content[0]);\n\t\tif (binary !== undefined) return binary;\n\t}\n\tconst text = content.map(textForBlock).join(\"\\n\");\n\tconst bytes = Buffer.from(text, \"utf8\");\n\treturn {\n\t\tbytes,\n\t\textension: \"txt\",\n\t\tlineCount: countLines(text),\n\t\tpreviewSource: text,\n\t\tsummary: `text output (${bytes.byteLength} bytes, ${countLines(text)} lines)`,\n\t};\n}\n\nfunction binaryPayload(block: McpMappedContentBlock): Payload | undefined {\n\tif ((block.type === \"image\" || block.type === \"audio\") && block.data.length > 0) {\n\t\tconst bytes = Buffer.from(block.data, \"base64\");\n\t\treturn {\n\t\t\tbytes,\n\t\t\textension: extensionForMime(block.mimeType),\n\t\t\tlineCount: 1,\n\t\t\tpreviewSource: `[${block.mimeType} binary output, ${bytes.byteLength} bytes]`,\n\t\t\tsummary: `${block.mimeType} binary output (${bytes.byteLength} bytes)`,\n\t\t};\n\t}\n\tif (block.type !== \"resource\" || !isRecord(block.resource)) return undefined;\n\tconst mimeType = typeof block.resource.mimeType === \"string\" ? block.resource.mimeType : \"application/octet-stream\";\n\tif (typeof block.resource.blob === \"string\") {\n\t\tconst bytes = Buffer.from(block.resource.blob, \"base64\");\n\t\treturn {\n\t\t\tbytes,\n\t\t\textension: extensionForMime(mimeType),\n\t\t\tlineCount: 1,\n\t\t\tpreviewSource: `[${mimeType} binary resource, ${bytes.byteLength} bytes]`,\n\t\t\tsummary: `${mimeType} binary resource (${bytes.byteLength} bytes)`,\n\t\t};\n\t}\n\tif (typeof block.resource.text === \"string\") {\n\t\tconst bytes = Buffer.from(block.resource.text, \"utf8\");\n\t\treturn {\n\t\t\tbytes,\n\t\t\textension: extensionForMime(mimeType),\n\t\t\tlineCount: countLines(block.resource.text),\n\t\t\tpreviewSource: block.resource.text,\n\t\t\tsummary: `${mimeType} resource (${bytes.byteLength} bytes, ${countLines(block.resource.text)} lines)`,\n\t\t};\n\t}\n\treturn undefined;\n}\n\nasync function writePayload(payload: Payload, options: McpOutputGuardOptions): Promise<string> {\n\tconst dir = join(options.agentDir ?? getAgentDir(), \"tmp\", \"mcp-out\");\n\tawait mkdir(dir, { recursive: true });\n\tconst path = join(\n\t\tdir,\n\t\t`${safePathPart(options.server)}-${Date.now()}-${process.hrtime.bigint()}-${spillCounter++}.${payload.extension}`,\n\t);\n\tawait writeFile(path, payload.bytes, { mode: 0o600 });\n\tawait chmod(path, 0o600);\n\t(options.artifacts ?? legacyArtifacts).track(path);\n\treturn path;\n}\n\nexport async function cleanupMcpOutputArtifacts(artifacts: McpOutputArtifacts = legacyArtifacts): Promise<void> {\n\tawait artifacts.cleanup();\n}\n\nfunction buildPreview(payload: Payload, limits: { maxBytes: number; maxLines: number }): string {\n\tconst maxBytes = Math.min(PREVIEW_BYTE_BUDGET, Math.max(1024, Math.floor(limits.maxBytes / 2)));\n\tconst maxLines = Math.min(80, Math.max(2, Math.floor(limits.maxLines / 2)));\n\treturn trimBytes(headTailLines(payload.previewSource, maxLines), maxBytes);\n}\n\nfunction spillMessage(payload: Payload, preview: string, path: string): string {\n\treturn [\n\t\t`MCP tool output exceeded outputGuard; ${payload.summary}.`,\n\t\t`Full output saved to: ${path}`,\n\t\t\"Read the file in chunks instead of loading the entire file at once.\",\n\t\t\"Preview:\",\n\t\tpreview,\n\t].join(\"\\n\");\n}\n\nfunction fallbackMessage(payload: Payload, preview: string, error: unknown): string {\n\treturn [\n\t\t`Warning: failed to write MCP output spill file: ${errorLabel(error)}`,\n\t\t`MCP output truncated inline; ${payload.summary}.`,\n\t\t\"Preview:\",\n\t\tpreview,\n\t].join(\"\\n\");\n}\n\nfunction headTailLines(text: string, maxLines: number): string {\n\tconst lines = text.split(\"\\n\");\n\tif (lines.length <= maxLines) return text;\n\tconst headCount = Math.max(1, Math.floor(maxLines / 2));\n\tconst tailCount = Math.max(1, maxLines - headCount);\n\treturn [...lines.slice(0, headCount), \"[... truncated ...]\", ...lines.slice(-tailCount)].join(\"\\n\");\n}\n\nfunction trimBytes(text: string, maxBytes: number): string {\n\tif (Buffer.byteLength(text, \"utf8\") <= maxBytes) return text;\n\tlet result = text;\n\twhile (result.length > 0 && Buffer.byteLength(`${result}\\n[... truncated ...]`, \"utf8\") > maxBytes) {\n\t\tresult = result.slice(0, Math.max(0, result.length - 256));\n\t}\n\treturn `${result}\\n[... truncated ...]`;\n}\n\nfunction textForBlock(block: McpMappedContentBlock): string {\n\tif (block.type === \"text\") return block.text;\n\tif (block.type === \"image\" || block.type === \"audio\") {\n\t\treturn `[${block.mimeType} binary output, ${Buffer.byteLength(block.data, \"base64\")} bytes]`;\n\t}\n\treturn JSON.stringify(block);\n}\n\nfunction countLines(text: string): number {\n\treturn text.length === 0 ? 0 : text.split(\"\\n\").length;\n}\n\nfunction extensionForMime(mimeType: string): string {\n\tif (mimeType === \"image/png\") return \"png\";\n\tif (mimeType === \"image/jpeg\") return \"jpg\";\n\tif (mimeType === \"image/webp\") return \"webp\";\n\tif (mimeType === \"image/gif\") return \"gif\";\n\tif (mimeType === \"audio/mpeg\") return \"mp3\";\n\tif (mimeType === \"audio/wav\") return \"wav\";\n\tif (mimeType === \"application/json\") return \"json\";\n\tif (mimeType === \"application/pdf\") return \"pdf\";\n\tif (mimeType.startsWith(\"text/\")) return \"txt\";\n\treturn \"bin\";\n}\n\nfunction safePathPart(value: string): string {\n\treturn value.replace(/[^a-zA-Z0-9_-]/g, \"_\") || \"server\";\n}\n\nfunction errorLabel(error: unknown): string {\n\treturn error instanceof Error ? error.message : String(error);\n}\n\nfunction isRecord(value: unknown): value is Record<string, unknown> {\n\treturn typeof value === \"object\" && value !== null && !Array.isArray(value);\n}\n"]}

package/dist/core/extensions/builtin/mcp/index.d.ts

@@ -1,3 +1,5 @@
-import type { ExtensionAPI } from "../../types.ts";
-export default function mcpExtension(pi: ExtensionAPI): void;
+import type { ExtensionAPI, ExtensionFactory } from "../../types.ts";
+import { McpService } from "./service.ts";
+export declare function createMcpExtension(service: McpService, sessionOwned?: boolean): ExtensionFactory;
+export default function mcpExtension(pi: ExtensionAPI): void | Promise<void>;
 //# sourceMappingURL=index.d.ts.map

package/dist/core/extensions/builtin/mcp/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/mcp/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAuC,MAAM,gBAAgB,CAAC;AAkBxF,MAAM,CAAC,OAAO,UAAU,YAAY,CAAC,EAAE,EAAE,YAAY,GAAG,IAAI,CAoI3D"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/mcp/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAoB,gBAAgB,EAAqB,MAAM,gBAAgB,CAAC;AAQ1G,OAAO,EAAiB,UAAU,EAAE,MAAM,cAAc,CAAC;AASzD,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,UAAU,EAAE,YAAY,UAAO,GAAG,gBAAgB,CA+I7F;AAWD,MAAM,CAAC,OAAO,UAAU,YAAY,CAAC,EAAE,EAAE,YAAY,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAG3E"}