gsd-pi 2.33.1 → 2.34.0-dev.bbb5216

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

@@ -1,244 +0,0 @@
-/**
- * worktree-e2e.test.ts -- End-to-end tests for worktree-isolated git flow.
- *
- * Covers cross-cutting groups not tested by individual slice tests:
- *   1. Full lifecycle chain (create -> slice commits -> merge to milestone -> merge to main)
- *   2. Self-heal: abortAndReset cleans up failed merges
- *   3. Doctor detection of orphaned worktrees
- */
-
-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,
-  mergeMilestoneToMain,
-} from "../auto-worktree.ts";
-import { getSliceBranchName } from "../worktree.ts";
-import { abortAndReset } from "../git-self-heal.ts";
-import { runGSDDoctor } from "../doctor.ts";
-import { createTestContext } from "./test-helpers.ts";
-
-const { assertEq, assertTrue, assertMatch, report } = createTestContext();
-
-// ---- Helpers ----
-
-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-e2e-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/worktrees/ is 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;
-}
-
-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`;
-}
-
-function addSliceToMilestone(
-  _repo: string,
-  wtPath: string,
-  milestoneId: string,
-  sliceId: string,
-  _sliceTitle: string,
-  commits: Array<{ file: string; content: string; message: string }>,
-): void {
-  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 "merge ${sliceId}"`, wtPath);
-}
-
-async function main(): Promise<void> {
-  const savedCwd = process.cwd();
-  const tempDirs: string[] = [];
-
-  try {
-    // ================================================================
-    // Group 1: Full lifecycle chain
-    // ================================================================
-    console.log("\n=== Full lifecycle: worktree -> slices -> milestone merge -> main ===");
-    {
-      const repo = createTempRepo();
-      tempDirs.push(repo);
-
-      // Count commits on main before
-      const mainLogBefore = run("git log --oneline main", repo);
-      const commitCountBefore = mainLogBefore.split("\n").length;
-
-      // Create worktree for M001
-      const wtPath = createAutoWorktree(repo, "M001");
-      tempDirs.push(wtPath);
-      assertTrue(existsSync(wtPath), "worktree directory created");
-
-      // Add two slices with commits
-      addSliceToMilestone(repo, wtPath, "M001", "S01", "Add auth", [
-        { file: "auth.ts", content: "export const auth = true;\n", message: "feat: add auth" },
-      ]);
-      addSliceToMilestone(repo, wtPath, "M001", "S02", "Add dashboard", [
-        { file: "dash.ts", content: "export const dash = true;\n", message: "feat: add dashboard" },
-      ]);
-
-      // Build roadmap content
-      const roadmapContent = makeRoadmap("M001", "First milestone", [
-        { id: "S01", title: "Add auth" },
-        { id: "S02", title: "Add dashboard" },
-      ]);
-
-      // Merge milestone to main
-      process.chdir(wtPath);
-      const result = mergeMilestoneToMain(repo, "M001", roadmapContent);
-      process.chdir(savedCwd);
-
-      // Assert exactly one new commit on main
-      const mainLogAfter = run("git log --oneline main", repo);
-      const commitCountAfter = mainLogAfter.split("\n").length;
-      assertEq(commitCountAfter, commitCountBefore + 1, "exactly one new commit on main");
-
-      // Commit message contains both slice titles
-      const lastCommitMsg = run("git log -1 --format=%B main", repo);
-      assertMatch(lastCommitMsg, /Add auth/, "commit message contains S01 title");
-      assertMatch(lastCommitMsg, /Add dashboard/, "commit message contains S02 title");
-
-      // Worktree directory removed
-      assertTrue(!existsSync(wtPath), "worktree directory removed after merge");
-
-      // Milestone branch deleted
-      const branches = run("git branch", repo);
-      assertTrue(!branches.includes("milestone/M001"), "milestone branch deleted");
-    }
-
-    // ================================================================
-    // Group 2: Self-heal (abortAndReset)
-    // ================================================================
-    console.log("\n=== Self-heal ===");
-    {
-      const repo = createTempRepo();
-      tempDirs.push(repo);
-
-      // Create conflicting branches
-      run("git checkout -b feature", repo);
-      writeFileSync(join(repo, "conflict.txt"), "feature content\n");
-      run("git add .", repo);
-      run("git commit -m feature", repo);
-      run("git checkout main", repo);
-      writeFileSync(join(repo, "conflict.txt"), "main content\n");
-      run("git add .", repo);
-      run("git commit -m main-change", repo);
-
-      // Trigger merge conflict
-      try { run("git merge feature", repo); } catch { /* expected */ }
-      assertTrue(existsSync(join(repo, ".git", "MERGE_HEAD")), "MERGE_HEAD exists before abort");
-
-      const abortResult = abortAndReset(repo);
-      assertTrue(!existsSync(join(repo, ".git", "MERGE_HEAD")), "MERGE_HEAD removed after abort");
-      assertTrue(abortResult.cleaned.length > 0, "abortAndReset reports cleaned items");
-    }
-
-    // ================================================================
-    // Group 3: Doctor detects orphaned worktrees
-    // Skip on Windows: git worktree path resolution in temp dirs uses
-    // UNC/8.3 forms that don't match after normalization.
-    // ================================================================
-    if (process.platform !== "win32") {
-    console.log("\n=== Doctor: orphaned worktree detection ===");
-    {
-      // Build a repo with a completed milestone
-      const repo = createTempRepo();
-      tempDirs.push(repo);
-
-      // Create completed milestone roadmap
-      const msDir = join(repo, ".gsd", "milestones", "M001");
-      mkdirSync(msDir, { recursive: true });
-      writeFileSync(join(msDir, "ROADMAP.md"), `---
-id: M001
-title: "Test Milestone"
----
-
-# M001: Test Milestone
-
-## Vision
-Test
-
-## Success Criteria
-- Done
-
-## Slices
-- [x] **S01: Test slice** \`risk:low\` \`depends:[]\`
-  > After this: done
-
-## Boundary Map
-_None_
-`);
-      run("git add -A", repo);
-      run("git commit -m \"add milestone\"", repo);
-
-      // Create orphaned worktree
-      mkdirSync(join(repo, ".gsd", "worktrees"), { recursive: true });
-      run("git worktree add -b milestone/M001 .gsd/worktrees/M001", repo);
-
-      // Detect
-      const detect = await runGSDDoctor(repo, { isolationMode: "worktree" });
-      const orphanIssues = detect.issues.filter(i => i.code === "orphaned_auto_worktree");
-      assertTrue(orphanIssues.length > 0, "doctor detects orphaned worktree");
-      assertEq(orphanIssues[0]?.unitId, "M001", "orphaned worktree unitId is M001");
-
-      // Fix
-      const fixed = await runGSDDoctor(repo, { fix: true, isolationMode: "worktree" });
-      assertTrue(
-        fixed.fixesApplied.some(f => f.includes("removed orphaned worktree")),
-        "doctor fix removes orphaned worktree",
-      );
-
-      // Verify gone
-      const wtList = run("git worktree list", repo);
-      assertTrue(!wtList.includes("milestone/M001"), "worktree gone after doctor fix");
-    }
-    } else {
-      console.log("\n=== Doctor: orphaned worktree detection (skipped on Windows) ===");
-    }
-  } finally {
-    process.chdir(savedCwd);
-    for (const d of tempDirs) {
-      try { rmSync(d, { recursive: true, force: true }); } catch { /* ignore */ }
-    }
-  }
-
-  report();
-}
-
-main();

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

@@ -1,207 +0,0 @@
-/**
- * Worktree Integration Tests
- *
- * Tests the full lifecycle of GSD operations inside a worktree:
- * - Branch namespacing (gsd/<wt>/<M>/<S> instead of gsd/<M>/<S>)
- * - getMainBranch returns worktree/<name> inside a worktree
- * - Parallel worktrees don't conflict on branch names
- * - State derivation works correctly inside worktrees
- */
-
-import { mkdtempSync, mkdirSync, rmSync, writeFileSync, readFileSync, existsSync } from "node:fs";
-import { join } from "node:path";
-import { tmpdir } from "node:os";
-import { execSync } from "node:child_process";
-
-import {
-  createWorktree,
-  listWorktrees,
-  removeWorktree,
-} from "../worktree-manager.ts";
-
-import {
-  detectWorktreeName,
-  getCurrentBranch,
-  getMainBranch,
-  getSliceBranchName,
-  autoCommitCurrentBranch,
-  SLICE_BRANCH_RE,
-} from "../worktree.ts";
-
-import { deriveState } from "../state.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();
-}
-
-// ─── Test repo setup ──────────────────────────────────────────────────────────
-
-const base = mkdtempSync(join(tmpdir(), "gsd-wt-integration-"));
-run("git init -b main", base);
-run("git config user.name 'Pi Test'", base);
-run("git config user.email 'pi@example.com'", base);
-
-// Create a project with one milestone and two slices
-mkdirSync(join(base, ".gsd", "milestones", "M001", "slices", "S01", "tasks"), { recursive: true });
-mkdirSync(join(base, ".gsd", "milestones", "M001", "slices", "S02", "tasks"), { recursive: true });
-writeFileSync(join(base, "README.md"), "# Test Project\n", "utf-8");
-writeFileSync(
-  join(base, ".gsd", "milestones", "M001", "M001-ROADMAP.md"),
-  [
-    "# M001: Demo",
-    "",
-    "## Slices",
-    "- [ ] **S01: First** `risk:low` `depends:[]`",
-    "  > After this: part one works",
-    "- [ ] **S02: Second** `risk:low` `depends:[]`",
-    "  > After this: part two works",
-  ].join("\n") + "\n",
-  "utf-8",
-);
-writeFileSync(
-  join(base, ".gsd", "milestones", "M001", "slices", "S01", "S01-PLAN.md"),
-  "# S01: First\n\n**Goal:** Demo\n**Demo:** Demo\n\n## Must-Haves\n- done\n\n## Tasks\n- [ ] **T01: Implement** `est:10m`\n  do it\n",
-  "utf-8",
-);
-writeFileSync(
-  join(base, ".gsd", "milestones", "M001", "slices", "S02", "S02-PLAN.md"),
-  "# S02: Second\n\n**Goal:** Demo\n**Demo:** Demo\n\n## Must-Haves\n- done\n\n## Tasks\n- [ ] **T01: Implement** `est:10m`\n  do it\n",
-  "utf-8",
-);
-run("git add .", base);
-run('git commit -m "chore: init"', base);
-
-async function main(): Promise<void> {
-  // ── Verify main tree baseline ──────────────────────────────────────────────
-
-  console.log("\n=== Main tree baseline ===");
-  assertEq(getMainBranch(base), "main", "main tree getMainBranch returns main");
-  assertEq(detectWorktreeName(base), null, "main tree not detected as worktree");
-
-  // ── Create worktree and verify detection ───────────────────────────────────
-
-  console.log("\n=== Create worktree ===");
-  const wt = createWorktree(base, "alpha");
-  assertTrue(existsSync(wt.path), "worktree created on disk");
-  assertEq(wt.branch, "worktree/alpha", "worktree branch name");
-
-  console.log("\n=== Worktree detection ===");
-  assertEq(detectWorktreeName(wt.path), "alpha", "detectWorktreeName inside worktree");
-  assertEq(getMainBranch(wt.path), "worktree/alpha", "getMainBranch returns worktree branch inside worktree");
-
-  // ── Verify current branch inside worktree ──────────────────────────────────
-
-  console.log("\n=== Worktree initial branch ===");
-  assertEq(getCurrentBranch(wt.path), "worktree/alpha", "worktree starts on its own branch");
-
-  // ── Verify branch name helper ──────────────────────────────────────────────
-
-  console.log("\n=== getSliceBranchName with worktree ===");
-  assertEq(getSliceBranchName("M001", "S01", "alpha"), "gsd/alpha/M001/S01", "explicit worktree param");
-  assertEq(getSliceBranchName("M001", "S01"), "gsd/M001/S01", "no worktree param = plain branch");
-
-  // ── Slice branch creation and detection inside worktree ────────────────────
-
-  console.log("\n=== Slice branch in worktree ===");
-  const sliceBranch = getSliceBranchName("M001", "S01", "alpha");
-  run(`git checkout -b ${sliceBranch}`, wt.path);
-  assertEq(getCurrentBranch(wt.path), "gsd/alpha/M001/S01", "worktree-namespaced slice branch");
-  assertTrue(SLICE_BRANCH_RE.test(getCurrentBranch(wt.path)), "slice branch regex matches namespaced branch");
-
-  // ── Do work on slice branch, then merge to worktree branch ─────────────────
-
-  console.log("\n=== Work and merge slice in worktree ===");
-  writeFileSync(join(wt.path, "feature.txt"), "new feature\n", "utf-8");
-  run("git add .", wt.path);
-  run('git commit -m "feat: add feature"', wt.path);
-
-  // Checkout worktree base branch and merge slice branch
-  run("git checkout worktree/alpha", wt.path);
-  assertEq(getCurrentBranch(wt.path), "worktree/alpha", "back on worktree branch");
-
-  run(`git merge --no-ff ${sliceBranch} -m "feat(M001/S01): First"`, wt.path);
-  run(`git branch -d ${sliceBranch}`, wt.path);
-  assertEq(getCurrentBranch(wt.path), "worktree/alpha", "still on worktree branch after merge");
-  assertTrue(readFileSync(join(wt.path, "feature.txt"), "utf-8").includes("new feature"), "merge brought feature to worktree branch");
-
-  // Verify slice branch is gone
-  const branches = run("git branch", base);
-  assertTrue(!branches.includes("gsd/alpha/M001/S01"), "slice branch cleaned up");
-
-  // ── Second slice in same worktree ──────────────────────────────────────────
-
-  console.log("\n=== Second slice in worktree ===");
-  const sliceBranch2 = getSliceBranchName("M001", "S02", "alpha");
-  run(`git checkout -b ${sliceBranch2}`, wt.path);
-  assertEq(getCurrentBranch(wt.path), "gsd/alpha/M001/S02", "on S02 namespaced branch");
-
-  writeFileSync(join(wt.path, "feature2.txt"), "second feature\n", "utf-8");
-  run("git add .", wt.path);
-  run('git commit -m "feat: add feature 2"', wt.path);
-
-  run("git checkout worktree/alpha", wt.path);
-  run(`git merge --no-ff ${sliceBranch2} -m "feat(M001/S02): Second"`, wt.path);
-  run(`git branch -d ${sliceBranch2}`, wt.path);
-  assertEq(getCurrentBranch(wt.path), "worktree/alpha", "back on worktree branch");
-
-  // ── Parallel worktrees don't conflict ──────────────────────────────────────
-
-  console.log("\n=== Parallel worktrees ===");
-  const wt2 = createWorktree(base, "beta");
-  assertEq(getMainBranch(wt2.path), "worktree/beta", "second worktree has its own base branch");
-
-  // Both worktrees can create S01 branches without conflict
-  const betaBranch = getSliceBranchName("M001", "S01", "beta");
-  run(`git checkout -b ${betaBranch}`, wt2.path);
-  assertEq(getCurrentBranch(wt2.path), "gsd/beta/M001/S01", "beta has its own namespaced branch");
-
-  // Alpha worktree can re-create S01 too (it was already merged+deleted earlier)
-  const alphaReBranch = getSliceBranchName("M001", "S01", "alpha");
-  run(`git checkout -b ${alphaReBranch}`, wt.path);
-  assertEq(getCurrentBranch(wt.path), "gsd/alpha/M001/S01", "alpha re-created S01");
-
-  // Both exist simultaneously
-  const allBranches = run("git branch", base);
-  assertTrue(allBranches.includes("gsd/alpha/M001/S01"), "alpha S01 branch exists");
-  assertTrue(allBranches.includes("gsd/beta/M001/S01"), "beta S01 branch exists");
-
-  // ── State derivation in worktree ───────────────────────────────────────────
-
-  console.log("\n=== State derivation in worktree ===");
-  // Switch alpha back to its base so deriveState sees milestone files
-  run("git checkout worktree/alpha", wt.path);
-  const state = await deriveState(wt.path);
-  assertTrue(state.activeMilestone !== null, "worktree has active milestone");
-  assertEq(state.activeMilestone?.id, "M001", "correct milestone");
-
-  // ── autoCommitCurrentBranch in worktree ────────────────────────────────────
-
-  console.log("\n=== autoCommitCurrentBranch in worktree ===");
-  // Re-checkout the beta slice branch
-  run(`git checkout ${betaBranch}`, wt2.path);
-  writeFileSync(join(wt2.path, "dirty.txt"), "uncommitted\n", "utf-8");
-  const commitMsg = autoCommitCurrentBranch(wt2.path, "execute-task", "M001/S01/T01");
-  assertTrue(commitMsg !== null, "auto-commit works in worktree");
-  assertEq(run("git status --short", wt2.path), "", "worktree clean after auto-commit");
-
-  // ── Cleanup ────────────────────────────────────────────────────────────────
-
-  console.log("\n=== Cleanup ===");
-  // Switch worktrees back to their base branches before removal
-  run("git checkout worktree/alpha", wt.path);
-  run("git checkout worktree/beta", wt2.path);
-  removeWorktree(base, "alpha", { deleteBranch: true });
-  removeWorktree(base, "beta", { deleteBranch: true });
-  assertEq(listWorktrees(base).length, 0, "all worktrees removed");
-
-  rmSync(base, { recursive: true, force: true });
-
-  report();
-}
-
-main().catch((error) => {
-  console.error(error);
-  process.exit(1);
-});

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

@@ -1,141 +0,0 @@
-import { mkdtempSync, mkdirSync, rmSync, writeFileSync, existsSync, readFileSync } from "node:fs";
-import { join } from "node:path";
-import { tmpdir } from "node:os";
-import { execSync } from "node:child_process";
-
-import {
-  createWorktree,
-  listWorktrees,
-  removeWorktree,
-  diffWorktreeGSD,
-  getWorktreeGSDDiff,
-  getWorktreeLog,
-  worktreeBranchName,
-  worktreePath,
-} from "../worktree-manager.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();
-}
-
-// Set up a test repo
-const base = mkdtempSync(join(tmpdir(), "gsd-worktree-mgr-test-"));
-run("git init -b main", base);
-run('git config user.name "Pi Test"', base);
-run('git config user.email "pi@example.com"', base);
-
-// Create initial project structure
-mkdirSync(join(base, ".gsd", "milestones", "M001"), { recursive: true });
-writeFileSync(join(base, "README.md"), "# Test Project\n", "utf-8");
-writeFileSync(
-  join(base, ".gsd", "milestones", "M001", "M001-ROADMAP.md"),
-  "# M001: Demo\n\n## Slices\n- [ ] **S01: First** `risk:low` `depends:[]`\n  > After this: it works\n",
-  "utf-8",
-);
-run("git add .", base);
-run('git commit -m "chore: init"', base);
-
-async function main(): Promise<void> {
-  console.log("\n=== worktreeBranchName ===");
-  assertEq(worktreeBranchName("feature-x"), "worktree/feature-x", "branch name format");
-
-  console.log("\n=== createWorktree ===");
-  const info = createWorktree(base, "feature-x");
-  assertTrue(info.name === "feature-x", "name matches");
-  assertTrue(info.branch === "worktree/feature-x", "branch matches");
-  assertTrue(info.exists, "worktree exists");
-  assertTrue(existsSync(info.path), "worktree path exists on disk");
-  assertTrue(existsSync(join(info.path, "README.md")), "README.md copied to worktree");
-  assertTrue(existsSync(join(info.path, ".gsd", "milestones", "M001", "M001-ROADMAP.md")), ".gsd files copied");
-
-  // Branch was created
-  const branches = run("git branch", base);
-  assertTrue(branches.includes("worktree/feature-x"), "branch was created");
-
-  console.log("\n=== createWorktree — duplicate ===");
-  let duplicateError = "";
-  try {
-    createWorktree(base, "feature-x");
-  } catch (e) {
-    duplicateError = (e as Error).message;
-  }
-  assertTrue(duplicateError.includes("already exists"), "duplicate creation fails");
-
-  console.log("\n=== createWorktree — invalid name ===");
-  let invalidError = "";
-  try {
-    createWorktree(base, "bad name!");
-  } catch (e) {
-    invalidError = (e as Error).message;
-  }
-  assertTrue(invalidError.includes("Invalid worktree name"), "invalid name rejected");
-
-  console.log("\n=== listWorktrees ===");
-  const list = listWorktrees(base);
-  assertEq(list.length, 1, "one worktree listed");
-  assertEq(list[0]!.name, "feature-x", "correct name");
-  assertEq(list[0]!.branch, "worktree/feature-x", "correct branch");
-  assertTrue(list[0]!.exists, "exists flag is true");
-
-  console.log("\n=== make changes in worktree ===");
-  const wtPath = worktreePath(base, "feature-x");
-  // Add a new GSD artifact in the worktree
-  mkdirSync(join(wtPath, ".gsd", "milestones", "M002"), { recursive: true });
-  writeFileSync(
-    join(wtPath, ".gsd", "milestones", "M002", "M002-ROADMAP.md"),
-    "# M002: New Feature\n\n## Slices\n- [ ] **S01: Setup** `risk:low` `depends:[]`\n  > After this: new feature ready\n",
-    "utf-8",
-  );
-  // Modify an existing artifact
-  writeFileSync(
-    join(wtPath, ".gsd", "milestones", "M001", "M001-ROADMAP.md"),
-    "# M001: Demo (updated)\n\n## Slices\n- [x] **S01: First** `risk:low` `depends:[]`\n  > Done\n",
-    "utf-8",
-  );
-  run("git add .", wtPath);
-  run('git commit -m "feat: add M002 and update M001"', wtPath);
-
-  console.log("\n=== diffWorktreeGSD ===");
-  const diff = diffWorktreeGSD(base, "feature-x");
-  assertTrue(diff.added.length > 0, "has added files");
-  assertTrue(diff.added.some(f => f.includes("M002")), "M002 roadmap is in added");
-  assertTrue(diff.modified.length > 0, "has modified files");
-  assertTrue(diff.modified.some(f => f.includes("M001")), "M001 roadmap is in modified");
-  assertEq(diff.removed.length, 0, "no removed files");
-
-  console.log("\n=== getWorktreeGSDDiff ===");
-  const fullDiff = getWorktreeGSDDiff(base, "feature-x");
-  assertTrue(fullDiff.includes("M002"), "full diff mentions M002");
-  assertTrue(fullDiff.includes("updated"), "full diff mentions update");
-
-  console.log("\n=== getWorktreeLog ===");
-  const log = getWorktreeLog(base, "feature-x");
-  assertTrue(log.includes("add M002"), "log shows commit message");
-
-  console.log("\n=== removeWorktree ===");
-  removeWorktree(base, "feature-x", { deleteBranch: true });
-  assertTrue(!existsSync(wtPath), "worktree directory removed");
-  const branchesAfter = run("git branch", base);
-  assertTrue(!branchesAfter.includes("worktree/feature-x"), "branch deleted");
-
-  console.log("\n=== listWorktrees after removal ===");
-  const listAfter = listWorktrees(base);
-  assertEq(listAfter.length, 0, "no worktrees after removal");
-
-  console.log("\n=== removeWorktree — already gone ===");
-  // Should not throw
-  removeWorktree(base, "feature-x", { deleteBranch: true });
-  assertTrue(true, "removeWorktree on missing worktree does not throw");
-
-  // Cleanup
-  rmSync(base, { recursive: true, force: true });
-
-  report();
-}
-
-main().catch((error) => {
-  console.error(error);
-  process.exit(1);
-});