clay-server 2.31.0 → 2.32.0-beta.10

package/lib/project-mate-interaction.js

@@ -4,6 +4,7 @@ var crypto = require("crypto");
 
 function attachMateInteraction(ctx) {
   var cwd = ctx.cwd;
+  var slug = ctx.slug || "";
   var sm = ctx.sm;
   var sdk = ctx.sdk;
   var send = ctx.send;
@@ -21,6 +22,7 @@ function attachMateInteraction(ctx) {
   var loadMateDigests = ctx.loadMateDigests;
   var updateMemorySummary = ctx.updateMemorySummary;
   var initMemorySummary = ctx.initMemorySummary;
+  var getNotificationsModule = ctx.getNotificationsModule || function () { return null; };
   // checkForDmDebateBrief is accessed via ctx at call time because
   // it comes from the debate module initialized after this one.
 
@@ -104,6 +106,30 @@ function attachMateInteraction(ctx) {
     return lines.join("\n") + "\n\n";
   }
 
+  function getHostMateId() {
+    if (typeof slug === "string" && slug.indexOf("mate-") === 0) {
+      return slug.substring(5) || null;
+    }
+    return null;
+  }
+
+  function notifyMentionResponse(session, mentionMateId, mentionMateName, fullText) {
+    var notificationsModule = getNotificationsModule();
+    var hostMateId = getHostMateId();
+    var preview = (fullText || "").replace(/\s+/g, " ").trim();
+    if (preview.length > 140) preview = preview.substring(0, 140) + "...";
+    if (!notificationsModule || !hostMateId) return;
+    notificationsModule.notify("mention_response", {
+      title: (mentionMateName || "Mate") + " responded",
+      preview: preview,
+      slug: slug,
+      sessionId: session.localId,
+      mateId: hostMateId,
+      avatarMateId: mentionMateId || null,
+      ownerId: session.ownerId || null,
+    });
+  }
+
   // --- Shared digest worker: one reusable Haiku session for gate+digest ---
   // Combines gate check and digest generation into a single prompt,
   // processes jobs sequentially from a queue, reuses the session across calls.
@@ -136,12 +162,19 @@ function attachMateInteraction(ctx) {
     } catch (e) {}
 
     // Combined gate + digest in one prompt (saves a full round-trip vs separate gate)
-    var prompt = [
+    var promptParts = [
       "[SYSTEM: Memory Gate + Digest]",
       "You are a memory system for an AI Mate (role: " + (mateRole || "assistant") + ").",
       "",
-      "Conversation (" + job.type + "):",
-      job.conversationContent,
+    ];
+    if (job.priorSummary) {
+      promptParts.push("Prior conversation context (memory summary so far):");
+      promptParts.push(job.priorSummary);
+      promptParts.push("");
+    }
+    promptParts.push("Conversation (" + job.type + "):");
+    promptParts.push(job.conversationContent);
+    var prompt = promptParts.concat([
       "",
       "STEP 1: Should this be saved to memory?",
       'Answer "no" ONLY if the entire conversation is trivial (e.g. just "hi"/"hello").',
@@ -171,7 +204,7 @@ function attachMateInteraction(ctx) {
       "user_observations: OPTIONAL array. Include ONLY if you noticed meaningful patterns about the USER themselves (not the topic).",
       "Categories: pattern (repeated behavior 2+ times), decision (explicit choice with reasoning), reaction (emotional/attitude signal), preference (tool/style/communication preference).",
       "Omit the field entirely if nothing notable about the user.",
-    ].join("\n");
+    ]).join("\n");
 
     function handleResult(text) {
       var cleaned = text.trim();
@@ -225,9 +258,14 @@ function attachMateInteraction(ctx) {
         }
       }
 
-      updateMemorySummary(job.mateCtx, job.mateId, digestObj);
-      maybeSynthesizeUserProfile(job.mateCtx, job.mateId);
-      if (job.onDone) job.onDone();
+      // Skip summary update for failed parses -- the fallback digest would degrade quality
+      if (digestObj.topic !== "parse_failed") {
+        updateMemorySummary(job.mateCtx, job.mateId, digestObj);
+        maybeSynthesizeUserProfile(job.mateCtx, job.mateId);
+        if (job.onDone) job.onDone();
+      } else {
+        if (job.onError) job.onError(new Error("parse_failed"));
+      }
       processDigestQueue();
     }
 
@@ -249,7 +287,7 @@ function attachMateInteraction(ctx) {
           console.error("[digest-worker] Error:", err);
           _digestWorker = null;
           _digestWorkerTurns = 0;
-          if (job.onDone) job.onDone();
+          if (job.onError) job.onError(err);
           processDigestQueue();
         },
       });
@@ -265,11 +303,11 @@ function attachMateInteraction(ctx) {
         onError: function (err) {
           console.error("[digest-worker] Create error:", err);
           _digestWorker = null;
-          if (job.onDone) job.onDone();
+          if (job.onError) job.onError(err);
           processDigestQueue();
         },
-      }).then(function (ws) { _digestWorker = ws; _digestWorkerTurns = 1; }).catch(function () {
-        if (job.onDone) job.onDone();
+      }).then(function (ws) { _digestWorker = ws; _digestWorkerTurns = 1; }).catch(function (err) {
+        if (job.onError) job.onError(err || new Error("digest worker creation failed"));
         processDigestQueue();
       });
     }
@@ -303,10 +341,14 @@ function attachMateInteraction(ctx) {
       type: "mention",
       conversationContent: conversationContent,
       onDone: function () { mentionSession._digesting = false; },
+      onError: function () { mentionSession._digesting = false; },
     });
   }
 
-  // Digest DM turn for mate projects - uses shared digest worker
+  // Digest DM turn for mate projects - uses shared digest worker.
+  // Delta-based: only collects new turns since the last successful digest.
+  // Concurrency debounce: turns that arrive while a digest is in-flight
+  // are naturally batched into the next flush.
   var _dmDigestPending = false;
   function digestDmTurn(session, responsePreview) {
     if (!isMate || _dmDigestPending) return;
@@ -314,11 +356,26 @@ function attachMateInteraction(ctx) {
     var mateCtx = matesModule.buildMateCtx(projectOwnerId);
     if (!matesModule.isMate(mateCtx, mateId)) return;
 
-    // Collect full conversation from session history (all user + mate turns)
+    // Track digest index per session so switching sessions doesn't misalign.
+    // On resumed sessions (after restart), recover index from the last
+    // digest_checkpoint entry in history so undigested turns aren't lost.
+    if (typeof session._dmLastDigestedIndex !== "number") {
+      session._dmLastDigestedIndex = 0;
+      for (var ci = session.history.length - 1; ci >= 0; ci--) {
+        if (session.history[ci].type === "digest_checkpoint") {
+          session._dmLastDigestedIndex = session.history[ci].digestedIndex;
+          break;
+        }
+      }
+    }
+
+    // Collect only new turns since the last successful digest
     var conversationParts = [];
     var totalLen = 0;
     var CONV_CAP = 6000;
-    for (var hi = 0; hi < session.history.length; hi++) {
+    var startIndex = session._dmLastDigestedIndex;
+    for (var hi = startIndex; hi < session.history.length; hi++) {
+      if (totalLen >= CONV_CAP) break;
       var entry = session.history[hi];
       if (entry.type === "user_message" && entry.text) {
         var uText = entry.text;
@@ -335,8 +392,8 @@ function attachMateInteraction(ctx) {
         conversationParts.push("Mate: " + aText);
         totalLen += aText.length;
       }
-      if (totalLen >= CONV_CAP) break;
     }
+    // If the latest response hasn't landed in history yet, append it
     var lastResponseText = responsePreview || "";
     if (lastResponseText && conversationParts.length > 0) {
       var lastPart = conversationParts[conversationParts.length - 1];
@@ -362,14 +419,34 @@ function attachMateInteraction(ctx) {
       });
     }
 
+    // Read existing summary to give the digest worker context for delta content
+    var priorSummary = "";
+    try {
+      if (fs.existsSync(summaryFile)) {
+        priorSummary = fs.readFileSync(summaryFile, "utf8").trim();
+      }
+    } catch (e) {}
+
     _dmDigestPending = true;
+    var snapshotIndex = session.history.length;
 
     enqueueDigest({
       mateCtx: mateCtx,
       mateId: mateId,
       type: "dm",
+      priorSummary: priorSummary || "",
       conversationContent: conversationParts.join("\n"),
-      onDone: function () { _dmDigestPending = false; },
+      onDone: function () {
+        session._dmLastDigestedIndex = snapshotIndex;
+        // Persist checkpoint so resumed sessions know where to continue
+        var checkpoint = { type: "digest_checkpoint", digestedIndex: snapshotIndex };
+        session.history.push(checkpoint);
+        sm.appendToSessionFile(session, checkpoint);
+        _dmDigestPending = false;
+      },
+      onError: function () {
+        _dmDigestPending = false;
+      },
     });
   }
 
@@ -445,6 +522,7 @@ function attachMateInteraction(ctx) {
     }
 
     session._mentionInProgress = true;
+    session._mentionActiveMateId = msg.mateId;
 
     // Send mention start indicator
     sendToSession(session.localId, {
@@ -478,6 +556,7 @@ function attachMateInteraction(ctx) {
       },
       onDone: function (fullText) {
         session._mentionInProgress = false;
+        session._mentionActiveMateId = null;
 
         // Save mention response to session history
         var mentionResponseEntry = {
@@ -504,6 +583,10 @@ function attachMateInteraction(ctx) {
         sendToSession(session.localId, { type: "mention_done", mateId: msg.mateId });
         send({ type: "mention_processing", mateId: msg.mateId, active: false });
 
+        if (isMate) {
+          notifyMentionResponse(session, msg.mateId, mateName, fullText);
+        }
+
         // Check if the mate wrote a debate brief during this turn
         ctx.checkForDmDebateBrief(session, msg.mateId, mateCtx);
 
@@ -512,6 +595,7 @@ function attachMateInteraction(ctx) {
       },
       onError: function (errMsg) {
         session._mentionInProgress = false;
+        session._mentionActiveMateId = null;
         // Clean up dead session
         if (session._mentionSessions && session._mentionSessions[msg.mateId]) {
           delete session._mentionSessions[msg.mateId];
@@ -560,6 +644,7 @@ function attachMateInteraction(ctx) {
 
       // Create new persistent mention session
       sdk.createMentionSession({
+        vendor: mate.vendor || null,
         claudeMd: claudeMd,
         initialContext: mentionContext,
         initialMessage: mentionFullInput,
@@ -614,6 +699,7 @@ function attachMateInteraction(ctx) {
         }
       }).catch(function (err) {
         session._mentionInProgress = false;
+        session._mentionActiveMateId = null;
         console.error("[mention] Failed to create session for mate " + msg.mateId + ":", err.message || err);
         sendToSession(session.localId, { type: "mention_error", mateId: msg.mateId, error: "Failed to create mention session." });
       });

package/lib/project-mcp.js

@@ -73,6 +73,7 @@ function attachMcp(ctx) {
 
   function handleToolResult(msg) {
     var callId = msg.callId;
+    console.log("[mcp-bridge] Tool result received: " + callId);
     var pending = _pendingCalls[callId];
     if (!pending) return;
     if (pending.timer) clearTimeout(pending.timer);
@@ -82,6 +83,7 @@ function attachMcp(ctx) {
 
   function handleToolError(msg) {
     var callId = msg.callId;
+    console.log("[mcp-bridge] Tool error received: " + callId + " error=" + (msg.error || "unknown"));
     var pending = _pendingCalls[callId];
     if (!pending) return;
     if (pending.timer) clearTimeout(pending.timer);
@@ -223,12 +225,14 @@ function attachMcp(ctx) {
         var callId = "mc_" + Date.now() + "_" + crypto.randomUUID().slice(0, 8);
 
         var timer = setTimeout(function () {
+          console.log("[mcp-bridge] Tool call TIMEOUT: " + callId + " server=" + serverName + " tool=" + toolName);
           delete _pendingCalls[callId];
           reject(new Error("MCP tool call timed out after " + (TOOL_TIMEOUT_MS / 1000) + "s"));
         }, TOOL_TIMEOUT_MS);
 
         _pendingCalls[callId] = { resolve: resolve, reject: reject, timer: timer };
 
+        console.log("[mcp-bridge] Sending tool call: " + callId + " server=" + serverName + " tool=" + toolName);
         sendTo(extWs, {
           type: "mcp_tool_call",
           callId: callId,

package/lib/project-notifications.js

@@ -60,6 +60,15 @@ var formatters = {
       body: data.preview || "Sent you a message",
     };
   },
+
+  mention_response: function (data) {
+    return {
+      type: "mention_response",
+      title: data.title || "Mention response ready",
+      body: data.preview || "",
+      meta: { avatarMateId: data.avatarMateId || null },
+    };
+  },
 };
 
 // ========================================================

package/lib/project-sessions.js

@@ -1,6 +1,7 @@
 var fs = require("fs");
 var path = require("path");
 var { execFileSync } = require("child_process");
+var { CODEX_DEFAULTS, getCodexConfig } = require("./codex-defaults");
 
 /**
  * Attach session management, config, project management, and mid-section
@@ -13,7 +14,7 @@ var { execFileSync } = require("child_process");
  *   opts, usersModule, userPresence, matesModule, pushModule,
  *   getSessionForWs, getLinuxUserForSession, getOsUserInfoForWs,
  *   hydrateImageRefs, onProcessingChanged, broadcastPresence,
- *   getSDK, getProjectList, getProjectCount, getScheduleCount,
+ *   adapter, getProjectList, getProjectCount, getScheduleCount,
  *   moveScheduleToProject, moveAllSchedulesToProject, getHubSchedules,
  *   fetchVersion, isNewer, onCreateWorktree, IGNORED_DIRS,
  *   scheduleMessage, cancelScheduledMessage,
@@ -46,7 +47,7 @@ function attachSessions(ctx) {
   var hydrateImageRefs = ctx.hydrateImageRefs;
   var onProcessingChanged = ctx.onProcessingChanged;
   var broadcastPresence = ctx.broadcastPresence;
-  var getSDK = ctx.getSDK;
+  var adapter = ctx.adapter;
   var getProjectList = ctx.getProjectList;
   var getProjectCount = ctx.getProjectCount;
   var getScheduleCount = ctx.getScheduleCount;
@@ -96,6 +97,7 @@ function attachSessions(ctx) {
       var sessionOpts = {};
       if (ws._clayUser && usersModule.isMultiUser()) sessionOpts.ownerId = ws._clayUser.id;
       if (msg.sessionVisibility) sessionOpts.sessionVisibility = msg.sessionVisibility;
+      if (msg.vendor) sessionOpts.vendor = msg.vendor;
       var newSess = sm.createSession(sessionOpts, ws);
       ws._clayActiveSession = newSess.localId;
       // Apply project-level email defaults to new session
@@ -153,9 +155,7 @@ function attachSessions(ctx) {
       if (!msg.cliSessionId) return true;
       var cliSess = require("./cli-sessions");
       // Try SDK for title first, then fall back to manual parsing
-      var titlePromise = getSDK().then(function(sdkMod) {
-        return sdkMod.getSessionInfo(msg.cliSessionId, { dir: cwd });
-      }).then(function(info) {
+      var titlePromise = adapter.getSessionInfo(msg.cliSessionId, { dir: cwd }).then(function(info) {
         return (info && info.summary) ? info.summary.substring(0, 100) : null;
       }).catch(function() { return null; });
 
@@ -200,9 +200,7 @@ function attachSessions(ctx) {
         }
       } catch (e) {}
 
-      getSDK().then(function(sdkMod) {
-        return sdkMod.listSessions({ dir: cwd });
-      }).then(function(sdkSessions) {
+      adapter.listSessions({ dir: cwd }).then(function(sdkSessions) {
         var filtered = sdkSessions.filter(function(s) {
           return !relayIds[s.sessionId];
         }).map(function(s) {
@@ -283,15 +281,14 @@ function attachSessions(ctx) {
       if (msg.id && sm.sessions.has(msg.id) && msg.title) {
         var s = sm.sessions.get(msg.id);
         s.title = String(msg.title).substring(0, 100);
+        s.titleManuallySet = true;
         sm.saveSessionFile(s);
         sm.broadcastSessionList();
         // Sync title to SDK session
         if (s.cliSessionId) {
-          getSDK().then(function(sdkInst) {
-            sdkInst.renameSession(s.cliSessionId, s.title, { dir: cwd }).catch(function(e) {
-              console.error("[project] SDK renameSession failed:", e.message);
-            });
-          }).catch(function() {});
+          adapter.renameSession(s.cliSessionId, s.title, { dir: cwd }).catch(function(e) {
+            console.error("[project] SDK renameSession failed:", e.message);
+          });
         }
       }
       return true;
@@ -381,8 +378,9 @@ function attachSessions(ctx) {
 
     if (msg.type === "stop") {
       var session = getSessionForWs(ws);
-      if (session && session.abortController && session.isProcessing) {
-        session.abortController.abort();
+      if (session && session.isProcessing) {
+        session.taskStopRequested = true;
+        if (session.abortController) session.abortController.abort();
       }
       return true;
     }
@@ -521,32 +519,34 @@ function attachSessions(ctx) {
       return true;
     }
 
+    // Codex-specific settings (stored on sessionManager, passed to adapter via adapterOptions)
+    if (msg.type === "set_codex_approval") {
+      sm.codexApproval = msg.approval || CODEX_DEFAULTS.approval;
+      send(Object.assign({ type: "codex_config" }, getCodexConfig(sm)));
+      return true;
+    }
+    if (msg.type === "set_codex_sandbox") {
+      sm.codexSandbox = msg.sandbox || CODEX_DEFAULTS.sandbox;
+      send(Object.assign({ type: "codex_config" }, getCodexConfig(sm)));
+      return true;
+    }
+    if (msg.type === "set_codex_websearch") {
+      sm.codexWebSearch = msg.webSearch || CODEX_DEFAULTS.webSearch;
+      send(Object.assign({ type: "codex_config" }, getCodexConfig(sm)));
+      return true;
+    }
+
     if (msg.type === "rewind_preview") {
       var session = getSessionForWs(ws);
       if (!session || !session.cliSessionId || !msg.uuid) return true;
-      // Reject preview requests while a rewind is executing
       if (session._rewindInProgress) return true;
 
       (async function () {
-        var result;
         try {
-          result = await sdk.getOrCreateRewindQuery(session);
-          var preview = await result.query.rewindFiles(msg.uuid, { dryRun: true });
-          var diffs = {};
-          var changedFiles = preview.filesChanged || [];
-          for (var f = 0; f < changedFiles.length; f++) {
-            try {
-              diffs[changedFiles[f]] = execFileSync(
-                "git", ["diff", "HEAD", "--", changedFiles[f]],
-                { cwd: cwd, encoding: "utf8", timeout: 5000 }
-              ) || "";
-            } catch (e) { diffs[changedFiles[f]] = ""; }
-          }
-          sendTo(ws, { type: "rewind_preview_result", preview: preview, diffs: diffs, uuid: msg.uuid });
+          var r = await sdk.rewindPreview(session, msg.uuid);
+          sendTo(ws, { type: "rewind_preview_result", preview: r.preview, diffs: r.diffs, uuid: msg.uuid, chatOnly: r.chatOnly || false });
         } catch (err) {
           sendTo(ws, { type: "rewind_error", text: "Failed to preview rewind: " + err.message });
-        } finally {
-          if (result && result.isTemp) result.cleanup();
         }
       })();
       return true;
@@ -564,12 +564,10 @@ function attachSessions(ctx) {
       var mode = msg.mode || "both";
 
       (async function () {
-        var result;
         try {
-          // File restoration (skip for chat-only mode)
+          // File restoration (delegated to adapter via sdk-bridge)
           if (mode !== "chat") {
-            result = await sdk.getOrCreateRewindQuery(session);
-            await result.query.rewindFiles(msg.uuid, { dryRun: false });
+            await sdk.rewindExecuteFiles(session, msg.uuid);
           }
 
           // Conversation rollback (skip for files-only mode)
@@ -582,6 +580,14 @@ function attachSessions(ctx) {
               }
             }
 
+            // Count turns to roll back BEFORE trimming local history
+            var turnsToRollBack = 0;
+            if (targetIdx >= 0) {
+              for (var ri = targetIdx; ri < session.messageUUIDs.length; ri++) {
+                if (session.messageUUIDs[ri].type === "user") turnsToRollBack++;
+              }
+            }
+
             if (targetIdx >= 0) {
               var trimTo = session.messageUUIDs[targetIdx].historyIndex;
               for (var k = trimTo - 1; k >= 0; k--) {
@@ -592,6 +598,19 @@ function attachSessions(ctx) {
               }
               session.history = session.history.slice(0, trimTo);
               session.messageUUIDs = session.messageUUIDs.slice(0, targetIdx);
+              // Reset digest checkpoint if it points past the trimmed history
+              if (typeof session._dmLastDigestedIndex === "number" && session._dmLastDigestedIndex > trimTo) {
+                session._dmLastDigestedIndex = trimTo;
+              }
+            }
+
+            // Notify adapter of conversation rollback (e.g. Codex thread/rollback)
+            if (turnsToRollBack > 0) {
+              try {
+                await sdk.rollbackConversation(session, turnsToRollBack);
+              } catch (rbErr) {
+                console.error("[project-sessions] conversation rollback failed:", rbErr.message || rbErr);
+              }
             }
 
             var kept = session.messageUUIDs;
@@ -622,7 +641,6 @@ function attachSessions(ctx) {
           sendTo(ws, { type: "rewind_error", text: "Rewind failed: " + err.message });
         } finally {
           session._rewindInProgress = false;
-          if (result && result.isTemp) result.cleanup();
         }
       })();
       return true;
@@ -634,22 +652,47 @@ function attachSessions(ctx) {
         sendTo(ws, { type: "error", text: "Cannot fork: no CLI session" });
         return true;
       }
-      var forkCliId = session.cliSessionId;
       var forkTitle = (session.title || "New Session") + " (fork)";
-      getSDK().then(function(sdkMod) {
-        return sdkMod.forkSession(forkCliId, {
-          upToMessageId: msg.uuid,
-          dir: cwd,
-        });
-      }).then(function(result) {
-        var cliSess = require("./cli-sessions");
-        return cliSess.readCliSessionHistory(cwd, result.sessionId).then(function(history) {
-          var forked = sm.resumeSession(result.sessionId, { history: history, title: forkTitle }, ws);
-          if (forked) {
-            ws._clayActiveSession = forked.localId;
-            sendTo(ws, { type: "fork_complete", sessionId: forked.localId });
+
+      sdk.forkSession(session, msg.uuid).then(function(result) {
+        if (result.useLocalHistory) {
+          // Copy local history up to the target UUID
+          var targetIdx = -1;
+          for (var fi = 0; fi < session.messageUUIDs.length; fi++) {
+            if (session.messageUUIDs[fi].uuid === msg.uuid) { targetIdx = fi; break; }
           }
-        });
+          var forkHistory = [];
+          if (targetIdx >= 0) {
+            var trimTo = session.messageUUIDs[targetIdx].historyIndex;
+            forkHistory = session.history.slice(0, trimTo);
+          } else {
+            forkHistory = session.history.slice();
+          }
+          var forked = sm.createSession({ vendor: session.vendor, ownerId: session.ownerId || null }, ws);
+          forked.cliSessionId = result.sessionId;
+          forked.title = forkTitle;
+          forked.history = forkHistory;
+          forked.messageUUIDs = [];
+          for (var hi = 0; hi < forkHistory.length; hi++) {
+            if (forkHistory[hi].type === "message_uuid") {
+              forked.messageUUIDs.push({ uuid: forkHistory[hi].uuid, type: forkHistory[hi].messageType, historyIndex: hi });
+            }
+          }
+          sm.saveSessionFile(forked);
+          sm.switchSession(forked.localId, ws, hydrateImageRefs);
+          sendTo(ws, { type: "fork_complete", sessionId: forked.localId });
+          sm.broadcastSessionList();
+        } else {
+          // Read history from CLI session files
+          var cliSess = require("./cli-sessions");
+          return cliSess.readCliSessionHistory(cwd, result.sessionId).then(function(history) {
+            var forked = sm.resumeSession(result.sessionId, { history: history, title: forkTitle }, ws);
+            if (forked) {
+              ws._clayActiveSession = forked.localId;
+              sendTo(ws, { type: "fork_complete", sessionId: forked.localId });
+            }
+          });
+        }
       }).catch(function(e) {
         sendTo(ws, { type: "error", text: "Fork failed: " + (e.message || e) });
       });

package/lib/project-user-message.js

@@ -23,7 +23,7 @@ var fs = require("fs");
  *   scheduleMessage, cancelScheduledMessage,
  *   loadContextSources, saveContextSources,
  *   digestDmTurn, gateMemory,
- *   getSDK             - lazy ESM loader returning Promise<sdk>
+ *   adapter            - YOKE adapter instance
  */
 function attachUserMessage(ctx) {
   var cwd = ctx.cwd;
@@ -69,7 +69,7 @@ function attachUserMessage(ctx) {
   var loadContextSources = ctx.loadContextSources;
   var saveContextSources = ctx.saveContextSources;
 
-  var getSDK = ctx.getSDK;
+  var adapter = ctx.adapter;
   var _email = ctx._email;
 
   // --------------- Sticky notes ---------------
@@ -292,6 +292,13 @@ function attachUserMessage(ctx) {
     var session = getSessionForWs(ws);
     if (!session) return true;
 
+    // Bind vendor to session on first message (if not already set)
+    if (!session.vendor && msg.vendor) {
+      session.vendor = msg.vendor;
+      sm.saveSessionFile(session);
+      sm.broadcastSessionList();
+    }
+
     // Backfill ownerId for legacy sessions restored without one (multi-user only)
     if (!session.ownerId && ws._clayUser && usersModule.isMultiUser()) {
       session.ownerId = ws._clayUser.id;
@@ -337,11 +344,9 @@ function attachUserMessage(ctx) {
       sm.broadcastSessionList();
       // Sync auto-title to SDK
       if (session.cliSessionId) {
-        getSDK().then(function(sdkMod) {
-          sdkMod.renameSession(session.cliSessionId, session.title, { dir: cwd }).catch(function(e) {
-            console.error("[project] SDK renameSession failed:", e.message);
-          });
-        }).catch(function() {});
+        adapter.renameSession(session.cliSessionId, session.title, { dir: cwd }).catch(function(e) {
+          console.error("[project] SDK renameSession failed:", e.message);
+        });
       }
     }