@songsid/agend 2.1.5 → 2.1.6-beta.10

package/dist/ui/view.html

@@ -211,7 +211,7 @@
       "usage.metric.overage_charges": "Overage charges", "usage.metric.pay_per_use": "Pay-per-use",
       "usage.metric.usage_monthly": "Usage (monthly)",
       "usage.unit.available": "available", "usage.unit.credits": "credits",
-      "usage.value.disabled": "Disabled", "usage.value.cap": "{0} cap",
+      "usage.value.disabled": "Disabled", "usage.value.cap": "{0} cap", "usage.value.unlimited": "♾️ Unlimited",
       "usage.note.binding": "binding", "usage.note.binding_severity": "binding · {0}",
       "usage.note.busiest_model": "busiest of {0} model", "usage.note.busiest_models": "busiest of {0} models",
       "usage.note.used_limit_unit": "{0} / {1} {2}", "usage.note.bonus_codes": "{0} / {1} {2} · {3} codes",
@@ -274,7 +274,7 @@
       "usage.metric.overage_charges": "超額費用", "usage.metric.pay_per_use": "隨用隨付",
       "usage.metric.usage_monthly": "用量（每月）",
       "usage.unit.available": "可用", "usage.unit.credits": "額度",
-      "usage.value.disabled": "已停用", "usage.value.cap": "上限 {0}",
+      "usage.value.disabled": "已停用", "usage.value.cap": "上限 {0}", "usage.value.unlimited": "♾️ 無限",
       "usage.note.binding": "生效", "usage.note.binding_severity": "生效 · {0}",
       "usage.note.busiest_model": "{0} 個模型中用量最高者", "usage.note.busiest_models": "{0} 個模型中用量最高者",
       "usage.note.used_limit_unit": "{0} / {1} {2}", "usage.note.bonus_codes": "{0} / {1} {2} · {3} 組代碼",

package/dist/usage/i18n-keys.d.ts

@@ -3,5 +3,5 @@
  * Keep this list explicit: the parity test rejects a key missing from either
  * locale surface before a mixed-language release can ship.
  */
-export declare const USAGE_I18N_KEYS: readonly ["usage.title", "usage.title_plain", "usage.empty_active", "usage.not_logged_in", "usage.error_fallback", "usage.no_data", "usage.reset.in", "usage.reset.soon", "usage.duration.days_hours", "usage.duration.hours_minutes", "usage.duration.minutes", "usage.metric.session", "usage.metric.weekly", "usage.metric.monthly", "usage.metric.days_window", "usage.metric.named", "usage.metric.named_session", "usage.metric.named_weekly", "usage.metric.named_monthly", "usage.metric.named_days", "usage.metric.extra_usage", "usage.metric.rate_limit_resets", "usage.metric.credits", "usage.metric.weekly_limit", "usage.metric.pay_as_you_go", "usage.metric.bonus_credits", "usage.metric.overage_charges", "usage.metric.pay_per_use", "usage.unit.available", "usage.unit.credits", "usage.metric.usage_monthly", "usage.note.used_limit_unit", "usage.note.bonus_codes", "usage.value.disabled", "usage.value.cap", "usage.note.binding", "usage.note.binding_severity", "usage.note.busiest_model", "usage.note.busiest_models", "usage.metric.agy_claude_others", "usage.metric.agy_claude_others_session", "usage.metric.agy_claude_others_weekly", "usage.hint.statusline_now", "usage.hint.statusline_minutes", "usage.hint.claude_api_key", "usage.hint.login_claude", "usage.hint.login_agy", "usage.hint.no_quota", "usage.hint.login_codex", "usage.hint.codex_no_oauth", "usage.hint.login_grok", "usage.hint.grok_no_login", "usage.hint.login_kiro", "usage.hint.kiro_signed_out", "usage.hint.token_refreshing", "usage.hint.subscription_no_credit", "usage.hint.no_quota_account", "usage.error.unreachable", "usage.error.token_rejected", "usage.error.rate_limited", "usage.error.http", "usage.error.billing_http", "usage.error.invalid_response", "usage.error.invalid_billing_response", "usage.error.invalid_kiro_response", "usage.error.claude_token_expired", "usage.error.codex_token_expired", "usage.error.grok_expired", "usage.error.grok_response_changed", "usage.error.agy_cap", "usage.error.agy_no_refresh", "usage.error.agy_token_expired", "usage.error.agy_login_expired", "usage.error.agy_refresh_empty", "usage.error.grok_auth_readonly", "usage.error.grok_no_refresh", "usage.error.grok_refresh_unreachable", "usage.error.grok_invalid_refresh", "usage.error.grok_persist"];
+export declare const USAGE_I18N_KEYS: readonly ["usage.title", "usage.title_plain", "usage.empty_active", "usage.not_logged_in", "usage.error_fallback", "usage.no_data", "usage.reset.in", "usage.reset.soon", "usage.duration.days_hours", "usage.duration.hours_minutes", "usage.duration.minutes", "usage.metric.session", "usage.metric.weekly", "usage.metric.monthly", "usage.metric.days_window", "usage.metric.named", "usage.metric.named_session", "usage.metric.named_weekly", "usage.metric.named_monthly", "usage.metric.named_days", "usage.metric.extra_usage", "usage.metric.rate_limit_resets", "usage.metric.credits", "usage.metric.weekly_limit", "usage.metric.pay_as_you_go", "usage.metric.bonus_credits", "usage.metric.overage_charges", "usage.metric.pay_per_use", "usage.unit.available", "usage.unit.credits", "usage.metric.usage_monthly", "usage.note.used_limit_unit", "usage.note.bonus_codes", "usage.value.disabled", "usage.value.cap", "usage.value.unlimited", "usage.note.binding", "usage.note.binding_severity", "usage.note.busiest_model", "usage.note.busiest_models", "usage.metric.agy_claude_others", "usage.metric.agy_claude_others_session", "usage.metric.agy_claude_others_weekly", "usage.hint.statusline_now", "usage.hint.statusline_minutes", "usage.hint.claude_api_key", "usage.hint.login_claude", "usage.hint.login_agy", "usage.hint.no_quota", "usage.hint.login_codex", "usage.hint.codex_no_oauth", "usage.hint.login_grok", "usage.hint.grok_no_login", "usage.hint.login_kiro", "usage.hint.kiro_signed_out", "usage.hint.token_refreshing", "usage.hint.subscription_no_credit", "usage.hint.no_quota_account", "usage.error.unreachable", "usage.error.token_rejected", "usage.error.rate_limited", "usage.error.http", "usage.error.billing_http", "usage.error.invalid_response", "usage.error.invalid_billing_response", "usage.error.invalid_kiro_response", "usage.error.claude_token_expired", "usage.error.codex_token_expired", "usage.error.grok_expired", "usage.error.grok_response_changed", "usage.error.agy_cap", "usage.error.agy_no_refresh", "usage.error.agy_token_expired", "usage.error.agy_login_expired", "usage.error.agy_refresh_empty", "usage.error.grok_auth_readonly", "usage.error.grok_no_refresh", "usage.error.grok_refresh_unreachable", "usage.error.grok_invalid_refresh", "usage.error.grok_persist"];
 export type UsageI18nKey = typeof USAGE_I18N_KEYS[number];

package/dist/usage/i18n-keys.js

@@ -14,7 +14,7 @@ export const USAGE_I18N_KEYS = [
     "usage.metric.pay_as_you_go", "usage.metric.bonus_credits", "usage.metric.overage_charges",
     "usage.metric.pay_per_use", "usage.unit.available", "usage.unit.credits",
     "usage.metric.usage_monthly", "usage.note.used_limit_unit", "usage.note.bonus_codes",
-    "usage.value.disabled", "usage.value.cap", "usage.note.binding",
+    "usage.value.disabled", "usage.value.cap", "usage.value.unlimited", "usage.note.binding",
     "usage.note.binding_severity", "usage.note.busiest_model", "usage.note.busiest_models",
     "usage.metric.agy_claude_others", "usage.metric.agy_claude_others_session", "usage.metric.agy_claude_others_weekly",
     "usage.hint.statusline_now", "usage.hint.statusline_minutes", "usage.hint.claude_api_key",

package/dist/usage/i18n-keys.js.map

@@ -1 +1 @@
-{"version":3,"file":"i18n-keys.js","sourceRoot":"","sources":["../../src/usage/i18n-keys.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG;IAC7B,aAAa,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,qBAAqB;IAC/E,sBAAsB,EAAE,eAAe,EAAE,gBAAgB,EAAE,kBAAkB;IAC7E,2BAA2B,EAAE,8BAA8B,EAAE,wBAAwB;IACrF,sBAAsB,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,0BAA0B;IACjG,oBAAoB,EAAE,4BAA4B,EAAE,2BAA2B;IAC/E,4BAA4B,EAAE,yBAAyB,EAAE,0BAA0B;IACnF,gCAAgC,EAAE,sBAAsB,EAAE,2BAA2B;IACrF,4BAA4B,EAAE,4BAA4B,EAAE,8BAA8B;IAC1F,0BAA0B,EAAE,sBAAsB,EAAE,oBAAoB;IACxE,4BAA4B,EAAE,4BAA4B,EAAE,wBAAwB;IACpF,sBAAsB,EAAE,iBAAiB,EAAE,oBAAoB;IAC/D,6BAA6B,EAAE,0BAA0B,EAAE,2BAA2B;IACtF,gCAAgC,EAAE,wCAAwC,EAAE,uCAAuC;IACnH,2BAA2B,EAAE,+BAA+B,EAAE,2BAA2B;IACzF,yBAAyB,EAAE,sBAAsB,EAAE,qBAAqB;IACxE,wBAAwB,EAAE,2BAA2B,EAAE,uBAAuB;IAC9E,0BAA0B,EAAE,uBAAuB,EAAE,4BAA4B;IACjF,6BAA6B,EAAE,mCAAmC,EAAE,6BAA6B;IACjG,yBAAyB,EAAE,4BAA4B,EAAE,0BAA0B;IACnF,kBAAkB,EAAE,0BAA0B,EAAE,8BAA8B;IAC9E,sCAAsC,EAAE,mCAAmC;IAC3E,kCAAkC,EAAE,iCAAiC;IACrE,0BAA0B,EAAE,mCAAmC,EAAE,qBAAqB;IACtF,4BAA4B,EAAE,+BAA+B,EAAE,+BAA+B;IAC9F,+BAA+B,EAAE,gCAAgC,EAAE,6BAA6B;IAChG,sCAAsC,EAAE,kCAAkC,EAAE,0BAA0B;CAC9F,CAAC"}
+{"version":3,"file":"i18n-keys.js","sourceRoot":"","sources":["../../src/usage/i18n-keys.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG;IAC7B,aAAa,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,qBAAqB;IAC/E,sBAAsB,EAAE,eAAe,EAAE,gBAAgB,EAAE,kBAAkB;IAC7E,2BAA2B,EAAE,8BAA8B,EAAE,wBAAwB;IACrF,sBAAsB,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,0BAA0B;IACjG,oBAAoB,EAAE,4BAA4B,EAAE,2BAA2B;IAC/E,4BAA4B,EAAE,yBAAyB,EAAE,0BAA0B;IACnF,gCAAgC,EAAE,sBAAsB,EAAE,2BAA2B;IACrF,4BAA4B,EAAE,4BAA4B,EAAE,8BAA8B;IAC1F,0BAA0B,EAAE,sBAAsB,EAAE,oBAAoB;IACxE,4BAA4B,EAAE,4BAA4B,EAAE,wBAAwB;IACpF,sBAAsB,EAAE,iBAAiB,EAAE,uBAAuB,EAAE,oBAAoB;IACxF,6BAA6B,EAAE,0BAA0B,EAAE,2BAA2B;IACtF,gCAAgC,EAAE,wCAAwC,EAAE,uCAAuC;IACnH,2BAA2B,EAAE,+BAA+B,EAAE,2BAA2B;IACzF,yBAAyB,EAAE,sBAAsB,EAAE,qBAAqB;IACxE,wBAAwB,EAAE,2BAA2B,EAAE,uBAAuB;IAC9E,0BAA0B,EAAE,uBAAuB,EAAE,4BAA4B;IACjF,6BAA6B,EAAE,mCAAmC,EAAE,6BAA6B;IACjG,yBAAyB,EAAE,4BAA4B,EAAE,0BAA0B;IACnF,kBAAkB,EAAE,0BAA0B,EAAE,8BAA8B;IAC9E,sCAAsC,EAAE,mCAAmC;IAC3E,kCAAkC,EAAE,iCAAiC;IACrE,0BAA0B,EAAE,mCAAmC,EAAE,qBAAqB;IACtF,4BAA4B,EAAE,+BAA+B,EAAE,+BAA+B;IAC9F,+BAA+B,EAAE,gCAAgC,EAAE,6BAA6B;IAChG,sCAAsC,EAAE,kCAAkC,EAAE,0BAA0B;CAC9F,CAAC"}

package/dist/usage/providers.d.ts

@@ -1,3 +1,5 @@
+import { listConfiguredProfiles } from "../backend/credential-profile.js";
+import { type KiroStoredToken } from "../backend/kiro-auth-store.js";
 import { type StatuslineRateLimits } from "./statusline-usage.js";
 import type { UsageI18nKey } from "./i18n-keys.js";
 export interface UsageMetric {
@@ -22,6 +24,8 @@ export interface ProviderUsage {
     id: string;
     name: string;
     status: "ok" | "error" | "no-credentials";
+    /** A non-metered subscription whose entitlement is unlimited (not 0/100%). */
+    unlimited?: boolean;
     plan?: string | null;
     error?: string;
     errorI18n?: UsageI18nRef;
@@ -118,17 +122,8 @@ interface AgyStoredToken {
  * uses) is read alongside `expiry` (RFC3339) for the same reason.
  */
 export declare function readAgyToken(file: unknown): AgyStoredToken;
-export declare function fetchCodexUsage(): Promise<Omit<ProviderUsage, "id" | "name">>;
-interface KiroToken {
-    access_token?: string;
-    expires_at?: string;
-    region?: string;
-    profile_arn?: string;
-    /** IAM Identity Center portal URL — present only for Q Developer Pro logins. */
-    start_url?: string;
-    /** Social login provider (google/github/…) — present only for free-tier logins. */
-    provider?: string;
-}
+export declare function fetchCodexUsage(storeHome?: string): Promise<Omit<ProviderUsage, "id" | "name">>;
+type KiroToken = KiroStoredToken;
 /**
  * Which Kiro login is in use. Verified against a real kiro-cli auth store:
  * - IAM Identity Center (Amazon Q Developer Pro) tokens carry `start_url`
@@ -141,12 +136,26 @@ interface KiroToken {
 export type KiroAuthKind = "q-developer-pro" | "builder-id";
 export declare function kiroAuthKind(token: KiroToken): KiroAuthKind;
 /** Exported for tests: the Q-Pro and expired paths return without any network call. */
-export declare function fetchKiroUsage(): Promise<Omit<ProviderUsage, "id" | "name">>;
+export declare function fetchKiroUsage(storeHome?: string): Promise<Omit<ProviderUsage, "id" | "name">>;
 type UsageProvider = {
     id: string;
     name: string;
-    fetch: () => Promise<Omit<ProviderUsage, "id" | "name">>;
+    fetch: (storeHome?: string) => Promise<Omit<ProviderUsage, "id" | "name">>;
 };
+type UsageFleetConfig = Parameters<typeof listConfiguredProfiles>[0];
+/** Read the daemon-written, token-free Muse relay snapshot for active Muse instances. */
+export declare function fetchMuseUsage(): Promise<Omit<ProviderUsage, "id" | "name">>;
+/**
+ * One row per subscription, not one row per backend.
+ *
+ * A fleet running two kiro/codex logins has two quotas, and a single row could
+ * only ever show one of them — or worse, add them together and show a number
+ * that is true of neither. Each effective credential profile reads its own
+ * store and gets its own row; a mixed fleet also keeps one row for effective
+ * legacy shared bindings. Instance-private homes are never scanned: their
+ * auth files point at these same logical sources.
+ */
+export declare function providersForConfig(config: UsageFleetConfig, base?: UsageProvider[]): UsageProvider[];
 /** Test seam: a provider that hangs cannot be simulated with real vendors. */
 export declare function setUsageProvidersForTests(providers: UsageProvider[] | null): void;
 /**
@@ -183,7 +192,7 @@ export declare const LONGEST_SINGLE_FETCH_MS = 15000;
 export declare function setUsageProviderDeadlineForTests(ms: number | null): void;
 /** Fetch every provider in parallel. Providers without local credentials are
  * skipped (per the panel's contract: absent CLIs simply don't show). */
-export declare function fetchAllUsage(): Promise<{
+export declare function fetchAllUsage(config?: Parameters<typeof listConfiguredProfiles>[0]): Promise<{
     fetchedAt: string;
     providers: ProviderUsage[];
 }>;

package/dist/usage/providers.js

@@ -19,12 +19,16 @@
  *   refresh at all when the file isn't writable, rather than risk the login.
  */
 import { readFile, writeFile, access, constants } from "node:fs/promises";
-import { readFileSync } from "node:fs";
+import { readFileSync, readdirSync } from "node:fs";
 import { join } from "node:path";
+import { getAgendHome } from "../paths.js";
+import { loadFleetConfig } from "../config.js";
+import { credentialHomeSpec, credentialProfileStoreHome, instanceCredentialProfile, } from "../backend/credential-profile.js";
+import { readKiroAuthTokens } from "../backend/kiro-auth-store.js";
 import { homedir } from "node:os";
 import { getProviderRateLimit } from "./provider-alerts.js";
+import { readMuseUsageSnapshot } from "../muse-usage-relay.js";
 import { readStatuslineRateLimits, } from "./statusline-usage.js";
-import Database from "better-sqlite3";
 const i18n = (key, ...args) => args.length ? { key, args } : { key };
 const WEEK_MS = 7 * 24 * 60 * 60 * 1000;
 const SESSION_MS = 5 * 60 * 60 * 1000;
@@ -654,8 +658,10 @@ function codexPlan(planType) {
         default: return planType.trim().split("_").map(w => w.charAt(0).toUpperCase() + w.slice(1)).join(" ");
     }
 }
-export async function fetchCodexUsage() {
-    const home = process.env.CODEX_HOME || join(homedir(), ".codex");
+export async function fetchCodexUsage(storeHome) {
+    // A credential profile owns its own auth.json; without one this is the shared
+    // login, exactly as before.
+    const home = storeHome ?? process.env.CODEX_HOME ?? join(homedir(), ".codex");
     let auth;
     try {
         auth = JSON.parse(await readFile(join(home, "auth.json"), "utf8"));
@@ -931,56 +937,31 @@ export function kiroAuthKind(token) {
  * case where the provider should vanish from the panel. `missing` means kiro-cli
  * IS installed but no login we recognise is stored: a real state the user needs
  * to see, not a reason to hide the row.
+ *
+ * A credential profile can only ever be `missing`, never `notInstalled`: the
+ * profile exists because the fleet configured it, so the CLI is demonstrably
+ * here and the absent store means *this subscription* has never been logged in.
+ * That is the one thing the user must see — running two subscriptions, the one
+ * you still have to log into is precisely the row that must not disappear.
  */
-function readKiroToken() {
-    const home = process.env.KIRO_CLI_HOME || join(homedir(), ".local", "share", "kiro-cli");
-    let db;
-    try {
-        db = new Database(join(home, "data.sqlite3"), { readonly: true, fileMustExist: true });
-    }
-    catch {
-        return { notInstalled: true };
-    }
-    try {
-        // Read every token-shaped row rather than a fixed pair of keys: kiro names
-        // its auth rows per login type (`kirocli:social:token`,
-        // `codewhisperer:odic:token`, …), and an unlisted one used to read as
-        // "not logged in" — which then removed Kiro from the panel entirely.
-        const rows = db.prepare("SELECT key, value FROM auth_kv WHERE key LIKE '%:token'").all();
-        const parse = (raw) => {
-            if (!raw)
-                return null;
-            try {
-                const t = JSON.parse(raw);
-                return t.access_token ? t : null;
-            }
-            catch {
-                return null;
-            }
-        };
-        const candidates = rows
-            .map(r => parse(r.value))
-            .filter((t) => t !== null);
-        if (candidates.length === 0)
-            return { missing: true };
-        // Switching login type leaves the old token behind, so "first key wins"
-        // could report a stale account. Prefer a token that has not expired, then
-        // the one that expires latest.
-        const expiry = (t) => (t.expires_at ? new Date(t.expires_at).getTime() : 0);
-        const now = Date.now();
-        const live = candidates.filter(t => expiry(t) > now);
-        const token = (live.length ? live : candidates).sort((a, b) => expiry(b) - expiry(a))[0];
-        return { token, kind: kiroAuthKind(token) };
-    }
-    catch {
+function readKiroToken(storeHome) {
+    // A credential profile keeps its own store; without one this is the shared
+    // login, exactly as before.
+    const home = storeHome ?? process.env.KIRO_CLI_HOME ?? join(homedir(), ".local", "share", "kiro-cli");
+    const read = readKiroAuthTokens(home);
+    if (read.kind === "no-store")
+        return storeHome ? { missing: true } : { notInstalled: true };
+    const candidates = read.tokens;
+    if (candidates.length === 0)
         return { missing: true };
-    }
-    finally {
-        try {
-            db.close();
-        }
-        catch { /* best-effort */ }
-    }
+    // Switching login type leaves the old token behind, so "first key wins"
+    // could report a stale account. Prefer a token that has not expired, then
+    // the one that expires latest.
+    const expiry = (t) => (t.expires_at ? new Date(t.expires_at).getTime() : 0);
+    const now = Date.now();
+    const live = candidates.filter(t => expiry(t) > now);
+    const token = (live.length ? live : candidates).sort((a, b) => expiry(b) - expiry(a))[0];
+    return { token, kind: kiroAuthKind(token) };
 }
 function kiroTitleCase(s) {
     return s.toLowerCase().replace(/(^|\s)\S/g, c => c.toUpperCase());
@@ -991,8 +972,8 @@ function kiroEpochIso(sec) {
         : null;
 }
 /** Exported for tests: the Q-Pro and expired paths return without any network call. */
-export async function fetchKiroUsage() {
-    const { token, kind, missing, notInstalled } = readKiroToken();
+export async function fetchKiroUsage(storeHome) {
+    const { token, kind, missing, notInstalled } = readKiroToken(storeHome);
     if (notInstalled) {
         // The one case that should disappear from the panel: kiro-cli isn't here.
         return { status: "no-credentials", hint: "Log in with the Kiro CLI (`kiro-cli`).", hintI18n: i18n("usage.hint.login_kiro"), metrics: [] };
@@ -1016,8 +997,9 @@ export async function fetchKiroUsage() {
         return {
             status: "ok",
             plan: "Q Developer Pro",
-            hint: "Subscription — no credit usage to report.",
-            hintI18n: i18n("usage.hint.subscription_no_credit"),
+            unlimited: true,
+            hint: "♾️ Unlimited",
+            hintI18n: i18n("usage.value.unlimited"),
             metrics: [],
         };
     }
@@ -1112,10 +1094,185 @@ export async function fetchKiroUsage() {
 const DEFAULT_PROVIDERS = [
     { id: "claude", name: "Claude", fetch: fetchClaudeUsage },
     { id: "codex", name: "Codex", fetch: fetchCodexUsage },
+    { id: "muse", name: "Muse", fetch: fetchMuseUsage },
     { id: "grok", name: "Grok", fetch: fetchGrokUsage },
     { id: "kiro", name: "Kiro", fetch: fetchKiroUsage },
     { id: "antigravity", name: "Antigravity", fetch: fetchAntigravityUsage },
 ];
+const MUSE_SESSION_MS = 5 * 60 * 60 * 1000;
+/** Read the daemon-written, token-free Muse relay snapshot for active Muse instances. */
+export async function fetchMuseUsage() {
+    let config = null;
+    try {
+        config = loadFleetConfig(join(getAgendHome(), "fleet.yaml"));
+    }
+    catch { /* unavailable config is an honest empty row */ }
+    const instanceRoot = join(getAgendHome(), "instances");
+    const configuredMuseNames = Object.entries(config?.instances ?? {})
+        .filter(([, instance]) => (instance.backend ?? config?.defaults?.backend) === "muse")
+        .map(([name]) => name);
+    // Classic channels may own an instance that is not present in fleet.yaml.
+    // Reading only daemon-written, token-free state files is not credential
+    // discovery and keeps the usage row useful for those instances too.
+    let stateNames = configuredMuseNames;
+    try {
+        const names = readdirSync(instanceRoot, { withFileTypes: true })
+            .filter(entry => entry.isDirectory())
+            .map(entry => entry.name);
+        stateNames = [...new Set([...configuredMuseNames, ...names])];
+    }
+    catch { /* no instances directory yet */ }
+    const snapshots = stateNames
+        .map(name => readMuseUsageSnapshot(join(instanceRoot, name)))
+        .filter((snapshot) => snapshot !== null)
+        .sort((a, b) => b.observedAt - a.observedAt);
+    const snapshot = snapshots[0];
+    if (!snapshot) {
+        return { status: "ok", plan: "Subscription", hint: "Muse usage unavailable — no response frame observed.", metrics: [] };
+    }
+    const metric = (label, window, windowMs) => {
+        if (!window)
+            return null;
+        return {
+            label,
+            type: "percent",
+            used: window.usedPercent,
+            resetsAt: new Date(window.resetsAt * 1000).toISOString(),
+            windowMs: window.windowMs ?? windowMs,
+        };
+    };
+    const metrics = [
+        metric("Session", snapshot.session, MUSE_SESSION_MS),
+        metric("Weekly", snapshot.weekly, WEEK_MS),
+    ].filter((m) => m !== null);
+    return {
+        status: "ok",
+        plan: snapshot.plan || "Subscription",
+        hint: metrics.length ? undefined : "Muse usage unavailable — no response frame observed.",
+        metrics,
+    };
+}
+/**
+ * One row per subscription, not one row per backend.
+ *
+ * A fleet running two kiro/codex logins has two quotas, and a single row could
+ * only ever show one of them — or worse, add them together and show a number
+ * that is true of neither. Each effective credential profile reads its own
+ * store and gets its own row; a mixed fleet also keeps one row for effective
+ * legacy shared bindings. Instance-private homes are never scanned: their
+ * auth files point at these same logical sources.
+ */
+export function providersForConfig(config, base = DEFAULT_PROVIDERS) {
+    return base.flatMap(provider => {
+        const backendName = usageBackendForProviderId(provider.id);
+        if (!backendName || !credentialHomeSpec(backendName))
+            return [provider];
+        const profiles = effectiveCredentialProfiles(config, backendName);
+        if (profiles.length === 0)
+            return [provider];
+        // A fleet can mix profiled and legacy instances.  The old expansion
+        // returned only profile rows whenever *any* profile existed, which hid the
+        // shared subscription from a running legacy instance.  Include the shared
+        // source only when an effective binding actually uses it; active-provider
+        // filtering then removes sources that are stopped or otherwise unused.
+        const rows = [];
+        // Classic channels are stored separately from fleet.yaml and always use
+        // the shared Codex login today.  Keep the shared Codex row available so
+        // active-provider filtering can retain that binding; unlike filesystem
+        // scanning this row is harmless when no classic/shared instance is live.
+        if (provider.id === "codex" || hasEffectiveSharedBinding(config, backendName)) {
+            rows.push({
+                id: provider.id,
+                name: provider.id === "codex" ? `${provider.name} (default)` : provider.name,
+                fetch: () => provider.fetch(),
+            });
+        }
+        rows.push(...profiles.map(profile => ({
+            id: `${provider.id}:${profile}`,
+            name: `${provider.name} (${profile})`,
+            fetch: () => provider.fetch(credentialProfileStoreHome(getAgendHome(), backendName, profile)),
+        })));
+        return rows;
+    });
+}
+/**
+ * Whether at least one effective fleet binding uses the legacy shared login.
+ *
+ * This deliberately follows effective backend/profile inheritance instead of
+ * looking at directories on disk.  Instance-private Codex homes are config
+ * homes whose auth file points at this same shared/profile source; scanning
+ * them would duplicate one quota and make usage depend on stale instance
+ * directories.  A missing/unknown config keeps the legacy shared row for
+ * backwards compatibility.
+ */
+function hasEffectiveSharedBinding(config, backendName) {
+    if (!config)
+        return true;
+    const defaults = config.defaults;
+    const instances = config.instances ?? {};
+    let sawEffectiveBinding = false;
+    for (const instance of Object.values(instances)) {
+        const backend = instance.backend ?? defaults?.backend;
+        if (backend !== backendName)
+            continue;
+        sawEffectiveBinding = true;
+        if (!instanceCredentialProfile(instance, defaults, backendName))
+            return true;
+    }
+    // A defaults-only fleet has one effective shared binding when the default
+    // backend is this provider and no profile was configured.  With no known
+    // binding at all, preserve the pre-profile shared-provider behaviour.
+    if (!sawEffectiveBinding) {
+        if (defaults?.backend === backendName && !instanceCredentialProfile(undefined, defaults, backendName))
+            return true;
+        return Object.keys(instances).length === 0;
+    }
+    return false;
+}
+/** Profiles on effective bindings only (not dormant backend_options on another backend). */
+function effectiveCredentialProfiles(config, backendName) {
+    if (!config)
+        return [];
+    const found = new Set();
+    const defaults = config.defaults;
+    for (const instance of Object.values(config.instances ?? {})) {
+        const backend = instance.backend ?? defaults?.backend;
+        if (backend !== backendName)
+            continue;
+        const profile = instanceCredentialProfile(instance, defaults, backendName);
+        if (profile)
+            found.add(profile);
+    }
+    if (Object.keys(config.instances ?? {}).length === 0 && defaults?.backend === backendName) {
+        const profile = instanceCredentialProfile(undefined, defaults, backendName);
+        if (profile)
+            found.add(profile);
+    }
+    return [...found].sort();
+}
+/**
+ * The fleet configuration, for working out which subscriptions exist.
+ *
+ * Usage runs in the fleet process and in the CLI, and it is never worth failing
+ * a usage snapshot over an unreadable config — no config simply means no
+ * profiles, which is the behaviour every fleet had before profiles existed.
+ */
+function readFleetConfigForUsage() {
+    try {
+        return loadFleetConfig(join(getAgendHome(), "fleet.yaml"));
+    }
+    catch {
+        return null;
+    }
+}
+/** The backend a usage row reads its credentials from. */
+function usageBackendForProviderId(id) {
+    if (id === "kiro")
+        return "kiro-cli";
+    if (id === "codex")
+        return "codex";
+    return null;
+}
 let PROVIDERS = DEFAULT_PROVIDERS;
 /** Test seam: a provider that hangs cannot be simulated with real vendors. */
 export function setUsageProvidersForTests(providers) {
@@ -1174,8 +1331,13 @@ async function withDeadline(work, ms) {
 }
 /** Fetch every provider in parallel. Providers without local credentials are
  * skipped (per the panel's contract: absent CLIs simply don't show). */
-export async function fetchAllUsage() {
-    const results = await Promise.all(PROVIDERS.map(async (p) => {
+export async function fetchAllUsage(config) {
+    // Expanded per call: a profile added through Settings or General should show
+    // up on the next snapshot, not on the next restart. Callers that already hold
+    // the config pass it; the rest get it read here, behind the same five-minute
+    // cache as the snapshot itself.
+    const providers = providersForConfig(config === undefined ? readFleetConfigForUsage() : config, PROVIDERS);
+    const results = await Promise.all(providers.map(async (p) => {
         try {
             const outcome = await withDeadline(p.fetch(), providerDeadlineMs);
             if (outcome === DEADLINE_EXCEEDED) {