gsd-pi 2.33.0-dev.bafba33 → 2.33.1-dev.235d83a

package/dist/resources/extensions/gsd/tests/auto-skip-loop.test.ts

@@ -1,123 +0,0 @@
-/**
- * auto-skip-loop.test.ts — Tests for the consecutive-skip loop breaker.
- *
- * Regression for #728: auto-mode infinite skip loop on previously completed
- * plan-slice units when deriveState keeps returning the same unit.
- *
- * The skip paths in dispatchNextUnit track consecutive skips per unit via
- * unitConsecutiveSkips. When the same unit is skipped > MAX_CONSECUTIVE_SKIPS
- * times without a real dispatch in between, the completion record is evicted
- * so deriveState can reconcile.
- */
-
-import { mkdtempSync, mkdirSync, writeFileSync, rmSync } from "node:fs";
-import { join } from "node:path";
-import { tmpdir } from "node:os";
-
-import {
-  _getUnitConsecutiveSkips,
-  _resetUnitConsecutiveSkips,
-} from "../auto.ts";
-import { MAX_CONSECUTIVE_SKIPS } from "../auto/session.ts";
-import { persistCompletedKey, removePersistedKey, loadPersistedKeys } from "../auto-recovery.ts";
-import { createTestContext } from "./test-helpers.ts";
-
-const { assertEq, assertTrue, report } = createTestContext();
-
-function makeTmpBase(): string {
-  const dir = mkdtempSync(join(tmpdir(), "gsd-skip-loop-test-"));
-  mkdirSync(join(dir, ".gsd"), { recursive: true });
-  return dir;
-}
-
-async function main(): Promise<void> {
-  // ─── Counter starts at zero ────────────────────────────────────────────
-  console.log("\n=== skip loop counter: initial state ===");
-  {
-    _resetUnitConsecutiveSkips();
-    const map = _getUnitConsecutiveSkips();
-    assertEq(map.size, 0, "counter map starts empty after reset");
-  }
-
-  // ─── Counter increments correctly ────────────────────────────────────
-  console.log("\n=== skip loop counter: increments on repeated calls ===");
-  {
-    _resetUnitConsecutiveSkips();
-    const map = _getUnitConsecutiveSkips();
-    const key = "plan-slice/M001/S04";
-
-    for (let i = 1; i <= MAX_CONSECUTIVE_SKIPS; i++) {
-      const prev = map.get(key) ?? 0;
-      map.set(key, prev + 1);
-    }
-
-    assertEq(map.get(key), MAX_CONSECUTIVE_SKIPS, `counter reaches MAX_CONSECUTIVE_SKIPS (${MAX_CONSECUTIVE_SKIPS})`);
-  }
-
-  // ─── Threshold constant is sane ──────────────────────────────────────
-  console.log("\n=== skip loop counter: threshold is reasonable ===");
-  {
-    assertTrue(MAX_CONSECUTIVE_SKIPS >= 3, "threshold allows a few legitimate skips");
-    assertTrue(MAX_CONSECUTIVE_SKIPS <= 10, "threshold catches loops quickly");
-  }
-
-  // ─── Reset clears all keys ────────────────────────────────────────────
-  console.log("\n=== skip loop counter: reset clears all keys ===");
-  {
-    _resetUnitConsecutiveSkips();
-    const map = _getUnitConsecutiveSkips();
-    map.set("plan-slice/M001/S01", 2);
-    map.set("plan-slice/M001/S02", 1);
-    assertEq(map.size, 2, "map has 2 entries before reset");
-
-    _resetUnitConsecutiveSkips();
-    assertEq(_getUnitConsecutiveSkips().size, 0, "map empty after reset");
-  }
-
-  // ─── Eviction path: persistCompletedKey + removePersistedKey round-trip
-  //     (simulates what the loop-breaker does) ───────────────────────────
-  console.log("\n=== skip loop counter: eviction removes persisted key ===");
-  {
-    _resetUnitConsecutiveSkips();
-    const base = makeTmpBase();
-    try {
-      const key = "plan-slice/M001/S04";
-      const keySet = new Set<string>();
-
-      persistCompletedKey(base, key);
-      loadPersistedKeys(base, keySet);
-      assertTrue(keySet.has(key), "key persisted before eviction");
-
-      // Simulate loop-breaker eviction
-      keySet.delete(key);
-      removePersistedKey(base, key);
-      const keySet2 = new Set<string>();
-      loadPersistedKeys(base, keySet2);
-      assertTrue(!keySet2.has(key), "key absent after eviction");
-    } finally {
-      rmSync(base, { recursive: true, force: true });
-    }
-  }
-
-  // ─── Counter resets per-key, not globally ─────────────────────────────
-  console.log("\n=== skip loop counter: per-key isolation ===");
-  {
-    _resetUnitConsecutiveSkips();
-    const map = _getUnitConsecutiveSkips();
-    map.set("plan-slice/M001/S04", MAX_CONSECUTIVE_SKIPS + 1);
-    map.set("plan-slice/M001/S05", 1);
-
-    // Deleting S04 (eviction) should not affect S05
-    map.delete("plan-slice/M001/S04");
-    assertTrue(!map.has("plan-slice/M001/S04"), "S04 evicted");
-    assertEq(map.get("plan-slice/M001/S05"), 1, "S05 counter unaffected");
-  }
-
-  _resetUnitConsecutiveSkips();
-  report();
-}
-
-main().catch((err) => {
-  console.error(err);
-  process.exit(1);
-});

package/dist/resources/extensions/gsd/tests/auto-worktree-milestone-merge.test.ts

@@ -1,340 +0,0 @@
-/**
- * auto-worktree-milestone-merge.test.ts — Integration tests for mergeMilestoneToMain.
- *
- * Covers: squash-merge topology (one commit on main), rich commit message with
- * slice titles, worktree cleanup, nothing-to-commit edge case, auto-push with
- * bare remote. All tests use real git operations in temp repos.
- */
-
-import { mkdtempSync, mkdirSync, writeFileSync, rmSync, existsSync, realpathSync, readFileSync } from "node:fs";
-import { join } from "node:path";
-import { tmpdir } from "node:os";
-import { execSync } from "node:child_process";
-
-import {
-  createAutoWorktree,
-  mergeMilestoneToMain,
-  getAutoWorktreeOriginalBase,
-} from "../auto-worktree.ts";
-import { getSliceBranchName } from "../worktree.ts";
-
-import { createTestContext } from "./test-helpers.ts";
-
-const { assertEq, assertTrue, assertMatch, report } = createTestContext();
-
-function run(cmd: string, cwd: string): string {
-  return execSync(cmd, { cwd, stdio: ["ignore", "pipe", "pipe"], encoding: "utf-8" }).trim();
-}
-
-function createTempRepo(): string {
-  const dir = realpathSync(mkdtempSync(join(tmpdir(), "wt-ms-merge-test-")));
-  run("git init", dir);
-  run("git config user.email test@test.com", dir);
-  run("git config user.name Test", dir);
-  writeFileSync(join(dir, "README.md"), "# test\n");
-  // Mirror production: GSD runtime dirs are gitignored so autoCommitDirtyState
-  // doesn't pick up the worktrees directory as dirty state (#1127 fix).
-  writeFileSync(join(dir, ".gitignore"), ".gsd/worktrees/\n");
-  mkdirSync(join(dir, ".gsd"), { recursive: true });
-  writeFileSync(join(dir, ".gsd", "STATE.md"), "# State\n");
-  run("git add .", dir);
-  run("git commit -m init", dir);
-  run("git branch -M main", dir);
-  return dir;
-}
-
-/** Minimal roadmap content for mergeMilestoneToMain. */
-function makeRoadmap(milestoneId: string, title: string, slices: Array<{ id: string; title: string }>): string {
-  const sliceLines = slices.map(s => `- [x] **${s.id}: ${s.title}**`).join("\n");
-  return `# ${milestoneId}: ${title}\n\n## Slices\n${sliceLines}\n`;
-}
-
-/** Set up a slice branch on the worktree, add commits, merge it --no-ff to milestone. */
-function addSliceToMilestone(
-  repo: string,
-  wtPath: string,
-  milestoneId: string,
-  sliceId: string,
-  sliceTitle: string,
-  commits: Array<{ file: string; content: string; message: string }>,
-): void {
-  // Detect worktree name for branch naming
-  const normalizedPath = wtPath.replaceAll("\\", "/");
-  const marker = "/.gsd/worktrees/";
-  const idx = normalizedPath.indexOf(marker);
-  const worktreeName = idx !== -1 ? normalizedPath.slice(idx + marker.length).split("/")[0] : null;
-
-  const sliceBranch = getSliceBranchName(milestoneId, sliceId, worktreeName);
-
-  run(`git checkout -b ${sliceBranch}`, wtPath);
-  for (const c of commits) {
-    writeFileSync(join(wtPath, c.file), c.content);
-    run("git add .", wtPath);
-    run(`git commit -m "${c.message}"`, wtPath);
-  }
-  run(`git checkout milestone/${milestoneId}`, wtPath);
-  run(`git merge --no-ff ${sliceBranch} -m "feat(${milestoneId}/${sliceId}): ${sliceTitle}"`, wtPath);
-  // Clean up the slice branch
-  run(`git branch -d ${sliceBranch}`, wtPath);
-}
-
-async function main(): Promise<void> {
-  const savedCwd = process.cwd();
-  const tempDirs: string[] = [];
-
-  function freshRepo(): string {
-    const d = createTempRepo();
-    tempDirs.push(d);
-    return d;
-  }
-
-  try {
-    // ─── Test 1: Basic squash merge — one commit on main ───────────────
-    console.log("\n=== basic squash merge — one commit on main ===");
-    {
-      const repo = freshRepo();
-      const wtPath = createAutoWorktree(repo, "M010");
-
-      // Add two slices with multiple commits each
-      addSliceToMilestone(repo, wtPath, "M010", "S01", "Auth module", [
-        { file: "auth.ts", content: "export const auth = true;\n", message: "add auth" },
-        { file: "auth-utils.ts", content: "export const hash = () => {};\n", message: "add auth utils" },
-      ]);
-      addSliceToMilestone(repo, wtPath, "M010", "S02", "User dashboard", [
-        { file: "dashboard.ts", content: "export const dash = true;\n", message: "add dashboard" },
-        { file: "widgets.ts", content: "export const widgets = [];\n", message: "add widgets" },
-      ]);
-
-      const roadmap = makeRoadmap("M010", "User management", [
-        { id: "S01", title: "Auth module" },
-        { id: "S02", title: "User dashboard" },
-      ]);
-
-      const mainLogBefore = run("git log --oneline main", repo);
-      const mainCommitCountBefore = mainLogBefore.split("\n").length;
-
-      const result = mergeMilestoneToMain(repo, "M010", roadmap);
-
-      // Exactly one new commit on main
-      const mainLog = run("git log --oneline main", repo);
-      const mainCommitCountAfter = mainLog.split("\n").length;
-      assertEq(mainCommitCountAfter, mainCommitCountBefore + 1, "exactly one new commit on main");
-
-      // Milestone branch deleted
-      const branches = run("git branch", repo);
-      assertTrue(!branches.includes("milestone/M010"), "milestone branch deleted");
-
-      // Worktree directory removed
-      const worktreeDir = join(repo, ".gsd", "worktrees", "M010");
-      assertTrue(!existsSync(worktreeDir), "worktree directory removed");
-
-      // Module state cleared
-      assertEq(getAutoWorktreeOriginalBase(), null, "originalBase cleared after merge");
-
-      // Files from both slices present on main
-      assertTrue(existsSync(join(repo, "auth.ts")), "auth.ts on main");
-      assertTrue(existsSync(join(repo, "dashboard.ts")), "dashboard.ts on main");
-      assertTrue(existsSync(join(repo, "widgets.ts")), "widgets.ts on main");
-
-      // Result shape
-      assertTrue(result.commitMessage.length > 0, "commitMessage returned");
-      assertTrue(typeof result.pushed === "boolean", "pushed is boolean");
-    }
-
-    // ─── Test 2: Rich commit message format ────────────────────────────
-    console.log("\n=== rich commit message format ===");
-    {
-      const repo = freshRepo();
-      const wtPath = createAutoWorktree(repo, "M020");
-
-      addSliceToMilestone(repo, wtPath, "M020", "S01", "Core API", [
-        { file: "api.ts", content: "export const api = true;\n", message: "add api" },
-      ]);
-      addSliceToMilestone(repo, wtPath, "M020", "S02", "Error handling", [
-        { file: "errors.ts", content: "export class AppError {}\n", message: "add errors" },
-      ]);
-      addSliceToMilestone(repo, wtPath, "M020", "S03", "Logging infra", [
-        { file: "logger.ts", content: "export const log = () => {};\n", message: "add logger" },
-      ]);
-
-      const roadmap = makeRoadmap("M020", "Backend foundation", [
-        { id: "S01", title: "Core API" },
-        { id: "S02", title: "Error handling" },
-        { id: "S03", title: "Logging infra" },
-      ]);
-
-      const result = mergeMilestoneToMain(repo, "M020", roadmap);
-
-      // Subject line: conventional commit format
-      assertMatch(result.commitMessage, /^feat\(M020\):/, "subject has conventional commit prefix");
-      assertTrue(result.commitMessage.includes("Backend foundation"), "subject includes milestone title");
-
-      // Body: slice listing
-      assertTrue(result.commitMessage.includes("- S01: Core API"), "body lists S01");
-      assertTrue(result.commitMessage.includes("- S02: Error handling"), "body lists S02");
-      assertTrue(result.commitMessage.includes("- S03: Logging infra"), "body lists S03");
-
-      // Branch metadata
-      assertTrue(result.commitMessage.includes("Branch: milestone/M020"), "body has branch metadata");
-
-      // Verify the actual git commit message matches
-      const gitMsg = run("git log -1 --format=%B main", repo).trim();
-      assertMatch(gitMsg, /^feat\(M020\):/, "git commit message starts with feat(M020):");
-      assertTrue(gitMsg.includes("- S01: Core API"), "git commit body has S01");
-    }
-
-    // ─── Test 3: Nothing to commit — no changes ────────────────────────
-    console.log("\n=== nothing to commit — no changes ===");
-    {
-      const repo = freshRepo();
-      const wtPath = createAutoWorktree(repo, "M030");
-
-      // Don't add any slices/changes — milestone branch is identical to main
-      const roadmap = makeRoadmap("M030", "Empty milestone", []);
-
-      // Should complete without throwing
-      let threw = false;
-      try {
-        const result = mergeMilestoneToMain(repo, "M030", roadmap);
-        assertTrue(typeof result.pushed === "boolean", "returns result even with nothing to commit");
-      } catch {
-        threw = true;
-      }
-      assertTrue(!threw, "does not throw on nothing-to-commit");
-
-      // Main log unchanged (only init commit)
-      const mainLog = run("git log --oneline main", repo);
-      assertEq(mainLog.split("\n").length, 1, "main still has only init commit");
-    }
-
-    // ─── Test 4: Auto-push — verify push mechanics work ──────────────
-    // Note: loadEffectiveGSDPreferences uses a module-level const for project
-    // prefs path (process.cwd() at import time), so temp repo prefs aren't
-    // discoverable. We verify the push mechanics work by testing that
-    // mergeMilestoneToMain successfully completes with a remote configured,
-    // then manually push to verify the remote is set up correctly.
-    console.log("\n=== auto-push with bare remote ===");
-    {
-      const repo = freshRepo();
-
-      // Set up bare remote
-      const bareDir = realpathSync(mkdtempSync(join(tmpdir(), "wt-ms-bare-")));
-      tempDirs.push(bareDir);
-      run("git init --bare", bareDir);
-      run(`git remote add origin ${bareDir}`, repo);
-      run("git push -u origin main", repo);
-
-      const wtPath = createAutoWorktree(repo, "M040");
-
-      addSliceToMilestone(repo, wtPath, "M040", "S01", "Push test", [
-        { file: "pushed.ts", content: "export const pushed = true;\n", message: "add pushed file" },
-      ]);
-
-      const roadmap = makeRoadmap("M040", "Push verification", [
-        { id: "S01", title: "Push test" },
-      ]);
-
-      const result = mergeMilestoneToMain(repo, "M040", roadmap);
-
-      // Verify merge succeeded (commit on main)
-      const mainLog = run("git log --oneline main", repo);
-      assertTrue(mainLog.includes("feat(M040)"), "milestone commit on main");
-
-      // Manually push to verify remote works
-      run("git push origin main", repo);
-      const remoteLog = run("git log --oneline main", bareDir);
-      assertTrue(remoteLog.includes("feat(M040)"), "milestone commit reachable on remote after manual push");
-
-      // result.pushed will be false since prefs aren't loadable in temp repos
-      // (module-level const limitation) — that's expected
-      assertEq(result.pushed, false, "pushed is false without discoverable prefs");
-    }
-
-    // ─── Test 5: Auto-resolve .gsd/ state file conflicts (#530) ───────
-    console.log("\n=== auto-resolve .gsd/ state file conflicts ===");
-    {
-      const repo = freshRepo();
-      const wtPath = createAutoWorktree(repo, "M050");
-
-      // Add a slice with real work
-      addSliceToMilestone(repo, wtPath, "M050", "S01", "Conflict test", [
-        { file: "feature.ts", content: "export const feature = true;\n", message: "add feature" },
-      ]);
-
-      // Modify .gsd/STATE.md on the milestone branch (simulates auto-mode state updates)
-      writeFileSync(join(wtPath, ".gsd", "STATE.md"), "# State\n\n## Updated on milestone branch\n");
-      run("git add .", wtPath);
-      run('git commit -m "chore: update state on milestone branch"', wtPath);
-
-      // Now modify .gsd/STATE.md on main too (simulates divergence)
-      run("git checkout main", repo);
-      writeFileSync(join(repo, ".gsd", "STATE.md"), "# State\n\n## Updated on main\n");
-      run("git add .", repo);
-      run('git commit -m "chore: update state on main"', repo);
-
-      // Go back to worktree for the merge
-      process.chdir(wtPath);
-
-      const roadmap = makeRoadmap("M050", "Conflict resolution", [
-        { id: "S01", title: "Conflict test" },
-      ]);
-
-      // Merge should succeed despite .gsd/STATE.md conflict — auto-resolved
-      let threw = false;
-      try {
-        const result = mergeMilestoneToMain(repo, "M050", roadmap);
-        assertTrue(result.commitMessage.includes("feat(M050)"), "merge commit created despite .gsd conflict");
-      } catch (err) {
-        threw = true;
-      }
-      assertTrue(!threw, "auto-resolves .gsd/ state file conflicts without throwing");
-
-      // Feature file should be on main
-      assertTrue(existsSync(join(repo, "feature.ts")), "feature.ts merged to main");
-    }
-
-    // ─── Test 6: Skip checkout when main already current (#757) ───────
-    console.log("\n=== skip checkout when main already current (#757) ===");
-    {
-      const repo = freshRepo();
-      const wtPath = createAutoWorktree(repo, "M060");
-
-      addSliceToMilestone(repo, wtPath, "M060", "S01", "Skip checkout test", [
-        { file: "skip-checkout.ts", content: "export const skip = true;\n", message: "add skip-checkout" },
-      ]);
-
-      const roadmap = makeRoadmap("M060", "Skip checkout verification", [
-        { id: "S01", title: "Skip checkout test" },
-      ]);
-
-      // Verify main is already checked out at repo root (worktree default)
-      const branchAtRoot = run("git rev-parse --abbrev-ref HEAD", repo);
-      assertEq(branchAtRoot, "main", "main is already checked out at project root");
-
-      // mergeMilestoneToMain should succeed without attempting to checkout main
-      // (which would fail with "already used by worktree" error)
-      let threw = false;
-      try {
-        const result = mergeMilestoneToMain(repo, "M060", roadmap);
-        assertTrue(result.commitMessage.includes("feat(M060)"), "merge commit created");
-      } catch (err) {
-        threw = true;
-        console.error("Unexpected error:", err);
-      }
-      assertTrue(!threw, "does not fail when main is already checked out at project root");
-
-      // Verify the merge actually happened
-      assertTrue(existsSync(join(repo, "skip-checkout.ts")), "skip-checkout.ts merged to main");
-    }
-
-  } finally {
-    process.chdir(savedCwd);
-    for (const d of tempDirs) {
-      if (existsSync(d)) rmSync(d, { recursive: true, force: true });
-    }
-  }
-
-  report();
-}
-
-main();

package/dist/resources/extensions/gsd/tests/auto-worktree.test.ts

@@ -1,167 +0,0 @@
-/**
- * auto-worktree.test.ts — Tests for auto-worktree lifecycle.
- *
- * Covers: create → detect → teardown, re-entry, path helpers.
- * Runs in a real temp git repo.
- */
-
-import { mkdtempSync, mkdirSync, writeFileSync, rmSync, existsSync, realpathSync } from "node:fs";
-import { join } from "node:path";
-import { tmpdir } from "node:os";
-import { execSync } from "node:child_process";
-
-import {
-  createAutoWorktree,
-  teardownAutoWorktree,
-  isInAutoWorktree,
-  getAutoWorktreePath,
-  enterAutoWorktree,
-  getAutoWorktreeOriginalBase,
-  getActiveAutoWorktreeContext,
-} from "../auto-worktree.ts";
-
-import { createTestContext } from "./test-helpers.ts";
-
-const { assertEq, assertTrue, report } = createTestContext();
-
-function run(command: string, cwd: string): string {
-  return execSync(command, { cwd, stdio: ["ignore", "pipe", "pipe"], encoding: "utf-8" }).trim();
-}
-
-function createTempRepo(): string {
-  const dir = realpathSync(mkdtempSync(join(tmpdir(), "auto-wt-test-")));
-  run("git init", dir);
-  run("git config user.email test@test.com", dir);
-  run("git config user.name Test", dir);
-  // Create initial commit on main
-  writeFileSync(join(dir, "README.md"), "# test\n");
-  run("git add .", dir);
-  run("git commit -m init", dir);
-  // Ensure branch is called main
-  run("git branch -M main", dir);
-  return dir;
-}
-
-async function main(): Promise<void> {
-  const savedCwd = process.cwd();
-  let tempDir = "";
-
-  try {
-    tempDir = createTempRepo();
-
-    // Create .gsd/milestones/M003 with a dummy file (simulates planning artifacts)
-    const msDir = join(tempDir, ".gsd", "milestones", "M003");
-    mkdirSync(msDir, { recursive: true });
-    writeFileSync(join(msDir, "CONTEXT.md"), "# M003 Context\n");
-    run("git add .", tempDir);
-    run("git commit -m \"add milestone\"", tempDir);
-
-    console.log("\n=== auto-worktree lifecycle ===");
-
-    // ─── createAutoWorktree ──────────────────────────────────────────
-    const wtPath = createAutoWorktree(tempDir, "M003");
-
-    assertTrue(existsSync(wtPath), "worktree directory exists after create");
-    assertEq(process.cwd(), wtPath, "process.cwd() is worktree path after create");
-
-    const branch = run("git branch --show-current", wtPath);
-    assertEq(branch, "milestone/M003", "git branch is milestone/M003");
-
-    assertTrue(
-      existsSync(join(wtPath, ".gsd", "milestones", "M003", "CONTEXT.md")),
-      "planning files inherited in worktree",
-    );
-
-    // ─── isInAutoWorktree ────────────────────────────────────────────
-    assertTrue(isInAutoWorktree(tempDir), "isInAutoWorktree returns true when inside");
-
-    // ─── getAutoWorktreeOriginalBase ─────────────────────────────────
-    assertEq(getAutoWorktreeOriginalBase(), tempDir, "originalBase returns temp dir");
-    assertEq(
-      getActiveAutoWorktreeContext(),
-      {
-        originalBase: tempDir,
-        worktreeName: "M003",
-        branch: "milestone/M003",
-      },
-      "active auto-worktree context reflects the worktree cwd",
-    );
-
-    // ─── getAutoWorktreePath ─────────────────────────────────────────
-    assertEq(getAutoWorktreePath(tempDir, "M003"), wtPath, "getAutoWorktreePath returns correct path");
-    assertEq(getAutoWorktreePath(tempDir, "M999"), null, "getAutoWorktreePath returns null for nonexistent");
-
-    // ─── teardownAutoWorktree ────────────────────────────────────────
-    teardownAutoWorktree(tempDir, "M003");
-
-    assertEq(process.cwd(), tempDir, "process.cwd() back to original after teardown");
-    assertTrue(!existsSync(wtPath), "worktree directory removed after teardown");
-    assertTrue(!isInAutoWorktree(tempDir), "isInAutoWorktree returns false after teardown");
-    assertEq(getAutoWorktreeOriginalBase(), null, "originalBase is null after teardown");
-    assertEq(getActiveAutoWorktreeContext(), null, "active auto-worktree context clears after teardown");
-
-    // ─── Re-entry: create again, exit without teardown, re-enter ─────
-    console.log("\n=== re-entry ===");
-
-    const wtPath2 = createAutoWorktree(tempDir, "M003");
-    assertTrue(existsSync(wtPath2), "worktree re-created");
-
-    // Manually chdir out (simulates pause/crash)
-    process.chdir(tempDir);
-
-    // enterAutoWorktree should re-enter
-    const entered = enterAutoWorktree(tempDir, "M003");
-    assertEq(process.cwd(), entered, "re-entered worktree via enterAutoWorktree");
-    assertEq(getAutoWorktreeOriginalBase(), tempDir, "originalBase restored on re-entry");
-    assertTrue(isInAutoWorktree(tempDir), "isInAutoWorktree true after re-entry");
-    assertEq(
-      getActiveAutoWorktreeContext(),
-      {
-        originalBase: tempDir,
-        worktreeName: "M003",
-        branch: "milestone/M003",
-      },
-      "active auto-worktree context is restored on re-entry",
-    );
-
-    // Cleanup
-    teardownAutoWorktree(tempDir, "M003");
-
-    // ─── Coexistence with manual worktree ─────────────────────────────
-    console.log("\n=== coexistence ===");
-
-    // Import createWorktree directly for manual worktree
-    const { createWorktree } = await import("../worktree-manager.ts");
-
-    // Create manual worktree (uses worktree/<name> branch)
-    const manualWt = createWorktree(tempDir, "feature-x");
-    assertTrue(existsSync(manualWt.path), "manual worktree exists");
-    assertEq(manualWt.branch, "worktree/feature-x", "manual worktree uses worktree/ prefix");
-
-    // Create auto-worktree alongside
-    const autoWtPath = createAutoWorktree(tempDir, "M003");
-    assertTrue(existsSync(autoWtPath), "auto-worktree coexists with manual");
-    assertTrue(existsSync(manualWt.path), "manual worktree still exists");
-
-    // Cleanup both
-    teardownAutoWorktree(tempDir, "M003");
-    const { removeWorktree } = await import("../worktree-manager.ts");
-    removeWorktree(tempDir, "feature-x");
-
-    // ─── Failure: split-brain prevention ──────────────────────────────
-    console.log("\n=== split-brain prevention ===");
-    // After teardown, originalBase should be null
-    assertEq(getAutoWorktreeOriginalBase(), null, "no split-brain: originalBase cleared");
-
-  } finally {
-    // Always restore cwd and clean up
-    process.chdir(savedCwd);
-    if (tempDir && existsSync(tempDir)) {
-      rmSync(tempDir, { recursive: true, force: true });
-    }
-  }
-
-  report();
-}
-
-main();