rechrome 1.16.1 → 1.17.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rechrome",
-  "version": "1.16.1",
+  "version": "1.17.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/snomiao/rechrome.git"

package/rech.js

@@ -3,7 +3,7 @@
 import { file } from "bun";
 import { randomBytes } from "crypto";
 import { mkdirSync, appendFileSync, existsSync, realpathSync, accessSync, cpSync, constants as fsConstants } from "fs";
-import { hostname } from "os";
+import { hostname, homedir } from "os";
 import { join, basename, dirname } from "path";
 
 export const ENV_KEY = "RECHROME_URL";
@@ -11,7 +11,10 @@ export const DEFAULT_PORT = 13775;
 export const RECH_DIR = join(import.meta.dir, ".rech");
 export const LOG_DIR = join(RECH_DIR, "logs");
 
-const RECH_HOME_DIR = join(process.env.HOME!, ".rechrome");
+// Home dir: HOME on POSIX, USERPROFILE on Windows (handled by os.homedir()).
+export const HOME = homedir();
+
+const RECH_HOME_DIR = join(HOME, ".rechrome");
 const TOKENS_FILE = join(RECH_HOME_DIR, "profiles.json");
 
 type TokenEntry = { extensionId: string; token: string; profileDir: string; userDataDir?: string };
@@ -29,7 +32,7 @@ async function saveTokenEntry(profileEmail: string, entry: TokenEntry): Promise<
 }
 
 const envFile = join(import.meta.dir, ".env.local");
-const globalEnvFile = join(process.env.HOME || "~", ".env.local");
+const globalEnvFile = join(HOME || "~", ".env.local");
 
 // Walk CWD→root loading env files nearest-first; per-key: closest file wins, farther files skip.
 // At each level .rechrome/.env.local is checked before .env.local (rechrome-specific overrides general).
@@ -91,6 +94,34 @@ function isReadable(p?: string): boolean {
   try { accessSync(p, fsConstants.R_OK); return true; } catch { return false; }
 }
 
+// Open a file/URL in the OS default app/browser. `open` is macOS-only — Windows needs
+// `cmd /c start`, Linux needs `xdg-open`.
+function openInDefaultApp(target: string): void {
+  const cmd = process.platform === "darwin" ? ["open", target]
+    : process.platform === "win32" ? ["cmd", "/c", "start", "", target]
+    : ["xdg-open", target];
+  try { Bun.spawn(cmd, { stdout: "ignore", stderr: "ignore" }); } catch {}
+}
+
+// Best-effort path to the Chrome executable for the current platform (used to open a
+// specific profile at a chrome-extension:// URL). Returns null if not found.
+function findChromeBinary(): string | null {
+  const candidates = process.platform === "darwin"
+    ? ["/Applications/Google Chrome.app/Contents/MacOS/Google Chrome"]
+    : process.platform === "win32"
+      ? [
+          join(process.env.PROGRAMFILES || "C:\\Program Files", "Google/Chrome/Application/chrome.exe"),
+          join(process.env["PROGRAMFILES(X86)"] || "C:\\Program Files (x86)", "Google/Chrome/Application/chrome.exe"),
+          join(process.env.LOCALAPPDATA || join(HOME, "AppData/Local"), "Google/Chrome/Application/chrome.exe"),
+        ]
+      : ["google-chrome", "google-chrome-stable", "chromium", "chromium-browser"];
+  for (const p of candidates) {
+    if (p.includes("/") || p.includes("\\")) { if (existsSync(p)) return p; }
+    else { const w = Bun.which(p); if (w) return w; }
+  }
+  return null;
+}
+
 export function log(msg: string) {
   mkdirSync(LOG_DIR, { recursive: true });
   const ts = new Date().toISOString();
@@ -214,7 +245,7 @@ async function getClientEnv(urlExtras?: { extensionId?: string; extensionToken?:
 }
 
 const CHROME_LOCAL_STATE_PATHS = () => {
-  const home = process.env.HOME || "~";
+  const home = HOME || "~";
   return [
     join(home, "Library/Application Support/Google/Chrome/Local State"),
     join(home, ".config/google-chrome/Local State"),
@@ -250,7 +281,7 @@ const LEGACY_EXTENSION_DIST_DIR = join(import.meta.dir, "lib/playwright-multi-ta
 
 // Stable per-user location: we copy the bundled dist here so Chrome's recorded install path survives
 // the ephemeral bunx temp dir being cleaned up between invocations.
-export const EXTENSION_DIST_DIR = join(process.env.HOME!, ".rechrome", "extension");
+export const EXTENSION_DIST_DIR = join(HOME, ".rechrome", "extension");
 
 // With the manifest `key` field set, Chrome derives this ID deterministically from the key (not the path),
 // so we can locate the extension by ID even when the on-disk path differs from what Chrome stored.
@@ -458,7 +489,7 @@ async function run(url: string, args: string[]) {
   process.exit(status);
 }
 
-function buildSetupHtml(extDistDir: string, profileDisplay: string): string {
+export function buildSetupHtml(extDistDir: string, profileDisplay: string): string {
   return `<!DOCTYPE html>
 <html lang="en">
 <head>
@@ -516,15 +547,35 @@ function buildSetupHtml(extDistDir: string, profileDisplay: string): string {
 </html>`;
 }
 
-const OXMGR_PROCESS_NAME = "rechrome-serve";
-
-async function runOxmgr(args: string[]): Promise<number> {
-  const proc = Bun.spawn(["bunx", "oxmgr", ...args], { stdout: "inherit", stderr: "inherit" });
+const PM_PROCESS_NAME = "rechrome";
+// Pre-rename names to evict on (re)install/uninstall so a single `rech setup`
+// migrates an existing checkout cleanly.
+const LEGACY_PROCESS_NAMES = ["rechrome-serve"];
+// oxmgr everywhere, but it's unstable on Windows — fall back to pm2 there.
+const IS_WINDOWS = process.platform === "win32";
+const PM_BIN = IS_WINDOWS ? "pm2" : "oxmgr";
+
+// Spawn the active process manager. `env` is merged over process.env for the
+// child: pm2 captures the CLI's environment for the managed process (it has no
+// per-var flag like oxmgr's --env), so install passes daemon env this way.
+async function runPm(args: string[], env?: Record<string, string>): Promise<number> {
+  const proc = Bun.spawn(["bunx", PM_BIN, ...args], {
+    stdout: "inherit",
+    stderr: "inherit",
+    ...(env ? { env: { ...process.env, ...env } } : {}),
+  });
   await proc.exited;
   return proc.exitCode ?? 1;
 }
 
-async function daemonInstall(serveUrl: string): Promise<void> {
+// Capture the process-manager's process list as text (oxmgr `list` / pm2 `jlist`).
+// Both render the process name verbatim, so callers can substring-match it.
+async function pmList(): Promise<string> {
+  const proc = Bun.spawn(["bunx", PM_BIN, IS_WINDOWS ? "jlist" : "list"], { stdout: "pipe", stderr: "ignore" });
+  return await new Response(proc.stdout).text();
+}
+
+export async function daemonInstall(serveUrl: string): Promise<void> {
   // Persist the URL to ~/.env.local before starting the daemon. The daemon's
   // loadEnv() walks CWD→root reading .env.local files and unconditionally
   // overwrites process.env.RECHROME_URL from whichever file it finds first.
@@ -536,42 +587,75 @@ async function daemonInstall(serveUrl: string): Promise<void> {
   const filtered = envRaw.trimEnd().split("\n").filter(l => !l.startsWith(`${ENV_KEY}=`));
   await Bun.write(globalEnvFile, [...filtered, `${ENV_KEY}=${serveUrl}`, ""].join("\n"));
 
-  const home = process.env.HOME!;
+  const home = HOME;
   const bunBin = Bun.which("bun") ?? process.execPath;
   const rechScript = import.meta.filename;
 
-  // Resolve PLAYWRIGHT_CLI: env override > bundled fork (development checkout) > "playwright-cli-multi-tab"
+  // Resolve PLAYWRIGHT_CLI: env override > bundled fork (development checkout) > "playwright-cli-multi-tab".
+  // The fork is a .js script: POSIX execs it via its shebang (`#!/usr/bin/env node`), but Windows
+  // can't exec a .js directly, so it must be invoked through an interpreter. It MUST be node, not
+  // bun: the cliDaemon inherits its parent's runtime (spawned via process.execPath), and the
+  // extension-bridge relay's WebSocket handshake hangs under Bun (the extension WS connects but
+  // `extension.initialized` never completes) — under node it completes, matching the POSIX shebang.
+  // serve splits PLAYWRIGHT_CLI on spaces into argv, so we use bare `node` (the node path lives
+  // under "Program Files" and contains a space); node must be on the daemon's PATH, same as the
+  // shebang's `env node` assumption. The repo path contains no spaces.
   const bundledForkCli = join(import.meta.dir, "lib/playwright-cli/playwright-cli.js");
   const resolvedPlaywrightCli = process.env.PLAYWRIGHT_CLI
-    || (existsSync(bundledForkCli) ? bundledForkCli : "playwright-cli-multi-tab");
-
-  const envArgs: string[] = [
-    "--env", `HOME=${home}`,
-    "--env", `PATH=${process.env.PATH || "/usr/local/bin:/usr/bin:/bin"}`,
-    "--env", `${ENV_KEY}=${serveUrl}`,
-    "--env", `PWMCP_TEST_CONNECTION_TIMEOUT=${process.env.PWMCP_TEST_CONNECTION_TIMEOUT || "30000"}`,
-    "--env", `PLAYWRIGHT_CLI=${resolvedPlaywrightCli}`,
-  ];
-  if (process.env.RECH_HOST) envArgs.push("--env", `RECH_HOST=${process.env.RECH_HOST}`);
-  if (isReadable(process.env.RECH_TLS_CERT)) envArgs.push("--env", `RECH_TLS_CERT=${process.env.RECH_TLS_CERT}`);
-  if (isReadable(process.env.RECH_TLS_KEY)) envArgs.push("--env", `RECH_TLS_KEY=${process.env.RECH_TLS_KEY}`);
-
-  await runOxmgr(["delete", OXMGR_PROCESS_NAME]).catch(() => {});
-  await runOxmgr([
-    "start",
-    "--name", OXMGR_PROCESS_NAME,
-    "--restart", "always",
-    "--cwd", home,
-    ...envArgs,
-    `${bunBin} ${rechScript} serve`,
-  ]);
-  await runOxmgr(["service", "install"]);
+    || (existsSync(bundledForkCli)
+        ? (IS_WINDOWS ? `node ${bundledForkCli}` : bundledForkCli)
+        : "playwright-cli-multi-tab");
+
+  // Environment the managed `serve` process must run with.
+  const daemonEnv: Record<string, string> = {
+    HOME: home,
+    PATH: process.env.PATH || "/usr/local/bin:/usr/bin:/bin",
+    [ENV_KEY]: serveUrl,
+    PWMCP_TEST_CONNECTION_TIMEOUT: process.env.PWMCP_TEST_CONNECTION_TIMEOUT || "30000",
+    PLAYWRIGHT_CLI: resolvedPlaywrightCli,
+  };
+  if (process.env.RECH_HOST) daemonEnv.RECH_HOST = process.env.RECH_HOST;
+  if (isReadable(process.env.RECH_TLS_CERT)) daemonEnv.RECH_TLS_CERT = process.env.RECH_TLS_CERT!;
+  if (isReadable(process.env.RECH_TLS_KEY)) daemonEnv.RECH_TLS_KEY = process.env.RECH_TLS_KEY!;
+
+  // Drop any prior registration (current + legacy names) before re-adding.
+  for (const name of [PM_PROCESS_NAME, ...LEGACY_PROCESS_NAMES]) await runPm(["delete", name]);
+
+  let startCode: number;
+  if (IS_WINDOWS) {
+    // pm2 captures the CLI env (passed via runPm's env) for the managed process,
+    // autorestarts by default, and runs the bun binary directly with
+    // `--interpreter none` (so it isn't fed to node).
+    startCode = await runPm([
+      "start", bunBin,
+      "--name", PM_PROCESS_NAME,
+      "--interpreter", "none",
+      "--cwd", home,
+      "--", rechScript, "serve",
+    ], daemonEnv);
+    await runPm(["save"]); // persist process list for `pm2 resurrect` on reboot
+  } else {
+    const envArgs = Object.entries(daemonEnv).flatMap(([k, v]) => ["--env", `${k}=${v}`]);
+    startCode = await runPm([
+      "start",
+      "--name", PM_PROCESS_NAME,
+      "--restart", "always",
+      "--cwd", home,
+      ...envArgs,
+      `${bunBin} ${rechScript} serve`,
+    ]);
+    await runPm(["service", "install"]);
+  }
+  // Surface a failed start instead of reporting a daemon that was never registered.
+  if (startCode !== 0)
+    throw new Error(`${PM_BIN} failed to start "${PM_PROCESS_NAME}" (exit ${startCode}). Check that ${PM_BIN} is installed and on PATH.`);
 }
 
 async function daemonUninstall(): Promise<void> {
-  await runOxmgr(["delete", OXMGR_PROCESS_NAME]);
-  await runOxmgr(["service", "uninstall"]);
-  console.log(`Removed oxmgr process: ${OXMGR_PROCESS_NAME}`);
+  for (const name of [PM_PROCESS_NAME, ...LEGACY_PROCESS_NAMES]) await runPm(["delete", name]);
+  if (IS_WINDOWS) await runPm(["save"]);
+  else await runPm(["service", "uninstall"]);
+  console.log(`Removed ${PM_BIN} process: ${PM_PROCESS_NAME}`);
 }
 
 async function setup(opts: { profile?: string } = {}): Promise<void> {
@@ -693,7 +777,7 @@ async function setup(opts: { profile?: string } = {}): Promise<void> {
     await waitForServe();
   } else {
     await daemonInstall(url);
-    console.log(`      Registered daemon: ${OXMGR_PROCESS_NAME}`);
+    console.log(`      Registered daemon: ${PM_PROCESS_NAME}`);
     await waitForServe();
   }
 
@@ -748,7 +832,7 @@ async function setup(opts: { profile?: string } = {}): Promise<void> {
       mkdirSync(RECH_HOME_DIR, { recursive: true });
       await Bun.write(setupHtmlPath, buildSetupHtml(EXTENSION_DIST_DIR, profileDisplay));
       console.log(`\n      Opening install guide in your browser...`);
-      Bun.spawn(["open", setupHtmlPath], { stdout: "ignore", stderr: "ignore" });
+      openInDefaultApp(setupHtmlPath);
       await ask("\n      Press Enter after loading the extension to retry...");
     }
     console.log(`      Extension found: ${extId}`);
@@ -771,11 +855,13 @@ async function setup(opts: { profile?: string } = {}): Promise<void> {
     console.log(`\n      Get auth token from the extension:`);
     console.log(`        ${statusUrl}`);
     if (isTTY) {
-      Bun.spawn(
-        ["/Applications/Google Chrome.app/Contents/MacOS/Google Chrome",
-         `--profile-directory=${profileDir}`, statusUrl],
-        { stdout: "ignore", stderr: "ignore", detached: true },
-      );
+      const chromeBin = findChromeBinary();
+      if (chromeBin) {
+        Bun.spawn(
+          [chromeBin, `--profile-directory=${profileDir}`, statusUrl],
+          { stdout: "ignore", stderr: "ignore", detached: true },
+        );
+      }
       console.log(`\n      Or click the extension icon in the Chrome toolbar.`);
       console.log(`      Copy the token shown on the page (PLAYWRIGHT_MCP_EXTENSION_TOKEN=...).\n`);
     } else {
@@ -832,7 +918,7 @@ async function setup(opts: { profile?: string } = {}): Promise<void> {
 
   const pwdEnvPath = join(process.cwd(), ".env.local");
   const pwdRechPath = join(process.cwd(), ".rechrome", ".env.local");
-  const homeEnvPath = join(process.env.HOME!, ".env.local");
+  const homeEnvPath = join(HOME, ".env.local");
   // Show whether each target already exists so it's clear we'll update (merge) vs create.
   const tag = async (p: string) => (await file(p).exists()) ? "exists → will update" : "new file";
   const [pwdTag, pwdRechTag, homeTag] = await Promise.all([tag(pwdEnvPath), tag(pwdRechPath), tag(homeEnvPath)]);
@@ -890,16 +976,19 @@ async function status(): Promise<void> {
   const { host, port, protocol } = parseUrl(url);
   const parsed = parseUrl(url);
   const ping = await fetch(`${protocol}://${host}:${port}/`, { signal: AbortSignal.timeout(2000) }).catch(() => null);
-  // Check actual socket binding via lsof (shows * for 0.0.0.0, or exact IP for loopback-only)
-  const lsofProc = Bun.spawn(["lsof", "-nP", `-iTCP:${port}`, "-sTCP:LISTEN"], { stdout: "pipe", stderr: "ignore" });
-  const lsofOut = await new Response(lsofProc.stdout).text();
-  const listenLine = lsofOut.split("\n").find(l => l.includes(`:${port}`));
-  const listenAddr = listenLine?.match(/TCP\s+(\S+:\d+)/)?.[1] ?? (ping ? `${host}:${port}` : null);
-  console.log(`serve:    ${ping ? `running  ${protocol}://${listenAddr ?? `${host}:${port}`}` : "not running"}`);
-  const oxmgrProc = Bun.spawn(["bunx", "oxmgr", "list"], { stdout: "pipe", stderr: "ignore" });
-  const oxmgrOut = await new Response(oxmgrProc.stdout).text();
-  const daemonRegistered = oxmgrOut.includes(OXMGR_PROCESS_NAME);
-  console.log(`daemon:   ${daemonRegistered ? `oxmgr (${OXMGR_PROCESS_NAME})` : "not installed"}`);
+  // Resolve the daemon's actual bind from its authenticated /ping (cross-platform; lsof is
+  // POSIX-only and absent on Windows). bind is "0.0.0.0" (all interfaces) or the loopback IP.
+  const bind = ping
+    ? await fetch(`${protocol}://${host}:${port}/ping`, {
+        headers: { Authorization: `Bearer ${parsed.key}` },
+        signal: AbortSignal.timeout(2000),
+      }).then(r => (r.ok ? r.json() : null)).then((b: { bind?: string } | null) => b?.bind).catch(() => undefined)
+    : undefined;
+  const listenAddr = bind ? `${bind}:${port}` : `${host}:${port}`;
+  console.log(`serve:    ${ping ? `running  ${protocol}://${listenAddr}` : "not running"}`);
+  const pmOut = await pmList();
+  const daemonRegistered = pmOut.includes(PM_PROCESS_NAME);
+  console.log(`daemon:   ${daemonRegistered ? `${PM_BIN} (${PM_PROCESS_NAME})` : "not installed"}`);
   const registry = await readTokenRegistry();
   const entries = Object.entries(registry);
   if (entries.length) {

package/rech.ts

@@ -3,7 +3,7 @@
 import { file } from "bun";
 import { randomBytes } from "crypto";
 import { mkdirSync, appendFileSync, existsSync, realpathSync, accessSync, cpSync, constants as fsConstants } from "fs";
-import { hostname } from "os";
+import { hostname, homedir } from "os";
 import { join, basename, dirname } from "path";
 
 export const ENV_KEY = "RECHROME_URL";
@@ -11,7 +11,10 @@ export const DEFAULT_PORT = 13775;
 export const RECH_DIR = join(import.meta.dir, ".rech");
 export const LOG_DIR = join(RECH_DIR, "logs");
 
-const RECH_HOME_DIR = join(process.env.HOME!, ".rechrome");
+// Home dir: HOME on POSIX, USERPROFILE on Windows (handled by os.homedir()).
+export const HOME = homedir();
+
+const RECH_HOME_DIR = join(HOME, ".rechrome");
 const TOKENS_FILE = join(RECH_HOME_DIR, "profiles.json");
 
 type TokenEntry = { extensionId: string; token: string; profileDir: string; userDataDir?: string };
@@ -29,7 +32,7 @@ async function saveTokenEntry(profileEmail: string, entry: TokenEntry): Promise<
 }
 
 const envFile = join(import.meta.dir, ".env.local");
-const globalEnvFile = join(process.env.HOME || "~", ".env.local");
+const globalEnvFile = join(HOME || "~", ".env.local");
 
 // Walk CWD→root loading env files nearest-first; per-key: closest file wins, farther files skip.
 // At each level .rechrome/.env.local is checked before .env.local (rechrome-specific overrides general).
@@ -91,6 +94,34 @@ function isReadable(p?: string): boolean {
   try { accessSync(p, fsConstants.R_OK); return true; } catch { return false; }
 }
 
+// Open a file/URL in the OS default app/browser. `open` is macOS-only — Windows needs
+// `cmd /c start`, Linux needs `xdg-open`.
+function openInDefaultApp(target: string): void {
+  const cmd = process.platform === "darwin" ? ["open", target]
+    : process.platform === "win32" ? ["cmd", "/c", "start", "", target]
+    : ["xdg-open", target];
+  try { Bun.spawn(cmd, { stdout: "ignore", stderr: "ignore" }); } catch {}
+}
+
+// Best-effort path to the Chrome executable for the current platform (used to open a
+// specific profile at a chrome-extension:// URL). Returns null if not found.
+function findChromeBinary(): string | null {
+  const candidates = process.platform === "darwin"
+    ? ["/Applications/Google Chrome.app/Contents/MacOS/Google Chrome"]
+    : process.platform === "win32"
+      ? [
+          join(process.env.PROGRAMFILES || "C:\\Program Files", "Google/Chrome/Application/chrome.exe"),
+          join(process.env["PROGRAMFILES(X86)"] || "C:\\Program Files (x86)", "Google/Chrome/Application/chrome.exe"),
+          join(process.env.LOCALAPPDATA || join(HOME, "AppData/Local"), "Google/Chrome/Application/chrome.exe"),
+        ]
+      : ["google-chrome", "google-chrome-stable", "chromium", "chromium-browser"];
+  for (const p of candidates) {
+    if (p.includes("/") || p.includes("\\")) { if (existsSync(p)) return p; }
+    else { const w = Bun.which(p); if (w) return w; }
+  }
+  return null;
+}
+
 export function log(msg: string) {
   mkdirSync(LOG_DIR, { recursive: true });
   const ts = new Date().toISOString();
@@ -214,7 +245,7 @@ async function getClientEnv(urlExtras?: { extensionId?: string; extensionToken?:
 }
 
 const CHROME_LOCAL_STATE_PATHS = () => {
-  const home = process.env.HOME || "~";
+  const home = HOME || "~";
   return [
     join(home, "Library/Application Support/Google/Chrome/Local State"),
     join(home, ".config/google-chrome/Local State"),
@@ -250,7 +281,7 @@ const LEGACY_EXTENSION_DIST_DIR = join(import.meta.dir, "lib/playwright-multi-ta
 
 // Stable per-user location: we copy the bundled dist here so Chrome's recorded install path survives
 // the ephemeral bunx temp dir being cleaned up between invocations.
-export const EXTENSION_DIST_DIR = join(process.env.HOME!, ".rechrome", "extension");
+export const EXTENSION_DIST_DIR = join(HOME, ".rechrome", "extension");
 
 // With the manifest `key` field set, Chrome derives this ID deterministically from the key (not the path),
 // so we can locate the extension by ID even when the on-disk path differs from what Chrome stored.
@@ -458,7 +489,7 @@ async function run(url: string, args: string[]) {
   process.exit(status);
 }
 
-function buildSetupHtml(extDistDir: string, profileDisplay: string): string {
+export function buildSetupHtml(extDistDir: string, profileDisplay: string): string {
   return `<!DOCTYPE html>
 <html lang="en">
 <head>
@@ -516,15 +547,35 @@ function buildSetupHtml(extDistDir: string, profileDisplay: string): string {
 </html>`;
 }
 
-const OXMGR_PROCESS_NAME = "rechrome-serve";
-
-async function runOxmgr(args: string[]): Promise<number> {
-  const proc = Bun.spawn(["bunx", "oxmgr", ...args], { stdout: "inherit", stderr: "inherit" });
+const PM_PROCESS_NAME = "rechrome";
+// Pre-rename names to evict on (re)install/uninstall so a single `rech setup`
+// migrates an existing checkout cleanly.
+const LEGACY_PROCESS_NAMES = ["rechrome-serve"];
+// oxmgr everywhere, but it's unstable on Windows — fall back to pm2 there.
+const IS_WINDOWS = process.platform === "win32";
+const PM_BIN = IS_WINDOWS ? "pm2" : "oxmgr";
+
+// Spawn the active process manager. `env` is merged over process.env for the
+// child: pm2 captures the CLI's environment for the managed process (it has no
+// per-var flag like oxmgr's --env), so install passes daemon env this way.
+async function runPm(args: string[], env?: Record<string, string>): Promise<number> {
+  const proc = Bun.spawn(["bunx", PM_BIN, ...args], {
+    stdout: "inherit",
+    stderr: "inherit",
+    ...(env ? { env: { ...process.env, ...env } } : {}),
+  });
   await proc.exited;
   return proc.exitCode ?? 1;
 }
 
-async function daemonInstall(serveUrl: string): Promise<void> {
+// Capture the process-manager's process list as text (oxmgr `list` / pm2 `jlist`).
+// Both render the process name verbatim, so callers can substring-match it.
+async function pmList(): Promise<string> {
+  const proc = Bun.spawn(["bunx", PM_BIN, IS_WINDOWS ? "jlist" : "list"], { stdout: "pipe", stderr: "ignore" });
+  return await new Response(proc.stdout).text();
+}
+
+export async function daemonInstall(serveUrl: string): Promise<void> {
   // Persist the URL to ~/.env.local before starting the daemon. The daemon's
   // loadEnv() walks CWD→root reading .env.local files and unconditionally
   // overwrites process.env.RECHROME_URL from whichever file it finds first.
@@ -536,42 +587,75 @@ async function daemonInstall(serveUrl: string): Promise<void> {
   const filtered = envRaw.trimEnd().split("\n").filter(l => !l.startsWith(`${ENV_KEY}=`));
   await Bun.write(globalEnvFile, [...filtered, `${ENV_KEY}=${serveUrl}`, ""].join("\n"));
 
-  const home = process.env.HOME!;
+  const home = HOME;
   const bunBin = Bun.which("bun") ?? process.execPath;
   const rechScript = import.meta.filename;
 
-  // Resolve PLAYWRIGHT_CLI: env override > bundled fork (development checkout) > "playwright-cli-multi-tab"
+  // Resolve PLAYWRIGHT_CLI: env override > bundled fork (development checkout) > "playwright-cli-multi-tab".
+  // The fork is a .js script: POSIX execs it via its shebang (`#!/usr/bin/env node`), but Windows
+  // can't exec a .js directly, so it must be invoked through an interpreter. It MUST be node, not
+  // bun: the cliDaemon inherits its parent's runtime (spawned via process.execPath), and the
+  // extension-bridge relay's WebSocket handshake hangs under Bun (the extension WS connects but
+  // `extension.initialized` never completes) — under node it completes, matching the POSIX shebang.
+  // serve splits PLAYWRIGHT_CLI on spaces into argv, so we use bare `node` (the node path lives
+  // under "Program Files" and contains a space); node must be on the daemon's PATH, same as the
+  // shebang's `env node` assumption. The repo path contains no spaces.
   const bundledForkCli = join(import.meta.dir, "lib/playwright-cli/playwright-cli.js");
   const resolvedPlaywrightCli = process.env.PLAYWRIGHT_CLI
-    || (existsSync(bundledForkCli) ? bundledForkCli : "playwright-cli-multi-tab");
-
-  const envArgs: string[] = [
-    "--env", `HOME=${home}`,
-    "--env", `PATH=${process.env.PATH || "/usr/local/bin:/usr/bin:/bin"}`,
-    "--env", `${ENV_KEY}=${serveUrl}`,
-    "--env", `PWMCP_TEST_CONNECTION_TIMEOUT=${process.env.PWMCP_TEST_CONNECTION_TIMEOUT || "30000"}`,
-    "--env", `PLAYWRIGHT_CLI=${resolvedPlaywrightCli}`,
-  ];
-  if (process.env.RECH_HOST) envArgs.push("--env", `RECH_HOST=${process.env.RECH_HOST}`);
-  if (isReadable(process.env.RECH_TLS_CERT)) envArgs.push("--env", `RECH_TLS_CERT=${process.env.RECH_TLS_CERT}`);
-  if (isReadable(process.env.RECH_TLS_KEY)) envArgs.push("--env", `RECH_TLS_KEY=${process.env.RECH_TLS_KEY}`);
-
-  await runOxmgr(["delete", OXMGR_PROCESS_NAME]).catch(() => {});
-  await runOxmgr([
-    "start",
-    "--name", OXMGR_PROCESS_NAME,
-    "--restart", "always",
-    "--cwd", home,
-    ...envArgs,
-    `${bunBin} ${rechScript} serve`,
-  ]);
-  await runOxmgr(["service", "install"]);
+    || (existsSync(bundledForkCli)
+        ? (IS_WINDOWS ? `node ${bundledForkCli}` : bundledForkCli)
+        : "playwright-cli-multi-tab");
+
+  // Environment the managed `serve` process must run with.
+  const daemonEnv: Record<string, string> = {
+    HOME: home,
+    PATH: process.env.PATH || "/usr/local/bin:/usr/bin:/bin",
+    [ENV_KEY]: serveUrl,
+    PWMCP_TEST_CONNECTION_TIMEOUT: process.env.PWMCP_TEST_CONNECTION_TIMEOUT || "30000",
+    PLAYWRIGHT_CLI: resolvedPlaywrightCli,
+  };
+  if (process.env.RECH_HOST) daemonEnv.RECH_HOST = process.env.RECH_HOST;
+  if (isReadable(process.env.RECH_TLS_CERT)) daemonEnv.RECH_TLS_CERT = process.env.RECH_TLS_CERT!;
+  if (isReadable(process.env.RECH_TLS_KEY)) daemonEnv.RECH_TLS_KEY = process.env.RECH_TLS_KEY!;
+
+  // Drop any prior registration (current + legacy names) before re-adding.
+  for (const name of [PM_PROCESS_NAME, ...LEGACY_PROCESS_NAMES]) await runPm(["delete", name]);
+
+  let startCode: number;
+  if (IS_WINDOWS) {
+    // pm2 captures the CLI env (passed via runPm's env) for the managed process,
+    // autorestarts by default, and runs the bun binary directly with
+    // `--interpreter none` (so it isn't fed to node).
+    startCode = await runPm([
+      "start", bunBin,
+      "--name", PM_PROCESS_NAME,
+      "--interpreter", "none",
+      "--cwd", home,
+      "--", rechScript, "serve",
+    ], daemonEnv);
+    await runPm(["save"]); // persist process list for `pm2 resurrect` on reboot
+  } else {
+    const envArgs = Object.entries(daemonEnv).flatMap(([k, v]) => ["--env", `${k}=${v}`]);
+    startCode = await runPm([
+      "start",
+      "--name", PM_PROCESS_NAME,
+      "--restart", "always",
+      "--cwd", home,
+      ...envArgs,
+      `${bunBin} ${rechScript} serve`,
+    ]);
+    await runPm(["service", "install"]);
+  }
+  // Surface a failed start instead of reporting a daemon that was never registered.
+  if (startCode !== 0)
+    throw new Error(`${PM_BIN} failed to start "${PM_PROCESS_NAME}" (exit ${startCode}). Check that ${PM_BIN} is installed and on PATH.`);
 }
 
 async function daemonUninstall(): Promise<void> {
-  await runOxmgr(["delete", OXMGR_PROCESS_NAME]);
-  await runOxmgr(["service", "uninstall"]);
-  console.log(`Removed oxmgr process: ${OXMGR_PROCESS_NAME}`);
+  for (const name of [PM_PROCESS_NAME, ...LEGACY_PROCESS_NAMES]) await runPm(["delete", name]);
+  if (IS_WINDOWS) await runPm(["save"]);
+  else await runPm(["service", "uninstall"]);
+  console.log(`Removed ${PM_BIN} process: ${PM_PROCESS_NAME}`);
 }
 
 async function setup(opts: { profile?: string } = {}): Promise<void> {
@@ -693,7 +777,7 @@ async function setup(opts: { profile?: string } = {}): Promise<void> {
     await waitForServe();
   } else {
     await daemonInstall(url);
-    console.log(`      Registered daemon: ${OXMGR_PROCESS_NAME}`);
+    console.log(`      Registered daemon: ${PM_PROCESS_NAME}`);
     await waitForServe();
   }
 
@@ -748,7 +832,7 @@ async function setup(opts: { profile?: string } = {}): Promise<void> {
       mkdirSync(RECH_HOME_DIR, { recursive: true });
       await Bun.write(setupHtmlPath, buildSetupHtml(EXTENSION_DIST_DIR, profileDisplay));
       console.log(`\n      Opening install guide in your browser...`);
-      Bun.spawn(["open", setupHtmlPath], { stdout: "ignore", stderr: "ignore" });
+      openInDefaultApp(setupHtmlPath);
       await ask("\n      Press Enter after loading the extension to retry...");
     }
     console.log(`      Extension found: ${extId}`);
@@ -771,11 +855,13 @@ async function setup(opts: { profile?: string } = {}): Promise<void> {
     console.log(`\n      Get auth token from the extension:`);
     console.log(`        ${statusUrl}`);
     if (isTTY) {
-      Bun.spawn(
-        ["/Applications/Google Chrome.app/Contents/MacOS/Google Chrome",
-         `--profile-directory=${profileDir}`, statusUrl],
-        { stdout: "ignore", stderr: "ignore", detached: true },
-      );
+      const chromeBin = findChromeBinary();
+      if (chromeBin) {
+        Bun.spawn(
+          [chromeBin, `--profile-directory=${profileDir}`, statusUrl],
+          { stdout: "ignore", stderr: "ignore", detached: true },
+        );
+      }
       console.log(`\n      Or click the extension icon in the Chrome toolbar.`);
       console.log(`      Copy the token shown on the page (PLAYWRIGHT_MCP_EXTENSION_TOKEN=...).\n`);
     } else {
@@ -832,7 +918,7 @@ async function setup(opts: { profile?: string } = {}): Promise<void> {
 
   const pwdEnvPath = join(process.cwd(), ".env.local");
   const pwdRechPath = join(process.cwd(), ".rechrome", ".env.local");
-  const homeEnvPath = join(process.env.HOME!, ".env.local");
+  const homeEnvPath = join(HOME, ".env.local");
   // Show whether each target already exists so it's clear we'll update (merge) vs create.
   const tag = async (p: string) => (await file(p).exists()) ? "exists → will update" : "new file";
   const [pwdTag, pwdRechTag, homeTag] = await Promise.all([tag(pwdEnvPath), tag(pwdRechPath), tag(homeEnvPath)]);
@@ -890,16 +976,19 @@ async function status(): Promise<void> {
   const { host, port, protocol } = parseUrl(url);
   const parsed = parseUrl(url);
   const ping = await fetch(`${protocol}://${host}:${port}/`, { signal: AbortSignal.timeout(2000) }).catch(() => null);
-  // Check actual socket binding via lsof (shows * for 0.0.0.0, or exact IP for loopback-only)
-  const lsofProc = Bun.spawn(["lsof", "-nP", `-iTCP:${port}`, "-sTCP:LISTEN"], { stdout: "pipe", stderr: "ignore" });
-  const lsofOut = await new Response(lsofProc.stdout).text();
-  const listenLine = lsofOut.split("\n").find(l => l.includes(`:${port}`));
-  const listenAddr = listenLine?.match(/TCP\s+(\S+:\d+)/)?.[1] ?? (ping ? `${host}:${port}` : null);
-  console.log(`serve:    ${ping ? `running  ${protocol}://${listenAddr ?? `${host}:${port}`}` : "not running"}`);
-  const oxmgrProc = Bun.spawn(["bunx", "oxmgr", "list"], { stdout: "pipe", stderr: "ignore" });
-  const oxmgrOut = await new Response(oxmgrProc.stdout).text();
-  const daemonRegistered = oxmgrOut.includes(OXMGR_PROCESS_NAME);
-  console.log(`daemon:   ${daemonRegistered ? `oxmgr (${OXMGR_PROCESS_NAME})` : "not installed"}`);
+  // Resolve the daemon's actual bind from its authenticated /ping (cross-platform; lsof is
+  // POSIX-only and absent on Windows). bind is "0.0.0.0" (all interfaces) or the loopback IP.
+  const bind = ping
+    ? await fetch(`${protocol}://${host}:${port}/ping`, {
+        headers: { Authorization: `Bearer ${parsed.key}` },
+        signal: AbortSignal.timeout(2000),
+      }).then(r => (r.ok ? r.json() : null)).then((b: { bind?: string } | null) => b?.bind).catch(() => undefined)
+    : undefined;
+  const listenAddr = bind ? `${bind}:${port}` : `${host}:${port}`;
+  console.log(`serve:    ${ping ? `running  ${protocol}://${listenAddr}` : "not running"}`);
+  const pmOut = await pmList();
+  const daemonRegistered = pmOut.includes(PM_PROCESS_NAME);
+  console.log(`daemon:   ${daemonRegistered ? `${PM_BIN} (${PM_PROCESS_NAME})` : "not installed"}`);
   const registry = await readTokenRegistry();
   const entries = Object.entries(registry);
   if (entries.length) {

package/serve.js

@@ -8,6 +8,7 @@ import {
   getOrCreateUrl,
   authCheck,
   RECH_DIR,
+  HOME,
   PASSTHROUGH_ENV_KEYS,
 } from "./rech.js";
 
@@ -57,14 +58,25 @@ async function renewCertIfNeeded(certPath: string, keyPath: string): Promise<boo
 }
 
 export function isUnderDir(base: string, candidate: string): boolean {
-  const absBase = resolve(base) + "/";
-  const absCandidate = resolve(base, candidate);
-  return absCandidate.startsWith(absBase);
+  // Use path.relative rather than string-prefix: resolve() yields backslash paths on
+  // Windows, so a "absBase + '/'" prefix check never matched there (every file was
+  // rejected). A candidate is under base iff the relative path neither escapes (..) nor
+  // is absolute (different drive).
+  const rel = relative(resolve(base), resolve(base, candidate));
+  return rel !== "" && !rel.startsWith("..") && !isAbsolute(rel);
+}
+
+// Tokenize a command string into argv, honoring double-quoted segments so an interpreter
+// path containing spaces (e.g. a quoted Windows "C:\Program Files\…\node.exe") survives.
+// PLAYWRIGHT_CLI is space-joined by the installer; a plain split(" ") would shatter such paths.
+export function splitCommand(cmd: string): string[] {
+  return (cmd.match(/"[^"]*"|\S+/g) ?? []).map(t =>
+    t.startsWith('"') && t.endsWith('"') ? t.slice(1, -1) : t);
 }
 
 async function resolveProfileDirectory(nameOrEmail: string): Promise<string> {
   if (/^(Default|Profile \d+)$/i.test(nameOrEmail)) return nameOrEmail;
-  const home = process.env.HOME || "~";
+  const home = HOME || "~";
   const candidates = [
     join(home, "Library/Application Support/Google/Chrome/Local State"),
     join(home, ".config/google-chrome/Local State"),
@@ -83,6 +95,45 @@ async function resolveProfileDirectory(nameOrEmail: string): Promise<string> {
   return nameOrEmail;
 }
 
+// Free the listening port from stale daemon holders before retrying a failed bind.
+// On Windows the listening socket (created inheritable by Bun.serve) is swept into the
+// detached cliDaemon grandchild via bInheritHandles, so an orphaned cliDaemon from a
+// previous `serve` keeps the port in LISTEN after the old serve dies — the fresh serve
+// then crash-loops on EADDRINUSE. A clean restart releases the port, so a failed bind
+// only happens when such a stale holder exists; killing orphaned daemon holders here is
+// safe because a freshly-starting serve owns no live sessions of its own yet (the user's
+// Chrome tabs persist regardless — the cliDaemon only drives them).
+async function freeStalePort(port: number): Promise<void> {
+  try {
+    if (process.platform === "win32") {
+      // Two-phase, narrow-first: (1) kill the port's actual listed owner if it's a live
+      // process; (2) only if the port is STILL held — the inherited-handle case, where the
+      // socket lives in a child while netstat attributes it to a now-dead owner — fall back
+      // to killing orphaned cliDaemon holders. The fallback is the only recovery for that
+      // case (the live holder can't be mapped from the port), but it runs only when the
+      // precise kill failed, so the broad sweep is a logged last resort, not the default.
+      const ps = [
+        "$ErrorActionPreference='SilentlyContinue';",
+        `$o=(Get-NetTCPConnection -LocalPort ${port} -State Listen).OwningProcess;`,
+        "if($o -and (Get-Process -Id $o)){ Stop-Process -Id $o -Force; Start-Sleep -Milliseconds 400 };",
+        `if(Get-NetTCPConnection -LocalPort ${port} -State Listen){`,
+        "  $h=Get-CimInstance Win32_Process | Where-Object { $_.CommandLine -like '*cliDaemon.js*' };",
+        "  Write-Output (\"freeStalePort: port still held; killing cliDaemon holders: \" + ($h.ProcessId -join ','));",
+        "  $h | ForEach-Object { Stop-Process -Id $_.ProcessId -Force }",
+        "}",
+      ].join(" ");
+      const r = Bun.spawnSync(["powershell", "-NoProfile", "-NonInteractive", "-Command", ps]);
+      const out = r.stdout?.toString().trim();
+      if (out) log(out);
+    } else {
+      Bun.spawnSync(["sh", "-c", `fuser -k ${port}/tcp 2>/dev/null || (lsof -ti tcp:${port} | xargs -r kill -9) 2>/dev/null || true`]);
+    }
+  } catch {
+    // best effort — the retry will surface a clear error if the port is still held
+  }
+  await new Promise(r => setTimeout(r, 800)); // let the OS release the socket before retry
+}
+
 export async function serve() {
   const url = await getOrCreateUrl();
   const { key, port } = parseUrl(url);
@@ -103,7 +154,7 @@ export async function serve() {
     }, 86_400_000);
   }
   const tls = certPath && keyPath ? { cert: Bun.file(certPath), key: Bun.file(keyPath) } : undefined;
-  const server = Bun.serve({
+  const startServer = () => Bun.serve({
     hostname: listenHost,
     port,
     tls,
@@ -182,7 +233,7 @@ export async function serve() {
       });
       const namespacedSession = clientSession ? `${sessionId}-${clientSession}` : sessionId;
 
-      const [bin, ...binArgs] = (process.env.PLAYWRIGHT_CLI || "playwright-cli-multi-tab").split(" ");
+      const [bin, ...binArgs] = splitCommand(process.env.PLAYWRIGHT_CLI || "playwright-cli-multi-tab");
 
       if (filteredArgs.length === 0) {
         filteredArgs.push("--help");
@@ -195,15 +246,17 @@ export async function serve() {
       const isOpenNoUrl = isOpenCmd && filteredArgs.length === 1;
       if (isOpenNoUrl) filteredArgs.push("about:blank");
 
-      // bare `rech open` with no URL: warn if session already has tabs
-      if (isOpenCmd && filteredArgs.length === 1) {
+      // open against an existing session: bare `open` returns a tab-list hint; `open <url>`
+      // converts to `goto` to reuse the live browser. (Guarding on filteredArgs.length===1
+      // was dead — about:blank/<url> is already appended above, so length is always >=2.)
+      if (isOpenCmd) {
         try {
           const listProc = Bun.spawn([bin, ...binArgs, "tab-list", `-s=${namespacedSession}`], {
             cwd: workDir,
             stdin: "ignore",
             stdout: "pipe",
             stderr: "pipe",
-            env: { PATH: process.env.PATH, HOME: process.env.HOME },
+            env: { PATH: process.env.PATH, HOME: HOME, USERPROFILE: process.env.USERPROFILE },
           });
           const [listStatus, listOut] = await Promise.race([
             Promise.all([listProc.exited, new Response(listProc.stdout).text()]),
@@ -248,10 +301,13 @@ export async function serve() {
 
       const childEnv: Record<string, string | undefined> = {
         PATH: process.env.PATH,
-        HOME: process.env.HOME,
+        HOME: HOME,
+        USERPROFILE: process.env.USERPROFILE,
         TMPDIR: process.env.TMPDIR,
         DISPLAY: process.env.DISPLAY,
         XDG_RUNTIME_DIR: process.env.XDG_RUNTIME_DIR,
+        DEBUG: process.env.DEBUG, // forward debug namespaces (e.g. pw:mcp:relay) for diagnostics
+        PWDEBUG: process.env.PWDEBUG,
         ...(clientName ? { PLAYWRIGHT_MCP_CLIENT_NAME: shortClientLabel(clientName) } : {}),
         ...passthroughEnv,
         // Enable extension bridge when credentials are present
@@ -339,6 +395,18 @@ export async function serve() {
     },
   });
 
+  // A leaked listening-socket handle in an orphaned cliDaemon can keep the port held after a
+  // prior serve exits; on EADDRINUSE, clear stale holders once and retry rather than crash-loop.
+  let server: ReturnType<typeof startServer>;
+  try {
+    server = startServer();
+  } catch (e: any) {
+    if (!String(e?.code ?? e?.message ?? "").includes("EADDRINUSE")) throw e;
+    log(`port ${port} in use — clearing stale daemon holders and retrying`);
+    await freeStalePort(port);
+    server = startServer();
+  }
+
   log(`serving on ${tls ? "https" : "http"}://${server.hostname}:${server.port}`);
   log(`Connection URL set (use .env.local to view)`);
 }

package/serve.ts

@@ -8,6 +8,7 @@ import {
   getOrCreateUrl,
   authCheck,
   RECH_DIR,
+  HOME,
   PASSTHROUGH_ENV_KEYS,
 } from "./rech.ts";
 
@@ -57,14 +58,25 @@ async function renewCertIfNeeded(certPath: string, keyPath: string): Promise<boo
 }
 
 export function isUnderDir(base: string, candidate: string): boolean {
-  const absBase = resolve(base) + "/";
-  const absCandidate = resolve(base, candidate);
-  return absCandidate.startsWith(absBase);
+  // Use path.relative rather than string-prefix: resolve() yields backslash paths on
+  // Windows, so a "absBase + '/'" prefix check never matched there (every file was
+  // rejected). A candidate is under base iff the relative path neither escapes (..) nor
+  // is absolute (different drive).
+  const rel = relative(resolve(base), resolve(base, candidate));
+  return rel !== "" && !rel.startsWith("..") && !isAbsolute(rel);
+}
+
+// Tokenize a command string into argv, honoring double-quoted segments so an interpreter
+// path containing spaces (e.g. a quoted Windows "C:\Program Files\…\node.exe") survives.
+// PLAYWRIGHT_CLI is space-joined by the installer; a plain split(" ") would shatter such paths.
+export function splitCommand(cmd: string): string[] {
+  return (cmd.match(/"[^"]*"|\S+/g) ?? []).map(t =>
+    t.startsWith('"') && t.endsWith('"') ? t.slice(1, -1) : t);
 }
 
 async function resolveProfileDirectory(nameOrEmail: string): Promise<string> {
   if (/^(Default|Profile \d+)$/i.test(nameOrEmail)) return nameOrEmail;
-  const home = process.env.HOME || "~";
+  const home = HOME || "~";
   const candidates = [
     join(home, "Library/Application Support/Google/Chrome/Local State"),
     join(home, ".config/google-chrome/Local State"),
@@ -83,6 +95,45 @@ async function resolveProfileDirectory(nameOrEmail: string): Promise<string> {
   return nameOrEmail;
 }
 
+// Free the listening port from stale daemon holders before retrying a failed bind.
+// On Windows the listening socket (created inheritable by Bun.serve) is swept into the
+// detached cliDaemon grandchild via bInheritHandles, so an orphaned cliDaemon from a
+// previous `serve` keeps the port in LISTEN after the old serve dies — the fresh serve
+// then crash-loops on EADDRINUSE. A clean restart releases the port, so a failed bind
+// only happens when such a stale holder exists; killing orphaned daemon holders here is
+// safe because a freshly-starting serve owns no live sessions of its own yet (the user's
+// Chrome tabs persist regardless — the cliDaemon only drives them).
+async function freeStalePort(port: number): Promise<void> {
+  try {
+    if (process.platform === "win32") {
+      // Two-phase, narrow-first: (1) kill the port's actual listed owner if it's a live
+      // process; (2) only if the port is STILL held — the inherited-handle case, where the
+      // socket lives in a child while netstat attributes it to a now-dead owner — fall back
+      // to killing orphaned cliDaemon holders. The fallback is the only recovery for that
+      // case (the live holder can't be mapped from the port), but it runs only when the
+      // precise kill failed, so the broad sweep is a logged last resort, not the default.
+      const ps = [
+        "$ErrorActionPreference='SilentlyContinue';",
+        `$o=(Get-NetTCPConnection -LocalPort ${port} -State Listen).OwningProcess;`,
+        "if($o -and (Get-Process -Id $o)){ Stop-Process -Id $o -Force; Start-Sleep -Milliseconds 400 };",
+        `if(Get-NetTCPConnection -LocalPort ${port} -State Listen){`,
+        "  $h=Get-CimInstance Win32_Process | Where-Object { $_.CommandLine -like '*cliDaemon.js*' };",
+        "  Write-Output (\"freeStalePort: port still held; killing cliDaemon holders: \" + ($h.ProcessId -join ','));",
+        "  $h | ForEach-Object { Stop-Process -Id $_.ProcessId -Force }",
+        "}",
+      ].join(" ");
+      const r = Bun.spawnSync(["powershell", "-NoProfile", "-NonInteractive", "-Command", ps]);
+      const out = r.stdout?.toString().trim();
+      if (out) log(out);
+    } else {
+      Bun.spawnSync(["sh", "-c", `fuser -k ${port}/tcp 2>/dev/null || (lsof -ti tcp:${port} | xargs -r kill -9) 2>/dev/null || true`]);
+    }
+  } catch {
+    // best effort — the retry will surface a clear error if the port is still held
+  }
+  await new Promise(r => setTimeout(r, 800)); // let the OS release the socket before retry
+}
+
 export async function serve() {
   const url = await getOrCreateUrl();
   const { key, port } = parseUrl(url);
@@ -103,7 +154,7 @@ export async function serve() {
     }, 86_400_000);
   }
   const tls = certPath && keyPath ? { cert: Bun.file(certPath), key: Bun.file(keyPath) } : undefined;
-  const server = Bun.serve({
+  const startServer = () => Bun.serve({
     hostname: listenHost,
     port,
     tls,
@@ -182,7 +233,7 @@ export async function serve() {
       });
       const namespacedSession = clientSession ? `${sessionId}-${clientSession}` : sessionId;
 
-      const [bin, ...binArgs] = (process.env.PLAYWRIGHT_CLI || "playwright-cli-multi-tab").split(" ");
+      const [bin, ...binArgs] = splitCommand(process.env.PLAYWRIGHT_CLI || "playwright-cli-multi-tab");
 
       if (filteredArgs.length === 0) {
         filteredArgs.push("--help");
@@ -195,15 +246,17 @@ export async function serve() {
       const isOpenNoUrl = isOpenCmd && filteredArgs.length === 1;
       if (isOpenNoUrl) filteredArgs.push("about:blank");
 
-      // bare `rech open` with no URL: warn if session already has tabs
-      if (isOpenCmd && filteredArgs.length === 1) {
+      // open against an existing session: bare `open` returns a tab-list hint; `open <url>`
+      // converts to `goto` to reuse the live browser. (Guarding on filteredArgs.length===1
+      // was dead — about:blank/<url> is already appended above, so length is always >=2.)
+      if (isOpenCmd) {
         try {
           const listProc = Bun.spawn([bin, ...binArgs, "tab-list", `-s=${namespacedSession}`], {
             cwd: workDir,
             stdin: "ignore",
             stdout: "pipe",
             stderr: "pipe",
-            env: { PATH: process.env.PATH, HOME: process.env.HOME },
+            env: { PATH: process.env.PATH, HOME: HOME, USERPROFILE: process.env.USERPROFILE },
           });
           const [listStatus, listOut] = await Promise.race([
             Promise.all([listProc.exited, new Response(listProc.stdout).text()]),
@@ -248,10 +301,13 @@ export async function serve() {
 
       const childEnv: Record<string, string | undefined> = {
         PATH: process.env.PATH,
-        HOME: process.env.HOME,
+        HOME: HOME,
+        USERPROFILE: process.env.USERPROFILE,
         TMPDIR: process.env.TMPDIR,
         DISPLAY: process.env.DISPLAY,
         XDG_RUNTIME_DIR: process.env.XDG_RUNTIME_DIR,
+        DEBUG: process.env.DEBUG, // forward debug namespaces (e.g. pw:mcp:relay) for diagnostics
+        PWDEBUG: process.env.PWDEBUG,
         ...(clientName ? { PLAYWRIGHT_MCP_CLIENT_NAME: shortClientLabel(clientName) } : {}),
         ...passthroughEnv,
         // Enable extension bridge when credentials are present
@@ -339,6 +395,18 @@ export async function serve() {
     },
   });
 
+  // A leaked listening-socket handle in an orphaned cliDaemon can keep the port held after a
+  // prior serve exits; on EADDRINUSE, clear stale holders once and retry rather than crash-loop.
+  let server: ReturnType<typeof startServer>;
+  try {
+    server = startServer();
+  } catch (e: any) {
+    if (!String(e?.code ?? e?.message ?? "").includes("EADDRINUSE")) throw e;
+    log(`port ${port} in use — clearing stale daemon holders and retrying`);
+    await freeStalePort(port);
+    server = startServer();
+  }
+
   log(`serving on ${tls ? "https" : "http"}://${server.hostname}:${server.port}`);
   log(`Connection URL set (use .env.local to view)`);
 }