@sema-agent/core 5.9.0 → 5.11.0

package/dist/core/runner/prepare-task.js

@@ -57,7 +57,7 @@ import { hasBackgroundShell, sweepBackgroundShells } from "../background-shell.j
 import { createTaskOutputTool, createTaskStopTool, defaultTaskRegistry } from "../task-registry.js";
 import { createMonitorTool } from "../../tools/monitor.js";
 import { createWorktreeTools } from "../../tools/worktree.js";
-import { applyCompactionToReadFileState, bashReversibilityProbe, createHandsToolkit, isReadDedupStubResult, seedReadFileStateFromContext, HAND_TOOL_EFFECTS, pdfModelCapabilitiesOf } from "../../tools/fs/index.js";
+import { applyCompactionToReadFileState, bashReversibilityProbe, createHandsToolkit, isReadDedupStubResult, seedReadFileStateFromContext, seedReadFileStateFromTranscript, HAND_TOOL_EFFECTS, pdfModelCapabilitiesOf } from "../../tools/fs/index.js";
 import { decodeTextBytes } from "../../tools/fs/encoding.js";
 import { ASK_USER_QUESTION_TOOL_NAME, createAskUserQuestionTool } from "../ask-question.js";
 import { createSchedulerTools } from "../../tools/scheduler-tools.js";
@@ -67,6 +67,7 @@ import { createRunWorkflowTool, RUN_WORKFLOW_TOOL_NAME } from "../../orchestrati
 import { resolveWorkflowSizeGuideline } from "../../orchestration/workflow-size-guideline.js";
 import { createLspTool, gitCheckIgnoreFilter, resolveLspPath } from "../lsp.js";
 import { resolveKey } from "../../tools/fs/safety.js";
+import { wholeFileRecordsFromTranscript } from "./session-file-state-replay.js";
 import { BINDING_CHECKPOINT_VERSION, mintCheckpointToken, RESOURCE_CHECKPOINT_VERSION, TOKEN_CHECKPOINT_VERSION, buildRiskDescriptor, debitLedger, remainingBudgetMicroUsd, } from "../checkpoint-store.js";
 import { boundInputHashOf } from "../canonical-json.js";
 import { GLOBAL_USAGE_KEY, resolveUsageWindows, usageRetryAfterMs } from "../usage-window-store.js";
@@ -171,6 +172,11 @@ export const DEFAULT_IRREVERSIBLE_SCOPE = "irreversible";
 export function checkpointScopeOf(spec) {
     return spec.durableApproval?.scope || spec.principal || DEFAULT_IRREVERSIBLE_SCOPE;
 }
+export function resolveCheckpointStore(spec, deps) {
+    if (spec.checkpointStore === null)
+        return undefined;
+    return spec.checkpointStore ?? deps.checkpointStore;
+}
 export function isFableFamilyModelId(id) {
     const tail = id.toLowerCase().split("/").pop() ?? "";
     return /^claude-fable-\d/.test(tail) || /^claude-mythos-5(?!\d)/.test(tail);
@@ -313,12 +319,38 @@ export async function prepareTask(spec, deps, sessions, resume, internals, runne
             throw e;
         }
     }
+    if (spec.toolMaterializeStrategy !== undefined && spec.toolMaterializeStrategy !== "swap" && spec.toolMaterializeStrategy !== "static") {
+        const e = new Error(`toolMaterializeStrategy must be "swap" or "static" (got ${JSON.stringify(spec.toolMaterializeStrategy)}).`);
+        e.code = "config.tool_materialize_invalid";
+        throw e;
+    }
+    if (spec.toolMaterializeStrategy === "static" && spec.deferSelfResolve === false) {
+        const e = new Error(`toolMaterializeStrategy "static" cannot be combined with deferSelfResolve: false — with the direct-call ` +
+            `lane disabled a placeholder is never swapped and never self-resolves, so no deferred tool could ever be ` +
+            `called. Use "swap", or leave deferSelfResolve on.`);
+        e.code = "config.tool_materialize_unreachable";
+        throw e;
+    }
     if (resume === undefined && spec.objective.trim().length === 0) {
         const e = new Error("TaskSpec.objective is empty — a task needs an instruction (an empty user message is rejected by strict model endpoints and would fail every later request of the session).");
         e.code = "config.empty_objective";
         throw e;
     }
     resolveTaskLimits(spec.limits);
+    if (spec.resourceSuspend !== undefined) {
+        const rsus = spec.resourceSuspend;
+        if (typeof rsus.scope !== "string" || rsus.scope === "") {
+            throw limitConfigError("config.limit_invalid", `TaskSpec.resourceSuspend.scope must be a non-empty string (got ${String(rsus.scope)}) — it is the multi-tenant isolation key every resource checkpoint is filed under.`);
+        }
+        for (const key of ["totalBudgetUsd", "totalTokens", "maxSlices", "ttlMs"]) {
+            const value = rsus[key];
+            if (value === undefined)
+                continue;
+            if (typeof value !== "number" || !Number.isFinite(value) || value < 0) {
+                throw limitConfigError("config.limit_invalid", `TaskSpec.resourceSuspend.${key} must be a finite, non-negative number (got ${String(value)}) — an unevaluable allocation is not an allocation, and a NaN here blinds even the validated per-slice window.`);
+            }
+        }
+    }
     const usageWindows = resolveUsageWindows(deps.usageWindows);
     const brainCallGuardrailRef = {};
     const brainCallGuardrailMs = resolveBrainCallGuardrailMs(spec.limits?.brainCallGuardrailMs ?? deps.brainCallGuardrailMs);
@@ -411,6 +443,7 @@ export async function prepareTask(spec, deps, sessions, resume, internals, runne
     let acquired;
     let session;
     let conflictRef;
+    let wakeRecovered = [];
     let resumeAtBeforeParentId = null;
     for (let attempt = 0;; attempt++) {
         try {
@@ -487,7 +520,7 @@ export async function prepareTask(spec, deps, sessions, resume, internals, runne
                 }
                 await session.getStorage().setLeafId(spec.resumeAtMode === "before" ? entry.parentId : spec.resumeAt);
             }
-            await reconcileInterruptedSession(session, toolEffects, resume?.suspendedBatch);
+            wakeRecovered = (await reconcileInterruptedSession(session, toolEffects, resume?.suspendedBatch)).recovered;
             break;
         }
         catch (err) {
@@ -910,6 +943,7 @@ export async function prepareTask(spec, deps, sessions, resume, internals, runne
         const effectiveShellGate = inheritedShellGate !== undefined && shellGateRank[inheritedShellGate] > shellGateRank[specShellGate] ? inheritedShellGate : specShellGate;
         const ownSessionRulesRef = {};
         const frozenOnAsk = spec.onAsk ?? deps.onAsk;
+        const frozenOnQuestion = spec.onQuestion ?? deps.onQuestion;
         const inheritedGateForChildren = () => {
             const ancestorRules = [
                 ...(inheritedAncestorRules ?? []),
@@ -945,6 +979,9 @@ export async function prepareTask(spec, deps, sessions, resume, internals, runne
             thinkingLevel: harnessRef.current?.getThinkingLevel(),
             principal: spec.principal,
             ...(frozenOnAsk !== undefined ? { onAsk: frozenOnAsk } : {}),
+            ...(frozenOnQuestion !== undefined ? { onQuestion: frozenOnQuestion } : {}),
+            ...(spec.handsReadOnly === true ? { handsReadOnly: true } : {}),
+            ...(spec.interactiveTools === false ? { interactiveTools: false } : {}),
             oneShot: spec.oneShot,
             clientContext: spec.clientContext,
             excludeTools: toolFaceSnapshot.exclude,
@@ -952,6 +989,7 @@ export async function prepareTask(spec, deps, sessions, resume, internals, runne
             alwaysLoadTools: toolFaceSnapshot.alwaysLoad,
             promptProfile,
             ...(spec.additionalDirectories !== undefined ? { additionalDirectories: Object.freeze([...spec.additionalDirectories]) } : {}),
+            ...(spec.additionalReadDirectories !== undefined ? { additionalReadDirectories: Object.freeze([...spec.additionalReadDirectories]) } : {}),
             ...(spec.envFacts !== undefined ? { envFacts: { ...spec.envFacts } } : {}),
             getApiKeyAndHeaders: spec.getApiKeyAndHeaders,
             parentCwd: taskRootPath,
@@ -961,6 +999,7 @@ export async function prepareTask(spec, deps, sessions, resume, internals, runne
             inheritedGateForChildren,
             ...(autoModeDecider ? { autoModeReview: { decider: autoModeDecider } } : {}),
             ...(spec.durableApproval !== undefined ? { durableApprovalForChildren: { ...spec.durableApproval } } : {}),
+            ...(spec.checkpointStore === null ? { checkpointStoreDisabledForChildren: true } : {}),
             taskId: hostTaskId,
             ...(internals?.parentTaskId !== undefined ? { parentTaskId: internals.parentTaskId } : {}),
             ...(internals?.parentSessionId !== undefined ? { parentSessionId: internals.parentSessionId } : {}),
@@ -1014,7 +1053,7 @@ export async function prepareTask(spec, deps, sessions, resume, internals, runne
             tools.push(createReportFindingsTool());
         }
         if (spec.enablePlanMode === true && spec.interactiveTools !== false) {
-            const planReviewFace = (spec.checkpointStore ?? deps.checkpointStore) !== undefined;
+            const planReviewFace = resolveCheckpointStore(spec, deps) !== undefined;
             if (spec.interactiveTools === true || planReviewFace) {
                 tools.push(defineTool(createPresentPlanTool(requestReview)));
                 if (planReviewFace) {
@@ -1125,6 +1164,8 @@ export async function prepareTask(spec, deps, sessions, resume, internals, runne
             gates: resume?.priorHumanReview?.gates ? [...resume.priorHumanReview.gates] : [],
         };
         const priorSuspendCount = resume?.priorSuspendCount ?? 0;
+        const suspendProgressRef = { executedApproved: false };
+        const suspendChainBase = () => (suspendProgressRef.executedApproved ? 0 : priorSuspendCount);
         const maxSuspends = spec.maxSuspends ?? deps.maxSuspends ?? DEFAULT_MAX_SUSPENDS;
         const maxSlices = spec.resourceSuspend?.maxSlices;
         const priorLedger = resume?.priorLedger;
@@ -1308,34 +1349,40 @@ export async function prepareTask(spec, deps, sessions, resume, internals, runne
         const callIssuedAtRef = {};
         const memoryWriteGateRef = {};
         const additionalRootsCanonical = [];
+        const additionalReadRootsCanonical = [];
         let attachmentRootCanonical;
         if (handsEnabled) {
             const rootRaw = taskRootPath;
             const canon = await executionEnv.canonicalPath(rootRaw);
             const rootCanonical = canon.ok ? canon.value : rootRaw;
             attachmentRootCanonical = rootCanonical;
-            for (const dir of spec.additionalDirectories ?? []) {
-                if (!dir || !dir.trim())
-                    continue;
-                const c = await executionEnv.canonicalPath(dir);
-                if (c.ok) {
-                    additionalRootsCanonical.push(c.value);
-                }
-                else {
-                    deps.onError?.(new Error(`additionalDirectories entry skipped (cannot canonicalize): ${dir}`), {
-                        phase: "config",
-                        sessionId,
-                    });
-                    emitTrace(deps.tracer, () => ({
-                        kind: "config.additional_directory_skipped",
-                        version: 1,
-                        taskId: hostTaskId,
-                        entry: dir,
-                        reason: `${c.error.code}: ${c.error.message}`,
-                        ts: Date.now(),
-                    }));
+            const canonicalizeExtraDirs = async (dirs, field, sink) => {
+                for (const dir of dirs ?? []) {
+                    if (!dir || !dir.trim())
+                        continue;
+                    const c = await executionEnv.canonicalPath(dir);
+                    if (c.ok) {
+                        sink.push(c.value);
+                    }
+                    else {
+                        deps.onError?.(new Error(`${field} entry skipped (cannot canonicalize): ${dir}`), {
+                            phase: "config",
+                            sessionId,
+                        });
+                        emitTrace(deps.tracer, () => ({
+                            kind: "config.additional_directory_skipped",
+                            version: 1,
+                            taskId: hostTaskId,
+                            entry: dir,
+                            ...(field !== "additionalDirectories" ? { field } : {}),
+                            reason: `${c.error.code}: ${c.error.message}`,
+                            ts: Date.now(),
+                        }));
+                    }
                 }
-            }
+            };
+            await canonicalizeExtraDirs(spec.additionalDirectories, "additionalDirectories", additionalRootsCanonical);
+            await canonicalizeExtraDirs(spec.additionalReadDirectories, "additionalReadDirectories", additionalReadRootsCanonical);
             if (spec.envFacts?.scratchpadDir) {
                 let c = await executionEnv.canonicalPath(spec.envFacts.scratchpadDir);
                 if (!c.ok && c.error.code === "not_found") {
@@ -1352,6 +1399,14 @@ export async function prepareTask(spec, deps, sessions, resume, internals, runne
             }
             const readFileState = new Map((resume?.seed.readFileState ?? []).map(([k, v]) => [rebaseRestoredPath(k), v]));
             readFileStateForCheckpoint = readFileState;
+            if (resume === undefined && spec.sessionId !== undefined) {
+                const prior = await session.buildContext().catch(() => undefined);
+                for (const rec of wholeFileRecordsFromTranscript(prior?.messages ?? [])) {
+                    const rk = await resolveKey(executionEnv, rootCanonical, rec.path, undefined, undefined, additionalRootsCanonical);
+                    if (rk.ok)
+                        seedReadFileStateFromTranscript(readFileState, rk.key, rec.content, rec.at);
+                }
+            }
             seedContextFiles = async (files) => {
                 for (const f of files) {
                     const rk = await resolveKey(executionEnv, rootCanonical, f.path, undefined, undefined, additionalRootsCanonical);
@@ -1378,6 +1433,7 @@ export async function prepareTask(spec, deps, sessions, resume, internals, runne
             }
             const band = createHandsToolkit(executionEnv, readFileState, rootCanonical, {
                 ...(additionalRootsCanonical.length > 0 ? { additionalRoots: additionalRootsCanonical } : {}),
+                ...(additionalReadRootsCanonical.length > 0 ? { additionalReadRoots: additionalReadRootsCanonical } : {}),
                 includeShell: handsIncludeShell,
                 readOnly: handsReadOnly,
                 ...(handsCwdRef ? { cwdRef: handsCwdRef } : {}),
@@ -1419,7 +1475,7 @@ export async function prepareTask(spec, deps, sessions, resume, internals, runne
                 irreversibilityTier.set("Bash", shellGate === "always" ? "always" : "maybe");
                 irreversibleTools.add("Bash");
                 const shellReadBoundary = () => ({
-                    roots: [rootCanonical, ...additionalRootsCanonical],
+                    roots: [rootCanonical, ...additionalRootsCanonical, ...additionalReadRootsCanonical],
                     ...(handsCwdRef?.current !== undefined ? { cwd: handsCwdRef.current } : {}),
                 });
                 if (shellGate === "classify")
@@ -1533,8 +1589,8 @@ export async function prepareTask(spec, deps, sessions, resume, internals, runne
         }
         if (offloadStore)
             tools.push(createReadToolResultTool(offloadStore));
-        const onQuestion = spec.onQuestion ?? deps.onQuestion;
-        const durableQuestionFace = (spec.checkpointStore ?? deps.checkpointStore) !== undefined &&
+        const onQuestion = frozenOnQuestion;
+        const durableQuestionFace = resolveCheckpointStore(spec, deps) !== undefined &&
             (spec.durableApproval !== undefined || runtimeCaps?.forceDurableGate === true);
         if (spec.interactiveTools === true || (spec.interactiveTools !== false && (onQuestion !== undefined || durableQuestionFace)))
             tools.push(createAskUserQuestionTool(onQuestion, { principal: spec.principal, sourceTaskId: sessionId }));
@@ -1743,6 +1799,9 @@ export async function prepareTask(spec, deps, sessions, resume, internals, runne
             if (additionalRootsCanonical.length > 0) {
                 envFacts.additionalDirectories = [...additionalRootsCanonical];
             }
+            if (additionalReadRootsCanonical.length > 0) {
+                envFacts.additionalReadDirectories = [...additionalReadRootsCanonical];
+            }
             try {
                 const probe = await executionEnv.exec('uname -s; uname -r; (git rev-parse --is-inside-work-tree 2>/dev/null || echo false); (git symbolic-ref --short -q HEAD 2>/dev/null || echo "HEAD (detached)"); (git rev-parse --show-toplevel 2>/dev/null || echo); (test -n "$(git status --porcelain 2>/dev/null | head -1)" && echo dirty || echo clean); (s=$(ps -p $$ -o comm= 2>/dev/null); s=${s##*/}; echo "${s#-}"); (test "$(git rev-parse --git-dir 2>/dev/null)" != "$(git rev-parse --git-common-dir 2>/dev/null)" && echo linked || echo main); (pwd -P 2>/dev/null || pwd)', { cwd: envFacts.cwd, timeout: 10 });
                 if (probe.ok && probe.value.exitCode === 0) {
@@ -1987,6 +2046,7 @@ export async function prepareTask(spec, deps, sessions, resume, internals, runne
             .filter((s) => s.status === "failed")
             .map((s) => ({ name: inlineUntrusted(s.name, 160), ...(s.error !== undefined ? { error: inlineUntrusted(s.error, 240) } : {}) }));
         let toolsDeltaRef;
+        let toolMaterializeStatic = false;
         if (deferred.size > 0 || failedMcpServers.length > 0) {
             toolsDeltaRef = { pending: [], pendingRemoved: [], pendingReadded: [], pendingFailed: failedMcpServers };
         }
@@ -2063,8 +2123,16 @@ export async function prepareTask(spec, deps, sessions, resume, internals, runne
             };
             offloadReachableToolsRef.current = callableToolNames;
             let toolSearch;
+            const envStrategy = process.env.SEMA_TOOL_MATERIALIZE_STRATEGY;
+            if (envStrategy !== undefined && envStrategy !== "swap" && envStrategy !== "static") {
+                const e = new Error(`SEMA_TOOL_MATERIALIZE_STRATEGY must be "swap" or "static" (got ${JSON.stringify(envStrategy)}).`);
+                e.code = "config.tool_materialize_invalid";
+                throw e;
+            }
+            const materializeStatic = (spec.toolMaterializeStrategy ?? envStrategy ?? "static") === "static" && spec.deferSelfResolve !== false;
+            toolMaterializeStatic = materializeStatic;
             const buildToolList = (active) => {
-                const list = tools.map((t) => (deferred.has(t.name) && !active.has(t.name) ? placeholders.get(t.name) : t));
+                const list = tools.map((t) => (deferred.has(t.name) && (materializeStatic || !active.has(t.name)) ? placeholders.get(t.name) : t));
                 list.push(toolSearch);
                 return list;
             };
@@ -2105,6 +2173,9 @@ export async function prepareTask(spec, deps, sessions, resume, internals, runne
                 listingRide: (newly) => listingRideRef.current?.(newly),
                 mountedNames: callableToolNames,
                 directCallEnabled: spec.deferSelfResolve !== false,
+                ...(materializeStatic
+                    ? { staticSchemaFor: (name) => tools.find((t) => t.name === name)?.parameters }
+                    : {}),
                 serializeActivation,
             });
             harnessTools = buildToolList(activeTools);
@@ -2462,7 +2533,7 @@ export async function prepareTask(spec, deps, sessions, resume, internals, runne
                     if (creq.toolName === ASK_USER_QUESTION_TOOL_NAME)
                         return first;
                     if (pc.durableMandate === true) {
-                        if ((spec.checkpointStore ?? deps.checkpointStore) !== undefined &&
+                        if (resolveCheckpointStore(spec, deps) !== undefined &&
                             (spec.durableApproval !== undefined || runtimeCaps?.forceDurableGate === true) &&
                             markInheritedUnavailable(creq.toolCallId)) {
                             return first;
@@ -2518,7 +2589,7 @@ export async function prepareTask(spec, deps, sessions, resume, internals, runne
                     if (creq.toolName === ASK_USER_QUESTION_TOOL_NAME)
                         return decision;
                     if (pc.durableMandate === true) {
-                        if ((spec.checkpointStore ?? deps.checkpointStore) !== undefined &&
+                        if (resolveCheckpointStore(spec, deps) !== undefined &&
                             (spec.durableApproval !== undefined || runtimeCaps?.forceDurableGate === true) &&
                             markInheritedUnavailable(creq.toolCallId)) {
                             return decision;
@@ -2678,13 +2749,13 @@ export async function prepareTask(spec, deps, sessions, resume, internals, runne
         const blockedTracked = Boolean(hooks?.postToolUse || hooks?.preToolUse || hooks?.postToolUseFailure || hooks?.postToolBatch);
         const restoreSurfaceGap = ownedEnv !== undefined && isRemoteExecutionEnv(ownedEnv) && ownedEnv.capabilities.suspendable ? missingRestoreSurface(ownedEnv) : [];
         const incompleteSuspendAdapter = restoreSurfaceGap.length > 0 ? restoreSurfaceGap : undefined;
-        const durableSuspendInfraReady = (spec.checkpointStore ?? deps.checkpointStore) !== undefined &&
+        const durableSuspendInfraReady = resolveCheckpointStore(spec, deps) !== undefined &&
             !(offloadStore !== undefined && isVolatileOffloadStore(offloadStore)) &&
             (ownedEnv === undefined || isRemoteExecutionEnv(ownedEnv)) &&
             incompleteSuspendAdapter === undefined;
         const resourceSuspendEligible = spec.resourceSuspend !== undefined && durableSuspendInfraReady;
         if (spec.resourceSuspend !== undefined && !resourceSuspendEligible) {
-            const why = (spec.checkpointStore ?? deps.checkpointStore) === undefined
+            const why = resolveCheckpointStore(spec, deps) === undefined
                 ? "no CheckpointStore is wired"
                 : offloadStore !== undefined && isVolatileOffloadStore(offloadStore)
                     ? "tool-result offload uses the in-memory store (a resume needs durable results)"
@@ -2842,7 +2913,7 @@ export async function prepareTask(spec, deps, sessions, resume, internals, runne
                 catch {
                 }
             };
-            const checkpointStore = spec.checkpointStore ?? deps.checkpointStore;
+            const checkpointStore = resolveCheckpointStore(spec, deps);
             const durableApproval = spec.durableApproval ??
                 (runtimeCaps?.forceDurableGate ? { scope: spec.principal || DEFAULT_IRREVERSIBLE_SCOPE } : undefined);
             const inFlightSpendMicroUsd = () => {
@@ -3049,7 +3120,7 @@ export async function prepareTask(spec, deps, sessions, resume, internals, runne
                         }
                         return false;
                     }
-                    if (suspendLoopCapHit(priorSuspendCount, maxSuspends, " for a plan_review (likely a resume/restart loop)."))
+                    if (suspendLoopCapHit(suspendChainBase(), maxSuspends, " for a plan_review (likely a resume/restart loop)."))
                         return false;
                     const leafId = await session.getLeafId();
                     if (!leafId) {
@@ -3097,7 +3168,7 @@ export async function prepareTask(spec, deps, sessions, resume, internals, runne
                         createdAt: mintedAt,
                         suspendedAt: now(),
                         deadline: mintedAt + (sanitizedTtlMs(spec.durableApproval?.ttlMs) ?? DEFAULT_RESOURCE_TTL_MS),
-                        suspendCount: priorSuspendCount + 1,
+                        suspendCount: suspendChainBase() + 1,
                         humanReview: humanReviewRef.count > 0
                             ? { count: humanReviewRef.count, totalWaitMs: humanReviewRef.totalWaitMs, gates: [...humanReviewRef.gates] }
                             : undefined,
@@ -3158,7 +3229,7 @@ export async function prepareTask(spec, deps, sessions, resume, internals, runne
                         if (abortController.signal.aborted) {
                             return undefined;
                         }
-                        if (suspendLoopCapHit(priorSuspendCount, maxSuspends, ` for tool "${req.toolName}" — likely a resume/restart loop.`))
+                        if (suspendLoopCapHit(suspendChainBase(), maxSuspends, ` for tool "${req.toolName}" — likely a resume/restart loop.`))
                             return undefined;
                         if (remoteEnv !== undefined) {
                             if (hasBackgroundShell(remoteEnv))
@@ -3181,6 +3252,7 @@ export async function prepareTask(spec, deps, sessions, resume, internals, runne
                             args: postHookArgs,
                             safety,
                             shellGated: (req.toolName === "Bash" && shellGatedBash) || (req.toolName === "Monitor" && shellGatedMonitor),
+                            ...(effectiveShellGate !== "off" ? { shellGateDoctrine: effectiveShellGate } : {}),
                         });
                         gate =
                             safety !== undefined
@@ -3241,7 +3313,7 @@ export async function prepareTask(spec, deps, sessions, resume, internals, runne
                             humanReview: humanReviewRef.count > 0
                                 ? { count: humanReviewRef.count, totalWaitMs: humanReviewRef.totalWaitMs, gates: [...humanReviewRef.gates] }
                                 : undefined,
-                            suspendCount: priorSuspendCount + 1,
+                            suspendCount: suspendChainBase() + 1,
                             resourceLedger: approvalLedger,
                             sourceTaskId: sessionId,
                             ...(spec.principal ? { principal: spec.principal } : {}),
@@ -3602,7 +3674,7 @@ export async function prepareTask(spec, deps, sessions, resume, internals, runne
             : undefined;
         overheadState.promptChars = systemPrompt.length;
         const preparedHolder = {};
-        const buildPrepared = () => ({ harness, session, sessionId, taskRootPath, model, thinking, compModel, mcp: mcp, ...(a2a !== undefined && a2a.tools.length > 0 ? { a2a } : {}), blockedRef, outputRef, abortController, conflictRef, blockedToolCalls, nestedStats, ...(rewindNotes.length > 0 ? { rewindNotes } : {}), cwdRef: handsCwdRef, ...(worktreeSessionRef !== undefined ? { worktreeSessionRef } : {}), ...(workspaceStateSettle !== undefined ? { workspaceStateSettle } : {}), denyNarrowingPolicy, ...(basePolicyForResumeEdit !== undefined ? { basePolicyForResumeEdit } : {}), releaseSignal, cacheBreakDetector, cacheFingerprint, promptManifest, epochDeclaredSections, activeTools, ...(deferred.size > 0 ? { deferredToolNames: deferred } : {}), ownedEnv, suspendRef, reviewRef, remoteEnvFailures, reviewRequestRef, suspendLoopRef, suspendForResource, ...(suspendForPlatformLimit !== undefined ? { suspendForPlatformLimit } : {}), ...(envLifetimeSuspendAt !== undefined ? { envLifetimeSuspendAt } : {}), ...(usageGovernance !== undefined ? { usageGovernance } : {}), callIssuedAtRef, brainCallGuardrailRef, suspendForReview, resourceLedger: priorLedger, liveSpendRef, humanReviewRef, now, tools, toolEffects, promptOverheadTokens, readTaskFile, recentlyReadFiles, normalizeAttachmentPath, isDedupStubResult, ...(onCompactionApplied ? { onCompactionApplied } : {}), compactionReuseRef, trimPressureRef, ...(memoryEngineSession ? { memoryEngineSession } : {}), ...(subagentRetain ? { subagentRetain } : {}), ...(lspDiagnostics && nudgeLspOnEdit ? { lspDiagnostics: { registry: lspDiagnostics, nudge: nudgeLspOnEdit, runIdent: lspRunIdent } } : {}), planModeRef, ...(dateChange ? { dateChange } : {}), ...(instructionSources ? { instructionSources } : {}), ...(workflowSizeGuideline ? { workflowSizeGuideline } : {}), ...(detectExternalChanges ? { detectExternalChanges } : {}), ...(toolsDeltaRef ? { toolsDeltaRef } : {}), ...(agentListing ? { agentListing } : {}), ...(skillsListing ? { skillsListing } : {}), announcedListingsRef, listBackgroundTasks, ...(turnSnapshotRef.current !== undefined ? { turnSnapshot: turnSnapshotRef.current } : {}), ...(centerCompactionCandidate !== undefined ? { centerCompactionCandidate } : {}) });
+        const buildPrepared = () => ({ harness, session, sessionId, taskRootPath, model, thinking, compModel, mcp: mcp, ...(a2a !== undefined && a2a.tools.length > 0 ? { a2a } : {}), blockedRef, outputRef, abortController, conflictRef, blockedToolCalls, nestedStats, ...(rewindNotes.length > 0 ? { rewindNotes } : {}), cwdRef: handsCwdRef, ...(worktreeSessionRef !== undefined ? { worktreeSessionRef } : {}), ...(workspaceStateSettle !== undefined ? { workspaceStateSettle } : {}), denyNarrowingPolicy, ...(basePolicyForResumeEdit !== undefined ? { basePolicyForResumeEdit } : {}), releaseSignal, cacheBreakDetector, cacheFingerprint, promptManifest, epochDeclaredSections, activeTools, ...(deferred.size > 0 ? { deferredToolNames: deferred } : {}), toolMaterializeStatic, ownedEnv, suspendRef, suspendProgressRef, reviewRef, remoteEnvFailures, reviewRequestRef, suspendLoopRef, suspendForResource, ...(suspendForPlatformLimit !== undefined ? { suspendForPlatformLimit } : {}), ...(envLifetimeSuspendAt !== undefined ? { envLifetimeSuspendAt } : {}), ...(usageGovernance !== undefined ? { usageGovernance } : {}), callIssuedAtRef, brainCallGuardrailRef, suspendForReview, resourceLedger: priorLedger, liveSpendRef, humanReviewRef, now, tools, toolEffects, wakeRecovered, promptOverheadTokens, readTaskFile, recentlyReadFiles, normalizeAttachmentPath, isDedupStubResult, ...(onCompactionApplied ? { onCompactionApplied } : {}), compactionReuseRef, trimPressureRef, ...(memoryEngineSession ? { memoryEngineSession } : {}), ...(subagentRetain ? { subagentRetain } : {}), ...(lspDiagnostics && nudgeLspOnEdit ? { lspDiagnostics: { registry: lspDiagnostics, nudge: nudgeLspOnEdit, runIdent: lspRunIdent } } : {}), planModeRef, ...(dateChange ? { dateChange } : {}), ...(instructionSources ? { instructionSources } : {}), ...(workflowSizeGuideline ? { workflowSizeGuideline } : {}), ...(detectExternalChanges ? { detectExternalChanges } : {}), ...(toolsDeltaRef ? { toolsDeltaRef } : {}), ...(agentListing ? { agentListing } : {}), ...(skillsListing ? { skillsListing } : {}), announcedListingsRef, listBackgroundTasks, ...(turnSnapshotRef.current !== undefined ? { turnSnapshot: turnSnapshotRef.current } : {}), ...(centerCompactionCandidate !== undefined ? { centerCompactionCandidate } : {}) });
         const prepared = buildPrepared();
         preparedHolder.current = prepared;
         return prepared;

package/dist/core/runner/runtask.d.ts

@@ -4,6 +4,7 @@ import type { RunInternals } from "./prepare-task.js";
 import { type TaskOutcome } from "../task-outcome.js";
 import { type SideQuerySpec, type SideQueryResult } from "../side-query.js";
 import type { SessionStore } from "../session.js";
+import { type RecoveredOrphan } from "../session-reconcile.js";
 import type { AgentDefinition, RunnerDeps, TaskEvent, TaskResult, TaskSpec, TaskStream } from "../types.js";
 export type ResumeTaskConfig = Omit<TaskSpec, "objective" | "sessionId">;
 interface ResumeRun {
@@ -19,6 +20,17 @@ interface ResumeRun {
     onEnvRestoreFailed?: (reason: ReopenReason) => Promise<void>;
     decisionDelivered?: boolean;
 }
+declare function toolEndBodyFrom(result: unknown, isError: boolean): {
+    output?: unknown;
+    truncated?: boolean;
+    totalChars?: number;
+    structured?: unknown;
+    errorCode?: string;
+};
+export declare function reconciledToolEndBody(orphan: Pick<RecoveredOrphan, "text" | "errorKind">): ReturnType<typeof toolEndBodyFrom>;
+export declare const GOVERNANCE_READ_STALLED: unique symbol;
+export declare function awaitChargeWithSlowDisclosure<T>(charge: Promise<T>, onSlow: () => void, discloseAfterMs?: number): Promise<T>;
+export declare function raceUntilDeadline<T>(p: Promise<T>, deadline: number): Promise<T | typeof GOVERNANCE_READ_STALLED>;
 export declare class Runner {
     private deps;
     readonly sessions: SessionStore;