@1mcp/agent 0.32.2 → 0.33.0-beta1

package/build/core/protocol/toolRequestHandlers.js

@@ -0,0 +1,132 @@
+import { CallToolRequestSchema, CallToolResultSchema, ListToolsRequestSchema, } from '@modelcontextprotocol/sdk/types.js';
+import { McpConfigManager } from '../../config/mcpConfigManager.js';
+import { MCP_URI_SEPARATOR } from '../../constants.js';
+import { InternalCapabilitiesProvider } from '../../core/capabilities/internalCapabilitiesProvider.js';
+import { byCapabilities } from '../../core/filtering/clientFiltering.js';
+import { FilteringService } from '../../core/filtering/filteringService.js';
+import { getDisabledToolError } from '../../core/server/disabledTools.js';
+import logger, { infoIf } from '../../logger/logger.js';
+import { withErrorHandling } from '../../utils/core/errorHandling.js';
+import { buildUri, parseUri } from '../../utils/core/parsing.js';
+import { getRequestTimeout } from '../../utils/core/timeoutUtils.js';
+import { createCapabilityCatalogFromConnections, filterConnectionsForSession, getRequestSession, resolveOutboundConnection, } from './requestHandlerUtils.js';
+export function registerToolHandlers(outboundConns, inboundConn, lazyLoadingOrchestrator) {
+    const sessionId = getRequestSession(inboundConn);
+    const lazyLoadingEnabled = lazyLoadingOrchestrator?.isEnabled();
+    const getServerConfigs = () => McpConfigManager.getInstance().getTransportConfig();
+    inboundConn.server.setRequestHandler(ListToolsRequestSchema, withErrorHandling(async (request) => {
+        if (lazyLoadingEnabled && lazyLoadingOrchestrator) {
+            const sessionFilteredConns = filterConnectionsForSession(outboundConns, sessionId);
+            const capabilityFilteredClients = byCapabilities({ tools: {} })(sessionFilteredConns);
+            const filteredClients = FilteringService.getFilteredConnections(capabilityFilteredClients, inboundConn);
+            const filteredServerNames = new Set(Array.from(filteredClients.values()).map((conn) => conn.name));
+            infoIf(() => ({
+                message: 'Lazy loading: filtered servers',
+                meta: {
+                    totalOutbound: outboundConns.size,
+                    sessionFiltered: sessionFilteredConns.size,
+                    capabilityFiltered: capabilityFilteredClients.size,
+                    finalFiltered: filteredClients.size,
+                    filteredServerNames: Array.from(filteredServerNames),
+                    inboundConfig: {
+                        tagFilterMode: inboundConn.tagFilterMode,
+                        tags: inboundConn.tags,
+                        tagExpression: inboundConn.tagExpression,
+                    },
+                },
+            }));
+            const capabilities = await lazyLoadingOrchestrator.getCapabilitiesForFilteredServers(filteredServerNames, sessionId);
+            const internalProvider = InternalCapabilitiesProvider.getInstance();
+            await internalProvider.initialize();
+            const internalTools = internalProvider.getAvailableTools();
+            const lazyToolNames = ['tool_list', 'tool_schema', 'tool_invoke'];
+            const nonLazyTools = internalTools.filter((tool) => !lazyToolNames.includes(tool.name));
+            const internalToolsWithPrefix = nonLazyTools.map((tool) => ({
+                ...tool,
+                name: buildUri('1mcp', tool.name, MCP_URI_SEPARATOR),
+            }));
+            return {
+                tools: [...capabilities.tools, ...internalToolsWithPrefix],
+            };
+        }
+        const sessionFilteredConns = filterConnectionsForSession(outboundConns, sessionId);
+        const capabilityFilteredClients = byCapabilities({ tools: {} })(sessionFilteredConns);
+        const filteredClients = FilteringService.getFilteredConnections(capabilityFilteredClients, inboundConn);
+        const catalog = await createCapabilityCatalogFromConnections(filteredClients, getServerConfigs);
+        const result = await catalog.listVisibleTools(request.params || {}, sessionId);
+        const internalProvider = InternalCapabilitiesProvider.getInstance();
+        await internalProvider.initialize();
+        const internalTools = internalProvider.getAvailableTools();
+        const internalToolsWithPrefix = internalTools.map((tool) => ({
+            ...tool,
+            name: buildUri('1mcp', tool.name, MCP_URI_SEPARATOR),
+        }));
+        const externalTools = result.tools.map((tool) => ({
+            ...tool,
+            name: buildUri(tool.server, tool.name, MCP_URI_SEPARATOR),
+            inputSchema: tool.inputSchema ?? { type: 'object' },
+        }));
+        return {
+            tools: [...externalTools, ...internalToolsWithPrefix],
+            nextCursor: result.nextCursor,
+        };
+    }, 'Error listing tools'));
+    inboundConn.server.setRequestHandler(CallToolRequestSchema, withErrorHandling(async (request) => {
+        const toolName = request.params.name;
+        const isUnprefixedMetaTool = lazyLoadingEnabled && lazyLoadingOrchestrator && lazyLoadingOrchestrator.isMetaTool(toolName);
+        if (isUnprefixedMetaTool && lazyLoadingOrchestrator) {
+            let result;
+            try {
+                result = await lazyLoadingOrchestrator.callMetaTool(toolName, request.params.arguments, sessionId);
+            }
+            catch (metaToolError) {
+                logger.error(`Meta-tool ${toolName} execution failed: ${metaToolError}`);
+                throw new Error(`Meta-tool ${toolName} failed: ${metaToolError instanceof Error ? metaToolError.message : String(metaToolError)}`);
+            }
+            return structuredToolResult(result);
+        }
+        if (lazyLoadingEnabled && !toolName.includes(MCP_URI_SEPARATOR)) {
+            return structuredToolResult({
+                error: {
+                    type: 'not_found',
+                    message: `Unknown tool: ${toolName}. In lazy loading mode, use meta-tools (tool_list, tool_schema, tool_invoke) to discover and call tools.`,
+                },
+            });
+        }
+        const { clientName, resourceName: extractedToolName } = parseUri(toolName, MCP_URI_SEPARATOR);
+        if (clientName === '1mcp') {
+            const internalProvider = InternalCapabilitiesProvider.getInstance();
+            await internalProvider.initialize();
+            const result = await internalProvider.executeTool(extractedToolName, request.params.arguments, sessionId);
+            return structuredToolResult(result);
+        }
+        const outboundConn = resolveOutboundConnection(clientName, sessionId, outboundConns, inboundConn);
+        if (!outboundConn) {
+            throw new Error(`Unknown client: ${clientName}`);
+        }
+        const disabledError = getDisabledToolError(getServerConfigs(), clientName, extractedToolName);
+        if (disabledError) {
+            return structuredToolResult({
+                error: {
+                    type: disabledError.type,
+                    message: disabledError.message,
+                },
+            });
+        }
+        return outboundConn.client.callTool({ ...request.params, name: extractedToolName }, CallToolResultSchema, {
+            timeout: getRequestTimeout(outboundConn.transport),
+        });
+    }, 'Error calling tool'));
+}
+function structuredToolResult(result) {
+    return {
+        content: [
+            {
+                type: 'text',
+                text: JSON.stringify(result, null, 2),
+            },
+        ],
+        structuredContent: result,
+    };
+}
+//# sourceMappingURL=toolRequestHandlers.js.map

package/build/core/protocol/toolRequestHandlers.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"toolRequestHandlers.js","sourceRoot":"","sources":["../../../src/core/protocol/toolRequestHandlers.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,qBAAqB,EACrB,oBAAoB,EAEpB,sBAAsB,GACvB,MAAM,oCAAoC,CAAC;AAE5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAAE,4BAA4B,EAAE,MAAM,wDAAwD,CAAC;AAEtG,OAAO,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAC;AACxE,OAAO,EAAE,gBAAgB,EAAE,MAAM,yCAAyC,CAAC;AAC3E,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AAGzE,OAAO,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AACrE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AAEpE,OAAO,EACL,sCAAsC,EACtC,2BAA2B,EAC3B,iBAAiB,EACjB,yBAAyB,GAC1B,MAAM,0BAA0B,CAAC;AAElC,MAAM,UAAU,oBAAoB,CAClC,aAAkC,EAClC,WAA8B,EAC9B,uBAAiD;IAEjD,MAAM,SAAS,GAAG,iBAAiB,CAAC,WAAW,CAAC,CAAC;IACjD,MAAM,kBAAkB,GAAG,uBAAuB,EAAE,SAAS,EAAE,CAAC;IAChE,MAAM,gBAAgB,GAAG,GAAoC,EAAE,CAAC,gBAAgB,CAAC,WAAW,EAAE,CAAC,kBAAkB,EAAE,CAAC;IAEpH,WAAW,CAAC,MAAM,CAAC,iBAAiB,CAClC,sBAAsB,EACtB,iBAAiB,CAAC,KAAK,EAAE,OAAyB,EAAE,EAAE;QACpD,IAAI,kBAAkB,IAAI,uBAAuB,EAAE,CAAC;YAClD,MAAM,oBAAoB,GAAG,2BAA2B,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;YACnF,MAAM,yBAAyB,GAAG,cAAc,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC,oBAAoB,CAAC,CAAC;YACtF,MAAM,eAAe,GAAG,gBAAgB,CAAC,sBAAsB,CAAC,yBAAyB,EAAE,WAAW,CAAC,CAAC;YAExG,MAAM,mBAAmB,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;YAEnG,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC;gBACZ,OAAO,EAAE,gCAAgC;gBACzC,IAAI,EAAE;oBACJ,aAAa,EAAE,aAAa,CAAC,IAAI;oBACjC,eAAe,EAAE,oBAAoB,CAAC,IAAI;oBAC1C,kBAAkB,EAAE,yBAAyB,CAAC,IAAI;oBAClD,aAAa,EAAE,eAAe,CAAC,IAAI;oBACnC,mBAAmB,EAAE,KAAK,CAAC,IAAI,CAAC,mBAAmB,CAAC;oBACpD,aAAa,EAAE;wBACb,aAAa,EAAE,WAAW,CAAC,aAAa;wBACxC,IAAI,EAAE,WAAW,CAAC,IAAI;wBACtB,aAAa,EAAE,WAAW,CAAC,aAAa;qBACzC;iBACF;aACF,CAAC,CAAC,CAAC;YAEJ,MAAM,YAAY,GAAG,MAAM,uBAAuB,CAAC,iCAAiC,CAClF,mBAAmB,EACnB,SAAS,CACV,CAAC;YAEF,MAAM,gBAAgB,GAAG,4BAA4B,CAAC,WAAW,EAAE,CAAC;YACpE,MAAM,gBAAgB,CAAC,UAAU,EAAE,CAAC;YACpC,MAAM,aAAa,GAAG,gBAAgB,CAAC,iBAAiB,EAAE,CAAC;YAE3D,MAAM,aAAa,GAAG,CAAC,WAAW,EAAE,aAAa,EAAE,aAAa,CAAC,CAAC;YAClE,MAAM,YAAY,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;YACxF,MAAM,uBAAuB,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;gBAC1D,GAAG,IAAI;gBACP,IAAI,EAAE,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,EAAE,iBAAiB,CAAC;aACrD,CAAC,CAAC,CAAC;YAEJ,OAAO;gBACL,KAAK,EAAE,CAAC,GAAG,YAAY,CAAC,KAAK,EAAE,GAAG,uBAAuB,CAAC;aAC3D,CAAC;QACJ,CAAC;QAED,MAAM,oBAAoB,GAAG,2BAA2B,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;QACnF,MAAM,yBAAyB,GAAG,cAAc,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC,oBAAoB,CAAC,CAAC;QACtF,MAAM,eAAe,GAAG,gBAAgB,CAAC,sBAAsB,CAAC,yBAAyB,EAAE,WAAW,CAAC,CAAC;QAExG,MAAM,OAAO,GAAG,MAAM,sCAAsC,CAAC,eAAe,EAAE,gBAAgB,CAAC,CAAC;QAChG,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,gBAAgB,CAAC,OAAO,CAAC,MAAM,IAAI,EAAE,EAAE,SAAS,CAAC,CAAC;QAE/E,MAAM,gBAAgB,GAAG,4BAA4B,CAAC,WAAW,EAAE,CAAC;QACpE,MAAM,gBAAgB,CAAC,UAAU,EAAE,CAAC;QACpC,MAAM,aAAa,GAAG,gBAAgB,CAAC,iBAAiB,EAAE,CAAC;QAE3D,MAAM,uBAAuB,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YAC3D,GAAG,IAAI;YACP,IAAI,EAAE,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,EAAE,iBAAiB,CAAC;SACrD,CAAC,CAAC,CAAC;QAEJ,MAAM,aAAa,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YAChD,GAAG,IAAI;YACP,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,EAAE,iBAAiB,CAAC;YACzD,WAAW,EAAE,IAAI,CAAC,WAAW,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE;SACpD,CAAC,CAAC,CAAC;QAEJ,OAAO;YACL,KAAK,EAAE,CAAC,GAAG,aAAa,EAAE,GAAG,uBAAuB,CAAC;YACrD,UAAU,EAAE,MAAM,CAAC,UAAU;SAC9B,CAAC;IACJ,CAAC,EAAE,qBAAqB,CAAC,CAC1B,CAAC;IAEF,WAAW,CAAC,MAAM,CAAC,iBAAiB,CAClC,qBAAqB,EACrB,iBAAiB,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;QAClC,MAAM,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;QACrC,MAAM,oBAAoB,GACxB,kBAAkB,IAAI,uBAAuB,IAAI,uBAAuB,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QAEhG,IAAI,oBAAoB,IAAI,uBAAuB,EAAE,CAAC;YACpD,IAAI,MAAM,CAAC;YACX,IAAI,CAAC;gBACH,MAAM,GAAG,MAAM,uBAAuB,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;YACrG,CAAC;YAAC,OAAO,aAAa,EAAE,CAAC;gBACvB,MAAM,CAAC,KAAK,CAAC,aAAa,QAAQ,sBAAsB,aAAa,EAAE,CAAC,CAAC;gBACzE,MAAM,IAAI,KAAK,CACb,aAAa,QAAQ,YAAY,aAAa,YAAY,KAAK,CAAC,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,CAClH,CAAC;YACJ,CAAC;YAED,OAAO,oBAAoB,CAAC,MAAM,CAAC,CAAC;QACtC,CAAC;QAED,IAAI,kBAAkB,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,iBAAiB,CAAC,EAAE,CAAC;YAChE,OAAO,oBAAoB,CAAC;gBAC1B,KAAK,EAAE;oBACL,IAAI,EAAE,WAAW;oBACjB,OAAO,EAAE,iBAAiB,QAAQ,0GAA0G;iBAC7I;aACF,CAAC,CAAC;QACL,CAAC;QAED,MAAM,EAAE,UAAU,EAAE,YAAY,EAAE,iBAAiB,EAAE,GAAG,QAAQ,CAAC,QAAQ,EAAE,iBAAiB,CAAC,CAAC;QAE9F,IAAI,UAAU,KAAK,MAAM,EAAE,CAAC;YAC1B,MAAM,gBAAgB,GAAG,4BAA4B,CAAC,WAAW,EAAE,CAAC;YACpE,MAAM,gBAAgB,CAAC,UAAU,EAAE,CAAC;YACpC,MAAM,MAAM,GAAG,MAAM,gBAAgB,CAAC,WAAW,CAAC,iBAAiB,EAAE,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;YAC1G,OAAO,oBAAoB,CAAC,MAAM,CAAC,CAAC;QACtC,CAAC;QAED,MAAM,YAAY,GAAG,yBAAyB,CAAC,UAAU,EAAE,SAAS,EAAE,aAAa,EAAE,WAAW,CAAC,CAAC;QAClG,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,MAAM,IAAI,KAAK,CAAC,mBAAmB,UAAU,EAAE,CAAC,CAAC;QACnD,CAAC;QACD,MAAM,aAAa,GAAG,oBAAoB,CAAC,gBAAgB,EAAE,EAAE,UAAU,EAAE,iBAAiB,CAAC,CAAC;QAC9F,IAAI,aAAa,EAAE,CAAC;YAClB,OAAO,oBAAoB,CAAC;gBAC1B,KAAK,EAAE;oBACL,IAAI,EAAE,aAAa,CAAC,IAAI;oBACxB,OAAO,EAAE,aAAa,CAAC,OAAO;iBAC/B;aACF,CAAC,CAAC;QACL,CAAC;QACD,OAAO,YAAY,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,IAAI,EAAE,iBAAiB,EAAE,EAAE,oBAAoB,EAAE;YACxG,OAAO,EAAE,iBAAiB,CAAC,YAAY,CAAC,SAAS,CAAC;SACnD,CAAC,CAAC;IACL,CAAC,EAAE,oBAAoB,CAAC,CACzB,CAAC;AACJ,CAAC;AAED,SAAS,oBAAoB,CAAC,MAAe;IAC3C,OAAO;QACL,OAAO,EAAE;YACP;gBACE,IAAI,EAAE,MAAe;gBACrB,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;aACtC;SACF;QACD,iBAAiB,EAAE,MAAM;KAC1B,CAAC;AACJ,CAAC"}

package/build/core/server/adapters/TemplateServerAdapter.d.ts

@@ -20,11 +20,6 @@ export declare class TemplateServerAdapter implements ServerAdapter {
     private readonly templateManager;
     readonly type = ServerType.Template;
     constructor(name: string, config: MCPServerParams, outboundConns: OutboundConnections, templateManager: TemplateServerManager);
-    /**
-     * Build the possible connection keys for a session.
-     * Returns keys in priority order: session-scoped first, then hash-based.
-     */
-    private buildConnectionKeys;
     /**
      * Resolve the outbound connection for this template server.
      * Uses session-based resolution with hash lookup for shareable servers.

package/build/core/server/adapters/TemplateServerAdapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TemplateServerAdapter.d.ts","sourceRoot":"","sources":["../../../../src/core/server/adapters/TemplateServerAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,2CAA2C,CAAC;AACvF,OAAO,KAAK,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AACzF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAGhE,OAAO,EAAiC,aAAa,EAAE,aAAa,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAEnH;;;;;;;;;;GAUG;AACH,qBAAa,qBAAsB,YAAW,aAAa;IAIvD,QAAQ,CAAC,IAAI,EAAE,MAAM;IACrB,QAAQ,CAAC,MAAM,EAAE,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,eAAe;IANlC,QAAQ,CAAC,IAAI,uBAAuB;gBAGzB,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,eAAe,EACf,aAAa,EAAE,mBAAmB,EAClC,eAAe,EAAE,qBAAqB;IAGzD;;;OAGG;IACH,OAAO,CAAC,mBAAmB;IAmB3B;;;OAGG;IACH,iBAAiB,CAAC,OAAO,CAAC,EAAE,aAAa,GAAG,kBAAkB,GAAG,SAAS;IA2B1E;;OAEG;IACH,SAAS,CAAC,OAAO,CAAC,EAAE,aAAa,GAAG,YAAY;IAKhD;;OAEG;IACH,WAAW,CAAC,OAAO,CAAC,EAAE,aAAa,GAAG,OAAO;IAK7C;;;OAGG;IACH,gBAAgB,CAAC,OAAO,CAAC,EAAE,aAAa,GAAG,MAAM,GAAG,SAAS;CAQ9D"}
+{"version":3,"file":"TemplateServerAdapter.d.ts","sourceRoot":"","sources":["../../../../src/core/server/adapters/TemplateServerAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,2CAA2C,CAAC;AACvF,OAAO,KAAK,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AACzF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAIhE,OAAO,EAAiC,aAAa,EAAE,aAAa,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAEnH;;;;;;;;;;GAUG;AACH,qBAAa,qBAAsB,YAAW,aAAa;IAIvD,QAAQ,CAAC,IAAI,EAAE,MAAM;IACrB,QAAQ,CAAC,MAAM,EAAE,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,eAAe;IANlC,QAAQ,CAAC,IAAI,uBAAuB;gBAGzB,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,eAAe,EACf,aAAa,EAAE,mBAAmB,EAClC,eAAe,EAAE,qBAAqB;IAGzD;;;OAGG;IACH,iBAAiB,CAAC,OAAO,CAAC,EAAE,aAAa,GAAG,kBAAkB,GAAG,SAAS;IA0B1E;;OAEG;IACH,SAAS,CAAC,OAAO,CAAC,EAAE,aAAa,GAAG,YAAY;IAKhD;;OAEG;IACH,WAAW,CAAC,OAAO,CAAC,EAAE,aAAa,GAAG,OAAO;IAK7C;;;OAGG;IACH,gBAAgB,CAAC,OAAO,CAAC,EAAE,aAAa,GAAG,MAAM,GAAG,SAAS;CAQ9D"}

package/build/core/server/adapters/TemplateServerAdapter.js

@@ -1,4 +1,5 @@
-import { debugIf, errorIf } from '../../../logger/logger.js';
+import { debugIf } from '../../../logger/logger.js';
+import { ConnectionResolver } from '../connectionResolver.js';
 import { mapClientStatusToServerStatus, ServerStatus, ServerType } from './types.js';
 /**
  * TemplateServerAdapter handles template-based MCP servers with dynamic connections.
@@ -23,27 +24,6 @@ export class TemplateServerAdapter {
         this.outboundConns = outboundConns;
         this.templateManager = templateManager;
     }
-    /**
-     * Build the possible connection keys for a session.
-     * Returns keys in priority order: session-scoped first, then hash-based.
-     */
-    buildConnectionKeys(sessionId) {
-        const keys = [`${this.name}:${sessionId}`];
-        try {
-            const renderedHash = this.templateManager.getRenderedHashForSession(sessionId, this.name);
-            if (renderedHash) {
-                keys.push(`${this.name}:${renderedHash}`);
-            }
-        }
-        catch (error) {
-            const errorMessage = error instanceof Error ? error.message : String(error);
-            errorIf(() => ({
-                message: `Failed to get rendered hash for template server`,
-                meta: { serverName: this.name, sessionId, error: errorMessage },
-            }));
-        }
-        return keys;
-    }
     /**
      * Resolve the outbound connection for this template server.
      * Uses session-based resolution with hash lookup for shareable servers.
@@ -57,16 +37,13 @@ export class TemplateServerAdapter {
             }));
             return undefined;
         }
-        const keys = this.buildConnectionKeys(sessionId);
-        for (const key of keys) {
-            const conn = this.outboundConns.get(key);
-            if (conn) {
-                return conn;
-            }
+        const resolved = new ConnectionResolver(this.outboundConns, this.templateManager).resolveWithKey(this.name, sessionId);
+        if (resolved) {
+            return resolved.connection;
         }
         debugIf(() => ({
             message: 'TemplateServerAdapter: No connection found for template server',
-            meta: { serverName: this.name, sessionId, attemptedKeys: keys },
+            meta: { serverName: this.name, sessionId },
         }));
         return undefined;
     }
@@ -93,7 +70,7 @@ export class TemplateServerAdapter {
         if (!sessionId) {
             return undefined;
         }
-        return this.buildConnectionKeys(sessionId).find((key) => this.outboundConns.has(key));
+        return new ConnectionResolver(this.outboundConns, this.templateManager).resolveWithKey(this.name, sessionId)?.key;
     }
 }
 //# sourceMappingURL=TemplateServerAdapter.js.map

package/build/core/server/adapters/TemplateServerAdapter.js.map

@@ -1 +1 @@
-{"version":3,"file":"TemplateServerAdapter.js","sourceRoot":"","sources":["../../../../src/core/server/adapters/TemplateServerAdapter.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAEzD,OAAO,EAAE,6BAA6B,EAAgC,YAAY,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAEnH;;;;;;;;;;GAUG;AACH,MAAM,OAAO,qBAAqB;IAIrB;IACA;IACQ;IACA;IANV,IAAI,GAAG,UAAU,CAAC,QAAQ,CAAC;IAEpC,YACW,IAAY,EACZ,MAAuB,EACf,aAAkC,EAClC,eAAsC;QAH9C,SAAI,GAAJ,IAAI,CAAQ;QACZ,WAAM,GAAN,MAAM,CAAiB;QACf,kBAAa,GAAb,aAAa,CAAqB;QAClC,oBAAe,GAAf,eAAe,CAAuB;IACtD,CAAC;IAEJ;;;OAGG;IACK,mBAAmB,CAAC,SAAiB;QAC3C,MAAM,IAAI,GAAa,CAAC,GAAG,IAAI,CAAC,IAAI,IAAI,SAAS,EAAE,CAAC,CAAC;QAErD,IAAI,CAAC;YACH,MAAM,YAAY,GAAG,IAAI,CAAC,eAAe,CAAC,yBAAyB,CAAC,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YAC1F,IAAI,YAAY,EAAE,CAAC;gBACjB,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI,IAAI,YAAY,EAAE,CAAC,CAAC;YAC5C,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,YAAY,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAC5E,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;gBACb,OAAO,EAAE,iDAAiD;gBAC1D,IAAI,EAAE,EAAE,UAAU,EAAE,IAAI,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,YAAY,EAAE;aAChE,CAAC,CAAC,CAAC;QACN,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;OAGG;IACH,iBAAiB,CAAC,OAAuB;QACvC,MAAM,SAAS,GAAG,OAAO,EAAE,SAAS,CAAC;QACrC,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;gBACb,OAAO,EAAE,yDAAyD;gBAClE,IAAI,EAAE,EAAE,UAAU,EAAE,IAAI,CAAC,IAAI,EAAE;aAChC,CAAC,CAAC,CAAC;YACJ,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,MAAM,IAAI,GAAG,IAAI,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC;QAEjD,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,MAAM,IAAI,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YACzC,IAAI,IAAI,EAAE,CAAC;gBACT,OAAO,IAAI,CAAC;YACd,CAAC;QACH,CAAC;QAED,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;YACb,OAAO,EAAE,gEAAgE;YACzE,IAAI,EAAE,EAAE,UAAU,EAAE,IAAI,CAAC,IAAI,EAAE,SAAS,EAAE,aAAa,EAAE,IAAI,EAAE;SAChE,CAAC,CAAC,CAAC;QAEJ,OAAO,SAAS,CAAC;IACnB,CAAC;IAED;;OAEG;IACH,SAAS,CAAC,OAAuB;QAC/B,MAAM,IAAI,GAAG,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;QAC7C,OAAO,IAAI,CAAC,CAAC,CAAC,6BAA6B,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,YAAY,CAAC;IACvF,CAAC;IAED;;OAEG;IACH,WAAW,CAAC,OAAuB;QACjC,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QACvC,OAAO,MAAM,KAAK,YAAY,CAAC,SAAS,CAAC;IAC3C,CAAC;IAED;;;OAGG;IACH,gBAAgB,CAAC,OAAuB;QACtC,MAAM,SAAS,GAAG,OAAO,EAAE,SAAS,CAAC;QACrC,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,OAAO,IAAI,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;IACxF,CAAC;CACF"}
+{"version":3,"file":"TemplateServerAdapter.js","sourceRoot":"","sources":["../../../../src/core/server/adapters/TemplateServerAdapter.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAEhD,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAE,6BAA6B,EAAgC,YAAY,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAEnH;;;;;;;;;;GAUG;AACH,MAAM,OAAO,qBAAqB;IAIrB;IACA;IACQ;IACA;IANV,IAAI,GAAG,UAAU,CAAC,QAAQ,CAAC;IAEpC,YACW,IAAY,EACZ,MAAuB,EACf,aAAkC,EAClC,eAAsC;QAH9C,SAAI,GAAJ,IAAI,CAAQ;QACZ,WAAM,GAAN,MAAM,CAAiB;QACf,kBAAa,GAAb,aAAa,CAAqB;QAClC,oBAAe,GAAf,eAAe,CAAuB;IACtD,CAAC;IAEJ;;;OAGG;IACH,iBAAiB,CAAC,OAAuB;QACvC,MAAM,SAAS,GAAG,OAAO,EAAE,SAAS,CAAC;QACrC,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;gBACb,OAAO,EAAE,yDAAyD;gBAClE,IAAI,EAAE,EAAE,UAAU,EAAE,IAAI,CAAC,IAAI,EAAE;aAChC,CAAC,CAAC,CAAC;YACJ,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,MAAM,QAAQ,GAAG,IAAI,kBAAkB,CAAC,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC,cAAc,CAC9F,IAAI,CAAC,IAAI,EACT,SAAS,CACV,CAAC;QACF,IAAI,QAAQ,EAAE,CAAC;YACb,OAAO,QAAQ,CAAC,UAAU,CAAC;QAC7B,CAAC;QAED,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;YACb,OAAO,EAAE,gEAAgE;YACzE,IAAI,EAAE,EAAE,UAAU,EAAE,IAAI,CAAC,IAAI,EAAE,SAAS,EAAE;SAC3C,CAAC,CAAC,CAAC;QAEJ,OAAO,SAAS,CAAC;IACnB,CAAC;IAED;;OAEG;IACH,SAAS,CAAC,OAAuB;QAC/B,MAAM,IAAI,GAAG,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;QAC7C,OAAO,IAAI,CAAC,CAAC,CAAC,6BAA6B,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,YAAY,CAAC;IACvF,CAAC;IAED;;OAEG;IACH,WAAW,CAAC,OAAuB;QACjC,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QACvC,OAAO,MAAM,KAAK,YAAY,CAAC,SAAS,CAAC;IAC3C,CAAC;IAED;;;OAGG;IACH,gBAAgB,CAAC,OAAuB;QACtC,MAAM,SAAS,GAAG,OAAO,EAAE,SAAS,CAAC;QACrC,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,OAAO,IAAI,kBAAkB,CAAC,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC,EAAE,GAAG,CAAC;IACpH,CAAC;CACF"}

package/build/core/server/clientInstanceFactory.d.ts

@@ -0,0 +1,13 @@
+import type { MCPServerParams } from '../../core/types/transport.js';
+import type { PooledClientInstance } from './clientInstancePoolTypes.js';
+export interface CreatePooledInstanceParams {
+    instanceId: string;
+    instanceKey: string;
+    templateName: string;
+    processedConfig: MCPServerParams;
+    renderedHash: string;
+    clientId: string;
+    idleTimeout: number;
+}
+export declare function createPooledClientInstance({ instanceId, instanceKey, templateName, processedConfig, renderedHash, clientId, idleTimeout, }: CreatePooledInstanceParams): Promise<PooledClientInstance>;
+//# sourceMappingURL=clientInstanceFactory.d.ts.map

package/build/core/server/clientInstanceFactory.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"clientInstanceFactory.d.ts","sourceRoot":"","sources":["../../../src/core/server/clientInstanceFactory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAIpE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAEzE,MAAM,WAAW,0BAA0B;IACzC,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,eAAe,CAAC;IACjC,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,wBAAsB,0BAA0B,CAAC,EAC/C,UAAU,EACV,WAAW,EACX,YAAY,EACZ,eAAe,EACf,YAAY,EACZ,QAAQ,EACR,WAAW,GACZ,EAAE,0BAA0B,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAmC5D"}

package/build/core/server/clientInstanceFactory.js

@@ -0,0 +1,32 @@
+import { createTransportsWithContext } from '../../transport/transportFactory.js';
+import { getConnectionTimeout } from '../../utils/core/timeoutUtils.js';
+export async function createPooledClientInstance({ instanceId, instanceKey, templateName, processedConfig, renderedHash, clientId, idleTimeout, }) {
+    const transports = await createTransportsWithContext({
+        [templateName]: processedConfig,
+    }, undefined);
+    const transport = transports[templateName];
+    if (!transport) {
+        throw new Error(`Failed to create transport for template ${templateName}`);
+    }
+    const { ClientManager } = await import('../../core/client/clientManager.js');
+    const clientManager = ClientManager.getOrCreateInstance();
+    const client = clientManager.createPooledClientInstance();
+    const connectionTimeout = getConnectionTimeout(transport);
+    await client.connect(transport, connectionTimeout ? { timeout: connectionTimeout } : undefined);
+    return {
+        id: instanceId,
+        instanceKey,
+        templateName,
+        client,
+        transport,
+        renderedHash,
+        processedConfig,
+        referenceCount: 1,
+        createdAt: new Date(),
+        lastUsedAt: new Date(),
+        status: 'active',
+        clientIds: new Set([clientId]),
+        idleTimeout,
+    };
+}
+//# sourceMappingURL=clientInstanceFactory.js.map

package/build/core/server/clientInstanceFactory.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"clientInstanceFactory.js","sourceRoot":"","sources":["../../../src/core/server/clientInstanceFactory.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,2BAA2B,EAAE,MAAM,oCAAoC,CAAC;AACjF,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AAcvE,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAAC,EAC/C,UAAU,EACV,WAAW,EACX,YAAY,EACZ,eAAe,EACf,YAAY,EACZ,QAAQ,EACR,WAAW,GACgB;IAC3B,MAAM,UAAU,GAAG,MAAM,2BAA2B,CAClD;QACE,CAAC,YAAY,CAAC,EAAE,eAAe;KAChC,EACD,SAAS,CACV,CAAC;IAEF,MAAM,SAAS,GAAG,UAAU,CAAC,YAAY,CAAC,CAAC;IAC3C,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,MAAM,IAAI,KAAK,CAAC,2CAA2C,YAAY,EAAE,CAAC,CAAC;IAC7E,CAAC;IAED,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,MAAM,CAAC,mCAAmC,CAAC,CAAC;IAC5E,MAAM,aAAa,GAAG,aAAa,CAAC,mBAAmB,EAAE,CAAC;IAC1D,MAAM,MAAM,GAAG,aAAa,CAAC,0BAA0B,EAAE,CAAC;IAE1D,MAAM,iBAAiB,GAAG,oBAAoB,CAAC,SAAS,CAAC,CAAC;IAC1D,MAAM,MAAM,CAAC,OAAO,CAAC,SAAS,EAAE,iBAAiB,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,iBAAiB,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IAEhG,OAAO;QACL,EAAE,EAAE,UAAU;QACd,WAAW;QACX,YAAY;QACZ,MAAM;QACN,SAAS;QACT,YAAY;QACZ,eAAe;QACf,cAAc,EAAE,CAAC;QACjB,SAAS,EAAE,IAAI,IAAI,EAAE;QACrB,UAAU,EAAE,IAAI,IAAI,EAAE;QACtB,MAAM,EAAE,QAAQ;QAChB,SAAS,EAAE,IAAI,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC;QAC9B,WAAW;KACZ,CAAC;AACJ,CAAC"}

package/build/core/server/clientInstancePool.d.ts

@@ -1,49 +1,7 @@
-import { Client } from '@modelcontextprotocol/sdk/client/index.js';
-import { AuthProviderTransport } from '../../core/types/index.js';
 import type { MCPServerParams } from '../../core/types/transport.js';
 import type { ContextData } from '../../types/context.js';
-/**
- * Configuration options for client instance pool
- */
-export interface ClientPoolOptions {
-    /** Maximum number of instances per template (0 = unlimited) */
-    maxInstances?: number;
-    /** Time in milliseconds to wait before terminating idle instances */
-    idleTimeout?: number;
-    /** Interval in milliseconds to run cleanup checks */
-    cleanupInterval?: number;
-    /** Maximum total instances across all templates (0 = unlimited) */
-    maxTotalInstances?: number;
-}
-/**
- * Represents a pooled client instance connected to an upstream MCP server
- */
-export interface PooledClientInstance {
-    /** Unique identifier for this instance */
-    id: string;
-    /** Name of the template this instance was created from */
-    templateName: string;
-    /** MCP client instance */
-    client: Client;
-    /** Transport connected to upstream server */
-    transport: AuthProviderTransport;
-    /** Hash of the rendered configuration used to create this instance */
-    renderedHash: string;
-    /** Processed server configuration */
-    processedConfig: MCPServerParams;
-    /** Number of clients currently connected to this instance */
-    referenceCount: number;
-    /** Timestamp when this instance was created */
-    createdAt: Date;
-    /** Timestamp of last client activity */
-    lastUsedAt: Date;
-    /** Current status of the instance */
-    status: 'active' | 'idle' | 'terminating';
-    /** Set of client IDs connected to this instance */
-    clientIds: Set<string>;
-    /** Template-specific idle timeout */
-    idleTimeout: number;
-}
+import { ClientPoolOptions, PooledClientInstance } from './clientInstancePoolTypes.js';
+export type { ClientPoolOptions, PooledClientInstance };
 /**
  * Manages a pool of MCP client instances created from templates
  *
@@ -59,6 +17,7 @@ export declare class ClientInstancePool {
     private options;
     private cleanupTimer?;
     private instanceCounter;
+    private pendingCreations;
     constructor(options?: Partial<ClientPoolOptions>);
     /**
      * Creates or retrieves a client instance for the given template and variables
@@ -75,11 +34,15 @@ export declare class ClientInstancePool {
     /**
      * Removes a client from an instance
      */
-    removeClientFromInstance(instanceKey: string, clientId: string): void;
+    removeClientFromInstance(instanceKey: string, clientId: string, idleSince?: Date): void;
     /**
      * Gets an instance by its key
      */
     getInstance(instanceKey: string): PooledClientInstance | undefined;
+    /**
+     * Gets an instance key by its generated instance ID
+     */
+    getInstanceKeyById(instanceId: string): string | undefined;
     /**
      * Gets all instances for a specific template
      */
@@ -110,10 +73,6 @@ export declare class ClientInstancePool {
         templateCount: number;
         totalClients: number;
     };
-    /**
-     * Creates a new client instance and connects to upstream server
-     */
-    private createNewInstance;
     /**
      * Gets template configuration with proper defaults
      */

package/build/core/server/clientInstancePool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"clientInstancePool.d.ts","sourceRoot":"","sources":["../../../src/core/server/clientInstancePool.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"clientInstancePool.d.ts","sourceRoot":"","sources":["../../../src/core/server/clientInstancePool.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAGpE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAGzD,OAAO,EAAE,iBAAiB,EAAwB,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAE7G,YAAY,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,CAAC;AAExD;;;;;;;;GAQG;AACH,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,SAAS,CAA2C;IAC5D,OAAO,CAAC,mBAAmB,CAAkC;IAC7D,OAAO,CAAC,OAAO,CAAoB;IACnC,OAAO,CAAC,YAAY,CAAC,CAAiC;IACtD,OAAO,CAAC,eAAe,CAAK;IAC5B,OAAO,CAAC,gBAAgB,CAAoD;gBAEhE,OAAO,GAAE,OAAO,CAAC,iBAAiB,CAAM;IAUpD;;OAEG;IACG,yBAAyB,CAC7B,YAAY,EAAE,MAAM,EACpB,cAAc,EAAE,eAAe,EAC/B,OAAO,EAAE,WAAW,EACpB,QAAQ,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE;QACR,SAAS,CAAC,EAAE,OAAO,CAAC;QACpB,SAAS,CAAC,EAAE,OAAO,CAAC;QACpB,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB,GACA,OAAO,CAAC,oBAAoB,CAAC;IAgGhC;;OAEG;IACH,mBAAmB,CAAC,QAAQ,EAAE,oBAAoB,EAAE,QAAQ,EAAE,MAAM,GAAG,oBAAoB;IAoB3F;;OAEG;IACH,wBAAwB,CAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,GAAE,IAAiB,GAAG,IAAI;IAiCnG;;OAEG;IACH,WAAW,CAAC,WAAW,EAAE,MAAM,GAAG,oBAAoB,GAAG,SAAS;IAIlE;;OAEG;IACH,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAU1D;;OAEG;IACH,oBAAoB,CAAC,YAAY,EAAE,MAAM,GAAG,oBAAoB,EAAE;IAWlE;;OAEG;IACH,eAAe,IAAI,oBAAoB,EAAE;IAIzC;;OAEG;IACG,cAAc,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA6BxD;;OAEG;IACG,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;IAmC3C;;OAEG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAqC/B;;OAEG;IACH,QAAQ,IAAI;QACV,cAAc,EAAE,MAAM,CAAC;QACvB,eAAe,EAAE,MAAM,CAAC;QACxB,aAAa,EAAE,MAAM,CAAC;QACtB,aAAa,EAAE,MAAM,CAAC;QACtB,YAAY,EAAE,MAAM,CAAC;KACtB;IAeD;;OAEG;IACH,OAAO,CAAC,mBAAmB;IA+B3B;;OAEG;IACH,OAAO,CAAC,iBAAiB;IAIzB;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAI1B;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAuB3B;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAO1B;;OAEG;IACH,OAAO,CAAC,uBAAuB;IAU/B;;OAEG;IACH,OAAO,CAAC,iBAAiB;CAc1B"}

package/build/core/server/clientInstancePool.js

@@ -1,17 +1,8 @@
+import { serializePoolIdentity, templateRenderedHash } from '../../core/server/templateIdentity.js';
 import logger, { debugIf, infoIf } from '../../logger/logger.js';
 import { HandlebarsTemplateRenderer } from '../../template/handlebarsTemplateRenderer.js';
-import { createTransportsWithContext } from '../../transport/transportFactory.js';
-import { getConnectionTimeout } from '../../utils/core/timeoutUtils.js';
-import { createHash } from '../../utils/crypto.js';
-/**
- * Default pool configuration
- */
-const DEFAULT_POOL_OPTIONS = {
-    maxInstances: 10,
-    idleTimeout: 5 * 60 * 1000, // 5 minutes
-    cleanupInterval: 60 * 1000, // 1 minute
-    maxTotalInstances: 100,
-};
+import { createPooledClientInstance } from './clientInstanceFactory.js';
+import { DEFAULT_POOL_OPTIONS } from './clientInstancePoolTypes.js';
 /**
  * Manages a pool of MCP client instances created from templates
  *
@@ -27,6 +18,7 @@ export class ClientInstancePool {
     options;
     cleanupTimer;
     instanceCounter = 0;
+    pendingCreations = new Map();
     constructor(options = {}) {
         this.options = { ...DEFAULT_POOL_OPTIONS, ...options };
         this.startCleanupTimer();
@@ -42,7 +34,7 @@ export class ClientInstancePool {
         // Render template with context data
         const renderer = new HandlebarsTemplateRenderer();
         const renderedConfig = renderer.renderTemplate(templateConfig, context);
-        const renderedHash = createHash(JSON.stringify(renderedConfig));
+        const renderedHash = templateRenderedHash(renderedConfig);
         // Debug logging to verify template rendering
         debugIf(() => ({
             message: 'Template rendering details',
@@ -66,35 +58,57 @@ export class ClientInstancePool {
         }));
         // Get template configuration with proper defaults
         const templateSettings = this.getTemplateSettings(templateConfig, options);
-        const instanceKey = this.createInstanceKey(templateName, renderedHash, templateSettings.perClient ? clientId : undefined);
+        const instanceKey = this.createInstanceKey(templateName, renderedHash, templateSettings.perClient || !templateSettings.shareable ? clientId : undefined);
         logger.info(`Template ${templateName}, renderedHash: ${renderedHash}, Instance key: ${instanceKey}`);
         // Check for existing instance
         const existingInstance = this.instances.get(instanceKey);
         if (existingInstance && existingInstance.status !== 'terminating') {
             // Check if this template is shareable
-            if (templateSettings.shareable) {
+            if (templateSettings.shareable || existingInstance.clientIds.has(clientId)) {
                 return this.addClientToInstance(existingInstance, clientId);
             }
         }
-        // Check instance limits before creating new
-        this.checkInstanceLimits(templateName);
-        // Create new client instance
-        const instance = await this.createNewInstance(templateName, templateConfig, renderedConfig, // Use rendered config directly
-        renderedHash, // Use rendered hash
-        clientId, templateSettings.idleTimeout);
-        this.instances.set(instanceKey, instance);
-        this.addToTemplateIndex(templateName, instanceKey);
-        infoIf(() => ({
-            message: 'Created new client instance from template',
-            meta: {
-                instanceId: instance.id,
+        const pendingCreation = this.pendingCreations.get(instanceKey);
+        if (pendingCreation) {
+            const instance = await pendingCreation;
+            if (instance.status !== 'terminating') {
+                return this.addClientToInstance(instance, clientId);
+            }
+        }
+        const instancePromise = (async () => {
+            // Check instance limits before creating new
+            this.checkInstanceLimits(templateName);
+            // Create new client instance
+            const instance = await createPooledClientInstance({
+                instanceId: this.generateInstanceId(),
+                instanceKey,
                 templateName,
-                renderedHash: renderedHash.substring(0, 8) + '...',
+                processedConfig: renderedConfig,
+                renderedHash,
                 clientId,
-                shareable: templateSettings.shareable,
-            },
-        }));
-        return instance;
+                idleTimeout: templateSettings.idleTimeout,
+            });
+            this.instances.set(instanceKey, instance);
+            this.addToTemplateIndex(templateName, instanceKey);
+            infoIf(() => ({
+                message: 'Created new client instance from template',
+                meta: {
+                    instanceId: instance.id,
+                    templateName,
+                    renderedHash: renderedHash.substring(0, 8) + '...',
+                    clientId,
+                    shareable: templateSettings.shareable,
+                },
+            }));
+            return instance;
+        })();
+        this.pendingCreations.set(instanceKey, instancePromise);
+        try {
+            return await instancePromise;
+        }
+        finally {
+            this.pendingCreations.delete(instanceKey);
+        }
     }
     /**
      * Adds a client to an existing instance
@@ -119,7 +133,7 @@ export class ClientInstancePool {
     /**
      * Removes a client from an instance
      */
-    removeClientFromInstance(instanceKey, clientId) {
+    removeClientFromInstance(instanceKey, clientId, idleSince = new Date()) {
         const instance = this.instances.get(instanceKey);
         if (!instance) {
             return;
@@ -137,7 +151,7 @@ export class ClientInstancePool {
         // Mark as idle if no more clients
         if (instance.referenceCount === 0) {
             instance.status = 'idle';
-            instance.lastUsedAt = new Date(); // Set lastUsedAt to when it became idle
+            instance.lastUsedAt = idleSince; // Set lastUsedAt to when it became idle
             infoIf(() => ({
                 message: 'Client instance marked as idle',
                 meta: {
@@ -153,6 +167,17 @@ export class ClientInstancePool {
     getInstance(instanceKey) {
         return this.instances.get(instanceKey);
     }
+    /**
+     * Gets an instance key by its generated instance ID
+     */
+    getInstanceKeyById(instanceId) {
+        for (const [instanceKey, instance] of this.instances) {
+            if (instance.id === instanceId) {
+                return instanceKey;
+            }
+        }
+        return undefined;
+    }
     /**
      * Gets all instances for a specific template
      */
@@ -256,6 +281,7 @@ export class ClientInstancePool {
         }));
         this.instances.clear();
         this.templateToInstances.clear();
+        this.pendingCreations.clear();
         debugIf(() => ({
             message: 'ClientInstancePool shutdown complete',
             meta: {
@@ -279,40 +305,6 @@ export class ClientInstancePool {
             totalClients,
         };
     }
-    /**
-     * Creates a new client instance and connects to upstream server
-     */
-    async createNewInstance(templateName, templateConfig, processedConfig, renderedHash, clientId, idleTimeout) {
-        // Create transport for the upstream server
-        const transports = await createTransportsWithContext({
-            [templateName]: processedConfig,
-        }, undefined);
-        const transport = transports[templateName];
-        if (!transport) {
-            throw new Error(`Failed to create transport for template ${templateName}`);
-        }
-        // Create client instance
-        const { ClientManager } = await import('../../core/client/clientManager.js');
-        const clientManager = ClientManager.getOrCreateInstance();
-        const client = clientManager.createPooledClientInstance();
-        // Connect client to the upstream server, respecting connectionTimeout from transport config
-        const connectionTimeout = getConnectionTimeout(transport);
-        await client.connect(transport, connectionTimeout ? { timeout: connectionTimeout } : undefined);
-        return {
-            id: this.generateInstanceId(),
-            templateName,
-            client,
-            transport,
-            renderedHash,
-            processedConfig,
-            referenceCount: 1,
-            createdAt: new Date(),
-            lastUsedAt: new Date(),
-            status: 'active',
-            clientIds: new Set([clientId]),
-            idleTimeout,
-        };
-    }
     /**
      * Gets template configuration with proper defaults
      */
@@ -337,10 +329,7 @@ export class ClientInstancePool {
      * Creates a unique instance key from template name and variable hash
      */
     createInstanceKey(templateName, variableHash, clientId) {
-        if (clientId) {
-            return `${templateName}:${variableHash}:${clientId}`;
-        }
-        return `${templateName}:${variableHash}`;
+        return serializePoolIdentity({ templateName, renderedHash: variableHash, sessionId: clientId });
     }
     /**
      * Generates a unique instance ID