@sema-agent/core 3.0.0 → 5.0.0

package/dist/core/runner/runtask.js

@@ -9,8 +9,7 @@ import { ASK_USER_QUESTION_TOOL_NAME } from "../ask-question.js";
 import { computeCostMicroUsd, modelCostToPricing } from "../pricing.js";
 import { emitTrace } from "../trace.js";
 import { emitTaskOutcome } from "../task-outcome.js";
-import { DEGENERATE_MESSAGE } from "../../brain/repetition.js";
-import { WALLTIME_CUTOFF_MESSAGE } from "../../brain/walltime.js";
+import { isDegenerateCutMessage, isWalltimeCutMessage } from "../../brain/terminal-cause.js";
 import { primaryActivityArg } from "../arg-summary.js";
 import { resolveReasoning } from "../../brain/reasoning.js";
 import { readDegradation } from "../../brain/degrading.js";
@@ -24,8 +23,10 @@ import { toImageContent } from "./image.js";
 import { OUTPUT_TOOL_NAME, SKILLS_LISTING_PROBE_HEADER, resolveOutputRetries } from "./synthetic-tools.js";
 import { cacheFamilyOf, usageCostMicroUsd } from "./usage-accounting.js";
 import { assembleResult, errorCodeOf } from "./assemble-result.js";
-import { ATTACHMENT_BYTE_CAP, CHANGED_FILES_MAX, AGENT_LISTING_REMOVED_HEADER, SKILLS_LISTING_DELTA_HEADER, SKILLS_LISTING_REMOVED_HEADER, advanceCadenceClock, agentListingDeltaHeader, agentListingInitialHeader, replayAnnouncedListing, replayAnnouncedModels, collectDateChange, collectDueAttachments, collectInstructionsChange, commitAgentListing, commitInstructionsChange, commitSkillsListing, createAttachmentState, rebaseCadenceWindows, reduceToolEnd, renderAgentListingDelta, renderMcpDroppedTools, renderMcpInstructionsDelta, renderOrphanedBackgroundTasks, selectMcpDroppedBatch, renderSkillsListingDelta, renderToolsDelta, stampWriteAnchor } from "./turn-attachments.js";
+import { ATTACHMENT_BYTE_CAP, CHANGED_FILES_MAX, AGENT_LISTING_REMOVED_HEADER, SKILLS_LISTING_DELTA_HEADER, SKILLS_LISTING_REMOVED_HEADER, advanceCadenceClock, agentListingDeltaHeader, agentListingInitialHeader, replayAnnouncedListing, replayAnnouncedModels, clipToBytes, collectDateChange, collectDueAttachments, collectInstructionsChange, commitAgentListing, commitInstructionsChange, commitSkillsListing, createAttachmentState, rebaseCadenceWindows, reduceToolEnd, renderAgentListingDelta, renderMcpDroppedTools, renderMcpInstructionsDelta, renderOrphanedBackgroundTasks, selectMcpDroppedBatch, renderSkillsListingDelta, renderToolsDelta, stampWriteAnchor } from "./turn-attachments.js";
+import { buildWorkingFileAttachments, centerAdoptionOption, emitInputTruncated } from "./compaction-call-options.js";
 import { prepareTask } from "./prepare-task.js";
+import { settleTeardownLeg } from "./teardown-bounded.js";
 import { TOOL_SEARCH_NAME } from "./tool-disclosure.js";
 import { hasVerifiableStructureSignal } from "./grounding-signal.js";
 import { hasDestroy, isIsolated } from "../remote-env.js";
@@ -35,7 +36,6 @@ import { delimitUntrusted, inlineUntrusted, sanitizeUntrustedText } from "../unt
 import { reconcileInterruptedSession } from "../session-reconcile.js";
 import { RunnerSharedToolResultStore } from "../tool-result-store.js";
 import { formatDiagnosticsBlock } from "../lsp-diagnostics.js";
-import { canonicalToolName } from "../tool-name-aliases.js";
 import { toolPolicyNameSets } from "../tool-policy.js";
 import { defaultTaskRegistry } from "../task-registry.js";
 import { discloseDroppedPending, PendingSessionNotifications, renderTaskNotificationXml, SystemInjectionQueue, taskNotificationDedupKey } from "../task-notification.js";
@@ -87,20 +87,6 @@ function batchResponseDigest(result) {
         ? `${text.slice(0, BATCH_RESPONSE_MAX_CHARS)}…[+${text.length - BATCH_RESPONSE_MAX_CHARS} chars truncated]`
         : text;
 }
-function clipToByteBudget(s, maxBytes) {
-    if (Buffer.byteLength(s, "utf8") <= maxBytes)
-        return s;
-    let lo = 0;
-    let hi = s.length;
-    while (lo < hi) {
-        const mid = (lo + hi + 1) >> 1;
-        if (Buffer.byteLength(s.slice(0, mid), "utf8") <= maxBytes)
-            lo = mid;
-        else
-            hi = mid - 1;
-    }
-    return s.slice(0, lo);
-}
 const BATCH_CONTEXT_MIN_KEEP_BYTES = 160;
 const BATCH_TRUNCATION_MARKER = "\n…[truncated]";
 const SUGGESTIONS_DEFAULT_COUNT = 3;
@@ -118,6 +104,10 @@ function resolveMaxTurns(limits) {
     }
     return DEFAULT_MAX_TURNS;
 }
+function resumeDecisionWasNegative(resume) {
+    const o = resume.outcome;
+    return o.decision === "reject" || o.decision === "deny";
+}
 const DEFERRED_REISSUE = "[DEFERRED] This tool call shared a batch with a call that suspended for durable approval, so it was " +
     "NOT executed on resume. If you still need it, issue it again now.";
 function deepJsonEqual(a, b) {
@@ -504,16 +494,17 @@ function makeTurnBoundary(prepared, stats, rs, deps) {
             const batch = rs.turn.toolBatch;
             rs.turn.toolBatch = [];
             batchArgs?.clear();
-            if (!boundarySteered && !rs.counters.finalizeInjected && !finalVerifyInjectedThisTurn && !prepared.abortController.signal.aborted) {
+            const injectedThisTurn = finalVerifyInjectedThisTurn ? "final_verification" : rs.counters.finalizeInjected ? "finalize" : undefined;
+            if (!boundarySteered && !prepared.abortController.signal.aborted) {
                 try {
-                    const r = await postToolBatchHook(batch);
-                    if (r?.additionalContext) {
+                    const r = await postToolBatchHook(batch, injectedThisTurn !== undefined ? { injectedThisTurn } : undefined);
+                    if (r?.additionalContext && injectedThisTurn === undefined) {
                         const body = sanitizeUntrustedText(r.additionalContext);
                         const budget = ATTACHMENT_BYTE_CAP - boundaryAttachmentBytes;
                         if (budget >= BATCH_CONTEXT_MIN_KEEP_BYTES) {
-                            const clipped = clipToByteBudget(body, budget) === body
+                            const clipped = clipToBytes(body, budget) === body
                                 ? body
-                                : `${clipToByteBudget(body, budget - Buffer.byteLength(BATCH_TRUNCATION_MARKER, "utf8"))}${BATCH_TRUNCATION_MARKER}`;
+                                : `${clipToBytes(body, budget - Buffer.byteLength(BATCH_TRUNCATION_MARKER, "utf8"))}${BATCH_TRUNCATION_MARKER}`;
                             batchContextBlock = `<system-reminder>\n${clipped}\n</system-reminder>`;
                         }
                     }
@@ -603,10 +594,7 @@ function makeTurnBoundary(prepared, stats, rs, deps) {
             const comp = await maybeCompact({
                 session: prepared.session,
                 epochDeclaredSections: prepared.epochDeclaredSections,
-                ...(() => {
-                    const ca = prepared.centerCompactionCandidate?.();
-                    return ca !== undefined ? { centerAdoption: ca } : {};
-                })(),
+                ...centerAdoptionOption(prepared),
                 model: event.model,
                 compactionModel: prepared.compModel,
                 brain: compactionBrain,
@@ -618,22 +606,11 @@ function makeTurnBoundary(prepared, stats, rs, deps) {
                 ...(manualCancelSignal !== undefined ? { manualCancelSignal } : {}),
                 minTokens: forceManual ? 0 : rs.counters.compactionFloor,
                 force: forceManual,
-                onInputTruncated: (info) => emitTrace(rs.telemetry.tracer, () => ({ kind: "compaction.input_truncated", version: 1, taskId: rs.telemetry.taskId, label: info.label, droppedChars: info.droppedChars, keptChars: info.keptChars, ts: Date.now() })),
+                onInputTruncated: emitInputTruncated(rs.telemetry.tracer, rs.telemetry.taskId),
                 forceUnderThreshold: trimPressure,
                 overheadTokens: prepared.promptOverheadTokens,
                 ...(prepared.activeTools.size > 0 ? { activeTools: [...prepared.activeTools] } : {}),
-                workingFileAttachments: spec.compaction?.attachWorkingFiles !== false && prepared.readTaskFile
-                    ? {
-                        readFile: prepared.readTaskFile,
-                        ...(prepared.recentlyReadFiles ? { recentlyReadFiles: prepared.recentlyReadFiles } : {}),
-                        ...(prepared.normalizeAttachmentPath ? { normalizePath: prepared.normalizeAttachmentPath } : {}),
-                        ...(prepared.isDedupStubResult ? { isDedupStubResult: prepared.isDedupStubResult } : {}),
-                        ...(prepared.instructionSources
-                            ? { instructionSourcePaths: prepared.instructionSources.filter((s) => s.contentHash !== null).map((s) => s.path) }
-                            : {}),
-                        ...(typeof spec.compaction?.attachWorkingFiles === "object" ? spec.compaction.attachWorkingFiles : undefined),
-                    }
-                    : undefined,
+                workingFileAttachments: buildWorkingFileAttachments(spec, prepared),
                 ...(prepared.onCompactionApplied ? { onApplied: prepared.onCompactionApplied } : {}),
                 ...runnerHooks.seamCCompactionOptions(prepared),
                 ...windowSafetyOptions(event.model),
@@ -770,6 +747,13 @@ function makeTurnBoundary(prepared, stats, rs, deps) {
 function makeHarnessHandlers(prepared, stats, rs, deps) {
     const { spec, queue, internals, buildFinalizeText, ident, nudgeSchedule, parentToolCallId, subagentName, pushContent, emitCommitted, startedToolCallIds, toolStartAt, turnToolSpan, writeFamilyOf, toolLabels, postToolBatchHook, batchArgs } = deps;
     let lastWorkspaceCwd = prepared.cwdRef?.current;
+    const announceWorkspaceMove = () => {
+        const cwdNow = prepared.cwdRef?.current;
+        if (cwdNow !== undefined && cwdNow !== lastWorkspaceCwd) {
+            lastWorkspaceCwd = cwdNow;
+            queue.push({ type: "workspace_changed", cwd: cwdNow, ...ident() });
+        }
+    };
     const onMessageUpdate = (event) => {
         const ev = event.assistantMessageEvent;
         if (rs.turn.callStartAt === undefined)
@@ -891,7 +875,7 @@ function makeHarnessHandlers(prepared, stats, rs, deps) {
         if (m.role === "assistant" && typeof m.stopReason === "string") {
             rs.turn.turnStopReason = m.stopReason;
         }
-        if (m.role === "assistant" && m.errorMessage === WALLTIME_CUTOFF_MESSAGE) {
+        if (m.role === "assistant" && isWalltimeCutMessage(m)) {
             rs.counters.callCutoffs += 1;
             if (prepared.callCapRef)
                 prepared.callCapRef.finalizeMode = true;
@@ -1022,7 +1006,7 @@ function makeHarnessHandlers(prepared, stats, rs, deps) {
         }));
         internals?.onActivity?.({ phase: "end", toolCallId: event.toolCallId, toolName: event.toolName, isError: event.isError, at: toolNow });
         if (prepared.lspDiagnostics && !event.isError) {
-            const name = canonicalToolName(event.toolName);
+            const name = event.toolName;
             if (name === "Edit" || name === "Write" || name === "NotebookEdit") {
                 const d = event.result?.details;
                 const p = typeof d?.filePath === "string" ? d.filePath : typeof d?.notebookPath === "string" ? d.notebookPath : undefined;
@@ -1048,11 +1032,7 @@ function makeHarnessHandlers(prepared, stats, rs, deps) {
             })(),
             ...ident(),
         });
-        const cwdNow = prepared.cwdRef?.current;
-        if (cwdNow !== undefined && cwdNow !== lastWorkspaceCwd) {
-            lastWorkspaceCwd = cwdNow;
-            queue.push({ type: "workspace_changed", cwd: cwdNow, ...ident() });
-        }
+        announceWorkspaceMove();
         if (spec.outputSchema && event.toolName === OUTPUT_TOOL_NAME) {
             if (event.isError) {
                 rs.degrade.outputErrorStreak += 1;
@@ -1130,7 +1110,7 @@ function makeHarnessHandlers(prepared, stats, rs, deps) {
             }
         }
     };
-    return { onMessageUpdate, onMessageEnd, onToolStart, onToolEnd, onTurnEnd };
+    return { onMessageUpdate, onMessageEnd, onToolStart, onToolEnd, onTurnEnd, announceWorkspaceMove };
 }
 export class Runner {
     deps;
@@ -1313,7 +1293,7 @@ export class Runner {
         const settled = run.catch(async (err) => {
             let code = errorCodeOf(err);
             const reopenReason = code === "resume.tool_unavailable" ? "tool_unavailable" : "env_failed";
-            const reopenable = resume !== undefined && resume.pendingActionStarted !== true && reopenReason !== undefined;
+            const reopenable = resume !== undefined && resume.pendingActionStarted !== true && reopenReason !== undefined && !(resumeDecisionWasNegative(resume) && resume.decisionDelivered === true);
             let reopenCommitted = false;
             if (reopenable && resume?.onEnvRestoreFailed) {
                 try {
@@ -1333,11 +1313,7 @@ export class Runner {
             }
             if (resume && !reopenCommitted) {
                 this.parentConstraintRegistry.delete(resume.cp.token);
-                try {
-                    await this.sessions.unpin?.(resume.cp.sessionId);
-                }
-                catch {
-                }
+                await settleTeardownLeg(() => this.sessions.unpin?.(resume.cp.sessionId), "sessions.unpin (resume-failure leg)", (e) => this.deps.onError?.(e, { phase: "config", sessionId: resume.cp.sessionId }));
             }
             if (resultValue !== undefined) {
                 try {
@@ -1940,18 +1916,18 @@ export class Runner {
             }
         }
         rs.attach.attachmentsInjected = 0;
-        const todoToolMounted = rs.attach.attachState !== undefined && prepared.tools.some((t) => canonicalToolName(t.name) === "TodoWrite");
-        const taskToolsMounted = rs.attach.attachState !== undefined && prepared.tools.some((t) => canonicalToolName(t.name) === "TaskCreate");
+        const todoToolMounted = rs.attach.attachState !== undefined && prepared.tools.some((t) => t.name === "TodoWrite");
+        const taskToolsMounted = rs.attach.attachState !== undefined && prepared.tools.some((t) => t.name === "TaskCreate");
         const writeFamilyByName = new Map();
         if (rs.attach.attachState !== undefined) {
             for (const t of prepared.tools) {
-                const family = writeFamilyOfCanonical(canonicalToolName(t.name));
+                const family = writeFamilyOfCanonical(t.name);
                 if (family !== undefined)
                     for (const n of [t.name, ...(t.aliases ?? [])])
                         writeFamilyByName.set(n, family);
             }
         }
-        const writeFamilyOf = (name) => writeFamilyByName.get(name) ?? writeFamilyOfCanonical(canonicalToolName(name));
+        const writeFamilyOf = (name) => writeFamilyByName.get(name) ?? writeFamilyOfCanonical(name);
         const toolStartAt = new Map();
         const turnToolSpan = {};
         const startedToolCallIds = new Set();
@@ -2117,7 +2093,7 @@ export class Runner {
         const postToolBatchHook = (spec.hooks ?? this.deps.hooks)?.postToolBatch;
         const batchArgs = postToolBatchHook ? new Map() : undefined;
         rs.turn.toolBatch = [];
-        const { onMessageUpdate, onMessageEnd, onToolStart, onToolEnd, onTurnEnd } = makeHarnessHandlers(prepared, stats, rs, {
+        const { onMessageUpdate, onMessageEnd, onToolStart, onToolEnd, onTurnEnd, announceWorkspaceMove } = makeHarnessHandlers(prepared, stats, rs, {
             spec, queue, internals, buildFinalizeText, ident, nudgeSchedule, parentToolCallId, subagentName,
             pushContent, emitCommitted, startedToolCallIds, toolStartAt, turnToolSpan, writeFamilyOf,
             toolLabels, postToolBatchHook, batchArgs,
@@ -2324,9 +2300,9 @@ export class Runner {
             truncatedOutput: {},
             malformedToolUse: {},
             thinkingOnly: {},
-            degenerateOutput: { detect: (m) => m.errorMessage === DEGENERATE_MESSAGE },
+            degenerateOutput: { detect: (m) => isDegenerateCutMessage(m) },
             walltimeCutoff: {
-                detect: (m) => m.errorMessage === WALLTIME_CUTOFF_MESSAGE,
+                detect: (m) => isWalltimeCutMessage(m),
                 hasLiveWriteoutWindow: () => {
                     const ref = prepared.callCapRef;
                     if (ref === undefined)
@@ -2349,10 +2325,7 @@ export class Runner {
                         const comp = await maybeCompact({
                             session: prepared.session,
                             epochDeclaredSections: prepared.epochDeclaredSections,
-                            ...(() => {
-                                const ca = prepared.centerCompactionCandidate?.();
-                                return ca !== undefined ? { centerAdoption: ca } : {};
-                            })(),
+                            ...centerAdoptionOption(prepared),
                             model: prepared.harness.getModel(),
                             compactionModel: prepared.compModel,
                             brain: compactionBrain,
@@ -2365,19 +2338,8 @@ export class Runner {
                             force: true,
                             overheadTokens: prepared.promptOverheadTokens,
                             ...(prepared.activeTools.size > 0 ? { activeTools: [...prepared.activeTools] } : {}),
-                            onInputTruncated: (info) => emitTrace(rs.telemetry.tracer, () => ({ kind: "compaction.input_truncated", version: 1, taskId: rs.telemetry.taskId, label: info.label, droppedChars: info.droppedChars, keptChars: info.keptChars, ts: Date.now() })),
-                            workingFileAttachments: spec.compaction?.attachWorkingFiles !== false && prepared.readTaskFile
-                                ? {
-                                    readFile: prepared.readTaskFile,
-                                    ...(prepared.recentlyReadFiles ? { recentlyReadFiles: prepared.recentlyReadFiles } : {}),
-                                    ...(prepared.normalizeAttachmentPath ? { normalizePath: prepared.normalizeAttachmentPath } : {}),
-                                    ...(prepared.isDedupStubResult ? { isDedupStubResult: prepared.isDedupStubResult } : {}),
-                                    ...(prepared.instructionSources
-                                        ? { instructionSourcePaths: prepared.instructionSources.filter((s) => s.contentHash !== null).map((s) => s.path) }
-                                        : {}),
-                                    ...(typeof spec.compaction?.attachWorkingFiles === "object" ? spec.compaction.attachWorkingFiles : undefined),
-                                }
-                                : undefined,
+                            onInputTruncated: emitInputTruncated(rs.telemetry.tracer, rs.telemetry.taskId),
+                            workingFileAttachments: buildWorkingFileAttachments(spec, prepared),
                             ...(prepared.onCompactionApplied ? { onApplied: prepared.onCompactionApplied } : {}),
                             ...this.seamCCompactionOptions(prepared),
                             ...windowSafetyOptions(prepared.harness.getModel()),
@@ -2499,6 +2461,9 @@ export class Runner {
                             resume.pendingActionStarted = true;
                         }
                     });
+                    if (resume.outcome.gate === "policy_ask")
+                        resume.decisionDelivered = true;
+                    announceWorkspaceMove();
                 }
                 if (walltimeExhaustedResume) {
                     timeout.fired = true;
@@ -2530,6 +2495,8 @@ export class Runner {
                         if (steer.trusted)
                             engineSegments.push({ start, end: continuation.length });
                     }
+                    if (resume !== undefined)
+                        resume.decisionDelivered = true;
                     final = await withBrainSinks(() => prepared.harness.prompt(continuation, { engineSegments }));
                 }
             }
@@ -2640,17 +2607,8 @@ export class Runner {
         }
         catch (err) {
             if (errorCodeOf(err) === "resume.tool_unavailable") {
-                try {
-                    await prepared.mcp.dispose();
-                }
-                catch {
-                }
-                try {
-                    if (prepared.ownedEnv && hasDestroy(prepared.ownedEnv))
-                        await prepared.ownedEnv.destroy();
-                }
-                catch {
-                }
+                await settleTeardownLeg(() => prepared.mcp.dispose(), "mcp.dispose (tool_unavailable leg)", (e) => this.deps.onError?.(e, { phase: "config", sessionId: prepared.sessionId }));
+                await settleTeardownLeg(() => (prepared.ownedEnv && hasDestroy(prepared.ownedEnv) ? prepared.ownedEnv.destroy() : undefined), "ownedEnv.destroy (tool_unavailable leg)", (e) => this.deps.onError?.(e, { phase: "config", sessionId: prepared.sessionId }));
                 throw err;
             }
             threw = err;
@@ -2739,7 +2697,7 @@ export class Runner {
                     tokens: prepared.nestedStats.tokens,
                     turns: prepared.nestedStats.turns,
                     tasks: prepared.nestedStats.tasks,
-                    costMicroUsd: prepared.nestedStats.costMicroUsd || undefined,
+                    ...(prepared.nestedStats.anyUnpriced ? {} : { costMicroUsd: prepared.nestedStats.costMicroUsd }),
                 };
             }
             if (stats.totalInputTokens > 0) {
@@ -2824,6 +2782,8 @@ export class Runner {
                 resume.pendingActionStarted !== true &&
                 result.status !== "completed" &&
                 result.status !== "suspended" &&
+                result.status !== "needs_review" &&
+                !(resumeDecisionWasNegative(resume) && resume.decisionDelivered === true) &&
                 resume.onEnvRestoreFailed !== undefined) {
                 try {
                     await resume.onEnvRestoreFailed("env_failed");
@@ -2844,15 +2804,11 @@ export class Runner {
                     const curWt = prepared.worktreeSessionRef?.current;
                     const changed = curCwd !== wss.restoredHandsCwd || curWt?.worktreeDir !== wss.restoredWorktreeDir;
                     if (curCwd !== undefined || curWt !== undefined || changed || wss.baselineUnknown === true) {
-                        try {
-                            await prepared.session.appendWorkspaceState({
-                                taskRoot: wss.rootCanonical,
-                                ...(curCwd !== undefined ? { handsCwd: curCwd } : {}),
-                                ...(curWt !== undefined ? { activeWorktree: { ...curWt } } : {}),
-                            });
-                        }
-                        catch {
-                        }
+                        await settleTeardownLeg(() => prepared.session.appendWorkspaceState({
+                            taskRoot: wss.rootCanonical,
+                            ...(curCwd !== undefined ? { handsCwd: curCwd } : {}),
+                            ...(curWt !== undefined ? { activeWorktree: { ...curWt } } : {}),
+                        }), "session.appendWorkspaceState (settle leg)", (e) => this.deps.onError?.(e, { phase: "config", sessionId: prepared.sessionId }));
                     }
                 }
             }
@@ -2860,8 +2816,8 @@ export class Runner {
             if (stopFailureHook !== undefined &&
                 result.status === "failed" &&
                 final?.stopReason === "error" &&
-                final.errorMessage !== DEGENERATE_MESSAGE &&
-                final.errorMessage !== WALLTIME_CUTOFF_MESSAGE &&
+                !isDegenerateCutMessage(final) &&
+                !isWalltimeCutMessage(final) &&
                 threw === undefined &&
                 rs.limits.budgetHit === undefined &&
                 !rs.degrade.outputInvalid &&
@@ -2902,19 +2858,12 @@ export class Runner {
                 }
             }
             if (resume && committedToken === undefined) {
-                try {
-                    await this.sessions.unpin?.(resume.cp.sessionId);
-                }
-                catch (err) {
-                    try {
-                        this.deps.onError?.(err, { phase: "config", sessionId: prepared.sessionId });
-                    }
-                    catch {
-                    }
-                }
+                await settleTeardownLeg(() => this.sessions.unpin?.(resume.cp.sessionId), "sessions.unpin (resumed-terminal leg)", (e) => this.deps.onError?.(e, { phase: "config", sessionId: prepared.sessionId }));
+            }
+            if (prepared.memoryEngineSession) {
+                const mes = prepared.memoryEngineSession;
+                await settleTeardownLeg(() => mes.harvest(), "memoryEngineSession.harvest (settle leg)", (e) => this.deps.onError?.(e, { phase: "config", sessionId: prepared.sessionId }));
             }
-            if (prepared.memoryEngineSession)
-                await prepared.memoryEngineSession.harvest();
             emitTrace(rs.telemetry.tracer, () => ({
                 kind: "task.end",
                 version: 1,
@@ -2968,28 +2917,19 @@ export class Runner {
                 isIsolated(prepared.ownedEnv) &&
                 prepared.suspendRef.token === undefined &&
                 prepared.reviewRef.token === undefined;
-            try {
-                await defaultTaskRegistry.settleKilledForOwner({ owner: spec.taskId ?? prepared.sessionId, scope: spec.principal ?? "default", sessionId: prepared.sessionId }, {
-                    source: abortedLive &&
-                        !timeout.fired &&
-                        !rs.limits.turnsExceeded &&
-                        rs.limits.budgetHit === undefined &&
-                        prepared.suspendRef.token === undefined &&
-                        prepared.reviewRef.token === undefined
-                        ? "user"
-                        : "parent",
-                    skipSessionScoped: true,
-                    envDying: ownedEnvDying,
-                    retainProcesses: spec.retainBackgroundProcesses === true,
-                });
-            }
-            catch (e) {
-                try {
-                    this.deps.onError?.(e, { phase: "config", sessionId: prepared.sessionId });
-                }
-                catch {
-                }
-            }
+            await settleTeardownLeg(() => defaultTaskRegistry.settleKilledForOwner({ owner: spec.taskId ?? prepared.sessionId, scope: spec.principal ?? "default", sessionId: prepared.sessionId }, {
+                source: abortedLive &&
+                    !timeout.fired &&
+                    !rs.limits.turnsExceeded &&
+                    rs.limits.budgetHit === undefined &&
+                    prepared.suspendRef.token === undefined &&
+                    prepared.reviewRef.token === undefined
+                    ? "user"
+                    : "parent",
+                skipSessionScoped: true,
+                envDying: ownedEnvDying,
+                retainProcesses: spec.retainBackgroundProcesses === true,
+            }), "taskRegistry.settleKilledForOwner", (e) => this.deps.onError?.(e, { phase: "config", sessionId: prepared.sessionId }));
             const bgEnv = prepared.ownedEnv ?? this.deps.executionEnv;
             const retainBgBySpec = spec.retainBackgroundProcesses === true && !ownedEnvDying;
             if (bgEnv && hasBackgroundShell(bgEnv) && !retainBgBySpec) {
@@ -3001,7 +2941,7 @@ export class Runner {
                             ...defaultTaskRegistry.timeoutResidentShellIds(bgEnv),
                             ...defaultTaskRegistry.retainedShellIds(bgEnv),
                         ];
-                    await sweepBackgroundShells(bgEnv, defaultTaskRegistry, keepAlive.length > 0 ? { except: keepAlive } : undefined);
+                    await settleTeardownLeg(() => sweepBackgroundShells(bgEnv, defaultTaskRegistry, keepAlive.length > 0 ? { except: keepAlive } : undefined), "sweepBackgroundShells", (e) => this.deps.onError?.(e, { phase: "config", sessionId: prepared.sessionId }));
                 }
                 catch (e) {
                     this.deps.onError?.(e, { phase: "config", sessionId: prepared.sessionId });
@@ -3016,14 +2956,9 @@ export class Runner {
                 scope: spec.principal ?? "default",
             }, { skipSessionScoped: true });
             if (prepared.subagentRetain) {
-                try {
-                    await prepared.subagentRetain.disposeAll();
-                }
-                catch (e) {
-                    this.deps.onError?.(e, { phase: "config", sessionId: prepared.sessionId });
-                }
+                await settleTeardownLeg(() => prepared.subagentRetain.disposeAll(), "subagentRetain.disposeAll", (e) => this.deps.onError?.(e, { phase: "config", sessionId: prepared.sessionId }));
             }
-            await this.teardownOwnedEnv(prepared);
+            await settleTeardownLeg(() => this.teardownOwnedEnv(prepared), "teardownOwnedEnv", (e) => this.deps.onError?.(e, { phase: "config", sessionId: prepared.sessionId }));
         }
     }
     async suggestNextPrompts(spec, prepared, result) {
@@ -3358,7 +3293,7 @@ export class Runner {
             return;
         if (resume.outcome.gate === "policy_ask" &&
             resume.outcome.decision === "allow" &&
-            !prepared.tools.some((t) => t.name === canonicalToolName(pendingAction.toolName))) {
+            !prepared.tools.some((t) => t.name === pendingAction.toolName)) {
             const e = new Error(`the approved tool "${pendingAction.toolName}" is no longer available on resume — refusing to continue as if it ran; the checkpoint is reopened for a retry with the tool present`);
             e.code = "resume.tool_unavailable";
             throw e;
@@ -3423,7 +3358,7 @@ export class Runner {
                 return;
             }
         }
-        const tool = prepared.tools.find((t) => t.name === canonicalToolName(pendingAction.toolName));
+        const tool = prepared.tools.find((t) => t.name === pendingAction.toolName);
         if (!tool) {
             const e = new Error(`the approved tool "${pendingAction.toolName}" is no longer available on resume`);
             e.code = "resume.tool_unavailable";
@@ -3443,7 +3378,7 @@ export class Runner {
         }
         const executedIsError = res.isError === true;
         emitEnd(executedIsError);
-        onResolvedToolSuccess?.(canonicalToolName(pendingAction.toolName), executedIsError ? undefined : res.details);
+        onResolvedToolSuccess?.(pendingAction.toolName, executedIsError ? undefined : res.details);
         const eid = await prepared.session.appendMessage({
             role: "toolResult",
             toolCallId: pendingAction.toolCallId,
@@ -3525,10 +3460,7 @@ export class Runner {
                 const finishComp = await maybeCompact({
                     session: prepared.session,
                     epochDeclaredSections: prepared.epochDeclaredSections,
-                    ...(() => {
-                        const ca = prepared.centerCompactionCandidate?.();
-                        return ca !== undefined ? { centerAdoption: ca } : {};
-                    })(),
+                    ...centerAdoptionOption(prepared),
                     model: prepared.model,
                     compactionModel: prepared.compModel,
                     brain: opts?.brain ?? this.deps.brain,
@@ -3539,28 +3471,9 @@ export class Runner {
                     minTokens: opts?.minTokens,
                     overheadTokens: prepared.promptOverheadTokens,
                     ...(prepared.activeTools.size > 0 ? { activeTools: [...prepared.activeTools] } : {}),
-                    onInputTruncated: (info) => emitTrace(spec.tracer ?? this.deps.tracer, () => ({
-                        kind: "compaction.input_truncated",
-                        version: 1,
-                        taskId: spec.taskId ?? prepared.sessionId,
-                        label: info.label,
-                        droppedChars: info.droppedChars,
-                        keptChars: info.keptChars,
-                        ts: Date.now(),
-                    })),
+                    onInputTruncated: emitInputTruncated(spec.tracer ?? this.deps.tracer, spec.taskId ?? prepared.sessionId),
                     ...(opts?.windowSafety ?? {}),
-                    workingFileAttachments: spec.compaction?.attachWorkingFiles !== false && prepared.readTaskFile
-                        ? {
-                            readFile: prepared.readTaskFile,
-                            ...(prepared.recentlyReadFiles ? { recentlyReadFiles: prepared.recentlyReadFiles } : {}),
-                            ...(prepared.normalizeAttachmentPath ? { normalizePath: prepared.normalizeAttachmentPath } : {}),
-                            ...(prepared.isDedupStubResult ? { isDedupStubResult: prepared.isDedupStubResult } : {}),
-                            ...(prepared.instructionSources
-                                ? { instructionSourcePaths: prepared.instructionSources.filter((s) => s.contentHash !== null).map((s) => s.path) }
-                                : {}),
-                            ...(typeof spec.compaction?.attachWorkingFiles === "object" ? spec.compaction.attachWorkingFiles : undefined),
-                        }
-                        : undefined,
+                    workingFileAttachments: buildWorkingFileAttachments(spec, prepared),
                     ...(prepared.onCompactionApplied ? { onApplied: prepared.onCompactionApplied } : {}),
                     ...this.seamCCompactionOptions(prepared),
                     ...this.compactionHookOptions(spec, prepared.sessionId, "auto"),
@@ -3629,7 +3542,6 @@ function startTimeout(harness, abortController, remainingMs, softSuspendable = f
             abortController.abort();
             void harness.abort();
         }, hardMs);
-        timer.unref?.();
         state.clear = () => clearTimeout(timer);
     }
     return state;

package/dist/core/runner/session-rule-policy.js

@@ -1,10 +1,12 @@
 import { canonicalizeTarget, fileArgPath } from "../../tools/fs/safety.js";
+import { isWinFormPath } from "../../tools/fs/safety.js";
 import { createCoarseCommandNamePolicy } from "../tool-policy.js";
-import { canonicalToolName } from "../tool-name-aliases.js";
 export const PATH_WRITE_TOOLS = new Set(["Write", "Edit", "MultiEdit"]);
 export function isWithin(root, p) {
+    if (!root)
+        return false;
     const norm = (x) => {
-        let n = x.replace(/\\/g, "/");
+        let n = isWinFormPath(x) ? x.replace(/\\/g, "/") : x;
         if (/^[A-Za-z]:(\/|$)/.test(n))
             n = n[0].toLowerCase() + n.slice(1);
         return n;
@@ -19,8 +21,8 @@ export function isWithin(root, p) {
 const deny = (reason) => ({ action: "deny", reason, decisionReason: "rule" });
 export function createSessionRulePolicy(rules, opts) {
     const { env, rootPath, toolEffects } = opts;
-    const toolDeny = new Set((rules.toolDeny ?? []).map(canonicalToolName));
-    const toolAllow = rules.toolAllow ? new Set(rules.toolAllow.map(canonicalToolName)) : undefined;
+    const toolDeny = new Set(rules.toolDeny ?? []);
+    const toolAllow = rules.toolAllow ? new Set(rules.toolAllow) : undefined;
     const cmdPolicy = rules.commandAllow || rules.commandDeny
         ? createCoarseCommandNamePolicy({
             ...(rules.commandAllow ? { allow: rules.commandAllow } : {}),
@@ -31,7 +33,7 @@ export function createSessionRulePolicy(rules, opts) {
     const allowDirs = rules.allowDirs && rules.allowDirs.length > 0 ? rules.allowDirs : undefined;
     return {
         async check(req, signal) {
-            const toolName = canonicalToolName(req.toolName);
+            const toolName = req.toolName;
             if (toolDeny.has(toolName))
                 return deny(`tool "${req.toolName}" is denied by a session rule`);
             if (toolAllow && !toolAllow.has(toolName)) {

package/dist/core/runner/teardown-bounded.d.ts

@@ -0,0 +1,7 @@
+export declare const TEARDOWN_LEG_MAX_MS = 15000;
+export declare function setTeardownLegBudgetForTests(ms: number | undefined): void;
+export declare class TeardownLegTimeoutError extends Error {
+    readonly leg: string;
+    constructor(leg: string, budgetMs: number);
+}
+export declare function settleTeardownLeg(leg: () => Promise<unknown> | unknown, label: string, report?: (err: Error) => void): Promise<void>;

package/dist/core/runner/teardown-bounded.js

@@ -0,0 +1,36 @@
+export const TEARDOWN_LEG_MAX_MS = 15_000;
+let teardownLegBudgetMs = TEARDOWN_LEG_MAX_MS;
+export function setTeardownLegBudgetForTests(ms) {
+    teardownLegBudgetMs = ms ?? TEARDOWN_LEG_MAX_MS;
+}
+export class TeardownLegTimeoutError extends Error {
+    leg;
+    constructor(leg, budgetMs) {
+        super(`teardown leg "${leg}" did not settle within ${budgetMs}ms — proceeding without it. ` +
+            `The leg keeps running detached; whatever it owns (process/env/store row) may be leaked until it settles on its own.`);
+        this.name = "TeardownLegTimeoutError";
+        this.leg = leg;
+    }
+}
+export async function settleTeardownLeg(leg, label, report) {
+    let timer;
+    try {
+        await Promise.race([
+            Promise.resolve().then(leg),
+            new Promise((_, reject) => {
+                timer = setTimeout(() => reject(new TeardownLegTimeoutError(label, teardownLegBudgetMs)), teardownLegBudgetMs);
+            }),
+        ]);
+    }
+    catch (e) {
+        try {
+            report?.(e instanceof Error ? e : new Error(String(e)));
+        }
+        catch {
+        }
+    }
+    finally {
+        if (timer !== undefined)
+            clearTimeout(timer);
+    }
+}

package/dist/core/runner/tool-disclosure.d.ts

@@ -2,6 +2,7 @@ import { type TSchema } from "typebox";
 import type { AgentMessage, AgentTool, AgentToolResult, AgentToolUpdateCallback, ToolExecutionMode } from "../../internal/harness-types.js";
 import type { Model } from "../../internal/llm.js";
 import type { ToolSpec } from "../types.js";
+import type { ToolFingerprintInput } from "../cache-break-detector.js";
 export declare const TOOL_SEARCH_NAME = "ToolSearch";
 export declare const TOOL_SEARCH_DEFAULT_MAX_RESULTS = 5;
 export interface DeferredToolInfo {
@@ -14,11 +15,7 @@ export declare function safeName(name: string): string;
 export declare function classifyDeferred(opts: {
     specs: ReadonlyArray<ToolSpec>;
     mcpToolNames: ReadonlyArray<string>;
-    fullTools: ReadonlyArray<{
-        name: string;
-        description: string;
-        parameters: unknown;
-    }>;
+    fullTools: ReadonlyArray<ToolFingerprintInput>;
     deferMode?: "auto";
     model: Model;
     deferNames?: ReadonlyArray<string>;