@songsid/agend 2.2.0-beta.15 → 2.2.0-beta.17

package/dist/ui/chat-store.js

@@ -31,6 +31,13 @@ function writePollMine(mine) {
   try { globalThis.localStorage?.setItem(POLL_MINE_KEY, JSON.stringify(mine)); } catch { /* storage unavailable */ }
 }
 
+/** Board 003648ac: an answer the server marks `sent` (handed over, and its text says only that) leaves after this. */
+const SENT_CLEAR_MS = 8000;
+const COMPACT_DONE_CLEAR_MS = 6000;
+const COMPACT_UNKNOWN_CLEAR_MS = 12000;
+/** The fleet stops following a /compact after 10 minutes (compact-watch.ts); the page waits a minute more. */
+const COMPACT_PAGE_LIMIT_MS = 11 * 60_000;
+
 /** Build a store. `deps` (fetch, toast, announce, t, now) are injected so tests can drive every path. */
 export function createChatStore(deps) {
   const s = {
@@ -77,6 +84,7 @@ export function createChatStore(deps) {
       const waits = i.state === "awaiting_input" ? (typeof i.interaction_summary === "string" ? i.interaction_summary : "") : null;
       if (i.name === s.current && waits != null && s.awaiting[i.name] == null) deps.announce(tf("chat.awaiting", i.name));
       s.awaiting[i.name] = waits;
+      if (i.compact) noteCompact(i.name, i.compact);
     }
     changed(null);
   }
@@ -337,10 +345,32 @@ export function createChatStore(deps) {
       if (!yes || !alive()) { delete s.commands[target]; changed(target); return; }
       r = await post({ confirm: r.confirm.token });
     }
-    s.commands[target] = r && r.choices ? { command, busy: false, choices: r.choices }
-      : r && r.error ? { command, busy: false, error: r.error } : { command, busy: false, text: (r && r.text) || "" };
+    const follow = r && r.follow && r.follow.kind === "compact" ? r.follow : null;
+    showCommand(target, r && r.choices ? { command, busy: false, choices: r.choices }
+      : r && r.error ? { command, busy: false, error: r.error }
+      : { command, busy: false, text: (r && r.text) || "", ...(r && r.sent === true ? { sent: true } : {}), ...(follow ? { compact: follow.id ? "running" : "unknown", watch: follow.id } : {}) });
     changed(target);
   }
+  // Board 003648ac: an answer the server marks `sent` leaves by itself; a sent /compact says "compacting…" until the
+  // status frame's `compact` (same watch id) says it ended, then leaves when it is done. Everything else — a refusal
+  // (even one worded as text), a list to choose from, an answer to read, a compaction timed out or lost — stays.
+  function showCommand(target, card) {
+    s.commands[target] = card;
+    const later = (ms, fn) => deps.setTimeout(() => { if (s.commands[target] === card) { fn(); changed(target); } }, ms);
+    const leave = () => { delete s.commands[target]; };
+    if (card.busy || card.error || card.choices || card.compact === "timeout" || card.compact === "lost") return;
+    if (card.compact === "running") later(COMPACT_PAGE_LIMIT_MS, () => showCommand(target, { ...card, compact: "timeout" }));
+    else if (card.compact === "done") later(COMPACT_DONE_CLEAR_MS, leave);
+    else if (card.compact === "unknown") later(COMPACT_UNKNOWN_CLEAR_MS, leave);
+    else if (card.sent === true) later(SENT_CLEAR_MS, leave);
+  }
+  /** The status frame's word on a followed /compact: done, timed out, or lost. */
+  function noteCompact(name, view) {
+    const c = s.commands[name];
+    if (!c || c.compact !== "running" || !view || view.id !== c.watch || !["done", "timeout", "lost"].includes(view.state)) return;
+    showCommand(name, { ...c, compact: view.state });
+    changed(name);
+  }
   function dismissCommand(target) { delete s.commands[target]; changed(target); }
   /** Whether a command can start for `target` now (none is out): checked before a typed command line is consumed. */
   const commandFree = (target) => !(s.commands[target] && s.commands[target].busy);

package/dist/ui/chat-strings.js

@@ -4,6 +4,9 @@ import { register } from "/assets/app-i18n.js";
 register("chat", {
   en: {
     cmdConfirm: "Clear", cmdConfirmBackend: "Switch and restart", cmdRunning: "Running /{0}…", cmdNotCommand: "Not a command here — Enter sends it as a message.", cmdDismiss: "Dismiss", cmdCommands: "Commands",
+    compactRunning: "Compacting…", compactDone: "✅ Conversation compacted", compactUnknown: "This backend does not report when compaction ends.",
+    compactTimeout: "No sign that compaction finished within {0} minutes — check the agent's own chat.",
+    compactLost: "Can't follow this compaction: the command did not reach the agent, or the agent stopped or changed backend.",
     cmdChoose: "Choose", cmdCurrent: "current", chipCompact: "Compact", chipClear: "Clear…", chipContext: "Context {0}% used",
     chipModel: "Model: {0} — choose another", chipEffort: "Effort: {0} — choose another",
     cmd_ctx: "Context use, model and effort", cmd_compact: "Compact the conversation", cmd_clear: "Clear the conversation (asks first)",
@@ -19,7 +22,7 @@ register("chat", {
     a11yWorking: "{0} started working", a11yIdle: "{0} finished", a11yReplied: "{0} replied", conversationWith: "Conversation with {0}",
     stopping: "Stopping {0}…", awaiting: "{0} is waiting for your input", approxNote: "Read from the terminal, so approximate", elapsedTitle: "Time since this page saw it start (approximate)",
     dropHere: "Drop files to attach them", asText: "As text", pasteAttached: "A long paste ({0} characters) was attached as a text file", pasteKeptAsText: "No room for another attachment: the long paste stays as text",
-    send: "Send", composerPlaceholder: "Message {0}…", composerHint: "Enter to send · Shift+Enter for a new line", composerMore: "/ for commands · Esc stops the reply", attachTitle: "Attach files (images, PDF, text — or paste / drop them)",
+    send: "Send", composerPlaceholder: "Message {0}…", composerHint: "Enter to send · Shift+Enter for a new line", composerMore: "/ for commands · Esc stops the reply", attachTitle: "Attach files (any type — or paste / drop them)",
     pvPreview: "Preview", pvStop: "Stop", pvDownload: "Download", pvMenu: "Preview options", pvHtml: "HTML",
     pvAllowButton: "Allow previews", pvAllow: "Allow HTML previews — they may be able to send data out", pvDisallow: "Stop allowing HTML previews",
     pvConfirm: "Allow HTML previews?\n\nThis applies on every device where you are signed in. A preview runs the agent's HTML in an isolated frame. It cannot use your login, but it may be able to send data out, and it can slow or freeze this tab. You still click Preview each time.",
@@ -89,6 +92,9 @@ register("chat", {
   },
   "zh-TW": {
     cmdConfirm: "清空", cmdConfirmBackend: "切換並重新啟動", cmdRunning: "執行 /{0} 中…", cmdNotCommand: "這裡沒有這個指令——按 Enter 會當成一般訊息送出。", cmdDismiss: "關閉", cmdCommands: "指令",
+    compactRunning: "壓縮中…", compactDone: "✅ 對話已壓縮", compactUnknown: "這個後端不會回報壓縮何時完成。",
+    compactTimeout: "{0} 分鐘內沒有看到壓縮完成的紀錄，請到代理自己的對話確認。",
+    compactLost: "無法再追蹤這次壓縮：指令沒有送到代理，或代理已停止、換了後端。",
     cmdChoose: "選擇", cmdCurrent: "目前", chipCompact: "壓縮", chipClear: "清空…", chipContext: "已用 {0}% 的 context",
     chipModel: "模型：{0}——選擇其他", chipEffort: "推理強度：{0}——選擇其他",
     cmd_ctx: "context 用量、模型與推理強度", cmd_compact: "壓縮對話", cmd_clear: "清空對話（會先確認）",
@@ -104,7 +110,7 @@ register("chat", {
     a11yWorking: "{0} 開始工作", a11yIdle: "{0} 已完成", a11yReplied: "{0} 已回覆", conversationWith: "與 {0} 的對話",
     stopping: "正在中止 {0}…", awaiting: "{0} 正在等你回應", approxNote: "從終端畫面判讀，僅供參考", elapsedTitle: "從這個頁面看到它開始工作起算（約略）",
     dropHere: "放開即可附加檔案", asText: "改為文字", pasteAttached: "貼上的長文字（{0} 個字元）已改為文字檔附加", pasteKeptAsText: "附件已滿，貼上的長文字保留為一般文字",
-    send: "送出", composerPlaceholder: "傳訊息給 {0}…", composerHint: "Enter 送出 · Shift+Enter 換行", composerMore: "/ 叫出指令 · Esc 中止回覆", attachTitle: "附加檔案（圖片、PDF、文字檔，也可以貼上或拖曳）",
+    send: "送出", composerPlaceholder: "傳訊息給 {0}…", composerHint: "Enter 送出 · Shift+Enter 換行", composerMore: "/ 叫出指令 · Esc 中止回覆", attachTitle: "附加檔案（任何類型，也可以貼上或拖曳）",
     pvPreview: "預覽", pvStop: "停止", pvDownload: "下載", pvMenu: "預覽選項", pvHtml: "HTML",
     pvAllowButton: "允許預覽", pvAllow: "允許預覽 HTML（預覽可能把資料傳出去）", pvDisallow: "不再允許預覽 HTML",
     pvConfirm: "要允許預覽 HTML 嗎？\n\n這會套用到你登入的每一台裝置。預覽會在隔離的框架裡執行 agent 的 HTML。它無法使用你的登入，但可能把資料傳出去，也可能讓這個分頁變慢或卡住。每次仍需要你按「預覽」。",

package/dist/ui/chat-thread.js

@@ -31,6 +31,12 @@ const COPY = '<svg class="icon" width="14" height="14" viewBox="0 0 24 24" fill=
 /** Escapes & " ' < >: safe for text and inside a quoted attribute. */
 export function escAttr(s) { return String(s == null ? "" : s).replace(/&/g, "&amp;").replace(/"/g, "&quot;").replace(/'/g, "&#39;").replace(/</g, "&lt;").replace(/>/g, "&gt;"); }
 export const msgKey = (x) => `${x.boot}-${x.id}`;
+/**
+ * Board 00ef2430: a thread opens with only its newest messages drawn — enough for a screen — so switching chats paints
+ * at once; the older ones are drawn after that, a chunk at a time between frames, the reader's place kept.
+ */
+export const THREAD_TAIL = 24;
+export const THREAD_CHUNK = 40;
 
 /**
  * Bind a renderer to `list` (the thread element) inside `scroller`. opts: { t, tf, isUser(x), onJump({show, unseen}),
@@ -47,6 +53,10 @@ export function createThread(list, scroller, opts) {
   // moves down or stays), and those must not count as the reader leaving the bottom. Reaching the bottom pins again.
   let pinned = true;
   let lastTop = 0;
+  // The oldest message drawn (by key): everything after it is drawn, so new messages never push the window. Null: none
+  // drawn yet — the next render draws the newest THREAD_TAIL and the rest follows (grow).
+  let firstKey = null;
+  let growTimer = null, growFrame = null, disposed = false;
   const cardRefresh = new WeakMap(); // card node → re-read availability (weak: a card that left takes its source with it)
   const tr = opts.t, trf = opts.tf;
   const stopIn = (node) => (P() ? P().stopIn(node) : []);
@@ -428,6 +438,44 @@ export function createThread(list, scroller, opts) {
   const ro = typeof ResizeObserver === "function" ? new ResizeObserver(resized) : null;
   if (ro) { ro.observe(list); ro.observe(scroller); }
 
+  /** Where drawing starts in `msgs`: at the oldest drawn message, or (none yet) the newest THREAD_TAIL. */
+  function startIndex() {
+    const i = firstKey === null ? -1 : msgs.findIndex((x) => msgKey(x) === firstKey);
+    // Whatever is drawn stays drawn: the list may have reordered (merged across fleet restarts) or lost its oldest to
+    // the cap — so the window starts at the earlier of the oldest drawn key and the first message still drawn.
+    const still = nodes.size ? msgs.findIndex((x) => nodes.has(msgKey(x))) : -1;
+    const at = [i, still].filter((n) => n >= 0);
+    return at.length ? Math.min(...at) : Math.max(0, msgs.length - THREAD_TAIL);
+  }
+  /** Draw the next chunk of older messages, keeping the reader where they were; then the next, until all are drawn. */
+  function grow() {
+    growTimer = growFrame = null;
+    if (disposed) return;                 // the chat left: nothing more is drawn
+    const at = startIndex();
+    if (at <= 0) return;
+    firstKey = msgKey(msgs[Math.max(0, at - THREAD_CHUNK)]);
+    const fromBottom = scroller.scrollHeight - scroller.scrollTop;
+    draw({ older: true });                // drawn above the reader: never "new below" (render alone counts those)
+    if (pinned) toBottom();
+    else { scroller.scrollTop = scroller.scrollHeight - fromBottom; lastTop = scroller.scrollTop; }
+    scheduleGrow();
+  }
+  /** After the next frame has painted (the click's own frame stays light), draw a chunk more. */
+  function scheduleGrow() {
+    if (growTimer !== null || growFrame !== null || startIndex() <= 0) return;
+    const later = () => { growFrame = null; growTimer = setTimeout(grow, 0); };
+    if (typeof requestAnimationFrame === "function") growFrame = requestAnimationFrame(later); else later();
+  }
+  /** Everything drawn now (a remembered scroll position, a message to show that is not drawn yet). */
+  function growAll() {
+    if (startIndex() <= 0) return;
+    if (growFrame !== null && typeof cancelAnimationFrame === "function") cancelAnimationFrame(growFrame);
+    if (growTimer !== null) clearTimeout(growTimer);
+    growTimer = growFrame = null;
+    firstKey = msgs.length ? msgKey(msgs[0]) : null;
+    draw({ older: true });
+  }
+
   /** Draw `next` (this instance's messages). `restore`: the scroll position to return to (null = the bottom). */
   function render(next, renderOpts = {}) {
     const stick = pinned || nearBottom();
@@ -435,24 +483,43 @@ export function createThread(list, scroller, opts) {
     if (!msgs.length) {
       for (const v of nodes.values()) stopIn(v.node);
       nodes.clear();
+      firstKey = null;
       armDay();
       list.textContent = "";
       opts.onEmpty(true);
       return;
     }
     opts.onEmpty(false);
-    const keep = new Set(msgs.map(msgKey));
+    // A position to return to that is not the bottom needs the messages above it: all of them, at once (as before).
+    if ("restore" in renderOpts && renderOpts.restore != null) firstKey = msgKey(msgs[0]);
+    const added = draw({});
+    if (firstKey === null || startIndex() > 0) { firstKey = msgKey(msgs[startIndex()]); scheduleGrow(); }
+    if ("restore" in renderOpts) {
+      unseen = 0;
+      if (renderOpts.restore == null) toBottom();
+      else { scroller.scrollTop = renderOpts.restore; pinned = nearBottom(); lastTop = scroller.scrollTop; }
+    } else if (stick) toBottom();
+    else unseen += added;
+    reportJump();
+  }
+  /** Put the messages from startIndex() on in the list (nodes reused when unchanged). Returns how many are new. */
+  function draw(drawOpts) {
+    const shown = msgs.slice(startIndex());
+    const keep = new Set(shown.map(msgKey));
     for (const [k, v] of nodes) if (!keep.has(k)) { stopIn(v.node); v.node.remove(); nodes.delete(k); }
     let prev = null, added = 0;
-    for (const x of msgs) {
-      const key = msgKey(x), html = msgHtml(x);
+    for (const x of shown) {
+      const key = msgKey(x);
       let have = nodes.get(key);
+      // Filling in older messages: a node drawn from this very message object is current — not drawn again.
+      if (drawOpts.older && have && have.x === x) { prev = have.node; continue; }
+      const html = msgHtml(x);
       if (!have || have.html !== html) {
         const stopped = have ? stopIn(have.node) : [];
         const node = msgNode(html, x, stopped);
         if (have) have.node.replaceWith(node); else added++;
-        have = { html, node }; nodes.set(key, have);
-      } else timeLabel(have.node);
+        have = { html, node, x }; nodes.set(key, have);
+      } else { have.x = x; timeLabel(have.node); }
       const want = prev ? prev.nextSibling : list.firstChild;
       // A node already in the list is being moved: its preview stops first. A new node (still in its template) has none.
       if (have.node !== want) { if (have.node.parentNode === list) stopIn(have.node); list.insertBefore(have.node, want); }
@@ -460,13 +527,7 @@ export function createThread(list, scroller, opts) {
     }
     armDay();
     armPolls();
-    if ("restore" in renderOpts) {
-      unseen = 0;
-      if (renderOpts.restore == null) toBottom();
-      else { scroller.scrollTop = renderOpts.restore; pinned = nearBottom(); lastTop = scroller.scrollTop; }
-    } else if (stick) toBottom();
-    else unseen += added;
-    reportJump();
+    return added;
   }
 
   function onScroll() {
@@ -481,6 +542,7 @@ export function createThread(list, scroller, opts) {
   function jumpLatest() { toBottom(); unseen = 0; reportJump(); }
   /** Show one message (the panel's "from …" link, #1481): scrolled into view and briefly marked. */
   function reveal(key) {
+    if (!nodes.has(key) && msgs.some((x) => msgKey(x) === key)) growAll();     // an older message not drawn yet
     const have = nodes.get(key); if (!have) return false;
     if (typeof have.node.scrollIntoView === "function") have.node.scrollIntoView({ block: "center" });
     have.node.classList.add("flash");
@@ -535,6 +597,7 @@ export function createThread(list, scroller, opts) {
 
   /** The thread goes (the chat left, or another instance opened): every preview in it stops first. */
   function dispose() {
+    disposed = true;
     if (ro) ro.disconnect();
     if (P()) P().stopAll("leave");
     nodes.clear();

package/dist/ui/panel-chat.js

@@ -322,6 +322,9 @@ function CommandCard({ name, lease }) {
         aria-label=${t("chat.cmdDismiss")} onClick=${() => store.dismissCommand(name)}><${Icon} name="close" size=${14} /></button>`}</div>
     ${c.error ? html`<p class="cmd-text">${c.error}</p>` : null}
     ${c.text ? html`<pre class="cmd-text">${c.text}</pre>` : null}
+    ${c.compact ? html`<p class="cmd-text cmd-phase">${c.compact === "running" ? t("chat.compactRunning")
+      : c.compact === "done" ? t("chat.compactDone") : c.compact === "timeout" ? t("chat.compactTimeout", "10")
+      : c.compact === "lost" ? t("chat.compactLost") : t("chat.compactUnknown")}</p>` : null}
     ${c.choices && c.choices.prompt ? html`<pre class="cmd-text">${c.choices.prompt}</pre>` : null}
     ${c.choices ? html`<div class="cmd-choices" role="group" aria-label=${t("chat.cmdChoose")}>${c.choices.options.map((o) => html`<button key=${o.id} type="button"
       class=${`btn btn-sm${o.id === c.choices.current ? " current" : ""}`} aria-current=${o.id === c.choices.current ? "true" : undefined} onClick=${() => run(o.id)}>${o.label}</button>`)}</div>` : null}
@@ -434,7 +437,7 @@ function Composer({ name, lease, busy }) {
     ${files.length ? html`<div class="pending-files">${files.map((f, i) => html`<${FileChip} key=${`${f.name}-${i}`} f=${f} i=${i} name=${name} />`)}</div>` : null}
     <div class="composer">
       <button id="attachBtn" type="button" class="icon-btn" title=${t("chat.attachTitle")} aria-label=${t("chat.attachTitle")} onClick=${() => fileIn.current && fileIn.current.click()}><${Icon} name="attach" /></button>
-      <input ref=${fileIn} type="file" multiple hidden accept="image/png,image/jpeg,image/gif,image/webp,application/pdf,text/*,.md,.csv,.json,.log,.yaml,.yml"
+      <input ref=${fileIn} type="file" multiple hidden
         onChange=${(e) => { store.addFiles(name, e.target.files); e.target.value = ""; }} />
       <textarea id="msgIn" ref=${input} rows="1" value=${value} placeholder=${t("chat.composerPlaceholder", name)} aria-label=${t("chat.composerPlaceholder", name)}
         autocomplete="off" aria-controls=${palette ? "cmdPalette" : undefined} aria-expanded=${palette ? "true" : "false"}

package/dist/ui/shared/app.css

@@ -1075,6 +1075,7 @@ strong.org-name { font-size: var(--fs-sm); color: var(--text); }
 .cmd-head { display: flex; align-items: center; justify-content: space-between; gap: var(--s-2); }
 .cmd-name { font-weight: var(--fw-semibold); }
 .cmd-text { margin: 0; white-space: pre-wrap; overflow-wrap: anywhere; font-family: var(--font-ui); color: var(--text-2); }
+.cmd-phase { color: var(--text); font-weight: var(--fw-semibold); }
 .cmd-choices { display: flex; flex-wrap: wrap; gap: var(--s-1); max-height: 180px; overflow-y: auto; }
 .cmd-choices .btn.current { border-color: var(--accent); color: var(--accent); }
 .quick-actions { display: flex; flex-wrap: wrap; align-items: center; gap: var(--s-2); margin-bottom: var(--s-2); font-size: var(--fs-xs); color: var(--text-2); }

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: [] };