@j0hanz/fetch-url-mcp 1.12.13 → 2.0.1

package/dist/tasks/store.d.ts

@@ -1,4 +1,4 @@
-export type TaskStatus = 'submitted' | 'working' | 'input_required' | 'completed' | 'failed' | 'cancelled';
+export type TaskStatus = 'working' | 'input_required' | 'completed' | 'failed' | 'cancelled';
 export interface TaskError {
     code: number;
     message: string;
@@ -9,18 +9,25 @@ export interface TaskState {
     ownerKey: string;
     status: TaskStatus;
     statusMessage?: string;
-    progress?: number;
-    total?: number;
     createdAt: string;
     lastUpdatedAt: string;
-    keepAlive: number;
-    pollFrequency: number;
+    ttl: number | null;
+    pollInterval: number;
     result?: unknown;
     error?: TaskError;
+    requestId?: string;
+    requestMethod?: string;
+    requestMeta?: Record<string, unknown>;
+    context?: Record<string, unknown>;
 }
 interface CreateTaskOptions {
     taskId?: string;
-    keepAlive?: number;
+    ttl?: number | null;
+    pollInterval?: number;
+    requestId?: string;
+    requestMethod?: string;
+    requestMeta?: Record<string, unknown>;
+    context?: Record<string, unknown>;
 }
 export interface CreateTaskResult {
     [key: string]: unknown;
@@ -28,20 +35,25 @@ export interface CreateTaskResult {
         taskId: string;
         status: TaskStatus;
         statusMessage?: string;
-        progress?: number;
-        total?: number;
         createdAt: string;
         lastUpdatedAt: string;
-        keepAlive: number;
-        pollFrequency: number;
-        ttl: number;
+        ttl: number | null;
         pollInterval: number;
     };
 }
+interface TerminalTaskErrorResult {
+    content: [{
+        type: 'text';
+        text: string;
+    }];
+    isError: true;
+}
+export declare function createTerminalTaskErrorResult(task: Pick<TaskState, 'taskId' | 'status' | 'statusMessage' | 'error'>): TerminalTaskErrorResult | undefined;
 declare class TaskManager {
     private tasks;
     private ownerCounts;
     private readonly waiters;
+    private readonly statusListeners;
     private cleanupInterval;
     private ensureCleanupLoop;
     private stopCleanupLoop;
@@ -50,13 +62,15 @@ declare class TaskManager {
     private removeTask;
     private applyTaskUpdate;
     private cancelActiveTask;
+    private emitStatus;
+    onStatusChange(listener: (task: TaskState) => void): () => void;
     private releaseTaskCapacity;
     private reserveTaskCapacity;
     createTask(options?: CreateTaskOptions, statusMessage?: string, ownerKey?: string): TaskState;
     private lookupActiveTask;
     getTask(taskId: string, ownerKey?: string): TaskState | undefined;
-    updateTask(taskId: string, updates: Partial<Omit<TaskState, 'taskId' | 'createdAt'>>): void;
-    cancelTask(taskId: string, ownerKey?: string): TaskState | undefined;
+    updateTask(taskId: string, updates: Partial<Omit<TaskState, 'taskId' | 'createdAt'>>, silent?: boolean): void;
+    cancelTask(taskId: string, ownerKey?: string, silent?: boolean): TaskState | undefined;
     deleteTask(taskId: string, ownerKey?: string): boolean;
     cancelTasksByOwner(ownerKey: string, statusMessage?: string): TaskState[];
     private collectPage;
@@ -70,7 +84,7 @@ declare class TaskManager {
     };
     private resolveAnchorTaskId;
     waitForTerminalTask(taskId: string, ownerKey: string, signal?: AbortSignal): Promise<TaskState | undefined>;
-    shrinkKeepAliveAfterDelivery(taskId: string): void;
+    shrinkTtlAfterDelivery(taskId: string): void;
 }
 export declare function encodeTaskCursor(anchorTaskId: string): string;
 export declare function decodeTaskCursor(cursor: string): {
@@ -79,15 +93,15 @@ export declare function decodeTaskCursor(cursor: string): {
 interface WaitableTask {
     taskId: string;
     ownerKey: string;
-    status: string;
-    keepAlive: number;
+    status: TaskStatus;
+    ttl: number | null;
     _createdAtMs: number;
 }
 type TaskWaiter<TTask extends WaitableTask> = (task: TTask) => void;
 export declare class TaskWaiterRegistry<TTask extends WaitableTask> {
-    private readonly isTerminalStatus;
+    private readonly isTerminal;
     private waiters;
-    constructor(isTerminalStatus: (status: TTask['status']) => boolean);
+    constructor(isTerminal: (status: TTask['status']) => boolean);
     add(taskId: string, waiter: TaskWaiter<TTask>): void;
     remove(taskId: string, waiter: TaskWaiter<TTask> | null): void;
     notify(task: TTask): void;
@@ -99,7 +113,7 @@ export declare function waitForTerminalTask<TTask extends WaitableTask>(options:
     lookupTask: (taskId: string, ownerKey: string) => TTask | undefined;
     removeTask: (taskId: string) => void;
     registry: TaskWaiterRegistry<TTask>;
-    isTerminalStatus: (status: TTask['status']) => boolean;
+    isTerminal: (status: TTask['status']) => boolean;
 }): Promise<TTask | undefined>;
 export declare const taskManager: TaskManager;
 export {};

package/dist/tasks/store.d.ts.map

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

package/dist/tasks/store.js

@@ -1,52 +1,75 @@
-import { ErrorCode } from '@modelcontextprotocol/sdk/types.js';
+import { isTerminal, ProtocolErrorCode, SdkErrorCode, } from '@modelcontextprotocol/server';
 import { AsyncLocalStorage } from 'node:async_hooks';
 import { createHmac, randomBytes, randomUUID } from 'node:crypto';
 import { config } from '../lib/config.js';
 import { Loggers, logInfo, logWarn } from '../lib/core.js';
 import { toError } from '../lib/error/index.js';
-import { createMcpError } from '../lib/mcp-interop.js';
+import { createProtocolError } from '../lib/mcp-interop.js';
 import { createUnrefTimeout, isObject, timingSafeEqualUtf8, } from '../lib/utils.js';
-const DEFAULT_KEEP_ALIVE_MS = 60_000;
-const MIN_KEEP_ALIVE_MS = 1_000;
-const MAX_KEEP_ALIVE_MS = 86_400_000;
-const DEFAULT_POLL_FREQUENCY_MS = 1_000;
+const DEFAULT_TTL_MS = 60_000;
+const MIN_TTL_MS = 1_000;
+const MAX_TTL_MS = 86_400_000;
+const DEFAULT_POLL_INTERVAL_MS = 1_000;
 const DEFAULT_OWNER_KEY = 'default';
 const DEFAULT_PAGE_SIZE = 50;
 const CLEANUP_INTERVAL_MS = 60_000;
 const RESULT_DELIVERY_GRACE_MS = 10_000;
+const CONNECTION_CLOSED_ERROR_CODE = -32000;
 const TASK_STATUS_VALUES = new Set([
-    'submitted',
     'working',
     'input_required',
     'completed',
     'failed',
     'cancelled',
 ]);
-const TERMINAL_STATUSES = new Set([
-    'completed',
-    'failed',
-    'cancelled',
-]);
-function isTerminalStatus(status) {
-    return TERMINAL_STATUSES.has(status);
+export function createTerminalTaskErrorResult(task) {
+    if (task.status !== 'cancelled' && task.status !== 'failed') {
+        return undefined;
+    }
+    const message = task.statusMessage ??
+        (task.status === 'cancelled' ? 'The task was cancelled.' : 'Task failed.');
+    const payload = {
+        error: message,
+        taskId: task.taskId,
+        status: task.status,
+    };
+    if (task.error?.code !== undefined)
+        payload['code'] = task.error.code;
+    if (task.error?.data !== undefined)
+        payload['data'] = task.error.data;
+    return {
+        content: [{ type: 'text', text: JSON.stringify(payload) }],
+        isError: true,
+    };
 }
 function resolveNextTaskStatus(task, updates) {
     const nextStatus = updates.status;
     if (!nextStatus || nextStatus === task.status)
         return task.status;
     if (!TASK_STATUS_VALUES.has(nextStatus)) {
-        throw createMcpError(ErrorCode.InternalError, `Invalid task status: ${nextStatus}`);
+        throw createProtocolError(ProtocolErrorCode.InternalError, `Invalid task status: ${nextStatus}`);
     }
-    if (isTerminalStatus(task.status)) {
-        throw createMcpError(ErrorCode.InternalError, `Cannot transition task from ${task.status} to ${nextStatus}`);
+    if (isTerminal(task.status)) {
+        throw createProtocolError(ProtocolErrorCode.InternalError, `Cannot transition task from ${task.status} to ${nextStatus}`);
     }
     return nextStatus;
 }
-function normalizeKeepAlive(keepAlive) {
-    if (keepAlive === undefined || !Number.isFinite(keepAlive)) {
-        return DEFAULT_KEEP_ALIVE_MS;
+function normalizeTtl(ttl) {
+    if (ttl === undefined || !Number.isFinite(ttl)) {
+        return DEFAULT_TTL_MS;
     }
-    return Math.max(MIN_KEEP_ALIVE_MS, Math.min(Math.trunc(keepAlive), MAX_KEEP_ALIVE_MS));
+    return Math.max(MIN_TTL_MS, Math.min(Math.trunc(ttl), MAX_TTL_MS));
+}
+function normalizeOptionalTtl(ttl) {
+    if (ttl === null)
+        return null;
+    return normalizeTtl(ttl);
+}
+function normalizePollInterval(pollInterval) {
+    if (pollInterval === undefined || !Number.isFinite(pollInterval)) {
+        return DEFAULT_POLL_INTERVAL_MS;
+    }
+    return Math.max(1, Math.trunc(pollInterval));
 }
 function logTaskStatusTransition(task, previousStatus, nextStatus) {
     if (previousStatus === nextStatus)
@@ -67,7 +90,8 @@ function logTaskStatusTransition(task, previousStatus, nextStatus) {
 class TaskManager {
     tasks = new Map();
     ownerCounts = new Map();
-    waiters = new TaskWaiterRegistry(isTerminalStatus);
+    waiters = new TaskWaiterRegistry(isTerminal);
+    statusListeners = new Set();
     cleanupInterval = null;
     ensureCleanupLoop() {
         if (this.cleanupInterval)
@@ -85,10 +109,12 @@ class TaskManager {
         this.cleanupInterval = null;
     }
     isTaskExpired(task, nowMs) {
+        if (task.ttl === null)
+            return false;
         if (task._terminalAtMs !== undefined) {
-            return nowMs - task._terminalAtMs > task.keepAlive;
+            return nowMs - task._terminalAtMs > task.ttl;
         }
-        return nowMs - task._createdAtMs > MAX_KEEP_ALIVE_MS;
+        return nowMs - task._createdAtMs > MAX_TTL_MS;
     }
     removeExpiredTasks() {
         const now = Date.now();
@@ -107,11 +133,12 @@ class TaskManager {
         const task = this.tasks.get(taskId);
         if (!task)
             return;
-        if (!isTerminalStatus(task.status)) {
+        if (!isTerminal(task.status)) {
             this.applyTaskUpdate(task, {
                 status: 'failed',
                 statusMessage: 'Task removed due to expiration',
             });
+            this.emitStatus(task);
             this.waiters.notify(task);
         }
         this.tasks.delete(taskId);
@@ -121,23 +148,42 @@ class TaskManager {
         Object.assign(task, updates);
         task.lastUpdatedAt = new Date().toISOString();
         if (updates.status &&
-            isTerminalStatus(updates.status) &&
+            isTerminal(updates.status) &&
             task._terminalAtMs === undefined) {
             task._terminalAtMs = Date.now();
         }
     }
-    cancelActiveTask(task, statusMessage) {
+    cancelActiveTask(task, statusMessage, silent) {
+        const error = {
+            code: CONNECTION_CLOSED_ERROR_CODE,
+            message: statusMessage,
+            data: { code: 'ABORTED', sdkCode: SdkErrorCode.ConnectionClosed },
+        };
         this.applyTaskUpdate(task, {
             status: 'cancelled',
             statusMessage,
-            error: {
-                code: ErrorCode.ConnectionClosed,
-                message: statusMessage,
-                data: { code: 'ABORTED' },
-            },
+            error,
+            result: createTerminalTaskErrorResult({
+                taskId: task.taskId,
+                status: 'cancelled',
+                statusMessage,
+                error,
+            }),
         });
+        if (!silent)
+            this.emitStatus(task);
         this.waiters.notify(task);
     }
+    emitStatus(task) {
+        for (const listener of this.statusListeners)
+            listener(task);
+    }
+    onStatusChange(listener) {
+        this.statusListeners.add(listener);
+        return () => {
+            this.statusListeners.delete(listener);
+        };
+    }
     releaseTaskCapacity(task) {
         const nextCount = (this.ownerCounts.get(task.ownerKey) ?? 0) - 1;
         if (nextCount > 0) {
@@ -149,10 +195,10 @@ class TaskManager {
     reserveTaskCapacity(ownerKey) {
         const { maxPerOwner, maxTotal } = config.tasks;
         if (this.tasks.size >= maxTotal) {
-            throw createMcpError(ErrorCode.InvalidRequest, `Server task limit reached (${maxTotal})`);
+            throw createProtocolError(ProtocolErrorCode.InvalidRequest, `Server task limit reached (${maxTotal})`);
         }
         if ((this.ownerCounts.get(ownerKey) ?? 0) >= maxPerOwner) {
-            throw createMcpError(ErrorCode.InvalidRequest, `Task limit reached for this session (${maxPerOwner})`);
+            throw createProtocolError(ProtocolErrorCode.InvalidRequest, `Task limit reached for this session (${maxPerOwner})`);
         }
         this.ownerCounts.set(ownerKey, (this.ownerCounts.get(ownerKey) ?? 0) + 1);
     }
@@ -160,7 +206,7 @@ class TaskManager {
         this.removeExpiredTasks();
         const taskId = options?.taskId ?? randomUUID();
         if (this.tasks.has(taskId)) {
-            throw createMcpError(ErrorCode.InvalidRequest, `Task already exists: ${taskId}`);
+            throw createProtocolError(ProtocolErrorCode.InvalidRequest, `Task already exists: ${taskId}`);
         }
         this.reserveTaskCapacity(ownerKey);
         const now = new Date();
@@ -168,12 +214,18 @@ class TaskManager {
         const task = {
             taskId,
             ownerKey,
-            status: 'submitted',
+            status: 'working',
             statusMessage,
             createdAt,
             lastUpdatedAt: createdAt,
-            keepAlive: normalizeKeepAlive(options?.keepAlive),
-            pollFrequency: DEFAULT_POLL_FREQUENCY_MS,
+            ttl: normalizeOptionalTtl(options?.ttl),
+            pollInterval: normalizePollInterval(options?.pollInterval),
+            ...(options?.requestId ? { requestId: options.requestId } : {}),
+            ...(options?.requestMethod
+                ? { requestMethod: options.requestMethod }
+                : {}),
+            ...(options?.requestMeta ? { requestMeta: options.requestMeta } : {}),
+            ...(options?.context ? { context: options.context } : {}),
             _createdAtMs: now.getTime(),
         };
         this.tasks.set(task.taskId, task);
@@ -181,8 +233,10 @@ class TaskManager {
         logInfo('Task created', {
             taskId: task.taskId,
             ownerKey,
-            keepAlive: task.keepAlive,
+            ttl: task.ttl,
+            pollInterval: task.pollInterval,
         }, Loggers.LOG_TASKS);
+        this.emitStatus(task);
         return task;
     }
     lookupActiveTask(taskId, ownerKey) {
@@ -200,13 +254,13 @@ class TaskManager {
     getTask(taskId, ownerKey) {
         return this.lookupActiveTask(taskId, ownerKey);
     }
-    updateTask(taskId, updates) {
+    updateTask(taskId, updates, silent) {
         const task = this.tasks.get(taskId);
         if (!task) {
             logWarn('updateTask called for unknown task', { taskId }, Loggers.LOG_TASKS);
             return;
         }
-        if (isTerminalStatus(task.status)) {
+        if (isTerminal(task.status)) {
             logWarn('updateTask called for terminal task', {
                 taskId,
                 currentStatus: task.status,
@@ -220,16 +274,18 @@ class TaskManager {
             ...(updates.status === undefined ? {} : { status: nextStatus }),
         });
         logTaskStatusTransition(task, previousStatus, task.status);
+        if (!silent)
+            this.emitStatus(task);
         this.waiters.notify(task);
     }
-    cancelTask(taskId, ownerKey) {
+    cancelTask(taskId, ownerKey, silent) {
         const task = this.lookupActiveTask(taskId, ownerKey);
         if (!task)
             return undefined;
-        if (isTerminalStatus(task.status)) {
-            throw createMcpError(ErrorCode.InvalidParams, `Cannot cancel task: already ${task.status}`);
+        if (isTerminal(task.status)) {
+            throw createProtocolError(ProtocolErrorCode.InvalidParams, `Cannot cancel task: already ${task.status}`);
         }
-        this.cancelActiveTask(task, 'The task was cancelled by request.');
+        this.cancelActiveTask(task, 'The task was cancelled by request.', silent);
         logInfo('Task cancelled by request', {
             taskId: task.taskId,
             ownerKey: task.ownerKey,
@@ -240,8 +296,8 @@ class TaskManager {
         const task = this.lookupActiveTask(taskId, ownerKey);
         if (!task)
             return false;
-        if (!isTerminalStatus(task.status)) {
-            throw createMcpError(ErrorCode.InvalidParams, `Cannot delete task: status is ${task.status}`);
+        if (!isTerminal(task.status)) {
+            throw createProtocolError(ProtocolErrorCode.InvalidParams, `Cannot delete task: status is ${task.status}`);
         }
         this.tasks.delete(taskId);
         this.releaseTaskCapacity(task);
@@ -253,7 +309,7 @@ class TaskManager {
             return [];
         const cancelled = [];
         for (const task of this.tasks.values()) {
-            if (task.ownerKey !== ownerKey || isTerminalStatus(task.status))
+            if (task.ownerKey !== ownerKey || isTerminal(task.status))
                 continue;
             this.cancelActiveTask(task, statusMessage);
             cancelled.push(task);
@@ -281,7 +337,7 @@ class TaskManager {
         }
         const anchorIndex = validTasks.findIndex((task) => task.taskId === anchorTaskId);
         if (anchorIndex === -1) {
-            throw createMcpError(ErrorCode.InvalidParams, 'Invalid cursor');
+            throw createProtocolError(ProtocolErrorCode.InvalidParams, 'Invalid cursor');
         }
         return validTasks.slice(anchorIndex + 1, anchorIndex + 1 + pageSize + 1);
     }
@@ -301,7 +357,7 @@ class TaskManager {
             return null;
         const decoded = decodeTaskCursor(cursor);
         if (!decoded) {
-            throw createMcpError(ErrorCode.InvalidParams, 'Invalid cursor');
+            throw createProtocolError(ProtocolErrorCode.InvalidParams, 'Invalid cursor');
         }
         return decoded.anchorTaskId;
     }
@@ -315,15 +371,17 @@ class TaskManager {
                 this.removeTask(id);
             },
             registry: this.waiters,
-            isTerminalStatus,
+            isTerminal,
         });
     }
-    shrinkKeepAliveAfterDelivery(taskId) {
+    shrinkTtlAfterDelivery(taskId) {
         const task = this.tasks.get(taskId);
-        if (!task || !isTerminalStatus(task.status))
+        if (!task || !isTerminal(task.status))
+            return;
+        if (task.ttl === null)
             return;
-        if (RESULT_DELIVERY_GRACE_MS < task.keepAlive) {
-            task.keepAlive = RESULT_DELIVERY_GRACE_MS;
+        if (RESULT_DELIVERY_GRACE_MS < task.ttl) {
+            task.ttl = RESULT_DELIVERY_GRACE_MS;
             task.lastUpdatedAt = new Date().toISOString();
         }
     }
@@ -369,10 +427,10 @@ export function decodeTaskCursor(cursor) {
     }
 }
 export class TaskWaiterRegistry {
-    isTerminalStatus;
+    isTerminal;
     waiters = new Map();
-    constructor(isTerminalStatus) {
-        this.isTerminalStatus = isTerminalStatus;
+    constructor(isTerminal) {
+        this.isTerminal = isTerminal;
     }
     add(taskId, waiter) {
         let set = this.waiters.get(taskId);
@@ -394,7 +452,7 @@ export class TaskWaiterRegistry {
         }
     }
     notify(task) {
-        if (!this.isTerminalStatus(task.status))
+        if (!this.isTerminal(task.status))
             return;
         const waiters = this.waiters.get(task.taskId);
         if (!waiters)
@@ -408,9 +466,12 @@ export async function waitForTerminalTask(options) {
     const task = options.lookupTask(options.taskId, options.ownerKey);
     if (!task)
         return undefined;
-    if (options.isTerminalStatus(task.status))
+    if (options.isTerminal(task.status))
         return task;
-    const deadlineMs = task._createdAtMs + task.keepAlive;
+    return createWaitForTaskPromise(options, task.ttl === null ? null : task._createdAtMs + task.ttl);
+}
+// eslint-disable-next-line sonarjs/no-invariant-returns -- this helper intentionally returns the shared pending promise it wires up below.
+function createWaitForTaskPromise(options, deadlineMs) {
     const { promise, resolve, reject } = Promise.withResolvers();
     const resolveInContext = AsyncLocalStorage.bind((value) => {
         resolve(value);
@@ -431,16 +492,16 @@ export async function waitForTerminalTask(options) {
         }
     };
     const settleOnce = (fn) => {
-        if (settled)
-            return;
-        settled = true;
-        fn();
+        if (!settled) {
+            settled = true;
+            fn();
+        }
     };
     const onAbort = () => {
         settleOnce(() => {
             cleanup();
             options.registry.remove(options.taskId, waiter);
-            rejectInContext(createMcpError(ErrorCode.ConnectionClosed, 'Request was cancelled'));
+            rejectInContext(createProtocolError(CONNECTION_CLOSED_ERROR_CODE, 'Request was cancelled'));
         });
     };
     waiter = (updated) => {
@@ -461,20 +522,22 @@ export async function waitForTerminalTask(options) {
     if (options.signal) {
         options.signal.addEventListener('abort', onAbort, { once: true });
     }
-    const timeoutMs = Math.max(0, deadlineMs - Date.now());
-    deadlineTimeout = createUnrefTimeout(timeoutMs, { timeout: true });
-    void deadlineTimeout.promise
-        .then(() => {
-        settleOnce(() => {
-            cleanup();
-            options.registry.remove(options.taskId, waiter);
-            options.removeTask(options.taskId);
-            rejectInContext(createMcpError(ErrorCode.InvalidParams, 'Task expired', {
-                taskId: options.taskId,
-            }));
-        });
-    })
-        .catch(rejectInContext);
+    if (deadlineMs !== null) {
+        const timeoutMs = Math.max(0, deadlineMs - Date.now());
+        deadlineTimeout = createUnrefTimeout(timeoutMs, { timeout: true });
+        void deadlineTimeout.promise
+            .then(() => {
+            settleOnce(() => {
+                cleanup();
+                options.registry.remove(options.taskId, waiter);
+                options.removeTask(options.taskId);
+                rejectInContext(createProtocolError(ProtocolErrorCode.InvalidParams, 'Task expired', {
+                    taskId: options.taskId,
+                }));
+            });
+        })
+            .catch(rejectInContext);
+    }
     return promise;
 }
 export const taskManager = new TaskManager();

package/dist/tools/index.d.ts

@@ -1,32 +1,26 @@
-import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
-import { type ContentBlock, type ServerResult } from '@modelcontextprotocol/sdk/types.js';
+import { type CallToolResult, type ContentBlock, type McpServer, type ServerContext, type ServerResult } from '@modelcontextprotocol/server';
 import type { z } from 'zod';
-import { type ProgressReporter, type ToolHandlerExtra } from '../lib/mcp-interop.js';
+import { type ProgressReporter } from '../lib/mcp-interop.js';
 import { type SharedFetchStage } from '../lib/net/index.js';
 import { fetchUrlInputSchema } from '../schemas.js';
-import { type TaskCapableToolSupport } from '../tasks/index.js';
 type FetchUrlInput = z.infer<typeof fetchUrlInputSchema>;
-interface ToolResponseBase {
-    [key: string]: unknown;
-    content: ContentBlock[];
-    structuredContent?: Record<string, unknown> | undefined;
-    isError?: boolean;
-}
 export declare const FETCH_URL_TOOL_NAME = "fetch-url";
 export declare function buildFetchUrlContentBlocks(structuredContent: Record<string, unknown>): ContentBlock[];
 export declare function getFetchCompletionStatusMessage(result: ServerResult): string | undefined;
 export declare class FetchUrlProgressPlan {
     private readonly reporter;
     private readonly context;
+    private readonly onStatusMessage?;
     private readonly total;
-    constructor(reporter: ProgressReporter, context: string);
+    constructor(reporter: ProgressReporter, context: string, onStatusMessage?: ((message: string) => void) | undefined);
     reportStart(): void;
     reportStage(stage: SharedFetchStage): void;
     reportSuccess(contentSize: number): void;
-    reportFailure(cancelled: boolean): void;
+    reportFailure(cancelled: boolean, error?: unknown): void;
     private mapStage;
 }
-export declare function fetchUrlToolHandler(input: FetchUrlInput, extra?: ToolHandlerExtra): Promise<ToolResponseBase>;
+export declare function fetchUrlToolHandler(input: FetchUrlInput, ctx?: ServerContext): Promise<CallToolResult>;
+type TaskCapableToolSupport = 'required' | 'optional' | 'forbidden';
 export interface ToolRegistrationControls {
     setTaskSupport: (support: TaskCapableToolSupport) => void;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/tools/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACzE,OAAO,EACL,KAAK,YAAY,EAEjB,KAAK,YAAY,EAElB,MAAM,oCAAoC,CAAC;AAE5C,OAAO,KAAK,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAK7B,OAAO,EAGL,KAAK,gBAAgB,EAErB,KAAK,gBAAgB,EAEtB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAOL,KAAK,gBAAgB,EAEtB,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EACL,mBAAmB,EAIpB,MAAM,eAAe,CAAC;AACvB,OAAO,EAIL,KAAK,sBAAsB,EAG5B,MAAM,mBAAmB,CAAC;AAK3B,KAAK,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAEzD,UAAU,gBAAgB;IACxB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;IACvB,OAAO,EAAE,YAAY,EAAE,CAAC;IACxB,iBAAiB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAAC;IACxD,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,eAAO,MAAM,mBAAmB,cAAc,CAAC;AAkF/C,wBAAgB,0BAA0B,CACxC,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACzC,YAAY,EAAE,CAUhB;AAuCD,wBAAgB,+BAA+B,CAC7C,MAAM,EAAE,YAAY,GACnB,MAAM,GAAG,SAAS,CAUpB;AAED,qBAAa,oBAAoB;IAI7B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAJ1B,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAa;gBAGhB,QAAQ,EAAE,gBAAgB,EAC1B,OAAO,EAAE,MAAM;IAGlC,WAAW,IAAI,IAAI;IAInB,WAAW,CAAC,KAAK,EAAE,gBAAgB,GAAG,IAAI;IAM1C,aAAa,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IAQxC,aAAa,CAAC,SAAS,EAAE,OAAO,GAAG,IAAI;IAQvC,OAAO,CAAC,QAAQ;CAiCjB;AA8FD,wBAAsB,mBAAmB,CACvC,KAAK,EAAE,aAAa,EACpB,KAAK,CAAC,EAAE,gBAAgB,GACvB,OAAO,CAAC,gBAAgB,CAAC,CAa3B;AAqBD,MAAM,WAAW,wBAAwB;IACvC,cAAc,EAAE,CAAC,OAAO,EAAE,sBAAsB,KAAK,IAAI,CAAC;CAC3D;AAoBD,wBAAgB,aAAa,CAAC,MAAM,EAAE,SAAS,GAAG,wBAAwB,CAuCzE"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/tools/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,cAAc,EACnB,KAAK,YAAY,EACjB,KAAK,SAAS,EAEd,KAAK,aAAa,EAClB,KAAK,YAAY,EAElB,MAAM,8BAA8B,CAAC;AAEtC,OAAO,KAAK,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAW7B,OAAO,EAGL,KAAK,gBAAgB,EAEtB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAOL,KAAK,gBAAgB,EAEtB,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EACL,mBAAmB,EAIpB,MAAM,eAAe,CAAC;AAUvB,KAAK,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAEzD,eAAO,MAAM,mBAAmB,cAAc,CAAC;AAkF/C,wBAAgB,0BAA0B,CACxC,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACzC,YAAY,EAAE,CAUhB;AA0CD,wBAAgB,+BAA+B,CAC7C,MAAM,EAAE,YAAY,GACnB,MAAM,GAAG,SAAS,CAUpB;AAED,qBAAa,oBAAoB;IAI7B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAC;IALnC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAa;gBAGhB,QAAQ,EAAE,gBAAgB,EAC1B,OAAO,EAAE,MAAM,EACf,eAAe,CAAC,GAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,aAAA;IAG9D,WAAW,IAAI,IAAI;IAUnB,WAAW,CAAC,KAAK,EAAE,gBAAgB,GAAG,IAAI;IAW1C,aAAa,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IAUxC,aAAa,CAAC,SAAS,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,OAAO,GAAG,IAAI;IAiBxD,OAAO,CAAC,QAAQ;CAoCjB;AAoID,wBAAsB,mBAAmB,CACvC,KAAK,EAAE,aAAa,EACpB,GAAG,CAAC,EAAE,aAAa,GAClB,OAAO,CAAC,cAAc,CAAC,CAazB;AAqBD,KAAK,sBAAsB,GAAG,UAAU,GAAG,UAAU,GAAG,WAAW,CAAC;AAEpE,MAAM,WAAW,wBAAwB;IACvC,cAAc,EAAE,CAAC,OAAO,EAAE,sBAAsB,KAAK,IAAI,CAAC;CAC3D;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,SAAS,GAAG,wBAAwB,CA+GzE"}