@oar-sh/oar 0.9.3 → 0.9.5

package/server/public/index.html

@@ -1507,6 +1507,39 @@
     padding: 4px 0;
   }
   .thinking-bubble-header:empty { display: none; margin-bottom: 0; }
+  /* Follow buttons (thinking-follow.js): 💭 thoughts, 📃 answer, 🛠️ tools.
+     Chips on the right of the header, Stop stays left; the armed one gets
+     the accent ring. */
+  .thinking-follow-group {
+    display: inline-flex;
+    align-items: center;
+    gap: 4px;
+    flex-shrink: 0;
+    margin-left: auto; /* right edge even when there is no Stop button */
+  }
+  .thinking-follow-btn {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    min-width: 30px;
+    height: 26px;
+    padding: 0 6px;
+    font-size: var(--fs-meta-md);
+    line-height: 1;
+    color: var(--muted);
+    background: transparent;
+    border: 1px solid transparent;
+    border-radius: 6px;
+    cursor: pointer;
+    transition: background 0.15s, border-color 0.15s, opacity 0.15s;
+  }
+  .thinking-follow-btn:hover { background: rgba(127, 127, 127, 0.12); }
+  .thinking-follow-btn.active,
+  .thinking-follow-btn[aria-pressed="true"] {
+    color: var(--accent);
+    border-color: var(--accent);
+    background: color-mix(in srgb, var(--accent) 16%, transparent);
+  }
   .bubble-action-btn {
     display: inline-flex;
     align-items: center;
@@ -2343,6 +2376,48 @@
     cursor: pointer;
   }
   .relay-toast-action:hover { background: rgba(210, 153, 34, 0.2); }
+  /* Persistent app-wide banner for a queued host suspend / relay restart
+     (host-suspend-ui.js). Same look as the toast, one row per pending action,
+     sits just below the toast so both stay readable; takes pointer input for
+     its Cancel buttons. */
+  #pending-action-banner {
+    display: none;
+    position: fixed;
+    top: calc(var(--header-safe-top, 0px) + 10px);
+    left: 50%;
+    transform: translateX(-50%);
+    z-index: 12590;
+    max-width: min(640px, calc(100vw - 24px));
+    background: var(--bg2);
+    background: color-mix(in srgb, var(--warn) 14%, var(--bg2));
+    border: 1px solid var(--warn);
+    color: var(--warn);
+    border-radius: 10px;
+    padding: 6px 12px;
+    font-size: var(--fs-meta-sm);
+    box-shadow: 0 6px 24px rgba(0, 0, 0, 0.35);
+    pointer-events: auto;
+  }
+  #pending-action-banner.visible { display: flex; flex-direction: column; gap: 4px; }
+  #relay-toast.visible ~ #app #pending-action-banner,
+  #relay-toast.visible + #pending-action-banner { top: calc(var(--header-safe-top, 0px) + 56px); }
+  .pending-action-row {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    gap: 8px;
+    flex-wrap: wrap;
+    text-align: center;
+  }
+  .pending-action-text { overflow-wrap: anywhere; }
+  .pending-action-cancel { margin-left: 0; }
+  .suspend-host-blockers {
+    margin: 6px 0 10px;
+    padding-left: 20px;
+    color: var(--text);
+    font-size: var(--fs-meta-md);
+  }
+  .suspend-host-blockers li { margin: 2px 0; overflow-wrap: anywhere; }
   #model-metadata-blocker {
     display: none;
     align-items: center;
@@ -2441,8 +2516,11 @@
     gap: 6px;
   }
   /* Slash-command autocompletion: same composer-anchored overlay as the emoji
-     popup, but list-shaped. Row highlight follows the arrow keys only. */
-  #slash-autocomplete-popup {
+     popup, but list-shaped. Row highlight follows the arrow keys only. The
+     @relay mention popup (mention-autocomplete.mjs) is its twin; the two are
+     never open at once. */
+  #slash-autocomplete-popup,
+  #mention-autocomplete-popup {
     display: none;
     position: absolute;
     left: 16px;
@@ -2457,7 +2535,9 @@
     box-shadow: 0 10px 28px rgba(0, 0, 0, 0.45);
     z-index: 30;
   }
-  #slash-autocomplete-popup.visible { display: block; }
+  #slash-autocomplete-popup.visible,
+  #mention-autocomplete-popup.visible { display: block; }
+  .mention-item { align-items: center; }
   .slash-item {
     display: flex; align-items: baseline; gap: 10px;
     padding: 6px 8px; border-radius: 8px; cursor: pointer;
@@ -2469,7 +2549,8 @@
   .slash-item-hint { cursor: default; }
   .slash-item-hint:hover { background: transparent; }
   .slash-item-hint .slash-item-name { color: var(--muted); }
-  body.shared-reader-mode #slash-autocomplete-popup { display: none; }
+  body.shared-reader-mode #slash-autocomplete-popup,
+  body.shared-reader-mode #mention-autocomplete-popup { display: none; }
   #emoji-popup.visible {
     display: grid;
   }
@@ -2619,6 +2700,68 @@
   .preview-close:hover:not(:disabled) { border-color: #f85149; color: #f85149; }
   .preview-close:disabled { opacity: 0.5; cursor: default; }
   #settings-previews-empty { color: var(--muted); font-size: var(--fs-meta-sm); }
+  /* Remote relays (Settings → Relays, the @mention popup): a health dot —
+     online green, unreachable/refused red, never checked grey. */
+  .remote-relay-dot {
+    width: 9px; height: 9px; border-radius: 50%; display: inline-block; flex-shrink: 0;
+    background: var(--relay-tone-offline);
+  }
+  .remote-relay-dot[data-status="online"] { background: var(--relay-tone-online); }
+  .remote-relay-dot[data-status="offline"],
+  .remote-relay-dot[data-status="unauthorized"],
+  .remote-relay-dot[data-status="error"] { background: #f85149; }
+  #remote-relays-list { width: 100%; }
+  .remote-relay-tag {
+    border: 1px solid var(--border); border-radius: 999px; padding: 0 7px;
+    font-size: var(--fs-meta-sm); color: var(--muted); background: var(--bg3); white-space: nowrap;
+  }
+  .remote-relay-error { color: #f85149; overflow-wrap: anywhere; }
+  .remote-relay-http-warning { color: var(--warn); opacity: 1; }
+  label.remote-relay-permission { display: flex; align-items: center; gap: 6px; font-size: var(--fs-meta-sm); color: var(--muted); font-weight: normal; }
+  .remote-relay-permission select {
+    background: var(--bg); color: var(--text); border: 1px solid var(--border);
+    border-radius: 6px; padding: 2px 6px; font-size: var(--fs-meta-sm);
+  }
+  .remote-relays-self-name-row { display: flex; align-items: baseline; gap: 10px; flex-wrap: wrap; }
+  .remote-relays-self-name { font-family: var(--mono, monospace); color: var(--text); }
+  #remote-relays-public-url-input,
+  #remote-relays-add-url-input,
+  #remote-relays-add-token-input {
+    background: var(--bg); color: var(--text); border: 1px solid var(--border);
+    border-radius: 6px; padding: 6px 12px; outline: none; font-size: var(--fs-meta-md);
+    width: min(420px, 100%); box-sizing: border-box;
+  }
+  .remote-relays-add-token-row { display: flex; flex-direction: column; gap: 6px; width: 100%; }
+  .remote-relays-add-token-row[hidden] { display: none; }
+  .remote-relays-add-token-row label { font-weight: normal; color: var(--muted); font-size: var(--fs-meta-sm); }
+  .remote-relays-link-btn {
+    background: none; border: none; padding: 0; cursor: pointer;
+    color: var(--accent); font-size: var(--fs-meta-sm); text-decoration: underline;
+  }
+  .remote-relays-link-btn[hidden] { display: none; }
+  .settings-row label.remote-relays-pair-back { display: flex; align-items: center; gap: 8px; font-weight: normal; }
+  #remote-relays-add-status[data-state="working"] { color: var(--muted); }
+  #remote-relays-add-status[data-state="added"],
+  #remote-relays-add-status[data-state="paired"] { color: #3fb950; }
+  #remote-relays-add-status[data-state="pair-failed"],
+  #remote-relays-add-status[data-state="needs-token"] { color: var(--warn); }
+  #remote-relays-add-status[data-state="self"],
+  #remote-relays-add-status[data-state="error"] { color: #f85149; }
+  /* Provenance of a prompt another relay's agent sent (remote-relay-origin-view.mjs). */
+  .msg-origin { margin-bottom: 6px; max-width: 100%; }
+  .msg-origin-badge {
+    display: inline-block; max-width: 100%; box-sizing: border-box;
+    padding: 1px 8px; border-radius: 999px; font-size: var(--fs-meta-sm); line-height: 1.5;
+    border: 1px solid color-mix(in srgb, currentColor 40%, transparent);
+    background: color-mix(in srgb, currentColor 12%, transparent);
+    overflow: hidden; text-overflow: ellipsis; white-space: nowrap;
+  }
+  .msg.user .msg-bubble a.msg-origin-badge { text-decoration: none; }
+  .msg.user .msg-bubble a.msg-origin-badge:hover { text-decoration: underline; }
+  .conv-origin-marker {
+    flex: 0 1 auto; min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;
+    color: var(--muted); font-size: var(--fs-ui-chip);
+  }
   /* Transcript card: a preview published during this turn, pinned into the
      response bubble. Compact single row; closed previews keep the label but
      lose the dead link. */
@@ -2669,10 +2812,13 @@
      kind='absorbed' and the steered message carries the continuing reply. A
      steer cut off by Stop settles as kind='stopped' with a Resend button.
      Markers are notes, not answers, so they render muted and compact.
-     steered-turn-merge.mjs adds the adjacency classes. */
+     steered-turn-merge.mjs adds the adjacency classes.
+     kind='answered-elsewhere' is no steer's marker but looks like one: it
+     closes a message whose answer is on a background-continuation row. */
   .msg.assistant.msg-absorbed .msg-bubble,
   .msg.assistant.msg-folded .msg-bubble,
-  .msg.assistant.msg-steer-stopped .msg-bubble {
+  .msg.assistant.msg-steer-stopped .msg-bubble,
+  .msg.assistant.msg-answered-elsewhere .msg-bubble {
     font-size: var(--fs-meta-md); color: var(--muted); font-style: italic;
     padding: 6px 12px; opacity: 0.85;
   }
@@ -2681,7 +2827,8 @@
   .msg.assistant.msg-folded,
   .msg.assistant.msg-steer-stopped { margin-top: -8px; }
   .msg.assistant.msg-folded .msg-label,
-  .msg.assistant.msg-steer-stopped .msg-label { display: none; }
+  .msg.assistant.msg-steer-stopped .msg-label,
+  .msg.assistant.msg-answered-elsewhere .msg-label { display: none; }
   .msg.assistant.msg-steer-stopped .msg-bubble-actions { font-style: normal; }
   .msg.user.msg-steered .msg-bubble { border-style: dashed; }
   .msg.user.msg-steered .msg-label::after { content: ' · steered mid-turn'; }
@@ -5106,6 +5253,7 @@
 <div id="chat-actions-menu-backdrop" onclick="window.closeChatActionsMenu && window.closeChatActionsMenu()"></div>
 <div id="font-scale-indicator" aria-live="polite" aria-atomic="true" hidden>100%</div>
 <div id="relay-toast" role="status" aria-live="polite"></div>
+<div id="pending-action-banner" role="status" aria-live="polite" hidden></div>
 
 <!-- Main App -->
   <div id="app">
@@ -5186,6 +5334,7 @@
       <div id="image-edit-target" aria-live="polite"></div>
       <div id="emoji-popup" aria-hidden="true"></div>
       <div id="slash-autocomplete-popup" aria-hidden="true" role="listbox"></div>
+      <div id="mention-autocomplete-popup" aria-hidden="true" role="listbox" aria-label="Remote relays"></div>
       <details id="background-tasks-panel" hidden>
         <summary id="background-tasks-summary"></summary>
         <div id="background-panel-body">
@@ -5196,7 +5345,7 @@
       <div class="input-row">
         <input id="image-input" type="file" multiple hidden onchange="handleAttachmentInput(this.files); this.value='';">
         <button id="emoji-btn" onclick="toggleEmojiPicker()" title="Emoji picker (Tip: Win + .)">🙂</button>
-        <textarea id="msg-input" placeholder="Message Copilot…" rows="1" onkeydown="handleKey(event)" oninput="autoResize(this); updateComposerSlashMenu(this)"></textarea>
+        <textarea id="msg-input" placeholder="Message Copilot…" rows="1" aria-autocomplete="list" onkeydown="handleKey(event)" oninput="autoResize(this); updateComposerSlashMenu(this)"></textarea>
         <select id="mode-select" title="Mode">
           <option value="agent" selected>Agent</option>
           <option value="ask">Ask</option>
@@ -5333,6 +5482,16 @@
         tabindex="-1"
         data-settings-tab="providers"
       >Providers</button>
+      <button
+        id="settings-tab-relays"
+        class="settings-tab"
+        type="button"
+        role="tab"
+        aria-selected="false"
+        aria-controls="settings-panel-relays"
+        tabindex="-1"
+        data-settings-tab="relays"
+      >Relays</button>
       <button
         id="settings-tab-previews"
         class="settings-tab"
@@ -5448,16 +5607,16 @@
           </div>
         </div>
         <div class="settings-row settings-row-column" style="margin-top: 12px; margin-bottom: 0;">
-          <label for="pwa-app-name-input">Install app name</label>
+          <label for="pwa-app-name-input">Relay name</label>
           <input
             id="pwa-app-name-input"
             type="text"
             maxlength="60"
             placeholder="OAR"
-            aria-label="Install app name"
+            aria-label="Relay name"
             onchange="updatePwaAppName(this.value)"
           >
-          <div class="settings-help">Used for the installed PWA app label on every device connecting to this relay. On Android, a rename reaches an already-installed app after a short delay, with one confirmation prompt showing the new name.</div>
+          <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.</div>
         </div>
         <div class="settings-row" style="margin-top: 12px; margin-bottom: 0;">
           <label for="update-auto-check-toggle">Check for updates automatically</label>
@@ -5949,6 +6108,96 @@
           </div>
         </div>
       </div>
+      <div
+        id="settings-panel-relays"
+        class="settings-panel"
+        role="tabpanel"
+        tabindex="0"
+        aria-labelledby="settings-tab-relays"
+        data-settings-panel="relays"
+        hidden
+      >
+        <div id="remote-relays-self-section" class="settings-row settings-row-column" style="margin-top: 12px; margin-bottom: 0;">
+          <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>
+        </div>
+        <div class="settings-row settings-row-column" style="margin-top: 12px; margin-bottom: 0;">
+          <label for="remote-relays-public-url-input">Public address</label>
+          <input
+            id="remote-relays-public-url-input"
+            type="url"
+            inputmode="url"
+            autocomplete="off"
+            autocapitalize="off"
+            spellcheck="false"
+            placeholder="https://…"
+            aria-label="Public address of this relay"
+            onchange="saveRemoteRelayPublicUrl(this.value)"
+          >
+          <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" style="margin-top: 12px; margin-bottom: 0;">
+          <label for="remote-relays-inbound-toggle">Accept prompts from other relays' agents</label>
+          <input
+            id="remote-relays-inbound-toggle"
+            type="checkbox"
+            onchange="toggleRemoteRelayInbound(this.checked)"
+            aria-label="Accept prompts from other relays' agents"
+            checked
+          >
+        </div>
+        <div class="settings-help" style="margin-top: 6px;">When off, agents on paired relays can still read sessions here, but cannot send prompts, start sessions, answer questions or stop turns. The relay token stays the real boundary: anyone holding it has full access.</div>
+        <div id="remote-relays-list-section" class="settings-row settings-row-column" style="margin-top: 16px; margin-bottom: 0;">
+          <label>Remote relays</label>
+          <div id="remote-relays-list"></div>
+          <div id="remote-relays-empty" class="settings-help">Loading remote relays…</div>
+          <div id="remote-relays-status" class="settings-help settings-provider-status" role="status" aria-live="polite" hidden></div>
+          <div class="settings-help">Agents in any session here can work on these relays once you mention one in the conversation (for example <code>@name</code>). "Agents may" limits what they can do there.</div>
+        </div>
+        <div id="remote-relays-add-section" class="settings-row settings-row-column" style="margin-top: 16px; margin-bottom: 0;">
+          <label for="remote-relays-add-url-input">Add a relay</label>
+          <input
+            id="remote-relays-add-url-input"
+            type="url"
+            inputmode="url"
+            autocomplete="off"
+            autocapitalize="off"
+            spellcheck="false"
+            placeholder="Paste the other relay's web address"
+            aria-label="Paste the other relay's web address"
+            onkeydown="if (event.key === 'Enter') { event.preventDefault(); addRemoteRelayFromForm(); }"
+          >
+          <div id="remote-relays-add-token-row" class="remote-relays-add-token-row" hidden>
+            <label for="remote-relays-add-token-input">Token of the other relay</label>
+            <input
+              id="remote-relays-add-token-input"
+              type="password"
+              autocomplete="off"
+              autocapitalize="off"
+              spellcheck="false"
+              placeholder="Only needed when it differs from this relay's token"
+              aria-label="Token of the other relay"
+              onkeydown="if (event.key === 'Enter') { event.preventDefault(); addRemoteRelayFromForm(); }"
+            >
+          </div>
+          <button id="remote-relays-use-token-btn" class="remote-relays-link-btn" type="button" onclick="showRemoteRelayTokenField()">Use a different token</button>
+          <label class="remote-relays-pair-back">
+            <input id="remote-relays-pair-back-toggle" type="checkbox" checked>
+            Also add this relay there
+          </label>
+          <div id="remote-relays-pair-back-hint" class="settings-help">
+            The other relay gets this relay's public address and, if it uses a different token, this
+            relay's token too: its agents can then work here. Removing a relay here does not revoke
+            that; rotate this relay's token to lock it out.
+          </div>
+          <button id="remote-relays-add-btn" class="chat-title-action-btn" type="button" onclick="addRemoteRelayFromForm()">Add</button>
+          <div id="remote-relays-add-status" class="settings-help settings-provider-status" role="status" aria-live="polite" hidden></div>
+        </div>
+      </div>
       <div
         id="settings-panel-previews"
         class="settings-panel"
@@ -6018,6 +6267,10 @@
             <label for="push-event-cli-offline-toggle">CLI went offline</label>
             <input id="push-event-cli-offline-toggle" type="checkbox" onchange="updatePushPreferencesFromControls()" disabled>
           </div>
+          <div class="settings-row" style="width: 100%; margin-top: 6px; margin-bottom: 0;">
+            <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>
           <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>

package/server/relay-tools.md

@@ -26,4 +26,8 @@ Use `restart: true` in the request body when the user wants a real relay restart
 
 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. Previews never expire on their own; close them with {action:"close"} when the user is done.
 
-There is no `preview` tool on this provider — use the authenticated localhost API (same auth as `POST /api/relay/shutdown`): `POST /api/previews` with `{ "conversationId": "<conv>", "port": 5173, "label": "web app" }` (or `"dir": "./dist"` instead of the port) publishes, `GET /api/previews` lists, `DELETE /api/previews/:token` closes the link without touching the dev server behind it. A 503 with `details` means the preview lane is disabled or misconfigured — surface those details, they are the operator's fix. See `docs/preview-servers.md`.
+If you have a `preview` tool, use it. Otherwise use the authenticated localhost API (same auth as `POST /api/relay/shutdown`): `POST /api/previews` with `{ "conversationId": "<conv>", "port": 5173, "label": "web app" }` (or `"dir": "./dist"` instead of the port) publishes, `GET /api/previews` lists, `DELETE /api/previews/:token` closes the link without touching the dev server behind it. A 503 with `details` means the preview lane is disabled or misconfigured — surface those details, they are the operator's fix. See `docs/preview-servers.md`.
+
+## Remote relays
+
+If you have a `remote_relay` tool, this relay is paired with other OAR relays and the tool works on them: list and read their sessions, prompt a session, start a new one and wait for its reply. Use it only when the user asks for work on another relay or mentions one, and start with `{"action":"list_relays"}`. A relay stays locked until the user mentions it in this conversation (`@name` or its plain name); a locked relay refuses everything except `list_relays`, so ask the user to mention it rather than retrying. Write actions may first wait for the user's approval. If a result lists `pendingQuestions`, the remote 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

@@ -284,6 +284,13 @@ export function createMessageRepository(db) {
           LIMIT ?
         `),
         countStatus:    db.prepare(`SELECT status, COUNT(*) as cnt FROM queue WHERE status IN ('pending','processing','parked') GROUP BY status`),
+        // Deferred host suspend: which conversations still hold live turns.
+        listActiveQueueCountsByConversation: db.prepare(`
+          SELECT q.conversation_id, COUNT(*) AS cnt, MAX(c.title) AS title
+          FROM queue q LEFT JOIN conversations c ON c.id = q.conversation_id
+          WHERE q.status IN ('pending','processing','parked')
+          GROUP BY q.conversation_id
+        `),
         countRuntimeSessions: db.prepare(`SELECT COUNT(*) AS cnt FROM runtime_sessions WHERE status = 'active'`),
         setProcessing:  db.prepare(`UPDATE queue SET status = 'processing', processing_at = ?, attempt_id = ? WHERE id = ?`),
         setProcessingWithWorkerLease: db.prepare(`

package/server/repositories/question-repository.mjs

@@ -112,6 +112,9 @@ export function createQuestionRepository(db) {
           FROM subagent_runs
           WHERE queue_message_id = ? AND status = 'running'
         `),
+        countRunningSubagentRuns: db.prepare(`
+          SELECT COUNT(*) AS cnt FROM subagent_runs WHERE status = 'running'
+        `),
         closeRunningSubagentRunsByQueueMessage: db.prepare(`
           UPDATE subagent_runs
           SET status = ?, updated_at = ?, completed_at = COALESCE(completed_at, ?)

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

@@ -0,0 +1,75 @@
+'use strict';
+
+import { normalizeRemoteRelayOrigin } from '../../shared/remote-relay-contract.mjs';
+
+// Storage for remote relays that is not app settings: which remote relays a
+// conversation has unlocked (the user mentioned them), and the provenance of
+// messages and conversations another relay's agent created. Tables and
+// columns come from migrations/0005-remote-relays.mjs.
+
+function parseOrigin(json) {
+  if (!json) return null;
+  try {
+    return normalizeRemoteRelayOrigin(JSON.parse(json));
+  } catch {
+    return null;
+  }
+}
+
+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`);
+  const insertUnlock = db.prepare(`INSERT OR IGNORE INTO conversation_remote_relay_unlocks (conversation_id, remote_relay_id, message_id, created_at) VALUES (?, ?, ?, ?)`);
+  const deleteUnlocksForRelay = db.prepare(`DELETE FROM conversation_remote_relay_unlocks WHERE remote_relay_id = ?`);
+  const deleteUnlocksForConversation = db.prepare(`DELETE FROM conversation_remote_relay_unlocks WHERE conversation_id = ?`);
+  const setMessageOrigin = db.prepare(`UPDATE messages SET origin_json = ? WHERE id = ?`);
+  const getMessageOrigin = db.prepare(`SELECT origin_json FROM messages WHERE id = ?`);
+  const setConversationOrigin = db.prepare(`UPDATE conversations SET origin_json = ? WHERE id = ?`);
+  const getConversationOrigin = db.prepare(`SELECT origin_json FROM conversations WHERE id = ?`);
+
+  return {
+    hasUnlock(conversationId, remoteRelayId) {
+      return !!hasUnlock.get(String(conversationId || ''), String(remoteRelayId || ''));
+    },
+    /** `[{ remoteRelayId, messageId, createdAt }]`, oldest first. */
+    listUnlocks(conversationId) {
+      return listUnlocks.all(String(conversationId || '')).map((row) => ({
+        remoteRelayId: row.remote_relay_id,
+        messageId: row.message_id || null,
+        createdAt: row.created_at,
+      }));
+    },
+    /** True when this call created the unlock (false when it already existed). */
+    recordUnlock(conversationId, remoteRelayId, messageId = null, nowIso = new Date().toISOString()) {
+      const conversation = String(conversationId || '').trim();
+      const relay = String(remoteRelayId || '').trim();
+      if (!conversation || !relay) return false;
+      return insertUnlock.run(conversation, relay, messageId ? String(messageId) : null, nowIso).changes > 0;
+    },
+    forgetRelay(remoteRelayId) {
+      return deleteUnlocksForRelay.run(String(remoteRelayId || '')).changes;
+    },
+    forgetConversation(conversationId) {
+      return deleteUnlocksForConversation.run(String(conversationId || '')).changes;
+    },
+    setMessageOrigin(messageId, origin) {
+      const normalized = normalizeRemoteRelayOrigin(origin);
+      return setMessageOrigin.run(normalized ? JSON.stringify(normalized) : null, String(messageId || '')).changes > 0;
+    },
+    getMessageOrigin(messageId) {
+      return parseOrigin(getMessageOrigin.get(String(messageId || ''))?.origin_json);
+    },
+    setConversationOrigin(conversationId, origin) {
+      const normalized = normalizeRemoteRelayOrigin(origin);
+      return setConversationOrigin.run(normalized ? JSON.stringify(normalized) : null, String(conversationId || '')).changes > 0;
+    },
+    getConversationOrigin(conversationId) {
+      return parseOrigin(getConversationOrigin.get(String(conversationId || ''))?.origin_json);
+    },
+  };
+}
+
+/** Parses an `origin_json` column value read by other queries. */
+export function parseRemoteRelayOriginJson(json) {
+  return parseOrigin(json);
+}

package/server/repositories/session-repository.mjs

@@ -9,6 +9,11 @@ export function createSessionRepository(db) {
     const runtimeProviderSelect = runtimeSessionsSupportProviders
       ? 'rs.model AS runtime_model, rs.provider_type AS runtime_provider_type, rs.provider_model AS runtime_provider_model'
       : 'rs.model AS runtime_model, NULL AS runtime_provider_type, NULL AS runtime_provider_model';
+    // Provenance of conversations another relay's agent created (migration
+    // 0005); NULL on a schema that predates it.
+    const conversationsHaveOrigin = db.prepare(`PRAGMA table_info(conversations)`).all()
+      .some((column) => String(column?.name || '').trim() === 'origin_json');
+    const conversationOriginSelect = conversationsHaveOrigin ? 'c.origin_json' : 'NULL AS origin_json';
     return {
         // conversations
         getConv:        db.prepare(`SELECT * FROM conversations WHERE id = ? AND status != 'deleted'`),
@@ -16,7 +21,7 @@ export function createSessionRepository(db) {
         getConvBySdkSessionId: db.prepare(`SELECT * FROM conversations WHERE sdk_session_id = ? AND status != 'deleted' ORDER BY updated_at DESC LIMIT 1`),
         listConvIdsMissingRuntimeSession: db.prepare(`SELECT c.id AS id FROM conversations c LEFT JOIN runtime_sessions rs ON rs.conversation_id = c.id WHERE rs.id IS NULL AND c.status != 'deleted'`),
         runtimeSessionsSupportProviders,
-        listConvs:      db.prepare(`SELECT c.id, c.title, c.title_source, c.archived, c.compacted_into, c.compacted_from, c.sdk_session_id, c.preferred_relay_mode, c.preferred_model, c.preferred_reasoning_effort, c.configured_workspace_root_path, c.runtime_workspace_root_path, c.draft_text, c.draft_updated_at, c.draft_updated_by_client_id, c.draft_attachments, c.created_at, c.updated_at, rs.id AS runtime_session_id, rs.strategy AS runtime_strategy, rs.status AS runtime_status, rs.last_used_at AS runtime_last_used_at, ${runtimeProviderSelect}, COUNT(m.id) as message_count FROM conversations c LEFT JOIN messages m ON m.conversation_id = c.id LEFT JOIN runtime_sessions rs ON rs.conversation_id = c.id WHERE c.status != 'deleted' AND (? = 1 OR c.archived = 0) GROUP BY c.id ORDER BY CASE WHEN c.sdk_session_id IS NULL OR c.sdk_session_id = '' THEN 1 ELSE 0 END ASC, c.updated_at DESC`),
+        listConvs:      db.prepare(`SELECT c.id, c.title, c.title_source, c.archived, c.compacted_into, c.compacted_from, c.sdk_session_id, c.preferred_relay_mode, c.preferred_model, c.preferred_reasoning_effort, c.configured_workspace_root_path, c.runtime_workspace_root_path, c.draft_text, c.draft_updated_at, c.draft_updated_by_client_id, c.draft_attachments, ${conversationOriginSelect}, c.created_at, c.updated_at, rs.id AS runtime_session_id, rs.strategy AS runtime_strategy, rs.status AS runtime_status, rs.last_used_at AS runtime_last_used_at, ${runtimeProviderSelect}, COUNT(m.id) as message_count FROM conversations c LEFT JOIN messages m ON m.conversation_id = c.id LEFT JOIN runtime_sessions rs ON rs.conversation_id = c.id WHERE c.status != 'deleted' AND (? = 1 OR c.archived = 0) GROUP BY c.id ORDER BY CASE WHEN c.sdk_session_id IS NULL OR c.sdk_session_id = '' THEN 1 ELSE 0 END ASC, c.updated_at DESC`),
         insertConv:     db.prepare(`INSERT OR IGNORE INTO conversations (id, title, created_at, updated_at) VALUES (?, ?, ?, ?)`),
         updateConvTime: db.prepare(`UPDATE conversations SET updated_at = ? WHERE id = ?`),
         updateConvTitle: db.prepare(`UPDATE conversations SET title = ?, title_source = 'manual' WHERE id = ?`),

package/server/routes/ask-user-routes.mjs

@@ -1,6 +1,8 @@
 'use strict';
 
 import { createAskUserRoutingService } from '../services/ask-user-routing-service.mjs';
+import { admitRemoteRelayRequest, readRemoteRelayRequest } from '../services/remote-relay-inbound.mjs';
+import { isRemoteRelayApprovalQuestion } from '../../shared/remote-relay-contract.mjs';
 import {
   extractRequestedSchema,
   normalizeSchema,
@@ -33,6 +35,21 @@ function firstKnownValue(source, keyPaths = []) {
   return null;
 }
 
+/**
+ * A stored question row that is this relay's Allow / Deny card for one of its
+ * own agent's calls to another relay (remote-relay-caller-context.mjs). The
+ * context lives in the row's request envelope.
+ */
+function isRemoteRelayApprovalRow(row) {
+  let envelope = null;
+  try {
+    envelope = JSON.parse(String(row?.request || ''));
+  } catch {
+    return false;
+  }
+  return isRemoteRelayApprovalQuestion(envelope);
+}
+
 function extractContinuationOwnership(rawRequest) {
   const parsed = rawRequest && typeof rawRequest === 'object' ? rawRequest : null;
   if (!parsed) {
@@ -99,6 +116,9 @@ export function registerAskUserRoutes(app, deps) {
     DEFAULT_RELAY_MODE,
     sessionWorkerRegistry,
     pushDispatchService,
+    // Remote relays: another relay's agent answering a question is refused
+    // while the inbound switch is off. Absent in older wiring (no-op).
+    remoteRelayInbound = null,
   } = deps;
 
   const continuationRoutingEnabled = runtimeState?.featureFlags?.SESSION_WORKER_CONTINUATION_ROUTING_ENABLED === true;
@@ -108,16 +128,26 @@ export function registerAskUserRoutes(app, deps) {
     sessionWorkerRegistry,
   });
 
+  // A request from another relay's agent, by the test the inbound switch
+  // applies (X-OAR-Remote-Origin or a body origin). Made even without the
+  // remote-relay deps: an approval card is only ever this relay's user's.
+  function fromRemoteRelay(req) {
+    return readRemoteRelayRequest(req, remoteRelayInbound || {}).remote;
+  }
+
   app.get('/api/relay-questions', auth, (req, res) => {
     const conversationId = req.query.conversationId ? String(req.query.conversationId) : null;
     const status = String(req.query.status || 'pending').trim() || 'pending';
-    const rows = stmts.listQuestions.all(status, conversationId, conversationId);
+    let rows = stmts.listQuestions.all(status, conversationId, conversationId);
+    if (fromRemoteRelay(req)) rows = rows.filter((row) => !isRemoteRelayApprovalRow(row));
     res.json({ questions: rows.map(formatQuestionRow) });
   });
 
   app.get('/api/relay-question/:id', auth, (req, res) => {
     const row = stmts.getQuestion.get(req.params.id);
-    if (!row) return res.status(404).json({ error: 'Not found' });
+    if (!row || (isRemoteRelayApprovalRow(row) && fromRemoteRelay(req))) {
+      return res.status(404).json({ error: 'Not found' });
+    }
     res.json({ question: formatQuestionRow(row) });
   });
 
@@ -220,6 +250,7 @@ export function registerAskUserRoutes(app, deps) {
   });
 
   app.post('/api/relay-question/:id/answer', auth, (req, res) => {
+    if (!admitRemoteRelayRequest(req, res, remoteRelayInbound)) return;
     const id = String(req.params.id || '').trim();
     const { answer, structuredAnswer, sdk_session_id, continuation_id, continuation_question_id } = req.body;
     const sdkSessionId = normalizeId(sdk_session_id);
@@ -228,6 +259,12 @@ export function registerAskUserRoutes(app, deps) {
 
     const row = stmts.getQuestion.get(id);
     if (!row) return res.status(404).json({ error: 'Not found' });
+    // Allow / Deny on this relay's own call to another relay is its user's
+    // decision; the relay that call went to must never make it.
+    if (isRemoteRelayApprovalRow(row) && fromRemoteRelay(req)) {
+      console.warn(`[${ts()}] QUESTION  reject id=${id.slice(0, 8)} reason=remote-relay-approval-from-remote`);
+      return res.status(403).json({ error: 'Only this relay\'s user can answer a remote relay approval' });
+    }
     if (row.status !== 'pending') return res.status(409).json({ error: `Question already ${row.status}` });
 
     const schema = parseQuestionRequest(row.request_schema);
@@ -287,6 +324,9 @@ export function registerAskUserRoutes(app, deps) {
   app.post('/api/relay-question/:id/timeout', auth, (req, res) => {
     const row = stmts.getQuestion.get(req.params.id);
     if (!row) return res.status(404).json({ error: 'Not found' });
+    if (isRemoteRelayApprovalRow(row) && fromRemoteRelay(req)) {
+      return res.status(403).json({ error: 'Only this relay\'s user can answer a remote relay approval' });
+    }
     if (row.status !== 'pending') return res.json({ ok: true, question: formatQuestionRow(row) });
 
     const result = stmts.timeoutQuestion.run(row.id);