bitfab-cli 0.2.31 → 0.2.32

package/dist/index.js

@@ -7347,49 +7347,35 @@ function isProcessAlive(pid) {
     return err.code === "EPERM";
   }
 }
-function stampActiveStudioSession(sessionId, field) {
-  try {
-    const current = readActiveStudioSessionRaw();
-    if (!current || current.sessionId !== sessionId || current[field]) {
-      return;
-    }
-    if (current.pid !== process.pid && isProcessAlive(current.pid)) {
-      return;
-    }
-    writeRecord({ ...current, [field]: (/* @__PURE__ */ new Date()).toISOString() });
-  } catch {
-  }
-}
-function markActiveStudioSessionClosed(sessionId) {
-  stampActiveStudioSession(sessionId, "closedAt");
-}
-function markActiveStudioSessionEnded(sessionId) {
-  stampActiveStudioSession(sessionId, "endedAt");
-}
-function reactivateActiveStudioSession(sessionId) {
+function clearActiveStudioSession(sessionId, opts = {}) {
   try {
     const current = readActiveStudioSessionRaw();
     if (!current || current.sessionId !== sessionId) {
-      return;
+      return false;
     }
-    if (!current.endedAt && !current.closedAt) {
-      return;
+    if (!opts.force && current.pid !== process.pid && isProcessAlive(current.pid)) {
+      return false;
     }
-    writeRecord({
-      sessionId: current.sessionId,
-      serviceUrl: current.serviceUrl,
-      pid: current.pid,
-      startedAt: current.startedAt
-    });
+    fs6.unlinkSync(filePath());
+    return true;
   } catch {
+    return false;
   }
 }
 function readActiveStudioSessionRaw() {
   try {
     const raw = fs6.readFileSync(filePath(), "utf-8");
     const parsed = JSON.parse(raw);
-    if (typeof parsed.sessionId === "string" && typeof parsed.serviceUrl === "string" && typeof parsed.pid === "number" && typeof parsed.startedAt === "string" && (parsed.closedAt === void 0 || typeof parsed.closedAt === "string") && (parsed.endedAt === void 0 || typeof parsed.endedAt === "string")) {
-      return parsed;
+    if (parsed.closedAt != null || parsed.endedAt != null) {
+      return null;
+    }
+    if (typeof parsed.sessionId === "string" && typeof parsed.serviceUrl === "string" && typeof parsed.pid === "number" && typeof parsed.startedAt === "string") {
+      return {
+        sessionId: parsed.sessionId,
+        serviceUrl: parsed.serviceUrl,
+        pid: parsed.pid,
+        startedAt: parsed.startedAt
+      };
     }
     return null;
   } catch {
@@ -7915,26 +7901,29 @@ var StudioNavigationError = class extends Error {
     this.name = "StudioNavigationError";
   }
 };
-async function openStudioTo(path15, opts) {
-  const sessionId = opts.sessionId ?? crypto4.randomUUID();
+async function openStudioTo(path15, opts = {}) {
+  const config2 = getConfig();
+  const serviceUrl = config2.serviceUrl;
+  const apiKey = hasCredentials() ? config2.apiKey : null;
   const noop = () => {
   };
   const restoreFocus = recordFocus();
-  if (!opts.apiKey) {
+  if (!apiKey) {
+    const sessionId2 = crypto4.randomUUID();
     const separator = path15.includes("?") ? "&" : "?";
-    const redirectPath = `${path15}${separator}session=${encodeURIComponent(sessionId)}&pluginLogin=true`;
+    const redirectPath = `${path15}${separator}session=${encodeURIComponent(sessionId2)}&pluginLogin=true`;
     const signInPath = `/studio/sign-in?redirect_url=${encodeURIComponent(redirectPath)}`;
-    const signInUrl = `${opts.serviceUrl}${signInPath}&session=${encodeURIComponent(sessionId)}`;
+    const signInUrl = `${serviceUrl}${signInPath}&session=${encodeURIComponent(sessionId2)}`;
     openChromelessWindow(signInUrl);
-    opts.onLoginRequired?.(sessionId, signInUrl);
+    opts.onLoginRequired?.(sessionId2, signInUrl);
     const abortController = new AbortController();
     const timer = setTimeout(() => abortController.abort(), LOGIN_TIMEOUT_MS);
     const keepalive = setInterval(() => process.stderr.write(""), 3e4);
-    let apiKey;
+    let loginApiKey;
     try {
-      apiKey = await pollLoginEvents({
-        serviceUrl: opts.serviceUrl,
-        sessionId,
+      loginApiKey = await pollLoginEvents({
+        serviceUrl,
+        sessionId: sessionId2,
         abortSignal: abortController.signal
       });
     } catch (err) {
@@ -7944,82 +7933,90 @@ async function openStudioTo(path15, opts) {
     }
     clearTimeout(timer);
     clearInterval(keepalive);
-    saveCredentials(apiKey);
-    opts.onAuthenticated?.(sessionId);
+    saveCredentials(loginApiKey);
+    opts.onAuthenticated?.(sessionId2);
     if (opts.onEvent) {
       await waitForSessionReady({
-        serviceUrl: opts.serviceUrl,
-        apiKey,
-        sessionId
+        serviceUrl,
+        apiKey: loginApiKey,
+        sessionId: sessionId2
       });
-      writeActiveStudioSession({ sessionId, serviceUrl: opts.serviceUrl });
-      const poller2 = startEventPoller(opts.serviceUrl, apiKey, sessionId, opts.onEvent, restoreFocus);
+      writeActiveStudioSession({ sessionId: sessionId2, serviceUrl });
+      const poller2 = startEventPoller(serviceUrl, loginApiKey, sessionId2, opts.onEvent, restoreFocus);
       return {
-        sessionId,
-        serviceUrl: opts.serviceUrl,
-        apiKey,
+        sessionId: sessionId2,
+        serviceUrl,
+        apiKey: loginApiKey,
         opened: true,
         ...poller2
       };
     }
     restoreFocus();
     return {
-      sessionId,
-      serviceUrl: opts.serviceUrl,
-      apiKey,
+      sessionId: sessionId2,
+      serviceUrl,
+      apiKey: loginApiKey,
       opened: true,
       abort: noop,
       done: Promise.resolve()
     };
   }
-  const active = opts.forceNew ? null : readActiveStudioSession();
-  const reachable = active && !active.closedAt ? active : null;
-  const existing = opts.sessionId != null && (reachable?.sessionId !== opts.sessionId || reachable?.serviceUrl !== opts.serviceUrl) ? null : reachable;
+  const existing = readActiveStudioSession();
   if (existing) {
     const client = {
       serviceUrl: existing.serviceUrl,
-      apiKey: opts.apiKey,
+      apiKey,
       sessionId: existing.sessionId
     };
     const ack = await navigateStudioAndAwaitAck(client, path15);
-    if (ack.acked) {
-      if (existing.endedAt != null || existing.closedAt != null) {
-        reactivateActiveStudioSession(existing.sessionId);
-      }
-      const poller2 = opts.onEvent ? startEventPoller(existing.serviceUrl, opts.apiKey, existing.sessionId, opts.onEvent, restoreFocus) : { abort: noop, done: Promise.resolve() };
-      return {
-        sessionId: existing.sessionId,
-        serviceUrl: existing.serviceUrl,
-        apiKey: opts.apiKey,
-        opened: false,
-        ...poller2
-      };
-    }
-    const tabGone = ack.reason === "session-ended" || ack.reason === "push-failed" || ack.reason === "timeout";
-    const canReopenSilently = tabGone && (existing.endedAt != null || opts.sessionId != null);
-    if (!canReopenSilently) {
+    if (!ack.acked) {
       throw new StudioNavigationError(ack.reason ?? "unknown", ack.blockedReason, existing.sessionId);
     }
+    const poller2 = opts.onEvent ? startEventPoller(existing.serviceUrl, apiKey, existing.sessionId, opts.onEvent, restoreFocus) : { abort: noop, done: Promise.resolve() };
+    return {
+      sessionId: existing.sessionId,
+      serviceUrl: existing.serviceUrl,
+      apiKey,
+      opened: false,
+      ...poller2
+    };
   }
+  const sessionId = crypto4.randomUUID();
   const session = await createStudioSession({
-    serviceUrl: opts.serviceUrl,
-    apiKey: opts.apiKey,
+    serviceUrl,
+    apiKey,
     sessionId,
     initialPath: path15,
     clientHeaders: opts.clientHeaders
   });
-  const poller = opts.onEvent ? startEventPoller(session.serviceUrl, opts.apiKey, session.sessionId, opts.onEvent, restoreFocus) : { abort: noop, done: Promise.resolve() };
+  const poller = opts.onEvent ? startEventPoller(session.serviceUrl, apiKey, session.sessionId, opts.onEvent, restoreFocus) : { abort: noop, done: Promise.resolve() };
   return {
     sessionId: session.sessionId,
     serviceUrl: session.serviceUrl,
-    apiKey: opts.apiKey,
+    apiKey,
     opened: true,
     ...poller
   };
 }
 function startEventPoller(serviceUrl, apiKey, sessionId, onEvent, restoreFocus) {
   const abortController = new AbortController();
-  let sessionEndGraceTimer = null;
+  let graceTimer = null;
+  let sawSessionEnded = false;
+  const clearGraceTimer = () => {
+    if (graceTimer) {
+      clearTimeout(graceTimer);
+      graceTimer = null;
+    }
+  };
+  const terminate = (clear, baseEvent) => {
+    graceTimer = null;
+    if (clear) {
+      clearActiveStudioSession(sessionId);
+    }
+    restoreFocus();
+    onEvent({ ...baseEvent, type: "studio:session-ended" });
+    abortController.abort();
+  };
   const done = pollAgentSessionEvents({
     serviceUrl,
     apiKey,
@@ -8027,35 +8024,31 @@ function startEventPoller(serviceUrl, apiKey, sessionId, onEvent, restoreFocus)
     abortSignal: abortController.signal,
     onEvent: (event) => {
       if (event.type === "studio:session-closed") {
-        if (sessionEndGraceTimer) {
-          return;
+        clearGraceTimer();
+        if (sawSessionEnded) {
+          terminate(true, event);
+        } else {
+          graceTimer = setTimeout(() => {
+            terminate(true, event);
+          }, SESSION_CLOSE_GRACE_PERIOD_MS);
         }
-        sessionEndGraceTimer = setTimeout(() => {
-          sessionEndGraceTimer = null;
-          markActiveStudioSessionClosed(sessionId);
-          restoreFocus();
-          onEvent({ ...event, type: "studio:session-ended" });
-          abortController.abort();
-        }, SESSION_CLOSE_GRACE_PERIOD_MS);
         return;
       }
       if (event.type === "studio:session-started") {
-        if (sessionEndGraceTimer) {
-          clearTimeout(sessionEndGraceTimer);
-          sessionEndGraceTimer = null;
+        if (graceTimer) {
+          clearGraceTimer();
           console.error("Studio reconnected after page refresh");
         }
+        sawSessionEnded = false;
         return;
       }
       if (event.type === "studio:session-ended") {
-        if (sessionEndGraceTimer) {
-          clearTimeout(sessionEndGraceTimer);
-          sessionEndGraceTimer = null;
+        sawSessionEnded = true;
+        if (!graceTimer) {
+          graceTimer = setTimeout(() => {
+            terminate(false, event);
+          }, SESSION_CLOSE_GRACE_PERIOD_MS);
         }
-        markActiveStudioSessionEnded(sessionId);
-        restoreFocus();
-        onEvent(event);
-        abortController.abort();
         return;
       }
       if (event.type === "studio:not-member") {
@@ -8101,7 +8094,6 @@ async function runLogin(platform2, pluginVersion, options) {
   const closePath = `/studio/close?autoClose=true&message=${encodeURIComponent("Login complete")}`;
   try {
     const result = await openStudioTo(closePath, {
-      serviceUrl: config2.serviceUrl,
       onLoginRequired: (_sessionId, signInUrl) => {
         console.log(`
 If the browser didn't open, visit this URL manually:

package/package.json

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