@eddyskywalker/dsh-chatgpt-subscription 0.12.3 → 0.12.4

package/lib/index.js

@@ -21610,8 +21610,10 @@ function assertStreamComplete$3(state) {
 * - `INVALID_CREDENTIAL` — a rejected access token fails identically on every
 *   attempt;
 * - `PROVIDER_ERROR` — a 400, a 401 that is really a plan-entitlement refusal,
-*   or a 403 quota limit. Retrying a quota that resets in hours only burns
-*   requests and delays the message the user needs to see;
+*   or a 403 quota limit. Retrying a quota that resets in hours against the
+*   SAME account only burns requests and delays the message the user needs to
+*   see, so none of it is retried; a 403 limit still rotates to another account
+*   when the pool holds one, which is a routing decision rather than a retry;
 * - `ABORTED` — the caller already cancelled.
 *
 * The DSH normal defaults would apply anyway; stating the values here pins them
@@ -21695,17 +21697,20 @@ function classifyKimiFailure(status, bodyText) {
 	if (isHttpContextOverflow(status, bodyText)) return {
 		code: CONTEXT_OVERFLOW_CODE,
 		retryable: false,
+		accountScoped: false,
 		message: `${PROVIDER_NAME$3} context window exceeded: ${detail}`
 	};
 	if (status === 402) return {
 		code: "SERVER",
 		retryable: true,
+		accountScoped: false,
 		message: `${PROVIDER_NAME$3} could not verify the subscription tier (402). Retrying; if it persists, confirm the membership is active.${detail ? ` ${detail}` : ""}`
 	};
 	if (status === 401 || status === 403) {
 		if (matchesAny$1(detail, ENTITLEMENT_PATTERNS)) return {
 			code: "PROVIDER_ERROR",
 			retryable: false,
+			accountScoped: false,
 			message: `${PROVIDER_NAME$3} refused this request for the current plan: ${detail || "the requested model or context is not included"}. Switch to a model the plan includes, lower the context-window override, or upgrade the subscription.`
 		};
 		if (status === 403) {
@@ -21713,12 +21718,14 @@ function classifyKimiFailure(status, bodyText) {
 			return {
 				code: "PROVIDER_ERROR",
 				retryable: false,
+				accountScoped: true,
 				message: `${PROVIDER_NAME$3} blocked the request on an account limit (403): ${detail || (limitReached ? "the account limit was reached" : "the account refused the request")}. The quota refreshes on its own schedule — check the Kimi Code card in Settings for the reset time.`
 			};
 		}
 		return {
 			code: "INVALID_CREDENTIAL",
 			retryable: false,
+			accountScoped: false,
 			message: `${PROVIDER_NAME$3} rejected the stored credential (401). Sign in again from Settings > Kimi Code.${detail ? ` ${detail}` : ""}`
 		};
 	}
@@ -21726,32 +21733,81 @@ function classifyKimiFailure(status, bodyText) {
 		if (matchesAny$1(detail, QUOTA_EXHAUSTED_PATTERNS$1)) return {
 			code: "PROVIDER_ERROR",
 			retryable: false,
+			accountScoped: true,
 			message: `${PROVIDER_NAME$3} reports the account quota is exhausted: ${detail || "no remaining quota"}. Top up or wait for the window to reset.`
 		};
 		return {
 			code: "RATE_LIMIT",
 			retryable: true,
+			accountScoped: false,
 			message: `${PROVIDER_NAME$3} is rate limited or overloaded (429): ${detail || "too many requests"}. Retrying with backoff.`
 		};
 	}
 	if (status >= 500) return {
 		code: "SERVER",
 		retryable: true,
+		accountScoped: false,
 		message: `${PROVIDER_NAME$3} upstream server error (${status}): ${detail || "the model provider is temporarily unavailable"}. Retrying with backoff.`
 	};
 	if (status === 400) return {
 		code: "PROVIDER_ERROR",
 		retryable: false,
+		accountScoped: false,
 		message: `${PROVIDER_NAME$3} rejected the request (400): ${detail || "the request was not accepted"}`
 	};
 	return {
 		code: "PROVIDER_ERROR",
 		retryable: false,
+		accountScoped: false,
 		message: `${PROVIDER_NAME$3} API error (${status}): ${detail || "No response"}`
 	};
 }
+/** Numeric reset the service may ship as a field rather than in prose. */
+const RESET_FIELD_PATTERN = /"?reset[A-Za-z_]*"?\s*[:=]\s*"?(\d{9,16})"?/i;
+/** ISO instant quoted in prose, trusted only when it names its own zone. */
+const RESET_INSTANT_PATTERN = /\d{4}-\d{2}-\d{2}[T ]\d{2}:\d{2}(?::\d{2})?(?:\.\d+)?(?:Z|[+-]\d{2}:?\d{2})/;
+/** The window a billing-cycle refusal names; nothing shorter describes it. */
+const BILLING_CYCLE_PATTERN = /usage limit for this billing cycle/i;
+/**
+* How long one account stays out of rotation after it reports a spent limit.
+*
+* The reset instant is read from the body whenever the service states one — as a
+* numeric field, or as an instant carrying its own zone — and the length of the
+* window the service names is used otherwise. The zone is required for that
+* instant because an unqualified one is ambiguous, and a cooldown computed from
+* the wrong zone is either hours too long or already over; where the body is
+* ambiguous the window length is the honest answer.
+*
+* Both ends of the range are load-bearing. A reset instant barely in the future
+* would otherwise read as no cooldown at all and put the account straight back
+* into rotation to be refused again; and a reset instant already in the past
+* (a stale cache, a clock skew) falls back to the window length above rather
+* than to no cooldown at all.
+*/
+function accountLimitCooldownMs(bodyText, now = Date.now()) {
+	const field = bodyText.match(RESET_FIELD_PATTERN);
+	const instant = bodyText.match(RESET_INSTANT_PATTERN);
+	const resetsAt = field !== null ? parseTimestamp(Number(field[1])) : instant !== null ? Date.parse(instant[0].replace(" ", "T")) : null;
+	if (resetsAt !== null && Number.isFinite(resetsAt) && resetsAt > now) return Math.min(Math.max(resetsAt - now, POOL_COOLDOWN_MS$2), MAX_ACCOUNT_LIMIT_COOLDOWN_MS);
+	return BILLING_CYCLE_PATTERN.test(bodyText) ? BILLING_CYCLE_COOLDOWN_MS : ACCOUNT_LIMIT_COOLDOWN_MS;
+}
 /** Cooldown one rate-limited account takes when the provider states no delay. */
 const POOL_COOLDOWN_MS$2 = 15 * 6e4;
+/**
+* Fallback cooldown for an account whose usage window is spent.
+*
+* The service states the reset time only sometimes, so the fallback is the
+* window's own length. The 15 minutes a 429 gets would put the account back
+* into rotation four times inside the very window that just refused it.
+*/
+const ACCOUNT_LIMIT_COOLDOWN_MS = 300 * 6e4;
+/**
+* A billing cycle is not a window: a 5-hour cooldown would spend a request every
+* five hours to learn an answer that changes at most once a month.
+*/
+const BILLING_CYCLE_COOLDOWN_MS = 720 * 60 * 6e4;
+/** Ceiling, so a malformed reset time cannot park an account for years. */
+const MAX_ACCOUNT_LIMIT_COOLDOWN_MS = BILLING_CYCLE_COOLDOWN_MS;
 var KimiCodeAdapter = class extends LlmAdapter {
 	store;
 	modelSettings;
@@ -21936,11 +21992,15 @@ var KimiCodeAdapter = class extends LlmAdapter {
 			if (pool !== null && accountId !== void 0) {
 				const planScoped = response.status === 429 && matchesAny$1(detail, ENTITLEMENT_PATTERNS);
 				if (response.status === 429 && !planScoped) {
-					await pool.markCooldown(accountId, after ?? POOL_COOLDOWN_MS$2, `${PROVIDER_NAME$3} 429`).catch(() => void 0);
+					const cooldownMs = failure.accountScoped ? accountLimitCooldownMs(detail) : after ?? POOL_COOLDOWN_MS$2;
+					await pool.markCooldown(accountId, cooldownMs, `${PROVIDER_NAME$3} 429`).catch(() => void 0);
 					if (await pool.hasAnotherAvailableAccount(tried)) continue;
 				} else if (failure.code === "INVALID_CREDENTIAL") {
 					await pool.markAuthFailed(accountId, failure.message).catch(() => void 0);
 					if (await pool.hasAnotherAvailableAccount(tried)) continue;
+				} else if (failure.accountScoped) {
+					await pool.markCooldown(accountId, accountLimitCooldownMs(detail), `${PROVIDER_NAME$3} 403`).catch(() => void 0);
+					if (await pool.hasAnotherAvailableAccount(tried)) continue;
 				}
 			}
 			throw new LlmError(failure.message, failure.code, {

package/lib/types/host/kimi-code/adapter.d.ts

@@ -28,8 +28,10 @@ import { KimiCodeAccountPool } from './account-pool.ts';
  * - `INVALID_CREDENTIAL` — a rejected access token fails identically on every
  *   attempt;
  * - `PROVIDER_ERROR` — a 400, a 401 that is really a plan-entitlement refusal,
- *   or a 403 quota limit. Retrying a quota that resets in hours only burns
- *   requests and delays the message the user needs to see;
+ *   or a 403 quota limit. Retrying a quota that resets in hours against the
+ *   SAME account only burns requests and delays the message the user needs to
+ *   see, so none of it is retried; a 403 limit still rotates to another account
+ *   when the pool holds one, which is a routing decision rather than a retry;
  * - `ABORTED` — the caller already cancelled.
  *
  * The DSH normal defaults would apply anyway; stating the values here pins them
@@ -63,6 +65,22 @@ export interface KimiFailureClassification {
     message: string;
     /** True only when the failure is worth retrying. */
     retryable: boolean;
+    /**
+     * True when the refusal belongs to THIS account alone, so another pooled
+     * account may still serve the same request.
+     *
+     * A spent usage window is the case that matters, and this service reports it
+     * as a 403 — neither a bad credential nor retryable back-pressure, so nothing
+     * in the code or the message says "rotate". Asking the same account again
+     * cannot help; taking it out of rotation until its window resets lets the next
+     * account answer, and each account in the pool carries its own quota.
+     *
+     * False for every verdict that belongs to the request or to the plan: an
+     * entitlement refusal, a malformed body, ordinary overload. Rotating on one of
+     * those would spend every account in the pool to learn the same answer from
+     * each of them.
+     */
+    accountScoped: boolean;
 }
 /** Short, single-line excerpt of one error body, safe to show a user. */
 export declare function summarizeFailureBody(raw: string): string;
@@ -73,6 +91,23 @@ export declare function summarizeFailureBody(raw: string): string;
  * @param bodyText - raw response body, used to separate overloaded statuses.
  */
 export declare function classifyKimiFailure(status: number, bodyText: string): KimiFailureClassification;
+/**
+ * How long one account stays out of rotation after it reports a spent limit.
+ *
+ * The reset instant is read from the body whenever the service states one — as a
+ * numeric field, or as an instant carrying its own zone — and the length of the
+ * window the service names is used otherwise. The zone is required for that
+ * instant because an unqualified one is ambiguous, and a cooldown computed from
+ * the wrong zone is either hours too long or already over; where the body is
+ * ambiguous the window length is the honest answer.
+ *
+ * Both ends of the range are load-bearing. A reset instant barely in the future
+ * would otherwise read as no cooldown at all and put the account straight back
+ * into rotation to be refused again; and a reset instant already in the past
+ * (a stale cache, a clock skew) falls back to the window length above rather
+ * than to no cooldown at all.
+ */
+export declare function accountLimitCooldownMs(bodyText: string, now?: number): number;
 export interface KimiCodeAdapterOptions {
     fetchFn?: typeof fetch;
     attachments?: AttachmentImageReader;

package/lib/types/host/kimi-code/adapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../../../../src/host/kimi-code/adapter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../../../../src/host/kimi-code/adapter.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eddyskywalker/dsh-chatgpt-subscription",
-  "version": "0.12.3",
+  "version": "0.12.4",
   "description": "DSH provider plugin for Codex access through a ChatGPT subscription.",
   "author": {
     "name": "eddyskywalker",