@1mcp/agent 0.37.0 → 0.38.1

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

@@ -0,0 +1,241 @@
+import { createMcpHandler, hostHeaderValidationResponse, isLegacyRequest, originValidationResponse, ProtocolError, Server, } from '@modelcontextprotocol/server';
+import { randomUUID } from 'node:crypto';
+import { Readable } from 'node:stream';
+import { pipeline } from 'node:stream/promises';
+import { MCP_SERVER_NAME, MCP_SERVER_VERSION, STREAMABLE_HTTP_ENDPOINT } from '../../../constants.js';
+import { ModernInboundEraAdapter } from '../../../gateway/adapters/modern/modernInboundEraAdapter.js';
+import { createEffectiveRequestAuthority } from '../../../gateway/contracts/effectiveRequestAuthority.js';
+import { gatewayOperationSchema } from '../../../gateway/contracts/gatewayRequest.js';
+import { MODERN_PROTOCOL_REVISION } from '../../../gateway/contracts/protocolEra.js';
+import { GatewayDispatcher } from '../../../gateway/core/gatewayDispatcher.js';
+import { GatewaySession } from '../../../gateway/core/gatewaySession.js';
+import { getPresetName, getTagExpression, getTagFilterMode, getTagQuery, getValidatedTags, } from '../middlewares/scopeAuthMiddleware.js';
+const DEFAULT_MODERN_REQUEST_TIMEOUT_MS = 60_000;
+function buildConfig(req, res) {
+    return {
+        tags: getValidatedTags(res),
+        tagExpression: getTagExpression(res),
+        tagFilterMode: getTagFilterMode(res),
+        tagQuery: getTagQuery(res),
+        presetName: getPresetName(res),
+        enablePagination: req.query.pagination === 'true',
+    };
+}
+function isFrameRecord(value) {
+    return value !== null && typeof value === 'object' && !Array.isArray(value);
+}
+function stripInboundRequestMeta(params) {
+    if (params === null ||
+        typeof params !== 'object' ||
+        Array.isArray(params) ||
+        !Object.prototype.hasOwnProperty.call(params, '_meta')) {
+        return params;
+    }
+    const { _meta: _untrustedMeta, ...businessParams } = params;
+    return businessParams;
+}
+function webRequest(req, signal) {
+    const headers = new Headers();
+    for (const [name, value] of Object.entries(req.headers)) {
+        if (Array.isArray(value))
+            value.forEach((item) => headers.append(name, item));
+        else if (value !== undefined)
+            headers.set(name, value);
+    }
+    // Admission checks the original Host header; URL construction must not trust it.
+    return new globalThis.Request(`http://localhost${req.originalUrl}`, {
+        method: req.method,
+        headers,
+        body: req.method === 'POST' ? JSON.stringify(req.body) : undefined,
+        signal,
+    });
+}
+async function modernAdmission(req, _res, next) {
+    if (req.get('mcp-protocol-version') === MODERN_PROTOCOL_REVISION) {
+        next();
+        return;
+    }
+    if (await isLegacyRequest(webRequest(req), req.body))
+        next('route');
+    else
+        next();
+}
+function gatewayFailureError(failure) {
+    const numericCode = Number(failure.code);
+    const fallback = failure.kind === 'authorization'
+        ? -32_001
+        : failure.kind === 'deadline-exceeded'
+            ? -32_008
+            : failure.kind === 'invalid-request' || failure.kind === 'protocol'
+                ? -32_602
+                : -32_603;
+    return new ProtocolError(Number.isSafeInteger(numericCode) ? numericCode : fallback, failure.message, failure.data);
+}
+async function dispatchGateway(method, params, signal, serverManager, config, createBridge, deadlineUnixMs) {
+    signal.throwIfAborted();
+    const bridge = await createBridge(serverManager, config);
+    const dispatcher = new GatewayDispatcher({
+        resolveOutbound: (id) => (id === bridge.targetConnectionId ? bridge.outbound : undefined),
+    });
+    const session = new GatewaySession(dispatcher);
+    const correlationId = randomUUID();
+    let delivered = false;
+    let cancellationDelivered = false;
+    let settle;
+    const settled = new Promise((resolve) => {
+        settle = resolve;
+    });
+    const abort = () => settle('cancel');
+    signal.addEventListener('abort', abort, { once: true });
+    try {
+        signal.throwIfAborted();
+        return await new Promise((resolve, reject) => {
+            const inbound = new ModernInboundEraAdapter({
+                revision: MODERN_PROTOCOL_REVISION,
+                receive: async () => {
+                    if (!delivered) {
+                        delivered = true;
+                        return { type: 'request', correlationId, operation: method, params: stripInboundRequestMeta(params) };
+                    }
+                    const state = await settled;
+                    if (state === 'cancel' && !cancellationDelivered) {
+                        cancellationDelivered = true;
+                        return { type: 'cancel', correlationId };
+                    }
+                    return undefined;
+                },
+                requestContext: () => ({
+                    requestId: `modern-${randomUUID()}`,
+                    targetConnectionId: bridge.targetConnectionId,
+                    authority: createEffectiveRequestAuthority({
+                        connectionIds: [bridge.targetConnectionId],
+                        provenance: ['authenticated-http-admission'],
+                    }),
+                    outbound: bridge.outbound.pin,
+                    deadlineUnixMs,
+                }),
+                respond: async (frame) => {
+                    if (isFrameRecord(frame) && frame.type === 'success')
+                        resolve(frame.result);
+                    else if (isFrameRecord(frame) && frame.type === 'failure') {
+                        reject(gatewayFailureError(frame.failure));
+                    }
+                    else
+                        reject(new ProtocolError(-32_603, 'Invalid gateway response'));
+                    settle('done');
+                },
+            });
+            void session.run(inbound).catch((error) => {
+                reject(typeof error === 'object' && error !== null && 'kind' in error
+                    ? gatewayFailureError(error)
+                    : error);
+            });
+        });
+    }
+    finally {
+        settle('done');
+        signal.removeEventListener('abort', abort);
+        await bridge.close();
+    }
+}
+export function bindDisconnectAbort(req, res) {
+    const controller = new AbortController();
+    const abort = () => controller.abort();
+    req.once('aborted', abort);
+    res.once('close', abort);
+    req.socket?.once('close', abort);
+    let cleaned = false;
+    return {
+        controller,
+        cleanup: () => {
+            if (cleaned)
+                return;
+            cleaned = true;
+            req.removeListener('aborted', abort);
+            res.removeListener('close', abort);
+            req.socket?.removeListener('close', abort);
+        },
+    };
+}
+export async function writeWebResponse(response, res) {
+    res.status(response.status);
+    response.headers.forEach((value, name) => res.setHeader(name, value));
+    if (!response.body) {
+        res.end();
+        return;
+    }
+    const source = Readable.fromWeb(response.body);
+    let sourceFailedWhileConnected = false;
+    source.once('error', () => {
+        // pipeline destroys the response for source failures too; retain their origin.
+        sourceFailedWhileConnected = !res.destroyed;
+    });
+    try {
+        await pipeline(source, res);
+    }
+    catch (error) {
+        if (sourceFailedWhileConnected ||
+            !res.destroyed ||
+            !(error instanceof Error) ||
+            !('code' in error) ||
+            error.code !== 'ERR_STREAM_PREMATURE_CLOSE') {
+            throw error;
+        }
+    }
+}
+export function setupModernHttpRoutes(router, serverManager, middlewares, createBridge, requestPolicy, requestTimeoutMs = DEFAULT_MODERN_REQUEST_TIMEOUT_MS) {
+    const rejectUnsupportedTransportMethod = async (req, res) => {
+        const request = webRequest(req);
+        const rejected = (!requestPolicy.allowsHost(req.get('host')) ? hostHeaderValidationResponse(request, []) : undefined) ??
+            (!requestPolicy.allowsOrigin(req.get('origin'), req.get('host'))
+                ? originValidationResponse(request, [])
+                : undefined);
+        if (rejected) {
+            await writeWebResponse(rejected, res);
+            return;
+        }
+        const handler = createMcpHandler(() => new Server({ name: MCP_SERVER_NAME, version: MCP_SERVER_VERSION }, { capabilities: { tools: {} } }), { legacy: 'reject' });
+        try {
+            await writeWebResponse(await handler.fetch(request), res);
+        }
+        finally {
+            await handler.close();
+        }
+    };
+    router.get(STREAMABLE_HTTP_ENDPOINT, modernAdmission, ...middlewares, rejectUnsupportedTransportMethod);
+    router.delete(STREAMABLE_HTTP_ENDPOINT, modernAdmission, ...middlewares, rejectUnsupportedTransportMethod);
+    router.post(STREAMABLE_HTTP_ENDPOINT, modernAdmission, ...middlewares, async (req, res) => {
+        const disconnect = bindDisconnectAbort(req, res);
+        try {
+            const request = webRequest(req, disconnect.controller.signal);
+            const rejected = (!requestPolicy.allowsHost(req.get('host')) ? hostHeaderValidationResponse(request, []) : undefined) ??
+                (!requestPolicy.allowsOrigin(req.get('origin'), req.get('host'))
+                    ? originValidationResponse(request, [])
+                    : undefined);
+            if (rejected) {
+                await writeWebResponse(rejected, res);
+                return;
+            }
+            const config = buildConfig(req, res);
+            const accepted = (req.get('accept') ?? '').split(',').map((value) => value.trim());
+            const responseMode = accepted.includes('text/event-stream') && !accepted.includes('application/json') ? 'sse' : 'auto';
+            const handler = createMcpHandler(() => {
+                const server = new Server({ name: MCP_SERVER_NAME, version: MCP_SERVER_VERSION }, { capabilities: { tools: {}, prompts: {}, resources: {}, completions: {} } });
+                for (const operation of gatewayOperationSchema.options) {
+                    server.setRequestHandler(operation, async (message, context) => (await dispatchGateway(operation, message.params, context.mcpReq.signal, serverManager, config, createBridge, Date.now() + requestTimeoutMs)));
+                }
+                return server;
+            }, { legacy: 'reject', responseMode });
+            try {
+                await writeWebResponse(await handler.fetch(request, { parsedBody: req.body }), res);
+            }
+            finally {
+                await handler.close();
+            }
+        }
+        finally {
+            disconnect.cleanup();
+        }
+    });
+}
+//# sourceMappingURL=modernHttpRoutes.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"modernHttpRoutes.js","sourceRoot":"","sources":["../../../../src/transport/http/routes/modernHttpRoutes.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;AAUpE;;GAEG;AACH,wBAAgB,iBAAiB,CAC/B,aAAa,EAAE,sBAAsB,EACrC,cAAc,CAAC,EAAE,iBAAiB,EAClC,SAAS,GAAE,sBAA2F,GACrG,MAAM,CAsJR;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;AAuCD,eAAe,iBAAiB,CAAC"}

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

@@ -5,7 +5,7 @@ import { LoadingState } from '../../../core/loading/loadingStateTracker.js';
 import { AgentConfigManager } from '../../../core/server/agentConfig.js';
 import { ServerManager } from '../../../core/server/serverManager.js';
 import logger from '../../../logger/logger.js';
-import { sensitiveOperationLimiter } from '../../../transport/http/middlewares/securityMiddleware.js';
+import { sensitiveOperationLimiter } from '../middlewares/securityMiddleware.js';
 import { Router } from 'express';
 import rateLimit from 'express-rate-limit';
 import { z } from 'zod';
@@ -14,6 +14,12 @@ const consentBodySchema = z.object({
     action: z.string().min(1).optional(),
     scopes: z.union([z.string(), z.array(z.string())]).optional(),
 });
+const callbackQuerySchema = z.object({
+    code: z.string().optional(),
+    error: z.string().optional(),
+    iss: z.string().optional(),
+    state: z.string().max(1024).optional(),
+});
 /**
  * Creates OAuth routes with the provided OAuth provider
  */
@@ -65,22 +71,36 @@ export function createOAuthRoutes(oauthProvider, loadingManager, oauthFlow = cre
     /**
      * Handle OAuth callback and trigger reconnection
      */
+    // Commit a document on the initiating site before navigating to the Strict-cookie Admin session.
+    router.get('/return', (req, res) => {
+        const errors = ['access_denied', 'provider_error', 'missing_code', 'callback_failed', 'runtime_unavailable'];
+        const error = typeof req.query.error === 'string' && errors.includes(req.query.error) ? req.query.error : 'callback_failed';
+        const path = req.query.success === '1' ? '/admin/oauth?success=1' : `/admin/oauth?error=${error}`;
+        res.setHeader('Cache-Control', 'no-store');
+        res.setHeader('Referrer-Policy', 'no-referrer');
+        res.setHeader('Content-Security-Policy', "default-src 'none'; base-uri 'none'; frame-ancestors 'none'");
+        res
+            .type('html')
+            .send(`<!doctype html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="refresh" content="0;url=${path}"><title>Returning to Admin Console</title></head><body><a href="${path}">Continue to Admin Console</a></body></html>`);
+    });
     router.get('/callback/:serverName', async (req, res) => {
         const { serverName } = req.params;
-        const { code, error } = req.query;
         try {
+            const callback = callbackQuerySchema.parse(req.query);
             const result = await oauthFlow.completeBackendOAuthCallback({
                 serverName,
-                code: code ? String(code) : undefined,
-                error: error ? String(error) : undefined,
+                ...callback,
             });
             if (result.status !== 'completed') {
                 logger.error(`OAuth callback failed for ${serverName}:`, result.errorDescription);
-                const errorCode = result.status === 'provider_error' ? result.errorDescription : result.status;
-                return res.redirect(`/admin/oauth?error=${encodeURIComponent(errorCode)}`);
+                const errorCode = result.status === 'provider_error' && result.errorDescription === 'access_denied'
+                    ? 'access_denied'
+                    : result.status;
+                const path = `/admin/oauth?error=${errorCode}`;
+                return res.redirect(result.adminReturnOrigin ? `${result.adminReturnOrigin}/oauth/return?error=${errorCode}` : path);
             }
             // Redirect back to dashboard with success
-            res.redirect('/admin/oauth?success=1');
+            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);
@@ -166,7 +186,7 @@ function getOAuthFlow(oauthProvider, loadingManager) {
             getClients: () => ServerManager.current.getClients(),
         },
         clientRuntime: {
-            createClientInstance: () => ClientManager.getOrCreateInstance().createClientInstance(),
+            initiateOAuth: (serverName) => ClientManager.getOrCreateInstance().initiateOAuth(serverName),
             completeOAuthAndReconnect: (serverName, authorizationCode) => ClientManager.getOrCreateInstance().completeOAuthAndReconnect(serverName, authorizationCode),
         },
         loadingRuntime: loadingManager

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/sseRoutes.d.ts

@@ -1,5 +1,2 @@
-import { AsyncLoadingOrchestrator } from '../../../core/capabilities/asyncLoadingOrchestrator.js';
-import { ServerManager } from '../../../core/server/serverManager.js';
-import { RequestHandler, Router } from 'express';
-export declare function setupSseRoutes(router: Router, serverManager: ServerManager, authMiddleware: RequestHandler, availabilityMiddleware?: RequestHandler, asyncOrchestrator?: AsyncLoadingOrchestrator, customTemplate?: string): void;
+export * from '../../../sdk/legacy/transport/http/routes/sseRoutes.js';
 //# sourceMappingURL=sseRoutes.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"sseRoutes.d.ts","sourceRoot":"","sources":["../../../../src/transport/http/routes/sseRoutes.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,wBAAwB,EAAE,MAAM,oDAAoD,CAAC;AAC9F,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAalE,OAAO,EAAW,cAAc,EAAY,MAAM,EAAE,MAAM,SAAS,CAAC;AAEpE,wBAAgB,cAAc,CAC5B,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,aAAa,EAC5B,cAAc,EAAE,cAAc,EAC9B,sBAAsB,CAAC,EAAE,cAAc,EACvC,iBAAiB,CAAC,EAAE,wBAAwB,EAC5C,cAAc,CAAC,EAAE,MAAM,GACtB,IAAI,CA6GN"}
+{"version":3,"file":"sseRoutes.d.ts","sourceRoot":"","sources":["../../../../src/transport/http/routes/sseRoutes.ts"],"names":[],"mappings":"AAAA,cAAc,oDAAoD,CAAC"}

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

@@ -1,110 +1,2 @@
-import { SSEServerTransport } from '@modelcontextprotocol/sdk/server/sse.js';
-import { ErrorCode } from '@modelcontextprotocol/sdk/types.js';
-import { MESSAGES_ENDPOINT, SSE_ENDPOINT } from '../../../constants.js';
-import { ServerStatus } from '../../../core/types/index.js';
-import logger from '../../../logger/logger.js';
-import { LoggingSSEServerTransport } from '../../../transport/http/loggingSseTransport.js';
-import { getPresetName, getTagExpression, getTagFilterMode, getTagQuery, getValidatedTags, } from '../../../transport/http/middlewares/scopeAuthMiddleware.js';
-import tagsExtractor from '../../../transport/http/middlewares/tagsExtractor.js';
-export function setupSseRoutes(router, serverManager, authMiddleware, availabilityMiddleware, asyncOrchestrator, customTemplate) {
-    const middlewares = [tagsExtractor, authMiddleware];
-    // Add availability middleware if provided
-    if (availabilityMiddleware) {
-        middlewares.push(availabilityMiddleware);
-    }
-    router.get(SSE_ENDPOINT, ...middlewares, async (req, res) => {
-        try {
-            const transport = new LoggingSSEServerTransport(MESSAGES_ENDPOINT, res);
-            // Use validated tags and tag expression from scope auth middleware
-            const tags = getValidatedTags(res);
-            const tagExpression = getTagExpression(res);
-            const tagFilterMode = getTagFilterMode(res);
-            const tagQuery = getTagQuery(res);
-            const presetName = getPresetName(res);
-            // Connect the transport using the server manager
-            await serverManager.connectTransport(transport, transport.sessionId, {
-                tags,
-                tagExpression,
-                tagFilterMode,
-                tagQuery,
-                presetName,
-                enablePagination: req.query.pagination === 'true',
-                customTemplate,
-            });
-            // Initialize notifications for async loading if enabled
-            if (asyncOrchestrator) {
-                const inboundConnection = serverManager.getServer(transport.sessionId);
-                if (inboundConnection) {
-                    asyncOrchestrator.initializeNotifications(inboundConnection);
-                    logger.debug(`Async loading notifications initialized for SSE session ${transport.sessionId}`);
-                }
-            }
-            // Set up heartbeat to detect disconnected clients
-            const heartbeatInterval = setInterval(() => {
-                try {
-                    // Send a comment as heartbeat (SSE clients ignore comments)
-                    res.write(': heartbeat\n\n');
-                }
-                catch (_error) {
-                    // If write fails, the connection is likely broken
-                    logger.debug(`SSE heartbeat failed for session ${transport.sessionId}, closing connection`);
-                    clearInterval(heartbeatInterval);
-                    serverManager.disconnectTransport(transport.sessionId);
-                }
-            }, 30000); // Send heartbeat every 30 seconds
-            transport.onclose = () => {
-                clearInterval(heartbeatInterval);
-                serverManager.disconnectTransport(transport.sessionId);
-                // Note: ServerManager already logs the disconnection
-            };
-            transport.onerror = (error) => {
-                clearInterval(heartbeatInterval);
-                logger.error(`SSE transport error for session ${transport.sessionId}:`, error);
-                const server = serverManager.getServer(transport.sessionId);
-                if (server) {
-                    server.status = ServerStatus.Error;
-                    server.lastError = error instanceof Error ? error : new Error(String(error));
-                }
-            };
-        }
-        catch (error) {
-            logger.error('SSE connection error:', error);
-            res.status(500).end();
-        }
-    });
-    router.post(MESSAGES_ENDPOINT, ...middlewares, async (req, res) => {
-        try {
-            const sessionId = req.query.sessionId;
-            if (!sessionId) {
-                res.status(400).json({
-                    error: {
-                        code: ErrorCode.InvalidParams,
-                        message: 'Invalid params: sessionId is required',
-                    },
-                });
-                return;
-            }
-            const transport = serverManager.getTransport(sessionId);
-            if (transport instanceof SSEServerTransport) {
-                await transport.handlePostMessage(req, res, req.body);
-                return;
-            }
-            res.status(404).json({
-                error: {
-                    code: ErrorCode.InvalidParams,
-                    message: 'Transport not found',
-                },
-            });
-        }
-        catch (error) {
-            logger.error('Message handling error:', error);
-            res.status(500).json({
-                error: {
-                    code: ErrorCode.InternalError,
-                    message: 'Internal server error',
-                },
-            });
-        }
-    });
-}
+export * from '../../../sdk/legacy/transport/http/routes/sseRoutes.js';
 //# sourceMappingURL=sseRoutes.js.map

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

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

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

@@ -1,7 +1,7 @@
 import { AsyncLoadingOrchestrator } from '../../../core/capabilities/asyncLoadingOrchestrator.js';
 import { ServerManager } from '../../../core/server/serverManager.js';
-import { StreamableSessionRepository } from '../../../transport/http/storage/streamableSessionRepository.js';
-import { StreamableSessionLifecycle } from '../../../transport/http/streamableSessionLifecycle.js';
+import { StreamableSessionRepository } from '../storage/streamableSessionRepository.js';
+import { StreamableSessionLifecycle } from '../streamableSessionLifecycle.js';
 import { RequestHandler, Router } from 'express';
 export declare function setupStreamableHttpRoutes(router: Router, serverManager: ServerManager, sessionRepository: StreamableSessionRepository, authMiddleware: RequestHandler, availabilityMiddleware?: RequestHandler, asyncOrchestrator?: AsyncLoadingOrchestrator, customTemplate?: string, injectedLifecycle?: StreamableSessionLifecycle): void;
 //# sourceMappingURL=streamableHttpRoutes.d.ts.map

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

@@ -1,12 +1,12 @@
 import { MCP_SERVER_NAME, MCP_SERVER_VERSION, STREAMABLE_HTTP_ENDPOINT } from '../../../constants.js';
 import logger from '../../../logger/logger.js';
-import { getPresetName, getTagExpression, getTagFilterMode, getTagQuery, getValidatedTags, } from '../../../transport/http/middlewares/scopeAuthMiddleware.js';
-import tagsExtractor from '../../../transport/http/middlewares/tagsExtractor.js';
-import { StreamableSessionLifecycle, StreamableSessionStatus } from '../../../transport/http/streamableSessionLifecycle.js';
-import { extractTemplateContextRequest } from '../../../transport/http/utils/contextExtractor.js';
-import { sendBadRequest, sendInternalError, sendNotFound } from '../../../transport/http/utils/httpErrorHandler.js';
-import { authorizeRequestTemplateContext, redactTemplateContextBodyForLogging, } from '../../../transport/http/utils/templateContextAuthority.js';
-import { logError, logWarn } from '../../../transport/http/utils/unifiedLogger.js';
+import { getPresetName, getTagExpression, getTagFilterMode, getTagQuery, getValidatedTags, } from '../middlewares/scopeAuthMiddleware.js';
+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 { logError, logWarn } from '../utils/unifiedLogger.js';
 /**
  * Type guard to check if a request body is an initialize request.
  */

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;AAKlE,OAAO,EAAW,cAAc,EAAY,MAAM,SAAS,CAAC;AAyH5D,wBAAgB,kBAAkB,CAAC,aAAa,EAAE,aAAa,GAAG,cAAc,CAyF/E;AAED,wBAAgB,4BAA4B,CAAC,aAAa,EAAE,aAAa,GAAG,cAAc,CA0IzF"}
+{"version":3,"file":"toolRoutes.d.ts","sourceRoot":"","sources":["../../../../src/transport/http/routes/toolRoutes.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAKlE,OAAO,EAAW,cAAc,EAAY,MAAM,SAAS,CAAC;AA0H5D,wBAAgB,kBAAkB,CAAC,aAAa,EAAE,aAAa,GAAG,cAAc,CAyF/E;AAED,wBAAgB,4BAA4B,CAAC,aAAa,EAAE,aAAa,GAAG,cAAc,CA0JzF"}

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

@@ -1,15 +1,16 @@
 import { getConfiguredServerTargets } from '../../../config/configuredServerTargets.js';
 import { CapabilityCatalog } from '../../../core/capabilities/capabilityCatalog.js';
 import { createCapabilityVisibility, getCapabilityVisibleServerNames, } from '../../../core/capabilities/capabilityVisibility.js';
+import { acquireRuntimeCapabilityCatalog } from '../../../core/capabilities/runtimeCapabilityCatalog.js';
 import { ToolRegistry } from '../../../core/capabilities/toolRegistry.js';
-import { executeWithPostAuthOAuthRecovery } from '../../../core/client/postAuthOAuthRecovery.js';
+import { requestLegacyAdapter } from '../../../core/client/legacyAdapterRequest.js';
 import { FilteringService } from '../../../core/filtering/filteringService.js';
 import { ServerType } from '../../../core/server/adapters/types.js';
 import { createConnectionResolver } from '../../../core/server/connectionResolver.js';
 import { getDisabledToolError } from '../../../core/server/disabledTools.js';
 import { ClientStatus } from '../../../core/types/client.js';
 import logger from '../../../logger/logger.js';
-import { CONTEXT_HEADERS } from '../../../transport/http/utils/contextExtractor.js';
+import { CONTEXT_HEADERS } from '../utils/contextExtractor.js';
 import { buildFilterConfig, ensureRequestContextInitialized, parseTarget, resolveConnectionByServerName, } from './inspectRoutes.js';
 function getServerConfigs() {
     return getConfiguredServerTargets();
@@ -55,11 +56,10 @@ async function createFallbackCapabilityCatalog(serverManager) {
             continue;
         try {
             const logicalServerName = conn.name || (connectionKey.includes(':') ? connectionKey.split(':')[0] : connectionKey);
-            const result = await conn.client.listTools();
-            const transportTags = conn.transport?.tags;
-            const tags = Array.isArray(transportTags)
-                ? transportTags.filter((tag) => typeof tag === 'string')
-                : [];
+            const result = await requestLegacyAdapter(conn.adapter, 'tools/list', undefined, {
+                timeoutMs: conn.requestTimeoutMs,
+            });
+            const tags = conn.tags;
             registryTools.push(...(result.tools ?? []).map((tool) => ({ tool, server: logicalServerName, connectionKey, tags })));
         }
         catch (err) {
@@ -205,15 +205,26 @@ export function createToolInvocationsHandler(serverManager) {
                 const connection = (sessionConnection ??
                     (allowGenericFallback ? resolveConnectionByServerName(filteredConnections, target.serverName) : undefined) ??
                     (allowGenericFallback ? serverManager.getClient(target.serverName) : undefined));
-                if (!connection || !connection.client) {
+                if (!connection || connection.status !== ClientStatus.Connected) {
                     res.status(503).json({ error: `Server not connected: ${target.serverName}` });
                     return;
                 }
                 try {
-                    const upstreamResult = await executeWithPostAuthOAuthRecovery(target.serverName, connection, () => connection.client.callTool({
-                        name: target.toolName,
+                    const catalogConnections = Array.from(allConnections.values()).includes(connection)
+                        ? allConnections
+                        : new Map([[`\0app.1mcp/resolved/${target.serverName}`, connection]]);
+                    const snapshot = await acquireRuntimeCapabilityCatalog(catalogConnections, createCapabilityVisibility(Array.from(catalogConnections)
+                        .filter(([, candidate]) => candidate === connection)
+                        .map(([key]) => [key, target.serverName]), requestSessionId), { serverConfigs: getServerConfigs() });
+                    const resolved = snapshot.resolve('tools', target.qualifiedName);
+                    if (!resolved?.connection) {
+                        res.status(404).json({ error: `Tool not found: ${toolRef}` });
+                        return;
+                    }
+                    const upstreamResult = await requestLegacyAdapter(resolved.connection.adapter, 'tools/call', {
+                        name: resolved.entry.route.upstreamIdentity,
                         arguments: toolArgs,
-                    }));
+                    });
                     res.json({ result: upstreamResult, server: target.serverName, tool: target.toolName });
                 }
                 catch (error) {