clay-server 3.4.0-beta.2 → 3.4.0-beta.21

package/lib/sdk-bridge.js

@@ -110,6 +110,7 @@ function createSDKBridge(opts) {
   var adapters = opts.adapters || {};
   var mateDisplayName = opts.mateDisplayName || "";
   var isMate = opts.isMate || (slug.indexOf("mate-") === 0);
+  var osUsers = !!opts.osUsers;
   var dangerouslySkipPermissions = opts.dangerouslySkipPermissions || false;
   // mcpServers may be either a static object or a getter function. The
   // getter form lets callers gate individual servers at call time (e.g.
@@ -244,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) {
@@ -323,6 +331,14 @@ function createSDKBridge(opts) {
   var mergeSkills = skills.mergeSkills;
 
   // --- Message processing (extracted to sdk-message-processor.js) ---
+  function getSessionLinuxUser(session) {
+    if (!osUsers || !session) return null;
+    if (session.lastLinuxUser) return session.lastLinuxUser;
+    if (!session.ownerId) return null;
+    var owner = usersModule.findUserById(session.ownerId);
+    return owner && owner.linuxUser ? owner.linuxUser : null;
+  }
+
   // Auto-generate a session title via YOKE adapter.generateTitle().
   // Triggered by sdk-message-processor after AUTO_TITLE_TURN_THRESHOLD turns.
   function autoGenerateTitle(session) {
@@ -345,7 +361,10 @@ function createSDKBridge(opts) {
     }
     console.log("[auto-title] Calling adapter.generateTitle with " + userMessages.length + " messages for session " + session.localId);
 
-    sessionAdapter.generateTitle(userMessages, { cwd: cwd }).then(function(title) {
+    sessionAdapter.generateTitle(userMessages, {
+      cwd: cwd,
+      linuxUser: getSessionLinuxUser(session) || undefined,
+    }).then(function(title) {
       if (!title || title.length < 2) return;
       title = title.substring(0, 100);
       if (!session.titleManuallySet) {
@@ -837,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 });
@@ -865,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" });
@@ -880,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, {
@@ -894,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")
@@ -1131,7 +1159,9 @@ function createSDKBridge(opts) {
   async function rollbackConversation(session, numTurns) {
     var sessionAdapter = getAdapterForSession(session);
     if (sessionAdapter && typeof sessionAdapter.rollbackThread === "function") {
-      await sessionAdapter.rollbackThread(session.cliSessionId, numTurns);
+      await sessionAdapter.rollbackThread(session.cliSessionId, numTurns, {
+        linuxUser: getSessionLinuxUser(session) || undefined,
+      });
     }
     // Claude: conversation rollback is handled by rewindFiles + local history trim
   }
@@ -1143,7 +1173,11 @@ function createSDKBridge(opts) {
 
   async function forkSessionUnified(session, uuid) {
     var sessionAdapter = getAdapterForSession(session);
-    var result = await sessionAdapter.forkSession(session.cliSessionId, { upToMessageId: uuid, dir: cwd });
+    var result = await sessionAdapter.forkSession(session.cliSessionId, {
+      upToMessageId: uuid,
+      dir: cwd,
+      linuxUser: getSessionLinuxUser(session) || undefined,
+    });
     if (!result || !result.sessionId) throw new Error("Fork returned no session id");
 
     // Adapters with rollbackThread (e.g. Codex) use local history copy
@@ -1157,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);
@@ -1208,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;
     }
@@ -1414,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]) || [];
@@ -1437,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);
@@ -1471,6 +1500,7 @@ function createSDKBridge(opts) {
 
     var queryOpts = {
       cwd: cwd,
+      linuxUser: linuxUser || undefined,
       // appendSystemPrompt, NOT systemPrompt: a plain-string systemPrompt
       // REPLACES the entire Claude Code system prompt (sdk.d.ts:2096), which
       // would strip the driver session down to the two-sentence pair preset.
@@ -1528,6 +1558,10 @@ function createSDKBridge(opts) {
         ACP: {
           mcpServers: getAcpMcpServers(session),
         },
+        ANTIGRAVITY: {
+          dangerouslySkipPermissions: dangerouslySkipPermissions
+            || session.permissionMode === "bypassPermissions",
+        },
         KIRO: {
           engine: kiroConfig.engine,
           mode: kiroConfig.mode,
@@ -1561,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;
@@ -1602,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 });
@@ -1672,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 {
@@ -1790,16 +1829,20 @@ function createSDKBridge(opts) {
     } catch (e) {}
     if ((codexBin && fs.existsSync(codexBin)) || tryLookup(yoke.getVendorInfo("codex").binaryName)) result.push("codex");
 
-    var acpVendorKeys = ["gemini", "opencode"];
+    var subprocessVendorKeys = ["antigravity", "opencode", "kimi", "grok", "copilot", "qwen", "junie"];
     var acpProfiles = require("./yoke/acp-agent-profiles");
-    for (var acpVendorIndex = 0; acpVendorIndex < acpVendorKeys.length; acpVendorIndex++) {
-      var acpVendor = acpVendorKeys[acpVendorIndex];
-      var acpInfo = yoke.getVendorInfo(acpVendor);
-      if (!linuxUser || acpInfo.osUserIsolation) {
-        var acpProfile = acpProfiles.getAcpAgentProfile(acpVendor);
-        if (acpProfiles.findAcpAgentPath(acpProfile)) result.push(acpVendor);
+    for (var subprocessVendorIndex = 0; subprocessVendorIndex < subprocessVendorKeys.length; subprocessVendorIndex++) {
+      var subprocessVendor = subprocessVendorKeys[subprocessVendorIndex];
+      var subprocessInfo = yoke.getVendorInfo(subprocessVendor);
+      if (!linuxUser || subprocessInfo.osUserIsolation) {
+        if (subprocessVendor === "antigravity") {
+          if (tryLookup(subprocessInfo.binaryName)) result.push(subprocessVendor);
+        } else {
+          var acpProfile = acpProfiles.getAcpAgentProfile(subprocessVendor);
+          if (acpProfiles.findAcpAgentPath(acpProfile)) result.push(subprocessVendor);
+        }
       } else {
-        console.log("[sdk-bridge] " + acpInfo.displayName + " hidden for OS-isolated user " + linuxUser + ": per-user spawning is not implemented");
+        console.log("[sdk-bridge] " + subprocessInfo.displayName + " hidden for OS-isolated user " + linuxUser + ": per-user spawning is not implemented");
       }
     }
 
@@ -1832,6 +1875,13 @@ function createSDKBridge(opts) {
     var defaultVendor = adapter ? adapter.vendor : "claude";
     sm.defaultVendor = defaultVendor;
 
+    // Installation detection is independent of adapter initialization. Publish
+    // it before warmup so a new project does not render the initial empty state
+    // as if every CLI were missing while the default adapter starts up.
+    sm.installedVendors = detectInstalledVendors(linuxUser);
+    sm.availableVendors = getAvailableVendors(linuxUser);
+    sendModelInfoForVendor(null, defaultVendor, defaultModelForVendor(defaultVendor));
+
     // Initialize default adapter first (provides skills, slash commands, etc.)
     if (adapter) {
       try {
@@ -1862,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
@@ -1883,19 +1934,8 @@ function createSDKBridge(opts) {
     //     actually issues a query with it.
     sm.modelsByVendor = sm.modelsByVendor || {};
 
-    // Detect installed vendors per-user (binary existence check)
-    sm.installedVendors = detectInstalledVendors(linuxUser);
-    sm.availableVendors = getAvailableVendors(linuxUser);
-
-    // Send initial state to client
-    send({
-      type: "model_info",
-      model: sm.currentModel || "",
-      models: getModelsForVendor(defaultVendor),
-      vendor: defaultVendor,
-      availableVendors: sm.availableVendors,
-      installedVendors: sm.installedVendors,
-    });
+    // Send the fully initialized state to the client.
+    sendModelInfoForVendor(null, defaultVendor, defaultModelForVendor(defaultVendor));
   }
 
   async function setModel(session, model) {
@@ -1907,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) };
     }
   }
 
@@ -1951,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) });
     }
@@ -2009,7 +2055,7 @@ function createSDKBridge(opts) {
   // Creates a mention session that can be reused across multiple mentions
   // within a conversation flow (session continuity).
   async function createMentionSession(opts) {
-    // opts: { vendor, claudeMd, initialContext, initialMessage, onDelta, onDone, onError, onActivity }
+    // opts: { vendor, linuxUser, claudeMd, initialContext, initialMessage, onDelta, onDone, onError, onActivity }
     var abortController = new AbortController();
 
     // Current response callbacks (swapped on each pushMessage)
@@ -2029,6 +2075,7 @@ function createSDKBridge(opts) {
     try {
       handle = await mentionAdapter.createQuery({
         cwd: cwd,
+        linuxUser: opts.linuxUser || undefined,
         systemPrompt: opts.claudeMd,
         model: opts.model || undefined,
         toolServers: opts.includeMcpServers ? (mergeMcpServers(getMcpServers(), getRemoteMcpServers) || undefined) : undefined,

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

@@ -2,7 +2,14 @@
 
 var buildShape = require("./session-spawn-mcp-server").buildShape;
 
-var MEMORY_CONTRACT = "The sticky-note board persists across sessions and is a user-facing artifact shared with people and Clay agents, not private agent scratch space. 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. 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.";
+var MEMORY_CONTRACT =
+  "The sticky-note board persists across sessions and is a user-facing artifact shared with people and Clay agents, not private agent scratch space. " +
+  "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.";
 
 function getToolDefs(handlers) {
   return [

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 };