@kenkaiiii/gg-core 4.9.0 → 4.10.0

package/dist/index.js

@@ -9,7 +9,7 @@ import {
   getSummaryModel,
   getVideoByteLimit,
   usesOpenAICodexTransport
-} from "./chunk-227IRQAU.js";
+} from "./chunk-RBR3MTVM.js";
 import {
   getAppPaths
 } from "./chunk-TZNVRILI.js";
@@ -1060,14 +1060,15 @@ function errorDetail(data) {
   const desc = data.error_description ?? data.message ?? data.error;
   return typeof desc === "string" && desc.length > 0 ? desc : "unknown error";
 }
-function credsFromTokenResponse(data) {
+function credsFromTokenResponse(data, opts) {
   const accessToken = data.access_token;
-  const refreshToken = data.refresh_token;
+  const responseRefreshToken = data.refresh_token;
   const expiresIn = Number(data.expires_in);
   if (typeof accessToken !== "string" || accessToken.length === 0) {
     throw new Error("Kimi OAuth response missing access_token.");
   }
-  if (typeof refreshToken !== "string" || refreshToken.length === 0) {
+  const refreshToken = typeof responseRefreshToken === "string" && responseRefreshToken.length > 0 ? responseRefreshToken : opts?.fallbackRefreshToken ?? "";
+  if (refreshToken.length === 0) {
     throw new Error("Kimi OAuth response missing refresh_token.");
   }
   if (!Number.isFinite(expiresIn) || expiresIn <= 0) {
@@ -1164,7 +1165,7 @@ async function refreshKimiToken(refreshToken) {
     refresh_token: refreshToken
   });
   if (status === 200 && typeof data.access_token === "string") {
-    return credsFromTokenResponse(data);
+    return credsFromTokenResponse(data, { fallbackRefreshToken: refreshToken });
   }
   const errorCode = typeof data.error === "string" ? data.error : "";
   throw new Error(`Kimi token refresh failed (${status}): ${errorCode || errorDetail(data)}`);
@@ -1172,6 +1173,7 @@ async function refreshKimiToken(refreshToken) {
 
 // src/auth-storage.ts
 var MOONSHOT_OAUTH_KEY = "moonshot-oauth";
+var REFRESH_SKEW_MS = 6e4;
 var STATIC_API_KEY_PROVIDERS = /* @__PURE__ */ new Set([
   "glm",
   "moonshot",
@@ -1286,6 +1288,11 @@ var AuthStorage = class {
         return await this.resolveCredentials(MOONSHOT_OAUTH_KEY, opts);
       } catch (err) {
         if (err instanceof NotLoggedInError && this.data["moonshot"]) {
+          log(
+            "WARN",
+            "auth",
+            'Kimi OAuth credential is no longer valid \u2014 falling back to the Moonshot API key. Run "ggcoder login" and choose Kimi OAuth to restore OAuth auth.'
+          );
           return this.data["moonshot"];
         }
         throw err;
@@ -1298,7 +1305,7 @@ var AuthStorage = class {
     if (STATIC_API_KEY_PROVIDERS.has(provider)) {
       return creds;
     }
-    if (!opts?.forceRefresh && Date.now() < creds.expiresAt) {
+    if (!opts?.forceRefresh && Date.now() < creds.expiresAt - REFRESH_SKEW_MS) {
       return creds;
     }
     const existing = this.refreshLocks.get(provider);
@@ -1308,7 +1315,7 @@ var AuthStorage = class {
         const content = await fs4.readFile(this.filePath, "utf-8");
         const freshData = JSON.parse(content);
         const freshCreds = freshData[provider];
-        if (freshCreds && !opts?.forceRefresh && Date.now() < freshCreds.expiresAt) {
+        if (freshCreds && !opts?.forceRefresh && Date.now() < freshCreds.expiresAt - REFRESH_SKEW_MS) {
           this.data[provider] = freshCreds;
           return freshCreds;
         }
@@ -1334,6 +1341,9 @@ var AuthStorage = class {
       if (!refreshed.projectId && creds.projectId) {
         refreshed.projectId = creds.projectId;
       }
+      if (!refreshed.baseUrl && creds.baseUrl) {
+        refreshed.baseUrl = creds.baseUrl;
+      }
       this.data[provider] = refreshed;
       await atomicWriteFile(this.filePath, JSON.stringify(this.data, null, 2));
       return refreshed;