@oar-sh/oar 0.9.11 → 0.9.12

package/server/public/app/settings-modal.js

@@ -29,6 +29,8 @@ import {
   updateTurnCeilingSetting as requestTurnCeilingSetting,
   loadBackgroundTaskTimeoutSetting,
   updateBackgroundTaskTimeoutSetting as requestBackgroundTaskTimeoutSetting,
+  loadTaskStallMinutesSetting,
+  updateTaskStallMinutesSetting as requestTaskStallMinutesSetting,
   loadSubagentRecordRetentionSetting,
   updateSubagentRecordRetentionSetting as requestSubagentRecordRetentionSetting,
   loadFeatureFlagSettings,
@@ -36,6 +38,12 @@ import {
   requestRelayRestart,
 } from './api-client.js';
 import { DEFAULT_BACKGROUND_TASK_TIMEOUT_MINUTES } from './background-task-timeout-options.mjs';
+import {
+  DEFAULT_CLAUDE_BACKGROUND_COMMAND_LIMIT_MINUTES,
+  formatClaudeBackgroundCommandLimitLabel,
+} from './claude-background-command-limit-options.mjs';
+import { DEFAULT_TASK_STALL_MINUTES } from './task-console-render.mjs';
+import { setTaskStallThreshold } from './background-tasks-view.mjs';
 import { describeRelayRestartError } from './relay-restart-error.mjs';
 import { syncFontScaleSelect } from './font-scaling.js';
 import { syncInstalledAppUiState, syncPwaAppNameInput } from './pwa-install.js';
@@ -51,6 +59,7 @@ import { refreshRemoteRelaysSection } from './remote-relays-settings.js';
 import { refreshAgentSessionsSection } from './agent-sessions-settings-ui.js';
 import { refreshSharedConversationsSection } from './shared-conversations-settings.js';
 import { syncScrollOnSendToggle } from './transcript-jump-bottom.mjs';
+import { syncWindowRetentionSlider } from './conversation-window-retention.mjs';
 import {
   getPreviews,
   renderPreviewRowsInto,
@@ -202,6 +211,74 @@ export async function refreshBackgroundTaskTimeoutSetting() {
   }
 }
 
+// Minutes without output after which a background task's row turns amber.
+// Starts at the relay's default; bounds come from the API response.
+let taskStallMinutes = DEFAULT_TASK_STALL_MINUTES;
+let taskStallMinutesUpdateInFlight = false;
+
+export function formatTaskStallMinutesLabel(value) {
+  const minutes = Math.max(1, Math.round(Number(value) || DEFAULT_TASK_STALL_MINUTES));
+  return `${minutes} min`;
+}
+
+function syncTaskStallMinutesSlider() {
+  const slider = document.getElementById('task-stall-minutes-slider');
+  const label = document.getElementById('task-stall-minutes-value');
+  if (slider instanceof HTMLInputElement) {
+    slider.value = String(taskStallMinutes);
+    slider.disabled = taskStallMinutesUpdateInFlight;
+  }
+  if (label) label.textContent = formatTaskStallMinutesLabel(taskStallMinutes);
+}
+
+/** Live label feedback while dragging; nothing is persisted until change fires. */
+export function previewTaskStallMinutesSetting(value) {
+  const label = document.getElementById('task-stall-minutes-value');
+  if (label) label.textContent = formatTaskStallMinutesLabel(value);
+}
+
+export async function refreshTaskStallMinutesSetting() {
+  syncTaskStallMinutesSlider();
+  try {
+    const result = await loadTaskStallMinutesSetting();
+    if (!result || !Number.isFinite(Number(result.minutes))) return;
+    taskStallMinutes = Number(result.minutes);
+    setTaskStallThreshold(taskStallMinutes);
+    const slider = document.getElementById('task-stall-minutes-slider');
+    if (slider instanceof HTMLInputElement) {
+      if (Number.isFinite(Number(result.min))) slider.min = String(result.min);
+      if (Number.isFinite(Number(result.max))) slider.max = String(result.max);
+    }
+  } catch {
+    // Keep the last known value; the setting is not critical.
+  } finally {
+    syncTaskStallMinutesSlider();
+  }
+}
+
+export async function updateTaskStallMinutesSetting(value) {
+  if (taskStallMinutesUpdateInFlight) {
+    syncTaskStallMinutesSlider();
+    return;
+  }
+  const requested = Math.max(1, Math.round(Number(value) || DEFAULT_TASK_STALL_MINUTES));
+  taskStallMinutesUpdateInFlight = true;
+  syncTaskStallMinutesSlider();
+  try {
+    const result = await requestTaskStallMinutesSetting(requested);
+    if (!result) throw new Error('Failed to update when a background task counts as quiet.');
+    taskStallMinutes = Number.isFinite(Number(result.minutes)) ? Number(result.minutes) : requested;
+    // The open conversation's rows follow at once, not on the next load.
+    setTaskStallThreshold(taskStallMinutes);
+    showTransientRelayNotice(`Background tasks are marked as quiet after ${formatTaskStallMinutesLabel(taskStallMinutes)} without output.`);
+  } catch (error) {
+    alert(error?.message || 'Failed to update when a background task counts as quiet.');
+  } finally {
+    taskStallMinutesUpdateInFlight = false;
+    syncTaskStallMinutesSlider();
+  }
+}
+
 // Mirrors shared/subagent-record-retention.mjs (the browser cannot import it):
 // the select starts at the relay's default until the relay's value loads.
 const DEFAULT_SUBAGENT_RECORD_RETENTION_DAYS = 90;
@@ -479,6 +556,7 @@ let claudeSettingsState = {
   enabled: false,
   model: 'claude-sonnet-5',
   models: [],
+  backgroundCommandLimitMinutes: DEFAULT_CLAUDE_BACKGROUND_COMMAND_LIMIT_MINUTES,
 };
 let claudeSettingsInputsDirty = false;
 
@@ -492,7 +570,7 @@ function ensureClaudeSettingsInputTracking() {
 }
 
 function setClaudeSettingsControlsDisabled(disabled) {
-  for (const id of ['claude-model-input', 'claude-enabled-toggle', 'claude-attribution-select', 'claude-save-btn']) {
+  for (const id of ['claude-model-input', 'claude-enabled-toggle', 'claude-attribution-select', 'claude-background-command-limit-slider', 'claude-save-btn']) {
     const element = document.getElementById(id);
     if (element) element.disabled = disabled;
   }
@@ -507,6 +585,9 @@ export function applyClaudeSettingsState(settings = {}, { resetInputs = false }
     models: Array.isArray(settings?.models) ? settings.models : claudeSettingsState.models,
     attributionMode: ['oar', 'vanilla', 'off'].includes(settings?.attributionMode) ? settings.attributionMode : (claudeSettingsState.attributionMode || 'oar'),
     attributionExample: String(settings?.attributionExample || claudeSettingsState.attributionExample || '').trim(),
+    backgroundCommandLimitMinutes: Number(settings?.backgroundCommandLimitMinutes) > 0
+      ? Number(settings.backgroundCommandLimitMinutes)
+      : (claudeSettingsState.backgroundCommandLimitMinutes || DEFAULT_CLAUDE_BACKGROUND_COMMAND_LIMIT_MINUTES),
   };
   const modelInput = document.getElementById('claude-model-input');
   const toggle = document.getElementById('claude-enabled-toggle');
@@ -514,6 +595,15 @@ export function applyClaudeSettingsState(settings = {}, { resetInputs = false }
   const attributionSelect = document.getElementById('claude-attribution-select');
   if (attributionSelect && (!claudeSettingsInputsDirty || resetInputs)) attributionSelect.value = claudeSettingsState.attributionMode;
   renderClaudeAttributionExample(attributionSelect?.value || claudeSettingsState.attributionMode);
+  const limitSlider = document.getElementById('claude-background-command-limit-slider');
+  if (limitSlider instanceof HTMLInputElement) {
+    // Bounds come from the relay; the markup's are only the pre-load copy.
+    for (const [attribute, field] of [['min', 'backgroundCommandLimitMinMinutes'], ['max', 'backgroundCommandLimitMaxMinutes'], ['step', 'backgroundCommandLimitStepMinutes']]) {
+      if (Number(settings?.[field]) > 0) limitSlider[attribute] = String(settings[field]);
+    }
+    if (!claudeSettingsInputsDirty || resetInputs) limitSlider.value = String(claudeSettingsState.backgroundCommandLimitMinutes);
+  }
+  renderClaudeBackgroundCommandLimitLabel(limitSlider?.value || claudeSettingsState.backgroundCommandLimitMinutes);
   if (modelInput && (!claudeSettingsInputsDirty || resetInputs)) modelInput.value = claudeSettingsState.model;
   if (resetInputs) claudeSettingsInputsDirty = false;
   if (toggle) {
@@ -561,6 +651,19 @@ function renderClaudeAttributionExample(mode) {
   example.textContent = claudeAttributionExampleText(mode, claudeSettingsState.attributionExample);
 }
 
+function renderClaudeBackgroundCommandLimitLabel(minutes) {
+  const label = document.getElementById('claude-background-command-limit-value');
+  if (label) label.textContent = formatClaudeBackgroundCommandLimitLabel(minutes);
+}
+
+/** Live label feedback while dragging; saved with the other Claude settings. */
+export function previewClaudeBackgroundCommandLimit(value) {
+  claudeSettingsInputsDirty = true;
+  renderClaudeBackgroundCommandLimitLabel(value);
+}
+
+window.previewClaudeBackgroundCommandLimit = previewClaudeBackgroundCommandLimit;
+
 window.previewClaudeAttribution = (mode) => {
   claudeSettingsInputsDirty = true;
   renderClaudeAttributionExample(mode);
@@ -572,10 +675,12 @@ export async function saveClaudeSettings() {
   const model = String(modelInput?.value || '').trim() || 'claude-sonnet-5';
   const attributionSelect = document.getElementById('claude-attribution-select');
   const attributionMode = ['oar', 'vanilla', 'off'].includes(attributionSelect?.value) ? attributionSelect.value : undefined;
+  const limitSlider = document.getElementById('claude-background-command-limit-slider');
+  const backgroundCommandLimitMinutes = Number(limitSlider?.value) > 0 ? Number(limitSlider.value) : undefined;
   claudeSettingsUpdateInFlight = true;
   setClaudeSettingsControlsDisabled(true);
   try {
-    const result = await updateClaudeSettings({ model, attributionMode });
+    const result = await updateClaudeSettings({ model, attributionMode, backgroundCommandLimitMinutes });
     if (!result) throw new Error('Failed to save Claude settings.');
     applyClaudeSettingsState(result, { resetInputs: true });
     showTransientRelayNotice(
@@ -1757,6 +1862,7 @@ export function openSettingsModal(tab, providerTab) {
   }
   syncSuspendHostVisibility();
   syncScrollOnSendToggle();
+  syncWindowRetentionSlider();
   syncFontScaleSelect();
   syncPwaAppNameInput();
   syncDefaultSessionWorkspaceRootInput();
@@ -1789,6 +1895,8 @@ export function openSettingsModal(tab, providerTab) {
   void refreshTurnCeilingSetting();
   syncBackgroundTaskTimeoutSlider();
   void refreshBackgroundTaskTimeoutSetting();
+  syncTaskStallMinutesSlider();
+  void refreshTaskStallMinutesSetting();
   syncSubagentRecordRetentionSelect();
   void refreshSubagentRecordRetentionSetting();
   void refreshPushSettingsSection();

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

@@ -30,6 +30,7 @@ import {
   applySessionWorkerSteering,
   refreshSummaryModal,
   summaryModalState,
+  IS_SHARED_VIEW,
 } from './store.js';
 import { scheduleContextUsageRefresh } from './api-client.js';
 import { capLiveActivityEntries } from './activity-replay-state.mjs';
@@ -43,7 +44,8 @@ import {
   updatePendingQuestionBanner,
 } from './ask-user-view.js';
 import { upsertRelayBoard, loadRelayBoards, renderRelayBoards } from './relay-board-view.js';
-import { setConversationBackgroundTasks } from './background-tasks-view.mjs';
+import { setConversationBackgroundTasks, setConversationTaskHealth } from './background-tasks-view.mjs';
+import { handleTaskConsoleReconnect, handleTaskOutputChunk } from './task-console.mjs';
 import { setConversationPins } from './pinned-messages-view.mjs';
 import { setConversationHiddenMessages } from './hidden-messages-view.mjs';
 import { setPreviews } from './preview-cards.mjs';
@@ -83,6 +85,8 @@ import {
   noteTranscriptLiveRow,
   applyIncomingConversationDraftUpdate,
   getRenderedConversationMessageFingerprints,
+  holdBackLiveRow,
+  isConversationWindowAtTail,
   clearBubbleCancelState,
   removeUserBubbleCancelButton,
   updateSubagentBubbleFromStatus,
@@ -96,6 +100,17 @@ 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 { conversationPayloadCache } from './conversation-payload-cache.mjs';
+
+// A live row of the conversation on screen joins its kept window, so a
+// switch away and back still shows it. Rows of other conversations do not:
+// their kept copy is what the reader saw, and the switch back fetches the rest.
+function keepLiveRow(conversationId, message, messageId) {
+  if (IS_SHARED_VIEW || !message || typeof message !== 'object') return;
+  const id = String(message.id || messageId || '').trim();
+  if (!id) return;
+  conversationPayloadCache.upsertMessage(conversationId, message.id ? message : { ...message, id });
+}
 import {
   handleSubagentStatusEventForViewer,
   handleSubagentTimelineEvent,
@@ -335,6 +350,9 @@ export async function connectSocket(overrideDeps) {
     // session, whose restored socket.data the server deliberately resets.
     emitDeviceVisibility(document.visibilityState === 'visible');
     clearMessageSearchRuntimeState();
+    // Events missed while the socket was down may have changed any of the
+    // conversations kept for a quick switch back.
+    conversationPayloadCache.clear();
     setRelayOnline(true);
     setCliOnline(true);
     renderConvList();
@@ -346,6 +364,8 @@ export async function connectSocket(overrideDeps) {
     refreshModelCatalog().catch(() => {});
     // An open sub-agent viewer fetches whatever it missed while away.
     handleSubagentViewerReconnect();
+    // An open task console watches again and reads what it missed.
+    void handleTaskConsoleReconnect();
     // Subscriptions that changed while away.
     void loadRelayEventSubscriptions();
     // Shares made or stopped while away.
@@ -519,11 +539,15 @@ export async function connectSocket(overrideDeps) {
       })) {
         return;
       }
+      // A window that ends above the conversation's end takes no live row:
+      // the newer pages bring it, and the jump-to-bottom badge counts it.
+      if (holdBackLiveRow(conversationId, messageId || normalizedMessage.id)) return;
       // 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();
+      keepLiveRow(conversationId, normalizedMessage, messageId);
     }
   });
   socket.on('assistant_message', ({ conversationId, message, messageId, sourceMessageId }) => {
@@ -554,12 +578,15 @@ export async function connectSocket(overrideDeps) {
       restoreLiveReplyReadingPosition(reading);
       return;
     }
-    if (isCurrentConversation) {
+    // Held back under a window that ends above the conversation's end, as
+    // in user_message.
+    if (isCurrentConversation && !holdBackLiveRow(conversationId, messageId || message?.id)) {
       appendMessage(message, autoScroll, messageId || null, false, sourceMessageId || null);
       restoreLiveReplyReadingPosition(reading);
       noteTranscriptLiveRow();
-      scheduleContextUsageRefresh(conversationId, 120);
+      keepLiveRow(conversationId, message, messageId);
     }
+    if (isCurrentConversation) scheduleContextUsageRefresh(conversationId, 120);
     if (sourceMessageId) relayActivities.delete(sourceMessageId);
     if (sourceMessageId) relayThoughts.delete(sourceMessageId);
     if (sourceMessageId) clearRelayStreamStateForMessage(sourceMessageId);
@@ -574,11 +601,22 @@ export async function connectSocket(overrideDeps) {
   // cannot be started): same id, new text or kind. Not on the page yet (the
   // conversation was opened after it was written): appended like any other.
   socket.on('message_updated', ({ conversationId, messageId, message }) => {
-    if (!messageId || conversationId !== currentConvId || !message) return;
+    // A row rewritten in place. Another conversation's kept window would show
+    // the old one: it is dropped. The window on screen takes the new row as
+    // the page does, so a switch away and back keeps both the row and the
+    // window around it.
+    if (!messageId || conversationId !== currentConvId || !message) {
+      conversationPayloadCache.forget(conversationId);
+      return;
+    }
     if (!replaceRenderedMessage(message, messageId)) {
+      // A row outside a window that ends above the conversation's end: the
+      // newer pages bring it as it is now.
+      if (!isConversationWindowAtTail()) return;
       appendMessage(message, followsTranscriptEnd(), messageId, false);
     }
     noteTranscriptLiveRow();
+    keepLiveRow(conversationId, message, messageId);
   });
   socket.on('relay_question', ({ question }) => upsertRelayQuestion(question));
   socket.on('relay_question_updated', ({ question }) => upsertRelayQuestion(question));
@@ -594,8 +632,8 @@ export async function connectSocket(overrideDeps) {
   socket.on('relay_event_subscriptions', ({ subscriptions }) => {
     applyRelayEventSubscriptions(subscriptions);
   });
-  socket.on('background_tasks', ({ conversationId, tasks }) => {
-    setConversationBackgroundTasks(conversationId, tasks);
+  socket.on('background_tasks', ({ conversationId, tasks, endedTasks }) => {
+    setConversationBackgroundTasks(conversationId, tasks, { endedTasks });
     // 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();
@@ -604,6 +642,16 @@ export async function connectSocket(overrideDeps) {
       || null;
     if (record && applyBackgroundTasksToConversation(record, tasks)) renderConvList();
   });
+  // The relay's health poller: last output time and test-runner counts of
+  // shell and Monitor tasks, only when they changed.
+  socket.on('background_tasks_health', ({ conversationId, health }) => {
+    setConversationTaskHealth(conversationId, health);
+  });
+  // New bytes of the task the console shows; the relay sends them only while
+  // this page's console watches that task.
+  socket.on('task_output_chunk', (payload) => {
+    handleTaskOutputChunk(payload);
+  });
   // 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 }) => {
@@ -738,6 +786,8 @@ export async function connectSocket(overrideDeps) {
   });
   socket.on('conversation_compacted', async ({ sourceConversationId, targetConversationId }) => {
     if (!sourceConversationId || !targetConversationId) return;
+    conversationPayloadCache.forget(sourceConversationId);
+    conversationPayloadCache.forget(targetConversationId);
     await refreshConversations();
     if (currentConvId === sourceConversationId) {
       await openConversation(targetConversationId);
@@ -827,7 +877,7 @@ 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
+      // The row's turn fields follow the event, open or not: the title colour, a
       // group head's pill and its fold read them between list fetches.
       applyTurnStatusToConversation(conversation, normalizedStatus);
       if (normalizedStatus === 'processing') {
@@ -892,6 +942,7 @@ export async function connectSocket(overrideDeps) {
     if (!id) return;
     const conversation = conversations[id];
     if (conversation) conversation.archived = archived !== false;
+    conversationPayloadCache.forget(id);
     renderConvList();
     if (currentConvId === id) {
       syncChatTitleControls();
@@ -900,6 +951,7 @@ export async function connectSocket(overrideDeps) {
   });
   socket.on('conversation_deleted', ({ conversationId }) => {
     delete conversations[conversationId];
+    conversationPayloadCache.forget(conversationId);
     for (const [id, question] of relayQuestions.entries()) {
       if (question?.conversationId === conversationId) relayQuestions.delete(id);
     }

package/server/public/app/store.js

@@ -1,4 +1,5 @@
 import { resolveNearBottomThresholdPx } from './transcript-viewport-anchor.mjs';
+import { normalizeReadingAnchor } from './transcript-reading-anchor.mjs';
 import { recordCliLifecycleEvent, recordRelayLifecycleEvent } from './status-store.mjs';
 import { resolveRelayDotState } from './relay-dot-state.mjs';
 import { readRepoBrowserPreferences } from './repo-browser-preferences.mjs';
@@ -313,6 +314,7 @@ function readConversationViewState(conversationId) {
         loadedMessageCount: Number.isFinite(Number(parsed.loadedMessageCount)) && Number(parsed.loadedMessageCount) >= 0
           ? Math.trunc(Number(parsed.loadedMessageCount))
           : null,
+        anchor: normalizeReadingAnchor(parsed.anchor),
       };
     }
   } catch {
@@ -323,6 +325,7 @@ function readConversationViewState(conversationId) {
   return {
     scrollTop: Math.trunc(legacyScrollTop),
     loadedMessageCount: null,
+    anchor: null,
   };
 }
 
@@ -337,6 +340,7 @@ function writeConversationViewState(conversationId, nextState = {}) {
     loadedMessageCount: Number.isFinite(Number(nextState.loadedMessageCount)) && Number(nextState.loadedMessageCount) >= 0
       ? Math.trunc(Number(nextState.loadedMessageCount))
       : current.loadedMessageCount ?? null,
+    anchor: 'anchor' in nextState ? normalizeReadingAnchor(nextState.anchor) : (current.anchor ?? null),
   };
   localStorage.setItem(key, JSON.stringify(next));
   return true;
@@ -373,6 +377,27 @@ export function loadConversationLoadedMessageCount(conversationId) {
   return readConversationViewState(conversationId)?.loadedMessageCount ?? null;
 }
 
+// The message read and its offset, or "at the end" (transcript-reading-anchor.mjs):
+// what a switch back and a reload restore. scrollTop is still written for
+// older pages of this app reading the same storage.
+export function saveConversationReadingAnchor(conversationId, anchor) {
+  const value = normalizeReadingAnchor(anchor);
+  if (!value) return false;
+  try {
+    return writeConversationViewState(conversationId, { anchor: value });
+  } catch {
+    return false;
+  }
+}
+
+export function loadConversationReadingAnchor(conversationId) {
+  try {
+    return readConversationViewState(conversationId)?.anchor ?? null;
+  } catch {
+    return null;
+  }
+}
+
 function normalizePendingMessageText(text) {
   return String(text || '').replace(/\s+/g, ' ').trim().toLowerCase();
 }

package/server/public/app/subagent-viewer.mjs

@@ -21,7 +21,7 @@ import { createViewerHistory } from './viewer-history.mjs';
 import { getSocket } from './socket-handlers.js';
 import { createSubagentViewerWatch } from './subagent-viewer-watch.mjs';
 import { formatTaskModelLabel, formatTaskTokens } from './task-row-format.mjs';
-import { getConversationBackgroundTasks } from './background-tasks-view.mjs';
+import { getConversationBackgroundTasks, setSubagentStepCounter } from './background-tasks-view.mjs';
 import { formatRunDuration, isRunningSubagentStatus, subagentRowHtml, subagentStatusLabel } from './subagent-row.mjs';
 import {
   createTimelineState,
@@ -488,6 +488,12 @@ export function syncSubagentRowClock() {
 export function initSubagentViewer() {
   if (initialized) return;
   initialized = true;
+  // A sub-agent row without the worker's `steps` counts the run's activity
+  // lines, the number its reply bubble shows.
+  setSubagentStepCounter((runId) => {
+    const activities = getSubagentRun(runId)?.activities;
+    return Array.isArray(activities) ? activities.length : null;
+  });
   viewerHistory = createViewerHistory({
     history: window.history,
     mark: 'oarSubagentViewer',