clay-server 2.11.0 → 2.12.0-beta.1

package/bin/cli.js

@@ -776,12 +776,12 @@ function promptPin(callback) {
  * Enter with empty input returns placeholder value.
  * Tab completes directory paths.
  */
-function promptText(title, placeholder, callback) {
+function promptText(title, placeholder, callback, opts) {
   var prefix = "  " + sym.bar + "  ";
   var hintLine = "";
   var lineCount = 2;
-
-  log(sym.pointer + "  " + a.bold + title + a.reset + "  " + a.dim + "(esc to go back)" + a.reset);
+  var escHint = (!title || (opts && opts.noEsc)) ? "" : "  " + a.dim + "(esc to go back)" + a.reset;
+  log(sym.pointer + "  " + a.bold + title + a.reset + escHint);
   process.stdout.write(prefix + a.dim + placeholder + a.reset);
   // Move cursor to start of placeholder
   process.stdout.write("\r" + prefix);
@@ -1527,7 +1527,7 @@ async function forkDaemon(mode, keepAwake, extraProjects, addCwd, wantOsUsers) {
     return;
   }
 
-  // Enable multi-user mode if requested
+  // Enable/disable multi-user mode based on startup config
   if (config.mode === "multi") {
     var muResult = enableMultiUser();
     if (muResult.setupCode) {
@@ -1537,6 +1537,8 @@ async function forkDaemon(mode, keepAwake, extraProjects, addCwd, wantOsUsers) {
       log(sym.bar + "  Open Clay in your browser and enter this code to create the admin account.");
       log("");
     }
+  } else if (isMultiUser()) {
+    disableMultiUser();
   }
 
   // Headless mode — print status and exit immediately
@@ -1636,6 +1638,16 @@ async function devMode(mode, keepAwake, existingPinHash) {
   ensureConfigDir();
   saveConfig(config);
 
+  // Enable/disable multi-user mode based on startup config
+  if (config.mode === "multi") {
+    var muResult = enableMultiUser();
+    if (muResult.setupCode) {
+      console.log("\x1b[38;2;0;183;133m[dev]\x1b[0m Multi-user mode enabled. Setup code: " + muResult.setupCode);
+    }
+  } else if (isMultiUser()) {
+    disableMultiUser();
+  }
+
   var daemonScript = path.join(__dirname, "..", "lib", "daemon.js");
   var libDir = path.join(__dirname, "..", "lib");
   var child = null;

package/lib/daemon.js

@@ -16,6 +16,9 @@ if (nodeMajor < 20) {
 if (!Symbol.dispose) Symbol.dispose = Symbol("Symbol.dispose");
 if (!Symbol.asyncDispose) Symbol.asyncDispose = Symbol("Symbol.asyncDispose");
 
+// Increase listener limit for projects with many worktrees
+process.setMaxListeners(50);
+
 // Remove CLAUDECODE env var so the SDK can spawn Claude Code child processes
 // (prevents "cannot be launched inside another Claude Code session" error)
 delete process.env.CLAUDECODE;
@@ -27,6 +30,7 @@ var { createIPCServer } = require("./ipc");
 var { createServer, generateAuthToken } = require("./server");
 var { grantProjectAccess, revokeProjectAccess, provisionAllUsers, provisionLinuxUser, grantAllUsersAccess, deactivateLinuxUser, ensureProjectsDir } = require("./os-users");
 var usersModule = require("./users");
+var { scanWorktrees, createWorktree, removeWorktree, isWorktree } = require("./worktree");
 
 var configFile = process.env.CLAY_CONFIG || process.env.CLAUDE_RELAY_CONFIG || require("./config").configPath();
 var config;
@@ -155,6 +159,8 @@ var relay = createServer({
         }
       }
     }
+    // Discover and register worktrees for the new project
+    scanAndRegisterWorktrees(absPath, slug, null, wsUser && wsUser.id && wsUser.role !== "admin" ? wsUser.id : null);
     // Broadcast updated project list to all clients
     relay.broadcastAll({
       type: "projects_updated",
@@ -313,11 +319,41 @@ var relay = createServer({
     });
   },
   onRemoveProject: function (slug, userId) {
+    // Check if this is a worktree project (ephemeral)
+    if (isWorktreeSlug(slug)) {
+      var wtParent = slug.split("--")[0];
+      var wtDirName = slug.split("--").slice(1).join("--");
+      // Find parent project path
+      var parentProject = null;
+      for (var pi = 0; pi < config.projects.length; pi++) {
+        if (config.projects[pi].slug === wtParent) { parentProject = config.projects[pi]; break; }
+      }
+      if (parentProject) {
+        var rmResult = removeWorktree(parentProject.path, wtDirName);
+        if (!rmResult.ok) {
+          console.log("[daemon] Failed to remove worktree:", slug, rmResult.error);
+          return { ok: false, error: rmResult.error };
+        }
+      }
+      relay.removeProject(slug);
+      if (worktreeRegistry[wtParent]) {
+        worktreeRegistry[wtParent] = worktreeRegistry[wtParent].filter(function (s) { return s !== slug; });
+      }
+      console.log("[daemon] Removed worktree (web):", slug);
+      relay.broadcastAll({
+        type: "projects_updated",
+        projects: relay.getProjects(),
+        projectCount: config.projects.length,
+      });
+      return { ok: true };
+    }
     var found = null;
     for (var j = 0; j < config.projects.length; j++) {
       if (config.projects[j].slug === slug) { found = config.projects[j]; break; }
     }
     if (!found) return { ok: false, error: "Project not found" };
+    // Cascade remove worktrees belonging to this parent
+    cleanupWorktreesForParent(slug);
     // Save to removedProjects for re-add functionality
     if (!config.removedProjects) config.removedProjects = [];
     config.removedProjects.push({
@@ -756,8 +792,135 @@ var relay = createServer({
     if (!config.osUsers || !linuxUser) return;
     deactivateLinuxUser(linuxUser);
   },
+  onCreateWorktree: function (parentSlug, branchName, baseBranch) {
+    // Find the parent project
+    var parent = null;
+    for (var j = 0; j < config.projects.length; j++) {
+      if (config.projects[j].slug === parentSlug) { parent = config.projects[j]; break; }
+    }
+    if (!parent) return { ok: false, error: "Parent project not found" };
+    if (isWorktree(parent.path)) return { ok: false, error: "Cannot create worktrees from a worktree project" };
+    var result = createWorktree(parent.path, branchName, baseBranch);
+    if (!result.ok) return result;
+    // Register the new worktree as ephemeral project
+    var wtSlug = parentSlug + "--" + branchName;
+    var wtMeta = { parentSlug: parentSlug, branch: branchName, accessible: true };
+    relay.addProject(result.path, wtSlug, branchName, parent.icon, parent.ownerId, wtMeta);
+    if (!worktreeRegistry[parentSlug]) worktreeRegistry[parentSlug] = [];
+    worktreeRegistry[parentSlug].push(wtSlug);
+    console.log("[daemon] Created worktree:", wtSlug, "->", result.path);
+    relay.broadcastAll({
+      type: "projects_updated",
+      projects: relay.getProjects(),
+      projectCount: config.projects.length,
+    });
+    return { ok: true, slug: wtSlug, path: result.path };
+  },
 });
 
+// --- Worktree tracking ---
+var worktreeRegistry = {}; // parentSlug -> [wtSlug, ...]
+var worktreeTimers = {};   // parentSlug -> intervalId
+var worktreeScanning = {}; // parentSlug -> boolean (mutex)
+
+function isWorktreeSlug(slug) {
+  return slug.indexOf("--") !== -1;
+}
+
+function scanAndRegisterWorktrees(parentPath, parentSlug, parentIcon, parentOwnerId) {
+  // Skip if this project is itself a worktree (not the main working tree)
+  if (isWorktree(parentPath)) return;
+  var worktrees = scanWorktrees(parentPath);
+  if (worktrees.length === 0) return;
+  if (!worktreeRegistry[parentSlug]) worktreeRegistry[parentSlug] = [];
+  for (var i = 0; i < worktrees.length; i++) {
+    var wt = worktrees[i];
+    var wtSlug = parentSlug + "--" + wt.dirName;
+    // Skip if already registered
+    var alreadyRegistered = false;
+    for (var j = 0; j < worktreeRegistry[parentSlug].length; j++) {
+      if (worktreeRegistry[parentSlug][j] === wtSlug) { alreadyRegistered = true; break; }
+    }
+    if (alreadyRegistered) continue;
+    var wtMeta = { parentSlug: parentSlug, branch: wt.branch || wt.dirName, accessible: wt.accessible };
+    // Only add as a full project if accessible, otherwise still track for UI display
+    relay.addProject(wt.path, wtSlug, wt.branch || wt.dirName, parentIcon, parentOwnerId, wtMeta);
+    worktreeRegistry[parentSlug].push(wtSlug);
+    console.log("[daemon] Registered worktree:", wtSlug, "->", wt.path, wt.accessible ? "(accessible)" : "(inaccessible)");
+  }
+  // Start periodic rescan if not already running
+  if (!worktreeTimers[parentSlug]) {
+    worktreeTimers[parentSlug] = setInterval(function () {
+      rescanWorktrees(parentPath, parentSlug, parentIcon, parentOwnerId);
+    }, 10000);
+  }
+}
+
+function rescanWorktrees(parentPath, parentSlug, parentIcon, parentOwnerId) {
+  if (worktreeScanning[parentSlug]) return;
+  worktreeScanning[parentSlug] = true;
+  try {
+    var discovered = scanWorktrees(parentPath);
+    var changed = false;
+    var existingSlugs = worktreeRegistry[parentSlug] || [];
+    // Build set of discovered dirNames
+    var discoveredNames = {};
+    for (var i = 0; i < discovered.length; i++) {
+      discoveredNames[discovered[i].dirName] = discovered[i];
+    }
+    // Add new worktrees
+    for (var di = 0; di < discovered.length; di++) {
+      var wt = discovered[di];
+      var wtSlug = parentSlug + "--" + wt.dirName;
+      var found = false;
+      for (var ei = 0; ei < existingSlugs.length; ei++) {
+        if (existingSlugs[ei] === wtSlug) { found = true; break; }
+      }
+      if (!found) {
+        var wtMeta = { parentSlug: parentSlug, branch: wt.branch || wt.dirName, accessible: wt.accessible };
+        relay.addProject(wt.path, wtSlug, wt.branch || wt.dirName, parentIcon, parentOwnerId, wtMeta);
+        if (!worktreeRegistry[parentSlug]) worktreeRegistry[parentSlug] = [];
+        worktreeRegistry[parentSlug].push(wtSlug);
+        console.log("[daemon] Rescan: added worktree:", wtSlug);
+        changed = true;
+      }
+    }
+    // Remove stale worktrees
+    for (var si = existingSlugs.length - 1; si >= 0; si--) {
+      var sSlug = existingSlugs[si];
+      var dirName = sSlug.split("--").slice(1).join("--");
+      if (!discoveredNames[dirName]) {
+        relay.removeProject(sSlug);
+        existingSlugs.splice(si, 1);
+        console.log("[daemon] Rescan: removed stale worktree:", sSlug);
+        changed = true;
+      }
+    }
+    if (changed) {
+      relay.broadcastAll({
+        type: "projects_updated",
+        projects: relay.getProjects(),
+        projectCount: config.projects.length,
+      });
+    }
+  } finally {
+    worktreeScanning[parentSlug] = false;
+  }
+}
+
+function cleanupWorktreesForParent(parentSlug) {
+  var wtSlugs = worktreeRegistry[parentSlug] || [];
+  for (var i = 0; i < wtSlugs.length; i++) {
+    relay.removeProject(wtSlugs[i]);
+    console.log("[daemon] Cascade removed worktree:", wtSlugs[i]);
+  }
+  delete worktreeRegistry[parentSlug];
+  if (worktreeTimers[parentSlug]) {
+    clearInterval(worktreeTimers[parentSlug]);
+    delete worktreeTimers[parentSlug];
+  }
+}
+
 // --- Register projects ---
 var projects = config.projects || [];
 for (var i = 0; i < projects.length; i++) {
@@ -765,6 +928,8 @@ for (var i = 0; i < projects.length; i++) {
   if (fs.existsSync(p.path)) {
     console.log("[daemon] Adding project:", p.slug, "→", p.path);
     relay.addProject(p.path, p.slug, p.title, p.icon, p.ownerId);
+    // Discover and register worktrees for this project
+    scanAndRegisterWorktrees(p.path, p.slug, p.icon, p.ownerId);
   } else {
     console.log("[daemon] Skipping missing project:", p.path);
   }
@@ -800,6 +965,8 @@ var ipc = createIPCServer(socketPath(), function (msg) {
       saveConfig(config);
       try { syncClayrc(config.projects); } catch (e) {}
       console.log("[daemon] Added project:", slug, "→", absPath);
+      // Discover and register worktrees for the new project
+      scanAndRegisterWorktrees(absPath, slug, null, null);
       relay.broadcastAll({
         type: "projects_updated",
         projects: relay.getProjects(),

package/lib/project.js

@@ -113,6 +113,8 @@ function createProjectContext(opts) {
   var updateChannel = opts.updateChannel || "stable";
   var osUsers = opts.osUsers || false;
   var projectOwnerId = opts.projectOwnerId || null;
+  var worktreeMeta = opts.worktreeMeta || null; // { parentSlug, branch, accessible }
+  var onCreateWorktree = opts.onCreateWorktree || null;
   var latestVersion = null;
 
   // --- OS-level user isolation helper ---
@@ -1228,7 +1230,8 @@ function createProjectContext(opts) {
       var session = getSessionForWs(ws);
       if (!session || typeof msg.before !== "number") return;
       var before = msg.before;
-      var from = sm.findTurnBoundary(session.history, Math.max(0, before - sm.HISTORY_PAGE_SIZE));
+      var targetFrom = typeof msg.target === "number" ? msg.target : before - sm.HISTORY_PAGE_SIZE;
+      var from = sm.findTurnBoundary(session.history, Math.max(0, targetFrom));
       var to = before;
       var items = session.history.slice(from, to);
       sendTo(ws, {
@@ -1410,6 +1413,16 @@ function createProjectContext(opts) {
       return;
     }
 
+    if (msg.type === "search_session_content") {
+      var targetSession = msg.id ? sm.sessions.get(msg.id) : getSessionForWs(ws);
+      if (!targetSession) return;
+      var contentResults = sm.searchSessionContent(targetSession.localId, msg.query || "");
+      var searchResp = { type: "search_content_results", query: msg.query || "", sessionId: targetSession.localId, hits: contentResults.hits, total: contentResults.total };
+      if (msg.source) searchResp.source = msg.source;
+      sendTo(ws, searchResp);
+      return;
+    }
+
     if (msg.type === "set_update_channel") {
       if (usersModule.isMultiUser() && (!ws._clayUser || ws._clayUser.role !== "admin")) return;
       var newChannel = msg.channel === "beta" ? "beta" : "stable";
@@ -1771,6 +1784,29 @@ function createProjectContext(opts) {
       return;
     }
 
+    if (msg.type === "cursor_move" || msg.type === "cursor_leave" || msg.type === "text_select") {
+      if (!usersModule.isMultiUser() || !ws._clayUser) return;
+      var u = ws._clayUser;
+      var p = u.profile || {};
+      var cursorMsg = {
+        type: msg.type,
+        userId: u.id,
+        displayName: p.name || u.displayName || u.username,
+        avatarStyle: p.avatarStyle || "thumbs",
+        avatarSeed: p.avatarSeed || u.username,
+      };
+      if (msg.type === "cursor_move") {
+        cursorMsg.turn = msg.turn;
+        if (msg.rx != null) cursorMsg.rx = msg.rx;
+        if (msg.ry != null) cursorMsg.ry = msg.ry;
+      }
+      if (msg.type === "text_select") {
+        cursorMsg.ranges = msg.ranges || [];
+      }
+      sendToSessionOthers(ws, ws._clayActiveSession, cursorMsg);
+      return;
+    }
+
     if (msg.type === "permission_response") {
       var session = getSessionForWs(ws);
       if (!session) return;
@@ -2022,6 +2058,23 @@ function createProjectContext(opts) {
       return;
     }
 
+    // --- Create worktree from web UI ---
+    if (msg.type === "create_worktree") {
+      var wtBranch = (msg.branch || "").trim();
+      var wtBase = (msg.baseBranch || "").trim() || null;
+      if (!wtBranch || !/^[a-zA-Z0-9_\/.@-]+$/.test(wtBranch)) {
+        sendTo(ws, { type: "create_worktree_result", ok: false, error: "Invalid branch name" });
+        return;
+      }
+      if (typeof onCreateWorktree === "function") {
+        var wtResult = onCreateWorktree(slug, wtBranch, wtBase);
+        sendTo(ws, { type: "create_worktree_result", ok: wtResult.ok, slug: wtResult.slug, error: wtResult.error });
+      } else {
+        sendTo(ws, { type: "create_worktree_result", ok: false, error: "Not supported" });
+      }
+      return;
+    }
+
     // --- Pre-check: does the project have tasks/schedules? ---
     if (msg.type === "remove_project_check") {
       var checkSlug = msg.slug;
@@ -3360,6 +3413,29 @@ function createProjectContext(opts) {
       return true;
     }
 
+    // List branches for worktree modal
+    if (req.method === "GET" && urlPath === "/api/branches") {
+      try {
+        var brRaw = execFileSync("git", ["branch", "-a", "--format=%(refname:short)"], {
+          cwd: cwd, timeout: 5000, encoding: "utf8"
+        });
+        var brList = brRaw.trim().split("\n").filter(Boolean);
+        var defBr = "main";
+        try {
+          var hrRef = execFileSync("git", ["symbolic-ref", "refs/remotes/origin/HEAD", "--short"], {
+            cwd: cwd, timeout: 3000, encoding: "utf8"
+          }).trim();
+          defBr = hrRef.replace(/^origin\//, "");
+        } catch (e) {}
+        res.writeHead(200, { "Content-Type": "application/json" });
+        res.end(JSON.stringify({ branches: brList, defaultBranch: defBr }));
+      } catch (e) {
+        res.writeHead(200, { "Content-Type": "application/json" });
+        res.end(JSON.stringify({ branches: ["main"], defaultBranch: "main" }));
+      }
+      return true;
+    }
+
     // Info endpoint
     if (req.method === "GET" && urlPath === "/info") {
       res.writeHead(200, {
@@ -3420,6 +3496,12 @@ function createProjectContext(opts) {
       isProcessing: hasProcessing,
       projectOwnerId: projectOwnerId,
     };
+    if (worktreeMeta) {
+      status.isWorktree = true;
+      status.parentSlug = worktreeMeta.parentSlug;
+      status.branch = worktreeMeta.branch;
+      status.worktreeAccessible = worktreeMeta.accessible;
+    }
     if (usersModule.isMultiUser()) {
       var seen = {};
       var onlineUsers = [];