agy-crew 0.9.2 → 0.9.3

package/companion/accounts.mjs

@@ -16,7 +16,8 @@ import { accountDir, accountHome, accountSettingsPath, loadPool, poolExists, poo
   updatePool, validateAccountName, PoolError } from './pool/state.mjs';
 import { accountInLoan } from './pool/loans.mjs';
 import { readToken } from './pool/token.mjs';
-import { refreshQuotas, summarizeSnapshot } from './pool/quota.mjs';
+import { refreshQuotas } from './pool/quota.mjs';
+import { formatAgo, renderCooldowns, renderQuotaTable, renderTable } from './pool/format.mjs';
 import { replaceFile } from './state-lock.mjs';
 
 const out = (text) => process.stdout.write(text + '\n');
@@ -47,6 +48,9 @@ function accountState(pool, account, now) {
   return n ? `busy ${n}` : 'ready';
 }
 
+/** Text-mode state: the per-family cooldown detail lives in the COOLDOWNS section. */
+const stateLabel = (state) => (state.startsWith('cooling ') ? 'cooling' : state);
+
 function cmdList(opts) {
   const pool = currentPool();
   const now = Date.now();
@@ -56,12 +60,14 @@ function cmdList(opts) {
     cooldowns: Object.entries(pool.cooldowns).filter(([k]) => k.startsWith(`${a.name}|`)).map(([k, c]) => ({ family: k.split('|')[1], ...c })),
   }));
   if (opts.json) return printJson({ accounts: rows, live: { description: 'your own agy login; never pooled' } });
-  if (!rows.length) out(`No pool accounts. Add one with \`accounts login <name>\`.`);
-  for (const r of rows) {
-    out(`${r.name}  <${r.email || 'unknown'}>  ${r.state}  last used ${r.last_used_at || 'never'}`);
-    out(`    ${summarizeSnapshot(r.quota)}`);
-  }
-  out('live (your own agy login; never pooled)');
+  if (!rows.length) out('No pool accounts. Add one with `accounts login <name>`.');
+  const table = rows.map((r) => [r.name, r.email || 'unknown', stateLabel(r.state), formatAgo(r.last_used_at, now)]);
+  table.push({ lead: ['live'], text: 'your own agy login, never pooled' });
+  const lines = renderTable(['ACCOUNT', 'EMAIL', 'STATE', 'LAST USED'], table);
+  if (rows.length) lines.push('', ...renderQuotaTable(rows.map((r) => ({ name: r.name, snapshot: r.quota })), now));
+  const cooling = rows.flatMap((r) => r.cooldowns.filter((c) => Date.parse(c.retry_at) > now).map((c) => ({ name: r.name, ...c })));
+  if (cooling.length) lines.push('', ...renderCooldowns(cooling, now));
+  out(lines.join('\n'));
 }
 
 // ---------------------------------------------------------------------------
@@ -267,11 +273,11 @@ async function cmdQuota(opts, deps) {
     cooldowns: Object.entries(latest.cooldowns).filter(([k, c]) => k.startsWith(`${name}|`) && Date.parse(c.retry_at) > now)
       .map(([k, c]) => ({ family: k.split('|')[1], retry_at: c.retry_at })) }));
   if (opts.json) return printJson({ accounts: rows });
-  if (!rows.length) out('No pool accounts. Add one with `accounts login <name>`.');
-  for (const r of rows) {
-    out(`${r.name}: ${summarizeSnapshot(r.snapshot)}${r.snapshot?.refreshed_at ? ` (as of ${r.snapshot.refreshed_at})` : ''}`);
-    for (const c of r.cooldowns) out(`    cooling ${c.family} until ${c.retry_at}`);
-  }
+  if (!rows.length) return out('No pool accounts. Add one with `accounts login <name>`.');
+  const lines = renderQuotaTable(rows.map((r) => ({ name: r.name, snapshot: r.snapshot })), now);
+  const cooling = rows.flatMap((r) => r.cooldowns.map((c) => ({ name: r.name, ...c })));
+  if (cooling.length) lines.push('', ...renderCooldowns(cooling, now));
+  out(lines.join('\n'));
 }
 
 /** settings.json of every pool account, for `setup --apply`. */

package/companion/pool/format.mjs

@@ -0,0 +1,115 @@
+/**
+ * Human-readable rendering of the account pool: durations, clock times and
+ * aligned tables. Pure functions; every time-dependent one takes `now`.
+ */
+
+const pad2 = (n) => String(n).padStart(2, '0');
+
+/** Length of a span of time, e.g. `<1m`, `12m`, `1h02m`, `1d 3h`. Sign is ignored. */
+export function formatDuration(ms) {
+  const minutes = Math.floor(Math.abs(ms) / 60_000);
+  if (minutes < 1) return '<1m';
+  if (minutes < 60) return `${minutes}m`;
+  if (minutes < 24 * 60) return `${Math.floor(minutes / 60)}h${pad2(minutes % 60)}m`;
+  return `${Math.floor(minutes / 1440)}d ${Math.floor((minutes % 1440) / 60)}h`;
+}
+
+/** `delta` is target minus now in ms: negative reads "12m ago", otherwise "in 12m". */
+export function formatRelative(delta) {
+  const text = formatDuration(delta);
+  return delta < 0 ? `${text} ago` : `in ${text}`;
+}
+
+/** Local `HH:MM` when `date` is on the same local day as `now`, else `MM-DD HH:MM`. */
+export function formatClock(date, now) {
+  const d = new Date(date);
+  const n = new Date(now);
+  const time = `${pad2(d.getHours())}:${pad2(d.getMinutes())}`;
+  if (d.getFullYear() === n.getFullYear() && d.getMonth() === n.getMonth() && d.getDate() === n.getDate()) return time;
+  return `${pad2(d.getMonth() + 1)}-${pad2(d.getDate())} ${time}`;
+}
+
+/** Relative age of an ISO timestamp, or `never` when it is missing. */
+export function formatAgo(iso, now) {
+  const t = Date.parse(iso);
+  return Number.isFinite(t) ? formatRelative(t - now) : 'never';
+}
+
+export const formatPercent = (remaining) => `${Math.round(remaining * 100)}%`;
+
+/** `<pct>  resets in <rel> (<clock>)`; pct is padded to `pctWidth` (right-aligned). */
+export function formatWindow(window, now, pctWidth = 0) {
+  if (!window || typeof window.remaining !== 'number') return '';
+  const pct = formatPercent(window.remaining).padStart(pctWidth);
+  const reset = Date.parse(window.reset_at);
+  if (!Number.isFinite(reset)) return pct;
+  if (reset <= now) return `${pct}  reset since refresh`;
+  return `${pct}  resets in ${formatDuration(reset - now)} (${formatClock(reset, now)})`;
+}
+
+/** Pool names in display order: gemini, other, then the rest alphabetically. */
+export function orderedPools(names) {
+  const rank = (n) => (n === 'gemini' ? 0 : n === 'other' ? 1 : 2);
+  return [...names].sort((a, b) => rank(a) - rank(b) || a.localeCompare(b));
+}
+
+/**
+ * Plain-text table. Cells are padded to the widest entry of their column and
+ * joined with two spaces; lines carry no trailing spaces. A row is an array of
+ * cells, or `{ lead: [cells], text }` for a message that runs on after its
+ * leading cells (it does not widen any column beyond its lead cells).
+ */
+export function renderTable(headers, rows) {
+  const widths = headers.map((h) => h.length);
+  for (const row of rows) {
+    const cells = Array.isArray(row) ? row : row.lead;
+    cells.forEach((c, i) => { widths[i] = Math.max(widths[i], String(c).length); });
+  }
+  const line = (cells) => cells.map((c, i) => String(c).padEnd(widths[i])).join('  ').trimEnd();
+  const lines = [line(headers)];
+  for (const row of rows) {
+    if (Array.isArray(row)) lines.push(line(row));
+    else lines.push(`${row.lead.map((c, i) => String(c).padEnd(widths[i])).join('  ')}  ${row.text}`.trimEnd());
+  }
+  return lines;
+}
+
+const clip = (text, max) => (text.length > max ? `${text.slice(0, max - 3)}...` : text);
+
+/**
+ * QUOTA table lines. `entries` is [{ name, snapshot }]. The account name shows
+ * on its first row only; AS OF sits on the first pool row.
+ */
+export function renderQuotaTable(entries, now) {
+  const windowRows = [];
+  const layout = entries.map(({ name, snapshot }) => {
+    if (!snapshot) return { name, message: 'not refreshed (run `accounts quota --refresh`)' };
+    if (snapshot.error) return { name, message: `error: ${clip(String(snapshot.error).replace(/\s+/g, ' '), 60)}` };
+    const pools = orderedPools(Object.keys(snapshot.pools || {}));
+    if (!pools.length) return { name, message: 'no quota data' };
+    const rows = pools.map((pool) => ({ pool, short: snapshot.pools[pool].short, weekly: snapshot.pools[pool].weekly }));
+    windowRows.push(...rows);
+    return { name, snapshot, rows };
+  });
+  const pctWidth = (key) => Math.max(0, ...windowRows.filter((r) => r[key]).map((r) => formatPercent(r[key].remaining).length));
+  const shortW = pctWidth('short');
+  const weeklyW = pctWidth('weekly');
+  const rows = [];
+  for (const item of layout) {
+    if (item.message) { rows.push({ lead: [item.name], text: item.message }); continue; }
+    item.rows.forEach((r, i) => rows.push([
+      i === 0 ? item.name : '', r.pool,
+      formatWindow(r.short, now, shortW), formatWindow(r.weekly, now, weeklyW),
+      i === 0 ? formatAgo(item.snapshot.refreshed_at, now) : '',
+    ]));
+  }
+  return renderTable(['QUOTA', 'POOL', '5H', 'WEEKLY', 'AS OF'], rows);
+}
+
+/** COOLDOWNS lines (header included), or [] when `cooldowns` is empty. Items: { name, family, retry_at }. */
+export function renderCooldowns(cooldowns, now) {
+  if (!cooldowns.length) return [];
+  const rows = cooldowns.map((c) => [c.name, c.family,
+    `until ${formatClock(c.retry_at, now)} (${formatRelative(Date.parse(c.retry_at) - now)})`]);
+  return ['COOLDOWNS', ...renderTable(['', '', ''], rows).slice(1)];
+}

package/companion/pool/quota.mjs

@@ -131,12 +131,3 @@ export async function refreshQuotas(names, deps) {
   });
   return Object.fromEntries(fetched.map(([name, f]) => [name, f.snapshot]));
 }
-
-/** One-line quota summary for list/quota output. */
-export function summarizeSnapshot(snapshot) {
-  if (!snapshot) return 'quota: not refreshed';
-  if (snapshot.error) return `quota: error (${snapshot.error})`;
-  const pct = (w) => (w ? `${Math.round(w.remaining * 100)}%` : '?');
-  const parts = Object.entries(snapshot.pools).map(([g, w]) => `${g} 5h ${pct(w.short)} weekly ${pct(w.weekly)}`);
-  return `quota: ${parts.join(' | ') || 'no data'}${snapshot.plan_type ? ` (${snapshot.plan_type})` : ''}`;
-}

package/docs/REFERENCE.md

@@ -205,10 +205,10 @@ Every agy process for a pool account runs with its own HOME (and `USERPROFILE` o
 
 | Command | Effect |
 |---|---|
-| `accounts list [--json]` | Name, email, state (`ready`, `busy n`, `cooling <family> until <time>`, `needs login`, `disabled`), last use and cached quota summary, plus a line for live: `live (your own agy login; never pooled)` |
+| `accounts list [--json]` | Aligned plain-text tables. First, name, email, state (`ready`, `busy n`, `cooling`, `needs login`, `disabled`) and last use as a relative time (`9m ago`, `never`), plus a `live` row (`your own agy login, never pooled`). Then a `QUOTA` table with, per account and quota pool (`gemini`, `other`, then any others), the remaining percent and reset time of the 5h and weekly windows (`99%  resets in 4h12m (15:23)`; `MM-DD HH:MM` when the reset is not today, `reset since refresh` when the cached reset time has passed) and the age of the snapshot (`AS OF`); accounts without a snapshot show `not refreshed`, failed refreshes `error: ...`. Finally a `COOLDOWNS` section listing each active cooldown's family and `until <time> (in <duration>)`, omitted when there are none. `--json` output is unchanged |
 | `accounts login <name>` | Interactive sign-in for a new account, or a re-login of an existing one. See [Login](#login) |
 | `accounts import <name> --home <dir>` | Copy the token (and `settings.json` when present) from an existing HOME-shaped directory, such as an agy-cli-manager account directory (`~/.agy-cli-manager/accounts/<name>`). Same email and duplicate checks as login. Refuses the live home |
-| `accounts quota [<name>...] [--refresh] [--json]` | Print cached quota snapshots and cooldowns. With `--refresh`, query Google's Cloud Code service first. See [Quota snapshots](#quota-snapshots) |
+| `accounts quota [<name>...] [--refresh] [--json]` | Print the `QUOTA` table and `COOLDOWNS` section described above for the named accounts (all by default), from cached snapshots. With `--refresh`, query Google's Cloud Code service first. See [Quota snapshots](#quota-snapshots) |
 | `accounts enable <name>` / `accounts disable <name>` | Include or exclude an account from selection. Disabled accounts also never lend |
 | `accounts cooldown clear <name> [--family <f>]` | Drop the recorded cooldown for an account, for one model family or for all |
 | `accounts remove <name> [--yes]` | Without `--yes`, print what would be deleted and exit 0. With `--yes`, delete the account directory, its cooldowns, quota snapshot and conversation bindings, and report how many conversations became unusable. Refused while the account is in a lease or loan |
@@ -471,7 +471,7 @@ To get upstream back later, run `agy-crew uninstall --all` first.
 
 ## Upgrading
 
-Claude Code and Codex cache the plugin under a per-**version** directory (e.g. `cache/agy-crew/agy-crew/0.9.2`) and key "is it current?" on that version string, not on the commit. Bump their manifests and `package.json` together when preparing a release. Pi's Git source instead follows the configured ref; local sources read the checkout directly.
+Claude Code and Codex cache the plugin under a per-**version** directory (e.g. `cache/agy-crew/agy-crew/0.9.3`) and key "is it current?" on that version string, not on the commit. Bump their manifests and `package.json` together when preparing a release. Pi's Git source instead follows the configured ref; local sources read the checkout directly.
 
 - **Terminal command (`agy-crew install`)** — for an npm install, run `npm install -g agy-crew@latest`, then `agy-crew install` to render a fresh bundle and re-link; restart the harness. For a checkout, `git pull` is live at once for the source, and `agy-crew install` refreshes the bundle. See [Install command](#install-command).
 - **Claude Code** — `claude plugin marketplace update agy-crew` refreshes the marketplace clone, then `claude plugin update agy-crew@agy-crew` re-copies it into the cache. `install` is **not** the upgrade command: on an already-installed plugin it answers "already installed" and does nothing, whatever the version. And `update` only moves if the version string changed — on an unchanged version it answers "already at the latest version" and leaves the old commit in place. Force the current commit in with `claude plugin uninstall agy-crew@agy-crew && claude plugin install agy-crew@agy-crew`. Restart Claude Code afterwards either way — skills are registered at session start.

package/docs/REFERENCE.zh-CN.md

@@ -254,10 +254,10 @@ review --prompt "Review the patch at /tmp/change.patch"
 
 | 命令 | 作用 |
 | --- | --- |
-| `accounts list [--json]` | 显示名称、邮箱、状态（`ready`、`busy n`、`cooling <family> until <time>`、`needs login`、`disabled`）、最近使用时间和缓存的配额摘要，并附一行 live：`live (your own agy login; never pooled)` |
+| `accounts list [--json]` | 以对齐的纯文本表格显示。先是名称、邮箱、状态（`ready`、`busy n`、`cooling`、`needs login`、`disabled`）和相对形式的最近使用时间（`9m ago`、`never`），并附一行 `live`（`your own agy login, never pooled`）。随后是 `QUOTA` 表：按账号和配额池（`gemini`、`other`，其余按字母序）显示 5h 与每周窗口的剩余百分比和重置时间（`99%  resets in 4h12m (15:23)`；重置不在今天时为 `MM-DD HH:MM`，缓存的重置时间已过时为 `reset since refresh`），以及快照的时效（`AS OF`）；没有快照的账号显示 `not refreshed`，刷新失败的显示 `error: ...`。最后是 `COOLDOWNS` 部分，列出每个生效的冷却的家族和 `until <time> (in <duration>)`，没有冷却时省略。`--json` 输出不变 |
 | `accounts login <name>` | 交互式登录：添加新账号，或为已有账号重新登录。见[登录](#登录) |
 | `accounts import <name> --home <dir>` | 从已有的 HOME 形态目录复制令牌（存在时一并复制 `settings.json`），例如 agy-cli-manager 的账号目录（`~/.agy-cli-manager/accounts/<name>`）。邮箱和重复检查与登录相同；不接受 live 自己的 HOME |
-| `accounts quota [<name>...] [--refresh] [--json]` | 显示缓存的配额快照和冷却状态。加上 `--refresh` 会先向 Google 的 Cloud Code 服务查询。见[配额快照](#配额快照) |
+| `accounts quota [<name>...] [--refresh] [--json]` | 按缓存的快照显示上述 `QUOTA` 表和 `COOLDOWNS` 部分（默认所有账号，也可指定名称）。加上 `--refresh` 会先向 Google 的 Cloud Code 服务查询。见[配额快照](#配额快照) |
 | `accounts enable <name>` / `accounts disable <name>` | 让账号加入或退出自动选择。已停用的账号也不会借出凭据 |
 | `accounts cooldown clear <name> [--family <f>]` | 清除该账号的冷却记录，可只清某个模型家族，不指定则全部清除 |
 | `accounts remove <name> [--yes]` | 不带 `--yes` 时只列出将被删除的内容并以 0 退出。带 `--yes` 才会删除账号目录、冷却记录、配额快照和会话绑定，并报告有多少个会话因此无法继续。账号正处于租约或借用中时会拒绝 |
@@ -562,7 +562,7 @@ agy-crew 与上游 [agy-staff](https://github.com/keli-wen/agy-staff) 不能安
 
 ## 升级
 
-Claude Code 和 Codex 按版本号缓存插件，例如 `cache/agy-crew/agy-crew/0.9.2`。缓存是否需要更新取决于版本号，而不是仓库的最新提交。因此，准备发布时需要同步更新两个插件 manifest 和 `package.json` 中的版本。
+Claude Code 和 Codex 按版本号缓存插件，例如 `cache/agy-crew/agy-crew/0.9.3`。缓存是否需要更新取决于版本号，而不是仓库的最新提交。因此，准备发布时需要同步更新两个插件 manifest 和 `package.json` 中的版本。
 
 ### 终端命令（`agy-crew install`）
 

package/opencode-skills/agy-crew-accounts/SKILL.md

@@ -27,8 +27,8 @@ node "<skill-dir>/../../companion/agy-companion.mjs" accounts <subcommand> [args
 
 | Command | Purpose |
 | --- | --- |
-| `accounts list [--json]` | Every account with its state, last use and cached quota summary, plus a line for live. Start here. |
-| `accounts quota [<name>...] [--refresh] [--json]` | Cached quota snapshots and cooldowns. `--refresh` queries Google's Cloud Code service and updates the snapshots; it is the only subcommand that uses the network. |
+| `accounts list [--json]` | Aligned tables: each account with email, state and last use (plus a line for live), then a `QUOTA` table (per pool: remaining percent and reset time for the 5h and weekly windows, and how old the snapshot is), then `COOLDOWNS` when any are active. Start here. |
+| `accounts quota [<name>...] [--refresh] [--json]` | The same `QUOTA` table and `COOLDOWNS` section, from cached snapshots. `--refresh` queries Google's Cloud Code service and updates the snapshots; it is the only subcommand that uses the network. |
 | `accounts import <name> --home <dir>` | Copy the token (and `settings.json`) from an existing HOME-shaped directory, for example an agy-cli-manager account. |
 | `accounts enable <name>` / `accounts disable <name>` | Put an account into or out of automatic selection. |
 | `accounts cooldown clear <name> [--family <f>]` | Drop a recorded quota cooldown. Use it only when the user says the quota is back. |
@@ -55,11 +55,11 @@ If the user already has accounts elsewhere, offer `accounts import` instead of a
 | --- | --- | --- |
 | `ready` | Idle and usable | None. |
 | `busy n` | `n` runs hold it | Normal. A new `auto` run prefers an idle account. |
-| `cooling <family> until <t>` | That model family hit its quota; other families still work | Wait until `<t>`, use another model family or account. Do not clear the cooldown on your own. |
+| `cooling` | A model family hit its quota; other families still work. The `COOLDOWNS` section lists each family with `until <time> (in <duration>)` | Wait until then, use another model family or account. Do not clear the cooldown on your own. |
 | `needs login` | agy rejected the credential | Tell the user to run `agy-crew accounts login <name>`. Never retry. |
 | `disabled` | Excluded from selection | `enable` only if the user asks. |
 
-Cooldowns are per account and per model family (for example `gemini-3.8-flash`, whatever the effort suffix). Quota snapshots show the short-window and weekly remaining fraction per quota pool; they are cached, so `quota --refresh` is needed for current numbers. Refresh only when the user asks about current quota or a run failed with a quota error, not for routine checks.
+Cooldowns are per account and per model family (for example `gemini-3.8-flash`, whatever the effort suffix). The `QUOTA` table shows the short-window (5H) and weekly remaining percent and reset time per quota pool, with times in local clock (`HH:MM` for today, otherwise `MM-DD HH:MM`) and `AS OF` giving the snapshot age; they are cached, so `quota --refresh` is needed for current numbers. Refresh only when the user asks about current quota or a run failed with a quota error, not for routine checks.
 
 ## Choosing an account for a run
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agy-crew",
-  "version": "0.9.2",
+  "version": "0.9.3",
   "description": "Delegate work to Google's Antigravity CLI (agy) across a pool of accounts. A fork of agy-staff.",
   "bin": {
     "agy-crew": "companion/agy-companion.mjs"

package/pi-skills/agy-crew-accounts/SKILL.md

@@ -27,8 +27,8 @@ node "<skill-dir>/../../companion/agy-companion.mjs" accounts <subcommand> [args
 
 | Command | Purpose |
 | --- | --- |
-| `accounts list [--json]` | Every account with its state, last use and cached quota summary, plus a line for live. Start here. |
-| `accounts quota [<name>...] [--refresh] [--json]` | Cached quota snapshots and cooldowns. `--refresh` queries Google's Cloud Code service and updates the snapshots; it is the only subcommand that uses the network. |
+| `accounts list [--json]` | Aligned tables: each account with email, state and last use (plus a line for live), then a `QUOTA` table (per pool: remaining percent and reset time for the 5h and weekly windows, and how old the snapshot is), then `COOLDOWNS` when any are active. Start here. |
+| `accounts quota [<name>...] [--refresh] [--json]` | The same `QUOTA` table and `COOLDOWNS` section, from cached snapshots. `--refresh` queries Google's Cloud Code service and updates the snapshots; it is the only subcommand that uses the network. |
 | `accounts import <name> --home <dir>` | Copy the token (and `settings.json`) from an existing HOME-shaped directory, for example an agy-cli-manager account. |
 | `accounts enable <name>` / `accounts disable <name>` | Put an account into or out of automatic selection. |
 | `accounts cooldown clear <name> [--family <f>]` | Drop a recorded quota cooldown. Use it only when the user says the quota is back. |
@@ -55,11 +55,11 @@ If the user already has accounts elsewhere, offer `accounts import` instead of a
 | --- | --- | --- |
 | `ready` | Idle and usable | None. |
 | `busy n` | `n` runs hold it | Normal. A new `auto` run prefers an idle account. |
-| `cooling <family> until <t>` | That model family hit its quota; other families still work | Wait until `<t>`, use another model family or account. Do not clear the cooldown on your own. |
+| `cooling` | A model family hit its quota; other families still work. The `COOLDOWNS` section lists each family with `until <time> (in <duration>)` | Wait until then, use another model family or account. Do not clear the cooldown on your own. |
 | `needs login` | agy rejected the credential | Tell the user to run `agy-crew accounts login <name>`. Never retry. |
 | `disabled` | Excluded from selection | `enable` only if the user asks. |
 
-Cooldowns are per account and per model family (for example `gemini-3.8-flash`, whatever the effort suffix). Quota snapshots show the short-window and weekly remaining fraction per quota pool; they are cached, so `quota --refresh` is needed for current numbers. Refresh only when the user asks about current quota or a run failed with a quota error, not for routine checks.
+Cooldowns are per account and per model family (for example `gemini-3.8-flash`, whatever the effort suffix). The `QUOTA` table shows the short-window (5H) and weekly remaining percent and reset time per quota pool, with times in local clock (`HH:MM` for today, otherwise `MM-DD HH:MM`) and `AS OF` giving the snapshot age; they are cached, so `quota --refresh` is needed for current numbers. Refresh only when the user asks about current quota or a run failed with a quota error, not for routine checks.
 
 ## Choosing an account for a run
 

package/skills/accounts/SKILL.md

@@ -26,8 +26,8 @@ node "<skill-dir>/../../companion/agy-companion.mjs" accounts <subcommand> [args
 
 | Command | Purpose |
 | --- | --- |
-| `accounts list [--json]` | Every account with its state, last use and cached quota summary, plus a line for live. Start here. |
-| `accounts quota [<name>...] [--refresh] [--json]` | Cached quota snapshots and cooldowns. `--refresh` queries Google's Cloud Code service and updates the snapshots; it is the only subcommand that uses the network. |
+| `accounts list [--json]` | Aligned tables: each account with email, state and last use (plus a line for live), then a `QUOTA` table (per pool: remaining percent and reset time for the 5h and weekly windows, and how old the snapshot is), then `COOLDOWNS` when any are active. Start here. |
+| `accounts quota [<name>...] [--refresh] [--json]` | The same `QUOTA` table and `COOLDOWNS` section, from cached snapshots. `--refresh` queries Google's Cloud Code service and updates the snapshots; it is the only subcommand that uses the network. |
 | `accounts import <name> --home <dir>` | Copy the token (and `settings.json`) from an existing HOME-shaped directory, for example an agy-cli-manager account. |
 | `accounts enable <name>` / `accounts disable <name>` | Put an account into or out of automatic selection. |
 | `accounts cooldown clear <name> [--family <f>]` | Drop a recorded quota cooldown. Use it only when the user says the quota is back. |
@@ -54,11 +54,11 @@ If the user already has accounts elsewhere, offer `accounts import` instead of a
 | --- | --- | --- |
 | `ready` | Idle and usable | None. |
 | `busy n` | `n` runs hold it | Normal. A new `auto` run prefers an idle account. |
-| `cooling <family> until <t>` | That model family hit its quota; other families still work | Wait until `<t>`, use another model family or account. Do not clear the cooldown on your own. |
+| `cooling` | A model family hit its quota; other families still work. The `COOLDOWNS` section lists each family with `until <time> (in <duration>)` | Wait until then, use another model family or account. Do not clear the cooldown on your own. |
 | `needs login` | agy rejected the credential | Tell the user to run `agy-crew accounts login <name>`. Never retry. |
 | `disabled` | Excluded from selection | `enable` only if the user asks. |
 
-Cooldowns are per account and per model family (for example `gemini-3.8-flash`, whatever the effort suffix). Quota snapshots show the short-window and weekly remaining fraction per quota pool; they are cached, so `quota --refresh` is needed for current numbers. Refresh only when the user asks about current quota or a run failed with a quota error, not for routine checks.
+Cooldowns are per account and per model family (for example `gemini-3.8-flash`, whatever the effort suffix). The `QUOTA` table shows the short-window (5H) and weekly remaining percent and reset time per quota pool, with times in local clock (`HH:MM` for today, otherwise `MM-DD HH:MM`) and `AS OF` giving the snapshot age; they are cached, so `quota --refresh` is needed for current numbers. Refresh only when the user asks about current quota or a run failed with a quota error, not for routine checks.
 
 ## Choosing an account for a run