@1mcp/agent 0.35.0-beta.3 → 0.35.0

package/build/core/instructions/templateTypes.js

@@ -166,4 +166,49 @@ No MCP servers are currently connected. 1MCP is ready to connect to servers and
 
 1MCP will automatically detect and connect to available MCP servers. Once connected, their tools and capabilities will become available through the unified interface.
 {{/if}}`;
+/** Built-in direct CLI variant matching the established `1mcp instructions` layout. */
+export const DEFAULT_CLI_INSTRUCTION_TEMPLATE = `1MCP CLI Instructions
+
+=== PLAYBOOK ===
+
+1. Start here before selecting tools.
+2. Review the available servers below and choose the server that matches the task.
+3. Run \`1mcp inspect <server>\` to list that server's tools.
+4. Run \`1mcp inspect <server>/<tool>\` to inspect the tool schema and arguments.
+5. Run \`1mcp wait <server>\` when a configured static server is still loading.
+6. Run \`1mcp run <server>/<tool> --args '<json>'\` only after inspecting the tool.
+7. Use \`--preset\`, \`--tags\`, or \`--tag-filter\` to narrow the server set when needed.
+8. If authentication is required, run \`1mcp auth login --context <name> --token <token>\` and retry.
+
+=== SERVER SUMMARY ===
+{{#each servers}}
+
+<server_summary name="{{name}}">
+	server: {{name}}
+{{#if summary.type}}	type: {{summary.type}}
+{{/if}}{{#if summary.status}}	status: {{summary.status}}
+{{/if}}{{#if summary.availableKnown}}	available: {{#if summary.available}}yes{{else}}no{{/if}}
+{{/if}}{{#if summary.loadTrackedKnown}}	load_tracked: {{#if summary.loadTracked}}yes{{else}}no{{/if}}
+{{/if}}	tools: {{summary.toolCount}}
+	instructions: {{#if summary.hasInstructions}}yes{{else}}no{{/if}}
+</server_summary>
+{{/each}}
+
+=== SERVER DETAILS ===
+{{#each servers}}
+
+<server_detail name="{{name}}">
+	server: {{name}}
+{{#if type}}	type: {{type}}
+{{/if}}{{#if status}}	status: {{status}}
+{{/if}}{{#if availableKnown}}	available: {{#if available}}yes{{else}}no{{/if}}
+{{/if}}{{#if loadTrackedKnown}}	load_tracked: {{#if loadTracked}}yes{{else}}no{{/if}}
+{{/if}}	tools: {{toolCount}}
+	instructions: {{#if hasInstructions}}yes{{else}}no{{/if}}
+{{#if hasInstructions}}	<server_instructions name="{{name}}">
+{{instructions}}
+	</server_instructions>
+{{else}}	<note>{{#if note}}{{note}}{{else}}(none provided){{/if}}</note>
+{{/if}}</server_detail>{{#unless @last}}
+{{/unless}}{{/each~}}`;
 //# sourceMappingURL=templateTypes.js.map

package/build/core/instructions/templateTypes.js.map

@@ -1 +1 @@
-{"version":3,"file":"templateTypes.js","sourceRoot":"","sources":["../../../src/core/instructions/templateTypes.ts"],"names":[],"mappings":"AA+JA;;GAEG;AACH,MAAM,CAAC,MAAM,yBAAyB,GAAsB;IAC1D;QACE,IAAI,EAAE,2BAA2B;QACjC,WAAW,EAAE,sCAAsC;KACpD;IACD;QACE,IAAI,EAAE,iBAAiB;QACvB,WAAW,EAAE,mCAAmC;KACjD;IACD;QACE,IAAI,EAAE,qBAAqB;QAC3B,WAAW,EAAE,yCAAyC;KACvD;CACF,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,MAAM,uBAAuB,GAAqD;IACvF,KAAK,EAAE,qCAAqC;IAC5C,WAAW,EAAE,sBAAsB;IACnC,QAAQ,EAAE,yBAAyB;IACnC,iBAAiB,EAAE,IAAI,GAAG,IAAI,EAAE,cAAc;CAC/C,CAAC;AAEF;;;GAGG;AACH,MAAM,CAAC,MAAM,4BAA4B,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAyIpC,CAAC"}
+{"version":3,"file":"templateTypes.js","sourceRoot":"","sources":["../../../src/core/instructions/templateTypes.ts"],"names":[],"mappings":"AAsLA;;GAEG;AACH,MAAM,CAAC,MAAM,yBAAyB,GAAsB;IAC1D;QACE,IAAI,EAAE,2BAA2B;QACjC,WAAW,EAAE,sCAAsC;KACpD;IACD;QACE,IAAI,EAAE,iBAAiB;QACvB,WAAW,EAAE,mCAAmC;KACjD;IACD;QACE,IAAI,EAAE,qBAAqB;QAC3B,WAAW,EAAE,yCAAyC;KACvD;CACF,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,MAAM,uBAAuB,GAAqD;IACvF,KAAK,EAAE,qCAAqC;IAC5C,WAAW,EAAE,sBAAsB;IACnC,QAAQ,EAAE,yBAAyB;IACnC,iBAAiB,EAAE,IAAI,GAAG,IAAI,EAAE,cAAc;CAC/C,CAAC;AAEF;;;GAGG;AACH,MAAM,CAAC,MAAM,4BAA4B,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAyIpC,CAAC;AAET,uFAAuF;AACvF,MAAM,CAAC,MAAM,gCAAgC,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;sBA2C1B,CAAC"}

package/build/core/protocol/notificationHandlers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"notificationHandlers.d.ts","sourceRoot":"","sources":["../../../src/core/protocol/notificationHandlers.ts"],"names":[],"mappings":"AAWA,OAAO,EAAgB,iBAAiB,EAAE,mBAAmB,EAAgB,MAAM,0BAA0B,CAAC;AAI9G;;;;GAIG;AACH,wBAAgB,gCAAgC,CAC9C,aAAa,EAAE,mBAAmB,EAClC,WAAW,EAAE,iBAAiB,GAC7B,IAAI,CA8CN;AAED;;;;GAIG;AACH,wBAAgB,gCAAgC,CAC9C,aAAa,EAAE,mBAAmB,EAClC,WAAW,EAAE,iBAAiB,GAC7B,IAAI,CA8CN"}
+{"version":3,"file":"notificationHandlers.d.ts","sourceRoot":"","sources":["../../../src/core/protocol/notificationHandlers.ts"],"names":[],"mappings":"AASA,OAAO,EAAgB,iBAAiB,EAAE,mBAAmB,EAAgB,MAAM,0BAA0B,CAAC;AAI9G;;;;GAIG;AACH,wBAAgB,gCAAgC,CAC9C,aAAa,EAAE,mBAAmB,EAClC,WAAW,EAAE,iBAAiB,GAC7B,IAAI,CAyEN;AAED;;;;GAIG;AACH,wBAAgB,gCAAgC,CAC9C,aAAa,EAAE,mBAAmB,EAClC,WAAW,EAAE,iBAAiB,GAC7B,IAAI,CA8CN"}

package/build/core/protocol/notificationHandlers.js

@@ -1,4 +1,5 @@
-import { CancelledNotificationSchema, LoggingMessageNotificationSchema, ProgressNotificationSchema, PromptListChangedNotificationSchema, ResourceListChangedNotificationSchema, ResourceUpdatedNotificationSchema, RootsListChangedNotificationSchema, ToolListChangedNotificationSchema, } from '@modelcontextprotocol/sdk/types.js';
+import { CancelledNotificationSchema, LoggingMessageNotificationSchema, ProgressNotificationSchema, ResourceUpdatedNotificationSchema, RootsListChangedNotificationSchema, } from '@modelcontextprotocol/sdk/types.js';
+import { registerCapabilityPaginationNotifications } from '../../core/capabilities/capabilityPagination.js';
 import { ClientStatus, ServerStatus } from '../../core/types/index.js';
 import logger from '../../logger/logger.js';
 import { withErrorHandling } from '../../utils/core/errorHandling.js';
@@ -13,11 +14,32 @@ export function setupClientToServerNotifications(outboundConns, inboundConn) {
         ProgressNotificationSchema,
         LoggingMessageNotificationSchema,
         ResourceUpdatedNotificationSchema,
-        ResourceListChangedNotificationSchema,
-        ToolListChangedNotificationSchema,
-        PromptListChangedNotificationSchema,
     ];
     for (const [name, outboundConn] of outboundConns.entries()) {
+        registerCapabilityPaginationNotifications(outboundConns, outboundConn, inboundConn, withErrorHandling(async (notification) => {
+            logger.info(`Received notification in client: ${name} ${JSON.stringify(notification)}`);
+            if (inboundConn.status !== ServerStatus.Connected || !inboundConn.server.transport) {
+                logger.warn(`Server transport not connected. Dropping notification from ${name}`);
+                return;
+            }
+            try {
+                await inboundConn.server.notification({
+                    method: notification.method,
+                    params: {
+                        ...notification.params,
+                        server: name,
+                    },
+                });
+            }
+            catch (error) {
+                if (error instanceof Error && error.message.includes('Not connected')) {
+                    logger.warn(`Server transport not connected. Dropping notification from ${name}`);
+                }
+                else {
+                    logger.error(`Failed to send notification from ${name}: ${error}`);
+                }
+            }
+        }, `Error handling client notification from ${name}`));
         clientNotificationSchemas.forEach((schema) => {
             outboundConn.client.setNotificationHandler(schema, withErrorHandling(async (notification) => {
                 logger.info(`Received notification in client: ${name} ${JSON.stringify(notification)}`);

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

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

package/build/core/protocol/promptRequestHandlers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"promptRequestHandlers.d.ts","sourceRoot":"","sources":["../../../src/core/protocol/promptRequestHandlers.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAQlF,wBAAgB,sBAAsB,CAAC,aAAa,EAAE,mBAAmB,EAAE,WAAW,EAAE,iBAAiB,GAAG,IAAI,CA6C/G;AAED,wBAAgB,0BAA0B,CAAC,aAAa,EAAE,mBAAmB,EAAE,WAAW,EAAE,iBAAiB,GAAG,IAAI,CAkCnH"}
+{"version":3,"file":"promptRequestHandlers.d.ts","sourceRoot":"","sources":["../../../src/core/protocol/promptRequestHandlers.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAYlF,wBAAgB,sBAAsB,CAAC,aAAa,EAAE,mBAAmB,EAAE,WAAW,EAAE,iBAAiB,GAAG,IAAI,CAoD/G;AAED,wBAAgB,0BAA0B,CAAC,aAAa,EAAE,mBAAmB,EAAE,WAAW,EAAE,iBAAiB,GAAG,IAAI,CAkCnH"}

package/build/core/protocol/promptRequestHandlers.js

@@ -1,25 +1,34 @@
 import { CompleteRequestSchema, GetPromptRequestSchema, ListPromptsRequestSchema, } from '@modelcontextprotocol/sdk/types.js';
 import { MCP_URI_SEPARATOR } from '../../constants.js';
-import { byCapabilities } from '../../core/filtering/clientFiltering.js';
-import { FilteringService } from '../../core/filtering/filteringService.js';
 import { withErrorHandling } from '../../utils/core/errorHandling.js';
 import { buildUri, parseUri } from '../../utils/core/parsing.js';
 import { getRequestTimeout } from '../../utils/core/timeoutUtils.js';
-import { handlePagination } from '../../utils/ui/pagination.js';
-import { filterConnectionsForSession, getRequestSession, resolveOutboundConnection } from './requestHandlerUtils.js';
+import { createProtocolCapabilityCatalog, getRequestSession, resolveCapabilityVisibility, resolveOutboundConnection, } from './requestHandlerUtils.js';
 export function registerPromptHandlers(outboundConns, inboundConn) {
     const sessionId = getRequestSession(inboundConn);
+    const catalog = createProtocolCapabilityCatalog(outboundConns);
     inboundConn.server.setRequestHandler(ListPromptsRequestSchema, withErrorHandling(async (request) => {
-        const sessionFilteredConns = filterConnectionsForSession(outboundConns, sessionId);
-        const capabilityFilteredClients = byCapabilities({ prompts: {} })(sessionFilteredConns);
-        const filteredClients = FilteringService.getFilteredConnections(capabilityFilteredClients, inboundConn);
-        const result = await handlePagination(filteredClients, request.params || {}, (client, params, opts) => client.listPrompts(params, opts), (outboundConn, result) => result.prompts?.map((prompt) => ({
-            ...prompt,
-            name: buildUri(outboundConn.name, prompt.name, MCP_URI_SEPARATOR),
-        })) ?? [], inboundConn.enablePagination ?? false);
+        const visibility = resolveCapabilityVisibility(outboundConns, inboundConn, sessionId, 'prompts');
+        const result = await catalog.listVisibleCapabilityPages({
+            kind: 'prompts',
+            visibility,
+            cursor: request.params?.cursor,
+            list: async (outboundConn, cursor, serverName) => {
+                const upstream = await outboundConn.client.listPrompts({ cursor }, { timeout: getRequestTimeout(outboundConn.transport) });
+                return {
+                    items: (upstream.prompts ?? []).map((prompt) => ({
+                        ...prompt,
+                        name: buildUri(serverName, prompt.name, MCP_URI_SEPARATOR),
+                    })),
+                    nextCursor: upstream.nextCursor,
+                };
+            },
+            enablePagination: inboundConn.enablePagination ?? false,
+        });
         return {
             prompts: result.items,
             nextCursor: result.nextCursor,
+            _meta: result._meta,
         };
     }, 'Error listing prompts'));
     inboundConn.server.setRequestHandler(GetPromptRequestSchema, withErrorHandling(async (request) => {

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

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

package/build/core/protocol/requestHandlerUtils.d.ts

@@ -4,8 +4,12 @@ import { InboundConnection, OutboundConnection, OutboundConnections } from '../.
 import type { MCPServerParams } from '../../core/types/transport.js';
 export declare function getRequestSession(inboundConn: InboundConnection): string | undefined;
 export declare function createCapabilityCatalogFromConnections(connections: OutboundConnections, getServerConfigs?: () => Record<string, MCPServerParams>): Promise<CapabilityCatalog>;
+/** Create the runtime Capability Catalog used by protocol capability walks. */
+export declare function createProtocolCapabilityCatalog(connections: OutboundConnections, getServerConfigs?: () => Record<string, MCPServerParams>): CapabilityCatalog;
 export declare function resolveOutboundConnection(clientName: string, sessionId: string | undefined, outboundConns: OutboundConnections, inboundConn?: InboundConnection): OutboundConnection | undefined;
 export declare function filterConnectionsForSession(outboundConns: OutboundConnections, sessionId: string | undefined): OutboundConnections;
 /** Resolve request-time Filter Selection into a Server Candidate Set. */
 export declare function resolveLazyCapabilityVisibility(outboundConns: OutboundConnections, inboundConn: InboundConnection, sessionId: string | undefined): CapabilityVisibility;
+/** Resolve request-time Filter Selection into a catalog-enforced Server Candidate Set. */
+export declare function resolveCapabilityVisibility(outboundConns: OutboundConnections, inboundConn: InboundConnection, sessionId: string | undefined, capability: 'tools' | 'resources' | 'prompts'): CapabilityVisibility;
 //# sourceMappingURL=requestHandlerUtils.d.ts.map

package/build/core/protocol/requestHandlerUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"requestHandlerUtils.d.ts","sourceRoot":"","sources":["../../../src/core/protocol/requestHandlerUtils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,6CAA6C,CAAC;AAChF,OAAO,EAAE,KAAK,oBAAoB,EAA8B,MAAM,gDAAgD,CAAC;AAOvH,OAAO,EAAgB,iBAAiB,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AACpH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAIpE,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,iBAAiB,GAAG,MAAM,GAAG,SAAS,CAEpF;AAED,wBAAsB,sCAAsC,CAC1D,WAAW,EAAE,mBAAmB,EAChC,gBAAgB,GAAE,MAAM,MAAM,CAAC,MAAM,EAAE,eAAe,CAA6D,GAClH,OAAO,CAAC,iBAAiB,CAAC,CAkC5B;AAED,wBAAgB,yBAAyB,CACvC,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,aAAa,EAAE,mBAAmB,EAClC,WAAW,CAAC,EAAE,iBAAiB,GAC9B,kBAAkB,GAAG,SAAS,CAMhC;AAED,wBAAgB,2BAA2B,CACzC,aAAa,EAAE,mBAAmB,EAClC,SAAS,EAAE,MAAM,GAAG,SAAS,GAC5B,mBAAmB,CAIrB;AAED,yEAAyE;AACzE,wBAAgB,+BAA+B,CAC7C,aAAa,EAAE,mBAAmB,EAClC,WAAW,EAAE,iBAAiB,EAC9B,SAAS,EAAE,MAAM,GAAG,SAAS,GAC5B,oBAAoB,CAatB"}
+{"version":3,"file":"requestHandlerUtils.d.ts","sourceRoot":"","sources":["../../../src/core/protocol/requestHandlerUtils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,6CAA6C,CAAC;AAChF,OAAO,EAAE,KAAK,oBAAoB,EAA8B,MAAM,gDAAgD,CAAC;AAOvH,OAAO,EAAgB,iBAAiB,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AACpH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAIpE,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,iBAAiB,GAAG,MAAM,GAAG,SAAS,CAEpF;AAED,wBAAsB,sCAAsC,CAC1D,WAAW,EAAE,mBAAmB,EAChC,gBAAgB,GAAE,MAAM,MAAM,CAAC,MAAM,EAAE,eAAe,CAA8B,GACnF,OAAO,CAAC,iBAAiB,CAAC,CAkC5B;AAED,+EAA+E;AAC/E,wBAAgB,+BAA+B,CAC7C,WAAW,EAAE,mBAAmB,EAChC,gBAAgB,GAAE,MAAM,MAAM,CAAC,MAAM,EAAE,eAAe,CAA8B,GACnF,iBAAiB,CAOnB;AAED,wBAAgB,yBAAyB,CACvC,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,aAAa,EAAE,mBAAmB,EAClC,WAAW,CAAC,EAAE,iBAAiB,GAC9B,kBAAkB,GAAG,SAAS,CAMhC;AAED,wBAAgB,2BAA2B,CACzC,aAAa,EAAE,mBAAmB,EAClC,SAAS,EAAE,MAAM,GAAG,SAAS,GAC5B,mBAAmB,CAIrB;AAED,yEAAyE;AACzE,wBAAgB,+BAA+B,CAC7C,aAAa,EAAE,mBAAmB,EAClC,WAAW,EAAE,iBAAiB,EAC9B,SAAS,EAAE,MAAM,GAAG,SAAS,GAC5B,oBAAoB,CAEtB;AAED,0FAA0F;AAC1F,wBAAgB,2BAA2B,CACzC,aAAa,EAAE,mBAAmB,EAClC,WAAW,EAAE,iBAAiB,EAC9B,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,UAAU,EAAE,OAAO,GAAG,WAAW,GAAG,SAAS,GAC5C,oBAAoB,CAsBtB"}

package/build/core/protocol/requestHandlerUtils.js

@@ -1,4 +1,4 @@
-import { McpConfigManager } from '../../config/mcpConfigManager.js';
+import { getConfiguredServerTargets } from '../../config/configuredServerTargets.js';
 import { CapabilityCatalog } from '../../core/capabilities/capabilityCatalog.js';
 import { createCapabilityVisibility } from '../../core/capabilities/capabilityVisibility.js';
 import { SchemaCache } from '../../core/capabilities/schemaCache.js';
@@ -13,7 +13,7 @@ import { getRequestTimeout } from '../../utils/core/timeoutUtils.js';
 export function getRequestSession(inboundConn) {
     return inboundConn.context?.sessionId;
 }
-export async function createCapabilityCatalogFromConnections(connections, getServerConfigs = () => McpConfigManager.getInstance().getTransportConfig()) {
+export async function createCapabilityCatalogFromConnections(connections, getServerConfigs = getConfiguredServerTargets) {
     const toolsByServer = new Map();
     const tagsByServer = new Map();
     await Promise.all(Array.from(connections.entries()).map(async ([connectionKey, connection]) => {
@@ -41,6 +41,15 @@ export async function createCapabilityCatalogFromConnections(connections, getSer
         templateHashProvider: ServerManager.current.getTemplateServerManager(),
     });
 }
+/** Create the runtime Capability Catalog used by protocol capability walks. */
+export function createProtocolCapabilityCatalog(connections, getServerConfigs = getConfiguredServerTargets) {
+    return new CapabilityCatalog({
+        getToolRegistry: ToolRegistry.empty,
+        schemaCache: new SchemaCache({ maxEntries: 100 }),
+        outboundConnections: connections,
+        getServerConfigs,
+    });
+}
 export function resolveOutboundConnection(clientName, sessionId, outboundConns, inboundConn) {
     const scopedConns = filterConnectionsForSession(outboundConns, sessionId);
     const filteredConns = inboundConn ? FilteringService.getFilteredConnections(scopedConns, inboundConn) : scopedConns;
@@ -55,10 +64,21 @@ export function filterConnectionsForSession(outboundConns, sessionId) {
 }
 /** Resolve request-time Filter Selection into a Server Candidate Set. */
 export function resolveLazyCapabilityVisibility(outboundConns, inboundConn, sessionId) {
+    return resolveCapabilityVisibility(outboundConns, inboundConn, sessionId, 'tools');
+}
+/** Resolve request-time Filter Selection into a catalog-enforced Server Candidate Set. */
+export function resolveCapabilityVisibility(outboundConns, inboundConn, sessionId, capability) {
     // Scope template instances before applying client filters and availability.
     const sessionScoped = filterConnectionsForSession(outboundConns, sessionId);
     const tagAndPresetScoped = FilteringService.getFilteredConnections(sessionScoped, inboundConn);
-    const toolCapable = byCapabilities({ tools: {} })(tagAndPresetScoped);
-    return createCapabilityVisibility(Array.from(toolCapable.entries(), ([connectionKey, connection]) => [connectionKey, connection.name || connectionKey.split(':')[0]]), sessionId);
+    const capabilityRequirement = capability === 'tools' ? { tools: {} } : capability === 'resources' ? { resources: {} } : { prompts: {} };
+    const capable = byCapabilities(capabilityRequirement)(tagAndPresetScoped);
+    return createCapabilityVisibility(Array.from(capable.entries(), ([connectionKey, connection]) => [connectionKey, connection.name || connectionKey.split(':')[0]]), sessionId, {
+        tagFilterMode: inboundConn.tagFilterMode,
+        tags: inboundConn.tags,
+        tagExpression: inboundConn.tagExpression,
+        tagQuery: inboundConn.tagQuery,
+        presetName: inboundConn.presetName,
+    });
 }
 //# sourceMappingURL=requestHandlerUtils.js.map

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

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

package/build/core/protocol/resourceRequestHandlers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resourceRequestHandlers.d.ts","sourceRoot":"","sources":["../../../src/core/protocol/resourceRequestHandlers.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAQlF,wBAAgB,wBAAwB,CAAC,aAAa,EAAE,mBAAmB,EAAE,WAAW,EAAE,iBAAiB,GAAG,IAAI,CAiHjH"}
+{"version":3,"file":"resourceRequestHandlers.d.ts","sourceRoot":"","sources":["../../../src/core/protocol/resourceRequestHandlers.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAYlF,wBAAgB,wBAAwB,CAAC,aAAa,EAAE,mBAAmB,EAAE,WAAW,EAAE,iBAAiB,GAAG,IAAI,CA8HjH"}

package/build/core/protocol/resourceRequestHandlers.js

@@ -1,38 +1,58 @@
 import { ListResourcesRequestSchema, ListResourceTemplatesRequestSchema, ReadResourceRequestSchema, SubscribeRequestSchema, UnsubscribeRequestSchema, } from '@modelcontextprotocol/sdk/types.js';
 import { MCP_URI_SEPARATOR } from '../../constants.js';
-import { byCapabilities } from '../../core/filtering/clientFiltering.js';
-import { FilteringService } from '../../core/filtering/filteringService.js';
 import { withErrorHandling } from '../../utils/core/errorHandling.js';
 import { buildUri, parseUri } from '../../utils/core/parsing.js';
 import { getRequestTimeout } from '../../utils/core/timeoutUtils.js';
-import { handlePagination } from '../../utils/ui/pagination.js';
-import { filterConnectionsForSession, getRequestSession, resolveOutboundConnection } from './requestHandlerUtils.js';
+import { createProtocolCapabilityCatalog, getRequestSession, resolveCapabilityVisibility, resolveOutboundConnection, } from './requestHandlerUtils.js';
 export function registerResourceHandlers(outboundConns, inboundConn) {
     const sessionId = getRequestSession(inboundConn);
+    const catalog = createProtocolCapabilityCatalog(outboundConns);
     inboundConn.server.setRequestHandler(ListResourcesRequestSchema, withErrorHandling(async (request) => {
-        const sessionFilteredConns = filterConnectionsForSession(outboundConns, sessionId);
-        const capabilityFilteredClients = byCapabilities({ resources: {} })(sessionFilteredConns);
-        const filteredClients = FilteringService.getFilteredConnections(capabilityFilteredClients, inboundConn);
-        const result = await handlePagination(filteredClients, request.params || {}, (client, params, opts) => client.listResources(params, opts), (outboundConn, result) => result.resources?.map((resource) => ({
-            ...resource,
-            uri: buildUri(outboundConn.name, resource.uri, MCP_URI_SEPARATOR),
-        })) ?? [], inboundConn.enablePagination ?? false);
+        const visibility = resolveCapabilityVisibility(outboundConns, inboundConn, sessionId, 'resources');
+        const result = await catalog.listVisibleCapabilityPages({
+            kind: 'resources',
+            visibility,
+            cursor: request.params?.cursor,
+            list: async (outboundConn, cursor, serverName) => {
+                const upstream = await outboundConn.client.listResources({ cursor }, { timeout: getRequestTimeout(outboundConn.transport) });
+                return {
+                    items: (upstream.resources ?? []).map((resource) => ({
+                        ...resource,
+                        uri: buildUri(serverName, resource.uri, MCP_URI_SEPARATOR),
+                    })),
+                    nextCursor: upstream.nextCursor,
+                };
+            },
+            enablePagination: inboundConn.enablePagination ?? false,
+        });
         return {
             resources: result.items,
             nextCursor: result.nextCursor,
+            _meta: result._meta,
         };
     }, 'Error listing resources'));
     inboundConn.server.setRequestHandler(ListResourceTemplatesRequestSchema, withErrorHandling(async (request) => {
-        const sessionFilteredConns = filterConnectionsForSession(outboundConns, sessionId);
-        const capabilityFilteredClients = byCapabilities({ resources: {} })(sessionFilteredConns);
-        const filteredClients = FilteringService.getFilteredConnections(capabilityFilteredClients, inboundConn);
-        const result = await handlePagination(filteredClients, request.params || {}, (client, params, opts) => client.listResourceTemplates(params, opts), (outboundConn, result) => result.resourceTemplates?.map((template) => ({
-            ...template,
-            uriTemplate: buildUri(outboundConn.name, template.uriTemplate, MCP_URI_SEPARATOR),
-        })) ?? [], inboundConn.enablePagination ?? false);
+        const visibility = resolveCapabilityVisibility(outboundConns, inboundConn, sessionId, 'resources');
+        const result = await catalog.listVisibleCapabilityPages({
+            kind: 'resourceTemplates',
+            visibility,
+            cursor: request.params?.cursor,
+            list: async (outboundConn, cursor, serverName) => {
+                const upstream = await outboundConn.client.listResourceTemplates({ cursor }, { timeout: getRequestTimeout(outboundConn.transport) });
+                return {
+                    items: (upstream.resourceTemplates ?? []).map((template) => ({
+                        ...template,
+                        uriTemplate: buildUri(serverName, template.uriTemplate, MCP_URI_SEPARATOR),
+                    })),
+                    nextCursor: upstream.nextCursor,
+                };
+            },
+            enablePagination: inboundConn.enablePagination ?? false,
+        });
         return {
             resourceTemplates: result.items,
             nextCursor: result.nextCursor,
+            _meta: result._meta,
         };
     }, 'Error listing resource templates'));
     inboundConn.server.setRequestHandler(SubscribeRequestSchema, withErrorHandling(async (request) => {

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

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

package/build/core/protocol/toolRequestHandlers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"toolRequestHandlers.d.ts","sourceRoot":"","sources":["../../../src/core/protocol/toolRequestHandlers.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,uBAAuB,EAAE,MAAM,mDAAmD,CAAC;AAI5F,OAAO,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAelF,wBAAgB,oBAAoB,CAClC,aAAa,EAAE,mBAAmB,EAClC,WAAW,EAAE,iBAAiB,EAC9B,uBAAuB,CAAC,EAAE,uBAAuB,GAChD,IAAI,CAsIN"}
+{"version":3,"file":"toolRequestHandlers.d.ts","sourceRoot":"","sources":["../../../src/core/protocol/toolRequestHandlers.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,uBAAuB,EAAE,MAAM,mDAAmD,CAAC;AAI5F,OAAO,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAelF,wBAAgB,oBAAoB,CAClC,aAAa,EAAE,mBAAmB,EAClC,WAAW,EAAE,iBAAiB,EAC9B,uBAAuB,CAAC,EAAE,uBAAuB,GAChD,IAAI,CAmLN"}

package/build/core/protocol/toolRequestHandlers.js

@@ -1,19 +1,21 @@
 import { CallToolRequestSchema, CallToolResultSchema, ListToolsRequestSchema, } from '@modelcontextprotocol/sdk/types.js';
-import { McpConfigManager } from '../../config/mcpConfigManager.js';
+import { getConfiguredServerTargets } from '../../config/configuredServerTargets.js';
 import { MCP_URI_SEPARATOR } from '../../constants.js';
+import { publishCompleteConfiguredToolTargetSnapshots, publishConfiguredToolPage, } from '../../core/capabilities/configuredToolSnapshot.js';
 import { InternalCapabilitiesProvider } from '../../core/capabilities/internalCapabilitiesProvider.js';
-import { byCapabilities } from '../../core/filtering/clientFiltering.js';
-import { FilteringService } from '../../core/filtering/filteringService.js';
+import { executeWithPostAuthOAuthRecovery } from '../../core/client/postAuthOAuthRecovery.js';
 import { getDisabledToolError } from '../../core/server/disabledTools.js';
+import { applyEffectiveToolDescription } from '../../core/server/toolDescriptionOverrides.js';
 import logger, { infoIf } from '../../logger/logger.js';
 import { withErrorHandling } from '../../utils/core/errorHandling.js';
 import { buildUri, parseUri } from '../../utils/core/parsing.js';
 import { getRequestTimeout } from '../../utils/core/timeoutUtils.js';
-import { createCapabilityCatalogFromConnections, filterConnectionsForSession, getRequestSession, resolveLazyCapabilityVisibility, resolveOutboundConnection, } from './requestHandlerUtils.js';
+import { createProtocolCapabilityCatalog, getRequestSession, resolveCapabilityVisibility, resolveLazyCapabilityVisibility, resolveOutboundConnection, } from './requestHandlerUtils.js';
 export function registerToolHandlers(outboundConns, inboundConn, lazyLoadingOrchestrator) {
     const sessionId = getRequestSession(inboundConn);
     const lazyLoadingEnabled = lazyLoadingOrchestrator?.isEnabled();
-    const getServerConfigs = () => McpConfigManager.getInstance().getTransportConfig();
+    const getServerConfigs = () => getConfiguredServerTargets();
+    const catalog = createProtocolCapabilityCatalog(outboundConns, getServerConfigs);
     inboundConn.server.setRequestHandler(ListToolsRequestSchema, withErrorHandling(async (request) => {
         if (lazyLoadingEnabled && lazyLoadingOrchestrator) {
             const visibility = resolveLazyCapabilityVisibility(outboundConns, inboundConn, sessionId);
@@ -37,34 +39,74 @@ export function registerToolHandlers(outboundConns, inboundConn, lazyLoadingOrch
             const internalTools = internalProvider.getAvailableTools();
             const lazyToolNames = ['tool_list', 'tool_schema', 'tool_invoke'];
             const nonLazyTools = internalTools.filter((tool) => !lazyToolNames.includes(tool.name));
+            const paginationFacts = createToolPaginationFacts(internalTools, getServerConfigs());
             const internalToolsWithPrefix = nonLazyTools.map((tool) => ({
                 ...tool,
                 name: buildUri('1mcp', tool.name, MCP_URI_SEPARATOR),
             }));
+            const tools = [...capabilities.tools, ...internalToolsWithPrefix].sort((left, right) => left.name < right.name ? -1 : left.name > right.name ? 1 : 0);
+            const result = await catalog.listVisibleCapabilityPages({
+                kind: 'tools',
+                visibility,
+                cursor: request.params?.cursor,
+                list: async () => ({ items: [] }),
+                internalPages: [{ id: '\0app.1mcp/lazy-tools', name: '1mcp', items: tools }],
+                includeExternal: false,
+                filterSelection: { lazy: true, ...paginationFacts },
+                generationSignature: paginationFacts,
+                enablePagination: inboundConn.enablePagination ?? false,
+            });
             return {
-                tools: [...capabilities.tools, ...internalToolsWithPrefix],
+                tools: result.items,
+                nextCursor: result.nextCursor,
+                _meta: result._meta,
             };
         }
-        const sessionFilteredConns = filterConnectionsForSession(outboundConns, sessionId);
-        const capabilityFilteredClients = byCapabilities({ tools: {} })(sessionFilteredConns);
-        const filteredClients = FilteringService.getFilteredConnections(capabilityFilteredClients, inboundConn);
-        const catalog = await createCapabilityCatalogFromConnections(filteredClients, getServerConfigs);
-        const result = await catalog.listVisibleTools(request.params || {});
+        const visibility = resolveCapabilityVisibility(outboundConns, inboundConn, sessionId, 'tools');
         const internalProvider = InternalCapabilitiesProvider.getInstance();
         await internalProvider.initialize();
         const internalTools = internalProvider.getAvailableTools();
-        const internalToolsWithPrefix = internalTools.map((tool) => ({
-            ...tool,
-            name: buildUri('1mcp', tool.name, MCP_URI_SEPARATOR),
-        }));
-        const externalTools = result.tools.map((tool) => ({
-            ...tool,
-            name: buildUri(tool.server, tool.name, MCP_URI_SEPARATOR),
-            inputSchema: tool.inputSchema ?? { type: 'object' },
-        }));
+        const serverConfigs = getServerConfigs();
+        const paginationFacts = createToolPaginationFacts(internalTools, serverConfigs);
+        const result = await catalog.listVisibleCapabilityPages({
+            kind: 'tools',
+            visibility,
+            cursor: request.params?.cursor,
+            list: async (outboundConn, cursor) => {
+                const upstream = await outboundConn.client.listTools({ cursor }, { timeout: getRequestTimeout(outboundConn.transport) });
+                publishConfiguredToolPage(outboundConn, upstream.tools ?? [], cursor, upstream.nextCursor);
+                if (upstream.nextCursor === undefined) {
+                    publishCompleteConfiguredToolTargetSnapshots(outboundConns);
+                }
+                return {
+                    items: upstream.tools ?? [],
+                    nextCursor: upstream.nextCursor,
+                };
+            },
+            mapItem: (tool, serverName) => ({
+                ...applyEffectiveToolDescription(tool, serverConfigs[serverName], serverName),
+                name: buildUri(serverName, tool.name, MCP_URI_SEPARATOR),
+                inputSchema: tool.inputSchema ?? { type: 'object' },
+            }),
+            internalPages: [
+                {
+                    id: '\0app.1mcp/internal-tools',
+                    name: '1mcp',
+                    items: internalTools.map((tool) => ({
+                        ...tool,
+                        name: buildUri('1mcp', tool.name, MCP_URI_SEPARATOR),
+                    })),
+                },
+            ],
+            filterSelection: paginationFacts,
+            generationSignature: paginationFacts,
+            serverConfigs,
+            enablePagination: inboundConn.enablePagination ?? false,
+        });
         return {
-            tools: [...externalTools, ...internalToolsWithPrefix],
+            tools: result.items,
             nextCursor: result.nextCursor,
+            _meta: result._meta,
         };
     }, 'Error listing tools'));
     inboundConn.server.setRequestHandler(CallToolRequestSchema, withErrorHandling(async (request) => {
@@ -113,11 +155,25 @@ export function registerToolHandlers(outboundConns, inboundConn, lazyLoadingOrch
                 },
             });
         }
-        return outboundConn.client.callTool({ ...request.params, name: extractedToolName }, CallToolResultSchema, {
+        return executeWithPostAuthOAuthRecovery(clientName, outboundConn, () => outboundConn.client.callTool({ ...request.params, name: extractedToolName }, CallToolResultSchema, {
             timeout: getRequestTimeout(outboundConn.transport),
-        });
+        }));
     }, 'Error calling tool'));
 }
+function createToolPaginationFacts(internalTools, serverConfigs) {
+    return {
+        disabledTools: Object.fromEntries(Object.entries(serverConfigs)
+            .filter(([, config]) => config.disabledTools?.length)
+            .map(([name, config]) => [name, [...(config.disabledTools ?? [])].sort()])),
+        toolDescriptionOverrides: Object.fromEntries(Object.entries(serverConfigs)
+            .filter(([, config]) => Object.keys(config.toolDescriptionOverrides ?? {}).length > 0)
+            .map(([name, config]) => [
+            name,
+            Object.fromEntries(Object.entries(config.toolDescriptionOverrides ?? {}).sort(([left], [right]) => left.localeCompare(right))),
+        ])),
+        internalTools: internalTools.map((tool) => tool.name).sort(),
+    };
+}
 function structuredToolResult(result) {
     return {
         content: [