clay-server 2.18.0-beta.9 → 2.18.0

package/lib/public/modules/sidebar.js

@@ -19,6 +19,7 @@ var searchMatchIds = null; // null = no search, Set of matched session IDs
 var searchDebounce = null;
 var cachedSessions = [];
 var expandedLoopGroups = new Set();
+var expandedLoopRuns = new Set();
 
 // --- Cached project data for mobile sheet ---
 var cachedProjectList = [];
@@ -309,39 +310,52 @@ function renderLoopChild(s) {
 
 function renderLoopGroup(loopId, children, groupKey) {
   var gk = groupKey || loopId;
-  // Sort children by iteration then role (coder before judge)
-  children.sort(function (a, b) {
-    var ai = (a.loop && a.loop.iteration) || 0;
-    var bi = (b.loop && b.loop.iteration) || 0;
-    if (ai !== bi) return ai - bi;
-    // coder before judge within same iteration
-    var ar = (a.loop && a.loop.role === "judge") ? 1 : 0;
-    var br = (b.loop && b.loop.role === "judge") ? 1 : 0;
-    return ar - br;
-  });
+
+  // Sub-group children by startedAt (each run)
+  var runMap = {};
+  for (var i = 0; i < children.length; i++) {
+    var runKey = String(children[i].loop && children[i].loop.startedAt || 0);
+    if (!runMap[runKey]) runMap[runKey] = [];
+    runMap[runKey].push(children[i]);
+  }
+  var runKeys = Object.keys(runMap);
+
+  // Sort each run's children by iteration then role
+  for (var ri = 0; ri < runKeys.length; ri++) {
+    runMap[runKeys[ri]].sort(function (a, b) {
+      var ai = (a.loop && a.loop.iteration) || 0;
+      var bi = (b.loop && b.loop.iteration) || 0;
+      if (ai !== bi) return ai - bi;
+      var ar = (a.loop && a.loop.role === "judge") ? 1 : 0;
+      var br = (b.loop && b.loop.role === "judge") ? 1 : 0;
+      return ar - br;
+    });
+  }
+
+  // Sort runs by startedAt descending (newest first)
+  runKeys.sort(function (a, b) { return Number(b) - Number(a); });
 
   var expanded = expandedLoopGroups.has(gk);
   var hasActive = false;
   var anyProcessing = false;
   var latestSession = children[0];
-  for (var i = 0; i < children.length; i++) {
-    if (children[i].active) hasActive = true;
-    if (children[i].isProcessing) anyProcessing = true;
-    if ((children[i].lastActivity || 0) > (latestSession.lastActivity || 0)) {
-      latestSession = children[i];
+  for (var ci = 0; ci < children.length; ci++) {
+    if (children[ci].active) hasActive = true;
+    if (children[ci].isProcessing) anyProcessing = true;
+    if ((children[ci].lastActivity || 0) > (latestSession.lastActivity || 0)) {
+      latestSession = children[ci];
     }
   }
 
   var loopName = (children[0].loop && children[0].loop.name) || "Ralph Loop";
   var isRalph = children[0].loop && children[0].loop.source === "ralph";
   var isCrafting = false;
-  var maxIter = 0;
   for (var j = 0; j < children.length; j++) {
-    var iter = (children[j].loop && children[j].loop.iteration) || 0;
-    if (iter > maxIter) maxIter = iter;
     if (children[j].loop && children[j].loop.role === "crafting") isCrafting = true;
   }
 
+  var runCount = runKeys.length;
+
   var wrapper = document.createElement("div");
   wrapper.className = "session-loop-wrapper";
 
@@ -378,7 +392,8 @@ function renderLoopGroup(loopId, children, groupKey) {
   if (isCrafting && children.length === 1) {
     textHtml += '<span class="session-loop-badge crafting">Crafting</span>';
   } else {
-    textHtml += '<span class="session-loop-count' + (isRalph ? "" : " scheduled") + '">' + children.length + '</span>';
+    var countLabel = runCount === 1 ? children.length : runCount + (runCount === 1 ? " run" : " runs");
+    textHtml += '<span class="session-loop-count' + (isRalph ? "" : " scheduled") + '">' + countLabel + '</span>';
   }
   textSpan.innerHTML = textHtml;
   el.appendChild(textSpan);
@@ -396,7 +411,7 @@ function renderLoopGroup(loopId, children, groupKey) {
   })(loopId, loopName, children.length, moreBtn));
   el.appendChild(moreBtn);
 
-  // Click row (not chevron/more) → switch to latest session
+  // Click row (not chevron/more) -> switch to latest session
   el.addEventListener("click", (function (id) {
     return function () {
       if (ctx.ws && ctx.connected) {
@@ -409,12 +424,98 @@ function renderLoopGroup(loopId, children, groupKey) {
 
   wrapper.appendChild(el);
 
-  // Expanded children
+  // Expanded: show runs as sub-groups
   if (expanded) {
     var childContainer = document.createElement("div");
     childContainer.className = "session-loop-children";
-    for (var k = 0; k < children.length; k++) {
-      childContainer.appendChild(renderLoopChild(children[k]));
+
+    if (runCount === 1) {
+      // Single run: show sessions directly (no extra nesting)
+      var singleRun = runMap[runKeys[0]];
+      for (var sk = 0; sk < singleRun.length; sk++) {
+        childContainer.appendChild(renderLoopChild(singleRun[sk]));
+      }
+    } else {
+      // Multiple runs: render each run as a collapsible sub-group
+      for (var rk = 0; rk < runKeys.length; rk++) {
+        childContainer.appendChild(renderLoopRun(gk, runKeys[rk], runMap[runKeys[rk]], isRalph));
+      }
+    }
+
+    wrapper.appendChild(childContainer);
+  }
+
+  return wrapper;
+}
+
+function renderLoopRun(parentGk, startedAtKey, sessions, isRalph) {
+  var runGk = parentGk + ":" + startedAtKey;
+  var expanded = expandedLoopRuns.has(runGk);
+  var startedAt = Number(startedAtKey);
+  var timeLabel = startedAt ? new Date(startedAt).toLocaleTimeString([], { hour: "2-digit", minute: "2-digit" }) : "Unknown";
+
+  var hasActive = false;
+  var anyProcessing = false;
+  var latestSession = sessions[0];
+  for (var i = 0; i < sessions.length; i++) {
+    if (sessions[i].active) hasActive = true;
+    if (sessions[i].isProcessing) anyProcessing = true;
+    if ((sessions[i].lastActivity || 0) > (latestSession.lastActivity || 0)) {
+      latestSession = sessions[i];
+    }
+  }
+
+  var wrapper = document.createElement("div");
+  wrapper.className = "session-loop-run-wrapper";
+
+  var el = document.createElement("div");
+  el.className = "session-loop-run" + (hasActive ? " active" : "") + (expanded ? " expanded" : "") + (isRalph ? "" : " scheduled");
+
+  var chevron = document.createElement("button");
+  chevron.className = "session-loop-chevron";
+  chevron.innerHTML = iconHtml("chevron-right");
+  chevron.addEventListener("click", (function (rk) {
+    return function (e) {
+      e.stopPropagation();
+      if (expandedLoopRuns.has(rk)) {
+        expandedLoopRuns.delete(rk);
+      } else {
+        expandedLoopRuns.add(rk);
+      }
+      renderSessionList(null);
+    };
+  })(runGk));
+  el.appendChild(chevron);
+
+  var textSpan = document.createElement("span");
+  textSpan.className = "session-item-text";
+  var textHtml = "";
+  if (anyProcessing) {
+    textHtml += '<span class="session-processing"></span>';
+  }
+  textHtml += '<span class="session-loop-run-time">' + escapeHtml(timeLabel) + '</span>';
+  textHtml += '<span class="session-loop-count' + (isRalph ? "" : " scheduled") + '">' + sessions.length + '</span>';
+  textSpan.innerHTML = textHtml;
+  el.appendChild(textSpan);
+
+  // Click row -> switch to latest session of this run
+  el.addEventListener("click", (function (id) {
+    return function () {
+      if (ctx.ws && ctx.connected) {
+        ctx.ws.send(JSON.stringify({ type: "switch_session", id: id }));
+        dismissOverlayPanels();
+        closeSidebar();
+      }
+    };
+  })(latestSession.id));
+
+  wrapper.appendChild(el);
+
+  if (expanded) {
+    var childContainer = document.createElement("div");
+    childContainer.className = "session-loop-children";
+    for (var k = 0; k < sessions.length; k++) {
+      childContainer.appendChild(renderLoopChild(sessions[k]));
     }
     wrapper.appendChild(childContainer);
   }
@@ -493,7 +594,7 @@ export function renderSessionList(sessions) {
   ctx.sessionListEl.innerHTML = "";
 
   // Partition: loop sessions vs normal sessions
-  // Group by loopId + startedAt so different runs of the same task are separate groups
+  // Group by loopId + date so all runs of the same task on the same day are merged
   var loopGroups = {}; // groupKey -> [sessions]
   var normalSessions = [];
   for (var i = 0; i < cachedSessions.length; i++) {
@@ -502,7 +603,9 @@ export function renderSessionList(sessions) {
       // Task crafting sessions live in the scheduler calendar, not the main list
       continue;
     } else if (s.loop && s.loop.loopId) {
-      var groupKey = s.loop.loopId + ":" + (s.loop.startedAt || 0);
+      var startedAt = s.loop.startedAt || 0;
+      var dateStr = startedAt ? new Date(startedAt).toISOString().slice(0, 10) : "unknown";
+      var groupKey = s.loop.loopId + ":" + dateStr;
       if (!loopGroups[groupKey]) loopGroups[groupKey] = [];
       loopGroups[groupKey].push(s);
     } else {
@@ -1665,8 +1768,12 @@ export function initSidebar(_ctx) {
   var sidebarColumn = document.getElementById("sidebar-column");
 
   function syncUserIslandWidth() {
-    if (!userIsland || !sidebarColumn) return;
-    var rect = sidebarColumn.getBoundingClientRect();
+    if (!userIsland) return;
+    var mateSidebarColumn = document.getElementById("mate-sidebar-column");
+    var isMateDM = document.body.classList.contains("mate-dm-active");
+    var col = (isMateDM && mateSidebarColumn && !mateSidebarColumn.classList.contains("hidden")) ? mateSidebarColumn : sidebarColumn;
+    if (!col) return;
+    var rect = col.getBoundingClientRect();
     userIsland.style.width = (rect.right - 8 - 8) + "px";
   }
 
@@ -1919,6 +2026,23 @@ function showIconTooltip(el, text) {
   });
 }
 
+function showIconTooltipHtml(el, html) {
+  hideIconTooltip();
+  var tip = document.createElement("div");
+  tip.className = "icon-strip-tooltip";
+  tip.style.whiteSpace = "normal";
+  tip.style.maxWidth = "260px";
+  tip.innerHTML = html;
+  document.body.appendChild(tip);
+  iconStripTooltip = tip;
+
+  requestAnimationFrame(function () {
+    var rect = el.getBoundingClientRect();
+    tip.style.top = (rect.top + rect.height / 2 - tip.offsetHeight / 2) + "px";
+    tip.classList.add("visible");
+  });
+}
+
 function hideIconTooltip() {
   if (iconStripTooltip) {
     iconStripTooltip.remove();
@@ -3452,7 +3576,13 @@ export function renderUserStrip(allUsers, onlineUserIds, myUserId, dmFavorites,
 
       // Tooltip
       var displayName = mp.displayName || mate.name || "New Mate";
-      el.addEventListener("mouseenter", function () { showIconTooltip(el, displayName); });
+      el.addEventListener("mouseenter", function () {
+        if (mate.bio) {
+          showIconTooltipHtml(el, '<div style="font-weight:600">' + escapeHtml(displayName) + '</div><div style="font-weight:400;font-size:12px;color:var(--text-secondary);margin-top:2px">' + escapeHtml(mate.bio) + '</div>');
+        } else {
+          showIconTooltip(el, displayName);
+        }
+      });
       el.addEventListener("mouseleave", hideIconTooltip);
 
       // Click: open DM with mate

package/lib/public/modules/tools.js

@@ -3,6 +3,7 @@ import { iconHtml, refreshIcons, randomThinkingVerb } from './icons.js';
 import { renderMarkdown, highlightCodeBlocks, renderMermaidBlocks } from './markdown.js';
 import { renderUnifiedDiff, renderSplitDiff, renderPatchDiff } from './diff.js';
 import { openFile } from './filebrowser.js';
+import { mateAvatarUrl } from './avatar.js';
 
 var ctx;
 
@@ -419,7 +420,7 @@ function permissionInputSummary(toolName, input) {
   }
 }
 
-export function renderPermissionRequest(requestId, toolName, toolInput, decisionReason) {
+export function renderPermissionRequest(requestId, toolName, toolInput, decisionReason, mateId) {
   if (pendingPermissions[requestId]) return;
   ctx.finalizeAssistantBlock();
   stopThinking();
@@ -433,7 +434,7 @@ export function renderPermissionRequest(requestId, toolName, toolInput, decision
 
   // Mate DM: render as conversational chat bubble instead of formal dialog
   if (ctx.isMateDm && ctx.isMateDm()) {
-    renderMatePermission(requestId, toolName, toolInput);
+    renderMatePermission(requestId, toolName, toolInput, mateId);
     return;
   }
 
@@ -690,9 +691,18 @@ function matePermissionInfo(toolName, toolInput) {
   return { verb: verb, target: target };
 }
 
-function renderMatePermission(requestId, toolName, toolInput) {
+function renderMatePermission(requestId, toolName, toolInput, mateId) {
   var mateName = ctx.getMateName();
   var mateAvatar = ctx.getMateAvatarUrl();
+
+  // If mateId provided (e.g. @mention in DM), use that mate's info instead of DM target
+  if (mateId && ctx.getMateById) {
+    var mentionMate = ctx.getMateById(mateId);
+    if (mentionMate) {
+      mateName = (mentionMate.profile && mentionMate.profile.displayName) || mentionMate.displayName || mentionMate.name || mateName;
+      mateAvatar = mateAvatarUrl(mentionMate, 36);
+    }
+  }
   var info = matePermissionInfo(toolName, toolInput);
   var askMsg = "Can I " + info.verb + (info.target ? " " + info.target : "") + "?";
 

package/lib/public/modules/tooltip.js

@@ -46,6 +46,8 @@ function convertTitles() {
     "#top-bar [title]",
     ".title-bar-content [title]",
     "#input-area [title]",
+    ".mate-sidebar-actions [title]",
+    "#mate-sidebar-header [title]",
   ];
   var els = document.querySelectorAll(selectors.join(", "));
   for (var i = 0; i < els.length; i++) {

package/lib/public/style.css

@@ -27,3 +27,4 @@
 @import url("css/mates.css");
 @import url("css/command-palette.css");
 @import url("css/mention.css");
+@import url("css/debate.css");

package/lib/scheduler.js

@@ -217,6 +217,62 @@ function createLoopRegistry(opts) {
         }
       }
 
+      // Check recurrenceEnd conditions before triggering
+      if (rec.recurrenceEnd) {
+        var shouldDisable = false;
+        if (rec.recurrenceEnd.type === "until" && rec.recurrenceEnd.date) {
+          var reParts = rec.recurrenceEnd.date.split("-");
+          var endDate = new Date(parseInt(reParts[0], 10), parseInt(reParts[1], 10) - 1, parseInt(reParts[2], 10), 23, 59, 59, 999);
+          if (now > endDate.getTime()) {
+            shouldDisable = true;
+          }
+        } else if (rec.recurrenceEnd.type === "after" && rec.recurrenceEnd.count > 0) {
+          if ((rec.runs || []).length >= rec.recurrenceEnd.count) {
+            shouldDisable = true;
+          }
+        }
+        if (shouldDisable) {
+          rec.enabled = false;
+          rec.nextRunAt = null;
+          save();
+          if (onChange) onChange(records);
+          continue;
+        }
+      }
+
+      // Check intervalEnd conditions before triggering
+      if (rec.intervalEnd) {
+        var skipTrigger = false;
+        if (rec.intervalEnd.type === "until" && rec.intervalEnd.time) {
+          // Stop at a specific time of day
+          var nowDate = new Date(now);
+          var ieParts = rec.intervalEnd.time.split(":");
+          var stopH = parseInt(ieParts[0], 10);
+          var stopM = parseInt(ieParts[1], 10) || 0;
+          var nowMinOfDay = nowDate.getHours() * 60 + nowDate.getMinutes();
+          if (nowMinOfDay >= stopH * 60 + stopM) {
+            skipTrigger = true;
+          }
+        } else if (rec.intervalEnd.type === "after" && rec.intervalEnd.count > 0) {
+          // Stop after N runs today
+          var todayStart = new Date(now);
+          todayStart.setHours(0, 0, 0, 0);
+          var todayStartMs = todayStart.getTime();
+          var todayRuns = (rec.runs || []).filter(function (r) { return r.startedAt >= todayStartMs; });
+          if (todayRuns.length >= rec.intervalEnd.count) {
+            skipTrigger = true;
+          }
+        }
+        if (skipTrigger) {
+          // Advance nextRunAt without triggering
+          if (rec.cron) {
+            rec.nextRunAt = nextRunTime(rec.cron, now);
+          }
+          save();
+          continue;
+        }
+      }
+
       // Update nextRunAt
       rec.lastRunAt = now;
       if (rec.cron) {
@@ -247,7 +303,7 @@ function createLoopRegistry(opts) {
       task: data.task || "",
       cron: data.cron || null,
       enabled: data.cron ? (data.enabled !== false) : false,
-      maxIterations: data.maxIterations || 20,
+      maxIterations: (data.maxIterations >= 1) ? data.maxIterations : 20,
       createdAt: Date.now(),
       updatedAt: Date.now(),
       lastRunAt: null,
@@ -265,6 +321,7 @@ function createLoopRegistry(opts) {
       mode: data.mode || "loop",
       prompt: data.prompt || null,
       skipIfRunning: data.skipIfRunning !== undefined ? data.skipIfRunning : true,
+      intervalEnd: data.intervalEnd || null,
       runs: [],
     };
     if (rec.cron && rec.enabled) {
@@ -301,6 +358,7 @@ function createLoopRegistry(opts) {
     if (data.allDay !== undefined) rec.allDay = data.allDay;
     if (data.linkedTaskId !== undefined) rec.linkedTaskId = data.linkedTaskId;
     if (data.skipIfRunning !== undefined) rec.skipIfRunning = data.skipIfRunning;
+    if (data.intervalEnd !== undefined) rec.intervalEnd = data.intervalEnd;
     rec.updatedAt = Date.now();
     if (rec.cron && rec.enabled) {
       rec.nextRunAt = nextRunTime(rec.cron);

package/lib/sessions.js

@@ -76,7 +76,6 @@ function createSessionManager(opts) {
 
   function saveSessionFile(session) {
     if (!session.cliSessionId) return;
-    session.lastActivity = Date.now();
     try {
       var metaObj = {
         type: "meta",
@@ -89,6 +88,8 @@ function createSessionManager(opts) {
       if (session.sessionVisibility) metaObj.sessionVisibility = session.sessionVisibility;
       if (session.lastRewindUuid) metaObj.lastRewindUuid = session.lastRewindUuid;
       if (session.loop) metaObj.loop = session.loop;
+      if (session.debateState) metaObj.debateState = session.debateState;
+      if (session.debateSetupMode) metaObj.debateSetupMode = true;
       var meta = JSON.stringify(metaObj);
       var lines = [meta];
       for (var i = 0; i < session.history.length; i++) {
@@ -174,6 +175,8 @@ function createSessionManager(opts) {
         lastRewindUuid: m.lastRewindUuid || null,
       };
       if (m.loop) session.loop = m.loop;
+      if (m.debateState) session.debateState = m.debateState;
+      if (m.debateSetupMode) session.debateSetupMode = true;
       if (m.ownerId) session.ownerId = m.ownerId;
       session.sessionVisibility = m.sessionVisibility || "shared";
       sessions.set(localId, session);
@@ -329,7 +332,11 @@ function createSessionManager(opts) {
     _send({ type: "history_meta", total: total, from: fromIndex });
 
     for (var i = fromIndex; i < total; i++) {
-      _send(transform ? transform(session.history[i]) : session.history[i]);
+      var _item = session.history[i];
+      if (_item && (_item.type === "mention_user" || _item.type === "mention_response")) {
+        console.log("[DEBUG replayHistory] sending mention at index=" + i + " from=" + fromIndex + " total=" + total + " type=" + _item.type + " mate=" + (_item.mateName || ""));
+      }
+      _send(transform ? transform(_item) : _item);
     }
 
     // Find the last result message in the full history for accurate context data

package/lib/user-presence.js

@@ -0,0 +1,92 @@
+var fs = require("fs");
+var path = require("path");
+var config = require("./config");
+
+// In-memory store: { slug: { userId: { sessionId, mateDm } } }
+var store = {};
+var presencePath = path.join(config.CONFIG_DIR, "user-presence.json");
+var saveTimer = null;
+
+// Load from disk on startup
+function load() {
+  try {
+    if (fs.existsSync(presencePath)) {
+      var raw = fs.readFileSync(presencePath, "utf8");
+      store = JSON.parse(raw);
+    }
+  } catch (e) {
+    store = {};
+  }
+}
+
+// Debounced save to disk (200ms)
+function scheduleSave() {
+  if (saveTimer) return;
+  saveTimer = setTimeout(function () {
+    saveTimer = null;
+    try {
+      config.ensureConfigDir();
+      fs.writeFileSync(presencePath, JSON.stringify(store, null, 2), "utf8");
+    } catch (e) {
+      // Silently ignore write errors
+    }
+  }, 200);
+}
+
+function setPresence(slug, userId, sessionId, mateDm) {
+  if (!slug || !userId) return;
+  if (!store[slug]) store[slug] = {};
+  store[slug][userId] = {
+    sessionId: sessionId || null,
+    mateDm: mateDm !== undefined ? mateDm : null,
+  };
+  scheduleSave();
+}
+
+function getPresence(slug, userId) {
+  if (!slug || !userId) return null;
+  if (!store[slug]) return null;
+  return store[slug][userId] || null;
+}
+
+function setMateDm(slug, userId, mateDm) {
+  if (!slug || !userId) return;
+  if (!store[slug]) store[slug] = {};
+  var existing = store[slug][userId] || {};
+  store[slug][userId] = {
+    sessionId: existing.sessionId || null,
+    mateDm: mateDm !== undefined ? mateDm : null,
+  };
+  scheduleSave();
+}
+
+function clearPresence(slug, userId) {
+  if (!slug || !userId) return;
+  if (store[slug]) {
+    delete store[slug][userId];
+    if (Object.keys(store[slug]).length === 0) delete store[slug];
+    scheduleSave();
+  }
+}
+
+// Remove all presence entries referencing a deleted session
+function clearSession(slug, sessionId) {
+  if (!slug || !store[slug]) return;
+  var keys = Object.keys(store[slug]);
+  for (var i = 0; i < keys.length; i++) {
+    if (store[slug][keys[i]].sessionId === sessionId) {
+      store[slug][keys[i]].sessionId = null;
+    }
+  }
+  scheduleSave();
+}
+
+load();
+
+module.exports = {
+  setPresence: setPresence,
+  getPresence: getPresence,
+  setMateDm: setMateDm,
+  clearPresence: clearPresence,
+  clearSession: clearSession,
+};

package/package.json

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