clay-server 5.1.0-beta.1 → 5.1.0-beta.3

package/LICENSES/README.md

@@ -6,6 +6,10 @@ Preexisting MIT-covered portions retain the grants and applicable copyright and
 
 Third-party components and assets retain their own licenses and notices. In particular, the bundled Source Serif 4 font remains under the [SIL Open Font License 1.1](../lib/public/fonts/source-serif-4/LICENSE.md).
 
+The locally generated historical avatar styles retain their DiceBear and
+original artist licenses and attributions, summarized in
+[dicebear-avatars.md](dicebear-avatars.md).
+
 The Salt layout, control geometry, text decoration, color map and diagram chrome
 in `lib/salt-*.js` and `lib/assets/salt-colors.json` are adapted from PlantUML
 1.2026.8, copyright 2009–2025 Arnaud Roques, under

package/LICENSES/dicebear-avatars.md

@@ -0,0 +1,16 @@
+# DiceBear avatar notices
+
+Clay locally generates its seven historical avatar choices with DiceBear 9.4.3.
+The generator code is MIT-licensed, copyright Florian Körner. Each design keeps
+its upstream license and attribution:
+
+- Thumbs — DiceBear, CC0 1.0.
+- Bottts — Pablo Stanley, free for personal and commercial use.
+- Pixel Art — DiceBear, CC0 1.0.
+- Adventurer — Lisa Wischofsky, CC BY 4.0.
+- Avatar Illustration System (Micah) — Micah Lanier, CC BY 4.0.
+- Fun Emoji Set — Davis Uche, CC BY 4.0.
+- Bootstrap Icons — The Bootstrap Authors, MIT.
+
+The complete notices and license links are distributed with their respective
+`@dicebear/*` packages. Upstream: https://www.dicebear.com/

package/bin/cli.js

@@ -37,6 +37,7 @@ var { generateAuthToken } = require("../lib/server");
 var { enableMultiUser, disableMultiUser, hasAdmin, isMultiUser, getSetupCode } = require("../lib/users");
 var clayStudioCert = require("../lib/clay-studio-cert");
 var cliWordmark = require("../lib/cli-wordmark");
+var buildStartupProjects = require("../lib/startup-projects").buildStartupProjects;
 
 function openUrl(url) {
   try {
@@ -446,9 +447,6 @@ async function restartDaemonFromConfig() {
   var newConfig = Object.assign({}, lastConfig, {
     pid: null,
     port: targetPort,
-    projects: (lastConfig.projects || []).filter(function (p) {
-      return fs.existsSync(p.path);
-    })
   });
 
   ensureConfigDir();
@@ -1445,56 +1443,15 @@ async function forkDaemon(mode, keepAwake, extraProjects, addCwd, wantOsUsers) {
     return;
   }
 
-  var allProjects = [];
-  var usedSlugs = [];
-
-  // Load previous config to preserve per-project settings (visibility, allowedUsers)
   var prevConfig = loadConfig();
-  var prevProjectMap = {};
-  if (prevConfig && prevConfig.projects) {
-    for (var pi = 0; pi < prevConfig.projects.length; pi++) {
-      prevProjectMap[prevConfig.projects[pi].path] = prevConfig.projects[pi];
-    }
-  }
-
-  // Only include cwd if explicitly requested
+  var recentProjects = extraProjects || [];
   if (addCwd) {
-    var slug = generateSlug(cwd, []);
-    var cwdEntry = { path: cwd, slug: slug, addedAt: Date.now() };
-    // Restore title/icon from .clayrc if available
-    var cwdRc = loadClayrc();
-    var cwdRecent = cwdRc.recentProjects || [];
-    for (var cr = 0; cr < cwdRecent.length; cr++) {
-      if (cwdRecent[cr].path === cwd) {
-        if (cwdRecent[cr].title) cwdEntry.title = cwdRecent[cr].title;
-        if (cwdRecent[cr].icon) cwdEntry.icon = cwdRecent[cr].icon;
-        break;
-      }
-    }
-    // Restore project-level settings from previous config
-    if (prevProjectMap[cwd]) {
-      cwdEntry = Object.assign({}, prevProjectMap[cwd], cwdEntry);
-    }
-    allProjects.push(cwdEntry);
-    usedSlugs.push(slug);
-  }
-
-  // Add restored projects (from ~/.clayrc)
-  if (extraProjects && extraProjects.length > 0) {
-    for (var ep = 0; ep < extraProjects.length; ep++) {
-      var rp = extraProjects[ep];
-      if (rp.path === cwd) continue; // skip if same as cwd
-      if (!fs.existsSync(rp.path)) continue; // skip missing directories
-      var rpSlug = generateSlug(rp.path, usedSlugs);
-      usedSlugs.push(rpSlug);
-      var rpEntry = { path: rp.path, slug: rpSlug, title: rp.title || undefined, icon: rp.icon || undefined, addedAt: rp.addedAt || Date.now() };
-      // Restore project-level settings from previous config
-      if (prevProjectMap[rp.path]) {
-        rpEntry = Object.assign({}, prevProjectMap[rp.path], rpEntry);
-      }
-      allProjects.push(rpEntry);
-    }
+    var cwdRecent = (loadClayrc().recentProjects || []).filter(function (p) { return p.path === cwd; });
+    recentProjects = cwdRecent.concat(recentProjects);
   }
+  var allProjects = buildStartupProjects(prevConfig, recentProjects, {
+    cwd: cwd, addCwd: addCwd, existsSync: fs.existsSync, generateSlug: generateSlug,
+  });
 
   var config = Object.assign({}, prevConfig || {}, {
     pid: null,
@@ -1629,49 +1586,10 @@ async function devMode(mode, keepAwake, existingPinHash, wantOsUsers) {
     return;
   }
 
-  var slug = generateSlug(cwd, []);
-  var cwdDevEntry = { path: cwd, slug: slug, addedAt: Date.now() };
-
-  // Load previous config to preserve per-project settings (visibility, allowedUsers)
   var prevDevConfig = loadConfig();
-  var prevDevProjectMap = {};
-  if (prevDevConfig && prevDevConfig.projects) {
-    for (var pdi = 0; pdi < prevDevConfig.projects.length; pdi++) {
-      prevDevProjectMap[prevDevConfig.projects[pdi].path] = prevDevConfig.projects[pdi];
-    }
-  }
-
-  // Restore previous projects
-  var rc = loadClayrc();
-  var restorable = (rc.recentProjects || []).filter(function (p) {
-    return p.path !== cwd && fs.existsSync(p.path);
+  var allProjects = buildStartupProjects(prevDevConfig, loadClayrc().recentProjects || [], {
+    cwd: cwd, addCwd: true, existsSync: fs.existsSync, generateSlug: generateSlug,
   });
-  // Restore title/icon for cwd from .clayrc
-  var rcAll = rc.recentProjects || [];
-  for (var ci = 0; ci < rcAll.length; ci++) {
-    if (rcAll[ci].path === cwd) {
-      if (rcAll[ci].title) cwdDevEntry.title = rcAll[ci].title;
-      if (rcAll[ci].icon) cwdDevEntry.icon = rcAll[ci].icon;
-      break;
-    }
-  }
-  // Restore access settings for cwd from previous config
-  if (prevDevProjectMap[cwd]) {
-    cwdDevEntry = Object.assign({}, prevDevProjectMap[cwd], cwdDevEntry);
-  }
-  var allProjects = [cwdDevEntry];
-  var usedSlugs = [slug];
-  for (var ri = 0; ri < restorable.length; ri++) {
-    var rp = restorable[ri];
-    var rpSlug = generateSlug(rp.path, usedSlugs);
-    usedSlugs.push(rpSlug);
-    var rpDevEntry = { path: rp.path, slug: rpSlug, title: rp.title || undefined, icon: rp.icon || undefined, addedAt: rp.addedAt || Date.now() };
-    // Restore project-level settings from previous config
-    if (prevDevProjectMap[rp.path]) {
-      rpDevEntry = Object.assign({}, prevDevProjectMap[rp.path], rpDevEntry);
-    }
-    allProjects.push(rpDevEntry);
-  }
 
   var config = Object.assign({}, prevDevConfig || {}, {
     pid: null,

package/lib/builtin-mates.js

@@ -156,7 +156,7 @@ var BUILTIN_MATES = [
 ];
 
 // ---------------------------------------------------------------------------
-// ALLY CLAUDE.md template
+// ALLY AGENTS.md template
 // ---------------------------------------------------------------------------
 
 var ALLY_TEMPLATE =
@@ -245,7 +245,7 @@ var ALLY_TEMPLATE =
   "- Do not promote transient information or emotional states.\n";
 
 // ---------------------------------------------------------------------------
-// CLAY CLAUDE.md template (host agent — the app itself answers)
+// CLAY AGENTS.md template (host agent — the app itself answers)
 // ---------------------------------------------------------------------------
 
 var CLAY_TEMPLATE =
@@ -321,7 +321,7 @@ var CLAY_TEMPLATE =
   "After that, jump straight into search. No more meta-conversation.\n";
 
 // ---------------------------------------------------------------------------
-// ARCH CLAUDE.md template
+// ARCH AGENTS.md template
 // ---------------------------------------------------------------------------
 
 var ARCH_TEMPLATE =
@@ -392,7 +392,7 @@ var ARCH_TEMPLATE =
   "If nothing is there, work without it and learn through the conversation.\n";
 
 // ---------------------------------------------------------------------------
-// RUSH CLAUDE.md template
+// RUSH AGENTS.md template
 // ---------------------------------------------------------------------------
 
 var RUSH_TEMPLATE =
@@ -459,7 +459,7 @@ var RUSH_TEMPLATE =
   "and deadlines. Use what is available. If nothing is there, work without it.\n";
 
 // ---------------------------------------------------------------------------
-// WARD CLAUDE.md template
+// WARD AGENTS.md template
 // ---------------------------------------------------------------------------
 
 var WARD_TEMPLATE =
@@ -527,7 +527,7 @@ var WARD_TEMPLATE =
   "tech stack, and known risk areas. Use what is available. If nothing is there, work without it.\n";
 
 // ---------------------------------------------------------------------------
-// PIXEL CLAUDE.md template
+// PIXEL AGENTS.md template
 // ---------------------------------------------------------------------------
 
 var PIXEL_TEMPLATE =
@@ -599,7 +599,7 @@ var PIXEL_TEMPLATE =
   "target audience, and UX decisions. Use what is available. If nothing is there, work without it.\n";
 
 // ---------------------------------------------------------------------------
-// BUZZ CLAUDE.md template
+// BUZZ AGENTS.md template
 // ---------------------------------------------------------------------------
 
 var BUZZ_TEMPLATE =

package/lib/daemon-project-access.js

@@ -32,7 +32,11 @@ function getProjectAccess(config, slug, osUsers) {
   var project = findProject(config, parentSlug || slug);
   if (!project) return { error: "Project not found" };
 
-  var isMateProject = project.slug.indexOf("mate-") === 0;
+  var isMateProject = project.isMate === true || project.slug.indexOf("mate-") === 0;
+  if (isMateProject) {
+    return { slug: slug, isMate: true, visibility: "private", ownerId: project.ownerId || null,
+      allowedUsers: [], sessionVisibilityDefault: "private", isWorktree: !!parentSlug };
+  }
   var visibility = isMateProject ? "private" : (project.visibility || (osUsers ? "private" : "public"));
   var parentAllowedUsers = uniqueUsers(project.allowedUsers);
   if (!parentSlug) {
@@ -72,6 +76,7 @@ function setAllowedUsers(config, slug, allowedUsers) {
   var parentSlug = parentSlugFor(slug);
   var project = findProject(config, parentSlug || slug);
   if (!project) return { error: "Project not found" };
+  if (project.slug.indexOf("mate-") === 0 || project.isMate) return { error: "Clay and Mates cannot be shared." };
   var clean = uniqueUsers(allowedUsers);
   if (!parentSlug) {
     project.allowedUsers = clean;
@@ -92,6 +97,7 @@ function setSessionVisibilityDefault(config, slug, visibility) {
   if (parentSlugFor(slug)) return { error: "Worktrees inherit this setting from their parent project." };
   var project = findProject(config, slug);
   if (!project) return { error: "Project not found" };
+  if (project.slug.indexOf("mate-") === 0 || project.isMate) return { error: "Clay and Mates are always private." };
   if (visibility === "shared") project.sessionVisibilityDefault = "shared";
   else delete project.sessionVisibilityDefault;
   return { ok: true, visibility: visibility };

package/lib/daemon-settings.js

@@ -0,0 +1,11 @@
+// Persist before publishing a setting to live daemon state.
+function saveDaemonSetting(config, key, value, saveConfig) {
+  var overrides = {}; overrides[key] = value;
+  var next = Object.assign({}, config, overrides);
+  if (value === undefined) delete next[key];
+  saveConfig(next);
+  if (value === undefined) delete config[key];
+  Object.assign(config, next);
+  return next;
+}
+module.exports = { saveDaemonSetting: saveDaemonSetting };

package/lib/daemon.js

@@ -1,4 +1,5 @@
 #!/usr/bin/env node
+var saveDaemonSetting = require("./daemon-settings").saveDaemonSetting;
 
 // --- Node version check ---
 var nodeMajor = parseInt(process.versions.node.split(".")[0], 10);
@@ -72,9 +73,7 @@ if (projectLogContext.initializeProjectKnowledge(config)) {
 }
 
 // --- OS users mode: check required system dependencies ---
-// Supplementary-group inheritance (issue #367): default on so sessions behave
-// like a normal login; operators can disable via config / the settings toggle.
-osUsersMod.setInheritGroups(config.inheritGroups !== false);
+// User-switched processes inherit the account groups, like a normal login.
 if (config.osUsers) {
   var checkExec = require("child_process").execFileSync;
   var missing = [];
@@ -86,11 +85,7 @@ if (config.osUsers) {
     console.error("[daemon] Install with:  sudo apt install " + missing.map(function (m) { return m.split(" ")[0]; }).join(" "));
     process.exit(78); // EX_CONFIG
   }
-  if (config.inheritGroups !== false) {
-    console.log("[daemon] Sessions inherit each user's supplementary groups (docker, etc.); disable in Settings > User Groups.");
-  } else {
-    console.log("[daemon] Sessions run with primary group only (supplementary groups dropped); enable in Settings > User Groups.");
-  }
+  console.log("[daemon] Sessions inherit each user's supplementary groups when setpriv is available.");
 }
 
 // --- TLS ---
@@ -565,6 +560,7 @@ var relay = createServer({
     return result;
   },
   onProjectOwnerChanged: function (slug, ownerId) {
+    if (slug.indexOf("mate-") === 0) return {error:"Mate ownership cannot be transferred."};
     console.log("[daemon] onProjectOwnerChanged:", slug, "→", ownerId);
     var oldOwnerId = null;
     var projectIdx = -1;
@@ -636,12 +632,7 @@ var relay = createServer({
     return { envrc: config.sharedEnv || "" };
   },
   onSetSharedEnv: function (envrc) {
-    if (envrc) {
-      config.sharedEnv = envrc;
-    } else {
-      delete config.sharedEnv;
-    }
-    saveConfig(config);
+    saveDaemonSetting(config, "sharedEnv", envrc || undefined, saveConfig);
     return { ok: true };
   },
   onGetServerDefaultEffort: function () {
@@ -811,7 +802,6 @@ var relay = createServer({
       keepAwake: !!config.keepAwake,
       autoContinueOnRateLimit: !!config.autoContinueOnRateLimit,
       osUsers: !!config.osUsers,
-      inheritGroups: config.inheritGroups !== false,
       chatLayout: config.chatLayout || "channel",
       matesEnabled: config.matesEnabled === true,
       capsulesEnabled: config.capsulesEnabled === true,
@@ -826,25 +816,18 @@ var relay = createServer({
   onSetImageRetention: function (days) {
     var d = parseInt(days, 10);
     if (isNaN(d) || d < 0) d = 7;
-    config.imageRetentionDays = d;
-    saveConfig(config);
+    saveDaemonSetting(config, "imageRetentionDays", d, saveConfig);
     console.log("[daemon] Image retention:", d === 0 ? "forever" : d + " days");
     return { ok: true, days: d };
   },
   onSetUpdateChannel: function (channel) {
-    config.updateChannel = channel === "beta" ? "beta" : "stable";
-    saveConfig(config);
+    saveDaemonSetting(config, "updateChannel", channel === "beta" ? "beta" : "stable", saveConfig);
     console.log("[daemon] Update channel:", config.updateChannel, "(web)");
     return { ok: true, updateChannel: config.updateChannel };
   },
   onSetPin: function (pin) {
-    if (pin) {
-      config.pinHash = generateAuthToken(pin);
-    } else {
-      config.pinHash = null;
-    }
+    saveDaemonSetting(config, "pinHash", pin ? generateAuthToken(pin) : null, saveConfig);
     relay.setAuthToken(config.pinHash);
-    saveConfig(config);
     console.log("[daemon] PIN", pin ? "set" : "removed", "(web)");
     return { ok: true, pinEnabled: !!config.pinHash };
   },
@@ -920,8 +903,7 @@ var relay = createServer({
   },
   onSetKeepAwake: function (value) {
     var want = !!value;
-    config.keepAwake = want;
-    saveConfig(config);
+    saveDaemonSetting(config, "keepAwake", want, saveConfig);
     if (want && !caffeinateProc && process.platform === "darwin") {
       try {
         var { spawn: spawnCaff } = require("child_process");
@@ -935,16 +917,6 @@ var relay = createServer({
     console.log("[daemon] Keep awake:", want, "(web)");
     return { ok: true, keepAwake: want };
   },
-  onSetInheritGroups: function (value) {
-    var want = !!value;
-    config.inheritGroups = want;
-    saveConfig(config);
-    // Apply live so subsequent session/terminal spawns pick it up without a
-    // daemon restart; already-running sessions keep their current groups.
-    osUsersMod.setInheritGroups(want);
-    console.log("[daemon] Inherit supplementary groups:", want, "(web)");
-    return { ok: true, inheritGroups: want };
-  },
   onShutdown: function () {
     console.log("[daemon] Shutdown requested via web UI");
     gracefulShutdown();
@@ -954,6 +926,7 @@ var relay = createServer({
     spawnAndRestart();
   },
   onSetProjectVisibility: function (slug, visibility) {
+    if (slug.indexOf("mate-") === 0) return {error:"Mates cannot be shared."};
     for (var i = 0; i < config.projects.length; i++) {
       if (config.projects[i].slug === slug) {
         var prevVisibility = config.projects[i].visibility || "public";

package/lib/dicebear-avatar.js

@@ -0,0 +1,62 @@
+var STYLE_PACKAGES = {
+  thumbs: "@dicebear/thumbs",
+  bottts: "@dicebear/bottts",
+  "pixel-art": "@dicebear/pixel-art",
+  adventurer: "@dicebear/adventurer",
+  micah: "@dicebear/micah",
+  "fun-emoji": "@dicebear/fun-emoji",
+  icons: "@dicebear/icons",
+};
+
+var corePromise = null;
+var stylePromises = Object.create(null);
+var avatarCache = new Map();
+
+function normalizeRequest(style, seed, size) {
+  if (!Object.prototype.hasOwnProperty.call(STYLE_PACKAGES, style)) {
+    throw new Error("Unknown avatar style");
+  }
+  var normalizedSeed = typeof seed === "string" ? seed.substring(0, 80) : "";
+  if (!normalizedSeed) normalizedSeed = "anonymous";
+  var normalizedSize = Number(size);
+  if (!Number.isInteger(normalizedSize) || normalizedSize < 16 || normalizedSize > 256) normalizedSize = 64;
+  return { style: style, seed: normalizedSeed, size: normalizedSize };
+}
+
+function loadCore() {
+  if (!corePromise) corePromise = import("@dicebear/core");
+  return corePromise;
+}
+
+function loadStyle(style) {
+  if (!stylePromises[style]) stylePromises[style] = import(STYLE_PACKAGES[style]);
+  return stylePromises[style];
+}
+
+function renderAvatar(style, seed, size) {
+  var request = normalizeRequest(style, seed, size);
+  var cacheKey = [request.style, request.seed, request.size].join("|");
+  if (avatarCache.has(cacheKey)) return Promise.resolve(avatarCache.get(cacheKey));
+  return Promise.all([loadCore(), loadStyle(request.style)]).then(function (modules) {
+    var createAvatar = modules[0].createAvatar;
+    var styleDefinition = modules[1];
+    var svg = createAvatar(styleDefinition, {
+      seed: [request.seed],
+      size: request.size,
+    }).toString();
+    if (avatarCache.size >= 512) avatarCache.delete(avatarCache.keys().next().value);
+    avatarCache.set(cacheKey, svg);
+    return svg;
+  });
+}
+
+function isSupportedStyle(style) {
+  return Object.prototype.hasOwnProperty.call(STYLE_PACKAGES, style);
+}
+
+module.exports = {
+  isSupportedStyle: isSupportedStyle,
+  normalizeRequest: normalizeRequest,
+  renderAvatar: renderAvatar,
+  styles: Object.keys(STYLE_PACKAGES),
+};