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

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/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();