agy-powerline 1.1.0 → 1.2.0

package/src/lib/git.js

@@ -4,6 +4,14 @@ const fs = require("fs");
 const path = require("path");
 const { logWarning } = require("./log");
 const { firstText } = require("./formatters");
+const { writeFileAtomic, PRIVATE_FILE_MODE } = require("./paths");
+
+// Ahead/behind counts depend only on the two commits compared, so they are
+// kept per commit pair: git runs again only when the branch or its upstream
+// moves. Starting git costs ~60 ms on Windows, on every refresh otherwise.
+const SYNC_CACHE_NAME = ".git-sync-cache.json";
+const SYNC_CACHE_MAX = 20;
+const COMMIT = /^[0-9a-f]{40}(?:[0-9a-f]{24})?$/;
 
 // Only an absolute folder that exists can belong to the user's session. A
 // relative path (a Windows path read on Linux, for one) resolves against
@@ -217,6 +225,54 @@ function upstreamRef(commonDir, branch) {
   return remote === "." ? merge : `refs/remotes/${remote}/${tracked}`;
 }
 
+// Only next to a real install's config (like the exec cache); CLI previews
+// and other copies don't write it.
+function syncCachePath() {
+  try {
+    const { getConfigDir } = require("./config");
+    const dir = getConfigDir();
+    return dir && fs.existsSync(path.join(dir, "statusline.config.json"))
+      ? path.join(dir, SYNC_CACHE_NAME)
+      : null;
+  } catch {
+    return null;
+  }
+}
+
+function readSyncCache(file) {
+  try {
+    const data = JSON.parse(fs.readFileSync(file, "utf8"));
+    return data && typeof data === "object" && !Array.isArray(data) ? data : {};
+  } catch {
+    return {};
+  }
+}
+
+function cachedSync(file, key) {
+  const value = file ? readSyncCache(file)[key] : null;
+  const valid =
+    Array.isArray(value) &&
+    value.length === 2 &&
+    value.every((n) => Number.isInteger(n) && n >= 0 && n <= 1e7);
+  return valid ? { ahead: value[0], behind: value[1] } : null;
+}
+
+function saveSync(file, key, sync) {
+  if (!file) {
+    return;
+  }
+  try {
+    // Newest last; the oldest pairs go once there are more than SYNC_CACHE_MAX.
+    const cache = readSyncCache(file);
+    delete cache[key];
+    cache[key] = [sync.ahead, sync.behind];
+    const kept = Object.fromEntries(Object.entries(cache).slice(-SYNC_CACHE_MAX));
+    writeFileAtomic(file, JSON.stringify(kept), { mode: PRIVATE_FILE_MODE });
+  } catch {
+    // Best effort: the next refresh runs git again.
+  }
+}
+
 function getGitSync(gitDir, branch) {
   if (!gitDir || !isSafeBranchName(branch)) {
     return { ahead: 0, behind: 0 };
@@ -232,10 +288,19 @@ function getGitSync(gitDir, branch) {
       return { ahead: 0, behind: 0 };
     }
 
-    if (readRef(commonDir, upstream) === localHash) {
+    const upstreamHash = readRef(commonDir, upstream);
+    if (upstreamHash === localHash) {
       return { ahead: 0, behind: 0 };
     }
 
+    const key =
+      COMMIT.test(localHash) && COMMIT.test(upstreamHash) ? `${localHash}..${upstreamHash}` : "";
+    const cacheFile = key ? syncCachePath() : null;
+    const cached = cachedSync(cacheFile, key);
+    if (cached) {
+      return cached;
+    }
+
     const { execFileSync } = require("child_process");
     const out = execFileSync(
       "git",
@@ -253,10 +318,12 @@ function getGitSync(gitDir, branch) {
 
     const parts = out.split(/\s+/);
     if (parts.length >= 2) {
-      return {
+      const sync = {
         ahead: parseInt(parts[0], 10) || 0,
         behind: parseInt(parts[1], 10) || 0,
       };
+      saveSync(cacheFile, key, sync);
+      return sync;
     }
   } catch (err) {
     // A timeout or missing git is worth knowing about when ahead/behind
@@ -327,4 +394,5 @@ module.exports = {
   gitHasDirtyMarkers,
   vcsFromPayload,
   resolveGit,
+  SYNC_CACHE_NAME,
 };

package/src/lib/layouts/lines.js

@@ -292,6 +292,12 @@ function buildLinesSegment(id, session, palette, emojis, ascii = false, widget =
     case "thirdPartyWeekly":
       return session.thirdPartyWeekly ? quotaMeter(session.thirdPartyWeekly) : null;
 
+    case "argonWeekly":
+      return session.argonWeekly ? quotaMeter(session.argonWeekly) : null;
+
+    case "argonReset":
+      return quotaReset(session.argonWeekly, true);
+
     case "context": {
       const { thresh, blinkSeq, color } = contextState();
       return (

package/src/lib/layouts/pills.js

@@ -312,6 +312,48 @@ function buildSegment(id, session, colors, emojis, ascii = false, widget = {}, c
       );
     }
 
+    // Argon is a Gemini model, so its quota takes the Gemini 7d color; the
+    // 🔮 tag tells the two apart.
+    case "argonWeekly": {
+      if (!session.argonWeekly) {
+        return null;
+      }
+      const thresh = resolveQuotaThresholds(widget, config);
+      const rem = session.argonWeekly.remaining;
+      const level = rem <= thresh.crit ? "crit" : rem <= thresh.warn ? "warn" : "normal";
+      const blink = !ascii && shouldBlink(level, thresh.blink);
+      const color = quotaColor(rem, colors.weekly, {
+        crit: thresh.crit,
+        warn: thresh.warn,
+        critColor: colors.warn,
+        warnColor: colors.caution,
+      });
+      return meterSegment(
+        color,
+        rem,
+        meterLabel(),
+        `${close} ${rem.toFixed(1)}% rem `,
+        true,
+        blink,
+        pace(session.argonWeekly)
+      );
+    }
+
+    case "argonReset": {
+      const text = session.argonWeekly
+        ? formatResetText(session.argonWeekly, {
+            format: widget.format,
+            fallback: "countdown",
+            weekly: true,
+            clock: config.clock,
+          })
+        : "";
+      if (!text) {
+        return null;
+      }
+      return pill(colors.weekly, lbl(text));
+    }
+
     case "context": {
       const thresh = resolveContextThresholds(widget, config);
       const level =

package/src/lib/log.js

@@ -28,6 +28,28 @@ const IN_REPO = path.basename(__dirname) === "lib";
 let logDir = null;
 let context = {};
 
+// The installed statusline.js is the runtime files joined into one (see
+// src/cli/bundle.js). [first line, file name] for each of them, so a stack
+// frame can still name the original file and line.
+let bundleLines = null;
+
+function setBundleLines(lines) {
+  bundleLines = Array.isArray(lines) ? lines : null;
+}
+
+function originalFrame(rel, line) {
+  if (!bundleLines || rel !== "statusline.js") {
+    return `${rel}:${line}`;
+  }
+  let match = null;
+  for (const entry of bundleLines) {
+    if (entry[0] <= line) {
+      match = entry;
+    }
+  }
+  return match ? `${match[1]}:${line - match[0] + 1}` : `${rel}:${line}`;
+}
+
 // The copied runtime has no package.json; init records the version in
 // install.json instead.
 function agyPowerlineVersion() {
@@ -139,7 +161,7 @@ function ourFrames(stack) {
       continue;
     }
     const fn = match[1] && /^[\w$.<> ]{1,60}$/.test(match[1]) ? `${match[1]} ` : "";
-    frames.push(`${fn}${rel.split(path.sep).join("/")}:${match[3]}`);
+    frames.push(`${fn}${originalFrame(rel.split(path.sep).join("/"), Number(match[3]))}`);
     if (frames.length >= 8) {
       break;
     }
@@ -283,4 +305,5 @@ module.exports = {
   logError,
   logWarning,
   clearLog,
+  setBundleLines,
 };

package/src/lib/mock-data.js

@@ -26,7 +26,7 @@ function sampleData() {
         input_tokens: 63382,
         output_tokens: 346,
         cache_creation_input_tokens: 0,
-        cache_read_input_tokens: 20857,
+        cache_read_input_tokens: 85935,
       },
     },
     exceeds_200k_tokens: false,
@@ -53,6 +53,11 @@ function sampleData() {
         reset_time: weeklyReset.toISOString(),
         reset_in_seconds: 86400 + 17 * 3600,
       },
+      "gemini-argon-wtu-weekly": {
+        remaining_fraction: 0.64,
+        reset_time: new Date(now + 4 * 86400 * 1000 + 9 * 3600 * 1000).toISOString(),
+        reset_in_seconds: 4 * 86400 + 9 * 3600,
+      },
     },
     agent_state: "thinking",
     vcs: {

package/src/lib/paths.js

@@ -8,7 +8,8 @@ const AGY_SETTINGS = path.join(os.homedir(), ".gemini", "antigravity-cli", "sett
 
 const INSTALL_META_NAME = "install.json";
 
-// Library files init copies next to statusline.js (paths relative to src/lib).
+// Library files the runtime needs (paths relative to src/lib). init joins them
+// with src/runtime/statusline.js into the one installed statusline.js.
 const RUNTIME_FILES = [
   "shared.js",
   "colors.js",
@@ -35,13 +36,16 @@ const PRIVATE_FILES = [
   "statusline.config.json",
   ".exec-cache.json",
   "last-payload.json",
+  // SYNC_CACHE_NAME in git.js: commit IDs of the repos you work in.
+  ".git-sync-cache.json",
   // LOG_NAME in log.js, spelled out because log.js requires this file.
   "agy-powerline.log",
 ];
 const PRIVATE_FILE_MODE = 0o600;
 
 // Everything init or the runtime may create in the install dir. uninstall
-// --delete removes only these, never the whole directory tree.
+// --delete removes only these, never the whole directory tree. RUNTIME_FILES
+// are listed for installs from 1.1.0 and earlier, which copied them separately.
 const INSTALLED_FILES = [
   "statusline.js",
   "statusline.cmd",

package/src/lib/session.js

@@ -6,10 +6,15 @@ const { resolveGit } = require("./git");
 
 const FIVE_HOURS = 5 * 3600;
 const SEVEN_DAYS = 7 * 86400;
+const ARGON_BUCKET = "gemini-argon-wtu-weekly";
 // The buckets Antigravity sends, with the short names the bar shows.
 const QUOTA_BUCKETS = {
   "gemini-5h": { label: "5h", window: FIVE_HOURS },
   "gemini-weekly": { label: "7d", window: SEVEN_DAYS },
+  // Gemini 4 Argon on Google AI Pro: a weekly quota of its own, with no 5-hour
+  // window, sent whatever model is in use. On Ultra Argon counts toward the
+  // Gemini buckets and this one isn't sent.
+  [ARGON_BUCKET]: { label: "Argon 7d", window: SEVEN_DAYS },
   "3p-5h": { label: "3P 5h", window: FIVE_HOURS },
   "3p-weekly": { label: "3P 7d", window: SEVEN_DAYS },
 };
@@ -68,8 +73,21 @@ function readQuota(data, key, windowSeconds) {
   };
 }
 
-// The bucket closest to running out for the model in use: gemini-* buckets
-// for Gemini models, 3p-* (third-party) buckets for the others. Without a
+// Which quota group a bucket belongs to.
+function bucketGroup(key) {
+  if (key.startsWith("gemini-argon-")) {
+    return "argon";
+  }
+  if (key.startsWith("gemini-")) {
+    return "gemini";
+  }
+  return key.startsWith("3p-") ? "3p" : null;
+}
+
+// The bucket closest to running out for the model in use: the Argon bucket
+// for Argon models, the other gemini-* buckets for Gemini models, 3p-*
+// (third-party) buckets for the others. Argon falls back to the Gemini
+// buckets, where its usage counts when there is no Argon bucket. Without a
 // matching bucket every bucket counts. Disabled buckets never do.
 function tightestQuota(data) {
   const buckets = data?.quota && typeof data.quota === "object" ? data.quota : {};
@@ -84,9 +102,17 @@ function tightestQuota(data) {
   }
 
   const model = firstText(data?.model?.display_name, data?.model?.id).toLowerCase();
-  const family = model.startsWith("gemini") ? "gemini-" : "3p-";
-  const forModel = usable.filter((quota) => quota.key.startsWith(family));
-  const pool = forModel.length ? forModel : usable;
+  const inGroup = (group) => usable.filter((quota) => bucketGroup(quota.key) === group);
+  let pool;
+  if (!model.startsWith("gemini")) {
+    pool = inGroup("3p");
+  } else if (model.includes("argon")) {
+    pool = inGroup("argon");
+    pool = pool.length ? pool : inGroup("gemini");
+  } else {
+    pool = inGroup("gemini");
+  }
+  pool = pool.length ? pool : usable;
 
   return pool.reduce((low, quota) => (!low || quota.remaining < low.remaining ? quota : low), null);
 }
@@ -121,9 +147,18 @@ function contextUsedPercent(data) {
 function extractSession(data, config) {
   const contextPct = percent(contextUsedPercent(data));
   const contextSize = count(data.context_window?.context_window_size);
+  const current = data.context_window?.current_usage;
+  // Context tokens are the used share of the window, so they always agree with
+  // the percentage next to them: agy's percentage also counts cached tokens and
+  // its own system prompt and tools, which no sum of current_usage reproduces.
+  // Without a window size, count what current_usage lists as in the window.
   const usedTokens =
-    count(data.context_window?.current_usage?.input_tokens) +
-    count(data.context_window?.current_usage?.output_tokens);
+    contextSize > 0
+      ? Math.round((contextPct * contextSize) / 100)
+      : count(current?.input_tokens) +
+        count(current?.cache_read_input_tokens) +
+        count(current?.cache_creation_input_tokens);
+  const requestTokens = count(current?.input_tokens) + count(current?.output_tokens);
 
   // RAM is measured here; Antigravity doesn't send it.
   let ramPct = 0;
@@ -139,7 +174,7 @@ function extractSession(data, config) {
   const inputTokens = count(data.context_window?.total_input_tokens);
   const outputTokens = count(data.context_window?.total_output_tokens);
   const sessionTokens = inputTokens + outputTokens;
-  const totalTokens = sessionTokens > 0 ? sessionTokens : usedTokens;
+  const totalTokens = sessionTokens > 0 ? sessionTokens : requestTokens;
 
   // Share of the prompt served from cache in the latest request.
   const cacheReadTokens = count(usage?.cache_read_input_tokens);
@@ -169,6 +204,7 @@ function extractSession(data, config) {
     weekly: readQuota(data, "gemini-weekly", SEVEN_DAYS),
     thirdPartyFiveHour: readQuota(data, "3p-5h", FIVE_HOURS),
     thirdPartyWeekly: readQuota(data, "3p-weekly", SEVEN_DAYS),
+    argonWeekly: readQuota(data, ARGON_BUCKET, SEVEN_DAYS),
     tightestQuota: tightestQuota(data),
     cwd: firstText(data.cwd, data.workspace?.current_dir),
     project: firstText(data.workspace?.project_dir),

package/src/lib/widget-style.js

@@ -93,6 +93,8 @@ const WIDGET_TAGS = {
   weeklyReset: { icon: "🔄", name: "Reset" },
   thirdPartyFiveHour: { icon: "🧪", name: "3P 5h" },
   thirdPartyWeekly: { icon: "🧪", name: "3P 7d" },
+  argonWeekly: { icon: "🔮", name: "Argon 7d" },
+  argonReset: { icon: "🔄", name: "Argon reset" },
   context: { icon: "💾", name: "Context", iconOnly: true },
   contextPct: { icon: "💾", name: "Context" },
   contextTokens: { icon: "💾", name: "Context" },