@welluable/orch 1.3.0 → 1.4.0

package/main.js

@@ -10,15 +10,16 @@ import { fileURLToPath } from 'url';
 import { AgentCursor } from './lib/agent-cursor.js';
 import { AgentClaude } from './lib/agent-claude.js';
 import { AgentAgn } from './lib/agent-agn.js';
+import { AgentOpencode } from './lib/agent-opencode.js';
 import { parseTriageJson } from './lib/parse-triage-json.js';
 import { parseVerdict } from './lib/parse-verdict.js';
-import { splitStageSummary, printStageSummary } from './lib/stage-summary.js';
+import { splitStageSummary, printStageSummary, resolveStageSummary } from './lib/stage-summary.js';
 import { createRunContext } from './lib/run-context.js';
 import { createWorktree } from './lib/worktree.js';
 import { commitWorktree, collectWorktreeChanges, printFilesChanged } from './lib/commit.js';
 import { FileTracker } from './lib/file-tracker.js';
 import { allocateJob } from './lib/job-lifecycle.js';
-import { setJobSlug, exitCodeForSignal, formatElapsed } from './lib/agent.js';
+import { setJobSlug, exitCodeForSignal, formatElapsed, flushFailureLog, beginStageCapture } from './lib/agent.js';
 import {
     jobPaths,
     readJob,
@@ -32,6 +33,7 @@ import {
     cascadeResume,
     stopJob,
     cleanJobs,
+    liveSlugsBlockingClean,
     isPidAlive,
     reopenJob,
     buildLastOutcome,
@@ -41,6 +43,11 @@ import {
     snapshotPriorOutcome,
     buildPriorOutcomeText,
 } from './lib/continue.js';
+import {
+    validateResume,
+    reopenForResume,
+    runRecover,
+} from './lib/resume.js';
 import { askAgentArgs } from './agents/ask.js';
 import { triageAgentArgs } from './agents/triage.js';
 import { quickFixAgentArgs } from './agents/quick-fix.js';
@@ -53,6 +60,8 @@ import { testRunnerAgentArgs } from './agents/test-runner.js';
 import { integratorAgentArgs } from './agents/integrator.js';
 import { boundariesAgentArgs } from './agents/boundaries.js';
 import { decomposerAgentArgs } from './agents/decomposer.js';
+import { seqDecomposerAgentArgs } from './agents/seq-decomposer.js';
+import { adjustAgentArgs } from './agents/adjust.js';
 import {
     readFanout,
     writeFanout,
@@ -67,6 +76,17 @@ import {
     detectOverlaps,
     ensureScaffoldSubtask,
 } from './lib/fanout.js';
+import {
+    readSeq,
+    writeSeq,
+    patchUnit,
+    patchTip,
+    appendAdjustment,
+    validateSeqDecomposition,
+    buildUnitEnvelope,
+    validateAdjustResult,
+    applyAdjustResult,
+} from './lib/seq.js';
 import { parseDecomposition } from './lib/parse-decomposition.js';
 import {
     mergeBranches,
@@ -76,11 +96,13 @@ import {
 } from './lib/integrate.js';
 import {
     resolveAgent,
+    resolveNotify,
     writeConfig,
     printConfig,
     globalConfigPath,
     localConfigPath,
 } from './lib/config.js';
+import { setNotifyEnabled } from './lib/notify.js';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
@@ -105,6 +127,12 @@ const AGENT_BACKENDS = {
         binary: 'agn',
         missingHint: 'agn not found; run npm install -g @welluable/agn-cli or use --agent cursor',
     },
+    opencode: {
+        AgentClass: AgentOpencode,
+        binary: 'opencode',
+        missingHint:
+            'opencode not found; install OpenCode (https://opencode.ai) or use --agent cursor',
+    },
 };
 
 function isBinaryOnPath(binary) {
@@ -187,9 +215,9 @@ export function formatJobsTable(jobs) {
     }
 
     const rows = ordered.map(({ job, indent }) => [
-        `${indent}${job.slug}`,
+        `${indent}${job.slug ?? '-'}`,
         displayJobRole(job.role),
-        job.state,
+        job.state ?? '-',
         job.phase ?? '-',
         job.agent ?? '-',
         formatRelativeTime(job.startedAt),
@@ -206,6 +234,21 @@ function lastNonEmptyLine(content) {
     return lines[lines.length - 1];
 }
 
+/** Status / list `next:` hint per `.spec/resume.md` decision 28. */
+function nextHintForRecord(record) {
+    if (!record) return null;
+    if (record.state === 'paused' || record.state === 'pausing') {
+        return `orch resume ${record.slug}`;
+    }
+    if (record.state === 'failed' || record.state === 'stopped' || record.state === 'crashed') {
+        return `orch resume ${record.slug}`;
+    }
+    if (record.state === 'done') {
+        return `orch continue ${record.slug} "<follow-up>"`;
+    }
+    return null;
+}
+
 export function formatStatus(cwd, record) {
     const lines = [
         `slug:     ${record.slug}`,
@@ -243,6 +286,9 @@ export function formatStatus(cwd, record) {
         if (last) lines.push(`status:   ${last}`);
     }
 
+    const nextHint = nextHintForRecord(record);
+    if (nextHint) lines.push(`next:     ${nextHint}`);
+
     // Child view: parent line only — do not expand siblings.
     // Read children from disk without reconcile so status reflects recorded
     // state/phase/branch (listJobs would rewrite dead-pid live states to crashed).
@@ -303,8 +349,24 @@ function defaultExecFile(command, args, options = {}) {
 
 /** Patch a job to a terminal state and write a matching `lastOutcome` in the same write. */
 function patchTerminalJob(patchJobFn, jobCwd, jobSlug, { state, exitCode, summary = '', error = null, task }) {
-    if (!jobSlug) return;
+    if (!jobSlug) return null;
     const finishedAt = new Date().toISOString();
+    let outcomeError = error;
+    if (state === 'failed') {
+        const pointer = flushFailureLog({
+            cwd: jobCwd,
+            slug: jobSlug,
+            state,
+            exitCode,
+            finishedAt,
+            task,
+            error,
+        });
+        if (pointer) {
+            outcomeError = pointer;
+            console.error(`error:    ${pointer}`);
+        }
+    }
     patchJobFn(jobCwd, jobSlug, (current) => ({
         state,
         exitCode,
@@ -318,9 +380,23 @@ function patchTerminalJob(patchJobFn, jobCwd, jobSlug, { state, exitCode, summar
             finishedAt,
             task: task ?? current.task,
             summary,
-            error,
+            error: outcomeError,
         }),
     }));
+    return outcomeError;
+}
+
+/** Patch live cursor fields and start stage-verbose capture when a job is active. */
+function patchJobCursor(patchJobFn, jobCwd, jobSlug, fields) {
+    if (!jobSlug) return;
+    if ('phase' in fields || 'stage' in fields) {
+        beginStageCapture({
+            phase: fields.phase ?? null,
+            stage: fields.stage ?? null,
+            round: 'round' in fields ? fields.round : null,
+        });
+    }
+    return patchJobFn(jobCwd, jobSlug, fields);
 }
 
 /** The test-writer ⇄ test-critic loop shared by `runPipeline` and `runWorkerPipeline`. */
@@ -335,13 +411,17 @@ async function runTestLoop({
     verbose,
     jobPatch,
     jobCheckpoint,
+    startAt = null,
 }) {
     let testAccepted = null;
     let criticFeedback = null;
     let testRound = 0;
     let testSummary = '';
 
-    for (let round = 1; round <= maxRounds; round++) {
+    // Resume at recorded round; always re-run writer for that round (need output for critic).
+    const startRound = Math.max(1, Number(startAt?.round) || 1);
+
+    for (let round = startRound; round <= maxRounds; round++) {
         testRound = round;
 
         jobPatch({ phase: 'test-loop', stage: 'test-writer', round });
@@ -367,7 +447,7 @@ async function runTestLoop({
         const { content: testWriterContent, summary: testWriterSummary } = splitStageSummary(testOut.result);
         printStageSummary(
             roundLabel('test-writer', round, maxRounds),
-            testWriterSummary,
+            resolveStageSummary(roundLabel('test-writer', round, maxRounds), testWriterSummary, testWriterContent),
             testWriterTracker.getFiles(),
         );
         if (!testOut.ok) {
@@ -400,7 +480,10 @@ async function runTestLoop({
         const criticOut = await testCritic.run({ verbose });
         await jobCheckpoint();
         const { content: testCriticContent, summary: testCriticSummary } = splitStageSummary(criticOut.result);
-        printStageSummary(roundLabel('test-critic', round, maxRounds), testCriticSummary);
+        printStageSummary(
+            roundLabel('test-critic', round, maxRounds),
+            resolveStageSummary(roundLabel('test-critic', round, maxRounds), testCriticSummary, testCriticContent),
+        );
         if (!criticOut.ok) {
             appendLoopStatus(statusPath, 'Test loop', {
                 round: testRound,
@@ -454,6 +537,7 @@ async function runCodeLoop({
     acceptedVerification,
     runnerFirst = false,
     loopTitle = 'Code loop',
+    startAt = null,
 }) {
     let codeAccepted = null;
     let runnerFeedback = null;
@@ -461,9 +545,14 @@ async function runCodeLoop({
     let codeSummary = '';
     let codeWriterContent = null;
 
-    for (let round = 1; round <= maxRounds; round++) {
+    const startRound = Math.max(1, Number(startAt?.round) || 1);
+    // When resuming at test-runner, skip writer once for that round (runner-first style).
+    let resumeSkipWriter = startAt?.stage === 'test-runner';
+
+    for (let round = startRound; round <= maxRounds; round++) {
         codeRound = round;
-        const skipWriter = runnerFirst && round === 1;
+        const skipWriter = (runnerFirst && round === 1) || (resumeSkipWriter && round === startRound);
+        if (resumeSkipWriter && round === startRound) resumeSkipWriter = false;
 
         if (!skipWriter) {
             jobPatch({ phase: 'code-loop', stage: 'code-writer', round });
@@ -492,7 +581,7 @@ async function runCodeLoop({
             codeWriterContent = content;
             printStageSummary(
                 roundLabel('code-writer', round, maxRounds),
-                summary,
+                resolveStageSummary(roundLabel('code-writer', round, maxRounds), summary, content),
                 codeWriterTracker.getFiles(),
             );
             if (!codeOut.ok) {
@@ -525,7 +614,10 @@ async function runCodeLoop({
         const runnerOut = await testRunner.run({ verbose });
         await jobCheckpoint();
         const { content: testRunnerContent, summary: testRunnerSummary } = splitStageSummary(runnerOut.result);
-        printStageSummary(roundLabel('test-runner', round, maxRounds), testRunnerSummary);
+        printStageSummary(
+            roundLabel('test-runner', round, maxRounds),
+            resolveStageSummary(roundLabel('test-runner', round, maxRounds), testRunnerSummary, testRunnerContent),
+        );
         if (!runnerOut.ok) {
             appendLoopStatus(statusPath, loopTitle, {
                 round: codeRound,
@@ -582,7 +674,7 @@ export async function runPipeline(prompt, options) {
 
     const jobPatch = (fields) => {
         if (!jobSlug) return;
-        patchJobFn(jobCwd, jobSlug, fields);
+        return patchJobCursor(patchJobFn, jobCwd, jobSlug, fields);
     };
     const jobCheckpoint = async () => {
         if (!jobSlug) return;
@@ -621,7 +713,7 @@ export async function runPipeline(prompt, options) {
                 return;
             }
             const { content, summary } = splitStageSummary(askResult.result);
-            printStageSummary('ask', summary);
+            printStageSummary('ask', resolveStageSummary('ask', summary, content));
             console.log(content);
             jobPatch({ state: 'done', exitCode: 0, finishedAt: new Date().toISOString() });
         } catch (err) {
@@ -651,8 +743,8 @@ export async function runPipeline(prompt, options) {
                 process.exit(1);
                 return;
             }
-            const { summary: quickFixSummary } = splitStageSummary(quickFixResult.result);
-            printStageSummary('quick-fix', quickFixSummary, quickFixTracker.getFiles());
+            const { content: quickFixContent, summary: quickFixSummary } = splitStageSummary(quickFixResult.result);
+            printStageSummary('quick-fix', resolveStageSummary('quick-fix', quickFixSummary, quickFixContent), quickFixTracker.getFiles());
             jobPatch({ state: 'done', exitCode: 0, finishedAt: new Date().toISOString() });
         } catch (err) {
             console.error(`Error: ${err.message}`);
@@ -676,7 +768,7 @@ export async function runPipeline(prompt, options) {
         const triageResult = await triageAgent.run({ verbose });
         await jobCheckpoint();
         const { content: triageContent, summary: triageSummary } = splitStageSummary(triageResult.result);
-        printStageSummary('triage', triageSummary);
+        printStageSummary('triage', resolveStageSummary('triage', triageSummary, triageContent));
         const parsed = parseTriageJson(triageContent);
 
         if (parsed?.simple === true) {
@@ -696,8 +788,8 @@ export async function runPipeline(prompt, options) {
 
             const quickFixResult = await quickFixAgent.run({ verbose });
             await jobCheckpoint();
-            const { summary: quickFixSummary } = splitStageSummary(quickFixResult.result);
-            printStageSummary('quick-fix', quickFixSummary, quickFixTracker.getFiles());
+            const { content: quickFixContent, summary: quickFixSummary } = splitStageSummary(quickFixResult.result);
+            printStageSummary('quick-fix', resolveStageSummary('quick-fix', quickFixSummary, quickFixContent), quickFixTracker.getFiles());
             jobPatch({ state: 'done', exitCode: 0, finishedAt: new Date().toISOString() });
             return;
         }
@@ -723,7 +815,7 @@ export async function runPipeline(prompt, options) {
         const result = await researchAgent.run({ verbose });
         await jobCheckpoint();
         const { content: researchContent, summary: researchSummary } = splitStageSummary(result.result);
-        printStageSummary('research', researchSummary);
+        printStageSummary('research', resolveStageSummary('research', researchSummary, researchContent));
 
         jobPatch({ phase: 'plan', stage: 'planner', round: null });
         const planner = plannerAgentArgs({
@@ -742,8 +834,8 @@ export async function runPipeline(prompt, options) {
 
         const plannerResult = await plannerAgent.run({ verbose });
         await jobCheckpoint();
-        const { summary: plannerSummary } = splitStageSummary(plannerResult.result);
-        printStageSummary('planner', plannerSummary);
+        const { content: plannerContent, summary: plannerSummary } = splitStageSummary(plannerResult.result);
+        printStageSummary('planner', resolveStageSummary('planner', plannerSummary, plannerContent));
 
         jobPatch({ phase: 'worktree', stage: 'worktree', round: null });
         const worktree = createWorktreeFn({ cwd: invocationCwd, slug: runContext.slug });
@@ -841,7 +933,7 @@ export async function runPipeline(prompt, options) {
                 // Best-effort: don't let a job-state write failure mask the real error.
             }
         }
-        console.error(`next:   orch continue ${jobSlug ?? '<slug>'} "fix the failure and finish"`);
+        console.error(`next:   orch resume ${jobSlug ?? '<slug>'}`);
         process.exit(1);
     }
 }
@@ -859,6 +951,9 @@ export async function runDetached(prompt, options = {}) {
         maxRounds = 5,
         verbose,
         cwd = process.cwd(),
+        seq = false,
+        maxUnits = 8,
+        notify,
         createRunContext: createRunContextFn = createRunContext,
         spawn: spawnFn = spawn,
         exit = (code) => process.exit(code),
@@ -882,6 +977,7 @@ export async function runDetached(prompt, options = {}) {
         maxRounds,
         state: 'starting',
         createRunContext: createRunContextFn,
+        role: seq ? 'coordinator' : null,
     });
     const { logPath } = jobPaths(cwd, slug);
 
@@ -889,6 +985,10 @@ export async function runDetached(prompt, options = {}) {
 
     const childArgs = [__filename, prompt, '--agent', agent, '--max-rounds', String(maxRounds)];
     if (verbose) childArgs.push('--verbose');
+    if (seq) {
+        childArgs.push('--seq', '--max-units', String(maxUnits));
+    }
+    appendNotifyArgs(childArgs, notify);
 
     const child = spawnFn(process.execPath, childArgs, {
         cwd,
@@ -920,11 +1020,6 @@ export async function runContinuePipeline(prompt, options = {}) {
     const cwd = options.cwd ?? process.cwd();
     const {
         slug,
-        worktreePath,
-        branch,
-        role,
-        parentSlug,
-        workerId,
         priorOutcome,
         continuation,
     } = options;
@@ -942,9 +1037,16 @@ export async function runContinuePipeline(prompt, options = {}) {
     const checkpointPauseFn = options.checkpointPause ?? checkpointPause;
     const pausePollIntervalMs = options.pausePollIntervalMs ?? 500;
 
+    const jobRecord = (jobSlug && readJob(jobCwd, jobSlug)) || null;
+    const worktreePath = options.worktreePath ?? jobRecord?.worktree;
+    const branch = options.branch ?? jobRecord?.branch;
+    const role = options.role ?? jobRecord?.role;
+    const parentSlug = options.parentSlug ?? jobRecord?.parent;
+    const workerId = options.workerId ?? jobRecord?.workerId;
+
     const jobPatch = (fields) => {
         if (!jobSlug) return;
-        patchJobFn(jobCwd, jobSlug, fields);
+        return patchJobCursor(patchJobFn, jobCwd, jobSlug, fields);
     };
     const jobCheckpoint = async () => {
         if (!jobSlug) return;
@@ -1002,7 +1104,7 @@ export async function runContinuePipeline(prompt, options = {}) {
         const researchResult = await researchAgent.run({ verbose });
         await jobCheckpoint();
         const { content: researchContent, summary: researchSummary } = splitStageSummary(researchResult.result);
-        printStageSummary('research', researchSummary);
+        printStageSummary('research', resolveStageSummary('research', researchSummary, researchContent));
 
         jobPatch({ phase: 'plan', stage: 'planner', round: null });
         const planner = plannerAgentArgs({
@@ -1020,8 +1122,8 @@ export async function runContinuePipeline(prompt, options = {}) {
         );
         const plannerResult = await plannerAgent.run({ verbose });
         await jobCheckpoint();
-        const { summary: plannerSummary } = splitStageSummary(plannerResult.result);
-        printStageSummary('planner', plannerSummary);
+        const { content: plannerContent, summary: plannerSummary } = splitStageSummary(plannerResult.result);
+        printStageSummary('planner', resolveStageSummary('planner', plannerSummary, plannerContent));
 
         const testAccepted = await runTestLoop({
             prompt,
@@ -1056,9 +1158,9 @@ export async function runContinuePipeline(prompt, options = {}) {
 
         jobPatch({ phase: 'commit', stage: 'commit', round: null });
         const message = `orch: ${slug} (continue ${continuation}): ${prompt.split('\n')[0]}`;
-        const worktreeChanges = collectWorktreeChangesFn({ worktreePath });
+        const worktreeChanges = await collectWorktreeChangesFn({ worktreePath });
         printFilesChanged(worktreeChanges);
-        const commitResult = commitWorktreeFn({
+        const commitResult = await commitWorktreeFn({
             worktreePath,
             branch,
             message,
@@ -1091,7 +1193,17 @@ export async function runContinuePipeline(prompt, options = {}) {
             } catch {
                 // Best-effort.
             }
-            if (commitResult.committed) {
+            const seqDoc = readSeq(cwd, parentSlug);
+            if (seqDoc) {
+                const patchUnitFn = options.patchUnit ?? patchUnit;
+                patchUnitFn(cwd, parentSlug, workerId, {
+                    state: 'done',
+                    sha: commitResult.sha,
+                    changedFiles,
+                    slug,
+                });
+                console.log(`next:   orch --seq-continue ${parentSlug}`);
+            } else if (commitResult.committed) {
                 patchWorkerFn(cwd, parentSlug, workerId, {
                     state: 'done',
                     sha: commitResult.sha,
@@ -1112,7 +1224,13 @@ export async function runContinuePipeline(prompt, options = {}) {
         console.error(`Error: ${err.message}`);
         if (role === 'worker' && parentSlug && workerId) {
             try {
-                patchWorkerFn(cwd, parentSlug, workerId, { state: 'failed' });
+                const seqDoc = readSeq(cwd, parentSlug);
+                if (seqDoc) {
+                    const patchUnitFn = options.patchUnit ?? patchUnit;
+                    patchUnitFn(cwd, parentSlug, workerId, { state: 'failed' });
+                } else {
+                    patchWorkerFn(cwd, parentSlug, workerId, { state: 'failed' });
+                }
             } catch {
                 // Best-effort.
             }
@@ -1188,6 +1306,7 @@ export async function runContinueDetached(slug, prompt, options = {}) {
         String(maxRounds),
     ];
     if (verbose) childArgs.push('--verbose');
+    appendNotifyArgs(childArgs, options.notify);
 
     const child = spawnFn(process.execPath, childArgs, {
         cwd,
@@ -1210,14 +1329,10 @@ export async function runContinueDetached(slug, prompt, options = {}) {
 }
 
 /**
- * The `--worker <parent>:<workerId>` driver: skips triage and runs research → planner →
- * worktree (from the fan-out's recorded `base`) → test loop → code loop (writer-first) →
- * commit, exactly like `runPipeline` minus triage. `prompt` is the worker's subtask text
- * with the envelope already appended by the CLI wiring. On success, patches the parent's
- * `fanout.json.workers[]` entry to `state:'done'` with `sha`/`changedFiles`; on failure,
- * patches it (and this job's own `run.json`) to `state:'failed'` before exiting non-zero.
+ * Failure-resume pipeline: recover → re-enter unfinished stage → remaining phases.
+ * Distinct from `runContinuePipeline` (new-task continue). See `.spec/resume.md`.
  */
-export async function runWorkerPipeline(prompt, options = {}) {
+export async function runResumePipeline(options = {}) {
     const verbose = Boolean(options.verbose);
     const maxRounds = options.maxRounds ?? 5;
     const backend = AGENT_BACKENDS[options.agent];
@@ -1226,7 +1341,11 @@ export async function runWorkerPipeline(prompt, options = {}) {
     }
     const AgentClass = options.AgentClass ?? backend.AgentClass;
     const cwd = options.cwd ?? process.cwd();
-    const { parentSlug, workerId, base } = options;
+    const {
+        slug,
+        priorOutcome,
+        recoverBrief = '',
+    } = options;
 
     const createRunContextFn = options.createRunContext ?? createRunContext;
     const createWorktreeFn = options.createWorktree ?? createWorktree;
@@ -1236,15 +1355,23 @@ export async function runWorkerPipeline(prompt, options = {}) {
     const recordChangedFilesFn = options.recordChangedFiles ?? recordChangedFiles;
     const execFileFn = options.execFile;
 
-    const jobSlug = options.jobSlug ?? process.env.ORCH_JOB_SLUG;
+    const jobSlug = options.jobSlug ?? slug ?? process.env.ORCH_JOB_SLUG;
     const jobCwd = options.jobCwd ?? cwd;
     const patchJobFn = options.patchJob ?? patchJob;
     const checkpointPauseFn = options.checkpointPause ?? checkpointPause;
     const pausePollIntervalMs = options.pausePollIntervalMs ?? 500;
 
+    const jobRecord = (jobSlug && readJob(jobCwd, jobSlug)) || null;
+    const worktreePath = options.worktreePath ?? jobRecord?.worktree;
+    const branch = options.branch ?? jobRecord?.branch;
+    const role = options.role ?? jobRecord?.role;
+    const parentSlug = options.parentSlug ?? jobRecord?.parent;
+    const workerId = options.workerId ?? jobRecord?.workerId;
+    const prompt = options.prompt ?? jobRecord?.task ?? priorOutcome?.task ?? '';
+
     const jobPatch = (fields) => {
         if (!jobSlug) return;
-        patchJobFn(jobCwd, jobSlug, fields);
+        return patchJobCursor(patchJobFn, jobCwd, jobSlug, fields);
     };
     const jobCheckpoint = async () => {
         if (!jobSlug) return;
@@ -1255,136 +1382,280 @@ export async function runWorkerPipeline(prompt, options = {}) {
         ensureBinaryOnPath(backend.binary, options.agent);
     }
 
+    const prior = priorOutcome ?? {};
+    const phase = prior.phase ?? jobRecord?.phase ?? null;
+    const stage = prior.stage ?? jobRecord?.stage ?? null;
+    const round = prior.round ?? jobRecord?.round ?? null;
+
+    const withRecover = (basePrompt) => (
+        recoverBrief ? `${recoverBrief}\n\n${basePrompt}` : basePrompt
+    );
+
     try {
-        const runContext = createRunContextFn(jobSlug ? { cwd, slug: jobSlug } : { cwd });
+        const runContext = createRunContextFn({ cwd, slug: jobSlug });
+        fs.mkdirSync(path.dirname(runContext.statusPath), { recursive: true });
 
-        jobPatch({ phase: 'research', stage: 'research', round: null });
-        const research = researchAgentArgs({ prompt, cwd, researchPath: runContext.researchPath });
-        const researchAgent = new AgentClass(
-            research.name,
-            research.instructions,
-            research.prompt,
-            research.options,
-        );
-        const researchResult = await researchAgent.run({ verbose });
-        await jobCheckpoint();
-        const { content: researchContent, summary: researchSummary } = splitStageSummary(researchResult.result);
-        printStageSummary('research', researchSummary);
+        const resumeSection = [
+            '',
+            '## Resume',
+            '',
+            `- Started: ${new Date().toISOString()}`,
+            `- Prior state: ${prior.state ?? '(none)'}`,
+            `- Reentry: ${phase ?? '-'}/${stage ?? '-'} (round ${round ?? '-'})`,
+            `- Branch: \`${branch}\``,
+            `- Worktree: \`${worktreePath}\``,
+            '',
+        ].join('\n');
+        fs.appendFileSync(runContext.statusPath, resumeSection);
+
+        const hasResearch = fs.existsSync(runContext.researchPath);
+        const hasTask = fs.existsSync(runContext.taskPath);
+        const skipEarly = ['worktree', 'test-loop', 'code-loop', 'commit'].includes(phase)
+            && hasResearch && hasTask;
+
+        let liveWorktree = worktreePath;
+        let liveBranch = branch;
+        let researchContent = hasResearch
+            ? fs.readFileSync(runContext.researchPath, 'utf8')
+            : '';
+
+        // --- research (only when cursor is research, or early artifacts missing) ---
+        if (phase === 'research' || (!skipEarly && !hasResearch && ['research', 'plan', null].includes(phase))) {
+            jobPatch({ phase: 'research', stage: 'research', round: null });
+            const research = researchAgentArgs({
+                prompt: withRecover(prompt),
+                cwd: liveWorktree || cwd,
+                researchPath: runContext.researchPath,
+            });
+            const researchAgent = new AgentClass(
+                research.name,
+                research.instructions,
+                research.prompt,
+                research.options,
+            );
+            const researchResult = await researchAgent.run({ verbose });
+            await jobCheckpoint();
+            const split = splitStageSummary(researchResult.result);
+            researchContent = split.content;
+            printStageSummary('research', resolveStageSummary('research', split.summary, researchContent));
+        }
 
-        jobPatch({ phase: 'plan', stage: 'planner', round: null });
-        const planner = plannerAgentArgs({
-            prompt,
-            cwd,
-            researchPath: runContext.researchPath,
-            taskPath: runContext.taskPath,
-            researchOutput: researchContent,
-        });
-        const plannerAgent = new AgentClass(
-            planner.name,
-            planner.instructions,
-            planner.prompt,
-            planner.options,
-        );
-        const plannerResult = await plannerAgent.run({ verbose });
-        await jobCheckpoint();
-        const { summary: plannerSummary } = splitStageSummary(plannerResult.result);
-        printStageSummary('planner', plannerSummary);
+        // --- plan ---
+        if (phase === 'plan' || phase === 'research' || (!skipEarly && !hasTask)) {
+            jobPatch({ phase: 'plan', stage: 'planner', round: null });
+            const plannerPrompt = phase === 'plan' ? withRecover(prompt) : prompt;
+            const researchOut = researchContent
+                || (hasResearch ? fs.readFileSync(runContext.researchPath, 'utf8') : '');
+            const planner = plannerAgentArgs({
+                prompt: plannerPrompt,
+                cwd: liveWorktree || cwd,
+                researchPath: runContext.researchPath,
+                taskPath: runContext.taskPath,
+                researchOutput: researchOut,
+            });
+            const plannerAgent = new AgentClass(
+                planner.name,
+                planner.instructions,
+                planner.prompt,
+                planner.options,
+            );
+            const plannerResult = await plannerAgent.run({ verbose });
+            await jobCheckpoint();
+            const { content: plannerContent, summary: plannerSummary } = splitStageSummary(plannerResult.result);
+            printStageSummary('planner', resolveStageSummary('planner', plannerSummary, plannerContent));
+        }
 
-        jobPatch({ phase: 'worktree', stage: 'worktree', round: null });
-        const worktree = createWorktreeFn({ cwd, slug: runContext.slug, base });
-        jobPatch({ branch: worktree.branch, worktree: worktree.worktreePath });
+        // --- worktree ensure ---
+        if (!liveWorktree || !fs.existsSync(liveWorktree) || phase === 'worktree') {
+            if (liveWorktree && fs.existsSync(liveWorktree) && liveBranch) {
+                jobPatch({ phase: 'worktree', stage: 'worktree', round: null, branch: liveBranch, worktree: liveWorktree });
+            } else {
+                jobPatch({ phase: 'worktree', stage: 'worktree', round: null });
+                const wt = createWorktreeFn({ cwd, slug: jobSlug });
+                liveWorktree = wt.worktreePath;
+                liveBranch = wt.branch;
+                jobPatch({ branch: liveBranch, worktree: liveWorktree });
+            }
+        }
 
-        fs.mkdirSync(path.dirname(runContext.statusPath), { recursive: true });
-        fs.writeFileSync(
-            runContext.statusPath,
-            `# Status\n\n- Slug: \`${runContext.slug}\`\n- Branch: \`${worktree.branch}\`\n- Worktree: \`${worktree.worktreePath}\`\n- Parent: \`${parentSlug}\`\n- Worker: \`${workerId}\`\n`,
-        );
+        let acceptedVerification = '';
+        const enterTest = !phase || ['research', 'plan', 'worktree', 'test-loop'].includes(phase);
+        const enterCode = !phase || ['research', 'plan', 'worktree', 'test-loop', 'code-loop'].includes(phase);
+        const enterCommit = true;
 
-        const testAccepted = await runTestLoop({
-            prompt,
-            worktreePath: worktree.worktreePath,
-            branch: worktree.branch,
-            taskPath: runContext.taskPath,
-            statusPath: runContext.statusPath,
-            maxRounds,
-            AgentClass,
-            verbose,
-            jobPatch,
-            jobCheckpoint,
-        });
+        if (enterTest && phase !== 'code-loop' && phase !== 'commit') {
+            const testStartAt = phase === 'test-loop'
+                ? { stage: stage ?? 'test-writer', round: round ?? 1 }
+                : null;
+            const testPrompt = phase === 'test-loop' ? withRecover(prompt) : prompt;
+            const testAccepted = await runTestLoop({
+                prompt: testPrompt,
+                worktreePath: liveWorktree,
+                branch: liveBranch,
+                taskPath: runContext.taskPath,
+                statusPath: runContext.statusPath,
+                maxRounds,
+                AgentClass,
+                verbose,
+                jobPatch,
+                jobCheckpoint,
+                startAt: testStartAt,
+            });
+            acceptedVerification = [testAccepted.verdict.summary, testAccepted.writerContent]
+                .filter(Boolean)
+                .join('\n');
+        } else if (hasTask) {
+            // Code-loop / commit reentry: best-effort verification from task.md
+            acceptedVerification = fs.readFileSync(runContext.taskPath, 'utf8').slice(0, 2000);
+        }
 
-        const acceptedVerification = [testAccepted.verdict.summary, testAccepted.writerContent]
-            .filter(Boolean)
-            .join('\n');
+        if (enterCode && phase !== 'commit') {
+            const codeStartAt = phase === 'code-loop'
+                ? { stage: stage ?? 'code-writer', round: round ?? 1 }
+                : null;
+            const codePrompt = phase === 'code-loop' ? withRecover(prompt) : prompt;
+            const codeAccepted = await runCodeLoop({
+                prompt: codePrompt,
+                worktreePath: liveWorktree,
+                branch: liveBranch,
+                taskPath: runContext.taskPath,
+                statusPath: runContext.statusPath,
+                maxRounds,
+                AgentClass,
+                verbose,
+                jobPatch,
+                jobCheckpoint,
+                acceptedVerification,
+                startAt: codeStartAt,
+            });
 
-        const codeAccepted = await runCodeLoop({
-            prompt,
-            worktreePath: worktree.worktreePath,
-            branch: worktree.branch,
-            taskPath: runContext.taskPath,
-            statusPath: runContext.statusPath,
-            maxRounds,
-            AgentClass,
-            verbose,
-            jobPatch,
-            jobCheckpoint,
-            acceptedVerification,
-        });
+            if (enterCommit) {
+                jobPatch({ phase: 'commit', stage: 'commit', round: null });
+                const message = `orch: ${jobSlug} (resume): ${String(prompt).split('\n')[0]}`;
+                const worktreeChanges = await collectWorktreeChangesFn({ worktreePath: liveWorktree });
+                printFilesChanged(worktreeChanges);
+                const commitResult = await commitWorktreeFn({
+                    worktreePath: liveWorktree,
+                    branch: liveBranch,
+                    message,
+                });
 
-        jobPatch({ phase: 'commit', stage: 'commit', round: null });
-        const message = `orch: ${runContext.slug} ${prompt.split('\n')[0]}`;
-        const worktreeChanges = collectWorktreeChangesFn({ worktreePath: worktree.worktreePath });
-        printFilesChanged(worktreeChanges);
-        const commitResult = commitWorktreeFn({
-            worktreePath: worktree.worktreePath,
-            branch: worktree.branch,
-            message,
-        });
+                if (commitResult.committed) {
+                    fs.appendFileSync(
+                        runContext.statusPath,
+                        `\n## Commit\n\n- SHA: \`${commitResult.sha}\`\n- Branch: \`${commitResult.branch}\`\n`,
+                    );
+                    console.log(`commit: ${commitResult.sha.slice(0, 7)} on ${commitResult.branch}`);
+                    console.log(`merge:  git merge ${commitResult.branch}`);
+                    console.log(`next:   orch continue ${jobSlug} "…"`);
+                } else {
+                    fs.appendFileSync(
+                        runContext.statusPath,
+                        `\n## Commit\n\n- No changes to commit on \`${commitResult.branch}\`.\n`,
+                    );
+                    console.log(`commit: no changes on ${commitResult.branch}`);
+                }
 
-        if (commitResult.committed) {
-            fs.appendFileSync(
-                runContext.statusPath,
-                `\n## Commit\n\n- SHA: \`${commitResult.sha}\`\n- Branch: \`${commitResult.branch}\`\n`,
-            );
-            console.log(`commit: ${commitResult.sha.slice(0, 7)} on ${commitResult.branch}`);
-        } else {
-            fs.appendFileSync(
-                runContext.statusPath,
-                `\n## Commit\n\n- No changes to commit on \`${commitResult.branch}\`.\n`,
-            );
-            console.log(`commit: no changes on ${commitResult.branch}`);
+                if (role === 'worker' && parentSlug && workerId) {
+                    let changedFiles = [];
+                    try {
+                        changedFiles = recordChangedFilesFn({
+                            repoRoot: cwd,
+                            base: undefined,
+                            branch: liveBranch,
+                            execFile: execFileFn,
+                        });
+                    } catch {
+                        // Best-effort.
+                    }
+                    const seqDoc = readSeq(cwd, parentSlug);
+                    if (seqDoc) {
+                        const patchUnitFn = options.patchUnit ?? patchUnit;
+                        patchUnitFn(cwd, parentSlug, workerId, {
+                            state: 'done',
+                            sha: commitResult.sha,
+                            changedFiles,
+                            slug: jobSlug,
+                        });
+                        console.log(`next:   orch --seq-continue ${parentSlug}`);
+                    } else if (commitResult.committed) {
+                        patchWorkerFn(cwd, parentSlug, workerId, {
+                            state: 'done',
+                            sha: commitResult.sha,
+                            changedFiles,
+                        });
+                        console.log(`next:   orch --integrate ${parentSlug}`);
+                    }
+                }
+
+                patchTerminalJob(patchJobFn, jobCwd, jobSlug, {
+                    state: 'done',
+                    exitCode: 0,
+                    summary: codeAccepted?.verdict?.summary ?? '',
+                    error: null,
+                    task: prompt,
+                });
+            }
+            return;
         }
 
-        let changedFiles = [];
-        try {
-            changedFiles = recordChangedFilesFn({
-                repoRoot: worktree.repoRoot,
-                base,
-                branch: worktree.branch,
-                execFile: execFileFn,
+        // commit-only reentry
+        if (phase === 'commit') {
+            jobPatch({ phase: 'commit', stage: 'commit', round: null });
+            const message = `orch: ${jobSlug} (resume): ${String(prompt).split('\n')[0]}`;
+            const worktreeChanges = await collectWorktreeChangesFn({ worktreePath: liveWorktree });
+            printFilesChanged(worktreeChanges);
+            const commitResult = await commitWorktreeFn({
+                worktreePath: liveWorktree,
+                branch: liveBranch,
+                message,
+            });
+            if (commitResult.committed) {
+                console.log(`commit: ${commitResult.sha.slice(0, 7)} on ${commitResult.branch}`);
+                console.log(`next:   orch continue ${jobSlug} "…"`);
+            } else {
+                console.log(`commit: no changes on ${commitResult.branch}`);
+            }
+            if (role === 'worker' && parentSlug && workerId && commitResult.committed) {
+                const seqDoc = readSeq(cwd, parentSlug);
+                if (seqDoc) {
+                    const patchUnitFn = options.patchUnit ?? patchUnit;
+                    patchUnitFn(cwd, parentSlug, workerId, {
+                        state: 'done',
+                        sha: commitResult.sha,
+                        changedFiles: [],
+                        slug: jobSlug,
+                    });
+                } else {
+                    patchWorkerFn(cwd, parentSlug, workerId, {
+                        state: 'done',
+                        sha: commitResult.sha,
+                        changedFiles: [],
+                    });
+                }
+            }
+            patchTerminalJob(patchJobFn, jobCwd, jobSlug, {
+                state: 'done',
+                exitCode: 0,
+                summary: '',
+                error: null,
+                task: prompt,
             });
-        } catch {
-            // Best-effort: changedFiles is informational only, never masks a successful commit.
         }
-
-        patchWorkerFn(cwd, parentSlug, workerId, {
-            state: 'done',
-            sha: commitResult.sha,
-            changedFiles,
-        });
-        patchTerminalJob(patchJobFn, jobCwd, jobSlug, {
-            state: 'done',
-            exitCode: 0,
-            summary: codeAccepted?.verdict?.summary ?? '',
-            error: null,
-            task: prompt,
-        });
     } catch (err) {
         console.error(`Error: ${err.message}`);
-        try {
-            patchWorkerFn(cwd, parentSlug, workerId, { state: 'failed' });
-        } catch {
-            // Best-effort: don't let a fanout-state write failure mask the real error.
+        if (role === 'worker' && parentSlug && workerId) {
+            try {
+                const seqDoc = readSeq(cwd, parentSlug);
+                if (seqDoc) {
+                    const patchUnitFn = options.patchUnit ?? patchUnit;
+                    patchUnitFn(cwd, parentSlug, workerId, { state: 'failed' });
+                } else {
+                    patchWorkerFn(cwd, parentSlug, workerId, { state: 'failed' });
+                }
+            } catch {
+                // Best-effort.
+            }
         }
         if (jobSlug) {
             try {
@@ -1396,42 +1667,121 @@ export async function runWorkerPipeline(prompt, options = {}) {
                     task: prompt,
                 });
             } catch {
-                // Best-effort: don't let a job-state write failure mask the real error.
+                // Best-effort.
             }
         }
-        console.error(`next:   orch continue ${jobSlug ?? '<slug>'} "fix the failure and finish"`);
-        if (parentSlug) console.error(`        orch --integrate ${parentSlug}`);
+        console.error(`next:   orch resume ${jobSlug ?? '<slug>'}`);
         process.exit(1);
     }
 }
 
 /**
- * The `--integrate <parent>` driver: reuses (or creates) the integration worktree keyed
- * by the parent slug, merges `fanout.integration.candidates` in order (repairing conflicts
- * via the `integrator` agent, one conflict at a time), then runs a runner-first verify
- * loop and commits on green. Never invokes triage/research/planner/test-writer/test-critic.
- * Appends every step to `.orch/<job-slug>/integration.md` as it happens.
+ * Detach-parent path for failure `orch resume`: spawn background child with
+ * ORCH_JOB_SLUG, reopen with child pid, print resumed, exit.
  */
-export async function runIntegratePipeline(options = {}) {
-    const verbose = Boolean(options.verbose);
-    const maxRounds = options.maxRounds ?? 5;
+export async function runResumeDetached(slug, options = {}) {
+    const {
+        agent,
+        maxRounds = 5,
+        verbose,
+        cwd = process.cwd(),
+        spawn: spawnFn = spawn,
+        exit = (code) => process.exit(code),
+        validateResume: validateResumeFn = validateResume,
+        reopenForResume: reopenForResumeFn = reopenForResume,
+        snapshotPriorOutcome: snapshotPriorOutcomeFn = snapshotPriorOutcome,
+    } = options;
+
+    const backend = AGENT_BACKENDS[agent];
+    if (!backend) {
+        throw new Error(`Unknown agent backend: ${agent}`);
+    }
+
+    let validated;
+    try {
+        validated = validateResumeFn(cwd, slug, {});
+    } catch (err) {
+        console.error(`Error: ${err.message}`);
+        exit(1);
+        return;
+    }
+
+    if (validated.mode !== 'failure') {
+        console.error(`Error: --detach only applies to failure resume (got mode ${validated.mode})`);
+        exit(1);
+        return;
+    }
+
+    if (!isBinaryOnPath(backend.binary)) {
+        console.error(binaryMissingHint(agent));
+        exit(1);
+        return;
+    }
+
+    const record = validated.record;
+    const prior = snapshotPriorOutcomeFn(cwd, slug, record);
+    const { logPath } = jobPaths(cwd, slug);
+    fs.mkdirSync(path.dirname(logPath), { recursive: true });
+    const logFd = fs.openSync(logPath, 'a');
+
+    const childArgs = [
+        __filename,
+        'resume',
+        slug,
+        '--agent',
+        agent,
+        '--max-rounds',
+        String(maxRounds),
+    ];
+    if (verbose) childArgs.push('--verbose');
+    appendNotifyArgs(childArgs, options.notify);
+
+    const child = spawnFn(process.execPath, childArgs, {
+        cwd,
+        env: { ...process.env, ORCH_JOB_SLUG: slug, ORCH_DETACHED: '1' },
+        detached: true,
+        stdio: ['ignore', logFd, logFd],
+    });
+    child.unref();
+
+    reopenForResumeFn(cwd, slug, {
+        agent,
+        maxRounds,
+        pid: child.pid,
+        prior,
+    });
+
+    // Recover runs in the child; parent only prints the resume line.
+    console.log(`resumed ${slug} (pid ${child.pid})`);
+    exit(0);
+}
+
+/**
+ * The `--worker <parent>:<workerId>` driver: skips triage and runs research → planner →
+ * worktree (from the fan-out's recorded `base`) → test loop → code loop (writer-first) →
+ * commit, exactly like `runPipeline` minus triage. `prompt` is the worker's subtask text
+ * with the envelope already appended by the CLI wiring. On success, patches the parent's
+ * `fanout.json.workers[]` entry to `state:'done'` with `sha`/`changedFiles`; on failure,
+ * patches it (and this job's own `run.json`) to `state:'failed'` before exiting non-zero.
+ */
+export async function runWorkerPipeline(prompt, options = {}) {
+    const verbose = Boolean(options.verbose);
+    const maxRounds = options.maxRounds ?? 5;
     const backend = AGENT_BACKENDS[options.agent];
     if (!backend) {
         throw new Error(`Unknown agent backend: ${options.agent}`);
     }
     const AgentClass = options.AgentClass ?? backend.AgentClass;
     const cwd = options.cwd ?? process.cwd();
-    const { parentSlug } = options;
+    const { parentSlug, workerId, base } = options;
 
+    const createRunContextFn = options.createRunContext ?? createRunContext;
     const createWorktreeFn = options.createWorktree ?? createWorktree;
     const commitWorktreeFn = options.commitWorktree ?? commitWorktree;
-    const readFanoutFn = options.readFanout ?? readFanout;
-    const patchIntegrationFn = options.patchIntegration ?? patchIntegration;
-    const mergeBranchesFn = options.mergeBranches ?? mergeBranches;
-    const abortMergeFn = options.abortMerge ?? abortMerge;
-    const conflictedFilesFn = options.conflictedFiles ?? conflictedFiles;
-    const hasConflictMarkersFn = options.hasConflictMarkers ?? hasConflictMarkers;
-    const execFileFn = options.execFile ?? defaultExecFile;
+    const collectWorktreeChangesFn = options.collectWorktreeChanges ?? collectWorktreeChanges;
+    const patchWorkerFn = options.patchWorker ?? patchWorker;
+    const recordChangedFilesFn = options.recordChangedFiles ?? recordChangedFiles;
+    const execFileFn = options.execFile;
 
     const jobSlug = options.jobSlug ?? process.env.ORCH_JOB_SLUG;
     const jobCwd = options.jobCwd ?? cwd;
@@ -1441,7 +1791,7 @@ export async function runIntegratePipeline(options = {}) {
 
     const jobPatch = (fields) => {
         if (!jobSlug) return;
-        patchJobFn(jobCwd, jobSlug, fields);
+        return patchJobCursor(patchJobFn, jobCwd, jobSlug, fields);
     };
     const jobCheckpoint = async () => {
         if (!jobSlug) return;
@@ -1452,198 +1802,334 @@ export async function runIntegratePipeline(options = {}) {
         ensureBinaryOnPath(backend.binary, options.agent);
     }
 
-    const fanout = readFanoutFn(cwd, parentSlug);
-    if (!fanout) {
-        console.error(`Error: unknown parent ${parentSlug} (no fanout.json found)`);
-        process.exit(1);
-        return;
-    }
-
-    const integrationSlug = jobSlug ?? parentSlug;
-    const integrationDir = path.join(jobCwd, '.orch', integrationSlug);
-    const integrationMdPath = path.join(integrationDir, 'integration.md');
-    const logIntegration = (line) => {
-        fs.mkdirSync(integrationDir, { recursive: true });
-        fs.appendFileSync(integrationMdPath, `${line}\n`);
-    };
-
-    let merged = [...fanout.integration.merged];
-    let skipped = [...(fanout.integration.skipped ?? [])];
-
     try {
-        fs.mkdirSync(integrationDir, { recursive: true });
-        fs.appendFileSync(integrationMdPath, `# Integration: ${parentSlug}\n\n`);
-
-        jobPatch({ phase: 'worktree', stage: 'worktree', round: null });
-
-        const reuseWorktreePath = `${cwd}-${parentSlug}`;
-        const expectedBranch = `orch/${parentSlug}`;
-        let worktree = null;
-
-        if (fs.existsSync(reuseWorktreePath)) {
-            const currentBranch = execFileFn('git', ['-C', reuseWorktreePath, 'rev-parse', '--abbrev-ref', 'HEAD']).trim();
-            if (currentBranch === expectedBranch) {
-                worktree = { repoRoot: cwd, worktreePath: reuseWorktreePath, branch: expectedBranch };
-            }
-        }
+        const runContext = createRunContextFn(jobSlug ? { cwd, slug: jobSlug } : { cwd });
 
-        const reused = Boolean(worktree);
-        if (!worktree) {
-            worktree = createWorktreeFn({ cwd, slug: parentSlug, base: fanout.base });
-        }
+        jobPatch({ phase: 'research', stage: 'research', round: null });
+        const research = researchAgentArgs({ prompt, cwd, researchPath: runContext.researchPath });
+        const researchAgent = new AgentClass(
+            research.name,
+            research.instructions,
+            research.prompt,
+            research.options,
+        );
+        const researchResult = await researchAgent.run({ verbose });
+        await jobCheckpoint();
+        const { content: researchContent, summary: researchSummary } = splitStageSummary(researchResult.result);
+        printStageSummary('research', resolveStageSummary('research', researchSummary, researchContent));
 
-        logIntegration(
-            reused
-                ? `- Reused existing worktree at \`${worktree.worktreePath}\` on \`${worktree.branch}\`.`
-                : `- Created worktree at \`${worktree.worktreePath}\` on \`${worktree.branch}\`.`,
+        jobPatch({ phase: 'plan', stage: 'planner', round: null });
+        const planner = plannerAgentArgs({
+            prompt,
+            cwd,
+            researchPath: runContext.researchPath,
+            taskPath: runContext.taskPath,
+            researchOutput: researchContent,
+        });
+        const plannerAgent = new AgentClass(
+            planner.name,
+            planner.instructions,
+            planner.prompt,
+            planner.options,
         );
+        const plannerResult = await plannerAgent.run({ verbose });
+        await jobCheckpoint();
+        const { content: plannerContent, summary: plannerSummary } = splitStageSummary(plannerResult.result);
+        printStageSummary('planner', resolveStageSummary('planner', plannerSummary, plannerContent));
 
+        jobPatch({ phase: 'worktree', stage: 'worktree', round: null });
+        const worktree = createWorktreeFn({ cwd, slug: runContext.slug, base });
         jobPatch({ branch: worktree.branch, worktree: worktree.worktreePath });
-        patchIntegrationFn(cwd, parentSlug, (current) => ({
-            worktree: current.worktree ?? worktree.worktreePath,
-            branch: current.branch ?? worktree.branch,
-        }));
 
-        let remaining = fanout.integration.candidates.filter(
-            (branch) => !merged.includes(branch) && !skipped.includes(branch),
+        fs.mkdirSync(path.dirname(runContext.statusPath), { recursive: true });
+        fs.writeFileSync(
+            runContext.statusPath,
+            `# Status\n\n- Slug: \`${runContext.slug}\`\n- Branch: \`${worktree.branch}\`\n- Worktree: \`${worktree.worktreePath}\`\n- Parent: \`${parentSlug}\`\n- Worker: \`${workerId}\`\n`,
         );
 
-        while (remaining.length > 0) {
-            const results = mergeBranchesFn({
-                cwd: worktree.worktreePath,
-                candidates: remaining,
-                merged,
-                overlappingFiles: fanout.integration.overlappingFiles,
-                execFile: execFileFn,
-            });
+        const testAccepted = await runTestLoop({
+            prompt,
+            worktreePath: worktree.worktreePath,
+            branch: worktree.branch,
+            taskPath: runContext.taskPath,
+            statusPath: runContext.statusPath,
+            maxRounds,
+            AgentClass,
+            verbose,
+            jobPatch,
+            jobCheckpoint,
+        });
 
-            for (const result of results) {
-                if (result.status === 'skipped') continue;
+        const acceptedVerification = [testAccepted.verdict.summary, testAccepted.writerContent]
+            .filter(Boolean)
+            .join('\n');
 
-                if (result.status === 'merged') {
-                    merged.push(result.branch);
-                    patchIntegrationFn(cwd, parentSlug, (current) => ({
-                        merged: [...current.merged, result.branch],
-                    }));
-                    logIntegration(`- Merged \`${result.branch}\` cleanly.`);
-                    continue;
-                }
+        const codeAccepted = await runCodeLoop({
+            prompt,
+            worktreePath: worktree.worktreePath,
+            branch: worktree.branch,
+            taskPath: runContext.taskPath,
+            statusPath: runContext.statusPath,
+            maxRounds,
+            AgentClass,
+            verbose,
+            jobPatch,
+            jobCheckpoint,
+            acceptedVerification,
+        });
 
-                // status === 'conflict'
-                logIntegration(`- Conflict merging \`${result.branch}\`; entering repair.`);
-                patchIntegrationFn(cwd, parentSlug, { state: 'repairing' });
+        jobPatch({ phase: 'commit', stage: 'commit', round: null });
+        const message = `orch: ${runContext.slug} ${prompt.split('\n')[0]}`;
+        const worktreeChanges = collectWorktreeChangesFn({ worktreePath: worktree.worktreePath });
+        printFilesChanged(worktreeChanges);
+        const commitResult = commitWorktreeFn({
+            worktreePath: worktree.worktreePath,
+            branch: worktree.branch,
+            message,
+        });
 
-                const conflicted = conflictedFilesFn({ cwd: worktree.worktreePath, execFile: execFileFn });
-                const involvedWorkers = fanout.workers
-                    .filter((worker) => worker.branch === result.branch)
-                    .map(({ id, title, subtask, area }) => ({ id, title, subtask, area }));
+        if (commitResult.committed) {
+            fs.appendFileSync(
+                runContext.statusPath,
+                `\n## Commit\n\n- SHA: \`${commitResult.sha}\`\n- Branch: \`${commitResult.branch}\`\n`,
+            );
+            console.log(`commit: ${commitResult.sha.slice(0, 7)} on ${commitResult.branch}`);
+        } else {
+            fs.appendFileSync(
+                runContext.statusPath,
+                `\n## Commit\n\n- No changes to commit on \`${commitResult.branch}\`.\n`,
+            );
+            console.log(`commit: no changes on ${commitResult.branch}`);
+        }
 
-                jobPatch({ phase: 'integrate', stage: 'integrator', round: null });
-                const integratorArgs = integratorAgentArgs({
-                    prompt: `Resolve the merge conflict from combining \`${result.branch}\` into the integration branch for "${fanout.task}".`,
-                    cwd: worktree.worktreePath,
-                    conflictedFiles: conflicted,
-                    mergeOutput: result.output,
-                    involvedWorkers,
-                });
-                const integratorAgent = new AgentClass(
-                    'integrator',
-                    integratorArgs.instructions,
-                    integratorArgs.prompt,
-                    integratorArgs.options,
-                );
+        let changedFiles = [];
+        try {
+            changedFiles = recordChangedFilesFn({
+                repoRoot: worktree.repoRoot,
+                base,
+                branch: worktree.branch,
+                execFile: execFileFn,
+            });
+        } catch {
+            // Best-effort: changedFiles is informational only, never masks a successful commit.
+        }
 
-                let integratorOk = false;
-                try {
-                    const integratorOut = await integratorAgent.run({ verbose });
-                    await jobCheckpoint();
-                    const { summary: integratorSummary } = splitStageSummary(integratorOut.result);
-                    printStageSummary('integrator', integratorSummary);
-                    integratorOk = Boolean(integratorOut.ok);
-                } catch (err) {
-                    logIntegration(`- Integrator agent errored: ${err.message}`);
-                    integratorOk = false;
-                }
+        patchWorkerFn(cwd, parentSlug, workerId, {
+            state: 'done',
+            sha: commitResult.sha,
+            changedFiles,
+        });
+        patchTerminalJob(patchJobFn, jobCwd, jobSlug, {
+            state: 'done',
+            exitCode: 0,
+            summary: codeAccepted?.verdict?.summary ?? '',
+            error: null,
+            task: prompt,
+        });
+    } catch (err) {
+        console.error(`Error: ${err.message}`);
+        try {
+            patchWorkerFn(cwd, parentSlug, workerId, { state: 'failed' });
+        } catch {
+            // Best-effort: don't let a fanout-state write failure mask the real error.
+        }
+        if (jobSlug) {
+            try {
+                patchTerminalJob(patchJobFn, jobCwd, jobSlug, {
+                    state: 'failed',
+                    exitCode: 1,
+                    summary: '',
+                    error: err.message,
+                    task: prompt,
+                });
+            } catch {
+                // Best-effort: don't let a job-state write failure mask the real error.
+            }
+        }
+        console.error(`next:   orch resume ${jobSlug ?? '<slug>'}`);
+        if (parentSlug) console.error(`        orch --integrate ${parentSlug}`);
+        process.exit(1);
+    }
+}
 
-                const stillConflicted = integratorOk
-                    ? hasConflictMarkersFn({ cwd: worktree.worktreePath, execFile: execFileFn })
-                    : true;
+/**
+ * The `--unit <parent>:<unitId>` driver: skips triage and runs research → planner →
+ * worktree (from the seq tip) → test loop → code loop → commit. On success patches
+ * `seq.json.units[]` to `done` with sha/changedFiles/slug; on failure, `failed` then exit 1.
+ */
+export async function runUnitPipeline(prompt, options = {}) {
+    const verbose = Boolean(options.verbose);
+    const maxRounds = options.maxRounds ?? 5;
+    const backend = AGENT_BACKENDS[options.agent];
+    if (!backend) {
+        throw new Error(`Unknown agent backend: ${options.agent}`);
+    }
+    const AgentClass = options.AgentClass ?? backend.AgentClass;
+    const cwd = options.cwd ?? process.cwd();
+    const { parentSlug, unitId, base } = options;
+    const exitFn = options.exit ?? ((code) => process.exit(code));
 
-                if (!stillConflicted) {
-                    execFileFn('git', ['-C', worktree.worktreePath, 'commit']);
-                    merged.push(result.branch);
-                    patchIntegrationFn(cwd, parentSlug, (current) => ({
-                        merged: [...current.merged, result.branch],
-                    }));
-                    logIntegration(`- Integrator resolved conflicts in \`${result.branch}\`; merge completed.`);
-                } else {
-                    abortMergeFn({ cwd: worktree.worktreePath, execFile: execFileFn });
-                    skipped.push(result.branch);
-                    patchIntegrationFn(cwd, parentSlug, (current) => ({
-                        skipped: [...(current.skipped ?? []), result.branch],
-                    }));
-                    logIntegration(`- Conflicts in \`${result.branch}\` remained unresolved; aborted merge and skipped.`);
-                }
-            }
+    const createRunContextFn = options.createRunContext ?? createRunContext;
+    const createWorktreeFn = options.createWorktree ?? createWorktree;
+    const commitWorktreeFn = options.commitWorktree ?? commitWorktree;
+    const collectWorktreeChangesFn = options.collectWorktreeChanges ?? collectWorktreeChanges;
+    const patchUnitFn = options.patchUnit ?? patchUnit;
+    const recordChangedFilesFn = options.recordChangedFiles ?? recordChangedFiles;
+    const execFileFn = options.execFile;
 
-            remaining = remaining.slice(results.length);
-        }
+    const jobSlug = options.jobSlug ?? process.env.ORCH_JOB_SLUG;
+    const jobCwd = options.jobCwd ?? cwd;
+    const patchJobFn = options.patchJob ?? patchJob;
+    const checkpointPauseFn = options.checkpointPause ?? checkpointPause;
+    const pausePollIntervalMs = options.pausePollIntervalMs ?? 500;
+
+    const jobPatch = (fields) => {
+        if (!jobSlug) return;
+        return patchJobCursor(patchJobFn, jobCwd, jobSlug, fields);
+    };
+    const jobCheckpoint = async () => {
+        if (!jobSlug) return;
+        await checkpointPauseFn(jobCwd, jobSlug, { pollIntervalMs: pausePollIntervalMs });
+    };
+
+    if (!options.AgentClass) {
+        ensureBinaryOnPath(backend.binary, options.agent);
+    }
+
+    try {
+        const runContext = createRunContextFn(jobSlug ? { cwd, slug: jobSlug } : { cwd });
+
+        jobPatch({ phase: 'research', stage: 'research', round: null });
+        const research = researchAgentArgs({ prompt, cwd, researchPath: runContext.researchPath });
+        const researchAgent = new AgentClass(
+            research.name,
+            research.instructions,
+            research.prompt,
+            research.options,
+        );
+        const researchResult = await researchAgent.run({ verbose });
+        if (!researchResult.ok) throw researchResult.error ?? new Error('research failed');
+        await jobCheckpoint();
+        const { content: researchContent, summary: researchSummary } = splitStageSummary(researchResult.result);
+        printStageSummary('research', resolveStageSummary('research', researchSummary, researchContent));
+
+        jobPatch({ phase: 'plan', stage: 'planner', round: null });
+        const planner = plannerAgentArgs({
+            prompt,
+            cwd,
+            researchPath: runContext.researchPath,
+            taskPath: runContext.taskPath,
+            researchOutput: researchContent,
+        });
+        const plannerAgent = new AgentClass(
+            planner.name,
+            planner.instructions,
+            planner.prompt,
+            planner.options,
+        );
+        const plannerResult = await plannerAgent.run({ verbose });
+        await jobCheckpoint();
+        const { content: plannerContent, summary: plannerSummary } = splitStageSummary(plannerResult.result);
+        printStageSummary('planner', resolveStageSummary('planner', plannerSummary, plannerContent));
+
+        jobPatch({ phase: 'worktree', stage: 'worktree', round: null });
+        const worktree = await createWorktreeFn({ cwd, slug: runContext.slug, base });
+        jobPatch({ branch: worktree.branch, worktree: worktree.worktreePath });
+
+        fs.mkdirSync(path.dirname(runContext.statusPath), { recursive: true });
+        fs.writeFileSync(
+            runContext.statusPath,
+            `# Status\n\n- Slug: \`${runContext.slug}\`\n- Branch: \`${worktree.branch}\`\n- Worktree: \`${worktree.worktreePath}\`\n- Parent: \`${parentSlug}\`\n- Worker: \`${unitId}\`\n`,
+        );
+
+        const testAccepted = await runTestLoop({
+            prompt,
+            worktreePath: worktree.worktreePath,
+            branch: worktree.branch,
+            taskPath: runContext.taskPath,
+            statusPath: runContext.statusPath,
+            maxRounds,
+            AgentClass,
+            verbose,
+            jobPatch,
+            jobCheckpoint,
+        });
+
+        const acceptedVerification = [testAccepted.verdict.summary, testAccepted.writerContent]
+            .filter(Boolean)
+            .join('\n');
 
-        // --- runner-first verify loop: test-runner first, code-writer only on failure ---
         const codeAccepted = await runCodeLoop({
-            prompt: fanout.task,
+            prompt,
             worktreePath: worktree.worktreePath,
             branch: worktree.branch,
-            taskPath: path.join(integrationDir, 'task.md'),
-            statusPath: integrationMdPath,
+            taskPath: runContext.taskPath,
+            statusPath: runContext.statusPath,
             maxRounds,
             AgentClass,
             verbose,
             jobPatch,
             jobCheckpoint,
-            acceptedVerification: '',
-            runnerFirst: true,
-            loopTitle: 'Verify loop',
+            acceptedVerification,
         });
 
         jobPatch({ phase: 'commit', stage: 'commit', round: null });
-        const message = `orch: ${parentSlug} ${fanout.task.split('\n')[0]}`;
-        const commitResult = commitWorktreeFn({
+        const message = `orch: ${runContext.slug} ${prompt.split('\n')[0]}`;
+        const worktreeChanges = await collectWorktreeChangesFn({ worktreePath: worktree.worktreePath });
+        printFilesChanged(worktreeChanges);
+        const commitResult = await commitWorktreeFn({
             worktreePath: worktree.worktreePath,
-            branch: `orch/${parentSlug}`,
+            branch: worktree.branch,
             message,
         });
 
-        logIntegration(
-            commitResult.committed
-                ? `- Committed \`${commitResult.sha}\` on \`${commitResult.branch}\`.`
-                : `- No changes to commit on \`${commitResult.branch}\`.`,
-        );
+        if (commitResult.committed) {
+            fs.appendFileSync(
+                runContext.statusPath,
+                `\n## Commit\n\n- SHA: \`${commitResult.sha}\`\n- Branch: \`${commitResult.branch}\`\n`,
+            );
+            console.log(`commit: ${commitResult.sha.slice(0, 7)} on ${commitResult.branch}`);
+        } else if (commitResult.sha) {
+            console.log(`commit: ${String(commitResult.sha).slice(0, 7)} on ${worktree.branch}`);
+        } else {
+            fs.appendFileSync(
+                runContext.statusPath,
+                `\n## Commit\n\n- No changes to commit on \`${worktree.branch}\`.\n`,
+            );
+            console.log(`commit: no changes on ${worktree.branch}`);
+        }
 
-        patchIntegrationFn(cwd, parentSlug, {
+        let changedFiles = [];
+        try {
+            changedFiles = recordChangedFilesFn({
+                repoRoot: worktree.repoRoot ?? cwd,
+                base,
+                branch: worktree.branch,
+                execFile: execFileFn,
+            });
+        } catch {
+            // Best-effort: changedFiles is informational only.
+        }
+
+        patchUnitFn(cwd, parentSlug, unitId, {
             state: 'done',
             sha: commitResult.sha,
-            merged,
-            skipped,
+            changedFiles,
+            slug: runContext.slug,
         });
         patchTerminalJob(patchJobFn, jobCwd, jobSlug, {
             state: 'done',
             exitCode: 0,
             summary: codeAccepted?.verdict?.summary ?? '',
             error: null,
-            task: fanout.task,
+            task: prompt,
         });
     } catch (err) {
         console.error(`Error: ${err.message}`);
         try {
-            logIntegration(`- Error: ${err.message}`);
-        } catch {
-            // Best-effort: don't let a log write failure mask the real error.
-        }
-        try {
-            patchIntegrationFn(cwd, parentSlug, { state: 'failed', merged, skipped });
+            patchUnitFn(cwd, parentSlug, unitId, { state: 'failed' });
         } catch {
-            // Best-effort: don't let a fanout-state write failure mask the real error.
+            // Best-effort.
         }
         if (jobSlug) {
             try {
@@ -1652,58 +2138,1328 @@ export async function runIntegratePipeline(options = {}) {
                     exitCode: 1,
                     summary: '',
                     error: err.message,
-                    task: fanout?.task,
+                    task: prompt,
                 });
             } catch {
-                // Best-effort: don't let a job-state write failure mask the real error.
+                // Best-effort.
             }
         }
-        process.exit(1);
+        console.error(`next:   orch resume ${jobSlug ?? '<slug>'}`);
+        if (parentSlug) console.error(`        orch --seq-continue ${parentSlug}`);
+        exitFn(1);
     }
 }
 
-function sleep(ms) {
-    return new Promise((resolve) => setTimeout(resolve, ms));
-}
-
-/** Sentinel thrown by the coordinator's scheduling loop when a SIGINT/SIGTERM/SIGHUP
- * cascade fires mid-flight, so the pending awaits unwind without a second exit call. */
-class FanoutInterrupted extends Error {}
-
 /**
- * SIGINT/SIGHUP/SIGTERM cascade: reads `fanout.json`, resolves every worker's and the
- * integration session's own pid via its `run.json`, filters through `isPidAlive`, and
- * SIGTERMs each live one. Never touches worktrees. Composes with (does not replace)
- * `lib/agent.js`'s existing `shutdown()` — the coordinator's own signal handling calls
- * both this and the normal in-process agent-CLI reaping.
+ * Merge one unit branch into `orch/<parentSlug>`, repair conflicts once via
+ * integrator, runner-first verify, then advance `seq.tip`. Merge/verify failure
+ * marks the unit `failed` and exits non-zero.
  */
-export function cascadeStopFanoutChildren(cwd, parentSlug, { kill = (pid, signal) => process.kill(pid, signal), isPidAlive: isPidAliveFn = isPidAlive } = {}) {
-    const fanout = readFanout(cwd, parentSlug);
-    if (!fanout) return;
-
-    const slugs = fanout.workers.filter((worker) => worker.slug).map((worker) => worker.slug);
-    if (fanout.integration?.slug) slugs.push(fanout.integration.slug);
-
-    for (const slug of slugs) {
-        const record = readJob(cwd, slug);
-        if (!record) continue;
-        if (isPidAliveFn(record.pid)) {
+export async function mergeOneUnit(options = {}) {
+    const verbose = Boolean(options.verbose);
+    const maxRounds = options.maxRounds ?? 5;
+    const backend = AGENT_BACKENDS[options.agent];
+    if (!backend) {
+        throw new Error(`Unknown agent backend: ${options.agent}`);
+    }
+    const AgentClass = options.AgentClass ?? backend.AgentClass;
+    const cwd = options.cwd ?? process.cwd();
+    const { parentSlug, unitId, unitBranch } = options;
+    const exitFn = options.exit ?? ((code) => process.exit(code));
+    const logFn = options.log ?? ((line) => console.log(line));
+
+    const createWorktreeFn = options.createWorktree ?? createWorktree;
+    const commitWorktreeFn = options.commitWorktree ?? commitWorktree;
+    const readSeqFn = options.readSeq ?? readSeq;
+    const patchUnitFn = options.patchUnit ?? patchUnit;
+    const patchTipFn = options.patchTip ?? patchTip;
+    const mergeBranchesFn = options.mergeBranches ?? mergeBranches;
+    const abortMergeFn = options.abortMerge ?? abortMerge;
+    const conflictedFilesFn = options.conflictedFiles ?? conflictedFiles;
+    const hasConflictMarkersFn = options.hasConflictMarkers ?? hasConflictMarkers;
+    const execFileFn = options.execFile ?? defaultExecFile;
+
+    const jobSlug = options.jobSlug ?? process.env.ORCH_JOB_SLUG;
+    const jobCwd = options.jobCwd ?? cwd;
+    const patchJobFn = options.patchJob ?? patchJob;
+    const checkpointPauseFn = options.checkpointPause ?? checkpointPause;
+    const pausePollIntervalMs = options.pausePollIntervalMs ?? 500;
+
+    const jobPatch = (fields) => {
+        if (!jobSlug) return;
+        return patchJobCursor(patchJobFn, jobCwd, jobSlug, fields);
+    };
+    const jobCheckpoint = async () => {
+        if (!jobSlug) return;
+        await checkpointPauseFn(jobCwd, jobSlug, { pollIntervalMs: pausePollIntervalMs });
+    };
+
+    const failUnit = async (message) => {
+        if (message) console.error(`Error: ${message}`);
+        try {
+            patchUnitFn(cwd, parentSlug, unitId, { state: 'failed' });
+        } catch {
+            // Best-effort.
+        }
+        exitFn(1);
+    };
+
+    try {
+        const seq = readSeqFn(cwd, parentSlug);
+        if (!seq) {
+            await failUnit(`unknown parent ${parentSlug} (no seq.json found)`);
+            return;
+        }
+
+        jobPatch({ phase: 'merge', stage: 'merge', round: null });
+
+        const reuseWorktreePath = `${cwd}-${parentSlug}`;
+        const expectedBranch = `orch/${parentSlug}`;
+        let worktree = null;
+
+        if (fs.existsSync(reuseWorktreePath)) {
+            try {
+                const currentBranch = execFileFn('git', ['-C', reuseWorktreePath, 'rev-parse', '--abbrev-ref', 'HEAD']).trim();
+                if (currentBranch === expectedBranch) {
+                    worktree = { repoRoot: cwd, worktreePath: reuseWorktreePath, branch: expectedBranch };
+                }
+            } catch {
+                // Fall through to create.
+            }
+        }
+
+        if (!worktree) {
+            worktree = await createWorktreeFn({
+                cwd,
+                slug: parentSlug,
+                base: seq.tip || seq.base,
+            });
+        }
+
+        jobPatch({ branch: worktree.branch, worktree: worktree.worktreePath });
+
+        const mergeResult = await mergeBranchesFn({
+            cwd: worktree.worktreePath,
+            candidates: [unitBranch],
+            merged: [],
+            overlappingFiles: [],
+            execFile: execFileFn,
+        });
+
+        let conflicts = [];
+        let mergedOk = false;
+        let mergeOutput = '';
+        if (Array.isArray(mergeResult)) {
+            conflicts = mergeResult.filter((r) => r.status === 'conflict').map((r) => r.branch);
+            mergedOk = mergeResult.some((r) => r.status === 'merged');
+            mergeOutput = mergeResult.find((r) => r.status === 'conflict')?.output ?? '';
+        } else {
+            conflicts = mergeResult?.conflicts ?? [];
+            mergedOk = (mergeResult?.merged ?? []).includes(unitBranch) || (mergeResult?.merged ?? []).length > 0;
+        }
+
+        if (conflicts.length > 0) {
+            jobPatch({ phase: 'merge', stage: 'integrator', round: null });
+            const conflicted = conflictedFilesFn({ cwd: worktree.worktreePath, execFile: execFileFn });
+            const integratorArgs = integratorAgentArgs({
+                prompt: `Resolve the merge conflict from combining \`${unitBranch}\` into the seq integration branch for "${seq.task}".`,
+                cwd: worktree.worktreePath,
+                conflictedFiles: conflicted,
+                mergeOutput,
+                involvedWorkers: [{ id: unitId, title: unitId, subtask: unitId, area: '' }],
+            });
+            const integratorAgent = new AgentClass(
+                'integrator',
+                integratorArgs.instructions,
+                integratorArgs.prompt,
+                integratorArgs.options,
+            );
+
+            let integratorOk = false;
+            try {
+                const integratorOut = await integratorAgent.run({ verbose });
+                await jobCheckpoint();
+                integratorOk = Boolean(integratorOut.ok);
+            } catch {
+                integratorOk = false;
+            }
+
+            const stillConflicted = integratorOk
+                ? hasConflictMarkersFn({ cwd: worktree.worktreePath, execFile: execFileFn })
+                : true;
+
+            if (!stillConflicted) {
+                try {
+                    execFileFn('git', ['-C', worktree.worktreePath, 'commit']);
+                } catch {
+                    // May already be committed by integrator.
+                }
+                mergedOk = true;
+            } else {
+                try {
+                    abortMergeFn({ cwd: worktree.worktreePath, execFile: execFileFn });
+                } catch {
+                    // Best-effort.
+                }
+                await failUnit(`merge conflict for ${unitId} could not be repaired`);
+                return;
+            }
+        }
+
+        if (!mergedOk && conflicts.length === 0) {
+            await failUnit(`failed to merge ${unitBranch}`);
+            return;
+        }
+
+        const artifactDir = path.join(jobCwd, '.orch', parentSlug);
+        await runCodeLoop({
+            prompt: seq.task,
+            worktreePath: worktree.worktreePath,
+            branch: worktree.branch,
+            taskPath: path.join(artifactDir, 'task.md'),
+            statusPath: path.join(artifactDir, 'status.md'),
+            maxRounds,
+            AgentClass,
+            verbose,
+            jobPatch,
+            jobCheckpoint,
+            acceptedVerification: '',
+            runnerFirst: true,
+            loopTitle: 'Verify loop',
+        });
+
+        const commitResult = await commitWorktreeFn({
+            worktreePath: worktree.worktreePath,
+            branch: worktree.branch,
+            message: `orch: merge ${unitId} into ${parentSlug}`,
+        });
+
+        let tipSha = commitResult?.sha;
+        if (!tipSha) {
+            tipSha = execFileFn('git', ['-C', worktree.worktreePath, 'rev-parse', 'HEAD']).trim();
+        }
+        patchTipFn(cwd, parentSlug, tipSha);
+        logFn(`merged ${unitId} → tip ${String(tipSha).slice(0, 7)}`);
+    } catch (err) {
+        await failUnit(err.message);
+    }
+}
+
+/**
+ * The `--integrate <parent>` driver: reuses (or creates) the integration worktree keyed
+ * by the parent slug, merges `fanout.integration.candidates` in order (repairing conflicts
+ * via the `integrator` agent, one conflict at a time), then runs a runner-first verify
+ * loop and commits on green. Never invokes triage/research/planner/test-writer/test-critic.
+ * Appends every step to `.orch/<job-slug>/integration.md` as it happens.
+ */
+export async function runIntegratePipeline(options = {}) {
+    const verbose = Boolean(options.verbose);
+    const maxRounds = options.maxRounds ?? 5;
+    const backend = AGENT_BACKENDS[options.agent];
+    if (!backend) {
+        throw new Error(`Unknown agent backend: ${options.agent}`);
+    }
+    const AgentClass = options.AgentClass ?? backend.AgentClass;
+    const cwd = options.cwd ?? process.cwd();
+    const { parentSlug } = options;
+
+    const createWorktreeFn = options.createWorktree ?? createWorktree;
+    const commitWorktreeFn = options.commitWorktree ?? commitWorktree;
+    const readFanoutFn = options.readFanout ?? readFanout;
+    const patchIntegrationFn = options.patchIntegration ?? patchIntegration;
+    const mergeBranchesFn = options.mergeBranches ?? mergeBranches;
+    const abortMergeFn = options.abortMerge ?? abortMerge;
+    const conflictedFilesFn = options.conflictedFiles ?? conflictedFiles;
+    const hasConflictMarkersFn = options.hasConflictMarkers ?? hasConflictMarkers;
+    const execFileFn = options.execFile ?? defaultExecFile;
+
+    const jobSlug = options.jobSlug ?? process.env.ORCH_JOB_SLUG;
+    const jobCwd = options.jobCwd ?? cwd;
+    const patchJobFn = options.patchJob ?? patchJob;
+    const checkpointPauseFn = options.checkpointPause ?? checkpointPause;
+    const pausePollIntervalMs = options.pausePollIntervalMs ?? 500;
+
+    const jobPatch = (fields) => {
+        if (!jobSlug) return;
+        return patchJobCursor(patchJobFn, jobCwd, jobSlug, fields);
+    };
+    const jobCheckpoint = async () => {
+        if (!jobSlug) return;
+        await checkpointPauseFn(jobCwd, jobSlug, { pollIntervalMs: pausePollIntervalMs });
+    };
+
+    if (!options.AgentClass) {
+        ensureBinaryOnPath(backend.binary, options.agent);
+    }
+
+    const fanout = readFanoutFn(cwd, parentSlug);
+    if (!fanout) {
+        console.error(`Error: unknown parent ${parentSlug} (no fanout.json found)`);
+        process.exit(1);
+        return;
+    }
+
+    const integrationSlug = jobSlug ?? parentSlug;
+    const integrationDir = path.join(jobCwd, '.orch', integrationSlug);
+    const integrationMdPath = path.join(integrationDir, 'integration.md');
+    const logIntegration = (line) => {
+        fs.mkdirSync(integrationDir, { recursive: true });
+        fs.appendFileSync(integrationMdPath, `${line}\n`);
+    };
+
+    let merged = [...fanout.integration.merged];
+    let skipped = [...(fanout.integration.skipped ?? [])];
+
+    try {
+        fs.mkdirSync(integrationDir, { recursive: true });
+        fs.appendFileSync(integrationMdPath, `# Integration: ${parentSlug}\n\n`);
+
+        jobPatch({ phase: 'worktree', stage: 'worktree', round: null });
+
+        const reuseWorktreePath = `${cwd}-${parentSlug}`;
+        const expectedBranch = `orch/${parentSlug}`;
+        let worktree = null;
+
+        if (fs.existsSync(reuseWorktreePath)) {
+            const currentBranch = execFileFn('git', ['-C', reuseWorktreePath, 'rev-parse', '--abbrev-ref', 'HEAD']).trim();
+            if (currentBranch === expectedBranch) {
+                worktree = { repoRoot: cwd, worktreePath: reuseWorktreePath, branch: expectedBranch };
+            }
+        }
+
+        const reused = Boolean(worktree);
+        if (!worktree) {
+            worktree = createWorktreeFn({ cwd, slug: parentSlug, base: fanout.base });
+        }
+
+        logIntegration(
+            reused
+                ? `- Reused existing worktree at \`${worktree.worktreePath}\` on \`${worktree.branch}\`.`
+                : `- Created worktree at \`${worktree.worktreePath}\` on \`${worktree.branch}\`.`,
+        );
+
+        jobPatch({ branch: worktree.branch, worktree: worktree.worktreePath });
+        patchIntegrationFn(cwd, parentSlug, (current) => ({
+            worktree: current.worktree ?? worktree.worktreePath,
+            branch: current.branch ?? worktree.branch,
+        }));
+
+        let remaining = fanout.integration.candidates.filter(
+            (branch) => !merged.includes(branch) && !skipped.includes(branch),
+        );
+
+        while (remaining.length > 0) {
+            const results = mergeBranchesFn({
+                cwd: worktree.worktreePath,
+                candidates: remaining,
+                merged,
+                overlappingFiles: fanout.integration.overlappingFiles,
+                execFile: execFileFn,
+            });
+
+            for (const result of results) {
+                if (result.status === 'skipped') continue;
+
+                if (result.status === 'merged') {
+                    merged.push(result.branch);
+                    patchIntegrationFn(cwd, parentSlug, (current) => ({
+                        merged: [...current.merged, result.branch],
+                    }));
+                    logIntegration(`- Merged \`${result.branch}\` cleanly.`);
+                    continue;
+                }
+
+                // status === 'conflict'
+                logIntegration(`- Conflict merging \`${result.branch}\`; entering repair.`);
+                patchIntegrationFn(cwd, parentSlug, { state: 'repairing' });
+
+                const conflicted = conflictedFilesFn({ cwd: worktree.worktreePath, execFile: execFileFn });
+                const involvedWorkers = fanout.workers
+                    .filter((worker) => worker.branch === result.branch)
+                    .map(({ id, title, subtask, area }) => ({ id, title, subtask, area }));
+
+                jobPatch({ phase: 'integrate', stage: 'integrator', round: null });
+                const integratorArgs = integratorAgentArgs({
+                    prompt: `Resolve the merge conflict from combining \`${result.branch}\` into the integration branch for "${fanout.task}".`,
+                    cwd: worktree.worktreePath,
+                    conflictedFiles: conflicted,
+                    mergeOutput: result.output,
+                    involvedWorkers,
+                });
+                const integratorAgent = new AgentClass(
+                    'integrator',
+                    integratorArgs.instructions,
+                    integratorArgs.prompt,
+                    integratorArgs.options,
+                );
+
+                let integratorOk = false;
+                try {
+                    const integratorOut = await integratorAgent.run({ verbose });
+                    await jobCheckpoint();
+                    const { content: integratorContent, summary: integratorSummary } = splitStageSummary(integratorOut.result);
+                    printStageSummary('integrator', resolveStageSummary('integrator', integratorSummary, integratorContent));
+                    integratorOk = Boolean(integratorOut.ok);
+                } catch (err) {
+                    logIntegration(`- Integrator agent errored: ${err.message}`);
+                    integratorOk = false;
+                }
+
+                const stillConflicted = integratorOk
+                    ? hasConflictMarkersFn({ cwd: worktree.worktreePath, execFile: execFileFn })
+                    : true;
+
+                if (!stillConflicted) {
+                    execFileFn('git', ['-C', worktree.worktreePath, 'commit']);
+                    merged.push(result.branch);
+                    patchIntegrationFn(cwd, parentSlug, (current) => ({
+                        merged: [...current.merged, result.branch],
+                    }));
+                    logIntegration(`- Integrator resolved conflicts in \`${result.branch}\`; merge completed.`);
+                } else {
+                    abortMergeFn({ cwd: worktree.worktreePath, execFile: execFileFn });
+                    skipped.push(result.branch);
+                    patchIntegrationFn(cwd, parentSlug, (current) => ({
+                        skipped: [...(current.skipped ?? []), result.branch],
+                    }));
+                    logIntegration(`- Conflicts in \`${result.branch}\` remained unresolved; aborted merge and skipped.`);
+                }
+            }
+
+            remaining = remaining.slice(results.length);
+        }
+
+        // --- runner-first verify loop: test-runner first, code-writer only on failure ---
+        const codeAccepted = await runCodeLoop({
+            prompt: fanout.task,
+            worktreePath: worktree.worktreePath,
+            branch: worktree.branch,
+            taskPath: path.join(integrationDir, 'task.md'),
+            statusPath: integrationMdPath,
+            maxRounds,
+            AgentClass,
+            verbose,
+            jobPatch,
+            jobCheckpoint,
+            acceptedVerification: '',
+            runnerFirst: true,
+            loopTitle: 'Verify loop',
+        });
+
+        jobPatch({ phase: 'commit', stage: 'commit', round: null });
+        const message = `orch: ${parentSlug} ${fanout.task.split('\n')[0]}`;
+        const commitResult = commitWorktreeFn({
+            worktreePath: worktree.worktreePath,
+            branch: `orch/${parentSlug}`,
+            message,
+        });
+
+        logIntegration(
+            commitResult.committed
+                ? `- Committed \`${commitResult.sha}\` on \`${commitResult.branch}\`.`
+                : `- No changes to commit on \`${commitResult.branch}\`.`,
+        );
+
+        patchIntegrationFn(cwd, parentSlug, {
+            state: 'done',
+            sha: commitResult.sha,
+            merged,
+            skipped,
+        });
+        patchTerminalJob(patchJobFn, jobCwd, jobSlug, {
+            state: 'done',
+            exitCode: 0,
+            summary: codeAccepted?.verdict?.summary ?? '',
+            error: null,
+            task: fanout.task,
+        });
+    } catch (err) {
+        console.error(`Error: ${err.message}`);
+        try {
+            logIntegration(`- Error: ${err.message}`);
+        } catch {
+            // Best-effort: don't let a log write failure mask the real error.
+        }
+        try {
+            patchIntegrationFn(cwd, parentSlug, { state: 'failed', merged, skipped });
+        } catch {
+            // Best-effort: don't let a fanout-state write failure mask the real error.
+        }
+        if (jobSlug) {
+            try {
+                patchTerminalJob(patchJobFn, jobCwd, jobSlug, {
+                    state: 'failed',
+                    exitCode: 1,
+                    summary: '',
+                    error: err.message,
+                    task: fanout?.task,
+                });
+            } catch {
+                // Best-effort: don't let a job-state write failure mask the real error.
+            }
+        }
+        process.exit(1);
+    }
+}
+
+function sleep(ms) {
+    return new Promise((resolve) => setTimeout(resolve, ms));
+}
+
+/** Sentinel thrown by the coordinator's scheduling loop when a SIGINT/SIGTERM/SIGHUP
+ * cascade fires mid-flight, so the pending awaits unwind without a second exit call. */
+class FanoutInterrupted extends Error {}
+
+/**
+ * SIGINT/SIGHUP/SIGTERM cascade: reads `fanout.json`, resolves every worker's and the
+ * integration session's own pid via its `run.json`, filters through `isPidAlive`, and
+ * SIGTERMs each live one. Never touches worktrees. Composes with (does not replace)
+ * `lib/agent.js`'s existing `shutdown()` — the coordinator's own signal handling calls
+ * both this and the normal in-process agent-CLI reaping.
+ */
+export function cascadeStopFanoutChildren(cwd, parentSlug, { kill = (pid, signal) => process.kill(pid, signal), isPidAlive: isPidAliveFn = isPidAlive } = {}) {
+    const fanout = readFanout(cwd, parentSlug);
+    if (!fanout) return;
+
+    const slugs = fanout.workers.filter((worker) => worker.slug).map((worker) => worker.slug);
+    if (fanout.integration?.slug) slugs.push(fanout.integration.slug);
+
+    for (const slug of slugs) {
+        const record = readJob(cwd, slug);
+        if (!record) continue;
+        if (isPidAliveFn(record.pid)) {
+            kill(record.pid, 'SIGTERM');
+        }
+    }
+}
+
+/**
+ * SIGINT/SIGHUP/SIGTERM cascade for seq: reads `seq.json` unit slugs and SIGTERMs
+ * live non-terminal children. Never touches worktrees.
+ */
+export function cascadeStopSeqChildren(cwd, parentSlug, { kill = (pid, signal) => process.kill(pid, signal), isPidAlive: isPidAliveFn = isPidAlive } = {}) {
+    const seq = readSeq(cwd, parentSlug);
+    if (!seq) return;
+
+    const slugs = (seq.units || []).filter((unit) => unit.slug).map((unit) => unit.slug);
+    for (const slug of slugs) {
+        const record = readJob(cwd, slug);
+        if (!record) continue;
+        if (TERMINAL_JOB_STATES.includes(record.state)) continue;
+        if (isPidAliveFn(record.pid)) {
             kill(record.pid, 'SIGTERM');
         }
     }
 }
 
-/**
- * CLI / management cascade stop: SIGTERM the parent pid if alive, then every
- * live child pid (via `cascadeStopFanoutChildren`). The coordinator signal
- * handler keeps calling the child-only helper so it does not re-signal itself.
- */
-export function cascadeStop(cwd, parentSlug, { kill = (pid, signal) => process.kill(pid, signal), isPidAlive: isPidAliveFn = isPidAlive } = {}) {
-    const parent = readJob(cwd, parentSlug);
-    if (parent && isPidAliveFn(parent.pid)) {
-        kill(parent.pid, 'SIGTERM');
+/**
+ * CLI / management cascade stop: SIGTERM the parent pid if alive, then every
+ * live child pid (via fan-out and/or seq helpers). The coordinator signal
+ * handler keeps calling the child-only helpers so it does not re-signal itself.
+ */
+export function cascadeStop(cwd, parentSlug, { kill = (pid, signal) => process.kill(pid, signal), isPidAlive: isPidAliveFn = isPidAlive } = {}) {
+    const parent = readJob(cwd, parentSlug);
+    if (parent && isPidAliveFn(parent.pid)) {
+        kill(parent.pid, 'SIGTERM');
+    }
+    cascadeStopFanoutChildren(cwd, parentSlug, { kill, isPidAlive: isPidAliveFn });
+    cascadeStopSeqChildren(cwd, parentSlug, { kill, isPidAlive: isPidAliveFn });
+}
+
+/**
+ * The `--seq` coordinator: triage → seq-decomposer (no boundaries) → schedule
+ * units concurrency 1 → merge+verify after each → hybrid adjust. Decline falls
+ * through to the single-worktree pipeline with no seq.json.
+ */
+export async function runSeqPipeline(prompt, options = {}) {
+    const verbose = Boolean(options.verbose);
+    const maxRounds = options.maxRounds ?? 5;
+    const maxUnits = options.maxUnits ?? 8;
+    const backend = AGENT_BACKENDS[options.agent];
+    if (!backend) {
+        throw new Error(`Unknown agent backend: ${options.agent}`);
+    }
+    const AgentClass = options.AgentClass ?? backend.AgentClass;
+    const invocationCwd = options.cwd ?? process.cwd();
+
+    const createRunContextFn = options.createRunContext ?? createRunContext;
+    const createWorktreeFn = options.createWorktree ?? createWorktree;
+    const commitWorktreeFn = options.commitWorktree ?? commitWorktree;
+    const collectWorktreeChangesFn = options.collectWorktreeChanges ?? collectWorktreeChanges;
+    const spawnFn = options.spawn ?? spawn;
+    const execFileFn = options.execFile ?? defaultExecFile;
+    const allocateJobFn = options.allocateJob ?? allocateJob;
+    const reconcileJobFn = options.reconcileJob ?? reconcileJob;
+    const readSeqFn = options.readSeq ?? readSeq;
+    const writeSeqFn = options.writeSeq ?? writeSeq;
+    const patchUnitFn = options.patchUnit ?? patchUnit;
+    const appendAdjustmentFn = options.appendAdjustment ?? appendAdjustment;
+    const mergeOneUnitFn = options.mergeOneUnit ?? mergeOneUnit;
+    const exitFn = options.exit ?? ((code) => process.exit(code));
+    const pollIntervalMs = options.pollIntervalMs ?? 500;
+
+    const jobSlug = options.jobSlug ?? process.env.ORCH_JOB_SLUG;
+    const jobCwd = options.jobCwd ?? invocationCwd;
+    const patchJobFn = options.patchJob ?? patchJob;
+    const checkpointPauseFn = options.checkpointPause ?? checkpointPause;
+    const pausePollIntervalMs = options.pausePollIntervalMs ?? 500;
+
+    const jobPatch = (fields) => {
+        if (!jobSlug) return;
+        return patchJobCursor(patchJobFn, jobCwd, jobSlug, fields);
+    };
+    const jobCheckpoint = async () => {
+        if (!jobSlug) return;
+        await checkpointPauseFn(jobCwd, jobSlug, { pollIntervalMs: pausePollIntervalMs });
+    };
+
+    if (!options.AgentClass) {
+        ensureBinaryOnPath(backend.binary, options.agent);
+    }
+
+    console.log(`cwd:   ${invocationCwd}`);
+    console.log(`agent: ${options.agent}`);
+    console.log();
+
+    let interrupted = false;
+    const onSignal = (signal) => {
+        interrupted = true;
+        try {
+            cascadeStopSeqChildren(invocationCwd, jobSlug);
+        } catch {
+            // Best-effort.
+        }
+        if (jobSlug) {
+            try {
+                const exitCode = exitCodeForSignal(signal);
+                const finishedAt = new Date().toISOString();
+                patchJobFn(jobCwd, jobSlug, (current) => ({
+                    state: 'stopped',
+                    exitCode,
+                    finishedAt,
+                    lastOutcome: buildLastOutcome({
+                        state: 'stopped',
+                        phase: current.phase,
+                        stage: current.stage,
+                        round: current.round,
+                        exitCode,
+                        finishedAt,
+                        task: prompt,
+                        summary: '',
+                        error: null,
+                    }),
+                }));
+            } catch {
+                // Best-effort.
+            }
+        }
+        exitFn(exitCodeForSignal(signal));
+    };
+    process.on('SIGINT', () => onSignal('SIGINT'));
+    process.on('SIGTERM', () => onSignal('SIGTERM'));
+    process.on('SIGHUP', () => onSignal('SIGHUP'));
+
+    const runDeclinePipeline = async () => {
+        const runContext = createRunContextFn(jobSlug ? { cwd: invocationCwd, slug: jobSlug } : { cwd: invocationCwd });
+
+        jobPatch({ phase: 'research', stage: 'research', round: null });
+        const research = researchAgentArgs({ prompt, cwd: invocationCwd, researchPath: runContext.researchPath });
+        const researchAgent = new AgentClass(research.name, research.instructions, research.prompt, research.options);
+        const researchResult = await researchAgent.run({ verbose });
+        await jobCheckpoint();
+        const { content: researchContent, summary: researchSummary } = splitStageSummary(researchResult.result);
+        printStageSummary('research', resolveStageSummary('research', researchSummary, researchContent));
+
+        jobPatch({ phase: 'plan', stage: 'planner', round: null });
+        const planner = plannerAgentArgs({
+            prompt, cwd: invocationCwd, researchPath: runContext.researchPath, taskPath: runContext.taskPath, researchOutput: researchContent,
+        });
+        const plannerAgent = new AgentClass(planner.name, planner.instructions, planner.prompt, planner.options);
+        const plannerResult = await plannerAgent.run({ verbose });
+        await jobCheckpoint();
+        const { content: plannerContent, summary: plannerSummary } = splitStageSummary(plannerResult.result);
+        printStageSummary('planner', resolveStageSummary('planner', plannerSummary, plannerContent));
+
+        jobPatch({ phase: 'worktree', stage: 'worktree', round: null });
+        const worktree = await createWorktreeFn({ cwd: invocationCwd, slug: runContext.slug });
+        jobPatch({ branch: worktree.branch, worktree: worktree.worktreePath });
+
+        fs.mkdirSync(path.dirname(runContext.statusPath), { recursive: true });
+        fs.writeFileSync(
+            runContext.statusPath,
+            `# Status\n\n- Slug: \`${runContext.slug}\`\n- Branch: \`${worktree.branch}\`\n- Worktree: \`${worktree.worktreePath}\`\n`,
+        );
+
+        const testAccepted = await runTestLoop({
+            prompt,
+            worktreePath: worktree.worktreePath,
+            branch: worktree.branch,
+            taskPath: runContext.taskPath,
+            statusPath: runContext.statusPath,
+            maxRounds,
+            AgentClass,
+            verbose,
+            jobPatch,
+            jobCheckpoint,
+        });
+
+        const acceptedVerification = [testAccepted.verdict.summary, testAccepted.writerContent].filter(Boolean).join('\n');
+
+        await runCodeLoop({
+            prompt,
+            worktreePath: worktree.worktreePath,
+            branch: worktree.branch,
+            taskPath: runContext.taskPath,
+            statusPath: runContext.statusPath,
+            maxRounds,
+            AgentClass,
+            verbose,
+            jobPatch,
+            jobCheckpoint,
+            acceptedVerification,
+        });
+
+        jobPatch({ phase: 'commit', stage: 'commit', round: null });
+        const message = `orch: ${runContext.slug} ${prompt.split('\n')[0]}`;
+        const worktreeChanges = await collectWorktreeChangesFn({ worktreePath: worktree.worktreePath });
+        printFilesChanged(worktreeChanges);
+        const commitResult = await commitWorktreeFn({ worktreePath: worktree.worktreePath, branch: worktree.branch, message });
+
+        if (commitResult.committed) {
+            fs.appendFileSync(
+                runContext.statusPath,
+                `\n## Commit\n\n- SHA: \`${commitResult.sha}\`\n- Branch: \`${commitResult.branch}\`\n`,
+            );
+            console.log(`commit: ${commitResult.sha.slice(0, 7)} on ${commitResult.branch}`);
+            console.log(`merge:  git merge ${commitResult.branch}`);
+        } else {
+            fs.appendFileSync(
+                runContext.statusPath,
+                `\n## Commit\n\n- No changes to commit on \`${commitResult.branch}\`.\n`,
+            );
+            console.log(`commit: no changes on ${commitResult.branch}`);
+        }
+
+        jobPatch({ state: 'done', exitCode: 0, finishedAt: new Date().toISOString() });
+        exitFn(0);
+    };
+
+    const runAdjust = async (seqDoc) => {
+        const doneUnits = seqDoc.units.filter((u) => u.state === 'done');
+        const pendingUnits = seqDoc.units.filter((u) => u.state === 'pending');
+        if (pendingUnits.length === 0) return seqDoc;
+
+        let feedback;
+        for (let attempt = 1; attempt <= 3; attempt += 1) {
+            jobPatch({ phase: 'adjust', stage: 'adjust', round: attempt });
+            const adjust = adjustAgentArgs({
+                originalTask: prompt,
+                doneUnits,
+                pendingUnits,
+                tip: seqDoc.tip,
+                cwd: invocationCwd,
+                maxUnits,
+                feedback,
+            });
+            const adjustAgent = new AgentClass(adjust.name, adjust.instructions, adjust.prompt, adjust.options);
+            const adjustResult = await adjustAgent.run({ verbose });
+            await jobCheckpoint();
+            const { content: adjustContent, summary: adjustSummary } = splitStageSummary(adjustResult.result);
+            printStageSummary('adjust', resolveStageSummary('adjust', adjustSummary, adjustContent));
+
+            const parsed = parseDecomposition(adjustContent);
+            if (!parsed) {
+                feedback = ['adjust output was not valid JSON'];
+                continue;
+            }
+            const violations = validateAdjustResult(parsed, { units: seqDoc.units, maxUnits });
+            if (violations.length === 0) {
+                const applied = applyAdjustResult(seqDoc, parsed);
+                writeSeqFn(invocationCwd, jobSlug, applied);
+                const rewriteIds = (parsed.rewrites || []).map((r) => r.id);
+                const dropIds = parsed.drops || [];
+                const summaryParts = [];
+                if (rewriteIds.length) summaryParts.push(`rewrote ${rewriteIds.join(', ')}`);
+                if (dropIds.length) summaryParts.push(`dropped ${dropIds.join(', ')}`);
+                const summary = summaryParts.join('; ') || 'no changes';
+                appendAdjustmentFn(invocationCwd, jobSlug, {
+                    afterUnitId: doneUnits[doneUnits.length - 1]?.id ?? null,
+                    tip: applied.tip,
+                    summary,
+                });
+                console.log(`adjust: ${summary}`);
+                return applied;
+            }
+            feedback = violations;
+        }
+        console.log('adjust: validation failed after repairs — keeping previous pending list');
+        return seqDoc;
+    };
+
+    const spawnUnitChild = async (unit, tip) => {
+        const envelope = buildUnitEnvelope({
+            id: unit.id,
+            title: unit.title,
+            subtask: unit.subtask,
+            originalTask: prompt,
+        });
+        const unitPrompt = `${unit.subtask}\n\n${envelope}`;
+
+        const allocated = await allocateJobFn({
+            cwd: invocationCwd,
+            prompt: unitPrompt,
+            agent: options.agent,
+            maxRounds,
+            state: 'starting',
+            parent: jobSlug,
+            role: 'worker',
+            workerId: unit.id,
+        });
+        const unitSlug = allocated.slug;
+        patchUnitFn(invocationCwd, jobSlug, unit.id, {
+            slug: unitSlug,
+            state: 'running',
+        });
+
+        const { logPath } = jobPaths(invocationCwd, unitSlug);
+        const logFd = fs.openSync(logPath, 'a');
+        const childArgs = [
+            __filename, unitPrompt,
+            '--agent', options.agent,
+            '--max-rounds', String(maxRounds),
+            '--unit', `${jobSlug}:${unit.id}`,
+        ];
+        const child = spawnFn(process.execPath, childArgs, {
+            cwd: invocationCwd,
+            env: {
+                ...process.env,
+                ORCH_JOB_SLUG: unitSlug,
+                ORCH_DETACHED: '1',
+                ORCH_SEQ_DEPTH: '1',
+                ORCH_FANOUT_DEPTH: '1',
+            },
+            detached: true,
+            stdio: ['ignore', logFd, logFd],
+        });
+        child.unref();
+        patchJobFn(invocationCwd, unitSlug, { pid: child.pid, state: 'running' });
+        console.log(`[${unit.id} ${unitSlug}] running (base ${String(tip).slice(0, 7)})`);
+        return unitSlug;
+    };
+
+    const waitForUnit = async (unitId, unitSlug) => {
+        const spawnedAt = Date.now();
+        for (;;) {
+            if (interrupted) return 'interrupted';
+            await sleep(pollIntervalMs);
+            await jobCheckpoint();
+
+            const seq = readSeqFn(invocationCwd, jobSlug);
+            const unit = seq?.units?.find((u) => u.id === unitId);
+            if (unit && (unit.state === 'done' || unit.state === 'failed' || unit.state === 'skipped')) {
+                return unit.state;
+            }
+
+            const job = reconcileJobFn(invocationCwd, unitSlug, readJob(invocationCwd, unitSlug));
+            if (job && TERMINAL_JOB_STATES.includes(job.state)) {
+                if (unit && unit.state !== 'done' && unit.state !== 'failed') {
+                    const nextState = job.state === 'done' ? 'done' : 'failed';
+                    patchUnitFn(invocationCwd, jobSlug, unitId, {
+                        state: nextState,
+                        sha: job.sha ?? null,
+                    });
+                    return nextState;
+                }
+                return job.state === 'done' ? 'done' : 'failed';
+            }
+
+            // Grace period before treating a dead pid as a crash (mirrors fan-out).
+            if (job && !job.pid && Date.now() - spawnedAt > Math.max(pollIntervalMs * 4, 2000)) {
+                patchUnitFn(invocationCwd, jobSlug, unitId, { state: 'failed' });
+                return 'failed';
+            }
+        }
+    };
+
+    try {
+        jobPatch({ phase: 'triage', stage: 'triage', round: null });
+        const triage = triageAgentArgs({ prompt, cwd: invocationCwd });
+        const triageAgent = new AgentClass(triage.name, triage.instructions, triage.prompt, triage.options);
+        const triageResult = await triageAgent.run({ verbose });
+        await jobCheckpoint();
+        const { content: triageContent, summary: triageSummary } = splitStageSummary(triageResult.result);
+        printStageSummary('triage', resolveStageSummary('triage', triageSummary, triageContent));
+        const parsed = parseTriageJson(triageContent);
+
+        if (parsed?.simple === true) {
+            console.log('triage: simple — seq skipped (quick-fix)');
+            jobPatch({ phase: 'quick-fix', stage: 'quick-fix', round: null });
+            const quickFix = quickFixAgentArgs({ prompt, cwd: invocationCwd, fix_plan: parsed.fix_plan });
+            const quickFixTracker = new FileTracker({ cwd: invocationCwd });
+            const quickFixAgent = new AgentClass(
+                quickFix.name,
+                quickFix.instructions,
+                quickFix.prompt,
+                { ...quickFix.options, fileTracker: quickFixTracker },
+            );
+            const quickFixResult = await quickFixAgent.run({ verbose });
+            await jobCheckpoint();
+            const { content: quickFixContent, summary: quickFixSummary } = splitStageSummary(quickFixResult.result);
+            printStageSummary('quick-fix', resolveStageSummary('quick-fix', quickFixSummary, quickFixContent), quickFixTracker.getFiles());
+            jobPatch({ state: 'done', exitCode: 0, finishedAt: new Date().toISOString() });
+            exitFn(0);
+            return;
+        }
+
+        console.log('triage: complex — seq requested');
+
+        let feedback;
+        let decision = null;
+        for (let attempt = 1; attempt <= 3; attempt += 1) {
+            jobPatch({ phase: 'decompose', stage: 'seq-decomposer', round: attempt });
+            const decomposer = seqDecomposerAgentArgs({
+                prompt, cwd: invocationCwd, maxUnits, feedback,
+            });
+            const decomposerAgent = new AgentClass(decomposer.name, decomposer.instructions, decomposer.prompt, decomposer.options);
+            const decomposerResult = await decomposerAgent.run({ verbose });
+            await jobCheckpoint();
+            const { content: decomposerContent, summary: decomposerSummary } = splitStageSummary(decomposerResult.result);
+            printStageSummary('seq-decomposer', resolveStageSummary('seq-decomposer', decomposerSummary, decomposerContent));
+
+            const parsedDecomposition = parseDecomposition(decomposerContent);
+            if (!parsedDecomposition) {
+                feedback = ['decomposer output was not valid JSON'];
+                if (attempt === 3) decision = { decline: true, why: 'decomposer did not return valid JSON after repair attempts' };
+                continue;
+            }
+            if (parsedDecomposition.decomposable === false) {
+                decision = { decline: true, why: parsedDecomposition.why };
+                break;
+            }
+
+            const violations = validateSeqDecomposition(parsedDecomposition, { maxUnits });
+            if (violations.length === 0) {
+                decision = { decline: false, decomposition: parsedDecomposition };
+                break;
+            }
+            feedback = violations;
+            if (attempt === 3) {
+                decision = { decline: true, why: `decomposition still invalid after repairs: ${violations.join('; ')}` };
+            }
+        }
+
+        if (decision.decline) {
+            console.log(`decomposer: declined — ${decision.why}`);
+            console.log('falling through to the single-worktree pipeline');
+            await runDeclinePipeline();
+            return;
+        }
+
+        const { decomposition } = decision;
+        const base = execFileFn('git', ['-C', invocationCwd, 'rev-parse', 'HEAD']).trim();
+
+        await createWorktreeFn({ cwd: invocationCwd, slug: jobSlug, base });
+
+        const units = decomposition.units.map((unit) => ({
+            id: unit.id,
+            title: unit.title,
+            subtask: unit.subtask,
+            state: 'pending',
+            slug: null,
+            sha: null,
+            changedFiles: null,
+        }));
+
+        writeSeqFn(invocationCwd, jobSlug, {
+            version: 1,
+            parentSlug: jobSlug,
+            task: prompt,
+            base,
+            tip: base,
+            maxUnits,
+            units,
+            adjustments: [],
+            state: 'running',
+            startedAt: new Date().toISOString(),
+            finishedAt: null,
+        });
+
+        console.log(`decomposer: ${units.length} units`);
+        jobPatch({ phase: 'schedule', stage: null, round: null });
+
+        for (;;) {
+            if (interrupted) {
+                exitFn(exitCodeForSignal('SIGINT'));
+                return;
+            }
+
+            await jobCheckpoint();
+
+            let seq = readSeqFn(invocationCwd, jobSlug);
+            const firstPending = seq.units.find((u) => u.state === 'pending');
+            if (!firstPending) {
+                const failed = seq.units.some((u) => u.state === 'failed');
+                writeSeqFn(invocationCwd, jobSlug, {
+                    ...seq,
+                    state: failed ? 'failed' : 'done',
+                    finishedAt: new Date().toISOString(),
+                });
+                jobPatch({
+                    state: failed ? 'failed' : 'done',
+                    exitCode: failed ? 1 : 0,
+                    finishedAt: new Date().toISOString(),
+                });
+                if (failed) {
+                    exitFn(1);
+                } else {
+                    console.log(`seq complete: ${seq.units.filter((u) => u.state === 'done').length}/${seq.units.length} merged`);
+                    console.log(`merge:  git merge orch/${jobSlug}`);
+                    exitFn(0);
+                }
+                return;
+            }
+
+            // Re-attach to a live running unit instead of spawning a duplicate.
+            const live = seq.units.find((u) => u.state === 'running' && u.slug);
+            if (live) {
+                const terminal = await waitForUnit(live.id, live.slug);
+                if (terminal === 'interrupted') {
+                    exitFn(exitCodeForSignal('SIGINT'));
+                    return;
+                }
+                if (terminal !== 'done') {
+                    console.log(`[${live.id} …] ${terminal}`);
+                    const liveSlug = live.slug;
+                    console.log(`stopped: chain halted; next: orch continue ${liveSlug} "fix …"`);
+                    writeSeqFn(invocationCwd, jobSlug, {
+                        ...readSeqFn(invocationCwd, jobSlug),
+                        state: 'failed',
+                        finishedAt: new Date().toISOString(),
+                    });
+                    jobPatch({ state: 'failed', exitCode: 1, finishedAt: new Date().toISOString() });
+                    exitFn(1);
+                    return;
+                }
+                console.log(`[${live.id} …] done — merging`);
+                await mergeOneUnitFn({
+                    cwd: invocationCwd,
+                    parentSlug: jobSlug,
+                    unitId: live.id,
+                    unitBranch: `orch/${live.slug}`,
+                    agent: options.agent,
+                    AgentClass,
+                    maxRounds,
+                    verbose,
+                    jobSlug,
+                    jobCwd,
+                    createWorktree: createWorktreeFn,
+                    commitWorktree: commitWorktreeFn,
+                    execFile: execFileFn,
+                    exit: exitFn,
+                });
+                seq = readSeqFn(invocationCwd, jobSlug);
+                await runAdjust(seq);
+                continue;
+            }
+
+            const tip = seq.tip;
+            const unitSlug = await spawnUnitChild(firstPending, tip);
+            const terminal = await waitForUnit(firstPending.id, unitSlug);
+            if (terminal === 'interrupted') {
+                exitFn(exitCodeForSignal('SIGINT'));
+                return;
+            }
+            if (terminal !== 'done') {
+                console.log(`[${firstPending.id} …] ${terminal}`);
+                console.log(`stopped: chain halted; next: orch continue ${unitSlug} "fix …"`);
+                writeSeqFn(invocationCwd, jobSlug, {
+                    ...readSeqFn(invocationCwd, jobSlug),
+                    state: 'failed',
+                    finishedAt: new Date().toISOString(),
+                });
+                jobPatch({ state: 'failed', exitCode: 1, finishedAt: new Date().toISOString() });
+                exitFn(1);
+                return;
+            }
+
+            console.log(`[${firstPending.id} …] done — merging`);
+            await mergeOneUnitFn({
+                cwd: invocationCwd,
+                parentSlug: jobSlug,
+                unitId: firstPending.id,
+                unitBranch: `orch/${unitSlug}`,
+                agent: options.agent,
+                AgentClass,
+                maxRounds,
+                verbose,
+                jobSlug,
+                jobCwd,
+                createWorktree: createWorktreeFn,
+                commitWorktree: commitWorktreeFn,
+                execFile: execFileFn,
+                exit: exitFn,
+            });
+            seq = readSeqFn(invocationCwd, jobSlug);
+            await runAdjust(seq);
+        }
+    } catch (err) {
+        console.error(`Error: ${err.message}`);
+        if (jobSlug) {
+            try {
+                patchTerminalJob(patchJobFn, jobCwd, jobSlug, {
+                    state: 'failed',
+                    exitCode: 1,
+                    summary: '',
+                    error: err.message,
+                    task: prompt,
+                });
+            } catch {
+                // Best-effort.
+            }
+        }
+        exitFn(1);
+    }
+}
+
+/**
+ * Hidden `--seq-continue <parent>`: merge any done-but-unmerged units, adjust,
+ * then continue the pending schedule loop.
+ */
+export async function runSeqContinuePipeline(options = {}) {
+    const verbose = Boolean(options.verbose);
+    const maxRounds = options.maxRounds ?? 5;
+    const backend = AGENT_BACKENDS[options.agent];
+    if (!backend) {
+        throw new Error(`Unknown agent backend: ${options.agent}`);
+    }
+    const AgentClass = options.AgentClass ?? backend.AgentClass;
+    const invocationCwd = options.cwd ?? process.cwd();
+    const parentSlug = options.parentSlug;
+    const exitFn = options.exit ?? ((code) => process.exit(code));
+    const pollIntervalMs = options.pollIntervalMs ?? 500;
+
+    const createWorktreeFn = options.createWorktree ?? createWorktree;
+    const commitWorktreeFn = options.commitWorktree ?? commitWorktree;
+    const spawnFn = options.spawn ?? spawn;
+    const execFileFn = options.execFile ?? defaultExecFile;
+    const allocateJobFn = options.allocateJob ?? allocateJob;
+    const reconcileJobFn = options.reconcileJob ?? reconcileJob;
+    const readSeqFn = options.readSeq ?? readSeq;
+    const writeSeqFn = options.writeSeq ?? writeSeq;
+    const patchUnitFn = options.patchUnit ?? patchUnit;
+    const appendAdjustmentFn = options.appendAdjustment ?? appendAdjustment;
+    const mergeOneUnitFn = options.mergeOneUnit ?? mergeOneUnit;
+
+    const jobSlug = options.jobSlug ?? parentSlug ?? process.env.ORCH_JOB_SLUG;
+    const jobCwd = options.jobCwd ?? invocationCwd;
+    const patchJobFn = options.patchJob ?? patchJob;
+    const checkpointPauseFn = options.checkpointPause ?? checkpointPause;
+    const pausePollIntervalMs = options.pausePollIntervalMs ?? 500;
+
+    const jobPatch = (fields) => {
+        if (!jobSlug) return;
+        return patchJobCursor(patchJobFn, jobCwd, jobSlug, fields);
+    };
+    const jobCheckpoint = async () => {
+        if (!jobSlug) return;
+        await checkpointPauseFn(jobCwd, jobSlug, { pollIntervalMs: pausePollIntervalMs });
+    };
+
+    const seq = readSeqFn(invocationCwd, parentSlug);
+    if (!seq) {
+        console.error(`Error: unknown parent ${parentSlug} (no seq.json found)`);
+        exitFn(1);
+        return;
+    }
+
+    const maxUnits = seq.maxUnits ?? 8;
+    const prompt = seq.task;
+
+    const runAdjust = async (seqDoc) => {
+        const doneUnits = seqDoc.units.filter((u) => u.state === 'done');
+        const pendingUnits = seqDoc.units.filter((u) => u.state === 'pending');
+        if (pendingUnits.length === 0) return seqDoc;
+
+        let feedback;
+        for (let attempt = 1; attempt <= 3; attempt += 1) {
+            const adjust = adjustAgentArgs({
+                originalTask: prompt,
+                doneUnits,
+                pendingUnits,
+                tip: seqDoc.tip,
+                cwd: invocationCwd,
+                maxUnits,
+                feedback,
+            });
+            const adjustAgent = new AgentClass(adjust.name, adjust.instructions, adjust.prompt, adjust.options);
+            const adjustResult = await adjustAgent.run({ verbose });
+            await jobCheckpoint();
+            const { content: adjustContent } = splitStageSummary(adjustResult.result);
+            const parsed = parseDecomposition(adjustContent);
+            if (!parsed) {
+                feedback = ['adjust output was not valid JSON'];
+                continue;
+            }
+            const violations = validateAdjustResult(parsed, { units: seqDoc.units, maxUnits });
+            if (violations.length === 0) {
+                const applied = applyAdjustResult(seqDoc, parsed);
+                writeSeqFn(invocationCwd, parentSlug, applied);
+                appendAdjustmentFn(invocationCwd, parentSlug, {
+                    afterUnitId: doneUnits[doneUnits.length - 1]?.id ?? null,
+                    tip: applied.tip,
+                    summary: 'seq-continue adjust',
+                });
+                return applied;
+            }
+            feedback = violations;
+        }
+        return seqDoc;
+    };
+
+    const spawnUnitChild = async (unit) => {
+        const envelope = buildUnitEnvelope({
+            id: unit.id,
+            title: unit.title,
+            subtask: unit.subtask,
+            originalTask: prompt,
+        });
+        const unitPrompt = `${unit.subtask}\n\n${envelope}`;
+        const allocated = await allocateJobFn({
+            cwd: invocationCwd,
+            prompt: unitPrompt,
+            agent: options.agent,
+            maxRounds,
+            state: 'starting',
+            parent: parentSlug,
+            role: 'worker',
+            workerId: unit.id,
+        });
+        const unitSlug = allocated.slug;
+        patchUnitFn(invocationCwd, parentSlug, unit.id, { slug: unitSlug, state: 'running' });
+        const { logPath } = jobPaths(invocationCwd, unitSlug);
+        const logFd = fs.openSync(logPath, 'a');
+        const childArgs = [
+            __filename, unitPrompt,
+            '--agent', options.agent,
+            '--max-rounds', String(maxRounds),
+            '--unit', `${parentSlug}:${unit.id}`,
+        ];
+        const child = spawnFn(process.execPath, childArgs, {
+            cwd: invocationCwd,
+            env: {
+                ...process.env,
+                ORCH_JOB_SLUG: unitSlug,
+                ORCH_DETACHED: '1',
+                ORCH_SEQ_DEPTH: '1',
+                ORCH_FANOUT_DEPTH: '1',
+            },
+            detached: true,
+            stdio: ['ignore', logFd, logFd],
+        });
+        child.unref();
+        patchJobFn(invocationCwd, unitSlug, { pid: child.pid, state: 'running' });
+        return unitSlug;
+    };
+
+    const waitForUnit = async (unitId, unitSlug) => {
+        for (;;) {
+            await sleep(pollIntervalMs);
+            await jobCheckpoint();
+            const current = readSeqFn(invocationCwd, parentSlug);
+            const unit = current?.units?.find((u) => u.id === unitId);
+            if (unit && (unit.state === 'done' || unit.state === 'failed')) return unit.state;
+            const job = reconcileJobFn(invocationCwd, unitSlug, readJob(invocationCwd, unitSlug));
+            if (job && TERMINAL_JOB_STATES.includes(job.state)) {
+                return job.state === 'done' ? 'done' : 'failed';
+            }
+        }
+    };
+
+    try {
+        jobPatch({ state: 'running', phase: 'schedule', finishedAt: null, exitCode: null });
+        writeSeqFn(invocationCwd, parentSlug, { ...seq, state: 'running', finishedAt: null });
+
+        // Merge any done units whose tip may not yet include them (done-but-unmerged).
+        let current = readSeqFn(invocationCwd, parentSlug);
+        for (const unit of current.units) {
+            if (unit.state === 'done' && unit.slug) {
+                // Heuristic: merge if unit sha is set and tip still looks like an earlier base,
+                // or always attempt merge of the most recent done unit that hasn't been adjusted after.
+                const alreadyAdjusted = (current.adjustments || []).some((a) => a.afterUnitId === unit.id);
+                if (!alreadyAdjusted) {
+                    await mergeOneUnitFn({
+                        cwd: invocationCwd,
+                        parentSlug,
+                        unitId: unit.id,
+                        unitBranch: `orch/${unit.slug}`,
+                        agent: options.agent,
+                        AgentClass,
+                        maxRounds,
+                        verbose,
+                        jobSlug,
+                        jobCwd,
+                        createWorktree: createWorktreeFn,
+                        commitWorktree: commitWorktreeFn,
+                        execFile: execFileFn,
+                        exit: (code) => {
+                            if (code !== 0) throw new Error(`merge of ${unit.id} failed`);
+                        },
+                    });
+                    current = await runAdjust(readSeqFn(invocationCwd, parentSlug));
+                }
+            }
+        }
+
+        for (;;) {
+            await jobCheckpoint();
+            current = readSeqFn(invocationCwd, parentSlug);
+            const pending = current.units.find((u) => u.state === 'pending');
+            if (!pending) {
+                writeSeqFn(invocationCwd, parentSlug, {
+                    ...current,
+                    state: 'done',
+                    finishedAt: new Date().toISOString(),
+                });
+                jobPatch({ state: 'done', exitCode: 0, finishedAt: new Date().toISOString() });
+                exitFn(0);
+                return;
+            }
+
+            const unitSlug = await spawnUnitChild(pending);
+            const terminal = await waitForUnit(pending.id, unitSlug);
+            if (terminal !== 'done') {
+                writeSeqFn(invocationCwd, parentSlug, {
+                    ...readSeqFn(invocationCwd, parentSlug),
+                    state: 'failed',
+                    finishedAt: new Date().toISOString(),
+                });
+                jobPatch({ state: 'failed', exitCode: 1, finishedAt: new Date().toISOString() });
+                exitFn(1);
+                return;
+            }
+
+            await mergeOneUnitFn({
+                cwd: invocationCwd,
+                parentSlug,
+                unitId: pending.id,
+                unitBranch: `orch/${unitSlug}`,
+                agent: options.agent,
+                AgentClass,
+                maxRounds,
+                verbose,
+                jobSlug,
+                jobCwd,
+                createWorktree: createWorktreeFn,
+                commitWorktree: commitWorktreeFn,
+                execFile: execFileFn,
+                exit: exitFn,
+            });
+            await runAdjust(readSeqFn(invocationCwd, parentSlug));
+        }
+    } catch (err) {
+        console.error(`Error: ${err.message}`);
+        exitFn(1);
     }
-    cascadeStopFanoutChildren(cwd, parentSlug, { kill, isPidAlive: isPidAliveFn });
 }
 
 /**
@@ -1748,7 +3504,7 @@ export async function runFanoutPipeline(prompt, options = {}) {
 
     const jobPatch = (fields) => {
         if (!jobSlug) return;
-        patchJobFn(jobCwd, jobSlug, fields);
+        return patchJobCursor(patchJobFn, jobCwd, jobSlug, fields);
     };
     const jobCheckpoint = async () => {
         if (!jobSlug) return;
@@ -1808,7 +3564,7 @@ export async function runFanoutPipeline(prompt, options = {}) {
         const triageResult = await triageAgent.run({ verbose });
         await jobCheckpoint();
         const { content: triageContent, summary: triageSummary } = splitStageSummary(triageResult.result);
-        printStageSummary('triage', triageSummary);
+        printStageSummary('triage', resolveStageSummary('triage', triageSummary, triageContent));
         const parsed = parseTriageJson(triageContent);
 
         if (parsed?.simple === true) {
@@ -1824,8 +3580,8 @@ export async function runFanoutPipeline(prompt, options = {}) {
             );
             const quickFixResult = await quickFixAgent.run({ verbose });
             await jobCheckpoint();
-            const { summary: quickFixSummary } = splitStageSummary(quickFixResult.result);
-            printStageSummary('quick-fix', quickFixSummary, quickFixTracker.getFiles());
+            const { content: quickFixContent, summary: quickFixSummary } = splitStageSummary(quickFixResult.result);
+            printStageSummary('quick-fix', resolveStageSummary('quick-fix', quickFixSummary, quickFixContent), quickFixTracker.getFiles());
             jobPatch({ state: 'done', exitCode: 0, finishedAt: new Date().toISOString() });
             exitFn(0);
             return;
@@ -1841,7 +3597,7 @@ export async function runFanoutPipeline(prompt, options = {}) {
         const boundariesResult = await boundariesAgent.run({ verbose });
         await jobCheckpoint();
         const { content: boundariesOutput, summary: boundariesSummary } = splitStageSummary(boundariesResult.result);
-        printStageSummary('boundaries', boundariesSummary);
+        printStageSummary('boundaries', resolveStageSummary('boundaries', boundariesSummary, boundariesOutput));
         console.log(`boundaries: ${boundariesSummary || 'done'}`);
 
         // --- decomposer: up to two repair round-trips on validation failure ---
@@ -1856,7 +3612,7 @@ export async function runFanoutPipeline(prompt, options = {}) {
             const decomposerResult = await decomposerAgent.run({ verbose });
             await jobCheckpoint();
             const { content: decomposerContent, summary: decomposerSummary } = splitStageSummary(decomposerResult.result);
-            printStageSummary('decomposer', decomposerSummary);
+            printStageSummary('decomposer', resolveStageSummary('decomposer', decomposerSummary, decomposerContent));
 
             const parsedDecomposition = parseDecomposition(decomposerContent);
             if (!parsedDecomposition) {
@@ -1892,7 +3648,7 @@ export async function runFanoutPipeline(prompt, options = {}) {
             const researchResult = await researchAgent.run({ verbose });
             await jobCheckpoint();
             const { content: researchContent, summary: researchSummary } = splitStageSummary(researchResult.result);
-            printStageSummary('research', researchSummary);
+            printStageSummary('research', resolveStageSummary('research', researchSummary, researchContent));
 
             jobPatch({ phase: 'plan', stage: 'planner', round: null });
             const planner = plannerAgentArgs({
@@ -1901,8 +3657,8 @@ export async function runFanoutPipeline(prompt, options = {}) {
             const plannerAgent = new AgentClass(planner.name, planner.instructions, planner.prompt, planner.options);
             const plannerResult = await plannerAgent.run({ verbose });
             await jobCheckpoint();
-            const { summary: plannerSummary } = splitStageSummary(plannerResult.result);
-            printStageSummary('planner', plannerSummary);
+            const { content: plannerContent, summary: plannerSummary } = splitStageSummary(plannerResult.result);
+            printStageSummary('planner', resolveStageSummary('planner', plannerSummary, plannerContent));
 
             jobPatch({ phase: 'worktree', stage: 'worktree', round: null });
             const worktree = createWorktreeFn({ cwd: invocationCwd, slug: runContext.slug });
@@ -2447,6 +4203,72 @@ async function runWorkerFromCli(options) {
     });
 }
 
+/** CLI glue for `--unit`: resolves the parent seq/unit record, builds the unit
+ * envelope, allocates (or reuses) the job record, then calls `runUnitPipeline`. */
+async function runUnitFromCli(options) {
+    const cwd = process.cwd();
+    const { parentSlug, workerId: unitId } = splitParentWorker(options.unit);
+    if (!parentSlug || !unitId) {
+        console.error(`Error: --unit must be in the form <parent-slug>:<unit-id>, got "${options.unit}"`);
+        process.exit(1);
+        return;
+    }
+
+    process.env.ORCH_SEQ_DEPTH = '1';
+    process.env.ORCH_FANOUT_DEPTH = '1';
+
+    const seq = readSeq(cwd, parentSlug);
+    if (!seq) {
+        console.error(`Error: unknown parent ${parentSlug} (no seq.json found)`);
+        process.exit(1);
+        return;
+    }
+
+    const unit = seq.units.find((u) => u.id === unitId);
+    if (!unit) {
+        console.error(`Error: unknown unit ${unitId} in ${parentSlug}`);
+        process.exit(1);
+        return;
+    }
+
+    const envelope = buildUnitEnvelope({
+        id: unit.id,
+        title: unit.title,
+        subtask: unit.subtask,
+        originalTask: seq.task,
+    });
+    const unitPrompt = `${unit.subtask}\n\n${envelope}`;
+
+    let jobSlug = process.env.ORCH_JOB_SLUG;
+    if (!jobSlug) {
+        const alloc = allocateJob({
+            cwd,
+            prompt: unitPrompt,
+            agent: options.agent,
+            maxRounds: options.maxRounds,
+            state: 'running',
+            pid: process.pid,
+            parent: parentSlug,
+            role: 'worker',
+            workerId: unitId,
+        });
+        jobSlug = alloc.slug;
+    }
+    setJobSlug(jobSlug);
+
+    await runUnitPipeline(unitPrompt, {
+        agent: options.agent,
+        maxRounds: options.maxRounds,
+        verbose: options.verbose,
+        cwd,
+        parentSlug,
+        unitId,
+        base: seq.tip,
+        jobSlug,
+        jobCwd: cwd,
+    });
+}
+
 /** CLI glue for `--integrate`: resolves the parent fan-out, allocates (or reuses) the
  * integration job record, then calls `runIntegratePipeline`. */
 async function runIntegrateFromCli(options) {
@@ -2512,28 +4334,80 @@ function resolveAgentOrExit(cliAgent, cwd = process.cwd()) {
     }
 }
 
+/**
+ * Resolve CLI `--notify` / `--no-notify` to `true` | `false` | `undefined`.
+ * Commander stores both on `opts.notify` (negatable); detect both-via-argv
+ * for the mutual-exclusion error.
+ */
+function cliNotifyFromOptions(options, argv = process.argv) {
+    const hasNotify = argv.includes('--notify');
+    const hasNoNotify = argv.includes('--no-notify');
+    if (hasNotify && hasNoNotify) {
+        console.error('Error: --notify and --no-notify are mutually exclusive');
+        process.exit(1);
+        return undefined;
+    }
+    if (options.notify === true) return true;
+    if (options.notify === false) return false;
+    return undefined;
+}
+
+function resolveNotifyOrExit(cliNotify, cwd = process.cwd()) {
+    try {
+        return resolveNotify({ cliNotify, cwd });
+    } catch (err) {
+        console.error(`Error: ${err.message}`);
+        process.exit(1);
+        return undefined;
+    }
+}
+
+/** Apply process-level notify gate from CLI flags + config (skip for dry-run). */
+function applyNotifyEnabled(options, { cwd = process.cwd(), dryRun = false } = {}) {
+    if (dryRun) {
+        setNotifyEnabled(false);
+        return false;
+    }
+    const cliNotify = cliNotifyFromOptions(options);
+    const enabled = resolveNotifyOrExit(cliNotify, cwd);
+    setNotifyEnabled(enabled);
+    return enabled;
+}
+
+/** Append `--notify` / `--no-notify` to child argv when the parent had an explicit flag. */
+function appendNotifyArgs(args, notify) {
+    if (notify === true) args.push('--notify');
+    else if (notify === false) args.push('--no-notify');
+}
+
 const program = new Command();
 
 program
     .name('orch')
     .version(version)
     .description('The Orchestrator: triage → research → plan → implement pipeline against a task')
-    .argument('<task...>', 'Task description to use as the prompt (mention a file path and the agent will read it)')
+    .argument('[task...]', 'Task description to use as the prompt (mention a file path and the agent will read it)')
     .option('-v, --verbose', 'Stream agent thinking/output deltas to stderr as the pipeline runs')
     .option('--dry-run', 'Check that the selected agent CLI is on PATH and exit; do not run the pipeline')
     .option('--ask', 'Ask a read-only question about the codebase; print the reply and exit (skips triage and all write pipelines)')
     .option('--quick', 'Skip triage, run quick-fix directly in the current working tree; create no artifacts, worktrees, or commits')
     .option('--detach', 'Run the pipeline in the background and return immediately; manage it with orch list/status/pause/resume/stop/logs. Cannot be combined with --ask, --quick, or --dry-run')
     .option('--max-rounds <n>', 'Max writer⇄critic and writer⇄runner iterations per implementer loop (ignored with --ask and --quick)', positiveIntParser('--max-rounds'), 5)
-    .option('--fan-out', 'Decompose the task into parallel workers coordinated by this process (see README Fan-out section). Cannot be combined with --ask, --quick, or --dry-run')
+    .option('--fan-out', 'Decompose into parallel workers, then integrate once. Cannot be combined with --ask, --quick, --dry-run, or --seq')
+    .option('--seq', 'Decompose into ordered units; merge each, then adjust the next. Cannot be combined with --fan-out, --ask, --quick, or --dry-run')
     .option('--max-workers <n>', 'Max number of parallel fan-out workers (only meaningful with --fan-out)', positiveIntParser('--max-workers'), 4)
+    .option('--max-units <n>', 'Max number of sequential units (only meaningful with --seq)', positiveIntParser('--max-units'), 8)
     .option('--max-concurrency <n>', 'Optional hard ceiling on in-flight fan-out workers at once (only meaningful with --fan-out; default: coordinator chooses)', positiveIntParser('--max-concurrency'))
+    .option('--notify', 'Enable desktop notification when a job reaches a terminal state (default: on)')
+    .option('--no-notify', 'Disable desktop notifications for this run')
     .addOption(
-        new Option('--agent <agent>', 'Agent backend to run the pipeline with: "cursor" (Cursor Agent CLI), "claude" (Claude Code CLI), or "agn" (agn CLI). Omitting uses local then global config, else cursor')
-            .choices(['cursor', 'claude', 'agn']),
+        new Option('--agent <agent>', 'Agent backend to run the pipeline with: "cursor" (Cursor Agent CLI), "claude" (Claude Code CLI), "agn" (agn CLI), or "opencode" (OpenCode CLI). Omitting uses local then global config, else cursor')
+            .choices(['cursor', 'claude', 'agn', 'opencode']),
     )
     .addOption(new Option('--worker <value>', 'internal: run a single fan-out worker "<parent-slug>:<worker-id>"').hideHelp())
+    .addOption(new Option('--unit <value>', 'internal: run a single seq unit "<parent-slug>:<unit-id>"').hideHelp())
     .addOption(new Option('--integrate <value>', 'internal: (re)run fan-out integration for "<parent-slug>"').hideHelp())
+    .addOption(new Option('--seq-continue <value>', 'internal: resume a seq coordinator after a fixed unit "<parent-slug>"').hideHelp())
     .addHelpText(
         'after',
         `
@@ -2541,20 +4415,23 @@ Examples:
   $ orch "fix the typo in the README" --agent claude
   $ orch "fix the bug described in task.md" --agent cursor -v
   $ orch "implement the local spec" --agent agn -v
+  $ orch "fix the typo in the README" --agent opencode
   $ orch --ask "where is the CLI entrypoint?" --agent claude
   $ orch --quick "fix the typo in the README" --agent claude
   $ orch "noop" --dry-run --agent cursor
+  $ orch "noop" --dry-run --agent opencode
   $ orch config                                          # print effective agent
   $ orch config --agent claude                           # pin global default
   $ orch config --agent agn --local                      # pin project default
+  $ orch config --agent opencode                         # pin OpenCode as default
 
 Headless runs:
   $ orch "long-running task" --detach --agent claude   # start in the background, prints the run slug
   $ orch list                                          # show all tracked runs
   $ orch status [slug]                                 # show full status (defaults to most recent)
   $ orch pause <slug>                                  # request a pause at the next stage boundary
-  $ orch resume <slug>                                 # unpause a paused/pausing run
-  $ orch continue <slug> "new task"                    # new work on a finished run's worktree
+  $ orch resume <slug>                                 # unpause live pause, or recover failed/stopped/crashed
+  $ orch continue <slug> "new task"                    # new work on a done run's worktree
                                                        # (workers: same command; then re-integrate the parent)
   $ orch stop <slug>                                   # send SIGTERM to a running job
   $ orch logs <slug> [-f]                              # print (or follow) a run's log file
@@ -2562,17 +4439,114 @@ Headless runs:
 Fan-out:
   $ orch "implement the billing module" --fan-out --agent claude   # triage, decompose, run parallel workers, integrate
   $ orch "implement X" --fan-out --max-workers 6 --max-concurrency 3
+
+Sequential (--seq):
+  $ orch "implement the billing module" --seq --agent claude
+  $ orch "implement X" --seq --max-units 6
 `,
     )
     .action(async (task, options) => {
-        const prompt = task.join(' ').trim();
+        const prompt = (Array.isArray(task) ? task : []).join(' ').trim();
+
+        options.agent = resolveAgentOrExit(options.agent);
+        applyNotifyEnabled(options, { dryRun: Boolean(options.dryRun) });
+
+        if (options.seqContinue) {
+            const cwd = process.cwd();
+            const parentSlug = options.seqContinue;
+            const seq = readSeq(cwd, parentSlug);
+            if (!seq) {
+                console.error(`Error: unknown parent ${parentSlug} (no seq.json found)`);
+                process.exit(1);
+                return;
+            }
+            let jobSlug = process.env.ORCH_JOB_SLUG;
+            if (!jobSlug) {
+                jobSlug = parentSlug;
+                setJobSlug(jobSlug);
+            }
+            await runSeqContinuePipeline({
+                agent: options.agent,
+                maxRounds: options.maxRounds,
+                verbose: options.verbose,
+                cwd,
+                parentSlug,
+                jobSlug,
+                jobCwd: cwd,
+            });
+            return;
+        }
+
         if (!prompt) {
-            console.error('Error: task cannot be empty');
+            // `[task...]` stays optional so hidden `--seq-continue` can omit a
+            // positional; still mirror commander's required-arg error when argv
+            // has no task parts at all (vs empty/whitespace → cannot be empty).
+            const taskParts = Array.isArray(task) ? task : [];
+            if (taskParts.length === 0) {
+                console.error("error: missing required argument 'task'");
+            } else {
+                console.error('Error: task cannot be empty');
+            }
             process.exit(1);
             return;
         }
 
-        options.agent = resolveAgentOrExit(options.agent);
+        if (options.seq && options.fanOut) {
+            console.error('Error: --seq cannot be combined with --fan-out');
+            process.exit(1);
+            return;
+        }
+
+        if (options.seq) {
+            const conflicts = ['ask', 'quick', 'dryRun']
+                .filter((key) => options[key])
+                .map((key) => `--${key === 'dryRun' ? 'dry-run' : key}`);
+            if (conflicts.length > 0) {
+                console.error(`Error: --seq cannot be combined with ${conflicts.join(', ')}`);
+                process.exit(1);
+                return;
+            }
+            if (process.env.ORCH_SEQ_DEPTH || process.env.ORCH_FANOUT_DEPTH) {
+                console.error('Error: --seq cannot be used inside a seq/fan-out child (ORCH_SEQ_DEPTH or ORCH_FANOUT_DEPTH is already set)');
+                process.exit(1);
+                return;
+            }
+
+            if (options.detach) {
+                await runDetached(prompt, {
+                    ...options,
+                    seq: true,
+                    maxUnits: options.maxUnits,
+                    notify: cliNotifyFromOptions(options),
+                });
+                return;
+            }
+
+            const cwd = process.cwd();
+            let slug = process.env.ORCH_JOB_SLUG;
+            if (!slug) {
+                const alloc = allocateJob({
+                    cwd,
+                    prompt,
+                    agent: options.agent,
+                    maxRounds: options.maxRounds,
+                    state: 'running',
+                    pid: process.pid,
+                    role: 'coordinator',
+                });
+                slug = alloc.slug;
+            }
+            setJobSlug(slug);
+
+            await runSeqPipeline(prompt, {
+                ...options,
+                cwd,
+                jobSlug: slug,
+                jobCwd: cwd,
+                maxUnits: options.maxUnits,
+            });
+            return;
+        }
 
         if (options.fanOut) {
             const conflicts = ['ask', 'quick', 'dryRun']
@@ -2583,8 +4557,8 @@ Fan-out:
                 process.exit(1);
                 return;
             }
-            if (process.env.ORCH_FANOUT_DEPTH) {
-                console.error('Error: --fan-out cannot be used inside a fan-out child (ORCH_FANOUT_DEPTH is already set)');
+            if (process.env.ORCH_FANOUT_DEPTH || process.env.ORCH_SEQ_DEPTH) {
+                console.error('Error: --fan-out cannot be used inside a fan-out/seq child (ORCH_FANOUT_DEPTH or ORCH_SEQ_DEPTH is already set)');
                 process.exit(1);
                 return;
             }
@@ -2612,8 +4586,8 @@ Fan-out:
             return;
         }
 
-        if (options.worker || options.integrate) {
-            const flagName = options.worker ? '--worker' : '--integrate';
+        if (options.worker || options.integrate || options.unit) {
+            const flagName = options.worker ? '--worker' : options.unit ? '--unit' : '--integrate';
             const conflicts = ['ask', 'quick', 'detach', 'dryRun']
                 .filter((key) => options[key])
                 .map((key) => `--${key === 'dryRun' ? 'dry-run' : key}`);
@@ -2625,6 +4599,8 @@ Fan-out:
 
             if (options.worker) {
                 await runWorkerFromCli(options);
+            } else if (options.unit) {
+                await runUnitFromCli(options);
             } else {
                 await runIntegrateFromCli(options);
             }
@@ -2640,7 +4616,10 @@ Fan-out:
                 process.exit(1);
                 return;
             }
-            await runDetached(prompt, options);
+            await runDetached(prompt, {
+                ...options,
+                notify: cliNotifyFromOptions(options),
+            });
             return;
         }
 
@@ -2663,7 +4642,7 @@ Fan-out:
 program
     .command('continue')
     .description(
-        'Start new complex work on a finished run\'s existing worktree (not the same as resume, which only unpauses). Workers: continue the worker slug, then re-integrate the parent',
+        'Start new complex work on a done run\'s existing worktree (not crash recovery — use orch resume for failed/stopped/crashed). Workers: continue the worker slug, then re-integrate the parent',
     )
     .argument('<slug>', 'Existing run slug under .orch/')
     .argument('<task...>', 'New task prompt for this continue iteration')
@@ -2673,9 +4652,11 @@ program
     .option('--quick', 'Rejected: continue does not support --quick')
     .option('--detach', 'Run the continue in the background under the same slug')
     .option('--max-rounds <n>', 'Max writer⇄critic and writer⇄runner iterations per implementer loop', positiveIntParser('--max-rounds'), 5)
+    .option('--notify', 'Enable desktop notification when the continue job reaches a terminal state')
+    .option('--no-notify', 'Disable desktop notifications for this continue')
     .addOption(
-        new Option('--agent <agent>', 'Agent backend: "cursor", "claude", or "agn". Omitting uses local then global config, else cursor')
-            .choices(['cursor', 'claude', 'agn']),
+        new Option('--agent <agent>', 'Agent backend: "cursor", "claude", "agn", or "opencode". Omitting uses local then global config, else cursor')
+            .choices(['cursor', 'claude', 'agn', 'opencode']),
     )
     .action(async (slug, taskParts, options, command) => {
         // Parent program also defines --ask/--quick/--dry-run/--agent/--detach/
@@ -2688,6 +4669,7 @@ program
         const cwd = process.cwd();
 
         opts.agent = resolveAgentOrExit(opts.agent, cwd);
+        applyNotifyEnabled(opts, { cwd, dryRun: Boolean(opts.dryRun) });
 
         let record;
         try {
@@ -2708,6 +4690,7 @@ program
                 maxRounds: opts.maxRounds,
                 verbose: opts.verbose,
                 cwd,
+                notify: cliNotifyFromOptions(opts),
             });
             return;
         }
@@ -2781,16 +4764,18 @@ program
 
 program
     .command('config')
-    .description('Print or set the default agent (global ~/.orch/config or local .orch/config)')
+    .description('Print or set default agent / notify (global ~/.orch/config or local .orch/config)')
     .addOption(
         new Option('--agent <agent>', 'Set the default agent backend')
-            .choices(['cursor', 'claude', 'agn']),
+            .choices(['cursor', 'claude', 'agn', 'opencode']),
     )
-    .option('--global', 'Write the global config (~/.orch/config); default when --agent is set')
+    .option('--notify', 'Set notify: true in the target config')
+    .option('--no-notify', 'Set notify: false in the target config')
+    .option('--global', 'Write the global config (~/.orch/config); default when setting a value')
     .option('--local', 'Write the project-local config (.orch/config)')
     .action((options, command) => {
-        // Parent also defines --agent; flags after `config` may land on the
-        // parent. Merge so either placement works.
+        // Parent also defines --agent/--notify/--no-notify; flags after `config`
+        // may land on the parent. Merge so either placement works.
         const opts = typeof command.optsWithGlobals === 'function'
             ? command.optsWithGlobals()
             : { ...program.opts(), ...options };
@@ -2802,25 +4787,41 @@ program
             return;
         }
 
-        if ((opts.global || opts.local) && !opts.agent) {
-            console.error('Error: --global/--local require --agent (omit flags to print config)');
+        const hasNotify = process.argv.includes('--notify');
+        const hasNoNotify = process.argv.includes('--no-notify');
+        if (hasNotify && hasNoNotify) {
+            console.error('Error: --notify and --no-notify are mutually exclusive');
+            process.exit(1);
+            return;
+        }
+
+        const settingNotify = hasNotify || hasNoNotify;
+        const settingAgent = Boolean(opts.agent);
+        const writing = settingAgent || settingNotify;
+
+        if ((opts.global || opts.local) && !writing) {
+            console.error('Error: --global/--local require --agent, --notify, or --no-notify (omit flags to print config)');
             process.exit(1);
             return;
         }
 
-        if (opts.agent) {
+        if (writing) {
             const targetPath = opts.local
                 ? localConfigPath(cwd)
                 : globalConfigPath();
+            const patch = {};
+            if (settingAgent) patch.agent = opts.agent;
+            if (hasNotify) patch.notify = true;
+            if (hasNoNotify) patch.notify = false;
             try {
-                writeConfig(targetPath, { agent: opts.agent });
+                writeConfig(targetPath, patch);
             } catch (err) {
                 console.error(`Error: ${err.message}`);
                 process.exit(1);
                 return;
             }
             console.log(`wrote ${targetPath}`);
-            process.stdout.write(`${JSON.stringify({ agent: opts.agent }, null, 2)}\n`);
+            process.stdout.write(`${JSON.stringify(patch, null, 2)}\n`);
             return;
         }
 
@@ -2836,6 +4837,7 @@ program
     .command('list')
     .description('List all runs (active and finished) tracked under .orch/ in this directory')
     .action(() => {
+        applyNotifyEnabled({});
         const jobs = listJobs(process.cwd());
         if (jobs.length === 0) {
             console.log('no runs');
@@ -2850,6 +4852,7 @@ program
     .description('Show full status for a run')
     .action((slug) => {
         const cwd = process.cwd();
+        applyNotifyEnabled({}, { cwd });
         let record;
         if (slug) {
             record = readJob(cwd, slug);
@@ -2896,23 +4899,162 @@ program
 program
     .command('resume')
     .argument('<slug>', 'Run slug to resume')
-    .description('Resume a paused (or pausing) job')
-    .action((slug) => {
+    .description(
+        'Unpause a live paused/pausing job, or recover a failed/stopped/crashed complex job at its unfinished stage',
+    )
+    .option('-v, --verbose', 'Stream agent thinking/output deltas to stderr as the pipeline runs')
+    .option('--dry-run', 'Validate eligibility only; do not unpause, reopen, or run agents')
+    .option('--ask', 'Rejected: resume does not support --ask')
+    .option('--quick', 'Rejected: resume does not support --quick')
+    .option('--detach', 'Run failure resume in the background under the same slug')
+    .option('--max-rounds <n>', 'Max writer⇄critic and writer⇄runner iterations per implementer loop', positiveIntParser('--max-rounds'), 5)
+    .addOption(
+        new Option('--agent <agent>', 'Agent backend: "cursor", "claude", "agn", or "opencode". Omitting uses local then global config, else cursor')
+            .choices(['cursor', 'claude', 'agn', 'opencode']),
+    )
+    .action(async (slug, options, command) => {
+        const opts = typeof command.optsWithGlobals === 'function'
+            ? command.optsWithGlobals()
+            : { ...program.opts(), ...options };
         const cwd = process.cwd();
+        opts.agent = resolveAgentOrExit(opts.agent, cwd);
+        applyNotifyEnabled(opts, { cwd, dryRun: Boolean(opts.dryRun) });
+
+        let validated;
         try {
-            const record = readJob(cwd, slug);
-            if (!record) throw new Error(`requestResume: unknown job ${slug}`);
-            if (isCascadeParent(cwd, record)) {
-                cascadeResume(cwd, slug);
-                console.log(`resumed ${slug}`);
-            } else {
-                requestResume(cwd, slug);
-                console.log(`resumed ${slug}`);
-            }
+            validated = validateResume(cwd, slug, {
+                ask: opts.ask,
+                quick: opts.quick,
+            });
         } catch (err) {
             console.error(`Error: ${err.message}`);
             process.exit(1);
+            return;
+        }
+
+        const { mode, record } = validated;
+
+        if (opts.dryRun) {
+            if (mode === 'failure') {
+                const backend = AGENT_BACKENDS[opts.agent];
+                if (!isBinaryOnPath(backend.binary)) {
+                    console.error(binaryMissingHint(opts.agent));
+                    process.exit(1);
+                    return;
+                }
+            }
+            console.log(`dry-run: resume ${slug} ok (${mode})`);
+            return;
+        }
+
+        if (mode === 'unpause') {
+            try {
+                if (isCascadeParent(cwd, record)) {
+                    cascadeResume(cwd, slug);
+                    console.log(`resumed ${slug}`);
+                } else {
+                    requestResume(cwd, slug);
+                    console.log(`resumed ${slug}`);
+                }
+            } catch (err) {
+                console.error(`Error: ${err.message}`);
+                process.exit(1);
+            }
+            return;
+        }
+
+        if (mode === 'noop') {
+            console.log(`resumed ${slug}`);
+            return;
+        }
+
+        // mode === 'failure'
+        if (opts.detach) {
+            await runResumeDetached(slug, {
+                agent: opts.agent,
+                maxRounds: opts.maxRounds,
+                verbose: opts.verbose,
+                cwd,
+                notify: cliNotifyFromOptions(opts),
+            });
+            return;
+        }
+
+        const alreadyReopened = Boolean(process.env.ORCH_JOB_SLUG);
+        let priorOutcome;
+        let worktreePath = record.worktree;
+        let branch = record.branch;
+        let role = record.role;
+        let parentSlug = record.parent;
+        let workerId = record.workerId;
+        let recoverBrief = '';
+
+        if (!alreadyReopened) {
+            priorOutcome = snapshotPriorOutcome(cwd, slug, record);
+            reopenForResume(cwd, slug, {
+                agent: opts.agent,
+                maxRounds: opts.maxRounds,
+                pid: process.pid,
+                prior: priorOutcome,
+            });
+            setJobSlug(slug);
+            const recovered = runRecover(cwd, slug, {
+                prior: priorOutcome,
+                worktreePath,
+            });
+            console.log(`orch: [recover] ${recovered.oneLiner}`);
+            recoverBrief = recovered.brief;
+        } else {
+            const live = readJob(cwd, slug) ?? record;
+            const entries = Array.isArray(live.resumes) ? live.resumes : [];
+            const last = entries[entries.length - 1];
+            priorOutcome = last?.prior ?? snapshotPriorOutcome(cwd, slug, live);
+            worktreePath = live.worktree ?? worktreePath;
+            branch = live.branch ?? branch;
+            role = live.role ?? role;
+            parentSlug = live.parent ?? parentSlug;
+            workerId = live.workerId ?? workerId;
+            setJobSlug(slug);
+            const recoverPath = path.join(jobPaths(cwd, slug).dir, 'recover.md');
+            if (!fs.existsSync(recoverPath)) {
+                const recovered = runRecover(cwd, slug, {
+                    prior: priorOutcome,
+                    worktreePath,
+                });
+                console.log(`orch: [recover] ${recovered.oneLiner}`);
+                recoverBrief = recovered.brief;
+            } else {
+                recoverBrief = fs.readFileSync(recoverPath, 'utf8');
+                const orient = recoverBrief.match(/^- Orientation: (.+)$/m)
+                    || recoverBrief.match(/^([^\n]+)$/m);
+                console.log(`orch: [recover] ${orient?.[1] ?? 'resuming from recover.md'}`);
+            }
+        }
+
+        const backend = AGENT_BACKENDS[opts.agent];
+        if (!isBinaryOnPath(backend.binary)) {
+            console.error(binaryMissingHint(opts.agent));
+            process.exit(1);
+            return;
         }
+
+        console.log(`resumed ${slug} (pid ${process.pid})`);
+        await runResumePipeline({
+            agent: opts.agent,
+            maxRounds: opts.maxRounds,
+            verbose: opts.verbose,
+            cwd,
+            slug,
+            jobSlug: slug,
+            priorOutcome,
+            recoverBrief,
+            worktreePath,
+            branch,
+            role,
+            parentSlug,
+            workerId,
+            prompt: priorOutcome?.task ?? record.task,
+        });
     });
 
 program
@@ -2921,6 +5063,7 @@ program
     .description('Send SIGTERM to a running job (or reconcile a dead one to crashed)')
     .action((slug) => {
         const cwd = process.cwd();
+        applyNotifyEnabled({}, { cwd });
         try {
             const record = readJob(cwd, slug);
             if (!record) throw new Error(`stopJob: unknown job ${slug}`);
@@ -2949,7 +5092,7 @@ const jobsCmd = program
 
 jobsCmd
     .command('clean')
-    .description('Delete all orch jobs from the .orch folder')
+    .description('Delete all orch jobs from .orch/ (refuses while live jobs are running; orch stop <slug> first)')
     .action(async () => {
         const cwd = process.cwd();
         const orchDir = path.join(cwd, '.orch');
@@ -2958,6 +5101,17 @@ jobsCmd
             return;
         }
 
+        // Refuse before prompting so we never ask to wipe dirs we will not delete.
+        const live = liveSlugsBlockingClean(cwd);
+        if (live.length > 0) {
+            console.error(
+                `Error: cannot clean while live jobs exist: ${live.join(', ')}. ` +
+                `Stop them first with: orch stop <slug>`,
+            );
+            process.exit(1);
+            return;
+        }
+
         const rl = readline.createInterface({ input, output });
         let answer;
         try {
@@ -2971,8 +5125,13 @@ jobsCmd
             return;
         }
 
-        const removed = cleanJobs(cwd);
-        console.log(`deleted ${removed.length} job${removed.length === 1 ? '' : 's'} from .orch/`);
+        try {
+            const removed = cleanJobs(cwd);
+            console.log(`deleted ${removed.length} job${removed.length === 1 ? '' : 's'} from .orch/`);
+        } catch (err) {
+            console.error(`Error: ${err.message}`);
+            process.exit(1);
+        }
     });
 
 program