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

package/build/transport/sseWireLimit.js

@@ -0,0 +1,227 @@
+/** Limits bytes retained by the SSE parser before JSON parsing can allocate a message. */
+export const SSE_WIRE_LIMIT_BYTES = 8 * 1024 * 1024;
+export class SseWireLimitError extends Error {
+    constructor() {
+        super(`Upstream SSE frame exceeds the ${SSE_WIRE_LIMIT_BYTES}-byte wire limit`);
+        this.name = 'SseWireLimitError';
+    }
+}
+/** Byte-only accounting leaves decoding, fields, and emitted messages to the SDK parser. */
+class SseWireCounter {
+    limit;
+    lineBytes = 0;
+    field = '';
+    valueStarted = false;
+    dataField = false;
+    firstValueByte = false;
+    dataBytes = 0;
+    dataFields = 0;
+    afterCR = false;
+    initialBytes = [];
+    initial = true;
+    constructor(limit) {
+        this.limit = limit;
+    }
+    accept(chunk) {
+        for (const byte of chunk) {
+            if (this.initial) {
+                this.initialBytes.push(byte);
+                const bom = [0xef, 0xbb, 0xbf];
+                if (byte === bom[this.initialBytes.length - 1]) {
+                    if (this.initialBytes.length === 3) {
+                        this.initial = false;
+                        this.lineBytes = 3;
+                        if (this.lineBytes > this.limit)
+                            throw new SseWireLimitError();
+                        this.initialBytes = [];
+                    }
+                    continue;
+                }
+                this.initial = false;
+                for (const initialByte of this.initialBytes)
+                    this.acceptByte(initialByte);
+                this.initialBytes = [];
+                continue;
+            }
+            this.acceptByte(byte);
+        }
+    }
+    finish() {
+        // An incomplete initial BOM is ordinary input, even when EOF splits its bytes.
+        for (const byte of this.initialBytes)
+            this.acceptByte(byte);
+        this.initialBytes = [];
+    }
+    acceptByte(byte) {
+        if (this.afterCR) {
+            this.afterCR = false;
+            if (byte === 10)
+                return;
+        }
+        if (byte === 10 || byte === 13) {
+            this.endLine();
+            this.afterCR = byte === 13;
+            return;
+        }
+        this.lineBytes++;
+        if (this.lineBytes > this.limit)
+            throw new SseWireLimitError();
+        if (!this.valueStarted) {
+            if (byte === 58) {
+                this.valueStarted = true;
+                this.dataField = this.field === 'data';
+                this.firstValueByte = true;
+                if (this.dataField)
+                    this.beginDataField();
+                return;
+            }
+            // Retain only enough bytes to recognize "data"; arbitrary field names stay bounded.
+            if (this.field.length < 5)
+                this.field += String.fromCharCode(byte);
+            return;
+        }
+        if (!this.dataField)
+            return;
+        if (this.firstValueByte) {
+            this.firstValueByte = false;
+            if (byte === 32)
+                return;
+        }
+        this.addDataBytes(1);
+    }
+    beginDataField() {
+        if (this.dataFields > 0)
+            this.addDataBytes(1); // Parser-inserted LF between data fields.
+        this.dataFields++;
+    }
+    addDataBytes(bytes) {
+        this.dataBytes += bytes;
+        if (this.dataBytes > this.limit)
+            throw new SseWireLimitError();
+    }
+    endLine() {
+        if (this.lineBytes === 0) {
+            this.dataBytes = 0;
+            this.dataFields = 0;
+        }
+        else if (!this.valueStarted && this.field === 'data') {
+            this.beginDataField(); // A field without a colon has an empty value.
+        }
+        this.lineBytes = 0;
+        this.field = '';
+        this.valueStarted = false;
+        this.dataField = false;
+        this.firstValueByte = false;
+    }
+}
+/** Each transport receives a fresh guard, including when the factory recreates it. */
+export function createSseWireLimitedFetch(fetchImpl, owner, limit = SSE_WIRE_LIMIT_BYTES) {
+    let terminalError;
+    return async (input, init) => {
+        if (terminalError)
+            throw terminalError;
+        const response = await (fetchImpl ?? fetch)(input, init);
+        if (!response.body ||
+            response.headers.get('content-type')?.split(';')[0].trim().toLowerCase() !== 'text/event-stream') {
+            return response;
+        }
+        const reader = response.body.getReader();
+        let cleanupPromise;
+        const cleanup = (reason) => {
+            cleanupPromise ??= reader
+                .cancel(reason)
+                .catch(() => { })
+                .finally(() => reader.releaseLock());
+            return cleanupPromise;
+        };
+        const counter = new SseWireCounter(limit);
+        const body = new ReadableStream({
+            async pull(controller) {
+                try {
+                    const next = await reader.read();
+                    if (next.done) {
+                        counter.finish();
+                        controller.close();
+                        reader.releaseLock();
+                        return;
+                    }
+                    counter.accept(next.value);
+                    controller.enqueue(next.value);
+                }
+                catch (error) {
+                    // Cancellation can take time; settle the body and transport immediately.
+                    void cleanup(error);
+                    if (error instanceof SseWireLimitError && !terminalError) {
+                        terminalError = error;
+                        // Report the bounded reason to pending requests, then close before the
+                        // body error reaches SDK/EventSource reconnect handling.
+                        const transport = owner();
+                        failPendingStart(transport, error);
+                        try {
+                            transport.onerror?.(error);
+                        }
+                        catch {
+                            // Consumer callbacks cannot prevent cancellation or surface unsafe data.
+                        }
+                        void transport.close().catch(() => { });
+                    }
+                    controller.error(error);
+                }
+            },
+            async cancel(reason) {
+                await cleanup(reason);
+            },
+        });
+        const boundedResponse = new Response(body, {
+            status: response.status,
+            statusText: response.statusText,
+            headers: response.headers,
+        });
+        Object.defineProperties(boundedResponse, {
+            url: { value: response.url },
+            redirected: { value: response.redirected },
+            type: { value: response.type },
+        });
+        return boundedResponse;
+    };
+}
+const transportFetchDelegates = new WeakMap();
+function failPendingStart(transport, error) {
+    const binding = transportFetchDelegates.get(transport);
+    if (!binding)
+        return;
+    binding.terminalError = error;
+    for (const reject of binding.pendingStarts)
+        reject(error);
+}
+/** Remember the delegate separately from SDK wrappers and settle a pending SSE handshake. */
+export function registerSseWireLimitOwner(transport, fetchImpl) {
+    const binding = { fetch: fetchImpl, pendingStarts: new Set() };
+    transportFetchDelegates.set(transport, binding);
+    if (!transport.start)
+        return;
+    const start = transport.start.bind(transport);
+    transport.start = async () => {
+        if (binding.terminalError)
+            throw binding.terminalError;
+        let rejectStart;
+        const failed = new Promise((_resolve, reject) => {
+            rejectStart = reject;
+        });
+        binding.pendingStarts.add(rejectStart);
+        try {
+            await Promise.race([start(), failed]);
+        }
+        finally {
+            binding.pendingStarts.delete(rejectStart);
+        }
+    };
+}
+/** Recreate from the trusted delegate rather than the SDK's wrapped private fetch. */
+export function getSseWireLimitBinding(transport) {
+    const binding = transportFetchDelegates.get(transport);
+    if (!binding)
+        return undefined;
+    return { fetch: binding.fetch };
+}
+//# sourceMappingURL=sseWireLimit.js.map

package/build/transport/sseWireLimit.js.map

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

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

@@ -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

@@ -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"}
+{"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

@@ -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

@@ -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"}
+{"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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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"}

package/build/utils/core/toolNames.js

@@ -0,0 +1,56 @@
+import { MCP_URI_SEPARATOR } from '../../constants/mcp.js';
+import { InvalidRequestError } from './errorTypes.js';
+import { buildToolName, buildUri } from './parsing.js';
+const MAX_PUBLIC_TOOL_NAME_LENGTH = 64;
+export function isValidPublicToolName(name) {
+    if (!name.length)
+        return false;
+    if (name.length > MAX_PUBLIC_TOOL_NAME_LENGTH)
+        return false;
+    return !/[^A-Za-z0-9_./-]/u.test(name);
+}
+/** Public names are display identities; only the catalog's exact route grants routing authority. */
+export function buildPublicToolName(server, upstreamIdentity) {
+    const canonical = buildUri(server, upstreamIdentity, MCP_URI_SEPARATOR);
+    for (const character of canonical) {
+        const point = character.codePointAt(0);
+        if (point >= 0xd800 && point <= 0xdfff) {
+            throw new InvalidRequestError('Tool identity must contain only Unicode scalar values');
+        }
+    }
+    return buildToolName(server, upstreamIdentity);
+}
+/** Configuration may reference an exact source name, its historical qualified name, or its current public name. */
+export function getSourceToolConfigReferences(server, upstreamIdentity) {
+    return [
+        upstreamIdentity.trim(),
+        buildUri(server, upstreamIdentity, MCP_URI_SEPARATOR),
+        buildPublicToolName(server, upstreamIdentity),
+    ];
+}
+/** Config-only edits retain opaque public references while supporting historical qualified inputs. */
+export function matchesToolConfigReference(server, requested, configured) {
+    if (toolConfigReferenceVariants(server, requested).has(configured))
+        return true;
+    return toolConfigReferenceVariants(server, configured).has(requested);
+}
+function toolConfigReferenceVariants(server, reference) {
+    const normalized = reference.trim();
+    const prefix = `${server}${MCP_URI_SEPARATOR}`;
+    const legacyRaw = normalized.startsWith(prefix) ? normalized.slice(prefix.length).trim() : normalized;
+    const variants = new Set([normalized]);
+    for (const sourceName of [normalized, legacyRaw]) {
+        if (!sourceName)
+            continue;
+        variants.add(sourceName);
+        variants.add(`${prefix}${sourceName}`);
+        try {
+            variants.add(buildPublicToolName(server, sourceName));
+        }
+        catch {
+            // Invalid config-only references stay opaque and never grant a catalog route.
+        }
+    }
+    return variants;
+}
+//# sourceMappingURL=toolNames.js.map

package/build/utils/core/toolNames.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"toolNames.js","sourceRoot":"","sources":["../../../src/utils/core/toolNames.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAE1D,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAEvD,MAAM,2BAA2B,GAAG,EAAE,CAAC;AAEvC,MAAM,UAAU,qBAAqB,CAAC,IAAY;IAChD,IAAI,CAAC,IAAI,CAAC,MAAM;QAAE,OAAO,KAAK,CAAC;IAC/B,IAAI,IAAI,CAAC,MAAM,GAAG,2BAA2B;QAAE,OAAO,KAAK,CAAC;IAC5D,OAAO,CAAC,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACzC,CAAC;AAED,oGAAoG;AACpG,MAAM,UAAU,mBAAmB,CAAC,MAAc,EAAE,gBAAwB;IAC1E,MAAM,SAAS,GAAG,QAAQ,CAAC,MAAM,EAAE,gBAAgB,EAAE,iBAAiB,CAAC,CAAC;IACxE,KAAK,MAAM,SAAS,IAAI,SAAS,EAAE,CAAC;QAClC,MAAM,KAAK,GAAG,SAAS,CAAC,WAAW,CAAC,CAAC,CAAE,CAAC;QACxC,IAAI,KAAK,IAAI,MAAM,IAAI,KAAK,IAAI,MAAM,EAAE,CAAC;YACvC,MAAM,IAAI,mBAAmB,CAAC,uDAAuD,CAAC,CAAC;QACzF,CAAC;IACH,CAAC;IACD,OAAO,aAAa,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;AACjD,CAAC;AAED,mHAAmH;AACnH,MAAM,UAAU,6BAA6B,CAAC,MAAc,EAAE,gBAAwB;IACpF,OAAO;QACL,gBAAgB,CAAC,IAAI,EAAE;QACvB,QAAQ,CAAC,MAAM,EAAE,gBAAgB,EAAE,iBAAiB,CAAC;QACrD,mBAAmB,CAAC,MAAM,EAAE,gBAAgB,CAAC;KAC9C,CAAC;AACJ,CAAC;AAED,sGAAsG;AACtG,MAAM,UAAU,0BAA0B,CAAC,MAAc,EAAE,SAAiB,EAAE,UAAkB;IAC9F,IAAI,2BAA2B,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC;QAAE,OAAO,IAAI,CAAC;IAChF,OAAO,2BAA2B,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;AACxE,CAAC;AAED,SAAS,2BAA2B,CAAC,MAAc,EAAE,SAAiB;IACpE,MAAM,UAAU,GAAG,SAAS,CAAC,IAAI,EAAE,CAAC;IACpC,MAAM,MAAM,GAAG,GAAG,MAAM,GAAG,iBAAiB,EAAE,CAAC;IAC/C,MAAM,SAAS,GAAG,UAAU,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC;IACtG,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC;IACvC,KAAK,MAAM,UAAU,IAAI,CAAC,UAAU,EAAE,SAAS,CAAC,EAAE,CAAC;QACjD,IAAI,CAAC,UAAU;YAAE,SAAS;QAC1B,QAAQ,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QACzB,QAAQ,CAAC,GAAG,CAAC,GAAG,MAAM,GAAG,UAAU,EAAE,CAAC,CAAC;QACvC,IAAI,CAAC;YACH,QAAQ,CAAC,GAAG,CAAC,mBAAmB,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC;QACxD,CAAC;QAAC,MAAM,CAAC;YACP,8EAA8E;QAChF,CAAC;IACH,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC"}