clay-server 2.14.0-beta.9 → 2.14.0

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

@@ -2,6 +2,7 @@ import { escapeHtml } from './utils.js';
 import { iconHtml, refreshIcons } from './icons.js';
 import { hideKnowledge } from './mate-knowledge.js';
 import { isSchedulerOpen, closeScheduler } from './scheduler.js';
+import { openSearch as openSessionSearch } from './session-search.js';
 
 var getMateWs = null;
 var currentMateId = null;
@@ -14,6 +15,15 @@ var avatarEl = null;
 var nameEl = null;
 var newSessionBtn = null;
 
+// Search state
+var searchBtn = null;
+var searchContainer = null;
+var searchInput = null;
+var searchClearBtn = null;
+var searchQuery = "";
+var searchMatchIds = null;
+var searchDebounce = null;
+
 export function initMateSidebar(mateWsGetter) {
   getMateWs = mateWsGetter;
   columnEl = document.getElementById("mate-sidebar-column");
@@ -31,6 +41,49 @@ export function initMateSidebar(mateWsGetter) {
     });
   }
 
+  // Session search
+  searchBtn = document.getElementById("mate-search-session-btn");
+  searchContainer = document.getElementById("mate-session-search");
+  searchInput = document.getElementById("mate-session-search-input");
+  searchClearBtn = document.getElementById("mate-session-search-clear");
+
+  if (searchBtn) {
+    searchBtn.addEventListener("click", function () {
+      if (searchContainer && searchContainer.classList.contains("hidden")) {
+        openSearch();
+      } else {
+        closeSearch();
+      }
+    });
+  }
+  if (searchClearBtn) {
+    searchClearBtn.addEventListener("click", closeSearch);
+  }
+  if (searchInput) {
+    searchInput.addEventListener("input", function () {
+      var q = searchInput.value.trim();
+      searchQuery = q;
+      if (searchDebounce) clearTimeout(searchDebounce);
+      if (!q) {
+        searchMatchIds = null;
+        renderMateSessionList(null);
+        return;
+      }
+      searchDebounce = setTimeout(function () {
+        var ws = getMateWs ? getMateWs() : null;
+        if (ws && ws.readyState === 1) {
+          ws.send(JSON.stringify({ type: "search_sessions", query: q }));
+        }
+      }, 200);
+    });
+    searchInput.addEventListener("keydown", function (e) {
+      e.stopPropagation();
+      if (e.key === "Escape") closeSearch();
+    });
+    searchInput.addEventListener("keyup", function (e) { e.stopPropagation(); });
+    searchInput.addEventListener("keypress", function (e) { e.stopPropagation(); });
+  }
+
   // Name hover: show seed data tooltip
   if (nameEl) {
     nameEl.addEventListener("mouseenter", function () {
@@ -257,8 +310,38 @@ export function hideMateSidebar() {
   if (columnEl) columnEl.classList.add("hidden");
 }
 
+function openSearch() {
+  if (searchContainer) searchContainer.classList.remove("hidden");
+  if (searchBtn) searchBtn.classList.add("active");
+  if (searchInput) { searchInput.value = ""; searchInput.focus(); }
+  searchQuery = "";
+  searchMatchIds = null;
+}
+
+function closeSearch() {
+  if (searchContainer) searchContainer.classList.add("hidden");
+  if (searchBtn) searchBtn.classList.remove("active");
+  if (searchInput) searchInput.value = "";
+  searchQuery = "";
+  searchMatchIds = null;
+  if (searchDebounce) { clearTimeout(searchDebounce); searchDebounce = null; }
+  renderMateSessionList(null);
+}
+
+export function handleMateSearchResults(msg) {
+  if (msg.query !== searchQuery) return;
+  var ids = new Set();
+  if (msg.results) {
+    for (var i = 0; i < msg.results.length; i++) {
+      ids.add(msg.results[i].id);
+    }
+  }
+  searchMatchIds = ids;
+  renderMateSessionList(null);
+}
+
 export function renderMateSessionList(sessions) {
-  cachedSessions = sessions || [];
+  if (sessions) cachedSessions = sessions;
   if (!listEl) return;
   listEl.innerHTML = "";
 
@@ -272,7 +355,16 @@ export function renderMateSessionList(sessions) {
 
   for (var i = 0; i < cachedSessions.length; i++) {
     var s = cachedSessions[i];
-    listEl.appendChild(renderMateSessionItem(s));
+    var el = renderMateSessionItem(s);
+    // Apply search filter
+    if (searchMatchIds !== null) {
+      if (searchMatchIds.has(s.id)) {
+        el.classList.add("search-match");
+      } else {
+        el.classList.add("search-dimmed");
+      }
+    }
+    listEl.appendChild(el);
   }
   refreshIcons();
 }
@@ -310,6 +402,7 @@ function renderMateSessionItem(s) {
       if (stickyPanel && !stickyPanel.classList.contains("hidden")) {
         if (stickyBtn) stickyBtn.click();
       }
+      var pendingQuery = searchQuery || "";
       var ws = getMateWs ? getMateWs() : null;
       if (ws && ws.readyState === 1) {
         ws.send(JSON.stringify({ type: "switch_session", id: id }));
@@ -320,6 +413,11 @@ function renderMateSessionItem(s) {
         items[j].classList.remove("active");
       }
       el.classList.add("active");
+      // Open in-session search with the sidebar search query
+      if (pendingQuery) {
+        closeSearch();
+        setTimeout(function () { openSessionSearch(pendingQuery); }, 400);
+      }
     };
   })(s.id));
 

package/lib/public/modules/sidebar.js

@@ -6,6 +6,7 @@ import { parseEmojis } from './markdown.js';
 import { showMateProfilePopover } from './profile.js';
 import { closeArchive } from './sticky-notes.js';
 import { closeScheduler } from './scheduler.js';
+import { openSearch as openSessionSearch } from './session-search.js';
 
 var ctx;
 
@@ -462,9 +463,14 @@ function renderSessionItem(s) {
   el.addEventListener("click", (function (id) {
     return function () {
       if (ctx.ws && ctx.connected) {
+        var pendingQuery = searchQuery || "";
         ctx.ws.send(JSON.stringify({ type: "switch_session", id: id }));
         dismissOverlayPanels();
         closeSidebar();
+        if (pendingQuery) {
+          closeSearch();
+          setTimeout(function () { openSessionSearch(pendingQuery); }, 400);
+        }
       }
     };
   })(s.id));

package/lib/public/modules/tools.js

@@ -116,10 +116,15 @@ function updateToolGroupHeader(group) {
   var header = group.el.querySelector(".tool-group-header");
   var isMate = group.el.classList.contains("mate-tool-group");
   if (isMate) {
-    // Mate DM: always show header and collapse
-    header.style.display = "";
-    if (!group.userToggled) {
-      group.el.classList.add("collapsed");
+    // Mate DM: hide entire group when no tools, show collapsed when tools exist
+    if (group.toolCount === 0) {
+      group.el.style.display = "none";
+    } else {
+      group.el.style.display = "";
+      header.style.display = "";
+      if (!group.userToggled) {
+        group.el.classList.add("collapsed");
+      }
     }
   } else if (group.toolCount >= 2) {
     header.style.display = "";
@@ -189,17 +194,27 @@ export function renderAskUserQuestion(toolId, input) {
   container.className = "ask-user-container";
   container.dataset.toolId = toolId;
 
-  // Mate DM: inject avatar + name header into ask-user container
+  // Mate DM: wrap in avatar + content layout (same as msg-assistant)
+  var mateContentWrap = null;
   if (ctx.isMateDm && ctx.isMateDm()) {
+    container.classList.add("mate-ask-user");
     var mateName = ctx.getMateName();
     var mateAvatar = ctx.getMateAvatarUrl();
-    var mateHeader = document.createElement("div");
-    mateHeader.className = "dm-bubble-header ask-user-mate-header";
-    mateHeader.innerHTML =
-      '<img class="dm-bubble-avatar" src="' + escapeHtml(mateAvatar) + '" alt="" style="display:block;width:28px;height:28px;border-radius:6px">' +
+
+    var avi = document.createElement("img");
+    avi.className = "dm-bubble-avatar";
+    avi.src = mateAvatar;
+    container.appendChild(avi);
+
+    mateContentWrap = document.createElement("div");
+    mateContentWrap.className = "dm-bubble-content";
+
+    var headerEl = document.createElement("div");
+    headerEl.className = "dm-bubble-header";
+    headerEl.innerHTML =
       '<span class="dm-bubble-name">' + escapeHtml(mateName) + '</span>' +
       '<span class="dm-bubble-time">' + String(new Date().getHours()).padStart(2, "0") + ":" + String(new Date().getMinutes()).padStart(2, "0") + '</span>';
-    container.appendChild(mateHeader);
+    mateContentWrap.appendChild(headerEl);
   }
 
   var answers = {};
@@ -320,6 +335,20 @@ export function renderAskUserQuestion(toolId, input) {
   });
   container.appendChild(skipBtn);
 
+  // Mate DM: move all content into the bubble content wrapper
+  if (mateContentWrap) {
+    var children = [];
+    for (var ci = 0; ci < container.childNodes.length; ci++) {
+      if (container.childNodes[ci] !== container.querySelector(".dm-bubble-avatar")) {
+        children.push(container.childNodes[ci]);
+      }
+    }
+    for (var cj = 0; cj < children.length; cj++) {
+      mateContentWrap.appendChild(children[cj]);
+    }
+    container.appendChild(mateContentWrap);
+  }
+
   ctx.addToMessages(container);
   disableMainInput();
   ctx.setActivity(null);
@@ -639,72 +668,71 @@ function sendPlanResponse(container, requestId, decision, feedback) {
   delete pendingPermissions[requestId];
 }
 
-function matePermissionVerb(toolName) {
-  switch (toolName) {
-    case "Write": return "write to";
-    case "Edit": return "edit";
-    case "Read": return "read";
-    case "Bash": return "run a command on";
-    case "Grep": return "search";
-    case "Glob": return "search for files in";
-    case "WebFetch": return "fetch";
-    case "WebSearch": return "search the web for";
-    default: return "use " + toolName + " on";
-  }
-}
+function matePermissionInfo(toolName, toolInput) {
+  var input = toolInput && typeof toolInput === "object" ? toolInput : {};
+  var verb = "use " + toolName;
+  var target = "";
 
-function matePermissionTarget(toolName, toolInput) {
-  if (!toolInput || typeof toolInput !== "object") return "";
   switch (toolName) {
-    case "Write": case "Edit": case "Read": return shortPath(toolInput.file_path);
-    case "Bash": return toolInput.description || (toolInput.command || "").substring(0, 60);
-    case "Grep": return toolInput.pattern || "";
-    case "Glob": return toolInput.pattern || "";
-    case "WebFetch": return toolInput.url || "";
-    case "WebSearch": return toolInput.query || "";
-    default: return "";
-  }
+    case "Write": verb = "write to"; target = shortPath(input.file_path); break;
+    case "Edit": verb = "edit"; target = shortPath(input.file_path); break;
+    case "Read": verb = "read"; target = shortPath(input.file_path); break;
+    case "Bash": verb = "run"; target = input.description || (input.command || "").substring(0, 80); break;
+    case "Grep": verb = "search"; target = input.pattern || ""; break;
+    case "Glob": verb = "search for files in"; target = input.pattern || ""; break;
+    case "WebFetch": verb = "fetch"; target = input.url || ""; break;
+    case "WebSearch": verb = "search the web for"; target = input.query || ""; break;
+  }
+  return { verb: verb, target: target };
 }
 
 function renderMatePermission(requestId, toolName, toolInput) {
   var mateName = ctx.getMateName();
   var mateAvatar = ctx.getMateAvatarUrl();
-  var verb = matePermissionVerb(toolName);
-  var target = matePermissionTarget(toolName, toolInput);
+  var info = matePermissionInfo(toolName, toolInput);
+  var askMsg = "Can I " + info.verb + (info.target ? " " + info.target : "") + "?";
 
   var container = document.createElement("div");
   container.className = "permission-container mate-permission";
   container.dataset.requestId = requestId;
 
-  // Chat bubble: avatar + name + time
+  // Avatar (left column)
+  var avi = document.createElement("img");
+  avi.className = "dm-bubble-avatar dm-bubble-avatar-mate";
+  avi.src = mateAvatar;
+  avi.alt = "";
+  container.appendChild(avi);
+
+  // Content (right column)
+  var content = document.createElement("div");
+  content.className = "dm-bubble-content";
+
+  // Name + time header
   var headerRow = document.createElement("div");
   headerRow.className = "dm-bubble-header";
-  headerRow.style.cssText = "display:flex;align-items:center;gap:8px;margin-bottom:6px";
   headerRow.innerHTML =
-    '<img class="dm-bubble-avatar" src="' + escapeHtml(mateAvatar) + '" alt="" style="display:block;width:28px;height:28px;border-radius:6px">' +
     '<span class="dm-bubble-name">' + escapeHtml(mateName) + '</span>' +
     '<span class="dm-bubble-time">' + String(new Date().getHours()).padStart(2, "0") + ":" + String(new Date().getMinutes()).padStart(2, "0") + '</span>';
-  container.appendChild(headerRow);
+  content.appendChild(headerRow);
 
-  // Conversational ask text
-  var askText = document.createElement("div");
-  askText.className = "mate-permission-ask";
-  var askMsg = "Can I " + verb + (target ? " " : "") + (target ? target : "") + "?";
-  askText.textContent = askMsg;
-  container.appendChild(askText);
+  // Ask text
+  var askEl = document.createElement("div");
+  askEl.className = "mate-perm-ask";
+  askEl.textContent = askMsg;
+  content.appendChild(askEl);
 
-  // Collapsible details (subtle)
+  // Collapsible details
   var details = document.createElement("details");
-  details.className = "mate-permission-details";
-  var detailsSummary = document.createElement("summary");
-  detailsSummary.textContent = "Details";
-  var detailsPre = document.createElement("pre");
-  detailsPre.textContent = JSON.stringify(toolInput, null, 2);
-  details.appendChild(detailsSummary);
-  details.appendChild(detailsPre);
-  container.appendChild(details);
-
-  // Quick reply buttons (chat-style)
+  details.className = "mate-perm-details";
+  var summary = document.createElement("summary");
+  summary.textContent = "Details";
+  var pre = document.createElement("pre");
+  pre.textContent = JSON.stringify(toolInput, null, 2);
+  details.appendChild(summary);
+  details.appendChild(pre);
+  content.appendChild(details);
+
+  // Buttons
   var actions = document.createElement("div");
   actions.className = "permission-actions mate-permission-actions";
 
@@ -717,7 +745,7 @@ function renderMatePermission(requestId, toolName, toolInput) {
 
   var alwaysBtn = document.createElement("button");
   alwaysBtn.className = "mate-permission-reply mate-permission-always";
-  alwaysBtn.textContent = "Always allow this";
+  alwaysBtn.textContent = "Always allow";
   alwaysBtn.addEventListener("click", function () {
     sendPermissionResponse(container, requestId, "allow_always");
   });
@@ -732,7 +760,9 @@ function renderMatePermission(requestId, toolName, toolInput) {
   actions.appendChild(allowBtn);
   actions.appendChild(alwaysBtn);
   actions.appendChild(denyBtn);
-  container.appendChild(actions);
+  content.appendChild(actions);
+
+  container.appendChild(content);
 
   ctx.addToMessages(container);
   pendingPermissions[requestId] = container;
@@ -1323,20 +1353,20 @@ export function startThinking() {
     var mateAvatar = ctx.getMateAvatarUrl();
     el.classList.add("mate-thinking");
     el.innerHTML =
+      '<img class="dm-bubble-avatar dm-bubble-avatar-mate" src="' + escapeHtml(mateAvatar) + '" alt="">' +
+      '<div class="dm-bubble-content">' +
       '<div class="mate-thinking-row">' +
-      '<img class="mate-thinking-avatar" src="' + escapeHtml(mateAvatar) + '" alt="">' +
-      '<div class="mate-thinking-body">' +
-      '<span class="mate-thinking-name">' + escapeHtml(mateName) + '</span>' +
+      '<span class="dm-bubble-name">' + escapeHtml(mateName) + '</span>' +
       '<span class="mate-thinking-dots"><span></span><span></span><span></span></span>' +
       '</div>' +
-      '</div>' +
       '<div class="thinking-header" style="display:none">' +
       '<span class="thinking-chevron">' + iconHtml("chevron-right") + '</span>' +
       '<span class="thinking-label">Thinking</span>' +
       '<span class="thinking-duration"></span>' +
       '<span class="thinking-spinner">' + iconHtml("loader", "icon-spin") + '</span>' +
       '</div>' +
-      '<div class="thinking-content"></div>';
+      '<div class="thinking-content"></div>' +
+      '</div>';
   } else {
     el.innerHTML =
       '<div class="thinking-header">' +
@@ -1405,9 +1435,11 @@ export function createToolItem(id, name) {
     toolGroupCounter++;
     var groupEl = document.createElement("div");
     groupEl.className = "tool-group";
-    if (ctx.isMateDm()) groupEl.classList.add("mate-tool-group");
+    var isMateToolGroup = ctx.isMateDm();
+    if (isMateToolGroup) groupEl.classList.add("mate-tool-group");
     groupEl.dataset.groupId = "g" + toolGroupCounter;
-    groupEl.innerHTML =
+
+    var toolGroupInner =
       '<div class="tool-group-header" style="display:none">' +
       '<span class="tool-group-chevron">' + iconHtml("chevron-right") + '</span>' +
       '<span class="tool-group-bullet"></span>' +
@@ -1416,6 +1448,15 @@ export function createToolItem(id, name) {
       '</div>' +
       '<div class="tool-group-items"></div>';
 
+    if (isMateToolGroup) {
+      var mateAvatar = ctx.getMateAvatarUrl();
+      groupEl.innerHTML =
+        '<img class="dm-bubble-avatar dm-bubble-avatar-mate" src="' + escapeHtml(mateAvatar) + '" alt="">' +
+        '<div class="dm-bubble-content">' + toolGroupInner + '</div>';
+    } else {
+      groupEl.innerHTML = toolGroupInner;
+    }
+
     groupEl.querySelector(".tool-group-header").addEventListener("click", function () {
       groupEl.classList.toggle("collapsed");
       if (currentToolGroup) currentToolGroup.userToggled = true;

package/lib/sdk-bridge.js

@@ -1675,13 +1675,10 @@ function createSDKBridge(opts) {
       send({ type: "config_state", model: sm.currentModel || "", mode: sm.currentPermissionMode || "default", effort: sm.currentEffort, betas: sm.currentBetas || [] });
       return;
     }
-    try {
-      await session.queryInstance.setEffort(effort);
-      sm.currentEffort = effort;
-      send({ type: "config_state", model: sm.currentModel || "", mode: sm.currentPermissionMode || "default", effort: sm.currentEffort, betas: sm.currentBetas || [] });
-    } catch (e) {
-      send({ type: "error", text: "Failed to set effort: " + (e.message || e) });
-    }
+    // SDK Query interface has no setEffort method.
+    // Store the effort level — it will be applied via queryOptions.effort on the next query.
+    sm.currentEffort = effort;
+    send({ type: "config_state", model: sm.currentModel || "", mode: sm.currentPermissionMode || "default", effort: sm.currentEffort, betas: sm.currentBetas || [] });
   }
 
   async function setPermissionMode(session, mode) {

package/package.json

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