@j0hanz/fetch-url-mcp 1.13.0 → 2.0.1

package/dist/resources/index.js

@@ -1,4 +1,4 @@
-import { completable } from '@modelcontextprotocol/sdk/server/completable.js';
+import { completable, } from '@modelcontextprotocol/server';
 import { z } from 'zod';
 import { config } from '../lib/config.js';
 import { buildOptionalIcons } from '../lib/utils.js';
@@ -46,63 +46,70 @@ export function filterInstructions(instructions, topic) {
 }
 export function buildServerInstructions() {
     const maxHtmlSizeMb = config.constants.maxHtmlBytes / 1024 / 1024;
-    return `# Fetch public webpages and return clean, readable Markdown.
-
-# Capabilities
-- Tool: \`${FETCH_URL_TOOL_NAME}\` — fetch a URL, return Markdown with metadata.
-- Resource: \`internal://instructions\` — this document.
-- Prompt: \`get-help\` — returns these instructions. Accepts optional \`topic\` filter (${HELP_TOPICS.join(' | ')}).
-
-# Workflows
-
-## Standard
-Call \`${FETCH_URL_TOOL_NAME}\` with \`{ url }\` → read \`markdown\` from result. Check \`truncated: true\` for incomplete content.
-
-## Progress
-Add \`_meta: { progressToken: "<token>" }\` to \`tools/call\` → receive \`notifications/progress\`.
-
-## Async (task mode)
-Add \`_meta: { "modelcontextprotocol.io/task": { taskId: "<client-id>", keepAlive: <ms> } }\` to \`tools/call\`.
-
-Lifecycle: \`submitted\` → \`working\` → \`completed\` | \`failed\` | \`cancelled\`.
-
-Endpoints:
-- \`tasks/get\` — poll for \`statusMessage\`, \`progress\`, \`total\`.
-- \`tasks/result\` — retrieve final output for completed tasks.
-- \`tasks/list\` — list tasks for the current session.
-- \`tasks/cancel\` — cancel an active task.
-- \`tasks/delete\` — remove a terminal task.
-
-Task-linked responses and notifications include
-\`_meta["modelcontextprotocol.io/related-task"] = { taskId }\`.
-
-Notifications (opt-in via \`TASKS_STATUS_NOTIFICATIONS=true\`):
-- \`notifications/tasks/created\` — emitted on task creation with related-task metadata.
-- \`notifications/tasks/status\` — emitted on each status transition with related-task metadata.
-
-HTTP mode: tasks are bound to the authenticated caller and resumable across sessions.
-
-# Constraints
-- Blocked: localhost, private IPs, link-local, cloud metadata endpoints, \`.local\`/\`.internal\` domains.
-- Max HTML: ${maxHtmlSizeMb}MB. Max redirects: ${config.fetcher.maxRedirects}.
-- No JS rendering — client-rendered pages may return incomplete content.
-- Binary content: not supported.
-- Batch JSON-RPC (\`[{...}]\`): rejected with HTTP 400.
-- \`internal://\` URIs are session-scoped.
-- Tasks API is experimental — endpoints may change.
-
-# Errors
-
-| Code | Cause | Action |
-|---|---|---|
-| VALIDATION_ERROR | Invalid or blocked URL | Do not retry |
-| FETCH_ERROR | Network failure | Retry once with backoff |
-| UPSTREAM_HTTP_ERROR | Upstream HTTP error | Retry only for 5xx |
-| UPSTREAM_RATE_LIMITED | 429 from upstream | Back off, then retry |
-| UPSTREAM_TIMEOUT | Upstream timed out | Retry with backoff |
-| UPSTREAM_ABORTED | Request cancelled | Retry if needed |
-| MCP_ERROR | Internal protocol error | Do not retry |
-| queue_full | Worker pool saturated | Wait, retry, or use task mode |`;
+    return `# Fetch public webpages and return clean, readable Markdown
+
+# Capabilities
+
+- Tool: \`${FETCH_URL_TOOL_NAME}\` — fetch a URL, return Markdown with metadata.
+- Resource: \`internal://instructions\` — this document.
+- Prompt: \`get-help\` — returns these instructions. Accepts optional \`topic\` filter (${HELP_TOPICS.join(' | ')}).
+
+# Workflows
+
+## Standard
+
+Call \`${FETCH_URL_TOOL_NAME}\` with \`{ url }\` → read \`markdown\` from result. Check \`truncated: true\` for incomplete content.
+
+## Progress
+
+Add \`_meta: { progressToken: "<token>" }\` to \`tools/call\` → receive \`notifications/progress\`.
+
+## Async (task mode)
+
+Add \`task: { ttl?: <ms> }\` to \`tools/call\`.
+
+Lifecycle: \`working\` → \`completed\` | \`failed\` | \`cancelled\`.
+
+Endpoints:
+
+- \`tasks/get\` — poll for task summaries with \`status\`, \`statusMessage\`, \`createdAt\`, \`lastUpdatedAt\`, \`ttl\`, and \`pollInterval\`.
+- \`tasks/result\` — wait for terminal status, then retrieve the stored result or terminal error payload.
+- \`tasks/list\` — list tasks visible to the current caller.
+- \`tasks/cancel\` — cancel an active task.
+- \`tasks/delete\` — remove a terminal task.
+
+Task-linked responses and notifications include
+\`_meta["io.modelcontextprotocol/related-task"] = { taskId }\`.
+
+Notifications (opt-in via \`TASKS_STATUS_NOTIFICATIONS=true\`):
+
+- \`notifications/tasks/status\` — emitted on each status transition with related-task metadata.
+
+HTTP mode: tasks are bound to the authenticated caller and resumable across sessions for the same authenticated subject.
+
+# Constraints
+
+- Blocked: localhost, private IPs, link-local, cloud metadata endpoints, \`.local\`/\`.internal\` domains.
+- Max HTML: ${maxHtmlSizeMb}MB. Max redirects: ${config.fetcher.maxRedirects}.
+- No JS rendering — client-rendered pages may return incomplete content.
+- Binary content: not supported.
+- Batch JSON-RPC (\`[{...}]\`): rejected with HTTP 400.
+- \`internal://\` URIs are session-scoped.
+- Tasks API is experimental — endpoints may change.
+
+# Errors
+
+| Code                  | Cause                   | Action                        |
+| --------------------- | ----------------------- | ----------------------------- |
+| VALIDATION_ERROR      | Invalid or blocked URL  | Do not retry                  |
+| FETCH_ERROR           | Network failure         | Retry once with backoff       |
+| UPSTREAM_HTTP_ERROR   | Upstream HTTP error     | Retry only for 5xx            |
+| UPSTREAM_RATE_LIMITED | 429 from upstream       | Back off, then retry          |
+| UPSTREAM_TIMEOUT      | Upstream timed out      | Retry with backoff            |
+| UPSTREAM_ABORTED      | Request cancelled       | Retry if needed               |
+| MCP_ERROR             | Internal protocol error | Do not retry                  |
+| queue_full            | Worker pool saturated   | Wait, retry, or use task mode |
+`;
 }
 function buildTopicSchema() {
     return completable(z
@@ -118,9 +125,9 @@ export function registerGetHelpPrompt(server, instructions, iconInfo) {
     server.registerPrompt('get-help', {
         title: 'Get Help',
         description,
-        argsSchema: {
+        argsSchema: z.object({
             topic: buildTopicSchema(),
-        },
+        }),
         ...buildOptionalIcons(iconInfo),
     }, (args) => ({
         description,

package/dist/server.d.ts

@@ -1,4 +1,4 @@
-import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+import { McpServer } from '@modelcontextprotocol/server';
 export declare function createMcpServer(): Promise<McpServer>;
 export declare function createMcpServerForHttpSession(): Promise<McpServer>;
 export declare function startStdioServer(): Promise<{

package/dist/server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAiHpE,wBAAsB,eAAe,IAAI,OAAO,CAAC,SAAS,CAAC,CAE1D;AAkDD,wBAAsB,6BAA6B,IAAI,OAAO,CAAC,SAAS,CAAC,CAExE;AAwHD,wBAAsB,gBAAgB,IAAI,OAAO,CAAC;IAChD,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAC7C,CAAC,CASD"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAwB,MAAM,8BAA8B,CAAC;AAkH/E,wBAAsB,eAAe,IAAI,OAAO,CAAC,SAAS,CAAC,CAE1D;AAkED,wBAAsB,6BAA6B,IAAI,OAAO,CAAC,SAAS,CAAC,CAExE;AAwGD,wBAAsB,gBAAgB,IAAI,OAAO,CAAC;IAChD,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAC7C,CAAC,CASD"}

package/dist/server.js

@@ -1,14 +1,12 @@
-import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
-import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
-import { SetLevelRequestSchema } from '@modelcontextprotocol/sdk/types.js';
-import * as fs from 'node:fs/promises';
+import { McpServer, StdioServerTransport } from '@modelcontextprotocol/server';
+import { readFile } from 'node:fs/promises';
 import process from 'node:process';
 import { config } from './lib/config.js';
-import { getSessionId, logError, Loggers, logInfo, logNotice, setLogLevel, setMcpServer, } from './lib/core.js';
+import { logError, Loggers, logInfo, resolveMcpSessionIdByServer, resolveMcpSessionOwnerKey, setMcpServer, } from './lib/core.js';
 import { toError } from './lib/error/index.js';
-import { setTaskToolCallCapability } from './lib/mcp-interop.js';
 import { buildServerInstructions, registerGetHelpPrompt, registerInstructionResource, } from './resources/index.js';
-import { abortAllTaskExecutions, registerTaskHandlers } from './tasks/index.js';
+import { TaskStoreAdapter } from './tasks/adapter.js';
+import { abortAllTaskExecutions, emitTaskStatusNotification, registerTaskHandlers, taskManager, } from './tasks/index.js';
 import { registerTools as registerFetchUrlTool } from './tools/index.js';
 import { shutdownTransformWorkerPool } from './transform/index.js';
 /* -------------------------------------------------------------------------------------------------
@@ -21,7 +19,7 @@ async function getLocalIconInfo() {
         const mime = 'image/svg+xml';
         try {
             const iconPath = new URL(`../assets/${name}`, import.meta.url);
-            const buffer = await fs.readFile(iconPath);
+            const buffer = await readFile(iconPath);
             return {
                 src: `data:${mime};base64,${buffer.toString('base64')}`,
                 mimeType: mime,
@@ -35,28 +33,30 @@ async function getLocalIconInfo() {
 }
 const serverInstructions = buildServerInstructions();
 function createServerCapabilities() {
+    const taskCapableToolCalls = config.tools.enabled.includes('fetch-url');
     return {
         completions: {},
         logging: {},
-        resources: { subscribe: true, listChanged: true },
-        // SDK auto-adds listChanged to tools capability at runtime.
+        resources: {},
         tools: {},
         prompts: {},
         tasks: {
             list: {},
             cancel: {},
             delete: {},
-            requests: {
-                tools: {
-                    call: {},
-                },
-            },
+            ...(taskCapableToolCalls
+                ? {
+                    requests: {
+                        tools: {
+                            call: {},
+                        },
+                    },
+                }
+                : {}),
+            taskStore: new TaskStoreAdapter(),
         },
     };
 }
-function syncTaskCapabilityAdvertisement(server, taskToolCallEnabled) {
-    setTaskToolCallCapability(server, taskToolCallEnabled);
-}
 function createServerInfo(icons) {
     return {
         name: config.server.name,
@@ -90,13 +90,29 @@ async function createMcpServerWithOptions(options) {
     const toolControls = registerFetchUrlTool(server);
     registerGetHelpPrompt(server, serverInstructions, localIcon);
     registerInstructionResource(server, serverInstructions, localIcon);
-    const taskRegistration = registerTaskHandlers(server, {
-        requireInterception: config.tasks.requireInterception,
+    server.server.registerCapabilities({
+        resources: { listChanged: false },
+        prompts: { listChanged: false },
+        tools: { listChanged: false },
     });
-    const taskToolCallEnabled = taskRegistration.interceptedToolsCall;
+    const taskRegistration = registerTaskHandlers(server);
+    const taskToolCallEnabled = taskRegistration.taskCapableToolsRegistered;
     toolControls.setTaskSupport(taskToolCallEnabled ? 'optional' : 'forbidden');
-    syncTaskCapabilityAdvertisement(server, taskToolCallEnabled);
-    registerLoggingSetLevelHandler(server);
+    const disposeTaskStatusListener = taskManager.onStatusChange((task) => {
+        const sessionId = resolveMcpSessionIdByServer(server);
+        if (sessionId) {
+            const ownerKey = resolveMcpSessionOwnerKey(sessionId);
+            if (ownerKey && task.ownerKey !== ownerKey) {
+                return;
+            }
+        }
+        emitTaskStatusNotification(server, task);
+    });
+    const close = server.close.bind(server);
+    server.close = async () => {
+        disposeTaskStatusListener();
+        await close();
+    };
     attachServerErrorHandler(server);
     // Set global ref only after all registrations succeed so callers
     // never observe a half-initialised server instance.
@@ -108,17 +124,6 @@ async function createMcpServerWithOptions(options) {
 export async function createMcpServerForHttpSession() {
     return createMcpServerWithOptions({ registerObservabilityServer: false });
 }
-function registerLoggingSetLevelHandler(server) {
-    server.server.setRequestHandler(SetLevelRequestSchema, (request) => {
-        const sessionId = getSessionId();
-        setLogLevel(request.params.level, sessionId);
-        logNotice('Logging level updated', {
-            level: request.params.level,
-            scope: sessionId ? 'session' : 'stdio',
-        }, 'logging');
-        return {};
-    });
-}
 function attachServerErrorHandler(server) {
     server.server.onerror = (error) => {
         logError('MCP server error', toError(error), Loggers.LOG_SERVER);

package/dist/tasks/adapter.d.ts

@@ -0,0 +1,15 @@
+import { type RequestId, type Result, type CreateTaskOptions as SdkCreateTaskOptions, type Task, type TaskStore } from '@modelcontextprotocol/server';
+type SdkRequest = Parameters<TaskStore['createTask']>[2];
+export declare class TaskStoreAdapter implements TaskStore {
+    createTask(taskParams: SdkCreateTaskOptions, requestId: RequestId, request: SdkRequest, sessionId?: string): Promise<Task>;
+    getTask(taskId: string, sessionId?: string): Promise<Task | null>;
+    storeTaskResult(taskId: string, status: 'completed' | 'failed', result: Result, sessionId?: string): Promise<void>;
+    getTaskResult(taskId: string, sessionId?: string): Promise<Result>;
+    updateTaskStatus(taskId: string, status: Task['status'], statusMessage?: string, sessionId?: string): Promise<void>;
+    listTasks(cursor?: string, sessionId?: string): Promise<{
+        tasks: Task[];
+        nextCursor?: string;
+    }>;
+}
+export {};
+//# sourceMappingURL=adapter.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../../src/tasks/adapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,SAAS,EACd,KAAK,MAAM,EACX,KAAK,iBAAiB,IAAI,oBAAoB,EAC9C,KAAK,IAAI,EACT,KAAK,SAAS,EACf,MAAM,8BAA8B,CAAC;AAiBtC,KAAK,UAAU,GAAG,UAAU,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAqEzD,qBAAa,gBAAiB,YAAW,SAAS;IAChD,UAAU,CACR,UAAU,EAAE,oBAAoB,EAChC,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,UAAU,EACnB,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,IAAI,CAAC;IAqBhB,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;IAMjE,eAAe,CACb,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,WAAW,GAAG,QAAQ,EAC9B,MAAM,EAAE,MAAM,EACd,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,IAAI,CAAC;IAOhB,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAkBlE,gBAAgB,CACd,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,EACtB,aAAa,CAAC,EAAE,MAAM,EACtB,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,IAAI,CAAC;IAiChB,SAAS,CACP,MAAM,CAAC,EAAE,MAAM,EACf,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC;QAAE,KAAK,EAAE,IAAI,EAAE,CAAC;QAAC,UAAU,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;CAWnD"}

package/dist/tasks/adapter.js

@@ -0,0 +1,138 @@
+import { ProtocolErrorCode, } from '@modelcontextprotocol/server';
+import { resolveMcpSessionOwnerKey } from '../lib/core.js';
+import { createProtocolError } from '../lib/mcp-interop.js';
+import { abortTaskExecution, isServerResult, withRelatedTaskMeta, } from './manager.js';
+import { createTerminalTaskErrorResult, taskManager, } from './store.js';
+function resolveOwnerKey(sessionId, context) {
+    const ownerKey = context?.['ownerKey'];
+    if (typeof ownerKey === 'string' && ownerKey.length > 0)
+        return ownerKey;
+    if (!sessionId)
+        return 'default';
+    return resolveMcpSessionOwnerKey(sessionId) ?? `session:${sessionId}`;
+}
+function toSdkTask(state) {
+    return {
+        taskId: state.taskId,
+        status: state.status,
+        ttl: state.ttl,
+        createdAt: state.createdAt,
+        lastUpdatedAt: state.lastUpdatedAt,
+        pollInterval: state.pollInterval,
+        ...(state.statusMessage ? { statusMessage: state.statusMessage } : {}),
+    };
+}
+function readRequestMeta(request) {
+    const meta = request.params?._meta;
+    return meta && typeof meta === 'object' && !Array.isArray(meta)
+        ? meta
+        : undefined;
+}
+function readStoredTaskResult(state, taskId) {
+    if (!state) {
+        throw createProtocolError(ProtocolErrorCode.ResourceNotFound, `Task not found: ${taskId}`);
+    }
+    if (state.result === undefined || state.result === null) {
+        const terminalResult = createTerminalTaskErrorResult(state);
+        if (terminalResult) {
+            const result = {
+                ...terminalResult,
+                _meta: {
+                    'io.modelcontextprotocol/related-task': {
+                        taskId,
+                    },
+                },
+            };
+            return result;
+        }
+        throw createProtocolError(ProtocolErrorCode.InvalidParams, `Task ${taskId} has no result stored`);
+    }
+    if (isServerResult(state.result)) {
+        return withRelatedTaskMeta(state.result, taskId);
+    }
+    return state.result;
+}
+export class TaskStoreAdapter {
+    createTask(taskParams, requestId, request, sessionId) {
+        const ownerKey = resolveOwnerKey(sessionId, taskParams.context);
+        const requestMeta = readRequestMeta(request);
+        const createTaskOptions = {
+            requestId: String(requestId),
+            requestMethod: request.method,
+            ...(taskParams.ttl !== undefined ? { ttl: taskParams.ttl } : {}),
+            ...(taskParams.pollInterval !== undefined
+                ? { pollInterval: taskParams.pollInterval }
+                : {}),
+            ...(taskParams.context ? { context: taskParams.context } : {}),
+            ...(requestMeta ? { requestMeta } : {}),
+        };
+        const state = taskManager.createTask(createTaskOptions, 'Task submitted', ownerKey);
+        return Promise.resolve(toSdkTask(state));
+    }
+    getTask(taskId, sessionId) {
+        const ownerKey = resolveOwnerKey(sessionId);
+        const state = taskManager.getTask(taskId, ownerKey);
+        return Promise.resolve(state ? toSdkTask(state) : null);
+    }
+    storeTaskResult(taskId, status, result, sessionId) {
+        const ownerKey = resolveOwnerKey(sessionId);
+        if (!taskManager.getTask(taskId, ownerKey))
+            return Promise.resolve();
+        taskManager.updateTask(taskId, { status, result }, true);
+        return Promise.resolve();
+    }
+    getTaskResult(taskId, sessionId) {
+        const ownerKey = resolveOwnerKey(sessionId);
+        const state = taskManager.getTask(taskId, ownerKey);
+        if (state?.result !== undefined && state.result !== null) {
+            const result = readStoredTaskResult(state, taskId);
+            taskManager.shrinkTtlAfterDelivery(taskId);
+            return Promise.resolve(result);
+        }
+        return taskManager
+            .waitForTerminalTask(taskId, ownerKey)
+            .then((terminalState) => {
+            const result = readStoredTaskResult(terminalState, taskId);
+            taskManager.shrinkTtlAfterDelivery(taskId);
+            return result;
+        });
+    }
+    updateTaskStatus(taskId, status, statusMessage, sessionId) {
+        const ownerKey = resolveOwnerKey(sessionId);
+        if (status === 'cancelled') {
+            if (!taskManager.cancelTask(taskId, ownerKey, true))
+                return Promise.resolve();
+            abortTaskExecution(taskId);
+            return Promise.resolve();
+        }
+        const task = taskManager.getTask(taskId, ownerKey);
+        if (!task)
+            return Promise.resolve();
+        taskManager.updateTask(taskId, {
+            status,
+            ...(statusMessage ? { statusMessage } : {}),
+            ...(status === 'failed'
+                ? {
+                    result: createTerminalTaskErrorResult({
+                        taskId,
+                        status: 'failed',
+                        ...(statusMessage ? { statusMessage } : {}),
+                        ...(task.error ? { error: task.error } : {}),
+                    }),
+                }
+                : {}),
+        }, true);
+        return Promise.resolve();
+    }
+    listTasks(cursor, sessionId) {
+        const ownerKey = resolveOwnerKey(sessionId);
+        const result = taskManager.listTasks({
+            ownerKey,
+            ...(cursor ? { cursor } : {}),
+        });
+        return Promise.resolve({
+            tasks: result.tasks.map(toSdkTask),
+            ...(result.nextCursor ? { nextCursor: result.nextCursor } : {}),
+        });
+    }
+}

package/dist/tasks/manager.d.ts

@@ -1,105 +1,37 @@
-import { type McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
-import { type ServerResult } from '@modelcontextprotocol/sdk/types.js';
-import { z } from 'zod';
-import { type ProgressNotification, type ToolHandlerExtra } from '../lib/mcp-interop.js';
+import { type McpServer, RELATED_TASK_META_KEY, type ServerContext, type ServerResult } from '@modelcontextprotocol/server';
 import { type CreateTaskResult, decodeTaskCursor, encodeTaskCursor, taskManager, type TaskState, type TaskStatus, TaskWaiterRegistry, waitForTerminalTask } from './store.js';
-export declare const extendedCallToolRequestSchema: z.ZodObject<{
-    method: z.ZodLiteral<"tools/call">;
-    params: z.ZodObject<{
-        name: z.ZodString;
-        arguments: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
-        _meta: z.ZodOptional<z.ZodObject<{
-            progressToken: z.ZodOptional<z.ZodUnion<readonly [z.ZodString, z.ZodNumber]>>;
-            'modelcontextprotocol.io/task': z.ZodOptional<z.ZodObject<{
-                taskId: z.ZodString;
-                keepAlive: z.ZodOptional<z.ZodNumber>;
-            }, z.core.$strict>>;
-            "modelcontextprotocol.io/related-task": z.ZodOptional<z.ZodObject<{
-                taskId: z.ZodString;
-            }, z.core.$strict>>;
-        }, z.core.$loose>>;
-        task: z.ZodOptional<z.ZodObject<{
-            ttl: z.ZodOptional<z.ZodNumber>;
-        }, z.core.$strip>>;
-    }, z.core.$strict>;
-}, z.core.$loose>;
-export type ExtendedCallToolRequest = z.infer<typeof extendedCallToolRequestSchema>;
-export type ToolCallRequestMeta = ExtendedCallToolRequest['params']['_meta'];
+interface RelatedTaskMeta {
+    taskId: string;
+}
+export interface ToolCallRequestMeta extends Record<string, unknown> {
+    progressToken?: string | number;
+    [RELATED_TASK_META_KEY]?: RelatedTaskMeta;
+}
 export { decodeTaskCursor, encodeTaskCursor, taskManager, TaskWaiterRegistry, waitForTerminalTask, };
 export type { CreateTaskResult, TaskState, TaskStatus };
-export declare function parseExtendedCallToolRequest(request: unknown): ExtendedCallToolRequest;
 export declare function sanitizeToolCallMeta(meta?: ToolCallRequestMeta): ToolCallRequestMeta | undefined;
 export declare function buildRelatedTaskMeta(taskId: string, meta?: ToolCallRequestMeta): Record<string, unknown>;
 export declare function withRelatedTaskMeta(result: ServerResult, taskId: string): ServerResult;
+export declare function detachAbortController(taskId: string): AbortController | undefined;
+export declare function attachAbortController(taskId: string): AbortController;
 export declare function abortTaskExecution(taskId: string): void;
 export declare function cancelTasksForOwner(ownerKey: string, statusMessage?: string): number;
 export declare function abortAllTaskExecutions(): void;
 type TaskSummary = CreateTaskResult['task'];
-type TaskLifecycleProjection = Pick<TaskState, 'taskId' | 'status' | 'statusMessage' | 'progress' | 'total' | 'createdAt' | 'lastUpdatedAt' | 'keepAlive' | 'pollFrequency'>;
+type TaskLifecycleProjection = Pick<TaskState, 'taskId' | 'status' | 'statusMessage' | 'createdAt' | 'lastUpdatedAt' | 'ttl' | 'pollInterval'>;
 export declare function toTaskSummary(task: TaskLifecycleProjection): TaskSummary;
 export declare function emitTaskStatusNotification(server: McpServer, task: TaskState): void;
 export declare function throwTaskNotFound(): never;
-export declare function handleToolCallRequest(server: McpServer, request: ExtendedCallToolRequest, context: ToolCallContext): Promise<ServerResult>;
-interface TaskHandlerRegistrationOptions {
-    requireInterception?: boolean;
-}
 interface TaskHandlerRegistrationResult {
-    interceptedToolsCall: boolean;
     taskCapableToolsRegistered: boolean;
 }
-export declare function registerTaskHandlers(server: McpServer, options?: TaskHandlerRegistrationOptions): TaskHandlerRegistrationResult;
-interface HandlerExtra {
-    sessionId?: string;
-    authInfo?: {
-        clientId?: string;
-        token?: string;
-    };
-    signal?: AbortSignal;
-    requestId?: string | number;
-    sendNotification?: (notification: ProgressNotification) => Promise<void>;
-    requestInfo?: unknown;
-}
-export interface ToolExecutionContext {
-    ownerKey: string;
-    sessionId?: string;
-    signal?: AbortSignal;
-    requestId?: string | number;
-    sendNotification?: (notification: ProgressNotification) => Promise<void>;
-    requestMeta?: ToolCallRequestMeta;
-}
-export type ToolCallContext = ToolExecutionContext;
+export declare function registerTaskHandlers(server: McpServer): TaskHandlerRegistrationResult;
 interface AuthIdentity {
     clientId?: string;
     token?: string;
+    extra?: Record<string, unknown>;
 }
-/** Strip keys whose value is `undefined`, returning an object with only the
- * present keys. Return type correctly omits the `undefined` union so the result
- * is compatible with `exactOptionalPropertyTypes`. */
-type Compacted<T extends object> = {
-    [K in keyof T as Exclude<T[K], undefined> extends never ? never : K]?: Exclude<T[K], undefined>;
-};
-export declare function compact<T extends object>(obj: T): Compacted<T>;
-export declare function parseHandlerExtra(extra: unknown): HandlerExtra | undefined;
 export declare function buildAuthenticatedOwnerKey(authInfo?: AuthIdentity): string | undefined;
-export declare function resolveTaskOwnerKey(extra?: HandlerExtra): string;
-export declare function resolveToolCallContext(extra?: HandlerExtra, requestMeta?: ToolCallRequestMeta): ToolCallContext;
-export declare function buildToolHandlerExtra(context: ToolExecutionContext, requestMeta?: ToolCallRequestMeta): ToolHandlerExtra;
-export declare function withRequestContextIfMissing<TParams, TResult, TExtra = unknown>(handler: (params: TParams, extra?: TExtra) => Promise<TResult>): (params: TParams, extra?: TExtra) => Promise<TResult>;
+export declare function resolveOwnerKeyFromContext(ctx: ServerContext): string;
 export declare function isServerResult(value: unknown): value is ServerResult;
-export type TaskCapableToolSupport = 'required' | 'optional' | 'forbidden';
-export interface TaskCapableToolDescriptor<TArgs = unknown> {
-    name: string;
-    parseArguments: (args: unknown) => TArgs;
-    execute: (args: TArgs, extra?: ToolHandlerExtra) => Promise<ServerResult>;
-    getCompletionStatusMessage?: (result: ServerResult) => string | undefined;
-    taskSupport?: TaskCapableToolSupport;
-    immediateResponse?: string;
-}
-export declare function registerTaskCapableTool<TArgs>(server: McpServer, descriptor: TaskCapableToolDescriptor<TArgs>): void;
-export declare function unregisterTaskCapableTool(server: McpServer, name: string): void;
-export declare function getTaskCapableTool(server: McpServer, name: string): TaskCapableToolDescriptor | undefined;
-export declare function getTaskCapableToolSupport(server: McpServer, name: string): TaskCapableToolSupport | undefined;
-export declare function hasTaskCapableTool(server: McpServer, name: string): boolean;
-export declare function hasRegisteredTaskCapableTools(server: McpServer): boolean;
-export declare function setTaskCapableToolSupport(server: McpServer, name: string, support: TaskCapableToolSupport): void;
 //# sourceMappingURL=manager.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../../src/tasks/manager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../../src/tasks/manager.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,SAAS,EAEd,qBAAqB,EACrB,KAAK,aAAa,EAClB,KAAK,YAAY,EAClB,MAAM,8BAA8B,CAAC;AAkBtC,OAAO,EACL,KAAK,gBAAgB,EACrB,gBAAgB,EAChB,gBAAgB,EAChB,WAAW,EACX,KAAK,SAAS,EACd,KAAK,UAAU,EACf,kBAAkB,EAClB,mBAAmB,EACpB,MAAM,YAAY,CAAC;AAWpB,UAAU,eAAe;IACvB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,mBAAoB,SAAQ,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAClE,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAChC,CAAC,qBAAqB,CAAC,CAAC,EAAE,eAAe,CAAC;CAC3C;AAED,OAAO,EACL,gBAAgB,EAChB,gBAAgB,EAChB,WAAW,EACX,kBAAkB,EAClB,mBAAmB,GACpB,CAAC;AACF,YAAY,EAAE,gBAAgB,EAAE,SAAS,EAAE,UAAU,EAAE,CAAC;AAExD,wBAAgB,oBAAoB,CAClC,IAAI,CAAC,EAAE,mBAAmB,GACzB,mBAAmB,GAAG,SAAS,CAOjC;AAED,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,MAAM,EACd,IAAI,CAAC,EAAE,mBAAmB,GACzB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAKzB;AAED,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,YAAY,EACpB,MAAM,EAAE,MAAM,GACb,YAAY,CAQd;AAuBD,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,MAAM,GACb,eAAe,GAAG,SAAS,CAM7B;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,eAAe,CAiBrE;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAEvD;AAED,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,MAAM,EAChB,aAAa,SAA4D,GACxE,MAAM,CAOR;AAED,wBAAgB,sBAAsB,IAAI,IAAI,CAE7C;AAMD,KAAK,WAAW,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC;AAC5C,KAAK,uBAAuB,GAAG,IAAI,CACjC,SAAS,EACP,QAAQ,GACR,QAAQ,GACR,eAAe,GACf,WAAW,GACX,eAAe,GACf,KAAK,GACL,cAAc,CACjB,CAAC;AAEF,wBAAgB,aAAa,CAAC,IAAI,EAAE,uBAAuB,GAAG,WAAW,CAUxE;AAED,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,SAAS,EACjB,IAAI,EAAE,SAAS,GACd,IAAI,CAmBN;AAED,wBAAgB,iBAAiB,IAAI,KAAK,CAKzC;AAgBD,UAAU,6BAA6B;IACrC,0BAA0B,EAAE,OAAO,CAAC;CACrC;AAED,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,SAAS,GAChB,6BAA6B,CAyB/B;AAMD,UAAU,YAAY;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACjC;AAgBD,wBAAgB,0BAA0B,CACxC,QAAQ,CAAC,EAAE,YAAY,GACtB,MAAM,GAAG,SAAS,CAiBpB;AAED,wBAAgB,0BAA0B,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAkBrE;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,YAAY,CAEpE"}