agy-powerline 1.3.0 → 1.4.0

package/README.zh-CN.md

@@ -3,13 +3,19 @@
 [English](README.md) | **简体中文** | [日本語](README.ja.md) | [Français](README.fr.md)
 
 [![CI](https://github.com/wassim-azi/agy-powerline/actions/workflows/ci.yml/badge.svg)](https://github.com/wassim-azi/agy-powerline/actions/workflows/ci.yml)
+[![CodeQL](https://github.com/wassim-azi/agy-powerline/actions/workflows/codeql.yml/badge.svg)](https://github.com/wassim-azi/agy-powerline/actions/workflows/codeql.yml)
 [![Version](https://img.shields.io/npm/v/agy-powerline.svg)](https://www.npmjs.com/package/agy-powerline)
-[![Downloads](https://img.shields.io/npm/dt/agy-powerline.svg)](https://www.npmjs.com/package/agy-powerline)
+[![Downloads](https://img.shields.io/npm/d18m/agy-powerline.svg?cacheSeconds=86400)](https://www.npmjs.com/package/agy-powerline)
+[![Stars](https://img.shields.io/github/stars/wassim-azi/agy-powerline?style=flat&color=gold&cacheSeconds=86400)](https://github.com/wassim-azi/agy-powerline/stargazers)
+[![Web Configurator](https://img.shields.io/badge/web%20configurator-live-00dc82.svg)](https://agy-powerline.com/configure/)
 [![Node](https://img.shields.io/badge/node-%3E%3D20-informational.svg)](https://nodejs.org/)
-[![Platform](https://img.shields.io/badge/platform-Windows%20%7C%20macOS%20%7C%20Linux-informational.svg)](docs/install.md)
+[![Windows](https://img.shields.io/badge/Windows-0078D6.svg?logo=windows&logoColor=white)](docs/install.md)
+[![macOS](https://img.shields.io/badge/macOS-000000.svg?logo=apple&logoColor=white)](docs/install.md)
+[![Linux](https://img.shields.io/badge/Linux-FCC624.svg?logo=linux&logoColor=black)](docs/install.md)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 [![Dependencies](https://img.shields.io/badge/dependencies-0-brightgreen.svg)](#隐私与安全)
 [![OpenSSF Scorecard](https://api.scorecard.dev/projects/github.com/wassim-azi/agy-powerline/badge)](https://scorecard.dev/viewer/?uri=github.com/wassim-azi/agy-powerline)
+[![OpenSSF Best Practices](https://www.bestpractices.dev/projects/15655/badge)](https://www.bestpractices.dev/projects/15655)
 [![Mentioned in Awesome Gemini CLI](https://img.shields.io/badge/mentioned%20in-awesome-fc60a8.svg?logo=awesomelists&logoColor=white)](https://github.com/Piebald-AI/awesome-gemini-cli)
 
 > 本文译自英文版 [README](README.md)，可能落后于英文版；如有出入，以英文版为准。详细文档（[`docs/`](docs/)）仅提供英文版。
@@ -19,7 +25,7 @@
 一眼看到当前模型、Gemini 5h/7d、Claude/GPT 和 Argon 配额、上下文窗口、git 分支等信息。在交互式编辑器中挑选组件、主题和布局。一条命令即可安装，零依赖。
 
 <p align="center">
-  <img src="assets/screenshots/pills-dark.png" alt="agy-powerline 的 Pills 布局，dark-ocean 主题：代理状态、模型、套餐、项目和 git；上下文；5h 和 7d 配额及重置时间" width="850">
+  <img src="assets/demo.gif" alt="agy-powerline 的 configure：输入 argon 添加 Argon 每周配额，然后浏览预设、主题和布局并实时预览状态栏，最后打开 Powerline 标签页" width="850">
 </p>
 
 ## 安装
@@ -34,6 +40,15 @@ agy                           # 启动 Antigravity
 
 `init` 在替换任何内容之前都会先询问，并会先备份 Antigravity 的 `settings.json`。运行 `init` 后需重启一次 `agy`。详情：[`init` 做了什么](docs/install.md)。
 
+<details>
+<summary>截图：真实 agy 会话中的状态栏（Windows Terminal）</summary>
+
+<p align="center">
+  <img src="assets/screenshots/windows.png" alt="Windows Terminal 中 agy 输入框下方的 agy-powerline：上方是一段简短对话，下方是三行的 Pills 状态栏" width="850">
+</p>
+
+</details>
+
 也可以让 agy 帮你安装：把下面这段话粘贴到 `agy` 会话中。
 
 ```text
@@ -54,13 +69,15 @@ Install the agy-powerline statusline: run `npx agy-powerline init --yes`, then t
 
 从一个预设开始，再按需调整：
 
-| 预设        | 显示内容                                               |
-| ----------- | ------------------------------------------------------ |
-| `default`   | 模型、上下文、git；第二行显示 5h 和 7d 配额及重置时间  |
-| `compact`   | 单行：简短模型名、最紧张的配额、上下文 %、git          |
-| `workspace` | 项目、git、代理状态、模型；上下文、最紧张的配额和模式  |
-| `limits`    | 所有配额（5h、7d、第三方、Argon），每行一个            |
-| `full`      | 全部：会话、项目和 git；上下文、token 和缓存；两组配额 |
+| 预设      | 显示内容                                                               |
+| --------- | ---------------------------------------------------------------------- |
+| `default` | 模型、上下文、git；第二行显示 5h 和 7d 配额及重置时间                  |
+| `compact` | 单行：简短模型名、最紧张的配额、上下文 %、git                          |
+| `agent`   | 代理状态、子代理、标题、模式、沙盒；模型、上下文 %、产物、最紧张的配额 |
+| `git`     | 项目、分支、worktree、stash；文件数、改动行数、提交                    |
+| `tokens`  | 上下文 token、会话输入/输出 token、缓存；今天和 7 天的 token           |
+| `quotas`  | 套餐和模型；5h 和 7d 配额并排显示，第三方和 Argon 配额在第三行         |
+| `full`    | 全部：会话、项目和 git；上下文、token 和缓存；两组配额                 |
 
 ### 主题
 
@@ -78,16 +95,48 @@ Install the agy-powerline statusline: run `npx agy-powerline init --yes`, then t
 **Pills**（默认）：powerline 风格的胶囊。可选圆角、尖角、斜角或平直形状，也可以在行与行之间留一个空行。
 
 <p align="center">
-  <img src="assets/screenshots/pills-light.png" alt="agy-powerline 的 Pills 布局，浅色终端上的 light-sky 主题，行间留空" width="850">
+  <img src="assets/screenshots/pills-dark.png" alt="agy-powerline 的 Pills 布局，dark-aurora 主题：模型、上下文、项目和 git；Gemini 5h 和 7d 配额，带进度标记和重置时间；Claude/GPT 和 Argon 每周配额" width="850">
 </p>
 
+<details>
+<summary>浅色终端</summary>
+
+<p align="center">
+  <img src="assets/screenshots/pills-light.png" alt="agy-powerline 的 Pills 布局，浅色终端上的 light-paper 主题" width="850">
+</p>
+
+</details>
+
 **Lines**：以纯彩色文本显示相同的信息。
 
 <p align="center">
-  <img src="assets/screenshots/lines-dark.png" alt="agy-powerline 的 Lines 布局，深色终端上的 dark-ocean 主题" width="850">
-  <img src="assets/screenshots/lines-light.png" alt="agy-powerline 的 Lines 布局，浅色终端上的 light-sky 主题" width="850">
+  <img src="assets/screenshots/lines-dark.png" alt="agy-powerline 的 Lines 布局，深色终端上的 dark-aurora 主题" width="850">
+</p>
+
+<details>
+<summary>浅色终端</summary>
+
+<p align="center">
+  <img src="assets/screenshots/lines-light.png" alt="agy-powerline 的 Lines 布局，浅色终端上的 light-paper 主题" width="850">
 </p>
 
+</details>
+
+**Classic**：用 `|` 分隔的纯彩色文本，进度条为方块，例如 `███░│░░░░░`。
+
+<p align="center">
+  <img src="assets/screenshots/classic-dark.png" alt="agy-powerline 的 Classic 布局，深色终端上的 dark-aurora 主题，方块进度条" width="850">
+</p>
+
+<details>
+<summary>浅色终端</summary>
+
+<p align="center">
+  <img src="assets/screenshots/classic-light.png" alt="agy-powerline 的 Classic 布局，浅色终端上的 light-paper 主题" width="850">
+</p>
+
+</details>
+
 ## 组件
 
 | 组件                                                          | 显示内容                                                                                                 |
@@ -116,21 +165,21 @@ Install the agy-powerline statusline: run `npx agy-powerline init --yes`, then t
 
 ## 命令
 
-| 命令                                      | 作用                                                  |
-| ----------------------------------------- | ----------------------------------------------------- |
-| `npx agy-powerline init [--yes]`          | 安装或更新状态栏                                      |
-| `npx agy-powerline configure`             | 打开编辑器（别名 `config`）                           |
-| `npx agy-powerline preset <name>`         | 应用预设（`--list` 查看全部）                         |
-| `npx agy-powerline theme <name>`          | 切换主题（`--list`、`--gallery`）                     |
-| `npx agy-powerline gradient <name>`       | Color each row with a gradient (`--list`, `off`)      |
-| `npx agy-powerline layout <pills\|lines>` | 切换布局                                              |
-| `npx agy-powerline caps <style>`          | 切换胶囊形状：`round`、`angled`、`slanted`、`flat`    |
-| `npx agy-powerline export [file]`         | Save your config to a file, to back it up or share it |
-| `npx agy-powerline import <file>`         | Load a config, after showing what changes (`--merge`) |
-| `npx agy-powerline doctor`                | 检查安装并说明问题所在                                |
-| `npx agy-powerline report`                | 生成保护隐私的错误报告                                |
-| `npx agy-powerline uninstall [--delete]`  | 从 agy 中移除（`--delete` 会同时删除其文件）          |
-| `npx agy-powerline render --demo`         | 用示例数据打印状态栏                                  |
+| 命令                                               | 作用                                                  |
+| -------------------------------------------------- | ----------------------------------------------------- |
+| `npx agy-powerline init [--yes]`                   | 安装或更新状态栏                                      |
+| `npx agy-powerline configure`                      | 打开编辑器（别名 `config`）                           |
+| `npx agy-powerline preset <name>`                  | 应用预设（`--list` 查看全部）                         |
+| `npx agy-powerline theme <name>`                   | 切换主题（`--list`、`--gallery`）                     |
+| `npx agy-powerline gradient <name>`                | Color each row with a gradient (`--list`, `off`)      |
+| `npx agy-powerline layout <pills\|lines\|classic>` | 切换布局                                              |
+| `npx agy-powerline caps <style>`                   | 切换胶囊形状：`round`、`angled`、`slanted`、`flat`    |
+| `npx agy-powerline export [file]`                  | Save your config to a file, to back it up or share it |
+| `npx agy-powerline import <file>`                  | Load a config, after showing what changes (`--merge`) |
+| `npx agy-powerline doctor`                         | 检查安装并说明问题所在                                |
+| `npx agy-powerline report`                         | 生成保护隐私的错误报告                                |
+| `npx agy-powerline uninstall [--delete]`           | 从 agy 中移除（`--delete` 会同时删除其文件）          |
+| `npx agy-powerline render --demo`                  | 用示例数据打印状态栏                                  |
 
 任何命令加上 `--help` 即可查看其选项。
 
@@ -185,6 +234,10 @@ npx agy-powerline doctor       # 检查一切是否为最新
 
 如果 agy-powerline 对你有用，点个 ⭐ 能帮助更多 agy 用户发现它。
 
+## Star History
+
+[![Star History Chart](https://api.star-history.com/svg?repos=wassim-azi/agy-powerline&type=Date)](https://star-history.com/#wassim-azi/agy-powerline&Date)
+
 ## 许可证
 
 [MIT](LICENSE) © Wassim AZI

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agy-powerline",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "description": "Fast, configurable statusline for Google Antigravity CLI (agy): live Gemini, Claude/GPT and Argon quota pacing, git, and an interactive TUI configurator",
   "bin": {
     "agy-powerline": "src/index.js"
@@ -35,6 +35,7 @@
     "test:update": "node tests/update-snapshots.js",
     "test:coverage": "node --test --experimental-test-coverage tests/shared.js",
     "gallery": "node scripts/gallery/build.js",
+    "screenshots": "node scripts/gallery/screenshots.js",
     "configurator": "node scripts/configurator/build.js",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix",
@@ -71,6 +72,7 @@
   "devDependencies": {
     "@eslint/js": "10.0.1",
     "eslint": "10.12.0",
+    "fast-check": "4.10.2",
     "globals": "17.13.0",
     "prettier": "3.9.10"
   }

package/src/cli/configure.js

@@ -295,7 +295,15 @@ const TAB_OF_SCREEN = {
   glyphs: "powerline",
 };
 
-const PRESET_ICONS = { default: "🎯", compact: "⚡", workspace: "📂", limits: "🔋", full: "🚀" };
+const PRESET_ICONS = {
+  default: "🎯",
+  compact: "⚡",
+  agent: "🧠",
+  git: "🔀",
+  tokens: "📊",
+  quotas: "🔋",
+  full: "🚀",
+};
 
 // Set by renderFrame so tests can draw a screen at a fixed size.
 let columnsOverride = null;
@@ -409,6 +417,7 @@ function previewParts(width) {
   // The toggle keys work on the widget list, so only that screen names them.
   const key = (letter) => (screen === "main" ? letter : "");
   const chips = [
+    ui.chip("gaps", preview.rowGap, key("v")),
     ui.chip("emojis", preview.emojis, key("e")),
     ui.chip("minimal", preview.minimalist, key("m")),
     ui.chip("pace", preview.pacing, key("r")),
@@ -416,10 +425,7 @@ function previewParts(width) {
     ui.chip("ascii", preview.ascii, key("i")),
   ];
   if (preview.layout === "pills") {
-    chips.unshift(
-      ui.chip("joins", preview.powerline.enabled, key("j")),
-      ui.chip("gaps", preview.rowGap, key("v"))
-    );
+    chips.unshift(ui.chip("joins", preview.powerline.enabled, key("j")));
   }
 
   return { title, bar: String(rendered).split("\n"), chips: chips.join("   ") };
@@ -1029,21 +1035,38 @@ const toHex = (rgb) => `#${rgb.map((part) => part.toString(16).padStart(2, "0"))
 
 // One color as a pill in that color with the theme's pill text, the way the
 // bar draws it, then its hex value.
-function colorLine(label, rgb, ink) {
-  return { raw: `${ui.pill(` ${label.padEnd(9)}`, rgb, ink)}  ${dim(toHex(rgb))}` };
-}
-
-const PALETTE_SLOTS = [
-  ["model", "Model"],
-  ["context", "Context"],
-  ["git", "Git"],
-  ["weekly", "7d quota"],
-  ["meta", "Details"],
-  ["fiveHour", "OK"],
-  ["caution", "Caution"],
-  ["warn", "Danger"],
+function colorCell(label, rgb, ink) {
+  return `${ui.pill(` ${label.padEnd(9)}`, rgb, ink)}  ${dim(toHex(rgb))}`;
+}
+
+// Widget colors on the left, states on the right; a blank line between rows
+// keeps the pills from touching.
+const PALETTE_ROWS = [
+  [
+    ["model", "Model"],
+    ["fiveHour", "OK"],
+  ],
+  [
+    ["context", "Context"],
+    ["caution", "Caution"],
+  ],
+  [
+    ["git", "Git"],
+    ["warn", "Danger"],
+  ],
+  [
+    ["weekly", "7d quota"],
+    ["meta", "Details"],
+  ],
 ];
 
+function paletteLines(colors) {
+  return PALETTE_ROWS.flatMap((row, index) => [
+    ...(index ? [""] : []),
+    { raw: row.map(([slot, label]) => colorCell(label, colors[slot], colors.text)).join("    ") },
+  ]);
+}
+
 function themeDetails(id) {
   if (id === "custom") {
     return {
@@ -1067,9 +1090,7 @@ function themeDetails(id) {
       ...(background ? [{ raw: `${dim("For")} ${ui.tag(background)}` }] : []),
       "",
       heading("Palette"),
-      ...PALETTE_SLOTS.map(([slot, label]) =>
-        colorLine(label, theme.colors[slot], theme.colors.text)
-      ),
+      ...paletteLines(theme.colors),
       "",
       heading("Sample"),
       ...themeSample(theme.colors),
@@ -1204,7 +1225,7 @@ const POWERLINE_HELP = {
   enabled:
     "On: adjacent widgets share one pill, with a separator between them. Off: every widget gets its own pill.",
   rowGap:
-    "Puts a blank line between Pills rows, so stacked pills don't touch. The bar takes more lines (three rows become five).",
+    "Puts a blank line between rows, in every layout, so stacked pills don't touch and text rows get more air. The bar takes more lines (three rows become five).",
   style: "Sets start caps, end caps and separators in one go. Enter cycles the styles.",
   separators: "Glyphs between widgets of a pill. With several, they cycle per join, left to right.",
   startCaps: "Glyphs that open each pill. With several, they cycle per pill, left to right.",
@@ -1233,7 +1254,7 @@ function powerlineDetails(row) {
 function drawPowerline() {
   const items = POWERLINE_ROWS.map((row) => ({ text: row.label, value: powerlineRowValue(row) }));
   const notes =
-    config.layout === "lines"
+    config.layout !== "pills"
       ? ["Powerline shapes apply to Pills. Switch layout with l."]
       : [
           "A style sets caps and separators together; edit a list to fine-tune it.",
@@ -1318,10 +1339,24 @@ function drawGlyphs() {
   });
 }
 
+// Three short paragraphs per layout, each under 90 columns so a wide panel
+// shows them unwrapped.
 const LAYOUT_HELP = {
-  pills: "Widgets sit in colored pills. The Powerline tab sets their caps, separators and joins.",
-  lines:
-    "Colored text on the terminal background, with dividers and dot meters. Powerline shapes don't apply.",
+  pills: [
+    "Widgets sit in colored pills, joined by powerline caps and separators.",
+    "Meters draw as small dots on the pill's color, with a larger dot as the pace marker.",
+    "The Powerline tab sets the caps, separators, joins and the space between rows.",
+  ],
+  lines: [
+    "Colored text on the terminal background, with thin │ dividers between widgets.",
+    "Meters draw as dots in the ok, caution or danger color, over a dim track.",
+    "Powerline shapes don't apply; the theme, widgets and space between rows do.",
+  ],
+  classic: [
+    "Colored text on the terminal background, with | dividers between widgets.",
+    "Meters draw as blocks in one color: █ filled, ░ empty and │ as the pace marker.",
+    "Powerline shapes don't apply; the theme, widgets and space between rows do.",
+  ],
 };
 
 function drawLayout() {
@@ -1335,10 +1370,9 @@ function drawLayout() {
   return screenFrame({
     title: "Layout",
     items,
-    notes: ["Both layouts use your widgets and theme; Powerline shapes apply to Pills."],
     details: hovered && {
       title: hovered.name,
-      lines: [`${hovered.description}.`, "", LAYOUT_HELP[hovered.id] ?? ""],
+      lines: LAYOUT_HELP[hovered.id].flatMap((line, i) => (i ? ["", line] : [line])),
     },
     keys: [
       [ui.glyph.upDown, "preview"],

package/src/index.js

@@ -102,7 +102,8 @@ const COMMANDS = [
   {
     name: "preset",
     arg: "[name]",
-    description: "View or apply a widget preset (default, compact, workspace, limits, full)",
+    description:
+      "View or apply a widget preset (default, compact, agent, git, tokens, quotas, full)",
     options: {
       list: { type: "boolean", short: "l", help: "list all available presets" },
     },

package/src/lib/colors.js

@@ -91,21 +91,24 @@ function rgb(r, g, b) {
   return [r, g, b];
 }
 
-function rgbToAnsi256([r, g, b]) {
-  if (r === g && g === b) {
-    if (r < 8) {
-      return 16;
-    }
-
-    if (r > 248) {
-      return 231;
-    }
+// The nearest xterm color: the 6x6x6 cube's levels (0, 95, 135, ... 255) are
+// not evenly spaced, and a near-gray reads better from the gray ramp, so both
+// candidates are measured and the closer one wins (as tmux does).
+const CUBE_LEVELS = [0, 95, 135, 175, 215, 255];
 
-    return Math.round(((r - 8) / 247) * 24) + 232;
-  }
-
-  const to6 = (v) => Math.round((v / 255) * 5);
-  return 16 + 36 * to6(r) + 6 * to6(g) + to6(b);
+function rgbToAnsi256([r, g, b]) {
+  const toCube = (v) => (v < 48 ? 0 : v < 115 ? 1 : Math.floor((v - 35) / 40));
+  const [cr, cg, cb] = [toCube(r), toCube(g), toCube(b)];
+  const cube = [CUBE_LEVELS[cr], CUBE_LEVELS[cg], CUBE_LEVELS[cb]];
+
+  const average = (r + g + b) / 3;
+  const grayIndex = average > 238 ? 23 : Math.max(0, Math.floor((average - 3) / 10));
+  const level = 8 + 10 * grayIndex;
+  const distance = ([x, y, z]) => (x - r) ** 2 + (y - g) ** 2 + (z - b) ** 2;
+
+  return distance([level, level, level]) < distance(cube)
+    ? 232 + grayIndex
+    : 16 + 36 * cr + 6 * cg + cb;
 }
 
 function colorSeq(kind, [r, g, b]) {

package/src/lib/config.js

@@ -91,9 +91,14 @@ const LAYOUTS = {
     name: "Lines",
     description: "Plain colored text with dividers and dot meters",
   },
+  classic: {
+    id: "classic",
+    name: "Classic",
+    description: "Plain colored text with | dividers and █░│ block meters",
+  },
 };
 
-const LAYOUT_ORDER = ["pills", "lines"];
+const LAYOUT_ORDER = ["pills", "lines", "classic"];
 
 function resolveLayoutId(layoutId) {
   return LAYOUTS[layoutId] ? layoutId : "pills";
@@ -255,11 +260,12 @@ function saveConfig(config) {
 }
 
 // Presets set the widget list only; the layout (Pills or Lines) stays the one
-// the user picked. Each keeps all its widgets at 80 columns (full at 100).
+// the user picked. Each answers one question and keeps all its widgets at 80
+// columns (full at 100); widgets with nothing to show hide on their own.
 const PRESETS = {
   default: {
     id: "default",
-    name: "Everyday",
+    name: "Default",
     description: "Model, context and git; 5h and 7d quotas with resets on a second row",
     widgets: [
       { id: "model" },
@@ -277,41 +283,84 @@ const PRESETS = {
   },
   compact: {
     id: "compact",
-    name: "One line",
-    description: "Short model, tightest quota, context % and git on a single row",
+    name: "Compact",
+    description: "One row: short model, tightest quota, context % and git",
     widgets: [{ id: "model", short: true }, { id: "quota" }, { id: "contextPct" }, { id: "git" }],
   },
-  workspace: {
-    id: "workspace",
-    name: "Several repos",
-    description: "Project, git, agent state and model; context, tightest quota and mode below",
+  agent: {
+    id: "agent",
+    name: "Agent activity",
+    description: "Agent state, subagents, title and mode; context, artifacts, quota",
+    widgets: [
+      { id: "agentState" },
+      { id: "tasks" },
+      { id: "title" },
+      { id: "separator" },
+      { id: "mode" },
+      { id: "sandbox" },
+      { id: "lineBreak" },
+      { id: "model", short: true },
+      { id: "contextPct" },
+      { id: "artifacts" },
+      { id: "separator" },
+      { id: "quota" },
+    ],
+  },
+  git: {
+    id: "git",
+    name: "Git focus",
+    description: "Project, branch, worktree, stash; changed files and lines, commit",
     widgets: [
       { id: "project" },
       { id: "git" },
-      { id: "agentState" },
+      { id: "gitWorktree" },
+      { id: "gitStash" },
       { id: "separator" },
       { id: "model", short: true },
       { id: "lineBreak" },
-      { id: "context" },
+      { id: "gitFiles" },
+      { id: "gitChanges" },
+      { id: "gitSha" },
+      { id: "separator" },
+      { id: "contextPct" },
+      { id: "quota" },
+    ],
+  },
+  tokens: {
+    id: "tokens",
+    name: "Token usage",
+    description: "Session tokens in and out, cache hit; tokens today and over 7 days",
+    widgets: [
+      { id: "model", short: true },
+      { id: "contextTokens" },
+      { id: "separator" },
+      { id: "totalTokens", split: true },
+      { id: "cacheHit" },
+      { id: "lineBreak" },
+      { id: "tokensToday" },
+      { id: "tokensWeek" },
       { id: "separator" },
       { id: "quota" },
-      { id: "mode" },
     ],
   },
-  limits: {
-    id: "limits",
-    name: "Heavy usage",
-    description: "5h, 7d, third-party and Argon quotas with resets, one quota per row",
+  quotas: {
+    id: "quotas",
+    name: "Quota watch",
+    description: "Plan and model; 5h and 7d quotas side by side; third-party and Argon",
     widgets: [
+      { id: "plan" },
+      { id: "separator" },
+      { id: "model", short: true },
+      { id: "lineBreak" },
       { id: "fiveHourBar" },
       { id: "fiveHourReset" },
-      { id: "lineBreak" },
+      { id: "separator" },
       { id: "weeklyBar" },
       { id: "weeklyReset" },
       { id: "lineBreak" },
       { id: "thirdPartyFiveHour" },
       { id: "thirdPartyWeekly" },
-      { id: "lineBreak" },
+      { id: "separator" },
       { id: "argonWeekly" },
       { id: "argonReset" },
     ],
@@ -319,7 +368,7 @@ const PRESETS = {
   full: {
     id: "full",
     name: "Everything",
-    description: "Session, project and git; context, tokens and cache; both quotas, on three rows",
+    description: "Session, project and git; context, tokens and cache; both quotas",
     widgets: [
       { id: "agentState" },
       { id: "tasks" },
@@ -344,7 +393,7 @@ const PRESETS = {
   },
 };
 
-const PRESET_ORDER = ["default", "compact", "workspace", "limits", "full"];
+const PRESET_ORDER = ["default", "compact", "agent", "git", "tokens", "quotas", "full"];
 
 function applyPreset(baseConfig, presetName) {
   const preset = PRESETS[presetName] || PRESETS.default;

package/src/lib/git.js

@@ -13,6 +13,15 @@ const SYNC_CACHE_NAME = ".git-sync-cache.json";
 const SYNC_CACHE_MAX = 20;
 const COMMIT = /^[0-9a-f]{40}(?:[0-9a-f]{24})?$/;
 
+// A git call that runs past its time is skipped until a later refresh. Tests
+// give git more time: on a busy CI machine a plain call can take longer.
+const timeouts = { sync: 150, detail: 300 };
+function setGitTimeouts(next) {
+  const previous = { ...timeouts };
+  Object.assign(timeouts, next);
+  return previous;
+}
+
 // 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
 // wherever this process runs, and the upward walk would then report that
@@ -392,7 +401,7 @@ function getGitSync(gitDir, branch) {
       ["rev-list", "--left-right", "--count", `${branch}...${branch}@{upstream}`, "--"],
       {
         cwd: path.dirname(gitDir),
-        timeout: 150,
+        timeout: timeouts.sync,
         stdio: ["ignore", "pipe", "ignore"],
         encoding: "utf8",
         // Antigravity may run the statusline without a console; without this,
@@ -414,7 +423,7 @@ function getGitSync(gitDir, branch) {
     // A timeout or missing git is worth knowing about when ahead/behind
     // counts never show.
     if (err.code === "ETIMEDOUT" || err.signal === "SIGTERM") {
-      logWarning("GIT_TIMEOUT", { timeoutMs: 150 });
+      logWarning("GIT_TIMEOUT", { timeoutMs: timeouts.sync });
     } else if (err.code === "ENOENT") {
       logWarning("GIT_NOT_FOUND");
     }
@@ -437,7 +446,6 @@ const DETAIL_NEEDS = {
 const STATUS_CACHE_NAME = ".git-status-cache.json";
 const STATUS_CACHE_MAX = 20;
 const STATUS_TTL_MS = 5000;
-const DETAIL_TIMEOUT_MS = 300;
 
 // No optional locks: the bar must never hold the index lock and make the
 // user's own git commands fail. The -c flags and the submodule skip keep git
@@ -559,7 +567,7 @@ function runGitDetail(cwd, args) {
     const { execFileSync } = require("child_process");
     return execFileSync("git", args, {
       cwd,
-      timeout: DETAIL_TIMEOUT_MS,
+      timeout: timeouts.detail,
       stdio: ["ignore", "pipe", "ignore"],
       encoding: "utf8",
       maxBuffer: 16 * 1024 * 1024,
@@ -567,7 +575,7 @@ function runGitDetail(cwd, args) {
     });
   } catch (err) {
     if (err.code === "ETIMEDOUT" || err.signal === "SIGTERM") {
-      logWarning("GIT_TIMEOUT", { timeoutMs: DETAIL_TIMEOUT_MS });
+      logWarning("GIT_TIMEOUT", { timeoutMs: timeouts.detail });
     } else if (err.code === "ENOENT") {
       logWarning("GIT_NOT_FOUND");
     }
@@ -767,4 +775,5 @@ module.exports = {
   getGitDetails,
   resolveGitDetails,
   clearGitDetailsCache,
+  setGitTimeouts,
 };