Pup - the AI's own browser

@@ -8090,6 +8090,48 @@ function requireLiveSession(res, args) {   }   return { sessionId, session: sessions.get(sessionId) }; }+// v2.0.239: /health, /status and the pup_status verb each hand-built the same core status fields+// (version, enum accounting, identity settings, session/active counts). The identical+// `settings: (() => {...})()` IIFE was pasted three times and the enum expression character for+// character. One builder; each surface spreads it and adds only what is genuinely its own.+function statusCore() {+  const st = pupSettings();+  return {+    version: BRIDGE_VERSION,+    // enum_windows accounting, so "is pup spamming ab?" is answered with a number, not an argument.+    // lastMin counts REAL ab calls in the last 60s (cache hits and coalesced callers are not counted).+    enumWindows: { total: _enumCalls, lastMin: (Date.now() - _enumWindow.at < 60000 ? _enumWindow.n : 0) },+    // the CURRENT identity mode, so a test harness asserts against what pup IS, not an assumption+    settings: {+      taskbarMode: st.aumidIcons !== 'on' ? 'plain' : (st.threadTiles === 'on' ? 'tiles' : 'aumid'),+      aumidIcons: st.aumidIcons, threadTiles: st.threadTiles,+      overlayBadges: st.overlayBadges, jumpLists: st.jumpLists,+    },+    iconAudit: _lastAudit ? { ok: _lastAudit.ok, at: _lastAudit.at, mode: _lastAudit.mode, findings: _lastAudit.findings.length, repaired: _lastAudit.repaired, reason: _lastAudit.reason } : null,+    sessionCount: sessions.size,+    activeSession: activeSessionId,+  };+}+// v2.0.239: the same 10-line C# raise helper was pasted into two script builders in the raise+// verb (and a third, already-deleted copy). One source of truth; callers append the invocation.+const PS_RAISE_TYPEDEF = [+  'Add-Type @"',+  'using System; using System.Runtime.InteropServices;',+  'public class WinFocusH {',+  '  [DllImport("user32.dll")] public static extern bool SetForegroundWindow(IntPtr hWnd);',+  '  [DllImport("user32.dll")] public static extern bool ShowWindow(IntPtr hWnd, int nCmdShow);',+  '  [DllImport("user32.dll")] public static extern bool IsIconic(IntPtr hWnd);',+  '  [DllImport("user32.dll")] public static extern int GetWindowLong(IntPtr h, int i);',+  '  [DllImport("user32.dll")] public static extern int SetWindowLong(IntPtr h, int i, int v);',+  // background windows carry WS_EX_NOACTIVATE (they can never take focus). To actually SHOW one,+  // CLEAR that style first, then restore + foreground it.+  '  public static void Raise(IntPtr h){',+  '    int ex = GetWindowLong(h, -20); SetWindowLong(h, -20, ex & ~0x08000000);',+  '    if (IsIconic(h)) ShowWindow(h, 9); ShowWindow(h, 5); SetForegroundWindow(h);',+  '  }',+  '}',+  '"@',+]; async function reconcileModel(reason) {   if (process.platform !== 'win32' || _reconcileBusy) return;   _reconcileBusy = true;@@ -12849,23 +12891,10 @@ const server = http.createServer(async (req, res) => {       sendJSON(res, {         status: 'ok',         bridge: 'puppeteer',-        version: BRIDGE_VERSION,+        ...statusCore(),         port: PORT,         toolbar: { enabled: pupSettings().toolbarExtension !== 'off', ownerBadge: pupSettings().tbOwnerBadge !== 'off', snipHotkey: pupSettings().tbSnipHotkey !== 'off', floaty: pupSettings().tbFloatyPencil !== 'off' },         browserCount: browsers.size,-        sessionCount: sessions.size,-        // v2.0.172: enum_windows call accounting, so "is pup spamming ab?" is answered with a-        // number instead of an argument. lastMin is REAL ab calls in the last 60s (cache hits and-        // coalesced callers are not counted, which is the point).-        enumWindows: { total: _enumCalls, lastMin: (Date.now() - _enumWindow.at < 60000 ? _enumWindow.n : 0) },-        // v2.0.218 (selftest flakiness on a live box): expose the CURRENT identity mode so test-        // harnesses can assert against what pup is actually in AT CHECK TIME, not an assumption —-        // the user clicks the Settings matrix while tests run, and both are legitimate.-        settings: (() => { const st = pupSettings(); return {-          taskbarMode: st.aumidIcons !== 'on' ? 'plain' : (st.threadTiles === 'on' ? 'tiles' : 'aumid'),-          aumidIcons: st.aumidIcons, threadTiles: st.threadTiles,-          overlayBadges: st.overlayBadges, jumpLists: st.jumpLists }; })(),-        activeSession: activeSessionId,         sessions: sessionList,         chrome: (chrome && chrome.readiness) ? chrome.readiness() : { ready: false, initializing: true },       });@@ -15406,20 +15435,7 @@ const server = http.createServer(async (req, res) => {                 if (hwnd) {                   const psPath = path.join(require('os').tmpdir(), '_adom_focus_hwnd.ps1');                   fs.writeFileSync(psPath, [-                    'Add-Type @"',-                    'using System; using System.Runtime.InteropServices;',-                    'public class WinFocusH {',-                    '  [DllImport("user32.dll")] public static extern bool SetForegroundWindow(IntPtr hWnd);',-                    '  [DllImport("user32.dll")] public static extern bool ShowWindow(IntPtr hWnd, int nCmdShow);',-                    '  [DllImport("user32.dll")] public static extern bool IsIconic(IntPtr hWnd);',-                    '  [DllImport("user32.dll")] public static extern int GetWindowLong(IntPtr h, int i);',-                    '  [DllImport("user32.dll")] public static extern int SetWindowLong(IntPtr h, int i, int v);',-                    '  public static void Raise(IntPtr h){',-                    '    int ex = GetWindowLong(h, -20); SetWindowLong(h, -20, ex & ~0x08000000);',-                    '    if (IsIconic(h)) ShowWindow(h, 9); ShowWindow(h, 5); SetForegroundWindow(h);',-                    '  }',-                    '}',-                    '"@',+                    ...PS_RAISE_TYPEDEF,                     `[WinFocusH]::Raise([IntPtr]${hwnd})`,                     "Write-Output 'focused'",                   ].join('\n'), 'utf8');@@ -15446,32 +15462,17 @@ const server = http.createServer(async (req, res) => {               // Write PowerShell script to temp file and execute (avoids quoting hell)               const psScript = path.join(require('os').tmpdir(), '_adom_focus.ps1');               const psContent = [-                'Add-Type @"',-                'using System; using System.Runtime.InteropServices;',-                'public class WinFocus {',-                '  [DllImport("user32.dll")] public static extern bool SetForegroundWindow(IntPtr hWnd);',-                '  [DllImport("user32.dll")] public static extern bool ShowWindow(IntPtr hWnd, int nCmdShow);',-                '  [DllImport("user32.dll")] public static extern bool IsIconic(IntPtr hWnd);',-                '  [DllImport("user32.dll")] public static extern int GetWindowLong(IntPtr h, int i);',-                '  [DllImport("user32.dll")] public static extern int SetWindowLong(IntPtr h, int i, int v);',-                // v1.8.32: background windows carry WS_EX_NOACTIVATE (they can never take focus).-                // To actually SHOW one, CLEAR that style first, then restore + foreground it.-                '  public static void Raise(IntPtr h){',-                '    int ex = GetWindowLong(h, -20); SetWindowLong(h, -20, ex & ~0x08000000);',-                '    if (IsIconic(h)) ShowWindow(h, 9); ShowWindow(h, 5); SetForegroundWindow(h);',-                '  }',-                '}',-                '"@',+                ...PS_RAISE_TYPEDEF,                 `$targetPid = ${pid}`,                 '$p = Get-Process -Id $targetPid -ErrorAction SilentlyContinue',                 'if ($p -and $p.MainWindowHandle -ne 0) {',-                '  [WinFocus]::Raise($p.MainWindowHandle)',+                '  [WinFocusH]::Raise($p.MainWindowHandle)',                 "  Write-Output 'focused'",                 '} else {',                 '  Get-WmiObject Win32_Process | Where-Object { $_.ParentProcessId -eq $targetPid -and $_.Name -eq "chrome.exe" } | ForEach-Object {',                 '    $cp = Get-Process -Id $_.ProcessId -ErrorAction SilentlyContinue',                 '    if ($cp -and $cp.MainWindowHandle -ne 0) {',-                '      [WinFocus]::Raise($cp.MainWindowHandle)',+                '      [WinFocusH]::Raise($cp.MainWindowHandle)',                 "      Write-Output 'focused'",                 '      return',                 '    }',@@ -17417,15 +17418,7 @@ const server = http.createServer(async (req, res) => {             ok: true,             // v2.0.190: version + the enum_windows counter belong on the VERB payload (2.0.188 put             // them on the HTTP /status chip only — the wrong surface for remote no-shell boxes).-            version: BRIDGE_VERSION,-            enumWindows: { total: _enumCalls, lastMin: (Date.now() - _enumWindow.at < 60000 ? _enumWindow.n : 0) },-            iconAudit: _lastAudit ? { ok: _lastAudit.ok, at: _lastAudit.at, mode: _lastAudit.mode, findings: _lastAudit.findings.length, repaired: _lastAudit.repaired, reason: _lastAudit.reason } : null,-            settings: (() => { const st = pupSettings(); return {-              taskbarMode: st.aumidIcons !== 'on' ? 'plain' : (st.threadTiles === 'on' ? 'tiles' : 'aumid'),-              aumidIcons: st.aumidIcons, threadTiles: st.threadTiles,-              overlayBadges: st.overlayBadges, jumpLists: st.jumpLists }; })(),-            sessionCount: sessions.size,-            activeSession: activeSessionId,+            ...statusCore(),             sessions: list,             pupshotUrl,           };@@ -17866,15 +17859,10 @@ const server = http.createServer(async (req, res) => {       sendJSON(res, {         ok: true,         bridge: 'puppeteer',-        version: BRIDGE_VERSION,+        ...statusCore(),         adVersion: _adVersion,         raiseGateBypassed: _adRaiseGateBypassed || undefined,         led, summary, tooltip,-        // v2.0.188: the enum_windows call counter rides pup_status too (not just /health), so the-        // "is pup spamming ab?" question is answerable via a pup verb on ANY box, no shell needed.-        enumWindows: { total: _enumCalls, lastMin: (Date.now() - _enumWindow.at < 60000 ? _enumWindow.n : 0) },-        sessionCount: sessions.size,-        activeSession: activeSessionId,         sessions: list,         chrome: rd,         pupshotUrl,