clay-server 5.2.0-beta.1 → 5.2.0-beta.11

package/lib/project.js

@@ -46,6 +46,8 @@ var { attachShellCommand } = require("./project-shell-command");
 var { attachVendorLogin } = require("./project-vendor-login");
 var { attachConnection } = require("./project-connection");
 var { attachProjectScheduledMessages } = require("./project-scheduled-messages");
+var { attachMateScheduling } = require("./mate-scheduling");
+var { attachMateScheduleLifecycle } = require("./mate-schedule-lifecycle");
 var { attachMcp } = require("./project-mcp");
 var { createSessionSkillCatalog } = require("./yoke/session-skill-catalog");
 var { attachEmail: attachEmailModule } = require("./project-email");
@@ -229,6 +231,8 @@ function createProjectContext(opts) {
   var getScheduleCount = opts.getScheduleCount || function () { return 0; };
   var notifyProcessingChanged = opts.onProcessingChanged || function () {};
   var _scheduledMessages = null;
+  var _mateScheduling = null;
+  var _mateLifecycle = null;
   var _scheduledTasks = null;
   var _scheduledTaskExecution = null;
   function onProcessingChanged() {
@@ -348,6 +352,10 @@ function createProjectContext(opts) {
   function getRuntimeEnvForSession(session) {
     var linuxUser = (session && session.linuxUser) || getLinuxUserForSession(session);
     var osUserInfo = getOsUserInfoForLinuxUser(linuxUser);
+    return resolveOwnerRuntimeEnv(osUserInfo);
+  }
+
+  function resolveOwnerRuntimeEnv(osUserInfo) {
     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;
@@ -451,7 +459,8 @@ function createProjectContext(opts) {
       if (obj.type === "loop_registry_updated") payload.records = getHubSchedules(userId);
       else payload.schedules = getHubSchedules(userId);
     }
-    ws.send(JSON.stringify(payload));
+    payload = require('./pane-session-transport').outbound(ws, payload);
+    if (payload) ws.send(JSON.stringify(payload));
   }
 
   function sendToAdmins(obj) {
@@ -543,24 +552,27 @@ function createProjectContext(opts) {
       || !!(ws._clayUser && ws._clayUser.id === session.userKnowledgeOwnerId);
   }
 
-  function sendToSession(sessionId, obj) {
-    var data = JSON.stringify(obj);
+  function sendToSession(sessionId, obj, onSent) {
+    var data = JSON.stringify(obj), delivered = 0;
     for (var ws of clients) {
       if (ws.readyState === 1 && canReceiveMate(ws) && canReceiveYou(ws, sessionId) && ws._clayActiveSession === sessionId) {
-        ws.send(data);
+        var panePayload = require('./pane-session-transport').outbound(ws, obj, sessionId);
+        if (panePayload) { ws.send(JSON.stringify(panePayload)); delivered++; if (onSent) onSent(ws); }
       }
     }
     homeDebateClients.forEach(function (ws) {
       if (ws.readyState !== 1) { homeDebateClients.delete(ws); return; }
-      if (canReceiveMate(ws) && canReceiveYou(ws, sessionId) && !clients.has(ws) && ws._clayHomeDebateSlug === slug && ws._clayActiveSession === sessionId) ws.send(data);
+      if (canReceiveMate(ws) && canReceiveYou(ws, sessionId) && !clients.has(ws) && ws._clayHomeDebateSlug === slug && ws._clayActiveSession === sessionId) { ws.send(data); delivered++; if (onSent) onSent(ws); }
     });
+    return delivered;
   }
 
   function sendToSessionOthers(sender, sessionId, obj) {
     var data = JSON.stringify(obj);
     for (var ws of clients) {
       if (ws !== sender && ws.readyState === 1 && canReceiveMate(ws) && canReceiveYou(ws, sessionId) && ws._clayActiveSession === sessionId) {
-        ws.send(data);
+        var panePayload = require('./pane-session-transport').outbound(ws, obj, sessionId);
+        if (panePayload) ws.send(JSON.stringify(panePayload));
       }
     }
   }
@@ -646,7 +658,8 @@ function createProjectContext(opts) {
           var access = opts.getProjectAccess ? opts.getProjectAccess() : { visibility: "public", ownerId: projectOwnerId || null };
           if (!viewer || (opts.canAccessProjectSlug && !opts.canAccessProjectSlug(viewer.id, slug)) || !usersModule.canAccessSession(viewer.id, session, access)) return;
         }
-        ws.send(data);
+        var panePayload = ws._clayPaneActivation ? require('./pane-session-transport').outbound(ws, message, session.localId) : message;
+        if (panePayload) ws.send(panePayload === message ? data : JSON.stringify(panePayload));
       });
     },
     authorize: function (session, actor) {
@@ -709,7 +722,22 @@ function createProjectContext(opts) {
 
   // Personal computer tools use the extension; remote URLs are owner-bound.
   var _mcp = attachMcp({
-    sendTo: sendTo, slug: slug, clients: clients,
+    sendTo: sendTo, slug: slug, clients: clients, cwd: cwd,
+    userInput: function (session) { return _askUser.createHandler(session); },
+    runtimeEnvForSession: getRuntimeEnvForSession,
+    canDiscoverSession: function (session) { var scope = _requestAccess.fileScope({ _clayUser: session.ownerId && usersModule.findUserById(session.ownerId) }); return !!scope.identity || !scope.projectBound; },
+    sessionVendor: function (session) { return session.vendor || sm.defaultVendor || "claude"; },
+    runtimeEnv: function (owner, ws) { return resolveOwnerRuntimeEnv(_requestAccess.fileScope(ws).identity); },
+    canDiscover: function (ws) { var scope = _requestAccess.fileScope(ws); return !!scope.identity || !scope.projectBound; },
+    ownerIdentity: function (owner) {
+      if (!osUsers) {
+        if (usersModule.isMultiUser() && (usersModule.getAllUsers().length !== 1 || !usersModule.findUserById(owner))) throw new Error('Local MCP requires OS user mapping in a shared installation.');
+        return null;
+      }
+      var user = usersModule.findUserById(owner);
+      if (!user || !user.linuxUser) throw new Error('OS user identity is unavailable.');
+      return getOsUserInfoForWs({ _clayUser: user });
+    },
     root: require("./config").CONFIG_DIR,
     isMultiUser: function () { return usersModule.isMultiUser(); },
     canAccess: function (ws) { return _requestAccess.canAccessProject(ws, slug); },
@@ -768,8 +796,15 @@ function createProjectContext(opts) {
       }
     },
   });
+  var _studioPresentation = require('./project-studio-presentation').attachStudioPresentation({
+    getPresentation: function (session) { return _workspaceQuery && _workspaceQuery.getPresentation(session); },
+    getSessionForWs: getSessionForWs,
+  });
   var _sharedBrowser = attachSharedBrowser({
-    slug: slug, isMate: isMate, sm: sm, clients: clients, sendTo: sendTo,
+    studioPresentation: _studioPresentation,
+    sendToSession: sendToSession,
+    getPresentation: function (session) { return _workspaceQuery && _workspaceQuery.getPresentation(session); },
+    slug: slug, isMate: isMate, ownerId: projectOwnerId, sm: sm, clients: clients, sendTo: sendTo,
     usersModule: usersModule, requestAccess: _requestAccess, osUsers: osUsers,
     getSessionForWs: getSessionForWs,
     getIdentity: function (session) {
@@ -778,8 +813,11 @@ function createProjectContext(opts) {
     },
   });
   var _sessionDocument = attachSessionDocument({
+    studioPresentation: _studioPresentation,
+    getPresentation: function (session) { return _workspaceQuery && _workspaceQuery.getPresentation(session); },
     cwd: cwd,
     isMate: isMate,
+    canUseSession: _sessionNotes.canUseSession,
     sendToSession: sendToSession,
     FS_MAX_SIZE: FS_MAX_SIZE,
     getOsUserInfoForSession: function (session) {
@@ -799,6 +837,8 @@ function createProjectContext(opts) {
   });
   var _workspaceQuery = attachProjectWorkspaceQuery({
     service: opts.workspaceQueryService || null,
+    controlService: opts.clayProductControl || null,
+    contextService: opts.mateContextService || null,
     sm: sm,
     projectSlug: slug,
     getProjectOwnerId: function () { return projectOwnerId; },
@@ -839,7 +879,12 @@ function createProjectContext(opts) {
     sendTo: sendTo, getClients: function () { return clients; }, startWork: _issueWork,
   });
   var _sessionGithub = require("./project-session-github").attachSessionGithub({
-    cwd: cwd, sm: sm, isMate: isMate, osUsers: osUsers,
+    cwd: cwd, sm: sm, isMate: isMate, osUsers: osUsers, projectSlug: slug, sendTo: sendTo,
+    userInput: function (session) { return _askUser.createHandler(session); },
+    canAccess: function (ws) {
+      return !isMate && clients.has(ws) && ws.readyState === 1 && (!usersModule.isMultiUser() ||
+        !!(ws._clayUser && usersModule.findUserById(ws._clayUser.id) && opts.canAccessProjectSlug(ws._clayUser.id, slug)));
+    },
     canUse: function (session) {
       if (session.hidden || session.delegated || session._pairDelegation || session._delegatedBy || require("./session-provenance").isWorker(session)) return false;
       if (!usersModule.isMultiUser()) return true;
@@ -858,9 +903,10 @@ function createProjectContext(opts) {
   });
   var _sessionLinear = require("./project-session-linear").attachSessionLinear({
     sm: sm, isMate: isMate, storage: opts.linearStorage, projectSlug: slug,
+    userInput: function (session) { return _askUser.createHandler(session); },
     isMultiUser: usersModule.isMultiUser, sendTo: sendTo,
     canAccess: function (ws) {
-      return !isMate && clients.has(ws) && ws.readyState === 1 && (!usersModule.isMultiUser() ||
+      return clients.has(ws) && ws.readyState === 1 && (!usersModule.isMultiUser() ||
         !!(ws._clayUser && usersModule.findUserById(ws._clayUser.id) && opts.canAccessProjectSlug(ws._clayUser.id, slug)));
     },
     startWork: require('./project-linear-launch').attachLinearLaunch({
@@ -1021,6 +1067,7 @@ function createProjectContext(opts) {
     persistSession: function (session) { return sm.saveSessionFile(session); },
     getVendorModelCatalog: function (ws, vendor) { return _models.getVendorCatalog(ws, vendor); },
     createReadyMate: opts.createReadyMate,
+    isLive: function (session) { return sm.sessions.get(session.localId) === session; },
   });
   var _askUser = attachAskUser({
     record: function (session, event) { sm.sendAndRecord(session, event); },
@@ -1055,14 +1102,12 @@ function createProjectContext(opts) {
       }
     }
 
-    // Shared sticky-note memory (main projects only).
-    if (!isMate) {
-      try {
-        var sessionNotesMcpConfig = _sessionNotes.createMcpServer(adapter);
-        if (sessionNotesMcpConfig) servers[sessionNotesMcpConfig.name || "clay-notes"] = sessionNotesMcpConfig;
-      } catch (e) {
-        console.error("[project] Failed to create session notes MCP server:", e.message);
-      }
+    // Shared sticky-note memory is available in both owner-private projects and Mates.
+    try {
+      var sessionNotesMcpConfig = _sessionNotes.createMcpServer(adapter);
+      if (sessionNotesMcpConfig) servers[sessionNotesMcpConfig.name || "clay-notes"] = sessionNotesMcpConfig;
+    } catch (e) {
+      console.error("[project] Failed to create session notes MCP server:", e.message);
     }
 
     // Project Logs. Project sessions get the project-scoped set; Mate projects
@@ -1107,13 +1152,11 @@ function createProjectContext(opts) {
     if (sharedBrowserConfig) servers["clay-shared-browser"] = sharedBrowserConfig;
 
     // Explicit agent signal for user-requested Markdown presentation.
-    if (!isMate) {
-      try {
-        var sessionDocumentMcpConfig = _sessionDocument.createMcpServer(adapter);
-        if (sessionDocumentMcpConfig) servers[sessionDocumentMcpConfig.name || "clay-documents"] = sessionDocumentMcpConfig;
-      } catch (e) {
-        console.error("[project] Failed to create session document MCP server:", e.message);
-      }
+    try {
+      var sessionDocumentMcpConfig = _sessionDocument.createMcpServer(adapter);
+      if (sessionDocumentMcpConfig) servers[sessionDocumentMcpConfig.name || "clay-documents"] = sessionDocumentMcpConfig;
+    } catch (e) {
+      console.error("[project] Failed to create session document MCP server:", e.message);
     }
 
     // Debate MCP server (available to both mates and main project)
@@ -1383,6 +1426,7 @@ function createProjectContext(opts) {
 
   // --- SDK bridge ---
   sdk = createSDKBridge({
+    isLifecycleExecutionPaused: function () { return !!(opts.getProjectAccess && opts.getProjectAccess().lifecycleExecutionPaused); },
     cwd: cwd,
     slug: slug,
     sessionManager: sm,
@@ -1458,6 +1502,7 @@ function createProjectContext(opts) {
         _sessionGithub.getSystemPrompt(session),
         _sessionLinear.getSystemPrompt(session),
         _scheduledTasks ? _scheduledTasks.getSystemPrompt(session) : "",
+        _mateScheduling ? _mateScheduling.getSystemPrompt(session) : "",
         _mateKnowledge.getSystemPrompt(session),
         _userKnowledge.getSystemPrompt(session),
         _autonomousRun ? _autonomousRun.getSystemPrompt(session) : "",
@@ -1487,6 +1532,7 @@ function createProjectContext(opts) {
         .concat(opts.userKnowledgeService ? _userKnowledge.getDynamicToolDefs(session) : [])
         .concat(_loopInterview ? _loopInterview.getToolDefs(session) : [])
         .concat(_scheduledTasks ? _scheduledTasks.getToolDefs(session) : [])
+        .concat(_mateScheduling ? _mateScheduling.getToolDefs(session) : [])
         .concat(_scheduledTaskExecution ? _scheduledTaskExecution.getToolDefs(session) : [])
         .concat(_autonomousRun ? _autonomousRun.getToolDefs(session) : []);
     },
@@ -1542,6 +1588,8 @@ function createProjectContext(opts) {
 
   _scheduledMessages = attachProjectScheduledMessages({
     scheduler: opts.durableScheduler,
+    mateLifecycle: function () { return _mateLifecycle; },
+    deferRehydrate: isMate,
     slug: slug,
     isMate: isMate,
     osUsers: osUsers,
@@ -1564,6 +1612,32 @@ function createProjectContext(opts) {
     consumePendingMessage: function (session) { return _userMessage && _userMessage.consumePendingMessage(session); },
   });
 
+  var _schedulingAccess = require('./project-scheduling-access').attachSchedulingAccess({ osUsers: osUsers, getLinuxUser: getLinuxUserForSession, resolveLinuxUser: getOsUserInfoForLinuxUser });
+  _mateLifecycle = attachMateScheduleLifecycle({
+    sm: sm, scheduler: opts.durableScheduler, slug: slug,
+    owner: function (session) { return _mateScheduling.owner(session); },
+    authorize: function (session, control) { return control ? _mateScheduling.authorizeControl(session, control) : _mateScheduling.authorize(session); },
+    authorizeRuntime: function (session) { return _mateScheduling.authorizeLifecycle(session); },
+    schedule: function () { return _scheduledMessages.schedule.apply(null, arguments); },
+    queueItem: function (session, job) { return _scheduledMessages.queueItem(session, job); },
+    cancelJob: function (session, job) {
+      return _scheduledMessages.cancel(session, { id: job.ownerId }, null, "cancelled_by_mate", { jobId: job.id, revision: job.payload.revision });
+    },
+  });
+  _mateScheduling = attachMateScheduling({
+    isMate: isMate, isHostAgent: isHostAgent, projectOwnerId: projectOwnerId, slug: slug, mateId: opts.mateId,
+    sm: sm, users: usersModule, lifecycle: _mateLifecycle,
+    authorizeAccess: function (session, ownerId) { _schedulingAccess.ownerIdentity(session); return _scheduledMessages.authorize(session, ownerId); },
+    userInput: function (session) { return _askUser.createHandler(session); },
+  });
+  if (isMate) {
+    sm.sessions.forEach(function (session) {
+      try { _mateLifecycle.reconcile(session); }
+      catch (error) { console.error("[mate-schedules] Recovery failed:", error.message); }
+    });
+    _scheduledMessages.rehydrate();
+  }
+
   // --- Loop engine (delegated to project-loop.js) ---
   // --- Notification center (global singleton from server.js) ---
   var _notifications = opts.notificationsModule || null;
@@ -1645,6 +1719,7 @@ function createProjectContext(opts) {
     cwd: cwd,
     projectSlug: slug,
     projectTitle: title || project,
+    validateOwnerIdentity: _schedulingAccess.ownerIdentity,
     isMate: isMate,
     sm: sm,
     sdk: sdk,
@@ -1743,8 +1818,8 @@ function createProjectContext(opts) {
   }
 
   // --- Schedule / cancel a message (used by WS handler and auto-continue) ---
-  function scheduleMessage(session, text, resetsAt, actorUser, targetWs, attachments, requestId, transportAccountId) {
-    return _scheduledMessages ? _scheduledMessages.schedule(session, text, resetsAt, actorUser, targetWs, attachments, requestId, transportAccountId) : null;
+  function scheduleMessage(session, text, resetsAt, actorUser, targetWs, attachments, requestId, transportAccountId, options) {
+    return _scheduledMessages ? _scheduledMessages.schedule(session, text, resetsAt, actorUser, targetWs, attachments, requestId, transportAccountId, options) : null;
   }
 
   function cancelScheduledMessage(session, actorUser, targetWs, correlation) {
@@ -1756,6 +1831,10 @@ function createProjectContext(opts) {
   }
 
   function handleMessage(ws, msg) {
+    return require('./pane-session-transport').run(ws, msg, dispatchMessage);
+  }
+
+  function dispatchMessage(ws, msg) {
     if (!_requestAccess.permitMessage(ws, msg)) return;
     // --- Keep-alive (delegated to project-connection.js) ---
     // Answered before any routing so a ping can never be forwarded elsewhere.
@@ -1777,8 +1856,10 @@ function createProjectContext(opts) {
       }
     }
 
+    if (_studioPresentation.handleMessage(ws, msg)) return;
+
     // --- DM messages (delegated to server-level handler) ---
-    if (msg.type === "home_debate_question_response" || msg.type === "home_debate_control" || msg.type === "home_mate_creation_question_response" || msg.type === "default_ai_get" || msg.type === "default_ai_catalog_get" || msg.type === "default_ai_set" || msg.type === "default_vendor_get" || msg.type === "default_vendor_set" || msg.type === "context_view_get" || msg.type === "context_view_set" || msg.type === "cursor_sharing_get" || msg.type === "cursor_sharing_set") {
+    if (msg.type === "home_mate_question_response" || msg.type === "mate_context_prepare" || msg.type === "clay_ui_ready" || msg.type === "clay_navigation_claim" || msg.type === "clay_navigation_ack" || msg.type === "clay_navigation_rendered" || msg.type === "home_debate_question_response" || msg.type === "home_debate_control" || msg.type === "home_mate_creation_question_response" || msg.type === "default_ai_get" || msg.type === "default_ai_catalog_get" || msg.type === "default_ai_set" || msg.type === "default_vendor_get" || msg.type === "default_vendor_set" || msg.type === "context_view_get" || msg.type === "context_view_set" || msg.type === "cursor_sharing_get" || msg.type === "cursor_sharing_set") {
       if (typeof opts.onDmMessage === "function") opts.onDmMessage(ws, msg, slug);
       return;
     }
@@ -2074,6 +2155,9 @@ function createProjectContext(opts) {
   });
   sm.setSessionHydrator(_sessionSkillCatalog.hydrate);
   var _sessions = attachSessions({
+    splitStore: _splitGroups.store,
+    adapters: adapters,
+    isPendingQueuePaused: function (session) { return _pendingMessageQueue.isPaused(session); },
     cwd: cwd,
     slug: slug,
     isMate: isMate,
@@ -2103,6 +2187,7 @@ function createProjectContext(opts) {
     resolveDefaultAi: opts.resolveDefaultAi,
     resolveMateSessionDefaults: opts.resolveMateSessionDefaults,
     getVendorAvailability: function (ws) { return _models.getVendorAvailability(ws); },
+    getLinuxUserForWs: getLinuxUserForWs,
     canCreateScheduledTaskInterview: function (ws, session) { return !!(_scheduledTasks && _scheduledTasks.canCreateInterview(ws, session)); },
     canStartScheduledTaskInterview: function (ws, session) { return !!(_scheduledTasks && _scheduledTasks.canStartInterview(ws, session)); },
     onHumanPairStop: function (session) {
@@ -2147,6 +2232,26 @@ function createProjectContext(opts) {
     _notifications: _notifications,
     _projectLogs: _projectLogs,
   });
+  var _productControl = require("./project-product-control").attachProjectProductControl({
+    sm: sm, users: usersModule, clients: clients, slug: slug, isMate: isMate, osUsers: osUsers,
+    getProjectAccess: opts.getProjectAccess || function () { return { visibility: "public", ownerId: projectOwnerId || null }; },
+    userInput: function (session) { return _askUser.createHandler(session); },
+    actions: _sessions.sessionActions, history: _sessions.sessionHistoryActions, selectModel: function (session, model, options) { return _models.selectSessionModel(session, model, null, options); },
+    isDriverOperatedSession: function (session) { return _sessionPair.workerPermission.isDriverOperated(session); },
+    deletePlan: _sessions.deleteProductControlPlan,
+    queue: _pendingMessageQueue,
+    requestQueueDrain: function (session) { if (_userMessage) _userMessage.consumePendingMessage(session); },
+    vendor: _sessions.sessionVendorActions,
+    runtime: _sessions.sessionRuntimeActions,
+  });
+  var _mateChatControl = require('./project-mate-chat-control').attachMateChatControl({
+    sm: sm, sdk: sdk, isMate: isMate, osUsers: osUsers, getLinuxUser: getLinuxUserForSession,
+    users: usersModule, getAccess: opts.getProjectAccess || function () { return { isMate: isMate, ownerId: projectOwnerId || null, visibility: 'private' }; },
+    actions: _sessions.sessionActions, vendor: _sessions.sessionVendorActions,
+    selectModel: function (session, model, options) { return _models.selectSessionModel(session, model, null, options); },
+  });
+
+
 
   var _models = attachModels({
     cwd: cwd,
@@ -2193,6 +2298,7 @@ function createProjectContext(opts) {
   });
   var _delegatedFollowUp = attachDelegatedFollowUp({
     sm: sm,
+    isPendingQueuePaused: function (session) { return _pendingMessageQueue.isPaused(session); },
     getSdk: function () { return sdk; },
     getLinuxUserForSession: getLinuxUserForSession,
     onProcessingChanged: onProcessingChanged,
@@ -2207,6 +2313,12 @@ function createProjectContext(opts) {
 
   // --- User message handler (delegated to project-user-message.js) ---
   var _userMessage = attachUserMessage({
+    isLifecycleExecutionPaused: function () { return !!(opts.getProjectAccess && opts.getProjectAccess().lifecycleExecutionPaused); },
+    resumeLifecycleProject: function (ws) {
+      if (!opts.getProjectAccess || !opts.getProjectAccess().lifecycleExecutionPaused) return true;
+      if (!clients.has(ws) || !ws._clayUser || !opts.resumeLifecycleProject) throw new Error('The current owner must explicitly resume recovered project execution.');
+      return opts.resumeLifecycleProject(ws._clayUser.id);
+    },
     // Exact live pair state decides whether a session is Driver-operated; the
     // handler never infers the role from the message.
     isDriverOperatedSession: function (session) {
@@ -2234,6 +2346,7 @@ function createProjectContext(opts) {
     cwd: cwd,
     slug: slug,
     isMate: isMate,
+    mateId: mateId,
     osUsers: osUsers,
     sm: sm,
     sdk: sdk,
@@ -2287,6 +2400,7 @@ function createProjectContext(opts) {
 
   // --- Vendor login flow (delegated to project-vendor-login.js) ---
   var _vendorLogin = attachVendorLogin({
+    onVendorAuthChanged: function () { _sessions.invalidateVendorUsage(); },
     requestAccess: _requestAccess,
     clients: clients,
     slug: slug,
@@ -2329,6 +2443,13 @@ function createProjectContext(opts) {
     FS_MAX_SIZE: FS_VIEWER_MAX_SIZE,
   });
 
+  var _workspaceOperations = require('./project-workspace-operations').attachWorkspaceOperations({
+    cwd: cwd, isMate: isMate, osUsers: osUsers, users: usersModule, tm: tm,
+    getAccess: opts.getProjectAccess || function () { return { ownerId: projectOwnerId || null, visibility: 'private' }; },
+    files: function () { return _filesystem.productOperations; },
+    publishTerminals: function () { send({ type: 'term_list', terminals: tm.list(true) }); },
+  });
+
   // --- MCP bridge handler for Codex and session-bound Kiro tools ---
   // Provides list_tools and call_tool operations over HTTP for mcp-bridge-server.js.
   // The normal Codex bridge excludes local MCP servers it manages natively;
@@ -2336,6 +2457,8 @@ function createProjectContext(opts) {
   function getMcpBridgeHandler(sessionId, sessionOnly, queryGeneration) {
     var boundSession = Number.isInteger(sessionId) ? sm.sessions.get(sessionId) : null;
     var queryToolBridge = createSessionQueryToolBridge({ session: boundSession, sdk: sdk });
+    var externalQueryBridge = require('./mcp-query-bridge').createQueryBridge({ valid: sessionQueryValid,
+      getServers: function () { return _mcp.getMcpServers(boundSession, sessionQueryValid()); } });
     function sessionQueryValid() {
       return !!boundSession
         && Number.isInteger(queryGeneration)
@@ -2460,7 +2583,7 @@ function createProjectContext(opts) {
           }
         }
 
-        if (sessionOnly) return Promise.resolve(tools);
+        if (sessionOnly) return Promise.resolve(tools.concat(externalQueryBridge.list()));
 
         // In-app MCP servers (debate, browser, email).
         // Use getLocalMcpServers() so clay-browser is hidden unless the
@@ -2480,7 +2603,7 @@ function createProjectContext(opts) {
         }
 
         // Personal computer and remote URL connections.
-        var remoteServers = _mcp.getMcpServers(boundSession);
+        var remoteServers = sessionQueryValid() ? _mcp.getMcpServers(boundSession, sessionQueryValid()) : {};
         if (remoteServers) {
           var remoteNames = Object.keys(remoteServers);
           for (var ri = 0; ri < remoteNames.length; ri++) {
@@ -2578,7 +2701,7 @@ function createProjectContext(opts) {
         if (serverName === "clay-sessions" || serverName === "clay-notes" || serverName === "clay-handoff" || serverName === "clay-documents" || serverName === "clay-shared-browser" || serverName === "clay-debate" || serverName === "clay-mate-creation" || serverName === "clay-workspace" || serverName === "clay-history" || serverName === "clay-github" || serverName === "clay-linear" || serverName === "clay-issues" || serverName === "clay-logs" || serverName === "clay-knowledge" || serverName === "clay-you") {
           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));
+        if (sessionOnly) return externalQueryBridge.call(serverName, toolName, args);
         // Try in-app servers first (gated by extension connectivity for clay-browser).
         var localMcp = getLocalMcpServers(boundSession);
         if (localMcp && localMcp[serverName]) {
@@ -2590,17 +2713,7 @@ function createProjectContext(opts) {
             }
           }
         }
-        // Try remote/local proxy servers
-        var remoteServers = _mcp.getMcpServers(boundSession);
-        if (remoteServers && remoteServers[serverName]) {
-          var rServer = remoteServers[serverName];
-          if (rServer.instance && rServer.instance._registeredTools && rServer.instance._registeredTools[toolName]) {
-            var rHandler = rServer.instance._registeredTools[toolName].handler;
-            if (typeof rHandler === "function") {
-              return Promise.resolve(rHandler(args));
-            }
-          }
-        }
+        if (externalQueryBridge.list().some(function (tool) { return tool.server === serverName && tool.name === toolName; })) return externalQueryBridge.call(serverName, toolName, args);
         return Promise.reject(new Error("Tool not found: " + serverName + "/" + toolName));
       },
     };
@@ -2608,6 +2721,8 @@ function createProjectContext(opts) {
 
   // --- HTTP handler (delegated to project-http.js) ---
   var _http = attachHTTP({
+    workspaceOperations: _workspaceOperations,
+    getProjectOwnerId: function () { return projectOwnerId; },
     requestAccess: _requestAccess,
     cwd: cwd,
     slug: slug,
@@ -2766,6 +2881,7 @@ function createProjectContext(opts) {
             return false;
           }));
         } catch (err) {
+          shutdowns.push(Promise.resolve(false));
           console.error("[project] " + vendor + " shutdown threw for " + slug + ":", err && err.message ? err.message : err);
         }
       });
@@ -2788,6 +2904,7 @@ function createProjectContext(opts) {
       }
     });
     var status = {
+      controlRuntimeId: require('./clay-control-target-projection').runtime(sm),
       slug: slug,
       path: cwd,
       project: project,
@@ -2838,7 +2955,7 @@ function createProjectContext(opts) {
 
   function setTitle(newTitle) {
     title = newTitle || null;
-    send({ type: "info", cwd: cwd, slug: slug, project: title || project, version: currentVersion, debug: !!debug, osUsers: osUsers, lanHost: lanHost, projectCount: getProjectCount(), projects: getProjectList(), projectOwnerId: projectOwnerId, isMate: isMate, mateId: isMate ? mateId : null, mateDisplayName: isMate ? (opts.mateDisplayName || title || project || "Mate") : "" });
+    send({ type: "info", controlRuntimeId: require("./clay-control-target-projection").runtime(sm), cwd: cwd, slug: slug, project: title || project, version: currentVersion, debug: !!debug, osUsers: osUsers, lanHost: lanHost, projectCount: getProjectCount(), projects: getProjectList(), projectOwnerId: projectOwnerId, isMate: isMate, mateId: isMate ? mateId : null, mateDisplayName: isMate ? (opts.mateDisplayName || title || project || "Mate") : "" });
   }
 
   function setIcon(newIcon) {
@@ -2909,15 +3026,33 @@ function createProjectContext(opts) {
     },
     getYouLinuxUser: getLinuxUserForSession,
     getStatus: getStatus,
+    bindMateSchedule: function (session, intent, id) {
+      return _mateLifecycle.create(session, require("./mate-schedule-input").normalize(intent), id);
+    },
+    cancelMateSchedule: function (session, record) { return _mateLifecycle.cancel(session, record); },
     getSessionManager: function () { return sm; },
     createDelegatedSession: _delegatedSession.createDelegatedSession,
+    refreshEnvironmentRuntime: function () { return sdk.refreshEnvironmentRuntime(); },
+    getWorkspaceProductOperations: function () { return isMate ? null : _workspaceOperations; },
+    getMateChatControl: function () { return isMate ? _mateChatControl : null; },
+    getMateScheduleControl: function () { return isMate ? _mateLifecycle : null; },
+    getScheduledTaskControl: function () { return _scheduledTasks.productControl; },
+    notifyIssueUpdate: _issues.notify,
+    notifyLogUpdate: _projectLogs.broadcastUpdate,
+    requestProductControlReview: _productControl.requestProductControlReview,
+    applyProductSessionAction: _productControl.applyProductSessionAction,
+    inspectProductSessionQueue: _productControl.inspectProductSessionQueue,
+    readVendorUsage: function (request) { return _sessions.readVendorUsage(request); },
+    inspectProductSessionRuntime: _sessions.sessionRuntimeActions.inspect,
+    inspectMateLifecycleRuntime: _sessions.sessionRuntimeActions.inspectLifecycle,
     inspectDelegatedFollowUp: _delegatedFollowUp.inspectDelegatedFollowUp,
     dispatchDelegatedFollowUp: _delegatedFollowUp.dispatchDelegatedFollowUp,
     deliverCapsuleTurn: _capsuleTurn.deliverCapsuleTurn,
     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); },
+    registerMcpConsentViewer: _mcp.registerConsentViewer,
+    handleHomeAskUserResponse: function (msg, session, ws) { return _sessions.respondToAskUser(session, msg, ws); },
     handleHomePermissionResponse: function (ws, msg, session) { return _sessions.respondToHomePermission(ws, msg, session); },
     stopHomeSession: function (session) { return _sessions.stopHomeSession(session); },
     handleHomeDebateControl: function (ws, msg, session) { return _debate.handleHomeControl(ws, msg, session); },
@@ -2926,6 +3061,7 @@ function createProjectContext(opts) {
     getMemoryState: _memory.readMemoryState,
     listKnowledgeFiles: _knowledge.listKnowledgeFiles,
     getKnowledgeDbService: function () { return _knowledge.databases; },
+    getKnowledgeProductOperations: function () { return _knowledge.productOperations; },
     refreshCapsuleCatalog: _capsuleCatalog.refreshSessions,
     getNotificationsModule: function () { return _notifications; },
     refreshVendorAuth: _vendorLogin.refreshVendorAuth,