@oar-sh/oar 0.9.9 → 0.9.11

package/server/public/app/socket-handlers.js

@@ -16,14 +16,12 @@ import {
   setRelayOnline,
   setCliOnline,
   setCloudflaredTunnelState,
-  setCurrentConv,
   updateWorkspaceRootHints,
   updateCompactButton,
-  updateSessionPill,
   clearPendingUserMessage,
   hasPendingUserMessageDuplicate,
-  isMessagesAtBottom,
   upsertSubagentRun,
+  getSubagentRun,
   addSubagentActivity,
   addSubagentThought,
   clearSubagentCancelInFlight,
@@ -36,7 +34,9 @@ import {
 import { scheduleContextUsageRefresh } from './api-client.js';
 import { capLiveActivityEntries } from './activity-replay-state.mjs';
 import { publishStatusEvent, recordStatusEvent } from './status-store.mjs';
-import { renderConvList, refreshConversations, openConversation } from './journal-view.js';
+import { clearOpenConversation, renderConvList, refreshConversations, scheduleLoadedConversationsRefresh, applyConversationGroupEvent, openConversation } from './journal-view.js';
+import { applyBackgroundTasksToConversation, applyTurnStatusToConversation } from './conversation-turn-state.mjs';
+import { applyRelayEventSubscriptions, loadRelayEventSubscriptions } from './relay-event-subscriptions-ui.js';
 import {
   upsertRelayQuestion,
   loadRelayQuestions,
@@ -45,7 +45,10 @@ import {
 import { upsertRelayBoard, loadRelayBoards, renderRelayBoards } from './relay-board-view.js';
 import { setConversationBackgroundTasks } from './background-tasks-view.mjs';
 import { setConversationPins } from './pinned-messages-view.mjs';
+import { setConversationHiddenMessages } from './hidden-messages-view.mjs';
 import { setPreviews } from './preview-cards.mjs';
+import { applyShareSettings, hasActiveShare, refreshShares } from './share-state.js';
+import { handleShareOpened, handleViewerIpsForgotten } from './shared-conversations-settings.js';
 import { setRemoteRelaysSnapshot } from './remote-relays-store.mjs';
 import { REMOTE_RELAY_SOCKET_EVENT } from './remote-relay-shared.mjs';
 import { AGENT_SESSIONS_SOCKET_EVENT } from './agent-sessions-settings.mjs';
@@ -54,6 +57,7 @@ import { applyClaudeAuthState } from './claude-auth-ui.js';
 import { applyGrokAuthState } from './grok-auth-ui.js';
 import { applyClaudeCloudSettingsState, refreshClaudeCloudSettingsState } from './claude-cloud-settings-ui.js';
 import { applyClaudeCloudSessionEvent } from './claude-cloud-conversation-ui.js';
+import { updateProviderReadinessInputs } from './provider-readiness.mjs';
 import { applyCliInstallState } from './cli-install-ui.js';
 import { renderUpdateSection } from './update-ui.js';
 import { applyHostSuspendState, applyRelayShutdownState } from './host-suspend-ui.js';
@@ -73,7 +77,10 @@ import {
   applyConversationTurnStatus,
   renderMessages,
   appendMessage,
+  captureLiveReplyReadingPosition,
+  restoreLiveReplyReadingPosition,
   replaceRenderedMessage,
+  noteTranscriptLiveRow,
   applyIncomingConversationDraftUpdate,
   getRenderedConversationMessageFingerprints,
   clearBubbleCancelState,
@@ -83,11 +90,18 @@ import {
   syncComposerButtonState,
   syncCancellableSteerButtons,
 } from './conversation-view.js';
+import { followsTranscriptEnd, noteTranscriptNews } from './transcript-jump-bottom-view.mjs';
 import { loadRepoBrowserTree, refreshRepoBrowserIfWorkspaceOpen } from './attachments-view.js';
 import { clearMessageSearchRuntimeState } from './message-search-view.js';
 import { stripRelayPromptContext } from './relay-prompt-sanitizer.mjs';
 import { isLikelyLiveDuplicateMessage } from './live-message-dedupe.mjs';
 import { mergeRelayThoughts } from './relay-thoughts.mjs';
+import {
+  handleSubagentStatusEventForViewer,
+  handleSubagentTimelineEvent,
+  handleSubagentViewerReconnect,
+  refreshSubagentRows,
+} from './subagent-viewer.mjs';
 
 const FALLBACK_MODE = 'agent';
 
@@ -325,8 +339,17 @@ export async function connectSocket(overrideDeps) {
     setCliOnline(true);
     renderConvList();
     resyncAfterConnect();
+    // Every loaded page again, not page one only: events missed while the
+    // socket was down touched rows anywhere in the list.
+    scheduleLoadedConversationsRefresh();
     refreshSessionWorkerStatus().catch(() => {});
     refreshModelCatalog().catch(() => {});
+    // An open sub-agent viewer fetches whatever it missed while away.
+    handleSubagentViewerReconnect();
+    // Subscriptions that changed while away.
+    void loadRelayEventSubscriptions();
+    // Shares made or stopped while away.
+    void refreshShares().catch(() => {});
   });
   socket.on('connect_error', (e) => {
     setRelayOnline(false);
@@ -357,8 +380,11 @@ export async function connectSocket(overrideDeps) {
     updateModelCatalogState(payload || {});
     void reconcileOpenModelVariantModal();
   });
+  // Each settings event also feeds provider readiness (provider-readiness.mjs),
+  // so a Settings save changes the empty screen without a reload.
   socket.on('openai_settings_updated', (payload) => {
-    deps?.applyOpenAISettingsState?.(payload || {});
+    const state = deps?.applyOpenAISettingsState?.(payload || {});
+    updateProviderReadinessInputs({ openai: state || payload || null });
     if (Number(payload?.reconciliation?.updatedUnstartedConversations || 0) > 0) {
       void Promise.resolve()
         .then(() => deps?.refreshCurrentView?.())
@@ -371,7 +397,8 @@ export async function connectSocket(overrideDeps) {
     deps?.applyCopilotSettingsState?.(payload || {});
   });
   socket.on('claude_settings_updated', (payload) => {
-    deps?.applyClaudeSettingsState?.(payload || {});
+    const state = deps?.applyClaudeSettingsState?.(payload || {});
+    updateProviderReadinessInputs({ claude: state || payload || null });
     if (Number(payload?.reconciliation?.updatedUnstartedConversations || 0) > 0) {
       void Promise.resolve()
         .then(() => deps?.refreshCurrentView?.())
@@ -421,8 +448,13 @@ export async function connectSocket(overrideDeps) {
   // carries the same shape as GET /api/settings/claude-cloud; one without a
   // body is read as "something changed" and answered with a fresh read.
   socket.on('claude_cloud_settings_updated', (payload) => {
-    if (payload && typeof payload === 'object') applyClaudeCloudSettingsState(payload);
-    else void refreshClaudeCloudSettingsState();
+    if (payload && typeof payload === 'object') {
+      updateProviderReadinessInputs({ claudeCloud: applyClaudeCloudSettingsState(payload) || null });
+    } else {
+      void refreshClaudeCloudSettingsState().then((state) => {
+        updateProviderReadinessInputs({ claudeCloud: state || null });
+      });
+    }
   });
   // A cloud session got its id, pushed a branch or reported a new cost: the
   // conversation's `cloud` field changed, and with it the cloud line.
@@ -430,7 +462,8 @@ export async function connectSocket(overrideDeps) {
     if (applyClaudeCloudSessionEvent(payload || null)) deps?.syncChatTitleControls?.();
   });
   socket.on('grok_settings_updated', (payload) => {
-    deps?.applyGrokSettingsState?.(payload || {});
+    const state = deps?.applyGrokSettingsState?.(payload || {});
+    updateProviderReadinessInputs({ grok: state || payload || null });
     if (Number(payload?.reconciliation?.updatedUnstartedConversations || 0) > 0) {
       void Promise.resolve()
         .then(() => deps?.refreshCurrentView?.())
@@ -438,7 +471,8 @@ export async function connectSocket(overrideDeps) {
     }
   });
   socket.on('cursor_settings_updated', (payload) => {
-    deps?.applyCursorSettingsState?.(payload || {});
+    const state = deps?.applyCursorSettingsState?.(payload || {});
+    updateProviderReadinessInputs({ cursor: state || payload || null });
     if (Number(payload?.reconciliation?.updatedUnstartedConversations || 0) > 0) {
       void Promise.resolve()
         .then(() => deps?.refreshCurrentView?.())
@@ -485,12 +519,19 @@ export async function connectSocket(overrideDeps) {
       })) {
         return;
       }
-      appendMessage(normalizedMessage, true, messageId);
+      // Another client's message (an agent's prompt included) follows the
+      // end like any live row: a reader scrolled up stays where they are,
+      // and the jump-to-bottom badge counts it.
+      appendMessage(normalizedMessage, followsTranscriptEnd(), messageId);
+      noteTranscriptLiveRow();
     }
   });
   socket.on('assistant_message', ({ conversationId, message, messageId, sourceMessageId }) => {
     const isCurrentConversation = conversationId === currentConvId;
-    const autoScroll = isCurrentConversation ? isMessagesAtBottom() : false;
+    const autoScroll = isCurrentConversation ? followsTranscriptEnd() : false;
+    // A reader who is not at the end keeps what they read where it is while
+    // the reply takes the live bubble's place.
+    const reading = isCurrentConversation && !autoScroll ? captureLiveReplyReadingPosition() : null;
     // A background conversation finishing its turn must not wipe the viewed
     // conversation's live bubble.
     if (isCurrentConversation) {
@@ -509,9 +550,14 @@ export async function connectSocket(overrideDeps) {
         message.thoughts = mergedThoughts;
       }
     }
-    if (messageId && seenMessageIds?.has(messageId)) return;
+    if (messageId && seenMessageIds?.has(messageId)) {
+      restoreLiveReplyReadingPosition(reading);
+      return;
+    }
     if (isCurrentConversation) {
       appendMessage(message, autoScroll, messageId || null, false, sourceMessageId || null);
+      restoreLiveReplyReadingPosition(reading);
+      noteTranscriptLiveRow();
       scheduleContextUsageRefresh(conversationId, 120);
     }
     if (sourceMessageId) relayActivities.delete(sourceMessageId);
@@ -530,8 +576,9 @@ export async function connectSocket(overrideDeps) {
   socket.on('message_updated', ({ conversationId, messageId, message }) => {
     if (!messageId || conversationId !== currentConvId || !message) return;
     if (!replaceRenderedMessage(message, messageId)) {
-      appendMessage(message, isMessagesAtBottom(), messageId, false);
+      appendMessage(message, followsTranscriptEnd(), messageId, false);
     }
+    noteTranscriptLiveRow();
   });
   socket.on('relay_question', ({ question }) => upsertRelayQuestion(question));
   socket.on('relay_question_updated', ({ question }) => upsertRelayQuestion(question));
@@ -543,19 +590,55 @@ export async function connectSocket(overrideDeps) {
   socket.on('relay_board_changed', () => {
     loadRelayBoards();
   });
+  // Relay event subscriptions: the whole active list, after every change.
+  socket.on('relay_event_subscriptions', ({ subscriptions }) => {
+    applyRelayEventSubscriptions(subscriptions);
+  });
   socket.on('background_tasks', ({ conversationId, tasks }) => {
     setConversationBackgroundTasks(conversationId, tasks);
+    // The sidebar's row (and its group's head) count background work as
+    // running; the set arrives under the conversation or its session id.
+    const id = String(conversationId || '').trim();
+    const record = conversations[id]
+      || Object.values(conversations).find((conversation) => String(conversation?.sdkSessionId || '') === id)
+      || null;
+    if (record && applyBackgroundTasksToConversation(record, tasks)) renderConvList();
   });
   // A message was pinned or unpinned (any client): the conversation's whole
   // pin list, replacing what this page had.
   socket.on('conversation_pins_updated', ({ conversationId, pins, revision }) => {
     setConversationPins(conversationId, pins, revision);
   });
+  // A message was hidden from or shown to shared viewers (any client): the
+  // conversation's whole hidden list, replacing what this page had.
+  socket.on('conversation_hidden_messages_updated', ({ conversationId, hiddenMessages, revision }) => {
+    setConversationHiddenMessages(conversationId, hiddenMessages, revision);
+  });
   // REPLACE semantics for the whole set: the preview registry is relay-owned
   // and global, so every change ships the full list.
   socket.on('previews', ({ previews }) => {
     setPreviews(previews);
   });
+  // Public shares: the events name the conversation only; the list (Settings
+  // → Sharing, the ⋯ menu's Stop sharing) is read again.
+  for (const event of ['share_created', 'share_renewed', 'share_revoked']) {
+    socket.on(event, () => {
+      void refreshShares().catch(() => {});
+    });
+  }
+  // A deleted conversation takes its share along.
+  socket.on('conversation_deleted', ({ conversationId } = {}) => {
+    if (hasActiveShare(conversationId)) void refreshShares().catch(() => {});
+  });
+  socket.on('share_opened', ({ conversationId } = {}) => {
+    handleShareOpened(conversationId);
+  });
+  socket.on('share_settings_changed', (payload) => {
+    applyShareSettings(payload || null);
+  });
+  socket.on('share_viewer_ips_forgotten', () => {
+    handleViewerIpsForgotten();
+  });
   // REPLACE semantics too: the relay ships the whole remote-relay list (no
   // tokens) whenever a remote is added, removed, renamed or changes status.
   socket.on(REMOTE_RELAY_SOCKET_EVENT, (payload) => {
@@ -580,16 +663,17 @@ export async function connectSocket(overrideDeps) {
     const last = items[items.length - 1];
     const lastText = typeof last === 'string' ? last : String(last?.text || '');
     const lastSubagentRunId = typeof last === 'object' && last ? (last.subagentRunId || null) : null;
-    if (lastText !== entry.text || lastSubagentRunId !== entry.subagentRunId) {
-      relayActivities.set(messageId, capLiveActivityEntries(items.concat(entry)));
-    }
+    // The same line again (a repeated event) adds nothing.
+    const added = lastText !== entry.text || lastSubagentRunId !== entry.subagentRunId;
+    if (added) relayActivities.set(messageId, capLiveActivityEntries(items.concat(entry)));
     if (entry.subagentRunId) {
       upsertSubagentRun({ subagentRunId: entry.subagentRunId, messageId, conversationId });
       addSubagentActivity(entry.subagentRunId, entry.text);
     }
     if (conversationId === currentConvId) {
-      const autoScroll = isMessagesAtBottom();
+      const autoScroll = followsTranscriptEnd();
       appendThinkingActivity(entry, entry.subagentRunId, autoScroll);
+      if (added && !autoScroll) noteTranscriptNews();
     }
   });
   socket.on('relay_stream', ({ conversationId, messageId, text, done, seq, subagentRunId }) => {
@@ -598,8 +682,8 @@ export async function connectSocket(overrideDeps) {
       upsertSubagentRun({ subagentRunId: String(subagentRunId).trim(), messageId, conversationId });
     }
     if (conversationId !== currentConvId) return;
-    const autoScroll = isMessagesAtBottom();
-    applyRelayStreamEvent({
+    const autoScroll = followsTranscriptEnd();
+    const accepted = applyRelayStreamEvent({
       messageId,
       text: String(text || ''),
       done: !!done,
@@ -607,11 +691,16 @@ export async function connectSocket(overrideDeps) {
       subagentRunId: subagentRunId ? String(subagentRunId).trim() : null,
       autoScroll,
     });
+    // A frame that was dropped (out of order, a finished turn) is no news.
+    if (accepted && !autoScroll) noteTranscriptNews();
   });
   socket.on('relay_thought', ({ conversationId, messageId, reasoningId, text, done, subagentRunId }) => {
     if (!messageId) return;
     const key = String(reasoningId || 'reasoning');
     const thoughtMap = relayThoughts.get(messageId) || new Map();
+    const known = thoughtMap.get(key);
+    // The same thought again (a repeated event) adds nothing.
+    const added = !known || known.text !== String(text || '') || known.done !== !!done;
     thoughtMap.set(key, { reasoningId: key, text: String(text || ''), done: !!done, subagentRunId: subagentRunId || null });
     relayThoughts.set(messageId, thoughtMap);
     if (subagentRunId) {
@@ -619,28 +708,33 @@ export async function connectSocket(overrideDeps) {
       addSubagentThought(subagentRunId, { reasoningId: key, text: String(text || ''), done: !!done });
     }
     if (conversationId === currentConvId) {
-      const autoScroll = isMessagesAtBottom();
+      const autoScroll = followsTranscriptEnd();
       appendThinkingThought(key, String(text || ''), !!done, subagentRunId, autoScroll);
+      if (added && !autoScroll) noteTranscriptNews();
     }
   });
-  socket.on('subagent_status', ({ conversationId, messageId, subagentRunId, parentSubagentId, displayName, status, timestamp, stopUnsupported }) => {
-    if (!messageId || !subagentRunId) return;
-    upsertSubagentRun({
-      subagentRunId,
-      messageId,
-      conversationId,
-      parentSubagentId,
-      displayName,
-      status,
-      timestamp,
-    });
+  socket.on('subagent_status', (payload = {}) => {
+    const { conversationId, subagentRunId, status, stopUnsupported } = payload;
+    if (!subagentRunId) return;
+    // An event without its turn is placed on the run the store already
+    // knows; one for an unknown run without a turn cannot be placed.
+    const messageId = payload.messageId || getSubagentRun(subagentRunId)?.messageId || null;
+    if (!messageId) return;
+    upsertSubagentRun({ ...payload, messageId });
     clearSubagentCancelInFlight(subagentRunId);
     // The provider answered "not supported": pin the state so the button does
     // not re-arm into an endless click-and-fail loop.
     if (stopUnsupported) markSubagentStopUnsupported(subagentRunId);
     if (conversationId === currentConvId) {
       updateSubagentBubbleFromStatus(subagentRunId, status);
+      refreshSubagentRows(subagentRunId);
     }
+    handleSubagentStatusEventForViewer({ ...payload, messageId });
+  });
+  // Entries of a sub-agent's record; the relay sends them only while this
+  // page's viewer watches that run.
+  socket.on('subagent_timeline', (payload) => {
+    handleSubagentTimelineEvent(payload);
   });
   socket.on('conversation_compacted', async ({ sourceConversationId, targetConversationId }) => {
     if (!sourceConversationId || !targetConversationId) return;
@@ -733,6 +827,9 @@ export async function connectSocket(overrideDeps) {
     applyConversationTurnStatus({ conversationId, messageId, status });
     if (conversationId && conversations[conversationId]) {
       const conversation = conversations[conversationId];
+      // The row's turn fields follow the event, open or not: the dots, a
+      // group head's pill and its fold read them between list fetches.
+      applyTurnStatusToConversation(conversation, normalizedStatus);
       if (normalizedStatus === 'processing') {
         conversation.localTurnStatus = 'processing';
         conversation.localTurnStatusUpdatedAt = Date.now();
@@ -748,7 +845,7 @@ export async function connectSocket(overrideDeps) {
       }
     }
     if (conversationId === currentConvId && normalizedStatus === 'processing') {
-      const autoScroll = isMessagesAtBottom();
+      const autoScroll = followsTranscriptEnd();
       showThinking(messageId || null, autoScroll);
       renderThinkingActivities();
       renderThinkingThoughts();
@@ -784,6 +881,12 @@ export async function connectSocket(overrideDeps) {
     }
     renderConvList();
   });
+  // A session group changed (a member joined or left, a name, a dissolve,
+  // here or from another device): every loaded page is fetched again with
+  // its groups, so a row far down the list changes too.
+  socket.on('conversation_group_changed', (payload) => {
+    applyConversationGroupEvent(payload);
+  });
   socket.on('conversation_archived', ({ conversationId, archived }) => {
     const id = String(conversationId || '').trim();
     if (!id) return;
@@ -811,13 +914,7 @@ export async function connectSocket(overrideDeps) {
     renderRelayBoards();
     renderConvList();
     if (currentConvId === conversationId) {
-      setCurrentConv(null);
-      renderMessages([]);
-      document.getElementById('chat-title').textContent = 'Select or start a conversation';
-      syncChatTitleControls();
-      updateSessionPill(null, null);
-      updateCompactButton();
-      scheduleContextUsageRefresh(null);
+      clearOpenConversation();
     } else {
       updateCompactButton();
     }

package/server/public/app/store.js

@@ -5,6 +5,7 @@ import { readRepoBrowserPreferences } from './repo-browser-preferences.mjs';
 import { isChatInteractionHeld } from './selection-guard.mjs';
 import { nextSubagentStatus } from './subagent-fold.mjs';
 import { useStrictStrikethrough } from './markdown-strikethrough.mjs';
+import { parseGroupFoldChoices, pruneGroupFoldChoices } from './conversation-group-state.mjs';
 
 function resolveAppBase() {
   const configuredBase = typeof window.__COPILOT_APP_CONFIG?.basePath === 'string'
@@ -16,6 +17,8 @@ function resolveAppBase() {
   const pathname = String(window.location.pathname || '/');
   const sharedIndex = pathname.indexOf('/shared/');
   if (sharedIndex >= 0) return pathname.slice(0, sharedIndex).replace(/\/+$/, '');
+  const previewIndex = pathname.indexOf('/share-preview/');
+  if (previewIndex >= 0) return pathname.slice(0, previewIndex).replace(/\/+$/, '');
   return pathname.replace(/\/+$/, '');
 }
 
@@ -32,8 +35,24 @@ function resolveSharedConversationToken() {
   if (configured) return configured;
   return extractSharedTokenFromPathname(window.location.pathname);
 }
-export const SHARED_CONVERSATION_TOKEN = resolveSharedConversationToken();
-export const IS_SHARED_VIEW = !!SHARED_CONVERSATION_TOKEN;
+// "Preview as shared": the owner reads a conversation as a share link would
+// serve it (marked redactions), through the owner-only preview routes. It is a
+// shared view in every other respect.
+function resolveSharePreviewConversationId() {
+  const configured = String(window.__COPILOT_APP_CONFIG?.sharePreviewConversationId || '').trim();
+  if (configured) return configured;
+  const match = String(window.location.pathname || '/').match(/\/share-preview\/([^/?#]+)\/?$/i);
+  if (!match) return '';
+  try {
+    return decodeURIComponent(String(match[1] || '')).trim();
+  } catch {
+    return '';
+  }
+}
+export const SHARE_PREVIEW_CONVERSATION_ID = resolveSharePreviewConversationId();
+export const IS_SHARE_PREVIEW = !!SHARE_PREVIEW_CONVERSATION_ID;
+export const SHARED_CONVERSATION_TOKEN = IS_SHARE_PREVIEW ? '' : resolveSharedConversationToken();
+export const IS_SHARED_VIEW = !!SHARED_CONVERSATION_TOKEN || IS_SHARE_PREVIEW;
 export let TOKEN = '';
 export let socket = null;
 export let currentConvId = null;
@@ -82,6 +101,9 @@ export let updateState = null;
 export let activeRuntimeSessionCount = 0;
 export let runtimeSessionBindingCount = 0;
 export let conversations = {};
+// Session groups by id, as the list payload describes them (`groups`):
+// name, display name, head and member counts. Merged with every page.
+export const conversationGroups = {};
 export let selectedAttachments = [];
 export let imageEditTarget = null;
 export const RELAY_QUESTION_POLL_MS = 3000;
@@ -172,6 +194,8 @@ const SIDEBAR_WIDTH_PERCENT_FALLBACK = 24;
 const SIDEBAR_WIDTH_PORTRAIT_STORAGE_KEY = 'copilot_sidebar_width_pct_portrait';
 const SIDEBAR_WIDTH_LANDSCAPE_STORAGE_KEY = 'copilot_sidebar_width_pct_landscape';
 const SIDEBAR_COLLAPSED_DESKTOP_STORAGE_KEY = 'copilot_sidebar_collapsed_desktop';
+// The user's fold choices for session groups in the sidebar: { [groupId]: 'open' | 'folded' }.
+const CONVERSATION_GROUP_FOLDS_STORAGE_KEY = 'copilot_conv_group_folds';
 let sidebarWidthPercent = SIDEBAR_WIDTH_PERCENT_FALLBACK;
 const CONVERSATION_SCROLL_STORAGE_PREFIX = 'copilot_message_scroll_';
 
@@ -197,6 +221,59 @@ export function setCurrentConv(id) {
   updateCompactButton();
 }
 
+/** Merges a list payload's `groups` (by id) into the known session groups. */
+export function mergeConversationGroups(groups) {
+  if (!groups || typeof groups !== 'object') return;
+  for (const [groupId, group] of Object.entries(groups)) {
+    const id = String(groupId || '').trim();
+    if (!id || !group || typeof group !== 'object') continue;
+    conversationGroups[id] = { ...(conversationGroups[id] || {}), ...group, id };
+  }
+}
+
+/** Forgets a session group the relay no longer lists. */
+export function forgetConversationGroup(groupId) {
+  delete conversationGroups[String(groupId || '').trim()];
+}
+
+/**
+ * Keeps only the groups that a loaded row still belongs to: after a list
+ * refresh a dissolved group has no row left, and the picker must not offer
+ * it. Returns the ids dropped.
+ */
+export function pruneConversationGroups(keepGroupIds) {
+  const keep = new Set((Array.isArray(keepGroupIds) ? keepGroupIds : []).map((id) => String(id || '').trim()).filter(Boolean));
+  const dropped = [];
+  for (const id of Object.keys(conversationGroups)) {
+    if (keep.has(id)) continue;
+    delete conversationGroups[id];
+    dropped.push(id);
+  }
+  return dropped;
+}
+
+export function readConversationGroupFoldChoices() {
+  return parseGroupFoldChoices(localStorage.getItem(CONVERSATION_GROUP_FOLDS_STORAGE_KEY) || '');
+}
+
+// The stored fold choices are trimmed to the loaded groups only past this
+// size: a choice for a group on an older page or in the other view must
+// not go with every toggle.
+const CONVERSATION_GROUP_FOLDS_MAX = 300;
+
+/** Stores the user's fold choice for a group. */
+export function setConversationGroupFoldChoice(groupId, choice) {
+  const id = String(groupId || '').trim();
+  if (!id) return;
+  let next = readConversationGroupFoldChoices();
+  if (Object.keys(next).length > CONVERSATION_GROUP_FOLDS_MAX) {
+    next = pruneGroupFoldChoices(next, [...Object.keys(conversationGroups), id]);
+  }
+  if (choice === 'open' || choice === 'folded') next[id] = choice;
+  else delete next[id];
+  localStorage.setItem(CONVERSATION_GROUP_FOLDS_STORAGE_KEY, JSON.stringify(next));
+}
+
 export function setConversationWatcherCount(conversationId, count) {
   const id = String(conversationId || '').trim();
   if (!id) return;
@@ -612,37 +689,18 @@ export function getMessagesDistanceFromBottom() {
   return Math.max(0, el.scrollHeight - el.clientHeight - el.scrollTop);
 }
 
-function resolveMessagesNearBottomThreshold(el, thresholdPx = null) {
-  if (Number.isFinite(Number(thresholdPx)) && Number(thresholdPx) >= 0) {
-    return Math.trunc(Number(thresholdPx));
-  }
-  return resolveNearBottomThresholdPx(el?.clientHeight);
-}
-
-export function isMessagesNearBottom(thresholdPx = null) {
-  const el = document.getElementById('messages');
-  if (!el) return true;
-  const distance = Math.max(0, el.scrollHeight - el.clientHeight - el.scrollTop);
-  const threshold = resolveMessagesNearBottomThreshold(el, thresholdPx);
-  return distance <= threshold;
-}
-
-export function isMessagesAtBottom(epsilonPx = 1) {
+/**
+ * "At the end" of the transcript, wherever that is decided: within the
+ * near-bottom margin (8% of the viewport, between 12 and 48 px). One margin
+ * and no parameter: a caller with a margin of its own (there was one with
+ * 80 px, one with 1 px, and a default that read as 0 px) breaks the rule that
+ * the transcript follows a reader who is at the end and nobody else.
+ */
+export function isMessagesNearBottom() {
   const el = document.getElementById('messages');
   if (!el) return true;
-  const epsilon = Math.max(0, Number.isFinite(Number(epsilonPx)) ? Number(epsilonPx) : 1);
   const distance = Math.max(0, el.scrollHeight - el.clientHeight - el.scrollTop);
-  return distance <= epsilon;
-}
-
-export function scrollBottomAfterSend() {
-  scrollBottom();
-  requestAnimationFrame(() => {
-    scrollBottom();
-  });
-  setTimeout(() => {
-    scrollBottom();
-  }, 120);
+  return distance <= resolveNearBottomThresholdPx(el.clientHeight);
 }
 
 export function isMobileComposerViewport() {
@@ -944,8 +1002,16 @@ function buildSessionWorkerStateHash(map) {
 
 let sessionWorkerStateHash = '';
 
+// Whether a status poll has answered yet: before that, a session's reported
+// background work is taken as it is; after it, only a live worker carries it.
+let sessionWorkerStatusKnown = false;
+export function hasSessionWorkerStatus() {
+  return sessionWorkerStatusKnown;
+}
+
 export function setSessionWorkerStatesFromStatusPayload(payload) {
   const workers = Array.isArray(payload?.workers) ? payload.workers : [];
+  sessionWorkerStatusKnown = true;
   const next = new Map();
   for (const worker of workers) {
     const normalized = normalizeWorkerStateEntry(worker);
@@ -1498,6 +1564,17 @@ export function isSubagentCancelInFlight(subagentRunId) {
   return id ? subagentCancelInFlight.has(id) : false;
 }
 
+const SUBAGENT_HEADER_FIELDS = ['completedAt', 'model', 'modelInherited', 'subagentType', 'taskId', 'totalTokens', 'background', 'truncated', 'stoppable'];
+
+function subagentHeaderFields(payload, existing) {
+  const fields = {};
+  for (const name of SUBAGENT_HEADER_FIELDS) {
+    const value = payload?.[name];
+    fields[name] = value === undefined ? (existing?.[name] ?? null) : value;
+  }
+  return fields;
+}
+
 export function upsertSubagentRun(payload) {
   const subagentRunId = normalizeSubagentRunId(payload?.subagentRunId);
   if (!subagentRunId) return null;
@@ -1511,8 +1588,14 @@ export function upsertSubagentRun(payload) {
     parentSubagentId: normalizeSubagentRunId(payload?.parentSubagentId) || existing?.parentSubagentId || null,
     displayName: String(payload?.displayName || existing?.displayName || '').trim() || null,
     status: nextSubagentStatus({ reported: payload?.status, known: existing?.status, normalize: normalizeSubagentStatus }),
-    startedAt: existing?.startedAt || payload?.timestamp || now,
-    updatedAt: payload?.timestamp || now,
+    startedAt: payload?.startedAt || existing?.startedAt || payload?.timestamp || now,
+    updatedAt: payload?.updatedAt || payload?.timestamp || now,
+    // The run header (relay 0009): what the sub-agent rows and the viewer
+    // show. An event that does not name a field keeps the known value.
+    ...subagentHeaderFields(payload, existing),
+    // Whether `status` came from the relay rather than the default a live
+    // lane's first frame starts with.
+    statusReported: Boolean(String(payload?.status || '').trim()) || existing?.statusReported === true,
     activities: existing?.activities || [],
     thoughts: existing?.thoughts || [],
     // Cumulative streamed text for this run, replayed when its bubble is