9remote 3.0.34 → 3.0.40

package/dist/extension/background.js

@@ -1,33 +1,84 @@
-// 9remote browser bridge — a dumb CDP pipe. All business logic (snapshot,
+// 9remote browser bridge — a dumb pipe. All business logic (snapshot,
 // click gates, tab discipline, settle waits) lives in the host engine; this
-// worker only forwards CDP verbs to chrome.debugger and shims the browser-level
-// tab verbs the engine speaks over the wire. It should almost never change.
-// Deliberately NOT an ES module (no import): the host bakes the relay URL into
-// this placeholder at install time, so no "type": "module" / SW-cache class of bugs.
+// worker drives pages with a static content-script runner + synthetic DOM
+// events, so Chrome never shows a debugging banner. It should almost never
+// change. Deliberately NOT an ES module (no import): the host bakes the relay
+// URL into this placeholder at install time, so no "type": "module" /
+// SW-cache class of bugs.
 const RELAY_URL = "__RELAY_URL__";
 
 let ws = null;
 let paused = false; // user's kill switch (popup) — survives Chrome restarts
-const attached = new Set(); // target ids (strings — chrome.debugger's form) with a live attach
 const agentTabs = new Set(); // tabs the bridge opened or drives — never "the user's focus"
 let activeTabId = null; // tab Chrome currently shows
 let prevActiveTabId = null; // tab shown before the current one — the focus restore target
-// Idle soft-detach: Chrome closes the "started debugging" banner ~5s after the
-// debugger detaches, so an idle agent gets out of the user's face. The next
-// command re-attaches transparently — the engine never notices.
-const idleDetached = new Set(); // tabs WE detached while idle
-let lastCallAt = 0;
-const IDLE_DETACH_MS = 10000;
-const IDLE_SWEEP_MS = 3000;
+const GROUP_TITLE = "9remote"; // agent tabs share one named tab group
+const GROUP_COLOR = "orange"; // matches the 9remote brand
 
-function send(frame) {
-  try { ws?.send(JSON.stringify(frame)); } catch { /* relay down — close handler reconnects */ }
+// Serializes grouping so two quick creates cannot each mint their own group.
+let groupQueue = Promise.resolve();
+// Cosmetic only: a grouping failure must never break the agent's command.
+function groupAgentTab(tab) {
+  groupQueue = groupQueue.then(async () => {
+    const [group] = await chrome.tabGroups.query({ title: GROUP_TITLE, windowId: tab.windowId });
+    const groupId = await chrome.tabs.group(group ? { tabIds: tab.id, groupId: group.id } : { tabIds: tab.id });
+    if (!group) await chrome.tabGroups.update(groupId, { title: GROUP_TITLE, color: GROUP_COLOR });
+  }).catch(() => {});
 }
 
-async function detachQuiet(tid, idle = false) {
-  attached.delete(tid);
-  if (!idle) idleDetached.delete(tid);
-  try { await chrome.debugger.detach({ targetId: tid }); } catch { /* already gone */ }
+// Setup verbs the runner path accepts and ignores — no debugger session exists.
+const LIGHT_NOOP = new Set(["Page.enable", "DOM.enable", "Runtime.enable", "Log.enable",
+  "Target.setAutoAttach", "Target.setDiscoverTargets",
+  "Emulation.setDeviceMetricsOverride", "Emulation.setFocusEmulationEnabled"]);
+const LIGHT_UNSUPPORTED = new Set(["Page.captureScreenshot", "DOM.getDocument",
+  "DOM.requestNode", "DOM.setFileInputFiles"]);
+
+// Normalize chrome API errors into the CDP shapes the engine's DEAD_SESSION
+// regex keys on, so a closed tab heals the session instead of wedging it.
+function normErr(tid, e) {
+  const msg = e?.message || String(e);
+  if (/no tab|tab not found|cannot access|chrome:\/\/|chrome web store/i.test(msg)) return `No target with given id: ${tid}`;
+  if (/refused to evaluate|content security policy/i.test(msg)) {
+    return `page CSP blocks script injection — this site cannot be driven via the extension`;
+  }
+  return msg; // anything else reads as "document navigating" to the engine
+}
+
+// The runner is injected once per tab (idempotent — see runner.js); navigation
+// destroys it, and the first sendMessage after that re-injects (AutoAgent
+// background pattern).
+const runnerTabs = new Set();
+async function ensureRunner(tabId) {
+  if (runnerTabs.has(tabId)) return;
+  await chrome.scripting.executeScript({ target: { tabId }, files: ["runner.js"] });
+  runnerTabs.add(tabId);
+}
+
+// Runtime.evaluate → a named op on the static runner (see runner.js — MV3 CSP
+// forbids eval, so the host tags every expression with an op name instead).
+// Promise-returning ops are awaited inside the runner before the reply.
+// A committing navigation wipes the runner and the injection can race it —
+// retry the inject+ask pair a bounded number of times before giving up.
+const TRANSIENT_INJECT = /receiving end does not exist|could not establish|message channel|cannot access contents/i;
+async function evalInTab(tid, params) {
+  if (!params.op) throw new Error("the runner needs op-tagged expressions (update the host)");
+  const tabId = Number(tid);
+  let lastErr = null;
+  for (let i = 0; i < 8; i++) {
+    try {
+      await ensureRunner(tabId);
+      const r = await chrome.tabs.sendMessage(tabId, { t: "op", op: params.op, args: params.args || [] });
+      if (!r) throw new Error(`No target with given id: ${tid}`);
+      if (!r.ok) throw normErr(tid, { message: r.err });
+      return r.v ?? null;
+    } catch (e) {
+      lastErr = e;
+      if (!TRANSIENT_INJECT.test(e?.message || "")) throw normErr(tid, e);
+      runnerTabs.delete(tabId); // document changed under us — inject fresh
+      await new Promise((r) => setTimeout(r, 250));
+    }
+  }
+  throw normErr(tid, lastErr);
 }
 
 // Restore what the user was watching when a popup stole the focus. Only called
@@ -44,19 +95,18 @@ function snapBackFocus(tid) {
   setTimeout(focusBack, 250);
 }
 
-// Browser-level verbs the engine needs but chrome.debugger does not expose —
-// routed to chrome.tabs / chrome.debugger equivalents. Everything else rides
-// sendCommand untouched, so engine changes never require an extension update.
+// Browser-level verbs the engine speaks over the wire, routed to chrome.tabs.
 const SHIM = {
   "Target.getTargets": async () => {
-    const targets = await chrome.debugger.getTargets();
-    return { targetInfos: targets.map((t) => ({ targetId: String(t.id), type: t.type, title: t.title, url: t.url })) };
+    const tabs = await chrome.tabs.query({});
+    return { targetInfos: tabs.map((t) => ({ targetId: String(t.id), type: "page", title: t.title, url: t.url })) };
   },
   "Target.createTarget": async ({ url }) => {
     // Always background: agent tabs never steal the user's focus (focus
     // emulation on the page keeps them rendering anyway).
     const tab = await chrome.tabs.create({ url: url || "about:blank", active: false });
     agentTabs.add(String(tab.id));
+    groupAgentTab(tab);
     return { targetId: String(tab.id) };
   },
   "Target.closeTarget": async ({ targetId }) => {
@@ -64,26 +114,21 @@ const SHIM = {
     return {};
   },
   "Target.attachToTarget": async ({ targetId }) => {
-    // chrome.debugger debuggee ids are STRINGS; chrome.tabs takes numbers —
-    // translate at each boundary and keep strings everywhere inside.
+    // No debugger session exists — the session id IS the tab id.
     const tid = String(targetId);
-    if (attached.has(tid)) return { sessionId: tid }; // session heal re-attaches its own target
-    // One attached page at a time — mirrors engine usage, avoids stacked infobars.
-    for (const prev of [...attached]) if (prev !== tid) detachQuiet(prev);
-    await chrome.debugger.attach({ targetId: tid }, "1.3");
-    attached.add(tid);
+    agentTabs.add(tid);
     // A popup our click spawned takes the focus Chrome gives it — hand it back
     // to the tab the user was actually reading. The agent drives in background.
-    agentTabs.add(tid);
     snapBackFocus(tid);
     return { sessionId: tid };
   },
-  "Target.detachFromTarget": async ({ sessionId }) => {
-    await detachQuiet(String(sessionId));
-    return {};
+  "Target.detachFromTarget": async () => ({}),
+  "Target.getTargetInfo": async ({ targetId }) => {
+    const t = await chrome.tabs.get(Number(targetId));
+    return { targetInfo: { targetId: String(t.id), type: "page", title: t.title, url: t.url } };
   },
-  // OOPIF child sessions are not reachable via chrome.debugger — accept and
-  // ignore so the engine's setup() does not fail (frames just stay unobserved).
+  // OOPIF child sessions are not reachable — accept and ignore so the
+  // engine's setup() does not fail (frames just stay unobserved).
   "Target.setAutoAttach": async () => ({}),
   // Browser-level discovery is synthesized from tabs.onCreated below.
   "Target.setDiscoverTargets": async () => ({}),
@@ -95,38 +140,50 @@ const SHIM = {
 let inputAt = 0; // last Input.* dispatch — gates popup adoption below
 
 async function dispatch(method, params, targetId) {
-  if (SHIM[method]) return SHIM[method](params || {});
-  if (targetId == null) throw new Error(`${method} is not available via the extension`);
-  if (method.startsWith("Input.")) inputAt = Date.now();
-  const tid = String(targetId);
-  // Not attached (idle soft-detach, or this worker restarted and lost its set):
-  // try to (re)attach first. Only a missing tab masquerades as "No target";
-  // other failures (e.g. DevTools open on the tab) must surface as themselves.
-  if (!attached.has(tid)) {
-    idleDetached.delete(tid);
-    try {
-      await chrome.debugger.attach({ targetId: tid }, "1.3");
-      attached.add(tid);
-    } catch (e) {
-      throw /no target|not found|cannot access/i.test(e?.message || "")
-        ? new Error(`No target with given id: ${targetId}`)
-        : e;
-    }
+  if (LIGHT_NOOP.has(method)) return {};
+  if (method === "Runtime.evaluate") {
+    if (targetId == null) throw new Error("Runtime.evaluate needs a target");
+    // CDP envelope shape: the host's evaluate() unwraps result.result.value.
+    const value = await evalInTab(String(targetId), params);
+    return { result: { value: value ?? null } };
+  }
+  if (method === "Input.dispatchMouseEvent") {
+    inputAt = Date.now();
+    return evalInTab(String(targetId), { op: "mouse", args: [params.type, params.x, params.y] });
+  }
+  if (method === "Input.dispatchKeyEvent") {
+    inputAt = Date.now();
+    return evalInTab(String(targetId), { op: "key", args: [{ type: params.type, key: params.key, code: params.code,
+      modifiers: params.modifiers || 0, vk: params.windowsVirtualKeyCode, commands: params.commands }] });
   }
-  try {
-    return await chrome.debugger.sendCommand({ targetId: tid }, method, params || {});
-  } catch (e) {
-    // A detached/closed target must look dead to the host's DEAD_SESSION heal.
-    if (!attached.has(tid)) throw new Error(`No target with given id: ${targetId}`);
-    throw e;
+  if (method === "Input.insertText") {
+    inputAt = Date.now();
+    return evalInTab(String(targetId), { op: "insertText", args: [params.text] });
   }
+  if (method === "Page.navigate") {
+    await chrome.tabs.update(Number(targetId), { url: params.url || "about:blank" });
+    return { frameId: 0 };
+  }
+  if (method === "Page.reload") {
+    await chrome.tabs.reload(Number(targetId));
+    return {};
+  }
+  if (method === "Browser.getWindowForTarget") {
+    return { windowId: (await chrome.tabs.get(Number(targetId))).windowId };
+  }
+  if (SHIM[method]) return SHIM[method](params, targetId);
+  if (LIGHT_UNSUPPORTED.has(method)) {
+    throw new Error(`${method} is not available via the extension`);
+  }
+  throw new Error(`${method} is not available via the extension`);
+}
+
+function send(frame) {
+  try { ws?.send(JSON.stringify(frame)); } catch { /* relay down — close handler reconnects */ }
 }
 
-chrome.debugger.onEvent.addListener((source, method, params) => {
-  send({ t: "event", method, params, sessionId: String(source.targetId) });
-});
 // Synthesize Target.targetCreated the engine's popup adoption listens for —
-// chrome.debugger never surfaces browser-level target events.
+// chrome.tabs never surfaces browser-level target events.
 const POPUP_WINDOW_MS = 1500; // born within this after our Input dispatch = the agent's click
 chrome.tabs.onCreated.addListener((tab) => {
   // Only a tab born right after an agent click counts as the agent's popup —
@@ -141,42 +198,35 @@ chrome.tabs.onCreated.addListener((tab) => {
     ...((tab.openerTabId != null && agentPopup) ? { openerId: String(tab.openerTabId) } : {})
   } } });
 });
+// Synthesize the main-frame navigation events settle() keys its nav tail on
+// (a debugger session would get them from CDP for free).
+chrome.webNavigation.onBeforeNavigate.addListener((d) => {
+  if (d.frameId !== 0) return;
+  send({ t: "event", method: "Page.frameRequestedNavigation",
+    params: { frame: {}, disposition: "currentTab" }, sessionId: String(d.tabId) });
+});
+chrome.webNavigation.onCommitted.addListener((d) => {
+  if (d.frameId !== 0) return;
+  send({ t: "event", method: "Page.frameNavigated",
+    params: { frame: { id: "0", url: d.url } }, sessionId: String(d.tabId) });
+});
 // Pure tracking: which tab Chrome shows, and which one came before it. The
 // user clicking ANY tab (agent tabs included, to watch it work) just updates
 // the trackers — focus is only ever restored at the adoption moment above.
 chrome.tabs.onActivated.addListener(({ tabId }) => {
   if (activeTabId !== tabId) { prevActiveTabId = activeTabId; activeTabId = tabId; }
 });
-// A closed tab is gone for good — never re-attach onto its id.
+// A closed tab is gone for good — never adopt onto its id again.
 chrome.tabs.onRemoved.addListener((tabId) => {
-  attached.delete(String(tabId));
-  idleDetached.delete(String(tabId));
-});
-// The idle sweep behind the soft-detach (see idleDetached above).
-setInterval(() => {
-  if (!attached.size || Date.now() - lastCallAt < IDLE_DETACH_MS) return;
-  for (const tid of [...attached]) {
-    idleDetached.add(tid);
-    detachQuiet(tid, true);
-  }
-}, IDLE_SWEEP_MS);
-// "Cancel" on the debug infobar, DevTools open, or tab close — surface it the
-// way CDP would so the engine drops and rebuilds the session instead of wedging.
-chrome.debugger.onDetach.addListener((source) => {
-  attached.delete(source.targetId);
-  idleDetached.delete(String(source.targetId)); // user cancelled — stay detached
-  send({ t: "event", method: "Target.detachedFromTarget", params: {
-    sessionId: String(source.targetId), targetId: String(source.targetId)
-  } });
+  runnerTabs.delete(tabId);
 });
 
-// The user's kill switch: pause = drop debugger + relay, hard. Nothing rides
+// The user's kill switch: pause = drop the relay, hard. Nothing rides
 // through; the host simply sees the extension go offline.
 async function setPaused(next) {
   paused = next;
   try { await chrome.storage.local.set({ paused: next }); } catch { /* non-fatal */ }
   if (next) {
-    for (const tid of [...attached]) detachQuiet(tid);
     try { ws?.close(); } catch { /* already closed */ }
     ws = null;
   } else if (!ws) {
@@ -204,13 +254,12 @@ chrome.runtime.onMessage.addListener((msg, _sender, sendResponse) => {
 function connect() {
   if (paused) return; // never dial out while the kill switch is on
   ws = new WebSocket(RELAY_URL);
-  ws.onopen = () => send({ t: "hello", proto: 1 });
+  ws.onopen = () => send({ t: "hello", proto: 2 });
   ws.onmessage = async (ev) => {
     let m;
     try { m = JSON.parse(ev.data); } catch { return; }
     if (m.t === "ping") return send({ t: "pong" });
     if (m.t !== "call") return;
-    lastCallAt = Date.now();
     try { send({ t: "result", id: m.id, result: await dispatch(m.method, m.params, m.targetId) }); }
     catch (e) { send({ t: "result", id: m.id, error: e?.message || String(e) }); }
   };

package/dist/extension/manifest.json

@@ -1,11 +1,12 @@
 {
   "manifest_version": 3,
-  "name": "9remote Browser Bridge",
-  "version": "1.0.0",
-  "description": "Lets the 9remote host drive this browser. All logic lives on the host — this is only a CDP pipe.",
-  "permissions": ["debugger", "tabs", "storage"],
+  "name": "9remote Bridge",
+  "version": "1.2.0",
+  "description": "Lets the 9remote host drive this browser. All logic lives on the host — this is only a pipe.",
+  "permissions": ["tabs", "tabGroups", "storage", "webNavigation", "scripting"],
+  "host_permissions": ["<all_urls>"],
   "background": { "service_worker": "background.js" },
   "action": { "default_popup": "popup.html" },
   "icons": { "16": "icons/icon16.png", "48": "icons/icon48.png", "128": "icons/icon128.png" },
-  "minimum_chrome_version": "116"
+  "minimum_chrome_version": "135"
 }