gsd-pi 2.16.0 → 2.18.0

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

@@ -0,0 +1,281 @@
+/**
+ * End-to-end integration tests for the Queue Reorder feature.
+ *
+ * Verifies the full chain: QUEUE-ORDER.json + findMilestoneIds() + deriveState()
+ * + depends_on removal from CONTEXT.md files.
+ *
+ * These tests simulate what happens when a user reorders milestones and confirms:
+ * 1. QUEUE-ORDER.json is written with the new order
+ * 2. depends_on is removed from CONTEXT.md frontmatter
+ * 3. deriveState() picks the correct milestone as active
+ * 4. A fresh deriveState() call (simulating new session) also works
+ */
+
+import { mkdtempSync, mkdirSync, rmSync, writeFileSync, readFileSync, existsSync } from 'node:fs';
+import { join } from 'node:path';
+import { tmpdir } from 'node:os';
+
+import { deriveState, invalidateStateCache } from '../state.ts';
+import { findMilestoneIds } from '../guided-flow.ts';
+import { saveQueueOrder, loadQueueOrder } from '../queue-order.ts';
+import { parseContextDependsOn } from '../files.ts';
+import { createTestContext } from './test-helpers.ts';
+
+const { assertEq, assertTrue, report } = createTestContext();
+
+// ─── Fixture Helpers ───────────────────────────────────────────────────────
+
+function createFixtureBase(): string {
+  const base = mkdtempSync(join(tmpdir(), 'gsd-reorder-e2e-'));
+  mkdirSync(join(base, '.gsd', 'milestones'), { recursive: true });
+  return base;
+}
+
+function cleanup(base: string): void {
+  rmSync(base, { recursive: true, force: true });
+}
+
+function writeMilestoneDir(base: string, mid: string): void {
+  mkdirSync(join(base, '.gsd', 'milestones', mid), { recursive: true });
+}
+
+function writeContext(base: string, mid: string, frontmatter: string, body: string = ''): void {
+  const dir = join(base, '.gsd', 'milestones', mid);
+  mkdirSync(dir, { recursive: true });
+  const fm = frontmatter ? `---\n${frontmatter}\n---\n\n` : '';
+  writeFileSync(join(dir, `${mid}-CONTEXT.md`), `${fm}# ${mid}: Test\n\n${body}`);
+}
+
+function writeCompleteMilestone(base: string, mid: string): void {
+  const dir = join(base, '.gsd', 'milestones', mid);
+  mkdirSync(dir, { recursive: true });
+  writeFileSync(join(dir, `${mid}-ROADMAP.md`), `# ${mid}: Complete
+
+**Vision:** Done.
+
+## Slices
+
+- [x] **S01: Done** \`risk:low\` \`depends:[]\`
+  > After this: Done.
+`);
+  writeFileSync(join(dir, `${mid}-SUMMARY.md`), `# ${mid} Summary\n\nComplete.`);
+}
+
+function readContextFile(base: string, mid: string): string {
+  return readFileSync(join(base, '.gsd', 'milestones', mid, `${mid}-CONTEXT.md`), 'utf-8');
+}
+
+// ═══════════════════════════════════════════════════════════════════════════
+// Test: Queue order changes milestone activation
+// ═══════════════════════════════════════════════════════════════════════════
+
+console.log('\n=== E2E: queue-order changes active milestone ===');
+{
+  const base = createFixtureBase();
+  try {
+    // Setup: M007 complete, M008 and M009 pending (no context, no roadmap)
+    writeCompleteMilestone(base, 'M007');
+    writeMilestoneDir(base, 'M008');
+    writeContext(base, 'M008', '', 'Multi-Session Parallel Orchestration');
+    writeMilestoneDir(base, 'M009');
+    writeContext(base, 'M009', '', 'Context-Budget Visibility');
+
+    // Without custom order: M008 comes first (numeric sort)
+    invalidateStateCache();
+    const stateBefore = await deriveState(base);
+    assertEq(stateBefore.activeMilestone?.id, 'M008', 'before reorder: M008 is active');
+
+    // Save custom order: M009 before M008
+    saveQueueOrder(base, ['M009', 'M008']);
+
+    // With custom order: M009 should be active
+    invalidateStateCache();
+    const stateAfter = await deriveState(base);
+    assertEq(stateAfter.activeMilestone?.id, 'M009', 'after reorder: M009 is active');
+
+    // findMilestoneIds respects the order
+    const ids = findMilestoneIds(base);
+    const m008Idx = ids.indexOf('M008');
+    const m009Idx = ids.indexOf('M009');
+    assertTrue(m009Idx < m008Idx, 'findMilestoneIds: M009 comes before M008');
+
+  } finally {
+    cleanup(base);
+  }
+}
+
+// ═══════════════════════════════════════════════════════════════════════════
+// Test: Reorder + depends_on removal = correct state
+// ═══════════════════════════════════════════════════════════════════════════
+
+console.log('\n=== E2E: reorder with depends_on removal ===');
+{
+  const base = createFixtureBase();
+  try {
+    // Setup: M007 complete, M008 depends_on M009, M009 no deps
+    writeCompleteMilestone(base, 'M007');
+    writeContext(base, 'M008', 'depends_on: [M009]', 'Multi-Session Parallel');
+    writeContext(base, 'M009', '', 'Context-Budget Visibility');
+
+    // Before: M008 depends on M009, so deriveState skips M008, M009 is active
+    invalidateStateCache();
+    const stateBefore = await deriveState(base);
+    assertEq(stateBefore.activeMilestone?.id, 'M009', 'before: M009 active (M008 dep-blocked)');
+
+    // Simulate reorder confirm: save order M009→M008, remove depends_on from M008
+    saveQueueOrder(base, ['M009', 'M008']);
+
+    // Remove depends_on from M008-CONTEXT.md (simulating what handleQueueReorder does)
+    const contextContent = readContextFile(base, 'M008');
+    const newContent = contextContent.replace(/---\ndepends_on: \[M009\]\n---\n\n/, '');
+    writeFileSync(join(base, '.gsd', 'milestones', 'M008', 'M008-CONTEXT.md'), newContent);
+
+    // Verify: depends_on is gone
+    const updatedContent = readContextFile(base, 'M008');
+    const deps = parseContextDependsOn(updatedContent);
+    assertEq(deps.length, 0, 'depends_on removed from M008-CONTEXT.md');
+
+    // Verify: deriveState still picks M009 (it's first in queue order)
+    invalidateStateCache();
+    const stateAfter = await deriveState(base);
+    assertEq(stateAfter.activeMilestone?.id, 'M009', 'after: M009 still active (first in queue)');
+
+    // Verify: M008 is now pending (not dep-blocked)
+    const m008Entry = stateAfter.registry.find(m => m.id === 'M008');
+    assertEq(m008Entry?.status, 'pending', 'M008 is pending (not dep-blocked)');
+    assertTrue(!m008Entry?.dependsOn || m008Entry.dependsOn.length === 0, 'M008 has no dependsOn');
+
+  } finally {
+    cleanup(base);
+  }
+}
+
+// ═══════════════════════════════════════════════════════════════════════════
+// Test: Fresh deriveState (simulating new session) respects queue order
+// ═══════════════════════════════════════════════════════════════════════════
+
+console.log('\n=== E2E: fresh session respects queue order ===');
+{
+  const base = createFixtureBase();
+  try {
+    writeCompleteMilestone(base, 'M007');
+    writeContext(base, 'M008', '', 'Parallel Orchestration');
+    writeContext(base, 'M009', '', 'Budget Visibility');
+
+    // Save queue order
+    saveQueueOrder(base, ['M009', 'M008']);
+
+    // Simulate fresh session — invalidate all caches
+    invalidateStateCache();
+
+    // Derive state — should read QUEUE-ORDER.json from disk
+    const state = await deriveState(base);
+    assertEq(state.activeMilestone?.id, 'M009', 'fresh session: M009 is active');
+
+    // Verify queue order persisted
+    const order = loadQueueOrder(base);
+    assertEq(order, ['M009', 'M008'], 'QUEUE-ORDER.json persisted correctly');
+
+  } finally {
+    cleanup(base);
+  }
+}
+
+// ═══════════════════════════════════════════════════════════════════════════
+// Test: Queue order with newly added milestones
+// ═══════════════════════════════════════════════════════════════════════════
+
+console.log('\n=== E2E: new milestones appended to queue ===');
+{
+  const base = createFixtureBase();
+  try {
+    writeCompleteMilestone(base, 'M007');
+    writeContext(base, 'M008', '', 'Parallel');
+    writeContext(base, 'M009', '', 'Visibility');
+
+    // Custom order only has M009, M008
+    saveQueueOrder(base, ['M009', 'M008']);
+
+    // Add M010 (not in queue order)
+    writeContext(base, 'M010', '', 'New feature');
+
+    invalidateStateCache();
+    const ids = findMilestoneIds(base);
+
+    // M009 first, M008 second, M010 appended at end
+    const m009Idx = ids.indexOf('M009');
+    const m008Idx = ids.indexOf('M008');
+    const m010Idx = ids.indexOf('M010');
+    assertTrue(m009Idx < m008Idx, 'M009 before M008');
+    assertTrue(m008Idx < m010Idx, 'M008 before M010 (new milestone appended)');
+
+    // M009 is still active (first non-complete in queue order)
+    const state = await deriveState(base);
+    assertEq(state.activeMilestone?.id, 'M009', 'M009 still active after M010 added');
+
+  } finally {
+    cleanup(base);
+  }
+}
+
+// ═══════════════════════════════════════════════════════════════════════════
+// Test: No queue order file = default numeric sort (backward compat)
+// ═══════════════════════════════════════════════════════════════════════════
+
+console.log('\n=== E2E: backward compat without QUEUE-ORDER.json ===');
+{
+  const base = createFixtureBase();
+  try {
+    writeCompleteMilestone(base, 'M007');
+    writeContext(base, 'M008', '', 'Parallel');
+    writeContext(base, 'M009', '', 'Visibility');
+
+    // No QUEUE-ORDER.json — default numeric sort
+    invalidateStateCache();
+    const state = await deriveState(base);
+    assertEq(state.activeMilestone?.id, 'M008', 'no queue order: M008 active (numeric)');
+
+    const ids = findMilestoneIds(base);
+    assertTrue(ids.indexOf('M008') < ids.indexOf('M009'), 'default sort: M008 before M009');
+
+  } finally {
+    cleanup(base);
+  }
+}
+
+// ═══════════════════════════════════════════════════════════════════════════
+// Test: depends_on inline array format removal
+// ═══════════════════════════════════════════════════════════════════════════
+
+console.log('\n=== E2E: depends_on inline format preserved after partial removal ===');
+{
+  const base = createFixtureBase();
+  try {
+    writeCompleteMilestone(base, 'M007');
+    // M008 depends on both M009 and M010
+    writeContext(base, 'M008', 'depends_on: [M009, M010]', 'Parallel');
+    writeContext(base, 'M009', '', 'Visibility');
+    writeContext(base, 'M010', '', 'Other');
+
+    // Verify both deps are parsed
+    const contentBefore = readContextFile(base, 'M008');
+    const depsBefore = parseContextDependsOn(contentBefore);
+    assertEq(depsBefore.length, 2, 'M008 has 2 deps before');
+
+    // Simulate removing only M009 dep (keep M010)
+    const content = readContextFile(base, 'M008');
+    const updated = content.replace('depends_on: [M009, M010]', 'depends_on: [M010]');
+    writeFileSync(join(base, '.gsd', 'milestones', 'M008', 'M008-CONTEXT.md'), updated);
+
+    // Verify only M010 remains
+    const contentAfter = readContextFile(base, 'M008');
+    const depsAfter = parseContextDependsOn(contentAfter);
+    assertEq(depsAfter.length, 1, 'M008 has 1 dep after removal');
+    assertEq(depsAfter[0], 'M010', 'remaining dep is M010');
+
+  } finally {
+    cleanup(base);
+  }
+}
+
+report();

package/dist/resources/extensions/gsd/tests/routing-history.test.ts

@@ -0,0 +1,87 @@
+/**
+ * Routing History — structural tests for adaptive learning module.
+ *
+ * Verifies routing-history.ts exports and structure from #579.
+ * Uses source-level checks to avoid @gsd/pi-coding-agent import chain.
+ */
+
+import test from "node:test";
+import assert from "node:assert/strict";
+import { readFileSync } from "node:fs";
+import { join, dirname } from "node:path";
+import { fileURLToPath } from "node:url";
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const historySrc = readFileSync(join(__dirname, "..", "routing-history.ts"), "utf-8");
+
+// ═══════════════════════════════════════════════════════════════════════════
+// Module Exports
+// ═══════════════════════════════════════════════════════════════════════════
+
+test("routing-history: exports initRoutingHistory", () => {
+  assert.ok(historySrc.includes("export function initRoutingHistory"), "should export initRoutingHistory");
+});
+
+test("routing-history: exports recordOutcome", () => {
+  assert.ok(historySrc.includes("export function recordOutcome"), "should export recordOutcome");
+});
+
+test("routing-history: exports recordFeedback", () => {
+  assert.ok(historySrc.includes("export function recordFeedback"), "should export recordFeedback");
+});
+
+test("routing-history: exports getAdaptiveTierAdjustment", () => {
+  assert.ok(historySrc.includes("export function getAdaptiveTierAdjustment"), "should export getAdaptiveTierAdjustment");
+});
+
+test("routing-history: exports resetRoutingHistory", () => {
+  assert.ok(historySrc.includes("export function resetRoutingHistory"), "should export resetRoutingHistory");
+});
+
+// ═══════════════════════════════════════════════════════════════════════════
+// Design Constants
+// ═══════════════════════════════════════════════════════════════════════════
+
+test("routing-history: uses rolling window of 50 entries", () => {
+  assert.ok(historySrc.includes("ROLLING_WINDOW = 50"), "should use 50-entry rolling window");
+});
+
+test("routing-history: failure threshold is 20%", () => {
+  assert.ok(historySrc.includes("FAILURE_THRESHOLD = 0.20"), "should use 20% failure threshold");
+});
+
+test("routing-history: feedback weight is 2x", () => {
+  assert.ok(historySrc.includes("FEEDBACK_WEIGHT = 2"), "feedback should count 2x");
+});
+
+// ═══════════════════════════════════════════════════════════════════════════
+// Type Structure
+// ═══════════════════════════════════════════════════════════════════════════
+
+test("routing-history: imports ComplexityTier from types.ts", () => {
+  assert.ok(
+    historySrc.includes('from "./types.js"') && historySrc.includes("ComplexityTier"),
+    "should import ComplexityTier from types.ts",
+  );
+});
+
+test("routing-history: defines RoutingHistoryData interface", () => {
+  assert.ok(historySrc.includes("interface RoutingHistoryData"), "should define RoutingHistoryData");
+});
+
+test("routing-history: defines FeedbackEntry interface", () => {
+  assert.ok(historySrc.includes("interface FeedbackEntry"), "should define FeedbackEntry");
+});
+
+// ═══════════════════════════════════════════════════════════════════════════
+// Persistence
+// ═══════════════════════════════════════════════════════════════════════════
+
+test("routing-history: persists to routing-history.json", () => {
+  assert.ok(historySrc.includes("routing-history.json"), "should persist to routing-history.json");
+});
+
+test("routing-history: has save and load functions", () => {
+  assert.ok(historySrc.includes("saveHistory") || historySrc.includes("function save"), "should have save");
+  assert.ok(historySrc.includes("loadHistory") || historySrc.includes("function load"), "should have load");
+});

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

@@ -0,0 +1,139 @@
+/**
+ * stale-worktree-cwd.test.ts — Tests for #608 fix.
+ *
+ * Verifies that when process.cwd() is inside a stale .gsd/worktrees/ path,
+ * startAuto escapes back to the project root before proceeding.
+ */
+
+import test from "node:test";
+import assert from "node:assert/strict";
+import { mkdtempSync, mkdirSync, rmSync, existsSync, realpathSync, writeFileSync } from "node:fs";
+import { join, sep } from "node:path";
+import { tmpdir } from "node:os";
+import { execSync } from "node:child_process";
+
+import {
+  createAutoWorktree,
+  teardownAutoWorktree,
+  mergeMilestoneToMain,
+} from "../auto-worktree.ts";
+
+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(), "stale-wt-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");
+  run("git add .", dir);
+  run("git commit -m init", dir);
+  run("git branch -M main", dir);
+  return dir;
+}
+
+// ─── escapeStaleWorktree is called by startAuto, test the detection logic ────
+
+test("detects stale worktree path and extracts project root", () => {
+  // Simulate the path pattern: /project/.gsd/worktrees/M004/...
+  const projectRoot = "/Users/test/myproject";
+  const stalePath = `${projectRoot}${sep}.gsd${sep}worktrees${sep}M004`;
+
+  const marker = `${sep}.gsd${sep}worktrees${sep}`;
+  const idx = stalePath.indexOf(marker);
+
+  assert.ok(idx !== -1, "marker found in stale path");
+  assert.equal(stalePath.slice(0, idx), projectRoot, "project root extracted correctly");
+});
+
+test("does not trigger on normal project path", () => {
+  const normalPath = "/Users/test/myproject";
+  const marker = `${sep}.gsd${sep}worktrees${sep}`;
+  const idx = normalPath.indexOf(marker);
+
+  assert.equal(idx, -1, "marker not found in normal path");
+});
+
+// ─── Integration: mergeMilestoneToMain restores cwd ─────────────────────────
+
+test("mergeMilestoneToMain restores cwd to project root", () => {
+  const savedCwd = process.cwd();
+  let tempDir = "";
+
+  try {
+    tempDir = createTempRepo();
+
+    // Create milestone planning artifacts
+    const msDir = join(tempDir, ".gsd", "milestones", "M050");
+    mkdirSync(msDir, { recursive: true });
+    writeFileSync(join(msDir, "CONTEXT.md"), "# M050 Context\n");
+    const roadmap = [
+      "# M050: Test Milestone",
+      "**Vision**: testing",
+      "## Success Criteria",
+      "- It works",
+      "## Slices",
+      "- [x] S01 — First slice",
+    ].join("\n");
+    writeFileSync(join(msDir, "ROADMAP.md"), roadmap);
+    run("git add .", tempDir);
+    run("git commit -m \"add milestone\"", tempDir);
+
+    // Create auto-worktree (enters the worktree dir)
+    const wtPath = createAutoWorktree(tempDir, "M050");
+    assert.equal(process.cwd(), wtPath, "cwd is in worktree after create");
+
+    // Add a change in the worktree
+    writeFileSync(join(wtPath, "feature.txt"), "new feature\n");
+    run("git add .", wtPath);
+    run("git commit -m \"feat: add feature\"", wtPath);
+
+    // Merge back — should restore cwd to tempDir
+    mergeMilestoneToMain(tempDir, "M050", roadmap);
+
+    assert.equal(process.cwd(), tempDir, "cwd restored to project root after merge");
+    assert.ok(!existsSync(wtPath), "worktree directory removed after merge");
+  } finally {
+    process.chdir(savedCwd);
+    if (tempDir && existsSync(tempDir)) {
+      rmSync(tempDir, { recursive: true, force: true });
+    }
+  }
+});
+
+// ─── Integration: stale worktree directory is detectable ────────────────────
+
+test("process.cwd() inside removed worktree is recoverable", () => {
+  const savedCwd = process.cwd();
+  let tempDir = "";
+
+  try {
+    tempDir = createTempRepo();
+
+    // Create a .gsd/worktrees/M099 directory to simulate stale state
+    const staleWtDir = join(tempDir, ".gsd", "worktrees", "M099");
+    mkdirSync(staleWtDir, { recursive: true });
+
+    // Enter the stale directory
+    process.chdir(staleWtDir);
+    const cwdBefore = process.cwd();
+    assert.ok(cwdBefore.includes(`${sep}.gsd${sep}worktrees${sep}`), "cwd is inside worktree dir");
+
+    // Simulate escapeStaleWorktree logic
+    const marker = `${sep}.gsd${sep}worktrees${sep}`;
+    const idx = cwdBefore.indexOf(marker);
+    assert.ok(idx !== -1, "marker found");
+
+    const projectRoot = cwdBefore.slice(0, idx);
+    process.chdir(projectRoot);
+
+    assert.equal(process.cwd(), tempDir, "successfully escaped to project root");
+  } finally {
+    process.chdir(savedCwd);
+    if (tempDir && existsSync(tempDir)) {
+      rmSync(tempDir, { recursive: true, force: true });
+    }
+  }
+});

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

@@ -0,0 +1,130 @@
+import test from "node:test";
+import assert from "node:assert/strict";
+import { mkdirSync, rmSync } from "node:fs";
+import { join } from "node:path";
+import { tmpdir } from "node:os";
+import { randomUUID } from "node:crypto";
+import { fork } from "node:child_process";
+
+import { writeFileSync } from "node:fs";
+import {
+  writeLock,
+  readCrashLock,
+  clearLock,
+  isLockProcessAlive,
+} from "../crash-recovery.ts";
+import { stopAutoRemote } from "../auto.ts";
+
+function makeTmpBase(): string {
+  const base = join(tmpdir(), `gsd-test-${randomUUID()}`);
+  mkdirSync(join(base, ".gsd"), { recursive: true });
+  return base;
+}
+
+function cleanup(base: string): void {
+  try { rmSync(base, { recursive: true, force: true }); } catch { /* */ }
+}
+
+// ─── stopAutoRemote ──────────────────────────────────────────────────────
+
+test("stopAutoRemote returns found:false when no lock file exists", () => {
+  const base = makeTmpBase();
+  try {
+    const result = stopAutoRemote(base);
+    assert.equal(result.found, false);
+    assert.equal(result.pid, undefined);
+    assert.equal(result.error, undefined);
+  } finally {
+    cleanup(base);
+  }
+});
+
+test("stopAutoRemote cleans up stale lock (dead PID) and returns found:false", () => {
+  const base = makeTmpBase();
+  try {
+    // Write a lock with a PID that doesn't exist
+    writeLock(base, "execute-task", "M001/S01/T01", 3);
+    // Overwrite PID to a dead one
+    const lock = readCrashLock(base)!;
+    const staleData = { ...lock, pid: 999999999 };
+    writeFileSync(join(base, ".gsd", "auto.lock"), JSON.stringify(staleData, null, 2), "utf-8");
+
+    const result = stopAutoRemote(base);
+    assert.equal(result.found, false, "stale lock should not be found as running");
+
+    // Lock should be cleaned up
+    assert.equal(readCrashLock(base), null, "stale lock should be removed");
+  } finally {
+    cleanup(base);
+  }
+});
+
+test("stopAutoRemote sends SIGTERM to a live process and returns found:true", async () => {
+  const base = makeTmpBase();
+
+  // Spawn a child process that sleeps, acting as a fake auto-mode session
+  const child = fork(
+    "-e",
+    ["process.on('SIGTERM', () => process.exit(0)); setTimeout(() => process.exit(1), 30000);"],
+    { stdio: "ignore", detached: false },
+  );
+
+  try {
+    // Wait for child to be ready
+    await new Promise((resolve) => setTimeout(resolve, 200));
+
+    // Write lock with child's PID
+    const lockData = {
+      pid: child.pid,
+      startedAt: new Date().toISOString(),
+      unitType: "execute-task",
+      unitId: "M001/S01/T01",
+      unitStartedAt: new Date().toISOString(),
+      completedUnits: 0,
+    };
+    writeFileSync(join(base, ".gsd", "auto.lock"), JSON.stringify(lockData, null, 2), "utf-8");
+
+    const result = stopAutoRemote(base);
+    assert.equal(result.found, true, "should find running auto-mode");
+    assert.equal(result.pid, child.pid, "should return the PID");
+
+    // Wait for child to exit (it should receive SIGTERM)
+    const exitCode = await new Promise<number | null>((resolve) => {
+      child.on("exit", (code) => resolve(code));
+      setTimeout(() => resolve(null), 5000);
+    });
+    // On Windows, SIGTERM is not interceptable — the process exits with code 1
+    // rather than running the handler. Accept either clean exit (0) or forced (1).
+    assert.ok(exitCode !== null, "child should have exited after SIGTERM");
+    if (process.platform !== "win32") {
+      assert.equal(exitCode, 0, "child should have exited cleanly via SIGTERM");
+    }
+  } finally {
+    try { child.kill("SIGKILL"); } catch { /* already dead */ }
+    cleanup(base);
+  }
+});
+
+// ─── Lock path: original project root vs worktree ────────────────────────
+
+test("lock file should be discoverable at project root, not worktree path", () => {
+  const projectRoot = makeTmpBase();
+  const worktreePath = join(projectRoot, ".gsd", "worktrees", "M001");
+  mkdirSync(join(worktreePath, ".gsd"), { recursive: true });
+
+  try {
+    // Simulate: auto-mode writes lock to project root (the fix)
+    writeLock(projectRoot, "execute-task", "M001/S01/T01", 0);
+
+    // Second terminal checks project root — should find the lock
+    const lock = readCrashLock(projectRoot);
+    assert.ok(lock, "lock should be found at project root");
+    assert.equal(lock!.unitType, "execute-task");
+
+    // Worktree path should NOT have a lock
+    const worktreeLock = readCrashLock(worktreePath);
+    assert.equal(worktreeLock, null, "lock should NOT exist at worktree path");
+  } finally {
+    cleanup(projectRoot);
+  }
+});