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

package/dist/resources/extensions/gsd/gsd-db.js

@@ -8,7 +8,6 @@ import { createRequire } from "node:module";
 import { existsSync, copyFileSync, mkdirSync, realpathSync } from "node:fs";
 import { dirname } from "node:path";
 import { GSDError, GSD_STALE_STATE } from "./errors.js";
-import { logError } from "./workflow-logger.js";
 const _require = createRequire(import.meta.url);
 let providerName = null;
 let providerModule = null;
@@ -698,29 +697,11 @@ export function openDatabase(path) {
         initSchema(adapter, fileBacked);
     }
     catch (err) {
-        // Corrupt freelist: DDL fails with "malformed" but VACUUM can rebuild.
-        // Attempt VACUUM recovery before giving up (see #2519).
-        if (fileBacked && err instanceof Error && err.message?.includes("malformed")) {
-            try {
-                adapter.exec("VACUUM");
-                initSchema(adapter, fileBacked);
-                process.stderr.write("gsd-db: recovered corrupt database via VACUUM\n");
-            }
-            catch (retryErr) {
-                try {
-                    adapter.close();
-                }
-                catch { /* swallow */ }
-                throw retryErr;
-            }
-        }
-        else {
-            try {
-                adapter.close();
-            }
-            catch { /* swallow */ }
-            throw err;
+        try {
+            adapter.close();
         }
+        catch { /* swallow */ }
+        throw err;
     }
     currentDb = adapter;
     currentPath = path;
@@ -1009,11 +990,10 @@ export function insertMilestone(m) {
         ":boundary_map_markdown": m.planning?.boundaryMapMarkdown ?? "",
     });
 }
-export function upsertMilestonePlanning(milestoneId, planning, title) {
+export function upsertMilestonePlanning(milestoneId, planning) {
     if (!currentDb)
         throw new GSDError(GSD_STALE_STATE, "gsd-db: No database open");
     currentDb.prepare(`UPDATE milestones SET
-      title = COALESCE(:title, title),
       vision = COALESCE(:vision, vision),
       success_criteria = COALESCE(:success_criteria, success_criteria),
       key_risks = COALESCE(:key_risks, key_risks),
@@ -1027,7 +1007,6 @@ export function upsertMilestonePlanning(milestoneId, planning, title) {
       boundary_map_markdown = COALESCE(:boundary_map_markdown, boundary_map_markdown)
      WHERE id = :id`).run({
         ":id": milestoneId,
-        ":title": title ?? null,
         ":vision": planning.vision ?? null,
         ":success_criteria": planning.successCriteria ? JSON.stringify(planning.successCriteria) : null,
         ":key_risks": planning.keyRisks ? JSON.stringify(planning.keyRisks) : null,
@@ -1297,12 +1276,6 @@ export function insertVerificationEvidence(e) {
         ":created_at": new Date().toISOString(),
     });
 }
-export function getVerificationEvidence(milestoneId, sliceId, taskId) {
-    if (!currentDb)
-        return [];
-    const rows = currentDb.prepare("SELECT * FROM verification_evidence WHERE milestone_id = :mid AND slice_id = :sid AND task_id = :tid ORDER BY id").all({ ":mid": milestoneId, ":sid": sliceId, ":tid": taskId });
-    return rows;
-}
 function rowToMilestone(row) {
     return {
         id: row["id"],
@@ -1474,7 +1447,7 @@ export function copyWorktreeDb(srcDbPath, destDbPath) {
         return true;
     }
     catch (err) {
-        logError("db", "failed to copy DB to worktree", { error: err.message });
+        process.stderr.write(`gsd-db: failed to copy DB to worktree: ${err.message}\n`);
         return false;
     }
 }
@@ -1493,13 +1466,13 @@ export function reconcileWorktreeDb(mainDbPath, worktreeDbPath) {
     // ATTACH DATABASE doesn't support parameterized paths in all providers,
     // so we use strict allowlist validation instead.
     if (/['";\x00]/.test(worktreeDbPath)) {
-        logError("db", "worktree DB reconciliation failed: path contains unsafe characters");
+        process.stderr.write("gsd-db: worktree DB reconciliation failed: path contains unsafe characters\n");
         return zero;
     }
     if (!currentDb) {
         const opened = openDatabase(mainDbPath);
         if (!opened) {
-            logError("db", "worktree DB reconciliation failed: cannot open main DB");
+            process.stderr.write("gsd-db: worktree DB reconciliation failed: cannot open main DB\n");
             return zero;
         }
     }
@@ -1623,7 +1596,7 @@ export function reconcileWorktreeDb(mainDbPath, worktreeDbPath) {
         }
     }
     catch (err) {
-        logError("db", "worktree DB reconciliation failed", { error: err.message });
+        process.stderr.write(`gsd-db: worktree DB reconciliation failed: ${err.message}\n`);
         return { ...zero, conflicts };
     }
 }

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

@@ -8,7 +8,6 @@
 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";
@@ -32,7 +31,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 { selectAndApplyModel } from "./auto-model-selection.js";
+import { resolveModelWithFallbacksForUnit } from "./preferences-models.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";
@@ -54,61 +53,18 @@ function nextMilestoneIdReserved(existingIds, uniqueEnabled) {
 function buildDocsCommitInstruction(_message) {
     return "Do not commit planning artifacts — .gsd/ is managed externally.";
 }
-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;
+// ─── 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;
 }
 /** Called from agent_end to check if auto-mode should start after discuss */
 export function checkAutoStartAfterDiscuss() {
-    const entry = _getPendingAutoStart();
-    if (!entry)
+    if (!pendingAutoStart)
         return false;
-    const { ctx, pi, basePath, milestoneId, step } = entry;
+    const { ctx, pi, basePath, milestoneId, step } = pendingAutoStart;
     // 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");
@@ -186,7 +142,7 @@ export function checkAutoStartAfterDiscuss() {
         unlinkSync(manifestPath);
     }
     catch { /* may not exist for single-milestone */ }
-    pendingAutoStartMap.delete(basePath);
+    pendingAutoStart = null;
     ctx.ui.notify(`Milestone ${milestoneId} ready.`, "info");
     startAuto(ctx, pi, basePath, false, { step }).catch((err) => {
         ctx.ui.notify(`Auto-start failed: ${getErrorMessage(err)}`, "error");
@@ -221,17 +177,23 @@ function parseMilestoneSequenceFromProject(content) {
  * per-phase model preferences that auto-mode uses.
  */
 async function dispatchWorkflow(pi, note, customType = "gsd-run", ctx, unitType) {
-    // Route through the dynamic routing pipeline (complexity classification,
-    // tier downgrade, fallback chains) — same path as auto-mode dispatches (#2958).
+    // Apply model preference for this unit type (if configured)
     if (ctx && unitType) {
-        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 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 workflowPath = process.env.GSD_WORKFLOW_PATH ?? join(process.env.HOME ?? "~", ".gsd", "agent", "GSD-WORKFLOW.md");
@@ -349,7 +311,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)
-    pendingAutoStartMap.set(basePath, { ctx, pi, basePath, milestoneId: nextId });
+    pendingAutoStart = { ctx, pi, basePath, milestoneId: nextId };
     // Dispatch — headless milestone creation is a planning activity
     await dispatchWorkflow(pi, prompt, "gsd-run", ctx, "plan-milestone");
 }
@@ -498,13 +460,13 @@ export async function showDiscuss(ctx, pi, basePath) {
             const seed = draftContent
                 ? `${basePrompt}\n\n## Prior Discussion (Draft Seed)\n\n${draftContent}`
                 : basePrompt;
-            pendingAutoStartMap.set(basePath, { ctx, pi, basePath, milestoneId: mid, step: false });
+            pendingAutoStart = { 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";
-            pendingAutoStartMap.set(basePath, { ctx, pi, basePath, milestoneId: mid, step: false });
+            pendingAutoStart = { 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`),
@@ -514,7 +476,7 @@ export async function showDiscuss(ctx, pi, basePath) {
             const milestoneIds = findMilestoneIds(basePath);
             const uniqueMilestoneIds = !!loadEffectiveGSDPreferences()?.preferences?.unique_milestone_ids;
             const nextId = nextMilestoneIdReserved(milestoneIds, uniqueMilestoneIds);
-            pendingAutoStartMap.set(basePath, { ctx, pi, basePath, milestoneId: nextId, step: false });
+            pendingAutoStart = { ctx, pi, basePath, milestoneId: nextId, step: false };
             await dispatchWorkflow(pi, buildDiscussPrompt(nextId, `New milestone ${nextId}.`, basePath), "gsd-run", ctx, "discuss-milestone");
         }
         return;
@@ -540,20 +502,8 @@ 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;
     }
@@ -567,14 +517,9 @@ 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, check for queued milestones before exiting (#3150)
+        // If all pending slices are discussed, notify and exit instead of looping
         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
@@ -829,7 +774,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);
-        pendingAutoStartMap.set(basePath, { ctx, pi, basePath, milestoneId: nextId, step: stepMode });
+        pendingAutoStart = { ctx, pi, basePath, milestoneId: nextId, step: stepMode };
         await dispatchWorkflow(pi, buildDiscussPrompt(nextId, `New milestone ${nextId}.`, basePath), "gsd-run", ctx, "discuss-milestone");
         return true;
     }
@@ -859,14 +804,7 @@ export async function showSmartEntry(ctx, pi, basePath, options) {
             return;
     }
     // ── Detection preamble — run before any bootstrap ────────────────────
-    // 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) {
+    if (!existsSync(gsdRoot(basePath))) {
         const detection = detectProjectState(basePath);
         // v1 .planning/ detected — offer migration before anything else
         if (detection.state === "v1-planning" && detection.v1) {
@@ -880,7 +818,7 @@ export async function showSmartEntry(ctx, pi, basePath, options) {
             }
             // "fresh" — fall through to init wizard
         }
-        // No .gsd/ or zombie .gsd/ — run the project init wizard
+        // No .gsd/ — run the project init wizard
         const result = await showProjectInit(ctx, pi, basePath, detection);
         if (!result.completed)
             return; // User cancelled
@@ -931,9 +869,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 the pending auto-start
+        // Without this guard, every subsequent /gsd call overwrites pendingAutoStart
         // and fires another dispatchWorkflow, resetting the conversation mid-interview.
-        if (pendingAutoStartMap.has(basePath)) {
+        if (pendingAutoStart) {
             ctx.ui.notify("Discussion already in progress — answer the question above to continue.", "info");
             return;
         }
@@ -960,7 +898,7 @@ export async function showSmartEntry(ctx, pi, basePath, options) {
         const isFirst = milestoneIds.length === 0;
         if (isFirst) {
             // First ever — skip wizard, just ask directly
-            pendingAutoStartMap.set(basePath, { ctx, pi, basePath, milestoneId: nextId, step: stepMode });
+            pendingAutoStart = { 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 {
@@ -978,7 +916,7 @@ export async function showSmartEntry(ctx, pi, basePath, options) {
                 notYetMessage: "Run /gsd when ready.",
             });
             if (choice === "new_milestone") {
-                pendingAutoStartMap.set(basePath, { ctx, pi, basePath, milestoneId: nextId, step: stepMode });
+                pendingAutoStart = { ctx, pi, basePath, milestoneId: nextId, step: stepMode };
                 await dispatchWorkflow(pi, buildDiscussPrompt(nextId, `New milestone ${nextId}.`, basePath), "gsd-run", ctx, "discuss-milestone");
             }
         }
@@ -1010,7 +948,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);
-            pendingAutoStartMap.set(basePath, { ctx, pi, basePath, milestoneId: nextId, step: stepMode });
+            pendingAutoStart = { 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") {
@@ -1056,13 +994,13 @@ export async function showSmartEntry(ctx, pi, basePath, options) {
             const seed = draftContent
                 ? `${basePrompt}\n\n## Prior Discussion (Draft Seed)\n\n${draftContent}`
                 : basePrompt;
-            pendingAutoStartMap.set(basePath, { ctx, pi, basePath, milestoneId, step: stepMode });
+            pendingAutoStart = { 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";
-            pendingAutoStartMap.set(basePath, { ctx, pi, basePath, milestoneId, step: stepMode });
+            pendingAutoStart = { 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`),
@@ -1072,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);
-            pendingAutoStartMap.set(basePath, { ctx, pi, basePath, milestoneId: nextId, step: stepMode });
+            pendingAutoStart = { ctx, pi, basePath, milestoneId: nextId, step: stepMode };
             await dispatchWorkflow(pi, buildDiscussPrompt(nextId, `New milestone ${nextId}.`, basePath), "gsd-run", ctx, "discuss-milestone");
         }
         return;
@@ -1117,7 +1055,7 @@ export async function showSmartEntry(ctx, pi, basePath, options) {
                 notYetMessage: "Run /gsd when ready.",
             });
             if (choice === "plan") {
-                pendingAutoStartMap.set(basePath, { ctx, pi, basePath, milestoneId, step: stepMode });
+                pendingAutoStart = { ctx, pi, basePath, milestoneId, step: stepMode };
                 const planMilestoneTemplates = [
                     inlineTemplate("roadmap", "Roadmap"),
                     inlineTemplate("plan", "Slice Plan"),
@@ -1150,7 +1088,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);
-                pendingAutoStartMap.set(basePath, { ctx, pi, basePath, milestoneId: nextId, step: stepMode });
+                pendingAutoStart = { 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,31 +16,6 @@ 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().
@@ -79,11 +54,5 @@ 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,7 +10,6 @@
 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";
@@ -21,8 +20,6 @@ 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();
@@ -49,18 +46,6 @@ 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,
@@ -68,8 +53,6 @@ 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, shouldBlockQueueExecution, } from "./bootstrap/write-gate.js";
+export { isDepthVerified, isQueuePhaseActive, setQueuePhaseActive, shouldBlockContextWrite, } 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,21 +57,14 @@ 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, isInsideWorktree } from "./repo-identity.js";
+import { externalGsdRoot } 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,13 +27,6 @@ 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/model-cost-table.js

@@ -20,27 +20,9 @@ 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" },