gsd-pi 2.77.0-dev.1d17f366c → 2.77.0-dev.2daa994b6

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

@@ -1,7 +1,5 @@
 import test, { mock } from "node:test";
 import assert from "node:assert/strict";
-import { readFileSync } from "node:fs";
-import { resolve } from "node:path";
 
 import {
   resolveAgentEnd,
@@ -556,65 +554,15 @@ test("auto-loop.ts exports autoLoop, runUnit, resolveAgentEnd", async () => {
   );
 });
 
-test("auto/loop.ts contains a while keyword", () => {
-  const src = readFileSync(
-    resolve(import.meta.dirname, "..", "auto", "loop.ts"),
-    "utf-8",
-  );
-  assert.ok(
-    src.includes("while"),
-    "auto/loop.ts should contain a while keyword (loop or placeholder)",
-  );
-});
-
-test("auto/resolve.ts one-shot pattern: _currentResolve is nulled before calling resolver", () => {
-  const src = readFileSync(
-    resolve(import.meta.dirname, "..", "auto", "resolve.ts"),
-    "utf-8",
-  );
-  // The one-shot pattern requires: save ref, null the variable, then call
-  const resolveBlock = src.slice(
-    src.indexOf("export function resolveAgentEnd"),
-    src.indexOf("export function resolveAgentEnd") + 600,
-  );
-  const nullIdx = resolveBlock.indexOf("_currentResolve = null");
-  const callIdx = resolveBlock.indexOf("r({");
-  assert.ok(nullIdx > 0, "should null _currentResolve in resolveAgentEnd");
-  assert.ok(callIdx > 0, "should call resolver in resolveAgentEnd");
-  assert.ok(
-    nullIdx < callIdx,
-    "_currentResolve should be nulled before calling the resolver (one-shot)",
-  );
-});
-
-test("auto/phases.ts: selectAndApplyModel called exactly once and before updateProgressWidget (#2907)", () => {
-  const src = readFileSync(
-    resolve(import.meta.dirname, "..", "auto", "phases.ts"),
-    "utf-8",
-  );
-  // Extract the runUnitPhase function body
-  const fnStart = src.indexOf("export async function runUnitPhase");
-  assert.ok(fnStart > 0, "runUnitPhase should exist in phases.ts");
-  const fnBody = src.slice(fnStart, fnStart + 16000);
-
-  // selectAndApplyModel must appear exactly once
-  const allOccurrences = [...fnBody.matchAll(/selectAndApplyModel\(/g)];
-  assert.equal(
-    allOccurrences.length,
-    1,
-    `selectAndApplyModel should be called exactly once in runUnitPhase, found ${allOccurrences.length} calls`,
-  );
-
-  // selectAndApplyModel must appear BEFORE updateProgressWidget
-  const modelIdx = fnBody.indexOf("selectAndApplyModel(");
-  const widgetIdx = fnBody.indexOf("updateProgressWidget(");
-  assert.ok(modelIdx > 0, "selectAndApplyModel should exist in runUnitPhase");
-  assert.ok(widgetIdx > 0, "updateProgressWidget should exist in runUnitPhase");
-  assert.ok(
-    modelIdx < widgetIdx,
-    "selectAndApplyModel must be called BEFORE updateProgressWidget (#2899/#2907)",
-  );
-});
+// NOTE: the "while keyword", "one-shot null-before-resolve", and
+// "selectAndApplyModel before updateProgressWidget" source-grep tests
+// previously here were deleted as tautological (readFileSync + substring
+// match). The one-shot pattern is already covered behaviourally by the
+// "double resolveAgentEnd only resolves once" test above, which drives the
+// real resolveAgentEnd/runUnit flow and asserts on the observable promise
+// outcome. The phases.ts ordering contract is tracked via a follow-up
+// issue proposing extraction of a pure `dispatchOrder` helper (per the
+// #4832/PR #4859 precedent) so it can be tested behaviourally.
 
 // ─── autoLoop tests (T02) ─────────────────────────────────────────────────
 
@@ -1451,217 +1399,18 @@ test("autoLoop exits when no active milestone found", async (t) => {
   );
 });
 
-test("autoLoop exports LoopDeps type", async () => {
-  const src = readFileSync(
-    resolve(import.meta.dirname, "..", "auto", "loop-deps.ts"),
-    "utf-8",
-  );
-  assert.ok(
-    src.includes("export interface LoopDeps"),
-    "auto/loop-deps.ts should export LoopDeps interface",
-  );
-});
-
-test("autoLoop signature accepts deps parameter", async () => {
-  const src = readFileSync(
-    resolve(import.meta.dirname, "..", "auto", "loop.ts"),
-    "utf-8",
-  );
-  assert.ok(
-    src.includes("deps: LoopDeps"),
-    "autoLoop should accept a deps: LoopDeps parameter",
-  );
-});
-
-test("autoLoop contains while (s.active) loop", () => {
-  const src = readFileSync(
-    resolve(import.meta.dirname, "..", "auto", "loop.ts"),
-    "utf-8",
-  );
-  assert.ok(
-    src.includes("while (s.active)"),
-    "autoLoop should contain a while (s.active) loop",
-  );
-});
-
-// ── T03: End-to-end wiring structural assertions ─────────────────────────────
-
-test("auto-loop.ts barrel re-exports autoLoop, runUnit, and resolveAgentEnd", () => {
-  const barrel = readFileSync(
-    resolve(import.meta.dirname, "..", "auto-loop.ts"),
-    "utf-8",
-  );
-  assert.ok(
-    barrel.includes("autoLoop"),
-    "barrel must re-export autoLoop",
-  );
-  assert.ok(
-    barrel.includes("runUnit"),
-    "barrel must re-export runUnit",
-  );
-  assert.ok(
-    barrel.includes("resolveAgentEnd"),
-    "barrel must re-export resolveAgentEnd",
-  );
-  // Verify the actual function declarations exist in the submodules
-  const loopSrc = readFileSync(
-    resolve(import.meta.dirname, "..", "auto", "loop.ts"),
-    "utf-8",
-  );
-  assert.ok(
-    loopSrc.includes("export async function autoLoop"),
-    "auto/loop.ts must define autoLoop",
-  );
-  const runUnitSrc = readFileSync(
-    resolve(import.meta.dirname, "..", "auto", "run-unit.ts"),
-    "utf-8",
-  );
-  assert.ok(
-    runUnitSrc.includes("export async function runUnit"),
-    "auto/run-unit.ts must define runUnit",
-  );
-  const resolveSrc = readFileSync(
-    resolve(import.meta.dirname, "..", "auto", "resolve.ts"),
-    "utf-8",
-  );
-  assert.ok(
-    resolveSrc.includes("export function resolveAgentEnd"),
-    "auto/resolve.ts must define resolveAgentEnd",
-  );
-});
-
-test("auto.ts startAuto dispatches through the UOK kernel wrapper with explicit kernel and legacy paths", () => {
-  const src = readFileSync(
-    resolve(import.meta.dirname, "..", "auto.ts"),
-    "utf-8",
-  );
-  // Find the startAuto function body
-  const fnIdx = src.indexOf("export async function startAuto");
-  assert.ok(fnIdx > -1, "startAuto must exist in auto.ts");
-  const fnEnd = src.indexOf("\n// ─── ", fnIdx + 100);
-  const fnBlock =
-    fnEnd > -1 ? src.slice(fnIdx, fnEnd) : src.slice(fnIdx, fnIdx + 5000);
-  assert.ok(
-    fnBlock.includes("runAutoLoopWithUok("),
-    "startAuto must dispatch through runAutoLoopWithUok()",
-  );
-  assert.ok(
-    fnBlock.includes("runKernelLoop: runUokKernelLoop"),
-    "startAuto must wire the explicit UOK kernel loop path",
-  );
-  assert.ok(
-    fnBlock.includes("runLegacyLoop: runLegacyAutoLoop"),
-    "startAuto must preserve explicit legacy fallback dispatch",
-  );
-});
-
-test("startAuto calls selfHealRuntimeRecords before autoLoop (#1727)", { skip: "selfHealRuntimeRecords moved to crash-recovery pipeline in v3" }, () => {
-  const src = readFileSync(
-    resolve(import.meta.dirname, "..", "auto.ts"),
-    "utf-8",
-  );
-  const fnIdx = src.indexOf("export async function startAuto");
-  assert.ok(fnIdx > -1, "startAuto must exist in auto.ts");
-  const fnEnd = src.indexOf("\n// ─── ", fnIdx + 100);
-  const fnBlock =
-    fnEnd > -1 ? src.slice(fnIdx, fnEnd) : src.slice(fnIdx, fnIdx + 5000);
-
-  // Both autoLoop call sites must be preceded by selfHealRuntimeRecords
-  const healIdx = fnBlock.indexOf("selfHealRuntimeRecords");
-  const loopIdx = fnBlock.indexOf("autoLoop(");
-  assert.ok(healIdx > -1, "startAuto must call selfHealRuntimeRecords");
-  assert.ok(healIdx < loopIdx, "selfHealRuntimeRecords must be called before autoLoop");
-
-  // Verify the second autoLoop call site also has selfHeal before it (if present)
-  const secondLoopIdx = fnBlock.indexOf("autoLoop(", loopIdx + 1);
-  const secondHealIdx = fnBlock.indexOf("selfHealRuntimeRecords", healIdx + 1);
-  assert.ok(
-    secondLoopIdx === -1 || (secondHealIdx > -1 && secondHealIdx < secondLoopIdx),
-    "if a second autoLoop call exists, it must also be preceded by selfHealRuntimeRecords",
-  );
-});
-
-test("startAuto guards against concurrent invocation (#2923)", () => {
-  const src = readFileSync(
-    resolve(import.meta.dirname, "..", "auto.ts"),
-    "utf-8",
-  );
-  const fnIdx = src.indexOf("export async function startAuto");
-  assert.ok(fnIdx > -1, "startAuto must exist in auto.ts");
-  // The guard must appear before any other logic in the function body
-  const fnBody = src.slice(fnIdx, fnIdx + 500);
-  const activeGuard = fnBody.indexOf("if (s.active)");
-  assert.ok(activeGuard > -1, "startAuto must check s.active to prevent concurrent auto-loops");
-  const returnIdx = fnBody.indexOf("return;", activeGuard);
-  assert.ok(
-    returnIdx > -1 && returnIdx < activeGuard + 120,
-    "s.active guard must early-return to prevent a second concurrent loop",
-  );
-});
-
-test("agent_end handler calls resolveAgentEnd (not the legacy auto.ts path)", () => {
-  const hooksSrc = readFileSync(
-    resolve(import.meta.dirname, "..", "bootstrap", "register-hooks.ts"),
-    "utf-8",
-  );
-  // Verify the agent_end hook is registered
-  const handlerIdx = hooksSrc.indexOf('pi.on("agent_end"');
-  assert.ok(handlerIdx > -1, "register-hooks.ts must have an agent_end handler");
-
-  const recoverySrc = readFileSync(
-    resolve(import.meta.dirname, "..", "bootstrap", "agent-end-recovery.ts"),
-    "utf-8",
-  );
-  assert.ok(
-    recoverySrc.includes("resolveAgentEnd(event)"),
-    "agent_end success path must call resolveAgentEnd(event) instead of legacy wrappers",
-  );
-  assert.ok(
-    recoverySrc.includes("isSessionSwitchInFlight()"),
-    "agent_end handler must ignore session-switch agent_end events from cmdCtx.newSession()",
-  );
-});
-
-test("auto-verification.ts runPostUnitVerification does not take dispatchNextUnit callback", () => {
-  const src = readFileSync(
-    resolve(import.meta.dirname, "..", "auto-verification.ts"),
-    "utf-8",
-  );
-  const fnIdx = src.indexOf("export async function runPostUnitVerification");
-  assert.ok(fnIdx > -1, "runPostUnitVerification must exist");
-  const sigEnd = src.indexOf("): Promise<VerificationResult>", fnIdx);
-  const signature = src.slice(fnIdx, sigEnd);
-  assert.ok(
-    !signature.includes("dispatchNextUnit"),
-    "runPostUnitVerification must not take a dispatchNextUnit callback parameter",
-  );
-  assert.ok(
-    !signature.includes("startDispatchGapWatchdog"),
-    "runPostUnitVerification must not take a startDispatchGapWatchdog callback parameter",
-  );
-});
-
-test("auto-timeout-recovery.ts calls resolveAgentEnd instead of dispatchNextUnit", () => {
-  const src = readFileSync(
-    resolve(import.meta.dirname, "..", "auto-timeout-recovery.ts"),
-    "utf-8",
-  );
-  assert.ok(
-    !src.includes("await dispatchNextUnit"),
-    "auto-timeout-recovery.ts must not call dispatchNextUnit",
-  );
-  // After PR #4716, advance branches go through bumpAndResolveSynthetic()
-  // (which bumps the turn epoch and calls resolveAgentEnd atomically).
-  // Either direct resolveAgentEnd() or the helper satisfies the invariant:
-  // the loop must be re-iterated on timeout recovery.
-  const reIteratesLoop =
-    src.includes("resolveAgentEnd(") ||
-    src.includes("bumpAndResolveSynthetic(");
-  assert.ok(
-    reIteratesLoop,
-    "auto-timeout-recovery.ts must call resolveAgentEnd (directly or via bumpAndResolveSynthetic) to re-iterate the loop on timeout recovery",
-  );
-});
+// NOTE: The T03 "wiring structural assertions" block (barrel re-exports,
+// LoopDeps-interface-declared, while-loop keyword, UOK kernel wrapper,
+// selfHeal ordering, s.active concurrent guard, agent_end handler call
+// shape, runPostUnitVerification signature, auto-timeout-recovery call
+// shape) was a pure source-grep chain — readFileSync + includes/indexOf —
+// so it asserted on code shape rather than runtime behaviour. The symbols
+// named in those assertions are ALREADY imported at the top of this file;
+// if the production barrel drops any of them, this file fails to import
+// and every test here fails cold. That import-time check is the real
+// behavioural contract. The ordering/signature contracts (UOK dispatch,
+// concurrent guard, agent_end wiring) are tracked as follow-up issues for
+// pure-helper extraction per the #4832/PR #4859 precedent.
 
 // ── Stuck counter tests ──────────────────────────────────────────────────────
 
@@ -1960,26 +1709,10 @@ test("detectStuck: truncates long error strings", () => {
   assert.ok(result!.reason.length < 300, "reason should be truncated");
 });
 
-test("stuck detection: logs debug output with stuck-detected phase", () => {
-  // Structural test: verify auto/phases.ts contains
-  // stuck-detected and stuck-counter-reset debug log phases, plus detectStuck
-  const src = readFileSync(
-    resolve(import.meta.dirname, "..", "auto", "phases.ts"),
-    "utf-8",
-  );
-  assert.ok(
-    src.includes('"stuck-detected"'),
-    "auto/phases.ts must log phase: 'stuck-detected' when stuck detection fires",
-  );
-  assert.ok(
-    src.includes('"stuck-counter-reset"'),
-    "auto/phases.ts must log phase: 'stuck-counter-reset' when recovery resets on new unit",
-  );
-  assert.ok(
-    src.includes("detectStuck"),
-    "auto/phases.ts must use detectStuck for sliding window analysis",
-  );
-});
+// NOTE: the "stuck-detected" / "stuck-counter-reset" debug-log grep was
+// removed — that string test never exercised the detector. detectStuck
+// itself is tested behaviourally above against the real implementation
+// imported from auto-loop.js.
 
 // ── Lifecycle test (S05/T02) ─────────────────────────────────────────────────
 

package/src/resources/extensions/gsd/tests/auto-remediate-slice-status.test.ts

@@ -15,6 +15,7 @@ import assert from 'node:assert/strict';
 import { readFileSync } from 'node:fs';
 import { fileURLToPath } from 'node:url';
 import { dirname, join } from 'node:path';
+import { extractSourceRegion } from "./test-helpers.ts";
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
@@ -43,7 +44,9 @@ describe('auto-remediate stale slice status (#3673)', () => {
     assert.match(before, /try\s*\{/,
       'updateSliceStatus should be inside a try block');
 
-    const after = source.slice(updateIdx, updateIdx + 300);
+    // Bound the region to stop before the rogue fallback so /catch/ only
+    // matches this try block's catch, not an unrelated later one.
+    const after = extractSourceRegion(source, 'updateSliceStatus(mid, sid', 'rogues.push({');
     assert.match(after, /catch/,
       'try block should have a catch for fallback');
   });

package/src/resources/extensions/gsd/tests/auto-retry-mcp-churn-fixes.test.ts

@@ -1,20 +1,20 @@
 /**
  * Regression tests for PR #4288 — auto-retry bug, .mcp.json churn, and MCP
- * worktree routing fixes.
+ * worktree routing fixes (behaviour subset).
  *
- * Covers four source-file changes:
- *   1. src/resources/extensions/gsd/safety/evidence-collector.ts (functional)
- *   2. src/resources/extensions/gsd/bootstrap/register-hooks.ts (source shape)
- *   3. src/resources/extensions/gsd/auto-recovery.ts (source shape)
- *   4. packages/mcp-server/src/workflow-tools.ts (source shape)
+ * The remaining 13 structural assertions (source-grep against register-hooks,
+ * auto-recovery, workflow-tools) were removed in favour of follow-up issues
+ * tracking a pure-helper extraction per the #4832/PR #4859 precedent. This
+ * file retains only the real behaviour tests against the public API of
+ * evidence-collector.
+ *
+ * Follow-ups filed for the removed coverage — see PR body.
  *
  * Copyright (c) 2026 Jeremy McSpadden <jeremy@fluxlabs.net>
  */
 
 import { describe, it, beforeEach } from "node:test";
 import assert from "node:assert/strict";
-import { readFileSync } from "node:fs";
-import { resolve } from "node:path";
 
 import {
   resetEvidence,
@@ -24,8 +24,6 @@ import {
   type BashEvidence,
 } from "../safety/evidence-collector.js";
 
-// ─── 1. evidence-collector: functional ─────────────────────────────────────
-
 describe("evidence-collector: toolCallId-based matching (A-3)", () => {
   beforeEach(() => {
     resetEvidence();
@@ -42,14 +40,9 @@ describe("evidence-collector: toolCallId-based matching (A-3)", () => {
   });
 
   it("matches results to the correct entry by toolCallId, not insertion order", () => {
-    // Simulate two parallel bash calls dispatched in order tc-1, tc-2.
     recordToolCall("tc-1", "bash", { command: "slow-thing" });
     recordToolCall("tc-2", "bash", { command: "fast-thing" });
 
-    // Results arrive out of order: tc-2 first (fast), then tc-1 (slow).
-    // With the old empty-string-matching strategy, tc-2's result would be
-    // stapled to tc-1's entry because findLastUnresolved scanned backwards
-    // for empty ids. Now we match by id directly.
     recordToolResult("tc-2", "bash", "Command exited with code 0\nfast-output", false);
     recordToolResult("tc-1", "bash", "Command exited with code 1\nslow-failure", true);
 
@@ -59,9 +52,6 @@ describe("evidence-collector: toolCallId-based matching (A-3)", () => {
 
     assert.ok(tc1, "tc-1 entry must exist");
     assert.ok(tc2, "tc-2 entry must exist");
-
-    // The original command stays attached to the entry it was recorded with,
-    // and the result matches the id it was reported for.
     assert.equal(tc1.command, "slow-thing");
     assert.equal(tc1.exitCode, 1);
     assert.ok(tc1.outputSnippet.includes("slow-failure"));
@@ -78,7 +68,6 @@ describe("evidence-collector: toolCallId-based matching (A-3)", () => {
     const entries = getEvidence() as readonly BashEvidence[];
     assert.equal(entries.length, 1);
     assert.equal(entries[0].toolCallId, "tc-1");
-    // tc-1 must be untouched — no result was reported for it.
     assert.equal(entries[0].exitCode, -1);
     assert.equal(entries[0].outputSnippet, "");
   });
@@ -95,178 +84,3 @@ describe("evidence-collector: toolCallId-based matching (A-3)", () => {
     assert.equal(entries[1].toolCallId, "tc-edit");
   });
 });
-
-// ─── 2. register-hooks: MCP auto-prep gated inside auto-worktrees (A-1) ────
-
-describe("register-hooks: skip prepareWorkflowMcpForProject inside auto-worktrees (A-1)", () => {
-  const src = readFileSync(
-    resolve(process.cwd(), "src", "resources", "extensions", "gsd", "bootstrap", "register-hooks.ts"),
-    "utf-8",
-  );
-
-  it("session_start hook is gated on isInAutoWorktree", () => {
-    const idx = src.indexOf('pi.on("session_start"');
-    assert.ok(idx !== -1, "session_start handler must exist");
-    const block = src.slice(idx, idx + 2500);
-    assert.ok(
-      block.includes("isInAutoWorktree"),
-      "session_start must consult isInAutoWorktree before preparing MCP",
-    );
-    assert.ok(
-      block.includes("prepareWorkflowMcpForProject"),
-      "session_start still prepares MCP for non-worktree paths",
-    );
-  });
-
-  it("session_switch hook is gated on isInAutoWorktree", () => {
-    const idx = src.indexOf('pi.on("session_switch"');
-    assert.ok(idx !== -1, "session_switch handler must exist");
-    const block = src.slice(idx, idx + 2500);
-    assert.ok(
-      block.includes("isInAutoWorktree"),
-      "session_switch must consult isInAutoWorktree before preparing MCP",
-    );
-  });
-
-  it("tool_call hook forwards event.toolCallId into safetyRecordToolCall (A-3)", () => {
-    // Find the call site (skip the import line by looking for the opening paren).
-    const idx = src.indexOf("safetyRecordToolCall(");
-    assert.ok(idx !== -1, "safetyRecordToolCall call must exist");
-    const line = src.slice(idx, src.indexOf("\n", idx));
-    assert.ok(
-      line.includes("event.toolCallId"),
-      "safetyRecordToolCall must receive event.toolCallId as the first argument",
-    );
-  });
-});
-
-// ─── 3. auto-recovery: verify-fail instrumentation ─────────────────────────
-
-describe("verifyExpectedArtifact: verify-fail exit-point logging (Phase B diag)", () => {
-  const src = readFileSync(
-    resolve(process.cwd(), "src", "resources", "extensions", "gsd", "auto-recovery.ts"),
-    "utf-8",
-  );
-
-  it("logs a verify-fail warning on the null-absPath exit", () => {
-    assert.ok(
-      src.includes('verify-fail ${unitType} ${unitId}: resolveExpectedArtifactPath returned null'),
-      "null-absPath branch must emit a diagnostic line",
-    );
-  });
-
-  it("logs a verify-fail warning on the existsSync-false exit", () => {
-    assert.ok(
-      src.includes("verify-fail ${unitType} ${unitId}: existsSync false"),
-      "existsSync-false branch must emit a diagnostic line",
-    );
-  });
-
-  it("logs a verify-fail warning on the plan-slice no-task-entry exit", () => {
-    assert.ok(
-      src.includes("verify-fail ${unitType} ${unitId}: plan has no task checkbox/heading"),
-      "plan-slice no-task branch must emit a diagnostic line",
-    );
-  });
-
-  it("plan-slice task-plan-files check fails fast on missing tasks dir (hardening)", () => {
-    // The original check silently passed when resolveTasksDir returned null.
-    // The new check returns false with a diagnostic, which is correct — if
-    // the tool successfully planned tasks, the tasks/ dir must exist.
-    const idx = src.indexOf('verify-fail ${unitType} ${unitId}: resolveTasksDir returned null');
-    assert.ok(
-      idx !== -1,
-      "resolveTasksDir-null branch must emit a diagnostic and return false",
-    );
-  });
-});
-
-// ─── 4. workflow-tools (mcp-server): guard + optional projectDir + routing ─
-
-describe("mcp-server workflow-tools: projectDir routing (Phase B root cause)", () => {
-  const src = readFileSync(
-    resolve(process.cwd(), "packages", "mcp-server", "src", "workflow-tools.ts"),
-    "utf-8",
-  );
-
-  it("projectDirParam is optional and documents the default", () => {
-    const idx = src.indexOf("const projectDirParam");
-    assert.ok(idx !== -1, "projectDirParam definition must exist");
-    const block = src.slice(idx, idx + 600);
-    assert.ok(
-      block.includes(".optional()"),
-      "projectDirParam must be optional so the agent stops deliberating",
-    );
-    assert.ok(
-      /Omit this field/i.test(block),
-      "description must tell the agent to omit the field",
-    );
-  });
-
-  it("parseWorkflowArgs defaults projectDir to process.cwd() when omitted", () => {
-    const idx = src.indexOf("function parseWorkflowArgs");
-    assert.ok(idx !== -1, "parseWorkflowArgs must exist");
-    const block = src.slice(idx, idx + 1500);
-    assert.ok(
-      block.includes("parsed.projectDir ?? process.cwd()"),
-      "parseWorkflowArgs must fall back to process.cwd() when projectDir is omitted",
-    );
-  });
-
-  it("validateProjectDir accepts external-state worktree paths via .gsd symlink target", () => {
-    const idx = src.indexOf("function validateProjectDir");
-    assert.ok(idx !== -1, "validateProjectDir must exist");
-    const block = src.slice(idx, idx + 2500);
-    assert.ok(
-      block.includes("resolveExternalStateRoot"),
-      "validateProjectDir must consult resolveExternalStateRoot for external-state layouts",
-    );
-
-    const helperIdx = src.indexOf("function resolveExternalStateRoot");
-    assert.ok(helperIdx !== -1, "resolveExternalStateRoot helper must exist");
-    const helperBlock = src.slice(helperIdx, helperIdx + 600);
-    assert.ok(
-      helperBlock.includes("realpathSync"),
-      "resolveExternalStateRoot must use realpathSync to follow the symlink",
-    );
-    assert.ok(
-      /join\([^)]*\.gsd/.test(helperBlock),
-      "resolveExternalStateRoot must resolve <allowedRoot>/.gsd",
-    );
-  });
-
-  it("parseWorkflowArgs routes tool writes to the active worktree when one exists", () => {
-    // This is the Phase B root-cause fix: when the tool call is scoped to a
-    // milestone that has an auto-worktree at <projectRoot>/.gsd/worktrees/<MID>/,
-    // tool writes must go to the worktree .gsd rather than the shared project .gsd.
-    const parseIdx = src.indexOf("function parseWorkflowArgs");
-    const parseBlock = src.slice(parseIdx, parseIdx + 2500);
-    assert.ok(
-      parseBlock.includes("resolveActiveWorktreeBasePath"),
-      "parseWorkflowArgs must consult resolveActiveWorktreeBasePath",
-    );
-    assert.ok(
-      parseBlock.includes("extractMilestoneId"),
-      "parseWorkflowArgs must extract the milestoneId to locate the worktree",
-    );
-  });
-
-  it("resolveActiveWorktreeBasePath checks .git presence to avoid hijacking stray directories", () => {
-    const idx = src.indexOf("function resolveActiveWorktreeBasePath");
-    assert.ok(idx !== -1, "resolveActiveWorktreeBasePath helper must exist");
-    const block = src.slice(idx, idx + 1200);
-    assert.ok(
-      block.includes('existsSync(join(wtPath, ".git"))'),
-      "resolveActiveWorktreeBasePath must verify a .git file exists in the worktree",
-    );
-  });
-
-  it("extractMilestoneId handles camelCase, snake_case, and short aliases", () => {
-    const idx = src.indexOf("function extractMilestoneId");
-    assert.ok(idx !== -1, "extractMilestoneId helper must exist");
-    const block = src.slice(idx, idx + 600);
-    assert.ok(block.includes("milestoneId"), "must check milestoneId");
-    assert.ok(block.includes("milestone_id"), "must check milestone_id");
-    assert.ok(block.includes("mid"), "must check mid");
-  });
-});

package/src/resources/extensions/gsd/tests/auto-start-clean-runtime-db-gated.test.ts

@@ -10,6 +10,7 @@ import assert from "node:assert/strict";
 import { readFileSync } from "node:fs";
 import { join, dirname } from "node:path";
 import { fileURLToPath } from "node:url";
+import { extractSourceRegion } from "./test-helpers.ts";
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const sourceFile = join(__dirname, "..", "auto-start.ts");
@@ -37,7 +38,7 @@ describe("auto-start cleanStaleRuntimeUnits DB gating (#4663)", () => {
   test("cleanStaleRuntimeUnits predicate consults DB status when available", () => {
     const cleanIdx = source.indexOf("cleanStaleRuntimeUnits(");
     assert.ok(cleanIdx > -1);
-    const snippet = source.slice(cleanIdx, cleanIdx + 600);
+    const snippet = extractSourceRegion(source, "cleanStaleRuntimeUnits(");
     assert.match(
       snippet,
       /isDbAvailable\(\)/,
@@ -53,7 +54,7 @@ describe("auto-start cleanStaleRuntimeUnits DB gating (#4663)", () => {
   test("cleanStaleRuntimeUnits predicate still falls back to SUMMARY-file when DB unavailable", () => {
     const cleanIdx = source.indexOf("cleanStaleRuntimeUnits(");
     assert.ok(cleanIdx > -1);
-    const snippet = source.slice(cleanIdx, cleanIdx + 600);
+    const snippet = extractSourceRegion(source, "cleanStaleRuntimeUnits(");
     assert.match(
       snippet,
       /resolveMilestoneFile\(base,\s*mid,\s*["']SUMMARY["']\)/,

package/src/resources/extensions/gsd/tests/auto-start-cold-db-bootstrap.test.ts

@@ -1,7 +1,7 @@
 import { readFileSync } from "node:fs";
 import { join } from "node:path";
 
-import { createTestContext } from "./test-helpers.ts";
+import {createTestContext, extractSourceRegion } from "./test-helpers.ts";
 
 const { assertTrue, report } = createTestContext();
 
@@ -13,7 +13,7 @@ console.log("\n=== #2841: cold DB opened before initial deriveState ===");
 const helperIdx = src.indexOf("async function openProjectDbIfPresent");
 assertTrue(helperIdx >= 0, "auto-start.ts defines a helper for pre-derive DB open (#2841)");
 
-const helperRegion = helperIdx >= 0 ? src.slice(helperIdx, helperIdx + 500) : "";
+const helperRegion = helperIdx >= 0 ? extractSourceRegion(src, "async function openProjectDbIfPresent") : "";
 assertTrue(
   helperRegion.includes("resolveProjectRootDbPath(basePath)"),
   "pre-derive DB helper resolves the project-root DB path (#2841)",