clay-server 2.35.0 → 2.35.1-beta.1

package/lib/project-mate-interaction.js

@@ -27,47 +27,65 @@ function attachMateInteraction(ctx) {
   // it comes from the debate module initialized after this one.
 
   // --- @Mention handler ---
-  var MENTION_WINDOW = 20; // turns to check for session continuity
-
-  function getRecentTurns(session, n) {
+  var MENTION_WINDOW = 20; // turns to check for session continuity (recency check only)
+  var MENTION_CONTEXT_BUDGET = 32 * 1024; // 32KB total budget for prior turns fed into mention context
+  var MENTION_CONTEXT_MAX_TURNS = 200; // hard safety cap so we never walk the entire session
+
+  // Walk session history backwards collecting full turns (no per-turn truncation)
+  // until either maxTurns is reached or byteBudget is exhausted. Each turn keeps
+  // its full text; we drop older turns first when the budget runs out.
+  function getRecentTurns(session, maxTurns, byteBudget) {
     var turns = [];
+    var totalBytes = 0;
     var history = session.history;
-    // Walk backwards through history, collect user/assistant/mention text turns
     var assistantBuffer = "";
-    for (var i = history.length - 1; i >= 0 && turns.length < n; i--) {
+
+    function tryPush(turn) {
+      var size = (turn.text || "").length + (turn.role || "").length + 4;
+      // Always keep at least one turn so a single long message still gets through.
+      if (byteBudget && turns.length > 0 && totalBytes + size > byteBudget) return false;
+      turns.push(turn);
+      totalBytes += size;
+      return true;
+    }
+
+    for (var i = history.length - 1; i >= 0 && turns.length < maxTurns; i--) {
       var entry = history[i];
       if (entry.type === "user_message") {
         if (assistantBuffer) {
-          turns.push({ role: "assistant", text: assistantBuffer.trim() });
+          if (!tryPush({ role: "assistant", text: assistantBuffer.trim() })) { assistantBuffer = ""; break; }
           assistantBuffer = "";
         }
-        turns.push({ role: "user", text: entry.text || "" });
+        if (!tryPush({ role: "user", text: entry.text || "" })) break;
       } else if (entry.type === "delta" || entry.type === "text") {
         assistantBuffer = (entry.text || "") + assistantBuffer;
       } else if (entry.type === "mention_response") {
         if (assistantBuffer) {
-          turns.push({ role: "assistant", text: assistantBuffer.trim() });
+          if (!tryPush({ role: "assistant", text: assistantBuffer.trim() })) { assistantBuffer = ""; break; }
           assistantBuffer = "";
         }
-        turns.push({ role: "@" + (entry.mateName || "Mate"), text: entry.text || "", mateId: entry.mateId });
+        if (!tryPush({ role: "@" + (entry.mateName || "Mate"), text: entry.text || "", mateId: entry.mateId })) break;
       } else if (entry.type === "mention_user") {
         if (assistantBuffer) {
-          turns.push({ role: "assistant", text: assistantBuffer.trim() });
+          if (!tryPush({ role: "assistant", text: assistantBuffer.trim() })) { assistantBuffer = ""; break; }
           assistantBuffer = "";
         }
-        turns.push({ role: "user", text: "@" + (entry.mateName || "Mate") + " " + (entry.text || ""), mateId: entry.mateId });
+        if (!tryPush({ role: "user", text: "@" + (entry.mateName || "Mate") + " " + (entry.text || ""), mateId: entry.mateId })) break;
       }
     }
-    if (assistantBuffer) {
-      turns.push({ role: "assistant", text: assistantBuffer.trim() });
+    if (assistantBuffer && turns.length < maxTurns) {
+      tryPush({ role: "assistant", text: assistantBuffer.trim() });
     }
     turns.reverse();
     return turns;
   }
 
-  // Check if the given mate has a mention response in the recent window
-  function hasMateInWindow(recentTurns, mateId) {
-    for (var i = 0; i < recentTurns.length; i++) {
+  // Check if the given mate has a mention response within the most recent
+  // `windowSize` turns. Continuity is recency-based, even when getRecentTurns
+  // returns more turns to satisfy the byte budget.
+  function hasMateInWindow(recentTurns, mateId, windowSize) {
+    var start = windowSize ? Math.max(0, recentTurns.length - windowSize) : 0;
+    for (var i = start; i < recentTurns.length; i++) {
       if (recentTurns[i].mateId === mateId && recentTurns[i].role.charAt(0) === "@") {
         return true;
       }
@@ -83,11 +101,11 @@ function attachMateInteraction(ctx) {
       var t = recentTurns[i];
       if (t.mateId === mateId && t.role.charAt(0) === "@") { found = true; break; }
       if (t.role === "user") {
-        lines.unshift("[User said after your last reply: " + t.text.substring(0, 500) + "]");
+        lines.unshift("[User said after your last reply: " + t.text + "]");
       } else if (t.role === "assistant") {
-        lines.unshift("[Session agent replied: " + t.text.substring(0, 500) + "]");
+        lines.unshift("[Session agent replied: " + t.text + "]");
       } else if (t.role.charAt(0) === "@") {
-        lines.unshift("[@" + t.role.substring(1) + " replied: " + t.text.substring(0, 500) + "]");
+        lines.unshift("[@" + t.role.substring(1) + " replied: " + t.text + "]");
       }
     }
     if (!found || lines.length === 0) return "";
@@ -101,7 +119,7 @@ function attachMateInteraction(ctx) {
     for (var i = 0; i < recentTurns.length; i++) {
       var t = recentTurns[i];
       var label = t.role === "user" ? userName : t.role === "assistant" ? "Session Agent" : t.role;
-      lines.push(label + ": " + t.text.substring(0, 500));
+      lines.push(label + ": " + t.text);
     }
     return lines.join("\n") + "\n\n";
   }
@@ -512,7 +530,7 @@ function attachMateInteraction(ctx) {
     sendToSessionOthers(ws, session.localId, hydrateImageRefs(mentionUserEntry));
 
     // Extract recent turns for continuity check
-    var recentTurns = getRecentTurns(session, MENTION_WINDOW);
+    var recentTurns = getRecentTurns(session, MENTION_CONTEXT_MAX_TURNS, MENTION_CONTEXT_BUDGET);
 
     // Determine user name for context
     var userName = "User";
@@ -612,7 +630,7 @@ function attachMateInteraction(ctx) {
     // Session continuity: check if this mate has a response in the recent window
     var existingSession = session._mentionSessions[msg.mateId];
     // Don't reuse a session that's still generating a digest (would mix digest output into mention stream)
-    var canContinue = existingSession && existingSession.isAlive() && !existingSession._digesting && hasMateInWindow(recentTurns, msg.mateId);
+    var canContinue = existingSession && existingSession.isAlive() && !existingSession._digesting && hasMateInWindow(recentTurns, msg.mateId, MENTION_WINDOW);
 
     if (canContinue) {
       // Continue existing mention session with middle context

package/package.json

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