clay-server 4.2.0 → 4.3.0-beta.10

package/lib/project.js

@@ -55,7 +55,11 @@ var { attachDelegatedFollowUp } = require("./project-delegated-follow-up");
 var { attachCapsuleTurn } = require("./project-capsule-turn");
 var workspaceSessionRef = require("./workspace-query-service").sessionRef;
 var { attachSessionPair } = require("./project-session-pair");
+var { attachPairResultOutbox } = require("./project-pair-result-outbox");
+var { attachPairResultRecovery } = require("./project-pair-result-recovery");
 var { attachSessionHandoff } = require("./project-session-handoff");
+var { attachDriverContinuation } = require("./project-driver-continuation");
+var driverContinuationAccess = require("./driver-continuation-access");
 var { attachSessionNotes, composeSystemPrompts } = require("./project-session-notes");
 var { attachSessionDocument } = require("./project-session-document");
 var { attachCapsuleCatalog } = require("./project-capsule-catalog");
@@ -64,6 +68,7 @@ var { attachProjectLogs } = require("./project-logs");
 var { attachProjectLogFeedbackDelivery } = require("./project-log-feedback-delivery");
 var { attachProjectMateKnowledge } = require("./project-mate-knowledge");
 var { attachSplitGroups } = require("./session-split-groups");
+var multiWorkerFeature = require("./multi-worker-feature");
 var toolControlMcp = require("./tool-control-mcp-server");
 var capsuleFloor = require("./capsule-display-floor");
 var toolLlm = require("./tool-llm");
@@ -203,6 +208,7 @@ function safeAbsPath(requested) {
  * opts: { cwd, slug, title, pushModule, debug, dangerouslySkipPermissions, currentVersion }
  */
 function createProjectContext(opts) {
+  var multiWorkerGate = multiWorkerFeature.fromServerConfig(opts);
   var cwd = opts.cwd;
   var slug = opts.slug;
   var project = path.basename(cwd);
@@ -657,6 +663,7 @@ function createProjectContext(opts) {
     clients: clients,
     sendTo: sendTo,
     usersModule: usersModule,
+    multiWorkerFeature: multiWorkerGate,
     onPairChanged: function (group) {
       if (!sdk || !group || !Array.isArray(group.members)) return;
       for (var i = 0; i < group.members.length; i++) {
@@ -817,10 +824,14 @@ function createProjectContext(opts) {
 
   // The SDK bridge is created after local MCP servers. Session spawning uses
   // a getter so tool handlers see the initialized bridge when they run.
+  var _pairResultOutbox = attachPairResultOutbox({ storageDir: sm.sessionsDir, projectSlug: slug });
+  _pairResultOutbox.recoverPending(sm.sessions);
+  var _pairResultRecovery = null;
   var _sessionPair = attachSessionPair({
     sm: sm,
     isMate: isMate,
     splitStore: _splitGroups.store,
+    multiWorkerFeature: multiWorkerGate,
     getSdk: function () { return sdk; },
     send: send,
     sendTo: sendTo,
@@ -835,12 +846,31 @@ function createProjectContext(opts) {
     usersModule: usersModule,
     getLinuxUserForSession: getLinuxUserForSession,
     onProcessingChanged: onProcessingChanged,
+    projectSlug: slug,
+    resultOutbox: _pairResultOutbox,
+    onResultStateChange: function (driver, record) { if (_pairResultRecovery) _pairResultRecovery.stateChanged(driver, record); },
     adapters: adapters,
     onPartnerResult: function (driver, worker, token) {
       if (_scheduledTaskExecution) _scheduledTaskExecution.onPartnerResult(driver, worker, token);
       if (_autonomousRun) _autonomousRun.onPartnerResult(driver, worker, token);
     },
   });
+  var _pairWorkerClose = require("./project-pair-worker-close").attachPairWorkerClose({
+    sm: sm,
+    splitStore: _splitGroups.store,
+    multiWorkerFeature: multiWorkerGate,
+    isMate: isMate,
+    projectSlug: slug,
+    hasSocket: function (ws) { return clients.has(ws); },
+    sendTo: sendTo,
+    closeWorker: _sessionPair.closeWorker,
+  });
+  _pairResultRecovery = attachPairResultRecovery({
+    sm: sm, store: _splitGroups.store, outbox: _pairResultOutbox, resultCapture: _sessionPair.resultCapture,
+    wake: _sessionPair.wakePartnerResult, projectSlug: slug, sendTo: sendTo,
+    blockedReason: _sessionPair.stopBarrier,
+    getClients: function () { return clients; }, isMultiUser: usersModule.isMultiUser,
+  });
   var _sessionSpawn = attachSessionSpawn({
     cwd: cwd,
     sm: sm,
@@ -854,16 +884,41 @@ function createProjectContext(opts) {
   });
   var _sessionHandoff = attachSessionHandoff({
     cwd: cwd,
+    projectSlug: slug,
     sm: sm,
     isMate: isMate,
     splitStore: _splitGroups.store,
     getSdk: function () { return sdk; },
     sendTo: sendTo,
     usersModule: usersModule,
+    isMultiUser: usersModule.isMultiUser,
+    getProjectAccess: opts.getProjectAccess || function () { return { visibility: "public", ownerId: projectOwnerId || null }; },
+    canAccessSession: usersModule.canAccessSession,
+    findUserById: usersModule.findUserById,
+    isDriverOperatedSession: function (session) { return !isMate && _sessionPair.workerPermission.isDriverOperated(session); },
     adapters: adapters,
     getLinuxUserForSession: getLinuxUserForSession,
     onProcessingChanged: onProcessingChanged,
   });
+  var _driverContinuation = attachDriverContinuation({
+    sm: sm,
+    isMate: isMate,
+    projectSlug: slug,
+    splitStore: _splitGroups.store,
+    pendingMessageQueue: _pendingMessageQueue,
+    dangerouslySkipPermissions: dangerouslySkipPermissions,
+    isMultiUser: usersModule.isMultiUser,
+    isDriverOperatedSession: function (session) { return !isMate && _sessionPair.workerPermission.isDriverOperated(session); },
+    authorizeSession: function (session, ownerId) {
+      return driverContinuationAccess.authorize({ usersModule: usersModule, projectSlug: slug,
+        getProjectAccess: opts.getProjectAccess, canAccessProjectSlug: opts.canAccessProjectSlug }, session, ownerId);
+    },
+    getSdk: function () { return sdk; },
+    getLinuxUserForSession: getLinuxUserForSession,
+    onProcessingChanged: onProcessingChanged,
+    consumePendingMessage: function (session) { return _userMessage && _userMessage.consumePendingMessage(session); },
+    sendTo: sendTo,
+  });
   var _debate = null;
   var _debateProposal = attachDebateProposal({
     cwd: cwd,
@@ -1250,6 +1305,7 @@ function createProjectContext(opts) {
     },
     onProcessingChanged: onProcessingChanged,
     onSessionAvailable: function (session) {
+      if (_pairResultRecovery) _pairResultRecovery.available(session);
       if (_scheduledMessages) _scheduledMessages.notify();
       if (_userMessage && session) setImmediate(function () { _userMessage.consumePendingMessage(session); });
     },
@@ -1287,6 +1343,7 @@ function createProjectContext(opts) {
         _sessionPair.getSystemPrompt(session),
         _sessionNotes.getSystemPrompt(session),
         _sessionHandoff.getSystemPrompt(session),
+        _driverContinuation.getSystemPrompt(session),
         _sessionDocument.getSystemPrompt(session),
         _capsuleCatalog.getSystemPrompt(session),
         _projectLogs.getSystemPrompt(session),
@@ -1304,6 +1361,7 @@ function createProjectContext(opts) {
       return _sessionPair.getToolDefs(session)
         .concat(_sessionNotes.getToolDefs(session))
         .concat(_sessionHandoff.getToolDefs(session))
+        .concat(_driverContinuation.getToolDefs(session, Number(session._sdkQueryGeneration || 0)))
         .concat(_sessionDocument.getToolDefs(session))
         .concat(_debateProposal.getToolDefs(session))
         .concat(_mateCreationProposal.getToolDefs(session))
@@ -1712,8 +1770,11 @@ function createProjectContext(opts) {
     if (msg.type === "memory_delete") { _memory.handleMemoryDelete(ws, msg); return; }
 
     // --- Sessions, config, project mgmt (delegated to project-sessions.js) ---
+    if (_pairResultRecovery.handleMessage(ws, msg)) return;
+    if (_pairWorkerClose.handleMessage(ws, msg)) return;
     if (_sessionPair.handleMessage(ws, msg)) return;
     if (_sessionHandoff.handleMessage(ws, msg)) return;
+    if (_driverContinuation.handleMessage(ws, msg)) return;
     if (_splitGroups.handleMessage(ws, msg)) return;
     if (_models.handleMessage(ws, msg)) return;
     if (_scheduledTasks.handleMessage(ws, msg)) return;
@@ -1986,6 +2047,7 @@ function createProjectContext(opts) {
     serverAuthToken: serverAuthToken,
     resolveDefaultAi: opts.resolveDefaultAi,
   });
+  _pairResultRecovery.reconcile();
   var _toolLlmRuntime = attachProjectToolLlmRuntime({
     users: usersModule,
     osUsers: osUsers,
@@ -2036,7 +2098,11 @@ function createProjectContext(opts) {
       if (isMate || !_sessionPair.workerPermission) return false;
       return _sessionPair.workerPermission.isDriverOperated(session);
     },
-    beginHumanPairTurn: function (session) { return _sessionPair.beginHumanTurn(session); },
+    beginHumanPairTurn: function (session) {
+      var resumed = _sessionPair.beginHumanTurn(session);
+      if (resumed) _pairResultRecovery.beginHumanTurn(session);
+      return resumed;
+    },
     authorizePendingDispatch: function (session, actor, item) {
       if (!session || sm.sessions.get(session.localId) !== session || !item || item.projectSlug !== slug) return false;
       if (_scheduledMessages && !_scheduledMessages.authorizePending(item, session)) return false;
@@ -2226,7 +2292,7 @@ function createProjectContext(opts) {
               inputSchema: normalizeToolSchema(noteTools[nti].inputSchema),
             });
           }
-          var handoffTools = _sessionHandoff.getToolDefs(boundSession);
+          var handoffTools = _sessionHandoff.getToolDefs(boundSession, queryGeneration);
           for (var hti = 0; hti < handoffTools.length; hti++) {
             tools.push({
               server: "clay-handoff",
@@ -2235,6 +2301,15 @@ function createProjectContext(opts) {
               inputSchema: normalizeToolSchema(handoffTools[hti].inputSchema),
             });
           }
+          var continuationTools = _driverContinuation.getToolDefs(boundSession, queryGeneration);
+          for (var cti = 0; cti < continuationTools.length; cti++) {
+            tools.push({
+              server: "clay-continuation",
+              name: continuationTools[cti].name,
+              description: continuationTools[cti].description || continuationTools[cti].name,
+              inputSchema: normalizeToolSchema(continuationTools[cti].inputSchema),
+            });
+          }
           var documentTools = _sessionDocument.getToolDefs(boundSession);
           for (var dti = 0; dti < documentTools.length; dti++) {
             tools.push({
@@ -2321,13 +2396,21 @@ function createProjectContext(opts) {
           }
         }
         if (boundSession && serverName === "clay-handoff") {
-          var handoffTools = _sessionHandoff.getToolDefs(boundSession);
+          var handoffTools = _sessionHandoff.getToolDefs(boundSession, queryGeneration);
           for (var hti = 0; hti < handoffTools.length; hti++) {
             if (handoffTools[hti].name === toolName && typeof handoffTools[hti].handler === "function") {
               return Promise.resolve(handoffTools[hti].handler(args || {}));
             }
           }
         }
+        if (boundSession && serverName === "clay-continuation") {
+          var continuationTools = _driverContinuation.getToolDefs(boundSession, queryGeneration);
+          for (var cti = 0; cti < continuationTools.length; cti++) {
+            if (continuationTools[cti].name === toolName && typeof continuationTools[cti].handler === "function") {
+              return Promise.resolve(continuationTools[cti].handler(args || {}));
+            }
+          }
+        }
         if (boundSession && serverName === "clay-documents") {
           var documentTools = _sessionDocument.getToolDefs(boundSession);
           for (var dti = 0; dti < documentTools.length; dti++) {
@@ -2452,6 +2535,7 @@ function createProjectContext(opts) {
     _email: _email,
     restoreDebateState: restoreDebateState,
     scheduledMessages: _scheduledMessages,
+    pairResultRecovery: _pairResultRecovery,
     sendCursorSharingState: opts.sendCursorSharingState,
     stopFileWatch: stopFileWatch,
     stopAllDirWatches: stopAllDirWatches,

package/lib/public/app.js

@@ -276,6 +276,7 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
     splitPanes: null,
     splitGroups: [],
     splitDelegations: {},
+    pairResultStatus: [],
     notesTemporarilyHidden: false,
     dmMode: false,
     historyFrom: 0,

package/lib/public/css/driver-continuation.css

@@ -0,0 +1,56 @@
+.driver-continuation-card,
+.driver-continuation-context {
+  width: min(680px, calc(100% - 24px));
+  margin: 14px auto;
+  border: 1px solid var(--border);
+  border-radius: 14px;
+  background: var(--bg-alt);
+  color: var(--text);
+  box-shadow: 0 10px 28px rgba(0, 0, 0, .08);
+}
+
+.driver-continuation-card { padding: 18px; }
+.driver-continuation-card header,
+.driver-continuation-context { display: flex; align-items: flex-start; gap: 12px; }
+.driver-continuation-context { padding: 15px 17px; }
+.driver-continuation-card header > div,
+.driver-continuation-context-copy { display: grid; gap: 3px; min-width: 0; flex: 1; }
+.driver-continuation-mark { display: grid; place-items: center; width: 30px; height: 30px; flex: 0 0 auto; border-radius: 9px; color: var(--accent2); background: color-mix(in srgb, var(--accent2) 12%, transparent); }
+.driver-continuation-kicker { font-size: 10px; line-height: 1.2; font-weight: 700; letter-spacing: .1em; color: var(--text-muted); }
+.driver-continuation-status { margin-left: auto; white-space: nowrap; font-size: 12px; color: var(--text-muted); }
+.driver-continuation-reason,
+.driver-continuation-context p { margin: 12px 0; color: var(--text-secondary); line-height: 1.5; }
+.driver-continuation-summary { display: grid; grid-template-columns: 80px 1fr; gap: 7px 12px; padding: 13px; border-radius: 10px; background: var(--bg); }
+.driver-continuation-summary dt,
+.driver-continuation-details dt { font-size: 11px; font-weight: 700; color: var(--text-muted); }
+.driver-continuation-summary dd,
+.driver-continuation-details dd { margin: 0; white-space: pre-wrap; line-height: 1.45; }
+.driver-continuation-details { margin-top: 12px; color: var(--text-secondary); }
+.driver-continuation-details summary { cursor: pointer; font-size: 12px; font-weight: 600; }
+.driver-continuation-details dl { display: grid; grid-template-columns: 120px 1fr; gap: 8px 12px; margin: 12px 0 0; }
+.driver-continuation-error { padding: 10px; border-radius: 8px; color: var(--error); background: var(--error-8); }
+.driver-continuation-context .driver-continuation-error { color: var(--error); }
+.driver-continuation-actions { display: flex; justify-content: flex-end; gap: 8px; margin-top: 16px; }
+.driver-continuation-action,
+.driver-continuation-source { min-height: 36px; border: 1px solid var(--border); border-radius: 9px; padding: 8px 13px; font: inherit; cursor: pointer; }
+.driver-continuation-action.primary { display: inline-flex; align-items: center; gap: 7px; border-color: var(--accent2); background: color-mix(in srgb, var(--accent2) 16%, var(--bg)); color: var(--accent2); }
+.driver-continuation-action.secondary,
+.driver-continuation-source { background: transparent; color: var(--text); }
+.driver-continuation-action:disabled,
+.driver-continuation-source:disabled { cursor: not-allowed; opacity: .45; }
+.driver-continuation-action:focus-visible,
+.driver-continuation-source:focus-visible,
+.driver-continuation-details summary:focus-visible { outline: 2px solid var(--accent2); outline-offset: 2px; }
+.driver-continuation-source { justify-self: start; margin-top: 5px; padding: 5px 9px; min-height: 30px; font-size: 12px; }
+
+@media (max-width: 600px) {
+  .driver-continuation-card,
+  .driver-continuation-context { width: calc(100% - 16px); }
+  .driver-continuation-card { padding: 14px; }
+  .driver-continuation-card header { flex-wrap: wrap; }
+  .driver-continuation-status { width: 100%; margin-left: 42px; }
+  .driver-continuation-summary,
+  .driver-continuation-details dl { grid-template-columns: 1fr; }
+  .driver-continuation-actions { flex-direction: column-reverse; }
+  .driver-continuation-action { width: 100%; justify-content: center; }
+}

package/lib/public/css/messages.css

@@ -1387,6 +1387,18 @@ pre.mermaid-error {
 .plan-banner.plan-exit { color: var(--success); }
 .plan-banner.plan-exit .plan-banner-icon { color: var(--success); }
 
+.pair-result-status { display: grid; gap: 8px; padding: 10px 16px 0; }
+.pair-result-status-card { border: 1px solid var(--border); border-radius: 10px; background: var(--bg-alt); padding: 10px 12px; color: var(--text-secondary); font-size: 12px; }
+.pair-result-status-card > strong, .pair-result-status-card > span { display: block; }
+.pair-result-status-card > strong { color: var(--text); margin-bottom: 3px; }
+.pair-result-status-card details { margin-top: 7px; }
+.pair-result-status-card summary { cursor: pointer; color: var(--accent); }
+.pair-result-status-card pre { max-height: 180px; overflow: auto; white-space: pre-wrap; font: inherit; }
+.pair-result-status-card button { margin-top: 8px; }
+.pair-result-status-retry:focus-visible { outline: 2px solid var(--accent); outline-offset: 2px; }
+.pair-result-status-retry:disabled { cursor: not-allowed; opacity: 0.55; }
+.pair-result-status-uncertain, .pair-result-status-blocked { border-color: color-mix(in srgb, var(--warning) 45%, var(--border)); }
+
 /* --- Plan card --- */
 .plan-card {
   max-width: var(--content-width);

package/lib/public/css/mobile-nav.css

@@ -358,11 +358,15 @@
     background: rgba(var(--overlay-rgb), 0.06);
   }
 
-  /* Split "New session" row: main action on the last-used vendor + a chevron
-     that expands .mobile-vendor-list below it. Mirrors the desktop sidebar. */
+  .mobile-session-new:focus-visible {
+    outline: 2px solid var(--accent);
+    outline-offset: 2px;
+  }
+
+  /* Primary creation action with an adjacent icon-only provider selector. */
   .mobile-session-new-row {
     display: flex;
-    gap: 6px;
+    gap: 0;
     padding: 6px 8px 8px;
   }
 
@@ -370,33 +374,44 @@
     flex: 1 1 auto;
     width: auto;
     margin-bottom: 0;
+    min-width: 0;
     padding: 10px 12px;
     border: 1px solid var(--border-subtle);
     border-radius: 8px;
     background: rgba(var(--overlay-rgb), 0.03);
     color: var(--text);
     gap: 8px;
-  }
-  .mobile-session-new-row .mobile-session-new-chevron {
-    flex: 0 0 auto;
-    width: 44px;
+    border-radius: 8px 0 0 8px;
+    white-space: normal;
+    line-height: 1.2;
+  }
+  .mobile-session-new-row .mobile-session-new-provider {
+    flex: 0 0 34px;
+    width: 34px;
+    min-width: 34px;
     margin-bottom: 0;
-    padding: 10px 0;
+    padding: 0;
     border: 1px solid var(--border-subtle);
-    border-radius: 8px;
+    border-left-color: var(--border);
+    border-radius: 0 8px 8px 0;
     background: rgba(var(--overlay-rgb), 0.03);
     color: var(--text-muted);
-    justify-content: center;
+    display: inline-flex;
+    align-items: center;
     gap: 0;
-  }
-  .mobile-session-new-row .mobile-session-new-chevron.expanded svg {
-    transform: rotate(180deg);
+    justify-content: center;
   }
   .mobile-session-new-row .mobile-session-new-main:active,
-  .mobile-session-new-row .mobile-session-new-chevron:active {
+  .mobile-session-new-row .mobile-session-new-provider:active {
     background: rgba(var(--overlay-rgb), 0.1);
   }
 
+  .mobile-session-new-row .session-create-provider-chevron .lucide,
+  .mobile-session-new-row .session-create-provider-chevron svg {
+    width: 14px;
+    height: 14px;
+  }
+
   .mobile-vendor-list {
     display: flex;
     flex-direction: column;

package/lib/public/css/overlays.css

@@ -518,13 +518,13 @@ button.top-bar-pill.pill-accent:hover { background: color-mix(in srgb, var(--acc
 .popover-copy:hover { color: var(--text); border-color: var(--text-dimmer); }
 .popover-copy.copied { color: var(--success); border-color: var(--success); }
 
-/* Skip permissions pill */
+/* Quiet native toolbar control for session permission mode. */
 .session-permission-control {
   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,81 @@ 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) 82%, transparent);
+  border-radius: 8px;
+  background: color-mix(in srgb, var(--bg-alt) 72%, transparent);
 }
 .session-permission-segmented button {
-  flex: 0 0 auto;
+  position: relative;
+  flex: 0 0 48px;
+  width: 48px;
+  height: 22px;
   border: 0;
-  border-radius: 999px;
-  padding: 3px 8px;
-  color: var(--text-muted, inherit);
+  border-radius: 7px;
+  padding: 3px 4px;
+  color: var(--text-secondary);
   background: transparent;
   font: inherit;
+  font-weight: 500;
   font-size: 11px;
+  line-height: 1;
   white-space: nowrap;
   cursor: pointer;
-}
-.session-permission-segmented button.active { background: var(--accent, #6f8cff); color: #fff; }
-.session-permission-segmented button:disabled { cursor: not-allowed; opacity: .5; }
+  transition: color .15s ease, background .15s ease, box-shadow .15s ease, border-color .15s ease;
+}
+.session-permission-segmented button:hover:not(:disabled) { color: var(--text); background: color-mix(in srgb, var(--bg) 76%, transparent); }
+.session-permission-segmented button:focus-visible { outline: 2px solid var(--accent); outline-offset: 1px; z-index: 1; }
+.session-permission-segmented button.active { border: 1px solid var(--border); background: var(--input-bg); color: var(--text); font-weight: var(--font-weight-heading, 600); box-shadow: 0 1px 2px rgba(var(--shadow-rgb), .12); }
+:root.light-theme .session-permission-segmented button.active { background: var(--bg); }
+.session-permission-segmented button:disabled { cursor: not-allowed; }
+.session-permission-control:not(.permission-pending) .session-permission-segmented button:disabled { color: var(--text-muted); opacity: .65; }
 .session-permission-control.permission-pending .session-permission-segmented button:disabled { cursor: wait; }
+.session-permission-segmented button.pending { color: var(--text); background: color-mix(in srgb, var(--bg) 42%, transparent); }
+.session-permission-segmented button.pending .permission-label { visibility: hidden; }
+.permission-spinner { position: absolute; inset: 50% auto auto 50%; display: block; visibility: hidden; width: 10px; height: 10px; transform: translate(-50%, -50%); 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: translate(-50%, -50%) 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-segmented button { padding-inline: 7px; }
+  .session-permission-control { column-gap: 4px; }
   .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

@@ -73,6 +73,28 @@ body.pane-mode #input-area {
   display: flex;
 }
 
+/* A configured two-Worker group is a deliberate workspace hierarchy: the
+   Driver gets the broad working canvas, while both Workers remain visible as
+   equal-height execution surfaces on the right. Legacy/ad-hoc two-pane
+   splits keep the ordinary equal columns below. */
+#split-host:has(.split-pane-role-worker:nth-of-type(3)) {
+  display: grid;
+  grid-template-columns: minmax(0, 3fr) minmax(260px, 2fr);
+  grid-template-rows: repeat(2, minmax(0, 1fr));
+  gap: 1px;
+  background: var(--border-subtle);
+}
+
+#split-host:has(.split-pane-role-worker:nth-of-type(3)) .split-pane-role-driver {
+  grid-row: 1 / span 2;
+  grid-column: 1;
+}
+
+#split-host:has(.split-pane-role-worker:nth-of-type(3)) .split-pane-role-worker {
+  grid-column: 2;
+  grid-row: var(--split-worker-row, auto);
+}
+
 .split-pane {
   flex: 1;
   display: flex;
@@ -365,26 +387,34 @@ body.pane-mode #input-area {
   line-height: 1;
 }
 
-/* Header-scoped (two-class) selectors: pane.css loads BEFORE menus.css in
-   style.css, so the base .session-full-access rules would win a specificity
-   tie and keep the pill at its 22px title-bar size inside the 24px pane
-   header. Scope under .split-pane-header to outrank them. */
+/* Header-scoped selectors keep the compact permission control clear of the
+   title and close affordance while preserving the shared header rhythm. */
+.split-pane-header {
+  height: 28px;
+  min-height: 28px;
+}
+
 .split-pane-header .split-pane-full-access {
-  height: auto;
+  height: 24px;
   align-self: center;
   margin-left: 0;
   padding: 0;
   gap: 4px;
-  font-size: 8px;
+  font-size: 11px;
   letter-spacing: 0.02em;
   flex-wrap: nowrap;
   flex: 0 0 auto;
-  overflow: hidden;
 }
 
 .split-pane-header .session-permission-segmented button {
-  padding: 1px 5px;
-  font-size: 8px;
+  min-height: 20px;
+  height: 20px;
+  font-size: 11px;
+}
+
+.split-pane-header .session-permission-segmented {
+  height: 24px;
+  padding: 1px;
 }
 
 .split-pane-header .session-permission-status {
@@ -394,7 +424,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 {
@@ -433,6 +463,11 @@ body.pane-mode #input-area {
   color: var(--text);
 }
 
+.split-pane-close:disabled {
+  opacity: 0.42;
+  cursor: not-allowed;
+}
+
 .split-pane-close svg {
   width: 12px;
   height: 12px;
@@ -470,6 +505,25 @@ body.pane-mode #input-area {
     --split-worker-height: calc(30% - 4.8px);
   }
 
+  #split-host:has(.split-pane-role-worker:nth-of-type(3)) {
+    display: flex;
+    flex-direction: column;
+    gap: var(--split-pane-gap);
+    background: transparent;
+  }
+
+  #split-host:has(.split-pane-role-worker:nth-of-type(3)) .split-pane-role-driver,
+  #split-host:has(.split-pane-role-worker:nth-of-type(3)) .split-pane-role-worker {
+    grid-row: auto;
+    grid-column: auto;
+  }
+
+  #split-host:has(.split-pane-role-worker:nth-of-type(3)) .split-pane-role-worker {
+    flex: 0 1 24%;
+    min-height: 104px;
+    order: -1;
+  }
+
   #split-host.visible {
     flex-direction: column;
     gap: var(--split-pane-gap);
@@ -487,11 +541,11 @@ body.pane-mode #input-area {
   }
 
   .split-pane-role-worker {
-    order: -1;
+    order: var(--split-pane-order, -1);
   }
 
   .split-pane-role-driver {
-    order: 0;
+    order: var(--split-pane-order, 0);
   }
 
   /* A configured Worker is an execution summary; the Driver keeps the