gsd-pi 2.82.0 → 3.0.0-dev.6c9a50fd0

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

@@ -7,8 +7,8 @@
  *
  * Split into two functions called sequentially by auto-loop with
  * the verification gate between them:
- *   1. postUnitPreVerification() — commit, doctor, state rebuild, worktree sync, artifact verification
- *   2. postUnitPostVerification() — DB dual-write, hooks, triage, quick-tasks
+ *   1. postUnitPreVerification() — closeout git for non-task units, doctor, state rebuild, worktree sync, artifact verification
+ *   2. postUnitPostVerification() — post-verified task git, DB dual-write, hooks, triage, quick-tasks
  *
  * Extracted from the pre-loop agent_end handler in auto.ts.
  */
@@ -23,12 +23,12 @@ import { rebuildState } from "./doctor.js";
 import { parseUnitId } from "./unit-id.js";
 import { closeoutUnit } from "./auto-unit-closeout.js";
 import { runTurnGitAction, } from "./git-service.js";
-import { verifyExpectedArtifact, resolveExpectedArtifactPath, writeBlockerPlaceholder, diagnoseExpectedArtifact, } from "./auto-recovery.js";
+import { verifyExpectedArtifact, resolveExpectedArtifactPath, writeBlockerPlaceholder, diagnoseExpectedArtifact, diagnoseWorktreeIntegrityFailure, } from "./auto-recovery.js";
 import { regenerateIfMissing } from "./workflow-projections.js";
 import { WorktreeStateProjection } from "./worktree-state-projection.js";
 import { createWorkspace, scopeMilestone } from "./workspace.js";
 import { normalizeWorktreePathForCompare } from "./worktree-root.js";
-import { isDbAvailable, getTask, getSlice, getMilestone, updateTaskStatus, _getAdapter, getVerificationEvidence } from "./gsd-db.js";
+import { isDbAvailable, getDbPath, refreshOpenDatabaseFromDisk, getTask, getSlice, getMilestone, updateTaskStatus, _getAdapter, getVerificationEvidence } from "./gsd-db.js";
 import { renderPlanCheckboxes } from "./markdown-renderer.js";
 import { consumeSignal } from "./session-status-io.js";
 import { checkPostUnitHooks, isRetryPending, consumeRetryTrigger, persistHookState, resolveHookArtifactPath, } from "./post-unit-hooks.js";
@@ -37,8 +37,7 @@ import { debugLog } from "./debug-logger.js";
 import { runSafely } from "./auto-utils.js";
 import { getEvidence, clearEvidenceFromDisk } from "./safety/evidence-collector.js";
 import { validateFileChanges } from "./safety/file-change-validator.js";
-// crossReferenceEvidence available for future use when verification_evidence is stored in DB
-// import { crossReferenceEvidence, type ClaimedEvidence } from "./safety/evidence-cross-ref.js";
+import { crossReferenceEvidence } from "./safety/evidence-cross-ref.js";
 import { validateContent } from "./safety/content-validator.js";
 import { resolveSafetyHarnessConfig } from "./safety/safety-harness.js";
 import { resolveExpectedArtifactPath as resolveArtifactForContent } from "./auto-artifact-paths.js";
@@ -76,6 +75,17 @@ function formatPreExecutionCheckDetail(check) {
 }
 const COMPLETE_MILESTONE_DB_SETTLE_MS = 1500;
 const COMPLETE_MILESTONE_DB_SETTLE_POLL_MS = 100;
+const GIT_ACTION_FAILURE_LOG_REL_PATH = ".gsd/git-action-failures.log";
+function persistGitActionFailure(basePath, action, message) {
+    const logPath = join(basePath, GIT_ACTION_FAILURE_LOG_REL_PATH);
+    const logDir = join(basePath, ".gsd");
+    const timestamp = new Date().toISOString();
+    const body = message.trim() || "unknown git failure";
+    const entry = `[${timestamp}] action=${action}\n${body}\n\n`;
+    mkdirSync(logDir, { recursive: true });
+    appendFileSync(logPath, entry, "utf-8");
+    return logPath;
+}
 function stripKnownIdPrefix(value, id) {
     const raw = String(value ?? "").trim();
     if (!raw)
@@ -126,7 +136,7 @@ async function buildTaskCommitContextForUnit(basePath, unitId) {
         sliceId: sid,
         sliceTitle: stripKnownIdPrefix(slice?.title, sid),
         oneLiner: summary?.oneLiner || task?.one_liner || undefined,
-        keyFiles: summary?.frontmatter.key_files?.filter(f => !f.includes("{{")) ??
+        keyFiles: summary?.frontmatter.key_files?.filter(f => !f.includes("{{") && f.trim() !== "(none)") ??
             task?.key_files ??
             undefined,
         issueNumber: ghIssueNumber,
@@ -171,6 +181,9 @@ export function _shouldDispatchQuickTaskForTest(state) {
         !!state.currentUnit &&
         state.currentUnit.type !== "quick-task";
 }
+export function shouldDeferCloseoutGitAction(unitType) {
+    return unitType === "execute-task";
+}
 /** Unit types that only touch `.gsd/` internal state files (no code changes).
  *  Auto-commit is skipped for these — their state files are picked up by the
  *  next actual task commit via `smartStage()`. */
@@ -181,7 +194,7 @@ const LIFECYCLE_ONLY_UNITS = new Set([
     "reassess-roadmap", "rewrite-docs",
 ]);
 import { describeNextUnit, } from "./auto-dashboard.js";
-import { existsSync, unlinkSync } from "node:fs";
+import { appendFileSync, existsSync, mkdirSync, unlinkSync } from "node:fs";
 import { join, relative } from "node:path";
 import { _resetHasChangesCache } from "./native-git-bridge.js";
 import { autoCommitCurrentBranch } from "./worktree.js";
@@ -292,14 +305,27 @@ export function detectRogueFileWrites(unitType, unitId, basePath) {
  * looping indefinitely (#2007).
  */
 export const MAX_ARTIFACT_VERIFICATION_RETRIES = 3;
-export const STEP_COMPLETE_FALLBACK_MESSAGE = "Step complete. Run /clear, then /gsd to continue (or /gsd auto to run continuously).";
+export const STEP_COMPLETE_FALLBACK_MESSAGE = "Step complete. Run /clear if you want a clean view, then /gsd next to continue one step (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).`;
+        + `Run /clear if you want a clean view, then /gsd next to continue one step (or /gsd auto to run continuously).`;
+}
+/**
+ * Decide whether step mode should stop at the step wizard after a unit finishes.
+ *
+ * @param currentUnitType The just-finished unit type, such as "execute-task" or
+ *   "complete-milestone"; may be null/undefined when no current unit is known.
+ * @param phaseAfterUnit The freshly derived next phase, such as "executing" or
+ *   "complete"; may be null/undefined if state derivation failed.
+ * @returns true to show the step wizard; false to keep the loop running so
+ *   terminal milestone completion can reach the merge/finalization path.
+ */
+export function shouldReturnStepWizardAfterUnit(currentUnitType, phaseAfterUnit) {
+    return currentUnitType !== "complete-milestone" && phaseAfterUnit !== "complete";
 }
 export const USER_DRIVEN_DEEP_UNITS = new Set([
     "discuss-project",
@@ -316,6 +342,10 @@ function artifactValidationKind(unitType) {
     return null;
 }
 function describeArtifactVerificationFailure(unitType, unitId, basePath) {
+    const worktreeFailure = diagnoseWorktreeIntegrityFailure(basePath);
+    if (worktreeFailure) {
+        return `${worktreeFailure} Unit: ${unitType} ${unitId}.`;
+    }
     const artifactPath = resolveExpectedArtifactPath(unitType, unitId, basePath);
     if (!artifactPath) {
         return `Artifact verification failed: ${unitType} "${unitId}" has no resolvable artifact path.`;
@@ -360,6 +390,162 @@ export async function autoCommitUnit(basePath, unitType, unitId, ctx) {
         return null;
     }
 }
+/**
+ * Execute the turn-level git action (commit, snapshot, or status-only).
+ *
+ * @param opts.softFailure - Defaults to false. When true, retry git failures,
+ * warn, and continue without pausing auto-mode; use for best-effort deferred
+ * closeout work where a git failure should not block the run.
+ */
+async function runCloseoutGitAction(pctx, unit, opts) {
+    const { s, ctx, pi, pauseAuto } = pctx;
+    const prefs = loadEffectiveGSDPreferences()?.preferences;
+    const uokFlags = resolveUokFlags(prefs);
+    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;
+        let targetRepositories;
+        if (turnAction === "commit" && unit.type === "execute-task") {
+            taskContext = await buildTaskCommitContextForUnit(s.basePath, unit.id);
+            const { milestone: mid, slice: sid, task: tid } = parseUnitId(unit.id);
+            if (mid && sid && tid && isDbAvailable()) {
+                targetRepositories = getTask(mid, sid, tid)?.target_repositories;
+            }
+        }
+        // Invalidate the nativeHasChanges cache before auto-commit (#1853).
+        // The cache has a 10-second TTL and is keyed by basePath. A stale
+        // `false` result causes autoCommit to skip staging entirely.
+        _resetHasChangesCache();
+        const skipLifecycleCommit = turnAction === "commit" && LIFECYCLE_ONLY_UNITS.has(unit.type);
+        if (skipLifecycleCommit) {
+            debugLog("postUnit", {
+                phase: "git-action-skipped",
+                reason: "lifecycle-only-unit",
+                unitType: unit.type,
+                unitId: unit.id,
+            });
+        }
+        else {
+            const maxAttempts = opts?.softFailure ? 3 : 1;
+            let gitResult = runTurnGitAction({
+                basePath: s.basePath,
+                action: turnAction,
+                unitType: unit.type,
+                unitId: unit.id,
+                taskContext,
+                targetRepositories,
+            });
+            for (let attempt = 1; gitResult.status === "failed" && attempt < maxAttempts; attempt++) {
+                await new Promise((resolve) => setTimeout(resolve, 250 * attempt));
+                gitResult = runTurnGitAction({
+                    basePath: s.basePath,
+                    action: turnAction,
+                    unitType: unit.type,
+                    unitId: unit.id,
+                    taskContext,
+                    targetRepositories,
+                });
+            }
+            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,
+                        dirtyRepositories: gitResult.dirtyRepositories,
+                        commitMessage: gitResult.commitMessage,
+                        commitMessages: gitResult.commitMessages,
+                        commitErrors: gitResult.commitErrors,
+                        skippedRepositories: gitResult.skippedRepositories,
+                        snapshotLabel: gitResult.snapshotLabel,
+                    },
+                });
+            }
+            if (gitResult.status === "failed") {
+                s.lastGitActionFailure = gitResult.error ?? `git ${turnAction} failed`;
+                s.lastGitActionStatus = "failed";
+                const fullError = gitResult.error ?? "unknown error";
+                const failureLogPath = persistGitActionFailure(s.basePath, turnAction, fullError);
+                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: fullError,
+                        }),
+                    });
+                    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: ${fullError.split("\n")[0]} (full details: ${failureLogPath})`;
+                ctx.ui.notify(failureMsg, opts?.softFailure ? "warning" : "error");
+                debugLog("postUnit", {
+                    phase: opts?.softFailure ? "git-action-failed-soft" : "git-action-failed-blocking",
+                    action: turnAction,
+                    error: fullError,
+                    failureLogPath,
+                });
+                if (opts?.softFailure) {
+                    return "continue";
+                }
+                await pauseAuto(ctx, pi);
+                return "dispatched";
+            }
+            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) {
+        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]}`, opts?.softFailure ? "warning" : "error");
+        if (opts?.softFailure) {
+            return "continue";
+        }
+        if (uokFlags.gitops) {
+            await pauseAuto(ctx, pi);
+            return "dispatched";
+        }
+    }
+    // GitHub sync (non-blocking, opt-in)
+    await runSafely("postUnit", "github-sync", async () => {
+        const { runGitHubSync } = await import("../github-sync/sync.js");
+        await runGitHubSync(s.basePath, unit.type, unit.id);
+    });
+    return "continue";
+}
 /**
  * Pre-verification processing: parallel worker signal check, cache invalidation,
  * auto-commit, doctor run, state rebuild, worktree sync, artifact verification.
@@ -370,7 +556,7 @@ export async function autoCommitUnit(basePath, unitType, unitId, ctx) {
  * - "retry" — artifact verification failed, s.pendingVerificationRetry set for loop re-iteration
  */
 export async function postUnitPreVerification(pctx, opts) {
-    const { s, ctx, pi, buildSnapshotOpts, stopAuto, pauseAuto } = pctx;
+    const { s, ctx, pi, stopAuto, pauseAuto } = pctx;
     // ── Parallel worker signal check ──
     const milestoneLock = process.env.GSD_MILESTONE_LOCK;
     if (milestoneLock) {
@@ -392,125 +578,29 @@ export async function postUnitPreVerification(pctx, opts) {
     if (!opts?.skipSettleDelay) {
         await new Promise(r => setTimeout(r, 100));
     }
-    const prefs = loadEffectiveGSDPreferences()?.preferences;
-    const uokFlags = resolveUokFlags(prefs);
+    const dbPath = getDbPath();
+    if (isDbAvailable() && dbPath && dbPath !== ":memory:") {
+        const refreshed = refreshOpenDatabaseFromDisk();
+        if (!refreshed) {
+            logWarning("db", "post-unit database refresh failed; derived state may be stale");
+        }
+    }
     // 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 (turnAction === "commit" && s.currentUnit.type === "execute-task") {
-                taskContext = await buildTaskCommitContextForUnit(s.basePath, s.currentUnit.id);
-            }
-            // Invalidate the nativeHasChanges cache before auto-commit (#1853).
-            // The cache has a 10-second TTL and is keyed by basePath.  A stale
-            // `false` result causes autoCommit to skip staging entirely, leaving
-            // code files only in the working tree where they are destroyed by
-            // `git worktree remove --force` during teardown.
-            _resetHasChangesCache();
-            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]}`;
-                    ctx.ui.notify(failureMsg, "error");
-                    debugLog("postUnit", {
-                        phase: "git-action-failed-blocking",
-                        action: turnAction,
-                        error: gitResult.error ?? "unknown error",
-                    });
-                    await pauseAuto(ctx, pi);
-                    return "dispatched";
-                }
-                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");
-                }
-            }
+        if (shouldDeferCloseoutGitAction(unit.type)) {
+            debugLog("postUnit", {
+                phase: "git-action-deferred-until-verification",
+                unitType: unit.type,
+                unitId: unit.id,
+            });
         }
-        catch (e) {
-            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);
+        else {
+            const gitActionResult = await runCloseoutGitAction(pctx, unit);
+            if (gitActionResult === "dispatched") {
                 return "dispatched";
             }
         }
-        // GitHub sync (non-blocking, opt-in)
-        await runSafely("postUnit", "github-sync", async () => {
-            const { runGitHubSync } = await import("../github-sync/sync.js");
-            await runGitHubSync(s.basePath, unit.type, unit.id);
-        });
         // Prune dead bg-shell processes
         await runSafely("postUnit", "prune-bg-shell", async () => {
             const { pruneDeadProcesses } = await import("../bg-shell/process-manager.js");
@@ -723,7 +813,7 @@ export async function postUnitPreVerification(pctx, opts) {
             const safetyConfig = resolveSafetyHarnessConfig(prefs?.safety_harness);
             if (safetyConfig.enabled) {
                 const { milestone: sMid, slice: sSid, task: sTid } = parseUnitId(s.currentUnit.id);
-                // File change validation (execute-task only, after auto-commit)
+                // File change validation (execute-task only, after unit execution)
                 if (safetyConfig.file_change_validation && s.currentUnit.type === "execute-task" && sMid && sSid && sTid && isDbAvailable()) {
                     try {
                         const taskRow = getTask(sMid, sSid, sTid);
@@ -756,12 +846,35 @@ export async function postUnitPreVerification(pctx, opts) {
                         const bashCalls = actual.filter(e => e.kind === "bash");
                         if (sMid && sSid && sTid && isDbAvailable()) {
                             const taskRow = getTask(sMid, sSid, sTid);
-                            const claimedCommands = getVerificationEvidence(sMid, sSid, sTid)
-                                .map((row) => row.command)
-                                .filter((command) => typeof command === "string" && command.trim().length > 0);
-                            if (taskRow?.status === "complete" && claimedCommands.length > 0 && bashCalls.length === 0) {
-                                logWarning("safety", "task claimed verification command evidence but no execution tool calls were recorded");
-                                ctx.ui.notify(`Safety: task ${sTid} claimed command evidence but no execution tool calls were recorded`, "warning");
+                            if (taskRow?.status === "complete") {
+                                const claimedEvidence = getVerificationEvidence(sMid, sSid, sTid)
+                                    .map((row) => ({
+                                    command: row.command,
+                                    exitCode: row.exit_code,
+                                    verdict: row.verdict,
+                                    createdAt: row.created_at,
+                                }))
+                                    .filter((row) => typeof row.command === "string" && row.command.trim().length > 0);
+                                const mismatches = crossReferenceEvidence(claimedEvidence, actual);
+                                for (const mismatch of mismatches) {
+                                    const logMessage = `evidence-xref: ${mismatch.reason}`;
+                                    if (mismatch.severity === "error") {
+                                        logError("safety", logMessage);
+                                    }
+                                    else {
+                                        logWarning("safety", logMessage);
+                                    }
+                                }
+                                if (claimedEvidence.length > 0 && bashCalls.length === 0) {
+                                    logWarning("safety", "task claimed verification command evidence but no execution tool calls were recorded");
+                                    ctx.ui.notify(`Safety: task ${sTid} claimed command evidence but no execution tool calls were recorded`, "warning");
+                                }
+                                const blockingMismatch = mismatches.find((mismatch) => mismatch.severity === "error");
+                                if (blockingMismatch) {
+                                    ctx.ui.notify(`Safety: task ${sTid} claimed passing verification that failed in recorded execution`, "error");
+                                    await pauseAuto(ctx, pi);
+                                    return "dispatched";
+                                }
                             }
                         }
                     }
@@ -919,9 +1032,25 @@ export async function postUnitPreVerification(pctx, opts) {
                 s.verificationRetryCount.delete(retryKey);
                 s.verificationRetryFailureHashes.delete(retryKey);
                 writeBlockerPlaceholder(s.currentUnit.type, s.currentUnit.id, s.basePath, reason);
-                ctx.ui.notify(`${s.currentUnit.type} ${s.currentUnit.id} — deterministic policy rejection, wrote blocker placeholder (no retries) (#4973)`, "warning");
+                ctx.ui.notify(`${s.currentUnit.type} ${s.currentUnit.id} — deterministic policy rejection, wrote blocker placeholder (no retries)`, "warning");
                 // Fall through to "continue" — do NOT enter the retry or db-unavailable paths.
             }
+            else if (!triggerArtifactVerified && diagnoseWorktreeIntegrityFailure(s.basePath)) {
+                const retryKey = `${s.currentUnit.type}:${s.currentUnit.id}`;
+                const worktreeFailure = diagnoseWorktreeIntegrityFailure(s.basePath);
+                s.pendingVerificationRetry = null;
+                s.verificationRetryCount.delete(retryKey);
+                s.verificationRetryFailureHashes.delete(retryKey);
+                debugLog("postUnit", {
+                    phase: "worktree-integrity-failure",
+                    unitType: s.currentUnit.type,
+                    unitId: s.currentUnit.id,
+                    basePath: s.basePath,
+                });
+                ctx.ui.notify(`${worktreeFailure} Retry ${s.currentUnit.id} after repair.`, "error");
+                await pauseAuto(ctx, pi);
+                return "dispatched";
+            }
             else if (!triggerArtifactVerified && !isDbAvailable()) {
                 debugLog("postUnit", { phase: "artifact-verify-skip-db-unavailable", unitType: s.currentUnit.type, unitId: s.currentUnit.id });
                 const dbSkipDiag = diagnoseExpectedArtifact(s.currentUnit.type, s.currentUnit.id, s.basePath);
@@ -992,6 +1121,12 @@ export async function postUnitPreVerification(pctx, opts) {
 export async function postUnitPostVerification(pctx) {
     const { s, ctx, pi, buildSnapshotOpts, lockBase, stopAuto, pauseAuto, updateProgressWidget } = pctx;
     if (s.currentUnit) {
+        if (shouldDeferCloseoutGitAction(s.currentUnit.type)) {
+            const gitActionResult = await runCloseoutGitAction(pctx, s.currentUnit, { softFailure: true });
+            if (gitActionResult === "dispatched") {
+                return "stopped";
+            }
+        }
         try {
             const codebasePrefs = loadEffectiveGSDPreferences()?.preferences?.codebase;
             const refresh = ensureCodebaseMapFresh(s.basePath, codebasePrefs
@@ -1161,7 +1296,9 @@ export async function postUnitPostVerification(pctx) {
                 // s.canonicalProjectRoot is the project root and lacks files that a
                 // prior slice wrote to the worktree but hasn't merged to main yet.
                 const preExecutionBasePath = s.basePath;
-                const result = await runPreExecutionChecks(tasks, preExecutionBasePath);
+                const result = await runPreExecutionChecks(tasks, preExecutionBasePath, {
+                    additionalRoots: [s.canonicalProjectRoot],
+                });
                 // Log summary to stderr in existing verification output format
                 const emoji = result.status === "pass" ? "✅" : result.status === "warn" ? "⚠️" : "❌";
                 process.stderr.write(`gsd-pre-exec: ${emoji} Pre-execution checks ${result.status} for ${mid}/${sid} (${result.durationMs}ms)\n`);
@@ -1171,12 +1308,12 @@ export async function postUnitPostVerification(pctx) {
                     process.stderr.write(`gsd-pre-exec:   ${checkEmoji} [${check.category}] ${check.target}: ${check.message}\n`);
                 }
                 // Write evidence JSON to slice artifacts directory
-                const slicePath = resolveSlicePath(preExecutionBasePath, mid, sid);
+                const slicePath = resolveSlicePath(s.canonicalProjectRoot, mid, sid);
                 const evidenceFileName = `${sid}-PRE-EXEC-VERIFY.json`;
                 let evidencePath = join(".gsd", "milestones", mid, "slices", sid, evidenceFileName);
                 if (slicePath) {
                     writePreExecutionEvidence(result, slicePath, mid, sid);
-                    evidencePath = relative(preExecutionBasePath, join(slicePath, evidenceFileName)) || evidenceFileName;
+                    evidencePath = relative(s.canonicalProjectRoot, join(slicePath, evidenceFileName)) || evidenceFileName;
                 }
                 if (uokFlags.gates) {
                     const failedChecks = result.checks
@@ -1356,18 +1493,22 @@ export async function postUnitPostVerification(pctx) {
         }
     }
     // 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.
+    // Without this notify(), /gsd next finishes a unit and silently exits the
+    // loop, leaving the user with no next-step command.
     if (s.stepMode) {
+        let phaseAfterUnit = null;
         try {
             const nextState = await deriveState(s.canonicalProjectRoot);
+            phaseAfterUnit = nextState.phase;
             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 shouldReturnStepWizardAfterUnit(s.currentUnit?.type, phaseAfterUnit)
+            ? "step-wizard"
+            : "continue";
     }
     return "continue";
 }