clay-server 4.3.0-beta.4 → 4.3.0-beta.6

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

@@ -23,6 +23,7 @@ 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';
+import { createWebSocketWatchdog } from './websocket-watchdog.js';
 
 var connectOverlay = null;
 var hasConnectedOnce = false;
@@ -42,16 +43,9 @@ var overlayGraceTimer = null;
 // server-global-ws.js. Well under the common 60s proxy read timeout, and one
 // timer per live socket.
 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) {
@@ -60,6 +54,21 @@ var lifecycle = createWebSocketLifecycle({
     }
   }
 });
+var watchdog = createWebSocketWatchdog({
+  heartbeatIntervalMs: HEARTBEAT_MS,
+  heartbeatDeadlineMs: 10000,
+  probeTimeoutMs: 4000,
+  now: function () { return Date.now(); },
+  isCurrent: function (socket, epoch) {
+    return getWs() === socket && socket.readyState === 1 && lifecycle.current(epoch);
+  },
+  sendPing: function (socket) {
+    socket.send(JSON.stringify({ type: "ping" }));
+  },
+  onFailure: function (reason, epoch, latency) {
+    forceReplaceSocket(reason, 0, epoch, latency);
+  }
+});
 
 function clearOverlayGrace() {
   if (overlayGraceTimer) {
@@ -88,19 +97,10 @@ function recordConnectionDiagnostic(reason, code, latency) {
   });
 }
 
-function clearProbe() {
-  if (probeTimer) clearTimeout(probeTimer);
-  probeTimer = null;
-  probeSocket = null;
-  probeEpoch = 0;
-  probeStartedAt = 0;
-}
-
-function forceReplaceSocket(reason, code, epoch) {
+function forceReplaceSocket(reason, code, epoch, latency) {
   if (!lifecycle.current(epoch)) return;
   var socket = getWs();
-  var latency = probeStartedAt ? Date.now() - probeStartedAt : null;
-  clearProbe();
+  watchdog.clearProbe();
   stopHeartbeat();
   if (socket) {
     socket.onopen = null;
@@ -117,19 +117,11 @@ function forceReplaceSocket(reason, code, epoch) {
 }
 
 export function stopHeartbeat() {
-  if (heartbeatTimer) {
-    clearInterval(heartbeatTimer);
-    heartbeatTimer = null;
-  }
-  if (heartbeatDeadlineTimer) {
-    clearTimeout(heartbeatDeadlineTimer);
-    heartbeatDeadlineTimer = null;
-  }
-  heartbeatAwaitingSocket = null;
+  watchdog.stopHeartbeat();
 }
 
 function suspendSocketForOffline() {
-  clearProbe();
+  watchdog.clearProbe();
   stopHeartbeat();
   var socket = getWs();
   attemptSocket = null;
@@ -150,31 +142,26 @@ function suspendSocketForOffline() {
 // 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, attemptEpoch) {
-  stopHeartbeat();
-  if (!socket) return;
-  heartbeatTimer = setInterval(function () {
-    if (!socket || socket.readyState !== 1 || getWs() !== socket || !lifecycle.current(attemptEpoch)) {
-      stopHeartbeat();
-      return;
-    }
-    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 && lifecycle.current(attemptEpoch)) {
-        forceReplaceSocket("heartbeat_timeout", 0, attemptEpoch);
-      }
-    }, 10000);
-  }, HEARTBEAT_MS);
+  watchdog.startHeartbeat(socket, attemptEpoch);
+}
+
+function suspendSocketWatchdogs() {
+  // A frozen page cannot promise proxy keepalive. Retire its deadlines without
+  // closing the socket; resume performs a fresh bounded liveness check.
+  watchdog.suspend();
+}
+
+function resumeSocketWatchdogs(reason) {
+  var resumed = watchdog.resume();
+  var socket = getWs();
+  if (socket && socket.readyState === 1 && resumed) startHeartbeat(socket, lifecycle.getEpoch());
+  probeReconnect(reason);
 }
 
 export function initConnection() {
   connectOverlay = document.getElementById("connect-overlay");
   if (typeof navigator !== "undefined" && navigator.onLine === false) lifecycle.setOffline(true);
+  if (document.hidden) suspendSocketWatchdogs();
   window.addEventListener("clay-message-delivery-timeout", function (event) {
     var socket = event.detail && event.detail.socket;
     recordConnectionDiagnostic("ack-timeout", 0, null);
@@ -186,17 +173,19 @@ export function initConnection() {
   });
   window.addEventListener("online", function () {
     lifecycle.wake(function () {
-      var socket = getWs();
-      if (socket && socket.readyState === 1) startHeartbeat(socket, lifecycle.getEpoch());
-      probeReconnect("online");
+      if (document.hidden) return;
+      resumeSocketWatchdogs("online");
     });
   });
   document.addEventListener("visibilitychange", function () {
-    if (!document.hidden) {
-      var socket = getWs();
-      if (socket && socket.readyState === 1) startHeartbeat(socket, lifecycle.getEpoch());
-      probeReconnect("visible");
-    }
+    if (document.hidden) suspendSocketWatchdogs();
+    else resumeSocketWatchdogs("visible");
+  });
+  document.addEventListener("freeze", function () {
+    suspendSocketWatchdogs();
+  });
+  document.addEventListener("resume", function () {
+    if (!document.hidden) resumeSocketWatchdogs("visible");
   });
 
   // --- Reactive UI sync for connected/processing state ---
@@ -379,7 +368,7 @@ export function connect() {
   newWs.onclose = function (e) {
     if (getWs() !== newWs || !lifecycle.current(attemptEpoch)) return;
     stopHeartbeat();
-    clearProbe();
+    watchdog.clearProbe();
     disconnectedAt = Date.now();
     recordConnectionDiagnostic("close", e && e.code, attemptStartedAt ? Date.now() - attemptStartedAt : null);
     closeDmUserPicker();
@@ -408,18 +397,13 @@ export function connect() {
     var msg;
     try { msg = JSON.parse(event.data); } catch (e) { return; }
     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();
+    if (msg.type === "pong") watchdog.acceptPong(newWs, attemptEpoch);
     processMessage(msg);
   };
 }
 
 export function cancelReconnect() {
-  clearProbe();
+  watchdog.clearProbe();
   stopHeartbeat();
   lifecycle.cancel();
 }
@@ -429,18 +413,7 @@ function probeReconnect(reason) {
   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);
+    watchdog.probe(socket, lifecycle.getEpoch());
     return;
   }
   scheduleReconnect(reason);

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

@@ -62,6 +62,7 @@ import { handleShellCommandResult } from './shell-command.js';
 import { handleLoopRegistryUpdated, handleScheduleRunStarted, handleScheduleRunFinished, handleLoopScheduled, isSchedulerOpen, enterCraftingMode, exitCraftingMode, handleLoopRegistryFiles } from './scheduler.js';
 import { handleScheduledTaskMessage, handleScheduledTaskSessionSwitched } from './scheduled-tasks.js';
 import { renderGeneratedImage, renderImageGenerationProgress, clearImageGenerationProgress, clearAllImageGenerationProgress } from './generated-images.js';
+import { clearPairResultStatus, handlePairResultStatus } from './pair-result-status.js';
 
 // --- App module imports ---
 import { scrollToBottom, addToMessages, addUserMessage, addSystemMessage, removeMatePreThinking, appendDelta, finalizeAssistantBlock, addConflictMessage, addContextOverflowMessage, showSuggestionChips, armStickyBottom, VENDOR_AVATARS, VENDOR_NAMES } from './app-rendering.js';
@@ -243,6 +244,7 @@ export function processMessage(msg) {
         // Restore cached rich context usage BEFORE updateContextPanel runs
         if (msg.contextUsage && !msg.contextUsage.unavailable) store.set({ richContextUsage: msg.contextUsage });
         else markContextUnavailable();
+
         // Restore accurate context data from the last result in full history
         if (msg.lastUsage || msg.lastModelUsage) {
           accumulateContext(msg.lastCost, msg.lastUsage, msg.lastModelUsage, msg.lastStreamInputTokens);
@@ -735,6 +737,10 @@ export function processMessage(msg) {
         if (!msg.ok && msg.error) showToast(msg.error, "error");
         break;
 
+      case "split_worker_close_result":
+        if (!msg.ok && msg.error) showToast(msg.error, "error");
+        break;
+
       case "pair_session_options":
         showPairDialog(msg);
         break;
@@ -804,6 +810,10 @@ export function processMessage(msg) {
         handleRemoteSelection(msg);
         break;
 
+      case "pair_result_status":
+        handlePairResultStatus(msg);
+        break;
+
       case "session_io":
         blinkSessionDot(msg.id);
         break;
@@ -823,6 +833,7 @@ export function processMessage(msg) {
         break;
 
       case "session_switched":
+        clearPairResultStatus();
         syncAutonomousRunForSession(msg.autonomousRun || null);
         closeWhatsNewArticle();
         // Save draft from outgoing session

package/lib/public/modules/pair-result-status.js

@@ -0,0 +1,87 @@
+import { store } from './store.js';
+import { getWs } from './ws-ref.js';
+import { showConfirm } from './app-misc.js';
+
+var statusGeneration = 0;
+
+function retrySource(item) {
+  return { item: item, generation: statusGeneration, projectSlug: store.get("currentSlug") || store.get("activeProjectSlug") || null,
+    sessionId: store.get("activeSessionId"), userId: store.get("myUserId") || null, ws: getWs() };
+}
+
+function sendRetry(source, confirmed) {
+  var ws = getWs();
+  var projectSlug = store.get("currentSlug") || store.get("activeProjectSlug") || null;
+  var items = store.get("pairResultStatus") || [];
+  var stillVisible = items.some(function (item) { return item.id === source.item.id; });
+  if (!ws || ws !== source.ws || ws.readyState !== 1 || statusGeneration !== source.generation ||
+      store.get("activeSessionId") !== source.sessionId || projectSlug !== source.projectSlug ||
+      (store.get("myUserId") || null) !== source.userId || !stillVisible) return false;
+  ws.send(JSON.stringify({ type: "pair_result_retry", id: source.item.id, confirmDuplicate: confirmed === true,
+    sessionId: source.sessionId, projectSlug: source.projectSlug }));
+  return true;
+}
+
+function retry(item) {
+  var source = retrySource(item);
+  if (item.confirmDuplicate) {
+    showConfirm("The Driver may already have received this completed result. Retry delivery anyway? This can cause a duplicate result receipt.", function () {
+      sendRetry(source, true);
+    }, "Retry delivery", false);
+    return;
+  }
+  sendRetry(source, false);
+}
+
+function renderPairResultStatus() {
+  var existing = document.getElementById("pair-result-status");
+  if (existing) existing.remove();
+  var items = store.get("pairResultStatus") || [];
+  if (!items.length) return;
+  var messages = document.getElementById("messages");
+  if (!messages || !messages.parentElement) return;
+  var section = document.createElement("section");
+  section.id = "pair-result-status";
+  section.className = "pair-result-status";
+  section.setAttribute("role", "status");
+  for (var i = 0; i < items.length; i++) {
+    var item = items[i], card = document.createElement("div");
+    card.className = "pair-result-status-card pair-result-status-" + item.state;
+    var title = document.createElement("strong");
+    title.textContent = item.state === "blocked" ? "Split Worker result blocked" :
+      (item.state === "uncertain" ? (item.hasCompletedResult === false ? "Split Worker recovery uncertain" : "Split Worker result delivery uncertain") : "Split Worker result pending");
+    var message = document.createElement("span");
+    message.textContent = item.message || "The completed result is retained.";
+    card.appendChild(title); card.appendChild(message);
+    if (item.hasCompletedResult !== false) {
+      var details = document.createElement("details"), summary = document.createElement("summary"), body = document.createElement("pre");
+      summary.textContent = "View completed result";
+      body.textContent = item.error ? "Error: " + item.error : (item.response || "No text response was recorded.");
+      details.appendChild(summary); details.appendChild(body); card.appendChild(details);
+    }
+    if (item.canRetry) {
+      var button = document.createElement("button");
+      button.type = "button"; button.className = "confirm-btn confirm-ok pair-result-status-retry"; button.textContent = "Retry delivery";
+      button.addEventListener("click", retry.bind(null, item));
+      card.appendChild(button);
+    }
+    section.appendChild(card);
+  }
+  messages.parentElement.insertBefore(section, messages);
+}
+
+function handlePairResultStatus(msg) {
+  if (!msg || msg.sessionId !== store.get("activeSessionId")) return false;
+  statusGeneration++;
+  store.set({ pairResultStatus: Array.isArray(msg.items) ? msg.items : [] });
+  renderPairResultStatus();
+  return true;
+}
+
+function clearPairResultStatus() {
+  statusGeneration++;
+  store.set({ pairResultStatus: [] });
+  renderPairResultStatus();
+}
+
+export { clearPairResultStatus, handlePairResultStatus, renderPairResultStatus };

package/lib/public/modules/project-activation.js

@@ -59,19 +59,22 @@ export function isProjectSessionReady(state, socket) {
 }
 
 export function splitPanesMatchProject(split, slug) {
-  if (!split || !Array.isArray(split.panes) || split.panes.length !== 2 || !slug) return false;
-  return split.panes[0].slug === slug && split.panes[1].slug === slug;
+  if (!split || !Array.isArray(split.panes) || split.panes.length < 2 || split.panes.length > 3 || !slug) return false;
+  for (var i = 0; i < split.panes.length; i++) if (split.panes[i].slug !== slug) return false;
+  return true;
 }
 
 export function hasCurrentSplitGroup(split, groups) {
   if (!split || !split.groupId) return true;
   var members = split.panes && split.panes.map(function (pane) { return pane.sessionId; });
-  if (!members || members.length !== 2) return false;
+  if (!members || members.length < 2 || members.length > 3) return false;
   var available = Array.isArray(groups) ? groups : [];
   for (var i = 0; i < available.length; i++) {
     var group = available[i];
-    if (group.id !== split.groupId || !Array.isArray(group.members) || group.members.length !== 2) continue;
-    if (group.members.indexOf(members[0]) !== -1 && group.members.indexOf(members[1]) !== -1) return true;
+    if (group.id !== split.groupId || !Array.isArray(group.members) || group.members.length !== members.length) continue;
+    var matches = true;
+    for (var mi = 0; mi < members.length; mi++) if (group.members.indexOf(members[mi]) === -1) matches = false;
+    if (matches) return true;
   }
   return false;
 }
@@ -84,8 +87,8 @@ export function reconcileRestoredSplit(split, groups) {
     if (group.id !== split.groupId) continue;
     var oldMembers = split.panes && split.panes.map(function (pane) { return pane.sessionId; });
     var members = Array.isArray(group.members) ? group.members : [];
-    if (oldMembers && oldMembers.length === 2 && members.length === 2
-        && members.indexOf(oldMembers[0]) !== -1 && members.indexOf(oldMembers[1]) !== -1) {
+    if (oldMembers && oldMembers.length === members.length
+        && oldMembers.every(function (id) { return members.indexOf(id) !== -1; })) {
       return { action: "keep", group: group };
     }
     return { action: "rebuild", group: group };

package/lib/public/modules/sidebar-sessions.js

@@ -1429,14 +1429,20 @@ function renderSplitGroupItem(group, members) {
       escapeHtml(VENDOR_NAMES[vendor] || vendor) + '">';
   }
   html += "</span>";
-  if (members[0].isProcessing || members[1].isProcessing) html += '<span class="session-processing"></span>';
-  var splitBackgroundTaskCount = (members[0].backgroundTaskCount || 0) + (members[1].backgroundTaskCount || 0);
+  var splitProcessing = false;
+  var splitBackgroundTaskCount = 0;
+  for (var si = 0; si < members.length; si++) {
+    if (members[si].isProcessing) splitProcessing = true;
+    splitBackgroundTaskCount += members[si].backgroundTaskCount || 0;
+  }
+  if (splitProcessing) html += '<span class="session-processing"></span>';
   if (splitBackgroundTaskCount) html += '<span class="session-background-task-count">' + splitBackgroundTaskCount + '</span>';
   html += '<span class="split-group-name">' + highlightMatch(group.name || "Split", searchQuery) + "</span>";
   text.innerHTML = html;
   el.appendChild(text);
 
-  var unread = (members[0].unread || 0) + (members[1].unread || 0);
+  var unread = 0;
+  for (var ui = 0; ui < members.length; ui++) unread += members[ui].unread || 0;
   var badge = document.createElement("span");
   badge.className = "session-unread-badge" + (unread > 0 ? " has-unread" : "");
   badge.dataset.splitGroupId = group.id;
@@ -1532,15 +1538,24 @@ export function renderSessionList(sessions) {
   }
   for (var sg = 0; sg < splitGroups.length; sg++) {
     var splitGroup = splitGroups[sg];
-    var leftMember = sessionsById.get(splitGroup.members[0]);
-    var rightMember = sessionsById.get(splitGroup.members[1]);
-    if (!leftMember || !rightMember) continue;
-    if (hierarchySessionIds.has(leftMember.id) || hierarchySessionIds.has(rightMember.id)) continue;
+    var splitMembers = [];
+    for (var smi = 0; smi < splitGroup.members.length; smi++) {
+      var splitMember = sessionsById.get(splitGroup.members[smi]);
+      if (splitMember) splitMembers.push(splitMember);
+    }
+    if (splitMembers.length !== splitGroup.members.length) continue;
+    var hasHierarchyMember = false;
+    for (var hmi = 0; hmi < splitMembers.length; hmi++) {
+      if (hierarchySessionIds.has(splitMembers[hmi].id)) hasHierarchyMember = true;
+    }
+    if (hasHierarchyMember) continue;
+    var splitLastActivity = 0;
+    for (var lai = 0; lai < splitMembers.length; lai++) splitLastActivity = Math.max(splitLastActivity, splitMembers[lai].lastActivity || 0);
     items.push({
       type: "split-group",
       group: splitGroup,
-      members: [leftMember, rightMember],
-      lastActivity: Math.max(leftMember.lastActivity || 0, rightMember.lastActivity || 0),
+      members: splitMembers,
+      lastActivity: splitLastActivity,
     });
   }
   var groupKeys = Object.keys(loopGroups);
@@ -1567,8 +1582,13 @@ export function renderSessionList(sessions) {
       continue;
     }
     if ((item.type === "driver-hierarchy" || item.type === "orphan-workers") && !hierarchyItemMatches(item, searchMatchIds)) continue;
-    if (item.type === "split-group" && searchMatchIds !== null &&
-        !searchMatchIds.has(item.members[0].id) && !searchMatchIds.has(item.members[1].id)) continue;
+    if (item.type === "split-group" && searchMatchIds !== null) {
+      var splitSearchMatch = false;
+      for (var splitSearchIndex = 0; splitSearchIndex < item.members.length; splitSearchIndex++) {
+        if (searchMatchIds.has(item.members[splitSearchIndex].id)) splitSearchMatch = true;
+      }
+      if (!splitSearchMatch) continue;
+    }
     if ((item.type === "session" || item.type === "driver-hierarchy") && item.data && item.data.bookmarked) {
       bookmarkedItems.push(item);
     } else {

package/lib/public/modules/split-group-helpers.js

@@ -12,15 +12,87 @@ export function findSplitGroup(groups, memberIds) {
   var list = groups || [];
   for (var i = 0; i < list.length; i++) {
     var members = list[i].members || [];
-    if (members.length === 2 && members[0] === memberIds[0] && members[1] === memberIds[1]) return list[i];
+    if (members.length !== memberIds.length) continue;
+    var matches = true;
+    for (var j = 0; j < memberIds.length; j++) {
+      if (members.indexOf(memberIds[j]) === -1) { matches = false; break; }
+    }
+    if (matches) return list[i];
   }
   return null;
 }
 
+// Resolve the visible order from the explicit role contract. Member array
+// order is persistence detail and must never decide who is the Driver.
+export function splitGroupRoles(group) {
+  if (!group || !Array.isArray(group.members)) return null;
+  var pair = group.pair;
+  if (!pair || typeof pair !== "object" || Array.isArray(pair)) return null;
+  var hasVersion = Object.prototype.hasOwnProperty.call(pair, "version");
+  var hasLegacyWorker = Object.prototype.hasOwnProperty.call(pair, "workerId");
+  var hasWorkerIds = Object.prototype.hasOwnProperty.call(pair, "workerIds");
+  if (hasVersion && pair.version !== 2) return null;
+  if (hasVersion && hasLegacyWorker) return null;
+  if (hasVersion && !hasWorkerIds) return null;
+  if (!hasVersion && hasWorkerIds) return null;
+  if (!hasVersion && !hasLegacyWorker) return null;
+  var driverId = pair.driverId;
+  var workerIds = hasWorkerIds ? (Array.isArray(pair.workerIds) ? pair.workerIds.slice() : []) :
+    (pair.workerId !== undefined ? [pair.workerId] : []);
+  if (!Number.isInteger(driverId) || workerIds.length < 1 || workerIds.length > 2) return null;
+  if (group.members.indexOf(driverId) === -1) return null;
+  var ordered = [driverId];
+  for (var i = 0; i < workerIds.length; i++) {
+    if (!Number.isInteger(workerIds[i]) || workerIds[i] === driverId || group.members.indexOf(workerIds[i]) === -1 || ordered.indexOf(workerIds[i]) !== -1) return null;
+    ordered.push(workerIds[i]);
+  }
+  if (group.members.length !== ordered.length) return null;
+  for (var mi = 0; mi < group.members.length; mi++) if (ordered.indexOf(group.members[mi]) === -1) return null;
+  return { driverId: driverId, workerIds: workerIds, orderedIds: ordered, version: pair.version || null };
+}
+
+export function splitGroupMemberIds(group) {
+  var roles = splitGroupRoles(group);
+  return roles ? roles.orderedIds : (group && Array.isArray(group.members) ? group.members.slice() : []);
+}
+
+export function splitGroupActiveAnchor(group, activeId) {
+  var roles = splitGroupRoles(group);
+  if (roles) return roles.driverId;
+  var members = group && Array.isArray(group.members) ? group.members : [];
+  return members.indexOf(activeId) !== -1 ? activeId : (members[0] || null);
+}
+
 export function isConfiguredWorker(groups, sessionId) {
   var list = groups || [];
   for (var i = 0; i < list.length; i++) {
-    if (list[i].pair && list[i].pair.workerId === sessionId) return true;
+    var roles = splitGroupRoles(list[i]);
+    if (roles && roles.workerIds.indexOf(sessionId) !== -1) return true;
   }
   return false;
 }
+
+export function splitWorkerCloseRequest(group, sessions, projectSlug, workerId, requestId) {
+  var roles = splitGroupRoles(group);
+  if (!roles || roles.version !== 2 || roles.workerIds.indexOf(workerId) === -1) return null;
+  var anchors = group && group.pairAnchors;
+  if (!anchors || anchors.version !== 2 || !anchors.driver || !Array.isArray(anchors.workers)) return null;
+  var workerIndex = roles.workerIds.indexOf(workerId);
+  var workerAnchor = anchors.workers[workerIndex];
+  var worker = null;
+  var list = sessions || [];
+  for (var i = 0; i < list.length; i++) if (list[i].id === workerId) worker = list[i];
+  if (!workerAnchor || !anchors.driver.origin || !workerAnchor.origin || !worker || !Number.isInteger(worker.workerGeneration)) return null;
+  return {
+    type: "split_worker_close",
+    requestId: requestId,
+    projectSlug: projectSlug,
+    groupId: group.id,
+    driverId: roles.driverId,
+    driverOriginId: anchors.driver.origin,
+    workerId: workerId,
+    workerOriginId: workerAnchor.origin,
+    generation: worker.workerGeneration,
+    expectedWorkerIds: roles.workerIds.slice(),
+  };
+}

package/lib/public/modules/split-pair-ui.js

@@ -5,6 +5,7 @@ import { buildAgentVendorSelect, fillAgentModels, buildAgentEffortSelect, fillAg
 import { showToast } from './utils.js';
 import { getCachedSessions } from './sidebar-sessions.js';
 import { appendWorkerRuntime } from './split-worker-runtime.js';
+import { splitGroupRoles } from './split-group-helpers.js';
 
 var pairDialog = null;
 // Set when the dialog was opened via "Add Split Worker" on an existing session:
@@ -245,6 +246,8 @@ export function syncPairChrome(host, split) {
   var paneEls = host.querySelectorAll(".split-pane");
   for (var paneIndex = 0; paneIndex < paneEls.length; paneIndex++) {
     paneEls[paneIndex].classList.remove("split-pane-role-driver", "split-pane-role-worker");
+    paneEls[paneIndex].style.removeProperty("--split-pane-order");
+    paneEls[paneIndex].style.removeProperty("--split-worker-row");
   }
   var runtimeHeaders = host.querySelectorAll(".has-worker-runtime");
   for (var ri = 0; ri < runtimeHeaders.length; ri++) runtimeHeaders[ri].classList.remove("has-worker-runtime");
@@ -268,10 +271,23 @@ export function syncPairChrome(host, split) {
     }
     return;
   }
+  var roles = splitGroupRoles(group);
+  if (!roles) return;
+  var workerIndex = 0;
   for (var pi = 0; pi < split.panes.length && pi < headers.length; pi++) {
-    (function (sessionId, header) {
-      var isDriver = sessionId === group.pair.driverId;
-      if (paneEls[pi]) paneEls[pi].classList.add(isDriver ? "split-pane-role-driver" : "split-pane-role-worker");
+    var desiredPane = split.panes[pi];
+    var desiredPaneEl = null;
+    for (var pei = 0; pei < paneEls.length; pei++) {
+      if (paneEls[pei].dataset.sessionId === String(desiredPane.sessionId)) desiredPaneEl = paneEls[pei];
+    }
+    if (!desiredPaneEl) continue;
+    (function (sessionId, header, paneEl) {
+      var isDriver = sessionId === roles.driverId;
+      if (paneEl) {
+        paneEl.classList.add(isDriver ? "split-pane-role-driver" : "split-pane-role-worker");
+        paneEl.style.setProperty("--split-pane-order", isDriver ? "2" : String(workerIndex));
+        if (!isDriver) paneEl.style.setProperty("--split-worker-row", String(workerIndex + 1));
+      }
       var role = isDriver ? "Driver" : "Split Worker";
       var badge = document.createElement("span");
       badge.className = "split-pair-role split-pair-role-" + role.toLowerCase().replace(/ /g, "-");
@@ -287,18 +303,24 @@ export function syncPairChrome(host, split) {
           if (sessions[wi].id === sessionId) { workerSession = sessions[wi]; break; }
         }
         appendWorkerRuntime(header, workerSession);
+        workerIndex++;
       }
-    })(split.panes[pi].sessionId, headers[pi]);
+    })(desiredPane.sessionId, desiredPaneEl.querySelector(".split-pane-header"), desiredPaneEl);
   }
   var active = (store.get('splitDelegations') || {})[group.id];
   if (!active || !active.active) return;
   host.classList.add("split-delegating");
   var fromIndex = split.panes[0].sessionId === active.from ? 0 : 1;
   host.classList.add(fromIndex === 0 ? "split-direction-right" : "split-direction-left");
-  for (var si = 0; si < split.panes.length && si < headers.length; si++) {
+  for (var si = 0; si < split.panes.length; si++) {
+    var livePane = null;
+    for (var lpi = 0; lpi < paneEls.length; lpi++) {
+      if (paneEls[lpi].dataset.sessionId === String(split.panes[si].sessionId)) livePane = paneEls[lpi];
+    }
+    if (!livePane) continue;
     var live = document.createElement("span");
     live.className = "split-pair-live";
     live.textContent = split.panes[si].sessionId === active.to ? "Following direction" : "Waiting";
-    headers[si].appendChild(live);
+    livePane.querySelector(".split-pane-header").appendChild(live);
   }
 }

package/lib/public/modules/split-pane-reconciler.js

@@ -0,0 +1,28 @@
+// Keyed DOM reconciliation for the parent split shell. Existing pane nodes
+// (and their iframe browsing contexts) are reused by stable project/session
+// identity while metadata and visual order are refreshed.
+
+export function splitPaneIdentity(pane) {
+  return String(pane && pane.slug || "") + "#" + String(pane && pane.sessionId || "");
+}
+
+export function reconcileSplitPanes(host, panes, createPane, updatePane) {
+  var desired = Array.isArray(panes) ? panes : [];
+  var existing = host.querySelectorAll(".split-pane");
+  var byKey = new Map();
+  for (var i = 0; i < existing.length; i++) byKey.set(existing[i].dataset.splitPaneKey, existing[i]);
+  var used = new Set();
+  for (var pi = 0; pi < desired.length; pi++) {
+    var pane = desired[pi];
+    var key = splitPaneIdentity(pane);
+    var paneEl = byKey.get(key);
+    if (!paneEl) paneEl = createPane(pane, pi);
+    paneEl.dataset.splitPaneKey = key;
+    updatePane(paneEl, pane, pi);
+    used.add(paneEl);
+    if (!paneEl.parentNode) host.appendChild(paneEl);
+  }
+  for (var ei = existing.length - 1; ei >= 0; ei--) {
+    if (!used.has(existing[ei])) existing[ei].remove();
+  }
+}