npm - @xopcai/xopc - Versions diffs - 0.0.93 → 0.0.94 - Mend

@xopcai/xopc 0.0.93 → 0.0.94

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (356) hide show

package/dist/src/agent/mcp/bundle-mcp-materialize.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"bundle-mcp-materialize.js","names":[],"sources":["../../../../src/agent/mcp/bundle-mcp-materialize.ts"],"sourcesContent":["import crypto from \"node:crypto\";\nimport type { AgentToolResult } from '@earendil-works/pi-agent-core';\nimport type { AgentTool as AnyAgentTool } from \"@earendil-works/pi-agent-core\";\nimport type { CallToolResult } from \"@modelcontextprotocol/sdk/types.js\";\nimport type { Config } from \"../../config/schema.js\";\nimport { createLogger } from \"../../utils/logger.js\";\nconst log = createLogger(\"~~BundleMcp~~\");\nimport { setPluginToolMeta } from \"./mcp-tool-meta.js\";\nimport {\n normalizeLowercaseStringOrEmpty,\n normalizeOptionalString,\n} from \"../../utils/string-coerce.js\";\nimport {\n buildSafeToolName,\n normalizeReservedToolNames,\n TOOL_NAME_SEPARATOR,\n} from \"./bundle-mcp-names.js\";\nimport type { BundleMcpToolRuntime, SessionMcpRuntime } from \"./bundle-mcp-types.js\";\n\nexport type McpGatewayToolEntry = {\n name: string;\n shortName: string;\n description: string;\n};\n\nfunction readMaterializedToolDescription(tool: AnyAgentTool): string {\n const raw = tool as { description?: unknown; label?: unknown };\n return (\n normalizeOptionalString(raw.description) ??\n normalizeOptionalString(raw.label) ??\n tool.name\n );\n}\n\nexport function mapBundleMcpToolsForGateway(\n tools: AnyAgentTool[],\n serverId: string,\n): McpGatewayToolEntry[] {\n const prefix = `${serverId.trim()}${TOOL_NAME_SEPARATOR}`;\n return tools\n .filter((tool) => tool.name.startsWith(prefix))\n .map((tool) => ({\n name: tool.name,\n shortName: tool.name.slice(prefix.length),\n description: readMaterializedToolDescription(tool),\n }));\n}\n\nexport async function listBundleMcpServerToolsForGateway(params: {\n workspaceDir: string;\n cfg?: Config;\n serverId: string;\n}): Promise<McpGatewayToolEntry[]> {\n const runtime = await createBundleMcpToolRuntime({\n workspaceDir: params.workspaceDir,\n cfg: params.cfg,\n });\n try {\n return mapBundleMcpToolsForGateway(runtime.tools, params.serverId);\n } finally {\n await runtime.dispose();\n }\n}\n\nfunction toAgentToolResult(params: {\n serverName: string;\n toolName: string;\n result: CallToolResult;\n}): AgentToolResult<unknown> {\n const content = Array.isArray(params.result.content)\n ? (params.result.content as AgentToolResult<unknown>[\"content\"])\n : [];\n const normalizedContent: AgentToolResult<unknown>[\"content\"] =\n content.length > 0\n ? content\n : params.result.structuredContent !== undefined\n ? [\n {\n type: \"text\",\n text: JSON.stringify(params.result.structuredContent, null, 2),\n },\n ]\n : ([\n {\n type: \"text\",\n text: JSON.stringify(\n {\n status: params.result.isError === true ? \"error\" : \"ok\",\n server: params.serverName,\n tool: params.toolName,\n },\n null,\n 2,\n ),\n },\n ] as AgentToolResult<unknown>[\"content\"]);\n const details: Record<string, unknown> = {\n mcpServer: params.serverName,\n mcpTool: params.toolName,\n };\n if (params.result.structuredContent !== undefined) {\n details.structuredContent = params.result.structuredContent;\n }\n if (params.result.isError === true) {\n details.status = \"error\";\n }\n return {\n content: normalizedContent,\n details,\n };\n}\n\nexport async function materializeBundleMcpToolsForRun(params: {\n runtime: SessionMcpRuntime;\n reservedToolNames?: Iterable<string>;\n disposeRuntime?: () => Promise<void>;\n}): Promise<BundleMcpToolRuntime> {\n let disposed = false;\n const releaseLease = params.runtime.acquireLease?.();\n params.runtime.markUsed();\n let catalog;\n try {\n catalog = await params.runtime.getCatalog();\n } catch (error) {\n releaseLease?.();\n throw error;\n }\n const reservedNames = normalizeReservedToolNames(params.reservedToolNames);\n const tools: BundleMcpToolRuntime[\"tools\"] = [];\n const sortedCatalogTools = [...catalog.tools].toSorted((a, b) => {\n const serverOrder = a.safeServerName.localeCompare(b.safeServerName);\n if (serverOrder !== 0) {\n return serverOrder;\n }\n const toolOrder = a.toolName.localeCompare(b.toolName);\n if (toolOrder !== 0) {\n return toolOrder;\n }\n return a.serverName.localeCompare(b.serverName);\n });\n\n for (const tool of sortedCatalogTools) {\n const originalName = tool.toolName.trim();\n if (!originalName) {\n continue;\n }\n const safeToolName = buildSafeToolName({\n serverName: tool.safeServerName,\n toolName: originalName,\n reservedNames,\n });\n if (safeToolName !== `${tool.safeServerName}${TOOL_NAME_SEPARATOR}${originalName}`) {\n log.warn(\n `bundle-mcp: tool \"${tool.toolName}\" from server \"${tool.serverName}\" registered as \"${safeToolName}\" to keep the tool name provider-safe.`,\n );\n }\n reservedNames.add(normalizeLowercaseStringOrEmpty(safeToolName));\n const agentTool = {\n name: safeToolName,\n label: tool.title ?? tool.toolName,\n description: tool.description \|\| tool.title \|\| tool.fallbackDescription,\n parameters: tool.inputSchema,\n execute: async (_toolCallId: string, input: unknown) => {\n params.runtime.markUsed();\n const result = await params.runtime.callTool(tool.serverName, tool.toolName, input);\n return toAgentToolResult({\n serverName: tool.serverName,\n toolName: tool.toolName,\n result,\n });\n },\n } as unknown as AnyAgentTool;\n setPluginToolMeta(agentTool, {\n pluginId: \"bundle-mcp\",\n optional: false,\n });\n tools.push(agentTool);\n }\n\n // Sort tools deterministically by name so the tools block in API requests is stable across\n // turns (defensive — listTools() order is usually stable but not guaranteed).\n // Cannot fix name collisions: collision suffixes above are order-dependent.\n tools.sort((a, b) => a.name.localeCompare(b.name));\n\n return {\n tools,\n dispose: async () => {\n if (disposed) {\n return;\n }\n disposed = true;\n releaseLease?.();\n await params.disposeRuntime?.();\n },\n };\n}\n\nexport async function createBundleMcpToolRuntime(params: {\n workspaceDir: string;\n cfg?: Config;\n reservedToolNames?: Iterable<string>;\n createRuntime?: (params: {\n sessionId: string;\n workspaceDir: string;\n cfg?: Config;\n }) => SessionMcpRuntime;\n}): Promise<BundleMcpToolRuntime> {\n const createRuntime =\n params.createRuntime ?? (await import(\"./bundle-mcp-runtime.js\")).createSessionMcpRuntime;\n const runtime = createRuntime({\n sessionId: `bundle-mcp:${crypto.randomUUID()}`,\n workspaceDir: params.workspaceDir,\n cfg: params.cfg,\n });\n const materialized = await materializeBundleMcpToolsForRun({\n runtime,\n reservedToolNames: params.reservedToolNames,\n disposeRuntime: async () => {\n await runtime.dispose();\n },\n });\n return materialized;\n}\n"],"mappings":";;;;;;;aAKqD;oBAMf;AALtC,MAAM,MAAM,aAAa,~~YAAY~~;~~AAmBrC~~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"}
1	+ {"version":3,"file":"bundle-mcp-materialize.js","names":[],"sources":["../../../../src/agent/mcp/bundle-mcp-materialize.ts"],"sourcesContent":["import crypto from \"node:crypto\";\nimport type { AgentToolResult } from '@earendil-works/pi-agent-core';\nimport type { AgentTool as AnyAgentTool } from \"@earendil-works/pi-agent-core\";\nimport type { CallToolResult } from \"@modelcontextprotocol/sdk/types.js\";\nimport type { Config } from \"../../config/schema.js\";\nimport { createLogger } from \"../../utils/logger.js\";\nconst log = createLogger(\"Mcp:Bundle\");\nimport { setPluginToolMeta } from \"./mcp-tool-meta.js\";\nimport {\n normalizeLowercaseStringOrEmpty,\n normalizeOptionalString,\n} from \"../../utils/string-coerce.js\";\nimport {\n buildSafeToolName,\n normalizeReservedToolNames,\n TOOL_NAME_SEPARATOR,\n} from \"./bundle-mcp-names.js\";\nimport type { BundleMcpToolRuntime, SessionMcpRuntime } from \"./bundle-mcp-types.js\";\n\nexport type McpGatewayToolEntry = {\n name: string;\n shortName: string;\n description: string;\n};\n\nfunction readMaterializedToolDescription(tool: AnyAgentTool): string {\n const raw = tool as { description?: unknown; label?: unknown };\n return (\n normalizeOptionalString(raw.description) ??\n normalizeOptionalString(raw.label) ??\n tool.name\n );\n}\n\nexport function mapBundleMcpToolsForGateway(\n tools: AnyAgentTool[],\n serverId: string,\n): McpGatewayToolEntry[] {\n const prefix = `${serverId.trim()}${TOOL_NAME_SEPARATOR}`;\n return tools\n .filter((tool) => tool.name.startsWith(prefix))\n .map((tool) => ({\n name: tool.name,\n shortName: tool.name.slice(prefix.length),\n description: readMaterializedToolDescription(tool),\n }));\n}\n\nexport async function listBundleMcpServerToolsForGateway(params: {\n workspaceDir: string;\n cfg?: Config;\n serverId: string;\n}): Promise<McpGatewayToolEntry[]> {\n const runtime = await createBundleMcpToolRuntime({\n workspaceDir: params.workspaceDir,\n cfg: params.cfg,\n });\n try {\n return mapBundleMcpToolsForGateway(runtime.tools, params.serverId);\n } finally {\n await runtime.dispose();\n }\n}\n\nfunction toAgentToolResult(params: {\n serverName: string;\n toolName: string;\n result: CallToolResult;\n}): AgentToolResult<unknown> {\n const content = Array.isArray(params.result.content)\n ? (params.result.content as AgentToolResult<unknown>[\"content\"])\n : [];\n const normalizedContent: AgentToolResult<unknown>[\"content\"] =\n content.length > 0\n ? content\n : params.result.structuredContent !== undefined\n ? [\n {\n type: \"text\",\n text: JSON.stringify(params.result.structuredContent, null, 2),\n },\n ]\n : ([\n {\n type: \"text\",\n text: JSON.stringify(\n {\n status: params.result.isError === true ? \"error\" : \"ok\",\n server: params.serverName,\n tool: params.toolName,\n },\n null,\n 2,\n ),\n },\n ] as AgentToolResult<unknown>[\"content\"]);\n const details: Record<string, unknown> = {\n mcpServer: params.serverName,\n mcpTool: params.toolName,\n };\n if (params.result.structuredContent !== undefined) {\n details.structuredContent = params.result.structuredContent;\n }\n if (params.result.isError === true) {\n details.status = \"error\";\n }\n return {\n content: normalizedContent,\n details,\n };\n}\n\nexport async function materializeBundleMcpToolsForRun(params: {\n runtime: SessionMcpRuntime;\n reservedToolNames?: Iterable<string>;\n disposeRuntime?: () => Promise<void>;\n}): Promise<BundleMcpToolRuntime> {\n let disposed = false;\n const releaseLease = params.runtime.acquireLease?.();\n params.runtime.markUsed();\n let catalog;\n try {\n catalog = await params.runtime.getCatalog();\n } catch (error) {\n releaseLease?.();\n throw error;\n }\n const reservedNames = normalizeReservedToolNames(params.reservedToolNames);\n const tools: BundleMcpToolRuntime[\"tools\"] = [];\n const sortedCatalogTools = [...catalog.tools].toSorted((a, b) => {\n const serverOrder = a.safeServerName.localeCompare(b.safeServerName);\n if (serverOrder !== 0) {\n return serverOrder;\n }\n const toolOrder = a.toolName.localeCompare(b.toolName);\n if (toolOrder !== 0) {\n return toolOrder;\n }\n return a.serverName.localeCompare(b.serverName);\n });\n\n for (const tool of sortedCatalogTools) {\n const originalName = tool.toolName.trim();\n if (!originalName) {\n continue;\n }\n const safeToolName = buildSafeToolName({\n serverName: tool.safeServerName,\n toolName: originalName,\n reservedNames,\n });\n if (safeToolName !== `${tool.safeServerName}${TOOL_NAME_SEPARATOR}${originalName}`) {\n log.warn(\n `bundle-mcp: tool \"${tool.toolName}\" from server \"${tool.serverName}\" registered as \"${safeToolName}\" to keep the tool name provider-safe.`,\n );\n }\n reservedNames.add(normalizeLowercaseStringOrEmpty(safeToolName));\n const agentTool = {\n name: safeToolName,\n label: tool.title ?? tool.toolName,\n description: tool.description \|\| tool.title \|\| tool.fallbackDescription,\n parameters: tool.inputSchema,\n execute: async (_toolCallId: string, input: unknown) => {\n params.runtime.markUsed();\n const result = await params.runtime.callTool(tool.serverName, tool.toolName, input);\n return toAgentToolResult({\n serverName: tool.serverName,\n toolName: tool.toolName,\n result,\n });\n },\n } as unknown as AnyAgentTool;\n setPluginToolMeta(agentTool, {\n pluginId: \"bundle-mcp\",\n optional: false,\n });\n tools.push(agentTool);\n }\n\n // Sort tools deterministically by name so the tools block in API requests is stable across\n // turns (defensive — listTools() order is usually stable but not guaranteed).\n // Cannot fix name collisions: collision suffixes above are order-dependent.\n tools.sort((a, b) => a.name.localeCompare(b.name));\n\n return {\n tools,\n dispose: async () => {\n if (disposed) {\n return;\n }\n disposed = true;\n releaseLease?.();\n await params.disposeRuntime?.();\n },\n };\n}\n\nexport async function createBundleMcpToolRuntime(params: {\n workspaceDir: string;\n cfg?: Config;\n reservedToolNames?: Iterable<string>;\n createRuntime?: (params: {\n sessionId: string;\n workspaceDir: string;\n cfg?: Config;\n }) => SessionMcpRuntime;\n}): Promise<BundleMcpToolRuntime> {\n const createRuntime =\n params.createRuntime ?? (await import(\"./bundle-mcp-runtime.js\")).createSessionMcpRuntime;\n const runtime = createRuntime({\n sessionId: `bundle-mcp:${crypto.randomUUID()}`,\n workspaceDir: params.workspaceDir,\n cfg: params.cfg,\n });\n const materialized = await materializeBundleMcpToolsForRun({\n runtime,\n reservedToolNames: params.reservedToolNames,\n disposeRuntime: async () => {\n await runtime.dispose();\n },\n });\n return materialized;\n}\n"],"mappings":"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"}

package/dist/src/agent/mcp/bundle-mcp-runtime.js CHANGED Viewed

@@ -1,6 +1,6 @@
+import { init_string_coerce, normalizeOptionalString } from "../../utils/string-coerce.js";
 import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
-import { init_string_coerce, normalizeOptionalString } from "../../utils/string-coerce.js";
 import { sanitizeServerName } from "./bundle-mcp-names.js";
 import { resolveConnectorSecretReferences } from "../../connectors/secret-store.js";
 import { resolveGlobalSingleton } from "../../utils/global-singleton.js";
@@ -15,7 +15,7 @@ import { AjvJsonSchemaValidator } from "@modelcontextprotocol/sdk/validation/ajv
 //#region src/agent/mcp/bundle-mcp-runtime.ts
 init_logger();
 init_string_coerce();
-const log = createLogger("BundleMcp");
+const log = createLogger("Mcp:Bundle");
 const SESSION_MCP_RUNTIME_MANAGER_KEY = Symbol.for("xopc.sessionMcpRuntimeManager");
 const DRAFT_2020_12_SCHEMA = "https://json-schema.org/draft/2020-12/schema";
 const DEFAULT_SESSION_MCP_RUNTIME_IDLE_TTL_MS = 600 * 1e3;
@@ -87,7 +87,11 @@ function loadSessionMcpConfig(params) {
 		workspaceDir: params.workspaceDir,
 		cfg: params.cfg
 	});
-	if (params.logDiagnostics !== false) for (const diagnostic of loaded.diagnostics) log.warn(`bundle-mcp: ${diagnostic.extensionId}: ${diagnostic.message}`);
+	if (params.logDiagnostics !== false) for (const diagnostic of loaded.diagnostics) log.warn({
+		phase: "agent.mcp_connect",
+		extensionId: diagnostic.extensionId,
+		message: diagnostic.message
+	}, `bundle-mcp diagnostic: ${diagnostic.extensionId}: ${diagnostic.message}`);
 	return {
 		loaded,
 		fingerprint: createCatalogFingerprint(loaded.mcpServers)
@@ -137,7 +141,11 @@ function createSessionMcpRuntime(params) {
 					const resolved = resolveMcpTransport(serverName, await resolveConnectorSecretReferences(rawServer));
 					if (!resolved) continue;
 					const safeServerName = sanitizeServerName(serverName, usedServerNames);
-					if (safeServerName !== serverName) log.warn(`bundle-mcp: server key "${serverName}" registered as "${safeServerName}" for provider-safe tool names.`);
+					if (safeServerName !== serverName) log.warn({
+						phase: "agent.mcp_connect",
+						serverName,
+						safeServerName
+					}, `bundle-mcp: server key "${serverName}" registered as "${safeServerName}" for provider-safe tool names`);
 					const client = new Client({
 						name: "xopc-bundle-mcp",
 						version: "0.0.0"
@@ -281,7 +289,12 @@ function createSessionMcpRuntimeManager(opts = {}) {
 	const queueIdleSweep = () => {
 		if (idleSweepInFlight) return;
 		idleSweepInFlight = sweepIdleRuntimes().then(() => void 0).catch((error) => {
-			log.warn(`bundle-mcp: idle runtime sweep failed: ${String(error)}`);
+			const em = error instanceof Error ? error.message : String(error);
+			log.warn({
+				err: error,
+				errorMessage: em,
+				phase: "agent.mcp_connect"
+			}, `bundle-mcp: idle runtime sweep failed: ${em}`);
 		}).finally(() => {
 			idleSweepInFlight = void 0;
 		});

package/dist/src/agent/mcp/bundle-mcp-runtime.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"bundle-mcp-runtime.js","names":[],"sources":["../../../../src/agent/mcp/bundle-mcp-runtime.ts"],"sourcesContent":["import crypto from \"node:crypto\";\nimport Ajv2020 from \"ajv/dist/2020.js\";\nimport { Client } from \"@modelcontextprotocol/sdk/client/index.js\";\nimport { StreamableHTTPClientTransport } from \"@modelcontextprotocol/sdk/client/streamableHttp.js\";\nimport type { Transport } from \"@modelcontextprotocol/sdk/shared/transport.js\";\nimport type { CallToolResult } from \"@modelcontextprotocol/sdk/types.js\";\nimport { AjvJsonSchemaValidator } from \"@modelcontextprotocol/sdk/validation/ajv-provider.js\";\nimport type {\n JsonSchemaType,\n JsonSchemaValidator,\n jsonSchemaValidator,\n} from \"@modelcontextprotocol/sdk/validation/types.js\";\nimport type { Config } from \"../../config/schema.js\";\nimport { createLogger } from \"../../utils/logger.js\";\nconst log = createLogger(\"BundleMcp\");\nimport { resolveGlobalSingleton } from \"../../utils/global-singleton.js\";\nimport { redactSensitiveUrlLikeString } from \"../../utils/redact-sensitive-url.js\";\nimport { normalizeOptionalString } from \"../../utils/string-coerce.js\";\nimport { loadEmbeddedMcpConfig } from \"./embedded-mcp.js\";\nimport { resolveConnectorSecretReferences } from \"../../connectors/secret-store.js\";\nimport { isMcpConfigRecord } from \"./mcp-config-shared.js\";\nimport { resolveMcpTransport } from \"./mcp-transport.js\";\nimport { sanitizeServerName } from \"./bundle-mcp-names.js\";\nimport type {\n McpCatalogTool,\n McpServerCatalog,\n McpToolCatalog,\n SessionMcpRuntime,\n SessionMcpRuntimeManager,\n} from \"./bundle-mcp-types.js\";\n\ntype BundleMcpSession = {\n serverName: string;\n client: Client;\n transport: Transport;\n transportType: \"stdio\" \| \"sse\" \| \"streamable-http\";\n detachStderr?: () => void;\n};\n\ntype LoadedMcpConfig = ReturnType<typeof loadEmbeddedMcpConfig>;\ntype ListedTool = Awaited<ReturnType<Client[\"listTools\"]>>[\"tools\"][number];\ntype CreateSessionMcpRuntime = (\n params: Parameters<typeof createSessionMcpRuntime>[0] & { configFingerprint?: string },\n) => SessionMcpRuntime;\n\nconst SESSION_MCP_RUNTIME_MANAGER_KEY = Symbol.for(\"xopc.sessionMcpRuntimeManager\");\nconst DRAFT_2020_12_SCHEMA = \"https://json-schema.org/draft/2020-12/schema\";\nconst DEFAULT_SESSION_MCP_RUNTIME_IDLE_TTL_MS = 10 * 60 * 1000;\nconst SESSION_MCP_RUNTIME_SWEEP_INTERVAL_MS = 60 * 1000;\n\nfunction isDraft202012Schema(schema: JsonSchemaType): boolean {\n return (schema as { $schema?: unknown }).$schema === DRAFT_2020_12_SCHEMA;\n}\n\nexport function createBundleMcpJsonSchemaValidator(): jsonSchemaValidator {\n const defaultValidator = new AjvJsonSchemaValidator();\n const ajv2020 = new Ajv2020({\n strict: false,\n validateFormats: false,\n validateSchema: false,\n allErrors: true,\n });\n\n return {\n getValidator<T>(schema: JsonSchemaType): JsonSchemaValidator<T> {\n if (!isDraft202012Schema(schema)) {\n return defaultValidator.getValidator<T>(schema);\n }\n const ajvValidator = ajv2020.compile(schema);\n return (input: unknown) => {\n const valid = ajvValidator(input);\n if (valid) {\n return {\n valid: true,\n data: input as T,\n errorMessage: undefined,\n };\n }\n return {\n valid: false,\n data: undefined,\n errorMessage: ajv2020.errorsText(ajvValidator.errors),\n };\n };\n },\n };\n}\n\nfunction connectWithTimeout(\n client: Client,\n transport: Transport,\n timeoutMs: number,\n): Promise<void> {\n return new Promise<void>((resolve, reject) => {\n const timer = setTimeout(\n () => reject(new Error(`MCP server connection timed out after ${timeoutMs}ms`)),\n timeoutMs,\n );\n client.connect(transport).then(\n (value) => {\n clearTimeout(timer);\n resolve(value);\n },\n (error) => {\n clearTimeout(timer);\n reject(error);\n },\n );\n });\n}\n\nfunction redactErrorUrls(error: unknown): string {\n return redactSensitiveUrlLikeString(String(error));\n}\n\nasync function listAllTools(client: Client) {\n const tools: ListedTool[] = [];\n let cursor: string \| undefined;\n do {\n const page = await client.listTools(cursor ? { cursor } : undefined);\n tools.push(...page.tools);\n cursor = page.nextCursor;\n } while (cursor);\n return tools;\n}\n\nasync function disposeSession(session: BundleMcpSession) {\n session.detachStderr?.();\n if (session.transportType === \"streamable-http\") {\n await (session.transport as StreamableHTTPClientTransport).terminateSession().catch(() => {});\n }\n await session.transport.close().catch(() => {});\n await session.client.close().catch(() => {});\n}\n\nfunction createCatalogFingerprint(servers: Record<string, unknown>): string {\n return crypto.createHash(\"sha1\").update(JSON.stringify(servers)).digest(\"hex\");\n}\n\nfunction loadSessionMcpConfig(params: {\n workspaceDir: string;\n cfg?: Config;\n logDiagnostics?: boolean;\n}): {\n loaded: LoadedMcpConfig;\n fingerprint: string;\n} {\n const loaded = loadEmbeddedMcpConfig({\n workspaceDir: params.workspaceDir,\n cfg: params.cfg,\n });\n if (params.logDiagnostics !== false) {\n for (const diagnostic of loaded.diagnostics) {\n log.warn(`bundle-mcp: ${diagnostic.extensionId}: ${diagnostic.message}`);\n }\n }\n return {\n loaded,\n fingerprint: createCatalogFingerprint(loaded.mcpServers),\n };\n}\n\nfunction createDisposedError(sessionId: string): Error {\n return new Error(`bundle-mcp runtime disposed for session ${sessionId}`);\n}\n\nfunction resolveSessionMcpRuntimeIdleTtlMs(cfg?: Config): number {\n const raw = cfg?.mcp?.sessionIdleTtlMs;\n if (typeof raw === \"number\" && Number.isFinite(raw) && raw >= 0) {\n return Math.floor(raw);\n }\n return DEFAULT_SESSION_MCP_RUNTIME_IDLE_TTL_MS;\n}\n\nexport function createSessionMcpRuntime(params: {\n sessionId: string;\n sessionKey?: string;\n workspaceDir: string;\n cfg?: Config;\n}): SessionMcpRuntime {\n const { loaded, fingerprint: configFingerprint } = loadSessionMcpConfig({\n workspaceDir: params.workspaceDir,\n cfg: params.cfg,\n logDiagnostics: true,\n });\n const createdAt = Date.now();\n let lastUsedAt = createdAt;\n let activeLeases = 0;\n let disposed = false;\n let catalog: McpToolCatalog \| null = null;\n let catalogInFlight: Promise<McpToolCatalog> \| undefined;\n const sessions = new Map<string, BundleMcpSession>();\n const failIfDisposed = () => {\n if (disposed) {\n throw createDisposedError(params.sessionId);\n }\n };\n\n const getCatalog = async (): Promise<McpToolCatalog> => {\n failIfDisposed();\n if (catalog) {\n return catalog;\n }\n if (catalogInFlight) {\n return catalogInFlight;\n }\n catalogInFlight = (async () => {\n if (Object.keys(loaded.mcpServers).length === 0) {\n return {\n version: 1,\n generatedAt: Date.now(),\n servers: {},\n tools: [],\n };\n }\n\n const servers: Record<string, McpServerCatalog> = {};\n const tools: McpCatalogTool[] = [];\n const usedServerNames = new Set<string>();\n\n try {\n for (const [serverName, rawServer] of Object.entries(loaded.mcpServers)) {\n failIfDisposed();\n const resolvedServer = await resolveConnectorSecretReferences(rawServer);\n const resolved = resolveMcpTransport(serverName, resolvedServer);\n if (!resolved) {\n continue;\n }\n const safeServerName = sanitizeServerName(serverName, usedServerNames);\n if (safeServerName !== serverName) {\n log.warn(\n `bundle-mcp: server key \"${serverName}\" registered as \"${safeServerName}\" for provider-safe tool names.`,\n );\n }\n\n const client = new Client(\n {\n name: \"xopc-bundle-mcp\",\n version: \"0.0.0\",\n },\n {\n jsonSchemaValidator: createBundleMcpJsonSchemaValidator(),\n },\n );\n const session: BundleMcpSession = {\n serverName,\n client,\n transport: resolved.transport,\n transportType: resolved.transportType,\n detachStderr: resolved.detachStderr,\n };\n sessions.set(serverName, session);\n\n try {\n failIfDisposed();\n await connectWithTimeout(client, resolved.transport, resolved.connectionTimeoutMs);\n failIfDisposed();\n const listedTools = await listAllTools(client);\n failIfDisposed();\n servers[serverName] = {\n serverName,\n launchSummary: resolved.description,\n toolCount: listedTools.length,\n };\n for (const tool of listedTools) {\n const toolName = tool.name.trim();\n if (!toolName) {\n continue;\n }\n tools.push({\n serverName,\n safeServerName,\n toolName,\n title: tool.title,\n description:\n normalizeOptionalString(tool.description) ?? normalizeOptionalString(tool.title),\n inputSchema: tool.inputSchema,\n fallbackDescription: `Provided by bundle MCP server \"${serverName}\" (${resolved.description}).`,\n });\n }\n } catch (error) {\n if (!disposed) {\n log.warn(\n `bundle-mcp: failed to start server \"${serverName}\" (${resolved.description}): ${redactErrorUrls(error)}`,\n );\n }\n await disposeSession(session);\n sessions.delete(serverName);\n failIfDisposed();\n }\n }\n\n failIfDisposed();\n return {\n version: 1,\n generatedAt: Date.now(),\n servers,\n tools,\n };\n } catch (error) {\n await Promise.allSettled(\n Array.from(sessions.values(), (session) => disposeSession(session)),\n );\n sessions.clear();\n throw error;\n }\n })();\n\n try {\n const nextCatalog = await catalogInFlight;\n failIfDisposed();\n catalog = nextCatalog;\n return nextCatalog;\n } finally {\n catalogInFlight = undefined;\n }\n };\n\n return {\n sessionId: params.sessionId,\n sessionKey: params.sessionKey,\n workspaceDir: params.workspaceDir,\n configFingerprint,\n createdAt,\n get lastUsedAt() {\n return lastUsedAt;\n },\n get activeLeases() {\n return activeLeases;\n },\n acquireLease() {\n activeLeases += 1;\n let released = false;\n return () => {\n if (released) {\n return;\n }\n released = true;\n activeLeases = Math.max(0, activeLeases - 1);\n lastUsedAt = Date.now();\n };\n },\n getCatalog,\n markUsed() {\n lastUsedAt = Date.now();\n },\n async callTool(serverName, toolName, input) {\n failIfDisposed();\n await getCatalog();\n const session = sessions.get(serverName);\n if (!session) {\n throw new Error(`bundle-mcp server \"${serverName}\" is not connected`);\n }\n return (await session.client.callTool({\n name: toolName,\n arguments: isMcpConfigRecord(input) ? input : {},\n })) as CallToolResult;\n },\n async dispose() {\n if (disposed) {\n return;\n }\n disposed = true;\n catalog = null;\n catalogInFlight = undefined;\n const sessionsToClose = Array.from(sessions.values());\n sessions.clear();\n await Promise.allSettled(sessionsToClose.map((session) => disposeSession(session)));\n },\n };\n}\n\nfunction createSessionMcpRuntimeManager(\n opts: {\n createRuntime?: CreateSessionMcpRuntime;\n now?: () => number;\n enableIdleSweepTimer?: boolean;\n idleSweepIntervalMs?: number;\n } = {},\n): SessionMcpRuntimeManager {\n const runtimesBySessionId = new Map<string, SessionMcpRuntime>();\n const sessionIdBySessionKey = new Map<string, string>();\n const idleTtlMsBySessionId = new Map<string, number>();\n const createRuntime = opts.createRuntime ?? createSessionMcpRuntime;\n const now = opts.now ?? Date.now;\n const createInFlight = new Map<\n string,\n {\n promise: Promise<SessionMcpRuntime>;\n workspaceDir: string;\n configFingerprint: string;\n }\n >();\n const idleSweepIntervalMs = opts.idleSweepIntervalMs ?? SESSION_MCP_RUNTIME_SWEEP_INTERVAL_MS;\n let idleSweepTimer: ReturnType<typeof setInterval> \| undefined;\n let idleSweepInFlight: Promise<void> \| undefined;\n\n const forgetSessionKeysForSessionId = (sessionId: string) => {\n for (const [sessionKey, mappedSessionId] of sessionIdBySessionKey.entries()) {\n if (mappedSessionId === sessionId) {\n sessionIdBySessionKey.delete(sessionKey);\n }\n }\n };\n\n const sweepIdleRuntimes = async (): Promise<number> => {\n const nowMs = now();\n const expired: SessionMcpRuntime[] = [];\n for (const [sessionId, runtime] of runtimesBySessionId.entries()) {\n const idleTtlMs =\n idleTtlMsBySessionId.get(sessionId) ?? DEFAULT_SESSION_MCP_RUNTIME_IDLE_TTL_MS;\n if (idleTtlMs <= 0 \|\| (runtime.activeLeases ?? 0) > 0) {\n continue;\n }\n if (nowMs - runtime.lastUsedAt < idleTtlMs) {\n continue;\n }\n runtimesBySessionId.delete(sessionId);\n idleTtlMsBySessionId.delete(sessionId);\n forgetSessionKeysForSessionId(sessionId);\n expired.push(runtime);\n }\n await Promise.allSettled(expired.map((runtime) => runtime.dispose()));\n return expired.length;\n };\n\n const queueIdleSweep = () => {\n if (idleSweepInFlight) {\n return;\n }\n idleSweepInFlight = sweepIdleRuntimes()\n .then(() => undefined)\n .catch((error: unknown) => {\n log.warn(`bundle-mcp: idle runtime sweep failed: ${String(error)}`);\n })\n .finally(() => {\n idleSweepInFlight = undefined;\n });\n };\n\n const ensureIdleSweepTimer = () => {\n if (opts.enableIdleSweepTimer === false \|\| idleSweepIntervalMs <= 0 \|\| idleSweepTimer) {\n return;\n }\n idleSweepTimer = setInterval(queueIdleSweep, idleSweepIntervalMs);\n idleSweepTimer.unref?.();\n };\n\n const clearIdleSweepTimer = () => {\n if (!idleSweepTimer) {\n return;\n }\n clearInterval(idleSweepTimer);\n idleSweepTimer = undefined;\n };\n\n return {\n async getOrCreate(params) {\n const idleTtlMs = resolveSessionMcpRuntimeIdleTtlMs(params.cfg);\n if (runtimesBySessionId.has(params.sessionId)) {\n idleTtlMsBySessionId.set(params.sessionId, idleTtlMs);\n }\n await sweepIdleRuntimes();\n if (idleTtlMs > 0) {\n ensureIdleSweepTimer();\n }\n if (params.sessionKey) {\n sessionIdBySessionKey.set(params.sessionKey, params.sessionId);\n }\n const { fingerprint: nextFingerprint } = loadSessionMcpConfig({\n workspaceDir: params.workspaceDir,\n cfg: params.cfg,\n logDiagnostics: false,\n });\n const existing = runtimesBySessionId.get(params.sessionId);\n if (existing) {\n if (\n existing.workspaceDir !== params.workspaceDir \|\|\n existing.configFingerprint !== nextFingerprint\n ) {\n runtimesBySessionId.delete(params.sessionId);\n await existing.dispose();\n } else {\n existing.markUsed();\n idleTtlMsBySessionId.set(params.sessionId, idleTtlMs);\n return existing;\n }\n }\n const inFlight = createInFlight.get(params.sessionId);\n if (inFlight) {\n if (\n inFlight.workspaceDir === params.workspaceDir &&\n inFlight.configFingerprint === nextFingerprint\n ) {\n return inFlight.promise;\n }\n createInFlight.delete(params.sessionId);\n const staleRuntime = await inFlight.promise.catch(() => undefined);\n runtimesBySessionId.delete(params.sessionId);\n idleTtlMsBySessionId.delete(params.sessionId);\n await staleRuntime?.dispose();\n }\n const created = Promise.resolve(\n createRuntime({\n sessionId: params.sessionId,\n sessionKey: params.sessionKey,\n workspaceDir: params.workspaceDir,\n cfg: params.cfg,\n }),\n ).then((runtime) => {\n runtime.markUsed();\n runtimesBySessionId.set(params.sessionId, runtime);\n idleTtlMsBySessionId.set(params.sessionId, idleTtlMs);\n return runtime;\n });\n createInFlight.set(params.sessionId, {\n promise: created,\n workspaceDir: params.workspaceDir,\n configFingerprint: nextFingerprint,\n });\n try {\n return await created;\n } finally {\n createInFlight.delete(params.sessionId);\n }\n },\n bindSessionKey(sessionKey, sessionId) {\n sessionIdBySessionKey.set(sessionKey, sessionId);\n },\n resolveSessionId(sessionKey) {\n return sessionIdBySessionKey.get(sessionKey);\n },\n async disposeSession(sessionId) {\n const inFlight = createInFlight.get(sessionId);\n createInFlight.delete(sessionId);\n let runtime = runtimesBySessionId.get(sessionId);\n if (!runtime && inFlight) {\n runtime = await inFlight.promise.catch(() => undefined);\n }\n runtimesBySessionId.delete(sessionId);\n idleTtlMsBySessionId.delete(sessionId);\n if (!runtime) {\n forgetSessionKeysForSessionId(sessionId);\n return;\n }\n forgetSessionKeysForSessionId(sessionId);\n await runtime.dispose();\n },\n async disposeAll() {\n clearIdleSweepTimer();\n const inFlightRuntimes = Array.from(createInFlight.values());\n createInFlight.clear();\n const runtimes = Array.from(runtimesBySessionId.values());\n runtimesBySessionId.clear();\n sessionIdBySessionKey.clear();\n idleTtlMsBySessionId.clear();\n const lateRuntimes = await Promise.all(\n inFlightRuntimes.map(async ({ promise }) => await promise.catch(() => undefined)),\n );\n const allRuntimes = new Set<SessionMcpRuntime>(runtimes);\n for (const runtime of lateRuntimes) {\n if (runtime) {\n allRuntimes.add(runtime);\n }\n }\n await Promise.allSettled(Array.from(allRuntimes, (runtime) => runtime.dispose()));\n },\n sweepIdleRuntimes,\n listSessionIds() {\n return Array.from(runtimesBySessionId.keys());\n },\n };\n}\n\nexport function getSessionMcpRuntimeManager(): SessionMcpRuntimeManager {\n return resolveGlobalSingleton(SESSION_MCP_RUNTIME_MANAGER_KEY, createSessionMcpRuntimeManager);\n}\n\nexport async function getOrCreateSessionMcpRuntime(params: {\n sessionId: string;\n sessionKey?: string;\n workspaceDir: string;\n cfg?: Config;\n}): Promise<SessionMcpRuntime> {\n return await getSessionMcpRuntimeManager().getOrCreate(params);\n}\n\nexport async function disposeSessionMcpRuntime(sessionId: string): Promise<void> {\n await getSessionMcpRuntimeManager().disposeSession(sessionId);\n}\n\nexport async function retireSessionMcpRuntime(params: {\n sessionId?: string \| null;\n reason: string;\n onError?: (error: unknown, sessionId: string, reason: string) => void;\n}): Promise<boolean> {\n const sessionId = normalizeOptionalString(params.sessionId);\n if (!sessionId) {\n return false;\n }\n try {\n await disposeSessionMcpRuntime(sessionId);\n return true;\n } catch (error) {\n params.onError?.(error, sessionId, params.reason);\n return false;\n }\n}\n\nexport async function retireSessionMcpRuntimeForSessionKey(params: {\n sessionKey?: string \| null;\n reason: string;\n onError?: (error: unknown, sessionId: string, reason: string) => void;\n}): Promise<boolean> {\n const sessionKey = normalizeOptionalString(params.sessionKey);\n if (!sessionKey) {\n return false;\n }\n const sessionId = getSessionMcpRuntimeManager().resolveSessionId(sessionKey);\n return await retireSessionMcpRuntime({\n sessionId,\n reason: params.reason,\n onError: params.onError,\n });\n}\n\nexport async function disposeAllSessionMcpRuntimes(): Promise<void> {\n await getSessionMcpRuntimeManager().disposeAll();\n}\n\nexport const __testing = {\n createSessionMcpRuntimeManager,\n async resetSessionMcpRuntimeManager() {\n await disposeAllSessionMcpRuntimes();\n },\n getCachedSessionIds() {\n return getSessionMcpRuntimeManager().listSessionIds();\n },\n resolveSessionMcpRuntimeIdleTtlMs,\n};\n"],"mappings":"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"}
1	+ {"version":3,"file":"bundle-mcp-runtime.js","names":[],"sources":["../../../../src/agent/mcp/bundle-mcp-runtime.ts"],"sourcesContent":["import crypto from \"node:crypto\";\nimport Ajv2020 from \"ajv/dist/2020.js\";\nimport { Client } from \"@modelcontextprotocol/sdk/client/index.js\";\nimport { StreamableHTTPClientTransport } from \"@modelcontextprotocol/sdk/client/streamableHttp.js\";\nimport type { Transport } from \"@modelcontextprotocol/sdk/shared/transport.js\";\nimport type { CallToolResult } from \"@modelcontextprotocol/sdk/types.js\";\nimport { AjvJsonSchemaValidator } from \"@modelcontextprotocol/sdk/validation/ajv-provider.js\";\nimport type {\n JsonSchemaType,\n JsonSchemaValidator,\n jsonSchemaValidator,\n} from \"@modelcontextprotocol/sdk/validation/types.js\";\nimport type { Config } from \"../../config/schema.js\";\nimport { createLogger } from \"../../utils/logger.js\";\nconst log = createLogger(\"Mcp:Bundle\");\nimport { resolveGlobalSingleton } from \"../../utils/global-singleton.js\";\nimport { redactSensitiveUrlLikeString } from \"../../utils/redact-sensitive-url.js\";\nimport { normalizeOptionalString } from \"../../utils/string-coerce.js\";\nimport { loadEmbeddedMcpConfig } from \"./embedded-mcp.js\";\nimport { resolveConnectorSecretReferences } from \"../../connectors/secret-store.js\";\nimport { isMcpConfigRecord } from \"./mcp-config-shared.js\";\nimport { resolveMcpTransport } from \"./mcp-transport.js\";\nimport { sanitizeServerName } from \"./bundle-mcp-names.js\";\nimport type {\n McpCatalogTool,\n McpServerCatalog,\n McpToolCatalog,\n SessionMcpRuntime,\n SessionMcpRuntimeManager,\n} from \"./bundle-mcp-types.js\";\n\ntype BundleMcpSession = {\n serverName: string;\n client: Client;\n transport: Transport;\n transportType: \"stdio\" \| \"sse\" \| \"streamable-http\";\n detachStderr?: () => void;\n};\n\ntype LoadedMcpConfig = ReturnType<typeof loadEmbeddedMcpConfig>;\ntype ListedTool = Awaited<ReturnType<Client[\"listTools\"]>>[\"tools\"][number];\ntype CreateSessionMcpRuntime = (\n params: Parameters<typeof createSessionMcpRuntime>[0] & { configFingerprint?: string },\n) => SessionMcpRuntime;\n\nconst SESSION_MCP_RUNTIME_MANAGER_KEY = Symbol.for(\"xopc.sessionMcpRuntimeManager\");\nconst DRAFT_2020_12_SCHEMA = \"https://json-schema.org/draft/2020-12/schema\";\nconst DEFAULT_SESSION_MCP_RUNTIME_IDLE_TTL_MS = 10 * 60 * 1000;\nconst SESSION_MCP_RUNTIME_SWEEP_INTERVAL_MS = 60 * 1000;\n\nfunction isDraft202012Schema(schema: JsonSchemaType): boolean {\n return (schema as { $schema?: unknown }).$schema === DRAFT_2020_12_SCHEMA;\n}\n\nexport function createBundleMcpJsonSchemaValidator(): jsonSchemaValidator {\n const defaultValidator = new AjvJsonSchemaValidator();\n const ajv2020 = new Ajv2020({\n strict: false,\n validateFormats: false,\n validateSchema: false,\n allErrors: true,\n });\n\n return {\n getValidator<T>(schema: JsonSchemaType): JsonSchemaValidator<T> {\n if (!isDraft202012Schema(schema)) {\n return defaultValidator.getValidator<T>(schema);\n }\n const ajvValidator = ajv2020.compile(schema);\n return (input: unknown) => {\n const valid = ajvValidator(input);\n if (valid) {\n return {\n valid: true,\n data: input as T,\n errorMessage: undefined,\n };\n }\n return {\n valid: false,\n data: undefined,\n errorMessage: ajv2020.errorsText(ajvValidator.errors),\n };\n };\n },\n };\n}\n\nfunction connectWithTimeout(\n client: Client,\n transport: Transport,\n timeoutMs: number,\n): Promise<void> {\n return new Promise<void>((resolve, reject) => {\n const timer = setTimeout(\n () => reject(new Error(`MCP server connection timed out after ${timeoutMs}ms`)),\n timeoutMs,\n );\n client.connect(transport).then(\n (value) => {\n clearTimeout(timer);\n resolve(value);\n },\n (error) => {\n clearTimeout(timer);\n reject(error);\n },\n );\n });\n}\n\nfunction redactErrorUrls(error: unknown): string {\n return redactSensitiveUrlLikeString(String(error));\n}\n\nasync function listAllTools(client: Client) {\n const tools: ListedTool[] = [];\n let cursor: string \| undefined;\n do {\n const page = await client.listTools(cursor ? { cursor } : undefined);\n tools.push(...page.tools);\n cursor = page.nextCursor;\n } while (cursor);\n return tools;\n}\n\nasync function disposeSession(session: BundleMcpSession) {\n session.detachStderr?.();\n if (session.transportType === \"streamable-http\") {\n await (session.transport as StreamableHTTPClientTransport).terminateSession().catch(() => {});\n }\n await session.transport.close().catch(() => {});\n await session.client.close().catch(() => {});\n}\n\nfunction createCatalogFingerprint(servers: Record<string, unknown>): string {\n return crypto.createHash(\"sha1\").update(JSON.stringify(servers)).digest(\"hex\");\n}\n\nfunction loadSessionMcpConfig(params: {\n workspaceDir: string;\n cfg?: Config;\n logDiagnostics?: boolean;\n}): {\n loaded: LoadedMcpConfig;\n fingerprint: string;\n} {\n const loaded = loadEmbeddedMcpConfig({\n workspaceDir: params.workspaceDir,\n cfg: params.cfg,\n });\n if (params.logDiagnostics !== false) {\n for (const diagnostic of loaded.diagnostics) {\n log.warn(\n {\n phase: 'agent.mcp_connect',\n extensionId: diagnostic.extensionId,\n message: diagnostic.message,\n },\n `bundle-mcp diagnostic: ${diagnostic.extensionId}: ${diagnostic.message}`,\n );\n }\n }\n return {\n loaded,\n fingerprint: createCatalogFingerprint(loaded.mcpServers),\n };\n}\n\nfunction createDisposedError(sessionId: string): Error {\n return new Error(`bundle-mcp runtime disposed for session ${sessionId}`);\n}\n\nfunction resolveSessionMcpRuntimeIdleTtlMs(cfg?: Config): number {\n const raw = cfg?.mcp?.sessionIdleTtlMs;\n if (typeof raw === \"number\" && Number.isFinite(raw) && raw >= 0) {\n return Math.floor(raw);\n }\n return DEFAULT_SESSION_MCP_RUNTIME_IDLE_TTL_MS;\n}\n\nexport function createSessionMcpRuntime(params: {\n sessionId: string;\n sessionKey?: string;\n workspaceDir: string;\n cfg?: Config;\n}): SessionMcpRuntime {\n const { loaded, fingerprint: configFingerprint } = loadSessionMcpConfig({\n workspaceDir: params.workspaceDir,\n cfg: params.cfg,\n logDiagnostics: true,\n });\n const createdAt = Date.now();\n let lastUsedAt = createdAt;\n let activeLeases = 0;\n let disposed = false;\n let catalog: McpToolCatalog \| null = null;\n let catalogInFlight: Promise<McpToolCatalog> \| undefined;\n const sessions = new Map<string, BundleMcpSession>();\n const failIfDisposed = () => {\n if (disposed) {\n throw createDisposedError(params.sessionId);\n }\n };\n\n const getCatalog = async (): Promise<McpToolCatalog> => {\n failIfDisposed();\n if (catalog) {\n return catalog;\n }\n if (catalogInFlight) {\n return catalogInFlight;\n }\n catalogInFlight = (async () => {\n if (Object.keys(loaded.mcpServers).length === 0) {\n return {\n version: 1,\n generatedAt: Date.now(),\n servers: {},\n tools: [],\n };\n }\n\n const servers: Record<string, McpServerCatalog> = {};\n const tools: McpCatalogTool[] = [];\n const usedServerNames = new Set<string>();\n\n try {\n for (const [serverName, rawServer] of Object.entries(loaded.mcpServers)) {\n failIfDisposed();\n const resolvedServer = await resolveConnectorSecretReferences(rawServer);\n const resolved = resolveMcpTransport(serverName, resolvedServer);\n if (!resolved) {\n continue;\n }\n const safeServerName = sanitizeServerName(serverName, usedServerNames);\n if (safeServerName !== serverName) {\n log.warn(\n {\n phase: 'agent.mcp_connect',\n serverName,\n safeServerName,\n },\n `bundle-mcp: server key \"${serverName}\" registered as \"${safeServerName}\" for provider-safe tool names`,\n );\n }\n\n const client = new Client(\n {\n name: \"xopc-bundle-mcp\",\n version: \"0.0.0\",\n },\n {\n jsonSchemaValidator: createBundleMcpJsonSchemaValidator(),\n },\n );\n const session: BundleMcpSession = {\n serverName,\n client,\n transport: resolved.transport,\n transportType: resolved.transportType,\n detachStderr: resolved.detachStderr,\n };\n sessions.set(serverName, session);\n\n try {\n failIfDisposed();\n await connectWithTimeout(client, resolved.transport, resolved.connectionTimeoutMs);\n failIfDisposed();\n const listedTools = await listAllTools(client);\n failIfDisposed();\n servers[serverName] = {\n serverName,\n launchSummary: resolved.description,\n toolCount: listedTools.length,\n };\n for (const tool of listedTools) {\n const toolName = tool.name.trim();\n if (!toolName) {\n continue;\n }\n tools.push({\n serverName,\n safeServerName,\n toolName,\n title: tool.title,\n description:\n normalizeOptionalString(tool.description) ?? normalizeOptionalString(tool.title),\n inputSchema: tool.inputSchema,\n fallbackDescription: `Provided by bundle MCP server \"${serverName}\" (${resolved.description}).`,\n });\n }\n } catch (error) {\n if (!disposed) {\n log.warn(\n `bundle-mcp: failed to start server \"${serverName}\" (${resolved.description}): ${redactErrorUrls(error)}`,\n );\n }\n await disposeSession(session);\n sessions.delete(serverName);\n failIfDisposed();\n }\n }\n\n failIfDisposed();\n return {\n version: 1,\n generatedAt: Date.now(),\n servers,\n tools,\n };\n } catch (error) {\n await Promise.allSettled(\n Array.from(sessions.values(), (session) => disposeSession(session)),\n );\n sessions.clear();\n throw error;\n }\n })();\n\n try {\n const nextCatalog = await catalogInFlight;\n failIfDisposed();\n catalog = nextCatalog;\n return nextCatalog;\n } finally {\n catalogInFlight = undefined;\n }\n };\n\n return {\n sessionId: params.sessionId,\n sessionKey: params.sessionKey,\n workspaceDir: params.workspaceDir,\n configFingerprint,\n createdAt,\n get lastUsedAt() {\n return lastUsedAt;\n },\n get activeLeases() {\n return activeLeases;\n },\n acquireLease() {\n activeLeases += 1;\n let released = false;\n return () => {\n if (released) {\n return;\n }\n released = true;\n activeLeases = Math.max(0, activeLeases - 1);\n lastUsedAt = Date.now();\n };\n },\n getCatalog,\n markUsed() {\n lastUsedAt = Date.now();\n },\n async callTool(serverName, toolName, input) {\n failIfDisposed();\n await getCatalog();\n const session = sessions.get(serverName);\n if (!session) {\n throw new Error(`bundle-mcp server \"${serverName}\" is not connected`);\n }\n return (await session.client.callTool({\n name: toolName,\n arguments: isMcpConfigRecord(input) ? input : {},\n })) as CallToolResult;\n },\n async dispose() {\n if (disposed) {\n return;\n }\n disposed = true;\n catalog = null;\n catalogInFlight = undefined;\n const sessionsToClose = Array.from(sessions.values());\n sessions.clear();\n await Promise.allSettled(sessionsToClose.map((session) => disposeSession(session)));\n },\n };\n}\n\nfunction createSessionMcpRuntimeManager(\n opts: {\n createRuntime?: CreateSessionMcpRuntime;\n now?: () => number;\n enableIdleSweepTimer?: boolean;\n idleSweepIntervalMs?: number;\n } = {},\n): SessionMcpRuntimeManager {\n const runtimesBySessionId = new Map<string, SessionMcpRuntime>();\n const sessionIdBySessionKey = new Map<string, string>();\n const idleTtlMsBySessionId = new Map<string, number>();\n const createRuntime = opts.createRuntime ?? createSessionMcpRuntime;\n const now = opts.now ?? Date.now;\n const createInFlight = new Map<\n string,\n {\n promise: Promise<SessionMcpRuntime>;\n workspaceDir: string;\n configFingerprint: string;\n }\n >();\n const idleSweepIntervalMs = opts.idleSweepIntervalMs ?? SESSION_MCP_RUNTIME_SWEEP_INTERVAL_MS;\n let idleSweepTimer: ReturnType<typeof setInterval> \| undefined;\n let idleSweepInFlight: Promise<void> \| undefined;\n\n const forgetSessionKeysForSessionId = (sessionId: string) => {\n for (const [sessionKey, mappedSessionId] of sessionIdBySessionKey.entries()) {\n if (mappedSessionId === sessionId) {\n sessionIdBySessionKey.delete(sessionKey);\n }\n }\n };\n\n const sweepIdleRuntimes = async (): Promise<number> => {\n const nowMs = now();\n const expired: SessionMcpRuntime[] = [];\n for (const [sessionId, runtime] of runtimesBySessionId.entries()) {\n const idleTtlMs =\n idleTtlMsBySessionId.get(sessionId) ?? DEFAULT_SESSION_MCP_RUNTIME_IDLE_TTL_MS;\n if (idleTtlMs <= 0 \|\| (runtime.activeLeases ?? 0) > 0) {\n continue;\n }\n if (nowMs - runtime.lastUsedAt < idleTtlMs) {\n continue;\n }\n runtimesBySessionId.delete(sessionId);\n idleTtlMsBySessionId.delete(sessionId);\n forgetSessionKeysForSessionId(sessionId);\n expired.push(runtime);\n }\n await Promise.allSettled(expired.map((runtime) => runtime.dispose()));\n return expired.length;\n };\n\n const queueIdleSweep = () => {\n if (idleSweepInFlight) {\n return;\n }\n idleSweepInFlight = sweepIdleRuntimes()\n .then(() => undefined)\n .catch((error: unknown) => {\n const em = error instanceof Error ? error.message : String(error);\n log.warn(\n { err: error, errorMessage: em, phase: 'agent.mcp_connect' },\n `bundle-mcp: idle runtime sweep failed: ${em}`,\n );\n })\n .finally(() => {\n idleSweepInFlight = undefined;\n });\n };\n\n const ensureIdleSweepTimer = () => {\n if (opts.enableIdleSweepTimer === false \|\| idleSweepIntervalMs <= 0 \|\| idleSweepTimer) {\n return;\n }\n idleSweepTimer = setInterval(queueIdleSweep, idleSweepIntervalMs);\n idleSweepTimer.unref?.();\n };\n\n const clearIdleSweepTimer = () => {\n if (!idleSweepTimer) {\n return;\n }\n clearInterval(idleSweepTimer);\n idleSweepTimer = undefined;\n };\n\n return {\n async getOrCreate(params) {\n const idleTtlMs = resolveSessionMcpRuntimeIdleTtlMs(params.cfg);\n if (runtimesBySessionId.has(params.sessionId)) {\n idleTtlMsBySessionId.set(params.sessionId, idleTtlMs);\n }\n await sweepIdleRuntimes();\n if (idleTtlMs > 0) {\n ensureIdleSweepTimer();\n }\n if (params.sessionKey) {\n sessionIdBySessionKey.set(params.sessionKey, params.sessionId);\n }\n const { fingerprint: nextFingerprint } = loadSessionMcpConfig({\n workspaceDir: params.workspaceDir,\n cfg: params.cfg,\n logDiagnostics: false,\n });\n const existing = runtimesBySessionId.get(params.sessionId);\n if (existing) {\n if (\n existing.workspaceDir !== params.workspaceDir \|\|\n existing.configFingerprint !== nextFingerprint\n ) {\n runtimesBySessionId.delete(params.sessionId);\n await existing.dispose();\n } else {\n existing.markUsed();\n idleTtlMsBySessionId.set(params.sessionId, idleTtlMs);\n return existing;\n }\n }\n const inFlight = createInFlight.get(params.sessionId);\n if (inFlight) {\n if (\n inFlight.workspaceDir === params.workspaceDir &&\n inFlight.configFingerprint === nextFingerprint\n ) {\n return inFlight.promise;\n }\n createInFlight.delete(params.sessionId);\n const staleRuntime = await inFlight.promise.catch(() => undefined);\n runtimesBySessionId.delete(params.sessionId);\n idleTtlMsBySessionId.delete(params.sessionId);\n await staleRuntime?.dispose();\n }\n const created = Promise.resolve(\n createRuntime({\n sessionId: params.sessionId,\n sessionKey: params.sessionKey,\n workspaceDir: params.workspaceDir,\n cfg: params.cfg,\n }),\n ).then((runtime) => {\n runtime.markUsed();\n runtimesBySessionId.set(params.sessionId, runtime);\n idleTtlMsBySessionId.set(params.sessionId, idleTtlMs);\n return runtime;\n });\n createInFlight.set(params.sessionId, {\n promise: created,\n workspaceDir: params.workspaceDir,\n configFingerprint: nextFingerprint,\n });\n try {\n return await created;\n } finally {\n createInFlight.delete(params.sessionId);\n }\n },\n bindSessionKey(sessionKey, sessionId) {\n sessionIdBySessionKey.set(sessionKey, sessionId);\n },\n resolveSessionId(sessionKey) {\n return sessionIdBySessionKey.get(sessionKey);\n },\n async disposeSession(sessionId) {\n const inFlight = createInFlight.get(sessionId);\n createInFlight.delete(sessionId);\n let runtime = runtimesBySessionId.get(sessionId);\n if (!runtime && inFlight) {\n runtime = await inFlight.promise.catch(() => undefined);\n }\n runtimesBySessionId.delete(sessionId);\n idleTtlMsBySessionId.delete(sessionId);\n if (!runtime) {\n forgetSessionKeysForSessionId(sessionId);\n return;\n }\n forgetSessionKeysForSessionId(sessionId);\n await runtime.dispose();\n },\n async disposeAll() {\n clearIdleSweepTimer();\n const inFlightRuntimes = Array.from(createInFlight.values());\n createInFlight.clear();\n const runtimes = Array.from(runtimesBySessionId.values());\n runtimesBySessionId.clear();\n sessionIdBySessionKey.clear();\n idleTtlMsBySessionId.clear();\n const lateRuntimes = await Promise.all(\n inFlightRuntimes.map(async ({ promise }) => await promise.catch(() => undefined)),\n );\n const allRuntimes = new Set<SessionMcpRuntime>(runtimes);\n for (const runtime of lateRuntimes) {\n if (runtime) {\n allRuntimes.add(runtime);\n }\n }\n await Promise.allSettled(Array.from(allRuntimes, (runtime) => runtime.dispose()));\n },\n sweepIdleRuntimes,\n listSessionIds() {\n return Array.from(runtimesBySessionId.keys());\n },\n };\n}\n\nexport function getSessionMcpRuntimeManager(): SessionMcpRuntimeManager {\n return resolveGlobalSingleton(SESSION_MCP_RUNTIME_MANAGER_KEY, createSessionMcpRuntimeManager);\n}\n\nexport async function getOrCreateSessionMcpRuntime(params: {\n sessionId: string;\n sessionKey?: string;\n workspaceDir: string;\n cfg?: Config;\n}): Promise<SessionMcpRuntime> {\n return await getSessionMcpRuntimeManager().getOrCreate(params);\n}\n\nexport async function disposeSessionMcpRuntime(sessionId: string): Promise<void> {\n await getSessionMcpRuntimeManager().disposeSession(sessionId);\n}\n\nexport async function retireSessionMcpRuntime(params: {\n sessionId?: string \| null;\n reason: string;\n onError?: (error: unknown, sessionId: string, reason: string) => void;\n}): Promise<boolean> {\n const sessionId = normalizeOptionalString(params.sessionId);\n if (!sessionId) {\n return false;\n }\n try {\n await disposeSessionMcpRuntime(sessionId);\n return true;\n } catch (error) {\n params.onError?.(error, sessionId, params.reason);\n return false;\n }\n}\n\nexport async function retireSessionMcpRuntimeForSessionKey(params: {\n sessionKey?: string \| null;\n reason: string;\n onError?: (error: unknown, sessionId: string, reason: string) => void;\n}): Promise<boolean> {\n const sessionKey = normalizeOptionalString(params.sessionKey);\n if (!sessionKey) {\n return false;\n }\n const sessionId = getSessionMcpRuntimeManager().resolveSessionId(sessionKey);\n return await retireSessionMcpRuntime({\n sessionId,\n reason: params.reason,\n onError: params.onError,\n });\n}\n\nexport async function disposeAllSessionMcpRuntimes(): Promise<void> {\n await getSessionMcpRuntimeManager().disposeAll();\n}\n\nexport const __testing = {\n createSessionMcpRuntimeManager,\n async resetSessionMcpRuntimeManager() {\n await disposeAllSessionMcpRuntimes();\n },\n getCachedSessionIds() {\n return getSessionMcpRuntimeManager().listSessionIds();\n },\n resolveSessionMcpRuntimeIdleTtlMs,\n};\n"],"mappings":";;;;;;;;;;;;;;;aAaqD;oBAIkB;AAHvE,MAAM,MAAM,aAAa,aAAa;AA+BtC,MAAM,kCAAkC,OAAO,IAAI,gCAAgC;AACnF,MAAM,uBAAuB;AAC7B,MAAM,0CAA0C,MAAU;AAC1D,MAAM,wCAAwC,KAAK;AAEnD,SAAS,oBAAoB,QAAiC;AAC5D,QAAQ,OAAiC,YAAY;;AAGvD,SAAgB,qCAA0D;CACxE,MAAM,mBAAmB,IAAI,wBAAwB;CACrD,MAAM,UAAU,IAAI,QAAQ;EAC1B,QAAQ;EACR,iBAAiB;EACjB,gBAAgB;EAChB,WAAW;EACZ,CAAC;AAEF,QAAO,EACL,aAAgB,QAAgD;AAC9D,MAAI,CAAC,oBAAoB,OAAO,CAC9B,QAAO,iBAAiB,aAAgB,OAAO;EAEjD,MAAM,eAAe,QAAQ,QAAQ,OAAO;AAC5C,UAAQ,UAAmB;AAEzB,OADc,aAAa,MAClB,CACP,QAAO;IACL,OAAO;IACP,MAAM;IACN,cAAc,KAAA;IACf;AAEH,UAAO;IACL,OAAO;IACP,MAAM,KAAA;IACN,cAAc,QAAQ,WAAW,aAAa,OAAO;IACtD;;IAGN;;AAGH,SAAS,mBACP,QACA,WACA,WACe;AACf,QAAO,IAAI,SAAe,SAAS,WAAW;EAC5C,MAAM,QAAQ,iBACN,uBAAO,IAAI,MAAM,yCAAyC,UAAU,IAAI,CAAC,EAC/E,UACD;AACD,SAAO,QAAQ,UAAU,CAAC,MACvB,UAAU;AACT,gBAAa,MAAM;AACnB,WAAQ,MAAM;MAEf,UAAU;AACT,gBAAa,MAAM;AACnB,UAAO,MAAM;IAEhB;GACD;;AAGJ,SAAS,gBAAgB,OAAwB;AAC/C,QAAO,6BAA6B,OAAO,MAAM,CAAC;;AAGpD,eAAe,aAAa,QAAgB;CAC1C,MAAM,QAAsB,EAAE;CAC9B,IAAI;AACJ,IAAG;EACD,MAAM,OAAO,MAAM,OAAO,UAAU,SAAS,EAAE,QAAQ,GAAG,KAAA,EAAU;AACpE,QAAM,KAAK,GAAG,KAAK,MAAM;AACzB,WAAS,KAAK;UACP;AACT,QAAO;;AAGT,eAAe,eAAe,SAA2B;AACvD,SAAQ,gBAAgB;AACxB,KAAI,QAAQ,kBAAkB,kBAC5B,OAAO,QAAQ,UAA4C,kBAAkB,CAAC,YAAY,GAAG;AAE/F,OAAM,QAAQ,UAAU,OAAO,CAAC,YAAY,GAAG;AAC/C,OAAM,QAAQ,OAAO,OAAO,CAAC,YAAY,GAAG;;AAG9C,SAAS,yBAAyB,SAA0C;AAC1E,QAAO,OAAO,WAAW,OAAO,CAAC,OAAO,KAAK,UAAU,QAAQ,CAAC,CAAC,OAAO,MAAM;;AAGhF,SAAS,qBAAqB,QAO5B;CACA,MAAM,SAAS,sBAAsB;EACnC,cAAc,OAAO;EACrB,KAAK,OAAO;EACb,CAAC;AACF,KAAI,OAAO,mBAAmB,MAC5B,MAAK,MAAM,cAAc,OAAO,YAC9B,KAAI,KACF;EACE,OAAO;EACP,aAAa,WAAW;EACxB,SAAS,WAAW;EACrB,EACD,0BAA0B,WAAW,YAAY,IAAI,WAAW,UACjE;AAGL,QAAO;EACL;EACA,aAAa,yBAAyB,OAAO,WAAW;EACzD;;AAGH,SAAS,oBAAoB,WAA0B;AACrD,wBAAO,IAAI,MAAM,2CAA2C,YAAY;;AAG1E,SAAS,kCAAkC,KAAsB;CAC/D,MAAM,MAAM,KAAK,KAAK;AACtB,KAAI,OAAO,QAAQ,YAAY,OAAO,SAAS,IAAI,IAAI,OAAO,EAC5D,QAAO,KAAK,MAAM,IAAI;AAExB,QAAO;;AAGT,SAAgB,wBAAwB,QAKlB;CACpB,MAAM,EAAE,QAAQ,aAAa,sBAAsB,qBAAqB;EACtE,cAAc,OAAO;EACrB,KAAK,OAAO;EACZ,gBAAgB;EACjB,CAAC;CACF,MAAM,YAAY,KAAK,KAAK;CAC5B,IAAI,aAAa;CACjB,IAAI,eAAe;CACnB,IAAI,WAAW;CACf,IAAI,UAAiC;CACrC,IAAI;CACJ,MAAM,2BAAW,IAAI,KAA+B;CACpD,MAAM,uBAAuB;AAC3B,MAAI,SACF,OAAM,oBAAoB,OAAO,UAAU;;CAI/C,MAAM,aAAa,YAAqC;AACtD,kBAAgB;AAChB,MAAI,QACF,QAAO;AAET,MAAI,gBACF,QAAO;AAET,qBAAmB,YAAY;AAC7B,OAAI,OAAO,KAAK,OAAO,WAAW,CAAC,WAAW,EAC5C,QAAO;IACL,SAAS;IACT,aAAa,KAAK,KAAK;IACvB,SAAS,EAAE;IACX,OAAO,EAAE;IACV;GAGH,MAAM,UAA4C,EAAE;GACpD,MAAM,QAA0B,EAAE;GAClC,MAAM,kCAAkB,IAAI,KAAa;AAEzC,OAAI;AACF,SAAK,MAAM,CAAC,YAAY,cAAc,OAAO,QAAQ,OAAO,WAAW,EAAE;AACvE,qBAAgB;KAEhB,MAAM,WAAW,oBAAoB,YAAY,MADpB,iCAAiC,UAAU,CACR;AAChE,SAAI,CAAC,SACH;KAEF,MAAM,iBAAiB,mBAAmB,YAAY,gBAAgB;AACtE,SAAI,mBAAmB,WACrB,KAAI,KACF;MACE,OAAO;MACP;MACA;MACD,EACD,2BAA2B,WAAW,mBAAmB,eAAe,gCACzE;KAGH,MAAM,SAAS,IAAI,OACjB;MACE,MAAM;MACN,SAAS;MACV,EACD,EACE,qBAAqB,oCAAoC,EAC1D,CACF;KACD,MAAM,UAA4B;MAChC;MACA;MACA,WAAW,SAAS;MACpB,eAAe,SAAS;MACxB,cAAc,SAAS;MACxB;AACD,cAAS,IAAI,YAAY,QAAQ;AAEjC,SAAI;AACF,sBAAgB;AAChB,YAAM,mBAAmB,QAAQ,SAAS,WAAW,SAAS,oBAAoB;AAClF,sBAAgB;MAChB,MAAM,cAAc,MAAM,aAAa,OAAO;AAC9C,sBAAgB;AAChB,cAAQ,cAAc;OACpB;OACA,eAAe,SAAS;OACxB,WAAW,YAAY;OACxB;AACD,WAAK,MAAM,QAAQ,aAAa;OAC9B,MAAM,WAAW,KAAK,KAAK,MAAM;AACjC,WAAI,CAAC,SACH;AAEF,aAAM,KAAK;QACT;QACA;QACA;QACA,OAAO,KAAK;QACZ,aACE,wBAAwB,KAAK,YAAY,IAAI,wBAAwB,KAAK,MAAM;QAClF,aAAa,KAAK;QAClB,qBAAqB,kCAAkC,WAAW,KAAK,SAAS,YAAY;QAC7F,CAAC;;cAEG,OAAO;AACd,UAAI,CAAC,SACH,KAAI,KACF,uCAAuC,WAAW,KAAK,SAAS,YAAY,KAAK,gBAAgB,MAAM,GACxG;AAEH,YAAM,eAAe,QAAQ;AAC7B,eAAS,OAAO,WAAW;AAC3B,sBAAgB;;;AAIpB,oBAAgB;AAChB,WAAO;KACL,SAAS;KACT,aAAa,KAAK,KAAK;KACvB;KACA;KACD;YACM,OAAO;AACd,UAAM,QAAQ,WACZ,MAAM,KAAK,SAAS,QAAQ,GAAG,YAAY,eAAe,QAAQ,CAAC,CACpE;AACD,aAAS,OAAO;AAChB,UAAM;;MAEN;AAEJ,MAAI;GACF,MAAM,cAAc,MAAM;AAC1B,mBAAgB;AAChB,aAAU;AACV,UAAO;YACC;AACR,qBAAkB,KAAA;;;AAItB,QAAO;EACL,WAAW,OAAO;EAClB,YAAY,OAAO;EACnB,cAAc,OAAO;EACrB;EACA;EACA,IAAI,aAAa;AACf,UAAO;;EAET,IAAI,eAAe;AACjB,UAAO;;EAET,eAAe;AACb,mBAAgB;GAChB,IAAI,WAAW;AACf,gBAAa;AACX,QAAI,SACF;AAEF,eAAW;AACX,mBAAe,KAAK,IAAI,GAAG,eAAe,EAAE;AAC5C,iBAAa,KAAK,KAAK;;;EAG3B;EACA,WAAW;AACT,gBAAa,KAAK,KAAK;;EAEzB,MAAM,SAAS,YAAY,UAAU,OAAO;AAC1C,mBAAgB;AAChB,SAAM,YAAY;GAClB,MAAM,UAAU,SAAS,IAAI,WAAW;AACxC,OAAI,CAAC,QACH,OAAM,IAAI,MAAM,sBAAsB,WAAW,oBAAoB;AAEvE,UAAQ,MAAM,QAAQ,OAAO,SAAS;IACpC,MAAM;IACN,WAAW,kBAAkB,MAAM,GAAG,QAAQ,EAAE;IACjD,CAAC;;EAEJ,MAAM,UAAU;AACd,OAAI,SACF;AAEF,cAAW;AACX,aAAU;AACV,qBAAkB,KAAA;GAClB,MAAM,kBAAkB,MAAM,KAAK,SAAS,QAAQ,CAAC;AACrD,YAAS,OAAO;AAChB,SAAM,QAAQ,WAAW,gBAAgB,KAAK,YAAY,eAAe,QAAQ,CAAC,CAAC;;EAEtF;;AAGH,SAAS,+BACP,OAKI,EAAE,EACoB;CAC1B,MAAM,sCAAsB,IAAI,KAAgC;CAChE,MAAM,wCAAwB,IAAI,KAAqB;CACvD,MAAM,uCAAuB,IAAI,KAAqB;CACtD,MAAM,gBAAgB,KAAK,iBAAiB;CAC5C,MAAM,MAAM,KAAK,OAAO,KAAK;CAC7B,MAAM,iCAAiB,IAAI,KAOxB;CACH,MAAM,sBAAsB,KAAK,uBAAuB;CACxD,IAAI;CACJ,IAAI;CAEJ,MAAM,iCAAiC,cAAsB;AAC3D,OAAK,MAAM,CAAC,YAAY,oBAAoB,sBAAsB,SAAS,CACzE,KAAI,oBAAoB,UACtB,uBAAsB,OAAO,WAAW;;CAK9C,MAAM,oBAAoB,YAA6B;EACrD,MAAM,QAAQ,KAAK;EACnB,MAAM,UAA+B,EAAE;AACvC,OAAK,MAAM,CAAC,WAAW,YAAY,oBAAoB,SAAS,EAAE;GAChE,MAAM,YACJ,qBAAqB,IAAI,UAAU,IAAI;AACzC,OAAI,aAAa,MAAM,QAAQ,gBAAgB,KAAK,EAClD;AAEF,OAAI,QAAQ,QAAQ,aAAa,UAC/B;AAEF,uBAAoB,OAAO,UAAU;AACrC,wBAAqB,OAAO,UAAU;AACtC,iCAA8B,UAAU;AACxC,WAAQ,KAAK,QAAQ;;AAEvB,QAAM,QAAQ,WAAW,QAAQ,KAAK,YAAY,QAAQ,SAAS,CAAC,CAAC;AACrE,SAAO,QAAQ;;CAGjB,MAAM,uBAAuB;AAC3B,MAAI,kBACF;AAEF,sBAAoB,mBAAmB,CACpC,WAAW,KAAA,EAAU,CACrB,OAAO,UAAmB;GACzB,MAAM,KAAK,iBAAiB,QAAQ,MAAM,UAAU,OAAO,MAAM;AACjE,OAAI,KACF;IAAE,KAAK;IAAO,cAAc;IAAI,OAAO;IAAqB,EAC5D,0CAA0C,KAC3C;IACD,CACD,cAAc;AACb,uBAAoB,KAAA;IACpB;;CAGN,MAAM,6BAA6B;AACjC,MAAI,KAAK,yBAAyB,SAAS,uBAAuB,KAAK,eACrE;AAEF,mBAAiB,YAAY,gBAAgB,oBAAoB;AACjE,iBAAe,SAAS;;CAG1B,MAAM,4BAA4B;AAChC,MAAI,CAAC,eACH;AAEF,gBAAc,eAAe;AAC7B,mBAAiB,KAAA;;AAGnB,QAAO;EACL,MAAM,YAAY,QAAQ;GACxB,MAAM,YAAY,kCAAkC,OAAO,IAAI;AAC/D,OAAI,oBAAoB,IAAI,OAAO,UAAU,CAC3C,sBAAqB,IAAI,OAAO,WAAW,UAAU;AAEvD,SAAM,mBAAmB;AACzB,OAAI,YAAY,EACd,uBAAsB;AAExB,OAAI,OAAO,WACT,uBAAsB,IAAI,OAAO,YAAY,OAAO,UAAU;GAEhE,MAAM,EAAE,aAAa,oBAAoB,qBAAqB;IAC5D,cAAc,OAAO;IACrB,KAAK,OAAO;IACZ,gBAAgB;IACjB,CAAC;GACF,MAAM,WAAW,oBAAoB,IAAI,OAAO,UAAU;AAC1D,OAAI,SACF,KACE,SAAS,iBAAiB,OAAO,gBACjC,SAAS,sBAAsB,iBAC/B;AACA,wBAAoB,OAAO,OAAO,UAAU;AAC5C,UAAM,SAAS,SAAS;UACnB;AACL,aAAS,UAAU;AACnB,yBAAqB,IAAI,OAAO,WAAW,UAAU;AACrD,WAAO;;GAGX,MAAM,WAAW,eAAe,IAAI,OAAO,UAAU;AACrD,OAAI,UAAU;AACZ,QACE,SAAS,iBAAiB,OAAO,gBACjC,SAAS,sBAAsB,gBAE/B,QAAO,SAAS;AAElB,mBAAe,OAAO,OAAO,UAAU;IACvC,MAAM,eAAe,MAAM,SAAS,QAAQ,YAAY,KAAA,EAAU;AAClE,wBAAoB,OAAO,OAAO,UAAU;AAC5C,yBAAqB,OAAO,OAAO,UAAU;AAC7C,UAAM,cAAc,SAAS;;GAE/B,MAAM,UAAU,QAAQ,QACtB,cAAc;IACZ,WAAW,OAAO;IAClB,YAAY,OAAO;IACnB,cAAc,OAAO;IACrB,KAAK,OAAO;IACb,CAAC,CACH,CAAC,MAAM,YAAY;AAClB,YAAQ,UAAU;AAClB,wBAAoB,IAAI,OAAO,WAAW,QAAQ;AAClD,yBAAqB,IAAI,OAAO,WAAW,UAAU;AACrD,WAAO;KACP;AACF,kBAAe,IAAI,OAAO,WAAW;IACnC,SAAS;IACT,cAAc,OAAO;IACrB,mBAAmB;IACpB,CAAC;AACF,OAAI;AACF,WAAO,MAAM;aACL;AACR,mBAAe,OAAO,OAAO,UAAU;;;EAG3C,eAAe,YAAY,WAAW;AACpC,yBAAsB,IAAI,YAAY,UAAU;;EAElD,iBAAiB,YAAY;AAC3B,UAAO,sBAAsB,IAAI,WAAW;;EAE9C,MAAM,eAAe,WAAW;GAC9B,MAAM,WAAW,eAAe,IAAI,UAAU;AAC9C,kBAAe,OAAO,UAAU;GAChC,IAAI,UAAU,oBAAoB,IAAI,UAAU;AAChD,OAAI,CAAC,WAAW,SACd,WAAU,MAAM,SAAS,QAAQ,YAAY,KAAA,EAAU;AAEzD,uBAAoB,OAAO,UAAU;AACrC,wBAAqB,OAAO,UAAU;AACtC,OAAI,CAAC,SAAS;AACZ,kCAA8B,UAAU;AACxC;;AAEF,iCAA8B,UAAU;AACxC,SAAM,QAAQ,SAAS;;EAEzB,MAAM,aAAa;AACjB,wBAAqB;GACrB,MAAM,mBAAmB,MAAM,KAAK,eAAe,QAAQ,CAAC;AAC5D,kBAAe,OAAO;GACtB,MAAM,WAAW,MAAM,KAAK,oBAAoB,QAAQ,CAAC;AACzD,uBAAoB,OAAO;AAC3B,yBAAsB,OAAO;AAC7B,wBAAqB,OAAO;GAC5B,MAAM,eAAe,MAAM,QAAQ,IACjC,iBAAiB,IAAI,OAAO,EAAE,cAAc,MAAM,QAAQ,YAAY,KAAA,EAAU,CAAC,CAClF;GACD,MAAM,cAAc,IAAI,IAAuB,SAAS;AACxD,QAAK,MAAM,WAAW,aACpB,KAAI,QACF,aAAY,IAAI,QAAQ;AAG5B,SAAM,QAAQ,WAAW,MAAM,KAAK,cAAc,YAAY,QAAQ,SAAS,CAAC,CAAC;;EAEnF;EACA,iBAAiB;AACf,UAAO,MAAM,KAAK,oBAAoB,MAAM,CAAC;;EAEhD;;AAGH,SAAgB,8BAAwD;AACtE,QAAO,uBAAuB,iCAAiC,+BAA+B;;AAGhG,eAAsB,6BAA6B,QAKpB;AAC7B,QAAO,MAAM,6BAA6B,CAAC,YAAY,OAAO;;AAGhE,eAAsB,yBAAyB,WAAkC;AAC/E,OAAM,6BAA6B,CAAC,eAAe,UAAU;;AAG/D,eAAsB,wBAAwB,QAIzB;CACnB,MAAM,YAAY,wBAAwB,OAAO,UAAU;AAC3D,KAAI,CAAC,UACH,QAAO;AAET,KAAI;AACF,QAAM,yBAAyB,UAAU;AACzC,SAAO;UACA,OAAO;AACd,SAAO,UAAU,OAAO,WAAW,OAAO,OAAO;AACjD,SAAO;;;AAIX,eAAsB,qCAAqC,QAItC;CACnB,MAAM,aAAa,wBAAwB,OAAO,WAAW;AAC7D,KAAI,CAAC,WACH,QAAO;AAGT,QAAO,MAAM,wBAAwB;EACnC,WAFgB,6BAA6B,CAAC,iBAAiB,WAEtD;EACT,QAAQ,OAAO;EACf,SAAS,OAAO;EACjB,CAAC;;AAGJ,eAAsB,+BAA8C;AAClE,OAAM,6BAA6B,CAAC,YAAY;;AAGlD,MAAa,YAAY;CACvB;CACA,MAAM,gCAAgC;AACpC,QAAM,8BAA8B;;CAEtC,sBAAsB;AACpB,SAAO,6BAA6B,CAAC,gBAAgB;;CAEvD;CACD"}

package/dist/src/agent/mcp/mcp-transport-config.js CHANGED Viewed

@@ -1,6 +1,6 @@
+import { init_string_coerce, normalizeLowercaseStringOrEmpty } from "../../utils/string-coerce.js";
 import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
-import { init_string_coerce, normalizeLowercaseStringOrEmpty } from "../../utils/string-coerce.js";
 import { resolveXopcMcpTransportAlias } from "../../config/mcp-config-normalize.js";
 import { sanitizeForLog } from "../../utils/sanitize-log.js";
 import { describeHttpMcpServerLaunchConfig, resolveHttpMcpServerLaunchConfig } from "./mcp-http.js";
@@ -8,7 +8,7 @@ import { describeStdioMcpServerLaunchConfig, resolveStdioMcpServerLaunchConfig }
 //#region src/agent/mcp/mcp-transport-config.ts
 init_logger();
 init_string_coerce();
-const log = createLogger("BundleMcp");
+const log = createLogger("Mcp:Bundle");
 const DEFAULT_CONNECTION_TIMEOUT_MS = 3e4;
 function getConnectionTimeoutMs(rawServer) {
 	if (rawServer && typeof rawServer === "object" && typeof rawServer.connectionTimeoutMs === "number" && rawServer.connectionTimeoutMs > 0) return rawServer.connectionTimeoutMs;
@@ -26,10 +26,17 @@ function resolveHttpTransportConfig(serverName, rawServer, transportType) {
 	const launch = resolveHttpMcpServerLaunchConfig(rawServer, {
 		transportType,
 		onDroppedHeader: (key) => {
-			log.warn(`bundle-mcp: server "${serverName}": header "${key}" has an unsupported value type and was ignored.`);
+			log.warn({
+				phase: "agent.mcp_connect",
+				serverName,
+				header: key
+			}, `bundle-mcp: server "${serverName}": header "${key}" has an unsupported value type and was ignored`);
 		},
 		onMalformedHeaders: () => {
-			log.warn(`bundle-mcp: server "${serverName}": "headers" must be a JSON object; the value was ignored.`);
+			log.warn({
+				phase: "agent.mcp_connect",
+				serverName
+			}, `bundle-mcp: server "${serverName}": "headers" must be a JSON object; the value was ignored`);
 		}
 	});
 	if (!launch.ok) return null;

package/dist/src/agent/mcp/mcp-transport-config.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"mcp-transport-config.js","names":[],"sources":["../../../../src/agent/mcp/mcp-transport-config.ts"],"sourcesContent":["import { resolveXopcMcpTransportAlias } from \"../../config/mcp-config-normalize.js\";\nimport { createLogger } from \"../../utils/logger.js\";\nconst log = createLogger(\"~~BundleMcp~~\");\nimport { normalizeLowercaseStringOrEmpty } from \"../../utils/string-coerce.js\";\nimport { sanitizeForLog } from \"../../utils/sanitize-log.js\";\nimport {\n describeHttpMcpServerLaunchConfig,\n resolveHttpMcpServerLaunchConfig,\n type HttpMcpTransportType,\n} from \"./mcp-http.js\";\nimport {\n describeStdioMcpServerLaunchConfig,\n resolveStdioMcpServerLaunchConfig,\n} from \"./mcp-stdio.js\";\n\ntype ResolvedBaseMcpTransportConfig = {\n description: string;\n connectionTimeoutMs: number;\n};\n\nexport type ResolvedStdioMcpTransportConfig = ResolvedBaseMcpTransportConfig & {\n kind: \"stdio\";\n transportType: \"stdio\";\n command: string;\n args?: string[];\n env?: Record<string, string>;\n cwd?: string;\n};\n\nexport type ResolvedHttpMcpTransportConfig = ResolvedBaseMcpTransportConfig & {\n kind: \"http\";\n transportType: HttpMcpTransportType;\n url: string;\n headers?: Record<string, string>;\n};\n\nexport type ResolvedMcpTransportConfig =\n \| ResolvedStdioMcpTransportConfig\n \| ResolvedHttpMcpTransportConfig;\n\nconst DEFAULT_CONNECTION_TIMEOUT_MS = 30_000;\n\nfunction getConnectionTimeoutMs(rawServer: unknown): number {\n if (\n rawServer &&\n typeof rawServer === \"object\" &&\n typeof (rawServer as { connectionTimeoutMs?: unknown }).connectionTimeoutMs === \"number\" &&\n (rawServer as { connectionTimeoutMs: number }).connectionTimeoutMs > 0\n ) {\n return (rawServer as { connectionTimeoutMs: number }).connectionTimeoutMs;\n }\n return DEFAULT_CONNECTION_TIMEOUT_MS;\n}\n\nfunction getRequestedTransport(rawServer: unknown): string {\n if (\n !rawServer \|\|\n typeof rawServer !== \"object\" \|\|\n typeof (rawServer as { transport?: unknown }).transport !== \"string\"\n ) {\n return \"\";\n }\n return normalizeLowercaseStringOrEmpty((rawServer as { transport?: string }).transport);\n}\n\nfunction getRequestedTransportAlias(rawServer: unknown): HttpMcpTransportType \| \"\" {\n if (\n !rawServer \|\|\n typeof rawServer !== \"object\" \|\|\n typeof (rawServer as { type?: unknown }).type !== \"string\"\n ) {\n return \"\";\n }\n return resolveXopcMcpTransportAlias((rawServer as { type?: string }).type) ?? \"\";\n}\n\nfunction resolveHttpTransportConfig(\n serverName: string,\n rawServer: unknown,\n transportType: HttpMcpTransportType,\n): ResolvedHttpMcpTransportConfig \| null {\n const launch = resolveHttpMcpServerLaunchConfig(rawServer, {\n transportType,\n onDroppedHeader: (key) => {\n log.warn(\n `bundle-mcp: server \"${serverName}\": header \"${key}\" has an unsupported value type and was ignored~~.`,\~~n );\n },\n onMalformedHeaders: () => {\n log.warn(\n `bundle-mcp: server \"${serverName}\": \"headers\" must be a JSON object; the value was ignored~~.`,\~~n );\n },\n });\n if (!launch.ok) {\n return null;\n }\n return {\n kind: \"http\",\n transportType: launch.config.transportType,\n url: launch.config.url,\n headers: launch.config.headers,\n description: describeHttpMcpServerLaunchConfig(launch.config),\n connectionTimeoutMs: getConnectionTimeoutMs(rawServer),\n };\n}\n\nexport function resolveMcpTransportConfig(\n serverName: string,\n rawServer: unknown,\n): ResolvedMcpTransportConfig \| null {\n const logServerName = sanitizeForLog(serverName);\n const requestedTransport = getRequestedTransport(rawServer);\n const requestedTransportAlias = requestedTransport ? \"\" : getRequestedTransportAlias(rawServer);\n const effectiveTransport = requestedTransport \|\| requestedTransportAlias;\n const stdioLaunch = resolveStdioMcpServerLaunchConfig(rawServer, {\n onDroppedEnv: (key) => {\n log.warn(\n `bundle-mcp: server \"${logServerName}\": env \"${sanitizeForLog(key)}\" is blocked for stdio startup safety and was ignored.`,\n );\n },\n });\n if (stdioLaunch.ok) {\n return {\n kind: \"stdio\",\n transportType: \"stdio\",\n command: stdioLaunch.config.command,\n args: stdioLaunch.config.args,\n env: stdioLaunch.config.env,\n cwd: stdioLaunch.config.cwd,\n description: describeStdioMcpServerLaunchConfig(stdioLaunch.config),\n connectionTimeoutMs: getConnectionTimeoutMs(rawServer),\n };\n }\n\n if (\n effectiveTransport &&\n effectiveTransport !== \"sse\" &&\n effectiveTransport !== \"streamable-http\"\n ) {\n log.warn(\n `bundle-mcp: skipped server \"${logServerName}\" because transport \"${sanitizeForLog(effectiveTransport)}\" is not supported.`,\n );\n return null;\n }\n\n if (effectiveTransport === \"streamable-http\") {\n const httpTransport = resolveHttpTransportConfig(serverName, rawServer, \"streamable-http\");\n if (httpTransport) {\n return httpTransport;\n }\n }\n\n const sseTransport = resolveHttpTransportConfig(serverName, rawServer, \"sse\");\n if (sseTransport) {\n return sseTransport;\n }\n\n const stdioReason =\n stdioLaunch.ok === false ? stdioLaunch.reason : 'not a stdio server';\n const httpLaunch = resolveHttpMcpServerLaunchConfig(rawServer);\n const httpReason =\n httpLaunch.ok === false ? httpLaunch.reason : 'not an HTTP MCP server';\n log.warn(\n `bundle-mcp: skipped server \"${logServerName}\" because ${stdioReason} and ${httpReason}.`,\n );\n return null;\n}\n"],"mappings":";;;;;;;;aACqD;oBAE0B;AAD/E,MAAM,MAAM,aAAa,~~YAAY~~;~~AAsCrC~~,MAAM,gCAAgC;AAEtC,SAAS,uBAAuB,WAA4B;AAC1D,KACE,aACA,OAAO,cAAc,YACrB,OAAQ,UAAgD,wBAAwB,YAC/E,UAA8C,sBAAsB,EAErE,QAAQ,UAA8C;AAExD,QAAO;;AAGT,SAAS,sBAAsB,WAA4B;AACzD,KACE,CAAC,aACD,OAAO,cAAc,YACrB,OAAQ,UAAsC,cAAc,SAE5D,QAAO;AAET,QAAO,gCAAiC,UAAqC,UAAU;;AAGzF,SAAS,2BAA2B,WAA+C;AACjF,KACE,CAAC,aACD,OAAO,cAAc,YACrB,OAAQ,UAAiC,SAAS,SAElD,QAAO;AAET,QAAO,6BAA8B,UAAgC,KAAK,IAAI;;AAGhF,SAAS,2BACP,YACA,WACA,eACuC;CACvC,MAAM,SAAS,iCAAiC,WAAW;EACzD;EACA,kBAAkB,QAAQ;AACxB,OAAI,KACF,uBAAuB,WAAW,aAAa,IAAI,~~kDACpD~~;;EAEH,0BAA0B;AACxB,OAAI,KACF,uBAAuB,WAAW,~~4DACnC~~;;EAEJ,CAAC;AACF,KAAI,CAAC,OAAO,GACV,QAAO;AAET,QAAO;EACL,MAAM;EACN,eAAe,OAAO,OAAO;EAC7B,KAAK,OAAO,OAAO;EACnB,SAAS,OAAO,OAAO;EACvB,aAAa,kCAAkC,OAAO,OAAO;EAC7D,qBAAqB,uBAAuB,UAAU;EACvD;;AAGH,SAAgB,0BACd,YACA,WACmC;CACnC,MAAM,gBAAgB,eAAe,WAAW;CAChD,MAAM,qBAAqB,sBAAsB,UAAU;CAC3D,MAAM,0BAA0B,qBAAqB,KAAK,2BAA2B,UAAU;CAC/F,MAAM,qBAAqB,sBAAsB;CACjD,MAAM,cAAc,kCAAkC,WAAW,EAC/D,eAAe,QAAQ;AACrB,MAAI,KACF,uBAAuB,cAAc,UAAU,eAAe,IAAI,CAAC,wDACpE;IAEJ,CAAC;AACF,KAAI,YAAY,GACd,QAAO;EACL,MAAM;EACN,eAAe;EACf,SAAS,YAAY,OAAO;EAC5B,MAAM,YAAY,OAAO;EACzB,KAAK,YAAY,OAAO;EACxB,KAAK,YAAY,OAAO;EACxB,aAAa,mCAAmC,YAAY,OAAO;EACnE,qBAAqB,uBAAuB,UAAU;EACvD;AAGH,KACE,sBACA,uBAAuB,SACvB,uBAAuB,mBACvB;AACA,MAAI,KACF,+BAA+B,cAAc,uBAAuB,eAAe,mBAAmB,CAAC,qBACxG;AACD,SAAO;;AAGT,KAAI,uBAAuB,mBAAmB;EAC5C,MAAM,gBAAgB,2BAA2B,YAAY,WAAW,kBAAkB;AAC1F,MAAI,cACF,QAAO;;CAIX,MAAM,eAAe,2BAA2B,YAAY,WAAW,MAAM;AAC7E,KAAI,aACF,QAAO;CAGT,MAAM,cACJ,YAAY,OAAO,QAAQ,YAAY,SAAS;CAClD,MAAM,aAAa,iCAAiC,UAAU;CAC9D,MAAM,aACJ,WAAW,OAAO,QAAQ,WAAW,SAAS;AAChD,KAAI,KACF,+BAA+B,cAAc,YAAY,YAAY,OAAO,WAAW,GACxF;AACD,QAAO"}
1	+ {"version":3,"file":"mcp-transport-config.js","names":[],"sources":["../../../../src/agent/mcp/mcp-transport-config.ts"],"sourcesContent":["import { resolveXopcMcpTransportAlias } from \"../../config/mcp-config-normalize.js\";\nimport { createLogger } from \"../../utils/logger.js\";\nconst log = createLogger(\"Mcp:Bundle\");\nimport { normalizeLowercaseStringOrEmpty } from \"../../utils/string-coerce.js\";\nimport { sanitizeForLog } from \"../../utils/sanitize-log.js\";\nimport {\n describeHttpMcpServerLaunchConfig,\n resolveHttpMcpServerLaunchConfig,\n type HttpMcpTransportType,\n} from \"./mcp-http.js\";\nimport {\n describeStdioMcpServerLaunchConfig,\n resolveStdioMcpServerLaunchConfig,\n} from \"./mcp-stdio.js\";\n\ntype ResolvedBaseMcpTransportConfig = {\n description: string;\n connectionTimeoutMs: number;\n};\n\nexport type ResolvedStdioMcpTransportConfig = ResolvedBaseMcpTransportConfig & {\n kind: \"stdio\";\n transportType: \"stdio\";\n command: string;\n args?: string[];\n env?: Record<string, string>;\n cwd?: string;\n};\n\nexport type ResolvedHttpMcpTransportConfig = ResolvedBaseMcpTransportConfig & {\n kind: \"http\";\n transportType: HttpMcpTransportType;\n url: string;\n headers?: Record<string, string>;\n};\n\nexport type ResolvedMcpTransportConfig =\n \| ResolvedStdioMcpTransportConfig\n \| ResolvedHttpMcpTransportConfig;\n\nconst DEFAULT_CONNECTION_TIMEOUT_MS = 30_000;\n\nfunction getConnectionTimeoutMs(rawServer: unknown): number {\n if (\n rawServer &&\n typeof rawServer === \"object\" &&\n typeof (rawServer as { connectionTimeoutMs?: unknown }).connectionTimeoutMs === \"number\" &&\n (rawServer as { connectionTimeoutMs: number }).connectionTimeoutMs > 0\n ) {\n return (rawServer as { connectionTimeoutMs: number }).connectionTimeoutMs;\n }\n return DEFAULT_CONNECTION_TIMEOUT_MS;\n}\n\nfunction getRequestedTransport(rawServer: unknown): string {\n if (\n !rawServer \|\|\n typeof rawServer !== \"object\" \|\|\n typeof (rawServer as { transport?: unknown }).transport !== \"string\"\n ) {\n return \"\";\n }\n return normalizeLowercaseStringOrEmpty((rawServer as { transport?: string }).transport);\n}\n\nfunction getRequestedTransportAlias(rawServer: unknown): HttpMcpTransportType \| \"\" {\n if (\n !rawServer \|\|\n typeof rawServer !== \"object\" \|\|\n typeof (rawServer as { type?: unknown }).type !== \"string\"\n ) {\n return \"\";\n }\n return resolveXopcMcpTransportAlias((rawServer as { type?: string }).type) ?? \"\";\n}\n\nfunction resolveHttpTransportConfig(\n serverName: string,\n rawServer: unknown,\n transportType: HttpMcpTransportType,\n): ResolvedHttpMcpTransportConfig \| null {\n const launch = resolveHttpMcpServerLaunchConfig(rawServer, {\n transportType,\n onDroppedHeader: (key) => {\n log.warn(\n {\n phase: 'agent.mcp_connect',\n serverName,\n header: key,\n },\n `bundle-mcp: server \"${serverName}\": header \"${key}\" has an unsupported value type and was ignored`,\n );\n },\n onMalformedHeaders: () => {\n log.warn(\n { phase: 'agent.mcp_connect', serverName },\n `bundle-mcp: server \"${serverName}\": \"headers\" must be a JSON object; the value was ignored`,\n );\n },\n });\n if (!launch.ok) {\n return null;\n }\n return {\n kind: \"http\",\n transportType: launch.config.transportType,\n url: launch.config.url,\n headers: launch.config.headers,\n description: describeHttpMcpServerLaunchConfig(launch.config),\n connectionTimeoutMs: getConnectionTimeoutMs(rawServer),\n };\n}\n\nexport function resolveMcpTransportConfig(\n serverName: string,\n rawServer: unknown,\n): ResolvedMcpTransportConfig \| null {\n const logServerName = sanitizeForLog(serverName);\n const requestedTransport = getRequestedTransport(rawServer);\n const requestedTransportAlias = requestedTransport ? \"\" : getRequestedTransportAlias(rawServer);\n const effectiveTransport = requestedTransport \|\| requestedTransportAlias;\n const stdioLaunch = resolveStdioMcpServerLaunchConfig(rawServer, {\n onDroppedEnv: (key) => {\n log.warn(\n `bundle-mcp: server \"${logServerName}\": env \"${sanitizeForLog(key)}\" is blocked for stdio startup safety and was ignored.`,\n );\n },\n });\n if (stdioLaunch.ok) {\n return {\n kind: \"stdio\",\n transportType: \"stdio\",\n command: stdioLaunch.config.command,\n args: stdioLaunch.config.args,\n env: stdioLaunch.config.env,\n cwd: stdioLaunch.config.cwd,\n description: describeStdioMcpServerLaunchConfig(stdioLaunch.config),\n connectionTimeoutMs: getConnectionTimeoutMs(rawServer),\n };\n }\n\n if (\n effectiveTransport &&\n effectiveTransport !== \"sse\" &&\n effectiveTransport !== \"streamable-http\"\n ) {\n log.warn(\n `bundle-mcp: skipped server \"${logServerName}\" because transport \"${sanitizeForLog(effectiveTransport)}\" is not supported.`,\n );\n return null;\n }\n\n if (effectiveTransport === \"streamable-http\") {\n const httpTransport = resolveHttpTransportConfig(serverName, rawServer, \"streamable-http\");\n if (httpTransport) {\n return httpTransport;\n }\n }\n\n const sseTransport = resolveHttpTransportConfig(serverName, rawServer, \"sse\");\n if (sseTransport) {\n return sseTransport;\n }\n\n const stdioReason =\n stdioLaunch.ok === false ? stdioLaunch.reason : 'not a stdio server';\n const httpLaunch = resolveHttpMcpServerLaunchConfig(rawServer);\n const httpReason =\n httpLaunch.ok === false ? httpLaunch.reason : 'not an HTTP MCP server';\n log.warn(\n `bundle-mcp: skipped server \"${logServerName}\" because ${stdioReason} and ${httpReason}.`,\n );\n return null;\n}\n"],"mappings":";;;;;;;;aACqD;oBAE0B;AAD/E,MAAM,MAAM,aAAa,aAAa;AAsCtC,MAAM,gCAAgC;AAEtC,SAAS,uBAAuB,WAA4B;AAC1D,KACE,aACA,OAAO,cAAc,YACrB,OAAQ,UAAgD,wBAAwB,YAC/E,UAA8C,sBAAsB,EAErE,QAAQ,UAA8C;AAExD,QAAO;;AAGT,SAAS,sBAAsB,WAA4B;AACzD,KACE,CAAC,aACD,OAAO,cAAc,YACrB,OAAQ,UAAsC,cAAc,SAE5D,QAAO;AAET,QAAO,gCAAiC,UAAqC,UAAU;;AAGzF,SAAS,2BAA2B,WAA+C;AACjF,KACE,CAAC,aACD,OAAO,cAAc,YACrB,OAAQ,UAAiC,SAAS,SAElD,QAAO;AAET,QAAO,6BAA8B,UAAgC,KAAK,IAAI;;AAGhF,SAAS,2BACP,YACA,WACA,eACuC;CACvC,MAAM,SAAS,iCAAiC,WAAW;EACzD;EACA,kBAAkB,QAAQ;AACxB,OAAI,KACF;IACE,OAAO;IACP;IACA,QAAQ;IACT,EACD,uBAAuB,WAAW,aAAa,IAAI,iDACpD;;EAEH,0BAA0B;AACxB,OAAI,KACF;IAAE,OAAO;IAAqB;IAAY,EAC1C,uBAAuB,WAAW,2DACnC;;EAEJ,CAAC;AACF,KAAI,CAAC,OAAO,GACV,QAAO;AAET,QAAO;EACL,MAAM;EACN,eAAe,OAAO,OAAO;EAC7B,KAAK,OAAO,OAAO;EACnB,SAAS,OAAO,OAAO;EACvB,aAAa,kCAAkC,OAAO,OAAO;EAC7D,qBAAqB,uBAAuB,UAAU;EACvD;;AAGH,SAAgB,0BACd,YACA,WACmC;CACnC,MAAM,gBAAgB,eAAe,WAAW;CAChD,MAAM,qBAAqB,sBAAsB,UAAU;CAC3D,MAAM,0BAA0B,qBAAqB,KAAK,2BAA2B,UAAU;CAC/F,MAAM,qBAAqB,sBAAsB;CACjD,MAAM,cAAc,kCAAkC,WAAW,EAC/D,eAAe,QAAQ;AACrB,MAAI,KACF,uBAAuB,cAAc,UAAU,eAAe,IAAI,CAAC,wDACpE;IAEJ,CAAC;AACF,KAAI,YAAY,GACd,QAAO;EACL,MAAM;EACN,eAAe;EACf,SAAS,YAAY,OAAO;EAC5B,MAAM,YAAY,OAAO;EACzB,KAAK,YAAY,OAAO;EACxB,KAAK,YAAY,OAAO;EACxB,aAAa,mCAAmC,YAAY,OAAO;EACnE,qBAAqB,uBAAuB,UAAU;EACvD;AAGH,KACE,sBACA,uBAAuB,SACvB,uBAAuB,mBACvB;AACA,MAAI,KACF,+BAA+B,cAAc,uBAAuB,eAAe,mBAAmB,CAAC,qBACxG;AACD,SAAO;;AAGT,KAAI,uBAAuB,mBAAmB;EAC5C,MAAM,gBAAgB,2BAA2B,YAAY,WAAW,kBAAkB;AAC1F,MAAI,cACF,QAAO;;CAIX,MAAM,eAAe,2BAA2B,YAAY,WAAW,MAAM;AAC7E,KAAI,aACF,QAAO;CAGT,MAAM,cACJ,YAAY,OAAO,QAAQ,YAAY,SAAS;CAClD,MAAM,aAAa,iCAAiC,UAAU;CAC9D,MAAM,aACJ,WAAW,OAAO,QAAQ,WAAW,SAAS;AAChD,KAAI,KACF,+BAA+B,cAAc,YAAY,YAAY,OAAO,WAAW,GACxF;AACD,QAAO"}

package/dist/src/agent/mcp/mcp-transport.js CHANGED Viewed

@@ -1,6 +1,6 @@
+import { init_string_coerce, normalizeOptionalString } from "../../utils/string-coerce.js";
 import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
-import { init_string_coerce, normalizeOptionalString } from "../../utils/string-coerce.js";
 import { XopcStdioClientTransport } from "./mcp-stdio-transport.js";
 import { resolveMcpTransportConfig } from "./mcp-transport-config.js";
 import { SSEClientTransport } from "@modelcontextprotocol/sdk/client/sse.js";
@@ -9,7 +9,7 @@ import { fetch } from "undici";
 //#region src/agent/mcp/mcp-transport.ts
 init_logger();
 init_string_coerce();
-const log = createLogger("McpTransport");
+const log = createLogger("Mcp:Transport");
 function attachStderrLogging(serverName, transport) {
 	const stderr = transport.stderr;
 	if (!stderr || typeof stderr.on !== "function") return;

package/dist/src/agent/mcp/mcp-transport.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"mcp-transport.js","names":["undiciFetch"],"sources":["../../../../src/agent/mcp/mcp-transport.ts"],"sourcesContent":["import {\n SSEClientTransport,\n type SSEClientTransportOptions,\n} from \"@modelcontextprotocol/sdk/client/sse.js\";\nimport { StreamableHTTPClientTransport } from \"@modelcontextprotocol/sdk/client/streamableHttp.js\";\nimport type { FetchLike, Transport } from \"@modelcontextprotocol/sdk/shared/transport.js\";\nimport { fetch as undiciFetch } from \"undici\";\nimport { createLogger } from \"../../utils/logger.js\";\nconst log = createLogger(\"~~McpTransport~~\");\nimport { normalizeOptionalString } from \"../../utils/string-coerce.js\";\nimport { XopcStdioClientTransport } from \"./mcp-stdio-transport.js\";\nimport { resolveMcpTransportConfig } from \"./mcp-transport-config.js\";\n\nexport type ResolvedMcpTransport = {\n transport: Transport;\n description: string;\n transportType: \"stdio\" \| \"sse\" \| \"streamable-http\";\n connectionTimeoutMs: number;\n detachStderr?: () => void;\n};\n\nfunction attachStderrLogging(serverName: string, transport: XopcStdioClientTransport) {\n const stderr = transport.stderr;\n if (!stderr \|\| typeof stderr.on !== \"function\") {\n return undefined;\n }\n const onData = (chunk: Buffer \| string) => {\n const message =\n normalizeOptionalString(typeof chunk === \"string\" ? chunk : String(chunk)) ?? \"\";\n if (!message) {\n return;\n }\n for (const line of message.split(/\\r?\\n/)) {\n const trimmed = line.trim();\n if (trimmed) {\n log.debug(`bundle-mcp:${serverName}: ${trimmed}`);\n }\n }\n };\n stderr.on(\"data\", onData);\n return () => {\n if (typeof stderr.off === \"function\") {\n stderr.off(\"data\", onData);\n } else if (typeof stderr.removeListener === \"function\") {\n stderr.removeListener(\"data\", onData);\n }\n };\n}\n\ntype SseEventSourceFetch = NonNullable<\n NonNullable<SSEClientTransportOptions[\"eventSourceInit\"]>[\"fetch\"]\n>;\n\nconst fetchWithUndici: FetchLike = async (url, init) =>\n (await undiciFetch(url, init as unknown as Parameters<typeof undiciFetch>[1])) as unknown as Response;\n\nfunction buildSseEventSourceFetch(headers: Record<string, string>): SseEventSourceFetch {\n return (url: string \| URL, init?: RequestInit) => {\n const sdkHeaders: Record<string, string> = {};\n if (init?.headers) {\n if (init.headers instanceof Headers) {\n init.headers.forEach((value, key) => {\n sdkHeaders[key] = value;\n });\n } else {\n Object.assign(sdkHeaders, init.headers);\n }\n }\n return fetchWithUndici(url, {\n ...(init as RequestInit),\n headers: { ...sdkHeaders, ...headers },\n }) as ReturnType<SseEventSourceFetch>;\n };\n}\n\nexport function resolveMcpTransport(\n serverName: string,\n rawServer: unknown,\n): ResolvedMcpTransport \| null {\n const resolved = resolveMcpTransportConfig(serverName, rawServer);\n if (!resolved) {\n return null;\n }\n if (resolved.kind === \"stdio\") {\n const transport = new XopcStdioClientTransport({\n command: resolved.command,\n args: resolved.args,\n env: resolved.env,\n cwd: resolved.cwd,\n stderr: \"pipe\",\n });\n return {\n transport,\n description: resolved.description,\n transportType: \"stdio\",\n connectionTimeoutMs: resolved.connectionTimeoutMs,\n detachStderr: attachStderrLogging(serverName, transport),\n };\n }\n if (resolved.transportType === \"streamable-http\") {\n return {\n transport: new StreamableHTTPClientTransport(new URL(resolved.url), {\n requestInit: resolved.headers ? { headers: resolved.headers } : undefined,\n }),\n description: resolved.description,\n transportType: \"streamable-http\",\n connectionTimeoutMs: resolved.connectionTimeoutMs,\n };\n }\n const headers: Record<string, string> = {\n ...resolved.headers,\n };\n const hasHeaders = Object.keys(headers).length > 0;\n return {\n transport: new SSEClientTransport(new URL(resolved.url), {\n requestInit: hasHeaders ? { headers } : undefined,\n fetch: fetchWithUndici,\n eventSourceInit: { fetch: buildSseEventSourceFetch(headers) },\n }),\n description: resolved.description,\n transportType: \"sse\",\n connectionTimeoutMs: resolved.connectionTimeoutMs,\n };\n}\n"],"mappings":";;;;;;;;;aAOqD;oBAEkB;AADvE,MAAM,MAAM,aAAa,~~eAAe~~;~~AAaxC~~,SAAS,oBAAoB,YAAoB,WAAqC;CACpF,MAAM,SAAS,UAAU;AACzB,KAAI,CAAC,UAAU,OAAO,OAAO,OAAO,WAClC;CAEF,MAAM,UAAU,UAA2B;EACzC,MAAM,UACJ,wBAAwB,OAAO,UAAU,WAAW,QAAQ,OAAO,MAAM,CAAC,IAAI;AAChF,MAAI,CAAC,QACH;AAEF,OAAK,MAAM,QAAQ,QAAQ,MAAM,QAAQ,EAAE;GACzC,MAAM,UAAU,KAAK,MAAM;AAC3B,OAAI,QACF,KAAI,MAAM,cAAc,WAAW,IAAI,UAAU;;;AAIvD,QAAO,GAAG,QAAQ,OAAO;AACzB,cAAa;AACX,MAAI,OAAO,OAAO,QAAQ,WACxB,QAAO,IAAI,QAAQ,OAAO;WACjB,OAAO,OAAO,mBAAmB,WAC1C,QAAO,eAAe,QAAQ,OAAO;;;AAS3C,MAAM,kBAA6B,OAAO,KAAK,SAC5C,MAAMA,MAAY,KAAK,KAAqD;AAE/E,SAAS,yBAAyB,SAAsD;AACtF,SAAQ,KAAmB,SAAuB;EAChD,MAAM,aAAqC,EAAE;AAC7C,MAAI,MAAM,QACR,KAAI,KAAK,mBAAmB,QAC1B,MAAK,QAAQ,SAAS,OAAO,QAAQ;AACnC,cAAW,OAAO;IAClB;MAEF,QAAO,OAAO,YAAY,KAAK,QAAQ;AAG3C,SAAO,gBAAgB,KAAK;GAC1B,GAAI;GACJ,SAAS;IAAE,GAAG;IAAY,GAAG;IAAS;GACvC,CAAC;;;AAIN,SAAgB,oBACd,YACA,WAC6B;CAC7B,MAAM,WAAW,0BAA0B,YAAY,UAAU;AACjE,KAAI,CAAC,SACH,QAAO;AAET,KAAI,SAAS,SAAS,SAAS;EAC7B,MAAM,YAAY,IAAI,yBAAyB;GAC7C,SAAS,SAAS;GAClB,MAAM,SAAS;GACf,KAAK,SAAS;GACd,KAAK,SAAS;GACd,QAAQ;GACT,CAAC;AACF,SAAO;GACL;GACA,aAAa,SAAS;GACtB,eAAe;GACf,qBAAqB,SAAS;GAC9B,cAAc,oBAAoB,YAAY,UAAU;GACzD;;AAEH,KAAI,SAAS,kBAAkB,kBAC7B,QAAO;EACL,WAAW,IAAI,8BAA8B,IAAI,IAAI,SAAS,IAAI,EAAE,EAClE,aAAa,SAAS,UAAU,EAAE,SAAS,SAAS,SAAS,GAAG,KAAA,GACjE,CAAC;EACF,aAAa,SAAS;EACtB,eAAe;EACf,qBAAqB,SAAS;EAC/B;CAEH,MAAM,UAAkC,EACtC,GAAG,SAAS,SACb;CACD,MAAM,aAAa,OAAO,KAAK,QAAQ,CAAC,SAAS;AACjD,QAAO;EACL,WAAW,IAAI,mBAAmB,IAAI,IAAI,SAAS,IAAI,EAAE;GACvD,aAAa,aAAa,EAAE,SAAS,GAAG,KAAA;GACxC,OAAO;GACP,iBAAiB,EAAE,OAAO,yBAAyB,QAAQ,EAAE;GAC9D,CAAC;EACF,aAAa,SAAS;EACtB,eAAe;EACf,qBAAqB,SAAS;EAC/B"}
1	+ {"version":3,"file":"mcp-transport.js","names":["undiciFetch"],"sources":["../../../../src/agent/mcp/mcp-transport.ts"],"sourcesContent":["import {\n SSEClientTransport,\n type SSEClientTransportOptions,\n} from \"@modelcontextprotocol/sdk/client/sse.js\";\nimport { StreamableHTTPClientTransport } from \"@modelcontextprotocol/sdk/client/streamableHttp.js\";\nimport type { FetchLike, Transport } from \"@modelcontextprotocol/sdk/shared/transport.js\";\nimport { fetch as undiciFetch } from \"undici\";\nimport { createLogger } from \"../../utils/logger.js\";\nconst log = createLogger(\"Mcp:Transport\");\nimport { normalizeOptionalString } from \"../../utils/string-coerce.js\";\nimport { XopcStdioClientTransport } from \"./mcp-stdio-transport.js\";\nimport { resolveMcpTransportConfig } from \"./mcp-transport-config.js\";\n\nexport type ResolvedMcpTransport = {\n transport: Transport;\n description: string;\n transportType: \"stdio\" \| \"sse\" \| \"streamable-http\";\n connectionTimeoutMs: number;\n detachStderr?: () => void;\n};\n\nfunction attachStderrLogging(serverName: string, transport: XopcStdioClientTransport) {\n const stderr = transport.stderr;\n if (!stderr \|\| typeof stderr.on !== \"function\") {\n return undefined;\n }\n const onData = (chunk: Buffer \| string) => {\n const message =\n normalizeOptionalString(typeof chunk === \"string\" ? chunk : String(chunk)) ?? \"\";\n if (!message) {\n return;\n }\n for (const line of message.split(/\\r?\\n/)) {\n const trimmed = line.trim();\n if (trimmed) {\n log.debug(`bundle-mcp:${serverName}: ${trimmed}`);\n }\n }\n };\n stderr.on(\"data\", onData);\n return () => {\n if (typeof stderr.off === \"function\") {\n stderr.off(\"data\", onData);\n } else if (typeof stderr.removeListener === \"function\") {\n stderr.removeListener(\"data\", onData);\n }\n };\n}\n\ntype SseEventSourceFetch = NonNullable<\n NonNullable<SSEClientTransportOptions[\"eventSourceInit\"]>[\"fetch\"]\n>;\n\nconst fetchWithUndici: FetchLike = async (url, init) =>\n (await undiciFetch(url, init as unknown as Parameters<typeof undiciFetch>[1])) as unknown as Response;\n\nfunction buildSseEventSourceFetch(headers: Record<string, string>): SseEventSourceFetch {\n return (url: string \| URL, init?: RequestInit) => {\n const sdkHeaders: Record<string, string> = {};\n if (init?.headers) {\n if (init.headers instanceof Headers) {\n init.headers.forEach((value, key) => {\n sdkHeaders[key] = value;\n });\n } else {\n Object.assign(sdkHeaders, init.headers);\n }\n }\n return fetchWithUndici(url, {\n ...(init as RequestInit),\n headers: { ...sdkHeaders, ...headers },\n }) as ReturnType<SseEventSourceFetch>;\n };\n}\n\nexport function resolveMcpTransport(\n serverName: string,\n rawServer: unknown,\n): ResolvedMcpTransport \| null {\n const resolved = resolveMcpTransportConfig(serverName, rawServer);\n if (!resolved) {\n return null;\n }\n if (resolved.kind === \"stdio\") {\n const transport = new XopcStdioClientTransport({\n command: resolved.command,\n args: resolved.args,\n env: resolved.env,\n cwd: resolved.cwd,\n stderr: \"pipe\",\n });\n return {\n transport,\n description: resolved.description,\n transportType: \"stdio\",\n connectionTimeoutMs: resolved.connectionTimeoutMs,\n detachStderr: attachStderrLogging(serverName, transport),\n };\n }\n if (resolved.transportType === \"streamable-http\") {\n return {\n transport: new StreamableHTTPClientTransport(new URL(resolved.url), {\n requestInit: resolved.headers ? { headers: resolved.headers } : undefined,\n }),\n description: resolved.description,\n transportType: \"streamable-http\",\n connectionTimeoutMs: resolved.connectionTimeoutMs,\n };\n }\n const headers: Record<string, string> = {\n ...resolved.headers,\n };\n const hasHeaders = Object.keys(headers).length > 0;\n return {\n transport: new SSEClientTransport(new URL(resolved.url), {\n requestInit: hasHeaders ? { headers } : undefined,\n fetch: fetchWithUndici,\n eventSourceInit: { fetch: buildSseEventSourceFetch(headers) },\n }),\n description: resolved.description,\n transportType: \"sse\",\n connectionTimeoutMs: resolved.connectionTimeoutMs,\n };\n}\n"],"mappings":";;;;;;;;;aAOqD;oBAEkB;AADvE,MAAM,MAAM,aAAa,gBAAgB;AAazC,SAAS,oBAAoB,YAAoB,WAAqC;CACpF,MAAM,SAAS,UAAU;AACzB,KAAI,CAAC,UAAU,OAAO,OAAO,OAAO,WAClC;CAEF,MAAM,UAAU,UAA2B;EACzC,MAAM,UACJ,wBAAwB,OAAO,UAAU,WAAW,QAAQ,OAAO,MAAM,CAAC,IAAI;AAChF,MAAI,CAAC,QACH;AAEF,OAAK,MAAM,QAAQ,QAAQ,MAAM,QAAQ,EAAE;GACzC,MAAM,UAAU,KAAK,MAAM;AAC3B,OAAI,QACF,KAAI,MAAM,cAAc,WAAW,IAAI,UAAU;;;AAIvD,QAAO,GAAG,QAAQ,OAAO;AACzB,cAAa;AACX,MAAI,OAAO,OAAO,QAAQ,WACxB,QAAO,IAAI,QAAQ,OAAO;WACjB,OAAO,OAAO,mBAAmB,WAC1C,QAAO,eAAe,QAAQ,OAAO;;;AAS3C,MAAM,kBAA6B,OAAO,KAAK,SAC5C,MAAMA,MAAY,KAAK,KAAqD;AAE/E,SAAS,yBAAyB,SAAsD;AACtF,SAAQ,KAAmB,SAAuB;EAChD,MAAM,aAAqC,EAAE;AAC7C,MAAI,MAAM,QACR,KAAI,KAAK,mBAAmB,QAC1B,MAAK,QAAQ,SAAS,OAAO,QAAQ;AACnC,cAAW,OAAO;IAClB;MAEF,QAAO,OAAO,YAAY,KAAK,QAAQ;AAG3C,SAAO,gBAAgB,KAAK;GAC1B,GAAI;GACJ,SAAS;IAAE,GAAG;IAAY,GAAG;IAAS;GACvC,CAAC;;;AAIN,SAAgB,oBACd,YACA,WAC6B;CAC7B,MAAM,WAAW,0BAA0B,YAAY,UAAU;AACjE,KAAI,CAAC,SACH,QAAO;AAET,KAAI,SAAS,SAAS,SAAS;EAC7B,MAAM,YAAY,IAAI,yBAAyB;GAC7C,SAAS,SAAS;GAClB,MAAM,SAAS;GACf,KAAK,SAAS;GACd,KAAK,SAAS;GACd,QAAQ;GACT,CAAC;AACF,SAAO;GACL;GACA,aAAa,SAAS;GACtB,eAAe;GACf,qBAAqB,SAAS;GAC9B,cAAc,oBAAoB,YAAY,UAAU;GACzD;;AAEH,KAAI,SAAS,kBAAkB,kBAC7B,QAAO;EACL,WAAW,IAAI,8BAA8B,IAAI,IAAI,SAAS,IAAI,EAAE,EAClE,aAAa,SAAS,UAAU,EAAE,SAAS,SAAS,SAAS,GAAG,KAAA,GACjE,CAAC;EACF,aAAa,SAAS;EACtB,eAAe;EACf,qBAAqB,SAAS;EAC/B;CAEH,MAAM,UAAkC,EACtC,GAAG,SAAS,SACb;CACD,MAAM,aAAa,OAAO,KAAK,QAAQ,CAAC,SAAS;AACjD,QAAO;EACL,WAAW,IAAI,mBAAmB,IAAI,IAAI,SAAS,IAAI,EAAE;GACvD,aAAa,aAAa,EAAE,SAAS,GAAG,KAAA;GACxC,OAAO;GACP,iBAAiB,EAAE,OAAO,yBAAyB,QAAQ,EAAE;GAC9D,CAAC;EACF,aAAa,SAAS;EACtB,eAAe;EACf,qBAAqB,SAAS;EAC/B"}

package/dist/src/agent/memory/builtin-memory-store.js CHANGED Viewed

@@ -1,6 +1,6 @@
+import { join } from "node:path";
 import { existsSync, mkdirSync, readFileSync } from "node:fs";
 import { mkdir, readFile, rename, writeFile } from "node:fs/promises";
-import { join } from "node:path";
 import lockfile from "proper-lockfile";
 //#region src/agent/memory/builtin-memory-store.ts
 /**

package/dist/src/agent/memory/dreaming/deep-promotion.js CHANGED Viewed

@@ -4,8 +4,8 @@ import { MEMORY_MD_FILENAME } from "./constants.js";
 import { clamp01, compareCandidatesByScore, computeCandidateScore, extractPromotionMarkers, isContaminatedSnippet, isExpiredEntry, isoDay, readFileLines, resolveDeepDefaults, sliceRange, snippetHash } from "./utils.js";
 import { loadDreamingStore, saveDreamingStore, withDreamingPromotionLock } from "./short-term-store.js";
 import { emptyDeepPhaseSkipped, writeDreamingDeepLastRun } from "./last-run.js";
-import fs from "node:fs/promises";
 import path from "node:path";
+import fs from "node:fs/promises";
 //#region src/agent/memory/dreaming/deep-promotion.ts
 init_logger();
 const log = createLogger("Dreaming:Deep");

package/dist/src/agent/memory/dreaming/events.js CHANGED Viewed

@@ -1,6 +1,6 @@
 import { DREAMING_DIR_RELATIVE, DREAMING_EVENTS_LOG_RELATIVE } from "./constants.js";
-import fs from "node:fs/promises";
 import path from "node:path";
+import fs from "node:fs/promises";
 //#region src/agent/memory/dreaming/events.ts
 /**
 * Append a single event line to `memory/.dreams/events.jsonl`.

package/dist/src/agent/memory/dreaming/last-run.js CHANGED Viewed

@@ -1,6 +1,6 @@
 import { DREAMING_LAST_RUN_RELATIVE } from "./constants.js";
-import fs from "node:fs/promises";
 import path from "node:path";
+import fs from "node:fs/promises";
 //#region src/agent/memory/dreaming/last-run.ts
 const DREAMING_LAST_RUN_FORMAT_VERSION = 2;
 function isRecord(v) {

package/dist/src/agent/memory/dreaming/light-sweep.js CHANGED Viewed

@@ -4,8 +4,8 @@ import { DREAMING_DIR_RELATIVE } from "./constants.js";
 import { buildEntryKey, isoDay, normalizeMemoryPath, normalizeSnippetForHash, snippetHash } from "./utils.js";
 import { bumpEntryPhaseSignal, loadDreamingStore, saveDreamingStore } from "./short-term-store.js";
 import "./last-run.js";
-import fs from "node:fs/promises";
 import path from "node:path";
+import fs from "node:fs/promises";
 //#region src/agent/memory/dreaming/light-sweep.ts
 init_logger();
 const log = createLogger("Dreaming:Light");

package/dist/src/agent/memory/dreaming/preview.js CHANGED Viewed

@@ -1,8 +1,8 @@
 import { MEMORY_MD_FILENAME } from "./constants.js";
 import { clamp01, compareCandidatesByScore, computeCandidateScore, extractPromotionMarkers, isContaminatedSnippet, isExpiredEntry, readFileLines, resolveDeepDefaults, sliceRange, snippetHash } from "./utils.js";
 import { loadDreamingStore } from "./short-term-store.js";
-import fs from "node:fs/promises";
 import path from "node:path";
+import fs from "node:fs/promises";
 //#region src/agent/memory/dreaming/preview.ts
 async function previewDreamingDeepPromotion(params) {
 	const cfg = resolveDeepDefaults(params.config);

package/dist/src/agent/memory/dreaming/rem-patterns.js CHANGED Viewed

@@ -4,8 +4,8 @@ import { DREAMING_DIR_RELATIVE, DREAMS_MD_FILENAME, MS_PER_DAY } from "./constan
 import { isoDay } from "./utils.js";
 import { bumpEntryPhaseSignal, loadDreamingStore, saveDreamingStore } from "./short-term-store.js";
 import "./last-run.js";
-import fs from "node:fs/promises";
 import path from "node:path";
+import fs from "node:fs/promises";
 //#region src/agent/memory/dreaming/rem-patterns.ts
 init_logger();
 const log = createLogger("Dreaming:REM");

package/dist/src/agent/memory/dreaming/short-term-store.js CHANGED Viewed

@@ -2,9 +2,9 @@ import { createLogger } from "../../../utils/logger/index.js";
 import { init_logger } from "../../../utils/logger.js";
 import { SHORT_TERM_PROMOTION_LOCK_RELATIVE, SHORT_TERM_RECALL_STORE_RELATIVE } from "./constants.js";
 import { buildEntryKey, clamp01, isoDay, normalizeMemoryPath } from "./utils.js";
+import path from "node:path";
 import { createHash, randomUUID } from "node:crypto";
 import fs from "node:fs/promises";
-import path from "node:path";
 //#region src/agent/memory/dreaming/short-term-store.ts
 init_logger();
 const log = createLogger("Dreaming:Store");

package/dist/src/agent/memory/dreaming/utils.js CHANGED Viewed

@@ -1,7 +1,7 @@
 import { DEFAULT_DEEP_CRON, DIVERSITY_WEIGHT, MS_PER_DAY, REINFORCEMENT_WEIGHT } from "./constants.js";
+import path from "node:path";
 import { createHash } from "node:crypto";
 import fs from "node:fs/promises";
-import path from "node:path";
 //#region src/agent/memory/dreaming/utils.ts
 /** Normalize a workspace-relative memory path: forward slashes, no odd ../ escapes at start. */
 function normalizeMemoryPath(rel) {

package/dist/src/agent/memory/plugin-discovery.js CHANGED Viewed

@@ -1,5 +1,5 @@
-import { readdir, stat } from "node:fs/promises";
 import { dirname, join } from "node:path";
+import { readdir, stat } from "node:fs/promises";
 import { fileURLToPath } from "node:url";
 //#region src/agent/memory/plugin-discovery.ts
 async function discoverMemoryPlugins() {

package/dist/src/agent/models/manager.js CHANGED Viewed

@@ -1,6 +1,6 @@
+import { getAgentDefaultModelRef, init_schema } from "../../config/schema.js";
 import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
-import { getAgentDefaultModelRef, init_schema } from "../../config/schema.js";
 import { getAllModels, getDefaultModelSync, init_providers, resolveModel } from "../../providers/index.js";
 import { resolveAgentTurnTimeoutMs, runAgentTurnWithTimeout } from "../orchestration/run-agent-turn-with-timeout.js";
 import { isAssistantTurnAborted, isAssistantTurnFailed, maybeRetryTurnAfterTransientLlmFailure } from "../orchestration/llm-turn-retry.js";

package/dist/src/agent/prompt/service-prompt-builder.js CHANGED Viewed

@@ -1,6 +1,6 @@
+import { resolveStateDir } from "../../config/paths-state.js";
 import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
-import { resolveStateDir } from "../../config/paths-state.js";
 import { init_paths } from "../../config/paths.js";
 import { DEFAULT_USER_FILENAME } from "../context/workspace.js";
 import { createSkillConfigManager } from "../skills/config.js";
@@ -8,8 +8,8 @@ import { buildTtsSystemPromptHint } from "../../voice/tts/directives.js";
 import { mergeTtsConfigFromAppConfig } from "../../voice/tts/merge-config.js";
 import { selectSkillsVisibleInPrompt } from "../skills/format-skills-prompt.js";
 import { buildSystemPrompt } from "./system-prompt.js";
-import { existsSync, readFileSync } from "node:fs";
 import { join } from "node:path";
+import { existsSync, readFileSync } from "node:fs";
 //#region src/agent/prompt/service-prompt-builder.ts
 /**
 * System Prompt Builder - Builds the complete system prompt

package/dist/src/agent/reply/post-compaction-context.js CHANGED Viewed

@@ -1,7 +1,7 @@
 import { init_agent_scope, resolveAgentProfileDir } from "../agent-scope.js";
 import { resolveEffectiveAgentProfileForSession } from "../../config/agent-profile.js";
-import { readFileSync } from "node:fs";
 import { join, resolve } from "node:path";
+import { readFileSync } from "node:fs";
 //#region src/agent/reply/post-compaction-context.ts
 init_agent_scope();
 const MAX_CONTEXT_CHARS = 1800;

package/dist/src/agent/reply/workspace-boundary-read.js CHANGED Viewed

@@ -1,5 +1,5 @@
-import { readFileSync } from "node:fs";
 import { resolve } from "node:path";
+import { readFileSync } from "node:fs";
 //#region src/agent/reply/workspace-boundary-read.ts
 /**
 * Read a file relative to workspace root with path traversal guard and byte cap.

package/dist/src/agent/sandbox/path-policy.js CHANGED Viewed

@@ -1,6 +1,6 @@
-import { realpathSync } from "node:fs";
-import { isAbsolute, normalize, resolve, sep } from "node:path";
 import { homedir } from "node:os";
+import { isAbsolute, normalize, resolve, sep } from "node:path";
+import { realpathSync } from "node:fs";
 //#region src/agent/sandbox/path-policy.ts
 /**
 * Path safety validation for sandbox isolation.

package/dist/src/agent/service/build-direct-message-content.js CHANGED Viewed

@@ -1,5 +1,5 @@
-import { init_agent_scope, resolveAgentHomeDir, resolveDefaultAgentId } from "../agent-scope.js";
 import { getAgentDefaultModelRef, init_schema } from "../../config/schema.js";
+import { init_agent_scope, resolveAgentHomeDir, resolveDefaultAgentId } from "../agent-scope.js";
 import { extractProfileAgentId } from "../../config/agent-profile.js";
 import { getDefaultModelSync, init_providers } from "../../providers/index.js";
 import { formatInboundFileTextBlock } from "../../channels/attachments/inbound-persist.js";

package/dist/src/agent/service/process-direct-streaming.d.ts CHANGED Viewed

@@ -53,6 +53,7 @@ export interface ProcessDirectStreamingDeps {
         skipPersistentGoalPostTurn: boolean;
     }) => void;
     onTurnComplete?: (sessionKey: string, lastAssistantText?: string) => void;
+    enqueueProvisionalSessionTitle?: (sessionKey: string, userText: string) => void;
     /** Disk-only transcript sync (slash receipt already streamed as tokens). */
     reloadWebchatTranscript?: (sessionKey: string) => void;
     maybeEmitWebchatTts: (sessionKey: string, hadInboundVoice: boolean) => Promise<{

package/dist/src/agent/service/process-direct-streaming.js CHANGED Viewed

@@ -139,18 +139,21 @@ async function* runProcessDirectStreaming(deps, input) {
 				content: await deps.buildMessageContent(textForAgent, prepared, sessionKey),
 				timestamp: Date.now()
 			};
-			if (channel === "webchat") pushVisible({
-				type: "user_message",
-				timestamp: userMessage.timestamp,
-				content: userMessage.content,
-				attachments: prepared?.map((att) => ({
-					type: att.type,
-					mimeType: att.mimeType,
-					name: att.name,
-					size: att.size,
-					workspaceRelativePath: att.workspaceRelativePath
-				}))
-			});
+			if (channel === "webchat") {
+				pushVisible({
+					type: "user_message",
+					timestamp: userMessage.timestamp,
+					content: userMessage.content,
+					attachments: prepared?.map((att) => ({
+						type: att.type,
+						mimeType: att.mimeType,
+						name: att.name,
+						size: att.size,
+						workspaceRelativePath: att.workspaceRelativePath
+					}))
+				});
+				if (textForAgent.trim()) deps.enqueueProvisionalSessionTitle?.(sessionKey, textForAgent);
+			}
 			const result = await runDirectAgentTurn({
 				sessionStore: deps.sessionStore,
 				agentManager: deps.agentManager,