clay-server 3.8.1 → 4.0.0-beta.10

package/lib/project.js

@@ -5,18 +5,22 @@ var crypto = require("crypto");
 var { createSessionManager } = require("./sessions");
 var { attachGitSessionAttribution } = require("./git-session-attribution");
 var { createSDKBridge, createMessageQueue } = require("./sdk-bridge");
+var runtimeEnv = require("./runtime-env");
 var { createTerminalManager } = require("./terminal-manager");
 var { createNotesManager } = require("./notes");
 var { fetchLatestVersion, fetchVersion, isNewer } = require("./updater");
 var { execFileSync, spawn } = require("child_process");
 var usersModule = require("./users");
 var { resolveOsUserInfo, fsAsUser, grantProjectAccess } = require("./os-users");
+var { buildUserEnv } = require("./build-user-env");
 var crisisSafety = require("./crisis-safety");
 var matesModule = require("./mates");
 var sessionSearch = require("./session-search");
 var userPresence = require("./user-presence");
 var { attachDebate } = require("./project-debate");
 var { attachDebateProposal } = require("./project-debate-proposal");
+var { attachMateCreationProposal } = require("./project-mate-creation-proposal");
+var { attachAskUser } = require("./project-ask-user");
 var { attachMemory } = require("./project-memory");
 var { attachMateInteraction } = require("./project-mate-interaction");
 var { attachUserMention } = require("./project-user-mention");
@@ -30,18 +34,76 @@ var { attachSessions } = require("./project-sessions");
 var { attachModels } = require("./project-models");
 var { attachUserMessage } = require("./project-user-message");
 var { attachShellCommand } = require("./project-shell-command");
+var { attachVendorLogin } = require("./project-vendor-login");
 var { attachConnection } = require("./project-connection");
 var { attachMcp } = require("./project-mcp");
 var { createLocalMcp } = require("./mcp-local");
 var { attachEmail: attachEmailModule } = require("./project-email");
 var { attachSessionSpawn } = require("./project-session-spawn");
+var { attachDelegatedSession } = require("./project-delegated-session");
+var { attachDelegatedFollowUp } = require("./project-delegated-follow-up");
+var workspaceSessionRef = require("./workspace-query-service").sessionRef;
 var { attachSessionPair } = require("./project-session-pair");
 var { attachSessionHandoff } = require("./project-session-handoff");
 var { attachSessionNotes, composeSystemPrompts } = require("./project-session-notes");
 var { attachSessionDocument } = require("./project-session-document");
+var { attachCapsuleCatalog } = require("./project-capsule-catalog");
+var { attachProjectWorkspaceQuery } = require("./project-workspace-query");
+var { attachProjectLogs } = require("./project-logs");
+var { attachProjectMateKnowledge } = require("./project-mate-knowledge");
 var { attachSplitGroups } = require("./session-split-groups");
+var toolControlMcp = require("./tool-control-mcp-server");
+var toolLlm = require("./tool-llm");
 // project-notifications is attached globally in server.js, passed via opts.notificationsModule
 
+function createMateToolControlMcp(adapter, config) {
+  if (!adapter || typeof adapter.createToolServer !== "function") return null;
+  var handlers = {
+    list: function () {
+      var manifests = config.list(config.userId) || [];
+      var tools = [];
+      for (var i = 0; i < manifests.length; i++) {
+        tools.push({
+          id: manifests[i].id,
+          name: manifests[i].name,
+          description: manifests[i].description || "",
+          useWhen: manifests[i].useWhen || "",
+          runtime: manifests[i].runtime || "worker",
+          permissions: manifests[i].permissions || [],
+          skills: manifests[i].skills || "",
+        });
+      }
+      return tools;
+    },
+    snapshot: function (toolId) {
+      return config.control(config.userId, config.mateId, toolId, "snapshot", {});
+    },
+    act: function (toolId, actionId, args) {
+      return config.control(config.userId, config.mateId, toolId, "act", { actionId: actionId, args: args });
+    },
+    set: function (toolId, controlId, value) {
+      return config.control(config.userId, config.mateId, toolId, "set", { controlId: controlId, value: value });
+    },
+    source: function (toolId) {
+      return config.source(config.userId, toolId);
+    },
+    install: function (input) {
+      return config.install(config.userId, input);
+    },
+    update: function (toolId, input) {
+      return config.update(config.userId, toolId, input);
+    },
+    uninstall: function (toolId) {
+      return config.remove(config.userId, toolId);
+    },
+  };
+  return adapter.createToolServer({
+    name: "clay-tools",
+    version: "1.0.0",
+    tools: toolControlMcp.getToolDefs(handlers),
+  });
+}
+
 // --- Context Sources persistence ---
 var _ctxSrcConfig = require("./config");
 var _ctxSrcDir = path.join(_ctxSrcConfig.CONFIG_DIR, "context-sources");
@@ -73,26 +135,7 @@ function saveContextSources(slug, sessionId, activeIds) {
 // Validate environment variable string (KEY=VALUE per line)
 // Returns null if valid, or an error string if invalid
 function validateEnvString(str) {
-  if (!str || !str.trim()) return null;
-  var lines = str.split("\n");
-  for (var i = 0; i < lines.length; i++) {
-    var line = lines[i].trim();
-    if (!line || line.charAt(0) === "#") continue;
-    // Must be KEY=VALUE format
-    var eqIdx = line.indexOf("=");
-    if (eqIdx < 1) return "Invalid format at line " + (i + 1) + ": expected KEY=VALUE";
-    var key = line.substring(0, eqIdx);
-    // Key must be valid env var name (no shell metacharacters)
-    if (!/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(key)) {
-      return "Invalid variable name at line " + (i + 1) + ": " + key;
-    }
-    // Value must not contain shell injection characters
-    var value = line.substring(eqIdx + 1);
-    if (/[`$\\;|&><(){}\n]/.test(value) && !/^["'].*["']$/.test(value)) {
-      return "Potentially unsafe value at line " + (i + 1) + ": shell metacharacters detected";
-    }
-  }
-  return null;
+  return runtimeEnv.validateEnvString(str);
 }
 
 // YOKE adapter (replaces direct SDK access)
@@ -153,8 +196,6 @@ function createProjectContext(opts) {
   var lanHost = opts.lanHost || null;
   var getProjectCount = opts.getProjectCount || function () { return 1; };
   var getProjectList = opts.getProjectList || function () { return []; };
-  var getAllProjectSessions = opts.getAllProjectSessions || function () { return []; };
-  var getAllProjectsWithSessions = opts.getAllProjectsWithSessions || function () { return []; };
   var isHostAgent = !!opts.isHostAgent;
   var getHubSchedules = opts.getHubSchedules || function () { return []; };
   var moveScheduleToProject = opts.moveScheduleToProject || function () { return { ok: false, error: "Not supported" }; };
@@ -168,6 +209,23 @@ function createProjectContext(opts) {
   var projectOwnerId = opts.projectOwnerId || null;
   var worktreeMeta = opts.worktreeMeta || null; // { parentSlug, branch, external }
   var isMate = opts.isMate || false;
+  var mateId = opts.mateId || (isMate ? path.basename(cwd) : null);
+  var listControllableTools = opts.listControllableTools || function () { return []; };
+  var controlToolForMate = opts.controlToolForMate || function () {
+    return Promise.reject(new Error("Tool control is unavailable."));
+  };
+  var installToolForMate = opts.installToolForMate || function () {
+    return Promise.reject(new Error("Tool installation is unavailable."));
+  };
+  var sourceToolForMate = opts.sourceToolForMate || function () {
+    return Promise.reject(new Error("Capsule source access is unavailable."));
+  };
+  var updateToolForMate = opts.updateToolForMate || function () {
+    return Promise.reject(new Error("Capsule source updates are unavailable."));
+  };
+  var removeToolForMate = opts.removeToolForMate || function () {
+    return Promise.reject(new Error("Tool removal is unavailable."));
+  };
   var onCreateWorktree = opts.onCreateWorktree || null;
   var serverPort = opts.port || 2633;
   var serverTls = opts.tls || false;
@@ -219,8 +277,7 @@ function createProjectContext(opts) {
 
   // Cache resolved OS user info to avoid repeated getent calls
   var osUserInfoCache = {};
-  function getOsUserInfoForWs(ws) {
-    var linuxUser = getLinuxUserForWs(ws);
+  function getOsUserInfoForLinuxUser(linuxUser) {
     if (!linuxUser) return null;
     if (osUserInfoCache[linuxUser]) return osUserInfoCache[linuxUser];
     try {
@@ -233,23 +290,34 @@ function createProjectContext(opts) {
     }
   }
 
+  function getOsUserInfoForWs(ws) {
+    var linuxUser = getLinuxUserForWs(ws);
+    return getOsUserInfoForLinuxUser(linuxUser);
+  }
+
   function getOsUserInfoForReq(req) {
     if (!osUsers) return null;
     if (!req._clayUser || !req._clayUser.linuxUser) return null;
     var linuxUser = req._clayUser.linuxUser;
-    if (osUserInfoCache[linuxUser]) return osUserInfoCache[linuxUser];
-    try {
-      var info = resolveOsUserInfo(linuxUser);
-      osUserInfoCache[linuxUser] = info;
-      return info;
-    } catch (e) {
-      console.error("[project] Failed to resolve OS user info for " + linuxUser + ":", e.message);
-      return null;
-    }
+    return getOsUserInfoForLinuxUser(linuxUser);
+  }
+
+  function getRuntimeEnvForSession(session) {
+    var linuxUser = (session && session.linuxUser) || getLinuxUserForSession(session);
+    var osUserInfo = getOsUserInfoForLinuxUser(linuxUser);
+    var baseEnv = osUserInfo ? buildUserEnv(osUserInfo) : process.env;
+    var shared = typeof opts.onGetSharedEnv === "function" ? opts.onGetSharedEnv() : null;
+    var projectEnv = typeof opts.onGetProjectEnv === "function" ? opts.onGetProjectEnv(slug) : null;
+    return runtimeEnv.resolveRuntimeEnv({
+      baseEnv: baseEnv,
+      sharedEnvrc: shared && shared.envrc,
+      projectEnvrc: projectEnv && projectEnv.envrc,
+    });
   }
 
   // --- Per-project clients ---
   var clients = new Set();
+  var homeDebateClients = new Set();
 
   // --- Browser extension state (shared mutable object) ---
   var _extToken = crypto.randomUUID(); // Auth token for MCP server bridge
@@ -369,6 +437,10 @@ function createProjectContext(opts) {
         ws.send(data);
       }
     }
+    homeDebateClients.forEach(function (ws) {
+      if (ws.readyState !== 1) { homeDebateClients.delete(ws); return; }
+      if (!clients.has(ws) && ws._clayHomeDebateSlug === slug && ws._clayActiveSession === sessionId) ws.send(data);
+    });
   }
 
   function sendToSessionOthers(sender, sessionId, obj) {
@@ -537,6 +609,41 @@ function createProjectContext(opts) {
     },
     fsAsUser: fsAsUser,
   });
+  var _capsuleCatalog = attachCapsuleCatalog({
+    isMate: isMate,
+    listManifests: listControllableTools,
+    getUserId: function (session) {
+      return (session && session.ownerId) || projectOwnerId || "default";
+    },
+    getSdk: function () { return sdk; },
+    getSessions: function () { return sm.sessions; },
+  });
+  var _workspaceQuery = attachProjectWorkspaceQuery({
+    service: opts.workspaceQueryService || null,
+    sm: sm,
+    projectSlug: slug,
+    getProjectOwnerId: function () { return projectOwnerId; },
+    isMate: isMate,
+    mateId: mateId,
+  });
+  var _projectLogs = attachProjectLogs({
+    service: opts.projectLogsService || null,
+    sm: sm,
+    projectSlug: slug,
+    getProjectOwnerId: function () { return projectOwnerId; },
+    isMate: isMate,
+    mateId: mateId,
+    sendTo: sendTo,
+    getClients: function () { return clients; },
+  });
+  var _mateKnowledge = attachProjectMateKnowledge({
+    service: opts.mateKnowledgeService || null,
+    sm: sm,
+    projectSlug: slug,
+    getProjectOwnerId: function () { return projectOwnerId; },
+    isMate: isMate,
+    mateId: mateId,
+  });
 
   // The SDK bridge is created after local MCP servers. Session spawning uses
   // a getter so tool handlers see the initialized bridge when they run.
@@ -587,15 +694,46 @@ function createProjectContext(opts) {
   var _debateProposal = attachDebateProposal({
     cwd: cwd,
     isMate: isMate,
+    isHostAgent: isHostAgent,
     sendTo: sendTo,
     buildMateCtx: matesModule.buildMateCtx,
     getMate: matesModule.getMate,
     getProjectOwnerId: function () { return projectOwnerId; },
+    getVendorModelCatalog: function (ws, vendor) { return _models.getVendorCatalog(ws, vendor); },
+    getVendorModelCatalogForSession: function (session, vendor) {
+      var user = session && session.ownerId ? usersModule.findUserById(session.ownerId) : null;
+      return _models.getVendorCatalog({ _clayUser: user || null }, vendor);
+    },
     startDebate: function (session, briefData, moderatorId, ws) {
       if (!_debate) return { error: "The debate engine is unavailable." };
       return _debate.handleMcpDebateApproval(session, briefData, moderatorId, ws);
     },
+    recordSessionEvent: function (session, event) { sm.sendAndRecord(session, event); },
   });
+  var _mateCreationProposal = attachMateCreationProposal({
+    isMate: isMate,
+    isHostAgent: isHostAgent,
+    isMultiUser: usersModule.isMultiUser,
+    getProjectOwnerId: function () { return projectOwnerId; },
+    recordSessionEvent: function (session, event) { sm.sendAndRecord(session, event); },
+    getVendorModelCatalog: function (ws, vendor) { return _models.getVendorCatalog(ws, vendor); },
+    createReadyMate: opts.createReadyMate,
+  });
+  var _askUser = attachAskUser({ record: function (session, event) { sm.sendAndRecord(session, event); } });
+
+  function createToolControlMcpServer() {
+    if (!isMate || !adapter || typeof adapter.createToolServer !== "function") return null;
+    return createMateToolControlMcp(adapter, {
+      userId: projectOwnerId || "default",
+      mateId: path.basename(cwd),
+      list: listControllableTools,
+      control: controlToolForMate,
+      source: sourceToolForMate,
+      install: installToolForMate,
+      update: updateToolForMate,
+      remove: removeToolForMate,
+    });
+  }
 
   // --- MCP tool servers (created via YOKE adapter) ---
   var mcpServers = (function () {
@@ -621,6 +759,27 @@ function createProjectContext(opts) {
       }
     }
 
+    // Project Logs. Project sessions get the project-scoped set; Mate projects
+    // get the read-only cross-project set only when the Mate registry confirms
+    // authoritative builtin Clay.
+    try {
+      var projectLogsMcpConfig = _projectLogs.createMcpServer(adapter, null);
+      if (projectLogsMcpConfig) servers[projectLogsMcpConfig.name || "clay-logs"] = projectLogsMcpConfig;
+    } catch (e) {
+      console.error("[project] Failed to create clay-logs MCP server:", e.message);
+    }
+
+    // Mate Knowledge. Mate projects only; the registry decides whether this is
+    // one Mate's own scope or authoritative Clay's cross-Mate read view.
+    if (isMate) {
+      try {
+        var mateKnowledgeMcpConfig = _mateKnowledge.createMcpServer(adapter, null);
+        if (mateKnowledgeMcpConfig) servers[mateKnowledgeMcpConfig.name || "clay-knowledge"] = mateKnowledgeMcpConfig;
+      } catch (e) {
+        console.error("[project] Failed to create clay-knowledge MCP server:", e.message);
+      }
+    }
+
     // Session-bound access to the source of a handoff (main projects only).
     if (!isMate) {
       try {
@@ -649,77 +808,39 @@ function createProjectContext(opts) {
       console.error("[project] Failed to create debate MCP server:", e.message);
     }
 
-    // Clay-history MCP server (host agent only — Clay mate)
-    // Gives Clay BM25 search + targeted reads across the user's full
-    // workspace. Read-only. Other Mates and project sessions never see
-    // these tools because the gate is the isHostAgent project flag.
-    if (isHostAgent) {
+    if (isMate && isHostAgent) {
       try {
-        var clayHistoryMcp = require("./clay-history-mcp-server");
-        var clayHistoryToolDefs = clayHistoryMcp.getToolDefs({
-          getAllProjectsWithSessions: getAllProjectsWithSessions,
-        });
-        var clayHistoryMcpConfig = adapter.createToolServer({ name: "clay-history", version: "1.0.0", tools: clayHistoryToolDefs });
-        if (clayHistoryMcpConfig) servers[clayHistoryMcpConfig.name || "clay-history"] = clayHistoryMcpConfig;
+        var mateCreationMcpConfig = _mateCreationProposal.createMcpServer(adapter, null);
+        if (mateCreationMcpConfig) servers[mateCreationMcpConfig.name || "clay-mate-creation"] = mateCreationMcpConfig;
       } catch (e) {
-        console.error("[project] Failed to create clay-history MCP server:", e.message);
+        console.error("[project] Failed to create Mate creation MCP server:", e.message);
       }
     }
 
-    // Ask-user MCP server (mates only)
+    // Owner-bound workspace inspection is available only inside Mate
+    // projects. The server-side Mate registry decides whether the wider
+    // builtin Clay tools are present; project flags and tool arguments do not.
     if (isMate) {
       try {
-        var askUserMcp = require("./ask-user-mcp-server");
-        var askUserToolDefs = askUserMcp.getToolDefs(function onAsk(input) {
-          // Stateless: the tool's job is to *post* the question card.
-          // We do NOT hold a promise open waiting for the user. When the
-          // user answers, the answer is injected as a fresh user message
-          // on the next turn (see project-sessions.js ask_user_response).
-          // This avoids HTTP long-poll timeouts on the MCP bridge and
-          // matches the natural multi-turn agent loop.
-          var session = sm.getActiveSession();
-          if (!session) {
-            // No active session means we have no way to show a card or
-            // route the answer. Fail closed rather than pretend success.
-            return Promise.resolve({
-              content: [{ type: "text", text: "Error: no active session in " + slug + "; cannot display question card." }],
-              isError: true,
-            });
-          }
-          if (session.loop && session.loop.active && session.loop.role !== "crafting") {
-            return Promise.resolve({
-              content: [{ type: "text", text: "Error: Autonomous mode. Make your own decision." }],
-              isError: true,
-            });
-          }
+        var workspaceMcpConfig = _workspaceQuery.createMcpServer(adapter, null);
+        if (workspaceMcpConfig) servers[workspaceMcpConfig.name || "clay-workspace"] = workspaceMcpConfig;
+      } catch (e) {
+        console.error("[project] Failed to create clay-workspace MCP server:", e.message);
+      }
+      try {
+        var clayHistoryMcpConfig = _workspaceQuery.createHistoryMcpServer(adapter, null);
+        if (clayHistoryMcpConfig) servers[clayHistoryMcpConfig.name || "clay-history"] = clayHistoryMcpConfig;
+      } catch (e) {
+        console.error("[project] Failed to create Clay history compatibility server:", e.message);
+      }
+    }
 
-          var toolId = "ask_" + Date.now() + "_" + crypto.randomUUID().slice(0, 8);
-          // Track for UI card lifecycle + answer routing. No resolve function.
-          session.pendingAskUser[toolId] = {
-            input: input,
-            mode: "mcp",
-            sessionId: session.localId,
-            postedAt: Date.now(),
-          };
-
-          sm.sendAndRecord(session, {
-            type: "tool_executing",
-            id: toolId,
-            name: "AskUserQuestion",
-            input: input,
-          });
-
-          return Promise.resolve({
-            content: [{
-              type: "text",
-              text: "The question card has been posted to the user. End this turn now without further commentary; the user's answer will arrive as the next user message, prefixed with \"[Answer to your AskUserQuestion]\" so you can recognize it.",
-            }],
-          });
-        });
-        var askUserMcpConfig = adapter.createToolServer({ name: "clay-ask-user", version: "1.0.0", tools: askUserToolDefs });
-        if (askUserMcpConfig) servers[askUserMcpConfig.name || "clay-ask-user"] = askUserMcpConfig;
+    if (isMate) {
+      try {
+        var toolControlMcpConfig = createToolControlMcpServer();
+        if (toolControlMcpConfig) servers[toolControlMcpConfig.name || "clay-tools"] = toolControlMcpConfig;
       } catch (e) {
-        console.error("[project] Failed to create ask-user MCP server:", e.message);
+        console.error("[project] Failed to create clay-tools MCP server:", e.message);
       }
     }
 
@@ -805,6 +926,51 @@ function createProjectContext(opts) {
       var name = keys[i];
       if (name === "clay-browser" && !extConnected) continue;
       if (name === "clay-email" && !emailAvailable) continue;
+      if (name === "clay-workspace" && forSession) {
+        try {
+          var boundWorkspace = _workspaceQuery.createMcpServer(adapter, forSession);
+          if (boundWorkspace) { filtered[name] = boundWorkspace; hasAny = true; }
+        } catch (e) {
+          console.error("[project] Failed to bind clay-workspace MCP server:", e.message);
+        }
+        continue;
+      }
+      if (name === "clay-history" && forSession) {
+        try {
+          var boundHistory = _workspaceQuery.createHistoryMcpServer(adapter, forSession);
+          if (boundHistory) { filtered[name] = boundHistory; hasAny = true; }
+        } catch (e) {
+          console.error("[project] Failed to bind Clay history compatibility server:", e.message);
+        }
+        continue;
+      }
+      if (name === "clay-logs" && forSession) {
+        try {
+          var boundLogs = _projectLogs.createMcpServer(adapter, forSession);
+          if (boundLogs) { filtered[name] = boundLogs; hasAny = true; }
+        } catch (e) {
+          console.error("[project] Failed to bind clay-logs MCP server:", e.message);
+        }
+        continue;
+      }
+      if (name === "clay-knowledge" && forSession) {
+        try {
+          var boundKnowledge = _mateKnowledge.createMcpServer(adapter, forSession);
+          if (boundKnowledge) { filtered[name] = boundKnowledge; hasAny = true; }
+        } catch (e) {
+          console.error("[project] Failed to bind clay-knowledge MCP server:", e.message);
+        }
+        continue;
+      }
+      if (name === "clay-tools" && forSession) {
+        try {
+          var boundToolControl = createToolControlMcpServer();
+          if (boundToolControl) { filtered[name] = boundToolControl; hasAny = true; }
+        } catch (e) {
+          console.error("[project] Failed to bind clay-tools MCP server:", e.message);
+        }
+        continue;
+      }
       if (name === "clay-sessions" && forSession) {
         try {
           var boundSpawn = _sessionSpawn.createMcpServer(adapter, forSession);
@@ -850,6 +1016,15 @@ function createProjectContext(opts) {
         }
         continue;
       }
+      if (name === "clay-mate-creation" && forSession) {
+        try {
+          var boundMateCreation = _mateCreationProposal.createMcpServer(adapter, forSession);
+          if (boundMateCreation) { filtered[name] = boundMateCreation; hasAny = true; }
+        } catch (e) {
+          console.error("[project] Failed to bind Mate creation MCP server:", e.message);
+        }
+        continue;
+      }
       filtered[name] = mcpServers[name];
       hasAny = true;
     }
@@ -866,6 +1041,7 @@ function createProjectContext(opts) {
     adapter: adapter,
     adapters: adapters,
     getNotificationsModule: function () { return _notifications; },
+    shouldSuppressResponseNotification: opts.shouldSuppressResponseNotification,
     mateDisplayName: opts.mateDisplayName || "",
     isMate: isMate,
     osUsers: osUsers,
@@ -879,6 +1055,7 @@ function createProjectContext(opts) {
     onTurnDone: function (session, preview) {
       if (isMate) digestDmTurn(session, preview);
       else _sessionPair.handleTurnDone(session);
+      if (session && typeof session.onTurnDone === "function") session.onTurnDone(session, preview);
     },
     scheduleMessage: function (session, text, resetsAt) {
       scheduleMessage(session, text, resetsAt);
@@ -902,13 +1079,26 @@ function createProjectContext(opts) {
         _sessionNotes.getSystemPrompt(session),
         _sessionHandoff.getSystemPrompt(session),
         _sessionDocument.getSystemPrompt(session),
+        _capsuleCatalog.getSystemPrompt(session),
+        _projectLogs.getSystemPrompt(session),
+        _mateKnowledge.getSystemPrompt(session),
       ]);
     },
+    getRuntimeEnv: getRuntimeEnvForSession,
+    onUserInputRequest: function (session, request, respond) {
+      return _askUser.createHandler(session)(request, respond);
+    },
     getSessionToolDefs: function (session) {
       return _sessionPair.getToolDefs(session)
         .concat(_sessionNotes.getToolDefs(session))
         .concat(_sessionHandoff.getToolDefs(session))
-        .concat(_sessionDocument.getToolDefs(session));
+        .concat(_sessionDocument.getToolDefs(session))
+        .concat(_debateProposal.getToolDefs(session))
+        .concat(_mateCreationProposal.getToolDefs(session))
+        .concat(_workspaceQuery.getDynamicToolDefs(session))
+        .concat(_workspaceQuery.getHistoryDynamicToolDefs(session))
+        .concat(_projectLogs.getDynamicToolDefs(session))
+        .concat(_mateKnowledge.getDynamicToolDefs(session));
     },
   });
 
@@ -1042,6 +1232,17 @@ function createProjectContext(opts) {
   }
 
   function handleMessage(ws, msg) {
+    // --- Keep-alive (delegated to project-connection.js) ---
+    // Answered before any routing so a ping can never be forwarded elsewhere.
+    // _connection is assigned later in this factory than the other modules, so
+    // the reference is guarded rather than assumed.
+    if (_connection && _connection.handleKeepaliveMessage(ws, msg)) return;
+
+    if (ws._clayHomeDebateSlug && ws._clayHomeDebateSlug !== slug && /^debate_(hand_raise|comment|stop|conclude_response|user_floor_response)$/.test(msg.type || "") && opts.getProject) {
+      var homeDebateCtx = opts.getProject(ws._clayHomeDebateSlug);
+      if (homeDebateCtx) homeDebateCtx.handleMessage(ws, msg);
+      return;
+    }
     // --- Cross-project routing (e.g. permission_response from notification banner) ---
     if (msg.targetSlug && msg.targetSlug !== slug && opts.getProject) {
       var targetCtx = opts.getProject(msg.targetSlug);
@@ -1052,9 +1253,17 @@ function createProjectContext(opts) {
     }
 
     // --- DM messages (delegated to server-level handler) ---
-    if (msg.type === "dm_open" || msg.type === "dm_send" || msg.type === "dm_list" || msg.type === "dm_typing" || msg.type === "dm_add_favorite" || msg.type === "dm_remove_favorite" || msg.type === "mate_create" || msg.type === "mate_list" || msg.type === "mate_delete" || msg.type === "mate_update" || msg.type === "mate_readd_builtin" || msg.type === "mate_list_available_builtins" || msg.type === "email_accounts_list" || msg.type === "email_account_add" || msg.type === "email_account_remove" || msg.type === "email_account_test" || msg.type === "home_clay_open" || msg.type === "home_clay_send" || msg.type === "home_clay_new_session" || msg.type === "home_clay_close") {
+    if (msg.type === "home_debate_question_response" || msg.type === "home_debate_control" || msg.type === "home_mate_creation_question_response") {
+      if (typeof opts.onDmMessage === "function") opts.onDmMessage(ws, msg);
+      return;
+    }
+    if (msg.type === "home_clay_ask" || msg.type === "home_clay_session_resolve") {
+      if (typeof opts.onDmMessage === "function") opts.onDmMessage(ws, msg, slug);
+      return;
+    }
+    if (msg.type === "project_assignment_response" || msg.type === "dm_open" || msg.type === "dm_send" || msg.type === "dm_list" || msg.type === "dm_typing" || msg.type === "dm_add_favorite" || msg.type === "dm_remove_favorite" || msg.type === "mate_create" || msg.type === "mate_list" || msg.type === "mate_delete" || msg.type === "mate_update" || msg.type === "mate_readd_builtin" || msg.type === "mate_list_available_builtins" || msg.type === "email_accounts_list" || msg.type === "email_account_add" || msg.type === "email_account_remove" || msg.type === "email_account_test" || msg.type === "home_debates_list" || msg.type === "home_mate_present" || msg.type === "home_mate_open" || msg.type === "home_mate_sessions_list" || msg.type === "home_mate_session_open" || msg.type === "home_mate_send" || msg.type === "home_mate_new_session" || msg.type === "home_mate_debate_plan" || msg.type === "home_debate_proposal_response" || msg.type === "home_mate_creation_plan" || msg.type === "home_mate_creation_proposal_response" || msg.type === "home_mate_close" || msg.type === "home_mate_memory_list" || msg.type === "home_mate_knowledge_list" || msg.type === "home_mate_models_get" || msg.type === "home_mate_model_set" || msg.type === "home_dock_get" || msg.type === "home_dock_set" || msg.type === "home_surface_get" || msg.type === "home_surface_set" || msg.type === "tools_list" || msg.type === "tool_get" || msg.type === "tool_install" || msg.type === "tool_remove" || msg.type === "tool_storage_op" || msg.type === "tool_llm_op" || msg.type === "tool_llm_config_get" || msg.type === "tool_control_response" || msg.type === "tool_source_get" || msg.type === "tool_mate_access_set") {
       if (typeof opts.onDmMessage === "function") {
-        opts.onDmMessage(ws, msg);
+        opts.onDmMessage(ws, msg, slug);
       }
       return;
     }
@@ -1126,6 +1335,9 @@ function createProjectContext(opts) {
     // --- Knowledge file management (delegated to project-knowledge.js) ---
     if (_knowledge.handleKnowledgeMessage(ws, msg)) return;
 
+    // --- Project Logs (delegated to project-logs.js) ---
+    if (_projectLogs.handleLogsMessage(ws, msg)) return;
+
     // --- Notifications (delegated to project-notifications.js) ---
     if (_notifications.handleNotificationMessage(ws, msg)) return;
 
@@ -1147,6 +1359,9 @@ function createProjectContext(opts) {
     // --- Shell command context ---
     if (_shellCommand.handleShellCommand(ws, msg)) return;
 
+    // --- Vendor login flow (delegated to project-vendor-login.js) ---
+    if (_vendorLogin.handleVendorLoginMessage(ws, msg)) return;
+
     // --- Notes, terminals, context, user message (delegated to project-user-message.js) ---
     if (_userMessage.handleUserMessage(ws, msg)) return;
   }
@@ -1165,7 +1380,12 @@ function createProjectContext(opts) {
     sendTo: sendTo,
     matesModule: matesModule,
     sessionSearch: sessionSearch,
-    getAllProjectSessions: getAllProjectSessions,
+    getWorkspaceMemorySessions: function () { return _workspaceQuery.getMemorySessions(true); },
+    getOwnedCurrentSessions: function () {
+      return _workspaceQuery.getMemorySessions(false).filter(function (session) {
+        return session._projectSlug === slug;
+      });
+    },
     projectOwnerId: projectOwnerId,
     handleMessage: handleMessage,
   });
@@ -1246,6 +1466,8 @@ function createProjectContext(opts) {
     getSessionForWs: getSessionForWs,
     updateMemorySummary: updateMemorySummary,
     initMemorySummary: initMemorySummary,
+    registerHomeDebateClient: function (ws) { if (ws) homeDebateClients.add(ws); },
+    unregisterHomeDebateClient: function (ws) { homeDebateClients.delete(ws); },
   });
   var handleDebateStart = _debate.handleDebateStart;
   var handleDebateHandRaise = _debate.handleDebateHandRaise;
@@ -1294,6 +1516,11 @@ function createProjectContext(opts) {
       browserState._extensionId = null;
       if (_mcp) _mcp.handleExtensionDisconnect();
     }
+    homeDebateClients.delete(ws);
+    if (ws._clayHomeDebateSlug && ws._clayHomeDebateSlug !== slug && opts.getProject) {
+      var debateProject = opts.getProject(ws._clayHomeDebateSlug);
+      if (debateProject && typeof debateProject.unregisterHomeDebateClient === "function") debateProject.unregisterHomeDebateClient(ws);
+    }
     _connection.handleDisconnection(ws);
   }
 
@@ -1317,6 +1544,7 @@ function createProjectContext(opts) {
     sendToSessionOthers: sendToSessionOthers,
     opts: opts,
     usersModule: usersModule,
+    getProjectAccess: opts.getProjectAccess || function () { return { visibility: "public", ownerId: projectOwnerId || null }; },
     userPresence: userPresence,
     matesModule: matesModule,
     pushModule: pushModule,
@@ -1365,6 +1593,28 @@ function createProjectContext(opts) {
     serverTls: serverTls,
     serverAuthToken: serverAuthToken,
   });
+  var _delegatedSession = attachDelegatedSession({
+    sm: sm,
+    getSdk: function () { return sdk; },
+    getLinuxUserForSession: getLinuxUserForSession,
+    resolveModel: function (principal) {
+      var user = principal && principal.userId ? usersModule.findUserById(principal.userId) : null;
+      return _models.resolveConfiguredModel({ _clayUser: user || null }, "standard");
+    },
+  });
+  var _delegatedFollowUp = attachDelegatedFollowUp({
+    sm: sm,
+    getSdk: function () { return sdk; },
+    getLinuxUserForSession: getLinuxUserForSession,
+    onProcessingChanged: onProcessingChanged,
+    isMultiUser: function () { return usersModule.isMultiUser(); },
+    sessionRef: function (session) { return workspaceSessionRef(slug, session); },
+    isPairedSession: function (session) { return !!_splitGroups.store.groupForMember(session.localId); },
+    canResumeVendor: function (vendor) {
+      var capabilities = sm.capabilitiesByVendor && sm.capabilitiesByVendor[vendor];
+      return !!(capabilities && capabilities.sessionResume === true);
+    },
+  });
 
   // --- User message handler (delegated to project-user-message.js) ---
   var _userMessage = attachUserMessage({
@@ -1419,6 +1669,22 @@ function createProjectContext(opts) {
     getOsUserInfoForWs: getOsUserInfoForWs,
   });
 
+  // --- Vendor login flow (delegated to project-vendor-login.js) ---
+  var _vendorLogin = attachVendorLogin({
+    slug: slug,
+    osUsers: osUsers,
+    sm: sm,
+    tm: tm,
+    adapters: adapters,
+    send: send,
+    sendTo: sendTo,
+    usersModule: usersModule,
+    getOsUserInfoForWs: getOsUserInfoForWs,
+    getOsUserInfoForLinuxUser: getOsUserInfoForLinuxUser,
+    getLinuxUserForSession: getLinuxUserForSession,
+    refreshVendorAuthEverywhere: opts.refreshVendorAuthEverywhere,
+  });
+
   // --- Filesystem handler (delegated to project-filesystem.js) ---
   var _filesystem = attachFilesystem({
     cwd: cwd,
@@ -1436,6 +1702,7 @@ function createProjectContext(opts) {
     usersModule: usersModule,
     fsAsUser: fsAsUser,
     validateEnvString: validateEnvString,
+    onEnvironmentChanged: function () { return sdk.refreshEnvironmentRuntime(); },
     opts: opts,
     IGNORED_DIRS: IGNORED_DIRS,
     BINARY_EXTS: BINARY_EXTS,
@@ -1531,6 +1798,18 @@ function createProjectContext(opts) {
               inputSchema: normalizeToolSchema(documentTools[dti].inputSchema),
             });
           }
+          var debateTools = _debateProposal.getBridgeTools(boundSession, normalizeToolSchema);
+          for (var dbti = 0; dbti < debateTools.length; dbti++) tools.push(debateTools[dbti]);
+          var mateCreationTools = _mateCreationProposal.getBridgeTools(boundSession, normalizeToolSchema);
+          for (var mcti = 0; mcti < mateCreationTools.length; mcti++) tools.push(mateCreationTools[mcti]);
+          var workspaceTools = _workspaceQuery.getBridgeTools(boundSession, normalizeToolSchema);
+          for (var wqti = 0; wqti < workspaceTools.length; wqti++) tools.push(workspaceTools[wqti]);
+          var historyTools = _workspaceQuery.getHistoryBridgeTools(boundSession, normalizeToolSchema);
+          for (var cht = 0; cht < historyTools.length; cht++) tools.push(historyTools[cht]);
+          var logsTools = _projectLogs.getBridgeTools(boundSession, normalizeToolSchema);
+          for (var plti = 0; plti < logsTools.length; plti++) tools.push(logsTools[plti]);
+          var knowledgeTools = _mateKnowledge.getBridgeTools(boundSession, normalizeToolSchema);
+          for (var mkti = 0; mkti < knowledgeTools.length; mkti++) tools.push(knowledgeTools[mkti]);
         }
 
         if (sessionOnly) return Promise.resolve(tools);
@@ -1543,6 +1822,10 @@ function createProjectContext(opts) {
           var inAppNames = Object.keys(localMcp);
           for (var i = 0; i < inAppNames.length; i++) {
             if (inAppNames[i] === "clay-sessions" || inAppNames[i] === "clay-notes" || inAppNames[i] === "clay-handoff" || inAppNames[i] === "clay-documents") continue;
+            // Debate tools were added above only when this request had an
+            // exact session. Never duplicate them or advertise the static,
+            // intentionally unbound proposal server.
+            if (inAppNames[i] === "clay-debate" || inAppNames[i] === "clay-mate-creation" || inAppNames[i] === "clay-workspace" || inAppNames[i] === "clay-history" || inAppNames[i] === "clay-logs" || inAppNames[i] === "clay-knowledge") continue;
             extractServerTools(inAppNames[i], localMcp[inAppNames[i]]);
           }
         }
@@ -1593,7 +1876,25 @@ function createProjectContext(opts) {
             }
           }
         }
-        if (serverName === "clay-sessions" || serverName === "clay-notes" || serverName === "clay-handoff" || serverName === "clay-documents") {
+        if (boundSession && serverName === "clay-debate") {
+          return _debateProposal.callBridgeTool(boundSession, toolName, args);
+        }
+        if (boundSession && serverName === "clay-mate-creation") {
+          return _mateCreationProposal.callBridgeTool(boundSession, toolName, args);
+        }
+        if (boundSession && serverName === "clay-workspace") {
+          return _workspaceQuery.callBridgeTool(boundSession, toolName, args);
+        }
+        if (boundSession && serverName === "clay-history") {
+          return _workspaceQuery.callHistoryBridgeTool(boundSession, toolName, args);
+        }
+        if (boundSession && serverName === "clay-logs") {
+          return _projectLogs.callBridgeTool(boundSession, toolName, args);
+        }
+        if (boundSession && serverName === "clay-knowledge") {
+          return _mateKnowledge.callBridgeTool(boundSession, toolName, args);
+        }
+        if (serverName === "clay-sessions" || serverName === "clay-notes" || serverName === "clay-handoff" || serverName === "clay-documents" || serverName === "clay-debate" || serverName === "clay-mate-creation" || serverName === "clay-workspace" || serverName === "clay-history" || serverName === "clay-logs" || serverName === "clay-knowledge") {
           return Promise.reject(new Error("Session-bound tool requires a valid Clay session: " + serverName + "/" + toolName));
         }
         if (sessionOnly) return Promise.reject(new Error("Session tool not found: " + serverName + "/" + toolName));
@@ -1667,6 +1968,7 @@ function createProjectContext(opts) {
     _mcp: _mcp,
     _notifications: _notifications,
     _splitGroups: _splitGroups,
+    _vendorLogin: _vendorLogin,
     resolveSessionForView: _sessions.resolveSessionForView,
     hydrateImageRefs: hydrateImageRefs,
     broadcastClientCount: broadcastClientCount,
@@ -1807,7 +2109,7 @@ function createProjectContext(opts) {
     };
     if (isMate) {
       status.isMate = true;
-      status.mateId = path.basename(cwd);
+      status.mateId = mateId;
     }
     if (worktreeMeta) {
       status.isWorktree = true;
@@ -1908,7 +2210,21 @@ function createProjectContext(opts) {
     getMcpBridgeHandler: getMcpBridgeHandler,
     getStatus: getStatus,
     getSessionManager: function () { return sm; },
+    createDelegatedSession: _delegatedSession.createDelegatedSession,
+    inspectDelegatedFollowUp: _delegatedFollowUp.inspectDelegatedFollowUp,
+    dispatchDelegatedFollowUp: _delegatedFollowUp.dispatchDelegatedFollowUp,
+    unregisterHomeDebateClient: function (ws) { homeDebateClients.delete(ws); },
+    handleHomeDebateProposalResponse: function (ws, msg, session) { return _debateProposal.handleHomeMessage(ws, msg, session); },
+    handleHomeMateCreationProposalResponse: function (ws, msg, session) { return _mateCreationProposal.handleHomeMessage(ws, msg, session); },
+    handleHomeAskUserResponse: function (msg, session) { return _sessions.respondToAskUser(session, msg); },
+    handleHomeDebateControl: function (ws, msg, session) { return _debate.handleHomeControl(ws, msg, session); },
+    getVendorModelCatalog: _models.getVendorCatalog,
+    getVendorModelAvailability: _models.getVendorAvailability,
+    getMemoryState: _memory.readMemoryState,
+    listKnowledgeFiles: _knowledge.listKnowledgeFiles,
+    refreshCapsuleCatalog: _capsuleCatalog.refreshSessions,
     getNotificationsModule: function () { return _notifications; },
+    refreshVendorAuth: _vendorLogin.refreshVendorAuth,
     getSchedules: _loop.getSchedules,
     importSchedule: _loop.importSchedule,
     removeSchedule: _loop.removeSchedule,
@@ -1916,6 +2232,21 @@ function createProjectContext(opts) {
     setIcon: setIcon,
     setProjectOwner: function (ownerId) { projectOwnerId = ownerId; },
     getProjectOwner: function () { return projectOwnerId; },
+    getToolLlmConfig: function (ws, alias) {
+      return _models.resolveConfiguredModel(ws, alias);
+    },
+    completeToolLlm: async function (ws, args) {
+      var owner = projectOwnerId ? usersModule.findUserById(projectOwnerId) : null;
+      var selection = await _models.resolveConfiguredModel(ws, args.model);
+      return toolLlm.complete({
+        adapters: adapters,
+        cwd: cwd,
+        linuxUser: owner && owner.linuxUser ? owner.linuxUser : null,
+        args: args,
+        selection: selection,
+        timeoutMs: 60000,
+      });
+    },
     refreshUserProfile: function (userId) {
       var user = usersModule.findUserById(userId);
       if (!user) return;
@@ -1934,4 +2265,4 @@ function createProjectContext(opts) {
   };
 }
 
-module.exports = { createProjectContext: createProjectContext, safePath: safePath, validateEnvString: validateEnvString };
+module.exports = { createProjectContext: createProjectContext, createMateToolControlMcp: createMateToolControlMcp, safePath: safePath, validateEnvString: validateEnvString };