@1mcp/agent 0.32.1 → 0.33.0-beta1

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

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

@@ -1 +1 @@
-{"version":3,"file":"clientInstancePool.js","sourceRoot":"","sources":["../../../src/core/server/clientInstancePool.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"clientInstancePool.js","sourceRoot":"","sources":["../../../src/core/server/clientInstancePool.ts"],"names":[],"mappings":"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"}

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

@@ -0,0 +1,52 @@
+import { Client } from '@modelcontextprotocol/sdk/client/index.js';
+import { AuthProviderTransport } from '../../core/types/index.js';
+import type { MCPServerParams } from '../../core/types/transport.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;
+}
+/**
+ * Default pool configuration
+ */
+export declare const DEFAULT_POOL_OPTIONS: ClientPoolOptions;
+/**
+ * Represents a pooled client instance connected to an upstream MCP server
+ */
+export interface PooledClientInstance {
+    /** Unique identifier for this instance */
+    id: string;
+    /** Internal pool key used to address this instance */
+    instanceKey: 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;
+}
+//# sourceMappingURL=clientInstancePoolTypes.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"clientInstancePoolTypes.d.ts","sourceRoot":"","sources":["../../../src/core/server/clientInstancePoolTypes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,2CAA2C,CAAC;AAEnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAEpE;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,+DAA+D;IAC/D,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,qEAAqE;IACrE,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,qDAAqD;IACrD,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,mEAAmE;IACnE,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED;;GAEG;AACH,eAAO,MAAM,oBAAoB,EAAE,iBAKlC,CAAC;AAEF;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC,0CAA0C;IAC1C,EAAE,EAAE,MAAM,CAAC;IACX,sDAAsD;IACtD,WAAW,EAAE,MAAM,CAAC;IACpB,0DAA0D;IAC1D,YAAY,EAAE,MAAM,CAAC;IACrB,0BAA0B;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,6CAA6C;IAC7C,SAAS,EAAE,qBAAqB,CAAC;IACjC,sEAAsE;IACtE,YAAY,EAAE,MAAM,CAAC;IACrB,qCAAqC;IACrC,eAAe,EAAE,eAAe,CAAC;IACjC,6DAA6D;IAC7D,cAAc,EAAE,MAAM,CAAC;IACvB,+CAA+C;IAC/C,SAAS,EAAE,IAAI,CAAC;IAChB,wCAAwC;IACxC,UAAU,EAAE,IAAI,CAAC;IACjB,qCAAqC;IACrC,MAAM,EAAE,QAAQ,GAAG,MAAM,GAAG,aAAa,CAAC;IAC1C,mDAAmD;IACnD,SAAS,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IACvB,qCAAqC;IACrC,WAAW,EAAE,MAAM,CAAC;CACrB"}

package/build/core/server/clientInstancePoolTypes.js

@@ -0,0 +1,10 @@
+/**
+ * Default pool configuration
+ */
+export const DEFAULT_POOL_OPTIONS = {
+    maxInstances: 10,
+    idleTimeout: 5 * 60 * 1000,
+    cleanupInterval: 60 * 1000,
+    maxTotalInstances: 100,
+};
+//# sourceMappingURL=clientInstancePoolTypes.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"clientInstancePoolTypes.js","sourceRoot":"","sources":["../../../src/core/server/clientInstancePoolTypes.ts"],"names":[],"mappings":"AAmBA;;GAEG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAsB;IACrD,YAAY,EAAE,EAAE;IAChB,WAAW,EAAE,CAAC,GAAG,EAAE,GAAG,IAAI;IAC1B,eAAe,EAAE,EAAE,GAAG,IAAI;IAC1B,iBAAiB,EAAE,GAAG;CACvB,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"connectionResolver.d.ts","sourceRoot":"","sources":["../../../src/core/server/connectionResolver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAGzF;;;GAGG;AACH,MAAM,WAAW,oBAAoB;IACnC;;OAEG;IACH,yBAAyB,CAAC,SAAS,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;IAEvF;;;OAGG;IACH,8BAA8B,CAAC,SAAS,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,CAAC;CACpF;AAED;;;;;;;;;;;;GAYG;AACH,qBAAa,kBAAkB;IAE3B,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAC;gBADrB,aAAa,EAAE,mBAAmB,EAClC,oBAAoB,CAAC,EAAE,oBAAoB,YAAA;IAG9D,cAAc,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,kBAAkB,CAAA;KAAE,GAAG,SAAS;IA+BnH;;;;;;OAMG;IACH,OAAO,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,kBAAkB,GAAG,SAAS;IAI/E;;;;;;;;;;OAUG;IACH,gBAAgB,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,mBAAmB;IA0CzD;;;;OAIG;IACH,OAAO,CAAC,wBAAwB;IAOhC;;;;;;;;;;OAUG;IACH,gBAAgB,CAAC,UAAU,EAAE,MAAM,GAAG;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,kBAAkB,CAAA;KAAE,GAAG,SAAS;CAgBlG;AAED;;;GAGG;AACH,wBAAgB,wBAAwB,CACtC,aAAa,EAAE,mBAAmB,EAClC,oBAAoB,CAAC,EAAE,oBAAoB,GAC1C,kBAAkB,CAEpB"}
+{"version":3,"file":"connectionResolver.d.ts","sourceRoot":"","sources":["../../../src/core/server/connectionResolver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAYzF;;;GAGG;AACH,MAAM,WAAW,oBAAoB;IACnC;;OAEG;IACH,yBAAyB,CAAC,SAAS,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;IAEvF;;;OAGG;IACH,8BAA8B,CAAC,SAAS,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,CAAC;CACpF;AAED;;;;;;;;;;;;GAYG;AACH,qBAAa,kBAAkB;IAE3B,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAC;gBADrB,aAAa,EAAE,mBAAmB,EAClC,oBAAoB,CAAC,EAAE,oBAAoB,YAAA;IAG9D,cAAc,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,kBAAkB,CAAA;KAAE,GAAG,SAAS;IAiCnH;;;;;;OAMG;IACH,OAAO,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,kBAAkB,GAAG,SAAS;IAI/E;;;;;;;;;;OAUG;IACH,gBAAgB,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,mBAAmB;IA2CzD;;;;OAIG;IACH,OAAO,CAAC,wBAAwB;IAOhC;;;;;;;;;;OAUG;IACH,gBAAgB,CAAC,UAAU,EAAE,MAAM,GAAG;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,kBAAkB,CAAA;KAAE,GAAG,SAAS;CAgBlG;AAED;;;GAGG;AACH,wBAAgB,wBAAwB,CACtC,aAAa,EAAE,mBAAmB,EAClC,oBAAoB,CAAC,EAAE,oBAAoB,GAC1C,kBAAkB,CAEpB"}

package/build/core/server/connectionResolver.js

@@ -1,4 +1,5 @@
 import { errorIf } from '../../logger/logger.js';
+import { createRenderedIdentity, createSessionIdentity, createStaticIdentity, parseTemplateConnectionKey, serializeTemplateIdentity, } from './templateIdentity.js';
 /**
  * ConnectionResolver encapsulates the 3-tier connection resolution logic.
  *
@@ -20,29 +21,31 @@ export class ConnectionResolver {
         this.templateHashProvider = templateHashProvider;
     }
     resolveWithKey(clientName, sessionId) {
-        // Tier 1: Try session-scoped key first (for per-client template servers: name:sessionId)
+        const candidates = [];
         if (sessionId) {
-            const sessionKey = `${clientName}:${sessionId}`;
-            const conn = this.outboundConns.get(sessionKey);
-            if (conn) {
-                return { key: sessionKey, connection: conn };
-            }
+            candidates.push(createSessionIdentity(clientName, sessionId));
         }
-        // Tier 2: Try rendered hash-based key (for shareable template servers: name:renderedHash)
         if (sessionId && this.templateHashProvider) {
-            const renderedHash = this.templateHashProvider.getRenderedHashForSession(sessionId, clientName);
-            if (renderedHash) {
-                const hashKey = `${clientName}:${renderedHash}`;
-                const conn = this.outboundConns.get(hashKey);
-                if (conn) {
-                    return { key: hashKey, connection: conn };
+            try {
+                const renderedHash = this.templateHashProvider.getRenderedHashForSession(sessionId, clientName);
+                if (renderedHash) {
+                    candidates.push(createRenderedIdentity(clientName, renderedHash));
                 }
             }
+            catch (error) {
+                errorIf(() => ({
+                    message: 'Failed to get rendered hash for template connection lookup',
+                    meta: { clientName, sessionId, error: error instanceof Error ? error.message : String(error) },
+                }));
+            }
         }
-        // Tier 3: Fall back to direct name lookup (for static servers)
-        const conn = this.outboundConns.get(clientName);
-        if (conn) {
-            return { key: clientName, connection: conn };
+        candidates.push(createStaticIdentity(clientName));
+        for (const identity of candidates) {
+            const key = serializeTemplateIdentity(identity);
+            const conn = this.outboundConns.get(key);
+            if (conn) {
+                return { key, connection: conn };
+            }
         }
         return undefined;
     }
@@ -72,29 +75,29 @@ export class ConnectionResolver {
         // Get rendered hashes for this session
         const sessionHashes = this.getSessionRenderedHashes(sessionId);
         for (const [key, conn] of this.outboundConns.entries()) {
+            const identity = parseTemplateConnectionKey(key);
+            if (identity.kind === 'invalid') {
+                errorIf(() => ({
+                    message: 'Invalid connection key format: expected clean name or exactly one colon delimiter',
+                    meta: { key },
+                }));
+                continue;
+            }
             // Static servers (no : in key) - always include
-            if (!key.includes(':')) {
+            if (identity.kind === 'static') {
                 filtered.set(key, conn);
                 continue;
             }
-            // Template servers (format: name:suffix)
-            const parts = key.split(':', 2);
-            // Validate split result - must have exactly 2 parts
-            if (parts.length !== 2) {
-                errorIf(() => ({
-                    message: 'Invalid connection key format: expected exactly one colon delimiter',
-                    meta: { key, parts: parts.length },
-                }));
-                continue; // Skip malformed keys
-            }
-            const [name, suffix] = parts;
-            // Per-client template servers (format: name:sessionId) - only include if session matches
+            // Per-client (name:sessionId) and rendered (name:renderedHash) servers - include if suffix matches session
+            const suffix = identity.kind === 'session' ? identity.sessionId : identity.renderedHash;
             if (suffix === sessionId) {
                 filtered.set(key, conn);
                 continue;
             }
             // Shareable template servers (format: name:renderedHash) - include if this session uses this hash
-            if (sessionHashes && sessionHashes.has(name) && sessionHashes.get(name) === suffix) {
+            if (sessionHashes &&
+                sessionHashes.has(identity.templateName) &&
+                sessionHashes.get(identity.templateName) === suffix) {
                 filtered.set(key, conn);
             }
         }

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

@@ -1 +1 @@
-{"version":3,"file":"connectionResolver.js","sourceRoot":"","sources":["../../../src/core/server/connectionResolver.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"connectionResolver.js","sourceRoot":"","sources":["../../../src/core/server/connectionResolver.ts"],"names":[],"mappings":"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"}

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

@@ -1,6 +1,6 @@
 import { Transport } from '@modelcontextprotocol/sdk/shared/transport.js';
 import type { OutboundConnections } from '../../core/types/client.js';
-import { MCPServerParams } from '../../core/types/index.js';
+import { AuthProviderTransport, MCPServerParams } from '../../core/types/index.js';
 /**
  * Manages the lifecycle of MCP server instances (start, stop, restart)
  */
@@ -31,6 +31,14 @@ export declare class MCPServerLifecycleManager {
      * Check if a specific MCP server is running
      */
     isMcpServerRunning(serverName: string): boolean;
+    /**
+     * Track a server whose connection is managed by another startup path.
+     */
+    trackServer(serverName: string, config: MCPServerParams, transport: AuthProviderTransport): void;
+    /**
+     * Remove lifecycle tracking without touching the already-cleaned-up transport.
+     */
+    untrackServer(serverName: string): void;
     /**
      * Update metadata for a running server without restarting it
      */

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

@@ -1 +1 @@
-{"version":3,"file":"mcpServerLifecycleManager.d.ts","sourceRoot":"","sources":["../../../src/core/server/mcpServerLifecycleManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,+CAA+C,CAAC;AAK1E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AACrE,OAAO,EAAyB,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAIlF;;GAEG;AACH,qBAAa,yBAAyB;IACpC,OAAO,CAAC,UAAU,CAAyF;IAC3G,OAAO,CAAC,aAAa,CAAC,CAAgB;;IAMtC;;OAEG;IACU,WAAW,CACtB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,eAAe,EACvB,aAAa,EAAE,mBAAmB,EAClC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GACpC,OAAO,CAAC,IAAI,CAAC;IAyChB;;OAEG;IACU,UAAU,CACrB,UAAU,EAAE,MAAM,EAClB,aAAa,EAAE,mBAAmB,EAClC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GACpC,OAAO,CAAC,IAAI,CAAC;IAkChB;;OAEG;IACU,aAAa,CACxB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,eAAe,EACvB,aAAa,EAAE,mBAAmB,EAClC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GACpC,OAAO,CAAC,IAAI,CAAC;IAqBhB;;OAEG;IACI,kBAAkB,IAAI,GAAG,CAAC,MAAM,EAAE;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,MAAM,EAAE,eAAe,CAAA;KAAE,CAAC;IAavF;;OAEG;IACI,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO;IAItD;;OAEG;IACU,oBAAoB,CAC/B,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,eAAe,EAC1B,aAAa,EAAE,mBAAmB,GACjC,OAAO,CAAC,IAAI,CAAC;IA6ChB;;OAEG;IACH,OAAO,CAAC,mBAAmB;IA0B3B;;OAEG;YACW,qBAAqB;IAgCnC;;OAEG;YACW,eAAe;IAgC7B;;OAEG;YACW,oBAAoB;CA0BnC"}
+{"version":3,"file":"mcpServerLifecycleManager.d.ts","sourceRoot":"","sources":["../../../src/core/server/mcpServerLifecycleManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,+CAA+C,CAAC;AAK1E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AACrE,OAAO,EAAE,qBAAqB,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAIlF;;GAEG;AACH,qBAAa,yBAAyB;IACpC,OAAO,CAAC,UAAU,CAAyF;IAC3G,OAAO,CAAC,aAAa,CAAC,CAAgB;;IAMtC;;OAEG;IACU,WAAW,CACtB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,eAAe,EACvB,aAAa,EAAE,mBAAmB,EAClC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GACpC,OAAO,CAAC,IAAI,CAAC;IAyChB;;OAEG;IACU,UAAU,CACrB,UAAU,EAAE,MAAM,EAClB,aAAa,EAAE,mBAAmB,EAClC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GACpC,OAAO,CAAC,IAAI,CAAC;IAkChB;;OAEG;IACU,aAAa,CACxB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,eAAe,EACvB,aAAa,EAAE,mBAAmB,EAClC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GACpC,OAAO,CAAC,IAAI,CAAC;IAqBhB;;OAEG;IACI,kBAAkB,IAAI,GAAG,CAAC,MAAM,EAAE;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,MAAM,EAAE,eAAe,CAAA;KAAE,CAAC;IAavF;;OAEG;IACI,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO;IAItD;;OAEG;IACI,WAAW,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,SAAS,EAAE,qBAAqB,GAAG,IAAI;IAavG;;OAEG;IACI,aAAa,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IAM9C;;OAEG;IACU,oBAAoB,CAC/B,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,eAAe,EAC1B,aAAa,EAAE,mBAAmB,GACjC,OAAO,CAAC,IAAI,CAAC;IA6ChB;;OAEG;IACH,OAAO,CAAC,mBAAmB;IA0B3B;;OAEG;YACW,qBAAqB;IAgCnC;;OAEG;YACW,eAAe;IAgC7B;;OAEG;YACW,oBAAoB;CA0BnC"}

package/build/core/server/mcpServerLifecycleManager.js

@@ -121,6 +121,28 @@ export class MCPServerLifecycleManager {
     isMcpServerRunning(serverName) {
         return this.mcpServers.has(serverName);
     }
+    /**
+     * Track a server whose connection is managed by another startup path.
+     */
+    trackServer(serverName, config, transport) {
+        if (config.disabled) {
+            this.mcpServers.delete(serverName);
+            return;
+        }
+        this.mcpServers.set(serverName, { transport, config });
+        debugIf(() => ({
+            message: `Tracked MCP server lifecycle state: ${serverName}`,
+            meta: { serverName, tags: config.tags },
+        }));
+    }
+    /**
+     * Remove lifecycle tracking without touching the already-cleaned-up transport.
+     */
+    untrackServer(serverName) {
+        if (this.mcpServers.delete(serverName)) {
+            debugIf(() => ({ message: `Untracked MCP server lifecycle state: ${serverName}` }));
+        }
+    }
     /**
      * Update metadata for a running server without restarting it
      */

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

@@ -1 +1 @@
-{"version":3,"file":"mcpServerLifecycleManager.js","sourceRoot":"","sources":["../../../src/core/server/mcpServerLifecycleManager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"mcpServerLifecycleManager.js","sourceRoot":"","sources":["../../../src/core/server/mcpServerLifecycleManager.ts"],"names":[],"mappings":"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"}

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

@@ -0,0 +1,38 @@
+import type { Transport } from '@modelcontextprotocol/sdk/shared/transport.js';
+import type { OutboundConnections } from '../../core/types/client.js';
+import type { MCPServerParams } from '../../core/types/index.js';
+import type { InboundConnectionConfig } from '../../core/types/server.js';
+import type { ContextData } from '../../types/context.js';
+export type RequestContextPreparationResult = {
+    status: 'no_context';
+} | {
+    status: 'routing_only';
+    sessionId: string;
+} | {
+    status: 'already_prepared' | 'prepared';
+    sessionId: string;
+    templateNames: string[];
+    createdTemplateNames: string[];
+};
+export interface RequestContextPreparationDependencies {
+    deriveSessionId(context: ContextData): string;
+    loadRenderedTemplates(context: ContextData): Promise<Record<string, MCPServerParams>>;
+    getRenderedHashForSession(sessionId: string, templateName: string): string | undefined;
+    touchEphemeralClient(sessionId: string): void;
+    createTemplateBasedServers(sessionId: string, context: ContextData, filterConfig: InboundConnectionConfig, serverConfigData: {
+        mcpTemplates?: Record<string, MCPServerParams>;
+    }, outboundConns: OutboundConnections, transports: Record<string, Transport>, lifecycle: 'ephemeral'): Promise<void>;
+    hasTemplateAdapter(templateName: string): boolean;
+    registerTemplateAdapter(templateName: string, config: MCPServerParams): void;
+    getOutboundConnections(): OutboundConnections;
+    getClientTransports(): Record<string, Transport>;
+    refreshCapabilities(): Promise<void>;
+}
+export interface PrepareRequestContextInput {
+    deps: RequestContextPreparationDependencies;
+    filterConfig: InboundConnectionConfig;
+    context?: ContextData | null;
+    transportSessionId?: string;
+}
+export declare function prepareRequestContext(input: PrepareRequestContextInput): Promise<RequestContextPreparationResult>;
+//# sourceMappingURL=requestContextPreparation.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"requestContextPreparation.d.ts","sourceRoot":"","sources":["../../../src/core/server/requestContextPreparation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,+CAA+C,CAAC;AAE/E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AACrE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AACzE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAGzD,MAAM,MAAM,+BAA+B,GACvC;IAAE,MAAM,EAAE,YAAY,CAAA;CAAE,GACxB;IAAE,MAAM,EAAE,cAAc,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,GAC7C;IACE,MAAM,EAAE,kBAAkB,GAAG,UAAU,CAAC;IACxC,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,oBAAoB,EAAE,MAAM,EAAE,CAAC;CAChC,CAAC;AAEN,MAAM,WAAW,qCAAqC;IACpD,eAAe,CAAC,OAAO,EAAE,WAAW,GAAG,MAAM,CAAC;IAC9C,qBAAqB,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC,CAAC;IACtF,yBAAyB,CAAC,SAAS,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;IACvF,oBAAoB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9C,0BAA0B,CACxB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,WAAW,EACpB,YAAY,EAAE,uBAAuB,EACrC,gBAAgB,EAAE;QAAE,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAA;KAAE,EACpE,aAAa,EAAE,mBAAmB,EAClC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,EACrC,SAAS,EAAE,WAAW,GACrB,OAAO,CAAC,IAAI,CAAC,CAAC;IACjB,kBAAkB,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC;IAClD,uBAAuB,CAAC,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,eAAe,GAAG,IAAI,CAAC;IAC7E,sBAAsB,IAAI,mBAAmB,CAAC;IAC9C,mBAAmB,IAAI,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACjD,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACtC;AAED,MAAM,WAAW,0BAA0B;IACzC,IAAI,EAAE,qCAAqC,CAAC;IAC5C,YAAY,EAAE,uBAAuB,CAAC;IACtC,OAAO,CAAC,EAAE,WAAW,GAAG,IAAI,CAAC;IAC7B,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B;AAED,wBAAsB,qBAAqB,CACzC,KAAK,EAAE,0BAA0B,GAChC,OAAO,CAAC,+BAA+B,CAAC,CAgE1C"}