@estebanforge/pi-antigravity-bridge 1.4.1 → 1.4.2

package/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 All notable changes to this project will be documented in this file.
 
+## [1.4.2] - 2026-09-04
+
+### Changed
+
+- `bridgeTools` now defaults to `all` (every registered non-builtin pi tool) instead of `mcp`. The `mcp` surface filters to pi-mcp-adapter tools and serves an empty catalog on installs without that adapter, which left the bridge registered but tool-less from the model's point of view. `none` still opts out entirely; explicit `"bridgeTools": "mcp"` in an existing config keeps pinning the narrow surface.
+- Skill discovery now mirrors pi's directory-based scan (docs/skills.md): global `~/.pi/agent/skills` AND `~/.agents/skills`, project `.pi/skills` plus `.agents/skills` in cwd and ancestors up to the git root (project dirs only when pi has trusted the project, same gate pi applies), recursive SKILL.md discovery with grouping folders, per-style root/`.md` rules, hidden entries skipped, and description-less skills dropped. Pi's other skill sources (`skills` settings array, `package.json`, `--skill`) are not mirrored. Previously only one flat level of two directories was scanned, and `~/.agents/skills` (where pi actually reads most skills) was missing entirely, so `activate_skill` never appeared.
+- `/agy` now exposes the full runtime config surface: new `/agy bridge all|mcp|none` (which pi tools the MCP bridge hands to agy) and `/agy acp-bin <path|auto>` (target a specific ACP server binary; applies on the next ACP turn), plus Bridge tools, Context digest, and System prompt rows in the bare `/agy` settings picker. Usage strings and `/agy status` list every knob.
+
 ## [1.4.1] - 2026-09-04
 
 ### Added

package/README.md

@@ -104,19 +104,21 @@ If `agy models` fails at load (binary missing, auth not done, network stall), a
 
 | Key | Values | Default |
 | --- | --- | --- |
-| `bridgeTools` | `none` (bridge off), `mcp` (pi-mcp-adapter tools), `all` (every non-builtin tool, incl. other `Ask*` delegations) | `mcp` |
+| `bridgeTools` | `none` (bridge off), `all` (every non-builtin tool, incl. other `Ask*` delegations), `mcp` (pi-mcp-adapter tools + skills bridge only) | `all` |
 | `digest` | `off` (stable prompts; agy's prompt cache hits) or `on` (inject a delta of pi-side context - compaction summaries, other-provider turns - into each agy prompt; the delta changes every turn, so agy re-bills the full context). Enable for mixed-provider sessions where agy must see pi-side context | `off` |
 | `systemPrompt` | `on` (prepend pi's system prompt - operating instructions plus the global agent-dir `AGENTS.md` and ancestor `AGENTS.md`/`CLAUDE.md` - to the first prompt of each new agy conversation) or `off` (agy-native behavior) | `on` |
 
 Env overrides: `AGY_BRIDGE_TOOLS`, `AGY_DIGEST`, `AGY_SYSTEM_PROMPT`. Env wins over the file, so while `AGY_DIGEST` or `AGY_SYSTEM_PROMPT` is set, the matching `/agy digest` or `/agy system-prompt` toggle persists a value that never takes effect.
 
+The `activate_skill` catalog mirrors pi's directory-based skill discovery: the two global dirs plus project dirs, the latter only when pi has trusted the project (same gate pi itself applies). Pi's other skill sources - the `skills` settings array, `package.json` entries, and `--skill` CLI paths - are not mirrored and won't appear in the catalog.
+
 ### The /agy command
 
 `/agy` configures the provider at runtime. Settings persist to `~/.pi/agent/antigravity-bridge/config.json` and take effect on the next turn.
 
 ```
-/agy                      status, or open the mode/permissions/model/thinking picker (TUI)
-/agy status               print current mode, permissions, model + session counts
+/agy                      status, or open the full settings picker (TUI)
+/agy status               print current settings + session counts
 /agy doctor               bridge state, driver counters, bridge port, last lifecycle events
 /agy mode plan            review-only: agy plans but writes nothing
 /agy mode accept-edits    agy applies edits directly (default)
@@ -125,6 +127,8 @@ Env overrides: `AGY_BRIDGE_TOOLS`, `AGY_DIGEST`, `AGY_SYSTEM_PROMPT`. Env wins o
 /agy thinking low|medium|high default thinking tier for the AskAntigravity tool
 /agy digest on|off        inject pi-side context into agy prompts (default off; see table above)
 /agy system-prompt on|off send pi's system prompt + AGENTS.md to new agy conversations (default on)
+/agy bridge all|mcp|none  which pi tools the MCP bridge exposes to agy (default all; none = bridge off)
+/agy acp-bin <path|auto>  point the ACP engine at a specific server binary (auto = setup installs, or AGY_ACP_BIN; applies on the next ACP turn)
 /agy engine acp|stream-json   switch the turn engine (restart to apply; default stream-json; acp runs self-service setup: binary install + auth bootstrap)
 /agy acp-auth                 manual ACP credential setup (fallback; auto-setup normally covers this; default login = your Antigravity subscription, same account as the agy CLI)
 /agy patch-cleanup        restore the original pi files if an older version patched them

package/extensions/index.ts

@@ -11,10 +11,12 @@
 //   ("[agy tool: editing foo.ts]") for visibility, but the edits already landed
 //   on disk and pi's inline diff review does not engage.
 //
-// /agy command: status, mode picker (plan / accept-edits),
-// and session clear. Config persists to ~/.pi/agent/antigravity-bridge/
-// config.json so toggles survive restarts.
+// /agy command: full runtime config surface (engine, mode, permissions,
+// bridge tools, model, thinking, digest, system prompt, acp binary) plus
+// doctor, auth, patch-cleanup, and session clear. Config persists to
+// ~/.pi/agent/antigravity-bridge/config.json so toggles survive restarts.
 
+import os from "node:os";
 import {
 	type ExtensionAPI,
 	type ExtensionCommandContext,
@@ -304,7 +306,9 @@ export default async function (pi: ExtensionAPI): Promise<void> {
 		if (bridgeMode === "none") return; // user opted out
 		if (mcpHandle) return; // already running (reload re-fires session_start)
 		const SKIP = new Set(["AskAntigravity"]);
-		const skills: SkillLite[] = scanSkills(process.cwd());
+		// pi loads project skill locations only after the project is trusted;
+		// mirror that gate. Global skill dirs are always scanned.
+		const skills: SkillLite[] = scanSkills(ctx.isProjectTrusted() ? process.cwd() : undefined);
 		const getAll = (pi as unknown as {
 			getAllTools: () => Array<{ name: string; description?: string; parameters?: object; sourceInfo?: { source?: string } }>;
 		}).getAllTools.bind(pi);
@@ -391,6 +395,9 @@ interface PendingConfig {
 	skipPermissions?: boolean;
 	defaultModel?: string;
 	defaultThinking?: ThinkingTier;
+	bridgeTools?: BridgeTools;
+	digest?: boolean;
+	systemPrompt?: boolean;
 }
 
 function statusText(ctx: AgyCommandCtx): string {
@@ -411,7 +418,7 @@ function statusText(ctx: AgyCommandCtx): string {
 		`  digest:        ${config.digest ? "on" : "off"}`,
 		`  system prompt: ${config.systemPrompt ? "on" : "off"}`,
 		"",
-		"Subcommands: /agy engine stream-json|acp, /agy mode plan|accept-edits, /agy permissions on|off, /agy model flash|pro|gemini, /agy thinking low|medium|high, /agy digest on|off, /agy system-prompt on|off, /agy acp-auth, /agy patch-cleanup, /agy clear",
+		"Subcommands: /agy engine stream-json|acp, /agy mode plan|accept-edits, /agy permissions on|off, /agy bridge all|mcp|none, /agy model <alias>, /agy thinking low|medium|high, /agy digest on|off, /agy system-prompt on|off, /agy acp-bin <path|auto>, /agy acp-auth, /agy patch-cleanup, /agy clear",
 	].join("\n");
 }
 
@@ -419,7 +426,7 @@ function statusText(ctx: AgyCommandCtx): string {
 function registerAgyCommand(pi: ExtensionAPI, ctx: AgyCommandCtx): void {
 	pi.registerCommand("agy", {
 		description:
-			"Antigravity provider: status, doctor, engine picker, mode picker, clear sessions. Usage: /agy [status|doctor|engine stream-json|acp|mode [plan|accept-edits]|permissions on|off|digest on|off|system-prompt on|off|acp-auth|patch-cleanup|clear]",
+			"Antigravity provider: status, doctor, settings picker, clear sessions. Usage: /agy [status|doctor|engine stream-json|acp|mode plan|accept-edits|permissions on|off|bridge all|mcp|none|model <alias>|thinking low|medium|high|digest on|off|system-prompt on|off|acp-bin <path|auto>|acp-auth|patch-cleanup|clear]",
 		handler: async (args, cmdCtx: ExtensionCommandContext) => {
 			const ui = cmdCtx.ui;
 			const mode = cmdCtx.mode;
@@ -487,6 +494,24 @@ function registerAgyCommand(pi: ExtensionAPI, ctx: AgyCommandCtx): void {
 				}
 				return;
 			}
+			if (sub === "acp-bin") {
+				const rest = (args ?? "").trim().split(/\s+/).slice(1).join(" ");
+				if (rest.length > 0) {
+					// Only the keyword compares case-insensitively; the path keeps its case.
+					const bin = rest.toLowerCase() === "auto" ? "" : rest.replace(/^~(?=\/|$)/, os.homedir());
+					saveConfig({ acp: { bin, permissions: loadConfig().acp.permissions } });
+					ui?.notify(
+						bin
+							? `acp.bin set to ${bin}. The next ACP turn (re)connects with it.`
+							: "acp.bin cleared. Auto-setup (or AGY_ACP_BIN) picks the binary on the next ACP turn.",
+						"info",
+					);
+				} else {
+					const cur = loadConfig().acp.bin;
+					ui?.notify(`acp.bin: ${cur || "(auto: setup installs, or AGY_ACP_BIN)"}\nusage: /agy acp-bin <path|auto>`, "info");
+				}
+				return;
+			}
 			if (sub === "acp-auth") {
 				ui?.notify(
 					[
@@ -575,6 +600,20 @@ function registerAgyCommand(pi: ExtensionAPI, ctx: AgyCommandCtx): void {
 				}
 				return;
 			}
+			if (sub === "bridge") {
+				if (val === "all" || val === "mcp" || val === "none") {
+					const next = saveConfig({ bridgeTools: val });
+					ui?.notify(
+						next.bridgeTools === "none"
+							? "bridge off. The MCP tool bridge will not start on the next pi start (or /reload)."
+							: `bridge tools set to ${next.bridgeTools}. The catalog rebuilds on the next pi start (or /reload).`,
+						"info",
+					);
+				} else {
+					ui?.notify(`bridge: ${loadConfig().bridgeTools}\nusage: /agy bridge all|mcp|none\n  all: every non-builtin pi tool (default). mcp: pi-mcp-adapter tools + skills only. none: bridge off.`, "info");
+				}
+				return;
+			}
 			if (sub === "model") {
 				if (val && val.length > 0) {
 					const next = saveConfig({ defaultModel: val });
@@ -640,7 +679,10 @@ function registerAgyCommand(pi: ExtensionAPI, ctx: AgyCommandCtx): void {
 	});
 }
 
-/** Interactive settings picker (TUI only). Rows: mode + permissions + model + thinking. */
+/** Interactive settings picker (TUI only). Rows: the full runtime config
+ *  surface (mode, permissions, model, thinking, bridge, digest, system
+ *  prompt). Engine stays a subcommand: switching runs install + auth setup
+ *  and needs a restart. */
 async function openAgyPicker(ui: ExtensionUIContext, ctx: AgyCommandCtx): Promise<void> {
 	const config = loadConfig();
 	const pending: PendingConfig = {};
@@ -678,6 +720,30 @@ async function openAgyPicker(ui: ExtensionUIContext, ctx: AgyCommandCtx): Promis
 			currentValue: config.defaultThinking,
 			values: ["low", "medium", "high"],
 		},
+		{
+			id: "bridge",
+			label: "Bridge tools",
+			description:
+				"Which pi tools the MCP bridge exposes to agy. all: every non-builtin tool (default). mcp: pi-mcp-adapter tools + skills. none: bridge off.",
+			currentValue: config.bridgeTools,
+			values: ["all", "mcp", "none"],
+		},
+		{
+			id: "digest",
+			label: "Context digest",
+			description:
+				"Inject a delta of pi-side context into each agy prompt. Defeats agy's prompt cache (~25-30k tokens re-billed per turn).",
+			currentValue: config.digest ? "on" : "off",
+			values: ["on", "off"],
+		},
+		{
+			id: "system-prompt",
+			label: "System prompt",
+			description:
+				"Prepend pi's system prompt (incl. AGENTS.md files) to the first prompt of each new agy conversation.",
+			currentValue: config.systemPrompt ? "on" : "off",
+			values: ["on", "off"],
+		},
 	];
 
 	await ui.custom((tui, theme, _kb, done) => {
@@ -698,6 +764,12 @@ async function openAgyPicker(ui: ExtensionUIContext, ctx: AgyCommandCtx): Promis
 					pending.defaultModel = newValue;
 				} else if (id === "thinking") {
 					pending.defaultThinking = newValue as ThinkingTier;
+				} else if (id === "bridge") {
+					pending.bridgeTools = newValue as BridgeTools;
+				} else if (id === "digest") {
+					pending.digest = newValue === "on";
+				} else if (id === "system-prompt") {
+					pending.systemPrompt = newValue === "on";
 				}
 			},
 			() => done(undefined),
@@ -714,13 +786,7 @@ async function openAgyPicker(ui: ExtensionUIContext, ctx: AgyCommandCtx): Promis
 		};
 	});
 
-	if (
-		pending.mode === undefined &&
-		pending.skipPermissions === undefined &&
-		pending.defaultModel === undefined &&
-		pending.defaultThinking === undefined
-	)
-		return;
+	if (Object.keys(pending).length === 0) return;
 
 	if (pending.mode === "plan" && ctx.engine === "acp") {
 		ui.notify("the ACP engine has no plan mode (RC01). Switch /agy engine stream-json first.", "warning");
@@ -736,6 +802,9 @@ async function openAgyPicker(ui: ExtensionUIContext, ctx: AgyCommandCtx): Promis
 				: null,
 			pending.defaultModel !== undefined ? `tool model=${next.defaultModel}` : null,
 			pending.defaultThinking !== undefined ? `tool thinking=${next.defaultThinking}` : null,
+			pending.bridgeTools !== undefined ? `bridge=${next.bridgeTools}` : null,
+			pending.digest !== undefined ? `digest=${next.digest ? "on" : "off"}` : null,
+			pending.systemPrompt !== undefined ? `system-prompt=${next.systemPrompt ? "on" : "off"}` : null,
 		]
 			.filter(Boolean)
 			.join(", ");

package/package.json

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

package/src/config.ts

@@ -59,8 +59,10 @@ export interface AgyConfig {
 	 *  always available. */
 	patchCleanupNotified?: boolean;
 	/** Which pi tools the MCP bridge exposes to agy: "none" (bridge off),
-	 *  "mcp" (pi-mcp-adapter tools + skills bridge; default), "all" (every
-	 *  registered non-builtin tool incl. other Ask* delegations). */
+	 *  "all" (every registered non-builtin tool incl. other Ask* delegations;
+	 *  default - users expect the bridge working out of the box, and the
+	 *  "mcp" surface serves an empty catalog on installs without
+	 *  pi-mcp-adapter), "mcp" (pi-mcp-adapter tools + skills bridge only). */
 	bridgeTools: BridgeTools;
 	/** Inject a delta digest of pi-side context (compaction summaries, turns
 	 *  handled by other providers or pi's own tools) into each agy prompt.
@@ -94,7 +96,7 @@ const DEFAULTS: AgyConfig = {
 	skipPermissions: true,
 	defaultModel: "flash",
 	defaultThinking: "medium",
-	bridgeTools: "mcp",
+	bridgeTools: "all",
 	digest: false,
 	systemPrompt: true,
 	acp: { bin: "", permissions: "auto" },
@@ -149,7 +151,9 @@ export function loadConfig(configPath: string = CONFIG_PATH): AgyConfig {
 
 	const bridgeRaw = (process.env.AGY_BRIDGE_TOOLS ?? file.bridgeTools ?? DEFAULTS.bridgeTools).toLowerCase();
 	const bridgeTools: BridgeTools =
-		bridgeRaw === "none" || bridgeRaw === "all" ? bridgeRaw : "mcp";
+		bridgeRaw === "none" || bridgeRaw === "all" || bridgeRaw === "mcp"
+			? bridgeRaw
+			: DEFAULTS.bridgeTools;
 
 	const digest = process.env.AGY_DIGEST !== undefined
 		? ["1", "true", "on"].includes(process.env.AGY_DIGEST.toLowerCase())

package/src/skills.ts

@@ -22,7 +22,9 @@ export interface SkillLite {
 	dir: string;
 }
 
-/** Parse `name:` / `description:` out of SKILL.md frontmatter. */
+/** Parse `name:` / `description:` out of SKILL.md frontmatter. Deliberately
+ *  line-based, not YAML: multi-line block scalars (`description: >-`) keep
+ *  only their first line. */
 function parseFrontmatter(raw: string): { name?: string; description?: string } {
 	const m = raw.match(/^---\r?\n([\s\S]*?)\r?\n---/);
 	if (!m) return {};
@@ -36,48 +38,123 @@ function parseFrontmatter(raw: string): { name?: string; description?: string }
 	return out;
 }
 
-function scanDir(dir: string): SkillLite[] {
-	let entries: string[];
+// The rest of this module mirrors pi's own skill discovery (pi docs
+// "docs/skills.md - Locations") so the bridge's activate_skill catalog
+// matches the [Skills] list pi shows in its system prompt:
+//
+// - Global: ~/.pi/agent/skills (pi style) and ~/.agents/skills (agents style,
+//   the cross-harness standard).
+// - Project: .pi/skills (pi style) and .agents/skills in cwd + ancestors up
+//   to the git repo root (agents style).
+// - Both styles discover every directory holding a SKILL.md, recursively;
+//   grouping folders (no SKILL.md) are descended into and a skill's contents
+//   are freeform (no descent past its SKILL.md).
+// - pi style also treats root .md files as individual skills; agents style
+//   ignores root .md but picks up frontmatter .md files inside grouping
+//   folders.
+// - Skills without a description are not loaded (same as pi).
+// - Name collisions keep the first skill found, pi global dirs before
+//   project dirs.
+
+export type SkillStyle = "pi" | "agents";
+
+export interface SkillLocation {
+	dir: string;
+	style: SkillStyle;
+}
+
+const MAX_DEPTH = 16; // symlink-loop insurance; real catalogs nest 1-2 levels
+
+/** Ordered skill locations for a session: pi global dirs, then project dirs
+ *  (project `.agents/skills` walks cwd ancestors up to the git root). */
+export function skillLocations(projectDir?: string, home: string = os.homedir()): SkillLocation[] {
+	const out: SkillLocation[] = [
+		{ dir: path.join(home, ".pi", "agent", "skills"), style: "pi" },
+		{ dir: path.join(home, ".agents", "skills"), style: "agents" },
+	];
+	if (!projectDir) return out;
+	out.push({ dir: path.join(projectDir, ".pi", "skills"), style: "pi" });
+	let dir = path.resolve(projectDir);
+	for (;;) {
+		out.push({ dir: path.join(dir, ".agents", "skills"), style: "agents" });
+		if (path.dirname(dir) === dir || fs.existsSync(path.join(dir, ".git"))) break;
+		dir = path.dirname(dir);
+	}
+	return out;
+}
+
+function readSkillFile(file: string, fallbackName: string): SkillLite | null {
+	let raw = "";
 	try {
-		entries = fs.readdirSync(dir, { withFileTypes: true }).map((e) => e.name);
+		// Strip a UTF-8 BOM so editors that add one do not break the `---` anchor.
+		raw = fs.readFileSync(file, "utf8").replace(/^\uFEFF/, "");
 	} catch {
-		return [];
+		return null;
 	}
-	const found: SkillLite[] = [];
-	for (const entry of entries) {
-		const skillDir = path.join(dir, entry);
-		const skillFile = path.join(skillDir, "SKILL.md");
+	const fm = parseFrontmatter(raw);
+	const description = (fm.description ?? "").trim();
+	// pi does not load skills without a description.
+	if (!description) return null;
+	return {
+		name: fm.name?.trim() || fallbackName,
+		description: description.replace(/\s+/g, " ").slice(0, 160),
+		filePath: file,
+		dir: path.dirname(file),
+	};
+}
+
+function scanLocation(loc: SkillLocation): SkillLite[] {
+	const walk = (dir: string, depth: number): SkillLite[] => {
+		if (depth > MAX_DEPTH) return [];
+		let entries: fs.Dirent[];
 		try {
-			if (!fs.statSync(skillFile).isFile()) continue;
+			entries = fs.readdirSync(dir, { withFileTypes: true });
 		} catch {
-			continue;
+			return [];
 		}
-		let raw = "";
-		try {
-			raw = fs.readFileSync(skillFile, "utf8");
-		} catch {
-			continue;
+		const found: SkillLite[] = [];
+		for (const entry of entries) {
+			// Hidden entries are harness internals (e.g. ~/.agents/skills/.system);
+			// pi's own [Skills] list never includes them.
+			if (entry.name.startsWith(".")) continue;
+			const full = path.join(dir, entry.name);
+			let isDir: boolean;
+			try {
+				isDir = entry.isDirectory() || (entry.isSymbolicLink() && fs.statSync(full).isDirectory());
+			} catch {
+				continue;
+			}
+			if (isDir) {
+				if (fs.existsSync(path.join(full, "SKILL.md"))) {
+					const skill = readSkillFile(path.join(full, "SKILL.md"), entry.name);
+					if (skill) found.push(skill);
+				} else {
+					found.push(...walk(full, depth + 1));
+				}
+				continue;
+			}
+			if (!entry.name.endsWith(".md") || entry.name === "SKILL.md") continue;
+			const standalone = loc.style === "pi" ? depth === 0 : depth > 0;
+			if (!standalone) continue;
+			const skill = readSkillFile(full, entry.name.replace(/\.md$/, ""));
+			if (skill) found.push(skill);
 		}
-		const fm = parseFrontmatter(raw);
-		found.push({
-			name: fm.name?.trim() || entry,
-			description: (fm.description ?? "").replace(/\s+/g, " ").slice(0, 160),
-			filePath: skillFile,
-			dir: skillDir,
-		});
-	}
-	return found;
+		return found;
+	};
+	return walk(loc.dir, 0);
 }
 
-/** Unique skills with a file path; first name wins (same as pi collisions). */
-export function scanSkills(projectDir?: string): SkillLite[] {
-	const globalDir = path.join(os.homedir(), ".pi", "agent", "skills");
+/** pi-faithful skill catalog: every skill pi itself would load, deduped by
+ *  name (first wins). `home` is injectable for tests. */
+export function scanSkills(projectDir?: string, home: string = os.homedir()): SkillLite[] {
 	const seen = new Set<string>();
 	const out: SkillLite[] = [];
-	for (const skill of [...scanDir(globalDir), ...(projectDir ? scanDir(path.join(projectDir, ".pi", "skills")) : [])]) {
-		if (!skill.filePath || seen.has(skill.name)) continue;
-		seen.add(skill.name);
-		out.push(skill);
+	for (const loc of skillLocations(projectDir, home)) {
+		for (const skill of scanLocation(loc)) {
+			if (seen.has(skill.name)) continue;
+			seen.add(skill.name);
+			out.push(skill);
+		}
 	}
 	return out;
 }