npm - @1mcp/agent - Versions diffs - 0.39.0-beta.3 → 0.39.0-beta.4 - Mend

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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (391) hide show

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

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

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

@@ -0,0 +1 @@

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

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

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

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

@@ -102,8 +102,8 @@ export function createOAuthRoutes(oauthProvider, loadingManager, oauthFlow = cre
             // Redirect back to dashboard with success
             res.redirect(result.adminReturnOrigin ? `${result.adminReturnOrigin}/oauth/return?success=1` : '/admin/oauth?success=1');
         }
-        catch (error) {
-            logger.error('oauthRoutes.error.handling.oauth.callback.for.41be0569', { error: error });
+        catch {
+            logger.error('oauthRoutes.error.handling.oauth.callback.for.41be0569');
             res.redirect('/admin/oauth?error=callback_failed');
         }
     });
@@ -186,7 +186,9 @@ function getOAuthFlow(oauthProvider, loadingManager) {
             getClients: () => ServerManager.current.getClients(),
         },
         clientRuntime: {
-            initiateOAuth: (serverName) => ClientManager.getOrCreateInstance().initiateOAuth(serverName),
+            bindOAuthReturn: (serverName, state, origin) => ClientManager.getOrCreateInstance().bindOAuthReturn(serverName, state, origin),
+            getOAuthReturn: (serverName, state) => ClientManager.getOrCreateInstance().getOAuthReturn(serverName, state),
+            initiateOAuth: (serverName, options) => ClientManager.getOrCreateInstance().initiateOAuth(serverName, options),
             completeOAuthAndReconnect: (serverName, authorizationCode) => ClientManager.getOrCreateInstance().completeOAuthAndReconnect(serverName, authorizationCode),
         },
         loadingRuntime: loadingManager
@@ -208,6 +210,7 @@ function getOAuthFlow(oauthProvider, loadingManager) {
             oauthTokenTtlMs: agentConfig.get('auth').oauthTokenTtlMs,
         }),
         getAvailableTags: () => [],
+        getResourceUrl: () => agentConfig.getUrl(),
     });
 }
 // Export the factory function as default

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

	@@ -1 +1 @@
1	- {"version":3,"file":"oauthRoutes.js","sourceRoot":"","sources":["../../../../src/transport/http/routes/oauthRoutes.ts"],"names":[],"mappings":"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~~OAAO~~,~~KAAK,EAAE,~~CAAC;~~YACf~~,MAAM,CAAC,KAAK,CAAC,wDAAwD,~~EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,~~CAAC,CAAC;~~YACzF~~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~~YAC5F~~,yBAAyB,EAAE,CAAC,UAAU,EAAE,iBAAiB,EAAE,EAAE,CAC3D,aAAa,CAAC,mBAAmB,EAAE,CAAC,yBAAyB,CAAC,UAAU,EAAE,iBAAiB,CAAC;SAC/F;QACD,cAAc,EAAE,cAAc;YAC5B,CAAC,CAAC;gBACE,SAAS,EAAE,CAAC,UAAU,EAAE,EAAE;oBACxB,IAAI,CAAC;wBACH,cAAc,CAAC,eAAe,EAAE,CAAC,iBAAiB,CAAC,UAAU,EAAE,YAAY,CAAC,KAAK,CAAC,CAAC;wBACnF,MAAM,CAAC,KAAK,CAAC,sFAAsF,CAAC,CAAC;oBACvG,CAAC;oBAAC,OAAO,UAAU,EAAE,CAAC;wBACpB,MAAM,CAAC,IAAI,CAAC,+DAA+D,EAAE,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,CAAC;oBACtG,CAAC;gBACH,CAAC;aACF;YACH,CAAC,CAAC,SAAS;QACb,aAAa,EAAE,GAAG,EAAE,CAAC,EAAE;QACvB,aAAa,EAAE,GAAG,EAAE,CAAC,CAAC;YACpB,OAAO,EAAE,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,IAAI;YACzC,eAAe,EAAE,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,eAAe;SACzD,CAAC;QACF,gBAAgB,EAAE,GAAG,EAAE,CAAC,EAAE;~~KAC3B~~,CAAC,CAAC;AACL,CAAC;AAED,yCAAyC;AACzC,eAAe,iBAAiB,CAAC"}
1	+ {"version":3,"file":"oauthRoutes.js","sourceRoot":"","sources":["../../../../src/transport/http/routes/oauthRoutes.ts"],"names":[],"mappings":"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"}

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

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

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

@@ -91,6 +91,19 @@ function hasCatalogAccess(lazyOrchestrator) {
         typeof lazyOrchestrator.getToolRegistry === 'function' &&
         typeof lazyOrchestrator.getSchemaCache === 'function');
 }
+function recoveryRefreshCallback(orchestrator) {
+    if (orchestrator.refreshCapabilitiesForRecovery) {
+        return async () => {
+            await orchestrator.refreshCapabilitiesForRecovery();
+        };
+    }
+    if (orchestrator.refreshCapabilities) {
+        return async () => {
+            await orchestrator.refreshCapabilities();
+        };
+    }
+    return undefined;
+}
 export function createToolsHandler(serverManager) {
     return async (req, res) => {
         try {
@@ -115,6 +128,7 @@ export function createToolsHandler(serverManager) {
                     totalCount: result.totalCount,
                     hasMore: result.hasMore,
                     ...(result.nextCursor ? { nextCursor: result.nextCursor } : {}),
+                    ...(result._meta ? { _meta: result._meta } : {}),
                     servers: result.servers,
                     ...(degradedServers.length > 0 ? { degradedServers } : {}),
                 });
@@ -128,19 +142,21 @@ export function createToolsHandler(serverManager) {
                     outboundConnections: serverManager.getClients(),
                     getServerConfigs,
                     templateHashProvider: getTemplateHashProvider(serverManager),
+                    refreshCapabilities: recoveryRefreshCallback(lazyOrchestrator),
                 });
                 const catalogResult = await catalog.listVisibleTools({
                     server,
                     pattern,
                     limit,
                     cursor,
-                }, visibility);
-                if (catalogResult.tools.length > 0 || catalogResult.totalCount > 0) {
+                }, visibility, !cursor && (await catalog.requiresToolListingRecovery(visibility)) ? { refreshIntent: 'force' } : {});
+                if (catalogResult.tools.length > 0 || catalogResult.totalCount > 0 || catalogResult._meta) {
                     res.json({
                         tools: catalogResult.tools,
                         totalCount: catalogResult.totalCount,
                         hasMore: catalogResult.hasMore,
                         ...(catalogResult.nextCursor ? { nextCursor: catalogResult.nextCursor } : {}),
+                        ...(catalogResult._meta ? { _meta: catalogResult._meta } : {}),
                         servers: catalogResult.servers,
                     });
                     return;

package/build/transport/http/routes/toolRoutes.js.map CHANGED Viewed

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

package/build/utils/core/parsing.d.ts CHANGED Viewed

@@ -22,4 +22,6 @@ export declare function parseUri(uri: string, separator: string): UriParts;
  * @returns The constructed URI
  */
 export declare function buildUri(clientName: string, resourceName: string, separator: string): string;
+/** Preserve valid public names; compact names that exceed MCP's tool-name limits. */
+export declare function buildToolName(serverName: string, toolName: string): string;
 //# sourceMappingURL=parsing.d.ts.map

package/build/utils/core/parsing.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"parsing.d.ts","sourceRoot":"","sources":["../../../src/utils/core/parsing.ts"],"names":[],"mappings":"~~AAEA~~;;GAEG;AACH,MAAM,WAAW,QAAQ;IACvB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED;;;;;;;GAOG;AACH,wBAAgB,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,QAAQ,CA4BjE;AAED;;;;;;GAMG;AACH,wBAAgB,QAAQ,CAAC,UAAU,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAc5F"}
1	+ {"version":3,"file":"parsing.d.ts","sourceRoot":"","sources":["../../../src/utils/core/parsing.ts"],"names":[],"mappings":"AAMA;;GAEG;AACH,MAAM,WAAW,QAAQ;IACvB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED;;;;;;;GAOG;AACH,wBAAgB,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,QAAQ,CA4BjE;AAED;;;;;;GAMG;AACH,wBAAgB,QAAQ,CAAC,UAAU,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAc5F;AAED,qFAAqF;AACrF,wBAAgB,aAAa,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAe1E"}

package/build/utils/core/parsing.js CHANGED Viewed

@@ -1,3 +1,5 @@
+import { createHash } from 'node:crypto';
+import { MCP_URI_SEPARATOR } from '../../constants/mcp.js';
 import { InvalidRequestError } from './errorTypes.js';
 /**
  * Extracts client name and resource name from a URI
@@ -48,4 +50,21 @@ export function buildUri(clientName, resourceName, separator) {
     }
     return `${clientName.trim()}${separator}${resourceName.trim()}`;
 }
+/** Preserve valid public names; compact names that exceed MCP's tool-name limits. */
+export function buildToolName(serverName, toolName) {
+    const qualified = buildUri(serverName, toolName, MCP_URI_SEPARATOR);
+    if (qualified.length <= 64 && /^[A-Za-z0-9_./-]+$/.test(qualified))
+        return qualified;
+    // Hash the structured source tuple, not an ambiguous concatenated identity.
+    // Connection IDs and catalog generations must not change consumer references.
+    const digest = createHash('sha256')
+        .update(JSON.stringify([serverName, toolName]))
+        .digest('hex')
+        .slice(0, 40);
+    const serverPrefix = serverName
+        .trim()
+        .replace(/[^A-Za-z0-9_./-]/g, '_')
+        .slice(0, 18);
+    return `${serverPrefix}${MCP_URI_SEPARATOR}${digest}`;
+}
 //# sourceMappingURL=parsing.js.map

package/build/utils/core/parsing.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"parsing.js","sourceRoot":"","sources":["../../../src/utils/core/parsing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAUtD;;;;;;;GAOG;AACH,MAAM,UAAU,QAAQ,CAAC,GAAW,EAAE,SAAiB;IACrD,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC;QAC5C,MAAM,IAAI,mBAAmB,CAAC,gCAAgC,CAAC,CAAC;IAClE,CAAC;IAED,IAAI,CAAC,SAAS,IAAI,OAAO,SAAS,KAAK,QAAQ,EAAE,CAAC;QAChD,MAAM,IAAI,mBAAmB,CAAC,sCAAsC,CAAC,CAAC;IACxE,CAAC;IAED,kDAAkD;IAClD,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;IAEtC,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;QACjD,MAAM,IAAI,mBAAmB,CAAC,0CAA0C,SAAS,SAAS,GAAG,GAAG,CAAC,CAAC;IACpG,CAAC;IAED,MAAM,UAAU,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IACnC,MAAM,YAAY,GAAG,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC;IAE9E,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,MAAM,IAAI,mBAAmB,CAAC,6BAA6B,CAAC,CAAC;IAC/D,CAAC;IAED,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,MAAM,IAAI,mBAAmB,CAAC,+BAA+B,CAAC,CAAC;IACjE,CAAC;IAED,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,CAAC;AACtC,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,QAAQ,CAAC,UAAkB,EAAE,YAAoB,EAAE,SAAiB;IAClF,IAAI,CAAC,UAAU,EAAE,IAAI,EAAE,EAAE,CAAC;QACxB,MAAM,IAAI,mBAAmB,CAAC,6BAA6B,CAAC,CAAC;IAC/D,CAAC;IAED,IAAI,CAAC,YAAY,EAAE,IAAI,EAAE,EAAE,CAAC;QAC1B,MAAM,IAAI,mBAAmB,CAAC,+BAA+B,CAAC,CAAC;IACjE,CAAC;IAED,IAAI,CAAC,SAAS,IAAI,OAAO,SAAS,KAAK,QAAQ,EAAE,CAAC;QAChD,MAAM,IAAI,mBAAmB,CAAC,sCAAsC,CAAC,CAAC;IACxE,CAAC;IAED,OAAO,GAAG,UAAU,CAAC,IAAI,EAAE,GAAG,SAAS,GAAG,YAAY,CAAC,IAAI,EAAE,EAAE,CAAC;AAClE,CAAC"}
1	+ {"version":3,"file":"parsing.js","sourceRoot":"","sources":["../../../src/utils/core/parsing.ts"],"names":[],"mappings":"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"}

package/build/utils/core/resourceUris.d.ts ADDED Viewed

@@ -0,0 +1,6 @@
+export declare function isValidResourceUri(value: string): boolean;
+/** RFC6570 sections 1.5 and 2; percent-encoded variable names are preserved, never decoded. */
+export declare function isValidResourceTemplate(value: string): boolean;
+export declare function buildPublicResourceUri(server: string, upstreamIdentity: string): string;
+export declare function buildPublicResourceTemplate(server: string, upstreamIdentity: string): string;
+//# sourceMappingURL=resourceUris.d.ts.map

package/build/utils/core/resourceUris.d.ts.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"resourceUris.d.ts","sourceRoot":"","sources":["../../../src/utils/core/resourceUris.ts"],"names":[],"mappings":"AAkCA,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAIzD;AAED,+FAA+F;AAC/F,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAoB9D;AAkCD,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,GAAG,MAAM,CAEvF;AAED,wBAAgB,2BAA2B,CAAC,MAAM,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,GAAG,MAAM,CAQ5F"}

package/build/utils/core/resourceUris.js ADDED Viewed

@@ -0,0 +1,104 @@
+import { createHash } from 'node:crypto';
+import { MCP_URI_SEPARATOR } from '../../constants/mcp.js';
+import addFormats from 'ajv-formats';
+import { InvalidRequestError } from './errorTypes.js';
+import { buildUri } from './parsing.js';
+const uriFormat = addFormats.default.get('uri', 'full');
+// ajv-formats omits RFC3986 path-empty and RFC6570 dotted variable names.
+const queryOrFragment = "(?:[A-Za-z0-9._~!$&'()*+,;=:@/?-]|%[A-Fa-f0-9]{2})*";
+const pathEmptyUri = new RegExp(`^[A-Za-z][A-Za-z0-9+.-]*:(?:\\?${queryOrFragment})?(?:#${queryOrFragment})?$`, 'u');
+const varchar = '(?:[A-Za-z0-9_]|%[A-Fa-f0-9]{2})';
+const varname = `${varchar}(?:\\.?${varchar})*`;
+const varspec = `${varname}(?::[1-9][0-9]{0,3}|\\*)?`;
+const expression = new RegExp(`^[+#./;?&=,!@|]?${varspec}(?:,${varspec})*$`, 'u');
+function hasOnlyUnicodeScalars(value) {
+    return Array.from(value).every((character) => {
+        const point = character.codePointAt(0);
+        return point < 0xd800 || point > 0xdfff;
+    });
+}
+function hasUriCharacters(value) {
+    if (!value)
+        return false;
+    for (const character of value) {
+        const point = character.codePointAt(0);
+        if (point <= 0x20 || point === 0x7f)
+            return false;
+    }
+    return hasOnlyUnicodeScalars(value);
+}
+export function isValidResourceUri(value) {
+    if (!hasUriCharacters(value))
+        return false;
+    if (typeof uriFormat === 'function' && uriFormat(value) === true)
+        return true;
+    return pathEmptyUri.test(value);
+}
+/** RFC6570 sections 1.5 and 2; percent-encoded variable names are preserved, never decoded. */
+export function isValidResourceTemplate(value) {
+    if (!hasUriCharacters(value))
+        return false;
+    let offset = 0;
+    while (offset < value.length) {
+        const character = String.fromCodePoint(value.codePointAt(offset));
+        if (character === '{') {
+            const close = value.indexOf('}', offset + 1);
+            if (close < 0 || !expression.test(value.slice(offset + 1, close)))
+                return false;
+            offset = close + 1;
+            continue;
+        }
+        if (character === '%') {
+            if (!/^[A-Fa-f0-9]{2}$/u.test(value.slice(offset + 1, offset + 3)))
+                return false;
+            offset += 3;
+            continue;
+        }
+        if (!isTemplateLiteral(character))
+            return false;
+        offset += character.length;
+    }
+    return true;
+}
+function isTemplateLiteral(character) {
+    const point = character.codePointAt(0);
+    if (point <= 0x7e)
+        return !/["'<>%\\^`{|}]/u.test(character);
+    if (point >= 0xa0 && point <= 0xd7ff)
+        return true;
+    if (point >= 0xe000 && point <= 0xfdcf)
+        return true;
+    if (point >= 0xfdf0 && point <= 0xffef)
+        return true;
+    if ((point & 0xffff) > 0xfffd)
+        return false;
+    if (point >= 0x10000 && point <= 0xdfffd)
+        return true;
+    if (point >= 0xe1000 && point <= 0xefffd)
+        return true;
+    return point >= 0xf0000 && point <= 0x10fffd;
+}
+function projectResourceIdentity(server, upstreamIdentity, valid, preserveLegacy = valid) {
+    if (!valid(upstreamIdentity))
+        throw new InvalidRequestError('Unsupported upstream resource identity');
+    const canonical = buildUri(server, upstreamIdentity, MCP_URI_SEPARATOR);
+    if (!hasOnlyUnicodeScalars(canonical))
+        throw new InvalidRequestError('Invalid resource server identity');
+    if (preserveLegacy(canonical))
+        return canonical;
+    // Extending the scheme keeps the complete source URI/template suffix in its original component positions.
+    // All resource kinds share one server prefix; sessions, backend instances and reloads do not change it.
+    const hash = createHash('sha256')
+        .update(JSON.stringify([server.trim()]))
+        .digest('hex')
+        .slice(0, 16);
+    return `mcp+1mcp.${hash}+${upstreamIdentity}`;
+}
+export function buildPublicResourceUri(server, upstreamIdentity) {
+    return projectResourceIdentity(server, upstreamIdentity, isValidResourceUri);
+}
+export function buildPublicResourceTemplate(server, upstreamIdentity) {
+    // RFC6570 permits variable schemes and relative references. Concrete resource reads still require absolute URIs.
+    return projectResourceIdentity(server, upstreamIdentity, isValidResourceTemplate, (canonical) => isValidResourceUri(`${server.trim()}${MCP_URI_SEPARATOR}`) && isValidResourceTemplate(canonical));
+}
+//# sourceMappingURL=resourceUris.js.map

package/build/utils/core/resourceUris.js.map ADDED Viewed

@@ -0,0 +1 @@

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

package/build/utils/core/toolNames.d.ts ADDED Viewed

@@ -0,0 +1,8 @@
+export declare function isValidPublicToolName(name: string): boolean;
+/** Public names are display identities; only the catalog's exact route grants routing authority. */
+export declare function buildPublicToolName(server: string, upstreamIdentity: string): string;
+/** Configuration may reference an exact source name, its historical qualified name, or its current public name. */
+export declare function getSourceToolConfigReferences(server: string, upstreamIdentity: string): readonly string[];
+/** Config-only edits retain opaque public references while supporting historical qualified inputs. */
+export declare function matchesToolConfigReference(server: string, requested: string, configured: string): boolean;
+//# sourceMappingURL=toolNames.d.ts.map

package/build/utils/core/toolNames.d.ts.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"toolNames.d.ts","sourceRoot":"","sources":["../../../src/utils/core/toolNames.ts"],"names":[],"mappings":"AAOA,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAI3D;AAED,oGAAoG;AACpG,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,GAAG,MAAM,CASpF;AAED,mHAAmH;AACnH,wBAAgB,6BAA6B,CAAC,MAAM,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,GAAG,SAAS,MAAM,EAAE,CAMzG;AAED,sGAAsG;AACtG,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAGzG"}