clay-server 4.3.0-beta.1 → 4.3.0-beta.10

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 ---
@@ -61,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';
@@ -98,6 +100,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;
@@ -241,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);
@@ -733,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;
@@ -802,6 +810,10 @@ export function processMessage(msg) {
         handleRemoteSelection(msg);
         break;
 
+      case "pair_result_status":
+        handlePairResultStatus(msg);
+        break;
+
       case "session_io":
         blinkSessionDot(msg.id);
         break;
@@ -821,6 +833,7 @@ export function processMessage(msg) {
         break;
 
       case "session_switched":
+        clearPairResultStatus();
         syncAutonomousRunForSession(msg.autonomousRun || null);
         closeWhatsNewArticle();
         // Save draft from outgoing session
@@ -839,10 +852,10 @@ 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 || {} });
+        store.set({ activeSessionId: msg.id, sessionOriginId: msg.sessionOriginId || null, 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.
@@ -936,6 +949,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/message-delivery-ui.js

@@ -0,0 +1,63 @@
+// message-delivery-ui.js - receipt recovery notices
+
+import { store } from './store.js';
+import { retryPendingMessage } from './message-delivery.js';
+
+var initialized = false;
+var rendered = {};
+var unsubscribe = null;
+
+function currentContext(receipt) {
+  var currentOriginId = store.get('sessionOriginId') || null;
+  return receipt && receipt.projectSlug === store.get('currentSlug') && String(receipt.sessionId) === String(store.get('activeSessionId')) && receipt.accountId === (store.get('myUserId') || "_default") && (!receipt.sessionOriginId || !currentOriginId || receipt.sessionOriginId === currentOriginId);
+}
+
+function renderReceipt(receipt) {
+  var messages = document.getElementById("messages");
+  if (!messages || !currentContext(receipt) || rendered[receipt.clientMessageId]) return;
+  var notice = document.createElement("div");
+  notice.className = "sys-msg error";
+  notice.dataset.deliveryReceipt = receipt.clientMessageId;
+  var text = document.createElement("span");
+  text.className = "sys-text";
+  text.textContent = "Receipt unconfirmed. Retry this message.";
+  notice.appendChild(text);
+  var retry = document.createElement("button");
+  retry.type = "button";
+  retry.className = "sys-retry";
+  retry.textContent = "Retry";
+  retry.addEventListener("click", function () { retryPendingMessage(receipt.clientMessageId); });
+  notice.appendChild(retry);
+  messages.appendChild(notice);
+  rendered[receipt.clientMessageId] = notice;
+}
+
+function sync(state) {
+  var receipts = state.deliveryReceipts || {};
+  Object.keys(rendered).forEach(function (id) {
+    if (!rendered[id].parentNode || !receipts[id] || !currentContext(receipts[id])) {
+      if (rendered[id] && rendered[id].parentNode) rendered[id].parentNode.removeChild(rendered[id]);
+      delete rendered[id];
+    }
+  });
+  Object.keys(receipts).forEach(function (id) { renderReceipt(receipts[id]); });
+}
+
+export function initMessageDeliveryUi() {
+  if (initialized) return;
+  initialized = true;
+  unsubscribe = store.subscribe(function (state, previous) {
+    if (state.deliveryReceipts !== previous.deliveryReceipts || state.currentSlug !== previous.currentSlug || state.activeSessionId !== previous.activeSessionId || state.sessionOriginId !== previous.sessionOriginId || state.myUserId !== previous.myUserId || state.replayingHistory !== previous.replayingHistory) sync(state);
+  });
+  sync(store.snap());
+}
+
+export function disposeMessageDeliveryUi() {
+  Object.keys(rendered).forEach(function (id) {
+    if (rendered[id] && rendered[id].parentNode) rendered[id].parentNode.removeChild(rendered[id]);
+  });
+  rendered = {};
+  if (unsubscribe) unsubscribe();
+  unsubscribe = null;
+  initialized = false;
+}

package/lib/public/modules/message-delivery.js

@@ -4,7 +4,10 @@ import { store } from './store.js';
 import { getWs } from './ws-ref.js';
 
 var ACK_TIMEOUT_MS = 5000;
+var ACK_RETRY_LIMIT = 3;
 var ackTimers = {};
+var socketRefs = {};
+var activatedContext = null;
 
 function createClientMessageId() {
   if (window.crypto && typeof window.crypto.randomUUID === "function") {
@@ -21,6 +24,39 @@ function replacePending(messages) {
   store.set({ pendingOutboundMessages: messages });
 }
 
+function receipts() {
+  return store.get('deliveryReceipts') || {};
+}
+
+function setReceipt(entry) {
+  var next = Object.assign({}, receipts());
+  next[entry.payload.clientMessageId] = {
+    clientMessageId: entry.payload.clientMessageId,
+    projectSlug: entry.projectSlug,
+    sessionId: entry.sessionId,
+    accountId: entry.accountId,
+    sessionOriginId: entry.sessionOriginId || null,
+    attempts: entry.attempts
+  };
+  store.set({ deliveryReceipts: next });
+}
+
+function clearReceipt(clientMessageId) {
+  var current = receipts();
+  if (!current[clientMessageId]) return;
+  var next = Object.assign({}, current);
+  delete next[clientMessageId];
+  store.set({ deliveryReceipts: next });
+}
+
+function markUnconfirmed(entry) {
+  var unconfirmed = Object.assign({}, entry, { status: "unconfirmed" });
+  replacePending(pendingMessages().map(function (candidate) {
+    return candidate.payload.clientMessageId === entry.payload.clientMessageId ? unconfirmed : candidate;
+  }));
+  setReceipt(unconfirmed);
+}
+
 function clearAckTimer(clientMessageId) {
   if (!ackTimers[clientMessageId]) return;
   clearTimeout(ackTimers[clientMessageId]);
@@ -35,25 +71,92 @@ function isPending(clientMessageId) {
   return false;
 }
 
+function pendingEntry(clientMessageId) {
+  var pending = pendingMessages();
+  for (var i = 0; i < pending.length; i++) {
+    if (pending[i].payload.clientMessageId === clientMessageId) return pending[i];
+  }
+  return null;
+}
+
+function matchesCurrentContext(entry) {
+  return entry && entry.projectSlug === store.get('currentSlug') && String(entry.sessionId) === String(store.get('activeSessionId')) && entry.accountId === (store.get('myUserId') || "_default");
+}
+
+function hasAutomaticReplayIdentity(entry, socket) {
+  if (!activatedContext || activatedContext.socket !== socket) return false;
+  if (entry.sessionOriginId && activatedContext.sessionOriginId && entry.sessionOriginId !== activatedContext.sessionOriginId) return false;
+  if (entry.sessionOriginId && activatedContext.sessionOriginId && entry.sessionOriginId === activatedContext.sessionOriginId) return true;
+  if (entry.cliSessionId && activatedContext.cliSessionId) return entry.cliSessionId === activatedContext.cliSessionId;
+  return socketRefs[entry.payload.clientMessageId] === socket;
+}
+
+function hasKnownCliMismatch(entry) {
+  if (entry.sessionOriginId && activatedContext && activatedContext.sessionOriginId && entry.sessionOriginId === activatedContext.sessionOriginId) return false;
+  return !!entry.cliSessionId && !!activatedContext && !!activatedContext.cliSessionId && entry.cliSessionId !== activatedContext.cliSessionId;
+}
+
+function matchesActivatedContext(entry) {
+  var currentCliSessionId = store.get('cliSessionId') || null;
+  var sameOrigin = !!(entry.sessionOriginId && activatedContext && activatedContext.sessionOriginId && entry.sessionOriginId === activatedContext.sessionOriginId);
+  return !!activatedContext && activatedContext.socket === getWs() && matchesCurrentContext(entry) &&
+    activatedContext.projectSlug === store.get('currentSlug') && String(activatedContext.sessionId) === String(store.get('activeSessionId')) &&
+    activatedContext.accountId === (store.get('myUserId') || "_default") && (activatedContext.sessionOriginId || activatedContext.cliSessionId === currentCliSessionId) &&
+    (!entry.sessionOriginId || !activatedContext.sessionOriginId || entry.sessionOriginId === activatedContext.sessionOriginId) &&
+    (sameOrigin || !entry.cliSessionId || !activatedContext.cliSessionId || entry.cliSessionId === activatedContext.cliSessionId);
+}
+
 function armAckTimer(clientMessageId, socket) {
   clearAckTimer(clientMessageId);
   ackTimers[clientMessageId] = setTimeout(function () {
     delete ackTimers[clientMessageId];
     if (!isPending(clientMessageId) || getWs() !== socket) return;
+    var entry = pendingEntry(clientMessageId);
+    if (!matchesActivatedContext(entry)) return;
     window.dispatchEvent(new CustomEvent("clay-message-delivery-timeout", {
       detail: { socket: socket, clientMessageId: clientMessageId },
     }));
+    var attempts = entry.attempts || 0;
+    if (attempts < ACK_RETRY_LIMIT && entry && socket.readyState === 1) {
+      var nextEntry = Object.assign({}, entry, { attempts: attempts + 1 });
+      replacePending(pendingMessages().map(function (candidate) {
+        return candidate.payload.clientMessageId === clientMessageId ? nextEntry : candidate;
+      }));
+      transmit(nextEntry, false);
+      return;
+    }
+    if (attempts >= ACK_RETRY_LIMIT) {
+      markUnconfirmed(entry);
+      return;
+    }
   }, ACK_TIMEOUT_MS);
 }
 
-function transmit(entry) {
+function transmit(entry, automatic) {
   var socket = getWs();
-  if (!socket || socket.readyState !== 1) return false;
+  if (!matchesCurrentContext(entry) || !socket || socket.readyState !== 1) return false;
+  if (automatic && entry.status === "unconfirmed") return false;
+  if (automatic && !hasAutomaticReplayIdentity(entry, socket)) {
+    markUnconfirmed(entry);
+    return false;
+  }
+  if (automatic) {
+    if ((entry.attempts || 0) >= ACK_RETRY_LIMIT) {
+      markUnconfirmed(entry);
+      return false;
+    }
+    entry = Object.assign({}, entry, { attempts: (entry.attempts || 0) + 1 });
+    replacePending(pendingMessages().map(function (candidate) {
+      return candidate.payload.clientMessageId === entry.payload.clientMessageId ? entry : candidate;
+    }));
+  }
+  socketRefs[entry.payload.clientMessageId] = socket;
   try {
     socket.send(JSON.stringify(entry.payload));
     armAckTimer(entry.payload.clientMessageId, socket);
     return true;
   } catch (e) {
+    markUnconfirmed(entry);
     return false;
   }
 }
@@ -63,10 +166,22 @@ export function sendAcknowledgedMessage(payload) {
   var entry = {
     projectSlug: store.get('currentSlug'),
     sessionId: store.get('activeSessionId'),
+    accountId: store.get('myUserId') || "_default",
+    cliSessionId: store.get('cliSessionId') || null,
+    sessionOriginId: store.get('sessionOriginId') || null,
+    attempts: 0,
+    status: "pending",
     payload: nextPayload,
   };
+  nextPayload.projectSlug = entry.projectSlug;
+  nextPayload.sessionId = entry.sessionId;
+  nextPayload.accountId = entry.accountId;
+  nextPayload.cliSessionId = entry.cliSessionId;
+  nextPayload.sessionOriginId = entry.sessionOriginId;
+  entry.payload = nextPayload;
   replacePending(pendingMessages().concat([entry]));
-  if (!transmit(entry)) {
+  if (!transmit(entry, false)) {
+    if (!getWs() || getWs().readyState !== 1) markUnconfirmed(entry);
     window.dispatchEvent(new CustomEvent("clay-message-delivery-timeout", {
       detail: { socket: getWs(), clientMessageId: nextPayload.clientMessageId },
     }));
@@ -74,6 +189,21 @@ export function sendAcknowledgedMessage(payload) {
   return nextPayload.clientMessageId;
 }
 
+export function retryPendingMessage(clientMessageId) {
+  var entry = pendingEntry(clientMessageId);
+  if (!matchesActivatedContext(entry) || hasKnownCliMismatch(entry)) return false;
+  var retryEntry = Object.assign({}, entry, { attempts: 0, status: "pending" });
+  replacePending(pendingMessages().map(function (candidate) {
+    return candidate.payload.clientMessageId === clientMessageId ? retryEntry : candidate;
+  }));
+  if (transmit(retryEntry, false)) {
+    clearReceipt(clientMessageId);
+    return true;
+  }
+  markUnconfirmed(retryEntry);
+  return false;
+}
+
 export function acknowledgeMessage(clientMessageId) {
   if (typeof clientMessageId !== "string") return null;
   var pending = pendingMessages();
@@ -82,9 +212,14 @@ export function acknowledgeMessage(clientMessageId) {
     if (entry.payload.clientMessageId === clientMessageId) acknowledged = entry;
     return entry.payload.clientMessageId !== clientMessageId;
   });
-  if (next.length === pending.length) return null;
+  if (next.length === pending.length) {
+    clearReceipt(clientMessageId);
+    return null;
+  }
   clearAckTimer(clientMessageId);
   replacePending(next);
+  delete socketRefs[clientMessageId];
+  clearReceipt(clientMessageId);
   return acknowledged;
 }
 
@@ -92,8 +227,30 @@ export function replayPendingMessages(sessionId) {
   var pending = pendingMessages();
   var projectSlug = store.get('currentSlug');
   for (var i = 0; i < pending.length; i++) {
-    if (pending[i].projectSlug === projectSlug && pending[i].sessionId === sessionId) {
-      transmit(pending[i]);
+    if (pending[i].projectSlug === projectSlug && String(pending[i].sessionId) === String(sessionId) && matchesCurrentContext(pending[i])) {
+      transmit(pending[i], true);
     }
   }
 }
+
+export function activateDeliverySession(sessionId, cliSessionId, sessionOriginId) {
+  var socket = getWs();
+  activatedContext = {
+    socket: socket,
+    projectSlug: store.get('currentSlug'),
+    sessionId: sessionId,
+    accountId: store.get('myUserId') || "_default",
+    cliSessionId: cliSessionId || null,
+    sessionOriginId: sessionOriginId || null
+  };
+  replayPendingMessages(sessionId);
+}
+
+export function refreshDeliverySessionIdentity(cliSessionId, sessionOriginId) {
+  if (!activatedContext || activatedContext.socket !== getWs()) return false;
+  if (activatedContext.projectSlug !== store.get('currentSlug') || String(activatedContext.sessionId) !== String(store.get('activeSessionId')) || activatedContext.accountId !== (store.get('myUserId') || "_default")) return false;
+  if (activatedContext.sessionOriginId && sessionOriginId && activatedContext.sessionOriginId !== sessionOriginId) return false;
+  activatedContext.cliSessionId = cliSessionId || null;
+  if (!activatedContext.sessionOriginId && sessionOriginId) activatedContext.sessionOriginId = sessionOriginId;
+  return true;
+}

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/permission-control.js

@@ -46,9 +46,9 @@ export function createPermissionControl(className, ariaLabel) {
   control.setAttribute("role", "group");
   control.setAttribute("aria-label", ariaLabel || "Session permission mode");
   control.innerHTML = '<div class="session-permission-segmented">' +
-    '<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>' +
+    '<button type="button" data-permission-mode="default" aria-label="Ask permissions" title="Ask permissions"><span class="permission-label">Ask</span><span class="permission-spinner" aria-hidden="true"></span></button>' +
+    '<button type="button" data-permission-mode="auto" aria-label="Auto permissions" title="Auto permissions"><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">Skip</span><span class="permission-spinner" aria-hidden="true"></span></button>' +
     '</div><span class="session-permission-status" aria-live="polite"></span>';
   control.querySelector(".session-permission-status").setAttribute("aria-atomic", "true");
   return control;
@@ -101,6 +101,7 @@ export function renderPermissionControl(control, state) {
   control.classList.toggle("permission-globally-forced", globallyForced);
   control.classList.toggle("permission-runtime-fallback", state.permissionMode === "auto" && !!state.effectivePermissionMode && state.effectivePermissionMode !== "auto");
   control.setAttribute("aria-busy", pending ? "true" : "false");
+  var buttonTitles = { default: "Ask permissions", auto: "Auto permissions", bypassPermissions: "Skip permissions" };
   var buttons = control.querySelectorAll("[data-permission-mode]");
   for (var i = 0; i < buttons.length; i++) {
     var mode = buttons[i].dataset.permissionMode;
@@ -113,8 +114,7 @@ export function renderPermissionControl(control, state) {
     buttons[i].classList.toggle("pending", requested);
     buttons[i].setAttribute("aria-pressed", selected ? "true" : "false");
     buttons[i].setAttribute("aria-busy", requested ? "true" : "false");
-    if (unsupported) buttons[i].title = "Auto permissions are unavailable for this Claude session.";
-    else buttons[i].removeAttribute("title");
+    buttons[i].title = unsupported ? "Auto permissions are unavailable for this Claude session." : buttonTitles[mode];
   }
   var status = control.querySelector(".session-permission-status");
   if (status) {

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/session-creation-cta.js

@@ -0,0 +1,46 @@
+// Shared, presentation-only session creation controls for desktop and mobile.
+
+import { iconHtml } from './icons.js';
+
+var SESSION_VENDOR_LABELS = {
+  claude: "Claude",
+  codex: "Codex",
+  antigravity: "Antigravity",
+  opencode: "OpenCode",
+  kimi: "Kimi",
+  grok: "Grok",
+  copilot: "Copilot",
+  qwen: "Qwen",
+  junie: "Junie",
+  kiro: "Kiro",
+};
+
+export function renderSessionCreationCta(options) {
+  var row = document.createElement("div");
+  row.className = options.rowClass + " session-create-cta";
+
+  var createButton = document.createElement("button");
+  createButton.className = options.createClass + " session-create-primary";
+  createButton.type = "button";
+  var vendorLabel = SESSION_VENDOR_LABELS[options.vendorKey] || options.vendorName;
+  createButton.innerHTML = '<img src="' + options.vendorAvatar +
+    '" class="' + options.iconClass + ' session-create-provider-icon" alt="">' +
+    '<span>Create new ' + vendorLabel + ' session</span>';
+  createButton.title = options.createTitle;
+  createButton.setAttribute("aria-label", options.createTitle);
+  createButton.addEventListener("click", options.onCreate);
+  row.appendChild(createButton);
+
+  var providerButton = document.createElement("button");
+  providerButton.className = options.providerClass + " session-create-provider";
+  providerButton.type = "button";
+  providerButton.title = options.providerTitle;
+  providerButton.setAttribute("aria-label", "Switch AI provider (current: " + options.vendorName + ")");
+  providerButton.setAttribute("aria-expanded", "false");
+  providerButton.setAttribute("aria-controls", options.menuId);
+  providerButton.innerHTML = iconHtml("chevron-down", "session-create-provider-chevron");
+  providerButton.addEventListener("click", options.onProvider);
+  row.appendChild(providerButton);
+
+  return { element: row, createButton: createButton, providerButton: providerButton };
+}