clay-server 2.20.0-beta.1 → 2.20.0-beta.2

package/lib/public/modules/input.js

@@ -13,6 +13,7 @@ var slashActiveIdx = -1;
 var slashFiltered = [];
 var isComposing = false;
 var isRemoteInput = false;
+var scheduleDelayMs = 0; // 0 = no schedule, >0 = delay in ms
 
 export function hasSendableContent() {
   return !!(
@@ -23,6 +24,36 @@ export function hasSendableContent() {
   );
 }
 
+export function getScheduleDelay() {
+  return scheduleDelayMs;
+}
+
+export function clearScheduleDelay() {
+  scheduleDelayMs = 0;
+  var btn = document.getElementById("schedule-btn");
+  if (btn) {
+    btn.classList.remove("schedule-active", "schedule-expanded");
+    var lbl = btn.querySelector(".schedule-delay-label");
+    if (lbl) lbl.remove();
+    var inp = btn.querySelector(".schedule-inline-input");
+    if (inp) inp.remove();
+    btn.title = "Schedule message";
+  }
+}
+
+export function setScheduleBtnDisabled(disabled) {
+  var btn = document.getElementById("schedule-btn");
+  if (!btn) return;
+  btn.disabled = disabled;
+  if (disabled) {
+    btn.style.opacity = "0.3";
+    btn.style.pointerEvents = "none";
+  } else {
+    btn.style.opacity = "";
+    btn.style.pointerEvents = "";
+  }
+}
+
 export var builtinCommands = [
   { name: "clear", desc: "Clear conversation" },
   { name: "context", desc: "Context window usage" },
@@ -131,19 +162,17 @@ export function sendMessage() {
 
   var pastes = pendingPastes.map(function (p) { return p.text; });
 
-  // Schedule mode: queue message for after rate limit resets
-  if (ctx.isScheduleMode && ctx.isScheduleMode()) {
-    var resetsAt = ctx.getRateLimitResetsAt ? ctx.getRateLimitResetsAt() : null;
-    if (resetsAt && resetsAt > Date.now()) {
-      ctx.ws.send(JSON.stringify({ type: "schedule_message", text: text || "", resetsAt: resetsAt }));
-      if (ctx.exitScheduleMode) ctx.exitScheduleMode();
-      ctx.inputEl.value = "";
-      sendInputSync();
-      clearPendingImages();
-      autoResize();
-      ctx.inputEl.focus();
-      return;
-    }
+  // Scheduled message: queue message with timer delay
+  if (scheduleDelayMs > 0) {
+    var resetsAt = Date.now() + scheduleDelayMs;
+    ctx.ws.send(JSON.stringify({ type: "schedule_message", text: text || "", resetsAt: resetsAt }));
+    clearScheduleDelay();
+    ctx.inputEl.value = "";
+    sendInputSync();
+    clearPendingImages();
+    autoResize();
+    ctx.inputEl.focus();
+    return;
   }
 
   ctx.addUserMessage(text, images.length > 0 ? images : null, pastes.length > 0 ? pastes : null);
@@ -578,6 +607,111 @@ export function initInput(_ctx) {
     });
   }
 
+  // Schedule button — inline expand with minute input
+  var scheduleBtn = document.getElementById("schedule-btn");
+  var scheduleInlineInput = null;
+  var scheduleInlineLabel = null;
+  var scheduleOutsideHandler = null;
+
+  function formatDelayLabel(ms) {
+    var mins = Math.round(ms / 60000);
+    if (mins < 60) return mins + "m";
+    var hrs = Math.floor(mins / 60);
+    var rem = mins % 60;
+    return rem > 0 ? hrs + "h " + rem + "m" : hrs + "h";
+  }
+
+  function collapseScheduleBtn() {
+    if (!scheduleBtn) return;
+    scheduleBtn.classList.remove("schedule-expanded");
+    if (scheduleInlineInput) { scheduleInlineInput.remove(); scheduleInlineInput = null; }
+    if (scheduleInlineLabel) { scheduleInlineLabel.remove(); scheduleInlineLabel = null; }
+    if (scheduleOutsideHandler) {
+      document.removeEventListener("mousedown", scheduleOutsideHandler);
+      scheduleOutsideHandler = null;
+    }
+  }
+
+  function setScheduleDelay(ms) {
+    scheduleDelayMs = ms;
+    if (!scheduleBtn) return;
+    collapseScheduleBtn();
+    if (ms > 0) {
+      scheduleBtn.classList.add("schedule-active", "schedule-expanded");
+      scheduleBtn.title = "Scheduled: " + formatDelayLabel(ms) + " (click to clear)";
+      scheduleInlineLabel = document.createElement("span");
+      scheduleInlineLabel.className = "schedule-delay-label";
+      scheduleInlineLabel.textContent = formatDelayLabel(ms);
+      scheduleBtn.appendChild(scheduleInlineLabel);
+    } else {
+      scheduleBtn.classList.remove("schedule-active", "schedule-expanded");
+      scheduleBtn.title = "Schedule message";
+    }
+  }
+
+  function expandScheduleInput() {
+    if (!scheduleBtn) return;
+    scheduleBtn.classList.add("schedule-expanded");
+    scheduleInlineInput = document.createElement("input");
+    scheduleInlineInput.type = "number";
+    scheduleInlineInput.min = "1";
+    scheduleInlineInput.max = "1440";
+    scheduleInlineInput.placeholder = "min";
+    scheduleInlineInput.className = "schedule-inline-input";
+    scheduleBtn.appendChild(scheduleInlineInput);
+
+    setTimeout(function () { scheduleInlineInput.focus(); }, 0);
+
+    scheduleInlineInput.addEventListener("click", function (e) { e.stopPropagation(); });
+    scheduleInlineInput.addEventListener("keydown", function (e) {
+      if (e.key === "Enter") {
+        e.preventDefault();
+        var val = parseInt(scheduleInlineInput.value, 10);
+        if (val >= 1 && val <= 1440) {
+          setScheduleDelay(val * 60000);
+        } else {
+          collapseScheduleBtn();
+        }
+      } else if (e.key === "Escape") {
+        collapseScheduleBtn();
+      }
+    });
+
+    // Close on outside click
+    setTimeout(function () {
+      scheduleOutsideHandler = function (ev) {
+        if (!scheduleBtn.contains(ev.target)) {
+          if (scheduleInlineInput) {
+            var val = parseInt(scheduleInlineInput.value, 10);
+            if (val >= 1 && val <= 1440) {
+              setScheduleDelay(val * 60000);
+            } else {
+              collapseScheduleBtn();
+            }
+          }
+          document.removeEventListener("mousedown", scheduleOutsideHandler);
+          scheduleOutsideHandler = null;
+        }
+      };
+      document.addEventListener("mousedown", scheduleOutsideHandler);
+    }, 0);
+  }
+
+  if (scheduleBtn) {
+    scheduleBtn.addEventListener("click", function (e) {
+      e.stopPropagation();
+      if (scheduleDelayMs > 0) {
+        setScheduleDelay(0);
+        return;
+      }
+      if (scheduleInlineInput) {
+        collapseScheduleBtn();
+      } else {
+        expandScheduleInput();
+      }
+    });
+  }
+
   // Paste handler
   document.addEventListener("paste", function (e) {
     // Don't intercept paste when typing in modals or other non-chat inputs

package/lib/public/modules/sidebar.js

@@ -961,7 +961,19 @@ function renderSheetSessions(listEl) {
     })(cachedProjectList[ci]);
   }
 
-  for (var mi = 0; mi < cachedMates.length; mi++) {
+  var favoriteChipMates = cachedMates.filter(function (m) {
+    if (cachedDmRemovedUsers[m.id]) return false;
+    if (cachedDmFavorites.indexOf(m.id) !== -1) return true;
+    if (cachedDmUnread[m.id] && cachedDmUnread[m.id] > 0) return true;
+    return false;
+  });
+  var sortedChipMates = favoriteChipMates.sort(function (a, b) {
+    var aBuiltin = a.builtinKey ? 1 : 0;
+    var bBuiltin = b.builtinKey ? 1 : 0;
+    if (aBuiltin !== bBuiltin) return bBuiltin - aBuiltin;
+    return (a.createdAt || 0) - (b.createdAt || 0);
+  });
+  for (var mi = 0; mi < sortedChipMates.length; mi++) {
     (function (mate) {
       var mp = mate.profile || {};
       var chip = document.createElement("button");
@@ -1000,7 +1012,7 @@ function renderSheetSessions(listEl) {
       }
 
       chips.push(chip);
-    })(cachedMates[mi]);
+    })(sortedChipMates[mi]);
   }
 
   for (var i = 0; i < chips.length; i++) {
@@ -2419,15 +2431,13 @@ function showMateCtxMenu(anchorEl, mate) {
   menu.appendChild(editItem);
 
   var removeItem = document.createElement("button");
-  removeItem.className = "project-ctx-item project-ctx-delete";
-  removeItem.innerHTML = iconHtml("trash-2") + " <span>Remove Mate</span>";
+  removeItem.className = "project-ctx-item";
+  removeItem.innerHTML = iconHtml("star-off") + " <span>Remove from favorites</span>";
   removeItem.addEventListener("click", function (e) {
     e.stopPropagation();
-    var iconRect = anchorEl.getBoundingClientRect();
-    spawnDustParticles(iconRect.left + iconRect.width / 2, iconRect.top + iconRect.height / 2);
     closeUserCtxMenu();
     if (ctx.sendWs) {
-      ctx.sendWs({ type: "mate_delete", mateId: mate.id });
+      ctx.sendWs({ type: "dm_remove_favorite", targetUserId: mate.id });
     }
   });
   menu.appendChild(removeItem);
@@ -3800,8 +3810,20 @@ export function renderUserStrip(allUsers, onlineUserIds, myUserId, dmFavorites,
     }
   }
 
-  // Render mates
-  for (var mi = 0; mi < cachedMates.length; mi++) {
+  // Render mates (only favorites, built-in first, then user-created)
+  var favoriteMates = cachedMates.filter(function (m) {
+    if (cachedDmRemovedUsers[m.id]) return false;
+    if (cachedDmFavorites.indexOf(m.id) !== -1) return true;
+    if (cachedDmUnread[m.id] && cachedDmUnread[m.id] > 0) return true;
+    return false;
+  });
+  var sortedMates = favoriteMates.sort(function (a, b) {
+    var aBuiltin = a.builtinKey ? 1 : 0;
+    var bBuiltin = b.builtinKey ? 1 : 0;
+    if (aBuiltin !== bBuiltin) return bBuiltin - aBuiltin;
+    return (a.createdAt || 0) - (b.createdAt || 0);
+  });
+  for (var mi = 0; mi < sortedMates.length; mi++) {
     (function (mate) {
       var mp = mate.profile || {};
       var mateSlug = "mate-" + mate.id;
@@ -3876,7 +3898,7 @@ export function renderUserStrip(allUsers, onlineUserIds, myUserId, dmFavorites,
       });
 
       container.appendChild(el);
-    })(cachedMates[mi]);
+    })(sortedMates[mi]);
   }
 
   // Show container if we have mates even with no other users
@@ -3913,13 +3935,12 @@ function toggleDmUserPicker(anchorEl) {
   var searchInput = document.createElement("input");
   searchInput.className = "dm-user-picker-search";
   searchInput.type = "text";
-  searchInput.placeholder = "Search users...";
+  searchInput.placeholder = "Search mates and users...";
   picker.appendChild(searchInput);
 
-  // Scrollable list
+  // User list element (appended later, after USERS label)
   var listEl = document.createElement("div");
   listEl.className = "dm-user-picker-list";
-  picker.appendChild(listEl);
 
   // Position the picker above the + button
   document.body.appendChild(picker);
@@ -3976,10 +3997,193 @@ function toggleDmUserPicker(anchorEl) {
     }
   }
 
+  // --- MATES section ---
+  var matesSectionLabel = document.createElement("div");
+  matesSectionLabel.className = "dm-user-picker-section";
+  matesSectionLabel.textContent = "Mates";
+  picker.appendChild(matesSectionLabel);
+
+  var matesListEl = document.createElement("div");
+  matesListEl.className = "dm-user-picker-list dm-mates-list";
+  picker.appendChild(matesListEl);
+
+  // Update scroll gradient hint
+  function updateMatesScrollHint() {
+    var isOverflow = matesListEl.scrollHeight > matesListEl.clientHeight + 2;
+    if (!isOverflow) {
+      matesListEl.classList.add("no-overflow");
+      matesListEl.classList.remove("scrolled-bottom");
+      return;
+    }
+    matesListEl.classList.remove("no-overflow");
+    var atBottom = matesListEl.scrollTop + matesListEl.clientHeight >= matesListEl.scrollHeight - 4;
+    if (atBottom) {
+      matesListEl.classList.add("scrolled-bottom");
+    } else {
+      matesListEl.classList.remove("scrolled-bottom");
+    }
+  }
+  matesListEl.addEventListener("scroll", updateMatesScrollHint);
+
+  function renderMatesList(filter) {
+    matesListEl.innerHTML = "";
+    var allMates = cachedMates || [];
+    if (filter) {
+      var lf = filter.toLowerCase();
+      allMates = allMates.filter(function (m) {
+        var name = (m.profile && m.profile.displayName) || m.name || "";
+        return name.toLowerCase().indexOf(lf) !== -1;
+      });
+    }
+    // Build unified list: installed builtins, deleted builtins, user-created
+    var availBuiltins = (ctx.availableBuiltins && ctx.availableBuiltins()) || [];
+    var entries = [];
+    // 1. Installed builtin mates
+    for (var si = 0; si < allMates.length; si++) {
+      if (allMates[si].builtinKey) entries.push({ type: "mate", data: allMates[si] });
+    }
+    // 2. Deleted builtins (only when not filtering)
+    if (!filter) {
+      for (var di = 0; di < availBuiltins.length; di++) {
+        entries.push({ type: "deleted", data: availBuiltins[di] });
+      }
+    }
+    // 3. User-created mates
+    var userMates = allMates.filter(function (m) { return !m.builtinKey; });
+    userMates.sort(function (a, b) { return (a.createdAt || 0) - (b.createdAt || 0); });
+    for (var ui = 0; ui < userMates.length; ui++) {
+      entries.push({ type: "mate", data: userMates[ui] });
+    }
+
+    for (var i = 0; i < entries.length; i++) {
+      var entry = entries[i];
+      if (entry.type === "deleted") {
+        // Deleted builtin: show with "+ Add" button
+        (function (b) {
+          var bItem = document.createElement("div");
+          bItem.className = "dm-user-picker-item dm-user-picker-builtin-item";
+          bItem.style.opacity = "0.5";
+          var bAv = document.createElement("img");
+          bAv.className = "dm-user-picker-avatar";
+          bAv.src = b.avatarCustom || "";
+          bAv.alt = b.displayName;
+          bItem.appendChild(bAv);
+          var bNameWrap = document.createElement("div");
+          bNameWrap.style.cssText = "flex:1;min-width:0;";
+          var bName = document.createElement("span");
+          bName.className = "dm-user-picker-name";
+          bName.textContent = b.displayName;
+          bNameWrap.appendChild(bName);
+          var bBio = document.createElement("div");
+          bBio.style.cssText = "font-size:11px;color:var(--text-dimmer);white-space:nowrap;overflow:hidden;text-overflow:ellipsis;";
+          bBio.textContent = "Deleted";
+          bNameWrap.appendChild(bBio);
+          bItem.appendChild(bNameWrap);
+          var bAddBtn = document.createElement("button");
+          bAddBtn.style.cssText = "border:none;background:none;cursor:pointer;padding:2px 6px;color:var(--accent, #6366f1);font-size:12px;font-weight:600;white-space:nowrap;";
+          bAddBtn.textContent = "+ Add";
+          bAddBtn.title = "Re-add " + b.displayName;
+          bAddBtn.addEventListener("click", function (e) {
+            e.stopPropagation();
+            if (ctx.sendWs) ctx.sendWs({ type: "mate_readd_builtin", builtinKey: b.key });
+            closeDmUserPicker();
+          });
+          bItem.appendChild(bAddBtn);
+          bItem.addEventListener("click", function () {
+            if (ctx.sendWs) ctx.sendWs({ type: "mate_readd_builtin", builtinKey: b.key });
+            closeDmUserPicker();
+          });
+          matesListEl.appendChild(bItem);
+        })(entry.data);
+      } else {
+        // Normal mate
+        (function (m) {
+          var mp = m.profile || {};
+          var isFav = cachedDmFavorites.indexOf(m.id) !== -1;
+          var item = document.createElement("div");
+          item.className = "dm-user-picker-item";
+          if (isFav) item.classList.add("dm-picker-fav");
+          var av = document.createElement("img");
+          av.className = "dm-user-picker-avatar";
+          av.src = mateAvatarUrl(m, 28);
+          av.alt = mp.displayName || m.name || "Mate";
+          item.appendChild(av);
+          var nameWrap = document.createElement("div");
+          nameWrap.style.cssText = "flex:1;min-width:0;";
+          var name = document.createElement("span");
+          name.className = "dm-user-picker-name";
+          name.textContent = mp.displayName || m.name || "Mate";
+          nameWrap.appendChild(name);
+          if (m.bio) {
+            var bio = document.createElement("div");
+            bio.style.cssText = "font-size:11px;color:var(--text-dimmer);white-space:nowrap;overflow:hidden;text-overflow:ellipsis;";
+            bio.textContent = m.bio;
+            nameWrap.appendChild(bio);
+          }
+          item.appendChild(nameWrap);
+          // Delete button with inline confirm
+          var delBtn = document.createElement("button");
+          delBtn.className = "dm-picker-del-btn";
+          delBtn.innerHTML = iconHtml("trash-2");
+          delBtn.title = "Delete mate";
+          delBtn.addEventListener("click", function (e) {
+            e.stopPropagation();
+            var origHtml = item.innerHTML;
+            item.innerHTML = "";
+            item.style.justifyContent = "center";
+            item.style.gap = "6px";
+            var confirmMsg = document.createElement("span");
+            confirmMsg.style.cssText = "font-size:12px;color:var(--text-dimmer);";
+            confirmMsg.textContent = m.builtinKey ? "Delete? You can re-add later." : "Delete permanently?";
+            item.appendChild(confirmMsg);
+            var yesBtn = document.createElement("button");
+            yesBtn.style.cssText = "border:none;background:var(--danger,#e74c3c);color:#fff;padding:3px 10px;border-radius:4px;font-size:12px;cursor:pointer;";
+            yesBtn.textContent = "Delete";
+            yesBtn.addEventListener("click", function (e2) {
+              e2.stopPropagation();
+              if (ctx.sendWs) ctx.sendWs({ type: "mate_delete", mateId: m.id });
+              closeDmUserPicker();
+            });
+            item.appendChild(yesBtn);
+            var noBtn = document.createElement("button");
+            noBtn.style.cssText = "border:1px solid var(--border);background:none;color:var(--text);padding:3px 10px;border-radius:4px;font-size:12px;cursor:pointer;";
+            noBtn.textContent = "Cancel";
+            noBtn.addEventListener("click", function (e2) {
+              e2.stopPropagation();
+              item.innerHTML = origHtml;
+              item.style.justifyContent = "";
+              item.style.gap = "";
+              refreshIcons();
+            });
+            item.appendChild(noBtn);
+          });
+          item.appendChild(delBtn);
+          item.addEventListener("click", function () {
+            if (ctx.openDm) ctx.openDm(m.id);
+            if (!isFav && ctx.sendWs) ctx.sendWs({ type: "dm_add_favorite", targetUserId: m.id });
+            closeDmUserPicker();
+          });
+          matesListEl.appendChild(item);
+        })(entry.data);
+      }
+    }
+
+    if (entries.length === 0 && filter) {
+      var emptyEl = document.createElement("div");
+      emptyEl.className = "dm-user-picker-empty";
+      emptyEl.textContent = "No mates found";
+      matesListEl.appendChild(emptyEl);
+    }
+    refreshIcons();
+    requestAnimationFrame(updateMatesScrollHint);
+  }
+
   // Create Mate option
   var createMateEl = document.createElement("div");
   createMateEl.className = "dm-user-picker-create-mate";
-  createMateEl.innerHTML = iconHtml("bot") + " <span>Create a Mate</span>";
+  var hasCustomMates = (cachedMates || []).some(function (m) { return !m.builtinKey; });
+  var createMateLabel = hasCustomMates ? "Create a Mate" : "Create a Mate for what you're doing";
+  createMateEl.innerHTML = iconHtml("bot") + " <span>" + createMateLabel + "</span>";
   createMateEl.addEventListener("click", function () {
     closeDmUserPicker();
     if (ctx.openMateWizard) ctx.openMateWizard();
@@ -3997,10 +4201,14 @@ function toggleDmUserPicker(anchorEl) {
   sectionLabel.className = "dm-user-picker-section";
   sectionLabel.textContent = "Users";
   picker.appendChild(sectionLabel);
+  picker.appendChild(listEl);
 
+  renderMatesList("");
   renderPickerList("");
   searchInput.addEventListener("input", function () {
-    renderPickerList(searchInput.value);
+    var val = searchInput.value;
+    renderMatesList(val);
+    renderPickerList(val);
   });
 
   // Focus search

package/lib/sdk-bridge.js

@@ -999,23 +999,14 @@ function createSDKBridge(opts) {
           var workerACEnabled = session.onQueryComplete || (typeof opts.getAutoContinueSetting === "function" && opts.getAutoContinueSetting(session));
           if (session.rateLimitResetsAt && session.rateLimitResetsAt > Date.now()
               && workerACEnabled && !session.destroying) {
-            var wacDelay = session.rateLimitResetsAt - Date.now() + 3000;
             var wacResetsAt = session.rateLimitResetsAt;
             session.rateLimitResetsAt = null;
             session.rateLimitAutoContinuePending = true;
             workerDidScheduleAC = true;
-            console.log("[sdk-bridge] Rate limited (worker), scheduling auto-continue in " + Math.round(wacDelay / 1000) + "s for session " + session.localId);
-            sendAndRecord(session, { type: "auto_continue_scheduled", resetsAt: wacResetsAt });
-            session.autoContinueTimer = setTimeout(function () {
-              session.autoContinueTimer = null;
-              session.rateLimitAutoContinuePending = false;
-              if (session.destroying) return;
-              console.log("[sdk-bridge] Auto-continue (worker) firing for session " + session.localId);
-              session.isProcessing = true;
-              onProcessingChanged();
-              sendAndRecord(session, { type: "auto_continue_fired" });
-              startQuery(session, "continue", null, session.lastLinuxUser || null);
-            }, wacDelay);
+            console.log("[sdk-bridge] Rate limited (worker), scheduling auto-continue via scheduleMessage for session " + session.localId);
+            if (typeof opts.scheduleMessage === "function") {
+              opts.scheduleMessage(session, "continue", wacResetsAt);
+            }
           }
           if (session.onQueryComplete && !workerDidScheduleAC) {
             try { session.onQueryComplete(session); } catch (err) {
@@ -1439,23 +1430,14 @@ function createSDKBridge(opts) {
       var acEnabled = session.onQueryComplete || (typeof opts.getAutoContinueSetting === "function" && opts.getAutoContinueSetting(session));
       if (session.rateLimitResetsAt && session.rateLimitResetsAt > Date.now()
           && acEnabled && !session.destroying) {
-        var acDelay = session.rateLimitResetsAt - Date.now() + 3000;
         var acResetsAt = session.rateLimitResetsAt;
         session.rateLimitResetsAt = null;
         session.rateLimitAutoContinuePending = true;
         didScheduleAutoContinue = true;
-        console.log("[sdk-bridge] Rate limited, scheduling auto-continue in " + Math.round(acDelay / 1000) + "s for session " + session.localId);
-        sendAndRecord(session, { type: "auto_continue_scheduled", resetsAt: acResetsAt });
-        session.autoContinueTimer = setTimeout(function () {
-          session.autoContinueTimer = null;
-          session.rateLimitAutoContinuePending = false;
-          if (session.destroying) return;
-          console.log("[sdk-bridge] Auto-continue firing for session " + session.localId);
-          session.isProcessing = true;
-          onProcessingChanged();
-          sendAndRecord(session, { type: "auto_continue_fired" });
-          startQuery(session, "continue", null, session.lastLinuxUser || null);
-        }, acDelay);
+        console.log("[sdk-bridge] Rate limited, scheduling auto-continue via scheduleMessage for session " + session.localId);
+        if (typeof opts.scheduleMessage === "function") {
+          opts.scheduleMessage(session, "continue", acResetsAt);
+        }
       }
 
       // Ralph Loop: notify completion so loop orchestrator can proceed