gsd-pi 2.57.0 → 2.58.0-dev.394cb18

package/dist/resources/extensions/gsd/guided-flow.js

@@ -8,6 +8,7 @@
 import { showNextAction } from "../shared/tui.js";
 import { loadFile } from "./files.js";
 import { isDbAvailable, getMilestoneSlices } from "./gsd-db.js";
+import { parseRoadmapSlices } from "./roadmap-slices.js";
 import { loadPrompt, inlineTemplate } from "./prompt-loader.js";
 import { buildSkillActivationBlock } from "./auto-prompts.js";
 import { deriveState } from "./state.js";
@@ -31,7 +32,7 @@ import { showConfirm } from "../shared/tui.js";
 import { debugLog } from "./debug-logger.js";
 import { findMilestoneIds, nextMilestoneId, reserveMilestoneId, getReservedMilestoneIds, clearReservedMilestoneIds } from "./milestone-ids.js";
 import { parkMilestone, discardMilestone } from "./milestone-actions.js";
-import { resolveModelWithFallbacksForUnit } from "./preferences-models.js";
+import { selectAndApplyModel } from "./auto-model-selection.js";
 // ─── Re-exports (preserve public API for existing importers) ────────────────
 export { MILESTONE_ID_RE, generateMilestoneSuffix, nextMilestoneId, extractMilestoneSeq, parseMilestoneId, milestoneIdSort, maxMilestoneNum, findMilestoneIds, reserveMilestoneId, claimReservedId, getReservedMilestoneIds, clearReservedMilestoneIds, } from "./milestone-ids.js";
 export { showQueue, handleQueueReorder, showQueueAdd, buildExistingMilestonesContext, } from "./guided-flow-queue.js";
@@ -53,18 +54,61 @@ function nextMilestoneIdReserved(existingIds, uniqueEnabled) {
 function buildDocsCommitInstruction(_message) {
     return "Do not commit planning artifacts — .gsd/ is managed externally.";
 }
-// ─── Auto-start after discuss ─────────────────────────────────────────────────
-/** Stashed context + flag for auto-starting after discuss phase completes */
-let pendingAutoStart = null;
-/** Returns the milestoneId being discussed, or null if no discussion is active */
-export function getDiscussionMilestoneId() {
-    return pendingAutoStart?.milestoneId ?? null;
+const pendingAutoStartMap = new Map();
+/**
+ * Backward-compat bridge: returns a mutable reference to the entry matching
+ * basePath, or the sole entry when only one session exists.
+ * Internal use only — external code should use the Map directly.
+ */
+function _getPendingAutoStart(basePath) {
+    if (basePath)
+        return pendingAutoStartMap.get(basePath) ?? null;
+    if (pendingAutoStartMap.size === 1)
+        return pendingAutoStartMap.values().next().value;
+    return null;
+}
+/**
+ * Store pending auto-start state for a project.
+ * Exported for testing (#2985).
+ */
+export function setPendingAutoStart(basePath, entry) {
+    pendingAutoStartMap.set(basePath, entry);
+}
+/**
+ * Clear pending auto-start state.
+ * If basePath is given, clears only that project.  Otherwise clears all.
+ * Exported for testing (#2985).
+ */
+export function clearPendingAutoStart(basePath) {
+    if (basePath) {
+        pendingAutoStartMap.delete(basePath);
+    }
+    else {
+        pendingAutoStartMap.clear();
+    }
+}
+/**
+ * Returns the milestoneId being discussed for the given project.
+ * When basePath is omitted and only one session is active, returns that
+ * session's milestoneId for backward compatibility.  Returns null when
+ * multiple sessions exist and basePath is not specified (#2985 Bug 4).
+ */
+export function getDiscussionMilestoneId(basePath) {
+    if (basePath) {
+        return pendingAutoStartMap.get(basePath)?.milestoneId ?? null;
+    }
+    // Backward compat: return the sole entry's milestoneId, or null if ambiguous
+    if (pendingAutoStartMap.size === 1) {
+        return pendingAutoStartMap.values().next().value.milestoneId;
+    }
+    return null;
 }
 /** Called from agent_end to check if auto-mode should start after discuss */
 export function checkAutoStartAfterDiscuss() {
-    if (!pendingAutoStart)
+    const entry = _getPendingAutoStart();
+    if (!entry)
         return false;
-    const { ctx, pi, basePath, milestoneId, step } = pendingAutoStart;
+    const { ctx, pi, basePath, milestoneId, step } = entry;
     // Gate 1: Primary milestone must have CONTEXT.md or ROADMAP.md
     // The "discuss" path creates CONTEXT.md; the "plan" path creates ROADMAP.md.
     const contextFile = resolveMilestoneFile(basePath, milestoneId, "CONTEXT");
@@ -142,7 +186,7 @@ export function checkAutoStartAfterDiscuss() {
         unlinkSync(manifestPath);
     }
     catch { /* may not exist for single-milestone */ }
-    pendingAutoStart = null;
+    pendingAutoStartMap.delete(basePath);
     ctx.ui.notify(`Milestone ${milestoneId} ready.`, "info");
     startAuto(ctx, pi, basePath, false, { step }).catch((err) => {
         ctx.ui.notify(`Auto-start failed: ${getErrorMessage(err)}`, "error");
@@ -177,23 +221,17 @@ function parseMilestoneSequenceFromProject(content) {
  * per-phase model preferences that auto-mode uses.
  */
 async function dispatchWorkflow(pi, note, customType = "gsd-run", ctx, unitType) {
-    // Apply model preference for this unit type (if configured)
+    // Route through the dynamic routing pipeline (complexity classification,
+    // tier downgrade, fallback chains) — same path as auto-mode dispatches (#2958).
     if (ctx && unitType) {
-        const modelConfig = resolveModelWithFallbacksForUnit(unitType);
-        if (modelConfig) {
-            const availableModels = ctx.modelRegistry.getAvailable();
-            const modelsToTry = [modelConfig.primary, ...modelConfig.fallbacks];
-            for (const modelId of modelsToTry) {
-                // Resolve model from available models (same logic as auto-model-selection)
-                const model = resolveAvailableModel(modelId, availableModels, ctx.model?.provider);
-                if (!model)
-                    continue;
-                const ok = await pi.setModel(model, { persist: false });
-                if (ok) {
-                    debugLog("guided-flow-model-applied", { unitType, model: `${model.provider}/${model.id}` });
-                    break;
-                }
-            }
+        const prefs = loadEffectiveGSDPreferences()?.preferences;
+        const result = await selectAndApplyModel(ctx, pi, unitType, /* unitId */ "", /* basePath */ process.cwd(), prefs, /* verbose */ false, /* autoModeStartModel */ null);
+        if (result.appliedModel) {
+            debugLog("guided-flow-model-applied", {
+                unitType,
+                model: `${result.appliedModel.provider}/${result.appliedModel.id}`,
+                routing: result.routing,
+            });
         }
     }
     const workflowPath = process.env.GSD_WORKFLOW_PATH ?? join(process.env.HOME ?? "~", ".gsd", "agent", "GSD-WORKFLOW.md");
@@ -311,7 +349,7 @@ export async function showHeadlessMilestoneCreation(ctx, pi, basePath, seedConte
     // Build and dispatch the headless discuss prompt
     const prompt = buildHeadlessDiscussPrompt(nextId, seedContext, basePath);
     // Set pending auto start (auto-mode triggers on "Milestone X ready." via checkAutoStartAfterDiscuss)
-    pendingAutoStart = { ctx, pi, basePath, milestoneId: nextId };
+    pendingAutoStartMap.set(basePath, { ctx, pi, basePath, milestoneId: nextId });
     // Dispatch — headless milestone creation is a planning activity
     await dispatchWorkflow(pi, prompt, "gsd-run", ctx, "plan-milestone");
 }
@@ -460,13 +498,13 @@ export async function showDiscuss(ctx, pi, basePath) {
             const seed = draftContent
                 ? `${basePrompt}\n\n## Prior Discussion (Draft Seed)\n\n${draftContent}`
                 : basePrompt;
-            pendingAutoStart = { ctx, pi, basePath, milestoneId: mid, step: false };
+            pendingAutoStartMap.set(basePath, { ctx, pi, basePath, milestoneId: mid, step: false });
             await dispatchWorkflow(pi, seed, "gsd-discuss", ctx, "discuss-milestone");
         }
         else if (choice === "discuss_fresh") {
             const discussMilestoneTemplates = inlineTemplate("context", "Context");
             const structuredQuestionsAvailable = pi.getActiveTools().includes("ask_user_questions") ? "true" : "false";
-            pendingAutoStart = { ctx, pi, basePath, milestoneId: mid, step: false };
+            pendingAutoStartMap.set(basePath, { ctx, pi, basePath, milestoneId: mid, step: false });
             await dispatchWorkflow(pi, loadPrompt("guided-discuss-milestone", {
                 milestoneId: mid, milestoneTitle, inlinedTemplates: discussMilestoneTemplates, structuredQuestionsAvailable,
                 commitInstruction: buildDocsCommitInstruction(`docs(${mid}): milestone context from discuss`),
@@ -476,7 +514,7 @@ export async function showDiscuss(ctx, pi, basePath) {
             const milestoneIds = findMilestoneIds(basePath);
             const uniqueMilestoneIds = !!loadEffectiveGSDPreferences()?.preferences?.unique_milestone_ids;
             const nextId = nextMilestoneIdReserved(milestoneIds, uniqueMilestoneIds);
-            pendingAutoStart = { ctx, pi, basePath, milestoneId: nextId, step: false };
+            pendingAutoStartMap.set(basePath, { ctx, pi, basePath, milestoneId: nextId, step: false });
             await dispatchWorkflow(pi, buildDiscussPrompt(nextId, `New milestone ${nextId}.`, basePath), "gsd-run", ctx, "discuss-milestone");
         }
         return;
@@ -502,8 +540,20 @@ export async function showDiscuss(ctx, pi, basePath) {
     else {
         normSlices = [];
     }
+    // DB is open but returned zero slices despite a roadmap existing —
+    // the DB may be empty due to WAL loss or truncation (see #2815, #2892).
+    // Fall back to roadmap parsing to prevent false "all complete" exit.
+    if (normSlices.length === 0 && roadmapContent) {
+        normSlices = parseRoadmapSlices(roadmapContent).map(s => ({ id: s.id, done: s.done, title: s.title }));
+    }
     const pendingSlices = normSlices.filter(s => !s.done);
     if (pendingSlices.length === 0) {
+        // All slices complete — but queued milestones may still need discussion (#3150)
+        const pendingMilestones = state.registry.filter(m => m.status === "pending");
+        if (pendingMilestones.length > 0) {
+            await showDiscussQueuedMilestone(ctx, pi, basePath, pendingMilestones);
+            return;
+        }
         ctx.ui.notify("All slices are complete — nothing to discuss.", "info");
         return;
     }
@@ -517,9 +567,14 @@ export async function showDiscuss(ctx, pi, basePath) {
             const contextFile = resolveSliceFile(basePath, mid, s.id, "CONTEXT");
             discussedMap.set(s.id, !!contextFile);
         }
-        // If all pending slices are discussed, notify and exit instead of looping
+        // If all pending slices are discussed, check for queued milestones before exiting (#3150)
         const allDiscussed = pendingSlices.every(s => discussedMap.get(s.id));
         if (allDiscussed) {
+            const pendingMilestones = state.registry.filter(m => m.status === "pending");
+            if (pendingMilestones.length > 0) {
+                await showDiscussQueuedMilestone(ctx, pi, basePath, pendingMilestones);
+                return;
+            }
             const lockData = readSessionLockData(basePath);
             const remoteAutoRunning = lockData && lockData.pid !== process.pid && isSessionLockProcessAlive(lockData);
             const nextStep = remoteAutoRunning
@@ -774,7 +829,7 @@ async function handleMilestoneActions(ctx, pi, basePath, milestoneId, milestoneT
         const milestoneIds = findMilestoneIds(basePath);
         const uniqueMilestoneIds = !!loadEffectiveGSDPreferences()?.preferences?.unique_milestone_ids;
         const nextId = nextMilestoneIdReserved(milestoneIds, uniqueMilestoneIds);
-        pendingAutoStart = { ctx, pi, basePath, milestoneId: nextId, step: stepMode };
+        pendingAutoStartMap.set(basePath, { ctx, pi, basePath, milestoneId: nextId, step: stepMode });
         await dispatchWorkflow(pi, buildDiscussPrompt(nextId, `New milestone ${nextId}.`, basePath), "gsd-run", ctx, "discuss-milestone");
         return true;
     }
@@ -804,7 +859,14 @@ export async function showSmartEntry(ctx, pi, basePath, options) {
             return;
     }
     // ── Detection preamble — run before any bootstrap ────────────────────
-    if (!existsSync(gsdRoot(basePath))) {
+    // Check bootstrap completeness, not just .gsd/ directory existence.
+    // A zombie .gsd/ state (symlink exists but missing PREFERENCES.md and
+    // milestones/) must trigger the init wizard, not skip it (#2942).
+    const gsdPath = gsdRoot(basePath);
+    const hasBootstrapArtifacts = existsSync(gsdPath)
+        && (existsSync(join(gsdPath, "PREFERENCES.md"))
+            || existsSync(join(gsdPath, "milestones")));
+    if (!hasBootstrapArtifacts) {
         const detection = detectProjectState(basePath);
         // v1 .planning/ detected — offer migration before anything else
         if (detection.state === "v1-planning" && detection.v1) {
@@ -818,7 +880,7 @@ export async function showSmartEntry(ctx, pi, basePath, options) {
             }
             // "fresh" — fall through to init wizard
         }
-        // No .gsd/ — run the project init wizard
+        // No .gsd/ or zombie .gsd/ — run the project init wizard
         const result = await showProjectInit(ctx, pi, basePath, detection);
         if (!result.completed)
             return; // User cancelled
@@ -869,9 +931,9 @@ export async function showSmartEntry(ctx, pi, basePath, options) {
     if (!state.activeMilestone?.id) {
         // Guard: if a discuss session is already in flight, don't re-inject the prompt.
         // Both /gsd and /gsd auto reach this branch when no milestone exists yet.
-        // Without this guard, every subsequent /gsd call overwrites pendingAutoStart
+        // Without this guard, every subsequent /gsd call overwrites the pending auto-start
         // and fires another dispatchWorkflow, resetting the conversation mid-interview.
-        if (pendingAutoStart) {
+        if (pendingAutoStartMap.has(basePath)) {
             ctx.ui.notify("Discussion already in progress — answer the question above to continue.", "info");
             return;
         }
@@ -898,7 +960,7 @@ export async function showSmartEntry(ctx, pi, basePath, options) {
         const isFirst = milestoneIds.length === 0;
         if (isFirst) {
             // First ever — skip wizard, just ask directly
-            pendingAutoStart = { ctx, pi, basePath, milestoneId: nextId, step: stepMode };
+            pendingAutoStartMap.set(basePath, { ctx, pi, basePath, milestoneId: nextId, step: stepMode });
             await dispatchWorkflow(pi, buildDiscussPrompt(nextId, `New project, milestone ${nextId}. Do NOT read or explore .gsd/ — it's empty scaffolding.`, basePath), "gsd-run", ctx, "discuss-milestone");
         }
         else {
@@ -916,7 +978,7 @@ export async function showSmartEntry(ctx, pi, basePath, options) {
                 notYetMessage: "Run /gsd when ready.",
             });
             if (choice === "new_milestone") {
-                pendingAutoStart = { ctx, pi, basePath, milestoneId: nextId, step: stepMode };
+                pendingAutoStartMap.set(basePath, { ctx, pi, basePath, milestoneId: nextId, step: stepMode });
                 await dispatchWorkflow(pi, buildDiscussPrompt(nextId, `New milestone ${nextId}.`, basePath), "gsd-run", ctx, "discuss-milestone");
             }
         }
@@ -948,7 +1010,7 @@ export async function showSmartEntry(ctx, pi, basePath, options) {
             const milestoneIds = findMilestoneIds(basePath);
             const uniqueMilestoneIds = !!loadEffectiveGSDPreferences()?.preferences?.unique_milestone_ids;
             const nextId = nextMilestoneIdReserved(milestoneIds, uniqueMilestoneIds);
-            pendingAutoStart = { ctx, pi, basePath, milestoneId: nextId, step: stepMode };
+            pendingAutoStartMap.set(basePath, { ctx, pi, basePath, milestoneId: nextId, step: stepMode });
             await dispatchWorkflow(pi, buildDiscussPrompt(nextId, `New milestone ${nextId}.`, basePath), "gsd-run", ctx, "discuss-milestone");
         }
         else if (choice === "status") {
@@ -994,13 +1056,13 @@ export async function showSmartEntry(ctx, pi, basePath, options) {
             const seed = draftContent
                 ? `${basePrompt}\n\n## Prior Discussion (Draft Seed)\n\n${draftContent}`
                 : basePrompt;
-            pendingAutoStart = { ctx, pi, basePath, milestoneId, step: stepMode };
+            pendingAutoStartMap.set(basePath, { ctx, pi, basePath, milestoneId, step: stepMode });
             await dispatchWorkflow(pi, seed, "gsd-discuss", ctx, "discuss-milestone");
         }
         else if (choice === "discuss_fresh") {
             const discussMilestoneTemplates = inlineTemplate("context", "Context");
             const structuredQuestionsAvailable = pi.getActiveTools().includes("ask_user_questions") ? "true" : "false";
-            pendingAutoStart = { ctx, pi, basePath, milestoneId, step: stepMode };
+            pendingAutoStartMap.set(basePath, { ctx, pi, basePath, milestoneId, step: stepMode });
             await dispatchWorkflow(pi, loadPrompt("guided-discuss-milestone", {
                 milestoneId, milestoneTitle, inlinedTemplates: discussMilestoneTemplates, structuredQuestionsAvailable,
                 commitInstruction: buildDocsCommitInstruction(`docs(${milestoneId}): milestone context from discuss`),
@@ -1010,7 +1072,7 @@ export async function showSmartEntry(ctx, pi, basePath, options) {
             const milestoneIds = findMilestoneIds(basePath);
             const uniqueMilestoneIds = !!loadEffectiveGSDPreferences()?.preferences?.unique_milestone_ids;
             const nextId = nextMilestoneIdReserved(milestoneIds, uniqueMilestoneIds);
-            pendingAutoStart = { ctx, pi, basePath, milestoneId: nextId, step: stepMode };
+            pendingAutoStartMap.set(basePath, { ctx, pi, basePath, milestoneId: nextId, step: stepMode });
             await dispatchWorkflow(pi, buildDiscussPrompt(nextId, `New milestone ${nextId}.`, basePath), "gsd-run", ctx, "discuss-milestone");
         }
         return;
@@ -1055,7 +1117,7 @@ export async function showSmartEntry(ctx, pi, basePath, options) {
                 notYetMessage: "Run /gsd when ready.",
             });
             if (choice === "plan") {
-                pendingAutoStart = { ctx, pi, basePath, milestoneId, step: stepMode };
+                pendingAutoStartMap.set(basePath, { ctx, pi, basePath, milestoneId, step: stepMode });
                 const planMilestoneTemplates = [
                     inlineTemplate("roadmap", "Roadmap"),
                     inlineTemplate("plan", "Slice Plan"),
@@ -1088,7 +1150,7 @@ export async function showSmartEntry(ctx, pi, basePath, options) {
                 const milestoneIds = findMilestoneIds(basePath);
                 const uniqueMilestoneIds = !!loadEffectiveGSDPreferences()?.preferences?.unique_milestone_ids;
                 const nextId = nextMilestoneIdReserved(milestoneIds, uniqueMilestoneIds);
-                pendingAutoStart = { ctx, pi, basePath, milestoneId: nextId, step: stepMode };
+                pendingAutoStartMap.set(basePath, { ctx, pi, basePath, milestoneId: nextId, step: stepMode });
                 await dispatchWorkflow(pi, buildDiscussPrompt(nextId, `New milestone ${nextId}.`, basePath), "gsd-run", ctx, "discuss-milestone");
             }
             else if (choice === "discard_milestone") {

package/dist/resources/extensions/gsd/health-widget-core.js

@@ -16,6 +16,31 @@ export function detectHealthWidgetProjectState(basePath) {
 function formatCost(n) {
     return n >= 1 ? `$${n.toFixed(2)}` : `${(n * 100).toFixed(1)}¢`;
 }
+/**
+ * Format a Unix epoch (seconds) as a human-readable relative time string.
+ * Returns "just now" for <1m, "Xm ago" for <1h, "Xh ago" for <24h, "Xd ago" otherwise.
+ */
+export function formatRelativeTime(epochSeconds) {
+    const diffSeconds = Math.floor(Date.now() / 1000) - epochSeconds;
+    if (diffSeconds < 60)
+        return "just now";
+    const minutes = Math.floor(diffSeconds / 60);
+    if (minutes < 60)
+        return `${minutes}m ago`;
+    const hours = Math.floor(minutes / 60);
+    if (hours < 24)
+        return `${hours}h ago`;
+    const days = Math.floor(hours / 24);
+    return `${days}d ago`;
+}
+/**
+ * Truncate a commit message to fit the widget, appending "…" if needed.
+ */
+function truncateMessage(msg, maxLen) {
+    if (msg.length <= maxLen)
+        return msg;
+    return msg.slice(0, maxLen - 1) + "…";
+}
 /**
  * Build compact health lines for the widget.
  * Returns a string array suitable for setWidget().
@@ -54,5 +79,11 @@ export function buildHealthLines(data) {
     else if (data.environmentWarningCount > 0) {
         parts.push(`Env: ${data.environmentWarningCount} warning${data.environmentWarningCount > 1 ? "s" : ""}`);
     }
+    // Always-on last commit display — shows relative time + truncated message
+    if (data.lastCommitEpoch !== null && data.lastCommitEpoch > 0) {
+        const relTime = formatRelativeTime(data.lastCommitEpoch);
+        const msg = data.lastCommitMessage ? ` — ${truncateMessage(data.lastCommitMessage, 50)}` : "";
+        parts.push(`Last commit: ${relTime}${msg}`);
+    }
     return [`  ${parts.join("  │  ")}`];
 }

package/dist/resources/extensions/gsd/health-widget.js

@@ -10,6 +10,7 @@
 import { runProviderChecks, summariseProviderIssues } from "./doctor-providers.js";
 import { runEnvironmentChecks } from "./doctor-environment.js";
 import { loadEffectiveGSDPreferences } from "./preferences.js";
+import { nativeIsRepo, nativeLastCommitEpoch, nativeGetCurrentBranch, nativeCommitSubject } from "./native-git-bridge.js";
 import { loadLedgerFromDisk, getProjectTotals } from "./metrics.js";
 import { projectRoot } from "./commands/context.js";
 import { buildHealthLines, detectHealthWidgetProjectState, } from "./health-widget-core.js";
@@ -20,6 +21,8 @@ function loadHealthWidgetData(basePath) {
     let providerIssue = null;
     let environmentErrorCount = 0;
     let environmentWarningCount = 0;
+    let lastCommitEpoch = null;
+    let lastCommitMessage = null;
     const projectState = detectHealthWidgetProjectState(basePath);
     try {
         const prefs = loadEffectiveGSDPreferences();
@@ -46,6 +49,18 @@ function loadHealthWidgetData(basePath) {
         }
     }
     catch { /* non-fatal */ }
+    // ── Last commit info ──
+    try {
+        if (nativeIsRepo(basePath)) {
+            const branch = nativeGetCurrentBranch(basePath);
+            const epoch = nativeLastCommitEpoch(basePath, branch || "HEAD");
+            if (epoch > 0) {
+                lastCommitEpoch = epoch;
+                lastCommitMessage = nativeCommitSubject(basePath, branch || "HEAD") || null;
+            }
+        }
+    }
+    catch { /* non-fatal */ }
     return {
         projectState,
         budgetCeiling,
@@ -53,6 +68,8 @@ function loadHealthWidgetData(basePath) {
         providerIssue,
         environmentErrorCount,
         environmentWarningCount,
+        lastCommitEpoch,
+        lastCommitMessage,
         lastRefreshed: Date.now(),
     };
 }

package/dist/resources/extensions/gsd/index.js

@@ -1,4 +1,4 @@
-export { isDepthVerified, isQueuePhaseActive, setQueuePhaseActive, shouldBlockContextWrite, } from "./bootstrap/write-gate.js";
+export { isDepthVerified, isQueuePhaseActive, setQueuePhaseActive, shouldBlockContextWrite, shouldBlockQueueExecution, } from "./bootstrap/write-gate.js";
 export default async function registerExtension(pi) {
     const { registerGsdExtension } = await import("./bootstrap/register-extension.js");
     registerGsdExtension(pi);

package/dist/resources/extensions/gsd/memory-extractor.js

@@ -57,14 +57,21 @@ export function buildMemoryLLMCall(ctx) {
         if (!model)
             return null;
         const selectedModel = model;
+        // Resolve API key via modelRegistry so OAuth tokens (auth.json) are used.
+        // Without this, streamSimpleAnthropic only checks env vars via getEnvApiKey,
+        // which returns undefined for OAuth users (Claude Max / Claude Pro).
+        // See: https://github.com/gsd-build/gsd-2/issues/2959
+        const resolvedKeyPromise = ctx.modelRegistry.getApiKey(selectedModel).catch(() => undefined);
         return async (system, user) => {
             const { completeSimple } = await import('@gsd/pi-ai');
+            const resolvedApiKey = await resolvedKeyPromise;
             const result = await completeSimple(selectedModel, {
                 systemPrompt: system,
                 messages: [{ role: 'user', content: [{ type: 'text', text: user }], timestamp: Date.now() }],
             }, {
                 maxTokens: 2048,
                 temperature: 0,
+                ...(resolvedApiKey ? { apiKey: resolvedApiKey } : {}),
             });
             // Extract text from response
             const textParts = result.content

package/dist/resources/extensions/gsd/migrate-external.js

@@ -8,7 +8,7 @@
 import { execFileSync } from "node:child_process";
 import { existsSync, lstatSync, mkdirSync, readdirSync, realpathSync, renameSync, cpSync, rmSync, symlinkSync } from "node:fs";
 import { join } from "node:path";
-import { externalGsdRoot } from "./repo-identity.js";
+import { externalGsdRoot, isInsideWorktree } from "./repo-identity.js";
 import { getErrorMessage } from "./error-utils.js";
 import { hasGitTrackedGsdFiles } from "./gitignore.js";
 import { GIT_NO_PROMPT_ENV } from "./git-constants.js";
@@ -27,6 +27,13 @@ import { GIT_NO_PROMPT_ENV } from "./git-constants.js";
  * 3. On failure: rename `.gsd.migrating` back to `.gsd` (rollback)
  */
 export function migrateToExternalState(basePath) {
+    // Worktrees get their .gsd via syncGsdStateToWorktree(), not migration.
+    // Migration inside a worktree would compute the same external hash as the
+    // main repo (externalGsdRoot hashes remoteUrl + gitRoot), creating a broken
+    // junction and orphaning .gsd.migrating (#2970).
+    if (isInsideWorktree(basePath)) {
+        return { migrated: false };
+    }
     const localGsd = join(basePath, ".gsd");
     // Skip if doesn't exist
     if (!existsSync(localGsd)) {

package/dist/resources/extensions/gsd/milestone-validation-gates.js

@@ -0,0 +1,45 @@
+/**
+ * Milestone validation quality gate persistence.
+ *
+ * #2945 Bug 4: validate-milestone was writing VALIDATION.md to disk and
+ * inserting an assessment row, but never persisted structured quality_gates
+ * records in the DB. This module inserts milestone-level validation gates
+ * that correspond to the validation checks performed.
+ *
+ * Gate IDs for milestone validation:
+ *   MV01 — Success criteria checklist
+ *   MV02 — Slice delivery audit
+ *   MV03 — Cross-slice integration
+ *   MV04 — Requirement coverage
+ *
+ * These use the existing quality_gates table with scope "milestone".
+ */
+import { _getAdapter } from "./gsd-db.js";
+/** Milestone validation gate IDs. */
+const MILESTONE_GATE_IDS = ["MV01", "MV02", "MV03", "MV04"];
+/**
+ * Insert milestone-level quality_gates records for a validation run.
+ *
+ * Each gate is inserted with status "complete" and a verdict derived
+ * from the overall milestone validation verdict. Individual gate-level
+ * verdicts are not available (the handler receives a single verdict),
+ * so all gates share the overall verdict.
+ */
+export function insertMilestoneValidationGates(milestoneId, sliceId, verdict, evaluatedAt) {
+    const db = _getAdapter();
+    if (!db)
+        return;
+    const gateVerdict = verdict === "pass" ? "pass" : "flag";
+    for (const gateId of MILESTONE_GATE_IDS) {
+        db.prepare(`INSERT OR REPLACE INTO quality_gates
+       (milestone_id, slice_id, gate_id, scope, task_id, status, verdict, rationale, findings, evaluated_at)
+       VALUES (:mid, :sid, :gid, 'milestone', '', 'complete', :verdict, :rationale, '', :evaluated_at)`).run({
+            ":mid": milestoneId,
+            ":sid": sliceId,
+            ":gid": gateId,
+            ":verdict": gateVerdict,
+            ":rationale": `Milestone validation verdict: ${verdict}`,
+            ":evaluated_at": evaluatedAt,
+        });
+    }
+}

package/dist/resources/extensions/gsd/model-cost-table.js

@@ -20,9 +20,27 @@ export const BUNDLED_COST_TABLE = [
     // OpenAI
     { id: "gpt-4o", inputPer1k: 0.0025, outputPer1k: 0.01, updatedAt: "2025-03-15" },
     { id: "gpt-4o-mini", inputPer1k: 0.00015, outputPer1k: 0.0006, updatedAt: "2025-03-15" },
+    { id: "gpt-4.1", inputPer1k: 0.002, outputPer1k: 0.008, updatedAt: "2026-03-29" },
+    { id: "gpt-4.1-mini", inputPer1k: 0.0004, outputPer1k: 0.0016, updatedAt: "2026-03-29" },
+    { id: "gpt-4.1-nano", inputPer1k: 0.0001, outputPer1k: 0.0004, updatedAt: "2026-03-29" },
+    { id: "gpt-5", inputPer1k: 0.01, outputPer1k: 0.04, updatedAt: "2026-03-29" },
+    { id: "gpt-5-mini", inputPer1k: 0.0003, outputPer1k: 0.0012, updatedAt: "2026-03-29" },
+    { id: "gpt-5-nano", inputPer1k: 0.0001, outputPer1k: 0.0004, updatedAt: "2026-03-29" },
+    { id: "gpt-5-pro", inputPer1k: 0.015, outputPer1k: 0.06, updatedAt: "2026-03-29" },
     { id: "o1", inputPer1k: 0.015, outputPer1k: 0.06, updatedAt: "2025-03-15" },
     { id: "o3", inputPer1k: 0.015, outputPer1k: 0.06, updatedAt: "2025-03-15" },
+    { id: "o4-mini", inputPer1k: 0.005, outputPer1k: 0.02, updatedAt: "2026-03-29" },
+    { id: "o4-mini-deep-research", inputPer1k: 0.005, outputPer1k: 0.02, updatedAt: "2026-03-29" },
     { id: "gpt-4-turbo", inputPer1k: 0.01, outputPer1k: 0.03, updatedAt: "2025-03-15" },
+    // OpenAI Codex
+    { id: "gpt-5.1", inputPer1k: 0.005, outputPer1k: 0.02, updatedAt: "2026-03-29" },
+    { id: "gpt-5.1-codex-max", inputPer1k: 0.003, outputPer1k: 0.012, updatedAt: "2026-03-29" },
+    { id: "gpt-5.1-codex-mini", inputPer1k: 0.0003, outputPer1k: 0.0012, updatedAt: "2026-03-29" },
+    { id: "gpt-5.2", inputPer1k: 0.005, outputPer1k: 0.02, updatedAt: "2026-03-29" },
+    { id: "gpt-5.2-codex", inputPer1k: 0.005, outputPer1k: 0.02, updatedAt: "2026-03-29" },
+    { id: "gpt-5.3-codex", inputPer1k: 0.005, outputPer1k: 0.02, updatedAt: "2026-03-29" },
+    { id: "gpt-5.3-codex-spark", inputPer1k: 0.0003, outputPer1k: 0.0012, updatedAt: "2026-03-29" },
+    { id: "gpt-5.4", inputPer1k: 0.005, outputPer1k: 0.02, updatedAt: "2026-03-29" },
     // Google
     { id: "gemini-2.0-flash", inputPer1k: 0.0001, outputPer1k: 0.0004, updatedAt: "2025-03-15" },
     { id: "gemini-flash-2.0", inputPer1k: 0.0001, outputPer1k: 0.0004, updatedAt: "2025-03-15" },

package/dist/resources/extensions/gsd/model-router.js

@@ -11,6 +11,12 @@ const MODEL_CAPABILITY_TIER = {
     "claude-3-5-haiku-latest": "light",
     "claude-3-haiku-20240307": "light",
     "gpt-4o-mini": "light",
+    "gpt-4.1-mini": "light",
+    "gpt-4.1-nano": "light",
+    "gpt-5-mini": "light",
+    "gpt-5-nano": "light",
+    "gpt-5.1-codex-mini": "light",
+    "gpt-5.3-codex-spark": "light",
     "gemini-2.0-flash": "light",
     "gemini-flash-2.0": "light",
     // Standard-tier models
@@ -18,14 +24,25 @@ const MODEL_CAPABILITY_TIER = {
     "claude-sonnet-4-5-20250514": "standard",
     "claude-3-5-sonnet-latest": "standard",
     "gpt-4o": "standard",
+    "gpt-4.1": "standard",
+    "gpt-5.1-codex-max": "standard",
     "gemini-2.5-pro": "standard",
     "deepseek-chat": "standard",
     // Heavy-tier models (most capable)
     "claude-opus-4-6": "heavy",
     "claude-3-opus-latest": "heavy",
     "gpt-4-turbo": "heavy",
+    "gpt-5": "heavy",
+    "gpt-5-pro": "heavy",
+    "gpt-5.1": "heavy",
+    "gpt-5.2": "heavy",
+    "gpt-5.2-codex": "heavy",
+    "gpt-5.3-codex": "heavy",
+    "gpt-5.4": "heavy",
     "o1": "heavy",
     "o3": "heavy",
+    "o4-mini": "heavy",
+    "o4-mini-deep-research": "heavy",
 };
 // ─── Cost Table (per 1K input tokens, approximate USD) ───────────────────────
 // Used for cross-provider cost comparison when multiple providers offer
@@ -38,6 +55,23 @@ const MODEL_COST_PER_1K_INPUT = {
     "claude-opus-4-6": 0.015,
     "gpt-4o-mini": 0.00015,
     "gpt-4o": 0.0025,
+    "gpt-4.1": 0.002,
+    "gpt-4.1-mini": 0.0004,
+    "gpt-4.1-nano": 0.0001,
+    "gpt-5": 0.01,
+    "gpt-5-mini": 0.0003,
+    "gpt-5-nano": 0.0001,
+    "gpt-5-pro": 0.015,
+    "gpt-5.1": 0.005,
+    "gpt-5.1-codex-max": 0.003,
+    "gpt-5.1-codex-mini": 0.0003,
+    "gpt-5.2": 0.005,
+    "gpt-5.2-codex": 0.005,
+    "gpt-5.3-codex": 0.005,
+    "gpt-5.3-codex-spark": 0.0003,
+    "gpt-5.4": 0.005,
+    "o4-mini": 0.005,
+    "o4-mini-deep-research": 0.005,
     "gemini-2.0-flash": 0.0001,
     "gemini-2.5-pro": 0.00125,
     "deepseek-chat": 0.00014,
@@ -133,7 +167,7 @@ export function escalateTier(currentTier) {
  */
 export function defaultRoutingConfig() {
     return {
-        enabled: false,
+        enabled: true,
         escalate_on_failure: true,
         budget_pressure: true,
         cross_provider: true,

package/dist/resources/extensions/gsd/native-git-bridge.js

@@ -525,6 +525,15 @@ export function nativeAddAll(basePath) {
     }
     gitFileExec(basePath, ["add", "-A"]);
 }
+/**
+ * Stage only already-tracked files (git add -u).
+ * Does NOT add new untracked files — only updates modifications and deletions
+ * for files git already knows about. Safe for automated snapshots where
+ * pulling in unknown untracked files (secrets, binaries) would be dangerous.
+ */
+export function nativeAddTracked(basePath) {
+    gitFileExec(basePath, ["add", "-u"]);
+}
 /**
  * Stage all files with pathspec exclusions (git add -A -- ':!pattern' ...).
  * Excluded paths are never hashed by git, preventing hangs on large
@@ -758,6 +767,36 @@ export function nativeResetHard(basePath) {
     }
     execSync("git reset --hard HEAD", { cwd: basePath, stdio: "pipe" });
 }
+/**
+ * Soft reset to a target ref (git reset --soft <ref>).
+ * Moves HEAD to `target` while keeping all changes staged in the index.
+ * Used to squash snapshot commits back into a single real commit.
+ */
+export function nativeResetSoft(basePath, target) {
+    execFileSync("git", ["reset", "--soft", target], {
+        cwd: basePath,
+        stdio: ["ignore", "pipe", "pipe"],
+        encoding: "utf-8",
+        env: GIT_NO_PROMPT_ENV,
+    });
+}
+/**
+ * Get the subject line of a commit (git log -1 --format=%s <ref>).
+ * Returns empty string if the ref doesn't exist.
+ */
+export function nativeCommitSubject(basePath, ref) {
+    try {
+        return execFileSync("git", ["log", "-1", "--format=%s", ref], {
+            cwd: basePath,
+            stdio: ["ignore", "pipe", "pipe"],
+            encoding: "utf-8",
+            env: GIT_NO_PROMPT_ENV,
+        }).trim();
+    }
+    catch {
+        return "";
+    }
+}
 /**
  * Delete a branch.
  * Native: libgit2 branch delete.