githits 0.4.8 → 0.4.10

package/dist/index.js

@@ -1,6 +1,6 @@
 import {
   version
-} from "./shared/chunk-wyphcypv.js";
+} from "./shared/chunk-fvpvx4x4.js";
 export {
   version
 };

package/dist/shared/{chunk-wyphcypv.js → chunk-fvpvx4x4.js}

@@ -1,6 +1,6 @@
 import { createRequire } from "node:module";
 var __require = /* @__PURE__ */ createRequire(import.meta.url);
 // package.json
-var version = "0.4.8";
+var version = "0.4.10";
 
 export { __require, version };

package/dist/shared/{chunk-681avsyw.js → chunk-mw1910qd.js}

@@ -4,8 +4,8 @@ import {
   createAuthStatusDependencies,
   createContainer,
   loadAutoLoginAuthSessionMetadata
-} from "./chunk-6hq1gf0g.js";
-import"./chunk-wyphcypv.js";
+} from "./chunk-p9ak72j0.js";
+import"./chunk-fvpvx4x4.js";
 export {
   loadAutoLoginAuthSessionMetadata,
   createContainer,

package/dist/shared/{chunk-6hq1gf0g.js → chunk-p9ak72j0.js}

@@ -1,35 +1,62 @@
 import {
   __require,
   version
-} from "./chunk-wyphcypv.js";
+} from "./chunk-fvpvx4x4.js";
 
 // src/services/app-config-paths.ts
 var APP_DIR = "githits";
 function getAppConfigDir(fs) {
-  const home = fs.getHomeDir();
-  if (process.platform === "win32") {
-    return fs.joinPath(process.env.APPDATA ?? fs.joinPath(home, "AppData", "Roaming"), APP_DIR);
+  return getAppConfigDirForEnv(fs, process.env, process.platform, fs.getHomeDir());
+}
+function getAppConfigDirForEnv(fs, env, platform, home = getHomeDirForEnv(fs, env, platform)) {
+  if (platform === "win32") {
+    return fs.joinPath(env.APPDATA ?? fs.joinPath(home, "AppData", "Roaming"), APP_DIR);
   }
-  return fs.joinPath(process.env.XDG_CONFIG_HOME ?? fs.joinPath(home, ".config"), APP_DIR);
+  return fs.joinPath(env.XDG_CONFIG_HOME ?? fs.joinPath(home, ".config"), APP_DIR);
 }
 function getAuthConfigPath(fs) {
   return fs.joinPath(getAppConfigDir(fs), "config.toml");
 }
+function getAuthConfigPathForEnv(fs, env, platform) {
+  return fs.joinPath(getAppConfigDirForEnv(fs, env, platform), "config.toml");
+}
 function getAuthFileStorageDir(fs) {
   return fs.joinPath(getAppConfigDir(fs), "auth");
 }
+function getAuthFileStorageDirForEnv(fs, env, platform) {
+  return fs.joinPath(getAppConfigDirForEnv(fs, env, platform), "auth");
+}
+function getHomeDirForEnv(fs, env, platform) {
+  if (platform === "win32" && env.USERPROFILE)
+    return env.USERPROFILE;
+  if (platform !== "win32" && env.HOME)
+    return env.HOME;
+  return fs.getHomeDir();
+}
 function getLegacyAuthStorageDir(fs) {
   return fs.joinPath(fs.getHomeDir(), ".githits");
 }
+function getLegacyAuthStorageDirForEnv(fs, env, platform) {
+  return fs.joinPath(getHomeDirForEnv(fs, env, platform), ".githits");
+}
 function getLegacyMacAppConfigDir(fs) {
   return fs.joinPath(fs.getHomeDir(), "Library", "Application Support", APP_DIR);
 }
+function getLegacyMacAppConfigDirForEnv(fs, env) {
+  return fs.joinPath(getHomeDirForEnv(fs, env, "darwin"), "Library", "Application Support", APP_DIR);
+}
 function getLegacyMacAuthConfigPath(fs) {
   return fs.joinPath(getLegacyMacAppConfigDir(fs), "config.toml");
 }
+function getLegacyMacAuthConfigPathForEnv(fs, env) {
+  return fs.joinPath(getLegacyMacAppConfigDirForEnv(fs, env), "config.toml");
+}
 function getLegacyMacAuthFileStorageDir(fs) {
   return fs.joinPath(getLegacyMacAppConfigDir(fs), "auth");
 }
+function getLegacyMacAuthFileStorageDirForEnv(fs, env) {
+  return fs.joinPath(getLegacyMacAppConfigDirForEnv(fs, env), "auth");
+}
 // src/services/auth-config.ts
 import { parse as parseToml } from "smol-toml";
 import { z } from "zod";
@@ -114,11 +141,57 @@ function generateState() {
   return randomBytes(32).toString("hex");
 }
 
+// src/shared/fetch-timeout.ts
+var DEFAULT_FETCH_TIMEOUT_MS = 120000;
+
+class FetchTimeoutError extends Error {
+  timeoutMs;
+  constructor(timeoutMs, options) {
+    super(`Request timed out after ${timeoutMs}ms.`, options);
+    this.name = "FetchTimeoutError";
+    this.timeoutMs = timeoutMs;
+  }
+}
+async function fetchWithTimeout(input, init = {}, options = {}) {
+  const timeoutMs = options.timeoutMs ?? DEFAULT_FETCH_TIMEOUT_MS;
+  const timeoutSignal = AbortSignal.timeout(timeoutMs);
+  const signal = init.signal ? AbortSignal.any([init.signal, timeoutSignal]) : timeoutSignal;
+  const fetchFn = options.fetchFn ?? globalThis.fetch;
+  let timeoutId;
+  const timeout = new Promise((_, reject) => {
+    timeoutId = setTimeout(() => {
+      reject(new FetchTimeoutError(timeoutMs));
+    }, timeoutMs);
+  });
+  try {
+    return await Promise.race([fetchFn(input, { ...init, signal }), timeout]);
+  } catch (cause) {
+    if (cause instanceof FetchTimeoutError)
+      throw cause;
+    if (timeoutSignal.aborted && !init.signal?.aborted) {
+      throw new FetchTimeoutError(timeoutMs, { cause });
+    }
+    throw cause;
+  } finally {
+    if (timeoutId)
+      clearTimeout(timeoutId);
+  }
+}
+function isFetchTimeoutError(error) {
+  return error instanceof FetchTimeoutError;
+}
+
 // src/services/auth-service.ts
 class AuthServiceImpl {
+  fetchFn;
+  fetchTimeoutMs;
+  constructor(fetchFn, fetchTimeoutMs = DEFAULT_FETCH_TIMEOUT_MS) {
+    this.fetchFn = fetchFn;
+    this.fetchTimeoutMs = fetchTimeoutMs;
+  }
   async discoverEndpoints(mcpBaseUrl) {
     const url = `${mcpBaseUrl}/.well-known/oauth-authorization-server`;
-    const response = await fetch(url);
+    const response = await fetchWithTimeout(url, {}, this.fetchOptions());
     if (!response.ok) {
       throw new Error(`Failed to discover OAuth endpoints: ${response.status} ${response.statusText}`);
     }
@@ -136,7 +209,7 @@ class AuthServiceImpl {
     };
   }
   async registerClient(params) {
-    const response = await fetch(params.registrationEndpoint, {
+    const response = await fetchWithTimeout(params.registrationEndpoint, {
       method: "POST",
       headers: { "Content-Type": "application/json" },
       body: JSON.stringify({
@@ -146,7 +219,7 @@ class AuthServiceImpl {
         response_types: ["code"],
         token_endpoint_auth_method: "client_secret_post"
       })
-    });
+    }, this.fetchOptions());
     if (!response.ok) {
       const error = await response.text();
       throw new Error(`Client registration failed: ${error}`);
@@ -251,11 +324,11 @@ class AuthServiceImpl {
       code_verifier: params.codeVerifier,
       redirect_uri: params.redirectUri
     });
-    const response = await fetch(params.tokenEndpoint, {
+    const response = await fetchWithTimeout(params.tokenEndpoint, {
       method: "POST",
       headers: { "Content-Type": "application/x-www-form-urlencoded" },
       body: body.toString()
-    });
+    }, this.fetchOptions());
     if (!response.ok) {
       const error = await response.text();
       throw new Error(`Token exchange failed: ${error}`);
@@ -269,17 +342,23 @@ class AuthServiceImpl {
       client_secret: params.clientSecret,
       refresh_token: params.refreshToken
     });
-    const response = await fetch(params.tokenEndpoint, {
+    const response = await fetchWithTimeout(params.tokenEndpoint, {
       method: "POST",
       headers: { "Content-Type": "application/x-www-form-urlencoded" },
       body: body.toString()
-    });
+    }, this.fetchOptions());
     if (!response.ok) {
       const error = await response.text();
       throw new Error(`Token refresh failed: ${error}`);
     }
     return parseRefreshTokenResponse(await response.json());
   }
+  fetchOptions() {
+    return {
+      fetchFn: this.fetchFn,
+      timeoutMs: this.fetchTimeoutMs
+    };
+  }
 }
 function parseTokenResponse(data) {
   const d = data;
@@ -1272,11 +1351,11 @@ function baseUrl(endpointUrl) {
   return endpointUrl.replace(/\/+$/, "");
 }
 async function postPkgseerGraphql(request) {
-  const fetchFn = request.fetchFn ?? globalThis.fetch;
   const userAgent = request.userAgent ?? `githits-cli/${version}`;
+  const timeoutMs = request.timeoutMs ?? DEFAULT_FETCH_TIMEOUT_MS;
   let response;
   try {
-    response = await fetchFn(`${baseUrl(request.endpointUrl)}/api/graphql`, {
+    response = await fetchWithTimeout(`${baseUrl(request.endpointUrl)}/api/graphql`, {
       method: "POST",
       headers: {
         ...buildClientHeaders(),
@@ -1288,7 +1367,7 @@ async function postPkgseerGraphql(request) {
         query: request.query,
         variables: request.variables
       })
-    });
+    }, { fetchFn: request.fetchFn, timeoutMs });
   } catch (cause) {
     debugLog("pkg-graphql", {
       event: "transport-error",
@@ -1478,13 +1557,17 @@ function parseDetail(body) {
 class GitHitsServiceImpl {
   apiUrl;
   token;
-  constructor(apiUrl, token) {
+  fetchFn;
+  fetchTimeoutMs;
+  constructor(apiUrl, token, fetchFn, fetchTimeoutMs = DEFAULT_FETCH_TIMEOUT_MS) {
     this.apiUrl = apiUrl;
     this.token = token;
+    this.fetchFn = fetchFn;
+    this.fetchTimeoutMs = fetchTimeoutMs;
   }
   async search(params) {
     return withTelemetrySpan("githits.search.request", async () => {
-      const response = await fetch(`${this.apiUrl}/search`, {
+      const response = await fetchWithTimeout(`${this.apiUrl}/search`, {
         method: "POST",
         headers: this.headers(),
         body: JSON.stringify({
@@ -1493,7 +1576,7 @@ class GitHitsServiceImpl {
           license_mode: params.licenseMode ?? "strict",
           include_explanation: params.includeExplanation ?? false
         })
-      });
+      }, this.fetchOptions());
       if (!response.ok) {
         throw await this.createError(response);
       }
@@ -1502,9 +1585,9 @@ class GitHitsServiceImpl {
   }
   async getLanguages() {
     return withTelemetrySpan("githits.languages.request", async () => {
-      const response = await fetch(`${this.apiUrl}/languages`, {
+      const response = await fetchWithTimeout(`${this.apiUrl}/languages`, {
         headers: this.headers()
-      });
+      }, this.fetchOptions());
       if (!response.ok) {
         throw await this.createError(response);
       }
@@ -1513,7 +1596,7 @@ class GitHitsServiceImpl {
   }
   async submitFeedback(params) {
     return withTelemetrySpan("githits.feedback.request", async () => {
-      const response = await fetch(`${this.apiUrl}/feedbacks`, {
+      const response = await fetchWithTimeout(`${this.apiUrl}/feedbacks`, {
         method: "POST",
         headers: this.headers(),
         body: JSON.stringify({
@@ -1529,7 +1612,7 @@ class GitHitsServiceImpl {
             tool_name: params.toolName
           }
         })
-      });
+      }, this.fetchOptions());
       if (!response.ok) {
         throw await this.createError(response);
       }
@@ -1544,6 +1627,12 @@ class GitHitsServiceImpl {
       "User-Agent": `githits-cli/${version}`
     };
   }
+  fetchOptions() {
+    return {
+      fetchFn: this.fetchFn,
+      timeoutMs: this.fetchTimeoutMs
+    };
+  }
   async createError(response) {
     const status = response.status;
     const body = await response.text().catch(() => "");
@@ -2628,7 +2717,7 @@ class CodeNavigationServiceImpl {
       });
     } catch (cause) {
       if (cause instanceof PkgseerTransportError) {
-        throw new CodeNavigationNetworkError("Could not reach the code navigation service. Check your connection or set GITHITS_CODE_NAV_URL.", { cause });
+        throw this.createTransportError(cause);
       }
       throw cause;
     }
@@ -2661,7 +2750,7 @@ class CodeNavigationServiceImpl {
       });
     } catch (cause) {
       if (cause instanceof PkgseerTransportError) {
-        throw new CodeNavigationNetworkError("Could not reach the code navigation service. Check your connection or set GITHITS_CODE_NAV_URL.", { cause });
+        throw this.createTransportError(cause);
       }
       throw cause;
     }
@@ -2712,6 +2801,12 @@ class CodeNavigationServiceImpl {
     }
     return new CodeNavigationBackendError(detail ?? `Request failed with status ${status}`, status);
   }
+  createTransportError(error) {
+    if (isFetchTimeoutError(error.cause)) {
+      return new CodeNavigationBackendError("Code navigation request timed out.", undefined, "TIMEOUT", true);
+    }
+    return new CodeNavigationNetworkError("Could not reach the code navigation service. Check your connection or set GITHITS_CODE_NAV_URL.", { cause: error });
+  }
   createGraphQLError(errors) {
     const message = errors.map((error) => error.message).join(", ");
     const extensions = getPrimaryExtensions(errors);
@@ -2975,7 +3070,7 @@ class CodeNavigationServiceImpl {
       });
     } catch (cause) {
       if (cause instanceof PkgseerTransportError) {
-        throw new CodeNavigationNetworkError("Could not reach the code navigation service. Check your connection or set GITHITS_CODE_NAV_URL.", { cause });
+        throw this.createTransportError(cause);
       }
       throw cause;
     }
@@ -3043,7 +3138,7 @@ class CodeNavigationServiceImpl {
       });
     } catch (cause) {
       if (cause instanceof PkgseerTransportError) {
-        throw new CodeNavigationNetworkError("Could not reach the code navigation service. Check your connection or set GITHITS_CODE_NAV_URL.", { cause });
+        throw this.createTransportError(cause);
       }
       throw cause;
     }
@@ -3116,7 +3211,7 @@ class CodeNavigationServiceImpl {
       });
     } catch (cause) {
       if (cause instanceof PkgseerTransportError) {
-        throw new CodeNavigationNetworkError("Could not reach the code navigation service. Check your connection or set GITHITS_CODE_NAV_URL.", { cause });
+        throw this.createTransportError(cause);
       }
       throw cause;
     }
@@ -5322,7 +5417,7 @@ class PackageIntelligenceServiceImpl {
       });
     } catch (cause) {
       if (cause instanceof PkgseerTransportError) {
-        throw new PackageIntelligenceNetworkError("Could not reach the package intelligence service. Check your connection or set GITHITS_CODE_NAV_URL.", { cause });
+        throw this.createTransportError(cause);
       }
       throw cause;
     }
@@ -5356,6 +5451,12 @@ class PackageIntelligenceServiceImpl {
     }
     return new PackageIntelligenceBackendError(detail ?? `Request failed with status ${status}`, status);
   }
+  createTransportError(error) {
+    if (isFetchTimeoutError(error.cause)) {
+      return new PackageIntelligenceBackendError("Package intelligence request timed out.", undefined, "TIMEOUT", true);
+    }
+    return new PackageIntelligenceNetworkError("Could not reach the package intelligence service. Check your connection or set GITHITS_CODE_NAV_URL.", { cause: error });
+  }
   createGraphQLError(errors) {
     const message = errors.map((error) => error.message).join(", ");
     const extensions = getPrimaryExtensions2(errors);
@@ -5527,7 +5628,7 @@ class PackageIntelligenceServiceImpl {
       });
     } catch (cause) {
       if (cause instanceof PkgseerTransportError) {
-        throw new PackageIntelligenceNetworkError("Could not reach the package intelligence service. Check your connection or set GITHITS_CODE_NAV_URL.", { cause });
+        throw this.createTransportError(cause);
       }
       throw cause;
     }
@@ -5631,7 +5732,7 @@ class PackageIntelligenceServiceImpl {
       });
     } catch (cause) {
       if (cause instanceof PkgseerTransportError) {
-        throw new PackageIntelligenceNetworkError("Could not reach the package intelligence service. Check your connection or set GITHITS_CODE_NAV_URL.", { cause });
+        throw this.createTransportError(cause);
       }
       throw cause;
     }
@@ -5670,7 +5771,7 @@ class PackageIntelligenceServiceImpl {
       });
     } catch (cause) {
       if (cause instanceof PkgseerTransportError) {
-        throw new PackageIntelligenceNetworkError("Could not reach the package intelligence service. Check your connection or set GITHITS_CODE_NAV_URL.", { cause });
+        throw this.createTransportError(cause);
       }
       throw cause;
     }
@@ -5907,7 +6008,7 @@ class PackageIntelligenceServiceImpl {
       });
     } catch (cause) {
       if (cause instanceof PkgseerTransportError) {
-        throw new PackageIntelligenceNetworkError("Could not reach the package intelligence service. Check your connection or set GITHITS_CODE_NAV_URL.", { cause });
+        throw this.createTransportError(cause);
       }
       throw cause;
     }
@@ -5982,7 +6083,7 @@ class PackageIntelligenceServiceImpl {
       });
     } catch (cause) {
       if (cause instanceof PkgseerTransportError) {
-        throw new PackageIntelligenceNetworkError("Could not reach the package intelligence service. Check your connection or set GITHITS_CODE_NAV_URL.", { cause });
+        throw this.createTransportError(cause);
       }
       throw cause;
     }
@@ -6051,7 +6152,7 @@ class PackageIntelligenceServiceImpl {
       });
     } catch (cause) {
       if (cause instanceof PkgseerTransportError) {
-        throw new PackageIntelligenceNetworkError("Could not reach the package intelligence service. Check your connection or set GITHITS_CODE_NAV_URL.", { cause });
+        throw this.createTransportError(cause);
       }
       throw cause;
     }
@@ -6217,7 +6318,8 @@ class TokenManager {
   authStorage;
   mcpUrl;
   cachedToken = null;
-  refreshPromise = null;
+  softRefreshPromise = null;
+  forceRefreshPromise = null;
   constructor(deps) {
     this.authService = deps.authService;
     this.authStorage = deps.authStorage;
@@ -6225,6 +6327,9 @@ class TokenManager {
   }
   async getToken() {
     return withTelemetrySpan("token-manager.get-token", async () => {
+      if (this.forceRefreshPromise) {
+        return (await this.forceRefreshPromise).accessToken;
+      }
       if (!this.cachedToken) {
         this.cachedToken = await withTelemetrySpan("token-manager.load-tokens", () => this.authStorage.loadTokens(this.mcpUrl));
         if (!this.cachedToken)
@@ -6235,7 +6340,9 @@ class TokenManager {
       if (!shouldRefresh) {
         return currentToken;
       }
-      const refreshedToken = await this.doRefresh();
+      const refreshedToken = await this.doRefresh({
+        allowFreshExternalToken: true
+      });
       if (refreshedToken) {
         return refreshedToken;
       }
@@ -6246,27 +6353,56 @@ class TokenManager {
     });
   }
   async forceRefresh() {
-    return withTelemetrySpan("token-manager.force-refresh", () => this.doRefresh());
-  }
-  async doRefresh() {
-    if (this.refreshPromise) {
-      return this.refreshPromise;
+    return withTelemetrySpan("token-manager.force-refresh", () => this.doRefresh({ allowFreshExternalToken: false }));
+  }
+  async doRefresh(options) {
+    const result = await this.doRefreshResult(options);
+    return result.accessToken;
+  }
+  async doRefreshResult(options) {
+    if (!options.allowFreshExternalToken) {
+      if (this.forceRefreshPromise)
+        return this.forceRefreshPromise;
+      this.forceRefreshPromise = (async () => {
+        const softResult = await this.softRefreshPromise?.catch(() => {
+          return;
+        });
+        if (softResult?.accessToken && softResult.refreshedViaEndpoint) {
+          return softResult;
+        }
+        return this.executeRefresh(options);
+      })();
+      try {
+        return await this.forceRefreshPromise;
+      } finally {
+        this.forceRefreshPromise = null;
+      }
     }
-    this.refreshPromise = this.executeRefresh();
+    if (this.forceRefreshPromise)
+      return this.forceRefreshPromise;
+    if (this.softRefreshPromise)
+      return this.softRefreshPromise;
+    this.softRefreshPromise = this.executeRefresh(options);
     try {
-      return await this.refreshPromise;
+      return await this.softRefreshPromise;
     } finally {
-      this.refreshPromise = null;
+      this.softRefreshPromise = null;
     }
   }
-  async executeRefresh() {
+  async executeRefresh(options) {
     return withTelemetrySpan("token-manager.refresh", async () => {
-      const tokens = this.cachedToken ?? await withTelemetrySpan("token-manager.load-tokens", () => this.authStorage.loadTokens(this.mcpUrl));
-      if (!tokens)
-        return;
+      const candidate = await this.loadRefreshCandidate();
+      if (!candidate)
+        return refreshResult(undefined, false);
+      if (candidate.externallyUpdated && options.allowFreshExternalToken) {
+        const { shouldRefresh } = shouldRefreshToken(candidate.tokens, PROACTIVE_REFRESH_RATIO, new Date);
+        if (!shouldRefresh)
+          return refreshResult(candidate.tokens.accessToken, false);
+      }
+      const tokens = candidate.tokens;
       const client = await withTelemetrySpan("token-manager.load-client", () => this.authStorage.loadClient(this.mcpUrl));
       if (!client)
-        return;
+        return refreshResult(undefined, false);
       let response;
       try {
         const metadata = await withTelemetrySpan("token-manager.discover-endpoints", () => this.authService.discoverEndpoints(this.mcpUrl));
@@ -6279,21 +6415,25 @@ class TokenManager {
       } catch {
         const reloadedToken = await this.loadExternallyUpdatedToken(tokens);
         if (reloadedToken)
-          return reloadedToken.accessToken;
+          return refreshResult(reloadedToken.accessToken, false);
         const isExpired = tokens.expiresAt ? new Date >= new Date(tokens.expiresAt) : false;
+        if (candidate.externallyUpdated && !isExpired) {
+          return refreshResult(tokens.accessToken, false);
+        }
         if (isExpired) {
           const currentStoredTokens = await this.loadExternallyUpdatedToken(tokens);
-          if (currentStoredTokens)
-            return currentStoredTokens.accessToken;
+          if (currentStoredTokens) {
+            return refreshResult(currentStoredTokens.accessToken, false);
+          }
           const cleared = await withTelemetrySpan("token-manager.clear-tokens-if-unchanged", () => this.authStorage.clearTokensIfUnchanged(this.mcpUrl, tokens));
           if (!cleared) {
             const currentToken = await this.authStorage.loadTokens(this.mcpUrl);
             this.cachedToken = currentToken;
-            return currentToken?.accessToken;
+            return refreshResult(currentToken?.accessToken, false);
           }
           this.cachedToken = null;
         }
-        return;
+        return refreshResult(undefined, false);
       }
       const newTokenData = {
         accessToken: response.accessToken,
@@ -6301,30 +6441,53 @@ class TokenManager {
         expiresAt: new Date(Date.now() + response.expiresIn * 1000).toISOString(),
         createdAt: new Date().toISOString()
       };
-      const externallyUpdatedToken = await this.loadExternallyUpdatedToken(tokens, {
-        treatMissingAsExternalUpdate: true
-      });
-      if (externallyUpdatedToken === null)
-        return;
-      if (externallyUpdatedToken)
-        return externallyUpdatedToken.accessToken;
       const saved = await withTelemetrySpan("token-manager.save-tokens", () => this.authStorage.saveTokensIfUnchanged(this.mcpUrl, tokens, newTokenData));
       if (!saved) {
-        const currentToken = await this.authStorage.loadTokens(this.mcpUrl);
-        this.cachedToken = currentToken;
-        return currentToken?.accessToken;
+        return this.resolveSuccessfulRefreshConflict(tokens, response, newTokenData);
       }
       this.cachedToken = newTokenData;
-      return response.accessToken;
+      return refreshResult(response.accessToken, true);
     });
   }
-  async loadExternallyUpdatedToken(failedTokens, options = {}) {
-    const storedTokens = await withTelemetrySpan("token-manager.reload-tokens", () => this.authStorage.loadTokens(this.mcpUrl));
+  async resolveSuccessfulRefreshConflict(refreshedFrom, response, newTokenData) {
+    const currentToken = await withTelemetrySpan("token-manager.reload-tokens", () => this.authStorage.loadTokens(this.mcpUrl));
+    if (!currentToken) {
+      this.cachedToken = null;
+      return refreshResult(undefined, false);
+    }
+    if (!response.refreshToken || currentToken.refreshToken !== refreshedFrom.refreshToken) {
+      this.cachedToken = currentToken;
+      return refreshResult(currentToken.accessToken, false);
+    }
+    const saved = await withTelemetrySpan("token-manager.save-rotated-tokens-after-conflict", () => this.authStorage.saveTokensIfUnchanged(this.mcpUrl, currentToken, newTokenData));
+    if (saved) {
+      this.cachedToken = newTokenData;
+      return refreshResult(newTokenData.accessToken, true);
+    }
+    const latestToken = await withTelemetrySpan("token-manager.reload-tokens", () => this.authStorage.loadTokens(this.mcpUrl));
+    this.cachedToken = latestToken;
+    return refreshResult(latestToken?.accessToken, false);
+  }
+  async loadRefreshCandidate() {
+    const storedTokens = await withTelemetrySpan("token-manager.load-tokens", () => this.authStorage.loadTokens(this.mcpUrl));
+    if (!this.cachedToken) {
+      this.cachedToken = storedTokens;
+      return storedTokens ? { tokens: storedTokens, externallyUpdated: false } : null;
+    }
     if (!storedTokens) {
-      if (options.treatMissingAsExternalUpdate)
-        this.cachedToken = null;
-      return options.treatMissingAsExternalUpdate ? null : undefined;
+      this.cachedToken = null;
+      return null;
+    }
+    if (!areSameTokenData(storedTokens, this.cachedToken)) {
+      this.cachedToken = storedTokens;
+      return { tokens: storedTokens, externallyUpdated: true };
     }
+    return { tokens: this.cachedToken, externallyUpdated: false };
+  }
+  async loadExternallyUpdatedToken(failedTokens) {
+    const storedTokens = await withTelemetrySpan("token-manager.reload-tokens", () => this.authStorage.loadTokens(this.mcpUrl));
+    if (!storedTokens)
+      return;
     if (areSameTokenData(storedTokens, failedTokens))
       return;
     this.cachedToken = storedTokens;
@@ -6334,6 +6497,9 @@ class TokenManager {
 function areSameTokenData(a, b) {
   return a.accessToken === b.accessToken && a.refreshToken === b.refreshToken && a.expiresAt === b.expiresAt && a.createdAt === b.createdAt;
 }
+function refreshResult(accessToken, refreshedViaEndpoint) {
+  return { accessToken, refreshedViaEndpoint };
+}
 // src/services/update-check-service.ts
 import semver from "semver";
 var NPM_DIST_TAGS_URL = "https://registry.npmjs.org/-/package/githits/dist-tags";
@@ -6785,4 +6951,4 @@ async function createContainer(options = {}) {
   });
 }
 
-export { AuthConfigError, CLIENT_UPDATE_REQUIRED_REASON, ClientUpdateRequiredError, debugLog, setMcpClientVersionProvider, setClientMode, isTelemetryEnabled, withTelemetrySpan, startTelemetrySpan, endTelemetrySpan, flushTelemetry, AuthenticationError, CodeNavigationAccessError, CodeNavigationGraphQLError, CodeNavigationIndexingError, CodeNavigationUnresolvableError, MalformedCodeNavigationResponseError, CodeNavigationTargetNotFoundError, CodeNavigationFileNotFoundError, CodeNavigationVersionNotFoundError, CodeNavigationValidationError, CodeNavigationFeatureFlagRequiredError, CodeNavigationNetworkError, CodeNavigationBackendError, getCodeNavigationUrl, ExecServiceImpl, FileSystemServiceImpl, AuthStorageLockTimeoutError, AuthStoragePolicyError, PackageIntelligenceAccessError, PackageIntelligenceFeatureFlagRequiredError, PackageIntelligenceNetworkError, PackageIntelligenceBackendError, PackageIntelligenceGraphQLError, PackageIntelligenceTargetNotFoundError, PackageIntelligenceValidationError, PackageIntelligenceVersionNotFoundError, MalformedPackageIntelligenceResponseError, PackageIntelligenceChangelogSourceNotFoundError, PromptServiceImpl, refreshExpiredToken, NpmRegistryUpdateCheckService, shouldRunUpdateCheck, shouldRunRequiredUpdateEnforcement, formatUpdateNotice, formatRequiredUpdateNotice, loadAutoLoginAuthSessionMetadata, clearAutoLoginAuthSessionMetadata, createAuthCommandDependencies, createAuthStatusDependencies, createContainer };
+export { getAppConfigDirForEnv, getAuthConfigPathForEnv, getAuthFileStorageDirForEnv, getLegacyAuthStorageDirForEnv, getLegacyMacAuthConfigPathForEnv, getLegacyMacAuthFileStorageDirForEnv, AuthConfigError, parseAuthStorageMode, normalizeBaseUrl, CLIENT_UPDATE_REQUIRED_REASON, ClientUpdateRequiredError, debugLog, setMcpClientVersionProvider, setClientMode, isTelemetryEnabled, withTelemetrySpan, startTelemetrySpan, endTelemetrySpan, flushTelemetry, AuthenticationError, CodeNavigationAccessError, CodeNavigationGraphQLError, CodeNavigationIndexingError, CodeNavigationUnresolvableError, MalformedCodeNavigationResponseError, CodeNavigationTargetNotFoundError, CodeNavigationFileNotFoundError, CodeNavigationVersionNotFoundError, CodeNavigationValidationError, CodeNavigationFeatureFlagRequiredError, CodeNavigationNetworkError, CodeNavigationBackendError, DEFAULT_MCP_URL, DEFAULT_API_URL, DEFAULT_CODE_NAV_URL, getCodeNavigationUrl, ExecServiceImpl, FileSystemServiceImpl, AuthStorageLockTimeoutError, AuthStoragePolicyError, PackageIntelligenceAccessError, PackageIntelligenceFeatureFlagRequiredError, PackageIntelligenceNetworkError, PackageIntelligenceBackendError, PackageIntelligenceGraphQLError, PackageIntelligenceTargetNotFoundError, PackageIntelligenceValidationError, PackageIntelligenceVersionNotFoundError, MalformedPackageIntelligenceResponseError, PackageIntelligenceChangelogSourceNotFoundError, PromptServiceImpl, refreshExpiredToken, NpmRegistryUpdateCheckService, shouldRunUpdateCheck, shouldRunRequiredUpdateEnforcement, formatUpdateNotice, formatRequiredUpdateNotice, loadAutoLoginAuthSessionMetadata, clearAutoLoginAuthSessionMetadata, createAuthCommandDependencies, createAuthStatusDependencies, createContainer };

package/gemini-extension.json

@@ -1,6 +1,6 @@
 {
   "name": "githits",
-  "version": "0.4.8",
+  "version": "0.4.10",
   "description": "Code examples from global open source for developers and AI assistants.",
   "mcpServers": {
     "githits": {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "githits",
   "description": "CLI companion for GitHits - code examples from global open source for developers and AI assistants",
-  "version": "0.4.8",
+  "version": "0.4.10",
   "type": "module",
   "files": [
     "dist",