pi-provider-antigravity 0.12.0 → 0.14.0

package/README.md

@@ -22,7 +22,7 @@ Use Google Antigravity models directly in [Pi](https://pi.dev).
 
 ## Requirements
 
-- Pi >= 0.80.0
+- Pi >= 0.86.0 (For Pi 0.80.0 ~ 0.85.x, see [Legacy Pi Support](#legacy-pi-support))
 - A Google account with Antigravity access
 
 ## Installation
@@ -37,6 +37,20 @@ Or try it without installing:
 pi -e npm:pi-provider-antigravity
 ```
 
+### Legacy Pi Support
+
+For Pi 0.80.0 ~ 0.85.x, install the compatible `0.13.0` release:
+
+```bash
+pi install npm:pi-provider-antigravity@0.13.0
+```
+
+Or try it without installing:
+
+```bash
+pi -e npm:pi-provider-antigravity@0.13.0
+```
+
 ## Quick Start
 
 1. Authenticate:

package/dist/index.js

@@ -6,7 +6,7 @@ import { createHash, randomBytes } from "node:crypto";
 
 // src/protocol.ts
 var DEFAULT_ENDPOINT = "https://daily-cloudcode-pa.googleapis.com";
-var DEFAULT_USER_AGENT = "antigravity/cli/1.2.4 (aidev_client; os_type=linux; arch=amd64; cl=982146307; auth_method=consumer)";
+var DEFAULT_USER_AGENT = "antigravity/cli/1.2.5 (aidev_client; os_type=linux; arch=amd64; cl=982839923; auth_method=consumer)";
 var PROVIDER_ID = "antigravity";
 var AntigravityHttpError = class extends Error {
   status;
@@ -254,7 +254,24 @@ function parseStoredCredentials(rawApiKey) {
   return { token: rawApiKey, projectId: FALLBACK_PROJECT_ID };
 }
 
-// src/models.ts
+// src/model-identity.ts
+function classifyModelFamily(modelId) {
+  const bare = ((modelId || "").split("/").pop() || "").toLowerCase();
+  if (bare.startsWith("gemini-")) return "gemini";
+  if (bare.startsWith("claude-")) return "claude";
+  if (bare.startsWith("gpt-")) return "gpt";
+  return "unknown";
+}
+function isCompatibleFamily(msgModel, targetModelId) {
+  if (!msgModel || !targetModelId) return true;
+  if (msgModel === targetModelId) return true;
+  const msgFamily = classifyModelFamily(msgModel);
+  if (msgFamily !== "unknown" && msgFamily === classifyModelFamily(targetModelId)) return true;
+  return false;
+}
+
+// src/model-catalog.ts
+var PRIVATE_SNAPSHOT_KEY = "pi-provider-antigravity";
 var CANONICAL_TIER_SUFFIXES = Object.freeze({
   low: "-low",
   medium: "-medium",
@@ -305,23 +322,6 @@ function tierCandidateOrder(effort) {
   const fallbacks = TIER_FALLBACKS[effort] ?? DEFAULT_TIER_ORDER;
   return [.../* @__PURE__ */ new Set([...canonical, ...fallbacks])];
 }
-function classifyModelFamily(modelId) {
-  const bare = ((modelId || "").split("/").pop() || "").toLowerCase();
-  if (bare.startsWith("gemini-")) return "gemini";
-  if (bare.startsWith("claude-")) return "claude";
-  if (bare.startsWith("gpt-")) return "gpt";
-  return "unknown";
-}
-function isCompatibleFamily(msgModel, targetModelId) {
-  if (!msgModel || !targetModelId) return true;
-  if (msgModel === targetModelId) return true;
-  const msgFamily = classifyModelFamily(msgModel);
-  if (msgFamily !== "unknown" && msgFamily === classifyModelFamily(targetModelId)) return true;
-  return extractBaseModelId(msgModel) === extractBaseModelId(targetModelId);
-}
-
-// src/model-catalog.ts
-var PRIVATE_SNAPSHOT_KEY = "pi-provider-antigravity";
 function buildThinkingMap(models) {
   return Object.fromEntries(
     models.map((m) => [
@@ -696,21 +696,7 @@ import * as fs from "node:fs";
 import * as os from "node:os";
 import * as path from "node:path";
 import { SettingsList } from "@earendil-works/pi-tui";
-var ANSI_FG_RESET = "\x1B[39m";
 var PROVIDER_CONFIG_FILE = "pi-provider-antigravity.json";
-var FOOTER_MODE_NOTES = Object.freeze({
-  smart: "Picks whichever window runs out first (5h or weekly), weighting the weekly pool by a ratio learned from your usage",
-  all: "Lists every window of the pool backing the current model (5h or weekly)"
-});
-var FOOTER_MODE_OPTIONS = Object.freeze([
-  "off",
-  "smart",
-  "all"
-]);
-function normalizeFooterMode(value) {
-  const v = typeof value === "string" ? value.trim().toLowerCase() : "";
-  return FOOTER_MODE_OPTIONS.includes(v) ? v : void 0;
-}
 function defaultConfigFile(env = process.env) {
   const dir = (env.PI_CODING_AGENT_DIR || "").trim() || path.join(os.homedir(), ".pi", "agent");
   return path.join(dir, PROVIDER_CONFIG_FILE);
@@ -761,9 +747,6 @@ function updateProviderConfig(file, mutate) {
     return false;
   }
 }
-function resolveFooterMode(config) {
-  return normalizeFooterMode(config?.settings?.quotaFooter) ?? "off";
-}
 function loadSubsystemState(subsystem, file = defaultConfigFile()) {
   const state = loadProviderConfig(file)?.states?.[subsystem];
   return state && typeof state === "object" && !Array.isArray(state) ? state : void 0;
@@ -776,28 +759,33 @@ function saveSubsystemState(subsystem, state, file = defaultConfigFile()) {
     config.states = states;
   });
 }
-function fileQuotaStatusStore(file = defaultConfigFile()) {
-  return {
-    loadMode: () => resolveFooterMode(loadProviderConfig(file)),
-    loadQuotaState: () => loadSubsystemState("quota", file),
-    saveQuotaState: (state) => saveSubsystemState("quota", state, file)
-  };
-}
-var SETTINGS_FIELDS = Object.freeze([
-  {
-    key: "quotaFooter",
-    label: "Quota footer",
-    description: "Show remaining quota in Pi's status footer",
-    options: FOOTER_MODE_OPTIONS,
-    defaultValue: "off",
-    optionNotes: FOOTER_MODE_NOTES,
-    onChange: async (ctx, quotaStatus) => {
-      if (!quotaStatus) return;
-      if (quotaStatus.mode() !== "off") await quotaStatus.refresh(ctx, { ignoreMode: true });
-      quotaStatus.paint(ctx);
+var SettingsRegistry = class {
+  fields = [];
+  register(field) {
+    const existingIndex = this.fields.findIndex((f) => f.key === field.key);
+    if (existingIndex >= 0) {
+      this.fields[existingIndex] = field;
+    } else {
+      this.fields.push(field);
     }
   }
-]);
+  unregister(key) {
+    this.fields = this.fields.filter((f) => f.key !== key);
+  }
+  getFields() {
+    return [...this.fields];
+  }
+  clear() {
+    this.fields = [];
+  }
+};
+var defaultSettingsRegistry = new SettingsRegistry();
+function registerSettingField(field) {
+  defaultSettingsRegistry.register(field);
+}
+function getRegisteredSettingFields() {
+  return defaultSettingsRegistry.getFields();
+}
 function fieldDisplayValue(config, field) {
   const raw = config?.settings?.[field.key];
   if (typeof raw === "string" && raw.trim()) return raw.trim();
@@ -810,25 +798,17 @@ function saveSettingValue(field, value, file) {
     config.settings = settings;
   });
 }
-async function applySettingValue(field, value, file, ctx, quotaStatus) {
+async function applySettingValue(field, value, file, ctx) {
   if (!saveSettingValue(field, value, file)) {
     return false;
   }
-  await field.onChange?.(ctx, quotaStatus);
+  await field.onChange?.(ctx, value);
   return true;
 }
 function writeFailedMessage(file) {
   return `Failed to write ${file}. If the file is not valid JSON, fix or delete it.`;
 }
-function previewQuotaFooterText(coord, modelId, mode, style) {
-  if (!coord) return void 0;
-  const normalized = normalizeFooterMode(mode);
-  if (!normalized || normalized === "off") return void 0;
-  const { colored } = coord.renderFooter(modelId, normalized, style);
-  if (!colored) return void 0;
-  return ANSI_FG_RESET + colored;
-}
-function buildSettingsItems(config, fields = SETTINGS_FIELDS) {
+function buildSettingsItems(config, fields = getRegisteredSettingFields()) {
   return fields.map((f) => ({
     id: f.key,
     label: f.label,
@@ -851,29 +831,37 @@ async function settingsListTheme(theme) {
     };
   }
 }
-async function openSettings(ctx, quotaStatus) {
+function resolveFields(registryOrFields) {
+  if (!registryOrFields) return getRegisteredSettingFields();
+  if ("getFields" in registryOrFields && typeof registryOrFields.getFields === "function") {
+    return registryOrFields.getFields();
+  }
+  return registryOrFields;
+}
+async function openSettings(ctx, registryOrFields) {
+  const fields = resolveFields(registryOrFields);
   const file = defaultConfigFile();
   if (ctx.mode === "tui" && ctx.hasUI) {
-    await openSettingsDialog(ctx, quotaStatus, file);
+    await openSettingsDialog(ctx, fields, file);
     return;
   }
   const config = loadProviderConfig(file);
   if (!ctx.hasUI) {
-    const text = SETTINGS_FIELDS.map((f) => `${f.label}: ${fieldDisplayValue(config, f)}`).join("\n") + `
+    const text = fields.map((f) => `${f.label}: ${fieldDisplayValue(config, f)}`).join("\n") + `
 Edit ${file} to change.`;
     if (ctx.hasUI) ctx.ui.notify(text, "info");
     else console.log(text);
     return;
   }
-  let field = SETTINGS_FIELDS[0];
+  let field = fields[0];
   if (!field) return;
-  if (SETTINGS_FIELDS.length > 1) {
-    const labels = SETTINGS_FIELDS.map(
+  if (fields.length > 1) {
+    const labels = fields.map(
       (f) => `${f.label} (current: ${fieldDisplayValue(config, f)})`
     );
     const choice = await ctx.ui.select("Antigravity settings", labels);
     if (!choice) return;
-    const found = SETTINGS_FIELDS[labels.indexOf(choice)];
+    const found = fields[labels.indexOf(choice)];
     if (!found) return;
     field = found;
   }
@@ -882,39 +870,43 @@ Edit ${file} to change.`;
     [...field.options]
   );
   if (!picked || !field.options.includes(picked)) return;
-  if (await applySettingValue(field, picked, file, ctx, quotaStatus)) {
+  if (await applySettingValue(field, picked, file, ctx)) {
     ctx.ui.notify(`${field.label} set to ${picked}.`, "info");
   } else {
     ctx.ui.notify(writeFailedMessage(file), "error");
   }
 }
-async function openSettingsDialog(ctx, quotaStatus, file) {
-  if (quotaStatus) await quotaStatus.ensurePreview(ctx);
+async function openSettingsDialog(ctx, fields, file) {
+  for (const field of fields) {
+    if (field.prepare) await field.prepare(ctx);
+  }
   await ctx.ui.custom(async (tui, theme, _kb, done) => {
     const config = loadProviderConfig(file);
-    const items = buildSettingsItems(config);
-    const quotaField = SETTINGS_FIELDS.find((f) => f.key === "quotaFooter");
-    const paintPreview = (mode) => {
-      const item = items.find((i) => i.id === "quotaFooter");
+    const items = buildSettingsItems(config, fields);
+    const paintPreview = (field, value) => {
+      const item = items.find((i) => i.id === field.key);
       if (!item) return;
-      const base = quotaField?.description ?? "";
-      const sample = mode === "off" ? "hidden" : previewQuotaFooterText(quotaStatus, ctx.model?.id, mode, theme);
+      const base = field.description ?? "";
+      const sample = field.renderPreview?.(value, ctx, theme);
       const head = sample && base ? `${base}: ${sample}` : sample ?? base;
-      const note = quotaField?.optionNotes?.[mode];
+      const note = field.optionNotes?.[value];
       item.description = note ? `${head}
 ${note}` : head;
     };
-    paintPreview(resolveFooterMode(config));
+    for (const field of fields) {
+      const current = fieldDisplayValue(config, field);
+      paintPreview(field, current);
+    }
     const list = new SettingsList(
       items,
       Math.min(items.length, 10),
       await settingsListTheme(theme),
       (id, newValue) => {
-        const field = SETTINGS_FIELDS.find((f) => f.key === id);
+        const field = fields.find((f) => f.key === id);
         if (!field) return;
         list.invalidate();
         tui.requestRender();
-        void applySettingValue(field, newValue, file, ctx, quotaStatus).then((saved) => {
+        void applySettingValue(field, newValue, file, ctx).then((saved) => {
           if (!saved) {
             list.updateValue(field.key, fieldDisplayValue(loadProviderConfig(file), field));
             ctx.ui.notify(writeFailedMessage(file), "error");
@@ -922,7 +914,7 @@ ${note}` : head;
             tui.requestRender();
             return;
           }
-          paintPreview(newValue);
+          paintPreview(field, newValue);
           list.invalidate();
           tui.requestRender();
         });
@@ -945,6 +937,22 @@ ${note}` : head;
 }
 
 // src/quota-status.ts
+var FOOTER_MODE_NOTES = Object.freeze({
+  smart: "Picks whichever window runs out first (5h or weekly), weighting the weekly pool by a ratio learned from your usage",
+  all: "Lists every window of the pool backing the current model (5h or weekly)"
+});
+var FOOTER_MODE_OPTIONS = Object.freeze([
+  "off",
+  "smart",
+  "all"
+]);
+function normalizeFooterMode(value) {
+  const v = typeof value === "string" ? value.trim().toLowerCase() : "";
+  return FOOTER_MODE_OPTIONS.includes(v) ? v : void 0;
+}
+function resolveFooterMode(config) {
+  return normalizeFooterMode(config?.settings?.quotaFooter) ?? "off";
+}
 function renderProgressBar(fraction, width = 10) {
   const clamped = Math.max(0, Math.min(1, fraction));
   const filled = Math.round(clamped * width);
@@ -1113,7 +1121,7 @@ function formatQuotaWindowPart(bucket) {
 var ANSI_RED = "\x1B[31m";
 var ANSI_YELLOW = "\x1B[33m";
 var ANSI_DIM = "\x1B[90m";
-var ANSI_FG_RESET2 = "\x1B[39m";
+var ANSI_FG_RESET = "\x1B[39m";
 var QUOTA_WARN_PCT = 30;
 var QUOTA_ALERT_PCT = 10;
 function resolveColorizer(style) {
@@ -1121,7 +1129,7 @@ function resolveColorizer(style) {
   if (style && typeof style.fg === "function") return (tone, text) => style.fg(tone, text);
   return (tone, text) => {
     const code = tone === "error" ? ANSI_RED : tone === "warning" ? ANSI_YELLOW : ANSI_DIM;
-    return `${code}${text}${ANSI_FG_RESET2}`;
+    return `${code}${text}${ANSI_FG_RESET}`;
   };
 }
 function colorizeQuotaFooter(footer, style) {
@@ -1140,9 +1148,51 @@ function colorizeQuotaFooterBoth(footer, style) {
   const sep = color("dim", " \xB7 ");
   return footer.split(" \xB7 ").map((part) => colorizeQuotaFooter(part, style) ?? part).join(sep);
 }
+function previewQuotaFooterText(coord, modelId, mode, style) {
+  if (!coord) return void 0;
+  const normalized = normalizeFooterMode(mode);
+  if (!normalized || normalized === "off") return void 0;
+  const { colored } = coord.renderFooter(modelId, normalized, style);
+  if (!colored) return void 0;
+  return ANSI_FG_RESET + colored;
+}
 var QUOTA_STATUS_KEY = "pi-provider-antigravity-footer-usage";
 var QUOTA_REFRESH_INTERVAL_MS = 5 * 60 * 1e3;
 var MAX_OBSERVATION_AGE_MS = 60 * 60 * 1e3;
+function fileQuotaStatusStore(file = defaultConfigFile()) {
+  return {
+    loadMode: () => resolveFooterMode(loadProviderConfig(file)),
+    loadQuotaState: () => loadSubsystemState("quota", file),
+    saveQuotaState: (state) => saveSubsystemState("quota", state, file)
+  };
+}
+function createQuotaFooterField(quotaStatus) {
+  return {
+    key: "quotaFooter",
+    label: "Quota footer",
+    description: "Show remaining quota in Pi's status footer",
+    options: FOOTER_MODE_OPTIONS,
+    defaultValue: "off",
+    optionNotes: FOOTER_MODE_NOTES,
+    renderPreview: (mode, ctx, theme) => {
+      if (mode === "off") return "hidden";
+      const activeTheme = theme || ctx.ui?.theme;
+      return previewQuotaFooterText(quotaStatus, ctx.model?.id, mode, activeTheme);
+    },
+    prepare: async (ctx) => {
+      await quotaStatus.ensurePreview(ctx);
+    },
+    onChange: async (ctx, _value) => {
+      if (quotaStatus.mode() !== "off") {
+        await quotaStatus.refresh(ctx, { ignoreMode: true });
+      }
+      quotaStatus.paint(ctx);
+    }
+  };
+}
+function registerQuotaSettings(quotaStatus) {
+  registerSettingField(createQuotaFooterField(quotaStatus));
+}
 function isFiniteNumber(value) {
   return typeof value === "number" && Number.isFinite(value);
 }
@@ -1339,6 +1389,13 @@ import {
 
 // src/builder.ts
 import { createHash as createHash2, randomUUID } from "node:crypto";
+import {
+  collapseSystemMessages,
+  getCurrentSystemPrompt,
+  getCurrentTools,
+  normalizeContext,
+  withoutInitialSystemMessage
+} from "@earendil-works/pi-ai";
 var BASE64_SIGNATURE_PATTERN = /^[A-Za-z0-9+/_-]+={0,2}$/;
 var SKIP_THOUGHT_SIGNATURE_VALIDATOR = "skip_thought_signature_validator";
 function isValidThoughtSignature(sig) {
@@ -1350,11 +1407,11 @@ function resolveThoughtSignature(isSameProviderAndModel, sig) {
   if (!isSameProviderAndModel) return void 0;
   return isValidThoughtSignature(sig) ? sig : void 0;
 }
-function deriveSessionId(context, explicitSessionId) {
+function deriveSessionId(conversation, explicitSessionId) {
   if (explicitSessionId && typeof explicitSessionId === "string" && explicitSessionId.trim().length > 0) {
     return explicitSessionId.trim();
   }
-  const firstMsg = context.messages?.[0];
+  const firstMsg = conversation?.[0];
   if (!firstMsg) {
     return randomUUID();
   }
@@ -1447,9 +1504,9 @@ function convertTools(tools) {
     }
   ];
 }
-function translateTurnTrace(context, runtimeModelId) {
+function translateTurnTrace(conversation, runtimeModelId) {
   const contents = [];
-  const messages = context.messages || [];
+  const messages = conversation || [];
   const isGeminiRequest = classifyModelFamily(runtimeModelId) === "gemini";
   const isGptRequest = classifyModelFamily(runtimeModelId) === "gpt";
   for (const msg of messages) {
@@ -1640,9 +1697,13 @@ function buildAntigravityRequestBody(params) {
     maxOutputTokens = 65536
   } = params;
   const runtimeModelId = plan.runtimeModelId;
-  const sessionId = deriveSessionId(context, params.sessionId);
+  const transcript = collapseSystemMessages(context);
+  const systemPrompt = getCurrentSystemPrompt(transcript.messages);
+  const tools = convertTools(getCurrentTools(transcript.messages));
+  const conversation = withoutInitialSystemMessage(transcript.messages);
+  const sessionId = deriveSessionId(conversation, params.sessionId);
   const trajectoryId = params.trajectoryId && typeof params.trajectoryId === "string" && params.trajectoryId.trim().length > 0 ? params.trajectoryId.trim() : resolveSessionTrajectory(sessionId);
-  const contents = translateTurnTrace(context, runtimeModelId);
+  const contents = translateTurnTrace(conversation, runtimeModelId);
   const requestIndex = contents.filter(
     (c) => c.role === "model" && !c.parts?.some((p) => p.functionResponse)
   ).length;
@@ -1664,13 +1725,12 @@ function buildAntigravityRequestBody(params) {
   const request = {
     contents
   };
-  if (context.systemPrompt) {
+  if (systemPrompt) {
     request.systemInstruction = {
       role: "user",
-      parts: [{ text: context.systemPrompt }]
+      parts: [{ text: systemPrompt }]
     };
   }
-  const tools = convertTools(context.tools);
   if (tools) {
     request.tools = tools;
   }
@@ -1742,6 +1802,9 @@ function processLine(rawLine, state, onEvent) {
     return;
   }
   const response = payload.response || payload;
+  if (response.responseId && !state.responseId) {
+    state.responseId = response.responseId;
+  }
   if (response.usageMetadata) {
     const um = response.usageMetadata;
     const promptTokens = typeof um.promptTokenCount === "number" ? um.promptTokenCount : 0;
@@ -1862,6 +1925,9 @@ async function consumeAntigravityStream(streamBody, output, stream, modelCost) {
         total: inputCost + outputCost + cacheCost
       };
     }
+    if (state.responseId) {
+      output.responseId ||= state.responseId;
+    }
     output.stopReason = state.stopReason;
   };
   const dispatchEvent = (ev) => {
@@ -1910,7 +1976,7 @@ function streamAntigravity(model, context, options, catalog) {
         context,
         sessionId: options?.sessionId,
         trajectoryId,
-        maxOutputTokens: model.maxTokens,
+        maxOutputTokens: options?.maxTokens ?? model.maxTokens,
         toolChoice: options?.toolChoice
       });
       const streamBody = await postAntigravityStream({
@@ -2063,7 +2129,10 @@ var SUBCOMMANDS = Object.freeze([
     name: "settings",
     description: "Configure provider settings",
     aliases: Object.freeze(["setting"]),
-    run: async ({ ctx, quotaStatus }) => openSettings(ctx, quotaStatus)
+    run: async ({ ctx, quotaStatus }) => {
+      if (quotaStatus) registerQuotaSettings(quotaStatus);
+      await openSettings(ctx);
+    }
   },
   {
     name: "websearch",
@@ -2214,6 +2283,7 @@ async function runAntigravitySubcommand(args, ctx, quotaStatus, catalog) {
 var PROVIDER_NAME = "Antigravity";
 function index_default(pi) {
   const quotaStatus = new QuotaStatusCoordinator();
+  registerQuotaSettings(quotaStatus);
   const catalog = createModelCatalog();
   pi.registerProvider(PROVIDER_ID, {
     name: PROVIDER_NAME,