bitfab-cli 0.2.87 → 0.2.89

package/dist/index.js

@@ -9398,77 +9398,8 @@ function updateActiveStudioSession(updates) {
   return updated;
 }
 
-// ../bitfab-plugin-lib/dist/parseArgs.js
-function formatPositionalLabel(spec) {
-  const tag = spec.format && spec.format !== "string" ? `:${spec.format}` : "";
-  if (spec.variadic) {
-    return spec.required !== false ? `<${spec.name}${tag}> [<${spec.name}${tag}>...]` : `[<${spec.name}${tag}>...]`;
-  }
-  return spec.required !== false ? `<${spec.name}${tag}>` : `[${spec.name}${tag}]`;
-}
-function formatFlagLabel(spec) {
-  if (spec.boolean) {
-    return `[--${spec.name}]`;
-  }
-  const tag = spec.format && spec.format !== "string" ? `:${spec.format}` : "";
-  const valueHint = spec.format === "number" ? " N" : ` <${spec.name}${tag}>`;
-  const defaultHint = spec.default !== void 0 ? ` (default: ${spec.default})` : "";
-  return `[--${spec.name}${valueHint}${defaultHint}]`;
-}
-function buildUsage(command, positional, flags) {
-  const parts = [
-    `Usage: ${command}`,
-    ...positional.map(formatPositionalLabel),
-    ...(flags ?? []).map(formatFlagLabel)
-  ];
-  return parts.join(" ");
-}
-function buildHelp(command, positional, flags, description) {
-  const lines = [buildUsage(command, positional, flags)];
-  if (description) {
-    lines.push("", description);
-  }
-  const describedArgs = positional.filter((s) => s.description);
-  const flagSpecs = flags ?? [];
-  const labelWidth = Math.max(0, ...describedArgs.map((s) => s.name.length), ...flagSpecs.map((s) => s.name.length + 2));
-  if (describedArgs.length > 0) {
-    lines.push("", "Arguments:");
-    for (const spec of describedArgs) {
-      lines.push(`  ${spec.name.padEnd(labelWidth)}  ${spec.description}`);
-    }
-  }
-  if (flagSpecs.length > 0) {
-    lines.push("", "Flags:");
-    for (const spec of flagSpecs) {
-      const detail = [
-        spec.description,
-        spec.default !== void 0 ? `(default: ${spec.default})` : void 0
-      ].filter(Boolean).join(" ");
-      lines.push(`  ${`--${spec.name}`.padEnd(labelWidth)}  ${detail}`.trimEnd());
-    }
-  }
-  return lines.join("\n");
-}
-function helpRequested(raw) {
-  return raw.includes("-h") || raw.includes("--help");
-}
-function printHelpIfRequested(opts) {
-  const argv = opts.argv ?? process.argv;
-  if (!helpRequested(argv.slice(2))) {
-    return;
-  }
-  console.log(buildHelp(extractCommandName(argv), opts.positional ?? [], opts.flags, opts.description));
-  process.exit(0);
-}
-function extractCommandName(argv) {
-  return argv[1]?.replace(/.*\//, "").replace(/\.[jt]s$/, "") ?? "command";
-}
-
-// ../bitfab-plugin-lib/dist/studioChannel.js
-import crypto6 from "crypto";
-
 // ../bitfab-plugin-lib/dist/browser.js
-import { execSync, spawn } from "child_process";
+import { execFileSync as execFileSync3, execSync, spawn } from "child_process";
 import fs8 from "fs";
 import os8 from "os";
 function getChromiumBrowsers() {
@@ -9715,6 +9646,47 @@ function shouldDisableChromelessWindows() {
 var WINDOW_OPEN_RATE_WINDOW_MS = 3e4;
 var WINDOW_OPEN_RATE_LIMIT = 3;
 var recentOpens = [];
+function macAppNameFromBinaryPath(binaryPath) {
+  const match = binaryPath.match(/\/([^/]+)\.app\//);
+  return match ? match[1] : null;
+}
+function macChromiumAppNames() {
+  return [
+    ...new Set(getChromiumBrowsers().flatMap((b) => b.binaryPaths.map(macAppNameFromBinaryPath)).filter((name) => name != null))
+  ];
+}
+function buildCloseStudioWindowsAppleScript(appName, sessionId) {
+  return [
+    `if application "${appName}" is running then`,
+    `  tell application "${appName}"`,
+    `    repeat with w in (every window)`,
+    `      try`,
+    `        repeat with t in (every tab of w)`,
+    `          if (URL of t) contains "${sessionId}" then`,
+    `            close w`,
+    `            exit repeat`,
+    `          end if`,
+    `        end repeat`,
+    `      end try`,
+    `    end repeat`,
+    `  end tell`,
+    `end if`
+  ].join("\n");
+}
+function closeStudioWindowsBySession(sessionId) {
+  if (os8.platform() !== "darwin" || !sessionId) {
+    return;
+  }
+  if (/["\\]/.test(sessionId)) {
+    return;
+  }
+  for (const appName of macChromiumAppNames()) {
+    try {
+      execFileSync3("osascript", ["-e", buildCloseStudioWindowsAppleScript(appName, sessionId)], { stdio: "ignore", timeout: 4e3 });
+    } catch {
+    }
+  }
+}
 function openChromelessWindow(url2) {
   if (process.env.VITEST || process.env.NODE_ENV === "test") {
     throw new Error("openChromelessWindow called in a test environment without being mocked");
@@ -9756,6 +9728,75 @@ function openChromelessWindow(url2) {
   return null;
 }
 
+// ../bitfab-plugin-lib/dist/parseArgs.js
+function formatPositionalLabel(spec) {
+  const tag = spec.format && spec.format !== "string" ? `:${spec.format}` : "";
+  if (spec.variadic) {
+    return spec.required !== false ? `<${spec.name}${tag}> [<${spec.name}${tag}>...]` : `[<${spec.name}${tag}>...]`;
+  }
+  return spec.required !== false ? `<${spec.name}${tag}>` : `[${spec.name}${tag}]`;
+}
+function formatFlagLabel(spec) {
+  if (spec.boolean) {
+    return `[--${spec.name}]`;
+  }
+  const tag = spec.format && spec.format !== "string" ? `:${spec.format}` : "";
+  const valueHint = spec.format === "number" ? " N" : ` <${spec.name}${tag}>`;
+  const defaultHint = spec.default !== void 0 ? ` (default: ${spec.default})` : "";
+  return `[--${spec.name}${valueHint}${defaultHint}]`;
+}
+function buildUsage(command, positional, flags) {
+  const parts = [
+    `Usage: ${command}`,
+    ...positional.map(formatPositionalLabel),
+    ...(flags ?? []).map(formatFlagLabel)
+  ];
+  return parts.join(" ");
+}
+function buildHelp(command, positional, flags, description) {
+  const lines = [buildUsage(command, positional, flags)];
+  if (description) {
+    lines.push("", description);
+  }
+  const describedArgs = positional.filter((s) => s.description);
+  const flagSpecs = flags ?? [];
+  const labelWidth = Math.max(0, ...describedArgs.map((s) => s.name.length), ...flagSpecs.map((s) => s.name.length + 2));
+  if (describedArgs.length > 0) {
+    lines.push("", "Arguments:");
+    for (const spec of describedArgs) {
+      lines.push(`  ${spec.name.padEnd(labelWidth)}  ${spec.description}`);
+    }
+  }
+  if (flagSpecs.length > 0) {
+    lines.push("", "Flags:");
+    for (const spec of flagSpecs) {
+      const detail = [
+        spec.description,
+        spec.default !== void 0 ? `(default: ${spec.default})` : void 0
+      ].filter(Boolean).join(" ");
+      lines.push(`  ${`--${spec.name}`.padEnd(labelWidth)}  ${detail}`.trimEnd());
+    }
+  }
+  return lines.join("\n");
+}
+function helpRequested(raw) {
+  return raw.includes("-h") || raw.includes("--help");
+}
+function printHelpIfRequested(opts) {
+  const argv = opts.argv ?? process.argv;
+  if (!helpRequested(argv.slice(2))) {
+    return;
+  }
+  console.log(buildHelp(extractCommandName(argv), opts.positional ?? [], opts.flags, opts.description));
+  process.exit(0);
+}
+function extractCommandName(argv) {
+  return argv[1]?.replace(/.*\//, "").replace(/\.[jt]s$/, "") ?? "command";
+}
+
+// ../bitfab-plugin-lib/dist/studioChannel.js
+import crypto6 from "crypto";
+
 // ../bitfab-plugin-lib/dist/commands/createStudioSession.js
 function ensureStudioPath(p5) {
   if (!p5.startsWith("/studio")) {
@@ -9999,6 +10040,7 @@ var DaemonClient = class {
   buffer = "";
   responseQueue = [];
   eventHandler = null;
+  disconnectHandler = null;
   socketPath;
   constructor(socketPath) {
     this.socketPath = socketPath ?? SOCKET_PATH;
@@ -10020,9 +10062,14 @@ var DaemonClient = class {
           return;
         }
         this.socket = null;
+        this.disconnectHandler?.(err);
       });
       socket.on("close", () => {
+        const wasConnected = this.socket !== null;
         this.socket = null;
+        if (wasConnected) {
+          this.disconnectHandler?.(new Error("daemon connection closed"));
+        }
       });
     });
   }
@@ -10103,8 +10150,13 @@ var DaemonClient = class {
   onEvent(handler) {
     this.eventHandler = handler;
   }
+  /** Fires once when the daemon connection drops unexpectedly (not on destroy). */
+  onDisconnect(handler) {
+    this.disconnectHandler = handler;
+  }
   destroy() {
     this.eventHandler = null;
+    this.disconnectHandler = null;
     this.responseQueue = [];
     if (this.socket) {
       this.socket.destroy();
@@ -10113,6 +10165,23 @@ var DaemonClient = class {
   }
 };
 
+// ../bitfab-plugin-lib/dist/studioUrl.js
+var DEFAULT_STUDIO_PATH = "/studio";
+function resolveStudioInitialPath(input) {
+  if (input && isValidStudioRoute(input)) {
+    return input;
+  }
+  return DEFAULT_STUDIO_PATH;
+}
+function buildStudioSessionUrl(args) {
+  const { serviceUrl, path: path18, sessionId } = args;
+  if (path18.includes("session=")) {
+    return `${serviceUrl}${path18}`;
+  }
+  const separator = path18.includes("?") ? "&" : "?";
+  return `${serviceUrl}${path18}${separator}session=${encodeURIComponent(sessionId)}`;
+}
+
 // ../bitfab-plugin-lib/dist/studioChannel.js
 var DirectChannel = class {
   apiKey;
@@ -10127,11 +10196,12 @@ var DirectChannel = class {
   async openOrNavigate(path18, opts) {
     if (!this.apiKey) {
       const sessionId2 = opts?.sessionId ?? crypto6.randomUUID();
-      const initialPath = path18.startsWith("/studio") ? path18 : "/studio";
-      if (!isValidStudioRoute(initialPath)) {
-        throw new Error(`Studio route not allowed: ${initialPath}`);
-      }
-      const url2 = initialPath.includes("session=") ? `${this.serviceUrl}${initialPath}` : `${this.serviceUrl}${initialPath}${initialPath.includes("?") ? "&" : "?"}session=${encodeURIComponent(sessionId2)}`;
+      const initialPath = resolveStudioInitialPath(path18);
+      const url2 = buildStudioSessionUrl({
+        serviceUrl: this.serviceUrl,
+        path: initialPath,
+        sessionId: sessionId2
+      });
       const windowPid = openChromelessWindow(url2);
       writeActiveStudioSession({
         sessionId: sessionId2,
@@ -10166,6 +10236,9 @@ var DirectChannel = class {
   async close(sessionId, message) {
     await closeStudio({ serviceUrl: this.serviceUrl, apiKey: this.apiKey, sessionId }, message);
   }
+  forceCloseWindow(sessionId) {
+    closeStudioWindowsBySession(sessionId);
+  }
   subscribe(sessionId, onEvent, onError) {
     const abortController = new AbortController();
     const done = (async () => {
@@ -10255,18 +10328,23 @@ var DaemonChannel = class _DaemonChannel {
       })
     ]);
   }
-  subscribe(_sessionId, onEvent, _onError) {
+  forceCloseWindow(_sessionId) {
+  }
+  subscribe(_sessionId, onEvent, onError) {
     const done = new Promise((resolve) => {
       this.doneResolve = resolve;
     });
     this.client.onEvent((push) => {
       const event = {
-        id: "",
+        id: push.id,
         type: push.event,
         data: push.data
       };
       onEvent(event);
     });
+    this.client.onDisconnect((err) => {
+      onError(err);
+    });
     return {
       abort: () => this.destroy(),
       done
@@ -10304,6 +10382,9 @@ function withDirectFallback(primary, apiKey, serviceUrl) {
     async close(sessionId, message) {
       await active.close(sessionId, message);
     },
+    forceCloseWindow(sessionId) {
+      active.forceCloseWindow(sessionId);
+    },
     subscribe(sessionId, onEvent, onError) {
       return active.subscribe(sessionId, onEvent, onError);
     },
@@ -10372,13 +10453,13 @@ async function reportHandoff(apiKey, pluginVersion, platform2, body) {
 import crypto7 from "crypto";
 
 // ../bitfab-plugin-lib/dist/frontmostApp.js
-import { execFileSync as execFileSync3, spawn as spawn2 } from "child_process";
+import { execFileSync as execFileSync4, spawn as spawn2 } from "child_process";
 import os10 from "os";
 function findAncestorApp() {
   try {
     let pid = process.ppid;
     while (pid > 1) {
-      const output = execFileSync3("ps", ["-o", "ppid=,comm=", "-p", String(pid)], { stdio: "pipe", encoding: "utf-8" }).trim();
+      const output = execFileSync4("ps", ["-o", "ppid=,comm=", "-p", String(pid)], { stdio: "pipe", encoding: "utf-8" }).trim();
       const match = output.match(/^\s*(\d+)\s+(.+)$/);
       if (!match) {
         break;
@@ -10437,19 +10518,19 @@ function getFrontmostApp() {
   const platform2 = os10.platform();
   try {
     if (platform2 === "darwin") {
-      return execFileSync3("osascript", [
+      return execFileSync4("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 execFileSync3("xdotool", ["getactivewindow"], {
+      return execFileSync4("xdotool", ["getactivewindow"], {
         stdio: "pipe",
         encoding: "utf-8"
       }).trim();
     }
     if (platform2 === "win32") {
-      return execFileSync3("powershell.exe", [
+      return execFileSync4("powershell.exe", [
         "-NoProfile",
         "-Command",
         `Add-Type -MemberDefinition '[DllImport("user32.dll")] public static extern IntPtr GetForegroundWindow();' -Name WinFocus -Namespace Bitfab; [Bitfab.WinFocus]::GetForegroundWindow().ToInt64()`

package/package.json

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