gsd-pi 2.73.0 → 2.73.1-dev.d987996

package/dist/cli.js

@@ -6,7 +6,6 @@ import { initResources, buildResourceLoader, getNewerManagedResourceVersion } fr
 import { ensureManagedTools } from './tool-bootstrap.js';
 import { loadStoredEnvKeys } from './wizard.js';
 import { migratePiCredentials, getPiDefaultModelAndProvider } from './pi-migration.js';
-import { shouldMigrateAnthropicToClaudeCode } from './provider-migrations.js';
 import { shouldRunOnboarding, runOnboarding } from './onboarding.js';
 import chalk from 'chalk';
 import { checkForUpdates } from './update-check.js';
@@ -455,29 +454,6 @@ if (isPrintMode) {
         isClaudeCodeReady: () => modelRegistry.isProviderRequestReady('claude-code'),
     });
     markStartup('createAgentSession');
-    // Migrate anthropic OAuth users to claude-code provider when CLI is available (#3772).
-    // Anthropic blocks third-party apps from using subscription quotas — routing through
-    // the local claude CLI binary is TOS-compliant.
-    if (shouldMigrateAnthropicToClaudeCode({
-        authStorage,
-        isClaudeCodeReady: modelRegistry.isProviderRequestReady('claude-code'),
-        defaultProvider: settingsManager.getDefaultProvider(),
-    })) {
-        const currentModelId = settingsManager.getDefaultModel();
-        if (currentModelId) {
-            const ccModel = modelRegistry.find('claude-code', currentModelId);
-            if (ccModel) {
-                try {
-                    await session.setModel(ccModel);
-                    // Only persist after successful session switch to avoid desync
-                    settingsManager.setDefaultModelAndProvider('claude-code', currentModelId);
-                }
-                catch {
-                    // claude-code provider not ready — leave both session and settings unchanged
-                }
-            }
-        }
-    }
     // Validate configured model AFTER extensions have registered their models (#2626).
     // Before this, extension-provided models (e.g. claude-code/*) were not yet in the
     // registry, causing the user's valid choice to be silently overwritten.
@@ -647,29 +623,6 @@ const { session, extensionsResult, modelFallbackMessage: interactiveFallbackMsg
     isClaudeCodeReady: () => modelRegistry.isProviderRequestReady('claude-code'),
 });
 markStartup('createAgentSession');
-// Migrate anthropic OAuth users to claude-code provider when CLI is available (#3772).
-// Anthropic blocks third-party apps from using subscription quotas — routing through
-// the local claude CLI binary is TOS-compliant.
-if (shouldMigrateAnthropicToClaudeCode({
-    authStorage,
-    isClaudeCodeReady: modelRegistry.isProviderRequestReady('claude-code'),
-    defaultProvider: settingsManager.getDefaultProvider(),
-})) {
-    const currentModelId = settingsManager.getDefaultModel();
-    if (currentModelId) {
-        const ccModel = modelRegistry.find('claude-code', currentModelId);
-        if (ccModel) {
-            try {
-                await session.setModel(ccModel);
-                // Only persist after successful session switch to avoid desync
-                settingsManager.setDefaultModelAndProvider('claude-code', currentModelId);
-            }
-            catch {
-                // claude-code provider not ready — leave both session and settings unchanged
-            }
-        }
-    }
-}
 // Validate configured model AFTER extensions have registered their models (#2626).
 // Before this, extension-provided models (e.g. claude-code/*) were not yet in the
 // registry, causing the user's valid choice to be silently overwritten.

package/dist/help-text.js

@@ -148,7 +148,7 @@ export function printHelp(version) {
     process.stdout.write('  --print, -p              Single-shot print mode\n');
     process.stdout.write('  --continue, -c           Resume the most recent session\n');
     process.stdout.write('  --worktree, -w [name]    Start in an isolated worktree (auto-named if omitted)\n');
-    process.stdout.write('  --model <id>             Override model (e.g. claude-opus-4-6)\n');
+    process.stdout.write('  --model <id>             Override model (e.g. provider/model-id)\n');
     process.stdout.write('  --no-session             Disable session persistence\n');
     process.stdout.write('  --extension <path>       Load additional extension\n');
     process.stdout.write('  --tools <a,b,c>          Restrict available tools\n');

package/dist/resources/extensions/gsd/auto-dispatch.js

@@ -18,6 +18,7 @@ import { logWarning, logError } from "./workflow-logger.js";
 import { join } from "node:path";
 import { hasImplementationArtifacts } from "./auto-recovery.js";
 import { buildDiscussMilestonePrompt, buildResearchMilestonePrompt, buildPlanMilestonePrompt, buildResearchSlicePrompt, buildPlanSlicePrompt, buildExecuteTaskPrompt, buildCompleteSlicePrompt, buildCompleteMilestonePrompt, buildValidateMilestonePrompt, buildReplanSlicePrompt, buildRunUatPrompt, buildReassessRoadmapPrompt, buildRewriteDocsPrompt, buildReactiveExecutePrompt, buildGateEvaluatePrompt, buildParallelResearchSlicesPrompt, checkNeedsReassessment, checkNeedsRunUat, } from "./auto-prompts.js";
+import { resolveModelWithFallbacksForUnit } from "./preferences-models.js";
 function missingSliceStop(mid, phase) {
     return {
         action: "stop",
@@ -330,7 +331,7 @@ export const DISPATCH_RULES = [
                 action: "dispatch",
                 unitType: "research-slice",
                 unitId: `${mid}/parallel-research`,
-                prompt: await buildParallelResearchSlicesPrompt(mid, midTitle, researchReadySlices, basePath),
+                prompt: await buildParallelResearchSlicesPrompt(mid, midTitle, researchReadySlices, basePath, resolveModelWithFallbacksForUnit("subagent")?.primary),
             };
         },
     },
@@ -401,7 +402,7 @@ export const DISPATCH_RULES = [
                 action: "dispatch",
                 unitType: "gate-evaluate",
                 unitId: `${mid}/${sid}/gates+${pending.map(g => g.gate_id).join(",")}`,
-                prompt: await buildGateEvaluatePrompt(mid, midTitle, sid, sTitle, basePath),
+                prompt: await buildGateEvaluatePrompt(mid, midTitle, sid, sTitle, basePath, resolveModelWithFallbacksForUnit("subagent")?.primary),
             };
         },
     },
@@ -436,6 +437,7 @@ export const DISPATCH_RULES = [
             const sid = state.activeSlice.id;
             const sTitle = state.activeSlice.title;
             const maxParallel = reactiveConfig.max_parallel ?? 2;
+            const subagentModel = reactiveConfig.subagent_model ?? resolveModelWithFallbacksForUnit("subagent")?.primary;
             // Dry-run mode: max_parallel=1 means graph is derived and logged but
             // execution remains sequential
             if (maxParallel <= 1)
@@ -478,7 +480,7 @@ export const DISPATCH_RULES = [
                     action: "dispatch",
                     unitType: "reactive-execute",
                     unitId: `${mid}/${sid}/reactive+${batchSuffix}`,
-                    prompt: await buildReactiveExecutePrompt(mid, midTitle, sid, sTitle, selected, basePath),
+                    prompt: await buildReactiveExecutePrompt(mid, midTitle, sid, sTitle, selected, basePath, subagentModel),
                 };
             }
             catch (err) {

package/dist/resources/extensions/gsd/auto-prompts.js

@@ -1712,7 +1712,7 @@ export async function buildReassessRoadmapPrompt(mid, midTitle, completedSliceId
     });
 }
 // ─── Reactive Execute Prompt ──────────────────────────────────────────────
-export async function buildReactiveExecutePrompt(mid, midTitle, sid, sTitle, readyTaskIds, base) {
+export async function buildReactiveExecutePrompt(mid, midTitle, sid, sTitle, readyTaskIds, base, subagentModel) {
     const { loadSliceTaskIO, deriveTaskGraph, graphMetrics } = await import("./reactive-graph.js");
     // Build graph for context
     const taskIO = await loadSliceTaskIO(base, mid, sid);
@@ -1744,10 +1744,11 @@ export async function buildReactiveExecutePrompt(mid, midTitle, sid, sTitle, rea
         const depPaths = await getDependencyTaskSummaryPaths(mid, sid, tid, node?.dependsOn ?? [], base);
         // Build a full execute-task prompt with dependency-based carry-forward
         const taskPrompt = await buildExecuteTaskPrompt(mid, sid, sTitle, tid, tTitle, base, { carryForwardPaths: depPaths });
+        const modelSuffix = subagentModel ? ` with model: "${subagentModel}"` : "";
         subagentSections.push([
             `### ${tid}: ${tTitle}`,
             "",
-            "Use this as the prompt for a `subagent` call:",
+            `Use this as the prompt for a \`subagent\` call${modelSuffix}:`,
             "",
             "```",
             taskPrompt,
@@ -1806,15 +1807,16 @@ function renderGatesToCloseBlock(gates, opts) {
     }
     return lines.join("\n").trimEnd();
 }
-export async function buildParallelResearchSlicesPrompt(mid, midTitle, slices, basePath) {
+export async function buildParallelResearchSlicesPrompt(mid, midTitle, slices, basePath, subagentModel) {
     // Build individual research-slice prompts for each slice
     const subagentSections = [];
+    const modelSuffix = subagentModel ? ` with model: "${subagentModel}"` : "";
     for (const slice of slices) {
         const slicePrompt = await buildResearchSlicePrompt(mid, midTitle, slice.id, slice.title, basePath);
         subagentSections.push([
             `### ${slice.id}: ${slice.title}`,
             "",
-            "Use this as the prompt for a `subagent` call (agent: `gsd-executor` or the default agent):",
+            `Use this as the prompt for a \`subagent\` call${modelSuffix} (agent: \`gsd-executor\` or the default agent):`,
             "",
             "```",
             slicePrompt,
@@ -1829,7 +1831,7 @@ export async function buildParallelResearchSlicesPrompt(mid, midTitle, slices, b
         subagentPrompts: subagentSections.join("\n\n---\n\n"),
     });
 }
-export async function buildGateEvaluatePrompt(mid, midTitle, sid, sTitle, base) {
+export async function buildGateEvaluatePrompt(mid, midTitle, sid, sTitle, base, subagentModel) {
     // Pull only the gates this turn actually owns (Q3/Q4). Filter via the
     // registry so that scope:"slice" gates owned by other turns (Q8) can't
     // leak into this prompt and can't block dispatch via silent skip.
@@ -1873,10 +1875,11 @@ export async function buildGateEvaluatePrompt(mid, midTitle, sid, sTitle, base)
             "- `rationale`: one-sentence justification",
             "- `findings`: detailed markdown findings (or empty if omitted)",
         ].join("\n");
+        const modelSuffix = subagentModel ? ` with model: "${subagentModel}"` : "";
         subagentSections.push([
             `### ${def.id}: ${def.question}`,
             "",
-            "Use this as the prompt for a `subagent` call:",
+            `Use this as the prompt for a \`subagent\` call${modelSuffix}:`,
             "",
             "```",
             subPrompt,

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

@@ -19,7 +19,7 @@ import { gsdRoot, resolveMilestoneFile, resolveMilestonePath, resolveDir, milest
 import { invalidateAllCaches } from "./cache.js";
 import { clearActivityLogState } from "./activity-log.js";
 import { synthesizeCrashRecovery, getDeepDiagnostic, readActiveMilestoneId, } from "./session-forensics.js";
-import { writeLock, clearLock, readCrashLock, isLockProcessAlive, formatCrashInfo, } from "./crash-recovery.js";
+import { writeLock, clearLock, readCrashLock, isLockProcessAlive, formatCrashInfo, emitCrashRecoveredUnitEnd, } from "./crash-recovery.js";
 import { acquireSessionLock, getSessionLockStatus, releaseSessionLock, updateSessionLock, } from "./session-lock.js";
 import { resolveAutoSupervisorConfig, loadEffectiveGSDPreferences, getIsolationMode, } from "./preferences.js";
 import { sendDesktopNotification } from "./notifications.js";
@@ -1014,6 +1014,10 @@ export async function startAuto(ctx, pi, base, verboseMode, options) {
         s.stepMode = requestedStepMode;
     }
     if (freshStartAssessment.lock) {
+        // Emit a synthetic unit-end for any unit-start that has no closing event.
+        // This closes the journal gap reported in #3348 where the worker wrote side
+        // effects (SUMMARY.md, DB updates) but died before emitting unit-end.
+        emitCrashRecoveredUnitEnd(base, freshStartAssessment.lock);
         clearLock(base);
     }
     if (!s.paused) {

package/dist/resources/extensions/gsd/bootstrap/crash-log.js

@@ -0,0 +1,31 @@
+/**
+ * crash-log.ts — Write crash diagnostics to ~/.gsd/crash/<timestamp>.log
+ *
+ * Zero cross-dependencies: only uses Node.js built-ins so it can be imported
+ * safely from uncaughtException / unhandledRejection handlers and from tests
+ * without pulling in the full extension dependency tree.
+ */
+import { appendFileSync, mkdirSync } from "node:fs";
+import { homedir } from "node:os";
+import { join } from "node:path";
+/**
+ * Write a crash log to ~/.gsd/crash/<timestamp>.log (or $GSD_HOME/crash/).
+ * Never throws — must be safe to call from any error handler.
+ */
+export function writeCrashLog(err, source) {
+    try {
+        const crashDir = join(process.env.GSD_HOME ?? join(homedir(), ".gsd"), "crash");
+        mkdirSync(crashDir, { recursive: true });
+        const ts = new Date().toISOString().replace(/[:.]/g, "-");
+        const logPath = join(crashDir, `${ts}.log`);
+        const lines = [
+            `[gsd] ${source}: ${err.message}`,
+            `timestamp: ${new Date().toISOString()}`,
+            `pid: ${process.pid}`,
+            err.stack ?? "(no stack trace available)",
+            "",
+        ];
+        appendFileSync(logPath, lines.join("\n"));
+    }
+    catch { /* never throw from crash handler */ }
+}

package/dist/resources/extensions/gsd/bootstrap/register-extension.js

@@ -8,6 +8,8 @@ import { registerJournalTools } from "./journal-tools.js";
 import { registerQueryTools } from "./query-tools.js";
 import { registerHooks } from "./register-hooks.js";
 import { registerShortcuts } from "./register-shortcuts.js";
+import { writeCrashLog } from "./crash-log.js";
+export { writeCrashLog } from "./crash-log.js";
 export function handleRecoverableExtensionProcessError(err) {
     if (err.code === "EPIPE") {
         process.exit(0);
@@ -28,17 +30,26 @@ export function handleRecoverableExtensionProcessError(err) {
 function installEpipeGuard() {
     if (!process.listeners("uncaughtException").some((listener) => listener.name === "_gsdEpipeGuard")) {
         const _gsdEpipeGuard = (err) => {
-            if (handleRecoverableExtensionProcessError(err)) {
+            if (handleRecoverableExtensionProcessError(err))
                 return;
-            }
-            // Log unhandled errors instead of re-throwing — throwing inside an
-            // uncaughtException handler is a fatal double-fault in Node.js (#3163).
-            process.stderr.write(`[gsd] uncaught extension error (non-fatal): ${err.message}\n`);
-            if (err.stack)
-                process.stderr.write(`${err.stack}\n`);
+            // Write crash log and exit cleanly for unrecoverable errors.
+            // Logging and continuing was the original double-fault fix (#3163), but
+            // continuing in an indeterminate state is worse than a clean exit (#3348).
+            writeCrashLog(err, "uncaughtException");
+            process.exit(1);
         };
         process.on("uncaughtException", _gsdEpipeGuard);
     }
+    if (!process.listeners("unhandledRejection").some((listener) => listener.name === "_gsdRejectionGuard")) {
+        const _gsdRejectionGuard = (reason, _promise) => {
+            const err = reason instanceof Error ? reason : new Error(String(reason));
+            if (handleRecoverableExtensionProcessError(err))
+                return;
+            writeCrashLog(err, "unhandledRejection");
+            process.exit(1);
+        };
+        process.on("unhandledRejection", _gsdRejectionGuard);
+    }
 }
 export function registerGsdExtension(pi) {
     registerGSDCommand(pi);

package/dist/resources/extensions/gsd/bootstrap/system-context.js

@@ -6,6 +6,7 @@ import { debugTime } from "../debug-logger.js";
 import { loadPrompt, getTemplatesDir } from "../prompt-loader.js";
 import { readForensicsMarker } from "../forensics.js";
 import { resolveAllSkillReferences, renderPreferencesForSystemPrompt, loadEffectiveGSDPreferences } from "../preferences.js";
+import { resolveModelWithFallbacksForUnit } from "../preferences-models.js";
 import { resolveSkillReference } from "../preferences-skills.js";
 import { resolveGsdRootFile, resolveSliceFile, resolveSlicePath, resolveTaskFile, resolveTaskFiles, resolveTasksDir, relSliceFile, relSlicePath, relTaskFile } from "../paths.js";
 import { ensureCodebaseMapFresh, readCodebaseMap } from "../codebase-generator.js";
@@ -147,7 +148,11 @@ export async function buildBeforeAgentStartResult(event, ctx) {
     // Re-inject forensics context on follow-up turns (#2941)
     const forensicsInjection = !injection ? buildForensicsContextInjection(process.cwd(), event.prompt) : null;
     const worktreeBlock = buildWorktreeContextBlock();
-    const fullSystem = `${event.systemPrompt}\n\n[SYSTEM CONTEXT — GSD]\n\n${systemContent}${preferenceBlock}${knowledgeBlock}${codebaseBlock}${memoryBlock}${newSkillsBlock}${worktreeBlock}`;
+    const subagentModelConfig = resolveModelWithFallbacksForUnit("subagent");
+    const subagentModelBlock = subagentModelConfig
+        ? `\n\n## Subagent Model\n\nWhen spawning subagents via the \`subagent\` tool, always pass \`model: "${subagentModelConfig.primary}"\` in the tool call parameters. Never omit this — always specify it explicitly.`
+        : "";
+    const fullSystem = `${event.systemPrompt}\n\n[SYSTEM CONTEXT — GSD]\n\n${systemContent}${preferenceBlock}${knowledgeBlock}${codebaseBlock}${memoryBlock}${newSkillsBlock}${worktreeBlock}${subagentModelBlock}`;
     stopContextTimer({
         systemPromptSize: fullSystem.length,
         injectionSize: injection?.length ?? forensicsInjection?.length ?? 0,

package/dist/resources/extensions/gsd/crash-recovery.js

@@ -14,6 +14,7 @@ import { join } from "node:path";
 import { gsdRoot } from "./paths.js";
 import { atomicWriteSync } from "./atomic-write.js";
 import { effectiveLockFile } from "./session-lock.js";
+import { emitJournalEvent, queryJournal } from "./journal.js";
 function lockPath(basePath) {
     return join(gsdRoot(basePath), effectiveLockFile());
 }
@@ -110,3 +111,53 @@ export function formatCrashInfo(lock) {
     }
     return lines.join("\n");
 }
+/**
+ * Emit a synthetic unit-end event for a unit that crashed without emitting its own.
+ *
+ * Queries the journal to find the most recent unit-start for the crashed unit.
+ * If a matching unit-end already exists (e.g. the hard timeout fired), this is a
+ * no-op. Called during crash recovery, before clearing the stale lock.
+ *
+ * Addresses the gap reported in #3348 where `unit-start` was emitted but no
+ * `unit-end` followed — side effects landed but the worker died before closeout.
+ */
+export function emitCrashRecoveredUnitEnd(basePath, lock) {
+    // Skip bootstrap / starting pseudo-units — they have no meaningful unit-start event.
+    if (!lock.unitType || !lock.unitId || lock.unitType === "starting")
+        return;
+    try {
+        const all = queryJournal(basePath);
+        // Find the most recent unit-start for this unitId
+        const starts = all.filter((e) => e.eventType === "unit-start" && e.data?.unitId === lock.unitId);
+        if (starts.length === 0)
+            return;
+        const lastStart = starts[starts.length - 1];
+        // Check if a unit-end was already emitted (e.g. hard timeout fired after the crash)
+        const alreadyClosed = all.some((e) => e.eventType === "unit-end" &&
+            e.data?.unitId === lock.unitId &&
+            e.causedBy?.flowId === lastStart.flowId &&
+            e.causedBy?.seq === lastStart.seq);
+        if (alreadyClosed)
+            return;
+        // Find the highest seq in this flow for monotonic ordering
+        const maxSeq = all
+            .filter((e) => e.flowId === lastStart.flowId)
+            .reduce((max, e) => Math.max(max, e.seq), lastStart.seq);
+        emitJournalEvent(basePath, {
+            ts: new Date().toISOString(),
+            flowId: lastStart.flowId,
+            seq: maxSeq + 1,
+            eventType: "unit-end",
+            data: {
+                unitType: lock.unitType,
+                unitId: lock.unitId,
+                status: "crash-recovered",
+                artifactVerified: false,
+            },
+            causedBy: { flowId: lastStart.flowId, seq: lastStart.seq },
+        });
+    }
+    catch {
+        // Never throw from crash recovery path — journal failure must not block recovery
+    }
+}

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

@@ -1352,6 +1352,25 @@ export function setSliceSummaryMd(milestoneId, sliceId, summaryMd, uatMd) {
         throw new GSDError(GSD_STALE_STATE, "gsd-db: No database open");
     currentDb.prepare(`UPDATE slices SET full_summary_md = :summary_md, full_uat_md = :uat_md WHERE milestone_id = :mid AND id = :sid`).run({ ":mid": milestoneId, ":sid": sliceId, ":summary_md": summaryMd, ":uat_md": uatMd });
 }
+function parseTaskArrayColumn(raw) {
+    if (typeof raw !== "string" || raw.trim() === "")
+        return [];
+    try {
+        const parsed = JSON.parse(raw);
+        if (Array.isArray(parsed))
+            return parsed.map((value) => String(value));
+        if (parsed === null || parsed === undefined || parsed === "")
+            return [];
+        return [String(parsed)];
+    }
+    catch {
+        // Older/corrupt rows may contain comma-separated strings instead of JSON.
+        return raw
+            .split(",")
+            .map((value) => value.trim())
+            .filter(Boolean);
+    }
+}
 function rowToTask(row) {
     const parseTaskArray = (value) => {
         if (Array.isArray(value)) {
@@ -1390,8 +1409,8 @@ function rowToTask(row) {
         blocker_discovered: row["blocker_discovered"] === 1,
         deviations: row["deviations"],
         known_issues: row["known_issues"],
-        key_files: JSON.parse(row["key_files"] || "[]"),
-        key_decisions: JSON.parse(row["key_decisions"] || "[]"),
+        key_files: parseTaskArrayColumn(row["key_files"]),
+        key_decisions: parseTaskArrayColumn(row["key_decisions"]),
         full_summary_md: row["full_summary_md"],
         description: row["description"] ?? "",
         estimate: row["estimate"] ?? "",
@@ -1855,6 +1874,21 @@ export function deleteSlice(milestoneId, sliceId) {
         currentDb.prepare(`DELETE FROM slices WHERE milestone_id = :mid AND id = :sid`).run({ ":mid": milestoneId, ":sid": sliceId });
     });
 }
+export function deleteMilestone(milestoneId) {
+    if (!currentDb)
+        throw new GSDError(GSD_STALE_STATE, "gsd-db: No database open");
+    transaction(() => {
+        currentDb.prepare(`DELETE FROM verification_evidence WHERE milestone_id = :mid`).run({ ":mid": milestoneId });
+        currentDb.prepare(`DELETE FROM quality_gates WHERE milestone_id = :mid`).run({ ":mid": milestoneId });
+        currentDb.prepare(`DELETE FROM tasks WHERE milestone_id = :mid`).run({ ":mid": milestoneId });
+        currentDb.prepare(`DELETE FROM slice_dependencies WHERE milestone_id = :mid`).run({ ":mid": milestoneId });
+        currentDb.prepare(`DELETE FROM slices WHERE milestone_id = :mid`).run({ ":mid": milestoneId });
+        currentDb.prepare(`DELETE FROM replan_history WHERE milestone_id = :mid`).run({ ":mid": milestoneId });
+        currentDb.prepare(`DELETE FROM assessments WHERE milestone_id = :mid`).run({ ":mid": milestoneId });
+        currentDb.prepare(`DELETE FROM artifacts WHERE milestone_id = :mid`).run({ ":mid": milestoneId });
+        currentDb.prepare(`DELETE FROM milestones WHERE id = :mid`).run({ ":mid": milestoneId });
+    });
+}
 export function updateSliceFields(milestoneId, sliceId, fields) {
     if (!currentDb)
         throw new GSDError(GSD_STALE_STATE, "gsd-db: No database open");

package/dist/resources/extensions/gsd/milestone-actions.js

@@ -15,7 +15,8 @@ import { join } from "node:path";
 import { resolveMilestonePath, resolveMilestoneFile, buildMilestoneFileName, } from "./paths.js";
 import { invalidateAllCaches } from "./cache.js";
 import { loadQueueOrder, saveQueueOrder } from "./queue-order.js";
-import { getMilestone, isDbAvailable, updateMilestoneStatus } from "./gsd-db.js";
+import { deleteMilestone, getMilestone, isDbAvailable, updateMilestoneStatus } from "./gsd-db.js";
+import { removeWorktree } from "./worktree-manager.js";
 import { logWarning } from "./workflow-logger.js";
 // ─── Park ──────────────────────────────────────────────────────────────────
 /**
@@ -99,12 +100,29 @@ export function discardMilestone(basePath, milestoneId) {
     const mDir = resolveMilestonePath(basePath, milestoneId);
     if (!mDir || !existsSync(mDir))
         return false;
+    try {
+        removeWorktree(basePath, milestoneId, {
+            branch: `milestone/${milestoneId}`,
+            deleteBranch: true,
+        });
+    }
+    catch (err) {
+        logWarning("engine", `discardMilestone worktree cleanup failed for ${milestoneId}: ${err.message}`);
+    }
     rmSync(mDir, { recursive: true, force: true });
     // Prune from queue order if present
     const order = loadQueueOrder(basePath);
     if (order && order.includes(milestoneId)) {
         saveQueueOrder(basePath, order.filter(id => id !== milestoneId));
     }
+    if (isDbAvailable()) {
+        try {
+            deleteMilestone(milestoneId);
+        }
+        catch (err) {
+            logWarning("engine", `discardMilestone DB cleanup failed for ${milestoneId}: ${err.message}`);
+        }
+    }
     invalidateAllCaches();
     return true;
 }

package/dist/startup-model-validation.js

@@ -34,15 +34,18 @@ export function validateConfiguredModel(modelRegistry, settingsManager) {
     if (!configuredModel || !configuredExists) {
         // Model not configured at all, or removed from registry — pick a fallback.
         // Only fires when the model is genuinely unknown (not just temporarily unavailable).
+        //
+        // Model-agnostic selection order:
+        //   1. Pi migration default (preserves migration from ~/.pi install)
+        //   2. Any model from the user's previously-chosen provider (provider stickiness)
+        //   3. First available model in registry order (user-controlled via models.json)
         const piDefault = getPiDefaultModelAndProvider();
         const preferred = (piDefault
             ? availableModels.find((m) => m.provider === piDefault.provider && m.id === piDefault.model)
             : undefined) ||
-            availableModels.find((m) => m.provider === 'openai' && m.id === 'gpt-5.4') ||
-            availableModels.find((m) => m.provider === 'openai') ||
-            availableModels.find((m) => m.provider === 'anthropic' && m.id === 'claude-opus-4-6') ||
-            availableModels.find((m) => m.provider === 'anthropic' && m.id.includes('opus')) ||
-            availableModels.find((m) => m.provider === 'anthropic') ||
+            (configuredProvider
+                ? availableModels.find((m) => m.provider === configuredProvider)
+                : undefined) ||
             availableModels[0];
         if (preferred) {
             settingsManager.setDefaultModelAndProvider(preferred.provider, preferred.id);

package/dist/web/standalone/.next/BUILD_ID

@@ -1 +1 @@
-KSZ2dcC3p4z6lOmUpPpzr
+cGmbVq2su4f9tMpgIkG8u

package/dist/web/standalone/.next/app-path-routes-manifest.json

@@ -1,44 +1,44 @@
 {
   "/_not-found/page": "/_not-found",
   "/_global-error/page": "/_global-error",
-  "/api/bridge-terminal/resize/route": "/api/bridge-terminal/resize",
   "/api/bridge-terminal/input/route": "/api/bridge-terminal/input",
   "/api/boot/route": "/api/boot",
+  "/api/bridge-terminal/resize/route": "/api/bridge-terminal/resize",
   "/api/bridge-terminal/stream/route": "/api/bridge-terminal/stream",
   "/api/dev-mode/route": "/api/dev-mode",
   "/api/cleanup/route": "/api/cleanup",
   "/api/doctor/route": "/api/doctor",
-  "/api/captures/route": "/api/captures",
   "/api/export-data/route": "/api/export-data",
-  "/api/forensics/route": "/api/forensics",
   "/api/browse-directories/route": "/api/browse-directories",
+  "/api/captures/route": "/api/captures",
+  "/api/forensics/route": "/api/forensics",
   "/api/git/route": "/api/git",
-  "/api/hooks/route": "/api/hooks",
   "/api/history/route": "/api/history",
+  "/api/hooks/route": "/api/hooks",
   "/api/inspect/route": "/api/inspect",
   "/api/knowledge/route": "/api/knowledge",
-  "/api/notifications/route": "/api/notifications",
+  "/api/experimental/route": "/api/experimental",
   "/api/live-state/route": "/api/live-state",
+  "/api/notifications/route": "/api/notifications",
   "/api/preferences/route": "/api/preferences",
-  "/api/experimental/route": "/api/experimental",
-  "/api/onboarding/route": "/api/onboarding",
   "/api/recovery/route": "/api/recovery",
+  "/api/onboarding/route": "/api/onboarding",
   "/api/projects/route": "/api/projects",
   "/api/session/browser/route": "/api/session/browser",
   "/api/session/command/route": "/api/session/command",
+  "/api/session/events/route": "/api/session/events",
   "/api/session/manage/route": "/api/session/manage",
   "/api/settings-data/route": "/api/settings-data",
-  "/api/session/events/route": "/api/session/events",
   "/api/shutdown/route": "/api/shutdown",
   "/api/skill-health/route": "/api/skill-health",
   "/api/steer/route": "/api/steer",
-  "/api/files/route": "/api/files",
   "/api/terminal/input/route": "/api/terminal/input",
   "/api/terminal/resize/route": "/api/terminal/resize",
-  "/api/terminal/sessions/route": "/api/terminal/sessions",
+  "/api/files/route": "/api/files",
   "/api/switch-root/route": "/api/switch-root",
-  "/api/terminal/stream/route": "/api/terminal/stream",
+  "/api/terminal/sessions/route": "/api/terminal/sessions",
   "/api/terminal/upload/route": "/api/terminal/upload",
+  "/api/terminal/stream/route": "/api/terminal/stream",
   "/api/visualizer/route": "/api/visualizer",
   "/api/undo/route": "/api/undo",
   "/api/update/route": "/api/update",

package/dist/web/standalone/.next/build-manifest.json

@@ -4,14 +4,14 @@
   ],
   "devFiles": [],
   "lowPriorityFiles": [
-    "static/KSZ2dcC3p4z6lOmUpPpzr/_buildManifest.js",
-    "static/KSZ2dcC3p4z6lOmUpPpzr/_ssgManifest.js"
+    "static/cGmbVq2su4f9tMpgIkG8u/_buildManifest.js",
+    "static/cGmbVq2su4f9tMpgIkG8u/_ssgManifest.js"
   ],
   "rootMainFiles": [
     "static/chunks/webpack-b868033a5834586d.js",
     "static/chunks/4bd1b696-e356ca5ba0218e27.js",
     "static/chunks/3794-42fdce068d44fa4f.js",
-    "static/chunks/main-app-d3d4c336195465f9.js"
+    "static/chunks/main-app-fdab67f7802d7832.js"
   ],
   "rootMainFilesTree": {},
   "pages": {

package/dist/web/standalone/.next/prerender-manifest.json

@@ -78,8 +78,8 @@
   "dynamicRoutes": {},
   "notFoundRoutes": [],
   "preview": {
-    "previewModeId": "a5b55541bc3e0fa2f07c4087828bfdb9",
-    "previewModeSigningKey": "1d263a5202d738e962bd891f42fec4583353ecdb77162ca3b09f7da49aa38e9c",
-    "previewModeEncryptionKey": "82afb9b7e120d168495c89adfe9fcfe9feb930812ef95d0fe02a2f0d3c075948"
+    "previewModeId": "17f5d57cb01dfbb2206069fd8f426e90",
+    "previewModeSigningKey": "4d7c58c0c991aa3523143e4ea3d4c0ff316057413ab7d8fe3a226758b7a4e635",
+    "previewModeEncryptionKey": "0b5fb58eaf785e54b64512118db11f3096a2a9eda097e442828f917e80028bfc"
   }
 }

package/dist/web/standalone/.next/required-server-files.json

@@ -104,7 +104,7 @@
         "transform": "lodash/{{member}}"
       }
     },
-    "outputFileTracingRoot": "/home/runner/_work/gsd-2/gsd-2",
+    "outputFileTracingRoot": "/__w/gsd-2/gsd-2",
     "cacheComponents": false,
     "cacheLife": {
       "default": {
@@ -308,11 +308,11 @@
       "node-pty"
     ],
     "turbopack": {
-      "root": "/home/runner/_work/gsd-2/gsd-2"
+      "root": "/__w/gsd-2/gsd-2"
     },
     "distDirRoot": ".next"
   },
-  "appDir": "/home/runner/_work/gsd-2/gsd-2/web",
+  "appDir": "/__w/gsd-2/gsd-2/web",
   "relativeAppDir": "web",
   "files": [
     ".next/routes-manifest.json",