gsd-pi 2.76.0-dev.fe143342a → 2.77.0-dev.1594b263e

package/src/resources/extensions/gsd/tests/research-milestone-composer.test.ts

@@ -0,0 +1,114 @@
+// GSD-2 — #4782 phase 3 batch 2: research-milestone migrated through composer.
+
+import test from "node:test";
+import assert from "node:assert/strict";
+import { mkdtempSync, mkdirSync, rmSync, writeFileSync } from "node:fs";
+import { join } from "node:path";
+import { tmpdir } from "node:os";
+
+import { buildResearchMilestonePrompt } from "../auto-prompts.ts";
+import { invalidateAllCaches } from "../cache.ts";
+import {
+  openDatabase,
+  closeDatabase,
+  insertMilestone,
+  upsertMilestonePlanning,
+  insertArtifact,
+} from "../gsd-db.ts";
+
+function makeBase(): string {
+  const base = mkdtempSync(join(tmpdir(), "gsd-research-ms-composer-"));
+  mkdirSync(join(base, ".gsd", "milestones", "M001"), { recursive: true });
+  return base;
+}
+
+function cleanup(base: string): void {
+  try { closeDatabase(); } catch { /* noop */ }
+  invalidateAllCaches();
+  rmSync(base, { recursive: true, force: true });
+}
+
+function seed(base: string, mid: string): void {
+  openDatabase(join(base, ".gsd", "gsd.db"));
+  insertMilestone({ id: mid, title: "Research Test", status: "active", depends_on: [] });
+  upsertMilestonePlanning(mid, {
+    title: "Research Test",
+    status: "active",
+    vision: "Research composer migration",
+    successCriteria: ["Prompt compiles"],
+    keyRisks: [],
+    proofStrategy: [],
+    verificationContract: "",
+    verificationIntegration: "",
+    verificationOperational: "",
+    verificationUat: "",
+    definitionOfDone: [],
+    requirementCoverage: "",
+    boundaryMapMarkdown: "",
+  });
+}
+
+test("#4782 phase 3: buildResearchMilestonePrompt emits milestone-context then research template via composer", async (t) => {
+  const base = makeBase();
+  t.after(() => cleanup(base));
+  invalidateAllCaches();
+
+  seed(base, "M001");
+
+  writeFileSync(
+    join(base, ".gsd", "milestones", "M001", "M001-CONTEXT.md"),
+    "# M001 Context\n\nA research test milestone.\n",
+  );
+
+  const prompt = await buildResearchMilestonePrompt("M001", "Research Test", base);
+
+  // Context wrapper present
+  assert.match(prompt, /## Inlined Context \(preloaded — do not re-read these files\)/);
+
+  // Milestone context inlined first (manifest order)
+  assert.match(prompt, /### Milestone Context/);
+  assert.match(prompt, /A research test milestone/);
+
+  // Research template inlined as the templates artifact
+  assert.match(prompt, /### Output Template: Research/);
+
+  // Ordering: milestone-context precedes the research template
+  const contextIdx = prompt.indexOf("### Milestone Context");
+  const researchIdx = prompt.indexOf("### Output Template: Research");
+  assert.ok(contextIdx > -1 && researchIdx > contextIdx,
+    `milestone-context (${contextIdx}) must precede research template (${researchIdx})`);
+});
+
+test("#4782 phase 3: buildResearchMilestonePrompt preserves manifest order across optional artifacts (#4925 review)", async (t) => {
+  const base = makeBase();
+  t.after(() => cleanup(base));
+  invalidateAllCaches();
+
+  seed(base, "M001");
+  writeFileSync(join(base, ".gsd", "milestones", "M001", "M001-CONTEXT.md"), "# M001 Context\n");
+  // Seed PROJECT.md into the artifacts table so inlineProjectFromDb resolves
+  // to a non-null body. Lets us verify the project block sits between
+  // milestone-context and the templates block per manifest order.
+  insertArtifact({
+    path: "PROJECT.md",
+    artifact_type: "project",
+    milestone_id: null,
+    slice_id: null,
+    task_id: null,
+    full_content: "# Project\n\nResearch composer fixture project.\n",
+  });
+
+  const prompt = await buildResearchMilestonePrompt("M001", "Research Test", base);
+
+  // Manifest-declared order: milestone-context, project, requirements, decisions, templates.
+  const contextIdx = prompt.indexOf("### Milestone Context");
+  const projectIdx = prompt.indexOf("### Project");
+  const researchIdx = prompt.indexOf("### Output Template: Research");
+  assert.ok(contextIdx > -1, "milestone-context block missing");
+  assert.ok(projectIdx > -1, "project block missing — seed should have populated it");
+  assert.ok(researchIdx > -1, "research template block missing");
+  assert.ok(
+    contextIdx < projectIdx && projectIdx < researchIdx,
+    `manifest order violated: milestone-context (${contextIdx}) < project (${projectIdx}) < research-template (${researchIdx})`,
+  );
+});

package/src/resources/extensions/gsd/tests/restore-tools-after-discuss.test.ts

@@ -13,6 +13,7 @@ import { describe, it } from 'node:test'
 import assert from 'node:assert/strict'
 import { readFileSync } from 'node:fs'
 import { resolve } from 'node:path'
+import { extractSourceRegion } from "./test-helpers.ts";
 
 const src = readFileSync(
   resolve(process.cwd(), 'src', 'resources', 'extensions', 'gsd', 'guided-flow.ts'),
@@ -37,7 +38,7 @@ describe('restore tools after discuss flow scoping (#3628)', () => {
     assert.ok(discussCheck !== -1)
 
     // Look for savedTools assignment within the discuss block
-    const blockAfter = src.slice(discussCheck, discussCheck + 500)
+    const blockAfter = extractSourceRegion(src, 'if (unitType?.startsWith("discuss-"))')
     assert.ok(
       blockAfter.includes('savedTools = currentTools'),
       'savedTools must be assigned from currentTools inside the discuss block',
@@ -45,12 +46,20 @@ describe('restore tools after discuss flow scoping (#3628)', () => {
   })
 
   it('savedTools is restored after sendMessage', () => {
-    // Find the sendMessage call
-    const sendMsg = src.indexOf('triggerTurn: true')
-    assert.ok(sendMsg !== -1, 'sendMessage with triggerTurn must exist')
+    // #4573: guided-flow.ts now contains multiple `triggerTurn: true` calls
+    // (ready-phrase and empty-turn recovery paths). The discuss-flow scoping
+    // sendMessage is the one that follows `savedTools = currentTools`, so
+    // anchor the search there rather than at the first `triggerTurn: true`.
+    const savedToolsAssign = src.indexOf('savedTools = currentTools')
+    assert.ok(savedToolsAssign !== -1, 'savedTools = currentTools must exist')
 
-    // After sendMessage, savedTools should be restored via setActiveTools
-    const afterSend = src.slice(sendMsg, sendMsg + 500)
+    const sendMsg = src.indexOf('triggerTurn: true', savedToolsAssign)
+    assert.ok(sendMsg !== -1, 'discuss-flow sendMessage with triggerTurn must exist after savedTools capture')
+
+    // After sendMessage, savedTools should be restored via setActiveTools.
+    // Use fromIdx to anchor at the discuss-flow sendMessage, not the first
+    // triggerTurn: true occurrence in the file.
+    const afterSend = extractSourceRegion(src, 'triggerTurn: true', { fromIdx: savedToolsAssign })
     assert.ok(
       afterSend.includes('if (savedTools)'),
       'savedTools restoration guard must exist after sendMessage',

package/src/resources/extensions/gsd/tests/resume-dispatch-worktree.test.ts

@@ -0,0 +1,230 @@
+/**
+ * Tests for fix of #3723: auto-mode resume/crash-recovery dispatches
+ * from project root instead of milestone worktree.
+ *
+ * During resume, the paused-session metadata may record `worktreePath` that
+ * was active when the session paused. The resume path must use that path (or
+ * derive the worktree path via filesystem lookup) to set the dispatch context
+ * (`s.basePath`), rather than defaulting to the project root.
+ *
+ * The fix adds an early worktree-path resolution step in the paused-session
+ * resume block of auto.ts — immediately after `s.basePath = base` — so that
+ * the correct dispatch directory is used before the dispatch loop runs.
+ */
+
+import test from "node:test";
+import assert from "node:assert/strict";
+import { readFileSync, mkdirSync, rmSync, writeFileSync } from "node:fs";
+import { join } from "node:path";
+import { tmpdir } from "node:os";
+import { randomUUID } from "node:crypto";
+import { fileURLToPath } from "node:url";
+import { dirname } from "node:path";
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const autoSrc = readFileSync(join(__dirname, "..", "auto.ts"), "utf-8");
+
+// ── Source-structure tests ────────────────────────────────────────────────────
+
+/**
+ * Extract the paused-session resume block from auto.ts.
+ *
+ * The block we care about is the `if (s.paused) { ... }` section inside
+ * startAuto, which contains `s.basePath = base` (line ~1473) followed by the
+ * `enterMilestone` call.
+ *
+ * We find it by locating the `s.basePath = base` assignment that appears
+ * WITHIN the s.paused branch (there's only one: all other basePath assignments
+ * use originalBasePath or a different value). We extract from that assignment
+ * up to just before `enterMilestone(`.
+ */
+function getBasepathToEnterMilestoneSegment(): string {
+  // Find `s.basePath = base;` in the s.paused branch
+  // This assignment appears uniquely inside the resume block
+  const assignPattern = "s.basePath = base;";
+  const assignIdx = autoSrc.indexOf(assignPattern);
+  assert.ok(
+    assignIdx > -1,
+    `auto.ts must contain '${assignPattern}' in the resume block`,
+  );
+
+  // Find the next enterMilestone call after this assignment
+  const enterMilestoneIdx = autoSrc.indexOf("enterMilestone(", assignIdx);
+  assert.ok(
+    enterMilestoneIdx > assignIdx,
+    "auto.ts must call enterMilestone after the s.basePath = base assignment",
+  );
+
+  // Return the code between the assignment and enterMilestone
+  return autoSrc.slice(assignIdx, enterMilestoneIdx);
+}
+
+test("auto.ts resume block resolves paused-session worktreePath and applies it to s.basePath before entering worktree (fixes #3723)", () => {
+  // The segment between `s.basePath = base` and `enterMilestone(` must
+  // contain logic that resolves the paused-session worktreePath and applies
+  // it to s.basePath when the worktree exists on disk.
+  //
+  // The fix reads the worktree path from freshStartAssessment.pausedSession
+  // (since `meta` is out of scope at this point in startAuto) and assigns
+  // it to s.basePath, guarded by existsSync.
+  //
+  // Without this fix, the dispatch loop runs from `base` (project root)
+  // instead of the worktree, causing split-brain execution (#3723).
+  const segment = getBasepathToEnterMilestoneSegment();
+
+  // The fix uses freshStartAssessment.pausedSession?.worktreePath via a
+  // local variable (resumeWorktreePath) and assigns to s.basePath.
+  const hasWorktreePathResolution =
+    segment.includes("worktreePath") &&
+    segment.includes("existsSync") &&
+    segment.includes("s.basePath =");
+
+  assert.ok(
+    hasWorktreePathResolution,
+    "auto.ts must resolve the paused-session worktreePath, check existsSync, and assign " +
+    "s.basePath before enterMilestone — crash-recovery currently dispatches from project root " +
+    "instead of milestone worktree (issue #3723). The fix belongs between `s.basePath = base` " +
+    "and the enterMilestone call.",
+  );
+});
+
+test("auto.ts worktreePath assignment in resume block guards against non-existent path (fixes #3723)", () => {
+  // The assignment to s.basePath from the paused-session worktreePath must
+  // be guarded by existsSync to avoid setting an invalid basePath if the
+  // worktree was cleaned up between pause and resume.
+  const segment = getBasepathToEnterMilestoneSegment();
+
+  // Must have existsSync guard AND a worktreePath reference AND s.basePath assignment
+  const hasGuardedAssignment =
+    segment.includes("existsSync") &&
+    segment.includes("worktreePath") &&
+    segment.includes("s.basePath =");
+
+  assert.ok(
+    hasGuardedAssignment,
+    "auto.ts must guard the s.basePath = worktreePath assignment with existsSync (fixes #3723)",
+  );
+});
+
+// ── Functional tests ──────────────────────────────────────────────────────────
+
+function makeTmpBase(): string {
+  const base = join(tmpdir(), `gsd-resume-wt-${randomUUID()}`);
+  mkdirSync(join(base, ".gsd", "runtime"), { recursive: true });
+  return base;
+}
+
+function cleanup(base: string): void {
+  try { rmSync(base, { recursive: true, force: true }); } catch { /* */ }
+}
+
+function writePausedSession(
+  base: string,
+  milestoneId: string,
+  worktreePath: string | null,
+): void {
+  writeFileSync(
+    join(base, ".gsd", "runtime", "paused-session.json"),
+    JSON.stringify({
+      milestoneId,
+      originalBasePath: base,
+      stepMode: false,
+      worktreePath,
+      pausedAt: new Date().toISOString(),
+    }, null, 2),
+    "utf-8",
+  );
+}
+
+function makeWorktreePath(base: string, milestoneId: string): string {
+  return join(base, ".gsd", "worktrees", milestoneId);
+}
+
+function setupWorktreeOnDisk(wt: string): void {
+  mkdirSync(wt, { recursive: true });
+  // Simulate a git worktree: .git file with gitdir pointer
+  writeFileSync(
+    join(wt, ".git"),
+    "gitdir: /project/.git/worktrees/M001-test\n",
+    "utf-8",
+  );
+}
+
+function writeRoadmap(base: string, milestoneId = "M001-test"): void {
+  const milestoneDir = join(base, ".gsd", "milestones", milestoneId);
+  mkdirSync(join(milestoneDir, "slices", "S01", "tasks"), { recursive: true });
+  writeFileSync(
+    join(milestoneDir, `${milestoneId}-ROADMAP.md`),
+    [
+      `# ${milestoneId}: Test Milestone`,
+      "",
+      "## Slices",
+      "",
+      "- [ ] **S01: Test slice** `risk:low`",
+      "  After this: Demo",
+    ].join("\n"),
+    "utf-8",
+  );
+}
+
+test("readPausedSessionMetadata round-trips worktreePath from paused-session.json", () => {
+  // Verify that the paused-session metadata correctly stores and reads back
+  // the worktreePath field — this is what the resume path in auto.ts uses
+  // to determine the dispatch basePath (#3723).
+  //
+  // Implemented inline to avoid slow import chain from interrupted-session.ts.
+  const base = makeTmpBase();
+  const wt = makeWorktreePath(base, "M001-test");
+  try {
+    setupWorktreeOnDisk(wt);
+    writePausedSession(base, "M001-test", wt);
+
+    // Simulate readPausedSessionMetadata without importing the full module
+    const pausedPath = join(base, ".gsd", "runtime", "paused-session.json");
+    const meta = JSON.parse(readFileSync(pausedPath, "utf-8"));
+
+    assert.ok(meta, "paused-session metadata must be readable");
+    assert.equal(meta.milestoneId, "M001-test");
+    assert.equal(meta.worktreePath, wt, "worktreePath must round-trip through paused-session.json");
+  } finally {
+    cleanup(base);
+  }
+});
+
+test("auto.ts resume block uses worktreePath from freshStartAssessment.pausedSession as dispatch basePath when worktree exists (#3723)", () => {
+  // End-to-end structural verification: the auto.ts source must contain code
+  // that reads the worktreePath from freshStartAssessment.pausedSession AND
+  // applies it to s.basePath (guarded by existsSync) between the
+  // `s.basePath = base` assignment and `enterMilestone`.
+  //
+  // This is the core of the #3723 fix. Without this check, a session that
+  // paused while operating inside a worktree will resume dispatching from the
+  // project root, not the worktree — causing split-brain execution where some
+  // operations target the worktree and others target the project root.
+  const segment = getBasepathToEnterMilestoneSegment();
+
+  // Must reference freshStartAssessment.pausedSession?.worktreePath or
+  // equivalent local variable, AND contain an existsSync guard
+  const hasAssessmentWorktreePath =
+    segment.includes("freshStartAssessment.pausedSession") &&
+    segment.includes("worktreePath");
+
+  assert.ok(
+    hasAssessmentWorktreePath,
+    "auto.ts must read worktreePath from freshStartAssessment.pausedSession between " +
+    "s.basePath=base and enterMilestone",
+  );
+  assert.ok(
+    segment.includes("existsSync"),
+    "auto.ts must guard worktreePath usage with existsSync",
+  );
+  // The actual basePath re-assignment must be present in the segment
+  // (note: there are multiple `s.basePath =` assignments — we need one after
+  // the initial `s.basePath = base` assignment within this segment)
+  const worktreeAssignIdx = segment.lastIndexOf("s.basePath =");
+  const baseAssignIdx = segment.indexOf("s.basePath = base");
+  assert.ok(
+    worktreeAssignIdx > baseAssignIdx,
+    "auto.ts must assign s.basePath to the worktree path after `s.basePath = base` in the resume block",
+  );
+});

package/src/resources/extensions/gsd/tests/rewrite-docs-abandon-detect.test.ts

@@ -0,0 +1,195 @@
+/**
+ * Regression tests for #3490: post-unit handler for rewrite-docs must
+ * detect abandon/descope overrides that target the current milestone and
+ * park it — without false-positive parking on unrelated scope-change
+ * overrides that merely contain an abandon-family verb.
+ *
+ * Exercises detectAbandonMilestone() directly — a pure function over
+ * Override objects, no I/O and no production-code import chain.
+ * parkMilestone() end-to-end behavior is covered by the existing
+ * park-milestone.test.ts / park-edge-cases.test.ts / park-db-sync.test.ts
+ * suites; here we only validate the decision layer that feeds it.
+ */
+import { test, describe } from "node:test";
+import assert from "node:assert/strict";
+import { detectAbandonMilestone } from "../abandon-detect.ts";
+import type { Override } from "../files.ts";
+
+function mkOverride(change: string): Override {
+  return {
+    timestamp: "2026-04-21T00:00:00.000Z",
+    change,
+    scope: "active",
+    appliedAt: "M001/S01/T01",
+  };
+}
+
+describe("detectAbandonMilestone (#3490)", () => {
+  test("parks on explicit abandon-milestone phrasing", () => {
+    const d = detectAbandonMilestone(
+      [mkOverride("abandon this milestone, it's no longer relevant")],
+      "M001",
+    );
+    assert.strictEqual(d.shouldPark, true);
+    assert.strictEqual(d.matched.length, 1);
+    assert.match(d.reason, /abandon this milestone/);
+  });
+
+  test("parks on descope-milestone phrasing", () => {
+    const d = detectAbandonMilestone(
+      [mkOverride("descope the entire milestone")],
+      "M001",
+    );
+    assert.strictEqual(d.shouldPark, true);
+  });
+
+  test("parks when override references milestone by ID instead of the word", () => {
+    const d = detectAbandonMilestone(
+      [mkOverride("shelve M003 for now, coming back next quarter")],
+      "M003",
+    );
+    assert.strictEqual(d.shouldPark, true);
+    assert.strictEqual(d.matched[0], "shelve M003 for now, coming back next quarter");
+  });
+
+  test("parks on past-tense / gerund verb forms (UK spelling)", () => {
+    const d = detectAbandonMilestone(
+      [mkOverride("this milestone was cancelled by product")],
+      "M001",
+    );
+    assert.strictEqual(d.shouldPark, true);
+  });
+
+  test("parks on US spelling 'canceled' (single-l)", () => {
+    const d = detectAbandonMilestone(
+      [mkOverride("the milestone was canceled by the PM")],
+      "M001",
+    );
+    assert.strictEqual(d.shouldPark, true);
+  });
+
+  test("parks on hyphenated 'de-scope' variant", () => {
+    const d = detectAbandonMilestone(
+      [mkOverride("de-scope this milestone — moved to v2")],
+      "M001",
+    );
+    assert.strictEqual(d.shouldPark, true);
+  });
+
+  test("parks on space-separated 'de scope' variant", () => {
+    const d = detectAbandonMilestone(
+      [mkOverride("de scope the milestone entirely")],
+      "M001",
+    );
+    assert.strictEqual(d.shouldPark, true);
+  });
+
+  test("parks on 'de-scoped' past-tense hyphen variant", () => {
+    const d = detectAbandonMilestone(
+      [mkOverride("M003 was de-scoped last week")],
+      "M003",
+    );
+    assert.strictEqual(d.shouldPark, true);
+  });
+
+  // ─── False-positive guards ────────────────────────────────────────────
+
+  test("does NOT park on 'cancel the standup reminder' (no milestone ref)", () => {
+    const d = detectAbandonMilestone(
+      [mkOverride("cancel the daily standup reminder")],
+      "M001",
+    );
+    assert.strictEqual(d.shouldPark, false);
+    assert.deepStrictEqual(d.matched, []);
+  });
+
+  test("does NOT park on 'drop the dependency on X' (no milestone ref)", () => {
+    const d = detectAbandonMilestone(
+      [mkOverride("drop the dependency on X and use Y instead")],
+      "M001",
+    );
+    assert.strictEqual(d.shouldPark, false);
+  });
+
+  test("does NOT park on 'scrap the v1 design' (no milestone ref)", () => {
+    const d = detectAbandonMilestone(
+      [mkOverride("scrap the v1 design for the landing page")],
+      "M001",
+    );
+    assert.strictEqual(d.shouldPark, false);
+  });
+
+  test("does NOT park on override with milestone word but no abandon verb", () => {
+    const d = detectAbandonMilestone(
+      [mkOverride("change the milestone title to something clearer")],
+      "M001",
+    );
+    assert.strictEqual(d.shouldPark, false);
+  });
+
+  test("does NOT park when a different milestone ID is referenced", () => {
+    // The abandon verb is present and an MID is present, but the MID is
+    // not the current milestone. We require either the literal word
+    // "milestone" OR the current MID — a reference to a different MID
+    // (M007) with neither the word "milestone" nor the current ID (M001)
+    // should not trigger.
+    const d = detectAbandonMilestone(
+      [mkOverride("drop M007")],
+      "M001",
+    );
+    assert.strictEqual(d.shouldPark, false);
+  });
+
+  // ─── Edge cases ───────────────────────────────────────────────────────
+
+  test("empty overrides list returns no-park", () => {
+    const d = detectAbandonMilestone([], "M001");
+    assert.strictEqual(d.shouldPark, false);
+    assert.deepStrictEqual(d.matched, []);
+  });
+
+  test("null/undefined currentMilestoneId returns no-park even with matching text", () => {
+    const d1 = detectAbandonMilestone(
+      [mkOverride("abandon this milestone")],
+      null,
+    );
+    assert.strictEqual(d1.shouldPark, false);
+
+    const d2 = detectAbandonMilestone(
+      [mkOverride("abandon this milestone")],
+      undefined,
+    );
+    assert.strictEqual(d2.shouldPark, false);
+  });
+
+  test("multiple abandon overrides are concatenated in reason", () => {
+    const d = detectAbandonMilestone(
+      [
+        mkOverride("abandon this milestone"),
+        mkOverride("cancel the standup"),           // filtered out (no ref)
+        mkOverride("descope the milestone entirely"),
+      ],
+      "M001",
+    );
+    assert.strictEqual(d.shouldPark, true);
+    assert.strictEqual(d.matched.length, 2, "only the two milestone-scoped overrides match");
+    assert.match(d.reason, /abandon this milestone/);
+    assert.match(d.reason, /descope the milestone entirely/);
+    assert.doesNotMatch(d.reason, /cancel the standup/);
+  });
+
+  // ─── Regex-injection guard on milestone ID ────────────────────────────
+
+  test("milestone ID with regex metacharacters is escaped, not interpreted", () => {
+    // A pathological MID should not break the matcher — the function
+    // escapes regex metacharacters before building the pattern.
+    const d = detectAbandonMilestone(
+      [mkOverride("abandon M.01 the milestone")],
+      "M.01",
+    );
+    // 'milestone' is present, so this parks regardless of escaping,
+    // but the test confirms the RegExp construction does not throw.
+    assert.strictEqual(d.shouldPark, true);
+  });
+});
+