bitfab-cli 0.2.33 → 0.2.34

package/dist/index.js

@@ -6971,6 +6971,39 @@ async function pollLoginEvents(opts) {
   }
   throw new Error("Login polling aborted");
 }
+async function fetchStreamTip(client) {
+  const PAGE_LIMIT = 500;
+  const MAX_PAGES = 10;
+  let tip;
+  try {
+    for (let page = 0; page < MAX_PAGES; page++) {
+      const url2 = new URL(`${client.serviceUrl}/api/studio/events`);
+      url2.searchParams.set("session", client.sessionId);
+      url2.searchParams.set("limit", String(PAGE_LIMIT));
+      if (tip) {
+        url2.searchParams.set("since", tip);
+      }
+      const res = await fetch(url2.toString(), {
+        headers: { Authorization: `Bearer ${client.apiKey}` }
+      });
+      if (!res.ok) {
+        return tip;
+      }
+      const body = await res.json();
+      const events = body.events ?? [];
+      const last = events.at(-1)?.id;
+      if (!last) {
+        return tip;
+      }
+      tip = last;
+      if (events.length < PAGE_LIMIT) {
+        return tip;
+      }
+    }
+  } catch {
+  }
+  return tip;
+}
 async function navigateStudio(client, path15) {
   if (!isValidStudioRoute(path15)) {
     throw new Error(`Studio route not allowed: ${path15}`);
@@ -6982,7 +7015,7 @@ async function navigateStudio(client, path15) {
 }
 var STUDIO_NAVIGATE_ACK_TIMEOUT_MS = 12e3;
 var PING_PONG_TIMEOUT_MS = 5e3;
-function awaitNavigateAck(client, path15, ackTimeoutMs) {
+function awaitNavigateAck(client, path15, ackTimeoutMs, startCursor) {
   const abortController = new AbortController();
   let timer = null;
   const result = new Promise((resolve) => {
@@ -6995,6 +7028,12 @@ function awaitNavigateAck(client, path15, ackTimeoutMs) {
       serviceUrl: client.serviceUrl,
       apiKey: client.apiKey,
       sessionId: client.sessionId,
+      // Only a FRESH ack counts: polling from the stream start would match a
+      // historical `studio:navigated` for the same path (sessions revisit the
+      // same routes constantly), false-acking a navigation a dead or
+      // disconnected window never processed — masking exactly the
+      // unreachable-window case that must gate.
+      startCursor,
       abortSignal: abortController.signal,
       onEvent: (event) => {
         if (event.type === "studio:navigated" && event.data.path === pathOnly) {
@@ -7017,11 +7056,11 @@ function awaitNavigateAck(client, path15, ackTimeoutMs) {
           abortController.abort();
           return;
         }
-        if (event.type === "studio:session-ended" || event.type === "studio:session-closed") {
+        if (event.type === "studio:window-closed") {
           if (timer) {
             clearTimeout(timer);
           }
-          resolve({ acked: false, reason: "session-ended" });
+          resolve({ acked: false, reason: "window-closed" });
           abortController.abort();
         }
       },
@@ -7075,12 +7114,13 @@ async function navigateStudioAndAwaitAck(client, path15, opts = {}) {
   if (!isValidStudioRoute(path15)) {
     return { acked: false, reason: "invalid-route" };
   }
+  const startCursor = await fetchStreamTip(client);
   try {
     await navigateStudio(client, path15);
   } catch {
     return { acked: false, reason: "push-failed" };
   }
-  const result = await awaitNavigateAck(client, path15, ackTimeoutMs);
+  const result = await awaitNavigateAck(client, path15, ackTimeoutMs, startCursor);
   if (result.acked || result.reason !== "timeout") {
     return result;
   }
@@ -7374,7 +7414,8 @@ function readActiveStudioSessionRaw() {
         sessionId: parsed.sessionId,
         serviceUrl: parsed.serviceUrl,
         pid: parsed.pid,
-        startedAt: parsed.startedAt
+        startedAt: parsed.startedAt,
+        ...typeof parsed.windowPid === "number" ? { windowPid: parsed.windowPid } : {}
       };
     }
     return null;
@@ -7601,9 +7642,10 @@ function spawnDetached(command, args) {
   child.on("error", () => {
   });
   child.unref();
+  return child.pid ?? null;
 }
 function openChromiumApp(binaryPath, url2, sizeArgs) {
-  spawnDetached(binaryPath, [`--app=${url2}`, ...sizeArgs]);
+  return spawnDetached(binaryPath, [`--app=${url2}`, ...sizeArgs]);
 }
 function openOsDefault(url2) {
   const platform2 = os7.platform();
@@ -7630,7 +7672,7 @@ function shouldDisableChromelessWindows() {
 function openChromelessWindow(url2) {
   if (shouldDisableChromelessWindows()) {
     openOsDefault(url2);
-    return;
+    return null;
   }
   const browsers = getChromiumBrowsers();
   const defaultId = getDefaultBrowserId();
@@ -7639,22 +7681,21 @@ function openChromelessWindow(url2) {
   if (defaultChromium) {
     const binary = findExistingBinary(defaultChromium.binaryPaths);
     if (binary) {
-      openChromiumApp(binary, url2, sizeArgs);
-      return;
+      return openChromiumApp(binary, url2, sizeArgs);
     }
   }
   if (defaultId !== null && defaultChromium === null) {
     openOsDefault(url2);
-    return;
+    return null;
   }
   for (const browser of browsers) {
     const binary = findExistingBinary(browser.binaryPaths);
     if (binary) {
-      openChromiumApp(binary, url2, sizeArgs);
-      return;
+      return openChromiumApp(binary, url2, sizeArgs);
     }
   }
   openOsDefault(url2);
+  return null;
 }
 
 // ../bitfab-plugin-lib/dist/commands/createStudioSession.js
@@ -7678,10 +7719,14 @@ async function createStudioSession({ serviceUrl, apiKey, sessionId, initialPath
     sessionId,
     extraHeaders: clientHeaders
   });
-  writeActiveStudioSession({ sessionId, serviceUrl });
   const separator = initialPath.includes("?") ? "&" : "?";
   const url2 = `${serviceUrl}${initialPath}${separator}session=${encodeURIComponent(sessionId)}`;
-  openChromelessWindow(url2);
+  const windowPid = openChromelessWindow(url2);
+  writeActiveStudioSession({
+    sessionId,
+    serviceUrl,
+    windowPid: windowPid ?? void 0
+  });
   return { sessionId, serviceUrl };
 }
 
@@ -7887,7 +7932,7 @@ async function waitForSessionReady(opts) {
 }
 
 // ../bitfab-plugin-lib/dist/commands/openStudioTo.js
-var SESSION_CLOSE_GRACE_PERIOD_MS = 1e4;
+var WINDOW_CLOSE_GRACE_PERIOD_MS = 1e4;
 var LOGIN_TIMEOUT_MS = 10 * 60 * 1e3;
 var StudioNavigationError = class extends Error {
   reason;
@@ -7914,7 +7959,7 @@ async function openStudioTo(path15, opts = {}) {
     const redirectPath = `${path15}${separator}session=${encodeURIComponent(sessionId2)}&pluginLogin=true`;
     const signInPath = `/studio/sign-in?redirect_url=${encodeURIComponent(redirectPath)}`;
     const signInUrl = `${serviceUrl}${signInPath}&session=${encodeURIComponent(sessionId2)}`;
-    openChromelessWindow(signInUrl);
+    const windowPid = openChromelessWindow(signInUrl);
     opts.onLoginRequired?.(sessionId2, signInUrl);
     const abortController = new AbortController();
     const timer = setTimeout(() => abortController.abort(), LOGIN_TIMEOUT_MS);
@@ -7941,7 +7986,11 @@ async function openStudioTo(path15, opts = {}) {
         apiKey: loginApiKey,
         sessionId: sessionId2
       });
-      writeActiveStudioSession({ sessionId: sessionId2, serviceUrl });
+      writeActiveStudioSession({
+        sessionId: sessionId2,
+        serviceUrl,
+        windowPid: windowPid ?? void 0
+      });
       const poller2 = startEventPoller(serviceUrl, loginApiKey, sessionId2, opts.onEvent, restoreFocus);
       return {
         sessionId: sessionId2,
@@ -8001,71 +8050,73 @@ async function openStudioTo(path15, opts = {}) {
 function startEventPoller(serviceUrl, apiKey, sessionId, onEvent, restoreFocus) {
   const abortController = new AbortController();
   let graceTimer = null;
-  let sawSessionEnded = false;
+  let endedNotified = false;
   const clearGraceTimer = () => {
     if (graceTimer) {
       clearTimeout(graceTimer);
       graceTimer = null;
     }
   };
-  const terminate = (clear, baseEvent) => {
-    graceTimer = null;
-    if (clear) {
-      clearActiveStudioSession(sessionId);
+  const notifyEnded = (baseEvent) => {
+    if (!endedNotified) {
+      endedNotified = true;
+      restoreFocus();
+      onEvent({ ...baseEvent, type: "studio:session-ended" });
     }
-    restoreFocus();
-    onEvent({ ...baseEvent, type: "studio:session-ended" });
     abortController.abort();
   };
-  const done = pollAgentSessionEvents({
-    serviceUrl,
-    apiKey,
-    sessionId,
-    abortSignal: abortController.signal,
-    onEvent: (event) => {
-      if (event.type === "studio:session-closed") {
-        clearGraceTimer();
-        if (sawSessionEnded) {
-          terminate(true, event);
-        } else {
+  const done = (async () => {
+    const startCursor = await fetchStreamTip({ serviceUrl, apiKey, sessionId });
+    if (abortController.signal.aborted) {
+      return;
+    }
+    await pollAgentSessionEvents({
+      serviceUrl,
+      apiKey,
+      sessionId,
+      startCursor,
+      abortSignal: abortController.signal,
+      onEvent: (event) => {
+        if (event.type === "studio:window-closed") {
+          clearGraceTimer();
           graceTimer = setTimeout(() => {
-            terminate(true, event);
-          }, SESSION_CLOSE_GRACE_PERIOD_MS);
+            graceTimer = null;
+            clearActiveStudioSession(sessionId);
+            notifyEnded(event);
+          }, WINDOW_CLOSE_GRACE_PERIOD_MS);
+          return;
         }
-        return;
-      }
-      if (event.type === "studio:session-started") {
-        if (graceTimer) {
+        if (event.type === "studio:session-started") {
+          if (graceTimer) {
+            clearGraceTimer();
+            console.error("Studio reconnected after page refresh");
+          }
+          return;
+        }
+        if (event.type === "studio:session-ended") {
           clearGraceTimer();
-          console.error("Studio reconnected after page refresh");
+          notifyEnded(event);
+          return;
         }
-        sawSessionEnded = false;
-        return;
-      }
-      if (event.type === "studio:session-ended") {
-        sawSessionEnded = true;
-        if (!graceTimer) {
-          graceTimer = setTimeout(() => {
-            terminate(false, event);
-          }, SESSION_CLOSE_GRACE_PERIOD_MS);
+        if (event.type === "studio:session-closed") {
+          return;
+        }
+        if (event.type === "studio:not-member") {
+          restoreFocus();
+          onEvent(event);
+          abortController.abort();
+          return;
+        }
+        if (event.type === "studio:return-to-agent" || event.type === "studio:edit-with-agent") {
+          restoreFocus();
         }
-        return;
-      }
-      if (event.type === "studio:not-member") {
-        restoreFocus();
         onEvent(event);
-        abortController.abort();
-        return;
-      }
-      if (event.type === "studio:return-to-agent" || event.type === "studio:edit-with-agent") {
-        restoreFocus();
+      },
+      onError: (err) => {
+        console.error(`studio agent-event poll: ${err.message}`);
       }
-      onEvent(event);
-    },
-    onError: (err) => {
-      console.error(`studio agent-event poll: ${err.message}`);
-    }
-  }).catch((err) => {
+    });
+  })().catch((err) => {
     if (!abortController.signal.aborted) {
       console.error(`studio agent-event poll terminated: ${err.message}`);
     }

package/package.json

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