clay-server 2.26.1-beta.1 → 2.27.0-beta.10

package/lib/project-connection.js

@@ -0,0 +1,259 @@
+var fs = require("fs");
+var path = require("path");
+var usersModule = require("./users");
+var userPresence = require("./user-presence");
+
+/**
+ * Attach connection/disconnection handlers to a project context.
+ *
+ * ctx fields:
+ *   cwd, slug, isMate, osUsers, debug, dangerouslySkipPermissions,
+ *   currentVersion, lanHost, sm, tm, nm, clients, send, sendTo,
+ *   opts, loopState, loopRegistry, _loop, pushModule,
+ *   hydrateImageRefs, broadcastClientCount, broadcastPresence,
+ *   getProjectList, getHubSchedules, loadContextSources,
+ *   restoreDebateState, handleMessage, handleDisconnection,
+ *   stopFileWatch, stopAllDirWatches,
+ *   getProjectOwnerId, setProjectOwnerId, getLatestVersion,
+ *   getTitle, getProject
+ */
+function attachConnection(ctx) {
+  var cwd = ctx.cwd;
+  var slug = ctx.slug;
+  var isMate = ctx.isMate;
+  var osUsers = ctx.osUsers;
+  var debug = ctx.debug;
+  var dangerouslySkipPermissions = ctx.dangerouslySkipPermissions;
+  var currentVersion = ctx.currentVersion;
+  var lanHost = ctx.lanHost;
+  var sm = ctx.sm;
+  var tm = ctx.tm;
+  var nm = ctx.nm;
+  var clients = ctx.clients;
+  var send = ctx.send;
+  var sendTo = ctx.sendTo;
+  var opts = ctx.opts;
+  var _loop = ctx._loop;
+  var hydrateImageRefs = ctx.hydrateImageRefs;
+  var broadcastClientCount = ctx.broadcastClientCount;
+  var broadcastPresence = ctx.broadcastPresence;
+  var getProjectList = ctx.getProjectList;
+  var getHubSchedules = ctx.getHubSchedules;
+  var loadContextSources = ctx.loadContextSources;
+  var restoreDebateState = ctx.restoreDebateState;
+  var stopFileWatch = ctx.stopFileWatch;
+  var stopAllDirWatches = ctx.stopAllDirWatches;
+  var getProjectOwnerId = ctx.getProjectOwnerId;
+  var setProjectOwnerId = ctx.setProjectOwnerId;
+  var getLatestVersion = ctx.getLatestVersion;
+  var getTitle = ctx.getTitle;
+  var getProject = ctx.getProject;
+
+  function handleConnection(ws, wsUser, handleMessage, handleDisconnection) {
+    ws._clayUser = wsUser || null;
+    clients.add(ws);
+    broadcastClientCount();
+
+    var loopState = _loop.loopState;
+    var loopRegistry = _loop.loopRegistry;
+
+    // Resume loop if server restarted mid-execution (deferred so client gets initial state first)
+    if (loopState._needsResume) {
+      delete loopState._needsResume;
+      setTimeout(function() { _loop.resumeLoop(); }, 500);
+    }
+
+    // Auto-assign owner if project has none and a user connects (e.g. IPC-added projects)
+    var projectOwnerId = getProjectOwnerId();
+    if (!projectOwnerId && ws._clayUser && ws._clayUser.id && !isMate) {
+      setProjectOwnerId(ws._clayUser.id);
+      projectOwnerId = ws._clayUser.id;
+      if (opts.onProjectOwnerChanged) {
+        opts.onProjectOwnerChanged(slug, projectOwnerId);
+      }
+      console.log("[project] Auto-assigned owner for " + slug + ": " + projectOwnerId);
+    }
+
+    // Send cached state
+    var _userId = ws._clayUser ? ws._clayUser.id : null;
+    var _filteredProjects = getProjectList(_userId);
+    var title = getTitle();
+    var project = getProject();
+    sendTo(ws, { type: "info", cwd: cwd, slug: slug, project: title || project, version: currentVersion, debug: !!debug, dangerouslySkipPermissions: dangerouslySkipPermissions, osUsers: osUsers, lanHost: lanHost, projectCount: _filteredProjects.length, projects: _filteredProjects, projectOwnerId: projectOwnerId });
+    var latestVersion = getLatestVersion();
+    if (latestVersion && ws._clayUser && ws._clayUser.role === "admin") {
+      sendTo(ws, { type: "update_available", version: latestVersion });
+    }
+    if (sm.slashCommands) {
+      sendTo(ws, { type: "slash_commands", commands: sm.slashCommands });
+    }
+    if (sm.currentModel) {
+      sendTo(ws, { type: "model_info", model: sm.currentModel, models: sm.availableModels || [] });
+    }
+    sendTo(ws, { type: "config_state", model: sm.currentModel || "", mode: sm.currentPermissionMode || "default", effort: sm.currentEffort || "medium", betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
+    sendTo(ws, { type: "term_list", terminals: tm.list() });
+    var restoredSources = loadContextSources(slug);
+    sendTo(ws, { type: "context_sources_state", active: restoredSources });
+    sendTo(ws, { type: "notes_list", notes: nm.list() });
+    sendTo(ws, { type: "loop_registry_updated", records: getHubSchedules() });
+    _loop.sendConnectionState(ws);
+
+    // Session list (filtered for access control)
+    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" });
+      });
+    } else if (!usersModule.isMultiUser()) {
+      allSessions = allSessions.filter(function (s) { return !s.ownerId; });
+    }
+    sendTo(ws, {
+      type: "session_list",
+      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);
+          if (rec) {
+            if (rec.name) loop.name = rec.name;
+            if (rec.source) loop.source = rec.source;
+          }
+        }
+        return {
+          id: s.localId,
+          cliSessionId: s.cliSessionId || null,
+          title: s.title || "New Session",
+          active: s.localId === sm.activeSessionId,
+          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 from server-side presence
+    var active = null;
+    var presenceKey = wsUser ? wsUser.id : "_default";
+    var storedPresence = userPresence.getPresence(slug, presenceKey);
+    if (storedPresence && storedPresence.sessionId) {
+      if (sm.sessions.has(storedPresence.sessionId)) {
+        active = sm.sessions.get(storedPresence.sessionId);
+      } else {
+        sm.sessions.forEach(function (s) {
+          if (s.cliSessionId && s.cliSessionId === storedPresence.sessionId) active = s;
+        });
+      }
+      if (active && usersModule.isMultiUser() && wsUser) {
+        if (!usersModule.canAccessSession(wsUser.id, active, { visibility: "public" })) active = null;
+      } else if (active && !usersModule.isMultiUser() && active.ownerId) {
+        active = null;
+      }
+    }
+    if (!active && allSessions.length > 0) {
+      active = allSessions[0];
+      for (var fi = 1; fi < allSessions.length; fi++) {
+        if ((allSessions[fi].lastActivity || 0) > (active.lastActivity || 0)) {
+          active = allSessions[fi];
+        }
+      }
+    }
+    var autoCreated = false;
+    if (!active) {
+      var autoOpts = {};
+      if (wsUser && usersModule.isMultiUser()) autoOpts.ownerId = wsUser.id;
+      active = sm.createSession(autoOpts, ws);
+      autoCreated = true;
+    }
+    if (active && !autoCreated) {
+      if (!active.ownerId && wsUser && usersModule.isMultiUser()) {
+        active.ownerId = wsUser.id;
+        sm.saveSessionFile(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;
+      var fromIndex = 0;
+      if (total > sm.HISTORY_PAGE_SIZE) {
+        fromIndex = sm.findTurnBoundary(active.history, Math.max(0, total - sm.HISTORY_PAGE_SIZE));
+      }
+      sendTo(ws, { type: "history_meta", total: total, from: fromIndex });
+      for (var i = fromIndex; i < total; i++) {
+        sendTo(ws, hydrateImageRefs(active.history[i]));
+      }
+      var _lastUsage = null, _lastModelUsage = null, _lastCost = null, _lastStreamInputTokens = null;
+      for (var _ri = total - 1; _ri >= 0; _ri--) {
+        if (active.history[_ri].type === "result") {
+          var _r = active.history[_ri];
+          _lastUsage = _r.usage || null;
+          _lastModelUsage = _r.modelUsage || null;
+          _lastCost = _r.cost != null ? _r.cost : null;
+          _lastStreamInputTokens = _r.lastStreamInputTokens || null;
+          break;
+        }
+      }
+      sendTo(ws, { type: "history_done", lastUsage: _lastUsage, lastModelUsage: _lastModelUsage, lastCost: _lastCost, lastStreamInputTokens: _lastStreamInputTokens, contextUsage: active.lastContextUsage || null });
+
+      if (active.isProcessing) {
+        sendTo(ws, { type: "status", status: "processing" });
+      }
+      var pendingIds = Object.keys(active.pendingPermissions);
+      for (var pi = 0; pi < pendingIds.length; pi++) {
+        var p = active.pendingPermissions[pendingIds[pi]];
+        sendTo(ws, {
+          type: "permission_request_pending",
+          requestId: p.requestId,
+          toolName: p.toolName,
+          toolInput: p.toolInput,
+          toolUseId: p.toolUseId,
+          decisionReason: p.decisionReason,
+          mateId: p.mateId || undefined,
+        });
+      }
+    }
+
+    if (active) {
+      userPresence.setPresence(slug, presenceKey, active.localId, storedPresence ? storedPresence.mateDm : null);
+    }
+    if (storedPresence && storedPresence.mateDm && !isMate) {
+      sendTo(ws, { type: "restore_mate_dm", mateId: storedPresence.mateDm });
+    }
+
+    broadcastPresence();
+    restoreDebateState(ws);
+
+    ws.on("message", function (raw) {
+      var msg;
+      try { msg = JSON.parse(raw.toString()); } catch (e) { return; }
+      handleMessage(ws, msg);
+    });
+
+    ws.on("close", function () {
+      handleDisconnection(ws);
+    });
+  }
+
+  function handleDisconnection(ws) {
+    if (ws._clayActiveSession) {
+      var dcPresKey = ws._clayUser ? ws._clayUser.id : "_default";
+      var dcExisting = userPresence.getPresence(slug, dcPresKey);
+      userPresence.setPresence(slug, dcPresKey, ws._clayActiveSession, dcExisting ? dcExisting.mateDm : null);
+    }
+    tm.detachAll(ws);
+    clients.delete(ws);
+    if (clients.size === 0) {
+      stopFileWatch();
+      stopAllDirWatches();
+    }
+    broadcastClientCount();
+    broadcastPresence();
+  }
+
+  return {
+    handleConnection: handleConnection,
+    handleDisconnection: handleDisconnection,
+  };
+}
+
+module.exports = { attachConnection: attachConnection };

package/lib/project-debate.js

@@ -299,6 +299,10 @@ function attachDebate(ctx) {
             }),
           };
           ctx.sendToSession(session.localId, briefReadyMsg);
+          // Also send to setup session if client switched there (quickStart flow)
+          if (debate.setupSessionId && debate.setupSessionId !== session.localId) {
+            ctx.sendToSession(debate.setupSessionId, briefReadyMsg);
+          }
         } else {
           console.log("[debate] Brief picked up, transitioning to live. Topic:", debate.topic);
           // Transition to live (standard flow via modal/skill)
@@ -530,6 +534,8 @@ function attachDebate(ctx) {
     ctx.sm.switchSession(setupSession.localId, null, ctx.hydrateImageRefs);
     debate.setupSessionId = setupSession.localId;
     debate.setupStartedAt = setupSession.loop.startedAt;
+    // Share debate state with setup session so confirm_brief works from either
+    setupSession._debate = debate;
 
     // Build DM conversation context for the moderator
     var dmContext = msg.dmContext || "";
@@ -715,6 +721,13 @@ function attachDebate(ctx) {
     ctx.send({ type: "mention_processing", mateId: mateId, active: active });
   }
 
+  // Persist a debate message to session history and send to clients
+  function debateSendAndRecord(session, msg) {
+    session.history.push(msg);
+    ctx.sm.appendToSessionFile(session, msg);
+    ctx.sendToSession(session.localId, msg);
+  }
+
   // --- Live debate ---
 
   function startDebateLive(session) {
@@ -765,7 +778,7 @@ function attachDebate(ctx) {
 
     // Signal moderator's first turn
     debateMateProcessing(debate.moderatorId, true);
-    ctx.sendToSession(debateSession.localId, {
+    debateSendAndRecord(debateSession, {
       type: "debate_turn",
       mateId: debate.moderatorId,
       mateName: moderatorProfile.name,
@@ -792,7 +805,7 @@ function attachDebate(ctx) {
       },
       onDelta: function (delta) {
         if (debateSession._debate && debateSession._debate.phase !== "ended") {
-          ctx.sendToSession(debateSession.localId, { type: "debate_stream", mateId: debate.moderatorId, mateName: moderatorProfile.name, delta: delta });
+          debateSendAndRecord(debateSession, { type: "debate_stream", mateId: debate.moderatorId, mateName: moderatorProfile.name, delta: delta });
         }
       },
       onDone: function (fullText) {
@@ -900,7 +913,7 @@ function attachDebate(ctx) {
 
     // Notify clients of new turn
     debateMateProcessing(mateId, true);
-    ctx.sendToSession(session.localId, {
+    debateSendAndRecord(session, {
       type: "debate_turn",
       mateId: mateId,
       mateName: profile.name,
@@ -920,7 +933,7 @@ function attachDebate(ctx) {
       onDelta: function (delta) {
         if (session._debate && session._debate.phase !== "ended") {
           debate._currentTurnText += delta;
-          ctx.sendToSession(session.localId, { type: "debate_stream", mateId: mateId, mateName: profile.name, delta: delta });
+          debateSendAndRecord(session, { type: "debate_stream", mateId: mateId, mateName: profile.name, delta: delta });
         }
       },
       onDone: function (fullText) {
@@ -1065,7 +1078,7 @@ function attachDebate(ctx) {
 
     // Notify clients of moderator turn
     debateMateProcessing(debate.moderatorId, true);
-    ctx.sendToSession(session.localId, {
+    debateSendAndRecord(session, {
       type: "debate_turn",
       mateId: debate.moderatorId,
       mateName: moderatorProfile.name,
@@ -1095,7 +1108,7 @@ function attachDebate(ctx) {
       },
       onDelta: function (delta) {
         if (session._debate && session._debate.phase !== "ended") {
-          ctx.sendToSession(session.localId, { type: "debate_stream", mateId: debate.moderatorId, mateName: moderatorProfile.name, delta: delta });
+          debateSendAndRecord(session, { type: "debate_stream", mateId: debate.moderatorId, mateName: moderatorProfile.name, delta: delta });
         }
       },
       onDone: function (fullText) {
@@ -1162,7 +1175,7 @@ function attachDebate(ctx) {
     debate.turnInProgress = true;
     var moderatorProfile = ctx.getMateProfile(debate.mateCtx, debate.moderatorId);
 
-    ctx.sendToSession(session.localId, {
+    debateSendAndRecord(session, {
       type: "debate_turn",
       mateId: debate.moderatorId,
       mateName: moderatorProfile.name,
@@ -1201,7 +1214,7 @@ function attachDebate(ctx) {
     debate.turnInProgress = true;
     var moderatorProfile = ctx.getMateProfile(debate.mateCtx, debate.moderatorId);
 
-    ctx.sendToSession(session.localId, {
+    debateSendAndRecord(session, {
       type: "debate_turn",
       mateId: debate.moderatorId,
       mateName: moderatorProfile.name,
@@ -1232,7 +1245,7 @@ function attachDebate(ctx) {
       },
       onDelta: function (delta) {
         if (session._debate && session._debate.phase !== "ended") {
-          ctx.sendToSession(session.localId, { type: "debate_stream", mateId: debate.moderatorId, mateName: moderatorProfile.name, delta: delta });
+          debateSendAndRecord(session, { type: "debate_stream", mateId: debate.moderatorId, mateName: moderatorProfile.name, delta: delta });
         }
       },
       onDone: function (fullText) {
@@ -1281,7 +1294,7 @@ function attachDebate(ctx) {
     var moderatorProfile = ctx.getMateProfile(debate.mateCtx, debate.moderatorId);
 
     debateMateProcessing(debate.moderatorId, true);
-    ctx.sendToSession(session.localId, {
+    debateSendAndRecord(session, {
       type: "debate_turn",
       mateId: debate.moderatorId,
       mateName: moderatorProfile.name,
@@ -1471,7 +1484,7 @@ function attachDebate(ctx) {
 
       debate.turnInProgress = true;
       debateMateProcessing(debate.moderatorId, true);
-      ctx.sendToSession(session.localId, {
+      debateSendAndRecord(session, {
         type: "debate_turn",
         mateId: debate.moderatorId,
         mateName: moderatorProfile.name,
@@ -1519,7 +1532,7 @@ function attachDebate(ctx) {
           },
           onDelta: function (delta) {
             if (session._debate && session._debate.phase !== "ended") {
-              ctx.sendToSession(session.localId, { type: "debate_stream", mateId: debate.moderatorId, mateName: moderatorProfile.name, delta: delta });
+              debateSendAndRecord(session, { type: "debate_stream", mateId: debate.moderatorId, mateName: moderatorProfile.name, delta: delta });
             }
           },
           onDone: function (fullText) {

package/lib/project-file-watch.js

@@ -0,0 +1,120 @@
+var fs = require("fs");
+var path = require("path");
+
+/**
+ * Attach file/directory watcher engine to a project context.
+ *
+ * ctx fields:
+ *   cwd, send, safePath, BINARY_EXTS, FS_MAX_SIZE, IGNORED_DIRS
+ */
+function attachFileWatch(ctx) {
+  var cwd = ctx.cwd;
+  var send = ctx.send;
+  var safePath = ctx.safePath;
+  var BINARY_EXTS = ctx.BINARY_EXTS;
+  var FS_MAX_SIZE = ctx.FS_MAX_SIZE;
+  var IGNORED_DIRS = ctx.IGNORED_DIRS;
+
+  // --- File watcher ---
+  var fileWatcher = null;
+  var watchedPath = null;
+  var watchDebounce = null;
+
+  function startFileWatch(relPath) {
+    var absPath = safePath(cwd, relPath);
+    if (!absPath) return;
+    if (watchedPath === relPath) return;
+    stopFileWatch();
+    watchedPath = relPath;
+    try {
+      fileWatcher = fs.watch(absPath, function () {
+        clearTimeout(watchDebounce);
+        watchDebounce = setTimeout(function () {
+          try {
+            var stat = fs.statSync(absPath);
+            var ext = path.extname(absPath).toLowerCase();
+            if (stat.size > FS_MAX_SIZE || BINARY_EXTS.has(ext)) return;
+            var content = fs.readFileSync(absPath, "utf8");
+            send({ type: "fs_file_changed", path: relPath, content: content, size: stat.size });
+          } catch (e) {
+            stopFileWatch();
+          }
+        }, 200);
+      });
+      fileWatcher.on("error", function () { stopFileWatch(); });
+    } catch (e) {
+      watchedPath = null;
+    }
+  }
+
+  function stopFileWatch() {
+    if (fileWatcher) {
+      try { fileWatcher.close(); } catch (e) {}
+      fileWatcher = null;
+    }
+    clearTimeout(watchDebounce);
+    watchDebounce = null;
+    watchedPath = null;
+  }
+
+  // --- Directory watcher ---
+  var dirWatchers = {};  // relPath -> { watcher, debounce }
+
+  function startDirWatch(relPath) {
+    if (dirWatchers[relPath]) return;
+    var absPath = safePath(cwd, relPath);
+    if (!absPath) return;
+    try {
+      var debounce = null;
+      var watcher = fs.watch(absPath, function () {
+        clearTimeout(debounce);
+        debounce = setTimeout(function () {
+          // Re-read directory and broadcast to all clients
+          try {
+            var items = fs.readdirSync(absPath, { withFileTypes: true });
+            var entries = [];
+            for (var i = 0; i < items.length; i++) {
+              if (items[i].isDirectory() && IGNORED_DIRS.has(items[i].name)) continue;
+              entries.push({
+                name: items[i].name,
+                type: items[i].isDirectory() ? "dir" : "file",
+                path: path.relative(cwd, path.join(absPath, items[i].name)).split(path.sep).join("/"),
+              });
+            }
+            send({ type: "fs_dir_changed", path: relPath, entries: entries });
+          } catch (e) {
+            stopDirWatch(relPath);
+          }
+        }, 300);
+      });
+      watcher.on("error", function () { stopDirWatch(relPath); });
+      dirWatchers[relPath] = { watcher: watcher, debounce: debounce };
+    } catch (e) {}
+  }
+
+  function stopDirWatch(relPath) {
+    var entry = dirWatchers[relPath];
+    if (entry) {
+      clearTimeout(entry.debounce);
+      try { entry.watcher.close(); } catch (e) {}
+      delete dirWatchers[relPath];
+    }
+  }
+
+  function stopAllDirWatches() {
+    var paths = Object.keys(dirWatchers);
+    for (var i = 0; i < paths.length; i++) {
+      stopDirWatch(paths[i]);
+    }
+  }
+
+  return {
+    startFileWatch: startFileWatch,
+    stopFileWatch: stopFileWatch,
+    startDirWatch: startDirWatch,
+    stopDirWatch: stopDirWatch,
+    stopAllDirWatches: stopAllDirWatches,
+  };
+}
+
+module.exports = { attachFileWatch: attachFileWatch };