clay-server 2.32.0-beta.5 → 2.32.0-beta.7

package/lib/project-mate-interaction.js

@@ -136,12 +136,19 @@ function attachMateInteraction(ctx) {
     } catch (e) {}
 
     // Combined gate + digest in one prompt (saves a full round-trip vs separate gate)
-    var prompt = [
+    var promptParts = [
       "[SYSTEM: Memory Gate + Digest]",
       "You are a memory system for an AI Mate (role: " + (mateRole || "assistant") + ").",
       "",
-      "Conversation (" + job.type + "):",
-      job.conversationContent,
+    ];
+    if (job.priorSummary) {
+      promptParts.push("Prior conversation context (memory summary so far):");
+      promptParts.push(job.priorSummary);
+      promptParts.push("");
+    }
+    promptParts.push("Conversation (" + job.type + "):");
+    promptParts.push(job.conversationContent);
+    var prompt = promptParts.concat([
       "",
       "STEP 1: Should this be saved to memory?",
       'Answer "no" ONLY if the entire conversation is trivial (e.g. just "hi"/"hello").',
@@ -171,7 +178,7 @@ function attachMateInteraction(ctx) {
       "user_observations: OPTIONAL array. Include ONLY if you noticed meaningful patterns about the USER themselves (not the topic).",
       "Categories: pattern (repeated behavior 2+ times), decision (explicit choice with reasoning), reaction (emotional/attitude signal), preference (tool/style/communication preference).",
       "Omit the field entirely if nothing notable about the user.",
-    ].join("\n");
+    ]).join("\n");
 
     function handleResult(text) {
       var cleaned = text.trim();
@@ -225,9 +232,14 @@ function attachMateInteraction(ctx) {
         }
       }
 
-      updateMemorySummary(job.mateCtx, job.mateId, digestObj);
-      maybeSynthesizeUserProfile(job.mateCtx, job.mateId);
-      if (job.onDone) job.onDone();
+      // Skip summary update for failed parses -- the fallback digest would degrade quality
+      if (digestObj.topic !== "parse_failed") {
+        updateMemorySummary(job.mateCtx, job.mateId, digestObj);
+        maybeSynthesizeUserProfile(job.mateCtx, job.mateId);
+        if (job.onDone) job.onDone();
+      } else {
+        if (job.onError) job.onError(new Error("parse_failed"));
+      }
       processDigestQueue();
     }
 
@@ -249,7 +261,7 @@ function attachMateInteraction(ctx) {
           console.error("[digest-worker] Error:", err);
           _digestWorker = null;
           _digestWorkerTurns = 0;
-          if (job.onDone) job.onDone();
+          if (job.onError) job.onError(err);
           processDigestQueue();
         },
       });
@@ -265,11 +277,11 @@ function attachMateInteraction(ctx) {
         onError: function (err) {
           console.error("[digest-worker] Create error:", err);
           _digestWorker = null;
-          if (job.onDone) job.onDone();
+          if (job.onError) job.onError(err);
           processDigestQueue();
         },
-      }).then(function (ws) { _digestWorker = ws; _digestWorkerTurns = 1; }).catch(function () {
-        if (job.onDone) job.onDone();
+      }).then(function (ws) { _digestWorker = ws; _digestWorkerTurns = 1; }).catch(function (err) {
+        if (job.onError) job.onError(err || new Error("digest worker creation failed"));
         processDigestQueue();
       });
     }
@@ -303,10 +315,14 @@ function attachMateInteraction(ctx) {
       type: "mention",
       conversationContent: conversationContent,
       onDone: function () { mentionSession._digesting = false; },
+      onError: function () { mentionSession._digesting = false; },
     });
   }
 
-  // Digest DM turn for mate projects - uses shared digest worker
+  // Digest DM turn for mate projects - uses shared digest worker.
+  // Delta-based: only collects new turns since the last successful digest.
+  // Concurrency debounce: turns that arrive while a digest is in-flight
+  // are naturally batched into the next flush.
   var _dmDigestPending = false;
   function digestDmTurn(session, responsePreview) {
     if (!isMate || _dmDigestPending) return;
@@ -314,11 +330,26 @@ function attachMateInteraction(ctx) {
     var mateCtx = matesModule.buildMateCtx(projectOwnerId);
     if (!matesModule.isMate(mateCtx, mateId)) return;
 
-    // Collect full conversation from session history (all user + mate turns)
+    // Track digest index per session so switching sessions doesn't misalign.
+    // On resumed sessions (after restart), recover index from the last
+    // digest_checkpoint entry in history so undigested turns aren't lost.
+    if (typeof session._dmLastDigestedIndex !== "number") {
+      session._dmLastDigestedIndex = 0;
+      for (var ci = session.history.length - 1; ci >= 0; ci--) {
+        if (session.history[ci].type === "digest_checkpoint") {
+          session._dmLastDigestedIndex = session.history[ci].digestedIndex;
+          break;
+        }
+      }
+    }
+
+    // Collect only new turns since the last successful digest
     var conversationParts = [];
     var totalLen = 0;
     var CONV_CAP = 6000;
-    for (var hi = 0; hi < session.history.length; hi++) {
+    var startIndex = session._dmLastDigestedIndex;
+    for (var hi = startIndex; hi < session.history.length; hi++) {
+      if (totalLen >= CONV_CAP) break;
       var entry = session.history[hi];
       if (entry.type === "user_message" && entry.text) {
         var uText = entry.text;
@@ -335,8 +366,8 @@ function attachMateInteraction(ctx) {
         conversationParts.push("Mate: " + aText);
         totalLen += aText.length;
       }
-      if (totalLen >= CONV_CAP) break;
     }
+    // If the latest response hasn't landed in history yet, append it
     var lastResponseText = responsePreview || "";
     if (lastResponseText && conversationParts.length > 0) {
       var lastPart = conversationParts[conversationParts.length - 1];
@@ -362,14 +393,34 @@ function attachMateInteraction(ctx) {
       });
     }
 
+    // Read existing summary to give the digest worker context for delta content
+    var priorSummary = "";
+    try {
+      if (fs.existsSync(summaryFile)) {
+        priorSummary = fs.readFileSync(summaryFile, "utf8").trim();
+      }
+    } catch (e) {}
+
     _dmDigestPending = true;
+    var snapshotIndex = session.history.length;
 
     enqueueDigest({
       mateCtx: mateCtx,
       mateId: mateId,
       type: "dm",
+      priorSummary: priorSummary || "",
       conversationContent: conversationParts.join("\n"),
-      onDone: function () { _dmDigestPending = false; },
+      onDone: function () {
+        session._dmLastDigestedIndex = snapshotIndex;
+        // Persist checkpoint so resumed sessions know where to continue
+        var checkpoint = { type: "digest_checkpoint", digestedIndex: snapshotIndex };
+        session.history.push(checkpoint);
+        sm.appendToSessionFile(session, checkpoint);
+        _dmDigestPending = false;
+      },
+      onError: function () {
+        _dmDigestPending = false;
+      },
     });
   }
 
@@ -445,6 +496,7 @@ function attachMateInteraction(ctx) {
     }
 
     session._mentionInProgress = true;
+    session._mentionActiveMateId = msg.mateId;
 
     // Send mention start indicator
     sendToSession(session.localId, {
@@ -478,6 +530,7 @@ function attachMateInteraction(ctx) {
       },
       onDone: function (fullText) {
         session._mentionInProgress = false;
+        session._mentionActiveMateId = null;
 
         // Save mention response to session history
         var mentionResponseEntry = {
@@ -512,6 +565,7 @@ function attachMateInteraction(ctx) {
       },
       onError: function (errMsg) {
         session._mentionInProgress = false;
+        session._mentionActiveMateId = null;
         // Clean up dead session
         if (session._mentionSessions && session._mentionSessions[msg.mateId]) {
           delete session._mentionSessions[msg.mateId];
@@ -615,6 +669,7 @@ function attachMateInteraction(ctx) {
         }
       }).catch(function (err) {
         session._mentionInProgress = false;
+        session._mentionActiveMateId = null;
         console.error("[mention] Failed to create session for mate " + msg.mateId + ":", err.message || err);
         sendToSession(session.localId, { type: "mention_error", mateId: msg.mateId, error: "Failed to create mention session." });
       });

package/lib/project-sessions.js

@@ -597,6 +597,10 @@ function attachSessions(ctx) {
               }
               session.history = session.history.slice(0, trimTo);
               session.messageUUIDs = session.messageUUIDs.slice(0, targetIdx);
+              // Reset digest checkpoint if it points past the trimmed history
+              if (typeof session._dmLastDigestedIndex === "number" && session._dmLastDigestedIndex > trimTo) {
+                session._dmLastDigestedIndex = trimTo;
+              }
             }
 
             // Notify adapter of conversation rollback (e.g. Codex thread/rollback)

package/lib/project.js

@@ -726,6 +726,7 @@ function createProjectContext(opts) {
           delete session._mentionSessions[mateId];
         }
         session._mentionInProgress = false;
+        session._mentionActiveMateId = null;
         sendToSession(session.localId, { type: "mention_done", mateId: mateId, stopped: true });
         send({ type: "mention_processing", mateId: mateId, active: false });
       }

package/lib/public/app.js

@@ -12,7 +12,7 @@ import {
 } from './modules/sidebar-projects.js';
 import {
   renderUserStrip, closeDmUserPicker, setCurrentDmUser,
-  updateDmBadge, renderSidebarPresence
+  updateDmBadge, renderSidebarPresence, setMentionActive, clearAllMentionActive
 } from './modules/sidebar-mates.js';
 import {
   openMobileSheet, setMobileSheetMateData, refreshMobileChatSheet

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

@@ -11,7 +11,7 @@ import { refreshIcons, iconHtml } from './icons.js';
 import { renderMarkdown } from './markdown.js';
 import { updatePageTitle } from './sidebar.js';
 import { renderSessionList, updateSessionPresence, populateCliSessionList, handleSearchResults, updateSessionBadge } from './sidebar-sessions.js';
-import { updateDmBadge, renderSidebarPresence } from './sidebar-mates.js';
+import { updateDmBadge, renderSidebarPresence, setMentionActive } from './sidebar-mates.js';
 import { refreshMobileChatSheet } from './sidebar-mobile.js';
 import { renderMateSessionList, handleMateSearchResults, updateMateSidebarProfile } from './mate-sidebar.js';
 import { renderKnowledgeList, handleKnowledgeContent } from './mate-knowledge.js';
@@ -38,7 +38,7 @@ import { handleLoopRegistryUpdated, handleScheduleRunStarted, handleScheduleRunF
 
 // --- App module imports ---
 import { scrollToBottom, addToMessages, addUserMessage, addSystemMessage, removeMatePreThinking, appendDelta, finalizeAssistantBlock, addConflictMessage, addContextOverflowMessage, addAuthRequiredMessage, showSuggestionChips } from './app-rendering.js';
-import { setActivity, startUrgentBlink, stopUrgentBlink, blinkSessionDot } from './app-favicon.js';
+import { setActivity, startUrgentBlink, stopUrgentBlink, blinkSessionDot, updateCrossProjectBlink } from './app-favicon.js';
 import { setStatus } from './app-connection.js';
 import { getModelEffortLevels, accumulateUsage, updateUsagePanel, accumulateContext, updateContextPanel, renderCtxPopover, updateStatusPanel } from './app-panels.js';
 import { updateProjectList, resetClientState, showUpdateAvailable, handleRemoveProjectCheckResult, handleRemoveProjectResult, handleBrowseDirResult, handleAddProjectResult, handleCloneProgress } from './app-projects.js';
@@ -1324,6 +1324,7 @@ export function processMessage(msg) {
       case "mention_processing":
         // Broadcast: show/hide activity dot on mate avatar across all tabs
         if (msg.mateId) {
+          setMentionActive(msg.mateId, msg.active);
           var mateContainers = document.querySelectorAll('.icon-strip-mate[data-user-id="' + msg.mateId + '"]');
           for (var mi = 0; mi < mateContainers.length; mi++) {
             var dot = mateContainers[mi].querySelector(".icon-strip-status");
@@ -1335,6 +1336,7 @@ export function processMessage(msg) {
               mateContainers[mi].classList.remove("mention-active");
             }
           }
+          updateCrossProjectBlink();
         }
         break;
 

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

@@ -24,6 +24,7 @@ import { connect, cancelReconnect, setStatus } from './app-connection.js';
 import { setTurnCounter, setPrependAnchor, setActivityEl, setIsUserScrolledUp, hideSuggestionChips } from './app-rendering.js';
 import { resetToolState, enableMainInput, resetTurnMetaCost } from './tools.js';
 import { clearPendingImages } from './input.js';
+import { clearAllMentionActive } from './sidebar-mates.js';
 import { setRewindMode } from './rewind.js';
 import { resetUsage, resetContext } from './app-panels.js';
 import { resetRateLimitState } from './app-rate-limit.js';
@@ -366,6 +367,7 @@ export function resetClientState() {
   store.set({ currentFullText: "" });
   resetToolState();
   clearPendingImages();
+  clearAllMentionActive();
   setActivityEl(null);
   store.set({ processing: false });
   setTurnCounter(0);

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

@@ -29,6 +29,16 @@ var currentDmUserId = null;
 var dmPickerOpen = false;
 var cachedDmRemovedUsers = {};
 var cachedMates = [];
+var activeMentionMateIds = {};
+
+export function setMentionActive(mateId, active) {
+  if (active) { activeMentionMateIds[mateId] = true; }
+  else { delete activeMentionMateIds[mateId]; }
+}
+
+export function clearAllMentionActive() {
+  activeMentionMateIds = {};
+}
 var _lastUserStripJson = "";
 
 // --- Icon strip tooltip ---
@@ -413,7 +423,9 @@ export function renderUserStrip(allUsers, onlineUserIds, myUserId, dmFavorites,
       // Processing status dot (IO blink) - top-left
       var statusDot = document.createElement("span");
       statusDot.className = "icon-strip-status";
-      if (mateProj.isProcessing) statusDot.classList.add("processing");
+      var isMentionActive = !!activeMentionMateIds[mate.id];
+      if (mateProj.isProcessing || isMentionActive) statusDot.classList.add("processing");
+      if (isMentionActive) el.classList.add("mention-active");
       el.appendChild(statusDot);
 
       // Mate badge (bot icon)

package/lib/sessions.js

@@ -354,6 +354,8 @@ function createSessionManager(opts) {
 
     for (var i = fromIndex; i < total; i++) {
       var _item = session.history[i];
+      // Skip internal bookkeeping entries not meant for the UI
+      if (_item && _item.type === "digest_checkpoint") continue;
       if (_item && (_item.type === "mention_user" || _item.type === "mention_response")) {
         console.log("[DEBUG replayHistory] sending mention at index=" + i + " from=" + fromIndex + " total=" + total + " type=" + _item.type + " mate=" + (_item.mateName || ""));
       }
@@ -423,6 +425,11 @@ function createSessionManager(opts) {
         decisionReason: p.decisionReason,
       });
     }
+
+    // Re-send active mention indicator so returning clients restore the mate avatar state
+    if (session._mentionInProgress && session._mentionActiveMateId) {
+      _send({ type: "mention_processing", mateId: session._mentionActiveMateId, active: true });
+    }
   }
 
   function cleanupMentionSessions(session) {

package/lib/yoke/adapters/claude.js

@@ -895,9 +895,18 @@ function createWorkerQueryHandle(worker, canUseTool, onElicitation) {
 
 // --- Adapter factory ---
 
+function resolveClaudeBinaryPath() {
+  try {
+    var result = require("child_process").execSync("which claude", { encoding: "utf8", timeout: 5000 }).trim();
+    if (result && fs.existsSync(result)) return result;
+  } catch (e) {}
+  return null;
+}
+
 function createClaudeAdapter(opts) {
   var _cwd = (opts && opts.cwd) || process.cwd();
   var _cachedModels = [];
+  var _claudeBinaryPath = resolveClaudeBinaryPath();
 
   // Path to the worker script (for OS-level user isolation)
   var workerScriptPath = path.join(__dirname, "claude-worker.js");
@@ -935,6 +944,7 @@ function createClaudeAdapter(opts) {
         settingSources: ["user", "project", "local"],
         abortController: ac,
       };
+      if (_claudeBinaryPath) warmupOptions.pathToClaudeCodeExecutable = _claudeBinaryPath;
 
       if (initOpts && initOpts.dangerouslySkipPermissions) {
         warmupOptions.permissionMode = "bypassPermissions";
@@ -1069,6 +1079,7 @@ function createClaudeAdapter(opts) {
         cwd: queryOpts.cwd || _cwd,
         abortController: ac,
       };
+      if (_claudeBinaryPath) sdkOptions.pathToClaudeCodeExecutable = _claudeBinaryPath;
 
       // YOKE standard options -> SDK options
       if (queryOpts.systemPrompt) sdkOptions.systemPrompt = queryOpts.systemPrompt;
@@ -1346,6 +1357,7 @@ function createClaudeAdapter(opts) {
         settingSources: ["user", "project", "local"],
         abortController: ac,
       };
+      if (_claudeBinaryPath) warmupOptions.pathToClaudeCodeExecutable = _claudeBinaryPath;
 
       if (initOpts && initOpts.dangerouslySkipPermissions) {
         warmupOptions.permissionMode = "bypassPermissions";
@@ -1419,6 +1431,7 @@ function createClaudeAdapter(opts) {
     }
 
     var warmupOptions = { cwd: workerCwd, settingSources: ["user", "project", "local"] };
+    if (_claudeBinaryPath) warmupOptions.pathToClaudeCodeExecutable = _claudeBinaryPath;
     if (initOpts && initOpts.dangerouslySkipPermissions) {
       warmupOptions.permissionMode = "bypassPermissions";
       warmupOptions.allowDangerouslySkipPermissions = true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clay-server",
-  "version": "2.32.0-beta.5",
+  "version": "2.32.0-beta.7",
   "description": "Self-hosted Claude Code in your browser. Multi-session, multi-user, push notifications.",
   "bin": {
     "clay-server": "./bin/cli.js",