gsd-pi 2.80.0-dev.c5f2443b3 → 2.80.0-dev.d4fc28e6b

package/src/resources/extensions/gsd/tests/finalize-survivor-branch.test.ts

@@ -0,0 +1,132 @@
+// GSD-2 + src/resources/extensions/gsd/tests/finalize-survivor-branch.test.ts
+// Regression: a thrown error from `_mergeBranchMode` (made fail-loud in
+// commit 68ef58a3c) must be caught at the survivor-finalize call site so
+// bootstrap surfaces an error notify instead of an unhandled exception
+// propagating to the slash-command caller (#5549 post-merge audit, R2).
+
+import test from "node:test";
+import assert from "node:assert/strict";
+
+import { _finalizeSurvivorBranch } from "../auto-start.js";
+import type { WorktreeResolver } from "../worktree-resolver.js";
+
+interface FakeResolverState {
+  mergeCalls: Array<{ milestoneId: string }>;
+  shouldThrow?: unknown;
+}
+
+function fakeResolver(state: FakeResolverState): WorktreeResolver {
+  return {
+    mergeAndExit: (milestoneId: string) => {
+      state.mergeCalls.push({ milestoneId });
+      if (state.shouldThrow) throw state.shouldThrow;
+    },
+  } as unknown as WorktreeResolver;
+}
+
+interface FakeUiState {
+  notifications: Array<{ message: string; level: string }>;
+}
+
+function fakeUi(state: FakeUiState): {
+  notify: (msg: string, level?: "info" | "warning" | "error" | "success") => void;
+} {
+  return {
+    notify: (message: string, level?: "info" | "warning" | "error" | "success") => {
+      state.notifications.push({ message, level: level ?? "info" });
+    },
+  };
+}
+
+test("happy path: survivor merge runs, returns merged:true, info notify announces the merge", () => {
+  const resolverState: FakeResolverState = { mergeCalls: [] };
+  const uiState: FakeUiState = { notifications: [] };
+  const result = _finalizeSurvivorBranch(
+    fakeResolver(resolverState),
+    "M001",
+    fakeUi(uiState),
+  );
+
+  assert.deepEqual(result, { merged: true });
+  assert.deepEqual(resolverState.mergeCalls, [{ milestoneId: "M001" }]);
+  assert.equal(uiState.notifications.length, 1);
+  assert.equal(uiState.notifications[0].level, "info");
+  assert.match(
+    uiState.notifications[0].message,
+    /Milestone M001 is complete but branch\/worktree was not finalized/,
+  );
+});
+
+test("regression: thrown error from mergeAndExit (e.g. wrong-branch) is caught and surfaced as error notify", () => {
+  // Pre-PR-5549 commit 5: `_mergeBranchMode` returned false silently.
+  // Post-commit 5: it throws. Without this fix, the throw at auto-start.ts
+  // line ~810 would bubble through `bootstrapAutoSession` to
+  // `startAutoDetached`'s top-level .catch as an unhandled-exception log
+  // — observable as a stack trace instead of a clean failure notification.
+  const boom = new Error("dirty working tree blocks checkout");
+  const resolverState: FakeResolverState = { mergeCalls: [], shouldThrow: boom };
+  const uiState: FakeUiState = { notifications: [] };
+
+  // Must not throw.
+  const result = _finalizeSurvivorBranch(
+    fakeResolver(resolverState),
+    "M001",
+    fakeUi(uiState),
+  );
+
+  assert.equal(result.merged, false);
+  assert.equal(result.error, boom);
+
+  // Two notifies: info (announce) + error (the failure detail).
+  assert.equal(uiState.notifications.length, 2);
+  assert.equal(uiState.notifications[0].level, "info");
+  assert.equal(uiState.notifications[1].level, "error");
+  assert.match(
+    uiState.notifications[1].message,
+    /Survivor-branch finalization for M001 failed/,
+  );
+  assert.match(uiState.notifications[1].message, /dirty working tree blocks checkout/);
+  assert.match(uiState.notifications[1].message, /Resolve manually/);
+});
+
+test("non-Error thrown values are stringified into the user-facing message", () => {
+  const resolverState: FakeResolverState = {
+    mergeCalls: [],
+    shouldThrow: "git lock contention",
+  };
+  const uiState: FakeUiState = { notifications: [] };
+
+  const result = _finalizeSurvivorBranch(
+    fakeResolver(resolverState),
+    "M001",
+    fakeUi(uiState),
+  );
+
+  assert.equal(result.merged, false);
+  assert.equal(result.error, resolverState.shouldThrow);
+  assert.equal(uiState.notifications[1].level, "error");
+  assert.match(uiState.notifications[1].message, /git lock contention/);
+});
+
+test("inner notifications from mergeAndExit's NotifyCtx reach the same UI", () => {
+  // The resolver's NotifyCtx must be wired to ui.notify so messages emitted
+  // inside mergeAndExit (e.g. "Milestone Mxxx merged. Pushed to remote.")
+  // appear in the same UI stream as the outer notifies.
+  const uiState: FakeUiState = { notifications: [] };
+  const ui = fakeUi(uiState);
+
+  const resolver = {
+    mergeAndExit: (_milestoneId: string, ctx: { notify: (msg: string, level?: "info" | "warning" | "error" | "success") => void }) => {
+      ctx.notify("Milestone M001 merged.", "success");
+    },
+  } as unknown as WorktreeResolver;
+
+  const result = _finalizeSurvivorBranch(resolver, "M001", ui);
+
+  assert.equal(result.merged, true);
+  // 1: outer announce
+  // 2: inner success
+  assert.equal(uiState.notifications.length, 2);
+  assert.equal(uiState.notifications[1].level, "success");
+  assert.equal(uiState.notifications[1].message, "Milestone M001 merged.");
+});

package/src/resources/extensions/gsd/tests/fixtures/pr-body/commands-ship-basic.md

@@ -0,0 +1,52 @@
+## TL;DR
+
+**What:** Ship milestone M001 - Authentication
+**Why:** Users need to authenticate before accessing protected resources.
+**How:** Added password hash check and session token issuance.
+
+## What
+
+### S01
+Implemented login flow.
+
+## Why
+
+Users need to authenticate before accessing protected resources.
+
+## How
+
+Added password hash check and session token issuance.
+
+## Linked Issue
+
+Closes #123
+
+## Roadmap
+
+- [x] **S01: Login**
+
+## Metrics
+
+- **Units executed:** 3
+
+## Tests Run
+
+- npm test
+- npm run typecheck:extensions
+
+## Change Type
+
+- [x] `feat` - New feature or capability
+- [ ] `fix` - Bug fix
+- [ ] `refactor` - Code restructuring
+- [ ] `test` - Adding or updating tests
+- [ ] `docs` - Documentation only
+- [ ] `chore` - Build, CI, or tooling changes
+
+## Rollback And Compatibility
+
+- Revert the merge commit.
+
+## AI Assistance Disclosure
+
+This PR was prepared with AI assistance.

package/src/resources/extensions/gsd/tests/fixtures/pr-body/commands-ship-empty-optionals.md

@@ -0,0 +1,42 @@
+## TL;DR
+
+**What:** Ship milestone M001 - Authentication
+**Why:** Milestone work is complete and ready for review.
+**How:** Generated from GSD evidence and local workflow artifacts.
+
+## What
+
+Milestone M001 completed.
+
+## Why
+
+Milestone work is complete and ready for review.
+
+## How
+
+Generated from GSD evidence and local workflow artifacts.
+
+## Linked Issue
+
+Not specified. Add an issue link before marking this PR ready if CONTRIBUTING.md requires one.
+
+## Tests Run
+
+- Not specified. Add exact verification commands before requesting review.
+
+## Change Type
+
+- [x] `feat` - New feature or capability
+- [ ] `fix` - Bug fix
+- [ ] `refactor` - Code restructuring
+- [ ] `test` - Adding or updating tests
+- [ ] `docs` - Documentation only
+- [ ] `chore` - Build, CI, or tooling changes
+
+## Rollback And Compatibility
+
+- No behavior-changing rollback notes recorded.
+
+## AI Assistance Disclosure
+
+This PR was prepared with AI assistance.

package/src/resources/extensions/gsd/tests/fixtures/pr-body/swarm-lane-no-blockers.md

@@ -0,0 +1,55 @@
+## TL;DR
+
+**What:** Ship workflow lane/writer - lane/writer
+**Why:** Workflow work is complete and ready for review.
+**How:** Generated by GSD GitHub Sync swarm routines from lane evidence.
+
+## What
+
+### Swarm lane
+**Lane:** `lane/writer`
+**Branch:** `lane/single-writer`
+**Owner:** @owner
+**Latest commit:** `abc1234`
+
+### Impact area
+Single-writer UOK metadata.
+
+### Changed contracts
+- [ ] WriterToken
+
+### Transition risks
+- [ ] Writer token lifecycle regression
+
+## Why
+
+Workflow work is complete and ready for review.
+
+## How
+
+Generated by GSD GitHub Sync swarm routines from lane evidence.
+
+## Linked Issue
+
+Closes #123
+
+## Tests Run
+
+- npm run typecheck:extensions
+
+## Change Type
+
+- [ ] `feat` - New feature or capability
+- [ ] `fix` - Bug fix
+- [x] `refactor` - Code restructuring
+- [ ] `test` - Adding or updating tests
+- [ ] `docs` - Documentation only
+- [ ] `chore` - Build, CI, or tooling changes
+
+## Rollback And Compatibility
+
+- Disable writer sequence enrichment
+
+## AI Assistance Disclosure
+
+This PR was prepared with AI assistance.

package/src/resources/extensions/gsd/tests/fixtures/pr-body/swarm-lane-with-blockers.md

@@ -0,0 +1,60 @@
+## TL;DR
+
+**What:** Ship workflow lane/writer - lane/writer
+**Why:** Workflow work is complete and ready for review.
+**How:** Generated by GSD GitHub Sync swarm routines from lane evidence.
+
+## What
+
+### Swarm lane
+**Lane:** `lane/writer`
+**Branch:** `lane/single-writer`
+**Owner:** @owner
+**Latest commit:** `abc1234`
+
+### Impact area
+Single-writer UOK metadata.
+
+### Changed contracts
+- [ ] WriterToken
+
+### Transition risks
+- [ ] Writer token lifecycle regression
+
+## Blockers
+
+- Awaiting state-lane writer-sequence merge
+- Parity report incomplete
+
+## Why
+
+Workflow work is complete and ready for review.
+
+## How
+
+Generated by GSD GitHub Sync swarm routines from lane evidence.
+
+## Linked Issue
+
+Closes #123
+
+## Tests Run
+
+- npm run typecheck:extensions
+
+## Change Type
+
+- [ ] `feat` - New feature or capability
+- [ ] `fix` - Bug fix
+- [x] `refactor` - Code restructuring
+- [ ] `test` - Adding or updating tests
+- [ ] `docs` - Documentation only
+- [ ] `chore` - Build, CI, or tooling changes
+
+## Rollback And Compatibility
+
+- Disable writer sequence enrichment
+
+## AI Assistance Disclosure
+
+This PR was prepared with AI assistance.

package/src/resources/extensions/gsd/tests/graph-operations.test.ts

@@ -233,6 +233,16 @@ describe("getNextPendingStep", () => {
     const next = getNextPendingStep(graph);
     assert.equal(next?.id, "b");
   });
+
+  it("treats expanded dependencies as satisfied", (t) => {
+    const graph = makeGraph([
+      makeStep({ id: "iter", status: "expanded" }),
+      makeStep({ id: "after", dependsOn: ["iter"] }),
+    ]);
+
+    const next = getNextPendingStep(graph);
+    assert.equal(next?.id, "after");
+  });
 });
 
 // ─── markStepComplete ────────────────────────────────────────────────────

package/src/resources/extensions/gsd/tests/gsd-db.test.ts

@@ -30,6 +30,10 @@ import {
   insertTask,
   getTask,
   getSliceTasks,
+  deleteMilestone,
+  clearEngineHierarchy,
+  recordMilestoneCommitAttribution,
+  getMilestoneCommitAttributionShas,
   checkpointDatabase,
   refreshOpenDatabaseFromDisk,
   tryCreateMemoriesFts,
@@ -1047,6 +1051,46 @@ describe('gsd-db', () => {
     });
   });
 
+  // ─── milestone_commit_attributions teardown ───────────────────────────────
+
+  describe('milestone commit attribution teardown', () => {
+    test('deleteMilestone removes persisted milestone commit attributions', () => {
+      openDatabase(':memory:');
+      insertMilestone({ id: 'M001', title: 'Milestone', status: 'active' });
+      recordMilestoneCommitAttribution({
+        commitSha: '0123456789abcdef0123456789abcdef01234567',
+        milestoneId: 'M001',
+        source: 'backfill',
+        confidence: 0.8,
+        files: ['app.js'],
+        createdAt: '2026-05-05T00:00:00.000Z',
+      });
+
+      assert.deepEqual(getMilestoneCommitAttributionShas('M001'), ['0123456789abcdef0123456789abcdef01234567']);
+      deleteMilestone('M001');
+      assert.deepEqual(getMilestoneCommitAttributionShas('M001'), []);
+      closeDatabase();
+    });
+
+    test('clearEngineHierarchy removes persisted milestone commit attributions', () => {
+      openDatabase(':memory:');
+      insertMilestone({ id: 'M001', title: 'Milestone', status: 'active' });
+      recordMilestoneCommitAttribution({
+        commitSha: 'fedcba9876543210fedcba9876543210fedcba98',
+        milestoneId: 'M001',
+        source: 'backfill',
+        confidence: 0.8,
+        files: ['app.js'],
+        createdAt: '2026-05-05T00:00:00.000Z',
+      });
+
+      assert.deepEqual(getMilestoneCommitAttributionShas('M001'), ['fedcba9876543210fedcba9876543210fedcba98']);
+      clearEngineHierarchy();
+      assert.deepEqual(getMilestoneCommitAttributionShas('M001'), []);
+      closeDatabase();
+    });
+  });
+
   // ─── getDbStatus ───────────────────────────────────────────────────────────
 
   describe('getDbStatus', () => {

package/src/resources/extensions/gsd/tests/has-pending-deep-stage.test.ts

@@ -15,7 +15,7 @@ import { tmpdir } from "node:os";
 import { join } from "node:path";
 import { randomUUID } from "node:crypto";
 
-import { hasPendingDeepStage } from "../auto-dispatch.ts";
+import { hasPendingDeepStage, shouldRunDeepProjectSetup } from "../auto-dispatch.ts";
 import type { GSDPreferences } from "../preferences.ts";
 import { loadEffectiveGSDPreferences } from "../preferences.ts";
 
@@ -57,6 +57,38 @@ test("hasPendingDeepStage: returns true in deep mode when nothing has been captu
   }
 });
 
+test("shouldRunDeepProjectSetup: complete state wins over pending deep setup", async () => {
+  const base = makeBase();
+  try {
+    assert.equal(hasPendingDeepStage(deepPrefs, base), true);
+    assert.equal(
+      shouldRunDeepProjectSetup({ phase: "complete" }, deepPrefs, base),
+      false,
+      "completed projects must not restart deep setup and loop through auto-mode",
+    );
+  } finally {
+    rmSync(base, { recursive: true, force: true });
+  }
+});
+
+test("shouldRunDeepProjectSetup: only setup phases can trigger pending deep setup", () => {
+  const base = makeBase();
+  try {
+    assert.equal(hasPendingDeepStage(deepPrefs, base), true);
+    assert.equal(shouldRunDeepProjectSetup({ phase: "pre-planning" }, deepPrefs, base), true);
+    assert.equal(shouldRunDeepProjectSetup({ phase: "needs-discussion" }, deepPrefs, base), true);
+    assert.equal(shouldRunDeepProjectSetup({ phase: "planning" }, deepPrefs, base), true);
+    assert.equal(shouldRunDeepProjectSetup({ phase: "executing" }, deepPrefs, base), false);
+    assert.equal(shouldRunDeepProjectSetup({ phase: "blocked" }, deepPrefs, base), false);
+    assert.equal(
+      shouldRunDeepProjectSetup({ phase: "pre-planning" }, deepPrefs, base, { hasSurvivorBranch: true }),
+      false,
+    );
+  } finally {
+    rmSync(base, { recursive: true, force: true });
+  }
+});
+
 test("hasPendingDeepStage: returns true in deep mode when only some gates pass", () => {
   // workflow-preferences captured but PROJECT.md still missing.
   const base = makeBase();

package/src/resources/extensions/gsd/tests/integration/git-service.test.ts

@@ -542,6 +542,60 @@ describe('git-service', async () => {
     rmSync(repo, { recursive: true, force: true });
   });
 
+  // Regression: #5500. The LLM occasionally hallucinates files in
+  // task.keyFiles that were never written. Pre-existing scoped-stage code
+  // ran `git add -- <every keyFile>` and failed the entire commit on the
+  // first missing path. Verify that valid paths still commit and missing
+  // ones are dropped silently.
+  test('GitServiceImpl: scoped staging drops missing keyFiles and commits the rest', () => {
+    const repo = initTempRepo();
+    const svc = new GitServiceImpl(repo);
+
+    createFile(repo, "src/index.ts", "export const ok = true;");
+    // Note: src/commands/list.ts is intentionally NOT created — the LLM
+    // claimed it wrote this file but didn't.
+
+    const msg = svc.autoCommit("execute-task", "M001/S01/T02", [], {
+      taskId: "S01/T02",
+      taskTitle: "wire up command list",
+      oneLiner: "Added list command stub",
+      keyFiles: ["src/index.ts", "src/commands/list.ts"],
+    });
+    assert.ok(msg !== null, "autoCommit succeeds when at least one keyFile exists");
+
+    const committed = run("git show --name-only --format= HEAD", repo);
+    assert.ok(committed.includes("src/index.ts"), "existing key file is committed");
+    assert.ok(!committed.includes("src/commands/list.ts"), "missing key file is silently dropped");
+
+    rmSync(repo, { recursive: true, force: true });
+  });
+
+  // Regression: #5500. When ALL keyFiles are bogus, scopedStageTaskFiles
+  // must return false so autoCommit falls back to smartStage. The commit
+  // still goes out (using `git add -A` semantics) instead of failing.
+  test('GitServiceImpl: all missing keyFiles falls back to smartStage', () => {
+    const repo = initTempRepo();
+    const svc = new GitServiceImpl(repo);
+
+    createFile(repo, "src/actually-changed.ts", "export const real = true;");
+
+    const msg = svc.autoCommit("execute-task", "M001/S01/T03", [], {
+      taskId: "S01/T03",
+      taskTitle: "fix path handling",
+      oneLiner: "Hardened path resolution",
+      keyFiles: ["src/wrong/path-1.ts", "src/wrong/path-2.ts"],
+    });
+    assert.ok(msg !== null, "autoCommit falls back to smartStage when all keyFiles are missing");
+
+    const committed = run("git show --name-only --format= HEAD", repo);
+    assert.ok(
+      committed.includes("src/actually-changed.ts"),
+      "smartStage fallback stages real dirty files when scoped staging finds nothing",
+    );
+
+    rmSync(repo, { recursive: true, force: true });
+  });
+
   // ─── GitServiceImpl: empty-after-staging guard ─────────────────────────
 
   test('GitServiceImpl: empty-after-staging guard', () => {

package/src/resources/extensions/gsd/tests/isolation-none-branch-guard.test.ts

@@ -52,9 +52,12 @@ describe('isolation:none stale branch guard (#3675)', () => {
   });
 
   test('guard is wrapped in try-catch (non-fatal)', () => {
-    // Find the milestone/ check and verify it is inside a try block
-    const milestoneIdx = source.indexOf('startsWith("milestone/")');
-    assert.ok(milestoneIdx > 0, 'milestone/ check should exist');
+    // Pin to the specific guard usage (`currentBranch.startsWith(...)`) so
+    // unrelated occurrences of `startsWith("milestone/")` elsewhere in the
+    // file (e.g. branch-name iteration helpers added later) don't shift the
+    // index and break this structural assertion.
+    const milestoneIdx = source.indexOf('currentBranch.startsWith("milestone/")');
+    assert.ok(milestoneIdx > 0, 'isolation:none guard milestone/ check should exist');
     const before = source.slice(Math.max(0, milestoneIdx - 500), milestoneIdx);
     assert.match(before, /try\s*\{/,
       'milestone branch guard should be inside a try block');