@maudecode/talaria-web 1.14.0 → 1.16.1

package/dist/providers/catalog.js

@@ -17,8 +17,8 @@ import { atomicWriteText } from '../fs/atomic.js';
 import { str } from '../util.js';
 import { loadEnvFile } from './env-file.js';
 import { ACCOUNT_USAGE_PROVIDERS, FALLBACK_MODELS, OAUTH_PROVIDERS, PORTAL_PROVIDERS, PROVIDER_DISPLAY, PROVIDER_ENV_VAR, PROVIDER_ENV_VAR_ALIASES, PROVIDER_MODELS, SELF_HOSTED_PROVIDER_IDS, } from './tables.js';
-import { activeProviderFromConfig, canonicaliseProviderId, configuredModelIds, configuredModelOptions, customProviderEntries, customProviderSlug, dict, effectiveDefaultModel, isDict, isOpenAiFamilyProvider, mainModelSupportsServiceTier, modelSection, providerIdentity, resolveProviderAlias, } from '../config/agent-config.js';
-/** Python `_model_matches_picker_selection`: same bare id, and the routing hints agree when both name one. */
+import { activeProviderFromConfig, canonicaliseProviderId, configuredModelIds, configuredModelOptions, customProviderEntries, customProviderSlug, dict, effectiveDefaultModel, isDict, isOpenAiFamilyProvider, mainModelSupportsServiceTier, modelSection, parseProviderQualifiedModel, providerIdentity, resolveProviderAlias, } from '../config/agent-config.js';
+/** Python `_model_matches_picker_selection`: same bare id, and the routing hints agree when the selection names one. */
 function modelMatchesPickerSelection(modelId, selected, providerId) {
     const candidate = modelId.trim();
     const sel = selected.trim();
@@ -26,12 +26,28 @@ function modelMatchesPickerSelection(modelId, selected, providerId) {
         return false;
     if (candidate === sel)
         return true;
-    const bare = (v) => (v.startsWith('@') && v.includes(':') ? v.slice(v.indexOf(':') + 1) : v);
-    if (bare(sel) !== bare(candidate))
-        return false;
-    const selProvider = sel.startsWith('@') && sel.includes(':') ? sel.slice(1, sel.indexOf(':')).toLowerCase() : '';
-    const candProvider = candidate.startsWith('@') && candidate.includes(':') ? candidate.slice(1, candidate.indexOf(':')).toLowerCase() : providerId.trim().toLowerCase();
-    return !selProvider || !candProvider || selProvider === candProvider;
+    const [candBare, candProvider] = parseProviderQualifiedModel(candidate) ?? [candidate, providerId.trim()];
+    const [selBare, selProvider] = parseProviderQualifiedModel(sel) ?? [sel, ''];
+    return selBare === candBare && (!selProvider || selProvider.toLowerCase() === candProvider.toLowerCase());
+}
+/** TAL-301: every entry names its routing provider and bare id, split once by `parseProviderQualifiedModel`. */
+function stampModelEntries(models, providerId) {
+    return models.map((m) => {
+        const [bare, provider] = parseProviderQualifiedModel(m.id) ?? [m.id, providerId];
+        return { ...m, bare_id: bare, provider_id: provider };
+    });
+}
+/** TAL-301: the catalog entry a stored `(model, provider)` pair selects, so clients render the pairing instead of computing it. */
+export function catalogOptionId(catalog, model, provider) {
+    const bare = str(model).trim();
+    const pid = str(provider).trim().toLowerCase();
+    if (!bare || !pid)
+        return null;
+    for (const g of catalog.groups)
+        for (const e of [...g.models, ...(g.extra_models ?? [])])
+            if (e.bare_id === bare && str(e.provider_id).toLowerCase() === pid)
+                return e.id;
+    return null;
 }
 /** Python `_split_picker_overflow_models`: past 25 rows the picker shows 15, keeping the selected model visible. */
 export function splitPickerOverflow(models, selected, providerId) {
@@ -49,13 +65,41 @@ export function splitPickerOverflow(models, selected, providerId) {
     }
     return [visible, extras];
 }
+/**
+ * TAL-388: stamp each auxiliary slot with its display value and the catalog entry whose provider/model pair equals the
+ * saved one, so clients tick exactly one option (a bare id listed under two providers matches only its own provider).
+ */
+export function stampAuxiliarySelections(aux, catalog) {
+    const options = catalog.groups.flatMap((g) => [...g.models, ...(g.extra_models ?? [])].map((m) => {
+        const parsed = parseProviderQualifiedModel(m.id);
+        return { id: m.id, label: m.label, group: g.provider, provider: canonicaliseProviderId(parsed?.[1] ?? g.provider_id), bare: parsed?.[0] ?? m.id };
+    }));
+    const describe = (providerRaw, modelRaw) => {
+        const provider = str(providerRaw).trim() || 'auto';
+        const model = str(modelRaw).trim();
+        const key = canonicaliseProviderId(provider);
+        const match = provider === 'auto' ? undefined : options.find((o) => o.provider === key && o.bare === model);
+        if (match)
+            return { value_label: match.label || match.bare, provider_label: match.group, option_id: match.id };
+        const group = catalog.groups.find((g) => canonicaliseProviderId(g.provider_id) === key);
+        return { value_label: model || null, provider_label: provider === 'auto' ? null : group?.provider ?? displayName(provider), option_id: null };
+    };
+    // Auto falls back to the main chat model; name the effective one the catalog resolved (a legacy string `model` or a
+    // `HERMES_MODEL`-style override never reaches `aux.main`).
+    const mainParsed = parseProviderQualifiedModel(catalog.default_model);
+    const main = describe(mainParsed?.[1] ?? catalog.active_provider ?? aux.main.provider, mainParsed?.[0] ?? (catalog.default_model || aux.main.model));
+    const tasks = aux.tasks.map((t) => {
+        if ((str(t.provider).trim() || 'auto') === 'auto' && !str(t.model).trim())
+            return { ...t, is_auto: true, value_label: main.value_label, provider_label: main.provider_label, selected_option_id: null, in_catalog: true };
+        const pinned = describe(t.provider, t.model);
+        return { ...t, is_auto: false, value_label: pinned.value_label, provider_label: pinned.provider_label, selected_option_id: pinned.option_id, in_catalog: pinned.option_id !== null };
+    });
+    return { ...aux, tasks };
+}
 /** Python `_BESPOKE_CATALOG_PROVIDERS`: cards whose catalog is resolved by their own rule, never the generic live probe. */
 const BESPOKE_CATALOG_PROVIDERS = new Set(['openai-codex', 'nous', 'xai-oauth', 'lmstudio', 'opencode-go']);
 /** Python `_unqualified_model_id`: strip a picker routing hint (`@provider:`). */
-function unqualifiedModelId(id) {
-    const raw = id.trim();
-    return raw.startsWith('@') && raw.includes(':') ? raw.slice(raw.indexOf(':') + 1) : raw;
-}
+const unqualifiedModelId = (id) => parseProviderQualifiedModel(id)?.[0] ?? id.trim();
 /** Python `_MODEL_PICKER_OVERFLOW_THRESHOLD` / `_MODEL_PICKER_VISIBLE_TARGET`. */
 const MODEL_PICKER_OVERFLOW_THRESHOLD = 25;
 const MODEL_PICKER_VISIBLE_TARGET = 15;
@@ -64,7 +108,110 @@ const LIVE_TTL_S = 86_400;
 const PROVIDERS_TTL_S = 30;
 const QUOTA_TIMEOUT_MS = 15_000;
 const OPENROUTER_KEY_URL = 'https://openrouter.ai/api/v1/key';
+const PLUGIN_LIST_TIMEOUT_MS = 15_000;
+/** TAL-288: the card text for a plugin provider the Agent does not report ready. */
+const PLUGIN_SETUP_ERRORS = {
+    missing_cli: "This provider's CLI was not found on the server. Install it and sign in, then refresh.",
+    needs_setup: "This provider is not set up yet. Finish its setup in Hermes, then refresh.",
+    not_loaded: 'This provider is installed but could not be loaded. Check it with hermes plugins doctor, then restart Talaria Web.',
+    unavailable: "This provider's setup status is unavailable.",
+};
+const PLUGIN_NO_MODELS = 'This provider listed no models.';
 const COST_SNAPSHOT_MAX_DAYS = 365;
+const FIVE_HOUR_WINDOW_S = 18_000;
+const WEEK_WINDOW_S = 604_800;
+/** Swift `rounded()`: half away from zero. */
+function roundTo(value, digits) {
+    const scale = 10 ** digits;
+    return (Math.sign(value) * Math.round(Math.abs(value) * scale)) / scale;
+}
+const finite = (v) => (typeof v === 'number' && Number.isFinite(v) ? v : null);
+/** ISO-8601 UTC for epoch seconds, without a `.000` fraction. */
+export const isoAt = (seconds) => new Date(seconds * 1000).toISOString().replace('.000Z', 'Z');
+/** ISO-8601 UTC (`…Z`) or null. Accepts the pre-TAL-409 sidecar's `str(datetime)` space form; a zone-less stamp is UTC. */
+export function isoUtc(value) {
+    if (typeof value !== 'string' || !value.trim())
+        return null;
+    let text = value.trim().replace(' ', 'T');
+    if (text.includes('T') && !/(Z|[+-]\d{2}:?\d{2})$/i.test(text))
+        text += 'Z';
+    const ms = Date.parse(text);
+    return Number.isFinite(ms) ? isoAt(ms / 1000) : null;
+}
+/** The forecast a pace implies: per-hour or per-day budget until reset, and whether the projection empties the window first. */
+export function quotaForecast(pace, remaining) {
+    const daily = pace.minutes_to_reset >= 24 * 60;
+    const margin = pace.projected_minutes_to_empty === null ? null : pace.projected_minutes_to_empty - pace.minutes_to_reset;
+    return {
+        outcome: margin === null || margin >= 0 ? 'safe' : 'warning',
+        budget_unit: daily ? 'day' : 'hour',
+        budget_percent: remaining !== null && pace.minutes_to_reset > 0 ? remaining / (pace.minutes_to_reset / (daily ? 24 * 60 : 60)) : null,
+        depletion_margin_minutes: margin,
+    };
+}
+/**
+ * TAL-409: the one normaliser for account-usage windows (Python `_snapshot_windows_payload` plus the pace math the
+ * App used to run). Blank labels drop; `reset_at` becomes ISO `Z`; each window gets its duration, pace and forecast
+ * as of `nowSeconds`; the indexes name the windows the App shows for pace, session and weekly selections.
+ */
+export function normalizeQuotaWindows(raw, nowSeconds) {
+    const nowMs = nowSeconds * 1000;
+    const windows = [];
+    for (const entry of Array.isArray(raw) ? raw : []) {
+        if (!isDict(entry))
+            continue;
+        const label = str(entry.label).trim();
+        if (!label)
+            continue;
+        const usedRaw = finite(entry.used_percent);
+        const remainingRaw = finite(entry.remaining_percent);
+        const clamp = (v) => Math.min(Math.max(v, 0), 100);
+        const used = usedRaw !== null ? clamp(usedRaw) : remainingRaw !== null ? clamp(100 - remainingRaw) : null;
+        const remaining = used === null ? null : 100 - used;
+        const resetAt = isoUtc(entry.reset_at);
+        const resetMs = resetAt === null ? null : Date.parse(resetAt);
+        const minutesToReset = resetMs === null ? null : Math.max(0, roundTo((resetMs - nowMs) / 60_000, 0));
+        const lower = label.toLowerCase();
+        const providedSeconds = finite(entry.window_seconds);
+        const windowSeconds = providedSeconds
+            ?? (lower.includes('week') ? WEEK_WINDOW_S
+                : lower.includes('5h') ? FIVE_HOUR_WINDOW_S
+                    // A "Session" window is 5h, or the weekly window a provider collapsed into one session bucket.
+                    : lower.includes('session') && minutesToReset !== null ? (minutesToReset > 5 * 60 ? WEEK_WINDOW_S : FIVE_HOUR_WINDOW_S)
+                        : null);
+        let pace = null;
+        if (resetAt !== null && resetMs !== null && minutesToReset !== null && resetMs > nowMs && used !== null && remaining !== null
+            && (windowSeconds === FIVE_HOUR_WINDOW_S || windowSeconds === WEEK_WINDOW_S)) {
+            const windowMinutes = windowSeconds / 60;
+            const elapsed = Math.max(0, windowMinutes - minutesToReset);
+            const expectedRemaining = roundTo(Math.min(Math.max((minutesToReset / windowMinutes) * 100, 0), 100), 1);
+            const expectedUsed = roundTo(100 - expectedRemaining, 1);
+            const usagePerMinute = elapsed > 0 ? used / elapsed : 0;
+            pace = {
+                expected_remaining_percent: expectedRemaining,
+                pace_delta_percent: roundTo(remaining - expectedRemaining, 1),
+                burn_rate: expectedUsed > 0 ? roundTo(used / expectedUsed, 2) : 0,
+                minutes_to_reset: minutesToReset,
+                projected_minutes_to_empty: usagePerMinute > 0 ? roundTo(remaining / usagePerMinute, 0) : null,
+                elapsed_minutes: elapsed,
+                valid_until: resetAt,
+            };
+        }
+        windows.push({
+            label, used_percent: usedRaw, remaining_percent: remaining, reset_at: resetAt, detail: typeof entry.detail === 'string' ? entry.detail : null,
+            window_seconds: windowSeconds, pace, forecast: pace ? quotaForecast(pace, remaining) : null,
+        });
+    }
+    const index = (match) => { const i = windows.findIndex(match); return i < 0 ? null : i; };
+    const labelHas = (needle) => (w) => w.label.toLowerCase().includes(needle);
+    const knownPace = (w) => w.window_seconds === FIVE_HOUR_WINDOW_S || w.window_seconds === WEEK_WINDOW_S || ['week', 'session', '5h'].some((n) => labelHas(n)(w));
+    return {
+        windows,
+        pace_window_index: index(labelHas('week')) ?? index(knownPace),
+        session_window_index: index(labelHas('session')) ?? index(labelHas('5h')),
+        weekly_window_index: index(labelHas('week')),
+    };
+}
 export function displayName(pid) {
     return PROVIDER_DISPLAY[pid] ?? pid.split('-').map((w) => (w ? w[0].toUpperCase() + w.slice(1) : w)).join(' ');
 }
@@ -84,9 +231,7 @@ export function formatOllamaLabel(mid) {
 }
 /** Python `_get_label_for_model`: reuse a known label, else prettify the bare id. */
 export function labelForModel(modelId, groups) {
-    let lookup = modelId;
-    if (lookup.startsWith('@') && lookup.includes(':'))
-        lookup = lookup.slice(lookup.indexOf(':') + 1);
+    const lookup = unqualifiedModelId(modelId);
     const hasScheme = (s) => s.includes('://');
     const norm = (s) => (s.includes('/') && !hasScheme(s) ? s.slice(s.indexOf('/') + 1) : s).replaceAll('-', '.').toLowerCase();
     const target = norm(lookup);
@@ -155,12 +300,20 @@ export function deduplicateModelIds(groups) {
                 m.id = `@${groups[gi].provider_id}:${m.id}`;
         }
 }
+/** Quota sources keep the first row per source id, ordered by provider id, account label, then source id (TAL-272). */
+export function uniqueQuotaSources(sources) {
+    const cmp = (a, b) => (a < b ? -1 : a > b ? 1 : 0);
+    return sources.filter((q, i) => sources.findIndex((o) => o.source_id === q.source_id) === i)
+        .sort((a, b) => cmp(a.provider_id, b.provider_id) || cmp(a.account_label, b.account_label) || cmp(a.source_id, b.source_id));
+}
 export class ProviderCatalog {
     deps;
     liveFailed = new Set();
     liveIds = new Map();
     liveInflight = new Map();
     providersCache = new Map();
+    /** TAL-301: the last catalog served per profile home, for the sync session payloads' `model_option_id`. */
+    lastModels = new Map();
     constructor(deps) {
         this.deps = deps;
     }
@@ -183,6 +336,29 @@ export class ProviderCatalog {
             this.liveIds.delete(key);
         }
         this.providersCache.clear();
+        // The picker catalog changed: option ids rebuild on the next read rather than pairing against the old one.
+        if (profileHome)
+            this.lastModels.delete(profileHome);
+        else
+            this.lastModels.clear();
+    }
+    /** TAL-301: the entry id a stored `(model, provider)` pair selects in the last catalog built for this home; a cold home starts building one. */
+    modelOptionFor(profileHome, model, provider) {
+        const catalog = this.lastModels.get(profileHome);
+        if (!catalog) {
+            void this.warmModelOptions(profileHome);
+            return null;
+        }
+        return catalogOptionId(catalog, model, provider);
+    }
+    /** Builds the catalog `modelOptionFor` reads once per home; an unavailable catalog leaves every option id null. */
+    async warmModelOptions(profileHome) {
+        if (this.lastModels.has(profileHome))
+            return;
+        try {
+            await this.models(profileHome);
+        }
+        catch { /* fail closed: no option ids */ }
     }
     /**
      * The process-environment value of `name` as a named profile may see it: values `loadStartupEnv` copied from the
@@ -306,6 +482,23 @@ export class ProviderCatalog {
         this.liveInflight.set(key, run);
         return run;
     }
+    /**
+     * TAL-288: the model-provider plugins installed and enabled in this profile, as the sidecar reads them from the Agent.
+     * A failed lookup lists none, so every other provider stays usable; an id that cannot be a provider routing hint is dropped.
+     */
+    async pluginProviders(profileHome) {
+        const sidecar = this.deps.sidecar();
+        if (!sidecar)
+            return [];
+        try {
+            const { providers } = await sidecar.call('plugins.providers', { profile_home: profileHome }, { timeoutMs: PLUGIN_LIST_TIMEOUT_MS });
+            return providers.filter((p, i, all) => /^[a-z0-9][a-z0-9._-]{0,63}$/.test(p.name) && all.findIndex((q) => q.name === p.name) === i);
+        }
+        catch (error) {
+            this.deps.log(`[catalog] plugin providers failed: ${str(error.message)}`);
+            return [];
+        }
+    }
     /** Python `get_providers`. */
     async providers(profileHome) {
         const config = await this.deps.config.read(profileHome);
@@ -316,10 +509,16 @@ export class ProviderCatalog {
             return structuredClone(hit.payload);
         const active = activeProviderFromConfig(config);
         const known = new Set([...Object.keys(PROVIDER_DISPLAY), ...Object.keys(PROVIDER_MODELS), ...OAUTH_PROVIDERS]);
+        // A plugin never stands in for a built-in provider, by id or alias (that would route to the built-in's billing); it
+        // does own a `providers.<id>` config entry.
+        const plugins = (await this.pluginProviders(profileHome)).filter((p) => !known.has(p.name) && !known.has(providerIdentity(p.name)));
+        const pluginIds = new Set(plugins.map((p) => p.name));
         const providersCfg = dict(config.providers);
         for (const key of Object.keys(providersCfg)) {
             const identity = canonicaliseProviderId(key);
-            known.add(known.has(identity) ? identity : key);
+            const id = known.has(identity) ? identity : key;
+            if (!pluginIds.has(id))
+                known.add(id);
         }
         const rows = [];
         for (const pid of [...known].sort()) {
@@ -364,6 +563,17 @@ export class ProviderCatalog {
                 models_total: modelsTotal,
             });
         }
+        // TAL-288: a plugin is selectable only once the Agent reports its setup ready; it never borrows a built-in's key.
+        for (const plugin of plugins) {
+            const ready = plugin.setup === 'ready';
+            const live = ready ? await this.liveModelIds(profileHome, plugin.name) : [];
+            rows.push({
+                id: plugin.name, display_name: plugin.display_name || plugin.name, has_key: ready,
+                configurable: false, is_oauth: false, is_plugin_provider: true, is_self_hosted: false, is_custom: false, key_source: ready ? 'plugin' : 'none',
+                base_url: null, auth_error: plugin.setup === 'ready' ? (live.length ? null : PLUGIN_NO_MODELS) : PLUGIN_SETUP_ERRORS[plugin.setup], env_var: null,
+                models: live.map((id) => ({ id, label: labelForModel(id, []) })), models_total: live.length,
+            });
+        }
         for (const cp of customProviderEntries(config)) {
             const name = str(cp.name).trim();
             if (!name)
@@ -383,6 +593,8 @@ export class ProviderCatalog {
         // Python `_provider_sort_key`: active first, then `custom:*`, then keyed providers, then the rest (alphabetical within).
         const rank = (p) => (str(p.id) === active ? 0 : str(p.id).startsWith('custom:') ? 1 : p.has_key ? 2 : 3);
         rows.sort((a, b) => rank(a) - rank(b) || (str(a.id) < str(b.id) ? -1 : str(a.id) > str(b.id) ? 1 : 0));
+        for (const row of rows)
+            row.models = stampModelEntries(row.models, str(row.id));
         const payload = { providers: rows, active_provider: active };
         this.providersCache.set(profileHome, { at: this.deps.now(), key: cacheKey, payload });
         return structuredClone(payload);
@@ -431,12 +643,18 @@ export class ProviderCatalog {
             if (canonical && this.providerHasKey(canonical, config, envValues, profileHome))
                 detected.add(canonical);
         }
-        // Python: OAuth providers the Agent reports as logged in join the picker with their live catalog (#1567, #2545).
-        const oauthLoggedIn = new Set();
-        for (const row of (await this.providers(profileHome)).providers)
-            if (row.is_oauth === true && row.has_key === true)
-                oauthLoggedIn.add(str(row.id));
-        for (const pid of oauthLoggedIn)
+        // Python: OAuth providers the Agent reports as logged in join the picker with their live catalog (#1567, #2545); so do
+        // ready plugin providers (TAL-288), under their own name.
+        const signedIn = new Set();
+        const pluginNames = new Map();
+        for (const row of (await this.providers(profileHome)).providers) {
+            if (row.has_key !== true || (row.is_oauth !== true && row.is_plugin_provider !== true))
+                continue;
+            signedIn.add(str(row.id));
+            if (row.is_plugin_provider === true)
+                pluginNames.set(str(row.id), str(row.display_name) || str(row.id));
+        }
+        for (const pid of signedIn)
             detected.add(pid);
         const fallbackCfg = Array.isArray(config.fallback_providers) ? config.fallback_providers.filter(isDict) : [];
         for (const entry of fallbackCfg) {
@@ -469,7 +687,7 @@ export class ProviderCatalog {
             detected.add(named?.[0] ?? active ?? 'custom');
         }
         const groups = [];
-        for (const pid of [...detected].map((p) => (p.startsWith('custom') ? p : canonicaliseProviderId(p) || p)).filter((v, i, a) => v && a.indexOf(v) === i).sort()) {
+        for (const pid of [...detected].map((p) => (p.startsWith('custom') || pluginNames.has(p) ? p : canonicaliseProviderId(p) || p)).filter((v, i, a) => v && a.indexOf(v) === i).sort()) {
             if (pid.startsWith('custom:')) {
                 const g = namedCustom.get(pid);
                 const models = [...(g?.models ?? [])];
@@ -490,7 +708,7 @@ export class ProviderCatalog {
             let raw = [];
             if ('models' in providerCfg && providerCfg.models_discovered !== true)
                 raw = configuredModelOptions(providerCfg.models);
-            if (!raw.length && (this.providerHasKey(pid, config, envValues, profileHome) || oauthLoggedIn.has(pid))) {
+            if (!raw.length && (this.providerHasKey(pid, config, envValues, profileHome) || signedIn.has(pid))) {
                 const live = await this.liveModelIds(profileHome, pid);
                 if (live.length)
                     raw = live.map((id) => ({ id, label: pid === 'nous' ? `${formatOllamaLabel(id.includes('/') ? id.slice(id.indexOf('/') + 1) : id)} (via Nous)` : labelForModel(id, []) }));
@@ -504,7 +722,7 @@ export class ProviderCatalog {
                 if (!raw.some((m) => m.id === id))
                     raw.push({ id, label: labelForModel(id, groups) });
             if (raw.length)
-                groups.push({ provider: displayName(pid), provider_id: pid, models: applyProviderPrefix(raw, pid, active) });
+                groups.push({ provider: pluginNames.get(pid) ?? displayName(pid), provider_id: pid, models: applyProviderPrefix(raw, pid, active) });
         }
         if (defaultModel) {
             const all = new Set(groups.flatMap((g) => g.models.map((m) => m.id)));
@@ -550,10 +768,20 @@ export class ProviderCatalog {
             for (const [k, v] of Object.entries(rawAliases))
                 if (k && v)
                     aliases[k.trim()] = str(v).trim();
+        const [defaultBare, defaultProvider] = parseProviderQualifiedModel(defaultModel) ?? [defaultModel, active];
+        const defaults = { active_provider: active, default_model: defaultModel, default_provider_id: defaultProvider, default_bare_id: defaultBare };
         if (!kept.length && defaultModel) {
-            return { active_provider: active, default_model: defaultModel, groups: [{ provider: 'Default', provider_id: active ?? 'default', models: [{ id: defaultModel, label: labelForModel(defaultModel, []) }] }], aliases: {}, configured_model_badges: {} };
+            const providerId = active ?? 'default';
+            return this.remember(profileHome, { ...defaults, groups: [{ provider: 'Default', provider_id: providerId, models: stampModelEntries([{ id: defaultModel, label: labelForModel(defaultModel, []) }], providerId) }], aliases: {}, configured_model_badges: {} });
         }
-        return { active_provider: active, default_model: defaultModel, groups: kept, aliases, configured_model_badges: this.badges(kept, active, defaultModel, fallbackCfg) };
+        const stamped = kept.map((g) => ({ ...g, models: stampModelEntries(g.models, g.provider_id), ...(g.extra_models ? { extra_models: stampModelEntries(g.extra_models, g.provider_id) } : {}) }));
+        return this.remember(profileHome, { ...defaults, groups: stamped, aliases, configured_model_badges: this.badges(kept, active, defaultModel, fallbackCfg) });
+    }
+    /** Stamps the default's entry id and keeps the catalog for `modelOptionFor`. */
+    remember(profileHome, catalog) {
+        catalog.default_option_id = catalogOptionId(catalog, catalog.default_bare_id ?? null, catalog.default_provider_id ?? null);
+        this.lastModels.set(profileHome, catalog);
+        return structuredClone(catalog);
     }
     /** Python `_configured_model_badges_from_static_catalog`: which picker rows are the main/fallback selections. */
     badges(groups, active, defaultModel, fallback) {
@@ -609,7 +837,7 @@ export class ProviderCatalog {
         if (provider !== 'nous' && ids.length > MODEL_PICKER_OVERFLOW_THRESHOLD)
             ids = ids.slice(0, MODEL_PICKER_VISIBLE_TARGET);
         const annotateFastTier = isOpenAiFamilyProvider(provider);
-        const models = ids.filter(Boolean).map((id) => ({ id, label: labelForModel(id, []), ...(annotateFastTier ? { supports_fast_tier: mainModelSupportsServiceTier(id, provider) } : {}) }));
+        const models = stampModelEntries(ids.filter(Boolean).map((id) => ({ id, label: labelForModel(id, []), ...(annotateFastTier ? { supports_fast_tier: mainModelSupportsServiceTier(id, provider) } : {}) })), provider);
         return { provider, source, models, count: models.length };
     }
     /**
@@ -621,7 +849,7 @@ export class ProviderCatalog {
         const config = await this.deps.config.read(profileHome);
         const section = modelSection(config);
         const pid = canonicaliseProviderId(provider ?? section.provider) || null;
-        const bare = model.replace(/^@[^:]+:/, '');
+        const bare = unqualifiedModelId(model);
         const positive = (v) => { const n = Math.trunc(Number(v)); return Number.isFinite(n) && n > 0 ? n : null; };
         const fromModels = (models) => {
             if (isDict(models)) {
@@ -644,7 +872,7 @@ export class ProviderCatalog {
         let baseUrl = '';
         let configContextLength = null;
         const sectionModel = str(section.default || (typeof config.model === 'string' ? config.model : '')).trim();
-        if (sectionModel && [model, bare].includes(sectionModel.replace(/^@[^:]+:/, '')))
+        if (sectionModel && [model, bare].includes(unqualifiedModelId(sectionModel)))
             configContextLength = positive(section.context_length);
         if (!pid || canonicaliseProviderId(section.provider) === pid)
             baseUrl = str(section.base_url).trim();
@@ -683,10 +911,12 @@ export class ProviderCatalog {
     /** Python `get_provider_quota`. */
     accountUsageCache = new Map();
     async quota(profileHome, providerRaw, opts = {}) {
+        const at = opts.at ?? this.deps.now();
+        const computed_at = isoAt(at);
         const config = await this.deps.config.read(profileHome);
         const provider = (providerRaw ?? activeProviderFromConfig(config) ?? '').trim().toLowerCase();
         if (!provider)
-            return { ok: false, provider: null, display_name: null, supported: false, status: 'unavailable', quota: null, message: 'No active provider is configured.' };
+            return { computed_at, ok: false, provider: null, display_name: null, supported: false, status: 'unavailable', quota: null, message: 'No active provider is configured.' };
         const name = displayName(provider);
         if (ACCOUNT_USAGE_PROVIDERS.has(provider)) {
             const sidecar = this.deps.sidecar();
@@ -707,22 +937,25 @@ export class ProviderCatalog {
                 }
                 this.accountUsageCache.set(cacheKey, { at: this.deps.now(), limits });
             }
+            // The cache keeps the Agent's raw windows; pace is recomputed as of every response.
+            if (limits)
+                limits = { ...limits, ...normalizeQuotaWindows(limits.windows, at), fetched_at: isoUtc(limits.fetched_at) };
             if (limits?.available)
-                return { ok: true, provider, display_name: name, supported: true, status: limits.stale ? 'stale' : 'available', label: limits.title, quota: null, account_limits: limits, message: limits.stale ? `${name} refresh failed; showing last-known account limits.` : `${name} account limits loaded.` };
+                return { computed_at, ok: true, provider, display_name: name, supported: true, status: limits.stale ? 'stale' : 'available', label: limits.title, quota: null, account_limits: limits, message: limits.stale ? `${name} refresh failed; showing last-known account limits.` : `${name} account limits loaded.` };
             const reason = str(limits?.unavailable_reason).trim();
-            return { ok: false, provider, display_name: name, supported: true, status: 'unavailable', quota: null, account_limits: limits, message: reason ? `${name} account limits are unavailable. ${reason}` : `${name} account limits are unavailable. Confirm provider authentication and try again.` };
+            return { computed_at, ok: false, provider, display_name: name, supported: true, status: 'unavailable', quota: null, account_limits: limits, message: reason ? `${name} account limits are unavailable. ${reason}` : `${name} account limits are unavailable. Confirm provider authentication and try again.` };
         }
         if (provider === 'openrouter') {
             const apiKey = this.apiKeyFor('openrouter', profileHome, config);
             if (!apiKey)
-                return { ok: false, provider, display_name: name, supported: true, status: 'no_key', quota: null, message: 'OpenRouter quota status needs an OPENROUTER_API_KEY configured on the server.' };
+                return { computed_at, ok: false, provider, display_name: name, supported: true, status: 'no_key', quota: null, message: 'OpenRouter quota status needs an OPENROUTER_API_KEY configured on the server.' };
             const info = await this.fetchOpenRouterKey(apiKey);
             if (info.kind === 'ok')
-                return { ok: true, provider, display_name: name, supported: true, status: 'available', label: 'OpenRouter credits', quota: info.quota, message: 'OpenRouter quota status loaded.' };
+                return { computed_at, ok: true, provider, display_name: name, supported: true, status: 'available', label: 'OpenRouter credits', quota: info.quota, message: 'OpenRouter quota status loaded.' };
             const status = info.kind === 'invalid_key' ? 'invalid_key' : 'unavailable';
-            return { ok: false, provider, display_name: name, supported: true, status, quota: null, message: status === 'invalid_key' ? 'OpenRouter rejected the configured API key.' : 'OpenRouter quota status is temporarily unavailable.' };
+            return { computed_at, ok: false, provider, display_name: name, supported: true, status, quota: null, message: status === 'invalid_key' ? 'OpenRouter rejected the configured API key.' : 'OpenRouter quota status is temporarily unavailable.' };
         }
-        return { ok: false, provider, display_name: name, supported: false, status: 'unsupported', quota: null, message: `No verified server-side quota or balance endpoint is available for ${name}.` };
+        return { computed_at, ok: false, provider, display_name: name, supported: false, status: 'unsupported', quota: null, message: `No verified server-side quota or balance endpoint is available for ${name}.` };
     }
     async fetchOpenRouterKey(apiKey) {
         const f = this.deps.fetch ?? fetch;
@@ -776,28 +1009,32 @@ export class ProviderCatalog {
     quotaProfileScopeId(profile) {
         return `qscope_${createHash('sha256').update(`${this.quotaServerScopeId()}\0${profile}`).digest('hex').slice(0, 32)}`;
     }
-    /** Python `get_provider_quotas`: one source per keyed provider, in the stable-identity envelope the iOS widget persists. */
+    /**
+     * Python `get_provider_quotas`: one source per keyed provider, in the stable-identity envelope the iOS widget persists.
+     * Each source id appears once (two custom providers can share a slug), ordered by provider, account label, then source id.
+     */
     async quotas(profileHome, profile, opts = {}) {
+        const at = this.deps.now();
         const status = await this.providers(profileHome);
         const active = status.active_provider;
         const scopeId = this.quotaProfileScopeId(profile);
         // Python `_quota_source_id(profile, provider, "provider")`: the single-credential descriptor per provider.
         const sourceId = (pid) => `qsrc_${createHash('sha256').update(`${scopeId}\0${pid}\0provider`).digest('hex').slice(0, 32)}`;
-        let descriptors = status.providers.filter((p) => p.has_key || p.is_custom).map((p) => ({ source_id: sourceId(str(p.id)), provider_id: str(p.id), provider_label: str(p.display_name) || str(p.id) }));
+        let descriptors = uniqueQuotaSources(status.providers.filter((p) => p.has_key || p.is_custom).map((p) => ({ source_id: sourceId(str(p.id)), provider_id: str(p.id), provider_label: str(p.display_name) || str(p.id), account_label: str(p.display_name) || str(p.id) })));
         const requested = str(opts.sourceId).trim() || null;
         if (requested)
             descriptors = descriptors.filter((d) => d.source_id === requested);
         const sources = await Promise.all(descriptors.map(async (d) => {
-            const q = await this.quota(profileHome, d.provider_id, { refresh: opts.refresh ?? false });
+            const q = await this.quota(profileHome, d.provider_id, { refresh: opts.refresh ?? false, at });
             const limits = dict(q.account_limits);
             return {
-                source_id: d.source_id, provider_id: d.provider_id, provider_label: d.provider_label, account_label: d.provider_label,
+                source_id: d.source_id, provider_id: d.provider_id, provider_label: d.provider_label, account_label: d.account_label,
                 is_active_provider: d.provider_id === active, supported: q.supported === true, status: str(limits.status) || str(q.status) || 'unavailable',
-                plan: limits.plan ?? null, windows: limits.windows ?? [], quota: q.quota ?? null, balances: q.balances ?? [], details: limits.details ?? [],
+                plan: limits.plan ?? null, windows: limits.windows ?? [], pace_window_index: limits.pace_window_index ?? null, session_window_index: limits.session_window_index ?? null, weekly_window_index: limits.weekly_window_index ?? null, quota: q.quota ?? null, balances: q.balances ?? [], details: limits.details ?? [],
                 unavailable_reason: limits.unavailable_reason ?? null, retry_after: limits.retry_after ?? null, fetched_at: limits.fetched_at ?? null, message: q.message ?? null,
             };
         }));
-        return { version: 1, scope_id: scopeId, profile_id: profile, active_provider: active, requested_source_id: requested, missing_source: Boolean(requested && !descriptors.length), sources };
+        return { version: 1, computed_at: isoAt(at), scope_id: scopeId, profile_id: profile, active_provider: active, requested_source_id: requested, missing_source: Boolean(requested && !descriptors.length), sources };
     }
     /** Python `get_provider_cost_history` (OpenRouter only; daily snapshots under `<home>/cost-snapshots`). */
     async costHistory(profileHome, providerRaw, days) {