claude-overnight 1.5.1 → 1.6.0

package/dist/index.js

@@ -410,6 +410,35 @@ function saveWaveSession(baseDir, waveNum, kind, swarm) {
         totalCost: swarm.totalCostUsd,
     }, null, 2), "utf-8");
 }
+/** Rebuild waveHistory from saved session files on resume. */
+function loadWaveHistory(runDir) {
+    const dir = join(runDir, "sessions");
+    try {
+        return readdirSync(dir)
+            .filter(f => f.startsWith("wave-") && f.endsWith(".json"))
+            .sort((a, b) => {
+            const numA = parseInt(a.replace("wave-", "").replace(".json", ""));
+            const numB = parseInt(b.replace("wave-", "").replace(".json", ""));
+            return numA - numB;
+        })
+            .map(f => {
+            const data = JSON.parse(readFileSync(join(dir, f), "utf-8"));
+            return {
+                wave: data.wave,
+                kind: data.kind,
+                tasks: (data.agents || []).map((a) => ({
+                    prompt: a.prompt,
+                    status: a.status,
+                    filesChanged: a.filesChanged,
+                    error: a.error,
+                })),
+            };
+        });
+    }
+    catch {
+        return [];
+    }
+}
 function recordBranches(swarm, branches) {
     for (const a of swarm.agents) {
         if (a.branch) {
@@ -671,6 +700,11 @@ async function main() {
             if (unmerged > 0) {
                 console.log("");
                 autoMergeBranches(cwd, prev.branches, (msg) => console.log(chalk.dim(`  ${msg}`)));
+                // Persist merged branch statuses immediately so they survive a crash before next saveRunState
+                try {
+                    saveRunState(incomplete.dir, prev);
+                }
+                catch { }
             }
         }
     }
@@ -683,7 +717,18 @@ async function main() {
     let usageCap;
     let allowExtraUsage = false;
     let extraUsageBudget;
-    if (!nonInteractive) {
+    if (resuming) {
+        // Skip interactive flow entirely — all config is restored from saved state later
+        workerModel = resumeState.workerModel;
+        plannerModel = resumeState.plannerModel;
+        budget = resumeState.budget;
+        concurrency = resumeState.concurrency;
+        objective = resumeState.objective;
+        usageCap = resumeState.usageCap;
+        allowExtraUsage = resumeState.allowExtraUsage ?? false;
+        extraUsageBudget = resumeState.extraUsageBudget;
+    }
+    else if (!nonInteractive) {
         // ① Objective
         while (true) {
             objective = await ask(`\n  ${chalk.cyan("①")} ${chalk.bold("What should the agents do?")}\n  ${chalk.cyan(">")} `);
@@ -819,11 +864,11 @@ async function main() {
         }
     }
     validateConcurrency(concurrency);
-    const permissionMode = fileCfg?.permissionMode ?? "auto";
-    const useWorktrees = fileCfg?.useWorktrees ?? (isGitRepo(cwd));
+    let permissionMode = resuming ? resumeState.permissionMode : (fileCfg?.permissionMode ?? "auto");
+    let useWorktrees = resuming ? resumeState.useWorktrees : (fileCfg?.useWorktrees ?? isGitRepo(cwd));
     if (useWorktrees)
         validateGitRepo(cwd);
-    const mergeStrategy = fileCfg?.mergeStrategy ?? "yolo";
+    let mergeStrategy = resuming ? resumeState.mergeStrategy : (fileCfg?.mergeStrategy ?? "yolo");
     if (nonInteractive) {
         const capStr = usageCap != null ? `  cap=${Math.round(usageCap * 100)}%` : "";
         const extraStr = allowExtraUsage ? (extraUsageBudget ? `  extra=$${extraUsageBudget}` : "  extra=∞") : "  extra=off";
@@ -840,7 +885,7 @@ async function main() {
     const runDir = resuming && resumeRunDir ? resumeRunDir : (orphanedDir ?? createRunDir(rootDir));
     const previousKnowledge = readPreviousRunKnowledge(rootDir);
     // ── Plan phase (interactive: review loop, non-interactive: auto-plan or skip) ──
-    const needsPlan = tasks.length === 0;
+    const needsPlan = tasks.length === 0 && !resuming;
     const designDir = join(runDir, "designs");
     if (needsPlan) {
         if (noTTY) {
@@ -1054,7 +1099,7 @@ async function main() {
             process.exit(1);
         }
     }
-    if (tasks.length === 0) {
+    if (tasks.length === 0 && !resuming) {
         console.error("No tasks provided.");
         process.exit(1);
     }
@@ -1066,7 +1111,7 @@ async function main() {
     // ── Run (wave loop) ──
     process.stdout.write("\x1B[?25l");
     const restore = () => process.stdout.write("\x1B[?25h\n");
-    const runStartedAt = Date.now();
+    const runStartedAt = resuming && resumeState?.startedAt ? new Date(resumeState.startedAt).getTime() : Date.now();
     // Wave-loop state — either fresh or resumed
     mkdirSync(join(runDir, "reflections"), { recursive: true });
     mkdirSync(join(runDir, "milestones"), { recursive: true });
@@ -1104,7 +1149,12 @@ async function main() {
         usageCap = resumeState.usageCap;
         allowExtraUsage = resumeState.allowExtraUsage ?? false;
         extraUsageBudget = resumeState.extraUsageBudget;
-        console.log(chalk.green(`\n  ✓ Resumed`) + chalk.dim(` · wave ${waveNum + 1} · ${remaining} remaining · $${accCost.toFixed(2)} spent\n`));
+        permissionMode = resumeState.permissionMode;
+        useWorktrees = resumeState.useWorktrees;
+        mergeStrategy = resumeState.mergeStrategy;
+        // Restore wave history from saved session files so steerer has full context
+        waveHistory.push(...loadWaveHistory(runDir));
+        console.log(chalk.green(`\n  ✓ Resumed`) + chalk.dim(` · wave ${waveNum + 1} · ${remaining} remaining · $${accCost.toFixed(2)} spent · ${waveHistory.length} prior waves\n`));
     }
     else {
         // Fresh run
@@ -1131,7 +1181,7 @@ async function main() {
     // For flex + branch strategy: create one target branch, waves merge via yolo into it
     let runBranch;
     let originalRef;
-    if (flex && mergeStrategy === "branch" && useWorktrees) {
+    if (flex && mergeStrategy === "branch" && useWorktrees && !resuming) {
         try {
             originalRef = execSync("git rev-parse --abbrev-ref HEAD", { cwd, encoding: "utf-8", stdio: "pipe" }).trim();
             if (originalRef === "HEAD")
@@ -1160,6 +1210,38 @@ async function main() {
     process.on("SIGTERM", () => gracefulStop("SIGTERM"));
     process.on("uncaughtException", (err) => { currentSwarm?.abort(); currentSwarm?.cleanup(); restore(); console.error(chalk.red(`\n  Uncaught: ${err.message}`)); process.exit(1); });
     process.on("unhandledRejection", (reason) => { currentSwarm?.abort(); currentSwarm?.cleanup(); restore(); console.error(chalk.red(`\n  Unhandled: ${reason instanceof Error ? reason.message : reason}`)); process.exit(1); });
+    // When resuming a flex run with no queued tasks, steer immediately to get the next wave
+    if (resuming && flex && currentTasks.length === 0 && remaining > 0) {
+        console.log(chalk.cyan(`\n  ◆ Assessing...\n`));
+        process.stdout.write("\x1B[?25l");
+        try {
+            const memory = readRunMemory(runDir, previousKnowledge || undefined);
+            const steer = await steerWave(objective, waveHistory, remaining, cwd, plannerModel, workerModel, permissionMode, concurrency, makeProgressLog(), memory);
+            process.stdout.write(`\x1B[2K\r`);
+            process.stdout.write("\x1B[?25h");
+            if (steer.statusUpdate)
+                writeStatus(runDir, steer.statusUpdate);
+            if (steer.goalUpdate)
+                writeGoalUpdate(runDir, steer.goalUpdate);
+            if (!steer.done && steer.tasks.length > 0) {
+                console.log(chalk.dim(`  ${steer.reasoning}\n`));
+                currentTasks = steer.tasks.map(t => ({
+                    ...t,
+                    model: t.model === "planner" ? plannerModel : t.model === "worker" ? workerModel : t.model,
+                }));
+                lastWaveKind = steer.waveKind;
+            }
+            else if (steer.done) {
+                console.log(chalk.green(`  \u2713 ${steer.reasoning}\n`));
+                objectiveComplete = true;
+                remaining = 0;
+            }
+        }
+        catch (err) {
+            process.stdout.write("\x1B[?25h");
+            console.log(chalk.yellow(`  Steering failed: ${err.message?.slice(0, 80)} \u2014 stopping\n`));
+        }
+    }
     while (remaining > 0 && currentTasks.length > 0 && !stopping) {
         if (currentTasks.length > remaining)
             currentTasks = currentTasks.slice(0, remaining);
@@ -1212,7 +1294,7 @@ async function main() {
         saveRunState(runDir, {
             id: `run-${new Date().toISOString().slice(0, 19)}`, objective: objective, budget: budget ?? tasks.length,
             remaining, workerModel, plannerModel, concurrency, permissionMode,
-            usageCap, allowExtraUsage, extraUsageBudget, flex, useWorktrees, mergeStrategy, waveNum, currentTasks,
+            usageCap, allowExtraUsage, extraUsageBudget, flex, useWorktrees, mergeStrategy, waveNum, currentTasks: [],
             lastWaveKind, overheadBudgetUsed, accCost, accCompleted, accFailed,
             branches, phase: "steering", startedAt: new Date(runStartedAt).toISOString(), cwd,
         });
@@ -1284,7 +1366,7 @@ async function main() {
             catch (err) {
                 process.stdout.write("\x1B[?25h");
                 console.log(chalk.yellow(`  Steering failed: ${err.message?.slice(0, 80)} \u2014 stopping\n`));
-                remaining = 0;
+                // Don't zero out remaining — preserve unspent budget so resume works
                 break;
             }
         }

package/dist/planner.js

@@ -725,7 +725,12 @@ If done: {"done": true, "waveKind": "done", "reasoning": "...", "statusUpdate":
             return first;
         onLog("Retrying...");
         const retryText = await runPlannerQuery(`Your previous response was not valid JSON. Respond with ONLY a JSON object {"done":false,"waveKind":"execute","reasoning":"...","statusUpdate":"...","tasks":[{"prompt":"..."}]}.\n\n${prompt}`, { cwd, model: plannerModel, permissionMode }, onLog);
-        return attemptJsonParse(retryText) ?? { done: true, waveKind: "done", reasoning: "Could not parse steering response" };
+        const retryParsed = attemptJsonParse(retryText);
+        if (retryParsed)
+            return retryParsed;
+        // Don't return done:true on parse failure — that permanently marks the run complete.
+        // Throw so the caller's catch block handles it as a transient steering failure.
+        throw new Error("Could not parse steering response after retry");
     })();
     const isDone = parsed.done === true;
     const waveKind = parsed.waveKind || parsed.action || (isDone ? "done" : "execute");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-overnight",
-  "version": "1.5.1",
+  "version": "1.6.0",
   "description": "Run 10, 100, or 1000 Claude agents overnight. Parallel autonomous AI coding with thinking waves, iterative quality steering, crash recovery, and rate limit handling. Built on the Claude Agent SDK.",
   "type": "module",
   "bin": {