bitfab-cli 0.2.12 → 0.2.14

package/dist/index.js

@@ -7652,9 +7652,6 @@ async function createStudioSession({ serviceUrl, apiKey, sessionId, initialPath
   return { sessionId, serviceUrl };
 }
 
-// ../bitfab-plugin-lib/dist/commands/login.js
-import crypto5 from "crypto";
-
 // ../bitfab-plugin-lib/dist/analytics.js
 async function reportHandoff(apiKey, pluginVersion, platform2, body) {
   const config2 = getConfig();
@@ -7676,6 +7673,9 @@ async function reportHandoff(apiKey, pluginVersion, platform2, body) {
   }
 }
 
+// ../bitfab-plugin-lib/dist/commands/openStudioTo.js
+import crypto4 from "crypto";
+
 // ../bitfab-plugin-lib/dist/frontmostApp.js
 import { execFileSync as execFileSync2, spawn as spawn2 } from "child_process";
 import os8 from "os";
@@ -7821,14 +7821,42 @@ function recordFocus() {
   return () => focusApp(frontmost);
 }
 
-// ../bitfab-plugin-lib/dist/commands/openStudioTo.js
-import crypto4 from "crypto";
-
 // ../bitfab-plugin-lib/dist/commands/loginForSession.js
 var LOGIN_TIMEOUT_MS = 10 * 60 * 1e3;
+var SESSION_READY_TIMEOUT_MS = 3e4;
+var SESSION_READY_POLL_MS = 500;
+async function waitForSessionReady(opts) {
+  const deadline = Date.now() + SESSION_READY_TIMEOUT_MS;
+  let since = null;
+  while (Date.now() < deadline) {
+    try {
+      const url2 = new URL(`${opts.serviceUrl}/api/studio/events`);
+      url2.searchParams.set("session", opts.sessionId);
+      if (since) {
+        url2.searchParams.set("since", since);
+      }
+      const res = await fetch(url2.toString(), {
+        headers: { Authorization: `Bearer ${opts.apiKey}` }
+      });
+      if (res.ok) {
+        const body = await res.json();
+        for (const event of body.events) {
+          since = event.id;
+          if (event.type === "studio:session-started") {
+            return;
+          }
+        }
+      }
+    } catch {
+    }
+    await new Promise((resolve) => setTimeout(resolve, SESSION_READY_POLL_MS));
+  }
+  console.error("Warning: Studio session did not confirm readiness within 30s. Proceeding anyway.");
+}
 
 // ../bitfab-plugin-lib/dist/commands/openStudioTo.js
 var SESSION_CLOSE_GRACE_PERIOD_MS = 1e4;
+var LOGIN_TIMEOUT_MS2 = 10 * 60 * 1e3;
 var StudioNavigationError = class extends Error {
   reason;
   blockedReason;
@@ -7847,9 +7875,45 @@ async function openStudioTo(path14, opts) {
   };
   const restoreFocus = recordFocus();
   if (!opts.apiKey) {
-    const separator = path14.includes("?") ? "&" : "?";
-    const url2 = `${opts.serviceUrl}${path14}${separator}session=${encodeURIComponent(sessionId)}`;
-    openChromelessWindow(url2);
+    const targetWithSession = `${path14}${path14.includes("?") ? "&" : "?"}session=${encodeURIComponent(sessionId)}&pluginLogin=true`;
+    const signInUrl = `${opts.serviceUrl}/studio/sign-in?redirect_url=${encodeURIComponent(targetWithSession)}`;
+    openChromelessWindow(signInUrl);
+    opts.onLoginRequired?.(sessionId);
+    const abortController = new AbortController();
+    const timer = setTimeout(() => abortController.abort(), LOGIN_TIMEOUT_MS2);
+    const keepalive = setInterval(() => process.stderr.write(""), 3e4);
+    let apiKey;
+    try {
+      apiKey = await pollLoginEvents({
+        serviceUrl: opts.serviceUrl,
+        sessionId,
+        abortSignal: abortController.signal
+      });
+    } catch (err) {
+      clearTimeout(timer);
+      clearInterval(keepalive);
+      throw err;
+    }
+    clearTimeout(timer);
+    clearInterval(keepalive);
+    saveCredentials(apiKey);
+    opts.onAuthenticated?.(sessionId);
+    if (opts.onEvent) {
+      await waitForSessionReady({
+        serviceUrl: opts.serviceUrl,
+        apiKey,
+        sessionId
+      });
+      writeActiveStudioSession({ sessionId, serviceUrl: opts.serviceUrl });
+      const poller2 = startEventPoller(opts.serviceUrl, apiKey, sessionId, opts.onEvent, restoreFocus);
+      return {
+        sessionId,
+        serviceUrl: opts.serviceUrl,
+        opened: true,
+        ...poller2
+      };
+    }
+    restoreFocus();
     return {
       sessionId,
       serviceUrl: opts.serviceUrl,
@@ -7965,7 +8029,6 @@ function startEventPoller(serviceUrl, apiKey, sessionId, onEvent, restoreFocus)
 }
 
 // ../bitfab-plugin-lib/dist/commands/login.js
-var LOGIN_TIMEOUT_MS2 = 10 * 60 * 1e3;
 async function verifyToken(serviceUrl, token) {
   try {
     const res = await fetch(`${serviceUrl}/api/plugin/whoami`, {
@@ -7982,75 +8045,32 @@ async function verifyToken(serviceUrl, token) {
 async function runLogin(platform2, pluginVersion, options) {
   const exitOnComplete = options?.exitOnComplete ?? true;
   const config2 = getConfig();
-  const restoreFocus = recordFocus();
-  const sessionId = crypto5.randomUUID();
-  const redirectPath = `/studio/close?pluginLogin=true&session=${sessionId}&autoClose=true&message=${encodeURIComponent("Login complete")}`;
-  const signInPath = `/studio/sign-in?redirect_url=${encodeURIComponent(redirectPath)}`;
   console.log("\nOpening Studio to sign in...");
   console.log("(If the browser didn't open, visit the Studio URL manually.)");
+  const closePath = `/studio/close?pluginLogin=true&autoClose=true&message=${encodeURIComponent("Login complete")}`;
   try {
-    await openStudioTo(signInPath, {
-      apiKey: hasCredentials() ? config2.apiKey : null,
-      serviceUrl: config2.serviceUrl,
-      sessionId
+    const result = await openStudioTo(closePath, {
+      serviceUrl: config2.serviceUrl
     });
-  } catch (err) {
-    if (err instanceof StudioNavigationError) {
-      await openStudioTo(signInPath, {
-        apiKey: null,
-        serviceUrl: config2.serviceUrl,
-        sessionId
+    result.abort();
+    const apiKey = getConfig().apiKey;
+    if (apiKey) {
+      await reportHandoff(apiKey, pluginVersion, platform2, {
+        flow: "auth.login",
+        wonBy: "studio",
+        loopbackAvailable: false,
+        ticketAvailable: false
       });
-    } else {
-      throw err;
-    }
-  }
-  const abortController = new AbortController();
-  let loginTimer;
-  const timeoutPromise = new Promise((_resolve, reject) => {
-    loginTimer = setTimeout(() => {
-      abortController.abort();
-      reject(new Error("Authentication timed out after 10 minutes. Run login again."));
-    }, LOGIN_TIMEOUT_MS2);
-  });
-  const keepaliveTimer = setInterval(() => {
-    process.stdout.write("");
-  }, 3e4);
-  try {
-    const token = await Promise.race([
-      pollLoginEvents({
-        serviceUrl: config2.serviceUrl,
-        sessionId,
-        abortSignal: abortController.signal
-      }),
-      timeoutPromise
-    ]);
-    if (loginTimer) {
-      clearTimeout(loginTimer);
-    }
-    clearInterval(keepaliveTimer);
-    saveCredentials(token);
-    await reportHandoff(token, pluginVersion, platform2, {
-      flow: "auth.login",
-      wonBy: "studio",
-      loopbackAvailable: false,
-      ticketAvailable: false
-    });
-    restoreFocus();
-    const who = await verifyToken(config2.serviceUrl, token);
-    const greeting = who?.user.email ? `Logged in as ${who.user.email}.` : "Authentication successful.";
-    console.log(`
+      const who = await verifyToken(config2.serviceUrl, apiKey);
+      const greeting = who?.user.email ? `Logged in as ${who.user.email}.` : "Authentication successful.";
+      console.log(`
 ${greeting}`);
-    console.log("Bitfab MCP tools are now active. (via studio)");
+      console.log("Bitfab MCP tools are now active. (via studio)");
+    }
     if (exitOnComplete) {
       process.exit(0);
     }
   } catch (err) {
-    if (loginTimer) {
-      clearTimeout(loginTimer);
-    }
-    clearInterval(keepaliveTimer);
-    abortController.abort();
     if (exitOnComplete) {
       console.error(`
 ${err.message}`);
@@ -8072,7 +8092,7 @@ function runLogout() {
 }
 
 // ../bitfab-plugin-lib/dist/commands/openTracePlan.js
-import crypto6 from "crypto";
+import crypto5 from "crypto";
 var OPEN_TRACE_PLAN_TIMEOUT_MS = 30 * 60 * 1e3;
 
 // ../bitfab-plugin-lib/dist/commands/persistReplayLabels.js
@@ -21873,10 +21893,10 @@ var inputFileSchema = external_exports.object({
 });
 
 // ../bitfab-plugin-lib/dist/commands/startDataset.js
-import crypto7 from "crypto";
+import crypto6 from "crypto";
 
 // ../bitfab-plugin-lib/dist/commands/startTemplatePreview.js
-import crypto8 from "crypto";
+import crypto7 from "crypto";
 
 // ../bitfab-plugin-lib/dist/activePreviewSession.js
 import fs8 from "fs";

package/package.json

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