rechrome 1.31.0 → 1.31.2

package/package.json

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

package/rechrome.js

@@ -1922,14 +1922,31 @@ async function ensureDaemonManager(ask: (q: string, def?: string) => Promise<str
   daemonManager();
 }
 
+/**
+ * Rewriting RECHROME_URL for a new daemon key must not drop the saved `?profile=`: without it
+ * every client loses its Chrome profile (and a setup aborted before its final save step used
+ * to leave it that way).
+ */
+export function keepProfileParam(next: string, previous?: string): string {
+  try {
+    const url = new URL(next);
+    // A .env.local value may be quoted: RECHROME_URL="http://…/?profile=work".
+    const raw = previous?.trim().replace(/^(['"])(.*)\1$/, "$2");
+    const profile = raw ? new URL(raw).searchParams.get("profile") : null;
+    if (profile && !url.searchParams.has("profile")) url.searchParams.set("profile", profile);
+    return url.toString();
+  } catch { return next; }
+}
+
 export async function daemonInstall(serveUrl: string): Promise<void> {
   // Resolve the manager first so a missing dependency fails before config is mutated.
   const mgr = daemonManager();
   // Persist the URL for future clients without an explicit environment override.
   // The daemon's explicit environment takes precedence over this saved default.
   const envRaw = await file(globalEnvFile).text().catch(() => "");
-  const filtered = envRaw.trimEnd().split("\n").filter(l => !l.startsWith(`${ENV_KEY}=`));
-  await Bun.write(globalEnvFile, [...filtered, `${ENV_KEY}=${serveUrl}`, ""].join("\n"));
+  const lines = envRaw.trimEnd().split("\n");
+  const filtered = lines.filter(l => !l.startsWith(`${ENV_KEY}=`));
+  await Bun.write(globalEnvFile, [...filtered, `${ENV_KEY}=${keepProfileParam(serveUrl, lines.find(l => l.startsWith(`${ENV_KEY}=`))?.slice(ENV_KEY.length + 1))}`, ""].join("\n"));
 
   const home = HOME;
   const bunBin = Bun.which("bun") ?? process.execPath;
@@ -1990,13 +2007,16 @@ export async function daemonInstall(serveUrl: string): Promise<void> {
     await runPm(mgr, ["save"]); // persist process list for `pm2 resurrect` on reboot
   } else {
     const envArgs = Object.entries(daemonEnv).flatMap(([k, v]) => ["--env", `${k}=${v}`]);
+    // oxmgr shell-splits the command string (backslashes are escapes, so `C:\Users\…` became
+    // `C:Users…`); pass quoted forward-slash paths — Windows accepts `/`, quotes keep spaces.
+    const q = (path: string) => `"${path.replaceAll("\\", "/")}"`;
     startCode = await runPm(mgr, [
       "start",
       "--name", PM_PROCESS_NAME,
       "--restart", "always",
       "--cwd", home,
       ...envArgs,
-      `${bunBin} ${rechScript} serve`,
+      `${q(bunBin)} ${q(rechScript)} serve`,
     ]);
     // Boot/login persistence: on Windows the winfix oxmgr wires Task Scheduler,
     // on POSIX a systemd --user unit / launchd agent — the equivalent of the pm2

package/rechrome.ts

@@ -1922,14 +1922,31 @@ async function ensureDaemonManager(ask: (q: string, def?: string) => Promise<str
   daemonManager();
 }
 
+/**
+ * Rewriting RECHROME_URL for a new daemon key must not drop the saved `?profile=`: without it
+ * every client loses its Chrome profile (and a setup aborted before its final save step used
+ * to leave it that way).
+ */
+export function keepProfileParam(next: string, previous?: string): string {
+  try {
+    const url = new URL(next);
+    // A .env.local value may be quoted: RECHROME_URL="http://…/?profile=work".
+    const raw = previous?.trim().replace(/^(['"])(.*)\1$/, "$2");
+    const profile = raw ? new URL(raw).searchParams.get("profile") : null;
+    if (profile && !url.searchParams.has("profile")) url.searchParams.set("profile", profile);
+    return url.toString();
+  } catch { return next; }
+}
+
 export async function daemonInstall(serveUrl: string): Promise<void> {
   // Resolve the manager first so a missing dependency fails before config is mutated.
   const mgr = daemonManager();
   // Persist the URL for future clients without an explicit environment override.
   // The daemon's explicit environment takes precedence over this saved default.
   const envRaw = await file(globalEnvFile).text().catch(() => "");
-  const filtered = envRaw.trimEnd().split("\n").filter(l => !l.startsWith(`${ENV_KEY}=`));
-  await Bun.write(globalEnvFile, [...filtered, `${ENV_KEY}=${serveUrl}`, ""].join("\n"));
+  const lines = envRaw.trimEnd().split("\n");
+  const filtered = lines.filter(l => !l.startsWith(`${ENV_KEY}=`));
+  await Bun.write(globalEnvFile, [...filtered, `${ENV_KEY}=${keepProfileParam(serveUrl, lines.find(l => l.startsWith(`${ENV_KEY}=`))?.slice(ENV_KEY.length + 1))}`, ""].join("\n"));
 
   const home = HOME;
   const bunBin = Bun.which("bun") ?? process.execPath;
@@ -1990,13 +2007,16 @@ export async function daemonInstall(serveUrl: string): Promise<void> {
     await runPm(mgr, ["save"]); // persist process list for `pm2 resurrect` on reboot
   } else {
     const envArgs = Object.entries(daemonEnv).flatMap(([k, v]) => ["--env", `${k}=${v}`]);
+    // oxmgr shell-splits the command string (backslashes are escapes, so `C:\Users\…` became
+    // `C:Users…`); pass quoted forward-slash paths — Windows accepts `/`, quotes keep spaces.
+    const q = (path: string) => `"${path.replaceAll("\\", "/")}"`;
     startCode = await runPm(mgr, [
       "start",
       "--name", PM_PROCESS_NAME,
       "--restart", "always",
       "--cwd", home,
       ...envArgs,
-      `${bunBin} ${rechScript} serve`,
+      `${q(bunBin)} ${q(rechScript)} serve`,
     ]);
     // Boot/login persistence: on Windows the winfix oxmgr wires Task Scheduler,
     // on POSIX a systemd --user unit / launchd agent — the equivalent of the pm2

package/serve.js

@@ -691,6 +691,39 @@ export async function serve() {
       const isOpenNoUrl = isOpenCmd && filteredArgs.length === 1;
       if (isOpenNoUrl) filteredArgs.push("about:blank");
 
+      // Merge passthrough env: server .env.local defaults, then client overrides
+      const passthroughEnv: Record<string, string | undefined> = {};
+      for (const key of PASSTHROUGH_ENV_KEYS) {
+        if (process.env[key]) passthroughEnv[key] = process.env[key];
+      }
+      Object.assign(passthroughEnv, clientEnv, profileEnv);
+
+      // Resolve profile name/email → directory name
+      if (!scoped && passthroughEnv.PLAYWRIGHT_MCP_PROFILE_DIRECTORY) {
+        const resolved = await resolveProfileDirectory(passthroughEnv.PLAYWRIGHT_MCP_PROFILE_DIRECTORY);
+        if (resolved !== passthroughEnv.PLAYWRIGHT_MCP_PROFILE_DIRECTORY)
+          log(`profile resolved: "${passthroughEnv.PLAYWRIGHT_MCP_PROFILE_DIRECTORY}" → "${resolved}"`);
+        passthroughEnv.PLAYWRIGHT_MCP_PROFILE_DIRECTORY = resolved;
+      }
+
+      // Never fall back silently: without extension credentials (a registered profile) or a managed
+      // user-data dir, `open` would launch a separate headless browser with a throwaway profile —
+      // the command "succeeds" and nothing shows up in the user's Chrome.
+      const extensionMode = !!(passthroughEnv.PLAYWRIGHT_MCP_EXTENSION_ID && passthroughEnv.PLAYWRIGHT_MCP_EXTENSION_TOKEN);
+      // Checked before the existing-session shortcuts below: reusing a leftover headless session
+      // (bare `open` answered with its tab list, or `open <url>` rewritten to goto) is the same
+      // silent fallback.
+      if (isOpenCmd && !extensionMode && !passthroughEnv.PLAYWRIGHT_MCP_USER_DATA_DIR) {
+        const requested = passthroughEnv.PLAYWRIGHT_MCP_PROFILE_DIRECTORY;
+        const registered = Object.keys(await readTokenRegistry().catch(() => ({})));
+        const known = registered.length ? `Registered here: ${registered.join(", ")}` : "No profiles are registered here yet: rech setup";
+        const stderr = requested
+          ? `[rech] profile "${requested}" has no extension token on this machine, so rech would open a separate headless browser instead of your Chrome. Refusing.\n  Register it: rech setup --profile ${JSON.stringify(requested)}\n  ${known}\n`
+          : `[rech] no Chrome profile selected, so rech would open a separate headless browser instead of your Chrome. Refusing.\n  Pick one: rech --profile <email> open <url>, or add ?profile=<email> to RECHROME_URL\n  ${known}\n`;
+        log(`refused open without a profile (session=${namespacedSession}, requested=${requested ?? "-"})`);
+        return Response.json({ status: 1, stdout: "", stderr, files: [] });
+      }
+
       // 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.)
@@ -730,21 +763,6 @@ export async function serve() {
         }
       }
 
-      // Merge passthrough env: server .env.local defaults, then client overrides
-      const passthroughEnv: Record<string, string | undefined> = {};
-      for (const key of PASSTHROUGH_ENV_KEYS) {
-        if (process.env[key]) passthroughEnv[key] = process.env[key];
-      }
-      Object.assign(passthroughEnv, clientEnv, profileEnv);
-
-      // Resolve profile name/email → directory name
-      if (!scoped && passthroughEnv.PLAYWRIGHT_MCP_PROFILE_DIRECTORY) {
-        const resolved = await resolveProfileDirectory(passthroughEnv.PLAYWRIGHT_MCP_PROFILE_DIRECTORY);
-        if (resolved !== passthroughEnv.PLAYWRIGHT_MCP_PROFILE_DIRECTORY)
-          log(`profile resolved: "${passthroughEnv.PLAYWRIGHT_MCP_PROFILE_DIRECTORY}" → "${resolved}"`);
-        passthroughEnv.PLAYWRIGHT_MCP_PROFILE_DIRECTORY = resolved;
-      }
-
       const childEnv: Record<string, string | undefined> = {
         PATH: process.env.PATH,
         HOME: HOME,

package/serve.ts

@@ -691,6 +691,39 @@ export async function serve() {
       const isOpenNoUrl = isOpenCmd && filteredArgs.length === 1;
       if (isOpenNoUrl) filteredArgs.push("about:blank");
 
+      // Merge passthrough env: server .env.local defaults, then client overrides
+      const passthroughEnv: Record<string, string | undefined> = {};
+      for (const key of PASSTHROUGH_ENV_KEYS) {
+        if (process.env[key]) passthroughEnv[key] = process.env[key];
+      }
+      Object.assign(passthroughEnv, clientEnv, profileEnv);
+
+      // Resolve profile name/email → directory name
+      if (!scoped && passthroughEnv.PLAYWRIGHT_MCP_PROFILE_DIRECTORY) {
+        const resolved = await resolveProfileDirectory(passthroughEnv.PLAYWRIGHT_MCP_PROFILE_DIRECTORY);
+        if (resolved !== passthroughEnv.PLAYWRIGHT_MCP_PROFILE_DIRECTORY)
+          log(`profile resolved: "${passthroughEnv.PLAYWRIGHT_MCP_PROFILE_DIRECTORY}" → "${resolved}"`);
+        passthroughEnv.PLAYWRIGHT_MCP_PROFILE_DIRECTORY = resolved;
+      }
+
+      // Never fall back silently: without extension credentials (a registered profile) or a managed
+      // user-data dir, `open` would launch a separate headless browser with a throwaway profile —
+      // the command "succeeds" and nothing shows up in the user's Chrome.
+      const extensionMode = !!(passthroughEnv.PLAYWRIGHT_MCP_EXTENSION_ID && passthroughEnv.PLAYWRIGHT_MCP_EXTENSION_TOKEN);
+      // Checked before the existing-session shortcuts below: reusing a leftover headless session
+      // (bare `open` answered with its tab list, or `open <url>` rewritten to goto) is the same
+      // silent fallback.
+      if (isOpenCmd && !extensionMode && !passthroughEnv.PLAYWRIGHT_MCP_USER_DATA_DIR) {
+        const requested = passthroughEnv.PLAYWRIGHT_MCP_PROFILE_DIRECTORY;
+        const registered = Object.keys(await readTokenRegistry().catch(() => ({})));
+        const known = registered.length ? `Registered here: ${registered.join(", ")}` : "No profiles are registered here yet: rech setup";
+        const stderr = requested
+          ? `[rech] profile "${requested}" has no extension token on this machine, so rech would open a separate headless browser instead of your Chrome. Refusing.\n  Register it: rech setup --profile ${JSON.stringify(requested)}\n  ${known}\n`
+          : `[rech] no Chrome profile selected, so rech would open a separate headless browser instead of your Chrome. Refusing.\n  Pick one: rech --profile <email> open <url>, or add ?profile=<email> to RECHROME_URL\n  ${known}\n`;
+        log(`refused open without a profile (session=${namespacedSession}, requested=${requested ?? "-"})`);
+        return Response.json({ status: 1, stdout: "", stderr, files: [] });
+      }
+
       // 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.)
@@ -730,21 +763,6 @@ export async function serve() {
         }
       }
 
-      // Merge passthrough env: server .env.local defaults, then client overrides
-      const passthroughEnv: Record<string, string | undefined> = {};
-      for (const key of PASSTHROUGH_ENV_KEYS) {
-        if (process.env[key]) passthroughEnv[key] = process.env[key];
-      }
-      Object.assign(passthroughEnv, clientEnv, profileEnv);
-
-      // Resolve profile name/email → directory name
-      if (!scoped && passthroughEnv.PLAYWRIGHT_MCP_PROFILE_DIRECTORY) {
-        const resolved = await resolveProfileDirectory(passthroughEnv.PLAYWRIGHT_MCP_PROFILE_DIRECTORY);
-        if (resolved !== passthroughEnv.PLAYWRIGHT_MCP_PROFILE_DIRECTORY)
-          log(`profile resolved: "${passthroughEnv.PLAYWRIGHT_MCP_PROFILE_DIRECTORY}" → "${resolved}"`);
-        passthroughEnv.PLAYWRIGHT_MCP_PROFILE_DIRECTORY = resolved;
-      }
-
       const childEnv: Record<string, string | undefined> = {
         PATH: process.env.PATH,
         HOME: HOME,