@oar-sh/oar 0.9.12 → 0.9.13

package/server/public/index.html

@@ -2984,6 +2984,15 @@
   }
   .pending-action-text { overflow-wrap: anywhere; }
   .pending-action-cancel { margin-left: 0; }
+  /* The queued relay restart's row (relay-restart-ui.js): the headline, the
+     sessions it waits for (links), held messages, background tasks, buttons. */
+  .relay-restart-row { flex-direction: column; gap: 3px; }
+  .relay-restart-head { display: flex; flex-wrap: wrap; justify-content: center; gap: 6px; }
+  .relay-restart-waited { opacity: 0.85; }
+  .relay-restart-detail { color: var(--text); overflow-wrap: anywhere; max-height: 4.5em; overflow-y: auto; }
+  .relay-restart-session-link { color: inherit; text-decoration: underline; }
+  .relay-restart-actions { display: flex; flex-wrap: wrap; justify-content: center; gap: 6px; }
+  .relay-restart-row[data-asking="1"] .relay-restart-head { font-weight: 600; }
   .suspend-host-blockers {
     margin: 6px 0 10px;
     padding-left: 20px;
@@ -3438,6 +3447,26 @@
     font-size: var(--fs-meta-sm); text-decoration: underline; text-underline-offset: 3px;
   }
   #task-console-stop:hover:not(:disabled) { border-color: #f85149; color: #f85149; }
+  /* "Load earlier" within reach while following the end; the one at the top
+     of the output stays. */
+  #task-console-earlier-top {
+    background: none; border: 0; padding: 0; color: var(--accent); cursor: pointer;
+    font-size: var(--fs-meta-sm); text-decoration: underline; text-underline-offset: 3px;
+  }
+  #task-console-earlier-top:disabled { color: var(--muted); text-decoration: none; cursor: default; }
+  #task-console-earlier-top[hidden] { display: none; }
+  /* Where the output of a command piped into tail stops until it ends. */
+  #task-console-hold {
+    margin: 8px 0 0; padding: 6px 10px; border-left: 3px solid var(--warn); border-radius: 4px;
+    background: var(--bg2); color: var(--text); font-size: var(--fs-meta-sm);
+  }
+  #task-console-hold[hidden] { display: none; }
+  .tc-hold-text { font-weight: 600; }
+  .tc-hold-hint { color: var(--muted); margin-top: 2px; }
+  /* Wider screens: the console ends above the composer's open task row, so
+     the row's chip, clock and Stop stay in view (task-console.mjs sets the
+     bottom). Phones keep the full-screen console. */
+  #task-console-modal.tc-above-panel .task-console-dialog { height: 100%; }
   #task-console-scroll {
     flex: 1; overflow: auto; overscroll-behavior: contain; padding: 8px 14px 28px;
     background: var(--bg);
@@ -3496,6 +3525,9 @@
   .tc-bg-13 { background: var(--tc-ansi-13); }
   .tc-bg-14 { background: var(--tc-ansi-14); }
   .tc-bg-15 { background: var(--tc-ansi-15); }
+  /* Inverse text (SGR 7) with a side left unset: the console's own colours, swapped. */
+  .tc-fg-inverse { color: var(--bg); }
+  .tc-bg-inverse { background: var(--text); }
   #task-console-status { color: var(--muted); padding: 10px 0; font-size: var(--fs-meta-sm); }
   #task-console-status[hidden] { display: none; }
   #task-console-jump {
@@ -3712,6 +3744,8 @@
   .relay-event-time { flex: 0 0 auto; }
   .relay-event-lines { margin: 2px 0 4px; padding-left: 18px; }
   .relay-event-line { margin: 2px 0; overflow-wrap: anywhere; white-space: pre-wrap; }
+  /* The relay's note to carry on after a restart (relay-restart-note-view.mjs). */
+  .relay-restart-note-text { padding-left: 0; overflow-wrap: anywhere; white-space: pre-wrap; }
   .relay-event-line.relay-event-question-asked,
   .relay-event-line.relay-event-error,
   .relay-event-line.relay-event-task-failed,
@@ -7229,6 +7263,30 @@
           >
         </div>
         <div class="settings-help" style="margin-top: 6px;">A shell or Monitor task that has written no output for this long gets an amber "no output for N min" note in the composer panel and its console.</div>
+        <div class="settings-row" style="margin-top: 12px; margin-bottom: 0;">
+          <label for="restart-resume-toggle">After a relay restart, tell interrupted sessions to carry on</label>
+          <input
+            id="restart-resume-toggle"
+            type="checkbox"
+            onchange="updateRestartResumeSettingFromToggle(this.checked)"
+            aria-label="After a relay restart, tell interrupted sessions to carry on"
+          >
+        </div>
+        <div class="settings-help" style="margin-top: 6px;">Most turns a restart interrupts run again by themselves. A turn that cannot (the agent had already taken the message, or had started on its own after a background task) just stops. With this on, such a session gets one relay note once the relay is back, saying when it restarted and asking the agent to check what it was doing and carry on. Your message is never sent again; idle, archived and usage-limit-paused sessions get nothing. Off by default; a setting of this relay.</div>
+        <div class="settings-row" style="margin-top: 12px; margin-bottom: 0;">
+          <label for="relay-restart-max-wait-select">Ask after a queued relay restart has waited</label>
+          <select id="relay-restart-max-wait-select" onchange="updateRelayRestartMaxWaitSetting(this.value)" aria-label="Ask after a queued relay restart has waited">
+            <option value="5">5 min</option>
+            <option value="10">10 min</option>
+            <option value="15">15 min</option>
+            <option value="30" selected>30 min</option>
+            <option value="60">1 h</option>
+            <option value="120">2 h</option>
+            <option value="240">4 h</option>
+            <option value="0">No limit</option>
+          </select>
+        </div>
+        <div class="settings-help" style="margin-top: 6px;">A queued relay restart waits for the running turns, and new messages wait for the restart. After this long the banner asks whether to restart now, keep waiting or cancel; it never restarts while the turns run, and still restarts as soon as they end. No limit waits until the turns end.</div>
         <div class="settings-row" style="margin-top: 12px; margin-bottom: 0;">
           <label for="subagent-record-retention-select">Keep sub-agent tool output</label>
           <select id="subagent-record-retention-select" onchange="updateSubagentRecordRetentionSetting(this.value)" aria-label="Keep sub-agent tool output">
@@ -8073,6 +8131,10 @@
             <label for="push-event-host-suspend-toggle">Host suspend fired or was dropped</label>
             <input id="push-event-host-suspend-toggle" type="checkbox" onchange="updatePushPreferencesFromControls()" checked disabled>
           </div>
+          <div class="settings-row" style="width: 100%; margin-top: 6px; margin-bottom: 0;">
+            <label for="push-event-relay-restart-toggle">Queued relay restart waited its maximum time</label>
+            <input id="push-event-relay-restart-toggle" type="checkbox" onchange="updatePushPreferencesFromControls()" checked disabled>
+          </div>
           <label style="margin-top: 10px;">Devices</label>
           <div id="push-device-list" style="width: 100%;"></div>
           <div class="settings-help">Notifications are only sent while no device has the app in the foreground. Content defaults to generic text; message previews are opt-in per device.</div>
@@ -8251,11 +8313,16 @@
         <span id="task-console-stall" class="tc-stall" hidden></span>
         <button id="task-console-chip" class="bg-task-chip" type="button" hidden></button>
         <button id="task-console-failure" type="button" hidden>first failure</button>
+        <button id="task-console-earlier-top" type="button" hidden>Load earlier</button>
       </div>
     </div>
     <div id="task-console-scroll">
       <button id="task-console-earlier" type="button" hidden>Load earlier</button>
       <pre id="task-console-body"></pre>
+      <div id="task-console-hold" role="note" hidden>
+        <div class="tc-hold-text"></div>
+        <div class="tc-hold-hint"></div>
+      </div>
       <div id="task-console-status" hidden></div>
     </div>
     <button id="task-console-jump" type="button" hidden>Jump to end ↓</button>

package/server/relay-tools.md

@@ -22,6 +22,8 @@ Note: shutdown is queued and only completes when the current turn finishes, so i
 
 Use `restart: true` in the request body when the user wants a real relay restart rather than a plain shutdown. Example request body: `{ "reason": "manual-restart", "requestedBy": "localhost-api", "restart": true }`.
 
+Never pass `immediate` in that request body: it restarts without waiting for the running turns, which only the user may decide, with Restart now in the web UI.
+
 ## Preview servers
 
 Publish a local web server or a static directory on a public preview URL so the user can open it from any device, or list/close existing previews. Use this whenever the user wants to see, try, or share something with a web UI — never ask them to open localhost or forward a port. For a dev server: call this FIRST with {action:"create", port} to get the basePath, then start the server configured to serve under that basePath (Vite --base, Next basePath, Express mount prefix); the proxy forwards X-Forwarded-Prefix but does not rewrite bodies, so root-absolute asset paths will not work. For plain files or a build output: pass {action:"create", dir} instead and the relay serves the directory itself — no dev server needed. Always tell the user the returned URL and that the link is public: anyone who has it can reach the app without logging in. Publishing the same port or directory again in this conversation returns the same link. Previews never expire and survive a relay restart (a port preview until the machine reboots); close them with {action:"close"} when the user is done.
@@ -39,9 +41,12 @@ This relay itself is listed with "self": true when its owner switched agent sess
 - `create_session` starts a session with any provider that `relay_info` lists: a local one in a folder ("cwd"), or provider "claude-cloud" with "repo" (a GitHub URL or owner/repo) and an optional "branch". At most 4 sessions you started may work at the same time; a fifth is refused until one finishes.
 - The first `create_session` on this relay shows the user an approval card, once per conversation. A session that an agent created cannot create sessions itself (one level only).
 - Sessions you start here are grouped under this session in the user's sidebar. `list_sessions` lists in the sidebar's order (a group sorts by its newest session, head first) and shows the group as a "group" field (id, name, role); `read_session` adds the group's live members with their state. Agents only read groups, the user arranges them.
+- A "model" for `create_session` or `send` must be an id `relay_info` lists for the provider (Claude also takes "opus", "sonnet", "haiku"). An unknown id is refused with the close matches ("unknown model 'gpt-5-4' for Copilot; did you mean 'gpt-5.4'?") and nothing is created or sent: pick from the list instead of guessing. If the answer has a "modelNote" saying the model could not be checked, the relay had no model list yet.
 - A new session knows nothing of this conversation: write a self-contained prompt. A Claude Cloud session works on a fresh clone in a sandbox at Anthropic, so name the branch it should work on and push.
 - Follow each session with `wait` (the message id comes back from `create_session` and `send`) and `read_session`; "wait_seconds" is limited to the maximum set on the relay (default 600).
 - Sessions run on the relay owner's accounts and cost their usage: start only what the task needs.
 - `read_task_output` ("session", "task_id" from `read_session`'s tasks, optional "lines") reads the end of a background shell or Monitor task's output, also for an hour after it ended: the last lines, minutes since its last output, and pass/fail counts for a test run. Credentials are scrubbed out.
 
+On this relay and on a paired one, `subscribe` wakes you when something happens in the sessions you watch, instead of polling them. Leave "events" out unless you need more: the default (question_asked, error, turn_end, subagent_finished, task_failed, stalled, all_idle) wakes you for questions, errors, replies, finished sub-agents, failed tasks (a non-zero exit included), stalls and all_idle, but not for each shell command that ended well. To get those too, pass that list plus "task_finished" (and "task_started" for the starts); each one costs you a turn, so do it only if you must follow every command.
+
 Write actions may first wait for the user's approval. If a result lists `pendingQuestions`, the other agent is waiting for an answer: ask the user (unless they told you to decide), then pass it on with `answer_question`. Always tell the user which relay and session you worked on.

package/server/repositories/message-repository.mjs

@@ -37,6 +37,9 @@ export function createMessageRepository(db) {
         listPinnedMessages: messagePins.listPinnedMessages,
         countPinnedMessages: messagePins.countPinnedMessages,
         getLatestConversationModel: db.prepare(`SELECT model FROM messages WHERE conversation_id = ? AND model IS NOT NULL AND model != '' ORDER BY timestamp DESC LIMIT 1`),
+        // The model of the conversation's latest user turn: one of the
+        // fallbacks for a send that names no model.
+        getLatestUserMessageModel: db.prepare(`SELECT model FROM messages WHERE conversation_id = ? AND role = 'user' AND model IS NOT NULL AND model != '' ORDER BY timestamp DESC LIMIT 1`),
         getRecentMessagesDesc: db.prepare(`SELECT id, role, text, timestamp FROM messages WHERE conversation_id = ? ORDER BY timestamp DESC LIMIT ?`),
         insertMsg:      db.prepare(`INSERT INTO messages (id, conversation_id, role, text, model, mode, attachments, timestamp, model_requested, model_actual, model_origin) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`),
         // Provenance is derived from the authenticated responder identity at

package/server/repositories/remote-relay-repository.mjs

@@ -27,7 +27,9 @@ function parseOrigin(json) {
 
 export function createRemoteRelayRepository(db) {
   const hasUnlock = db.prepare(`SELECT 1 FROM conversation_remote_relay_unlocks WHERE conversation_id = ? AND remote_relay_id = ?`);
-  const listUnlocks = db.prepare(`SELECT remote_relay_id, message_id, created_at FROM conversation_remote_relay_unlocks WHERE conversation_id = ? ORDER BY created_at ASC`);
+  // Two unlocks can share a millisecond (Windows' clock is coarse); the rowid
+  // keeps them in the order they were recorded rather than by relay id.
+  const listUnlocks = db.prepare(`SELECT remote_relay_id, message_id, created_at FROM conversation_remote_relay_unlocks WHERE conversation_id = ? ORDER BY created_at ASC, rowid ASC`);
   const insertUnlock = db.prepare(`INSERT OR IGNORE INTO conversation_remote_relay_unlocks (conversation_id, remote_relay_id, message_id, created_at) VALUES (?, ?, ?, ?)`);
   // The relay's unlocks and the approvals stored under its id (`<id>:watch`).
   const deleteUnlocksForRelay = db.prepare(`
@@ -64,7 +66,7 @@ export function createRemoteRelayRepository(db) {
     hasUnlock(conversationId, remoteRelayId) {
       return !!hasUnlock.get(String(conversationId || ''), String(remoteRelayId || ''));
     },
-    /** `[{ remoteRelayId, messageId, createdAt }]`, oldest first. */
+    /** `[{ remoteRelayId, messageId, createdAt }]`, oldest first, ties in the order recorded. */
     listUnlocks(conversationId) {
       return listUnlocks.all(String(conversationId || '')).map((row) => ({
         remoteRelayId: row.remote_relay_id,

package/server/routes/messages-routes.mjs

@@ -16,6 +16,7 @@ import {
 import {
   persistConversationModelPreference as persistConversationModelPreferenceTx,
 } from '../services/conversation-preferences-service.mjs';
+import { fallbackReasoningEffort, inheritedConversationModel } from '../services/conversation-model-fallback.mjs';
 import { killTmuxSession } from '../services/session-worker-launch-service.mjs';
 import { normalizeWorkerSteeringSnapshot } from '../services/session-worker-registry-service.mjs';
 import {
@@ -45,6 +46,8 @@ import { normalizeBackgroundTaskDigest } from '../../shared/worker-runtime/backg
 import {
   DEFAULT_TASK_STALL_MINUTES,
   TASK_OUTPUT_LIMITS,
+  cleanTaskText,
+  normalizeTaskCommand,
   normalizeTaskOutputKind,
   normalizeTaskOutputPath,
 } from '../../shared/task-output-text.mjs';
@@ -68,6 +71,7 @@ import { createStaleAttemptLogLimiter } from '../services/stale-attempt-log-limi
 import { createSubagentTimelinePublisher } from '../services/subagent-viewer-rooms.mjs';
 import { createLocalRequestCheck } from '../services/request-boundary.mjs';
 import { buildClaudeCloudDelivery, isClaudeCloudProviderType } from '../services/claude-cloud-session-service.mjs';
+import { TASK_OUTPUT_NONE_MESSAGES } from '../public/app/task-console-render.mjs';
 import {
   admitRemoteRelayRequest,
   readRemoteRelayRequest,
@@ -244,9 +248,17 @@ function findRecentDuplicateUserMessage({
   const exempt = new Set((Array.isArray(exemptMessageIds) ? exemptMessageIds : [])
     .map((id) => String(id || '').trim()).filter(Boolean));
   const isExempt = (row) => exempt.has(String(row?.id || '').trim());
+  // A message whose turn failed never ran, so sending it again is a retry,
+  // not a double submit. Only failed rows: a cancelled or finished turn stays
+  // a duplicate, as before.
+  const failedTurnIds = new Set((Array.isArray(recentQueueRows) ? recentQueueRows : [])
+    .filter((row) => String(row?.status || '').trim().toLowerCase() === 'failed')
+    .map((row) => String(row?.id || '').trim())
+    .filter(Boolean));
 
   for (const row of Array.isArray(recentUserMessages) ? recentUserMessages : []) {
     if (isExempt(row)) continue;
+    if (failedTurnIds.has(String(row?.id || '').trim())) continue;
     const rowText = normalizeDuplicateMessageText(row?.text || '');
     if (!rowText || rowText !== fingerprint) continue;
     const rowTime = Date.parse(row?.timestamp || '');
@@ -1792,6 +1804,9 @@ export function registerMessagesRoutes(app, deps) {
     taskOutputSnapshots = null,
     // Has the health poller read soon (a task with a console ended).
     pokeTaskHealth = null,
+    // What a recovery did with a turn that was running when the relay
+    // started (services/restart-resume-service.mjs noteOutcome).
+    noteRestartTurnOutcome = () => {},
     getTaskStallMinutes = () => DEFAULT_TASK_STALL_MINUTES,
     sendWorkerControl,
     ensureSessionId,
@@ -2727,10 +2742,12 @@ export function registerMessagesRoutes(app, deps) {
         // quietly.
         stmts.dropStaleContinuation?.run?.(row.id);
         io.emit('message_status', { messageId: row.id, conversationId: row.conversation_id, status: 'failed' });
+        noteRestartTurnOutcome(row, 'cut');
         continue;
       }
       if (row.consumed_at) {
         failConsumedQueueRow(row, { reason });
+        noteRestartTurnOutcome(row, 'cut');
         continue;
       }
       const relayActivityRows = stmts.listActivityByQueueMessage?.all?.(row.id);
@@ -2767,6 +2784,7 @@ export function registerMessagesRoutes(app, deps) {
         error: reason,
       });
       io.emit('message_status', { messageId: row.id, conversationId: row.conversation_id, status: 'pending' });
+      noteRestartTurnOutcome(row, 'requeued');
     }
     for (const row of rowsToFail) {
       const failureRecord = buildHeartbeatIdleReplayFailure({
@@ -2792,6 +2810,8 @@ export function registerMessagesRoutes(app, deps) {
           ok: false,
           error: failureRecord.code,
         });
+        // Started, so not replayed: a turn the agent never heard the end of.
+        noteRestartTurnOutcome(row, 'cut');
       }
     }
     if (rowsToRecover.length || rowsToFail.length) {
@@ -4429,7 +4449,17 @@ export function registerMessagesRoutes(app, deps) {
     const requesterSessionId = normalizeSessionWorkerId(requesterIdentity?.sessionId);
     const sessionWorkerRoutingEnabled = isSessionWorkerRoutingEnabled(featureFlags);
     let conversationSdkSessionId = null;
-    const requestedRelayMode = normalizeRelayMode(relayMode || mode);
+    // The conversation's saved choices, for a send that leaves one out: a
+    // send to an existing conversation that names no mode runs in the mode
+    // the conversation is in, not the relay default.
+    const existingConversation = (!newConversation && conversationId)
+      ? (stmts.getConvAnyStatus?.get?.(conversationId) || null)
+      : null;
+    const explicitRelayModeGiven = !!String(relayMode || mode || '').trim();
+    const savedRelayMode = !explicitRelayModeGiven && existingConversation?.preferred_relay_mode
+      ? normalizeRelayMode(existingConversation.preferred_relay_mode)
+      : null;
+    const requestedRelayMode = savedRelayMode || normalizeRelayMode(relayMode || mode);
     const trimmedText = stripRelayPromptContext(text, requestedRelayMode || relayMode || mode);
     const normalizedAttachments = normalizeAttachments(rawAttachments);
     const requestedAttachmentCount = Math.min(
@@ -4786,6 +4816,34 @@ export function registerMessagesRoutes(app, deps) {
     // sends set_model before the message), so a changed model is taken as
     // for a local Claude chat.
     const claudeCloudModel = claudeCloudModelSelection ? claudeCloudModelSelection.model : '';
+    // What the request itself chose. Only these are saved as the
+    // conversation's preference; a value filled in below never is.
+    const explicitModelGiven = !!requestedOpenAIModel;
+    const conversationReasoningEffort = String(existingConversation?.preferred_reasoning_effort || '').trim().toLowerCase();
+    // A Copilot conversation sent no model keeps its own: the saved
+    // preference, the runtime session's model, the latest user message's,
+    // and the catalog default only when it has none of these. A model the
+    // catalog no longer lists is refused rather than swapped for another.
+    const usesGitHubCatalog = !useOpenAIProvider && !runtimeBoundToExplicitProvider;
+    const inheritedModel = usesGitHubCatalog && !shouldCreateConversation && !explicitModelGiven
+      ? inheritedConversationModel({
+          conversation: existingConversation,
+          runtimeSession: existingRuntimeSession,
+          latestUserMessageModel: stmts.getLatestUserMessageModel?.get?.(conversationId)?.model || '',
+        })
+      : null;
+    const githubModelResolution = usesGitHubCatalog
+      ? resolveRequestedModel(inheritedModel ? inheritedModel.model : model)
+      : null;
+    if (inheritedModel && !githubModelResolution?.ok) {
+      return res.status(409).json({
+        error: `This conversation's model "${inheritedModel.model}" is no longer available. Choose a model and send again.`,
+        code: 'CONVERSATION_MODEL_UNAVAILABLE',
+        conversationId,
+        model: inheritedModel.model,
+        supportedModels: githubModelResolution?.available || [],
+      });
+    }
     const modelResolution = useOpenAIProvider
       ? {
           ok: !!openAIModel,
@@ -4826,7 +4884,7 @@ export function registerMessagesRoutes(app, deps) {
                   reasoningEffort: null,
                   error: claudeCloudModel ? null : 'Claude Cloud model is not configured',
                 }
-              : resolveRequestedModel(model)))));
+              : githubModelResolution))));
     if (!modelResolution.ok) return res.status(400).json({ error: modelResolution.error, supportedModels: modelResolution.available || [] });
     const requestedModel = String(modelResolution.model || '').trim();
     const requestedAutoModel = requestedModel.toLowerCase() === AUTO_MODEL_SENTINEL;
@@ -4851,6 +4909,15 @@ export function registerMessagesRoutes(app, deps) {
         code: 'IMAGE_TARGET_REQUIRES_IMAGE_MODEL',
       });
     }
+    // A send that names no effort runs with the conversation's own, clamped
+    // to the nearest level the model has. Null when there is nothing to keep
+    // or it neither matches nor clamps (an ultracode on a model without it):
+    // the provider's own default applies then.
+    const conversationEffortFor = (supported) => (
+      !explicitReasoningEffort && conversationReasoningEffort
+        ? (fallbackReasoningEffort([conversationReasoningEffort], supported, { fallback: '' }) || null)
+        : null
+    );
     // Claude conversations validate effort against the Claude provider's
     // per-model levels ('none' = SDK default). Effort is per-turn: each Claude
     // turn is a fresh query(), so it can change between messages.
@@ -4859,6 +4926,8 @@ export function registerMessagesRoutes(app, deps) {
       const supported = Array.isArray(configuredClaude?.effortsByModel?.[String(requestedModel || '').trim().toLowerCase()])
         ? configuredClaude.effortsByModel[String(requestedModel || '').trim().toLowerCase()]
         : [...DEFAULT_CLAUDE_REASONING_EFFORTS];
+      const kept = conversationEffortFor(supported);
+      if (kept) return { ok: true, effort: kept, supported };
       const effort = supported.includes(requestedEffort) ? requestedEffort : 'none';
       return { ok: true, effort: effort === 'none' ? 'none' : effort, supported };
     };
@@ -4874,8 +4943,11 @@ export function registerMessagesRoutes(app, deps) {
         // the worker validates it against the resolved model's live params
         // and falls back to the model default on any mismatch. Clamping to
         // 'none' here would actively disable thinking on the resolved model.
-        return { ok: true, effort: requestedEffort, supported: [] };
+        // The conversation's own effort goes through the same way.
+        return { ok: true, effort: requestedEffort || conversationReasoningEffort, supported: [] };
       }
+      const kept = conversationEffortFor(discovered);
+      if (kept) return { ok: true, effort: kept, supported: discovered };
       const effort = discovered.includes(requestedEffort) ? requestedEffort : 'none';
       return { ok: true, effort, supported: discovered };
     };
@@ -4884,11 +4956,16 @@ export function registerMessagesRoutes(app, deps) {
       const supported = Array.isArray(configuredGrok?.effortsByModel?.[String(requestedModel || '').trim().toLowerCase()])
         ? configuredGrok.effortsByModel[String(requestedModel || '').trim().toLowerCase()]
         : ['none', 'low', 'medium', 'high'];
+      const kept = conversationEffortFor(supported);
+      if (kept) return { ok: true, effort: kept, supported };
       const effort = supported.includes(requestedEffort) ? requestedEffort : 'none';
       return { ok: true, effort, supported };
     };
     let reasoningResolution = useOpenAIProvider
-      ? resolveOpenAIReasoningEffort(explicitReasoningEffort, openAIModel)
+      ? resolveOpenAIReasoningEffort(
+          explicitReasoningEffort || conversationEffortFor(openAIReasoningEffortsForModel(openAIModel)) || '',
+          openAIModel,
+        )
       : (runtimeUsesClaude
         ? resolveClaudeReasoningEffort()
         : (runtimeUsesCursor
@@ -4902,15 +4979,21 @@ export function registerMessagesRoutes(app, deps) {
                   requestedModel,
                   explicitReasoningEffort || modelResolution.reasoningEffort || null,
                 )))));
+    // No effort sent (or the model's variant carried one it lacks): the
+    // conversation's own effort, clamped to the model's levels, else its
+    // lowest level that is not 'none'. Some models list 'none' and the API
+    // still refuses it, so it is taken only when the conversation chose it or
+    // the model has nothing else.
     if (!reasoningResolution?.ok && !explicitReasoningEffort) {
       const supportedEfforts = Array.isArray(reasoningResolution?.supported)
         ? reasoningResolution.supported.map((value) => String(value || '').trim().toLowerCase()).filter(Boolean)
         : [];
-      const fallbackReasoningEffort = supportedEfforts.includes('none')
-        ? 'none'
-        : (supportedEfforts[0] || null);
-      if (fallbackReasoningEffort) {
-        reasoningResolution = resolveRequestedReasoningEffort(requestedModel, fallbackReasoningEffort);
+      const fallbackEffort = fallbackReasoningEffort(
+        [modelResolution.reasoningEffort, conversationReasoningEffort],
+        supportedEfforts,
+      );
+      if (fallbackEffort) {
+        reasoningResolution = resolveRequestedReasoningEffort(requestedModel, fallbackEffort);
       }
     }
     if (!reasoningResolution?.ok) {
@@ -4920,6 +5003,9 @@ export function registerMessagesRoutes(app, deps) {
       });
     }
     const requestedReasoningEffort = reasoningResolution.effort || null;
+    // The request's own effort: sent as such, or carried by the variant id of
+    // a model it named.
+    const explicitEffortGiven = !!explicitReasoningEffort || (explicitModelGiven && !!modelResolution.reasoningEffort);
     let normalizedContextTier = requestedContextTier;
     if (openAIImageModel) {
       normalizedContextTier = normalizeOpenAIImageSize(requestedContextTier) || 'auto';
@@ -4964,6 +5050,7 @@ export function registerMessagesRoutes(app, deps) {
       return res.json({
         ok: true,
         duplicate: true,
+        queued: false,
         alreadyResent: true,
         duplicateOfMessageId: resend.alreadyResentAs,
         conversationId,
@@ -4994,6 +5081,8 @@ export function registerMessagesRoutes(app, deps) {
         return res.json({
           ok: true,
           duplicate: true,
+          // Said outright for a caller that reads only `ok`: nothing new runs.
+          queued: false,
           duplicateWindowMs: DUPLICATE_USER_MESSAGE_WINDOW_MS,
           duplicateSource: duplicateMessage.source,
           duplicateOfMessageId: duplicateMessage.messageId,
@@ -5175,15 +5264,25 @@ export function registerMessagesRoutes(app, deps) {
       }
       // Another relay's agent picks the model and mode of its own turn; the
       // composer keeps restoring the user's choice for this conversation.
-      conversationPreferences = remoteRequest.remote && !shouldCreateConversation
-        ? readConversationModelPreference(convId, requestedRelayMode)
-        : persistConversationModelPreference(
+      // Any other send to an existing conversation saves only what it named:
+      // a model or an effort filled in from a fallback is never written back
+      // as the conversation's choice (an empty effort keeps the stored one).
+      const savedModel = String(existingConversation?.preferred_model || '').trim();
+      if (shouldCreateConversation) {
+        conversationPreferences = persistConversationModelPreference(
+          convId, requestedRelayMode, requestedModel, requestedReasoningEffort, now,
+        );
+      } else if (remoteRequest.remote || (!explicitModelGiven && !(explicitEffortGiven && savedModel))) {
+        conversationPreferences = readConversationModelPreference(convId, requestedRelayMode);
+      } else {
+        conversationPreferences = persistConversationModelPreference(
           convId,
           requestedRelayMode,
-          requestedModel,
-          requestedReasoningEffort,
+          explicitModelGiven ? requestedModel : savedModel,
+          explicitEffortGiven ? requestedReasoningEffort : '',
           now,
         );
+      }
       stmts.insertQ.run(
         msgId,
         convId,
@@ -5527,6 +5626,9 @@ export function registerMessagesRoutes(app, deps) {
         const leaseExpiresAt = addMsToIso(now, SESSION_WORKER_OWNER_LEASE_MS);
         for (const id of activeQueueMessageIds) {
           refreshProcessingLeaseForOwnedMessage.run(leaseExpiresAt, now, id, requesterSessionId);
+          // The worker has the turn: if it was running when the relay
+          // started, the restart did not cut it off.
+          noteRestartTurnOutcome({ id }, 'claimed');
         }
         recoverOwnedProcessingRowsForSession(requesterSessionId, {
           excludeMessageIds: activeQueueMessageIds,
@@ -6570,7 +6672,17 @@ export function registerMessagesRoutes(app, deps) {
       || rawRestart === 1
       || String(rawRestart || '').trim().toLowerCase() === 'true'
       || String(rawRestart || '').trim() === '1';
-    const result = requestRelayShutdown({ reason, requestedBy, restart });
+    // `immediate` starts it now, without waiting for the running turns (the
+    // banner's "Restart now"); the answer names what it did not wait for.
+    const rawImmediate = req.body?.immediate;
+    const immediate = rawImmediate === true
+      || rawImmediate === 1
+      || String(rawImmediate || '').trim().toLowerCase() === 'true'
+      || String(rawImmediate || '').trim() === '1';
+    // The banner's "Restart now" names the queued request it saw (see
+    // services/relay-restart-queue.mjs); a stale one is refused.
+    const expectRequestedAt = String(req.body?.expectRequestedAt || '').trim().slice(0, 40) || null;
+    const result = requestRelayShutdown({ reason, requestedBy, restart, immediate, expectRequestedAt });
     return res.json({ ok: true, ...result });
   });
 
@@ -7694,7 +7806,8 @@ export function registerMessagesRoutes(app, deps) {
     // Only a number the worker sent: a missing or null exit code stays null
     // (Number(null) would read as a clean exit).
     const exitCode = wholeNumber(req.body?.exitCode);
-    const settledDescription = String(req.body?.description || '').trim().slice(0, 500);
+    // Scrubbed like the output: a description can be the command line.
+    const settledDescription = cleanTaskText(String(req.body?.description || ''), 500);
     // The store is keyed as the worker posts. A task with a console stays
     // viewable as an ended row; one that ended while this runtime was away
     // becomes one when the post names its output.
@@ -7706,6 +7819,7 @@ export function registerMessagesRoutes(app, deps) {
       outputPath: settledOutputPath || undefined,
       outputKind: settledOutputPath ? normalizeTaskOutputKind(req.body?.outputKind, settledOutputPath) : undefined,
       description: settledDescription,
+      command: normalizeTaskCommand(req.body?.command) || undefined,
       taskType: String(req.body?.taskType || '').trim().slice(0, 80),
       startedAt: Number(req.body?.startedAt) || null,
     }) || null;
@@ -7717,7 +7831,7 @@ export function registerMessagesRoutes(app, deps) {
       taskId,
       toolUseId: sanitizeSubagentRunId(req.body?.toolUseId) || null,
       status: String(req.body?.status || '').trim().slice(0, 40) || 'completed',
-      summary: String(req.body?.summary || '').trim().slice(0, 500) || null,
+      summary: cleanTaskText(String(req.body?.summary || ''), 500) || null,
       exitCode: exitCode ?? null,
       // What the task was, from a worker that sends it: the end of a task
       // this runtime never knew (it ended while the relay was away) is
@@ -7747,11 +7861,18 @@ export function registerMessagesRoutes(app, deps) {
       .map((task) => ({
         taskId: String(task?.taskId || '').trim(),
         taskType: String(task?.taskType || '').trim(),
-        description: String(task?.description || '').trim().slice(0, 500),
+        // Scrubbed like the output before anything keeps or sends them: a
+        // description can be the command line (Grok's terminals, a Copilot
+        // shell without one), a summary or tool call can quote one.
+        description: cleanTaskText(String(task?.description || ''), 500),
+        // A shell task's command line, where the worker knows it: scrubbed
+        // like the output and cut at 2,000 characters before it is kept, so
+        // every reader (the pages, read_session, the stored row) gets it so.
+        command: normalizeTaskCommand(task?.command) || undefined,
         startedAt: Number(task?.startedAt) || null,
-        summary: String(task?.summary || '').trim().slice(0, 500) || null,
+        summary: cleanTaskText(String(task?.summary || ''), 500) || null,
         lastToolName: String(task?.lastToolName || '').trim() || null,
-        lastToolCall: String(task?.lastToolCall || '').replace(/\s+/g, ' ').trim().slice(0, 300) || null,
+        lastToolCall: cleanTaskText(String(task?.lastToolCall || '').replace(/\s+/g, ' '), 300) || null,
         totalTokens: Number.isFinite(Number(task?.totalTokens)) ? Number(task.totalTokens) : null,
         subagentType: String(task?.subagentType || '').trim().slice(0, 120) || null,
         model: String(task?.model || '').trim().slice(0, 120) || null,
@@ -7870,9 +7991,11 @@ export function registerMessagesRoutes(app, deps) {
   // or a snapshot). A task of theirs without one comes from a worker that
   // started before the console existed.
   const TASK_OUTPUT_PROVIDERS = new Set(['claude', 'github', 'copilot', 'grok']);
-  const SUBAGENT_OUTPUT_MESSAGE = 'Sub-agents have no shell output; open the sub-agent view.';
+  const SUBAGENT_OUTPUT_MESSAGE = TASK_OUTPUT_NONE_MESSAGES.subagent;
 
-  // Why a task has no output to show, for the console's `none` answer.
+  // Why a task has no output to show, for the console's `none` answer. The
+  // texts are the page's own (task-console-render.mjs), so the row's hover
+  // title and the console say the same.
   function noOutputMessage(conversationId, task) {
     if (taskKindOf(task?.taskType) === 'subagent') return SUBAGENT_OUTPUT_MESSAGE;
     let provider = '';
@@ -7880,9 +8003,9 @@ export function registerMessagesRoutes(app, deps) {
       provider = String(stmts.getRuntimeSessionByConversation?.get?.(conversationId)?.provider_type || '').trim().toLowerCase();
     } catch {}
     if (!provider || TASK_OUTPUT_PROVIDERS.has(provider)) {
-      return 'This session did not report an output file for this task. Sessions started before the task console need a restart to show output.';
+      return TASK_OUTPUT_NONE_MESSAGES.noOutputFile;
     }
-    return 'Output is not available for this provider.';
+    return TASK_OUTPUT_NONE_MESSAGES.provider;
   }
 
   // A task the session's task list shows that the task store does not hold:
@@ -7949,13 +8072,17 @@ export function registerMessagesRoutes(app, deps) {
       });
     }
     const { task, ended, key } = found;
+    // Held since a relay restart: its worker has not said yet whether it
+    // still runs, so it is neither running nor stoppable.
+    const held = !ended && found.restored === true;
     const { kind, path } = taskOutputSource(task);
     const head = {
       ok: true,
       taskId,
       kind,
       ended,
-      status: ended ? task.status : 'running',
+      status: ended ? task.status : (held ? 'held' : 'running'),
+      ...(held ? { held: true } : {}),
       exitCode: ended ? (task.exitCode ?? null) : null,
       health: task.health || null,
       taskStallMinutes: taskStallMinutes(),
@@ -7963,9 +8090,10 @@ export function registerMessagesRoutes(app, deps) {
         taskId,
         taskType: task.taskType || null,
         description: task.description || '',
+        ...(task.command ? { command: task.command } : {}),
         startedAt: task.startedAt || null,
         endedAt: task.endedAt || null,
-        stoppable: !ended && task.stoppable !== false,
+        stoppable: !ended && !held && task.stoppable !== false,
       },
     };
     if (kind === 'none') {
@@ -7982,7 +8110,7 @@ export function registerMessagesRoutes(app, deps) {
       if (!cached) return res.json({ ...head, pending: true, text: '', lines: [], startOffset: 0, endOffset: 0, size: 0, mtime: null, hasMoreBefore: false });
       return res.json({ ...head, ...shapeSnapshot(cached) });
     }
-    if (!path) return res.json({ ...head, kind: 'none', message: 'Output is not available for this task.' });
+    if (!path) return res.json({ ...head, kind: 'none', message: TASK_OUTPUT_NONE_MESSAGES.noPath });
     const lines = req.query?.lines;
     const before = req.query?.before;
     const read = before !== undefined && before !== ''