@kenkaiiii/gg-core 5.94.0 → 5.95.0

package/dist/index.js

@@ -1,21 +1,30 @@
 import {
   AuthStorage,
+  CHATGPT_PLAN_BASE_URL,
+  CHATGPT_PLAN_NOT_ENABLED_MESSAGE,
+  CHATGPT_PLAN_SCOPE,
+  CHATGPT_USAGE_URL,
   CLAUDE_CODE_AUTH_KEY,
   CLAUDE_CODE_AUTH_MARKER,
   CLAUDE_CODE_MANIFEST,
+  ChatGPTPlanNotEnabledError,
   DEFAULT_MAX_VIDEO_BYTES,
   GEMINI_API_KEY,
   GEMINI_API_KEY_BASE_URL,
   HIDDEN_PROVIDERS,
+  KIMI_CODE_DEFAULT_BASE_URL,
+  KIMI_CODE_KEY,
+  KIMI_CODE_OVERSEAS_BASE_URL,
   LOCAL_AUTH_KEY_PREFIX,
   MINIMAX_CN_BASE_URL,
   MINIMAX_GLOBAL_BASE_URL,
   MODELS,
-  MOONSHOT_OAUTH_KEY,
   NotLoggedInError,
-  XAI_OAUTH_KEY,
+  OPENAI_CHATGPT_KEY,
+  RETIRED_SIGN_INS,
   XIAOMI_CREDITS_KEY,
   XIAOMI_TOKEN_PLAN_BASE_URLS,
+  apiKeyStorageKeys,
   claudeCodeAuthStatus,
   claudeCodeBinaryPath,
   claudeCodeCallbackUrl,
@@ -25,16 +34,19 @@ import {
   claudeCodePlatformKey,
   clearRuntimeModels,
   closeLogger,
+  detectKimiCodeBaseUrl,
   detectMiniMaxBaseUrl,
   detectXiaomiTokenPlanBaseUrl,
   dualAuthProvider,
   dualAuthProviderByOAuthKey,
   ensureClaudeCodeBinary,
+  fetchChatGPTPlanModels,
   formatClaudeCodeInstallProgress,
   generatePKCE,
   getAllModels,
   getAuthStorageKey,
   getAuthStorageKeys,
+  getChatGPTHostId,
   getContextWindow,
   getDefaultModel,
   getDefaultThinkingLevel,
@@ -47,40 +59,33 @@ import {
   getSummaryModel,
   getToolResultCharLimit,
   getVideoByteLimit,
-  grokCliBaseUrl,
-  grokCliHeaders,
   isClaudeCodeAuthMarker,
-  isGrokCliEndpoint,
   isHiddenProvider,
   isKimiCodingEndpoint,
   isLegacyClaudeOAuth,
   isLoggerOpen,
   isPaidModel,
-  kimiCodeBaseUrl,
-  kimiCodingHeaders,
   log,
+  loginChatGPT,
   loginClaudeCode,
-  loginGemini,
-  loginKimi,
-  loginOpenAI,
-  loginXai,
   logoutClaudeCode,
   oauthStorageKey,
   openLog,
+  parseCallbackInput,
   providerStorageKeys,
   readStoredBaseUrlSync,
-  refreshGeminiToken,
-  refreshKimiToken,
-  refreshOpenAIToken,
-  refreshXaiToken,
+  refreshChatGPTToken,
   registerLogCleanup,
   registerRuntimeModels,
   resolveClaudeCodeBinary,
+  revokeChatGPTSignIn,
   setProviderCatalog,
+  storageKeyProvider,
   usesOpenAICodexTransport,
+  verifyIdToken,
   withFileLock,
   withoutPaidTier
-} from "./chunk-JLEBGMG4.js";
+} from "./chunk-J7W5HS6X.js";
 import {
   getAppPaths
 } from "./chunk-GXOFTHM5.js";
@@ -704,6 +709,9 @@ async function signOutOfClaudeCode(auth, opts = {}) {
 }
 
 // src/auth-providers.ts
+function apiKeyDetails(label, billing, when = "") {
+  return { apikey: { method: "apikey", label, billing, when } };
+}
 var ALL_AUTH_PROVIDERS = [
   {
     value: "anthropic",
@@ -731,89 +739,103 @@ var ALL_AUTH_PROVIDERS = [
     value: "openai",
     label: "OpenAI",
     description: "GPT-6 Astra, GPT-6 Astra Fast, GPT-6.1 Sol, GPT-6.1 Sol Fast, GPT-6.1 Terra, GPT-6.1 Terra Fast, GPT-6 Luna, GPT-6 Luna Fast",
-    methods: ["oauth"]
+    methods: ["oauth", "apikey"],
+    apiKeyLabel: "OpenAI",
+    methodDetails: {
+      oauth: {
+        method: "oauth",
+        label: "Continue with ChatGPT",
+        billing: "Uses your ChatGPT plan.",
+        when: "Signs in through OpenAI. Manage what GG Coder may use at chatgpt.com/settings/usage.",
+        requires: "A ChatGPT plan."
+      },
+      apikey: {
+        method: "apikey",
+        label: "OpenAI API key",
+        billing: "Pay-per-token from an OpenAI Platform key.",
+        when: "No subscription needed. Covers you while your ChatGPT plan's usage is out."
+      }
+    }
   },
   {
     value: "gemini",
     label: "Gemini",
     description: "Gemini 3.8 Flash, 3.5 Flash Lite, 3.1 Flash Lite, 3.5 Flash, 3.1 Pro (Preview)",
-    methods: ["oauth", "apikey"],
+    methods: ["apikey"],
     apiKeyLabel: "Gemini",
     apiKeyBaseUrl: GEMINI_API_KEY_BASE_URL,
-    // Stored under its own key so it never overwrites the `gemini` OAuth login.
+    // Stored under its own key: `gemini` held the retired Google sign-in.
     apiKeyVariants: [
-      { key: GEMINI_API_KEY, label: "Google AI Studio", baseUrl: GEMINI_API_KEY_BASE_URL }
-    ],
-    methodDetails: {
-      oauth: {
-        method: "oauth",
-        label: "Sign in with Google",
-        billing: "Gemini Code Assist Standard or Enterprise licence.",
-        when: "Personal Google accounts are no longer served here (Google ended it on June 18, 2026)."
-      },
-      apikey: {
-        method: "apikey",
-        label: "Gemini API key",
+      {
+        key: GEMINI_API_KEY,
+        label: "Google AI Studio",
+        kind: "payg",
         billing: "Pay-per-token from a Google AI Studio key.",
-        when: "Used first whenever it is set."
+        baseUrl: GEMINI_API_KEY_BASE_URL
       }
-    }
+    ],
+    methodDetails: apiKeyDetails("Gemini API key", "Pay-per-token from a Google AI Studio key.")
   },
   {
     value: "xai",
     label: "xAI (Grok)",
-    description: "Grok 4.7 \xB7 OAuth or API key",
-    methods: ["oauth", "apikey"],
+    description: "Grok 4.7",
+    methods: ["apikey"],
     apiKeyLabel: "xAI",
-    methodDetails: {
-      oauth: {
-        method: "oauth",
-        label: "Sign in with Grok",
-        billing: "Included with SuperGrok or X Premium.",
-        when: ""
-      },
-      apikey: {
-        method: "apikey",
-        label: "xAI API key",
-        billing: "Pay-per-token on console.x.ai credits.",
-        when: ""
-      }
-    }
+    methodDetails: apiKeyDetails(
+      "xAI API key",
+      "Pay-per-token from console.x.ai credits.",
+      "SuperGrok and X Premium usage is only offered in apps xAI partners with."
+    )
   },
   {
     value: "moonshot",
-    label: "Moonshot",
-    description: "Kimi K3, K2.8 Preview (Kimi sign-in), K2.7 Code, K2.7 Code HighSpeed \xB7 OAuth or API key",
-    methods: ["oauth", "apikey"],
-    apiKeyLabel: "Moonshot",
-    methodDetails: {
-      oauth: {
-        method: "oauth",
-        label: "Sign in with Kimi",
-        billing: "Included with a Kimi For Coding plan.",
-        when: ""
+    label: "Kimi (Moonshot)",
+    description: "Kimi K3, K2.8 Preview (Kimi Code plan), K2.7 Code, K2.7 Code HighSpeed",
+    methods: ["apikey"],
+    apiKeyLabel: "Kimi",
+    apiKeyVariants: [
+      {
+        key: KIMI_CODE_KEY,
+        label: "Kimi Code plan",
+        kind: "plan",
+        billing: "Uses your Kimi Code plan. Create the key in the Kimi Code Console."
       },
-      apikey: {
-        method: "apikey",
-        label: "Moonshot API key",
-        billing: "Pay-per-token on Moonshot credits.",
-        when: ""
+      {
+        key: "moonshot",
+        label: "Moonshot API",
+        kind: "payg",
+        billing: "Pay-per-token from platform.moonshot.ai."
       }
-    }
+    ],
+    methodDetails: apiKeyDetails(
+      "Kimi API key",
+      "A Kimi Code plan key uses your plan; a Moonshot key is pay-per-token."
+    )
   },
   {
     value: "glm",
     label: "Z.AI (GLM)",
     description: "GLM-5.3, GLM-5.3-Flash",
     methods: ["apikey"],
-    apiKeyLabel: "Z.AI"
+    apiKeyLabel: "Z.AI",
+    methodDetails: apiKeyDetails(
+      "Z.AI API key",
+      "Pay-per-token from your Z.AI account balance.",
+      "GLM Coding Plan quota can't be used here: Z.AI limits the plan to the tools it lists."
+    )
   },
   {
     value: "minimax",
     label: "MiniMax",
     description: "MiniMax M3.1 Flash, M3",
     methods: ["apikey"],
-    apiKeyLabel: "MiniMax"
+    apiKeyLabel: "MiniMax",
+    methodDetails: apiKeyDetails(
+      "MiniMax API key",
+      "An M Plan key uses your plan; a pay-as-you-go key is pay-per-token.",
+      "The key you paste decides which one is billed."
+    )
   },
   {
     value: "xiaomi",
@@ -826,44 +848,66 @@ var ALL_AUTH_PROVIDERS = [
       {
         key: "xiaomi",
         label: "Token Plan",
+        kind: "plan",
+        billing: "Uses your MiMo Token Plan.",
         baseUrl: "https://token-plan-sgp.xiaomimimo.com/v1"
       },
       {
         key: XIAOMI_CREDITS_KEY,
-        label: "API Credits (required for UltraSpeed)",
+        label: "API Credits",
+        kind: "payg",
+        billing: "Pay-per-token from MiMo API Credits. Required for UltraSpeed.",
         baseUrl: "https://api.xiaomimimo.com/v1"
       }
-    ]
+    ],
+    methodDetails: apiKeyDetails(
+      "Xiaomi MiMo API key",
+      "A Token Plan key uses your plan; an API Credits key is pay-per-token."
+    )
   },
   {
     value: "deepseek",
     label: "DeepSeek",
     description: "DeepSeek V4 Pro, V4.1 Flash",
     methods: ["apikey"],
-    apiKeyLabel: "DeepSeek"
+    apiKeyLabel: "DeepSeek",
+    methodDetails: apiKeyDetails("DeepSeek API key", "Pay-per-token from platform.deepseek.com.")
   },
   {
     value: "sakana",
     label: "Sakana (Fugu)",
     description: "Fugu, Fugu Max, Fugu Ultra",
     methods: ["apikey"],
-    apiKeyLabel: "Sakana"
+    apiKeyLabel: "Sakana",
+    methodDetails: apiKeyDetails("Sakana API key", "Pay-per-token from your Sakana API account.")
   },
   {
     value: "openrouter",
     label: "OpenRouter",
     description: "Qwen3.8 Max \xB7 multi-provider gateway",
     methods: ["apikey"],
-    apiKeyLabel: "OpenRouter"
+    apiKeyLabel: "OpenRouter",
+    methodDetails: apiKeyDetails("OpenRouter API key", "Pay-per-token from OpenRouter credits.")
   },
   {
     value: "huggingface",
     label: "Hugging Face",
     description: "Kimi K2.7 Code, DeepSeek V4.1 Flash, GPT-OSS 120B",
     methods: ["apikey"],
-    apiKeyLabel: "Hugging Face"
+    apiKeyLabel: "Hugging Face",
+    methodDetails: apiKeyDetails(
+      "Hugging Face token",
+      "Pay-per-token from Hugging Face Inference Providers credits."
+    )
   }
 ];
+function requiredKeyLabel(provider, storageKeys) {
+  const variants = ALL_AUTH_PROVIDERS.find((p) => p.value === provider)?.apiKeyVariants ?? [];
+  const needed = variants.filter((v) => storageKeys.includes(v.key));
+  if (needed.length === 0 || needed.length === variants.length) return void 0;
+  const names = needed.map((v) => v.label).join(" or ");
+  return `Needs ${/^[aeiou]/i.test(names) ? "an" : "a"} ${names} key`;
+}
 var AUTH_PROVIDERS = ALL_AUTH_PROVIDERS.filter(
   (p) => !isHiddenProvider(p.value)
 );
@@ -890,18 +934,24 @@ function describeAuthMethods(provider) {
   });
 }
 function authPriorityNote(provider) {
-  if (provider === "gemini") {
-    return "Uses the Gemini API key first when one is set; otherwise the Google sign-in.";
-  }
   if (provider === "anthropic") {
     return "Uses Sign in with Claude while you are signed in; otherwise the Anthropic API key.";
   }
   const dual = dualAuthProvider(provider);
-  if (!dual) return void 0;
-  return `Uses ${dual.oauthLabel} first; the ${dual.apiKeyLabel} takes over when it runs out, then switches back.`;
+  if (dual) {
+    return `Uses your ${dual.oauthLabel} first; the ${dual.apiKeyLabel} takes over while its usage is out, then switches back.`;
+  }
+  const variants = getAuthProvider(provider)?.apiKeyVariants;
+  const plan = variants?.find((v) => v.kind === "plan");
+  const payg = variants?.find((v) => v.kind === "payg");
+  if (plan && payg) {
+    return `Uses the ${plan.label} key first when both are set; the ${payg.label} key covers models the plan doesn't include.`;
+  }
+  return void 0;
 }
 
 // src/provider-usage.ts
+import { GG_CODER_USER_AGENT } from "@kenkaiiii/gg-ai";
 var SubscriptionUsageError = class extends Error {
   constructor(message, status, retryAfterMs2) {
     super(message);
@@ -910,51 +960,14 @@ var SubscriptionUsageError = class extends Error {
     this.name = "SubscriptionUsageError";
   }
 };
-var CODEX_USAGE_URL = "https://chatgpt.com/backend-api/wham/usage";
 function finiteNumber(value) {
   return typeof value === "number" && Number.isFinite(value) ? value : void 0;
 }
-function clampPercent(value) {
-  const number = finiteNumber(value);
-  return number === void 0 ? void 0 : Math.min(100, Math.max(0, number));
-}
 function isoTimestamp(value) {
   if (typeof value !== "string" || !value.trim()) return void 0;
   const timestamp = Date.parse(value);
   return Number.isFinite(timestamp) ? timestamp : void 0;
 }
-function unixTimestamp(value) {
-  const seconds = finiteNumber(value);
-  return seconds === void 0 ? void 0 : seconds * 1e3;
-}
-function codexResetAt(window, now) {
-  const absolute = unixTimestamp(window.reset_at);
-  if (absolute !== void 0) return absolute;
-  const afterSeconds = finiteNumber(window.reset_after_seconds);
-  return afterSeconds === void 0 ? void 0 : now + afterSeconds * 1e3;
-}
-function currentWindowLabel(seconds, fallbackHours) {
-  const duration = finiteNumber(seconds);
-  const hours = Math.max(1, Math.round((duration ?? fallbackHours * 3600) / 3600));
-  return `${hours}-hour`;
-}
-function codexWindowKind(window, fallback) {
-  const duration = finiteNumber(window.limit_window_seconds);
-  if (duration === void 0) return fallback;
-  return duration >= 6 * 24 * 60 * 60 ? "weekly" : "current";
-}
-function normalizedCodexWindow(window, fallbackKind, now) {
-  if (!window) return null;
-  const usedPercent = clampPercent(window.used_percent);
-  if (usedPercent === void 0) return null;
-  const kind = codexWindowKind(window, fallbackKind);
-  return {
-    kind,
-    label: kind === "weekly" ? "Weekly" : currentWindowLabel(window.limit_window_seconds, 5),
-    usedPercent,
-    resetsAt: codexResetAt(window, now)
-  };
-}
 function retryAfterMs(response, now) {
   const value = response.headers.get("retry-after")?.trim();
   if (!value) return void 0;
@@ -977,31 +990,6 @@ async function readUsageResponse(response, now) {
     throw new SubscriptionUsageError("Subscription usage response was not valid JSON");
   }
 }
-async function fetchCodexUsage(credentials, fetchFn, signal, now) {
-  const headers = {
-    Authorization: `Bearer ${credentials.accessToken}`,
-    Accept: "application/json",
-    originator: "ggcoder",
-    "User-Agent": "ggcoder"
-  };
-  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, now());
-  const windows = [
-    normalizedCodexWindow(data.rate_limit?.primary_window, "current", now()),
-    normalizedCodexWindow(data.rate_limit?.secondary_window, "weekly", now())
-  ].filter((window) => window !== null);
-  windows.sort((left, right) => {
-    if (left.kind === right.kind) return 0;
-    return left.kind === "current" ? -1 : 1;
-  });
-  return {
-    provider: "openai",
-    displayName: "Codex",
-    windows,
-    fetchedAt: now()
-  };
-}
 function kimiNumber(value) {
   if (typeof value === "string" && value.trim()) {
     const parsed = Number(value);
@@ -1032,15 +1020,14 @@ function kimiWindowMinutes(window) {
   }
 }
 async function fetchKimiUsage(credentials, fetchFn, signal, now) {
-  const response = await fetchFn(`${kimiCodeBaseUrl()}/usages`, {
+  const baseUrl = (credentials.baseUrl ?? KIMI_CODE_DEFAULT_BASE_URL).replace(/\/+$/, "");
+  const response = await fetchFn(`${baseUrl}/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()
+      "User-Agent": GG_CODER_USER_AGENT
     }
   });
   const data = await readUsageResponse(response, now());
@@ -1092,7 +1079,7 @@ async function fetchSubscriptionUsage(provider, credentials, options = {}) {
   const now = options.now ?? Date.now;
   const signal = AbortSignal.timeout(options.timeoutMs ?? 8e3);
   try {
-    return provider === "openai" ? await fetchCodexUsage(credentials, fetchFn, signal, now) : await fetchKimiUsage(credentials, fetchFn, signal, now);
+    return await fetchKimiUsage(credentials, fetchFn, signal, now);
   } catch (error) {
     if (error instanceof SubscriptionUsageError) throw error;
     const message = error instanceof Error ? error.message : String(error);
@@ -1598,29 +1585,38 @@ function createAutoUpdater(config) {
 export {
   AUTH_PROVIDERS,
   AuthStorage,
+  CHATGPT_PLAN_BASE_URL,
+  CHATGPT_PLAN_NOT_ENABLED_MESSAGE,
+  CHATGPT_PLAN_SCOPE,
+  CHATGPT_USAGE_URL,
   CLAUDE_CODE_AUTH_KEY,
   CLAUDE_CODE_AUTH_MARKER,
   CLAUDE_CODE_MANIFEST,
+  ChatGPTPlanNotEnabledError,
   DEFAULT_LOCAL_ENDPOINTS,
   DEFAULT_MAX_VIDEO_BYTES,
   FALLBACK_CONTEXT_WINDOW,
   GEMINI_API_KEY,
   GEMINI_API_KEY_BASE_URL,
   HIDDEN_PROVIDERS,
+  KIMI_CODE_DEFAULT_BASE_URL,
+  KIMI_CODE_KEY,
+  KIMI_CODE_OVERSEAS_BASE_URL,
   LOCAL_API_KEY_PLACEHOLDER,
   LOCAL_AUTH_KEY_PREFIX,
   MINIMAX_CN_BASE_URL,
   MINIMAX_GLOBAL_BASE_URL,
   MODELS,
-  MOONSHOT_OAUTH_KEY,
   NotLoggedInError,
+  OPENAI_CHATGPT_KEY,
   OPENROUTER_DEFAULT_BASE_URL,
   PLAN_MODE_THINKING_CAP,
+  RETIRED_SIGN_INS,
   SubscriptionUsageError,
   TelegramBot,
-  XAI_OAUTH_KEY,
   XIAOMI_CREDITS_KEY,
   XIAOMI_TOKEN_PLAN_BASE_URLS,
+  apiKeyStorageKeys,
   authPriorityNote,
   clampThinkingForPlanMode,
   claudeCodeAuthStatus,
@@ -1637,6 +1633,7 @@ export {
   createAutoUpdater,
   decodeOggOpus,
   describeAuthMethods,
+  detectKimiCodeBaseUrl,
   detectMiniMaxBaseUrl,
   detectXiaomiTokenPlanBaseUrl,
   discoverLocalModels,
@@ -1645,6 +1642,7 @@ export {
   dualAuthProviderByOAuthKey,
   endpointRoot,
   ensureClaudeCodeBinary,
+  fetchChatGPTPlanModels,
   fetchSubscriptionUsage,
   findProbedModel,
   formatClaudeCodeInstallProgress,
@@ -1655,6 +1653,7 @@ export {
   getAuthProvider,
   getAuthStorageKey,
   getAuthStorageKeys,
+  getChatGPTHostId,
   getContextWindow,
   getDefaultModel,
   getDefaultThinkingLevel,
@@ -1670,10 +1669,7 @@ export {
   getSupportedThinkingLevels,
   getToolResultCharLimit,
   getVideoByteLimit,
-  grokCliBaseUrl,
-  grokCliHeaders,
   isClaudeCodeAuthMarker,
-  isGrokCliEndpoint,
   isHiddenProvider,
   isKimiCodingEndpoint,
   isLegacyClaudeOAuth,
@@ -1682,21 +1678,17 @@ export {
   isModelLoaded,
   isPaidModel,
   isThinkingLevelSupported,
-  kimiCodeBaseUrl,
-  kimiCodingHeaders,
   localAuthStorageKey,
   localModelShortName,
   log,
+  loginChatGPT,
   loginClaudeCode,
-  loginGemini,
-  loginKimi,
-  loginOpenAI,
-  loginXai,
   logoutClaudeCode,
   mergeClaudeCodeRateLimit,
   oauthStorageKey,
   ollamaServedContext,
   openLog,
+  parseCallbackInput,
   parseLocalModelId,
   parseOpenRouterCatalog,
   probeEndpoint,
@@ -1704,21 +1696,22 @@ export {
   readClaudeCodeUsage,
   readStoredBaseUrlSync,
   recordClaudeCodeRateLimit,
-  refreshGeminiToken,
-  refreshKimiToken,
-  refreshOpenAIToken,
-  refreshXaiToken,
+  refreshChatGPTToken,
   registerLogCleanup,
   registerRuntimeModels,
+  requiredKeyLabel,
   resample,
   resolveClaudeCodeBinary,
+  revokeChatGPTSignIn,
   setProgressCallback,
   setProviderCatalog,
   signInWithClaudeCode,
   signOutOfClaudeCode,
+  storageKeyProvider,
   toModelInfo,
   transcribeVoice,
   usesOpenAICodexTransport,
+  verifyIdToken,
   withFileLock,
   withoutPaidTier
 };