@1mcp/agent 0.37.0 → 0.38.1

package/build/core/capabilities/capabilityAggregator.js

@@ -1,242 +1,99 @@
 import { EventEmitter } from 'events';
 import { getConfiguredServerTargets } from '../../config/configuredServerTargets.js';
-import { clearConfiguredToolSnapshot, collectConfiguredToolPages, publishCompleteConfiguredToolTargetSnapshots, publishConfiguredToolSnapshot, } from '../../core/capabilities/configuredToolSnapshot.js';
-import { InternalCapabilitiesProvider } from '../../core/capabilities/internalCapabilitiesProvider.js';
-import { executeWithPostAuthOAuthRecovery } from '../../core/client/postAuthOAuthRecovery.js';
-import { filterDisabledTools } from '../../core/server/disabledTools.js';
-import { applyEffectiveToolDescription } from '../../core/server/toolDescriptionOverrides.js';
-import { ClientStatus } from '../../core/types/index.js';
-import logger, { debugIf } from '../../logger/logger.js';
-import { getRequestTimeout } from '../../utils/core/timeoutUtils.js';
-/**
- * Aggregates and tracks capabilities (tools, resources, prompts) from all ready MCP servers.
- * Detects changes when servers come online or go offline and emits events for notification.
- *
- * @example
- * ```typescript
- * const aggregator = new CapabilityAggregator(outboundConnections);
- * aggregator.on('capabilities-changed', (changes) => {
- *   if (changes.toolsChanged) {
- *     // Send ToolListChangedNotification to clients
- *   }
- * });
- *
- * // When server comes online
- * aggregator.updateCapabilities();
- * ```
- */
+import { InternalCapabilitiesProvider } from './internalCapabilitiesProvider.js';
+import { buildCatalogGeneration } from './catalogGeneration.js';
+import { acquireRuntimeCapabilityCatalog, RuntimeCatalogBackendChangedError, } from './runtimeCapabilityCatalog.js';
+/** Publishes the runtime catalog as one aggregate snapshot for discovery and notifications. */
 export class CapabilityAggregator extends EventEmitter {
     outboundConns;
-    currentCapabilities;
-    isInitialized = false;
-    internalProvider;
-    constructor(outboundConnections) {
+    generation = buildCatalogGeneration(0, []);
+    snapshot;
+    currentCapabilities = {
+        tools: [],
+        resources: [],
+        resourceTemplates: [],
+        prompts: [],
+        readyServers: [],
+        timestamp: new Date(),
+    };
+    refreshSequence = 0;
+    constructor(outboundConns) {
         super();
-        this.outboundConns = outboundConnections;
-        this.currentCapabilities = this.createEmptyCapabilities();
-        this.internalProvider = InternalCapabilitiesProvider.getInstance();
+        this.outboundConns = outboundConns;
         this.setMaxListeners(50);
     }
-    /**
-     * Create an empty capabilities snapshot
-     */
-    createEmptyCapabilities() {
-        return {
-            tools: [],
-            resources: [],
-            prompts: [],
-            readyServers: [],
-            timestamp: new Date(),
-        };
-    }
-    /**
-     * Get current aggregated capabilities
-     */
     getCurrentCapabilities() {
         return this.currentCapabilities;
     }
-    /**
-     * Update capabilities by querying all ready servers
-     * This should be called when server states change
-     */
+    getCatalogGeneration() {
+        return this.generation;
+    }
+    getCatalogSnapshot() {
+        return this.snapshot;
+    }
     async updateCapabilities() {
-        const previousCapabilities = this.currentCapabilities;
-        const newCapabilities = await this.aggregateFromReadyServers();
-        const changes = this.detectChanges(previousCapabilities, newCapabilities);
-        this.currentCapabilities = newCapabilities;
-        if (!this.isInitialized) {
-            this.isInitialized = true;
-            debugIf('CapabilityAggregator initialized with capabilities from ready servers');
-        }
-        if (changes.hasChanges) {
-            logger.info(`Capabilities changed: tools=${changes.toolsChanged}, resources=${changes.resourcesChanged}, prompts=${changes.promptsChanged}`);
+        const sequence = ++this.refreshSequence;
+        const internal = InternalCapabilitiesProvider.getInstance();
+        await internal.initialize();
+        const collect = async () => {
+            const snapshot = await acquireRuntimeCapabilityCatalog(this.outboundConns, undefined, {
+                serverConfigs: getConfiguredServerTargets(),
+                internalTools: internal.getAvailableTools(),
+                internalResources: internal.getAvailableResources(),
+                internalPrompts: internal.getAvailablePrompts(),
+            });
+            const [tools, resources, resourceTemplates, prompts] = await Promise.all([
+                snapshot.list('tools', { enablePagination: false }),
+                snapshot.list('resources', { enablePagination: false }),
+                snapshot.list('resourceTemplates', { enablePagination: false }),
+                snapshot.list('prompts', { enablePagination: false }),
+            ]);
+            return { snapshot, tools, resources, resourceTemplates, prompts };
+        };
+        const { snapshot, tools, resources, resourceTemplates, prompts } = await collect().catch((error) => {
+            if (!(error instanceof RuntimeCatalogBackendChangedError))
+                throw error;
+            return collect();
+        });
+        const previous = this.currentCapabilities;
+        if (sequence !== this.refreshSequence)
+            return this.detectChanges(previous, previous);
+        const readyServers = new Set(Array.from(snapshot.connections.keys()));
+        if (snapshot.generation.entries.some((entry) => entry.route.origin === 'internal'))
+            readyServers.add('1mcp');
+        const current = Object.freeze({
+            tools: Object.freeze(tools.items),
+            resources: Object.freeze(resources.items),
+            resourceTemplates: Object.freeze(resourceTemplates.items),
+            prompts: Object.freeze(prompts.items),
+            readyServers: Object.freeze([...readyServers].sort()),
+            timestamp: new Date(),
+        });
+        const changes = this.detectChanges(previous, current);
+        this.generation = snapshot.generation;
+        this.snapshot = snapshot;
+        this.currentCapabilities = current;
+        if (changes.hasChanges)
             this.emit('capabilities-changed', changes);
-        }
         return changes;
     }
-    /**
-     * Force refresh capabilities from all servers
-     */
     async refreshCapabilities() {
-        const changes = await this.updateCapabilities();
-        return changes.current;
-    }
-    /**
-     * Aggregate capabilities from all ready servers
-     */
-    async aggregateFromReadyServers() {
-        const readyServers = [];
-        const allTools = [];
-        const allResources = [];
-        const allPrompts = [];
-        const serverConfigs = getConfiguredServerTargets();
-        // Add 1mcp tools first
-        try {
-            await this.internalProvider.initialize();
-            const internalTools = this.internalProvider.getAvailableTools();
-            const internalResources = this.internalProvider.getAvailableResources();
-            const internalPrompts = this.internalProvider.getAvailablePrompts();
-            allTools.push(...internalTools);
-            allResources.push(...internalResources);
-            allPrompts.push(...internalPrompts);
-            // Only add 1mcp as a ready server if it provides capabilities
-            if (internalTools.length > 0 || internalResources.length > 0 || internalPrompts.length > 0) {
-                readyServers.push('1mcp');
-            }
-        }
-        catch (error) {
-            logger.warn(`Failed to load 1mcp tools: ${error}`);
-        }
-        // Add tools from external MCP servers
-        for (const [serverName, connection] of this.outboundConns.entries()) {
-            if (connection.status !== ClientStatus.Connected || !connection.client.transport) {
-                continue;
-            }
-            try {
-                readyServers.push(serverName);
-                // Get server capabilities to check what's supported
-                const serverCapabilities = connection.client.getServerCapabilities() || {};
-                // Build promises array based on actual capabilities
-                const promises = [this.safeListTools(serverName, connection)];
-                if (serverCapabilities.resources) {
-                    promises.push(this.safeListResources(serverName, connection));
-                }
-                if (serverCapabilities.prompts) {
-                    promises.push(this.safeListPrompts(serverName, connection));
-                }
-                // Fetch capabilities in parallel (only those supported)
-                const results = await Promise.allSettled(promises);
-                if (connection.status !== ClientStatus.Connected) {
-                    clearConfiguredToolSnapshot(connection);
-                    readyServers.splice(readyServers.indexOf(serverName), 1);
-                    continue;
-                }
-                // Process tools (always first in promises array)
-                if (results[0]?.status === 'fulfilled') {
-                    const toolsResult = results[0].value;
-                    if (toolsResult.tools) {
-                        publishConfiguredToolSnapshot(connection, toolsResult.tools, toolsResult.nextCursor === undefined);
-                        const logicalServerName = connection.name || serverName;
-                        allTools.push(...filterDisabledTools(toolsResult.tools, serverConfigs, logicalServerName).map((tool) => applyEffectiveToolDescription(tool, serverConfigs[logicalServerName], logicalServerName)));
-                    }
-                }
-                else {
-                    clearConfiguredToolSnapshot(connection);
-                }
-                // Process resources (second if available)
-                let resultIndex = 1;
-                if (serverCapabilities.resources) {
-                    const resourceResult = results[resultIndex];
-                    if (resourceResult && resourceResult.status === 'fulfilled') {
-                        const resourcesResult = resourceResult.value;
-                        if (resourcesResult.resources) {
-                            allResources.push(...resourcesResult.resources);
-                        }
-                    }
-                    // Always increment index when resources capability exists, regardless of fulfillment
-                    resultIndex++;
-                }
-                // Process prompts (third if available)
-                if (serverCapabilities.prompts) {
-                    const promptResult = results[resultIndex];
-                    if (promptResult && promptResult.status === 'fulfilled') {
-                        const promptsResult = promptResult.value;
-                        if (promptsResult.prompts) {
-                            allPrompts.push(...promptsResult.prompts);
-                        }
-                    }
-                }
-            }
-            catch (error) {
-                logger.warn(`Failed to aggregate capabilities from ${serverName}: ${error}`);
-                // Continue with other servers
-            }
-        }
-        publishCompleteConfiguredToolTargetSnapshots(this.outboundConns);
-        return {
-            tools: this.deduplicateTools(allTools),
-            resources: this.deduplicateResources(allResources),
-            prompts: this.deduplicatePrompts(allPrompts),
-            readyServers: readyServers.sort(),
-            timestamp: new Date(),
-        };
-    }
-    /**
-     * Safely list tools from a server
-     */
-    async safeListTools(serverName, connection) {
-        try {
-            return await executeWithPostAuthOAuthRecovery(serverName, connection, () => collectConfiguredToolPages((cursor) => connection.client.listTools(cursor === undefined ? undefined : { cursor }, {
-                timeout: getRequestTimeout(connection.transport),
-            })));
-        }
-        catch (error) {
-            logger.warn(`Failed to list tools from ${serverName}`, { error: String(error) });
-            throw error;
-        }
+        return (await this.updateCapabilities()).current;
     }
-    /**
-     * Safely list resources from a server
-     */
-    async safeListResources(serverName, connection) {
-        try {
-            return await executeWithPostAuthOAuthRecovery(serverName, connection, () => connection.client.listResources(undefined, {
-                timeout: getRequestTimeout(connection.transport),
-            }));
-        }
-        catch (error) {
-            logger.warn(`Failed to list resources from ${serverName}`, { error: String(error) });
-            return { resources: [] };
-        }
-    }
-    /**
-     * Safely list prompts from a server
-     */
-    async safeListPrompts(serverName, connection) {
-        try {
-            return await executeWithPostAuthOAuthRecovery(serverName, connection, () => connection.client.listPrompts(undefined, {
-                timeout: getRequestTimeout(connection.transport),
-            }));
-        }
-        catch (error) {
-            logger.warn(`Failed to list prompts from ${serverName}`, { error: String(error) });
-            return { prompts: [] };
-        }
-    }
-    /**
-     * Detect changes between two capability snapshots
-     */
     detectChanges(previous, current) {
-        const toolsChanged = !this.arraysEqual(previous.tools.map((tool) => `${tool.name}\0${tool.description ?? ''}`).sort(), current.tools.map((tool) => `${tool.name}\0${tool.description ?? ''}`).sort());
-        const resourcesChanged = !this.arraysEqual(previous.resources.map((r) => r.uri).sort(), current.resources.map((r) => r.uri).sort());
-        const promptsChanged = !this.arraysEqual(previous.prompts.map((p) => p.name).sort(), current.prompts.map((p) => p.name).sort());
-        const addedServers = current.readyServers.filter((s) => !previous.readyServers.includes(s));
-        const removedServers = previous.readyServers.filter((s) => !current.readyServers.includes(s));
-        const hasChanges = toolsChanged || resourcesChanged || promptsChanged || addedServers.length > 0 || removedServers.length > 0;
+        const changed = (before, after) => JSON.stringify(before.map((item) => JSON.stringify(item)).sort()) !==
+            JSON.stringify(after.map((item) => JSON.stringify(item)).sort());
+        const toolsChanged = changed(previous.tools, current.tools);
+        const resourceTemplatesChanged = changed(previous.resourceTemplates, current.resourceTemplates);
+        const resourcesChanged = changed(previous.resources, current.resources) || resourceTemplatesChanged;
+        const promptsChanged = changed(previous.prompts, current.prompts);
+        const addedServers = current.readyServers.filter((server) => !previous.readyServers.includes(server));
+        const removedServers = previous.readyServers.filter((server) => !current.readyServers.includes(server));
         return {
-            hasChanges,
+            hasChanges: toolsChanged || resourcesChanged || promptsChanged || addedServers.length > 0 || removedServers.length > 0,
             toolsChanged,
             resourcesChanged,
+            resourceTemplatesChanged,
             promptsChanged,
             addedServers,
             removedServers,
@@ -244,57 +101,6 @@ export class CapabilityAggregator extends EventEmitter {
             current,
         };
     }
-    /**
-     * Check if two arrays are equal (shallow comparison)
-     */
-    arraysEqual(a, b) {
-        return a.length === b.length && a.every((val, index) => val === b[index]);
-    }
-    /**
-     * Remove duplicate tools based on name
-     */
-    deduplicateTools(tools) {
-        const seen = new Set();
-        return tools.filter((tool) => {
-            if (seen.has(tool.name)) {
-                debugIf(`Duplicate tool name detected: ${tool.name}`);
-                return false;
-            }
-            seen.add(tool.name);
-            return true;
-        });
-    }
-    /**
-     * Remove duplicate resources based on URI
-     */
-    deduplicateResources(resources) {
-        const seen = new Set();
-        return resources.filter((resource) => {
-            if (seen.has(resource.uri)) {
-                debugIf(`Duplicate resource URI detected: ${resource.uri}`);
-                return false;
-            }
-            seen.add(resource.uri);
-            return true;
-        });
-    }
-    /**
-     * Remove duplicate prompts based on name
-     */
-    deduplicatePrompts(prompts) {
-        const seen = new Set();
-        return prompts.filter((prompt) => {
-            if (seen.has(prompt.name)) {
-                debugIf(`Duplicate prompt name detected: ${prompt.name}`);
-                return false;
-            }
-            seen.add(prompt.name);
-            return true;
-        });
-    }
-    /**
-     * Get summary of current capabilities for logging
-     */
     getCapabilitiesSummary() {
         const caps = this.currentCapabilities;
         return `${caps.tools.length} tools, ${caps.resources.length} resources, ${caps.prompts.length} prompts from ${caps.readyServers.length} servers`;

package/build/core/capabilities/capabilityAggregator.js.map

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

package/build/core/capabilities/capabilityCatalog.d.ts

@@ -1,8 +1,9 @@
-import type { Tool } from '@modelcontextprotocol/sdk/types.js';
-import { type TemplateHashProvider } from '../../core/server/connectionResolver.js';
-import { type MCPServerParams, type OutboundConnection, type OutboundConnections } from '../../core/types/index.js';
+import { type TemplateHashProvider } from '../server/connectionResolver.js';
+import { type MCPServerParams, type OutboundConnection, type OutboundConnections } from '../types/index.js';
+import type { Tool } from '../../sdk/contracts/index.js';
 import { type CapabilityKind, type CapabilityPage, type CapabilityPaginationResult } from './capabilityPagination.js';
 import { type CapabilityVisibility } from './capabilityVisibility.js';
+import type { CapabilityRoute as CatalogRoute } from './catalogGeneration.js';
 import { SchemaCache } from './schemaCache.js';
 import type { ListToolsOptions, ListToolsResult as RegistryListToolsResult, ToolMetadata } from './toolRegistry.js';
 import { ToolRegistry } from './toolRegistry.js';
@@ -29,10 +30,8 @@ export interface CapabilityRefreshResult {
 export interface CapabilityCatalogQueryOptions {
     refreshIntent?: CapabilityRefreshIntent;
 }
-export interface CapabilityRoute {
-    server: string;
+export interface CapabilityRoute extends CatalogRoute {
     toolName: string;
-    connectionKey: string;
 }
 export interface VisibleTool extends ToolMetadata {
 }

package/build/core/capabilities/capabilityCatalog.d.ts.map

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

package/build/core/capabilities/capabilityCatalog.js

@@ -1,8 +1,8 @@
-import { executeWithPostAuthOAuthRecovery } from '../../core/client/postAuthOAuthRecovery.js';
-import { ConnectionResolver } from '../../core/server/connectionResolver.js';
-import { getDisabledToolError, isToolDisabled } from '../../core/server/disabledTools.js';
-import { applyEffectiveToolDescription } from '../../core/server/toolDescriptionOverrides.js';
-import { ClientStatus, } from '../../core/types/index.js';
+import { requestLegacyAdapter } from '../client/legacyAdapterRequest.js';
+import { ConnectionResolver } from '../server/connectionResolver.js';
+import { getDisabledSourceToolError, isSourceToolDisabled } from '../server/disabledTools.js';
+import { applySourceToolDescription } from '../server/toolDescriptionOverrides.js';
+import { ClientStatus, } from '../types/index.js';
 import logger from '../../logger/logger.js';
 import { walkCapabilityPages, } from './capabilityPagination.js';
 import { getCapabilityVisibleServerNames } from './capabilityVisibility.js';
@@ -48,7 +48,7 @@ export class CapabilityCatalog {
                                 const name = item && typeof item === 'object' && 'name' in item && typeof item.name === 'string'
                                     ? item.name
                                     : undefined;
-                                return name === undefined || !isToolDisabled(serverConfigs, serverName, name);
+                                return name === undefined || !isSourceToolDisabled(serverConfigs, serverName, name);
                             });
                             return mapPage(visibleItems);
                         },
@@ -105,10 +105,22 @@ export class CapabilityCatalog {
             return { schema: {}, error: access.error, refresh };
         }
         const { route } = access;
+        if (access.tool.definition && access.connection) {
+            const cached = this.deps.schemaCache.getIfCached(route.connectionKey, route.toolName);
+            const fromCache = cached !== null && JSON.stringify(cached) === JSON.stringify(access.tool.definition);
+            if (!fromCache)
+                this.deps.schemaCache.set(route.connectionKey, route.toolName, access.tool.definition);
+            return {
+                schema: applySourceToolDescription(access.tool.definition, this.deps.getServerConfigs()[route.server], route.server),
+                fromCache,
+                route,
+                refresh,
+            };
+        }
         const cached = this.deps.schemaCache.getIfCached(route.connectionKey, route.toolName);
         if (cached) {
             return {
-                schema: applyEffectiveToolDescription(cached, this.deps.getServerConfigs()[route.server], route.server),
+                schema: applySourceToolDescription(cached, this.deps.getServerConfigs()[route.server], route.server),
                 fromCache: true,
                 route,
                 refresh,
@@ -127,7 +139,7 @@ export class CapabilityCatalog {
         try {
             const tool = await this.deps.schemaCache.getOrLoad(route.connectionKey, route.toolName, this.deps.loadSchema);
             return {
-                schema: applyEffectiveToolDescription(tool, this.deps.getServerConfigs()[route.server], route.server),
+                schema: applySourceToolDescription(tool, this.deps.getServerConfigs()[route.server], route.server),
                 fromCache: false,
                 route,
                 refresh,
@@ -158,8 +170,10 @@ export class CapabilityCatalog {
             };
         }
         const { route } = access;
-        const connection = this.deps.outboundConnections.get(route.connectionKey);
-        if (!connection?.client) {
+        const connection = access.connection ?? this.deps.outboundConnections.get(route.connectionKey);
+        if (!connection ||
+            connection.status !== ClientStatus.Connected ||
+            this.deps.outboundConnections.get(route.connectionKey) !== connection) {
             return {
                 result: {},
                 server: route.server,
@@ -173,10 +187,10 @@ export class CapabilityCatalog {
             };
         }
         try {
-            const result = await executeWithPostAuthOAuthRecovery(route.server, connection, () => connection.client.callTool({
+            const result = await requestLegacyAdapter(connection.adapter, 'tools/call', {
                 name: route.toolName,
                 arguments: args.args,
-            }));
+            });
             return { result, server: route.server, tool: route.toolName, route, refresh };
         }
         catch (error) {
@@ -229,6 +243,8 @@ export class CapabilityCatalog {
     }
     visibleToolRegistry(visibility) {
         let registry = this.deps.getToolRegistry();
+        if (registry.isCurrent?.() === false)
+            return ToolRegistry.empty();
         const effectiveVisibility = visibility ?? this.deps.defaultVisibility;
         if (effectiveVisibility !== undefined) {
             const connectedCandidates = new Map(Array.from(effectiveVisibility.serverCandidates).filter(([connectionKey]) => this.deps.outboundConnections.get(connectionKey)?.status === ClientStatus.Connected));
@@ -240,9 +256,9 @@ export class CapabilityCatalog {
         const serverConfigs = this.deps.getServerConfigs();
         return ToolRegistry.fromToolsWithServer(registry
             .getAllTools()
-            .filter((tool) => !isToolDisabled(serverConfigs, tool.server, tool.name))
+            .filter((tool) => !isSourceToolDisabled(serverConfigs, tool.server, tool.name))
             .map((tool) => ({
-            tool: applyEffectiveToolDescription({
+            tool: applySourceToolDescription(tool.definition ?? {
                 name: tool.name,
                 description: tool.description,
                 inputSchema: tool.inputSchema ?? { type: 'object' },
@@ -250,7 +266,7 @@ export class CapabilityCatalog {
             server: tool.server,
             connectionKey: tool.connectionKey,
             tags: tool.tags,
-        })));
+        }))).withConnections(registry.getConnections(), () => registry.isCurrent());
     }
     resolveVisibleToolAccess(args, visibility) {
         if (!args.server || !args.toolName) {
@@ -273,7 +289,7 @@ export class CapabilityCatalog {
         const tool = visibleRegistry.getTool(args.server, args.toolName);
         if (!tool) {
             const disabledError = this.isServerVisible(args.server, visibility)
-                ? getDisabledToolError(this.deps.getServerConfigs(), args.server, args.toolName)
+                ? getDisabledSourceToolError(this.deps.getServerConfigs(), args.server, args.toolName)
                 : undefined;
             return {
                 error: disabledError ?? {
@@ -291,7 +307,7 @@ export class CapabilityCatalog {
                 },
             };
         }
-        return { route, tool };
+        return { route, tool, connection: visibleRegistry.getConnections()?.get(route.connectionKey) };
     }
     isServerVisible(server, visibility) {
         const effectiveVisibility = visibility ?? this.deps.defaultVisibility;
@@ -299,20 +315,34 @@ export class CapabilityCatalog {
     }
     resolveRoute(tool, visibility) {
         const registryConnectionKey = tool.connectionKey ?? tool.server;
+        const sessionId = visibility?.sessionId ?? this.deps.defaultVisibility?.sessionId;
+        if (sessionId &&
+            registryConnectionKey !== tool.server &&
+            this.connectionResolver.resolveWithKey(tool.server, sessionId)?.key !== registryConnectionKey)
+            return undefined;
         if (this.deps.outboundConnections.has(registryConnectionKey)) {
             return {
+                ...tool.route,
+                kind: 'tools',
+                origin: 'external',
+                upstreamIdentity: tool.name,
+                publicIdentity: tool.route?.publicIdentity ?? `${tool.server}_1mcp_${tool.name}`,
                 server: tool.server,
                 toolName: tool.name,
                 connectionKey: registryConnectionKey,
             };
         }
-        const sessionId = visibility?.sessionId ?? this.deps.defaultVisibility?.sessionId;
         const sessionResult = sessionId ? this.connectionResolver.resolveWithKey(tool.server, sessionId) : undefined;
         const result = sessionResult ?? (!sessionId ? this.connectionResolver.findByServerName(tool.server) : undefined);
         if (!result) {
             return undefined;
         }
         return {
+            ...tool.route,
+            kind: 'tools',
+            origin: 'external',
+            upstreamIdentity: tool.name,
+            publicIdentity: tool.route?.publicIdentity ?? `${tool.server}_1mcp_${tool.name}`,
             server: tool.server,
             toolName: tool.name,
             connectionKey: result.key,