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

package/lib/server-admin.js

@@ -18,6 +18,13 @@ function attachAdmin(ctx) {
   var onGetProjectAccess = ctx.onGetProjectAccess;
   var onProjectOwnerChanged = ctx.onProjectOwnerChanged;
 
+  function verifyCurrentOwner(req, route) {
+    if (!route || req.method === "GET" || !users.isMultiUser()) return;
+    var actor = getMultiUserFromReq(req);
+    var access = onGetProjectAccess && onGetProjectAccess(route[1]);
+    if (!actor || !access || access.ownerId !== actor.id || !users.findUserById(access.ownerId)) throw new Error("Project owner access required");
+  }
+
   function handleRequest(req, res, fullUrl) {
     var mateAccessRoute = /^\/api\/admin\/projects\/([^/]+)\/(visibility|owner|users|access)$/.exec(fullUrl);
     if (mateAccessRoute) {
@@ -31,6 +38,25 @@ function attachAdmin(ctx) {
     }
 
 
+    // Project content authority belongs to the valid owner, never the role.
+    if (mateAccessRoute && users.isMultiUser()) {
+      var actor = getMultiUserFromReq(req);
+      var governing = onGetProjectAccess && onGetProjectAccess(mateAccessRoute[1]);
+      var validOwner = governing && governing.ownerId && users.findUserById(governing.ownerId);
+      var owns = actor && validOwner && actor.id === validOwner.id;
+      if (req.method !== "GET" && !owns) {
+        res.writeHead(403, { "Content-Type": "application/json" });
+        res.end(JSON.stringify({ error: "Only the valid project owner can change access." }));
+        return true;
+      }
+      if (req.method === "GET" && !owns && actor && actor.role === "admin") {
+        var overview = require("./project-admin-overview").metadataFor(actor, target && target.getStatus(), governing, users);
+        res.writeHead(overview ? 200 : 404, { "Content-Type": "application/json", "Cache-Control": "no-store" });
+        res.end(JSON.stringify(overview || { error: "Project not found" }));
+        return true;
+      }
+    }
+
     // --- Admin API endpoints (multi-user mode only) ---
 
     // List all users (admin only)
@@ -83,6 +109,16 @@ function attachAdmin(ctx) {
       // Look up the user before deletion to get linuxUser for deactivation
       var targetUser = users.findUserById(targetUserId);
       var targetLinuxUser = targetUser ? targetUser.linuxUser : null;
+      var owned = false;
+      projects.forEach(function (project, slug) {
+        var access = onGetProjectAccess && onGetProjectAccess(slug);
+        if (access && !access.isMate && access.ownerId === targetUserId) owned = true;
+      });
+      if (owned) {
+        res.writeHead(409, { "Content-Type": "application/json" });
+        res.end(JSON.stringify({ error: "The owner must transfer ordinary projects before account deletion." }));
+        return true;
+      }
       var result = users.removeUser(targetUserId);
       if (result.error) {
         res.writeHead(404, { "Content-Type": "application/json" });
@@ -118,6 +154,7 @@ function attachAdmin(ctx) {
       req.on("end", function () {
         try {
           var data = JSON.parse(body);
+          verifyCurrentOwner(req, mateAccessRoute);
           if (!data.username || typeof data.username !== "string" || data.username.trim().length < 1) {
             res.writeHead(400, { "Content-Type": "application/json" });
             res.end('{"error":"Username is required"}');
@@ -182,6 +219,11 @@ function attachAdmin(ctx) {
         res.end('{"error":"User not found"}');
         return true;
       }
+      if (mu.id !== targetUserId) {
+        res.writeHead(403, { "Content-Type": "application/json" });
+        res.end(JSON.stringify({ error: "Use account-owner credential recovery. Administrators cannot impersonate another account." }));
+        return true;
+      }
       var newPin = users.generatePin();
       var pinResult = users.updateUserPin(targetUserId, newPin);
       if (pinResult.error) {
@@ -222,15 +264,10 @@ function attachAdmin(ctx) {
       req.on("data", function(chunk) { body += chunk; });
       req.on("end", function() {
         try {
-          var parsed = JSON.parse(body);
-          var result = users.updateLinuxUser(targetUserId, parsed.linuxUser || null);
-          if (result.error) {
-            res.writeHead(400, { "Content-Type": "application/json" });
-            res.end(JSON.stringify({ error: result.error }));
-          } else {
-            res.writeHead(200, { "Content-Type": "application/json" });
-            res.end('{"ok":true}');
-          }
+          JSON.parse(body);
+          res.writeHead(403, { "Content-Type": "application/json" });
+          res.end(JSON.stringify({ error: "OS identity mapping requires server-side verified provisioning." }));
+          return;
         } catch (e) {
           res.writeHead(400, { "Content-Type": "application/json" });
           res.end('{"error":"Invalid request body"}');
@@ -363,6 +400,7 @@ function attachAdmin(ctx) {
       req.on("end", function () {
         try {
           var data = JSON.parse(body);
+          verifyCurrentOwner(req, mateAccessRoute);
           if (!data.email || !/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(data.email)) {
             res.writeHead(400, { "Content-Type": "application/json" });
             res.end('{"error":"Valid email is required"}');
@@ -429,6 +467,7 @@ function attachAdmin(ctx) {
       req.on("end", function () {
         try {
           var data = JSON.parse(body);
+          verifyCurrentOwner(req, mateAccessRoute);
           // Allow clearing SMTP config by sending empty fields
           if (!data.host && !data.user && !data.pass && !data.from) {
             smtp.saveSmtpConfig(null);
@@ -484,6 +523,7 @@ function attachAdmin(ctx) {
       req.on("end", function () {
         try {
           var data = JSON.parse(body);
+          verifyCurrentOwner(req, mateAccessRoute);
           // Use provided config or fall back to saved
           var existingCfg = smtp.getSmtpConfig();
           var pass = data.pass;
@@ -548,6 +588,7 @@ function attachAdmin(ctx) {
       req.on("end", function () {
         try {
           var data = JSON.parse(body);
+          verifyCurrentOwner(req, mateAccessRoute);
           if (data.visibility !== "public" && data.visibility !== "private") {
             res.writeHead(400, { "Content-Type": "application/json" });
             res.end('{"error":"Visibility must be public or private"}');
@@ -582,9 +623,10 @@ function attachAdmin(ctx) {
         return true;
       }
       var mu = getMultiUserFromReq(req);
-      if (!mu || mu.role !== "admin") {
+      var ownerAccess = onGetProjectAccess && onGetProjectAccess(fullUrl.split("/")[4]);
+      if (!mu || !ownerAccess || mu.id !== ownerAccess.ownerId) {
         res.writeHead(403, { "Content-Type": "application/json" });
-        res.end('{"error":"Admin access required"}');
+        res.end('{"error":"Project owner access required"}');
         return true;
       }
       var projSlug = fullUrl.split("/")[4];
@@ -598,17 +640,21 @@ function attachAdmin(ctx) {
       req.on("end", function () {
         try {
           var data = JSON.parse(body);
+          verifyCurrentOwner(req, mateAccessRoute);
           var targetCtx = projects.get(projSlug);
           if (!targetCtx) {
             res.writeHead(404, { "Content-Type": "application/json" });
             res.end('{"error":"Project not found"}');
             return;
           }
-          var ownerId = data.userId || null;
+          var ownerId = data.userId;
+          if (typeof ownerId !== "string" || !users.findUserById(ownerId)) throw new Error("A valid owner is required");
+          var currentAccess = onGetProjectAccess && onGetProjectAccess(projSlug);
+          if (!currentAccess || currentAccess.ownerId !== mu.id) throw new Error("Project owner access required");
+          if (!onProjectOwnerChanged) throw new Error("Ownership persistence is unavailable");
+          var saved = onProjectOwnerChanged(projSlug, ownerId);
+          if (saved && saved.error) throw new Error(saved.error);
           targetCtx.setProjectOwner(ownerId);
-          if (onProjectOwnerChanged) {
-            onProjectOwnerChanged(projSlug, ownerId);
-          }
           // Broadcast to project clients
           var ownerName = null;
           if (ownerId) {
@@ -653,7 +699,8 @@ function attachAdmin(ctx) {
       req.on("end", function () {
         try {
           var data = JSON.parse(body);
-          if (!Array.isArray(data.allowedUsers)) {
+          verifyCurrentOwner(req, mateAccessRoute);
+          if (!Array.isArray(data.allowedUsers) || data.allowedUsers.some(function (id) { return typeof id !== "string" || !users.findUserById(id); })) {
             res.writeHead(400, { "Content-Type": "application/json" });
             res.end('{"error":"allowedUsers must be an array"}');
             return;

package/lib/server-appearance-settings.js

@@ -34,6 +34,18 @@ function attachAppearanceSettings(ctx) {
       fs.renameSync(defaultPath + '.tmp', defaultPath);
     }
   }
+  function getInitialAppearance(req) {
+    var user = identity(req);
+    if (!user) return null;
+    var saved = read(user);
+    return {
+      configured: saved.configured,
+      theme: saved.theme,
+      mode: saved.mode,
+      lightTheme: saved.lightTheme || null,
+      darkTheme: saved.darkTheme || null
+    };
+  }
   function handleRequest(req, res, url) {
     if (url !== '/api/user/appearance') return false;
     var user = identity(req);
@@ -66,6 +78,6 @@ function attachAppearanceSettings(ctx) {
     });
     return true;
   }
-  return { handleRequest: handleRequest };
+  return { handleRequest: handleRequest, getInitialAppearance: getInitialAppearance };
 }
 module.exports = { attachAppearanceSettings: attachAppearanceSettings };

package/lib/server-contextual-clay-settings.js

@@ -0,0 +1,40 @@
+// Authenticated personal preferences, using the shared users/config persistence.
+function attachContextualClaySettings(ctx) {
+  function reply(res, status, data) {
+    res.writeHead(status, { 'Content-Type': 'application/json', 'Cache-Control': 'no-store' });
+    res.end(JSON.stringify(data));
+  }
+  function identity(req) {
+    if (!ctx.isRequestAuthed(req)) return null;
+    return ctx.users.isMultiUser() ? ctx.getMultiUserFromReq(req) : { id: 'default' };
+  }
+  function handleRequest(req, res, url) {
+    if (url !== '/api/user/contextual-clay-geometry') return false;
+    var user = identity(req);
+    if (!user) { reply(res, 401, { error: 'Sign in to manage popover preferences.' }); return true; }
+    if (req.method === 'GET') {
+      try { reply(res, 200, { geometry: ctx.users.getContextualClayGeometry(user.id) }); }
+      catch (error) { reply(res, 500, { error: 'Could not read popover preference.' }); }
+      return true;
+    }
+    if (req.method !== 'PUT') { reply(res, 405, { error: 'Method not allowed.' }); return true; }
+    if (req.headers['x-clay-settings'] !== '1' || (req.headers['sec-fetch-site'] && ['same-origin', 'none'].indexOf(req.headers['sec-fetch-site']) < 0)) {
+      reply(res, 403, { error: 'Save preferences from Clay.' }); return true;
+    }
+    var body = ''; var tooLarge = false;
+    req.setEncoding('utf8');
+    req.on('data', function (chunk) { body += chunk; if (body.length > 1024 && !tooLarge) { tooLarge = true; reply(res, 413, { error: 'Request too large.' }); } });
+    req.on('end', function () {
+      if (tooLarge) return;
+      var live = identity(req);
+      if (!live || live.id !== user.id) { reply(res, 401, { error: 'Sign in again.' }); return; }
+      try {
+        var result = ctx.users.setContextualClayGeometry(live.id, JSON.parse(body));
+        reply(res, result.error ? 400 : 200, result);
+      } catch (error) { reply(res, 400, { error: 'Could not save popover preference.' }); }
+    });
+    return true;
+  }
+  return { handleRequest: handleRequest };
+}
+module.exports = { attachContextualClaySettings: attachContextualClaySettings };

package/lib/server-contextual-mate-sessions.js

@@ -0,0 +1,70 @@
+// Presentation-only session operations share Home's authoritative permissions,
+// model policy, saved-session projection and session manager. No transcript tap.
+function attachContextualMateSessions(ctx) {
+  var receipts = new Map();
+  var lifetime = 30 * 60 * 1000;
+  function stamp(mate) { return JSON.stringify([mate.id, mate.createdBy || null, mate.createdAt || null, mate.builtinKey || null]); }
+  function live(ws, userId, msg, original) {
+    if (!ctx.isActorLive(ws, userId)) throw new Error('Your account is no longer available.');
+    var found = ctx.findMateProject(userId, msg.mateId, true);
+    if (!found || found.mate.archived || found.mate.lifecycleDeletion || found.mate.createdBy && found.mate.createdBy !== userId || stamp(found.mate) !== msg.mateStamp) throw new Error('This Mate is no longer available.');
+    var status = found.ctx.getStatus();
+    if (!status || !status.isMate || status.mateId !== found.mate.id || userId && status.projectOwnerId !== userId) throw new Error('This private Mate workspace is unavailable.');
+    found.contextualManager = found.ctx.getSessionManager();
+    found.contextualRevision = JSON.stringify([status.path, status.projectOwnerId, status.mateId, stamp(found.mate)]);
+    if (original && (found.ctx !== original.ctx || found.contextualRevision !== original.contextualRevision || found.contextualManager !== original.contextualManager)) throw new Error('This Mate conversation changed.');
+    return found;
+  }
+  function reply(ws, msg, data) { ctx.sendMessage(ws, Object.assign({ type: 'contextual_mate_sessions_result', requestId: msg.requestId, mateId: msg.mateId, mateStamp: msg.mateStamp }, data)); }
+  async function perform(ws, userId, msg) {
+    try {
+      if (typeof msg.requestId !== 'string' || !/^mate-conversations-[a-z0-9-]{36}$/.test(msg.requestId)) throw new Error('Invalid conversation request.');
+      var found = live(ws, userId, msg), manager = found.ctx.getSessionManager();
+      if (!manager) throw new Error('Conversation history is unavailable.');
+      if (msg.type === 'home_mate_sessions_list') {
+        var list = ctx.listHomeSessions(found, userId);
+        reply(ws, msg, { ok: true, sessions: list.slice(0, 500), truncated: list.length > 500 }); return;
+      }
+      var session;
+      if (msg.type === 'home_mate_session_open') {
+        session = ctx.resolveHomeSession(found, userId, msg.sessionId);
+        if (!session || typeof msg.sessionOriginId !== 'string' || msg.sessionOriginId !== session.sessionOriginId) throw new Error('This conversation is no longer available.');
+      } else {
+        var now = Date.now();
+        receipts.forEach(function (entry, key) { if (now - entry.at > lifetime) receipts.delete(key); });
+        var key = JSON.stringify([userId, msg.mateId, msg.requestId]);
+        var receipt = receipts.get(key);
+        manager.sessions.forEach(function (candidate) { if (candidate.contextualCreationRequestId === msg.requestId && ctx.ownsSession(candidate, userId)) session = candidate; });
+        if (session && session.contextualCreationMateStamp !== msg.mateStamp) throw new Error('This request belongs to a replaced Mate.');
+        if (receipt && (!session || receipt.origin !== session.sessionOriginId || receipt.stamp !== msg.mateStamp)) throw new Error('The previously created conversation is no longer available.');
+        if (!session && msg.lookupOnly) throw new Error('Creation was not confirmed. Start a new chat explicitly if you still want one.');
+        if (!session) {
+          if (receipts.size >= 1024) throw new Error('Please try starting a conversation later.');
+          var resolved = await ctx.homeModels.resolveMateModel(ws, found, userId);
+          found = live(ws, userId, msg, found);
+          // Recheck after model resolution: concurrent retries select one exact session.
+          manager.sessions.forEach(function (candidate) { if (candidate.contextualCreationRequestId === msg.requestId && ctx.ownsSession(candidate, userId)) session = candidate; });
+          receipt = receipts.get(key);
+          if (receipt && (!session || receipt.origin !== session.sessionOriginId || receipt.stamp !== msg.mateStamp)) throw new Error('The previously created conversation is no longer available.');
+          if (session && session.contextualCreationMateStamp !== msg.mateStamp) throw new Error('This request belongs to a replaced Mate.');
+          if (!session) {
+            if (receipts.size >= 1024) throw new Error('Please try starting a conversation later.');
+            session = manager.createSessionRaw({ ownerId: userId, vendor: resolved.vendor, model: resolved.model, effort: resolved.effort || null });
+            session.contextualCreationRequestId = msg.requestId;
+            session.contextualCreationMateStamp = msg.mateStamp;
+            manager.saveSessionFile(session);
+          }
+        }
+        if (!ctx.ownsSession(session, userId)) throw new Error('This conversation is no longer available.');
+        receipts.set(key, { at: now, origin: session.sessionOriginId, stamp: msg.mateStamp });
+      }
+      live(ws, userId, msg, found);
+      reply(ws, msg, { ok: true, sessionId: session.localId, sessionOriginId: session.sessionOriginId });
+    } catch (error) { reply(ws, msg, { ok: false, error: error.message || 'Conversation unavailable.' }); }
+  }
+  return { handle: function (ws, userId, msg) {
+    if (msg.presentation !== 'contextual' || !/^home_mate_(sessions_list|session_open|new_session)$/.test(msg.type)) return false;
+    perform(ws, userId, msg); return true;
+  } };
+}
+module.exports = { attachContextualMateSessions: attachContextualMateSessions };

package/lib/server-dm.js

@@ -49,7 +49,7 @@ function attachDm(ctx) {
       var mateCtx2 = mates.buildMateCtx(userId);
       if (mates.isMate(mateCtx2, msg.targetUserId)) {
         var mate = mates.getMate(mateCtx2, msg.targetUserId);
-        if (!mate) return true;
+        if (!mate || mate.lifecycleDeletion) return true;
         // Ensure mate project is registered (survives server restarts)
         var mateSlug2 = "mate-" + mate.id;
         if (!projects.has(mateSlug2)) {
@@ -69,6 +69,7 @@ function attachDm(ctx) {
             id: mate.id,
             displayName: mp.displayName || mate.name || "New Mate",
             username: mate.id,
+            avatarCatalogId: mp.avatarCatalogId || "",
             avatarStyle: mp.avatarStyle || "imprint",
             avatarSeed: mp.avatarSeed || mate.id,
             avatarColor: mp.avatarColor || "#5857fc",

package/lib/server-github-stars.js

@@ -0,0 +1,39 @@
+// server-github-stars.js - GET /api/github-stars for the top-bar Star link.
+//
+// Read-only. Returns the cached public star count of the fixed Clay
+// repository (null when not yet known). No request input reaches GitHub, and
+// nothing about the caller is sent or stored.
+
+var githubStarCount = require("./github-star-count");
+
+function attachGithubStars(ctx) {
+  var cache = ctx.cache || githubStarCount.createGithubStarCount();
+
+  function json(res, status, body) {
+    res.writeHead(status, { "Content-Type": "application/json", "Cache-Control": "no-store" });
+    res.end(JSON.stringify(body));
+  }
+
+  function handleRequest(req, res, url) {
+    if (url !== "/api/github-stars") return false;
+    if (req.method !== "GET") {
+      res.writeHead(405, { "Content-Type": "application/json", "Allow": "GET" });
+      res.end(JSON.stringify({ error: "Method not allowed." }));
+      return true;
+    }
+    if (!ctx.isRequestAuthed(req)) {
+      json(res, 401, { error: "Sign in to continue." });
+      return true;
+    }
+    cache.get().then(function (snapshot) {
+      json(res, 200, snapshot);
+    }, function () {
+      json(res, 200, { repo: githubStarCount.REPO, stars: null, fetchedAt: null });
+    });
+    return true;
+  }
+
+  return { handleRequest: handleRequest };
+}
+
+module.exports = { attachGithubStars: attachGithubStars };

package/lib/server-global-ws.js

@@ -19,6 +19,9 @@
 var fs = require("fs");
 var path = require("path");
 var config = require("./config");
+var startProtocol = require("./project-start-protocol");
+var startReply = startProtocol.withRequestId;
+var browseMeta = startProtocol.browseMeta;
 
 // Mirrored from lib/project.js — keep in sync if entries change there.
 var IGNORED_DIRS = new Set([
@@ -63,14 +66,6 @@ function attachGlobalWs(opts) {
     if (msg.type === "browse_dir") {
       var rawPath = (msg.path || "").replace(/^~/, config.REAL_HOME);
       var absTarget = path.resolve(rawPath);
-      // Multi-user mode: non-admins can only browse their home directory.
-      if (osUsers && ws._clayUser && ws._clayUser.role !== "admin") {
-        var browseHome = ws._clayUser.linuxUser ? "/home/" + ws._clayUser.linuxUser : null;
-        if (!browseHome || (absTarget !== browseHome && (absTarget + "/").indexOf(browseHome + "/") !== 0)) {
-          sendTo(ws, { type: "browse_dir_result", path: msg.path, entries: [], error: "Access restricted to your home directory" });
-          return;
-        }
-      }
       var parentDir, prefix;
       try {
         var stat = fs.statSync(absTarget);
@@ -87,21 +82,27 @@ function attachGlobalWs(opts) {
         parentDir = path.dirname(absTarget);
         prefix = path.basename(absTarget).toLowerCase();
       }
+      var canList = function (candidate) { return !opts.canUsePath || opts.canUsePath(ws._clayUser && ws._clayUser.id, candidate); };
+      if (!canList(parentDir)) {
+        sendTo(ws, startReply(msg, { type: "browse_dir_result", path: msg.path, entries: [], error: "Directory access is not permitted" }));
+        return;
+      }
       try {
         var dirItems = fs.readdirSync(parentDir, { withFileTypes: true });
         var dirEntries = [];
         for (var di = 0; di < dirItems.length; di++) {
           var d = dirItems[di];
           if (!d.isDirectory()) continue;
+          if (opts.canUsePath && !opts.canUsePath(ws._clayUser && ws._clayUser.id, path.join(parentDir, d.name))) continue;
           if (d.name.charAt(0) === ".") continue;
           if (IGNORED_DIRS.has(d.name)) continue;
           if (prefix && !d.name.toLowerCase().startsWith(prefix)) continue;
           dirEntries.push({ name: d.name, path: path.join(parentDir, d.name) });
         }
         dirEntries.sort(function (a, b) { return a.name.localeCompare(b.name); });
-        sendTo(ws, { type: "browse_dir_result", path: msg.path, entries: dirEntries });
+        sendTo(ws, Object.assign(browseMeta(msg, parentDir, prefix, canList), { type: "browse_dir_result", path: msg.path, entries: dirEntries }));
       } catch (e) {
-        sendTo(ws, { type: "browse_dir_result", path: msg.path, entries: [], error: e.message });
+        sendTo(ws, startReply(msg, { type: "browse_dir_result", path: msg.path, entries: [], error: e.message }));
       }
       return;
     }
@@ -110,32 +111,25 @@ function attachGlobalWs(opts) {
     if (msg.type === "add_project") {
       var addPath = (msg.path || "").replace(/^~/, config.REAL_HOME);
       var addAbs = path.resolve(addPath);
-      if (osUsers && ws._clayUser && ws._clayUser.role !== "admin") {
-        if (!ws._clayUser.linuxUser) {
-          sendTo(ws, { type: "add_project_result", ok: false, error: "No Linux user assigned" });
-          return;
-        }
-        var userHome = "/home/" + ws._clayUser.linuxUser;
-        if (addAbs !== userHome && (addAbs + "/").indexOf(userHome + "/") !== 0) {
-          sendTo(ws, { type: "add_project_result", ok: false, error: "Path not allowed. You can only add directories under " + userHome });
-          return;
-        }
+      if (opts.canUsePath && !opts.canUsePath(ws._clayUser && ws._clayUser.id, addAbs)) {
+        sendTo(ws, startReply(msg, { type: "add_project_result", ok: false, error: "Directory access is not permitted" }));
+        return;
       }
       try {
         var addStat = fs.statSync(addAbs);
         if (!addStat.isDirectory()) {
-          sendTo(ws, { type: "add_project_result", ok: false, error: "Not a directory" });
+          sendTo(ws, startReply(msg, { type: "add_project_result", ok: false, error: "Not a directory" }));
           return;
         }
       } catch (e) {
-        sendTo(ws, { type: "add_project_result", ok: false, error: "Directory not found" });
+        sendTo(ws, startReply(msg, { type: "add_project_result", ok: false, error: "Directory not found" }));
         return;
       }
       if (typeof onAddProject === "function") {
         var result = onAddProject(addAbs, ws._clayUser);
-        sendTo(ws, { type: "add_project_result", ok: result.ok, slug: result.slug, error: result.error, existing: result.existing });
+        sendTo(ws, startReply(msg, Object.assign({}, result, { type: "add_project_result" })));
       } else {
-        sendTo(ws, { type: "add_project_result", ok: false, error: "Not supported" });
+        sendTo(ws, startReply(msg, { type: "add_project_result", ok: false, error: "Not supported" }));
       }
       return;
     }
@@ -145,7 +139,7 @@ function attachGlobalWs(opts) {
       if (ws._clayUser && usersModule) {
         var cpPerms = usersModule.getEffectivePermissions(ws._clayUser, osUsers);
         if (!cpPerms.createProject) {
-          sendTo(ws, { type: "add_project_result", ok: false, error: "You do not have permission to create projects" });
+          sendTo(ws, startReply(msg, { type: "add_project_result", ok: false, error: "You do not have permission to create projects" }));
           return;
         }
       }
@@ -154,14 +148,14 @@ function attachGlobalWs(opts) {
     if (msg.type === "create_project") {
       var createName = (msg.name || "").trim();
       if (!createName || !/^[a-zA-Z0-9_-]+$/.test(createName)) {
-        sendTo(ws, { type: "add_project_result", ok: false, error: "Invalid name. Use only letters, numbers, dashes, and underscores." });
+        sendTo(ws, startReply(msg, { type: "add_project_result", ok: false, error: "Invalid name. Use only letters, numbers, dashes, and underscores." }));
         return;
       }
       if (typeof onCreateProject === "function") {
         var createResult = onCreateProject(createName, ws._clayUser);
-        sendTo(ws, { type: "add_project_result", ok: createResult.ok, slug: createResult.slug, error: createResult.error });
+        sendTo(ws, startReply(msg, Object.assign({}, createResult, { type: "add_project_result" })));
       } else {
-        sendTo(ws, { type: "add_project_result", ok: false, error: "Not supported" });
+        sendTo(ws, startReply(msg, { type: "add_project_result", ok: false, error: "Not supported" }));
       }
       return;
     }
@@ -169,16 +163,16 @@ function attachGlobalWs(opts) {
     if (msg.type === "clone_project") {
       var cloneUrl = (msg.url || "").trim();
       if (!cloneUrl || (!/^https?:\/\//.test(cloneUrl) && !/^git@/.test(cloneUrl))) {
-        sendTo(ws, { type: "add_project_result", ok: false, error: "Invalid URL. Use https:// or git@ format." });
+        sendTo(ws, startReply(msg, { type: "add_project_result", ok: false, error: "Invalid URL. Use https:// or git@ format." }));
         return;
       }
-      sendTo(ws, { type: "clone_project_progress", status: "cloning" });
+      sendTo(ws, startReply(msg, { type: "clone_project_progress", status: "cloning" }));
       if (typeof onCloneProject === "function") {
         onCloneProject(cloneUrl, ws._clayUser, function (cloneResult) {
-          sendTo(ws, { type: "add_project_result", ok: cloneResult.ok, slug: cloneResult.slug, error: cloneResult.error });
+          sendTo(ws, startReply(msg, { type: "add_project_result", ok: cloneResult.ok, slug: cloneResult.slug, error: cloneResult.error }));
         });
       } else {
-        sendTo(ws, { type: "add_project_result", ok: false, error: "Not supported" });
+        sendTo(ws, startReply(msg, { type: "add_project_result", ok: false, error: "Not supported" }));
       }
       return;
     }

package/lib/server-home-chat-events.js

@@ -3,7 +3,7 @@
 function homeDebateQuestions(input) {
   var source = input && Array.isArray(input.questions) && input.questions[0] ? input.questions[0] : null;
   if (!source) return [];
-  var question = { header: source.header || "", question: source.question || "", multiSelect: false, options: [] };
+  var question = { header: source.header || "", question: source.question || "", multiSelect: false, allowOther: source.allowOther !== false, options: [] };
   var options = Array.isArray(source.options) ? source.options.slice(0, 6) : [];
   for (var i = 0; i < options.length; i++) question.options.push({ label: options[i].label || "Option", description: options[i].description || "" });
   return [question];
@@ -36,6 +36,7 @@ function findDebateTurn(messages, event) {
 function debateIdentity(source, fallback) {
   var prior = fallback || {};
   return {
+    avatarCatalogId: source.avatarCatalogId || prior.avatarCatalogId || "",
     avatarStyle: source.avatarStyle || prior.avatarStyle || "imprint",
     avatarSeed: source.avatarSeed || prior.avatarSeed || source.mateId || "mate",
     avatarColor: source.avatarColor || prior.avatarColor || "",
@@ -112,7 +113,7 @@ function applyAssignmentHistoryEvent(messages, event) {
   messages.push({ role: "assignment", assignment: assignment });
 }
 
-function historyToHomeChat(history, debateSetupMode, mateCreationMode) {
+function historyToHomeChat(history, debateSetupMode, mateCreationMode, pendingAskUser) {
   var messages = [];
   var pending = "";
   var interviewMode = debateSetupMode === true || mateCreationMode === true;
@@ -124,6 +125,12 @@ function historyToHomeChat(history, debateSetupMode, mateCreationMode) {
   for (var i = 0; i < history.length; i++) {
     var event = history[i];
     if (!event) continue;
+    if (event.type === 'tool_executing' && event.name === 'AskUserQuestion' && ['mcp-import', 'mate-schedule', 'mcp_fallback', 'product-control'].indexOf(event.source) >= 0) {
+      flushAssistant();
+      var activeConsent = pendingAskUser === undefined || !!(pendingAskUser && pendingAskUser[event.id]);
+      messages.push({ role: 'question', flow: event.source === 'mcp-import' ? 'mcp_import' : 'mate_question', toolId: event.id, questions: homeDebateQuestions(event.input), status: activeConsent ? 'pending' : 'expired', error: activeConsent ? '' : 'This question is no longer active. Ask for a new review.' });
+      continue;
+    }
     if (event.type === "project_assignment_proposal" || event.type === "project_assignment_status") {
       flushAssistant();
       applyAssignmentHistoryEvent(messages, event);
@@ -185,7 +192,7 @@ function historyToHomeChat(history, debateSetupMode, mateCreationMode) {
     } else if (interviewMode && event.type === "tool_executing" && event.name === "AskUserQuestion" && event.id && event.input) {
       flushAssistant();
       messages.push({ role: "question", flow: mateCreationMode === true ? "mate_creation" : "debate", toolId: event.id, questions: homeDebateQuestions(event.input), status: "pending", error: "" });
-    } else if ((event.type === "ask_user_answered" || event.type === "home_debate_question_expired" || event.type === "home_mate_creation_question_expired") && event.toolId) {
+    } else if ((event.type === "ask_user_answered" || event.type === "home_debate_question_expired" || event.type === "home_mate_creation_question_expired" || event.type === "mcp_import_consent_expired" || event.type === "mate_schedule_question_expired") && event.toolId) {
       for (var k = messages.length - 1; k >= 0; k--) {
         if (messages[k].role === "question" && messages[k].toolId === event.toolId) {
           messages[k].status = event.type === "ask_user_answered" ? "answered" : "expired";
@@ -273,7 +280,7 @@ function transformEvent(event, mateId, session, requestId, stableSessionId) {
   }
   if (session && session.homeDebatePlanning === true && HOME_DEBATE_EVENT_TYPES[event.type]) {
     var live = { type: "home_debate_event", eventType: event.type };
-    var fields = ["turnId", "decisionId", "decision", "toolName", "command", "commandTruncated", "topic", "format", "moderatorId", "moderatorName", "panelists", "mateName", "role", "round", "activity", "delta", "text", "reason", "action", "avatarStyle", "avatarSeed", "avatarColor", "avatarCustom"];
+    var fields = ["turnId", "decisionId", "decision", "toolName", "command", "commandTruncated", "topic", "format", "moderatorId", "moderatorName", "panelists", "mateName", "role", "round", "activity", "delta", "text", "reason", "action", "avatarCatalogId", "avatarStyle", "avatarSeed", "avatarColor", "avatarCustom"];
     for (var fi = 0; fi < fields.length; fi++) if (Object.prototype.hasOwnProperty.call(event, fields[fi])) live[fields[fi]] = event[fields[fi]];
     if (event.mateId) live.speakerMateId = event.mateId;
     return Object.assign(live, metadata);
@@ -298,6 +305,13 @@ function transformEvent(event, mateId, session, requestId, stableSessionId) {
   if (event.type === "debate_proposal_resolved" && event.proposalId) return Object.assign({ type: "home_debate_proposal_resolved", proposalId: event.proposalId, action: event.action || "cancel", error: event.error || "" }, metadata);
   if (session && session.mateCreationMode === true && event.type === "mate_creation_proposal" && event.proposal) return Object.assign({ type: "home_mate_creation_proposal", proposal: event.proposal }, metadata);
   if (session && session.mateCreationMode === true && event.type === "mate_creation_proposal_resolved" && event.proposalId) return Object.assign({ type: "home_mate_creation_proposal_resolved", proposalId: event.proposalId, action: event.action || "cancel", createdMateId: event.mateId || null, mateName: event.mateName || null, error: event.error || "" }, metadata);
+  if (!(session && (session.debateSetupMode === true || session.mateCreationMode === true)) && event.type === 'tool_executing' && event.name === 'AskUserQuestion' && ['mate-schedule', 'mcp_fallback', 'product-control'].indexOf(event.source) >= 0) return Object.assign({ type: 'home_mate_question', toolId: event.id, questions: homeDebateQuestions(event.input) }, metadata);
+  if (session && session.debateSetupMode !== true && session.mateCreationMode !== true && event.type === 'ask_user_answered' && event.toolId && (session.history || []).some(function (item) { return item.id === event.toolId && ['mate-schedule', 'mcp_fallback', 'product-control'].indexOf(item.source) >= 0; })) return Object.assign({ type: 'home_mate_question_resolved', toolId: event.toolId, status: 'answered', answers: event.answers }, metadata);
+  if (event.type === 'tool_executing' && event.name === 'AskUserQuestion' && event.source === 'mcp-import') return Object.assign({ type: 'home_mcp_import_question', toolId: event.id, questions: homeDebateQuestions(event.input) }, metadata);
+  if (event.type === 'product_control_question_expired') return Object.assign({ type: 'home_mate_question_resolved', toolId: event.toolId, status: 'expired', error: event.error }, metadata);
+  if (event.type === 'mate_schedule_question_expired') return Object.assign({ type: 'home_mate_question_resolved', toolId: event.toolId, status: 'expired', error: event.error }, metadata);
+  if (event.type === 'mcp_import_consent_expired') return Object.assign({ type: 'home_mcp_import_question_resolved', toolId: event.toolId, status: 'expired', error: event.error }, metadata);
+  if (session && event.type === 'ask_user_answered' && event.toolId && (session.history || []).some(function (item) { return item.id === event.toolId && item.source === 'mcp-import'; })) return Object.assign({ type: 'home_mcp_import_question_resolved', toolId: event.toolId, status: 'answered', answers: event.answers }, metadata);
   if (session && session.debateSetupMode === true && event.type === "tool_executing" && event.name === "AskUserQuestion" && event.id && event.input) {
     return Object.assign({ type: "home_debate_question", toolId: event.id, questions: homeDebateQuestions(event.input) }, metadata);
   }