novel-writer-cli 0.0.3 → 0.1.0

package/dist/__tests__/next-step-title-fix.test.js

@@ -54,7 +54,14 @@ test("computeNextStep returns title-fix on hard title violations when auto_fix=t
     await writeJson(join(rootDir, "platform-profile.json"), makePlatformProfileRaw({ enabled: true, auto_fix: true }));
     await mkdir(join(rootDir, "staging/chapters"), { recursive: true });
     await writeFile(join(rootDir, "staging/chapters/chapter-001.md"), "正文\n", "utf8");
-    const checkpoint = { last_completed_chapter: 0, current_volume: 1, pipeline_stage: "refined", inflight_chapter: 1, title_fix_count: 0 };
+    const checkpoint = {
+        last_completed_chapter: 0,
+        current_volume: 1,
+        orchestrator_state: "WRITING",
+        pipeline_stage: "refined",
+        inflight_chapter: 1,
+        title_fix_count: 0
+    };
     const next = await computeNextStep(rootDir, checkpoint);
     assert.equal(next.step, "chapter:001:title-fix");
 });
@@ -63,7 +70,14 @@ test("computeNextStep returns review after title-fix was already attempted", asy
     await writeJson(join(rootDir, "platform-profile.json"), makePlatformProfileRaw({ enabled: true, auto_fix: true }));
     await mkdir(join(rootDir, "staging/chapters"), { recursive: true });
     await writeFile(join(rootDir, "staging/chapters/chapter-001.md"), "正文\n", "utf8");
-    const checkpoint = { last_completed_chapter: 0, current_volume: 1, pipeline_stage: "refined", inflight_chapter: 1, title_fix_count: 1 };
+    const checkpoint = {
+        last_completed_chapter: 0,
+        current_volume: 1,
+        orchestrator_state: "WRITING",
+        pipeline_stage: "refined",
+        inflight_chapter: 1,
+        title_fix_count: 1
+    };
     const next = await computeNextStep(rootDir, checkpoint);
     assert.equal(next.step, "chapter:001:review");
 });
@@ -72,7 +86,14 @@ test("computeNextStep returns review on hard title violations when auto_fix=fals
     await writeJson(join(rootDir, "platform-profile.json"), makePlatformProfileRaw({ enabled: true, auto_fix: false }));
     await mkdir(join(rootDir, "staging/chapters"), { recursive: true });
     await writeFile(join(rootDir, "staging/chapters/chapter-001.md"), "正文\n", "utf8");
-    const checkpoint = { last_completed_chapter: 0, current_volume: 1, pipeline_stage: "refined", inflight_chapter: 1, title_fix_count: 0 };
+    const checkpoint = {
+        last_completed_chapter: 0,
+        current_volume: 1,
+        orchestrator_state: "WRITING",
+        pipeline_stage: "refined",
+        inflight_chapter: 1,
+        title_fix_count: 0
+    };
     const next = await computeNextStep(rootDir, checkpoint);
     assert.equal(next.step, "chapter:001:review");
 });
@@ -81,7 +102,14 @@ test("computeNextStep does not block on warn-only title issues when auto_fix=fal
     await writeJson(join(rootDir, "platform-profile.json"), makePlatformProfileRaw({ enabled: true, auto_fix: false, max_chars: 3 }));
     await mkdir(join(rootDir, "staging/chapters"), { recursive: true });
     await writeFile(join(rootDir, "staging/chapters/chapter-001.md"), "# 太长的标题\n正文\n", "utf8");
-    const checkpoint = { last_completed_chapter: 0, current_volume: 1, pipeline_stage: "refined", inflight_chapter: 1, title_fix_count: 0 };
+    const checkpoint = {
+        last_completed_chapter: 0,
+        current_volume: 1,
+        orchestrator_state: "WRITING",
+        pipeline_stage: "refined",
+        inflight_chapter: 1,
+        title_fix_count: 0
+    };
     const next = await computeNextStep(rootDir, checkpoint);
     assert.equal(next.step, "chapter:001:judge");
 });
@@ -90,7 +118,14 @@ test("computeNextStep returns title-fix on warn-only title issues when auto_fix=
     await writeJson(join(rootDir, "platform-profile.json"), makePlatformProfileRaw({ enabled: true, auto_fix: true, max_chars: 3 }));
     await mkdir(join(rootDir, "staging/chapters"), { recursive: true });
     await writeFile(join(rootDir, "staging/chapters/chapter-001.md"), "# 太长的标题\n正文\n", "utf8");
-    const checkpoint = { last_completed_chapter: 0, current_volume: 1, pipeline_stage: "refined", inflight_chapter: 1, title_fix_count: 0 };
+    const checkpoint = {
+        last_completed_chapter: 0,
+        current_volume: 1,
+        orchestrator_state: "WRITING",
+        pipeline_stage: "refined",
+        inflight_chapter: 1,
+        title_fix_count: 0
+    };
     const next = await computeNextStep(rootDir, checkpoint);
     assert.equal(next.step, "chapter:001:title-fix");
 });
@@ -101,7 +136,14 @@ test("computeNextStep returns title-fix on judged stage when eval exists and tit
     await writeFile(join(rootDir, "staging/chapters/chapter-001.md"), "正文\n", "utf8");
     await mkdir(join(rootDir, "staging/evaluations"), { recursive: true });
     await writeJson(join(rootDir, "staging/evaluations/chapter-001-eval.json"), {});
-    const checkpoint = { last_completed_chapter: 0, current_volume: 1, pipeline_stage: "judged", inflight_chapter: 1, title_fix_count: 0 };
+    const checkpoint = {
+        last_completed_chapter: 0,
+        current_volume: 1,
+        orchestrator_state: "WRITING",
+        pipeline_stage: "judged",
+        inflight_chapter: 1,
+        title_fix_count: 0
+    };
     const next = await computeNextStep(rootDir, checkpoint);
     assert.equal(next.step, "chapter:001:title-fix");
 });
@@ -111,7 +153,14 @@ test("title-fix snapshot is write-once (rerunning instructions does not bypass b
     await mkdir(join(rootDir, "staging/chapters"), { recursive: true });
     const chapterAbs = join(rootDir, "staging/chapters/chapter-001.md");
     await writeFile(chapterAbs, "# 标题\n正文\n", "utf8");
-    const checkpoint = { last_completed_chapter: 0, current_volume: 1, pipeline_stage: "refined", inflight_chapter: 1, title_fix_count: 0 };
+    const checkpoint = {
+        last_completed_chapter: 0,
+        current_volume: 1,
+        orchestrator_state: "WRITING",
+        pipeline_stage: "refined",
+        inflight_chapter: 1,
+        title_fix_count: 0
+    };
     await buildInstructionPacket({
         rootDir,
         checkpoint,
@@ -145,7 +194,14 @@ test("advance draft cleans up title-fix snapshot to avoid stale reuse", async ()
     await mkdir(join(rootDir, "staging/logs"), { recursive: true });
     const snapshotRel = titleFixSnapshotRel(1);
     await writeFile(join(rootDir, snapshotRel), "old snapshot\n", "utf8");
-    const checkpoint = { last_completed_chapter: 0, current_volume: 1, pipeline_stage: null, inflight_chapter: null, title_fix_count: 1 };
+    const checkpoint = {
+        last_completed_chapter: 0,
+        current_volume: 1,
+        orchestrator_state: "WRITING",
+        pipeline_stage: null,
+        inflight_chapter: null,
+        title_fix_count: 1
+    };
     await writeJson(join(rootDir, ".checkpoint.json"), checkpoint);
     await advanceCheckpointForStep({ rootDir, step: { kind: "chapter", chapter: 1, stage: "draft" } });
     // validate cleanup is best-effort; the file should be gone.

package/dist/__tests__/orchestrator-state-routing.test.js

@@ -0,0 +1,168 @@
+import assert from "node:assert/strict";
+import { mkdtemp, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import test from "node:test";
+import { readCheckpoint } from "../checkpoint.js";
+import { computeNextStep } from "../next-step.js";
+async function writeJson(absPath, payload) {
+    await writeFile(absPath, `${JSON.stringify(payload, null, 2)}\n`, "utf8");
+}
+test("readCheckpoint injects orchestrator_state via legacy inference", async () => {
+    const rootDir = await mkdtemp(join(tmpdir(), "novel-orchestrator-state-legacy-"));
+    await writeJson(join(rootDir, ".checkpoint.json"), {
+        last_completed_chapter: 0,
+        current_volume: 1,
+        pipeline_stage: null,
+        inflight_chapter: null
+    });
+    const checkpoint = await readCheckpoint(rootDir);
+    assert.equal(checkpoint.orchestrator_state, "WRITING");
+});
+test("readCheckpoint infers CHAPTER_REWRITE when pipeline_stage=revising", async () => {
+    const rootDir = await mkdtemp(join(tmpdir(), "novel-orchestrator-state-revising-"));
+    await writeJson(join(rootDir, ".checkpoint.json"), {
+        last_completed_chapter: 0,
+        current_volume: 1,
+        pipeline_stage: "revising",
+        inflight_chapter: 7
+    });
+    const checkpoint = await readCheckpoint(rootDir);
+    assert.equal(checkpoint.orchestrator_state, "CHAPTER_REWRITE");
+});
+test("readCheckpoint infers ERROR_RETRY when pipeline_stage=revising but inflight_chapter is missing", async () => {
+    const rootDir = await mkdtemp(join(tmpdir(), "novel-orchestrator-state-revising-missing-inflight-"));
+    await writeJson(join(rootDir, ".checkpoint.json"), {
+        last_completed_chapter: 0,
+        current_volume: 1,
+        pipeline_stage: "revising",
+        inflight_chapter: null
+    });
+    const checkpoint = await readCheckpoint(rootDir);
+    assert.equal(checkpoint.orchestrator_state, "ERROR_RETRY");
+});
+test("readCheckpoint infers ERROR_RETRY when inflight_chapter is set but pipeline_stage is idle", async () => {
+    const rootDir = await mkdtemp(join(tmpdir(), "novel-orchestrator-state-idle-inflight-"));
+    await writeJson(join(rootDir, ".checkpoint.json"), {
+        last_completed_chapter: 0,
+        current_volume: 1,
+        pipeline_stage: null,
+        inflight_chapter: 7
+    });
+    const checkpoint = await readCheckpoint(rootDir);
+    assert.equal(checkpoint.orchestrator_state, "ERROR_RETRY");
+});
+test("readCheckpoint rejects inflight_chapter=0", async () => {
+    const rootDir = await mkdtemp(join(tmpdir(), "novel-orchestrator-state-inflight-zero-"));
+    await writeJson(join(rootDir, ".checkpoint.json"), {
+        last_completed_chapter: 0,
+        current_volume: 1,
+        pipeline_stage: "drafting",
+        inflight_chapter: 0
+    });
+    await assert.rejects(() => readCheckpoint(rootDir), /inflight_chapter must be an int >= 1/);
+});
+test("computeNextStep throws for INIT placeholder", async () => {
+    const rootDir = await mkdtemp(join(tmpdir(), "novel-orchestrator-init-"));
+    await assert.rejects(() => computeNextStep(rootDir, {
+        last_completed_chapter: 0,
+        current_volume: 1,
+        orchestrator_state: "INIT",
+        pipeline_stage: null,
+        inflight_chapter: null
+    }), /Not implemented: orchestrator_state=INIT/);
+});
+test("computeNextStep throws when pipeline_stage=committed but inflight_chapter is set", async () => {
+    const rootDir = await mkdtemp(join(tmpdir(), "novel-orchestrator-committed-inflight-"));
+    await assert.rejects(() => computeNextStep(rootDir, {
+        last_completed_chapter: 0,
+        current_volume: 1,
+        orchestrator_state: "WRITING",
+        pipeline_stage: "committed",
+        inflight_chapter: 7
+    }), /Checkpoint inconsistent: pipeline_stage=committed but inflight_chapter=7/);
+});
+test("computeNextStep throws for QUICK_START placeholder", async () => {
+    const rootDir = await mkdtemp(join(tmpdir(), "novel-orchestrator-quickstart-"));
+    await assert.rejects(() => computeNextStep(rootDir, {
+        last_completed_chapter: 0,
+        current_volume: 1,
+        orchestrator_state: "QUICK_START",
+        pipeline_stage: null,
+        inflight_chapter: null
+    }), /Not implemented: orchestrator_state=QUICK_START/);
+});
+test("computeNextStep prefixes reason for ERROR_RETRY", async () => {
+    const rootDir = await mkdtemp(join(tmpdir(), "novel-orchestrator-error-retry-"));
+    const next = await computeNextStep(rootDir, {
+        last_completed_chapter: 0,
+        current_volume: 1,
+        orchestrator_state: "ERROR_RETRY",
+        pipeline_stage: null,
+        inflight_chapter: null
+    });
+    assert.equal(next.step, "chapter:001:draft");
+    assert.equal(next.reason, "error_retry:fresh");
+});
+test("computeNextStep heals ERROR_RETRY when pipeline_stage is committed but inflight_chapter is set", async () => {
+    const rootDir = await mkdtemp(join(tmpdir(), "novel-orchestrator-error-retry-heal-committed-"));
+    const next = await computeNextStep(rootDir, {
+        last_completed_chapter: 0,
+        current_volume: 1,
+        orchestrator_state: "ERROR_RETRY",
+        pipeline_stage: "committed",
+        inflight_chapter: 7
+    });
+    assert.equal(next.step, "chapter:001:draft");
+    assert.equal(next.reason, "error_retry:healed_drop_inflight:fresh");
+});
+test("computeNextStep heals ERROR_RETRY when pipeline_stage is in-flight but inflight_chapter is missing", async () => {
+    const rootDir = await mkdtemp(join(tmpdir(), "novel-orchestrator-error-retry-heal-drafting-"));
+    const next = await computeNextStep(rootDir, {
+        last_completed_chapter: 6,
+        current_volume: 1,
+        orchestrator_state: "ERROR_RETRY",
+        pipeline_stage: "drafting",
+        inflight_chapter: null
+    });
+    assert.equal(next.step, "chapter:007:draft");
+    assert.equal(next.reason, "error_retry:healed_infer_inflight:drafting:missing_chapter");
+});
+test("computeNextStep delegates CHAPTER_REWRITE to chapter routing", async () => {
+    const rootDir = await mkdtemp(join(tmpdir(), "novel-orchestrator-chapter-rewrite-"));
+    const next = await computeNextStep(rootDir, {
+        last_completed_chapter: 6,
+        current_volume: 1,
+        orchestrator_state: "CHAPTER_REWRITE",
+        pipeline_stage: "revising",
+        inflight_chapter: 7
+    });
+    assert.equal(next.step, "chapter:007:draft");
+    assert.equal(next.reason, "revising:restart_draft");
+    assert.deepEqual(next.inflight, { chapter: 7, pipeline_stage: "revising" });
+});
+test("computeNextStep routes VOL_PLANNING to volume pipeline", async () => {
+    const rootDir = await mkdtemp(join(tmpdir(), "novel-orchestrator-vol-planning-"));
+    const next = await computeNextStep(rootDir, {
+        last_completed_chapter: 0,
+        current_volume: 1,
+        orchestrator_state: "VOL_PLANNING",
+        pipeline_stage: null,
+        inflight_chapter: null,
+        volume_pipeline_stage: null
+    });
+    assert.equal(next.step, "volume:outline");
+    assert.equal(next.reason, "vol_planning:outline");
+});
+test("computeNextStep routes VOL_REVIEW to review pipeline", async () => {
+    const rootDir = await mkdtemp(join(tmpdir(), "novel-orchestrator-vol-review-"));
+    const next = await computeNextStep(rootDir, {
+        last_completed_chapter: 0,
+        current_volume: 1,
+        orchestrator_state: "VOL_REVIEW",
+        pipeline_stage: null,
+        inflight_chapter: null
+    });
+    assert.equal(next.step, "review:collect");
+    assert.equal(next.reason, "vol_review:missing_quality_summary");
+});

package/dist/__tests__/orchestrator-state-write-path.test.js

@@ -0,0 +1,59 @@
+import assert from "node:assert/strict";
+import { mkdir, mkdtemp, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import { dirname, join } from "node:path";
+import test from "node:test";
+import { advanceCheckpointForStep } from "../advance.js";
+import { readCheckpoint } from "../checkpoint.js";
+import { commitChapter } from "../commit.js";
+async function writeText(absPath, contents) {
+    await mkdir(dirname(absPath), { recursive: true });
+    await writeFile(absPath, contents, "utf8");
+}
+async function writeJson(absPath, payload) {
+    await writeText(absPath, `${JSON.stringify(payload, null, 2)}\n`);
+}
+test("advanceCheckpointForStep normalizes orchestrator_state to WRITING for chapter pipeline", async () => {
+    const rootDir = await mkdtemp(join(tmpdir(), "novel-orchestrator-advance-state-"));
+    await writeJson(join(rootDir, ".checkpoint.json"), {
+        last_completed_chapter: 0,
+        current_volume: 1,
+        orchestrator_state: "INIT",
+        pipeline_stage: null,
+        inflight_chapter: null
+    });
+    await writeText(join(rootDir, "staging/chapters/chapter-001.md"), `# 第1章\n\n（测试）\n`);
+    const updated = await advanceCheckpointForStep({
+        rootDir,
+        step: { kind: "chapter", chapter: 1, stage: "draft" }
+    });
+    assert.equal(updated.orchestrator_state, "WRITING");
+    const checkpoint = await readCheckpoint(rootDir);
+    assert.equal(checkpoint.orchestrator_state, "WRITING");
+});
+test("commitChapter resets orchestrator_state to WRITING", async () => {
+    const rootDir = await mkdtemp(join(tmpdir(), "novel-orchestrator-commit-state-"));
+    await writeJson(join(rootDir, ".checkpoint.json"), {
+        last_completed_chapter: 0,
+        current_volume: 1,
+        orchestrator_state: "CHAPTER_REWRITE",
+        pipeline_stage: "judged",
+        inflight_chapter: 1
+    });
+    await writeText(join(rootDir, "staging/chapters/chapter-001.md"), `# 第1章\n\n（测试）\n`);
+    await writeText(join(rootDir, "staging/summaries/chapter-001-summary.md"), `## 第 1 章摘要\n\n- 测试事件\n`);
+    await writeJson(join(rootDir, "staging/state/chapter-001-crossref.json"), { schema_version: 1, chapter: 1, entities: [] });
+    await writeJson(join(rootDir, "staging/evaluations/chapter-001-eval.json"), { chapter: 1 });
+    await writeText(join(rootDir, "staging/storylines/main-arc/memory.md"), `- 测试记忆\n`);
+    await writeJson(join(rootDir, "staging/state/chapter-001-delta.json"), {
+        chapter: 1,
+        base_state_version: 0,
+        storyline_id: "main-arc",
+        ops: [{ op: "set", path: "characters.hero.display_name", value: "阿宁" }]
+    });
+    await commitChapter({ rootDir, chapter: 1, dryRun: false });
+    const checkpoint = await readCheckpoint(rootDir);
+    assert.equal(checkpoint.orchestrator_state, "WRITING");
+    assert.equal(checkpoint.pipeline_stage, "committed");
+    assert.equal(checkpoint.inflight_chapter, null);
+});

package/dist/__tests__/steps-id.test.js

@@ -0,0 +1,23 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+import { formatStepId, parseStepId } from "../steps.js";
+test("formatStepId formats chapter ids with pad3", () => {
+    assert.equal(formatStepId({ kind: "chapter", chapter: 7, stage: "draft" }), "chapter:007:draft");
+});
+test("formatStepId formats volume/quickstart/review ids", () => {
+    assert.equal(formatStepId({ kind: "volume", phase: "outline" }), "volume:outline");
+    assert.equal(formatStepId({ kind: "quickstart", phase: "world" }), "quickstart:world");
+    assert.equal(formatStepId({ kind: "review", phase: "report" }), "review:report");
+});
+test("parseStepId parses chapter ids and trims whitespace", () => {
+    assert.deepEqual(parseStepId("  chapter:7:refine  "), { kind: "chapter", chapter: 7, stage: "refine" });
+});
+test("parseStepId parses volume/quickstart/review ids", () => {
+    assert.deepEqual(parseStepId("volume:validate"), { kind: "volume", phase: "validate" });
+    assert.deepEqual(parseStepId("quickstart:trial"), { kind: "quickstart", phase: "trial" });
+    assert.deepEqual(parseStepId("review:cleanup"), { kind: "review", phase: "cleanup" });
+});
+test("parseStepId rejects unknown kind and invalid phases", () => {
+    assert.throws(() => parseStepId("foo:bar"), /Supported kinds: chapter, volume, quickstart, review/);
+    assert.throws(() => parseStepId("volume:badphase"), /Phase must be one of:/);
+});

package/dist/__tests__/volume-pipeline.test.js

@@ -0,0 +1,227 @@
+import assert from "node:assert/strict";
+import { mkdir, mkdtemp, readFile, rm, stat, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import { dirname, join } from "node:path";
+import test from "node:test";
+import { advanceCheckpointForStep } from "../advance.js";
+import { commitVolume } from "../volume-commit.js";
+import { readCheckpoint, writeCheckpoint } from "../checkpoint.js";
+import { computeNextStep } from "../next-step.js";
+import { validateStep } from "../validate.js";
+import { computeVolumeChapterRange, volumeStagingRelPaths } from "../volume-planning.js";
+async function writeText(absPath, contents) {
+    await mkdir(dirname(absPath), { recursive: true });
+    await writeFile(absPath, contents, "utf8");
+}
+async function writeJson(absPath, payload) {
+    await writeText(absPath, `${JSON.stringify(payload, null, 2)}\n`);
+}
+async function exists(absPath) {
+    try {
+        await stat(absPath);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+test("computeVolumeChapterRange enforces deterministic bounds", () => {
+    assert.deepEqual(computeVolumeChapterRange({ current_volume: 1, last_completed_chapter: 0 }), { start: 1, end: 30 });
+    assert.deepEqual(computeVolumeChapterRange({ current_volume: 2, last_completed_chapter: 58 }), { start: 59, end: 60 });
+    assert.throws(() => computeVolumeChapterRange({ current_volume: 1, last_completed_chapter: 30 }), /plan_start=31 > plan_end=30/);
+});
+test("volume planning pipeline routes outline -> validate -> commit -> writing", async () => {
+    const rootDir = await mkdtemp(join(tmpdir(), "novel-volume-pipeline-"));
+    try {
+        const initial = {
+            last_completed_chapter: 58,
+            current_volume: 2,
+            orchestrator_state: "VOL_PLANNING",
+            pipeline_stage: null,
+            inflight_chapter: null,
+            volume_pipeline_stage: null
+        };
+        await writeJson(join(rootDir, ".checkpoint.json"), initial);
+        const volume = 2;
+        const range = computeVolumeChapterRange({ current_volume: volume, last_completed_chapter: initial.last_completed_chapter });
+        const rels = volumeStagingRelPaths(volume);
+        // Minimal planning artifacts for a 2-chapter range (59-60)
+        await writeText(join(rootDir, rels.outlineMd), [
+            `## 第 ${volume} 卷大纲`,
+            ``,
+            `### 第${range.start}章: 测试`,
+            `- **Storyline**: main-arc`,
+            `- **POV**: hero`,
+            `- **Location**: city`,
+            `- **Conflict**: test`,
+            `- **Arc**: test`,
+            `- **Foreshadowing**: test`,
+            `- **StateChanges**: test`,
+            `- **TransitionHint**: {}`,
+            ``,
+            `### 第 ${range.end}章: 测试`,
+            `- **Storyline**: main-arc`,
+            `- **POV**: hero`,
+            `- **Location**: city`,
+            `- **Conflict**: test`,
+            `- **Arc**: test`,
+            `- **Foreshadowing**: test`,
+            `- **StateChanges**: test`,
+            `- **TransitionHint**: {}`,
+            ``
+        ].join("\n"));
+        await writeJson(join(rootDir, rels.storylineScheduleJson), { active_storylines: ["main-arc"] });
+        await writeJson(join(rootDir, rels.foreshadowingJson), { schema_version: 1, items: [] });
+        await writeJson(join(rootDir, rels.newCharactersJson), []);
+        const contractBase = {
+            storyline_id: "main-arc",
+            objectives: [{ id: "OBJ", required: true, description: "x" }],
+            preconditions: { character_states: { Alice: { location: "city" } } },
+            postconditions: { state_changes: {} }
+        };
+        await writeJson(join(rootDir, rels.chapterContractJson(range.start)), { chapter: range.start, ...contractBase });
+        await writeJson(join(rootDir, rels.chapterContractJson(range.end)), { chapter: range.end, ...contractBase });
+        // Next step: outline
+        let checkpoint = await readCheckpoint(rootDir);
+        let next = await computeNextStep(rootDir, checkpoint);
+        assert.equal(next.step, "volume:outline");
+        // Validate outputs for outline, then advance outline -> validate stage.
+        await validateStep({ rootDir, checkpoint, step: { kind: "volume", phase: "outline" } });
+        checkpoint = await advanceCheckpointForStep({ rootDir, step: { kind: "volume", phase: "outline" } });
+        next = await computeNextStep(rootDir, checkpoint);
+        assert.equal(next.step, "volume:validate");
+        // Advance validate -> commit stage.
+        await validateStep({ rootDir, checkpoint, step: { kind: "volume", phase: "validate" } });
+        checkpoint = await advanceCheckpointForStep({ rootDir, step: { kind: "volume", phase: "validate" } });
+        next = await computeNextStep(rootDir, checkpoint);
+        assert.equal(next.step, "volume:commit");
+        // Commit volume plan.
+        const result = await commitVolume({ rootDir, volume, dryRun: false });
+        assert.ok(result.plan.length > 0);
+        const after = await readCheckpoint(rootDir);
+        assert.equal(after.orchestrator_state, "WRITING");
+        assert.equal(after.volume_pipeline_stage, null);
+        assert.equal(after.pipeline_stage, "committed");
+        assert.equal(after.inflight_chapter, null);
+        assert.ok(await exists(join(rootDir, `volumes/vol-02/outline.md`)));
+        assert.equal(await exists(join(rootDir, rels.dir)), false);
+    }
+    finally {
+        await rm(rootDir, { recursive: true, force: true });
+    }
+});
+test("commitVolume normalizes checkpoint when final dir exists but staging is missing", async () => {
+    const rootDir = await mkdtemp(join(tmpdir(), "novel-volume-commit-recover-"));
+    try {
+        await writeJson(join(rootDir, ".checkpoint.json"), {
+            last_completed_chapter: 0,
+            current_volume: 1,
+            orchestrator_state: "VOL_PLANNING",
+            pipeline_stage: null,
+            inflight_chapter: null,
+            volume_pipeline_stage: "commit"
+        });
+        await writeText(join(rootDir, "volumes/vol-01/outline.md"), "# vol 1\n");
+        const result = await commitVolume({ rootDir, volume: 1, dryRun: false });
+        assert.ok(result.warnings.some((w) => /already exists/i.test(w)));
+        const after = await readCheckpoint(rootDir);
+        assert.equal(after.orchestrator_state, "WRITING");
+        assert.equal(after.volume_pipeline_stage, null);
+    }
+    finally {
+        await rm(rootDir, { recursive: true, force: true });
+    }
+});
+test("advanceCheckpointForStep rejects volume advance outside VOL_PLANNING", async () => {
+    const rootDir = await mkdtemp(join(tmpdir(), "novel-volume-advance-guard-"));
+    try {
+        await writeCheckpoint(rootDir, {
+            last_completed_chapter: 0,
+            current_volume: 1,
+            orchestrator_state: "WRITING",
+            pipeline_stage: "committed",
+            volume_pipeline_stage: null,
+            inflight_chapter: null
+        });
+        await assert.rejects(() => advanceCheckpointForStep({ rootDir, step: { kind: "volume", phase: "outline" } }), /orchestrator_state=VOL_PLANNING/);
+    }
+    finally {
+        await rm(rootDir, { recursive: true, force: true });
+    }
+});
+test("computeNextStep falls back to volume:outline when validate stage is selected but artifacts are missing", async () => {
+    const rootDir = await mkdtemp(join(tmpdir(), "novel-volume-next-missing-"));
+    try {
+        const next = await computeNextStep(rootDir, {
+            last_completed_chapter: 58,
+            current_volume: 2,
+            orchestrator_state: "VOL_PLANNING",
+            pipeline_stage: null,
+            inflight_chapter: null,
+            volume_pipeline_stage: "validate"
+        });
+        assert.equal(next.step, "volume:outline");
+        assert.equal(next.reason, "vol_planning:validate:missing_artifacts");
+    }
+    finally {
+        await rm(rootDir, { recursive: true, force: true });
+    }
+});
+test("commitVolume dryRun does not touch checkpoint", async () => {
+    const rootDir = await mkdtemp(join(tmpdir(), "novel-volume-commit-dryrun-"));
+    try {
+        await writeJson(join(rootDir, ".checkpoint.json"), {
+            last_completed_chapter: 0,
+            current_volume: 1,
+            orchestrator_state: "VOL_PLANNING",
+            pipeline_stage: null,
+            inflight_chapter: null,
+            volume_pipeline_stage: "commit"
+        });
+        const before = await readFile(join(rootDir, ".checkpoint.json"), "utf8");
+        const result = await commitVolume({ rootDir, volume: 1, dryRun: true });
+        assert.ok(result.plan.some((l) => l.includes("MOVE")));
+        const after = await readFile(join(rootDir, ".checkpoint.json"), "utf8");
+        assert.equal(after, before);
+    }
+    finally {
+        await rm(rootDir, { recursive: true, force: true });
+    }
+});
+test("commitVolume rejects when both staging and final volume dirs exist", async () => {
+    const rootDir = await mkdtemp(join(tmpdir(), "novel-volume-commit-conflict-"));
+    try {
+        await writeJson(join(rootDir, ".checkpoint.json"), {
+            last_completed_chapter: 0,
+            current_volume: 1,
+            orchestrator_state: "VOL_PLANNING",
+            pipeline_stage: null,
+            inflight_chapter: null,
+            volume_pipeline_stage: "commit"
+        });
+        await mkdir(join(rootDir, "staging/volumes/vol-01"), { recursive: true });
+        await mkdir(join(rootDir, "volumes/vol-01"), { recursive: true });
+        await assert.rejects(() => commitVolume({ rootDir, volume: 1, dryRun: false }), /Commit conflict/);
+    }
+    finally {
+        await rm(rootDir, { recursive: true, force: true });
+    }
+});
+test("commitVolume recovery refuses when final dir exists but outline.md is missing", async () => {
+    const rootDir = await mkdtemp(join(tmpdir(), "novel-volume-commit-recover-missing-outline-"));
+    try {
+        await writeJson(join(rootDir, ".checkpoint.json"), {
+            last_completed_chapter: 0,
+            current_volume: 1,
+            orchestrator_state: "VOL_PLANNING",
+            pipeline_stage: null,
+            inflight_chapter: null,
+            volume_pipeline_stage: "commit"
+        });
+        await mkdir(join(rootDir, "volumes/vol-01"), { recursive: true });
+        await assert.rejects(() => commitVolume({ rootDir, volume: 1, dryRun: false }), /missing .*outline\.md/i);
+    }
+    finally {
+        await rm(rootDir, { recursive: true, force: true });
+    }
+});