clay-server 2.20.1-beta.7 → 2.20.1-beta.9

package/lib/config.js

@@ -35,7 +35,11 @@ function getRealHome() {
 var REAL_HOME = getRealHome();
 
 // v3: ~/.clay/  (v2 was ~/.claude-relay/, v1 was {cwd}/.claude-relay/)
-var CLAY_HOME = process.env.CLAY_HOME || path.join(REAL_HOME, ".clay");
+// If CLAY_CONFIG is set (daemon mode), derive CLAY_HOME from it so that
+// daemon.json, users.json, sessions/, etc. all live in the same directory.
+var CLAY_HOME = process.env.CLAY_HOME
+  || (process.env.CLAY_CONFIG ? path.dirname(process.env.CLAY_CONFIG) : null)
+  || path.join(REAL_HOME, ".clay");
 var LEGACY_HOME = path.join(REAL_HOME, ".claude-relay");
 
 // Auto-migrate v2 -> v3: rename ~/.claude-relay/ to ~/.clay/ (once, before anything reads)

package/lib/daemon.js

@@ -1263,37 +1263,49 @@ function startListening() {
     config.pid = process.pid;
     saveConfig(config);
 
-    // Auto-provision Linux accounts on startup if OS users mode is enabled
+    // Auto-provision Linux accounts on startup if OS users mode is enabled.
+    // Run in setTimeout so the event loop stays free for IPC during startup.
     if (config.osUsers) {
-      try { ensureProjectsDir(); } catch (e) {}
-      var provResult = provisionAllUsers(usersModule);
-      if (provResult.provisioned.length > 0) {
-        console.log("[daemon] Auto-provisioned " + provResult.provisioned.length + " Linux account(s) on startup");
-      }
-      if (provResult.errors.length > 0) {
-        console.error("[daemon] Failed to provision " + provResult.errors.length + " account(s)");
-      }
-      // Set up ACLs for all existing projects on startup
-      for (var pi = 0; pi < config.projects.length; pi++) {
-        var proj = config.projects[pi];
-        if (proj.ownerId) {
-          var ownerUser = usersModule.findUserById(proj.ownerId);
-          if (ownerUser && ownerUser.linuxUser) {
-            grantProjectAccess(proj.path, ownerUser.linuxUser);
+      setTimeout(function () {
+        try { ensureProjectsDir(); } catch (e) {}
+        try {
+          var provResult = provisionAllUsers(usersModule);
+          if (provResult.provisioned.length > 0) {
+            console.log("[daemon] Auto-provisioned " + provResult.provisioned.length + " Linux account(s) on startup");
+          }
+          if (provResult.errors.length > 0) {
+            console.error("[daemon] Failed to provision " + provResult.errors.length + " account(s)");
           }
+        } catch (provErr) {
+          console.error("[daemon] Startup provisioning error:", provErr.message);
         }
-        if ((proj.visibility || "public") === "public") {
-          grantAllUsersAccess(proj.path, usersModule);
-        } else {
-          var projAllowed = proj.allowedUsers || [];
-          for (var ai = 0; ai < projAllowed.length; ai++) {
-            var allowedUser = usersModule.findUserById(projAllowed[ai]);
-            if (allowedUser && allowedUser.linuxUser) {
-              grantProjectAccess(proj.path, allowedUser.linuxUser);
+        // Set up ACLs for all existing projects on startup
+        for (var pi = 0; pi < config.projects.length; pi++) {
+          var proj = config.projects[pi];
+          try {
+            if (proj.ownerId) {
+              var ownerUser = usersModule.findUserById(proj.ownerId);
+              if (ownerUser && ownerUser.linuxUser) {
+                grantProjectAccess(proj.path, ownerUser.linuxUser);
+              }
             }
+            if ((proj.visibility || "public") === "public") {
+              grantAllUsersAccess(proj.path, usersModule);
+            } else {
+              var projAllowed = proj.allowedUsers || [];
+              for (var ai = 0; ai < projAllowed.length; ai++) {
+                var allowedUser = usersModule.findUserById(projAllowed[ai]);
+                if (allowedUser && allowedUser.linuxUser) {
+                  grantProjectAccess(proj.path, allowedUser.linuxUser);
+                }
+              }
+            }
+          } catch (aclErr) {
+            console.error("[daemon] Startup ACL error for " + proj.path + ":", aclErr.message);
           }
         }
-      }
+        console.log("[daemon] Startup OS users provisioning complete.");
+      }, 100);
     }
 
     // Check for crash info from a previous crash and notify clients

package/package.json

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