clay-server 2.36.2-beta.7 → 2.36.2-beta.9

package/lib/public/css/rewind.css

@@ -284,6 +284,14 @@
   color: var(--accent2);
 }
 
+.activity-inline-avatar {
+  width: 28px;
+  height: 28px;
+  border-radius: 50%;
+  flex-shrink: 0;
+  object-fit: cover;
+}
+
 .activity-inline .activity-icon {
   display: inline-flex;
   animation: sparkle 2s ease-in-out infinite;

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

@@ -5,7 +5,8 @@ import { refreshIcons } from './icons.js';
 import { store } from './store.js';
 import { getSendBtn, getStatusDot } from './dom-refs.js';
 import { onThemeChange } from './theme.js';
-import { getActivityEl, setActivityEl, addToMessages, scrollToBottom } from './app-rendering.js';
+import { getActivityEl, setActivityEl, addToMessages, scrollToBottom, VENDOR_AVATARS } from './app-rendering.js';
+import { escapeHtml } from './utils.js';
 
 // --- Module-owned state ---
 var faviconLink, faviconOrigHref, faviconCanvas, faviconCtx, faviconImg, faviconImgReady;
@@ -199,8 +200,21 @@ export function setActivity(text) {
     if (!getActivityEl()) {
       var _actEl = document.createElement("div");
       _actEl.className = "activity-inline";
-      _actEl.innerHTML =
-        '<div class="mate-thinking-dots"><span></span><span></span><span></span></div>';
+      // In channel mode (Claude Code / Codex sessions), include the vendor
+      // avatar so the user can see who is responding while the dots are
+      // animating. DM mode handles its own avatar via mate-thinking
+      // elements and shouldn't pick up a vendor avatar here.
+      var _isDm = !!(store.get('dmMode') && store.get('dmTargetUser') && store.get('dmTargetUser').isMate);
+      if (!_isDm) {
+        var _vendor = store.get('currentVendor') || 'claude';
+        var _avatarUrl = VENDOR_AVATARS[_vendor] || VENDOR_AVATARS.claude;
+        _actEl.innerHTML =
+          '<img class="activity-inline-avatar" src="' + escapeHtml(_avatarUrl) + '" alt="">' +
+          '<div class="mate-thinking-dots"><span></span><span></span><span></span></div>';
+      } else {
+        _actEl.innerHTML =
+          '<div class="mate-thinking-dots"><span></span><span></span><span></span></div>';
+      }
       setActivityEl(_actEl);
       addToMessages(_actEl);
     }

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

@@ -733,6 +733,10 @@ export function processMessage(msg) {
           // applied at history_done time.
           store.set({ sessionIsProcessing: true });
           applyDeadSessionTodoCompaction();
+          // Server confirmed the turn started: pre-thinking dots have done
+          // their job, drop them so they aren't stranded if no further
+          // events make it through.
+          removeMatePreThinking();
           if (!(store.get('dmMode') && store.get('dmTargetUser') && store.get('dmTargetUser').isMate) && !store.get('matePreThinkingEl')) {
             setActivity("thinking");
           }
@@ -740,6 +744,10 @@ export function processMessage(msg) {
         break;
 
       case "compacting":
+        // Compacting means the SDK is mid-turn doing context compaction.
+        // Pre-thinking dots have served their purpose, clear them so the
+        // user sees the compaction indicator instead.
+        removeMatePreThinking();
         if (msg.active) {
           setActivity("compacting");
         } else if (!(store.get('dmMode') && store.get('dmTargetUser') && store.get('dmTargetUser').isMate)) {
@@ -934,6 +942,10 @@ export function processMessage(msg) {
         break;
 
       case "result":
+        // Result marks turn end. Drop pre-thinking even if no delta/tool
+        // event ever arrived (e.g. tool-only turn whose progress signals
+        // were missed by the client).
+        removeMatePreThinking();
         setActivity(null);
         stopThinking();
         markAllToolsDone();

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

@@ -623,6 +623,23 @@ function doShowMatePreThinking(mateName, mateAvatar) {
   }
   refreshIcons();
   scrollToBottom();
+  // Safety net: if no server event ever clears these dots (lost in transit,
+  // missed handler, etc.) the user sees them forever and assumes the
+  // session is hung. After 90s with zero progress, clear the indicator
+  // and log a system note so the user knows to retry.
+  if (matePreThinkingTimer) clearTimeout(matePreThinkingTimer);
+  matePreThinkingTimer = setTimeout(function () {
+    var stillThere = store.get('matePreThinkingEl');
+    if (!stillThere) return;
+    stillThere.remove();
+    store.set({ matePreThinkingEl: null });
+    matePreThinkingTimer = null;
+    var note = document.createElement("div");
+    note.className = "system-msg";
+    note.textContent = "No response received in 90s. The server may have stalled. Send another message to retry.";
+    addToMessages(note);
+    scrollToBottom();
+  }, 90000);
 }
 
 export function removeMatePreThinking() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clay-server",
-  "version": "2.36.2-beta.7",
+  "version": "2.36.2-beta.9",
   "description": "Self-hosted team workspace for Claude Code and Codex. Multi-user, browser-based, with persistent AI mates.",
   "bin": {
     "clay-server": "./bin/cli.js",