clay-server 3.4.0-beta.8 → 3.4.0

package/lib/sdk-bridge.js

@@ -245,17 +245,24 @@ function createSDKBridge(opts) {
     return null;
   }
 
-  function sendModelInfoForVendor(vendor, model) {
+  function defaultModelForVendor(vendor) {
+    return (sm.defaultModelByVendor && sm.defaultModelByVendor[vendor]) || "";
+  }
+
+  function sendModelInfoForVendor(session, vendor, model) {
     var resolvedVendor = vendor || (adapter && adapter.vendor) || "claude";
-    send({
+    var message = {
       type: "model_info",
       model: model || "",
       models: getModelsForVendor(resolvedVendor),
       vendor: resolvedVendor,
+      sessionId: session ? session.localId : null,
       capabilities: (sm.capabilitiesByVendor && sm.capabilitiesByVendor[resolvedVendor]) || {},
       availableVendors: sm.availableVendors || [],
       installedVendors: sm.installedVendors || [],
-    });
+    };
+    if (session) sendToSession(session, message);
+    else send(message);
   }
 
   function rememberAdapterReady(vendor, result) {
@@ -849,19 +856,20 @@ function createSDKBridge(opts) {
             case "model_changed":
               session.model = metaData.model;
               sm.saveSessionFile(session);
-              sm.currentModel = metaData.model;
-              sendModelInfoForVendor(session.vendor || (adapter && adapter.vendor) || "claude", metaData.model);
-              sendToSession(session, { type: "config_state", model: session.model || sm.currentModel, mode: session.permissionMode || sm.currentPermissionMode || "default", effort: session.effort || sm.currentEffort || "medium", betas: sm.currentBetas || [] });
+              sm.defaultModelByVendor = sm.defaultModelByVendor || {};
+              sm.defaultModelByVendor[session.vendor || "claude"] = metaData.model;
+              sendModelInfoForVendor(session, session.vendor || (adapter && adapter.vendor) || "claude", metaData.model);
+              sendToSession(session, { type: "config_state", model: session.model || defaultModelForVendor(session.vendor || "claude"), vendor: session.vendor || "claude", sessionId: session.localId, mode: session.permissionMode || sm.currentPermissionMode || "default", effort: session.effort || sm.currentEffort || "medium", betas: sm.currentBetas || [] });
               break;
             case "effort_changed":
               session.effort = metaData.effort;
               sm.saveSessionFile(session);
               sm.currentEffort = metaData.effort;
-              sendToSession(session, { type: "config_state", model: session.model || sm.currentModel || "", mode: session.permissionMode || sm.currentPermissionMode || "default", effort: session.effort, betas: sm.currentBetas || [] });
+              sendToSession(session, { type: "config_state", model: session.model || defaultModelForVendor(session.vendor || "claude"), vendor: session.vendor || "claude", sessionId: session.localId, mode: session.permissionMode || sm.currentPermissionMode || "default", effort: session.effort, betas: sm.currentBetas || [] });
               break;
             case "permission_mode_changed":
               sm.currentPermissionMode = metaData.mode;
-              sendToSession(session, { type: "config_state", model: session.model || sm.currentModel || "", mode: session.permissionMode || sm.currentPermissionMode, effort: session.effort || sm.currentEffort || "medium", betas: sm.currentBetas || [] });
+              sendToSession(session, { type: "config_state", model: session.model || defaultModelForVendor(session.vendor || "claude"), vendor: session.vendor || "claude", sessionId: session.localId, mode: session.permissionMode || sm.currentPermissionMode, effort: session.effort || sm.currentEffort || "medium", betas: sm.currentBetas || [] });
               break;
             case "worker_error":
               send({ type: "error", text: metaData.error });
@@ -877,7 +885,10 @@ function createSDKBridge(opts) {
       console.log("[sdk-bridge] processQueryStream ended: isProcessing=" + session.isProcessing + " taskStopRequested=" + session.taskStopRequested);
       var stillOwnsRuntime = session.queryInstance === myQueryInstance;
       if (session.isProcessing && session.taskStopRequested && stillOwnsRuntime) {
+        session._lastTurnInterrupted = true;
         session.isProcessing = false;
+        session._awaitingTurnResult = false;
+        session._queuedTurnCount = 0;
         onProcessingChanged();
         send({ type: "status", processing: false });
         sendAndRecord(session, { type: "thinking_stop" });
@@ -892,6 +903,8 @@ function createSDKBridge(opts) {
         // iterator without a result event. Treat any result-less stream end as
         // a failed turn so the UI cannot remain on processing forever.
         session.isProcessing = false;
+        session._awaitingTurnResult = false;
+        session._queuedTurnCount = 0;
         onProcessingChanged();
         if (!session._lastAdapterError) {
           sendAndRecord(session, {
@@ -906,8 +919,11 @@ function createSDKBridge(opts) {
     } catch (err) {
       if (session.isProcessing && session.queryInstance === myQueryInstance) {
         session.isProcessing = false;
+        session._awaitingTurnResult = false;
+        session._queuedTurnCount = 0;
         onProcessingChanged();
         if (err.name === "AbortError" || (myAbortController && myAbortController.signal.aborted) || session.taskStopRequested) {
+          session._lastTurnInterrupted = true;
           if (!session.destroying) {
             sendAndRecord(session, { type: "thinking_stop" });
             var interruptMsg2 = (session.vendor && session.vendor !== "claude")
@@ -1175,6 +1191,7 @@ function createSDKBridge(opts) {
   // Wrapper: marks the boot window so pushMessage can buffer instead of
   // dropping messages that arrive while createQuery is still awaiting.
   async function startQuery(session, text, images, linuxUser) {
+    delete session._lastTurnInterrupted;
     session._queryStarting = true;
     try {
       return await startQueryInner(session, text, images, linuxUser);
@@ -1226,10 +1243,10 @@ function createSDKBridge(opts) {
           sm.modelsByVendor[vendor] = await vendorAdapter.supportedModels();
         }
         var vendorModels = getModelsForVendor(vendor);
-        var modelForVendor = resolveModelInList(vendorModels, sm.currentModel)
+        var modelForVendor = resolveModelInList(vendorModels, defaultModelForVendor(vendor))
           || modelEntryValue(vendorModels[0])
           || "";
-        sendModelInfoForVendor(vendor, modelForVendor);
+        sendModelInfoForVendor(session, vendor, modelForVendor);
       }
       return vendorAdapter;
     }
@@ -1432,14 +1449,9 @@ function createSDKBridge(opts) {
       }
     }
 
-    // Pick a model that belongs to the session's vendor. sm.currentModel is
-    // shared project-wide, so a Codex session that last set it to
-    // "gpt-5.4-mini" would otherwise leak into a Claude session in the same
-    // project (or in another session that switches vendor to claude) and
-    // Claude would reject the unknown model. We validate against the
-    // session vendor's model list regardless of which vendor happens to be
-    // the project's default adapter.
-    var queryModel = (ls.model && ls.model !== "default" ? ls.model : null) || session.model || sm.currentModel || undefined;
+    // Pick a model from the session or its vendor-specific default, then
+    // validate it against the session vendor's known model list.
+    var queryModel = (ls.model && ls.model !== "default" ? ls.model : null) || session.model || defaultModelForVendor(session.vendor || "claude") || undefined;
     var sessionVendor = session.vendor || (adapter && adapter.vendor) || null;
     if (sessionVendor) {
       var vendorModels = (sm.modelsByVendor && sm.modelsByVendor[sessionVendor]) || [];
@@ -1455,8 +1467,7 @@ function createSDKBridge(opts) {
     }
 
     // Bind the resolved model to the session so it survives a daemon
-    // restart. Without this, a session started under sm.currentModel (an
-    // in-memory value) came back after restart on the adapter default.
+    // restart. This preserves a session-specific selection across restarts.
     if (queryModel && session.model !== queryModel) {
       session.model = queryModel;
       sm.saveSessionFile(session);
@@ -1584,6 +1595,8 @@ function createSDKBridge(opts) {
       console.error("[sdk-bridge] cliSessionId:", session.cliSessionId, "resume:", !!session.cliSessionId);
       console.error("[sdk-bridge] Stack:", e.stack || "(no stack)");
       session.isProcessing = false;
+      session._awaitingTurnResult = false;
+      session._queuedTurnCount = 0;
       onProcessingChanged();
       session.queryInstance = null;
       session.messageQueue = null;
@@ -1625,6 +1638,8 @@ function createSDKBridge(opts) {
       session.messageQueue = null;
       session.abortController = null;
       session.isProcessing = false;
+      session._awaitingTurnResult = false;
+      session._queuedTurnCount = 0;
       onProcessingChanged();
       sendAndRecord(session, { type: "error", text: "The agent connection closed before it received your message. Please send it again." });
       sendAndRecord(session, { type: "done", code: 1 });
@@ -1695,6 +1710,7 @@ function createSDKBridge(opts) {
         console.error("[sdk-bridge] QueryHandle rejected message for session " + session.localId + ":", e.message || e);
       }
       if (delivered) {
+        delete session._lastTurnInterrupted;
         if (session._awaitingTurnResult) {
           session._queuedTurnCount = (session._queuedTurnCount || 0) + 1;
         } else {
@@ -1813,7 +1829,7 @@ function createSDKBridge(opts) {
     } catch (e) {}
     if ((codexBin && fs.existsSync(codexBin)) || tryLookup(yoke.getVendorInfo("codex").binaryName)) result.push("codex");
 
-    var subprocessVendorKeys = ["antigravity", "opencode"];
+    var subprocessVendorKeys = ["antigravity", "opencode", "kimi", "grok", "copilot", "qwen", "junie"];
     var acpProfiles = require("./yoke/acp-agent-profiles");
     for (var subprocessVendorIndex = 0; subprocessVendorIndex < subprocessVendorKeys.length; subprocessVendorIndex++) {
       var subprocessVendor = subprocessVendorKeys[subprocessVendorIndex];
@@ -1864,7 +1880,7 @@ function createSDKBridge(opts) {
     // as if every CLI were missing while the default adapter starts up.
     sm.installedVendors = detectInstalledVendors(linuxUser);
     sm.availableVendors = getAvailableVendors(linuxUser);
-    sendModelInfoForVendor(defaultVendor, sm.currentModel || "");
+    sendModelInfoForVendor(null, defaultVendor, defaultModelForVendor(defaultVendor));
 
     // Initialize default adapter first (provides skills, slash commands, etc.)
     if (adapter) {
@@ -1896,7 +1912,8 @@ function createSDKBridge(opts) {
           send({ type: "slash_commands", commands: combined, vendor: defaultVendor });
         }
         if (result.defaultModel) {
-          sm.currentModel = sm.currentModel || sm._savedDefaultModel || result.defaultModel;
+          sm.defaultModelByVendor = sm.defaultModelByVendor || {};
+          sm.defaultModelByVendor[defaultVendor] = sm.defaultModelByVendor[defaultVendor] || result.defaultModel;
         }
         sm.availableModels = result.models || [];
         // Store per-vendor models and capabilities
@@ -1918,7 +1935,7 @@ function createSDKBridge(opts) {
     sm.modelsByVendor = sm.modelsByVendor || {};
 
     // Send the fully initialized state to the client.
-    sendModelInfoForVendor(defaultVendor, sm.currentModel || "");
+    sendModelInfoForVendor(null, defaultVendor, defaultModelForVendor(defaultVendor));
   }
 
   async function setModel(session, model) {
@@ -1930,22 +1947,28 @@ function createSDKBridge(opts) {
       // No active query — just store the model for next startQuery
       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);
-      sendToSession(session, { type: "config_state", model: sm.currentModel, mode: session.permissionMode || sm.currentPermissionMode || "default", effort: session.effort || sm.currentEffort || "medium", betas: sm.currentBetas || [] });
-      return;
+      sm.defaultModelByVendor = sm.defaultModelByVendor || {};
+      // 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";
+      sm.defaultModelByVendor[pendingVendor] = model;
+      sendModelInfoForVendor(session, pendingVendor, model);
+      sendToSession(session, { type: "config_state", model: model, vendor: pendingVendor, sessionId: session.localId, mode: session.permissionMode || sm.currentPermissionMode || "default", effort: session.effort || sm.currentEffort || "medium", betas: sm.currentBetas || [] });
+      return { ok: true, model: model };
     }
     try {
       await session.queryInstance.setModel(model);
       session.model = model;
       sm.saveSessionFile(session);
-      sm.currentModel = model;
+      sm.defaultModelByVendor = sm.defaultModelByVendor || {};
       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 || [] });
+      sm.defaultModelByVendor[sessionVendor] = model;
+      sendModelInfoForVendor(session, sessionVendor, model);
+      sendToSession(session, { type: "config_state", model: model, vendor: sessionVendor, sessionId: session.localId, 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) };
     }
   }
 
@@ -1974,14 +1997,14 @@ function createSDKBridge(opts) {
     if (!session.queryInstance) {
       // No active query — just store the mode for next startQuery
       sm.currentPermissionMode = mode;
-      sendToSession(session, { type: "config_state", model: session.model || sm.currentModel || "", mode: sm.currentPermissionMode, effort: session.effort || sm.currentEffort || "medium", betas: sm.currentBetas || [] });
+      sendToSession(session, { type: "config_state", model: session.model || defaultModelForVendor(session.vendor || "claude"), vendor: session.vendor || "claude", sessionId: session.localId, mode: sm.currentPermissionMode, effort: session.effort || sm.currentEffort || "medium", betas: sm.currentBetas || [] });
       return;
     }
     try {
       // Route through QueryHandle (works for both in-process and worker paths)
       await session.queryInstance.setPermissionMode(mode);
       sm.currentPermissionMode = mode;
-      sendToSession(session, { type: "config_state", model: session.model || sm.currentModel || "", mode: sm.currentPermissionMode, effort: session.effort || sm.currentEffort || "medium", betas: sm.currentBetas || [] });
+      sendToSession(session, { type: "config_state", model: session.model || defaultModelForVendor(session.vendor || "claude"), vendor: session.vendor || "claude", sessionId: session.localId, mode: sm.currentPermissionMode, effort: session.effort || sm.currentEffort || "medium", betas: sm.currentBetas || [] });
     } catch (e) {
       sendToSession(session, { type: "error", text: "Failed to set permission mode: " + (e.message || e) });
     }

package/lib/sdk-message-processor.js

@@ -175,6 +175,10 @@ function attachMessageProcessor(ctx) {
 
     // Cache slash_commands and model from CLI init message
     if (parsed.yokeType === "init") {
+      var previousBackgroundTaskCount = (session.activeBackgroundTasks || []).length;
+      session.activeBackgroundTasks = [];
+      sendToSession(session, { type: "active_background_tasks", tasks: [] });
+      if (previousBackgroundTaskCount !== 0) sm.broadcastSessionList();
       var fsSkills = discoverSkillDirs();
       sm.skillNames = mergeSkills(parsed.skills, fsSkills);
       if (parsed.slashCommands) {
@@ -192,13 +196,20 @@ function attachMessageProcessor(ctx) {
         send({ type: "slash_commands", commands: sm.slashCommands });
       }
       if (parsed.model) {
-        sm.currentModel = sm.currentModel || sm._savedDefaultModel || parsed.model;
         var initVendor = session.vendor || (adapter && adapter.vendor) || "claude";
-        send({
+        sm.defaultModelByVendor = sm.defaultModelByVendor || {};
+        sm.defaultModelByVendor[initVendor] = sm.defaultModelByVendor[initVendor] || parsed.model;
+        var initModels = getModelsForVendor(initVendor);
+        var initModel = session.model || sm.defaultModelByVendor[initVendor] || "";
+        if (initModels.length > 0 && !initModels.some(function(entry) {
+          return entry === initModel || (entry && (entry.value === initModel || entry.id === initModel || entry.resolvedModel === initModel));
+        })) initModel = typeof initModels[0] === "string" ? initModels[0] : (initModels[0].value || initModels[0].id || "");
+        sendToSession(session, {
           type: "model_info",
-          model: sm.currentModel,
-          models: getModelsForVendor(initVendor),
+          model: initModel,
+          models: initModels,
           vendor: initVendor,
+          sessionId: session.localId,
           availableVendors: sm.availableVendors || [],
           installedVendors: sm.installedVendors || [],
         });
@@ -612,6 +623,15 @@ function attachMessageProcessor(ctx) {
         });
       }
 
+    } else if (parsed.yokeType === "background_tasks_changed") {
+      var previousBackgroundTaskCount = (session.activeBackgroundTasks || []).length;
+      var activeBackgroundTasks = Array.isArray(parsed.tasks) ? parsed.tasks : [];
+      session.activeBackgroundTasks = activeBackgroundTasks;
+      sendToSession(session, { type: "active_background_tasks", tasks: activeBackgroundTasks });
+      if (previousBackgroundTaskCount !== activeBackgroundTasks.length) {
+        sm.broadcastSessionList();
+      }
+
     } else if (parsed.yokeType === "tool_progress") {
       // Sub-agent tool_progress: forward as activity update
       var parentId = parsed.parentToolId;
@@ -783,6 +803,8 @@ function attachMessageProcessor(ctx) {
       // app-server returned an unauthorized/token-revoked error). Trigger the
       // same login flow as the Claude login-prompt path.
       session.isProcessing = false;
+      session._awaitingTurnResult = false;
+      session._queuedTurnCount = 0;
       onProcessingChanged();
       emitAuthRequired(session);
 

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/session-notes-mcp-server.js

@@ -7,6 +7,7 @@ var MEMORY_CONTRACT =
   "Default to not writing. Create a note proactively only when the user explicitly asks to remember or track something, or when all of these are true: it will remain useful after the current task and session, it is not already adequately recorded in the repository or another note, and the user would likely be glad to find it on the board a week later. " +
   "Good notes capture an unresolved commitment, durable product decision, user preference, constraint, or handoff that will materially change future work. " +
   "Important exception for deferred defects: while doing code or technical work, actively create a sticky note when you discover a concrete defect, regression risk, security issue, or data-loss risk that is outside the current session goal and will remain unfixed when the turn ends. Do not wait for the user to ask. Include the observable evidence, affected component, likely impact, and a clear next action. Check active notes first when a duplicate is plausible. Do not create defect notes for speculation, general cleanup ideas, or problems you fixed in the current session. " +
+  "Important exception for deferred proposals: when you propose work (a fix, follow-up, improvement, or next step) and the user defers it rather than declining it (\"let's do that later\", \"next time\", \"after this\"), actively create a sticky note before the topic moves on. Do not wait to be asked. Capture what was proposed, why it mattered, and the agreed timing if any. Deferred agreements scroll out of chat history quickly and are hard to track; the board is where they survive. If the user declines the idea outright, do not write a note. " +
   "Never create a note merely because work is important, lengthy, spans agents or restarts, or might help another agent. Do not record completed work, implementation details, test results, investigation logs, transient blockers, conversation summaries, or announcements of your own activity. When uncertain, do not write. " +
   "Updates are visible too: update only when durable state materially changes, and remove a note created by your session when it stops being useful instead of turning it into a completion log. Put a concise plain-text title on the first line, stay focused on one topic, and include only the context needed for future action.";
 

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;
@@ -493,6 +495,7 @@ function createSessionManager(opts) {
       title: s.title || "New Session",
       active: isActive,
       isProcessing: s.isProcessing,
+      backgroundTaskCount: (s.activeBackgroundTasks || []).length,
       lastActivity: s.lastActivity || s.createdAt || 0,
       loop: loop,
       spawn: s.spawn || null,
@@ -715,6 +718,7 @@ function createSessionManager(opts) {
     if (session.isProcessing) {
       _send({ type: "status", status: "processing" });
     }
+    _send({ type: "active_background_tasks", tasks: session.activeBackgroundTasks || [] });
 
     // Re-send any pending permission requests
     var pendingIds = Object.keys(session.pendingPermissions);

package/lib/worktree.js

@@ -43,9 +43,14 @@ function isWorktree(projectPath) {
   }
 }
 
+function isPathInside(parentPath, candidatePath) {
+  var relative = path.relative(path.resolve(parentPath), path.resolve(candidatePath));
+  return relative !== "" && relative !== ".." && relative.indexOf(".." + path.sep) !== 0 && !path.isAbsolute(relative);
+}
+
 // Scan worktrees for a given project path
-// Returns array of { path, branch, bare, detached, accessible }
-// accessible = true if worktree path is inside parentPath
+// Returns array of { path, branch, bare, detached, external }
+// external = true when Git registered the worktree outside the main project folder
 function scanWorktrees(projectPath) {
   var resolvedParent = path.resolve(projectPath);
   try {
@@ -63,7 +68,7 @@ function scanWorktrees(projectPath) {
       if (wt.bare) continue;
       var resolvedWt = path.resolve(wt.path);
       if (resolvedWt === resolvedParent) continue;
-      wt.accessible = resolvedWt.indexOf(resolvedParent + path.sep) === 0;
+      wt.external = !isPathInside(resolvedParent, resolvedWt);
       wt.dirName = path.basename(wt.path);
       results.push(wt);
     }
@@ -131,4 +136,4 @@ function removeWorktree(projectPath, worktreeDirName) {
   }
 }
 
-module.exports = { scanWorktrees: scanWorktrees, createWorktree: createWorktree, removeWorktree: removeWorktree, isWorktree: isWorktree };
+module.exports = { scanWorktrees: scanWorktrees, createWorktree: createWorktree, removeWorktree: removeWorktree, isWorktree: isWorktree, isPathInside: isPathInside };

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" },
@@ -109,6 +114,7 @@ var schema = {
   "subagent_done":            { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Subagent task completed" },
   "task_started":             { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Background task started" },
   "task_progress":            { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Background task progress update" },
+  "active_background_tasks":  { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Current background tasks for the active session (full replacement)" },
   "markdown_edit_present":    { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Open a user-requested Markdown edit with a before snapshot" },
 
   // -----------------------------------------------------------------------
@@ -175,7 +181,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 +199,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/acp-agent-profiles.js

@@ -96,6 +96,15 @@ function validateOpenCodeConfig(config) {
   }
 }
 
+function trustDefaultWhenModeIsNotExposed(ctx, next) {
+  var options = ctx.state && ctx.state.configOptions;
+  for (var i = 0; i < (options || []).length; i++) {
+    if (options[i].category === "mode" || options[i].id === "mode") return next();
+  }
+  if (ctx.state && ctx.state.modes) return next();
+  return Promise.resolve();
+}
+
 var ACP_AGENT_PROFILES = {
   opencode: {
     vendor: "opencode",
@@ -147,6 +156,61 @@ var ACP_AGENT_PROFILES = {
       return Promise.resolve();
     },
   },
+  kimi: {
+    vendor: "kimi",
+    displayName: "Kimi Code",
+    binaryName: "kimi",
+    overrideName: "KIMI_CLI_PATH",
+    args: ["acp"],
+    defaultModels: ["auto"],
+    defaultModel: "auto",
+    sessionResume: null,
+    ensureSafePermissionMode: trustDefaultWhenModeIsNotExposed,
+  },
+  grok: {
+    vendor: "grok",
+    displayName: "Grok Build",
+    binaryName: "grok",
+    overrideName: "GROK_CLI_PATH",
+    args: ["--no-auto-update", "--permission-mode", "ask", "agent", "stdio"],
+    defaultModels: ["auto"],
+    defaultModel: "auto",
+    sessionResume: null,
+    permissionModeGuaranteed: true,
+  },
+  copilot: {
+    vendor: "copilot",
+    displayName: "GitHub Copilot CLI",
+    binaryName: "copilot",
+    overrideName: "COPILOT_CLI_PATH",
+    args: ["--acp"],
+    defaultModels: ["auto"],
+    defaultModel: "auto",
+    sessionResume: null,
+    ensureSafePermissionMode: trustDefaultWhenModeIsNotExposed,
+  },
+  qwen: {
+    vendor: "qwen",
+    displayName: "Qwen Code",
+    binaryName: "qwen",
+    overrideName: "QWEN_CLI_PATH",
+    args: ["--acp", "--approval-mode", "default"],
+    defaultModels: ["auto"],
+    defaultModel: "auto",
+    sessionResume: null,
+    permissionModeGuaranteed: true,
+  },
+  junie: {
+    vendor: "junie",
+    displayName: "Junie CLI",
+    binaryName: "junie",
+    overrideName: "JUNIE_CLI_PATH",
+    args: ["--acp", "true"],
+    defaultModels: ["auto"],
+    defaultModel: "auto",
+    sessionResume: null,
+    ensureSafePermissionMode: trustDefaultWhenModeIsNotExposed,
+  },
 };
 
 function getAcpAgentProfile(vendor) {

package/lib/yoke/adapters/acp.js

@@ -3,6 +3,7 @@
 // Implements the YOKE Adapter contract once for standard ACP agents.
 
 var AcpProcessManager = require("../acp-process-manager").AcpProcessManager;
+var INITIALIZE_TIMEOUT_MS = require("../interface").INITIALIZE_TIMEOUT_MS;
 var createAcpQueryHandle = require("../acp-query-handle").createAcpQueryHandle;
 var profiles = require("../acp-agent-profiles");
 var driverRuntime = require("../acp-driver-runtime");
@@ -178,7 +179,7 @@ function createAcpAdapter(vendor, opts) {
               session: { configOptions: { boolean: {} } },
             },
           });
-          initResult = await acp.send("initialize", initializeParams, 30000);
+          initResult = await acp.send("initialize", initializeParams, INITIALIZE_TIMEOUT_MS);
           await driverRuntime.callAsync(driver, "onInitialize", context({ acp: acp, initResult: initResult }), function() {});
           if (shuttingDown) throw new Error(driver.displayName + " adapter is shutting down");
         } catch (e) {