@j0hanz/fetch-url-mcp 1.3.0 → 1.4.0

package/dist/tasks/execution.js

@@ -1,15 +1,25 @@
 import { ErrorCode, McpError, } from '@modelcontextprotocol/sdk/types.js';
-import { logWarn, runWithRequestContext } from '../observability.js';
-import { FETCH_URL_TOOL_NAME, fetchUrlInputSchema, fetchUrlToolHandler, } from '../tools.js';
+import { config } from '../lib/config.js';
+import { getErrorMessage, RESOURCE_NOT_FOUND_ERROR_CODE, } from '../lib/errors.js';
+import { logWarn, runWithRequestContext } from '../lib/observability.js';
+import { isObject } from '../lib/type-guards.js';
 import { taskManager, } from './manager.js';
-import { compact, isRecord, tryReadToolStructuredError, } from './owner.js';
+import { compact, tryReadToolStructuredError, } from './owner.js';
+import { getTaskCapableTool, hasTaskCapableTool, } from './tool-registry.js';
 /* -------------------------------------------------------------------------------------------------
  * Abort-controller management for in-flight task executions
  * ------------------------------------------------------------------------------------------------- */
+// Intentionally process-global (not session-scoped): abortAllTaskExecutions() is called
+// during SIGTERM/SIGINT shutdown to cancel every in-flight task across all sessions.
+// Keep this process-global so shutdown can cancel all in-flight tasks across sessions.
+// Per-session isolation would require a different cancellation fan-out strategy.
 const taskAbortControllers = new Map();
 function attachAbortController(taskId) {
     const existing = taskAbortControllers.get(taskId);
     if (existing) {
+        // Abort the previous controller before replacing it — avoids stranding
+        // a running fetch that can no longer be cancelled via abortTaskExecution().
+        existing.abort();
         taskAbortControllers.delete(taskId);
     }
     const controller = new AbortController();
@@ -48,6 +58,11 @@ export function toTaskSummary(task) {
         lastUpdatedAt: task.lastUpdatedAt,
         ttl: task.ttl,
         pollInterval: task.pollInterval,
+        _meta: {
+            'io.modelcontextprotocol/related-task': {
+                taskId: task.taskId,
+            },
+        },
     };
 }
 export function withRelatedTaskMeta(result, taskId) {
@@ -63,39 +78,55 @@ export function withRelatedTaskMeta(result, taskId) {
     };
 }
 export function emitTaskStatusNotification(server, task) {
+    if (!config.tasks.emitStatusNotifications)
+        return;
     if (!server.isConnected())
         return;
+    // NOTE: 'notifications/tasks/status' is not part of the MCP v2025-11-25 specification.
+    // This relies on the experimental task infrastructure in the SDK and may change.
     void server.server
         .notification({
         method: 'notifications/tasks/status',
-        params: toTaskSummary(task),
+        params: buildTaskStatusNotificationParams(task),
     })
         .catch((error) => {
         logWarn('Failed to send task status notification', {
             taskId: task.taskId,
             status: task.status,
-            error,
+            error: getErrorMessage(error),
         });
     });
 }
+function buildTaskStatusNotificationParams(task) {
+    return {
+        taskId: task.taskId,
+        status: task.status,
+        ...(task.statusMessage ? { statusMessage: task.statusMessage } : {}),
+        createdAt: task.createdAt,
+        lastUpdatedAt: task.lastUpdatedAt,
+        ttl: task.ttl,
+        pollInterval: task.pollInterval,
+    };
+}
 /* -------------------------------------------------------------------------------------------------
  * Validation helpers
  * ------------------------------------------------------------------------------------------------- */
-function requireFetchUrlArgs(args) {
-    const parsed = fetchUrlInputSchema.safeParse(args);
-    if (!parsed.success) {
-        throw new McpError(ErrorCode.InvalidParams, 'Invalid arguments for fetch-url');
-    }
-    return parsed.data;
-}
 export function throwTaskNotFound() {
-    throw new McpError(ErrorCode.InvalidParams, 'Failed to retrieve task: Task not found');
+    throw new McpError(RESOURCE_NOT_FOUND_ERROR_CODE, 'Task not found');
 }
-function requireFetchUrlToolName(name) {
-    if (name === FETCH_URL_TOOL_NAME)
-        return;
+function resolveTaskCapableTool(name) {
+    const descriptor = getTaskCapableTool(name);
+    if (descriptor)
+        return descriptor;
     throw new McpError(ErrorCode.MethodNotFound, `Unknown tool: '${name}'`);
 }
+// Validates that the tool name is recognized before we attempt to execute it.
+// This ensures that an unknown tool produces a MethodNotFound error, rather than potentially executing and failing with an internal error if the tool handler does not properly validate its input.
+function assertKnownTool(name) {
+    if (!hasTaskCapableTool(name)) {
+        throw new McpError(ErrorCode.MethodNotFound, `Unknown tool: '${name}'`);
+    }
+}
 /* -------------------------------------------------------------------------------------------------
  * Task result builders
  * ------------------------------------------------------------------------------------------------- */
@@ -135,13 +166,43 @@ function updateWorkingTaskStatus(server, taskId, statusMessage) {
     if (updated)
         emitTaskStatusNotification(server, updated);
 }
-async function runFetchTaskExecution(params) {
-    const { server, taskId, args, meta, sendNotification } = params;
-    return runWithRequestContext({ requestId: taskId, operationId: taskId }, async () => {
+function updateTaskAndEmitStatus(server, taskId, update) {
+    taskManager.updateTask(taskId, update);
+    const task = taskManager.getTask(taskId);
+    if (task)
+        emitTaskStatusNotification(server, task);
+}
+function buildTaskFailureState(error) {
+    const statusMessage = getErrorMessage(error);
+    if (error instanceof McpError) {
+        return {
+            statusMessage,
+            error: {
+                code: error.code,
+                message: statusMessage,
+                data: error.data,
+            },
+        };
+    }
+    return {
+        statusMessage,
+        error: {
+            code: ErrorCode.InternalError,
+            message: statusMessage,
+        },
+    };
+}
+async function runTaskToolExecution(params) {
+    const { server, taskId, args, tool, meta, sessionId, sendNotification } = params;
+    return runWithRequestContext({
+        requestId: taskId,
+        operationId: taskId,
+        ...(sessionId ? { sessionId } : {}),
+    }, async () => {
         const controller = attachAbortController(taskId);
         try {
             const relatedMeta = buildRelatedTaskMeta(taskId, meta);
-            const result = await fetchUrlToolHandler(args, {
+            const result = await tool.execute(args, {
                 signal: controller.signal,
                 requestId: taskId,
                 _meta: relatedMeta,
@@ -150,40 +211,22 @@ async function runFetchTaskExecution(params) {
                     updateWorkingTaskStatus(server, taskId, message);
                 },
             });
-            const isToolError = isRecord(result) &&
-                typeof result['isError'] === 'boolean' &&
-                result['isError'];
-            taskManager.updateTask(taskId, {
+            const isToolError = isObject(result) && 'isError' in result && result.isError === true;
+            updateTaskAndEmitStatus(server, taskId, {
                 status: isToolError ? 'failed' : 'completed',
                 statusMessage: isToolError
                     ? (tryReadToolStructuredError(result) ?? 'Tool execution failed')
                     : 'Task completed successfully.',
                 result,
             });
-            const task = taskManager.getTask(taskId);
-            if (task)
-                emitTaskStatusNotification(server, task);
         }
         catch (error) {
-            const errorMessage = error instanceof Error ? error.message : String(error);
-            const errorPayload = error instanceof McpError
-                ? {
-                    code: error.code,
-                    message: errorMessage,
-                    data: error.data,
-                }
-                : {
-                    code: ErrorCode.InternalError,
-                    message: errorMessage,
-                };
-            taskManager.updateTask(taskId, {
+            const failure = buildTaskFailureState(error);
+            updateTaskAndEmitStatus(server, taskId, {
                 status: 'failed',
-                statusMessage: errorMessage,
-                error: errorPayload,
+                statusMessage: failure.statusMessage,
+                error: failure.error,
             });
-            const task = taskManager.getTask(taskId);
-            if (task)
-                emitTaskStatusNotification(server, task);
         }
         finally {
             clearTaskExecution(taskId);
@@ -191,42 +234,41 @@ async function runFetchTaskExecution(params) {
     });
 }
 function handleTaskToolCall(server, params, context) {
-    requireFetchUrlToolName(params.name);
-    const validArgs = requireFetchUrlArgs(params.arguments);
+    const tool = resolveTaskCapableTool(params.name);
+    const validArgs = tool.parseArguments(params.arguments);
     const task = taskManager.createTask(params.task?.ttl !== undefined ? { ttl: params.task.ttl } : undefined, 'Task started', context.ownerKey);
-    void runFetchTaskExecution({
+    void runTaskToolExecution({
         server,
         taskId: task.taskId,
         args: validArgs,
+        tool,
         ...compact({
             meta: params._meta,
+            sessionId: context.sessionId,
             sendNotification: context.sendNotification,
         }),
     });
     return buildCreateTaskResult(toTaskSummary(task));
 }
 async function handleDirectToolCall(params, context) {
-    const args = requireFetchUrlArgs(params.arguments);
-    const extra = {
-        ...(context.signal ? { signal: context.signal } : {}),
-        ...(context.requestId !== undefined
-            ? { requestId: context.requestId }
-            : {}),
-        ...(context.sendNotification
-            ? { sendNotification: context.sendNotification }
-            : {}),
-        ...(params._meta ? { _meta: params._meta } : {}),
-    };
-    return fetchUrlToolHandler(args, extra);
+    const tool = resolveTaskCapableTool(params.name);
+    const args = tool.parseArguments(params.arguments);
+    const extra = compact({
+        signal: context.signal,
+        requestId: context.requestId,
+        sendNotification: context.sendNotification,
+        _meta: params._meta,
+    });
+    return tool.execute(args, extra);
 }
 export async function handleToolCallRequest(server, request, context) {
     const { params } = request;
+    // Validate the tool name first so an unknown tool always produces MethodNotFound,
+    // regardless of whether a task:{} param was supplied (H-4).
+    assertKnownTool(params.name);
     if (params.task) {
         return handleTaskToolCall(server, params, context);
     }
-    if (params.name === FETCH_URL_TOOL_NAME) {
-        return handleDirectToolCall(params, context);
-    }
-    throw new McpError(ErrorCode.MethodNotFound, `Unknown tool: ${params.name}`);
+    return handleDirectToolCall(params, context);
 }
 //# sourceMappingURL=execution.js.map

package/dist/tasks/execution.js.map

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

package/dist/tasks/manager.d.ts

@@ -28,6 +28,11 @@ export interface CreateTaskResult {
         lastUpdatedAt: string;
         ttl: number;
         pollInterval: number;
+        _meta?: {
+            'io.modelcontextprotocol/related-task': {
+                taskId: string;
+            };
+        };
     };
     _meta?: Record<string, unknown>;
 }
@@ -39,11 +44,13 @@ declare class TaskManager {
     private startCleanupLoop;
     private removeExpiredTasks;
     private removeTask;
+    private releaseOwnerCount;
     private countTasksForOwner;
     private incrementOwnerCount;
     private decrementOwnerCount;
     private assertTaskCapacity;
     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;
@@ -57,12 +64,15 @@ declare class TaskManager {
         tasks: TaskState[];
         nextCursor?: string;
     };
+    private addWaiter;
+    private removeWaiter;
     waitForTerminalTask(taskId: string, ownerKey: string, signal?: AbortSignal): Promise<TaskState | undefined>;
     private notifyWaiters;
     private isExpired;
     shrinkTtlAfterDelivery(taskId: string): void;
     private encodeCursor;
     private decodeCursor;
+    private resolveNextCursor;
 }
 export declare const taskManager: TaskManager;
 export {};

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

@@ -1 +1 @@
-{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../../src/tasks/manager.ts"],"names":[],"mappings":"AAUA,MAAM,MAAM,UAAU,GAClB,SAAS,GACT,gBAAgB,GAChB,WAAW,GACX,QAAQ,GACR,WAAW,CAAC;AAEhB,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAED,MAAM,WAAW,SAAS;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,UAAU,CAAC;IACnB,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;IACrB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,SAAS,CAAC;CACnB;AAMD,UAAU,iBAAiB;IACzB,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE;QACJ,MAAM,EAAE,MAAM,CAAC;QACf,MAAM,EAAE,UAAU,CAAC;QACnB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,SAAS,EAAE,MAAM,CAAC;QAClB,aAAa,EAAE,MAAM,CAAC;QACtB,GAAG,EAAE,MAAM,CAAC;QACZ,YAAY,EAAE,MAAM,CAAC;KACtB,CAAC;IACF,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACjC;AA2BD,cAAM,WAAW;IACf,OAAO,CAAC,KAAK,CAAwC;IACrD,OAAO,CAAC,WAAW,CAA6B;IAChD,OAAO,CAAC,OAAO,CAAqD;;IAMpE,OAAO,CAAC,gBAAgB;IAQxB,OAAO,CAAC,kBAAkB;IAa1B,OAAO,CAAC,UAAU;IAQlB,OAAO,CAAC,kBAAkB;IAI1B,OAAO,CAAC,mBAAmB;IAI3B,OAAO,CAAC,mBAAmB;IAS3B,OAAO,CAAC,kBAAkB;IAmB1B,UAAU,CACR,OAAO,CAAC,EAAE,iBAAiB,EAC3B,aAAa,SAAiB,EAC9B,QAAQ,GAAE,MAA0B,GACnC,SAAS;IAwBZ,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS;IAcjE,UAAU,CACR,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,GAAG,WAAW,CAAC,CAAC,GACxD,IAAI;IAcP,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS;IAmBpE,kBAAkB,CAChB,QAAQ,EAAE,MAAM,EAChB,aAAa,SAAkE,GAC9E,SAAS,EAAE;IAmBd,OAAO,CAAC,WAAW;IA6CnB,SAAS,CAAC,OAAO,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG;QACzE,KAAK,EAAE,SAAS,EAAE,CAAC;QACnB,UAAU,CAAC,EAAE,MAAM,CAAC;KACrB;IA4BK,mBAAmB,CACvB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;IAkHjC,OAAO,CAAC,aAAa;IAUrB,OAAO,CAAC,SAAS;IAIjB,sBAAsB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAY5C,OAAO,CAAC,YAAY;IAIpB,OAAO,CAAC,YAAY;CAWrB;AAgBD,eAAO,MAAM,WAAW,aAAoB,CAAC"}
+{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../../src/tasks/manager.ts"],"names":[],"mappings":"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"}

package/dist/tasks/manager.js

@@ -3,8 +3,9 @@ import { AsyncLocalStorage } from 'node:async_hooks';
 import { Buffer } from 'node:buffer';
 import { randomUUID } from 'node:crypto';
 import { setInterval } from 'node:timers';
-import { config } from '../config.js';
-import { createUnrefTimeout } from '../timer-utils.js';
+import { config } from '../lib/config.js';
+import { toError } from '../lib/errors.js';
+import { createUnrefTimeout, } from '../lib/timer-utils.js';
 const DEFAULT_TTL_MS = 60_000;
 const MIN_TTL_MS = 1_000;
 const MAX_TTL_MS = 86_400_000;
@@ -20,7 +21,7 @@ function isTerminalStatus(status) {
 function normalizeTaskTtl(ttl) {
     if (!Number.isFinite(ttl))
         return DEFAULT_TTL_MS;
-    const rounded = Math.trunc(ttl ?? DEFAULT_TTL_MS);
+    const rounded = Math.trunc(Number(ttl));
     if (rounded < MIN_TTL_MS)
         return MIN_TTL_MS;
     if (rounded > MAX_TTL_MS)
@@ -42,24 +43,29 @@ class TaskManager {
     }
     removeExpiredTasks() {
         const now = Date.now();
-        const expired = [];
         for (const [id, task] of this.tasks) {
             if (this.isExpired(task, now)) {
-                expired.push(id);
+                this.removeTask(id);
             }
         }
-        for (const id of expired) {
-            this.removeTask(id);
-        }
     }
     removeTask(taskId) {
         const task = this.tasks.get(taskId);
         if (!task)
             return false;
         this.tasks.delete(taskId);
-        this.decrementOwnerCount(task.ownerKey);
+        this.releaseOwnerCount(task);
         return true;
     }
+    releaseOwnerCount(task) {
+        const internal = task;
+        if (internal._ownerCounted === false)
+            return;
+        if ('_ownerCounted' in internal) {
+            internal._ownerCounted = false;
+        }
+        this.decrementOwnerCount(task.ownerKey);
+    }
     countTasksForOwner(ownerKey) {
         return this.ownerCounts.get(ownerKey) ?? 0;
     }
@@ -99,12 +105,13 @@ class TaskManager {
             ttl: normalizeTaskTtl(options?.ttl),
             pollInterval: DEFAULT_POLL_INTERVAL_MS,
             _createdAtMs: now.getTime(),
+            _ownerCounted: true,
         };
         this.tasks.set(task.taskId, task);
         this.incrementOwnerCount(ownerKey);
         return task;
     }
-    getTask(taskId, ownerKey) {
+    lookupActiveTask(taskId, ownerKey) {
         const task = this.tasks.get(taskId);
         if (!task)
             return undefined;
@@ -116,16 +123,17 @@ class TaskManager {
         }
         return task;
     }
+    getTask(taskId, ownerKey) {
+        return this.lookupActiveTask(taskId, ownerKey);
+    }
     updateTask(taskId, updates) {
         const task = this.tasks.get(taskId);
         if (!task)
             return;
         if (isTerminalStatus(task.status))
             return;
-        Object.assign(task, {
-            ...updates,
-            lastUpdatedAt: new Date().toISOString(),
-        });
+        Object.assign(task, updates);
+        task.lastUpdatedAt = new Date().toISOString();
         this.notifyWaiters(task);
     }
     cancelTask(taskId, ownerKey) {
@@ -139,6 +147,7 @@ class TaskManager {
             status: 'cancelled',
             statusMessage: 'The task was cancelled by request.',
         });
+        this.releaseOwnerCount(task);
         return this.tasks.get(taskId);
     }
     cancelTasksByOwner(ownerKey, statusMessage = 'The task was cancelled because its owner is no longer active.') {
@@ -154,6 +163,7 @@ class TaskManager {
                 status: 'cancelled',
                 statusMessage,
             });
+            this.releaseOwnerCount(task);
             cancelled.push(task);
         }
         return cancelled;
@@ -163,12 +173,11 @@ class TaskManager {
         let collecting = anchorTaskId === null;
         let anchorFound = anchorTaskId === null;
         const now = Date.now();
-        const expired = [];
         for (const task of this.tasks.values()) {
             if (task.ownerKey !== ownerKey)
                 continue;
             if (this.isExpired(task, now)) {
-                expired.push(task.taskId);
+                this.removeTask(task.taskId);
                 continue;
             }
             if (!collecting) {
@@ -182,9 +191,6 @@ class TaskManager {
             if (page.length > pageSize)
                 break;
         }
-        for (const id of expired) {
-            this.removeTask(id);
-        }
         // Anchor task expired between pages; return empty list so callers stop
         // pagination cleanly. Silently falling back to page 0 risks infinite loops
         // for automated clients that always follow nextCursor.
@@ -209,36 +215,44 @@ class TaskManager {
         if (hasMore) {
             page.pop();
         }
-        const lastTask = page.at(-1);
-        const nextCursor = hasMore && lastTask !== undefined
-            ? this.encodeCursor(lastTask.taskId)
-            : undefined;
+        const nextCursor = this.resolveNextCursor(page, hasMore);
         return nextCursor ? { tasks: page, nextCursor } : { tasks: page };
     }
+    addWaiter(taskId, waiter) {
+        let set = this.waiters.get(taskId);
+        if (!set) {
+            set = new Set();
+            this.waiters.set(taskId, set);
+        }
+        set.add(waiter);
+    }
+    removeWaiter(taskId, waiter) {
+        if (!waiter)
+            return;
+        const set = this.waiters.get(taskId);
+        if (!set)
+            return;
+        set.delete(waiter);
+        if (set.size === 0) {
+            this.waiters.delete(taskId);
+        }
+    }
     async waitForTerminalTask(taskId, ownerKey, signal) {
-        const task = this.tasks.get(taskId);
+        const task = this.lookupActiveTask(taskId, ownerKey);
         if (!task)
             return undefined;
-        if (ownerKey && task.ownerKey !== ownerKey)
-            return undefined;
-        if (this.isExpired(task)) {
-            this.removeTask(taskId);
-            return undefined;
-        }
         if (isTerminalStatus(task.status))
             return task;
+        // isExpired() above guarantees task.ttl has not elapsed; compute deadlineMs
+        // for the promise-based timeout below.
         const deadlineMs = task._createdAtMs + task.ttl;
-        const now = Date.now();
-        if (deadlineMs <= now) {
-            this.removeTask(taskId);
-            return undefined;
-        }
         return new Promise((resolve, reject) => {
+            // Bind resolve/reject to the AsyncLocalStorage context of the caller, so that any context values (e.g. requestId) are preserved when we later call them from a different tick.
             const resolveInContext = AsyncLocalStorage.bind((value) => {
                 resolve(value);
             });
             const rejectInContext = AsyncLocalStorage.bind((error) => {
-                reject(error instanceof Error ? error : new Error(String(error)));
+                reject(toError(error));
             });
             let settled = false;
             let waiter = null;
@@ -252,16 +266,6 @@ class TaskManager {
                     signal.removeEventListener('abort', onAbort);
                 }
             };
-            const removeWaiter = () => {
-                if (waiter) {
-                    const set = this.waiters.get(taskId);
-                    if (set) {
-                        set.delete(waiter);
-                        if (set.size === 0)
-                            this.waiters.delete(taskId);
-                    }
-                }
-            };
             const settleOnce = (fn) => {
                 if (settled)
                     return;
@@ -271,7 +275,7 @@ class TaskManager {
             const onAbort = () => {
                 settleOnce(() => {
                     cleanup();
-                    removeWaiter();
+                    this.removeWaiter(taskId, waiter);
                     rejectInContext(new McpError(ErrorCode.ConnectionClosed, 'Request was cancelled'));
                 });
             };
@@ -289,12 +293,7 @@ class TaskManager {
                 onAbort();
                 return;
             }
-            let set = this.waiters.get(taskId);
-            if (!set) {
-                set = new Set();
-                this.waiters.set(taskId, set);
-            }
-            set.add(waiter);
+            this.addWaiter(taskId, waiter);
             if (signal) {
                 signal.addEventListener('abort', onAbort, { once: true });
             }
@@ -304,7 +303,7 @@ class TaskManager {
                 .then(() => {
                 settleOnce(() => {
                     cleanup();
-                    removeWaiter();
+                    this.removeWaiter(taskId, waiter);
                     this.removeTask(taskId);
                     resolveInContext(undefined);
                 });
@@ -335,9 +334,12 @@ class TaskManager {
         const newTtl = elapsed + RESULT_DELIVERY_GRACE_MS;
         if (newTtl < task.ttl) {
             task.ttl = newTtl;
+            task.lastUpdatedAt = new Date().toISOString();
         }
     }
     encodeCursor(taskId) {
+        // Base64url-encode the taskId to produce a compact opaque cursor string.
+        // The taskId is a UUID, which is 36 ASCII chars, so the resulting cursor will be 48 chars (36 * 4/3) plus padding if any.
         return Buffer.from(taskId, 'utf8').toString('base64url');
     }
     decodeCursor(cursor) {
@@ -354,6 +356,12 @@ class TaskManager {
             return null;
         }
     }
+    resolveNextCursor(page, hasMore) {
+        if (!hasMore)
+            return undefined;
+        const lastTask = page.at(-1);
+        return lastTask ? this.encodeCursor(lastTask.taskId) : undefined;
+    }
 }
 function isValidBase64UrlCursor(cursor) {
     if (!cursor)