@oh-my-pi/pi-catalog 17.3.0 → 17.3.2

package/src/variant-collapse.ts

@@ -265,22 +265,32 @@ function geminiFlashFamily(mode: "budget" | "google-level"): EffortVariantFamily
 	};
 }
 
-const GEMINI_36_FLASH_FAMILY: EffortVariantFamily = {
-	id: "gemini-3.6-flash",
-	name: "Gemini 3.6 Flash",
-	members: ["gemini-3.6-flash-low", "gemini-3.6-flash-medium", "gemini-3.6-flash-high", "gemini-3.6-flash-tiered"],
-	routing: {
-		[Effort.Minimal]: "gemini-3.6-flash-low",
-		[Effort.Low]: "gemini-3.6-flash-low",
-		[Effort.Medium]: "gemini-3.6-flash-medium",
-		[Effort.High]: "gemini-3.6-flash-high",
-	},
-	thinking: {
-		mode: "google-level",
-		efforts: GEMINI_3_FLASH_FAMILY_EFFORTS,
-		requiresEffort: true,
-	},
-};
+/**
+ * Gemini 3.6+ Flash exposes one mandatory-reasoning wire id per thinking
+ * level. Some generations retain additional discovery-only aliases.
+ */
+function geminiLevelFlashFamily(version: "3.6" | "3.7", ...additionalMembers: string[]): EffortVariantFamily {
+	const id = `gemini-${version}-flash`;
+	return {
+		id,
+		name: `Gemini ${version} Flash`,
+		members: [`${id}-low`, `${id}-medium`, `${id}-high`, ...additionalMembers],
+		routing: {
+			[Effort.Minimal]: `${id}-low`,
+			[Effort.Low]: `${id}-low`,
+			[Effort.Medium]: `${id}-medium`,
+			[Effort.High]: `${id}-high`,
+		},
+		thinking: {
+			mode: "google-level",
+			efforts: GEMINI_3_FLASH_FAMILY_EFFORTS,
+			requiresEffort: true,
+		},
+	};
+}
+
+const GEMINI_36_FLASH_FAMILY = geminiLevelFlashFamily("3.6", "gemini-3.6-flash-tiered");
+const GEMINI_37_FLASH_FAMILY = geminiLevelFlashFamily("3.7");
 
 function geminiProFamily(mode: "budget" | "google-level"): EffortVariantFamily {
 	const budget = mode === "budget";
@@ -364,13 +374,20 @@ const SHARED_CCA_FAMILIES: readonly EffortVariantFamily[] = [
 
 /** `google-antigravity` Gemini families, using each generation's native transport. */
 export const ANTIGRAVITY_VARIANT_COLLAPSE_TABLE: VariantCollapseTable = {
-	families: [GEMINI_36_FLASH_FAMILY, geminiFlashFamily("budget"), geminiProFamily("budget"), ...SHARED_CCA_FAMILIES],
+	families: [
+		GEMINI_36_FLASH_FAMILY,
+		GEMINI_37_FLASH_FAMILY,
+		geminiFlashFamily("budget"),
+		geminiProFamily("budget"),
+		...SHARED_CCA_FAMILIES,
+	],
 };
 
 /** `google-gemini-cli` Gemini families on the official CLI's level transport. */
 export const GEMINI_CLI_VARIANT_COLLAPSE_TABLE: VariantCollapseTable = {
 	families: [
 		GEMINI_36_FLASH_FAMILY,
+		GEMINI_37_FLASH_FAMILY,
 		geminiFlashFamily("google-level"),
 		geminiProFamily("google-level"),
 		...SHARED_CCA_FAMILIES,

package/src/wire/gemini-headers.ts

@@ -1,3 +1,5 @@
+import type { FetchImpl } from "@oh-my-pi/pi-utils";
+
 /**
  * Build a User-Agent string that identifies as Gemini CLI to unlock higher rate limits.
  * Uses the same format as the official Gemini CLI (v0.35+):
@@ -15,30 +17,89 @@ export const getGeminiCliHeaders = (modelId?: string) => ({
 	"Client-Metadata": "ideType=IDE_UNSPECIFIED,platform=PLATFORM_UNSPECIFIED,pluginType=GEMINI",
 });
 
-export const ANTIGRAVITY_SYSTEM_INSTRUCTION =
-	"You are Antigravity, a powerful agentic AI coding assistant designed by the Google Deepmind team working on Advanced Agentic Coding." +
-	"You are pair programming with a USER to solve their coding task. The task may require creating a new codebase, modifying or debugging an existing codebase, or simply answering a question." +
-	"**Absolute paths only**" +
-	"**Proactiveness**";
 /**
  * Antigravity / Cloud Code Assist user agent. Lives in its own file so discovery
  * and usage code can read it without pulling the heavy google-gemini-cli provider
  * (and its @google/genai → google-auth-library dependency chain) into the startup
  * parse graph.
+ *
+ * Format captured from the real 2.8.0 `antigravity/hub` client:
+ * `antigravity/hub/2.8.0 (aidev_client; os_type=darwin; arch=arm64; cl=963137146)`.
+ * The backend gates newer models (e.g. gemini-3.7-flash) on the client version,
+ * so the version tracks the latest Antigravity release via the update manifest
+ * (see {@link ensureAntigravityVersion}) with `DEFAULT_ANTIGRAVITY_VERSION` as
+ * the offline fallback. os_type/arch are pinned to the darwin/arm64 reference
+ * client the version and manifest are captured from, independent of the host
+ * platform. Overrides: PI_AI_ANTIGRAVITY_VERSION / _CL / _OS / _ARCH.
  */
-export let getAntigravityUserAgent = () => {
-	const DEFAULT_ANTIGRAVITY_VERSION = "2.1.4";
-	const version = process.env.PI_AI_ANTIGRAVITY_VERSION || DEFAULT_ANTIGRAVITY_VERSION;
-	// Map Node.js platform/arch to Antigravity's expected format.
-	// Verified against Antigravity source: _qn() and wqn() in main.js.
-	// process.platform: win32→windows, others pass through (darwin, linux)
-	// process.arch:     x64→amd64, ia32→386, others pass through (arm64)
-	const os = process.platform === "win32" ? "windows" : process.platform;
-	const arch = process.arch === "x64" ? "amd64" : process.arch === "ia32" ? "386" : process.arch;
-	const userAgent = `antigravity/hub/${version} ${os}/${arch}`;
-	getAntigravityUserAgent = () => userAgent;
-	return userAgent;
-};
+export const DEFAULT_ANTIGRAVITY_VERSION = "2.8.0";
+
+const ANTIGRAVITY_VERSION_MANIFEST_URL =
+	"https://antigravity-hub-auto-updater-974169037036.us-central1.run.app/manifest/latest-arm64-mac.yml";
+const ANTIGRAVITY_VERSION_FETCH_TIMEOUT_MS = 5_000;
+
+let discoveredAntigravityVersion: string | null = null;
+let antigravityVersionFetch: Promise<void> | null = null;
+
+/** Current Antigravity client version: env override → manifest-discovered → pinned fallback. */
+export function getAntigravityVersion(): string {
+	return process.env.PI_AI_ANTIGRAVITY_VERSION || discoveredAntigravityVersion || DEFAULT_ANTIGRAVITY_VERSION;
+}
+
+/**
+ * Extracts the client version from an electron-builder update manifest.
+ * Returns null when no well-formed `version:` line is present.
+ */
+export function parseAntigravityManifestVersion(yamlText: string): string | null {
+	for (const line of yamlText.split(/\r?\n/)) {
+		const match = /^\s*version\s*:\s*(?:"([^"]*)"|'([^']*)'|([^\s#]+))\s*(?:#.*)?$/.exec(line);
+		if (!match) continue;
+		const version = (match[1] ?? match[2] ?? match[3] ?? "").trim();
+		return /^\d+\.\d+\.\d+$/.test(version) ? version : null;
+	}
+	return null;
+}
+
+/**
+ * Resolves the latest Antigravity release from the official update manifest.
+ * Success is cached for the process lifetime; failures are silent (the pinned
+ * fallback stays valid) and clear the in-flight cache so a later call retries.
+ * Skipped entirely when PI_AI_ANTIGRAVITY_VERSION is set.
+ */
+export function ensureAntigravityVersion(fetcher: FetchImpl = fetch, signal?: AbortSignal): Promise<void> {
+	if (process.env.PI_AI_ANTIGRAVITY_VERSION || discoveredAntigravityVersion) return Promise.resolve();
+	if (antigravityVersionFetch) return antigravityVersionFetch;
+
+	antigravityVersionFetch = (async () => {
+		try {
+			const timeoutSignal = AbortSignal.timeout(ANTIGRAVITY_VERSION_FETCH_TIMEOUT_MS);
+			const response = await fetcher(ANTIGRAVITY_VERSION_MANIFEST_URL, {
+				headers: { "Cache-Control": "no-cache", "User-Agent": "electron-builder" },
+				signal: signal ? AbortSignal.any([signal, timeoutSignal]) : timeoutSignal,
+			});
+			if (response.ok) {
+				discoveredAntigravityVersion = parseAntigravityManifestVersion(await response.text());
+			}
+		} catch {
+			// Silent: the pinned fallback remains valid when version discovery fails.
+		} finally {
+			if (!discoveredAntigravityVersion) antigravityVersionFetch = null;
+		}
+	})();
+	return antigravityVersionFetch;
+}
+
+/** Antigravity `User-Agent` header value; rebuilt when the discovered version changes. */
+export function getAntigravityUserAgent(): string {
+	const version = getAntigravityVersion();
+	// The backend does not validate `cl` (verified live: stale, zero, and absent
+	// cl all pass model gating on daily-cloudcode-pa; only the version gates).
+	// The update manifest carries no changelist, so the captured value stays.
+	const cl = process.env.PI_AI_ANTIGRAVITY_CL || "963137146";
+	const os = process.env.PI_AI_ANTIGRAVITY_OS || "darwin";
+	const arch = process.env.PI_AI_ANTIGRAVITY_ARCH || "arm64";
+	return `antigravity/hub/${version} (aidev_client; os_type=${os}; arch=${arch}; cl=${cl})`;
+}
 
 /**
  * Per-wire-id Antigravity Cloud Code Assist request constants, captured from the