@tostudy-ai/cli 0.18.22 → 0.18.23

package/dist/main.js

@@ -1325,11 +1325,27 @@ import path2 from "node:path";
 import { chmod, readFile, rm, writeFile } from "node:fs/promises";
 import { execFile } from "node:child_process";
 import { promisify } from "node:util";
-function fileBelongsTo(secrets, owner) {
+function identityOf(secrets) {
+  if (secrets.userId) return { userId: secrets.userId, sessionId: secrets.sessionId };
+  try {
+    const claims = JSON.parse(
+      Buffer.from(secrets.accessToken.split(".")[1] ?? "", "base64url").toString("utf-8")
+    );
+    if (typeof claims.userId !== "string") return null;
+    return {
+      userId: claims.userId,
+      ...typeof claims.sid === "string" ? { sessionId: claims.sid } : {}
+    };
+  } catch {
+    return null;
+  }
+}
+function belongsTo(secrets, owner) {
   if (!owner) return true;
-  if (!secrets.userId) return false;
-  if (secrets.userId !== owner.userId) return false;
-  if (secrets.sessionId && owner.sessionId && secrets.sessionId !== owner.sessionId) return false;
+  const identity = identityOf(secrets);
+  if (!identity) return null;
+  if (identity.userId !== owner.userId) return false;
+  if (identity.sessionId && owner.sessionId && identity.sessionId !== owner.sessionId) return false;
   return true;
 }
 function getStoreKey(configDir) {
@@ -1413,10 +1429,9 @@ async function loadStoredSessionSecrets(configDir, owner) {
     let legacyFile = null;
     try {
       const fromFile = await loadFallback(configDir);
-      if (fromFile && fileBelongsTo(fromFile, owner)) {
-        return fromFile;
-      }
-      if (fromFile && !fromFile.userId) legacyFile = fromFile;
+      const verdict = fromFile && belongsTo(fromFile, owner);
+      if (fromFile && verdict === true) return fromFile;
+      if (fromFile && verdict === null) legacyFile = fromFile;
     } catch {
     }
     try {
@@ -1428,7 +1443,8 @@ async function loadStoredSessionSecrets(configDir, owner) {
         account,
         "-w"
       ]);
-      return JSON.parse(stdout2.trim());
+      const fromKeychain = JSON.parse(stdout2.trim());
+      return belongsTo(fromKeychain, owner) === false ? legacyFile : fromKeychain;
     } catch {
       return legacyFile;
     }
@@ -3790,7 +3806,7 @@ import { spawn } from "node:child_process";
 import { hostname } from "node:os";
 
 // src/version.ts
-var CLI_VERSION = true ? "0.18.22" : "0.7.1";
+var CLI_VERSION = true ? "0.18.23" : "0.7.1";
 
 // src/installer/mcp-setup.ts
 function safeServerError(text2) {