clay-server 2.13.0-beta.5 → 2.13.0-beta.6

package/lib/daemon.js

@@ -936,16 +936,40 @@ for (var i = 0; i < projects.length; i++) {
   }
 }
 
+// Migrate legacy mates storage before registration
+mates.migrateLegacyMates();
+
 // Register existing mates as projects
-var allMates = mates.getAllMates();
-for (var mi = 0; mi < allMates.length; mi++) {
-  var m = allMates[mi];
-  var mateDir = path.join(mates.MATES_DIR, m.id);
-  var mateSlug = "mate-" + m.id;
-  var mateName = (m.profile && m.profile.displayName) || m.name || "New Mate";
-  if (fs.existsSync(mateDir)) {
-    console.log("[daemon] Adding mate project:", mateSlug);
-    relay.addProject(mateDir, mateSlug, mateName, null, m.createdBy, null, { isMate: true });
+if (usersModule.isMultiUser()) {
+  // Multi-user mode: iterate over all users and load each user's mates
+  var allUsers = usersModule.getAllUsers();
+  for (var ui = 0; ui < allUsers.length; ui++) {
+    var mateCtx = mates.buildMateCtx(allUsers[ui].id);
+    var userMates = mates.getAllMates(mateCtx);
+    for (var mi = 0; mi < userMates.length; mi++) {
+      var m = userMates[mi];
+      var mateDir = mates.getMateDir(mateCtx, m.id);
+      var mateSlug = "mate-" + m.id;
+      var mateName = (m.profile && m.profile.displayName) || m.name || "New Mate";
+      if (fs.existsSync(mateDir)) {
+        console.log("[daemon] Adding mate project:", mateSlug);
+        relay.addProject(mateDir, mateSlug, mateName, null, m.createdBy, null, { isMate: true });
+      }
+    }
+  }
+} else {
+  // Single-user mode: use null ctx
+  var mateCtx = mates.buildMateCtx(null);
+  var allMates = mates.getAllMates(mateCtx);
+  for (var mi = 0; mi < allMates.length; mi++) {
+    var m = allMates[mi];
+    var mateDir = mates.getMateDir(mateCtx, m.id);
+    var mateSlug = "mate-" + m.id;
+    var mateName = (m.profile && m.profile.displayName) || m.name || "New Mate";
+    if (fs.existsSync(mateDir)) {
+      console.log("[daemon] Adding mate project:", mateSlug);
+      relay.addProject(mateDir, mateSlug, mateName, null, m.createdBy, null, { isMate: true });
+    }
   }
 }
 

package/lib/dm.js

@@ -118,10 +118,10 @@ function getDmList(userId) {
   return dms;
 }
 
-// Check if a user is a mate (AI persona)
+// Check if a user ID looks like a mate (AI persona) by format only
 function isMate(userId) {
   var mates = require("./mates");
-  return mates.isMate(userId);
+  return mates.isMateIdFormat(userId);
 }
 
 module.exports = {

package/lib/mates.js

@@ -3,8 +3,40 @@ var path = require("path");
 var crypto = require("crypto");
 var config = require("./config");
 
-var MATES_FILE = path.join(config.CONFIG_DIR, "mates.json");
-var MATES_DIR = path.join(process.cwd(), ".claude", "mates");
+// --- Path resolution ---
+
+function resolveMatesRoot(ctx) {
+  // OS-users mode: per-linuxUser home directory
+  if (ctx && ctx.linuxUser) {
+    return path.join("/home", ctx.linuxUser, ".clay", "mates");
+  }
+  // Multi-user mode: per-userId subdirectory
+  if (ctx && ctx.multiUser && ctx.userId) {
+    return path.join(config.CONFIG_DIR, "mates", ctx.userId);
+  }
+  // Single-user mode: flat directory
+  return path.join(config.CONFIG_DIR, "mates");
+}
+
+function buildMateCtx(userId) {
+  if (!userId) return { userId: null, multiUser: false, linuxUser: null };
+  // Lazy require to avoid circular dependency
+  var users = require("./users");
+  var multiUser = users.isMultiUser();
+  var linuxUser = null;
+  if (multiUser && userId) {
+    var user = users.findUserById(userId);
+    if (user && user.linuxUser) {
+      linuxUser = user.linuxUser;
+    }
+  }
+  return { userId: userId, multiUser: multiUser, linuxUser: linuxUser };
+}
+
+function isMateIdFormat(id) {
+  if (!id) return false;
+  return typeof id === "string" && id.indexOf("mate_") === 0;
+}
 
 // --- Default data ---
 
@@ -14,9 +46,13 @@ function defaultData() {
 
 // --- Load / Save ---
 
-function loadMates() {
+function matesFilePath(ctx) {
+  return path.join(resolveMatesRoot(ctx), "mates.json");
+}
+
+function loadMates(ctx) {
   try {
-    var raw = fs.readFileSync(MATES_FILE, "utf8");
+    var raw = fs.readFileSync(matesFilePath(ctx), "utf8");
     var data = JSON.parse(raw);
     if (!data.mates) data.mates = [];
     return data;
@@ -25,11 +61,12 @@ function loadMates() {
   }
 }
 
-function saveMates(data) {
-  fs.mkdirSync(path.dirname(MATES_FILE), { recursive: true });
-  var tmpPath = MATES_FILE + ".tmp";
+function saveMates(ctx, data) {
+  var filePath = matesFilePath(ctx);
+  fs.mkdirSync(path.dirname(filePath), { recursive: true });
+  var tmpPath = filePath + ".tmp";
   fs.writeFileSync(tmpPath, JSON.stringify(data, null, 2));
-  fs.renameSync(tmpPath, MATES_FILE);
+  fs.renameSync(tmpPath, filePath);
 }
 
 // --- CRUD ---
@@ -38,9 +75,10 @@ function generateMateId() {
   return "mate_" + crypto.randomUUID();
 }
 
-function createMate(seedData, userId) {
-  var data = loadMates();
+function createMate(ctx, seedData) {
+  var data = loadMates(ctx);
   var id = generateMateId();
+  var userId = ctx ? ctx.userId : null;
 
   // Pick a random avatar color from a pleasant palette
   var colors = ["#6c5ce7", "#00b894", "#e17055", "#0984e3", "#fdcb6e", "#e84393", "#00cec9", "#ff7675"];
@@ -63,10 +101,10 @@ function createMate(seedData, userId) {
   };
 
   data.mates.push(mate);
-  saveMates(data);
+  saveMates(ctx, data);
 
   // Create the mate's identity directory
-  var mateDir = path.join(MATES_DIR, id);
+  var mateDir = getMateDir(ctx, id);
   fs.mkdirSync(mateDir, { recursive: true });
 
   // Write initial mate.yaml
@@ -98,40 +136,40 @@ function createMate(seedData, userId) {
   return mate;
 }
 
-function getMate(id) {
-  var data = loadMates();
+function getMate(ctx, id) {
+  var data = loadMates(ctx);
   for (var i = 0; i < data.mates.length; i++) {
     if (data.mates[i].id === id) return data.mates[i];
   }
   return null;
 }
 
-function updateMate(id, updates) {
-  var data = loadMates();
+function updateMate(ctx, id, updates) {
+  var data = loadMates(ctx);
   for (var i = 0; i < data.mates.length; i++) {
     if (data.mates[i].id === id) {
       var keys = Object.keys(updates);
       for (var j = 0; j < keys.length; j++) {
         data.mates[i][keys[j]] = updates[keys[j]];
       }
-      saveMates(data);
+      saveMates(ctx, data);
       return data.mates[i];
     }
   }
   return null;
 }
 
-function deleteMate(id) {
-  var data = loadMates();
+function deleteMate(ctx, id) {
+  var data = loadMates(ctx);
   var before = data.mates.length;
   data.mates = data.mates.filter(function (m) {
     return m.id !== id;
   });
   if (data.mates.length === before) return { error: "Mate not found" };
-  saveMates(data);
+  saveMates(ctx, data);
 
   // Remove mate directory
-  var mateDir = path.join(MATES_DIR, id);
+  var mateDir = getMateDir(ctx, id);
   try {
     fs.rmSync(mateDir, { recursive: true, force: true });
   } catch (e) {
@@ -141,29 +179,86 @@ function deleteMate(id) {
   return { ok: true };
 }
 
-function getAllMates() {
-  var data = loadMates();
+function getAllMates(ctx) {
+  var data = loadMates(ctx);
   return data.mates;
 }
 
-function getMatesByUser(userId) {
-  var data = loadMates();
-  return data.mates.filter(function (m) {
-    return m.createdBy === userId;
-  });
-}
-
-function isMate(id) {
+function isMate(ctx, id) {
   if (!id) return false;
   if (typeof id === "string" && id.indexOf("mate_") === 0) {
     // Double check it exists in registry
-    return !!getMate(id);
+    return !!getMate(ctx, id);
   }
   return false;
 }
 
-function getMateDir(id) {
-  return path.join(MATES_DIR, id);
+function getMateDir(ctx, id) {
+  return path.join(resolveMatesRoot(ctx), id);
+}
+
+// --- Migration ---
+
+function migrateLegacyMates() {
+  var legacyFile = path.join(config.CONFIG_DIR, "mates.json");
+  if (!fs.existsSync(legacyFile)) return;
+
+  // Check if already migrated
+  var migratedMarker = legacyFile + ".migrated";
+  if (fs.existsSync(migratedMarker)) return;
+
+  try {
+    var raw = fs.readFileSync(legacyFile, "utf8");
+    var data = JSON.parse(raw);
+    if (!data.mates || data.mates.length === 0) {
+      // Nothing to migrate, just mark as done
+      fs.renameSync(legacyFile, migratedMarker);
+      return;
+    }
+
+    // Group mates by createdBy
+    var byUser = {};
+    for (var i = 0; i < data.mates.length; i++) {
+      var m = data.mates[i];
+      var key = m.createdBy || "__null__";
+      if (!byUser[key]) byUser[key] = [];
+      byUser[key].push(m);
+    }
+
+    // Write each user's mates to their own storage path
+    var keys = Object.keys(byUser);
+    for (var k = 0; k < keys.length; k++) {
+      var userId = keys[k] === "__null__" ? null : keys[k];
+      var ctx = buildMateCtx(userId);
+      var userData = { mates: byUser[keys[k]] };
+      saveMates(ctx, userData);
+
+      // Move mate identity directories to new location
+      var legacyMatesDir = path.join(config.CONFIG_DIR, "mates");
+      var newRoot = resolveMatesRoot(ctx);
+      for (var mi = 0; mi < byUser[keys[k]].length; mi++) {
+        var mateId = byUser[keys[k]][mi].id;
+        var oldDir = path.join(legacyMatesDir, mateId);
+        var newDir = path.join(newRoot, mateId);
+        if (fs.existsSync(oldDir) && oldDir !== newDir) {
+          fs.mkdirSync(path.dirname(newDir), { recursive: true });
+          try {
+            fs.renameSync(oldDir, newDir);
+          } catch (e) {
+            // Cross-device or other issue, copy instead
+            fs.cpSync(oldDir, newDir, { recursive: true });
+            fs.rmSync(oldDir, { recursive: true, force: true });
+          }
+        }
+      }
+    }
+
+    // Mark legacy file as migrated
+    fs.renameSync(legacyFile, migratedMarker);
+    console.log("[mates] Migrated legacy mates.json to per-user storage");
+  } catch (e) {
+    console.error("[mates] Legacy migration failed:", e.message);
+  }
 }
 
 // Format seed data as a human-readable context string
@@ -206,8 +301,9 @@ function formatSeedContext(seedData) {
 }
 
 module.exports = {
-  MATES_FILE: MATES_FILE,
-  MATES_DIR: MATES_DIR,
+  resolveMatesRoot: resolveMatesRoot,
+  buildMateCtx: buildMateCtx,
+  isMateIdFormat: isMateIdFormat,
   loadMates: loadMates,
   saveMates: saveMates,
   createMate: createMate,
@@ -215,8 +311,8 @@ module.exports = {
   updateMate: updateMate,
   deleteMate: deleteMate,
   getAllMates: getAllMates,
-  getMatesByUser: getMatesByUser,
   isMate: isMate,
   getMateDir: getMateDir,
+  migrateLegacyMates: migrateLegacyMates,
   formatSeedContext: formatSeedContext,
 };

package/lib/server.js

@@ -2614,7 +2614,8 @@ function createServer(opts) {
         }
       }
       // Include mates in the list
-      var mateList = mates.getAllMates();
+      var mateCtx = mates.buildMateCtx(userId);
+      var mateList = mates.getAllMates(mateCtx);
       ws.send(JSON.stringify({ type: "dm_list", dms: dmList, mates: mateList }));
       return;
     }
@@ -2623,16 +2624,25 @@ function createServer(opts) {
       if (!msg.targetUserId) return;
 
       // Check if target is a mate
-      if (mates.isMate(msg.targetUserId)) {
-        var mate = mates.getMate(msg.targetUserId);
+      var mateCtx2 = mates.buildMateCtx(userId);
+      if (mates.isMate(mateCtx2, msg.targetUserId)) {
+        var mate = mates.getMate(mateCtx2, msg.targetUserId);
         if (!mate) return;
+        // Ensure mate project is registered (survives server restarts)
+        var mateSlug2 = "mate-" + mate.id;
+        if (!projects.has(mateSlug2)) {
+          var mateDir2 = mates.getMateDir(mateCtx2, mate.id);
+          fs.mkdirSync(mateDir2, { recursive: true });
+          var mateName2 = (mate.profile && mate.profile.displayName) || mate.name || "New Mate";
+          addProject(mateDir2, mateSlug2, mateName2, null, mate.createdBy || userId, null, { isMate: true });
+        }
         var mp = mate.profile || {};
         ws.send(JSON.stringify({
           type: "dm_history",
           dmKey: "mate:" + mate.id,
           messages: dm.loadHistory("mate:" + mate.id),
           isMate: true,
-          projectSlug: "mate-" + mate.id,
+          projectSlug: mateSlug2,
           targetUser: {
             id: mate.id,
             displayName: mp.displayName || mate.name || "New Mate",
@@ -2690,8 +2700,9 @@ function createServer(opts) {
       var parts = msg.dmKey.split(":");
 
       // Handle mate DM: dmKey is "mate:mate_xxx"
-      if (parts[0] === "mate" && mates.isMate(parts[1])) {
-        var mate = mates.getMate(parts[1]);
+      var mateCtx3 = mates.buildMateCtx(userId);
+      if (parts[0] === "mate" && mates.isMate(mateCtx3, parts[1])) {
+        var mate = mates.getMate(mateCtx3, parts[1]);
         if (!mate) return;
         // Verify sender is the mate's creator
         if (mate.createdBy !== userId) return;
@@ -2758,9 +2769,10 @@ function createServer(opts) {
     if (msg.type === "mate_create") {
       if (!msg.seedData) return;
       try {
-        var mate = mates.createMate(msg.seedData, userId);
+        var mateCtx4 = mates.buildMateCtx(userId);
+        var mate = mates.createMate(mateCtx4, msg.seedData);
         // Register mate as a project
-        var mateDir = path.join(mates.MATES_DIR, mate.id);
+        var mateDir = mates.getMateDir(mateCtx4, mate.id);
         var mateSlug = "mate-" + mate.id;
         var mateName = (mate.profile && mate.profile.displayName) || mate.name || "New Mate";
         addProject(mateDir, mateSlug, mateName, null, mate.createdBy, null, { isMate: true });
@@ -2772,14 +2784,27 @@ function createServer(opts) {
     }
 
     if (msg.type === "mate_list") {
-      var mateList = mates.getAllMates();
+      var mateCtx5 = mates.buildMateCtx(userId);
+      var mateList = mates.getAllMates(mateCtx5);
+      // Ensure all mate projects are registered (survives server restarts)
+      for (var mi = 0; mi < mateList.length; mi++) {
+        var m = mateList[mi];
+        var mSlug = "mate-" + m.id;
+        if (!projects.has(mSlug)) {
+          var mDir = mates.getMateDir(mateCtx5, m.id);
+          fs.mkdirSync(mDir, { recursive: true });
+          var mName = (m.profile && m.profile.displayName) || m.name || "New Mate";
+          addProject(mDir, mSlug, mName, null, m.createdBy || userId, null, { isMate: true });
+        }
+      }
       ws.send(JSON.stringify({ type: "mate_list", mates: mateList }));
       return;
     }
 
     if (msg.type === "mate_delete") {
       if (!msg.mateId) return;
-      var result = mates.deleteMate(msg.mateId);
+      var mateCtx6 = mates.buildMateCtx(userId);
+      var result = mates.deleteMate(mateCtx6, msg.mateId);
       if (result.error) {
         ws.send(JSON.stringify({ type: "mate_error", error: result.error }));
       } else {
@@ -2799,7 +2824,8 @@ function createServer(opts) {
 
     if (msg.type === "mate_update") {
       if (!msg.mateId || !msg.updates) return;
-      var updated = mates.updateMate(msg.mateId, msg.updates);
+      var mateCtx7 = mates.buildMateCtx(userId);
+      var updated = mates.updateMate(mateCtx7, msg.mateId, msg.updates);
       if (updated) {
         ws.send(JSON.stringify({ type: "mate_updated", mate: updated }));
         // Broadcast update

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clay-server",
-  "version": "2.13.0-beta.5",
+  "version": "2.13.0-beta.6",
   "description": "Web UI for Claude Code. Any device. Push notifications.",
   "bin": {
     "clay-server": "./bin/cli.js",