dsh-subscriptions 0.1.1 → 0.1.2

package/lib/index.js

@@ -1031,8 +1031,94 @@ async function setDefaultAccount(provider, account, path = authFilePath()) {
 	});
 }
 
+//#endregion
+//#region src/providers/minimax-usage.ts
+/** MiniMax subscription quota, not the balance API for sk-api-* inference keys. */
+async function fetchMiniMaxUsage(key, region, http$1 = fetch, signal) {
+	if (key.startsWith("sk-api-")) throw new Error("MiniMax requires a subscription key, not a pay-as-you-go key");
+	const response = await http$1(`https://www.minimax.${region === "cn" ? "cn" : "io"}/v1/token_plan/remains`, {
+		headers: {
+			authorization: `Bearer ${key}`,
+			"content-type": "application/json"
+		},
+		...signal === void 0 ? {} : { signal }
+	});
+	if (!response.ok) throw new Error(`MiniMax usage endpoint returned HTTP ${response.status}`);
+	const body = await response.json();
+	if (body?.base_resp?.status_code !== void 0 && body.base_resp.status_code !== 0 || !Array.isArray(body?.model_remains)) throw new Error("MiniMax usage response failed or has no quota records");
+	const windows = [];
+	for (const raw of body.model_remains) {
+		if (raw === null || typeof raw !== "object") continue;
+		const row = raw;
+		if (typeof row.model_name !== "string") continue;
+		for (const [prefix, startKey, endKey, fallback] of [[
+			"current_interval",
+			"start_time",
+			"end_time",
+			"session"
+		], [
+			"current_weekly",
+			"weekly_start_time",
+			"weekly_end_time",
+			"weekly"
+		]]) {
+			if (row[`${prefix}_status`] === 3) continue;
+			const remaining = row[`${prefix}_remaining_percent`];
+			const boost = prefix === "current_weekly" ? row.weekly_boost_permille ?? 1e3 : 1e3;
+			if (typeof boost !== "number" || !Number.isFinite(boost) || boost <= 0) continue;
+			const total = row[`${prefix}_total_count`];
+			const count = row[`${prefix}_usage_count`];
+			if (typeof total !== "number" || !Number.isFinite(total) || total <= 0) continue;
+			const usedPercent = typeof remaining === "number" ? 100 - remaining * boost / 1e3 : typeof total === "number" && total > 0 && typeof count === "number" ? (1 - count / total) * 100 : void 0;
+			if (usedPercent === void 0 || !Number.isFinite(usedPercent) || usedPercent < 0 || usedPercent > 100) continue;
+			const start = row[startKey];
+			const end = row[endKey];
+			const validBounds = typeof start === "number" && Number.isFinite(start) && start > 0 && typeof end === "number" && Number.isFinite(end) && end > start;
+			windows.push({
+				kind: fallback === "session" && validBounds && end - start !== 18e6 ? "other" : fallback,
+				scope: row.model_name,
+				usedPercent,
+				...validBounds ? {
+					startsAt: start,
+					resetsAt: end
+				} : {}
+			});
+		}
+	}
+	if (!windows.length) throw new Error("MiniMax has no supported finite quota windows");
+	return {
+		supported: true,
+		plan: "MiniMax",
+		windows
+	};
+}
+
 //#endregion
 //#region src/providers/external-usage.ts
+function numeric(value) {
+	const n = typeof value === "string" && value.trim() !== "" ? Number(value) : value;
+	return typeof n === "number" && Number.isFinite(n) ? n : void 0;
+}
+function kimiReset(value) {
+	for (const key of [
+		"reset_at",
+		"resetAt",
+		"reset_time",
+		"resetTime"
+	]) {
+		const reset = resetTime$1(value[key]);
+		if (reset !== void 0) return reset;
+	}
+	for (const key of [
+		"reset_in",
+		"resetIn",
+		"ttl",
+		"window"
+	]) {
+		const seconds = numeric(value[key]);
+		if (seconds !== void 0 && seconds > 0) return Date.now() + seconds * 1e3;
+	}
+}
 function record$3(value) {
 	return value !== null && typeof value === "object" && !Array.isArray(value) ? value : void 0;
 }
@@ -1085,6 +1171,13 @@ async function fetchOpenCodeGoUsage(apiKey, http$1 = fetch, signal) {
 			kind,
 			...scope === void 0 ? {} : { scope },
 			usedPercent,
+			...field === "rolling" ? {
+				fixedWindow: true,
+				windowDurationMs: 18e6
+			} : field === "weekly" ? {
+				fixedWindow: true,
+				windowDurationMs: 6048e5
+			} : {},
 			...resetsAt === void 0 ? {} : { resetsAt }
 		});
 	}
@@ -1095,12 +1188,45 @@ async function fetchOpenCodeGoUsage(apiKey, http$1 = fetch, signal) {
 		plan: "OpenCode Go"
 	};
 }
-/** Read the Kimi Code plan windows using the same API as the Kimi Code CLI. */
+/** Read official CLI count windows and retain compatibility with older ratio pools. */
 async function fetchKimiCodeUsage(apiKey, http$1 = fetch, signal) {
 	const body = record$3(await getUsage("https://api.kimi.com/coding/v1/usages", apiKey, http$1, signal));
 	if (body === void 0) throw new Error("Kimi Code usage response is not an object");
+	const modern = [];
+	const rows = [...record$3(body.usage) ? [{ detail: body.usage }] : [], ...Array.isArray(body.limits) ? body.limits : []];
+	for (const raw of rows) {
+		const item = record$3(raw);
+		if (!item) continue;
+		const detail = record$3(item.detail) ?? item;
+		const limit = numeric(detail.limit);
+		const used = numeric(detail.used) ?? (limit !== void 0 && numeric(detail.remaining) !== void 0 ? limit - numeric(detail.remaining) : void 0);
+		if (limit === void 0 || limit <= 0 || used === void 0) continue;
+		const usedPercent = percent(used / limit * 100);
+		if (usedPercent === void 0) continue;
+		const window = record$3(item.window) ?? item;
+		const duration = numeric(window.duration ?? item.duration ?? detail.duration);
+		const unit = String(window.timeUnit ?? item.timeUnit ?? detail.timeUnit ?? "").toUpperCase();
+		const multiplier = unit.includes("MINUTE") ? 6e4 : unit.includes("HOUR") ? 36e5 : unit.includes("DAY") ? 864e5 : unit.includes("SECOND") ? 1e3 : void 0;
+		const durationMs$1 = duration === void 0 || duration <= 0 || multiplier === void 0 ? void 0 : duration * multiplier;
+		const kind = durationMs$1 === 18e6 ? "session" : durationMs$1 === 6048e5 ? "weekly" : "other";
+		const resetsAt = kimiReset(detail);
+		const scope = detail.name ?? detail.title ?? item.name ?? item.title;
+		modern.push({
+			kind,
+			usedPercent,
+			...typeof scope === "string" ? { scope } : {},
+			...resetsAt === void 0 ? {} : { resetsAt },
+			...durationMs$1 === void 0 ? {} : { windowDurationMs: durationMs$1 },
+			...kind === "weekly" ? { fixedWindow: true } : {}
+		});
+	}
+	if (modern.length) return {
+		supported: true,
+		windows: modern,
+		plan: "Kimi Code"
+	};
 	const usages = record$3(body.usages);
-	if (usages === void 0) throw new Error("Kimi Code usage response has no usages object");
+	if (usages === void 0) throw new Error("Kimi Code usage response has no valid windows");
 	const windows = [];
 	for (const [field, kind, scope] of [
 		[
@@ -1127,6 +1253,10 @@ async function fetchKimiCodeUsage(apiKey, http$1 = fetch, signal) {
 			kind,
 			...scope === void 0 ? {} : { scope },
 			usedPercent: ratio * 100,
+			...field === "limit_7d" ? {
+				fixedWindow: true,
+				windowDurationMs: 6048e5
+			} : {},
 			...resetsAt === void 0 ? {} : { resetsAt }
 		});
 	}
@@ -1139,10 +1269,17 @@ async function fetchKimiCodeUsage(apiKey, http$1 = fetch, signal) {
 
 //#endregion
 //#region src/providers/external-usage-controller.ts
-const EXTERNAL_USAGE_SOURCES = ["opencode-go", "kimi-code"];
+const EXTERNAL_USAGE_SOURCES = [
+	"opencode-go",
+	"kimi-code",
+	"minimax",
+	"minimax-cn"
+];
 const DEFAULT_REFS = {
 	"opencode-go": "OPENCODE_GO_API_KEY",
-	"kimi-code": "KIMI_CODING_API_KEY"
+	"kimi-code": "KIMI_CODING_API_KEY",
+	"minimax": "MINIMAX_API_KEY",
+	"minimax-cn": "MINIMAX_CN_API_KEY"
 };
 var ExternalUsageController = class {
 	refs;
@@ -1155,18 +1292,16 @@ var ExternalUsageController = class {
 		};
 	}
 	async status() {
-		const [go, kimi] = await Promise.all(EXTERNAL_USAGE_SOURCES.map(async (source) => {
+		const values = await Promise.all(EXTERNAL_USAGE_SOURCES.map(async (source) => {
 			const value = await this.resolveCredential(this.refs[source]);
 			return typeof value?.value === "string" && value.value.length > 0;
 		}));
-		return {
-			"opencode-go": { configured: go ?? false },
-			"kimi-code": { configured: kimi ?? false }
-		};
+		return Object.fromEntries(EXTERNAL_USAGE_SOURCES.map((source, i) => [source, { configured: values[i] ?? false }]));
 	}
 	async usage(source, signal) {
 		const credential = await this.resolveCredential(this.refs[source]);
 		if (credential?.value === void 0 || credential.value.length === 0) throw new Error(`${source} API key is not configured`);
+		if (source === "minimax" || source === "minimax-cn") return fetchMiniMaxUsage(credential.value, source === "minimax-cn" ? "cn" : "global", this.http, signal);
 		return source === "opencode-go" ? fetchOpenCodeGoUsage(credential.value, this.http, signal) : fetchKimiCodeUsage(credential.value, this.http, signal);
 	}
 };
@@ -1766,6 +1901,12 @@ async function fetchCursorUsage(accessToken, http$1 = fetch, signal) {
 	const resetValue = summary?.billingCycleEnd;
 	const parsedReset = typeof resetValue === "string" ? Date.parse(resetValue) : NaN;
 	const resetsAt = Number.isFinite(parsedReset) ? parsedReset : void 0;
+	const startValue = summary?.billingCycleStart;
+	const parsedStart = typeof startValue === "string" ? Date.parse(startValue) : NaN;
+	const timing = {
+		...resetsAt === void 0 ? {} : { resetsAt },
+		...Number.isFinite(parsedStart) ? { startsAt: parsedStart } : {}
+	};
 	const windows = [];
 	for (const [field, scope] of [
 		["totalPercentUsed", "Included"],
@@ -1778,11 +1919,14 @@ async function fetchCursorUsage(accessToken, http$1 = fetch, signal) {
 			kind: "other",
 			scope,
 			usedPercent,
-			...resetsAt === void 0 ? {} : { resetsAt }
+			...timing
 		});
 	}
 	const legacy = legacyRequestWindow(legacyResult.status === "fulfilled" ? legacyResult.value : void 0, resetsAt);
-	if (legacy !== void 0) windows.push(legacy);
+	if (legacy !== void 0) windows.push({
+		...legacy,
+		...timing
+	});
 	if (windows.length === 0 && summary?.isUnlimited !== true) throw new Error("Cursor usage response has no quota windows");
 	const membershipType = summary?.membershipType;
 	return {
@@ -4521,8 +4665,8 @@ function resetInstantFromValue(value, now) {
 	if (typeof value !== "string") return void 0;
 	const trimmed = value.trim();
 	if (trimmed.length === 0) return void 0;
-	const numeric = Number(trimmed);
-	if (Number.isFinite(numeric)) return resetInstantFromNumber(numeric, now);
+	const numeric$1 = Number(trimmed);
+	if (Number.isFinite(numeric$1)) return resetInstantFromNumber(numeric$1, now);
 	const duration = durationMs(trimmed);
 	if (duration !== void 0) return now + duration;
 	const parsed = Date.parse(trimmed);
@@ -6548,6 +6692,16 @@ function claudeResetsAt(value) {
 	const parsed = Date.parse(value);
 	return Number.isFinite(parsed) ? parsed : void 0;
 }
+/** Claude session and weekly buckets reset as whole five-hour/seven-day windows. */
+function claudeWindowTiming(kind) {
+	return kind === "session" ? {
+		windowDurationMs: 300 * 6e4,
+		fixedWindow: true
+	} : kind === "weekly" ? {
+		windowDurationMs: 10080 * 6e4,
+		fixedWindow: true
+	} : {};
+}
 /** Map one legacy `{utilization, resets_at}` bucket; undefined when null or unusable. */
 function claudeLegacyWindow(value, kind, scope) {
 	if (typeof value !== "object" || value === null) return void 0;
@@ -6557,6 +6711,7 @@ function claudeLegacyWindow(value, kind, scope) {
 	return {
 		kind,
 		...scope === void 0 ? {} : { scope },
+		...claudeWindowTiming(kind),
 		usedPercent: bucket.utilization,
 		...resetsAt === void 0 ? {} : { resetsAt }
 	};
@@ -6575,6 +6730,7 @@ function claudeLimitsWindows(value) {
 		windows.push({
 			kind,
 			...typeof scope === "string" && scope.length > 0 ? { scope } : {},
+			...claudeWindowTiming(kind),
 			usedPercent: entry.percent,
 			...resetsAt === void 0 ? {} : { resetsAt }
 		});
@@ -7575,6 +7731,10 @@ function codexUsageWindow(value, fallbackKind) {
 	else if (typeof window.reset_after_seconds === "number" && window.reset_after_seconds > 0) resetsAt = Date.now() + window.reset_after_seconds * 1e3;
 	return {
 		kind: codexWindowKind(window, fallbackKind),
+		...typeof window.limit_window_seconds === "number" && Number.isFinite(window.limit_window_seconds) && window.limit_window_seconds > 0 ? {
+			windowDurationMs: window.limit_window_seconds * 1e3,
+			fixedWindow: true
+		} : {},
 		usedPercent: window.used_percent,
 		...resetsAt === void 0 ? {} : { resetsAt }
 	};
@@ -9106,13 +9266,19 @@ var PoolUsageTracker = class {
 		const entry = this.entries.get(key);
 		if (entry !== void 0 && Date.now() - entry.at < (entry.cooldownMs ?? this.ttlMs)) if (entry.snapshot !== void 0) {
 			if (!force) return entry.snapshot;
-		} else if (entry.lastSnapshot !== void 0) return entry.lastSnapshot;
+		} else if (entry.lastSnapshot !== void 0) return {
+			...entry.lastSnapshot,
+			stale: true
+		};
 		else throw entry.error;
 		try {
 			return await this.refresh(key, fetcher);
 		} catch (error) {
 			const failed = this.entries.get(key);
-			if (failed?.snapshot === void 0 && failed?.lastSnapshot !== void 0) return failed.lastSnapshot;
+			if (failed?.snapshot === void 0 && failed?.lastSnapshot !== void 0) return {
+				...failed.lastSnapshot,
+				stale: true
+			};
 			throw error;
 		}
 	}
@@ -9137,10 +9303,16 @@ var PoolUsageTracker = class {
 		if (pending === void 0) {
 			const prior = this.entries.get(key);
 			const lastSnapshot = prior?.snapshot ?? prior?.lastSnapshot;
-			pending = fetcher().then((snapshot) => {
+			pending = fetcher().then((value) => {
+				const at = Date.now();
+				const snapshot = {
+					...value,
+					observedAt: at,
+					stale: false
+				};
 				this.entries.set(key, {
 					snapshot,
-					at: Date.now()
+					at
 				});
 				return snapshot;
 			}, (error) => {
@@ -9445,10 +9617,12 @@ async function fetchGrokUsage(session, fetchFn = hostFetch, signal) {
 		const kind = config.currentPeriod?.type === "USAGE_PERIOD_TYPE_WEEKLY" ? "weekly" : "other";
 		const resetsAt = grokResetsAt(config.currentPeriod?.end);
 		const usedPercent = typeof config.creditUsagePercent === "number" && Number.isFinite(config.creditUsagePercent) ? config.creditUsagePercent : 0;
+		const startsAt = grokResetsAt(config.currentPeriod?.start);
 		windows.push({
 			kind,
 			usedPercent,
-			...resetsAt === void 0 ? {} : { resetsAt }
+			...resetsAt === void 0 ? {} : { resetsAt },
+			...startsAt === void 0 ? {} : { startsAt }
 		});
 	} else if (typeof config.monthlyLimit?.val === "number" && config.monthlyLimit.val > 0) {
 		const used = typeof config.used?.val === "number" ? config.used.val : 0;
@@ -12999,16 +13173,29 @@ const Config = z.object({
 const DEFAULT_MODELS = {
 	codex: [
 		{
-			id: "gpt-5.1-codex",
-			name: "GPT-5.1 Codex"
+			id: "gpt-6-astra",
+			name: "GPT-6-Astra",
+			contextWindow: 272e3
+		},
+		{
+			id: "gpt-5.6-sol",
+			name: "GPT-5.6-Sol",
+			contextWindow: 272e3
 		},
 		{
-			id: "gpt-5.1-codex-mini",
-			name: "GPT-5.1 Codex Mini"
+			id: "gpt-5.6-terra",
+			name: "GPT-5.6-Terra",
+			contextWindow: 272e3
 		},
 		{
-			id: "gpt-5.1",
-			name: "GPT-5.1"
+			id: "gpt-5.6-luna",
+			name: "GPT-5.6-Luna",
+			contextWindow: 272e3
+		},
+		{
+			id: "gpt-5.5",
+			name: "GPT-5.5",
+			contextWindow: 272e3
 		}
 	],
 	claude: [
@@ -13058,23 +13245,26 @@ const DEFAULT_MODELS = {
 	],
 	copilot: [
 		{
-			id: "gpt-4.1",
-			name: "GPT-4.1",
-			inputModalities: ["text", "image"]
+			id: "gpt-6-sol",
+			name: "GPT-6 Sol",
+			inputModalities: ["text", "image"],
+			wire: "responses"
 		},
 		{
-			id: "gpt-4o",
-			name: "GPT-4o",
-			inputModalities: ["text", "image"]
+			id: "gpt-6-luna",
+			name: "GPT-6 Luna",
+			inputModalities: ["text", "image"],
+			wire: "responses"
 		},
 		{
-			id: "claude-sonnet-4.5",
-			name: "Claude Sonnet 4.5",
-			inputModalities: ["text", "image"]
+			id: "gpt-5.5",
+			name: "GPT-5.5",
+			inputModalities: ["text", "image"],
+			wire: "responses"
 		},
 		{
-			id: "gemini-2.5-pro",
-			name: "Gemini 2.5 Pro",
+			id: "claude-haiku-4.5",
+			name: "Claude Haiku 4.5",
 			inputModalities: ["text", "image"]
 		}
 	],

package/lib/providers/claude.js

@@ -256,6 +256,11 @@ function claudeResetsAt(value) {
     const parsed = Date.parse(value);
     return Number.isFinite(parsed) ? parsed : undefined;
 }
+/** Claude session and weekly buckets reset as whole five-hour/seven-day windows. */
+function claudeWindowTiming(kind) {
+    return kind === 'session' ? { windowDurationMs: 5 * 60 * 60_000, fixedWindow: true }
+        : kind === 'weekly' ? { windowDurationMs: 7 * 24 * 60 * 60_000, fixedWindow: true } : {};
+}
 /** Map one legacy `{utilization, resets_at}` bucket; undefined when null or unusable. */
 function claudeLegacyWindow(value, kind, scope) {
     if (typeof value !== 'object' || value === null)
@@ -267,6 +272,7 @@ function claudeLegacyWindow(value, kind, scope) {
     return {
         kind,
         ...scope === undefined ? {} : { scope },
+        ...claudeWindowTiming(kind),
         usedPercent: bucket.utilization,
         ...resetsAt === undefined ? {} : { resetsAt },
     };
@@ -290,6 +296,7 @@ function claudeLimitsWindows(value) {
         windows.push({
             kind,
             ...typeof scope === 'string' && scope.length > 0 ? { scope } : {},
+            ...claudeWindowTiming(kind),
             usedPercent: entry.percent,
             ...resetsAt === undefined ? {} : { resetsAt },
         });

package/lib/providers/codex.js

@@ -256,6 +256,11 @@ function codexUsageWindow(value, fallbackKind) {
     }
     return {
         kind: codexWindowKind(window, fallbackKind),
+        ...typeof window.limit_window_seconds === 'number' && Number.isFinite(window.limit_window_seconds)
+            && window.limit_window_seconds > 0 ? {
+            // wham reports the duration and reset of this same quota window.
+            windowDurationMs: window.limit_window_seconds * 1000, fixedWindow: true,
+        } : {},
         usedPercent: window.used_percent,
         ...resetsAt === undefined ? {} : { resetsAt },
     };

package/lib/providers/common.d.ts

@@ -193,9 +193,19 @@ export interface UsageWindow {
     usedPercent: number;
     /** Epoch milliseconds at which the window resets, when the provider discloses it. */
     resetsAt?: number;
+    /** Epoch milliseconds of the billing/window start, when disclosed. */
+    startsAt?: number;
+    /** Reported duration; not sufficient to establish fixed-window semantics. */
+    windowDurationMs?: number;
+    /** Provider-verified fixed interval; permits deriving start from end and duration. */
+    fixedWindow?: boolean;
 }
 /** Subscription usage of one provider, as served by the `usage` RPC endpoint. */
 export interface ProviderUsage {
+    /** Original successful observation time, preserved across cache reads. */
+    observedAt?: number;
+    /** Last refresh failed; cached numbers are display-only until recovery. */
+    stale?: boolean;
     /** False when the provider has no usage endpoint (grok); windows are absent then. */
     supported: boolean;
     /** Usage windows in display order. */

package/lib/providers/cursor-usage.js

@@ -86,6 +86,10 @@ export async function fetchCursorUsage(accessToken, http = fetch, signal) {
     const resetValue = summary?.billingCycleEnd;
     const parsedReset = typeof resetValue === 'string' ? Date.parse(resetValue) : NaN;
     const resetsAt = Number.isFinite(parsedReset) ? parsedReset : undefined;
+    const startValue = summary?.billingCycleStart;
+    const parsedStart = typeof startValue === 'string' ? Date.parse(startValue) : NaN;
+    const timing = { ...(resetsAt === undefined ? {} : { resetsAt }),
+        ...(Number.isFinite(parsedStart) ? { startsAt: parsedStart } : {}) };
     const windows = [];
     for (const [field, scope] of [
         ['totalPercentUsed', 'Included'],
@@ -95,11 +99,11 @@ export async function fetchCursorUsage(accessToken, http = fetch, signal) {
         const usedPercent = number(plan?.[field]);
         if (usedPercent === undefined || usedPercent < 0 || usedPercent > 100)
             continue;
-        windows.push({ kind: 'other', scope, usedPercent, ...(resetsAt === undefined ? {} : { resetsAt }) });
+        windows.push({ kind: 'other', scope, usedPercent, ...timing });
     }
     const legacy = legacyRequestWindow(legacyResult.status === 'fulfilled' ? legacyResult.value : undefined, resetsAt);
     if (legacy !== undefined)
-        windows.push(legacy);
+        windows.push({ ...legacy, ...timing });
     if (windows.length === 0 && summary?.isUnlimited !== true) {
         throw new Error('Cursor usage response has no quota windows');
     }

package/lib/providers/external-usage-controller.d.ts

@@ -1,6 +1,6 @@
 import type { ProviderUsage } from './common.js';
 /** Usage-only sources whose model routes are supplied by the DSH base install. */
-export type ExternalUsageSource = 'opencode-go' | 'kimi-code';
+export type ExternalUsageSource = 'opencode-go' | 'kimi-code' | 'minimax' | 'minimax-cn';
 export declare const EXTERNAL_USAGE_SOURCES: readonly ExternalUsageSource[];
 export interface ExternalUsageStatus {
     configured: boolean;

package/lib/providers/external-usage-controller.js

@@ -1,8 +1,11 @@
+import { fetchMiniMaxUsage } from './minimax-usage.js';
 import { fetchKimiCodeUsage, fetchOpenCodeGoUsage } from './external-usage.js';
-export const EXTERNAL_USAGE_SOURCES = ['opencode-go', 'kimi-code'];
+export const EXTERNAL_USAGE_SOURCES = ['opencode-go', 'kimi-code', 'minimax', 'minimax-cn'];
 const DEFAULT_REFS = {
     'opencode-go': 'OPENCODE_GO_API_KEY',
     'kimi-code': 'KIMI_CODING_API_KEY',
+    'minimax': 'MINIMAX_API_KEY',
+    'minimax-cn': 'MINIMAX_CN_API_KEY',
 };
 export class ExternalUsageController {
     resolveCredential;
@@ -14,17 +17,19 @@ export class ExternalUsageController {
         this.refs = { ...DEFAULT_REFS, ...refs };
     }
     async status() {
-        const [go, kimi] = await Promise.all(EXTERNAL_USAGE_SOURCES.map(async (source) => {
+        const values = await Promise.all(EXTERNAL_USAGE_SOURCES.map(async (source) => {
             const value = await this.resolveCredential(this.refs[source]);
             return typeof value?.value === 'string' && value.value.length > 0;
         }));
-        return { 'opencode-go': { configured: go ?? false }, 'kimi-code': { configured: kimi ?? false } };
+        return Object.fromEntries(EXTERNAL_USAGE_SOURCES.map((source, i) => [source, { configured: values[i] ?? false }]));
     }
     async usage(source, signal) {
         const credential = await this.resolveCredential(this.refs[source]);
         if (credential?.value === undefined || credential.value.length === 0) {
             throw new Error(`${source} API key is not configured`);
         }
+        if (source === 'minimax' || source === 'minimax-cn')
+            return fetchMiniMaxUsage(credential.value, source === 'minimax-cn' ? 'cn' : 'global', this.http, signal);
         return source === 'opencode-go'
             ? fetchOpenCodeGoUsage(credential.value, this.http, signal)
             : fetchKimiCodeUsage(credential.value, this.http, signal);

package/lib/providers/external-usage.d.ts

@@ -3,6 +3,6 @@ import type { ProviderUsage } from './common.js';
 type HttpFetch = typeof fetch;
 /** Read the three account-wide OpenCode Go windows from its Go gateway. */
 export declare function fetchOpenCodeGoUsage(apiKey: string, http?: HttpFetch, signal?: AbortSignal): Promise<ProviderUsage>;
-/** Read the Kimi Code plan windows using the same API as the Kimi Code CLI. */
+/** Read official CLI count windows and retain compatibility with older ratio pools. */
 export declare function fetchKimiCodeUsage(apiKey: string, http?: HttpFetch, signal?: AbortSignal): Promise<ProviderUsage>;
 export {};

package/lib/providers/external-usage.js

@@ -1,4 +1,21 @@
 /** Usage readers for subscriptions whose model adapters are built into DSH. */
+function numeric(value) {
+    const n = typeof value === 'string' && value.trim() !== '' ? Number(value) : value;
+    return typeof n === 'number' && Number.isFinite(n) ? n : undefined;
+}
+function kimiReset(value) {
+    for (const key of ['reset_at', 'resetAt', 'reset_time', 'resetTime']) {
+        const reset = resetTime(value[key]);
+        if (reset !== undefined)
+            return reset;
+    }
+    for (const key of ['reset_in', 'resetIn', 'ttl', 'window']) {
+        const seconds = numeric(value[key]);
+        if (seconds !== undefined && seconds > 0)
+            return Date.now() + seconds * 1000;
+    }
+    return undefined;
+}
 function record(value) {
     return value !== null && typeof value === 'object' && !Array.isArray(value)
         ? value
@@ -45,6 +62,9 @@ export async function fetchOpenCodeGoUsage(apiKey, http = fetch, signal) {
             kind,
             ...(scope === undefined ? {} : { scope }),
             usedPercent,
+            // Go's rolling counter is first-use anchored, not per-request sliding.
+            ...(field === 'rolling' ? { fixedWindow: true, windowDurationMs: 18_000_000 }
+                : field === 'weekly' ? { fixedWindow: true, windowDurationMs: 604_800_000 } : {}),
             ...(resetsAt === undefined ? {} : { resetsAt }),
         });
     }
@@ -52,14 +72,53 @@ export async function fetchOpenCodeGoUsage(apiKey, http = fetch, signal) {
         throw new Error('OpenCode Go usage response has no valid windows');
     return { supported: true, windows, plan: 'OpenCode Go' };
 }
-/** Read the Kimi Code plan windows using the same API as the Kimi Code CLI. */
+/** Read official CLI count windows and retain compatibility with older ratio pools. */
 export async function fetchKimiCodeUsage(apiKey, http = fetch, signal) {
     const body = record(await getUsage('https://api.kimi.com/coding/v1/usages', apiKey, http, signal));
     if (body === undefined)
         throw new Error('Kimi Code usage response is not an object');
+    const modern = [];
+    const rows = [
+        ...(record(body.usage) ? [{ detail: body.usage }] : []),
+        ...(Array.isArray(body.limits) ? body.limits : []),
+    ];
+    for (const raw of rows) {
+        const item = record(raw);
+        if (!item)
+            continue;
+        const detail = record(item.detail) ?? item;
+        const limit = numeric(detail.limit);
+        const used = numeric(detail.used) ?? (limit !== undefined && numeric(detail.remaining) !== undefined
+            ? limit - numeric(detail.remaining) : undefined);
+        if (limit === undefined || limit <= 0 || used === undefined)
+            continue;
+        const usedPercent = percent(used / limit * 100);
+        if (usedPercent === undefined)
+            continue;
+        const window = record(item.window) ?? item;
+        const duration = numeric(window.duration ?? item.duration ?? detail.duration);
+        const unit = String(window.timeUnit ?? item.timeUnit ?? detail.timeUnit ?? '').toUpperCase();
+        const multiplier = unit.includes('MINUTE') ? 60_000 : unit.includes('HOUR') ? 3_600_000
+            : unit.includes('DAY') ? 86_400_000 : unit.includes('SECOND') ? 1000 : undefined;
+        const durationMs = duration === undefined || duration <= 0 || multiplier === undefined
+            ? undefined : duration * multiplier;
+        const kind = durationMs === 18_000_000 ? 'session' : durationMs === 604_800_000 ? 'weekly' : 'other';
+        const resetsAt = kimiReset(detail);
+        const scope = detail.name ?? detail.title ?? item.name ?? item.title;
+        modern.push({ kind, usedPercent,
+            ...(typeof scope === 'string' ? { scope } : {}),
+            ...(resetsAt === undefined ? {} : { resetsAt }),
+            ...(durationMs === undefined ? {} : { windowDurationMs: durationMs }),
+            // Legacy weekly plans reset as whole seven-day buckets; five-hour semantics
+            // are documented as rolling, so no fixed-window assertion is made there.
+            ...(kind === 'weekly' ? { fixedWindow: true } : {}),
+        });
+    }
+    if (modern.length)
+        return { supported: true, windows: modern, plan: 'Kimi Code' };
     const usages = record(body.usages);
     if (usages === undefined)
-        throw new Error('Kimi Code usage response has no usages object');
+        throw new Error('Kimi Code usage response has no valid windows');
     const windows = [];
     for (const [field, kind, scope] of [
         ['limit_5h', 'session', undefined],
@@ -75,6 +134,7 @@ export async function fetchKimiCodeUsage(apiKey, http = fetch, signal) {
             kind,
             ...(scope === undefined ? {} : { scope }),
             usedPercent: ratio * 100,
+            ...(field === 'limit_7d' ? { fixedWindow: true, windowDurationMs: 604_800_000 } : {}),
             ...(resetsAt === undefined ? {} : { resetsAt }),
         });
     }

package/lib/providers/grok.js

@@ -272,7 +272,9 @@ export async function fetchGrokUsage(session, fetchFn = hostFetch, signal) {
         const usedPercent = typeof config.creditUsagePercent === 'number' && Number.isFinite(config.creditUsagePercent)
             ? config.creditUsagePercent
             : 0;
-        windows.push({ kind, usedPercent, ...resetsAt === undefined ? {} : { resetsAt } });
+        const startsAt = grokResetsAt(config.currentPeriod?.start);
+        windows.push({ kind, usedPercent, ...resetsAt === undefined ? {} : { resetsAt },
+            ...startsAt === undefined ? {} : { startsAt } });
     }
     else if (typeof config.monthlyLimit?.val === 'number' && config.monthlyLimit.val > 0) {
         const used = typeof config.used?.val === 'number' ? config.used.val : 0;