@slkiser/opencode-quota 4.0.1 → 4.2.0

package/dist/lib/zhipu-auth.js

@@ -1,5 +1,4 @@
-import { extractProviderOptionsApiKey, getApiKeyCheckedPaths, getFirstAuthEntryValue, getGlobalOpencodeConfigCandidatePaths, resolveApiKeyFromEnvAndConfig, } from "./api-key-resolver.js";
-import { sanitizeDisplayText } from "./display-sanitize.js";
+import { createProviderApiKeyResolver, getGlobalOpencodeConfigCandidatePaths, } from "./api-key-resolver.js";
 import { getAuthPaths, readAuthFileCached } from "./opencode-auth.js";
 export const DEFAULT_ZHIPU_AUTH_CACHE_MAX_AGE_MS = 5_000;
 const ZHIPU_AUTH_KEYS = ["zhipu-coding-plan", "zhipuai-coding-plan"];
@@ -11,102 +10,33 @@ const ZHIPU_PROVIDER_KEYS = [
 ];
 const ALLOWED_ZHIPU_ENV_VARS = ["ZHIPU_API_KEY", "ZHIPU_CODING_PLAN_API_KEY"];
 export { getGlobalOpencodeConfigCandidatePaths as getOpencodeConfigCandidatePaths } from "./api-key-resolver.js";
-function getZhipuAuthEntry(auth) {
-    return getFirstAuthEntryValue(auth, ZHIPU_AUTH_KEYS);
-}
-function isZhipuAuthData(value) {
-    return value !== null && typeof value === "object";
-}
-function sanitizeZhipuAuthValue(value) {
-    const sanitized = sanitizeDisplayText(value).replace(/\s+/g, " ").trim();
-    return (sanitized || "unknown").slice(0, 120);
-}
+const zhipuAuthResolver = createProviderApiKeyResolver({
+    envVars: [
+        { name: "ZHIPU_API_KEY", source: "env:ZHIPU_API_KEY" },
+        { name: "ZHIPU_CODING_PLAN_API_KEY", source: "env:ZHIPU_CODING_PLAN_API_KEY" },
+    ],
+    providerKeys: ZHIPU_PROVIDER_KEYS,
+    allowedEnvVars: ALLOWED_ZHIPU_ENV_VARS,
+    configJsonSource: "opencode.json",
+    configJsoncSource: "opencode.jsonc",
+    getConfigCandidates: getGlobalOpencodeConfigCandidatePaths,
+    auth: {
+        policy: "invalid-aware-api-key",
+        authKeys: ZHIPU_AUTH_KEYS,
+        authSource: "auth.json",
+        displayName: "Zhipu",
+        defaultMaxAgeMs: DEFAULT_ZHIPU_AUTH_CACHE_MAX_AGE_MS,
+        readAuth: (maxAgeMs) => readAuthFileCached({ maxAgeMs }),
+        getAuthPaths,
+    },
+});
 export function resolveZhipuAuth(auth) {
-    const zhipu = getZhipuAuthEntry(auth);
-    if (zhipu === null || zhipu === undefined) {
-        return { state: "none" };
-    }
-    if (!isZhipuAuthData(zhipu)) {
-        return { state: "invalid", error: "Zhipu auth entry has invalid shape" };
-    }
-    if (typeof zhipu.type !== "string") {
-        return { state: "invalid", error: "Zhipu auth entry present but type is missing or invalid" };
-    }
-    if (zhipu.type !== "api") {
-        return {
-            state: "invalid",
-            error: `Unsupported Zhipu auth type: "${sanitizeZhipuAuthValue(zhipu.type)}"`,
-        };
-    }
-    const key = typeof zhipu.key === "string" ? zhipu.key.trim() : "";
-    if (!key) {
-        return { state: "invalid", error: "Zhipu auth entry present but key is empty" };
-    }
-    return { state: "configured", apiKey: key };
-}
-async function resolveZhipuAuthWithSource(params) {
-    const resolvedFromEnvOrConfig = await resolveApiKeyFromEnvAndConfig({
-        envVars: [
-            { name: "ZHIPU_API_KEY", source: "env:ZHIPU_API_KEY" },
-            {
-                name: "ZHIPU_CODING_PLAN_API_KEY",
-                source: "env:ZHIPU_CODING_PLAN_API_KEY",
-            },
-        ],
-        extractFromConfig: (config) => extractProviderOptionsApiKey(config, {
-            providerKeys: ZHIPU_PROVIDER_KEYS,
-            allowedEnvVars: ALLOWED_ZHIPU_ENV_VARS,
-        }),
-        configJsonSource: "opencode.json",
-        configJsoncSource: "opencode.jsonc",
-        getConfigCandidates: getGlobalOpencodeConfigCandidatePaths,
-    });
-    if (resolvedFromEnvOrConfig) {
-        return {
-            auth: { state: "configured", apiKey: resolvedFromEnvOrConfig.key },
-            source: resolvedFromEnvOrConfig.source,
-        };
-    }
-    const maxAgeMs = Math.max(0, params?.maxAgeMs ?? DEFAULT_ZHIPU_AUTH_CACHE_MAX_AGE_MS);
-    const authData = await readAuthFileCached({ maxAgeMs });
-    const auth = resolveZhipuAuth(authData);
-    return {
-        auth,
-        source: auth.state === "none" ? null : "auth.json",
-    };
+    return zhipuAuthResolver.parseAuth(auth);
 }
 export async function resolveZhipuAuthCached(params) {
-    return (await resolveZhipuAuthWithSource(params)).auth;
+    return zhipuAuthResolver.resolve(params);
 }
 export async function getZhipuAuthDiagnostics(params) {
-    const { auth, source } = await resolveZhipuAuthWithSource(params);
-    const checkedPaths = getApiKeyCheckedPaths({
-        envVarNames: [...ALLOWED_ZHIPU_ENV_VARS],
-        getConfigCandidates: getGlobalOpencodeConfigCandidatePaths,
-    });
-    const authPaths = getAuthPaths();
-    if (auth.state === "none") {
-        return {
-            state: "none",
-            source: null,
-            checkedPaths,
-            authPaths,
-        };
-    }
-    if (auth.state === "invalid") {
-        return {
-            state: "invalid",
-            source: "auth.json",
-            checkedPaths,
-            authPaths,
-            error: auth.error,
-        };
-    }
-    return {
-        state: "configured",
-        source: source ?? "auth.json",
-        checkedPaths,
-        authPaths,
-    };
+    return zhipuAuthResolver.diagnostics(params);
 }
 //# sourceMappingURL=zhipu-auth.js.map

package/dist/lib/zhipu-auth.js.map

@@ -1 +1 @@
-{"version":3,"file":"zhipu-auth.js","sourceRoot":"","sources":["../../src/lib/zhipu-auth.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"zhipu-auth.js","sourceRoot":"","sources":["../../src/lib/zhipu-auth.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,4BAA4B,EAC5B,qCAAqC,GACtC,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAKtE,MAAM,CAAC,MAAM,mCAAmC,GAAG,KAAK,CAAC;AACzD,MAAM,eAAe,GAAG,CAAC,mBAAmB,EAAE,qBAAqB,CAAU,CAAC;AAC9E,MAAM,mBAAmB,GAAG;IAC1B,OAAO;IACP,mBAAmB;IACnB,qBAAqB;IACrB,iBAAiB;CACT,CAAC;AACX,MAAM,sBAAsB,GAAG,CAAC,eAAe,EAAE,2BAA2B,CAAU,CAAC;AAYvF,OAAO,EAAE,qCAAqC,IAAI,+BAA+B,EAAE,MAAM,uBAAuB,CAAC;AAEjH,MAAM,iBAAiB,GAAG,4BAA4B,CAA8B;IAClF,OAAO,EAAE;QACP,EAAE,IAAI,EAAE,eAAe,EAAE,MAAM,EAAE,mBAAmB,EAAE;QACtD,EAAE,IAAI,EAAE,2BAA2B,EAAE,MAAM,EAAE,+BAA+B,EAAE;KAC/E;IACD,YAAY,EAAE,mBAAmB;IACjC,cAAc,EAAE,sBAAsB;IACtC,gBAAgB,EAAE,eAAe;IACjC,iBAAiB,EAAE,gBAAgB;IACnC,mBAAmB,EAAE,qCAAqC;IAC1D,IAAI,EAAE;QACJ,MAAM,EAAE,uBAAuB;QAC/B,QAAQ,EAAE,eAAe;QACzB,UAAU,EAAE,WAAW;QACvB,WAAW,EAAE,OAAO;QACpB,eAAe,EAAE,mCAAmC;QACpD,QAAQ,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,kBAAkB,CAAC,EAAE,QAAQ,EAAE,CAAC;QACxD,YAAY;KACb;CACF,CAAC,CAAC;AAEH,MAAM,UAAU,gBAAgB,CAAC,IAAiC;IAChE,OAAO,iBAAiB,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;AAC3C,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAAC,MAE5C;IACC,OAAO,iBAAiB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;AAC3C,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAAC,MAE7C;IACC,OAAO,iBAAiB,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;AAC/C,CAAC"}

package/dist/lib/zhipu.d.ts

@@ -1,11 +1,4 @@
-/**
- * Zhipu quota fetcher
- *
- * Uses OpenCode's auth.json (zhipu-coding-plan) and queries:
- * https://bigmodel.cn/api/monitor/usage/quota/limit
- */
-import type { ZaiResult } from "./types.js";
 export declare function queryZhipuQuota(options?: {
     requestTimeoutMs?: number;
-}): Promise<ZaiResult>;
+}): Promise<import("./types.js").ZaiResult>;
 //# sourceMappingURL=zhipu.d.ts.map

package/dist/lib/zhipu.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"zhipu.d.ts","sourceRoot":"","sources":["../../src/lib/zhipu.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAKH,OAAO,KAAK,EACV,SAAS,EAEV,MAAM,YAAY,CAAC;AAKpB,wBAAsB,eAAe,CAAC,OAAO,GAAE;IAAE,gBAAgB,CAAC,EAAE,MAAM,CAAA;CAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CA+ErG"}
+{"version":3,"file":"zhipu.d.ts","sourceRoot":"","sources":["../../src/lib/zhipu.ts"],"names":[],"mappings":"AAWA,wBAAgB,eAAe,CAAC,OAAO,GAAE;IAAE,gBAAgB,CAAC,EAAE,MAAM,CAAA;CAAO,2CAE1E"}

package/dist/lib/zhipu.js

@@ -1,87 +1,13 @@
-/**
- * Zhipu quota fetcher
- *
- * Uses OpenCode's auth.json (zhipu-coding-plan) and queries:
- * https://bigmodel.cn/api/monitor/usage/quota/limit
- */
-import { clampPercent } from "./format-utils.js";
-import { sanitizeDisplaySnippet, sanitizeDisplayText } from "./display-sanitize.js";
-import { fetchWithTimeout } from "./http.js";
+import { queryGlmCodingPlanQuota } from "./glm-coding-plan.js";
 import { resolveZhipuAuthCached } from "./zhipu-auth.js";
-const ZHIPU_QUOTA_URL = "https://bigmodel.cn/api/monitor/usage/quota/limit";
-export async function queryZhipuQuota(options = {}) {
-    const auth = await resolveZhipuAuthCached();
-    if (auth.state === "none")
-        return null;
-    if (auth.state === "invalid") {
-        return { success: false, error: auth.error };
-    }
-    try {
-        const headers = {
-            Authorization: auth.apiKey,
-            "User-Agent": "OpenCode-Quota-Toast/1.0",
-            "Content-Type": "application/json",
-        };
-        const resp = await fetchWithTimeout(ZHIPU_QUOTA_URL, { headers }, options.requestTimeoutMs);
-        if (!resp.ok) {
-            const text = await resp.text();
-            return {
-                success: false,
-                error: `Zhipu API error ${resp.status}: ${sanitizeDisplaySnippet(text, 120)}`,
-            };
-        }
-        const data = (await resp.json());
-        const limits = data.data.limits;
-        if (!limits || !Array.isArray(limits)) {
-            return { success: false, error: "Invalid quota data" };
-        }
-        let fiveHourWindow;
-        let weeklyWindow;
-        let mcpWindow;
-        for (const limit of limits) {
-            const percentRemaining = clampPercent(100 - limit.percentage);
-            let resetTimeIso;
-            if (limit.nextResetTime) {
-                const ms = Math.round(limit.nextResetTime);
-                if (Number.isFinite(ms) && ms > 0) {
-                    resetTimeIso = new Date(ms).toISOString();
-                }
-            }
-            const window = { percentRemaining, resetTimeIso };
-            if (limit.type === "TOKENS_LIMIT") {
-                if (limit.unit === 3) {
-                    // unit 3 is the 5-hour token window (Standard Lite/Pro/Max).
-                    fiveHourWindow = window;
-                }
-                else if (limit.unit === 6) {
-                    // unit 6 is the weekly token window.
-                    weeklyWindow = window;
-                }
-                else if (limit.unit === 4) {
-                    // unit 4 is daily. Do not surface it as weekly in the current UI/report shape.
-                    continue;
-                }
-            }
-            else if (limit.type === "TIME_LIMIT") {
-                // TIME_LIMIT (unit 5) is typically the Monthly MCP limit
-                mcpWindow = window;
-            }
-        }
-        return {
-            success: true,
-            label: "Zhipu",
-            windows: {
-                fiveHour: fiveHourWindow,
-                weekly: weeklyWindow,
-                mcp: mcpWindow,
-            },
-        };
-    }
-    catch (err) {
-        return {
-            success: false,
-            error: sanitizeDisplayText(err instanceof Error ? err.message : String(err)),
-        };
-    }
+const ZHIPU_QUOTA = {
+    label: "Zhipu",
+    endpoint: "https://bigmodel.cn/api/monitor/usage/quota/limit",
+    httpErrorPrefix: "Zhipu API error",
+    envelope: "zhipu",
+    resolveAuth: resolveZhipuAuthCached,
+};
+export function queryZhipuQuota(options = {}) {
+    return queryGlmCodingPlanQuota(ZHIPU_QUOTA, options);
 }
 //# sourceMappingURL=zhipu.js.map

package/dist/lib/zhipu.js.map

@@ -1 +1 @@
-{"version":3,"file":"zhipu.js","sourceRoot":"","sources":["../../src/lib/zhipu.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"zhipu.js","sourceRoot":"","sources":["../../src/lib/zhipu.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAC/D,OAAO,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AAEzD,MAAM,WAAW,GAAG;IAClB,KAAK,EAAE,OAAO;IACd,QAAQ,EAAE,mDAAmD;IAC7D,eAAe,EAAE,iBAAiB;IAClC,QAAQ,EAAE,OAAO;IACjB,WAAW,EAAE,sBAAsB;CAC3B,CAAC;AAEX,MAAM,UAAU,eAAe,CAAC,UAAyC,EAAE;IACzE,OAAO,uBAAuB,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;AACvD,CAAC"}

package/dist/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AA6MlD;;GAEG;AACH,eAAO,MAAM,gBAAgB,EAAE,MAsrC9B,CAAC"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAkMlD;;GAEG;AACH,eAAO,MAAM,gBAAgB,EAAE,MAoiC9B,CAAC"}

package/dist/plugin.js

@@ -12,17 +12,15 @@ import { getOrFetchWithCacheControl } from "./lib/cache.js";
 import { formatQuotaRows } from "./lib/format.js";
 import { getProviders } from "./providers/registry.js";
 import { tool } from "@opencode-ai/plugin";
-import { buildQuotaStatusReport } from "./lib/quota-status.js";
 import { inspectTuiConfig } from "./lib/tui-config-diagnostics.js";
 import { maybeRefreshPricingSnapshot, setPricingSnapshotAutoRefresh, setPricingSnapshotSelection, } from "./lib/modelsdev-pricing.js";
-import { refreshGoogleTokensForAllAccounts } from "./lib/google.js";
 import { DEFAULT_ALIBABA_AUTH_CACHE_MAX_AGE_MS, isAlibabaModelId, resolveAlibabaCodingPlanAuthCached, } from "./lib/alibaba-auth.js";
 import { isQwenCodeModelId, resolveQwenLocalPlanCached } from "./lib/qwen-auth.js";
 import { isCursorModelId, isCursorProviderId } from "./lib/cursor-pricing.js";
 import { sanitizeDisplayText } from "./lib/display-sanitize.js";
-import { SINGLE_WINDOW_PER_PROVIDER_FORMAT_STYLE, resolveQuotaFormatStyle, } from "./lib/quota-format-style.js";
-import { collectQuotaRenderData, collectQuotaStatusLiveProbes, matchesQuotaProviderCurrentSelection, } from "./lib/quota-render-data.js";
-import { createQuotaProviderRuntimeContext, createQuotaRuntimeRequestContext, resolveQuotaRuntimeContext, } from "./lib/quota-runtime-context.js";
+import { resolveQuotaFormatStyle } from "./lib/quota-format-style.js";
+import { collectQuotaRenderData } from "./lib/quota-render-data.js";
+import { createQuotaRuntimeRequestContext, resolveQuotaRuntimeContext, } from "./lib/quota-runtime-context.js";
 import { findGitWorktreeRoot, getEffectiveConfigRoot } from "./lib/config-file-utils.js";
 import { reconcileDetectedProvidersInGlobalConfig } from "./lib/opencode-config-providers.js";
 import { BUNDLED_MAINTAINER_ANNOUNCEMENTS, formatMaintainerAnnouncementHomeCountLine, getMaintainerAnnouncementsSummary, } from "./lib/maintainer-announcements.js";
@@ -579,6 +577,7 @@ export const QuotaToastPlugin = async ({ client, directory }) => {
         const quotaRequestContext = createQuotaRuntimeRequestContext(runtime);
         const quotaResult = await collectQuotaRenderData({
             client: runtime.client,
+            resolveRuntimeProviderIds: runtime.resolveRuntimeProviderIds,
             config: runtimeConfig,
             configMeta: runtime.configMeta,
             request: quotaRequestContext,
@@ -632,6 +631,7 @@ export const QuotaToastPlugin = async ({ client, directory }) => {
                 errors: data?.errors ?? [],
                 style: resolveQuotaFormatStyle(runtimeConfig.formatStyle),
                 percentDisplayMode: runtimeConfig.percentDisplayMode,
+                resetTimeDecimals: runtimeConfig.resetTimeDecimals,
                 sessionTokens: data?.sessionTokens,
             });
             const retryableMaskedProviderFailure = !hasProviderQuotaRows && providerFetchFailureOnly;
@@ -721,10 +721,6 @@ export const QuotaToastPlugin = async ({ client, directory }) => {
             detectedProviderIds,
         };
     }
-    async function fetchQuotaMessage(params) {
-        const result = await fetchQuotaMessageResult(params);
-        return result.message;
-    }
     async function reconcileDeferredQuotaRefresh(params) {
         const existing = deferredQuotaRefreshes.get(params.sessionID);
         if (!params.result.retryable) {
@@ -859,135 +855,6 @@ export const QuotaToastPlugin = async ({ client, directory }) => {
             }
         }
     }
-    async function buildStatusReport(params) {
-        const runtime = await resolvePluginRuntimeContext({
-            sessionID: params.sessionID,
-            includeSessionMeta: true,
-        });
-        const runtimeConfig = runtime.config;
-        if (!runtimeConfig.enabled)
-            return null;
-        await kickPricingRefresh({ reason: "status", maxWaitMs: 750 });
-        const currentSession = runtime.session.sessionMeta ?? {};
-        const currentModel = currentSession.modelID;
-        const currentProviderID = currentSession.providerID;
-        const sessionModelLookup = !params.sessionID
-            ? "no_session"
-            : currentModel
-                ? "ok"
-                : "not_found";
-        const isAutoMode = runtimeConfig.enabledProviders === "auto";
-        const providers = runtime.providers;
-        const providerContext = createQuotaProviderRuntimeContext(runtime);
-        const availability = await Promise.all(providers.map(async (p) => {
-            let ok = false;
-            try {
-                ok = await p.isAvailable(providerContext);
-            }
-            catch {
-                ok = false;
-            }
-            return {
-                id: p.id,
-                // In auto mode, a provider is effectively "enabled" if it's available.
-                enabled: isAutoMode ? ok : runtimeConfig.enabledProviders.includes(p.id),
-                available: ok,
-                matchesCurrentModel: currentModel || isCursorProviderId(currentProviderID)
-                    ? matchesQuotaProviderCurrentSelection({
-                        provider: p,
-                        currentModel,
-                        currentProviderID,
-                        enabledProviders: runtimeConfig.enabledProviders,
-                        quotaProviders: runtimeConfig.quotaProviders,
-                    })
-                    : undefined,
-            };
-        }));
-        if (isAutoMode) {
-            await reconcileDetectedProviderConfig(availability.filter((item) => item.available).map((item) => item.id));
-        }
-        const providersById = new Map(providers.map((provider) => [provider.id, provider]));
-        const liveProbeProviders = availability.flatMap((item) => {
-            if (!item.enabled || !item.available) {
-                return [];
-            }
-            const provider = providersById.get(item.id);
-            return provider ? [provider] : [];
-        });
-        let providerLiveProbes = [];
-        if (liveProbeProviders.length > 0) {
-            try {
-                providerLiveProbes = await collectQuotaStatusLiveProbes({
-                    client: runtime.client,
-                    config: runtimeConfig,
-                    configMeta: runtime.configMeta,
-                    request: createQuotaRuntimeRequestContext(runtime),
-                    formatStyle: SINGLE_WINDOW_PER_PROVIDER_FORMAT_STYLE,
-                    providers: liveProbeProviders,
-                });
-            }
-            catch (error) {
-                await typedClient.app.log({
-                    body: {
-                        service: "quota-toast",
-                        level: "warn",
-                        message: "Failed to collect /quota_status live probes",
-                        extra: {
-                            providers: liveProbeProviders.map((provider) => provider.id),
-                            error: error instanceof Error ? error.message : String(error),
-                        },
-                    },
-                });
-            }
-        }
-        const refresh = params.refreshGoogleTokens
-            ? await refreshGoogleTokensForAllAccounts({ skewMs: params.skewMs, force: params.force })
-            : null;
-        const tuiDiagnostics = await inspectTuiConfig({ roots: runtime.roots });
-        const announcementProviderIds = availability
-            .filter((item) => item.enabled && item.available)
-            .map((item) => item.id);
-        const maintainerAnnouncementsSummary = getMaintainerAnnouncementsSummary({
-            enabledProviders: announcementProviderIds,
-        });
-        return await buildQuotaStatusReport({
-            tuiDiagnostics,
-            configSource: runtime.configMeta.source,
-            configPaths: runtime.configMeta.paths,
-            globalConfigPaths: runtime.configMeta.globalConfigPaths,
-            workspaceConfigPaths: runtime.configMeta.workspaceConfigPaths,
-            settingSources: runtime.configMeta.settingSources,
-            configIssues: runtime.configMeta.configIssues,
-            enabledProviders: runtimeConfig.enabledProviders,
-            anthropicBinaryPath: runtimeConfig.anthropicBinaryPath,
-            cursorPlan: runtimeConfig.cursorPlan,
-            cursorIncludedApiUsd: runtimeConfig.cursorIncludedApiUsd,
-            cursorBillingCycleStartDay: runtimeConfig.cursorBillingCycleStartDay,
-            opencodeGoWindows: runtimeConfig.opencodeGoWindows,
-            pricingSnapshotSource: runtimeConfig.pricingSnapshot.source,
-            onlyCurrentModel: runtimeConfig.onlyCurrentModel,
-            currentModel,
-            sessionModelLookup,
-            providerAvailability: availability,
-            providerLiveProbes,
-            quotaProviders: runtimeConfig.quotaProviders,
-            googleRefresh: refresh
-                ? {
-                    attempted: true,
-                    total: refresh.total,
-                    successCount: refresh.successCount,
-                    failures: refresh.failures,
-                }
-                : { attempted: false },
-            sessionTokenError: lastSessionTokenError,
-            maintainerAnnouncements: {
-                config: runtimeConfig.maintainerAnnouncements,
-                summary: maintainerAnnouncementsSummary,
-            },
-            geminiCliClient: typedClient,
-            generatedAtMs: params.generatedAtMs,
-        });
-    }
     // Return hook implementations
     return {
         config: async (input) => {
@@ -1025,17 +892,25 @@ export const QuotaToastPlugin = async ({ client, directory }) => {
                         .describe("If true, refresh even if cached token looks valid"),
                 },
                 async execute(args, context) {
-                    const out = await buildStatusReport({
-                        refreshGoogleTokens: args.refreshGoogleTokens,
-                        skewMs: args.skewMs,
-                        force: args.force,
+                    const result = await buildQuotaDialogCommandOutput({
+                        command: "quota_status",
+                        arguments: JSON.stringify({
+                            refreshGoogleTokens: args.refreshGoogleTokens,
+                            skewMs: args.skewMs,
+                            force: args.force,
+                        }),
+                        client: typedClient,
+                        roots: getPluginRuntimeRootHints(),
                         sessionID: context.sessionID,
-                        generatedAtMs: Date.now(),
+                        resolveSessionMeta: (sessionID) => getSessionModelMeta(sessionID),
+                        lastSessionTokenError,
+                        log,
+                        onDetectedProviderIds: reconcileDetectedProviderConfig,
                     });
-                    if (!out)
+                    if (result.state !== "output")
                         return "";
                     context.metadata({ title: "Quota Status" });
-                    await injectRawOutput(context.sessionID, out);
+                    await injectRawOutput(context.sessionID, result.output);
                     return ""; // Empty return - output already injected with noReply
                 },
             }),