gsd-pi 2.58.0-dev.778d6ac → 2.58.0-dev.d63175c

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

@@ -4,7 +4,7 @@ import { mkdtempSync, mkdirSync, rmSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
 import { tmpdir } from "node:os";
 
-import { resolvePreferredModelConfig, resolveModelId } from "../auto-model-selection.js";
+import { resolvePreferredModelConfig } from "../auto-model-selection.js";
 
 function makeTempDir(prefix: string): string {
   return mkdtempSync(join(tmpdir(), prefix));
@@ -137,73 +137,3 @@ test("resolvePreferredModelConfig keeps explicit phase models as the ceiling", (
     rmSync(tempGsdHome, { recursive: true, force: true });
   }
 });
-
-// ─── resolveModelId tests ─────────────────────────────────────────────────
-
-test("resolveModelId: bare ID resolves to anthropic over claude-code when session is claude-code (#2905)", () => {
-  const availableModels = [
-    { id: "claude-sonnet-4-6", provider: "anthropic" },
-    { id: "claude-sonnet-4-6", provider: "claude-code" },
-  ];
-
-  // Bug: when currentProvider is "claude-code", bare ID "claude-sonnet-4-6"
-  // resolves to claude-code/claude-sonnet-4-6 instead of anthropic/claude-sonnet-4-6
-  const result = resolveModelId("claude-sonnet-4-6", availableModels, "claude-code");
-  assert.ok(result, "should resolve a model");
-  assert.equal(result.provider, "anthropic", "bare ID must resolve to anthropic, not claude-code");
-});
-
-test("resolveModelId: bare ID still prefers current provider when it is a first-class API provider", () => {
-  const availableModels = [
-    { id: "claude-sonnet-4-6", provider: "anthropic" },
-    { id: "claude-sonnet-4-6", provider: "bedrock" },
-  ];
-
-  const result = resolveModelId("claude-sonnet-4-6", availableModels, "bedrock");
-  assert.ok(result, "should resolve a model");
-  assert.equal(result.provider, "bedrock", "bare ID should prefer current provider when it is a real API provider");
-});
-
-test("resolveModelId: explicit provider/model format still resolves to claude-code when specified", () => {
-  const availableModels = [
-    { id: "claude-sonnet-4-6", provider: "anthropic" },
-    { id: "claude-sonnet-4-6", provider: "claude-code" },
-  ];
-
-  const result = resolveModelId("claude-code/claude-sonnet-4-6", availableModels, "anthropic");
-  assert.ok(result, "should resolve a model");
-  assert.equal(result.provider, "claude-code", "explicit provider prefix must be respected");
-});
-
-test("resolveModelId: bare ID with only one provider works normally", () => {
-  const availableModels = [
-    { id: "claude-sonnet-4-6", provider: "anthropic" },
-  ];
-
-  const result = resolveModelId("claude-sonnet-4-6", availableModels, "anthropic");
-  assert.ok(result, "should resolve a model");
-  assert.equal(result.provider, "anthropic");
-});
-
-test("resolveModelId: bare ID with claude-code as only provider still resolves", () => {
-  const availableModels = [
-    { id: "claude-sonnet-4-6", provider: "claude-code" },
-  ];
-
-  // If claude-code is the ONLY provider for this model, it should still resolve
-  const result = resolveModelId("claude-sonnet-4-6", availableModels, "claude-code");
-  assert.ok(result, "should resolve even when only available via claude-code");
-  assert.equal(result.provider, "claude-code");
-});
-
-test("resolveModelId: anthropic wins over claude-code regardless of list order", () => {
-  const availableModels = [
-    { id: "claude-sonnet-4-6", provider: "claude-code" },
-    { id: "claude-sonnet-4-6", provider: "anthropic" },
-  ];
-
-  // Even when claude-code appears first in the list, anthropic should win
-  const result = resolveModelId("claude-sonnet-4-6", availableModels, "claude-code");
-  assert.ok(result, "should resolve a model");
-  assert.equal(result.provider, "anthropic", "anthropic must win over claude-code regardless of list order");
-});

package/src/resources/extensions/gsd/tests/captures.test.ts

@@ -19,11 +19,8 @@ import {
   appendCapture,
   loadAllCaptures,
   loadPendingCaptures,
-  loadActionableCaptures,
   hasPendingCaptures,
   markCaptureResolved,
-  markCaptureExecuted,
-  stampCaptureMilestone,
   resolveCapturesPath,
   parseTriageOutput,
 } from "../captures.ts";
@@ -422,103 +419,3 @@ test("triage: parseTriageOutput preserves affectedFiles and targetSlice", () =>
   assert.strictEqual(results[1].targetSlice, "S04");
   assert.strictEqual(results[1].affectedFiles, undefined);
 });
-
-// ─── Stale Quick-Task Captures (#2872) ────────────────────────────────────────
-
-test("captures: markCaptureResolved stores milestone ID when provided", (t) => {
-  const tmp = makeTempDir("cap-milestone");
-  t.after(() => rmSync(tmp, { recursive: true, force: true }));
-
-  const id = appendCapture(tmp, "fix dialog width");
-  markCaptureResolved(tmp, id, "quick-task", "widen the dialog", "small fix", "M003");
-
-  const all = loadAllCaptures(tmp);
-  assert.strictEqual(all.length, 1);
-  assert.strictEqual(all[0].resolvedInMilestone, "M003", "should store milestone ID");
-});
-
-test("captures: loadActionableCaptures excludes captures resolved in prior milestones", (t) => {
-  const tmp = makeTempDir("cap-stale-filter");
-  t.after(() => rmSync(tmp, { recursive: true, force: true }));
-
-  // Capture resolved in M003 (prior milestone)
-  const id1 = appendCapture(tmp, "dialog too narrow");
-  markCaptureResolved(tmp, id1, "quick-task", "widen it", "small fix", "M003");
-
-  // Capture resolved in M004 (current milestone)
-  const id2 = appendCapture(tmp, "button misaligned");
-  markCaptureResolved(tmp, id2, "quick-task", "fix alignment", "css fix", "M004");
-
-  // Capture resolved without milestone context (legacy)
-  const id3 = appendCapture(tmp, "typo in label");
-  markCaptureResolved(tmp, id3, "quick-task", "fix typo", "trivial");
-
-  // When loading for M004, only M004 and no-milestone captures should be returned
-  const actionable = loadActionableCaptures(tmp, "M004");
-  const ids = actionable.map(c => c.id);
-
-  assert.ok(!ids.includes(id1), "should exclude capture resolved in M003");
-  assert.ok(ids.includes(id2), "should include capture resolved in M004");
-  assert.ok(ids.includes(id3), "should include capture with no milestone (legacy)");
-});
-
-test("captures: loadActionableCaptures without milestone returns all actionable", (t) => {
-  const tmp = makeTempDir("cap-no-milestone-filter");
-  t.after(() => rmSync(tmp, { recursive: true, force: true }));
-
-  const id1 = appendCapture(tmp, "issue one");
-  markCaptureResolved(tmp, id1, "quick-task", "fix it", "small", "M003");
-
-  const id2 = appendCapture(tmp, "issue two");
-  markCaptureResolved(tmp, id2, "inject", "inject it", "needed", "M004");
-
-  // Without milestone filter, all actionable captures are returned (backward compat)
-  const actionable = loadActionableCaptures(tmp);
-  assert.strictEqual(actionable.length, 2, "should return all actionable without filter");
-});
-
-test("captures: loadActionableCaptures excludes already-executed captures", (t) => {
-  const tmp = makeTempDir("cap-executed-filter");
-  t.after(() => rmSync(tmp, { recursive: true, force: true }));
-
-  const id1 = appendCapture(tmp, "already done");
-  markCaptureResolved(tmp, id1, "quick-task", "fix it", "small", "M004");
-  markCaptureExecuted(tmp, id1);
-
-  const id2 = appendCapture(tmp, "still pending");
-  markCaptureResolved(tmp, id2, "quick-task", "fix it too", "small", "M004");
-
-  const actionable = loadActionableCaptures(tmp, "M004");
-  assert.strictEqual(actionable.length, 1, "should exclude executed capture");
-  assert.strictEqual(actionable[0].id, id2);
-});
-
-test("captures: stampCaptureMilestone adds milestone to capture missing it", (t) => {
-  const tmp = makeTempDir("cap-stamp-milestone");
-  t.after(() => rmSync(tmp, { recursive: true, force: true }));
-
-  const id = appendCapture(tmp, "fix alignment");
-  markCaptureResolved(tmp, id, "quick-task", "fix it", "small");
-
-  // Before stamping, no milestone
-  let all = loadAllCaptures(tmp);
-  assert.strictEqual(all[0].resolvedInMilestone, undefined, "should have no milestone initially");
-
-  stampCaptureMilestone(tmp, id, "M004");
-
-  all = loadAllCaptures(tmp);
-  assert.strictEqual(all[0].resolvedInMilestone, "M004", "should have milestone after stamping");
-});
-
-test("captures: stampCaptureMilestone is no-op if milestone already present", (t) => {
-  const tmp = makeTempDir("cap-stamp-noop");
-  t.after(() => rmSync(tmp, { recursive: true, force: true }));
-
-  const id = appendCapture(tmp, "fix alignment");
-  markCaptureResolved(tmp, id, "quick-task", "fix it", "small", "M003");
-
-  stampCaptureMilestone(tmp, id, "M004");
-
-  const all = loadAllCaptures(tmp);
-  assert.strictEqual(all[0].resolvedInMilestone, "M003", "should keep original milestone");
-});

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

@@ -237,33 +237,6 @@ describe("complete-milestone", () => {
     }
   });
 
-  test("step 11 specifies write tool for PROJECT.md update (#2946)", () => {
-    const prompt = loadPromptFromWorktree("complete-milestone", {
-      workingDirectory: "/tmp/test-project",
-      milestoneId: "M001",
-      milestoneTitle: "Tool Guidance Test",
-      roadmapPath: ".gsd/milestones/M001/M001-ROADMAP.md",
-      inlinedContext: "context",
-      milestoneSummaryPath: ".gsd/milestones/M001/M001-SUMMARY.md",
-      skillActivation: "",
-    });
-
-    // Step 11 must explicitly name the `write` tool so the LLM doesn't
-    // confuse it with `edit` (which requires path + oldText + newText).
-    // See: https://github.com/gsd-build/gsd-2/issues/2946
-    assert.ok(
-      /PROJECT\.md.*\bwrite\b/i.test(prompt) || /\bwrite\b.*PROJECT\.md/i.test(prompt),
-      "step 11 must name the `write` tool when updating PROJECT.md",
-    );
-
-    // The prompt must NOT leave tool choice ambiguous for PROJECT.md
-    // Verify it mentions the required parameter (`content` or `path`)
-    assert.ok(
-      prompt.includes("`.gsd/PROJECT.md`") || prompt.includes('".gsd/PROJECT.md"'),
-      "step 11 must reference the PROJECT.md path explicitly",
-    );
-  });
-
   test("deriveState completing-milestone integration", async () => {
     const { deriveState, isMilestoneComplete } = await import("../state.ts");
     const { invalidateAllCaches: invalidateAllCachesDynamic } = await import("../cache.ts");

package/src/resources/extensions/gsd/tests/complete-slice.test.ts

@@ -406,27 +406,6 @@ console.log('\n=== complete-slice: handler with missing roadmap ===');
   cleanup(dbPath);
 }
 
-// ═══════════════════════════════════════════════════════════════════════════
-// complete-slice: step 13 specifies write tool for PROJECT.md (#2946)
-// ═══════════════════════════════════════════════════════════════════════════
-
-console.log('\n=== complete-slice: step 13 specifies write tool for PROJECT.md (#2946) ===');
-{
-  const promptPath = path.join(
-    path.dirname(new URL(import.meta.url).pathname),
-    '..', 'prompts', 'complete-slice.md',
-  );
-  const prompt = fs.readFileSync(promptPath, 'utf-8');
-
-  // Step 13 must explicitly name the `write` tool so the LLM doesn't
-  // confuse it with `edit` (which requires path + oldText + newText).
-  // See: https://github.com/gsd-build/gsd-2/issues/2946
-  const mentionsWriteTool =
-    /PROJECT\.md.*\bwrite\b/i.test(prompt) ||
-    /\bwrite\b.*PROJECT\.md/i.test(prompt);
-  assertTrue(mentionsWriteTool, 'step 13 must name the `write` tool when updating PROJECT.md');
-}
-
 // ═══════════════════════════════════════════════════════════════════════════
 
 report();

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

@@ -416,18 +416,23 @@ describe('db-writer', () => {
     }
   });
 
-  test('updateRequirementInDb — upserts when not found (#2919)', async () => {
+  test('updateRequirementInDb — not found', async () => {
     const tmpDir = makeTmpDir();
     const dbPath = path.join(tmpDir, '.gsd', 'gsd.db');
     openDatabase(dbPath);
 
     try {
-      // Previously threw; now upserts a skeleton requirement with the provided updates
-      await updateRequirementInDb('R999', { status: 'validated' }, tmpDir);
-      const created = getRequirementById('R999');
-      assert.ok(created !== null, 'R999 should be created by upsert');
-      assert.deepStrictEqual(created!.status, 'validated', 'Upserted requirement should have validated status');
-      assert.deepStrictEqual(created!.id, 'R999', 'Upserted requirement should keep the provided ID');
+      let threw = false;
+      try {
+        await updateRequirementInDb('R999', { status: 'validated' }, tmpDir);
+      } catch (err) {
+        threw = true;
+        assert.ok(
+          (err as Error).message.includes('R999'),
+          'error message mentions the missing ID',
+        );
+      }
+      assert.ok(threw, 'throws when requirement not found');
     } finally {
       closeDatabase();
       cleanupDir(tmpDir);

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

@@ -4,7 +4,7 @@ import { mkdtempSync, mkdirSync, rmSync, writeFileSync } from 'node:fs';
 import { join } from 'node:path';
 import { tmpdir } from 'node:os';
 
-import { deriveState, invalidateStateCache, _deriveStateImpl, deriveStateFromDb, isGhostMilestone } from '../state.ts';
+import { deriveState, invalidateStateCache, _deriveStateImpl, deriveStateFromDb } from '../state.ts';
 import {
   openDatabase,
   closeDatabase,
@@ -934,8 +934,8 @@ describe('derive-state-db', async () => {
     }
   });
 
-  // ─── Test 21: Ghost milestone skipped (no DB row, no worktree) ─────────
-  test('derive-state-db: ghost milestone skipped when no DB row and no worktree', async () => {
+  // ─── Test 21: Ghost milestone skipped ─────────────────────────────────
+  test('derive-state-db: ghost milestone skipped', async () => {
     const base = createFixtureBase();
     try {
       // Ghost: milestone dir exists with only META.json, no context/roadmap/summary
@@ -948,7 +948,8 @@ describe('derive-state-db', async () => {
       const fileState = await _deriveStateImpl(base);
 
       openDatabase(':memory:');
-      // Only insert M002 — M001 has no DB row (simulates row loss / never inserted)
+      // Ghost milestone in DB — no slices, status active
+      insertMilestone({ id: 'M001', title: '', status: 'active' });
       insertMilestone({ id: 'M002', title: 'Real', status: 'active' });
 
       invalidateStateCache();
@@ -1050,78 +1051,4 @@ describe('derive-state-db', async () => {
       closeDatabase();
     }
   });
-
-  // ─── Queued milestone with worktree not flagged as ghost (#2921) ──────
-  test('derive-state-db: queued milestone with worktree not flagged as ghost (#2921)', async () => {
-    const base = createFixtureBase();
-    try {
-      // M001: complete milestone with summary
-      writeFile(base, 'milestones/M001/M001-SUMMARY.md', '# M001 Summary\n\nDone.');
-
-      // M002: queued milestone — directory + slices dir exists, but no content files.
-      // This is what happens when ensureMilestoneDbRow creates M002 but the DB row
-      // is lost during worktree teardown.
-      mkdirSync(join(base, '.gsd', 'milestones', 'M002', 'slices'), { recursive: true });
-
-      // A worktree exists for M002, proving it's a legitimate milestone
-      mkdirSync(join(base, '.gsd', 'worktrees', 'M002'), { recursive: true });
-
-      // isGhostMilestone should NOT treat M002 as ghost when worktree exists
-      assert.ok(!isGhostMilestone(base, 'M002'), 'ghost-wt: M002 with worktree is NOT a ghost');
-
-      // DB has M001 complete but M002 row was lost
-      openDatabase(':memory:');
-      insertMilestone({ id: 'M001', title: 'First', status: 'complete' });
-      // No M002 row — simulates DB row loss during worktree teardown
-
-      invalidateStateCache();
-      const dbState = await deriveStateFromDb(base);
-
-      // M002 should be reconciled from disk (not skipped as ghost) and become active
-      const m002Entry = dbState.registry.find(e => e.id === 'M002');
-      assert.ok(m002Entry !== undefined, 'ghost-wt: M002 should be in registry');
-      assert.deepStrictEqual(dbState.activeMilestone?.id, 'M002', 'ghost-wt: M002 should be active');
-      // Should NOT be phase: complete
-      assert.notEqual(dbState.phase, 'complete', 'ghost-wt: phase should not be complete');
-
-      closeDatabase();
-    } finally {
-      closeDatabase();
-      cleanup(base);
-    }
-  });
-
-  // ─── Queued milestone with DB row not flagged as ghost (#2921) ────────
-  test('derive-state-db: queued milestone with DB row not flagged as ghost (#2921)', async () => {
-    const base = createFixtureBase();
-    try {
-      // M001: complete milestone with summary
-      writeFile(base, 'milestones/M001/M001-SUMMARY.md', '# M001 Summary\n\nDone.');
-
-      // M002: queued milestone — directory exists, no content files, but has DB row
-      mkdirSync(join(base, '.gsd', 'milestones', 'M002', 'slices'), { recursive: true });
-
-      // DB has both M001 complete and M002 queued
-      openDatabase(':memory:');
-      insertMilestone({ id: 'M001', title: 'First', status: 'complete' });
-      insertMilestone({ id: 'M002', title: 'Second', status: 'queued' });
-
-      // isGhostMilestone should NOT treat M002 as ghost when DB row exists
-      assert.ok(!isGhostMilestone(base, 'M002'), 'ghost-dbrow: M002 with DB row is NOT a ghost');
-
-      invalidateStateCache();
-      const dbState = await deriveStateFromDb(base);
-
-      // M002 should not be skipped
-      const m002Entry = dbState.registry.find(e => e.id === 'M002');
-      assert.ok(m002Entry !== undefined, 'ghost-dbrow: M002 should be in registry');
-      assert.deepStrictEqual(dbState.activeMilestone?.id, 'M002', 'ghost-dbrow: M002 should be active');
-      assert.notEqual(dbState.phase, 'complete', 'ghost-dbrow: phase should not be complete');
-
-      closeDatabase();
-    } finally {
-      closeDatabase();
-      cleanup(base);
-    }
-  });
 });

package/src/resources/extensions/gsd/tests/derive-state.test.ts

@@ -930,35 +930,6 @@ slice: S01
     }
   });
 
-  // ─── Test: queued milestone with worktree not flagged as ghost (#2921) ──
-  test('queued milestone with worktree not flagged as ghost (#2921)', async () => {
-    const base = createFixtureBase();
-    try {
-      // Create a milestone directory with only an empty slices subdir — no content files.
-      // This would normally be a ghost, but it has a worktree directory.
-      const milestoneDir = join(base, '.gsd', 'milestones', 'M002');
-      mkdirSync(join(milestoneDir, 'slices'), { recursive: true });
-
-      // Create a worktree directory for M002, simulating an active worktree
-      const worktreeDir = join(base, '.gsd', 'worktrees', 'M002');
-      mkdirSync(worktreeDir, { recursive: true });
-
-      // isGhostMilestone should return false because the worktree exists
-      assert.ok(!isGhostMilestone(base, 'M002'), 'M002 with worktree should NOT be a ghost');
-
-      // Also create a completed M001 so deriveState has something before M002
-      writeMilestoneSummary(base, 'M001', '# M001 Summary\n\nDone.');
-
-      const state = await deriveState(base);
-      // M002 should appear in the registry (not filtered as ghost)
-      const m002Entry = state.registry.find(e => e.id === 'M002');
-      assert.ok(m002Entry !== undefined, 'M002 should be in registry when worktree exists');
-      assert.deepStrictEqual(state.activeMilestone?.id, 'M002', 'M002 should be active milestone');
-    } finally {
-      cleanup(base);
-    }
-  });
-
   // ─── Test: zero-slice roadmap → pre-planning, not blocked (#1785) ────
   test('zero-slice roadmap → pre-planning, not blocked (#1785)', async () => {
     const base = createFixtureBase();

package/src/resources/extensions/gsd/tests/discuss-queued-milestones.test.ts

@@ -238,44 +238,4 @@ describe("discuss-queued-milestones (#2307)", () => {
       "queued milestone picker must label entries with [queued] to distinguish from active",
     );
   });
-
-  // ─── #3150: allDiscussed early-return must not block queued milestone discussion ──
-
-  test("12. allDiscussed path checks for pending milestones before returning (#3150)", () => {
-    const source = readGuidedFlowSource();
-
-    // Extract the allDiscussed block — the if (allDiscussed) { ... } body
-    const allDiscussedMatch = source.match(
-      /const allDiscussed = pendingSlices\.every\([\s\S]*?\n    if \(allDiscussed\) \{([\s\S]*?)\n    \}/,
-    );
-    assert.ok(!!allDiscussedMatch, "allDiscussed guard block must exist in showDiscuss()");
-
-    if (allDiscussedMatch) {
-      const body = allDiscussedMatch[1];
-      // The fix must check for pending milestones and route to showDiscussQueuedMilestone
-      assert.ok(
-        body.includes("pending") && body.includes("showDiscussQueuedMilestone"),
-        "allDiscussed block must check for pending milestones and call showDiscussQueuedMilestone before returning (#3150)",
-      );
-    }
-  });
-
-  test("13. pendingSlices.length===0 path checks for pending milestones before returning (#3150)", () => {
-    const source = readGuidedFlowSource();
-
-    // Find the pendingSlices.length === 0 guard block
-    const zeroSlicesMatch = source.match(
-      /if \(pendingSlices\.length === 0\) \{([\s\S]*?)\n  \}/,
-    );
-    assert.ok(!!zeroSlicesMatch, "pendingSlices.length === 0 guard block must exist in showDiscuss()");
-
-    if (zeroSlicesMatch) {
-      const body = zeroSlicesMatch[1];
-      // The fix must check for pending milestones and route to showDiscussQueuedMilestone
-      assert.ok(
-        body.includes("pending") && body.includes("showDiscussQueuedMilestone"),
-        "pendingSlices.length===0 block must check for pending milestones and call showDiscussQueuedMilestone before returning (#3150)",
-      );
-    }
-  });
 });

package/src/resources/extensions/gsd/tests/dist-redirect.mjs

@@ -87,26 +87,7 @@ export function load(url, context, nextLoad) {
         emitDecoratorMetadata: true,
       },
     });
-    // Inject CJS-compatible globals (__dirname, __filename, require) so that
-    // workspace packages compiled as ESM can still use them.  This avoids the
-    // need for import.meta.url behind indirect invocation patterns that fail in
-    // CJS and in dynamically-created scopes.
-    // Only inject globals that the source file doesn't already declare itself.
-    const preambleLines = [
-      'import { fileURLToPath as __preamble_fUTP } from "node:url";',
-      'import { dirname as __preamble_dn } from "node:path";',
-      'import { createRequire as __preamble_cR } from "node:module";',
-    ];
-    if (!outputText.includes('const __filename') && !outputText.includes('let __filename')) {
-      preambleLines.push('const __filename = __preamble_fUTP(import.meta.url);');
-    }
-    if (!outputText.includes('const __dirname') && !outputText.includes('let __dirname')) {
-      preambleLines.push('const __dirname = __preamble_dn(__preamble_fUTP(import.meta.url));');
-    }
-    if (!outputText.includes('const require') && !outputText.includes('let require')) {
-      preambleLines.push('const require = __preamble_cR(import.meta.url);');
-    }
-    return { format: 'module', source: preambleLines.join('\n') + '\n' + outputText, shortCircuit: true };
+    return { format: 'module', source: outputText, shortCircuit: true };
   }
   return nextLoad(url, context);
 }

package/src/resources/extensions/gsd/tests/doctor-providers.test.ts

@@ -484,120 +484,3 @@ test("runProviderChecks uses object provider field for anthropic-vertex models",
   rmSync(repo, { recursive: true, force: true });
   rmSync(tmpHome, { recursive: true, force: true });
 });
-
-// ─── Cross-provider routing: Codex & Gemini CLI (#2922) ────────────────────
-
-test("runProviderChecks reports ok for Google via google-gemini-cli auth.json (#2922)", () => {
-  const repo = realpathSync(mkdtempSync(join(tmpdir(), "gsd-providers-gemini-cli-repo-")));
-  mkdirSync(join(repo, ".gsd"), { recursive: true });
-  writeFileSync(
-    join(repo, ".gsd", "PREFERENCES.md"),
-    [
-      "---",
-      "models:",
-      "  execution: gemini-2.5-pro",
-      "---",
-      "",
-    ].join("\n"),
-  );
-
-  const tmpHome = realpathSync(mkdtempSync(join(tmpdir(), "gsd-providers-gemini-cli-home-")));
-  const agentDir = join(tmpHome, ".gsd", "agent");
-  mkdirSync(agentDir, { recursive: true });
-
-  // google-gemini-cli OAuth in auth.json (no google API key)
-  const authData = {
-    "google-gemini-cli": { type: "oauth", apiKey: "ya29.gemini-cli-token", expires: Date.now() + 3_600_000 },
-  };
-  writeFileSync(join(agentDir, "auth.json"), JSON.stringify(authData));
-
-  withEnv({
-    HOME: tmpHome,
-    GEMINI_API_KEY: undefined,
-    GOOGLE_API_KEY: undefined,
-  }, () => {
-    withCwd(repo, () => {
-      const results = runProviderChecks();
-      const google = results.find(r => r.name === "google");
-      assert.ok(google, "google result should exist");
-      assert.equal(google!.status, "ok", "should be ok when google-gemini-cli auth is available (#2922)");
-      assert.ok(google!.message.includes("Google Gemini CLI"), "should mention Gemini CLI as the source (#2922)");
-    });
-  });
-
-  rmSync(repo, { recursive: true, force: true });
-  rmSync(tmpHome, { recursive: true, force: true });
-});
-
-test("runProviderChecks reports ok for OpenAI via openai-codex auth.json (#2922)", () => {
-  const repo = realpathSync(mkdtempSync(join(tmpdir(), "gsd-providers-codex-repo-")));
-  mkdirSync(join(repo, ".gsd"), { recursive: true });
-  writeFileSync(
-    join(repo, ".gsd", "PREFERENCES.md"),
-    [
-      "---",
-      "models:",
-      "  execution: gpt-4o",
-      "---",
-      "",
-    ].join("\n"),
-  );
-
-  const tmpHome = realpathSync(mkdtempSync(join(tmpdir(), "gsd-providers-codex-home-")));
-  const agentDir = join(tmpHome, ".gsd", "agent");
-  mkdirSync(agentDir, { recursive: true });
-
-  // openai-codex OAuth in auth.json (no openai API key)
-  const authData = {
-    "openai-codex": { type: "oauth", apiKey: "codex-token", expires: Date.now() + 3_600_000 },
-  };
-  writeFileSync(join(agentDir, "auth.json"), JSON.stringify(authData));
-
-  withEnv({
-    HOME: tmpHome,
-    OPENAI_API_KEY: undefined,
-    // Clear Copilot env vars so it doesn't route through Copilot
-    COPILOT_GITHUB_TOKEN: undefined,
-    GH_TOKEN: undefined,
-    GITHUB_TOKEN: undefined,
-  }, () => {
-    withCwd(repo, () => {
-      const results = runProviderChecks();
-      const openai = results.find(r => r.name === "openai");
-      assert.ok(openai, "openai result should exist");
-      assert.equal(openai!.status, "ok", "should be ok when openai-codex auth is available (#2922)");
-      assert.ok(openai!.message.includes("Codex"), "should mention Codex as the source (#2922)");
-    });
-  });
-
-  rmSync(repo, { recursive: true, force: true });
-  rmSync(tmpHome, { recursive: true, force: true });
-});
-
-test("PROVIDER_ROUTES includes google-gemini-cli as route for google (#2922)", async () => {
-  const { readFileSync: readFS } = await import("node:fs");
-  const { dirname: dirn, join: joinPath } = await import("node:path");
-  const { fileURLToPath: fileUrl } = await import("node:url");
-  const __dir = dirn(fileUrl(import.meta.url));
-  const src = readFS(joinPath(__dir, "..", "doctor-providers.ts"), "utf-8");
-
-  // PROVIDER_ROUTES must map google -> [..., "google-gemini-cli"]
-  assert.ok(
-    src.includes('"google-gemini-cli"'),
-    'PROVIDER_ROUTES must include "google-gemini-cli" as a route (#2922)',
-  );
-});
-
-test("PROVIDER_ROUTES includes openai-codex as route for openai (#2922)", async () => {
-  const { readFileSync: readFS } = await import("node:fs");
-  const { dirname: dirn, join: joinPath } = await import("node:path");
-  const { fileURLToPath: fileUrl } = await import("node:url");
-  const __dir = dirn(fileUrl(import.meta.url));
-  const src = readFS(joinPath(__dir, "..", "doctor-providers.ts"), "utf-8");
-
-  // PROVIDER_ROUTES must map openai -> [..., "openai-codex"]
-  assert.ok(
-    src.includes('"openai-codex"'),
-    'PROVIDER_ROUTES must include "openai-codex" as a route (#2922)',
-  );
-});