diff --git a/desktop/src-tauri/Cargo.lock b/desktop/src-tauri/Cargo.lock index dcf6e108aec..af7e5d3066a 100644 --- a/desktop/src-tauri/Cargo.lock +++ b/desktop/src-tauri/Cargo.lock @@ -2541,7 +2541,7 @@ dependencies = [ [[package]] name = "opencodex-desktop" -version = "2.65.0-vadymhimself.23" +version = "2.65.0-vadymhimself.24" dependencies = [ "dbus", "reqwest 0.12.24", diff --git a/desktop/src-tauri/Cargo.toml b/desktop/src-tauri/Cargo.toml index b9ff2bbaa96..fa1760977d8 100644 --- a/desktop/src-tauri/Cargo.toml +++ b/desktop/src-tauri/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "opencodex-desktop" -version = "2.65.0-vadymhimself.23" +version = "2.65.0-vadymhimself.24" description = "OpenCodex desktop shell" authors = ["OpenCodex contributors"] license = "MIT" diff --git a/desktop/src-tauri/tauri.conf.json b/desktop/src-tauri/tauri.conf.json index e6a77ee53a8..e0cc4bb837a 100644 --- a/desktop/src-tauri/tauri.conf.json +++ b/desktop/src-tauri/tauri.conf.json @@ -1,7 +1,7 @@ { "$schema": "https://schema.tauri.app/config/2", "productName": "OpenCodex", - "version": "2.65.0-vadymhimself.23", + "version": "2.65.0-vadymhimself.24", "identifier": "com.opencodex.desktop", "build": { "frontendDist": "../ui", diff --git a/fixtures/external/kimi/README.md b/fixtures/external/kimi/README.md new file mode 100644 index 00000000000..cfebd68cf0a --- /dev/null +++ b/fixtures/external/kimi/README.md @@ -0,0 +1,5 @@ +# Documented Kimi answers + +Samples of what Kimi's `GET /coding/v1/usages` sends, taken from Kimi's own published client code, not captured from live traffic. A test that needs one of these loads it from here; it never hand-types a shorter or tidier copy. + +- client-test-usages-full.json: the usages payload in the test "parses the full payload" of Kimi's own client, MoonshotAI/kimi-code, `packages/oauth/test/managed-usage.test.ts` (https://github.com/MoonshotAI/kimi-code/blob/main/packages/oauth/test/managed-usage.test.ts), read 2026-11-15. The fields are copied as written there and serialized as JSON, the way that test's own fetch mock serializes its body; the vendor's parser reading it is `packages/oauth/src/managed-usage.ts`. It is the vendor's documented shape, not a live capture: no live `/usages` body has been recorded. It holds no key, account or request id. diff --git a/fixtures/external/kimi/client-test-usages-full.json b/fixtures/external/kimi/client-test-usages-full.json new file mode 100644 index 00000000000..a60d309375f --- /dev/null +++ b/fixtures/external/kimi/client-test-usages-full.json @@ -0,0 +1 @@ +{"goods_version":2,"usages":{"limit_5h":{"used_ratio":0.3,"reset_time":"2026-09-11T18:00:00Z"},"limit_7d":{"used_ratio":0.2,"reset_time":"2026-09-17T00:00:00Z"},"limit_month_total":{"used_ratio":0.4,"reset_time":"2026-10-01T00:00:00Z"},"limit_month_code":{"used_ratio":0.25,"reset_time":"2026-10-01T00:00:00Z"}}} diff --git a/package.json b/package.json index 291cf84b6d5..2887ec10ef0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@bitkyc08/opencodex", - "version": "2.65.0-vadymhimself.23", + "version": "2.65.0-vadymhimself.24", "description": "Universal provider proxy for OpenAI Codex & Claude Code — use any LLM with Codex CLI/App/SDK and Claude Code", "type": "module", "main": "./bin/package-main.mjs", diff --git a/src/providers/quota/vendor-probes-key.ts b/src/providers/quota/vendor-probes-key.ts index 59347607f5e..74ab52016b0 100644 --- a/src/providers/quota/vendor-probes-key.ts +++ b/src/providers/quota/vendor-probes-key.ts @@ -962,8 +962,8 @@ function unwrapKimiQuotaPayload(value: unknown): Record | null // A null/non-usable outer field is a placeholder, not data — an envelope like // { usage: null, data: { usage: {...} } } must still unwrap to the nested payload. const usable = (field: unknown): boolean => field !== undefined && field !== null; - const outerHasUsage = usable(body.usage) || usable(body.limits) || usable(body.totalQuota); - const nestedHasUsage = usable(nested.usage) || usable(nested.limits) || usable(nested.totalQuota); + const outerHasUsage = usable(body.usage) || usable(body.usages) || usable(body.limits) || usable(body.totalQuota); + const nestedHasUsage = usable(nested.usage) || usable(nested.usages) || usable(nested.limits) || usable(nested.totalQuota); return !outerHasUsage && nestedHasUsage ? nested : body; } @@ -1009,13 +1009,29 @@ function isKimiWeeklyLimit(item: Record, detail: Record { expect(seen).toEqual([]); }); + test("Kimi quota reads Kimi Code's documented usages shape: 5-hour, weekly and monthly pools", async () => { + await saveCredential("kimi", { access: "kimi-access-secret", refresh: "kimi-refresh-secret", expires: Date.now() + 3600_000 }); + // Kimi's own client test payload (fixtures/external/kimi/README.md). + const usages = readFileSync(repoPath("fixtures/external/kimi/client-test-usages-full.json"), "utf8"); + globalThis.fetch = (async (input: RequestInfo | URL) => { + if (String(input) !== "https://api.kimi.com/coding/v1/usages") return new Response("not found", { status: 404 }); + return new Response(usages, { status: 200 }); + }) as typeof fetch; + + const result = await fetchProviderQuotaReports(kimiOnlyConfig(), true); + + expect(result.reports[0]?.quota).toEqual({ + fiveHourPercent: 30, + fiveHourResetAt: Date.parse("2026-09-11T18:00:00Z"), + weeklyPercent: 20, + weeklyResetAt: Date.parse("2026-09-17T00:00:00Z"), + monthlyPercent: 40, + monthlyResetAt: Date.parse("2026-10-01T00:00:00Z"), + updatedAt: expect.any(Number), + }); + }); + + test("Kimi quota usages shape: when usages is present, legacy limits and totalQuota blocks are not read", async () => { + await saveCredential("kimi", { access: "kimi-access-secret", refresh: "kimi-refresh-secret", expires: Date.now() + 3600_000 }); + // Edge input, not a provider sample: the documented usages plus legacy blocks that must be ignored. + const documented = JSON.parse(readFileSync(repoPath("fixtures/external/kimi/client-test-usages-full.json"), "utf8")); + globalThis.fetch = (async () => new Response(JSON.stringify({ + ...documented, + limits: [{ window: { duration: 300, timeUnit: "TIME_UNIT_MINUTE" }, detail: { limit: "100", remaining: "1" } }], + totalQuota: { limit: "100", remaining: "1" }, + }), { status: 200 })) as typeof fetch; + + const result = await fetchProviderQuotaReports(kimiOnlyConfig(), true); + + expect(result.reports[0]?.quota?.fiveHourPercent).toBe(30); + expect(result.reports[0]?.quota?.monthlyPercent).toBe(40); + }); + + // Edge input, not a provider sample: ratio forms the parser must accept or skip. + test("Kimi quota usages shape: a 0 ratio is 0%, limit_7d is weekly, a missing ratio is skipped", async () => { + await saveCredential("kimi", { access: "kimi-access-secret", refresh: "kimi-refresh-secret", expires: Date.now() + 3600_000 }); + globalThis.fetch = (async () => new Response(JSON.stringify({ + usages: { + limit_5h: { used_ratio: 0, reset_time: "2026-11-06T07:46:00Z" }, + limit_7d: { used_ratio: "0.5", reset_time: "2026-11-10T00:00:00Z" }, + limit_month_total: { reset_time: "2026-12-06T03:22:00Z" }, + }, + }), { status: 200 })) as typeof fetch; + + const result = await fetchProviderQuotaReports(kimiOnlyConfig(), true); + + expect(result.reports[0]?.quota).toEqual({ + fiveHourPercent: 0, + fiveHourResetAt: Date.parse("2026-11-06T07:46:00Z"), + weeklyPercent: 50, + weeklyResetAt: Date.parse("2026-11-10T00:00:00Z"), + updatedAt: expect.any(Number), + }); + }); + test("Kimi quota refreshes an expired OAuth token before calling usages", async () => { await saveCredential("kimi", { access: "expired-kimi-access", refresh: "kimi-refresh-secret", expires: Date.now() - 1 }); const seen: Array<{ url: string; authorization?: string }> = [];