clay-server 3.4.0-beta.9 → 3.5.0-beta.1

package/lib/project-session-pair.js

@@ -98,10 +98,15 @@ function attachSessionPair(ctx) {
     token.delivered = true;
     var failure = token.failure || null;
     var response = token.response || "";
-    var text = "A Worker task delegated through send_to_partner has finished.\n\n" +
-      "Original task:\n" + token.message + "\n\n" +
-      (failure ? "Worker error:\n" + failure : "Worker result:\n" + (response || "(No text response was recorded.)")) +
-      "\n\nReview the result, verify it as needed, and continue the task.";
+    var text;
+    if (token.interrupted) {
+      text = "[Worker execution interrupted] The user interrupted the Worker mid-turn. Its work is PARTIAL and unverified — do not treat it as finished. Review what was done and decide next steps with the user.";
+    } else {
+      text = "A Worker task delegated through send_to_partner has finished.\n\n" +
+        "Original task:\n" + token.message + "\n\n" +
+        (failure ? "Worker error:\n" + failure : "Worker result:\n" + (response || "(No text response was recorded.)")) +
+        "\n\nReview the result, verify it as needed, and continue the task.";
+    }
     sm.sendAndRecord(caller, {
       type: "user_message",
       text: text,
@@ -146,6 +151,7 @@ function attachSessionPair(ctx) {
     }
     token.response = responseText(partner.history || [], token.startIndex);
     token.failure = errorSince(partner.history || [], token.startIndex);
+    token.interrupted = !token.failure && !!partner._lastTurnInterrupted;
     finishDelegation(group, caller, partner, token);
     return resumeDriverWithResult(caller, partner, token);
   }
@@ -165,8 +171,9 @@ function attachSessionPair(ctx) {
           clearInterval(timer);
           finishDelegation(group, caller, partner, token);
           var failure = errorSince(partner.history || [], token.startIndex);
+          var interrupted = !failure && !!partner._lastTurnInterrupted;
           resolve({
-            status: failure ? "error" : "complete",
+            status: failure ? "error" : (interrupted ? "interrupted" : "complete"),
             response: responseText(partner.history || [], token.startIndex),
             error: failure || undefined,
           });
@@ -260,7 +267,7 @@ function attachSessionPair(ctx) {
       var count = Number.isFinite(args.lastTurns) ? Math.floor(args.lastTurns) : 1;
       count = Math.max(1, Math.min(5, count));
       return toolResult({
-        status: resolved.partner.isProcessing ? "running" : "idle",
+        status: resolved.partner.isProcessing ? "running" : (resolved.partner._lastTurnInterrupted ? "interrupted" : "idle"),
         partnerId: resolved.partner.localId,
         title: resolved.partner.title || "New Session",
         turns: recentTurns(resolved.partner, count),
@@ -383,7 +390,7 @@ function attachSessionPair(ctx) {
     var group = store.groupForMember(session.localId);
     var pairPrompt = "";
     if (group && group.pair && group.pair.driverId === session.localId) {
-      pairPrompt = "You are the Driver in a two-agent pair. The tools send_to_partner and read_partner are provided directly to you. Use send_to_partner to delegate concrete bounded work to the Worker. A completed Worker turn leaves the Worker session available for more work. If review or user feedback requires corrections to the Worker's implementation, delegate a follow-up turn to that Worker instead of editing the Worker-owned files yourself. If send_to_partner reports that the Worker is no longer available, create a replacement with spawn_sessions and delegate the remaining implementation rather than taking it over. If a non-waiting delegation finishes later, Clay pushes the result back and resumes you automatically; use read_partner only when you need an interim status check. Integrate and verify the final outcome. Do not search the project for implementations of these tools, and do not delegate work that must be performed sequentially in this same session.";
+      pairPrompt = "You are the Driver in a two-agent pair. The tools send_to_partner and read_partner are provided directly to you. Use send_to_partner to delegate concrete bounded work to the Worker. A completed Worker turn leaves the Worker session available for more work. If a Worker turn is interrupted, its work is partial and unverified; review it and decide next steps with the user. If review or user feedback requires corrections to the Worker's implementation, delegate a follow-up turn to that Worker instead of editing the Worker-owned files yourself. If send_to_partner reports that the Worker is no longer available, create a replacement with spawn_sessions and delegate the remaining implementation rather than taking it over. If a non-waiting delegation finishes later, Clay pushes the result back and resumes you automatically; use read_partner only when you need an interim status check. Integrate and verify the final outcome. Do not search the project for implementations of these tools, and do not delegate work that must be performed sequentially in this same session.";
     }
     return [pairPrompt, workerProposal.getSystemPrompt(session)].filter(Boolean).join("\n\n");
   }

package/lib/project-session-spawn.js

@@ -319,7 +319,7 @@ function attachSessionSpawn(ctx) {
         statuses.push({
           localId: session.localId,
           title: session.title || "New Session",
-          status: session.isProcessing ? "running" : (hasSessionError(session) ? "error" : "done"),
+          status: session.isProcessing ? "running" : (session._lastTurnInterrupted ? "interrupted" : (hasSessionError(session) ? "error" : "done")),
           turnCount: session.turnCount || 0,
           lastActivity: session.lastActivity || session.createdAt || 0,
         });

package/lib/project-sessions.js

@@ -658,10 +658,6 @@ function attachSessions(ctx) {
           // (resume_tui_session), and born-GUI never auto-converts to a terminal.
           resolveSessionForView(xmTarget, ws);
         }
-        // If the target session's vendor doesn't own the currently cached
-        // model, clear sm.currentModel so the UI and next query don't leak
-        // the previous session's vendor-specific model into this one. A
-        // session-specific model always wins and survives daemon restarts.
         var switchTargetSess = sm.sessions.get(msg.id);
         var switchTargetVendor = switchTargetSess && (switchTargetSess.vendor || sm.defaultVendor || "claude");
         if (switchTargetSess && !switchTargetSess.effort) {
@@ -671,22 +667,6 @@ function attachSessions(ctx) {
           ) || null;
           sm.saveSessionFile(switchTargetSess);
         }
-        if (switchTargetSess && switchTargetSess.model) {
-          sm.currentModel = switchTargetSess.model;
-        } else if (switchTargetSess && sm.currentModel) {
-          var targetVendor = switchTargetSess.vendor || sm.defaultVendor || null;
-          var tvModels = (targetVendor && sm.modelsByVendor && sm.modelsByVendor[targetVendor]) || [];
-          var found = false;
-          var _curLc = sm.currentModel.toLowerCase();
-          for (var tvi = 0; tvi < tvModels.length; tvi++) {
-            var tvEntry = tvModels[tvi];
-            var tvVal = typeof tvEntry === "string" ? tvEntry : (tvEntry && (tvEntry.value || tvEntry.id)) || "";
-            if (tvVal === sm.currentModel || (tvVal && (tvVal.toLowerCase().indexOf(_curLc) !== -1 || _curLc.indexOf(tvVal.toLowerCase()) !== -1))) { found = true; break; }
-          }
-          if (tvModels.length > 0 && !found) {
-            sm.currentModel = "";
-          }
-        }
         // Check access in multi-user mode
         if (usersModule.isMultiUser() && ws._clayUser) {
           var switchTarget = sm.sessions.get(msg.id);
@@ -958,14 +938,6 @@ function attachSessions(ctx) {
       return true;
     }
 
-    if (msg.type === "set_model" && msg.model) {
-      var session = getSessionForWs(ws);
-      if (session) {
-        sdk.setModel(session, msg.model);
-      }
-      return true;
-    }
-
     if (msg.type === "reload_skills") {
       var session = getSessionForWs(ws);
       if (session && sdk.reloadSkills) {
@@ -997,11 +969,7 @@ function attachSessions(ctx) {
             " is bound to '" + vendorSession.vendor + "', refused rebind to '" + msg.vendor + "'");
         } else {
           vendorSession.vendor = msg.vendor;
-          // Clear the shared model so the next query uses the vendor's default
-          // instead of leaking the previous vendor's model into a fresh session.
-          if (sm.currentModel) {
-            sm.currentModel = "";
-          }
+          if (vendorSession.vendor !== msg.vendor) vendorSession.model = "";
           sm.saveSessionFile(vendorSession);
           sm.broadcastSessionList();
         }
@@ -1012,11 +980,11 @@ function attachSessions(ctx) {
           type: "model_info",
           model: "",
           models: vendorModels,
-          vendor: msg.vendor,
+          vendor: msg.vendor, sessionId: vendorSession ? vendorSession.localId : null,
           availableVendors: sm.availableVendors || [],
           installedVendors: sm.installedVendors || [],
         });
-        send({ type: "config_state", model: sm.currentModel || "", mode: sm.currentPermissionMode || "default", effort: sm.currentEffort || "medium", betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
+        send({ type: "config_state", vendor: null, sessionId: null, mode: sm.currentPermissionMode || "default", effort: sm.currentEffort || "medium", betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
       }
       return true;
     }
@@ -1052,7 +1020,7 @@ function attachSessions(ctx) {
         sm.broadcastSessionList();
         sdk.setPermissionMode(session, msg.mode);
       }
-      send({ type: "config_state", model: sm.currentModel || "", mode: sm.currentPermissionMode, effort: sm.currentEffort || "medium", betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
+      send({ type: "config_state", vendor: null, sessionId: null, mode: sm.currentPermissionMode, effort: sm.currentEffort || "medium", betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
       return true;
     }
 
@@ -1113,7 +1081,7 @@ function attachSessions(ctx) {
       if (session) {
         sdk.setPermissionMode(session, msg.mode);
       }
-      send({ type: "config_state", model: sm.currentModel || "", mode: sm.currentPermissionMode, effort: sm.currentEffort || "medium", betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
+      send({ type: "config_state", vendor: null, sessionId: null, mode: sm.currentPermissionMode, effort: sm.currentEffort || "medium", betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
       return true;
     }
 
@@ -1126,7 +1094,7 @@ function attachSessions(ctx) {
       if (session) {
         sdk.setPermissionMode(session, msg.mode);
       }
-      send({ type: "config_state", model: sm.currentModel || "", mode: sm.currentPermissionMode, effort: sm.currentEffort || "medium", betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
+      send({ type: "config_state", vendor: null, sessionId: null, mode: sm.currentPermissionMode, effort: sm.currentEffort || "medium", betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
       return true;
     }
 
@@ -1142,7 +1110,7 @@ function attachSessions(ctx) {
         sdk.setEffort(session, sessionEffort).catch(function (e) {
           sendTo(ws, { type: "error", text: "Failed to change reasoning effort: " + (e.message || e) });
         });
-        sm.sendToSession(session, { type: "config_state", model: session.model || sm.currentModel || "", mode: session.permissionMode || sm.currentPermissionMode || "default", effort: sessionEffort, betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
+        sm.sendToSession(session, { type: "config_state", model: session.model || ((sm.defaultModelByVendor || {})[effortVendor]) || "", vendor: effortVendor, sessionId: session.localId, mode: session.permissionMode || sm.currentPermissionMode || "default", effort: sessionEffort, betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
       }
       return true;
     }
@@ -1152,7 +1120,7 @@ function attachSessions(ctx) {
         opts.onSetServerDefaultEffort(msg.effort);
       }
       sm.currentEffort = msg.effort;
-      send({ type: "config_state", model: sm.currentModel || "", mode: sm.currentPermissionMode || "default", effort: sm.currentEffort, betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
+      send({ type: "config_state", vendor: null, sessionId: null, mode: sm.currentPermissionMode || "default", effort: sm.currentEffort, betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
       return true;
     }
 
@@ -1161,20 +1129,20 @@ function attachSessions(ctx) {
         opts.onSetProjectDefaultEffort(slug, msg.effort);
       }
       sm.currentEffort = msg.effort;
-      send({ type: "config_state", model: sm.currentModel || "", mode: sm.currentPermissionMode || "default", effort: sm.currentEffort, betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
+      send({ type: "config_state", vendor: null, sessionId: null, mode: sm.currentPermissionMode || "default", effort: sm.currentEffort, betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
       return true;
     }
 
     if (msg.type === "set_betas") {
       sm.currentBetas = msg.betas || [];
-      send({ type: "config_state", model: sm.currentModel || "", mode: sm.currentPermissionMode || "default", effort: sm.currentEffort || "medium", betas: sm.currentBetas, thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
+      send({ type: "config_state", vendor: null, sessionId: null, mode: sm.currentPermissionMode || "default", effort: sm.currentEffort || "medium", betas: sm.currentBetas, thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
       return true;
     }
 
     if (msg.type === "set_thinking") {
       sm.currentThinking = msg.thinking || "adaptive";
       if (msg.budgetTokens) sm.currentThinkingBudget = msg.budgetTokens;
-      send({ type: "config_state", model: sm.currentModel || "", mode: sm.currentPermissionMode || "default", effort: sm.currentEffort || "medium", betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
+      send({ type: "config_state", vendor: null, sessionId: null, mode: sm.currentPermissionMode || "default", effort: sm.currentEffort || "medium", betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
       return true;
     }
 
@@ -1456,7 +1424,7 @@ function attachSessions(ctx) {
       if (decision === "allow_accept_edits") {
         sdk.setPermissionMode(session, "acceptEdits");
         sm.currentPermissionMode = "acceptEdits";
-        send({ type: "config_state", model: sm.currentModel || "", mode: sm.currentPermissionMode, effort: sm.currentEffort || "medium", betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
+        send({ type: "config_state", vendor: null, sessionId: null, mode: sm.currentPermissionMode, effort: sm.currentEffort || "medium", betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
         pending.resolve({ behavior: "allow", updatedInput: pending.toolInput });
         sm.sendAndRecord(session, { type: "permission_resolved", requestId: requestId, decision: decision });
         return true;
@@ -1485,7 +1453,7 @@ function attachSessions(ctx) {
 
         // Update permission mode for the new session
         sm.currentPermissionMode = "acceptEdits";
-        send({ type: "config_state", model: sm.currentModel || "", mode: sm.currentPermissionMode, effort: sm.currentEffort || "medium", betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
+        send({ type: "config_state", vendor: null, sessionId: null, mode: sm.currentPermissionMode, effort: sm.currentEffort || "medium", betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
 
         // Build prompt from plan content (sent from client) or plan file path
         var clientPlanContent = msg.planContent || "";

package/lib/project-worker-proposal.js

@@ -40,7 +40,7 @@ function attachWorkerProposal(ctx) {
   function isEligible(session) {
     if (ctx.isMate || !session || session.mode === "tui") return false;
     if (store.groupForMember(session.localId)) return false;
-    return isFableSession(session, sm.modelsByVendor, sm.currentModel);
+    return isFableSession(session, sm.modelsByVendor, (sm.defaultModelByVendor || {})[session.vendor || "claude"]);
   }
 
   function safeModelsByVendor(installed) {
@@ -112,7 +112,7 @@ function attachWorkerProposal(ctx) {
     }
     var models = options.modelsByVendor[vendor] || [];
     var model = modelIsAvailable(options, vendor, args.recommendedModel) ? (args.recommendedModel || "") : "";
-    var currentModel = session.model || sm.currentModel || "";
+    var currentModel = session.model || (sm.defaultModelByVendor || {})[session.vendor || "claude"] || "";
     if (vendor === session.vendor && model === currentModel) model = "";
     if (!model && models.length > 0) {
       for (var j = 0; j < models.length; j++) {
@@ -154,6 +154,18 @@ function attachWorkerProposal(ctx) {
     }, patch));
   }
 
+  function skipPermissionsEnabled(session) {
+    return !!session && (session.permissionMode === "bypassPermissions" || session.dangerouslySkipPermissions === true);
+  }
+
+  function autoApprovalWs(session) {
+    return {
+      _clayActiveSession: session.localId,
+      _clayUser: session.ownerId ? { id: session.ownerId } : null,
+      _autoApproval: true,
+    };
+  }
+
   async function propose(args, session) {
     if (!isEligible(session)) return toolResult({ error: "Worker suggestions are only available in an unpaired Fable session." });
     if (hasPendingProposal(session)) return toolResult({ error: "A Worker suggestion is already awaiting a decision." });
@@ -166,6 +178,7 @@ function attachWorkerProposal(ctx) {
     var options = proposalOptions();
     if (options.installedVendors.length === 0) return toolResult({ error: "No coding agent is installed for a Worker session." });
     var recommendation = chooseRecommendation(args, session, options);
+    var autoApprove = skipPermissionsEnabled(session);
     var proposal = {
       type: "worker_proposal",
       proposalId: "worker_" + crypto.randomUUID(),
@@ -178,7 +191,22 @@ function attachWorkerProposal(ctx) {
       recommendedEffort: recommendation.effort,
       options: options,
     };
+    if (autoApprove) proposal.autoApproved = true;
     sm.sendAndRecord(session, proposal);
+    if (autoApprove) {
+      var accepted = await acceptProposal(session, proposal, {
+        vendor: recommendation.vendor,
+        model: recommendation.model,
+        effort: recommendation.effort,
+        autoApproved: true,
+      }, autoApprovalWs(session));
+      if (!accepted.ok) return toolResult({ error: accepted.error || "Could not start the Worker." });
+      return toolResult({
+        status: "running",
+        proposalId: proposal.proposalId,
+        instruction: "The Worker was auto-approved and started because skip permissions is enabled. Its result will return for review.",
+      });
+    }
     return toolResult({
       status: "posted",
       proposalId: proposal.proposalId,
@@ -220,6 +248,8 @@ function attachWorkerProposal(ctx) {
     var followup;
     if (result.status === "complete") {
       followup = "[Worker execution completed]\nReview and verify the Worker's result. The Worker session remains available: if the implementation needs corrections or additional edits, send a follow-up with send_to_partner instead of taking over the Worker-owned files yourself. If that Worker is no longer available, create a replacement with spawn_sessions for the remaining implementation.\n\n" + (result.response || "The Worker completed without a text summary.");
+    } else if (result.status === "interrupted") {
+      followup = "[Worker execution interrupted]\nThe user interrupted the Worker mid-turn. Its work is PARTIAL and unverified — do not treat it as finished. Review what was done and decide next steps with the user.";
     } else if (result.status === "running") {
       followup = "[Worker execution is still running]\nUse read_partner to inspect progress before completing the task.";
     } else {
@@ -238,30 +268,24 @@ function attachWorkerProposal(ctx) {
     return session;
   }
 
-  async function respondToProposal(ws, msg) {
-    var session = sessionForResponse(ws);
-    var proposal = findProposal(session, msg.proposalId);
-    if (!proposal) throw new Error("Worker suggestion not found");
-    if (proposal.status !== "pending") throw new Error("Worker suggestion has already been resolved");
-    if (!msg.accepted) {
-      updateProposal(session, proposal, { status: "declined" });
-      await resumeDriver(session, "[Worker suggestion declined]\nContinue this task in the current session using the plan you already prepared.");
-      return { ok: true, status: "declined" };
-    }
+  async function acceptProposal(session, proposal, msg, ws) {
     var options = proposal.options || proposalOptions();
     var vendor = msg.vendor || proposal.recommendedVendor;
     var model = msg.model || "";
     if (options.installedVendors.indexOf(vendor) === -1) throw new Error("Selected Worker vendor is not installed");
     if (!modelIsAvailable(options, vendor, model)) throw new Error("Selected Worker model is unavailable");
     var effort = yoke.clampEffort(vendor, msg.effort || proposal.recommendedEffort || "medium") || "";
-    updateProposal(session, proposal, { status: "starting", selectedVendor: vendor, selectedModel: model, selectedEffort: effort });
+    var startingPatch = { status: "starting", selectedVendor: vendor, selectedModel: model, selectedEffort: effort };
+    if (msg.autoApproved) startingPatch.autoApproved = true;
+    updateProposal(session, proposal, startingPatch);
     try {
       var created = ctx.createPairRecord(ws, {
         driver: { sessionId: session.localId },
         worker: { vendor: vendor, model: model, effort: effort },
       });
       updateProposal(session, proposal, { status: "running", groupId: created.group.id, workerId: created.worker.localId });
-      ctx.sendTo(ws, { type: "pair_session_created", ok: true, group: created.group });
+      if (ws._autoApproval) sm.sendToSession(session, { type: "pair_session_created", ok: true, group: created.group });
+      else ctx.sendTo(ws, { type: "pair_session_created", ok: true, group: created.group });
       runWorker(session, proposal).catch(function (err) {
         updateProposal(session, proposal, { status: "error", error: err.message || String(err) });
         resumeDriver(session, "[Worker execution failed]\n" + (err.message || String(err))).catch(function () {});
@@ -273,6 +297,19 @@ function attachWorkerProposal(ctx) {
     }
   }
 
+  async function respondToProposal(ws, msg) {
+    var session = sessionForResponse(ws);
+    var proposal = findProposal(session, msg.proposalId);
+    if (!proposal) throw new Error("Worker suggestion not found");
+    if (proposal.status !== "pending") throw new Error("Worker suggestion has already been resolved");
+    if (!msg.accepted) {
+      updateProposal(session, proposal, { status: "declined" });
+      await resumeDriver(session, "[Worker suggestion declined]\nContinue this task in the current session using the plan you already prepared.");
+      return { ok: true, status: "declined" };
+    }
+    return acceptProposal(session, proposal, msg, ws);
+  }
+
   function handleMessage(ws, msg) {
     if (msg.type !== "worker_proposal_response") return false;
     respondToProposal(ws, msg).catch(function (err) {

package/lib/project.js

@@ -27,6 +27,7 @@ var { attachImage } = require("./project-image");
 var { attachKnowledge } = require("./project-knowledge");
 var { attachFilesystem } = require("./project-filesystem");
 var { attachSessions } = require("./project-sessions");
+var { attachModels } = require("./project-models");
 var { attachUserMessage } = require("./project-user-message");
 var { attachShellCommand } = require("./project-shell-command");
 var { attachConnection } = require("./project-connection");
@@ -35,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");
@@ -470,10 +472,9 @@ function createProjectContext(opts) {
 
   var _projModel = typeof opts.onGetProjectDefaultModel === "function" ? opts.onGetProjectDefaultModel(slug) : null;
   var _srvModel = typeof opts.onGetServerDefaultModel === "function" ? opts.onGetServerDefaultModel() : null;
-  sm._savedDefaultModel = (_projModel && _projModel.model) || (_srvModel && _srvModel.model) || null;
-  // Immediately apply the saved default so config_state on connect reflects it
-  // before the SDK has warmed up and fired system/init.
-  if (sm._savedDefaultModel) sm.currentModel = sm._savedDefaultModel;
+  var savedDefaultModel = (_projModel && _projModel.model) || (_srvModel && _srvModel.model) || null;
+  sm.defaultModelByVendor = sm.defaultModelByVendor || {};
+  if (savedDefaultModel) sm.defaultModelByVendor[sm.defaultVendor || "claude"] = savedDefaultModel;
 
   // --- Local MCP (direct process management for localhost clients) ---
   var _localMcp = createLocalMcp();
@@ -569,6 +570,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,
@@ -607,6 +620,16 @@ function createProjectContext(opts) {
       }
     }
 
+    // Session-bound access to the source of a handoff (main projects only).
+    if (!isMate) {
+      try {
+        var sessionHandoffMcpConfig = _sessionHandoff.createMcpServer(adapter);
+        if (sessionHandoffMcpConfig) servers[sessionHandoffMcpConfig.name || "clay-handoff"] = sessionHandoffMcpConfig;
+      } catch (e) {
+        console.error("[project] Failed to create session handoff MCP server:", e.message);
+      }
+    }
+
     // Explicit agent signal for user-requested Markdown presentation.
     if (!isMate) {
       try {
@@ -767,7 +790,7 @@ function createProjectContext(opts) {
   //   clay-email   -> only when the user has an account or server SMTP
   //
   // forSession (optional): the session whose query these servers are mounted
-  // into. Session, notes, and document tools must know their caller, so they
+  // into. Session, notes, handoff, and document tools must know their caller, so they
   // are re-instantiated bound to that session; static instances only serve
   // descriptor listing and fail closed on calls.
   function getLocalMcpServers(forSession) {
@@ -799,6 +822,15 @@ function createProjectContext(opts) {
         }
         continue;
       }
+      if (name === "clay-handoff" && forSession) {
+        try {
+          var boundHandoff = _sessionHandoff.createMcpServer(adapter, forSession);
+          if (boundHandoff) { filtered[name] = boundHandoff; hasAny = true; }
+        } catch (e) {
+          console.error("[project] Failed to bind session handoff MCP server:", e.message);
+        }
+        continue;
+      }
       if (name === "clay-documents" && forSession) {
         try {
           var boundDocuments = _sessionDocument.createMcpServer(adapter, forSession);
@@ -866,12 +898,14 @@ function createProjectContext(opts) {
       return composeSystemPrompts([
         _sessionPair.getSystemPrompt(session),
         _sessionNotes.getSystemPrompt(session),
+        _sessionHandoff.getSystemPrompt(session),
         _sessionDocument.getSystemPrompt(session),
       ]);
     },
     getSessionToolDefs: function (session) {
       return _sessionPair.getToolDefs(session)
         .concat(_sessionNotes.getToolDefs(session))
+        .concat(_sessionHandoff.getToolDefs(session))
         .concat(_sessionDocument.getToolDefs(session));
     },
   });
@@ -1053,79 +1087,6 @@ function createProjectContext(opts) {
       return;
     }
 
-    // --- Vendor model switching ---
-    if (msg.type === "get_vendor_models") {
-      (async function() {
-        if (msg.vendor) {
-          try {
-            var modelLinuxUser = getLinuxUserForWs(ws);
-            var vendorAdapter = adapters[msg.vendor] || null;
-            if (!vendorAdapter) {
-              vendorAdapter = await yoke.lazyCreateAdapter(adapters, msg.vendor, {
-                cwd: cwd,
-                linuxUser: modelLinuxUser || undefined,
-                clayPort: serverPort,
-                clayTls: serverTls,
-                clayAuthToken: serverAuthToken,
-                slug: slug,
-              });
-            }
-            var needsReadyMetadata = !sm.capabilitiesByVendor || !sm.capabilitiesByVendor[msg.vendor]
-              || !sm.modelsByVendor || !sm.modelsByVendor[msg.vendor];
-            if (vendorAdapter && needsReadyMetadata && typeof vendorAdapter.init === "function") {
-              // Init warms the adapter, but a slow/failed init must not block
-              // model listing (e.g. Codex models are a fixed list). Keep going
-              // to supportedModels() even if init throws.
-              try {
-                var readyResult = await vendorAdapter.init({
-                  cwd: cwd,
-                  linuxUser: modelLinuxUser || undefined,
-                  clayPort: serverPort,
-                  clayTls: serverTls,
-                  clayAuthToken: serverAuthToken,
-                  slug: slug,
-                });
-                sm.capabilitiesByVendor = sm.capabilitiesByVendor || {};
-                sm.capabilitiesByVendor[msg.vendor] = readyResult.capabilities || {};
-                sm.modelsByVendor = sm.modelsByVendor || {};
-                if (Array.isArray(readyResult.models)) sm.modelsByVendor[msg.vendor] = readyResult.models;
-              } catch (e) {
-                console.error("[project] " + msg.vendor + " init failed (continuing to model list):", e.message || e);
-              }
-            }
-            if (vendorAdapter) {
-              sm.availableVendors = Object.keys(adapters);
-              sm.modelsByVendor = sm.modelsByVendor || {};
-              if (!sm.modelsByVendor[msg.vendor] && typeof vendorAdapter.supportedModels === "function") {
-                sm.modelsByVendor[msg.vendor] = await vendorAdapter.supportedModels();
-              }
-            }
-          } catch (e) {
-            console.error("[project] get_vendor_models lazy init failed for " + msg.vendor + ":", e.message || e);
-          }
-        }
-        var vendorModels = (sm.modelsByVendor && sm.modelsByVendor[msg.vendor]) || [];
-        var firstModel = vendorModels[0] || "";
-        // model value can be string or {value, displayName} object
-        var defaultModel = typeof firstModel === "string" ? firstModel : (firstModel.value || "");
-        // Preserve the user's current model selection if it belongs to this
-        // vendor, rather than always snapping back to the vendor's default.
-        var modelToSend = defaultModel;
-        if (sm.currentModel) {
-          for (var mi = 0; mi < vendorModels.length; mi++) {
-            var mv = typeof vendorModels[mi] === "string" ? vendorModels[mi] : (vendorModels[mi].value || "");
-            if (mv === sm.currentModel) {
-              modelToSend = sm.currentModel;
-              break;
-            }
-          }
-        }
-        var vendorCapabilities = (sm.capabilitiesByVendor && sm.capabilitiesByVendor[msg.vendor]) || {};
-        sendTo(ws, { type: "model_info", model: modelToSend, models: vendorModels, vendor: msg.vendor, capabilities: vendorCapabilities, availableVendors: sm.availableVendors || [], installedVendors: sm.installedVendors || [] });
-      })();
-      return;
-    }
-
     // --- Debate ---
     if (msg.type === "debate_start") {
       handleDebateStart(ws, msg);
@@ -1173,7 +1134,9 @@ 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;
 
     // --- Filesystem, settings, env (delegated to project-filesystem.js) ---
@@ -1386,6 +1349,20 @@ function createProjectContext(opts) {
     _notifications: _notifications,
   });
 
+  var _models = attachModels({
+    cwd: cwd,
+    slug: slug,
+    sm: sm,
+    sdk: sdk,
+    adapters: adapters,
+    sendTo: sendTo,
+    getSessionForWs: getSessionForWs,
+    getLinuxUserForWs: getLinuxUserForWs,
+    serverPort: serverPort,
+    serverTls: serverTls,
+    serverAuthToken: serverAuthToken,
+  });
+
   // --- User message handler (delegated to project-user-message.js) ---
   var _userMessage = attachUserMessage({
     cwd: cwd,
@@ -1533,6 +1510,15 @@ function createProjectContext(opts) {
               inputSchema: normalizeToolSchema(noteTools[nti].inputSchema),
             });
           }
+          var handoffTools = _sessionHandoff.getToolDefs(boundSession);
+          for (var hti = 0; hti < handoffTools.length; hti++) {
+            tools.push({
+              server: "clay-handoff",
+              name: handoffTools[hti].name,
+              description: handoffTools[hti].description || handoffTools[hti].name,
+              inputSchema: normalizeToolSchema(handoffTools[hti].inputSchema),
+            });
+          }
           var documentTools = _sessionDocument.getToolDefs(boundSession);
           for (var dti = 0; dti < documentTools.length; dti++) {
             tools.push({
@@ -1553,7 +1539,7 @@ function createProjectContext(opts) {
         if (localMcp) {
           var inAppNames = Object.keys(localMcp);
           for (var i = 0; i < inAppNames.length; i++) {
-            if (inAppNames[i] === "clay-sessions" || inAppNames[i] === "clay-notes" || inAppNames[i] === "clay-documents") continue;
+            if (inAppNames[i] === "clay-sessions" || inAppNames[i] === "clay-notes" || inAppNames[i] === "clay-handoff" || inAppNames[i] === "clay-documents") continue;
             extractServerTools(inAppNames[i], localMcp[inAppNames[i]]);
           }
         }
@@ -1588,6 +1574,14 @@ function createProjectContext(opts) {
             }
           }
         }
+        if (boundSession && serverName === "clay-handoff") {
+          var handoffTools = _sessionHandoff.getToolDefs(boundSession);
+          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-documents") {
           var documentTools = _sessionDocument.getToolDefs(boundSession);
           for (var dti = 0; dti < documentTools.length; dti++) {
@@ -1596,7 +1590,7 @@ function createProjectContext(opts) {
             }
           }
         }
-        if (serverName === "clay-sessions" || serverName === "clay-notes" || serverName === "clay-documents") {
+        if (serverName === "clay-sessions" || serverName === "clay-notes" || serverName === "clay-handoff" || serverName === "clay-documents") {
           return Promise.reject(new Error("Session-bound tool requires a valid Clay session: " + serverName + "/" + toolName));
         }
         if (sessionOnly) return Promise.reject(new Error("Session tool not found: " + serverName + "/" + toolName));