@slkiser/opencode-quota 4.1.0 → 4.3.0
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 +85 -28
- package/dist/lib/api-key-resolver.d.ts +73 -22
- package/dist/lib/api-key-resolver.d.ts.map +1 -1
- package/dist/lib/api-key-resolver.js +102 -15
- package/dist/lib/api-key-resolver.js.map +1 -1
- package/dist/lib/chutes-config.d.ts.map +1 -1
- package/dist/lib/chutes-config.js +2 -4
- package/dist/lib/chutes-config.js.map +1 -1
- package/dist/lib/config.d.ts +1 -1
- package/dist/lib/config.d.ts.map +1 -1
- package/dist/lib/config.js +22 -0
- package/dist/lib/config.js.map +1 -1
- package/dist/lib/copilot.d.ts.map +1 -1
- package/dist/lib/copilot.js +82 -31
- package/dist/lib/copilot.js.map +1 -1
- package/dist/lib/deepseek-auth.d.ts.map +1 -1
- package/dist/lib/deepseek-auth.js +3 -7
- package/dist/lib/deepseek-auth.js.map +1 -1
- package/dist/lib/entries.d.ts +9 -4
- package/dist/lib/entries.d.ts.map +1 -1
- package/dist/lib/entries.js.map +1 -1
- package/dist/lib/glm-coding-plan.d.ts +18 -0
- package/dist/lib/glm-coding-plan.d.ts.map +1 -0
- package/dist/lib/glm-coding-plan.js +68 -0
- package/dist/lib/glm-coding-plan.js.map +1 -0
- package/dist/lib/google-agy-companion.d.ts +4 -25
- package/dist/lib/google-agy-companion.d.ts.map +1 -1
- package/dist/lib/google-agy-companion.js +47 -272
- package/dist/lib/google-agy-companion.js.map +1 -1
- package/dist/lib/google-agy.d.ts.map +1 -1
- package/dist/lib/google-agy.js +7 -25
- package/dist/lib/google-agy.js.map +1 -1
- package/dist/lib/google-antigravity-companion.d.ts +4 -25
- package/dist/lib/google-antigravity-companion.d.ts.map +1 -1
- package/dist/lib/google-antigravity-companion.js +44 -283
- package/dist/lib/google-antigravity-companion.js.map +1 -1
- package/dist/lib/google-companion-credentials.d.ts +70 -0
- package/dist/lib/google-companion-credentials.d.ts.map +1 -0
- package/dist/lib/google-companion-credentials.js +265 -0
- package/dist/lib/google-companion-credentials.js.map +1 -0
- package/dist/lib/google-gemini-cli-companion.d.ts +4 -25
- package/dist/lib/google-gemini-cli-companion.d.ts.map +1 -1
- package/dist/lib/google-gemini-cli-companion.js +47 -258
- package/dist/lib/google-gemini-cli-companion.js.map +1 -1
- package/dist/lib/google-gemini-cli.d.ts.map +1 -1
- package/dist/lib/google-gemini-cli.js +2 -20
- package/dist/lib/google-gemini-cli.js.map +1 -1
- package/dist/lib/google.d.ts.map +1 -1
- package/dist/lib/google.js +23 -45
- package/dist/lib/google.js.map +1 -1
- package/dist/lib/kimi-auth.d.ts +3 -26
- package/dist/lib/kimi-auth.d.ts.map +1 -1
- package/dist/lib/kimi-auth.js +24 -91
- package/dist/lib/kimi-auth.js.map +1 -1
- package/dist/lib/maintainer-announcements.js +2 -2
- package/dist/lib/maintainer-announcements.js.map +1 -1
- package/dist/lib/map-with-concurrency.d.ts +2 -0
- package/dist/lib/map-with-concurrency.d.ts.map +1 -0
- package/dist/lib/map-with-concurrency.js +17 -0
- package/dist/lib/map-with-concurrency.js.map +1 -0
- package/dist/lib/nanogpt-config.d.ts.map +1 -1
- package/dist/lib/nanogpt-config.js +2 -4
- package/dist/lib/nanogpt-config.js.map +1 -1
- package/dist/lib/openrouter.d.ts +13 -0
- package/dist/lib/openrouter.d.ts.map +1 -0
- package/dist/lib/openrouter.js +41 -0
- package/dist/lib/openrouter.js.map +1 -0
- package/dist/lib/provider-metadata.d.ts +11 -0
- package/dist/lib/provider-metadata.d.ts.map +1 -1
- package/dist/lib/provider-metadata.js +11 -0
- package/dist/lib/provider-metadata.js.map +1 -1
- package/dist/lib/quota-dialog-commands.d.ts.map +1 -1
- package/dist/lib/quota-dialog-commands.js +3 -10
- package/dist/lib/quota-dialog-commands.js.map +1 -1
- package/dist/lib/quota-export.d.ts.map +1 -1
- package/dist/lib/quota-export.js +1 -0
- package/dist/lib/quota-export.js.map +1 -1
- package/dist/lib/quota-providers-remote.d.ts +0 -1
- package/dist/lib/quota-providers-remote.d.ts.map +1 -1
- package/dist/lib/quota-providers-remote.js +3 -16
- package/dist/lib/quota-providers-remote.js.map +1 -1
- package/dist/lib/quota-render-data.d.ts.map +1 -1
- package/dist/lib/quota-render-data.js +40 -15
- package/dist/lib/quota-render-data.js.map +1 -1
- package/dist/lib/quota-runtime-context.d.ts +2 -0
- package/dist/lib/quota-runtime-context.d.ts.map +1 -1
- package/dist/lib/quota-runtime-context.js +40 -0
- package/dist/lib/quota-runtime-context.js.map +1 -1
- package/dist/lib/quota-state.d.ts.map +1 -1
- package/dist/lib/quota-state.js +89 -5
- package/dist/lib/quota-state.js.map +1 -1
- package/dist/lib/quota-status.d.ts +7 -17
- package/dist/lib/quota-status.d.ts.map +1 -1
- package/dist/lib/quota-status.js +116 -1036
- package/dist/lib/quota-status.js.map +1 -1
- package/dist/lib/quota-telemetry.d.ts +45 -0
- package/dist/lib/quota-telemetry.d.ts.map +1 -0
- package/dist/lib/quota-telemetry.js +300 -0
- package/dist/lib/quota-telemetry.js.map +1 -0
- package/dist/lib/synthetic-config.d.ts.map +1 -1
- package/dist/lib/synthetic-config.js +2 -4
- package/dist/lib/synthetic-config.js.map +1 -1
- package/dist/lib/tui-runtime.d.ts.map +1 -1
- package/dist/lib/tui-runtime.js +10 -1
- package/dist/lib/tui-runtime.js.map +1 -1
- package/dist/lib/types.d.ts +17 -1
- package/dist/lib/types.d.ts.map +1 -1
- package/dist/lib/types.js +3 -0
- package/dist/lib/types.js.map +1 -1
- package/dist/lib/zai-auth.d.ts +3 -26
- package/dist/lib/zai-auth.d.ts.map +1 -1
- package/dist/lib/zai-auth.js +24 -94
- package/dist/lib/zai-auth.js.map +1 -1
- package/dist/lib/zai.d.ts +1 -8
- package/dist/lib/zai.d.ts.map +1 -1
- package/dist/lib/zai.js +11 -97
- package/dist/lib/zai.js.map +1 -1
- package/dist/lib/zhipu-auth.d.ts +3 -26
- package/dist/lib/zhipu-auth.d.ts.map +1 -1
- package/dist/lib/zhipu-auth.js +24 -94
- package/dist/lib/zhipu-auth.js.map +1 -1
- package/dist/lib/zhipu.d.ts +1 -8
- package/dist/lib/zhipu.d.ts.map +1 -1
- package/dist/lib/zhipu.js +10 -89
- package/dist/lib/zhipu.js.map +1 -1
- package/dist/plugin.d.ts.map +1 -1
- package/dist/plugin.js +4 -0
- package/dist/plugin.js.map +1 -1
- package/dist/providers/alibaba-coding-plan.d.ts.map +1 -1
- package/dist/providers/alibaba-coding-plan.js +33 -6
- package/dist/providers/alibaba-coding-plan.js.map +1 -1
- package/dist/providers/anthropic.d.ts.map +1 -1
- package/dist/providers/anthropic.js +35 -7
- package/dist/providers/anthropic.js.map +1 -1
- package/dist/providers/chutes.d.ts.map +1 -1
- package/dist/providers/chutes.js +10 -3
- package/dist/providers/chutes.js.map +1 -1
- package/dist/providers/copilot.d.ts.map +1 -1
- package/dist/providers/copilot.js +79 -29
- package/dist/providers/copilot.js.map +1 -1
- package/dist/providers/cursor.d.ts.map +1 -1
- package/dist/providers/cursor.js +34 -6
- package/dist/providers/cursor.js.map +1 -1
- package/dist/providers/deepseek.d.ts.map +1 -1
- package/dist/providers/deepseek.js +10 -3
- package/dist/providers/deepseek.js.map +1 -1
- package/dist/providers/glm-coding-plan-provider.d.ts +9 -0
- package/dist/providers/glm-coding-plan-provider.d.ts.map +1 -1
- package/dist/providers/glm-coding-plan-provider.js +24 -2
- package/dist/providers/glm-coding-plan-provider.js.map +1 -1
- package/dist/providers/google-agy.d.ts.map +1 -1
- package/dist/providers/google-agy.js +23 -6
- package/dist/providers/google-agy.js.map +1 -1
- package/dist/providers/google-antigravity.d.ts.map +1 -1
- package/dist/providers/google-antigravity.js +31 -6
- package/dist/providers/google-antigravity.js.map +1 -1
- package/dist/providers/google-gemini-cli.d.ts.map +1 -1
- package/dist/providers/google-gemini-cli.js +24 -6
- package/dist/providers/google-gemini-cli.js.map +1 -1
- package/dist/providers/kimi-code.d.ts.map +1 -1
- package/dist/providers/kimi-code.js +27 -8
- package/dist/providers/kimi-code.js.map +1 -1
- package/dist/providers/mimo.d.ts.map +1 -1
- package/dist/providers/mimo.js +12 -5
- package/dist/providers/mimo.js.map +1 -1
- package/dist/providers/minimax-coding-plan.d.ts.map +1 -1
- package/dist/providers/minimax-coding-plan.js +37 -6
- package/dist/providers/minimax-coding-plan.js.map +1 -1
- package/dist/providers/nanogpt.d.ts.map +1 -1
- package/dist/providers/nanogpt.js +41 -4
- package/dist/providers/nanogpt.js.map +1 -1
- package/dist/providers/openai.d.ts.map +1 -1
- package/dist/providers/openai.js +20 -3
- package/dist/providers/openai.js.map +1 -1
- package/dist/providers/opencode-go.d.ts.map +1 -1
- package/dist/providers/opencode-go.js +33 -15
- package/dist/providers/opencode-go.js.map +1 -1
- package/dist/providers/opencode-zen.d.ts.map +1 -1
- package/dist/providers/opencode-zen.js +27 -22
- package/dist/providers/opencode-zen.js.map +1 -1
- package/dist/providers/openrouter.d.ts +6 -0
- package/dist/providers/openrouter.d.ts.map +1 -0
- package/dist/providers/openrouter.js +25 -0
- package/dist/providers/openrouter.js.map +1 -0
- package/dist/providers/quota-providers.js +2 -1
- package/dist/providers/quota-providers.js.map +1 -1
- package/dist/providers/qwen-code.d.ts.map +1 -1
- package/dist/providers/qwen-code.js +19 -5
- package/dist/providers/qwen-code.js.map +1 -1
- package/dist/providers/registry.d.ts.map +1 -1
- package/dist/providers/registry.js +2 -0
- package/dist/providers/registry.js.map +1 -1
- package/dist/providers/result-helpers.d.ts +29 -1
- package/dist/providers/result-helpers.d.ts.map +1 -1
- package/dist/providers/result-helpers.js +69 -0
- package/dist/providers/result-helpers.js.map +1 -1
- package/dist/providers/synthetic.d.ts.map +1 -1
- package/dist/providers/synthetic.js +10 -3
- package/dist/providers/synthetic.js.map +1 -1
- package/dist/providers/zai.d.ts.map +1 -1
- package/dist/providers/zai.js +2 -1
- package/dist/providers/zai.js.map +1 -1
- package/dist/providers/zhipu.d.ts.map +1 -1
- package/dist/providers/zhipu.js +2 -1
- package/dist/providers/zhipu.js.map +1 -1
- package/dist/tui.d.ts.map +1 -1
- package/dist/tui.js +4 -0
- package/dist/tui.tsx +5 -0
- package/package.json +10 -2
|
@@ -3,9 +3,10 @@
|
|
|
3
3
|
*
|
|
4
4
|
* Normalizes Claude CLI-exposed quota windows into generic toast entries.
|
|
5
5
|
*/
|
|
6
|
-
import { hasAnthropicCredentialsConfigured, queryAnthropicQuota } from "../lib/anthropic.js";
|
|
6
|
+
import { getAnthropicDiagnostics, hasAnthropicCredentialsConfigured, queryAnthropicQuota, } from "../lib/anthropic.js";
|
|
7
|
+
import { sanitizeDisplayText } from "../lib/display-sanitize.js";
|
|
7
8
|
import { isCanonicalProviderAvailable } from "../lib/provider-availability.js";
|
|
8
|
-
import { attemptedErrorResult, attemptedResult, notAttemptedResult } from "./result-helpers.js";
|
|
9
|
+
import { attemptedErrorResult, attemptedResult, notAttemptedResult, statusDetailsFromRecord, withStatusDetails, } from "./result-helpers.js";
|
|
9
10
|
export function getAnthropicNoDataMessage() {
|
|
10
11
|
return "Quota unavailable via local Claude CLI or Claude OAuth fallback";
|
|
11
12
|
}
|
|
@@ -28,15 +29,42 @@ export const anthropicProvider = {
|
|
|
28
29
|
return model.toLowerCase().startsWith("anthropic/");
|
|
29
30
|
},
|
|
30
31
|
async fetch(ctx) {
|
|
31
|
-
const
|
|
32
|
+
const options = {
|
|
32
33
|
binaryPath: ctx.config?.anthropicBinaryPath,
|
|
33
34
|
requestTimeoutMs: ctx.config?.requestTimeoutMs,
|
|
34
|
-
}
|
|
35
|
+
};
|
|
36
|
+
let statusDetails;
|
|
37
|
+
try {
|
|
38
|
+
const diagnostics = await getAnthropicDiagnostics(options);
|
|
39
|
+
const quota = diagnostics.quotaSupported ? diagnostics.quota : undefined;
|
|
40
|
+
statusDetails = statusDetailsFromRecord({
|
|
41
|
+
cli_installed: diagnostics.installed ? "true" : "false",
|
|
42
|
+
cli_version: diagnostics.version ?? "(none)",
|
|
43
|
+
auth_status: diagnostics.authStatus,
|
|
44
|
+
quota_supported: diagnostics.quotaSupported ? "true" : "false",
|
|
45
|
+
quota_source: diagnostics.quotaSource === "none" ? "(none)" : diagnostics.quotaSource,
|
|
46
|
+
checked_commands: diagnostics.checkedCommands.join(" | ") || "(none)",
|
|
47
|
+
message: diagnostics.message,
|
|
48
|
+
five_hour_remaining: quota
|
|
49
|
+
? `${quota.five_hour.percentRemaining}% reset_at=${quota.five_hour.resetTimeIso ?? "(none)"}`
|
|
50
|
+
: undefined,
|
|
51
|
+
seven_day_remaining: quota
|
|
52
|
+
? `${quota.seven_day.percentRemaining}% reset_at=${quota.seven_day.resetTimeIso ?? "(none)"}`
|
|
53
|
+
: undefined,
|
|
54
|
+
});
|
|
55
|
+
}
|
|
56
|
+
catch (error) {
|
|
57
|
+
statusDetails = statusDetailsFromRecord({
|
|
58
|
+
cli_installed: "false",
|
|
59
|
+
message: `failed to probe Claude CLI: ${sanitizeDisplayText(error instanceof Error ? error.message : String(error))}`,
|
|
60
|
+
});
|
|
61
|
+
}
|
|
62
|
+
const result = await queryAnthropicQuota(options);
|
|
35
63
|
if (!result) {
|
|
36
|
-
return notAttemptedResult();
|
|
64
|
+
return withStatusDetails(notAttemptedResult(), statusDetails);
|
|
37
65
|
}
|
|
38
66
|
if (!result.success) {
|
|
39
|
-
return attemptedErrorResult("Claude", result.error);
|
|
67
|
+
return withStatusDetails(attemptedErrorResult("Claude", result.error), statusDetails);
|
|
40
68
|
}
|
|
41
69
|
const entries = [
|
|
42
70
|
{
|
|
@@ -66,7 +94,7 @@ export const anthropicProvider = {
|
|
|
66
94
|
resetTimeIso: result.seven_day.resetTimeIso,
|
|
67
95
|
},
|
|
68
96
|
];
|
|
69
|
-
return attemptedResult(entries);
|
|
97
|
+
return withStatusDetails(attemptedResult(entries), statusDetails);
|
|
70
98
|
},
|
|
71
99
|
};
|
|
72
100
|
//# sourceMappingURL=anthropic.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"anthropic.js","sourceRoot":"","sources":["../../src/providers/anthropic.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAQH,OAAO,
|
|
1
|
+
{"version":3,"file":"anthropic.js","sourceRoot":"","sources":["../../src/providers/anthropic.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAQH,OAAO,EACL,uBAAuB,EACvB,iCAAiC,EACjC,mBAAmB,GACpB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAE,4BAA4B,EAAE,MAAM,iCAAiC,CAAC;AAC/E,OAAO,EACL,oBAAoB,EACpB,eAAe,EACf,kBAAkB,EAClB,uBAAuB,EACvB,iBAAiB,GAClB,MAAM,qBAAqB,CAAC;AAE7B,MAAM,UAAU,yBAAyB;IACvC,OAAO,iEAAiE,CAAC;AAC3E,CAAC;AAED,MAAM,CAAC,MAAM,iBAAiB,GAAkB;IAC9C,EAAE,EAAE,WAAW;IAEf,KAAK,CAAC,WAAW,CAAC,GAAyB;QACzC,MAAM,iBAAiB,GAAG,MAAM,4BAA4B,CAAC;YAC3D,GAAG;YACH,UAAU,EAAE,WAAW;YACvB,eAAe,EAAE,KAAK;SACvB,CAAC,CAAC;QACH,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACvB,OAAO,KAAK,CAAC;QACf,CAAC;QAED,OAAO,MAAM,iCAAiC,CAAC;YAC7C,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,mBAAmB;SAC5C,CAAC,CAAC;IACL,CAAC;IAED,mBAAmB,CAAC,KAAa;QAC/B,OAAO,KAAK,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC;IACtD,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,GAAyB;QACnC,MAAM,OAAO,GAAG;YACd,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,mBAAmB;YAC3C,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,gBAAgB;SAC/C,CAAC;QACF,IAAI,aAAa,CAAC;QAClB,IAAI,CAAC;YACH,MAAM,WAAW,GAAG,MAAM,uBAAuB,CAAC,OAAO,CAAC,CAAC;YAC3D,MAAM,KAAK,GAAG,WAAW,CAAC,cAAc,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;YACzE,aAAa,GAAG,uBAAuB,CAAC;gBACtC,aAAa,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO;gBACvD,WAAW,EAAE,WAAW,CAAC,OAAO,IAAI,QAAQ;gBAC5C,WAAW,EAAE,WAAW,CAAC,UAAU;gBACnC,eAAe,EAAE,WAAW,CAAC,cAAc,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO;gBAC9D,YAAY,EAAE,WAAW,CAAC,WAAW,KAAK,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC,WAAW;gBACrF,gBAAgB,EAAE,WAAW,CAAC,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,QAAQ;gBACrE,OAAO,EAAE,WAAW,CAAC,OAAO;gBAC5B,mBAAmB,EAAE,KAAK;oBACxB,CAAC,CAAC,GAAG,KAAK,CAAC,SAAS,CAAC,gBAAgB,cAAc,KAAK,CAAC,SAAS,CAAC,YAAY,IAAI,QAAQ,EAAE;oBAC7F,CAAC,CAAC,SAAS;gBACb,mBAAmB,EAAE,KAAK;oBACxB,CAAC,CAAC,GAAG,KAAK,CAAC,SAAS,CAAC,gBAAgB,cAAc,KAAK,CAAC,SAAS,CAAC,YAAY,IAAI,QAAQ,EAAE;oBAC7F,CAAC,CAAC,SAAS;aACd,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,aAAa,GAAG,uBAAuB,CAAC;gBACtC,aAAa,EAAE,OAAO;gBACtB,OAAO,EAAE,+BAA+B,mBAAmB,CAAC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE;aACtH,CAAC,CAAC;QACL,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,mBAAmB,CAAC,OAAO,CAAC,CAAC;QAClD,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,OAAO,iBAAiB,CAAC,kBAAkB,EAAE,EAAE,aAAa,CAAC,CAAC;QAChE,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YACpB,OAAO,iBAAiB,CAAC,oBAAoB,CAAC,QAAQ,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE,aAAa,CAAC,CAAC;QACxF,CAAC;QAED,MAAM,OAAO,GAAsB;YACjC;gBACE,UAAU,EAAE;oBACV,UAAU,EAAE,OAAO;oBACnB,iBAAiB,EAAE,WAAW;oBAC9B,SAAS,EAAE,YAAY;oBACvB,SAAS,EAAE,mBAAmB;iBAC/B;gBACD,IAAI,EAAE,WAAW;gBACjB,KAAK,EAAE,QAAQ;gBACf,KAAK,EAAE,KAAK;gBACZ,gBAAgB,EAAE,MAAM,CAAC,SAAS,CAAC,gBAAgB;gBACnD,YAAY,EAAE,MAAM,CAAC,SAAS,CAAC,YAAY;aAC5C;YACD;gBACE,UAAU,EAAE;oBACV,UAAU,EAAE,OAAO;oBACnB,iBAAiB,EAAE,WAAW;oBAC9B,SAAS,EAAE,YAAY;oBACvB,SAAS,EAAE,mBAAmB;iBAC/B;gBACD,IAAI,EAAE,eAAe;gBACrB,KAAK,EAAE,QAAQ;gBACf,KAAK,EAAE,SAAS;gBAChB,gBAAgB,EAAE,MAAM,CAAC,SAAS,CAAC,gBAAgB;gBACnD,YAAY,EAAE,MAAM,CAAC,SAAS,CAAC,YAAY;aAC5C;SACF,CAAC;QAEF,OAAO,iBAAiB,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,aAAa,CAAC,CAAC;IACpE,CAAC;CACF,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chutes.d.ts","sourceRoot":"","sources":["../../src/providers/chutes.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,aAAa,EAA6C,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"chutes.d.ts","sourceRoot":"","sources":["../../src/providers/chutes.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,aAAa,EAA6C,MAAM,mBAAmB,CAAC;AAUlG,eAAO,MAAM,cAAc,EAAE,aA6C5B,CAAC"}
|
package/dist/providers/chutes.js
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Chutes AI provider wrapper.
|
|
3
3
|
*/
|
|
4
|
-
import { queryChutesQuota, hasChutesApiKeyConfigured } from "../lib/chutes.js";
|
|
4
|
+
import { getChutesKeyDiagnostics, queryChutesQuota, hasChutesApiKeyConfigured, } from "../lib/chutes.js";
|
|
5
5
|
import { isCanonicalProviderAvailable } from "../lib/provider-availability.js";
|
|
6
6
|
import { modelProviderIncludesAny } from "../lib/provider-model-matching.js";
|
|
7
|
-
import { attemptedResult, mapNullableProviderResult } from "./result-helpers.js";
|
|
7
|
+
import { attemptedResult, mapNullableProviderResult, withStatusDetails } from "./result-helpers.js";
|
|
8
8
|
export const chutesProvider = {
|
|
9
9
|
id: "chutes",
|
|
10
10
|
async isAvailable(ctx) {
|
|
@@ -21,8 +21,13 @@ export const chutesProvider = {
|
|
|
21
21
|
return modelProviderIncludesAny(model, ["chutes"]);
|
|
22
22
|
},
|
|
23
23
|
async fetch(ctx) {
|
|
24
|
+
const diagnostics = await getChutesKeyDiagnostics().catch(() => ({
|
|
25
|
+
configured: false,
|
|
26
|
+
source: null,
|
|
27
|
+
checkedPaths: [],
|
|
28
|
+
}));
|
|
24
29
|
const result = await queryChutesQuota({ requestTimeoutMs: ctx.config?.requestTimeoutMs });
|
|
25
|
-
|
|
30
|
+
const providerResult = mapNullableProviderResult(result, {
|
|
26
31
|
errorLabel: "Chutes",
|
|
27
32
|
onSuccess: (result) => attemptedResult([
|
|
28
33
|
{
|
|
@@ -38,6 +43,8 @@ export const chutesProvider = {
|
|
|
38
43
|
},
|
|
39
44
|
]),
|
|
40
45
|
});
|
|
46
|
+
const detail = `configured=${diagnostics.configured ? "true" : "false"}${diagnostics.source ? ` source=${diagnostics.source}` : ""}${diagnostics.checkedPaths.length > 0 ? ` checked=${diagnostics.checkedPaths.join(" | ")}` : ""}`;
|
|
47
|
+
return withStatusDetails(providerResult, [{ key: "chutes api key", value: detail }]);
|
|
41
48
|
},
|
|
42
49
|
};
|
|
43
50
|
//# sourceMappingURL=chutes.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chutes.js","sourceRoot":"","sources":["../../src/providers/chutes.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,
|
|
1
|
+
{"version":3,"file":"chutes.js","sourceRoot":"","sources":["../../src/providers/chutes.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,EACL,uBAAuB,EACvB,gBAAgB,EAChB,yBAAyB,GAC1B,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,4BAA4B,EAAE,MAAM,iCAAiC,CAAC;AAC/E,OAAO,EAAE,wBAAwB,EAAE,MAAM,mCAAmC,CAAC;AAC7E,OAAO,EAAE,eAAe,EAAE,yBAAyB,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAEpG,MAAM,CAAC,MAAM,cAAc,GAAkB;IAC3C,EAAE,EAAE,QAAQ;IAEZ,KAAK,CAAC,WAAW,CAAC,GAAyB;QACzC,MAAM,iBAAiB,GAAG,MAAM,4BAA4B,CAAC;YAC3D,GAAG;YACH,UAAU,EAAE,QAAQ;YACpB,eAAe,EAAE,KAAK;SACvB,CAAC,CAAC;QACH,IAAI,iBAAiB;YAAE,OAAO,IAAI,CAAC;QAEnC,OAAO,MAAM,yBAAyB,EAAE,CAAC;IAC3C,CAAC;IAED,mBAAmB,CAAC,KAAa;QAC/B,OAAO,wBAAwB,CAAC,KAAK,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;IACrD,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,GAAyB;QACnC,MAAM,WAAW,GAAG,MAAM,uBAAuB,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC;YAC/D,UAAU,EAAE,KAAK;YACjB,MAAM,EAAE,IAAI;YACZ,YAAY,EAAE,EAAE;SACjB,CAAC,CAAC,CAAC;QACJ,MAAM,MAAM,GAAG,MAAM,gBAAgB,CAAC,EAAE,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,gBAAgB,EAAE,CAAC,CAAC;QAC1F,MAAM,cAAc,GAAG,yBAAyB,CAAC,MAAM,EAAE;YACvD,UAAU,EAAE,QAAQ;YACpB,SAAS,EAAE,CAAC,MAAM,EAAE,EAAE,CACpB,eAAe,CAAC;gBACd;oBACE,UAAU,EAAE;wBACV,UAAU,EAAE,OAAO;wBACnB,iBAAiB,EAAE,YAAY;wBAC/B,SAAS,EAAE,YAAY;wBACvB,SAAS,EAAE,mBAAmB;qBAC/B;oBACD,IAAI,EAAE,QAAQ;oBACd,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;oBACzC,YAAY,EAAE,MAAM,CAAC,YAAY;iBAClC;aACF,CAAC;SACL,CAAC,CAAC;QACH,MAAM,MAAM,GAAG,cAAc,WAAW,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,WAAW,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,YAAY,WAAW,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;QACrO,OAAO,iBAAiB,CAAC,cAAc,EAAE,CAAC,EAAE,GAAG,EAAE,gBAAgB,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;IACvF,CAAC;CACF,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"copilot.d.ts","sourceRoot":"","sources":["../../src/providers/copilot.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAEV,aAAa,EAId,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"copilot.d.ts","sourceRoot":"","sources":["../../src/providers/copilot.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAEV,aAAa,EAId,MAAM,mBAAmB,CAAC;AA+P3B,eAAO,MAAM,eAAe,EAAE,aAkD7B,CAAC"}
|
|
@@ -4,15 +4,19 @@
|
|
|
4
4
|
* Normalizes GitHub AI Credit and explicitly eligible legacy PRU accounting
|
|
5
5
|
* into the shared provider/result boundary.
|
|
6
6
|
*/
|
|
7
|
-
import { hasCopilotQuotaRuntimeAvailable, queryCopilotQuota } from "../lib/copilot.js";
|
|
7
|
+
import { getCopilotQuotaAuthDiagnostics, hasCopilotQuotaRuntimeAvailable, queryCopilotQuota, } from "../lib/copilot.js";
|
|
8
|
+
import { readAuthFileCached } from "../lib/opencode-auth.js";
|
|
8
9
|
import { isCanonicalProviderAvailable } from "../lib/provider-availability.js";
|
|
9
10
|
import { modelIncludesAny, modelProviderIncludesAny } from "../lib/provider-model-matching.js";
|
|
10
|
-
import { attemptedErrorResult, attemptedResult, notAttemptedResult } from "./result-helpers.js";
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
11
|
+
import { attemptedErrorResult, attemptedResult, notAttemptedResult, statusDetailsFromRecord, withStatusDetails, } from "./result-helpers.js";
|
|
12
|
+
function remoteAccounting(resultType, authority) {
|
|
13
|
+
return {
|
|
14
|
+
resultType,
|
|
15
|
+
acquisitionMethod: "remote_api",
|
|
16
|
+
ownership: "maintained",
|
|
17
|
+
authority,
|
|
18
|
+
};
|
|
19
|
+
}
|
|
16
20
|
function formatBillingPeriod(period) {
|
|
17
21
|
return `${period.year}-${String(period.month).padStart(2, "0")}`;
|
|
18
22
|
}
|
|
@@ -28,15 +32,16 @@ function formatUsd(value) {
|
|
|
28
32
|
return `$${value.toFixed(2)}`;
|
|
29
33
|
}
|
|
30
34
|
function formatAiCreditUsageValue(result) {
|
|
31
|
-
const parts = [
|
|
35
|
+
const parts = [`Used ${formatNumber(result.used)}`];
|
|
32
36
|
if (result.includedUsed !== undefined) {
|
|
33
|
-
parts.push(
|
|
37
|
+
parts.push(`Included ${formatNumber(result.includedUsed)}`);
|
|
34
38
|
}
|
|
35
39
|
if (result.billedUsed !== undefined) {
|
|
36
|
-
|
|
40
|
+
const billedAmount = result.billedAmountUsd === undefined ? "" : ` (${formatUsd(result.billedAmountUsd)})`;
|
|
41
|
+
parts.push(`Billed ${formatNumber(result.billedUsed)}${billedAmount}`);
|
|
37
42
|
}
|
|
38
|
-
if (result.billedAmountUsd !== undefined) {
|
|
39
|
-
parts.push(
|
|
43
|
+
else if (result.billedAmountUsd !== undefined) {
|
|
44
|
+
parts.push(`Billed ${formatUsd(result.billedAmountUsd)}`);
|
|
40
45
|
}
|
|
41
46
|
if (result.mode !== "user_quota") {
|
|
42
47
|
parts.push(formatBillingPeriod(result.period));
|
|
@@ -51,16 +56,13 @@ function formatAiCreditUsageValue(result) {
|
|
|
51
56
|
if (result.username)
|
|
52
57
|
parts.push(`user=${result.username}`);
|
|
53
58
|
}
|
|
54
|
-
|
|
55
|
-
parts.push(`plan=${result.plan}`);
|
|
56
|
-
}
|
|
57
|
-
return parts.join(" | ");
|
|
59
|
+
return parts.join(" · ");
|
|
58
60
|
}
|
|
59
61
|
function makeBudgetEntry(budget, group, resetTimeIso) {
|
|
60
62
|
const spent = budget.spentUsd;
|
|
61
63
|
if (budget.percentRemaining !== undefined && spent !== undefined && budget.amountUsd > 0) {
|
|
62
64
|
return {
|
|
63
|
-
accounting:
|
|
65
|
+
accounting: remoteAccounting("budget", budget.authority),
|
|
64
66
|
name: "Copilot Additional Usage",
|
|
65
67
|
group,
|
|
66
68
|
label: "Budget:",
|
|
@@ -74,7 +76,7 @@ function makeBudgetEntry(budget, group, resetTimeIso) {
|
|
|
74
76
|
: `${formatUsd(spent)} spent | ${formatUsd(budget.amountUsd)} budget | scope=${budget.scope}`;
|
|
75
77
|
return {
|
|
76
78
|
kind: "value",
|
|
77
|
-
accounting:
|
|
79
|
+
accounting: remoteAccounting("budget", budget.authority),
|
|
78
80
|
name: "Copilot Additional Usage",
|
|
79
81
|
group,
|
|
80
82
|
label: "Budget:",
|
|
@@ -86,7 +88,7 @@ function planEntries(result) {
|
|
|
86
88
|
return [
|
|
87
89
|
{
|
|
88
90
|
kind: "value",
|
|
89
|
-
accounting:
|
|
91
|
+
accounting: remoteAccounting("quota", result.authority),
|
|
90
92
|
name: "Copilot",
|
|
91
93
|
group: getCopilotGroup(result.mode),
|
|
92
94
|
label: "Plan:",
|
|
@@ -99,12 +101,16 @@ function planEntries(result) {
|
|
|
99
101
|
}
|
|
100
102
|
function personalEntries(result) {
|
|
101
103
|
const group = getCopilotGroup(result.mode);
|
|
102
|
-
const name = result.unit === "ai_credits"
|
|
104
|
+
const name = result.unit === "ai_credits"
|
|
105
|
+
? "Copilot AI Credits"
|
|
106
|
+
: result.unit === "premium_interactions"
|
|
107
|
+
? "Copilot Premium Interactions"
|
|
108
|
+
: "Copilot Premium Requests";
|
|
103
109
|
if (result.unlimited) {
|
|
104
110
|
return [
|
|
105
111
|
{
|
|
106
112
|
kind: "value",
|
|
107
|
-
accounting:
|
|
113
|
+
accounting: remoteAccounting("quota", result.authority),
|
|
108
114
|
name,
|
|
109
115
|
group,
|
|
110
116
|
label: "Quota:",
|
|
@@ -116,7 +122,7 @@ function personalEntries(result) {
|
|
|
116
122
|
const entries = [];
|
|
117
123
|
if (result.total !== undefined && result.total > 0 && result.percentRemaining !== undefined) {
|
|
118
124
|
entries.push({
|
|
119
|
-
accounting:
|
|
125
|
+
accounting: remoteAccounting("quota", result.authority),
|
|
120
126
|
name,
|
|
121
127
|
group,
|
|
122
128
|
label: result.unit === "ai_credits" ? "Credits:" : "Quota:",
|
|
@@ -128,13 +134,13 @@ function personalEntries(result) {
|
|
|
128
134
|
else {
|
|
129
135
|
entries.push({
|
|
130
136
|
kind: "value",
|
|
131
|
-
accounting:
|
|
137
|
+
accounting: remoteAccounting("usage", result.authority),
|
|
132
138
|
name,
|
|
133
139
|
group,
|
|
134
140
|
label: result.unit === "ai_credits" ? "Credits:" : "Usage:",
|
|
135
141
|
value: result.unit === "ai_credits"
|
|
136
142
|
? formatAiCreditUsageValue(result)
|
|
137
|
-
:
|
|
143
|
+
: `Used ${formatNumber(result.used)}`,
|
|
138
144
|
resetTimeIso: result.resetTimeIso,
|
|
139
145
|
});
|
|
140
146
|
}
|
|
@@ -143,12 +149,54 @@ function personalEntries(result) {
|
|
|
143
149
|
}
|
|
144
150
|
return entries;
|
|
145
151
|
}
|
|
152
|
+
async function getCopilotStatusDetails() {
|
|
153
|
+
const diagnostics = getCopilotQuotaAuthDiagnostics(await readAuthFileCached({ maxAgeMs: 5_000 }));
|
|
154
|
+
const managedBilling = diagnostics.billingMode === "organization_usage" ||
|
|
155
|
+
diagnostics.billingMode === "enterprise_usage";
|
|
156
|
+
return statusDetailsFromRecord({
|
|
157
|
+
pat_state: diagnostics.pat.state,
|
|
158
|
+
pat_path: diagnostics.pat.selectedPath,
|
|
159
|
+
pat_token_kind: diagnostics.pat.tokenKind,
|
|
160
|
+
pat_tier: diagnostics.pat.config?.tier,
|
|
161
|
+
billing_model: diagnostics.billingModel,
|
|
162
|
+
pat_organization: diagnostics.pat.config?.organization,
|
|
163
|
+
pat_enterprise: diagnostics.pat.config?.enterprise,
|
|
164
|
+
deployment: diagnostics.deployment,
|
|
165
|
+
api_host: diagnostics.apiHost ?? "(none)",
|
|
166
|
+
enterprise_host_source: diagnostics.enterpriseHostSource,
|
|
167
|
+
enterprise_host_error: diagnostics.enterpriseHostError,
|
|
168
|
+
billing_mode: diagnostics.billingMode,
|
|
169
|
+
billing_scope: diagnostics.billingScope,
|
|
170
|
+
quota_api: diagnostics.quotaApi,
|
|
171
|
+
budget_api: diagnostics.budgetApi,
|
|
172
|
+
billing_api_access_likely: diagnostics.billingApiAccessLikely ? "true" : "false",
|
|
173
|
+
remaining_totals_state: diagnostics.remainingTotalsState,
|
|
174
|
+
billing_period: diagnostics.queryPeriod
|
|
175
|
+
? formatBillingPeriod(diagnostics.queryPeriod)
|
|
176
|
+
: undefined,
|
|
177
|
+
username_filter: diagnostics.usernameFilter,
|
|
178
|
+
billing_usage_note: managedBilling
|
|
179
|
+
? `${diagnostics.billingMode === "organization_usage" ? "organization" : "enterprise"} AI Credit usage for the current UTC calendar month`
|
|
180
|
+
: undefined,
|
|
181
|
+
remaining_quota_note: managedBilling
|
|
182
|
+
? "the usage report exposes included-pool consumption and billed usage, but no included-pool denominator; percentages require a real budget"
|
|
183
|
+
: undefined,
|
|
184
|
+
billing_target_error: diagnostics.billingTargetError,
|
|
185
|
+
token_compatibility_error: diagnostics.tokenCompatibilityError,
|
|
186
|
+
pat_error: diagnostics.pat.error,
|
|
187
|
+
pat_checked_paths: diagnostics.pat.checkedPaths.join(" | ") || "(none)",
|
|
188
|
+
oauth_configured: `${diagnostics.oauth.configured ? "true" : "false"} key=${diagnostics.oauth.keyName ?? "(none)"} refresh=${diagnostics.oauth.hasRefreshToken ? "true" : "false"} access=${diagnostics.oauth.hasAccessToken ? "true" : "false"} enterprise_host=${diagnostics.oauth.hasEnterpriseUrl ? "true" : "false"}`,
|
|
189
|
+
effective_source: diagnostics.effectiveSource,
|
|
190
|
+
oauth_accounting_state: diagnostics.oauthAccountingState,
|
|
191
|
+
override: diagnostics.override,
|
|
192
|
+
});
|
|
193
|
+
}
|
|
146
194
|
function managedEntries(result) {
|
|
147
195
|
const group = getCopilotGroup(result.mode);
|
|
148
196
|
const entries = [
|
|
149
197
|
{
|
|
150
198
|
kind: "value",
|
|
151
|
-
accounting:
|
|
199
|
+
accounting: remoteAccounting("usage", result.authority),
|
|
152
200
|
name: "Copilot AI Credits",
|
|
153
201
|
group,
|
|
154
202
|
label: "Credits:",
|
|
@@ -184,11 +232,13 @@ export const copilotProvider = {
|
|
|
184
232
|
return modelIncludesAny(model, ["copilot", "github-copilot"]);
|
|
185
233
|
},
|
|
186
234
|
async fetch(ctx) {
|
|
235
|
+
const statusDetails = await getCopilotStatusDetails();
|
|
187
236
|
const result = await queryCopilotQuota({ requestTimeoutMs: ctx.config?.requestTimeoutMs });
|
|
188
237
|
if (!result)
|
|
189
|
-
return notAttemptedResult();
|
|
190
|
-
if (!result.success)
|
|
191
|
-
return attemptedErrorResult("Copilot", result.error);
|
|
238
|
+
return withStatusDetails(notAttemptedResult(), statusDetails);
|
|
239
|
+
if (!result.success) {
|
|
240
|
+
return withStatusDetails(attemptedErrorResult("Copilot", result.error), statusDetails);
|
|
241
|
+
}
|
|
192
242
|
const entries = result.mode === "user_plan"
|
|
193
243
|
? planEntries(result)
|
|
194
244
|
: result.mode === "user_quota"
|
|
@@ -203,7 +253,7 @@ export const copilotProvider = {
|
|
|
203
253
|
: result.mode === "organization_usage"
|
|
204
254
|
? { singleWindowDisplayName: `Copilot Org (${result.organization})` }
|
|
205
255
|
: undefined;
|
|
206
|
-
return attemptedResult(entries, errors, presentation);
|
|
256
|
+
return withStatusDetails(attemptedResult(entries, errors, presentation), statusDetails);
|
|
207
257
|
},
|
|
208
258
|
};
|
|
209
259
|
//# sourceMappingURL=copilot.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"copilot.js","sourceRoot":"","sources":["../../src/providers/copilot.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AASH,OAAO,
|
|
1
|
+
{"version":3,"file":"copilot.js","sourceRoot":"","sources":["../../src/providers/copilot.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cursor.d.ts","sourceRoot":"","sources":["../../src/providers/cursor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,aAAa,EAId,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"cursor.d.ts","sourceRoot":"","sources":["../../src/providers/cursor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,aAAa,EAId,MAAM,mBAAmB,CAAC;AAmC3B,eAAO,MAAM,cAAc,EAAE,aAwJ5B,CAAC"}
|
package/dist/providers/cursor.js
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { fmtUsdAmount } from "../lib/format-utils.js";
|
|
2
2
|
import { isCanonicalProviderAvailable } from "../lib/provider-availability.js";
|
|
3
3
|
import { getEffectiveCursorIncludedApiUsd, getCursorPlanDisplayName, isCursorModelId, isCursorProviderId, } from "../lib/cursor-pricing.js";
|
|
4
|
-
import { inspectCursorOpenCodeIntegration } from "../lib/cursor-detection.js";
|
|
4
|
+
import { CURSOR_CANONICAL_PLUGIN_PACKAGE, inspectCursorAuthPresence, inspectCursorOpenCodeIntegration, } from "../lib/cursor-detection.js";
|
|
5
5
|
import { getCurrentCursorUsageSummary } from "../lib/cursor-usage.js";
|
|
6
|
-
import { attemptedResult, notAttemptedResult } from "./result-helpers.js";
|
|
6
|
+
import { attemptedResult, notAttemptedResult, statusDetailsFromRecord, withStatusDetails, } from "./result-helpers.js";
|
|
7
7
|
function buildCursorGroup(plan) {
|
|
8
8
|
return plan ? `Cursor (${plan})` : "Cursor";
|
|
9
9
|
}
|
|
@@ -38,11 +38,39 @@ export const cursorProvider = {
|
|
|
38
38
|
plan: ctx.config.cursorPlan,
|
|
39
39
|
overrideUsd: ctx.config.cursorIncludedApiUsd,
|
|
40
40
|
});
|
|
41
|
-
const usage = await
|
|
42
|
-
|
|
41
|
+
const [usage, auth, integration] = await Promise.all([
|
|
42
|
+
getCurrentCursorUsageSummary({
|
|
43
|
+
billingCycleStartDay: ctx.config.cursorBillingCycleStartDay,
|
|
44
|
+
}),
|
|
45
|
+
inspectCursorAuthPresence(),
|
|
46
|
+
inspectCursorOpenCodeIntegration(),
|
|
47
|
+
]);
|
|
48
|
+
const formatUsage = (costUsd, messageCount) => `${fmtUsdAmount(costUsd)} across ${Math.trunc(messageCount).toLocaleString("en-US")} messages`;
|
|
49
|
+
const statusDetails = statusDetailsFromRecord({
|
|
50
|
+
plan: planLabel ?? "none",
|
|
51
|
+
included_api_usd: typeof includedApiUsd === "number" ? fmtUsdAmount(includedApiUsd) : "(none)",
|
|
52
|
+
billing_cycle_start_day: typeof ctx.config.cursorBillingCycleStartDay === "number"
|
|
53
|
+
? String(ctx.config.cursorBillingCycleStartDay)
|
|
54
|
+
: "(calendar month)",
|
|
55
|
+
auth_state: auth.state,
|
|
56
|
+
auth_selected_path: auth.selectedPath ?? "(none)",
|
|
57
|
+
auth_present_paths: auth.presentPaths.join(" | ") || "(none)",
|
|
58
|
+
auth_candidate_paths: auth.candidatePaths.join(" | ") || "(none)",
|
|
59
|
+
auth_error: auth.error,
|
|
60
|
+
plugin_enabled: integration.pluginEnabled ? "true" : "false",
|
|
61
|
+
canonical_plugin_package: CURSOR_CANONICAL_PLUGIN_PACKAGE,
|
|
62
|
+
provider_configured: integration.providerConfigured ? "true" : "false",
|
|
63
|
+
config_matches: integration.matchedPaths.join(" | ") || "(none)",
|
|
64
|
+
config_checked_paths: integration.checkedPaths.join(" | ") || "(none)",
|
|
65
|
+
cycle_source: usage.window.source,
|
|
66
|
+
cycle_reset_at: usage.window.resetTimeIso,
|
|
67
|
+
api_usage: formatUsage(usage.api.costUsd, usage.api.messageCount),
|
|
68
|
+
auto_composer_usage: formatUsage(usage.autoComposer.costUsd, usage.autoComposer.messageCount),
|
|
69
|
+
total_cursor_usage: formatUsage(usage.total.costUsd, usage.total.messageCount),
|
|
70
|
+
unknown_cursor_models: Math.trunc(usage.unknownModels.length).toLocaleString("en-US"),
|
|
43
71
|
});
|
|
44
72
|
if (usage.total.messageCount === 0 && includedApiUsd === undefined) {
|
|
45
|
-
return notAttemptedResult();
|
|
73
|
+
return withStatusDetails(notAttemptedResult(), statusDetails);
|
|
46
74
|
}
|
|
47
75
|
const errors = usage.unknownModels.length > 0
|
|
48
76
|
? [
|
|
@@ -121,7 +149,7 @@ export const cursorProvider = {
|
|
|
121
149
|
resetTimeIso: usage.window.resetTimeIso,
|
|
122
150
|
});
|
|
123
151
|
}
|
|
124
|
-
return attemptedResult(entries, errors);
|
|
152
|
+
return withStatusDetails(attemptedResult(entries, errors), statusDetails);
|
|
125
153
|
},
|
|
126
154
|
};
|
|
127
155
|
//# sourceMappingURL=cursor.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cursor.js","sourceRoot":"","sources":["../../src/providers/cursor.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,4BAA4B,EAAE,MAAM,iCAAiC,CAAC;AAC/E,OAAO,EACL,gCAAgC,EAChC,wBAAwB,EACxB,eAAe,EACf,kBAAkB,GACnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,
|
|
1
|
+
{"version":3,"file":"cursor.js","sourceRoot":"","sources":["../../src/providers/cursor.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deepseek.d.ts","sourceRoot":"","sources":["../../src/providers/deepseek.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EACV,aAAa,EAId,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"deepseek.d.ts","sourceRoot":"","sources":["../../src/providers/deepseek.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EACV,aAAa,EAId,MAAM,mBAAmB,CAAC;AA4D3B,eAAO,MAAM,gBAAgB,EAAE,aAiC9B,CAAC"}
|
|
@@ -4,10 +4,10 @@
|
|
|
4
4
|
* Queries the DeepSeek /user/balance endpoint and displays the
|
|
5
5
|
* account balance as a value entry.
|
|
6
6
|
*/
|
|
7
|
-
import { formatDeepSeekBalanceValue, hasDeepSeekApiKeyConfigured, queryDeepSeekBalance, } from "../lib/deepseek.js";
|
|
7
|
+
import { formatDeepSeekBalanceValue, getDeepSeekKeyDiagnostics, hasDeepSeekApiKeyConfigured, queryDeepSeekBalance, } from "../lib/deepseek.js";
|
|
8
8
|
import { isCanonicalProviderAvailable } from "../lib/provider-availability.js";
|
|
9
9
|
import { modelProviderIncludesAny } from "../lib/provider-model-matching.js";
|
|
10
|
-
import { attemptedResult, mapNullableProviderResult } from "./result-helpers.js";
|
|
10
|
+
import { attemptedResult, mapNullableProviderResult, simpleApiKeyStatusDetails, withStatusDetails, } from "./result-helpers.js";
|
|
11
11
|
function buildDeepSeekEntries(result) {
|
|
12
12
|
const entries = [];
|
|
13
13
|
for (const info of result.balanceInfos) {
|
|
@@ -63,11 +63,18 @@ export const deepseekProvider = {
|
|
|
63
63
|
return modelProviderIncludesAny(model, ["deepseek"]);
|
|
64
64
|
},
|
|
65
65
|
async fetch(ctx) {
|
|
66
|
+
const diagnostics = await getDeepSeekKeyDiagnostics().catch(() => ({
|
|
67
|
+
configured: false,
|
|
68
|
+
source: null,
|
|
69
|
+
checkedPaths: [],
|
|
70
|
+
authPaths: [],
|
|
71
|
+
}));
|
|
66
72
|
const result = await queryDeepSeekBalance({ requestTimeoutMs: ctx.config?.requestTimeoutMs });
|
|
67
|
-
|
|
73
|
+
const providerResult = mapNullableProviderResult(result, {
|
|
68
74
|
errorLabel: "DeepSeek",
|
|
69
75
|
onSuccess: (result) => attemptedResult(buildDeepSeekEntries(result)),
|
|
70
76
|
});
|
|
77
|
+
return withStatusDetails(providerResult, simpleApiKeyStatusDetails(diagnostics));
|
|
71
78
|
},
|
|
72
79
|
};
|
|
73
80
|
//# sourceMappingURL=deepseek.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deepseek.js","sourceRoot":"","sources":["../../src/providers/deepseek.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAQH,OAAO,EACL,0BAA0B,EAC1B,2BAA2B,EAC3B,oBAAoB,GACrB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,4BAA4B,EAAE,MAAM,iCAAiC,CAAC;AAC/E,OAAO,EAAE,wBAAwB,EAAE,MAAM,mCAAmC,CAAC;AAC7E,OAAO,
|
|
1
|
+
{"version":3,"file":"deepseek.js","sourceRoot":"","sources":["../../src/providers/deepseek.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,6 +23,15 @@ export declare function createGlmCodingPlanProvider(params: {
|
|
|
23
23
|
}) => Promise<{
|
|
24
24
|
state: string;
|
|
25
25
|
}>;
|
|
26
|
+
getAuthDiagnostics: (params: {
|
|
27
|
+
maxAgeMs: number;
|
|
28
|
+
}) => Promise<{
|
|
29
|
+
state: string;
|
|
30
|
+
source: string | null;
|
|
31
|
+
checkedPaths: string[];
|
|
32
|
+
authPaths: string[];
|
|
33
|
+
error?: string;
|
|
34
|
+
}>;
|
|
26
35
|
queryQuota: (params: {
|
|
27
36
|
requestTimeoutMs?: number;
|
|
28
37
|
}) => Promise<GlmQuotaResult | {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"glm-coding-plan-provider.d.ts","sourceRoot":"","sources":["../../src/providers/glm-coding-plan-provider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAwB,MAAM,mBAAmB,CAAC;AAC7E,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"glm-coding-plan-provider.d.ts","sourceRoot":"","sources":["../../src/providers/glm-coding-plan-provider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAwB,MAAM,mBAAmB,CAAC;AAC7E,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,6BAA6B,CAAC;AAW5E,KAAK,cAAc,GAAG;IACpB,gBAAgB,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF,KAAK,cAAc,GAAG;IACpB,OAAO,EAAE,IAAI,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE;QACP,QAAQ,CAAC,EAAE,cAAc,CAAC;QAC1B,MAAM,CAAC,EAAE,cAAc,CAAC;QACxB,GAAG,CAAC,EAAE,cAAc,CAAC;KACtB,CAAC;CACH,CAAC;AAEF,wBAAgB,2BAA2B,CAAC,MAAM,EAAE;IAClD,EAAE,EAAE,KAAK,GAAG,OAAO,CAAC;IACpB,UAAU,EAAE,wBAAwB,CAAC;IACrC,UAAU,EAAE,MAAM,CAAC;IACnB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,WAAW,EAAE,CAAC,MAAM,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAA;KAAE,KAAK,OAAO,CAAC;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC1E,kBAAkB,EAAE,CAAC,MAAM,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAA;KAAE,KAAK,OAAO,CAAC;QAC5D,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;QACtB,YAAY,EAAE,MAAM,EAAE,CAAC;QACvB,SAAS,EAAE,MAAM,EAAE,CAAC;QACpB,KAAK,CAAC,EAAE,MAAM,CAAC;KAChB,CAAC,CAAC;IACH,UAAU,EAAE,CAAC,MAAM,EAAE;QACnB,gBAAgB,CAAC,EAAE,MAAM,CAAC;KAC3B,KAAK,OAAO,CAAC,cAAc,GAAG;QAAE,OAAO,EAAE,KAAK,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC,CAAC;IACzE,mBAAmB,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC;CACjD,GAAG,aAAa,CAoEhB"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { isCanonicalProviderAvailable } from "../lib/provider-availability.js";
|
|
2
|
-
import { attemptedResult, groupedPercentWindowEntries, mapNullableProviderResult, } from "./result-helpers.js";
|
|
2
|
+
import { apiKeyStatusDetails, attemptedResult, groupedPercentWindowEntries, mapNullableProviderResult, statusDetailsFromRecord, withStatusDetails, } from "./result-helpers.js";
|
|
3
3
|
export function createGlmCodingPlanProvider(params) {
|
|
4
4
|
return {
|
|
5
5
|
id: params.id,
|
|
@@ -16,8 +16,10 @@ export function createGlmCodingPlanProvider(params) {
|
|
|
16
16
|
},
|
|
17
17
|
matchesCurrentModel: params.matchesCurrentModel,
|
|
18
18
|
async fetch(ctx) {
|
|
19
|
+
const diagnostics = await params.getAuthDiagnostics({ maxAgeMs: params.authCacheMaxAgeMs });
|
|
20
|
+
const authDetails = apiKeyStatusDetails(diagnostics);
|
|
19
21
|
const result = await params.queryQuota({ requestTimeoutMs: ctx.config?.requestTimeoutMs });
|
|
20
|
-
|
|
22
|
+
const providerResult = mapNullableProviderResult(result, {
|
|
21
23
|
errorLabel: params.errorLabel,
|
|
22
24
|
onSuccess: (quota) => attemptedResult(groupedPercentWindowEntries({
|
|
23
25
|
group: quota.label,
|
|
@@ -34,6 +36,26 @@ export function createGlmCodingPlanProvider(params) {
|
|
|
34
36
|
],
|
|
35
37
|
}), [], { singleWindowDisplayName: quota.label }),
|
|
36
38
|
});
|
|
39
|
+
const windows = result?.success ? result.windows : {};
|
|
40
|
+
const formatWindow = (window) => window
|
|
41
|
+
? `${window.percentRemaining}% reset_at=${window.resetTimeIso ?? "(none)"}`
|
|
42
|
+
: undefined;
|
|
43
|
+
return withStatusDetails(providerResult, [
|
|
44
|
+
...authDetails,
|
|
45
|
+
...statusDetailsFromRecord({
|
|
46
|
+
live_fetch_error: !result
|
|
47
|
+
? `${params.errorLabel} API key became unavailable before fetch`
|
|
48
|
+
: result.success
|
|
49
|
+
? undefined
|
|
50
|
+
: result.error,
|
|
51
|
+
five_hour_remaining: formatWindow(windows.fiveHour),
|
|
52
|
+
weekly_remaining: formatWindow(windows.weekly),
|
|
53
|
+
mcp_remaining: formatWindow(windows.mcp),
|
|
54
|
+
live_state: result?.success && !windows.fiveHour && !windows.weekly && !windows.mcp
|
|
55
|
+
? `no reportable ${params.errorLabel} quota windows`
|
|
56
|
+
: undefined,
|
|
57
|
+
}),
|
|
58
|
+
]);
|
|
37
59
|
},
|
|
38
60
|
};
|
|
39
61
|
}
|