claude-overnight 1.25.7 → 1.25.10

package/dist/_version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "1.25.7";
+export declare const VERSION = "1.25.10";

package/dist/_version.js

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

package/dist/index.js

@@ -318,6 +318,7 @@ async function main() {
     }
     // ── Resume / continue detection ──
     let resuming = false;
+    let replanFromScratch = false;
     let resumeState = null;
     let resumeRunDir;
     let continueObjective;
@@ -460,25 +461,29 @@ async function main() {
                     // thinking spend instead of throwing it away).
                     const designs = readMdDir(join(resumeRunDir, "designs"));
                     if (!designs || !resumeState.objective) {
-                        console.error(chalk.red(`\n  Planning-phase run has no usable tasks.json or designs  -- start Fresh instead.\n`));
-                        process.exit(1);
+                        // Planning died before producing anything — re-run planning from
+                        // scratch while keeping all saved settings (model, budget, etc.).
+                        console.log(chalk.yellow(`\n  ⚠ Planning-phase run has no tasks or designs — will re-plan from scratch.\n`));
+                        replanFromScratch = true;
                     }
-                    const remainingBudget = Math.max(resumeState.concurrency, resumeState.budget - resumeState.accCompleted);
-                    const orchBudget = Math.min(50, Math.max(resumeState.concurrency, Math.ceil(remainingBudget * 0.5)));
-                    const flexNote = `This is wave 1 of an adaptive multi-wave run (total budget: ${remainingBudget}). Plan the highest-impact foundational work first. Future waves will iterate based on what's learned.`;
-                    console.log(chalk.cyan(`\n  ◆ Re-orchestrating plan from existing designs...\n`));
-                    process.stdout.write("\x1B[?25l");
-                    try {
-                        const orchTasks = await orchestrate(resumeState.objective, designs, cwd, resumeState.plannerModel, resumeState.workerModel, resumeState.permissionMode, orchBudget, resumeState.concurrency, makeProgressLog(), flexNote, join(resumeRunDir, "tasks.json"));
-                        resumeState.currentTasks = orchTasks;
-                        process.stdout.write(`\x1B[2K\r  ${chalk.green(`✓ ${orchTasks.length} tasks`)}\n`);
-                    }
-                    catch (err) {
+                    else {
+                        const remainingBudget = Math.max(resumeState.concurrency, resumeState.budget - resumeState.accCompleted);
+                        const orchBudget = Math.min(50, Math.max(resumeState.concurrency, Math.ceil(remainingBudget * 0.5)));
+                        const flexNote = `This is wave 1 of an adaptive multi-wave run (total budget: ${remainingBudget}). Plan the highest-impact foundational work first. Future waves will iterate based on what's learned.`;
+                        console.log(chalk.cyan(`\n  ◆ Re-orchestrating plan from existing designs...\n`));
+                        process.stdout.write("\x1B[?25l");
+                        try {
+                            const orchTasks = await orchestrate(resumeState.objective, designs, cwd, resumeState.plannerModel, resumeState.workerModel, resumeState.permissionMode, orchBudget, resumeState.concurrency, makeProgressLog(), flexNote, join(resumeRunDir, "tasks.json"));
+                            resumeState.currentTasks = orchTasks;
+                            process.stdout.write(`\x1B[2K\r  ${chalk.green(`✓ ${orchTasks.length} tasks`)}\n`);
+                        }
+                        catch (err) {
+                            process.stdout.write("\x1B[?25h");
+                            console.error(chalk.red(`\n  Re-orchestration failed: ${err.message}\n  Start Fresh instead.\n`));
+                            process.exit(1);
+                        }
                         process.stdout.write("\x1B[?25h");
-                        console.error(chalk.red(`\n  Re-orchestration failed: ${err.message}\n  Start Fresh instead.\n`));
-                        process.exit(1);
                     }
-                    process.stdout.write("\x1B[?25h");
                 }
             }
             const unmerged = resumeState.branches.filter(b => b.status === "unmerged").length;
@@ -860,7 +865,7 @@ async function main() {
     if (resuming && resumeRunDir)
         updateLatestSymlink(rootDir, resumeRunDir);
     const previousKnowledge = readPreviousRunKnowledge(rootDir);
-    const needsPlan = tasks.length === 0 && !resuming;
+    const needsPlan = tasks.length === 0 && (!resuming || replanFromScratch);
     const designDir = join(runDir, "designs");
     // Persist an early planning-phase state so the run is visible to the resume
     // picker even if orchestrate dies before executeRun gets a chance to run.
@@ -970,15 +975,16 @@ async function main() {
                     console.log("");
                 }
                 else {
-                    const thinkingTasks = buildThinkingTasks(objective, themes, designDir, plannerModel, previousKnowledge || undefined);
+                    const researchModel = fastModel ? workerModel : plannerModel;
+                    const thinkingTasks = buildThinkingTasks(objective, themes, designDir, researchModel, previousKnowledge || undefined);
                     console.log(chalk.cyan(`\n  ◆ Thinking: ${thinkingTasks.length} agents exploring...\n`));
                     const thinkingSwarm = new Swarm({
-                        tasks: thinkingTasks, concurrency, cwd, model: plannerModel, permissionMode,
+                        tasks: thinkingTasks, concurrency, cwd, model: researchModel, permissionMode,
                         useWorktrees: false, mergeStrategy: "yolo", agentTimeoutMs, usageCap, allowExtraUsage, extraUsageBudget,
                         envForModel,
                         cursorProxy: [plannerProvider, workerProvider, fastProvider].some(p => p && isCursorProxyProvider(p)),
                     });
-                    const thinkRunInfo = { accIn: 0, accOut: 0, accCost: 0, accCompleted: 0, accFailed: 0, sessionsBudget: budget ?? 10, waveNum: -1, remaining: budget ?? 10, model: plannerModel, startedAt: Date.now() };
+                    const thinkRunInfo = { accIn: 0, accOut: 0, accCost: 0, accCompleted: 0, accFailed: 0, sessionsBudget: budget ?? 10, waveNum: -1, remaining: budget ?? 10, model: researchModel, startedAt: Date.now() };
                     const thinkDisplay = new RunDisplay(thinkRunInfo, { remaining: 0, usageCap, concurrency, paused: false, dirty: false });
                     thinkDisplay.setWave(thinkingSwarm);
                     thinkDisplay.start();

package/dist/render.js

@@ -510,6 +510,7 @@ export function renderSummary(swarm) {
     out.push(chalk.gray("  " + "\u2500".repeat(Math.min(w - 4, fixedW + taskW))));
     const groups = [
         swarm.agents.filter(a => a.status === "running"),
+        swarm.agents.filter(a => a.status === "paused"),
         swarm.agents.filter(a => a.status === "done"),
         swarm.agents.filter(a => a.status === "error"),
     ].filter(g => g.length > 0);
@@ -521,7 +522,10 @@ export function renderSummary(swarm) {
         for (const a of groups[gi]) {
             const id = String(a.id).padStart(3);
             const ok = a.status === "done";
-            const status = ok ? chalk.green("\u2713 done") : a.status === "running" ? chalk.blue("~ run ") : chalk.red("\u2717 err ");
+            const status = ok ? chalk.green("\u2713 done")
+                : a.status === "running" ? chalk.blue("~ run ")
+                    : a.status === "paused" ? chalk.yellow("\u23F8 paused")
+                        : chalk.red("\u2717 err ");
             const task = truncate(a.task.prompt, taskW).padEnd(taskW);
             const durMs = a.startedAt != null ? (a.finishedAt ?? Date.now()) - a.startedAt : 0;
             const dur = fmtDur(durMs).padStart(8);
@@ -532,7 +536,7 @@ export function renderSummary(swarm) {
             totalFiles += a.filesChanged ?? 0;
             totalTools += a.toolCalls;
             totalCost += a.costUsd ?? 0;
-            const color = ok ? chalk.white : a.status === "running" ? chalk.blue : chalk.red;
+            const color = ok ? chalk.white : a.status === "running" ? chalk.blue : a.status === "paused" ? chalk.yellow : chalk.red;
             out.push(color(`  ${id}  ${status}  ${task}  ${dur}  ${files}  ${tools}  ${cost}`));
         }
     }
@@ -549,7 +553,8 @@ function fmtRow(a, w, selected = false) {
     const spin = SPINNER[Math.floor(Date.now() / 250) % SPINNER.length];
     const icon = a.status === "running"
         ? (a.blockedAt ? chalk.yellow("\u25CF blk") : chalk.blue(`${spin} run`)) + elapsed
-        : a.status === "done" ? chalk.green("\u2713 done") : chalk.red("\u2717 err ");
+        : a.status === "paused" ? chalk.yellow("\u23F8 paused")
+            : a.status === "done" ? chalk.green("\u2713 done") : chalk.red("\u2717 err ");
     const taskW = Math.max(20, Math.min(36, w - 50));
     const task = truncate(a.task.prompt, taskW).padEnd(taskW);
     let action;
@@ -562,6 +567,10 @@ function fmtRow(a, w, selected = false) {
     else if (a.status === "running") {
         action = chalk.dim(truncate(a.lastText || "...", 24));
     }
+    else if (a.status === "paused") {
+        const dur = fmtDur((Date.now()) - (a.startedAt || Date.now()));
+        action = chalk.yellow(`paused ${dur}`);
+    }
     else if (a.status === "done") {
         const dur = fmtDur((a.finishedAt || Date.now()) - (a.startedAt || Date.now()));
         const cost = a.costUsd != null ? ` $${a.costUsd.toFixed(3)}` : "";

package/dist/swarm.js

@@ -126,6 +126,13 @@ export class Swarm {
             return;
         this.paused = b;
         this.log(-1, b ? "Dispatch paused" : "Dispatch resumed");
+        if (b) {
+            // Instant: interrupt every active SDK session so agents stop mid-turn.
+            // After the interrupt, the for await loop exits, runOnce returns, and
+            // runAgent detects this.paused and re-queues the task with resume info.
+            this.activeQueries.forEach(q => { q.interrupt().catch(() => { }); });
+            this.log(-1, "Pausing agents…");
+        }
     }
     /** Returns the rate-limit window currently holding the swarm back  -- rejected first, then highest utilization. */
     mostConstrainedWindow() {
@@ -232,7 +239,7 @@ export class Swarm {
     abort() {
         this.aborted = true;
         this.queue.length = 0;
-        this.activeQueries.forEach(q => q.close());
+        this.activeQueries.forEach(q => { q.interrupt().catch(() => { }); });
         this.activeQueries.clear();
     }
     /** Re-queue all errored agents' tasks for retry within this wave. */
@@ -431,11 +438,17 @@ export class Swarm {
     }
     // ── Agent execution ──
     async runAgent(task) {
+        // Guard: if pause was triggered between dispatch and here, re-queue immediately.
+        // The worker already shifted this task, so unshift puts it back for resume.
+        if (this.paused) {
+            this.queue.unshift(task);
+            return;
+        }
         const id = this.nextId++;
         const agent = { id, task, status: "running", startedAt: Date.now(), toolCalls: 0 };
         this.agents.push(agent);
-        let agentCwd = task.cwd || this.config.cwd;
-        if (this.config.useWorktrees && this.worktreeBase && !task.noWorktree) {
+        let agentCwd = task.agentCwd || task.cwd || this.config.cwd;
+        if (this.config.useWorktrees && this.worktreeBase && !task.noWorktree && !task.agentCwd) {
             const branch = `swarm/task-${id}`;
             const dir = join(this.worktreeBase, `agent-${id}`);
             let baseRef;
@@ -477,7 +490,8 @@ export class Swarm {
                 this.log(id, `Worktree failed after retry  -- running without isolation`);
             }
         }
-        this.log(id, `Starting: ${task.prompt.slice(0, 60)}`);
+        const isResumed = !!task.resumeSessionId;
+        this.log(id, isResumed ? `Resuming: ${task.prompt.slice(0, 60)}` : `Starting: ${task.prompt.slice(0, 60)}`);
         const maxRetries = this.config.maxRetries ?? 2;
         const inactivityMs = this.config.agentTimeoutMs ?? 15 * 60 * 1000;
         for (let attempt = 0; attempt <= maxRetries; attempt++) {
@@ -491,7 +505,7 @@ export class Swarm {
             }
             try {
                 const perm = this.config.permissionMode ?? "auto";
-                let resumeSessionId;
+                let resumeSessionId = task.resumeSessionId;
                 let resumePrompt = "Continue. Complete the task.";
                 const runOnce = async (isResume) => {
                     const preamble = "Keep files under ~500 lines. If a file would exceed that, split it.\n\n";
@@ -529,6 +543,16 @@ export class Swarm {
                         timer = setTimeout(check, timeoutMs);
                     });
                     this.activeQueries.add(agentQuery);
+                    // Guard: if pause was triggered between runAgent check and here, close the query
+                    // immediately so requeueIfPaused can catch it without running a turn.
+                    if (this.paused) {
+                        this.activeQueries.delete(agentQuery);
+                        try {
+                            agentQuery.close();
+                        }
+                        catch { }
+                        return;
+                    }
                     try {
                         await Promise.race([
                             (async () => {
@@ -553,17 +577,47 @@ export class Swarm {
                         catch { }
                     }
                 };
-                try {
-                    await runOnce(false);
-                }
-                catch (nudgeErr) {
-                    if (nudgeErr instanceof NudgeError && resumeSessionId) {
-                        this.log(id, `Silent ${Math.round(inactivityMs / 60000)}m  -- resuming with continue`);
+                // Helper: re-queue this task with resume info when paused mid-turn.
+                const requeueIfPaused = () => {
+                    if (!this.paused || agent.status !== "running")
+                        return false;
+                    agent.status = "paused";
+                    this.log(id, "Paused mid-task");
+                    if (resumeSessionId) {
+                        this.queue.unshift({ ...task, resumeSessionId, agentCwd });
+                    }
+                    return true;
+                };
+                if (isResumed && resumeSessionId) {
+                    // Resumed task: continue the existing SDK session
+                    try {
                         await runOnce(true);
                     }
-                    else
-                        throw nudgeErr;
+                    catch (nudgeErr) {
+                        if (nudgeErr instanceof NudgeError && resumeSessionId) {
+                            this.log(id, `Silent ${Math.round(inactivityMs / 60000)}m  -- resuming with continue`);
+                            await runOnce(true);
+                        }
+                        else
+                            throw nudgeErr;
+                    }
+                }
+                else {
+                    // Fresh task: start with the task prompt
+                    try {
+                        await runOnce(false);
+                    }
+                    catch (nudgeErr) {
+                        if (nudgeErr instanceof NudgeError && resumeSessionId) {
+                            this.log(id, `Silent ${Math.round(inactivityMs / 60000)}m  -- resuming with continue`);
+                            await runOnce(true);
+                        }
+                        else
+                            throw nudgeErr;
+                    }
                 }
+                if (requeueIfPaused())
+                    return;
                 if (resumeSessionId && agent.status === "running") {
                     try {
                         this.log(id, "Simplify pass");
@@ -574,6 +628,8 @@ export class Swarm {
                         this.log(id, "Simplify pass skipped");
                     }
                 }
+                if (requeueIfPaused())
+                    return;
                 if (agent.status === "running") {
                     agent.finishedAt = Date.now();
                     const duration = agent.finishedAt - (agent.startedAt || agent.finishedAt);

package/dist/types.d.ts

@@ -10,6 +10,10 @@ export interface Task {
     model?: string;
     /** When true, skip worktree isolation  -- run in the real project directory with env files, dependencies, and local config. */
     noWorktree?: boolean;
+    /** SDK session ID to resume from (set when task was paused mid-turn). */
+    resumeSessionId?: string;
+    /** Working directory preserved from a previous run (worktree dir for paused-and-resumed tasks). */
+    agentCwd?: string;
 }
 /** Schema for a JSON task file that defines a batch of work for the swarm. */
 export interface TaskFile {
@@ -45,7 +49,7 @@ export interface TaskFile {
     })[];
 }
 /** Lifecycle status of a single agent. */
-export type AgentStatus = "pending" | "running" | "done" | "error";
+export type AgentStatus = "pending" | "running" | "paused" | "done" | "error";
 /** Live mutable state for one agent, used by the UI and orchestrator. */
 export interface AgentState {
     /** Sequential agent index (0-based), used for display and log correlation. */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-overnight",
-  "version": "1.25.7",
+  "version": "1.25.10",
   "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.25.7",
+  "version": "1.25.10",
   "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"