clay-server 4.0.0-beta.9 → 4.0.1-beta.1

package/lib/server.js

@@ -23,6 +23,8 @@ var serverPalette = require("./server-palette");
 var workspaceQueryModule = require("./workspace-query-service");
 var { attachWorkspaceQueryService } = workspaceQueryModule;
 var { attachWorkspaceAssignmentService } = require("./workspace-assignment-service");
+var { attachProjectLogsService } = require("./project-logs-service");
+var { attachMateKnowledgeService } = require("./mate-knowledge-service");
 var serverEmail = require("./server-email");
 var serverGlobalWs = require("./server-global-ws");
 var { parseWsRequestUrl } = require("./ws-request");
@@ -122,6 +124,14 @@ function stripPrefix(urlPath, slug) {
   return rest || "/";
 }
 
+function injectRootProjectSlug(html, slug) {
+  var bodyPattern = /<body\b([^>]*)>/i;
+  if (!bodyPattern.test(html)) throw new Error("App shell body is missing");
+  return html.replace(bodyPattern, function (_match, attributes) {
+    return '<body' + attributes + ' data-home-project-slug="' + slug + '">';
+  });
+}
+
 /**
  * Create a multi-project server.
  * opts: { tlsOptions, caPath, pinHash, port, debug, dangerouslySkipPermissions }
@@ -306,18 +316,50 @@ function createServer(opts) {
   var workspaceQueryService = attachWorkspaceQueryService({
     getProjects: function () { return projects; },
     isMultiUser: function () { return users.isMultiUser(); },
-    canAccessProject: function (userId, status) {
-      return users.canAccessProject(userId, {
-        ownerId: status && status.projectOwnerId || null,
-        visibility: status && status.visibility || "public",
-        allowedUsers: status && status.allowedUsers || [],
-      });
+    // Project access is resolved from the authoritative project record, not
+    // from getStatus(), which carries no visibility or allowedUsers fields and
+    // would otherwise default every project to public.
+    onGetProjectAccess: onGetProjectAccess,
+    canAccessProject: function (userId, access) {
+      return users.canAccessProject(userId, access) === true;
     },
     resolveMate: function (userId, mateId) {
       return mates.getMate(mates.buildMateCtx(users.isMultiUser() ? userId : null), mateId);
     },
     assignmentService: assignmentService,
   });
+  // Project access is resolved from the authoritative project record, not from
+  // getStatus(), which carries no visibility or allowedUsers fields.
+  var projectLogsService = attachProjectLogsService({
+    getProjects: function () { return projects; },
+    isMultiUser: function () { return users.isMultiUser(); },
+    canAccessProject: function (userId, status) {
+      if (!status || !status.slug || !onGetProjectAccess) return false;
+      var access = onGetProjectAccess(status.slug);
+      if (!access || access.error) return false;
+      return users.canAccessProject(userId, access) === true;
+    },
+    resolveMate: function (userId, mateId) {
+      return mates.getMate(mates.buildMateCtx(users.isMultiUser() ? userId : null), mateId);
+    },
+    findUserById: function (userId) { return users.findUserById(userId); },
+  });
+  // Mate Knowledge reads the synchronized Knowledge records. The Mate list is
+  // derived from the owning user alone, so a binding can never span users.
+  var mateKnowledgeService = attachMateKnowledgeService({
+    getProjects: function () { return projects; },
+    isMultiUser: function () { return users.isMultiUser(); },
+    resolveMate: function (userId, mateId) {
+      return mates.getMate(mates.buildMateCtx(users.isMultiUser() ? userId : null), mateId);
+    },
+    listMates: function (userId) {
+      var mateCtx = mates.buildMateCtx(users.isMultiUser() ? userId : null);
+      var all = mates.getAllMates(mateCtx) || [];
+      return all.map(function (mate) {
+        return { id: mate.id, name: mate.name || null, createdBy: mate.createdBy || null, dir: mates.getMateDir(mateCtx, mate.id) };
+      });
+    },
+  });
 
   // --- Admin module ---
   var admin = serverAdmin.attachAdmin({
@@ -351,6 +393,9 @@ function createServer(opts) {
     projects: projects,
     opts: opts,
     CONFIG_DIR: CONFIG_DIR,
+    onCapsulesPreferenceChanged: function (userId) {
+      if (toolsHandler) toolsHandler.refreshMateCatalogs(userId);
+    },
   });
 
   var palette = serverPalette.attachPalette({
@@ -388,16 +433,38 @@ function createServer(opts) {
     securityHeaders["Strict-Transport-Security"] = "max-age=31536000; includeSubDomains";
   }
 
-  function setSecurityHeaders(res) {
+  // Capsule rich-Display frames are served by a second listener on the same
+  // hostname but a different port, so frame-src cannot stay at the default
+  // 'self'. The allowance is computed from the request's own hostname with
+  // any port, never a wildcard host, and only for the scheme the app itself
+  // speaks. If the host header is unusable the CSP stays at 'self' and the
+  // frame silently falls back to the floor Display.
+  function frameSrcFor(req) {
+    var host = req && req.headers && typeof req.headers.host === "string" ? req.headers.host : "";
+    if (!host) return "'self'";
+    var scheme = tlsOptions ? "https" : "http";
+    var hostname;
+    try {
+      hostname = new URL(scheme + "://" + host).hostname;
+    } catch (error) {
+      return "'self'";
+    }
+    if (!hostname) return "'self'";
+    if (hostname.indexOf(":") !== -1) hostname = "[" + hostname + "]";
+    return "'self' " + scheme + "://" + hostname + ":*";
+  }
+
+  function setSecurityHeaders(res, req) {
     var keys = Object.keys(securityHeaders);
     for (var i = 0; i < keys.length; i++) {
       res.setHeader(keys[i], securityHeaders[keys[i]]);
     }
+    res.setHeader("Content-Security-Policy", securityHeaders["Content-Security-Policy"] + " frame-src " + frameSrcFor(req) + ";");
   }
 
   // --- HTTP handler ---
   var appHandler = function (req, res) {
-    setSecurityHeaders(res);
+    setSecurityHeaders(res, req);
     var fullUrl = req.url.split("?")[0];
 
     // --- Auth routes (delegated to server-auth) ---
@@ -682,7 +749,8 @@ function createServer(opts) {
     // --- Skills routes (delegated to server-skills) ---
     if (skills.handleRequest(req, res, fullUrl)) return;
 
-    // Root path — render home while keeping the last accessible project connected.
+    // Root path — render the default project workspace while keeping Home
+    // available as an explicit client-side surface.
     if (fullUrl === "/" && req.method === "GET") {
       if (!isRequestAuthed(req)) {
         res.writeHead(200, { "Content-Type": "text/html; charset=utf-8" });
@@ -692,11 +760,16 @@ function createServer(opts) {
       if (projects.size > 0) {
         var targetSlug = null;
         var reqUser = users.isMultiUser() ? getMultiUserFromReq(req) : null;
+        function isOrdinaryProject(slug) {
+          var candidate = slug ? projects.get(slug) : null;
+          var status = candidate && candidate.getStatus ? candidate.getStatus() : null;
+          return !!candidate && (!status || status.isMate !== true);
+        }
         var homePreference = typeof users.getHomeSurfacePreference === "function"
           ? users.getHomeSurfacePreference(reqUser ? reqUser.id : "default")
           : null;
         var preferredContextSlug = homePreference && homePreference.projectSlug;
-        if (preferredContextSlug && projects.has(preferredContextSlug)) {
+        if (isOrdinaryProject(preferredContextSlug)) {
           if (reqUser && onGetProjectAccess) {
             var preferredAccess = onGetProjectAccess(preferredContextSlug);
             if (preferredAccess && !preferredAccess.error && users.canAccessProject(reqUser.id, preferredAccess)) {
@@ -708,7 +781,7 @@ function createServer(opts) {
         }
         // Check for last-visited project cookie
         var lastProject = parseCookies(req)["clay_last_project"];
-        if (!targetSlug && lastProject && projects.has(lastProject)) {
+        if (!targetSlug && isOrdinaryProject(lastProject)) {
           if (reqUser && onGetProjectAccess) {
             var lpAccess = onGetProjectAccess(lastProject);
             if (lpAccess && !lpAccess.error && users.canAccessProject(reqUser.id, lpAccess)) {
@@ -722,6 +795,7 @@ function createServer(opts) {
         if (!targetSlug) {
           projects.forEach(function (ctx, s) {
             if (targetSlug) return;
+            if (!isOrdinaryProject(s)) return;
             if (reqUser && onGetProjectAccess) {
               var access = onGetProjectAccess(s);
               if (access && !access.error && users.canAccessProject(reqUser.id, access)) {
@@ -735,7 +809,7 @@ function createServer(opts) {
         if (targetSlug) {
           try {
             var homeHtml = fs.readFileSync(path.join(publicDir, "index.html"), "utf8");
-            homeHtml = homeHtml.replace("<body>", '<body data-home-project-slug="' + targetSlug + '">');
+            homeHtml = injectRootProjectSlug(homeHtml, targetSlug);
             res.writeHead(200, { "Content-Type": "text/html; charset=utf-8", "Cache-Control": "no-cache" });
             res.end(homeHtml);
           } catch (e) {
@@ -937,17 +1011,24 @@ function createServer(opts) {
 
   // --- WebSocket ---
   var wss = new WebSocketServer({ noServer: true });
+  var homePreferencesHandler = null;
 
   // Slug-less /ws handler: lets a user with no projects yet load the regular
   // app shell and create/add/clone their first one. Only knows about the
-  // small set of bootstrap messages (browse_dir, add_project, create_project,
-  // clone_project, ping).
+  // small set of bootstrap messages, including the Home preferences required
+  // to dismiss the workspace restoration screen.
   var globalWs = serverGlobalWs.attachGlobalWs({
     osUsers: osUsers,
     usersModule: users,
     onAddProject: onAddProject,
     onCreateProject: onCreateProject,
     onCloneProject: onCloneProject,
+    onHomePreferenceMessage: function (ws, msg) {
+      return homePreferencesHandler ? homePreferencesHandler.handleMessage(ws, msg) : false;
+    },
+    onAppMessage: function (ws, msg) {
+      return handleDmMessage(ws, msg);
+    },
   });
 
   server.on("upgrade", function (req, socket, head) {
@@ -1182,6 +1263,7 @@ function createServer(opts) {
       title: title || null,
       icon: icon || null,
       projectOwnerId: projectOwnerId || null,
+      projectKnowledgeId: extra.projectKnowledgeId || (worktreeMeta && worktreeMeta.projectKnowledgeId) || null,
       worktreeMeta: worktreeMeta || null,
       isMate: extra.isMate || false,
       mateId: extra.mateId || (extra.isMate ? path.basename(cwd) : null),
@@ -1192,6 +1274,21 @@ function createServer(opts) {
         return mateHandler.createReadyMateFromInterview(ws, userId, definition);
       },
       workspaceQueryService: workspaceQueryService,
+      projectLogsService: projectLogsService,
+      mateKnowledgeService: mateKnowledgeService,
+      canAccessProjectSlug: function (userId, targetSlug) {
+        var target = projects.get(targetSlug);
+        if (!target) return false;
+        var status = target.getStatus();
+        var access;
+        if (status.isMate) {
+          access = { visibility: "private", ownerId: status.projectOwnerId, allowedUsers: [] };
+        } else {
+          if (!onGetProjectAccess) return false;
+          access = onGetProjectAccess(status.parentSlug || targetSlug);
+        }
+        return !!(access && !access.error && users.canAccessProject(userId, access));
+      },
       getProjectAccess: function () {
         return onGetProjectAccess ? onGetProjectAccess(slug) : { visibility: "public", ownerId: projectOwnerId || null };
       },
@@ -1361,6 +1458,10 @@ function createServer(opts) {
     return true;
   }
 
+  function setProjectLogContextState(slug, status) {
+    return projectLogsService.setContextState(slug, status);
+  }
+
   // --- DM message handler (delegated to server-dm + server-mates inline) ---
   var dmHandler = serverDm.attachDm({
     users: users,
@@ -1381,9 +1482,10 @@ function createServer(opts) {
     projects: projects,
     addProject: addProject,
     workspaceQueryService: workspaceQueryService,
+    projectLogsService: projectLogsService,
   });
 
-  var homePreferencesHandler = serverHomePreferences.attachHomePreferences({
+  homePreferencesHandler = serverHomePreferences.attachHomePreferences({
     users: users,
     projects: projects,
   });
@@ -1392,6 +1494,17 @@ function createServer(opts) {
   var toolsHandler = serverTools.attachTools({
     users: users,
     projects: projects,
+    // The rich-Display frame listener must speak the same scheme as the app,
+    // or the sandboxed frame would be blocked as mixed content under TLS.
+    tlsOptions: tlsOptions,
+    // Lets a Capsule turn handed to the mate seat wake the opponent Mate's
+    // project, registering it first if it has never been opened.
+    findMateProject: homeChatHandler.findMateProject,
+    isCapsulesEnabled: function (userId) {
+      if (users.isMultiUser()) return users.getCapsulesEnabled(userId);
+      var daemonConfig = onGetDaemonConfig ? onGetDaemonConfig() : {};
+      return daemonConfig.capsulesEnabled === true;
+    },
   });
 
   // --- Mate handler ---
@@ -1402,13 +1515,14 @@ function createServer(opts) {
   }
 
   function handleDmMessage(ws, msg, routedProjectSlug) {
-    if (assignmentService.handleMessage(ws, msg, routedProjectSlug)) return;
-    if (dmHandler.handleMessage(ws, msg)) return;
-    if (mateHandler && mateHandler.handleMessage(ws, msg)) return;
-    if (emailHandler.handleMessage(ws, msg)) return;
-    if (homeChatHandler.handleMessage(ws, msg)) return;
-    if (homePreferencesHandler.handleMessage(ws, msg)) return;
-    if (toolsHandler.handleMessage(ws, msg)) return;
+    if (assignmentService.handleMessage(ws, msg, routedProjectSlug)) return true;
+    if (dmHandler.handleMessage(ws, msg)) return true;
+    if (mateHandler && mateHandler.handleMessage(ws, msg)) return true;
+    if (emailHandler.handleMessage(ws, msg)) return true;
+    if (homeChatHandler.handleMessage(ws, msg)) return true;
+    if (homePreferencesHandler.handleMessage(ws, msg)) return true;
+    if (toolsHandler.handleMessage(ws, msg)) return true;
+    return false;
   }
 
   function removeProject(slug) {
@@ -1702,6 +1816,7 @@ function createServer(opts) {
     forEachProject: forEachProject,
     destroyProject: removeProject,
     destroyAll: destroyAll,
+    setProjectLogContextState: setProjectLogContextState,
   };
 }
 

package/lib/session-driver-eligibility.js

@@ -0,0 +1,38 @@
+// Driver capability for a visible Driver/Split Worker pair.
+//
+// Model and vendor choice belongs to the user. A session does not need to
+// clear a model-tier threshold to coordinate a Split Worker; runtime catalog
+// validation belongs to session-pair-factory.js and applies equally to every
+// requested role. The only session-level exclusion here is structural: an
+// embedded terminal has no project chat surface on which to host the Driver
+// controls or the paired pane.
+
+var sessionProvenance = require("./session-provenance");
+
+function evaluateDriverSession(session) {
+  if (!session) {
+    return { ok: false, error: "No session was bound to this request." };
+  }
+  if (session.mode === "tui") {
+    return {
+      ok: false,
+      error: "An embedded terminal session cannot take the Driver role.",
+    };
+  }
+  if (sessionProvenance.isWorker(session)) {
+    return {
+      ok: false,
+      error: "A Split Worker session cannot take the Driver role.",
+    };
+  }
+  return { ok: true, error: null };
+}
+
+function isEligibleDriverSession(session) {
+  return evaluateDriverSession(session).ok;
+}
+
+module.exports = {
+  evaluateDriverSession: evaluateDriverSession,
+  isEligibleDriverSession: isEligibleDriverSession,
+};

package/lib/session-driver-orchestration.js

@@ -0,0 +1,31 @@
+// Model-tier policy for proactive Split Worker orchestration.
+//
+// Structural Driver eligibility remains model-agnostic. This policy only
+// decides whether a model should be prompted to judge when delegation helps.
+
+var HIGH_TIER_PATTERNS = {
+  claude: [/(?:^|-)fable(?:-|$)/i, /(?:^|-)opus(?:-|$)/i],
+  codex: [/^gpt-6(?:-|$)/i, /^gpt-[0-9]+(?:\.[0-9]+)?-sol(?:-|$)/i],
+};
+
+function resolvedModel(session, sm) {
+  if (!session) return "";
+  var vendor = session.vendor || "claude";
+  var defaults = sm && sm.defaultModelByVendor || {};
+  return session.model || defaults[vendor] || "";
+}
+
+function isHighTierDriverSession(session, sm) {
+  if (!session) return false;
+  var patterns = HIGH_TIER_PATTERNS[session.vendor || "claude"] || [];
+  var model = resolvedModel(session, sm);
+  for (var i = 0; i < patterns.length; i++) {
+    if (patterns[i].test(model)) return true;
+  }
+  return false;
+}
+
+module.exports = {
+  isHighTierDriverSession: isHighTierDriverSession,
+  resolvedModel: resolvedModel,
+};

package/lib/session-hygiene.js

@@ -2,6 +2,8 @@
 // "New session" request and which abandoned blanks are safe to sweep.
 // Pure decision logic only -- deletion/switching stays in sessions.js.
 
+var sessionProvenance = require("./session-provenance");
+
 var BLANK_SESSION_MAX_AGE_MS = 24 * 60 * 60 * 1000;
 var CLAUDE_INTERRUPTED_TEXT = "[Request interrupted by user]";
 
@@ -19,6 +21,7 @@ function isBlankSession(s) {
     && !s.bookmarked
     && !s.spawn
     && !s.loop
+    && !sessionProvenance.isWorker(s)
     && (s.mode || "gui") !== "tui"
     && s.terminalId == null;
 }

package/lib/session-notes-mcp-server.js

@@ -9,14 +9,18 @@ var MEMORY_CONTRACT =
   "Important exception for deferred defects: while doing code or technical work, actively create a sticky note when you discover a concrete defect, regression risk, security issue, or data-loss risk that is outside the current session goal and will remain unfixed when the turn ends. Do not wait for the user to ask. Include the observable evidence, affected component, likely impact, and a clear next action. Check active notes first when a duplicate is plausible. Do not create defect notes for speculation, general cleanup ideas, or problems you fixed in the current session. " +
   "Important exception for deferred proposals: when you propose work (a fix, follow-up, improvement, or next step) and the user defers it rather than declining it (\"let's do that later\", \"next time\", \"after this\"), actively create a sticky note before the topic moves on. Do not wait to be asked. Capture what was proposed, why it mattered, and the agreed timing if any. Deferred agreements scroll out of chat history quickly and are hard to track; the board is where they survive. If the user declines the idea outright, do not write a note. " +
   "Never create a note merely because work is important, lengthy, spans agents or restarts, or might help another agent. Do not record completed work, implementation details, test results, investigation logs, transient blockers, conversation summaries, or announcements of your own activity. When uncertain, do not write. " +
-  "Updates are visible too: update only when durable state materially changes, and remove a note created by your session when it stops being useful instead of turning it into a completion log. Put a concise plain-text title on the first line, stay focused on one topic, and include only the context needed for future action.";
+  "Updates are visible too: update only when durable state materially changes. " +
+  "A note is an attention item, so finishing it means closing it, never erasing it: call close_note once the thing it is asking for is done, and the note leaves the active board while the record stays and can be reopened. Do not turn a note into a completion log instead of closing it. " +
+  "Put a concise plain-text title on the first line, stay focused on one topic, and include only the context needed for future action.";
 
 function getToolDefs(handlers) {
   return [
     {
       name: "list_notes",
-      description: MEMORY_CONTRACT + " List the active notes before writing when you need to avoid duplicates or inspect full memory beyond the injected summary.",
-      inputSchema: buildShape({}),
+      description: MEMORY_CONTRACT + " List the notes before writing when you need to avoid duplicates or inspect full memory beyond the injected summary. Lists open notes by default; pass state to see closed ones.",
+      inputSchema: buildShape({
+        state: { type: "string", enum: ["open", "closed", "all"], description: "Which notes to list. Defaults to open, the notes still asking for action." },
+      }),
       handler: function (args) { return handlers.list(args || {}); },
     },
     {
@@ -29,11 +33,27 @@ function getToolDefs(handlers) {
       }, ["text"]),
       handler: function (args) { return handlers.write(args || {}); },
     },
+    {
+      name: "close_note",
+      description: MEMORY_CONTRACT + " Close a note created by this same session once what it asked for is done. Closing is not deletion: the note leaves the active board, stays queryable under state closed, and can be reopened. Notes created by users or other sessions cannot be closed by this session.",
+      inputSchema: buildShape({
+        id: { type: "string", description: "Id of the note to close." },
+      }, ["id"]),
+      handler: function (args) { return handlers.close(args || {}); },
+    },
+    {
+      name: "reopen_note",
+      description: MEMORY_CONTRACT + " Reopen a closed note created by this same session when it turns out to still need action. The note returns to the active board unchanged.",
+      inputSchema: buildShape({
+        id: { type: "string", description: "Id of the note to reopen." },
+      }, ["id"]),
+      handler: function (args) { return handlers.reopen(args || {}); },
+    },
     {
       name: "remove_note",
-      description: MEMORY_CONTRACT + " Remove a note created by this same session when it is no longer true. Notes created by users or other sessions cannot be removed.",
+      description: MEMORY_CONTRACT + " Deprecated: use close_note. This tool no longer deletes anything and now closes the note instead, so an older caller cannot destroy a record. Same ownership rule as close_note.",
       inputSchema: buildShape({
-        id: { type: "string", description: "Id of the note to remove." },
+        id: { type: "string", description: "Id of the note to close. Nothing is deleted." },
       }, ["id"]),
       handler: function (args) { return handlers.remove(args || {}); },
     },