clay-server 2.20.0 → 2.20.1-beta.2

package/README.md

@@ -8,7 +8,7 @@
 
 <p align="center"><img src="media/hero.png" alt="Clay workspace" /></p>
 
-AI teammates who remember your decisions, challenge your thinking, and grow with your codebase. Runs on your machine.
+A team workspace built on Claude Code. AI teammates who remember your decisions, challenge your thinking, and grow with your codebase. Runs on your machine.
 
 ```bash
 npx clay-server

package/bin/cli.js

@@ -36,7 +36,7 @@ var crypto = require("crypto");
 var { loadConfig, saveConfig, configPath, socketPath, logPath, ensureConfigDir, isDaemonAlive, isDaemonAliveAsync, generateSlug, clearStaleConfig, loadClayrc, saveClayrc, readCrashInfo, REAL_HOME } = require("../lib/config");
 var { sendIPCCommand } = require("../lib/ipc");
 var { generateAuthToken } = require("../lib/server");
-var { enableMultiUser, disableMultiUser, hasAdmin, isMultiUser } = require("../lib/users");
+var { enableMultiUser, disableMultiUser, hasAdmin, isMultiUser, getSetupCode } = require("../lib/users");
 
 function openUrl(url) {
   try {
@@ -1417,16 +1417,15 @@ function setup(callback) {
           }
           var isRoot = typeof process.getuid === "function" && process.getuid() === 0;
           if (!isRoot) {
-            // Save config so sudo clay can pick it up
-            var partialConfig = {
-              port: port,
-              host: host,
-              mode: "multi",
-              osUsers: true,
-              setupCompleted: true,
-              dangerouslySkipPermissions: dangerouslySkipPermissions,
-            };
-            saveConfig(partialConfig);
+            // Merge into existing config (preserve projects, TLS, etc.)
+            var existingCfg = loadConfig() || {};
+            existingCfg.port = port;
+            existingCfg.host = host;
+            existingCfg.mode = "multi";
+            existingCfg.osUsers = true;
+            existingCfg.setupCompleted = true;
+            if (dangerouslySkipPermissions) existingCfg.dangerouslySkipPermissions = true;
+            saveConfig(existingCfg);
             log(sym.bar);
             log(sym.warn + "  " + a.yellow + "OS user isolation requires root." + a.reset);
             log(sym.bar + "  Run:");
@@ -2009,8 +2008,10 @@ function showMainMenu(config, ip, setupCode) {
         log("");
       }
 
-      if (setupCode) {
-        log("  " + a.yellow + sym.warn + " Setup code:  " + a.bold + setupCode + a.reset);
+      // Always show setup code if one exists (persists until admin is created)
+      var displayCode = setupCode || getSetupCode();
+      if (displayCode) {
+        log("  " + a.yellow + sym.warn + " Setup code:  " + a.bold + displayCode + a.reset);
         log("  " + a.dim + "Open Clay in your browser and enter this code to create the admin account." + a.reset);
         log("");
       }
@@ -2373,6 +2374,10 @@ function showSettingsMenu(config, ip) {
     } else {
       items.push({ label: "Enable multi-user mode", value: "multi_user" });
     }
+    var pendingSetupCode = getSetupCode();
+    if (muEnabled && pendingSetupCode) {
+      items.push({ label: "Show setup code", value: "show_setup_code" });
+    }
     if (muEnabled && hasAdmin()) {
       items.push({ label: "Recover admin password", value: "recover_admin" });
     }
@@ -2478,7 +2483,9 @@ function showSettingsMenu(config, ip) {
         }
         if (process.getuid() !== 0) {
           log(sym.bar);
-          log(sym.bar + "  " + a.red + "Requires running as root." + a.reset);
+          log(sym.bar + "  " + a.red + sym.warn + " OS user isolation requires root." + a.reset);
+          log(sym.bar + "  " + a.dim + "Shut down this server, then restart with:" + a.reset);
+          log(sym.bar + "    " + a.bold + "sudo npx clay-server" + a.reset);
           log(sym.bar);
           promptSelect("Back?", [{ label: "Back", value: "back" }], function () {
             showSettingsMenu(config, ip);
@@ -2603,33 +2610,48 @@ function showSettingsMenu(config, ip) {
           { label: "Cancel", value: "cancel" },
         ], function (confirmChoice) {
           if (confirmChoice === "confirm") {
-            // Clear setupCompleted so setup() runs fresh
+            // Save old PID before clearing, so we can force-kill if needed
             var cfg = loadConfig() || {};
+            var oldPid = cfg.pid;
+            // Clear setupCompleted so setup() runs fresh
             delete cfg.setupCompleted;
             delete cfg.mode;
             cfg.pid = null;
             saveConfig(cfg);
-            // Shut down the daemon
-            sendIPCCommand(socketPath(), { cmd: "shutdown" }).then(function () {
-              clearStaleConfig();
-              // Run the setup wizard, then fork a new daemon
-              setup(function (mode, keepAwake, wantOsUsers) {
-                var rc = loadClayrc();
-                var restorable = (rc.recentProjects || []).filter(function (p) {
-                  return p.path !== cwd && fs.existsSync(p.path);
+
+            // Helper: wait for port to be free, force-kill if needed
+            function waitForPortFree(cb) {
+              var attempts = 0;
+              var maxAttempts = 12; // 6 seconds total
+              function check() {
+                isPortFree(port).then(function (free) {
+                  if (free) return cb();
+                  attempts++;
+                  if (attempts >= maxAttempts) {
+                    // Port still busy, force-kill old daemon
+                    if (oldPid) {
+                      try { process.kill(oldPid, "SIGKILL"); } catch (e) {}
+                    }
+                    // Wait a bit more after SIGKILL
+                    setTimeout(function () {
+                      isPortFree(port).then(function (free2) {
+                        if (!free2) {
+                          log(sym.warn + "  " + a.yellow + "Port " + port + " still in use. Kill the process manually:" + a.reset);
+                          log(sym.bar + "    " + a.bold + "lsof -ti:" + port + " | xargs kill -9" + a.reset);
+                        }
+                        cb();
+                      });
+                    }, 1000);
+                    return;
+                  }
+                  setTimeout(check, 500);
                 });
-                if (restorable.length > 0) {
-                  promptRestoreProjects(restorable, function (selected) {
-                    forkDaemon(mode, keepAwake, selected, false, wantOsUsers);
-                  });
-                } else {
-                  log(sym.bar);
-                  log(sym.end + "  " + a.dim + "Starting relay..." + a.reset);
-                  log("");
-                  forkDaemon(mode, keepAwake, undefined, true, wantOsUsers);
-                }
-              });
-            }).catch(function () {
+              }
+              check();
+            }
+
+            // Helper: run setup wizard after daemon is dead
+            function proceedWithSetup() {
               clearStaleConfig();
               setup(function (mode, keepAwake, wantOsUsers) {
                 var rc = loadClayrc();
@@ -2647,6 +2669,17 @@ function showSettingsMenu(config, ip) {
                   forkDaemon(mode, keepAwake, undefined, true, wantOsUsers);
                 }
               });
+            }
+
+            // Shut down the daemon, then wait for port to be free
+            sendIPCCommand(socketPath(), { cmd: "shutdown" }).then(function () {
+              waitForPortFree(proceedWithSetup);
+            }).catch(function () {
+              // IPC failed, daemon may be unresponsive. Try SIGTERM, then wait.
+              if (oldPid) {
+                try { process.kill(oldPid, "SIGTERM"); } catch (e) {}
+              }
+              waitForPortFree(proceedWithSetup);
             });
           } else {
             showSettingsMenu(config, ip);
@@ -2654,6 +2687,23 @@ function showSettingsMenu(config, ip) {
         });
         break;
 
+      case "show_setup_code":
+        var currentCode = getSetupCode();
+        if (currentCode) {
+          log(sym.bar);
+          log(sym.bar + "  " + a.yellow + sym.warn + " Setup code:  " + a.bold + currentCode + a.reset);
+          log(sym.bar + "  " + a.dim + "Open Clay in your browser and enter this code to create the admin account." + a.reset);
+          log(sym.bar);
+        } else {
+          log(sym.bar);
+          log(sym.bar + "  " + a.dim + "No pending setup code (admin already exists)." + 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);

package/lib/daemon.js

@@ -43,6 +43,11 @@ try {
   process.exit(1);
 }
 
+console.log("[daemon] Config: " + configFile);
+console.log("[daemon] Users: " + usersModule.USERS_FILE);
+if (process.env.SUDO_USER) console.log("[daemon] SUDO_USER: " + process.env.SUDO_USER);
+console.log("[daemon] UID: " + (typeof process.getuid === "function" ? process.getuid() : "N/A"));
+
 // --- OS users mode: check required system dependencies ---
 if (config.osUsers) {
   var { execSync: checkExec } = require("child_process");

package/lib/users.js

@@ -115,7 +115,15 @@ function generateSetupCode() {
 
 function getSetupCode() {
   var data = loadUsers();
-  return data.setupCode || null;
+  if (data.setupCode) return data.setupCode;
+  // Defensive: if multi-user is on, no admin, and no code, auto-generate one
+  if (data.multiUser && !findAdmin(data)) {
+    var code = generateSetupCode();
+    data.setupCode = code;
+    saveUsers(data);
+    return code;
+  }
+  return null;
 }
 
 function clearSetupCode() {

package/package.json

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