@oar-sh/oar 0.9.15 → 0.9.17

package/server/public/app/relay-schedules-ui.js

@@ -0,0 +1,172 @@
+// Relay schedules on the page: the header's "N scheduled" chip with its list
+// and Cancel buttons (on a conversation a schedule fires into or that set
+// one), and the "scheduled" marker on the sidebar row of a conversation a
+// schedule fires into. The relay sends the whole active list on every change
+// (socket `relay_schedules`); the page loads it once at start.
+
+import { apiFetch } from './api-client.js';
+import { conversations, currentConvId, escHtml, IS_SHARED_VIEW, showTransientRelayNotice } from './store.js';
+import {
+  nextScheduledAt,
+  renderScheduledBadgeHtml,
+  renderSchedulePanelHtml,
+  scheduleChipText,
+  schedulesOf,
+} from './relay-schedule-view.mjs';
+
+let schedules = [];
+let renderedChipKey = '';
+let panelOpen = false;
+let panelConversationId = '';
+const changeListeners = new Set();
+
+/** Runs after every change of the list (the sidebar re-renders its markers). */
+export function onRelaySchedulesChanged(listener) {
+  changeListeners.add(listener);
+  return () => changeListeners.delete(listener);
+}
+
+export function applyRelaySchedules(list) {
+  schedules = Array.isArray(list) ? list.filter((schedule) => schedule && typeof schedule === 'object') : [];
+  syncRelayScheduleHeader();
+  for (const listener of changeListeners) {
+    try { listener(schedules); } catch {}
+  }
+}
+
+export async function loadRelaySchedules() {
+  if (IS_SHARED_VIEW) return;
+  const response = await apiFetch('/api/relay-schedules');
+  if (response && Array.isArray(response.schedules)) applyRelaySchedules(response.schedules);
+}
+
+/** The sidebar's marker for one conversation. */
+export function relayScheduleMarkerHtml(conversationId) {
+  if (IS_SHARED_VIEW) return '';
+  return renderScheduledBadgeHtml(schedules, conversationId, { escHtml });
+}
+
+async function cancelSchedule(scheduleId, button) {
+  if (!scheduleId) return;
+  if (button) button.disabled = true;
+  const response = await apiFetch(`/api/relay-schedules/${encodeURIComponent(scheduleId)}`, { method: 'DELETE' });
+  if (!response?.ok) {
+    if (button) button.disabled = false;
+    showTransientRelayNotice?.('The schedule could not be cancelled. Try again in a moment.');
+    return;
+  }
+  // The socket brings the new list; this page does not wait for it.
+  applyRelaySchedules(schedules.filter((schedule) => schedule.id !== scheduleId));
+}
+
+// A fixed popover on <body>, placed under the chip, like the subscriptions'
+// list: the title slot clips its overflow.
+function ensurePanel() {
+  let panel = document.getElementById('relay-schedule-panel');
+  if (panel) return panel;
+  panel = document.createElement('div');
+  panel.id = 'relay-schedule-panel';
+  panel.className = 'relay-watch-panel';
+  panel.hidden = true;
+  document.body.appendChild(panel);
+  panel.addEventListener('click', (event) => {
+    const target = event.target instanceof Element ? event.target : null;
+    const cancelButton = target?.closest?.('.relay-schedule-cancel');
+    if (!cancelButton) return;
+    void cancelSchedule(cancelButton.getAttribute('data-schedule-id'), cancelButton);
+  });
+  document.addEventListener('click', (event) => {
+    if (!panelOpen) return;
+    // composedPath: a Cancel click may have re-rendered the panel already.
+    const path = event.composedPath();
+    if (path.includes(panel) || path.some((node) => node instanceof Element && node.classList.contains('relay-schedule-chip'))) return;
+    setPanelOpen(false);
+  });
+  document.addEventListener('keydown', (event) => {
+    if (!panelOpen || event.key !== 'Escape') return;
+    event.stopPropagation();
+    setPanelOpen(false);
+    document.querySelector('#chat-title-relay-schedules .relay-schedule-chip')?.focus?.();
+  }, true);
+  window.addEventListener('resize', () => { if (panelOpen) placePanel(); });
+  return panel;
+}
+
+function setPanelOpen(open) {
+  panelOpen = Boolean(open);
+  renderedChipKey = '';
+  syncRelayScheduleHeader();
+}
+
+function placePanel() {
+  const panel = document.getElementById('relay-schedule-panel');
+  const chip = document.querySelector('#chat-title-relay-schedules .relay-schedule-chip');
+  if (!panel || panel.hidden) return;
+  const rect = chip?.getBoundingClientRect?.();
+  if (!rect || (!rect.width && !rect.height)) {
+    panel.hidden = true;
+    return;
+  }
+  const margin = 8;
+  const viewportWidth = document.documentElement.clientWidth || window.innerWidth;
+  const top = Math.round(rect.bottom + 4);
+  panel.style.top = `${top}px`;
+  panel.style.maxHeight = `${Math.max(120, window.innerHeight - top - margin)}px`;
+  panel.style.left = '0px';
+  const width = panel.offsetWidth;
+  const left = Math.max(margin, Math.min(rect.left, viewportWidth - width - margin));
+  panel.style.left = `${Math.round(left)}px`;
+}
+
+function ensureHeaderElements() {
+  const slot = document.getElementById('chat-title-slot');
+  if (!slot) return null;
+  let line = document.getElementById('chat-title-relay-schedules');
+  if (!line) {
+    line = document.createElement('span');
+    line.id = 'chat-title-relay-schedules';
+    line.hidden = true;
+    const after = document.getElementById('chat-title-relay-events') || document.getElementById('chat-title-origin');
+    if (after?.nextSibling) slot.insertBefore(line, after.nextSibling);
+    else slot.appendChild(line);
+    line.addEventListener('click', (event) => {
+      const target = event.target instanceof Element ? event.target : null;
+      if (target?.closest?.('.relay-schedule-chip')) {
+        event.stopPropagation();
+        setPanelOpen(!panelOpen);
+      }
+    });
+  }
+  return line;
+}
+
+/** The header's chip for the conversation on screen. Idempotent. */
+export function syncRelayScheduleHeader() {
+  const line = ensureHeaderElements();
+  if (!line) return;
+  const panel = ensurePanel();
+  const id = String(currentConvId || '').trim();
+  // Another conversation on screen closes the list.
+  if (id !== panelConversationId) panelOpen = false;
+  panelConversationId = id;
+  const mine = IS_SHARED_VIEW || !id ? [] : schedulesOf(schedules, id);
+  const chipText = scheduleChipText(mine);
+  if (!chipText) panelOpen = false;
+  const key = JSON.stringify([id, chipText, panelOpen, mine.map((schedule) => [schedule.id, schedule.nextFireAt, schedule.skippedCount || 0])]);
+  if (key === renderedChipKey) return;
+  renderedChipKey = key;
+  if (!chipText) {
+    line.hidden = true;
+    line.innerHTML = '';
+    panel.hidden = true;
+    panel.innerHTML = '';
+    return;
+  }
+  const next = nextScheduledAt(mine);
+  const nextText = next ? new Date(next).toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' }) : '';
+  line.innerHTML = `<button type="button" class="relay-watch-chip relay-schedule-chip" aria-expanded="${panelOpen ? 'true' : 'false'}" aria-controls="relay-schedule-panel" title="Prompts the relay queues at set times (agents set them with remote_relay schedule)">⏰ ${escHtml(chipText)}${nextText ? ` <span class="relay-watch-hint">next ${escHtml(nextText)}</span>` : ''}</button>`;
+  line.hidden = false;
+  panel.innerHTML = panelOpen ? renderSchedulePanelHtml(schedules, id, { conversations, escHtml }) : '';
+  panel.hidden = !panelOpen;
+  if (panelOpen) placePanel();
+}

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

@@ -55,6 +55,16 @@ import { refreshPushSettingsSection } from './push-settings.js';
 import { selectSettingsTab } from './settings-tabs.js';
 import { refreshClaudeAuthSection } from './claude-auth-ui.js';
 import { refreshGrokAuthSection } from './grok-auth-ui.js';
+import { syncDeepSeekSettingsInputs } from './deepseek-settings-ui.js';
+
+export {
+  applyDeepSeekSettingsState,
+  importDeepSeekUsageExport,
+  refreshDeepSeekSettingsState,
+  removeDeepSeekSettings,
+  saveDeepSeekSettings,
+  toggleDeepSeekProvider,
+} from './deepseek-settings-ui.js';
 import { openClaudeCloudSettingsSection } from './claude-cloud-settings-ui.js';
 import { refreshCliInstallSections } from './cli-install-ui.js';
 import { refreshUpdateSection } from './update-ui.js';
@@ -1949,6 +1959,7 @@ export function openSettingsModal(tab, providerTab) {
   cursorSettingsInputsDirty = false;
   ensureCursorSettingsInputTracking();
   void syncCursorSettingsInputs();
+  void syncDeepSeekSettingsInputs();
   void refreshCursorAllowanceState();
   void refreshCursorDashboardTokenState();
   void refreshGrokAllowanceState();

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

@@ -4,7 +4,7 @@ const SETTINGS_PROVIDER_TAB_STORAGE_KEY = 'copilot_settings_provider_tab';
 const SETTINGS_TABS = ['general', 'providers', 'relays', 'previews', 'shares', 'notifications', 'features'];
 // Copilot leads: it is the default provider, and `SETTINGS_PROVIDER_TABS[0]`
 // is also the sub-tab a first-time visitor lands on.
-const SETTINGS_PROVIDER_TABS = ['copilot', 'openai', 'claude', 'claude-cloud', 'grok', 'cursor'];
+const SETTINGS_PROVIDER_TABS = ['copilot', 'openai', 'claude', 'claude-cloud', 'grok', 'cursor', 'deepseek'];
 
 let settingsTabsBound = false;
 

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

@@ -38,6 +38,9 @@ import { publishStatusEvent, recordStatusEvent } from './status-store.mjs';
 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 { applyRelaySchedules, loadRelaySchedules } from './relay-schedules-ui.js';
+import { noteInboxQuestionsChanged, noteRelayAskUpdated, refreshInbox } from './inbox-ui.js';
+import { RELAY_ASK_SOCKET_EVENT } from './inbox-view.mjs';
 import {
   upsertRelayQuestion,
   loadRelayQuestions,
@@ -150,6 +153,7 @@ let deps = null;
  * @property {(payload?: object) => void} applyOpenAISettingsState
  * @property {(payload?: object) => void} applyClaudeSettingsState
  * @property {(payload?: object) => void} applyGrokSettingsState
+ * @property {(payload?: object) => void} applyDeepSeekSettingsState
  * @property {(payload?: object) => void} applyCursorSettingsState
  */
 
@@ -368,6 +372,10 @@ export async function connectSocket(overrideDeps) {
     void handleTaskConsoleReconnect();
     // Subscriptions that changed while away.
     void loadRelayEventSubscriptions();
+    // Schedules that changed or fired while away.
+    void loadRelaySchedules();
+    // Questions asked or answered while away.
+    void refreshInbox();
     // Shares made or stopped while away.
     void refreshShares().catch(() => {});
   });
@@ -490,6 +498,15 @@ export async function connectSocket(overrideDeps) {
         .catch(() => {});
     }
   });
+  socket.on('deepseek_settings_updated', (payload) => {
+    const state = deps?.applyDeepSeekSettingsState?.(payload || {});
+    updateProviderReadinessInputs({ deepseek: state || payload || null });
+    if (Number(payload?.reconciliation?.updatedUnstartedConversations || 0) > 0) {
+      void Promise.resolve()
+        .then(() => deps?.refreshCurrentView?.())
+        .catch(() => {});
+    }
+  });
   socket.on('cursor_settings_updated', (payload) => {
     const state = deps?.applyCursorSettingsState?.(payload || {});
     updateProviderReadinessInputs({ cursor: state || payload || null });
@@ -618,11 +635,20 @@ export async function connectSocket(overrideDeps) {
     noteTranscriptLiveRow();
     keepLiveRow(conversationId, message, messageId);
   });
-  socket.on('relay_question', ({ question }) => upsertRelayQuestion(question));
-  socket.on('relay_question_updated', ({ question }) => upsertRelayQuestion(question));
+  socket.on('relay_question', ({ question }) => {
+    upsertRelayQuestion(question);
+    noteInboxQuestionsChanged();
+  });
+  socket.on('relay_question_updated', ({ question }) => {
+    upsertRelayQuestion(question);
+    noteInboxQuestionsChanged();
+  });
   socket.on('relay_question_changed', () => {
     loadRelayQuestions(currentConvId);
+    noteInboxQuestionsChanged();
   });
+  // Questions that don't block: one ask, after every change of it.
+  socket.on(RELAY_ASK_SOCKET_EVENT, (payload) => noteRelayAskUpdated(payload));
   socket.on('relay_board', ({ board }) => upsertRelayBoard(board));
   socket.on('relay_board_updated', ({ board }) => upsertRelayBoard(board));
   socket.on('relay_board_changed', () => {
@@ -632,6 +658,10 @@ export async function connectSocket(overrideDeps) {
   socket.on('relay_event_subscriptions', ({ subscriptions }) => {
     applyRelayEventSubscriptions(subscriptions);
   });
+  // Relay schedules: the whole active list, after every change.
+  socket.on('relay_schedules', ({ schedules }) => {
+    applyRelaySchedules(schedules);
+  });
   socket.on('background_tasks', ({ conversationId, tasks, endedTasks }) => {
     setConversationBackgroundTasks(conversationId, tasks, { endedTasks, event: true });
     // The sidebar's row (and its group's head) count background work as
@@ -799,7 +829,7 @@ export async function connectSocket(overrideDeps) {
     applyConversationTitleUpdate(conversationId, title, updatedAt);
     syncChatTitleControls();
   });
-  socket.on('conversation_preferences_updated', ({ conversationId, preferredRelayMode, preferredModel, preferredReasoningEffort, autoCompactWindow, thinkingEnabled, thinkingDisplay, senderClientId }) => {
+  socket.on('conversation_preferences_updated', ({ conversationId, preferredRelayMode, preferredModel, preferredReasoningEffort, autoCompactWindow, thinkingEnabled, thinkingDisplay, mayCreateSessions, senderClientId }) => {
     if (senderClientId && senderClientId === CLIENT_ID) return;
     const id = String(conversationId || '').trim();
     if (!id || !conversations[id]) return;
@@ -821,6 +851,10 @@ export async function connectSocket(overrideDeps) {
       thinkingDisplay: thinkingDisplay === undefined
         ? (conversations[id].thinkingDisplay ?? null)
         : (thinkingDisplay ?? null),
+      // The owner's "agents may start sessions"; an older relay omits it.
+      mayCreateSessions: typeof mayCreateSessions === 'boolean'
+        ? mayCreateSessions
+        : conversations[id].mayCreateSessions === true,
     };
     if (String(currentConvId || '').trim() === id) {
       applyConversationPreferencesForConversation(id, {

package/server/public/app/store.js

@@ -222,6 +222,16 @@ export function setCurrentConv(id) {
   updateCompactButton();
 }
 
+/**
+ * Forgets the kept empty groups before the list's first page names the ones
+ * still kept (one the owner dissolved meanwhile is not named again).
+ */
+export function forgetKeptEmptyConversationGroups() {
+  for (const [id, group] of Object.entries(conversationGroups)) {
+    if (group?.keptEmptyAt) delete conversationGroups[id];
+  }
+}
+
 /** Merges a list payload's `groups` (by id) into the known session groups. */
 export function mergeConversationGroups(groups) {
   if (!groups || typeof groups !== 'object') return;
@@ -240,13 +250,15 @@ export function forgetConversationGroup(groupId) {
 /**
  * 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.
+ * it. An owner's group an agent emptied (`keptEmptyAt`) has no row and
+ * stays: the list's first page names it while it is kept. 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;
+    if (keep.has(id) || conversationGroups[id]?.keptEmptyAt) continue;
     delete conversationGroups[id];
     dropped.push(id);
   }
@@ -1126,9 +1138,10 @@ function measureSidebarHeaderMinWidthPx() {
     sectionCount += 1;
   }
 
-  const statusButton = document.getElementById('status-btn');
-  if (isVisibleElement(statusButton)) {
-    const buttonStyle = window.getComputedStyle(statusButton);
+  for (const id of ['status-btn', 'inbox-btn']) {
+    const headerButton = document.getElementById(id);
+    if (!isVisibleElement(headerButton)) continue;
+    const buttonStyle = window.getComputedStyle(headerButton);
     neededWidth += Math.ceil(parseCssPx(buttonStyle.minWidth));
     sectionCount += 1;
   }