esque-bridge 0.5.0 → 0.6.1

package/index.js

@@ -27,6 +27,10 @@ const fs = require('fs');
 const path = require('path');
 const os = require('os');
 
+// Windows has no POSIX process groups or `.cmd`-aware spawn, so several
+// process-management paths below branch on this.
+const isWindows = process.platform === 'win32';
+
 // --- Config ---------------------------------------------------------------
 
 const argv = parseArgs(process.argv.slice(2));
@@ -331,14 +335,19 @@ function runAgent(prompt, esqueSessionId) {
       usesStdin = !argv.some((a) => a.includes(prompt));
     }
 
-    // detached → its own process group so we can kill the WHOLE tree (the
-    // agent can spawn its own subprocesses) on timeout instead of orphaning
-    // zombies.
+    // POSIX: detach into its own process group so we can kill the WHOLE tree
+    // (the agent spawns subprocesses) on timeout instead of orphaning zombies.
+    // Windows: no detach (it would pop a console window) — we kill the tree
+    // via `taskkill /T` instead; and `shell: true` so spawn can resolve the
+    // `.cmd` shims npm installs global bins as (claude.cmd / codex.cmd). Our
+    // built-in adapters pass fixed flag args (the prompt rides via stdin), so
+    // there's no shell-injection surface here.
     const child = spawn(bin, argv, {
       cwd: WORKDIR,
       env: process.env,
       stdio: ['pipe', 'pipe', 'pipe'],
-      detached: true,
+      detached: !isWindows,
+      shell: isWindows,
     });
 
     const MAX_BUF = 16 * 1024 * 1024; // hard cap so a runaway agent can't OOM the bridge
@@ -356,6 +365,22 @@ function runAgent(prompt, esqueSessionId) {
     const rejectOnce = settle(reject);
 
     const killTree = (signal) => {
+      if (isWindows) {
+        // No process groups on Windows; force-kill the whole tree by PID.
+        // Signals don't map, so SIGTERM/SIGKILL both become a /F force-kill.
+        try {
+          spawn('taskkill', ['/pid', String(child.pid), '/T', '/F'], {
+            stdio: 'ignore',
+          });
+        } catch {
+          try {
+            child.kill();
+          } catch {
+            /* already gone */
+          }
+        }
+        return;
+      }
       try {
         process.kill(-child.pid, signal);
       } catch {
@@ -753,6 +778,43 @@ function confirmWorkdir(dir) {
   });
 }
 
+// Bind the local HTTP server to the first free port at/after `startPort`.
+// EADDRINUSE on the default port almost always means a previous esque-bridge
+// is still running (or another app grabbed 3030). Rather than crash with a raw
+// Node stack trace, we step to the next port and tell the user. The pairing
+// URL travels over the tunnel, so the exact local port doesn't matter to the
+// app. Returns { server, port } for the port we actually bound.
+function listenOnFreePort(app, startPort, maxTries = 25) {
+  return new Promise((resolve, reject) => {
+    let attempts = 0;
+    const attempt = (port) => {
+      const server = app.listen(port);
+      const onError = (err) => {
+        server.removeListener('listening', onListening);
+        if (err && err.code === 'EADDRINUSE' && attempts < maxTries) {
+          if (attempts === 0) {
+            console.error(
+              `\n  Port ${startPort} is busy — another Esque bridge may already be running.`,
+            );
+            console.error('  Stepping to the next free port…');
+          }
+          attempts += 1;
+          attempt(port + 1);
+        } else {
+          reject(err);
+        }
+      };
+      const onListening = () => {
+        server.removeListener('error', onError);
+        resolve({ server, port });
+      };
+      server.once('error', onError);
+      server.once('listening', onListening);
+    };
+    attempt(startPort);
+  });
+}
+
 async function main() {
   if (!fs.existsSync(WORKDIR) || !fs.statSync(WORKDIR).isDirectory()) {
     console.error(`workdir does not exist: ${WORKDIR}`);
@@ -787,15 +849,18 @@ async function main() {
     process.exit(1);
   }
 
-  await new Promise((resolve) => app.listen(PORT, resolve));
+  const { port: boundPort } = await listenOnFreePort(app, PORT);
+  if (boundPort !== PORT) {
+    console.log(`  ✓ Using port ${boundPort} instead (${PORT} was taken).`);
+  }
 
   let tunnel;
   try {
-    tunnel = await localtunnel({ port: PORT, subdomain: LT_SUBDOMAIN });
+    tunnel = await localtunnel({ port: boundPort, subdomain: LT_SUBDOMAIN });
   } catch (err) {
     console.error('Failed to open localtunnel:', err.message);
     console.error('If localtunnel.me is blocked, try cloudflared:');
-    console.error(`  cloudflared tunnel --url http://localhost:${PORT}`);
+    console.error(`  cloudflared tunnel --url http://localhost:${boundPort}`);
     process.exit(1);
   }
 
@@ -811,7 +876,7 @@ async function main() {
   qrcode.generate(pairUrl, { small: true });
   console.log('');
   console.log(`  Agent        ${adapter.label} (${AGENT_TYPE})`);
-  console.log(`  Local        http://localhost:${PORT}`);
+  console.log(`  Local        http://localhost:${boundPort}`);
   console.log(`  Tunnel       ${tunnel.url}`);
   console.log(`  Workdir      ${WORKDIR}`);
   console.log(`  Binary       ${AGENT_BIN ?? '(custom)'}`);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "esque-bridge",
-  "version": "0.5.0",
-  "description": "Desktop-side receiver for the Esque Agent mobile app. Pairs your phone with a local coding-agent CLI (Claude Code, Aider, or any custom command) via a tunnel + QR code, so prompts run through your subscription instead of per-token API billing.",
+  "version": "0.6.1",
+  "description": "Desktop-side receiver for the Esque Agent mobile app. Pairs your phone with a local coding-agent CLI (Claude Code, Codex, Aider, or any custom command) via a tunnel + QR code, so prompts run through your subscription instead of per-token API billing.",
   "bin": {
     "esque-bridge": "index.js"
   },