clay-server 2.20.1-beta.2 → 2.20.1-beta.4

package/bin/cli.js

@@ -1998,6 +1998,7 @@ function showMainMenu(config, ip, setupCode) {
         parts.push(a.reset + a.yellow + a.bold + totalAwaiting + a.reset + a.yellow + " awaiting" + a.reset + a.dim);
       }
       log("  " + a.dim + parts.join(a.reset + a.dim + " · ") + a.reset);
+      log("  " + a.dim + "~/.clay → " + path.join(REAL_HOME, ".clay") + a.reset);
       log("  Press " + a.bold + "o" + a.reset + " to open in browser");
       log("");
 
@@ -2374,8 +2375,7 @@ function showSettingsMenu(config, ip) {
     } else {
       items.push({ label: "Enable multi-user mode", value: "multi_user" });
     }
-    var pendingSetupCode = getSetupCode();
-    if (muEnabled && pendingSetupCode) {
+    if (muEnabled) {
       items.push({ label: "Show setup code", value: "show_setup_code" });
     }
     if (muEnabled && hasAdmin()) {
@@ -2534,6 +2534,10 @@ function showSettingsMenu(config, ip) {
                 log(sym.bar);
                 log(sym.bar + "  " + a.dim + "Then try enabling OS user isolation again." + a.reset);
                 log(sym.bar);
+              } else if (res.error) {
+                log(sym.bar);
+                log(sym.bar + "  " + a.red + sym.warn + " Failed to enable OS users: " + res.error + a.reset);
+                log(sym.bar);
               } else if (res.ok) {
                 config.osUsers = true;
                 log(sym.bar);
@@ -2558,10 +2562,19 @@ function showSettingsMenu(config, ip) {
                     }
                   }
                 }
-                log(sym.bar + "  " + a.dim + "Restart the daemon for changes to take full effect." + a.reset);
+                log(sym.bar);
+              } else {
+                log(sym.bar);
+                log(sym.bar + "  " + a.red + sym.warn + " Unexpected response from daemon." + a.reset);
+                log(sym.bar + "  " + a.dim + JSON.stringify(res) + a.reset);
                 log(sym.bar);
               }
               showSettingsMenu(config, ip);
+            }).catch(function (err) {
+              log(sym.bar);
+              log(sym.bar + "  " + a.red + sym.warn + " IPC error: " + (err.message || err) + a.reset);
+              log(sym.bar);
+              showSettingsMenu(config, ip);
             });
           } else {
             showSettingsMenu(config, ip);
@@ -2688,17 +2701,20 @@ function showSettingsMenu(config, ip) {
         break;
 
       case "show_setup_code":
+        // getSetupCode() auto-generates if multi-user is on and no code exists
         var currentCode = getSetupCode();
+        log(sym.bar);
         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);
+          if (hasAdmin()) {
+            log(sym.bar + "  " + a.dim + "Admin account exists. This code is for adding the next admin." + a.reset);
+          } else {
+            log(sym.bar + "  " + a.dim + "Enter this code in the browser to create the admin account." + a.reset);
+          }
         } else {
-          log(sym.bar);
-          log(sym.bar + "  " + a.dim + "No pending setup code (admin already exists)." + a.reset);
-          log(sym.bar);
+          log(sym.bar + "  " + a.dim + "Multi-user mode is not enabled." + a.reset);
         }
+        log(sym.bar);
         promptSelect("Back?", [{ label: "Back", value: "back" }], function () {
           showSettingsMenu(config, ip);
         });

package/lib/daemon.js

@@ -1140,36 +1140,45 @@ var ipc = createIPCServer(socketPath(), function (msg) {
           console.error("[daemon] Failed to create projects dir:", e.message);
         }
         // Auto-provision Linux accounts for all existing users
-        var provisionResult = provisionAllUsers(usersModule);
-        console.log("[daemon] Provisioning result: " +
-          provisionResult.provisioned.length + " provisioned, " +
-          provisionResult.skipped.length + " skipped, " +
-          provisionResult.errors.length + " errors");
+        var provisionResult = { provisioned: [], skipped: [], errors: [] };
+        try {
+          provisionResult = provisionAllUsers(usersModule);
+          console.log("[daemon] Provisioning result: " +
+            provisionResult.provisioned.length + " provisioned, " +
+            provisionResult.skipped.length + " skipped, " +
+            provisionResult.errors.length + " errors");
+        } catch (provErr) {
+          console.error("[daemon] Provisioning threw:", provErr.message);
+        }
         // Set up ACLs for all existing projects
-        for (var pi = 0; pi < config.projects.length; pi++) {
-          var proj = config.projects[pi];
-          var projPath = proj.path;
-          var projVisibility = proj.visibility || "public";
-          // Grant ACL to project owner
-          if (proj.ownerId) {
-            var ownerUser = usersModule.findUserById(proj.ownerId);
-            if (ownerUser && ownerUser.linuxUser) {
-              grantProjectAccess(projPath, ownerUser.linuxUser);
+        try {
+          for (var pi = 0; pi < config.projects.length; pi++) {
+            var proj = config.projects[pi];
+            var projPath = proj.path;
+            var projVisibility = proj.visibility || "public";
+            // Grant ACL to project owner
+            if (proj.ownerId) {
+              var ownerUser = usersModule.findUserById(proj.ownerId);
+              if (ownerUser && ownerUser.linuxUser) {
+                grantProjectAccess(projPath, ownerUser.linuxUser);
+              }
             }
-          }
-          // Public projects: grant ACL to all users
-          if (projVisibility === "public") {
-            grantAllUsersAccess(projPath, usersModule);
-          } else {
-            // Private projects: grant ACL to allowedUsers
-            var projAllowed = proj.allowedUsers || [];
-            for (var ai = 0; ai < projAllowed.length; ai++) {
-              var allowedUser = usersModule.findUserById(projAllowed[ai]);
-              if (allowedUser && allowedUser.linuxUser) {
-                grantProjectAccess(projPath, allowedUser.linuxUser);
+            // Public projects: grant ACL to all users
+            if (projVisibility === "public") {
+              grantAllUsersAccess(projPath, usersModule);
+            } else {
+              // Private projects: grant ACL to allowedUsers
+              var projAllowed = proj.allowedUsers || [];
+              for (var ai = 0; ai < projAllowed.length; ai++) {
+                var allowedUser = usersModule.findUserById(projAllowed[ai]);
+                if (allowedUser && allowedUser.linuxUser) {
+                  grantProjectAccess(projPath, allowedUser.linuxUser);
+                }
               }
             }
           }
+        } catch (aclErr) {
+          console.error("[daemon] ACL setup threw:", aclErr.message);
         }
         return { ok: true, provisioning: provisionResult };
       }

package/package.json

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