@1mcp/agent 0.39.0-beta.2 → 0.39.0-beta.4

package/build/transport/http/routes/modernToolHeaderRegistry.js

@@ -0,0 +1,161 @@
+import { ProtocolError } from '@modelcontextprotocol/server';
+import { getConfiguredServerTargets } from '../../../config/configuredServerTargets.js';
+import { getCapabilityPaginationGeneration, registerCapabilityPaginationNotifications, unregisterCapabilityPaginationConnections, } from '../../../core/capabilities/capabilityPagination.js';
+import { InternalCapabilitiesProvider } from '../../../core/capabilities/internalCapabilitiesProvider.js';
+import { acquireRuntimeCapabilityCatalog } from '../../../core/capabilities/runtimeCapabilityCatalog.js';
+import { FilteringService } from '../../../core/filtering/filteringService.js';
+import { filterConnectionsForSession, resolveCapabilityVisibility } from '../../../core/protocol/requestHandlerUtils.js';
+import { withInteractionRoute } from '../../../gateway/interactions/interactionRoute.js';
+import { createMcpParamHeaders, scanMcpParamDeclarations } from '../../../sdk/contracts/mcpParamHeaders.js';
+/**
+ * This registry only projects already-admitted schemas for the SDK's header lookup.
+ * fromJsonSchema's default validator compiles synchronously; never use it here.
+ * Generic gateway handlers replace the registry's handlers and retain worker-based
+ * input/output validation. Accidental registry execution must fail closed.
+ */
+export const toolHeaderProjectionValidator = {
+    getValidator: () => () => {
+        throw new Error('Tool schema evaluation requires the gateway schema boundary');
+    },
+};
+export async function resolveModernToolHeaderRegistry(manager, config, method, params, signal) {
+    if (method !== 'tools/call')
+        return undefined;
+    if (!params || typeof params !== 'object' || Array.isArray(params))
+        return undefined;
+    const name = params.name;
+    if (typeof name !== 'string')
+        return undefined;
+    const connections = manager.getClients();
+    const visible = FilteringService.getFilteredConnections(filterConnectionsForSession(connections, undefined), config);
+    const visibility = resolveCapabilityVisibility(connections, config, undefined, 'tools');
+    // Observe before the asynchronous read so a notification during admission also
+    // invalidates the declaration. Separate maps fence only the selected provider.
+    const observers = Array.from(visible, ([key, connection]) => {
+        const observed = new Map([[key, connection]]);
+        registerCapabilityPaginationNotifications(observed, connection);
+        return { connection, observed, generation: getCapabilityPaginationGeneration(observed, 'tools') };
+    });
+    let retained;
+    try {
+        const provider = InternalCapabilitiesProvider.getInstance();
+        await provider.initialize();
+        const lazyOrchestrator = manager.getLazyLoadingOrchestrator?.();
+        const lazy = lazyOrchestrator?.isEnabled() ?? false;
+        const internalTools = provider.getAvailableTools();
+        const metaTools = lazy && lazyOrchestrator ? (await lazyOrchestrator.getCapabilitiesForVisibility(visibility)).tools : [];
+        const serverConfigs = getConfiguredServerTargets();
+        const args = params.arguments;
+        const toolListContinuation = lazy &&
+            name === 'tool_list' &&
+            args &&
+            typeof args === 'object' &&
+            !Array.isArray(args) &&
+            typeof args.cursor === 'string';
+        // Cursor-backed lazy listing is owned by the internal cached catalog. Match
+        // the authoritative handler's acquisition without waiting on unrelated peers.
+        const acquisitionVisibility = toolListContinuation
+            ? { ...visibility, serverCandidates: new Map() }
+            : visibility;
+        const snapshot = await acquireRuntimeCapabilityCatalog(connections, acquisitionVisibility, {
+            serverConfigs,
+            signal,
+            internalTools: lazy
+                ? internalTools.filter((tool) => !['tool_list', 'tool_schema', 'tool_invoke'].includes(tool.name))
+                : internalTools,
+            unprefixedTools: metaTools,
+        });
+        const selected = snapshot.resolve('tools', name);
+        const definition = snapshot.getToolDefinition(name);
+        if (!selected || !definition)
+            return {
+                headerTool: undefined,
+                close: () => { },
+                async run(_operation, _additionalFence = () => true) {
+                    // An unobserved definition cannot authorize a later, freshly discovered
+                    // external provider whose declarations were never checked by the SDK.
+                    throw new ProtocolError(-32602, 'Tool definition is unavailable');
+                },
+            };
+        // The SDK accepts declarations outside the owned primitive/schema subset.
+        // An invalid declaration set disables all header projection while leaving
+        // the original admitted schema and ordinary worker validation intact.
+        const scan = scanMcpParamDeclarations(definition.tool.inputSchema);
+        const headerTool = scan.valid && scan.declarations.length > 0 ? definition.tool : undefined;
+        const assertHeaderArguments = () => {
+            if (!scan.valid)
+                return;
+            const unsafeIntegers = scan.declarations.filter((declaration) => {
+                if (declaration.type !== 'integer')
+                    return false;
+                let value = args;
+                for (const field of declaration.path) {
+                    if (!value || typeof value !== 'object' || Array.isArray(value) || !Object.hasOwn(value, field))
+                        return false;
+                    value = value[field];
+                }
+                // Fractions and wrong primitive types still follow ordinary worker
+                // schema validation. Only integral values skipped by the SDK need this guard.
+                return typeof value === 'number' && Number.isInteger(value) && !Number.isSafeInteger(value);
+            });
+            try {
+                // Reuse the owned encoder's safe-integer guard without forwarding headers.
+                createMcpParamHeaders(unsafeIntegers, args);
+            }
+            catch {
+                throw new ProtocolError(-32602, 'Header integer parameter must be a safe integer');
+            }
+        };
+        if (selected.entry.route.origin === 'internal')
+            return {
+                headerTool,
+                close: () => { },
+                async run(operation, _additionalFence = () => true) {
+                    definition.assertCurrent();
+                    assertHeaderArguments();
+                    return operation();
+                },
+            };
+        if (!selected.connection)
+            throw new ProtocolError(-32602, 'Tool definition is unavailable');
+        const { entry, connection } = selected;
+        const observer = observers.find((item) => item.connection === connection);
+        if (!observer)
+            throw new ProtocolError(-32602, 'Tool definition is unavailable');
+        const adapter = connection.adapter;
+        const configuredTarget = JSON.stringify(serverConfigs[entry.route.server]);
+        const isCurrent = () => {
+            try {
+                definition.assertCurrent();
+                return (manager.getClients().get(entry.route.connectionKey) === connection &&
+                    connection.adapter === adapter &&
+                    getCapabilityPaginationGeneration(observer.observed, 'tools') === observer.generation &&
+                    JSON.stringify(getConfiguredServerTargets()[entry.route.server]) === configuredTarget);
+            }
+            catch {
+                return false;
+            }
+        };
+        retained = observer;
+        return {
+            headerTool,
+            close: () => unregisterCapabilityPaginationConnections(observer.observed),
+            run(operation, additionalFence = () => true) {
+                assertHeaderArguments();
+                return withInteractionRoute({
+                    adapter,
+                    method: 'tools/call',
+                    identity: entry.route.upstreamIdentity,
+                    isCurrent: () => isCurrent() && additionalFence(),
+                }, operation);
+            },
+        };
+    }
+    finally {
+        for (const observer of observers) {
+            if (observer !== retained)
+                unregisterCapabilityPaginationConnections(observer.observed);
+        }
+    }
+}
+//# sourceMappingURL=modernToolHeaderRegistry.js.map

package/build/transport/http/routes/modernToolHeaderRegistry.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"modernToolHeaderRegistry.js","sourceRoot":"","sources":["../../../../src/transport/http/routes/modernToolHeaderRegistry.ts"],"names":[],"mappings":"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"}

package/build/transport/http/routes/oauthRoutes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"oauthRoutes.d.ts","sourceRoot":"","sources":["../../../../src/transport/http/routes/oauthRoutes.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,sBAAsB,EACtB,8BAA8B,EAC/B,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAI7E,OAAO,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAM3E,OAAO,EAAqC,MAAM,EAAE,MAAM,SAAS,CAAC;AAiBpE;;GAEG;AACH,wBAAgB,iBAAiB,CAC/B,aAAa,EAAE,sBAAsB,EACrC,cAAc,CAAC,EAAE,iBAAiB,EAClC,SAAS,GAAE,sBAA2F,GACrG,MAAM,CA6KR;AAED,wBAAgB,mCAAmC,CACjD,aAAa,EAAE,sBAAsB,GAAG,8BAA8B,EACtE,cAAc,CAAC,EAAE,iBAAiB,EAClC,SAAS,GAAE,sBAA2F,GACrG,MAAM,UAAU,CAAC,sBAAsB,CAAC,0BAA0B,CAAC,CAAC,CAEtE;AAED,wBAAgB,mCAAmC,CACjD,aAAa,EAAE,sBAAsB,GAAG,8BAA8B,EACtE,cAAc,CAAC,EAAE,iBAAiB,GACjC,sBAAsB,CAExB;AAuCD,eAAe,iBAAiB,CAAC"}
+{"version":3,"file":"oauthRoutes.d.ts","sourceRoot":"","sources":["../../../../src/transport/http/routes/oauthRoutes.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,sBAAsB,EACtB,8BAA8B,EAC/B,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAI7E,OAAO,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAM3E,OAAO,EAAqC,MAAM,EAAE,MAAM,SAAS,CAAC;AAiBpE;;GAEG;AACH,wBAAgB,iBAAiB,CAC/B,aAAa,EAAE,sBAAsB,EACrC,cAAc,CAAC,EAAE,iBAAiB,EAClC,SAAS,GAAE,sBAA2F,GACrG,MAAM,CA6KR;AAED,wBAAgB,mCAAmC,CACjD,aAAa,EAAE,sBAAsB,GAAG,8BAA8B,EACtE,cAAc,CAAC,EAAE,iBAAiB,EAClC,SAAS,GAAE,sBAA2F,GACrG,MAAM,UAAU,CAAC,sBAAsB,CAAC,0BAA0B,CAAC,CAAC,CAEtE;AAED,wBAAgB,mCAAmC,CACjD,aAAa,EAAE,sBAAsB,GAAG,8BAA8B,EACtE,cAAc,CAAC,EAAE,iBAAiB,GACjC,sBAAsB,CAExB;AA2CD,eAAe,iBAAiB,CAAC"}

package/build/transport/http/routes/oauthRoutes.js

@@ -62,7 +62,7 @@ export function createOAuthRoutes(oauthProvider, loadingManager, oauthFlow = cre
             res.status(500).json(errorResponse);
         }
         catch (error) {
-            logger.error(`Error starting OAuth for ${req.params.serverName}:`, error);
+            logger.error('oauthRoutes.error.starting.oauth.for.88e8a703', { error: error });
             const errorResponse = { error: 'Failed to start OAuth flow' };
             res.status(500).json(errorResponse);
         }
@@ -92,7 +92,7 @@ export function createOAuthRoutes(oauthProvider, loadingManager, oauthFlow = cre
                 ...callback,
             });
             if (result.status !== 'completed') {
-                logger.error(`OAuth callback failed for ${serverName}:`, result.errorDescription);
+                logger.error('oauthRoutes.oauth.callback.failed.for.e5feb0e3');
                 const errorCode = result.status === 'provider_error' && result.errorDescription === 'access_denied'
                     ? 'access_denied'
                     : result.status;
@@ -102,8 +102,8 @@ export function createOAuthRoutes(oauthProvider, loadingManager, oauthFlow = cre
             // Redirect back to dashboard with success
             res.redirect(result.adminReturnOrigin ? `${result.adminReturnOrigin}/oauth/return?success=1` : '/admin/oauth?success=1');
         }
-        catch (error) {
-            logger.error(`Error handling OAuth callback for ${serverName}:`, error);
+        catch {
+            logger.error('oauthRoutes.error.handling.oauth.callback.for.41be0569');
             res.redirect('/admin/oauth?error=callback_failed');
         }
     });
@@ -127,7 +127,7 @@ export function createOAuthRoutes(oauthProvider, loadingManager, oauthFlow = cre
             res.status(500).json(errorResponse);
         }
         catch (error) {
-            logger.error(`Error restarting OAuth for ${serverName}:`, error);
+            logger.error('oauthRoutes.error.restarting.oauth.for.c39e1d9b', { error: error });
             const errorResponse = { error: 'Failed to restart OAuth flow' };
             res.status(500).json(errorResponse);
         }
@@ -161,7 +161,7 @@ export function createOAuthRoutes(oauthProvider, loadingManager, oauthFlow = cre
                 });
                 return;
             }
-            logger.error('Error handling consent form:', error);
+            logger.error('oauthRoutes.error.handling.consent.form.3b43829f', { error: error });
             const errorResponse = {
                 error: 'server_error',
                 error_description: 'Internal server error',
@@ -186,7 +186,9 @@ function getOAuthFlow(oauthProvider, loadingManager) {
             getClients: () => ServerManager.current.getClients(),
         },
         clientRuntime: {
-            initiateOAuth: (serverName) => ClientManager.getOrCreateInstance().initiateOAuth(serverName),
+            bindOAuthReturn: (serverName, state, origin) => ClientManager.getOrCreateInstance().bindOAuthReturn(serverName, state, origin),
+            getOAuthReturn: (serverName, state) => ClientManager.getOrCreateInstance().getOAuthReturn(serverName, state),
+            initiateOAuth: (serverName, options) => ClientManager.getOrCreateInstance().initiateOAuth(serverName, options),
             completeOAuthAndReconnect: (serverName, authorizationCode) => ClientManager.getOrCreateInstance().completeOAuthAndReconnect(serverName, authorizationCode),
         },
         loadingRuntime: loadingManager
@@ -194,10 +196,10 @@ function getOAuthFlow(oauthProvider, loadingManager) {
                 markReady: (serverName) => {
                     try {
                         loadingManager.getStateTracker().updateServerState(serverName, LoadingState.Ready);
-                        logger.debug(`Updated LoadingStateTracker: ${serverName} is now Ready after OAuth completion`);
+                        logger.debug('oauthRoutes.updated.loadingstatetracker.is.now.ready.after.oauth.completion.83008138');
                     }
                     catch (stateError) {
-                        logger.warn(`Could not update LoadingStateTracker for ${serverName}`, { error: stateError });
+                        logger.warn('oauthRoutes.could.not.update.loadingstatetracker.for.2da895a0', { error: stateError });
                     }
                 },
             }
@@ -208,6 +210,7 @@ function getOAuthFlow(oauthProvider, loadingManager) {
             oauthTokenTtlMs: agentConfig.get('auth').oauthTokenTtlMs,
         }),
         getAvailableTags: () => [],
+        getResourceUrl: () => agentConfig.getUrl(),
     });
 }
 // Export the factory function as default

package/build/transport/http/routes/oauthRoutes.js.map

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

package/build/transport/http/routes/streamableHttpRoutes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"streamableHttpRoutes.d.ts","sourceRoot":"","sources":["../../../../src/transport/http/routes/streamableHttpRoutes.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,wBAAwB,EAAE,MAAM,oDAAoD,CAAC;AAC9F,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAUlE,OAAO,EAAE,2BAA2B,EAAE,MAAM,4DAA4D,CAAC;AACzG,OAAO,EAAE,0BAA0B,EAA2B,MAAM,mDAAmD,CAAC;AASxH,OAAO,EAAW,cAAc,EAAY,MAAM,EAAE,MAAM,SAAS,CAAC;AAuJpE,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,aAAa,EAC5B,iBAAiB,EAAE,2BAA2B,EAC9C,cAAc,EAAE,cAAc,EAC9B,sBAAsB,CAAC,EAAE,cAAc,EACvC,iBAAiB,CAAC,EAAE,wBAAwB,EAC5C,cAAc,CAAC,EAAE,MAAM,EACvB,iBAAiB,CAAC,EAAE,0BAA0B,GAC7C,IAAI,CAyIN"}
+{"version":3,"file":"streamableHttpRoutes.d.ts","sourceRoot":"","sources":["../../../../src/transport/http/routes/streamableHttpRoutes.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,wBAAwB,EAAE,MAAM,oDAAoD,CAAC;AAC9F,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAUlE,OAAO,EAAE,2BAA2B,EAAE,MAAM,4DAA4D,CAAC;AACzG,OAAO,EAAE,0BAA0B,EAA2B,MAAM,mDAAmD,CAAC;AAMxH,OAAO,EAAW,cAAc,EAAY,MAAM,EAAE,MAAM,SAAS,CAAC;AA8IpE,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,aAAa,EAC5B,iBAAiB,EAAE,2BAA2B,EAC9C,cAAc,EAAE,cAAc,EAC9B,sBAAsB,CAAC,EAAE,cAAc,EACvC,iBAAiB,CAAC,EAAE,wBAAwB,EAC5C,cAAc,CAAC,EAAE,MAAM,EACvB,iBAAiB,CAAC,EAAE,0BAA0B,GAC7C,IAAI,CAwIN"}

package/build/transport/http/routes/streamableHttpRoutes.js

@@ -5,7 +5,7 @@ import tagsExtractor from '../middlewares/tagsExtractor.js';
 import { StreamableSessionLifecycle, StreamableSessionStatus } from '../streamableSessionLifecycle.js';
 import { extractTemplateContextRequest } from '../utils/contextExtractor.js';
 import { sendBadRequest, sendInternalError, sendNotFound } from '../utils/httpErrorHandler.js';
-import { authorizeRequestTemplateContext, redactTemplateContextBodyForLogging, } from '../utils/templateContextAuthority.js';
+import { authorizeRequestTemplateContext } from '../utils/templateContextAuthority.js';
 import { logError, logWarn } from '../utils/unifiedLogger.js';
 /**
  * Type guard to check if a request body is an initialize request.
@@ -30,11 +30,8 @@ function extractProtocolVersion(body) {
         }
         return null;
     }
-    catch (error) {
-        logWarn('Failed to extract protocol version from request body', {
-            reason: 'Request body structure incompatible',
-            context: { error },
-        });
+    catch (_error) {
+        logWarn('streamableHttpRoutes.failed.to.extract.protocol.version.from.request.body.3edac56e');
         return null;
     }
 }
@@ -46,25 +43,19 @@ function wrapResponseForLogging(req, res, sessionId) {
     const originalStatus = res.status.bind(res);
     const originalJson = res.json.bind(res);
     let logged = false;
-    const logIfNeeded = (responseBody) => {
+    const logIfNeeded = (_responseBody) => {
         if (logged || res.statusCode < 400)
             return;
         logged = true;
         const level = res.statusCode >= 500 ? 'error' : 'warn';
         const logFn = level === 'error' ? logError : logWarn;
-        logFn(`HTTP error ${res.statusCode}`, {
+        logFn('http.response-error', {
             method: req.method,
-            path: req.path,
             sessionId,
             statusCode: res.statusCode,
-            reason: 'SDK request validation failed',
         });
         // Log request/response details at debug level for troubleshooting
-        logger.debug('SDK error details', {
-            sessionId,
-            requestBody: redactTemplateContextBodyForLogging(req.body),
-            responseBody,
-        });
+        logger.debug('streamableHttpRoutes.sdk.error.details.0633179d', { sessionId: sessionId });
     };
     // Intercept res.status() to detect when error codes are set
     res.status = function (code) {
@@ -125,7 +116,7 @@ function setupDisconnectDetection(req, res, sessionId, lifecycle) {
     });
     const cleanupTransport = () => {
         if (!responseClosed && !res.writableEnded) {
-            logger.debug(`Client disconnected for session ${sessionId}, cleaning up transport`);
+            logger.debug('streamableHttpRoutes.client.disconnected.for.session.cleaning.up.transport.eca47590');
             void lifecycle.handleAbnormalDisconnect(sessionId);
         }
     };
@@ -166,16 +157,15 @@ export function setupStreamableHttpRoutes(router, serverManager, sessionReposito
                 return;
             }
             if ('persisted' in result && !result.persisted) {
-                logger.warn(`New session ${result.sessionId} was created but not persisted: ${result.persistenceError}`);
+                logger.warn('streamableHttpRoutes.new.session.was.created.but.not.persisted.c1345354');
             }
             const actualSessionId = result.sessionId;
             const transport = result.transport;
             const wrappedRes = wrapResponseForLogging(req, res, actualSessionId);
             const protocolVersion = isInitialize ? extractProtocolVersion(req.body) : null;
             if ('isRestored' in transport && typeof transport.isRestored === 'function' && transport.isRestored()) {
-                logger.debug('Handling request for restored session', {
+                logger.debug('streamableHttpRoutes.handling.request.for.restored.session.3031f880', {
                     sessionId: actualSessionId,
-                    isInitialize,
                     method: req.body?.method,
                 });
             }
@@ -187,10 +177,10 @@ export function setupStreamableHttpRoutes(router, serverManager, sessionReposito
                         capabilities: {},
                         serverInfo: { name: MCP_SERVER_NAME, version: MCP_SERVER_VERSION },
                     });
-                    logger.debug(`Stored initialize response for session ${actualSessionId}`);
+                    logger.debug('streamableHttpRoutes.stored.initialize.response.for.session.9fcc1c4d');
                 }
                 catch (err) {
-                    logger.warn(`Failed to store initialize response for ${actualSessionId}:`, err);
+                    logger.warn('streamableHttpRoutes.failed.to.store.initialize.response.for.92e5cefc', { error: err });
                 }
             }
         }

package/build/transport/http/routes/streamableHttpRoutes.js.map

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

package/build/transport/http/routes/toolRoutes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"toolRoutes.d.ts","sourceRoot":"","sources":["../../../../src/transport/http/routes/toolRoutes.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAYlE,OAAO,EAAW,cAAc,EAAY,MAAM,SAAS,CAAC;AA2H5D,wBAAgB,kBAAkB,CAAC,aAAa,EAAE,aAAa,GAAG,cAAc,CA8F/E;AAOD,wBAAgB,4BAA4B,CAAC,aAAa,EAAE,aAAa,GAAG,cAAc,CA8NzF"}
+{"version":3,"file":"toolRoutes.d.ts","sourceRoot":"","sources":["../../../../src/transport/http/routes/toolRoutes.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAYlE,OAAO,EAAW,cAAc,EAAY,MAAM,SAAS,CAAC;AA8I5D,wBAAgB,kBAAkB,CAAC,aAAa,EAAE,aAAa,GAAG,cAAc,CAkG/E;AAOD,wBAAgB,4BAA4B,CAAC,aAAa,EAAE,aAAa,GAAG,cAAc,CA8NzF"}

package/build/transport/http/routes/toolRoutes.js

@@ -67,8 +67,8 @@ async function createFallbackCapabilityCatalog(serverManager) {
             const tags = conn.tags;
             registryTools.push(...(result.tools ?? []).map((tool) => ({ tool, server: logicalServerName, connectionKey, tags })));
         }
-        catch (err) {
-            logger.error('Failed to list tools', { failure: gatewayFailureFromUnknown(err, 'transport') });
+        catch (_err) {
+            logger.error('toolRoutes.failed.to.list.tools.736c81c7', { error: _err });
             degradedServers.push(connectionKey);
         }
     }
@@ -91,6 +91,19 @@ function hasCatalogAccess(lazyOrchestrator) {
         typeof lazyOrchestrator.getToolRegistry === 'function' &&
         typeof lazyOrchestrator.getSchemaCache === 'function');
 }
+function recoveryRefreshCallback(orchestrator) {
+    if (orchestrator.refreshCapabilitiesForRecovery) {
+        return async () => {
+            await orchestrator.refreshCapabilitiesForRecovery();
+        };
+    }
+    if (orchestrator.refreshCapabilities) {
+        return async () => {
+            await orchestrator.refreshCapabilities();
+        };
+    }
+    return undefined;
+}
 export function createToolsHandler(serverManager) {
     return async (req, res) => {
         try {
@@ -115,6 +128,7 @@ export function createToolsHandler(serverManager) {
                     totalCount: result.totalCount,
                     hasMore: result.hasMore,
                     ...(result.nextCursor ? { nextCursor: result.nextCursor } : {}),
+                    ...(result._meta ? { _meta: result._meta } : {}),
                     servers: result.servers,
                     ...(degradedServers.length > 0 ? { degradedServers } : {}),
                 });
@@ -128,19 +142,21 @@ export function createToolsHandler(serverManager) {
                     outboundConnections: serverManager.getClients(),
                     getServerConfigs,
                     templateHashProvider: getTemplateHashProvider(serverManager),
+                    refreshCapabilities: recoveryRefreshCallback(lazyOrchestrator),
                 });
                 const catalogResult = await catalog.listVisibleTools({
                     server,
                     pattern,
                     limit,
                     cursor,
-                }, visibility);
-                if (catalogResult.tools.length > 0 || catalogResult.totalCount > 0) {
+                }, visibility, !cursor && (await catalog.requiresToolListingRecovery(visibility)) ? { refreshIntent: 'force' } : {});
+                if (catalogResult.tools.length > 0 || catalogResult.totalCount > 0 || catalogResult._meta) {
                     res.json({
                         tools: catalogResult.tools,
                         totalCount: catalogResult.totalCount,
                         hasMore: catalogResult.hasMore,
                         ...(catalogResult.nextCursor ? { nextCursor: catalogResult.nextCursor } : {}),
+                        ...(catalogResult._meta ? { _meta: catalogResult._meta } : {}),
                         servers: catalogResult.servers,
                     });
                     return;
@@ -165,8 +181,8 @@ export function createToolsHandler(serverManager) {
             }
             res.json(result);
         }
-        catch (error) {
-            logger.error('API tools handler error', { failure: gatewayFailureFromUnknown(error) });
+        catch (_error) {
+            logger.error('toolRoutes.api.tools.handler.error.92efa583', { error: _error });
             res.status(500).json({ error: 'Internal server error' });
         }
     };
@@ -278,7 +294,7 @@ export function createToolInvocationsHandler(serverManager) {
                             message: error.code,
                         })
                         : gatewayFailureFromUnknown(error, 'transport');
-                    logger.error('Direct tool invocation error', { failure });
+                    logger.error('toolRoutes.direct.tool.invocation.error.ba32e1c5', { error: error });
                     const problem = gatewayFailureToProblem(failure);
                     const status = error instanceof SchemaBoundaryError
                         ? schemaFailureStatus(error.code, error.phase === 'input' ? 'validation' : 'upstream')
@@ -360,8 +376,8 @@ export function createToolInvocationsHandler(serverManager) {
             }
             res.json(result);
         }
-        catch (error) {
-            logger.error('API tool-invocations handler error', { failure: gatewayFailureFromUnknown(error) });
+        catch (_error) {
+            logger.error('toolRoutes.api.tool.invocations.handler.error.398a77aa', { error: _error });
             res.status(500).json({ error: 'Internal server error' });
         }
         finally {