clay-server 3.4.0-beta.12 → 3.4.0-beta.13

package/lib/project-session-handoff.js

@@ -0,0 +1,162 @@
+var yoke = require("./yoke");
+var contextBuilder = require("./session-handoff-context");
+
+function hasUserContext(session) {
+  var history = (session && session.history) || [];
+  for (var i = 0; i < history.length; i++) {
+    if (history[i] && history[i].type === "user_message" && history[i].text) return true;
+    if (history[i] && history[i].type === "handoff_context" && history[i].request) return true;
+  }
+  return false;
+}
+
+function attachSessionHandoff(ctx) {
+  var sm = ctx.sm;
+
+  function sendResult(ws, ok, details) {
+    ctx.sendTo(ws, Object.assign({ type: "session_handoff_result", ok: ok }, details || {}));
+  }
+
+  function validate(ws, source, targetVendor) {
+    if (ctx.isMate) throw new Error("Session handoff is only available in projects.");
+    if (!source) throw new Error("No active session was found.");
+    if (ctx.splitStore && ctx.splitStore.groupForMember(source.localId)) {
+      throw new Error("Open the session by itself before continuing it in another agent.");
+    }
+    if (source.isProcessing || source._queryStarting) {
+      throw new Error("Wait for the current response to finish before continuing in another agent.");
+    }
+    if (!hasUserContext(source)) throw new Error("This session does not have any conversation to continue.");
+    if (!targetVendor) throw new Error("Choose an agent for the handoff.");
+    if (!ctx.adapters[targetVendor] || (sm.installedVendors || []).indexOf(targetVendor) === -1) {
+      throw new Error("The selected coding agent is not installed.");
+    }
+    var linuxUser = ctx.getLinuxUserForSession(source);
+    var vendorInfo = yoke.getVendorInfo(targetVendor);
+    if (linuxUser && vendorInfo && vendorInfo.osUserIsolation === false) {
+      throw new Error((vendorInfo.displayName || targetVendor) + " is not available for OS-isolated users.");
+    }
+    var ownerId = ws._clayUser && ctx.usersModule.isMultiUser() ? ws._clayUser.id : null;
+    if ((source.ownerId || null) !== ownerId) throw new Error("Session access denied.");
+    return linuxUser;
+  }
+
+  function quietRecord(session, entry) {
+    session.history.push(entry);
+    sm.appendToSessionFile(session, entry);
+  }
+
+  function handoff(ws, msg) {
+    var source = sm.sessions.get(ws._clayActiveSession) || null;
+    var targetVendor = typeof msg.targetVendor === "string" ? msg.targetVendor.trim() : "";
+    var targetModel = typeof msg.model === "string" ? msg.model.trim() : "";
+    var linuxUser;
+    try {
+      linuxUser = validate(ws, source, targetVendor);
+    } catch (err) {
+      sendResult(ws, false, { error: err.message || String(err) });
+      return;
+    }
+
+    var targetEffort = yoke.clampEffort(
+      targetVendor,
+      msg.effort || (sm.currentEffortByVendor && sm.currentEffortByVendor[targetVendor]) || sm.currentEffort || "medium"
+    ) || null;
+    var target = sm.createSessionRaw({
+      ownerId: source.ownerId || null,
+      sessionVisibility: source.sessionVisibility || "shared",
+      vendor: targetVendor,
+      model: targetModel || null,
+      effort: targetEffort,
+    });
+    var targetName = (yoke.getVendorInfo(targetVendor) || {}).displayName || targetVendor;
+    target.title = (source.title || "Continued session") + " · " + targetName;
+    target.handoff = {
+      sourceSessionId: source.localId,
+      sourceVendor: source.vendor || sm.defaultVendor || "claude",
+      createdAt: Date.now(),
+      mode: "context",
+      sourceHistoryIndex: source.history.length,
+    };
+
+    var sourceEntry = {
+      type: "handoff_created",
+      targetSessionId: target.localId,
+      targetVendor: targetVendor,
+      targetTitle: target.title,
+      _ts: Date.now(),
+    };
+    var targetEntry = {
+      type: "handoff_context",
+      sourceSessionId: source.localId,
+      sourceVendor: target.handoff.sourceVendor,
+      sourceTitle: source.title || "Untitled session",
+      targetVendor: targetVendor,
+      request: contextBuilder.latestUserRequest(source.history),
+      _ts: Date.now(),
+    };
+    quietRecord(source, sourceEntry);
+    quietRecord(target, targetEntry);
+
+    var prompt = contextBuilder.buildHandoffContext({
+      cwd: ctx.cwd,
+      source: source,
+      targetVendor: targetVendor,
+    });
+    target.isProcessing = true;
+    target.lastActivity = Date.now();
+    target.sentToolResults = {};
+    sm.switchSession(target.localId, ws);
+    if (typeof ctx.onProcessingChanged === "function") ctx.onProcessingChanged();
+    sendResult(ws, true, {
+      sourceSessionId: source.localId,
+      targetSessionId: target.localId,
+      targetVendor: targetVendor,
+    });
+
+    var sdk = ctx.getSdk();
+    function failStart(err) {
+      target.isProcessing = false;
+      sm.sendAndRecord(target, { type: "error", text: "Could not start the handoff session: " + (err.message || String(err)) });
+      if (typeof ctx.onProcessingChanged === "function") ctx.onProcessingChanged();
+      sm.broadcastSessionList();
+    }
+    if (!sdk || typeof sdk.startQuery !== "function") {
+      failStart(new Error("SDK bridge is not ready."));
+      return;
+    }
+    target._queryStartTs = Date.now();
+    var startPromise;
+    try {
+      startPromise = sdk.startQuery(target, prompt, undefined, linuxUser);
+    } catch (err) {
+      failStart(err);
+      return;
+    }
+    Promise.resolve(startPromise).catch(failStart);
+  }
+
+  function handleMessage(ws, msg) {
+    if (msg.type === "handoff_session_options") {
+      ctx.sendTo(ws, {
+        type: "handoff_session_options",
+        installedVendors: sm.installedVendors || [],
+        modelsByVendor: sm.modelsByVendor || {},
+        capabilitiesByVendor: sm.capabilitiesByVendor || {},
+      });
+      return true;
+    }
+    if (msg.type === "handoff_session") {
+      handoff(ws, msg);
+      return true;
+    }
+    return false;
+  }
+
+  return { handleMessage: handleMessage };
+}
+
+module.exports = {
+  attachSessionHandoff: attachSessionHandoff,
+  hasUserContext: hasUserContext,
+};

package/lib/project.js

@@ -36,6 +36,7 @@ var { createLocalMcp } = require("./mcp-local");
 var { attachEmail: attachEmailModule } = require("./project-email");
 var { attachSessionSpawn } = require("./project-session-spawn");
 var { attachSessionPair } = require("./project-session-pair");
+var { attachSessionHandoff } = require("./project-session-handoff");
 var { attachSessionNotes, composeSystemPrompts } = require("./project-session-notes");
 var { attachSessionDocument } = require("./project-session-document");
 var { attachSplitGroups } = require("./session-split-groups");
@@ -570,6 +571,18 @@ function createProjectContext(opts) {
     getLinuxUserForSession: getLinuxUserForSession,
     getPairToolDefs: function (boundSession) { return _sessionPair.getToolDefs(boundSession); },
   });
+  var _sessionHandoff = attachSessionHandoff({
+    cwd: cwd,
+    sm: sm,
+    isMate: isMate,
+    splitStore: _splitGroups.store,
+    getSdk: function () { return sdk; },
+    sendTo: sendTo,
+    usersModule: usersModule,
+    adapters: adapters,
+    getLinuxUserForSession: getLinuxUserForSession,
+    onProcessingChanged: onProcessingChanged,
+  });
   var _debate = null;
   var _debateProposal = attachDebateProposal({
     cwd: cwd,
@@ -1101,6 +1114,7 @@ function createProjectContext(opts) {
 
     // --- Sessions, config, project mgmt (delegated to project-sessions.js) ---
     if (_sessionPair.handleMessage(ws, msg)) return;
+    if (_sessionHandoff.handleMessage(ws, msg)) return;
     if (_splitGroups.handleMessage(ws, msg)) return;
     if (_models.handleMessage(ws, msg)) return;
     if (_sessions.handleSessionsMessage(ws, msg)) return;

package/lib/public/app.js

@@ -60,6 +60,7 @@ import { initRateLimit, handleRateLimitEvent as _rlHandleRateLimitEvent, updateR
 import { initCursors, handleRemoteCursorMove as _curHandleRemoteCursorMove, handleRemoteCursorLeave as _curHandleRemoteCursorLeave, handleRemoteSelection as _curHandleRemoteSelection, clearRemoteCursors as _curClearRemoteCursors, initCursorToggle } from './modules/app-cursors.js';
 import { initFavicon, updateFavicon as _favUpdateFavicon, setSendBtnMode as _favSetSendBtnMode, blinkIO as _favBlinkIO, blinkSessionDot as _favBlinkSessionDot, updateCrossProjectBlink as _favUpdateCrossProjectBlink, startUrgentBlink as _favStartUrgentBlink, stopUrgentBlink as _favStopUrgentBlink, setActivity as _favSetActivity, drawFaviconAnimFrame as _favDrawFaviconAnimFrame } from './modules/app-favicon.js';
 import { initHeader, closeSessionInfoPopover as _hdrCloseSessionInfoPopover, updateHistorySentinel as _hdrUpdateHistorySentinel, requestMoreHistory as _hdrRequestMoreHistory, prependOlderHistory as _hdrPrependOlderHistory } from './modules/app-header.js';
+import { initSessionActions } from './modules/session-actions.js';
 import { initMisc, flushPendingExtMessages, showImageModal as _miscShowImageModal, closeImageModal as _miscCloseImageModal, showPasteModal as _miscShowPasteModal, closePasteModal as _miscClosePasteModal, showConfirm as _miscShowConfirm, hideConfirm as _miscHideConfirm, showForceChangePinOverlay as _miscShowForceChangePinOverlay, sendExtensionCommand as _miscSendExtensionCommand, handleExtensionResult as _miscHandleExtensionResult } from './modules/app-misc.js';
 import { initSkillInstall, requireSkills as _siRequireSkills, requireClayMateInterview as _siRequireClayMateInterview, handleSkillInstallWs as _siHandleSkillInstallWs } from './modules/app-skills-install.js';
 import { initDebateUi, showDebateConcludeConfirm as _debShowDebateConcludeConfirm, exitDebateConcludeMode as _debExitDebateConcludeMode, handleDebateConcludeSend as _debHandleDebateConcludeSend, showDebateEndedMode as _debShowDebateEndedMode, exitDebateEndedMode as _debExitDebateEndedMode, showDebateUserFloor as _debShowDebateUserFloor, exitDebateFloorMode as _debExitDebateFloorMode, handleDebateFloorSend as _debHandleDebateFloorSend, renderDebateUserFloorDone as _debRenderDebateUserFloorDone, showDebateSticky as _debShowDebateSticky, showDebateBottomBar as _debShowDebateBottomBar, removeDebateBottomBar as _debRemoveDebateBottomBar, sendDebateStickyComment as _debSendDebateStickyComment, updateDebateRound as _debUpdateDebateRound } from './modules/app-debate-ui.js';
@@ -639,6 +640,7 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
 
   // --- Header module (rename, info popover, history) ---
   initHeader();
+  initSessionActions();
 
   // --- Skill Install module ---
   initSkillInstall();

package/lib/public/css/menus.css

@@ -43,62 +43,6 @@
 #header-rename-btn:hover { color: var(--text-secondary); background: rgba(var(--overlay-rgb),0.04); border-color: var(--border); }
 #header-rename-btn .lucide { width: 13px; height: 13px; }
 
-#header-add-worker-btn {
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-  gap: 7px;
-  width: auto;
-  height: 28px;
-  border: 1px solid color-mix(in srgb, var(--accent2) 28%, var(--border));
-  background: var(--accent2-8);
-  color: var(--accent2);
-  cursor: pointer;
-  border-radius: 8px;
-  flex-shrink: 0;
-  padding: 0 9px 0 7px;
-  margin-left: 0;
-  font-family: inherit;
-  font-size: 11px;
-  font-weight: 700;
-  line-height: 1;
-  white-space: nowrap;
-  transition: color 0.15s, background 0.15s, border-color 0.15s;
-}
-#header-add-worker-btn:hover {
-  color: var(--accent2-hover);
-  background: var(--accent2-15);
-  border-color: color-mix(in srgb, var(--accent2) 48%, var(--border));
-}
-.header-worker-icon {
-  position: relative;
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-  width: 16px;
-  height: 16px;
-  flex-shrink: 0;
-}
-.header-worker-icon > .lucide { width: 15px; height: 15px; }
-.header-worker-add-badge {
-  position: absolute;
-  right: -4px;
-  bottom: -3px;
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-  width: 9px;
-  height: 9px;
-  border-radius: 50%;
-  background: var(--accent2);
-  color: var(--bg);
-  box-shadow: 0 0 0 2px var(--bg);
-}
-.header-worker-add-badge .lucide { width: 7px; height: 7px; stroke-width: 3; }
-.header-worker-label { letter-spacing: 0.01em; }
-#header-add-worker-btn.hidden { display: none; }
-body.dm-mode #header-add-worker-btn { display: none; }
-
 /* "Close terminal" button for a live TUI session. Matches the session-control
    chrome; reds out on hover since it stops the running agent while preserving
    the resumable session. */

package/lib/public/css/pane.css

@@ -100,7 +100,8 @@ body.pane-mode #input-area {
 }
 
 .split-pane-title {
-  flex: 1;
+  flex: 0 1 auto;
+  max-width: 46%;
   min-width: 0;
   overflow: hidden;
   text-overflow: ellipsis;
@@ -283,12 +284,17 @@ button.split-pair-role:hover { filter: brightness(1.25); }
   color: var(--text-dimmer);
   cursor: pointer;
   flex-shrink: 0;
+  margin-left: auto;
 }
 
 .split-pane-context.has-data {
   display: inline-flex;
 }
 
+.split-pane-context:not(.has-data) + .split-pane-close {
+  margin-left: auto;
+}
+
 .split-pane-context:hover {
   background: var(--bg-alt);
   color: var(--text);

package/lib/public/css/session-actions.css

@@ -0,0 +1,98 @@
+#header-session-actions-btn {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  width: 28px;
+  height: 28px;
+  padding: 0;
+  border: 1px solid transparent;
+  border-radius: 8px;
+  background: transparent;
+  color: var(--text-dimmer);
+  cursor: pointer;
+  flex-shrink: 0;
+  transition: color 0.15s, background 0.15s, border-color 0.15s;
+}
+
+#header-session-actions-btn:hover,
+#header-session-actions-btn[aria-expanded="true"] {
+  color: var(--text);
+  background: rgba(var(--overlay-rgb), 0.05);
+  border-color: var(--border);
+}
+
+#header-session-actions-btn.hidden { display: none; }
+#header-session-actions-btn .lucide { width: 16px; height: 16px; }
+
+.session-actions-menu {
+  position: fixed;
+  z-index: 10020;
+  width: 286px;
+  padding: 6px;
+  border: 1px solid var(--border);
+  border-radius: 12px;
+  background: color-mix(in srgb, var(--bg) 96%, transparent);
+  box-shadow: 0 14px 38px rgba(var(--shadow-rgb), 0.32), 0 2px 8px rgba(var(--shadow-rgb), 0.2);
+  backdrop-filter: blur(18px);
+}
+
+.session-actions-row {
+  width: 100%;
+  border: 0;
+  background: transparent;
+  color: var(--text);
+  font: inherit;
+  text-align: left;
+  cursor: pointer;
+}
+
+.session-actions-row {
+  display: grid;
+  grid-template-columns: 30px minmax(0, 1fr) 16px;
+  align-items: center;
+  gap: 8px;
+  min-height: 54px;
+  padding: 7px 8px;
+  border-radius: 8px;
+}
+
+.session-actions-row:hover { background: var(--bg-alt); }
+.session-actions-row:disabled { cursor: default; opacity: 0.42; }
+.session-actions-row:disabled:hover { background: transparent; }
+
+.session-actions-row-icon {
+  display: grid;
+  place-items: center;
+  width: 28px;
+  height: 28px;
+  border: 1px solid var(--border-subtle);
+  border-radius: 8px;
+  background: rgba(var(--overlay-rgb), 0.035);
+  color: var(--accent2);
+}
+
+.session-actions-row-icon .lucide { width: 15px; height: 15px; }
+.session-actions-row-copy { display: flex; min-width: 0; flex-direction: column; gap: 2px; }
+.session-actions-row-copy strong { font-size: 12px; font-weight: 750; }
+.session-actions-row-copy > span { color: var(--text-dimmer); font-size: 10px; line-height: 1.25; }
+.session-actions-row-chevron { color: var(--text-dimmer); }
+.session-actions-row-chevron .lucide { width: 13px; height: 13px; }
+
+.handoff-modal { width: min(420px, calc(100vw - 32px)); }
+.handoff-modal-desc { margin: -10px 0 14px; color: var(--text-dimmer); font-size: 12px; line-height: 1.45; }
+.handoff-modal-source {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+  margin-bottom: 14px;
+  padding: 10px;
+  border: 1px solid var(--border-subtle);
+  border-radius: 9px;
+  background: var(--bg-alt);
+}
+.handoff-modal-source > img { width: 26px; height: 26px; object-fit: contain; border-radius: 6px; }
+.handoff-modal-source > span { display: grid; min-width: 0; gap: 1px; }
+.handoff-modal-source strong { overflow: hidden; color: var(--text); font-size: 12px; text-overflow: ellipsis; white-space: nowrap; }
+.handoff-modal-source span span { color: var(--text-dimmer); font-size: 10px; }
+.handoff-modal-field + .handoff-modal-field { margin-top: 10px; }
+.handoff-modal-field .wt-modal-label { margin-top: 0; }

package/lib/public/index.html

@@ -30,7 +30,7 @@
 (function(){try{var k="clay-theme-vars",v=localStorage.getItem(k),r=document.documentElement;if(v){var o=JSON.parse(v),p;for(p in o)r.style.setProperty(p,o[p]);var vt=localStorage.getItem(k.replace("-vars","-variant"));if(vt==="light"){r.classList.add("light-theme");r.classList.remove("dark-theme")}else{r.classList.add("dark-theme");r.classList.remove("light-theme")}var m=document.querySelector('meta[name="theme-color"]');if(m&&o["--bg"])m.setAttribute("content",o["--bg"])}else{var sl=window.matchMedia&&window.matchMedia("(prefers-color-scheme: light)").matches;if(sl){r.classList.add("light-theme");r.classList.remove("dark-theme")}}}catch(e){}})();
 </script>
 <script>if(window.navigator.standalone||window.matchMedia("(display-mode:standalone)").matches){document.documentElement.classList.add("pwa-standalone")}</script>
-<link rel="stylesheet" href="style.css?v=20260824f">
+<link rel="stylesheet" href="style.css?v=20260826a">
 <style>
 @media(max-width:768px){
   /* User messages: vertical stack, avatar on top, right-aligned */
@@ -388,12 +388,8 @@
         <div id="ralph-sticky" class="hidden"></div>
         <div id="debate-sticky" class="hidden"></div>
         <div class="status">
-          <button id="header-add-worker-btn" type="button" aria-label="Add AI Worker" title="Add an AI Worker — this session becomes the Driver of a pair">
-            <span class="header-worker-icon" aria-hidden="true">
-              <i data-lucide="bot"></i>
-              <span class="header-worker-add-badge"><i data-lucide="plus"></i></span>
-            </span>
-            <span class="header-worker-label">Add Worker</span>
+          <button id="header-session-actions-btn" type="button" aria-label="Session actions" title="Session actions" aria-haspopup="menu" aria-expanded="false">
+            <i data-lucide="ellipsis"></i>
           </button>
           <button type="button" id="header-tui-font-btn" class="header-tui-font-btn hidden" title="Terminal font" aria-label="Terminal font">
             <i data-lucide="type"></i>
@@ -2364,7 +2360,7 @@
 <script src="https://cdn.jsdelivr.net/npm/@xterm/addon-fit@0/lib/addon-fit.min.js"></script>
 <script src="https://cdn.jsdelivr.net/npm/@xterm/addon-web-links@0/lib/addon-web-links.min.js"></script>
 <script src="https://cdn.jsdelivr.net/npm/@xterm/addon-webgl@0/lib/addon-webgl.min.js"></script>
-<script type="module" src="app.js?v=20260824g"></script>
+<script type="module" src="app.js?v=20260826a"></script>
 <div id="pwa-install-modal" class="pwa-modal hidden">
   <div class="pwa-modal-backdrop"></div>
   <div class="pwa-modal-card">

package/lib/public/modules/agent-config-selects.js

@@ -0,0 +1,69 @@
+import { VENDOR_NAMES, VENDOR_ORDER, isExperimentalVendor } from './app-rendering.js';
+import { effortLevelsFor, effortDisplayName } from './app-panels.js';
+
+function optionValue(entry) {
+  if (typeof entry === "string") return entry;
+  return entry && (entry.value || entry.id) || "";
+}
+
+function optionLabel(entry) {
+  if (typeof entry === "string") return entry;
+  return entry && (entry.displayName || entry.name || entry.value || entry.id) || "";
+}
+
+export function buildAgentVendorSelect(installed, preferred) {
+  var select = document.createElement("select");
+  select.className = "wt-modal-input";
+  for (var i = 0; i < VENDOR_ORDER.length; i++) {
+    var vendor = VENDOR_ORDER[i];
+    if (installed.indexOf(vendor) === -1) continue;
+    var option = document.createElement("option");
+    option.value = vendor;
+    option.textContent = (isExperimentalVendor(vendor) ? "🧪 " : "") + (VENDOR_NAMES[vendor] || vendor);
+    if (isExperimentalVendor(vendor)) option.title = "Experimental integration; not yet validated through direct use testing";
+    select.appendChild(option);
+  }
+  if (preferred && installed.indexOf(preferred) !== -1) select.value = preferred;
+  return select;
+}
+
+export function fillAgentModels(select, vendor, options, preferred) {
+  var models = (options.modelsByVendor && options.modelsByVendor[vendor]) || [];
+  select.innerHTML = "";
+  var automatic = document.createElement("option");
+  automatic.value = "";
+  automatic.textContent = "Automatic";
+  select.appendChild(automatic);
+  for (var i = 0; i < models.length; i++) {
+    var option = document.createElement("option");
+    option.value = optionValue(models[i]);
+    option.textContent = optionLabel(models[i]);
+    select.appendChild(option);
+  }
+  select.value = preferred || "";
+  if (select.selectedIndex === -1) select.value = "";
+}
+
+export function buildAgentEffortSelect() {
+  var select = document.createElement("select");
+  select.className = "wt-modal-input";
+  return select;
+}
+
+export function fillAgentEffort(select, vendor, options, modelValue, preferred) {
+  var previous = preferred === undefined ? select.value : preferred;
+  var models = (options.modelsByVendor && options.modelsByVendor[vendor]) || [];
+  var levels = effortLevelsFor(vendor, models, modelValue);
+  select.innerHTML = "";
+  var automatic = document.createElement("option");
+  automatic.value = "";
+  automatic.textContent = "Default";
+  select.appendChild(automatic);
+  for (var i = 0; i < levels.length; i++) {
+    var option = document.createElement("option");
+    option.value = levels[i];
+    option.textContent = effortDisplayName(levels[i]);
+    select.appendChild(option);
+  }
+  select.value = levels.indexOf(previous) !== -1 ? previous : "";
+}

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

@@ -12,7 +12,6 @@ import { saveToolState, resetToolState, restoreToolState } from './tools.js';
 import { getSessionUsage, setSessionUsage, getContextData, setContextData, updateContextPanel, updateUsagePanel } from './app-panels.js';
 import { onHistoryPrepended as onSessionSearchHistoryPrepended } from './session-search.js';
 import { getCachedSessions } from './sidebar-sessions.js';
-import { openPairDialog } from './split-pair-ui.js';
 import { showConfirm } from './app-misc.js';
 
 // --- Module-owned state ---
@@ -23,27 +22,6 @@ export function initHeader() {
   var headerRenameBtn = document.getElementById("header-rename-btn");
   var headerTitleEl = document.getElementById("header-title");
   var headerInfoBtn = document.getElementById("header-info-btn");
-  var headerAddWorkerBtn = document.getElementById("header-add-worker-btn");
-
-  // --- Add Worker: the current session becomes the Driver of a new pair ---
-  if (headerAddWorkerBtn) {
-    headerAddWorkerBtn.addEventListener("click", function () {
-      var sessionId = store.get('activeSessionId');
-      if (!sessionId || store.get('splitPanes') || store.get('dmMode')) return;
-      openPairDialog({
-        sessionId: sessionId,
-        title: headerTitleEl ? headerTitleEl.textContent : "",
-        vendor: store.get('currentVendor') || "claude",
-      });
-    });
-    // A split shows the GROUP in the title bar; adding a worker there makes
-    // no sense (the group already has two members), so hide the button.
-    store.subscribe(function (state, prev) {
-      if (state.splitPanes !== prev.splitPanes) {
-        headerAddWorkerBtn.classList.toggle("hidden", !!state.splitPanes);
-      }
-    });
-  }
   var headerFullAccessBtn = document.getElementById("header-full-access-btn");
 
   function updateFullAccessButton() {

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

@@ -21,6 +21,7 @@ import { handlePaletteSessionSwitch, setPaletteVersion } from './command-palette
 import { handleFindInSessionResults } from './session-search.js';
 import { syncPaneTitles, maybeRestoreSplitGroup, openGroup } from './split-view.js';
 import { showPairDialog, handlePairCreated, handleSplitDelegation, showWorkerDelegationNotice, hideWorkerDelegationNotice } from './split-pair-ui.js';
+import { handleSessionActionMessage } from './session-actions.js';
 import { renderWorkerProposal, updateWorkerProposal } from './worker-proposal.js';
 import { handleInputSync, autoResize, builtinCommands, setScheduleBtnDisabled, sendShellResultToAgent } from './input.js';
 import { startThinking, appendThinking, stopThinking, resetThinkingGroup, createToolItem, updateToolExecuting, updateToolResult, markAllToolsDone, closeToolGroup, removeToolFromGroup, resetToolState, getTools, getPlanContent, setPlanContent, renderPlanBanner, renderPlanCard, getTodoTools, handleTodoWrite, handleTaskCreate, handleTaskUpdate, applyDeadSessionTodoCompaction, isPlanFilePath, enableMainInput, addTurnMeta, updateSubagentActivity, addSubagentToolEntry, markSubagentDone, initSubagentStop, updateSubagentProgress, updateSubagentTaskStatus, renderAskUserQuestion, markAskUserAnswered, renderPermissionRequest, markPermissionCancelled, markPermissionResolved, renderElicitationRequest, markElicitationResolved, renderUserDialogRequest, markUserDialogResolved, updateThinkingTokens } from './tools.js';
@@ -601,6 +602,13 @@ export function processMessage(msg) {
         if (createdPairGroup) openGroup(createdPairGroup);
         break;
 
+      case "session_handoff_result":
+      case "handoff_session_options":
+      case "handoff_context":
+      case "handoff_created":
+        handleSessionActionMessage(msg);
+        break;
+
       case "worker_proposal":
         renderWorkerProposal(msg);
         break;

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

@@ -814,9 +814,7 @@ export function updateContextPanel() {
       hCtxEl = document.createElement("div");
       hCtxEl.className = "header-context";
       hCtxEl.innerHTML = '<div class="header-context-bar"><div class="header-context-fill"></div></div><span class="header-context-label"></span>';
-      var workerBtn = document.getElementById("header-add-worker-btn");
-      var contextAnchor = workerBtn && workerBtn.parentNode === statusArea ? workerBtn.nextSibling : statusArea.firstChild;
-      statusArea.insertBefore(hCtxEl, contextAnchor);
+      statusArea.insertBefore(hCtxEl, statusArea.firstChild);
       hCtxEl.addEventListener("mouseenter", function() {
         if (store.get('richContextUsage')) {
           showCtxPopover();

package/lib/public/modules/model-picker.js

@@ -238,8 +238,6 @@ export function renderModelPicker() {
     return;
   }
 
-  var caps = s.vendorCapabilities || {};
-  var locked = s.activeSessionMode === "gui" && !!s.sessionHasHistory && !caps.midSessionModelSwitch;
   for (var i = 0; i < s.currentModels.length; i++) {
     var item = s.currentModels[i];
     var value = modelEntryValue(item);
@@ -247,29 +245,18 @@ export function renderModelPicker() {
     var button = document.createElement("button");
     button.className = "config-radio-item";
     if (modelEntryMatches(item, s.currentModel)) button.classList.add("active");
-    if (locked) button.classList.add("locked");
     button.dataset.model = value;
     button.textContent = typeof item === "string" ? item : (item.displayName || value);
     if (s.modelSelectionPending && s.modelSelectionPending.model === value) {
       button.classList.add("pending");
       button.textContent += " · Selecting…";
     }
-    button.disabled = locked || !!s.modelSelectionPending;
-    if (locked) {
-      button.title = "This vendor binds the model when the session starts. Start a new session to change it.";
-    } else {
-      button.addEventListener("click", function() { requestModelSelection(this.dataset.model); });
-    }
+    button.disabled = !!s.modelSelectionPending;
+    button.addEventListener("click", function() { requestModelSelection(this.dataset.model); });
     configModelList.appendChild(button);
   }
 
   if (s.modelSelectionError) {
     appendState("Model selection failed", s.modelSelectionError, false);
   }
-  if (locked) {
-    var hint = document.createElement("div");
-    hint.className = "config-model-hint";
-    hint.textContent = "Locked after first message. Start a new session to change models.";
-    configModelList.appendChild(hint);
-  }
 }

package/lib/public/modules/session-actions.js

@@ -0,0 +1,294 @@
+import { store } from './store.js';
+import { getWs } from './ws-ref.js';
+import { refreshIcons, iconHtml } from './icons.js';
+import { addSystemMessage, VENDOR_AVATARS, VENDOR_NAMES } from './app-rendering.js';
+import { openPairDialog } from './split-pair-ui.js';
+import { buildAgentVendorSelect, fillAgentModels, buildAgentEffortSelect, fillAgentEffort } from './agent-config-selects.js';
+import { showToast } from './utils.js';
+
+var menu = null;
+var button = null;
+var outsideHandler = null;
+var escapeHandler = null;
+var handoffDialog = null;
+var handoffEscapeHandler = null;
+var handoffSubmitButton = null;
+
+function closeMenu() {
+  if (menu) menu.remove();
+  menu = null;
+  if (button) button.setAttribute("aria-expanded", "false");
+  if (outsideHandler) document.removeEventListener("pointerdown", outsideHandler, true);
+  if (escapeHandler) document.removeEventListener("keydown", escapeHandler);
+  outsideHandler = null;
+  escapeHandler = null;
+}
+
+function positionMenu() {
+  if (!menu || !button) return;
+  var rect = button.getBoundingClientRect();
+  var width = menu.offsetWidth;
+  menu.style.top = Math.round(rect.bottom + 6) + "px";
+  menu.style.left = Math.max(8, Math.round(rect.right - width)) + "px";
+}
+
+function actionRow(icon, label, description) {
+  var row = document.createElement("button");
+  row.type = "button";
+  row.className = "session-actions-row";
+  row.innerHTML = iconHtml(icon, "session-actions-row-icon") +
+    '<span class="session-actions-row-copy"><strong></strong><span></span></span>' +
+    iconHtml("chevron-right", "session-actions-row-chevron");
+  row.querySelector("strong").textContent = label;
+  row.querySelector(".session-actions-row-copy > span").textContent = description;
+  return row;
+}
+
+function menuShell(label) {
+  var el = document.createElement("div");
+  el.className = "session-actions-menu";
+  el.setAttribute("role", "menu");
+  el.setAttribute("aria-label", label);
+  document.body.appendChild(el);
+  menu = el;
+  button.setAttribute("aria-expanded", "true");
+  return el;
+}
+
+function installCloseHandlers() {
+  outsideHandler = function (event) {
+    if (menu && !menu.contains(event.target) && event.target !== button && !button.contains(event.target)) closeMenu();
+  };
+  escapeHandler = function (event) {
+    if (event.key === "Escape") {
+      event.preventDefault();
+      closeMenu();
+      if (button) button.focus();
+    }
+  };
+  setTimeout(function () {
+    document.addEventListener("pointerdown", outsideHandler, true);
+    document.addEventListener("keydown", escapeHandler);
+  }, 0);
+}
+
+function closeHandoffDialog() {
+  if (handoffDialog) handoffDialog.remove();
+  if (handoffEscapeHandler) document.removeEventListener("keydown", handoffEscapeHandler);
+  handoffDialog = null;
+  handoffEscapeHandler = null;
+  handoffSubmitButton = null;
+}
+
+function handoffField(labelText, control) {
+  var field = document.createElement("div");
+  field.className = "handoff-modal-field";
+  var label = document.createElement("label");
+  label.className = "wt-modal-label";
+  label.textContent = labelText;
+  field.appendChild(label);
+  field.appendChild(control);
+  return field;
+}
+
+function requestHandoffDialog() {
+  var ws = getWs();
+  if (!ws || ws.readyState !== 1) return;
+  closeMenu();
+  ws.send(JSON.stringify({ type: "handoff_session_options" }));
+}
+
+function showHandoffDialog(options) {
+  closeHandoffDialog();
+  var installed = options.installedVendors || [];
+  var vendorInfo = store.get('vendorInfo') || {};
+  if (store.get('isOsUsers')) {
+    installed = installed.filter(function (vendor) {
+      return !vendorInfo[vendor] || vendorInfo[vendor].osUserIsolation !== false;
+    });
+  }
+  if (installed.length < 1) {
+    showToast("Install a coding agent before continuing this session.", "error");
+    return;
+  }
+
+  var currentVendor = store.get('currentVendor') || "claude";
+  var currentModel = store.get('currentModel') || "";
+  var currentEffort = store.get('currentEffort') || "";
+  var container = document.createElement("div");
+  var overlay = document.createElement("div");
+  overlay.className = "wt-modal-overlay";
+  container.appendChild(overlay);
+  var modal = document.createElement("div");
+  modal.className = "wt-modal handoff-modal";
+  modal.setAttribute("role", "dialog");
+  modal.setAttribute("aria-modal", "true");
+  modal.setAttribute("aria-labelledby", "handoff-modal-title");
+
+  var title = document.createElement("div");
+  title.id = "handoff-modal-title";
+  title.className = "wt-modal-title";
+  title.textContent = "Continue in a new agent";
+  modal.appendChild(title);
+  var desc = document.createElement("div");
+  desc.className = "handoff-modal-desc";
+  desc.textContent = "Start an independent session with a focused copy of this conversation's context.";
+  modal.appendChild(desc);
+
+  var source = document.createElement("div");
+  source.className = "handoff-modal-source";
+  var sourceAvatar = document.createElement("img");
+  sourceAvatar.src = VENDOR_AVATARS[currentVendor] || VENDOR_AVATARS.claude;
+  sourceAvatar.alt = "";
+  source.appendChild(sourceAvatar);
+  var sourceCopy = document.createElement("span");
+  var sourceTitle = document.createElement("strong");
+  sourceTitle.textContent = document.getElementById("header-title").textContent || "Current session";
+  var sourceMeta = document.createElement("span");
+  sourceMeta.textContent = "From " + (VENDOR_NAMES[currentVendor] || currentVendor);
+  sourceCopy.appendChild(sourceTitle);
+  sourceCopy.appendChild(sourceMeta);
+  source.appendChild(sourceCopy);
+  modal.appendChild(source);
+
+  var vendorSelect = buildAgentVendorSelect(installed, currentVendor);
+  var modelSelect = document.createElement("select");
+  modelSelect.className = "wt-modal-input";
+  var effortSelect = buildAgentEffortSelect();
+  var vendorField = handoffField("Agent", vendorSelect);
+  var modelField = handoffField("Model", modelSelect);
+  var effortField = handoffField("Reasoning effort", effortSelect);
+  modal.appendChild(vendorField);
+  modal.appendChild(modelField);
+  modal.appendChild(effortField);
+
+  function syncEffort(preferred) {
+    fillAgentEffort(effortSelect, vendorSelect.value, options, modelSelect.value, preferred);
+    var capabilities = (options.capabilitiesByVendor && options.capabilitiesByVendor[vendorSelect.value]) || {};
+    effortField.style.display = capabilities.effort === false ? "none" : "";
+  }
+  fillAgentModels(modelSelect, vendorSelect.value, options, vendorSelect.value === currentVendor ? currentModel : "");
+  syncEffort(vendorSelect.value === currentVendor ? currentEffort : "");
+  vendorSelect.addEventListener("change", function () {
+    fillAgentModels(modelSelect, vendorSelect.value, options, "");
+    syncEffort("");
+  });
+  modelSelect.addEventListener("change", function () { syncEffort(effortSelect.value); });
+
+  var actions = document.createElement("div");
+  actions.className = "wt-modal-actions";
+  var cancel = document.createElement("button");
+  cancel.type = "button";
+  cancel.className = "wt-modal-btn";
+  cancel.textContent = "Cancel";
+  var submit = document.createElement("button");
+  submit.type = "button";
+  submit.className = "wt-modal-btn primary";
+  submit.textContent = "Continue";
+  actions.appendChild(cancel);
+  actions.appendChild(submit);
+  modal.appendChild(actions);
+  container.appendChild(modal);
+  document.body.appendChild(container);
+  handoffDialog = container;
+  handoffSubmitButton = submit;
+
+  cancel.addEventListener("click", closeHandoffDialog);
+  overlay.addEventListener("click", closeHandoffDialog);
+  handoffEscapeHandler = function (event) {
+    if (event.key === "Escape") closeHandoffDialog();
+  };
+  document.addEventListener("keydown", handoffEscapeHandler);
+  submit.addEventListener("click", function () {
+    var ws = getWs();
+    if (!ws || ws.readyState !== 1) return;
+    ws.send(JSON.stringify({
+      type: "handoff_session",
+      targetVendor: vendorSelect.value,
+      model: modelSelect.value,
+      effort: effortSelect.value,
+    }));
+    submit.disabled = true;
+    submit.textContent = "Continuing…";
+  });
+  vendorSelect.focus();
+}
+
+function showMainMenu() {
+  closeMenu();
+  var el = menuShell("Session actions");
+  var addWorker = actionRow("bot", "Add AI Worker", "Open a second agent beside this session.");
+  addWorker.addEventListener("click", function () {
+    var sessionId = store.get('activeSessionId');
+    if (!sessionId) return;
+    closeMenu();
+    openPairDialog({
+      sessionId: sessionId,
+      title: document.getElementById("header-title").textContent,
+      vendor: store.get('currentVendor') || "claude",
+    });
+  });
+  var handoff = actionRow("forward", "Continue in another agent", "Carry this conversation into a new session.");
+  var unavailable = !store.get('sessionHasHistory') || store.get('sessionIsProcessing');
+  handoff.disabled = unavailable;
+  handoff.title = unavailable ? "Available after the current turn is complete" : "";
+  handoff.addEventListener("click", requestHandoffDialog);
+  el.appendChild(addWorker);
+  el.appendChild(handoff);
+  refreshIcons();
+  positionMenu();
+  installCloseHandlers();
+}
+
+function updateVisibility() {
+  if (!button) return;
+  var state = store.snap();
+  var hidden = !state.activeSessionId || state.dmMode || state.paneMode || !!state.splitPanes || state.activeSessionMode !== "gui";
+  button.classList.toggle("hidden", hidden);
+  if (hidden) closeMenu();
+}
+
+export function initSessionActions() {
+  button = document.getElementById("header-session-actions-btn");
+  if (!button) return;
+  button.addEventListener("click", function () {
+    if (menu) closeMenu();
+    else showMainMenu();
+  });
+  store.subscribe(function (state, prev) {
+    if (state.activeSessionId !== prev.activeSessionId || state.dmMode !== prev.dmMode ||
+        state.paneMode !== prev.paneMode || state.splitPanes !== prev.splitPanes ||
+        state.activeSessionMode !== prev.activeSessionMode) updateVisibility();
+  });
+  window.addEventListener("resize", closeMenu);
+  updateVisibility();
+}
+
+export function handleSessionActionMessage(msg) {
+  if (msg.type === "handoff_session_options") {
+    showHandoffDialog(msg);
+    return true;
+  }
+  if (msg.type === "session_handoff_result") {
+    if (msg.ok) closeHandoffDialog();
+    else {
+      showToast(msg.error || "Could not continue the session in another agent.", "error");
+      if (handoffSubmitButton) {
+        handoffSubmitButton.disabled = false;
+        handoffSubmitButton.textContent = "Continue";
+      }
+    }
+    return true;
+  }
+  if (msg.type === "handoff_context") {
+    var sourceName = VENDOR_NAMES[msg.sourceVendor] || msg.sourceVendor || "another agent";
+    addSystemMessage("Continued from “" + (msg.sourceTitle || "Untitled session") + "” in " + sourceName + ".", false);
+    return true;
+  }
+  if (msg.type === "handoff_created") {
+    var targetName = VENDOR_NAMES[msg.targetVendor] || msg.targetVendor || "another agent";
+    addSystemMessage("Continued in a new " + targetName + " session.", false);
+    return true;
+  }
+  return false;
+}

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

@@ -1,7 +1,7 @@
 import { store } from './store.js';
 import { getWs } from './ws-ref.js';
-import { VENDOR_AVATARS, VENDOR_NAMES, VENDOR_ORDER, isExperimentalVendor } from './app-rendering.js';
-import { effortLevelsFor, effortDisplayName } from './app-panels.js';
+import { VENDOR_AVATARS } from './app-rendering.js';
+import { buildAgentVendorSelect, fillAgentModels, buildAgentEffortSelect, fillAgentEffort } from './agent-config-selects.js';
 import { showToast } from './utils.js';
 
 var pairDialog = null;
@@ -9,78 +9,14 @@ var pairDialog = null;
 // that session becomes the Driver and the dialog only configures the Worker.
 var pendingDriver = null;
 
-function optionValue(entry) {
-  if (typeof entry === "string") return entry;
-  return entry && (entry.value || entry.id) || "";
-}
-
-function optionLabel(entry) {
-  if (typeof entry === "string") return entry;
-  return entry && (entry.displayName || entry.name || entry.value || entry.id) || "";
-}
-
-function fillModels(select, vendor, options) {
-  var models = (options.modelsByVendor && options.modelsByVendor[vendor]) || [];
-  select.innerHTML = "";
-  var automatic = document.createElement("option");
-  automatic.value = "";
-  automatic.textContent = "Automatic";
-  select.appendChild(automatic);
-  for (var i = 0; i < models.length; i++) {
-    var option = document.createElement("option");
-    option.value = optionValue(models[i]);
-    option.textContent = optionLabel(models[i]);
-    select.appendChild(option);
-  }
-}
-
 function closePairDialog() {
   if (pairDialog) pairDialog.remove();
   pairDialog = null;
 }
 
-function buildVendorSelect(installed, preferred) {
-  var select = document.createElement("select");
-  select.className = "wt-modal-input";
-  for (var i = 0; i < VENDOR_ORDER.length; i++) {
-    if (installed.indexOf(VENDOR_ORDER[i]) === -1) continue;
-    var option = document.createElement("option");
-    option.value = VENDOR_ORDER[i];
-    option.textContent = (isExperimentalVendor(VENDOR_ORDER[i]) ? "🧪 " : "") + (VENDOR_NAMES[VENDOR_ORDER[i]] || VENDOR_ORDER[i]);
-    if (isExperimentalVendor(VENDOR_ORDER[i])) option.title = "Experimental integration; not yet validated through direct use testing";
-    select.appendChild(option);
-  }
-  if (preferred && installed.indexOf(preferred) !== -1) select.value = preferred;
-  return select;
-}
-
 // Effort levels are vendor- and model-specific (codex: minimal..xhigh,
 // claude/kiro: low..max, plus per-model supportedEffortLevels overrides), so
 // options are rebuilt whenever the role's vendor or model changes.
-function fillEffortOptions(select, vendor, options, modelValue) {
-  var previous = select.value;
-  var models = (options.modelsByVendor && options.modelsByVendor[vendor]) || [];
-  var levels = effortLevelsFor(vendor, models, modelValue);
-  select.innerHTML = "";
-  var automatic = document.createElement("option");
-  automatic.value = "";
-  automatic.textContent = "Default";
-  select.appendChild(automatic);
-  for (var i = 0; i < levels.length; i++) {
-    var option = document.createElement("option");
-    option.value = levels[i];
-    option.textContent = effortDisplayName(levels[i]);
-    select.appendChild(option);
-  }
-  select.value = levels.indexOf(previous) !== -1 ? previous : "";
-}
-
-function buildEffortSelect() {
-  var select = document.createElement("select");
-  select.className = "wt-modal-input";
-  return select;
-}
-
 function fieldLabel(text, control) {
   var label = document.createElement("label");
   label.className = "wt-modal-label";
@@ -155,25 +91,25 @@ export function showPairDialog(options) {
     : "One Driver plans and directs a visible Worker session.";
   modal.appendChild(desc);
 
-  var driverVendor = buildVendorSelect(installed, installed.indexOf("claude") !== -1 ? "claude" : installed[0]);
+  var driverVendor = buildAgentVendorSelect(installed, installed.indexOf("claude") !== -1 ? "claude" : installed[0]);
   var workerDefault = options.lastVendor && options.lastVendor !== driverVendor.value ? options.lastVendor : (installed.indexOf("codex") !== -1 ? "codex" : installed[0]);
-  var workerVendor = buildVendorSelect(installed, workerDefault);
+  var workerVendor = buildAgentVendorSelect(installed, workerDefault);
   var driverModel = document.createElement("select");
   driverModel.className = "wt-modal-input";
   var workerModel = document.createElement("select");
   workerModel.className = "wt-modal-input";
-  var driverEffort = buildEffortSelect();
-  var workerEffort = buildEffortSelect();
-  function refreshDriverEffort() { fillEffortOptions(driverEffort, driverVendor.value, options, driverModel.value); }
-  function refreshWorkerEffort() { fillEffortOptions(workerEffort, workerVendor.value, options, workerModel.value); }
-  fillModels(driverModel, driverVendor.value, options);
-  fillModels(workerModel, workerVendor.value, options);
+  var driverEffort = buildAgentEffortSelect();
+  var workerEffort = buildAgentEffortSelect();
+  function refreshDriverEffort() { fillAgentEffort(driverEffort, driverVendor.value, options, driverModel.value); }
+  function refreshWorkerEffort() { fillAgentEffort(workerEffort, workerVendor.value, options, workerModel.value); }
+  fillAgentModels(driverModel, driverVendor.value, options);
+  fillAgentModels(workerModel, workerVendor.value, options);
   refreshDriverEffort();
   refreshWorkerEffort();
   workerEffort.value = "medium";
   if (workerEffort.value !== "medium") workerEffort.value = "";
-  driverVendor.addEventListener("change", function () { fillModels(driverModel, driverVendor.value, options); refreshDriverEffort(); });
-  workerVendor.addEventListener("change", function () { fillModels(workerModel, workerVendor.value, options); refreshWorkerEffort(); });
+  driverVendor.addEventListener("change", function () { fillAgentModels(driverModel, driverVendor.value, options); refreshDriverEffort(); });
+  workerVendor.addEventListener("change", function () { fillAgentModels(workerModel, workerVendor.value, options); refreshWorkerEffort(); });
   driverModel.addEventListener("change", refreshDriverEffort);
   workerModel.addEventListener("change", refreshWorkerEffort);
 
@@ -319,7 +255,8 @@ export function syncPairChrome(host, split) {
         setBtn.title = "Make this session the Driver; the other pane becomes its Worker";
         setBtn.addEventListener("click", function () { sendSetPair(group.id, paneSessionId); });
         var titleEl = header.querySelector(".split-pane-title");
-        header.insertBefore(setBtn, titleEl ? titleEl.nextSibling : null);
+        var accessEl = header.querySelector(".split-pane-full-access");
+        header.insertBefore(setBtn, accessEl ? accessEl.nextSibling : (titleEl ? titleEl.nextSibling : null));
       })(split.panes[ai].sessionId, headers[ai]);
     }
     return;
@@ -339,7 +276,8 @@ export function syncPairChrome(host, split) {
         sendSetPair(group.id, isDriver ? null : sessionId);
       });
       var title = header.querySelector(".split-pane-title");
-      header.insertBefore(badge, title ? title.nextSibling : null);
+      var access = header.querySelector(".split-pane-full-access");
+      header.insertBefore(badge, access ? access.nextSibling : (title ? title.nextSibling : null));
     })(split.panes[pi].sessionId, headers[pi]);
   }
   var active = (store.get('splitDelegations') || {})[group.id];

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

@@ -231,6 +231,9 @@ function createPane(pane, index) {
     }, "Skip Permissions", true);
   });
   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";

package/lib/public/style.css

@@ -3,6 +3,7 @@
 @import url("css/title-bar.css?v=20260824");
 @import url("css/pane.css");
 @import url("css/worker-proposal.css");
+@import url("css/session-actions.css");
 @import url("css/sidebar.css");
 @import url("css/overlays.css");
 @import url("css/menus.css");

package/lib/session-handoff-context.js

@@ -0,0 +1,110 @@
+var spawnSync = require("child_process").spawnSync;
+var yoke = require("./yoke");
+
+var MAX_CONTEXT_CHARS = 36000;
+var MAX_TURNS = 12;
+var MAX_USER_CHARS = 5000;
+var MAX_ASSISTANT_CHARS = 9000;
+var MAX_GIT_CHARS = 5000;
+var MAX_TRANSCRIPT_CHARS = 24000;
+
+function trimText(value, limit) {
+  var text = typeof value === "string" ? value.trim() : "";
+  if (text.length <= limit) return text;
+  return text.slice(0, limit) + "\n[truncated]";
+}
+
+function recentTurns(history) {
+  var turns = [];
+  var current = null;
+  history = Array.isArray(history) ? history : [];
+  for (var i = 0; i < history.length; i++) {
+    var entry = history[i];
+    if (!entry) continue;
+    if (entry.type === "user_message" || (entry.type === "handoff_context" && entry.request)) {
+      current = { user: trimText(entry.text || entry.request, MAX_USER_CHARS), assistant: "" };
+      turns.push(current);
+    } else if (entry.type === "delta" && entry.text) {
+      if (!current) {
+        current = { user: "", assistant: "" };
+        turns.push(current);
+      }
+      current.assistant += entry.text;
+      if (current.assistant.length > MAX_ASSISTANT_CHARS) {
+        current.assistant = current.assistant.slice(-MAX_ASSISTANT_CHARS);
+      }
+    }
+  }
+  return turns.slice(-MAX_TURNS);
+}
+
+function latestUserRequest(history) {
+  var turns = recentTurns(history);
+  for (var i = turns.length - 1; i >= 0; i--) {
+    if (turns[i].user) return turns[i].user;
+  }
+  return "";
+}
+
+function gitCommand(cwd, args) {
+  var result = spawnSync("git", args, {
+    cwd: cwd,
+    encoding: "utf8",
+    timeout: 5000,
+    maxBuffer: 1024 * 1024,
+  });
+  if (result.error || result.status !== 0) return "";
+  return trimText(result.stdout, MAX_GIT_CHARS);
+}
+
+function repositoryState(cwd) {
+  var status = gitCommand(cwd, ["status", "--short", "--branch"]);
+  var lines = [];
+  lines.push("Working tree:\n" + (status || "clean"));
+  return lines.join("\n\n");
+}
+
+function transcriptText(turns) {
+  var sections = [];
+  for (var i = 0; i < turns.length; i++) {
+    var turn = turns[i];
+    var parts = ["Turn " + (i + 1)];
+    if (turn.user) parts.push("USER:\n" + turn.user);
+    if (turn.assistant) parts.push("ASSISTANT:\n" + trimText(turn.assistant, MAX_ASSISTANT_CHARS));
+    sections.push(parts.join("\n\n"));
+  }
+  while (sections.length > 1 && sections.join("\n\n---\n\n").length > MAX_TRANSCRIPT_CHARS) {
+    sections.shift();
+  }
+  return sections.join("\n\n---\n\n");
+}
+
+function buildHandoffContext(options) {
+  var source = options.source;
+  var targetVendor = options.targetVendor;
+  var sourceVendor = source.vendor || "claude";
+  var sourceName = (yoke.getVendorInfo(sourceVendor) || {}).displayName || sourceVendor;
+  var targetName = (yoke.getVendorInfo(targetVendor) || {}).displayName || targetVendor;
+  var turns = recentTurns(source.history);
+  var latestUser = latestUserRequest(source.history);
+  var parts = [
+    "[Clay session handoff]",
+    "You are continuing work from another Clay coding-agent session. This is a snapshot, not a native conversation resume. Verify the current filesystem state before acting.",
+    "Source agent: " + sourceName,
+    "Target agent: " + targetName,
+    "Source session: " + (source.title || "Untitled session") + " (#" + source.localId + ")",
+  ];
+  if (latestUser) parts.push("Current user request, verbatim:\n" + latestUser);
+  parts.push("Repository state at handoff:\n" + repositoryState(options.cwd));
+  parts.push("Recent conversation:\n" + transcriptText(turns));
+  parts.push("Continue from the unresolved work above. Preserve the user's decisions and constraints, inspect the actual files before making assumptions, and proceed without asking the user to repeat context.");
+  return trimText(parts.join("\n\n"), MAX_CONTEXT_CHARS);
+}
+
+module.exports = {
+  MAX_CONTEXT_CHARS: MAX_CONTEXT_CHARS,
+  buildHandoffContext: buildHandoffContext,
+  latestUserRequest: latestUserRequest,
+  recentTurns: recentTurns,
+  repositoryState: repositoryState,
+};

package/lib/sessions.js

@@ -169,6 +169,7 @@ function createSessionManager(opts) {
       if (session.lastRewindUuid) metaObj.lastRewindUuid = session.lastRewindUuid;
       if (session.loop) metaObj.loop = session.loop;
       if (session.spawn) metaObj.spawn = session.spawn;
+      if (session.handoff) metaObj.handoff = session.handoff;
       if (session.debateState) metaObj.debateState = session.debateState;
       if (session.debateSetupMode) metaObj.debateSetupMode = true;
       var meta = JSON.stringify(metaObj);
@@ -281,6 +282,7 @@ function createSessionManager(opts) {
       session.effort = m.effort || null;
       if (m.loop) session.loop = m.loop;
       if (m.spawn) session.spawn = m.spawn;
+      if (m.handoff) session.handoff = m.handoff;
       if (m.debateState) session.debateState = m.debateState;
       if (m.debateSetupMode) session.debateSetupMode = true;
       if (m.ownerId) session.ownerId = m.ownerId;

package/lib/ws-schema.js

@@ -30,6 +30,8 @@ var schema = {
   "search_session_content":   { direction: "c2s", handler: "lib/project-sessions.js", description: "Full-text search within a session" },
   "load_more_history":        { direction: "c2s", handler: "lib/project-sessions.js", description: "Request older history entries for the current session" },
   "fork_session":             { direction: "c2s", handler: "lib/project-sessions.js", description: "Fork a session from a given message UUID" },
+  "handoff_session":          { direction: "c2s", handler: "lib/project-session-handoff.js", description: "Continue the active session in a newly created agent session" },
+  "handoff_session_options":  { direction: "c2s", handler: "lib/project-session-handoff.js", description: "Request vendors, models, and effort capabilities for the handoff dialog (response reuses the same type)" },
   "input_sync":               { direction: "c2s", handler: "lib/project-sessions.js", description: "Sync the current input field text to other clients" },
   "tui_transcript_request":   { direction: "c2s", handler: "lib/project-sessions.js", description: "Ask for the assistant text index of a Claude TUI session (for hover-to-grab)" },
   "split_group_create":       { direction: "c2s", handler: "lib/session-split-groups.js", description: "Create a persistent two-session split group" },
@@ -49,6 +51,9 @@ var schema = {
   "search_results":           { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Session title search results" },
   "search_content_results":   { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Full-text content search results" },
   "fork_complete":            { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Fork succeeded, includes new session ID" },
+  "session_handoff_result":   { direction: "s2c", handler: "lib/public/modules/session-actions.js", description: "Session handoff result and new target session ID" },
+  "handoff_context":          { direction: "s2c", handler: "lib/public/modules/session-actions.js", description: "Timeline marker identifying the source of a handoff session" },
+  "handoff_created":          { direction: "s2c", handler: "lib/public/modules/session-actions.js", description: "Timeline marker linking a source session to its handoff target" },
   "input_sync_broadcast":     { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Broadcast input text from another client" },
   "tui_transcript_state":     { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Assistant text index for a Claude TUI session (full replace; sent on request and after each new assistant message)" },
   "split_groups":             { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Full persistent split-group list for the current user" },

package/lib/yoke/adapters/codex.js

@@ -1072,6 +1072,7 @@ function createCodexQueryHandle(appServer, queryOpts) {
         await appServer.send("turn/start", {
           threadId: state.threadId,
           input: input,
+          model: state.model,
         }, 60000);
 
         // Wait for turn to complete
@@ -1144,7 +1145,7 @@ function createCodexQueryHandle(appServer, queryOpts) {
     },
 
     setModel: function(model) {
-      // Model is set at thread creation. Cannot change mid-thread.
+      state.model = model || "gpt-5.6-terra";
       return Promise.resolve();
     },
 
@@ -1326,7 +1327,7 @@ function createCodexAdapter(opts) {
       fastModeState: null,
       capabilities: {
         effort: true,
-        midSessionModelSwitch: false,
+        midSessionModelSwitch: true,
         fork: true,
         rollback: true,
         sessionListing: false,

package/lib/yoke/adapters/kiro.js

@@ -762,7 +762,7 @@ function createKiroQueryHandle(acp, queryOpts) {
 
     setModel: function(model) {
       state.model = model;
-      return setSessionModel(model).catch(function() {});
+      return setSessionModel(model);
     },
 
     setEffort: function() { return Promise.resolve(); },
@@ -867,7 +867,7 @@ function createKiroAdapter(opts) {
       fastModeState: null,
       capabilities: {
         effort: false,
-        midSessionModelSwitch: false,
+        midSessionModelSwitch: true,
         fork: false,
         rollback: false,
         sessionListing: false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clay-server",
-  "version": "3.4.0-beta.12",
+  "version": "3.4.0-beta.13",
   "description": "Self-hosted team workspace for Claude Code and Codex. Multi-user, browser-based, with persistent AI mates.",
   "bin": {
     "clay-server": "./bin/cli.js",