@opengsd/gsd-pi 1.0.2-dev.5961fbf → 1.0.2-dev.5f7864c

package/dist/resources/extensions/google-cli/stream-adapter.js

@@ -0,0 +1,191 @@
+import { spawn } from "node:child_process";
+import { createAssistantMessageEventStream } from "@gsd/pi-ai";
+const ZERO_USAGE = {
+    input: 0,
+    output: 0,
+    cacheRead: 0,
+    cacheWrite: 0,
+    totalTokens: 0,
+    cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, total: 0 },
+};
+function textBlocks(content) {
+    return content
+        .map((block) => block.type === "text" ? block.text : `[${block.type} omitted]`)
+        .join("\n");
+}
+function messageToText(message) {
+    if (message.role === "user") {
+        const content = typeof message.content === "string" ? message.content : textBlocks(message.content);
+        return `User:\n${content}`;
+    }
+    if (message.role === "assistant") {
+        const text = message.content
+            .map((block) => {
+            if (block.type === "text")
+                return block.text;
+            if (block.type === "thinking")
+                return `[thinking omitted]`;
+            if (block.type === "toolCall")
+                return `[tool call: ${block.name}]`;
+            if (block.type === "serverToolUse")
+                return `[server tool: ${block.name}]`;
+            if (block.type === "webSearchResult")
+                return `[web search result omitted]`;
+            return `[${block.type} omitted]`;
+        })
+            .join("\n");
+        return `Assistant:\n${text}`;
+    }
+    return `Tool result (${message.toolName}):\n${textBlocks(message.content)}`;
+}
+export function buildGoogleCliPrompt(context) {
+    const parts = [];
+    if (context.systemPrompt?.trim()) {
+        parts.push(`System instructions:\n${context.systemPrompt.trim()}`);
+    }
+    if (context.messages.length > 0) {
+        parts.push(context.messages.map(messageToText).join("\n\n"));
+    }
+    if (context.tools?.length) {
+        const names = context.tools.map((tool) => tool.name).join(", ");
+        parts.push(`Available local GSD tools were not forwarded to this external CLI bridge. ` +
+            `If you need to act, use the CLI's own tools or ask the user to switch to a provider with native tool-call support. ` +
+            `Requested GSD tools: ${names}`);
+    }
+    return parts.join("\n\n").trim();
+}
+function buildAssistantMessage(model, text, stopReason = "stop", errorMessage) {
+    return {
+        role: "assistant",
+        content: text ? [{ type: "text", text }] : [],
+        api: model.api,
+        provider: model.provider,
+        model: model.id,
+        usage: { ...ZERO_USAGE, cost: { ...ZERO_USAGE.cost } },
+        stopReason,
+        ...(errorMessage ? { errorMessage } : {}),
+        timestamp: Date.now(),
+    };
+}
+function extractGeminiJsonResponse(raw) {
+    const trimmed = raw.trim();
+    if (!trimmed)
+        return "";
+    try {
+        const parsed = JSON.parse(trimmed);
+        for (const key of ["response", "text", "content", "message"]) {
+            const value = parsed[key];
+            if (typeof value === "string")
+                return value;
+        }
+        return JSON.stringify(parsed, null, 2);
+    }
+    catch {
+        return trimmed;
+    }
+}
+function commandForProvider(provider) {
+    return provider === "google-gemini-cli" ? "gemini" : "agy";
+}
+function argsForProvider(provider, model, prompt) {
+    if (provider === "google-gemini-cli") {
+        const args = ["-p", prompt, "--output-format", "json"];
+        if (model.id !== "default")
+            args.unshift("-m", model.id);
+        return args;
+    }
+    const args = ["-p", prompt];
+    if (model.id !== "default")
+        args.unshift("-m", model.id);
+    return args;
+}
+export function buildGoogleCliSpawnInvocation(command, args, platform = process.platform) {
+    if (platform === "win32") {
+        return { command: "cmd", args: ["/c", command, ...args] };
+    }
+    return { command, args };
+}
+function runCli(command, args, options) {
+    return new Promise((resolve, reject) => {
+        const invocation = buildGoogleCliSpawnInvocation(command, args);
+        const child = spawn(invocation.command, invocation.args, {
+            cwd: options?.cwd || process.cwd(),
+            env: process.env,
+            stdio: ["ignore", "pipe", "pipe"],
+        });
+        let stdout = "";
+        let stderr = "";
+        let settled = false;
+        const settle = (fn) => {
+            if (settled)
+                return;
+            settled = true;
+            options?.signal?.removeEventListener("abort", onAbort);
+            fn();
+        };
+        const onAbort = () => {
+            child.kill("SIGTERM");
+            settle(() => reject(new Error("Request was aborted")));
+        };
+        if (options?.signal?.aborted) {
+            onAbort();
+            return;
+        }
+        options?.signal?.addEventListener("abort", onAbort);
+        child.stdout.setEncoding("utf8");
+        child.stderr.setEncoding("utf8");
+        child.stdout.on("data", (chunk) => {
+            stdout += chunk;
+        });
+        child.stderr.on("data", (chunk) => {
+            stderr += chunk;
+        });
+        child.on("error", (error) => {
+            settle(() => reject(error));
+        });
+        child.on("close", (code, signal) => {
+            settle(() => resolve({ stdout, stderr, code, signal }));
+        });
+    });
+}
+function emitText(stream, message, text) {
+    stream.push({ type: "start", partial: { ...message, content: [] } });
+    if (text) {
+        stream.push({ type: "text_start", contentIndex: 0, partial: message });
+        stream.push({ type: "text_delta", contentIndex: 0, delta: text, partial: message });
+        stream.push({ type: "text_end", contentIndex: 0, content: text, partial: message });
+    }
+    stream.push({ type: "done", reason: "stop", message });
+    stream.end(message);
+}
+function emitError(stream, model, error) {
+    const message = error instanceof Error ? error.message : String(error);
+    const output = buildAssistantMessage(model, "", "error", message);
+    stream.push({ type: "error", reason: "error", error: output });
+    stream.end(output);
+}
+export function streamViaGoogleCli(model, context, options) {
+    const stream = createAssistantMessageEventStream();
+    const provider = model.provider;
+    queueMicrotask(async () => {
+        try {
+            const prompt = buildGoogleCliPrompt(context);
+            const command = commandForProvider(provider);
+            const args = argsForProvider(provider, model, prompt);
+            const result = await runCli(command, args, options);
+            if (result.code !== 0) {
+                const detail = (result.stderr || result.stdout || `CLI exited with code ${result.code}`).trim();
+                throw new Error(detail);
+            }
+            const text = provider === "google-gemini-cli"
+                ? extractGeminiJsonResponse(result.stdout)
+                : result.stdout.trim();
+            const message = buildAssistantMessage(model, text);
+            emitText(stream, message, text);
+        }
+        catch (error) {
+            emitError(stream, model, error);
+        }
+    });
+    return stream;
+}

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

@@ -132,6 +132,8 @@ export class AutoSession {
     // ── Isolation degradation ────────────────────────────────────────────
     /** Set to true when worktree creation fails; prevents merge of nonexistent branch. */
     isolationDegraded = false;
+    /** Temporary recovery mode for stranded work adopted from physical git evidence. */
+    strandedRecoveryIsolationMode = null;
     /** Project-root dirty snapshot captured before an isolated worktree unit runs. */
     rootWriteBaseline = null;
     // ── Merge guard ──────────────────────────────────────────────────────
@@ -285,6 +287,7 @@ export class AutoSession {
         this.lastGitActionFailure = null;
         this.lastGitActionStatus = null;
         this.isolationDegraded = false;
+        this.strandedRecoveryIsolationMode = null;
         this.rootWriteBaseline = null;
         this.milestoneMergedInPhases = false;
         this.milestoneStartShas = new Map();

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

@@ -21,7 +21,7 @@ import { invalidateAllCaches } from "./cache.js";
 import { writeLock, clearLock, readCrashLock, isLockProcessAlive } from "./crash-recovery.js";
 import { acquireSessionLock, releaseSessionLock, updateSessionLock, } from "./session-lock.js";
 import { ensureGitignore, untrackRuntimeFiles } from "./gitignore.js";
-import { nativeIsRepo, nativeInit, nativeAddAll, nativeCommit, nativeGetCurrentBranch, nativeDetectMainBranch, nativeBranchList, nativeBranchExists, nativeBranchListMerged, nativeBranchDelete, nativeWorktreeRemove, nativeCommitCountBetween, } from "./native-git-bridge.js";
+import { nativeIsRepo, nativeInit, nativeAddAll, nativeCommit, nativeGetCurrentBranch, nativeDetectMainBranch, nativeBranchList, nativeBranchExists, nativeBranchListMerged, nativeBranchDelete, nativeWorktreeRemove, nativeCommitCountBetween, nativeHasChanges, } from "./native-git-bridge.js";
 import { GitServiceImpl } from "./git-service.js";
 import { captureIntegrationBranch, detectWorktreeName, setActiveMilestoneId, } from "./worktree.js";
 import { getAutoWorktreePath, checkoutBranchWithStashGuard } from "./auto-worktree.js";
@@ -126,17 +126,68 @@ export function resolveSurvivorRecoveryIsolationMode(isolationMode, phase) {
         return "branch";
     return isolationMode;
 }
-export function auditOrphanedMilestoneBranches(basePath, isolationMode, gitDeps = {}) {
+function isBlockingStrandedWorkAction(action) {
+    return action.kind === "in-progress-stranded-work" && action.blocksAuto;
+}
+function detectWorktreeEvidence(basePath, milestoneId, hasChanges) {
+    const wtDir = getWorktreeDir(basePath, milestoneId);
+    const wtPath = getAutoWorktreePath(basePath, milestoneId);
+    let dirty = false;
+    if (wtPath) {
+        try {
+            dirty = hasChanges(wtPath);
+        }
+        catch {
+            dirty = false;
+        }
+    }
+    return {
+        path: wtPath,
+        dirExists: existsSync(wtDir),
+        dirty,
+    };
+}
+function strandedWorkMessage(args) {
+    const evidence = [];
+    if (args.branch && args.commitsAhead > 0) {
+        evidence.push(`branch ${args.branch} has ${args.commitsAhead} commit(s) ahead of ${args.mainBranch}`);
+    }
+    if (args.dirtyWorktree) {
+        evidence.push("the worktree has uncommitted changes");
+    }
+    if (evidence.length === 0) {
+        evidence.push("physical git evidence exists");
+    }
+    const wtSuffix = args.worktreeDirExists
+        ? ` Worktree directory at .gsd/worktrees/${args.milestoneId}/ holds live work.`
+        : "";
+    const recovery = args.recoveryMode === "worktree"
+        ? "Recovering will adopt the existing worktree."
+        : "Recovering will adopt the milestone branch.";
+    return (`Stranded work for in-progress milestone ${args.milestoneId}: ${evidence.join("; ")}.` +
+        wtSuffix +
+        ` ${recovery} Park or discard explicitly if abandoning.`);
+}
+export function auditOrphanedMilestoneBranches(basePath, _isolationMode, gitDeps = {}) {
     const recovered = [];
     const warnings = [];
+    const actions = [];
     const branchList = gitDeps.branchList ?? nativeBranchList;
     const branchExists = gitDeps.branchExists ?? nativeBranchExists;
-    // Skip in none mode — no milestone branches are created
-    if (isolationMode === "none")
-        return { recovered, warnings };
+    const hasChanges = gitDeps.hasChanges ?? nativeHasChanges;
+    const pushAction = (action) => {
+        actions.push(action);
+        if (action.severity === "info") {
+            recovered.push(action.message);
+        }
+        else {
+            warnings.push(action.message);
+        }
+    };
     // Skip if DB not available — can't determine completion status
-    if (!isDbAvailable())
-        return { recovered, warnings };
+    if (!isDbAvailable()) {
+        return { recovered, warnings, actions, blockingStrandedWork: null };
+    }
     let milestoneBranches;
     let milestoneBranchListAvailable = true;
     try {
@@ -170,6 +221,7 @@ export function auditOrphanedMilestoneBranches(basePath, isolationMode, gitDeps
         if (!milestone)
             continue;
         const isMerged = mergedBranches.has(branch);
+        const worktreeEvidence = detectWorktreeEvidence(basePath, milestoneId, hasChanges);
         // #4762 — in-progress milestone branch with unmerged commits ahead of
         // main. This is the pre-completion orphan case: auto-mode exited without
         // completing the milestone (pause, stop, crash, merge error, blocker) and
@@ -181,32 +233,45 @@ export function auditOrphanedMilestoneBranches(basePath, isolationMode, gitDeps
         // Parked/other closed statuses go through the legacy complete/unmerged
         // path below where appropriate.
         if (!isClosedStatus(milestone.status)) {
-            if (isMerged)
-                continue; // nothing to recover
             let commitsAhead = 0;
             try {
                 commitsAhead = nativeCommitCountBetween(basePath, mainBranch, branch);
             }
             catch {
-                // Rev-walk failure — skip rather than noise
-                continue;
+                commitsAhead = 0;
             }
-            if (commitsAhead === 0)
+            if ((isMerged || commitsAhead === 0) && !worktreeEvidence.dirty)
                 continue;
-            const wtDir = getWorktreeDir(basePath, milestoneId);
-            const wtDirExists = existsSync(wtDir);
-            const wtSuffix = wtDirExists
-                ? ` Worktree directory at .gsd/worktrees/${milestoneId}/ holds the live work.`
-                : "";
-            warnings.push(`Branch ${branch} has ${commitsAhead} commit(s) ahead of ${mainBranch} for in-progress milestone ${milestoneId}.` +
-                wtSuffix +
-                ` Run \`/gsd auto\` to resume, or merge manually if abandoning.`);
+            const recoveryMode = worktreeEvidence.path
+                ? "worktree"
+                : "branch";
+            const message = strandedWorkMessage({
+                milestoneId,
+                branch,
+                commitsAhead,
+                mainBranch,
+                dirtyWorktree: worktreeEvidence.dirty,
+                worktreeDirExists: worktreeEvidence.dirExists,
+                recoveryMode,
+            });
+            pushAction({
+                kind: "in-progress-stranded-work",
+                milestoneId,
+                branch,
+                commitsAhead,
+                dirtyWorktree: worktreeEvidence.dirty,
+                worktreeDirExists: worktreeEvidence.dirExists,
+                recoveryMode,
+                message,
+                severity: "warning",
+                blocksAuto: true,
+            });
             // #4764 telemetry
             try {
                 emitWorktreeOrphaned(basePath, milestoneId, {
                     reason: "in-progress-unmerged",
                     commitsAhead,
-                    worktreeDirExists: wtDirExists,
+                    worktreeDirExists: worktreeEvidence.dirExists,
                 });
             }
             catch (err) {
@@ -223,7 +288,14 @@ export function auditOrphanedMilestoneBranches(basePath, isolationMode, gitDeps
             // Branch is merged — safe to delete branch and clean up worktree dir
             try {
                 nativeBranchDelete(basePath, branch, true);
-                recovered.push(`Deleted merged branch ${branch} for completed milestone ${milestoneId}.`);
+                pushAction({
+                    kind: "complete-merged-branch",
+                    milestoneId,
+                    branch,
+                    message: `Deleted merged branch ${branch} for completed milestone ${milestoneId}.`,
+                    severity: "info",
+                    blocksAuto: false,
+                });
             }
             catch (err) {
                 warnings.push(`Failed to delete merged branch ${branch}: ${err instanceof Error ? err.message : String(err)}`);
@@ -246,7 +318,15 @@ export function auditOrphanedMilestoneBranches(basePath, isolationMode, gitDeps
                     if (isInsideWorktreesDir(basePath, wtDir)) {
                         try {
                             rmSync(wtDir, { recursive: true, force: true });
-                            recovered.push(`Removed orphaned worktree directory for ${milestoneId}.`);
+                            pushAction({
+                                kind: "complete-merged-worktree",
+                                milestoneId,
+                                branch,
+                                worktreeDirExists: true,
+                                message: `Removed orphaned worktree directory for ${milestoneId}.`,
+                                severity: "info",
+                                blocksAuto: false,
+                            });
                         }
                         catch (err2) {
                             warnings.push(`Failed to remove worktree directory for ${milestoneId}: ${err2 instanceof Error ? err2.message : String(err2)}`);
@@ -257,14 +337,30 @@ export function auditOrphanedMilestoneBranches(basePath, isolationMode, gitDeps
                     }
                 }
                 else {
-                    recovered.push(`Removed orphaned worktree directory for ${milestoneId}.`);
+                    pushAction({
+                        kind: "complete-merged-worktree",
+                        milestoneId,
+                        branch,
+                        worktreeDirExists: true,
+                        message: `Removed orphaned worktree directory for ${milestoneId}.`,
+                        severity: "info",
+                        blocksAuto: false,
+                    });
                 }
             }
         }
         else {
             // Branch is NOT merged — preserve for safety, warn the user
-            warnings.push(`Branch ${branch} exists for completed milestone ${milestoneId} but is NOT merged into ${mainBranch}. ` +
-                `This may contain unmerged work. Merge manually or run \`/gsd doctor fix\` to resolve.`);
+            pushAction({
+                kind: "complete-unmerged-branch",
+                milestoneId,
+                branch,
+                worktreeDirExists: worktreeEvidence.dirExists,
+                message: `Branch ${branch} exists for completed milestone ${milestoneId} but is NOT merged into ${mainBranch}. ` +
+                    `This may contain unmerged work. Merge manually or run \`/gsd doctor fix\` to resolve.`,
+                severity: "warning",
+                blocksAuto: false,
+            });
             // #4764 telemetry
             try {
                 emitWorktreeOrphaned(basePath, milestoneId, {
@@ -300,6 +396,43 @@ export function auditOrphanedMilestoneBranches(basePath, isolationMode, gitDeps
         completedMilestones = [];
     }
     for (const m of completedMilestones) {
+        if (!isClosedStatus(m.status)) {
+            if (seenMilestoneIds.has(m.id))
+                continue;
+            const worktreeEvidence = detectWorktreeEvidence(basePath, m.id, hasChanges);
+            if (!worktreeEvidence.dirty)
+                continue;
+            const message = strandedWorkMessage({
+                milestoneId: m.id,
+                commitsAhead: 0,
+                mainBranch,
+                dirtyWorktree: true,
+                worktreeDirExists: worktreeEvidence.dirExists,
+                recoveryMode: "worktree",
+            });
+            pushAction({
+                kind: "in-progress-stranded-work",
+                milestoneId: m.id,
+                commitsAhead: 0,
+                dirtyWorktree: true,
+                worktreeDirExists: worktreeEvidence.dirExists,
+                recoveryMode: "worktree",
+                message,
+                severity: "warning",
+                blocksAuto: true,
+            });
+            try {
+                emitWorktreeOrphaned(basePath, m.id, {
+                    reason: "in-progress-unmerged",
+                    commitsAhead: 0,
+                    worktreeDirExists: worktreeEvidence.dirExists,
+                });
+            }
+            catch (err) {
+                logWarning("engine", `worktree-orphaned telemetry failed for ${m.id}: ${err instanceof Error ? err.message : String(err)}`);
+            }
+            continue;
+        }
         if (m.status !== "complete")
             continue;
         if (seenMilestoneIds.has(m.id))
@@ -332,17 +465,36 @@ export function auditOrphanedMilestoneBranches(basePath, isolationMode, gitDeps
         if (existsSync(wtDir)) {
             try {
                 rmSync(wtDir, { recursive: true, force: true });
-                recovered.push(`Removed orphaned worktree directory for ${m.id} (branch already deleted).`);
+                pushAction({
+                    kind: "complete-branchless-worktree",
+                    milestoneId: m.id,
+                    worktreeDirExists: true,
+                    message: `Removed orphaned worktree directory for ${m.id} (branch already deleted).`,
+                    severity: "info",
+                    blocksAuto: false,
+                });
             }
             catch (err) {
                 warnings.push(`Failed to remove orphaned worktree directory for ${m.id}: ${err instanceof Error ? err.message : String(err)}`);
             }
         }
         else {
-            recovered.push(`Removed orphaned worktree directory for ${m.id} (branch already deleted).`);
+            pushAction({
+                kind: "complete-branchless-worktree",
+                milestoneId: m.id,
+                worktreeDirExists: true,
+                message: `Removed orphaned worktree directory for ${m.id} (branch already deleted).`,
+                severity: "info",
+                blocksAuto: false,
+            });
         }
     }
-    return { recovered, warnings };
+    return {
+        recovered,
+        warnings,
+        actions,
+        blockingStrandedWork: actions.find(isBlockingStrandedWorkAction) ?? null,
+    };
 }
 /**
  * Pure decision function for picking which orphan milestone the auto-loop
@@ -679,17 +831,27 @@ export async function bootstrapAutoSession(s, ctx, pi, base, verboseMode, reques
         // was lost due to session ending between completion and teardown.
         // Must run after DB open and before worktree entry.
         let orphanAuditRecovered = false;
+        let strandedRecoveryActions = [];
+        let strandedRecoveryAction = null;
         try {
             const auditResult = auditOrphanedMilestoneBranches(base, getIsolationMode(base));
+            strandedRecoveryActions = auditResult.actions.filter(isBlockingStrandedWorkAction);
+            strandedRecoveryAction = strandedRecoveryActions[0] ?? null;
             for (const msg of auditResult.recovered) {
                 ctx.ui.notify(`Orphan audit: ${msg}`, "info");
             }
             for (const msg of auditResult.warnings) {
-                ctx.ui.notify(`Orphan audit: ${msg}`, "warning");
+                const prefix = msg.startsWith("Stranded work") ? "" : "Orphan audit: ";
+                ctx.ui.notify(`${prefix}${msg}`, "warning");
             }
             if (auditResult.recovered.length > 0) {
                 orphanAuditRecovered = true;
-                debugLog("orphan-audit", { recovered: auditResult.recovered, warnings: auditResult.warnings });
+                debugLog("orphan-audit", {
+                    recovered: auditResult.recovered,
+                    warnings: auditResult.warnings,
+                    strandedRecoveryAction,
+                    strandedRecoveryActions,
+                });
             }
         }
         catch (err) {
@@ -724,13 +886,6 @@ export async function bootstrapAutoSession(s, ctx, pi, base, verboseMode, reques
             logWarning("bootstrap", `orphaned preflight-stash audit failed: ${err instanceof Error ? err.message : String(err)}`);
         }
         let state = await deriveState(base);
-        if (process.env.GSD_HEADLESS === "1" &&
-            orphanAuditRecovered &&
-            !state.activeMilestone &&
-            state.phase === "complete") {
-            ctx.ui.notify("Auto-mode stopped (Recovered completed milestone cleanup; all milestones complete).", "info");
-            return releaseLockAndReturn();
-        }
         // Stale worktree state recovery (#654)
         if (state.activeMilestone &&
             shouldUseWorktreeIsolation(base) &&
@@ -740,6 +895,28 @@ export async function bootstrapAutoSession(s, ctx, pi, base, verboseMode, reques
                 state = await deriveState(wtPath);
             }
         }
+        const blockingStrandedRecoveryAction = state.activeMilestone
+            ? strandedRecoveryActions.find((action) => action.milestoneId !== state.activeMilestone?.id) ?? strandedRecoveryAction
+            : strandedRecoveryAction;
+        if (blockingStrandedRecoveryAction) {
+            if (!state.activeMilestone) {
+                ctx.ui.notify(`Stranded work for ${blockingStrandedRecoveryAction.milestoneId} blocks auto-mode, but that milestone is not active in project state. Park or discard it explicitly before continuing.`, "error");
+                return releaseLockAndReturn();
+            }
+            if (state.activeMilestone.id !== blockingStrandedRecoveryAction.milestoneId) {
+                ctx.ui.notify(`Stranded work for ${blockingStrandedRecoveryAction.milestoneId} blocks auto-mode before ${state.activeMilestone.id}. Recover, park, or discard ${blockingStrandedRecoveryAction.milestoneId} explicitly before continuing.`, "error");
+                return releaseLockAndReturn();
+            }
+            strandedRecoveryAction = blockingStrandedRecoveryAction;
+            ctx.ui.notify(`Recovering stranded work for ${strandedRecoveryAction.milestoneId} before dispatching new units.`, "info");
+        }
+        if (process.env.GSD_HEADLESS === "1" &&
+            orphanAuditRecovered &&
+            !state.activeMilestone &&
+            state.phase === "complete") {
+            ctx.ui.notify("Auto-mode stopped (Recovered completed milestone cleanup; all milestones complete).", "info");
+            return releaseLockAndReturn();
+        }
         // Milestone branch recovery (#601, #2358)
         // Detect survivor milestone branches in both pre-planning and complete phases.
         // In phase=complete, the milestone artifacts exist but finalization (merge,
@@ -768,7 +945,8 @@ export async function bootstrapAutoSession(s, ctx, pi, base, verboseMode, reques
         // The worktree/branch was created but the milestone only has CONTEXT-DRAFT.md.
         // Route to the interactive discussion handler instead of falling through to
         // auto-mode, which would immediately stop with "needs discussion".
-        if (decideSurvivorAction(hasSurvivorBranch, state.phase) === "discuss") {
+        if (!strandedRecoveryAction &&
+            decideSurvivorAction(hasSurvivorBranch, state.phase) === "discuss") {
             const { showSmartEntry } = await import("./guided-flow.js");
             await showSmartEntry(ctx, pi, base, { step: requestedStepMode });
             invalidateAllCaches();
@@ -848,14 +1026,14 @@ export async function bootstrapAutoSession(s, ctx, pi, base, verboseMode, reques
         const effectivePrefs = loadEffectiveGSDPreferences(base)?.preferences;
         const { shouldRunDeepProjectSetup } = await import("./auto-dispatch.js");
         const deepProjectStagePending = shouldRunDeepProjectSetup(state, effectivePrefs, base, { hasSurvivorBranch });
-        if (deepProjectStagePending) {
+        if (deepProjectStagePending && !strandedRecoveryAction) {
             // Deep project-level setup runs before the first milestone exists. Let
             // the auto loop dispatch workflow-preferences / project / requirements
             // units instead of recursing back through showSmartEntry while this
             // bootstrap still holds the session lock.
             s.currentMilestoneId = null;
         }
-        if (!hasSurvivorBranch && !deepProjectStagePending) {
+        if (!hasSurvivorBranch && !deepProjectStagePending && !strandedRecoveryAction) {
             // No active work — start a new milestone via discuss flow
             if (!state.activeMilestone || state.phase === "complete") {
                 // Guard against recursive dialog loop (#1348):
@@ -917,7 +1095,7 @@ export async function bootstrapAutoSession(s, ctx, pi, base, verboseMode, reques
             }
         }
         // Unreachable safety check
-        if (!state.activeMilestone && !deepProjectStagePending) {
+        if (!state.activeMilestone && !deepProjectStagePending && !strandedRecoveryAction) {
             const { showSmartEntry } = await import("./guided-flow.js");
             await showSmartEntry(ctx, pi, base, { step: requestedStepMode });
             return releaseLockAndReturn();
@@ -952,7 +1130,9 @@ export async function bootstrapAutoSession(s, ctx, pi, base, verboseMode, reques
         s.resourceVersionOnStart = readResourceVersion();
         s.pendingQuickTasks = [];
         s.currentUnit = null;
-        s.currentMilestoneId ??= deepProjectStagePending ? null : state.activeMilestone?.id ?? null;
+        s.currentMilestoneId ??=
+            strandedRecoveryAction?.milestoneId ??
+                (deepProjectStagePending ? null : state.activeMilestone?.id ?? null);
         s.originalModelId = startModelSnapshot?.id ?? ctx.model?.id ?? null;
         s.originalModelProvider = startModelSnapshot?.provider ?? ctx.model?.provider ?? null;
         s.originalThinkingLevel = startThinkingSnapshot ?? null;
@@ -960,7 +1140,7 @@ export async function bootstrapAutoSession(s, ctx, pi, base, verboseMode, reques
         registerSigtermHandler(base);
         // Capture integration branch
         if (s.currentMilestoneId) {
-            if (getIsolationMode(base) !== "none") {
+            if (getIsolationMode(base) !== "none" || strandedRecoveryAction) {
                 captureIntegrationBranch(base, s.currentMilestoneId);
             }
             setActiveMilestoneId(base, s.currentMilestoneId);
@@ -970,7 +1150,7 @@ export async function bootstrapAutoSession(s, ctx, pi, base, verboseMode, reques
         // milestone/<MID>. Auto-checkout back to the integration branch.
         const isolationMode = getIsolationMode(base);
         const isRepo = nativeIsRepo(base);
-        if (isolationMode === "none" && isRepo) {
+        if (isolationMode === "none" && isRepo && !strandedRecoveryAction) {
             try {
                 const currentBranch = nativeGetCurrentBranch(base);
                 const integrationBranch = nativeDetectMainBranch(base);
@@ -1001,12 +1181,15 @@ export async function bootstrapAutoSession(s, ctx, pi, base, verboseMode, reques
             return symlinkRe.test(p);
         };
         if (s.currentMilestoneId &&
-            getIsolationMode(base) !== "none" &&
+            (getIsolationMode(base) !== "none" || strandedRecoveryAction?.recoveryMode) &&
             !detectWorktreeName(base) &&
             !isUnderGsdWorktrees(base)) {
-            const enterResult = buildLifecycle().enterMilestone(s.currentMilestoneId, {
-                notify: ctx.ui.notify.bind(ctx.ui),
-            });
+            const lifecycle = buildLifecycle();
+            const enterResult = strandedRecoveryAction?.recoveryMode
+                ? lifecycle.adoptStrandedMilestone(s.currentMilestoneId, base, { notify: ctx.ui.notify.bind(ctx.ui) }, { mode: strandedRecoveryAction.recoveryMode })
+                : lifecycle.enterMilestone(s.currentMilestoneId, {
+                    notify: ctx.ui.notify.bind(ctx.ui),
+                });
             if (!enterResult.ok) {
                 s.active = false;
                 if (enterResult.reason === "lease-conflict") {