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

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

@@ -0,0 +1,107 @@
+import { store } from './store.js';
+import { getWs } from './ws-ref.js';
+import { getCachedSessions } from './sidebar-sessions.js';
+import { iconHtml } from './icons.js';
+import { formatTokens } from './app-panels.js';
+import { VENDOR_AVATARS, VENDOR_NAMES } from './app-rendering.js';
+import { createPermissionControl, bindPermissionControl, renderPermissionControl } from './permission-control.js';
+import { splitGroupRoles } from './split-group-helpers.js';
+
+function sessionById(sessionId) {
+  var sessions = getCachedSessions() || [];
+  for (var i = 0; i < sessions.length; i++) if (sessions[i].id === sessionId) return sessions[i];
+  return null;
+}
+
+function paneUrl(pane) {
+  return "/p/" + encodeURIComponent(pane.slug) + "/?pane=1&session=" + encodeURIComponent(pane.sessionId);
+}
+
+function startPaneRename(header, titleEl, pane) {
+  if (header.querySelector(".split-pane-rename-input")) return;
+  var input = document.createElement("input");
+  input.type = "text"; input.className = "split-pane-rename-input"; input.value = pane.title;
+  titleEl.style.display = "none"; header.insertBefore(input, titleEl); input.focus(); input.select();
+  var done = false;
+  function finish(commit) {
+    if (done) return;
+    done = true;
+    var newTitle = input.value.trim(); input.remove(); titleEl.style.display = "";
+    if (!commit || !newTitle || newTitle === pane.title) return;
+    pane.title = newTitle; titleEl.textContent = newTitle;
+    var ws = getWs();
+    if (ws && ws.readyState === 1) ws.send(JSON.stringify({ type: "rename_session", id: pane.sessionId, title: newTitle }));
+  }
+  input.addEventListener("keydown", function (event) {
+    if (event.key === "Enter") { event.preventDefault(); finish(true); }
+    if (event.key === "Escape") { event.preventDefault(); finish(false); }
+  });
+  input.addEventListener("blur", function () { finish(true); });
+  input.addEventListener("click", function (event) { event.stopPropagation(); });
+}
+
+function permissionState(session) {
+  var mode = session && (session.runtimeMode || session.mode || "gui");
+  var worker = !!session && isConfiguredWorker(store.get('splitGroups'), session.id);
+  return {
+    projectSlug: store.get('currentSlug'), sessionId: session && session.id,
+    vendor: session && session.vendor || store.get('currentVendor') || "claude",
+    permissionMode: session && session.permissionMode || "default",
+    effectivePermissionMode: session && session.effectivePermissionMode || null,
+    permissionCapabilities: session && session.permissionCapabilities || { auto: false, mcpOverride: false },
+    connected: store.get('connected'), globalPermissionModeForced: store.get('skipPermsEnabled') === true,
+    visible: !!session && !worker && mode === "gui", locked: worker,
+  };
+}
+
+function isConfiguredWorker(groups, sessionId) {
+  for (var i = 0; i < (groups || []).length; i++) {
+    var roles = splitGroupRoles(groups[i]);
+    if (roles && roles.workerIds.indexOf(sessionId) !== -1) return true;
+  }
+  return false;
+}
+
+export function updatePaneFullAccessButton(button, session) {
+  if (button) renderPermissionControl(button, permissionState(session));
+}
+
+export function createSplitPane(pane, closePane) {
+  var paneEl = document.createElement("section"); paneEl.className = "split-pane";
+  var header = document.createElement("header"); header.className = "split-pane-header"; header.title = pane.title;
+  var session = sessionById(pane.sessionId); var vendor = session && session.vendor || "claude";
+  var vendorIcon = document.createElement("img"); vendorIcon.className = "split-pane-vendor";
+  vendorIcon.src = VENDOR_AVATARS[vendor] || VENDOR_AVATARS.claude; vendorIcon.alt = ""; vendorIcon.title = VENDOR_NAMES[vendor] || vendor; header.appendChild(vendorIcon);
+  var title = document.createElement("span"); title.className = "split-pane-title"; title.textContent = pane.title; title.title = "Rename session";
+  title.addEventListener("click", function () { startPaneRename(header, title, pane); }); header.appendChild(title);
+  var frame = document.createElement("iframe"); frame.className = "split-pane-frame"; frame.dataset.projectSlug = pane.slug;
+  frame.dataset.sessionId = String(pane.sessionId); frame.src = paneUrl(pane); frame.title = pane.title;
+  var ctxChip = document.createElement("button"); ctxChip.type = "button"; ctxChip.className = "split-pane-context"; ctxChip.title = "Context usage";
+  ctxChip.innerHTML = '<span class="split-pane-context-bar"><span class="split-pane-context-fill"></span></span><span class="split-pane-context-label"></span>';
+  ctxChip.addEventListener("click", function () { if (frame.contentWindow) frame.contentWindow.postMessage({ type: "clay-pane-toggle-context" }, window.location.origin); }); header.appendChild(ctxChip);
+  var fullAccess = createPermissionControl("split-pane-full-access hidden", "Driver session permission mode");
+  updatePaneFullAccessButton(fullAccess, session); bindPermissionControl(fullAccess, function () { return permissionState(sessionById(pane.sessionId)); }); header.appendChild(fullAccess); header.insertBefore(fullAccess, ctxChip);
+  var close = document.createElement("button"); close.type = "button"; close.className = "split-pane-close"; close.title = "Close pane"; close.setAttribute("aria-label", "Close pane"); close.innerHTML = iconHtml("x");
+  close.dataset.sessionId = String(pane.sessionId); close.addEventListener("click", function () { closePane(Number(this.dataset.sessionId)); }); header.appendChild(close);
+  paneEl.appendChild(header); paneEl.appendChild(frame); return paneEl;
+}
+
+export function updateSplitPaneMetadata(paneEl, pane) {
+  var session = sessionById(pane.sessionId); var header = paneEl.querySelector(".split-pane-header");
+  var title = paneEl.querySelector(".split-pane-title"); var frame = paneEl.querySelector(".split-pane-frame"); var vendor = paneEl.querySelector(".split-pane-vendor");
+  paneEl.dataset.sessionId = String(pane.sessionId); paneEl.dataset.projectSlug = pane.slug;
+  if (header) header.title = pane.title; if (title && title.style.display !== "none") title.textContent = pane.title; if (frame) frame.title = pane.title;
+  if (vendor) { var vendorName = session && session.vendor || "claude"; vendor.src = VENDOR_AVATARS[vendorName] || VENDOR_AVATARS.claude; vendor.title = VENDOR_NAMES[vendorName] || vendorName; }
+  var close = paneEl.querySelector(".split-pane-close");
+  if (close) {
+    close.dataset.sessionId = String(pane.sessionId); close.disabled = false; close.title = "Close pane"; close.setAttribute("aria-label", close.title);
+  }
+}
+
+export function updatePaneContextChip(paneEl, msg) {
+  if (!paneEl) return; var chip = paneEl.querySelector(".split-pane-context"); if (!chip) return; var pct = msg.pct || 0; if (pct <= 0) return;
+  chip.classList.add("has-data"); var fill = chip.querySelector(".split-pane-context-fill"); var label = chip.querySelector(".split-pane-context-label");
+  fill.style.width = Math.min(100, pct).toFixed(1) + "%"; fill.className = "split-pane-context-fill" + (msg.cls || ""); label.textContent = pct.toFixed(0) + "%";
+  var tip = "Context " + pct.toFixed(0) + "% (" + formatTokens(msg.used || 0) + " / " + formatTokens(msg.win || 0) + " tokens)";
+  if (msg.cost) tip += " · $" + msg.cost.toFixed(4); if (msg.model && msg.model !== "-") tip += " · " + msg.model; chip.title = tip;
+}

package/lib/public/modules/split-view.js

@@ -3,20 +3,19 @@
 import { store } from './store.js';
 import { getWs } from './ws-ref.js';
 import { getCachedSessions } from './sidebar-sessions.js';
-import { iconHtml, refreshIcons } from './icons.js';
+import { refreshIcons } from './icons.js';
 import { detachTuiView } from './session-tui-view.js';
-import { formatTokens } from './app-panels.js';
-import { VENDOR_AVATARS, VENDOR_NAMES } from './app-rendering.js';
-import { groupedSessionIds, findSplitGroup, isConfiguredWorker } from './split-group-helpers.js';
+import { groupedSessionIds, findSplitGroup, isConfiguredWorker, splitGroupRoles, splitGroupMemberIds, splitGroupActiveAnchor, splitWorkerCloseRequest } from './split-group-helpers.js';
 import { syncPairChrome } from './split-pair-ui.js';
 import { presentMarkdownEdit } from './filebrowser.js';
 import { autoStartLoginIfNeeded } from './vendor-login.js';
 import { isCurrentProjectSessionReady } from './split-session-boundary.js';
-import { splitPanesMatchProject, hasCurrentSplitGroup, reconcileRestoredSplit } from './project-activation.js';
+import { splitPanesMatchProject, reconcileRestoredSplit } from './project-activation.js';
 import { handlePaneIssueMessage } from './pane-issue-bridge.js';
 import { handlePaneFileMessage, revealFilesPanel } from './pane-file-bridge.js';
 import { openFile } from './filebrowser.js';
-import { bindPermissionControl, createPermissionControl, renderPermissionControl } from './permission-control.js';
+import { reconcileSplitPanes } from './split-pane-reconciler.js';
+import { createSplitPane, updateSplitPaneMetadata, updatePaneContextChip, updatePaneFullAccessButton } from './split-pane-renderer.js';
 
 var host = null;
 var nativeApp = null;
@@ -59,10 +58,6 @@ function paneForSession(sessionId) {
   };
 }
 
-function paneUrl(pane) {
-  return "/p/" + encodeURIComponent(pane.slug) + "/?pane=1&session=" + encodeURIComponent(pane.sessionId);
-}
-
 // Arc-style drop preview: hovering one half folds the live app into the
 // other half and shows a ghost pane where the dragged session will land.
 function setPreviewSide(side) {
@@ -99,48 +94,28 @@ function switchNativeSession(sessionId, expectedSlug) {
   }
 }
 
-function closePane(index) {
+function closePane(sessionId) {
   var split = store.get('splitPanes');
-  if (!split || !split.panes || split.panes.length !== 2) return;
+  if (!split || !split.panes || split.panes.length < 2) return;
+  var index = -1;
+  for (var pi = 0; pi < split.panes.length; pi++) if (split.panes[pi].sessionId === sessionId) index = pi;
+  if (index === -1) return;
   if (split.groupId && getWs() && getWs().readyState === 1) {
-    getWs().send(JSON.stringify({ type: "split_group_dissolve", id: split.groupId }));
-  }
-  switchNativeSession(split.panes[index === 0 ? 1 : 0].sessionId, split.panes[index === 0 ? 1 : 0].slug);
-}
-
-function startPaneRename(header, titleEl, pane) {
-  if (header.querySelector(".split-pane-rename-input")) return;
-  var input = document.createElement("input");
-  input.type = "text";
-  input.className = "split-pane-rename-input";
-  input.value = pane.title;
-  titleEl.style.display = "none";
-  header.insertBefore(input, titleEl);
-  input.focus();
-  input.select();
-
-  var done = false;
-  function finish(commit) {
-    if (done) return;
-    done = true;
-    var newTitle = input.value.trim();
-    input.remove();
-    titleEl.style.display = "";
-    if (!commit || !newTitle || newTitle === pane.title) return;
-    pane.title = newTitle;
-    titleEl.textContent = newTitle;
-    var ws = getWs();
-    if (ws && ws.readyState === 1) {
-      ws.send(JSON.stringify({ type: "rename_session", id: pane.sessionId, title: newTitle }));
+    var group = null;
+    var groups = store.get('splitGroups') || [];
+    for (var gi = 0; gi < groups.length; gi++) if (groups[gi].id === split.groupId) group = groups[gi];
+    var roles = splitGroupRoles(group);
+    var closingId = sessionId;
+    if (roles && roles.version === 2 && roles.workerIds.indexOf(closingId) !== -1) {
+      var request = splitWorkerCloseRequest(group, getCachedSessions(), store.get('currentSlug'), closingId,
+        "worker-close-" + Date.now().toString(36) + "-" + Math.random().toString(36).slice(2, 8));
+      if (request) getWs().send(JSON.stringify(request));
+      return;
     }
+    getWs().send(JSON.stringify({ type: "split_group_dissolve", id: split.groupId }));
   }
-
-  input.addEventListener("keydown", function (event) {
-    if (event.key === "Enter") { event.preventDefault(); finish(true); }
-    if (event.key === "Escape") { event.preventDefault(); finish(false); }
-  });
-  input.addEventListener("blur", function () { finish(true); });
-  input.addEventListener("click", function (event) { event.stopPropagation(); });
+  var next = split.panes[index === 0 ? 1 : 0];
+  switchNativeSession(next.sessionId, next.slug);
 }
 
 // Called on session_list so pane headers follow renames made elsewhere
@@ -163,117 +138,6 @@ export function syncPaneTitles() {
   syncPairChrome(host, split);
 }
 
-function panePermissionControlState(session) {
-  var mode = session && (session.runtimeMode || session.mode || "gui");
-  var worker = !!session && isConfiguredWorker(store.get('splitGroups'), session.id);
-  return {
-    projectSlug: store.get('currentSlug'),
-    sessionId: session && session.id,
-    vendor: session && session.vendor || store.get('currentVendor') || "claude",
-    permissionMode: session && session.permissionMode || "default",
-    effectivePermissionMode: session && session.effectivePermissionMode || null,
-    permissionCapabilities: session && session.permissionCapabilities || { auto: false, mcpOverride: false },
-    connected: store.get('connected'),
-    globalPermissionModeForced: store.get('skipPermsEnabled') === true,
-    visible: !!session && !worker && mode === "gui",
-    locked: worker,
-  };
-}
-
-function updatePaneFullAccessButton(button, session) {
-  if (!button) return;
-  // Permission policy belongs to the Driver. A configured Worker inherits it
-  // server-side and must not present a second, misleading control.
-  renderPermissionControl(button, panePermissionControlState(session));
-}
-
-function createPane(pane, index) {
-  var paneEl = document.createElement("section");
-  paneEl.className = "split-pane";
-
-  var header = document.createElement("header");
-  header.className = "split-pane-header";
-  header.title = pane.title;
-
-  var session = sessionById(pane.sessionId);
-  var vendor = (session && session.vendor) || "claude";
-  var vendorIcon = document.createElement("img");
-  vendorIcon.className = "split-pane-vendor";
-  vendorIcon.src = VENDOR_AVATARS[vendor] || VENDOR_AVATARS.claude;
-  vendorIcon.alt = "";
-  vendorIcon.title = VENDOR_NAMES[vendor] || vendor;
-  header.appendChild(vendorIcon);
-
-  var title = document.createElement("span");
-  title.className = "split-pane-title";
-  title.textContent = pane.title;
-  title.title = "Rename session";
-  title.addEventListener("click", function () { startPaneRename(header, title, pane); });
-  header.appendChild(title);
-
-  var frame = document.createElement("iframe");
-  frame.className = "split-pane-frame";
-  frame.dataset.projectSlug = pane.slug;
-  frame.dataset.sessionId = String(pane.sessionId);
-  frame.src = paneUrl(pane);
-  frame.title = pane.title;
-
-  // Context-usage chip, fed by clay-pane-context messages from the pane
-  // iframe. Hidden until the pane reports a non-zero context percentage.
-  var ctxChip = document.createElement("button");
-  ctxChip.type = "button";
-  ctxChip.className = "split-pane-context";
-  ctxChip.title = "Context usage";
-  ctxChip.innerHTML = '<span class="split-pane-context-bar"><span class="split-pane-context-fill"></span></span><span class="split-pane-context-label"></span>';
-  ctxChip.addEventListener("click", function () {
-    if (frame.contentWindow) {
-      frame.contentWindow.postMessage({ type: "clay-pane-toggle-context" }, window.location.origin);
-    }
-  });
-  header.appendChild(ctxChip);
-
-  var fullAccess = createPermissionControl("split-pane-full-access hidden", "Driver session permission mode");
-  updatePaneFullAccessButton(fullAccess, session);
-  bindPermissionControl(fullAccess, function() {
-    var current = sessionById(pane.sessionId);
-    return panePermissionControlState(current);
-  });
-  header.appendChild(fullAccess);
-  // Permission state belongs to the session identity on the left. Keep it
-  // immediately after the title instead of grouping it with usage and close.
-  header.insertBefore(fullAccess, ctxChip);
-
-  var close = document.createElement("button");
-  close.type = "button";
-  close.className = "split-pane-close";
-  close.title = "Close pane";
-  close.setAttribute("aria-label", "Close pane");
-  close.innerHTML = iconHtml("x");
-  close.addEventListener("click", function () { closePane(index); });
-  header.appendChild(close);
-  paneEl.appendChild(header);
-  paneEl.appendChild(frame);
-  return paneEl;
-}
-
-function updatePaneContextChip(paneEl, msg) {
-  if (!paneEl) return;
-  var chip = paneEl.querySelector(".split-pane-context");
-  if (!chip) return;
-  var pct = msg.pct || 0;
-  if (pct <= 0) return;
-  chip.classList.add("has-data");
-  var fill = chip.querySelector(".split-pane-context-fill");
-  var label = chip.querySelector(".split-pane-context-label");
-  fill.style.width = Math.min(100, pct).toFixed(1) + "%";
-  fill.className = "split-pane-context-fill" + (msg.cls || "");
-  label.textContent = pct.toFixed(0) + "%";
-  var tip = "Context " + pct.toFixed(0) + "% (" + formatTokens(msg.used || 0) + " / " + formatTokens(msg.win || 0) + " tokens)";
-  if (msg.cost) tip += " · $" + msg.cost.toFixed(4);
-  if (msg.model && msg.model !== "-") tip += " · " + msg.model;
-  chip.title = tip;
-}
-
 function handlePaneMessage(event) {
   if (event.origin !== window.location.origin) return;
   var msg = event.data;
@@ -301,34 +165,20 @@ function handlePaneMessage(event) {
   }
 }
 
-var renderedPaneKey = null;
-
-function paneKey(panes) {
-  return panes.map(function (pane) { return pane.slug + "#" + pane.sessionId; }).join("|");
-}
-
 function renderSplit(split) {
   if (!host || !nativeApp) return;
   var panes = split && split.panes;
-  if (!panes || panes.length !== 2) {
+  if (!panes || panes.length < 2 || panes.length > 3) {
     placeStickyNotesOverlay(false);
     host.innerHTML = "";
-    renderedPaneKey = null;
     host.classList.remove("visible");
     nativeApp.classList.remove("split-native-hidden");
     return;
   }
-  // splitPanes is replaced (same panes, new object) when the server confirms
-  // the groupId. Rebuilding then would reload both iframes, so skip DOM work
-  // when the rendered pane set is unchanged.
-  var key = paneKey(panes);
   placeStickyNotesOverlay(true);
-  if (key === renderedPaneKey && host.classList.contains("visible")) return;
-  host.innerHTML = "";
-  renderedPaneKey = key;
   nativeApp.classList.add("split-native-hidden");
   host.classList.add("visible");
-  for (var i = 0; i < panes.length; i++) host.appendChild(createPane(panes[i], i));
+  reconcileSplitPanes(host, panes, function (pane) { return createSplitPane(pane, closePane); }, updateSplitPaneMetadata);
   syncPairChrome(host, split);
   refreshIcons();
 }
@@ -360,23 +210,26 @@ function openSplit(side, draggedId) {
 }
 
 export function openGroup(group) {
-  if (!group || !Array.isArray(group.members) || group.members.length !== 2) return false;
-  if (!sessionById(group.members[0]) || !sessionById(group.members[1])) return false;
+  if (!group || !Array.isArray(group.members) || group.members.length < 2 || group.members.length > 3) return false;
+  var memberIds = splitGroupMemberIds(group);
+  if (memberIds.length !== group.members.length) return false;
+  for (var mi = 0; mi < memberIds.length; mi++) if (!sessionById(memberIds[mi])) return false;
   detachTuiView();
   store.set({
     splitPanes: {
       groupId: group.id,
-      panes: [paneForSession(group.members[0]), paneForSession(group.members[1])],
+      panes: memberIds.map(function (id) { return paneForSession(id); }),
     },
   });
   // Anchor the parent's active session (and server-side presence) to a
   // member while the split is open, so a hard refresh restores into this
   // group instead of whatever was viewed before it.
   var activeId = store.get('activeSessionId');
-  if (activeId !== group.members[0] && activeId !== group.members[1]) {
+  var anchorId = splitGroupActiveAnchor(group, activeId);
+  if (anchorId && anchorId !== activeId) {
     var ws = getWs();
     if (isCurrentProjectSessionReady(store.snap(), ws)) {
-      ws.send(JSON.stringify({ type: "switch_session", id: group.members[0] }));
+      ws.send(JSON.stringify({ type: "switch_session", id: anchorId }));
     }
   }
   dismissSplitOverlays();
@@ -403,13 +256,13 @@ export function maybeRestoreSplitGroup() {
     }
     if (reconciliation.action === "rebuild") {
       var rebuilt = reconciliation.group;
-      if (!sessionById(rebuilt.members[0]) || !sessionById(rebuilt.members[1])) {
+      if (rebuilt.members.some(function (id) { return !sessionById(id); })) {
         store.set({ splitPanes: null });
         return;
       }
       store.set({ splitPanes: {
         groupId: rebuilt.id,
-        panes: [paneForSession(rebuilt.members[0]), paneForSession(rebuilt.members[1])],
+        panes: splitGroupMemberIds(rebuilt).map(function (id) { return paneForSession(id); }),
       } });
     }
     return;
@@ -427,13 +280,13 @@ export function maybeRestoreSplitGroup() {
 }
 
 export function separateGroup(group) {
-  if (!group || !Array.isArray(group.members) || group.members.length !== 2) return;
+  if (!group || !Array.isArray(group.members) || group.members.length < 2) return;
   var ws = getWs();
   if (ws && ws.readyState === 1) {
     ws.send(JSON.stringify({ type: "split_group_dissolve", id: group.id }));
   }
   var split = store.get('splitPanes');
-  if (split && split.groupId === group.id) switchNativeSession(group.members[0]);
+  if (split && split.groupId === group.id) switchNativeSession(split.panes[0].sessionId);
 }
 
 function dismissSplitOverlays() {
@@ -531,24 +384,41 @@ export function initSplitView() {
     // notification click) closes the split UI; the group itself persists.
     if (state.activeSessionId !== prev.activeSessionId && state.splitPanes && state.splitPanes.panes) {
       var sp = state.splitPanes.panes;
-      if (state.activeSessionId !== sp[0].sessionId && state.activeSessionId !== sp[1].sessionId) {
+      var activePane = false;
+      for (var spi = 0; spi < sp.length; spi++) if (state.activeSessionId === sp[spi].sessionId) activePane = true;
+      if (!activePane) {
         store.set({ splitPanes: null });
       }
     }
     if (state.splitGroups !== prev.splitGroups) {
       if (!isCurrentProjectSessionReady(state, getWs())) return;
       var split = state.splitPanes;
-      if (!split || !split.panes) return;
+      if (!split || !split.panes || split.panes.length < 2) return;
       if (!splitPanesMatchProject(split, state.currentSlug)) {
         store.set({ splitPanes: null });
         return;
       }
       syncPairChrome(host, split);
       if (split.groupId) {
-            if (!hasCurrentSplitGroup(split, state.splitGroups)) switchNativeSession(split.panes[0].sessionId, state.currentSlug);
+        var currentGroup = null;
+        for (var cgi = 0; cgi < state.splitGroups.length; cgi++) {
+          if (state.splitGroups[cgi].id === split.groupId) currentGroup = state.splitGroups[cgi];
+        }
+        if (!currentGroup) {
+          switchNativeSession(split.panes[0].sessionId, state.currentSlug);
+          return;
+        }
+        var projectedIds = splitGroupMemberIds(currentGroup);
+        if (projectedIds.length < 2 || projectedIds.length > 3) return;
+        var projectedPanes = projectedIds.map(function (id) { return paneForSession(id); });
+        var projectedKey = projectedPanes.map(function (pane) { return pane.slug + "#" + pane.sessionId; }).join("|");
+        var currentKey = split.panes.map(function (pane) { return pane.slug + "#" + pane.sessionId; }).join("|");
+        if (projectedKey !== currentKey) {
+          store.set({ splitPanes: { groupId: split.groupId, panes: projectedPanes } });
+        }
         return;
       }
-      var ids = [split.panes[0].sessionId, split.panes[1].sessionId];
+      var ids = split.panes.map(function (pane) { return pane.sessionId; });
       var confirmed = findSplitGroup(state.splitGroups, ids);
       if (confirmed) store.set({ splitPanes: { groupId: confirmed.id, panes: split.panes } });
     }

package/lib/public/modules/websocket-watchdog.js

@@ -0,0 +1,126 @@
+// websocket-watchdog.js - suspendable liveness timers for the browser socket
+
+function createWebSocketWatchdog(options) {
+  var suspended = false;
+  var heartbeatTimer = null;
+  var heartbeatDeadlineTimer = null;
+  var heartbeatSocket = null;
+  var heartbeatEpoch = 0;
+  var heartbeatGeneration = 0;
+  var deadlineGeneration = 0;
+  var probeTimer = null;
+  var probeSocket = null;
+  var probeEpoch = 0;
+  var probeStartedAt = 0;
+  var probeGeneration = 0;
+
+  function clearHeartbeatDeadline() {
+    deadlineGeneration += 1;
+    if (heartbeatDeadlineTimer) clearTimeout(heartbeatDeadlineTimer);
+    heartbeatDeadlineTimer = null;
+  }
+
+  function stopHeartbeat() {
+    heartbeatGeneration += 1;
+    clearHeartbeatDeadline();
+    if (heartbeatTimer) clearInterval(heartbeatTimer);
+    heartbeatTimer = null;
+    heartbeatSocket = null;
+    heartbeatEpoch = 0;
+  }
+
+  function clearProbe() {
+    probeGeneration += 1;
+    if (probeTimer) clearTimeout(probeTimer);
+    probeTimer = null;
+    probeSocket = null;
+    probeEpoch = 0;
+    probeStartedAt = 0;
+  }
+
+  function suspend() {
+    suspended = true;
+    stopHeartbeat();
+    clearProbe();
+  }
+
+  function resume() {
+    var changed = suspended;
+    suspended = false;
+    return changed;
+  }
+
+  function startHeartbeat(socket, epoch) {
+    stopHeartbeat();
+    if (suspended || !socket) return false;
+    heartbeatSocket = socket;
+    heartbeatEpoch = epoch;
+    var generation = heartbeatGeneration;
+    heartbeatTimer = setInterval(function () {
+      if (suspended || generation !== heartbeatGeneration) return;
+      if (!options.isCurrent(socket, epoch)) {
+        stopHeartbeat();
+        return;
+      }
+      clearHeartbeatDeadline();
+      var currentDeadlineGeneration = deadlineGeneration;
+      heartbeatDeadlineTimer = setTimeout(function () {
+        if (suspended || currentDeadlineGeneration !== deadlineGeneration) return;
+        heartbeatDeadlineTimer = null;
+        if (heartbeatSocket === socket && heartbeatEpoch === epoch && options.isCurrent(socket, epoch)) {
+          options.onFailure("heartbeat_timeout", epoch, null);
+        }
+      }, options.heartbeatDeadlineMs);
+      try {
+        options.sendPing(socket);
+      } catch (e) {
+        options.onFailure("heartbeat_error", epoch, null);
+      }
+    }, options.heartbeatIntervalMs);
+    return true;
+  }
+
+  function probe(socket, epoch) {
+    if (suspended) return "suspended";
+    if (probeTimer) return "pending";
+    probeSocket = socket;
+    probeEpoch = epoch;
+    probeStartedAt = options.now();
+    probeGeneration += 1;
+    var generation = probeGeneration;
+    probeTimer = setTimeout(function () {
+      if (suspended || generation !== probeGeneration) return;
+      probeTimer = null;
+      if (probeSocket === socket && probeEpoch === epoch && options.isCurrent(socket, epoch)) {
+        options.onFailure("probe_timeout", epoch, options.now() - probeStartedAt);
+      }
+    }, options.probeTimeoutMs);
+    try {
+      options.sendPing(socket);
+    } catch (e) {
+      if (generation !== probeGeneration) return "cleared";
+      var latency = options.now() - probeStartedAt;
+      clearProbe();
+      options.onFailure("probe_error", epoch, latency);
+      return "failed";
+    }
+    return "started";
+  }
+
+  function acceptPong(socket, epoch) {
+    if (heartbeatSocket === socket && heartbeatEpoch === epoch) clearHeartbeatDeadline();
+    if (probeSocket === socket && probeEpoch === epoch) clearProbe();
+  }
+
+  return {
+    acceptPong: acceptPong,
+    clearProbe: clearProbe,
+    probe: probe,
+    resume: resume,
+    startHeartbeat: startHeartbeat,
+    stopHeartbeat: stopHeartbeat,
+    suspend: suspend
+  };
+}
+
+export { createWebSocketWatchdog };

package/lib/public/modules/worker-pane-lock.js

@@ -27,6 +27,18 @@ import { store } from './store.js';
 var STATUS_ID = "worker-pane-status";
 var LOCK_CLASS = "worker-pane-locked";
 
+function configuredWorkerIds(group) {
+  if (!group || !group.pair || !Array.isArray(group.members)) return [];
+  var pair = group.pair;
+  var ids = Array.isArray(pair.workerIds) ? pair.workerIds :
+    (pair.workerId !== undefined ? [pair.workerId] : []);
+  if (pair.driverId === undefined || ids.length < 1 || ids.length > 2 || group.members.indexOf(pair.driverId) === -1) return [];
+  for (var i = 0; i < ids.length; i++) {
+    if (ids[i] === pair.driverId || group.members.indexOf(ids[i]) === -1) return [];
+  }
+  return ids;
+}
+
 // Every interactive composer affordance. Queried lazily: a pane iframe and the
 // main window share this markup, and some ids are mobile-only.
 var LOCKED_CONTROL_IDS = [
@@ -64,9 +76,7 @@ export function isDriverOperatedView(state) {
   if (!sessionId) return false;
   var groups = snapshot.splitGroups || [];
   for (var i = 0; i < groups.length; i++) {
-    var pair = groups[i] && groups[i].pair;
-    if (!pair) continue;
-    if (pair.workerId === sessionId) return true;
+    if (configuredWorkerIds(groups[i]).indexOf(sessionId) !== -1) return true;
   }
   return false;
 }

package/lib/server.js

@@ -1336,6 +1336,7 @@ function createServer(opts) {
       worktreeMeta: worktreeMeta || null,
       mcpBridgeToken: extra.mcpBridgeToken || null,
       isMate: extra.isMate || false,
+      multiWorkerRuntimeEnabled: !extra.isMate,
       mateId: extra.mateId || (extra.isMate ? path.basename(cwd) : null),
       mateDisplayName: extra.mateDisplayName || "",
       isHostAgent: !!extra.isHostAgent,