gsd-pi 2.81.0 → 2.82.0

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

@@ -15,7 +15,7 @@ import { deriveState } from "./state.js";
 import { parseUnitId } from "./unit-id.js";
 import { assessInterruptedSession, readPausedSessionMetadata, PAUSED_SESSION_KV_KEY, } from "./interrupted-session.js";
 import { setRuntimeKv, deleteRuntimeKv, } from "./db/runtime-kv.js";
-import { getManifestStatus } from "./files.js";
+import { extractSection, getManifestStatus, splitFrontmatter, parseFrontmatterMap } from "./files.js";
 export { inlinePriorMilestoneSummary } from "./files.js";
 import { collectSecretsFromManifest } from "../get-secrets-from-user.js";
 import { gsdRoot, resolveMilestoneFile, resolveMilestonePath, resolveDir, milestonesDir, } from "./paths.js";
@@ -45,11 +45,10 @@ import { isAbsolute, join } from "node:path";
 import { pathToFileURL } from "node:url";
 import { readFileSync, existsSync, mkdirSync } from "node:fs";
 import { atomicWriteSync } from "./atomic-write.js";
-import { autoCommitCurrentBranch, captureIntegrationBranch, detectWorktreeName, getCurrentBranch, getMainBranch, setActiveMilestoneId, resolveProjectRoot, } from "./worktree.js";
+import { captureIntegrationBranch, detectWorktreeName, getCurrentBranch, getMainBranch, setActiveMilestoneId, resolveProjectRoot, } from "./worktree.js";
 import { GitServiceImpl } from "./git-service.js";
-import { nativeCheckoutBranch } from "./native-git-bridge.js";
 import { getPriorSliceCompletionBlocker } from "./dispatch-guard.js";
-import { createAutoWorktree, enterAutoWorktree, enterBranchModeForMilestone, teardownAutoWorktree, isInAutoWorktree, getAutoWorktreePath, mergeMilestoneToMain, autoWorktreeBranch, checkResourcesStale, escapeStaleWorktree, } from "./auto-worktree.js";
+import { createAutoWorktree, teardownAutoWorktree, isInAutoWorktree, getAutoWorktreePath, mergeMilestoneToMain, autoWorktreeBranch, checkResourcesStale, escapeStaleWorktree, } from "./auto-worktree.js";
 import { pruneQueueOrder } from "./queue-order.js";
 import { startCommandPolling as _startCommandPolling, isRemoteConfigured } from "../remote-questions/manager.js";
 import { debugLog, isDebugEnabled, writeDebugSummary } from "./debug-logger.js";
@@ -61,9 +60,9 @@ import { recoverFailedMigration } from "./migrate-external.js";
 import { initRegistry, convertDispatchRules } from "./rule-registry.js";
 import { emitJournalEvent as _emitJournalEvent } from "./journal.js";
 import { isClosedStatus } from "./status-guards.js";
-import { updateProgressWidget as _updateProgressWidget, updateSliceProgressCache, clearSliceProgressCache, } from "./auto-dashboard.js";
+import { updateProgressWidget as _updateProgressWidget, setCompletionProgressWidget, setAutoOutcomeWidget, updateSliceProgressCache, clearSliceProgressCache, unitVerb, } from "./auto-dashboard.js";
 import { registerSigtermHandler as _registerSigtermHandler, deregisterSigtermHandler as _deregisterSigtermHandler, } from "./auto-supervisor.js";
-import { isDbAvailable, getMilestone } from "./gsd-db.js";
+import { isDbAvailable, getMilestone, getMilestoneSlices } from "./gsd-db.js";
 import { markLatestActiveForWorkerCanceled } from "./db/unit-dispatches.js";
 import { writeUnitRuntimeRecord } from "./unit-runtime.js";
 import { countPendingCaptures } from "./captures.js";
@@ -253,11 +252,10 @@ function synthesizePausedSessionRecovery(basePath, unitType, unitId, sessionFile
 export function _synthesizePausedSessionRecoveryForTest(basePath, unitType, unitId, sessionFile) {
     return synthesizePausedSessionRecovery(basePath, unitType, unitId, sessionFile);
 }
-export function _resolvePausedResumeBasePathForTest(basePath, pausedWorktreePath, pathExists = existsSync) {
-    return pausedWorktreePath && pathExists(pausedWorktreePath)
-        ? pausedWorktreePath
-        : basePath;
-}
+// `_resolvePausedResumeBasePathForTest` was retired in ADR-016 phase 2 / B3
+// (#5621). Production callers go through
+// `WorktreeLifecycle.resumeFromPausedSession`; the pure helper for tests is
+// `resolvePausedResumeBasePath` exported from `worktree-lifecycle.ts`.
 const DETACHED_AUTO_KEEPALIVE_INTERVAL_MS = 30_000;
 function withDetachedAutoKeepalive(run) {
     const keepAlive = setInterval(() => { }, DETACHED_AUTO_KEEPALIVE_INTERVAL_MS);
@@ -415,6 +413,9 @@ export function getAutoDashboardData() {
 export function isAutoActive() {
     return s.active;
 }
+export function isAutoCompletionStopInProgress() {
+    return s.completionStopInProgress;
+}
 /** Test-only seam for validating auto-mode guards (#4704). Do not use in production code. */
 export function _setAutoActiveForTest(active) {
     s.active = active;
@@ -611,6 +612,21 @@ function buildSnapshotOpts(_unitType, _unitId) {
         ...(s.currentUnitRouting ?? {}),
     };
 }
+function currentUnitLabel() {
+    if (!s.currentUnit)
+        return null;
+    return `${unitVerb(s.currentUnit.type)} ${s.currentUnit.id}`;
+}
+function setLifecycleOutcome(ctx, input) {
+    if (!ctx?.hasUI)
+        return;
+    const { unitLabel: unitLabelOverride, ...rest } = input;
+    setAutoOutcomeWidget(ctx, {
+        ...rest,
+        unitLabel: unitLabelOverride !== undefined ? unitLabelOverride : currentUnitLabel(),
+        startedAt: s.autoStartTime,
+    });
+}
 function handleLostSessionLock(ctx, lockStatus) {
     debugLog("session-lock-lost", {
         lockBase: lockBase(),
@@ -690,33 +706,84 @@ export async function cleanupAfterLoopExit(ctx) {
     // visible so the user still has a resumable auto-mode signal on screen.
     if (!s.paused) {
         ctx.ui.setStatus("gsd-auto", undefined);
-        ctx.ui.setWidget("gsd-progress", undefined);
+        if (s.completionStopInProgress) {
+            s.completionStopInProgress = false;
+        }
         initHealthWidget(ctx);
     }
-    // Restore CWD out of worktree back to original project root
+    // ADR-016 phase 3 (#5693): the stop-path basePath restore routes through
+    // `Lifecycle.restoreToProjectRoot()`, the sole owner of `s.basePath`
+    // mutation. The verb assigns `s.basePath` before any throwable work
+    // (rebuildGitService, cache invalidation), so a thrown error still leaves
+    // basePath restored — no fallback assignment needed at the call site.
+    // The chdir stays here because `restoreToProjectRoot` is a pure
+    // session-state mutation.
     if (s.originalBasePath) {
-        s.basePath = s.originalBasePath;
         try {
-            process.chdir(s.basePath);
+            buildLifecycle().restoreToProjectRoot();
         }
         catch (err) {
-            /* best-effort */
-            logWarning("engine", `chdir failed: ${err instanceof Error ? err.message : String(err)}`, { file: "auto.ts" });
+            logWarning("engine", `restore project root failed: ${err instanceof Error ? err.message : String(err)}`, { file: "auto.ts" });
+        }
+        try {
+            process.chdir(s.originalBasePath);
+        }
+        catch (err) {
+            logWarning("engine", `basePath restore/chdir failed: ${err instanceof Error ? err.message : String(err)}`, { file: "auto.ts" });
         }
     }
     if (s.originalBasePath && s.cmdCtx) {
-        const result = await rerootCommandSession(s.cmdCtx, s.basePath);
+        const result = await rerootCommandSession(s.cmdCtx, s.originalBasePath);
         if (result.status === "cancelled") {
-            logWarning("engine", "post-loop session re-root was cancelled", { file: "auto.ts", basePath: s.basePath });
+            logWarning("engine", "post-loop session re-root was cancelled", { file: "auto.ts", basePath: s.originalBasePath });
         }
         else if (result.status === "failed") {
-            logWarning("engine", `post-loop session re-root failed: ${result.error ?? "unknown"}`, { file: "auto.ts", basePath: s.basePath });
+            logWarning("engine", `post-loop session re-root failed: ${result.error ?? "unknown"}`, { file: "auto.ts", basePath: s.originalBasePath });
         }
     }
 }
 export function _cleanupAfterLoopExitForTest(ctx) {
     return cleanupAfterLoopExit(ctx);
 }
+function normalizeFrontmatterList(value) {
+    if (!Array.isArray(value))
+        return [];
+    return value
+        .map(item => typeof item === "string" ? item.trim() : "")
+        .filter(item => item.length > 0 && item !== "(none)");
+}
+function firstBoldParagraph(body) {
+    const match = body.match(/\*\*([^*\n][\s\S]*?)\*\*/);
+    return match?.[1]?.replace(/\s+/g, " ").trim() || undefined;
+}
+function loadMilestoneCompletionRollup(basePath, milestoneId) {
+    if (!milestoneId)
+        return {};
+    const summaryPath = resolveMilestoneFile(basePath, milestoneId, "SUMMARY");
+    if (!summaryPath || !existsSync(summaryPath))
+        return {};
+    try {
+        const raw = readFileSync(summaryPath, "utf-8");
+        const [frontmatterLines, body] = splitFrontmatter(raw);
+        const frontmatter = frontmatterLines ? parseFrontmatterMap(frontmatterLines) : {};
+        return {
+            milestoneTitle: typeof frontmatter.title === "string" ? frontmatter.title : undefined,
+            oneLiner: firstBoldParagraph(body),
+            successCriteriaResults: extractSection(body, "Success Criteria Results") ?? undefined,
+            definitionOfDoneResults: extractSection(body, "Definition of Done Results") ?? undefined,
+            requirementOutcomes: extractSection(body, "Requirement Outcomes") ?? undefined,
+            deviations: extractSection(body, "Deviations") ?? undefined,
+            followUps: extractSection(body, "Follow-ups") ?? undefined,
+            keyDecisions: normalizeFrontmatterList(frontmatter.key_decisions),
+            keyFiles: normalizeFrontmatterList(frontmatter.key_files),
+            lessonsLearned: normalizeFrontmatterList(frontmatter.lessons_learned),
+        };
+    }
+    catch (err) {
+        logWarning("dashboard", `completion roll-up summary read failed: ${err instanceof Error ? err.message : String(err)}`);
+        return {};
+    }
+}
 export function _resolveAutoWorktreeExitActionForTest(currentMilestoneId, milestoneMergedInPhases, milestoneComplete) {
     const action = _selectStopAutoWorktreeExit({
         currentMilestoneId: currentMilestoneId ?? null,
@@ -725,15 +792,16 @@ export function _resolveAutoWorktreeExitActionForTest(currentMilestoneId, milest
     });
     return action === "none" ? "skip" : action;
 }
-export async function stopAuto(ctx, pi, reason) {
+export async function stopAuto(ctx, pi, reason, options = {}) {
     if (!s.active && !s.paused)
         return;
     const loadedPreferences = loadEffectiveGSDPreferences(s.basePath || undefined)?.preferences;
     const reasonSuffix = reason ? ` — ${reason}` : "";
-    // #4764 — telemetry: record the exit reason and whether the current milestone
-    // was merged before we entered stopAuto. This is the producer-side signal for
-    // the #4761 orphan class: milestoneMerged=false + currentMilestoneId present
-    // is exactly the pattern that strands work.
+    const preserveCompletionSurface = Boolean(options.completionWidget);
+    s.completionStopInProgress = preserveCompletionSurface;
+    // #4764 — telemetry: record the exit reason, isolation mode, whether an auto
+    // worktree was active, and whether the current milestone was merged before
+    // stopAuto. The unmerged-work warning is only meaningful for real worktrees.
     try {
         const { emitAutoExit } = await import("./worktree-telemetry.js");
         // Normalize the free-form reason to a closed set so the telemetry
@@ -755,10 +823,13 @@ export async function stopAuto(ctx, pi, reason) {
                                 : rawReason === "stop" || rawReason === "pause"
                                     ? rawReason
                                     : "other";
-        emitAutoExit(s.originalBasePath || s.basePath, {
+        const telemetryBase = s.originalBasePath || s.basePath;
+        emitAutoExit(telemetryBase, {
             reason: normalizedReason,
             milestoneId: s.currentMilestoneId ?? undefined,
             milestoneMerged: s.milestoneMergedInPhases === true,
+            isolationMode: getIsolationMode(telemetryBase),
+            worktreeActive: isInAutoWorktree(s.basePath),
         });
     }
     catch (err) {
@@ -902,6 +973,21 @@ export async function stopAuto(ctx, pi, reason) {
                 });
             }
         }
+        // Pre-compute completion widget slice counts while the DB is still open.
+        // Step 8 runs after closeDatabase(), so DB-backed slice lookups must happen here.
+        const completionMilestoneId = options.completionWidget?.milestoneId ?? s.currentMilestoneId;
+        let completedSlices = null;
+        let totalSlices = null;
+        if (preserveCompletionSurface && options.completionWidget && completionMilestoneId && isDbAvailable()) {
+            try {
+                const slices = getMilestoneSlices(completionMilestoneId);
+                completedSlices = slices.filter(slice => isClosedStatus(slice.status)).length;
+                totalSlices = slices.length;
+            }
+            catch (err) {
+                logWarning("dashboard", `completion slice stats lookup failed: ${err instanceof Error ? err.message : String(err)}`);
+            }
+        }
         // ── Step 6: DB cleanup ──
         if (isDbAvailable()) {
             try {
@@ -914,49 +1000,112 @@ export async function stopAuto(ctx, pi, reason) {
                 });
             }
         }
-        // ── Step 7: Restore basePath and chdir ──
-        try {
-            if (s.originalBasePath) {
-                s.basePath = s.originalBasePath;
-                try {
-                    process.chdir(s.basePath);
-                }
-                catch (err) {
-                    /* best-effort */
-                    logWarning("engine", `chdir failed: ${err instanceof Error ? err.message : String(err)}`, { file: "auto.ts" });
-                }
+        // ── Step 7: Restore basePath and chdir (ADR-016 phase 3, #5693) ──
+        // `restoreToProjectRoot` assigns s.basePath before any throwable work;
+        // no fallback assignment is needed at the call site.
+        if (s.originalBasePath) {
+            try {
+                buildLifecycle().restoreToProjectRoot();
+            }
+            catch (e) {
+                debugLog("stop-cleanup-basepath", { error: e instanceof Error ? e.message : String(e) });
+            }
+            try {
+                process.chdir(s.basePath);
+            }
+            catch (err) {
+                /* best-effort */
+                logWarning("engine", `chdir failed: ${err instanceof Error ? err.message : String(err)}`, { file: "auto.ts" });
             }
-        }
-        catch (e) {
-            debugLog("stop-cleanup-basepath", { error: e instanceof Error ? e.message : String(e) });
         }
         // Re-root the active command session/tool runtime after worktree teardown.
         // mergeAndExit restores process.cwd(), but AgentSession has already captured
         // its own cwd for tools and system prompt; refresh it before returning to the
         // user so follow-up commands do not target a removed milestone worktree.
         if (s.originalBasePath && ctx && s.cmdCtx) {
-            const result = await rerootCommandSession(s.cmdCtx, s.basePath);
+            const result = await rerootCommandSession(s.cmdCtx, s.originalBasePath);
             if (result.status === "cancelled") {
-                logWarning("engine", "post-stop session re-root was cancelled", { file: "auto.ts", basePath: s.basePath });
+                logWarning("engine", "post-stop session re-root was cancelled", { file: "auto.ts", basePath: s.originalBasePath });
             }
             else if (result.status === "failed") {
-                logWarning("engine", `post-stop session re-root failed: ${result.error ?? "unknown"}`, { file: "auto.ts", basePath: s.basePath });
+                logWarning("engine", `post-stop session re-root failed: ${result.error ?? "unknown"}`, { file: "auto.ts", basePath: s.originalBasePath });
             }
         }
         // ── Step 8: Ledger notification ──
         try {
             const ledger = getLedger();
+            const isAllComplete = reason === "All milestones complete";
+            const isMilestoneComplete = /^Milestone\s+\S+\s+complete$/i.test(reason ?? "");
+            const notificationPrefix = isAllComplete
+                ? "All milestones complete"
+                : isMilestoneComplete
+                    ? `${reason}. Auto-mode finished this milestone`
+                    : `Auto-mode stopped${reasonSuffix}`;
             if (ledger && ledger.units.length > 0) {
                 const totals = getProjectTotals(ledger.units);
-                ctx?.ui.notify(`Auto-mode stopped${reasonSuffix}. Session: ${formatCost(totals.cost)} · ${formatTokenCount(totals.tokens.total)} tokens · ${ledger.units.length} units`, "info");
+                ctx?.ui.notify(`${notificationPrefix}. Session: ${formatCost(totals.cost)} · ${formatTokenCount(totals.tokens.total)} tokens · ${ledger.units.length} units`, "info");
             }
             else {
-                ctx?.ui.notify(`Auto-mode stopped${reasonSuffix}.`, "info");
+                ctx?.ui.notify(`${notificationPrefix}.`, "info");
             }
         }
         catch (e) {
             debugLog("stop-cleanup-ledger", { error: e instanceof Error ? e.message : String(e) });
         }
+        if (preserveCompletionSurface && ctx && options.completionWidget) {
+            const ledger = getLedger();
+            const units = ledger?.units ?? [];
+            const totals = units.length > 0 ? getProjectTotals(units) : null;
+            let totalInput = 0;
+            let totalCacheRead = 0;
+            try {
+                for (const entry of s.cmdCtx?.sessionManager?.getEntries?.() ?? []) {
+                    if (entry.type === "message") {
+                        const msgEntry = entry;
+                        if (msgEntry.message?.role === "assistant") {
+                            const usage = msgEntry.message.usage;
+                            if (usage) {
+                                totalInput += usage.input || 0;
+                                totalCacheRead += usage.cacheRead || 0;
+                            }
+                        }
+                    }
+                }
+            }
+            catch (err) {
+                logWarning("dashboard", `completion stats lookup failed: ${err instanceof Error ? err.message : String(err)}`);
+            }
+            const contextUsage = s.cmdCtx?.getContextUsage?.();
+            const milestoneId = completionMilestoneId;
+            const rollup = loadMilestoneCompletionRollup(s.originalBasePath || s.basePath, milestoneId);
+            setCompletionProgressWidget(ctx, {
+                milestoneId,
+                milestoneTitle: options.completionWidget.milestoneTitle ?? rollup.milestoneTitle,
+                oneLiner: rollup.oneLiner,
+                successCriteriaResults: rollup.successCriteriaResults,
+                definitionOfDoneResults: rollup.definitionOfDoneResults,
+                requirementOutcomes: rollup.requirementOutcomes,
+                deviations: rollup.deviations,
+                followUps: rollup.followUps,
+                keyDecisions: rollup.keyDecisions,
+                keyFiles: rollup.keyFiles,
+                lessonsLearned: rollup.lessonsLearned,
+                reason: reason ?? "Milestone complete",
+                startedAt: s.autoStartTime,
+                totalCost: totals?.cost ?? 0,
+                totalTokens: totals?.tokens.total ?? 0,
+                unitCount: units.length,
+                cacheHitRate: totalCacheRead + totalInput > 0
+                    ? (totalCacheRead / (totalCacheRead + totalInput)) * 100
+                    : null,
+                contextPercent: contextUsage?.percent ?? null,
+                contextWindow: contextUsage?.contextWindow ?? s.cmdCtx?.model?.contextWindow ?? null,
+                completedSlices,
+                totalSlices,
+                allMilestonesComplete: options.completionWidget.allMilestonesComplete,
+                basePath: s.originalBasePath || s.basePath || null,
+            });
+        }
         // ── Step 9: Cmux sidebar / event log ──
         try {
             pi?.events.emit(CMUX_CHANNELS.SIDEBAR, { action: "clear", preferences: loadedPreferences });
@@ -1047,9 +1196,21 @@ export async function stopAuto(ctx, pi, reason) {
         resetProactiveHealing();
         // UI cleanup
         ctx?.ui.setStatus("gsd-auto", undefined);
-        ctx?.ui.setWidget("gsd-progress", undefined);
-        if (ctx)
-            initHealthWidget(ctx);
+        if (!preserveCompletionSurface) {
+            ctx?.ui.setWidget("gsd-progress", undefined);
+            const status = reason?.startsWith("Blocked:") ? "blocked" : reason?.toLowerCase().includes("fail") ? "failed" : "stopped";
+            setLifecycleOutcome(ctx, {
+                status,
+                title: status === "blocked" ? "Auto-mode blocked" : status === "failed" ? "Auto-mode stopped with an issue" : "Auto-mode stopped",
+                detail: reason ?? "Auto-mode stopped.",
+                nextAction: status === "blocked"
+                    ? "Fix the blocker, then run /gsd auto to resume."
+                    : "Run /gsd status for the current project state, or /gsd auto to continue.",
+                commands: ["/gsd status for overview", "/gsd auto to run", "/gsd visualize to inspect", "/gsd notifications for history"],
+            });
+            if (ctx)
+                initHealthWidget(ctx);
+        }
         restoreProjectRootEnv();
         restoreMilestoneLockEnv();
         // Drop the active-tool baseline so a subsequent /gsd auto run on the
@@ -1065,7 +1226,7 @@ export async function stopAuto(ctx, pi, reason) {
             debugLog("stop-orchestration-stop", { error: err instanceof Error ? err.message : String(err) });
         }
         // Reset all session state in one call
-        s.reset();
+        s.resetAfterStop({ preserveCompletionSurface });
     }
 }
 export function _selectStopAutoWorktreeExit(args) {
@@ -1126,6 +1287,7 @@ export async function pauseAuto(ctx, _pi, _errorContext) {
         // Non-fatal — resume will still work via full bootstrap, just without worktree context
         logWarning("engine", `paused-session DB write failed: ${err instanceof Error ? err.message : String(err)}`, { file: "auto.ts" });
     }
+    const pausedUnitLabel = currentUnitLabel();
     // Close out the current unit so its runtime record doesn't stay at "dispatched"
     if (s.currentUnit && ctx) {
         try {
@@ -1173,9 +1335,17 @@ export async function pauseAuto(ctx, _pi, _errorContext) {
     s.verificationRetryCount.clear();
     ctx?.ui.setStatus("gsd-auto", "paused");
     ctx?.ui.setWidget("gsd-progress", undefined);
+    const resumeCmd = s.stepMode ? "/gsd next" : "/gsd auto";
+    setLifecycleOutcome(ctx, {
+        status: "paused",
+        title: `${s.stepMode ? "Step" : "Auto"}-mode paused`,
+        detail: _errorContext?.message ?? "Paused by user request.",
+        nextAction: `Type to steer, or run ${resumeCmd} to resume.`,
+        commands: [resumeCmd, "/gsd status for overview", "/gsd notifications for history"],
+        unitLabel: pausedUnitLabel,
+    });
     if (ctx)
         initHealthWidget(ctx);
-    const resumeCmd = s.stepMode ? "/gsd next" : "/gsd auto";
     ctx?.ui.notify(`${s.stepMode ? "Step" : "Auto"}-mode paused (Escape). Type to interact, or ${resumeCmd} to resume.`, "info");
 }
 /**
@@ -1186,28 +1356,34 @@ export async function pauseAuto(ctx, _pi, _errorContext) {
  * deps bag is intentionally focused — Lifecycle does not see the wider auto-
  * mode dependency graph.
  */
-function buildLifecycle() {
-    const lifecycleDeps = {
-        enterAutoWorktree,
-        createAutoWorktree,
-        enterBranchModeForMilestone,
-        getAutoWorktreePath,
-        getIsolationMode,
-        invalidateAllCaches,
-        GitServiceImpl,
-        loadEffectiveGSDPreferences,
+/**
+ * Construct a `WorktreeLifecycleDeps` bag without binding to any session.
+ *
+ * Exported so session-less callers (currently `parallel-merge.ts`) can build
+ * the same deps and call `mergeMilestoneStandalone` through the Worktree
+ * Lifecycle Module instead of bypassing it (ADR-016 phase 2 / A2).
+ */
+export function buildWorktreeLifecycleDeps() {
+    // ADR-016 phase 2 / C-track close-out:
+    //   C1 (#5624) — fs + git-CLI primitives inlined
+    //   C2 (#5625) — worktree-manager helpers inlined
+    //   C3 (#5626) — cache + preferences + paths inlined
+    //   C4 (#5627) — GitServiceImpl constructor → gitServiceFactory
+    //
+    // Final WorktreeLifecycleDeps shape: 3 fields (gitServiceFactory,
+    // worktreeProjection, mergeMilestoneToMain). Down from 18 at slice-7
+    // closure.
+    return {
+        gitServiceFactory: (basePath) => {
+            const gitConfig = loadEffectiveGSDPreferences()?.preferences?.git ?? {};
+            return new GitServiceImpl(basePath, gitConfig);
+        },
         worktreeProjection: new WorktreeStateProjection(),
-        isInAutoWorktree,
-        autoCommitCurrentBranch,
-        autoWorktreeBranch,
-        teardownAutoWorktree,
         mergeMilestoneToMain,
-        getCurrentBranch,
-        checkoutBranch: nativeCheckoutBranch,
-        resolveMilestoneFile,
-        readFileSync: (path, encoding) => readFileSync(path, encoding),
     };
-    return new WorktreeLifecycle(s, lifecycleDeps);
+}
+function buildLifecycle() {
+    return new WorktreeLifecycle(s, buildWorktreeLifecycleDeps());
 }
 /**
  * Thin entry glue for the new Auto Orchestration module.
@@ -1223,16 +1399,19 @@ export function createWiredAutoOrchestrationModule(ctx, _pi, dispatchBasePath, r
         stateReconciliation: {
             async reconcileBeforeDispatch() {
                 const result = await reconcileBeforeDispatch(dispatchBasePath);
-                if (!result.ok) {
+                if (result.blockers.length > 0) {
                     return {
                         ok: false,
-                        reason: result.reason,
+                        reason: result.blockers[0],
                         stateSnapshot: result.stateSnapshot,
                     };
                 }
+                const repairedKinds = result.repaired.map((d) => d.kind);
                 return {
                     ok: true,
-                    reason: result.repaired.join(", "),
+                    reason: repairedKinds.length > 0
+                        ? `repaired: ${repairedKinds.join(", ")}`
+                        : "clean",
                     stateSnapshot: result.stateSnapshot,
                 };
             },
@@ -1431,7 +1610,6 @@ function buildLoopDeps(pi) {
         pruneQueueOrder,
         isInAutoWorktree,
         shouldUseWorktreeIsolation,
-        mergeMilestoneToMain,
         teardownAutoWorktree,
         createAutoWorktree,
         captureIntegrationBranch,
@@ -1701,7 +1879,12 @@ export async function startAuto(ctx, pi, base, verboseMode, options) {
         s.verbose = verboseMode;
         s.stepMode = requestedStepMode;
         s.cmdCtx = ctx;
-        s.basePath = base;
+        // ADR-016 phase 2 / B2 (#5620): bootstrap basePath transition before
+        // the resume path consults persisted worktree state. Defensive about
+        // s.originalBasePath — the meta-restore above (line 2003 / 2055) may
+        // have already populated it from paused metadata; the verb preserves
+        // that value.
+        buildLifecycle().adoptSessionRoot(base);
         // ── Resume worktree: if the paused session was inside a milestone worktree,
         // apply that path as the dispatch basePath immediately (#3723).
         // This ensures the dispatch loop runs from the worktree directory even when
@@ -1713,7 +1896,8 @@ export async function startAuto(ctx, pi, base, verboseMode, options) {
         if (resumeWorktreePath && !existsSync(resumeWorktreePath)) {
             logWarning("session", `Worktree was expected at ${resumeWorktreePath} but is missing. Continuing in project-root mode. To restart with a fresh worktree, run /gsd-debug or recreate the milestone.`, { file: "auto.ts", milestoneId: s.currentMilestoneId ?? "" });
         }
-        s.basePath = _resolvePausedResumeBasePathForTest(base, resumeWorktreePath);
+        // ADR-016 phase 2 / B3 (#5621): paused-resume worktree-path adoption.
+        buildLifecycle().resumeFromPausedSession(base, resumeWorktreePath);
         // Rebuild scope now that s.basePath reflects the actual worktree (or project root).
         rebuildScope(s.basePath, s.currentMilestoneId);
         // Ensure the workflow-logger audit log is pinned to the project root
@@ -1936,7 +2120,12 @@ export async function dispatchHookUnit(ctx, pi, hookName, triggerUnitType, trigg
         s.currentUnit = null;
         s.pendingQuickTasks = [];
     }
-    s.basePath = targetBasePath;
+    // ADR-016 phase 2 / B2 (#5620): hook-trigger basePath transition. Treats
+    // the trigger as a bootstrap variant — if the session is fresh,
+    // `originalBasePath` gets set to `targetBasePath`; if the session was
+    // already active with an established `originalBasePath`, the verb
+    // preserves it.
+    buildLifecycle().adoptSessionRoot(targetBasePath);
     if (!s.orchestration) {
         ensureOrchestrationModule(ctx, pi, s.basePath);
     }

package/dist/resources/extensions/gsd/bootstrap/agent-end-recovery.js

@@ -2,7 +2,7 @@
 import { logWarning } from "../workflow-logger.js";
 import { checkDeepProjectSetupAfterTurn, checkAutoStartAfterDiscuss, maybeHandleReadyPhraseWithoutFiles, maybeHandleEmptyIntentTurn, resetEmptyTurnCounter, } from "../guided-flow.js";
 import { clearPathCache } from "../paths.js";
-import { getAutoDashboardData, getAutoModeStartModel, isAutoActive, pauseAuto, setCurrentDispatchedModelId } from "../auto.js";
+import { getAutoDashboardData, getAutoModeStartModel, isAutoActive, isAutoCompletionStopInProgress, pauseAuto, setCurrentDispatchedModelId, } from "../auto.js";
 import { getNextFallbackModel, resolveModelWithFallbacksForUnit } from "../preferences.js";
 import { pauseAutoForProviderError } from "../provider-error-pause.js";
 import { isSessionSwitchAbortGraceActive, isSessionSwitchInFlight, resolveAgentEnd, resolveAgentEndCancelled, } from "../auto/resolve.js";
@@ -116,8 +116,7 @@ export function isBareClaudeCodeStreamAbortPlaceholder(lastMsg) {
  * Claude Code abort markers are intentionally ignored when the abort fires
  * while the session-switch is in flight: the abort is the expected side-effect
  * of the transition, not a user signal. Other branches (genuine `stopReason
- * === "aborted"` with diagnostic content/errorMessage) preserve the prior
- * behavior.
+ * === "aborted"` with explicit errorMessage) preserve the prior behavior.
  */
 export function _handleSessionSwitchAgentEnd(lastMsg, resolveCancelled) {
     if (!lastMsg || typeof lastMsg !== "object")
@@ -136,10 +135,8 @@ export function _handleSessionSwitchAgentEnd(lastMsg, resolveCancelled) {
         return;
     }
     if (m.stopReason === "aborted") {
-        const content = m.content;
-        const hasEmptyContent = Array.isArray(content) && content.length === 0;
         const hasErrorMessage = !!m.errorMessage;
-        if (!hasEmptyContent || hasErrorMessage) {
+        if (hasErrorMessage) {
             resolveCancelled(_buildAbortedPauseContext(m));
         }
     }
@@ -239,6 +236,11 @@ export async function handleAgentEnd(pi, event, ctx) {
         return;
     }
     if (isObjectRecord(lastMsg) && "stopReason" in lastMsg && lastMsg.stopReason === "aborted") {
+        if (isAutoCompletionStopInProgress()) {
+            resetRetryState(retryState);
+            resolveAgentEnd(event);
+            return;
+        }
         // Empty content with aborted stopReason is a non-fatal agent stop (the LLM
         // chose to end without producing output). Only pause on genuine fatal aborts
         // that carry error context — e.g. errorMessage field or non-empty content
@@ -274,6 +276,11 @@ export async function handleAgentEnd(pi, event, ctx) {
         // errorMessage looks uninformative.
         const rawErrorMsg = ("errorMessage" in lastMsg && lastMsg.errorMessage) ? String(lastMsg.errorMessage) : "";
         if (isUserInitiatedAbortMessage(rawErrorMsg)) {
+            if (isAutoCompletionStopInProgress()) {
+                resetRetryState(retryState);
+                resolveAgentEnd(event);
+                return;
+            }
             resolveAgentEndCancelled({
                 message: rawErrorMsg,
                 category: "aborted",

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

@@ -10,7 +10,7 @@ import { canonicalToolName, clearDiscussionFlowState, isDepthConfirmationAnswer,
 import { resolveManifest } from "../unit-context-manifest.js";
 import { isBlockedStateFile, isBashWriteToStateFile, BLOCKED_WRITE_ERROR } from "../write-intercept.js";
 import { loadFile, saveFile, formatContinue } from "../files.js";
-import { getAutoRuntimeSnapshot, isAutoActive, isAutoPaused, markToolEnd, markToolStart, recordToolInvocationError } from "../auto-runtime-state.js";
+import { clearToolInvocationError, getAutoRuntimeSnapshot, isAutoActive, isAutoPaused, markToolEnd, markToolStart, recordToolInvocationError } from "../auto-runtime-state.js";
 import { checkToolCallLoop, resetToolCallLoopGuard } from "./tool-call-loop-guard.js";
 import { saveActivityLog } from "../activity-log.js";
 import { recordToolCall as safetyRecordToolCall, recordToolResult as safetyRecordToolResult, saveEvidenceToDisk } from "../safety/evidence-collector.js";
@@ -123,7 +123,7 @@ const AUTO_UNIT_SCOPED_TOOLS = {
     "plan-slice": ["gsd_plan_slice", "gsd_plan_task", "gsd_decision_save"],
     "refine-slice": ["gsd_plan_slice", "gsd_plan_task", "gsd_decision_save"],
     "replan-slice": ["gsd_replan_slice", "gsd_plan_task", "gsd_decision_save"],
-    "complete-slice": ["gsd_slice_complete", "gsd_decision_save", "gsd_requirement_update", "subagent"],
+    "complete-slice": ["gsd_slice_complete", "gsd_task_reopen", "gsd_replan_slice", "gsd_decision_save", "gsd_requirement_update", "subagent"],
     "reassess-roadmap": ["gsd_reassess_roadmap"],
     "execute-task": ["gsd_task_complete", "gsd_decision_save"],
     "execute-task-simple": ["gsd_task_complete", "gsd_decision_save"],
@@ -773,6 +773,9 @@ export function registerHooks(pi, ecosystemHandlers) {
             // errors and deterministic policy rejections are handled consistently.
             recordToolInvocationError(event.toolName, errorText);
         }
+        else if (isAutoActive()) {
+            clearToolInvocationError();
+        }
         const toolName = canonicalToolName(event.toolName);
         if (toolName !== "ask_user_questions")
             return;
@@ -891,6 +894,9 @@ export function registerHooks(pi, ecosystemHandlers) {
             // errors and deterministic policy rejections are handled consistently.
             recordToolInvocationError(event.toolName, errorText);
         }
+        else if (isAutoActive()) {
+            clearToolInvocationError();
+        }
         // Safety harness: record tool execution results for evidence cross-referencing
         if (isAutoActive()) {
             safetyRecordToolResult(event.toolCallId, event.toolName, event.result, event.isError);