@prestyj/core 5.8.0 → 5.9.0

package/dist/index.d.cts

@@ -1,4 +1,4 @@
-export { ContextWindowOptions, DEFAULT_MAX_VIDEO_BYTES, MODELS, ModelInfo, getAuthStorageKey, getAuthStorageKeys, getContextWindow, getDefaultModel, getFastModel, getMaxThinkingLevel, getModel, getModelsForProvider, getSummaryModel, getToolResultCharLimit, getVideoByteLimit, usesOpenAICodexTransport } from './model-registry.cjs';
+export { ContextWindowOptions, DEFAULT_MAX_VIDEO_BYTES, MODELS, ModelInfo, getAuthStorageKey, getAuthStorageKeys, getContextWindow, getDefaultModel, getDefaultThinkingLevel, getFastModel, getMaxThinkingLevel, getModel, getModelsForProvider, getSummaryModel, getToolResultCharLimit, getVideoByteLimit, usesOpenAICodexTransport } from './model-registry.cjs';
 import { Provider, ThinkingLevel } from '@prestyj/ai';
 export { AppPaths, getAppPaths } from './paths.cjs';
 
@@ -85,6 +85,14 @@ declare const MOONSHOT_OAUTH_KEY = "moonshot-oauth";
  * order, is decided per-model via `getAuthStorageKeys()` in model-registry.ts.
  */
 declare const XIAOMI_CREDITS_KEY = "xiaomi-credits";
+/**
+ * Synchronous baseUrl read straight from the auth file, for boot paths that
+ * need the active endpoint before an AuthStorage instance exists (e.g. the
+ * CLI's sync main()). Missing/corrupt files yield undefined — callers treat
+ * that as the provider's public endpoint. Read-only: safe without the file
+ * lock (a torn mid-write read just falls back to undefined).
+ */
+declare function readStoredBaseUrlSync(authFile: string, provider: string): string | undefined;
 declare class AuthStorage {
     private data;
     private filePath;
@@ -118,16 +126,31 @@ declare class AuthStorage {
      * credential is absent (a present OAuth credential is refreshable).
      */
     isStaticApiKey(provider: string): Promise<boolean>;
+    /**
+     * The base URL on the credential that is active right now, if any.
+     * Synchronous — call only after load()/resolveCredentials() populated the
+     * snapshot. For `moonshot` this is the Kimi For Coding URL whenever the
+     * OAuth entry is the one resolveCredentials would serve (i.e. not currently
+     * usage-exhausted with an API key configured).
+     */
+    getStoredBaseUrl(provider: string): string | undefined;
     load(): Promise<void>;
     private ensureLoaded;
     /**
      * Force a re-read from disk, discarding the in-memory cache. Needed when
      * another process mutates the auth file out-of-band — e.g. the desktop app
-     * writes API keys natively (Rust → ~/.ezcoder/auth.json) without going through
-     * this instance, so a long-lived daemon's cache would otherwise stay stale and
-     * never see a newly added provider key.
+     * writes API keys natively without going through this instance.
      */
     reload(): Promise<void>;
+    /**
+     * Apply one provider-scoped mutation to the latest on-disk snapshot.
+     * AuthStorage instances live in every app session/process, so writing this
+     * instance's cached snapshot can erase credentials another instance just
+     * added. The file lock only serializes writers; the re-read prevents stale
+     * full-file overwrites.
+     */
+    private mutateLatest;
+    private reloadLatest;
     getCredentials(provider: string): Promise<OAuthCredentials | undefined>;
     setCredentials(provider: string, creds: OAuthCredentials): Promise<void>;
     clearCredentials(provider: string): Promise<void>;
@@ -159,14 +182,13 @@ declare class AuthStorage {
      * Throws if not logged in.
      */
     resolveToken(provider: string): Promise<string>;
-    private save;
 }
 declare class NotLoggedInError extends Error {
     provider: string;
     constructor(provider: string);
 }
 
-type SubscriptionUsageProvider = "anthropic" | "openai";
+type SubscriptionUsageProvider = "anthropic" | "openai" | "moonshot";
 interface SubscriptionUsageWindow {
     kind: "current" | "weekly";
     label: string;
@@ -182,7 +204,8 @@ interface SubscriptionUsageSnapshot {
 }
 declare class SubscriptionUsageError extends Error {
     readonly status?: number | undefined;
-    constructor(message: string, status?: number | undefined);
+    readonly retryAfterMs?: number | undefined;
+    constructor(message: string, status?: number | undefined, retryAfterMs?: number | undefined);
 }
 type FetchFn = (input: string | URL | Request, init?: RequestInit) => Promise<Response>;
 interface FetchSubscriptionUsageOptions {
@@ -430,4 +453,4 @@ interface AutoUpdater {
 }
 declare function createAutoUpdater(config: AutoUpdateConfig): AutoUpdater;
 
-export { AuthStorage, type AutoUpdateConfig, type AutoUpdater, type InlineButton, type LogLevel, MOONSHOT_OAUTH_KEY, NotLoggedInError, type OAuthCredentials, type OAuthLoginCallbacks, type ProgressCallback, SubscriptionUsageError, type SubscriptionUsageProvider, type SubscriptionUsageSnapshot, type SubscriptionUsageWindow, TelegramBot, type TelegramConfig, type TelegramMessage, type TelegramUpdate, type TelegramVoiceMessage, XIAOMI_CREDITS_KEY, closeLogger, createAutoUpdater, decodeOggOpus, downmixToMono, fetchSubscriptionUsage, generatePKCE, getClaudeCliUserAgent, getClaudeCodeVersion, getNextThinkingLevel, getSessionId, getSupportedThinkingLevels, isKimiCodingEndpoint, isLoggerOpen, isModelLoaded, isThinkingLevelSupported, kimiCodeBaseUrl, kimiCodingHeaders, log, loginAnthropic, loginGemini, loginKimi, loginOpenAI, openLog, refreshAnthropicToken, refreshGeminiToken, refreshKimiToken, refreshOpenAIToken, registerLogCleanup, resample, setProgressCallback, transcribeVoice, withFileLock };
+export { AuthStorage, type AutoUpdateConfig, type AutoUpdater, type InlineButton, type LogLevel, MOONSHOT_OAUTH_KEY, NotLoggedInError, type OAuthCredentials, type OAuthLoginCallbacks, type ProgressCallback, SubscriptionUsageError, type SubscriptionUsageProvider, type SubscriptionUsageSnapshot, type SubscriptionUsageWindow, TelegramBot, type TelegramConfig, type TelegramMessage, type TelegramUpdate, type TelegramVoiceMessage, XIAOMI_CREDITS_KEY, closeLogger, createAutoUpdater, decodeOggOpus, downmixToMono, fetchSubscriptionUsage, generatePKCE, getClaudeCliUserAgent, getClaudeCodeVersion, getNextThinkingLevel, getSessionId, getSupportedThinkingLevels, isKimiCodingEndpoint, isLoggerOpen, isModelLoaded, isThinkingLevelSupported, kimiCodeBaseUrl, kimiCodingHeaders, log, loginAnthropic, loginGemini, loginKimi, loginOpenAI, openLog, readStoredBaseUrlSync, refreshAnthropicToken, refreshGeminiToken, refreshKimiToken, refreshOpenAIToken, registerLogCleanup, resample, setProgressCallback, transcribeVoice, withFileLock };

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-export { ContextWindowOptions, DEFAULT_MAX_VIDEO_BYTES, MODELS, ModelInfo, getAuthStorageKey, getAuthStorageKeys, getContextWindow, getDefaultModel, getFastModel, getMaxThinkingLevel, getModel, getModelsForProvider, getSummaryModel, getToolResultCharLimit, getVideoByteLimit, usesOpenAICodexTransport } from './model-registry.js';
+export { ContextWindowOptions, DEFAULT_MAX_VIDEO_BYTES, MODELS, ModelInfo, getAuthStorageKey, getAuthStorageKeys, getContextWindow, getDefaultModel, getDefaultThinkingLevel, getFastModel, getMaxThinkingLevel, getModel, getModelsForProvider, getSummaryModel, getToolResultCharLimit, getVideoByteLimit, usesOpenAICodexTransport } from './model-registry.js';
 import { Provider, ThinkingLevel } from '@prestyj/ai';
 export { AppPaths, getAppPaths } from './paths.js';
 
@@ -85,6 +85,14 @@ declare const MOONSHOT_OAUTH_KEY = "moonshot-oauth";
  * order, is decided per-model via `getAuthStorageKeys()` in model-registry.ts.
  */
 declare const XIAOMI_CREDITS_KEY = "xiaomi-credits";
+/**
+ * Synchronous baseUrl read straight from the auth file, for boot paths that
+ * need the active endpoint before an AuthStorage instance exists (e.g. the
+ * CLI's sync main()). Missing/corrupt files yield undefined — callers treat
+ * that as the provider's public endpoint. Read-only: safe without the file
+ * lock (a torn mid-write read just falls back to undefined).
+ */
+declare function readStoredBaseUrlSync(authFile: string, provider: string): string | undefined;
 declare class AuthStorage {
     private data;
     private filePath;
@@ -118,16 +126,31 @@ declare class AuthStorage {
      * credential is absent (a present OAuth credential is refreshable).
      */
     isStaticApiKey(provider: string): Promise<boolean>;
+    /**
+     * The base URL on the credential that is active right now, if any.
+     * Synchronous — call only after load()/resolveCredentials() populated the
+     * snapshot. For `moonshot` this is the Kimi For Coding URL whenever the
+     * OAuth entry is the one resolveCredentials would serve (i.e. not currently
+     * usage-exhausted with an API key configured).
+     */
+    getStoredBaseUrl(provider: string): string | undefined;
     load(): Promise<void>;
     private ensureLoaded;
     /**
      * Force a re-read from disk, discarding the in-memory cache. Needed when
      * another process mutates the auth file out-of-band — e.g. the desktop app
-     * writes API keys natively (Rust → ~/.ezcoder/auth.json) without going through
-     * this instance, so a long-lived daemon's cache would otherwise stay stale and
-     * never see a newly added provider key.
+     * writes API keys natively without going through this instance.
      */
     reload(): Promise<void>;
+    /**
+     * Apply one provider-scoped mutation to the latest on-disk snapshot.
+     * AuthStorage instances live in every app session/process, so writing this
+     * instance's cached snapshot can erase credentials another instance just
+     * added. The file lock only serializes writers; the re-read prevents stale
+     * full-file overwrites.
+     */
+    private mutateLatest;
+    private reloadLatest;
     getCredentials(provider: string): Promise<OAuthCredentials | undefined>;
     setCredentials(provider: string, creds: OAuthCredentials): Promise<void>;
     clearCredentials(provider: string): Promise<void>;
@@ -159,14 +182,13 @@ declare class AuthStorage {
      * Throws if not logged in.
      */
     resolveToken(provider: string): Promise<string>;
-    private save;
 }
 declare class NotLoggedInError extends Error {
     provider: string;
     constructor(provider: string);
 }
 
-type SubscriptionUsageProvider = "anthropic" | "openai";
+type SubscriptionUsageProvider = "anthropic" | "openai" | "moonshot";
 interface SubscriptionUsageWindow {
     kind: "current" | "weekly";
     label: string;
@@ -182,7 +204,8 @@ interface SubscriptionUsageSnapshot {
 }
 declare class SubscriptionUsageError extends Error {
     readonly status?: number | undefined;
-    constructor(message: string, status?: number | undefined);
+    readonly retryAfterMs?: number | undefined;
+    constructor(message: string, status?: number | undefined, retryAfterMs?: number | undefined);
 }
 type FetchFn = (input: string | URL | Request, init?: RequestInit) => Promise<Response>;
 interface FetchSubscriptionUsageOptions {
@@ -430,4 +453,4 @@ interface AutoUpdater {
 }
 declare function createAutoUpdater(config: AutoUpdateConfig): AutoUpdater;
 
-export { AuthStorage, type AutoUpdateConfig, type AutoUpdater, type InlineButton, type LogLevel, MOONSHOT_OAUTH_KEY, NotLoggedInError, type OAuthCredentials, type OAuthLoginCallbacks, type ProgressCallback, SubscriptionUsageError, type SubscriptionUsageProvider, type SubscriptionUsageSnapshot, type SubscriptionUsageWindow, TelegramBot, type TelegramConfig, type TelegramMessage, type TelegramUpdate, type TelegramVoiceMessage, XIAOMI_CREDITS_KEY, closeLogger, createAutoUpdater, decodeOggOpus, downmixToMono, fetchSubscriptionUsage, generatePKCE, getClaudeCliUserAgent, getClaudeCodeVersion, getNextThinkingLevel, getSessionId, getSupportedThinkingLevels, isKimiCodingEndpoint, isLoggerOpen, isModelLoaded, isThinkingLevelSupported, kimiCodeBaseUrl, kimiCodingHeaders, log, loginAnthropic, loginGemini, loginKimi, loginOpenAI, openLog, refreshAnthropicToken, refreshGeminiToken, refreshKimiToken, refreshOpenAIToken, registerLogCleanup, resample, setProgressCallback, transcribeVoice, withFileLock };
+export { AuthStorage, type AutoUpdateConfig, type AutoUpdater, type InlineButton, type LogLevel, MOONSHOT_OAUTH_KEY, NotLoggedInError, type OAuthCredentials, type OAuthLoginCallbacks, type ProgressCallback, SubscriptionUsageError, type SubscriptionUsageProvider, type SubscriptionUsageSnapshot, type SubscriptionUsageWindow, TelegramBot, type TelegramConfig, type TelegramMessage, type TelegramUpdate, type TelegramVoiceMessage, XIAOMI_CREDITS_KEY, closeLogger, createAutoUpdater, decodeOggOpus, downmixToMono, fetchSubscriptionUsage, generatePKCE, getClaudeCliUserAgent, getClaudeCodeVersion, getNextThinkingLevel, getSessionId, getSupportedThinkingLevels, isKimiCodingEndpoint, isLoggerOpen, isModelLoaded, isThinkingLevelSupported, kimiCodeBaseUrl, kimiCodingHeaders, log, loginAnthropic, loginGemini, loginKimi, loginOpenAI, openLog, readStoredBaseUrlSync, refreshAnthropicToken, refreshGeminiToken, refreshKimiToken, refreshOpenAIToken, registerLogCleanup, resample, setProgressCallback, transcribeVoice, withFileLock };

package/dist/index.js

@@ -13,6 +13,7 @@ import {
   getClaudeCodeVersion,
   getContextWindow,
   getDefaultModel,
+  getDefaultThinkingLevel,
   getFastModel,
   getMaxThinkingLevel,
   getModel,
@@ -31,6 +32,7 @@ import {
   loginKimi,
   loginOpenAI,
   openLog,
+  readStoredBaseUrlSync,
   refreshAnthropicToken,
   refreshGeminiToken,
   refreshKimiToken,
@@ -38,7 +40,7 @@ import {
   registerLogCleanup,
   usesOpenAICodexTransport,
   withFileLock
-} from "./chunk-GMAX7TES.js";
+} from "./chunk-JXPW4JKV.js";
 import {
   getAppPaths
 } from "./chunk-WCIV25KV.js";
@@ -68,6 +70,7 @@ var ANTHROPIC_ADAPTIVE_THINKING_LEVELS = [
   "high",
   "max"
 ];
+var MOONSHOT_K3_THINKING_LEVELS = ["low", "high", "max"];
 function isOpenAIGptModel(provider, model) {
   return provider === "openai" && model.startsWith("gpt-");
 }
@@ -77,6 +80,9 @@ function isSakanaModel(provider) {
 function isXaiModel(provider) {
   return provider === "xai";
 }
+function isMoonshotK3Model(provider, model) {
+  return provider === "moonshot" && model === "kimi-k3";
+}
 function isAnthropicOpus48Or47Model(provider, model) {
   return provider === "anthropic" && /opus-4-8|opus-4-7/.test(model);
 }
@@ -101,6 +107,7 @@ function getSupportedThinkingLevels(provider, model) {
     if (maxIndex2 === -1) return XAI_THINKING_LEVELS;
     return XAI_THINKING_LEVELS.slice(0, maxIndex2 + 1);
   }
+  if (isMoonshotK3Model(provider, model)) return MOONSHOT_K3_THINKING_LEVELS;
   if (!isOpenAIGptModel(provider, model)) return [maxLevel];
   const levels = model.startsWith("gpt-5.6-") ? OPENAI_GPT_56_THINKING_LEVELS : OPENAI_GPT_THINKING_LEVELS;
   const maxIndex = levels.indexOf(maxLevel);
@@ -112,7 +119,7 @@ function isThinkingLevelSupported(provider, model, level) {
 }
 function getNextThinkingLevel(provider, model, current) {
   const supportedLevels = getSupportedThinkingLevels(provider, model);
-  const shouldCycleLevels = isOpenAIGptModel(provider, model) || isAnthropicAdaptiveModel(provider, model) || isSakanaModel(provider) || isXaiModel(provider);
+  const shouldCycleLevels = isOpenAIGptModel(provider, model) || isAnthropicAdaptiveModel(provider, model) || isSakanaModel(provider) || isXaiModel(provider) || isMoonshotK3Model(provider, model);
   if (!shouldCycleLevels) {
     return current ? void 0 : supportedLevels[0];
   }
@@ -124,9 +131,10 @@ function getNextThinkingLevel(provider, model, current) {
 
 // src/provider-usage.ts
 var SubscriptionUsageError = class extends Error {
-  constructor(message, status) {
+  constructor(message, status, retryAfterMs2) {
     super(message);
     this.status = status;
+    this.retryAfterMs = retryAfterMs2;
     this.name = "SubscriptionUsageError";
   }
 };
@@ -176,12 +184,20 @@ function normalizedCodexWindow(window, fallbackKind, now) {
     resetsAt: codexResetAt(window, now)
   };
 }
-async function readUsageResponse(response) {
+function retryAfterMs(response, now) {
+  const value = response.headers.get("retry-after")?.trim();
+  if (!value) return void 0;
+  if (/^\d+(?:\.\d+)?$/.test(value)) return Math.ceil(Number(value) * 1e3);
+  const retryAt = Date.parse(value);
+  return Number.isFinite(retryAt) ? Math.max(0, retryAt - now) : void 0;
+}
+async function readUsageResponse(response, now) {
   const text = await response.text();
   if (!response.ok) {
     throw new SubscriptionUsageError(
       `Subscription usage request failed with HTTP ${response.status}`,
-      response.status
+      response.status,
+      retryAfterMs(response, now)
     );
   }
   try {
@@ -202,7 +218,7 @@ async function fetchAnthropicUsage(credentials, fetchFn, signal, now) {
       "User-Agent": "ezcoder"
     }
   });
-  const data = await readUsageResponse(response);
+  const data = await readUsageResponse(response, now());
   const windows = [];
   const currentPercent = clampPercent(data.five_hour?.utilization);
   if (currentPercent !== void 0) {
@@ -238,7 +254,7 @@ async function fetchCodexUsage(credentials, fetchFn, signal, now) {
   };
   if (credentials.accountId) headers["ChatGPT-Account-Id"] = credentials.accountId;
   const response = await fetchFn(CODEX_USAGE_URL, { method: "GET", signal, headers });
-  const data = await readUsageResponse(response);
+  const data = await readUsageResponse(response, now());
   const windows = [
     normalizedCodexWindow(data.rate_limit?.primary_window, "current", now()),
     normalizedCodexWindow(data.rate_limit?.secondary_window, "weekly", now())
@@ -254,12 +270,97 @@ async function fetchCodexUsage(credentials, fetchFn, signal, now) {
     fetchedAt: now()
   };
 }
+function kimiNumber(value) {
+  if (typeof value === "string" && value.trim()) {
+    const parsed = Number(value);
+    return Number.isFinite(parsed) ? parsed : void 0;
+  }
+  return finiteNumber(value);
+}
+function kimiUsagePercent(detail) {
+  const used = kimiNumber(detail?.used);
+  const limit = kimiNumber(detail?.limit);
+  if (used === void 0 || limit === void 0 || limit <= 0) return void 0;
+  return Math.min(100, Math.max(0, used / limit * 100));
+}
+function kimiWindowMinutes(window) {
+  const duration = kimiNumber(window?.duration);
+  if (duration === void 0 || duration <= 0) return void 0;
+  switch (window?.timeUnit) {
+    case "TIME_UNIT_SECOND":
+      return duration / 60;
+    case "TIME_UNIT_MINUTE":
+      return duration;
+    case "TIME_UNIT_HOUR":
+      return duration * 60;
+    case "TIME_UNIT_DAY":
+      return duration * 24 * 60;
+    default:
+      return void 0;
+  }
+}
+async function fetchKimiUsage(credentials, fetchFn, signal, now) {
+  const response = await fetchFn(`${kimiCodeBaseUrl()}/usages`, {
+    method: "GET",
+    signal,
+    headers: {
+      Authorization: "Bearer " + credentials.accessToken,
+      Accept: "application/json",
+      // The managed coding endpoint gates on the kimi-code-cli client identity,
+      // same as model requests.
+      ...kimiCodingHeaders()
+    }
+  });
+  const data = await readUsageResponse(response, now());
+  const windows = [];
+  const weeklyPercent = kimiUsagePercent(data.usage);
+  if (weeklyPercent !== void 0) {
+    windows.push({
+      kind: "weekly",
+      label: "Weekly",
+      usedPercent: weeklyPercent,
+      resetsAt: isoTimestamp(data.usage?.resetTime)
+    });
+  }
+  for (const limit of data.limits ?? []) {
+    const minutes = kimiWindowMinutes(limit?.window);
+    const percent = kimiUsagePercent(limit?.detail);
+    if (minutes === void 0 || percent === void 0) continue;
+    if (minutes >= 6 * 24 * 60) {
+      if (!windows.some((window) => window.kind === "weekly")) {
+        windows.push({
+          kind: "weekly",
+          label: "Weekly",
+          usedPercent: percent,
+          resetsAt: isoTimestamp(limit?.detail?.resetTime)
+        });
+      }
+      continue;
+    }
+    windows.push({
+      kind: "current",
+      label: `${Math.max(1, Math.round(minutes / 60))}-hour`,
+      usedPercent: percent,
+      resetsAt: isoTimestamp(limit?.detail?.resetTime)
+    });
+  }
+  windows.sort((left, right) => {
+    if (left.kind === right.kind) return 0;
+    return left.kind === "current" ? -1 : 1;
+  });
+  return {
+    provider: "moonshot",
+    displayName: "Kimi",
+    windows,
+    fetchedAt: now()
+  };
+}
 async function fetchSubscriptionUsage(provider, credentials, options = {}) {
   const fetchFn = options.fetchFn ?? fetch;
   const now = options.now ?? Date.now;
   const signal = AbortSignal.timeout(options.timeoutMs ?? 8e3);
   try {
-    return provider === "anthropic" ? await fetchAnthropicUsage(credentials, fetchFn, signal, now) : await fetchCodexUsage(credentials, fetchFn, signal, now);
+    return provider === "anthropic" ? await fetchAnthropicUsage(credentials, fetchFn, signal, now) : provider === "openai" ? await fetchCodexUsage(credentials, fetchFn, signal, now) : await fetchKimiUsage(credentials, fetchFn, signal, now);
   } catch (error) {
     if (error instanceof SubscriptionUsageError) throw error;
     const message = error instanceof Error ? error.message : String(error);
@@ -764,6 +865,7 @@ export {
   getClaudeCodeVersion,
   getContextWindow,
   getDefaultModel,
+  getDefaultThinkingLevel,
   getFastModel,
   getMaxThinkingLevel,
   getModel,
@@ -786,6 +888,7 @@ export {
   loginKimi,
   loginOpenAI,
   openLog,
+  readStoredBaseUrlSync,
   refreshAnthropicToken,
   refreshGeminiToken,
   refreshKimiToken,