@opengsd/gsd-pi 1.0.2-dev.e70300c → 1.0.2-dev.fb7ddf1

package/dist/resources/extensions/google-cli/models.js

@@ -0,0 +1,55 @@
+const ZERO_COST = {
+    input: 0,
+    output: 0,
+    cacheRead: 0,
+    cacheWrite: 0,
+};
+export const GOOGLE_GEMINI_CLI_MODELS = [
+    {
+        id: "gemini-2.5-flash",
+        name: "Gemini 2.5 Flash",
+        reasoning: true,
+        input: ["text"],
+        cost: ZERO_COST,
+        contextWindow: 1_000_000,
+        maxTokens: 65_536,
+    },
+    {
+        id: "gemini-2.5-pro",
+        name: "Gemini 2.5 Pro",
+        reasoning: true,
+        input: ["text"],
+        cost: ZERO_COST,
+        contextWindow: 1_000_000,
+        maxTokens: 65_536,
+    },
+    {
+        id: "gemini-3-flash-preview",
+        name: "Gemini 3 Flash Preview",
+        reasoning: true,
+        input: ["text"],
+        cost: ZERO_COST,
+        contextWindow: 1_000_000,
+        maxTokens: 65_536,
+    },
+    {
+        id: "gemini-3.1-pro-preview",
+        name: "Gemini 3.1 Pro Preview",
+        reasoning: true,
+        input: ["text"],
+        cost: ZERO_COST,
+        contextWindow: 1_000_000,
+        maxTokens: 65_536,
+    },
+];
+export const GOOGLE_ANTIGRAVITY_MODELS = [
+    {
+        id: "default",
+        name: "Antigravity Default",
+        reasoning: true,
+        input: ["text"],
+        cost: ZERO_COST,
+        contextWindow: 1_000_000,
+        maxTokens: 65_536,
+    },
+];

package/dist/resources/extensions/google-cli/package.json

@@ -0,0 +1,11 @@
+{
+  "name": "@gsd/google-cli",
+  "private": true,
+  "version": "1.0.0",
+  "type": "module",
+  "pi": {
+    "extensions": [
+      "./index.js"
+    ]
+  }
+}

package/dist/resources/extensions/google-cli/readiness.js

@@ -0,0 +1,12 @@
+import { spawnSync } from "node:child_process";
+function isCommandInPath(command) {
+    const resolver = process.platform === "win32" ? "where" : "which";
+    const result = spawnSync(resolver, [command], { stdio: "ignore" });
+    return result.status === 0;
+}
+export function isGeminiCliReady() {
+    return isCommandInPath("gemini");
+}
+export function isAntigravityCliReady() {
+    return isCommandInPath("agy");
+}

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/loop.js

@@ -50,6 +50,7 @@ import { handleCustomEngineVerifyPause, handleCustomEngineVerifyRetryOutcome, }
 import { handleCustomEngineReconcile } from "./workflow-custom-engine-reconcile.js";
 import { handleCustomEngineReconcileOutcome } from "./workflow-custom-engine-reconcile-outcome.js";
 import { formatLeaseConflictNotice } from "./lease-conflict-notice.js";
+import { setAutoOutcomeWidget, unitVerb } from "../auto-dashboard.js";
 /**
  * Returns true if workerId is an active worker in this project whose OS
  * process no longer exists. Used to detect dead lease holders before
@@ -690,6 +691,24 @@ export async function autoLoop(ctx, pi, s, deps, options) {
                 });
                 if (reconcileFlow.action === "break")
                     break;
+                if (s.stepMode) {
+                    if (ctx.hasUI) {
+                        ctx.ui.setWidget?.("gsd-progress", undefined);
+                        setAutoOutcomeWidget(ctx, {
+                            status: "step",
+                            title: "Step complete",
+                            detail: `Completed ${unitVerb(iterData.unitType)} ${iterData.unitId}.`,
+                            unitLabel: `${unitVerb(iterData.unitType)} ${iterData.unitId}`,
+                            nextAction: "Advance one step, or resume automatic mode.",
+                            commands: ["/gsd next", "/gsd auto", "/gsd status for overview"],
+                            startedAt: s.autoStartTime,
+                        });
+                    }
+                    ctx.ui.setStatus("gsd-auto", "next");
+                    ctx.ui.notify(`Step complete: ${unitVerb(iterData.unitType)} ${iterData.unitId}. Run /gsd next for the next step, or /gsd auto to continue automatically.`, "info");
+                    s.preserveStepSurfaceAfterLoopExit = true;
+                    break;
+                }
                 continue;
             }
             if (!sidecarItem) {
@@ -713,11 +732,36 @@ export async function autoLoop(ctx, pi, s, deps, options) {
                                 message: orchestrationResult.reason,
                                 category: "unknown",
                             });
+                            finishTurn("paused", "manual-attention", "orchestration-blocked");
                         }
                         else {
                             await deps.stopAuto(ctx, pi, orchestrationResult.reason);
+                            finishTurn("stopped", "manual-attention", "orchestration-blocked");
                         }
-                        finishTurn("stopped", "manual-attention", "orchestration-blocked");
+                        finishIncompleteIteration({
+                            status: orchestrationResult.action === "pause" ? "paused" : "stopped",
+                            reason: orchestrationResult.reason,
+                            failureClass: "manual-attention",
+                        });
+                        break;
+                    }
+                    if (orchestrationResult.kind === "paused") {
+                        s.pendingOrchestrationDispatch = null;
+                        finishTurn("skipped");
+                        continue;
+                    }
+                    if (orchestrationResult.kind === "error") {
+                        s.pendingOrchestrationDispatch = null;
+                        await deps.pauseAuto(ctx, pi, {
+                            message: orchestrationResult.reason,
+                            category: "unknown",
+                        });
+                        finishTurn("paused", "manual-attention", `orchestration-${orchestrationResult.kind}`);
+                        finishIncompleteIteration({
+                            status: "paused",
+                            reason: orchestrationResult.reason,
+                            failureClass: "manual-attention",
+                        });
                         break;
                     }
                     if (orchestrationResult.kind === "stopped") {
@@ -750,6 +794,42 @@ export async function autoLoop(ctx, pi, s, deps, options) {
                         isRetry: false,
                         previousTier: undefined,
                     };
+                    const preDispatchResult = deps.runPreDispatchHooks(iterData.unitType, iterData.unitId, iterData.prompt, s.basePath);
+                    if (preDispatchResult.firedHooks.length > 0) {
+                        ctx.ui.notify(`Pre-dispatch hook${preDispatchResult.firedHooks.length > 1 ? "s" : ""}: ${preDispatchResult.firedHooks.join(", ")}`, "info");
+                        deps.emitJournalEvent({
+                            ts: new Date().toISOString(),
+                            flowId: ic.flowId,
+                            seq: ic.nextSeq(),
+                            eventType: "pre-dispatch-hook",
+                            data: {
+                                firedHooks: preDispatchResult.firedHooks,
+                                action: preDispatchResult.action,
+                            },
+                        });
+                    }
+                    if (preDispatchResult.action === "skip") {
+                        ctx.ui.notify(`Skipping ${iterData.unitType} ${iterData.unitId} (pre-dispatch hook).`, "info");
+                        s.pendingOrchestrationDispatch = null;
+                        emitIterationEnd({ skipped: true });
+                        completeIteration();
+                        finishTurn("skipped");
+                        continue;
+                    }
+                    if (preDispatchResult.action === "replace") {
+                        iterData.prompt = preDispatchResult.prompt ?? iterData.prompt;
+                        iterData.finalPrompt = iterData.prompt;
+                        if (preDispatchResult.unitType) {
+                            iterData.unitType = preDispatchResult.unitType;
+                        }
+                    }
+                    else if (preDispatchResult.prompt) {
+                        iterData.prompt = preDispatchResult.prompt;
+                        iterData.finalPrompt = preDispatchResult.prompt;
+                    }
+                    if (preDispatchResult.model) {
+                        iterData.hookModelOverride = preDispatchResult.model;
+                    }
                     s.pendingOrchestrationDispatch = null;
                     phaseReporter.report("dispatch", "next", {
                         unitType: iterData.unitType,

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

@@ -369,9 +369,11 @@ export class AutoOrchestrator {
         const activeUnitKey = this.status.activeUnit
             ? `${this.status.activeUnit.unitType}:${this.status.activeUnit.unitId}`
             : null;
-        if (activeUnitKey !== unitKey)
+        if (activeUnitKey !== unitKey && this.lastFinalizedUnitKey !== unitKey)
             return;
-        this.status.activeUnit = undefined;
+        if (activeUnitKey === unitKey) {
+            this.status.activeUnit = undefined;
+        }
         this.lastAdvanceKey = null;
         this.lastFinalizedUnitKey = null;
         this.bumpTransition();

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

@@ -10,6 +10,7 @@
  */
 import { importExtensionModule } from "@gsd/pi-coding-agent";
 import { USER_DRIVEN_DEEP_UNITS, isAwaitingUserInput, } from "../auto-post-unit.js";
+import { lastAssistantText } from "../user-input-boundary.js";
 import { MAX_RECOVERY_CHARS, BUDGET_THRESHOLDS, MAX_FINALIZE_TIMEOUTS, } from "./types.js";
 import { detectStuck } from "./detect-stuck.js";
 import { runUnit } from "./run-unit.js";
@@ -52,8 +53,19 @@ import { decideVerificationRetry, verificationRetryKey } from "./verification-re
 import { buildPhaseHandoffOutcome, setAutoOutcomeWidget } from "../auto-dashboard.js";
 import { getConsecutiveDispatchBlocker } from "../dispatch-guard.js";
 import { captureRootDirtySnapshot, detectRootWriteLeak, formatRootWriteLeakMessage, } from "../root-write-leak-guard.js";
+import { classifyError, isTransient } from "../error-classifier.js";
 export const STUCK_WINDOW_SIZE = 6;
 const STUCK_RECOVERY_ATTEMPTS_KEY = "stuck_recovery_attempts";
+const ZERO_TOOL_PROVIDER_ERROR_PREFIX_RE = /^(?:api error(?::|$|\s*\()|provider error(?::|$|\s*\()|request failed\b|(?:http\s*)?(?:429|500|502|503)\b|\b(?:econnreset|etimedout|econnrefused|epipe)\b|socket hang up\b|fetch failed\b|(?:network|connection|server) error(?::|$)|connection (?:reset|refused)(?::|$|\s+by\b)|dns\b.*(?:fail|error|timeout)|unexpected eof\b|stream idle timeout\b|partial response received\b|stream_exhausted\b|terminated(?::|$)|(?:connection|stream|request)\b.{0,40}\bterminated\b|other side closed\b|rate.?limit(?:ed| exceeded| reached| error)|too many requests\b|you(?:'ve| have) hit your limit\b|usage limit\b|out of extra usage\b|service.?unavailable\b|internal(?: server)? error(?::|$)|internal(?:[_-]server)?[_-]error\b|server[_-]error\b|(?:provider|server|api|model|codex|claude|openai|anthropic|gemini)\b.{0,80}\boverloaded\b|overloaded\b.{0,80}\b(?:provider|server|api|model)\b|context (?:window|length) exceed|context window exceed)/i;
+const ZERO_TOOL_PROVIDER_ERROR_SIGNAL_RE = /(?:\b(?:http|status(?: code)?|code|error:)\s*(?:429|500|502|503)\b|\b(?:api|provider) error\s*[:(]?\s*(?:429|500|502|503)\b|\b(?:typeerror|error):\s*(?:fetch failed\b|socket hang up\b|terminated(?::|$)|connection (?:reset|refused)(?::|$|\s+by\b)|(?:network|connection|server) error(?::|$)|stream idle timeout\b|partial response received\b|unexpected eof\b)|\b(?:server_error|api_error|stream_exhausted(?:_without_result)?)\b|\b(?:econnreset|etimedout|econnrefused|epipe)\b|context (?:window|length) exceed|context window exceed)/i;
+function classifyZeroToolProviderMessage(message) {
+    const firstLine = message.trim().split(/\r?\n/, 1)[0]?.trim() ?? "";
+    if (!firstLine ||
+        (!ZERO_TOOL_PROVIDER_ERROR_PREFIX_RE.test(firstLine) &&
+            !ZERO_TOOL_PROVIDER_ERROR_SIGNAL_RE.test(firstLine)))
+        return null;
+    return classifyError(firstLine);
+}
 export function resolveDispatchRecoveryAttempts(unitRecoveryCount, unitType, unitId) {
     return (unitRecoveryCount.get(`${unitType}/${unitId}`) ?? 0) > 0
         ? 0
@@ -1568,7 +1580,7 @@ export async function runUnitPhase(ic, iterData, loopState, sidecarItem) {
     const dispatchKey = `${unitType}/${unitId}`;
     const nextDispatchCount = (s.unitDispatchCount.get(dispatchKey) ?? 0) + 1;
     // Status bar (widget + preconditions deferred until after model selection — see #2899)
-    ctx.ui.setStatus("gsd-auto", "auto");
+    ctx.ui.setStatus("gsd-auto", s.stepMode ? "next" : "auto");
     if (mid)
         deps.updateSliceProgressCache(s.basePath, mid, state.activeSlice?.id);
     // ── Safety harness: reset evidence + create checkpoint ──
@@ -1999,6 +2011,31 @@ export async function runUnitPhase(ic, iterData, loopState, sidecarItem) {
         if (currentLedger?.units) {
             const lastUnit = [...currentLedger.units].reverse().find((u) => u.type === unitType && u.id === unitId && u.startedAt === _resolveCurrentUnitStartedAtForTest(s.currentUnit));
             if (lastUnit && lastUnit.toolCalls === 0) {
+                const lastAssistantMessage = lastAssistantText(s.lastUnitAgentEndMessages);
+                const providerMessageClass = classifyZeroToolProviderMessage(lastAssistantMessage);
+                if (providerMessageClass && isTransient(providerMessageClass)) {
+                    const retryAfterMs = "retryAfterMs" in providerMessageClass ? providerMessageClass.retryAfterMs : 15_000;
+                    await pauseAutoForProviderError(ctx.ui, ` for ${unitType} ${unitId}`, () => deps.pauseAuto(ctx, pi), {
+                        isRateLimit: providerMessageClass.kind === "rate-limit",
+                        isTransient: true,
+                        retryAfterMs,
+                        resume: () => {
+                            void resumeAutoAfterProviderDelay(pi, ctx).catch((err) => {
+                                logWarning("engine", `Provider error auto-resume failed: ${err instanceof Error ? err.message : String(err)}`);
+                            });
+                        },
+                    });
+                    await emitCancelledUnitEnd(ic, unitType, unitId, unitStartSeq, {
+                        message: lastAssistantMessage.slice(0, 200),
+                        category: "provider",
+                        isTransient: true,
+                        retryAfterMs,
+                    });
+                    return {
+                        action: "break",
+                        reason: providerMessageClass.kind === "rate-limit" ? "rate-limit" : "api-timeout",
+                    };
+                }
                 if (USER_DRIVEN_DEEP_UNITS.has(unitType) && isAwaitingUserInput(s.lastUnitAgentEndMessages ?? undefined)) {
                     debugLog("runUnitPhase", {
                         phase: "zero-tool-calls-awaiting-user-input",

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

@@ -7,6 +7,7 @@ import { logWarning } from "../workflow-logger.js";
 import { resolveAutoSupervisorConfig } from "../preferences.js";
 import { readUnitRuntimeRecord } from "../unit-runtime.js";
 import { consumeAutoWakeup } from "./schedule-wakeup.js";
+import { applyUnitSkillVisibility } from "../skill-scope.js";
 const UNIT_FAILSAFE_BUFFER_MS = 30_000;
 const UNIT_FAILSAFE_RECHECK_MS = 30_000;
 const WAKEUP_SLEEP_CHUNK_MS = 1_000;
@@ -123,6 +124,10 @@ export async function runUnit(ctx, pi, s, unitType, unitId, prompt) {
             };
         }
     }
+    const setVisibleSkills = typeof pi.setVisibleSkills === "function" ? pi.setVisibleSkills.bind(pi) : undefined;
+    if (setVisibleSkills) {
+        applyUnitSkillVisibility({ setVisibleSkills }, unitType);
+    }
     // ── Create the agent_end promise (per-unit one-shot) ──
     // This happens after newSession completes so session-switch agent_end events
     // from the previous session cannot resolve the new unit.
@@ -134,6 +139,7 @@ export async function runUnit(ctx, pi, s, unitType, unitId, prompt) {
     const pendingSwitchCancellation = _consumePendingSwitchCancellation();
     if (pendingSwitchCancellation) {
         _clearCurrentResolve();
+        setVisibleSkills?.(undefined);
         return {
             status: "cancelled",
             ...(pendingSwitchCancellation.errorContext ? { errorContext: pendingSwitchCancellation.errorContext } : {}),
@@ -156,6 +162,7 @@ export async function runUnit(ctx, pi, s, unitType, unitId, prompt) {
             }
             if (!ready) {
                 _clearCurrentResolve();
+                setVisibleSkills?.(undefined);
                 return {
                     status: "cancelled",
                     errorContext: {
@@ -290,6 +297,7 @@ export async function runUnit(ctx, pi, s, unitType, unitId, prompt) {
         if (unitTimeoutHandle)
             clearTimeout(unitTimeoutHandle);
         ctx.ui.setWorkingMessage?.(undefined);
+        setVisibleSkills?.(undefined);
     }
     debugLog("runUnit", {
         phase: "agent-end-received",

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-dispatch.js

@@ -33,6 +33,11 @@ import { resolveWorktreeProjectRoot } from "./worktree-root.js";
 import { probeGitConflictState } from "./git-conflict-state.js";
 import { runTurnGitAction } from "./git-service.js";
 import { parseUnitId } from "./unit-id.js";
+import { resolveExpectedArtifactPath } from "./auto-artifact-paths.js";
+function resolveExistingExpectedArtifact(unitType, unitId, basePath) {
+    const artifactPath = resolveExpectedArtifactPath(unitType, unitId, basePath);
+    return artifactPath && existsSync(artifactPath) ? artifactPath : null;
+}
 let reassessmentChecker = checkNeedsReassessment;
 let researchProjectPromptBuilder = buildResearchProjectPrompt;
 function shouldBypassMilestoneDepthGateInAuto(prefs) {
@@ -808,13 +813,15 @@ export const DISPATCH_RULES = [
             if (await getMilestonePipelineVariant(mid) === "trivial")
                 return null;
             // Load roadmap to find all slices
-            const roadmapFile = resolveMilestoneFile(basePath, mid, "ROADMAP");
+            const roadmapFile = resolveExistingExpectedArtifact("plan-milestone", mid, basePath) ??
+                resolveMilestoneFile(basePath, mid, "ROADMAP");
             const roadmapContent = roadmapFile ? await loadFile(roadmapFile) : null;
             if (!roadmapContent)
                 return null;
             const roadmap = parseRoadmap(roadmapContent);
             // Find slices that need research (no RESEARCH file, dependencies done)
-            const milestoneResearchFile = resolveMilestoneFile(basePath, mid, "RESEARCH");
+            const milestoneResearchFile = resolveExistingExpectedArtifact("research-milestone", mid, basePath) ??
+                resolveMilestoneFile(basePath, mid, "RESEARCH");
             const researchReadySlices = [];
             for (const slice of roadmap.slices) {
                 if (slice.done)
@@ -823,10 +830,10 @@ export const DISPATCH_RULES = [
                 if (milestoneResearchFile && slice.id === "S01")
                     continue;
                 // Skip if already has research
-                if (resolveSliceFile(basePath, mid, slice.id, "RESEARCH"))
+                if (resolveExistingExpectedArtifact("research-slice", `${mid}/${slice.id}`, basePath))
                     continue;
                 // Skip if dependencies aren't done (check for SUMMARY files)
-                const depsComplete = (slice.depends ?? []).every((depId) => !!resolveSliceFile(basePath, mid, depId, "SUMMARY"));
+                const depsComplete = (slice.depends ?? []).every((depId) => !!resolveExistingExpectedArtifact("complete-slice", `${mid}/${depId}`, basePath));
                 if (!depsComplete)
                     continue;
                 researchReadySlices.push({ id: slice.id, title: slice.title });
@@ -837,7 +844,8 @@ export const DISPATCH_RULES = [
             // #4414: If a previous parallel-research attempt escalated to a blocker
             // placeholder, skip this rule and fall through to per-slice research
             // (or other rules) rather than re-dispatching the same failing unit.
-            const parallelBlocker = resolveMilestoneFile(basePath, mid, "PARALLEL-BLOCKER");
+            const parallelBlocker = resolveExistingExpectedArtifact("research-slice", `${mid}/parallel-research`, basePath) ??
+                resolveMilestoneFile(basePath, mid, "PARALLEL-BLOCKER");
             if (parallelBlocker)
                 return null;
             return {
@@ -863,12 +871,14 @@ export const DISPATCH_RULES = [
                 return missingSliceStop(mid, state.phase);
             const sid = state.activeSlice.id;
             const sTitle = state.activeSlice.title;
-            const researchFile = resolveSliceFile(basePath, mid, sid, "RESEARCH");
+            const researchFile = resolveExistingExpectedArtifact("research-slice", `${mid}/${sid}`, basePath) ??
+                resolveSliceFile(basePath, mid, sid, "RESEARCH");
             if (researchFile)
                 return null; // has research, fall through
             // Skip slice research for S01 when milestone research already exists —
             // the milestone research already covers the same ground for the first slice.
-            const milestoneResearchFile = resolveMilestoneFile(basePath, mid, "RESEARCH");
+            const milestoneResearchFile = resolveExistingExpectedArtifact("research-milestone", mid, basePath) ??
+                resolveMilestoneFile(basePath, mid, "RESEARCH");
             if (milestoneResearchFile && sid === "S01")
                 return null; // fall through to plan-slice
             return {