@oar-sh/oar 0.9.25 → 0.9.26

package/server/public/index.html

@@ -211,18 +211,17 @@
 <title>OAR — Open Agent Relay</title>
 <script>document.write('<scr'+'ipt src="'+__APP_BASE+'/socket.io/socket.io.js"><\/scr'+'ipt>');</script>
 <script src="https://cdn.jsdelivr.net/npm/marked@15.0.12/marked.min.js"></script>
-<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/katex@0.16.22/dist/katex.min.css">
-<script src="https://cdn.jsdelivr.net/npm/katex@0.16.22/dist/katex.min.js"></script>
-<script src="https://cdn.jsdelivr.net/npm/katex@0.16.22/dist/contrib/mhchem.min.js"></script>
-<script src="https://cdn.jsdelivr.net/npm/katex@0.16.22/dist/contrib/auto-render.min.js"></script>
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/katex@0.19.1/dist/katex.min.css" integrity="sha384-WwGtaC6ywCHxA5cstpj/3+xIZvTez8dq2IcBQaXRkenHZ7FVVq1ZROtURwfbtTlG" crossorigin="anonymous">
+<script src="https://cdn.jsdelivr.net/npm/katex@0.19.1/dist/katex.min.js" integrity="sha384-a1WQdjRj162i159OYq041X6I4K8NenkrI09LlPmiHg0YOb7CR+wJOraXwK9abpnE" crossorigin="anonymous"></script>
+<script src="https://cdn.jsdelivr.net/npm/katex@0.19.1/dist/contrib/mhchem.min.js" integrity="sha384-fB8BH//9nBzROkMUsu/Dr35jWHIbnKesUo9rW0hfEgw8mZGnkAyBAjKX9F98OVuo" crossorigin="anonymous"></script>
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.9.0/styles/github-dark.min.css">
 <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.9.0/highlight.min.js"></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.9.0/languages/nginx.min.js"></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.9.0/languages/powershell.min.js"></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.9.0/languages/x86asm.min.js"></script>
-<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/xterm@5.5.0/css/xterm.min.css">
-<script src="https://cdn.jsdelivr.net/npm/xterm@5.5.0/lib/xterm.min.js"></script>
-<script src="https://cdn.jsdelivr.net/npm/xterm-addon-fit@0.10.0/lib/xterm-addon-fit.min.js"></script>
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@xterm/xterm@5.5.0/css/xterm.css" integrity="sha384-8Xk9wy/gzEDUKrXtrmCFa2bBuK3BpjpDuL/p0SeKQX19Khl/M+lHOgD/CyYf7efP" crossorigin="anonymous">
+<script src="https://cdn.jsdelivr.net/npm/@xterm/xterm@5.5.0/lib/xterm.js" integrity="sha384-M169f14mRZOXm3hD/v2Ti0ThIT/RnAQagXA9nlE15yHAtrW19gdePJh/HaTzUOe/" crossorigin="anonymous"></script>
+<script src="https://cdn.jsdelivr.net/npm/@xterm/addon-fit@0.10.0/lib/addon-fit.js" integrity="sha384-iF+jqbuti4XlB64clWgFWYEscb+UnSRv3VgVikGYZu+otNFnSHr7y7NcKfBnGizn" crossorigin="anonymous"></script>
 <script>
   if (window.hljs && typeof window.hljs.registerAliases === 'function') {
     window.hljs.registerAliases(['pwsh', 'ps1'], { languageName: 'powershell' });
@@ -1978,6 +1977,8 @@
   }
   .settings-section:first-child .settings-section-title { margin-top: 0; }
   .settings-section-title + .settings-row { margin-top: 0; }
+  /* Settings → Appearance: the one line saying where its settings live. */
+  #appearance-browser-note { margin-bottom: calc(8px * var(--ui-scale)); }
   /* A row inside a column block: the block's full width; the lead row (the
      provider's on/off toggle) keeps a small gap to the fields below. */
   .settings-row-full { width: 100%; }
@@ -2429,6 +2430,9 @@
      The anchor class comes from JS rather than :has() so positioning works
      everywhere the transcript renders. */
   pre.has-code-copy { position: relative; }
+  /* The button gets a strip of its own above the first line, so a long line
+     never runs under it. */
+  pre.has-code-copy > code { padding-top: calc(0.72rem + 12px * var(--ui-scale) + 4px); }
   .code-copy-btn {
     position: absolute;
     top: calc(4px * var(--ui-scale));
@@ -2470,8 +2474,8 @@
     vertical-align: bottom;
     -webkit-overflow-scrolling: touch;
   }
-  .katex-error {
-    color: var(--danger);
+  /* A formula KaTeX could not set is shown as its source, line breaks kept. */
+  .math-source {
     white-space: pre-wrap;
   }
   .msg-bubble code:not(pre code) {
@@ -5066,8 +5070,7 @@
     background: var(--bg); color: var(--text); border: 1px solid var(--border);
     border-radius: calc(6px * var(--ui-scale)); padding: calc(2px * var(--ui-scale)) calc(4px * var(--ui-scale)); font-size: var(--fs-meta-sm);
   }
-  .remote-relays-self-name-row { display: flex; align-items: baseline; gap: calc(5px * var(--ui-scale)); flex-wrap: wrap; }
-  .remote-relays-self-name { font-family: var(--mono, monospace); color: var(--text); }
+  #settings-panel-relays #pwa-app-name-input,
   #remote-relays-public-url-input,
   #remote-relays-add-url-input,
   #remote-relays-add-token-input {
@@ -8844,6 +8847,16 @@
         tabindex="0"
         data-settings-tab="general"
       >General</button>
+      <button
+        id="settings-tab-appearance"
+        class="settings-tab"
+        type="button"
+        role="tab"
+        aria-selected="false"
+        aria-controls="settings-panel-appearance"
+        tabindex="-1"
+        data-settings-tab="appearance"
+      >Appearance</button>
       <button
         id="settings-tab-providers"
         class="settings-tab"
@@ -8914,68 +8927,6 @@
         aria-labelledby="settings-tab-general"
         data-settings-panel="general"
       >
-        <section class="settings-section" id="settings-section-appearance" aria-labelledby="settings-section-appearance-title">
-          <h3 class="settings-section-title" id="settings-section-appearance-title">Appearance</h3>
-          <div class="settings-row">
-            <label for="theme-select">Theme</label>
-            <select id="theme-select" onchange="updateTheme(this.value)">
-              <option value="dark">Dark</option>
-              <option value="light">Light</option>
-            </select>
-          </div>
-          <div class="settings-row" style="margin-bottom: 0;">
-            <label for="font-scale-select">Text scaling</label>
-            <select id="font-scale-select" onchange="updateFontScaleFromSelect(this.value)" aria-label="Text scaling"></select>
-          </div>
-          <div class="settings-row settings-gap">
-            <label for="thoughts-expanded-toggle">Expand thoughts while an agent works</label>
-            <input
-              id="thoughts-expanded-toggle"
-              type="checkbox"
-              onchange="updateThoughtsExpandedSetting(this.checked)"
-              aria-label="Expand thoughts while an agent works"
-              checked
-            >
-          </div>
-          <div class="settings-help settings-gap-xs">Open thoughts in the live turn, in sub-agent bubbles and in the sub-agent viewer. Saved in this browser.</div>
-          <div class="settings-row settings-row-column settings-gap">
-            <label for="live-activity-cap-slider">Tool lines shown while an agent works <span id="live-activity-cap-value">50 lines</span></label>
-            <input
-              id="live-activity-cap-slider"
-              type="range"
-              min="10"
-              max="510"
-              step="10"
-              value="50"
-              aria-label="Tool lines shown while an agent works"
-              aria-valuetext="50 lines"
-              oninput="previewLiveActivityCap(this.value)"
-              onchange="updateLiveActivityCap(this.value)"
-            >
-          </div>
-          <div class="settings-help settings-gap-xs">Per agent: the main agent and each sub-agent keep this many of their newest tool lines in the live bubble. The relay keeps up to 500 per agent. Saved in this browser.</div>
-          <div class="settings-row settings-gap">
-            <label for="stream-view-toggle">Stream view: thoughts, tool calls and the reply in order</label>
-            <input
-              id="stream-view-toggle"
-              type="checkbox"
-              onchange="updateStreamViewSetting(this.checked)"
-              aria-label="Stream view: thoughts, tool calls and the reply in order"
-            >
-          </div>
-          <div class="settings-help settings-gap-xs">Turns recorded before this version keep the grouped layout. Saved in this browser.</div>
-          <div class="settings-row settings-gap">
-            <label for="show-suspend-host-toggle">Show Suspend host action</label>
-            <input
-              id="show-suspend-host-toggle"
-              type="checkbox"
-              onchange="updateShowSuspendHostSetting(this.checked)"
-              aria-label="Show Suspend host action"
-              checked
-            >
-          </div>
-          <div class="settings-help settings-gap-xs">Shows or hides the menu action in this browser only. Suspend works only when the relay runs on Windows; a queued suspend still shows its banner here either way.</div>
-        </section>
         <section class="settings-section" id="settings-section-reading" aria-labelledby="settings-section-reading-title">
           <h3 class="settings-section-title" id="settings-section-reading-title">Reading</h3>
           <div class="settings-row settings-gap">
@@ -9090,44 +9041,8 @@
           <div id="model-refresh-providers" class="settings-gap" role="group" aria-label="Providers checked for new models"></div>
           <div class="settings-help settings-gap-xs">The relay asks each switched-on provider for its model list this often. A provider whose list was refreshed in the meantime (Refresh in Select Models, a settings save, a sign-in) waits a full interval again, and a failed check is tried again after an hour at the earliest. Whether a new model starts on is set per provider in Select Models. A setting of this relay.</div>
         </section>
-        <section class="settings-section" id="settings-section-relay" aria-labelledby="settings-section-relay-title">
-          <h3 class="settings-section-title" id="settings-section-relay-title">This relay</h3>
-          <div class="settings-row settings-row-column settings-gap">
-            <label for="pwa-app-name-input">Relay name</label>
-            <input
-              id="pwa-app-name-input"
-              type="text"
-              maxlength="60"
-              placeholder="OAR"
-              aria-label="Relay name"
-              onchange="updatePwaAppName(this.value)"
-            >
-            <div class="settings-help">Shown to other relays and used as the installed app's name. On Android, a rename reaches an already-installed app after a short delay, with one confirmation prompt showing the new name. A setting of this relay.</div>
-          </div>
-          <div class="settings-row settings-gap">
-            <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 settings-gap-xs">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 settings-gap">
-            <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 settings-gap-xs">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. A setting of this relay.</div>
+        <section class="settings-section" id="settings-section-computer" aria-labelledby="settings-section-computer-title">
+          <h3 class="settings-section-title" id="settings-section-computer-title">This computer</h3>
           <div class="settings-row settings-row-column settings-gap">
             <label for="default-session-workspace-root-input">Default CWD for new sessions</label>
             <input
@@ -9204,6 +9119,80 @@
           </div>
         </section>
       </div>
+      <div
+        id="settings-panel-appearance"
+        class="settings-panel"
+        role="tabpanel"
+        tabindex="0"
+        aria-labelledby="settings-tab-appearance"
+        data-settings-panel="appearance"
+        hidden
+      >
+        <div id="appearance-browser-note" class="settings-help">These settings are kept in this browser; other devices keep their own.</div>
+        <div class="settings-row">
+          <label for="theme-select">Theme</label>
+          <select id="theme-select" onchange="updateTheme(this.value)" aria-describedby="appearance-browser-note">
+            <option value="dark">Dark</option>
+            <option value="light">Light</option>
+          </select>
+        </div>
+        <div class="settings-row" style="margin-bottom: 0;">
+          <label for="font-scale-select">Text scaling</label>
+          <select id="font-scale-select" onchange="updateFontScaleFromSelect(this.value)" aria-label="Text scaling" aria-describedby="appearance-browser-note"></select>
+        </div>
+        <div class="settings-row settings-gap">
+          <label for="thoughts-expanded-toggle">Expand thoughts while an agent works</label>
+          <input
+            id="thoughts-expanded-toggle"
+            aria-describedby="appearance-browser-note"
+            type="checkbox"
+            onchange="updateThoughtsExpandedSetting(this.checked)"
+            aria-label="Expand thoughts while an agent works"
+            checked
+          >
+        </div>
+        <div class="settings-help settings-gap-xs">Open thoughts in the live turn, in sub-agent bubbles and in the sub-agent viewer.</div>
+        <div class="settings-row settings-row-column settings-gap">
+          <label for="live-activity-cap-slider">Tool lines shown while an agent works <span id="live-activity-cap-value">50 lines</span></label>
+          <input
+            id="live-activity-cap-slider"
+            aria-describedby="appearance-browser-note"
+            type="range"
+            min="10"
+            max="510"
+            step="10"
+            value="50"
+            aria-label="Tool lines shown while an agent works"
+            aria-valuetext="50 lines"
+            oninput="previewLiveActivityCap(this.value)"
+            onchange="updateLiveActivityCap(this.value)"
+          >
+        </div>
+        <div class="settings-help settings-gap-xs">Per agent: the main agent and each sub-agent keep this many of their newest tool lines in the live bubble. The relay keeps up to 500 per agent.</div>
+        <div class="settings-row settings-gap">
+          <label for="stream-view-toggle">Stream view: thoughts, tool calls and the reply in order</label>
+          <input
+            id="stream-view-toggle"
+            aria-describedby="appearance-browser-note"
+            type="checkbox"
+            onchange="updateStreamViewSetting(this.checked)"
+            aria-label="Stream view: thoughts, tool calls and the reply in order"
+          >
+        </div>
+        <div class="settings-help settings-gap-xs">Turns recorded before this version keep the grouped layout.</div>
+        <div class="settings-row settings-gap">
+          <label for="show-suspend-host-toggle">Show Suspend host action</label>
+          <input
+            id="show-suspend-host-toggle"
+            aria-describedby="appearance-browser-note"
+            type="checkbox"
+            onchange="updateShowSuspendHostSetting(this.checked)"
+            aria-label="Show Suspend host action"
+            checked
+          >
+        </div>
+        <div class="settings-help settings-gap-xs">Shows or hides the menu action in this browser only. Suspend works only when the relay runs on Windows; a queued suspend still shows its banner here either way.</div>
+      </div>
       <div
         id="settings-panel-providers"
         class="settings-panel"
@@ -9936,11 +9925,16 @@
         hidden
       >
         <div id="remote-relays-self-section" class="settings-row settings-row-column settings-gap">
-          <label>This relay</label>
-          <div class="remote-relays-self-name-row">
-            <span id="remote-relays-self-name" class="remote-relays-self-name">—</span>
-            <span class="settings-help">Change it under General → Relay name.</span>
-          </div>
+          <label for="pwa-app-name-input">Relay name</label>
+          <input
+            id="pwa-app-name-input"
+            type="text"
+            maxlength="60"
+            placeholder="OAR"
+            aria-label="Relay name"
+            onchange="updatePwaAppName(this.value)"
+          >
+          <div class="settings-help">Shown to other relays and used as the installed app's name. On Android, a rename reaches an already-installed app after a short delay, with one confirmation prompt showing the new name. A setting of this relay.</div>
         </div>
         <div class="settings-row settings-row-column settings-gap">
           <label for="remote-relays-public-url-input">Public address</label>
@@ -9958,6 +9952,30 @@
           <div class="settings-help">How other relays reach this one — the address you open this relay at from another device. Needed for "Also add this relay there".</div>
           <div id="remote-relays-self-status" class="settings-help settings-provider-status" role="status" aria-live="polite" hidden></div>
         </div>
+        <div class="settings-row settings-gap">
+          <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 settings-gap-xs">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 settings-gap">
+          <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 settings-gap-xs">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. A setting of this relay.</div>
         <div class="settings-row settings-gap">
           <label for="remote-relays-inbound-toggle">Accept prompts from other relays' agents</label>
           <input

package/server/routes/relay-board-routes.mjs

@@ -21,6 +21,51 @@ function normalizeBoardText(value, fallback = '') {
   return text.slice(0, 12_000);
 }
 
+// A plan is shown whole on its card: the old shared limit of 12,000 characters
+// cut a longer one in mid-sentence and left no mark. Past this size the card
+// says how much is missing.
+const BOARD_BODY_MAX_CHARS = 200_000;
+
+/**
+ * The code fence still open at the end of `text`, as the characters that
+ * close it, or ''. By the Markdown rules: a fence is three or more backticks
+ * or tildes behind at most three spaces (a backtick fence's info string holds
+ * no backtick); it is closed by a line of the same character, at least as
+ * long, with nothing but blanks behind it. Lines inside it open nothing.
+ */
+function openCodeFence(text) {
+  let open = null;
+  // A plan file read on Windows ends its lines with CRLF.
+  for (const line of text.split(/\r?\n/)) {
+    const fence = /^ {0,3}(`{3,}|~{3,})(.*)$/.exec(line);
+    if (!fence) continue;
+    const [, run, rest] = fence;
+    if (!open) {
+      if (run[0] === '`' && rest.includes('`')) continue;
+      open = { char: run[0], length: run.length };
+    } else if (run[0] === open.char && run.length >= open.length && !rest.trim()) {
+      open = null;
+    }
+  }
+  return open ? open.char.repeat(open.length) : '';
+}
+
+function normalizeBoardBody(value, context) {
+  const text = String(value || '').trim();
+  if (text.length <= BOARD_BODY_MAX_CHARS) return text;
+  const lineBreak = text.lastIndexOf('\n', BOARD_BODY_MAX_CHARS);
+  let kept = text.slice(0, lineBreak > BOARD_BODY_MAX_CHARS / 2 ? lineBreak : BOARD_BODY_MAX_CHARS);
+  // Not half a character.
+  if (/[\uD800-\uDBFF]$/.test(kept)) kept = kept.slice(0, -1);
+  kept = kept.trimEnd();
+  // A cut inside a code block would put the note into the code: close the block first.
+  const fence = openCodeFence(kept);
+  const openFence = fence ? `\n${fence}` : '';
+  const planFilePath = String(context?.planFilePath || '').trim();
+  const where = planFilePath ? `; the whole plan is in \`${planFilePath}\`` : '';
+  return `${kept}${openFence}\n\n… cut here: ${text.length - kept.length} more characters${where}.`;
+}
+
 function normalizeBoardType(value) {
   const text = String(value || '').trim().toLowerCase();
   if (!text) return 'generic';
@@ -197,7 +242,7 @@ export function registerRelayBoardRoutes(app, deps) {
       normalizedBoardType,
       relayMode,
       normalizeBoardText(title, 'Plan ready for review'),
-      normalizeBoardText(body, ''),
+      normalizeBoardBody(body, boardContext),
       normalizedActions.length ? JSON.stringify(normalizedActions) : null,
       normalizedRecommended,
       boardContext ? JSON.stringify(boardContext) : null,

package/server/routes/remote-relay-routes.mjs

@@ -44,7 +44,7 @@ export function registerRemoteRelayRoutes(app, deps) {
   app.get('/api/remote-relays', auth, (_req, res) => {
     res.json({
       relays: registry.listPublic(),
-      self: { ...registry.selfIdentity(), ...registry.getSelfSettings() },
+      self: registry.selfPayload(),
     });
   });
 

package/server/server-runtime.mjs

@@ -2401,6 +2401,8 @@ function setPwaAppName(rawValue) {
   } else {
     stmts.deleteAppSetting.run(PWA_APP_NAME_SETTING_KEY);
   }
+  // Settings open on another device show the new name (Settings › Relays).
+  try { remoteRelayRegistry.notifySelfChanged(); } catch {}
   return { ok: true, appName: normalized.value };
 }
 

package/server/services/relay-prompt-sanitizer.mjs

@@ -4,6 +4,7 @@ import fs from 'fs';
 import path from 'path';
 import { fileURLToPath } from 'url';
 
+import { renderMathInstructionBlock } from '../../shared/math-instructions.mjs';
 import { renderMediaEmbedInstructionBlock } from '../../shared/media-embed-instructions.mjs';
 
 const DEFAULT_RELAY_TOOL_GUIDANCE = [
@@ -148,6 +149,11 @@ const MEDIA_EMBED_BLOCK_PATTERN = new RegExp(
   whitespaceFlexiblePattern(renderMediaEmbedInstructionBlock()),
   'gi',
 );
+// The formula guidance (shared/math-instructions.mjs) rides right behind it.
+const MATH_BLOCK_PATTERN = new RegExp(
+  whitespaceFlexiblePattern(renderMathInstructionBlock()),
+  'gi',
+);
 
 // A steered message's hidden note (shared/steer-note.mjs) leads the prompt the
 // runtime stored, right after any mode marker. Matched by its stable opening
@@ -167,6 +173,7 @@ function stripLeadingRelayNotes(text) {
 export function stripRelayPromptContext(text, relayMode = '', attachments = []) {
   const value = stripAttachmentPromptArtifacts(text)
     .replace(MEDIA_EMBED_BLOCK_PATTERN, '')
+    .replace(MATH_BLOCK_PATTERN, '')
     .trim();
   if (!value) return '';
   const patterns = buildPromptPrefixPatterns(relayMode);

package/server/services/relay-restart-queue.mjs

@@ -8,7 +8,7 @@
  * The request waits until no turn is processing (relay-shutdown-gate.mjs);
  * while it waits, no pending row is handed to a worker. A turn that runs for
  * hours would hold every session's new messages for hours, so the wait has a
- * maximum (Settings › General). Past it the relay does not force anything:
+ * maximum (Settings › Relays). Past it the relay does not force anything:
  * the request stays queued and turns into a question — restart now, keep
  * waiting another period, or cancel — that the banner shows and a push
  * notification announces once. Only the user, or an API caller that says

package/server/services/remote-relay-dispatcher.mjs

@@ -4127,6 +4127,24 @@ export function createRemoteRelayDispatcher({
     return null;
   }
 
+  /**
+   * Is `session` on `relay` the session whose agent created this conversation
+   * (its origin, which an agent of this relay never sets for a paired one)?
+   */
+  function sendsToCreator(conversationId, relay, session) {
+    if (relay.local === true || !toText(relay.relayId) || !toText(session)) return false;
+    let origin = null;
+    try {
+      origin = repository.getConversationOrigin?.(conversationId) || null;
+    } catch {
+      return false;
+    }
+    return !!origin && origin.local !== true
+      && toText(origin.relayId) === toText(relay.relayId)
+      && !!toText(origin.conversationId)
+      && toText(origin.conversationId) === toText(session);
+  }
+
   async function runRelayAction({ conversationId, action, args, req, signal, waitNote }) {
     const target = await resolveTarget(args.relay);
     if (!target.relay) return target.failure;
@@ -4189,7 +4207,11 @@ export function createRemoteRelayDispatcher({
     const origins = Array.isArray(caller.originRelayIds) ? caller.originRelayIds.map(toText) : [];
     const answering = !!toText(relay.relayId) && origins.length > 0
       && origins.every((id) => id === toText(relay.relayId));
-    if (write && access !== 'user' && !answering && hops > REMOTE_RELAY_LIMITS.hopLimit) {
+    // A session another relay's agent created may always send to the session
+    // that created it, whatever else its turn acts on (a prompt of a session
+    // on this relay, say): its reports go back the way its work came.
+    if (write && access !== 'user' && !answering && hops > REMOTE_RELAY_LIMITS.hopLimit
+      && !(action === 'send' && sendsToCreator(conversationId, relay, args.session))) {
       return finish(failure(403, REMOTE_RELAY_ERROR_CODES.hopLimit,
         `This turn acts on a prompt from another relay's agent (hop ${hops - 1}); passing it on to relay "${relay.name}" would pass the limit of ${REMOTE_RELAY_LIMITS.hopLimit} hops. The user can allow it by mentioning @${relay.name} in this conversation.`,
         { relay: relay.name }));

package/server/services/remote-relay-registry-service.mjs

@@ -232,8 +232,10 @@ export function createRemoteRelayRegistry({
     };
   }
 
+  // For this relay's own Settings only, never for other relays: `defaultName`
+  // is the name it goes by while the relay name is empty.
   function selfPayload() {
-    return { ...selfIdentity(), ...getSelfSettings() };
+    return { ...selfIdentity(), ...getSelfSettings(), defaultName: toText(hostname) || 'OAR' };
   }
 
   function emitChange() {
@@ -622,8 +624,12 @@ export function createRemoteRelayRegistry({
     instanceId,
     selfName,
     selfIdentity,
+    selfPayload,
     getSelfSettings,
     setSelfSettings,
+    // The relay name lives outside the registry: its setter calls this so
+    // every open Settings sees the new name.
+    notifySelfChanged: emitChange,
     getAgentSessionsSettings,
     setAgentSessionsSettings,
     list,

package/server/services/session-worker-stop-service.mjs

@@ -25,13 +25,24 @@ function toPidList(rows, extraPid) {
 // read: the caller must not pretend it stopped what it could not see. The
 // registry's pid counts only while that process is alive: a worker that is
 // gone is stopped already (on Windows its stop call alone could fail).
+//
+// On POSIX the list is every process with its command line, so a live worker
+// of the session is on it as long as its argv carries the session id within
+// ps's width (procps-ng cuts `args` at 128 KiB even with -ww), and the
+// registry's pid counts only when it is: a pid that is alive but not listed
+// is no worker of this session. It is
+// the old worker's pid handed to another process (another user's, which no
+// signal reaches, or one of the relay user's own, which the stop would
+// kill), or the worker ended and its parent has not reaped it yet (a zombie
+// answers signal 0 and has no command line left).
 async function enumeratePids({ sdkSessionId, worker, processInspector, platform, isPidAliveImpl }) {
   const rows = platform === 'win32'
     ? await processInspector?.findWindowsProcessTreeForSessionAsync?.(sdkSessionId, { fresh: true })
     : await processInspector?.findProcessesForSessionAsync?.(sdkSessionId, { fresh: true });
   const listed = toPidList(rows || []);
   const workerPid = Number(worker?.pid);
-  const workerAlive = Number.isInteger(workerPid) && workerPid > 0 && (listed.includes(workerPid) || isPidAliveImpl(workerPid));
+  const workerAlive = Number.isInteger(workerPid) && workerPid > 0
+    && (listed.includes(workerPid) || (platform === 'win32' && isPidAliveImpl(workerPid)));
   return workerAlive ? toPidList(rows || [], workerPid) : listed;
 }
 
@@ -98,6 +109,36 @@ export async function stopSessionWorkerProcesses({
 
   const survivors = (list) => list.filter((pid) => isPidAliveImpl(pid));
 
+  // POSIX: a signal no process takes (ESRCH) is ignored; one it is not ours
+  // to send (EPERM: another user's process) is remembered and the others
+  // still get theirs; the re-check below decides about that pid.
+  const refused = new Map();
+  const signal = (pid, name) => {
+    try {
+      killImpl(pid, name);
+    } catch (error) {
+      const code = String(error?.code || '');
+      if (code === 'EPERM') refused.set(pid, error);
+      else if (code !== 'ESRCH') throw error;
+    }
+  };
+
+  // POSIX: a pid that outlived the stop counts only while a fresh list still
+  // shows it as the session's. The list matches command lines, so a match
+  // can be a process that was ending anyway (a shell that carried the
+  // session's arguments, another user's one included), and a process that
+  // ended but is not reaped yet (a zombie) still answers signal 0 with no
+  // command line left. A list that cannot be read changes nothing.
+  const stillListed = async (list) => {
+    if (platform === 'win32' || !list.length) return list;
+    try {
+      const fresh = await enumeratePids({ sdkSessionId: sid, worker, processInspector, platform, isPidAliveImpl });
+      return list.filter((pid) => fresh.includes(pid) && isPidAliveImpl(pid));
+    } catch {
+      return list;
+    }
+  };
+
   const waitFor = async (list, timeoutMs) => {
     const deadline = nowMs() + Math.max(0, Number(timeoutMs) || 0);
     let remaining = survivors(list);
@@ -114,13 +155,7 @@ export async function stopSessionWorkerProcesses({
       // Stop-Process -Force, so there is no gentler first pass to attempt.
       await stopWindowsPids(processInspector, pids);
     } else {
-      for (const pid of pids) {
-        try {
-          killImpl(pid, 'SIGTERM');
-        } catch (error) {
-          if (String(error?.code || '') !== 'ESRCH') throw error;
-        }
-      }
+      for (const pid of pids) signal(pid, 'SIGTERM');
       // The tmux session can outlive its child after SIGTERM.
       killTmuxSessionImpl?.(sid);
     }
@@ -140,13 +175,7 @@ export async function stopSessionWorkerProcesses({
       escalationTargets = [...new Set([...remainingPids, ...rediscovered.filter((pid) => isPidAliveImpl(pid))])];
       await stopWindowsPids(processInspector, escalationTargets);
     } else {
-      for (const pid of escalationTargets) {
-        try {
-          killImpl(pid, 'SIGKILL');
-        } catch (error) {
-          if (String(error?.code || '') !== 'ESRCH') throw error;
-        }
-      }
+      for (const pid of escalationTargets) signal(pid, 'SIGKILL');
     }
   } catch (error) {
     return done({
@@ -158,15 +187,18 @@ export async function stopSessionWorkerProcesses({
     });
   }
 
-  remainingPids = await waitFor(escalationTargets, escalationTimeoutMs);
+  remainingPids = await stillListed(await waitFor(escalationTargets, escalationTimeoutMs));
   if (remainingPids.length) {
+    // A refused signal is the reason only when every survivor refused one;
+    // a survivor that took its signals and lives on is a timeout.
+    const refusal = remainingPids.every((pid) => refused.has(pid)) ? refused.get(remainingPids[0]) : null;
     return done({
       ok: false,
       pids,
       remainingPids,
       escalated: true,
-      timedOut: true,
-      error: `worker-stop-timeout:${remainingPids.join(',')}`,
+      timedOut: !refusal,
+      error: refusal ? (refusal.message || 'Failed to stop the CLI') : `worker-stop-timeout:${remainingPids.join(',')}`,
     });
   }
   return done({ pids, escalated: true });