@opengsd/gsd-pi 1.0.2-dev.867e002 → 1.0.2-dev.aed3486

package/packages/rpc-client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengsd/rpc-client",
-  "version": "1.0.2-dev.867e002",
+  "version": "1.0.2-dev.aed3486",
   "description": "Standalone RPC client SDK for GSD — zero internal dependencies",
   "license": "MIT",
   "gsd": {
@@ -34,7 +34,7 @@
     "test": "node --test dist/rpc-client.test.js"
   },
   "dependencies": {
-    "@opengsd/contracts": "^1.0.2-dev.867e002"
+    "@opengsd/contracts": "^1.0.2-dev.aed3486"
   },
   "engines": {
     "node": ">=22.0.0"

package/pkg/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@glittercowboy/gsd",
-  "version": "1.0.2-dev.867e002",
+  "version": "1.0.2-dev.aed3486",
   "piConfig": {
     "name": "gsd",
     "configDir": ".gsd"

package/src/resources/extensions/context7/index.ts

@@ -132,6 +132,19 @@ function formatLibraryList(libs: C7Library[], query: string): string {
 	return lines.join("\n");
 }
 
+function getFirstTextContent(result: { content?: unknown }): string | undefined {
+	const content = result.content;
+	if (!Array.isArray(content)) return undefined;
+	const textBlock = content.find(
+		(block: unknown) =>
+			typeof block === "object" &&
+			block !== null &&
+			(block as { type?: unknown }).type === "text" &&
+			typeof (block as { text?: unknown }).text === "string",
+	) as { text: string } | undefined;
+	return textBlock?.text.trim() || undefined;
+}
+
 // ─── Tool details types ───────────────────────────────────────────────────────
 
 interface ResolveDetails {
@@ -234,7 +247,7 @@ export default function (pi: ExtensionAPI) {
 			const d = result.details as ResolveDetails | undefined;
 			if (isPartial) return new Text(theme.fg("warning", "Searching Context7..."), 0, 0);
 			if ((result as any).isError || d?.error) {
-				return new Text(theme.fg("error", `Error: ${d?.error ?? "unknown"}`), 0, 0);
+				return new Text(theme.fg("error", `Error: ${d?.error ?? getFirstTextContent(result) ?? "unknown"}`), 0, 0);
 			}
 			let text = theme.fg("success", `${d?.resultCount ?? 0} ${d?.resultCount === 1 ? "library" : "libraries"} found`);
 			if (d?.cached) text += theme.fg("dim", " (cached)");
@@ -389,7 +402,7 @@ export default function (pi: ExtensionAPI) {
 
 			if (isPartial) return new Text(theme.fg("warning", "Fetching documentation..."), 0, 0);
 			if ((result as any).isError || d?.error) {
-				return new Text(theme.fg("error", `Error: ${d?.error ?? "unknown"}`), 0, 0);
+				return new Text(theme.fg("error", `Error: ${d?.error ?? getFirstTextContent(result) ?? "unknown"}`), 0, 0);
 			}
 
 			let text = theme.fg("success", `${(d?.charCount ?? 0).toLocaleString()} chars`);

package/src/resources/extensions/get-secrets-from-user.ts

@@ -13,6 +13,7 @@ import { resolve } from "node:path";
 import type { ExtensionAPI, Theme } from "@gsd/pi-coding-agent";
 import { Editor, type EditorTheme, Key, matchesKey, Text, truncateToWidth, wrapTextWithAnsi } from "@gsd/pi-tui";
 import { Type } from "@sinclair/typebox";
+import { renderSharedDialogFrame } from "./shared/dialog-frame.js";
 import { makeUI } from "./shared/tui.js";
 import { maskEditorLine, type ProgressStatus } from "./shared/mod.js";
 import { parseSecretsManifest, formatSecretsManifest } from "./gsd/files.js";
@@ -43,6 +44,10 @@ function maskPreview(value: string): string {
 	return `${value.slice(0, 4)}${"*".repeat(Math.max(4, value.length - 8))}${value.slice(-4)}`;
 }
 
+function dialogContentWidth(width: number): number {
+	return width < 4 ? Math.max(1, width) : Math.max(1, width - 4);
+}
+
 function shellEscapeSingle(value: string): string {
 	return `'${value.replace(/'/g, `'\\''`)}'`;
 }
@@ -168,10 +173,10 @@ async function collectOneSecret(
 
 		function render(width: number): string[] {
 			if (cachedLines) return cachedLines;
+			const contentWidth = dialogContentWidth(width);
 			const lines: string[] = [];
-			const add = (s: string) => lines.push(truncateToWidth(s, width));
+			const add = (s: string) => lines.push(truncateToWidth(s, contentWidth));
 
-			add(theme.fg("accent", "─".repeat(width)));
 			add(theme.fg("dim", ` Page ${pageIndex + 1}/${totalPages} · Secure Env Setup`));
 			lines.push("");
 
@@ -187,7 +192,7 @@ async function collectOneSecret(
 				for (let g = 0; g < guidance.length; g++) {
 					const prefix = `  ${g + 1}. `;
 					const step = guidance[g] as string;
-					const wrappedLines = wrapTextWithAnsi(step, width - 4);
+					const wrappedLines = wrapTextWithAnsi(step, Math.max(1, contentWidth - 4));
 					for (let w = 0; w < wrappedLines.length; w++) {
 						const indent = w === 0 ? prefix : " ".repeat(prefix.length);
 						lines.push(theme.fg("dim", `${indent}${wrappedLines[w]}`));
@@ -205,16 +210,15 @@ async function collectOneSecret(
 
 			// Editor
 			add(theme.fg("muted", " Enter value:"));
-			for (const line of editor.render(width - 2)) {
+			for (const line of editor.render(Math.max(1, contentWidth - 2))) {
 				add(theme.fg("text", maskEditorLine(line)));
 			}
 
 			lines.push("");
-			add(theme.fg("dim", ` enter to confirm  |  ctrl+s or esc to skip  |  esc cancels`));
-			add(theme.fg("accent", "─".repeat(width)));
+			const footer = theme.fg("dim", " enter to confirm  |  ctrl+s or esc to skip  |  esc cancels");
 
-			cachedLines = lines;
-			return lines;
+			cachedLines = renderSharedDialogFrame(theme, "Secure Env Setup", lines, width, { footer });
+			return cachedLines;
 		}
 
 		return {
@@ -286,13 +290,11 @@ export async function showSecretsSummary(
 		function render(width: number): string[] {
 			if (cachedLines) return cachedLines;
 
-			const ui = makeUI(theme, width);
+			const contentWidth = dialogContentWidth(width);
+			const ui = makeUI(theme, contentWidth);
 			const lines: string[] = [];
 			const push = (...rows: string[][]) => { for (const r of rows) lines.push(...r); };
 
-			push(ui.bar());
-			push(ui.blank());
-			push(ui.header("  Secrets Summary"));
 			push(ui.blank());
 
 			for (const entry of entries) {
@@ -314,11 +316,10 @@ export async function showSecretsSummary(
 			}
 
 			push(ui.blank());
-			push(ui.hints(["any key to continue"]));
-			push(ui.bar());
+			const footer = ui.hints(["any key to continue"])[0] ?? "";
 
-			cachedLines = lines;
-			return lines;
+			cachedLines = renderSharedDialogFrame(theme, "Secrets Summary", lines, width, { footer });
+			return cachedLines;
 		}
 
 		return {

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

@@ -881,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;
           }
 
@@ -918,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();