agy-powerline 1.1.0 → 1.2.0

package/src/cli/init.js

@@ -18,9 +18,8 @@ const {
   cmdBreakingMessage,
 } = require("../lib/paths");
 const { createRl, confirm } = require("../lib/prompt");
+const { buildRuntimeBundle } = require("./bundle");
 
-const RUNTIME_DIR = path.join(__dirname, "..", "runtime");
-const LIB_DIR = path.join(__dirname, "..", "lib");
 const DIM = "\x1b[2m";
 const BOLD = "\x1b[1m";
 const CYAN = "\x1b[36m";
@@ -29,6 +28,27 @@ const YELLOW = "\x1b[33m";
 const RED = "\x1b[31m";
 const RESET = "\x1b[0m";
 
+// Up to 1.1.0 the runtime was installed as separate files next to
+// statusline.js. They are part of the one-file statusline.js now; delete the
+// old copies by name (regular files only), then the emptied layouts folder.
+function removeSeparateRuntimeFiles(installDir) {
+  for (const rel of RUNTIME_FILES) {
+    const file = path.join(installDir, rel);
+    try {
+      if (fs.lstatSync(file).isFile()) {
+        fs.unlinkSync(file);
+      }
+    } catch {
+      // Not there: nothing to remove.
+    }
+  }
+  try {
+    fs.rmdirSync(path.join(installDir, "layouts"));
+  } catch {
+    // Missing, or holds something that isn't ours: leave it.
+  }
+}
+
 function assertUnixNode() {
   if (!isWindowsNodeOnWsl()) {
     return;
@@ -104,13 +124,8 @@ async function initCommand(options = {}) {
     }
 
     if (writeScripts) {
-      fs.copyFileSync(path.join(RUNTIME_DIR, "statusline.js"), destStatusline);
-      for (const rel of RUNTIME_FILES) {
-        const src = path.join(LIB_DIR, rel);
-        const dest = path.join(installDir, rel);
-        fs.mkdirSync(path.dirname(dest), { recursive: true });
-        fs.copyFileSync(src, dest);
-      }
+      fs.writeFileSync(destStatusline, buildRuntimeBundle(), "utf8");
+      removeSeparateRuntimeFiles(installDir);
 
       if (process.platform !== "win32") {
         try {

package/src/cli/tui-style.js

@@ -13,7 +13,8 @@ const BOX = {
 
 const GLYPHS = {
   fancy: {
-    pointer: "▌",
+    // A Powerline arrow: one column wide in every Nerd Font, like the pill ends.
+    pointer: "\ue0b1",
     on: "●",
     off: "○",
     ok: "✓",
@@ -43,12 +44,15 @@ const GLYPHS = {
 };
 
 const REVERSE = "\x1b[7m";
+// Rounded pill ends, the same glyphs as the bar's default style.
+const CAP_LEFT = "\ue0b6";
+const CAP_RIGHT = "\ue0b4";
 const strip = (text) =>
   String(text)
     .replace(/\x1b\[[0-9;]*m/g, "")
     .replace(/\x1b\]8;;[^\x07]*\x07/g, "");
 
-// width: the outer width of the panels, so a selected row can fill its panel.
+// width: the outer width of the panels, so the tabs know when to drop their keys.
 function makeUi(colors, { ascii = false, width = 100 } = {}) {
   const plain = getActiveDepth() === "none";
   const box = ascii ? BOX.ascii : BOX.round;
@@ -60,7 +64,6 @@ function makeUi(colors, { ascii = false, width = 100 } = {}) {
   // which many dark terminals draw almost invisible.
   const mutedColor = colors.meta;
   const borderColor = mix(colors.track, colors.meta, 0.4);
-  const inner = Math.max(10, width - 4);
 
   function muted(text) {
     return plain ? `${DIM}${text}${RESET}` : `${fg(mutedColor)}${text}${RESET}`;
@@ -77,8 +80,48 @@ function makeUi(colors, { ascii = false, width = 100 } = {}) {
     );
   }
 
+  // Text on a filled, round-ended pill; ASCII mode keeps the fill and drops
+  // the round ends (spaces instead), and no-color mode uses reverse video.
+  function pill(text, fill = accent, ink = colors.text) {
+    if (plain) {
+      return `${REVERSE}${BOLD} ${text} ${RESET}`;
+    }
+    if (ascii) {
+      return `${bg(fill)}${fg(ink)}${BOLD} ${text} ${RESET}`;
+    }
+    return `${fg(fill)}${CAP_LEFT}${bg(fill)}${fg(ink)}${BOLD}${text}${RESET}${fg(fill)}${CAP_RIGHT}${RESET}`;
+  }
+
+  // A quiet label, like a keycap: preset names, the version.
+  function tag(text) {
+    return quiet(text);
+  }
+
+  // A pill in the theme's track gray with muted text, for tags and keycaps.
+  function quiet(text, weight = "") {
+    if (plain) {
+      return `[${text}]`;
+    }
+    const body = `${bg(colors.track)}${fg(mutedColor)}${weight}`;
+    if (ascii) {
+      return `${body} ${text} ${RESET}`;
+    }
+    return `${fg(colors.track)}${CAP_LEFT}${body}${text}${RESET}${fg(colors.track)}${CAP_RIGHT}${RESET}`;
+  }
+
+  function accentText(text) {
+    return plain ? `${BOLD}${text}${RESET}` : `${fg(accent)}${BOLD}${text}${RESET}`;
+  }
+
+  // A small heading inside a panel.
+  function heading(text) {
+    return plain
+      ? `${BOLD}${text.toUpperCase()}${RESET}`
+      : `${fg(mutedColor)}${BOLD}${text.toUpperCase()}${RESET}`;
+  }
+
   function keycap(key) {
-    return plain ? `[${key}]` : `${bg(colors.track)}${fg(mutedColor)}${BOLD} ${key} ${RESET}`;
+    return quiet(key, BOLD);
   }
 
   // Key hints as keycaps, wrapped to the width without splitting a hint.
@@ -101,24 +144,36 @@ function makeUi(colors, { ascii = false, width = 100 } = {}) {
     return lines.map((text) => ` ${text}`);
   }
 
-  // Tabs for the main screens; the current one is a filled pill. On a narrow
-  // terminal the key letters and the arrow hint go first.
+  // left, then right ending at the panels' inner edge; null when they don't
+  // both fit with room between them.
+  function spread(left, right) {
+    const free = width - visibleWidth(left) - visibleWidth(right) - 1;
+    return free >= 3 ? left + " ".repeat(free) + right : null;
+  }
+
+  // A thin line across the panels' width, in the border color.
+  function rule() {
+    const line = box.h.repeat(Math.max(0, width - 2));
+    return ` ${plain ? line : fg(borderColor) + line + RESET}`;
+  }
+
+  // Tabs for the main screens; the current one is a filled pill, and the
+  // navigation keys sit at the right end. On a narrow terminal the navigation
+  // keys go first, then the tabs' key letters.
   function tabs(items, current) {
     const draw = (withKeys) =>
       " " +
       items
         .map(({ id, label, key }) => {
           if (id === current) {
-            return plain
-              ? `${REVERSE}${BOLD} ${label} ${RESET}`
-              : `${bg(accent)}${fg(colors.text)}${BOLD} ${label} ${RESET}`;
+            return pill(label);
           }
-          return ` ${BOLD}${label}${RESET}${withKeys && key ? ` ${muted(key)}` : ""} `;
+          return ` ${label}${withKeys && key ? ` ${muted(key)}` : ""} `;
         })
-        .join(" ") +
-      (withKeys && !ascii ? `   ${muted("← →")}` : "");
+        .join(" ");
+    const nav = muted(`${glyph.leftRight} navigate   q quit`);
     const full = draw(true);
-    return visibleWidth(full) <= width - 1 ? full : draw(false);
+    return spread(full, nav) ?? (visibleWidth(full) <= width - 1 ? full : draw(false));
   }
 
   // An on/off toggle; key, when given, follows the label like a tab's letter.
@@ -129,40 +184,71 @@ function makeUi(colors, { ascii = false, width = 100 } = {}) {
   }
 
   // A rounded panel with its title in the top border. Content wider than the
-  // panel is cut with an ellipsis instead of wrapping.
-  function panel(title, body, panelWidth = width) {
+  // panel is cut with an ellipsis instead of wrapping. above and below sit at
+  // the right end of the top and bottom borders (a scrolled list's counts),
+  // so they cost no rows.
+  function panel(title, body, panelWidth = width, { above = "", below = "" } = {}) {
     const space = Math.max(10, panelWidth - 4);
     const border = (text) => (plain ? text : fg(borderColor) + text + RESET);
-    const label = title ? ` ${title} ` : "";
+    const edge = (text) => (text ? ` ${muted(text)} ${border(box.h)}` : "");
+    // A title too long for the border is cut, like the rows.
+    const room = Math.max(1, panelWidth - 5 - visibleWidth(edge(above)));
+    const label = title ? ` ${truncateLines(title, room, ascii)} ` : "";
+    const ink = plain ? "" : fg(accent);
     const top =
       border(box.tl + box.h) +
       BOLD +
+      ink +
       label +
       RESET +
-      border(box.h.repeat(Math.max(0, panelWidth - 3 - visibleWidth(label))) + box.tr);
+      border(
+        box.h.repeat(Math.max(0, panelWidth - 3 - visibleWidth(label) - visibleWidth(edge(above))))
+      ) +
+      edge(above) +
+      border(box.tr);
     const rows = body.map((line) => {
       const clipped = truncateLines(line, space, ascii);
       const pad = " ".repeat(Math.max(0, space - visibleWidth(clipped)));
       return border(box.v) + " " + clipped + RESET + pad + " " + border(box.v);
     });
-    const bottom = border(box.bl + box.h.repeat(Math.max(0, panelWidth - 2)) + box.br);
+    const bottom =
+      border(box.bl + box.h.repeat(Math.max(0, panelWidth - 2 - visibleWidth(edge(below))))) +
+      edge(below) +
+      border(box.br);
     return [top, ...rows, bottom];
   }
 
-  // One list row. The selected row is a full-width bar in the accent color
-  // (reverse video without color), so it stands out on any background.
-  function row(selected, text, extra = "", number = null) {
+  // One list row: pointer, number, lead (an icon or swatch), the label and
+  // its extra. The selected row's label is an accent pill and its pointer and
+  // number light up; other labels sit where the pill's ends would be, so the
+  // columns stay put. pad lines up the extras of a list in one column.
+  // badge (e.g. "current") follows the label outside the pill, so it keeps
+  // its own color.
+  function row(selected, text, extra = "", number = null, { pad = 0, lead = "", badge = "" } = {}) {
     const index = number === null ? "" : `${String(number).padStart(2)} `;
+    const front = lead ? `${lead} ` : "";
+    const after = badge ? ` ${badge}` : "";
+    const width = visibleWidth(text) + visibleWidth(after);
+    const gap = extra ? " ".repeat(Math.max(3, pad - width + 3)) : "";
     if (selected) {
-      const content = strip(`${glyph.pointer} ${index}${text}${extra ? `   ${extra}` : ""}`);
-      const clipped = truncateLines(content, inner, ascii);
-      const padded = clipped + " ".repeat(Math.max(0, inner - visibleWidth(clipped)));
-      return plain
-        ? `${REVERSE}${BOLD}${padded}${RESET}`
-        : `${bg(accent)}${fg(colors.text)}${BOLD}${padded}${RESET}`;
+      const point = plain ? glyph.pointer : `${fg(accent)}${BOLD}${glyph.pointer}${RESET}`;
+      const lit = plain ? index : `${fg(accent)}${BOLD}${index}${RESET}`;
+      const note = extra ? `${gap}${BOLD}${extra}${RESET}` : "";
+      return `${point} ${lit}${front}${pill(strip(text))}${after}${note}`;
     }
-    const note = extra ? `   ${muted(extra)}` : "";
-    return `  ${index ? muted(index) : ""}${text}${note}`;
+    const note = extra ? `${gap}${muted(extra)}` : "";
+    return `  ${index ? muted(index) : ""}${front} ${text} ${after}${note}`;
+  }
+
+  // Two panels next to each other, one space apart; the shorter one is
+  // padded with blank lines of its width.
+  function beside(left, right) {
+    const height = Math.max(left.length, right.length);
+    const blank = (lines) => " ".repeat(lines.length ? visibleWidth(lines[0]) : 0);
+    return Array.from(
+      { length: height },
+      (_, i) => `${left[i] ?? blank(left)} ${right[i] ?? blank(right)}`
+    );
   }
 
   // Messages starting with ⚠ are warnings; everything else is a success.
@@ -177,7 +263,44 @@ function makeUi(colors, { ascii = false, width = 100 } = {}) {
     return plain ? `${BOLD}${mark} ${text}${RESET}` : `${fg(color)}${BOLD}${mark} ${text}${RESET}`;
   }
 
-  return { glyph, muted, wordmark, keycap, hints, tabs, chip, panel, row, toast, accent };
+  return {
+    glyph,
+    muted,
+    wordmark,
+    pill,
+    tag,
+    heading,
+    accentText,
+    spread,
+    rule,
+    keycap,
+    hints,
+    tabs,
+    chip,
+    panel,
+    row,
+    beside,
+    toast,
+    accent,
+  };
+}
+
+// Word wrap for plain text; a word longer than the width gets a line of its
+// own and the panel cuts it.
+function wrapText(text, lineWidth) {
+  const lines = [];
+  let line = "";
+  for (const word of String(text).split(" ")) {
+    const next = line ? `${line} ${word}` : word;
+    if (line && visibleWidth(next) > lineWidth) {
+      lines.push(line);
+      line = word;
+    } else {
+      line = next;
+    }
+  }
+  lines.push(line);
+  return lines;
 }
 
-module.exports = { makeUi };
+module.exports = { makeUi, wrapText };

package/src/lib/catalog.js

@@ -1,183 +1,252 @@
 "use strict";
 
+// description: one sentence, shown in the configure details panel.
+// summary: six words at most, shown next to the label in configure's lists.
 const WIDGET_CATALOG = [
-  { id: "model", label: "Model", unique: true, description: "the model in use" },
+  {
+    id: "model",
+    label: "Model",
+    unique: true,
+    description: "the model in use",
+    summary: "the model in use",
+  },
   {
     id: "quota",
     label: "Tightest Quota",
     unique: true,
     description: "the quota bucket closest to running out, with its reset",
+    summary: "quota closest to running out",
   },
   {
     id: "fiveHourBar",
     label: "5h Remaining Bar",
     unique: true,
     description: "5-hour quota left, as a meter",
+    summary: "5-hour quota left, as a meter",
   },
   {
     id: "fiveHourPct",
     label: "5h Remaining %",
     unique: true,
     description: "5-hour quota left, as a percentage",
+    summary: "5-hour quota left, in percent",
   },
   {
     id: "fiveHourReset",
     label: "5h Reset Timer",
     unique: true,
     description: "time until the 5-hour quota resets",
+    summary: "when the 5-hour quota resets",
   },
   {
     id: "weeklyBar",
     label: "7d Remaining Bar",
     unique: true,
     description: "7-day quota left, as a meter",
+    summary: "7-day quota left, as a meter",
   },
   {
     id: "weeklyPct",
     label: "7d Remaining %",
     unique: true,
     description: "7-day quota left, as a percentage",
+    summary: "7-day quota left, in percent",
   },
   {
     id: "weeklyReset",
     label: "7d Reset Timer",
     unique: true,
     description: "time until the 7-day quota resets",
+    summary: "when the 7-day quota resets",
   },
   {
     id: "thirdPartyFiveHour",
     label: "3P 5h Remaining",
     unique: true,
     description: "third-party 5-hour quota left, hidden when off",
+    summary: "third-party 5-hour quota left",
   },
   {
     id: "thirdPartyWeekly",
     label: "3P 7d Remaining",
     unique: true,
     description: "third-party 7-day quota left",
+    summary: "third-party 7-day quota left",
+  },
+  {
+    id: "argonWeekly",
+    label: "Argon 7d Remaining",
+    unique: true,
+    description: "Gemini 4 Argon's own 7-day quota left (Google AI Pro), hidden when not sent",
+    summary: "Argon 7-day quota left",
+  },
+  {
+    id: "argonReset",
+    label: "Argon Reset Timer",
+    unique: true,
+    description: "time until Gemini 4 Argon's 7-day quota resets, hidden when not sent",
+    summary: "when the Argon quota resets",
   },
   {
     id: "context",
     label: "Context Bar",
     unique: true,
     description: "context window used, as a meter with tokens and %",
+    summary: "context window used, as a meter",
   },
   {
     id: "contextPct",
     label: "Context %",
     unique: true,
     description: "context window used, as a percentage",
+    summary: "context window used, in percent",
   },
   {
     id: "contextTokens",
     label: "Context Tokens",
     unique: true,
     description: "context tokens used out of the window size",
+    summary: "context tokens out of window size",
   },
   {
     id: "cwd",
     label: "Working Directory",
     unique: true,
     description: "current folder, with ~ for home",
+    summary: "current working folder",
   },
   {
     id: "project",
     label: "Project Directory",
     unique: true,
     description: "name of the project folder",
+    summary: "project folder name",
   },
   {
     id: "git",
     label: "VCS Branch",
     unique: true,
     description: "current branch, marked when there are uncommitted changes",
+    summary: "branch and uncommitted changes",
+  },
+  {
+    id: "plan",
+    label: "Plan Tier",
+    unique: true,
+    description: "your Antigravity plan",
+    summary: "your Antigravity plan",
   },
-  { id: "plan", label: "Plan Tier", unique: true, description: "your Antigravity plan" },
   {
     id: "agentState",
     label: "Agent State",
     unique: true,
     description: "what the agent is doing, such as idle or thinking",
+    summary: "what the agent is doing",
   },
   {
     id: "artifacts",
     label: "Artifacts",
     unique: true,
     description: "number of artifacts",
+    summary: "number of artifacts",
   },
   {
     id: "tasks",
     label: "Subagents & Tasks",
     unique: true,
     description: "running subagents and background tasks, shown only when there are some",
+    summary: "running subagents and background tasks",
   },
   {
     id: "mode",
     label: "Mode",
     unique: true,
     description: "approval mode (e.g. accept-edits) and Vim mode, shown only when one is on",
+    summary: "approval mode and Vim mode",
   },
   {
     id: "title",
     label: "Conversation Title",
     unique: true,
     description: "name of the current conversation, shown once it has one",
+    summary: "current conversation title",
+  },
+  {
+    id: "ram",
+    label: "RAM Usage",
+    unique: true,
+    description: "memory used on this machine",
+    summary: "memory used on this machine",
+  },
+  {
+    id: "version",
+    label: "CLI Version",
+    unique: true,
+    description: "Antigravity CLI version",
+    summary: "Antigravity CLI version",
   },
-  { id: "ram", label: "RAM Usage", unique: true, description: "memory used on this machine" },
-  { id: "version", label: "CLI Version", unique: true, description: "Antigravity CLI version" },
   {
     id: "sandbox",
     label: "Sandbox",
     unique: true,
     description: "sandbox and network access, shown only when on",
+    summary: "sandbox and network access",
   },
   {
     id: "cacheRead",
     label: "Cache Read",
     unique: true,
     description: "input tokens read from the cache",
+    summary: "input tokens read from cache",
   },
   {
     id: "cacheCreate",
     label: "Cache Create",
     unique: true,
     description: "input tokens written to the cache",
+    summary: "input tokens written to cache",
   },
   {
     id: "cacheHit",
     label: "Cache Hit %",
     unique: true,
     description: "share of input tokens served from the cache",
+    summary: "share of input from cache",
   },
   {
     id: "totalTokens",
     label: "Total Tokens",
     unique: true,
     description: "session tokens, as a total or split into input and output",
+    summary: "session tokens, total or split",
   },
   {
     id: "exec",
     label: "Shell Command",
     unique: false,
     description: "runs a shell command on every refresh (global config only)",
+    summary: "output of a shell command",
   },
   {
     id: "customText",
     label: "Custom Badge",
     unique: false,
     description: "a fixed text of your choice",
+    summary: "a fixed text of your choice",
   },
   {
     id: "separator",
     label: "Flex Separator",
     unique: false,
     description: "expands to fill available terminal width",
+    summary: "pushes later widgets to the right",
   },
   {
     id: "lineBreak",
     label: "New Line",
     unique: false,
     description: "starts the next widgets on a new row",
+    summary: "starts a new row",
   },
 ];
 

package/src/lib/config.js

@@ -31,6 +31,8 @@ const VALID_WIDGET_IDS = new Set([
   "weeklyBar",
   "thirdPartyFiveHour",
   "thirdPartyWeekly",
+  "argonWeekly",
+  "argonReset",
   "context",
   "contextPct",
   "contextTokens",
@@ -280,7 +282,7 @@ const PRESETS = {
   limits: {
     id: "limits",
     name: "Heavy usage",
-    description: "5h, 7d and third-party quotas with resets, one quota per row",
+    description: "5h, 7d, third-party and Argon quotas with resets, one quota per row",
     widgets: [
       { id: "fiveHourBar" },
       { id: "fiveHourReset" },
@@ -290,6 +292,9 @@ const PRESETS = {
       { id: "lineBreak" },
       { id: "thirdPartyFiveHour" },
       { id: "thirdPartyWeekly" },
+      { id: "lineBreak" },
+      { id: "argonWeekly" },
+      { id: "argonReset" },
     ],
   },
   full: {

package/src/lib/fit.js

@@ -21,8 +21,10 @@ const DROP_ORDER = [
   "exec",
   "agentState",
   "mode",
+  "argonReset",
   "thirdPartyWeekly",
   "thirdPartyFiveHour",
+  "argonWeekly",
   "weeklyReset",
   "fiveHourReset",
   "contextTokens",