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

package/lib/daemon.js

@@ -1264,7 +1264,8 @@ function startListening() {
     saveConfig(config);
 
     // 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.
+    // ACLs are NOT re-applied on every startup (too slow with recursive setfacl).
+    // ACLs are set when: projects are added, users are added, or visibility changes.
     if (config.osUsers) {
       setTimeout(function () {
         try { ensureProjectsDir(); } catch (e) {}
@@ -1272,6 +1273,17 @@ function startListening() {
           var provResult = provisionAllUsers(usersModule);
           if (provResult.provisioned.length > 0) {
             console.log("[daemon] Auto-provisioned " + provResult.provisioned.length + " Linux account(s) on startup");
+            // Only set ACLs for newly provisioned users (not all users on all projects)
+            for (var pi = 0; pi < config.projects.length; pi++) {
+              var proj = config.projects[pi];
+              if ((proj.visibility || "public") === "public") {
+                for (var ni = 0; ni < provResult.provisioned.length; ni++) {
+                  try {
+                    grantProjectAccess(proj.path, provResult.provisioned[ni].linuxUser);
+                  } catch (e) {}
+                }
+              }
+            }
           }
           if (provResult.errors.length > 0) {
             console.error("[daemon] Failed to provision " + provResult.errors.length + " account(s)");
@@ -1279,32 +1291,7 @@ function startListening() {
         } catch (provErr) {
           console.error("[daemon] Startup provisioning error:", provErr.message);
         }
-        // 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.");
+        console.log("[daemon] Startup OS users check complete.");
       }, 100);
     }
 

package/lib/sdk-bridge.js

@@ -814,9 +814,36 @@ function createSDKBridge(opts) {
    * Mirrors the in-process startQuery flow but delegates SDK execution to the worker.
    */
   async function startQueryViaWorker(session, text, images, linuxUser) {
-    // Save for auto-retry on session-not-found
-    session._lastQueryText = text;
-    session._lastQueryImages = images;
+    // Pre-copy CLI session file BEFORE spawning worker.
+    // Must happen before spawn so execSync doesn't block the event loop
+    // while worker is alive (which causes ready/exit race conditions).
+    if (session.cliSessionId && linuxUser) {
+      try {
+        var configMod = require("./config");
+        var osUsersMod = require("./os-users");
+        var originalHome = configMod.REAL_HOME || require("os").homedir();
+        var linuxUserHome = osUsersMod.getLinuxUserHome(linuxUser);
+        if (originalHome !== linuxUserHome) {
+          var projectSlug = (cwd || "").replace(/\//g, "-");
+          var sessionFileName = session.cliSessionId + ".jsonl";
+          var srcFile = path.join(originalHome, ".claude", "projects", projectSlug, sessionFileName);
+          var dstDir = path.join(linuxUserHome, ".claude", "projects", projectSlug);
+          var dstFile = path.join(dstDir, sessionFileName);
+          if (fs.existsSync(srcFile) && !fs.existsSync(dstFile)) {
+            fs.mkdirSync(dstDir, { recursive: true });
+            fs.copyFileSync(srcFile, dstFile);
+            var uid = osUsersMod.getLinuxUserUid(linuxUser);
+            if (uid != null) {
+              try { require("child_process").execSync("chown " + uid + " " + JSON.stringify(dstFile)); } catch (e2) {}
+            }
+            console.log("[sdk-bridge] Pre-copied CLI session " + session.cliSessionId + " to " + linuxUser);
+          }
+        }
+      } catch (copyErr) {
+        console.log("[sdk-bridge] Session pre-copy skipped:", copyErr.message);
+      }
+    }
+
     var worker;
     try {
       worker = spawnWorker(linuxUser);
@@ -952,7 +979,7 @@ function createSDKBridge(opts) {
             sendAndRecord(session, { type: "done", code: 0 });
             sm.broadcastSessionList();
           }
-          cleanupSessionWorker(session);
+          cleanupSessionWorker(session, worker);
           if (session.onQueryComplete) {
             try { session.onQueryComplete(session); } catch (err) {
               console.error("[sdk-bridge] onQueryComplete error:", err.message || err);
@@ -965,63 +992,10 @@ function createSDKBridge(opts) {
           var qerrLower = (msg.error || "").toLowerCase();
           var isSessionNotFound = qerrLower.indexOf("no conversation found") !== -1
             || qerrLower.indexOf("session not found") !== -1;
-          if (isSessionNotFound && !session._sessionMigrateRetried) {
-            // Auto-retry: copy CLI session file to OS user's home, then resume
-            console.log("[sdk-bridge] Session not found for OS user, migrating CLI session for session " + session.localId);
-            session._sessionMigrateRetried = true;
-            // Try to copy the CLI session file from original user to OS user
-            var migratedOk = false;
-            if (session.cliSessionId && session.lastLinuxUser) {
-              try {
-                var configMod = require("./config");
-                var osUsersMod = require("./os-users");
-                var originalHome = configMod.REAL_HOME || require("os").homedir();
-                var linuxUserHome = osUsersMod.getLinuxUserHome ? osUsersMod.getLinuxUserHome(session.lastLinuxUser) : "/home/" + session.lastLinuxUser;
-                var projectDir = session.cwd || "";
-                var projectSlug = projectDir.replace(/\//g, "-");
-                var srcFile = path.join(originalHome, ".claude", "projects", projectSlug, session.cliSessionId + ".jsonl");
-                var dstDir = path.join(linuxUserHome, ".claude", "projects", projectSlug);
-                var dstFile = path.join(dstDir, session.cliSessionId + ".jsonl");
-                if (fs.existsSync(srcFile) && !fs.existsSync(dstFile)) {
-                  fs.mkdirSync(dstDir, { recursive: true });
-                  fs.copyFileSync(srcFile, dstFile);
-                  // Fix ownership so the OS user can read/write it
-                  var uid = osUsersMod.getLinuxUserUid ? osUsersMod.getLinuxUserUid(session.lastLinuxUser) : null;
-                  if (uid != null) {
-                    try { require("child_process").execSync("chown -R " + uid + " " + JSON.stringify(dstDir)); } catch (e2) {}
-                  }
-                  console.log("[sdk-bridge] Copied CLI session " + session.cliSessionId + " to " + dstFile);
-                  migratedOk = true;
-                } else if (fs.existsSync(dstFile)) {
-                  migratedOk = true; // already there
-                }
-              } catch (copyErr) {
-                console.error("[sdk-bridge] Failed to copy CLI session:", copyErr.message);
-              }
-            }
-            // Detach old worker so its exit event doesn't interfere with the new one
-            if (session.worker) {
-              session.worker.messageHandlers = [];
-              session.worker.kill();
-              session.worker = null;
-            }
-            session.queryInstance = null;
-            session.messageQueue = null;
-            session.abortController = null;
-            // Ensure client knows we're still processing (re-send status)
-            session.isProcessing = true;
-            onProcessingChanged();
-            send({ type: "status", status: "processing" });
-            // If migration failed, clear cliSessionId so it starts fresh
-            if (!migratedOk) {
-              session.cliSessionId = null;
-            }
-            // Re-run the query (with resume if migration succeeded)
-            var retryText = session._lastQueryText || "";
-            var retryImages = session._lastQueryImages || undefined;
-            var retryLinuxUser = session.lastLinuxUser || null;
-            startQuery(session, retryText, retryImages, retryLinuxUser);
-            break;
+          if (isSessionNotFound) {
+            // Pre-copy should have handled this. Clear stale cliSessionId
+            // so next message starts a fresh conversation in the same UI session.
+            session.cliSessionId = null;
           }
           if (session.isProcessing) {
             session.isProcessing = false;
@@ -1086,7 +1060,7 @@ function createSDKBridge(opts) {
             }
             sm.broadcastSessionList();
           }
-          cleanupSessionWorker(session);
+          cleanupSessionWorker(session, worker);
           // Auto-continue on rate limit (scheduler sessions, or user setting)
           var workerDidScheduleAC = false;
           var workerACEnabled = session.onQueryComplete || (typeof opts.getAutoContinueSetting === "function" && opts.getAutoContinueSetting(session));
@@ -1154,7 +1128,13 @@ function createSDKBridge(opts) {
     });
   }
 
-  function cleanupSessionWorker(session) {
+  function cleanupSessionWorker(session, fromWorker) {
+    // If called from a specific worker's exit/error handler, only cleanup if
+    // that worker is still the session's current worker. Prevents stale
+    // worker exit events from killing a newer worker.
+    if (fromWorker && session.worker && session.worker !== fromWorker) {
+      return;
+    }
     session.queryInstance = null;
     session.messageQueue = null;
     session.abortController = null;
@@ -1254,9 +1234,9 @@ function createSDKBridge(opts) {
       // Auto-approve safe Bash commands (read-only, non-destructive)
       if (toolName === "Bash" && input && input.command) {
         var cmd = input.command.trim();
-        var firstWord = cmd.split(/[\s;|&]/)[0];
         var safeBashCommands = {
-          ls: true, cat: true, head: true, tail: true, wc: true, file: true,
+          // Navigation (harmless on its own, checked in compound commands below)
+          cd: true, pushd: true, popd: true,
           // File/dir inspection
           ls: true, cat: true, head: true, tail: true, wc: true, file: true,
           stat: true, find: true, tree: true, du: true, df: true,
@@ -1293,7 +1273,16 @@ function createSDKBridge(opts) {
           nslookup: true, host: true, ping: true, traceroute: true,
           curl: true, wget: true, http: true,
         };
-        if (safeBashCommands[firstWord]) {
+        // Split compound commands (&&, ||, ;, |) and check ALL segments
+        var segments = cmd.split(/\s*(?:&&|\|\||[;|])\s*/);
+        var allSafe = true;
+        for (var si = 0; si < segments.length; si++) {
+          var seg = segments[si].trim();
+          if (!seg) continue;
+          var firstWord = seg.split(/\s/)[0];
+          if (!safeBashCommands[firstWord]) { allSafe = false; break; }
+        }
+        if (allSafe) {
           return Promise.resolve({ behavior: "allow", updatedInput: input });
         }
       }

package/lib/sdk-worker.js

@@ -220,31 +220,6 @@ async function handleQueryStart(msg) {
     messageQueue.push(msg.prompt);
   }
 
-  // If resuming a session that doesn't exist for this OS user, try to migrate
-  // the session file from the original user's home directory.
-  if (msg.options && msg.options.resume && msg.originalHome && msg.projectPath) {
-    try {
-      var fs = require("fs");
-      var homePath = require("os").homedir();
-      if (homePath !== msg.originalHome) {
-        var projDirName = msg.projectPath.replace(/\//g, "-");
-        var sessionFile = msg.options.resume + ".jsonl";
-        var destDir = path.join(homePath, ".claude", "projects", projDirName);
-        var destFile = path.join(destDir, sessionFile);
-        if (!fs.existsSync(destFile)) {
-          var srcFile = path.join(msg.originalHome, ".claude", "projects", projDirName, sessionFile);
-          if (fs.existsSync(srcFile)) {
-            fs.mkdirSync(destDir, { recursive: true });
-            fs.copyFileSync(srcFile, destFile);
-            try { fs.writeSync(2, "[sdk-worker] Migrated session " + msg.options.resume + " from " + msg.originalHome + "\n"); } catch (e2) {}
-          }
-        }
-      }
-    } catch (migrateErr) {
-      try { fs.writeSync(2, "[sdk-worker] Session migration failed: " + migrateErr.message + "\n"); } catch (e2) {}
-    }
-  }
-
   // Build query options (callbacks are local, everything else from daemon)
   var options = msg.options || {};
   options.abortController = abortController;

package/lib/sessions.js

@@ -627,10 +627,12 @@ function createSessionManager(opts) {
     return { hits: hits, total: history.length };
   }
 
+  var _migrationFailedIds = {};
   function migrateSessionTitles(getSDK, migrateCwd) {
     var candidates = [];
     sessions.forEach(function(s) {
-      if (s.cliSessionId && s.title && s.title !== "New Session" && s.title !== "Resumed session") {
+      if (s.cliSessionId && s.title && s.title !== "New Session" && s.title !== "Resumed session"
+          && !_migrationFailedIds[s.cliSessionId]) {
         candidates.push({ cliSessionId: s.cliSessionId, title: s.title });
       }
     });
@@ -647,18 +649,28 @@ function createSessionManager(opts) {
           return sdkTitles[item.cliSessionId] !== item.title;
         });
         if (toMigrate.length === 0) return;
+        var migrated = 0;
+        var failed = 0;
         var chain = Promise.resolve();
         for (var j = 0; j < toMigrate.length; j++) {
           (function(item) {
             chain = chain.then(function() {
-              return sdkMod.renameSession(item.cliSessionId, item.title, { dir: migrateCwd }).catch(function(e) {
-                console.error("[session] Migration failed for " + item.cliSessionId + ":", e.message);
+              return sdkMod.renameSession(item.cliSessionId, item.title, { dir: migrateCwd }).then(function() {
+                migrated++;
+              }).catch(function(e) {
+                failed++;
+                _migrationFailedIds[item.cliSessionId] = true;
               });
             });
           })(toMigrate[j]);
         }
         chain.then(function() {
-          console.log("[session] Migrated " + toMigrate.length + " session title(s) to SDK format");
+          if (migrated > 0) {
+            console.log("[session] Migrated " + migrated + " session title(s) to SDK format");
+          }
+          if (failed > 0) {
+            console.log("[session] Skipped " + failed + " session(s) (CLI session not found for current user)");
+          }
         }).catch(function(e) {
           console.error("[session] Migration chain failed:", e.message || e);
         });

package/package.json

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