@oar-sh/oar 0.9.6 → 0.9.8

package/server/public/app/conversation-view.js

@@ -49,7 +49,7 @@ import {
   closeSummaryModal,
 } from './store.js';
 import { getPendingQuestionCountsByConversation } from './ask-user-view.js';
-import { sendMessage as sendMessageApi, cancelConversationTurn, cancelQueuedConversationTurn, cancelSubagentRun, compactConversation as compactConversationApi, scheduleContextUsageRefresh, loadConversation as loadConversationApi, loadSharedConversation, updateConversationDraft as updateConversationDraftApi, updateMessageShareVisibility } from './api-client.js';
+import { sendMessage as sendMessageApi, cancelConversationTurn, cancelQueuedConversationTurn, cancelSubagentRun, compactConversation as compactConversationApi, scheduleContextUsageRefresh, loadConversation as loadConversationApi, loadSharedConversation, updateConversationDraft as updateConversationDraftApi, updateMessageShareVisibility, launchSessionWorker } from './api-client.js';
 import { enqueueOutboxRequest, registerOutboxSync } from './sync-outbox.mjs';
 import { linkifyWorkspaceMentionsInNode, parseAppFileHref, renderMarkdownPreview, rewriteLocalAssetUrlsInNode } from './router.js';
 import { renderAttachmentMarkup, removeComposerAttachments, uploadAttachments, setComposerAttachments, setRepoBrowserSessionInfo, openDriveFilePreview, openWorkspaceFilePreview, openUploadedAttachmentViewer } from './attachments-view.js';
@@ -88,8 +88,14 @@ import {
   normalizeRelayActivityEntry,
   promotedCompactBoundaryEntry,
   relayActivityEntryText,
+  visibleActivityEntries,
 } from './activity-replay-state.mjs';
-import { SEPARATOR_CLASS, syncSeparatorRail, syncTranscriptSeparators } from './transcript-separators.mjs';
+import {
+  COMPACT_PENDING_STAMP,
+  SEPARATOR_CLASS,
+  syncSeparatorRail,
+  syncTranscriptSeparators,
+} from './transcript-separators.mjs';
 import { ABSORBED_MSG_CLASS, STEER_MARKER_CLASS_BY_KIND, syncSteeredTurnMerge } from './steered-turn-merge.mjs';
 import { resolveSubagentFold, subagentFoldSummary, toggledSubagentFoldChoice } from './subagent-fold.mjs';
 import { deriveComposerControlState, hasComposerDraft, hasUploadingAttachments } from './composer-control-state.mjs';
@@ -546,6 +552,7 @@ function syncSendButtonState() {
     steeringSupported: conversationSupportsSteering(currentConvId),
     steeringHeld: steeringHold.held,
     steeringHoldReason: steeringHold.reason,
+    archived: conversations[String(currentConvId || '').trim()]?.archived === true,
   });
   btn.disabled = state.disabled;
   btn.dataset.action = state.action;
@@ -1283,6 +1290,15 @@ function createMessageNode(msg, msgId = null, force = false) {
   const steerMarkerClass = msg.role === 'assistant' ? STEER_MARKER_CLASS_BY_KIND[messageKind] : null;
   if (steerMarkerClass) div.classList.add(steerMarkerClass);
   const isStoppedSteer = msg.role === 'assistant' && messageKind === 'stopped';
+  // The relay's note while this session's worker cannot be started
+  // (worker-launch-note-service.mjs), rewritten in place as the episode goes
+  // on. Once the relay has stopped trying, the note carries Retry: a launch
+  // for once the cause is fixed.
+  const isWorkerLaunchNote = msg.role === 'assistant' && messageKind.startsWith('worker-launch-');
+  if (isWorkerLaunchNote) div.classList.add('msg-worker-launch', `msg-${messageKind}`);
+  const workerLaunchActionsHtml = (!IS_SHARED_VIEW && msgId && messageKind === 'worker-launch-stopped')
+    ? `<div class="msg-bubble-actions"><button type="button" class="bubble-action-btn" data-action="retry-worker-launch" data-message-id="${escHtml(msgId)}" title="Start the worker for this conversation again now">Retry</button></div>`
+    : '';
   // A turn answered by a different provider than the conversation is bound to
   // (e.g. the Copilot relay answering a Cursor conversation) must be visible,
   // not silent: it ran on another plan than the header indicates.
@@ -1328,12 +1344,14 @@ function createMessageNode(msg, msgId = null, force = false) {
   // break row immediately above this message (syncTranscriptSeparators reads
   // the stamp), so it must not also show up inside the bubble's activity list.
   // Only the promoted (last) boundary is hidden — see renderActivityMarkup.
+  // A rendered row is a finished message, so a compaction start without an
+  // end draws no line here (the live bubble owns the running one).
   const promotedBoundaryEntry = promotedCompactBoundaryEntry(activities);
   const compactBoundary = compactBoundaryFromActivities(activities);
   if (compactBoundary) {
     div.dataset.compactBoundary = `${compactBoundary.preTokens ?? ''}|${compactBoundary.postTokens ?? ''}`;
   }
-  if (activities.some((item) => item !== promotedBoundaryEntry)) div.classList.add('msg-with-activity');
+  if (visibleActivityEntries(activities, promotedBoundaryEntry).length) div.classList.add('msg-with-activity');
   const thoughts = Array.isArray(msg.thoughts) ? msg.thoughts.filter((t) => t && String(t.text || '').trim()) : [];
   const attachmentHtml = attachments.length ? renderAttachmentMarkup(attachments, { messageId: msgId }) : '';
   const subagentRuns = Array.isArray(msg.subagentRuns) ? msg.subagentRuns.filter(Boolean) : [];
@@ -1404,13 +1422,14 @@ function createMessageNode(msg, msgId = null, force = false) {
     ? `<div class="msg-bubble-actions"><button type="button" class="bubble-action-btn" data-action="resend-stopped-steer" data-message-id="${escHtml(msgId)}" title="Send this message again as a new turn"${resendState ? ' disabled' : ''}>${resendLabel}</button></div>`
     : '';
 
-  // Shared viewers get the badge without the link to the other relay.
+  // Shared viewers get the badge without the link to the other relay (or, for
+  // an agent on this relay, to the conversation it runs in).
   const originBadgeHtml = remoteOrigin
-    ? renderRemoteOriginBadgeHtml(remoteOrigin, { linkable: !IS_SHARED_VIEW })
+    ? renderRemoteOriginBadgeHtml(remoteOrigin, { linkable: !IS_SHARED_VIEW, conversations })
     : '';
 
   div.innerHTML = `
-    <div class="${bubbleClass}">${shareVisibilityActionHtml}${thoughtsHtml}${originBadgeHtml}${content}${relayErrorCtaHtml}${attachmentHtml}${activityHtml}${subagentHtml}${workflowRunsHtml}${previewCardsHtml}${userBubbleActionsHtml}${stoppedSteerActionsHtml}</div>
+    <div class="${bubbleClass}">${shareVisibilityActionHtml}${thoughtsHtml}${originBadgeHtml}${content}${relayErrorCtaHtml}${attachmentHtml}${activityHtml}${subagentHtml}${workflowRunsHtml}${previewCardsHtml}${userBubbleActionsHtml}${stoppedSteerActionsHtml}${workerLaunchActionsHtml}</div>
     <div class="msg-label">${label}${modelTag}${reasoningTag}${modeTag}${autoTag}${continuationTag}${crossProviderTag}${usageTurnTag}${usageRemainingTag}${usageStaleTag} · ${fmtDate(msg.timestamp)}</div>`;
 
   const bubble = div.querySelector('.msg-bubble');
@@ -1468,7 +1487,15 @@ function insertMessageNode(node, insertAfterId = null) {
   const anchorId = String(insertAfterId || '').trim();
   const anchor = anchorId ? el.querySelector(`[data-message-id="${anchorId}"]`) : null;
   if (anchor && anchor.parentNode === el) {
-    const next = anchor.nextSibling;
+    let next = anchor.nextSibling;
+    // The line of a compaction that ran in this turn sits between the user
+    // message and its live bubble; the reply lands under it, so the
+    // separator pass relabels that line instead of replacing it.
+    if (next?.nodeType === 1
+      && next.classList?.contains(SEPARATOR_CLASS)
+      && next.dataset?.separatorKey === `compact:${anchorId}`) {
+      next = next.nextSibling;
+    }
     if (next) el.insertBefore(node, next);
     else el.appendChild(node);
   } else {
@@ -1593,11 +1620,12 @@ export function renderActivityMarkup(activities, promotedBoundaryEntry = undefin
   // ones stay visible here as prose rather than disappearing from the
   // transcript altogether (one break row per message is all the separator
   // planner can place).
+  // A compaction's start and cancel steps are never prose either.
   const list = Array.isArray(activities) ? activities : [];
   const promoted = promotedBoundaryEntry === undefined
     ? promotedCompactBoundaryEntry(list)
     : promotedBoundaryEntry;
-  const visible = list.filter((item) => item !== promoted);
+  const visible = visibleActivityEntries(list, promoted);
   const progress = visible.filter((item) => relayActivityEntryText(item).startsWith('● '));
   const tools = visible.filter((item) => !relayActivityEntryText(item).startsWith('● '));
   const progressHtml = progress.length
@@ -1700,10 +1728,16 @@ function anchorThinkingBubble(div, messageId) {
   const id = String(messageId || '').trim();
   const target = id ? el.querySelector(`[data-message-id="${id}"]`) : null;
   if (target && target.parentNode === el) {
-    if (target.nextSibling === div) return;
+    // The bubble's own compaction line sits between the two.
+    let follower = target.nextSibling;
+    while (follower && follower !== div && follower.classList?.contains('transcript-separator')) {
+      follower = follower.nextSibling;
+    }
+    if (follower === div) return;
     const next = target.nextSibling;
     if (next) el.insertBefore(div, next);
     else el.appendChild(div);
+    if (div.dataset.compactBoundary) syncSeparatorsNow();
   } else if (div.parentNode !== el) {
     el.appendChild(div);
   }
@@ -1760,11 +1794,13 @@ export function showThinking(messageId = null, autoScroll = true) {
         <div class="thinking-thoughts-list"></div>
       </details>
       <div id="thinking-stream" class="thinking-stream" hidden></div>
+      <div class="thinking-compacting-note" hidden>Compacting the conversation…</div>
       <div class="dots"><span></span><span></span><span></span></div>
       <div id="thinking-activity" class="thinking-activity"></div>
       <div class="subagent-bubbles-container" data-subagent-bubbles-root="1"></div>
     </div>`;
   anchorThinkingBubble(div, nextMessageId);
+  syncThinkingCompaction(div);
   renderThinkingThoughts();
   renderThinkingStream();
   // A board the turn has posted already lives in its live bubble.
@@ -1777,8 +1813,33 @@ export function showThinking(messageId = null, autoScroll = true) {
 export function removeThinking() {
   thinkingMessageId = null;
   lastInFlightSnapshotKey = '';
+  const wasCompacting = !!document.getElementById('thinking-indicator')?.dataset?.compactBoundary;
   unobserveThinkingBubble();
   document.getElementById('thinking-indicator')?.remove();
+  // The bubble's compaction line goes with it, but only after the
+  // caller's same-tick work: a reply appended right after this call takes
+  // the line over (relabelled in place) instead of it being dropped first.
+  if (wasCompacting) queueMicrotask(syncSeparatorsNow);
+}
+
+// The live turn's compaction line: the bubble stamps the turn's compaction
+// for the separator pass — "Compacting context…" while the last compaction
+// entry is a start without an end, the final label once the boundary is in —
+// so the line sits above the bubble and the reply takes it over unchanged.
+// The bubble's own note shows only while it runs.
+function syncThinkingCompaction(bubble = document.getElementById('thinking-indicator')) {
+  if (!bubble) return;
+  const items = thinkingMessageId ? (relayActivities.get(thinkingMessageId) || []) : [];
+  const boundary = compactBoundaryFromActivities(items, { processing: true });
+  const note = bubble.querySelector('.thinking-compacting-note');
+  if (note) note.hidden = !boundary?.pending;
+  const stamp = !boundary
+    ? ''
+    : (boundary.pending ? COMPACT_PENDING_STAMP : `${boundary.preTokens ?? ''}|${boundary.postTokens ?? ''}`);
+  if ((bubble.dataset.compactBoundary || '') === stamp) return;
+  if (stamp) bubble.dataset.compactBoundary = stamp;
+  else delete bubble.dataset.compactBoundary;
+  if (bubble.parentNode) syncSeparatorsNow();
 }
 
 // Stop is one tap away on a sticky header, so a stray touch must not kill a
@@ -1812,6 +1873,19 @@ function openStopTurnConfirmation(conversationId, messageId) {
   }, { once: true });
 }
 
+/** The Stop confirmation for a conversation's running turn, from outside the bubble (the sidebar menu). */
+export function openStopTurnConfirmationForConversation(conversationId) {
+  const turn = getActiveTurnForConversation(conversationId);
+  if (!turn?.messageId) return false;
+  openStopTurnConfirmation(conversationId, turn.messageId);
+  return true;
+}
+
+/** Whether a turn of this conversation is running as far as this page knows. */
+export function conversationHasActiveTurn(conversationId) {
+  return !!getActiveTurnForConversation(conversationId);
+}
+
 export function collapseThinkingThoughts() {
   const panel = document.getElementById('thinking-thoughts');
   if (!(panel instanceof HTMLDetailsElement)) return;
@@ -1931,6 +2005,7 @@ export function renderThinkingActivities() {
   if (!selectionIntersectsNode(box)) {
     patchActivityList(box, mainExpected, 'thinking-activity-item');
   }
+  syncThinkingCompaction();
   for (const [subagentRunId, expected] of bySubagentRun) {
     const bubble = ensureSubagentBubble(subagentRunId);
     const runBox = bubble?.querySelector('.subagent-activity');
@@ -2036,8 +2111,12 @@ export function appendThinkingActivity(item, subagentRunId = null, autoScroll =
   );
   if (!entry) return;
   // Same rule as renderThinkingActivities: a boundary becomes a break row on
-  // the persisted message, so it never shows as live prose.
-  if (isCompactBoundaryActivityEntry(entry)) return;
+  // the persisted message, so it never shows as live prose. Every
+  // compaction step does move the live turn's compaction line, though.
+  if (isCompactBoundaryActivityEntry(entry)) {
+    syncThinkingCompaction();
+    return;
+  }
   const decorated = decorateActivityText(entry.text);
 
   if (subagentRunId) {
@@ -2773,6 +2852,55 @@ function releaseStoppedSteerResendsOf(messageId) {
   }
 }
 
+// Retry on the worker-launch note: ask the relay for a launch now. The relay
+// rewrites the note itself — the worker started, or the launches are
+// exhausted again — so the button only has to report a refused request.
+async function retryWorkerLaunch(conversationId, noteId) {
+  const conversationKey = String(conversationId || '').trim();
+  const id = String(noteId || '').trim();
+  if (!conversationKey || !id) return;
+  const btn = document.querySelector(`.bubble-action-btn[data-message-id="${CSS.escape(id)}"][data-action="retry-worker-launch"]`);
+  if (btn?.disabled) return;
+  const sdkSessionId = String(conversations[conversationKey]?.sdkSessionId || '').trim();
+  if (!sdkSessionId) {
+    showTransientRelayNotice('This conversation has no session to start a worker for.');
+    return;
+  }
+  if (btn) {
+    btn.disabled = true;
+    btn.textContent = 'Retrying…';
+  }
+  try {
+    // apiFetch answers null for a refused request (the route says 409 with
+    // the reason) as for a network failure: both re-arm the button.
+    const result = await launchSessionWorker(sdkSessionId);
+    if (!result || result.ok === false) throw new Error(String(result?.error || 'the relay refused the launch'));
+  } catch (error) {
+    showTransientRelayNotice(`The worker could not be started: ${error?.message || error}`);
+    if (btn) {
+      btn.disabled = false;
+      btn.textContent = 'Retry';
+    }
+  }
+}
+
+// A message the relay rewrote in place (the worker-launch note): the bubble is
+// rebuilt where it stands, so the transcript keeps its order. False when the
+// message is not on the page.
+export function replaceRenderedMessage(msg, msgId) {
+  const el = getMessagesElement();
+  const id = String(msgId || '').trim();
+  if (!el || !id) return false;
+  const existing = el.querySelector(`[data-message-id="${CSS.escape(id)}"]`);
+  if (!existing) return false;
+  const placeholder = document.createComment('replacing');
+  existing.replaceWith(placeholder);
+  seenMessageIds.delete(id);
+  const fresh = createMessageNode(msg, id, true);
+  placeholder.replaceWith(fresh || existing);
+  return Boolean(fresh);
+}
+
 async function resendStoppedSteer(conversationId, markerId) {
   const conversationKey = String(conversationId || '').trim();
   const id = String(markerId || '').trim();
@@ -3112,6 +3240,12 @@ function handleBubbleActionClick(event) {
     void resendStoppedSteer(currentConvId, messageId);
   }
 
+  if (action === 'retry-worker-launch' && messageId) {
+    event.preventDefault();
+    event.stopPropagation();
+    void retryWorkerLaunch(currentConvId, messageId);
+  }
+
   if (action === 'stop-subagent' && subagentRunId) {
     event.preventDefault();
     event.stopPropagation();

package/server/public/app/cwd-picker.js

@@ -23,6 +23,7 @@ import {
   buildKnownCwdOptions as buildKnownCwdOptionsFromInputs,
   normalizeKnownCwdPath,
 } from './known-cwd-options.mjs';
+import { buildCloudLineModel, cloudHeaderLabel, isClaudeCloudConversation } from './claude-cloud-ui.mjs';
 
 export { normalizeKnownCwdPath };
 
@@ -462,6 +463,17 @@ export function syncChatHeaderWorkspaceLabel() {
   const labelEl = document.getElementById('chat-title-cwd');
   if (!labelEl) return;
   const convId = String(currentConvId || '').trim();
+  const conversation = convId ? (conversations?.[convId] || null) : null;
+  if (isClaudeCloudConversation(conversation)) {
+    // A cloud chat runs on a clone at Anthropic, so the line names the
+    // repository instead of a folder on the relay host.
+    const label = cloudHeaderLabel(conversation.cloud);
+    labelEl.hidden = !label;
+    labelEl.textContent = label;
+    if (label) labelEl.title = buildCloudLineModel(conversation.cloud)?.repoUrl || label;
+    else labelEl.removeAttribute('title');
+    return;
+  }
   const cwd = getSelectedConversationCurrentCwd();
   if (!convId || !cwd) {
     labelEl.hidden = true;