clay-server 2.11.0 → 2.12.0-beta.1

package/lib/public/modules/tooltip.js

@@ -0,0 +1,123 @@
+// --- Global JS tooltip system ---
+// Unified tooltip using [data-tip] attribute.
+// Usage: initTooltips() auto-binds, converts [title] to [data-tip].
+// Call registerTooltip(el, text) for dynamic elements.
+
+var tooltipEl = null;
+var showTimer = null;
+var SHOW_DELAY = 120;
+
+function initTooltips() {
+  // Create singleton tooltip element
+  tooltipEl = document.createElement("div");
+  tooltipEl.className = "tooltip";
+  document.body.appendChild(tooltipEl);
+
+  // Convert existing title attributes to data-tip in target areas
+  convertTitles();
+
+  // Delegate hover events on document for [data-tip]
+  document.addEventListener("mouseover", function (e) {
+    var target = e.target.closest("[data-tip]");
+    if (!target) return;
+    scheduleShow(target);
+  });
+
+  document.addEventListener("mouseout", function (e) {
+    var target = e.target.closest("[data-tip]");
+    if (!target) return;
+    cancelShow();
+    hideTooltip();
+  });
+
+  document.addEventListener("pointerdown", function () {
+    cancelShow();
+    hideTooltip();
+  }, true);
+
+  document.addEventListener("scroll", function () {
+    cancelShow();
+    hideTooltip();
+  }, true);
+}
+
+function convertTitles() {
+  var selectors = [
+    "#top-bar [title]",
+    ".title-bar-content [title]",
+    "#input-area [title]",
+  ];
+  var els = document.querySelectorAll(selectors.join(", "));
+  for (var i = 0; i < els.length; i++) {
+    var el = els[i];
+    if (!el.getAttribute("data-tip")) {
+      el.setAttribute("data-tip", el.getAttribute("title"));
+      el.removeAttribute("title");
+    }
+  }
+}
+
+function registerTooltip(el, text) {
+  el.setAttribute("data-tip", text);
+  el.removeAttribute("title");
+}
+
+function scheduleShow(el) {
+  cancelShow();
+  showTimer = setTimeout(function () {
+    showTooltipAt(el);
+  }, SHOW_DELAY);
+}
+
+function cancelShow() {
+  if (showTimer) {
+    clearTimeout(showTimer);
+    showTimer = null;
+  }
+}
+
+function showTooltipAt(target) {
+  if (!tooltipEl) return;
+  var text = target.getAttribute("data-tip");
+  if (!text) return;
+
+  tooltipEl.textContent = text;
+  tooltipEl.style.top = "-9999px";
+  tooltipEl.style.left = "0";
+  tooltipEl.style.right = "";
+  tooltipEl.classList.add("visible");
+
+  // Position after layout
+  var tipW = tooltipEl.offsetWidth;
+  var tipH = tooltipEl.offsetHeight;
+  var rect = target.getBoundingClientRect();
+  var gap = 8;
+  var winW = window.innerWidth;
+  var winH = window.innerHeight;
+
+  // Prefer bottom, fallback to top
+  var top = rect.bottom + gap;
+  if (top + tipH > winH - 8) {
+    top = rect.top - tipH - gap;
+  }
+
+  // Center horizontally, clamp to viewport
+  var centerX = rect.left + rect.width / 2;
+  var left = centerX - tipW / 2;
+  if (left + tipW > winW - 8) {
+    tooltipEl.style.left = "";
+    tooltipEl.style.right = "8px";
+  } else {
+    tooltipEl.style.left = Math.max(8, left) + "px";
+    tooltipEl.style.right = "";
+  }
+  tooltipEl.style.top = top + "px";
+}
+
+function hideTooltip() {
+  if (tooltipEl) {
+    tooltipEl.classList.remove("visible");
+  }
+}
+
+export { initTooltips, registerTooltip };

package/lib/public/style.css

@@ -22,3 +22,5 @@
 @import url("css/stt.css");
 @import url("css/profile.css");
 @import url("css/admin.css");
+@import url("css/session-search.css");
+@import url("css/tooltip.css");

package/lib/server.js

@@ -220,12 +220,37 @@ function isAuthed(req, authToken) {
 }
 
 // --- Multi-user auth helpers ---
-// Multi-user auth tokens: userId:randomToken stored in memory
+// Multi-user auth tokens: persisted to disk so they survive restarts
+var TOKENS_FILE = path.join(CONFIG_DIR, "auth-tokens.json");
 var multiUserTokens = {}; // token → userId
 
+function loadTokens() {
+  try {
+    var raw = fs.readFileSync(TOKENS_FILE, "utf8");
+    var data = JSON.parse(raw);
+    if (data && typeof data === "object") {
+      multiUserTokens = data;
+    }
+  } catch (e) {
+    multiUserTokens = {};
+  }
+}
+
+function saveTokens() {
+  try {
+    fs.mkdirSync(path.dirname(TOKENS_FILE), { recursive: true });
+    var tmpPath = TOKENS_FILE + ".tmp";
+    fs.writeFileSync(tmpPath, JSON.stringify(multiUserTokens));
+    fs.renameSync(tmpPath, TOKENS_FILE);
+  } catch (e) {}
+}
+
+loadTokens();
+
 function createMultiUserSession(userId, tlsOptions) {
   var token = users.generateUserAuthToken(userId);
   multiUserTokens[token] = userId;
+  saveTokens();
   var cookie = "relay_auth_user=" + token + "; Path=/; HttpOnly; SameSite=Strict; Max-Age=31536000" + (tlsOptions ? "; Secure" : "");
   return { token: token, cookie: cookie };
 }
@@ -244,6 +269,17 @@ function isMultiUserAuthed(req) {
   return !!getMultiUserFromReq(req);
 }
 
+function revokeUserTokens(userId) {
+  var changed = false;
+  for (var token in multiUserTokens) {
+    if (multiUserTokens[token] === userId) {
+      delete multiUserTokens[token];
+      changed = true;
+    }
+  }
+  if (changed) saveTokens();
+}
+
 // --- PIN rate limiting ---
 var pinAttempts = {}; // ip → { count, lastAttempt }
 var PIN_MAX_ATTEMPTS = 5;
@@ -359,6 +395,7 @@ function createServer(opts) {
   var onSetProjectVisibility = opts.onSetProjectVisibility || null;
   var onSetProjectAllowedUsers = opts.onSetProjectAllowedUsers || null;
   var onGetProjectAccess = opts.onGetProjectAccess || null;
+  var onCreateWorktree = opts.onCreateWorktree || null;
   var onUserProvisioned = opts.onUserProvisioned || null;
   var onUserDeleted = opts.onUserDeleted || null;
   var getRemovedProjects = opts.getRemovedProjects || function () { return []; };
@@ -1050,6 +1087,8 @@ function createServer(opts) {
         res.end(JSON.stringify({ error: result.error }));
         return;
       }
+      // Remove auth tokens for deleted user
+      revokeUserTokens(targetUserId);
       // Deactivate the Linux account if applicable
       if (onUserDeleted && targetLinuxUser) {
         onUserDeleted(targetUserId, targetLinuxUser);
@@ -1975,7 +2014,9 @@ function createServer(opts) {
       wsUser = getMultiUserFromReq(req);
       // Check project access for multi-user mode
       if (wsUser && onGetProjectAccess) {
-        var projectAccess = onGetProjectAccess(wsSlug);
+        // For worktree projects, inherit access from parent
+        var accessSlug = (wsSlug.indexOf("--") !== -1) ? wsSlug.split("--")[0] : wsSlug;
+        var projectAccess = onGetProjectAccess(accessSlug);
         if (debug) console.log("[server] WS access check:", wsSlug, "user:", wsUser.id, "role:", wsUser.role, "visibility:", projectAccess && projectAccess.visibility, "ownerId:", projectAccess && projectAccess.ownerId, "allowed:", projectAccess && projectAccess.allowedUsers);
         if (projectAccess && !projectAccess.error) {
           if (!users.canAccessProject(wsUser.id, projectAccess)) {
@@ -2094,7 +2135,7 @@ function createServer(opts) {
   }
 
   // --- Project management ---
-  function addProject(cwd, slug, title, icon, projectOwnerId) {
+  function addProject(cwd, slug, title, icon, projectOwnerId, worktreeMeta) {
     if (projects.has(slug)) return false;
     var ctx = createProjectContext({
       cwd: cwd,
@@ -2102,6 +2143,7 @@ function createServer(opts) {
       title: title || null,
       icon: icon || null,
       projectOwnerId: projectOwnerId || null,
+      worktreeMeta: worktreeMeta || null,
       pushModule: pushModule,
       debug: debug,
       dangerouslySkipPermissions: dangerouslySkipPermissions,
@@ -2190,6 +2232,7 @@ function createServer(opts) {
       onCreateProject: onCreateProject,
       onCloneProject: onCloneProject,
       onRemoveProject: onRemoveProject,
+      onCreateWorktree: onCreateWorktree,
       onReorderProjects: onReorderProjects,
       onSetProjectTitle: onSetProjectTitle,
       onSetProjectIcon: onSetProjectIcon,

package/lib/sessions.js

@@ -540,6 +540,42 @@ function createSessionManager(opts) {
     return results;
   }
 
+  function searchSessionContent(localId, query) {
+    if (!query) return { hits: [], total: 0 };
+    var session = sessions.get(localId);
+    if (!session) return { hits: [], total: 0 };
+    var q = query.toLowerCase();
+    var history = session.history;
+    var hits = [];
+    var lastAssistantHitTurn = -1; // track current assistant turn to deduplicate delta hits
+    var currentTurnStart = -1;
+    for (var i = 0; i < history.length; i++) {
+      var entry = history[i];
+      if (entry.type === "user_message") {
+        currentTurnStart = i;
+        lastAssistantHitTurn = -1;
+      }
+      if ((entry.type === "delta" || entry.type === "user_message") && entry.text) {
+        // Skip duplicate delta hits within the same assistant turn
+        if (entry.type === "delta" && currentTurnStart === lastAssistantHitTurn) continue;
+        var text = entry.text;
+        var lowerText = text.toLowerCase();
+        var idx = lowerText.indexOf(q);
+        if (idx === -1) continue;
+        var start = Math.max(0, idx - 15);
+        var end = Math.min(text.length, idx + query.length + 15);
+        var snippet = (start > 0 ? "\u2026" : "") + text.substring(start, end) + (end < text.length ? "\u2026" : "");
+        if (entry.type === "delta") lastAssistantHitTurn = currentTurnStart;
+        hits.push({
+          historyIndex: i,
+          snippet: snippet,
+          role: entry.type === "user_message" ? "user" : "assistant",
+        });
+      }
+    }
+    return { hits: hits, total: history.length };
+  }
+
   function migrateSessionTitles(getSDK, migrateCwd) {
     var toMigrate = [];
     sessions.forEach(function(s) {
@@ -597,6 +633,7 @@ function createSessionManager(opts) {
     findTurnBoundary: findTurnBoundary,
     replayHistory: replayHistory,
     searchSessions: searchSessions,
+    searchSessionContent: searchSessionContent,
     setResolveLoopInfo: setResolveLoopInfo,
     migrateSessionTitles: migrateSessionTitles,
     setSessionVisibility: function (localId, visibility) {

package/lib/worktree.js

@@ -0,0 +1,134 @@
+var { execFileSync } = require("child_process");
+var path = require("path");
+
+// Parse `git worktree list --porcelain` output into structured objects
+function parseWorktreeOutput(output) {
+  var worktrees = [];
+  var current = null;
+  var lines = output.split("\n");
+  for (var i = 0; i < lines.length; i++) {
+    var line = lines[i];
+    if (line.indexOf("worktree ") === 0) {
+      if (current) worktrees.push(current);
+      current = { path: line.slice(9), branch: null, bare: false, detached: false };
+    } else if (line.indexOf("branch ") === 0 && current) {
+      // refs/heads/feat/login -> feat/login
+      var ref = line.slice(7);
+      var headsIdx = ref.indexOf("refs/heads/");
+      current.branch = headsIdx === 0 ? ref.slice(11) : ref;
+    } else if (line === "bare" && current) {
+      current.bare = true;
+    } else if (line === "detached" && current) {
+      current.detached = true;
+    }
+  }
+  if (current) worktrees.push(current);
+  return worktrees;
+}
+
+// Check if a given path is itself a worktree (not the main working tree)
+function isWorktree(projectPath) {
+  try {
+    var gitDir = execFileSync("git", ["rev-parse", "--git-dir"], {
+      cwd: projectPath, encoding: "utf8", timeout: 5000, stdio: ["pipe", "pipe", "pipe"],
+    }).trim();
+    var commonDir = execFileSync("git", ["rev-parse", "--git-common-dir"], {
+      cwd: projectPath, encoding: "utf8", timeout: 5000, stdio: ["pipe", "pipe", "pipe"],
+    }).trim();
+    var absGit = path.resolve(projectPath, gitDir);
+    var absCommon = path.resolve(projectPath, commonDir);
+    return absGit !== absCommon;
+  } catch (e) {
+    return false;
+  }
+}
+
+// Scan worktrees for a given project path
+// Returns array of { path, branch, bare, detached, accessible }
+// accessible = true if worktree path is inside parentPath
+function scanWorktrees(projectPath) {
+  var resolvedParent = path.resolve(projectPath);
+  try {
+    var output = execFileSync("git", ["worktree", "list", "--porcelain"], {
+      cwd: resolvedParent,
+      encoding: "utf8",
+      timeout: 5000,
+      stdio: ["pipe", "pipe", "pipe"],
+    });
+    var all = parseWorktreeOutput(output);
+    // Filter out bare worktrees and the main worktree itself
+    var results = [];
+    for (var i = 0; i < all.length; i++) {
+      var wt = all[i];
+      if (wt.bare) continue;
+      var resolvedWt = path.resolve(wt.path);
+      if (resolvedWt === resolvedParent) continue;
+      wt.accessible = resolvedWt.indexOf(resolvedParent + path.sep) === 0;
+      wt.dirName = path.basename(wt.path);
+      results.push(wt);
+    }
+    return results;
+  } catch (e) {
+    return [];
+  }
+}
+
+// Create a new worktree inside the parent project directory
+// Returns { ok, path, error }
+function createWorktree(projectPath, branchName, baseBranch) {
+  var resolvedParent = path.resolve(projectPath);
+  var wtPath = path.join(resolvedParent, branchName);
+  var base = baseBranch || "main";
+  // Try creating with -b (new branch)
+  try {
+    execFileSync("git", ["worktree", "add", wtPath, "-b", branchName, base], {
+      cwd: resolvedParent,
+      encoding: "utf8",
+      timeout: 15000,
+      stdio: ["pipe", "pipe", "pipe"],
+    });
+    return { ok: true, path: wtPath };
+  } catch (e) {
+    // Branch may already exist, try without -b
+    try {
+      execFileSync("git", ["worktree", "add", wtPath, branchName], {
+        cwd: resolvedParent,
+        encoding: "utf8",
+        timeout: 15000,
+        stdio: ["pipe", "pipe", "pipe"],
+      });
+      return { ok: true, path: wtPath };
+    } catch (e2) {
+      return { ok: false, error: e2.message || "Failed to create worktree" };
+    }
+  }
+}
+
+// Remove a worktree
+// Returns { ok, error }
+function removeWorktree(projectPath, worktreeDirName) {
+  var resolvedParent = path.resolve(projectPath);
+  var wtPath = path.join(resolvedParent, worktreeDirName);
+  // Try normal remove first
+  try {
+    execFileSync("git", ["worktree", "remove", wtPath], {
+      cwd: resolvedParent,
+      encoding: "utf8",
+      timeout: 15000,
+      stdio: ["pipe", "pipe", "pipe"],
+    });
+    return { ok: true };
+  } catch (e) {
+    var errMsg = (e.stderr || e.message || "").toString();
+    // If dirty, report to user
+    if (errMsg.indexOf("modified") !== -1 || errMsg.indexOf("untracked") !== -1) {
+      return { ok: false, error: "Worktree has uncommitted changes. Commit or discard them first." };
+    }
+    if (errMsg.indexOf("locked") !== -1) {
+      return { ok: false, error: "Worktree is locked. Unlock it first with: git worktree unlock" };
+    }
+    return { ok: false, error: errMsg || "Failed to remove worktree" };
+  }
+}
+
+module.exports = { scanWorktrees: scanWorktrees, createWorktree: createWorktree, removeWorktree: removeWorktree, isWorktree: isWorktree };

package/package.json

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