clay-server 2.8.2 → 2.9.0

package/lib/project.js

@@ -9,9 +9,35 @@ var { createNotesManager } = require("./notes");
 var { fetchLatestVersion, isNewer } = require("./updater");
 var { execFileSync, spawn } = require("child_process");
 var { createLoopRegistry } = require("./scheduler");
+var usersModule = require("./users");
 
 var MAX_UPLOAD_BYTES = 50 * 1024 * 1024; // 50 MB
 
+// Validate environment variable string (KEY=VALUE per line)
+// Returns null if valid, or an error string if invalid
+function validateEnvString(str) {
+  if (!str || !str.trim()) return null;
+  var lines = str.split("\n");
+  for (var i = 0; i < lines.length; i++) {
+    var line = lines[i].trim();
+    if (!line || line.charAt(0) === "#") continue;
+    // Must be KEY=VALUE format
+    var eqIdx = line.indexOf("=");
+    if (eqIdx < 1) return "Invalid format at line " + (i + 1) + ": expected KEY=VALUE";
+    var key = line.substring(0, eqIdx);
+    // Key must be valid env var name (no shell metacharacters)
+    if (!/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(key)) {
+      return "Invalid variable name at line " + (i + 1) + ": " + key;
+    }
+    // Value must not contain shell injection characters
+    var value = line.substring(eqIdx + 1);
+    if (/[`$\\;|&><(){}\n]/.test(value) && !/^["'].*["']$/.test(value)) {
+      return "Potentially unsafe value at line " + (i + 1) + ": shell metacharacters detected";
+    }
+  }
+  return null;
+}
+
 // SDK loaded dynamically (ESM module)
 var sdkModule = null;
 function getSDK() {
@@ -81,6 +107,7 @@ function createProjectContext(opts) {
   var moveAllSchedulesToProject = opts.moveAllSchedulesToProject || function () { return { ok: false, error: "Not supported" }; };
   var getScheduleCount = opts.getScheduleCount || function () { return 0; };
   var onProcessingChanged = opts.onProcessingChanged || function () {};
+  var onPresenceChange = opts.onPresenceChange || function () {};
   var latestVersion = null;
 
   // --- Per-project clients ---
@@ -98,7 +125,28 @@ function createProjectContext(opts) {
   }
 
   function broadcastClientCount() {
-    send({ type: "client_count", count: clients.size });
+    var msg = { type: "client_count", count: clients.size };
+    if (usersModule.isMultiUser()) {
+      var seen = {};
+      var userList = [];
+      for (var c of clients) {
+        if (!c._clayUser) continue;
+        var u = c._clayUser;
+        if (seen[u.id]) continue;
+        seen[u.id] = true;
+        var p = u.profile || {};
+        userList.push({
+          id: u.id,
+          displayName: p.name || u.displayName || u.username,
+          username: u.username,
+          avatarStyle: p.avatarStyle || "thumbs",
+          avatarSeed: p.avatarSeed || u.username,
+        });
+      }
+      msg.users = userList;
+    }
+    send(msg);
+    onPresenceChange();
   }
 
   function sendToOthers(sender, obj) {
@@ -202,7 +250,25 @@ function createProjectContext(opts) {
   }
 
   // --- Session manager ---
-  var sm = createSessionManager({ cwd: cwd, send: send });
+  var sm = createSessionManager({
+    cwd: cwd,
+    send: send,
+    sendTo: sendTo,
+    sendEach: function (fn) {
+      for (var ws of clients) {
+        var user = ws._clayUser;
+        var filterFn = null;
+        if (usersModule.isMultiUser() && user) {
+          filterFn = (function (u) {
+            return function (s) {
+              return usersModule.canAccessSession(u.id, s, { visibility: "public" });
+            };
+          })(user);
+        }
+        fn(ws, filterFn);
+      }
+    },
+  });
   var _projMode = typeof opts.onGetProjectDefaultMode === "function" ? opts.onGetProjectDefaultMode(slug) : null;
   var _srvMode = typeof opts.onGetServerDefaultMode === "function" ? opts.onGetServerDefaultMode() : null;
   sm.currentPermissionMode = (_projMode && _projMode.mode) || (_srvMode && _srvMode.mode) || "default";
@@ -320,6 +386,31 @@ function createProjectContext(opts) {
     } catch (e) {
       // No saved state, use defaults
     }
+    // Recover orphaned loops: if idle but completed loop files exist in .claude/loops/
+    if (loopState.phase === "idle") {
+      var _loopsBase = path.join(cwd, ".claude", "loops");
+      try {
+        var _loopDirs = fs.readdirSync(_loopsBase).filter(function (d) {
+          return d.indexOf("loop_") === 0;
+        });
+        for (var _li = 0; _li < _loopDirs.length; _li++) {
+          var _ld = path.join(_loopsBase, _loopDirs[_li]);
+          try {
+            fs.accessSync(path.join(_ld, "PROMPT.md"));
+            fs.accessSync(path.join(_ld, "JUDGE.md"));
+            fs.accessSync(path.join(_ld, "LOOP.json"));
+            // Found a completed loop — recover to approval phase
+            loopState.loopId = _loopDirs[_li];
+            loopState.phase = "approval";
+            var _loopCfg = JSON.parse(fs.readFileSync(path.join(_ld, "LOOP.json"), "utf8"));
+            loopState.maxIterations = _loopCfg.maxIterations || 20;
+            saveLoopState();
+            console.log("[ralph-loop] Recovered orphaned loop: " + _loopDirs[_li]);
+            break;
+          } catch (e) {}
+        }
+      } catch (e) {}
+    }
   }
 
   function clearLoopState() {
@@ -846,7 +937,8 @@ function createProjectContext(opts) {
   });
 
   // --- WS connection handler ---
-  function handleConnection(ws) {
+  function handleConnection(ws, wsUser) {
+    ws._clayUser = wsUser || null;
     clients.add(ws);
     broadcastClientCount();
 
@@ -857,7 +949,9 @@ function createProjectContext(opts) {
     }
 
     // Send cached state
-    sendTo(ws, { type: "info", cwd: cwd, slug: slug, project: title || project, version: currentVersion, debug: !!debug, dangerouslySkipPermissions: dangerouslySkipPermissions, lanHost: lanHost, projectCount: getProjectCount(), projects: getProjectList() });
+    var _userId = ws._clayUser ? ws._clayUser.id : null;
+    var _filteredProjects = getProjectList(_userId);
+    sendTo(ws, { type: "info", cwd: cwd, slug: slug, project: title || project, version: currentVersion, debug: !!debug, dangerouslySkipPermissions: dangerouslySkipPermissions, lanHost: lanHost, projectCount: _filteredProjects.length, projects: _filteredProjects });
     if (latestVersion) {
       sendTo(ws, { type: "update_available", version: latestVersion });
     }
@@ -879,6 +973,17 @@ function createProjectContext(opts) {
       fs.accessSync(path.join(cwd, ".claude", "JUDGE.md"));
       hasLoopFiles = true;
     } catch (e) {}
+    // Also check loop directory files
+    if (!hasLoopFiles && loopState.loopId) {
+      var _avDir = loopDir();
+      if (_avDir) {
+        try {
+          fs.accessSync(path.join(_avDir, "PROMPT.md"));
+          fs.accessSync(path.join(_avDir, "JUDGE.md"));
+          hasLoopFiles = true;
+        } catch (e) {}
+      }
+    }
     sendTo(ws, {
       type: "loop_available",
       available: hasLoopFiles,
@@ -911,10 +1016,16 @@ function createProjectContext(opts) {
       });
     }
 
-    // Session list
+    // Session list (filtered for multi-user)
+    var allSessions = [].concat(Array.from(sm.sessions.values())).filter(function (s) { return !s.hidden; });
+    if (usersModule.isMultiUser() && wsUser) {
+      allSessions = allSessions.filter(function (s) {
+        return usersModule.canAccessSession(wsUser.id, s, { visibility: "public" });
+      });
+    }
     sendTo(ws, {
       type: "session_list",
-      sessions: [].concat(Array.from(sm.sessions.values())).filter(function (s) { return !s.hidden; }).map(function (s) {
+      sessions: allSessions.map(function (s) {
         var loop = s.loop ? Object.assign({}, s.loop) : null;
         if (loop && loop.loopId && loopRegistry) {
           var rec = loopRegistry.getById(loop.loopId);
@@ -931,13 +1042,21 @@ function createProjectContext(opts) {
           isProcessing: s.isProcessing,
           lastActivity: s.lastActivity || s.createdAt || 0,
           loop: loop,
+          ownerId: s.ownerId || null,
+          sessionVisibility: s.sessionVisibility || "shared",
         };
       }),
     });
 
-    // Restore active session for this client
+    // Restore active session for this client (check access in multi-user mode)
     var active = sm.getActiveSession();
+    if (active && usersModule.isMultiUser() && wsUser) {
+      if (!usersModule.canAccessSession(wsUser.id, active, { visibility: "public" })) {
+        active = null;
+      }
+    }
     if (active) {
+      ws._clayActiveSession = active.localId;
       sendTo(ws, { type: "session_switched", id: active.localId, cliSessionId: active.cliSessionId || null, loop: active.loop || null });
 
       var total = active.history.length;
@@ -968,6 +1087,8 @@ function createProjectContext(opts) {
       }
     }
 
+    broadcastPresence();
+
     ws.on("message", function (raw) {
       var msg;
       try { msg = JSON.parse(raw.toString()); } catch (e) { return; }
@@ -1002,7 +1123,21 @@ function createProjectContext(opts) {
     }
 
     if (msg.type === "new_session") {
-      sm.createSession();
+      var sessionOpts = {};
+      if (ws._clayUser) sessionOpts.ownerId = ws._clayUser.id;
+      if (msg.sessionVisibility) sessionOpts.sessionVisibility = msg.sessionVisibility;
+      var newSess = sm.createSession(sessionOpts, usersModule.isMultiUser() ? ws : undefined);
+      if (usersModule.isMultiUser()) {
+        ws._clayActiveSession = newSess.localId;
+        broadcastPresence();
+      }
+      return;
+    }
+
+    if (msg.type === "set_session_visibility") {
+      if (typeof msg.sessionId === "number" && (msg.visibility === "shared" || msg.visibility === "private")) {
+        sm.setSessionVisibility(msg.sessionId, msg.visibility);
+      }
       return;
     }
 
@@ -1017,9 +1152,11 @@ function createProjectContext(opts) {
             break;
           }
         }
-        sm.resumeSession(msg.cliSessionId, { history: history, title: title });
+        var _rws = usersModule.isMultiUser() ? ws : undefined;
+        sm.resumeSession(msg.cliSessionId, { history: history, title: title }, _rws);
       }).catch(function () {
-        sm.resumeSession(msg.cliSessionId);
+        var _rws = usersModule.isMultiUser() ? ws : undefined;
+        sm.resumeSession(msg.cliSessionId, undefined, _rws);
       });
       return;
     }
@@ -1056,14 +1193,23 @@ function createProjectContext(opts) {
 
     if (msg.type === "switch_session") {
       if (msg.id && sm.sessions.has(msg.id)) {
-        sm.switchSession(msg.id);
+        // Check access in multi-user mode
+        if (usersModule.isMultiUser() && ws._clayUser) {
+          var switchTarget = sm.sessions.get(msg.id);
+          if (!usersModule.canAccessSession(ws._clayUser.id, switchTarget, { visibility: "public" })) return;
+          ws._clayActiveSession = msg.id;
+          sm.switchSession(msg.id, ws);
+          broadcastPresence();
+        } else {
+          sm.switchSession(msg.id);
+        }
       }
       return;
     }
 
     if (msg.type === "delete_session") {
       if (msg.id && sm.sessions.has(msg.id)) {
-        sm.deleteSession(msg.id);
+        sm.deleteSession(msg.id, usersModule.isMultiUser() ? ws : undefined);
       }
       return;
     }
@@ -1085,6 +1231,7 @@ function createProjectContext(opts) {
     }
 
     if (msg.type === "check_update") {
+      if (usersModule.isMultiUser() && (!ws._clayUser || ws._clayUser.role !== "admin")) return;
       fetchLatestVersion().then(function (v) {
         if (v && isNewer(v, currentVersion)) {
           latestVersion = v;
@@ -1095,6 +1242,7 @@ function createProjectContext(opts) {
     }
 
     if (msg.type === "update_now") {
+      if (usersModule.isMultiUser() && (!ws._clayUser || ws._clayUser.role !== "admin")) return;
       send({ type: "update_started", version: latestVersion || "" });
       var _ipc = require("./ipc");
       var _config = require("./config");
@@ -1353,7 +1501,7 @@ function createProjectContext(opts) {
           onProcessingChanged();
 
           sm.saveSessionFile(session);
-          sm.switchSession(session.localId);
+          sm.switchSession(session.localId, usersModule.isMultiUser() ? ws : undefined);
           sm.sendAndRecord(session, { type: "rewind_complete", mode: mode });
           sm.broadcastSessionList();
         } catch (err) {
@@ -1672,7 +1820,18 @@ function createProjectContext(opts) {
       return;
     }
 
-    // --- Daemon config (server settings) ---
+    // --- Daemon config / server management (admin-only in multi-user mode) ---
+    if (msg.type === "get_daemon_config" || msg.type === "set_pin" || msg.type === "set_keep_awake" ||
+        msg.type === "shutdown_server" || msg.type === "restart_server") {
+      if (usersModule.isMultiUser()) {
+        var _wsUser = ws._clayUser;
+        if (!_wsUser || _wsUser.role !== "admin") {
+          sendTo(ws, { type: "error", message: "Admin access required" });
+          return;
+        }
+      }
+    }
+
     if (msg.type === "get_daemon_config") {
       if (typeof opts.onGetDaemonConfig === "function") {
         var daemonConfig = opts.onGetDaemonConfig();
@@ -1815,6 +1974,11 @@ function createProjectContext(opts) {
 
     if (msg.type === "set_project_env") {
       if (typeof opts.onSetProjectEnv === "function") {
+        var envError = validateEnvString(msg.envrc || "");
+        if (envError) {
+          sendTo(ws, { type: "set_project_env_result", ok: false, slug: msg.slug, error: envError });
+          return;
+        }
         var setResult = opts.onSetProjectEnv(msg.slug, msg.envrc || "");
         sendTo(ws, { type: "set_project_env_result", ok: setResult.ok, slug: msg.slug, error: setResult.error });
       } else {
@@ -1865,6 +2029,11 @@ function createProjectContext(opts) {
 
     if (msg.type === "set_shared_env") {
       if (typeof opts.onSetSharedEnv === "function") {
+        var sharedEnvError = validateEnvString(msg.envrc || "");
+        if (sharedEnvError) {
+          sendTo(ws, { type: "set_shared_env_result", ok: false, error: sharedEnvError });
+          return;
+        }
         var sharedSetResult = opts.onSetSharedEnv(msg.envrc || "");
         sendTo(ws, { type: "set_shared_env_result", ok: sharedSetResult.ok, error: sharedSetResult.error });
       } else {
@@ -2475,6 +2644,33 @@ function createProjectContext(opts) {
     sm.broadcastSessionList();
   }
 
+  // --- Session presence (who is viewing which session) ---
+  function broadcastPresence() {
+    if (!usersModule.isMultiUser()) return;
+    var presence = {};
+    for (var c of clients) {
+      if (!c._clayUser || !c._clayActiveSession) continue;
+      var sid = c._clayActiveSession;
+      if (!presence[sid]) presence[sid] = [];
+      var u = c._clayUser;
+      var p = u.profile || {};
+      // Deduplicate: skip if this user is already listed for this session
+      var dominated = false;
+      for (var di = 0; di < presence[sid].length; di++) {
+        if (presence[sid][di].id === u.id) { dominated = true; break; }
+      }
+      if (dominated) continue;
+      presence[sid].push({
+        id: u.id,
+        displayName: p.name || u.displayName || u.username,
+        username: u.username,
+        avatarStyle: p.avatarStyle || "thumbs",
+        avatarSeed: p.avatarSeed || u.username,
+      });
+    }
+    send({ type: "session_presence", presence: presence });
+  }
+
   // --- WS disconnection handler ---
   function handleDisconnection(ws) {
     tm.detachAll(ws);
@@ -2484,6 +2680,7 @@ function createProjectContext(opts) {
       stopAllDirWatches();
     }
     broadcastClientCount();
+    broadcastPresence();
   }
 
   // --- Handle project-scoped HTTP requests ---
@@ -2635,6 +2832,18 @@ function createProjectContext(opts) {
           res.end('{"error":"missing url, skill, or scope"}');
           return;
         }
+        // Validate skill name: alphanumeric, hyphens, underscores only
+        if (!/^[a-zA-Z0-9_-]+$/.test(skill)) {
+          res.writeHead(400, { "Content-Type": "application/json" });
+          res.end('{"error":"invalid skill name"}');
+          return;
+        }
+        // Validate URL: must be https://
+        if (!/^https:\/\//i.test(url)) {
+          res.writeHead(400, { "Content-Type": "application/json" });
+          res.end('{"error":"only https:// URLs are allowed"}');
+          return;
+        }
         var spawnCwd = scope === "global" ? os.homedir() : cwd;
         var child = spawn("npx", ["skills", "add", url, "--skill", skill], {
           cwd: spawnCwd,
@@ -2679,6 +2888,12 @@ function createProjectContext(opts) {
           res.end('{"error":"missing skill or scope"}');
           return;
         }
+        // Validate skill name
+        if (!/^[a-zA-Z0-9_-]+$/.test(skill)) {
+          res.writeHead(400, { "Content-Type": "application/json" });
+          res.end('{"error":"invalid skill name"}');
+          return;
+        }
         var baseDir = scope === "global" ? os.homedir() : cwd;
         var skillDir = path.join(baseDir, ".claude", "skills", skill);
         // Safety: ensure skillDir is inside the expected .claude/skills directory
@@ -2823,7 +3038,7 @@ function createProjectContext(opts) {
     sm.sessions.forEach(function (s) {
       if (s.isProcessing) hasProcessing = true;
     });
-    return {
+    var status = {
       slug: slug,
       path: cwd,
       project: project,
@@ -2833,6 +3048,26 @@ function createProjectContext(opts) {
       sessions: sessionCount,
       isProcessing: hasProcessing,
     };
+    if (usersModule.isMultiUser()) {
+      var seen = {};
+      var onlineUsers = [];
+      for (var c of clients) {
+        if (!c._clayUser) continue;
+        var u = c._clayUser;
+        if (seen[u.id]) continue;
+        seen[u.id] = true;
+        var p = u.profile || {};
+        onlineUsers.push({
+          id: u.id,
+          displayName: p.name || u.displayName || u.username,
+          username: u.username,
+          avatarStyle: p.avatarStyle || "thumbs",
+          avatarSeed: p.avatarSeed || u.username,
+        });
+      }
+      status.onlineUsers = onlineUsers;
+    }
+    return status;
   }
 
   function setTitle(newTitle) {
@@ -2853,6 +3088,11 @@ function createProjectContext(opts) {
     sdk: sdk,
     send: send,
     sendTo: sendTo,
+    forEachClient: function (fn) {
+      for (var ws of clients) {
+        if (ws.readyState === 1) fn(ws);
+      }
+    },
     handleConnection: handleConnection,
     handleMessage: handleMessage,
     handleDisconnection: handleDisconnection,
@@ -2863,6 +3103,17 @@ function createProjectContext(opts) {
     removeSchedule: function (id) { return loopRegistry.remove(id); },
     setTitle: setTitle,
     setIcon: setIcon,
+    refreshUserProfile: function (userId) {
+      var user = usersModule.findUserById(userId);
+      if (!user) return;
+      for (var ws of clients) {
+        if (ws._clayUser && ws._clayUser.id === userId) {
+          ws._clayUser = user;
+        }
+      }
+      broadcastClientCount();
+      broadcastPresence();
+    },
     warmup: function () {
       sdk.warmup();
       // Auto-install clay-ralph skill globally if not present
@@ -2904,4 +3155,4 @@ function parseJsonBody(req) {
   });
 }
 
-module.exports = { createProjectContext: createProjectContext };
+module.exports = { createProjectContext: createProjectContext, safePath: safePath, validateEnvString: validateEnvString };

package/lib/public/app.js

@@ -1,7 +1,7 @@
 import { showToast, copyToClipboard, escapeHtml } from './modules/utils.js';
 import { refreshIcons, iconHtml, randomThinkingVerb } from './modules/icons.js';
-import { renderMarkdown, highlightCodeBlocks, renderMermaidBlocks, closeMermaidModal } from './modules/markdown.js';
-import { initSidebar, renderSessionList, handleSearchResults, updatePageTitle, getActiveSearchQuery, buildSearchTimeline, removeSearchTimeline, populateCliSessionList, renderIconStrip, initIconStrip, getEmojiCategories } from './modules/sidebar.js';
+import { renderMarkdown, highlightCodeBlocks, renderMermaidBlocks, closeMermaidModal, parseEmojis } from './modules/markdown.js';
+import { initSidebar, renderSessionList, handleSearchResults, updateSessionPresence, updatePageTitle, getActiveSearchQuery, buildSearchTimeline, removeSearchTimeline, populateCliSessionList, renderIconStrip, renderSidebarPresence, initIconStrip, getEmojiCategories } from './modules/sidebar.js';
 import { initRewind, setRewindMode, showRewindModal, clearPendingRewindUuid, addRewindButton } from './modules/rewind.js';
 import { initNotifications, showDoneNotification, playDoneSound, isNotifAlertEnabled, isNotifSoundEnabled } from './modules/notifications.js';
 import { initInput, clearPendingImages, handleInputSync, autoResize, builtinCommands, sendMessage } from './modules/input.js';
@@ -19,6 +19,7 @@ import { initAsciiLogo, startLogoAnimation, stopLogoAnimation } from './modules/
 import { initPlaybook, openPlaybook, getPlaybooks, getPlaybookForTip, isCompleted as isPlaybookCompleted } from './modules/playbook.js';
 import { initSTT } from './modules/stt.js';
 import { initProfile } from './modules/profile.js';
+import { initAdmin, checkAdminAccess } from './modules/admin.js';
 
 // --- Base path for multi-project routing ---
   var slugMatch = location.pathname.match(/^\/p\/([a-z0-9_-]+)/);
@@ -598,12 +599,37 @@ import { initProfile } from './modules/profile.js';
     } else if (projectHint) {
       projectHint.classList.add("hidden");
     }
+    // Update topbar with server-wide presence
+    if (msg.serverUsers) {
+      renderTopbarPresence(msg.serverUsers);
+    }
+  }
+
+  function renderTopbarPresence(serverUsers) {
+    var countEl = document.getElementById("client-count");
+    if (!countEl) return;
+    if (serverUsers.length > 1) {
+      countEl.innerHTML = "";
+      for (var cui = 0; cui < serverUsers.length; cui++) {
+        var cu = serverUsers[cui];
+        var cuImg = document.createElement("img");
+        cuImg.className = "client-avatar";
+        cuImg.src = "https://api.dicebear.com/9.x/" + (cu.avatarStyle || "thumbs") + "/svg?seed=" + encodeURIComponent(cu.avatarSeed || cu.username) + "&size=24";
+        cuImg.alt = cu.displayName;
+        cuImg.dataset.tip = cu.displayName + " (@" + cu.username + ")";
+        if (cui > 0) cuImg.style.marginLeft = "-6px";
+        countEl.appendChild(cuImg);
+      }
+      countEl.classList.remove("hidden");
+    } else {
+      countEl.classList.add("hidden");
+    }
   }
 
   function renderProjectList() {
     // Render icon strip projects
     var iconStripProjects = cachedProjects.map(function (p) {
-      return { slug: p.slug, name: p.title || p.project, icon: p.icon || null, isProcessing: p.isProcessing };
+      return { slug: p.slug, name: p.title || p.project, icon: p.icon || null, isProcessing: p.isProcessing, onlineUsers: p.onlineUsers || [] };
     });
     renderIconStrip(iconStripProjects, currentSlug);
     // Update title bar project name and icon if it changed
@@ -617,7 +643,7 @@ import { initProfile } from './modules/profile.js';
           var pIcon = cachedProjects[pi].icon || null;
           if (pIcon) {
             tbIcon.textContent = pIcon;
-
+            parseEmojis(tbIcon);
             tbIcon.classList.add("has-icon");
             try { localStorage.setItem("clay-project-icon-" + (currentSlug || "default"), pIcon); } catch (e) {}
           } else {
@@ -736,7 +762,7 @@ import { initProfile } from './modules/profile.js';
       var _tbi = $("title-bar-project-icon");
       if (_tbi) {
         _tbi.textContent = _cachedProjectIcon;
-
+        parseEmojis(_tbi);
         _tbi.classList.add("has-icon");
       }
     }
@@ -936,6 +962,8 @@ import { initProfile } from './modules/profile.js';
     showHomeHub: function () { showHomeHub(); },
     openRalphWizard: function () { openRalphWizard(); },
     getUpcomingSchedules: getUpcomingSchedules,
+    get multiUser() { return isMultiUserMode; },
+    get myUserId() { return myUserId; },
   };
   initSidebar(sidebarCtx);
   initIconStrip(sidebarCtx);
@@ -2615,14 +2643,20 @@ import { initProfile } from './modules/profile.js';
           break;
 
         case "client_count":
-          var countEl = document.getElementById("client-count");
-          if (countEl) {
-            if (msg.count > 1) {
-              countEl.textContent = msg.count;
-              countEl.dataset.tip = msg.count + " devices connected";
-              countEl.classList.remove("hidden");
-            } else {
-              countEl.classList.add("hidden");
+          // Sidebar presence: current project's online users
+          if (msg.users) {
+            renderSidebarPresence(msg.users);
+          }
+          // Non-multi-user mode: simple count in topbar
+          if (!msg.users) {
+            var countEl = document.getElementById("client-count");
+            if (countEl) {
+              if (msg.count > 1) {
+                countEl.textContent = msg.count;
+                countEl.classList.remove("hidden");
+              } else {
+                countEl.classList.add("hidden");
+              }
             }
           }
           break;
@@ -2693,6 +2727,10 @@ import { initProfile } from './modules/profile.js';
           renderSessionList(msg.sessions || []);
           break;
 
+        case "session_presence":
+          updateSessionPresence(msg.presence || {});
+          break;
+
         case "session_io":
           blinkSessionDot(msg.id);
           break;
@@ -3453,6 +3491,26 @@ import { initProfile } from './modules/profile.js';
     basePath: basePath,
   });
 
+  // --- Admin (multi-user mode) ---
+  var isMultiUserMode = false;
+  var myUserId = null;
+  initAdmin({
+    get projectList() { return cachedProjects; },
+  });
+  fetch("/api/me").then(function (r) { return r.json(); }).then(function (d) {
+    if (d.multiUser) isMultiUserMode = true;
+    if (d.user && d.user.id) myUserId = d.user.id;
+  }).catch(function () {});
+  // Hide server settings and update controls for non-admin users in multi-user mode
+  checkAdminAccess().then(function (isAdmin) {
+    if (isMultiUserMode && !isAdmin) {
+      var settingsBtn = document.getElementById("server-settings-btn");
+      if (settingsBtn) settingsBtn.style.display = "none";
+      var updatePill = document.getElementById("update-pill-wrap");
+      if (updatePill) updatePill.style.display = "none";
+    }
+  });
+
   // --- Notifications module (viewport, banners, notifications, debug, service worker) ---
   initNotifications({
     $: $,
@@ -3725,12 +3783,14 @@ import { initProfile } from './modules/profile.js';
 
   function updateRalphBars() {
     var onCraftingSession = ralphCraftingSessionId && activeSessionId === ralphCraftingSessionId;
+    // If approval phase but no craftingSessionId (recovered after server restart), show bar anyway
+    var recoveredApproval = ralphPhase === "approval" && !ralphCraftingSessionId;
     if (ralphPhase === "crafting" && onCraftingSession) {
       showRalphCraftingBar(true);
     } else {
       showRalphCraftingBar(false);
     }
-    if (ralphPhase === "approval" && onCraftingSession) {
+    if (ralphPhase === "approval" && (onCraftingSession || recoveredApproval)) {
       showRalphApprovalBar(true);
     } else {
       showRalphApprovalBar(false);