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

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/sdk-bridge.js

@@ -1931,10 +1931,12 @@ function createSDKBridge(opts) {
       session.model = model;
       sm.saveSessionFile(session);
       sm.currentModel = model;
-      // Don't send vendor here: session vendor not yet bound, let client keep its selection
-      sendModelInfoForVendor(null, model);
+      // Confirm against the session vendor so a non-default vendor does not
+      // receive model metadata labeled as the project's default adapter.
+      var pendingVendor = session.vendor || (adapter && adapter.vendor) || "claude";
+      sendModelInfoForVendor(pendingVendor, model);
       sendToSession(session, { type: "config_state", model: sm.currentModel, mode: session.permissionMode || sm.currentPermissionMode || "default", effort: session.effort || sm.currentEffort || "medium", betas: sm.currentBetas || [] });
-      return;
+      return { ok: true, model: model };
     }
     try {
       await session.queryInstance.setModel(model);
@@ -1944,8 +1946,10 @@ function createSDKBridge(opts) {
       var sessionVendor = session.vendor || (adapter && adapter.vendor) || "claude";
       sendModelInfoForVendor(sessionVendor, model);
       sendToSession(session, { type: "config_state", model: sm.currentModel, mode: session.permissionMode || sm.currentPermissionMode || "default", effort: session.effort || sm.currentEffort || "medium", betas: sm.currentBetas || [] });
+      return { ok: true, model: model };
     } catch (e) {
       send({ type: "error", text: "Failed to switch model: " + (e.message || e) });
+      return { ok: false, model: session.model || "", error: e.message || String(e) };
     }
   }
 

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" },
@@ -175,7 +180,8 @@ var schema = {
   // -----------------------------------------------------------------------
   // Model / config
   // -----------------------------------------------------------------------
-  "set_model":                { direction: "c2s", handler: "lib/project-sessions.js", description: "Set the model for the current session" },
+  "set_model":                { direction: "c2s", handler: "lib/project-models.js", description: "Set the model for the current session" },
+  "get_vendor_models":        { direction: "c2s", handler: "lib/project-models.js", description: "Load a vendor model catalog" },
   "set_server_default_model": { direction: "c2s", handler: "lib/project-sessions.js", description: "Set the server-wide default model" },
   "set_project_default_model": { direction: "c2s", handler: "lib/project-sessions.js", description: "Set the project default model" },
   "set_permission_mode":      { direction: "c2s", handler: "lib/project-sessions.js", description: "Set permission mode for the current session" },
@@ -192,6 +198,7 @@ var schema = {
   "set_betas":                { direction: "c2s", handler: "lib/project-sessions.js", description: "Set beta feature flags" },
   "set_thinking":             { direction: "c2s", handler: "lib/project-sessions.js", description: "Set thinking mode and budget" },
   "model_info":               { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Current model and available models list" },
+  "model_selection_result":   { direction: "s2c", handler: "lib/public/modules/model-picker.js", description: "Acknowledgement or error for a model selection" },
   "config_state":             { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Full config state: model, mode, effort, betas, thinking" },
   "slash_commands":           { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Available slash commands list" },
   "fast_mode_state":          { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Fast mode toggle state" },

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.11",
+  "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",