@sema-agent/core 3.0.0 → 5.0.0

package/dist/core/task-registry.js

@@ -4,11 +4,12 @@ import { hasBackgroundShell } from "./background-shell.js";
 import { shutdownDebug } from "./shutdown-debug.js";
 import { canAccessAgentRecord, } from "./background-agent-store.js";
 import { delimitUntrusted } from "./untrusted-text.js";
+import { createSafeNotifier } from "./safe-notify.js";
 import { registerMonitorLane, pollMonitorLane, stopMonitorLane } from "./task-registry-monitor.js";
 import { registerWorkflowLane, pollWorkflowLane, stopWorkflowLane } from "./task-registry-workflow.js";
-import { mintCompletionId, canAccessWorkflowRun, formatWorkflowRun, clipTaskOutput, assertOwnership, sleepPollStep, statusFromBackground, rollSpoolText, accountDroppedBytes, droppedGapNote, alreadyTerminalStopNote, terminalTaskSummary, TASK_OUTPUT_MAX_CHARS, MONITOR_BATCH_WINDOW_MS, MONITOR_DEFAULT_TIMEOUT_MS, MONITOR_MAX_TIMEOUT_MS, MONITOR_MAX_BATCHES_PER_MINUTE, canAccess, DURABLE_AGENT_HANDLE_RE, } from "./task-registry-shared.js";
+import { mintCompletionId, canAccessWorkflowRun, formatWorkflowRun, clipTaskOutput, assertOwnership, sleepPollStep, statusFromBackground, rollSpoolText, accountDroppedBytes, renderSpoolBody, spoolDropNote, droppedGapNote, alreadyTerminalStopNote, terminalTaskSummary, TASK_OUTPUT_MAX_CHARS, MONITOR_BATCH_WINDOW_MS, MONITOR_DEFAULT_TIMEOUT_MS, MONITOR_MAX_TIMEOUT_MS, MONITOR_MAX_BATCHES_PER_MINUTE, canAccess, DURABLE_AGENT_HANDLE_RE, } from "./task-registry-shared.js";
 export { normalizeAgentName, DURABLE_AGENT_HEARTBEAT_MS, DURABLE_AGENT_HANDLE_RE, BG_AGENT_REAP_STOP_ERROR } from "./task-registry-shared.js";
-import { TASK_OUTPUT_TOOL_NAME, TASK_STOP_TOOL_NAME, TASK_OUTPUT_ALIASES, TASK_STOP_ALIASES, TASK_OUTPUT_CONTRACT, TASK_STOP_CONTRACT, TASK_OUTPUT_MISSING_ID_MESSAGE, TASK_STOP_MISSING_ID_MESSAGE, TASK_STOP_PARAMS, resolveTaskIdArg, REGISTRY_TASK_TOOL_CAPS, composeTaskOutputDescription, composeTaskOutputParams, composeTaskStopDescription, } from "./task-tool-shape.js";
+import { TASK_OUTPUT_TOOL_NAME, TASK_STOP_TOOL_NAME, TASK_OUTPUT_CONTRACT, TASK_STOP_CONTRACT, TASK_OUTPUT_MISSING_ID_MESSAGE, TASK_STOP_MISSING_ID_MESSAGE, TASK_STOP_PARAMS, resolveTaskIdArg, REGISTRY_TASK_TOOL_CAPS, composeTaskOutputDescription, composeTaskOutputParams, composeTaskStopDescription, } from "./task-tool-shape.js";
 import { durableAgentArmedLane, durableAgentRowProbeLane, beginDurableClaimLane, endDurableClaimLane, reapDurableAgentsLane, releaseDurableTranscriptAnchorLane, bindBackgroundAgentSessionLane, registerBackgroundAgentLane, parkBackgroundAgentLane, reconcileParkedAgentsLane, claimParkedAgentLane, rollbackParkedClaimLane, consumeParkedFlipLane, finalizeParkedResumeLane, settleBackgroundAgentLane, abortBackgroundAgentsForOwnerLane, serveDurableAgentRowLane, resolveBackgroundAgentByNameLane, markRetainedContinuationLane, reviveBackgroundAgentLane, settleRevivedAgentLane, unmarkRetainedContinuationLane, attachAgentNotifyLane, deliverToRunningAgentLane, runningBackgroundAgentLabelsLane, runningAgentFooterLane, notFoundRunningAgentsTail, pollBackgroundAgentLane, stopBackgroundAgentLane, } from "./task-registry-agent.js";
 export { canAccessWorkflowRun, clipTaskOutput, MONITOR_BATCH_WINDOW_MS, MONITOR_DEFAULT_TIMEOUT_MS, MONITOR_MAX_TIMEOUT_MS, MONITOR_MAX_BATCHES_PER_MINUTE };
 const BLOCK_DEFAULT_TIMEOUT_MS = 30_000;
@@ -47,6 +48,31 @@ function bashTerminalResult(spool) {
     const err = spool.stderr.slice(-2_000);
     return err.length > 0 ? `${out}${out.length > 0 ? "\n" : ""}--- stderr (tail) ---\n${err}` : out;
 }
+async function drainBashTailBestEffort(handle) {
+    if (handle.outputFile === undefined)
+        return;
+    try {
+        const drained = await handle.env.pollBackground(handle.shellId);
+        if (drained.ok && handle.spool !== undefined)
+            accountDroppedBytes(handle.spool, drained.value);
+        if (drained.ok && (drained.value.stdout.length > 0 || drained.value.stderr.length > 0)) {
+            if (handle.spool !== undefined) {
+                const spool = handle.spool;
+                const cap = 2 * TASK_OUTPUT_MAX_CHARS;
+                spool.stdout = rollSpoolText(spool, spool.stdout + drained.value.stdout, cap);
+                spool.stderr = rollSpoolText(spool, spool.stderr + drained.value.stderr, cap);
+                const ap = await handle.env.appendFile(handle.outputFile, drained.value.stdout + drained.value.stderr);
+                if (!ap.ok)
+                    spool.mirrorFailed = true;
+            }
+            else {
+                await handle.env.appendFile(handle.outputFile, drained.value.stdout + drained.value.stderr);
+            }
+        }
+    }
+    catch {
+    }
+}
 function bashMirrorGapNote(handle) {
     return handle.outputFile !== undefined && handle.spool?.mirrorFailed === true
         ? " [!] The output file is INCOMPLETE (one or more writes to it failed) — trust the result text / TaskOutput over the file."
@@ -76,7 +102,10 @@ export class TaskRegistry {
     handles = new Map();
     sessionReapHooks = new Set();
     bgQuiescenceWatchers = new Map();
-    legacyToTaskId = new Map();
+    notifier = createSafeNotifier();
+    notifierFailureCounts() {
+        return this.notifier.failedSites().map((site) => ({ site, count: this.notifier.failuresAt(site) }));
+    }
     core = (() => {
         const self = this;
         return {
@@ -199,7 +228,7 @@ export class TaskRegistry {
         const prefix = TASK_PREFIX[type];
         for (let i = 0; i < 32; i++) {
             const id = `${prefix}${randomBytes(8).toString("hex")}`;
-            if (!this.handles.has(id) && !this.legacyToTaskId.has(id))
+            if (!this.handles.has(id))
                 return id;
         }
         throw new Error(`TaskRegistry: exhausted task id mint retries for ${type}`);
@@ -226,7 +255,6 @@ export class TaskRegistry {
             ...(input.onTerminal !== undefined ? { onTerminal: input.onTerminal } : {}),
             ...(input.outputFile !== undefined ? { outputFile: input.outputFile } : {}),
         });
-        this.legacyToTaskId.set(String(input.shellId), id);
         if (input.onTerminal)
             this.startBashWatcher(id, input.onTerminal);
         return id;
@@ -263,6 +291,7 @@ export class TaskRegistry {
             ...(hb.parentTaskId !== undefined ? { parentTaskId: hb.parentTaskId } : {}),
             ...(hb.parentSessionId !== undefined ? { parentSessionId: hb.parentSessionId } : {}),
             ...(hb.rootSessionId !== undefined ? { rootSessionId: hb.rootSessionId } : {}),
+            createdAt: h.createdAt,
         };
     }
     markStopSource(id, source) {
@@ -291,17 +320,9 @@ export class TaskRegistry {
         return marked;
     }
     markStopSourceByShellId(shellId, source, env) {
-        const sid = String(shellId);
-        const taskId = this.legacyToTaskId.get(sid);
-        if (taskId !== undefined) {
-            const handle = this.handles.get(taskId);
-            if (handle && handle.type === "background_bash" && (env === undefined || handle.env === env)) {
-                this.markStopSource(taskId, source);
-                return;
-            }
-        }
         if (env === undefined)
             return;
+        const sid = String(shellId);
         for (const [id, handle] of this.handles) {
             if (handle.type === "background_bash" && String(handle.shellId) === sid && handle.env === env) {
                 this.markStopSource(id, source);
@@ -322,9 +343,6 @@ export class TaskRegistry {
             }
             return true;
         };
-        const taskId = this.legacyToTaskId.get(sid);
-        if (taskId !== undefined && clear(taskId))
-            return;
         if (env === undefined)
             return;
         for (const [id, handle] of this.handles) {
@@ -407,22 +425,7 @@ export class TaskRegistry {
                 handle.stoppedBy = handle.stopSource ?? source;
                 handle.updatedAt = Date.now();
                 mintCompletionId(handle);
-                if (handle.outputFile !== undefined) {
-                    try {
-                        const drained = await handle.env.pollBackground(handle.shellId);
-                        if (drained.ok && (drained.value.stdout.length > 0 || drained.value.stderr.length > 0)) {
-                            const spool = (handle.spool ??= { stdout: "", stderr: "", rolledChars: 0 });
-                            const cap = 2 * TASK_OUTPUT_MAX_CHARS;
-                            spool.stdout = rollSpoolText(spool, spool.stdout + drained.value.stdout, cap);
-                            spool.stderr = rollSpoolText(spool, spool.stderr + drained.value.stderr, cap);
-                            const ap = await handle.env.appendFile(handle.outputFile, drained.value.stdout + drained.value.stderr);
-                            if (!ap.ok)
-                                spool.mirrorFailed = true;
-                        }
-                    }
-                    catch {
-                    }
-                }
+                await drainBashTailBestEffort(handle);
                 const resultText = handle.spool !== undefined ? bashTerminalResult(handle.spool) : "";
                 this.notifyTerminalOnce(handle, () => handle.onTerminal?.({
                     task_id: handle.id,
@@ -521,21 +524,13 @@ export class TaskRegistry {
             this.settleBackgroundAgent(handle.id, { status: "killed", error: "session released", cycle: handle.reviveCycle ?? 0 });
             if (reapTerminalNote !== undefined && handle.terminalNotified !== true) {
                 handle.terminalNotified = true;
-                try {
-                    reapTerminalNote();
-                }
-                catch {
-                }
+                this.notifier.notify(() => reapTerminalNote(), "taskRegistry.reapTerminalNote");
             }
             reaped++;
         }
         this.pokeBgQuiescence(sessionId);
         for (const hook of this.sessionReapHooks) {
-            try {
-                hook(sessionId, scope);
-            }
-            catch {
-            }
+            this.notifier.notify(() => hook(sessionId, scope), "taskRegistry.onSessionReap");
         }
         return reaped;
     }
@@ -585,11 +580,7 @@ export class TaskRegistry {
                     this.bgQuiescenceWatchers.delete(oldest);
                     queueMicrotask(() => {
                         for (const victim of victims) {
-                            try {
-                                victim("evicted");
-                            }
-                            catch {
-                            }
+                            this.notifier.notify(() => victim("evicted"), "taskRegistry.bgQuiescence.evicted");
                         }
                     });
                 }
@@ -617,22 +608,14 @@ export class TaskRegistry {
             return;
         this.bgQuiescenceWatchers.delete(owner);
         for (const cb of set) {
-            try {
-                cb("quiescent");
-            }
-            catch {
-            }
+            this.notifier.notify(() => cb("quiescent"), "taskRegistry.bgQuiescence.quiescent");
         }
     }
     notifyTerminalOnce(handle, send) {
         if (handle.terminalNotified === true)
             return;
         handle.terminalNotified = true;
-        try {
-            send();
-        }
-        catch {
-        }
+        this.notifier.notify(() => send(), "taskRegistry.notifyTerminalOnce");
         this.pokeBgQuiescence(handle.owner);
     }
     startBashWatcher(id, onTerminal) {
@@ -966,11 +949,8 @@ The durable record is still marked running (last update ${new Date(row.updatedAt
             if (now - handle.updatedAt < terminalTtlMs)
                 continue;
             this.handles.delete(id);
-            if (handle.type === "background_bash") {
-                this.legacyToTaskId.delete(String(handle.shellId));
-                if (handle.watcher !== undefined)
-                    clearInterval(handle.watcher);
-            }
+            if (handle.type === "background_bash" && handle.watcher !== undefined)
+                clearInterval(handle.watcher);
             if (handle.type === "monitor" && handle.watcher !== undefined) {
                 handle.timers.clearInterval(handle.watcher);
                 handle.watcher = undefined;
@@ -1007,7 +987,6 @@ The durable record is still marked running (last update ${new Date(row.updatedAt
             this.handles.delete(id);
             if (handle.status === "running" && handle.owner !== undefined)
                 evictedRunningOwners.add(handle.owner);
-            this.legacyToTaskId.delete(String(handle.shellId));
             if (handle.watcher !== undefined)
                 clearInterval(handle.watcher);
             deleted++;
@@ -1017,10 +996,7 @@ The durable record is still marked running (last update ${new Date(row.updatedAt
         return deleted;
     }
     resolveInternal(id, access) {
-        const taskId = this.handles.has(id) ? id : this.legacyToTaskId.get(id);
-        if (!taskId)
-            return undefined;
-        const handle = this.handles.get(taskId);
+        const handle = this.handles.get(id);
         if (!handle || !canAccess(handle, access))
             return undefined;
         return handle;
@@ -1049,17 +1025,7 @@ The durable record is still marked running (last update ${new Date(row.updatedAt
             const shape = (text) => clipTaskOutput(rx ? text.split(/\r?\n/).filter((l) => rx.test(l)).join("\n") : text, handle.outputFile);
             const running = handle.status === "running";
             const retrieval = running && deadline !== undefined && Date.now() >= deadline ? "timeout" : "success";
-            const timedOutClause = spool.timedOut === true ? ` (timed out after ${spool.timeoutSec !== undefined ? `${spool.timeoutSec}s` : "its background time budget"})` : "";
-            const displayStatus = (spool.exitCode !== undefined ? `exited(code ${spool.exitCode})` : running ? "running" : handle.status) + timedOutClause;
-            const rolledNote = spool.rolledChars > 0 ? `[!] ${spool.rolledChars} earlier char(s) dropped from the spool (memory bound)\n` : "";
-            const droppedNote = (spool.droppedBytes ?? 0) > 0
-                ? `[!] ${spool.droppedBytes} earlier byte(s) permanently dropped before this window (8MB buffer evicted)\n`
-                : spool.dropUnknown === true
-                    ? "[!] an unknown amount of earlier output was permanently dropped before this window (buffer evicted)\n"
-                    : "";
-            const stdoutHeading = droppedNote !== "" ? "stdout (re-readable spool — INCOMPLETE, see note above)" : "stdout (full, re-readable)";
-            const body = `status: ${displayStatus}\n${rolledNote}${droppedNote}--- ${stdoutHeading} ---\n${shape(spool.stdout) || "(none)"}\n` +
-                `--- stderr ---\n${shape(spool.stderr) || "(none)"}`;
+            const body = renderSpoolBody(spool, { running, handleStatus: handle.status, shape, rolledExtraClause: "", drainNote: "" });
             return {
                 content: delimitUntrusted(`TaskOutput ${handle.id}`, body),
                 details: {
@@ -1089,7 +1055,7 @@ The durable record is still marked running (last update ${new Date(row.updatedAt
         };
         let stdout = "";
         let stderr = "";
-        let dropped = 0;
+        const dropAcct = {};
         for (;;) {
             const r = await handle.env.pollBackground(handle.shellId);
             if (!r.ok) {
@@ -1107,7 +1073,7 @@ The durable record is still marked running (last update ${new Date(row.updatedAt
             }
             stdout = roll(stdout + r.value.stdout);
             stderr = roll(stderr + r.value.stderr);
-            dropped += r.value.bytesDroppedBeforeCursor ?? 0;
+            accountDroppedBytes(dropAcct, r.value);
             handle.status = statusFromBackground(r.value.status, r.value.exitCode);
             if (handle.status === "killed" && handle.stoppedBy === undefined)
                 handle.stoppedBy = handle.stopSource ?? (r.value.timedOut === true ? "timeout" : "system");
@@ -1120,7 +1086,7 @@ The durable record is still marked running (last update ${new Date(row.updatedAt
                 const shape = (text) => clipTaskOutput(rx ? text.split(/\r?\n/).filter((l) => rx.test(l)).join("\n") : text, handle.outputFile);
                 const timedOutClause = r.value.timedOut === true ? ` (timed out after ${r.value.timeoutSec !== undefined ? `${r.value.timeoutSec}s` : "its background time budget"})` : "";
                 const displayStatus = (r.value.status === "exited" ? `exited(code ${r.value.exitCode})` : r.value.status) + timedOutClause;
-                const droppedNote = (dropped > 0 ? `[!] ${dropped} earlier byte(s) permanently dropped before this window (8MB buffer evicted)\n` : "") +
+                const droppedNote = spoolDropNote(dropAcct) +
                     (rolledChars > 0 ? `[!] ${rolledChars} accumulated char(s) dropped from the middle during the blocked wait (memory bound)\n` : "");
                 const body = `status: ${displayStatus}\n${droppedNote}--- new stdout ---\n${shape(stdout) || "(none)"}\n` +
                     `--- new stderr ---\n${shape(stderr) || "(none)"}`;
@@ -1136,7 +1102,7 @@ The durable record is still marked running (last update ${new Date(row.updatedAt
                         details: {
                             status: r.value.status,
                             exitCode: r.value.exitCode,
-                            bytesDroppedBeforeCursor: dropped,
+                            bytesDroppedBeforeCursor: dropAcct.droppedBytes ?? 0,
                             ...(r.value.timedOut === true ? { timedOut: true, ...(r.value.timeoutSec !== undefined ? { timeoutSec: r.value.timeoutSec } : {}) } : {}),
                         },
                     },
@@ -1205,6 +1171,7 @@ The durable record is still marked running (last update ${new Date(row.updatedAt
         handle.status = "killed";
         handle.updatedAt = Date.now();
         mintCompletionId(handle);
+        await drainBashTailBestEffort(handle);
         this.notifyTerminalOnce(handle, () => explicitStopBashTerminalNote(handle, false));
         return {
             content: `Terminated ${handle.id}.`,
@@ -1233,14 +1200,13 @@ export function createTaskOutputTool(opts) {
     const caps = { ...REGISTRY_TASK_TOOL_CAPS, notification: opts.notificationWired !== false };
     return defineTool({
         name: TASK_OUTPUT_TOOL_NAME,
-        aliases: [...TASK_OUTPUT_ALIASES],
         contract: TASK_OUTPUT_CONTRACT,
         description: composeTaskOutputDescription(caps),
         parameters: composeTaskOutputParams(caps),
         effect: "read",
         execute: async (rawArgs, ctx) => {
             const args = rawArgs;
-            const id = resolveTaskIdArg(args.task_id, args.bash_id, args.runId);
+            const id = resolveTaskIdArg(args.task_id);
             if (!id)
                 return errorResult(TASK_OUTPUT_MISSING_ID_MESSAGE);
             const requestedMs = typeof args.timeout === "number" ? args.timeout : undefined;
@@ -1283,14 +1249,13 @@ export function createTaskOutputTool(opts) {
 export function createTaskStopTool(opts) {
     return defineTool({
         name: TASK_STOP_TOOL_NAME,
-        aliases: [...TASK_STOP_ALIASES],
         contract: TASK_STOP_CONTRACT,
         description: composeTaskStopDescription(REGISTRY_TASK_TOOL_CAPS),
         parameters: TASK_STOP_PARAMS,
         effect: "write",
         execute: async (rawArgs, ctx) => {
             const args = rawArgs;
-            const id = resolveTaskIdArg(args.task_id, args.shell_id, args.runId);
+            const id = resolveTaskIdArg(args.task_id, args.shell_id);
             if (!id)
                 return errorResult(TASK_STOP_MISSING_ID_MESSAGE);
             const r = await opts.registry.stopTask(id, { owner: ctx.taskId ?? opts.owner, scope: ctx.principal ?? opts.scope, ...((ctx.sessionId ?? opts.sessionId) !== undefined ? { sessionId: ctx.sessionId ?? opts.sessionId } : {}) }, { workflowStore: opts.workflowStore, agentStore: opts.agentStore });

package/dist/core/task-tool-shape.d.ts

@@ -1,8 +1,6 @@
 import { Type } from "typebox";
 export declare const TASK_OUTPUT_TOOL_NAME = "TaskOutput";
 export declare const TASK_STOP_TOOL_NAME = "TaskStop";
-export declare const TASK_OUTPUT_ALIASES: readonly ["BashOutput", "AgentOutputTool", "BashOutputTool", "AgentOutput", "WorkflowStatus"];
-export declare const TASK_STOP_ALIASES: readonly ["KillShell", "KillBash"];
 export declare const TASK_OUTPUT_CONTRACT: {
     readonly contractId: "core.task_output@1";
     readonly implementationRevision: "1";

package/dist/core/task-tool-shape.js

@@ -1,8 +1,6 @@
 import { Type } from "typebox";
 export const TASK_OUTPUT_TOOL_NAME = "TaskOutput";
 export const TASK_STOP_TOOL_NAME = "TaskStop";
-export const TASK_OUTPUT_ALIASES = ["BashOutput", "AgentOutputTool", "BashOutputTool", "AgentOutput", "WorkflowStatus"];
-export const TASK_STOP_ALIASES = ["KillShell", "KillBash"];
 export const TASK_OUTPUT_CONTRACT = { contractId: "core.task_output@1", implementationRevision: "1" };
 export const TASK_STOP_CONTRACT = { contractId: "core.task_stop@1", implementationRevision: "1" };
 export const TASK_OUTPUT_MISSING_ID_MESSAGE = "Error (TaskOutput): Missing required parameter: task_id";
@@ -50,9 +48,8 @@ export function composeTaskOutputDescription(caps) {
             "poll captures any final output. ");
     }
     if (!caps.lanes)
-        parts.push("Optional `filter` is a regex keeping only matching lines. ");
-    parts.push("Legacy bash_id and runId arguments are accepted for compatibility.");
-    return parts.join("");
+        parts.push("Optional `filter` is a regex keeping only matching lines.");
+    return parts.join("").trimEnd();
 }
 export function composeTaskStopDescription(caps) {
     return [

package/dist/core/tool-errors.js

@@ -1,14 +1,15 @@
 import { Value } from "typebox/value";
 const MAX_ERROR_CHARS = 10_000;
 const HALF = MAX_ERROR_CHARS / 2;
+import { isHighSurrogate, isLowSurrogate, sliceHeadSafe, sliceTailSafe } from "./surrogate-safe-slice.js";
 export function truncateError(s) {
     if (s.length <= MAX_ERROR_CHARS)
         return s;
-    const removed = s.length - MAX_ERROR_CHARS;
-    return `${s.slice(0, HALF)}\n\n... [${removed} characters truncated] ...\n\n${s.slice(s.length - HALF)}`;
+    const head = sliceHeadSafe(s, HALF);
+    const tail = sliceTailSafe(s, HALF);
+    const removed = s.length - head.length - tail.length;
+    return `${head}\n\n... [${removed} characters truncated] ...\n\n${tail}`;
 }
-const isHighSurrogate = (c) => c >= 0xd800 && c <= 0xdbff;
-const isLowSurrogate = (c) => c >= 0xdc00 && c <= 0xdfff;
 export function clipWithFilePointer(s, limit, fullOutputPath) {
     if (s.length <= limit)
         return s;

package/dist/core/tool-name-aliases.d.ts

@@ -1,2 +1 @@
-export declare const TOMBSTONED_TOOLS: Readonly<Record<string, string>>;
-export declare function canonicalToolName(name: string): string;
+export declare const RETIRED_TOOL_NAMES: ReadonlyMap<string, string>;

package/dist/core/tool-name-aliases.js

@@ -1,59 +1,42 @@
-const OLD_TO_NEW = {
-    recall: "Recall",
-    remember: "Remember",
-    read_file: "Read",
-    edit_file: "Edit",
-    write_file: "Write",
-    bash: "Bash",
-    bash_readonly: "Bash",
-    glob: "Glob",
-    grep: "Grep",
-    web_fetch: "WebFetch",
-    tool_search: "ToolSearch",
-    skill: "Skill",
-    present_plan: "ExitPlanMode",
-    enter_plan_mode: "EnterPlanMode",
-    spawn_subagent: "Agent",
-    CronCancel: "CronDelete",
-    lsp: "LSP",
-    submit_output: "StructuredOutput",
-    repo_map: "RepoMap",
-    read_tool_result: "ReadToolResult",
-    report_blocked: "ReportBlocked",
-    declare_done: "DeclareDone",
-    run_workflow: "Workflow",
-    RunWorkflow: "Workflow",
-    Task: "Agent",
-    BashOutput: "TaskOutput",
-    AgentOutputTool: "TaskOutput",
-    BashOutputTool: "TaskOutput",
-    AgentOutput: "TaskOutput",
-    KillShell: "TaskStop",
-    KillBash: "TaskStop",
-    ListMcpResources: "ListMcpResourcesTool",
-    ReadMcpResource: "ReadMcpResourceTool",
-    ReadMcpResourceDir: "ReadMcpResourceDirTool",
-    MultiEdit: "Edit",
-    Fork: "Agent",
-    WorkflowStatus: "TaskOutput",
-};
-const MEMORY_TOOLS_TOMBSTONE = "The Remember/Recall memory tools were removed (design/138): long-term memory is now file-based. " +
-    "Durable notes live in the memory directory shown in your # Memory instruction (MEMORY.md index + topic files) — " +
-    "use your ordinary file tools (Read/Write/Edit) on those files to record or look up memories. " +
-    "If no # Memory section is present, memory is not enabled for this task; do not retry this tool.";
-export const TOMBSTONED_TOOLS = {
-    Sleep: 'Sleep was removed. To pause and resume later, schedule a self-contained re-wake with CronCreate({ schedule: { kind: "delay", delaySec: … }, prompt: "<what to do on wake>" }) and then end your turn. To wait for an external condition or a long-running command, use Monitor. Do not poll in a loop.',
-    Fork: 'Fork was removed as a standalone tool. Use Agent with subagent_type: "fork" instead — it spawns the same context-inheriting child (pass your directive as \'prompt\'; run_in_background is supported).',
-    Remember: MEMORY_TOOLS_TOMBSTONE,
-    remember: MEMORY_TOOLS_TOMBSTONE,
-    Recall: MEMORY_TOOLS_TOMBSTONE,
-    recall: MEMORY_TOOLS_TOMBSTONE,
-};
-const MCP_PREFIX = "mcp__";
-const MCP_NAME_SEP = "__";
-export function canonicalToolName(name) {
-    const renamed = OLD_TO_NEW[name] ?? name;
-    if (renamed.includes(MCP_NAME_SEP) && !renamed.startsWith(MCP_PREFIX))
-        return MCP_PREFIX + renamed;
-    return renamed;
-}
+export const RETIRED_TOOL_NAMES = new Map([
+    ["read_file", 'renamed "Read"'],
+    ["edit_file", 'renamed "Edit"'],
+    ["write_file", 'renamed "Write"'],
+    ["bash", 'renamed "Bash"'],
+    ["bash_readonly", 'folded into "Bash" (read-only posture rides handsReadOnly/shellGate, not a tool name)'],
+    ["glob", 'renamed "Glob"'],
+    ["grep", 'renamed "Grep"'],
+    ["web_fetch", 'renamed "WebFetch"'],
+    ["tool_search", 'renamed "ToolSearch"'],
+    ["skill", 'renamed "Skill"'],
+    ["present_plan", 'renamed "ExitPlanMode"'],
+    ["enter_plan_mode", 'renamed "EnterPlanMode"'],
+    ["spawn_subagent", 'renamed "Agent"'],
+    ["CronCancel", 'renamed "CronDelete"'],
+    ["lsp", 'renamed "LSP"'],
+    ["submit_output", 'renamed "StructuredOutput"'],
+    ["repo_map", 'renamed "RepoMap"'],
+    ["read_tool_result", 'renamed "ReadToolResult"'],
+    ["report_blocked", 'renamed "ReportBlocked"'],
+    ["declare_done", 'renamed "DeclareDone"'],
+    ["run_workflow", 'renamed "Workflow"'],
+    ["RunWorkflow", 'renamed "Workflow"'],
+    ["Task", 'renamed "Agent" (a deployment-defined tool named "Task" is fine — this fires only when the name matches nothing in the roster)'],
+    ["BashOutput", 'renamed "TaskOutput"'],
+    ["AgentOutputTool", 'renamed "TaskOutput"'],
+    ["BashOutputTool", 'renamed "TaskOutput"'],
+    ["AgentOutput", 'renamed "TaskOutput"'],
+    ["WorkflowStatus", 'folded into "TaskOutput" (poll by runId)'],
+    ["KillShell", 'renamed "TaskStop"'],
+    ["KillBash", 'renamed "TaskStop"'],
+    ["ListMcpResources", 'renamed "ListMcpResourcesTool"'],
+    ["ReadMcpResource", 'renamed "ReadMcpResourceTool"'],
+    ["ReadMcpResourceDir", 'renamed "ReadMcpResourceDirTool"'],
+    ["MultiEdit", 'removed — "Edit" accepts the edits[] shape'],
+    ["Fork", 'removed — use Agent with subagent_type: "fork"'],
+    ["Sleep", "removed — schedule a re-wake with CronCreate({schedule:{kind:\"delay\"}}) or wait with Monitor"],
+    ["Remember", "removed — memory is file-based; write the memory directory with the ordinary file tools"],
+    ["remember", "removed — memory is file-based; write the memory directory with the ordinary file tools"],
+    ["Recall", "removed — memory is file-based; read the memory directory with the ordinary file tools"],
+    ["recall", "removed — memory is file-based; read the memory directory with the ordinary file tools"],
+]);

package/dist/core/tool-policy.js

@@ -2,13 +2,12 @@ import { homedir } from "node:os";
 import { isAbsolute, join, normalize as normalizePath, sep } from "node:path";
 import { BASH_READONLY_DEFAULT_ALLOW, parseLeadingCommandName } from "../tools/fs/index.js";
 import { writeTargetPath } from "../tools/fs/safety.js";
-import { canonicalToolName } from "./tool-name-aliases.js";
 export function decisionText(d) {
     return d.message ?? d.reason;
 }
 const ALLOW = { action: "allow" };
 function withTimeout(p, ms, onTimeout) {
-    if (!ms || ms <= 0) {
+    if (ms === undefined) {
         return p;
     }
     return new Promise((resolve, reject) => {
@@ -25,7 +24,6 @@ function withTimeout(p, ms, onTimeout) {
                 return;
             settle(resolve, onTimeout());
         }, ms);
-        timer.unref?.();
         p.then((v) => settle(resolve, v), (e) => settle(reject, e));
     });
 }
@@ -34,12 +32,12 @@ export function toolPolicyNameSets(p) {
     return Array.isArray(sets) ? sets : [];
 }
 export function createAllowDenyPolicy(opts) {
-    const allow = opts.allow ? new Set(opts.allow.map(canonicalToolName)) : undefined;
-    const deny = new Set((opts.deny ?? []).map(canonicalToolName));
+    const allow = opts.allow ? new Set(opts.allow) : undefined;
+    const deny = new Set(opts.deny ?? []);
     return {
         nameSets: [{ ...(opts.allow ? { allow: [...opts.allow] } : {}), ...(opts.deny ? { deny: [...opts.deny] } : {}) }],
         check(req) {
-            const toolName = canonicalToolName(req.toolName);
+            const toolName = req.toolName;
             if (deny.has(toolName)) {
                 return { action: "deny", reason: `tool "${req.toolName}" is denied by policy` };
             }
@@ -51,9 +49,12 @@ export function createAllowDenyPolicy(opts) {
     };
 }
 export function createApprovalPolicy(opts) {
-    const need = new Set(opts.requireApproval.map(canonicalToolName));
-    const deny = new Set((opts.deny ?? []).map(canonicalToolName));
-    const auto = new Set((opts.autoAllow ?? []).map(canonicalToolName));
+    if (opts.approvalTimeoutMs !== undefined && !Number.isFinite(opts.approvalTimeoutMs)) {
+        throw new Error(`createApprovalPolicy: approvalTimeoutMs must be a finite number of ms (got ${opts.approvalTimeoutMs}) — omit it to wait indefinitely`);
+    }
+    const need = new Set(opts.requireApproval);
+    const deny = new Set(opts.deny ?? []);
+    const auto = new Set(opts.autoAllow ?? []);
     return {
         nameSets: [
             {
@@ -63,7 +64,7 @@ export function createApprovalPolicy(opts) {
             },
         ],
         async check(req, signal) {
-            const toolName = canonicalToolName(req.toolName);
+            const toolName = req.toolName;
             if (deny.has(toolName)) {
                 return { action: "deny", reason: `tool "${req.toolName}" is denied by policy` };
             }
@@ -121,7 +122,7 @@ export function combinePolicies(...policies) {
 }
 export const COARSE_SHELL_TOOLS = ["Bash", "Monitor"];
 function canonicalToolNameSet(tools) {
-    return new Set((tools ?? COARSE_SHELL_TOOLS).map(canonicalToolName));
+    return new Set(tools ?? COARSE_SHELL_TOOLS);
 }
 export function createCoarseCommandNamePolicy(opts) {
     const allow = opts.allow ? new Set(opts.allow) : undefined;
@@ -133,7 +134,7 @@ export function createCoarseCommandNamePolicy(opts) {
         : { action: "ask", message: reason, decisionReason: "rule" };
     return {
         check(req) {
-            if (!shellTools.has(canonicalToolName(req.toolName)))
+            if (!shellTools.has(req.toolName))
                 return ALLOW;
             const command = req.args?.command;
             if (typeof command !== "string") {
@@ -381,7 +382,7 @@ export function createUnverifiableDeletePolicy(opts) {
     const shellTools = canonicalToolNameSet(opts?.tools);
     return {
         check(req) {
-            if (!shellTools.has(canonicalToolName(req.toolName)))
+            if (!shellTools.has(req.toolName))
                 return ALLOW;
             const command = req.args?.command;
             if (typeof command !== "string")
@@ -403,6 +404,8 @@ export function createUnverifiableDeletePolicy(opts) {
 function pathSegments(p) {
     return p.split(/[\\/]/).filter(Boolean);
 }
+const CASE_INSENSITIVE_FS = process.platform === "darwin" || process.platform === "win32";
+const foldPathCase = (s) => (CASE_INSENSITIVE_FS ? s.toLowerCase() : s);
 function lexicalPath(p, home) {
     const norm = p.normalize("NFC");
     const expanded = norm === "~" ? home : /^~[\\/]/.test(norm) ? join(home, norm.slice(2)) : norm;
@@ -432,17 +435,18 @@ export function createTranscriptIntegrityPolicy(opts) {
     });
     const readAllow = new Set(opts?.readAllow ?? BASH_READONLY_DEFAULT_ALLOW);
     const shellTools = canonicalToolNameSet(opts?.tools);
-    const dirSegs = dirs.map(pathSegments);
+    const dirSegs = dirs.map((d) => pathSegments(d).map(foldPathCase));
     const inProtectedDir = (p) => {
         const abs = lexicalPath(p, home);
-        const segs = pathSegments(abs);
+        const segs = pathSegments(abs).map(foldPathCase);
         if (isAbsolute(abs)) {
             return dirSegs.some((d) => d.length <= segs.length && d.every((s, i) => s === segs[i]));
         }
         return dirSegs.some((d) => relativeContinuesDirTail(segs, d));
     };
     const referencesProtectedDir = (cmd) => {
-        if (textualForms.some((f) => cmd.includes(f)))
+        const hay = foldPathCase(cmd);
+        if (textualForms.some((f) => hay.includes(foldPathCase(f))))
             return true;
         for (const raw of cmd.split(/[\s;&|<>()]+/)) {
             if (raw === "")
@@ -471,7 +475,7 @@ export function createTranscriptIntegrityPolicy(opts) {
     });
     return {
         check(req) {
-            const toolName = canonicalToolName(req.toolName);
+            const toolName = req.toolName;
             if (shellTools.has(toolName)) {
                 const command = req.args?.command;
                 if (typeof command !== "string")

package/dist/core/tool-result-store.d.ts

@@ -45,6 +45,7 @@ export declare class ScopedToolResultStore implements ToolResultStore {
 }
 export declare function isVolatileOffloadStore(store: ToolResultStore): boolean;
 export declare const OFFLOAD_TOOL_NAME = "ReadToolResult";
+export declare function createOffloadPersist(store: ToolResultStore, sessionId: string): (toolCallId: string, fullText: string) => string;
 export declare function offloadPagebackHint(ref: string, form: "preview" | "cleared", reachableTools?: ReadonlySet<string>): string;
 export declare const PERSISTED_OUTPUT_PREFIX = "<persisted-output ref=";
 export declare const DEFAULT_TOOL_RESULT_THRESHOLD_CHARS = 20000;