pi-provider-antigravity 0.4.0 → 0.6.0

package/README.md

@@ -95,7 +95,7 @@ Remaining percentages are automatically colorized to keep depletion visible with
 - **Low** (≤ 30%): Yellow
 - **Critical** (≤ 10%): Red
 
-In `both` mode, each window carries its own color based on its remaining percentage.
+In `all` mode, each window carries its own color based on its remaining percentage.
 
 ### Display Modes
 
@@ -104,13 +104,27 @@ Switch between display modes at any time using `/antigravity settings`:
 | Mode | Example | Behavior |
 |---|---|---|
 | `off` *(default)* | *(hidden)* | Slot stays empty; zero background quota requests |
-| `single` | `Wk 6% (2d 14h)` | Shows only the primary bottleneck window |
-| `both` | `5h 90% (3h 54m) · Wk 6% (2d 14h)` | Shows both 5-hour and weekly windows side-by-side |
+| `smart` | `Wk 6% (2d 14h)` | Shows the window that runs out first, 5h or weekly |
+| `all` | `5h 90% (3h 54m) · Wk 6% (2d 14h)` | Shows every window of the pool backing the current model |
+
+### Footer placement
+
+The extension never calls `setFooter` — it only publishes the slot text under the key `pi-provider-antigravity-footer-usage` via `setStatus`. Where that text renders is up to your footer; Pi's built-in one gives it its own line, below the default two.
+
+To move it elsewhere (the right side of the first line, for example), ask Pi in a session and name the key:
+
+> Move the `pi-provider-antigravity-footer-usage` slot to the right side of the first footer line, keeping the rest of the footer as it is.
+
+Pi edits your own footer extension, creating one if you have none — based on
+Pi's [complete custom-footer
+example](https://github.com/earendil-works/pi-mono/blob/main/packages/coding-agent/examples/extensions/custom-footer.ts),
+which Pi maintains. A custom footer replaces the built-in one, so Pi has to
+redraw whichever lines you want to keep.
 
 ### Under the Hood
 
 - **Model-aware pool routing**: Automatically aligns with your active model. Selecting a Gemini model displays the Gemini quota pool; switching to Claude or GPT switches to the third-party pool. When using a non-Antigravity model or no model at all, the slot cleanly disappears.
-- **Intelligent bottleneck detection**: In `single` mode, the extension determines urgency using `min(r5h, rWk × R)` rather than a naive percentage comparison, accounting for total volume differences between the 5-hour and weekly pools. The volume multiplier `R` starts at 6.0 and automatically self-calibrates between 1.0 and 20.0 based on real usage deltas, persisting across restarts.
+- **Bottleneck detection**: In `smart` mode, the extension determines urgency using `min(r5h, rWk × R)` rather than a naive percentage comparison, accounting for total volume differences between the 5-hour and weekly pools. The volume multiplier `R` starts at 6.0 and automatically self-calibrates between 1.0 and 20.0 based on real usage deltas, persisting across restarts.
 - **Battery- and network-friendly caching**: Idle sessions perform zero network requests. The slot repaints instantly from memory on turn completion, session launch, and model changes. Upstream quota queries are throttled to at most once every 5 minutes. Running `/antigravity usage` refreshes upstream data immediately.
 
 ## Configuration
@@ -136,7 +150,7 @@ Configuration is stored in `pi-provider-antigravity.json` alongside Pi's `settin
 ```json
 {
   "settings": {
-    "quotaFooter": "single"
+    "quotaFooter": "smart"
   }
 }
 ```
@@ -147,7 +161,7 @@ Configuration is stored in `pi-provider-antigravity.json` alongside Pi's `settin
 
 | Key | Values | Default | Description |
 |---|---|---|---|
-| `quotaFooter` | `off`, `single`, `both` | `off` | Display remaining quota in Pi's status footer. See [Quota footer](#quota-footer). |
+| `quotaFooter` | `off`, `smart`, `all` | `off` | Display remaining quota in Pi's status footer. See [Quota footer](#quota-footer). |
 
 ## Disclaimer
 

package/dist/index.js

@@ -3,7 +3,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.1.27 (aidev_client; os_type=linux; arch=amd64; cl=976543523; auth_method=consumer)";
+var DEFAULT_USER_AGENT = "antigravity/cli/1.1.28 (aidev_client; os_type=linux; arch=amd64; cl=978129418; auth_method=consumer)";
 var PROVIDER_ID = "antigravity";
 async function postAntigravity({
   token,
@@ -275,6 +275,19 @@ function updateCatalogStore(enums, runtimeIds, thinking = {}, deprecated = {}) {
     version: activeStore.version + 1
   };
 }
+var lastCatalog;
+function ingestCatalog(catalog) {
+  updateCatalogStore(
+    catalog.modelEnums,
+    catalog.models.map((m) => m.id),
+    buildThinkingMap(catalog.models),
+    catalog.deprecated || {}
+  );
+  lastCatalog = catalog;
+}
+function getStoredCatalog() {
+  return lastCatalog;
+}
 function resolveRuntimeModelId(modelId, effort, availableRuntimeIds = activeStore.runtimeIds) {
   if (modelId.endsWith("-high") || modelId.endsWith("-medium") || modelId.endsWith("-low") || modelId.endsWith("-thinking") || modelId.endsWith("-agent") || modelId.endsWith("-extra-low") || modelId.endsWith("-tiered")) {
     return modelId;
@@ -490,20 +503,19 @@ async function refreshCatalog(context) {
     }
     const { token, projectId } = parseStoredCredentials(apiKey);
     const catalog = await fetchAvailableModelsCatalog(token, projectId, context.signal);
-    const thinking = buildThinkingMap(catalog.models);
-    const deprecated = catalog.deprecated || {};
-    updateCatalogStore(catalog.modelEnums, catalog.models.map((m) => m.id), thinking, deprecated);
+    ingestCatalog(catalog);
     const dynamicModels = buildDynamicPublicModels(catalog);
     if (context.publish) {
+      const snap = getCatalogSnapshot();
       await context.publish({
         persist: {
           models: dynamicModels,
           checkedAt: Date.now(),
           "pi-provider-antigravity": {
-            modelEnums: catalog.modelEnums,
-            runtimeIds: catalog.models.map((m) => m.id),
-            thinking,
-            deprecated
+            modelEnums: { ...snap.enums },
+            runtimeIds: [...snap.runtimeIds],
+            thinking: { ...snap.thinking ?? {} },
+            deprecated: { ...snap.deprecated ?? {} }
           }
         }
       });
@@ -513,6 +525,14 @@ async function refreshCatalog(context) {
     return context.stored?.models || [];
   }
 }
+async function refreshCatalogGeneration(doRefresh) {
+  const before = getCatalogSnapshot().version;
+  await doRefresh();
+  const catalog = getStoredCatalog();
+  if (!catalog) return { status: "failed" };
+  if (getCatalogSnapshot().version === before) return { status: "stale", catalog };
+  return { status: "fresh", catalog };
+}
 function parseAvailableModels(data) {
   const models = [];
   const modelEnums = {};
@@ -758,7 +778,7 @@ function colorizeQuotaFooterBoth(footer) {
   if (!footer) return void 0;
   return footer.split(" \xB7 ").map((part) => colorizeQuotaFooter(part) ?? part).join(" \xB7 ");
 }
-var QUOTA_STATUS_KEY = "antigravity_quota";
+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 isFiniteNumber(value) {
@@ -787,7 +807,7 @@ function paintQuotaStatus(coord, ctx) {
   const plain = coord.footerFor(ctx.model?.id, mode);
   ctx.ui.setStatus(
     QUOTA_STATUS_KEY,
-    mode === "both" ? colorizeQuotaFooterBoth(plain) : colorizeQuotaFooter(plain)
+    mode === "all" ? colorizeQuotaFooterBoth(plain) : colorizeQuotaFooter(plain)
   );
 }
 var QuotaStatusCoordinator = class {
@@ -809,9 +829,9 @@ var QuotaStatusCoordinator = class {
   mode() {
     return this.store.loadMode();
   }
-  footerFor(modelId, mode = "single") {
+  footerFor(modelId, mode = "smart") {
     if (!this.summary || mode === "off") return void 0;
-    return mode === "both" ? buildQuotaFooterBoth(this.summary, modelId) : buildQuotaFooter(this.summary, modelId, this.weeklyTo5hRatio);
+    return mode === "all" ? buildQuotaFooterBoth(this.summary, modelId) : buildQuotaFooter(this.summary, modelId, this.weeklyTo5hRatio);
   }
   get isFresh() {
     return !!this.summary && Date.now() - this.fetchedAt < QUOTA_REFRESH_INTERVAL_MS;
@@ -832,12 +852,13 @@ var QuotaStatusCoordinator = class {
     await this.refresh(ctx);
     paintQuotaStatus(this, ctx);
   }
-  // One fetch for preview purposes even when the footer slot is off: opening
-  // quota settings is an explicit look at quota.
+  // One fetch for preview purposes even when the footer slot is off or the
+  // current model belongs to another provider: opening quota settings is an
+  // explicit look at quota (like /antigravity usage), and the preview is the
+  // only place that quota is visible while a foreign model is selected.
   ensurePreview(ctx) {
     if (this.summary) return Promise.resolve(this.summary);
     if (this.inflight) return this.inflight;
-    if (!isAntigravityModel(ctx.model)) return Promise.resolve(void 0);
     return this.fetchOnce(ctx);
   }
   fetchOnce(ctx, signal) {
@@ -928,7 +949,7 @@ function saveProviderConfig(file, data) {
 }
 function normalizeFooterMode(value) {
   const v = typeof value === "string" ? value.trim().toLowerCase() : "";
-  return v === "off" || v === "single" || v === "both" ? v : void 0;
+  return v === "off" || v === "smart" || v === "all" ? v : void 0;
 }
 function resolveFooterMode(config) {
   return normalizeFooterMode(config?.settings?.quotaFooter) ?? "off";
@@ -968,13 +989,16 @@ var SETTINGS_FIELDS = Object.freeze([
     key: "quotaFooter",
     label: "Quota footer",
     description: "Show remaining quota in the footer",
-    options: ["off", "single", "both"],
+    options: ["off", "smart", "all"],
     defaultValue: "off",
+    optionNotes: {
+      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)"
+    },
     onChange: async (ctx, quotaStatus) => {
-      if (quotaStatus) {
-        await quotaStatus.refresh(ctx);
-        paintQuotaStatus(quotaStatus, ctx);
-      }
+      if (!quotaStatus) return;
+      if (quotaStatus.mode() !== "off") await quotaStatus.refresh(ctx, { ignoreMode: true });
+      paintQuotaStatus(quotaStatus, ctx);
     }
   }
 ]);
@@ -997,9 +1021,10 @@ async function applySettingValue(field, value, file, ctx, quotaStatus) {
 }
 function previewQuotaFooterText(coord, modelId, mode) {
   if (!coord || mode === "off") return void 0;
-  const plain = coord.footerFor(modelId, mode === "both" ? "both" : "single");
+  const plain = coord.footerFor(modelId, mode === "all" ? "all" : "smart");
   if (!plain) return void 0;
-  return mode === "both" ? colorizeQuotaFooterBoth(plain) : colorizeQuotaFooter(plain);
+  const colored = mode === "all" ? colorizeQuotaFooterBoth(plain) : colorizeQuotaFooter(plain);
+  return ANSI_FG_RESET + colored;
 }
 function buildSettingsItems(config, fields = SETTINGS_FIELDS) {
   return fields.map((f) => ({
@@ -1081,7 +1106,10 @@ async function openSettingsDialog(ctx, quotaStatus, file) {
       if (!item) return;
       const base = quotaField?.description ?? "";
       const sample = mode === "off" ? "hidden" : previewQuotaFooterText(quotaStatus, ctx.model?.id, mode);
-      item.description = sample && base ? `${base}: ${sample}` : sample ?? base;
+      const head = sample && base ? `${base}: ${sample}` : sample ?? base;
+      const note = quotaField?.optionNotes?.[mode];
+      item.description = note ? `${head}
+${note}` : head;
     };
     paintPreview(resolveFooterMode(config));
     const list = new SettingsList(
@@ -1153,12 +1181,12 @@ function createSseFeed() {
   };
   const closeOpenBlock = (events) => {
     if (openType === null) return;
-    const index = content.length - 1;
-    const block = content[index];
+    const contentIndex = content.length - 1;
+    const block = content[contentIndex];
     if (block?.type === "thinking") {
-      events.push({ kind: "thinking_end", index, content: block.thinking });
+      events.push({ type: "thinking_end", contentIndex, content: block.thinking });
     } else if (block?.type === "text") {
-      events.push({ kind: "text_end", index, content: block.text });
+      events.push({ type: "text_end", contentIndex, content: block.text });
     }
     openType = null;
   };
@@ -1201,7 +1229,7 @@ function createSseFeed() {
         if (openType !== "thinking") {
           closeOpenBlock(events);
           content.push({ type: "thinking", thinking: "" });
-          events.push({ kind: "thinking_start", index: content.length - 1 });
+          events.push({ type: "thinking_start", contentIndex: content.length - 1 });
           openType = "thinking";
         }
         const block = content[content.length - 1];
@@ -1212,10 +1240,9 @@ function createSseFeed() {
           block.thinkingSignature = part.thoughtSignature;
         }
         events.push({
-          kind: "thinking_delta",
-          index: content.length - 1,
-          delta,
-          ...part.thoughtSignature ? { thinkingSignature: part.thoughtSignature } : {}
+          type: "thinking_delta",
+          contentIndex: content.length - 1,
+          delta
         });
       } else if (part.functionCall) {
         closeOpenBlock(events);
@@ -1228,18 +1255,25 @@ function createSseFeed() {
           thoughtSignature: part.thoughtSignature || lastThoughtSignature
         };
         content.push(block);
-        events.push({ kind: "toolCall", index: content.length - 1, block });
+        const contentIndex = content.length - 1;
+        events.push({ type: "toolcall_start", contentIndex });
+        events.push({
+          type: "toolcall_delta",
+          contentIndex,
+          delta: JSON.stringify(block.arguments)
+        });
+        events.push({ type: "toolcall_end", contentIndex, toolCall: block });
       } else if (part.text !== void 0) {
         if (openType !== "text") {
           closeOpenBlock(events);
           content.push({ type: "text", text: "" });
-          events.push({ kind: "text_start", index: content.length - 1 });
+          events.push({ type: "text_start", contentIndex: content.length - 1 });
           openType = "text";
         }
         const block = content[content.length - 1];
         if (block?.type !== "text") continue;
         block.text += part.text;
-        events.push({ kind: "text_delta", index: content.length - 1, delta: part.text });
+        events.push({ type: "text_delta", contentIndex: content.length - 1, delta: part.text });
       }
     }
   };
@@ -1266,6 +1300,7 @@ function createSseFeed() {
 // src/builder.ts
 import { createHash as createHash2, randomUUID } from "node:crypto";
 var BASE64_SIGNATURE_PATTERN = /^[A-Za-z0-9+/_-]+={0,2}$/;
+var SKIP_THOUGHT_SIGNATURE_VALIDATOR = "skip_thought_signature_validator";
 function isValidThoughtSignature(sig) {
   if (typeof sig !== "string" || sig.length === 0) return false;
   if (sig.includes("=") && sig.length % 4 !== 0) return false;
@@ -1297,12 +1332,12 @@ function resolveSessionTrajectory(sessionId) {
   const hex = [...bytes].map((b) => b.toString(16).padStart(2, "0")).join("");
   return `${hex.slice(0, 8)}-${hex.slice(8, 12)}-${hex.slice(12, 16)}-${hex.slice(16, 20)}-${hex.slice(20)}`;
 }
+var AGY_SESSION_ID = "-3750763034362895579";
 function resolveNumericSessionId(sessionId) {
   if (/^-?\d+$/.test(sessionId)) {
     return sessionId;
   }
-  const hash = createHash2("sha256").update(`antigravity:session:${sessionId}`).digest();
-  return hash.readBigInt64BE(0).toString();
+  return AGY_SESSION_ID;
 }
 function normalizeToolCallId(id) {
   if (!id || typeof id !== "string") return id;
@@ -1375,6 +1410,7 @@ function convertTools(tools) {
 function translateTurnTrace(context, runtimeModelId) {
   const contents = [];
   const messages = context.messages || [];
+  const isGeminiRequest = classifyModelFamily(runtimeModelId) === "gemini";
   for (const msg of messages) {
     if (msg.role === "user") {
       const parts = [];
@@ -1468,6 +1504,8 @@ function translateTurnTrace(context, runtimeModelId) {
             if (sig) {
               part.thoughtSignature = sig;
               pendingThinkingSig = void 0;
+            } else if (isGeminiRequest && !isSameProviderAndModel) {
+              part.thoughtSignature = SKIP_THOUGHT_SIGNATURE_VALIDATOR;
             }
             parts.push(part);
           }
@@ -1673,11 +1711,12 @@ function streamAntigravity(model, context, options) {
       const reader = res.body.getReader();
       const decoder = new TextDecoder();
       const feed = createSseFeed();
-      const applyUsage = (u) => {
-        output.usage.input = u.input;
-        output.usage.cacheRead = u.cacheRead;
-        output.usage.output = u.output;
-        output.usage.totalTokens = u.total;
+      const applyFeedOutput = (fed) => {
+        output.content = fed.content;
+        output.usage.input = fed.usage.input;
+        output.usage.cacheRead = fed.usage.cacheRead;
+        output.usage.output = fed.usage.output;
+        output.usage.totalTokens = fed.usage.total;
         if (model.cost) {
           const c = model.cost;
           const inputCost = output.usage.input * (c.input || 0) / 1e6;
@@ -1691,51 +1730,10 @@ function streamAntigravity(model, context, options) {
             total: inputCost + outputCost + cacheCost
           };
         }
-      };
-      const translate = (events) => {
-        for (const ev of events) {
-          if (ev.kind === "text_start" || ev.kind === "thinking_start") {
-            const isThinking = ev.kind === "thinking_start";
-            stream.push(
-              isThinking ? { type: "thinking_start", contentIndex: ev.index, partial: output } : { type: "text_start", contentIndex: ev.index, partial: output }
-            );
-          } else if (ev.kind === "text_delta" || ev.kind === "thinking_delta") {
-            stream.push(
-              ev.kind === "text_delta" ? { type: "text_delta", contentIndex: ev.index, delta: ev.delta, partial: output } : { type: "thinking_delta", contentIndex: ev.index, delta: ev.delta, partial: output }
-            );
-          } else if (ev.kind === "text_end" || ev.kind === "thinking_end") {
-            stream.push(
-              ev.kind === "text_end" ? { type: "text_end", contentIndex: ev.index, content: ev.content, partial: output } : { type: "thinking_end", contentIndex: ev.index, content: ev.content, partial: output }
-            );
-          } else if (ev.kind === "toolCall") {
-            const toolCall = {
-              type: "toolCall",
-              id: ev.block.id,
-              name: ev.block.name,
-              arguments: ev.block.arguments || {},
-              thoughtSignature: ev.block.thoughtSignature
-            };
-            stream.push({ type: "toolcall_start", contentIndex: ev.index, partial: output });
-            stream.push({
-              type: "toolcall_delta",
-              contentIndex: ev.index,
-              delta: JSON.stringify(toolCall.arguments),
-              partial: output
-            });
-            stream.push({
-              type: "toolcall_end",
-              contentIndex: ev.index,
-              toolCall,
-              partial: output
-            });
-          }
-        }
-      };
-      const applyFeedOutput = (fed) => {
-        output.content = fed.content;
-        applyUsage(fed.usage);
         output.stopReason = fed.stopReason;
-        translate(fed.events);
+        for (const ev of fed.events) {
+          stream.push({ ...ev, partial: output });
+        }
       };
       while (true) {
         const { done, value } = await reader.read();
@@ -1762,29 +1760,32 @@ function streamAntigravity(model, context, options) {
 
 // src/commands.ts
 var USAGE_TEXT = "Usage: /antigravity <command>\n\nCommands:\n  usage    Show 5h and weekly quota pool limits\n  models   List recommended models with context window and remaining quota (alias: model)\n  refresh  Force refresh model catalog\n  settings Pick provider settings: Enter cycles values (alias: setting)\n  login    Run /login antigravity";
-var FETCH_SUBCOMMANDS = {
-  models: {
-    progress: "Fetching available models\u2026",
-    errLabel: "models",
-    run: (token, projectId, signal) => fetchAvailableModelsCatalog(token, projectId, signal).then(formatModelsList)
-  }
-};
 async function resolveToken(ctx) {
   const apiKey = await ctx.modelRegistry?.getApiKeyForProvider?.(PROVIDER_ID);
   if (!apiKey) return null;
   return parseStoredCredentials(apiKey);
 }
-async function runWithToken(ctx, cmd) {
-  const creds = await resolveToken(ctx);
-  if (!creds) {
+async function runModelsSubcommand(ctx) {
+  if (await resolveToken(ctx) === null) {
     emitOutput(ctx, "Not logged in. Run /login antigravity first.", "warning");
     return;
   }
   try {
-    if (ctx.hasUI) ctx.ui.notify(cmd.progress, "info");
-    emitOutput(ctx, await cmd.run(creds.token, creds.projectId, ctx.signal));
+    if (ctx.hasUI) ctx.ui.notify("Fetching available models\u2026", "info");
+    const { status, catalog } = await refreshCatalogGeneration(
+      () => ctx.modelRegistry?.refresh?.({ force: true, providers: [PROVIDER_ID], signal: ctx.signal })
+    );
+    if (status === "failed" || !catalog) {
+      throw new Error("no new generation received");
+    }
+    if (status === "stale") {
+      emitOutput(ctx, "Failed to refresh models, showing last known list.", "warning");
+      emitOutput(ctx, formatModelsList(catalog));
+      return;
+    }
+    emitOutput(ctx, formatModelsList(catalog));
   } catch (err) {
-    emitOutput(ctx, `Failed to fetch ${cmd.errLabel}: ${err.message}`, "error");
+    emitOutput(ctx, `Failed to fetch models: ${err.message}`, "error");
   }
 }
 function parseAntigravitySubcommand(args) {
@@ -1822,9 +1823,8 @@ async function runAntigravitySubcommand(args, ctx, quotaStatus) {
     await runUsageSubcommand(ctx, quotaStatus);
     return;
   }
-  const fetchCmd = FETCH_SUBCOMMANDS[sub];
-  if (fetchCmd) {
-    await runWithToken(ctx, fetchCmd);
+  if (sub === "models") {
+    await runModelsSubcommand(ctx);
     return;
   }
   if (sub === "settings") {
@@ -1834,8 +1834,16 @@ async function runAntigravitySubcommand(args, ctx, quotaStatus) {
   if (sub === "refresh") {
     try {
       if (ctx.hasUI) ctx.ui.notify("Refreshing models\u2026", "info");
-      await ctx.modelRegistry?.refresh?.({ force: true, providers: [PROVIDER_ID], signal: ctx.signal });
-      emitOutput(ctx, "Antigravity models refreshed successfully.");
+      const { status } = await refreshCatalogGeneration(
+        () => ctx.modelRegistry?.refresh?.({ force: true, providers: [PROVIDER_ID], signal: ctx.signal })
+      );
+      if (status === "fresh") {
+        emitOutput(ctx, "Antigravity models refreshed successfully.");
+      } else if (status === "stale") {
+        emitOutput(ctx, "Failed to refresh models, keeping last known list.", "warning");
+      } else {
+        emitOutput(ctx, "Failed to refresh models: no new generation received.", "error");
+      }
     } catch (err) {
       emitOutput(ctx, `Failed to refresh: ${err.message}`, "error");
     }