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

package/src/resources/extensions/google-cli/index.ts

@@ -0,0 +1,34 @@
+/**
+ * Google local CLI providers.
+ *
+ * These deliberately use authMode "externalCli": GSD never owns the browser
+ * OAuth flow or cached tokens. Users authenticate with the official CLI, then
+ * /login activates the provider once the local binary is available.
+ */
+
+import type { ExtensionAPI } from "@gsd/pi-coding-agent";
+import { GOOGLE_ANTIGRAVITY_MODELS, GOOGLE_GEMINI_CLI_MODELS } from "./models.js";
+import { isAntigravityCliReady, isGeminiCliReady } from "./readiness.js";
+import { streamViaGoogleCli } from "./stream-adapter.js";
+
+export default function googleCli(pi: ExtensionAPI) {
+	pi.registerProvider("google-gemini-cli", {
+		name: "Google Gemini CLI",
+		authMode: "externalCli",
+		api: "google-gemini-cli",
+		baseUrl: "local://google-gemini-cli",
+		isReady: isGeminiCliReady,
+		streamSimple: streamViaGoogleCli,
+		models: GOOGLE_GEMINI_CLI_MODELS,
+	});
+
+	pi.registerProvider("google-antigravity", {
+		name: "Google Antigravity",
+		authMode: "externalCli",
+		api: "google-antigravity",
+		baseUrl: "local://google-antigravity",
+		isReady: isAntigravityCliReady,
+		streamSimple: streamViaGoogleCli,
+		models: GOOGLE_ANTIGRAVITY_MODELS,
+	});
+}

package/src/resources/extensions/google-cli/models.ts

@@ -0,0 +1,57 @@
+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" as const],
+		cost: ZERO_COST,
+		contextWindow: 1_000_000,
+		maxTokens: 65_536,
+	},
+	{
+		id: "gemini-2.5-pro",
+		name: "Gemini 2.5 Pro",
+		reasoning: true,
+		input: ["text" as const],
+		cost: ZERO_COST,
+		contextWindow: 1_000_000,
+		maxTokens: 65_536,
+	},
+	{
+		id: "gemini-3-flash-preview",
+		name: "Gemini 3 Flash Preview",
+		reasoning: true,
+		input: ["text" as const],
+		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" as const],
+		cost: ZERO_COST,
+		contextWindow: 1_000_000,
+		maxTokens: 65_536,
+	},
+];
+
+export const GOOGLE_ANTIGRAVITY_MODELS = [
+	{
+		id: "default",
+		name: "Antigravity Default",
+		reasoning: true,
+		input: ["text" as const],
+		cost: ZERO_COST,
+		contextWindow: 1_000_000,
+		maxTokens: 65_536,
+	},
+];

package/src/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.ts"
+    ]
+  }
+}

package/src/resources/extensions/google-cli/readiness.ts

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

package/src/resources/extensions/google-cli/stream-adapter.ts

@@ -0,0 +1,245 @@
+import { spawn } from "node:child_process";
+import type {
+	Api,
+	AssistantMessage,
+	AssistantMessageEventStream,
+	Context,
+	Message,
+	Model,
+	SimpleStreamOptions,
+	TextContent,
+} from "@gsd/pi-ai";
+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 },
+};
+
+type GoogleCliProviderId = "google-gemini-cli" | "google-antigravity";
+
+interface CliRunResult {
+	stdout: string;
+	stderr: string;
+	code: number | null;
+	signal: NodeJS.Signals | null;
+}
+
+function textBlocks(content: (TextContent | { type: string })[]): string {
+	return content
+		.map((block) => block.type === "text" ? (block as TextContent).text : `[${block.type} omitted]`)
+		.join("\n");
+}
+
+function messageToText(message: Message): string {
+	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 as { type: string }).type} omitted]`;
+			})
+			.join("\n");
+		return `Assistant:\n${text}`;
+	}
+
+	return `Tool result (${message.toolName}):\n${textBlocks(message.content)}`;
+}
+
+export function buildGoogleCliPrompt(context: Context): string {
+	const parts: string[] = [];
+
+	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: Model<Api>,
+	text: string,
+	stopReason: AssistantMessage["stopReason"] = "stop",
+	errorMessage?: string,
+): AssistantMessage {
+	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: string): string {
+	const trimmed = raw.trim();
+	if (!trimmed) return "";
+
+	try {
+		const parsed = JSON.parse(trimmed) as Record<string, unknown>;
+		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: GoogleCliProviderId): string {
+	return provider === "google-gemini-cli" ? "gemini" : "agy";
+}
+
+function argsForProvider(provider: GoogleCliProviderId, model: Model<Api>, prompt: string): string[] {
+	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: string,
+	args: string[],
+	platform: NodeJS.Platform = process.platform,
+): { command: string; args: string[] } {
+	if (platform === "win32") {
+		return { command: "cmd", args: ["/c", command, ...args] };
+	}
+	return { command, args };
+}
+
+function runCli(command: string, args: string[], options?: SimpleStreamOptions): Promise<CliRunResult> {
+	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: () => void) => {
+			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: AssistantMessageEventStream, message: AssistantMessage, text: string): void {
+	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: AssistantMessageEventStream, model: Model<Api>, error: unknown): void {
+	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: Model<Api>,
+	context: Context,
+	options?: SimpleStreamOptions,
+): AssistantMessageEventStream {
+	const stream = createAssistantMessageEventStream();
+	const provider = model.provider as GoogleCliProviderId;
+
+	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/src/resources/extensions/gsd/auto/loop.ts

@@ -106,6 +106,7 @@ import {
 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
@@ -834,6 +835,27 @@ export async function autoLoop(
           },
         });
         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;
       }
 
@@ -859,10 +881,37 @@ export async function autoLoop(
                 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;
           }
 
@@ -896,6 +945,52 @@ export async function autoLoop(
             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/src/resources/extensions/gsd/auto/orchestrator.ts

@@ -396,9 +396,11 @@ export class AutoOrchestrator implements AutoOrchestrationModule {
     const activeUnitKey = this.status.activeUnit
       ? `${this.status.activeUnit.unitType}:${this.status.activeUnit.unitId}`
       : null;
-    if (activeUnitKey !== unitKey) return;
+    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/src/resources/extensions/gsd/auto/phases.ts

@@ -19,6 +19,7 @@ import {
   type PostUnitContext,
   type PreVerificationOpts,
 } from "../auto-post-unit.js";
+import { lastAssistantText } from "../user-input-boundary.js";
 import type { Phase } from "../types.js";
 import {
   MAX_RECOVERY_CHARS,
@@ -93,9 +94,24 @@ import {
   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: string): ReturnType<typeof classifyError> | null {
+  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: Map<string, number>,
@@ -2072,7 +2088,7 @@ export async function runUnitPhase(
   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);
 
@@ -2637,6 +2653,36 @@ export async function runUnitPhase(
         (u: { type: string; id: string; startedAt: number; toolCalls: number }) => 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/src/resources/extensions/gsd/auto/run-unit.ts

@@ -27,6 +27,7 @@ import { logWarning, logError } from "../workflow-logger.js";
 import { resolveAutoSupervisorConfig } from "../preferences.js";
 import { readUnitRuntimeRecord, type AutoUnitRuntimeRecord } 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;
@@ -165,6 +166,12 @@ export async function runUnit(
     }
   }
 
+  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.
@@ -176,6 +183,7 @@ export async function runUnit(
   const pendingSwitchCancellation = _consumePendingSwitchCancellation();
   if (pendingSwitchCancellation) {
     _clearCurrentResolve();
+    setVisibleSkills?.(undefined);
     return {
       status: "cancelled",
       ...(pendingSwitchCancellation.errorContext ? { errorContext: pendingSwitchCancellation.errorContext } : {}),
@@ -200,6 +208,7 @@ export async function runUnit(
 
       if (!ready) {
         _clearCurrentResolve();
+        setVisibleSkills?.(undefined);
         return {
           status: "cancelled",
           errorContext: {
@@ -351,6 +360,7 @@ export async function runUnit(
   } finally {
     if (unitTimeoutHandle) clearTimeout(unitTimeoutHandle);
     ctx.ui.setWorkingMessage?.(undefined);
+    setVisibleSkills?.(undefined);
   }
   debugLog("runUnit", {
     phase: "agent-end-received",

package/src/resources/extensions/gsd/auto/session.ts

@@ -218,6 +218,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: "worktree" | "branch" | null = null;
   /** Project-root dirty snapshot captured before an isolated worktree unit runs. */
   rootWriteBaseline: RootDirtySnapshot | null = null;
 
@@ -382,6 +384,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();