@oar-sh/oar 0.9.1 → 0.9.3

package/server/public/app/background-tasks-view.mjs

@@ -5,6 +5,8 @@
 // `backgroundTasks` on reload; hidden whenever the set is empty.
 
 import { apiFetch } from './api-client.js';
+import { humanizeModelLabel } from './model-selector-options.mjs';
+import { prefixToolActivityEmoji } from './tool-activity-emoji.mjs';
 import {
   getPreviewsForConversation,
   renderPreviewRowsInto,
@@ -69,11 +71,26 @@ function taskKindLabel(task) {
   return label === 'Subagent' && subagentType ? subagentType : label;
 }
 
-function formatTaskModel(task) {
-  const model = String(task?.model || '').trim();
-  if (!model) return '';
-  const short = model.replace(/^claude-/, '');
-  return task?.modelInherited === true ? `${short} (inherited)` : short;
+// "claude-opus-5-5" → "Opus 5.5". A bare alias ("opus") is what a spawn pin
+// carries until the subagent's first answer names the real model.
+export function formatTaskModelLabel(model) {
+  const value = String(model || '').trim();
+  if (!value) return '';
+  if (/^claude-/i.test(value)) return humanizeModelLabel(value);
+  if (/^[a-z]+(\[[^\]]+\])?$/i.test(value)) return value.charAt(0).toUpperCase() + value.slice(1);
+  return humanizeModelLabel(value);
+}
+
+// Detail line: the live tool call when the worker saw one ("🪓 Tool
+// (PowerShell): cd …", cropped to the row by CSS), else the SDK's progress
+// summary, else the bare tool name.
+export function taskActivityText(task) {
+  const toolCall = String(task?.lastToolCall || '').trim();
+  if (toolCall) return { text: prefixToolActivityEmoji(toolCall), toolCall: true };
+  const summary = String(task?.summary || '').trim();
+  if (summary) return { text: summary, toolCall: false };
+  const lastToolName = String(task?.lastToolName || '').trim();
+  return { text: lastToolName ? `using ${lastToolName}` : '', toolCall: false };
 }
 
 // Compact token counts: "812 tok", "62.2k tok", "1.2M tok". Exported for the
@@ -180,7 +197,7 @@ function buildWorkflowAgentRow(agent) {
   const activityText = state === 'running' && lastToolName ? `— using ${lastToolName}` : '';
 
   const meta = [];
-  const model = String(agent.model ?? '').trim().replace(/^claude-/, '');
+  const model = formatTaskModelLabel(agent.model);
   if (model) meta.push(model);
   const tokens = formatTaskTokens(agent.tokens);
   if (tokens) meta.push(tokens);
@@ -364,16 +381,11 @@ function renderTaskRow(conversationId, task) {
   const key = `${conversationId}:${task.taskId}`;
   const stopping = stopsInFlight.has(key);
   const elapsed = formatElapsed(task.startedAt);
-  // Second line: progress first ("using Bash" prefixed so a bare tool name
-  // can't read as the task's kind), then model. Token usage renders as its
-  // own always-visible element on the row's right side instead of riding
-  // this clampable line, so a long summary can never crowd it out.
-  const summary = String(task.summary || '').trim();
-  const lastToolName = String(task.lastToolName || '').trim();
-  const detail = [
-    summary || (lastToolName ? `using ${lastToolName}` : ''),
-    formatTaskModel(task),
-  ].filter(Boolean).join(' · ');
+  // Token usage and the model render on the row's right side instead of
+  // riding the detail line, so a long tool call can never crowd them out.
+  const activity = taskActivityText(task);
+  const modelLabel = formatTaskModelLabel(task.model);
+  const modelTitle = task.modelInherited === true ? `${task.model} (inherited from the session)` : task.model;
   const tokens = formatTaskTokens(task.totalTokens);
   // Workflow rows with a digest get a fold chevron plus an (initially empty)
   // tree container right below the row; renderBackgroundTasksPanel fills the
@@ -392,14 +404,17 @@ function renderTaskRow(conversationId, task) {
       ${foldButton}<span class="bg-task-icon" title="${escHtml(task.taskType || 'task')}">${taskIcon(task.taskType)}</span>
       <span class="bg-task-main">
         <span class="bg-task-desc">${escHtml(task.description || task.taskId)}</span>
-        ${detail ? `<span class="bg-task-detail">${escHtml(detail)}</span>` : ''}
+        ${activity.text ? `<span class="bg-task-detail${activity.toolCall ? ' bg-task-toolcall' : ''}" title="${escHtml(activity.text)}">${escHtml(activity.text)}</span>` : ''}
       </span>
       <span class="bg-task-side">
-        <span class="bg-task-badge">${escHtml(taskKindLabel(task))}</span>
+        <span class="bg-task-side-head">
+          ${modelLabel ? `<span class="bg-task-model" title="${escHtml(modelTitle)}">${escHtml(modelLabel)}</span>` : ''}
+          <span class="bg-task-badge">${escHtml(taskKindLabel(task))}</span>
+        </span>
         <span class="bg-task-side-status">
           ${tokens ? `<span class="bg-task-tokens">${escHtml(tokens)}</span>` : ''}
           <span class="bg-task-elapsed">${escHtml(elapsed)}</span>
-          <button type="button" class="bg-task-stop" data-task-id="${escHtml(task.taskId)}" ${stopping ? 'disabled' : ''}>${stopping ? 'Stopping…' : 'Stop'}</button>
+          ${task.stoppable === false ? '' : `<button type="button" class="bg-task-stop" data-task-id="${escHtml(task.taskId)}" ${stopping ? 'disabled' : ''}>${stopping ? 'Stopping…' : 'Stop'}</button>`}
         </span>
       </span>
     </div>${treeHolder}`;

package/server/public/app/bootstrap.js

@@ -48,7 +48,10 @@ import {
   SHARED_CONVERSATION_TOKEN,
   getConversationWatcherCount,
   generateId,
+  imageEditTarget,
+  hasPendingUserMessageForConversation,
 } from './store.js';
+import { createTranscriptResizeKeeper } from './transcript-viewport-anchor.mjs';
 import {
   verifyExistingSession,
   verifyToken,
@@ -74,7 +77,7 @@ import {
   reportSharedViewerPresence,
   setNetworkRequestsEnabled,
 } from './api-client.js';
-import { loadConversations, refreshConversations, openConversation, renderConvList, applyLoadedConversationState, initConversationListLazyLoading } from './journal-view.js';
+import { loadConversations, refreshConversations, openConversation, renderConvList, applyLoadedConversationState, initConversationListLazyLoading, initConversationFilter } from './journal-view.js';
 import {
   newConversation,
   confirmNewConversationModel,
@@ -85,7 +88,7 @@ import {
   loadRelayQuestions,
   getPendingQuestionCountsByConversation,
 } from './ask-user-view.js';
-import { openPendingQuestionFromBanner, submitRelayQuestionChoice, submitRelayQuestionAnswer, submitRelayStructuredAnswer, onRelayQuestionDraftInput, handleRelayQuestionKey } from './ask-user-view.js';
+import { openPendingQuestionFromBanner, submitRelayQuestionChoice, submitRelayQuestionAnswer, submitRelayQuestionMultiSelect, submitRelayStructuredAnswer, onRelayQuestionDraftInput, onRelayQuestionMultiSelectChange, setRelayQuestionMultiMode, handleRelayQuestionKey } from './ask-user-view.js';
 import { loadRelayBoards, submitRelayBoardAction } from './relay-board-view.js';
 import {
   restoreInFlightThinking,
@@ -97,7 +100,10 @@ import {
   updateComposerSlashMenu,
   getConversationLoadedMessageCount,
   loadOlderConversationMessages,
-  syncComposerControlState,
+  syncComposerButtonState,
+  syncCancellableSteerButtons,
+  syncComposerAfterUserEdit,
+  isConversationDraftHeldBySend,
   persistComposerAttachments,
   flushConversationDraft,
   initConversationHistoryLazyLoading,
@@ -110,7 +116,7 @@ import {
 } from './conversation-view.js';
 import { bindChatSelectionGuard, chatSelectionGuard, isChatInteractionHeld } from './selection-guard.mjs';
 import { loadRepoBrowserTree, openRepoBrowser, closeRepoBrowser, setRepoBrowserSessionInfo, resetWorkspaceRepoBrowserForRootChange } from './attachments-view.js';
-import { handleAttachmentInput, retryAttachmentUpload, handleComposerPaste, handleComposerDrop, refreshComposerAttachmentWarning, removeAttachment, clearAttachments, openUploadedAttachmentViewer, setFilePreviewMode, toggleFilePreviewHtml, closeFilePreview, goBackFilePreview, openWorkspaceFilePreview, openWorkspaceFilePreviewFromRepo, setRepoBrowserRoot, setRepoBrowserViewMode, toggleRepoBrowserHidden, toggleRepoBrowserHeavy, refreshRepoBrowser, focusRepoTree, setRepoCurrentPath, confirmRepoBrowserCwdPick } from './attachments-view.js';
+import { handleAttachmentInput, retryAttachmentUpload, openAnnotateEditorForPending, openAnnotateEditorForPreview, handleComposerPaste, handleComposerDrop, refreshComposerAttachmentWarning, removeAttachment, clearAttachments, openUploadedAttachmentViewer, setFilePreviewMode, toggleFilePreviewHtml, copyFilePreviewImage, closeFilePreview, goBackFilePreview, openWorkspaceFilePreview, openWorkspaceFilePreviewFromRepo, setRepoBrowserRoot, setRepoBrowserViewMode, toggleRepoBrowserHidden, toggleRepoBrowserHeavy, refreshRepoBrowser, focusRepoTree, setRepoCurrentPath, confirmRepoBrowserCwdPick } from './attachments-view.js';
 import { initEmojiPicker, toggleEmojiPicker } from './emoji-view.js';
 import { initSlashAutocomplete } from './slash-autocomplete.mjs';
 import { dataTransferHasFiles } from './composer-paste.mjs';
@@ -122,8 +128,14 @@ import {
   resolveConversationComposerSelection,
 } from './conversation-preferences.mjs';
 import {
+  buildCatalogModelOptions,
+  catalogModelLabel,
+  composerPlaceholderFor,
+  contextWindowSuffix,
+  humanizeModelLabel,
+  modelMetadataFor,
   modelSelectorOptionsEqual,
-  normalizeModelSelectorOptions,
+  splitModelVariantId,
 } from './model-selector-options.mjs';
 import {
   buildContextTierOptions,
@@ -166,7 +178,7 @@ import {
   initFullscreenButton,
   promptInstallApp,
   toggleFullscreen,
-  applyPwaManifestFromSettings,
+  adoptLegacyPwaAppName,
   registerPwaShell,
   updatePwaAppName,
 } from './pwa-install.js';
@@ -265,7 +277,7 @@ import {
   toggleCursorProvider,
   applyCursorSettingsState,
   refreshCursorSettingsState,
-  updateWindowsAutostartSettingFromToggle,
+  updateWindowsAutostartMode,
   previewTurnCeilingSetting,
   updateTurnCeilingSetting,
   previewBackgroundTaskTimeoutSetting,
@@ -311,6 +323,14 @@ import {
   runCliInstall,
   cancelCliInstallRun,
 } from './cli-install-ui.js';
+import {
+  updateAutoCheckSetting,
+  checkForUpdatesNow,
+  applyAvailableUpdate,
+  cancelRunningUpdate,
+  dismissAvailableUpdate,
+  dismissUpdateOutcome,
+} from './update-ui.js';
 
 const MODEL_STORAGE_KEY = 'copilot_selected_model';
 // The New Chat modal used to keep its own model key, so a selection made there
@@ -413,6 +433,8 @@ let modelVariantCatalogState = {
   variants: [],
   enabledVariantIds: [],
   reasoningByModel: {},
+  contextLimitsByModel: {},
+  modelMetadataByModel: {},
   source: null,
   refreshedAt: null,
   warning: null,
@@ -1065,49 +1087,12 @@ function syncQueueStatusMenuEntry(payload = null) {
 }
 
 
-function splitVariantId(modelVariantId = '') {
-  const value = String(modelVariantId || '').trim();
-  if (!value) return { baseModelId: '', reasoningEffort: null };
-  const match = value.match(/^(.*)-(none|low|medium|high|xhigh|max)$/i);
-  if (!match) return { baseModelId: value, reasoningEffort: null };
-  return {
-    baseModelId: String(match[1] || '').trim(),
-    reasoningEffort: String(match[2] || '').trim().toLowerCase(),
-  };
-}
-
-function humanizeModelLabel(modelId = '') {
-  const text = String(modelId || '').trim();
-  if (!text) return '';
-  if (/^gpt-/i.test(text)) {
-    return text
-      .replace(/^gpt-/i, 'GPT-')
-      .replace(/-codex$/i, ' Codex')
-      .replace(/-mini$/i, ' Mini');
-  }
-  if (/^claude-/i.test(text)) {
-    return text
-      .replace(/^claude-/i, 'Claude ')
-      .split('-')
-      .map((part) => (/^\d+(\.\d+)?$/.test(part) ? part : (part.charAt(0).toUpperCase() + part.slice(1))))
-      .join(' ');
-  }
-  if (/^gemini-/i.test(text)) {
-    return text
-      .replace(/^gemini-/i, 'Gemini ')
-      .split('-')
-      .map((part) => (/^\d+(\.\d+)?$/.test(part) ? part : (part.charAt(0).toUpperCase() + part.slice(1))))
-      .join(' ');
-  }
-  return text;
-}
-
+// Bare label (no window suffix) for places outside the option list, such as
+// the runtime-lock pin.
 function modelOptionLabel(modelVariantId = '') {
-  if (String(modelVariantId || '').trim().toLowerCase() === AUTO_MODEL_OPTION) return 'Auto';
-  const { baseModelId, reasoningEffort } = splitVariantId(modelVariantId);
-  if (!baseModelId) return modelVariantId;
-  const baseLabel = humanizeModelLabel(baseModelId);
-  return reasoningEffort ? `${baseLabel} (${reasoningEffort})` : baseLabel;
+  return catalogModelLabel(modelVariantId, modelCatalogState.modelMetadataByModel, {
+    autoValue: AUTO_MODEL_OPTION,
+  });
 }
 
 function normalizeReasoningEffortList(efforts = []) {
@@ -1158,7 +1143,7 @@ function syncModelMetadataBlocker(message = '') {
     reasoningSelect.disabled = blocked;
     reasoningSelect.title = blocked ? 'Reasoning metadata unavailable' : 'Reasoning effort';
   }
-  window.syncComposerControlState?.();
+  window.syncComposerButtonState?.();
 }
 
 function currentConversationHasMessages() {
@@ -1314,6 +1299,9 @@ function clearModelMetadataHardFail() {
 async function startAppWithErrorHandling() {
   try {
     await initApp();
+    // Post-auth: move a legacy per-browser install app name to the relay so
+    // manifest fetches (Android WebAPK checks included) stop reverting it.
+    void adoptLegacyPwaAppName();
     return true;
   } catch (error) {
     console.error('[bootstrap] initApp failed', error);
@@ -1332,6 +1320,25 @@ function activeComposerProviderType() {
   ).trim().toLowerCase();
 }
 
+/**
+ * Keeps "Message <who>…" in step with the current model selection. The two
+ * standing overrides win: the shared read-only text owns the field for the
+ * whole session, and an active image-edit target owns it until cleared
+ * (clearImageEditTarget calls back in through the window global).
+ */
+function syncComposerPlaceholder() {
+  const input = document.getElementById('msg-input');
+  if (!input) return;
+  if (isSharedReaderMode()) return;
+  if (imageEditTarget) return;
+  const rawValue = String(document.getElementById('model-select')?.value || '');
+  const { baseModelId } = splitModelVariantId(rawValue);
+  input.placeholder = composerPlaceholderFor({
+    modelId: baseModelId || rawValue,
+    providerType: normalizeModelSelectorProviderType(activeComposerProviderType()),
+  });
+}
+
 function normalizeModelSelectorProviderType(providerType = '') {
   const normalized = String(providerType || '').trim().toLowerCase();
   if (normalized === 'openai' || normalized === 'openai-byok') return 'openai';
@@ -1379,10 +1386,19 @@ function modelVisibleForActiveProvider(modelId, activeProviderType, providersByM
   return !((hasOpenAIByok || hasClaude || hasCursor || hasGrok) && !hasNonExclusiveProvider);
 }
 
-function buildModelSelectorOptions(models = [], providersByModel = {}, activeProviderType = '') {
-  const normalizedOptions = normalizeModelSelectorOptions(models.length ? models : [FALLBACK_MODEL], {
+// metadataByModel is a parameter because the catalog refresh builds the next
+// option list before it commits nextState; reading modelCatalogState there
+// would label the new models with the old metadata.
+function buildModelSelectorOptions(
+  models = [],
+  providersByModel = {},
+  activeProviderType = '',
+  metadataByModel = modelCatalogState.modelMetadataByModel,
+) {
+  const normalizedOptions = buildCatalogModelOptions(models.length ? models : [FALLBACK_MODEL], {
     autoValue: AUTO_MODEL_OPTION,
-    labelFor: modelOptionLabel,
+    metadataByModel,
+    annotateContextWindow: normalizeModelSelectorProviderType(activeProviderType) !== 'claude',
   });
   return normalizedOptions.filter((option) => modelVisibleForActiveProvider(
     option.value,
@@ -1522,9 +1538,14 @@ function updateModelCatalogState(payload) {
     : [];
   const currentModel = String(payload?.currentModel || models[0] || '').trim();
   const defaultModel = String(payload?.defaultModel || models[0] || '').trim();
-  const normalizedModelOptions = normalizeModelSelectorOptions(models.length ? models : [FALLBACK_MODEL], {
+  const modelMetadataByModel = payload?.modelMetadataByModel && typeof payload.modelMetadataByModel === 'object'
+    ? payload.modelMetadataByModel
+    : {};
+  // Stored in catalog order so every consumer of modelCatalogState.models
+  // (composer, provider rescope, auto fallback) walks the same sequence.
+  const normalizedModelOptions = buildCatalogModelOptions(models.length ? models : [FALLBACK_MODEL], {
     autoValue: AUTO_MODEL_OPTION,
-    labelFor: modelOptionLabel,
+    metadataByModel: modelMetadataByModel,
   });
   const normalizedModels = normalizedModelOptions.map((option) => option.value);
 
@@ -1569,9 +1590,7 @@ function updateModelCatalogState(payload) {
       ]))
       : {},
     reasoningEfforts: normalizeReasoningEffortList(payload?.reasoningEfforts || []),
-    modelMetadataByModel: payload?.modelMetadataByModel && typeof payload.modelMetadataByModel === 'object'
-      ? payload.modelMetadataByModel
-      : {},
+    modelMetadataByModel,
     claudeContextTiersByModel: payload?.claudeContextTiersByModel && typeof payload.claudeContextTiersByModel === 'object'
       ? Object.fromEntries(Object.entries(payload.claudeContextTiersByModel).map(([modelId, tiers]) => [
         String(modelId || '').trim().toLowerCase(),
@@ -1590,6 +1609,7 @@ function updateModelCatalogState(payload) {
     normalizedModels,
     nextState.providersByModel,
     activeProviderType,
+    nextState.modelMetadataByModel,
   );
   const nextModels = nextOptions.map((option) => option.value);
   const currentOptions = Array.from(select.options)
@@ -1670,6 +1690,10 @@ function updateModelCatalogState(payload) {
 
   syncModelMetadataBlocker();
   syncAutoModelAvailability();
+  // After syncAutoModelAvailability: it can rewrite select.value (auto
+  // fallback, runtime-lock pin) and the placeholder must describe the final
+  // selection, not the transient one.
+  syncComposerPlaceholder();
   // The rebuilt catalog may now contain the conversation's preferred model for
   // the first time (provider models arrive after the initial catalog load).
   if (currentConvId) applyConversationPreferencesForConversation(currentConvId);
@@ -1703,7 +1727,7 @@ function updateContextTierSelector(modelId) {
   const tierOptions = buildContextTierOptions({
     modelId,
     providerType: activeComposerProviderType(),
-    metadata: modelCatalogState.modelMetadataByModel?.[modelId] || {},
+    metadata: modelMetadataFor(modelId, modelCatalogState.modelMetadataByModel) || {},
     claudeTiers: modelCatalogState.claudeContextTiersByModel,
   });
   const current = select.value;
@@ -1917,6 +1941,7 @@ function applyConversationPreferences({
       String(preferredReasoningEffort || '').trim().toLowerCase(),
     );
     updateContextTierSelector(selection.model || modelSelect.value);
+    syncComposerPlaceholder();
     const tierSelect = document.getElementById('context-tier-select');
     const desiredTier = String(preferredContextTier || 'default').trim().toLowerCase();
     if (tierSelect && Array.from(tierSelect.options).some((option) => option.value === desiredTier)) {
@@ -1990,6 +2015,8 @@ function initModelSelector() {
       if (suppressConversationPreferenceSync) return;
       if (currentConversationHasMessages() && select.value.toLowerCase() === AUTO_MODEL_OPTION) {
         syncAutoModelAvailability();
+        // The revert rewrites select.value; keep the placeholder describing it.
+        syncComposerPlaceholder();
         setModelBanner('⚠️ Auto model selection is available only for a new conversation.');
         return;
       }
@@ -2003,6 +2030,7 @@ function initModelSelector() {
         { persist: true },
       );
       updateContextTierSelector(select.value);
+      syncComposerPlaceholder();
       syncSessionLockNote({ pinnedModel: currentRuntimeModelLock()?.model || '' });
       refreshComposerAttachmentWarning();
       void persistCurrentConversationPreferences().catch(() => {});
@@ -2145,6 +2173,10 @@ function applyModelVariantCatalogState(payload) {
       selectable: entry?.selectable !== false,
       enabled: !!entry?.enabled,
       sortOrder: Number.isFinite(Number(entry?.sortOrder)) ? Math.max(0, Math.trunc(Number(entry.sortOrder))) : 0,
+      contextLimitTokens: Number.isFinite(Number(entry?.contextLimitTokens)) && Number(entry.contextLimitTokens) > 0
+        ? Number(entry.contextLimitTokens)
+        : null,
+      pricing: entry?.pricing && typeof entry.pricing === 'object' ? entry.pricing : null,
     })).filter((entry) => entry.variantId && entry.baseModelId)
     : [];
   const canonicalizeId = (value) => String(value || '').trim().toLowerCase();
@@ -2169,6 +2201,8 @@ function applyModelVariantCatalogState(payload) {
       sortOrder: Math.min(existing.sortOrder, entry.sortOrder),
       label: existing.label || entry.label,
       provider: existing.provider || entry.provider,
+      contextLimitTokens: existing.contextLimitTokens ?? entry.contextLimitTokens,
+      pricing: existing.pricing || entry.pricing,
     });
   }
   const variants = Array.from(dedupedVariantsMap.values());
@@ -2185,6 +2219,15 @@ function applyModelVariantCatalogState(payload) {
         normalizeReasoningEffortList(efforts),
       ]))
       : {},
+    contextLimitsByModel: payload?.contextLimitsByModel && typeof payload.contextLimitsByModel === 'object'
+      ? Object.fromEntries(Object.entries(payload.contextLimitsByModel).map(([modelId, tokens]) => [
+        String(modelId || '').trim().toLowerCase(),
+        Number(tokens),
+      ]).filter(([modelId, tokens]) => modelId && Number.isFinite(tokens) && tokens > 0))
+      : {},
+    modelMetadataByModel: payload?.modelMetadataByModel && typeof payload.modelMetadataByModel === 'object'
+      ? payload.modelMetadataByModel
+      : {},
     source: String(payload?.source || '').trim() || null,
     refreshedAt: payload?.refreshedAt || null,
     warning: payload?.warning ? String(payload.warning) : null,
@@ -2514,6 +2557,13 @@ function renderModelVariantCatalogBody() {
         ? { ...fallbackMeta, efforts: new Set(providerEfforts) }
         : fallbackMeta;
       const label = meta.label || humanizeModelLabel(baseModelId) || baseModelId;
+      const windowSuffix = contextWindowSuffix(
+        baseModelId,
+        modelVariantCatalogState.modelMetadataByModel || modelCatalogState.modelMetadataByModel,
+      );
+      const windowChip = windowSuffix
+        ? `<span class="model-reasoning-chip model-reasoning-chip-muted">${escHtml(windowSuffix.replace(/^ · /, ''))}</span>`
+        : '';
       const variantRowsHtml = variantRows.map((row) => {
         const selectable = row.selectable !== false;
         // SDK-provider rows (Claude/Cursor/Grok) carry their own enabled flag; only
@@ -2551,7 +2601,7 @@ function renderModelVariantCatalogBody() {
       return `
         <div class="model-base-group">
           <div class="model-base-header">
-            <div class="model-base-title">${escHtml(label)}</div>
+            <div class="model-base-title">${escHtml(label)}${windowChip ? ` ${windowChip}` : ''}</div>
             <div class="model-base-reasoning">
               <span class="model-base-reasoning-label">Reasoning</span>
               ${renderReasoningEffortChipRow(meta.efforts)}
@@ -3194,6 +3244,10 @@ async function refreshSessionWorkerStatus() {
   syncQueueStatusMenuEntry(status);
   if (setSessionWorkerStatesFromStatusPayload(status.sessionWorker)) {
     renderConvList();
+    // A worker steering snapshot may have changed; the composer's Steer
+    // button (gate, hold) and the pushed rows' Cancel controls derive from it.
+    syncComposerButtonState();
+    syncCancellableSteerButtons();
   }
   updateCliStatus();
   const nextWorkerState = currentSdkSessionId ? getSessionWorkerState(currentSdkSessionId) : null;
@@ -3224,8 +3278,13 @@ async function pollAuthenticatedCurrentConversationLive() {
   const currentId = String(currentConvId || '').trim();
   if (!currentId) return;
   const currentConversation = conversations[currentId] || null;
+  // A locally-sent message still waiting in the queue must keep the poll
+  // armed: while it waits, inFlight is null, so the poll itself tears the
+  // bubble down — leaving neither localTurnStatus nor an indicator to revive
+  // polling once a worker finally picks the message up.
   const isProcessing = String(currentConversation?.localTurnStatus || '').trim().toLowerCase() === 'processing'
-    || !!document.getElementById('thinking-indicator');
+    || !!document.getElementById('thinking-indicator')
+    || hasPendingUserMessageForConversation(currentId);
   if (!isProcessing) return;
   // Refreshing while the user selects or drags in the chat would rebuild the
   // DOM under the selection; the guard's release callback re-polls right away.
@@ -3260,9 +3319,18 @@ function startLiveConversationPolling() {
   }, 900);
 }
 
+const transcriptResizeKeeper = createTranscriptResizeKeeper({
+  getElement: () => document.getElementById('messages'),
+});
+
 function setupViewportTracking() {
   syncViewportMetrics();
-  const update = () => syncViewportMetrics();
+  // After the metrics: --app-height decides the transcript's height, and the
+  // keeper's restore reads the post-resize layout.
+  const update = () => {
+    syncViewportMetrics();
+    transcriptResizeKeeper.handleResize();
+  };
   window.addEventListener('resize', update, { passive: true });
   window.addEventListener('orientationchange', update, { passive: true });
   if (window.visualViewport) {
@@ -3301,7 +3369,7 @@ function setupViewportTracking() {
   if (input && input.dataset.viewportBound !== '1') {
     input.dataset.viewportBound = '1';
     input.addEventListener('input', () => {
-      syncComposerControlState();
+      syncComposerAfterUserEdit();
     }, { passive: true });
     input.addEventListener('focus', () => {
       document.body.classList.add('keyboard-open');
@@ -3376,6 +3444,7 @@ function initMessageScrollPersistence() {
   if (!el || el.dataset.scrollPersistenceBound === '1') return;
   el.dataset.scrollPersistenceBound = '1';
   el.addEventListener('scroll', () => {
+    transcriptResizeKeeper.recordScroll();
     const convId = String(currentConvId || '').trim();
     if (!convId) return;
     saveConversationScrollTop(convId, el.scrollTop);
@@ -3893,7 +3962,11 @@ async function initApp() {
     // The direct flush below can be killed mid-flight by the browser; the
     // queued copy survives and is replayed by Background Sync. If the direct
     // write wins, the replay hits a draft version conflict and is dropped.
-    if (!appSharedMode) void enqueueDraftFlushForBackgroundSync(currentConvId);
+    if (!appSharedMode) {
+      void enqueueDraftFlushForBackgroundSync(currentConvId, {
+        afterPendingSend: isConversationDraftHeldBySend(currentConvId),
+      });
+    }
     void flushConversationDraft(currentConvId);
     closeTmuxInspectorView();
   });
@@ -4113,6 +4186,7 @@ async function initApp() {
   initEmojiPicker();
   initSlashAutocomplete();
   initConversationListLazyLoading();
+  initConversationFilter();
   initConversationHistoryLazyLoading();
   initBubbleActionHandlers();
   initMessageScrollPersistence();
@@ -4164,9 +4238,6 @@ async function bootstrap() {
       .then((registrations) => Promise.all(registrations.map((registration) => registration.unregister().catch(() => false))))
       .catch(() => {});
   }
-  if (!sharedMode) {
-    await applyPwaManifestFromSettings();
-  }
   if (!sharedMode) {
     registerPwaShell();
     initInstallButton();
@@ -4219,6 +4290,12 @@ window.confirmGrokLogout = confirmGrokLogout;
 window.confirmCliInstall = confirmCliInstall;
 window.runCliInstall = runCliInstall;
 window.cancelCliInstallRun = cancelCliInstallRun;
+window.updateAutoCheckSetting = updateAutoCheckSetting;
+window.checkForUpdatesNow = checkForUpdatesNow;
+window.applyAvailableUpdate = applyAvailableUpdate;
+window.cancelRunningUpdate = cancelRunningUpdate;
+window.dismissAvailableUpdate = dismissAvailableUpdate;
+window.dismissUpdateOutcome = dismissUpdateOutcome;
 window.saveGrokSettings = saveGrokSettings;
 window.toggleGrokProvider = toggleGrokProvider;
 window.saveCursorSettings = saveCursorSettings;
@@ -4231,7 +4308,7 @@ window.saveGrokAllowanceSettings = saveGrokAllowanceSettings;
 window.resetGrokAllowanceAccounting = resetGrokAllowanceAccounting;
 window.toggleCursorProvider = toggleCursorProvider;
 window.updateShowSuspendHostSetting = updateShowSuspendHostSetting;
-window.updateWindowsAutostartSettingFromToggle = updateWindowsAutostartSettingFromToggle;
+window.updateWindowsAutostartMode = updateWindowsAutostartMode;
 window.previewTurnCeilingSetting = previewTurnCeilingSetting;
 window.updateTurnCeilingSetting = updateTurnCeilingSetting;
 window.previewBackgroundTaskTimeoutSetting = previewBackgroundTaskTimeoutSetting;
@@ -4285,8 +4362,11 @@ window.retryAttachmentUpload = retryAttachmentUpload;
 window.removeAttachment = removeAttachment;
 window.clearAttachments = clearAttachments;
 window.openUploadedAttachmentViewer = openUploadedAttachmentViewer;
+window.openAnnotateEditorForPending = openAnnotateEditorForPending;
+window.openAnnotateEditorForPreview = openAnnotateEditorForPreview;
 window.setFilePreviewMode = setFilePreviewMode;
 window.toggleFilePreviewHtml = toggleFilePreviewHtml;
+window.copyFilePreviewImage = copyFilePreviewImage;
 window.closeFilePreview = closeFilePreview;
 window.goBackFilePreview = goBackFilePreview;
 window.openWorkspaceFilePreview = openWorkspaceFilePreview;
@@ -4301,14 +4381,18 @@ window.confirmRepoBrowserCwdPick = confirmRepoBrowserCwdPick;
 window.toggleEmojiPicker = toggleEmojiPicker;
 window.submitRelayQuestionChoice = submitRelayQuestionChoice;
 window.submitRelayQuestionAnswer = submitRelayQuestionAnswer;
+window.submitRelayQuestionMultiSelect = submitRelayQuestionMultiSelect;
 window.submitRelayStructuredAnswer = submitRelayStructuredAnswer;
 window.onRelayQuestionDraftInput = onRelayQuestionDraftInput;
+window.onRelayQuestionMultiSelectChange = onRelayQuestionMultiSelectChange;
+window.setRelayQuestionMultiMode = setRelayQuestionMultiMode;
 window.handleRelayQuestionKey = handleRelayQuestionKey;
 window.openPendingQuestionFromBanner = openPendingQuestionFromBanner;
 window.submitRelayBoardAction = submitRelayBoardAction;
 window.compactCurrentConversation = compactCurrentConversation;
 window.sendMessage = sendMessage;
-window.syncComposerControlState = syncComposerControlState;
+window.syncComposerButtonState = syncComposerButtonState;
+window.syncComposerPlaceholder = syncComposerPlaceholder;
 window.persistComposerAttachments = persistComposerAttachments;
 window.appendMessage = appendMessage;
 window.loadOlderConversationMessages = loadOlderConversationMessages;