@slkiser/opencode-quota 4.0.1 → 4.2.0

package/dist/lib/xai.d.ts

@@ -0,0 +1,39 @@
+/**
+ * xAI SuperGrok subscription quota fetcher.
+ *
+ * Uses OpenCode's read-only `xai` OAuth entry and queries the same shared
+ * period meter exposed by Grok Build:
+ * GET https://cli-chat-proxy.grok.com/v1/billing?format=credits
+ *
+ * OpenCode remains the sole owner of OAuth refresh and auth.json persistence.
+ */
+import type { AuthData, QuotaError } from "./types.js";
+export declare const DEFAULT_XAI_AUTH_CACHE_MAX_AGE_MS = 5000;
+export type XaiPeriodKind = "weekly" | "monthly" | "daily" | "period";
+export interface XaiWindowValue {
+    percentRemaining: number;
+    resetTimeIso?: string;
+    kind: XaiPeriodKind;
+}
+export type XaiResult = {
+    success: true;
+    label: "xAI SuperGrok";
+    window: XaiWindowValue;
+} | QuotaError | null;
+export type ResolvedXaiOAuth = {
+    state: "none";
+} | {
+    state: "configured";
+    accessToken: string;
+    expiresAt?: number;
+};
+export declare function periodKindLabel(kind: XaiPeriodKind): string;
+export declare function resolveXaiOAuth(auth: AuthData | null | undefined): ResolvedXaiOAuth;
+export declare function hasXaiOAuth(auth: AuthData | null | undefined): boolean;
+export declare function hasXaiOAuthCached(params?: {
+    maxAgeMs?: number;
+}): Promise<boolean>;
+export declare function queryXaiQuota(options?: {
+    requestTimeoutMs?: number;
+}): Promise<XaiResult>;
+//# sourceMappingURL=xai.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"xai.d.ts","sourceRoot":"","sources":["../../src/lib/xai.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAMH,OAAO,KAAK,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAEvD,eAAO,MAAM,iCAAiC,OAAQ,CAAC;AAKvD,MAAM,MAAM,aAAa,GAAG,QAAQ,GAAG,SAAS,GAAG,OAAO,GAAG,QAAQ,CAAC;AAEtE,MAAM,WAAW,cAAc;IAC7B,gBAAgB,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,IAAI,EAAE,aAAa,CAAC;CACrB;AAED,MAAM,MAAM,SAAS,GACjB;IACE,OAAO,EAAE,IAAI,CAAC;IACd,KAAK,EAAE,eAAe,CAAC;IACvB,MAAM,EAAE,cAAc,CAAC;CACxB,GACD,UAAU,GACV,IAAI,CAAC;AAET,MAAM,MAAM,gBAAgB,GACxB;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,GACjB;IACE,KAAK,EAAE,YAAY,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AA0BN,wBAAgB,eAAe,CAAC,IAAI,EAAE,aAAa,GAAG,MAAM,CAW3D;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,QAAQ,GAAG,IAAI,GAAG,SAAS,GAAG,gBAAgB,CAenF;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,QAAQ,GAAG,IAAI,GAAG,SAAS,GAAG,OAAO,CAEtE;AAED,wBAAsB,iBAAiB,CAAC,MAAM,CAAC,EAAE;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAKxF;AAwCD,wBAAsB,aAAa,CACjC,OAAO,GAAE;IAAE,gBAAgB,CAAC,EAAE,MAAM,CAAA;CAAO,GAC1C,OAAO,CAAC,SAAS,CAAC,CAmDpB"}

package/dist/lib/xai.js

@@ -0,0 +1,153 @@
+/**
+ * xAI SuperGrok subscription quota fetcher.
+ *
+ * Uses OpenCode's read-only `xai` OAuth entry and queries the same shared
+ * period meter exposed by Grok Build:
+ * GET https://cli-chat-proxy.grok.com/v1/billing?format=credits
+ *
+ * OpenCode remains the sole owner of OAuth refresh and auth.json persistence.
+ */
+import { sanitizeSingleLineDisplaySnippet } from "./display-sanitize.js";
+import { clampPercent } from "./format-utils.js";
+import { fetchWithTimeout } from "./http.js";
+import { readAuthFile, readAuthFileCached } from "./opencode-auth.js";
+export const DEFAULT_XAI_AUTH_CACHE_MAX_AGE_MS = 5_000;
+const CREDITS_URL = "https://cli-chat-proxy.grok.com/v1/billing?format=credits";
+const USER_AGENT = "OpenCode-Quota-Toast/1.0";
+function isRecord(value) {
+    return Boolean(value) && typeof value === "object" && !Array.isArray(value);
+}
+function getNonEmptyString(value) {
+    return typeof value === "string" && value.trim().length > 0 ? value.trim() : undefined;
+}
+function isoOrUndefined(value) {
+    const raw = getNonEmptyString(value);
+    if (!raw)
+        return undefined;
+    const date = new Date(raw);
+    return Number.isNaN(date.getTime()) ? undefined : date.toISOString();
+}
+function periodKindFromType(value) {
+    const raw = getNonEmptyString(value)?.toUpperCase() ?? "";
+    if (raw.includes("WEEK"))
+        return "weekly";
+    if (raw.includes("MONTH"))
+        return "monthly";
+    if (raw.includes("DAY"))
+        return "daily";
+    return "period";
+}
+export function periodKindLabel(kind) {
+    switch (kind) {
+        case "weekly":
+            return "Weekly";
+        case "monthly":
+            return "Monthly";
+        case "daily":
+            return "Daily";
+        default:
+            return "Period";
+    }
+}
+export function resolveXaiOAuth(auth) {
+    const entry = auth?.xai;
+    if (!entry || entry.type !== "oauth")
+        return { state: "none" };
+    const accessToken = typeof entry.access === "string" ? entry.access.trim() : "";
+    if (!accessToken)
+        return { state: "none" };
+    return {
+        state: "configured",
+        accessToken,
+        expiresAt: typeof entry.expires === "number" && Number.isFinite(entry.expires)
+            ? entry.expires
+            : undefined,
+    };
+}
+export function hasXaiOAuth(auth) {
+    return resolveXaiOAuth(auth).state === "configured";
+}
+export async function hasXaiOAuthCached(params) {
+    const auth = await readAuthFileCached({
+        maxAgeMs: Math.max(0, params?.maxAgeMs ?? DEFAULT_XAI_AUTH_CACHE_MAX_AGE_MS),
+    });
+    return hasXaiOAuth(auth);
+}
+function parseCreditsWindow(payload) {
+    if (!isRecord(payload) || !isRecord(payload.config)) {
+        throw new Error("xAI credits response returned an unexpected response shape");
+    }
+    const config = payload.config;
+    const period = isRecord(config.currentPeriod) ? config.currentPeriod : null;
+    const hasUsage = Object.prototype.hasOwnProperty.call(config, "creditUsagePercent");
+    const hasPeriod = Boolean(getNonEmptyString(period?.type) ||
+        getNonEmptyString(period?.start) ||
+        getNonEmptyString(period?.end));
+    if (!hasPeriod && !hasUsage)
+        return null;
+    if (hasUsage &&
+        (typeof config.creditUsagePercent !== "number" || !Number.isFinite(config.creditUsagePercent))) {
+        throw new Error("xAI credits response returned an invalid usage percentage");
+    }
+    // Protobuf JSON omits zero-valued fields, so an absent percentage with a
+    // current period means 0% used rather than missing quota.
+    const usedPercent = hasUsage ? config.creditUsagePercent : 0;
+    return {
+        percentRemaining: clampPercent(100 - usedPercent),
+        resetTimeIso: isoOrUndefined(period?.end) ?? isoOrUndefined(config.billingPeriodEnd),
+        kind: periodKindFromType(period?.type),
+    };
+}
+function safeErrorText(message, accessToken) {
+    const redacted = accessToken ? message.split(accessToken).join("[redacted]") : message;
+    return sanitizeSingleLineDisplaySnippet(redacted, 160);
+}
+export async function queryXaiQuota(options = {}) {
+    // OpenCode can replace this OAuth entry while servicing a model request.
+    // Read the file directly so a post-request quota fetch cannot reuse the
+    // token snapshot from before that refresh.
+    const resolvedAuth = resolveXaiOAuth(await readAuthFile());
+    if (resolvedAuth.state !== "configured")
+        return null;
+    if (resolvedAuth.expiresAt !== undefined && resolvedAuth.expiresAt <= Date.now()) {
+        return {
+            success: false,
+            error: "xAI OAuth token expired; use xAI in OpenCode to refresh it or reconnect xAI",
+        };
+    }
+    try {
+        return await fetchWithTimeout(CREDITS_URL, {
+            request: {
+                method: "GET",
+                headers: {
+                    Authorization: `Bearer ${resolvedAuth.accessToken}`,
+                    Accept: "application/json",
+                    "User-Agent": USER_AGENT,
+                    "x-grok-client-surface": "grok-build",
+                    "x-grok-client-version": "1.0.0",
+                },
+            },
+            timeoutMs: options.requestTimeoutMs,
+            consume: async (response) => {
+                if (!response.ok) {
+                    const body = await response.text();
+                    return {
+                        success: false,
+                        error: `xAI API error ${response.status}: ${safeErrorText(body, resolvedAuth.accessToken)}`,
+                    };
+                }
+                const window = parseCreditsWindow(await response.json());
+                if (!window)
+                    return { success: false, error: "No weekly quota data" };
+                return { success: true, label: "xAI SuperGrok", window };
+            },
+        });
+    }
+    catch (error) {
+        return {
+            success: false,
+            error: safeErrorText(error instanceof Error ? error.message : String(error), resolvedAuth.accessToken),
+        };
+    }
+}
+//# sourceMappingURL=xai.js.map

package/dist/lib/xai.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"xai.js","sourceRoot":"","sources":["../../src/lib/xai.ts"],"names":[],"mappings":"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"}

package/dist/lib/zai-auth.d.ts

@@ -1,32 +1,9 @@
+import type { InvalidAwareAuthDiagnostics, InvalidAwareAuthResult } from "./api-key-resolver.js";
 import type { AuthData } from "./types.js";
 export declare const DEFAULT_ZAI_AUTH_CACHE_MAX_AGE_MS = 5000;
 export type ZaiKeySource = "env:ZAI_API_KEY" | "env:ZAI_CODING_PLAN_API_KEY" | "opencode.json" | "opencode.jsonc" | "auth.json";
-export type ResolvedZaiAuth = {
-    state: "none";
-} | {
-    state: "configured";
-    apiKey: string;
-} | {
-    state: "invalid";
-    error: string;
-};
-export type ZaiAuthDiagnostics = {
-    state: "none";
-    source: null;
-    checkedPaths: string[];
-    authPaths: string[];
-} | {
-    state: "configured";
-    source: ZaiKeySource;
-    checkedPaths: string[];
-    authPaths: string[];
-} | {
-    state: "invalid";
-    source: "auth.json";
-    checkedPaths: string[];
-    authPaths: string[];
-    error: string;
-};
+export type ResolvedZaiAuth = InvalidAwareAuthResult;
+export type ZaiAuthDiagnostics = InvalidAwareAuthDiagnostics<ZaiKeySource, "auth.json">;
 export { getGlobalOpencodeConfigCandidatePaths as getOpencodeConfigCandidatePaths } from "./api-key-resolver.js";
 export declare function resolveZaiAuth(auth: AuthData | null | undefined): ResolvedZaiAuth;
 export declare function resolveZaiAuthCached(params?: {

package/dist/lib/zai-auth.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"zai-auth.d.ts","sourceRoot":"","sources":["../../src/lib/zai-auth.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,QAAQ,EAAe,MAAM,YAAY,CAAC;AAExD,eAAO,MAAM,iCAAiC,OAAQ,CAAC;AAKvD,MAAM,MAAM,YAAY,GACpB,iBAAiB,GACjB,6BAA6B,GAC7B,eAAe,GACf,gBAAgB,GAChB,WAAW,CAAC;AAEhB,MAAM,MAAM,eAAe,GACvB;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,GACjB;IAAE,KAAK,EAAE,YAAY,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GACvC;IAAE,KAAK,EAAE,SAAS,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAExC,MAAM,MAAM,kBAAkB,GAC1B;IACE,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,IAAI,CAAC;IACb,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,SAAS,EAAE,MAAM,EAAE,CAAC;CACrB,GACD;IACE,KAAK,EAAE,YAAY,CAAC;IACpB,MAAM,EAAE,YAAY,CAAC;IACrB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,SAAS,EAAE,MAAM,EAAE,CAAC;CACrB,GACD;IACE,KAAK,EAAE,SAAS,CAAC;IACjB,MAAM,EAAE,WAAW,CAAC;IACpB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEN,OAAO,EAAE,qCAAqC,IAAI,+BAA+B,EAAE,MAAM,uBAAuB,CAAC;AAejH,wBAAgB,cAAc,CAAC,IAAI,EAAE,QAAQ,GAAG,IAAI,GAAG,SAAS,GAAG,eAAe,CA2BjF;AAwCD,wBAAsB,oBAAoB,CAAC,MAAM,CAAC,EAAE;IAClD,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,GAAG,OAAO,CAAC,eAAe,CAAC,CAE3B;AAED,wBAAsB,qBAAqB,CAAC,MAAM,CAAC,EAAE;IACnD,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAiC9B"}
+{"version":3,"file":"zai-auth.d.ts","sourceRoot":"","sources":["../../src/lib/zai-auth.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,2BAA2B,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AACjG,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAE3C,eAAO,MAAM,iCAAiC,OAAQ,CAAC;AAKvD,MAAM,MAAM,YAAY,GACpB,iBAAiB,GACjB,6BAA6B,GAC7B,eAAe,GACf,gBAAgB,GAChB,WAAW,CAAC;AAEhB,MAAM,MAAM,eAAe,GAAG,sBAAsB,CAAC;AACrD,MAAM,MAAM,kBAAkB,GAAG,2BAA2B,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;AAExF,OAAO,EAAE,qCAAqC,IAAI,+BAA+B,EAAE,MAAM,uBAAuB,CAAC;AAuBjH,wBAAgB,cAAc,CAAC,IAAI,EAAE,QAAQ,GAAG,IAAI,GAAG,SAAS,GAAG,eAAe,CAEjF;AAED,wBAAsB,oBAAoB,CAAC,MAAM,CAAC,EAAE;IAClD,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,GAAG,OAAO,CAAC,eAAe,CAAC,CAE3B;AAED,wBAAsB,qBAAqB,CAAC,MAAM,CAAC,EAAE;IACnD,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAE9B"}

package/dist/lib/zai-auth.js

@@ -1,107 +1,37 @@
-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_ZAI_AUTH_CACHE_MAX_AGE_MS = 5_000;
 const ZAI_AUTH_KEYS = ["zai-coding-plan"];
 const ZAI_PROVIDER_KEYS = ["zai", "zai-coding-plan", "glm"];
 const ALLOWED_ZAI_ENV_VARS = ["ZAI_API_KEY", "ZAI_CODING_PLAN_API_KEY"];
 export { getGlobalOpencodeConfigCandidatePaths as getOpencodeConfigCandidatePaths } from "./api-key-resolver.js";
-function getZaiAuthEntry(auth) {
-    return getFirstAuthEntryValue(auth, ZAI_AUTH_KEYS);
-}
-function isZaiAuthData(value) {
-    return value !== null && typeof value === "object";
-}
-function sanitizeZaiAuthValue(value) {
-    const sanitized = sanitizeDisplayText(value).replace(/\s+/g, " ").trim();
-    return (sanitized || "unknown").slice(0, 120);
-}
+const zaiAuthResolver = createProviderApiKeyResolver({
+    envVars: [
+        { name: "ZAI_API_KEY", source: "env:ZAI_API_KEY" },
+        { name: "ZAI_CODING_PLAN_API_KEY", source: "env:ZAI_CODING_PLAN_API_KEY" },
+    ],
+    providerKeys: ZAI_PROVIDER_KEYS,
+    allowedEnvVars: ALLOWED_ZAI_ENV_VARS,
+    configJsonSource: "opencode.json",
+    configJsoncSource: "opencode.jsonc",
+    getConfigCandidates: getGlobalOpencodeConfigCandidatePaths,
+    auth: {
+        policy: "invalid-aware-api-key",
+        authKeys: ZAI_AUTH_KEYS,
+        authSource: "auth.json",
+        displayName: "Z.ai",
+        defaultMaxAgeMs: DEFAULT_ZAI_AUTH_CACHE_MAX_AGE_MS,
+        readAuth: (maxAgeMs) => readAuthFileCached({ maxAgeMs }),
+        getAuthPaths,
+    },
+});
 export function resolveZaiAuth(auth) {
-    const zai = getZaiAuthEntry(auth);
-    if (zai === null || zai === undefined) {
-        return { state: "none" };
-    }
-    if (!isZaiAuthData(zai)) {
-        return { state: "invalid", error: "Z.ai auth entry has invalid shape" };
-    }
-    if (typeof zai.type !== "string") {
-        return { state: "invalid", error: "Z.ai auth entry present but type is missing or invalid" };
-    }
-    if (zai.type !== "api") {
-        return {
-            state: "invalid",
-            error: `Unsupported Z.ai auth type: "${sanitizeZaiAuthValue(zai.type)}"`,
-        };
-    }
-    const key = typeof zai.key === "string" ? zai.key.trim() : "";
-    if (!key) {
-        return { state: "invalid", error: "Z.ai auth entry present but key is empty" };
-    }
-    return { state: "configured", apiKey: key };
-}
-async function resolveZaiAuthWithSource(params) {
-    const resolvedFromEnvOrConfig = await resolveApiKeyFromEnvAndConfig({
-        envVars: [
-            { name: "ZAI_API_KEY", source: "env:ZAI_API_KEY" },
-            {
-                name: "ZAI_CODING_PLAN_API_KEY",
-                source: "env:ZAI_CODING_PLAN_API_KEY",
-            },
-        ],
-        extractFromConfig: (config) => extractProviderOptionsApiKey(config, {
-            providerKeys: ZAI_PROVIDER_KEYS,
-            allowedEnvVars: ALLOWED_ZAI_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_ZAI_AUTH_CACHE_MAX_AGE_MS);
-    const authData = await readAuthFileCached({ maxAgeMs });
-    const auth = resolveZaiAuth(authData);
-    return {
-        auth,
-        source: auth.state === "none" ? null : "auth.json",
-    };
+    return zaiAuthResolver.parseAuth(auth);
 }
 export async function resolveZaiAuthCached(params) {
-    return (await resolveZaiAuthWithSource(params)).auth;
+    return zaiAuthResolver.resolve(params);
 }
 export async function getZaiAuthDiagnostics(params) {
-    const { auth, source } = await resolveZaiAuthWithSource(params);
-    const checkedPaths = getApiKeyCheckedPaths({
-        envVarNames: [...ALLOWED_ZAI_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 zaiAuthResolver.diagnostics(params);
 }
 //# sourceMappingURL=zai-auth.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"zai-auth.js","sourceRoot":"","sources":["../../src/lib/zai-auth.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"zai-auth.js","sourceRoot":"","sources":["../../src/lib/zai-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,iCAAiC,GAAG,KAAK,CAAC;AACvD,MAAM,aAAa,GAAG,CAAC,iBAAiB,CAAU,CAAC;AACnD,MAAM,iBAAiB,GAAG,CAAC,KAAK,EAAE,iBAAiB,EAAE,KAAK,CAAU,CAAC;AACrE,MAAM,oBAAoB,GAAG,CAAC,aAAa,EAAE,yBAAyB,CAAU,CAAC;AAYjF,OAAO,EAAE,qCAAqC,IAAI,+BAA+B,EAAE,MAAM,uBAAuB,CAAC;AAEjH,MAAM,eAAe,GAAG,4BAA4B,CAA4B;IAC9E,OAAO,EAAE;QACP,EAAE,IAAI,EAAE,aAAa,EAAE,MAAM,EAAE,iBAAiB,EAAE;QAClD,EAAE,IAAI,EAAE,yBAAyB,EAAE,MAAM,EAAE,6BAA6B,EAAE;KAC3E;IACD,YAAY,EAAE,iBAAiB;IAC/B,cAAc,EAAE,oBAAoB;IACpC,gBAAgB,EAAE,eAAe;IACjC,iBAAiB,EAAE,gBAAgB;IACnC,mBAAmB,EAAE,qCAAqC;IAC1D,IAAI,EAAE;QACJ,MAAM,EAAE,uBAAuB;QAC/B,QAAQ,EAAE,aAAa;QACvB,UAAU,EAAE,WAAW;QACvB,WAAW,EAAE,MAAM;QACnB,eAAe,EAAE,iCAAiC;QAClD,QAAQ,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,kBAAkB,CAAC,EAAE,QAAQ,EAAE,CAAC;QACxD,YAAY;KACb;CACF,CAAC,CAAC;AAEH,MAAM,UAAU,cAAc,CAAC,IAAiC;IAC9D,OAAO,eAAe,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;AACzC,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,MAE1C;IACC,OAAO,eAAe,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;AACzC,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAAC,MAE3C;IACC,OAAO,eAAe,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;AAC7C,CAAC"}

package/dist/lib/zai.d.ts

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

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

@@ -1 +1 @@
-{"version":3,"file":"zai.d.ts","sourceRoot":"","sources":["../../src/lib/zai.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAKH,OAAO,KAAK,EAAiB,SAAS,EAAE,MAAM,YAAY,CAAC;AAgB3D,wBAAsB,aAAa,CAAC,OAAO,GAAE;IAAE,gBAAgB,CAAC,EAAE,MAAM,CAAA;CAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAuFnG"}
+{"version":3,"file":"zai.d.ts","sourceRoot":"","sources":["../../src/lib/zai.ts"],"names":[],"mappings":"AAYA,wBAAgB,aAAa,CAAC,OAAO,GAAE;IAAE,gBAAgB,CAAC,EAAE,MAAM,CAAA;CAAO,2CAExE"}

package/dist/lib/zai.js

@@ -1,94 +1,14 @@
-/**
- * Z.ai quota fetcher
- *
- * Uses OpenCode's auth.json (zai-coding-plan) and queries:
- * https://api.z.ai/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 { resolveZaiAuthCached } from "./zai-auth.js";
-const ZAI_QUOTA_URL = "https://api.z.ai/api/monitor/usage/quota/limit";
-export async function queryZaiQuota(options = {}) {
-    const auth = await resolveZaiAuthCached();
-    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(ZAI_QUOTA_URL, { headers }, options.requestTimeoutMs);
-        if (!resp.ok) {
-            const text = await resp.text();
-            return {
-                success: false,
-                error: `Z.ai API error ${resp.status}: ${sanitizeDisplaySnippet(text, 120)}`,
-            };
-        }
-        const data = (await resp.json());
-        if (data.success === false || (typeof data.code === "number" && data.code >= 400)) {
-            const msg = typeof data.msg === "string" ? sanitizeDisplayText(data.msg) : "";
-            return {
-                success: false,
-                error: msg || (typeof data.code === "number" ? `Z.ai API error ${data.code}` : "Z.ai API error"),
-            };
-        }
-        const limits = data.data?.limits ?? 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: "Z.ai",
-            windows: {
-                fiveHour: fiveHourWindow,
-                weekly: weeklyWindow,
-                mcp: mcpWindow,
-            },
-        };
-    }
-    catch (err) {
-        return {
-            success: false,
-            error: sanitizeDisplayText(err instanceof Error ? err.message : String(err)),
-        };
-    }
+const ZAI_QUOTA = {
+    label: "Z.ai",
+    endpoint: "https://api.z.ai/api/monitor/usage/quota/limit",
+    httpErrorPrefix: "Z.ai API error",
+    apiErrorPrefix: "Z.ai API error",
+    envelope: "zai",
+    resolveAuth: resolveZaiAuthCached,
+};
+export function queryZaiQuota(options = {}) {
+    return queryGlmCodingPlanQuota(ZAI_QUOTA, options);
 }
 //# sourceMappingURL=zai.js.map

package/dist/lib/zai.js.map

@@ -1 +1 @@
-{"version":3,"file":"zai.js","sourceRoot":"","sources":["../../src/lib/zai.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"zai.js","sourceRoot":"","sources":["../../src/lib/zai.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAC/D,OAAO,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AAErD,MAAM,SAAS,GAAG;IAChB,KAAK,EAAE,MAAM;IACb,QAAQ,EAAE,gDAAgD;IAC1D,eAAe,EAAE,gBAAgB;IACjC,cAAc,EAAE,gBAAgB;IAChC,QAAQ,EAAE,KAAK;IACf,WAAW,EAAE,oBAAoB;CACzB,CAAC;AAEX,MAAM,UAAU,aAAa,CAAC,UAAyC,EAAE;IACvE,OAAO,uBAAuB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;AACrD,CAAC"}

package/dist/lib/zhipu-auth.d.ts

@@ -1,32 +1,9 @@
+import type { InvalidAwareAuthDiagnostics, InvalidAwareAuthResult } from "./api-key-resolver.js";
 import type { AuthData } from "./types.js";
 export declare const DEFAULT_ZHIPU_AUTH_CACHE_MAX_AGE_MS = 5000;
 export type ZhipuKeySource = "env:ZHIPU_API_KEY" | "env:ZHIPU_CODING_PLAN_API_KEY" | "opencode.json" | "opencode.jsonc" | "auth.json";
-export type ResolvedZhipuAuth = {
-    state: "none";
-} | {
-    state: "configured";
-    apiKey: string;
-} | {
-    state: "invalid";
-    error: string;
-};
-export type ZhipuAuthDiagnostics = {
-    state: "none";
-    source: null;
-    checkedPaths: string[];
-    authPaths: string[];
-} | {
-    state: "configured";
-    source: ZhipuKeySource;
-    checkedPaths: string[];
-    authPaths: string[];
-} | {
-    state: "invalid";
-    source: "auth.json";
-    checkedPaths: string[];
-    authPaths: string[];
-    error: string;
-};
+export type ResolvedZhipuAuth = InvalidAwareAuthResult;
+export type ZhipuAuthDiagnostics = InvalidAwareAuthDiagnostics<ZhipuKeySource, "auth.json">;
 export { getGlobalOpencodeConfigCandidatePaths as getOpencodeConfigCandidatePaths } from "./api-key-resolver.js";
 export declare function resolveZhipuAuth(auth: AuthData | null | undefined): ResolvedZhipuAuth;
 export declare function resolveZhipuAuthCached(params?: {

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

@@ -1 +1 @@
-{"version":3,"file":"zhipu-auth.d.ts","sourceRoot":"","sources":["../../src/lib/zhipu-auth.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,QAAQ,EAAe,MAAM,YAAY,CAAC;AAExD,eAAO,MAAM,mCAAmC,OAAQ,CAAC;AAUzD,MAAM,MAAM,cAAc,GACtB,mBAAmB,GACnB,+BAA+B,GAC/B,eAAe,GACf,gBAAgB,GAChB,WAAW,CAAC;AAEhB,MAAM,MAAM,iBAAiB,GACzB;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,GACjB;IAAE,KAAK,EAAE,YAAY,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GACvC;IAAE,KAAK,EAAE,SAAS,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAExC,MAAM,MAAM,oBAAoB,GAC5B;IACE,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,IAAI,CAAC;IACb,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,SAAS,EAAE,MAAM,EAAE,CAAC;CACrB,GACD;IACE,KAAK,EAAE,YAAY,CAAC;IACpB,MAAM,EAAE,cAAc,CAAC;IACvB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,SAAS,EAAE,MAAM,EAAE,CAAC;CACrB,GACD;IACE,KAAK,EAAE,SAAS,CAAC;IACjB,MAAM,EAAE,WAAW,CAAC;IACpB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEN,OAAO,EAAE,qCAAqC,IAAI,+BAA+B,EAAE,MAAM,uBAAuB,CAAC;AAejH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,QAAQ,GAAG,IAAI,GAAG,SAAS,GAAG,iBAAiB,CA2BrF;AAwCD,wBAAsB,sBAAsB,CAAC,MAAM,CAAC,EAAE;IACpD,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAE7B;AAED,wBAAsB,uBAAuB,CAAC,MAAM,CAAC,EAAE;IACrD,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAiChC"}
+{"version":3,"file":"zhipu-auth.d.ts","sourceRoot":"","sources":["../../src/lib/zhipu-auth.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,2BAA2B,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AACjG,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAE3C,eAAO,MAAM,mCAAmC,OAAQ,CAAC;AAUzD,MAAM,MAAM,cAAc,GACtB,mBAAmB,GACnB,+BAA+B,GAC/B,eAAe,GACf,gBAAgB,GAChB,WAAW,CAAC;AAEhB,MAAM,MAAM,iBAAiB,GAAG,sBAAsB,CAAC;AACvD,MAAM,MAAM,oBAAoB,GAAG,2BAA2B,CAAC,cAAc,EAAE,WAAW,CAAC,CAAC;AAE5F,OAAO,EAAE,qCAAqC,IAAI,+BAA+B,EAAE,MAAM,uBAAuB,CAAC;AAuBjH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,QAAQ,GAAG,IAAI,GAAG,SAAS,GAAG,iBAAiB,CAErF;AAED,wBAAsB,sBAAsB,CAAC,MAAM,CAAC,EAAE;IACpD,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAE7B;AAED,wBAAsB,uBAAuB,CAAC,MAAM,CAAC,EAAE;IACrD,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAEhC"}