@slkiser/opencode-quota 5.0.0 → 5.0.2

package/dist/providers/openai.js

@@ -5,6 +5,7 @@ import { DEFAULT_OPENAI_AUTH_CACHE_MAX_AGE_MS, hasOpenAIOAuthCached, OPENAI_AUTH
 import { credentialRowAuthEntry, formatCredentialDisplayNames, readCredentialRows, } from "../lib/opencode-auth.js";
 import { isCanonicalProviderAvailable } from "../lib/provider-availability.js";
 import { modelProviderIncludesAny } from "../lib/provider-model-matching.js";
+import { resolveQuotaProviderSessionModelIdentity } from "../lib/quota-providers.js";
 import { attemptedResult, groupedPercentWindowEntries, mapNullableProviderResult, statusDetailsFromRecord, withStatusDetails, } from "./result-helpers.js";
 export const openaiProvider = {
     id: "openai",
@@ -18,15 +19,43 @@ export const openaiProvider = {
         if (availableByProviderId) {
             return true;
         }
-        return hasOpenAIOAuthCached({ maxAgeMs: DEFAULT_OPENAI_AUTH_CACHE_MAX_AGE_MS });
+        if (await hasOpenAIOAuthCached({ maxAgeMs: DEFAULT_OPENAI_AUTH_CACHE_MAX_AGE_MS })) {
+            return true;
+        }
+        // Without an OpenAI alias or OAuth login, a stored API key still counts.
+        const keyRows = await readCredentialRows(OPENAI_AUTH_SOURCE_KEYS, {
+            methods: ["key"],
+            firstOnly: true,
+        });
+        return keyRows.length > 0;
     },
     matchesCurrentModel(model) {
         return modelProviderIncludesAny(model, ["openai", "chatgpt", "codex"]);
     },
     async fetch(ctx) {
-        const rows = (await readCredentialRows(OPENAI_AUTH_SOURCE_KEYS, { methods: ["oauth"] })).filter((row) => OPENAI_AUTH_SOURCE_KEYS.includes(row.integrationId));
+        const currentIntegrationId = ctx.config?.currentProviderID ??
+            resolveQuotaProviderSessionModelIdentity({ currentModel: ctx.config?.currentModel ?? "" })
+                ?.providerId;
+        const rows = (await readCredentialRows(OPENAI_AUTH_SOURCE_KEYS, { methods: ["oauth", "key"] }))
+            .filter((row) => OPENAI_AUTH_SOURCE_KEYS.includes(row.integrationId))
+            // Active is per integration: keep the session's active login first, then
+            // other active logins, preserving source order within each set. Without
+            // the session's login, an active OAuth login (which has quota numbers)
+            // goes before an active API key (which only has a status).
+            .sort((left, right) => {
+            const activeOrder = Number(right.active) - Number(left.active);
+            if (activeOrder !== 0 || !left.active)
+                return activeOrder;
+            const sessionOrder = Number(right.integrationId === currentIntegrationId) -
+                Number(left.integrationId === currentIntegrationId);
+            if (sessionOrder !== 0)
+                return sessionOrder;
+            return Number(left.value.type === "api") - Number(right.value.type === "api");
+        });
         // A failed login stays in the list so it shows as its own error row.
         const credentials = rows.flatMap((row) => {
+            if (row.value.type === "api")
+                return [];
             const auth = resolveOpenAIOAuth({
                 [row.integrationId]: credentialRowAuthEntry(row),
             });
@@ -58,35 +87,99 @@ export const openaiProvider = {
         });
         const results = await Promise.all(credentials.map(async ({ row, auth }) => ({
             row,
-            auth,
             result: await queryOpenAIQuota({ requestTimeoutMs: ctx.config?.requestTimeoutMs, auth }),
         })));
-        const names = formatCredentialDisplayNames("OpenAI", results.map(({ row, result }) => ({
-            row,
-            fallbackName: result?.success ? result.label : "OpenAI",
-        })));
-        for (const [index, { row, result }] of results.entries()) {
-            const providerResult = mapResult(result, { group: names[index], sourceId: row.id });
-            entries.push(...providerResult.entries);
-            errors.push(...providerResult.errors);
+        const resultByRow = new Map(results.map(({ row, result }) => [row, result]));
+        // Names span every stored account (OAuth and API key) so numbering and the
+        // `(active)` marker match the accounts OpenCode actually holds.
+        const names = formatCredentialDisplayNames("OpenAI", rows.map((row) => {
+            const result = resultByRow.get(row);
+            return {
+                row,
+                fallbackName: result?.success ? result.label : "OpenAI",
+                numberUnnamed: row.value.type === "api",
+            };
+        }));
+        const nameByRow = new Map(rows.map((row, index) => [row, names[index]]));
+        for (const row of rows) {
+            const name = nameByRow.get(row) ?? "OpenAI";
+            if (row.value.type !== "api") {
+                const providerResult = mapResult(resultByRow.get(row) ?? null, {
+                    group: name,
+                    sourceId: row.id,
+                });
+                entries.push(...providerResult.entries);
+                errors.push(...providerResult.errors);
+                continue;
+            }
+            // ChatGPT's usage endpoint only accepts OAuth credentials, so an API-key
+            // account reports its lack of ChatGPT quota instead of a quota number.
+            if (row.resolveError !== undefined) {
+                errors.push({
+                    label: name,
+                    message: `OpenAI API key could not be read: ${row.resolveError}`,
+                });
+                continue;
+            }
+            entries.push({
+                kind: "value",
+                accounting: {
+                    resultType: "status",
+                    acquisitionMethod: "local_runtime_accounting",
+                    ownership: "maintained",
+                    authority: "locally_derived",
+                    sourceId: row.id,
+                },
+                name,
+                group: name,
+                value: "ChatGPT quota unavailable for API key",
+            });
         }
         const providerResult = entries.length > 0 || errors.length > 0
             ? attemptedResult(entries, errors)
             : mapResult(await queryOpenAIQuota({ requestTimeoutMs: ctx.config?.requestTimeoutMs }));
-        const configuredAuth = credentials[0]?.auth;
-        const configured = configuredAuth !== undefined;
-        const expiresAt = configuredAuth?.state === "configured" ? configuredAuth.expiresAt : undefined;
+        // The active account describes the status; a row OpenCode did not mark
+        // active (e.g. an env-selected connection or a failed active lookup) must
+        // not be reported as the active one.
+        const activeRow = rows.find((row) => row.active);
+        let authConfigured = "false";
+        let authSource = "(none)";
+        let tokenStatus = "(none)";
+        let tokenExpiresAt = "(none)";
+        if (activeRow) {
+            if (activeRow.value.type === "api") {
+                authConfigured = "true";
+                authSource = activeRow.integrationId;
+                tokenStatus = activeRow.resolveError !== undefined ? "failed" : "api key";
+            }
+            else {
+                const auth = credentials.find(({ row }) => row === activeRow)?.auth;
+                if (auth) {
+                    const expiresAt = auth.state === "configured" ? auth.expiresAt : undefined;
+                    authConfigured = "true";
+                    authSource = auth.sourceKey;
+                    tokenStatus =
+                        auth.state === "failed"
+                            ? "failed"
+                            : expiresAt && expiresAt < Date.now()
+                                ? "expired"
+                                : "valid";
+                    tokenExpiresAt = expiresAt ? new Date(expiresAt).toISOString() : "(none)";
+                }
+            }
+        }
+        else if (rows.length > 0) {
+            // Stored accounts exist, but which one is active is unknown.
+            authConfigured = "true";
+            authSource = "unknown";
+            tokenStatus = "unknown";
+            tokenExpiresAt = "unknown";
+        }
         return withStatusDetails(providerResult, statusDetailsFromRecord({
-            auth_configured: configured ? "true" : "false",
-            auth_source: configuredAuth?.sourceKey ?? "(none)",
-            token_status: !configured
-                ? "(none)"
-                : configuredAuth?.state === "failed"
-                    ? "failed"
-                    : expiresAt && expiresAt < Date.now()
-                        ? "expired"
-                        : "valid",
-            token_expires_at: expiresAt ? new Date(expiresAt).toISOString() : "(none)",
+            auth_configured: authConfigured,
+            auth_source: authSource,
+            token_status: tokenStatus,
+            token_expires_at: tokenExpiresAt,
         }));
     },
 };

package/dist/providers/openai.js.map

@@ -1 +1 @@
-{"version":3,"file":"openai.js","sourceRoot":"","sources":["../../src/providers/openai.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"openai.js","sourceRoot":"","sources":["../../src/providers/openai.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,EACL,oCAAoC,EACpC,oBAAoB,EACpB,uBAAuB,EACvB,gBAAgB,EAChB,kBAAkB,GACnB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,sBAAsB,EACtB,4BAA4B,EAC5B,kBAAkB,GACnB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,4BAA4B,EAAE,MAAM,iCAAiC,CAAC;AAC/E,OAAO,EAAE,wBAAwB,EAAE,MAAM,mCAAmC,CAAC;AAC7E,OAAO,EAAE,wCAAwC,EAAE,MAAM,2BAA2B,CAAC;AAErF,OAAO,EACL,eAAe,EACf,2BAA2B,EAC3B,yBAAyB,EACzB,uBAAuB,EACvB,iBAAiB,GAClB,MAAM,qBAAqB,CAAC;AAE7B,MAAM,CAAC,MAAM,cAAc,GAAkB;IAC3C,EAAE,EAAE,QAAQ;IAEZ,KAAK,CAAC,WAAW,CAAC,GAAyB;QACzC,gFAAgF;QAChF,MAAM,qBAAqB,GAAG,MAAM,4BAA4B,CAAC;YAC/D,GAAG;YACH,UAAU,EAAE,QAAQ;YACpB,eAAe,EAAE,IAAI;SACtB,CAAC,CAAC;QAEH,IAAI,qBAAqB,EAAE,CAAC;YAC1B,OAAO,IAAI,CAAC;QACd,CAAC;QAED,IAAI,MAAM,oBAAoB,CAAC,EAAE,QAAQ,EAAE,oCAAoC,EAAE,CAAC,EAAE,CAAC;YACnF,OAAO,IAAI,CAAC;QACd,CAAC;QAED,yEAAyE;QACzE,MAAM,OAAO,GAAG,MAAM,kBAAkB,CAAC,uBAAuB,EAAE;YAChE,OAAO,EAAE,CAAC,KAAK,CAAC;YAChB,SAAS,EAAE,IAAI;SAChB,CAAC,CAAC;QACH,OAAO,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC;IAC5B,CAAC;IAED,mBAAmB,CAAC,KAAa;QAC/B,OAAO,wBAAwB,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC;IACzE,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,GAAyB;QACnC,MAAM,oBAAoB,GACxB,GAAG,CAAC,MAAM,EAAE,iBAAiB;YAC7B,wCAAwC,CAAC,EAAE,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,IAAI,EAAE,EAAE,CAAC;gBACxF,EAAE,UAAU,CAAC;QACjB,MAAM,IAAI,GAAG,CAAC,MAAM,kBAAkB,CAAC,uBAAuB,EAAE,EAAE,OAAO,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;aAC5F,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAE,uBAA6C,CAAC,QAAQ,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;YAC5F,yEAAyE;YACzE,wEAAwE;YACxE,uEAAuE;YACvE,2DAA2D;aAC1D,IAAI,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;YACpB,MAAM,WAAW,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAC/D,IAAI,WAAW,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM;gBAAE,OAAO,WAAW,CAAC;YAC1D,MAAM,YAAY,GAChB,MAAM,CAAC,KAAK,CAAC,aAAa,KAAK,oBAAoB,CAAC;gBACpD,MAAM,CAAC,IAAI,CAAC,aAAa,KAAK,oBAAoB,CAAC,CAAC;YACtD,IAAI,YAAY,KAAK,CAAC;gBAAE,OAAO,YAAY,CAAC;YAC5C,OAAO,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,KAAK,KAAK,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,KAAK,KAAK,CAAC,CAAC;QAChF,CAAC,CAAC,CAAC;QACL,qEAAqE;QACrE,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YACvC,IAAI,GAAG,CAAC,KAAK,CAAC,IAAI,KAAK,KAAK;gBAAE,OAAO,EAAE,CAAC;YACxC,MAAM,IAAI,GAAG,kBAAkB,CAAC;gBAC9B,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE,sBAAsB,CAAC,GAAG,CAAC;aACrC,CAAC,CAAC;YACf,OAAO,IAAI,CAAC,KAAK,KAAK,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC;QACtD,CAAC,CAAC,CAAC;QACH,MAAM,OAAO,GAAmC,EAAE,CAAC;QACnD,MAAM,MAAM,GAAkC,EAAE,CAAC;QACjD,MAAM,SAAS,GAAG,CAChB,MAAoD,EACpD,OAAO,GAA0C,EAAE,EACnD,EAAE,CACF,yBAAyB,CAAC,MAAM,EAAE;YAChC,UAAU,EAAE,OAAO,CAAC,KAAK,IAAI,QAAQ;YACrC,SAAS,EAAE,CAAC,MAAM,EAAE,EAAE;gBACpB,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,IAAI,MAAM,CAAC,KAAK,CAAC;gBAC5C,OAAO,eAAe,CACpB,2BAA2B,CAAC;oBAC1B,KAAK;oBACL,UAAU,EAAE;wBACV,UAAU,EAAE,YAAY;wBACxB,iBAAiB,EAAE,YAAY;wBAC/B,SAAS,EAAE,YAAY;wBACvB,SAAS,EAAE,mBAAmB;wBAC9B,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;qBAC5D;oBACD,OAAO,EAAE;wBACP,EAAE,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE;wBAC7D,EAAE,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,SAAS,EAAE;wBACrE,EAAE,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE;wBACxE,EAAE,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,cAAc,EAAE;qBACpF;iBACF,CAAC,EACF,EAAE,EACF,EAAE,uBAAuB,EAAE,KAAK,EAAE,CACnC,CAAC;YACJ,CAAC;SACF,CAAC,CAAC;QACL,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CAC/B,WAAW,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;YACxC,GAAG;YACH,MAAM,EAAE,MAAM,gBAAgB,CAAC,EAAE,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAAC;SACzF,CAAC,CAAC,CACJ,CAAC;QACF,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC;QAC7E,2EAA2E;QAC3E,gEAAgE;QAChE,MAAM,KAAK,GAAG,4BAA4B,CACxC,QAAQ,EACR,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YACf,MAAM,MAAM,GAAG,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YACpC,OAAO;gBACL,GAAG;gBACH,YAAY,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ;gBACvD,aAAa,EAAE,GAAG,CAAC,KAAK,CAAC,IAAI,KAAK,KAAK;aACxC,CAAC;QACJ,CAAC,CAAC,CACH,CAAC;QACF,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAEzE,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,MAAM,IAAI,GAAG,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,QAAQ,CAAC;YAC5C,IAAI,GAAG,CAAC,KAAK,CAAC,IAAI,KAAK,KAAK,EAAE,CAAC;gBAC7B,MAAM,cAAc,GAAG,SAAS,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,IAAI,EAAE;oBAC7D,KAAK,EAAE,IAAI;oBACX,QAAQ,EAAE,GAAG,CAAC,EAAE;iBACjB,CAAC,CAAC;gBACH,OAAO,CAAC,IAAI,CAAC,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC;gBACxC,MAAM,CAAC,IAAI,CAAC,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC;gBACtC,SAAS;YACX,CAAC;YAED,yEAAyE;YACzE,uEAAuE;YACvE,IAAI,GAAG,CAAC,YAAY,KAAK,SAAS,EAAE,CAAC;gBACnC,MAAM,CAAC,IAAI,CAAC;oBACV,KAAK,EAAE,IAAI;oBACX,OAAO,EAAE,qCAAqC,GAAG,CAAC,YAAY,EAAE;iBACjE,CAAC,CAAC;gBACH,SAAS;YACX,CAAC;YACD,OAAO,CAAC,IAAI,CAAC;gBACX,IAAI,EAAE,OAAO;gBACb,UAAU,EAAE;oBACV,UAAU,EAAE,QAAQ;oBACpB,iBAAiB,EAAE,0BAA0B;oBAC7C,SAAS,EAAE,YAAY;oBACvB,SAAS,EAAE,iBAAiB;oBAC5B,QAAQ,EAAE,GAAG,CAAC,EAAE;iBACjB;gBACD,IAAI;gBACJ,KAAK,EAAE,IAAI;gBACX,KAAK,EAAE,uCAAuC;aAC/C,CAAC,CAAC;QACL,CAAC;QAED,MAAM,cAAc,GAClB,OAAO,CAAC,MAAM,GAAG,CAAC,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC;YACrC,CAAC,CAAC,eAAe,CAAC,OAAO,EAAE,MAAM,CAAC;YAClC,CAAC,CAAC,SAAS,CAAC,MAAM,gBAAgB,CAAC,EAAE,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,gBAAgB,EAAE,CAAC,CAAC,CAAC;QAE5F,uEAAuE;QACvE,0EAA0E;QAC1E,qCAAqC;QACrC,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACjD,IAAI,cAAc,GAAG,OAAO,CAAC;QAC7B,IAAI,UAAU,GAAG,QAAQ,CAAC;QAC1B,IAAI,WAAW,GAAG,QAAQ,CAAC;QAC3B,IAAI,cAAc,GAAG,QAAQ,CAAC;QAC9B,IAAI,SAAS,EAAE,CAAC;YACd,IAAI,SAAS,CAAC,KAAK,CAAC,IAAI,KAAK,KAAK,EAAE,CAAC;gBACnC,cAAc,GAAG,MAAM,CAAC;gBACxB,UAAU,GAAG,SAAS,CAAC,aAAa,CAAC;gBACrC,WAAW,GAAG,SAAS,CAAC,YAAY,KAAK,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;YAC5E,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,GAAG,KAAK,SAAS,CAAC,EAAE,IAAI,CAAC;gBACpE,IAAI,IAAI,EAAE,CAAC;oBACT,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,KAAK,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;oBAC3E,cAAc,GAAG,MAAM,CAAC;oBACxB,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC;oBAC5B,WAAW;wBACT,IAAI,CAAC,KAAK,KAAK,QAAQ;4BACrB,CAAC,CAAC,QAAQ;4BACV,CAAC,CAAC,SAAS,IAAI,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE;gCACnC,CAAC,CAAC,SAAS;gCACX,CAAC,CAAC,OAAO,CAAC;oBAChB,cAAc,GAAG,SAAS,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC;gBAC5E,CAAC;YACH,CAAC;QACH,CAAC;aAAM,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC3B,6DAA6D;YAC7D,cAAc,GAAG,MAAM,CAAC;YACxB,UAAU,GAAG,SAAS,CAAC;YACvB,WAAW,GAAG,SAAS,CAAC;YACxB,cAAc,GAAG,SAAS,CAAC;QAC7B,CAAC;QACD,OAAO,iBAAiB,CACtB,cAAc,EACd,uBAAuB,CAAC;YACtB,eAAe,EAAE,cAAc;YAC/B,WAAW,EAAE,UAAU;YACvB,YAAY,EAAE,WAAW;YACzB,gBAAgB,EAAE,cAAc;SACjC,CAAC,CACH,CAAC;IACJ,CAAC;CACF,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@slkiser/opencode-quota",
-  "version": "5.0.0",
+  "version": "5.0.2",
   "description": "OpenCode quota & tokens usage with zero context window pollution. Supports GitHub Copilot, OpenAI (Plus/Pro), Chutes AI, Synthetic, Google AGY, Z.ai coding plan and more.",
   "type": "module",
   "main": "./dist/index.js",