bitfab-cli 0.2.75 → 0.2.77

package/dist/index.js

@@ -6801,10 +6801,6 @@ var require_dist = __commonJS({
 // src/index.ts
 import { cancel as cancel2 } from "@clack/prompts";
 
-// src/init.ts
-import { execSync as execSync3 } from "child_process";
-import * as p4 from "@clack/prompts";
-
 // ../bitfab-plugin-lib/dist/errors.js
 var NotAuthenticatedError = class extends Error {
   constructor(message) {
@@ -7614,7 +7610,7 @@ function printBlockingNotice(until) {
 
 // ../bitfab-plugin-lib/dist/studioTeardown.js
 var WINDOW_CLOSE_GRACE_PERIOD_MS = 1e4;
-function createWindowCloseArbiter(handlers) {
+function createWindowCloseArbiter(handlers, graceMs = WINDOW_CLOSE_GRACE_PERIOD_MS) {
   let graceTimer = null;
   const cancel3 = () => {
     if (graceTimer) {
@@ -7629,7 +7625,7 @@ function createWindowCloseArbiter(handlers) {
         graceTimer = setTimeout(() => {
           graceTimer = null;
           handlers.onConfirmed(event);
-        }, WINDOW_CLOSE_GRACE_PERIOD_MS);
+        }, graceMs);
         return;
       }
       if (event.type === "studio:session-started" && graceTimer) {
@@ -8196,6 +8192,11 @@ async function openStudioTo(path15, opts = {}) {
     const signInPath = `/studio/sign-in?redirect_url=${encodeURIComponent(redirectPath)}`;
     const signInUrl = `${serviceUrl}${signInPath}&session=${encodeURIComponent(sessionId2)}`;
     const windowPid = openChromelessWindow(signInUrl);
+    writeActiveStudioSession({
+      sessionId: sessionId2,
+      serviceUrl,
+      windowPid: windowPid ?? void 0
+    });
     opts.onLoginRequired?.(sessionId2, signInUrl);
     const abortController = new AbortController();
     const timer = setTimeout(() => abortController.abort(), LOGIN_TIMEOUT_MS);
@@ -8222,11 +8223,6 @@ async function openStudioTo(path15, opts = {}) {
         apiKey: loginApiKey,
         sessionId: sessionId2
       });
-      writeActiveStudioSession({
-        sessionId: sessionId2,
-        serviceUrl,
-        windowPid: windowPid ?? void 0
-      });
       const poller2 = startEventPoller(serviceUrl, loginApiKey, sessionId2, opts.onEvent, restoreFocus, { claim: opts.monitor !== "wait" });
       return {
         sessionId: sessionId2,
@@ -8395,7 +8391,7 @@ function awaitReauthLogin(args) {
     });
   });
 }
-function startEventPoller(serviceUrl, apiKey, sessionId, onEvent, restoreFocus, { claim = true } = {}) {
+function startEventPoller(serviceUrl, apiKey, sessionId, onEvent, restoreFocus, { claim = true, fromStreamStart = false, graceMs, forceClear = false } = {}) {
   printBlockingNotice(BLOCKING_NOTICE_UNTIL);
   if (claim) {
     claimStudioMonitor();
@@ -8418,15 +8414,19 @@ function startEventPoller(serviceUrl, apiKey, sessionId, onEvent, restoreFocus,
   };
   const arbiter = createWindowCloseArbiter({
     onConfirmed: (event) => {
-      clearActiveStudioSession(sessionId);
+      if (forceClear) {
+        clearActiveStudioSession(sessionId, { force: true });
+      } else {
+        clearActiveStudioSession(sessionId);
+      }
       notifyEnded(event);
     },
     onRefuted: () => {
       console.error("Studio reconnected after page refresh");
     }
-  });
+  }, graceMs);
   const done = (async () => {
-    const startCursor = await fetchStreamTip({ serviceUrl, apiKey, sessionId });
+    const startCursor = fromStreamStart ? void 0 : await fetchStreamTip({ serviceUrl, apiKey, sessionId });
     if (abortController.signal.aborted) {
       return;
     }
@@ -8479,8 +8479,62 @@ function startEventPoller(serviceUrl, apiKey, sessionId, onEvent, restoreFocus,
     done
   };
 }
+var LOGIN_MONITOR_DRAIN_MS = 8e3;
+async function runLoginWindowMonitor(sessionId) {
+  const config2 = getConfig();
+  const apiKey = config2.apiKey;
+  if (!apiKey) {
+    return;
+  }
+  const poller = startEventPoller(
+    config2.serviceUrl,
+    apiKey,
+    sessionId,
+    () => {
+    },
+    () => {
+    },
+    // claim: false — this is a transient cleanup reader with a no-op event
+    // handler, NOT the session's real monitor. If it claimed the lock, a
+    // subsequent `openStudioTo` reuse with monitor:"start" (e.g. a flow's
+    // backgrounded open right after a PARKED login) would lose the atomic
+    // claim, assume a live monitor is forwarding events, and fire-and-exit —
+    // leaving the session with no real monitor while this one forwards
+    // nothing. Reading without claiming lets it clean up the pointer
+    // (window-closed → clear) without shadowing the real monitor.
+    //
+    // forceClear: the clear runs in a detached child while the login/init
+    // parent that WROTE the pointer may still be alive (init keeps running with
+    // exitOnComplete:false, even spawnSync-ing the editor), so a non-force clear
+    // would be refused by the writer-alive guard and the closed window's
+    // pointer would leak. Safe — the clear still matches on the unique
+    // sessionId.
+    { claim: false, fromStreamStart: true, graceMs: 0, forceClear: true }
+  );
+  let drainTimer;
+  const drain = new Promise((resolve) => {
+    drainTimer = setTimeout(resolve, LOGIN_MONITOR_DRAIN_MS);
+  });
+  await Promise.race([poller.done, drain]);
+  if (drainTimer) {
+    clearTimeout(drainTimer);
+  }
+  poller.abort();
+}
 
 // ../bitfab-plugin-lib/dist/commands/login.js
+function trySpawnDetachedMonitor(sessionId) {
+  try {
+    const pid = spawnDetached(process.execPath, [
+      ...process.argv.slice(1),
+      "--drain",
+      sessionId
+    ]);
+    return pid != null;
+  } catch {
+    return false;
+  }
+}
 async function verifyToken(serviceUrl, token) {
   try {
     const res = await fetch(`${serviceUrl}/api/plugin/whoami`, {
@@ -8496,6 +8550,18 @@ async function verifyToken(serviceUrl, token) {
 }
 async function runLogin(platform2, pluginVersion, options) {
   const exitOnComplete = options?.exitOnComplete ?? true;
+  const drainIdx = process.argv.indexOf("--drain");
+  if (drainIdx !== -1) {
+    const sessionId = process.argv[drainIdx + 1];
+    if (!sessionId) {
+      throw new Error("--drain requires a sessionId argument");
+    }
+    await runLoginWindowMonitor(sessionId);
+    if (exitOnComplete) {
+      process.exit(0);
+    }
+    return;
+  }
   const force = options?.force ?? process.argv.includes("--force");
   const config2 = getConfig();
   if (!force && hasCredentials() && config2.apiKey) {
@@ -8510,7 +8576,6 @@ Already logged in as ${identity}. Run the login command with --force to re-authe
       return;
     }
   }
-  console.error("NOTE: this command blocks until sign-in completes in the browser (10-minute timeout).");
   console.log("\nOpening Studio to sign in...");
   try {
     const result = await openStudioTo("/studio", {
@@ -8522,7 +8587,6 @@ If the browser didn't open, visit this URL manually:
 ${signInUrl}`);
       }
     });
-    result.abort();
     const apiKey = getConfig().apiKey;
     if (apiKey) {
       await reportHandoff(apiKey, pluginVersion, platform2, {
@@ -8537,6 +8601,9 @@ ${signInUrl}`);
 ${greeting}`);
       console.log("Bitfab MCP tools are now active. (via studio)");
     }
+    if (!trySpawnDetachedMonitor(result.sessionId)) {
+      await runLoginWindowMonitor(result.sessionId);
+    }
     if (exitOnComplete) {
       process.exit(0);
     }
@@ -27780,6 +27847,10 @@ var McpZodTypeKind;
 // ../node_modules/.pnpm/@modelcontextprotocol+sdk@1.29.0_@cfworker+json-schema@4.1.1_zod@4.3.6/node_modules/@modelcontextprotocol/sdk/dist/esm/server/stdio.js
 import process3 from "process";
 
+// src/init.ts
+import { execSync as execSync3 } from "child_process";
+import * as p4 from "@clack/prompts";
+
 // src/claude.ts
 import { spawnSync } from "child_process";
 import fs15 from "fs";
@@ -28423,7 +28494,22 @@ function parseArgs2(argv) {
   }
   return { command, editor, skipPermissions, rest };
 }
+async function handleDrainArg(argv) {
+  const drainIdx = argv.indexOf("--drain");
+  if (drainIdx === -1) {
+    return false;
+  }
+  const sessionId = argv[drainIdx + 1];
+  if (!sessionId) {
+    throw new Error("--drain requires a sessionId argument");
+  }
+  await runLoginWindowMonitor(sessionId);
+  return true;
+}
 async function main() {
+  if (await handleDrainArg(process.argv)) {
+    return;
+  }
   const { command, editor, skipPermissions, rest } = parseArgs2(
     process.argv.slice(2)
   );
@@ -28480,5 +28566,6 @@ main().catch((err) => {
   process.exit(1);
 });
 export {
+  handleDrainArg,
   parseArgs2 as parseArgs
 };

package/package.json

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