@slkiser/opencode-quota 5.0.1 → 5.0.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +2 -1
- package/dist/data/modelsdev-pricing.min.json +248 -22
- package/dist/lib/config.d.ts +1 -1
- package/dist/lib/config.d.ts.map +1 -1
- package/dist/lib/config.js +9 -0
- package/dist/lib/config.js.map +1 -1
- package/dist/lib/cursor-pricing.d.ts.map +1 -1
- package/dist/lib/cursor-pricing.js +1 -0
- package/dist/lib/cursor-pricing.js.map +1 -1
- package/dist/lib/format.d.ts.map +1 -1
- package/dist/lib/format.js +27 -16
- package/dist/lib/format.js.map +1 -1
- package/dist/lib/google-agy.js +1 -1
- package/dist/lib/google-agy.js.map +1 -1
- package/dist/lib/home-dir-display.d.ts +10 -0
- package/dist/lib/home-dir-display.d.ts.map +1 -0
- package/dist/lib/home-dir-display.js +108 -0
- package/dist/lib/home-dir-display.js.map +1 -0
- package/dist/lib/modelsdev-pricing.d.ts.map +1 -1
- package/dist/lib/modelsdev-pricing.js +60 -10
- package/dist/lib/modelsdev-pricing.js.map +1 -1
- package/dist/lib/ollama-cloud.d.ts +6 -5
- package/dist/lib/ollama-cloud.d.ts.map +1 -1
- package/dist/lib/ollama-cloud.js +80 -38
- package/dist/lib/ollama-cloud.js.map +1 -1
- package/dist/lib/openai.d.ts +1 -0
- package/dist/lib/openai.d.ts.map +1 -1
- package/dist/lib/openai.js +28 -2
- package/dist/lib/openai.js.map +1 -1
- package/dist/lib/opencode-auth.d.ts +6 -0
- package/dist/lib/opencode-auth.d.ts.map +1 -1
- package/dist/lib/opencode-auth.js +80 -21
- package/dist/lib/opencode-auth.js.map +1 -1
- package/dist/lib/opencode-storage.d.ts.map +1 -1
- package/dist/lib/opencode-storage.js +47 -3
- package/dist/lib/opencode-storage.js.map +1 -1
- package/dist/lib/opencode-zen.d.ts +18 -5
- package/dist/lib/opencode-zen.d.ts.map +1 -1
- package/dist/lib/opencode-zen.js +173 -52
- package/dist/lib/opencode-zen.js.map +1 -1
- package/dist/lib/provider-registration.d.ts +1 -1
- package/dist/lib/provider-registration.d.ts.map +1 -1
- package/dist/lib/provider-registration.js +1 -1
- package/dist/lib/provider-registration.js.map +1 -1
- package/dist/lib/quota-status.d.ts +2 -0
- package/dist/lib/quota-status.d.ts.map +1 -1
- package/dist/lib/quota-status.js +34 -15
- package/dist/lib/quota-status.js.map +1 -1
- package/dist/lib/quota-surface-data.d.ts +0 -5
- package/dist/lib/quota-surface-data.d.ts.map +1 -1
- package/dist/lib/quota-surface-data.js +63 -0
- package/dist/lib/quota-surface-data.js.map +1 -1
- package/dist/lib/toast-format-grouped.d.ts.map +1 -1
- package/dist/lib/toast-format-grouped.js +31 -10
- package/dist/lib/toast-format-grouped.js.map +1 -1
- package/dist/lib/types.d.ts +25 -11
- package/dist/lib/types.d.ts.map +1 -1
- package/dist/lib/types.js +1 -0
- package/dist/lib/types.js.map +1 -1
- package/dist/providers/cache-policies.d.ts.map +1 -1
- package/dist/providers/cache-policies.js +7 -3
- package/dist/providers/cache-policies.js.map +1 -1
- package/dist/providers/google-agy.d.ts +1 -0
- package/dist/providers/google-agy.d.ts.map +1 -1
- package/dist/providers/google-agy.js +17 -4
- package/dist/providers/google-agy.js.map +1 -1
- package/dist/providers/ollama-cloud.d.ts +2 -1
- package/dist/providers/ollama-cloud.d.ts.map +1 -1
- package/dist/providers/ollama-cloud.js +32 -7
- package/dist/providers/ollama-cloud.js.map +1 -1
- package/dist/providers/openai.d.ts.map +1 -1
- package/dist/providers/openai.js +148 -26
- package/dist/providers/openai.js.map +1 -1
- package/dist/providers/opencode-zen.d.ts.map +1 -1
- package/dist/providers/opencode-zen.js +15 -2
- package/dist/providers/opencode-zen.js.map +1 -1
- package/package.json +1 -1
package/dist/lib/types.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/lib/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,EAAE,0BAA0B,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/lib/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,EAAE,0BAA0B,EAAE,MAAM,yBAAyB,CAAC;AAmFrE,sCAAsC;AACtC,MAAM,CAAC,MAAM,kBAAkB,GAAG,IAAI,CAAC;AAgJvC,mCAAmC;AACnC,MAAM,CAAC,MAAM,cAAc,GAAqB;IAC9C,OAAO,EAAE,IAAI;IAEb,WAAW,EAAE,IAAI;IACjB,kBAAkB,EAAE;QAClB,OAAO,EAAE,KAAK;QACd,OAAO,EAAE,CAAC,QAAQ,CAAC;KACpB;IACD,iBAAiB,EAAE,QAAQ;IAC3B,WAAW,EAAE,0BAA0B;IACvC,kBAAkB,EAAE,WAAW;IAC/B,gBAAgB,EAAE,SAAS;IAC3B,eAAe,EAAE,IAAI;IACrB,aAAa,EAAE,MAAM,EAAE,YAAY;IACnC,gBAAgB,EAAE,kBAAkB;IAEpC,KAAK,EAAE,KAAK;IAEZ,mFAAmF;IACnF,gBAAgB,EAAE,MAAe;IACjC,cAAc,EAAE,EAAE;IAElB,mBAAmB,EAAE,QAAQ;IAE7B,UAAU,EAAE,MAAM;IAClB,iBAAiB,EAAE,CAAC,SAAS,EAAE,QAAQ,EAAE,SAAS,CAAC;IACnD,oBAAoB,EAAE,SAAS;IAC/B,eAAe,EAAE;QACf,MAAM,EAAE,MAAM;QACd,WAAW,EAAE,CAAC;KACf;IAED,UAAU,EAAE,IAAI;IAChB,cAAc,EAAE,IAAI;IACpB,aAAa,EAAE,IAAI;IACnB,cAAc,EAAE,IAAI;IACpB,eAAe,EAAE,IAAI;IACrB,gBAAgB,EAAE,KAAK;IACvB,iBAAiB,EAAE,IAAI;IACvB,iBAAiB,EAAE,IAAI;IACvB,iBAAiB,EAAE,SAAS;IAC5B,eAAe,EAAE;QACf,OAAO,EAAE,IAAI;KACd;IACD,gBAAgB,EAAE;QAChB,OAAO,EAAE,KAAK;QACd,UAAU,EAAE,IAAI;QAChB,aAAa,EAAE,IAAI;QACnB,QAAQ,EAAE,EAAE;KACb;IACD,YAAY,EAAE;QACZ,OAAO,EAAE,KAAK;KACf;IACD,uBAAuB,EAAE;QACvB,OAAO,EAAE,IAAI;QACb,IAAI,EAAE,IAAI;QACV,aAAa,EAAE,OAAO;KACvB;IACD,MAAM,EAAE;QACN,OAAO,EAAE,KAAK;QACd,IAAI,EAAE,EAAE;KACT;IACD,SAAS,EAAE;QACT,OAAO,EAAE,KAAK;KACf;IACD,MAAM,EAAE;QACN,QAAQ,EAAE,EAAE;QACZ,QAAQ,EAAE,EAAE;QACZ,MAAM,EAAE,EAAE;KACX;CACF,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cache-policies.d.ts","sourceRoot":"","sources":["../../src/providers/cache-policies.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,mBAAmB,CAAC;AA4BlE,OAAO,KAAK,EACV,uBAAuB,EAExB,MAAM,2BAA2B,CAAC;AAEnC,OAAO,EAGL,KAAK,oBAAoB,EAC1B,MAAM,kCAAkC,CAAC;AAmC1C,wBAAsB,0CAA0C,CAC9D,UAAU,EAAE,uBAAuB,GAClC,OAAO,CAAC,oBAAoB,GAAG,IAAI,CAAC,CAgBtC;AAoBD,eAAO,MAAM,uBAAuB;;;;;;;;;;;;;;;;;;;uBAnEX,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"cache-policies.d.ts","sourceRoot":"","sources":["../../src/providers/cache-policies.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,mBAAmB,CAAC;AA4BlE,OAAO,KAAK,EACV,uBAAuB,EAExB,MAAM,2BAA2B,CAAC;AAEnC,OAAO,EAGL,KAAK,oBAAoB,EAC1B,MAAM,kCAAkC,CAAC;AAmC1C,wBAAsB,0CAA0C,CAC9D,UAAU,EAAE,uBAAuB,GAClC,OAAO,CAAC,oBAAoB,GAAG,IAAI,CAAC,CAgBtC;AAoBD,eAAO,MAAM,uBAAuB;;;;;;;;;;;;;;;;;;;uBAnEX,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA2MmC,CAAC"}
|
|
@@ -189,10 +189,14 @@ export const PROVIDER_CACHE_POLICIES = {
|
|
|
189
189
|
if (resolved.state !== "configured")
|
|
190
190
|
return null;
|
|
191
191
|
const { credential } = resolved;
|
|
192
|
-
// The identity
|
|
193
|
-
// org
|
|
192
|
+
// The identity distinguishes accounts within the same org (member budgets
|
|
193
|
+
// are queried per account): org + account, else the account, else the
|
|
194
|
+
// token. The Console URL qualifies it because org ids can collide across
|
|
195
|
+
// self-hosted Console URLs.
|
|
194
196
|
return {
|
|
195
|
-
credential: credential.orgId
|
|
197
|
+
credential: credential.orgId && credential.accountId
|
|
198
|
+
? JSON.stringify([credential.orgId, credential.accountId])
|
|
199
|
+
: (credential.orgId ?? credential.accountId ?? credential.accessToken),
|
|
196
200
|
principalKind: credential.orgId || credential.accountId ? "stable-id" : "credential",
|
|
197
201
|
qualifiers: [consoleBaseUrl(credential)],
|
|
198
202
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cache-policies.js","sourceRoot":"","sources":["../../src/providers/cache-policies.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"cache-policies.js","sourceRoot":"","sources":["../../src/providers/cache-policies.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"google-agy.d.ts","sourceRoot":"","sources":["../../src/providers/google-agy.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,aAAa,EAId,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"google-agy.d.ts","sourceRoot":"","sources":["../../src/providers/google-agy.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,aAAa,EAId,MAAM,mBAAmB,CAAC;AAiG3B,wBAAgB,wBAAwB,CAAC,cAAc,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,CAS5F;AAUD,eAAO,MAAM,iBAAiB,EAAE,aAkJ/B,CAAC"}
|
|
@@ -66,6 +66,17 @@ function formatRemainingAmount(value) {
|
|
|
66
66
|
: sanitizeDisplayText(normalized);
|
|
67
67
|
return `${display} left`;
|
|
68
68
|
}
|
|
69
|
+
export function formatAgyCredentialGroup(credentialName, familyLabel) {
|
|
70
|
+
const trimmed = credentialName.trim();
|
|
71
|
+
if (!familyLabel?.trim())
|
|
72
|
+
return trimmed;
|
|
73
|
+
const match = trimmed.match(/^(\[[^\]]+\])(.*)$/);
|
|
74
|
+
if (match) {
|
|
75
|
+
const inside = match[1]?.slice(1, -1) ?? "";
|
|
76
|
+
return `[${inside}: ${familyLabel}]${match[2] ?? ""}`;
|
|
77
|
+
}
|
|
78
|
+
return `[${trimmed}: ${familyLabel}]`;
|
|
79
|
+
}
|
|
69
80
|
async function isAgyConfigured() {
|
|
70
81
|
try {
|
|
71
82
|
return await hasAgyQuotaRuntimeAvailable();
|
|
@@ -114,14 +125,16 @@ export const googleAgyProvider = {
|
|
|
114
125
|
const entries = [];
|
|
115
126
|
const errors = [];
|
|
116
127
|
for (const [index, { row, result }] of results.entries()) {
|
|
117
|
-
const
|
|
128
|
+
const credentialName = names[index] ?? "Google AGY";
|
|
118
129
|
if (!result)
|
|
119
130
|
continue;
|
|
120
131
|
if (!result.success) {
|
|
121
|
-
errors.push({ label:
|
|
132
|
+
errors.push({ label: credentialName, message: result.error });
|
|
122
133
|
continue;
|
|
123
134
|
}
|
|
124
135
|
for (const bucket of [...result.buckets].sort(compareBuckets)) {
|
|
136
|
+
const familyLabel = formatAgyFamilyLabel(bucket.family);
|
|
137
|
+
const group = formatAgyCredentialGroup(credentialName, familyLabel);
|
|
125
138
|
const right = formatRemainingAmount(bucket.remainingAmount);
|
|
126
139
|
entries.push({
|
|
127
140
|
accounting: {
|
|
@@ -131,7 +144,7 @@ export const googleAgyProvider = {
|
|
|
131
144
|
authority: "provider_reported",
|
|
132
145
|
sourceId: row.id,
|
|
133
146
|
},
|
|
134
|
-
name: `${group} ${
|
|
147
|
+
name: `${group} ${bucket.windowLabel}`,
|
|
135
148
|
group,
|
|
136
149
|
label: `${bucket.windowLabel}:`,
|
|
137
150
|
sortPriority: windowRank(bucket.window),
|
|
@@ -141,7 +154,7 @@ export const googleAgyProvider = {
|
|
|
141
154
|
});
|
|
142
155
|
}
|
|
143
156
|
errors.push(...(result.errors ?? []).map((error) => ({
|
|
144
|
-
label:
|
|
157
|
+
label: credentialName,
|
|
145
158
|
message: error.error,
|
|
146
159
|
})));
|
|
147
160
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"google-agy.js","sourceRoot":"","sources":["../../src/providers/google-agy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAOjE,OAAO,EACL,aAAa,EACb,2BAA2B,EAC3B,sBAAsB,EACtB,mBAAmB,GACpB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,2BAA2B,EAAE,MAAM,gCAAgC,CAAC;AAC7E,OAAO,EAAE,4BAA4B,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC3F,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAE1E,OAAO,EACL,2BAA2B,EAC3B,yBAAyB,EACzB,wBAAwB,GACzB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EACL,oBAAoB,EACpB,eAAe,EACf,kBAAkB,EAClB,uBAAuB,EACvB,iBAAiB,GAClB,MAAM,qBAAqB,CAAC;AAE7B,SAAS,UAAU,CAAC,KAAa;IAC/B,MAAM,EAAE,UAAU,EAAE,GAAG,qBAAqB,CAAC,KAAK,CAAC,CAAC;IACpD,OAAO,CAAC,YAAY,EAAE,mBAAmB,EAAE,iBAAiB,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;AACrF,CAAC;AAED,SAAS,qBAAqB,CAC5B,MAAuD,EACvD,aAA0C;IAE1C,IAAI,MAAM,CAAC,YAAY,EAAE,CAAC;QACxB,OAAO,CACL,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC;YACtC,wBAAwB,CAAC,MAAM,CAAC,YAAY,EAAE,YAAY,CAAC,CAC5D,CAAC;IACJ,CAAC;IACD,OAAO,WAAW,MAAM,CAAC,YAAY,GAAG,CAAC,EAAE,CAAC;AAC9C,CAAC;AAED,SAAS,UAAU,CAAC,MAAc;IAChC,IAAI,MAAM,KAAK,eAAe;QAAE,OAAO,CAAC,CAAC;IACzC,IAAI,MAAM,KAAK,uBAAuB;QAAE,OAAO,CAAC,CAAC;IACjD,OAAO,CAAC,CAAC;AACX,CAAC;AAED,SAAS,UAAU,CAAC,MAAsC;IACxD,OAAO,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACrC,CAAC;AAED,SAAS,oBAAoB,CAAC,MAAc;IAC1C,IAAI,MAAM,KAAK,eAAe;QAAE,OAAO,QAAQ,CAAC;IAChD,IAAI,MAAM,KAAK,uBAAuB;QAAE,OAAO,YAAY,CAAC;IAC5D,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,cAAc,CAAC,IAA0B,EAAE,KAA2B;IAC7E,IAAI,IAAI,CAAC,YAAY,KAAK,KAAK,CAAC,YAAY,EAAE,CAAC;QAC7C,OAAO,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC,YAAY,CAAC;IAChD,CAAC;IAED,MAAM,YAAY,GAAG,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACxE,IAAI,YAAY,KAAK,CAAC,EAAE,CAAC;QACvB,OAAO,YAAY,CAAC;IACtB,CAAC;IAED,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAC3D,IAAI,UAAU,KAAK,CAAC,EAAE,CAAC;QACrB,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,MAAM,YAAY,GAAG,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACxE,IAAI,YAAY,KAAK,CAAC,EAAE,CAAC;QACvB,OAAO,YAAY,CAAC;IACtB,CAAC;IAED,MAAM,WAAW,GAAG,CAAC,IAAI,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC;IACpF,IAAI,WAAW,KAAK,CAAC,EAAE,CAAC;QACtB,OAAO,WAAW,CAAC;IACrB,CAAC;IACD,OAAO,CAAC,IAAI,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC;AACnE,CAAC;AAED,SAAS,qBAAqB,CAAC,KAAyB;IACtD,MAAM,UAAU,GAAG,KAAK,EAAE,IAAI,EAAE,CAAC;IACjC,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,MAAM,MAAM,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC;IAClC,MAAM,OAAO,GAAG,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC;QACrC,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC;QAChC,CAAC,CAAC,mBAAmB,CAAC,UAAU,CAAC,CAAC;IACpC,OAAO,GAAG,OAAO,OAAO,CAAC;AAC3B,CAAC;AAED,KAAK,UAAU,eAAe;IAC5B,IAAI,CAAC;QACH,OAAO,MAAM,2BAA2B,EAAE,CAAC;IAC7C,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,MAAM,CAAC,MAAM,iBAAiB,GAAkB;IAC9C,EAAE,EAAE,YAAY;IAEhB,KAAK,CAAC,WAAW;QACf,OAAO,MAAM,eAAe,EAAE,CAAC;IACjC,CAAC;IAED,mBAAmB,CAAC,KAAa;QAC/B,OAAO,UAAU,CAAC,KAAK,CAAC,CAAC;IAC3B,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,GAAyB;QACnC,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YAC1C,sBAAsB,EAAE;YACxB,2BAA2B,EAAE;SAC9B,CAAC,CAAC;QACH,MAAM,aAAa,GAAG,uBAAuB,CAAC;YAC5C,UAAU,EAAE,IAAI,CAAC,KAAK;YACtB,WAAW,EAAE,IAAI,CAAC,SAAS,IAAI,QAAQ;YACvC,aAAa,EAAE,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC;YACxC,mBAAmB,EAAE,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC;YACnD,uBAAuB,EAAE,SAAS,CAAC,KAAK;YACxC,sBAAsB,EACpB,SAAS,CAAC,KAAK,KAAK,SAAS,IAAI,SAAS,CAAC,KAAK,KAAK,SAAS;gBAC5D,CAAC,CAAC,CAAC,SAAS,CAAC,YAAY,IAAI,QAAQ,CAAC;gBACtC,CAAC,CAAC,QAAQ;YACd,UAAU,EAAE,IAAI,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,mBAAmB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS;YAClF,eAAe,EACb,SAAS,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,mBAAmB,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS;SACnF,CAAC,CAAC;QACH,MAAM,cAAc,GAAG,CAAC,MAAM,kBAAkB,CAAC,aAAa,EAAE,EAAE,OAAO,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAC7F,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,YAAY,EAAE,mBAAmB,EAAE,iBAAiB,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,aAAa,CAAC,CAC5F,CAAC;QACF,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC9B,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CAC/B,cAAc,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;gBACjC,GAAG;gBACH,MAAM,EAAE,MAAM,mBAAmB,CAAC;oBAChC,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,0BAA0B;wBACtD,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,gBAAgB;wBAC7B,CAAC,CAAC,SAAS;oBACb,QAAQ,EAAE,EAAE,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE,GAAG,CAAC,KAAK,EAAc;iBACzD,CAAC;aACH,CAAC,CAAC,CACJ,CAAC;YACF,MAAM,KAAK,GAAG,4BAA4B,CACxC,YAAY,EACZ,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,YAAY,EAAE,YAAY,EAAE,CAAC,CAAC,CAChE,CAAC;YACF,MAAM,OAAO,GAAsB,EAAE,CAAC;YACtC,MAAM,MAAM,GAAkC,EAAE,CAAC;YACjD,KAAK,MAAM,CAAC,KAAK,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC,IAAI,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC;gBACzD,MAAM,
|
|
1
|
+
{"version":3,"file":"google-agy.js","sourceRoot":"","sources":["../../src/providers/google-agy.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Ollama Cloud provider wrapper.
|
|
3
3
|
*
|
|
4
|
-
* Queries the Ollama Cloud
|
|
4
|
+
* Queries the Ollama Cloud balance API and reports included credits or
|
|
5
|
+
* session/weekly limits, plus purchased credits.
|
|
5
6
|
*/
|
|
6
7
|
import type { QuotaProvider } from "../lib/entries.js";
|
|
7
8
|
export declare const ollamaCloudProvider: QuotaProvider;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ollama-cloud.d.ts","sourceRoot":"","sources":["../../src/providers/ollama-cloud.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"ollama-cloud.d.ts","sourceRoot":"","sources":["../../src/providers/ollama-cloud.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EACV,aAAa,EAId,MAAM,mBAAmB,CAAC;AAiH3B,eAAO,MAAM,mBAAmB,EAAE,aA+BjC,CAAC"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Ollama Cloud provider wrapper.
|
|
3
3
|
*
|
|
4
|
-
* Queries the Ollama Cloud
|
|
4
|
+
* Queries the Ollama Cloud balance API and reports included credits or
|
|
5
|
+
* session/weekly limits, plus purchased credits.
|
|
5
6
|
*/
|
|
6
7
|
import { queryOllamaCloudQuota } from "../lib/ollama-cloud.js";
|
|
7
8
|
import { getOllamaCloudKeyDiagnostics, hasOllamaCloudApiKey } from "../lib/ollama-cloud-config.js";
|
|
@@ -25,6 +26,7 @@ function mapOllamaCloudSuccess(result) {
|
|
|
25
26
|
group: OLLAMA_CLOUD_PROVIDER_LABEL,
|
|
26
27
|
label: "Session:",
|
|
27
28
|
percentRemaining: result.session.percentRemaining,
|
|
29
|
+
...(result.session.resetTimeIso ? { resetTimeIso: result.session.resetTimeIso } : {}),
|
|
28
30
|
});
|
|
29
31
|
}
|
|
30
32
|
if (result.weekly) {
|
|
@@ -37,9 +39,12 @@ function mapOllamaCloudSuccess(result) {
|
|
|
37
39
|
group: OLLAMA_CLOUD_PROVIDER_LABEL,
|
|
38
40
|
label: "Weekly:",
|
|
39
41
|
percentRemaining: result.weekly.percentRemaining,
|
|
42
|
+
...(result.weekly.resetTimeIso ? { resetTimeIso: result.weekly.resetTimeIso } : {}),
|
|
40
43
|
});
|
|
41
44
|
}
|
|
42
|
-
|
|
45
|
+
// Included credits run on the plan's monthly period.
|
|
46
|
+
const included = result.includedCredits;
|
|
47
|
+
if (included?.percentRemaining !== undefined) {
|
|
43
48
|
entries.push({
|
|
44
49
|
accounting: {
|
|
45
50
|
resultType: "quota",
|
|
@@ -48,7 +53,22 @@ function mapOllamaCloudSuccess(result) {
|
|
|
48
53
|
name: `${OLLAMA_CLOUD_PROVIDER_LABEL} Monthly`,
|
|
49
54
|
group: OLLAMA_CLOUD_PROVIDER_LABEL,
|
|
50
55
|
label: "Monthly:",
|
|
51
|
-
percentRemaining:
|
|
56
|
+
percentRemaining: included.percentRemaining,
|
|
57
|
+
...(included.resetTimeIso ? { resetTimeIso: included.resetTimeIso } : {}),
|
|
58
|
+
});
|
|
59
|
+
}
|
|
60
|
+
// Purchased credits show when there are some, or when they are the only data.
|
|
61
|
+
if (result.purchasedUsd !== undefined && (result.purchasedUsd > 0 || entries.length === 0)) {
|
|
62
|
+
entries.push({
|
|
63
|
+
kind: "value",
|
|
64
|
+
accounting: {
|
|
65
|
+
resultType: "balance",
|
|
66
|
+
...REMOTE_API_ACCOUNTING,
|
|
67
|
+
},
|
|
68
|
+
name: `${OLLAMA_CLOUD_PROVIDER_LABEL} Purchased`,
|
|
69
|
+
group: OLLAMA_CLOUD_PROVIDER_LABEL,
|
|
70
|
+
label: "Purchased:",
|
|
71
|
+
value: `$${result.purchasedUsd.toFixed(2)} left`,
|
|
52
72
|
});
|
|
53
73
|
}
|
|
54
74
|
const errors = (result.rowErrors ?? []).map((message) => ({
|
|
@@ -58,14 +78,19 @@ function mapOllamaCloudSuccess(result) {
|
|
|
58
78
|
if (entries.length === 0) {
|
|
59
79
|
errors.push({
|
|
60
80
|
label: OLLAMA_CLOUD_PROVIDER_LABEL,
|
|
61
|
-
message: "
|
|
81
|
+
message: "Ollama Cloud returned no limits or balance",
|
|
62
82
|
});
|
|
63
83
|
}
|
|
64
84
|
return withStatusDetails(attemptedResult(entries, errors), [
|
|
65
85
|
...statusDetailsFromRecord({
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
86
|
+
included_balance_usd: included?.balanceUsd.toString(),
|
|
87
|
+
included_allowance_usd: included?.allowanceUsd.toString(),
|
|
88
|
+
included_period_until: included?.resetTimeIso,
|
|
89
|
+
session_remaining_percent: result.session?.percentRemaining.toString(),
|
|
90
|
+
session_resets_at: result.session?.resetTimeIso,
|
|
91
|
+
weekly_remaining_percent: result.weekly?.percentRemaining.toString(),
|
|
92
|
+
weekly_resets_at: result.weekly?.resetTimeIso,
|
|
93
|
+
purchased_balance_usd: result.purchasedUsd?.toString(),
|
|
69
94
|
}),
|
|
70
95
|
...(result.rowErrors ?? []).map((message, index) => ({
|
|
71
96
|
key: `live_error_${index + 1}`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ollama-cloud.js","sourceRoot":"","sources":["../../src/providers/ollama-cloud.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"ollama-cloud.js","sourceRoot":"","sources":["../../src/providers/ollama-cloud.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai.d.ts","sourceRoot":"","sources":["../../src/providers/openai.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,aAAa,EAA6C,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"openai.d.ts","sourceRoot":"","sources":["../../src/providers/openai.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,aAAa,EAA6C,MAAM,mBAAmB,CAAC;AA0DlG,eAAO,MAAM,cAAc,EAAE,aA4M5B,CAAC"}
|
package/dist/providers/openai.js
CHANGED
|
@@ -5,7 +5,33 @@ import { DEFAULT_OPENAI_AUTH_CACHE_MAX_AGE_MS, hasOpenAIOAuthCached, OPENAI_AUTH
|
|
|
5
5
|
import { credentialRowAuthEntry, formatCredentialDisplayNames, readCredentialRows, } from "../lib/opencode-auth.js";
|
|
6
6
|
import { isCanonicalProviderAvailable } from "../lib/provider-availability.js";
|
|
7
7
|
import { modelProviderIncludesAny } from "../lib/provider-model-matching.js";
|
|
8
|
+
import { resolveQuotaProviderSessionModelIdentity } from "../lib/quota-providers.js";
|
|
8
9
|
import { attemptedResult, groupedPercentWindowEntries, mapNullableProviderResult, statusDetailsFromRecord, withStatusDetails, } from "./result-helpers.js";
|
|
10
|
+
/**
|
|
11
|
+
* OpenCode 2's "Sign in with ChatGPT" login. Its token is scoped to
|
|
12
|
+
* api.openai.com, and ChatGPT's usage endpoint rejects it with HTTP 401
|
|
13
|
+
* `no_matching_rule` (#316), so it gets a status row instead of a request.
|
|
14
|
+
*/
|
|
15
|
+
const TOKEN_SHARING_METHOD_ID = "chatgpt-token-sharing";
|
|
16
|
+
function isTokenSharingLogin(row) {
|
|
17
|
+
return row.value.methodID === TOKEN_SHARING_METHOD_ID;
|
|
18
|
+
}
|
|
19
|
+
/** A row that says why a login has no ChatGPT quota number. */
|
|
20
|
+
function statusValueEntry(row, name, value) {
|
|
21
|
+
return {
|
|
22
|
+
kind: "value",
|
|
23
|
+
accounting: {
|
|
24
|
+
resultType: "status",
|
|
25
|
+
acquisitionMethod: "local_runtime_accounting",
|
|
26
|
+
ownership: "maintained",
|
|
27
|
+
authority: "locally_derived",
|
|
28
|
+
sourceId: row.id,
|
|
29
|
+
},
|
|
30
|
+
name,
|
|
31
|
+
group: name,
|
|
32
|
+
value,
|
|
33
|
+
};
|
|
34
|
+
}
|
|
9
35
|
export const openaiProvider = {
|
|
10
36
|
id: "openai",
|
|
11
37
|
async isAvailable(ctx) {
|
|
@@ -18,15 +44,43 @@ export const openaiProvider = {
|
|
|
18
44
|
if (availableByProviderId) {
|
|
19
45
|
return true;
|
|
20
46
|
}
|
|
21
|
-
|
|
47
|
+
if (await hasOpenAIOAuthCached({ maxAgeMs: DEFAULT_OPENAI_AUTH_CACHE_MAX_AGE_MS })) {
|
|
48
|
+
return true;
|
|
49
|
+
}
|
|
50
|
+
// Without an OpenAI alias or OAuth login, a stored API key still counts.
|
|
51
|
+
const keyRows = await readCredentialRows(OPENAI_AUTH_SOURCE_KEYS, {
|
|
52
|
+
methods: ["key"],
|
|
53
|
+
firstOnly: true,
|
|
54
|
+
});
|
|
55
|
+
return keyRows.length > 0;
|
|
22
56
|
},
|
|
23
57
|
matchesCurrentModel(model) {
|
|
24
58
|
return modelProviderIncludesAny(model, ["openai", "chatgpt", "codex"]);
|
|
25
59
|
},
|
|
26
60
|
async fetch(ctx) {
|
|
27
|
-
const
|
|
61
|
+
const currentIntegrationId = ctx.config?.currentProviderID ??
|
|
62
|
+
resolveQuotaProviderSessionModelIdentity({ currentModel: ctx.config?.currentModel ?? "" })
|
|
63
|
+
?.providerId;
|
|
64
|
+
const rows = (await readCredentialRows(OPENAI_AUTH_SOURCE_KEYS, { methods: ["oauth", "key"] }))
|
|
65
|
+
.filter((row) => OPENAI_AUTH_SOURCE_KEYS.includes(row.integrationId))
|
|
66
|
+
// Active is per integration: keep the session's active login first, then
|
|
67
|
+
// other active logins, preserving source order within each set. Without
|
|
68
|
+
// the session's login, an active OAuth login (which has quota numbers)
|
|
69
|
+
// goes before an active API key (which only has a status).
|
|
70
|
+
.sort((left, right) => {
|
|
71
|
+
const activeOrder = Number(right.active) - Number(left.active);
|
|
72
|
+
if (activeOrder !== 0 || !left.active)
|
|
73
|
+
return activeOrder;
|
|
74
|
+
const sessionOrder = Number(right.integrationId === currentIntegrationId) -
|
|
75
|
+
Number(left.integrationId === currentIntegrationId);
|
|
76
|
+
if (sessionOrder !== 0)
|
|
77
|
+
return sessionOrder;
|
|
78
|
+
return Number(left.value.type === "api") - Number(right.value.type === "api");
|
|
79
|
+
});
|
|
28
80
|
// A failed login stays in the list so it shows as its own error row.
|
|
29
81
|
const credentials = rows.flatMap((row) => {
|
|
82
|
+
if (row.value.type === "api")
|
|
83
|
+
return [];
|
|
30
84
|
const auth = resolveOpenAIOAuth({
|
|
31
85
|
[row.integrationId]: credentialRowAuthEntry(row),
|
|
32
86
|
});
|
|
@@ -56,37 +110,105 @@ export const openaiProvider = {
|
|
|
56
110
|
}), [], { singleWindowDisplayName: group });
|
|
57
111
|
},
|
|
58
112
|
});
|
|
59
|
-
const results = await Promise.all(credentials
|
|
113
|
+
const results = await Promise.all(credentials
|
|
114
|
+
.filter(({ row }) => !isTokenSharingLogin(row))
|
|
115
|
+
.map(async ({ row, auth }) => ({
|
|
60
116
|
row,
|
|
61
|
-
|
|
62
|
-
|
|
117
|
+
result: await queryOpenAIQuota({
|
|
118
|
+
requestTimeoutMs: ctx.config?.requestTimeoutMs,
|
|
119
|
+
auth,
|
|
120
|
+
loginLabel: row.label,
|
|
121
|
+
}),
|
|
63
122
|
})));
|
|
64
|
-
const
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
123
|
+
const resultByRow = new Map(results.map(({ row, result }) => [row, result]));
|
|
124
|
+
// Names span every stored account (OAuth and API key) so numbering and the
|
|
125
|
+
// `(active)` marker match the accounts OpenCode actually holds.
|
|
126
|
+
const names = formatCredentialDisplayNames("OpenAI", rows.map((row) => {
|
|
127
|
+
const result = resultByRow.get(row);
|
|
128
|
+
return {
|
|
129
|
+
row,
|
|
130
|
+
fallbackName: result?.success ? result.label : "OpenAI",
|
|
131
|
+
numberUnnamed: row.value.type === "api",
|
|
132
|
+
};
|
|
133
|
+
}));
|
|
134
|
+
const nameByRow = new Map(rows.map((row, index) => [row, names[index]]));
|
|
135
|
+
for (const row of rows) {
|
|
136
|
+
const name = nameByRow.get(row) ?? "OpenAI";
|
|
137
|
+
if (isTokenSharingLogin(row)) {
|
|
138
|
+
entries.push(statusValueEntry(row, name, "ChatGPT quota unavailable for Sign in with ChatGPT"));
|
|
139
|
+
continue;
|
|
140
|
+
}
|
|
141
|
+
if (row.value.type !== "api") {
|
|
142
|
+
const providerResult = mapResult(resultByRow.get(row) ?? null, {
|
|
143
|
+
group: name,
|
|
144
|
+
sourceId: row.id,
|
|
145
|
+
});
|
|
146
|
+
entries.push(...providerResult.entries);
|
|
147
|
+
errors.push(...providerResult.errors);
|
|
148
|
+
continue;
|
|
149
|
+
}
|
|
150
|
+
// ChatGPT's usage endpoint only accepts OAuth credentials, so an API-key
|
|
151
|
+
// account reports its lack of ChatGPT quota instead of a quota number.
|
|
152
|
+
if (row.resolveError !== undefined) {
|
|
153
|
+
errors.push({
|
|
154
|
+
label: name,
|
|
155
|
+
message: `OpenAI API key could not be read: ${row.resolveError}`,
|
|
156
|
+
});
|
|
157
|
+
continue;
|
|
158
|
+
}
|
|
159
|
+
entries.push(statusValueEntry(row, name, "ChatGPT quota unavailable for API key"));
|
|
72
160
|
}
|
|
73
161
|
const providerResult = entries.length > 0 || errors.length > 0
|
|
74
162
|
? attemptedResult(entries, errors)
|
|
75
163
|
: mapResult(await queryOpenAIQuota({ requestTimeoutMs: ctx.config?.requestTimeoutMs }));
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
164
|
+
// The active account describes the status; a row OpenCode did not mark
|
|
165
|
+
// active (e.g. an env-selected connection or a failed active lookup) must
|
|
166
|
+
// not be reported as the active one.
|
|
167
|
+
const activeRow = rows.find((row) => row.active);
|
|
168
|
+
let authConfigured = "false";
|
|
169
|
+
let authSource = "(none)";
|
|
170
|
+
// OpenCode 2's sign-in method, e.g. chatgpt-token-sharing ("Sign in with ChatGPT").
|
|
171
|
+
let authMethod = "(none)";
|
|
172
|
+
let tokenStatus = "(none)";
|
|
173
|
+
let tokenExpiresAt = "(none)";
|
|
174
|
+
if (activeRow) {
|
|
175
|
+
if (typeof activeRow.value.methodID === "string")
|
|
176
|
+
authMethod = activeRow.value.methodID;
|
|
177
|
+
if (activeRow.value.type === "api") {
|
|
178
|
+
authConfigured = "true";
|
|
179
|
+
authSource = activeRow.integrationId;
|
|
180
|
+
tokenStatus = activeRow.resolveError !== undefined ? "failed" : "api key";
|
|
181
|
+
}
|
|
182
|
+
else {
|
|
183
|
+
const auth = credentials.find(({ row }) => row === activeRow)?.auth;
|
|
184
|
+
if (auth) {
|
|
185
|
+
const expiresAt = auth.state === "configured" ? auth.expiresAt : undefined;
|
|
186
|
+
authConfigured = "true";
|
|
187
|
+
authSource = auth.sourceKey;
|
|
188
|
+
tokenStatus =
|
|
189
|
+
auth.state === "failed"
|
|
190
|
+
? "failed"
|
|
191
|
+
: expiresAt && expiresAt < Date.now()
|
|
192
|
+
? "expired"
|
|
193
|
+
: "valid";
|
|
194
|
+
tokenExpiresAt = expiresAt ? new Date(expiresAt).toISOString() : "(none)";
|
|
195
|
+
}
|
|
196
|
+
}
|
|
197
|
+
}
|
|
198
|
+
else if (rows.length > 0) {
|
|
199
|
+
// Stored accounts exist, but which one is active is unknown.
|
|
200
|
+
authConfigured = "true";
|
|
201
|
+
authSource = "unknown";
|
|
202
|
+
authMethod = "unknown";
|
|
203
|
+
tokenStatus = "unknown";
|
|
204
|
+
tokenExpiresAt = "unknown";
|
|
205
|
+
}
|
|
79
206
|
return withStatusDetails(providerResult, statusDetailsFromRecord({
|
|
80
|
-
auth_configured:
|
|
81
|
-
auth_source:
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
? "failed"
|
|
86
|
-
: expiresAt && expiresAt < Date.now()
|
|
87
|
-
? "expired"
|
|
88
|
-
: "valid",
|
|
89
|
-
token_expires_at: expiresAt ? new Date(expiresAt).toISOString() : "(none)",
|
|
207
|
+
auth_configured: authConfigured,
|
|
208
|
+
auth_source: authSource,
|
|
209
|
+
auth_method: authMethod,
|
|
210
|
+
token_status: tokenStatus,
|
|
211
|
+
token_expires_at: tokenExpiresAt,
|
|
90
212
|
}));
|
|
91
213
|
},
|
|
92
214
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"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,
|
|
1
|
+
{"version":3,"file":"openai.js","sourceRoot":"","sources":["../../src/providers/openai.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"opencode-zen.d.ts","sourceRoot":"","sources":["../../src/providers/opencode-zen.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,aAAa,EAKd,MAAM,mBAAmB,CAAC;AAgF3B,eAAO,MAAM,mBAAmB,EAAE,
|
|
1
|
+
{"version":3,"file":"opencode-zen.d.ts","sourceRoot":"","sources":["../../src/providers/opencode-zen.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,aAAa,EAKd,MAAM,mBAAmB,CAAC;AAgF3B,eAAO,MAAM,mBAAmB,EAAE,aAkMjC,CAAC"}
|
|
@@ -100,9 +100,12 @@ export const opencodeZenProvider = {
|
|
|
100
100
|
? null
|
|
101
101
|
: result.data.monthlyUsage / OPENCODE_ZEN_BILLING_UNITS_PER_DOLLAR;
|
|
102
102
|
const hasMonthlyUsage = monthlyUsageUsd !== null && Number.isFinite(monthlyUsageUsd) && monthlyUsageUsd >= 0;
|
|
103
|
+
// A member-budget limit of $0 is a real blocking limit, not an absence;
|
|
104
|
+
// a $0 credit-limit fallback value still counts as no limit.
|
|
105
|
+
const zeroBudgetActive = result.data.budgetSource === "member_budget" && effectiveMonthlyLimit === 0;
|
|
103
106
|
const hasMonthlyBudget = effectiveMonthlyLimit !== null &&
|
|
104
107
|
Number.isFinite(effectiveMonthlyLimit) &&
|
|
105
|
-
effectiveMonthlyLimit > 0 &&
|
|
108
|
+
(effectiveMonthlyLimit > 0 || zeroBudgetActive) &&
|
|
106
109
|
hasMonthlyUsage;
|
|
107
110
|
const entries = [];
|
|
108
111
|
if (hasMonthlyBudget) {
|
|
@@ -111,7 +114,9 @@ export const opencodeZenProvider = {
|
|
|
111
114
|
accounting: OPENCODE_ZEN_BUDGET_ACCOUNTING,
|
|
112
115
|
name: "zen-monthly-budget",
|
|
113
116
|
group: OPENCODE_ZEN_GROUP,
|
|
114
|
-
percentRemaining:
|
|
117
|
+
percentRemaining: effectiveMonthlyLimit > 0
|
|
118
|
+
? Math.min(100, (monthlyRemainingUsd / effectiveMonthlyLimit) * 100)
|
|
119
|
+
: 0,
|
|
115
120
|
...(result.data.budgetResetIso ? { resetTimeIso: result.data.budgetResetIso } : {}),
|
|
116
121
|
semantic: {
|
|
117
122
|
metric: { kind: "window", window: "month" },
|
|
@@ -186,6 +191,14 @@ export const opencodeZenProvider = {
|
|
|
186
191
|
value: monthlyUsageUsd === null ? "(unknown)" : `USD ${zenUsdDecimal(monthlyUsageUsd)}`,
|
|
187
192
|
},
|
|
188
193
|
{ key: "budget_source", value: result.data.budgetSource },
|
|
194
|
+
...(result.data.memberBudgetsSkipped
|
|
195
|
+
? [
|
|
196
|
+
{
|
|
197
|
+
key: "member_budget_note",
|
|
198
|
+
value: "member budgets found, but not all can be evaluated (model filters, per-model limits, or missing amounts); using the credit limit",
|
|
199
|
+
},
|
|
200
|
+
]
|
|
201
|
+
: []),
|
|
189
202
|
{
|
|
190
203
|
key: "auto_reload",
|
|
191
204
|
value: result.data.reload === null ? "(unknown)" : String(result.data.reload),
|