rechrome 1.12.2 → 1.13.0

package/rech.ts

@@ -254,7 +254,7 @@ export const EXTENSION_DIST_DIR = join(process.env.HOME!, ".rechrome", "extensio
 
 // 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.
-export const EXTENSION_ID = "fokngfbogklgiffokdnekajodmhgfnhk";
+export const EXTENSION_ID = "mmlmfjhmonkocbjadbfplnigmagldckm";
 
 async function ensureExtensionDistInstalled(): Promise<string> {
   const source = existsSync(BUNDLED_EXTENSION_DIST_DIR)
@@ -279,28 +279,41 @@ async function findInstalledExtension(
   const cache = await readChromeProfileCache();
   const profiles = profileDir ? [profileDir] : (cache ? Object.keys(cache) : []);
   // Resolve our known-good install paths up front for path-based fallback matching.
+  // LEGACY_EXTENSION_DIST_DIR is intentionally excluded: it points at the pre-V2 multi-tab
+  // bridge, which is incompatible with the current cdpRelayV2 relay — matching it would hand
+  // setup a stale, broken extension.
   const knownPaths = new Set<string>();
-  for (const p of [EXTENSION_DIST_DIR, BUNDLED_EXTENSION_DIST_DIR, LEGACY_EXTENSION_DIST_DIR]) {
+  for (const p of [EXTENSION_DIST_DIR, BUNDLED_EXTENSION_DIST_DIR]) {
     try { knownPaths.add(realpathSync(p)); } catch {}
   }
+  // Read each profile's settings once so we can prioritize stable-ID matches over path fallbacks.
+  const perProfile: Array<{ prof: string; settings: Record<string, any> }> = [];
   for (const prof of profiles) {
     const prefsPath = join(userDataDir, prof, "Secure Preferences");
     const f = file(prefsPath);
     if (!(await f.exists())) continue;
     try {
       const data = JSON.parse(await f.text());
-      const settings = data?.extensions?.settings ?? {};
-      for (const [extId, info] of Object.entries(settings as Record<string, any>)) {
-        if (!info?.path || info.state === 0) continue; // state 0 = explicitly disabled
-        // Primary: stable ID match (works when manifest `key` is set, regardless of path).
-        if (extId === EXTENSION_ID) return { id: extId, profile: prof };
-        // Fallback: path equality for legacy installs without a stable key.
-        let storedPath = info.path as string;
-        try { storedPath = realpathSync(storedPath); } catch {}
-        if (knownPaths.has(storedPath)) return { id: extId, profile: prof };
-      }
+      perProfile.push({ prof, settings: (data?.extensions?.settings ?? {}) as Record<string, any> });
     } catch {}
   }
+  // Pass 1: stable ID match (manifest `key` set, path-independent). This must win over any path
+  // fallback so a stale legacy install sitting on a known path can't shadow the current extension.
+  for (const { prof, settings } of perProfile) {
+    for (const [extId, info] of Object.entries(settings)) {
+      if (!info?.path || info.state === 0) continue; // state 0 = explicitly disabled
+      if (extId === EXTENSION_ID) return { id: extId, profile: prof };
+    }
+  }
+  // Pass 2: path equality fallback for legacy keyless installs without a stable ID.
+  for (const { prof, settings } of perProfile) {
+    for (const [extId, info] of Object.entries(settings)) {
+      if (!info?.path || info.state === 0) continue;
+      let storedPath = info.path as string;
+      try { storedPath = realpathSync(storedPath); } catch {}
+      if (knownPaths.has(storedPath)) return { id: extId, profile: prof };
+    }
+  }
   return null;
 }
 
@@ -584,7 +597,7 @@ async function setup(opts: { profile?: string } = {}): Promise<void> {
   };
 
   // [1/4] Daemon
-  console.log("\n[1/4] Setting up serve daemon...");
+  console.log("\n[1/4] Checking serve daemon...");
 
   // Bind address (persists to ~/.env.local as RECH_HOST).
   // Read the persisted value from ~/.env.local directly — process.env may be shadowed by nearer .env files.
@@ -617,15 +630,24 @@ async function setup(opts: { profile?: string } = {}): Promise<void> {
   const liveBindUnknown = !!authPing?.ok && !liveBind;
   const currentBind = liveBind || persistedBind;
 
+  // A healthy daemon already answering on our key needs no reinstall — don't re-prompt for it.
+  const daemonHealthy = !!(anonPing && authPing?.ok && !liveBindUnknown);
+  // An explicit RECH_HOST override that differs from the live bind is a deliberate rebind request.
+  const explicitRebind = !!process.env.RECH_HOST && process.env.RECH_HOST !== currentBind;
+
   // Non-TTY honors explicit process.env.RECH_HOST (shell or merged env stack) — matches the documented `RECH_HOST=0.0.0.0 rech setup` flow.
   let desiredBind = process.env.RECH_HOST || currentBind;
-  if (isTTY) {
+  // Only prompt to (re)configure the bind when we actually need to set up the daemon. A running
+  // daemon is left alone unless the user explicitly asks for a different bind via RECH_HOST.
+  if (isTTY && (!daemonHealthy || explicitRebind)) {
     console.log(`\n      Bind address (current: ${currentBind}):`);
     console.log(`        1.  127.0.0.1  (localhost only)`);
     console.log(`        2.  0.0.0.0    (all interfaces — HTTP plaintext, trust your network)`);
     const defaultBindChoice = currentBind === "0.0.0.0" ? "2" : "1";
     const bindAns = (await ask(`      Choice [${defaultBindChoice}]: `, defaultBindChoice)).trim();
     desiredBind = bindAns === "2" || bindAns === "0.0.0.0" ? "0.0.0.0" : "127.0.0.1";
+  } else if (daemonHealthy) {
+    console.log(`      Daemon already running at ${protocol}://${host}:${port} (bind: ${currentBind}) — skipping daemon setup`);
   }
   const bindChanged = desiredBind !== currentBind;
   const persistedChanged = desiredBind !== persistedBind;
@@ -761,11 +783,26 @@ async function setup(opts: { profile?: string } = {}): Promise<void> {
       console.log(`      [agent] Find PLAYWRIGHT_MCP_EXTENSION_TOKEN=... on that page`);
       console.log(`      [agent] Provide the token value on next stdin line:\n`);
     }
-    const tokenInput = (await ask("      Paste token: ")).trim();
-    const token = tokenInput.replace(/^.*?=/, "").trim();
-    if (!token || token.length < 20) { console.error("      Invalid token (too short)"); return null; }
-    console.log("      Token accepted");
-    return { extId, token };
+    // Retry on empty/too-short paste — a truncated copy or a stale token shouldn't
+    // abort the whole setup. Bounded so a non-TTY agent with exhausted stdin can't spin.
+    const maxTries = isTTY ? 5 : 3;
+    for (let attempt = 1; attempt <= maxTries; attempt++) {
+      const tokenInput = (await ask("      Paste token: ")).trim();
+      const token = tokenInput.replace(/^.*?=/, "").trim();
+      const retriesLeft = maxTries - attempt;
+      if (!token) {
+        console.error(`      No token entered.${retriesLeft ? " Copy the full PLAYWRIGHT_MCP_EXTENSION_TOKEN value and try again." : ""}`);
+      } else if (token.length < 20) {
+        console.error(`      Token too short (${token.length} chars) — likely truncated when copying.${retriesLeft ? " Re-copy the full value and try again." : ""}`);
+      } else {
+        console.log("      Token accepted");
+        return { extId, token };
+      }
+      // Non-TTY with no input left: ask() won't block, so stop instead of burning retries on empty reads.
+      if (!isTTY && !tokenInput) break;
+    }
+    console.error("      No valid token provided — aborting");
+    return null;
   }
 
   // [2/4] Primary profile
@@ -796,12 +833,16 @@ 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");
+  // 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)]);
   const saveChoice = (await ask(
-    `Save to:\n  1. ${pwdEnvPath} (current dir) [default]\n  2. ${pwdRechPath} (current dir, rechrome-only)\n  3. ${homeEnvPath} (user home)\n  4. Skip (already copied)\n\n  Choice [1]: `
+    `Save to:\n  1. ${pwdEnvPath} (current dir) [${pwdTag}] [default]\n  2. ${pwdRechPath} (current dir, rechrome-only) [${pwdRechTag}]\n  3. ${homeEnvPath} (user home) [${homeTag}]\n  4. Skip (already copied)\n\n  Choice [1]: `
   )).trim();
   if (saveChoice !== "4") {
     const globalEnvPath = saveChoice === "3" ? homeEnvPath : saveChoice === "2" ? pwdRechPath : pwdEnvPath;
     if (saveChoice === "2") mkdirSync(join(process.cwd(), ".rechrome"), { recursive: true });
+    const existedBefore = await file(globalEnvPath).exists();
     const existing = await file(globalEnvPath).text().catch(() => "");
     const keysToRemove = ["PLAYWRIGHT_MCP_USER_DATA_DIR", "PLAYWRIGHT_MCP_EXTENSION_ID", "PLAYWRIGHT_MCP_EXTENSION_TOKEN", "PLAYWRIGHT_MCP_PROFILE_DIRECTORY"];
     let lines = existing.trimEnd().split("\n").filter(l => !keysToRemove.some(k => l.startsWith(`${k}=`)));
@@ -809,7 +850,7 @@ async function setup(opts: { profile?: string } = {}): Promise<void> {
     if (rechIdx >= 0) lines[rechIdx] = newLine;
     else lines.push(newLine);
     await Bun.write(globalEnvPath, lines.join("\n").trim() + "\n");
-    console.log(`\nSaved to ${globalEnvPath}`);
+    console.log(`\n${existedBefore ? "Updated" : "Created"} ${globalEnvPath}`);
   }
 
   // Save primary to token registry
@@ -837,7 +878,7 @@ async function setup(opts: { profile?: string } = {}): Promise<void> {
   }
   rl?.close();
   envWatcher?.close();
-  console.log(`\nDone! Test with:\n  rech eval "() => document.title"`);
+  console.log(`\nDone! Test with:\n  rech open github.com/snomiao`);
 }
 
 async function status(): Promise<void> {