gsd-pi 2.13.0 → 2.14.0

package/dist/resources/extensions/gsd/tests/idle-recovery.test.ts

@@ -280,119 +280,6 @@ function cleanup(base: string): void {
   }
 }
 
-// ═══ verifyExpectedArtifact: fix-merge ════════════════════════════════════════
-
-/** Create a real git repo for fix-merge tests */
-function createGitBase(): string {
-  const base = mkdtempSync(join(tmpdir(), "gsd-fixmerge-test-"));
-  execSync("git init -b main", { cwd: base, stdio: "ignore" });
-  execSync("git config user.email test@test.com", { cwd: base, stdio: "ignore" });
-  execSync("git config user.name Test", { cwd: base, stdio: "ignore" });
-  writeFileSync(join(base, "README.md"), "init\n", "utf-8");
-  execSync("git add -A && git commit -m init", { cwd: base, stdio: "ignore" });
-  // Create .gsd structure for the fixture
-  mkdirSync(join(base, ".gsd", "milestones", "M001", "slices", "S01", "tasks"), { recursive: true });
-  return base;
-}
-
-{
-  console.log("\n=== verifyExpectedArtifact: fix-merge — clean repo returns true ===");
-  const base = createGitBase();
-  try {
-    const result = verifyExpectedArtifact("fix-merge", "M001/S01", base);
-    assertTrue(result === true, "clean repo should verify as true");
-  } finally {
-    cleanup(base);
-  }
-}
-
-{
-  console.log("\n=== verifyExpectedArtifact: fix-merge — MERGE_HEAD present returns false ===");
-  const base = createGitBase();
-  try {
-    writeFileSync(join(base, ".git", "MERGE_HEAD"), "abc123\n", "utf-8");
-    const result = verifyExpectedArtifact("fix-merge", "M001/S01", base);
-    assertTrue(result === false, "MERGE_HEAD present should return false");
-  } finally {
-    cleanup(base);
-  }
-}
-
-{
-  console.log("\n=== verifyExpectedArtifact: fix-merge — SQUASH_MSG present returns false ===");
-  const base = createGitBase();
-  try {
-    writeFileSync(join(base, ".git", "SQUASH_MSG"), "squash msg\n", "utf-8");
-    const result = verifyExpectedArtifact("fix-merge", "M001/S01", base);
-    assertTrue(result === false, "SQUASH_MSG present should return false");
-  } finally {
-    cleanup(base);
-  }
-}
-
-{
-  console.log("\n=== verifyExpectedArtifact: fix-merge — real UU conflict returns false ===");
-  const base = createGitBase();
-  try {
-    // Create a conflict: modify same file on two branches
-    writeFileSync(join(base, "conflict.txt"), "main content\n", "utf-8");
-    execSync('git add -A && git commit -m "main change"', { cwd: base, stdio: "ignore" });
-    execSync("git checkout -b feature", { cwd: base, stdio: "ignore" });
-    writeFileSync(join(base, "conflict.txt"), "feature content\n", "utf-8");
-    execSync('git add -A && git commit -m "feature change"', { cwd: base, stdio: "ignore" });
-    execSync("git checkout main", { cwd: base, stdio: "ignore" });
-    writeFileSync(join(base, "conflict.txt"), "different main content\n", "utf-8");
-    execSync('git add -A && git commit -m "diverge"', { cwd: base, stdio: "ignore" });
-    try { execSync("git merge feature", { cwd: base, stdio: "ignore" }); } catch { /* expected conflict */ }
-    const result = verifyExpectedArtifact("fix-merge", "M001/S01", base);
-    assertTrue(result === false, "UU conflict should return false");
-  } finally {
-    execSync("git reset --hard HEAD", { cwd: base, stdio: "ignore" });
-    cleanup(base);
-  }
-}
-
-{
-  console.log("\n=== verifyExpectedArtifact: fix-merge — real DU conflict returns false ===");
-  const base = createGitBase();
-  try {
-    writeFileSync(join(base, "deleted.txt"), "content\n", "utf-8");
-    execSync('git add -A && git commit -m "add file"', { cwd: base, stdio: "ignore" });
-    execSync("git checkout -b feature2", { cwd: base, stdio: "ignore" });
-    writeFileSync(join(base, "deleted.txt"), "modified on feature\n", "utf-8");
-    execSync('git add -A && git commit -m "modify on feature"', { cwd: base, stdio: "ignore" });
-    execSync("git checkout main", { cwd: base, stdio: "ignore" });
-    execSync("git rm deleted.txt", { cwd: base, stdio: "ignore" });
-    execSync('git commit -m "delete on main"', { cwd: base, stdio: "ignore" });
-    try { execSync("git merge feature2", { cwd: base, stdio: "ignore" }); } catch { /* expected conflict */ }
-    const result = verifyExpectedArtifact("fix-merge", "M001/S01", base);
-    assertTrue(result === false, "DU conflict should return false");
-  } finally {
-    execSync("git reset --hard HEAD", { cwd: base, stdio: "ignore" });
-    cleanup(base);
-  }
-}
-
-{
-  console.log("\n=== verifyExpectedArtifact: fix-merge — real AA conflict returns false ===");
-  const base = createGitBase();
-  try {
-    execSync("git checkout -b branch-a", { cwd: base, stdio: "ignore" });
-    writeFileSync(join(base, "both.txt"), "branch-a content\n", "utf-8");
-    execSync('git add -A && git commit -m "add on branch-a"', { cwd: base, stdio: "ignore" });
-    execSync("git checkout main", { cwd: base, stdio: "ignore" });
-    execSync("git checkout -b branch-b", { cwd: base, stdio: "ignore" });
-    writeFileSync(join(base, "both.txt"), "branch-b content\n", "utf-8");
-    execSync('git add -A && git commit -m "add on branch-b"', { cwd: base, stdio: "ignore" });
-    try { execSync("git merge branch-a", { cwd: base, stdio: "ignore" }); } catch { /* expected conflict */ }
-    const result = verifyExpectedArtifact("fix-merge", "M001/S01", base);
-    assertTrue(result === false, "AA conflict should return false");
-  } finally {
-    execSync("git reset --hard HEAD", { cwd: base, stdio: "ignore" });
-    cleanup(base);
-  }
-}
-
 // ═══ verifyExpectedArtifact: complete-slice roadmap check ════════════════════
 // Regression for #indefinite-hang: complete-slice must verify roadmap [x] or
 // the idempotency skip loops forever after a crash that wrote SUMMARY+UAT but
@@ -574,4 +461,25 @@ const ROADMAP_COMPLETE = `# M001: Test Milestone
   }
 }
 
+// ═══ verifyExpectedArtifact: hook unit types ═════════════════════════════════
+
+console.log("\n=== verifyExpectedArtifact: hook types always return true ===");
+
+{
+  const base = createFixtureBase();
+  try {
+    // Hook units don't have standard artifacts — they should always pass
+    const result1 = verifyExpectedArtifact("hook/code-review", "M001/S01/T01", base);
+    assertTrue(result1, "hook/code-review should always return true");
+
+    const result2 = verifyExpectedArtifact("hook/simplify", "M001/S01/T02", base);
+    assertTrue(result2, "hook/simplify should always return true");
+
+    const result3 = verifyExpectedArtifact("hook/custom-hook", "M001/S01", base);
+    assertTrue(result3, "hook/custom-hook at slice level should return true");
+  } finally {
+    rmSync(base, { recursive: true, force: true });
+  }
+}
+
 report();

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

@@ -6,7 +6,7 @@
  * Uses real filesystem and git fixtures — no mocking.
  */
 
-import { mkdtempSync, mkdirSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
+import { mkdtempSync, mkdirSync, rmSync, writeFileSync } from 'node:fs';
 import { execSync } from 'node:child_process';
 import { join } from 'node:path';
 import { tmpdir } from 'node:os';
@@ -16,12 +16,8 @@ import { indexWorkspace } from '../workspace-index.ts';
 import { inlinePriorMilestoneSummary } from '../files.ts';
 import { getPriorSliceCompletionBlocker } from '../dispatch-guard.ts';
 import {
-  ensureSliceBranch,
-  getCurrentBranch,
   getSliceBranchName,
-  mergeSliceToMain,
   parseSliceBranch,
-  switchToMain,
 } from '../worktree.ts';
 import { clearPathCache } from '../paths.ts';
 import { createTestContext } from './test-helpers.ts';
@@ -481,84 +477,22 @@ Built the legacy feature successfully.
     }
   }
 
-  // ─── Group 6: Branch operations with new-format IDs ─────────────────
-  console.log('\n=== Group 6: Branch operations with new-format IDs ===');
+  // ─── Group 6: Branch name helpers with new-format IDs ───────────────
+  console.log('\n=== Group 6: Branch name helpers with new-format IDs ===');
   {
-    const base = createGitRepo();
-    try {
-      // Need a milestone dir and initial commit for branch ops
-      writeRoadmap(base, 'M001-abc123', `# M001-abc123: Branch Test
-
-**Vision:** Test branches
-
-## Slices
-- [ ] **S01: Slice One** \`risk:low\` \`depends:[]\`
-  > Branch test
-`);
-      writePlan(base, 'M001-abc123', 'S01', `# S01: Slice One
-
-**Goal:** Test
-**Demo:** Branch works
-
-## Tasks
-- [ ] **T01: Build** \`est:10m\`
-  Build it.
-`);
-      writeFileSync(join(base, 'README.md'), 'initial\n');
-      run('git add .', base);
-      run('git commit -m init', base);
-
-      // Test getSliceBranchName with new-format ID
-      assertEq(
-        getSliceBranchName('M001-abc123', 'S01'),
-        'gsd/M001-abc123/S01',
-        'G6: getSliceBranchName returns gsd/M001-abc123/S01',
-      );
-
-      // Test parseSliceBranch with new-format branch name
-      const parsed = parseSliceBranch('gsd/M001-abc123/S01');
-      assertTrue(parsed !== null, 'G6: parseSliceBranch returns non-null for new-format');
-      assertEq(parsed?.milestoneId, 'M001-abc123', 'G6: parsed milestoneId is M001-abc123');
-      assertEq(parsed?.sliceId, 'S01', 'G6: parsed sliceId is S01');
-      assertEq(parsed?.worktreeName, null, 'G6: parsed worktreeName is null (no worktree)');
-
-      // Test ensureSliceBranch creates the branch
-      const created = ensureSliceBranch(base, 'M001-abc123', 'S01');
-      assertTrue(created, 'G6: ensureSliceBranch returns true (branch created)');
-      assertEq(
-        getCurrentBranch(base),
-        'gsd/M001-abc123/S01',
-        'G6: getCurrentBranch returns gsd/M001-abc123/S01',
-      );
-
-      // Idempotent: second ensure should not create
-      const secondCreate = ensureSliceBranch(base, 'M001-abc123', 'S01');
-      assertEq(secondCreate, false, 'G6: second ensureSliceBranch returns false');
-
-      // Make a change on the slice branch, commit, then merge to main
-      writeFileSync(join(base, 'feature.txt'), 'new feature from slice\n');
-      run('git add feature.txt', base);
-      run('git commit -m "feat: slice work"', base);
-
-      // Switch to main and merge
-      switchToMain(base);
-      assertEq(getCurrentBranch(base), 'main', 'G6: back on main after switchToMain');
-
-      const merge = mergeSliceToMain(base, 'M001-abc123', 'S01', 'Slice One');
-      assertEq(merge.branch, 'gsd/M001-abc123/S01', 'G6: merge reports correct branch');
-      assertEq(getCurrentBranch(base), 'main', 'G6: still on main after merge');
-      assertTrue(merge.deletedBranch, 'G6: merge deleted the slice branch');
-
-      // Verify the merged content exists on main
-      const content = readFileSync(join(base, 'feature.txt'), 'utf-8');
-      assertTrue(content.includes('new feature from slice'), 'G6: merged content on main');
-
-      // Verify branch is gone
-      const branches = run('git branch', base);
-      assertTrue(!branches.includes('gsd/M001-abc123/S01'), 'G6: slice branch deleted after merge');
-    } finally {
-      cleanup(base);
-    }
+    // Test getSliceBranchName with new-format ID
+    assertEq(
+      getSliceBranchName('M001-abc123', 'S01'),
+      'gsd/M001-abc123/S01',
+      'G6: getSliceBranchName returns gsd/M001-abc123/S01',
+    );
+
+    // Test parseSliceBranch with new-format branch name
+    const parsed = parseSliceBranch('gsd/M001-abc123/S01');
+    assertTrue(parsed !== null, 'G6: parseSliceBranch returns non-null for new-format');
+    assertEq(parsed?.milestoneId, 'M001-abc123', 'G6: parsed milestoneId is M001-abc123');
+    assertEq(parsed?.sliceId, 'S01', 'G6: parsed sliceId is S01');
+    assertEq(parsed?.worktreeName, null, 'G6: parsed worktreeName is null (no worktree)');
   }
 
   // ─── Summary ──────────────────────────────────────────────────────────

package/dist/resources/extensions/gsd/tests/preferences-git.test.ts

@@ -1,5 +1,6 @@
 /**
- * preferences-git.test.ts — Validates git.isolation and git.merge_to_main preference fields.
+ * preferences-git.test.ts — Validates that deprecated git.isolation and
+ * git.merge_to_main preference fields produce deprecation warnings.
  */
 
 import { createTestContext } from "./test-helpers.ts";
@@ -8,78 +9,56 @@ import { validatePreferences } from "../preferences.ts";
 const { assertEq, assertTrue, report } = createTestContext();
 
 async function main(): Promise<void> {
-  console.log("\n=== git.isolation validation ===");
+  console.log("\n=== git.isolation deprecated ===");
 
-  // Valid values
+  // Any value produces a deprecation warning
   {
-    const { preferences, errors } = validatePreferences({ git: { isolation: "worktree" } });
-    assertEq(errors.length, 0, "isolation: worktree — no errors");
-    assertEq(preferences.git?.isolation, "worktree", "isolation: worktree — value preserved");
+    const { warnings } = validatePreferences({ git: { isolation: "worktree" } });
+    assertTrue(warnings.length > 0, "isolation: worktree — produces deprecation warning");
+    assertTrue(warnings[0].includes("deprecated"), "isolation: worktree — warning mentions deprecated");
   }
   {
-    const { preferences, errors } = validatePreferences({ git: { isolation: "branch" } });
-    assertEq(errors.length, 0, "isolation: branch — no errors");
-    assertEq(preferences.git?.isolation, "branch", "isolation: branch — value preserved");
+    const { warnings } = validatePreferences({ git: { isolation: "branch" } });
+    assertTrue(warnings.length > 0, "isolation: branch — produces deprecation warning");
+    assertTrue(warnings[0].includes("deprecated"), "isolation: branch — warning mentions deprecated");
   }
 
-  // Invalid values
+  // Undefined passes through without warning
   {
-    const { errors } = validatePreferences({ git: { isolation: "invalid" } });
-    assertTrue(errors.length > 0, "isolation: invalid — produces error");
-    assertTrue(errors[0].includes("isolation"), "isolation: invalid — error mentions isolation");
-  }
-  {
-    const { errors } = validatePreferences({ git: { isolation: 42 } });
-    assertTrue(errors.length > 0, "isolation: number — produces error");
-  }
-
-  // Undefined passes through
-  {
-    const { preferences, errors } = validatePreferences({ git: { auto_push: true } });
-    assertEq(errors.length, 0, "isolation: undefined — no errors");
+    const { preferences, warnings } = validatePreferences({ git: { auto_push: true } });
+    assertEq(warnings.length, 0, "isolation: undefined — no warnings");
     assertEq(preferences.git?.isolation, undefined, "isolation: undefined — not set");
   }
 
-  console.log("\n=== git.merge_to_main validation ===");
-
-  // Valid values
-  {
-    const { preferences, errors } = validatePreferences({ git: { merge_to_main: "milestone" } });
-    assertEq(errors.length, 0, "merge_to_main: milestone — no errors");
-    assertEq(preferences.git?.merge_to_main, "milestone", "merge_to_main: milestone — value preserved");
-  }
-  {
-    const { preferences, errors } = validatePreferences({ git: { merge_to_main: "slice" } });
-    assertEq(errors.length, 0, "merge_to_main: slice — no errors");
-    assertEq(preferences.git?.merge_to_main, "slice", "merge_to_main: slice — value preserved");
-  }
+  console.log("\n=== git.merge_to_main deprecated ===");
 
-  // Invalid values
+  // Any value produces a deprecation warning
   {
-    const { errors } = validatePreferences({ git: { merge_to_main: "invalid" } });
-    assertTrue(errors.length > 0, "merge_to_main: invalid — produces error");
-    assertTrue(errors[0].includes("merge_to_main"), "merge_to_main: invalid — error mentions merge_to_main");
+    const { warnings } = validatePreferences({ git: { merge_to_main: "milestone" } });
+    assertTrue(warnings.length > 0, "merge_to_main: milestone — produces deprecation warning");
+    assertTrue(warnings[0].includes("deprecated"), "merge_to_main: milestone — warning mentions deprecated");
   }
   {
-    const { errors } = validatePreferences({ git: { merge_to_main: false } });
-    assertTrue(errors.length > 0, "merge_to_main: boolean — produces error");
+    const { warnings } = validatePreferences({ git: { merge_to_main: "slice" } });
+    assertTrue(warnings.length > 0, "merge_to_main: slice — produces deprecation warning");
+    assertTrue(warnings[0].includes("deprecated"), "merge_to_main: slice — warning mentions deprecated");
   }
 
-  // Undefined passes through
+  // Undefined passes through without warning
   {
-    const { preferences, errors } = validatePreferences({ git: { auto_push: true } });
-    assertEq(errors.length, 0, "merge_to_main: undefined — no errors");
+    const { preferences, warnings } = validatePreferences({ git: { auto_push: true } });
+    assertEq(warnings.length, 0, "merge_to_main: undefined — no warnings");
     assertEq(preferences.git?.merge_to_main, undefined, "merge_to_main: undefined — not set");
   }
 
-  console.log("\n=== both fields together ===");
+  console.log("\n=== both deprecated fields together ===");
   {
-    const { preferences, errors } = validatePreferences({
+    const { warnings } = validatePreferences({
       git: { isolation: "worktree", merge_to_main: "slice" },
     });
-    assertEq(errors.length, 0, "both fields valid — no errors");
-    assertEq(preferences.git?.isolation, "worktree", "isolation preserved");
-    assertEq(preferences.git?.merge_to_main, "slice", "merge_to_main preserved");
+    assertEq(warnings.length, 2, "both deprecated fields — 2 warnings");
+    assertTrue(warnings.some(w => w.includes("isolation")), "one warning mentions isolation");
+    assertTrue(warnings.some(w => w.includes("merge_to_main")), "one warning mentions merge_to_main");
   }
 
   report();

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

@@ -1,17 +1,15 @@
 /**
  * worktree-e2e.test.ts -- End-to-end tests for worktree-isolated git flow.
  *
- * Covers 5 cross-cutting groups not tested by individual slice tests:
+ * Covers cross-cutting groups not tested by individual slice tests:
  *   1. Full lifecycle chain (create -> slice commits -> merge to milestone -> merge to main)
- *   2. Preference gating (shouldUseWorktreeIsolation with overrides)
- *   3. merge_to_main mode resolution (getMergeToMainMode)
- *   4. Self-heal in merge context (abortAndReset, withMergeHeal)
- *   5. Doctor detection of orphaned worktrees
+ *   2. Self-heal: abortAndReset cleans up failed merges
+ *   3. Doctor detection of orphaned worktrees
  */
 
 import {
   mkdtempSync, mkdirSync, writeFileSync, rmSync,
-  existsSync, realpathSync, readFileSync,
+  existsSync, realpathSync,
 } from "node:fs";
 import { join } from "node:path";
 import { tmpdir } from "node:os";
@@ -20,11 +18,9 @@ import { execSync } from "node:child_process";
 import {
   createAutoWorktree,
   mergeMilestoneToMain,
-  mergeSliceToMilestone,
-  shouldUseWorktreeIsolation,
 } from "../auto-worktree.ts";
 import { getSliceBranchName } from "../worktree.ts";
-import { abortAndReset, withMergeHeal, MergeConflictError } from "../git-self-heal.ts";
+import { abortAndReset } from "../git-self-heal.ts";
 import { runGSDDoctor } from "../doctor.ts";
 import { createTestContext } from "./test-helpers.ts";
 
@@ -60,11 +56,11 @@ function makeRoadmap(
 }
 
 function addSliceToMilestone(
-  repo: string,
+  _repo: string,
   wtPath: string,
   milestoneId: string,
   sliceId: string,
-  sliceTitle: string,
+  _sliceTitle: string,
   commits: Array<{ file: string; content: string; message: string }>,
 ): void {
   const normalizedPath = wtPath.replaceAll("\\", "/");
@@ -81,7 +77,7 @@ function addSliceToMilestone(
     run(`git commit -m "${c.message}"`, wtPath);
   }
   run(`git checkout milestone/${milestoneId}`, wtPath);
-  mergeSliceToMilestone(repo, milestoneId, sliceId, sliceTitle);
+  run(`git merge --no-ff ${sliceBranch} -m "merge ${sliceId}"`, wtPath);
 }
 
 async function main(): Promise<void> {
@@ -144,59 +140,10 @@ async function main(): Promise<void> {
     }
 
     // ================================================================
-    // Group 2: Preference gating (shouldUseWorktreeIsolation)
-    // ================================================================
-    console.log("\n=== Preference gating ===");
-    {
-      const repo = createTempRepo();
-      tempDirs.push(repo);
-
-      // Override to branch mode
-      const branchResult = shouldUseWorktreeIsolation(repo, { isolation: "branch" });
-      assertEq(branchResult, false, "isolation=branch returns false");
-
-      // Override to worktree mode
-      const wtResult = shouldUseWorktreeIsolation(repo, { isolation: "worktree" });
-      assertEq(wtResult, true, "isolation=worktree returns true");
-
-      // Default (no legacy branches) returns true
-      const defaultResult = shouldUseWorktreeIsolation(repo);
-      assertEq(defaultResult, true, "new project defaults to worktree (true)");
-    }
-
-    // ================================================================
-    // Group 3: merge_to_main mode resolution
-    // ================================================================
-    console.log("\n=== merge_to_main mode ===");
-    {
-      // getMergeToMainMode reads from loadEffectiveGSDPreferences — test via legacy branch detection
-      // Instead, test that the function returns the default "milestone" when no prefs set
-      // (Cannot inject overridePrefs — function signature doesn't accept them)
-      // We verify the shouldUseWorktreeIsolation override path handles legacy detection
-      const repo = createTempRepo();
-      tempDirs.push(repo);
-
-      // Create a legacy gsd/*/* branch to test legacy detection
-      run("git checkout -b gsd/M001/S01", repo);
-      writeFileSync(join(repo, "legacy.txt"), "legacy\n");
-      run("git add .", repo);
-      run("git commit -m legacy", repo);
-      run("git checkout main", repo);
-
-      const legacyResult = shouldUseWorktreeIsolation(repo);
-      assertEq(legacyResult, false, "legacy gsd branches detected -> branch mode");
-
-      // Explicit worktree override wins over legacy detection
-      const overrideResult = shouldUseWorktreeIsolation(repo, { isolation: "worktree" });
-      assertEq(overrideResult, true, "explicit worktree override wins over legacy");
-    }
-
-    // ================================================================
-    // Group 4: Self-heal (abortAndReset, withMergeHeal)
+    // Group 2: Self-heal (abortAndReset)
     // ================================================================
     console.log("\n=== Self-heal ===");
     {
-      // 4a: abortAndReset cleans up MERGE_HEAD
       const repo = createTempRepo();
       tempDirs.push(repo);
 
@@ -218,37 +165,13 @@ async function main(): Promise<void> {
       assertTrue(!existsSync(join(repo, ".git", "MERGE_HEAD")), "MERGE_HEAD removed after abort");
       assertTrue(abortResult.cleaned.length > 0, "abortAndReset reports cleaned items");
     }
-    {
-      // 4b: withMergeHeal throws MergeConflictError for real conflicts
-      const repo = createTempRepo();
-      tempDirs.push(repo);
-
-      run("git checkout -b conflict-branch", repo);
-      writeFileSync(join(repo, "file.txt"), "branch version\n");
-      run("git add .", repo);
-      run("git commit -m branch-ver", repo);
-      run("git checkout main", repo);
-      writeFileSync(join(repo, "file.txt"), "main version\n");
-      run("git add .", repo);
-      run("git commit -m main-ver", repo);
-
-      let caughtError: unknown = null;
-      try {
-        withMergeHeal(repo, () => {
-          execSync("git merge conflict-branch", { cwd: repo, stdio: "pipe" });
-        });
-      } catch (e) {
-        caughtError = e;
-      }
-      assertTrue(caughtError instanceof MergeConflictError, "withMergeHeal throws MergeConflictError");
-      if (caughtError instanceof MergeConflictError) {
-        assertTrue(caughtError.conflictedFiles.length > 0, "MergeConflictError has conflictedFiles");
-      }
-    }
 
     // ================================================================
-    // Group 5: Doctor detects orphaned worktrees
+    // 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
@@ -279,7 +202,7 @@ Test
 _None_
 `);
       run("git add -A", repo);
-      run("git commit -m 'add milestone'", repo);
+      run("git commit -m \"add milestone\"", repo);
 
       // Create orphaned worktree
       mkdirSync(join(repo, ".gsd", "worktrees"), { recursive: true });
@@ -302,6 +225,9 @@ _None_
       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) {