clay-server 2.20.0-beta.1 → 2.20.0-beta.2

package/lib/server.js

@@ -326,9 +326,11 @@ function serveStatic(urlPath, res) {
     var content = fs.readFileSync(filePath);
     var ext = path.extname(filePath);
     var mime = MIME_TYPES[ext] || "application/octet-stream";
+    var isImage = ext === ".png" || ext === ".jpg" || ext === ".jpeg" || ext === ".gif" || ext === ".svg" || ext === ".webp" || ext === ".ico";
+    var cacheControl = isImage ? "public, max-age=86400, immutable" : "no-cache";
     res.writeHead(200, {
-      "Content-Type": mime + "; charset=utf-8",
-      "Cache-Control": "no-cache",
+      "Content-Type": mime + (isImage ? "" : "; charset=utf-8"),
+      "Cache-Control": cacheControl,
     });
     res.end(content);
     return true;
@@ -2465,8 +2467,8 @@ function createServer(opts) {
       return;
     }
 
-    // Static files at root (favicon, manifest, icons, sw.js, etc.)
-    if (fullUrl.lastIndexOf("/") === 0 && !fullUrl.includes("..")) {
+    // Static files (favicon, manifest, icons, sw.js, mate avatars, etc.)
+    if (!fullUrl.includes("..") && !fullUrl.startsWith("/p/") && !fullUrl.startsWith("/api/")) {
       if (serveStatic(fullUrl, res)) return;
     }
 
@@ -2973,6 +2975,7 @@ function createServer(opts) {
             avatarStyle: mp.avatarStyle || "bottts",
             avatarSeed: mp.avatarSeed || mate.id,
             avatarColor: mp.avatarColor || "#6c5ce7",
+            avatarCustom: mp.avatarCustom || "",
             isMate: true,
             mateStatus: mate.status,
             seedData: mate.seedData || {},
@@ -3101,6 +3104,8 @@ function createServer(opts) {
         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, mateDisplayName: mateName });
+        // Auto-add to favorites so it shows in sidebar
+        users.addDmFavorite(userId, mate.id);
         ws.send(JSON.stringify({ type: "mate_created", mate: mate, projectSlug: mateSlug }));
       } catch (e) {
         ws.send(JSON.stringify({ type: "mate_error", error: "Failed to create mate: " + e.message }));
@@ -3110,7 +3115,30 @@ function createServer(opts) {
 
     if (msg.type === "mate_list") {
       var mateCtx5 = mates.buildMateCtx(userId);
+      // Backfill built-in mates for existing users
+      try {
+        var deletedKeys = users.getDeletedBuiltinKeys(userId);
+        var newBuiltins = mates.ensureBuiltinMates(mateCtx5, deletedKeys);
+        for (var bi = 0; bi < newBuiltins.length; bi++) {
+          var nb = newBuiltins[bi];
+          var nbSlug = "mate-" + nb.id;
+          var nbDir = mates.getMateDir(mateCtx5, nb.id);
+          var nbName = (nb.profile && nb.profile.displayName) || nb.name || "New Mate";
+          addProject(nbDir, nbSlug, nbName, null, nb.createdBy || userId, null, { isMate: true, mateDisplayName: nbName });
+          users.addDmFavorite(userId, nb.id);
+        }
+      } catch (e) {
+        console.error("[server] Failed to ensure built-in mates:", e.message);
+      }
+      // Ensure built-in mates are in favorites (unless user explicitly removed them)
       var mateList = mates.getAllMates(mateCtx5);
+      var currentFavs = users.getDmFavorites(userId);
+      var hiddenIds = users.getDmHidden(userId);
+      for (var bfi = 0; bfi < mateList.length; bfi++) {
+        if (mateList[bfi].builtinKey && currentFavs.indexOf(mateList[bfi].id) === -1 && hiddenIds.indexOf(mateList[bfi].id) === -1) {
+          users.addDmFavorite(userId, mateList[bfi].id);
+        }
+      }
       // Ensure all mate projects are registered (survives server restarts)
       for (var mi = 0; mi < mateList.length; mi++) {
         var m = mateList[mi];
@@ -3122,31 +3150,121 @@ function createServer(opts) {
           addProject(mDir, mSlug, mName, null, m.createdBy || userId, null, { isMate: true, mateDisplayName: mName });
         }
       }
-      ws.send(JSON.stringify({ type: "mate_list", mates: mateList }));
+      // Include deleted built-in mates for re-add UI
+      var builtinDefs2 = require("./builtin-mates");
+      var missingKeys2 = mates.getMissingBuiltinKeys(mateCtx5);
+      var availableBuiltins2 = [];
+      for (var abk2 = 0; abk2 < missingKeys2.length; abk2++) {
+        var bDef2 = builtinDefs2.getBuiltinByKey(missingKeys2[abk2]);
+        if (bDef2) {
+          availableBuiltins2.push({
+            key: bDef2.key,
+            displayName: bDef2.displayName,
+            bio: bDef2.bio,
+            avatarCustom: bDef2.avatarCustom || "",
+          });
+        }
+      }
+      ws.send(JSON.stringify({ type: "mate_list", mates: mateList, availableBuiltins: availableBuiltins2 }));
       return;
     }
 
     if (msg.type === "mate_delete") {
       if (!msg.mateId) return;
       var mateCtx6 = mates.buildMateCtx(userId);
+      // Track deleted built-in mate key so it doesn't auto-recreate
+      var mateToDelete = mates.getMate(mateCtx6, msg.mateId);
+      if (mateToDelete && mateToDelete.builtinKey) {
+        users.addDeletedBuiltinKey(userId, mateToDelete.builtinKey);
+      }
       var result = mates.deleteMate(mateCtx6, msg.mateId);
       if (result.error) {
         ws.send(JSON.stringify({ type: "mate_error", error: result.error }));
       } else {
         removeProject("mate-" + msg.mateId);
-        ws.send(JSON.stringify({ type: "mate_deleted", mateId: msg.mateId }));
+        // Build updated available builtins list
+        var builtinDefs3 = require("./builtin-mates");
+        var missingKeys3 = mates.getMissingBuiltinKeys(mateCtx6);
+        var availableBuiltins3 = [];
+        for (var abk3 = 0; abk3 < missingKeys3.length; abk3++) {
+          var bDef3 = builtinDefs3.getBuiltinByKey(missingKeys3[abk3]);
+          if (bDef3) {
+            availableBuiltins3.push({
+              key: bDef3.key,
+              displayName: bDef3.displayName,
+              bio: bDef3.bio,
+              avatarCustom: bDef3.avatarCustom || "",
+            });
+          }
+        }
+        ws.send(JSON.stringify({ type: "mate_deleted", mateId: msg.mateId, availableBuiltins: availableBuiltins3 }));
         // Broadcast to all clients so strips update
         projects.forEach(function (ctx) {
           ctx.forEachClient(function (otherWs) {
             if (otherWs === ws) return;
             if (otherWs.readyState !== 1) return;
-            otherWs.send(JSON.stringify({ type: "mate_deleted", mateId: msg.mateId }));
+            otherWs.send(JSON.stringify({ type: "mate_deleted", mateId: msg.mateId, availableBuiltins: availableBuiltins3 }));
           });
         });
       }
       return;
     }
 
+    if (msg.type === "mate_readd_builtin") {
+      if (!msg.builtinKey) return;
+      try {
+        var mateCtxR = mates.buildMateCtx(userId);
+        var missingKeys = mates.getMissingBuiltinKeys(mateCtxR);
+        if (missingKeys.indexOf(msg.builtinKey) === -1) {
+          ws.send(JSON.stringify({ type: "mate_error", error: "This built-in mate already exists" }));
+          return;
+        }
+        var newMate = mates.createBuiltinMate(mateCtxR, msg.builtinKey);
+        users.removeDeletedBuiltinKey(userId, msg.builtinKey);
+        var updatedFavsR = users.addDmFavorite(userId, newMate.id);
+        var readdSlug = "mate-" + newMate.id;
+        var readdDir = mates.getMateDir(mateCtxR, newMate.id);
+        var readdName = (newMate.profile && newMate.profile.displayName) || newMate.name || "New Mate";
+        addProject(readdDir, readdSlug, readdName, null, newMate.createdBy || userId, null, { isMate: true, mateDisplayName: readdName });
+        // Build updated available builtins
+        var builtinDefsR = require("./builtin-mates");
+        var missingKeysR = mates.getMissingBuiltinKeys(mateCtxR);
+        var availableBuiltinsR = [];
+        for (var abkR = 0; abkR < missingKeysR.length; abkR++) {
+          var bDefR = builtinDefsR.getBuiltinByKey(missingKeysR[abkR]);
+          if (bDefR) {
+            availableBuiltinsR.push({ key: bDefR.key, displayName: bDefR.displayName, bio: bDefR.bio, avatarCustom: bDefR.avatarCustom || "" });
+          }
+        }
+        ws.send(JSON.stringify({ type: "mate_created", mate: newMate, projectSlug: readdSlug, availableBuiltins: availableBuiltinsR, dmFavorites: updatedFavsR }));
+      } catch (e) {
+        ws.send(JSON.stringify({ type: "mate_error", error: "Failed to re-add built-in mate: " + e.message }));
+      }
+      return;
+    }
+
+    if (msg.type === "mate_list_available_builtins") {
+      var mateCtxAB = mates.buildMateCtx(userId);
+      var missingBuiltinKeys = mates.getMissingBuiltinKeys(mateCtxAB);
+      var builtinDefs = require("./builtin-mates");
+      var availableBuiltins = [];
+      for (var abk = 0; abk < missingBuiltinKeys.length; abk++) {
+        var bDef = builtinDefs.getBuiltinByKey(missingBuiltinKeys[abk]);
+        if (bDef) {
+          availableBuiltins.push({
+            key: bDef.key,
+            displayName: bDef.displayName,
+            bio: bDef.bio,
+            avatarColor: bDef.avatarColor,
+            avatarStyle: bDef.avatarStyle,
+            avatarCustom: bDef.avatarCustom || "",
+          });
+        }
+      }
+      ws.send(JSON.stringify({ type: "mate_available_builtins", builtins: availableBuiltins }));
+      return;
+    }
+
     if (msg.type === "mate_update") {
       if (!msg.mateId || !msg.updates) return;
       var mateCtx7 = mates.buildMateCtx(userId);

package/lib/users.js

@@ -176,6 +176,16 @@ function createUser(opts) {
   };
   data.users.push(user);
   saveUsers(data);
+
+  // Seed built-in mates for the new user
+  try {
+    var mates = require("./mates");
+    var mateCtx = mates.buildMateCtx(user.id);
+    mates.ensureBuiltinMates(mateCtx);
+  } catch (e) {
+    console.error("[users] Failed to seed built-in mates for user " + user.id + ":", e.message);
+  }
+
   return { ok: true, user: user };
 }
 
@@ -422,6 +432,16 @@ function createUserWithoutPin(opts) {
   };
   data.users.push(user);
   saveUsers(data);
+
+  // Seed built-in mates for the new user
+  try {
+    var mates = require("./mates");
+    var mateCtx = mates.buildMateCtx(user.id);
+    mates.ensureBuiltinMates(mateCtx);
+  } catch (e) {
+    console.error("[users] Failed to seed built-in mates for user " + user.id + ":", e.message);
+  }
+
   return { ok: true, user: user };
 }
 
@@ -563,6 +583,46 @@ function removeDmHidden(userId, targetUserId) {
   return [];
 }
 
+// --- Deleted built-in mate keys tracking ---
+
+function getDeletedBuiltinKeys(userId) {
+  var data = loadUsers();
+  for (var i = 0; i < data.users.length; i++) {
+    if (data.users[i].id === userId) {
+      return data.users[i].deletedBuiltinKeys || [];
+    }
+  }
+  return [];
+}
+
+function addDeletedBuiltinKey(userId, key) {
+  var data = loadUsers();
+  for (var i = 0; i < data.users.length; i++) {
+    if (data.users[i].id === userId) {
+      if (!data.users[i].deletedBuiltinKeys) data.users[i].deletedBuiltinKeys = [];
+      if (data.users[i].deletedBuiltinKeys.indexOf(key) === -1) {
+        data.users[i].deletedBuiltinKeys.push(key);
+        saveUsers(data);
+      }
+      return;
+    }
+  }
+}
+
+function removeDeletedBuiltinKey(userId, key) {
+  var data = loadUsers();
+  for (var i = 0; i < data.users.length; i++) {
+    if (data.users[i].id === userId) {
+      if (!data.users[i].deletedBuiltinKeys) return;
+      data.users[i].deletedBuiltinKeys = data.users[i].deletedBuiltinKeys.filter(function (k) {
+        return k !== key;
+      });
+      saveUsers(data);
+      return;
+    }
+  }
+}
+
 // --- RBAC permissions ---
 
 function getEffectivePermissions(user, osUsersMode) {
@@ -717,4 +777,7 @@ module.exports = {
   removeDmHidden: removeDmHidden,
   getAutoContinue: getAutoContinue,
   setAutoContinue: setAutoContinue,
+  getDeletedBuiltinKeys: getDeletedBuiltinKeys,
+  addDeletedBuiltinKey: addDeletedBuiltinKey,
+  removeDeletedBuiltinKey: removeDeletedBuiltinKey,
 };

package/package.json

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