clay-server 2.26.0-beta.1 → 2.26.0-beta.10

package/lib/public/modules/input.js

@@ -71,6 +71,21 @@ export var builtinCommands = [
 
 // --- Send ---
 export function sendMessage() {
+  // Debate ended mode intercept: route to resume handler
+  if (ctx.isDebateEndedMode && ctx.isDebateEndedMode() && ctx.handleDebateEndedSend) {
+    ctx.handleDebateEndedSend();
+    return;
+  }
+  // Debate conclude mode intercept: route to conclude handler
+  if (ctx.isDebateConcludeMode && ctx.isDebateConcludeMode() && ctx.handleDebateConcludeSend) {
+    ctx.handleDebateConcludeSend();
+    return;
+  }
+  // Debate floor mode intercept: route to floor response handler
+  if (ctx.isDebateFloorMode && ctx.isDebateFloorMode() && ctx.handleDebateFloorSend) {
+    ctx.handleDebateFloorSend();
+    return;
+  }
   // DM mode intercept: if in DM mode, route to DM handler instead
   if (ctx.isDmMode && ctx.isDmMode() && ctx.handleDmSend) {
     ctx.handleDmSend();
@@ -193,9 +208,11 @@ export function sendMessage() {
   }
   ctx.ws.send(JSON.stringify(payload));
 
-  // Mate DM: show pre-thinking dots after a short delay (before server responds)
+  // Show pre-thinking dots before server responds
   if (ctx.isMateDm && ctx.isMateDm()) {
     ctx.showMatePreThinking();
+  } else if (ctx.showClaudePreThinking) {
+    ctx.showClaudePreThinking();
   }
 
   ctx.inputEl.value = "";

package/lib/public/modules/mate-knowledge.js

@@ -3,7 +3,7 @@ import { hideNotes } from './sticky-notes.js';
 import { hideMemory } from './mate-memory.js';
 import { renderMarkdown, highlightCodeBlocks } from './markdown.js';
 
-var getMateWs = null;
+var getWs = null;
 var filesEl = null;
 var sidebarBtn = null;
 var countBadge = null;
@@ -46,8 +46,8 @@ var dirty = false;
 var mode = "none"; // "none" | "viewer" | "editor"
 var pendingEditMode = false;
 
-export function initMateKnowledge(mateWsGetter) {
-  getMateWs = mateWsGetter;
+export function initMateKnowledge(wsGetter) {
+  getWs = wsGetter;
   filesEl = document.getElementById("mate-knowledge-files");
   sidebarBtn = document.getElementById("mate-knowledge-btn");
   countBadge = document.getElementById("mate-knowledge-count");
@@ -123,7 +123,7 @@ export function initMateKnowledge(mateWsGetter) {
   if (editorDeleteBtn) {
     editorDeleteBtn.addEventListener("click", function () {
       if (editingFile) {
-        var ws = getMateWs ? getMateWs() : null;
+        var ws = getWs ? getWs() : null;
         if (ws && ws.readyState === 1) {
           ws.send(JSON.stringify({ type: "knowledge_delete", name: editingFile }));
         }
@@ -317,7 +317,7 @@ export function isKnowledgeVisible() {
 }
 
 export function requestKnowledgeList() {
-  var ws = getMateWs ? getMateWs() : null;
+  var ws = getWs ? getWs() : null;
   if (ws && ws.readyState === 1) {
     ws.send(JSON.stringify({ type: "knowledge_list" }));
   }
@@ -457,7 +457,7 @@ function renderFileItem(file) {
 
   item.addEventListener("click", (function (f) {
     return function () {
-      var ws = getMateWs ? getMateWs() : null;
+      var ws = getWs ? getWs() : null;
       if (ws && ws.readyState === 1) {
         var msg = { type: "knowledge_read", name: f.name };
         if (f.common) {
@@ -554,7 +554,7 @@ function saveKnowledge() {
     setTimeout(function () { editorNameEl.style.outline = ""; }, 1500);
     return;
   }
-  var ws = getMateWs ? getMateWs() : null;
+  var ws = getWs ? getWs() : null;
   if (ws && ws.readyState === 1) {
     ws.send(JSON.stringify({ type: "knowledge_save", name: name, content: content }));
   }
@@ -720,7 +720,7 @@ function showFileMenu(file, anchorBtn) {
     // Request file content, then open editor directly
     editingCommon = false;
     editingFile = file.name;
-    var ws = getMateWs ? getMateWs() : null;
+    var ws = getWs ? getWs() : null;
     if (ws && ws.readyState === 1) {
       ws.send(JSON.stringify({ type: "knowledge_read", name: file.name }));
       // Override handleKnowledgeContent to go straight to editor
@@ -736,7 +736,7 @@ function showFileMenu(file, anchorBtn) {
     promoteItem.innerHTML = iconHtml("share-2") + "<span>Share to all mates</span>";
     promoteItem.addEventListener("click", function (e) {
       e.stopPropagation();
-      var ws = getMateWs ? getMateWs() : null;
+      var ws = getWs ? getWs() : null;
       if (ws && ws.readyState === 1) {
         ws.send(JSON.stringify({ type: "knowledge_promote", name: file.name }));
       }
@@ -749,7 +749,7 @@ function showFileMenu(file, anchorBtn) {
     depromoteItem.innerHTML = iconHtml("x-circle") + "<span>Unshare</span>";
     depromoteItem.addEventListener("click", function (e) {
       e.stopPropagation();
-      var ws = getMateWs ? getMateWs() : null;
+      var ws = getWs ? getWs() : null;
       if (ws && ws.readyState === 1) {
         ws.send(JSON.stringify({ type: "knowledge_depromote", name: file.name }));
       }
@@ -770,7 +770,7 @@ function showFileMenu(file, anchorBtn) {
     deleteItem.innerHTML = iconHtml("trash-2") + "<span>Delete</span>";
     deleteItem.addEventListener("click", function (e) {
       e.stopPropagation();
-      var ws = getMateWs ? getMateWs() : null;
+      var ws = getWs ? getWs() : null;
       if (ws && ws.readyState === 1) {
         ws.send(JSON.stringify({ type: "knowledge_delete", name: file.name }));
       }

package/lib/public/modules/mate-memory.js

@@ -1,7 +1,7 @@
 import { iconHtml, refreshIcons } from './icons.js';
 import { escapeHtml } from './utils.js';
 
-var getMateWs = null;
+var getWs = null;
 var visible = false;
 var cachedEntries = [];
 var cachedSummary = "";
@@ -24,8 +24,8 @@ var confirmOverlay = null;
 
 var _onShow = null;
 
-export function initMateMemory(mateWsGetter, opts) {
-  getMateWs = mateWsGetter;
+export function initMateMemory(wsGetter, opts) {
+  getWs = wsGetter;
   if (opts && opts.onShow) _onShow = opts.onShow;
 
   sidebarBtn = document.getElementById("mate-memory-btn");
@@ -99,7 +99,7 @@ export function isMemoryVisible() {
 }
 
 function requestMemoryList() {
-  var ws = getMateWs ? getMateWs() : null;
+  var ws = getWs ? getWs() : null;
   if (ws && ws.readyState === 1) {
     ws.send(JSON.stringify({ type: "memory_list" }));
   }
@@ -325,7 +325,7 @@ function confirmDelete(index) {
   deleteBtn.className = "mate-memory-confirm-delete";
   deleteBtn.textContent = "Delete";
   deleteBtn.addEventListener("click", function () {
-    var ws = getMateWs ? getMateWs() : null;
+    var ws = getWs ? getWs() : null;
     if (ws && ws.readyState === 1) {
       ws.send(JSON.stringify({ type: "memory_delete", index: index }));
     }

package/lib/public/modules/mate-sidebar.js

@@ -6,7 +6,7 @@ import { isSchedulerOpen, closeScheduler } from './scheduler.js';
 import { hideNotes } from './sticky-notes.js';
 import { openSearch as openSessionSearch } from './session-search.js';
 
-var getMateWs = null;
+var getWs = null;
 var currentMateId = null;
 var currentMate = null;
 var cachedSessions = [];
@@ -27,8 +27,8 @@ var searchQuery = "";
 var searchMatchIds = null;
 var searchDebounce = null;
 
-export function initMateSidebar(mateWsGetter) {
-  getMateWs = mateWsGetter;
+export function initMateSidebar(wsGetter) {
+  getWs = wsGetter;
   columnEl = document.getElementById("mate-sidebar-column");
   listEl = document.getElementById("mate-session-list");
   avatarEl = document.getElementById("mate-sidebar-avatar");
@@ -37,7 +37,7 @@ export function initMateSidebar(mateWsGetter) {
 
   if (newSessionBtn) {
     newSessionBtn.addEventListener("click", function () {
-      var ws = getMateWs ? getMateWs() : null;
+      var ws = getWs ? getWs() : null;
       if (ws && ws.readyState === 1) {
         ws.send(JSON.stringify({ type: "new_session" }));
       }
@@ -73,7 +73,7 @@ export function initMateSidebar(mateWsGetter) {
         return;
       }
       searchDebounce = setTimeout(function () {
-        var ws = getMateWs ? getMateWs() : null;
+        var ws = getWs ? getWs() : null;
         if (ws && ws.readyState === 1) {
           ws.send(JSON.stringify({ type: "search_sessions", query: q }));
         }
@@ -316,6 +316,10 @@ function spawnSparks(cx, cy) {
   }
 }
 
+export function getMateSessions() {
+  return cachedSessions;
+}
+
 export function hideMateSidebar() {
   currentMateId = null;
   currentMate = null;
@@ -498,7 +502,7 @@ function renderDebateGroup(children, groupKey) {
       hideKnowledge();
       if (isSchedulerOpen()) closeScheduler();
       hideNotes();
-      var ws = getMateWs ? getMateWs() : null;
+      var ws = getWs ? getWs() : null;
       if (ws && ws.readyState === 1) {
         ws.send(JSON.stringify({ type: "switch_session", id: id }));
       }
@@ -534,7 +538,7 @@ function renderDebateGroup(children, groupKey) {
           hideKnowledge();
           if (isSchedulerOpen()) closeScheduler();
           hideNotes();
-          var ws = getMateWs ? getMateWs() : null;
+          var ws = getWs ? getWs() : null;
           if (ws && ws.readyState === 1) {
             ws.send(JSON.stringify({ type: "switch_session", id: id }));
           }
@@ -580,7 +584,7 @@ function renderMateSessionItem(s) {
       if (isSchedulerOpen()) closeScheduler();
       hideNotes();
       var pendingQuery = searchQuery || "";
-      var ws = getMateWs ? getMateWs() : null;
+      var ws = getWs ? getWs() : null;
       if (ws && ws.readyState === 1) {
         ws.send(JSON.stringify({ type: "switch_session", id: id }));
       }
@@ -642,7 +646,7 @@ function showMateSessionCtxMenu(anchorEl, sessionId, title) {
     overlay.querySelector(".mate-confirm-cancel").addEventListener("click", function () { overlay.remove(); });
     overlay.querySelector(".mate-confirm-delete").addEventListener("click", function () {
       overlay.remove();
-      var ws = getMateWs ? getMateWs() : null;
+      var ws = getWs ? getWs() : null;
       if (ws && ws.readyState === 1) {
         ws.send(JSON.stringify({ type: "delete_session", id: sessionId }));
       }

package/lib/public/modules/mention.js

@@ -176,13 +176,42 @@ function selectMentionItem(idx) {
   hideMentionMenu();
 }
 
+function ensureChipContrast(hex) {
+  if (!hex || hex.charAt(0) !== "#") return hex;
+  var r = parseInt(hex.substring(1, 3), 16);
+  var g = parseInt(hex.substring(3, 5), 16);
+  var b = parseInt(hex.substring(5, 7), 16);
+  // Relative luminance (sRGB)
+  var lum = (0.299 * r + 0.587 * g + 0.114 * b) / 255;
+  var isDark = document.documentElement.classList.contains("dark") ||
+               document.body.classList.contains("dark-mode");
+  if (isDark) {
+    // Dark mode: lighten if too dark
+    return lum < 0.4 ? color_mix_lighten(r, g, b, 0.35) : hex;
+  }
+  // Light mode: darken if too bright
+  return lum > 0.55 ? color_mix_darken(r, g, b, 0.4) : hex;
+}
+
+function color_mix_darken(r, g, b, amount) {
+  var f = 1 - amount;
+  return "#" + [Math.round(r * f), Math.round(g * f), Math.round(b * f)]
+    .map(function (v) { return v.toString(16).padStart(2, "0"); }).join("");
+}
+
+function color_mix_lighten(r, g, b, amount) {
+  return "#" + [Math.round(r + (255 - r) * amount), Math.round(g + (255 - g) * amount), Math.round(b + (255 - b) * amount)]
+    .map(function (v) { return v.toString(16).padStart(2, "0"); }).join("");
+}
+
 function showInputMentionChip(name, color, avatarSrc) {
   removeInputMentionChip();
+  var textColor = ensureChipContrast(color);
   var chip = document.createElement("div");
   chip.id = "input-mention-chip";
   chip.innerHTML =
     '<img class="input-mention-chip-avatar" src="' + escapeHtml(avatarSrc) + '" width="18" height="18" />' +
-    '<span class="input-mention-chip-name" style="color:' + escapeHtml(color) + '">@' + escapeHtml(name) + '</span>' +
+    '<span class="input-mention-chip-name" style="color:' + escapeHtml(textColor) + '">@' + escapeHtml(name) + '</span>' +
     '<button class="input-mention-chip-remove" type="button" aria-label="Remove mention">&times;</button>';
   chip.style.setProperty("--chip-color", color);
 
@@ -277,7 +306,16 @@ export function sendMention(mateId, text, pastes, images) {
 
 // Recreate the mention block if it was lost (e.g. session switch)
 function ensureMentionBlock() {
-  if (currentMentionEl && currentMentionEl.parentNode) return; // still in DOM
+  if (currentMentionEl && currentMentionEl.parentNode) {
+    // If other elements (e.g. permission requests) were added after the mention
+    // block, move it to the bottom to maintain chronological order.
+    var parent = currentMentionEl.parentNode;
+    if (parent.lastElementChild !== currentMentionEl) {
+      parent.appendChild(currentMentionEl);
+      if (ctx.scrollToBottom) ctx.scrollToBottom();
+    }
+    return;
+  }
   if (!activeMentionMeta) return;
   // Recreate from saved meta
   handleMentionStart(activeMentionMeta);

package/lib/public/modules/notifications.js

@@ -1,4 +1,4 @@
-import { copyToClipboard } from './utils.js';
+import { copyToClipboard, showToast } from './utils.js';
 import { iconHtml, refreshIcons } from './icons.js';
 
 var ctx;
@@ -155,6 +155,114 @@ export function initNotifications(_ctx) {
     });
   })();
 
+  // --- Extension pill popover ---
+  (function () {
+    var extPillWrap = $("ext-pill-wrap");
+    var extPillBtn = $("ext-pill");
+    var extPopover = $("ext-popover");
+    var extDownloadBtn = $("ext-download-btn");
+    var extDownloadStatus = $("ext-download-status");
+    var extCopyUrl = $("ext-copy-url");
+    if (!extPillWrap || !extPillBtn || !extPopover) return;
+
+    // Detect extension connection via postMessage from content.js
+    var extConnected = false;
+    var connectedBanner = $("ext-connected-banner");
+    var extDesc = $("ext-popover-desc");
+    var extDivider = $("ext-popover-divider");
+    var extGuideTitle = $("ext-popover-guide-title");
+    var extSteps = extPopover.querySelector(".ext-popover-steps");
+
+    function setExtConnected() {
+      if (extConnected) return;
+      extConnected = true;
+      extPillBtn.classList.add("ext-connected");
+      extPillBtn.innerHTML = '<i data-lucide="check"></i> Extension';
+      refreshIcons(extPillBtn);
+      if (connectedBanner) connectedBanner.classList.remove("hidden");
+      if (extDownloadBtn) extDownloadBtn.style.display = "none";
+      if (extDownloadStatus) extDownloadStatus.classList.add("hidden");
+      if (extDesc) extDesc.style.display = "none";
+      if (extDivider) extDivider.style.display = "none";
+      if (extGuideTitle) extGuideTitle.style.display = "none";
+      if (extSteps) extSteps.style.display = "none";
+    }
+
+    window.addEventListener("message", function (event) {
+      if (event.source !== window) return;
+      if (!event.data || event.data.source !== "clay-chrome-extension") return;
+      setExtConnected();
+    });
+
+    // Toggle popover
+    extPillBtn.addEventListener("click", function (e) {
+      e.stopPropagation();
+      extPopover.classList.toggle("visible");
+      refreshIcons(extPopover);
+    });
+
+    document.addEventListener("click", function (e) {
+      if (!extPopover.contains(e.target) && e.target !== extPillBtn && !extPillBtn.contains(e.target)) {
+        extPopover.classList.remove("visible");
+      }
+    });
+
+    // Download button
+    if (extDownloadBtn) {
+      extDownloadBtn.addEventListener("click", function (e) {
+        e.stopPropagation();
+        extDownloadBtn.disabled = true;
+        extDownloadBtn.innerHTML = iconHtml("loader") + " Downloading...";
+        refreshIcons(extDownloadBtn);
+        var loaderIcon = extDownloadBtn.querySelector(".lucide");
+        if (loaderIcon) loaderIcon.style.animation = "spin 1s linear infinite";
+        if (extDownloadStatus) {
+          extDownloadStatus.classList.remove("hidden");
+          extDownloadStatus.textContent = "Fetching from GitHub...";
+          extDownloadStatus.style.color = "";
+        }
+        fetch("/api/extension/download").then(function (resp) {
+          if (!resp.ok) throw new Error("Download failed (" + resp.status + ")");
+          return resp.blob();
+        }).then(function (blob) {
+          var url = URL.createObjectURL(blob);
+          var a = document.createElement("a");
+          a.href = url;
+          a.download = "clay-chrome-extension.zip";
+          document.body.appendChild(a);
+          a.click();
+          document.body.removeChild(a);
+          URL.revokeObjectURL(url);
+          if (extDownloadStatus) {
+            extDownloadStatus.textContent = "Download complete!";
+            extDownloadStatus.style.color = "var(--accent)";
+          }
+          showToast("Extension downloaded");
+        }).catch(function (err) {
+          if (extDownloadStatus) {
+            extDownloadStatus.textContent = "Failed: " + err.message;
+            extDownloadStatus.style.color = "var(--danger, #e53935)";
+          }
+          showToast("Download failed");
+        }).finally(function () {
+          extDownloadBtn.disabled = false;
+          extDownloadBtn.innerHTML = iconHtml("download") + " Download Extension (.zip)";
+          refreshIcons(extDownloadBtn);
+        });
+      });
+    }
+
+    // Copy chrome://extensions URL
+    if (extCopyUrl) {
+      extCopyUrl.addEventListener("click", function (e) {
+        e.stopPropagation();
+        copyToClipboard("chrome://extensions").then(function () {
+          showToast("Copied chrome://extensions");
+        });
+      });
+    }
+  })();
+
   // --- Settings: Check for updates ---
   (function () {
     var settingsUpdateCheck = $("settings-update-check");

package/lib/public/modules/rewind.js

@@ -4,6 +4,8 @@ import { iconHtml, refreshIcons } from './icons.js';
 var ctx;
 var rewindMode = false;
 var pendingRewindUuid = null;
+var rewindPreviewInFlight = false;
+var rewindExecuting = false;
 var rewindBannerEl = null;
 var rewindScrollHandler = null;
 var rewindModal, rewindSummary, rewindFilesList, rewindConfirmBtn, rewindCancelBtn, rewindModeOptions;
@@ -50,6 +52,17 @@ export function clearPendingRewindUuid() {
   pendingRewindUuid = null;
 }
 
+export function onRewindComplete() {
+  rewindExecuting = false;
+  rewindPreviewInFlight = false;
+  pendingRewindUuid = null;
+}
+
+export function onRewindError() {
+  rewindExecuting = false;
+  rewindPreviewInFlight = false;
+}
+
 function initiateRewind(uuid) {
   if (ctx.processing) {
     ctx.addSystemMessage("Cannot rewind while processing. Stop the current operation first.", true);
@@ -59,7 +72,16 @@ function initiateRewind(uuid) {
     ctx.addSystemMessage("No rewind point found for this turn.", true);
     return;
   }
+  if (rewindPreviewInFlight) {
+    // Debounce: ignore clicks while a preview is already in flight
+    return;
+  }
+  if (rewindExecuting) {
+    ctx.addSystemMessage("Rewind already in progress.", true);
+    return;
+  }
   pendingRewindUuid = uuid;
+  rewindPreviewInFlight = true;
   if (ctx.ws && ctx.connected) {
     ctx.ws.send(JSON.stringify({ type: "rewind_preview", uuid: uuid }));
   }
@@ -98,6 +120,17 @@ function updateSummaryForMode() {
 }
 
 export function showRewindModal(data) {
+  rewindPreviewInFlight = false;
+
+  // Ignore stale preview results that don't match current pending UUID
+  if (data.uuid && pendingRewindUuid && data.uuid !== pendingRewindUuid) {
+    return;
+  }
+  // Ignore if a rewind is already executing
+  if (rewindExecuting) {
+    return;
+  }
+
   var p = data.preview || data;
   var filePaths = p.filesChanged || p.filePaths || p.files || [];
   var fileCount = filePaths.length;
@@ -171,6 +204,7 @@ export function showRewindModal(data) {
 export function hideRewindModal() {
   rewindModal.classList.add("hidden");
   pendingRewindUuid = null;
+  rewindPreviewInFlight = false;
 }
 
 export function renderDiffPre(text) {
@@ -333,7 +367,9 @@ export function initRewind(_ctx) {
   });
 
   rewindConfirmBtn.addEventListener("click", function() {
+    if (rewindExecuting) return;
     if (pendingRewindUuid && ctx.ws && ctx.connected) {
+      rewindExecuting = true;
       var mode = getSelectedMode();
       ctx.ws.send(JSON.stringify({ type: "rewind_execute", uuid: pendingRewindUuid, mode: mode }));
     }