gsd-pi 2.73.1-dev.d987996 → 2.74.0-dev.0306a2e

package/dist/resources/extensions/gsd/auto-post-unit.js

@@ -19,7 +19,7 @@ import { invalidateAllCaches } from "./cache.js";
 import { rebuildState } from "./doctor.js";
 import { parseUnitId } from "./unit-id.js";
 import { closeoutUnit } from "./auto-unit-closeout.js";
-import { autoCommitCurrentBranch, } from "./worktree.js";
+import { runTurnGitAction, } from "./git-service.js";
 import { verifyExpectedArtifact, resolveExpectedArtifactPath, writeBlockerPlaceholder, diagnoseExpectedArtifact, } from "./auto-recovery.js";
 import { regenerateIfMissing } from "./workflow-projections.js";
 import { syncStateToProjectRoot } from "./auto-worktree.js";
@@ -42,6 +42,9 @@ import { getSliceTasks } from "./gsd-db.js";
 import { runPreExecutionChecks } from "./pre-execution-checks.js";
 import { writePreExecutionEvidence } from "./verification-evidence.js";
 import { ensureCodebaseMapFresh } from "./codebase-generator.js";
+import { resolveUokFlags } from "./uok/flags.js";
+import { UokGateRunner } from "./uok/gate-runner.js";
+import { writeTurnGitTransaction } from "./uok/gitops.js";
 /** Maximum verification retry attempts before escalating to blocker placeholder (#2653). */
 const MAX_VERIFICATION_RETRIES = 3;
 /** Enqueue a sidecar item (hook, triage, or quick-task) for the main loop to
@@ -67,9 +70,11 @@ const LIFECYCLE_ONLY_UNITS = new Set([
     "replan-slice", "complete-slice", "run-uat",
     "reassess-roadmap", "rewrite-docs",
 ]);
+import { describeNextUnit, } from "./auto-dashboard.js";
 import { existsSync, unlinkSync } from "node:fs";
 import { join } from "node:path";
 import { _resetHasChangesCache } from "./native-git-bridge.js";
+import { autoCommitCurrentBranch } from "./worktree.js";
 /**
  * Detect summary files written directly to disk without the LLM calling
  * the completion tool. A "rogue" file is one that exists on disk but has
@@ -179,6 +184,66 @@ export function detectRogueFileWrites(unitType, unitId, basePath) {
     }
     return rogues;
 }
+export const STEP_COMPLETE_FALLBACK_MESSAGE = "Step complete. Run /clear, then /gsd to continue (or /gsd auto to run continuously).";
+export function buildStepCompleteMessage(nextState) {
+    if (nextState.phase === "complete") {
+        return "Step complete — milestone finished. Run /gsd status to review, or start the next milestone.";
+    }
+    const next = describeNextUnit(nextState);
+    return `Step complete. Next: ${next.label}\n`
+        + `Run /clear, then /gsd to continue (or /gsd auto to run continuously).`;
+}
+export async function autoCommitUnit(basePath, unitType, unitId, ctx) {
+    try {
+        let taskContext;
+        if (unitType === "execute-task") {
+            const { milestone: mid, slice: sid, task: tid } = parseUnitId(unitId);
+            if (mid && sid && tid) {
+                const summaryPath = resolveTaskFile(basePath, mid, sid, tid, "SUMMARY");
+                if (summaryPath) {
+                    try {
+                        const summaryContent = await loadFile(summaryPath);
+                        if (summaryContent) {
+                            const summary = parseSummary(summaryContent);
+                            let ghIssueNumber;
+                            try {
+                                const { getTaskIssueNumberForCommit } = await import("../github-sync/sync.js");
+                                ghIssueNumber = getTaskIssueNumberForCommit(basePath, mid, sid, tid) ?? undefined;
+                            }
+                            catch (err) {
+                                logWarning("engine", `GitHub issue lookup failed: ${err instanceof Error ? err.message : String(err)}`);
+                            }
+                            taskContext = {
+                                taskId: `${sid}/${tid}`,
+                                taskTitle: summary.title?.replace(/^T\d+:\s*/, "") || tid,
+                                oneLiner: summary.oneLiner || undefined,
+                                keyFiles: summary.frontmatter.key_files?.filter(f => !f.includes("{{")) || undefined,
+                                issueNumber: ghIssueNumber,
+                            };
+                        }
+                    }
+                    catch (e) {
+                        debugLog("postUnit", { phase: "task-summary-parse", error: String(e) });
+                    }
+                }
+            }
+        }
+        _resetHasChangesCache();
+        if (LIFECYCLE_ONLY_UNITS.has(unitType)) {
+            return null;
+        }
+        const commitMsg = autoCommitCurrentBranch(basePath, unitType, unitId, taskContext);
+        if (commitMsg) {
+            ctx?.ui.notify(`Committed: ${commitMsg.split("\n")[0]}`, "info");
+        }
+        return commitMsg;
+    }
+    catch (e) {
+        debugLog("postUnit", { phase: "auto-commit", error: String(e) });
+        ctx?.ui.notify(`Auto-commit failed: ${String(e).split("\n")[0]}`, "warning");
+        return null;
+    }
+}
 /**
  * Pre-verification processing: parallel worker signal check, cache invalidation,
  * auto-commit, doctor run, state rebuild, worktree sync, artifact verification.
@@ -211,12 +276,19 @@ export async function postUnitPreVerification(pctx, opts) {
     if (!opts?.skipSettleDelay) {
         await new Promise(r => setTimeout(r, 100));
     }
-    // Auto-commit
+    const prefs = loadEffectiveGSDPreferences()?.preferences;
+    const uokFlags = resolveUokFlags(prefs);
+    // Turn-level git action (commit | snapshot | status-only)
     if (s.currentUnit) {
         const unit = s.currentUnit;
+        const turnAction = uokFlags.gitops ? uokFlags.gitopsTurnAction : "commit";
+        const traceId = s.currentTraceId ?? `turn:${unit.startedAt}`;
+        const turnId = s.currentTurnId ?? `${unit.type}/${unit.id}/${unit.startedAt}`;
+        s.lastGitActionFailure = null;
+        s.lastGitActionStatus = null;
         try {
             let taskContext;
-            if (s.currentUnit.type === "execute-task") {
+            if (turnAction === "commit" && s.currentUnit.type === "execute-task") {
                 const { milestone: mid, slice: sid, task: tid } = parseUnitId(s.currentUnit.id);
                 if (mid && sid && tid) {
                     const summaryPath = resolveTaskFile(s.basePath, mid, sid, tid, "SUMMARY");
@@ -256,19 +328,101 @@ export async function postUnitPreVerification(pctx, opts) {
             // code files only in the working tree where they are destroyed by
             // `git worktree remove --force` during teardown.
             _resetHasChangesCache();
-            // Skip auto-commit for lifecycle-only units (#2553) — they only touch
-            // `.gsd/` internal state files. Those files are picked up by the next
-            // actual task commit via smartStage().
-            if (!LIFECYCLE_ONLY_UNITS.has(s.currentUnit.type)) {
-                const commitMsg = autoCommitCurrentBranch(s.basePath, s.currentUnit.type, s.currentUnit.id, taskContext);
-                if (commitMsg) {
-                    ctx.ui.notify(`Committed: ${commitMsg.split("\n")[0]}`, "info");
+            const skipLifecycleCommit = turnAction === "commit" && LIFECYCLE_ONLY_UNITS.has(s.currentUnit.type);
+            if (skipLifecycleCommit) {
+                debugLog("postUnit", {
+                    phase: "git-action-skipped",
+                    reason: "lifecycle-only-unit",
+                    unitType: s.currentUnit.type,
+                    unitId: s.currentUnit.id,
+                });
+            }
+            else {
+                const gitResult = runTurnGitAction({
+                    basePath: s.basePath,
+                    action: turnAction,
+                    unitType: s.currentUnit.type,
+                    unitId: s.currentUnit.id,
+                    taskContext,
+                });
+                if (uokFlags.gitops) {
+                    writeTurnGitTransaction({
+                        basePath: s.basePath,
+                        traceId,
+                        turnId,
+                        unitType: unit.type,
+                        unitId: unit.id,
+                        stage: "publish",
+                        action: turnAction,
+                        push: uokFlags.gitopsTurnPush,
+                        status: gitResult.status,
+                        error: gitResult.error,
+                        metadata: {
+                            dirty: gitResult.dirty,
+                            commitMessage: gitResult.commitMessage,
+                            snapshotLabel: gitResult.snapshotLabel,
+                        },
+                    });
+                }
+                if (gitResult.status === "failed") {
+                    s.lastGitActionFailure = gitResult.error ?? `git ${turnAction} failed`;
+                    s.lastGitActionStatus = "failed";
+                    if (uokFlags.gitops && uokFlags.gates) {
+                        const parsed = parseUnitId(unit.id);
+                        const gateRunner = new UokGateRunner();
+                        gateRunner.register({
+                            id: "closeout-git-action",
+                            type: "closeout",
+                            execute: async () => ({
+                                outcome: "fail",
+                                failureClass: "git",
+                                rationale: `turn git action "${turnAction}" failed`,
+                                findings: gitResult.error ?? "unknown git failure",
+                            }),
+                        });
+                        await gateRunner.run("closeout-git-action", {
+                            basePath: s.basePath,
+                            traceId,
+                            turnId,
+                            milestoneId: parsed.milestone ?? undefined,
+                            sliceId: parsed.slice ?? undefined,
+                            taskId: parsed.task ?? undefined,
+                            unitType: unit.type,
+                            unitId: unit.id,
+                        });
+                    }
+                    const failureMsg = `Git ${turnAction} failed: ${(gitResult.error ?? "unknown error").split("\n")[0]}`;
+                    if (uokFlags.gitops) {
+                        ctx.ui.notify(failureMsg, "error");
+                        await pauseAuto(ctx, pi);
+                        return "dispatched";
+                    }
+                    ctx.ui.notify(failureMsg, "warning");
+                    debugLog("postUnit", {
+                        phase: "git-action-failed-nonblocking",
+                        action: turnAction,
+                        error: gitResult.error ?? "unknown error",
+                    });
+                }
+                s.lastGitActionStatus = "ok";
+                if (turnAction === "commit" && gitResult.commitMessage) {
+                    ctx.ui.notify(`Committed: ${gitResult.commitMessage.split("\n")[0]}`, "info");
+                }
+                else if (turnAction === "snapshot" && gitResult.snapshotLabel) {
+                    ctx.ui.notify(`Snapshot recorded: ${gitResult.snapshotLabel}`, "info");
                 }
             }
         }
         catch (e) {
-            debugLog("postUnit", { phase: "auto-commit", error: String(e) });
-            ctx.ui.notify(`Auto-commit failed: ${String(e).split("\n")[0]}`, "warning");
+            const message = e instanceof Error ? e.message : String(e);
+            s.lastGitActionFailure = message;
+            s.lastGitActionStatus = "failed";
+            debugLog("postUnit", { phase: "git-action", error: message, action: turnAction });
+            ctx.ui.notify(`Git ${turnAction} failed: ${message.split("\n")[0]}`, uokFlags.gitops ? "error" : "warning");
+            if (uokFlags.gitops) {
+                await pauseAuto(ctx, pi);
+                return "dispatched";
+            }
         }
         // GitHub sync (non-blocking, opt-in)
         await runSafely("postUnit", "github-sync", async () => {
@@ -509,6 +663,26 @@ export async function postUnitPreVerification(pctx, opts) {
                     const attempt = (s.verificationRetryCount.get(retryKey) ?? 0) + 1;
                     s.verificationRetryCount.set(retryKey, attempt);
                     if (attempt > MAX_VERIFICATION_RETRIES) {
+                        // #4175: For complete-milestone, a blocker placeholder is harmful —
+                        // the stub SUMMARY has no recovery value (milestone is terminal),
+                        // it does not update DB status (so deriveState never advances),
+                        // and it fools stopAuto's presence check into merging a milestone
+                        // that was never legitimately completed. Pause auto-mode with a
+                        // clear single failure signal and preserve the worktree branch.
+                        if (s.currentUnit.type === "complete-milestone") {
+                            debugLog("postUnit", {
+                                phase: "artifact-verify-pause-complete-milestone",
+                                unitType: s.currentUnit.type,
+                                unitId: s.currentUnit.id,
+                                attempt,
+                                maxRetries: MAX_VERIFICATION_RETRIES,
+                            });
+                            s.verificationRetryCount.delete(retryKey);
+                            s.pendingVerificationRetry = null;
+                            ctx.ui.notify(`Milestone ${s.currentUnit.id} verification failed after ${MAX_VERIFICATION_RETRIES} retries — worktree branch preserved. Re-run /gsd auto once blockers are resolved.`, "error");
+                            await pauseAuto(ctx, pi);
+                            return "dispatched";
+                        }
                         // Retries exhausted — write a blocker placeholder so the pipeline
                         // can advance past this stuck unit (#2653).
                         debugLog("postUnit", {
@@ -684,11 +858,13 @@ export async function postUnitPostVerification(pctx) {
     // ── Pre-execution checks (after plan-slice completes) ──
     if (s.currentUnit &&
         s.currentUnit.type === "plan-slice") {
+        const currentUnit = s.currentUnit;
         let preExecPauseNeeded = false;
         await runSafely("postUnitPostVerification", "pre-execution-checks", async () => {
+            const prefs = loadEffectiveGSDPreferences()?.preferences;
+            const uokFlags = resolveUokFlags(prefs);
             try {
                 // Check preferences — respect enhanced_verification and enhanced_verification_pre
-                const prefs = loadEffectiveGSDPreferences()?.preferences;
                 const enhancedEnabled = prefs?.enhanced_verification !== false; // default true
                 const preEnabled = prefs?.enhanced_verification_pre !== false; // default true
                 if (!enhancedEnabled || !preEnabled) {
@@ -700,7 +876,7 @@ export async function postUnitPostVerification(pctx) {
                     return;
                 }
                 // Parse the unit ID to get milestone/slice IDs
-                const { milestone: mid, slice: sid } = parseUnitId(s.currentUnit.id);
+                const { milestone: mid, slice: sid } = parseUnitId(currentUnit.id);
                 if (!mid || !sid) {
                     debugLog("postUnitPostVerification", {
                         phase: "pre-execution-checks",
@@ -719,6 +895,7 @@ export async function postUnitPostVerification(pctx) {
                     });
                     return;
                 }
+                const strictMode = prefs?.enhanced_verification_strict === true;
                 // Run pre-execution checks
                 const result = await runPreExecutionChecks(tasks, s.basePath);
                 // Log summary to stderr in existing verification output format
@@ -734,6 +911,35 @@ export async function postUnitPostVerification(pctx) {
                 if (slicePath) {
                     writePreExecutionEvidence(result, slicePath, mid, sid);
                 }
+                if (uokFlags.gates) {
+                    const failedChecks = result.checks
+                        .filter((check) => !check.passed)
+                        .map((check) => `[${check.category}] ${check.target}: ${check.message}`);
+                    const warnEscalated = result.status === "warn" && strictMode;
+                    const blockingFailure = result.status === "fail" || warnEscalated;
+                    const gateRunner = new UokGateRunner();
+                    gateRunner.register({
+                        id: "pre-execution-checks",
+                        type: "input",
+                        execute: async () => ({
+                            outcome: blockingFailure ? "fail" : "pass",
+                            failureClass: result.status === "fail" ? "input" : warnEscalated ? "policy" : "none",
+                            rationale: blockingFailure
+                                ? `pre-execution checks ${result.status}${warnEscalated ? " (strict)" : ""}`
+                                : "pre-execution checks passed",
+                            findings: failedChecks.join("\n"),
+                        }),
+                    });
+                    await gateRunner.run("pre-execution-checks", {
+                        basePath: s.basePath,
+                        traceId: `pre-execution:${currentUnit.id}`,
+                        turnId: currentUnit.id,
+                        milestoneId: mid,
+                        sliceId: sid,
+                        unitType: currentUnit.type,
+                        unitId: currentUnit.id,
+                    });
+                }
                 // Notify UI
                 if (result.status === "fail") {
                     const blockingCount = result.checks.filter(c => !c.passed && c.blocking).length;
@@ -764,6 +970,29 @@ export async function postUnitPostVerification(pctx) {
                 });
                 logError("engine", `gsd-pre-exec: Pre-execution checks threw an error: ${errorMessage}`);
                 ctx.ui.notify(`Pre-execution checks error: ${errorMessage} — pausing for human review`, "error");
+                if (uokFlags.gates && s.currentUnit) {
+                    const { milestone: mid, slice: sid } = parseUnitId(s.currentUnit.id);
+                    const gateRunner = new UokGateRunner();
+                    gateRunner.register({
+                        id: "pre-execution-checks",
+                        type: "input",
+                        execute: async () => ({
+                            outcome: "manual-attention",
+                            failureClass: "manual-attention",
+                            rationale: "pre-execution checks threw before completion",
+                            findings: errorMessage,
+                        }),
+                    });
+                    await gateRunner.run("pre-execution-checks", {
+                        basePath: s.basePath,
+                        traceId: `pre-execution:${s.currentUnit.id}`,
+                        turnId: s.currentUnit.id,
+                        milestoneId: mid ?? undefined,
+                        sliceId: sid ?? undefined,
+                        unitType: s.currentUnit.type,
+                        unitId: s.currentUnit.id,
+                    });
+                }
                 preExecPauseNeeded = true;
             }
         });
@@ -836,8 +1065,18 @@ export async function postUnitPostVerification(pctx) {
             debugLog("postUnit", { phase: "quick-task-dispatch", error: String(e) });
         }
     }
-    // Step mode → show wizard instead of dispatch
+    // Step mode → show wizard instead of dispatch.
+    // Without this notify(), /gsd in step mode finishes a unit and silently
+    // exits the loop, leaving the user with no hint to /clear and /gsd again.
     if (s.stepMode) {
+        try {
+            const nextState = await deriveState(s.basePath);
+            ctx.ui.notify(buildStepCompleteMessage(nextState), "info");
+        }
+        catch (e) {
+            debugLog("postUnit", { phase: "step-wizard-notify", error: String(e) });
+            ctx.ui.notify(STEP_COMPLETE_FALLBACK_MESSAGE, "info");
+        }
         return "step-wizard";
     }
     return "continue";

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

@@ -20,6 +20,7 @@ import { assertGateCoverage, getGatesForTurn, } from "./gate-registry.js";
 import { formatDecisionsCompact, formatRequirementsCompact } from "./structured-data-formatter.js";
 import { readPhaseAnchor, formatAnchorForPrompt } from "./phase-anchor.js";
 import { logWarning } from "./workflow-logger.js";
+import { inlineGraphSubgraph } from "./graph-context.js";
 // ─── Preamble Cap ─────────────────────────────────────────────────────────────
 const MAX_PREAMBLE_CHARS = 30_000;
 function capPreamble(preamble) {
@@ -1040,6 +1041,10 @@ export async function buildResearchSlicePrompt(mid, _midTitle, sid, sTitle, base
     const knowledgeInlineRS = await inlineKnowledgeScoped(base, keywords);
     if (knowledgeInlineRS)
         inlined.push(knowledgeInlineRS);
+    // Knowledge graph: subgraph for this slice (graceful — skipped if no graph.json)
+    const graphBlockRS = await inlineGraphSubgraph(base, `${sid} ${sTitle}`, { budget: 3000 });
+    if (graphBlockRS)
+        inlined.push(graphBlockRS);
     inlined.push(inlineTemplate("research", "Research"));
     const depContent = await inlineDependencySummaries(mid, sid, base);
     const activeOverrides = await loadActiveOverrides(base);
@@ -1111,6 +1116,10 @@ export async function buildPlanSlicePrompt(mid, _midTitle, sid, sTitle, base, le
     const knowledgeInlinePS = await inlineKnowledgeScoped(base, keywordsPS);
     if (knowledgeInlinePS)
         inlined.push(knowledgeInlinePS);
+    // Knowledge graph: subgraph for this slice (graceful — skipped if no graph.json)
+    const graphBlockPS = await inlineGraphSubgraph(base, `${sid} ${sTitle}`, { budget: 3000 });
+    if (graphBlockPS)
+        inlined.push(graphBlockPS);
     inlined.push(inlineTemplate("plan", "Slice Plan"));
     if (inlineLevel === "full") {
         inlined.push(inlineTemplate("task-plan", "Task Plan"));
@@ -1194,12 +1203,15 @@ export async function buildExecuteTaskPrompt(mid, sid, sTitle, tid, tTitle, base
         : null;
     // Only include if it has content (not a "not found" result)
     const knowledgeContent = knowledgeInlineET && !knowledgeInlineET.includes("not found") ? knowledgeInlineET : null;
+    // Knowledge graph: tight subgraph for this task (graceful — skipped if no graph.json)
+    const graphBlockET = await inlineGraphSubgraph(base, `${tid} ${tTitle}`, { budget: 2000 });
     const inlinedTemplates = inlineLevel === "minimal"
         ? inlineTemplate("task-summary", "Task Summary")
         : [
             inlineTemplate("task-summary", "Task Summary"),
             inlineTemplate("decisions", "Decisions"),
             ...(knowledgeContent ? [knowledgeContent] : []),
+            ...(graphBlockET ? [graphBlockET] : []),
         ].join("\n\n---\n\n");
     const taskSummaryPath = join(base, `${relSlicePath(base, mid, sid)}/tasks/${tid}-SUMMARY.md`);
     const activeOverrides = await loadActiveOverrides(base);

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

@@ -38,7 +38,7 @@ import { existsSync, mkdirSync, readdirSync, rmSync, statSync, unlinkSync, } fro
 import { join } from "node:path";
 import { sep as pathSep } from "node:path";
 import { resolveProjectRootDbPath } from "./bootstrap/dynamic-tools.js";
-import { resolveDefaultSessionModel, resolveDynamicRoutingConfig } from "./preferences-models.js";
+import { isCustomProvider, resolveDefaultSessionModel, resolveDynamicRoutingConfig, } from "./preferences-models.js";
 import { getSessionModelOverride } from "./session-model-override.js";
 /**
  * Bootstrap a fresh auto-mode session. Handles everything from git init
@@ -195,8 +195,18 @@ export async function bootstrapAutoSession(s, ctx, pi, base, verboseMode, reques
     //
     // This preserves #3517 defaults while honoring explicit runtime model
     // selection for subsequent /gsd runs in the same session.
+    //
+    // Exception (#4122): when the session provider is a custom provider declared
+    // in ~/.gsd/agent/models.json (Ollama, vLLM, OpenAI-compatible proxy, etc.),
+    // PREFERENCES.md is skipped entirely. PREFERENCES.md cannot reference custom
+    // providers, so honoring it would silently reroute auto-mode to a built-in
+    // provider the user is not logged into and surface as "Not logged in · Please
+    // run /login" before pausing and resetting to claude-code/claude-sonnet-4-6.
     const manualSessionOverride = getSessionModelOverride(ctx.sessionManager.getSessionId());
-    const preferredModel = resolveDefaultSessionModel(ctx.model?.provider);
+    const sessionProviderIsCustom = isCustomProvider(ctx.model?.provider);
+    const preferredModel = sessionProviderIsCustom
+        ? null
+        : resolveDefaultSessionModel(ctx.model?.provider);
     // Validate the preferred model against the live registry + provider auth so
     // an unconfigured PREFERENCES.md entry (no API key / OAuth) can't become the
     // start-model snapshot. Without this, every subsequent unit would try to
@@ -622,6 +632,9 @@ export async function bootstrapAutoSession(s, ctx, pi, base, verboseMode, reques
         }
         ctx.ui.setStatus("gsd-auto", s.stepMode ? "next" : "auto");
         ctx.ui.setFooter(hideFooter);
+        // Hide gsd-health during AUTO — gsd-progress is the single source of truth
+        // for last-commit / cost / health signal while auto is running.
+        ctx.ui.setWidget("gsd-health", undefined);
         const modeLabel = s.stepMode ? "Step-mode" : "Auto-mode";
         const pendingCount = (state.registry ?? []).filter((m) => m.status !== "complete" && m.status !== "parked").length;
         const scopeMsg = pendingCount > 1
@@ -636,12 +649,16 @@ export async function bootstrapAutoSession(s, ctx, pi, base, verboseMode, reques
         const startModelLabel = s.autoModeStartModel
             ? `${s.autoModeStartModel.provider}/${s.autoModeStartModel.id}`
             : ctx.model ? `${ctx.model.provider}/${ctx.model.id}` : "default";
-        // Flat-rate providers (e.g. GitHub Copilot, claude-code) suppress routing
-        // at dispatch time (#3453) — reflect that in the banner.
-        const { isFlatRateProvider } = await import("./auto-model-selection.js");
+        // Flat-rate providers (e.g. GitHub Copilot, claude-code, user-declared
+        // subscription proxies, externalCli CLIs) suppress routing at dispatch
+        // time (#3453) — reflect that in the banner.  Thread the same
+        // FlatRateContext used by selectAndApplyModel so user-declared
+        // flat-rate providers and externalCli auto-detection are respected.
+        const { isFlatRateProvider, buildFlatRateContext } = await import("./auto-model-selection.js");
+        const bannerPrefs = loadEffectiveGSDPreferences()?.preferences;
         const effectiveProvider = s.autoModeStartModel?.provider ?? ctx.model?.provider;
         const effectivelyEnabled = routingConfig.enabled
-            && !(effectiveProvider && isFlatRateProvider(effectiveProvider));
+            && !(effectiveProvider && isFlatRateProvider(effectiveProvider, buildFlatRateContext(effectiveProvider, ctx, bannerPrefs)));
         // The actual ceiling may come from tier_models.heavy, not the start model.
         const effectiveCeiling = (routingConfig.enabled && routingConfig.tier_models?.heavy)
             ? routingConfig.tier_models.heavy

package/dist/resources/extensions/gsd/auto-timeout-recovery.js

@@ -156,6 +156,19 @@ export async function recoverTimedOutUnit(ctx, pi, unitType, unitId, reason, rct
         ctx.ui.notify(`${reason === "idle" ? "Idle" : "Timeout"} recovery: steering ${unitType} ${unitId} to produce ${expected} (attempt ${attemptNumber}, session ${recoveryAttempts + 1}/${maxRecoveryAttempts}).`, "warning");
         return "recovered";
     }
+    // #4175: For complete-milestone, never write a blocker placeholder — a stub
+    // SUMMARY has no recovery value (milestone is terminal), it does not update
+    // DB status, and downstream merge paths can treat the stub as a legitimate
+    // completion signal. Pause instead so the worktree branch is preserved.
+    if (unitType === "complete-milestone") {
+        writeUnitRuntimeRecord(basePath, unitType, unitId, currentUnitStartedAt, {
+            phase: "paused",
+            recoveryAttempts: recoveryAttempts + 1,
+            lastRecoveryReason: reason,
+        });
+        ctx.ui.notify(`Milestone ${unitId} ${reason}-recovery exhausted ${maxRecoveryAttempts} attempt(s) — worktree branch preserved. Re-run /gsd auto once blockers are resolved.`, "error");
+        return "paused";
+    }
     // Retries exhausted — write a blocker placeholder and advance the pipeline
     // instead of silently stalling.
     const placeholder = writeBlockerPlaceholder(unitType, unitId, basePath, `${reason} recovery exhausted ${maxRecoveryAttempts} attempts without producing the artifact.`);

package/dist/resources/extensions/gsd/auto-unit-closeout.js

@@ -6,6 +6,7 @@
 import { snapshotUnitMetrics } from "./metrics.js";
 import { saveActivityLog } from "./activity-log.js";
 import { logWarning } from "./workflow-logger.js";
+import { writeTurnGitTransaction } from "./uok/gitops.js";
 /**
  * Snapshot metrics, save activity log, and fire-and-forget memory extraction
  * for a completed unit. Returns the activity log file path (if any).
@@ -28,5 +29,22 @@ export async function closeoutUnit(ctx, basePath, unitType, unitId, startedAt, o
             logWarning("engine", `operation failed: ${err instanceof Error ? err.message : String(err)}`);
         }
     }
+    if (opts?.traceId && opts.turnId && opts.gitAction && opts.gitStatus) {
+        writeTurnGitTransaction({
+            basePath,
+            traceId: opts.traceId,
+            turnId: opts.turnId,
+            unitType,
+            unitId,
+            stage: "record",
+            action: opts.gitAction,
+            push: opts.gitPush === true,
+            status: opts.gitStatus,
+            error: opts.gitError,
+            metadata: {
+                activityFile,
+            },
+        });
+    }
     return activityFile ?? undefined;
 }