bitfab-cli 0.2.49 → 0.2.51

package/dist/index.js

@@ -7418,6 +7418,7 @@ function buildBitfabRequestHeaders(apiKey, pluginVersion, platform2) {
 }
 
 // ../bitfab-plugin-lib/dist/activeStudioSession.js
+import { execFileSync as execFileSync2 } from "child_process";
 import crypto3 from "crypto";
 import fs6 from "fs";
 import os6 from "os";
@@ -7461,6 +7462,22 @@ function isProcessAlive(pid) {
     return err.code === "EPERM";
   }
 }
+function processStartToken(pid) {
+  try {
+    const out = execFileSync2("ps", ["-o", "lstart=", "-p", String(pid)], {
+      encoding: "utf-8",
+      stdio: ["ignore", "pipe", "ignore"],
+      // Bound it: a local `ps -p` is instant, but with no timeout a wedged `ps`
+      // (severe load, a stuck process table) could block the monitor claim. On
+      // timeout this throws, we return null, and the caller degrades to a plain
+      // liveness check — never a hang.
+      timeout: 2e3
+    }).trim();
+    return out || null;
+  } catch {
+    return null;
+  }
+}
 function clearActiveStudioSession(sessionId, opts = {}) {
   try {
     const current = readActiveStudioSessionRaw();
@@ -7500,6 +7517,92 @@ function readActiveStudioSessionRaw() {
 function readActiveStudioSession() {
   return readActiveStudioSessionRaw();
 }
+function monitorLockPath() {
+  return path5.join(os6.homedir(), ".config", "bitfab", `active-studio-session.${sessionScope()}.monitor.lock`);
+}
+function tryClaimStudioMonitor() {
+  const lock = monitorLockPath();
+  fs6.mkdirSync(path5.dirname(lock), { recursive: true });
+  for (let attempt = 0; attempt < 10; attempt++) {
+    try {
+      const fd = fs6.openSync(lock, "wx");
+      fs6.writeSync(fd, monitorLockBody(process.pid));
+      fs6.closeSync(fd);
+      stampMonitorPid();
+      return true;
+    } catch (err) {
+      if (err.code !== "EEXIST") {
+        throw err;
+      }
+      const owner = readLockOwner(lock);
+      if (owner?.pid === process.pid) {
+        return true;
+      }
+      if (owner && isMonitorOwnerLive(owner)) {
+        return false;
+      }
+      try {
+        fs6.unlinkSync(lock);
+      } catch {
+      }
+    }
+  }
+  stampMonitorPid();
+  return true;
+}
+function claimStudioMonitor() {
+  try {
+    const lock = monitorLockPath();
+    fs6.mkdirSync(path5.dirname(lock), { recursive: true });
+    fs6.writeFileSync(lock, monitorLockBody(process.pid));
+  } catch {
+  }
+  stampMonitorPid();
+}
+function releaseStudioMonitor() {
+  try {
+    const lock = monitorLockPath();
+    if (readLockOwner(lock)?.pid === process.pid) {
+      fs6.unlinkSync(lock);
+    }
+  } catch {
+  }
+}
+function monitorLockBody(pid) {
+  return `${pid}
+${processStartToken(pid) ?? ""}`;
+}
+function isMonitorOwnerLive(owner) {
+  if (!isProcessAlive(owner.pid)) {
+    return false;
+  }
+  if (!owner.start) {
+    return true;
+  }
+  const current = processStartToken(owner.pid);
+  if (current === null) {
+    return true;
+  }
+  return current === owner.start;
+}
+function readLockOwner(lock) {
+  try {
+    const [pidLine = "", ...rest] = fs6.readFileSync(lock, "utf-8").split("\n");
+    const pid = Number.parseInt(pidLine.trim(), 10);
+    if (!Number.isInteger(pid)) {
+      return null;
+    }
+    return { pid, start: rest.join("\n").trim() };
+  } catch {
+    return null;
+  }
+}
+function stampMonitorPid() {
+  const current = readActiveStudioSessionRaw();
+  if (current) {
+    writeRecord({ ...current, pid: process.pid });
+  }
+}
 
 // ../bitfab-plugin-lib/dist/studioTeardown.js
 var WINDOW_CLOSE_GRACE_PERIOD_MS = 1e4;
@@ -7859,13 +7962,13 @@ async function reportHandoff(apiKey, pluginVersion, platform2, body) {
 import crypto4 from "crypto";
 
 // ../bitfab-plugin-lib/dist/frontmostApp.js
-import { execFileSync as execFileSync2, spawn as spawn2 } from "child_process";
+import { execFileSync as execFileSync3, spawn as spawn2 } from "child_process";
 import os8 from "os";
 function findAncestorApp() {
   try {
     let pid = process.ppid;
     while (pid > 1) {
-      const output = execFileSync2("ps", ["-o", "ppid=,comm=", "-p", String(pid)], { stdio: "pipe", encoding: "utf-8" }).trim();
+      const output = execFileSync3("ps", ["-o", "ppid=,comm=", "-p", String(pid)], { stdio: "pipe", encoding: "utf-8" }).trim();
       const match = output.match(/^\s*(\d+)\s+(.+)$/);
       if (!match) {
         break;
@@ -7924,19 +8027,19 @@ function getFrontmostApp() {
   const platform2 = os8.platform();
   try {
     if (platform2 === "darwin") {
-      return execFileSync2("osascript", [
+      return execFileSync3("osascript", [
         "-e",
         'tell application "System Events" to get name of first process whose frontmost is true'
       ], { stdio: "pipe", encoding: "utf-8" }).trim();
     }
     if (platform2 === "linux") {
-      return execFileSync2("xdotool", ["getactivewindow"], {
+      return execFileSync3("xdotool", ["getactivewindow"], {
         stdio: "pipe",
         encoding: "utf-8"
       }).trim();
     }
     if (platform2 === "win32") {
-      return execFileSync2("powershell.exe", [
+      return execFileSync3("powershell.exe", [
         "-NoProfile",
         "-Command",
         `Add-Type -MemberDefinition '[DllImport("user32.dll")] public static extern IntPtr GetForegroundWindow();' -Name WinFocus -Namespace Bitfab; [Bitfab.WinFocus]::GetForegroundWindow().ToInt64()`
@@ -8115,7 +8218,7 @@ async function openStudioTo(path15, opts = {}) {
         serviceUrl,
         windowPid: windowPid ?? void 0
       });
-      const poller2 = startEventPoller(serviceUrl, loginApiKey, sessionId2, opts.onEvent, restoreFocus);
+      const poller2 = startEventPoller(serviceUrl, loginApiKey, sessionId2, opts.onEvent, restoreFocus, { claim: opts.monitor !== "wait" });
       return {
         sessionId: sessionId2,
         serviceUrl,
@@ -8145,13 +8248,34 @@ async function openStudioTo(path15, opts = {}) {
     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() };
+    if (opts.onEvent && opts.monitor === "wait") {
+      const poller2 = startEventPoller(existing.serviceUrl, apiKey, existing.sessionId, opts.onEvent, restoreFocus, { claim: false });
+      return {
+        sessionId: existing.sessionId,
+        serviceUrl: existing.serviceUrl,
+        apiKey,
+        opened: false,
+        ...poller2
+      };
+    }
+    if (opts.onEvent && opts.monitor === "start" && tryClaimStudioMonitor()) {
+      const poller2 = startEventPoller(existing.serviceUrl, apiKey, existing.sessionId, opts.onEvent, restoreFocus, { claim: true });
+      return {
+        sessionId: existing.sessionId,
+        serviceUrl: existing.serviceUrl,
+        apiKey,
+        opened: false,
+        ...poller2
+      };
+    }
+    restoreFocus();
     return {
       sessionId: existing.sessionId,
       serviceUrl: existing.serviceUrl,
       apiKey,
       opened: false,
-      ...poller2
+      abort: noop,
+      done: Promise.resolve()
     };
   }
   const sessionId = crypto4.randomUUID();
@@ -8162,7 +8286,7 @@ async function openStudioTo(path15, opts = {}) {
     initialPath: path15,
     clientHeaders: opts.clientHeaders
   });
-  const poller = opts.onEvent ? startEventPoller(session.serviceUrl, apiKey, session.sessionId, opts.onEvent, restoreFocus) : { abort: noop, done: Promise.resolve() };
+  const poller = opts.onEvent ? startEventPoller(session.serviceUrl, apiKey, session.sessionId, opts.onEvent, restoreFocus, { claim: opts.monitor !== "wait" }) : { abort: noop, done: Promise.resolve() };
   return {
     sessionId: session.sessionId,
     serviceUrl: session.serviceUrl,
@@ -8192,13 +8316,13 @@ async function loginViaExistingWindow(args) {
   }
   saveCredentials(loginApiKey);
   args.opts.onAuthenticated?.(sessionId);
-  if (args.opts.onEvent) {
+  if (args.opts.onEvent && (args.opts.monitor === "wait" || args.opts.monitor === "start" && tryClaimStudioMonitor())) {
     await waitForSessionReady({
       serviceUrl,
       apiKey: loginApiKey,
       sessionId
     });
-    const poller = startEventPoller(serviceUrl, loginApiKey, sessionId, args.opts.onEvent, args.restoreFocus);
+    const poller = startEventPoller(serviceUrl, loginApiKey, sessionId, args.opts.onEvent, args.restoreFocus, { claim: args.opts.monitor !== "wait" });
     return {
       sessionId,
       serviceUrl,
@@ -8262,15 +8386,24 @@ function awaitReauthLogin(args) {
     });
   });
 }
-function startEventPoller(serviceUrl, apiKey, sessionId, onEvent, restoreFocus) {
+function startEventPoller(serviceUrl, apiKey, sessionId, onEvent, restoreFocus, { claim = true } = {}) {
+  if (claim) {
+    claimStudioMonitor();
+  }
   const abortController = new AbortController();
   let endedNotified = false;
+  const releaseLock = () => {
+    if (claim) {
+      releaseStudioMonitor();
+    }
+  };
   const notifyEnded = (baseEvent) => {
     if (!endedNotified) {
       endedNotified = true;
       restoreFocus();
       onEvent({ ...baseEvent, type: "studio:session-ended" });
     }
+    releaseLock();
     abortController.abort();
   };
   const arbiter = createWindowCloseArbiter({
@@ -8309,6 +8442,7 @@ function startEventPoller(serviceUrl, apiKey, sessionId, onEvent, restoreFocus)
         if (event.type === "studio:not-member") {
           restoreFocus();
           onEvent(event);
+          releaseLock();
           abortController.abort();
           return;
         }
@@ -8325,8 +8459,15 @@ function startEventPoller(serviceUrl, apiKey, sessionId, onEvent, restoreFocus)
     if (!abortController.signal.aborted) {
       console.error(`studio agent-event poll terminated: ${err.message}`);
     }
+    releaseLock();
   });
-  return { abort: () => abortController.abort(), done };
+  return {
+    abort: () => {
+      releaseLock();
+      abortController.abort();
+    },
+    done
+  };
 }
 
 // ../bitfab-plugin-lib/dist/commands/login.js

package/package.json

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