claude-overnight 1.50.3 → 1.50.5

package/dist/core/_version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "1.50.3";
+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.3";
+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

@@ -207,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")
@@ -253,6 +268,8 @@ export async function executeRun(cfg) {
         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 = () => {

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

@@ -22,6 +22,8 @@ export interface RunStateBase {
     repoFingerprint: string;
     coachedObjective?: string;
     coachedAt?: number;
+    runBranch?: string;
+    originalRef?: string;
 }
 /** Live counters captured at snapshot time. */
 export interface RunStateLive {

package/dist/state/run-state.js

@@ -26,5 +26,7 @@ export function composeRunState(base, live, varying) {
         repoFingerprint: base.repoFingerprint,
         coachedObjective: base.coachedObjective,
         coachedAt: base.coachedAt,
+        runBranch: base.runBranch,
+        originalRef: base.originalRef,
     };
 }

package/dist/state/state.js

@@ -199,7 +199,12 @@ export function saveRunState(runDir, state) {
 }
 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.3",
+  "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.3",
+  "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"