@j0hanz/fetch-url-mcp 1.13.0 → 2.0.1

package/dist/lib/mcp-interop.d.ts

@@ -1,8 +1,7 @@
-import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
-import { McpError } from '@modelcontextprotocol/sdk/types.js';
+import { type JSONRPCRequest, type Progress, type ProgressNotification, type ProgressNotificationParams, ProtocolError, type ServerContext } from '@modelcontextprotocol/server';
 import type { ServerResponse } from 'node:http';
-import { z } from 'zod';
-export declare function createMcpError(code: number, message: string, data?: unknown): McpError;
+import type { z } from 'zod';
+export declare function createProtocolError(code: number, message: string, data?: unknown): ProtocolError;
 interface JsonRpcErrorPayload {
     code: number;
     message: string;
@@ -15,114 +14,16 @@ export declare function buildJsonRpcErrorBody(code: number, message: string, id?
 };
 export declare function sendJsonRpcError(res: ServerResponse, status: number, code: number, message: string, id?: JsonRpcId, data?: unknown): void;
 export type JsonRpcId = string | number | null;
-declare const jsonRpcRequestSchema: z.ZodObject<{
-    jsonrpc: z.ZodLiteral<"2.0">;
-    method: z.ZodString;
-    id: z.ZodOptional<z.ZodUnion<readonly [z.ZodString, z.ZodNumber]>>;
-    params: z.ZodOptional<z.ZodObject<{
-        _meta: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
-    }, z.core.$loose>>;
-}, z.core.$strict>;
-declare const jsonRpcResponseSchema: z.ZodUnion<readonly [z.ZodObject<{
-    jsonrpc: z.ZodLiteral<"2.0">;
-    id: z.ZodUnion<readonly [z.ZodString, z.ZodNumber]>;
-    result: z.ZodRecord<z.ZodString, z.ZodUnknown>;
-}, z.core.$strict>, z.ZodObject<{
-    jsonrpc: z.ZodLiteral<"2.0">;
-    id: z.ZodOptional<z.ZodUnion<[z.ZodUnion<readonly [z.ZodString, z.ZodNumber]>, z.ZodNull]>>;
-    error: z.ZodObject<{
-        code: z.ZodNumber;
-        message: z.ZodString;
-        data: z.ZodOptional<z.ZodUnknown>;
-    }, z.core.$strict>;
-}, z.core.$strict>]>;
-declare const jsonRpcMessageSchema: z.ZodUnion<readonly [z.ZodObject<{
-    jsonrpc: z.ZodLiteral<"2.0">;
-    method: z.ZodString;
-    id: z.ZodOptional<z.ZodUnion<readonly [z.ZodString, z.ZodNumber]>>;
-    params: z.ZodOptional<z.ZodObject<{
-        _meta: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
-    }, z.core.$loose>>;
-}, z.core.$strict>, z.ZodUnion<readonly [z.ZodObject<{
-    jsonrpc: z.ZodLiteral<"2.0">;
-    id: z.ZodUnion<readonly [z.ZodString, z.ZodNumber]>;
-    result: z.ZodRecord<z.ZodString, z.ZodUnknown>;
-}, z.core.$strict>, z.ZodObject<{
-    jsonrpc: z.ZodLiteral<"2.0">;
-    id: z.ZodOptional<z.ZodUnion<[z.ZodUnion<readonly [z.ZodString, z.ZodNumber]>, z.ZodNull]>>;
-    error: z.ZodObject<{
-        code: z.ZodNumber;
-        message: z.ZodString;
-        data: z.ZodOptional<z.ZodUnknown>;
-    }, z.core.$strict>;
-}, z.core.$strict>]>]>;
-type McpRequestBody = z.infer<typeof jsonRpcRequestSchema>;
-type JsonRpcResponseBody = z.infer<typeof jsonRpcResponseSchema>;
-type JsonRpcMessageBody = z.infer<typeof jsonRpcMessageSchema>;
 export declare function isJsonRpcBatchRequest(body: unknown): boolean;
-export declare function isMcpRequestBody(body: unknown): body is McpRequestBody;
-export declare function isJsonRpcResponseBody(body: unknown): body is JsonRpcResponseBody;
-export declare function isMcpMessageBody(body: unknown): body is JsonRpcMessageBody;
+export declare function isMcpRequestBody(body: unknown): body is JSONRPCRequest;
+export declare function isJsonRpcResponseBody(body: unknown): boolean;
+export declare function isMcpMessageBody(body: unknown): boolean;
 export declare function acceptsEventStream(header: string | null | undefined): boolean;
 export declare function acceptsJsonAndEventStream(header: string | null | undefined): boolean;
-type CleanupCallback = () => void;
-type RequestHandlerFn = (request: unknown, extra?: unknown) => Promise<unknown>;
-interface ToolPresentation {
-    icons?: {
-        src: string;
-        mimeType?: string;
-        sizes?: string[];
-    }[];
-}
-export declare function registerServerLifecycleCleanup(server: McpServer, callback: CleanupCallback): void;
-/**
- * Retrieves the SDK's internal request-handler map.
- *
- * Depends on SDK private API `_requestHandlers` (verified against ^1.28).
- * If the SDK changes this internal, the sdk-compat-guard.test.ts tests will fail.
- */
-export declare function getSdkCallToolHandler(server: McpServer): RequestHandlerFn | null;
-/**
- * Patches the SDK's internal capabilities to enable/disable task-mode tool calls.
- *
- * Depends on SDK private API `_capabilities.tasks.requests` (verified against ^1.28).
- * If the SDK changes this internal, the sdk-compat-guard.test.ts tests will fail.
- */
-export declare function setTaskToolCallCapability(server: McpServer, enabled: boolean): void;
-export declare function registerToolPresentation(server: McpServer, name: string, presentation: ToolPresentation): void;
-type ProgressToken = string | number;
-interface RequestMeta {
-    progressToken?: ProgressToken | undefined;
-    [key: string]: unknown;
-}
-export interface ProgressNotificationParams {
-    progressToken: ProgressToken;
-    progress: number;
-    total?: number;
-    message?: string;
-    _meta?: Record<string, unknown>;
-}
-export interface ProgressNotification {
-    method: 'notifications/progress';
-    params: ProgressNotificationParams;
-}
-export interface ToolHandlerExtra {
-    signal?: AbortSignal;
-    requestId?: string | number;
-    sessionId?: unknown;
-    requestInfo?: unknown;
-    _meta?: RequestMeta;
-    progressState?: {
-        closed: boolean;
-    };
-    sendNotification?: (notification: ProgressNotification) => Promise<void>;
-    onProgress?: (progress: number, message: string, total?: number) => void;
-    canReportProgress?: () => boolean;
-}
+export { type ProgressNotification, type ProgressNotificationParams };
 export interface ProgressReporter {
-    report: (progress: number, message: string, total?: number) => void;
+    report: (progress: Progress) => void;
 }
-export declare const createProgressReporter: (extra?: ToolHandlerExtra) => ProgressReporter;
+export declare const createProgressReporter: (ctx?: ServerContext) => ProgressReporter;
 export declare function validateOrThrow<T>(schema: z.ZodType<T>, data: unknown, errorCode: number, msg: string, logger: string): T;
-export {};
 //# sourceMappingURL=mcp-interop.d.ts.map

package/dist/lib/mcp-interop.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mcp-interop.d.ts","sourceRoot":"","sources":["../../src/lib/mcp-interop.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"mcp-interop.d.ts","sourceRoot":"","sources":["../../src/lib/mcp-interop.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,cAAc,EACnB,KAAK,QAAQ,EACb,KAAK,oBAAoB,EACzB,KAAK,0BAA0B,EAE/B,aAAa,EACb,KAAK,aAAa,EACnB,MAAM,8BAA8B,CAAC;AAEtC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAGhD,OAAO,KAAK,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAM7B,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,EACf,IAAI,CAAC,EAAE,OAAO,GACb,aAAa,CAEf;AAED,UAAU,mBAAmB;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAED,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,EACf,EAAE,GAAE,SAAgB,EACpB,IAAI,CAAC,EAAE,OAAO,GACb;IACD,OAAO,EAAE,KAAK,CAAC;IACf,KAAK,EAAE,mBAAmB,CAAC;IAC3B,EAAE,EAAE,SAAS,CAAC;CACf,CAUA;AAED,wBAAgB,gBAAgB,CAC9B,GAAG,EAAE,cAAc,EACnB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,EACf,EAAE,GAAE,SAAgB,EACpB,IAAI,CAAC,EAAE,OAAO,GACb,IAAI,CAMN;AAMD,MAAM,MAAM,SAAS,GAAG,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;AAC/C,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAE5D;AACD,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI,IAAI,cAAc,CAEtE;AACD,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAE5D;AACD,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAOvD;AAUD,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,OAAO,CAG7E;AACD,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAChC,OAAO,CAUT;AAMD,OAAO,EAAE,KAAK,oBAAoB,EAAE,KAAK,0BAA0B,EAAE,CAAC;AAEtE,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,CAAC,QAAQ,EAAE,QAAQ,KAAK,IAAI,CAAC;CACtC;AA0JD,eAAO,MAAM,sBAAsB,GAAI,MAAM,aAAa,KAAG,gBAC3B,CAAC;AAEnC,wBAAgB,eAAe,CAAC,CAAC,EAC/B,MAAM,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EACpB,IAAI,EAAE,OAAO,EACb,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,MAAM,GACb,CAAC,CAQH"}

package/dist/lib/mcp-interop.js

@@ -1,13 +1,10 @@
-import { ListToolsRequestSchema, ListToolsResultSchema, McpError, } from '@modelcontextprotocol/sdk/types.js';
+import { isJSONRPCErrorResponse, isJSONRPCNotification, isJSONRPCRequest, isJSONRPCResultResponse, ProtocolError, } from '@modelcontextprotocol/server';
 import { setTimeout as setTimeoutPromise } from 'node:timers/promises';
-import { z } from 'zod';
-import { logError, Loggers, logWarn } from './core.js';
+import { Loggers, logWarn } from './core.js';
 import { getErrorMessage } from './error/index.js';
-import { formatZodError, isObject } from './utils.js';
-export function createMcpError(code, message, data) {
-    const error = new McpError(code, message, data);
-    error.message = message;
-    return error;
+import { formatZodError } from './utils.js';
+export function createProtocolError(code, message, data) {
+    return ProtocolError.fromError(code, message, data);
 }
 export function buildJsonRpcErrorBody(code, message, id = null, data) {
     return {
@@ -27,49 +24,20 @@ export function sendJsonRpcError(res, status, code, message, id = null, data) {
     res.setHeader('Cache-Control', 'no-store');
     res.end(JSON.stringify(buildJsonRpcErrorBody(code, message, id, data)));
 }
-const paramsSchema = z.looseObject({
-    _meta: z.record(z.string(), z.unknown()).optional(),
-});
-const jsonRpcRequestIdSchema = z.union([z.string(), z.number()]);
-const jsonRpcRequestSchema = z.strictObject({
-    jsonrpc: z.literal('2.0'),
-    method: z.string().min(1),
-    id: jsonRpcRequestIdSchema.optional(),
-    params: paramsSchema.optional(),
-});
-const jsonRpcResultResponseSchema = z.strictObject({
-    jsonrpc: z.literal('2.0'),
-    id: jsonRpcRequestIdSchema,
-    result: z.record(z.string(), z.unknown()),
-});
-const jsonRpcErrorResponseSchema = z.strictObject({
-    jsonrpc: z.literal('2.0'),
-    id: jsonRpcRequestIdSchema.or(z.null()).optional(),
-    error: z.strictObject({
-        code: z.number().int(),
-        message: z.string(),
-        data: z.unknown().optional(),
-    }),
-});
-const jsonRpcResponseSchema = z.union([
-    jsonRpcResultResponseSchema,
-    jsonRpcErrorResponseSchema,
-]);
-const jsonRpcMessageSchema = z.union([
-    jsonRpcRequestSchema,
-    jsonRpcResponseSchema,
-]);
 export function isJsonRpcBatchRequest(body) {
     return Array.isArray(body);
 }
 export function isMcpRequestBody(body) {
-    return jsonRpcRequestSchema.safeParse(body).success;
+    return isJSONRPCRequest(body);
 }
 export function isJsonRpcResponseBody(body) {
-    return jsonRpcResponseSchema.safeParse(body).success;
+    return isJSONRPCResultResponse(body) || isJSONRPCErrorResponse(body);
 }
 export function isMcpMessageBody(body) {
-    return jsonRpcMessageSchema.safeParse(body).success;
+    return (isJSONRPCRequest(body) ||
+        isJSONRPCNotification(body) ||
+        isJSONRPCResultResponse(body) ||
+        isJSONRPCErrorResponse(body));
 }
 function parseAcceptMediaTypes(header) {
     if (!header)
@@ -90,178 +58,38 @@ export function acceptsJsonAndEventStream(header) {
         return false;
     return mediaTypes.some((m) => m === '*/*' || m === 'text/event-stream' || m === 'text/*');
 }
-function getNestedRecord(value, key) {
-    const nested = value[key];
-    return isObject(nested) ? nested : undefined;
-}
-const patchedCleanupServers = new WeakSet();
-const serverCleanupCallbacks = new WeakMap();
-function getServerCleanupCallbackSet(server) {
-    let callbacks = serverCleanupCallbacks.get(server);
-    if (!callbacks) {
-        callbacks = new Set();
-        serverCleanupCallbacks.set(server, callbacks);
-    }
-    return callbacks;
-}
-function drainServerCleanupCallbacks(server) {
-    const callbacks = serverCleanupCallbacks.get(server);
-    if (!callbacks || callbacks.size === 0)
-        return;
-    const pending = [...callbacks];
-    callbacks.clear();
-    for (const callback of pending) {
-        try {
-            callback();
-        }
-        catch (error) {
-            logWarn('Server cleanup callback failed', { error }, Loggers.LOG_MCP);
-        }
-    }
-}
-function ensureServerCleanupHooks(server) {
-    if (patchedCleanupServers.has(server))
-        return;
-    patchedCleanupServers.add(server);
-    const originalOnClose = server.server.onclose;
-    server.server.onclose = () => {
-        drainServerCleanupCallbacks(server);
-        originalOnClose?.();
-    };
-    const originalClose = server.close.bind(server);
-    server.close = async () => {
-        drainServerCleanupCallbacks(server);
-        await originalClose();
-    };
-}
-export function registerServerLifecycleCleanup(server, callback) {
-    ensureServerCleanupHooks(server);
-    getServerCleanupCallbackSet(server).add(callback);
-}
-/**
- * Retrieves the SDK's internal request-handler map.
- *
- * Depends on SDK private API `_requestHandlers` (verified against ^1.28).
- * If the SDK changes this internal, the sdk-compat-guard.test.ts tests will fail.
- */
-export function getSdkCallToolHandler(server) {
-    const maybeHandlers = Reflect.get(server.server, '_requestHandlers');
-    if (!(maybeHandlers instanceof Map))
-        return null;
-    const handler = maybeHandlers.get('tools/call');
-    return typeof handler === 'function' ? handler : null;
-}
-function getSdkListToolsHandler(server) {
-    const maybeHandlers = Reflect.get(server.server, '_requestHandlers');
-    if (!(maybeHandlers instanceof Map))
-        return null;
-    const handler = maybeHandlers.get('tools/list');
-    return typeof handler === 'function' ? handler : null;
-}
-/**
- * Patches the SDK's internal capabilities to enable/disable task-mode tool calls.
- *
- * Depends on SDK private API `_capabilities.tasks.requests` (verified against ^1.28).
- * If the SDK changes this internal, the sdk-compat-guard.test.ts tests will fail.
- */
-export function setTaskToolCallCapability(server, enabled) {
-    const capabilities = Reflect.get(server.server, '_capabilities');
-    if (!isObject(capabilities))
-        return;
-    const tasks = getNestedRecord(capabilities, 'tasks');
-    if (!tasks)
-        return;
-    const requests = getNestedRecord(tasks, 'requests');
-    if (!requests)
-        return;
-    if (enabled) {
-        requests['tools'] = { call: {} };
-        return;
-    }
-    delete requests['tools'];
-}
-const toolPresentationByServer = new WeakMap();
-const patchedToolListServers = new WeakSet();
-function getServerToolPresentationMap(server) {
-    let toolMap = toolPresentationByServer.get(server);
-    if (toolMap)
-        return toolMap;
-    toolMap = new Map();
-    toolPresentationByServer.set(server, toolMap);
-    registerServerLifecycleCleanup(server, () => {
-        toolPresentationByServer.delete(server);
-    });
-    return toolMap;
-}
-function patchSdkToolListHandler(server) {
-    if (patchedToolListServers.has(server))
-        return;
-    const sdkListToolsHandler = getSdkListToolsHandler(server);
-    if (!sdkListToolsHandler)
-        return;
-    patchedToolListServers.add(server);
-    server.server.setRequestHandler(ListToolsRequestSchema, async (request, extra) => {
-        const parsed = ListToolsResultSchema.parse(await sdkListToolsHandler(request, extra));
-        const presentations = getServerToolPresentationMap(server);
-        return {
-            ...parsed,
-            tools: parsed.tools.map((tool) => {
-                if (typeof tool.name !== 'string') {
-                    return tool;
-                }
-                const presentation = presentations.get(tool.name);
-                if (!presentation?.icons?.length)
-                    return tool;
-                return {
-                    ...tool,
-                    icons: presentation.icons,
-                };
-            }),
-        };
-    });
-}
-export function registerToolPresentation(server, name, presentation) {
-    getServerToolPresentationMap(server).set(name, presentation);
-    patchSdkToolListHandler(server);
-}
+/* =================================================================================================
+ * Progress reporting
+ * ================================================================================================= */
+export {};
 const PROGRESS_NOTIFICATION_TIMEOUT_MS = 5000;
 const PROGRESS_NOTIFICATION_MIN_INTERVAL_MS = 100;
-function resolveRelatedTaskMeta(meta) {
-    const related = meta?.['modelcontextprotocol.io/related-task'];
-    if (!isObject(related))
-        return undefined;
-    const { taskId } = related;
-    return typeof taskId === 'string' ? { taskId } : undefined;
-}
 class ToolProgressReporter {
     token;
-    handlers;
-    progressState;
-    taskMeta;
+    send;
     lastProgress = -1;
-    lastMessage;
     lastTotal;
     pendingNotification;
     isDispatching = false;
     lastDispatchedAt = 0;
-    constructor(token, handlers, progressState, taskMeta) {
+    constructor(token, send) {
         this.token = token;
-        this.handlers = handlers;
-        this.progressState = progressState;
-        this.taskMeta = taskMeta;
+        this.send = send;
     }
-    static create(extra = {}) {
-        const token = extra._meta?.progressToken ?? null;
-        const { onProgress } = extra;
-        if (token === null && !onProgress) {
+    static create(ctx) {
+        if (!ctx) {
             return { report: () => { } };
         }
-        const reporter = new ToolProgressReporter(token, {
-            send: extra.sendNotification,
-            onProgress,
-            canReport: extra.canReportProgress,
-        }, extra.progressState, resolveRelatedTaskMeta(extra._meta));
-        return reporter;
+        const meta = ctx.mcpReq._meta;
+        const token = meta?.progressToken ?? null;
+        if (token === null) {
+            return { report: () => { } };
+        }
+        const send = (notification) => ctx.mcpReq.notify({
+            method: notification.method,
+            params: { ...notification.params },
+        });
+        return new ToolProgressReporter(token, send);
     }
     /**
      * Report progress toward completion. Steps are monotonic (never decrease)
@@ -269,52 +97,30 @@ class ToolProgressReporter {
      * intermediate steps). Clients should treat progress as "at least this far"
      * rather than expecting every step to fire sequentially.
      */
-    report(progress, message, total) {
-        if (this.progressState?.closed === true ||
-            this.handlers.canReport?.() === false) {
-            return;
-        }
+    report(input) {
+        const { progress, message, total } = input;
         const effectiveProgress = Math.max(progress, this.lastProgress);
         const effectiveTotal = total === undefined ? this.lastTotal : Math.max(total, effectiveProgress);
         const isIncreasing = effectiveProgress > this.lastProgress;
-        const isMessageChanged = message !== this.lastMessage;
-        const isTotalChanged = effectiveTotal !== this.lastTotal;
         this.lastProgress = effectiveProgress;
-        this.lastMessage = message;
         this.lastTotal = effectiveTotal;
-        if (isIncreasing || isMessageChanged || isTotalChanged) {
-            try {
-                this.handlers.onProgress?.(effectiveProgress, message, effectiveTotal);
-            }
-            catch (error) {
-                logError('Progress callback failed', {
-                    error: getErrorMessage(error),
-                    progress: effectiveProgress,
-                    message,
-                }, Loggers.LOG_MCP);
-            }
-        }
-        if (!isIncreasing || this.token === null || !this.handlers.send)
+        if (!isIncreasing)
             return;
         this.pendingNotification = this.createProgressNotification({
             token: this.token,
             progress: effectiveProgress,
-            message,
+            ...(message !== undefined ? { message } : {}),
             ...(effectiveTotal !== undefined ? { total: effectiveTotal } : {}),
         });
         this.flushNotifications();
     }
     flushNotifications() {
-        if (this.isDispatching || !this.handlers.send)
+        if (this.isDispatching)
             return;
         this.isDispatching = true;
         void (async () => {
             try {
                 while (this.pendingNotification) {
-                    if (this.handlers.canReport?.() === false) {
-                        this.pendingNotification = undefined;
-                        return;
-                    }
                     const remainingDelay = this.lastDispatchedAt +
                         PROGRESS_NOTIFICATION_MIN_INTERVAL_MS -
                         Date.now();
@@ -333,8 +139,6 @@ class ToolProgressReporter {
         })();
     }
     async sendWithTimeout(notification) {
-        if (!this.handlers.send)
-            return;
         const ac = new AbortController();
         const timeoutPromise = setTimeoutPromise(PROGRESS_NOTIFICATION_TIMEOUT_MS, { timeout: true }, { signal: ac.signal, ref: false }).catch((err) => {
             if (err.name === 'AbortError')
@@ -343,7 +147,7 @@ class ToolProgressReporter {
         });
         try {
             const outcome = await Promise.race([
-                this.handlers.send(notification).then(() => {
+                this.send(notification).then(() => {
                     ac.abort();
                     return { ok: true };
                 }),
@@ -371,23 +175,18 @@ class ToolProgressReporter {
                 progressToken: params.token,
                 progress: params.progress,
                 ...(params.total !== undefined ? { total: params.total } : {}),
-                message: params.message,
-                ...(this.taskMeta && {
-                    _meta: {
-                        'modelcontextprotocol.io/related-task': this.taskMeta,
-                    },
-                }),
+                ...(params.message !== undefined ? { message: params.message } : {}),
             },
         };
     }
 }
-export const createProgressReporter = (extra) => ToolProgressReporter.create(extra);
+export const createProgressReporter = (ctx) => ToolProgressReporter.create(ctx);
 export function validateOrThrow(schema, data, errorCode, msg, logger) {
     const result = schema.safeParse(data);
     if (!result.success) {
         const issues = formatZodError(result.error);
         logWarn(`Zod validation failed: ${msg}`, { issues }, logger);
-        throw createMcpError(errorCode, msg, { issues });
+        throw createProtocolError(errorCode, msg, { issues });
     }
     return result.data;
 }

package/dist/lib/net/http.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../../../src/lib/net/http.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,KAAK,EAAmB,MAAM,QAAQ,CAAC;AAwBhD,OAAO,EAQL,KAAK,eAAe,EAErB,MAAM,UAAU,CAAC;AAywClB,UAAU,qBAAqB;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAoKD,UAAU,YAAY;IACpB,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AA6ND,wBAAgB,WAAW,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAE/C;AACD,wBAAgB,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG;IAC/C,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;CAClB,CAEA;AACD,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAEjE;AACD,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,eAAe,CAE9D;AACD,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAExD;AACD,wBAAgB,mBAAmB,CACjC,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,MAAM,GACb,qBAAqB,CAEvB;AACD,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,qBAAqB,EAC9B,QAAQ,EAAE,QAAQ,EAClB,WAAW,CAAC,EAAE,MAAM,GACnB,IAAI,CAEN;AACD,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,qBAAqB,EAC9B,KAAK,EAAE,OAAO,EACd,MAAM,CAAC,EAAE,MAAM,GACd,IAAI,CAEN;AACD,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,WAAW,EACjB,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC;IAAE,QAAQ,EAAE,QAAQ,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,KAAK,CAAA;CAAE,CAAC,CAE7D;AACD,wBAAsB,gBAAgB,CACpC,QAAQ,EAAE,QAAQ,EAClB,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,MAAM,EAChB,MAAM,CAAC,EAAE,WAAW,EACpB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,CASzC;AACD,wBAAsB,kBAAkB,CACtC,aAAa,EAAE,MAAM,EACrB,OAAO,CAAC,EAAE,YAAY,GACrB,OAAO,CAAC,MAAM,CAAC,CAEjB;AACD,wBAAsB,wBAAwB,CAC5C,aAAa,EAAE,MAAM,EACrB,OAAO,CAAC,EAAE,YAAY,GACrB,OAAO,CAAC;IACT,MAAM,EAAE,UAAU,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,OAAO,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC,CAED"}
+{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../../../src/lib/net/http.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,KAAK,EAAyC,MAAM,QAAQ,CAAC;AAwBtE,OAAO,EAQL,KAAK,eAAe,EAErB,MAAM,UAAU,CAAC;AA4vClB,UAAU,qBAAqB;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAoKD,UAAU,YAAY;IACpB,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AAiOD,wBAAgB,WAAW,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAE/C;AACD,wBAAgB,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG;IAC/C,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;CAClB,CAEA;AACD,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAEjE;AACD,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,eAAe,CAE9D;AACD,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAExD;AACD,wBAAgB,mBAAmB,CACjC,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,MAAM,GACb,qBAAqB,CAEvB;AACD,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,qBAAqB,EAC9B,QAAQ,EAAE,QAAQ,EAClB,WAAW,CAAC,EAAE,MAAM,GACnB,IAAI,CAEN;AACD,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,qBAAqB,EAC9B,KAAK,EAAE,OAAO,EACd,MAAM,CAAC,EAAE,MAAM,GACd,IAAI,CAEN;AACD,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,WAAW,EACjB,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC;IAAE,QAAQ,EAAE,QAAQ,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,KAAK,CAAA;CAAE,CAAC,CAE7D;AACD,wBAAsB,gBAAgB,CACpC,QAAQ,EAAE,QAAQ,EAClB,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,MAAM,EAChB,MAAM,CAAC,EAAE,WAAW,EACpB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,CASzC;AACD,wBAAsB,kBAAkB,CACtC,aAAa,EAAE,MAAM,EACrB,OAAO,CAAC,EAAE,YAAY,GACrB,OAAO,CAAC,MAAM,CAAC,CAEjB;AACD,wBAAsB,wBAAwB,CAC5C,aAAa,EAAE,MAAM,EACrB,OAAO,CAAC,EAAE,YAAY,GACrB,OAAO,CAAC;IACT,MAAM,EAAE,UAAU,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,OAAO,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC,CAED"}

package/dist/lib/net/http.js

@@ -6,7 +6,7 @@ import { finished, pipeline } from 'node:stream/promises';
 import {} from 'node:stream/web';
 import tls from 'node:tls';
 import { createBrotliDecompress, createGunzip, createInflate } from 'node:zlib';
-import { Agent } from 'undici';
+import { Agent, fetch as undiciFetch } from 'undici';
 import { config } from '../config.js';
 import { getOperationId, getRequestId, logDebug, logError, Loggers, logWarn, redactUrl, } from '../core.js';
 import { FetchError, invalidRedirectError, isAbortError, isError, isSystemError, redirectCredentialsError, SystemErrors, toError, unsupportedProtocolError, } from '../error/index.js';
@@ -28,26 +28,13 @@ function getCharsetFromContentType(contentType) {
     }
     return charset.trim();
 }
-const MAX_CACHED_DECODERS = 50;
-const decoderCache = new Map();
 function createDecoder(encoding) {
     const label = normalizeEncodingLabel(encoding) || 'utf-8';
-    const cached = decoderCache.get(label);
-    if (cached)
-        return cached;
     try {
-        const decoder = new TextDecoder(label);
-        if (decoderCache.size < MAX_CACHED_DECODERS) {
-            decoderCache.set(label, decoder);
-        }
-        return decoder;
+        return new TextDecoder(label);
     }
     catch {
-        const fallback = decoderCache.get('utf-8') ?? new TextDecoder('utf-8');
-        if (decoderCache.size < MAX_CACHED_DECODERS) {
-            decoderCache.set('utf-8', fallback);
-        }
-        return fallback;
+        return new TextDecoder('utf-8');
     }
 }
 function decodeBuffer(buffer, encoding) {
@@ -1062,7 +1049,7 @@ const defaultContext = {
 const defaultRedactor = {
     redact: redactUrl,
 };
-const defaultFetch = (input, init) => globalThis.fetch(input, init);
+const defaultFetch = async (input, init) => undiciFetch(input, init);
 class HttpFetcher {
     fetcherConfig;
     redirectFollower;

package/dist/resources/index.d.ts

@@ -1,4 +1,4 @@
-import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+import { type McpServer } from '@modelcontextprotocol/server';
 import { type IconInfo } from '../lib/utils.js';
 export declare function registerInstructionResource(server: McpServer, instructions: string, iconInfo?: IconInfo): void;
 export declare const HELP_TOPICS: readonly ["capabilities", "workflows", "constraints", "errors"];

package/dist/resources/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/resources/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AASzE,OAAO,EAAsB,KAAK,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAOpE,wBAAgB,2BAA2B,CACzC,MAAM,EAAE,SAAS,EACjB,YAAY,EAAE,MAAM,EACpB,QAAQ,CAAC,EAAE,QAAQ,GAClB,IAAI,CAwBN;AAED,eAAO,MAAM,WAAW,iEAKd,CAAC;AAEX,MAAM,MAAM,SAAS,GAAG,CAAC,OAAO,WAAW,CAAC,CAAC,MAAM,CAAC,CAAC;AAErD,wBAAgB,cAAc,CAC5B,YAAY,EAAE,MAAM,EACpB,KAAK,EAAE,SAAS,GACf,MAAM,GAAG,SAAS,CAIpB;AAED,wBAAgB,kBAAkB,CAChC,YAAY,EAAE,MAAM,EACpB,KAAK,CAAC,EAAE,MAAM,GACb,MAAM,CAKR;AAED,wBAAgB,uBAAuB,IAAI,MAAM,CA4DhD;AAiBD,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,SAAS,EACjB,YAAY,EAAE,MAAM,EACpB,QAAQ,CAAC,EAAE,QAAQ,GAClB,IAAI,CA2BN"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/resources/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,SAAS,EAEf,MAAM,8BAA8B,CAAC;AAKtC,OAAO,EAAsB,KAAK,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAOpE,wBAAgB,2BAA2B,CACzC,MAAM,EAAE,SAAS,EACjB,YAAY,EAAE,MAAM,EACpB,QAAQ,CAAC,EAAE,QAAQ,GAClB,IAAI,CAwBN;AAED,eAAO,MAAM,WAAW,iEAKd,CAAC;AAEX,MAAM,MAAM,SAAS,GAAG,CAAC,OAAO,WAAW,CAAC,CAAC,MAAM,CAAC,CAAC;AAErD,wBAAgB,cAAc,CAC5B,YAAY,EAAE,MAAM,EACpB,KAAK,EAAE,SAAS,GACf,MAAM,GAAG,SAAS,CAIpB;AAED,wBAAgB,kBAAkB,CAChC,YAAY,EAAE,MAAM,EACpB,KAAK,CAAC,EAAE,MAAM,GACb,MAAM,CAKR;AAED,wBAAgB,uBAAuB,IAAI,MAAM,CAmEhD;AAiBD,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,SAAS,EACjB,YAAY,EAAE,MAAM,EACpB,QAAQ,CAAC,EAAE,QAAQ,GAClB,IAAI,CA2BN"}