← Commit history

Make GROUPED mode actually group by category (John: 'i like that you just group to each category icon'): with icon-style category, windows of the same category share one AUMID (Adom.Pup.<cat>) so you get up to 5 category buttons each wearing its category icon; standard style still collapses to one Adom Pup button. Previously grouped lumped every window under one button regardless. Updated the setting copy

John Lauer ·7c11c5e8ba ·3mo ago ·parent efb8844
4 files changed +18−8
adom-bridge-puppeteer-manifest.json+4−4
@@ -1,10 +1,10 @@ {   "manifest_version": 1,   "name": "puppeteer",-  "version": "1.9.320",-  "url": "https://wiki.adom.inc/download/adom/adom-desktop-puppeteer-bridge/1.9.320/adom-bridge-puppeteer-v1.9.320.zip",-  "sha256": "da4a8f457c59e0c3b530ad9fe31817b0c5d04a02b49e3e5c2693273cb25b65ad",-  "size": 613503,+  "version": "1.9.321",+  "url": "https://wiki.adom.inc/download/adom/adom-desktop-puppeteer-bridge/1.9.321/adom-bridge-puppeteer-v1.9.321.zip",+  "sha256": "d94a45f5e1962d106fa60c70425605172bafd931d23c302be2b6cce325febd66",+  "size": 613928,   "verbPrefixes": [     "browser_",     "desktop_recorder_",
src/BRIDGE_VERSION+1−1
@@ -1 +1 @@-1.9.320+1.9.321
src/bridge.json+1−1
@@ -2,7 +2,7 @@   "manifest_version": 1,   "name": "puppeteer",   "displayName": "Puppeteer (Chrome for Testing + Native)",-  "version": "1.9.320",+  "version": "1.9.321",   "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. browser_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. browser_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, browser_alert_window posts a native toast whose click focuses the window, browser_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-desktop",   "author": "Adom Inc.",
src/server.js+12−2
@@ -3127,8 +3127,18 @@ async function stampPupIdentity(sessionId, opts) {     if (sess) sess._plainStampAttempts = 0;     const cat = rawCat || 'plain';     const _dashInfra = sessionId === 'pup-dashboard';+    // v1.9.321 (John: "i like that you just group to each category icon"): make GROUPED mode actually+    // group BY CATEGORY when the category icon-style is on — windows of the same category share one+    // AUMID (Adom.Pup.<cat>), so you get up to 5 category buttons (all wiki-signed-in windows under the+    // padlock button, all open-web windows under the globe, etc.), each wearing its category icon.+    // Previously grouped lumped EVERY window under one Adom.Pup button regardless of style. Plain+    // "standard" style still collapses to the single Adom.Pup button (one icon, so per-category buttons+    // would be pointless). Split is unchanged (one button per window).+    const _catGroup = grouped && pupSettings().aumidIconStyle === 'category';     const appId = _dashInfra ? `${PUP_APP_ID}.Dashboard.${PUP_ICON_GEN}`-      : grouped ? PUP_APP_ID : `${PUP_APP_ID}.${sessionId}.${cat}.${PUP_ICON_GEN}`;+      : _catGroup ? `${PUP_APP_ID}.${cat}.${PUP_ICON_GEN}`+      : grouped ? PUP_APP_ID+      : `${PUP_APP_ID}.${sessionId}.${cat}.${PUP_ICON_GEN}`;     const prevAppId = sess && sess._curAppId;     // v1.9.279 THE IDEMPOTENCY GATE: only touch the window when its identity actually changes.     // desktop_set_window_identity RECREATES the taskbar button every call, so firing it when nothing@@ -9290,7 +9300,7 @@ let SEENTOAST=0; // change POSTs set-setting and answers back with a toast. const SETTINGS_DEF=[  {k:'aumidIcons',l:'AUMID taskbar icons',info:'AUMID = Application User Model ID, a feature built into Windows itself. Every taskbar button is really a GROUP: Windows collects windows that share the same ID onto one button. Normally all windows of one app share the app ID, which is why 5 Chrome windows stack under one Chrome button. But the ID can be set PER WINDOW: pup writes a unique ID onto each pup window using the Windows property system (the same mechanism apps like Office use), and Windows then gives that window its own taskbar button with its own icon. The catch, and why this is an experiment: whenever a window ID changes, Windows destroys and recreates its taskbar button, and that churn is a suspect in the Chrome crashes. pup stamps each window exactly once, at creation, to minimize it.',d:'EXPERIMENT: give every pup window its OWN taskbar icon by stamping a per-window identity. Toggle on/off to test whether AUMID stamping is what crashes Chrome. Off = all windows share one Chrome button (current mode). Already-stamped windows keep their icon until closed.',img:'aumid'},- {k:'taskbarGrouping',l:'AUMID grouping',d:'Only applies when AUMID icons are on: split = one icon per window; grouped = all pup windows under one Adom Pup icon.',sel:['split','grouped'],dep:'aumidIcons',imgBy:{split:'groupsplit',grouped:'groupgrouped'}},+ {k:'taskbarGrouping',l:'AUMID grouping',d:'Only applies when AUMID icons are on. split = one taskbar button per window. grouped = windows grouped BY CATEGORY when icon-style is "category" (up to 5 buttons: signed-in wiki, public wiki, open web, Adom app, plain — e.g. all your signed-in-wiki windows collapse under the one padlock button); with icon-style "standard" grouped collapses everything under a single Adom Pup button.',sel:['split','grouped'],dep:'aumidIcons',imgBy:{split:'groupsplit',grouped:'groupgrouped'}},  {k:'aumidIconStyle',l:'AUMID icon style',d:'Only applies when AUMID icons are on: standard = one pup tile for every window; category = the custom set (wiki signed-out, wiki signed-in padlock, world icon for the open web, adom app icon, mixed).',sel:['standard','category'],dep:'aumidIcons',imgBy:{standard:'iconstylestd',category:'iconstylecat'}},  {k:'jumpLists',l:'Jump lists',d:'The menu Windows shows when you right-click a pup taskbar icon (real screenshot below, captured on this machine). Requires AUMID icons on. Off by default. Quirk: the FIRST right-click can blip the menu closed — right-click again ~1s later and it holds (a Windows shell timing race, not a pup bug).',img:'jumplist'},  {k:'jlViewTasks',l:'',d:'Wiki view tasks: Switch to logged-in view / Switch to public view on every wiki window.',dep:'jumpLists',subtgl:1,img:'jlviewtasks'},