@oar-sh/oar 0.9.7 → 0.9.9

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

@@ -52,8 +52,10 @@ 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, 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';
+import { renderAttachmentMarkup, removeComposerAttachments, uploadAttachments, setComposerAttachments, setRepoBrowserSessionInfo, openGalleryItem } from './attachments-view.js';
+import { chatMediaGallery, chatMediaItemFromNode } from './viewer-chat-gallery.mjs';
 import { buildWorkflowRunCard } from './background-tasks-view.mjs';
+import { isMessagePinned, toggleMessagePin } from './pinned-messages-view.mjs';
 import { parsePreviewCommand, runPreviewCommand } from './preview-command.mjs';
 import { buildTranscriptPreviewCard } from './preview-cards.mjs';
 import { closeSlashAutocomplete, handleSlashAutocompleteKey, updateSlashAutocomplete } from './slash-autocomplete.mjs';
@@ -88,8 +90,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';
@@ -1338,12 +1346,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) : [];
@@ -1385,8 +1395,13 @@ function createMessageNode(msg, msgId = null, force = false) {
   const belongsToActiveTurn = !!activeTurnMessageId
     && (activeTurnMessageId === msgId || activeTurnMessageId === sourceMessageId);
   const canToggleShareVisibility = !IS_SHARED_VIEW && !!msgId && !isQueuedUserMessage && !belongsToActiveTurn;
+  // From the conversation's pin list, not from the message: the list is
+  // ordered by revision, and a bubble built from a live event has no pin
+  // state of its own.
+  const pinned = isMessagePinned(currentConvId, msgId);
   const shareVisibilityActionHtml = canToggleShareVisibility
     ? `<div class="msg-share-visibility">
+        ${buildMessagePinControlsHtml(msgId, pinned)}
         ${hiddenFromShares ? '<span class="msg-hidden-label">Hidden from shared viewers</span>' : ''}
         <button type="button" class="msg-share-visibility-btn" data-action="toggle-share-visibility" data-message-id="${escHtml(msgId)}" data-hidden-from-shares="${hiddenFromShares ? 'true' : 'false'}" title="${hiddenFromShares ? 'Shows this message in shared conversations' : 'Hides this message from shared conversations'}">${hiddenFromShares ? 'Unhide' : 'Hide'}</button>
       </div>`
@@ -1479,7 +1494,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 {
@@ -1604,11 +1627,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
@@ -1711,10 +1735,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);
   }
@@ -1771,11 +1801,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.
@@ -1788,8 +1820,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
@@ -1955,6 +2012,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');
@@ -2060,8 +2118,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) {
@@ -3079,6 +3141,38 @@ async function cancelSubagentByRunId(conversationId, subagentRunId) {
   updateSubagentStopButton(targetSubagentRunId, false);
 }
 
+const PINNED_LABEL_HTML = '<span class="msg-pinned-label">📍 Pinned</span>';
+
+function pinButtonTitle(pinned) {
+  return pinned ? 'Removes this message from the pinned list' : 'Adds this message to the pinned list';
+}
+
+// The pin half of a bubble's corner row. No whitespace between label and
+// button: syncRenderedPinState finds the label as the button's sibling.
+function buildMessagePinControlsHtml(msgId, pinned) {
+  return `${pinned ? PINNED_LABEL_HTML : ''}<button type="button" class="msg-pin-btn" data-action="toggle-pin" data-message-id="${escHtml(msgId)}" data-pinned="${pinned ? 'true' : 'false'}" title="${pinButtonTitle(pinned)}">${pinned ? 'Unpin' : 'Pin'}</button>`;
+}
+
+// The pin list changed (this page, another device): bring the bubbles on the
+// page in line without rebuilding them.
+export function syncRenderedPinState(pinnedIds) {
+  const el = getMessagesElement();
+  if (!el) return;
+  const ids = pinnedIds instanceof Set ? pinnedIds : new Set(pinnedIds || []);
+  for (const button of el.querySelectorAll('.msg-pin-btn')) {
+    const pinned = ids.has(String(button.dataset.messageId || '').trim());
+    if ((button.dataset.pinned === 'true') === pinned) continue;
+    button.dataset.pinned = pinned ? 'true' : 'false';
+    button.disabled = false;
+    button.textContent = pinned ? 'Unpin' : 'Pin';
+    button.title = pinButtonTitle(pinned);
+    const sibling = button.previousElementSibling;
+    const label = sibling?.classList?.contains('msg-pinned-label') ? sibling : null;
+    if (pinned && !label) button.insertAdjacentHTML('beforebegin', PINNED_LABEL_HTML);
+    if (!pinned && label) label.remove();
+  }
+}
+
 async function toggleMessageShareVisibility(conversationId, messageId, hiddenFromShares) {
   const conversationKey = String(conversationId || '').trim();
   const targetMessageId = String(messageId || '').trim();
@@ -3137,7 +3231,7 @@ function runRelayErrorCta(cta) {
 }
 
 function handleBubbleActionClick(event) {
-  const btn = event.target.closest('.bubble-action-btn, .msg-share-visibility-btn, .thinking-follow-btn, .subagent-bubble-header');
+  const btn = event.target.closest('.bubble-action-btn, .msg-share-visibility-btn, .msg-pin-btn, .thinking-follow-btn, .subagent-bubble-header');
   if (!btn) return;
   const action = btn.dataset.action;
   const messageId = btn.dataset.messageId;
@@ -3159,6 +3253,12 @@ function handleBubbleActionClick(event) {
     );
   }
 
+  if (action === 'toggle-pin' && messageId) {
+    event.preventDefault();
+    event.stopPropagation();
+    void toggleMessagePin(currentConvId, messageId, btn.dataset.pinned === 'true');
+  }
+
   if (action === 'stop-turn' && messageId) {
     event.preventDefault();
     event.stopPropagation();
@@ -3214,30 +3314,48 @@ function handleBubbleActionKeydown(event) {
   toggleSubagentFold(header.dataset.subagentRunId);
 }
 
-// Clicking an inline-embedded image in a message bubble opens it in the file
-// viewer modal (zoom + Download + Copy), the same viewer the repo browser
-// uses. Attachment thumbnails keep their own handler; video/audio keep their
-// native controls untouched.
-function handleEmbeddedImageClick(event) {
-  const img = event.target.closest?.('.msg-bubble img');
-  if (!img || img.closest('.msg-attachment')) return;
-  if (IS_SHARED_VIEW) return; // the file routes are cookie-authed; shared viewers would only see a failed load
-  const src = String(img.getAttribute('src') || '').trim();
-  if (!src) return;
+// A tap on a media attachment (its picture, chip or name) or on a picture
+// embedded in a bubble opens it in the file viewer, together with the other
+// media of the conversation to swipe through. Inline video/audio players in
+// bubbles keep their native controls untouched.
+function handleChatMediaClick(event) {
+  const attachment = event.target.closest?.('.msg-attachment[data-media-url]');
+  let node = null;
+  if (attachment) {
+    // The buttons under a generated image ("Edit this image") do their own work.
+    if (event.target.closest?.('button')) return;
+    if (!event.target.closest?.('img, .msg-attachment-video-chip, [data-media-open]')) return;
+    node = attachment;
+  } else {
+    const img = event.target.closest?.('.msg-bubble img');
+    if (!img || img.closest('.msg-attachment')) return;
+    if (IS_SHARED_VIEW) return; // the file routes are cookie-authed; shared viewers would only see a failed load
+    if (!String(img.getAttribute('src') || '').trim()) return;
+    node = img;
+  }
   event.preventDefault();
   event.stopPropagation();
-  const target = parseAppFileHref(src);
-  if (target?.kind === 'drive') {
-    void openDriveFilePreview(target.path);
-    return;
-  }
-  if (target?.kind === 'workspace') {
-    void openWorkspaceFilePreview(target.path);
-    return;
+  const options = { includeEmbedded: !IS_SHARED_VIEW, parseAppFileHref };
+  const gallery = chatMediaGallery(getMessagesElement(), node, options);
+  const item = gallery ? gallery.items[gallery.index] : chatMediaItemFromNode(node, options);
+  void openGalleryItem(item, gallery);
+}
+
+// On a touch screen the corner row (Pin, Hide) is revealed by a tap on the
+// bubble. The tap leaves an emulated :hover behind, which the CSS also honours,
+// but Chromium drops that hover at the next scroll or layout change on some
+// platforms (seen on Linux), and the row went back to `pointer-events: none`
+// before it could be tapped. The class keeps the reveal until a tap lands
+// outside the bubble. A pointer with hover keeps the hover reveal alone.
+const REVEALED_BUBBLE_CLASS = 'msg-actions-revealed';
+function handleBubbleTapReveal(event) {
+  const bubble = event.target?.closest?.('.msg-bubble') || null;
+  for (const revealed of document.querySelectorAll(`.msg-bubble.${REVEALED_BUBBLE_CLASS}`)) {
+    if (revealed !== bubble) revealed.classList.remove(REVEALED_BUBBLE_CLASS);
   }
-  // data: thumbnails and external http(s) images: show them directly.
-  const dataMime = /^data:(image\/[a-z0-9.+-]+)/i.exec(src)?.[1] || '';
-  openUploadedAttachmentViewer(img.getAttribute('alt') || 'image', src, dataMime || 'image/*');
+  if (!bubble || IS_SHARED_VIEW) return;
+  if (!window.matchMedia?.('(hover: none)')?.matches) return;
+  bubble.classList.add(REVEALED_BUBBLE_CLASS);
 }
 
 export function initBubbleActionHandlers() {
@@ -3245,7 +3363,9 @@ export function initBubbleActionHandlers() {
   if (!messagesEl) return;
   messagesEl.addEventListener('click', handleBubbleActionClick);
   messagesEl.addEventListener('keydown', handleBubbleActionKeydown);
-  messagesEl.addEventListener('click', handleEmbeddedImageClick);
+  messagesEl.addEventListener('click', handleChatMediaClick);
+  // On the document: a tap outside the transcript clears the reveal too.
+  document.addEventListener('click', handleBubbleTapReveal);
   initThinkingFollow({ getCurrentConversationId: () => currentConvId });
 }
 
@@ -3357,6 +3477,20 @@ function buildMessageSnapshotKey(messages = [], meta = {}) {
   });
 }
 
+// Counts jumps into the history (a search result, a pinned message). A reload
+// of the END of the conversation that was asked for before a jump and is
+// answered after it would put the end back over the window just jumped to.
+// Only jumps count: an ordinary reload must still be able to correct another.
+let transcriptJumpEpoch = 0;
+
+export function getTranscriptJumpEpoch() {
+  return transcriptJumpEpoch;
+}
+
+export function noteTranscriptJump() {
+  transcriptJumpEpoch += 1;
+}
+
 export function renderMessages(msgs, scroll = true, meta = {}) {
   const el = getMessagesElement();
   if (!el) return false;
@@ -3535,12 +3669,18 @@ export async function loadNewerConversationMessages() {
   await conversationFutureLoader.loadMore();
 }
 
+// False while a window in the middle of the history is on the page (a search
+// result or a pinned message was jumped to) and newer messages are unloaded.
+export function isConversationWindowAtTail() {
+  return !conversationHistoryState.hasMoreNewer;
+}
+
 export function focusConversationMessageById(messageId, { behavior = 'smooth', block = 'center' } = {}) {
   const id = String(messageId || '').trim();
   if (!id) return false;
   const el = getMessagesElement();
   if (!el) return false;
-  const target = el.querySelector(`[data-message-id="${id}"]`);
+  const target = el.querySelector(`.msg[data-message-id="${CSS.escape(id)}"]`);
   if (!target) return false;
   target.scrollIntoView({ behavior, block, inline: 'nearest' });
   target.classList.add('msg-search-target');

package/server/public/app/external-link-policy.mjs

@@ -57,7 +57,10 @@ export function installExternalLinkPolicy({ documentRef = document, onFallback =
   documentRef.addEventListener('click', (event) => {
     const target = event.target instanceof Element ? event.target : event.target?.parentElement;
     const anchor = target?.closest?.('a[href]');
-    if (!anchor || isInAppLink(anchor)) return;
+    // A download link is left to the browser: opened in a new tab instead, it
+    // lost its `download` name, and a phone showed or saved the file under
+    // the plain name, next to (or instead of) an older copy.
+    if (!anchor || anchor.hasAttribute('download') || isInAppLink(anchor)) return;
     secureExternalLink(anchor, documentRef.baseURI, onFallback);
     if (!isExternalNavigationHref(anchor.getAttribute('href'), documentRef.baseURI)) return;
     if (event.defaultPrevented || event.button !== 0 || event.metaKey || event.ctrlKey || event.shiftKey || event.altKey) return;

package/server/public/app/file-version.mjs

@@ -0,0 +1,58 @@
+// A download link has to change when the file behind it changes. The address
+// and the name a file is saved under both carry the file's version, so nothing
+// between the relay and the Downloads folder can hand back an older copy:
+// not a download manager or a proxy keyed on the URL, and not a phone that
+// keeps `name.pdf`, `name (1).pdf`, `name (2).pdf` side by side and opens the
+// first.
+
+export function appendUrlParam(url, key, value) {
+  const base = String(url || '');
+  const text = String(value ?? '');
+  if (!base || !text) return base;
+  return `${base}${base.includes('?') ? '&' : '?'}${key}=${encodeURIComponent(text)}`;
+}
+
+/** `href` with the file's version token (`v=…`) appended; unchanged when there is none or it has one. */
+export function versionedFileHref(href, version) {
+  const base = String(href || '');
+  if (/[?&]v=/.test(base)) return base;
+  return appendUrlParam(base, 'v', version);
+}
+
+function twoDigits(value) {
+  return String(value).padStart(2, '0');
+}
+
+/**
+ * The name to save a download under: the file's own name with the time it was
+ * last changed, `report.pdf` → `report (1005-0719).pdf` (month, day, hour,
+ * minute, local time). Two versions of a file get two names, and the name
+ * says which one is open. Without a known time the name stays as it is.
+ */
+export function stampedDownloadName(name, mtimeMs) {
+  const plain = String(name || '').trim();
+  const time = Number(mtimeMs);
+  if (!plain || !Number.isFinite(time) || time <= 0) return plain;
+  const date = new Date(time);
+  if (Number.isNaN(date.getTime())) return plain;
+  const stamp = `${twoDigits(date.getMonth() + 1)}${twoDigits(date.getDate())}-${twoDigits(date.getHours())}${twoDigits(date.getMinutes())}`;
+  const dot = plain.lastIndexOf('.');
+  // A leading dot is part of the name (`.env`), not the start of an extension.
+  if (dot <= 0) return `${plain} (${stamp})`;
+  return `${plain.slice(0, dot)} (${stamp})${plain.slice(dot)}`;
+}
+
+/**
+ * The download link of a previewed file: versioned address, and the stamped
+ * name both as the link's `download` name and as `as=…`, which the relay puts
+ * into the `Content-Disposition` header (a browser prefers that header over
+ * the link's own name).
+ */
+export function buildDownloadLink({ href, name, version, mtimeMs } = {}) {
+  const downloadName = stampedDownloadName(name, mtimeMs);
+  let url = versionedFileHref(href, version);
+  if (url && downloadName && downloadName !== String(name || '').trim()) {
+    url = appendUrlParam(url, 'as', downloadName);
+  }
+  return { href: url, downloadName };
+}

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

@@ -42,9 +42,10 @@ import {
   loadGrokSettings,
   loadOpenAISettings,
 } from './api-client.js';
-import { renderMessages, restoreInFlightThinking, focusConversationMessageById, flushConversationDraft, hydrateConversationDraft, beginConversationDraftSwitch, openStopTurnConfirmationForConversation, conversationHasActiveTurn } from './conversation-view.js';
+import { renderMessages, restoreInFlightThinking, focusConversationMessageById, noteTranscriptJump, flushConversationDraft, hydrateConversationDraft, beginConversationDraftSwitch, openStopTurnConfirmationForConversation, conversationHasActiveTurn } from './conversation-view.js';
 import { MENU_SEPARATOR, bindLongPress, closeContextMenu, openContextMenu } from './context-menu.mjs';
 import { setBackgroundTasksConversation, setConversationBackgroundTasks } from './background-tasks-view.mjs';
+import { setConversationPins, setPinsConversation } from './pinned-messages-view.mjs';
 import { setUsageLimitConversation } from './usage-limit-ui.js';
 import { mergeConversationPreviews } from './preview-cards.mjs';
 import { loadRelayQuestions, getPendingQuestionCountsByConversation } from './ask-user-view.js';
@@ -428,10 +429,14 @@ export function renderConvList() {
   scheduleConversationListBoundaryCheck();
 }
 
+// keepTranscript: the page shows a window this payload must not replace (the
+// user jumped into the history; the payload is the end of the conversation).
+// Everything but the messages still applies.
 export function applyLoadedConversationState(id, response, {
   restoreScroll = false,
   savedScrollTop = null,
   followLiveUpdates = !restoreScroll,
+  keepTranscript = false,
 } = {}) {
   if (!response) {
     setRepoBrowserSessionInfo('', '');
@@ -490,7 +495,13 @@ export function applyLoadedConversationState(id, response, {
   // live poll, and the bare loadRepoBrowserTree path resets loaded folders and
   // deep selections. The end-of-turn message_status handler refreshes the tree
   // through the restoring path instead.
-  const didRenderMessages = renderMessages(response.messages, !restoreScroll, response);
+  // Before the messages: their bubbles take Pin / Unpin from this list.
+  // Absent from an older relay's payload: keep what the socket said.
+  if ('pins' in response) setConversationPins(id, response.pins, response.pinsRevision);
+  setPinsConversation(id);
+  const didRenderMessages = keepTranscript
+    ? false
+    : renderMessages(response.messages, !restoreScroll, response);
   hydrateConversationDraft(id, {
     draftText: response.draftText,
     draftAttachments: response.draftAttachments,
@@ -605,6 +616,9 @@ export async function openConversation(id, options = {}) {
     return;
   }
   if (r) {
+    // Counted when the window is put on the page, not when it is asked for:
+    // a reload of the end that is still on its way must see the change.
+    if (forceFreshWindow) noteTranscriptJump();
     applyLoadedConversationState(id, r, { restoreScroll, savedScrollTop });
     if (focusMessageId) {
       requestAnimationFrame(() => {