@songsid/agend 2.2.0-beta.9 → 2.2.1

package/dist/update-launch.d.ts

@@ -1,3 +1,46 @@
+/** Chat updates must survive the fleet's service cgroup being stopped (#1490 row 37). */
+import { type ChildProcess } from "node:child_process";
+/** How many bytes to cap the update.log file at (across all runs). */
+export declare const UPDATE_LOG_FILE_CAP: number;
+/**
+ * Path of the update log file (mode 0600; raw updater output is written directly — secrets are
+ * masked only when extracting the short cause shown in chat; the file itself is owner-readable only).
+ */
+export declare function updateLogPath(dataDir: string): string;
+/**
+ * Extract a short human-readable cause from raw updater output.
+ * #1947: AgEnD's own install refusal first — the postinstall's "AgEnD cannot be installed here: …" or the preinstall's
+ * "AgEnD 2.2 needs Node …" — which npm prints after its `code`/`path` lines (prefixed `npm error`), so it was never
+ * shown. Then the last `npm ERR!`/`npm error` summary line or the last `✗` line.
+ * Falls back to the last non-blank line. Masks secrets and caps at ~300 chars.
+ */
+export declare function extractUpdateCause(output: string): string | null;
+/**
+ * #1829: the one-line fix for a failure AgEnD knows, from this run's output (a small lookup; anything else: null).
+ * - `agendGone`: the launched `agend` is no longer there (an install that removed it and did not put it back).
+ * - npm `ENOTEMPTY` on its rename: a staging directory left by an interrupted install. npm names the same one on every
+ *   retry, so the retry fails the same way until it is removed — only that exact directory, and only when it is one of
+ *   AgEnD's own (`@songsid/.agend…`), never a pattern.
+ * - "systemd does not know …": the activation proof could not read the user manager (#1804): the one-time manual hop.
+ */
+export declare function updateFixHint(output: string, opts?: {
+    agendGone?: boolean;
+}): string | null;
+/**
+ * Rotate the log file if needed, write a run header, and return an open file descriptor
+ * for the child process to write to directly — not a pipe.
+ *
+ * Using an fd instead of a pipe means the updater can keep writing after the fleet process
+ * that spawned it has been stopped: there is no read end to close, so no EPIPE.
+ * The caller must closeSync(fd) after spawn so the parent's copy of the fd is released.
+ *
+ * Returns `null` when the log file cannot be opened (dataDir unwritable, disk full, etc.).
+ * In that case the caller should fall back to `stdio: "ignore"` and omit the log note.
+ */
+export declare function openUpdateLog(logPath: string, header: string): {
+    fd: number;
+    offset: number;
+} | null;
 export interface UpdateLaunchDeps {
     platform: string;
     cgroup(): Promise<string>;
@@ -19,4 +62,8 @@ export type UpdateLaunch = {
 /** Same UID, no privileged or remote manager, no credentials in argv. No unsafe detached fallback. */
 export declare function resolveUpdateLaunch(agend: string, deps?: UpdateLaunchDeps): Promise<UpdateLaunch>;
 /** Spawn/manager refusal and nonzero updater exit are visible; exit 75 is the existing pending hand-off. */
-export declare function watchUpdateLaunch(child: Pick<import("node:child_process").ChildProcess, "once">, fail: (message: string) => void): void;
+export declare function watchUpdateLaunch(child: Pick<ChildProcess, "once">, fail: (message: string) => void, logPath?: string, 
+/** Byte offset into the log file at which this run's output begins. */
+logOffset?: number, 
+/** The `agend` the updater runs: there at launch and gone after a failure → reinstalling is the fix (#1829). */
+agendPath?: string): void;

package/dist/update-launch.js

@@ -1,9 +1,147 @@
 /** Chat updates must survive the fleet's service cgroup being stopped (#1490 row 37). */
 import { execFile } from "node:child_process";
 import { randomBytes } from "node:crypto";
+import { appendFileSync, existsSync, fchmodSync, openSync, readFileSync, statSync, writeFileSync } from "node:fs";
 import { readFile } from "node:fs/promises";
+import { basename, dirname, isAbsolute, join } from "node:path";
 import { promisify } from "node:util";
 import { updateCommand } from "./update-dispatch.js";
+import { maskSecrets } from "./log-steps.js";
+import { t } from "./locale.js";
+/** How many bytes to read from the tail of the log when extracting a cause after the updater exits. */
+const CAUSE_TAIL_BYTES = 8 * 1024;
+/** How many bytes to cap the update.log file at (across all runs). */
+export const UPDATE_LOG_FILE_CAP = 400 * 1024;
+/**
+ * Path of the update log file (mode 0600; raw updater output is written directly — secrets are
+ * masked only when extracting the short cause shown in chat; the file itself is owner-readable only).
+ */
+export function updateLogPath(dataDir) {
+    return join(dataDir, "update.log");
+}
+/**
+ * Extract a short human-readable cause from raw updater output.
+ * #1947: AgEnD's own install refusal first — the postinstall's "AgEnD cannot be installed here: …" or the preinstall's
+ * "AgEnD 2.2 needs Node …" — which npm prints after its `code`/`path` lines (prefixed `npm error`), so it was never
+ * shown. Then the last `npm ERR!`/`npm error` summary line or the last `✗` line.
+ * Falls back to the last non-blank line. Masks secrets and caps at ~300 chars.
+ */
+export function extractUpdateCause(output) {
+    // Lines starting with --- are log headers, not updater output.
+    const lines = output.split("\n").map(l => l.trimEnd()).filter(l => Boolean(l) && !l.startsWith("---"));
+    if (!lines.length)
+        return null;
+    const refusal = lines.map(l => /^(?:npm (?:ERR!|error)\s+)?\s*(AgEnD cannot be installed here: .+|AgEnD 2\.2 needs Node .+)$/i.exec(l)?.[1]).find(Boolean);
+    if (refusal)
+        return maskSecrets(refusal).slice(0, 300);
+    // npm ERR! ends with !, a non-word char: \b does not anchor here. Use (?:\s|$) instead.
+    const npmErrRe = /^npm (ERR!|error)(?:\s|$)/i;
+    const npmLines = lines.filter(l => npmErrRe.test(l));
+    if (npmLines.length) {
+        // npm 10 always ends with "A complete log of this run can be found in: …". Skip that footer.
+        // Prefer the first `npm error code` line plus the next for context.
+        const codeIdx = npmLines.findIndex(l => /^npm (ERR!|error) code\s/i.test(l));
+        if (codeIdx >= 0) {
+            const summary = [npmLines[codeIdx], npmLines[codeIdx + 1]].filter(Boolean).join(" — ");
+            return maskSecrets(summary).slice(0, 300);
+        }
+        const meaningful = npmLines.filter(l => !/A complete log of this run can be found in/i.test(l));
+        const pick = meaningful.length ? meaningful[meaningful.length - 1] : npmLines[npmLines.length - 1];
+        return maskSecrets(pick).slice(0, 300);
+    }
+    const cross = lines.filter(l => /^\s*[✗✕×✘]/.test(l));
+    if (cross.length)
+        return maskSecrets(cross[cross.length - 1]).slice(0, 300);
+    return maskSecrets(lines[lines.length - 1]).slice(0, 300);
+}
+/** A version or dist-tag as the updater printed it, safe to put in a suggested command; else a placeholder. */
+function updateTarget(output) {
+    const to = /Updating AgEnD v\S+ → v(\S+?)\.\.\./.exec(output)?.[1] ?? /Updating AgEnD to (\S+?)\.\.\./.exec(output)?.[1];
+    return to && /^[0-9A-Za-z][0-9A-Za-z.+-]*$/.test(to) ? to : "<version>";
+}
+/**
+ * #1829: the one-line fix for a failure AgEnD knows, from this run's output (a small lookup; anything else: null).
+ * - `agendGone`: the launched `agend` is no longer there (an install that removed it and did not put it back).
+ * - npm `ENOTEMPTY` on its rename: a staging directory left by an interrupted install. npm names the same one on every
+ *   retry, so the retry fails the same way until it is removed — only that exact directory, and only when it is one of
+ *   AgEnD's own (`@songsid/.agend…`), never a pattern.
+ * - "systemd does not know …": the activation proof could not read the user manager (#1804): the one-time manual hop.
+ */
+export function updateFixHint(output, opts = {}) {
+    const target = updateTarget(output);
+    if (opts.agendGone)
+        return `\`npm install -g @songsid/agend@${target}\``;
+    if (/^npm (?:ERR!|error) code ENOTEMPTY\b/im.test(output)) {
+        const named = /^npm (?:ERR!|error) dest (.+)$/im.exec(output)?.[1] ?? /ENOTEMPTY[^\n]*rename '[^'\n]+' -> '([^'\n]+)'/.exec(output)?.[1];
+        const ours = named && isAbsolute(named) && !/['"\s\\`$]/.test(named)
+            && basename(dirname(named)) === "@songsid" && /^\.agend[A-Za-z0-9._-]*$/.test(basename(named));
+        if (ours)
+            return t("update.failure.remove_staging", `\`rm -rf '${named}' && agend update\``);
+        return null;
+    }
+    if (/systemd does not know /.test(output))
+        return `\`npm i -g @songsid/agend@${target} && agend restart\``;
+    return null;
+}
+/**
+ * Rotate the log file if needed, write a run header, and return an open file descriptor
+ * for the child process to write to directly — not a pipe.
+ *
+ * Using an fd instead of a pipe means the updater can keep writing after the fleet process
+ * that spawned it has been stopped: there is no read end to close, so no EPIPE.
+ * The caller must closeSync(fd) after spawn so the parent's copy of the fd is released.
+ *
+ * Returns `null` when the log file cannot be opened (dataDir unwritable, disk full, etc.).
+ * In that case the caller should fall back to `stdio: "ignore"` and omit the log note.
+ */
+export function openUpdateLog(logPath, header) {
+    // Rotate BEFORE opening the fd the child will use (never write to the same inode concurrently).
+    try {
+        if (existsSync(logPath) && statSync(logPath).size > UPDATE_LOG_FILE_CAP / 2) {
+            const old = readFileSync(logPath);
+            writeFileSync(logPath, old.subarray(Math.max(0, old.length - UPDATE_LOG_FILE_CAP / 2)));
+        }
+    }
+    catch { /* best-effort */ }
+    try {
+        appendFileSync(logPath, `${header}\n`, { mode: 0o600 });
+    }
+    catch { /* best-effort */ }
+    let fd;
+    try {
+        fd = openSync(logPath, "a", 0o600);
+    }
+    catch {
+        return null; // caller falls back to stdio: "ignore" and no log note
+    }
+    // fchmod: mode param of openSync only applies to new files; existing files keep their mode.
+    try {
+        fchmodSync(fd, 0o600);
+    }
+    catch { /* best-effort */ }
+    // Record the offset so readRunCause only reads this run's output, not previous runs.
+    const offset = (() => { try {
+        return statSync(logPath).size;
+    }
+    catch {
+        return 0;
+    } })();
+    return { fd, offset };
+}
+/**
+ * Read only this run's output from the log (from `offset`): its tail, for the cause and the fix.
+ * Prevents a run with no output from picking up the previous run's error as the cause.
+ */
+function readRunTail(logPath, offset) {
+    try {
+        const buf = readFileSync(logPath);
+        const runBytes = buf.subarray(offset);
+        return runBytes.subarray(Math.max(0, runBytes.length - CAUSE_TAIL_BYTES)).toString("utf8");
+    }
+    catch {
+        return null;
+    }
+}
 export const defaultUpdateLaunchDeps = {
     platform: process.platform,
     cgroup: async () => {
@@ -89,18 +227,34 @@ export async function resolveUpdateLaunch(agend, deps = defaultUpdateLaunchDeps)
         ] };
 }
 /** Spawn/manager refusal and nonzero updater exit are visible; exit 75 is the existing pending hand-off. */
-export function watchUpdateLaunch(child, fail) {
+export function watchUpdateLaunch(child, fail, logPath, 
+/** Byte offset into the log file at which this run's output begins. */
+logOffset, 
+/** The `agend` the updater runs: there at launch and gone after a failure → reinstalling is the fix (#1829). */
+agendPath) {
     let reported = false;
+    const agendAtLaunch = agendPath !== undefined && existsSync(agendPath);
     const report = (reason) => {
         if (reported)
             return;
         reported = true;
-        fail(`/update could not complete (${reason}). Run \`agend update\` from a host shell.`);
+        const tail = logPath != null && logOffset != null ? readRunTail(logPath, logOffset) : null;
+        const cause = tail === null ? null : extractUpdateCause(tail);
+        const fix = updateFixHint(tail ?? "", { agendGone: agendAtLaunch && !existsSync(agendPath) });
+        // The persisted marker caps this text at 300 chars: keep the action and log before raw diagnostics.
+        fail([
+            fix ? t("update.failure.fix", fix) : t("update.failure.shell"),
+            ...(logPath ? [t("update.failure.log", logPath)] : []),
+            t("update.failure.summary", reason),
+            ...(cause ? [t("update.failure.cause", cause)] : []),
+        ].join(" "));
     };
-    child.once("error", () => report("updater launch failed"));
+    child.once("error", () => report(t("update.failure.launch")));
     child.once("exit", (code, signal) => {
-        if (signal || (code !== 0 && code !== 75))
-            report(signal ? "updater was interrupted" : `updater exited ${code ?? "without a status"}`);
+        if (signal || (code !== 0 && code !== 75)) {
+            report(signal ? t("update.failure.interrupted")
+                : code == null ? t("update.failure.no_status") : t("update.failure.exit", code));
+        }
     });
 }
 //# sourceMappingURL=update-launch.js.map

package/dist/update-launch.js.map

@@ -1 +1 @@
-{"version":3,"file":"update-launch.js","sourceRoot":"","sources":["../src/update-launch.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"update-launch.js","sourceRoot":"","sources":["../src/update-launch.ts"],"names":[],"mappings":"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"}

package/dist/usage/providers.d.ts

@@ -143,22 +143,42 @@ export interface ClaudeUsageScope {
  * always; beside profiles (`besideProfiles`), its statusline fallback leaves the profiles' instances out.
  */
 export declare function fetchClaudeUsage(storeHome?: string, scope?: ClaudeUsageScope): Promise<Omit<ProviderUsage, "id" | "name">>;
+/**
+ * One quota bucket of `retrieveUserQuotaSummary` (agy's proto: QuotaSummaryBucket). `group` is not on the wire: it is
+ * the display name of the QuotaSummaryGroup the bucket came in, copied on by agyQuotaBuckets.
+ */
 interface AgyBucket {
     bucketId?: string;
     displayName?: string;
+    window?: string;
+    disabled?: boolean;
     remainingFraction?: number;
     resetTime?: string;
+    group?: string;
 }
+interface AgyQuotaSummary {
+    groups?: {
+        displayName?: string;
+        buckets?: AgyBucket[];
+    }[];
+    buckets?: AgyBucket[];
+}
+/** The summary's buckets, each tagged with its group's name. The top-level list (deprecated in the proto) only counts
+ * when no group carries any bucket. */
+export declare function agyQuotaBuckets(body: AgyQuotaSummary): AgyBucket[];
 /**
- * Pool the summary's buckets into at most four metrics.
+ * Pool the summary's buckets into one metric per pool and limit.
+ *
+ * Three payload shapes exist:
+ * - pooled ids (`gemini-5h`, `gemini-weekly`, `3p-5h`, `3p-weekly`), which map 1:1;
+ * - PER-MODEL buckets (`gemini-3.6-flash-high`, `claude-sonnet-4-6`, …), aggregated into a Gemini pool and an
+ *   everything-else pool;
+ * - (#1898, agy 2026-10) named groups ("Gemini Models", "Claude and GPT Models") whose buckets are the group's
+ *   five-hour and weekly limits. The group decides the pool; the bucket's window, id or name decides the limit.
  *
- * Two payload shapes exist. Older accounts report pooled ids (`gemini-5h`,
- * `gemini-weekly`, `3p-5h`, `3p-weekly`), which map 1:1. This machine's live
- * response instead lists PER-MODEL buckets (`gemini-3.6-flash-high`,
- * `claude-sonnet-4-6`, `gpt-oss-120b-medium`, …) — those aggregate into a
- * Gemini pool and an everything-else pool, keeping each pool's WORST remaining
- * fraction, because eleven per-model meters is noise and the binding constraint
- * is the one that runs out first.
+ * Every metric keeps the WORST remaining fraction of its buckets, because the binding constraint is the one that runs
+ * out first. Within one pool a bucket with a known limit is authoritative over per-model buckets; one pool never hides
+ * another. Disabled buckets (agy dims them, no number) are left out.
  */
 export declare function agyPoolMetrics(buckets: AgyBucket[]): UsageMetric[];
 interface AgyStoredToken {

package/dist/usage/providers.js

@@ -549,42 +549,96 @@ function agyOAuthClient(env = process.env) {
 /** Refreshed bearer, cached until shortly before expiry. The CLI's token file is
  * never written back — it belongs to agy; refresh tokens are reusable. */
 let agyTokenCache = null;
+/** The summary's buckets, each tagged with its group's name. The top-level list (deprecated in the proto) only counts
+ * when no group carries any bucket. */
+export function agyQuotaBuckets(body) {
+    const grouped = (body.groups ?? []).flatMap(g => (g.buckets ?? []).map(b => ({ ...b, group: g.displayName?.trim() || undefined })));
+    return grouped.length ? grouped : (body.buckets ?? []);
+}
+const AGY_POOLED = {
+    "gemini-5h": { pool: "Gemini", window: "session" },
+    "gemini-weekly": { pool: "Gemini", window: "weekly" },
+    "3p-5h": { pool: "Claude & others", window: "session" },
+    "3p-weekly": { pool: "Claude & others", window: "weekly" },
+};
+/** The pool a bucket belongs to: its group when the summary names one (#1898), else a guess from the bucket id. */
+function agyPool(b, id) {
+    const pooled = AGY_POOLED[id];
+    if (pooled)
+        return pooled.pool;
+    const group = b.group;
+    if (group) {
+        if (/gemini/i.test(group))
+            return "Gemini";
+        if (/claude|gpt|third.?party|\b3p\b/i.test(group))
+            return "Claude & others";
+        return group;
+    }
+    return id.startsWith("gemini") ? "Gemini" : "Claude & others";
+}
+/** The limit a bucket counts against ("Five Hour Limit", window "5h" …), or null for a per-model bucket. */
+function agyWindow(b, id) {
+    const pooled = AGY_POOLED[id];
+    if (pooled)
+        return pooled.window;
+    // One source at a time, the most specific first: the bucket's own window, then its id, then — only inside a named
+    // group, where a per-model name ("Gemini 2.5 High") cannot occur — its display name. A word that merely appears in an
+    // opaque id never overrides a window the bucket states.
+    for (const text of [b.window, id, b.group ? b.displayName : undefined]) {
+        const window = text ? agyWindowOf(text) : null;
+        if (window)
+            return window;
+    }
+    return null;
+}
+/** "5h", "5 h", "5-hour", "5_hours", "Five Hour Limit", "session" → session; "weekly", "7d", "7 days" → weekly. */
+function agyWindowOf(text) {
+    if (/(^|[^0-9.])5[\s_-]*h(ours?|rs?)?\b|five[\s_-]*h(ours?|rs?)\b|\bsession\b/i.test(text))
+        return "session";
+    if (/week|(^|[^0-9.])7[\s_-]*d(ays?)?\b|seven[\s_-]*days?\b/i.test(text))
+        return "weekly";
+    return null;
+}
+function agyLabel(pool, window) {
+    if (pool === "Claude & others") {
+        return window === "session" ? { text: "Claude & others (session)", i18n: i18n("usage.metric.agy_claude_others_session") }
+            : window === "weekly" ? { text: "Claude & others (weekly)", i18n: i18n("usage.metric.agy_claude_others_weekly") }
+                : { text: pool, i18n: i18n("usage.metric.agy_claude_others") };
+    }
+    return window === "session" ? { text: `${pool} (session)`, i18n: i18n("usage.metric.named_session", pool) }
+        : window === "weekly" ? { text: `${pool} (weekly)`, i18n: i18n("usage.metric.named_weekly", pool) }
+            : { text: pool, i18n: i18n("usage.metric.named", pool) };
+}
 /**
- * Pool the summary's buckets into at most four metrics.
+ * Pool the summary's buckets into one metric per pool and limit.
  *
- * Two payload shapes exist. Older accounts report pooled ids (`gemini-5h`,
- * `gemini-weekly`, `3p-5h`, `3p-weekly`), which map 1:1. This machine's live
- * response instead lists PER-MODEL buckets (`gemini-3.6-flash-high`,
- * `claude-sonnet-4-6`, `gpt-oss-120b-medium`, …) — those aggregate into a
- * Gemini pool and an everything-else pool, keeping each pool's WORST remaining
- * fraction, because eleven per-model meters is noise and the binding constraint
- * is the one that runs out first.
+ * Three payload shapes exist:
+ * - pooled ids (`gemini-5h`, `gemini-weekly`, `3p-5h`, `3p-weekly`), which map 1:1;
+ * - PER-MODEL buckets (`gemini-3.6-flash-high`, `claude-sonnet-4-6`, …), aggregated into a Gemini pool and an
+ *   everything-else pool;
+ * - (#1898, agy 2026-10) named groups ("Gemini Models", "Claude and GPT Models") whose buckets are the group's
+ *   five-hour and weekly limits. The group decides the pool; the bucket's window, id or name decides the limit.
+ *
+ * Every metric keeps the WORST remaining fraction of its buckets, because the binding constraint is the one that runs
+ * out first. Within one pool a bucket with a known limit is authoritative over per-model buckets; one pool never hides
+ * another. Disabled buckets (agy dims them, no number) are left out.
  */
 export function agyPoolMetrics(buckets) {
-    const POOLED = {
-        "gemini-5h": { text: "Gemini (session)", i18n: i18n("usage.metric.named_session", "Gemini") },
-        "gemini-weekly": { text: "Gemini (weekly)", i18n: i18n("usage.metric.named_weekly", "Gemini") },
-        "3p-5h": { text: "Claude & others (session)", i18n: i18n("usage.metric.agy_claude_others_session") },
-        "3p-weekly": { text: "Claude & others (weekly)", i18n: i18n("usage.metric.agy_claude_others_weekly") },
-    };
-    const direct = [];
-    const pools = new Map();
+    const entries = new Map();
     for (const b of buckets) {
-        if (!b.bucketId || typeof b.remainingFraction !== "number" || !Number.isFinite(b.remainingFraction))
+        const id = b.bucketId?.trim() || (b.group ? b.displayName?.trim() : undefined);
+        if (!id || b.disabled === true || typeof b.remainingFraction !== "number" || !Number.isFinite(b.remainingFraction))
             continue;
+        const pool = agyPool(b, id);
+        const window = agyWindow(b, id);
+        const key = `${pool}\u0000${window ?? ""}`;
         const reset = b.resetTime ?? null;
-        const pooledLabel = POOLED[b.bucketId];
-        if (pooledLabel) {
-            direct.push({ label: pooledLabel.text, labelI18n: pooledLabel.i18n, type: "percent", used: (1 - b.remainingFraction) * 100, resetsAt: reset });
-            continue;
-        }
-        const pool = b.bucketId.startsWith("gemini") ? "Gemini" : "Claude & others";
-        const existing = pools.get(pool);
+        const existing = entries.get(key);
         if (!existing) {
-            pools.set(pool, { fraction: b.remainingFraction, resetsAt: reset, models: 1 });
+            entries.set(key, { pool, window, fraction: b.remainingFraction, resetsAt: reset, models: 1 });
             continue;
         }
-        // Count every model in the pool; track the worst separately. Replacing the
+        // Count every bucket in the entry; track the worst separately. Replacing the
         // whole entry on a new worst would restart the count at that bucket.
         existing.models += 1;
         if (b.remainingFraction < existing.fraction) {
@@ -592,22 +646,24 @@ export function agyPoolMetrics(buckets) {
             existing.resetsAt = reset;
         }
     }
-    if (direct.length)
-        return direct;
-    return [...pools.entries()].map(([label, p]) => ({
-        label,
-        labelI18n: label === "Claude & others"
-            ? i18n("usage.metric.agy_claude_others")
-            : i18n("usage.metric.named", label),
-        type: "percent",
-        used: (1 - p.fraction) * 100,
-        resetsAt: p.resetsAt,
+    const limited = new Set([...entries.values()].filter(e => e.window).map(e => e.pool));
+    const order = (w) => (w === "session" ? 0 : w === "weekly" ? 1 : 2);
+    const pools = [...new Set([...entries.values()].map(e => e.pool))];
+    return [...entries.values()]
+        .filter(e => e.window || !limited.has(e.pool))
+        .sort((a, b) => pools.indexOf(a.pool) - pools.indexOf(b.pool) || order(a.window) - order(b.window))
+        .map(e => {
+        const label = agyLabel(e.pool, e.window);
+        const metric = { label: label.text, labelI18n: label.i18n, type: "percent", used: (1 - e.fraction) * 100, resetsAt: e.resetsAt };
         // Which number this is: the highest usage across the pool's models. Without
         // it a flat 0% right after a weekly rollover is indistinguishable from a
         // broken reading — which is exactly how it was reported.
-        note: `busiest of ${p.models} model${p.models === 1 ? "" : "s"}`,
-        noteI18n: i18n(p.models === 1 ? "usage.note.busiest_model" : "usage.note.busiest_models", p.models),
-    }));
+        if (!e.window || e.models > 1) {
+            metric.note = `busiest of ${e.models} model${e.models === 1 ? "" : "s"}`;
+            metric.noteI18n = i18n(e.models === 1 ? "usage.note.busiest_model" : "usage.note.busiest_models", e.models);
+        }
+        return metric;
+    });
 }
 /**
  * agy's token file, in either shape.
@@ -735,8 +791,7 @@ async function fetchAntigravityUsage() {
         catch {
             continue;
         }
-        const buckets = (body.groups ?? []).flatMap(g => g.buckets ?? []);
-        const metrics = agyPoolMetrics(buckets);
+        const metrics = agyPoolMetrics(agyQuotaBuckets(body ?? {}));
         return metrics.length
             ? { status: "ok", plan: null, metrics }
             : { status: "ok", plan: null, hint: "No quota information reported for this account.", hintI18n: i18n("usage.hint.no_quota"), metrics: [] };