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

package/lib/server-home-chat.js

@@ -9,6 +9,8 @@ var attachHomeMateCreation = require("./server-home-mate-creation").attachHomeMa
 var attachHomeDebates = require("./server-home-debates").attachHomeDebates, attachHomeClayEntry = require("./server-home-clay-entry").attachHomeClayEntry;
 var homeChatEvents = require("./server-home-chat-events");
 var homeCapsuleCreation = require("./server-home-capsule-creation");
+var sessionTitlePolicy = require("./session-title-policy");
+var sessionProvenance = require("./session-provenance");
 var historyToHomeChat = homeChatEvents.historyToHomeChat;
 var transformEvent = homeChatEvents.transformEvent;
 function attachHomeChat(deps) {
@@ -82,8 +84,18 @@ function attachHomeChat(deps) {
     var sessionManager = found.ctx.getSessionManager();
     if (!sessionManager) return [];
     var result = [];
+    var visibleSessions = [];
     sessionManager.sessions.forEach(function (session) {
       if (!ownsSession(session, userId)) return;
+      visibleSessions.push(session);
+    });
+    var hierarchy = sessionProvenance.hierarchyFor(visibleSessions);
+    for (var vi = 0; vi < visibleSessions.length; vi++) {
+      var session = visibleSessions[vi];
+      if (sessionTitlePolicy.repairLegacySearchTitle(session)
+          && typeof sessionManager.saveSessionFile === "function") {
+        sessionManager.saveSessionFile(session);
+      }
       var cliSessionId = sessionString(session.cliSessionId, 512);
       var createdAt = sessionTimestamp(session.createdAt);
       var lastActivity = sessionTimestamp(session.lastActivity) || createdAt;
@@ -97,12 +109,16 @@ function attachHomeChat(deps) {
         createdAt: createdAt,
         lastActivity: lastActivity,
         isProcessing: !!session.isProcessing,
+        sessionRole: hierarchy[session.localId].role,
+        parentSessionId: hierarchy[session.localId].parentSessionId == null ? null : sessionReference(sessionManager.sessions.get(hierarchy[session.localId].parentSessionId)),
+        parentAvailable: hierarchy[session.localId].parentAvailable,
+        workerGeneration: hierarchy[session.localId].generation,
       });
       if (session.debateSetupMode === true) result[result.length - 1].debatePlanning = true;
       if (session.homeDebatePhase) result[result.length - 1].debatePhase = session.homeDebatePhase;
       if (session.mateCreationMode === true) result[result.length - 1].mateCreation = true;
       if (session.homeMateCreationPhase) result[result.length - 1].mateCreationPhase = session.homeMateCreationPhase;
-    });
+    }
     result.sort(function (a, b) { return b.lastActivity - a.lastActivity; });
     return result;
   }
@@ -188,7 +204,12 @@ function attachHomeChat(deps) {
 
   var homeModels = attachHomeModels({ users: users, mates: mates, projects: projects, sendMessage: sendMessage });
   var homeDebates = attachHomeDebates({ mates: mates, findMateProject: findMateProject, ownsSession: ownsSession, sessionReference: sessionReference, sendMessage: sendMessage });
-  var homeClaySessionLinks = attachHomeClaySessionLinks({ projects: projects, workspaceQueryService: deps.workspaceQueryService, sendMessage: sendMessage });
+  var homeClaySessionLinks = attachHomeClaySessionLinks({
+    projects: projects,
+    workspaceQueryService: deps.workspaceQueryService,
+    projectLogsService: deps.projectLogsService,
+    sendMessage: sendMessage,
+  });
 
   function sendHistory(ws, found, session, requestId) {
     if (ws.readyState !== 1) return;
@@ -367,7 +388,7 @@ function attachHomeChat(deps) {
 
   function handleMessage(ws, msg) {
     if (!msg || typeof msg.type !== "string") return false;
-    if (msg.type !== "home_debates_list" && msg.type !== "home_clay_ask" && msg.type !== "home_clay_session_resolve" && 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_debate_question_response" && msg.type !== "home_debate_control" && msg.type !== "home_mate_creation_plan" && msg.type !== "home_mate_creation_question_response" && 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") {
+    if (msg.type !== "home_debates_list" && msg.type !== "home_clay_ask" && msg.type !== "home_clay_session_resolve" && msg.type !== "home_clay_log_resolve" && 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_debate_question_response" && msg.type !== "home_debate_control" && msg.type !== "home_mate_creation_plan" && msg.type !== "home_mate_creation_question_response" && 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") {
       return false;
     }
 
@@ -386,6 +407,7 @@ function attachHomeChat(deps) {
     if (users.isMultiUser() && !userId) {
       if (msg.type === "home_debates_list") sendMessage(ws, { type: "home_debates_state", requestId: msg.requestId || null, status: "error", debates: [], error: "Sign in to load your debates." });
       else if (msg.type === "home_clay_session_resolve") sendMessage(ws, { type: "home_clay_session_target", requestId: msg.requestId || null, sessionRef: msg.sessionRef || null, status: "error", error: "Sign in to open this session." });
+      else if (msg.type === "home_clay_log_resolve") sendMessage(ws, { type: "home_clay_log_target", requestId: msg.requestId || null, ref: msg.ref || null, status: "error", error: "Sign in to open this log." });
       else if (msg.type === "home_mate_models_get" || msg.type === "home_mate_model_set") homeModels.sendAccessError(ws, msg, "Not authenticated.");
       else sendError(ws, msg.mateId || null, "Not authenticated.", msg.requestId || null, msg.sessionId || null);
       return true;
@@ -394,6 +416,7 @@ function attachHomeChat(deps) {
     if (homeDebates.handle(ws, userId, msg)) return true;
     if (msg.type === "home_clay_ask") { homeClayEntry.start(ws, userId, msg); return true; }
     if (msg.type === "home_clay_session_resolve") { homeClaySessionLinks.resolve(ws, msg); return true; }
+    if (msg.type === "home_clay_log_resolve") { homeClaySessionLinks.resolveLog(ws, msg); return true; }
 
     if (msg.type === "home_mate_debate_plan") {
       homeDebate.start(ws, userId, msg);
@@ -513,6 +536,6 @@ function attachHomeChat(deps) {
     teardownTap(ws);
     teardownTap(ws, "_searchClayTap");
   }
-  return { handleMessage: handleMessage, handleDisconnection: handleDisconnection };
+  return { handleMessage: handleMessage, handleDisconnection: handleDisconnection, findMateProject: findMateProject };
 }
 module.exports = { attachHomeChat: attachHomeChat };

package/lib/server-home-clay-entry.js

@@ -2,7 +2,7 @@
 
 function attachHomeClayEntry(ctx) {
   function providerPrompt(text) {
-    return "This conversation began in Clay Studio's global search. Respond as Clay. When the user is trying to locate prior work, use search_workspace_history before any other investigation. Search by meaning, related terms, and context, using at most three focused search passes. Do not use Bash, filesystem scans, or generic agents to search Clay conversation history. Give the user useful findings promptly, and do not mention tools or internal search mechanics. Do not force a workspace search when the request is a general question or task.\n\nUser request:\n" + text;
+    return "This conversation began in Clay Studio's global search. Respond as Clay. When the user is trying to locate a conversation, use search_workspace_history before any other investigation. When the user asks about a project's prior work, decisions, defects, status, rationale, or unfinished work, identify the project and search_project_logs before answering; use conversation history as additional evidence when useful. Search by meaning, related terms, and context, using at most three focused search passes. Do not use Bash, filesystem scans, or generic agents to search Clay history. Give the user useful findings promptly, and do not mention tools or internal search mechanics. Do not force a workspace or Logs search when the request is a general question or task.\n\nUser request:\n" + text;
   }
 
   function findExisting(manager, userId, requestId) {

package/lib/server-home-clay-session-links.js

@@ -1,13 +1,19 @@
-// Resolve rendered Mate session references through an exact owner-bound source session.
+// Resolve rendered Mate session and Project Log references through an exact
+// owner-bound source session.
 
 function attachHomeClaySessionLinks(ctx) {
-  function resolve(ws, msg) {
+  function source(ws, msg) {
     var tap = msg.surface === "search" ? ws._searchClayTap : ws._homeChatTap;
     var sourceProject = tap && tap.mateSlug ? ctx.projects.get(tap.mateSlug) : null;
     var sourceManager = sourceProject && sourceProject.getSessionManager ? sourceProject.getSessionManager() : null;
     var sourceSession = sourceManager && tap ? sourceManager.sessions.get(tap.sessionId) : null;
-    var bound = ctx.workspaceQueryService && sourceSession
-      ? ctx.workspaceQueryService.bindProjectSession({ projectSlug: tap.mateSlug, session: sourceSession })
+    return { tap: tap, project: sourceProject, session: sourceSession };
+  }
+
+  function resolve(ws, msg) {
+    var selected = source(ws, msg);
+    var bound = ctx.workspaceQueryService && selected.session
+      ? ctx.workspaceQueryService.bindProjectSession({ projectSlug: selected.tap.mateSlug, session: selected.session })
       : null;
     var payload = { type: "home_clay_session_target", requestId: msg.requestId || null, sessionRef: msg.sessionRef || null, status: "error" };
     try {
@@ -20,7 +26,30 @@ function attachHomeClaySessionLinks(ctx) {
     ctx.sendMessage(ws, payload);
   }
 
-  return { resolve: resolve };
+  function resolveLog(ws, msg) {
+    var selected = source(ws, msg);
+    var status = selected.project && selected.project.getStatus ? selected.project.getStatus() : null;
+    var bound = ctx.projectLogsService && selected.session && status
+      ? ctx.projectLogsService.bindMate({
+        projectSlug: selected.tap.mateSlug,
+        projectOwnerId: status.projectOwnerId || null,
+        isMate: true,
+        mateId: selected.tap.mateId,
+        session: selected.session,
+      })
+      : null;
+    var payload = { type: "home_clay_log_target", requestId: msg.requestId || null, ref: msg.ref || null, status: "error" };
+    try {
+      if (!bound) throw new Error("The source conversation is no longer available.");
+      payload.target = bound.resolveLogNavigation({ ref: msg.ref });
+      payload.status = "ready";
+    } catch (error) {
+      payload.error = error.message || "Log not available.";
+    }
+    ctx.sendMessage(ws, payload);
+  }
+
+  return { resolve: resolve, resolveLog: resolveLog };
 }
 
 module.exports = { attachHomeClaySessionLinks: attachHomeClaySessionLinks };

package/lib/server-settings.js

@@ -1,5 +1,6 @@
 var fs = require("fs");
 var path = require("path");
+var { attachExperimentalSettings } = require("./server-experimental-settings");
 
 function attachSettings(ctx) {
   var users = ctx.users;
@@ -10,8 +11,10 @@ function attachSettings(ctx) {
   var CONFIG_DIR = ctx.CONFIG_DIR;
 
   var profilePath = path.join(CONFIG_DIR, "profile.json");
+  var experimentalSettings = attachExperimentalSettings(ctx);
 
   function handleRequest(req, res, fullUrl) {
+    if (experimentalSettings.handleRequest(req, res, fullUrl)) return true;
     // GET /api/profile
     if (req.method === "GET" && fullUrl === "/api/profile") {
       if (users.isMultiUser()) {
@@ -30,6 +33,7 @@ function attachSettings(ctx) {
         profile.chatLayout = mu.chatLayout || "channel";
         profile.mateOnboardingShown = !!mu.mateOnboardingShown;
         profile.matesEnabled = mu.matesEnabled === true;
+        profile.capsulesEnabled = users.getCapsulesEnabled(mu.id);
         try { profile.terminalFont = users.getTerminalFont(mu.id); } catch (e) {}
         res.writeHead(200, { "Content-Type": "application/json" });
         res.end(JSON.stringify(profile));
@@ -53,6 +57,7 @@ function attachSettings(ctx) {
         profile.chatLayout = dc.chatLayout || "channel";
         profile.mateOnboardingShown = !!dc.mateOnboardingShown;
         profile.matesEnabled = dc.matesEnabled === true;
+        profile.capsulesEnabled = dc.capsulesEnabled === true;
         if (dc.terminalFont && typeof dc.terminalFont === "object") {
           profile.terminalFont = {
             family: dc.terminalFont.family || "'SF Mono', Menlo, Monaco, 'Courier New', monospace",

package/lib/server-tools.js

@@ -2,14 +2,29 @@ var toolsRegistry = require("./tools-registry");
 var toolStorage = require("./tool-storage");
 var crypto = require("crypto");
 var toolLlm = require("./tool-llm");
+var capsuleFloor = require("./capsule-display-floor");
+var capsuleServerRuntimes = require("./capsule-server-runtimes");
+var capsuleFrameServer = require("./capsule-frame-server");
+var capsuleMateTurn = require("./capsule-mate-turn");
 
 function attachTools(deps) {
   var users = deps.users;
   var projects = deps.projects;
-  var serverLogic = Object.create(null);
+  var serverRuntimes = deps.serverRuntimes || capsuleServerRuntimes;
+  var frameServer = deps.frameServer || capsuleFrameServer.createCapsuleFrameServer({ tlsOptions: deps.tlsOptions || null });
+  var mateTurn = deps.mateTurn || capsuleMateTurn.attachCapsuleMateTurn({
+    users: users,
+    findMateProject: deps.findMateProject || null,
+    broadcastToUser: function (targetUserId, payload) { broadcastToUser(targetUserId, payload); },
+  });
   var controlTimeoutMs = deps.controlTimeoutMs || 15000;
   var llmControlTimeoutMs = deps.llmControlTimeoutMs || 90000;
   var pendingControl = Object.create(null);
+  var isCapsulesEnabled = deps.isCapsulesEnabled || function () { return true; };
+
+  function requireCapsulesEnabled(userId) {
+    if (!isCapsulesEnabled(userId)) throw new Error("Capsules are disabled in User Settings.");
+  }
 
   function contextFor(userId) {
     var multiUser = users.isMultiUser();
@@ -68,6 +83,7 @@ function attachTools(deps) {
   }
 
   function installedManifests(userId) {
+    if (!isCapsulesEnabled(userId)) return [];
     var ctx = contextFor(userId);
     return toolsRegistry.listTools(ctx).filter(function (manifest) { return !manifest.error; });
   }
@@ -137,20 +153,52 @@ function attachTools(deps) {
     });
   }
 
+  // One act pipeline for server-runtime Capsules. The human's button click and
+  // the Mate's clay_tool_act call both arrive here, so the same Logic enforces
+  // the same rules for both and neither gets a private path. The seat is set
+  // from the server-resolved actor, never from caller-supplied text.
+  //
+  // The caller gets state and nothing else: a Mate never sees Display. Every
+  // successful act additionally pushes its causal {seq, actor, action,
+  // previous, next} event to the user's own connected clients, so a watching
+  // Display re-renders on any Logic change no matter who caused it.
+  async function controlServerCapsule(userId, installed, actor, callerId, kind, payload) {
+    var runtime = serverRuntimes.createRuntime(installed.manifest.id, contextFor(userId));
+    if (!runtime) throw new Error("No trusted server runtime is registered for this capsule.");
+    var context = { userId: userId, actor: actor, callerId: callerId };
+    if (kind === "snapshot") return runtime.snapshot(context);
+    if (kind === "act") {
+      var result = await runtime.act(context, payload.actionId, payload.args || {});
+      if (result && result.event) {
+        broadcastToUser(userId, { type: "tool_server_event", toolId: installed.manifest.id, event: result.event });
+        // The game round-trips: a Mate act names the opponent seat, and a
+        // human act that hands the turn over wakes that Mate to play it.
+        if (actor === "mate" && callerId) mateTurn.rememberOpponent(userId, installed.manifest.id, callerId);
+        mateTurn.maybeNudge(userId, installed.manifest, actor, result.event);
+        return result.state;
+      }
+      return result;
+    }
+    if (kind === "set" && runtime.set) return runtime.set(context, payload.controlId, payload.value);
+    throw new Error("The server-runtime capsule does not support '" + kind + "'.");
+  }
+
   function controlForMate(userId, mateId, toolId, kind, payload) {
+    requireCapsulesEnabled(userId);
     payload = payload || {};
     var ctx = contextFor(userId);
     toolsRegistry.listTools(ctx);
     var installed = toolsRegistry.getTool(ctx, toolId);
     if (!installed) return Promise.reject(new Error("Tool is not installed."));
+    // Skills are gated by Display: the Mate loses a Capsule at the same moment
+    // the human loses the declarative floor it is operated through.
+    if (!capsuleFloor.hasUsableFloor(installed.manifest, installed.uiTree)) {
+      return Promise.reject(new Error("This Capsule has no usable human Display, so it is unavailable to Mates."));
+    }
     if (installed.manifest.runtime === "server") {
-      var adapter = serverLogic[toolId];
-      if (!adapter) return Promise.reject(new Error("No trusted server runtime is registered for this capsule."));
-      var context = { userId: userId, callerId: mateId };
-      if (kind === "snapshot") return Promise.resolve(adapter.snapshot(context));
-      if (kind === "act") return Promise.resolve(adapter.act(context, payload.actionId, payload.args || {}));
-      if (kind === "set" && adapter.set) return Promise.resolve(adapter.set(context, payload.controlId, payload.value));
-      return Promise.reject(new Error("The server-runtime capsule does not support '" + kind + "'."));
+      return Promise.resolve().then(function () {
+        return controlServerCapsule(userId, installed, "mate", mateId, kind, payload);
+      });
     }
     var permissions = installed.manifest.permissions || [];
     var timeoutMs = kind === "act" && permissions.indexOf("llm") !== -1 ? llmControlTimeoutMs : controlTimeoutMs;
@@ -211,6 +259,7 @@ function attachTools(deps) {
   }
 
   function installForMate(userId, input) {
+    requireCapsulesEnabled(userId);
     var installed = toolsRegistry.installTool(contextFor(userId), input);
     refreshMateCatalogs(userId);
     broadcastToUser(userId, { type: "tool_installed", tool: installed });
@@ -218,6 +267,7 @@ function attachTools(deps) {
   }
 
   function sourceForMate(userId, toolId) {
+    requireCapsulesEnabled(userId);
     var ctx = contextFor(userId);
     var installed = toolsRegistry.getTool(ctx, toolId);
     if (!installed) throw new Error("Tool not found.");
@@ -229,6 +279,7 @@ function attachTools(deps) {
   }
 
   function updateForMate(userId, toolId, input) {
+    requireCapsulesEnabled(userId);
     var ctx = contextFor(userId);
     var installed = toolsRegistry.getTool(ctx, toolId);
     if (!installed) throw new Error("Tool not found.");
@@ -243,6 +294,7 @@ function attachTools(deps) {
   }
 
   function setMateAccess(userId, toolId, allowed, requestId) {
+    requireCapsulesEnabled(userId);
     var ctx = contextFor(userId);
     var tool = toolsRegistry.getTool(ctx, toolId);
     if (!tool) throw new Error("Tool not found.");
@@ -255,6 +307,7 @@ function attachTools(deps) {
   }
 
   function removeForMate(userId, toolId) {
+    requireCapsulesEnabled(userId);
     var removed = toolsRegistry.removeTool(contextFor(userId), toolId);
     if (!removed) throw new Error("Tool not found.");
     refreshMateCatalogs(userId);
@@ -262,8 +315,19 @@ function attachTools(deps) {
     return { removed: true, toolId: toolId };
   }
 
+  // The human half of the shared server-Capsule pipeline. Same Logic, same
+  // rules, no AI in the path.
+  function controlForUser(userId, toolId, kind, payload) {
+    requireCapsulesEnabled(userId);
+    var ctx = contextFor(userId);
+    var installed = toolsRegistry.getTool(ctx, toolId);
+    if (!installed) throw new Error("Tool is not installed.");
+    if (installed.manifest.runtime !== "server") throw new Error("This Capsule does not run on the server.");
+    return controlServerCapsule(userId, installed, "human", "user", kind, payload || {});
+  }
+
   function handleMessage(ws, msg) {
-    var messageTypes = ["tools_list", "tool_get", "tool_install", "tool_remove", "tool_storage_op", "tool_llm_op", "tool_llm_config_get", "tool_control_response", "tool_source_get", "tool_mate_access_set"];
+    var messageTypes = ["tools_list", "tool_get", "tool_install", "tool_remove", "tool_storage_op", "tool_llm_op", "tool_llm_config_get", "tool_control_response", "tool_source_get", "tool_mate_access_set", "tool_server_control", "tool_frame_url"];
     if (!msg || messageTypes.indexOf(msg.type) === -1) return false;
     var userId;
     if (users.isMultiUser()) {
@@ -279,6 +343,12 @@ function attachTools(deps) {
       return true;
     }
 
+    if (!isCapsulesEnabled(userId)) {
+      if (msg.type === "tools_list") send(ws, { type: "tools_state", tools: [] });
+      else sendError(ws, msg, new Error("Capsules are disabled in User Settings."));
+      return true;
+    }
+
     if (msg.type === "tools_list") {
       run(ws, msg, function () {
         send(ws, { type: "tools_state", tools: fullToolList(ctx) });
@@ -312,6 +382,52 @@ function attachTools(deps) {
       });
       return true;
     }
+    if (msg.type === "tool_frame_url") {
+      // The rich element renders on a separate anonymous origin, so the frame
+      // URL is minted here, on the authenticated socket, as a short-lived
+      // one-time token bound to this user's tools root. The rich element is
+      // additive only: it exists solely when the floor already validated at
+      // registration, and losing it never costs the human the floor.
+      Promise.resolve().then(function () {
+        var ctx = contextFor(userId);
+        var installed = toolsRegistry.getTool(ctx, msg.toolId);
+        if (!installed) throw new Error("Tool is not installed.");
+        if (!installed.hasRichDisplay) throw new Error("This Capsule ships no rich Display element.");
+        return frameServer.issueFrameUrl(ctx, msg.toolId);
+      }).then(function (frame) {
+        send(ws, { type: "tool_frame_url_state", toolId: msg.toolId, requestId: msg.requestId || null, ok: true, frame: frame });
+      }).catch(function (error) {
+        send(ws, {
+          type: "tool_frame_url_state",
+          toolId: msg.toolId,
+          requestId: msg.requestId || null,
+          ok: false,
+          error: error && error.message ? error.message : "The rich Display is unavailable.",
+        });
+      });
+      return true;
+    }
+    if (msg.type === "tool_server_control") {
+      Promise.resolve().then(function () {
+        return controlForUser(userId, msg.toolId, msg.kind, {
+          actionId: msg.actionId,
+          args: msg.args || {},
+          controlId: msg.controlId,
+          value: msg.value,
+        });
+      }).then(function (state) {
+        send(ws, { type: "tool_server_state", toolId: msg.toolId, requestId: msg.requestId || null, ok: true, state: state });
+      }).catch(function (error) {
+        send(ws, {
+          type: "tool_server_state",
+          toolId: msg.toolId,
+          requestId: msg.requestId || null,
+          ok: false,
+          error: error && error.message ? error.message : "The Capsule action failed.",
+        });
+      });
+      return true;
+    }
     if (msg.type === "tool_install") {
       run(ws, msg, function () {
         installForMate(userId, {
@@ -366,11 +482,13 @@ function attachTools(deps) {
     handleMessage: handleMessage,
     installedManifests: installedManifests,
     controlForMate: controlForMate,
+    controlForUser: controlForUser,
     installForMate: installForMate,
     sourceForMate: sourceForMate,
     updateForMate: updateForMate,
     setMateAccess: setMateAccess,
     removeForMate: removeForMate,
+    refreshMateCatalogs: refreshMateCatalogs,
   };
 }