clay-server 4.2.0 → 4.3.0-beta.2

package/lib/public/css/overlays.css

@@ -523,8 +523,8 @@ button.top-bar-pill.pill-accent:hover { background: color-mix(in srgb, var(--acc
   display: inline-flex;
   align-items: center;
   flex: 0 1 auto;
-  flex-wrap: wrap;
-  gap: 7px;
+  flex-wrap: nowrap;
+  gap: 5px;
   max-width: 100%;
   min-width: 0;
 }
@@ -533,52 +533,80 @@ button.top-bar-pill.pill-accent:hover { background: color-mix(in srgb, var(--acc
   display: inline-flex;
   align-items: center;
   flex: 0 0 auto;
-  gap: 2px;
+  gap: 1px;
   padding: 2px;
-  border: 1px solid var(--border, rgba(255,255,255,.18));
-  border-radius: 999px;
-  background: var(--surface-raised, rgba(0,0,0,.18));
+  border: 1px solid color-mix(in srgb, var(--border, #45484f) 88%, transparent);
+  border-radius: 10px;
+  background: color-mix(in srgb, var(--surface-raised, rgba(0,0,0,.18)) 86%, transparent);
+  box-shadow: inset 0 1px 0 rgba(255,255,255,.04), 0 2px 8px rgba(0,0,0,.12);
 }
 .session-permission-segmented button {
+  position: relative;
   flex: 0 0 auto;
   border: 0;
-  border-radius: 999px;
-  padding: 3px 8px;
+  border-radius: 7px;
+  padding: 4px 9px;
   color: var(--text-muted, inherit);
   background: transparent;
   font: inherit;
   font-size: 11px;
+  line-height: 1;
   white-space: nowrap;
   cursor: pointer;
+  transition: color .15s ease, background .15s ease, box-shadow .15s ease;
 }
-.session-permission-segmented button.active { background: var(--accent, #6f8cff); color: #fff; }
+.session-permission-segmented button:hover:not(:disabled) { color: var(--text, #fff); background: rgba(255,255,255,.07); }
+.session-permission-segmented button:focus-visible { outline: 2px solid var(--accent, #6f8cff); outline-offset: 1px; z-index: 1; }
+.session-permission-segmented button.active { background: var(--accent, #6f8cff); color: #fff; box-shadow: 0 1px 4px rgba(0,0,0,.2); }
 .session-permission-segmented button:disabled { cursor: not-allowed; opacity: .5; }
 .session-permission-control.permission-pending .session-permission-segmented button:disabled { cursor: wait; }
+.session-permission-segmented button.pending { color: #fff; }
+.permission-spinner { display: inline-block; visibility: hidden; width: 10px; height: 10px; margin-left: 4px; vertical-align: -1px; border: 1.5px solid currentColor; border-right-color: transparent; border-radius: 50%; }
+.session-permission-segmented button.pending .permission-spinner { visibility: visible; animation: permission-spin .7s linear infinite; }
+@keyframes permission-spin { to { transform: rotate(360deg); } }
 .session-permission-status {
-  flex: 1 1 118px;
+  flex: 0 1 auto;
   min-width: 0;
-  max-width: 190px;
-  overflow-wrap: anywhere;
-  white-space: normal;
+  max-width: 180px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  padding: 3px 6px;
+  border: 1px solid transparent;
+  border-radius: 6px;
   color: var(--text-dimmer, var(--text-muted));
   font-size: 10px;
   line-height: 1.2;
 }
 .session-permission-status.hidden { display: none; }
+.session-permission-control.permission-pending .session-permission-status:not(.hidden) {
+  position: absolute;
+  width: 1px;
+  height: 1px;
+  padding: 0;
+  margin: -1px;
+  overflow: hidden;
+  clip: rect(0, 0, 0, 0);
+  white-space: nowrap;
+  border: 0;
+}
 .permission-runtime-fallback .session-permission-status { color: var(--warning, #d49a55); }
 .permission-globally-forced .session-permission-status { color: var(--warning, #d49a55); }
 .permission-label-short { display: none; }
 @media (max-width: 760px) {
   .permission-label-long { display: none; }
   .permission-label-short { display: inline; }
-  .session-permission-control { column-gap: 5px; row-gap: 2px; }
+  .session-permission-control { column-gap: 4px; }
   .session-permission-segmented button { padding-inline: 7px; }
   .session-permission-status {
-    flex-basis: 96px;
-    max-width: 170px;
+    max-width: 132px;
     font-size: 9px;
   }
 }
+@media (prefers-reduced-motion: reduce) {
+  .session-permission-segmented button { transition: none; }
+  .session-permission-segmented button.pending .permission-spinner { animation: none; opacity: .7; }
+}
 #skip-perms-pill .lucide { width: 12px; height: 12px; flex-shrink: 0; }
 
 /* --- Confirm modal --- */

package/lib/public/css/pane.css

@@ -370,12 +370,12 @@ body.pane-mode #input-area {
    tie and keep the pill at its 22px title-bar size inside the 24px pane
    header. Scope under .split-pane-header to outrank them. */
 .split-pane-header .split-pane-full-access {
-  height: auto;
+  height: 22px;
   align-self: center;
   margin-left: 0;
   padding: 0;
   gap: 4px;
-  font-size: 8px;
+  font-size: 10px;
   letter-spacing: 0.02em;
   flex-wrap: nowrap;
   flex: 0 0 auto;
@@ -383,10 +383,14 @@ body.pane-mode #input-area {
 }
 
 .split-pane-header .session-permission-segmented button {
-  padding: 1px 5px;
-  font-size: 8px;
+  min-height: 18px;
+  padding: 3px 6px;
+  font-size: 10px;
 }
 
+.split-pane-header .permission-label-long { display: none; }
+.split-pane-header .permission-label-short { display: inline; }
+
 .split-pane-header .session-permission-status {
   flex: 0 0 auto;
   min-width: 40px;
@@ -394,7 +398,7 @@ body.pane-mode #input-area {
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
-  font-size: 8px;
+  font-size: 10px;
 }
 
 .split-pane-header .session-full-access-track {

package/lib/public/index.html

@@ -410,9 +410,9 @@
           <button id="header-info-btn" type="button" title="Session info"><i data-lucide="info"></i></button>
           <div id="header-full-access-btn" class="session-permission-control hidden" role="group" aria-label="Session permission mode">
             <div class="session-permission-segmented">
-              <button type="button" data-permission-mode="default">Ask</button>
-              <button type="button" data-permission-mode="auto">Auto</button>
-              <button type="button" data-permission-mode="bypassPermissions" aria-label="Skip permissions"><span class="permission-label-long">Skip permissions</span><span class="permission-label-short" aria-hidden="true">Skip</span></button>
+              <button type="button" data-permission-mode="default"><span class="permission-label">Ask</span><span class="permission-spinner" aria-hidden="true"></span></button>
+              <button type="button" data-permission-mode="auto"><span class="permission-label">Auto</span><span class="permission-spinner" aria-hidden="true"></span></button>
+              <button type="button" data-permission-mode="bypassPermissions" aria-label="Skip permissions" title="Skip permissions"><span class="permission-label-long permission-label">Skip permissions</span><span class="permission-label-short permission-label" aria-hidden="true">Skip</span><span class="permission-spinner" aria-hidden="true"></span></button>
             </div>
             <span class="session-permission-status hidden" aria-live="polite"></span>
           </div>

package/lib/public/modules/app-connection.js

@@ -22,10 +22,8 @@ import { beginDefaultVendorConnection, requestDefaultVendor } from './default-ve
 import { clearProjectSplitState } from './split-session-boundary.js';
 import { clearPermissionModePending } from './permission-control.js';
 import { clearMcpPermissionModePending } from './mcp-ui.js';
+import { createWebSocketLifecycle } from './websocket-lifecycle.js';
 
-var reconnectTimer = null;
-var reconnectDelay = 1000;
-var connectTimeoutId = null;
 var connectOverlay = null;
 var hasConnectedOnce = false;
 
@@ -46,7 +44,22 @@ var overlayGraceTimer = null;
 var HEARTBEAT_MS = 25000;
 var heartbeatTimer = null;
 var heartbeatDeadlineTimer = null;
+var heartbeatAwaitingSocket = null;
 var disconnectedAt = 0;
+var attemptStartedAt = 0;
+var attemptSocket = null;
+var probeTimer = null;
+var probeSocket = null;
+var probeEpoch = 0;
+var probeStartedAt = 0;
+var lifecycle = createWebSocketLifecycle({
+  handshakeTimeoutMs: 12000,
+  onHandshakeTimeout: function (epoch) {
+    if (lifecycle.current(epoch) && attemptSocket) {
+      forceReplaceSocket("handshake_timeout", 0, epoch);
+    }
+  }
+});
 
 function clearOverlayGrace() {
   if (overlayGraceTimer) {
@@ -64,6 +77,45 @@ function showOverlayNow() {
   connectOverlay.classList.remove("hidden");
 }
 
+function recordConnectionDiagnostic(reason, code, latency) {
+  var safeReasons = { close: true, error: true, handshake_timeout: true, heartbeat_timeout: true, heartbeat_error: true, probe_error: true, probe_timeout: true, auth_timeout: true, "ack-timeout": true, online: true, visible: true };
+  if (!safeReasons[reason]) reason = "unknown";
+  console.warn("[clay] WebSocket diagnostic", {
+    reason: reason,
+    code: typeof code === "number" ? code : 0,
+    retry: lifecycle.getRetryAttempt(),
+    latencyMs: typeof latency === "number" ? Math.max(0, Math.min(latency, 600000)) : null
+  });
+}
+
+function clearProbe() {
+  if (probeTimer) clearTimeout(probeTimer);
+  probeTimer = null;
+  probeSocket = null;
+  probeEpoch = 0;
+  probeStartedAt = 0;
+}
+
+function forceReplaceSocket(reason, code, epoch) {
+  if (!lifecycle.current(epoch)) return;
+  var socket = getWs();
+  var latency = probeStartedAt ? Date.now() - probeStartedAt : null;
+  clearProbe();
+  stopHeartbeat();
+  if (socket) {
+    socket.onopen = null;
+    socket.onmessage = null;
+    socket.onerror = null;
+    socket.onclose = null;
+    try { socket.close(); } catch (e) {}
+  }
+  setWs(null);
+  recordConnectionDiagnostic(reason, code, latency);
+  setStatus("disconnected");
+  lifecycle.invalidate(epoch);
+  scheduleReconnect(reason);
+}
+
 export function stopHeartbeat() {
   if (heartbeatTimer) {
     clearInterval(heartbeatTimer);
@@ -73,6 +125,23 @@ export function stopHeartbeat() {
     clearTimeout(heartbeatDeadlineTimer);
     heartbeatDeadlineTimer = null;
   }
+  heartbeatAwaitingSocket = null;
+}
+
+function suspendSocketForOffline() {
+  clearProbe();
+  stopHeartbeat();
+  var socket = getWs();
+  attemptSocket = null;
+  if (socket) {
+    socket.onopen = null;
+    socket.onmessage = null;
+    socket.onerror = null;
+    socket.onclose = null;
+    try { socket.close(); } catch (e) {}
+  }
+  setWs(null);
+  if (socket || store.get('connected')) setStatus("disconnected");
 }
 
 // Started once per live socket. The socket it was started for is captured, so
@@ -80,28 +149,54 @@ export function stopHeartbeat() {
 // connection. The pong the server sends back keeps a proxy's upstream read
 // timeout from expiring. A missing pong also identifies a half-open socket,
 // which browsers can otherwise leave OPEN while silently losing sends.
-export function startHeartbeat(socket) {
+export function startHeartbeat(socket, attemptEpoch) {
   stopHeartbeat();
   if (!socket) return;
   heartbeatTimer = setInterval(function () {
-    if (!socket || socket.readyState !== 1 || getWs() !== socket) {
+    if (!socket || socket.readyState !== 1 || getWs() !== socket || !lifecycle.current(attemptEpoch)) {
       stopHeartbeat();
       return;
     }
-    try { socket.send(JSON.stringify({ type: "ping" })); } catch (e) {}
+    try { socket.send(JSON.stringify({ type: "ping" })); } catch (e) {
+      forceReplaceSocket("heartbeat_error", 0, attemptEpoch);
+      return;
+    }
+    heartbeatAwaitingSocket = socket;
     if (heartbeatDeadlineTimer) clearTimeout(heartbeatDeadlineTimer);
     heartbeatDeadlineTimer = setTimeout(function () {
       heartbeatDeadlineTimer = null;
-      if (getWs() === socket && socket.readyState === 1) connect();
+      if (getWs() === socket && socket.readyState === 1 && lifecycle.current(attemptEpoch)) {
+        forceReplaceSocket("heartbeat_timeout", 0, attemptEpoch);
+      }
     }, 10000);
   }, HEARTBEAT_MS);
 }
 
 export function initConnection() {
   connectOverlay = document.getElementById("connect-overlay");
+  if (typeof navigator !== "undefined" && navigator.onLine === false) lifecycle.setOffline(true);
   window.addEventListener("clay-message-delivery-timeout", function (event) {
     var socket = event.detail && event.detail.socket;
-    if (!socket || getWs() === socket) connect();
+    recordConnectionDiagnostic("ack-timeout", 0, null);
+    if (!socket || getWs() === socket) probeReconnect("ack-timeout");
+  });
+  window.addEventListener("offline", function () {
+    lifecycle.setOffline(true);
+    suspendSocketForOffline();
+  });
+  window.addEventListener("online", function () {
+    lifecycle.wake(function () {
+      var socket = getWs();
+      if (socket && socket.readyState === 1) startHeartbeat(socket, lifecycle.getEpoch());
+      probeReconnect("online");
+    });
+  });
+  document.addEventListener("visibilitychange", function () {
+    if (!document.hidden) {
+      var socket = getWs();
+      if (socket && socket.readyState === 1) startHeartbeat(socket, lifecycle.getEpoch());
+      probeReconnect("visible");
+    }
   });
 
   // --- Reactive UI sync for connected/processing state ---
@@ -224,6 +319,9 @@ function onConnected() {
 }
 
 export function connect() {
+  if (lifecycle.isOffline()) return;
+  var attemptEpoch = lifecycle.beginAttempt();
+  attemptStartedAt = Date.now();
   var ws = getWs();
   // Tear down the previous socket's heartbeat before a new socket exists, so
   // two sockets can never both be pinging.
@@ -236,37 +334,24 @@ export function connect() {
     ws.onclose = null;
     ws.close();
   }
-  if (connectTimeoutId) { clearTimeout(connectTimeoutId); connectTimeoutId = null; }
-
   var protocol = location.protocol === "https:" ? "wss:" : "ws:";
   var socketPath = store.get('wsPath');
   if (store.get('socketPath') && store.get('socketPath') !== socketPath) clearProjectSplitState();
   store.set({ socketPath: socketPath, activeProjectSlug: null, sessionActivatedProjectSlug: null, sessionListProjectSlug: null, splitGroupsProjectSlug: null });
   var newWs = new WebSocket(protocol + "//" + location.host + socketPath);
   setWs(newWs);
-
-  // If not connected within 3s, force retry
-  connectTimeoutId = setTimeout(function () {
-    if (getWs() !== newWs) return;
-    if (!store.get('connected')) {
-      newWs.onclose = null;
-      newWs.onerror = null;
-      newWs.close();
-      connect();
-    }
-  }, 3000);
+  attemptSocket = newWs;
 
   newWs.onopen = function () {
-    if (getWs() !== newWs) return;
-    if (connectTimeoutId) { clearTimeout(connectTimeoutId); connectTimeoutId = null; }
+    if (getWs() !== newWs || !lifecycle.current(attemptEpoch)) return;
+    if (!lifecycle.markOpen(attemptEpoch)) return;
     if (hasConnectedOnce && disconnectedAt) {
       console.log("[clay] WebSocket reconnected after " + (Date.now() - disconnectedAt) + "ms");
     }
     disconnectedAt = 0;
     setStatus("connected");
-    startHeartbeat(newWs);
-    reconnectDelay = 1000;
-    if (reconnectTimer) { clearTimeout(reconnectTimer); reconnectTimer = null; }
+    startHeartbeat(newWs, attemptEpoch);
+    lifecycle.clearRetry();
 
     // A pane pin is one-shot per WebSocket, not per page lifetime. The server
     // intentionally does not restore pane presence after a daemon restart.
@@ -292,64 +377,97 @@ export function connect() {
   };
 
   newWs.onclose = function (e) {
-    if (getWs() !== newWs) return;
-    if (connectTimeoutId) { clearTimeout(connectTimeoutId); connectTimeoutId = null; }
+    if (getWs() !== newWs || !lifecycle.current(attemptEpoch)) return;
     stopHeartbeat();
+    clearProbe();
     disconnectedAt = Date.now();
-    // Abnormal closes are the ones worth reporting: a clean close is either a
-    // deliberate navigation or a server shutdown the user already knows about.
-    if (e && !e.wasClean) {
-      console.warn("[clay] WebSocket closed abnormally: code=" + e.code +
-        " reason=" + (e.reason || "(none)") + " wasClean=false");
-    }
+    recordConnectionDiagnostic("close", e && e.code, attemptStartedAt ? Date.now() - attemptStartedAt : null);
     closeDmUserPicker();
     store.set({ activeProjectSlug: null, sessionActivatedProjectSlug: null });
     setStatus("disconnected");
     setActivity(null);
-    scheduleReconnect();
+    lifecycle.invalidate(attemptEpoch);
+    scheduleReconnect("close");
   };
 
-  newWs.onerror = function () {};
+  newWs.onerror = function () {
+    if (getWs() !== newWs || !lifecycle.current(attemptEpoch)) return;
+    recordConnectionDiagnostic("error", 0, null);
+    forceReplaceSocket("error", 0, attemptEpoch);
+  };
 
   newWs.onmessage = function (event) {
-    if (getWs() !== newWs) return;
+    if (getWs() !== newWs || !lifecycle.current(attemptEpoch)) return;
     // Backup: if we're receiving messages, we're connected
     if (!store.get('connected')) {
       setStatus("connected");
-      reconnectDelay = 1000;
-      if (reconnectTimer) { clearTimeout(reconnectTimer); reconnectTimer = null; }
+      lifecycle.clearRetry();
     }
 
     blinkIO();
     var msg;
     try { msg = JSON.parse(event.data); } catch (e) { return; }
-    if (msg.type === "pong" && heartbeatDeadlineTimer) {
+    lifecycle.markLive(attemptEpoch);
+    if (msg.type === "pong" && heartbeatDeadlineTimer && heartbeatAwaitingSocket === newWs) {
       clearTimeout(heartbeatDeadlineTimer);
       heartbeatDeadlineTimer = null;
+      heartbeatAwaitingSocket = null;
     }
+    if (msg.type === "pong" && probeSocket === newWs && lifecycle.current(probeEpoch)) clearProbe();
     processMessage(msg);
   };
 }
 
 export function cancelReconnect() {
-  if (reconnectTimer) { clearTimeout(reconnectTimer); reconnectTimer = null; }
+  clearProbe();
+  stopHeartbeat();
+  lifecycle.cancel();
 }
 
-export function scheduleReconnect() {
-  if (reconnectTimer) return;
-  reconnectTimer = setTimeout(function () {
-    reconnectTimer = null;
-    // Check if auth is still valid before reconnecting
-    fetch("/info").then(function (res) {
+function probeReconnect(reason) {
+  if (lifecycle.isOffline() || !lifecycle.current(lifecycle.getEpoch())) return;
+  var socket = getWs();
+  if (socket && socket.readyState === 0) return;
+  if (socket && socket.readyState === 1) {
+    if (probeTimer) return;
+    probeSocket = socket;
+    probeEpoch = lifecycle.getEpoch();
+    probeStartedAt = Date.now();
+    try { socket.send(JSON.stringify({ type: "ping" })); } catch (e) {
+      forceReplaceSocket("probe_error", 0, probeEpoch);
+      return;
+    }
+    probeTimer = setTimeout(function () {
+      probeTimer = null;
+      if (probeSocket === socket && lifecycle.current(probeEpoch) && getWs() === socket && socket.readyState === 1) forceReplaceSocket("probe_timeout", 0, probeEpoch);
+    }, 4000);
+    return;
+  }
+  scheduleReconnect(reason);
+}
+
+export function scheduleReconnect(reason) {
+  lifecycle.schedule(reason || "unknown", function (epoch) {
+    var authEpoch = epoch;
+    var controller = typeof AbortController === "function" ? new AbortController() : null;
+    var authToken = lifecycle.beginAuth(authEpoch, function () {
+      if (controller) controller.abort();
+      scheduleReconnect("auth_timeout");
+    }, function () {
+      if (controller) controller.abort();
+    });
+    if (!authToken) return;
+    fetch("/info", controller ? { signal: controller.signal } : undefined).then(function (res) {
+      if (!lifecycle.finishAuth(authEpoch, authToken)) return;
+      if (!lifecycle.canProceed(authEpoch)) return;
       if (res.status === 401) {
         location.reload();
         return;
       }
       connect();
     }).catch(function () {
-      // Server still down, try connecting anyway
-      connect();
+      var authFinished = lifecycle.finishAuth(authEpoch, authToken);
+      if (authFinished && lifecycle.canProceed(authEpoch)) connect();
     });
-  }, reconnectDelay);
-  reconnectDelay = Math.min(reconnectDelay * 1.5, 10000);
+  });
 }

package/lib/public/modules/app-messages.js

@@ -4,7 +4,8 @@ import { handleIssuesMessageInContext as handleIssuesMessage } from './issues-co
 // All dependencies are direct imports; no context injection needed.
 
 import { store } from './store.js';
-import { acknowledgeMessage, replayPendingMessages } from './message-delivery.js';
+import { acknowledgeMessage, activateDeliverySession, refreshDeliverySessionIdentity } from './message-delivery.js';
+import { initMessageDeliveryUi } from './message-delivery-ui.js';
 import { getWs } from './ws-ref.js';
 
 // --- Leaf module imports ---
@@ -30,6 +31,7 @@ import { syncPaneTitles, maybeRestoreSplitGroup, openGroup } from './split-view.
 import { showPairDialog, handlePairCreated, handleSplitDelegation, showWorkerDelegationNotice, hideWorkerDelegationNotice } from './split-pair-ui.js';
 import { handleSessionActionMessage } from './session-actions.js';
 import { renderWorkerProposal, updateWorkerProposal } from './worker-proposal.js';
+import { renderDriverContinuation, updateDriverContinuation, renderDriverContinuationContext } from './driver-continuation.js';
 import { handleInputSync, autoResize, builtinCommands, setScheduleBtnDisabled, sendShellResultToAgent, handleAcceptedOrdinaryMessage, handleScheduleMessageResult } from './input.js';
 import { startThinking, appendThinking, stopThinking, resetThinkingGroup, createToolItem, updateToolExecuting, updateToolResult, markAllToolsDone, closeToolGroup, removeToolFromGroup, resetToolState, getTools, getPlanContent, setPlanContent, renderPlanBanner, renderPlanCard, getTodoTools, handleTodoWrite, handleTaskCreate, handleTaskUpdate, applyDeadSessionTodoCompaction, isPlanFilePath, enableMainInput, addTurnMeta, updateSubagentActivity, addSubagentToolEntry, markSubagentDone, initSubagentStop, updateSubagentProgress, updateSubagentTaskStatus, renderAskUserQuestion, markAskUserAnswered, renderPermissionRequest, markPermissionCancelled, markPermissionResolved, renderElicitationRequest, markElicitationResolved, renderUserDialogRequest, markUserDialogResolved, updateThinkingTokens } from './tools.js';
 import { finishThinkingTurn, resumeThinkingAfterReplay } from './thinking-lifecycle.js';
@@ -97,6 +99,7 @@ var messagesEl = document.getElementById("messages");
 var headerTitleEl = document.getElementById("header-title");
 var inputEl = document.getElementById("input");
 var connectOverlay = document.getElementById("connect-overlay");
+initMessageDeliveryUi();
 
 export function processMessage(msg) {
   if (handleIssuesMessage(msg)) return;
@@ -756,6 +759,19 @@ export function processMessage(msg) {
         updateWorkerProposal(msg);
         break;
 
+      case "driver_continuation_proposal":
+        renderDriverContinuation(msg);
+        break;
+
+      case "driver_continuation_update":
+      case "driver_continuation_result":
+        updateDriverContinuation(msg);
+        break;
+
+      case "driver_continuation_context":
+        renderDriverContinuationContext(msg);
+        break;
+
       case "split_delegation":
         handleSplitDelegation(msg);
         syncPaneTitles();
@@ -825,10 +841,9 @@ export function processMessage(msg) {
         var _effectiveTerminalId = (typeof msg.runtimeTerminalId === "number")
           ? msg.runtimeTerminalId
           : (typeof msg.terminalId === "number" ? msg.terminalId : null);
-        store.set({ activeSessionId: msg.id, cliSessionId: msg.cliSessionId || null, currentModel: msg.model || "", currentEffort: msg.effort || store.get('currentEffort'), vendorCapabilities: msg.capabilities || {}, sessionIsProcessing: !!msg.isProcessing, activeSessionMode: _effectiveMode, activeTerminalId: _effectiveTerminalId, sessionHasHistory: !!msg.hasHistory, sessionVendorBound: !!msg.vendor || !!msg.hasHistory, sessionFullAccess: msg.permissionMode === "bypassPermissions", currentMode: msg.permissionMode || store.get('currentMode'), effectivePermissionMode: msg.effectivePermissionMode || null, permissionCapabilities: msg.permissionCapabilities || { auto: false, mcpOverride: false }, mcpPermissionModeOverrides: msg.mcpPermissionModeOverrides || {} });
         handleScheduledTaskSessionSwitched(msg);
         requestLoopInterviewState();
-        replayPendingMessages(msg.id);
+        activateDeliverySession(msg.id, msg.cliSessionId || null, msg.sessionOriginId || null);
         // TUI sessions swap the chat UI for an embedded xterm running
         // `claude` inside a real PTY. Mount or tear down before the rest of
         // the chat-side bookkeeping runs so we don't waste work on hidden DOM.
@@ -922,6 +937,7 @@ export function processMessage(msg) {
 
       case "session_id":
         store.set({ cliSessionId: msg.cliSessionId });
+        refreshDeliverySessionIdentity(msg.cliSessionId, store.get('sessionOriginId') || null);
         break;
 
       case "message_uuid":

package/lib/public/modules/driver-continuation-state.js

@@ -0,0 +1,76 @@
+function clean(value) {
+  return value === undefined || value === null ? "" : String(value);
+}
+
+export function continuationKey(message) {
+  if (!message) return "";
+  var projectSlug = clean(message.projectSlug);
+  var sourceOriginId = clean(message.sourceOriginId);
+  var proposalId = clean(message.proposalId);
+  if (!projectSlug || !sourceOriginId || !proposalId) return "";
+  return projectSlug + "\n" + sourceOriginId + "\n" + proposalId;
+}
+
+export function authoritativeState(message) {
+  return {
+    key: continuationKey(message),
+    projectSlug: clean(message.projectSlug),
+    sourceOriginId: clean(message.sourceOriginId),
+    proposalId: clean(message.proposalId),
+    sourceSessionId: Number(message.sourceSessionId),
+    status: message.status || "pending",
+    requestId: "",
+    requestKind: "",
+    inflight: false,
+    error: message.error || "",
+  };
+}
+
+export function beginRequest(state, kind, requestId, connected) {
+  if (!state || !state.key || state.inflight || connected !== true) return null;
+  if (kind === "decision" && state.status !== "pending") return null;
+  var next = Object.assign({}, state, {
+    inflight: true,
+    requestId: clean(requestId),
+    requestKind: kind,
+    error: "",
+  });
+  return next.requestId ? next : null;
+}
+
+export function applyResponse(state, message) {
+  if (!state || !message || continuationKey(message) !== state.key) return null;
+  if (message.requestId && clean(message.requestId) !== state.requestId) return null;
+  var next = Object.assign({}, state, { inflight: false, requestId: "", requestKind: "" });
+  var sourceSessionId = Number(message.sourceSessionId);
+  if (Number.isInteger(sourceSessionId) && sourceSessionId > 0) next.sourceSessionId = sourceSessionId;
+  if (message.status) next.status = message.status;
+  next.error = message.error || "";
+  return next;
+}
+
+export function failRequest(state, requestId, error) {
+  if (!state || !state.inflight || clean(requestId) !== state.requestId) return null;
+  return Object.assign({}, state, {
+    inflight: false,
+    requestId: "",
+    requestKind: "",
+    error: clean(error) || "The request could not be sent. Try again.",
+  });
+}
+
+export function sendContinuationPayload(ws, payload) {
+  if (!ws || ws.readyState !== 1) return { ok: false, error: "The connection is unavailable. Try again." };
+  try {
+    if (ws.send(JSON.stringify(payload)) === false) {
+      return { ok: false, error: "The request was not accepted by the connection. Try again." };
+    }
+  } catch (error) {
+    return { ok: false, error: "The request could not be sent. Try again." };
+  }
+  return { ok: true };
+}
+
+export function continuationCanAct(state, connected) {
+  return !!state && state.status === "pending" && !state.inflight && connected === true;
+}