@oar-sh/oar 0.9.10 → 0.9.12

package/server/public/app/preview-cards.mjs

@@ -6,8 +6,9 @@
 // The same row builder serves both surfaces: the composer's background-task
 // panel (this conversation's previews, beside the Bash task running the dev
 // server) and the settings modal's "Live previews" list (every session's).
-// Previews never expire, so the settings list is the one place that can always
-// close a link left behind in a conversation you have moved on from.
+// Previews never expire and survive a relay restart, so the settings list is
+// the one place that can always close a link left behind in a conversation you
+// have moved on from; it shows each preview's age and last use to help.
 
 import { apiFetch } from './api-client.js';
 
@@ -21,10 +22,35 @@ export function subscribePreviews(callback) {
   return () => subscribers.delete(callback);
 }
 
+// Transcript cards on screen, with the snapshot each was built from. A card's
+// open/closed state is read from the registry when it is built, and a page that
+// renders a transcript before the registry arrived (the conversation payload
+// carries it after the messages) would otherwise keep showing a live preview
+// as closed.
+const transcriptCards = new Map();
+
+function refreshTranscriptCards() {
+  for (const [card, snapshot] of [...transcriptCards]) {
+    if (!card.isConnected) {
+      transcriptCards.delete(card);
+      continue;
+    }
+    const liveEntry = previews.find((entry) => entry.token === snapshot.token && !entry.unverified);
+    const shownLive = !card.classList.contains('msg-preview-card-closed');
+    // Rebuilt when it opened or closed, and when its link moved (a changed
+    // public address: the live entry carries the current one).
+    if (!!liveEntry === shownLive && (!liveEntry || card.dataset.previewUrl === (liveEntry.url || snapshot.url))) continue;
+    const next = buildTranscriptPreviewCard(snapshot);
+    transcriptCards.delete(card);
+    if (next) card.replaceWith(next);
+  }
+}
+
 function notify() {
   for (const callback of subscribers) {
     try { callback(previews); } catch {}
   }
+  try { refreshTranscriptCards(); } catch {}
 }
 
 function normalizePreview(entry) {
@@ -40,8 +66,12 @@ function normalizePreview(entry) {
     url: String(entry.url || '').trim(),
     basePath: String(entry.basePath || '').trim(),
     createdAt: Number(entry.createdAt) || null,
+    lastHitAt: Number(entry.lastHitAt) || null,
     // null = not probed yet; the badge stays absent rather than guessing.
     online: entry.online === true ? true : (entry.online === false ? false : null),
+    // Stored, but not served: the relay could not check it after a restart
+    // and tries again. It can be closed like any other.
+    unverified: entry.unverified === true,
   };
 }
 
@@ -110,13 +140,31 @@ async function copyPreviewUrl(url, button) {
   }
 }
 
-function previewDetail(preview, { withConversation = false } = {}) {
+export function formatPreviewAge(timestamp, now = Date.now()) {
+  const at = Number(timestamp);
+  if (!Number.isFinite(at) || at <= 0) return '';
+  const minutes = Math.floor(Math.max(0, now - at) / 60_000);
+  if (minutes < 1) return 'just now';
+  if (minutes < 60) return `${minutes} min ago`;
+  const hours = Math.floor(minutes / 60);
+  if (hours < 48) return `${hours} h ago`;
+  return `${Math.floor(hours / 24)} d ago`;
+}
+
+function previewDetail(preview, { withConversation = false, withAge = false, now = Date.now() } = {}) {
   const parts = [];
   if (preview.targetPort) parts.push(`:${preview.targetPort}`);
-  if (preview.online === false) parts.push('offline — dev server not responding');
+  if (preview.unverified) parts.push('not served — could not be checked after the restart, trying again');
+  else if (preview.online === false) parts.push('offline — dev server not responding');
   if (withConversation && preview.conversationId) {
     parts.push(`session ${preview.conversationId.slice(0, 8)}`);
   }
+  if (withAge) {
+    const published = formatPreviewAge(preview.createdAt, now);
+    if (published) parts.push(`published ${published}`);
+    const opened = formatPreviewAge(preview.lastHitAt, now);
+    parts.push(opened ? `last opened ${opened}` : 'never opened');
+  }
   return parts.join(' · ');
 }
 
@@ -124,7 +172,7 @@ function previewDetail(preview, { withConversation = false } = {}) {
  * One preview row. Built with createElement/textContent throughout: a label is
  * agent-supplied text and must never be able to execute as markup.
  */
-export function buildPreviewRow(preview, { withConversation = false } = {}) {
+export function buildPreviewRow(preview, { withConversation = false, withAge = false, now } = {}) {
   const row = document.createElement('div');
   row.className = 'preview-row';
   row.dataset.token = preview.token;
@@ -145,7 +193,7 @@ export function buildPreviewRow(preview, { withConversation = false } = {}) {
   label.textContent = preview.label;
   main.appendChild(label);
 
-  const detailText = previewDetail(preview, { withConversation });
+  const detailText = previewDetail(preview, { withConversation, withAge, now });
   if (detailText) {
     const detail = document.createElement('span');
     detail.className = 'preview-detail';
@@ -177,25 +225,28 @@ export function buildPreviewRow(preview, { withConversation = false } = {}) {
   actions.className = 'preview-actions';
   side.appendChild(actions);
 
-  const open = document.createElement('a');
-  open.className = 'preview-open';
-  open.href = preview.url;
-  open.target = '_blank';
-  // noopener/noreferrer: the preview is a different origin running app code we
-  // do not control, and it has no business holding a handle on this window.
-  open.rel = 'noopener noreferrer';
-  open.textContent = 'Open';
-  actions.appendChild(open);
-
-  const copy = document.createElement('button');
-  copy.type = 'button';
-  copy.className = 'preview-copy';
-  copy.textContent = 'Copy link';
-  copy.addEventListener('click', (event) => {
-    event.preventDefault();
-    void copyPreviewUrl(preview.url, copy);
-  });
-  actions.appendChild(copy);
+  // An unverified preview answers 404 for now: no link to open or copy.
+  if (!preview.unverified) {
+    const open = document.createElement('a');
+    open.className = 'preview-open';
+    open.href = preview.url;
+    open.target = '_blank';
+    // noopener/noreferrer: the preview is a different origin running app code we
+    // do not control, and it has no business holding a handle on this window.
+    open.rel = 'noopener noreferrer';
+    open.textContent = 'Open';
+    actions.appendChild(open);
+
+    const copy = document.createElement('button');
+    copy.type = 'button';
+    copy.className = 'preview-copy';
+    copy.textContent = 'Copy link';
+    copy.addEventListener('click', (event) => {
+      event.preventDefault();
+      void copyPreviewUrl(preview.url, copy);
+    });
+    actions.appendChild(copy);
+  }
 
   const closing = closesInFlight.has(preview.token);
   const close = document.createElement('button');
@@ -214,17 +265,29 @@ export function buildPreviewRow(preview, { withConversation = false } = {}) {
 
 /**
  * Transcript card for a preview published during a turn. Renders from the
- * persisted snapshot (the registry may be long gone), overlaying live state
- * from the current store: a token still registered gets a working row, a
- * vanished one keeps the label but drops the dead link for a `closed` badge.
+ * persisted snapshot, overlaying live state from the current store: a token
+ * still registered (previews survive a restart) gets a working row, a closed
+ * one keeps the label but drops the dead link for a `closed` badge.
+ *
+ * A public share carries no token or link (the link would open the preview to
+ * every reader of the transcript): its cards come as `{ label, redacted }` and
+ * render as a plain note.
  */
 export function buildTranscriptPreviewCard(snapshot) {
+  if (snapshot && typeof snapshot === 'object' && snapshot.redacted === true) {
+    return buildRedactedPreviewCard(snapshot);
+  }
   const preview = normalizePreview(snapshot);
   if (!preview) return null;
-  const live = previews.some((entry) => entry.token === preview.token);
+  const liveEntry = previews.find((entry) => entry.token === preview.token && !entry.unverified);
+  const live = !!liveEntry;
+  // The snapshot's link was built from the public address at publish time;
+  // the live entry's follows the current settings.
+  const url = liveEntry?.url || preview.url;
 
   const card = document.createElement('div');
   card.className = live ? 'msg-preview-card' : 'msg-preview-card msg-preview-card-closed';
+  if (live) card.dataset.previewUrl = url;
 
   const icon = document.createElement('span');
   icon.className = 'preview-icon';
@@ -236,10 +299,12 @@ export function buildTranscriptPreviewCard(snapshot) {
   label.textContent = preview.label;
   card.appendChild(label);
 
+  transcriptCards.set(card, preview);
+
   if (live) {
     const open = document.createElement('a');
     open.className = 'preview-open';
-    open.href = preview.url;
+    open.href = url;
     open.target = '_blank';
     open.rel = 'noopener noreferrer';
     open.textContent = 'Open';
@@ -251,7 +316,7 @@ export function buildTranscriptPreviewCard(snapshot) {
     copy.textContent = 'Copy link';
     copy.addEventListener('click', (event) => {
       event.preventDefault();
-      void copyPreviewUrl(preview.url, copy);
+      void copyPreviewUrl(url, copy);
     });
     card.appendChild(copy);
   } else {
@@ -263,6 +328,27 @@ export function buildTranscriptPreviewCard(snapshot) {
   return card;
 }
 
+function buildRedactedPreviewCard(snapshot) {
+  const card = document.createElement('div');
+  card.className = 'msg-preview-card msg-preview-card-redacted';
+
+  const icon = document.createElement('span');
+  icon.className = 'preview-icon';
+  icon.textContent = '🌐';
+  card.appendChild(icon);
+
+  const label = document.createElement('span');
+  label.className = 'preview-label';
+  label.textContent = String(snapshot.label || '').trim() || 'Preview';
+  card.appendChild(label);
+
+  const note = document.createElement('span');
+  note.className = 'preview-detail';
+  note.textContent = 'preview link not shared';
+  card.appendChild(note);
+  return card;
+}
+
 export function renderPreviewRowsInto(container, rows, options = {}) {
   if (!container) return 0;
   container.textContent = '';

package/server/public/app/preview-command.mjs

@@ -74,6 +74,10 @@ export async function runPreviewCommand(parsed, { conversationId = '' } = {}) {
       if (!previews.length) return { ok: true, notice: 'No live previews.' };
       const lines = previews.map((entry) => {
         const target = entry.mode === 'static' ? entry.rootDir : `:${entry.targetPort}`;
+        // Stored but not served until the relay could check it: no link.
+        if (entry.unverified === true) {
+          return `${entry.token.slice(0, 8)} · ${entry.label} (${target}) — not served, could not be checked after the restart`;
+        }
         const state = entry.online === false ? ' — offline' : '';
         return `${entry.token.slice(0, 8)} · ${entry.label} (${target})${state} → ${entry.url}`;
       });
@@ -96,7 +100,12 @@ export async function runPreviewCommand(parsed, { conversationId = '' } = {}) {
       // point at the panel where the states are visible instead.
       return { ok: false, notice: 'Preview failed — check the port/path, or whether the preview lane is enabled (Settings → Live previews).' };
     }
-    return { ok: true, notice: `Preview published: ${created.url}` };
+    return {
+      ok: true,
+      notice: created.existing === true
+        ? `Preview already published (same link): ${created.url}`
+        : `Preview published: ${created.url}`,
+    };
   } catch {
     return { ok: false, notice: 'Preview command failed — could not reach the relay.' };
   }

package/server/public/app/relay-board-view.js

@@ -3,6 +3,7 @@ import {
   currentConvId,
   escHtml,
   relayBoards,
+  scrollBottom,
 } from './store.js';
 import {
   boardBodyShownInReply,
@@ -16,6 +17,7 @@ import {
 } from './api-client.js';
 import { renderMarkdownPreview } from './router.js';
 import { attachCodeCopyButtons } from './code-copy.mjs';
+import { beginOwnSend, followsTranscriptEnd, refreshJumpButton, scrollAfterOwnSend } from './transcript-jump-bottom-view.mjs';
 
 // The conversation whose settled boards (acted on, dismissed) are loaded. They
 // are asked for per conversation: only the pending ones matter everywhere.
@@ -26,7 +28,18 @@ export function upsertRelayBoard(board) {
   if (!board || !board.id) return;
   relayBoards.set(board.id, board);
   window.renderConvList?.();
-  renderRelayBoards();
+  showNewRelayBoards();
+}
+
+// A board that arrives is shown to a reader who is at the end. Anyone further
+// up stays where they are; the jump-to-bottom button says that it waits.
+// "At the end" is read here, once, before the board is on the page: the
+// render itself reads no layout, it also runs inside a rebuild of the
+// transcript, where a read would clamp the scroll position to the few rows
+// that are on the page at that moment.
+function showNewRelayBoards() {
+  const atEnd = followsTranscriptEnd();
+  if (renderRelayBoards() && atEnd) scrollBottom();
 }
 
 export async function loadRelayBoards() {
@@ -40,7 +53,7 @@ export async function loadRelayBoards() {
   }
   for (const board of pending) relayBoards.set(board.id, board);
   window.renderConvList?.();
-  renderRelayBoards();
+  showNewRelayBoards();
 }
 
 async function loadBoardHistory(conversationId) {
@@ -186,10 +199,8 @@ export function renderRelayBoards() {
   // the live bubble into the reply, or one of another conversation.
   el.querySelectorAll('.relay-board-inline').forEach((node) => { if (!placed.has(node)) node.remove(); });
   el.querySelectorAll('.relay-board-container').forEach((node) => { if (!node.querySelector('.relay-board-inline')) node.remove(); });
-  // A folded agent exchange whose turn waits on a board opens to show it
-  // (agent-exchange-fold-view.mjs).
-  window.syncAgentExchangeFolds?.();
-  if (added) window.scrollBottom?.();
+  refreshJumpButton();
+  return added;
 }
 
 export async function submitRelayBoardAction(boardId, actionId) {
@@ -199,6 +210,7 @@ export async function submitRelayBoardAction(boardId, actionId) {
   const card = document.querySelector(`.relay-board-inline[data-board-id="${CSS.escape(id)}"]`);
   const controls = card ? card.querySelectorAll('button') : [];
   controls.forEach((control) => { control.disabled = true; });
+  const send = beginOwnSend();
 
   try {
     const r = await submitRelayBoardActionApi(id, nextActionId);
@@ -208,6 +220,7 @@ export async function submitRelayBoardAction(boardId, actionId) {
     relayBoards.set(id, r.board);
     window.renderConvList?.();
     renderRelayBoards();
+    scrollAfterOwnSend(send);
   } catch (error) {
     controls.forEach((control) => { control.disabled = false; });
     alert(error.message || 'Failed to submit board action');

package/server/public/app/relay-prompt-sanitizer.mjs

@@ -77,12 +77,17 @@ function whitespaceFlexiblePattern(value) {
     .join('\\s+');
 }
 
+// The patterns depend only on the mode, so they are built once per mode and
+// reused: a long conversation sanitises every message on each history load.
+const PROMPT_PREFIX_PATTERN_CACHE = new Map();
+
 function buildPromptPrefixPatterns(mode) {
   const requestedMode = String(mode || '').trim().toLowerCase();
-  const modes = requestedMode && MODE_MARKERS[requestedMode]
-    ? [requestedMode]
-    : Object.keys(MODE_MARKERS);
-  return modes.flatMap((key) => {
+  const cacheKey = requestedMode && MODE_MARKERS[requestedMode] ? requestedMode : '';
+  const cached = PROMPT_PREFIX_PATTERN_CACHE.get(cacheKey);
+  if (cached) return cached;
+  const modes = cacheKey ? [cacheKey] : Object.keys(MODE_MARKERS);
+  const patterns = modes.flatMap((key) => {
     const marker = MODE_MARKERS[key];
     const currentFullPrefix = `${marker} ${MODE_INSTRUCTIONS[key]} ${RELAY_TOOL_GUIDANCE}`;
     const legacyFullPrefix = `${marker} ${LEGACY_MODE_INSTRUCTIONS[key]} ${RELAY_TOOL_GUIDANCE}`;
@@ -92,6 +97,8 @@ function buildPromptPrefixPatterns(mode) {
       new RegExp(`^${whitespaceFlexiblePattern(marker)}\\s*`, 'i'),
     ];
   });
+  PROMPT_PREFIX_PATTERN_CACHE.set(cacheKey, patterns);
+  return patterns;
 }
 
 function stripAttachmentPromptArtifacts(text) {

package/server/public/app/relay-restart-error.mjs

@@ -0,0 +1,16 @@
+/**
+ * What to tell the user when a restart request failed. An HTTP answer is a
+ * refusal and says so (`refused`, shown as an alert); no answer at all can
+ * mean the relay took the request and began restarting before it could
+ * reply (`unanswered`, shown as a notice).
+ */
+export function describeRelayRestartError(error) {
+  const message = String(error?.message || '').trim();
+  if (Number(error?.status) > 0) {
+    return { kind: 'refused', text: `The relay refused the restart: ${message || `HTTP ${Number(error.status)}`}` };
+  }
+  return {
+    kind: 'unanswered',
+    text: `${message || 'The relay did not answer.'} If it took the restart, the connection comes back once it has restarted.`,
+  };
+}