agentgui 1.0.1062 → 1.0.1063

package/.gm/prd.yml

@@ -3109,15 +3109,6 @@
 - id: gc-delete-undo-trash
   subject: No undo-after-delete (soft-delete/trash) anywhere in the confined delete surface
   status: pending
-- id: gc-search-hit-hash-anchor
-  subject: Search-hit event anchor (focusEventI/focusEventTs) not carried in the hash - reload/Back loses highlighted line
-  status: pending
-- id: gc-settings-section-scrollspy
-  subject: Settings section anchor is deep-link-in only - scrolling never updates state.settingsSection or the URL
-  status: pending
-- id: gc-context-budget-affordance
-  subject: No context-size/token-budget affordance - only turn count and dollar cost shown, never remaining context headroom
-  status: pending
 - id: gc-expanded-body-highlight
   subject: Search-result highlighting inside expanded event bodies never highlights the matched query term
   status: pending

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agentgui",
-  "version": "1.0.1062",
+  "version": "1.0.1063",
   "description": "Multi-agent ACP client with real-time communication",
   "type": "module",
   "main": "electron/main.js",

package/site/app/js/app.js

@@ -51,7 +51,7 @@ const ARM_RESET_MS = 4000;
 
 // Full routable param set. Every view-defining piece of state round-trips
 // through the hash so reload and Back/forward restore the exact view.
-const HASH_KEYS = ['tab', 'sid', 'dir', 'file', 'q', 'project', 'section', 'filter', 'lsort', 'lfilter', 'lerr'];
+const HASH_KEYS = ['tab', 'sid', 'dir', 'file', 'q', 'project', 'section', 'filter', 'lsort', 'lfilter', 'lerr', 'ets'];
 function readHash() {
   const hash = location.hash || '';
   const out = {};
@@ -80,6 +80,11 @@ function buildHash() {
     const q = (state.searchQ || '').trim();
     if (q.length >= 2) parts.push('q=' + encodeURIComponent(q));
     if (state.projectFilter) parts.push('project=' + encodeURIComponent(state.projectFilter));
+    // A session opened from a search hit carries the matched event's
+    // timestamp so reload/Back reproduces the same scrolled+flashed position
+    // a live click gives - without this, the anchor only existed in memory
+    // and a search-hit URL degraded to just the bare session on reload.
+    if (state._focusEventTs != null) parts.push('ets=' + encodeURIComponent(state._focusEventTs));
   }
   if (tab === 'settings' && state.settingsSection) parts.push('section=' + encodeURIComponent(state.settingsSection));
   if (tab === 'live') {
@@ -822,7 +827,14 @@ function sessionsColumn() {
       onNew: () => { navTo('chat'); newChat(); },
       onSelect: (s) => {
         if (state.tab === 'chat') resumeInChat({ sid: s.sid });
-        else loadSession(s.sid, { focusEventI: s._focusEventI, focusEventTs: s._focusEventTs });
+        else {
+          // Persist the anchor so buildHash() can carry it into the URL -
+          // without this, reload/Back only ever restored the bare session,
+          // losing the matched event's scroll+flash position.
+          state._focusEventTs = s._focusEventTs ?? null;
+          loadSession(s.sid, { focusEventI: s._focusEventI, focusEventTs: s._focusEventTs });
+          writeHash({ push: true });
+        }
       },
       loading: state.searchBusy,
       error: state.searchHits.error || null,
@@ -3927,6 +3939,10 @@ async function loadSession(sid, { focusEventI = null, focusEventTs = null, fromH
     return;
   }
   state.selectedSid = sid;
+  // A plain (non-search-hit) session open must not carry a stale event
+  // anchor forward into the URL - only reset it when this call ISN'T itself
+  // the one supplying a fresh focusEventTs.
+  if (focusEventTs == null) state._focusEventTs = null;
   state.events = [];
   state.events._seen = new Set();     // O(1) dedupe by event index
   state.eventsLoaded = false;
@@ -4092,9 +4108,11 @@ async function init() {
   } else if (hp.sid) {
     if (hp.q) state.searchQ = hp.q;
     if (hp.project) state.projectFilter = hp.project;
+    const bootFocusTs = hp.ets != null ? Number(hp.ets) : null;
+    if (bootFocusTs != null && !Number.isNaN(bootFocusTs)) state._focusEventTs = bootFocusTs;
     navTo('history', { push: false });
     await refreshHistory();
-    await loadSession(hp.sid, { fromHash: true });
+    await loadSession(hp.sid, { fromHash: true, focusEventTs: bootFocusTs != null && !Number.isNaN(bootFocusTs) ? bootFocusTs : undefined });
     if (state.searchQ.trim().length >= 2) runSearch();
   } else if (bootTab !== state.tab) {
     // Files deep-link: restore the directory the URL names (reload keeps
@@ -4119,6 +4137,7 @@ async function init() {
   }
 
   registerWsStatusOnce();
+  registerSettingsScrollSpyOnce();
   startActivePolling();   // surface running chats on any tab, not just history
   startRelTimeTick();
   startLiveTick();        // 1s elapsed advance on the live dashboard
@@ -4177,6 +4196,44 @@ function focusSettingsSection(id) {
     el.addEventListener('blur', clear);
   });
 }
+const SETTINGS_SECTION_IDS = ['backend', 'server', 'agents', 'appearance', 'keyboard', 'data'];
+// Settings was deep-link-IN only: focusSettingsSection() (a section= URL param
+// or the ?-overlay jump) set state.settingsSection, but manually scrolling
+// never updated it back - so the URL/state silently went stale the instant a
+// user scrolled by hand, and Back could never step BETWEEN panels the way it
+// does for every other tab. A lightweight scroll-position scrollspy (not a
+// full IntersectionObserver - the settings scroll region is small/short-lived
+// enough that a debounced scroll-position check is simpler and avoids the
+// observer-lifecycle bookkeeping) keeps state.settingsSection (and the URL)
+// honest while the user scrolls, registered once like the WS/session-expired
+// listeners above.
+const debouncedSettingsScrollSpy = debounce(() => {
+  if (state.tab !== 'settings') return;
+  const region = document.querySelector('#agentgui-main');
+  if (!region) return;
+  const regionTop = region.getBoundingClientRect().top;
+  let current = null;
+  for (const id of SETTINGS_SECTION_IDS) {
+    const el = document.getElementById(id);
+    if (!el) continue;
+    // The section whose top has scrolled past the region's own top edge
+    // (with a little slack for the sticky header) is the "current" one -
+    // same heuristic every scrollspy implementation uses.
+    if (el.getBoundingClientRect().top - regionTop <= 80) current = id;
+  }
+  if (current && current !== state.settingsSection) {
+    state.settingsSection = current;
+    writeHash({ push: false });   // passive sync, not a Back-able step - matches search text/filter's replaceState treatment
+  }
+}, 150);
+let settingsScrollSpyRegistered = false;
+function registerSettingsScrollSpyOnce() {
+  if (settingsScrollSpyRegistered) return;
+  settingsScrollSpyRegistered = true;
+  document.addEventListener('scroll', (e) => {
+    if (e.target && e.target.id === 'agentgui-main') debouncedSettingsScrollSpy();
+  }, true);   // capture: #agentgui-main itself is the scrolling element, not a bubling target
+}
 
 // Browser Back/forward: diff the FULL hash param set against state and re-sync
 // each piece. Everything here runs with writeHash:false / fromHash:true so the
@@ -4189,7 +4246,11 @@ window.addEventListener('popstate', () => {
   // anything else - or a bare sid - opens it in history).
   if (hp.sid && hp.sid !== state.selectedSid) {
     if (tab === 'chat') resumeInChat({ sid: hp.sid }, { fromHash: true });
-    else loadSession(hp.sid, { fromHash: true });
+    else {
+      const popFocusTs = hp.ets != null ? Number(hp.ets) : null;
+      state._focusEventTs = (popFocusTs != null && !Number.isNaN(popFocusTs)) ? popFocusTs : null;
+      loadSession(hp.sid, { fromHash: true, focusEventTs: (popFocusTs != null && !Number.isNaN(popFocusTs)) ? popFocusTs : undefined });
+    }
   } else if (!hp.sid && state.selectedSid && tab === 'history') {
     state.selectedSid = null;
     state.events = [];