gsd-pi 2.13.0 → 2.14.0

package/dist/resources/extensions/gsd/tests/orphaned-branch.test.ts

@@ -1,353 +0,0 @@
-/**
- * Tests for orphaned completed slice branch detection.
- *
- * Verifies the git operations and detection logic that mergeOrphanedSliceBranches
- * in auto.ts relies on — without importing auto.ts (which requires @gsd/pi-coding-agent).
- * Uses execSync directly and roadmap-slices.ts (no pi-coding-agent dep) to replicate
- * the detection logic.
- */
-
-import { mkdtempSync, mkdirSync, rmSync, writeFileSync, existsSync } from "node:fs";
-import { execSync, execFileSync } from "node:child_process";
-import { join } from "node:path";
-import { tmpdir } from "node:os";
-
-import { relMilestoneFile } from "../paths.ts";
-import { parseRoadmapSlices } from "../roadmap-slices.ts";
-
-// Inline SLICE_BRANCH_RE and parseSliceBranch to avoid importing worktree.ts,
-// which transitively imports preferences.ts → @gsd/pi-coding-agent (not available in tests).
-const SLICE_BRANCH_RE = /^gsd\/(?:([a-zA-Z0-9_-]+)\/)?(M\d+)\/(S\d+)$/;
-
-function parseSliceBranch(
-  branchName: string,
-): { worktreeName: string | null; milestoneId: string; sliceId: string } | null {
-  const match = branchName.match(SLICE_BRANCH_RE);
-  if (!match) return null;
-  return { worktreeName: match[1] ?? null, milestoneId: match[2]!, sliceId: match[3]! };
-}
-
-let passed = 0;
-let failed = 0;
-
-function assert(condition: boolean, message: string): void {
-  if (condition) {
-    passed++;
-  } else {
-    failed++;
-    console.error(`  FAIL: ${message}`);
-  }
-}
-
-function assertEq<T>(actual: T, expected: T, message: string): void {
-  if (JSON.stringify(actual) === JSON.stringify(expected)) {
-    passed++;
-  } else {
-    failed++;
-    console.error(
-      `  FAIL: ${message} — expected ${JSON.stringify(expected)}, got ${JSON.stringify(actual)}`,
-    );
-  }
-}
-
-function run(command: string, cwd: string): string {
-  return execSync(command, { cwd, stdio: ["ignore", "pipe", "pipe"], encoding: "utf-8" }).trim();
-}
-
-function git(base: string, args: string[]): string {
-  try {
-    return execFileSync("git", args, {
-      cwd: base,
-      stdio: ["ignore", "pipe", "pipe"],
-      encoding: "utf-8",
-    }).trim();
-  } catch {
-    return "";
-  }
-}
-
-/**
- * Replicate the core orphan-detection logic from mergeOrphanedSliceBranches
- * in auto.ts — using only paths.ts + roadmap-slices.ts + execSync (no pi-coding-agent deps).
- * Returns a list of orphaned branch descriptors.
- */
-function detectOrphanedSliceBranches(base: string): Array<{
-  branch: string;
-  milestoneId: string;
-  sliceId: string;
-  sliceTitle: string;
-}> {
-  const orphans: Array<{
-    branch: string;
-    milestoneId: string;
-    sliceId: string;
-    sliceTitle: string;
-  }> = [];
-
-  const branchListRaw = git(base, ["branch", "--list", "gsd/*/*", "--format=%(refname:short)"]);
-  if (!branchListRaw) return orphans;
-
-  const branches = branchListRaw.split("\n").map(b => b.trim()).filter(Boolean);
-  for (const branch of branches) {
-    const parsed = parseSliceBranch(branch);
-    // Skip worktree-namespaced branches
-    if (!parsed || parsed.worktreeName) continue;
-
-    const { milestoneId, sliceId } = parsed;
-
-    // Skip if already merged (no commits ahead of main)
-    const aheadCount = git(base, ["rev-list", "--count", `main..${branch}`]);
-    if (!aheadCount || aheadCount === "0") continue;
-
-    // Read roadmap from the slice branch
-    const roadmapRelPath = relMilestoneFile(base, milestoneId, "ROADMAP");
-    const roadmapContent = git(base, ["show", `${branch}:${roadmapRelPath}`]);
-    if (!roadmapContent) continue;
-
-    const slices = parseRoadmapSlices(roadmapContent);
-    const sliceEntry = slices.find(s => s.id === sliceId);
-    if (!sliceEntry?.done) continue;
-
-    orphans.push({
-      branch,
-      milestoneId,
-      sliceId,
-      sliceTitle: sliceEntry.title || sliceId,
-    });
-  }
-
-  return orphans;
-}
-
-// ─── Setup helpers ─────────────────────────────────────────────────────────
-
-function initRepo(): string {
-  const repo = mkdtempSync(join(tmpdir(), "gsd-orphan-test-"));
-  run("git init -b main", repo);
-  run("git config user.email test@example.com", repo);
-  run("git config user.name Test", repo);
-  return repo;
-}
-
-function writeBaseArtifacts(repo: string): void {
-  mkdirSync(join(repo, ".gsd", "milestones", "M001", "slices", "S01", "tasks"), {
-    recursive: true,
-  });
-
-  writeFileSync(
-    join(repo, ".gsd", "milestones", "M001", "M001-ROADMAP.md"),
-    [
-      "# M001: Demo",
-      "",
-      "## Slices",
-      "- [ ] **S01: First Slice** `risk:low` `depends:[]`",
-      "  > After this: feature works",
-      "",
-    ].join("\n"),
-  );
-
-  writeFileSync(
-    join(repo, ".gsd", "milestones", "M001", "slices", "S01", "S01-PLAN.md"),
-    "# S01: First Slice\n\n**Goal:** Demo\n**Demo:** Demo\n\n## Must-Haves\n- done\n\n## Tasks\n- [x] **T01: Task** `est:5m`\n  do it\n",
-  );
-  run("git add .", repo);
-  run('git commit -m "chore: milestone base"', repo);
-}
-
-function writeCompletedArtifactsOnBranch(repo: string): void {
-  writeFileSync(
-    join(repo, ".gsd", "milestones", "M001", "M001-ROADMAP.md"),
-    [
-      "# M001: Demo",
-      "",
-      "## Slices",
-      "- [x] **S01: First Slice** `risk:low` `depends:[]`",
-      "  > After this: feature works",
-      "",
-    ].join("\n"),
-  );
-  writeFileSync(
-    join(repo, ".gsd", "milestones", "M001", "slices", "S01", "S01-SUMMARY.md"),
-    "# S01: First Slice\n\nDone.\n",
-  );
-  writeFileSync(
-    join(repo, ".gsd", "milestones", "M001", "slices", "S01", "S01-UAT.md"),
-    "# UAT\n\nPassed.\n",
-  );
-  run("git add .", repo);
-  run('git commit -m "feat(M001/S01): complete-slice"', repo);
-}
-
-// ─── Tests ────────────────────────────────────────────────────────────────────
-
-console.log("\n=== parseSliceBranch: plain branch ===");
-{
-  const parsed = parseSliceBranch("gsd/M001/S01");
-  assert(parsed !== null, "plain branch parsed");
-  assertEq(parsed?.milestoneId, "M001", "milestone ID extracted");
-  assertEq(parsed?.sliceId, "S01", "slice ID extracted");
-  assertEq(parsed?.worktreeName, null, "no worktree name for plain branch");
-}
-
-console.log("\n=== parseSliceBranch: worktree-namespaced branch ===");
-{
-  const parsed = parseSliceBranch("gsd/wt1/M001/S01");
-  assert(parsed !== null, "worktree branch parsed");
-  assertEq(parsed?.milestoneId, "M001", "milestone ID extracted from worktree branch");
-  assertEq(parsed?.sliceId, "S01", "slice ID extracted from worktree branch");
-  assertEq(parsed?.worktreeName, "wt1", "worktree name extracted");
-}
-
-console.log("\n=== parseSliceBranch: non-slice branch not matched ===");
-{
-  assert(parseSliceBranch("main") === null, "main branch not matched");
-  assert(parseSliceBranch("gsd/M001") === null, "bare milestone branch not matched");
-  assert(!SLICE_BRANCH_RE.test("gsd/M001"), "bare milestone branch not matched by regex");
-  assert(SLICE_BRANCH_RE.test("gsd/M001/S01"), "standard slice branch matched by regex");
-}
-
-console.log("\n=== orphan detection: no slice branches ===");
-{
-  const repo = initRepo();
-  writeBaseArtifacts(repo);
-
-  const orphans = detectOrphanedSliceBranches(repo);
-  assertEq(orphans.length, 0, "no orphans when no slice branches exist");
-
-  rmSync(repo, { recursive: true, force: true });
-}
-
-console.log("\n=== orphan detection: slice branch not done ===");
-{
-  const repo = initRepo();
-  writeBaseArtifacts(repo);
-
-  run("git checkout -b gsd/M001/S01", repo);
-  writeFileSync(
-    join(repo, ".gsd", "milestones", "M001", "slices", "S01", "S01-RESEARCH.md"),
-    "# Research\n",
-  );
-  run("git add .", repo);
-  run('git commit -m "feat: research"', repo);
-  run("git checkout main", repo);
-
-  const orphans = detectOrphanedSliceBranches(repo);
-  assertEq(orphans.length, 0, "incomplete slice branch is not reported as orphan");
-
-  rmSync(repo, { recursive: true, force: true });
-}
-
-console.log("\n=== orphan detection: completed slice branch (orphaned) ===");
-{
-  const repo = initRepo();
-  writeBaseArtifacts(repo);
-
-  run("git checkout -b gsd/M001/S01", repo);
-  writeCompletedArtifactsOnBranch(repo);
-  // Return to main without merging — this is the orphaned branch scenario
-  run("git checkout main", repo);
-
-  const orphans = detectOrphanedSliceBranches(repo);
-  assertEq(orphans.length, 1, "completed but unmerged branch detected as orphan");
-  assertEq(orphans[0]?.branch, "gsd/M001/S01", "correct branch name reported");
-  assertEq(orphans[0]?.milestoneId, "M001", "correct milestone ID");
-  assertEq(orphans[0]?.sliceId, "S01", "correct slice ID");
-  assertEq(orphans[0]?.sliceTitle, "First Slice", "correct slice title");
-
-  rmSync(repo, { recursive: true, force: true });
-}
-
-console.log("\n=== orphan detection: already merged branch is not orphan ===");
-{
-  const repo = initRepo();
-  writeBaseArtifacts(repo);
-
-  run("git checkout -b gsd/M001/S01", repo);
-  writeCompletedArtifactsOnBranch(repo);
-  run("git checkout main", repo);
-  run("git merge --squash gsd/M001/S01", repo);
-  run('git commit -m "feat(M001/S01): merge"', repo);
-  run("git branch -D gsd/M001/S01", repo);
-
-  const orphans = detectOrphanedSliceBranches(repo);
-  assertEq(orphans.length, 0, "already-merged branch is not detected as orphan");
-
-  rmSync(repo, { recursive: true, force: true });
-}
-
-console.log("\n=== orphan detection: worktree-namespaced branch is skipped ===");
-{
-  const repo = initRepo();
-  writeBaseArtifacts(repo);
-
-  // gsd/wt1/M001/S01 — worktree-namespaced branches are managed by the worktree
-  // manager and must not be merged by the main-tree orphan check.
-  run("git checkout -b gsd/wt1/M001/S01", repo);
-  writeCompletedArtifactsOnBranch(repo);
-  run("git checkout main", repo);
-
-  const orphans = detectOrphanedSliceBranches(repo);
-  assertEq(orphans.length, 0, "worktree-namespaced branch not detected by main-tree orphan check");
-
-  rmSync(repo, { recursive: true, force: true });
-}
-
-console.log("\n=== orphan detection: relMilestoneFile resolves roadmap path for git show ===");
-{
-  const repo = initRepo();
-  writeBaseArtifacts(repo);
-
-  run("git checkout -b gsd/M001/S01", repo);
-  writeCompletedArtifactsOnBranch(repo);
-  run("git checkout main", repo);
-
-  // Simulate what mergeOrphanedSliceBranches does: read roadmap from branch
-  const roadmapRelPath = relMilestoneFile(repo, "M001", "ROADMAP");
-  const roadmapOnBranch = git(repo, ["show", `gsd/M001/S01:${roadmapRelPath}`]);
-  assert(roadmapOnBranch.length > 0, "roadmap readable from orphaned branch via git show");
-
-  const slices = parseRoadmapSlices(roadmapOnBranch);
-  const s01 = slices.find(s => s.id === "S01");
-  assert(s01?.done === true, "slice marked done on orphaned branch");
-
-  rmSync(repo, { recursive: true, force: true });
-}
-
-console.log("\n=== orphan merge: squash-merge resolves orphan, artifacts appear on main ===");
-{
-  const repo = initRepo();
-  writeBaseArtifacts(repo);
-
-  run("git checkout -b gsd/M001/S01", repo);
-  writeCompletedArtifactsOnBranch(repo);
-  run("git checkout main", repo);
-
-  const orphansBefore = detectOrphanedSliceBranches(repo);
-  assertEq(orphansBefore.length, 1, "orphan detected before merge");
-
-  // Perform squash-merge (as mergeOrphanedSliceBranches does via mergeSliceToMain)
-  run("git merge --squash gsd/M001/S01", repo);
-  run('git commit -m "feat(M001/S01): recover orphaned branch"', repo);
-  run("git branch -D gsd/M001/S01", repo);
-
-  // Verify artifacts are now on main
-  assert(
-    existsSync(
-      join(repo, ".gsd", "milestones", "M001", "slices", "S01", "S01-SUMMARY.md"),
-    ),
-    "SUMMARY merged to main after orphan recovery",
-  );
-  assert(
-    existsSync(join(repo, ".gsd", "milestones", "M001", "slices", "S01", "S01-UAT.md")),
-    "UAT merged to main after orphan recovery",
-  );
-
-  // Orphan no longer detected after merge + branch delete
-  const orphansAfter = detectOrphanedSliceBranches(repo);
-  assertEq(orphansAfter.length, 0, "no orphans after merge and branch deletion");
-
-  rmSync(repo, { recursive: true, force: true });
-}
-
-console.log(`\nResults: ${passed} passed, ${failed} failed`);
-if (failed > 0) process.exit(1);

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

@@ -1,282 +0,0 @@
-/**
- * auto-worktree-merge.test.ts — Integration tests for mergeSliceToMilestone.
- *
- * Covers: --no-ff merge topology, rich commit messages, slice branch deletion,
- * zero-commit error, real code conflicts, .gsd/ non-conflict in worktree mode.
- * All tests use real git operations in temp repos.
- */
-
-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,
-  mergeSliceToMilestone,
-} from "../auto-worktree.ts";
-import { MergeConflictError } from "../git-service.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-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");
-  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;
-}
-
-/** Create a slice branch in the worktree, add commits, return branch name. */
-function setupSliceBranch(
-  wtPath: string,
-  milestoneId: string,
-  sliceId: string,
-  commits: Array<{ file: string; content: string; message: string }>,
-): string {
-  // 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);
-  }
-  return sliceBranch;
-}
-
-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: Single slice --no-ff merge ────────────────────────────
-    console.log("\n=== single slice --no-ff merge ===");
-    {
-      const repo = freshRepo();
-      const wtPath = createAutoWorktree(repo, "M003");
-
-      const sliceBranch = setupSliceBranch(wtPath, "M003", "S01", [
-        { file: "a.ts", content: "const a = 1;\n", message: "add a.ts" },
-        { file: "b.ts", content: "const b = 2;\n", message: "add b.ts" },
-        { file: "c.ts", content: "const c = 3;\n", message: "add c.ts" },
-      ]);
-      run("git checkout milestone/M003", wtPath);
-
-      const result = mergeSliceToMilestone(repo, "M003", "S01", "Add core files");
-
-      // Verify we're back on milestone branch
-      const branch = run("git branch --show-current", wtPath);
-      assertEq(branch, "milestone/M003", "back on milestone branch after merge");
-
-      // Verify merge topology via git log --graph
-      const log = run("git log --oneline --graph", wtPath);
-      assertTrue(log.includes("*   "), "merge commit visible in graph (asterisk with two parents)");
-      assertTrue(log.includes("add a.ts"), "slice commit 'add a.ts' visible");
-      assertTrue(log.includes("add b.ts"), "slice commit 'add b.ts' visible");
-      assertTrue(log.includes("add c.ts"), "slice commit 'add c.ts' visible");
-
-      // Verify commit message format
-      assertMatch(result.mergedCommitMessage, /feat\(M003\/S01\)/, "commit message has conventional format");
-      assertTrue(result.mergedCommitMessage.includes("Add core files"), "commit message includes slice title");
-
-      // Verify slice branch deleted
-      assertTrue(result.deletedBranch, "slice branch deleted");
-      const branches = run("git branch", wtPath);
-      assertTrue(!branches.includes(sliceBranch), "slice branch no longer in git branch list");
-
-      teardownAutoWorktree(repo, "M003");
-    }
-
-    // ─── Test 2: Two sequential slices ─────────────────────────────────
-    console.log("\n=== two sequential slices ===");
-    {
-      const repo = freshRepo();
-      const wtPath = createAutoWorktree(repo, "M003");
-
-      // Slice S01
-      setupSliceBranch(wtPath, "M003", "S01", [
-        { file: "s1.ts", content: "export const s1 = 1;\n", message: "s1 work" },
-      ]);
-      run("git checkout milestone/M003", wtPath);
-      mergeSliceToMilestone(repo, "M003", "S01", "First slice");
-
-      // Slice S02
-      setupSliceBranch(wtPath, "M003", "S02", [
-        { file: "s2.ts", content: "export const s2 = 2;\n", message: "s2 work" },
-      ]);
-      run("git checkout milestone/M003", wtPath);
-      mergeSliceToMilestone(repo, "M003", "S02", "Second slice");
-
-      // Verify two merge boundaries
-      const log = run("git log --oneline --graph", wtPath);
-      const mergeLines = log.split("\n").filter(l => l.includes("*   "));
-      assertTrue(mergeLines.length >= 2, "two distinct merge commits in graph");
-      assertTrue(log.includes("s1 work"), "S01 commit visible");
-      assertTrue(log.includes("s2 work"), "S02 commit visible");
-
-      teardownAutoWorktree(repo, "M003");
-    }
-
-    // ─── Test 3: Zero commits throws ───────────────────────────────────
-    console.log("\n=== zero commits throws ===");
-    {
-      const repo = freshRepo();
-      const wtPath = createAutoWorktree(repo, "M003");
-
-      // Create slice branch with no commits ahead
-      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("M003", "S01", worktreeName);
-      run(`git checkout -b ${sliceBranch}`, wtPath);
-      // No commits — immediately try to merge
-      run(`git checkout milestone/M003`, wtPath);
-
-      let threw = false;
-      try {
-        mergeSliceToMilestone(repo, "M003", "S01", "Empty slice");
-      } catch (err) {
-        threw = true;
-        assertTrue(
-          err instanceof Error && err.message.includes("no commits ahead"),
-          "error message mentions no commits ahead",
-        );
-      }
-      assertTrue(threw, "mergeSliceToMilestone throws on zero commits");
-
-      teardownAutoWorktree(repo, "M003");
-    }
-
-    // ─── Test 4: Real code conflict throws MergeConflictError ──────────
-    console.log("\n=== real code conflict throws MergeConflictError ===");
-    {
-      const repo = freshRepo();
-      const wtPath = createAutoWorktree(repo, "M003");
-
-      // Add a file on milestone branch
-      writeFileSync(join(wtPath, "shared.ts"), "// version 1\n");
-      run("git add .", wtPath);
-      run('git commit -m "add shared.ts"', wtPath);
-
-      // Create slice branch, modify same file differently
-      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("M003", "S01", worktreeName);
-      run(`git checkout -b ${sliceBranch}`, wtPath);
-      writeFileSync(join(wtPath, "shared.ts"), "// slice version\nexport const x = 1;\n");
-      run("git add .", wtPath);
-      run('git commit -m "slice edit shared.ts"', wtPath);
-
-      // Modify same file on milestone branch
-      run("git checkout milestone/M003", wtPath);
-      writeFileSync(join(wtPath, "shared.ts"), "// milestone version\nexport const y = 2;\n");
-      run("git add .", wtPath);
-      run('git commit -m "milestone edit shared.ts"', wtPath);
-
-      // Go back to milestone branch for merge call
-      run("git checkout milestone/M003", wtPath);
-
-      let caught: MergeConflictError | null = null;
-      try {
-        mergeSliceToMilestone(repo, "M003", "S01", "Conflicting slice");
-      } catch (err) {
-        if (err instanceof MergeConflictError) {
-          caught = err;
-        } else {
-          throw err;
-        }
-      }
-
-      assertTrue(caught !== null, "MergeConflictError thrown on conflict");
-      if (caught) {
-        assertTrue(caught.conflictedFiles.includes("shared.ts"), "conflictedFiles includes shared.ts");
-        assertEq(caught.strategy, "merge", "strategy is merge");
-        assertTrue(caught.branch.includes("S01"), "branch includes S01");
-      }
-
-      // Clean up conflict state before teardown
-      run("git merge --abort || true", wtPath);
-      run("git checkout milestone/M003", wtPath);
-      teardownAutoWorktree(repo, "M003");
-    }
-
-    // ─── Test 5: .gsd/ changes don't conflict ─────────────────────────
-    console.log("\n=== .gsd/ changes don't conflict ===");
-    {
-      const repo = freshRepo();
-      const wtPath = createAutoWorktree(repo, "M003");
-
-      // The .gsd/ directory in worktrees is local — it's not shared via git
-      // between the main repo and the worktree. So modifications to .gsd/
-      // files in both branches shouldn't cause conflicts because .gsd/ is
-      // in the main repo's tree but the worktree has its own working copy.
-      //
-      // In the worktree, .gsd/ IS tracked (inherited from main). But since
-      // slice branches diverge from milestone branch, .gsd/ changes on both
-      // can conflict. The key insight: in real auto-mode, .gsd/ changes only
-      // happen on the milestone branch (planning artifacts), not on slice
-      // branches (which only have code changes). So we test that code-only
-      // slice commits merge cleanly even when milestone has .gsd/ changes.
-
-      // Add a .gsd/ change on milestone branch
-      writeFileSync(join(wtPath, ".gsd", "STATE.md"), "# Updated State\nactive: M003\n");
-      run("git add .", wtPath);
-      run('git commit -m "update .gsd/STATE.md on milestone"', wtPath);
-
-      // Create slice branch with code-only changes
-      setupSliceBranch(wtPath, "M003", "S01", [
-        { file: "feature.ts", content: "export const feature = true;\n", message: "add feature" },
-      ]);
-      run("git checkout milestone/M003", wtPath);
-
-      // Merge should succeed — no .gsd/ conflict since slice didn't touch .gsd/
-      const result = mergeSliceToMilestone(repo, "M003", "S01", "Feature slice");
-      assertTrue(result.branch.includes("S01"), ".gsd/ no-conflict merge succeeded");
-      assertTrue(result.deletedBranch, "slice branch deleted after .gsd/-safe merge");
-
-      // Verify feature file exists after merge
-      assertTrue(existsSync(join(wtPath, "feature.ts")), "feature.ts present after merge");
-
-      teardownAutoWorktree(repo, "M003");
-    }
-
-  } finally {
-    process.chdir(savedCwd);
-    for (const d of tempDirs) {
-      if (existsSync(d)) rmSync(d, { recursive: true, force: true });
-    }
-  }
-
-  report();
-}
-
-main();