@j0hanz/fetch-url-mcp 1.10.2 → 1.10.3

package/dist/lib/task-handlers.js

@@ -2,56 +2,13 @@ import { randomUUID } from 'node:crypto';
 import {} from '@modelcontextprotocol/sdk/server/mcp.js';
 import { CallToolRequestSchema, ErrorCode, McpError, } from '@modelcontextprotocol/sdk/types.js';
 import { z } from 'zod';
-import { abortTaskExecution, emitTaskStatusNotification, handleToolCallRequest, throwTaskNotFound, toTaskSummary, withRelatedTaskMeta, } from '../tasks/execution.js';
+import { parseExtendedCallToolRequest, withRelatedTaskMeta, } from '../tasks/call-contract.js';
+import { abortTaskExecution, emitTaskStatusNotification, handleToolCallRequest, throwTaskNotFound, toTaskSummary, } from '../tasks/execution.js';
 import { taskManager } from '../tasks/manager.js';
 import { isServerResult, parseHandlerExtra, resolveTaskOwnerKey, resolveToolCallContext, } from '../tasks/owner.js';
 import { hasRegisteredTaskCapableTools, hasTaskCapableTool, } from '../tasks/tool-registry.js';
 import { logWarn, runWithRequestContext } from './core.js';
-import { formatZodError } from './zod.js';
-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 });
-        }
-    }
-}
-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);
-}
+import { getSdkCallToolHandler } from './sdk-interop.js';
 export { cancelTasksForOwner, abortAllTaskExecutions, } from '../tasks/execution.js';
 /* -------------------------------------------------------------------------------------------------
  * Task handler schemas and registration
@@ -76,41 +33,6 @@ const TaskResultSchema = z.looseObject({
     method: z.literal('tasks/result'),
     params: z.looseObject({ taskId: z.string() }),
 });
-const MIN_TASK_TTL_MS = 1_000;
-const MAX_TASK_TTL_MS = 86_400_000;
-const ExtendedCallToolRequestSchema = z.looseObject({
-    method: z.literal('tools/call'),
-    params: z.strictObject({
-        name: z.string().min(1),
-        arguments: z.record(z.string(), z.unknown()).optional(),
-        task: z
-            .strictObject({
-            ttl: z
-                .number()
-                .int()
-                .min(MIN_TASK_TTL_MS)
-                .max(MAX_TASK_TTL_MS)
-                .optional(),
-        })
-            .optional(),
-        _meta: z
-            .looseObject({
-            progressToken: z.union([z.string(), z.number()]).optional(),
-            'io.modelcontextprotocol/related-task': z
-                .strictObject({
-                taskId: z.string(),
-            })
-                .optional(),
-        })
-            .optional(),
-    }),
-});
-function parseExtendedCallToolRequest(request) {
-    const parsed = ExtendedCallToolRequestSchema.safeParse(request);
-    if (parsed.success)
-        return parsed.data;
-    throw new McpError(ErrorCode.InvalidParams, `Invalid tool request params: ${formatZodError(parsed.error)}`);
-}
 function resolveOwnerScopedExtra(extra) {
     const parsedExtra = parseHandlerExtra(extra);
     return {
@@ -118,14 +40,6 @@ function resolveOwnerScopedExtra(extra) {
         ownerKey: resolveTaskOwnerKey(parsedExtra),
     };
 }
-function getSdkCallToolHandler(server) {
-    // S-2: see tests/sdk-compat-guard.test.ts
-    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;
-}
 export function registerTaskHandlers(server, options) {
     const sdkCallToolHandler = getSdkCallToolHandler(server);
     const taskCapableToolsRegistered = hasRegisteredTaskCapableTools();
@@ -139,15 +53,15 @@ export function registerTaskHandlers(server, options) {
     if (sdkCallToolHandler) {
         server.server.setRequestHandler(CallToolRequestSchema, async (request, extra) => {
             const parsedExtra = parseHandlerExtra(extra);
-            const context = resolveToolCallContext(parsedExtra);
-            const requestId = context.requestId !== undefined
-                ? String(context.requestId)
+            const requestId = parsedExtra?.requestId !== undefined
+                ? String(parsedExtra.requestId)
                 : randomUUID();
-            const sessionId = parsedExtra?.sessionId;
             return runWithRequestContext({
                 requestId,
                 operationId: requestId,
-                ...(sessionId ? { sessionId } : {}),
+                ...(parsedExtra?.sessionId
+                    ? { sessionId: parsedExtra.sessionId }
+                    : {}),
             }, () => {
                 const toolName = request.params.name;
                 // Only intercept task-capable tools managed by the local task registry.
@@ -156,6 +70,7 @@ export function registerTaskHandlers(server, options) {
                     return sdkCallToolHandler(request, extra);
                 }
                 const parsed = parseExtendedCallToolRequest(request);
+                const context = resolveToolCallContext(parsedExtra, parsed.params._meta);
                 return handleToolCallRequest(server, parsed, context);
             });
         });

package/dist/resources/index.js

@@ -2,7 +2,7 @@ import { ResourceTemplate, } from '@modelcontextprotocol/sdk/server/mcp.js';
 import { ErrorCode, McpError, SubscribeRequestSchema, UnsubscribeRequestSchema, } from '@modelcontextprotocol/sdk/types.js';
 import { get as getCacheEntry, getEntryMeta, keys as listCacheKeys, onCacheUpdate, parseCacheKey, } from '../lib/core.js';
 import { logWarn } from '../lib/core.js';
-import { registerServerLifecycleCleanup } from '../lib/task-handlers.js';
+import { registerServerLifecycleCleanup } from '../lib/sdk-interop.js';
 import { buildOptionalIcons } from '../lib/types.js';
 import { isObject } from '../lib/utils.js';
 import { parseCachedPayload, resolveCachedPayloadContent } from '../schemas.js';

package/dist/server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAkGpE,wBAAsB,eAAe,IAAI,OAAO,CAAC,SAAS,CAAC,CAE1D;AA8CD,wBAAsB,6BAA6B,IAAI,OAAO,CAAC,SAAS,CAAC,CAExE;AAkFD,wBAAsB,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC,CAMtD"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AA0GpE,wBAAsB,eAAe,IAAI,OAAO,CAAC,SAAS,CAAC,CAE1D;AAiDD,wBAAsB,6BAA6B,IAAI,OAAO,CAAC,SAAS,CAAC,CAExE;AAkFD,wBAAsB,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC,CAMtD"}

package/dist/server.js

@@ -5,12 +5,13 @@ import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js'
 import { SetLevelRequestSchema } from '@modelcontextprotocol/sdk/types.js';
 import { config } from './lib/core.js';
 import { getSessionId, logError, logInfo, setLogLevel, setMcpServer, } from './lib/core.js';
+import { setTaskToolCallCapability } from './lib/sdk-interop.js';
 import { abortAllTaskExecutions, registerTaskHandlers, } from './lib/task-handlers.js';
 import { toError } from './lib/utils.js';
 import { registerGetHelpPrompt } from './prompts/index.js';
 import { registerCacheResourceTemplate, registerInstructionResource, } from './resources/index.js';
 import { buildServerInstructions } from './resources/instructions.js';
-import { registerAllTools } from './tools/index.js';
+import { registerTools as registerFetchUrlTool } from './tools/fetch-url.js';
 import { shutdownTransformWorkerPool } from './transform/transform.js';
 /* -------------------------------------------------------------------------------------------------
  * Icons + server info
@@ -50,6 +51,9 @@ function createServerCapabilities() {
         },
     };
 }
+function syncTaskCapabilityAdvertisement(server, taskToolCallEnabled) {
+    setTaskToolCallCapability(server, taskToolCallEnabled);
+}
 function createServerInfo(icons) {
     return {
         name: config.server.name,
@@ -83,13 +87,16 @@ async function createMcpServerWithOptions(options) {
     if (shouldRegisterObservabilityServer(options)) {
         setMcpServer(server);
     }
-    registerAllTools(server);
+    const toolControls = registerFetchUrlTool(server);
     registerGetHelpPrompt(server, serverInstructions, localIcon);
     registerInstructionResource(server, serverInstructions, localIcon);
     registerCacheResourceTemplate(server, localIcon);
-    registerTaskHandlers(server, {
+    const taskRegistration = registerTaskHandlers(server, {
         requireInterception: config.tasks.requireInterception,
     });
+    const taskToolCallEnabled = taskRegistration.interceptedToolsCall;
+    toolControls.setTaskSupport(taskToolCallEnabled ? 'optional' : 'forbidden');
+    syncTaskCapabilityAdvertisement(server, taskToolCallEnabled);
     registerLoggingSetLevelHandler(server);
     attachServerErrorHandler(server);
     return server;

package/dist/tasks/call-contract.d.ts

@@ -0,0 +1,25 @@
+import type { ServerResult } from '@modelcontextprotocol/sdk/types.js';
+import { z } from 'zod';
+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>>;
+        task: z.ZodOptional<z.ZodObject<{
+            ttl: z.ZodOptional<z.ZodNumber>;
+        }, z.core.$strict>>;
+        _meta: z.ZodOptional<z.ZodObject<{
+            progressToken: z.ZodOptional<z.ZodUnion<readonly [z.ZodString, z.ZodNumber]>>;
+            'io.modelcontextprotocol/related-task': z.ZodOptional<z.ZodObject<{
+                taskId: z.ZodString;
+            }, z.core.$strict>>;
+        }, z.core.$loose>>;
+    }, z.core.$strict>;
+}, z.core.$loose>;
+export type ExtendedCallToolRequest = z.infer<typeof extendedCallToolRequestSchema>;
+export type ToolCallRequestMeta = ExtendedCallToolRequest['params']['_meta'];
+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;
+//# sourceMappingURL=call-contract.d.ts.map

package/dist/tasks/call-contract.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"call-contract.d.ts","sourceRoot":"","sources":["../../src/tasks/call-contract.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAEvE,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAgBxB,eAAO,MAAM,6BAA6B;;;;;;;;;;;;;;;iBAiBxC,CAAC;AAEH,MAAM,MAAM,uBAAuB,GAAG,CAAC,CAAC,KAAK,CAC3C,OAAO,6BAA6B,CACrC,CAAC;AACF,MAAM,MAAM,mBAAmB,GAAG,uBAAuB,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC;AAE7E,wBAAgB,4BAA4B,CAC1C,OAAO,EAAE,OAAO,GACf,uBAAuB,CAQzB;AAED,wBAAgB,oBAAoB,CAClC,IAAI,CAAC,EAAE,mBAAmB,GACzB,mBAAmB,GAAG,SAAS,CAMjC;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"}

package/dist/tasks/call-contract.js

@@ -0,0 +1,58 @@
+import { ErrorCode, McpError } from '@modelcontextprotocol/sdk/types.js';
+import { z } from 'zod';
+import { formatZodError } from '../lib/zod.js';
+const MIN_TASK_TTL_MS = 1_000;
+const MAX_TASK_TTL_MS = 86_400_000;
+const relatedTaskMetaSchema = z.strictObject({
+    taskId: z.string(),
+});
+const toolCallMetaSchema = z.looseObject({
+    progressToken: z.union([z.string(), z.number()]).optional(),
+    'io.modelcontextprotocol/related-task': relatedTaskMetaSchema.optional(),
+});
+export const extendedCallToolRequestSchema = z.looseObject({
+    method: z.literal('tools/call'),
+    params: z.strictObject({
+        name: z.string().min(1),
+        arguments: z.record(z.string(), z.unknown()).optional(),
+        task: z
+            .strictObject({
+            ttl: z
+                .number()
+                .int()
+                .min(MIN_TASK_TTL_MS)
+                .max(MAX_TASK_TTL_MS)
+                .optional(),
+        })
+            .optional(),
+        _meta: toolCallMetaSchema.optional(),
+    }),
+});
+export function parseExtendedCallToolRequest(request) {
+    const parsed = extendedCallToolRequestSchema.safeParse(request);
+    if (parsed.success)
+        return parsed.data;
+    throw new McpError(ErrorCode.InvalidParams, `Invalid tool request params: ${formatZodError(parsed.error)}`);
+}
+export function sanitizeToolCallMeta(meta) {
+    if (!meta)
+        return undefined;
+    const sanitized = { ...meta };
+    delete sanitized['io.modelcontextprotocol/related-task'];
+    return Object.keys(sanitized).length > 0 ? sanitized : undefined;
+}
+export function buildRelatedTaskMeta(taskId, meta) {
+    return {
+        ...(sanitizeToolCallMeta(meta) ?? {}),
+        'io.modelcontextprotocol/related-task': { taskId },
+    };
+}
+export function withRelatedTaskMeta(result, taskId) {
+    return {
+        ...result,
+        _meta: {
+            ...result._meta,
+            'io.modelcontextprotocol/related-task': { taskId },
+        },
+    };
+}

package/dist/tasks/cursor-codec.d.ts

@@ -0,0 +1,5 @@
+export declare function encodeTaskCursor(anchorTaskId: string): string;
+export declare function decodeTaskCursor(cursor: string): {
+    anchorTaskId: string;
+} | null;
+//# sourceMappingURL=cursor-codec.d.ts.map

package/dist/tasks/cursor-codec.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"cursor-codec.d.ts","sourceRoot":"","sources":["../../src/tasks/cursor-codec.ts"],"names":[],"mappings":"AAkBA,wBAAgB,gBAAgB,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAO7D;AAED,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,MAAM,GACb;IAAE,YAAY,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAuBjC"}

package/dist/tasks/cursor-codec.js

@@ -0,0 +1,41 @@
+import { createHmac, randomBytes, timingSafeEqual } from 'node:crypto';
+const MAX_CURSOR_LENGTH = 256;
+const CURSOR_SECRET = randomBytes(32);
+function signPayload(payload) {
+    return createHmac('sha256', CURSOR_SECRET)
+        .update(payload)
+        .digest('base64url');
+}
+function safeCompare(left, right) {
+    const leftBuffer = Buffer.from(left);
+    const rightBuffer = Buffer.from(right);
+    if (leftBuffer.length !== rightBuffer.length)
+        return false;
+    return timingSafeEqual(leftBuffer, rightBuffer);
+}
+export function encodeTaskCursor(anchorTaskId) {
+    const payload = Buffer.from(JSON.stringify({ anchorTaskId }), 'utf8').toString('base64url');
+    const signature = signPayload(payload);
+    return `${payload}.${signature}`;
+}
+export function decodeTaskCursor(cursor) {
+    if (!cursor || cursor.length > MAX_CURSOR_LENGTH)
+        return null;
+    const [payload, signature, ...rest] = cursor.split('.');
+    if (!payload || !signature || rest.length > 0)
+        return null;
+    if (!safeCompare(signPayload(payload), signature))
+        return null;
+    try {
+        const decoded = JSON.parse(Buffer.from(payload, 'base64url').toString('utf8'));
+        if (typeof decoded.anchorTaskId !== 'string' ||
+            decoded.anchorTaskId.length === 0 ||
+            decoded.anchorTaskId.length > 128) {
+            return null;
+        }
+        return { anchorTaskId: decoded.anchorTaskId };
+    }
+    catch {
+        return null;
+    }
+}

package/dist/tasks/execution.d.ts

@@ -1,26 +1,8 @@
 import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
 import { type ServerResult } from '@modelcontextprotocol/sdk/types.js';
+import { type ExtendedCallToolRequest } from './call-contract.js';
 import { type CreateTaskResult, type TaskState } from './manager.js';
 import { type ToolCallContext } from './owner.js';
-export interface ExtendedCallToolRequest {
-    method: 'tools/call';
-    params: {
-        name: string;
-        arguments?: Record<string, unknown> | undefined;
-        task?: {
-            ttl?: number | undefined;
-        } | undefined;
-        _meta?: {
-            progressToken?: string | number | undefined;
-            'io.modelcontextprotocol/related-task'?: {
-                taskId: string;
-            } | undefined;
-            [key: string]: unknown;
-        } | undefined;
-        [key: string]: unknown;
-    };
-    [key: string]: unknown;
-}
 export declare function abortTaskExecution(taskId: string): void;
 export declare function cancelTasksForOwner(ownerKey: string, statusMessage?: string): number;
 export declare function abortAllTaskExecutions(): void;
@@ -34,7 +16,6 @@ export declare function toTaskSummary(task: {
     ttl: number;
     pollInterval: number;
 }): TaskSummary;
-export declare function withRelatedTaskMeta(result: ServerResult, taskId: string): ServerResult;
 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>;

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

@@ -1 +1 @@
-{"version":3,"file":"execution.d.ts","sourceRoot":"","sources":["../../src/tasks/execution.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACzE,OAAO,EAGL,KAAK,YAAY,EAClB,MAAM,oCAAoC,CAAC;AAW5C,OAAO,EACL,KAAK,gBAAgB,EAErB,KAAK,SAAS,EACf,MAAM,cAAc,CAAC;AACtB,OAAO,EAEL,KAAK,eAAe,EAErB,MAAM,YAAY,CAAC;AAapB,MAAM,WAAW,uBAAuB;IACtC,MAAM,EAAE,YAAY,CAAC;IACrB,MAAM,EAAE;QACN,IAAI,EAAE,MAAM,CAAC;QACb,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAAC;QAChD,IAAI,CAAC,EACD;YACE,GAAG,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;SAC1B,GACD,SAAS,CAAC;QACd,KAAK,CAAC,EACF;YACE,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;YAC5C,sCAAsC,CAAC,EACnC;gBAAE,MAAM,EAAE,MAAM,CAAA;aAAE,GAClB,SAAS,CAAC;YACd,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;SACxB,GACD,SAAS,CAAC;QACd,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;KACxB,CAAC;IACF,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAyBD,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAKvD;AAMD,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,MAAM,EAChB,aAAa,SAA4D,GACxE,MAAM,CASR;AAED,wBAAgB,sBAAsB,IAAI,IAAI,CAE7C;AAgBD,KAAK,WAAW,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC;AAE5C,wBAAgB,aAAa,CAAC,IAAI,EAAE;IAClC,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,SAAS,CAAC,QAAQ,CAAC,CAAC;IAC5B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,EAAE,MAAM,CAAC;CACtB,GAAG,WAAW,CAUd;AAED,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,YAAY,EACpB,MAAM,EAAE,MAAM,GACb,YAAY,CAYd;AAED,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,SAAS,EACjB,IAAI,EAAE,SAAS,GACd,IAAI,CAmBN;AAoBD,wBAAgB,iBAAiB,IAAI,KAAK,CAEzC;AAmND,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,SAAS,EACjB,OAAO,EAAE,uBAAuB,EAChC,OAAO,EAAE,eAAe,GACvB,OAAO,CAAC,YAAY,CAAC,CAYvB"}
+{"version":3,"file":"execution.d.ts","sourceRoot":"","sources":["../../src/tasks/execution.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACzE,OAAO,EAGL,KAAK,YAAY,EAClB,MAAM,oCAAoC,CAAC;AAQ5C,OAAO,EAEL,KAAK,uBAAuB,EAC7B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACL,KAAK,gBAAgB,EAErB,KAAK,SAAS,EACf,MAAM,cAAc,CAAC;AACtB,OAAO,EAGL,KAAK,eAAe,EAErB,MAAM,YAAY,CAAC;AAgCpB,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAKvD;AAMD,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,MAAM,EAChB,aAAa,SAA4D,GACxE,MAAM,CASR;AAED,wBAAgB,sBAAsB,IAAI,IAAI,CAE7C;AAgBD,KAAK,WAAW,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC;AAE5C,wBAAgB,aAAa,CAAC,IAAI,EAAE;IAClC,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,SAAS,CAAC,QAAQ,CAAC,CAAC;IAC5B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,EAAE,MAAM,CAAC;CACtB,GAAG,WAAW,CAUd;AAED,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,SAAS,EACjB,IAAI,EAAE,SAAS,GACd,IAAI,CAmBN;AAoBD,wBAAgB,iBAAiB,IAAI,KAAK,CAEzC;AA+LD,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,SAAS,EACjB,OAAO,EAAE,uBAAuB,EAChC,OAAO,EAAE,eAAe,GACvB,OAAO,CAAC,YAAY,CAAC,CAYvB"}

package/dist/tasks/execution.js

@@ -3,8 +3,9 @@ import { config } from '../lib/core.js';
 import { logWarn, runWithRequestContext } from '../lib/core.js';
 import { getErrorMessage } from '../lib/utils.js';
 import { isObject } from '../lib/utils.js';
+import { buildRelatedTaskMeta, } from './call-contract.js';
 import { taskManager, } from './manager.js';
-import { compact, tryReadToolStructuredError, } from './owner.js';
+import { buildToolHandlerExtra, compact, tryReadToolStructuredError, } from './owner.js';
 import { getTaskCapableTool, hasTaskCapableTool, } from './tool-registry.js';
 const TASK_NOT_FOUND_ERROR_CODE = ErrorCode.InvalidParams;
 /* -------------------------------------------------------------------------------------------------
@@ -61,18 +62,6 @@ export function toTaskSummary(task) {
         pollInterval: task.pollInterval,
     };
 }
-export function withRelatedTaskMeta(result, taskId) {
-    const relatedTaskMeta = {
-        'io.modelcontextprotocol/related-task': { taskId },
-    };
-    return {
-        ...result,
-        _meta: {
-            ...result._meta,
-            ...relatedTaskMeta,
-        },
-    };
-}
 export function emitTaskStatusNotification(server, task) {
     if (!config.tasks.emitStatusNotifications)
         return;
@@ -124,15 +113,6 @@ function assertKnownTool(name) {
         throw new McpError(ErrorCode.MethodNotFound, `Unknown tool: '${name}'`);
     }
 }
-/* -------------------------------------------------------------------------------------------------
- * Task result builders
- * ------------------------------------------------------------------------------------------------- */
-function buildRelatedTaskMeta(taskId, meta) {
-    return {
-        ...(meta ?? {}),
-        'io.modelcontextprotocol/related-task': { taskId },
-    };
-}
 function buildCreateTaskResult(task) {
     return { task };
 }
@@ -178,13 +158,14 @@ function resolveToolAndArgs(params) {
     const args = tool.parseArguments(params.arguments);
     return { tool, args };
 }
-function buildTaskCompletionUpdate(result) {
+function buildTaskCompletionUpdate(result, tool) {
     const isToolError = isObject(result) && 'isError' in result && result.isError === true;
     return {
         status: isToolError ? 'failed' : 'completed',
         statusMessage: isToolError
             ? (tryReadToolStructuredError(result) ?? 'Tool execution failed')
-            : 'Task completed successfully.',
+            : (tool.getCompletionStatusMessage?.(result) ??
+                'Task completed successfully.'),
         result,
     };
 }
@@ -208,7 +189,7 @@ async function runTaskToolExecution(params) {
                     updateWorkingTaskStatus(server, taskId, message);
                 },
             });
-            updateTaskAndEmitStatus(server, taskId, buildTaskCompletionUpdate(result));
+            updateTaskAndEmitStatus(server, taskId, buildTaskCompletionUpdate(result, tool));
         }
         catch (error) {
             const failure = buildTaskFailureState(error);
@@ -241,13 +222,7 @@ function handleTaskToolCall(server, params, context) {
 }
 async function handleDirectToolCall(params, context) {
     const { tool, args } = resolveToolAndArgs(params);
-    const extra = compact({
-        signal: context.signal,
-        requestId: context.requestId,
-        sendNotification: context.sendNotification,
-        _meta: params._meta,
-    });
-    return tool.execute(args, extra);
+    return tool.execute(args, buildToolHandlerExtra(context, params._meta));
 }
 export async function handleToolCallRequest(server, request, context) {
     const { params } = request;

package/dist/tasks/manager.d.ts

@@ -34,7 +34,7 @@ export interface CreateTaskResult {
 declare class TaskManager {
     private tasks;
     private ownerCounts;
-    private waiters;
+    private readonly waiters;
     private cleanupInterval;
     private ensureCleanupLoop;
     private stopCleanupLoop;
@@ -63,15 +63,11 @@ declare class TaskManager {
         nextCursor?: string;
     };
     private resolveAnchorTaskId;
-    private addWaiter;
-    private removeWaiter;
     waitForTerminalTask(taskId: string, ownerKey: string, signal?: AbortSignal): Promise<TaskState | undefined>;
     private notifyWaiters;
     private isExpired;
     private maybeUpdateLastUpdatedAt;
     shrinkTtlAfterDelivery(taskId: string): void;
-    private encodeCursor;
-    private decodeCursor;
     private resolveNextCursor;
 }
 export declare const taskManager: TaskManager;

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