Pup - the AI's own browser

@@ -5518,36 +5518,25 @@ async function showCaptureToast(pg, previewDataUrl, line1) {   } catch (e) {} } -async function ensureToolbarExtensionInstalled(userDataDir, executablePath) {-  if (process.platform !== 'win32' || !userDataDir) return false;-  if (pupSettings().toolbarExtension === 'off') return false;+// v2.0.53 (John repinned pup to CfT): the toolbar extension is now a LAUNCH ARG. Chrome for+// Testing still honors --load-extension (branded Chrome >=137 removed it), so when the driving+// browser is CfT and the toolbarExtension setting is on, every profile launch carries the flag+// and every window is BORN with the toolbar: no install step exists at all. This helper just+// stages the extension files at a stable path for the flag to point at.+function stageToolbarExtension() {+  if (process.platform !== 'win32') return null;+  if (pupSettings().toolbarExtension === 'off') return null;   const srcDir = path.join(__dirname, 'extension');-  let extVer = '0';-  try { extVer = JSON.parse(fs.readFileSync(path.join(srcDir, 'manifest.json'), 'utf8')).version; } catch (e) { return false; }-  const marker = path.join(userDataDir, '.pup-toolbar-installed');-  try { if (fs.readFileSync(marker, 'utf8').trim() === extVer) return true; } catch (e) {}-  // stage at a stable absolute path (the profile references it)+  if (!fs.existsSync(path.join(srcDir, 'manifest.json'))) return null;   const dstDir = path.join(os.homedir(), '.adom', 'pup-extension');   try {     fs.mkdirSync(dstDir, { recursive: true });-    for (const f of fs.readdirSync(srcDir)) fs.copyFileSync(path.join(srcDir, f), path.join(dstDir, f));-  } catch (e) { return false; }-  let tb = null;-  try {-    tb = await puppeteer.launch({-      pipe: true, enableExtensions: true, userDataDir,-      ...(executablePath ? { executablePath } : {}),-      args: ['--no-first-run', '--no-default-browser-check', '--window-position=-32000,-32000', '--window-size=1,1'],-      handleSIGINT: false, handleSIGTERM: false, handleSIGHUP: false,-    });-    const id = await tb.installExtension(dstDir);-    fs.writeFileSync(marker, extVer);-    console.log(`[toolbar] extension v${extVer} auto-installed into profile "${path.basename(userDataDir)}" (pipe launch, id ${id}) — every window on this profile is born with the toolbar`);-    return true;-  } catch (e) {-    console.log(`[toolbar] pre-launch extension install failed: ${e.message} — continuing without the toolbar`);-    return false;-  } finally { try { if (tb) await tb.close(); } catch (e) {} }+    for (const f of fs.readdirSync(srcDir)) {+      const sp = path.join(srcDir, f), dp = path.join(dstDir, f);+      try { const a = fs.statSync(sp), b = fs.existsSync(dp) && fs.statSync(dp); if (!b || b.size !== a.size) fs.copyFileSync(sp, dp); } catch (e) { fs.copyFileSync(sp, dp); }+    }+    return dstDir;+  } catch (e) { return null; } } async function startAnnotation(session, sessionId, callerThread, opts) {   const tab = (session.activeTabId && (session.tabs || []).find(t => t.tabId === session.activeTabId)) || (session.tabs || [])[0];@@ -7960,14 +7949,8 @@ async function getOrLaunchBrowser(profileName, { freshProfile = false, strictPer       return b;     }; -    // v2.0.52 (John: "why can't your extension just auto-exist in pup? you control the-    // browser"): IT DOES NOW. Before a profile's Chrome ever launches, pup does an invisible-    // ~2s pipe-launch of the SAME profile and installs the toolbar extension via CDP-    // Extensions.loadUnpacked (puppeteer enableExtensions/installExtension — the sanctioned-    // replacement for --load-extension, which branded Chrome >=137 removed). The extension-    // persists in the profile, so every window is simply BORN with the toolbar. No dialogs,-    // no chrome://extensions driving, no user action, ever. Marker-gated per extension version.-    try { await ensureToolbarExtensionInstalled(userDataDir, (candidates[0] || {}).executablePath); } catch (e) {}+    // v2.0.53: stage the toolbar extension; CfT candidates carry it as --load-extension below.+    const _tbExtDir = stageToolbarExtension();      // ─── Spawn-verified launch: try each candidate browser in order, up to 3 ───     // attempts each (with orphan/lock cleanup between attempts). If a browser can't@@ -7987,6 +7970,9 @@ async function getOrLaunchBrowser(profileName, { freshProfile = false, strictPer     for (const cand of launchList) {       if (cand.executablePath) launchOpts.executablePath = cand.executablePath;       else delete launchOpts.executablePath;+      // v2.0.53: the toolbar rides ONLY on CfT (branded Chrome ignores/removed the flag).+      launchOpts.args = launchOpts.args.filter(a => !a.startsWith('--load-extension='));+      if (_tbExtDir && cand.kind === 'chrome-for-testing') launchOpts.args.push(`--load-extension=${_tbExtDir}`);       lastErr = null;       for (let attempt = 1; attempt <= MAX_ATTEMPTS; attempt++) {         try {@@ -13903,24 +13889,16 @@ const server = http.createServer(async (req, res) => {           return;         }         case 'pup_install_toolbar': {-          // v2.0.52: thin now — the extension AUTO-INSTALLS at profile launch (see-          // ensureToolbarExtensionInstalled). This verb covers the one already-running-profile-          // case: it reports what to do, or installs immediately when the profile is cold.-          if (process.platform !== 'win32') { sendJSON(res, { success: false, error: 'windows only' }); return; }-          try {-            const profileName = args.profile || 'adom-you';-            const userDataDir = path.join(PROFILES_DIR, profileName);-            const be = browsers.get(profileName);-            const running = !!(be && be.browser && be.browser.isConnected());-            if (running) {-              const marker = path.join(userDataDir, '.pup-toolbar-installed');-              let installed = false; try { installed = !!fs.readFileSync(marker, 'utf8').trim(); } catch (e) {}-              sendJSON(res, { success: true, output: JSON.stringify({ ok: true, installed, running: true, _hint: installed ? 'Toolbar already installed in this profile.' : 'Profile Chrome is running; the toolbar auto-installs on the profile\'s NEXT launch (close its windows or wait for the natural restart — no action needed).' }) });-              return;-            }-            const okInst = await ensureToolbarExtensionInstalled(userDataDir, null);-            sendJSON(res, { success: okInst, output: JSON.stringify({ ok: okInst, installedNow: okInst }) });-          } catch (e) { sendJSON(res, { success: false, error: e.message }); }+          // v2.0.53: nothing to install anymore — on CfT the toolbar is a launch arg. This verb+          // reports the state so agents can explain it.+          const cft = (chrome && chrome.readiness) ? chrome.readiness() : {};+          const staged = stageToolbarExtension();+          sendJSON(res, { success: true, output: JSON.stringify({+            ok: true, mode: 'launch-flag', stagedAt: staged,+            driving: cft.browserKind || null,+            active: !!staged && cft.browserKind === 'chrome-for-testing',+            _hint: staged ? (cft.browserKind === 'chrome-for-testing' ? 'Toolbar auto-loads on every profile launch (CfT --load-extension).' : `Driving browser is ${cft.browserKind}; the toolbar flag only works on Chrome for Testing — pup_use {browser:"cft"} to enable.`) : 'toolbarExtension is off in settings (or non-Windows).',+          }) });           return;         }         case 'pup_annotate': {