@sema-agent/core 5.7.0 → 5.8.0

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,6 +52,7 @@ export interface Stats {
         compactionMicroUsd: number;
     };
 }
+export type BudgetAxis = "tokens" | "cost";
 export interface ResultFlags {
     threw: unknown;
     model?: string;
@@ -70,6 +63,7 @@ export interface ResultFlags {
     abortedForTurns: boolean;
     abortedLive?: boolean;
     budgetHit?: "exceeded" | "precall";
+    budgetAxis?: BudgetAxis;
     blockedReason?: string;
     conflict?: boolean;
     outputInvalid?: boolean;

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

@@ -1,4 +1,4 @@
-import { isDegenerateCutMessage, isWalltimeCutMessage } from "../../brain/terminal-cause.js";
+import { isDegenerateCutMessage } from "../../brain/terminal-cause.js";
 import { extractErrorCode, stripErrorCodePrefix } from "../../brain/errors.js";
 export function errorCodeOf(err) {
     let cur = err;
@@ -54,7 +54,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";
@@ -66,19 +65,15 @@ export function assembleResult(spec, sessionId, final, stats, flags) {
         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}`;
+        salvagedOutput = text.trim() || undefined;
     }
     else if (flags.suspendLoop) {
         status = "failed";
@@ -86,15 +81,17 @@ 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);
+        if (flags.abortedForTimeout || flags.abortedForTurns)
+            salvagedOutput = text.trim() || undefined;
     }
     else if (flags.blockedReason) {
         status = "blocked";
@@ -114,9 +111,11 @@ 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");
+        if (flags.abortedForTimeout || flags.abortedForTurns)
+            salvagedOutput = text.trim() || undefined;
     }
     else if (!final) {
         status = "failed";

package/dist/core/runner/prepare-task.d.ts

@@ -8,7 +8,6 @@ import type { SessionStore } from "../session.js";
 import { SubagentRetainLedger } from "../../agents/retain-ledger.js";
 import type { OnAsk, ToolPolicy } from "../tool-policy.js";
 import { type ActiveSkillFrame } from "./active-skill-scope.js";
-import { type CutKillRegistry } from "./cut-kill.js";
 import type { SessionPermissionRules } from "../session-policy-store.js";
 import { CacheBreakDetector, type ToolFingerprintInput } from "../cache-break-detector.js";
 import { type BrainCallGuardrailRef } from "../../brain/timeout.js";
@@ -19,10 +18,23 @@ import type { TaskNotificationPayload } from "../task-notification.js";
 import { type CwdRef } from "../../tools/fs/index.js";
 import { type WorkflowSizeGuideline } from "../../orchestration/workflow-size-guideline.js";
 import type { Runner } from "./runtask.js";
-import { type CheckpointGate, type CheckpointState, type CheckpointToken, type ResourceLedger, type ResourceLimitReason } from "../checkpoint-store.js";
+import { type CheckpointGate, type CheckpointState, type CheckpointToken, type ResourceLedger, type PlatformLimitReason, type ResourceLimitReason } from "../checkpoint-store.js";
 import type { ActiveWorktreeSession, AgentMessage, AgentTool, ExecutionEnv } from "../../internal/harness.js";
-import type { NestedUsageAccum, RunnerDeps, TaskEvent, TaskResult, TaskSpec, ToolActivity, ToolEffect } from "../types.js";
+import type { NestedUsageAccum, RunnerDeps, TaskEvent, TaskLimits, TaskResult, TaskSpec, ToolActivity, ToolEffect } from "../types.js";
 import type { RepairBundle } from "../../agents/repair-loop.js";
+export declare function resolveTaskLimits(limits: TaskLimits | undefined): TaskLimits | undefined;
+export declare const ENV_LIFETIME_SUSPEND_MARGIN_MS = 60000;
+export declare const USAGE_WINDOW_REAP_MARGIN_MS: number;
+export interface UsageGovernance {
+    readonly key: string;
+    check(now: number): Promise<number | undefined>;
+    commit(cumulativeTokens: number, now: number): Promise<void>;
+}
+export declare function resolveEnvLifetimeExpiry(env: ExecutionEnv, observedAt: number | undefined): {
+    expiresAt: number;
+} | {
+    unanchored: true;
+} | undefined;
 export declare const DEFAULT_IRREVERSIBLE_SCOPE = "irreversible";
 export declare function checkpointScopeOf(spec: {
     durableApproval?: {
@@ -132,9 +144,17 @@ export interface Prepared {
         turns: number;
         walltimeMs: number;
     }) => Promise<boolean>;
-    callCapRef?: import("./call-cap.js").CallCapRef;
-    cutKills?: CutKillRegistry;
-    callIssuedAtRef?: {
+    suspendForPlatformLimit?: (reason: PlatformLimitReason, sliceSpend: {
+        costMicroUsd: number;
+        tokens: number;
+        turns: number;
+        walltimeMs: number;
+    }, hint?: {
+        resumeAfterMs: number;
+    }) => Promise<boolean>;
+    envLifetimeSuspendAt?: number;
+    usageGovernance?: UsageGovernance;
+    callIssuedAtRef: {
         current?: number;
     };
     brainCallGuardrailRef: BrainCallGuardrailRef;