clay-server 2.11.0-beta.8 → 2.11.0

package/lib/public/modules/terminal.js

@@ -15,6 +15,106 @@ var resizeObserver = null;
 var toolbarBound = false;
 var termCtxMenu = null;
 
+// --- Multi-line link provider ---
+// xterm's WebLinksAddon only detects URLs on a single line.
+// This provider reconstructs "logical lines" from wrapped buffer lines
+// and detects URLs that span multiple rows.
+function createMultiLineLinkProvider(xterm) {
+  var URL_RE = /https?:\/\/[^\s'"\]>)}{]+/g;
+
+  function getLogicalLine(buffer, y) {
+    // Walk backward to find the start of the logical line
+    var startY = y;
+    while (startY > 0) {
+      var line = buffer.getLine(startY);
+      if (!line || !line.isWrapped) break;
+      startY--;
+    }
+
+    // Walk forward to collect all wrapped continuation lines
+    var endY = startY;
+    var cols = xterm.cols;
+    while (endY < buffer.length - 1) {
+      var next = buffer.getLine(endY + 1);
+      if (!next || !next.isWrapped) break;
+      endY++;
+    }
+
+    // Build the full logical line text and track row boundaries
+    var text = "";
+    var rowOffsets = []; // { y, startOffset, length }
+    for (var row = startY; row <= endY; row++) {
+      var line = buffer.getLine(row);
+      if (!line) break;
+      var trimRight = (row === endY); // only trim trailing spaces on last row
+      var rowText = line.translateToString(trimRight);
+      rowOffsets.push({ y: row, startOffset: text.length, length: rowText.length });
+      text += rowText;
+    }
+
+    return { text: text, startY: startY, endY: endY, rowOffsets: rowOffsets };
+  }
+
+  function offsetToBufferPos(rowOffsets, offset) {
+    for (var i = 0; i < rowOffsets.length; i++) {
+      var ro = rowOffsets[i];
+      if (offset < ro.startOffset + ro.length) {
+        return { x: offset - ro.startOffset + 1, y: ro.y + 1 }; // 1-based
+      }
+    }
+    // Past end, clamp to last row
+    var last = rowOffsets[rowOffsets.length - 1];
+    return { x: last.length + 1, y: last.y + 1 };
+  }
+
+  return {
+    provideLinks: function (y, callback) {
+      var buffer = xterm.buffer.active;
+      // y is 1-based in provideLinks
+      var bufferY = y - 1;
+      var logical = getLogicalLine(buffer, bufferY);
+
+      // Only process if this logical line spans multiple rows
+      if (logical.startY === logical.endY) {
+        callback(undefined);
+        return;
+      }
+
+      // Only trigger on the first row of the logical line to avoid duplicates
+      if (bufferY !== logical.startY) {
+        callback(undefined);
+        return;
+      }
+
+      var links = [];
+      var match;
+      URL_RE.lastIndex = 0;
+      while ((match = URL_RE.exec(logical.text)) !== null) {
+        var urlStart = match.index;
+        var urlEnd = match.index + match[0].length - 1;
+
+        var startPos = offsetToBufferPos(logical.rowOffsets, urlStart);
+        var endPos = offsetToBufferPos(logical.rowOffsets, urlEnd);
+
+        // Only include if the URL actually spans multiple rows
+        if (startPos.y !== endPos.y) {
+          (function (url) {
+            links.push({
+              range: { start: startPos, end: endPos },
+              text: url,
+              activate: function () {
+                window.open(url, "_blank", "noopener");
+              },
+            });
+          })(match[0]);
+        }
+      }
+
+      callback(links.length > 0 ? links : undefined);
+    },
+  };
+}
+
 // --- Init ---
 export function initTerminal(_ctx) {
   ctx = _ctx;
@@ -184,6 +284,8 @@ function activateTab(termId) {
   // Fit and focus
   setupListeners();
   fitTerminal();
+  // Re-fit after layout settles (flex may not have computed final size yet)
+  setTimeout(fitTerminal, 50);
 
   if (tab.xterm) {
     tab.xterm.focus();
@@ -225,6 +327,14 @@ function createXtermForTab(tab) {
     xterm.loadAddon(fitAddon);
   }
 
+  // Web links addon: make URLs clickable (single-line)
+  if (typeof WebLinksAddon !== "undefined") {
+    xterm.loadAddon(new WebLinksAddon.WebLinksAddon());
+  }
+
+  // Custom multi-line link provider: detect URLs that wrap across lines
+  xterm.registerLinkProvider(createMultiLineLinkProvider(xterm));
+
   // Create a container div for this tab's terminal
   var bodyEl = document.createElement("div");
   bodyEl.className = "terminal-tab-body";
@@ -239,20 +349,26 @@ function createXtermForTab(tab) {
     }
   });
 
-  // Cmd/Ctrl+C copy: use clipboard API when text is selected
-  bodyEl.addEventListener("keydown", function (e) {
+  // Cmd/Ctrl+C copy and Cmd/Ctrl+V paste: intercept before xterm swallows the event
+  xterm.attachCustomKeyEventHandler(function (e) {
+    if (e.type !== "keydown") return true;
+    // Cmd/Ctrl+C: copy selection if any, otherwise send SIGINT
     if ((e.ctrlKey || e.metaKey) && e.key === "c") {
-      var sel = tab.xterm ? tab.xterm.getSelection() : "";
+      var sel = xterm.getSelection();
       if (sel) {
-        e.preventDefault();
         if (navigator.clipboard && navigator.clipboard.writeText) {
           navigator.clipboard.writeText(sel).catch(function () {});
         }
+        return false; // prevent xterm from handling
       }
-      // If no selection, let it pass through as Ctrl+C (SIGINT)
+      // No selection on macOS Cmd+C: do nothing (not SIGINT)
+      if (e.metaKey) return false;
     }
-    // Do NOT preventDefault for Cmd/Ctrl+V here.
-    // Let the browser fire the paste event, which we handle below.
+    // Cmd/Ctrl+V: let browser handle paste event
+    if ((e.ctrlKey || e.metaKey) && e.key === "v") {
+      return false; // let browser fire paste event
+    }
+    return true;
   });
 
   // Handle paste via browser paste event (works for Cmd+V, Ctrl+V, right-click paste)
@@ -277,22 +393,28 @@ function createXtermForTab(tab) {
 }
 
 // --- Fit active terminal ---
-function fitTerminal() {
-  if (!activeTabId) return;
-  var tab = tabs.get(activeTabId);
-  if (!tab || !tab.fitAddon || !tab.xterm) return;
+var fitRafId = null;
 
-  try {
-    tab.fitAddon.fit();
-    if (ctx.ws && ctx.connected) {
-      ctx.ws.send(JSON.stringify({
-        type: "term_resize",
-        id: activeTabId,
-        cols: tab.xterm.cols,
-        rows: tab.xterm.rows,
-      }));
-    }
-  } catch (e) {}
+function fitTerminal() {
+  if (fitRafId) cancelAnimationFrame(fitRafId);
+  fitRafId = requestAnimationFrame(function () {
+    fitRafId = null;
+    if (!activeTabId) return;
+    var tab = tabs.get(activeTabId);
+    if (!tab || !tab.fitAddon || !tab.xterm) return;
+
+    try {
+      tab.fitAddon.fit();
+      if (ctx.ws && ctx.connected) {
+        ctx.ws.send(JSON.stringify({
+          type: "term_resize",
+          id: activeTabId,
+          cols: tab.xterm.cols,
+          rows: tab.xterm.rows,
+        }));
+      }
+    } catch (e) {}
+  });
 }
 
 // --- Setup/cleanup resize listeners ---
@@ -611,10 +733,24 @@ function showTermCtxMenu(e, tab) {
   var menu = document.createElement("div");
   menu.className = "term-ctx-menu";
 
-  // Copy
+  // Copy selection
+  var sel = tab.xterm ? tab.xterm.getSelection() : "";
+  if (sel) {
+    var copySelItem = document.createElement("button");
+    copySelItem.className = "term-ctx-item";
+    copySelItem.innerHTML = iconHtml("copy") + " <span>Copy</span>";
+    copySelItem.addEventListener("click", function (ev) {
+      ev.stopPropagation();
+      closeTermCtxMenu();
+      if (sel) copyToClipboard(sel);
+    });
+    menu.appendChild(copySelItem);
+  }
+
+  // Copy entire console
   var copyItem = document.createElement("button");
   copyItem.className = "term-ctx-item";
-  copyItem.innerHTML = iconHtml("clipboard-copy") + " <span>Copy Terminal</span>";
+  copyItem.innerHTML = iconHtml("clipboard-copy") + " <span>Copy Console</span>";
   copyItem.addEventListener("click", function (ev) {
     ev.stopPropagation();
     closeTermCtxMenu();
@@ -647,7 +783,7 @@ function showTermCtxMenu(e, tab) {
   // Clear
   var clearItem = document.createElement("button");
   clearItem.className = "term-ctx-item";
-  clearItem.innerHTML = iconHtml("trash-2") + " <span>Clear Terminal</span>";
+  clearItem.innerHTML = iconHtml("trash-2") + " <span>Clear Console</span>";
   clearItem.addEventListener("click", function (ev) {
     ev.stopPropagation();
     closeTermCtxMenu();

package/lib/sdk-bridge.js

@@ -573,6 +573,38 @@ function createSDKBridge(opts) {
 
   var WORKER_SCRIPT = path.join(__dirname, "sdk-worker.js");
 
+  // Ensure the package directory tree is world-readable so OS-level users
+  // can access the worker script and its dependencies (the install path
+  // may be under /root/.npm/_npx/ which defaults to 700)
+  (function ensurePackageReadable() {
+    try {
+      // Walk up from __dirname to find the package root (where node_modules lives)
+      var pkgDir = path.join(__dirname, "..");
+      // Open read+execute on each ancestor directory up to and including the
+      // npx cache entry so that non-root users can traverse the path
+      var dir = pkgDir;
+      var dirs = [];
+      while (dir !== path.dirname(dir)) {
+        dirs.push(dir);
+        // Stop once we leave the npm cache tree
+        if (dir.indexOf(".npm") === -1 && dir.indexOf("node_modules") === -1) break;
+        dir = path.dirname(dir);
+      }
+      for (var di = 0; di < dirs.length; di++) {
+        try {
+          var st = fs.statSync(dirs[di]);
+          // Add o+rx if not already present
+          if ((st.mode & 0o005) !== 0o005) {
+            fs.chmodSync(dirs[di], st.mode | 0o005);
+          }
+        } catch (e) {}
+      }
+      // Recursively make the package contents readable
+      var { execSync: chmodExec } = require("child_process");
+      chmodExec("chmod -R o+rX " + JSON.stringify(pkgDir), { stdio: "ignore", timeout: 5000 });
+    } catch (e) {}
+  })();
+
   // resolveLinuxUser delegates to shared os-users utility
   function resolveLinuxUser(username) {
     return resolveOsUserInfo(username);
@@ -658,12 +690,27 @@ function createSDKBridge(opts) {
       worker.process.stdout.on("data", function(data) {
         console.log("[sdk-worker:" + linuxUser + "] " + data.toString().trim());
       });
+      worker._stderrBuf = "";
       worker.process.stderr.on("data", function(data) {
-        console.error("[sdk-worker:" + linuxUser + "] " + data.toString().trim());
+        var text = data.toString().trim();
+        worker._stderrBuf += text + "\n";
+        console.error("[sdk-worker:" + linuxUser + "] " + text);
       });
 
       worker.process.on("exit", function(code, signal) {
         console.log("[sdk-bridge] Worker for " + linuxUser + " exited (code=" + code + ", signal=" + signal + ")");
+        // Notify message handlers about unexpected exit so sessions don't hang
+        if (code !== 0 && code !== null) {
+          var stderrText = worker._stderrBuf || "";
+          for (var h = 0; h < worker.messageHandlers.length; h++) {
+            worker.messageHandlers[h]({
+              type: "query_error",
+              error: stderrText || "Worker exited with code " + code,
+              exitCode: code,
+              stderr: stderrText || null,
+            });
+          }
+        }
         cleanupWorker(worker);
       });
     });
@@ -1021,7 +1068,7 @@ function createSDKBridge(opts) {
         worker.kill();
       } else if (msg.type === "warmup_error" && !warmupDone) {
         warmupDone = true;
-        send({ type: "error", text: result.error || "Warmup failed" });
+        send({ type: "error", text: msg.error || "Warmup failed" });
         worker.kill();
       }
     });
@@ -1152,14 +1199,13 @@ function createSDKBridge(opts) {
       for (var j = 0; j < candidates.length; j++) {
         var c = candidates[j];
         try {
-          var lsof = execSync("lsof -a -p " + c.pid + " -d cwd -F n 2>/dev/null", { encoding: "utf8", timeout: 3000 });
-          // lsof -F n output: lines starting with 'n' contain the path
-          var cwdMatch = lsof.match(/\nn(.+)/);
-          if (cwdMatch && cwdMatch[1] === cwd) {
+          // Use /proc/<pid>/cwd symlink (always available on Linux, no lsof dependency)
+          var procCwd = fs.readlinkSync("/proc/" + c.pid + "/cwd");
+          if (procCwd === cwd) {
             results.push(c);
           }
         } catch (e) {
-          // lsof failed — include as candidate anyway (conservative)
+          // /proc read failed — include as candidate anyway (conservative)
           results.push(c);
         }
       }

package/lib/server.js

@@ -353,6 +353,7 @@ function createServer(opts) {
   var onSetPin = opts.onSetPin || null;
   var onSetKeepAwake = opts.onSetKeepAwake || null;
   var onShutdown = opts.onShutdown || null;
+  var onRestart = opts.onRestart || null;
   var onSetUpdateChannel = opts.onSetUpdateChannel || null;
   var onUpgradePin = opts.onUpgradePin || null;
   var onSetProjectVisibility = opts.onSetProjectVisibility || null;
@@ -360,6 +361,7 @@ function createServer(opts) {
   var onGetProjectAccess = opts.onGetProjectAccess || null;
   var onUserProvisioned = opts.onUserProvisioned || null;
   var onUserDeleted = opts.onUserDeleted || null;
+  var getRemovedProjects = opts.getRemovedProjects || function () { return []; };
 
   var authToken = pinHash || null;
   var realVersion = require("../package.json").version;
@@ -1118,6 +1120,48 @@ function createServer(opts) {
       return;
     }
 
+    // Reset user PIN (admin only) — generates a new temp PIN
+    if (req.method === "POST" && fullUrl.match(/^\/api\/admin\/users\/[^/]+\/reset-pin$/)) {
+      if (!users.isMultiUser()) {
+        res.writeHead(404, { "Content-Type": "application/json" });
+        res.end('{"error":"Not found"}');
+        return;
+      }
+      var mu = getMultiUserFromReq(req);
+      if (!mu || mu.role !== "admin") {
+        res.writeHead(403, { "Content-Type": "application/json" });
+        res.end('{"error":"Admin access required"}');
+        return;
+      }
+      var urlParts = fullUrl.split("/");
+      var targetUserId = urlParts[4]; // /api/admin/users/{userId}/reset-pin
+      var targetUser = users.findUserById(targetUserId);
+      if (!targetUser) {
+        res.writeHead(404, { "Content-Type": "application/json" });
+        res.end('{"error":"User not found"}');
+        return;
+      }
+      var newPin = users.generatePin();
+      var pinResult = users.updateUserPin(targetUserId, newPin);
+      if (pinResult.error) {
+        res.writeHead(400, { "Content-Type": "application/json" });
+        res.end(JSON.stringify({ error: pinResult.error }));
+        return;
+      }
+      // Mark as must change on next login
+      var data = users.loadUsers();
+      for (var i = 0; i < data.users.length; i++) {
+        if (data.users[i].id === targetUserId) {
+          data.users[i].mustChangePin = true;
+          users.saveUsers(data);
+          break;
+        }
+      }
+      res.writeHead(200, { "Content-Type": "application/json" });
+      res.end(JSON.stringify({ ok: true, tempPin: newPin }));
+      return;
+    }
+
     // Set Linux user mapping (admin only, OS-level multi-user)
     if (req.method === "PUT" && fullUrl.match(/^\/api\/admin\/users\/[^/]+\/linux-user$/)) {
       if (!users.isMultiUser()) {
@@ -1920,6 +1964,7 @@ function createServer(opts) {
 
     var ctx = projects.get(wsSlug);
     if (!ctx) {
+      if (debug) console.log("[server] WS rejected: project not found for slug", wsSlug);
       socket.destroy();
       return;
     }
@@ -1931,8 +1976,10 @@ function createServer(opts) {
       // Check project access for multi-user mode
       if (wsUser && onGetProjectAccess) {
         var projectAccess = onGetProjectAccess(wsSlug);
+        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)) {
+            if (debug) console.log("[server] WS rejected: access denied for", wsUser.id, "on", wsSlug);
             socket.write("HTTP/1.1 403 Forbidden\r\n\r\n");
             socket.destroy();
             return;
@@ -1966,23 +2013,51 @@ function createServer(opts) {
         return origEmit.apply(ws, arguments);
       };
       ws._clayUser = wsUser; // attach user context
+      // Clear cross-project unread for this project when client connects
+      var unreadMap = getCrossProjectUnread(ws);
+      if (unreadMap[wsSlug]) {
+        unreadMap[wsSlug] = 0;
+      }
       ctx.handleConnection(ws, wsUser);
     });
   });
 
+  // --- Cross-project unread tracking ---
+  // WeakMap<ws, { slug: count }> tracks how many done events happened in other projects
+  var crossProjectUnread = new WeakMap();
+
+  function getCrossProjectUnread(ws) {
+    var map = crossProjectUnread.get(ws);
+    if (!map) { map = {}; crossProjectUnread.set(ws, map); }
+    return map;
+  }
+
+  function onSessionDone(sourceSlug) {
+    // Increment unread for all clients NOT connected to sourceSlug
+    projects.forEach(function (ctx, projSlug) {
+      if (projSlug === sourceSlug) return;
+      ctx.forEachClient(function (ws) {
+        var map = getCrossProjectUnread(ws);
+        map[sourceSlug] = (map[sourceSlug] || 0) + 1;
+      });
+    });
+    // Trigger a projects_updated broadcast so clients get updated unread counts
+    broadcastProcessingChange();
+  }
+
   // --- Debounced broadcast for processing status changes ---
   var processingUpdateTimer = null;
   function broadcastProcessingChange() {
     if (processingUpdateTimer) clearTimeout(processingUpdateTimer);
     processingUpdateTimer = setTimeout(function () {
       processingUpdateTimer = null;
-      if (users.isMultiUser() && onGetProjectAccess) {
-        // Per-client filtered project list
-        var allProjectsList = getProjects();
-        projects.forEach(function (ctx) {
-          ctx.forEachClient(function (ws) {
+      var allProjectsList = getProjects();
+      // Always send per-client to include cross-project unread counts
+      projects.forEach(function (ctx, projSlug) {
+        ctx.forEachClient(function (ws) {
+          var filtered = allProjectsList;
+          if (users.isMultiUser() && onGetProjectAccess) {
             var wsUser = ws._clayUser;
-            var filtered = allProjectsList;
             if (wsUser) {
               filtered = allProjectsList.filter(function (p) {
                 var access = onGetProjectAccess(p.slug);
@@ -1990,20 +2065,31 @@ function createServer(opts) {
                 return users.canAccessProject(wsUser.id, access);
               });
             }
+          }
+          // Attach per-project unread counts for this client
+          var unreadMap = getCrossProjectUnread(ws);
+          var projectsWithUnread = filtered.map(function (p) {
+            var copy = {};
+            var keys = Object.keys(p);
+            for (var i = 0; i < keys.length; i++) copy[keys[i]] = p[keys[i]];
+            // For the current project, use session-level unread total
+            if (p.slug === projSlug) {
+              copy.unread = ctx.sm.getTotalUnread(ws);
+            } else {
+              copy.unread = unreadMap[p.slug] || 0;
+            }
+            return copy;
+          });
+          if (ws.readyState === 1) {
             ws.send(JSON.stringify({
               type: "projects_updated",
-              projects: filtered,
-              projectCount: filtered.length,
+              projects: projectsWithUnread,
+              projectCount: projectsWithUnread.length,
+              removedProjects: getRemovedProjects(ws._clayUser ? ws._clayUser.id : null),
             }));
-          });
-        });
-      } else {
-        broadcastAll({
-          type: "projects_updated",
-          projects: getProjects(),
-          projectCount: projects.size,
+          }
         });
-      }
+      });
     }, 200);
   }
 
@@ -2099,6 +2185,7 @@ function createServer(opts) {
       },
       onPresenceChange: broadcastPresenceChange,
       onProcessingChanged: broadcastProcessingChange,
+      onSessionDone: function () { onSessionDone(slug); },
       onAddProject: onAddProject,
       onCreateProject: onCreateProject,
       onCloneProject: onCloneProject,
@@ -2125,6 +2212,7 @@ function createServer(opts) {
       onSetUpdateChannel: onSetUpdateChannel,
       updateChannel: onGetDaemonConfig ? (onGetDaemonConfig().updateChannel || "stable") : "stable",
       onShutdown: onShutdown,
+      onRestart: onRestart,
       onDmMessage: handleDmMessage,
     });
     projects.set(slug, ctx);
@@ -2217,6 +2305,41 @@ function createServer(opts) {
       });
       return;
     }
+
+    if (msg.type === "dm_add_favorite") {
+      if (!msg.targetUserId) return;
+      users.removeDmHidden(userId, msg.targetUserId);
+      var updatedFavorites = users.addDmFavorite(userId, msg.targetUserId);
+      var allUsersList = users.getAllUsers().map(function (u) {
+        var p = u.profile || {};
+        return {
+          id: u.id,
+          displayName: p.name || u.displayName || u.username,
+          username: u.username,
+          role: u.role,
+          avatarStyle: p.avatarStyle || "thumbs",
+          avatarSeed: p.avatarSeed || u.username,
+          avatarColor: p.avatarColor || "#7c3aed",
+        };
+      });
+      ws.send(JSON.stringify({
+        type: "dm_favorites_updated",
+        dmFavorites: updatedFavorites,
+        allUsers: allUsersList,
+      }));
+      return;
+    }
+
+    if (msg.type === "dm_remove_favorite") {
+      if (!msg.targetUserId) return;
+      users.addDmHidden(userId, msg.targetUserId);
+      var updatedFavorites = users.removeDmFavorite(userId, msg.targetUserId);
+      ws.send(JSON.stringify({
+        type: "dm_favorites_updated",
+        dmFavorites: updatedFavorites,
+      }));
+      return;
+    }
   }
 
   function removeProject(slug) {
@@ -2296,7 +2419,7 @@ function createServer(opts) {
   // Sends per-user filtered project lists + server-wide user list
   var presenceTimer = null;
   function broadcastPresenceChange() {
-    if (presenceTimer) return;
+    if (presenceTimer) clearTimeout(presenceTimer);
     presenceTimer = setTimeout(function () {
       presenceTimer = null;
       if (!users.isMultiUser()) {
@@ -2304,6 +2427,7 @@ function createServer(opts) {
           type: "projects_updated",
           projects: getProjects(),
           projectCount: projects.size,
+          removedProjects: getRemovedProjects(),
         });
         return;
       }
@@ -2340,12 +2464,27 @@ function createServer(opts) {
             }
             filteredProjects.push(status);
           });
+          // Per-user DM data
+          var userDmFavorites = userId ? users.getDmFavorites(userId) : [];
+          var userDmHidden = userId ? users.getDmHidden(userId) : [];
+          var userDmConversations = [];
+          if (userId) {
+            var dmList = dm.getDmList(userId);
+            for (var di = 0; di < dmList.length; di++) {
+              if (userDmHidden.indexOf(dmList[di].otherUserId) === -1) {
+                userDmConversations.push(dmList[di].otherUserId);
+              }
+            }
+          }
           var msgStr = JSON.stringify({
             type: "projects_updated",
             projects: filteredProjects,
             projectCount: projects.size,
             serverUsers: serverUsers,
             allUsers: allUsers,
+            dmFavorites: userDmFavorites,
+            dmConversations: userDmConversations,
+            removedProjects: getRemovedProjects(userId),
           });
           sentUsers[key] = msgStr;
           ws.send(msgStr);