gsd-pi 2.80.0-dev.4ea7d80e7 → 2.80.0-dev.7582bf37a

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

@@ -1,107 +1,66 @@
 /**
  * auto-pr-bugs.test.ts — Regression tests for #2302.
  *
- * Three interacting bugs prevented auto_pr from ever creating a PR:
- * 1. auto_pr was gated on `pushed` (which requires auto_push)
- * 2. Milestone branch was not pushed to remote before PR creation
- * 3. createDraftPR in git-service.ts lacked --head/--base parameters
+ * Verifies the PR creation command behavior directly instead of asserting on
+ * git-service.ts source text.
  */
 
 import test from "node:test";
 import assert from "node:assert/strict";
-import { readFileSync } from "node:fs";
+import { chmodSync, mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
-
-// ─── Bug 1: auto_pr should not depend on auto_push / pushed flag ────────────
-
-const autoWorktreeSrcPath = join(import.meta.dirname, "..", "auto-worktree.ts");
-const autoWorktreeSrc = readFileSync(autoWorktreeSrcPath, "utf-8");
-
-test("#2302 bug 1: auto_pr condition should not require pushed flag", () => {
-  // Find the auto_pr block in mergeMilestoneToMain
-  const autoPrIdx = autoWorktreeSrc.indexOf("auto_pr");
-  assert.ok(autoPrIdx !== -1, "auto_pr reference exists in auto-worktree.ts");
-
-  // Get context around the auto_pr check
-  const lineStart = autoWorktreeSrc.lastIndexOf("\n", autoPrIdx) + 1;
-  const lineEnd = autoWorktreeSrc.indexOf("\n", autoPrIdx);
-  const autoPrLine = autoWorktreeSrc.slice(lineStart, lineEnd);
-
-  // The condition should NOT include `&& pushed`
-  assert.ok(
-    !autoPrLine.includes("&& pushed"),
-    "auto_pr condition should not be gated on pushed flag (auto_push dependency)",
-  );
-});
-
-test("auto_pr skips milestone branch push when configured remote is absent", () => {
-  const autoPrIdx = autoWorktreeSrc.indexOf("prefs.auto_pr === true");
-  assert.ok(autoPrIdx !== -1, "auto_pr block exists in auto-worktree.ts");
-
-  const autoPrBlock = autoWorktreeSrc.slice(
-    autoPrIdx,
-    autoWorktreeSrc.indexOf("// 11. Guard removed", autoPrIdx),
+import { tmpdir } from "node:os";
+
+import { createDraftPR } from "../git-service.ts";
+
+function makeTempDir(prefix: string): string {
+  return mkdtempSync(join(tmpdir(), prefix));
+}
+
+test("#2302 createDraftPR passes head and base branch parameters to gh", (t) => {
+  const dir = makeTempDir("gsd-auto-pr-");
+  const bin = join(dir, "bin");
+  const logPath = join(dir, "gh-args.json");
+  t.after(() => rmSync(dir, { recursive: true, force: true }));
+
+  mkdirSync(bin, { recursive: true });
+  const ghPath = join(bin, "gh");
+  writeFileSync(
+    ghPath,
+    [
+      "#!/usr/bin/env node",
+      "const fs = require('node:fs');",
+      `fs.writeFileSync(${JSON.stringify(logPath)}, JSON.stringify(process.argv.slice(2)));`,
+      "process.stdout.write('https://example.test/pr/1\\n');",
+    ].join("\n"),
+    "utf-8",
   );
-  const remoteExistsIdx = autoPrBlock.indexOf("gitRemoteExists(originalBasePath_, remote)");
-  const pushIdx = autoPrBlock.indexOf('execFileSync("git", ["push", remote, milestoneBranch]');
-
-  assert.ok(remoteExistsIdx !== -1, "auto_pr must check that the configured remote exists");
-  assert.ok(pushIdx !== -1, "auto_pr still pushes the milestone branch before creating the PR");
-  assert.ok(
-    remoteExistsIdx < pushIdx,
-    "auto_pr must check remote existence before pushing the milestone branch",
+  chmodSync(ghPath, 0o755);
+
+  const prUrl = createDraftPR(
+    dir,
+    "M001",
+    "Draft title",
+    "Draft body",
+    {
+      head: "milestone/M001",
+      base: "main",
+      env: { ...process.env, PATH: `${bin}:${process.env.PATH ?? ""}` },
+    },
   );
-});
-
-// ─── Bug 2: phases.ts should not duplicate PR creation ──────────────────────
-
-const phasesSrcPath = join(import.meta.dirname, "..", "auto", "phases.ts");
-const phasesSrc = readFileSync(phasesSrcPath, "utf-8");
-
-test("#2302 bug 2: phases.ts should not call createDraftPR (handled by mergeMilestoneToMain)", () => {
-  // After fix, phases.ts should not import or call createDraftPR because
-  // PR creation is handled inside mergeMilestoneToMain in auto-worktree.ts
-  const createDraftPRCalls = phasesSrc.match(/createDraftPR\(/g) || [];
 
-  assert.equal(
-    createDraftPRCalls.length,
-    0,
-    "phases.ts should not call createDraftPR — it's handled by mergeMilestoneToMain",
-  );
-});
-
-// ─── Bug 3: createDraftPR should accept head and base branch parameters ─────
-
-const gitServiceSrcPath = join(import.meta.dirname, "..", "git-service.ts");
-const gitServiceSrc = readFileSync(gitServiceSrcPath, "utf-8");
-
-test("#2302 bug 3: createDraftPR should accept head and base branch parameters", () => {
-  // Find the createDraftPR function signature
-  const fnIdx = gitServiceSrc.indexOf("function createDraftPR");
-  assert.ok(fnIdx !== -1, "createDraftPR function exists");
-
-  // Get the function signature (up to the closing paren)
-  const sigEnd = gitServiceSrc.indexOf(")", fnIdx);
-  const signature = gitServiceSrc.slice(fnIdx, sigEnd);
-
-  // Should have head and base parameters
-  assert.ok(
-    signature.includes("head") || signature.includes("branch"),
-    "createDraftPR should accept a head/branch parameter",
-  );
-});
-
-test("#2302 bug 3: createDraftPR should pass --head and --base to gh pr create", () => {
-  const fnIdx = gitServiceSrc.indexOf("function createDraftPR");
-  const fnEnd = gitServiceSrc.indexOf("\n}", fnIdx);
-  const fnBody = gitServiceSrc.slice(fnIdx, fnEnd);
-
-  assert.ok(
-    fnBody.includes("--head"),
-    "createDraftPR should pass --head to gh pr create",
-  );
-  assert.ok(
-    fnBody.includes("--base"),
-    "createDraftPR should pass --base to gh pr create",
-  );
+  assert.equal(prUrl, "https://example.test/pr/1");
+  assert.deepEqual(JSON.parse(readFileSync(logPath, "utf-8")), [
+    "pr",
+    "create",
+    "--draft",
+    "--title",
+    "Draft title",
+    "--body",
+    "Draft body",
+    "--head",
+    "milestone/M001",
+    "--base",
+    "main",
+  ]);
 });

package/src/resources/extensions/gsd/tests/auto-project-root-env.test.ts

@@ -1,33 +1,74 @@
+// Project/App: GSD-2
+// File Purpose: Behavior tests for auto-mode project-root environment cleanup.
 import test from "node:test";
 import assert from "node:assert/strict";
-import { readFileSync } from "node:fs";
+import { mkdtempSync, rmSync } from "node:fs";
+import { tmpdir } from "node:os";
 import { join } from "node:path";
 
-const sourcePath = join(import.meta.dirname, "..", "auto.ts");
-const source = readFileSync(sourcePath, "utf-8");
-
-test("auto-mode captures GSD_PROJECT_ROOT before entering the dispatch loop", () => {
-  const captureDeclIdx = source.indexOf("function captureProjectRootEnv(projectRoot: string): void {");
-  assert.ok(captureDeclIdx > -1, "auto.ts should define captureProjectRootEnv()");
-
-  const resumeCallIdx = source.indexOf("captureProjectRootEnv(s.originalBasePath || s.basePath);");
-  assert.ok(resumeCallIdx > -1, "auto.ts should capture GSD_PROJECT_ROOT before resume autoLoop");
-
-  const firstLoopIdxCandidates = [
-    source.indexOf("await runAutoLoopWithUok({"),
-    source.indexOf("await autoLoop(ctx, pi, s, buildLoopDeps());"),
-  ].filter((idx) => idx > -1);
-  const firstAutoLoopIdx = firstLoopIdxCandidates.length > 0 ? Math.min(...firstLoopIdxCandidates) : -1;
-  assert.ok(firstAutoLoopIdx > -1, "auto.ts should invoke the auto dispatch loop");
-  assert.ok(
-    resumeCallIdx < firstAutoLoopIdx,
-    "auto.ts must set GSD_PROJECT_ROOT before the first loop call",
-  );
+import {
+  cleanupAfterLoopExit,
+  _captureProjectRootEnvForTest,
+  _restoreProjectRootEnvForTest,
+} from "../auto.ts";
+import { autoSession } from "../auto-runtime-state.ts";
+
+test.afterEach(() => {
+  _restoreProjectRootEnvForTest();
+});
+
+test("auto-mode project-root env capture sets GSD_PROJECT_ROOT and restores an existing value", () => {
+  process.env.GSD_PROJECT_ROOT = "/before";
+
+  _captureProjectRootEnvForTest("/project");
+  assert.equal(process.env.GSD_PROJECT_ROOT, "/project");
+
+  _restoreProjectRootEnvForTest();
+  assert.equal(process.env.GSD_PROJECT_ROOT, "/before");
+  delete process.env.GSD_PROJECT_ROOT;
+});
+
+test("auto-mode project-root env restore deletes GSD_PROJECT_ROOT when it was initially absent", () => {
+  delete process.env.GSD_PROJECT_ROOT;
+
+  _captureProjectRootEnvForTest("/project");
+  assert.equal(process.env.GSD_PROJECT_ROOT, "/project");
+
+  _restoreProjectRootEnvForTest();
+  assert.equal(process.env.GSD_PROJECT_ROOT, undefined);
 });
 
-test("auto-mode restores GSD_PROJECT_ROOT when execution stops or pauses", () => {
-  assert.match(source, /function restoreProjectRootEnv\(\): void \{/);
-  assert.match(source, /cleanupAfterLoopExit\(ctx: ExtensionContext\): void \{[\s\S]*restoreProjectRootEnv\(\);/);
-  assert.match(source, /export async function pauseAuto\([\s\S]*restoreProjectRootEnv\(\);/);
-  assert.match(source, /\} finally \{[\s\S]*restoreProjectRootEnv\(\);[\s\S]*s\.reset\(\);/);
+test("cleanupAfterLoopExit restores captured GSD_PROJECT_ROOT", async () => {
+  const base = mkdtempSync(join(tmpdir(), "gsd-project-root-env-"));
+  const previousCwd = process.cwd();
+  const previousProjectRoot = process.env.GSD_PROJECT_ROOT;
+
+  autoSession.reset();
+  autoSession.active = true;
+  autoSession.basePath = join(base, ".gsd", "worktrees", "M001");
+  autoSession.originalBasePath = base;
+  autoSession.projectRootEnvCaptured = true;
+  autoSession.hadProjectRootEnv = true;
+  autoSession.previousProjectRootEnv = "/previous/project";
+  process.env.GSD_PROJECT_ROOT = base;
+
+  try {
+    await cleanupAfterLoopExit({
+      ui: {
+        setStatus: () => {},
+        setWidget: () => {},
+        notify: () => {},
+      },
+    } as any);
+
+    assert.equal(process.env.GSD_PROJECT_ROOT, "/previous/project");
+    assert.equal(autoSession.projectRootEnvCaptured, false);
+    assert.equal(autoSession.previousProjectRootEnv, null);
+  } finally {
+    autoSession.reset();
+    process.chdir(previousCwd);
+    if (previousProjectRoot === undefined) delete process.env.GSD_PROJECT_ROOT;
+    else process.env.GSD_PROJECT_ROOT = previousProjectRoot;
+    rmSync(base, { recursive: true, force: true });
+  }
 });

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

@@ -5,7 +5,7 @@ import { join } from "node:path";
 import { tmpdir } from "node:os";
 import { randomUUID } from "node:crypto";
 
-import { verifyExpectedArtifact, hasImplementationArtifacts, resolveExpectedArtifactPath, diagnoseExpectedArtifact, buildLoopRemediationSteps, writeBlockerPlaceholder } from "../auto-recovery.ts";
+import { verifyExpectedArtifact, hasImplementationArtifacts, resolveExpectedArtifactPath, diagnoseExpectedArtifact, buildLoopRemediationSteps, writeBlockerPlaceholder, refreshRecoveryDbForArtifact } from "../auto-recovery.ts";
 import { resolveMilestoneFile } from "../paths.ts";
 import { openDatabase, closeDatabase, insertMilestone, insertSlice, insertGateRow, insertTask, getMilestoneCommitAttributionShas } from "../gsd-db.ts";
 import { clearParseCache } from "../files.ts";
@@ -175,6 +175,19 @@ test("resolveExpectedArtifactPath returns correct path for all slice-level types
   }
 });
 
+test("refreshRecoveryDbForArtifact treats missing execute-task DB rows as fatal mismatches", () => {
+  makeTmpProject();
+
+  const result = refreshRecoveryDbForArtifact("execute-task", "M001/S01/T01");
+
+  assert.deepEqual(result, {
+    ok: false,
+    fatal: true,
+    reason: "execute-task-artifact-db-missing",
+    message: "Stuck recovery found execute-task M001/S01/T01 artifacts, but no matching DB task row exists after refresh.",
+  });
+});
+
 // ─── diagnoseExpectedArtifact ─────────────────────────────────────────────
 
 test("diagnoseExpectedArtifact returns description for known types", () => {

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

@@ -4,43 +4,45 @@
  * A SUMMARY.md on disk is a projection/diagnostic. Runtime post-unit checks
  * must not use it to mark the DB slice complete; explicit import/recovery
  * commands own markdown-to-DB behavior.
- *
- * This structural test verifies the complete-slice rogue branch reports the
- * stale projection without calling updateSliceStatus().
  */
 
-import { describe, test } from 'node:test';
-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";
+import { afterEach, describe, test } from "node:test";
+import assert from "node:assert/strict";
+import { mkdtempSync, mkdirSync, realpathSync, rmSync, writeFileSync } from "node:fs";
+import { dirname, join } from "node:path";
+import { tmpdir } from "node:os";
 
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
+import { detectRogueFileWrites } from "../auto-post-unit.ts";
+import {
+  closeDatabase,
+  getSlice,
+  insertMilestone,
+  insertSlice,
+  isDbAvailable,
+  openDatabase,
+} from "../gsd-db.ts";
 
-const source = readFileSync(join(__dirname, '..', 'auto-post-unit.ts'), 'utf-8');
+afterEach(() => {
+  if (isDbAvailable()) closeDatabase();
+});
 
-describe('DB-authoritative slice rogue detection', () => {
-  test('updateSliceStatus is not imported for post-unit rogue reconciliation', () => {
-    assert.doesNotMatch(source, /import\s*\{[^}]*updateSliceStatus[^}]*\}\s*from\s*["']\.\/gsd-db/,
-      'auto-post-unit must not import updateSliceStatus for disk-to-DB reconciliation');
-  });
+describe("DB-authoritative slice rogue detection", () => {
+  test("complete-slice SUMMARY.md is reported as rogue without marking DB complete", (t) => {
+    const base = realpathSync(mkdtempSync(join(tmpdir(), "gsd-rogue-slice-")));
+    t.after(() => rmSync(base, { recursive: true, force: true }));
 
-  test('complete-slice rogue branch does not mark DB complete from disk', () => {
-    assert.doesNotMatch(source, /updateSliceStatus\(mid,\s*sid,\s*["']complete["']/,
-      'SUMMARY.md on disk must not mark slice complete in DB');
-  });
+    mkdirSync(join(base, ".gsd"), { recursive: true });
+    openDatabase(join(base, ".gsd", "gsd.db"));
+    insertMilestone({ id: "M001", title: "Milestone", status: "active" });
+    insertSlice({ milestoneId: "M001", id: "S01", title: "Slice", status: "pending", sequence: 1 });
 
-  test('explicit rogue diagnostic reports stale slice summary projection', () => {
-    const branch = extractSourceRegion(source, 'unitType === "complete-slice"', 'unitType === "plan-milestone"');
-    assert.match(branch, /rogues\.push\(\{\s*path:\s*summaryPath,\s*unitType,\s*unitId\s*\}\)/,
-      'complete-slice branch should report stale SUMMARY.md as rogue');
-  });
+    const summaryPath = join(base, ".gsd", "milestones", "M001", "slices", "S01", "S01-SUMMARY.md");
+    mkdirSync(dirname(summaryPath), { recursive: true });
+    writeFileSync(summaryPath, "# Summary\n", "utf-8");
+
+    const rogues = detectRogueFileWrites("complete-slice", "M001/S01", base);
 
-  test('post-unit runtime does not call rogue diagnostics automatically', () => {
-    const postUnit = extractSourceRegion(source, 'export async function postUnitPostVerification');
-    assert.doesNotMatch(postUnit, /detectRogueFileWrites\(/,
-      'runtime post-unit path must not scan disk projections for rogue files');
+    assert.deepEqual(rogues, [{ path: summaryPath, unitType: "complete-slice", unitId: "M001/S01" }]);
+    assert.equal(getSlice("M001", "S01")?.status, "pending");
   });
 });

package/src/resources/extensions/gsd/tests/auto-start-bootstrap-await-3420.test.ts

@@ -1,141 +1,45 @@
 /**
  * auto-start-bootstrap-await-3420.test.ts — Regression test for #3420.
  *
- * Bug: In bootstrapAutoSession, when state.phase === "pre-planning" and no
- * context file exists, showSmartEntry is called to dispatch a discuss workflow.
- * showSmartEntry calls dispatchWorkflow which calls pi.sendMessage() — a
- * fire-and-forget call that returns immediately. The LLM discussion runs
- * asynchronously in a separate turn.
- *
- * The bug: after showSmartEntry returns (before the LLM has run), the code
- * immediately calls invalidateAllCaches() + deriveState() + checks postState.
- * Since the discussion hasn't run yet, postState.phase is still "pre-planning"
- * and the context check fails, producing the warning:
- *   "Discussion completed but milestone context is still missing. Run /gsd to try again."
- *
- * The discussion never ran — the warning fires immediately.
- *
- * Fix: bootstrapAutoSession must return false (release lock) after showSmartEntry
- * dispatches the workflow. The checkAutoStartAfterDiscuss callback in guided-flow.ts
- * already handles re-entering auto-mode when the discussion completes.
- *
- * This test verifies the fix by asserting that the pre-planning !hasContext block
- * does NOT contain a postState phase check after showSmartEntry — it must
- * return false immediately to let the async dispatch complete.
+ * The discussion handoff is asynchronous: bootstrap queues a discuss turn and
+ * releases the lock; checkAutoStartAfterDiscuss is responsible for re-entry
+ * once artifacts exist.
  */
 
 import test from "node:test";
 import assert from "node:assert/strict";
-import { readFileSync } from "node:fs";
+import { mkdtempSync, mkdirSync, rmSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
+import { tmpdir } from "node:os";
 
-const sourcePath = join(import.meta.dirname, "..", "auto-start.ts");
-const source = readFileSync(sourcePath, "utf-8");
-
-test("bootstrapAutoSession: pre-planning no-context path does NOT check postState immediately after showSmartEntry (#3420)", () => {
-  // Find the pre-planning block that handles the case where context is missing.
-  // This block dispatches showSmartEntry which is async (fire-and-forget via pi.sendMessage).
-  // After the dispatch, checking postState.phase immediately is premature — the
-  // LLM discussion hasn't run yet. The block should return false instead.
-  const prePlanningNoContextBlock = source.match(
-    /\/\/ Active milestone exists but has no roadmap\s*\n\s*if\s*\(\s*state\.phase\s*===\s*"pre-planning"\s*\)([\s\S]*?)\/\/ Active milestone has CONTEXT-DRAFT/,
-  );
-  assert.ok(
-    !!prePlanningNoContextBlock,
-    "auto-start.ts must have the pre-planning handler block before needs-discussion",
-  );
+import {
+  checkAutoStartAfterDiscuss,
+  clearPendingAutoStart,
+  setPendingAutoStart,
+} from "../guided-flow.ts";
 
-  const block = prePlanningNoContextBlock![1];
-
-  // The block must call showSmartEntry when !hasContext
-  assert.ok(
-    block.includes("showSmartEntry"),
-    "pre-planning !hasContext block must call showSmartEntry to dispatch the discuss workflow",
-  );
-
-  // FAILING ASSERTION (before fix): after showSmartEntry, the block must NOT
-  // immediately check postState.phase — that check fires before the LLM runs.
-  // Instead, it must return false (release lock) so the async dispatch can complete.
-  // The warning "Discussion completed but milestone context is still missing"
-  // fires prematurely when this postState check exists.
-  assert.ok(
-    !block.includes("Discussion completed but milestone context is still missing"),
-    "pre-planning !hasContext block must NOT check postState.phase immediately after showSmartEntry — " +
-    "the dispatch is async (pi.sendMessage is fire-and-forget) and the discussion hasn't run yet; " +
-    "return false instead so checkAutoStartAfterDiscuss can re-enter auto-mode after discussion completes (#3420)",
-  );
+test.afterEach(() => {
+  clearPendingAutoStart();
 });
 
-test("bootstrapAutoSession: complete/no-milestone path does NOT check postState immediately after showSmartEntry (#3420)", () => {
-  // Find the complete/no-milestone block
-  const completeBlock = source.match(
-    /\/\/ No active work — start a new milestone via discuss flow\s*\n\s*if\s*\(!state\.activeMilestone\s*\|\|\s*state\.phase\s*===\s*"complete"\s*\)([\s\S]*?)\/\/ Active milestone exists but has no roadmap/,
-  );
-  assert.ok(
-    !!completeBlock,
-    "auto-start.ts must have the complete/no-milestone handler block",
-  );
-
-  const block = completeBlock![1];
-
-  // The block must call showSmartEntry
-  assert.ok(
-    block.includes("showSmartEntry"),
-    "complete/no-milestone block must call showSmartEntry",
-  );
-
-  // After showSmartEntry dispatches, checking postState.phase is premature —
-  // the LLM hasn't had a turn yet. The block should return false.
-  // Specifically, the "no milestone context was written" warning fires too early.
-  assert.ok(
-    !block.includes("Discussion completed but no milestone context was written"),
-    "complete/no-milestone block must NOT check postState.phase immediately after showSmartEntry dispatch — " +
-    "return false instead so the async LLM turn can complete (#3420)",
-  );
-});
-
-test("bootstrapAutoSession: showSmartEntry in pre-planning path is followed by releaseLockAndReturn, not postState check (#3420)", () => {
-  // After the fix, the pre-planning !hasContext branch should call showSmartEntry
-  // and then immediately return releaseLockAndReturn() — not check postState.
-  const prePlanningNoContextBlock = source.match(
-    /\/\/ Active milestone exists but has no roadmap\s*\n\s*if\s*\(\s*state\.phase\s*===\s*"pre-planning"\s*\)([\s\S]*?)\/\/ Active milestone has CONTEXT-DRAFT/,
-  );
-  assert.ok(!!prePlanningNoContextBlock, "pre-planning handler block found");
-
-  const block = prePlanningNoContextBlock![1];
-
-  // After the fix, the !hasContext branch ends with releaseLockAndReturn
-  assert.ok(
-    block.includes("releaseLockAndReturn"),
-    "pre-planning !hasContext block must call releaseLockAndReturn() after showSmartEntry dispatch (#3420)",
-  );
-
-  // The showSmartEntry call must appear before releaseLockAndReturn
-  const showSmartEntryIdx = block.indexOf("showSmartEntry");
-  const releaseLockIdx = block.indexOf("releaseLockAndReturn");
-  assert.ok(
-    showSmartEntryIdx > -1 && releaseLockIdx > -1,
-    "both showSmartEntry and releaseLockAndReturn must appear in the block",
-  );
-  assert.ok(
-    showSmartEntryIdx < releaseLockIdx,
-    "showSmartEntry must appear before releaseLockAndReturn in pre-planning !hasContext block",
-  );
-
-  // There must be NO invalidateAllCaches between showSmartEntry and releaseLockAndReturn
-  // (invalidateAllCaches + deriveState after showSmartEntry is the buggy premature check)
-  const afterShowSmartEntry = block.substring(showSmartEntryIdx);
-  const cacheInvalidateIdx = afterShowSmartEntry.indexOf("invalidateAllCaches");
-  const releaseFromShowIdx = afterShowSmartEntry.indexOf("releaseLockAndReturn");
-
-  // If invalidateAllCaches appears, it must appear AFTER releaseLockAndReturn
-  // (which is impossible since releaseLockAndReturn returns) — so invalidateAllCaches
-  // must not appear at all between showSmartEntry and the end of the !hasContext block.
-  if (cacheInvalidateIdx !== -1) {
-    assert.ok(
-      cacheInvalidateIdx > releaseFromShowIdx,
-      "invalidateAllCaches must NOT appear between showSmartEntry and releaseLockAndReturn — " +
-      "this is the premature postState check that causes #3420",
-    );
-  }
+test("checkAutoStartAfterDiscuss waits until discussion artifacts exist before re-entering auto-mode", (t) => {
+  const base = mkdtempSync(join(tmpdir(), "gsd-bootstrap-await-"));
+  const notifications: string[] = [];
+  t.after(() => rmSync(base, { recursive: true, force: true }));
+  mkdirSync(join(base, ".gsd", "milestones", "M001"), { recursive: true });
+  setPendingAutoStart(base, {
+    basePath: base,
+    milestoneId: "M001",
+    ctx: { ui: { notify: (message: string) => notifications.push(message) } } as any,
+    pi: { sendMessage: () => {} } as any,
+  });
+
+  assert.equal(checkAutoStartAfterDiscuss(), false);
+  assert.deepEqual(notifications, []);
+
+  writeFileSync(join(base, ".gsd", "milestones", "M001", "M001-CONTEXT.md"), "# Context\n", "utf-8");
+  writeFileSync(join(base, ".gsd", "STATE.md"), "# State\n", "utf-8");
+
+  assert.equal(checkAutoStartAfterDiscuss(), true);
+  assert.deepEqual(notifications, ["Milestone M001 ready."]);
 });

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

@@ -1,72 +1,38 @@
 // GSD-2 auto-start regression test: cleanStaleRuntimeUnits is DB-gated (#4663)
-//
-// Source-level structural check that the stale-runtime-cleanup predicate in
-// auto-start.ts consults DB status when available instead of treating a
-// SUMMARY-file on disk as proof of milestone completion. Pairs with #4658 /
-// PR #4660 fix in auto-dispatch + auto-recovery.
 
 import { describe, test } from "node:test";
 import assert from "node:assert/strict";
-import { existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from "node:fs";
-import { join, dirname } from "node:path";
-import { fileURLToPath } from "node:url";
+import { existsSync, mkdirSync, rmSync, writeFileSync } from "node:fs";
+import { join } from "node:path";
 import { tmpdir } from "node:os";
 import { randomUUID } from "node:crypto";
 import { cleanStaleRuntimeUnits } from "../auto-worktree.ts";
-import { extractSourceRegion } from "./test-helpers.ts";
 
-const __dirname = dirname(fileURLToPath(import.meta.url));
-const sourceFile = join(__dirname, "..", "auto-start.ts");
+function makeBase(): string {
+  return join(tmpdir(), `gsd-clean-runtime-${randomUUID()}`);
+}
 
 describe("auto-start cleanStaleRuntimeUnits DB gating (#4663)", () => {
-  const source = readFileSync(sourceFile, "utf-8");
-
-  test("imports isClosedStatus for DB-status check", () => {
-    assert.match(
-      source,
-      /import\s*\{\s*isClosedStatus\s*\}\s*from\s*["']\.\/status-guards/,
-    );
-  });
-
-  test("cleanStaleRuntimeUnits is called after openProjectDbIfPresent", () => {
-    const openDbIdx = source.indexOf("await openProjectDbIfPresent(base)");
-    assert.ok(openDbIdx > -1, "openProjectDbIfPresent should be called in auto-start");
-    const cleanIdx = source.indexOf("cleanStaleRuntimeUnits(", openDbIdx);
-    assert.ok(
-      cleanIdx > -1,
-      "cleanStaleRuntimeUnits must run AFTER openProjectDbIfPresent so predicate can consult DB",
-    );
-  });
+  test("predicate controls whether milestone runtime units are removed", () => {
+    const base = makeBase();
+    const unitsDir = join(base, ".gsd", "runtime", "units");
+    try {
+      mkdirSync(unitsDir, { recursive: true });
+      const unitFile = join(unitsDir, "execute-task-M001-S01-T01.json");
+      writeFileSync(unitFile, "{}\n", "utf-8");
 
-  test("cleanStaleRuntimeUnits predicate consults DB status when available", () => {
-    const cleanIdx = source.indexOf("cleanStaleRuntimeUnits(");
-    assert.ok(cleanIdx > -1);
-    const snippet = extractSourceRegion(source, "cleanStaleRuntimeUnits(");
-    assert.match(
-      snippet,
-      /isDbAvailable\(\)/,
-      "predicate must branch on DB availability",
-    );
-    assert.match(
-      snippet,
-      /isClosedStatus\(/,
-      "predicate must check DB status via isClosedStatus",
-    );
-  });
+      assert.equal(cleanStaleRuntimeUnits(join(base, ".gsd"), () => false), 0);
+      assert.equal(existsSync(unitFile), true);
 
-  test("cleanStaleRuntimeUnits predicate still falls back to SUMMARY-file when DB unavailable", () => {
-    const cleanIdx = source.indexOf("cleanStaleRuntimeUnits(");
-    assert.ok(cleanIdx > -1);
-    const snippet = extractSourceRegion(source, "cleanStaleRuntimeUnits(");
-    assert.match(
-      snippet,
-      /resolveMilestoneFile\(base,\s*mid,\s*["']SUMMARY["']\)/,
-      "legacy FS-fallback branch should still use SUMMARY file presence",
-    );
+      assert.equal(cleanStaleRuntimeUnits(join(base, ".gsd"), (mid) => mid === "M001"), 1);
+      assert.equal(existsSync(unitFile), false);
+    } finally {
+      rmSync(base, { recursive: true, force: true });
+    }
   });
 
   test("cleanStaleRuntimeUnits removes legacy pseudo deep-setup runtime files", () => {
-    const base = join(tmpdir(), `gsd-clean-runtime-${randomUUID()}`);
+    const base = makeBase();
     const gsdRoot = join(base, ".gsd");
     const unitsDir = join(gsdRoot, "runtime", "units");
     try {