Pup - the AI's own browser

@@ -2515,6 +2515,51 @@ async function hidePupCursorEverywhere(page) {   }).catch(() => {}))); } +// v2.0.321 (#72): trusted input via a DEDICATED, TIMEOUT-BOUNDED CDP session, NOT puppeteer's+// page.mouse/keyboard. puppeteer serializes every mouse op behind an internal lock; when one+// Input.dispatchMouseEvent hangs (a click handler that awaits navigator.clipboard.writeText in an+// UNFOCUSED window neither resolves nor rejects), that lock is held forever and EVERY later dispatch+// on the page wedges — the session's input is dead until the window is recreated, because the lock+// lives in puppeteer's memory where pup_reload/pup_rescan cannot reach it. A per-tab CDP session we+// OWN, with a per-call deadline, isolates the failure: a hang times out, we DISCARD that session,+// and the next call makes a fresh one. One bad page handler can no longer poison the whole session.+async function _inputCdp(tab) {+  if (tab._inputCdp && !tab._inputCdpDead) return tab._inputCdp;+  const sess = await tab.page.target().createCDPSession();+  tab._inputCdp = sess; tab._inputCdpDead = false;+  return sess;+}+function killInputCdp(tab) {+  const sess = tab && tab._inputCdp;+  if (tab) { tab._inputCdp = null; tab._inputCdpDead = false; }+  if (sess) { try { const r = sess.detach(); if (r && r.catch) r.catch(() => {}); } catch (e) {} }+}+async function _rawInput(tab, method, params, ms = 6000) {+  const sess = await _inputCdp(tab);+  try {+    return await Promise.race([+      sess.send(method, params),+      new Promise((_, rej) => setTimeout(() => rej(new Error('input_dispatch_timeout')), ms)),+    ]);+  } catch (e) {+    // a hung/failed command leaves this CDP session with a stuck in-flight send; discard it so the+    // NEXT dispatch is clean. THIS is the #72 fix: the wedge can never persist past one call.+    killInputCdp(tab);+    if (String(e && e.message) === 'input_dispatch_timeout') { const err = new Error('input timed out after ' + ms + 'ms — a page handler hung (e.g. clipboard write in an unfocused window). The input channel was reset; retry, and if it persists the page handler is the cause.'); err.wedge = true; throw err; }+    throw e;+  }+}+const _btnMask = (b) => (b === 'right' ? 2 : b === 'middle' ? 4 : 1);+async function rawTrustedClick(tab, x, y, { button = 'left', clickCount = 1, ms = 6000 } = {}) {+  const b = button === 'right' ? 'right' : button === 'middle' ? 'middle' : 'left';+  await _rawInput(tab, 'Input.dispatchMouseEvent', { type: 'mouseMoved', x, y, button: 'none', buttons: 0 }, ms);+  await _rawInput(tab, 'Input.dispatchMouseEvent', { type: 'mousePressed', x, y, button: b, buttons: _btnMask(b), clickCount }, ms);+  await _rawInput(tab, 'Input.dispatchMouseEvent', { type: 'mouseReleased', x, y, button: b, buttons: 0, clickCount }, ms);+}+async function rawTrustedMove(tab, x, y, { ms = 6000 } = {}) {+  await _rawInput(tab, 'Input.dispatchMouseEvent', { type: 'mouseMoved', x, y, button: 'none', buttons: 0 }, ms);+}+ async function showPupCursor(page, x, y, { click = true, label = null } = {}) {   try {     // Remove any stale instance ANYWHERE (legacy id, or one left in an iframe) before drawing.@@ -15164,6 +15209,9 @@ const server = http.createServer(async (req, res) => {           //     callers with random tabs in their sessions list.           try {             const adoptOrphans = !!args.adoptOrphans;+            // v2.0.321 (#72 ask): rescan also resets each tab's input CDP session, so a wedged input+            // channel is recovered by pup_rescan (in addition to the automatic discard-on-timeout).+            for (const [, ss] of sessions) { for (const t of (ss.tabs || [])) { try { if (t && t._inputCdp) killInputCdp(t); } catch (e) {} } }             const stats = await rescanAllProfiles({ adoptOrphans });             brandSweep('rescan').catch(() => {}); // v1.8.79: unify icons on re-adopted windows             // Build the post-rescan session list so callers can verify@@ -17572,13 +17620,13 @@ const server = http.createServer(async (req, res) => {                   }                 } -                // page.click does scrollIntoView + bounding-rect resolution + page.mouse.click.-                // Chromium dispatches via Input.dispatchMouseEvent → isTrusted=true.-                await chosenHandle.click({-                  button: args.button || 'left',-                  clickCount: args.clickCount || 1,-                  delay: args.delay || 0,-                });+                // v2.0.321 (#72): scroll into view, resolve the rect, then click via the ISOLATED+                // timeout-bounded CDP path (rawTrustedClick) instead of chosenHandle.click(), which+                // routes through puppeteer's wedge-prone mouse lock. isTrusted=true either way.+                try { await chosenHandle.scrollIntoView(); } catch (e) {}+                let _box = null; try { _box = await chosenHandle.boundingBox(); } catch (e) {}+                if (!_box || _box.width < 1 || _box.height < 1) { sendJSON(res, { success: false, error: 'chosen element has no visible box to click', selector: args.selector }); return; }+                await rawTrustedClick(tab, Math.round(_box.x + _box.width / 2), Math.round(_box.y + _box.height / 2), { button: args.button || 'left', clickCount: args.clickCount || 1 });                 sendJSON(res, { success: true, output: JSON.stringify({                   ok: true,                   sessionId: resolvedId,@@ -17610,11 +17658,7 @@ const server = http.createServer(async (req, res) => {                 sendJSON(res, { success: false, error: 'pup_input_dispatch click: provide either {selector} OR {x, y}' });                 return;               }-              await tab.page.mouse.click(args.x, args.y, {-                button: args.button || 'left',-                clickCount: args.clickCount || 1,-                delay: args.delay || 0,-              });+              await rawTrustedClick(tab, args.x, args.y, { button: args.button || 'left', clickCount: args.clickCount || 1 });               sendJSON(res, { success: true, output: JSON.stringify({ ok: true, sessionId: resolvedId, tabId, dispatched: 'click', via: 'coords', x: args.x, y: args.y }) });               return;             }@@ -17627,7 +17671,7 @@ const server = http.createServer(async (req, res) => {               // only clicks moved it, which undercuts the whole "gliding cursor" idea. Move the               // visible cursor with the real pointer (no click ripple).               if (args.showCursor !== false) { try { await showPupCursor(tab.page, Number(args.x), Number(args.y), { click: false, label: args.intent || 'Moving' }); } catch (e) {} }-              await tab.page.mouse.move(args.x, args.y, { steps: args.steps || 1 });+              await rawTrustedMove(tab, args.x, args.y);               sendJSON(res, { success: true, output: JSON.stringify({ ok: true, sessionId: resolvedId, tabId, dispatched: 'move', x: args.x, y: args.y }) });               return;             }@@ -17644,7 +17688,7 @@ const server = http.createServer(async (req, res) => {                   return;                 }               }-              await tab.page.keyboard.type(args.text, { delay: args.delay || 0 });+              await withTimeout(tab.page.keyboard.type(args.text, { delay: args.delay || 0 }), 15000, 'input type');               sendJSON(res, { success: true, output: JSON.stringify({ ok: true, sessionId: resolvedId, tabId, dispatched: 'type', length: args.text.length }) });               return;             }@@ -17653,13 +17697,13 @@ const server = http.createServer(async (req, res) => {                 sendJSON(res, { success: false, error: 'pup_input_dispatch key requires {key} (Enter|Escape|Tab|ArrowUp|...)' });                 return;               }-              await tab.page.keyboard.press(args.key, { delay: args.delay || 0 });+              await withTimeout(tab.page.keyboard.press(args.key, { delay: args.delay || 0 }), 8000, 'input key');               sendJSON(res, { success: true, output: JSON.stringify({ ok: true, sessionId: resolvedId, tabId, dispatched: 'key', key: args.key }) });               return;             }             sendJSON(res, { success: false, error: `pup_input_dispatch: unknown type "${args.type}". Supported: click | move | type | key` });           } catch (e) {-            sendJSON(res, { success: false, error: `pup_input_dispatch ${t} failed: ${e.message}` });+            sendJSON(res, { success: false, errorCode: e && e.wedge ? 'input_channel_reset' : undefined, error: `pup_input_dispatch ${t} failed: ${e.message}`, _hint: e && e.wedge ? 'The input channel was reset after a hung page handler; the session is NOT wedged — retry the dispatch. If it keeps hanging, the page handler itself (often an unfocused-window clipboard write) is the cause.' : undefined });           }           return;         }