agentgui 1.0.1052 → 1.0.1053

package/package.json

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

package/site/app/js/app.js

@@ -3,7 +3,7 @@ import * as B from './backend.js';
 
 installStyles().catch(() => {});
 
-const { AppShell, WorkspaceShell, WorkspaceRail, Topbar, Crumb, Side, Status, Chat, ChatComposer, AgentChat, ConversationList, SessionDashboard, Row, Panel, PageHeader, TextField, Select, Btn, Icon, EventList, Spinner, Alert, FileGrid, FileSkeleton, sortFiles, FileToolbar, RootsPicker, BreadcrumbPath, EmptyState, FileViewer, FilePreviewPane, FilePreviewCode, FilePreviewText, FilePreviewMedia, ThemeToggle, ContextPane, PromptDialog, ConfirmDialog, DropZone, UploadProgress, FilterPills, SessionMeta, BulkBar, Checkbox, ShortcutList, FocusTrap, AgentListSkeleton } = C;
+const { AppShell, WorkspaceShell, WorkspaceRail, Topbar, Crumb, Side, Status, Chat, ChatComposer, AgentChat, ConversationList, SessionDashboard, Row, Panel, PageHeader, TextField, Select, Btn, Icon, IconButton, EventList, Spinner, Alert, FileGrid, FileSkeleton, sortFiles, FileToolbar, RootsPicker, BreadcrumbPath, EmptyState, FileViewer, FilePreviewPane, FilePreviewCode, FilePreviewText, FilePreviewMedia, ThemeToggle, ContextPane, PromptDialog, ConfirmDialog, DropZone, UploadProgress, FilterPills, SessionMeta, BulkBar, Checkbox, ShortcutList, FocusTrap, AgentListSkeleton } = C;
 
 // One duration/bytes vocabulary across every surface: prefer the kit's shared
 // formatters (exported alongside the components), fall back to the local
@@ -437,6 +437,21 @@ async function stopActiveChat(sid) {
   state.active = (Array.isArray(state.active) ? state.active : []).filter(a => a.sessionId !== sid);
   await refreshActive();
   render();
+  // The backend accepted the cancel, but the underlying process can outlive
+  // this immediate refresh - if it's still showing active after a bounded
+  // wait, stop treating it as en-route-to-stopped: clear `stopping` (or the
+  // row wedges permanently disabled) and surface the same retry banner used
+  // on an outright rejection.
+  setTimeout(() => {
+    const st2 = state.live.stopping;
+    const stillActive = Array.isArray(state.active) && state.active.some(a => a.sessionId === sid);
+    if (st2 && st2.has(sid) && stillActive) {
+      st2.delete(sid);
+      state.live.bulkStopError = 'conversation did not stop - try again';
+      announce('stop failed');
+      render();
+    }
+  }, 9000);
 }
 
 function openLiveStream() {
@@ -507,6 +522,7 @@ function openLiveStream() {
             if (ev.type === 'tool_use') { t.tools++; t.toolRunning = true; t.toolName = ev.tool || ev.name || ''; }
             if (ev.type === 'tool_result') { t.toolRunning = false; t.toolName = ''; }
             if (ev.type === 'result' && ev.usage) { t.tokens = (t.tokens || 0) + (ev.usage.input_tokens || 0) + (ev.usage.output_tokens || 0); }
+            if (ev.type === 'result' && typeof ev.total_cost_usd === 'number') { t.cost = (t.cost || 0) + ev.total_cost_usd; }
             if (ev.isError) { t.errors++; t.lastErrorTs = t.last; }
           }
           state.live.tally.set(data.sid, t);
@@ -708,8 +724,13 @@ function workspaceRail() {
     action: { label: 'New chat', icon: 'pencil', onClick: () => { navTo('chat'); newChat(); } },
     items,
     // W18: a persistent theme toggle pinned to the rail bottom (the Claude-Desktop
-    // / cowork pinned-bottom affordance). ThemeToggle is already imported.
-    footer: ThemeToggle({ compact: true }),
+    // / cowork pinned-bottom affordance). A shortcuts-help icon sits alongside it -
+    // the '?' overlay (state.showShortcuts) was previously 100% keyboard-only
+    // tribal knowledge with zero visible entry point outside Settings.
+    footer: [
+      h('span', { key: 'rail-help' }, IconButton({ icon: 'help', title: 'Keyboard shortcuts', onClick: () => { state.showShortcuts = true; render(); } })),
+      h('span', { key: 'rail-theme' }, ThemeToggle({ compact: true })),
+    ],
   });
 }
 
@@ -1779,7 +1800,7 @@ function computeLiveSessions() {
       // Surface the in-page chat's own running cost and token count on its card
       // (the only session we hold reliable per-session data for; others omit it).
       cost: (state.chat.resumeSid && (r.claudeSessionId === state.chat.resumeSid || r.sessionId === state.chat.resumeSid))
-        ? (state.chat.totalCost || null) : null,
+        ? (state.chat.totalCost || null) : (t && t.cost ? t.cost : null),
       tokens: (state.chat.resumeSid && (r.claudeSessionId === state.chat.resumeSid || r.sessionId === state.chat.resumeSid) && state.chat.usage)
         ? ((state.chat.usage.inputTokens || 0) + (state.chat.usage.outputTokens || 0)) : (t && t.tokens ? t.tokens : undefined),
     };
@@ -3121,6 +3142,15 @@ function resumeSidLabel(sid) {
   return label || UNTITLED_CONVERSATION;
 }
 
+// Same identity contract as the sessions rail/history rail/Live SessionCard:
+// a running row must show the resolved conversation title, not just agent
+// metadata - otherwise the same session reads as "nameless" here and named
+// everywhere else.
+function runningRowTitle(r) {
+  const realSid = r.claudeSessionId || r.sessionId;
+  return resumeSidLabel(realSid);
+}
+
 function uniqueProjects() {
   const arr = Array.isArray(state.sessions) ? state.sessions : [];
   const seen = new Map();
@@ -3168,7 +3198,7 @@ function runningPanel() {
         // unkeyed one crashes webjsx applyDiff "reading 'key'").
         return h('div', { key: 'run' + r.sessionId, class: 'resume-banner', role: 'group' },
           h('span', { key: 'rd-' + r.sessionId, class: 'status-dot-disc ' + (isStopping ? 'status-dot-connecting' : 'status-dot-live'), 'aria-hidden': 'true' }),
-          h('span', { key: 'rl-' + r.sessionId, class: 't-meta' }, agentName + (r.model ? ' · ' + r.model : '') + (elapsedMs ? ' · ' + fmtDuration(elapsedMs) : '') + (r.cwd ? ' · ' + pathBasename(r.cwd) : '')),
+          h('span', { key: 'rl-' + r.sessionId, class: 't-meta' }, runningRowTitle(r) + ' · ' + agentName + (r.model ? ' · ' + r.model : '') + (elapsedMs ? ' · ' + fmtDuration(elapsedMs) : '') + (r.cwd ? ' · ' + pathBasename(r.cwd) : '')),
           Btn({ key: 'open' + r.sessionId, onClick: () => navTo('live'), children: 'open in live' }),
           Btn({ key: 'stop' + r.sessionId, disabled: isStopping, onClick: () => stopActiveChat(r.sessionId), children: isStopping ? 'stopping…' : 'stop' }));
       }),