@sema-agent/core 5.7.0 → 5.9.0

package/dist/core/auto-compaction.js

@@ -22,13 +22,7 @@ const WORKING_FILE_BREAKOUT_TAGS = ["working-file", "summary"];
 function escapeWorkingFilePathAttr(path) {
     return path.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/[\r\n]+/g, " ");
 }
-export const COMPACTION_THROUGHPUT_PRIOR_TOKENS_PER_MS = 3;
-const COMPACTION_THROUGHPUT_EWMA_ALPHA = 0.3;
-const COMPACTION_WALLTIME_ABORT_FLAG = "semaCompactionWalltimeAbort";
 const COMPACTION_MANUAL_CANCEL_FLAG = "semaCompactionManualCancel";
-export function isCompactionWalltimeAbort(err) {
-    return (typeof err === "object" && err !== null && err[COMPACTION_WALLTIME_ABORT_FLAG] === true);
-}
 export function isCompactionManualCancel(err) {
     return (typeof err === "object" && err !== null && err[COMPACTION_MANUAL_CANCEL_FLAG] === true);
 }
@@ -180,7 +174,7 @@ export async function maybeCompact(opts) {
         const wantsWindowSafety = opts.compactionModel !== undefined &&
             summarizationCharsCapacity(opts.compactionModel) < summarizationCharsCapacity(opts.model);
         let dry;
-        if (wantsWindowSafety || opts.walltime !== undefined) {
+        if (wantsWindowSafety) {
             dry = dryRunSummarizationClamp(prep.value, summaryModel, effectiveInstructions);
         }
         const contentTokens = dry !== undefined ? Math.ceil((dry.conversationChars + (prep.value.previousSummary?.length ?? 0)) / cpt) : 0;
@@ -201,13 +195,6 @@ export async function maybeCompact(opts) {
                         gate = "budget";
                     }
                 }
-                if (gate === undefined && opts.walltime !== undefined) {
-                    const remainingMs = opts.walltime.deadlineMs - opts.walltime.cushionMs() - Date.now();
-                    const throughput = opts.walltime.throughputRef.ewmaTokensPerMs ?? COMPACTION_THROUGHPUT_PRIOR_TOKENS_PER_MS;
-                    if (remainingMs < contentTokens / Math.max(throughput, 1e-6)) {
-                        gate = "walltime";
-                    }
-                }
                 if (gate === undefined) {
                     summaryModel = opts.model;
                     modelFallback = true;
@@ -245,35 +232,7 @@ export async function maybeCompact(opts) {
             }
         }
         const auth = await opts.getApiKeyAndHeaders?.(summaryModel);
-        let summarySignal = opts.signal;
-        let softTimer;
-        let softAbort;
-        let onOuterAbort;
-        let firstAbortCause;
-        const latchCallerCause = () => {
-            firstAbortCause ??= opts.manualCancelSignal?.aborted === true ? "manual" : "caller";
-        };
-        if (opts.walltime !== undefined) {
-            softAbort = new AbortController();
-            onOuterAbort = () => {
-                latchCallerCause();
-                softAbort?.abort();
-            };
-            if (opts.signal?.aborted) {
-                latchCallerCause();
-                softAbort.abort();
-            }
-            else if (opts.signal) {
-                opts.signal.addEventListener("abort", onOuterAbort, { once: true });
-            }
-            const softMs = opts.walltime.deadlineMs - opts.walltime.cushionMs() - Date.now();
-            softTimer = setTimeout(() => {
-                firstAbortCause ??= "walltime";
-                softAbort?.abort();
-            }, Math.max(0, softMs));
-            softTimer.unref?.();
-            summarySignal = softAbort.signal;
-        }
+        const summarySignal = opts.signal;
         const runtime = brainToRuntime(opts.brain);
         let res;
         summaryStartAt = Date.now();
@@ -284,23 +243,9 @@ export async function maybeCompact(opts) {
         }
         finally {
             summaryEndAt = Date.now();
-            if (softTimer !== undefined)
-                clearTimeout(softTimer);
-            if (onOuterAbort !== undefined)
-                opts.signal?.removeEventListener("abort", onOuterAbort);
         }
         if (!res.ok) {
-            const walltimeWon = softAbort !== undefined &&
-                softAbort.signal.aborted &&
-                (firstAbortCause !== undefined ? firstAbortCause === "walltime" : opts.signal?.aborted !== true);
-            if (walltimeWon) {
-                if (typeof res.error !== "object" || res.error === null) {
-                    throw Object.assign(new Error(String(res.error)), { [COMPACTION_WALLTIME_ABORT_FLAG]: true });
-                }
-                res.error[COMPACTION_WALLTIME_ABORT_FLAG] = true;
-            }
-            if (!walltimeWon &&
-                opts.manualCancelSignal?.aborted === true &&
+            if (opts.manualCancelSignal?.aborted === true &&
                 res.error instanceof CompactionError &&
                 res.error.code === "aborted") {
                 res.error[COMPACTION_MANUAL_CANCEL_FLAG] = true;
@@ -315,15 +260,6 @@ export async function maybeCompact(opts) {
             throw new Error(`compaction produced an oversized summary (≈${Math.ceil(summary.length / cpt)} tokens vs ` +
                 `${res.value.tokensBefore} before compaction; history left untouched)`);
         }
-        if (opts.walltime !== undefined && contentTokens > 0) {
-            const passMs = Math.max(1, Date.now() - compactStartAt);
-            const sample = contentTokens / passMs;
-            const prev = opts.walltime.throughputRef.ewmaTokensPerMs;
-            opts.walltime.throughputRef.ewmaTokensPerMs =
-                prev === undefined
-                    ? sample
-                    : COMPACTION_THROUGHPUT_EWMA_ALPHA * sample + (1 - COMPACTION_THROUGHPUT_EWMA_ALPHA) * prev;
-        }
         firstKeptEntryId = res.value.firstKeptEntryId;
         summaryTokensBefore = res.value.tokensBefore;
         details = res.value.details;

package/dist/core/checkpoint-store.d.ts

@@ -10,7 +10,8 @@ export type CheckpointToken = string & {
     readonly __brand: "CheckpointToken";
 };
 export declare function mintCheckpointToken(): CheckpointToken;
-export type ResourceLimitReason = "budget" | "walltime" | "turns" | "preempt";
+export type ResourceLimitReason = "budget_tokens" | "budget_cost" | "walltime" | "turns" | "preempt" | "env_lifetime" | "usage_window";
+export type PlatformLimitReason = Extract<ResourceLimitReason, "env_lifetime" | "usage_window">;
 export interface SafetyAxis {
     egress?: boolean;
     irreversible?: boolean;
@@ -53,6 +54,7 @@ export type CheckpointGate = {
 } | {
     kind: "resource_limit";
     reason: ResourceLimitReason;
+    resumeAfterMs?: number;
 } | {
     kind: "needs_review";
     reason: string;
@@ -153,12 +155,12 @@ export type SerializedCheckpointState = {
 export declare const CURRENT_CHECKPOINT_VERSION = 1;
 export declare const RESOURCE_CHECKPOINT_VERSION = 2;
 export declare const BINDING_CHECKPOINT_VERSION = 3;
-export declare const WALLTIME_CHECKPOINT_VERSION = 4;
-export declare const MAX_SUPPORTED_CHECKPOINT_VERSION = 4;
+export declare const TOKEN_CHECKPOINT_VERSION = 5;
+export declare const MAX_SUPPORTED_CHECKPOINT_VERSION = 5;
 export declare function checkpointVersionOf(cp: Pick<Checkpoint, "version">): number;
 export interface ResourceLedger {
     totalBudgetMicroUsd?: number;
-    totalWalltimeSec?: number;
+    totalTokens?: number;
     spentMicroUsd: number;
     spentTokens: number;
     spentTurns: number;
@@ -172,12 +174,12 @@ export declare function debitLedger(prior: ResourceLedger | undefined, slice: {
     walltimeMs?: number;
 }, total?: {
     totalBudgetMicroUsd?: number;
-    totalWalltimeSec?: number;
+    totalTokens?: number;
 }, opts?: {
     countSlice?: boolean;
 }): ResourceLedger;
 export declare function remainingBudgetMicroUsd(ledger: ResourceLedger | undefined): number | undefined;
-export declare function remainingWalltimeMs(ledger: ResourceLedger | undefined): number | undefined;
+export declare function remainingTokens(ledger: ResourceLedger | undefined): number | undefined;
 export interface ResolvedOutcome {
     boundCallId: string;
     decision: "allow" | "deny" | "approve" | "reject" | "edit";
@@ -242,11 +244,11 @@ export interface CheckpointSummary {
 }
 export declare function summarizeCheckpoint(cp: Checkpoint): CheckpointSummary;
 export declare class CheckpointError extends Error {
-    readonly code: "checkpoint.already_exists" | "checkpoint.already_resolved" | "checkpoint.not_found" | "checkpoint.gate_mismatch" | "checkpoint.resume_aborted" | "checkpoint.invalid_outcome" | "checkpoint.unsupported_version" | "checkpoint.reopen_revote" | "checkpoint.reopened_concurrently" | "checkpoint.reopen_failed" | "steering.invalid_content" | "wake.gate_pending" | "wake.nothing_to_deliver" | "resume.parent_constraint_missing" | "resume.parent_constraint_mismatch";
+    readonly code: "checkpoint.already_exists" | "checkpoint.already_resolved" | "checkpoint.not_found" | "checkpoint.gate_mismatch" | "checkpoint.resume_aborted" | "checkpoint.invalid_outcome" | "checkpoint.unsupported_version" | "checkpoint.walltime_axis_retired" | "checkpoint.reopen_revote" | "checkpoint.reopened_concurrently" | "checkpoint.reopen_failed" | "steering.invalid_content" | "wake.gate_pending" | "wake.nothing_to_deliver" | "resume.parent_constraint_missing" | "resume.parent_constraint_mismatch";
     readonly detail?: {
         field?: "boundCallId" | "boundInputHash" | "answer";
     } | undefined;
-    constructor(code: "checkpoint.already_exists" | "checkpoint.already_resolved" | "checkpoint.not_found" | "checkpoint.gate_mismatch" | "checkpoint.resume_aborted" | "checkpoint.invalid_outcome" | "checkpoint.unsupported_version" | "checkpoint.reopen_revote" | "checkpoint.reopened_concurrently" | "checkpoint.reopen_failed" | "steering.invalid_content" | "wake.gate_pending" | "wake.nothing_to_deliver" | "resume.parent_constraint_missing" | "resume.parent_constraint_mismatch", message: string, detail?: {
+    constructor(code: "checkpoint.already_exists" | "checkpoint.already_resolved" | "checkpoint.not_found" | "checkpoint.gate_mismatch" | "checkpoint.resume_aborted" | "checkpoint.invalid_outcome" | "checkpoint.unsupported_version" | "checkpoint.walltime_axis_retired" | "checkpoint.reopen_revote" | "checkpoint.reopened_concurrently" | "checkpoint.reopen_failed" | "steering.invalid_content" | "wake.gate_pending" | "wake.nothing_to_deliver" | "resume.parent_constraint_missing" | "resume.parent_constraint_mismatch", message: string, detail?: {
         field?: "boundCallId" | "boundInputHash" | "answer";
     } | undefined);
 }

package/dist/core/checkpoint-store.js

@@ -126,8 +126,8 @@ export function buildRiskDescriptor(input) {
 export const CURRENT_CHECKPOINT_VERSION = 1;
 export const RESOURCE_CHECKPOINT_VERSION = 2;
 export const BINDING_CHECKPOINT_VERSION = 3;
-export const WALLTIME_CHECKPOINT_VERSION = 4;
-export const MAX_SUPPORTED_CHECKPOINT_VERSION = 4;
+export const TOKEN_CHECKPOINT_VERSION = 5;
+export const MAX_SUPPORTED_CHECKPOINT_VERSION = 5;
 export function checkpointVersionOf(cp) {
     return cp.version ?? 0;
 }
@@ -140,7 +140,7 @@ function finiteSpend(v) {
 export function debitLedger(prior, slice, total, opts) {
     return {
         totalBudgetMicroUsd: finiteBound(prior?.totalBudgetMicroUsd) ?? finiteBound(total?.totalBudgetMicroUsd),
-        totalWalltimeSec: finiteBound(prior?.totalWalltimeSec) ?? finiteBound(total?.totalWalltimeSec),
+        totalTokens: finiteBound(prior?.totalTokens) ?? finiteBound(total?.totalTokens),
         spentMicroUsd: (finiteSpend(prior?.spentMicroUsd) ?? 0) + Math.max(0, finiteSpend(slice.costMicroUsd) ?? 0),
         spentTokens: (finiteSpend(prior?.spentTokens) ?? 0) + Math.max(0, finiteSpend(slice.tokens) ?? 0),
         spentTurns: (finiteSpend(prior?.spentTurns) ?? 0) + Math.max(0, finiteSpend(slice.turns) ?? 0),
@@ -157,14 +157,14 @@ export function remainingBudgetMicroUsd(ledger) {
         return 0;
     return Math.max(0, total - (spent ?? 0));
 }
-export function remainingWalltimeMs(ledger) {
-    const total = ledger?.totalWalltimeSec;
+export function remainingTokens(ledger) {
+    const total = ledger?.totalTokens;
     if (total === undefined || !Number.isFinite(total))
         return undefined;
-    const spent = ledger?.spentWalltimeMs;
+    const spent = ledger?.spentTokens;
     if (spent !== undefined && !Number.isFinite(spent))
         return 0;
-    return Math.max(0, total * 1000 - (spent ?? 0));
+    return Math.max(0, total - (spent ?? 0));
 }
 export function summarizeCheckpoint(cp) {
     const riskDescriptor = cp.gate.kind === "human" || cp.gate.kind === "irreversible_ask" ? cp.gate.riskDescriptor : undefined;

package/dist/core/fs-write-gate-policy.js

@@ -1,9 +1,9 @@
 import { canonicalizeTarget, writeTargetPath } from "../tools/fs/safety.js";
-import { PATH_WRITE_TOOLS, isWithin } from "./runner/session-rule-policy.js";
+import { PATH_CONFINABLE_WRITE_TOOLS, isWithin } from "./runner/session-rule-policy.js";
 const ask = (message) => ({ action: "ask", message, decisionReason: "rule" });
 export function createFsWriteGatePolicy(opts) {
     const { env, rootPath, defaultWrite } = opts;
-    const gated = new Set([...PATH_WRITE_TOOLS, "NotebookEdit"]);
+    const gated = PATH_CONFINABLE_WRITE_TOOLS;
     const acceptDirs = opts.acceptDirs && opts.acceptDirs.length > 0 ? opts.acceptDirs : undefined;
     const exemptDirs = opts.exemptDirs && opts.exemptDirs.length > 0 ? opts.exemptDirs : undefined;
     return {

package/dist/core/lsp-diagnostics.d.ts

@@ -22,9 +22,10 @@ export declare class LspDiagnosticsRegistry {
     private readonly pending;
     private readonly delivered;
     publish(uri: string, diagnostics: LspDiagnostic[]): void;
-    fileEdited(uri: string): void;
+    fileEdited(runIdent: string, uri: string): void;
+    releaseRun(runIdent: string): void;
     isEmpty(): boolean;
-    drain(): LspFileDiagnostics[];
+    drain(runIdent: string): LspFileDiagnostics[];
 }
 export declare function formatDiagnosticsSummary(files: LspFileDiagnostics[]): string;
 export declare function formatDiagnosticsBlock(files: LspFileDiagnostics[]): string;

package/dist/core/lsp-diagnostics.js

@@ -16,30 +16,39 @@ function diagnosticKey(uri, d) {
 }
 export class LspDiagnosticsRegistry {
     pending = new Map();
-    delivered = new Set();
+    delivered = new Map();
     publish(uri, diagnostics) {
         if (diagnostics.length === 0)
             this.pending.delete(uri);
         else
             this.pending.set(uri, diagnostics);
     }
-    fileEdited(uri) {
+    fileEdited(runIdent, uri) {
+        const forRun = this.delivered.get(runIdent);
+        if (forRun === undefined)
+            return;
         const prefix = `${uri}|`;
-        for (const key of this.delivered) {
+        for (const key of forRun) {
             if (key.startsWith(prefix))
-                this.delivered.delete(key);
+                forRun.delete(key);
         }
+        if (forRun.size === 0)
+            this.delivered.delete(runIdent);
+    }
+    releaseRun(runIdent) {
+        this.delivered.delete(runIdent);
     }
     isEmpty() {
         return this.pending.size === 0;
     }
-    drain() {
+    drain(runIdent) {
         const out = [];
         const requeued = new Map();
+        let delivered = this.delivered.get(runIdent);
         let total = 0;
         for (const [uri, all] of this.pending) {
             const fresh = all
-                .filter((d) => !this.delivered.has(diagnosticKey(uri, d)))
+                .filter((d) => delivered?.has(diagnosticKey(uri, d)) !== true)
                 .sort((a, b) => (a.severity ?? 99) - (b.severity ?? 99));
             if (fresh.length === 0)
                 continue;
@@ -49,8 +58,12 @@ export class LspDiagnosticsRegistry {
                 requeued.set(uri, fresh.slice(take.length));
             if (take.length === 0)
                 continue;
+            if (delivered === undefined) {
+                delivered = new Set();
+                this.delivered.set(runIdent, delivered);
+            }
             for (const d of take)
-                this.delivered.add(diagnosticKey(uri, d));
+                delivered.add(diagnosticKey(uri, d));
             total += take.length;
             out.push({ uri, diagnostics: take });
         }

package/dist/core/memory-engine/file-backend.js

@@ -487,28 +487,31 @@ export class FileMemoryEngineBackend {
                 mtimeMs = statSync(lockDir).mtimeMs;
             }
             catch {
-                continue;
+                mtimeMs = undefined;
             }
-            const staleAt = mtimeMs + staleMs;
-            deadline = Math.max(deadline, staleAt + stealGraceMs);
-            if (Date.now() > staleAt) {
-                let tokenPresent = false;
-                try {
-                    statSync(ownerPath);
-                    tokenPresent = true;
-                }
-                catch {
-                }
-                if (tokenPresent) {
-                    const tomb = join(this.controlPlaneRoot, `txn.lock.stale-${randomUUID()}`);
+            if (mtimeMs !== undefined) {
+                const staleAt = mtimeMs + staleMs;
+                deadline = Math.max(deadline, staleAt + stealGraceMs);
+                if (Date.now() > staleAt) {
+                    let tokenPresent = false;
                     try {
-                        renameSync(lockDir, tomb);
+                        statSync(ownerPath);
+                        tokenPresent = true;
                     }
                     catch {
-                        continue;
                     }
-                    rmSync(tomb, { recursive: true, force: true });
-                    continue;
+                    if (tokenPresent) {
+                        const tomb = join(this.controlPlaneRoot, `txn.lock.stale-${randomUUID()}`);
+                        let stolen = false;
+                        try {
+                            renameSync(lockDir, tomb);
+                            stolen = true;
+                        }
+                        catch {
+                        }
+                        if (stolen)
+                            rmSync(tomb, { recursive: true, force: true });
+                    }
                 }
             }
             if (Date.now() > deadline) {

package/dist/core/memory-engine/layout.d.ts

@@ -41,6 +41,11 @@ export declare const ANNOUNCEMENTS_FILE = "announcements.json";
 export declare const MEMORY_ANNOUNCEMENTS_MAX = 20;
 export declare const SCAN_FUSE_FILE = "scan-fuse.json";
 export declare const SCAN_FUSE_THRESHOLD = 3;
+export interface SidecarLockOptions {
+    onDeadline?: "proceed" | "throw";
+    waitCapMs?: number;
+}
+export declare function acquireSidecarLock(lockDir: string, opts?: SidecarLockOptions): string;
 interface AnnouncementsRecord {
     folded: number;
     queue: MemoryAnnouncement[];

package/dist/core/memory-engine/layout.js

@@ -1,4 +1,4 @@
-import { closeSync, existsSync, fsyncSync, mkdirSync, openSync, readFileSync, readdirSync, realpathSync, renameSync, rmSync, statSync, unlinkSync, writeFileSync, writeSync } from "node:fs";
+import { closeSync, existsSync, fsyncSync, mkdirSync, openSync, readFileSync, readdirSync, realpathSync, renameSync, rmSync, rmdirSync, statSync, unlinkSync, writeFileSync, writeSync } from "node:fs";
 import { homedir } from "node:os";
 import { createHash } from "node:crypto";
 import { basename, dirname, isAbsolute, join, resolve, sep } from "node:path";
@@ -36,6 +36,37 @@ function subtreeHasFiles(dir) {
     }
     return false;
 }
+function pruneFilelessDirTree(dir) {
+    let entries;
+    try {
+        entries = readdirSync(dir, { withFileTypes: true });
+    }
+    catch {
+        return !existsSync(dir);
+    }
+    for (const e of entries) {
+        if (!e.isDirectory())
+            return false;
+        if (!pruneFilelessDirTree(join(dir, e.name)))
+            return false;
+    }
+    try {
+        rmdirSync(dir);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+function tryAdoptByRename(fromDir, toDir) {
+    try {
+        renameSync(fromDir, toDir);
+        return { ok: true };
+    }
+    catch (err) {
+        return { ok: false, code: err.code, error: err };
+    }
+}
 function migrateKeyedPartition(m) {
     const disclose = (code, message) => {
         try {
@@ -52,36 +83,26 @@ function migrateKeyedPartition(m) {
             return;
         if (!existsSync(m.fromDir))
             return;
-        if (existsSync(m.toDir)) {
-            if (subtreeHasFiles(m.toDir)) {
-                disclose("memory.partition_split", splitText);
-                return;
-            }
-            try {
-                rmSync(m.toDir, { recursive: true });
-            }
-            catch (err) {
-                const code = err.code;
-                disclose("memory.partition_adopt_failed", `could not clear the empty directory scaffolding at ${m.toDir} before adopting ${m.fromDir} (${code ?? String(err)}): ` +
-                    `this session proceeds on ${m.toDir}; ${m.fromDir} still holds the prior memory — move it by hand.`);
-                return;
-            }
+        if (existsSync(m.toDir) && subtreeHasFiles(m.toDir)) {
+            disclose("memory.partition_split", splitText);
+            return;
         }
-        try {
-            ensureDirExists(dirname(m.toDir));
-            renameSync(m.fromDir, m.toDir);
-        }
-        catch (err) {
-            const code = err.code;
-            if ((code === "ENOENT" || code === "EEXIST" || code === "ENOTEMPTY") && existsSync(m.toDir)) {
-                if (!existsSync(m.fromDir))
-                    return;
-                disclose("memory.partition_split", splitText);
+        ensureDirExists(dirname(m.toDir));
+        let outcome = tryAdoptByRename(m.fromDir, m.toDir);
+        if (!outcome.ok && (outcome.code === "EEXIST" || outcome.code === "ENOTEMPTY") && !subtreeHasFiles(m.toDir) && pruneFilelessDirTree(m.toDir)) {
+            outcome = tryAdoptByRename(m.fromDir, m.toDir);
+        }
+        if (outcome.ok)
+            return;
+        const { code, error } = outcome;
+        if ((code === "ENOENT" || code === "EEXIST" || code === "ENOTEMPTY") && existsSync(m.toDir)) {
+            if (!existsSync(m.fromDir))
                 return;
-            }
-            disclose("memory.partition_adopt_failed", `could not adopt the memory partition ${m.fromDir} → ${m.toDir} (${code ?? String(err)}): this session proceeds on ${m.toDir}; ` +
-                `${m.fromDir} still holds the prior memory — move it by hand.`);
+            disclose("memory.partition_split", splitText);
+            return;
         }
+        disclose("memory.partition_adopt_failed", `could not adopt the memory partition ${m.fromDir} → ${m.toDir} (${code ?? String(error)}): this session proceeds on ${m.toDir}; ` +
+            `${m.fromDir} still holds the prior memory — move it by hand.`);
     }
     catch {
     }
@@ -338,8 +359,13 @@ function sleepSync(ms) {
 }
 const LOCK_STALE_MS = 1_500;
 const LOCK_WAIT_CAP_MS = 3_000;
-function acquireSidecarLock(lockDir, opts = {}) {
-    const deadline = Date.now() + LOCK_WAIT_CAP_MS;
+const LOCK_SPIN_PAUSE_MS = 5;
+const MAX_FAIL_OPEN_DEADLINE_ROUNDS = 3;
+export function acquireSidecarLock(lockDir, opts = {}) {
+    const waitCapMs = opts.waitCapMs ?? LOCK_WAIT_CAP_MS;
+    const deadline = Date.now() + waitCapMs;
+    const mintToken = () => `${process.pid}-${Math.random().toString(36).slice(2, 10)}`;
+    let deadlineRounds = 0;
     const stealOnce = () => {
         const tomb = `${lockDir}.stale-${process.pid}-${Math.random().toString(36).slice(2, 8)}`;
         try {
@@ -354,7 +380,7 @@ function acquireSidecarLock(lockDir, opts = {}) {
     for (;;) {
         try {
             mkdirSync(lockDir);
-            const token = `${process.pid}-${Math.random().toString(36).slice(2, 10)}`;
+            const token = mintToken();
             let fd;
             try {
                 fd = openSync(join(lockDir, "owner"), "w");
@@ -374,25 +400,24 @@ function acquireSidecarLock(lockDir, opts = {}) {
             return token;
         }
         catch {
-            try {
-                const age = Date.now() - statSync(lockDir).mtimeMs;
-                if (age > LOCK_STALE_MS) {
-                    stealOnce();
-                    continue;
-                }
-            }
-            catch {
-                continue;
-            }
-            if (Date.now() > deadline) {
-                if (opts.onDeadline === "throw") {
-                    throw new Error(`sidecar lock wait timed out (${LOCK_WAIT_CAP_MS}ms) at ${lockDir} — refusing to proceed without the lock (fail-closed sidecar)`);
-                }
+        }
+        try {
+            const age = Date.now() - statSync(lockDir).mtimeMs;
+            if (age > LOCK_STALE_MS)
                 stealOnce();
-                continue;
+        }
+        catch {
+        }
+        if (Date.now() > deadline) {
+            if (opts.onDeadline === "throw") {
+                throw new Error(`sidecar lock wait timed out (${waitCapMs}ms) at ${lockDir} — refusing to proceed without the lock (fail-closed sidecar)`);
             }
-            sleepSync(5);
+            deadlineRounds += 1;
+            if (deadlineRounds > MAX_FAIL_OPEN_DEADLINE_ROUNDS)
+                return mintToken();
+            stealOnce();
         }
+        sleepSync(LOCK_SPIN_PAUSE_MS);
     }
 }
 function rollForwardSidecar(file, journal) {

package/dist/core/runner/assemble-result.d.ts

@@ -30,14 +30,6 @@ export interface Stats {
         }>;
     };
     mechanisms?: {
-        finalizeInjected?: true;
-        nudgesSent?: number;
-        capShrinks?: number;
-        callCutoffs?: number;
-        toolClamps?: number;
-        toolCuts?: number;
-        toolCutKills?: number;
-        pendingCutTools?: number;
         finalVerifyInjected?: true;
         finalVerifyInjections?: number;
         attachmentsInjected?: number;
@@ -60,16 +52,19 @@ export interface Stats {
         compactionMicroUsd: number;
     };
 }
+export type BudgetAxis = "tokens" | "cost";
 export interface ResultFlags {
     threw: unknown;
     model?: string;
     unpricedSpend?: boolean;
     rewindNotes?: TaskResult["rewindNotes"];
     remoteEnvFailures?: TaskResult["remoteEnvFailures"];
+    retryAfterMs?: number;
     abortedForTimeout: boolean;
     abortedForTurns: boolean;
     abortedLive?: boolean;
     budgetHit?: "exceeded" | "precall";
+    budgetAxis?: BudgetAxis;
     blockedReason?: string;
     conflict?: boolean;
     outputInvalid?: boolean;

package/dist/core/runner/assemble-result.js

@@ -1,5 +1,14 @@
-import { isDegenerateCutMessage, isWalltimeCutMessage } from "../../brain/terminal-cause.js";
+import { isDegenerateCutMessage } from "../../brain/terminal-cause.js";
 import { extractErrorCode, stripErrorCodePrefix } from "../../brain/errors.js";
+const SALVAGE_ELIGIBLE_TERMINALS = new Set([
+    "output.degenerate",
+    "limits.max_tokens_exceeded",
+    "limits.max_cost_exceeded",
+    "limits.max_turns_exceeded",
+    "limits.max_walltime_exceeded",
+    "env.lifetime_expired",
+    "usage.window_exhausted",
+]);
 export function errorCodeOf(err) {
     let cur = err;
     let fallback;
@@ -54,7 +63,6 @@ export function assembleResult(spec, sessionId, final, stats, flags) {
     let checkpointGate;
     let workspaceRestoreMode;
     const isDegenerate = final?.stopReason === "error" && isDegenerateCutMessage(final);
-    const isWalltimeCutoff = final?.stopReason === "error" && isWalltimeCutMessage(final);
     if (flags.outputInvalid) {
         status = "failed";
         errorCode = "output.invalid";
@@ -64,21 +72,15 @@ export function assembleResult(spec, sessionId, final, stats, flags) {
         status = "failed";
         errorCode = "output.degenerate";
         errorMessage = final?.errorMessage;
-        salvagedOutput = text.trim() || undefined;
-    }
-    else if (isWalltimeCutoff) {
-        status = "timeout";
-        errorCode = "limit.timeout";
-        errorMessage = final?.errorMessage;
-        salvagedOutput = text.trim() || undefined;
     }
     else if (flags.budgetHit) {
         status = "failed";
-        errorCode = flags.budgetHit === "precall" ? "budget.precall" : "budget.exceeded";
+        errorCode = flags.budgetAxis === "tokens" ? "limits.max_tokens_exceeded" : "limits.max_cost_exceeded";
+        const axisName = flags.budgetAxis === "tokens" ? "limits.maxTokens" : "limits.maxCostUsd";
         errorMessage =
             flags.budgetHit === "precall"
-                ? "estimated cost exceeds maxCostUsd; task not started"
-                : "cumulative cost or tokens exceeded the task budget";
+                ? `the estimated cost of the first call already exceeds ${axisName}; the task was not started`
+                : `cumulative usage exceeded ${axisName}`;
     }
     else if (flags.suspendLoop) {
         status = "failed";
@@ -86,12 +88,12 @@ export function assembleResult(spec, sessionId, final, stats, flags) {
         errorMessage = "task suspended too many times (resume/restart loop) — exceeded the suspend limit";
     }
     else if (flags.threw) {
-        status = flags.abortedForTimeout ? "timeout" : "failed";
+        status = "failed";
         errorMessage = flags.threw instanceof Error ? flags.threw.message : String(flags.threw);
         errorCode = flags.abortedForTimeout
-            ? "limit.timeout"
+            ? "limits.max_walltime_exceeded"
             : flags.abortedForTurns
-                ? "limit.max_turns"
+                ? "limits.max_turns_exceeded"
                 : flags.conflict
                     ? "conflict"
                     : errorCodeOf(flags.threw);
@@ -114,8 +116,8 @@ export function assembleResult(spec, sessionId, final, stats, flags) {
         workspaceRestoreMode = flags.reviewRef.restoreMode;
     }
     else if (flags.abortedLive || final?.stopReason === "aborted") {
-        status = flags.abortedForTimeout ? "timeout" : "failed";
-        errorCode = flags.abortedForTimeout ? "limit.timeout" : flags.abortedForTurns ? "limit.max_turns" : undefined;
+        status = "failed";
+        errorCode = flags.abortedForTimeout ? "limits.max_walltime_exceeded" : flags.abortedForTurns ? "limits.max_turns_exceeded" : undefined;
         errorMessage = final?.errorMessage ?? (flags.abortedForTurns ? "max turns exceeded" : "run aborted");
     }
     else if (!final) {
@@ -140,9 +142,13 @@ export function assembleResult(spec, sessionId, final, stats, flags) {
     else {
         status = "completed";
     }
+    if (errorCode !== undefined && SALVAGE_ELIGIBLE_TERMINALS.has(errorCode)) {
+        salvagedOutput = text.trim() || undefined;
+    }
+    const retryAfterMs = errorCode === "usage.window_exhausted" ? flags.retryAfterMs : undefined;
     const { compactionMicroUsd: _internalCompaction, ...publicStats } = stats;
     void _internalCompaction;
     if (flags.unpricedSpend)
         delete publicStats.costMicroUsd;
-    return { taskId, sessionId, status, ...(flags.model !== undefined ? { model: flags.model } : {}), result: result.trim(), salvagedOutput, blockedReason, errorMessage, errorCode, checkpointToken, checkpointGate, ...(workspaceRestoreMode !== undefined ? { workspaceRestoreMode } : {}), ...(flags.rewindNotes !== undefined && flags.rewindNotes.length > 0 ? { rewindNotes: flags.rewindNotes } : {}), ...(flags.remoteEnvFailures !== undefined && flags.remoteEnvFailures.length > 0 ? { remoteEnvFailures: flags.remoteEnvFailures } : {}), stats: publicStats };
+    return { taskId, sessionId, status, ...(flags.model !== undefined ? { model: flags.model } : {}), result: result.trim(), salvagedOutput, blockedReason, errorMessage, errorCode, ...(retryAfterMs !== undefined ? { retryAfterMs } : {}), checkpointToken, checkpointGate, ...(workspaceRestoreMode !== undefined ? { workspaceRestoreMode } : {}), ...(flags.rewindNotes !== undefined && flags.rewindNotes.length > 0 ? { rewindNotes: flags.rewindNotes } : {}), ...(flags.remoteEnvFailures !== undefined && flags.remoteEnvFailures.length > 0 ? { remoteEnvFailures: flags.remoteEnvFailures } : {}), stats: publicStats };
 }