@kenkaiiii/gg-core 5.92.0 → 5.94.0

package/dist/index.js

@@ -1,5 +1,8 @@
 import {
   AuthStorage,
+  CLAUDE_CODE_AUTH_KEY,
+  CLAUDE_CODE_AUTH_MARKER,
+  CLAUDE_CODE_MANIFEST,
   DEFAULT_MAX_VIDEO_BYTES,
   GEMINI_API_KEY,
   GEMINI_API_KEY_BASE_URL,
@@ -13,18 +16,25 @@ import {
   XAI_OAUTH_KEY,
   XIAOMI_CREDITS_KEY,
   XIAOMI_TOKEN_PLAN_BASE_URLS,
+  claudeCodeAuthStatus,
+  claudeCodeBinaryPath,
+  claudeCodeCallbackUrl,
+  claudeCodeConfigDir,
+  claudeCodeEnv,
+  claudeCodeHome,
+  claudeCodePlatformKey,
   clearRuntimeModels,
   closeLogger,
   detectMiniMaxBaseUrl,
   detectXiaomiTokenPlanBaseUrl,
   dualAuthProvider,
   dualAuthProviderByOAuthKey,
+  ensureClaudeCodeBinary,
+  formatClaudeCodeInstallProgress,
   generatePKCE,
   getAllModels,
   getAuthStorageKey,
   getAuthStorageKeys,
-  getClaudeCliUserAgent,
-  getClaudeCodeVersion,
   getContextWindow,
   getDefaultModel,
   getDefaultThinkingLevel,
@@ -39,39 +49,41 @@ import {
   getVideoByteLimit,
   grokCliBaseUrl,
   grokCliHeaders,
+  isClaudeCodeAuthMarker,
   isGrokCliEndpoint,
   isHiddenProvider,
   isKimiCodingEndpoint,
+  isLegacyClaudeOAuth,
   isLoggerOpen,
   isPaidModel,
   kimiCodeBaseUrl,
   kimiCodingHeaders,
   log,
-  loginAnthropic,
+  loginClaudeCode,
   loginGemini,
   loginKimi,
   loginOpenAI,
   loginXai,
+  logoutClaudeCode,
   oauthStorageKey,
   openLog,
-  pendingClaudeCodeVersionRefresh,
   providerStorageKeys,
   readStoredBaseUrlSync,
-  refreshAnthropicToken,
   refreshGeminiToken,
   refreshKimiToken,
   refreshOpenAIToken,
   refreshXaiToken,
   registerLogCleanup,
   registerRuntimeModels,
+  resolveClaudeCodeBinary,
   setProviderCatalog,
   usesOpenAICodexTransport,
   withFileLock,
   withoutPaidTier
-} from "./chunk-SDUIKPGO.js";
+} from "./chunk-JLEBGMG4.js";
 import {
   getAppPaths
-} from "./chunk-2X5L6U4Z.js";
+} from "./chunk-GXOFTHM5.js";
 
 // src/openrouter-catalog.ts
 var OPENROUTER_DEFAULT_BASE_URL = "https://openrouter.ai/api/v1";
@@ -587,18 +599,138 @@ function findProbedModel(probes, modelId) {
   return void 0;
 }
 
+// src/claude-code/usage.ts
+import fsp from "fs/promises";
+import path from "path";
+var USAGE_FILE = "usage.json";
+var WINDOWS = {
+  five_hour: { kind: "current", label: "5-hour" },
+  seven_day: { kind: "weekly", label: "Weekly" }
+};
+function finite(value) {
+  return typeof value === "number" && Number.isFinite(value) ? value : void 0;
+}
+function toWindow(key, raw) {
+  const shape = WINDOWS[key];
+  const fraction = finite(raw?.utilization);
+  if (!shape || fraction === void 0) return null;
+  const resetsAt = finite(raw?.resetsAt);
+  return {
+    ...shape,
+    usedPercent: Math.min(100, Math.max(0, fraction * 100)),
+    ...resetsAt !== void 0 ? { resetsAt: resetsAt * 1e3 } : {}
+  };
+}
+function mergeClaudeCodeRateLimit(info, previous, now = Date.now()) {
+  const reported = info.unifiedWindows ? Object.entries(info.unifiedWindows).map(([key, raw]) => toWindow(key, raw)) : info.rateLimitType ? [toWindow(info.rateLimitType, info)] : [];
+  const byKind = new Map(previous?.windows.map((w) => [w.kind, w]) ?? []);
+  for (const window of reported) if (window) byKind.set(window.kind, window);
+  const windows = [...byKind.values()].sort(
+    (a, b) => a.kind === b.kind ? 0 : a.kind === "current" ? -1 : 1
+  );
+  return { provider: "anthropic", displayName: "Anthropic", windows, fetchedAt: now };
+}
+function usagePath(opts) {
+  return path.join(claudeCodeHome(opts), USAGE_FILE);
+}
+async function readClaudeCodeUsage(opts = {}) {
+  let parsed;
+  try {
+    parsed = JSON.parse(await fsp.readFile(usagePath(opts), "utf8"));
+  } catch {
+    return null;
+  }
+  if (!Array.isArray(parsed?.windows) || typeof parsed.fetchedAt !== "number") return null;
+  const now = opts.now ?? Date.now();
+  const windows = parsed.windows.filter(
+    (w) => (w.kind === "current" || w.kind === "weekly") && typeof w.usedPercent === "number" && (w.resetsAt === void 0 || w.resetsAt > now)
+  );
+  return { provider: "anthropic", displayName: "Anthropic", windows, fetchedAt: parsed.fetchedAt };
+}
+var writeQueue = Promise.resolve();
+function recordClaudeCodeRateLimit(info, opts = {}) {
+  const write = async () => {
+    const now = opts.now ?? Date.now();
+    const next = mergeClaudeCodeRateLimit(info, await readClaudeCodeUsage({ ...opts, now }), now);
+    if (next.windows.length === 0) return;
+    const file = usagePath(opts);
+    await fsp.mkdir(path.dirname(file), { recursive: true });
+    await fsp.writeFile(file, JSON.stringify(next), "utf8");
+  };
+  writeQueue = writeQueue.then(write).catch(() => {
+  });
+  return writeQueue;
+}
+async function clearClaudeCodeUsage(opts = {}) {
+  await writeQueue;
+  await fsp.rm(usagePath(opts), { force: true }).catch(() => {
+  });
+}
+
+// src/claude-code/sign-in.ts
+async function signInWithClaudeCode(auth, callbacks, opts = {}) {
+  if (!opts.binary && !resolveClaudeCodeBinary(opts)) {
+    callbacks.onStatus("Downloading Claude Code (one time)\u2026");
+    await ensureClaudeCodeBinary({
+      ...opts,
+      onProgress: (progress) => {
+        callbacks.onStatus(formatClaudeCodeInstallProgress(progress));
+        opts.onProgress?.(progress);
+      }
+    });
+  }
+  let status = await claudeCodeAuthStatus(opts);
+  if (!status.loggedIn) {
+    callbacks.onStatus("Opening Claude sign-in\u2026");
+    await loginClaudeCode(callbacks, opts);
+    status = await claudeCodeAuthStatus(opts);
+  }
+  if (!status.loggedIn) throw new Error("Claude sign-in didn't finish. Try again.");
+  await auth.setClaudeCodeLogin();
+  return status;
+}
+async function signOutOfClaudeCode(auth, opts = {}) {
+  await auth.clearClaudeCodeLogin();
+  await clearClaudeCodeUsage(opts);
+  try {
+    await logoutClaudeCode(opts);
+  } catch (err) {
+    log(
+      "WARN",
+      "auth",
+      `claude auth logout failed: ${err instanceof Error ? err.message : String(err)}`
+    );
+  }
+}
+
 // src/auth-providers.ts
 var ALL_AUTH_PROVIDERS = [
   {
     value: "anthropic",
     label: "Anthropic",
     description: "Claude Fable 5.1, Opus 5.5, Opus 5.5 Fast, Sonnet 5.5, Haiku 5.5",
-    methods: ["oauth"]
+    methods: ["oauth", "apikey"],
+    apiKeyLabel: "Anthropic",
+    methodDetails: {
+      oauth: {
+        method: "oauth",
+        label: "Sign in with Claude",
+        billing: "Uses your Claude Pro or Max plan.",
+        when: "Runs through Anthropic's Claude Code, which GG Coder downloads once (about 140 MB) the first time you pick this.",
+        requires: "A Claude Pro or Max subscription."
+      },
+      apikey: {
+        method: "apikey",
+        label: "Anthropic API key",
+        billing: "Pay-per-token from an Anthropic Console key.",
+        when: "No subscription needed. Used only while you are not signed in with Claude."
+      }
+    }
   },
   {
     value: "openai",
     label: "OpenAI",
-    description: "GPT-6 Astra, GPT-6 Astra Fast, GPT-6.1 Sol, GPT-6.1 Sol Fast, GPT-6 Luna, GPT-6 Luna Fast",
+    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"]
   },
   {
@@ -761,6 +893,9 @@ 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.`;
@@ -775,7 +910,6 @@ var SubscriptionUsageError = class extends Error {
     this.name = "SubscriptionUsageError";
   }
 };
-var ANTHROPIC_USAGE_URL = "https://api.anthropic.com/api/oauth/usage";
 var CODEX_USAGE_URL = "https://chatgpt.com/backend-api/wham/usage";
 function finiteNumber(value) {
   return typeof value === "number" && Number.isFinite(value) ? value : void 0;
@@ -843,45 +977,6 @@ async function readUsageResponse(response, now) {
     throw new SubscriptionUsageError("Subscription usage response was not valid JSON");
   }
 }
-async function fetchAnthropicUsage(credentials, fetchFn, signal, now) {
-  const response = await fetchFn(ANTHROPIC_USAGE_URL, {
-    method: "GET",
-    signal,
-    headers: {
-      Authorization: `Bearer ${credentials.accessToken}`,
-      Accept: "application/json",
-      "anthropic-version": "2023-06-01",
-      "anthropic-beta": "oauth-2025-04-20",
-      "User-Agent": "ggcoder"
-    }
-  });
-  const data = await readUsageResponse(response, now());
-  const windows = [];
-  const currentPercent = clampPercent(data.five_hour?.utilization);
-  if (currentPercent !== void 0) {
-    windows.push({
-      kind: "current",
-      label: "5-hour",
-      usedPercent: currentPercent,
-      resetsAt: isoTimestamp(data.five_hour?.resets_at)
-    });
-  }
-  const weeklyPercent = clampPercent(data.seven_day?.utilization);
-  if (weeklyPercent !== void 0) {
-    windows.push({
-      kind: "weekly",
-      label: "Weekly",
-      usedPercent: weeklyPercent,
-      resetsAt: isoTimestamp(data.seven_day?.resets_at)
-    });
-  }
-  return {
-    provider: "anthropic",
-    displayName: "Anthropic",
-    windows,
-    fetchedAt: now()
-  };
-}
 async function fetchCodexUsage(credentials, fetchFn, signal, now) {
   const headers = {
     Authorization: `Bearer ${credentials.accessToken}`,
@@ -997,7 +1092,7 @@ async function fetchSubscriptionUsage(provider, credentials, options = {}) {
   const now = options.now ?? Date.now;
   const signal = AbortSignal.timeout(options.timeoutMs ?? 8e3);
   try {
-    return provider === "anthropic" ? await fetchAnthropicUsage(credentials, fetchFn, signal, now) : provider === "openai" ? await fetchCodexUsage(credentials, fetchFn, signal, now) : await fetchKimiUsage(credentials, fetchFn, signal, now);
+    return 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);
@@ -1335,7 +1430,7 @@ async function transcribeVoice(fileUrl) {
 // src/auto-update.ts
 import { spawn } from "child_process";
 import fs from "fs";
-import path from "path";
+import path2 from "path";
 var CHECK_INTERVAL_MS = 60 * 60 * 1e3;
 var FETCH_TIMEOUT_MS = 1e4;
 function compareVersions(a, b) {
@@ -1377,7 +1472,7 @@ function createAutoUpdater(config) {
   function writeState(state) {
     try {
       const filePath = stateFilePath();
-      fs.mkdirSync(path.dirname(filePath), { recursive: true, mode: 448 });
+      fs.mkdirSync(path2.dirname(filePath), { recursive: true, mode: 448 });
       fs.writeFileSync(filePath, JSON.stringify(state));
     } catch {
     }
@@ -1503,6 +1598,9 @@ function createAutoUpdater(config) {
 export {
   AUTH_PROVIDERS,
   AuthStorage,
+  CLAUDE_CODE_AUTH_KEY,
+  CLAUDE_CODE_AUTH_MARKER,
+  CLAUDE_CODE_MANIFEST,
   DEFAULT_LOCAL_ENDPOINTS,
   DEFAULT_MAX_VIDEO_BYTES,
   FALLBACK_CONTEXT_WINDOW,
@@ -1525,6 +1623,14 @@ export {
   XIAOMI_TOKEN_PLAN_BASE_URLS,
   authPriorityNote,
   clampThinkingForPlanMode,
+  claudeCodeAuthStatus,
+  claudeCodeBinaryPath,
+  claudeCodeCallbackUrl,
+  claudeCodeConfigDir,
+  claudeCodeEnv,
+  claudeCodeHome,
+  claudeCodePlatformKey,
+  clearClaudeCodeUsage,
   clearLocalDiscoveryCache,
   clearRuntimeModels,
   closeLogger,
@@ -1538,8 +1644,10 @@ export {
   dualAuthProvider,
   dualAuthProviderByOAuthKey,
   endpointRoot,
+  ensureClaudeCodeBinary,
   fetchSubscriptionUsage,
   findProbedModel,
+  formatClaudeCodeInstallProgress,
   formatLocalModelId,
   generatePKCE,
   getAllModels,
@@ -1547,8 +1655,6 @@ export {
   getAuthProvider,
   getAuthStorageKey,
   getAuthStorageKeys,
-  getClaudeCliUserAgent,
-  getClaudeCodeVersion,
   getContextWindow,
   getDefaultModel,
   getDefaultThinkingLevel,
@@ -1566,9 +1672,11 @@ export {
   getVideoByteLimit,
   grokCliBaseUrl,
   grokCliHeaders,
+  isClaudeCodeAuthMarker,
   isGrokCliEndpoint,
   isHiddenProvider,
   isKimiCodingEndpoint,
+  isLegacyClaudeOAuth,
   isLocalModelId,
   isLoggerOpen,
   isModelLoaded,
@@ -1579,21 +1687,23 @@ export {
   localAuthStorageKey,
   localModelShortName,
   log,
-  loginAnthropic,
+  loginClaudeCode,
   loginGemini,
   loginKimi,
   loginOpenAI,
   loginXai,
+  logoutClaudeCode,
+  mergeClaudeCodeRateLimit,
   oauthStorageKey,
   ollamaServedContext,
   openLog,
   parseLocalModelId,
   parseOpenRouterCatalog,
-  pendingClaudeCodeVersionRefresh,
   probeEndpoint,
   providerStorageKeys,
+  readClaudeCodeUsage,
   readStoredBaseUrlSync,
-  refreshAnthropicToken,
+  recordClaudeCodeRateLimit,
   refreshGeminiToken,
   refreshKimiToken,
   refreshOpenAIToken,
@@ -1601,8 +1711,11 @@ export {
   registerLogCleanup,
   registerRuntimeModels,
   resample,
+  resolveClaudeCodeBinary,
   setProgressCallback,
   setProviderCatalog,
+  signInWithClaudeCode,
+  signOutOfClaudeCode,
   toModelInfo,
   transcribeVoice,
   usesOpenAICodexTransport,