@estebanforge/pi-antigravity-bridge 1.1.2 → 1.2.4

package/CHANGELOG.md

@@ -2,6 +2,42 @@
 
 All notable changes to this project will be documented in this file.
 
+## [1.2.4] - 2026-08-13
+
+### Added
+
+- **Model, thinking tier, and mode shown next to the tool name.** The
+  `AskAntigravity` tool now renders
+  `AskAntigravity [model=gemini-3.6-flash, thinking=high]` with a prompt
+  preview while a delegation runs, plus a tidy result row
+  (`✓ AskAntigravity 12.3s`) with an expandable body. Built on pi's
+  `renderCall`/`renderResult` hooks; the values shown are the resolved
+  config defaults (model alias + tier), not just the args the caller passed.
+  `AgyDetails` gained a `thinking` field.
+- **Opt-in full-context delegation (`includeContext`).** New boolean param
+  (default `false`, isolated one-shot unchanged). When `true`, the current pi
+  conversation is exported as resolved markdown to
+  `~/.pi/extensions-data/estebanforge/pi-antigravity-bridge/` and the prompt
+  tells agy to read it first. The run passes `--add-dir` for that folder so
+  the sandbox can read it; the temp file is removed after the run.
+
+## [1.2.3] - 2026-08-10
+
+### Fixed
+
+- **Model parsing now handles agy's real two-column output.** `agy models`
+  prints `<slug>  <display label>` per line, and `--model` accepts only the
+  slug. `entriesFromRaw` (provider path) applied its slug regex to the whole
+  line, so every real line was rejected and the provider always fell back to
+  the hardcoded catalog; it now splits column 1 and requires a hyphen, which
+  also drops banner words split out of column 1. The AskAntigravity resolver
+  swallowed slug + label into `--model`, which agy rejected; it now returns a
+  `{model, effort?}` shape that sends Gemini-family bases' base slug to
+  `--model` and their tier to `--effort`, while fixed-thinking families
+  (Claude, GPT-OSS) keep the exact slug with no `--effort` (agy rejects it for
+  them). Matches the provider's collapse + clamping path. Tests rewritten to
+  the verified live `agy models` fixture.
+
 ## [1.1.2] - 2026-08-10
 
 ### Fixed

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@estebanforge/pi-antigravity-bridge",
-  "version": "1.1.2",
+  "version": "1.2.4",
   "description": "Streaming Gemini provider for pi, built on the agy CLI. Registers antigravity/* models in pi's /model picker via SQLite polling + protobuf decode of agy's conversation DBs.",
   "keywords": [
     "pi-package",

package/src/ask-tool.ts

@@ -15,6 +15,9 @@ import { spawn } from "node:child_process";
 import * as fs from "node:fs";
 import * as path from "node:path";
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import { buildSessionContext, getAgentDir, keyHint } from "@earendil-works/pi-coding-agent";
+import { Text } from "@earendil-works/pi-tui";
+import { contentText } from "@earendil-works/pi-ai";
 import { Type } from "typebox";
 import {
 	CONVERSATIONS_DIR,
@@ -30,6 +33,10 @@ const DEFAULT_TIMEOUT_MIN = 10;
 const GRACE_AFTER_TIMEOUT_MS = 5000;
 const STATUS_INTERVAL_MS = 1000;
 const STATUS_TAIL_CHARS = 160;
+
+// renderCall / renderResult preview limits (match pi-claude-bridge).
+const PREVIEW_MAX_CHARS = 1000;
+const PREVIEW_MAX_LINES = 6;
 const DISCOVERY_POLL_ATTEMPTS = 5;
 const DISCOVERY_POLL_MS = 100;
 
@@ -84,6 +91,15 @@ interface ModelEntry {
 	tier: ThinkingTier | null;
 }
 
+/** Argv-facing model resolution: the exact --model slug plus an optional
+ *  --effort tier. Gemini bases split the tier out (the base slug alone is
+ *  invalid without --effort); fixed-thinking families keep agy's exact slug
+ *  and carry no effort. */
+interface ResolvedModel {
+	model: string;
+	effort?: ThinkingTier;
+}
+
 // --- Version helpers -------------------------------------------------------
 
 /** Descending numeric version compare (3.10 > 3.9, not lexical). */
@@ -110,7 +126,10 @@ function mergeCatalog(live: ModelEntry[]): ModelEntry[] {
 }
 
 function parseModelLine(line: string): ModelEntry | null {
-	const full = line.trim();
+	// agy prints TWO columns: "<slug>  <display label>". --model takes only the
+	// slug (col 1), so split it off; the label is display-only and must never
+	// reach --model. A bare-slug line (no whitespace) splits to itself.
+	const full = line.trim().split(/\s+/)[0] ?? "";
 	if (!full) return null;
 	const lower = full.toLowerCase();
 	const family: Family = lower.includes("flash")
@@ -135,21 +154,36 @@ function nearestTier(available: ThinkingTier[], preferred: ThinkingTier): Thinki
 	return sorted[0] ?? preferred;
 }
 
-/** Resolve a friendly alias / partial name to an exact agy model string. */
+/** Build the argv-facing resolution from a picked catalog entry. Gemini bases
+ *  (slugs starting "gemini-") accept a separate --effort, so split the tier
+ *  suffix out of the slug: the base alone (gemini-3.6-flash) is what --model
+ *  wants, and the tier goes to --effort. Fixed-thinking families keep agy's
+ *  exact slug even when it carries a -medium suffix (gpt-oss-120b-medium):
+ *  agy rejects --effort for them, so the suffix stays part of the slug. */
+function toResolved(full: string, tier: ThinkingTier | null): ResolvedModel {
+	if (tier && full.toLowerCase().startsWith("gemini-")) {
+		return { model: full.replace(/-(low|medium|high)$/, ""), effort: tier };
+	}
+	return { model: full };
+}
+
+/** Resolve a friendly alias / partial name to an argv-facing {model, effort?}.
+ *  Returns null only when the family is unrecognized; the caller then passes
+ *  the raw input straight to agy. */
 export function resolveModel(
 	input: string,
 	entries: ModelEntry[],
 	defaultThinking: ThinkingTier,
-): string | null {
+): ResolvedModel | null {
 	const lower = input.toLowerCase().trim();
 
 	const exact = entries.find((e) => e.full.toLowerCase() === lower);
-	if (exact) return exact.full;
+	if (exact) return toResolved(exact.full, exact.tier);
 
 	if (STATIC_SHORT_ALIAS.has(lower)) {
 		const target = STATIC_SHORT_ALIAS.get(lower) as string;
 		const fromCatalog = entries.find((e) => e.full.toLowerCase() === target.toLowerCase());
-		return fromCatalog ? fromCatalog.full : target;
+		return toResolved(fromCatalog?.full ?? target, fromCatalog?.tier ?? null);
 	}
 
 	let family: Family | null = lower.includes("flash")
@@ -193,13 +227,14 @@ export function resolveModel(
 	const familyTiers = new Set(
 		candidates.map((e) => e.tier).filter((t): t is ThinkingTier => t !== null),
 	);
-	if (familyTiers.size === 0) return candidates[0].full;
+	if (familyTiers.size === 0) return toResolved(candidates[0].full, null);
 
 	const preferred =
 		tier ??
 		(familyTiers.has(defaultThinking) ? defaultThinking : FAMILY_DEFAULT_TIER[family]);
 	const chosenTier = nearestTier([...familyTiers], preferred);
-	return (candidates.find((e) => e.tier === chosenTier) ?? candidates[0]).full;
+	const picked = candidates.find((e) => e.tier === chosenTier) ?? candidates[0];
+	return toResolved(picked.full, picked.tier);
 }
 
 /** Parse raw `agy models` text into tool-catalog entries (all families, plus
@@ -274,7 +309,78 @@ export async function registerAskAntigravityTool(
 			timeoutMinutes: Type.Optional(
 				Type.Number({ description: `Hard cap on the agy run in minutes. Default ${DEFAULT_TIMEOUT_MIN}.` }),
 			),
+			includeContext: Type.Optional(
+				Type.Boolean({
+					description:
+						"When true, export the current pi conversation (resolved, as markdown) to a temp file inside the workspace and tell agy to read it first. Default false (isolated one-shot). Opt in only when the user explicitly wants agy to see the full conversation; it costs agy tokens to read.",
+				}),
+			),
 		}),
+		renderCall(args, theme, _context) {
+			// Show RESOLVED model/thinking/mode (config defaults applied) so the
+			// row identifies what will actually run, not just explicit args.
+			const cfg = loadConfig();
+			const requestedModel = (args.model as string | undefined)?.trim() || cfg.defaultModel;
+			const resolved =
+				resolveModel(requestedModel, entries, cfg.defaultThinking) ?? { model: requestedModel };
+			const thinking: ThinkingTier = resolved.effort ?? cfg.defaultThinking;
+			const mode: AgyMode = (args.mode as AgyMode | undefined) ?? "accept-edits";
+			const useDigest = typeof args.digest === "boolean" ? args.digest : mode === "plan";
+			const isContinue =
+				typeof args.conversationId === "string" && CONV_ID_RE.test(args.conversationId);
+
+			const tags: string[] = [`model=${resolved.model}`, `thinking=${thinking}`];
+			if (mode !== "accept-edits") tags.push(`mode=${mode}`);
+			if (useDigest) tags.push("digest");
+			if (isContinue) tags.push("continue");
+			if (args.includeContext) tags.push("context=full");
+
+			let text = theme.fg("mdLink", theme.bold("AskAntigravity "));
+			text += `${theme.fg("accent", `[${tags.join(", ")}]`)} `;
+
+			const prompt = String(args.prompt ?? "");
+			const truncated = prompt.length > PREVIEW_MAX_CHARS ? prompt.slice(0, PREVIEW_MAX_CHARS) : prompt;
+			const lines = truncated.split("\n").slice(0, PREVIEW_MAX_LINES);
+			text += theme.fg("muted", `"${lines.join("\n")}"`);
+			if (prompt.length > PREVIEW_MAX_CHARS || prompt.split("\n").length > PREVIEW_MAX_LINES) {
+				text += theme.fg("dim", " …");
+			}
+			return new Text(text, 0, 0);
+		},
+		renderResult(result, { expanded, isPartial }, theme) {
+			const d = result.details as AgyDetails | undefined;
+			if (isPartial) {
+				const status = result.content[0]?.type === "text" ? result.content[0].text : "working...";
+				return new Text(theme.fg("mdLink", "◉ AskAntigravity ") + theme.fg("muted", status), 0, 0);
+			}
+
+			const body = result.content[0]?.type === "text" ? result.content[0].text : "";
+			const errored = d?.exitCode !== 0 || !!d?.aborted || !!d?.timedOut;
+
+			let text = errored
+				? theme.fg("error", "✗ AskAntigravity error")
+				: theme.fg("mdLink", "✓ AskAntigravity");
+
+			const rTags: string[] = [];
+			if (d?.resolvedModel || d?.model) rTags.push(`model=${d?.resolvedModel ?? d?.model}`);
+			if (d?.thinking) rTags.push(`thinking=${d.thinking}`);
+			if (d?.mode && d.mode !== "accept-edits") rTags.push(`mode=${d.mode}`);
+			if (d?.includeContext) rTags.push("context=full");
+			if (rTags.length) text += ` ${theme.fg("accent", `[${rTags.join(", ")}]`)}`;
+			if (d?.durationMs) text += ` ${theme.fg("dim", `${(d.durationMs / 1000).toFixed(1)}s`)}`;
+
+			if (expanded) {
+				if (body) text += `\n${theme.fg("toolOutput", body)}`;
+			} else {
+				const truncated = body.length > PREVIEW_MAX_CHARS ? body.slice(0, PREVIEW_MAX_CHARS) : body;
+				const lines = truncated.split("\n").slice(0, PREVIEW_MAX_LINES);
+				if (lines.length) text += `\n${theme.fg("toolOutput", lines.join("\n"))}`;
+				if (body.length > PREVIEW_MAX_CHARS || body.split("\n").length > PREVIEW_MAX_LINES) {
+					text += `\n${theme.fg("dim", `… (${keyHint("app.tools.expand", "to expand")})`)}`;
+				}
+			}
+			return new Text(text, 0, 0);
+		},
 		async execute(toolCallId, params, signal, onUpdate, ctx) {
 			// Circular-delegation guard: refuse if already running through the
 			// antigravity provider.
@@ -304,7 +410,9 @@ export async function registerAskAntigravityTool(
 				};
 			}
 			const resolved =
-				resolveModel(requestedModel, entries, config.defaultThinking) ?? requestedModel;
+				resolveModel(requestedModel, entries, config.defaultThinking) ?? {
+					model: requestedModel,
+				};
 
 			const start = Date.now();
 			const cwd = params.cwd || ctx.cwd || process.cwd();
@@ -313,13 +421,13 @@ export async function registerAskAntigravityTool(
 				if (!stat.isDirectory()) {
 					return {
 						content: [{ type: "text", text: `cwd is not a directory: ${cwd}` }],
-						details: emptyDetails(requestedModel, resolved),
+						details: emptyDetails(requestedModel, resolved.model),
 					};
 				}
 			} catch {
 				return {
 					content: [{ type: "text", text: `cwd does not exist: ${cwd}` }],
-					details: emptyDetails(requestedModel, resolved),
+					details: emptyDetails(requestedModel, resolved.model),
 				};
 			}
 
@@ -337,10 +445,34 @@ export async function registerAskAntigravityTool(
 				? `(Use compact digests, not full file contents.)\n${params.prompt}`
 				: params.prompt;
 
+			// Opt-in full-context export (isolated stays the default).
+			let contextFile: string | null = null;
+			if (params.includeContext) {
+				try {
+					const { messages } = buildSessionContext(ctx.sessionManager.getBranch());
+					if (messages.length) {
+						const md = renderAgentMessagesMarkdown(messages);
+						const ctxDir = askContextDir();
+						fs.mkdirSync(ctxDir, { recursive: true });
+						contextFile = path.join(
+							ctxDir,
+							`.ask-context-${Date.now()}-${Math.random().toString(36).slice(2, 8)}.md`,
+						);
+						fs.writeFileSync(contextFile, md, { mode: 0o600 });
+					}
+				} catch {
+					contextFile = null;
+				}
+			}
+			const effectivePrompt = contextFile
+				? `The full pi conversation context (as markdown) is at: ${contextFile}\nRead that file first for context, then do the task below.\n\n---\n\n${finalPrompt}`
+				: finalPrompt;
+
 			const args: string[] = ["--add-dir", cwd];
 			const extra = extraArgs();
 			if (extra.length) args.push(...extra);
-			if (resolved) args.push("--model", resolved);
+			if (resolved.model) args.push("--model", resolved.model);
+			if (resolved.effort) args.push("--effort", resolved.effort);
 			args.push("--mode", mode);
 			// Honor the shared permissions setting (same knob as the provider). Non-
 			// interactive -p can't answer a permission prompt, so when this is off
@@ -348,14 +480,17 @@ export async function registerAskAntigravityTool(
 			if (config.skipPermissions !== false) args.push("--dangerously-skip-permissions");
 			if (isContinuation) args.push("--conversation", rawConvId as string);
 			args.push("--print-timeout", `${timeoutMin}m`);
-			args.push("-p", finalPrompt);
+			if (contextFile) args.push("--add-dir", askContextDir());
+			args.push("-p", effectivePrompt);
 
 			const details: AgyDetails = {
 				model: requestedModel,
-				resolvedModel: resolved,
+				resolvedModel: resolved.model,
+				thinking: resolved.effort ?? config.defaultThinking,
 				mode,
 				digest: useDigest,
 				conversationId: isContinuation ? (rawConvId as string) : null,
+				includeContext: contextFile !== null,
 				exitCode: 0,
 				aborted: false,
 				timedOut: false,
@@ -547,16 +682,91 @@ export async function registerAskAntigravityTool(
 				const msg = err instanceof Error ? err.message : String(err);
 				return { content: [{ type: "text", text: `failed to run agy: ${msg}` }], details };
 			}
+			finally {
+				if (contextFile) {
+					try {
+						fs.unlinkSync(contextFile);
+					} catch {}
+				}
+			}
 		},
 	});
 }
 
+// --- Full-context export (opt-in includeContext) --------------------------
+// NOTE: duplicated per pi-ask-* / bridge package (each is self-contained).
+// Duck-typed over role/content to tolerate AgentMessage's union + custom types.
+
+// Tool-call inputs and tool-result bodies are clamped so the exported
+// transcript stays reviewable; the agent can re-read any source file by path.
+// User/assistant prose is kept in full (that IS the conversation).
+const CONTEXT_BLOCK_MAX_CHARS = 2000;
+
+function clampBlock(text: unknown, limit = CONTEXT_BLOCK_MAX_CHARS): string {
+	const t = String(text ?? "");
+	return t.length > limit ? `${t.slice(0, limit)}\n…[truncated, ${t.length - limit} more chars]` : t;
+}
+
+/** Render resolved pi AgentMessages to a readable markdown transcript.
+ *  Pure: no IO. Caller writes the returned string to a temp file. */
+function renderAgentMessagesMarkdown(messages: readonly unknown[]): string {
+	const lines: string[] = [
+		"# Pi conversation context",
+		"",
+		`_Exported for full-context delegation. ${messages.length} message(s)._`,
+		"",
+	];
+	for (const raw of messages) {
+		const m = raw as { role?: string; content?: unknown };
+		const role = m.role ?? "message";
+		const content = m.content;
+		if (role === "assistant") {
+			const blocks = (Array.isArray(content) ? content : []) as ReadonlyArray<{
+				type: string;
+				text?: string;
+				name?: string;
+				input?: unknown;
+			}>;
+			const text = blocks
+				.filter((b) => b.type === "text")
+				.map((b) => b.text ?? "")
+				.join("\n");
+			if (text.trim()) lines.push("## Assistant", "", text, "");
+			for (const b of blocks) {
+				if (b.type === "toolCall" || b.type === "tool_use") {
+					const input = clampBlock(
+						typeof b.input === "string" ? b.input : JSON.stringify(b.input ?? ""),
+						500,
+					);
+					lines.push(`> tool call: ${b.name ?? "(unknown)"}(${input})`, "");
+				}
+			}
+		} else if (role === "toolResult" || role === "tool_result" || role === "tool") {
+			const text = contentText(content as any);
+			if (text.trim()) lines.push("## Tool result", "", clampBlock(text), "");
+		} else {
+			const text = contentText(content as any);
+			if (text.trim()) lines.push(`## ${role}`, "", clampBlock(text), "");
+		}
+	}
+	return lines.join("\n");
+}
+
+/** Centralized scratch dir for full-context exports, following the
+ *  ~/.pi/extensions-data/<author>/<extension>/ convention (see pi-token-cost-ledger).
+ *  Derived from getAgentDir() so rebranded distros resolve correctly. */
+function askContextDir(): string {
+	return path.join(path.dirname(getAgentDir()), "extensions-data", "estebanforge", "pi-antigravity-bridge");
+}
+
 interface AgyDetails {
 	model: string | null;
 	resolvedModel: string | null;
+	thinking: ThinkingTier | null;
 	mode: AgyMode;
 	digest: boolean;
 	conversationId: string | null;
+	includeContext: boolean;
 	exitCode: number;
 	aborted: boolean;
 	timedOut: boolean;
@@ -564,12 +774,19 @@ interface AgyDetails {
 	stderr: string;
 }
 
-function emptyDetails(model: string | null = null, resolvedModel: string | null = null): AgyDetails {
+function emptyDetails(
+	model: string | null = null,
+	resolvedModel: string | null = null,
+	thinking: ThinkingTier | null = null,
+	includeContext: boolean = false,
+): AgyDetails {
 	return {
 		model,
 		resolvedModel,
+		thinking,
 		mode: "accept-edits",
 		digest: false,
+		includeContext,
 		conversationId: null,
 		exitCode: 0,
 		aborted: false,

package/src/models.ts

@@ -1,11 +1,13 @@
 // Discover models from `agy models` and project them into pi's Model shape so
 // they appear in the /model picker as antigravity/<slug>.
 //
-// agy lists effort-qualified slugs one per line, e.g.:
-//   gemini-3.6-flash-high / -medium / -low
-//   gemini-3.1-pro-high / -low            (Pro has NO medium variant)
-//   claude-sonnet-4-6                      (fixed thinking, no effort tiers)
-//   gpt-oss-120b-medium                    (fixed, no effort tiers)
+// agy prints TWO columns per line: "<slug>  <display label>". --model takes
+// ONLY the slug (col 1); the label is display-only. Verified live, e.g.:
+//   gemini-3.6-flash-high     Gemini 3.6 Flash (High)
+//   gemini-3.6-flash-medium   Gemini 3.6 Flash (Medium)   (+ -low)
+//   gemini-3.1-pro-high       Gemini 3.1 Pro (High)        (Pro has NO medium)
+//   claude-sonnet-4-6         Claude Sonnet 4.6 (Thinking) (fixed, no tiers)
+//   gpt-oss-120b-medium       GPT-OSS 120B (Medium)        (fixed, no tiers)
 //
 // Gemini models are collapsed to a BASE slug (gemini-3.6-flash) and exposed
 // with a thinking-effort toggle whose levels match exactly the tiers agy
@@ -34,11 +36,13 @@ const EFFORT_RANK: Record<AgyEffort, number> = { low: 0, medium: 1, high: 2 };
  *  IS its suffix here, claude-opus-4-6-thinking is not a tier). */
 const TIER_RE = /^(.+)-(high|medium|low)$/;
 
-/** agy emits clean slug ids (gemini-3.6-flash-high). Reject anything else so a
- *  banner / auth / "Fetching models…" line can't register as a model, and a
- *  leading-dash token (e.g. "-high") can't reach agy's flag parser as
- *  --model. First char must be alphanumeric (no leading dash, no dot). */
-const MODEL_LINE_RE = /^[A-Za-z0-9][A-Za-z0-9._-]*$/;
+/** agy emits clean slug ids (gemini-3.6-flash-high). Validate col1 of each
+ *  line so a banner / auth / "Fetching models…" line can't register as a
+ *  model, and a leading-dash token (e.g. "-high") can't reach agy's flag
+ *  parser as --model. First char must be alphanumeric; the slug must contain
+ *  at least one hyphen (every real agy slug does: family-version-name), which
+ *  also drops a prose banner word split out of col1 ("Available"). */
+const MODEL_LINE_RE = /^[A-Za-z0-9][A-Za-z0-9._]*-[A-Za-z0-9._-]*$/;
 
 /** Model families VERIFIED to accept base-slug + --effort. Only these collapse
  *  to a base slug with a thinking toggle. Any other family stays as agy's exact
@@ -210,22 +214,23 @@ export async function loadModelCatalogRaw(
  *  medium) or none (claude-sonnet-4-6) means fixed thinking, where --effort is
  *  unsupported. Insertion order of first-seen bases is preserved. */
 export function entriesFromRaw(raw: string): AgyModelEntry[] {
-	const lines = raw
-		.split("\n")
-		.map((line) => line.trim())
-		.filter((line) => line.length > 0)
-		.filter((line) => MODEL_LINE_RE.test(line));
+	// agy prints TWO columns: "<slug>  <display label>". --model takes only the
+	// slug, so split col1 and validate THAT; the label is display-only. A
+	// bare-slug line (no whitespace) splits to itself, so this also tolerates
+	// the legacy one-column shape.
 	const groups = new Map<string, { lines: string[]; tiers: Set<AgyEffort> }>();
-	for (const line of lines) {
-		const m = TIER_RE.exec(line);
-		const base = m ? (m[1] as string) : line;
+	for (const line of raw.split("\n")) {
+		const slug = line.trim().split(/\s+/)[0] ?? "";
+		if (!slug || !MODEL_LINE_RE.test(slug)) continue;
+		const m = TIER_RE.exec(slug);
+		const base = m ? (m[1] as string) : slug;
 		const tier = m ? (m[2] as AgyEffort) : null;
 		let g = groups.get(base);
 		if (!g) {
 			g = { lines: [], tiers: new Set<AgyEffort>() };
 			groups.set(base, g);
 		}
-		g.lines.push(line);
+		g.lines.push(slug);
 		if (tier) g.tiers.add(tier);
 	}
 	const entries: AgyModelEntry[] = [];