clay-server 2.31.0 → 2.32.0-beta.10

package/lib/public/modules/app-misc.js

@@ -13,6 +13,9 @@ var _extRequestCallbacks = {};
 
 // Queue for extension messages that arrived before WS was ready
 var _pendingExtMessages = [];
+// Cache last extension state so we can resend on WS reconnect (server restart)
+var _lastTabListMsg = null;
+var _lastMcpServersMsg = null;
 
 function sendOrQueue(msgObj) {
   var ws = getWs();
@@ -24,14 +27,20 @@ function sendOrQueue(msgObj) {
 }
 
 export function flushPendingExtMessages() {
-  if (_pendingExtMessages.length === 0) return;
   var ws = getWs();
   if (!ws || ws.readyState !== 1) return;
-  var queued = _pendingExtMessages.slice();
-  _pendingExtMessages = [];
-  for (var i = 0; i < queued.length; i++) {
-    ws.send(JSON.stringify(queued[i]));
+  // Flush queued messages from before WS was ready
+  if (_pendingExtMessages.length > 0) {
+    var queued = _pendingExtMessages.slice();
+    _pendingExtMessages = [];
+    for (var i = 0; i < queued.length; i++) {
+      ws.send(JSON.stringify(queued[i]));
+    }
   }
+  // Resend cached extension state on every WS reconnect so the server
+  // re-registers _extensionWs and rebuilds MCP proxy servers
+  if (_lastTabListMsg) ws.send(JSON.stringify(_lastTabListMsg));
+  if (_lastMcpServersMsg) ws.send(JSON.stringify(_lastMcpServersMsg));
 }
 
 export function initMisc() {
@@ -121,11 +130,9 @@ export function initMisc() {
     if (msg.type === "clay_ext_tab_list") {
       setExtensionConnected(true);
       updateBrowserTabList(msg.tabs);
-      // Also inform server about tab list (queue if WS not ready yet)
-      sendOrQueue({
-        type: "browser_tab_list",
-        tabs: msg.tabs
-      });
+      // Cache and send (or queue) - resent on WS reconnect via flushPendingExtMessages
+      _lastTabListMsg = { type: "browser_tab_list", tabs: msg.tabs };
+      sendOrQueue(_lastTabListMsg);
     }
     if (msg.type === "clay_ext_result") {
       handleExtensionResult(msg.requestId, msg.result);
@@ -135,12 +142,14 @@ export function initMisc() {
     }
 
     // MCP bridge: extension reports available MCP servers (queue if WS not ready yet)
+    // Cache for resend on WS reconnect (server restart loses _availableServers)
     if (msg.type === "mcp_servers_available") {
-      sendOrQueue({
+      _lastMcpServersMsg = {
         type: "mcp_servers_available",
         servers: msg.servers,
         hostConnected: msg.hostConnected
-      });
+      };
+      sendOrQueue(_lastMcpServersMsg);
     }
 
     // MCP bridge: tool result from extension (tool results should not be queued,
@@ -161,6 +170,7 @@ export function initMisc() {
 
 // Forward an MCP tool call from the server to the Chrome extension
 export function forwardMcpToolCall(msg) {
+  console.log("[mcp] forwarding to extension:", msg.callId, msg.server, msg.method);
   window.postMessage({
     source: "clay-page",
     payload: {
@@ -185,6 +195,7 @@ export function setHttpMcpServers(servers) {
 }
 
 export function handleMcpToolCallMessage(msg) {
+  console.log("[mcp] tool call received from server:", msg.callId, msg.server, msg.params && msg.params.name);
   var httpUrl = _httpMcpServers[msg.server];
   if (httpUrl) {
     // HTTP transport: call directly via fetch

package/lib/public/modules/app-notifications.js

@@ -9,12 +9,19 @@ import { getWs } from './ws-ref.js';
 import { openDm } from './app-dm.js';
 import { getCachedProjects } from './app-projects.js';
 import { switchProject } from './app-projects.js';
+import { mateAvatarUrl } from './avatar.js';
 var notifications = [];
 var unreadCount = 0;
 var bannerContainer = null;
 var bellBtn = null;
 var badgeEl = null;
 
+// --- Update available banner state ---
+// Server pushes update_available on an hourly boundary; dismissal is
+// per-banner-instance and doesn't need to persist. The next server push
+// (next hour) acts as a fresh ping.
+var pendingUpdateMsg = null;
+
 // ========================================================
 // Init
 // ========================================================
@@ -44,7 +51,12 @@ function showAllBanners() {
   // Clear existing banners first
   if (bannerContainer) bannerContainer.innerHTML = "";
 
-  if (notifications.length === 0) {
+  // Re-add update banner if present (may be suppressed by recent dismiss)
+  if (pendingUpdateMsg) showUpdateBanner(pendingUpdateMsg);
+
+  // Check if any banner actually got rendered (update banner can be suppressed)
+  var hasVisibleBanner = bannerContainer.children.length > 0;
+  if (notifications.length === 0 && !hasVisibleBanner) {
     showBanner({
       id: "_empty",
       type: "info",
@@ -71,14 +83,17 @@ function showBanner(notif, autoDismissMs) {
   var projectIcon = isEmpty ? null : getProjectIcon(notif.slug);
   var projectName = isEmpty ? "" : getProjectName(notif.slug);
   var isPermission = notif.type === "permission_request" && notif.meta && notif.meta.requestId;
+  var mate = isEmpty ? null : getMateForNotification(notif);
 
   var banner = document.createElement("div");
   banner.className = "notif-banner" + (isPermission ? " notif-banner-permission" : "");
   if (!isEmpty) banner.setAttribute("data-notif-id", notif.id);
 
-  var iconHtmlStr = projectIcon
-    ? '<span class="notif-banner-emoji">' + projectIcon + '</span>'
-    : iconHtml(isEmpty ? "check-circle" : "folder");
+  var iconHtmlStr = mate
+    ? '<img class="notif-banner-avatar" src="' + escapeHtml(mateAvatarUrl(mate, 32)) + '" alt="' + escapeHtml(mate.displayName || mate.name || "Mate") + '">'
+    : projectIcon
+      ? '<span class="notif-banner-emoji">' + projectIcon + '</span>'
+      : iconHtml(isEmpty ? "check-circle" : "folder");
 
   // Format permission title as "Can I ..." style
   if (isPermission && notif.meta) {
@@ -93,7 +108,7 @@ function showBanner(notif, autoDismissMs) {
     actionsHtml =
       '<div class="notif-banner-actions">' +
         '<button class="notif-banner-allow">Sure</button>' +
-        '<button class="notif-banner-always">Always allow</button>' +
+        '<button class="notif-banner-always">Allow for session</button>' +
         '<button class="notif-banner-deny">No</button>' +
         '<button class="notif-banner-goto" title="Go to session">' + iconHtml("external-link") + '</button>' +
       '</div>';
@@ -237,7 +252,7 @@ export function handleNotificationCreated(msg) {
   var notif = msg.notification;
 
   // Auto-dismiss if it's for the session the user is currently viewing
-  var activeSession = store.getState().activeSessionId || null;
+  var activeSession = store.get('activeSessionId') || null;
   console.log("[notif] created:", notif.type, "sessionId=" + notif.sessionId + "(" + typeof notif.sessionId + ")", "active=" + activeSession + "(" + typeof activeSession + ")", "match=" + (notif.sessionId == activeSession));
   if (notif.sessionId && String(notif.sessionId) === String(activeSession)) {
     dismissNotif(notif.id);
@@ -292,12 +307,16 @@ function updateBadge() {
 // ========================================================
 
 function navigateToNotification(notif) {
-  if (notif.mateId) {
-    openDm(notif.mateId);
+  var mateId = notif.mateId || deriveMateIdFromNotification(notif);
+  if (mateId) {
+    if (notif.sessionId) {
+      try { sessionStorage.setItem("pending-notif-session", notif.sessionId); } catch (e) {}
+    }
+    openDm(mateId);
     return;
   }
 
-  var currentSlug = store.getState().currentSlug || "";
+  var currentSlug = store.get('currentSlug') || "";
   var needsProjectSwitch = notif.slug && notif.slug !== currentSlug;
 
   if (needsProjectSwitch) {
@@ -314,6 +333,97 @@ function navigateToNotification(notif) {
   }
 }
 
+function deriveMateIdFromNotification(notif) {
+  if (!notif) return null;
+  if (typeof notif.slug === "string" && notif.slug.indexOf("mate-") === 0) {
+    return notif.slug.substring(5) || null;
+  }
+  return null;
+}
+
+function getMateForNotification(notif) {
+  var mateId = notif && notif.meta ? notif.meta.avatarMateId : null;
+  if (!mateId) mateId = deriveMateIdFromNotification(notif);
+  if (!mateId) return null;
+  var mates = store.get('cachedMatesList') || [];
+  for (var i = 0; i < mates.length; i++) {
+    if (mates[i] && mates[i].id === mateId) return mates[i];
+  }
+  return { id: mateId };
+}
+
+// ========================================================
+// Update available banner
+// ========================================================
+
+export function showUpdateBanner(msg) {
+  if (!msg || !msg.version) return;
+  pendingUpdateMsg = msg;
+  if (!bannerContainer) return;
+
+  // Remove any existing update banner
+  var existing = bannerContainer.querySelector('[data-notif-id="_update"]');
+  if (existing) removeBanner(existing);
+
+  var isHeadless = store.get('isHeadlessMode');
+  var updTag = msg.version.indexOf("-beta") !== -1 ? "beta" : "latest";
+
+  var banner = document.createElement("div");
+  banner.className = "notif-banner notif-banner-update";
+  banner.setAttribute("data-notif-id", "_update");
+
+  var actionsHtml = '';
+  if (!isHeadless) {
+    actionsHtml =
+      '<div class="notif-banner-actions">' +
+        '<button class="notif-banner-update-now">Update now</button>' +
+      '</div>';
+  }
+
+  banner.innerHTML =
+    '<div class="notif-banner-icon"><img src="/icon-banded-76.png" width="32" height="32" alt="Clay" style="border-radius:8px"></div>' +
+    '<div class="notif-banner-body">' +
+      '<div class="notif-banner-project">CLAY</div>' +
+      '<div class="notif-banner-title">v' + escapeHtml(msg.version) + ' is available</div>' +
+      (isHeadless
+        ? '<div class="notif-banner-text">Run: npx clay-server@' + escapeHtml(updTag) + '</div>'
+        : '') +
+      actionsHtml +
+    '</div>' +
+    '<button class="notif-banner-close">' + iconHtml("x") + '</button>';
+
+  bannerContainer.appendChild(banner);
+  refreshIcons();
+
+  requestAnimationFrame(function () {
+    banner.classList.add("show");
+  });
+
+  // "Update now" button
+  var updateBtn = banner.querySelector(".notif-banner-update-now");
+  if (updateBtn) {
+    updateBtn.addEventListener("click", function (e) {
+      e.stopPropagation();
+      var ws = getWs();
+      if (ws && ws.readyState === 1) {
+        ws.send(JSON.stringify({ type: "update_now" }));
+        updateBtn.textContent = "Updating...";
+        updateBtn.disabled = true;
+      }
+    });
+  }
+
+  // Close button -> dismiss. No local throttle; the server pushes a new
+  // update_available on the next hour boundary, which re-shows naturally.
+  var closeBtn = banner.querySelector(".notif-banner-close");
+  if (closeBtn) {
+    closeBtn.addEventListener("click", function (e) {
+      e.stopPropagation();
+      removeBanner(banner);
+    });
+  }
+}
+
 // ========================================================
 // Helpers
 // ========================================================