clay-server 2.8.0 → 2.9.0

package/README.md

@@ -276,6 +276,8 @@ If you are using claude-relay, let us know how you are using it in Discussions:
 
 This is an independent project and is not affiliated with Anthropic. Claude is a trademark of Anthropic.
 
+Clay is provided "as is" without warranty of any kind. Users are responsible for ensuring their use of this software complies with all applicable terms of service of the underlying AI providers (e.g., Anthropic, OpenAI) and any other third-party services. Features such as multi-user mode are experimental and may involve sharing access to API-backed services — please review your provider's usage policies regarding account sharing, acceptable use, and any applicable rate limits or restrictions before enabling such features. The authors assume no liability for any misuse or violations arising from the use of this software.
+
 ## License
 
 MIT

package/bin/cli.js

@@ -28,6 +28,7 @@ if (_isDev) process.env.CLAY_DEV = "1";
 var { loadConfig, saveConfig, configPath, socketPath, logPath, ensureConfigDir, isDaemonAlive, isDaemonAliveAsync, generateSlug, clearStaleConfig, loadClayrc, saveClayrc, readCrashInfo } = require("../lib/config");
 var { sendIPCCommand } = require("../lib/ipc");
 var { generateAuthToken } = require("../lib/server");
+var { enableMultiUser, hasAdmin, isMultiUser } = require("../lib/users");
 
 function openUrl(url) {
   try {
@@ -56,6 +57,7 @@ var dangerouslySkipPermissions = false;
 var headlessMode = false;
 var watchMode = false;
 var host = null;
+var multiUserMode = false;
 
 for (var i = 0; i < args.length; i++) {
   if (args[i] === "-p" || args[i] === "--port") {
@@ -100,6 +102,8 @@ for (var i = 0; i < args.length; i++) {
     autoYes = true;
   } else if (args[i] === "--dangerously-skip-permissions") {
     dangerouslySkipPermissions = true;
+  } else if (args[i] === "--multi-user") {
+    multiUserMode = true;
   } else if (args[i] === "-h" || args[i] === "--help") {
     console.log("Usage: clay-server [-p|--port <port>] [--host <address>] [--no-https] [--no-update] [--debug] [-y|--yes] [--pin <pin>] [--shutdown] [--restart]");
     console.log("       clay-server --add <path>     Add a project to the running daemon");
@@ -120,8 +124,9 @@ for (var i = 0; i < args.length; i++) {
     console.log("  --remove <path>    Remove a project directory");
     console.log("  --list             List all registered projects");
     console.log("  --headless         Start daemon and exit immediately (implies --yes)");
+    console.log("  --multi-user       Enable multi-user mode (generates setup code)");
     console.log("  --dangerously-skip-permissions");
-    console.log("                     Bypass all permission prompts (requires --pin)");
+    console.log("                     Bypass all permission prompts");
     process.exit(0);
   }
 }
@@ -258,6 +263,34 @@ if (listMode) {
   return;
 }
 
+// --- Handle --multi-user before anything else ---
+if (multiUserMode) {
+  var muResult = enableMultiUser();
+  if (muResult.alreadyEnabled && muResult.hasAdmin) {
+    console.log("");
+    console.log("Multi-user mode is already enabled and an admin account exists.");
+    console.log("No changes made.");
+    console.log("");
+  } else if (muResult.setupCode) {
+    console.log("");
+    console.log("\x1b[33m⚠ Experimental Feature\x1b[0m");
+    console.log("");
+    console.log("  Multi-user mode is experimental and may change in future releases.");
+    console.log("  Sharing access to AI-powered tools may be subject to your provider's");
+    console.log("  terms of service. Please review the applicable usage policies before");
+    console.log("  granting access to other users.");
+    console.log("");
+    console.log("\x1b[32mMulti-user mode enabled.\x1b[0m");
+    console.log("");
+    console.log("Setup code:  \x1b[1m" + muResult.setupCode + "\x1b[0m");
+    console.log("");
+    console.log("Open Clay in your browser and enter this code to create the admin account.");
+    console.log("The code is single-use and will be cleared once the admin is set up.");
+    console.log("");
+  }
+  process.exit(0);
+}
+
 var cwd = process.cwd();
 
 // --- ANSI helpers ---
@@ -1243,7 +1276,30 @@ function setup(callback) {
           port = p;
           log(sym.bar);
 
-          promptPin(function (pin) {
+          function askPin() {
+            promptPin(function (pin) {
+              if (dangerouslySkipPermissions && !pin) {
+                log(sym.bar);
+                log(sym.warn + "  " + a.yellow + "WARNING: No PIN + skip permissions = anyone with the URL" + a.reset);
+                log(sym.bar + "  " + a.yellow + "can execute any command without approval." + a.reset);
+                log(sym.bar);
+                promptToggle("Continue without PIN?", null, false, function (confirmed) {
+                  if (!confirmed) {
+                    clearUp(6);
+                    log(sym.done + "  PIN protection " + a.dim + "·" + a.reset + " " + a.yellow + "Required for skip permissions" + a.reset);
+                    log(sym.bar);
+                    askPin();
+                    return;
+                  }
+                  afterPin(pin);
+                });
+              } else {
+                afterPin(pin);
+              }
+            });
+          }
+
+          function afterPin(pin) {
             if (process.platform === "darwin") {
               promptToggle("Keep awake", "Prevent system sleep while relay is running", false, function (keepAwake) {
                 callback(pin, keepAwake);
@@ -1251,7 +1307,9 @@ function setup(callback) {
             } else {
               callback(pin, false);
             }
-          });
+          }
+
+          askPin();
         });
       });
     }
@@ -1287,6 +1345,15 @@ async function forkDaemon(pin, keepAwake, extraProjects, addCwd) {
   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
   if (addCwd) {
     var slug = generateSlug(cwd, []);
@@ -1301,6 +1368,11 @@ async function forkDaemon(pin, keepAwake, extraProjects, addCwd) {
         break;
       }
     }
+    // Restore access settings from previous config
+    if (prevProjectMap[cwd]) {
+      if (prevProjectMap[cwd].visibility) cwdEntry.visibility = prevProjectMap[cwd].visibility;
+      if (prevProjectMap[cwd].allowedUsers) cwdEntry.allowedUsers = prevProjectMap[cwd].allowedUsers;
+    }
     allProjects.push(cwdEntry);
     usedSlugs.push(slug);
   }
@@ -1313,7 +1385,13 @@ async function forkDaemon(pin, keepAwake, extraProjects, addCwd) {
       if (!fs.existsSync(rp.path)) continue; // skip missing directories
       var rpSlug = generateSlug(rp.path, usedSlugs);
       usedSlugs.push(rpSlug);
-      allProjects.push({ path: rp.path, slug: rpSlug, title: rp.title || undefined, icon: rp.icon || undefined, addedAt: rp.addedAt || Date.now() });
+      var rpEntry = { path: rp.path, slug: rpSlug, title: rp.title || undefined, icon: rp.icon || undefined, addedAt: rp.addedAt || Date.now() };
+      // Restore access settings from previous config
+      if (prevProjectMap[rp.path]) {
+        if (prevProjectMap[rp.path].visibility) rpEntry.visibility = prevProjectMap[rp.path].visibility;
+        if (prevProjectMap[rp.path].allowedUsers) rpEntry.allowedUsers = prevProjectMap[rp.path].allowedUsers;
+      }
+      allProjects.push(rpEntry);
     }
   }
 
@@ -1404,6 +1482,15 @@ async function devMode(pin, keepAwake, existingPinHash) {
   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) {
@@ -1418,13 +1505,24 @@ async function devMode(pin, keepAwake, existingPinHash) {
       break;
     }
   }
+  // Restore access settings for cwd from previous config
+  if (prevDevProjectMap[cwd]) {
+    if (prevDevProjectMap[cwd].visibility) cwdDevEntry.visibility = prevDevProjectMap[cwd].visibility;
+    if (prevDevProjectMap[cwd].allowedUsers) cwdDevEntry.allowedUsers = prevDevProjectMap[cwd].allowedUsers;
+  }
   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);
-    allProjects.push({ path: rp.path, slug: rpSlug, title: rp.title || undefined, icon: rp.icon || undefined, addedAt: rp.addedAt || Date.now() });
+    var rpDevEntry = { path: rp.path, slug: rpSlug, title: rp.title || undefined, icon: rp.icon || undefined, addedAt: rp.addedAt || Date.now() };
+    // Restore access settings from previous config
+    if (prevDevProjectMap[rp.path]) {
+      if (prevDevProjectMap[rp.path].visibility) rpDevEntry.visibility = prevDevProjectMap[rp.path].visibility;
+      if (prevDevProjectMap[rp.path].allowedUsers) rpDevEntry.allowedUsers = prevDevProjectMap[rp.path].allowedUsers;
+    }
+    allProjects.push(rpDevEntry);
   }
 
   var config = {
@@ -2197,7 +2295,13 @@ function showSettingsMenu(config, ip) {
     log(sym.bar + "  Tailscale    " + tsStatus);
     log(sym.bar + "  mkcert       " + mcStatus);
     log(sym.bar + "  HTTPS        " + tlsStatus);
+    var muEnabled = isMultiUser();
+    var muStatus = muEnabled
+      ? a.green + "Enabled" + a.reset
+      : a.dim + "Off" + a.reset;
+
     log(sym.bar + "  PIN          " + pinStatus);
+    log(sym.bar + "  Multi-user   " + muStatus);
     if (process.platform === "darwin") {
       log(sym.bar + "  Keep awake   " + awakeStatus);
     }
@@ -2214,6 +2318,11 @@ function showSettingsMenu(config, ip) {
     } else {
       items.push({ label: "Set PIN", value: "pin" });
     }
+    if (muEnabled) {
+      items.push({ label: "Multi-user mode (enabled)", value: "multi_user" });
+    } else {
+      items.push({ label: "Enable multi-user mode", value: "multi_user" });
+    }
     if (process.platform === "darwin") {
       items.push({ label: isAwake ? "Disable keep awake" : "Enable keep awake", value: "awake" });
     }
@@ -2255,6 +2364,42 @@ function showSettingsMenu(config, ip) {
         });
         break;
 
+      case "multi_user":
+        if (muEnabled && hasAdmin()) {
+          log(sym.bar);
+          log(sym.bar + "  " + a.dim + "Multi-user mode is already enabled and an admin account exists." + a.reset);
+          log(sym.bar + "  " + a.dim + "No changes made." + a.reset);
+          log(sym.bar);
+          promptSelect("Back?", [{ label: "Back", value: "back" }], function () {
+            showSettingsMenu(config, ip);
+          });
+        } else {
+          var muResult = enableMultiUser();
+          log(sym.bar);
+          log(sym.bar + "  " + a.yellow + sym.warn + " Experimental Feature" + a.reset);
+          log(sym.bar);
+          log(sym.bar + "  " + a.dim + "Multi-user mode is experimental and may change in future releases." + a.reset);
+          log(sym.bar + "  " + a.dim + "Sharing access to AI-powered tools may be subject to your provider's" + a.reset);
+          log(sym.bar + "  " + a.dim + "terms of service. Please review the applicable usage policies before" + a.reset);
+          log(sym.bar + "  " + a.dim + "granting access to other users." + a.reset);
+          log(sym.bar);
+          if (muResult.setupCode) {
+            log(sym.bar + "  " + a.green + "Multi-user mode enabled." + a.reset);
+            log(sym.bar);
+            log(sym.bar + "  Setup code:  " + a.bold + muResult.setupCode + a.reset);
+            log(sym.bar);
+            log(sym.bar + "  " + a.dim + "Open Clay in your browser and enter this code to create the admin account." + a.reset);
+            log(sym.bar + "  " + a.dim + "The code is single-use and will be cleared once the admin is set up." + a.reset);
+          } else {
+            log(sym.bar + "  " + a.dim + "Multi-user mode is already enabled." + a.reset);
+          }
+          log(sym.bar);
+          promptSelect("Back?", [{ label: "Back", value: "back" }], function () {
+            showSettingsMenu(config, ip);
+          });
+        }
+        break;
+
       case "logs":
         console.clear();
         log(a.bold + "Daemon logs" + a.reset + " " + a.dim + "(" + logPath() + ")" + a.reset);
@@ -2398,15 +2543,10 @@ var currentVersion = require("../package.json").version;
     // No daemon running — first-time setup
     if (autoYes) {
       var pin = cliPin || null;
-      if (dangerouslySkipPermissions && !pin) {
-        console.error("  " + sym.warn + "  " + a.red + "--dangerously-skip-permissions requires --pin <pin>" + a.reset);
-        process.exit(1);
-        return;
-      }
       console.log("  " + sym.done + "  Auto-accepted disclaimer");
       console.log("  " + sym.done + "  PIN: " + (pin ? "Enabled" : "Skipped"));
       if (dangerouslySkipPermissions) {
-        console.log("  " + sym.warn + "  " + a.yellow + "Skip permissions mode enabled" + a.reset);
+        console.log("  " + sym.warn + "  " + a.yellow + "Skip permissions mode enabled" + (pin ? "" : " (no PIN)") + a.reset);
       }
       var autoRc = loadClayrc();
       var autoRestorable = (autoRc.recentProjects || []).filter(function (p) {
@@ -2423,13 +2563,6 @@ var currentVersion = require("../package.json").version;
       await forkDaemon(pin, false, autoRestorable.length > 0 ? autoRestorable : undefined, addCwd);
     } else {
       setup(function (pin, keepAwake) {
-        if (dangerouslySkipPermissions && !pin) {
-          log(sym.warn + "  " + a.red + "--dangerously-skip-permissions requires a PIN." + a.reset);
-          log(a.dim + "     Please set a PIN to use skip permissions mode." + a.reset);
-          process.exit(1);
-          return;
-        }
-
         // Check ~/.clayrc for previous projects to restore
         var rc = loadClayrc();
         var restorable = (rc.recentProjects || []).filter(function (p) {

package/lib/config.js

@@ -89,8 +89,14 @@ function logPath() {
   return path.join(CONFIG_DIR, _devMode ? "daemon-dev.log" : "daemon.log");
 }
 
+function chmodSafe(filePath, mode) {
+  if (process.platform === "win32") return;
+  try { fs.chmodSync(filePath, mode); } catch (e) {}
+}
+
 function ensureConfigDir() {
   fs.mkdirSync(CONFIG_DIR, { recursive: true });
+  chmodSafe(CONFIG_DIR, 0o700);
 }
 
 function loadConfig() {
@@ -106,7 +112,9 @@ function saveConfig(config) {
   ensureConfigDir();
   var tmpPath = configPath() + ".tmp";
   fs.writeFileSync(tmpPath, JSON.stringify(config, null, 2));
+  chmodSafe(tmpPath, 0o600);
   fs.renameSync(tmpPath, configPath());
+  chmodSafe(configPath(), 0o600);
 }
 
 function isPidAlive(pid) {
@@ -173,7 +181,17 @@ function generateSlug(projectPath, existingSlugs) {
 }
 
 function clearStaleConfig() {
-  try { fs.unlinkSync(configPath()); } catch (e) {}
+  // Clear pid from config instead of deleting the file (preserves project settings)
+  try {
+    var data = fs.readFileSync(configPath(), "utf8");
+    var cfg = JSON.parse(data);
+    cfg.pid = null;
+    var tmpPath = configPath() + ".tmp";
+    fs.writeFileSync(tmpPath, JSON.stringify(cfg, null, 2));
+    chmodSafe(tmpPath, 0o600);
+    fs.renameSync(tmpPath, configPath());
+    chmodSafe(configPath(), 0o600);
+  } catch (e) {}
   if (process.platform !== "win32") {
     try { fs.unlinkSync(socketPath()); } catch (e) {}
   }
@@ -316,4 +334,5 @@ module.exports = {
   saveClayrc: saveClayrc,
   syncClayrc: syncClayrc,
   removeFromClayrc: removeFromClayrc,
+  chmodSafe: chmodSafe,
 };

package/lib/daemon.js

@@ -368,6 +368,12 @@ var relay = createServer({
     console.log("[daemon] PIN", pin ? "set" : "removed", "(web)");
     return { ok: true, pinEnabled: !!config.pinHash };
   },
+  onUpgradePin: function (newHash) {
+    config.pinHash = newHash;
+    relay.setAuthToken(newHash);
+    saveConfig(config);
+    console.log("[daemon] PIN hash auto-upgraded to scrypt");
+  },
   onSetKeepAwake: function (value) {
     var want = !!value;
     config.keepAwake = want;
@@ -393,6 +399,40 @@ var relay = createServer({
     console.log("[daemon] Restart requested via web UI");
     spawnAndRestart();
   },
+  onSetProjectVisibility: function (slug, visibility) {
+    for (var i = 0; i < config.projects.length; i++) {
+      if (config.projects[i].slug === slug) {
+        config.projects[i].visibility = visibility;
+        saveConfig(config);
+        console.log("[daemon] Set project visibility:", slug, "→", visibility);
+        return { ok: true };
+      }
+    }
+    return { error: "Project not found" };
+  },
+  onSetProjectAllowedUsers: function (slug, allowedUsers) {
+    for (var i = 0; i < config.projects.length; i++) {
+      if (config.projects[i].slug === slug) {
+        config.projects[i].allowedUsers = allowedUsers;
+        saveConfig(config);
+        console.log("[daemon] Set project allowed users:", slug, "→", allowedUsers.length, "users");
+        return { ok: true };
+      }
+    }
+    return { error: "Project not found" };
+  },
+  onGetProjectAccess: function (slug) {
+    for (var i = 0; i < config.projects.length; i++) {
+      if (config.projects[i].slug === slug) {
+        return {
+          slug: slug,
+          visibility: config.projects[i].visibility || "public",
+          allowedUsers: config.projects[i].allowedUsers || [],
+        };
+      }
+    }
+    return { error: "Project not found" };
+  },
 });
 
 // --- Register projects ---