@estebanforge/pi-ask-antigravity 1.1.0 → 1.2.0

package/extensions/index.ts

@@ -54,6 +54,9 @@ const GLOBAL_CONFIG_PATH = path.join(os.homedir(), ".pi", "agent", "ask-antigrav
 
 const DEFAULT_MODEL = "flash";
 const DEFAULT_THINKING = "medium";
+// Default on: without --dangerously-skip-permissions, any run_command hangs in
+// non-interactive -p mode (accept-edits auto-approves edits, NOT commands).
+const DEFAULT_SKIP_PERMISSIONS = true;
 
 // Per-family fallback tier when none is specified and no config default.
 // Flash defaults to medium (per spec); Pro only ships Low/High, so "latest
@@ -146,6 +149,9 @@ interface ModelEntry {
 interface Config {
 	defaultModel: string;
 	defaultThinking: ThinkingTier;
+	/** Pass --dangerously-skip-permissions so commands don't hang on an
+	 *  unanswerable y/n prompt in non-interactive -p mode. Default true. */
+	skipPermissions: boolean;
 }
 
 // --- Version helpers -------------------------------------------------------
@@ -188,9 +194,16 @@ function loadConfig(): Config {
 	const thinking: ThinkingTier =
 		thinkingRaw === "low" || thinkingRaw === "high" ? thinkingRaw : "medium";
 
+	const envPerm = process.env.AGY_SKIP_PERMISSIONS;
+	const skipPermissions =
+		envPerm !== undefined
+			? envPerm === "1" || envPerm.toLowerCase() === "true"
+			: merged.skipPermissions === false ? false : DEFAULT_SKIP_PERMISSIONS;
+
 	return {
 		defaultModel: String(merged.defaultModel ?? DEFAULT_MODEL).trim() || DEFAULT_MODEL,
 		defaultThinking: thinking,
+		skipPermissions,
 	};
 }
 
@@ -367,6 +380,52 @@ function resolveAgy(): string {
 	return process.env.AGY_BIN || "agy";
 }
 
+// Defer to pi-antigravity-bridge when it is installed: the bridge provides BOTH
+// the streaming antigravity provider AND the AskAntigravity tool (same shape as
+// pi-claude-bridge). Registering the tool here too would create a duplicate.
+//
+// Detection does NOT rely on module resolution: pi loads each package with a
+// separate module root (docs/packages.md), so require.resolve from here never
+// reaches a sibling package. Instead we check:
+//   1. An in-process Symbol.for flag the bridge sets at its load (fast path
+//      when the bridge loaded earlier this session).
+//   2. The bridge's package.json at pi's documented install locations
+//      (~/.pi/agent/npm|git/... and project .pi/npm|git/...).
+//
+// Coverage: (2) is order-independent for npm/git installs - installation is a
+// fact on disk. For LOCAL/source installs (`pi install <path>`) the package
+// lives at its original checkout, not under .pi/npm|git/, so (2) sees nothing;
+// there only (1) helps, and only if the bridge loads first. Recommendation for
+// dev with both repos checked out side-by-side: install the bridge first so it
+// is earlier in settings.json (pi loads extensions in that order). If the
+// clash still occurs, both tools are functionally identical, so the only
+// symptom is a duplicate-name TUI warning - not broken behavior.
+const BRIDGE_FLAG = Symbol.for("pi-antigravity-bridge:active");
+
+function bridgeInstallPaths(): string[] {
+	const npmPkg = path.join("@estebanforge", "pi-antigravity-bridge", "package.json");
+	const gitPkg = path.join("EstebanForge", "pi-antigravity-bridge", "package.json");
+	const home = os.homedir();
+	const cwd = process.cwd();
+	return [
+		path.join(home, ".pi", "agent", "npm", "node_modules", npmPkg),
+		path.join(cwd, ".pi", "npm", "node_modules", npmPkg),
+		path.join(home, ".pi", "agent", "git", "github.com", gitPkg),
+		path.join(cwd, ".pi", "git", "github.com", gitPkg),
+	];
+}
+
+const isBridgeInstalled = (): boolean => {
+	if ((globalThis as Record<symbol, unknown>)[BRIDGE_FLAG]) return true;
+	return bridgeInstallPaths().some((p) => {
+		try {
+			return fs.existsSync(p);
+		} catch {
+			return false;
+		}
+	});
+};
+
 const sleep = (ms: number) => new Promise<void>((r) => setTimeout(r, ms));
 
 /** Query `agy models`. Returns [] on any failure (non-fatal). */
@@ -466,6 +525,12 @@ interface AgyDetails {
 }
 
 export default async function (pi: ExtensionAPI) {
+	// If pi-antigravity-bridge is installed, it owns the AskAntigravity tool
+	// (and the provider). Stay silent and register nothing to avoid a
+	// duplicate-tool clash. Without the bridge, this extension behaves as
+	// before (standalone tool).
+	if (isBridgeInstalled()) return;
+
 	const binary = resolveAgy();
 	// Discovered once at load; frozen for the session. Run /reload after an
 	// `agy update` to refresh. Failure is non-fatal: resolveModel falls back
@@ -494,6 +559,7 @@ export default async function (pi: ExtensionAPI) {
 						`AskAntigravity config`,
 						`  defaultModel:    ${config.defaultModel}`,
 						`  defaultThinking: ${config.defaultThinking}`,
+						`  permissions:     ${config.skipPermissions ? "auto-approved" : "prompt"}`,
 						`  resolved:        ${resolveModel(config.defaultModel, discovered, config.defaultThinking) ?? "(agy default)"}`,
 						``,
 						`Edit: ~/.pi/agent/ask-antigravity.json`,
@@ -527,6 +593,14 @@ export default async function (pi: ExtensionAPI) {
 					currentValue: config.defaultThinking,
 					values: THINKING_OPTIONS,
 				},
+				{
+					id: "permissions",
+					label: "Permissions",
+					description:
+						"auto-approved: --dangerously-skip-permissions (required so run_command doesn't hang in -p mode). prompt: agy asks y/n (hangs non-interactively).",
+					currentValue: config.skipPermissions ? "auto-approved" : "prompt",
+					values: ["auto-approved", "prompt"],
+				},
 			];
 
 			const pending: Partial<Config> = {};
@@ -548,6 +622,8 @@ export default async function (pi: ExtensionAPI) {
 							pending.defaultModel = alias;
 						} else if (id === "defaultThinking") {
 							pending.defaultThinking = newValue as ThinkingTier;
+						} else if (id === "permissions") {
+							pending.skipPermissions = newValue === "auto-approved";
 						}
 					},
 					() => done(undefined),
@@ -742,6 +818,10 @@ export default async function (pi: ExtensionAPI) {
 			if (extra.length) args.push(...extra);
 			if (resolved) args.push("--model", resolved);
 			args.push("--mode", mode);
+			// accept-edits auto-approves file edits but NOT shell commands, so a
+			// run_command would hang on an unanswerable y/n prompt in non-interactive
+			// -p mode. Honor the shared permissions setting (same knob as the bridge).
+			if (config.skipPermissions) args.push("--dangerously-skip-permissions");
 			if (isContinuation) args.push("--conversation", rawConvId as string);
 			args.push("--print-timeout", `${timeoutMin}m`);
 			args.push("-p", finalPrompt);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@estebanforge/pi-ask-antigravity",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "Pi tool that delegates a self-contained sub-task to Google Antigravity's agy CLI (the CLI for Gemini). Friendly model aliases (flash/pro/gemini), configurable default model + thinking, and the AskAntigravity delegation tool.",
   "keywords": [
     "pi-package",