@estebanforge/pi-antigravity-bridge 1.1.2 → 1.2.3

package/CHANGELOG.md

@@ -2,6 +2,23 @@
 
 All notable changes to this project will be documented in this file.
 
+## [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.3",
   "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

@@ -84,6 +84,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 +119,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 +147,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 +220,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
@@ -304,7 +332,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 +343,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),
 				};
 			}
 
@@ -340,7 +370,8 @@ export async function registerAskAntigravityTool(
 			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
@@ -352,7 +383,7 @@ export async function registerAskAntigravityTool(
 
 			const details: AgyDetails = {
 				model: requestedModel,
-				resolvedModel: resolved,
+				resolvedModel: resolved.model,
 				mode,
 				digest: useDigest,
 				conversationId: isContinuation ? (rawConvId as string) : null,

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[] = [];