@estebanforge/pi-antigravity-bridge 1.10.0 → 1.10.1

package/CHANGELOG.md

@@ -2,6 +2,17 @@
 
 All notable changes to this project will be documented in this file.
 
+## [1.10.1] - 2026-11-09
+
+### Fixed
+
+- **Windows: the bridge now finds the installed `agy` CLI.** `isAgyInstalled` probed bare names with a plain `stat`, which never applies `PATHEXT`, so `agy.exe` was invisible on Windows and every start reported the CLI as missing (also looping the self-service installer, whose verify uses the same probe). Bare names on `PATH` now probe `agy.exe` only, the one Windows artifact Google ships: spawns run with `shell: false` and Node throws `EINVAL` on `.bat`/`.cmd` shims (CVE-2024-27980), so a `.cmd` wrapper does not count as installed, and neither does an extensionless file. A bare `AGY_BIN=agy.exe` finds the real file instead of probing `agy.exe.EXE`, and an `AGY_BIN` set with backslashes (`C:\...\agy.exe`) is treated as a file path instead of being mangled into a `PATH` segment (issue #11).
+- **Windows and fresh CLI installs: ACP turns no longer abort on the CLI's empty `mcp_config.json`.** The agy CLI's initial state is a 0-byte `%USERPROFILE%\.gemini\config\mcp_config.json`; staging the isolated ACP home tolerated only a missing file and turned the empty file into `Cannot isolate inherited MCP config: Unexpected end of JSON input`, killing every turn. Empty and whitespace-only files now stage as `{ "mcpServers": {} }`; a leading UTF-8 BOM (a common Windows-editor artifact) is stripped instead of breaking the parse; a file with contents that are not a JSON object still fails closed (issue #11). The same tolerant read now covers stream-json bridge registration, which previously refused to touch an empty or BOM-prefixed file and silently skipped registering the bridge.
+
+### Changed
+
+- **The legacy ACP binary override cleanup is now automatic, and the warning speaks plainly.** Startup strips the retired `acp.bin` key from `~/.pi/agent/antigravity-bridge/config.json` in place, keeping the rest of the file untouched (a symlinked config is written through, not replaced), so the usual case never shows a warning. Only a set `AGY_ACP_BIN` environment variable still warns (the bridge cannot edit shell config), with exact removal instructions. A failed config rewrite warns with the file path and the manual fix instead of failing silently.
+
 ## [1.10.0] - 2026-11-08
 
 ### Changed

package/extensions/index.ts

@@ -65,7 +65,7 @@ import { agyAuthenticationMessage } from "../src/agy-install.js";
 import { createAgySetupOffer } from "../src/agy-setup.js";
 import { ensureQueuedMessagesDefaults } from "../src/queued-messages.js";
 import type { TurnDriver, TurnOutcome } from "../src/driver-types.js";
-import { CONFIG_PATH, legacyAcpBinConfigured, loadConfig, logsDir, MAX_TURN_CAP_MIN, parseCapMinutes, saveConfig, type AgyMode, type BridgeTools, type Engine, type ThinkingTier } from "../src/config.js";
+import { CONFIG_PATH, loadConfig, logsDir, MAX_TURN_CAP_MIN, parseCapMinutes, removeLegacyAcpBin, saveConfig, type AgyMode, type BridgeTools, type Engine, type ThinkingTier } from "../src/config.js";
 import { agyMissingMessage, ENGINE_SETTINGS_ROW_ID, engineSettingsRow, isAgyInstalled, savedEngineMessage, showEnginePicker, shouldOfferEnginePicker } from "../src/engine-picker.js";
 import { agyVersionVerdict, checkAgyCliVersion, describeAgyVersionCheck, MIN_AGY_ACP_VERSION, MIN_AGY_VERSION } from "../src/agy-version.js";
 import { isValidAgyAgentName, listAgyAgents } from "../src/agents.js";
@@ -205,7 +205,10 @@ export default async function (pi: ExtensionAPI): Promise<void> {
 	// start when the gate is active; removed at session_shutdown.
 	let gateScriptPath: string | null = null;
 	let managedAcpCleanupRan = false;
-	let legacyAcpWarningShown = false;
+	let legacyConfigCleanupRan = false;
+	let legacyConfigCleanupFailed = false;
+	let legacyEnvAcpWarningShown = false;
+	let legacyFileAcpWarningShown = false;
 	let agySetupOffer: (() => Promise<void>) | null = null;
 	let agyMissingWarned = false;
 	let agyVersionWarned = false;
@@ -616,9 +619,28 @@ export default async function (pi: ExtensionAPI): Promise<void> {
 				console.error(`[antigravity-bridge] engine picker failed: ${String(err)}`);
 			}
 		}
-		if (!legacyAcpWarningShown && legacyAcpBinConfigured()) {
-			legacyAcpWarningShown = true;
-			const msg = "Legacy AGY_ACP_BIN/acp.bin settings are ignored. Turns use `agy acp`; remove the stale override.";
+		// The retired acp.bin key heals itself in the config file; the env var
+		// lives outside our reach, so it is the only case that still warns.
+		// Independent once-flags: a failed cleanup must never suppress the
+		// env-var warning (or vice versa) for the rest of the process.
+		if (!legacyConfigCleanupRan) {
+			legacyConfigCleanupRan = true;
+			try {
+				removeLegacyAcpBin();
+			} catch (err) {
+				legacyConfigCleanupFailed = true;
+				fileLog.log("legacy-acp-config-cleanup", { error: String(err) }, "error");
+			}
+		}
+		if (!legacyEnvAcpWarningShown && process.env.AGY_ACP_BIN?.trim()) {
+			legacyEnvAcpWarningShown = true;
+			const msg = "AGY_ACP_BIN is set but no longer used; turns run \"agy acp\" from the CLI. Remove it from your shell config, then start a new terminal.";
+			if (ctx.hasUI) ctx.ui.notify(msg, "warning");
+			else console.error(`[antigravity-bridge] ${msg}`);
+		}
+		if (!legacyFileAcpWarningShown && legacyConfigCleanupFailed) {
+			legacyFileAcpWarningShown = true;
+			const msg = `Couldn't remove the old "bin" setting from ${CONFIG_PATH} (details in the bridge log). Delete the "bin" line under "acp" by hand; turns run "agy acp" from the CLI.`;
 			if (ctx.hasUI) ctx.ui.notify(msg, "warning");
 			else console.error(`[antigravity-bridge] ${msg}`);
 		}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@estebanforge/pi-antigravity-bridge",
-  "version": "1.10.0",
+  "version": "1.10.1",
   "description": "Gemini provider for Pi on the Antigravity ACP server (official Google ACP) or the stream-json agy CLI. Use antigravity/* models in Pi. Full /model picker support. Models runs Pi's tools. ToS safe to use.",
   "keywords": [
     "pi-package",

package/src/acp/home.ts

@@ -2,6 +2,7 @@ import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
 import { isPidAlive } from "../mcp-server.js";
+import { readGlobalMcpConfig } from "../mcp-registration.js";
 
 function record(value: unknown, label: string): Record<string, unknown> {
 	if (!value || typeof value !== "object" || Array.isArray(value)) throw new Error(`${label} must contain a JSON object`);
@@ -23,7 +24,9 @@ export function stageAcpHome(opts: { geminiHome?: string; parentDir?: string } =
 	const globalMcpPath = path.join(globalConfigDir, "mcp_config.json");
 	let config: Record<string, unknown> = { mcpServers: {} };
 	try {
-		config = record(JSON.parse(fs.readFileSync(globalMcpPath, "utf8")), globalMcpPath);
+		// Tolerant of the CLI's 0-byte fresh-install file and a UTF-8 BOM;
+		// only a missing file means "no config at all" (issue #11).
+		config = record(readGlobalMcpConfig(globalMcpPath), globalMcpPath);
 	} catch (err) {
 		if ((err as NodeJS.ErrnoException).code !== "ENOENT") {
 			throw new Error(`Cannot isolate inherited MCP config ${globalMcpPath}: ${err instanceof Error ? err.message : String(err)}`);

package/src/config.ts

@@ -251,12 +251,19 @@ function readConfigFile(configPath: string): Partial<AgyConfig> {
 	return {};
 }
 
-export function legacyAcpBinConfigured(configPath: string = CONFIG_PATH): boolean {
-	if (process.env.AGY_ACP_BIN?.trim()) return true;
+/** Strip the retired acp.bin key from the raw config file; returns true when
+ *  removed. Raw passthrough on purpose (no defaults merge): users keep their
+ *  minimal hand-edited shape instead of gaining the full default set. */
+export function removeLegacyAcpBin(configPath: string = CONFIG_PATH): boolean {
 	const file = readConfigFile(configPath) as Record<string, unknown>;
 	if (!file.acp || typeof file.acp !== "object" || Array.isArray(file.acp)) return false;
-	const bin = (file.acp as Record<string, unknown>).bin;
-	return typeof bin === "string" && bin.trim().length > 0;
+	const acp = file.acp as Record<string, unknown>;
+	if (!("bin" in acp)) return false;
+	delete acp.bin;
+	// Rename would replace a dotfiles-managed symlink with a regular file;
+	// write through the resolved target so the link survives.
+	writeConfigJson(fs.realpathSync(configPath), file);
+	return true;
 }
 
 /** Load config merged over defaults. Env vars override the file when set. */
@@ -419,6 +426,24 @@ function narrowEngine(raw: string): Engine {
 	return raw === "acp" || raw === "stream-json" ? raw : DEFAULT_ENGINE;
 }
 
+/** Atomic JSON write (temp + rename, 0600) shared by every config writer. */
+function writeConfigJson(configPath: string, value: unknown): void {
+	const dir = path.dirname(configPath);
+	fs.mkdirSync(dir, { recursive: true });
+	const tmp = `${configPath}.${process.pid}.tmp`;
+	try {
+		fs.writeFileSync(tmp, JSON.stringify(value, null, 2) + "\n", { mode: 0o600 });
+		fs.renameSync(tmp, configPath);
+	} catch (err) {
+		try {
+			fs.unlinkSync(tmp);
+		} catch {
+			/* nothing to clean */
+		}
+		throw err;
+	}
+}
+
 /** Atomically persist a config patch (temp + rename). Merges onto the RAW
  *  FILE values, never loadConfig(): env overrides must not be baked into the
  *  file (AGY_READONLY=1 in the env would otherwise persist readOnly: true to
@@ -451,20 +476,7 @@ export function saveConfig(patch: Partial<AgyConfig>, configPath: string = CONFI
 		...patch,
 		engine: narrowEngine(String(persistedEngine).toLowerCase()),
 	};
-	const dir = path.dirname(configPath);
-	fs.mkdirSync(dir, { recursive: true });
-	const tmp = `${configPath}.${process.pid}.tmp`;
-	try {
-		fs.writeFileSync(tmp, JSON.stringify(next, null, 2) + "\n", { mode: 0o600 });
-		fs.renameSync(tmp, configPath);
-	} catch (err) {
-		try {
-			fs.unlinkSync(tmp);
-		} catch {
-			/* nothing to clean */
-		}
-		throw err;
-	}
+	writeConfigJson(configPath, next);
 	return next;
 }
 

package/src/engine-picker.ts

@@ -85,28 +85,51 @@ export function engineSettingsRow(engine: Engine): DialogRow {
 	};
 }
 
-/** True when the `agy` CLI binary can be found. A binRef with a path
- *  separator (AGY_BIN=/opt/agy/agy) must exist as a file; a bare name is
- *  searched on PATH. statSync cannot throw through the guards, but a race
- *  (file removed between listing and stat) fails closed to false. */
-export function isAgyInstalled(binRef: string, env: NodeJS.ProcessEnv = process.env): boolean {
-	if (binRef.includes("/")) {
+/** Bare-name suffix candidates per platform. Windows pins the probe to
+ *  agy.exe: that is the only artifact Google ships there, and .bat/.cmd
+ *  cannot spawn anyway (shell:false + EINVAL since CVE-2024-27980). */
+function executableSuffixes(platform: NodeJS.Platform): string[] {
+	return platform === "win32" ? [".EXE"] : [""];
+}
+
+/** True when the `agy` CLI binary can be found. A binRef carrying a path
+ *  separator must exist as a file - backslashes count as separators on
+ *  win32, where path.join would mangle a bare "C:\..." AGY_BIN into a PATH
+ *  segment. Otherwise the bare name is searched on PATH, appending the
+ *  Windows candidate (agy.exe only: Google ships nothing else there, and
+ *  an extensionless or .cmd file cannot be spawned anyway). A bare
+ *  AGY_BIN that already ends in .exe probes the raw name too. Only a
+ *  regular file counts; races fail closed. */
+export function isAgyInstalled(
+	binRef: string,
+	env: NodeJS.ProcessEnv = process.env,
+	platform: NodeJS.Platform = process.platform,
+): boolean {
+	if (binRef.includes("/") || (platform === "win32" && binRef.includes("\\"))) {
 		try {
 			return fs.statSync(binRef).isFile();
 		} catch {
 			return false;
 		}
 	}
+	let suffixes = executableSuffixes(platform);
+	// A bare AGY_BIN=agy.exe already carries the extension; name+suffix
+	// would stat agy.exe.EXE and miss the real file (issue #11 class).
+	if (platform === "win32" && path.extname(binRef).toLowerCase() === ".exe") {
+		suffixes = ["", ...suffixes];
+	}
 	return (env.PATH ?? "")
 		.split(path.delimiter)
 		.filter(Boolean)
-		.some((dir) => {
-			try {
-				return fs.statSync(path.join(dir, binRef)).isFile();
-			} catch {
-				return false;
-			}
-		});
+		.some((dir) =>
+			suffixes.some((suffix) => {
+				try {
+					return fs.statSync(path.join(dir, binRef) + suffix).isFile();
+				} catch {
+					return false;
+				}
+			}),
+		);
 }
 
 /** Toast copy for the missing-CLI warning. Fires every pi start while the

package/src/mcp-registration.ts

@@ -36,19 +36,29 @@ export interface BridgeServerEntry {
 
 type McpConfig = { mcpServers: Record<string, unknown> };
 
+/** Tolerant read of the global mcp_config.json: strips a UTF-8 BOM and
+ *  treats the CLI's fresh-install 0-byte file as no config (issue #11).
+ *  Content that is not a JSON object still throws; ENOENT propagates.
+ *  A malformed mcpServers value is NOT normalized here - staging wants
+ *  strictness; registration normalizes at its own call site. */
+export function readGlobalMcpConfig(file: string): McpConfig {
+	const raw = fs.readFileSync(file, "utf8").replace(/^\uFEFF/, "");
+	const parsed = raw.trim() === "" ? { mcpServers: {} } : JSON.parse(raw);
+	if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
+		throw new Error("mcp_config.json is not an object");
+	}
+	return parsed as McpConfig;
+}
+
 function readConfig(file: string): { ok: true; config: McpConfig } | { ok: false; reason: string } {
-	let parsed: unknown;
+	let config: McpConfig;
 	try {
-		parsed = JSON.parse(fs.readFileSync(file, "utf8"));
+		config = readGlobalMcpConfig(file);
 	} catch (err) {
 		const code = (err as NodeJS.ErrnoException).code;
 		if (code === "ENOENT") return { ok: true, config: { mcpServers: {} } };
 		return { ok: false, reason: `mcp_config.json is not valid JSON; refusing to touch it (${String(err)})` };
 	}
-	if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
-		return { ok: false, reason: "mcp_config.json is not an object; refusing to touch it" };
-	}
-	const config = parsed as McpConfig;
 	if (!config.mcpServers || typeof config.mcpServers !== "object" || Array.isArray(config.mcpServers)) {
 		config.mcpServers = {};
 	}