agentgui 1.0.936 → 1.0.937

package/lib/http-handler.js

@@ -20,7 +20,11 @@ export function createHttpHandler({ BASE_URL, expressApp, queries, sendJSON, ser
     if (hits > RATE_LIMIT_MAX) { res.writeHead(429, { 'Retry-After': '60' }); res.end('Too Many Requests'); return; }
 
     const _pwd = process.env.PASSWORD;
-    if (_pwd) {
+    // Optional: exempt /health from auth so container/k8s probes work
+    // without distributing the password to monitoring infra.
+    const _bareEarly = req.url.split('?')[0];
+    const _healthExempt = process.env.HEALTH_NO_AUTH === '1' && (_bareEarly === '/health' || _bareEarly === '/api/health' || _bareEarly === (BASE_URL + '/health') || _bareEarly === (BASE_URL + '/api/health'));
+    if (_pwd && !_healthExempt) {
       const _auth = req.headers['authorization'] || '';
       let _ok = false;
       const _checkToken = (tok) => {

package/lib/ws-handlers-util.js

@@ -51,6 +51,7 @@ export function register(router, deps) {
     const model = p?.model || undefined;
     const subAgent = p?.subAgent || undefined;
     const cwd = p?.cwd || STARTUP_CWD;
+    const resumeSessionId = p?.resumeSid || p?.resumeSessionId || undefined;
     if (!registry.has(agentId)) err(404, `Unknown agentId: ${agentId}`);
 
     const sessionId = 'chat-' + crypto.randomBytes(8).toString('hex');
@@ -88,7 +89,7 @@ export function register(router, deps) {
       try {
         const config = {
           verbose: true, outputFormat: 'stream-json', timeout: 1800000, print: true,
-          model, subAgent, onEvent,
+          model, subAgent, onEvent, resumeSessionId,
           onPid: () => {}, onProcess: (proc) => { ctrl.proc = proc; },
         };
         await runClaudeWithStreaming(content, cwd, agentId, config);

package/package.json

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

package/site/app/js/app.js

@@ -12,7 +12,7 @@ const state = {
   tab: 'chat',
   models: [],
   selectedModel: '',
-  chat: { messages: [], busy: false, abort: null, draft: '' },
+  chat: { messages: [], busy: false, abort: null, draft: '', resumeSid: null },
   sessions: [],
   selectedSid: null,
   events: [],
@@ -20,7 +20,9 @@ const state = {
   searchHits: null,
   historyError: null,
   showSubagents: false,
-  live: { es: null, connected: false, lastEventTs: 0, error: null, eventCount: 0 },
+  sessionsLimit: 60,
+  projectFilter: '',
+  live: { es: null, connected: false, lastEventTs: 0, error: null, eventCount: 0, reconnects: 0 },
 };
 
 function readHash() {
@@ -74,12 +76,14 @@ function openLiveStream() {
       state.live.lastEventTs = Date.now();
       state.live.eventCount++;
       if (kind === 'hello') {
-        state.live.connected = true;
+        if (!state.live.connected) state.live.connected = true;
+        if (state.live.error) { state.live.error = null; state.live.reconnects++; }
       } else if (kind === 'event' && data) {
         if (state.selectedSid && data.sid === state.selectedSid) {
           state.events.push(data);
         }
-        const sess = state.sessions.find(s => s.sid === data.sid);
+        const arr = Array.isArray(state.sessions) ? state.sessions : [];
+        const sess = arr.find(s => s.sid === data.sid);
         if (sess) {
           sess.events = (sess.events || 0) + 1;
           sess.last = data.ts || Date.now();
@@ -98,9 +102,12 @@ function openLiveStream() {
       scheduleRender();
     });
     state.live.es.addEventListener('error', () => {
-      state.live.connected = false;
-      state.live.error = 'connection lost';
-      scheduleRender();
+      // EventSource auto-reconnects; only flap state once per disconnect.
+      if (!state.live.error) {
+        state.live.connected = false;
+        state.live.error = 'connection lost (auto-retry)';
+        scheduleRender();
+      }
     });
   } catch (e) {
     state.live.error = e.message;
@@ -119,8 +126,10 @@ function view() {
   const ok = state.health.status === 'ok';
   const liveActive = state.tab === 'history' && state.live.connected && (Date.now() - state.live.lastEventTs < 30000);
   const dotText = state.tab === 'history'
-    ? (state.live.error ? '○ stream offline' : (liveActive ? '● live · ' + state.live.eventCount : (state.live.connected ? '● live' : '◌ connecting…')))
-    : (ok ? '● connected' : '○ offline');
+    ? (state.live.error
+        ? '◌ ' + state.live.error + (state.live.reconnects ? ' · ' + state.live.reconnects + ' reconnects' : '')
+        : (liveActive ? '● live · ' + state.live.eventCount : (state.live.connected ? '● live' : '◌ connecting…')))
+    : (ok ? (state.health.ws === 'reconnecting' ? '◌ ws reconnecting' : '● connected') : '○ offline');
   const dot = h('span', { key: 'dot' }, dotText);
 
   const topbar = Topbar({
@@ -211,19 +220,25 @@ function chatMain() {
     onSend: (v) => { state.chat.draft = v; sendChat(); },
   });
 
+  const resumeBanner = state.chat.resumeSid
+    ? h('div', { key: 'rb', style: 'padding:.5em .75em;background:rgba(80,200,120,.1);border-radius:4px;display:flex;justify-content:space-between;align-items:center;margin-bottom:.5em' },
+        h('span', { class: 'lede' }, '▶ resuming session ' + state.chat.resumeSid.slice(0, 8) + '… via claude --resume'),
+        Btn({ key: 'rclr', onClick: () => { state.chat.resumeSid = null; render(); }, children: '× clear' }))
+    : null;
   return [
+    resumeBanner,
     Chat({
-      title: state.selectedModel || 'agent',
+      title: (state.selectedModel || 'agent') + (state.chat.resumeSid ? ' · resume' : ''),
       sub: state.chat.busy ? 'streaming…' : (state.chat.messages.length + ' messages'),
       messages: msgs,
       composer,
     }),
-  ];
+  ].filter(Boolean);
 }
 
 function newChat() {
   state.chat.abort?.abort();
-  state.chat = { messages: [], busy: false, abort: null, draft: '' };
+  state.chat = { messages: [], busy: false, abort: null, draft: '', resumeSid: null };
   render();
 }
 
@@ -246,6 +261,7 @@ async function sendChat() {
       model: state.selectedModel,
       messages: state.chat.messages.slice(0, -1).map(m => ({ role: m.role, content: m.content })),
       signal: ctrl.signal,
+      resumeSid: state.chat.resumeSid || undefined,
     })) {
       if (ev.type === 'text')  { cur.content += ev.text; render(); }
       if (ev.type === 'error') { cur.content += '\n[error] ' + JSON.stringify(ev.error); render(); }
@@ -314,21 +330,42 @@ function historyMain() {
 function resumeInChat(sess) {
   state.tab = 'chat';
   closeLiveStream();
-  state.chat.draft = '/resume ' + (sess?.sid || state.selectedSid);
+  state.chat.resumeSid = sess?.sid || state.selectedSid;
+  state.chat.messages = [];
+  state.chat.draft = '';
+  // Default to claude-code if no model yet (only claude supports --resume by sid here).
+  if (!state.selectedModel || state.selectedModel !== 'claude-code') state.selectedModel = 'claude-code';
   render();
 }
 
 function visibleSessions() {
   const arr = Array.isArray(state.sessions) ? state.sessions : [];
-  const filtered = state.showSubagents ? arr : arr.filter(s => !s.isSubagent);
+  let filtered = state.showSubagents ? arr : arr.filter(s => !s.isSubagent);
+  if (state.projectFilter) {
+    const pf = state.projectFilter.toLowerCase();
+    filtered = filtered.filter(s => (s.project || '').toLowerCase().includes(pf));
+  }
   return filtered.slice().sort((a, b) => (b.last || 0) - (a.last || 0));
 }
 
+function uniqueProjects() {
+  const arr = Array.isArray(state.sessions) ? state.sessions : [];
+  const seen = new Map();
+  for (const s of arr) {
+    if (!s.project) continue;
+    seen.set(s.project, (seen.get(s.project) || 0) + 1);
+  }
+  return Array.from(seen.entries()).sort((a, b) => b[1] - a[1]);
+}
+
 function historySide() {
   const searching = !!state.searchHits;
   const sessionsView = visibleSessions();
+  const limit = state.sessionsLimit;
+  const visible = searching ? state.searchHits.results.slice(0, 60) : sessionsView.slice(0, limit);
+  const truncatedBy = searching ? Math.max(0, state.searchHits.results.length - 60) : Math.max(0, sessionsView.length - limit);
   const rows = searching
-    ? state.searchHits.results.slice(0, 60).map((r, i) =>
+    ? visible.map((r, i) =>
         Row({
           key: 'sr' + i,
           rank: String(i + 1).padStart(3, '0'),
@@ -338,7 +375,7 @@ function historySide() {
           onClick: () => loadSession(r.sid),
         })
       )
-    : sessionsView.slice(0, 120).map((s, i) =>
+    : visible.map((s, i) =>
         Row({
           key: 'sess' + s.sid,
           rank: String(i + 1).padStart(3, '0'),
@@ -350,6 +387,7 @@ function historySide() {
         })
       );
   const subagentCount = (Array.isArray(state.sessions) ? state.sessions : []).filter(s => s.isSubagent).length;
+  const projects = uniqueProjects();
 
   return [
     Side({
@@ -373,6 +411,15 @@ function historySide() {
           value: state.searchQ,
           onInput: (v) => { state.searchQ = v; runSearch(); },
         }),
+        state.searchQ && searching
+          ? Btn({ key: 'clearq', onClick: () => { state.searchQ = ''; state.searchHits = null; render(); }, children: '× clear search' })
+          : null,
+        !searching && projects.length > 1
+          ? h('div', { key: 'projfilter', style: 'display:flex;flex-wrap:wrap;gap:.25em;padding:.25em 0' },
+              h('span', { key: 'allp', class: 'lede', style: 'cursor:pointer;padding:.15em .5em;border-radius:3px;' + (!state.projectFilter ? 'background:rgba(80,200,120,.15)' : ''), onClick: () => { state.projectFilter = ''; render(); } }, 'all'),
+              ...projects.slice(0, 8).map(([name, count]) =>
+                h('span', { key: 'p'+name, class: 'lede', style: 'cursor:pointer;padding:.15em .5em;border-radius:3px;' + (state.projectFilter === name ? 'background:rgba(80,200,120,.15)' : ''), title: name, onClick: () => { state.projectFilter = state.projectFilter === name ? '' : name; render(); } }, (name.length > 20 ? name.slice(0, 20) + '…' : name) + ' (' + count + ')')))
+          : null,
         !searching && subagentCount
           ? h('label', { key: 'subtog', class: 'lede', style: 'display:flex;gap:.5em;align-items:center;padding:.25em 0' },
               h('input', { type: 'checkbox', checked: state.showSubagents, onChange: (e) => { state.showSubagents = e.target.checked; render(); } }),
@@ -381,6 +428,9 @@ function historySide() {
         state.historyError
           ? h('p', { key: 'err', class: 'lede' }, '⚠ ' + state.historyError)
           : (rows.length ? h('div', { key: 'rows' }, ...rows) : h('p', { key: 'empty', class: 'lede' }, 'no sessions yet')),
+        !searching && truncatedBy > 0
+          ? Btn({ key: 'more', onClick: () => { state.sessionsLimit += 60; render(); }, children: '↓ show '+Math.min(60, truncatedBy)+' more ('+truncatedBy+' hidden)' })
+          : null,
       ],
     }),
   ];

package/site/app/js/backend.js

@@ -87,11 +87,31 @@ let _wsReady = null;       // Promise that resolves when ws is OPEN
 let _nextReqId = 1;
 const _pending = new Map();          // requestId → { resolve, reject }
 const _sessionListeners = new Map(); // sessionId → Set<(event)=>void>
-const _statusListeners = new Set();  // fn(state) where state in 'open'|'closed'|'error'
+const _statusListeners = new Set();  // fn(state) where state in 'open'|'closed'|'error'|'reconnecting'
+let _reconnectAttempts = 0;
+let _reconnectTimer = null;
+let _wsBaseHint = '';                 // base remembered for reconnect
 
 export function onWsStatus(fn) { _statusListeners.add(fn); return () => _statusListeners.delete(fn); }
 function emitStatus(s) { for (const fn of _statusListeners) { try { fn(s); } catch {} } }
 
+function scheduleReconnect() {
+  if (_reconnectTimer) return;
+  if (typeof navigator !== 'undefined' && navigator.onLine === false) {
+    // Wait for online before retrying.
+    const onOnline = () => { window.removeEventListener('online', onOnline); _reconnectAttempts = 0; ensureWs(_wsBaseHint).catch(() => {}); };
+    window.addEventListener('online', onOnline);
+    return;
+  }
+  const delay = Math.min(30000, 500 * Math.pow(2, _reconnectAttempts));
+  _reconnectAttempts++;
+  emitStatus('reconnecting');
+  _reconnectTimer = setTimeout(() => {
+    _reconnectTimer = null;
+    ensureWs(_wsBaseHint).catch(() => {});
+  }, delay);
+}
+
 function wsUrl(base) {
   let proto, host;
   if (base) {
@@ -110,11 +130,20 @@ function wsUrl(base) {
 }
 
 function ensureWs(base) {
+  _wsBaseHint = base || _wsBaseHint;
   if (_ws && _ws.readyState === 1) return _wsReady;
   if (_ws && _ws.readyState === 0) return _wsReady;
-  _ws = new WebSocket(wsUrl(base));
+  _ws = new WebSocket(wsUrl(_wsBaseHint));
   _wsReady = new Promise((resolve, reject) => {
-    _ws.addEventListener('open', () => { emitStatus('open'); resolve(_ws); });
+    _ws.addEventListener('open', () => {
+      _reconnectAttempts = 0;
+      emitStatus('open');
+      // Re-subscribe any session listeners that survived the disconnect.
+      for (const sid of _sessionListeners.keys()) {
+        try { _ws.send(encode({ m: 'conversation.subscribe', r: _nextReqId++, p: { sessionId: sid } })); } catch {}
+      }
+      resolve(_ws);
+    });
     _ws.addEventListener('error', (e) => { emitStatus('error'); reject(e); });
     _ws.addEventListener('close', () => {
       emitStatus('closed');
@@ -122,6 +151,8 @@ function ensureWs(base) {
       _pending.clear();
       _ws = null;
       _wsReady = null;
+      // Auto-reconnect if there are listeners or callers will retry.
+      if (_sessionListeners.size > 0 || _statusListeners.size > 0) scheduleReconnect();
     });
     _ws.addEventListener('message', (ev) => {
       let msg;
@@ -187,7 +218,7 @@ export async function listModels(base) {
 //   { type: 'error', error: '...' }
 //
 // Caller signature kept compatible with the previous HTTP/SSE impl.
-export async function* streamChat(base, { model, messages, signal, agentId }) {
+export async function* streamChat(base, { model, messages, signal, agentId, resumeSid }) {
   // The last user message is the prompt; agentgui's claude-runner doesn't
   // accept a full message list — it spawns the agent for a single prompt.
   // For multi-turn, the agent's own session/resume handles continuity.
@@ -221,7 +252,7 @@ export async function* streamChat(base, { model, messages, signal, agentId }) {
   // Kick off the chat on the server.
   let started;
   try {
-    started = await wsCall(base, 'chat.sendMessage', { content, agentId: resolvedAgentId, model: resolvedModel });
+    started = await wsCall(base, 'chat.sendMessage', { content, agentId: resolvedAgentId, model: resolvedModel, resumeSid });
   } catch (e) {
     yield { type: 'error', error: e.message };
     return;