@great-arrow/cli 0.1.50 → 0.1.51

package/dist/index.js

@@ -9399,7 +9399,7 @@ function isNodeError(value) {
 
 // src/lib/version.ts
 var CLI_PACKAGE_NAME = "@great-arrow/cli";
-var CLI_VERSION = "0.1.50";
+var CLI_VERSION = "0.1.51";
 var GAD_INSTALL_VERSION = "2026.08.08";
 var GAD_INSTALL_MIN_VERSION = "2026.06.22";
 var GAD_INSTALL_HEADER = "X-GAD-Install-Version";
@@ -10414,14 +10414,14 @@ async function storedPairOtherThan(ours) {
     debugSwallow("refresh.reread", err);
   }
   if (stored?.kind !== "oauth") return null;
+  if (stored.credential.clientId !== ours.clientId || stored.credential.apiUrl.replace(/\/$/, "") !== ours.apiUrl.replace(/\/$/, "")) {
+    throw networkError(
+      "The stored session changed while renewing it.",
+      "Retry the command with the current session."
+    );
+  }
   return stored.credential.refreshToken === ours.refreshToken ? null : stored.credential;
 }
-async function rotatedByAnotherProcess(ours) {
-  const theirs = await storedPairOtherThan(ours);
-  if (!theirs) return null;
-  if (Date.now() >= theirs.accessExpiresAt - REFRESH_SKEW_MS) return null;
-  return theirs;
-}
 async function resolveAuth() {
   const config = await loadConfig();
   const configApiUrl = config.api_url || DEFAULT_API_URL;
@@ -10512,20 +10512,37 @@ async function ensureFreshAccessToken(credential) {
 }
 async function doRefresh(credential) {
   const held = await acquireRefreshLock();
+  let current = credential;
   try {
-    const theirs = await rotatedByAnotherProcess(credential);
-    if (theirs) return theirs;
+    const theirs = await storedPairOtherThan(credential);
+    if (theirs) {
+      current = theirs;
+      if (Date.now() < current.accessExpiresAt - REFRESH_SKEW_MS)
+        return current;
+    }
+    if (!held) {
+      throw networkError(
+        "Session renewal is already in progress.",
+        "Retry shortly; your saved session has been kept."
+      );
+    }
     const refreshed = await refreshTokens({
-      apiUrl: credential.apiUrl,
-      clientId: credential.clientId,
-      refreshToken: credential.refreshToken
+      apiUrl: current.apiUrl,
+      clientId: current.clientId,
+      refreshToken: current.refreshToken
     });
     await saveOAuthCredential(refreshed);
     return refreshed;
   } catch (err) {
     if (err instanceof RefreshRejected) {
-      const theirs = await storedPairOtherThan(credential);
-      if (theirs) return theirs;
+      const theirs = await storedPairOtherThan(current);
+      if (theirs) {
+        if (Date.now() < theirs.accessExpiresAt) return theirs;
+        throw networkError(
+          "Another process updated the session during renewal.",
+          "Retry shortly; your saved session has been kept."
+        );
+      }
       await clearStoredCredential();
       throw sessionExpired();
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@great-arrow/cli",
-  "version": "0.1.50",
+  "version": "0.1.51",
   "description": "GreatArrow.ai CLI tool",
   "type": "module",
   "bin": {