Pup - the AI's own browser

@@ -129,7 +129,9 @@ function listSystemBrowsers() {   const posix = [     ['chrome', '/usr/bin/google-chrome'], ['chrome', '/usr/bin/chromium'], ['chrome', '/usr/bin/chromium-browser'],     ['chrome', '/Applications/Google Chrome.app/Contents/MacOS/Google Chrome'],+    ['chrome', path.join(os.homedir(), 'Applications/Google Chrome.app/Contents/MacOS/Google Chrome')],     ['edge',   '/Applications/Microsoft Edge.app/Contents/MacOS/Microsoft Edge'],+    ['edge',   path.join(os.homedir(), 'Applications/Microsoft Edge.app/Contents/MacOS/Microsoft Edge')],   ];   const out = [];   const seen = new Set();@@ -247,7 +249,9 @@ function setDefaultBrowser({ browser, executablePath, install, elevate } = {}) {       installChromeStable({ elevate }); // background; browser_use polling + readiness track it       return {         ok: true, installing: true, installingChrome: true,-        _hint: "Installing Google Chrome in the background. On a normal PC this is silent with NO prompt. On a locked-down box (a VM, managed device) it needs a Windows approval — the bridge will pop a native notification asking the user to click YES on the UAC, and if it expires it re-notifies with a one-tap 'Approve now'. Poll browser_readiness: chromeStablePhase goes installing → awaiting_uac (waiting on the user's click) → ready. pup drives Edge meanwhile, so nothing is blocked.",+        _hint: process.platform === 'darwin'+          ? "Installing Google Chrome in the background (official dmg → Applications; silent, no prompt). Poll browser_readiness: chromeStablePhase goes installing → ready. pup keeps driving its current browser meanwhile, so nothing is blocked."+          : "Installing Google Chrome in the background. On a normal PC this is silent with NO prompt. On a locked-down box (a VM, managed device) it needs a Windows approval — the bridge will pop a native notification asking the user to click YES on the UAC, and if it expires it re-notifies with a one-tap 'Approve now'. Poll browser_readiness: chromeStablePhase goes installing → awaiting_uac (waiting on the user's click) → ready. pup drives Edge meanwhile, so nothing is blocked.",         ...pickSummary(),       };     }@@ -331,29 +335,6 @@ function installChrome({ onProgress } = {}) {       }        state.buildId = buildId;-      // v1.9.75 — SELF-HEAL A HALF-POPULATED CACHE DIR (wiki issue #15, AdityaAngajala).-      // @puppeteer/browsers REFUSES to install when the versioned folder already exists but the-      // executable inside it does not:-      //   "The browser folder ...\\chrome\\win64-146.0.7680.76 exists but the executable-      //    ...\\chrome-win64\\chrome.exe is missing"-      // Easy state to reach: an interrupted download, a bridge killed mid-unzip, or npm's-      // allow-scripts gate skipping puppeteer's postinstall partway. Once in it, EVERY later-      // install attempt throws the same error forever and pup has no browser of its own — the-      // user's only escape is knowing to pin a system browser. detectChrome() already reports-      // installed:false here (it validates the real exe), so the dir is known junk. Delete it-      // and let the install proceed instead of failing in a loop.-      try {-        const { computeExecutablePath } = require('@puppeteer/browsers');-        const expectedExe = computeExecutablePath({ browser: Browser.CHROME, buildId, cacheDir: cacheDir() });-        if (expectedExe && !fileExists(expectedExe)) {-          let dir = path.dirname(expectedExe);-          const versioned = path.basename(dir).includes(buildId) ? dir : path.dirname(dir);-          if (versioned && versioned.includes(buildId) && fs.existsSync(versioned)) {-            console.log(`[chrome] cache dir for ${buildId} exists but its executable is missing — removing the half-populated folder and re-downloading: ${versioned}`);-            fs.rmSync(versioned, { recursive: true, force: true });-          }-        }-      } catch (e) { console.log(`[chrome] half-populated-cache check skipped: ${e.message}`); }       console.log(`[chrome] installing Chrome for Testing ${buildId} (${platform}) into ${cacheDir()} (disk free: ${freeMb == null ? 'unknown' : freeMb + ' MB'}) ...`);        const installed = await install({@@ -526,6 +507,13 @@ function _resolveAdApiBase() {   if (_adApiBase !== undefined) return _adApiBase;   _adApiBase = null;   try {+    // v1.9.75: ADOM_DIRECT_API_URL is NOT always AD. An HD-spawned bridge gets that env+    // pointed at HD's control API (127.0.0.1:47084), which does not serve notify_user etc.+    // So the env is a CANDIDATE, not the answer: _adApiCandidates() lists env → port-file →+    // default, and adCommand verifies the picked base actually serves the verb surface+    // (via _probeAdNotifyCap-style /commands checks) before trusting it. Here we keep the+    // historical single-pick for callers that just need "a base": env first, then the+    // ~/.adom/direct-api-port file AD writes, then the documented default.     const env = process.env.ADOM_DIRECT_API_URL;     if (env) { _adApiBase = env.replace(/\/+$/, ''); return _adApiBase; }     const home = process.env.USERPROFILE || os.homedir();@@ -538,6 +526,47 @@ function _resolveAdApiBase() {   _adApiBase = 'http://127.0.0.1:47200'; // documented default; harmless if unreachable   return _adApiBase; }+// Every plausible AD base, in trust order. Used by the verified resolver below.+function _adApiCandidates() {+  const out = [];+  try { const env = process.env.ADOM_DIRECT_API_URL; if (env) out.push(env.replace(/\/+$/, '')); } catch {}+  try {+    const home = process.env.USERPROFILE || os.homedir();+    const pf = path.join(home, '.adom', 'direct-api-port');+    if (fileExists(pf)) { const hp = fs.readFileSync(pf, 'utf8').trim(); if (hp) out.push(`http://${hp}`); }+  } catch {}+  out.push('http://127.0.0.1:47200');+  return [...new Set(out)];+}+// v1.9.75: resolve a base VERIFIED to be AD (its /commands lists notify_user). Fixes the+// HD-hosted case where the env points at HD's control API: the probe misses there and we+// fall through to the port file AD itself writes. Cached; null when nothing verifies.+let _adVerifiedBase = undefined;+async function _resolveVerifiedAdBase() {+  if (_adVerifiedBase !== undefined) return _adVerifiedBase;+  _adVerifiedBase = null;+  for (const base of _adApiCandidates()) {+    try {+      const cmds = await new Promise((resolve) => {+        const http = require('http'); const u = new URL(base + '/commands');+        const req = http.get({ hostname: u.hostname, port: u.port, path: u.pathname }, (resp) => {+          let d = ''; resp.on('data', c => d += c);+          resp.on('end', () => { try { resolve(JSON.parse(d)); } catch { resolve(null); } });+        });+        req.on('error', () => resolve(null));+        req.setTimeout(3000, () => { try { req.destroy(); } catch {}; resolve(null); });+      });+      const top = (cmds && cmds.topLevel) || [];+      const dlist = (cmds && cmds.desktop && (cmds.desktop.commands || cmds.desktop)) || [];+      if ((Array.isArray(top) && top.includes('notify_user')) || (Array.isArray(dlist) && dlist.includes('notify_user'))) {+        _adVerifiedBase = base;+        if (base !== _resolveAdApiBase()) console.log(`[chrome] AD base: env candidate is not AD — using verified ${base}`);+        break;+      }+    } catch {}+  }+  return _adVerifiedBase;+} // Call an AD verb via the direct-API. AD ≥1.9.84: `app` is inferred and the FULL verb // surface is reachable (notify_user, notify_response, targets, …). Best-effort: resolves // null on any failure so a missing/old AD never blocks the install (the UAC still appears).@@ -547,9 +576,12 @@ function _resolveAdApiBase() { // attribution (OPTIONAL — a stale token 403s, so we retry once without it). function adCommand(command, args, opts = {}) {   const { target, timeoutMs = 8000, noToken = false } = opts;-  return new Promise((resolve) => {+  return new Promise(async (resolve) => {     let base;-    try { base = _resolveAdApiBase(); } catch { return resolve(null); }+    // v1.9.75: prefer the VERIFIED-AD base (see _resolveVerifiedAdBase) so an HD-spawned+    // bridge whose env points at HD's control API still reaches the real AD via the port+    // file. Falls back to the historical single-pick if nothing verifies (probe cached).+    try { base = (await _resolveVerifiedAdBase()) || _resolveAdApiBase(); } catch { try { base = _resolveAdApiBase(); } catch { return resolve(null); } }     if (!base) return resolve(null);     try {       const http = require('http');@@ -741,9 +773,50 @@ function installChromeStable(opts = {}) {     try {       const pre = listSystemBrowsers().find(x => x.kind === 'chrome');       if (pre) { chromeStableState.phase = 'ready'; chromeStableState.finishedAt = Date.now(); return { ok: true, executablePath: pre.executablePath, alreadyInstalled: true }; }+      // ── macOS ── official universal dmg → mount → copy the .app. User-scoped first+      // (~/Applications needs no rights); /Applications when writable (admin users — the+      // normal Mac case). No UAC/elevation dance exists or is needed here.+      if (process.platform === 'darwin') {+        const dmg = path.join(os.tmpdir(), `chrome_installer_${process.pid}.dmg`);+        console.log(`[chrome] downloading Google Chrome dmg → ${dmg}`);+        await _download('https://dl.google.com/chrome/mac/universal/stable/GGRO/googlechrome.dmg', dmg);+        const { execFileSync } = require('child_process');+        let mountPoint = null;+        try {+          const out = execFileSync('/usr/bin/hdiutil', ['attach', '-nobrowse', '-readonly', '-plist', dmg], { encoding: 'utf8', timeout: 60_000 });+          const m = out.match(/<key>mount-point<\/key>\s*<string>([^<]+)<\/string>/);+          mountPoint = m ? m[1] : null;+          if (!mountPoint) throw new Error('could not resolve the dmg mount point');+          const srcApp = path.join(mountPoint, 'Google Chrome.app');+          if (!fs.existsSync(srcApp)) throw new Error(`no Google Chrome.app inside the dmg at ${mountPoint}`);+          const dests = ['/Applications', path.join(os.homedir(), 'Applications')];+          let installedTo = null, lastErr = null;+          for (const destDir of dests) {+            try {+              fs.mkdirSync(destDir, { recursive: true });+              execFileSync('/usr/bin/ditto', [srcApp, path.join(destDir, 'Google Chrome.app')], { timeout: 120_000 });+              installedTo = path.join(destDir, 'Google Chrome.app');+              break;+            } catch (e) { lastErr = e; }+          }+          if (!installedTo) throw lastErr || new Error('copy failed');+          console.log(`[chrome] Google Chrome installed at ${installedTo}`);+        } finally {+          if (mountPoint) { try { execFileSync('/usr/bin/hdiutil', ['detach', mountPoint, '-quiet'], { timeout: 30_000 }); } catch {} }+          try { fs.unlinkSync(dmg); } catch {}+        }+        const found = listSystemBrowsers().find(x => x.kind === 'chrome');+        if (!found) {+          chromeStableState.phase = 'failed'; chromeStableState.errorCode = 'chrome_stable_not_detected';+          chromeStableState.error = 'Copied Google Chrome.app but it did not detect afterward — check /Applications and ~/Applications.';+          return { ok: false, errorCode: chromeStableState.errorCode, error: chromeStableState.error };+        }+        chromeStableState.phase = 'ready'; chromeStableState.finishedAt = Date.now();+        return { ok: true, executablePath: found.executablePath };+      }       if (process.platform !== 'win32') {         chromeStableState.phase = 'failed'; chromeStableState.errorCode = 'chrome_stable_unsupported_os';-        chromeStableState.error = 'Auto-installing Google Chrome is only wired up for Windows.';+        chromeStableState.error = 'Auto-installing Google Chrome is only wired up for Windows and macOS.';         return { ok: false, errorCode: chromeStableState.errorCode, error: chromeStableState.error };       }       const freeMb = diskFreeMb();