claude-overnight 1.50.1 → 1.50.5

package/dist/core/_version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "1.50.1";
+export declare const VERSION = "1.50.5";

package/dist/core/_version.js

@@ -1,2 +1,2 @@
 // Auto-generated by build — do not edit manually.
-export const VERSION = "1.50.1";
+export const VERSION = "1.50.5";

package/dist/core/types.d.ts

@@ -310,6 +310,10 @@ export interface RunState extends RunConfigBase {
     coachedObjective?: string;
     /** Unix timestamp (ms) when the coach produced the accepted rewrite. */
     coachedAt?: number;
+    /** Run-branch created when mergeStrategy="branch" — must survive resume so subsequent waves accumulate into it instead of orphan branches. */
+    runBranch?: string;
+    /** Branch (or detached HEAD sha) the user was on before the run-branch was created — restored on run completion. */
+    originalRef?: string;
 }
 /** Function that returns a rate-limit snapshot with optional context token info. */
 export type RLGetter = () => {

package/dist/run/run.js

@@ -10,6 +10,7 @@ import { buildEnvResolver, isCursorProxyProvider } from "../providers/index.js";
 import { RunDisplay } from "../ui/ui.js";
 import { renderSummary } from "../ui/summary.js";
 import { readRunMemory, writeStatus, writeGoalUpdate, saveRunState, saveWaveSession, loadWaveHistory, recordBranches, archiveMilestone, writeSteerInbox, consumeSteerInbox, countSteerInbox, appendOvernightLogStart, updateOvernightLogEnd, } from "../state/state.js";
+import { composeRunState } from "../state/run-state.js";
 import { runPostRunReview } from "./review.js";
 import { printFinalSummary } from "./summary.js";
 import { runWaveLoop } from "./wave-loop.js";
@@ -206,10 +207,25 @@ export async function executeRun(cfg) {
             .then(text => { display.setDebrief(text.trim().slice(0, 210), label); })
             .catch(() => { display.setDebrief(undefined); });
     };
-    // For flex + branch strategy: create one target branch
+    // For flex + branch strategy: create one target branch (or restore on resume).
+    // The run-branch + originalRef are persisted in run.json so resumes accumulate
+    // into the original branch instead of spawning orphan swarm/run-* branches.
     let runBranch;
     let originalRef;
-    if (flex && mergeStrategy === "branch" && useWorktrees && !cfg.resuming) {
+    if (cfg.resuming && cfg.resumeState) {
+        runBranch = cfg.resumeState.runBranch;
+        originalRef = cfg.resumeState.originalRef;
+        if (runBranch) {
+            try {
+                execSync(`git checkout "${runBranch}"`, { cwd, encoding: "utf-8", stdio: "pipe" });
+                console.log(chalk.dim(`  Resumed on branch: ${runBranch}\n`));
+            }
+            catch {
+                console.log(chalk.yellow(`  ⚠ Could not check out run branch ${runBranch} — wave merges may diverge\n`));
+            }
+        }
+    }
+    if (flex && mergeStrategy === "branch" && useWorktrees && !runBranch) {
         try {
             originalRef = execSync("git rev-parse --abbrev-ref HEAD", { cwd, encoding: "utf-8", stdio: "pipe" }).trim();
             if (originalRef === "HEAD")
@@ -237,21 +253,25 @@ export async function executeRun(cfg) {
         }
         catch { }
     }
-    const buildRunState = (varying) => ({
-        id: `run-${new Date().toISOString().slice(0, 19)}`, objective: objective ?? "", budget: cfg.budget,
-        remaining, workerModel, plannerModel, fastModel,
-        workerProviderId: cfg.workerProvider?.id, plannerProviderId: cfg.plannerProvider?.id,
+    const runStateBase = {
+        cwd,
+        id: `run-${new Date(cfg.runStartedAt).toISOString().slice(0, 19)}`,
+        startedAt: new Date(cfg.runStartedAt).toISOString(),
+        objective: objective ?? "",
+        budget: cfg.budget,
+        workerProviderId: cfg.workerProvider?.id,
+        plannerProviderId: cfg.plannerProvider?.id,
         fastProviderId: cfg.fastProvider?.id,
-        concurrency,
-        usageCap, allowExtraUsage: cfg.allowExtraUsage, extraUsageBudget: cfg.extraUsageBudget,
-        flex, useWorktrees, mergeStrategy, waveNum,
-        currentTasks: varying.currentTasks,
-        accCost, accCompleted, accFailed, accIn, accOut, accTools,
-        branches, phase: varying.phase, startedAt: new Date(cfg.runStartedAt).toISOString(), cwd,
+        allowExtraUsage: cfg.allowExtraUsage ?? false,
+        extraUsageBudget: cfg.extraUsageBudget,
+        flex, useWorktrees, mergeStrategy,
         repoFingerprint,
         coachedObjective: cfg.coachedObjective,
         coachedAt: cfg.coachedAt,
-    });
+        runBranch,
+        originalRef,
+    };
+    const buildRunState = (varying) => composeRunState({ ...runStateBase, workerModel, plannerModel, fastModel, concurrency, usageCap }, { remaining: varying.remaining, waveNum, accCost, accCompleted, accFailed, accIn, accOut, accTools, branches }, { phase: varying.phase, currentTasks: varying.currentTasks });
     const gracefulStop = () => {
         if (stopping) {
             currentSwarm?.cleanup();
@@ -509,6 +529,7 @@ export async function executeRun(cfg) {
         rlGetter,
         isStopping: () => stopping,
         syncRunInfo,
+        buildRunState,
         renderSummary,
         runDebrief,
         recordBranches: (agents, mergeResults, currentWave) => {

package/dist/run/wave-loop.d.ts

@@ -1,4 +1,4 @@
-import type { Task, MergeStrategy, BranchRecord, WaveSummary, RLGetter } from "../core/types.js";
+import type { Task, MergeStrategy, BranchRecord, WaveSummary, RLGetter, RunState } from "../core/types.js";
 import { Swarm } from "../swarm/swarm.js";
 import { RunDisplay } from "../ui/ui.js";
 import type { LiveConfig, SteeringContext } from "../ui/ui.js";
@@ -70,6 +70,15 @@ export interface WaveLoopCtx {
         ok: boolean;
     }[], currentWave?: number) => void;
     onLibrarianResult?: (promoted: number, patched: number, quarantined: number, rejected: number) => void;
+    /** Builds a full RunState snapshot. Provided by run.ts so cwd, budget, branches,
+     * provider ids, etc. are preserved — the wave loop used to rebuild a truncated
+     * state that omitted cwd, which made saved runs invisible to `findIncompleteRuns`
+     * (the cwd-equality filter dropped them). */
+    buildRunState: (varying: {
+        remaining: number;
+        phase: RunState["phase"];
+        currentTasks: Task[];
+    }) => RunState;
 }
 export interface WaveLoopResult {
     runAnotherRound: boolean;

package/dist/run/wave-loop.js

@@ -59,7 +59,7 @@ export async function runWaveLoop(host, ctx) {
             if (host.currentTasks.length > host.remaining)
                 host.currentTasks = host.currentTasks.slice(0, host.remaining);
             ctx.syncRunInfo();
-            saveRunState(ctx.runDir, buildRunState(host, "steering", host.currentTasks));
+            saveRunState(ctx.runDir, ctx.buildRunState({ remaining: host.remaining, phase: "steering", currentTasks: host.currentTasks }));
             // ── Pre-wave rate limit gate ──
             await throttleBeforeWave(ctx.rlGetter, (text) => ctx.display.appendSteeringEvent(text), ctx.isStopping);
             if (ctx.isStopping())
@@ -181,7 +181,7 @@ export async function runWaveLoop(host, ctx) {
             // On user-initiated quit mid-wave, "never started" tasks are real leftover
             // work the user expects to see on resume — save them under "stopped".
             const midWavePhase = (ctx.isStopping() || swarm.aborted) ? "stopped" : "steering";
-            saveRunState(ctx.runDir, buildRunState(host, midWavePhase, neverStarted));
+            saveRunState(ctx.runDir, ctx.buildRunState({ remaining: host.remaining, phase: midWavePhase, currentTasks: neverStarted }));
             // Preserve the leftover tasks on the host so resume / verifier see the
             // real pending queue (not the full original batch) after each wave.
             host.currentTasks = neverStarted;
@@ -235,7 +235,7 @@ export async function runWaveLoop(host, ctx) {
             if (circuitHalt) {
                 ctx.display.appendSteeringEvent(`Circuit breaker: 2 consecutive waves produced no merged changes — halting to prevent budget drain`);
                 ctx.display.stop();
-                saveRunState(ctx.runDir, buildRunState(host, "stopped", []));
+                saveRunState(ctx.runDir, ctx.buildRunState({ remaining: host.remaining, phase: "stopped", currentTasks: [] }));
                 ctx.display.stop();
                 console.log(chalk.red(`\n  Circuit breaker: 2 consecutive waves produced no merged changes.`));
                 console.log(chalk.red(`  Halting to prevent budget drain. Run preserved at ${ctx.runDir}.`));
@@ -521,16 +521,6 @@ function handleZeroWorkRetry(swarm, host, ctx) {
     swarm.totalOutputTokens += retrySwarm.totalOutputTokens;
     host.liveConfig.remaining = host.remaining;
 }
-function buildRunState(host, phase, currentTasks) {
-    return {
-        remaining: host.remaining, phase, currentTasks,
-        workerModel: host.workerModel, plannerModel: host.plannerModel, fastModel: host.fastModel,
-        concurrency: host.concurrency,
-        usageCap: host.usageCap, flex: true, waveNum: host.waveNum,
-        accCost: host.accCost, accCompleted: host.accCompleted, accFailed: host.accFailed,
-        accIn: host.accIn, accOut: host.accOut, accTools: host.accTools,
-    };
-}
 function captureAbOutcome(swarm, assignment, host, ctx) {
     const treatmentAgents = swarm.agents.filter(a => assignment.treatmentTaskIds.includes(a.task.id));
     const controlAgents = swarm.agents.filter(a => assignment.controlTaskIds.includes(a.task.id));

package/dist/state/run-state.d.ts

@@ -0,0 +1,45 @@
+import type { RunState, Task, BranchRecord } from "../core/types.js";
+/** Static inputs that don't change between RunState snapshots within a single run. */
+export interface RunStateBase {
+    cwd: string;
+    id: string;
+    startedAt: string;
+    objective: string;
+    budget: number;
+    workerModel: string;
+    plannerModel: string;
+    fastModel: string | undefined;
+    workerProviderId?: string;
+    plannerProviderId?: string;
+    fastProviderId?: string;
+    concurrency: number;
+    usageCap: number | undefined;
+    allowExtraUsage: boolean;
+    extraUsageBudget?: number;
+    flex: boolean;
+    useWorktrees: boolean;
+    mergeStrategy: RunState["mergeStrategy"];
+    repoFingerprint: string;
+    coachedObjective?: string;
+    coachedAt?: number;
+    runBranch?: string;
+    originalRef?: string;
+}
+/** Live counters captured at snapshot time. */
+export interface RunStateLive {
+    remaining: number;
+    waveNum: number;
+    accCost: number;
+    accCompleted: number;
+    accFailed: number;
+    accIn: number;
+    accOut: number;
+    accTools: number;
+    branches: BranchRecord[];
+}
+/** Variable-per-snapshot inputs: phase and the task slice for resume. */
+export interface RunStateVarying {
+    phase: RunState["phase"];
+    currentTasks: Task[];
+}
+export declare function composeRunState(base: RunStateBase, live: RunStateLive, varying: RunStateVarying): RunState;

package/dist/state/run-state.js

@@ -0,0 +1,32 @@
+// Single source of truth for constructing a RunState snapshot for persistence.
+//
+// Two writers used to exist (run.ts and wave-loop.ts) and one drifted —
+// silently omitting cwd, which made saved runs invisible to findIncompleteRuns.
+// Now both call this. Adding a field to RunState forces an edit here.
+//
+// `saveRunState` enforces required fields at the write boundary; this module
+// enforces them at the call boundary.
+export function composeRunState(base, live, varying) {
+    return {
+        id: base.id, objective: base.objective, budget: base.budget,
+        remaining: live.remaining,
+        workerModel: base.workerModel, plannerModel: base.plannerModel, fastModel: base.fastModel,
+        workerProviderId: base.workerProviderId, plannerProviderId: base.plannerProviderId,
+        fastProviderId: base.fastProviderId,
+        concurrency: base.concurrency,
+        usageCap: base.usageCap, allowExtraUsage: base.allowExtraUsage, extraUsageBudget: base.extraUsageBudget,
+        flex: base.flex, useWorktrees: base.useWorktrees, mergeStrategy: base.mergeStrategy,
+        waveNum: live.waveNum,
+        currentTasks: varying.currentTasks,
+        accCost: live.accCost, accCompleted: live.accCompleted, accFailed: live.accFailed,
+        accIn: live.accIn, accOut: live.accOut, accTools: live.accTools,
+        branches: live.branches,
+        phase: varying.phase,
+        startedAt: base.startedAt, cwd: base.cwd,
+        repoFingerprint: base.repoFingerprint,
+        coachedObjective: base.coachedObjective,
+        coachedAt: base.coachedAt,
+        runBranch: base.runBranch,
+        originalRef: base.originalRef,
+    };
+}

package/dist/state/state.js

@@ -180,13 +180,31 @@ export function updateOvernightLogEnd(cwd, runId, meta) {
     }
 }
 // ── Run state persistence ──
+/**
+ * Required fields on every persisted RunState. The type already marks these as
+ * non-optional, but callers that build state dynamically (or upcast through
+ * `any`) can still slip a truncated snapshot past the compiler. A truncated
+ * snapshot is silently excluded by `findIncompleteRuns` (cwd-equality filter),
+ * so the run becomes unresumable without any visible error. Guard at the write
+ * boundary so the bug surfaces where it's introduced, not weeks later.
+ */
+const REQUIRED_RUN_STATE_FIELDS = ["cwd", "id", "phase", "startedAt"];
 export function saveRunState(runDir, state) {
+    const missing = REQUIRED_RUN_STATE_FIELDS.filter(k => !state[k]);
+    if (missing.length) {
+        throw new Error(`saveRunState: refusing to persist truncated state, missing fields: ${missing.join(", ")}`);
+    }
     mkdirSync(runDir, { recursive: true });
     writeFileSync(join(runDir, "run.json"), JSON.stringify(state, null, 2), "utf-8");
 }
 export function loadRunState(runDir) {
     try {
-        return JSON.parse(readFileSync(join(runDir, "run.json"), "utf-8"));
+        const state = JSON.parse(readFileSync(join(runDir, "run.json"), "utf-8"));
+        if (state && !Array.isArray(state.branches))
+            state.branches = [];
+        if (state && !Array.isArray(state.currentTasks))
+            state.currentTasks = [];
+        return state;
     }
     catch {
         return null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-overnight",
-  "version": "1.50.1",
+  "version": "1.50.5",
   "description": "Parallel Claude agents in git worktrees with a usage cap that reserves headroom for your interactive Claude Code. Crash-safe resume. Provider-agnostic model catalog (Anthropic, Cursor, OpenAI, Gemini, DeepSeek, Llama, Qwen) with capability-based task scoping.",
   "type": "module",
   "bin": {

package/plugins/claude-overnight/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-overnight",
-  "version": "1.50.1",
+  "version": "1.50.5",
   "description": "Claude Code skill for understanding, installing, and inspecting claude-overnight runs  -- parallel Claude agents in git worktrees with thinking waves, multi-wave steering, and crash-safe resume. Supports Cursor API Proxy, Qwen, OpenRouter.",
   "author": {
     "name": "Francesco Fornace"