@songsid/agend 2.3.0-beta.1 → 2.3.0-beta.11

package/dist/ui/shared/view-strings.js

@@ -40,6 +40,8 @@ register("view", {
   "usageMinutes": "{n} min",
   "usageHours": "{n} h",
   "usageRefresh": "Refresh",
+  "usageByAgent": "By agent →",
+  "usageByAgentTitle": "Each agent's tokens and API-equivalent (Fleet → Usage)",
   "usageHigh": "high",
   "usageNear": "near limit",
   "usageMoveUp": "Move up",
@@ -51,6 +53,16 @@ register("view", {
   "tooltipEffort": "Effort: {value}",
   "tooltipCost": "Cost: {value}",
   "tooltipUnavailable": "Unavailable",
+  "srcConfigured": " (configured)",
+  "srcFleetDefault": " (fleet default)",
+  "modelDefault": "default",
+  "modelDefaultWhy": "default ({reason})",
+  "modelCliDefault": "{model} (default)",
+  "modelWhyStart": "detected when it starts",
+  "modelWhyCli": "this CLI does not report a default",
+  "groupOther": "Other",
+  "groupTeam": "Team",
+  "groupTag": "Tag",
   "statusRunning": "Running",
   "statusPaused": "Paused",
   "statusStopped": "Stopped",
@@ -162,6 +174,9 @@ register("view", {
   "cardBio": "Bio (up to 280 characters, 3 line breaks)",
   "cardPortrait": "Portrait",
   "cardBanner": "Banner",
+  "cardBannerFocus": "Banner focus",
+  "cardBannerFocusNote": "What stays in view when the banner is cropped: the dashed area shows on every screen and card size; the yellow one is a phone's medium card.",
+  "cardFocusFollow": "Follow the agent's",
   "cardRemove": "Remove yours",
   "cardKeep": "Keep yours",
   "clearCard": "Clear card",
@@ -197,7 +212,25 @@ register("view", {
   "favUp": "Move {name} up",
   "favDown": "Move {name} down",
   "favFull": "Favorites are full ({max})",
-  "favFiltered": "Clear the filter to reorder favorites"
+  "favFiltered": "Clear the filter to reorder favorites",
+  "favSorted": "Favorites are sorted by last reply — set them back to your order to move them",
+  "replyJustNow": "just now",
+  "replyMinutes": "{n} min ago",
+  "replyHours": "{n} h ago",
+  "replyYesterday": "yesterday",
+  "replyDays": "{n} d ago",
+  "replyTitle": "Last replied: {time}",
+  "sortTitle": "Sort the list",
+  "sortCustom": "Custom",
+  "sortCustomHint": "Your own order (drag rows); replies never move them",
+  "sortRecent": "Recent replies",
+  "sortRecentHint": "No groups: the last reply first",
+  "sortFavs": "Favorites, in Recent replies",
+  "sortFavsFixed": "Pinned on top, in your order",
+  "sortFavsRecent": "Sorted by last reply too",
+  "recentOthers": "Recent replies first",
+  "pinnedCurrent": "Current",
+  "pinnedLabel": "The instance you have open"
  },
  "zh-TW": {
   "editProfile": "編輯個人資料",
@@ -235,6 +268,8 @@ register("view", {
   "usageMinutes": "{n} 分鐘",
   "usageHours": "{n} 小時",
   "usageRefresh": "重新整理",
+  "usageByAgent": "依 agent →",
+  "usageByAgentTitle": "每個 agent 的 token 與 API 等值（Fleet → 用量）",
   "usageHigh": "偏高",
   "usageNear": "接近上限",
   "usageMoveUp": "上移",
@@ -246,6 +281,16 @@ register("view", {
   "tooltipEffort": "推理強度：{value}",
   "tooltipCost": "費用：{value}",
   "tooltipUnavailable": "無資料",
+  "srcConfigured": "（設定值）",
+  "srcFleetDefault": "（fleet 預設）",
+  "modelDefault": "預設",
+  "modelDefaultWhy": "預設（{reason}）",
+  "modelCliDefault": "{model}（預設）",
+  "modelWhyStart": "啟動時偵測",
+  "modelWhyCli": "這個 CLI 不提供預設值",
+  "groupOther": "其他",
+  "groupTeam": "團隊",
+  "groupTag": "標籤",
   "statusRunning": "運行中",
   "statusPaused": "已暫停",
   "statusStopped": "已停止",
@@ -357,6 +402,9 @@ register("view", {
   "cardBio": "簡介（最多 280 個字、3 次換行）",
   "cardPortrait": "肖像",
   "cardBanner": "橫幅",
+  "cardBannerFocus": "橫幅焦點",
+  "cardBannerFocusNote": "橫幅被裁切時保留在畫面中的部分：虛線框在所有螢幕與卡片大小都看得到；黃色框是手機上中卡片的範圍。",
+  "cardFocusFollow": "跟隨 agent 的設定",
   "cardRemove": "移除你的",
   "cardKeep": "保留你的",
   "clearCard": "清除卡片",
@@ -392,6 +440,24 @@ register("view", {
   "favUp": "把 {name} 上移",
   "favDown": "把 {name} 下移",
   "favFull": "最愛已滿（{max} 個）",
-  "favFiltered": "清除篩選後才能調整最愛順序"
+  "favFiltered": "清除篩選後才能調整最愛順序",
+  "favSorted": "最愛目前依最近回覆排序；改回「照你的順序」才能移動",
+  "replyJustNow": "剛剛",
+  "replyMinutes": "{n} 分鐘前",
+  "replyHours": "{n} 小時前",
+  "replyYesterday": "昨天",
+  "replyDays": "{n} 天前",
+  "replyTitle": "最後回覆：{time}",
+  "sortTitle": "排序方式",
+  "sortCustom": "自訂",
+  "sortCustomHint": "你拖曳排好的順序，有回覆也不會跳動",
+  "sortRecent": "最近回覆",
+  "sortRecentHint": "不分組，最後回覆的在上面",
+  "sortFavs": "最愛（最近回覆模式時）",
+  "sortFavsFixed": "固定在最上面，照你的順序",
+  "sortFavsRecent": "也依最近回覆排序",
+  "recentOthers": "最近回覆在上",
+  "pinnedCurrent": "目前",
+  "pinnedLabel": "你目前開著的 instance"
  }
 });

package/dist/ui/shared/web-authorize.js

@@ -0,0 +1,151 @@
+// #1939 S2b (design §0.1): "Authorize this browser". The app shows this browser's state — verified (until when), a
+// Confirm card waiting in the account's Discord or Telegram DM (with its countdown), or why it can't be authorized here —
+// and asks for the card. The card itself is the gate: nothing here can authorize anything.
+import { html, useEffect, useRef, useState } from "./app-html.js";
+import { register, t } from "./app-i18n.js";
+import { guestPage } from "./app-store.js";
+
+register("webauth", {
+  en: {
+    verified: "Verified · speaks as you until {0}",
+    notVerified: "Not verified",
+    authorize: "Authorize this browser",
+    waiting: "Waiting for your Confirm in Discord or Telegram ({0})",
+    sent: "Sent — confirm it in your DM within 5 minutes.",
+    publicLink: "Not on the temporary public link: open the dashboard directly to authorize.",
+    reason_disabled: "Web authority is turned off.",
+    reason_loopback_only: "Only this computer can authorize, and this browser is not on it.",
+    reason_no_account: "This browser was not signed in as an account (agend web): sign in with /web to authorize.",
+    reason_not_admin: "Your account is not a fleet admin here.",
+    reason_not_admin_session: "Guests can't authorize.",
+    reason_token_rotated: "The dashboard's token changed: sign in again.",
+    reason_public_link: "Not on the temporary public link.",
+    reason_not_session: "Sign in to authorize.",
+    reason_other: "This browser can't be authorized here.",
+    refusal_pending: "A request is already waiting in your DM.",
+    refusal_rate_limited: "Three requests this hour — try again in {0} min.",
+    refusal_dm_unavailable: "Couldn't send you a DM. Open your DMs with the bot, then try again.",
+    refusal_other: "That didn't work: {0}",
+    settings: "Settings",
+  },
+  "zh-TW": {
+    verified: "已驗證 · 以你的身分發言到 {0}",
+    notVerified: "未驗證",
+    authorize: "授權這個瀏覽器",
+    waiting: "等你在 Discord 或 Telegram 按下確認（{0}）",
+    sent: "已送出——請在 5 分鐘內到私訊確認。",
+    publicLink: "臨時公開連結上無法授權：請直接開啟儀表板再授權。",
+    reason_disabled: "網頁授權已關閉。",
+    reason_loopback_only: "只有這台電腦可以授權，而這個瀏覽器不在這台電腦上。",
+    reason_no_account: "這個瀏覽器不是用帳號登入的（agend web）：請用 /web 登入後再授權。",
+    reason_not_admin: "你的帳號在這裡不是 fleet 管理者。",
+    reason_not_admin_session: "訪客無法授權。",
+    reason_token_rotated: "儀表板的 token 已變更：請重新登入。",
+    reason_public_link: "臨時公開連結上無法授權。",
+    reason_not_session: "登入後才能授權。",
+    reason_other: "這個瀏覽器在這裡無法授權。",
+    refusal_pending: "已經有一個請求在你的私訊中等待。",
+    refusal_rate_limited: "這一小時已請求三次——請 {0} 分鐘後再試。",
+    refusal_dm_unavailable: "無法私訊給你。請開放與 bot 的私訊後再試一次。",
+    refusal_other: "沒有成功：{0}",
+    settings: "設定",
+  },
+});
+const tn = (k, ...v) => t(`webauth.${k}`, ...v);
+const REASONS = ["disabled", "loopback_only", "no_account", "not_admin", "not_admin_session", "token_rotated", "public_link", "not_session"];
+// Until when: the time, with the day when it isn't today (an authorization lasts up to 48 h).
+const clock = (ms) => {
+  const d = new Date(ms), today = new Date().toDateString() === d.toDateString();
+  return today ? d.toLocaleTimeString([], { hour: "2-digit", minute: "2-digit" })
+    : d.toLocaleString([], { weekday: "short", month: "short", day: "numeric", hour: "2-digit", minute: "2-digit" });
+};
+const mmss = (ms) => { const s = Math.max(0, Math.ceil(ms / 1000)); return `${Math.floor(s / 60)}:${String(s % 60).padStart(2, "0")}`; };
+const publicLink = () => globalThis.document?.body?.dataset?.publicLink === "1";
+
+// One read per page load, shared by every line that shows it (the composer's, the session menu's): coming back to a chat
+// reads nothing (#1374). It is read again only after an ask, and while a card is pending.
+// An answer of any kind counts as this page's read (one that isn't a state hides the line); only a network failure lets a
+// later mount try again. Signed out (401: the session ended, e.g. Not me), the line goes.
+let shared = null, answered = false, inflight = null, signedOut = false;
+async function readStatus() {
+  inflight ??= (async () => {
+    try {
+      const r = await fetch("/ui/authorization", { credentials: "same-origin" });
+      answered = true;
+      if (r.status === 401) { signedOut = true; shared = null; }
+      const body = r.ok ? await r.json().catch(() => null) : null;
+      if (body && typeof body.state === "string") shared = body;
+    } catch { /* the line stays as it was; a later mount may try again */ }
+    finally { inflight = null; }
+    return shared;
+  })();
+  return inflight;
+}
+
+/** This browser's authorization, kept fresh while a card is pending (every 3 s, until it is decided or expires). */
+export function useWebAuthorization() {
+  const [st, setSt] = useState(shared), [notice, setNotice] = useState(null);
+  const [deadline, setDeadline] = useState(0), [now, setNow] = useState(() => Date.now());
+  const alive = useRef(true);
+  const load = async () => {
+    if (publicLink() || guestPage()) return;
+    const body = await readStatus();
+    if (!alive.current) return;
+    if (signedOut) { setSt(null); setNotice(null); return; }
+    if (!body) return;
+    setSt(body);
+    if (body.state !== "pending") setNotice((n) => (n === tn("sent") ? null : n));           // "Sent —" was about the card
+    if (body.state === "pending" && typeof body.expiresInMs === "number") setDeadline(Date.now() + body.expiresInMs);
+  };
+  useEffect(() => { alive.current = true; if (!answered) load(); return () => { alive.current = false; }; }, []);
+  useEffect(() => {
+    if (!st || st.state !== "pending") return undefined;
+    const tick = setInterval(() => setNow(Date.now()), 1000), poll = setInterval(load, 3000);
+    return () => { clearInterval(tick); clearInterval(poll); };
+  }, [st && st.state]);
+  // "Verified · until X" is read again at X (a page left open must not keep saying verified after it ends).
+  useEffect(() => {
+    if (!st || st.state !== "verified" || typeof st.until !== "number") return undefined;
+    const at = setTimeout(() => { resetWebAuthorization(); load(); }, Math.max(0, Math.min(st.until - Date.now() + 1000, 2 ** 31 - 1)));
+    return () => clearTimeout(at);
+  }, [st && st.state, st && st.until]);
+  const ask = async () => {
+    setNotice(null);
+    let r = null, body = null;
+    try { r = await fetch("/ui/authorization", { method: "POST", credentials: "same-origin", headers: { "content-type": "application/json" }, body: "{}" }); body = await r.json(); } catch { body = null; }
+    if (r && r.ok && body && body.ok) { setNotice(tn("sent")); setSt(shared = { state: "pending", expiresInMs: body.expiresInMs }); setDeadline(Date.now() + body.expiresInMs); return; }
+    const refusal = body && body.refusal;
+    if (refusal === "rate_limited") setNotice(tn("refusal_rate_limited", Math.max(1, Math.ceil((body.retryAfterMs || 0) / 60_000))));
+    else if (refusal === "pending" || refusal === "dm_unavailable") setNotice(tn(`refusal_${refusal}`));
+    else if (REASONS.includes(refusal)) setNotice(tn(`reason_${refusal}`));
+    else setNotice(tn("refusal_other", String(refusal || (r && r.status) || "?")));
+    load();
+  };
+  return { st, notice, ask, left: deadline - now };
+}
+
+/**
+ * Forget the page's one read, so the next line that mounts reads again: Settings → Web calls it when it shows (a revoke
+ * or a changed switch there changes what the line should say). Tests use it too: each case is its own page load.
+ */
+export function resetWebAuthorization() { shared = null; answered = false; inflight = null; signedOut = false; }
+
+/** The line under the composer: verified, waiting, or "Not verified" with the button (or why not, with the fix). */
+export function AuthorizeChip() {
+  const a = useWebAuthorization();
+  if (guestPage()) return null;
+  if (publicLink()) return html`<p class="webauth-chip note" data-state="public">${tn("publicLink")}</p>`;
+  if (!a.st) return null;
+  return html`<div class="webauth-chip" data-state=${a.st.state}>${body(a)}${a.notice ? html` <span class="note" role="status">${a.notice}</span>` : null}</div>`;
+}
+
+function body(a) {
+  const st = a.st;
+  if (st.state === "verified") return html`<span class="webauth-ok">✓ ${tn("verified", clock(st.until))}</span>`;
+  if (st.state === "pending") return html`<span class="note">${tn("waiting", mmss(a.left))}</span>`;
+  if (st.reason === "not_authorized" || st.reason === "authorization_expired")
+    return html`<span class="note">${tn("notVerified")} ·</span> <button type="button" class="btn btn-sm" onClick=${a.ask}>${tn("authorize")}</button>`;
+  const why = REASONS.includes(st.reason) ? tn(`reason_${st.reason}`) : tn("reason_other");
+  // The fix, where there is one the person can take here: the switch lives in Settings → Web.
+  return html`<span class="note">${tn("notVerified")}: ${why}</span>${st.reason === "disabled" || st.reason === "loopback_only" ? html` <a href="/settings/web">${tn("settings")}</a>` : null}`;
+}

package/dist/ui/signin.html

@@ -55,7 +55,7 @@
     <div id="msg" role="alert" aria-live="polite"></div>
     <div class="hint" data-i18n="hint">No code? Send /web in General, then press a sign-in button to get one.</div>
     <details class="help"><summary data-i18n="nobot">No chat bot?</summary><p data-i18n="nobot_body">Ask the operator to run <code>agend web --code</code> on the AgEnD computer.</p></details>
-    <details class="help"><summary data-i18n="safe">Page looks wrong after signing in?</summary><p data-i18n="safe_body">Your custom CSS may be hiding something. Add ?safe=1 to the end of the address to load the page without it, then fix it or turn it off in Settings → Appearance.</p></details>
+    <details class="help"><summary data-i18n="safe">Page looks wrong after signing in?</summary><p data-i18n="safe_body">Your custom CSS may be hiding something. Add ?safe=1 to the end of the address to load the page without it, then fix it or turn it off in Settings → Web appearance.</p></details>
   </form>
   <noscript>This page needs JavaScript to sign you in.</noscript>
 </main>

package/dist/ui/web-terminal/terminal.css

@@ -1,4 +1,4 @@
-html, body { margin: 0; height: 100%; background: #111; color: #ddd; font: 14px system-ui, sans-serif; }
+html, body { margin: 0; height: 100%; background: #111; color: #ddd; font: 14px system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji", emoji; }
 body { display: flex; flex-direction: column; }
 #bar { display: flex; align-items: center; gap: 12px; padding: 6px 10px; background: #1c1c1c; border-bottom: 1px solid #333; }
 #bar #title { font-weight: 600; }
@@ -6,18 +6,18 @@ body { display: flex; flex-direction: column; }
 #bar button { background: #402; color: #fbb; border: 1px solid #733; border-radius: 4px; padding: 3px 10px; cursor: pointer; }
 #gate { max-width: 560px; margin: 40px auto; padding: 0 16px; line-height: 1.5; }
 #gate form { display: flex; gap: 8px; margin-top: 12px; }
-#gate input { flex: 1; font: 16px ui-monospace, monospace; letter-spacing: 1px; padding: 8px; background: #000; color: #fff; border: 1px solid #555; border-radius: 4px; }
+#gate input { flex: 1; font: 16px ui-monospace, monospace, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji", emoji; letter-spacing: 1px; padding: 8px; background: #000; color: #fff; border: 1px solid #555; border-radius: 4px; }
 #gate button { padding: 8px 16px; background: #246; color: #fff; border: 0; border-radius: 4px; cursor: pointer; }
 #gate-msg { color: #f88; min-height: 1.5em; }
 #term { flex: 1; min-height: 0; padding: 4px; overflow: hidden; }  /* never drawn over the rows below it (#1242) */
 #code-row { display: flex; flex-wrap: wrap; align-items: center; gap: 8px; padding: 8px 10px; background: #1c1c1c; border-top: 1px solid #333; }
 #code-row[hidden] { display: none; }
-#code-row input { flex: 1; min-width: 12em; font: 16px ui-monospace, monospace; padding: 8px; background: #000; color: #fff; border: 1px solid #555; border-radius: 4px; }
+#code-row input { flex: 1; min-width: 12em; font: 16px ui-monospace, monospace, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji", emoji; padding: 8px; background: #000; color: #fff; border: 1px solid #555; border-radius: 4px; }
 #code-row button { padding: 8px 16px; background: #246; color: #fff; border: 0; border-radius: 4px; cursor: pointer; }
 #code-msg { color: #9ad; min-height: 1.2em; }
 #code-hint { flex-basis: 100%; margin: 0; color: #aaa; font-size: 13px; }
 #keys { display: flex; flex-wrap: wrap; gap: 6px; padding: 6px; background: #1c1c1c; border-top: 1px solid #333; }
-#keys button { background: #222; color: #ddd; border: 1px solid #444; border-radius: 4px; padding: 6px 10px; font: 14px ui-monospace, monospace; cursor: pointer; }
+#keys button { background: #222; color: #ddd; border: 1px solid #444; border-radius: 4px; padding: 6px 10px; font: 14px ui-monospace, monospace, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji", emoji; cursor: pointer; }
 #done { padding: 10px; background: #1c1c1c; border-top: 1px solid #333; }
 #done.ok { color: #8d8; } #done.bad { color: #f88; }
 @media (min-width: 900px) { #keys { display: none; } }

package/dist/usage/providers.d.ts

@@ -34,6 +34,8 @@ export interface UsageMetric {
 export interface ProviderUsage {
     id: string;
     name: string;
+    /** #2014: the credential profile this row reads (its `name` ends in ` (<profile>)`); the page shows it on its own line. */
+    profile?: string;
     status: "ok" | "error" | "no-credentials";
     /** A non-metered subscription whose entitlement is unlimited (not 0/100%). */
     unlimited?: boolean;
@@ -155,6 +157,8 @@ interface AgyBucket {
     remainingFraction?: number;
     resetTime?: string;
     group?: string;
+    /** Not on the summary's wire: the model's `modelProvider` (MODEL_PROVIDER_GOOGLE …), copied on by agyModelBuckets. */
+    provider?: string;
 }
 interface AgyQuotaSummary {
     groups?: {
@@ -166,6 +170,28 @@ interface AgyQuotaSummary {
 /** 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[];
+/** `fetchAvailableModels`: each model's own quota (agy's proto: ModelDetails.quotaInfo). */
+interface AgyModels {
+    models?: Record<string, {
+        displayName?: string;
+        modelProvider?: string;
+        quotaInfo?: {
+            remainingFraction?: number;
+            resetTime?: string;
+        };
+    }>;
+}
+/**
+ * Each model's quota as a per-model bucket. Only models with a reset time count: agy's internal models (tab completion,
+ * `chat_…`) report a bare 1 with none, which is no limit anyone runs into.
+ */
+export declare function agyModelBuckets(body: AgyModels): AgyBucket[];
+/**
+ * The buckets to show: the summary's, then — for each pool the summary does not name — the models' own quotas
+ * (#2174). agy 1.4 (2026-10-19, this machine's live account) answered the summary with only the "Claude and GPT
+ * models" group while every Gemini model still had a quota of its own, so the Gemini pool vanished from the row.
+ */
+export declare function agyUsageBuckets(summary: AgyQuotaSummary, models: AgyModels | null): AgyBucket[];
 /**
  * Pool the summary's buckets into one metric per pool and limit.
  *
@@ -197,6 +223,7 @@ interface AgyStoredToken {
  * uses) is read alongside `expiry` (RFC3339) for the same reason.
  */
 export declare function readAgyToken(file: unknown): AgyStoredToken;
+export declare function fetchAntigravityUsage(): Promise<Omit<ProviderUsage, "id" | "name">>;
 /**
  * When the soonest of the still-available reset tickets expires (#1244): min(expires_at) over the tickets whose status
  * is "available", skipping ones with no expiry or one already past. null when there is none — or when the list cannot
@@ -221,6 +248,7 @@ export declare function fetchKiroUsage(storeHome?: string): Promise<Omit<Provide
 type UsageProvider = {
     id: string;
     name: string;
+    profile?: string;
     fetch: (storeHome?: string, scope?: ClaudeUsageScope) => Promise<Omit<ProviderUsage, "id" | "name">>;
 };
 type UsageFleetConfig = Parameters<typeof listConfiguredProfiles>[0];

package/dist/usage/providers.js

@@ -555,13 +555,39 @@ 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 ?? []);
 }
+/**
+ * Each model's quota as a per-model bucket. Only models with a reset time count: agy's internal models (tab completion,
+ * `chat_…`) report a bare 1 with none, which is no limit anyone runs into.
+ */
+export function agyModelBuckets(body) {
+    return Object.entries(body.models ?? {}).flatMap(([id, m]) => m?.quotaInfo?.resetTime
+        ? [{ bucketId: id, remainingFraction: m.quotaInfo.remainingFraction, resetTime: m.quotaInfo.resetTime, provider: m.modelProvider }]
+        : []);
+}
+/**
+ * The buckets to show: the summary's, then — for each pool the summary does not name — the models' own quotas
+ * (#2174). agy 1.4 (2026-10-19, this machine's live account) answered the summary with only the "Claude and GPT
+ * models" group while every Gemini model still had a quota of its own, so the Gemini pool vanished from the row.
+ */
+export function agyUsageBuckets(summary, models) {
+    const fromSummary = agyQuotaBuckets(summary);
+    const named = new Set(fromSummary.map(b => { const id = agyBucketId(b); return id ? agyPool(b, id) : null; }));
+    return [...fromSummary, ...(models ? agyModelBuckets(models).filter(b => !named.has(agyPool(b, b.bucketId))) : [])];
+}
+function agyBucketId(b) {
+    return b.bucketId?.trim() || (b.group ? b.displayName?.trim() : undefined);
+}
 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. */
+/**
+ * The pool a bucket belongs to: its group when the summary names one (#1898), else its model's provider, else its id.
+ * One nobody recognises is a pool of its own under its own name — never folded into another, so a vendor rename shows
+ * up as a new row instead of hiding one (#2174).
+ */
 function agyPool(b, id) {
     const pooled = AGY_POOLED[id];
     if (pooled)
@@ -574,7 +600,20 @@ function agyPool(b, id) {
             return "Claude & others";
         return group;
     }
-    return id.startsWith("gemini") ? "Gemini" : "Claude & others";
+    const provider = b.provider?.replace(/^MODEL_PROVIDER_/, "");
+    if (provider) {
+        if (provider === "GOOGLE")
+            return "Gemini";
+        if (provider === "ANTHROPIC" || provider === "OPENAI")
+            return "Claude & others";
+        if (provider !== "UNSPECIFIED")
+            return provider.replace(/_/g, " ");
+    }
+    if (/^gemini/i.test(id))
+        return "Gemini";
+    if (/^(claude|gpt|3p)\b/i.test(id))
+        return "Claude & others";
+    return id;
 }
 /** The limit a bucket counts against ("Five Hour Limit", window "5h" …), or null for a per-model bucket. */
 function agyWindow(b, id) {
@@ -626,7 +665,7 @@ function agyLabel(pool, window) {
 export function agyPoolMetrics(buckets) {
     const entries = new Map();
     for (const b of buckets) {
-        const id = b.bucketId?.trim() || (b.group ? b.displayName?.trim() : undefined);
+        const id = agyBucketId(b);
         if (!id || b.disabled === true || typeof b.remainingFraction !== "number" || !Number.isFinite(b.remainingFraction))
             continue;
         const pool = agyPool(b, id);
@@ -737,7 +776,48 @@ async function agyAccessToken() {
         return { error: "Could not reach oauth2.googleapis.com.", errorI18n: i18n("usage.error.unreachable", "oauth2.googleapis.com") };
     }
 }
-async function fetchAntigravityUsage() {
+/**
+ * The models' own quotas (`fetchAvailableModels`, the list agy's model picker reads), from the same base as the
+ * summary. Only what the summary leaves out is taken from it, so a failure here costs nothing: null. Optional, so it
+ * never costs the row the summary already in hand (#2176 review, as the Codex ticket list, #1246): once the summary
+ * has answered it gets only what is left before the provider deadline, less a margin, and is then cancelled.
+ */
+const AGY_MODELS_DEADLINE_MARGIN_MS = 1_000;
+function agyModels(base, token) {
+    const abort = new AbortController();
+    const result = (async () => {
+        const res = await fetch(`${base}/v1internal:fetchAvailableModels`, {
+            method: "POST",
+            headers: { Authorization: `Bearer ${token}`, "Content-Type": "application/json", "User-Agent": "antigravity" },
+            body: "{}",
+            signal: AbortSignal.any([abort.signal, AbortSignal.timeout(LONGEST_SINGLE_FETCH_MS)]),
+        });
+        if (!res.ok)
+            return null;
+        const body = await res.json();
+        return body && typeof body === "object" ? body : null;
+    })().catch(() => null);
+    return {
+        cancel: () => abort.abort(),
+        async within(budgetMs) {
+            // No time left: an answer already in hand still counts (it settles first), nothing is waited for.
+            if (!(budgetMs > 0))
+                return Promise.race([result, Promise.resolve(null)]);
+            let timer;
+            // The timer settles the race, so a fetch that ignores its signal cannot hold the row; the caller then cancels it.
+            const timedOut = new Promise(resolve => { timer = setTimeout(() => resolve(null), budgetMs); });
+            try {
+                return await Promise.race([result, timedOut]);
+            }
+            finally {
+                clearTimeout(timer);
+            }
+        },
+    };
+}
+export async function fetchAntigravityUsage() {
+    // Monotonic: the deadline the models' budget is measured against is a timer, which a wall-clock change does not move.
+    const startedAt = performance.now();
     // A CLI-observed rate limit outranks anything the quota API says. The bucket
     // summary cannot see the account-level individual cap: verified live, it
     // reported every bucket 0% used in the same minute the CLI was refusing work
@@ -763,38 +843,47 @@ async function fetchAntigravityUsage() {
     if ("error" in auth)
         return { status: "error", error: auth.error, errorI18n: auth.errorI18n, metrics: [] };
     for (const base of AGY_CLOUDCODE_URLS) {
-        let res;
+        // Alongside the summary, not after it: one more round trip in the chain would push a slow-but-healthy pair past
+        // the provider deadline. Cancelled when the summary fails (it never rejects).
+        const models = agyModels(base, auth.token);
         try {
-            res = await fetch(`${base}/v1internal:retrieveUserQuotaSummary`, {
-                method: "POST",
-                headers: {
-                    Authorization: `Bearer ${auth.token}`,
-                    "Content-Type": "application/json",
-                    "User-Agent": "antigravity",
-                },
-                body: "{}",
-                signal: AbortSignal.timeout(LONGEST_SINGLE_FETCH_MS),
-            });
-        }
-        catch {
-            continue;
-        }
-        if (res.status === 401 || res.status === 403) {
-            return { status: "error", error: "Token rejected. Run `agy` once to refresh the login.", errorI18n: i18n("usage.error.token_rejected", "agy"), metrics: [] };
-        }
-        if (!res.ok)
-            continue; // try the other base
-        let body;
-        try {
-            body = await res.json();
+            let res;
+            try {
+                res = await fetch(`${base}/v1internal:retrieveUserQuotaSummary`, {
+                    method: "POST",
+                    headers: {
+                        Authorization: `Bearer ${auth.token}`,
+                        "Content-Type": "application/json",
+                        "User-Agent": "antigravity",
+                    },
+                    body: "{}",
+                    signal: AbortSignal.timeout(LONGEST_SINGLE_FETCH_MS),
+                });
+            }
+            catch {
+                continue;
+            }
+            if (res.status === 401 || res.status === 403) {
+                return { status: "error", error: "Token rejected. Run `agy` once to refresh the login.", errorI18n: i18n("usage.error.token_rejected", "agy"), metrics: [] };
+            }
+            if (!res.ok)
+                continue; // try the other base
+            let body;
+            try {
+                body = await res.json();
+            }
+            catch {
+                continue;
+            }
+            const budgetMs = providerDeadlineMs - (performance.now() - startedAt) - AGY_MODELS_DEADLINE_MARGIN_MS;
+            const metrics = agyPoolMetrics(agyUsageBuckets(body ?? {}, await models.within(budgetMs)));
+            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: [] };
         }
-        catch {
-            continue;
+        finally {
+            models.cancel(); // a base given up on, or a read already settled: nothing left to wait for
         }
-        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: [] };
     }
     return { status: "error", error: "Could not reach the Cloud Code quota endpoints.", errorI18n: i18n("usage.error.unreachable", "Cloud Code quota endpoints"), metrics: [] };
 }
@@ -1458,6 +1547,7 @@ export function providersForConfig(config, base = DEFAULT_PROVIDERS) {
         rows.push(...profiles.map(profile => ({
             id: `${provider.id}:${profile}`,
             name: `${provider.name} (${profile})`,
+            profile,
             fetch: () => provider.fetch(credentialProfileStoreHome(getAgendHome(), backendName, profile), { profile }),
         })));
         return rows;
@@ -1644,16 +1734,16 @@ export async function fetchAllUsage(config) {
                 // Fail soft: this row says it could not be read, the rest still answer,
                 // and the snapshot returns in bounded time.
                 return {
-                    id: p.id, name: p.name, status: "error",
+                    id: p.id, name: p.name, ...(p.profile ? { profile: p.profile } : {}), status: "error",
                     error: `Could not reach ${p.name}.`,
                     errorI18n: i18n("usage.error.unreachable", p.name),
                     metrics: [],
                 };
             }
-            return { id: p.id, name: p.name, ...outcome };
+            return { id: p.id, name: p.name, ...(p.profile ? { profile: p.profile } : {}), ...outcome };
         }
         catch (err) {
-            return { id: p.id, name: p.name, status: "error", error: String(err?.message ?? err), metrics: [] };
+            return { id: p.id, name: p.name, ...(p.profile ? { profile: p.profile } : {}), status: "error", error: String(err?.message ?? err), metrics: [] };
         }
     }));
     return {