bitfab-cli 0.2.116 → 0.2.117

package/dist/index.js

@@ -10441,6 +10441,9 @@ function buildStudioSessionUrl(args) {
 }
 
 // ../bitfab-plugin-lib/dist/studioChannel.js
+function stripSessionId(path19, sessionId) {
+  return sessionId ? path19.split(sessionId).join("__SID__") : path19;
+}
 var DirectChannel = class {
   apiKey;
   serviceUrl;
@@ -10458,6 +10461,10 @@ var DirectChannel = class {
     if (!this.apiKey) {
       const sessionId2 = opts?.sessionId ?? crypto7.randomUUID();
       const initialPath = resolveStudioInitialPath(path19);
+      const live = readActiveStudioSession();
+      if (live && live.source === "direct" && !live.authenticated && live.windowState !== "closed" && live.serviceUrl === this.serviceUrl && live.currentPath != null && stripSessionId(live.currentPath, live.sessionId) === stripSessionId(initialPath, sessionId2)) {
+        return { sessionId: live.sessionId, opened: false };
+      }
       const url2 = buildStudioSessionUrl({
         serviceUrl: this.serviceUrl,
         path: initialPath,
@@ -10468,7 +10475,13 @@ var DirectChannel = class {
         sessionId: sessionId2,
         serviceUrl: this.serviceUrl,
         windowPid,
-        currentPath: initialPath
+        currentPath: initialPath,
+        // A keyless login window is pre-auth: writeActiveStudioSession defaults
+        // authenticated to true, but this window has no token yet. Record it as
+        // unauthenticated so the keyless reuse gate above (!live.authenticated)
+        // actually matches it, and so the login-completion flip to authenticated
+        // (openStudioTo) is what later excludes it from reuse.
+        authenticated: false
       });
       return { sessionId: sessionId2, opened: true };
     }
@@ -10482,6 +10495,7 @@ var DirectChannel = class {
       if (!ack.acked) {
         throw new StudioNavigationError(ack.reason ?? "unknown", ack.blockedReason, existing.sessionId);
       }
+      updateActiveStudioSession({ currentPath: path19 });
       return { sessionId: existing.sessionId, opened: false };
     }
     truncateStudioEventLog(resolveAgentSessionKey());
@@ -11047,17 +11061,20 @@ async function openStudioTo(path19, opts = {}) {
     };
   };
   if (!apiKey) {
-    const sessionId2 = crypto8.randomUUID();
     const destination = opts.freshWindowPath ?? path19;
     const destSeparator = destination.includes("?") ? "&" : "?";
-    const redirectPath = `${destination}${destSeparator}session=${encodeURIComponent(sessionId2)}&pluginLogin=true`;
-    const signInInitialPath = `/studio/sign-in?redirect_url=${encodeURIComponent(redirectPath)}&session=${encodeURIComponent(sessionId2)}`;
-    await channel.openOrNavigate(signInInitialPath, {
+    const buildSignInPath = (sid) => {
+      const redirectPath = `${destination}${destSeparator}session=${encodeURIComponent(sid)}&pluginLogin=true`;
+      return `/studio/sign-in?redirect_url=${encodeURIComponent(redirectPath)}&session=${encodeURIComponent(sid)}`;
+    };
+    const requestedSessionId = crypto8.randomUUID();
+    const openResult = await channel.openOrNavigate(buildSignInPath(requestedSessionId), {
       clientHeaders: opts.clientHeaders,
-      sessionId: sessionId2,
+      sessionId: requestedSessionId,
       focusTarget: focusTarget ?? void 0
     });
-    const signInUrl = `${serviceUrl}${signInInitialPath}`;
+    const sessionId2 = openResult.sessionId;
+    const signInUrl = `${serviceUrl}${buildSignInPath(sessionId2)}`;
     opts.onLoginRequired?.(sessionId2, signInUrl);
     const loginApiKey = await new Promise((resolve, reject) => {
       const timer = setTimeout(() => {
@@ -11081,9 +11098,10 @@ async function openStudioTo(path19, opts = {}) {
       });
     });
     saveCredentials(loginApiKey);
+    updateActiveStudioSession({ authenticated: true });
     opts.onAuthenticated?.(sessionId2);
     channel.setApiKey(loginApiKey);
-    return finish(sessionId2, true, loginApiKey);
+    return finish(sessionId2, openResult.opened, loginApiKey);
   }
   const { sessionId, opened } = await channel.openOrNavigate(path19, {
     clientHeaders: opts.clientHeaders,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bitfab-cli",
-  "version": "0.2.116",
+  "version": "0.2.117",
   "description": "Install and configure the Bitfab plugin in Claude Code, Codex, or Cursor.",
   "type": "module",
   "main": "dist/index.js",