← Commit history

Annotate mode exits the way John expects: Esc closes the toolbar and removes the drawings from anywhere in the flow, and Auto mode is one-shot, circle the area, lift the mouse, it is captured and copied, and the toolbar closes immediately so the page is usable again (the drawing stays visible for the owning thread's next screenshot). Turning Auto off keeps the compose-then-Done flow for multi-step annotations, and the Auto tooltip teaches all of it

John Lauer ·a65167c79c ·2mo ago ·parent 454aae9
4 files changed +15−12
adom-bridge-puppeteer-manifest.json+4−4
@@ -1,10 +1,10 @@ {   "manifest_version": 1,   "name": "puppeteer",-  "version": "2.0.58",-  "url": "https://wiki.adom.inc/download/adom/pup-bridge/2.0.58/adom-bridge-puppeteer-v2.0.58.zip",-  "sha256": "ff3c32042c23145f975d9fceef8863b8f8da620010d1b925abf9608f46bfed86",-  "size": 828176,+  "version": "2.0.59",+  "url": "https://wiki.adom.inc/download/adom/pup-bridge/2.0.59/adom-bridge-puppeteer-v2.0.59.zip",+  "sha256": "8fdae250a813aef1ad54c2b7de10e13bf9d0a386f7ea80ada8221c5c49983caa",+  "size": 828290,   "verbPrefixes": [     "browser_",     "desktop_recorder_",
src/BRIDGE_VERSION+1−1
@@ -1 +1 @@-2.0.58+2.0.59
src/bridge.json+1−1
@@ -2,7 +2,7 @@   "manifest_version": 1,   "name": "puppeteer",   "displayName": "Puppeteer (Chrome for Testing + Native)",-  "version": "2.0.58",+  "version": "2.0.59",   "description": "Drives a browser ALREADY on the machine \u2014 installed Chrome, else Microsoft Edge (every Windows PC ships with Edge) \u2014 launched with a FRESH isolated profile, so the common case has NO ~150 MB Chrome-for-Testing download and it never touches the user's real tabs/logins. Binds its local server to LOOPBACK (127.0.0.1) only, so no Windows Firewall 'allow Node through the firewall' prompt ever pops. Chrome for Testing is fetched only as a LAST RESORT if the machine has no Chromium browser at all. SPAWN-VERIFIED fallback: pup tries each detected browser (Chrome \u2192 Edge \u2192 CfT) and actually launches it, falling through to the next if one won't start (and handling browsers like Edge that relaunch onto another PID), so a corrupt/partial install never hard-fails an open. The browser that launches is cached as the default (persisted across restarts) so it isn't re-probed each time. On spawn the bridge SELF-WARMS: detects browsers + disk, and only if the box has no Chrome/Edge and no cached CfT does it background-fetch CfT so the first open is instant. pup_use pins a specific browser (chrome | edge | cft | auto); {browser:'chrome',install:true} downloads & installs REAL Google Chrome (user-scoped, no admin) on an Edge-only box. pup_readiness (READ-ONLY) reports which browser will be used + the full candidate list + the default + free disk. Every failure returns a specific errorCode + _hint (chrome_install_no_disk, chrome_download_network, chrome_install_permission, chrome_stable_not_detected, \u2026). Launches with FULL browser permissions by default for full debug (strictPermissions:true opts out). Headful automation: open/close windows+tabs, navigate, screenshot, eval JS, record. pup is a GENERIC, non-profile browser only \u2014 every session is a fresh isolated Chrome/Edge process, never the user's real signed-in browser; profile defaults to sessionId. To drive the user's REAL Chrome/Edge (their profile, cookies, SSO), use the Adom browser EXTENSION's nbrowser_* verbs \u2014 a separate bridge, not pup's job. macOS (v1.9.74+): full parity with mac-native mechanics \u2014 background-by-default is the app-level hide (windows stay drivable/screenshottable while hidden), raise/lower map to unhide+activate/hide, pup_alert_window posts a native toast whose click focuses the window, pup_use {browser:'chrome',install:true} installs Chrome from the official dmg, and taskbar identity/badging remains Windows-only.",   "homepage": "https://wiki.adom.inc/adom/adom-bridge",   "author": "Adom Inc.",
src/server.js+9−6
@@ -5409,7 +5409,7 @@ const ANNOTATE_OVERLAY_JS = `(() => {     window.__pupAnnotateResult = r;   }   cv.addEventListener('pointerdown', function (e) {-    if (S.tool === 'text') { var t = prompt('Annotation text:'); if (t) { S.strokes.push({ tool: 'text', color: S.color, pts: [[e.clientX, e.clientY]], text: t }); redraw(); if (S.quick) emit(null, false); } return; }+    if (S.tool === 'text') { var t = prompt('Annotation text:'); if (t) { S.strokes.push({ tool: 'text', color: S.color, pts: [[e.clientX, e.clientY]], text: t }); redraw(); if (S.quick) { emit(null, true); removeEventListener('keydown', onKey, true); } } return; }     S.cur = { tool: S.tool, color: S.color, pts: [[e.clientX, e.clientY]] }; cv.setPointerCapture(e.pointerId);   });   cv.addEventListener('pointermove', function (e) { if (S.cur) { S.cur.pts.push([e.clientX, e.clientY]); redraw(); } });@@ -5425,7 +5425,7 @@ const ANNOTATE_OVERLAY_JS = `(() => {     S.strokes.push(S.cur); S.cur = null; redraw();     // QUICK MODE (1a3): the moment the mouse lifts, capture fires — keep drawing and each lift     // supersedes the last capture with the union bbox.-    if (S.quick) emit(null, false);+    if (S.quick) { emit(null, true); removeEventListener('keydown', onKey, true); }   });   function icon(paths, dash) {     var n = document.createElementNS('http://www.w3.org/2000/svg', 'svg');@@ -5472,13 +5472,16 @@ const ANNOTATE_OVERLAY_JS = `(() => {   function qkPaint() { qk.style.cssText = 'background:' + (S.quick ? 'rgba(0,184,177,.13)' : 'none') + ';border:1px solid ' + (S.quick ? 'rgba(0,184,177,.55)' : 'transparent') + ';border-radius:8px;color:' + (S.quick ? '#00d4cb' : '#c9d1d9') + ';padding:3px 8px;cursor:pointer;font:inherit;display:flex;align-items:center;gap:5px;'; }   qk.appendChild(icon(ICONS.auto[0])); qk.appendChild(document.createTextNode('Auto'));    qk.onclick = function () { S.quick = !S.quick; qkPaint(); };-  qkPaint(); bar.appendChild(qk); tipFor(qk, 'Auto capture (on by default): every time you lift the mouse, the marked-up area is captured and copied to your clipboard, ready to paste into any AI chat. Turn off to compose multi-step drawings and capture once with Done.');+  qkPaint(); bar.appendChild(qk); tipFor(qk, 'Auto capture (on by default): circle it, lift the mouse, and it is captured, copied to your clipboard, and the toolbar closes. Turn off to compose multi-step drawings and capture once with Done. Esc exits any time.');   btn('Undo', 'Remove the last thing you drew. Click again to keep unwinding.', function () { S.strokes.pop(); redraw(); }, null, 'undo');   btn('Clear', 'Erase every drawing on this page. The page itself is untouched.', function () { S.strokes = []; redraw(); }, null, 'clear');   var done = btn('Done', 'Capture the annotated area (tight-cropped around your drawing), copy it to your clipboard, and leave the drawing visible so the AI thread that owns this window sees it too.', function () { emit(null, true); }, null, 'done');   done.style.cssText += 'background:rgba(0,184,177,.13);border:1px solid rgba(0,184,177,.55);color:#00d4cb;font-weight:600;';-  btn('', 'Close the annotation toolbar and remove all drawings from the page.', function () { wrap.remove(); window.__pupAnnotate = null; window.__pupAnnotateResult = { done: false, ts: Date.now() }; }, null, 'cancel');-  window.__pupAnnotate = { show: function () { wrap.style.display = ''; bar.style.display = 'flex'; cv.style.pointerEvents = 'auto'; } };+  btn('', 'Close the annotation toolbar and remove all drawings from the page (Esc does this too).', function () { exitAll(); }, null, 'cancel');+  function exitAll() { removeEventListener('keydown', onKey, true); wrap.remove(); window.__pupAnnotate = null; window.__pupAnnotateResult = { done: false, ts: Date.now() }; }+  function onKey(e) { if (e.key === 'Escape') { e.preventDefault(); e.stopPropagation(); exitAll(); } }+  addEventListener('keydown', onKey, true);+  window.__pupAnnotate = { show: function () { wrap.style.display = ''; bar.style.display = 'flex'; cv.style.pointerEvents = 'auto'; addEventListener('keydown', onKey, true); } };   addEventListener('resize', fit);   document.documentElement.appendChild(wrap);   fit(); selTool(initTool);@@ -5686,7 +5689,7 @@ async function startAnnotation(session, sessionId, callerThread, opts) {         await showCaptureToast(pg, preview, `${isSnip ? 'Snippet' : 'Annotation'} ${clipped ? 'copied to your clipboard' : 'captured'}`);         console.log(`[annotate] "${sessionId}" CAPTURED ${isSnip ? `SNIP ${res.snip.w}x${res.snip.h}` : (clipRect ? `tight-crop ${clipRect.w}x${clipRect.h}` : 'full-view')} -> ${fp} | clipboard=${clipped} | quick=${!!res.quick}`);       } catch (e) { console.log(`[annotate] "${sessionId}" capture failed: ${e.message}`); }-      if (!res.quick) return;   // Done/snip end the loop; quick mode re-arms+      return;   // v2.0.59: every capture is terminal — auto mode is one-shot (circle, captured, toolbar gone)     }   })(); }