clay-server 2.17.0 → 2.18.0-beta.2

package/lib/sdk-bridge.js

@@ -1115,6 +1115,14 @@ function createSDKBridge(opts) {
       return Promise.resolve({ behavior: "allow", updatedInput: input });
     }
 
+    // Mate sessions (DM): auto-approve read-only tools
+    if (mateDisplayName) {
+      var mateReadTools = { Read: true, Glob: true, Grep: true };
+      if (mateReadTools[toolName]) {
+        return Promise.resolve({ behavior: "allow", updatedInput: input });
+      }
+    }
+
     // AskUserQuestion: wait for user answers via WebSocket
     if (toolName === "AskUserQuestion") {
       return new Promise(function(resolve) {
@@ -1729,6 +1737,182 @@ function createSDKBridge(opts) {
     }
   }
 
+  // --- @Mention: persistent read-only session for a mentioned Mate ---
+  // Creates a mention session that can be reused across multiple mentions
+  // within a conversation flow (session continuity).
+  async function createMentionSession(opts) {
+    // opts: { claudeMd, initialContext, initialMessage, onDelta, onDone, onError, onActivity }
+    var sdk;
+    try {
+      sdk = await getSDK();
+    } catch (e) {
+      opts.onError("Failed to load Claude SDK: " + (e.message || e));
+      return null;
+    }
+
+    var mq = createMessageQueue();
+    var abortController = new AbortController();
+
+    // Current response callbacks (swapped on each pushMessage)
+    var currentOnDelta = opts.onDelta;
+    var currentOnDone = opts.onDone;
+    var currentOnError = opts.onError;
+    var currentOnActivity = opts.onActivity || null;
+    var responseFullText = "";
+    var responseStreamedText = false;
+    var mentionBlocks = {};
+    var alive = true;
+
+    var query;
+    try {
+      query = sdk.query({
+        prompt: mq,
+        options: {
+          cwd: cwd,
+          systemPrompt: opts.claudeMd,
+          settingSources: ["user"],
+          includePartialMessages: true,
+          abortController: abortController,
+          canUseTool: function (toolName, input) {
+            var allowed = { Read: true, Glob: true, Grep: true };
+            if (allowed[toolName]) {
+              return Promise.resolve({ behavior: "allow", updatedInput: input });
+            }
+            return Promise.resolve({
+              behavior: "deny",
+              message: "Read-only access. You cannot make changes via @mention.",
+            });
+          },
+        },
+      });
+    } catch (e) {
+      opts.onError("Failed to create mention query: " + (e.message || e));
+      return null;
+    }
+
+    // Push the initial message (context + question)
+    var initialPrompt = opts.initialContext + "\n\n" + opts.initialMessage;
+    mq.push({
+      type: "user",
+      message: { role: "user", content: [{ type: "text", text: initialPrompt }] },
+    });
+
+    // Background stream processing loop
+    (async function () {
+      try {
+        for await (var sdkMsg of query) {
+          if (sdkMsg.type === "stream_event" && sdkMsg.event) {
+            var evt = sdkMsg.event;
+
+            // Track content blocks for activity reporting
+            if (evt.type === "content_block_start") {
+              var block = evt.content_block;
+              var idx = evt.index;
+              if (block.type === "thinking") {
+                mentionBlocks[idx] = { type: "thinking" };
+                if (currentOnActivity) currentOnActivity("thinking");
+              } else if (block.type === "tool_use") {
+                mentionBlocks[idx] = { type: "tool_use", name: block.name, inputJson: "" };
+                var toolLabel = block.name;
+                if (toolLabel === "Read") toolLabel = "Reading file...";
+                else if (toolLabel === "Grep") toolLabel = "Searching code...";
+                else if (toolLabel === "Glob") toolLabel = "Finding files...";
+                if (currentOnActivity) currentOnActivity(toolLabel);
+              } else if (block.type === "text") {
+                mentionBlocks[idx] = { type: "text" };
+              }
+            }
+
+            if (evt.type === "content_block_delta" && evt.delta) {
+              if (evt.delta.type === "text_delta" && typeof evt.delta.text === "string") {
+                responseStreamedText = true;
+                responseFullText += evt.delta.text;
+                if (currentOnActivity) currentOnActivity(null); // clear activity on text
+                if (currentOnDelta) currentOnDelta(evt.delta.text);
+              } else if (evt.delta.type === "input_json_delta" && mentionBlocks[evt.index]) {
+                mentionBlocks[evt.index].inputJson += evt.delta.partial_json;
+              }
+            }
+
+            if (evt.type === "content_block_stop") {
+              var blk = mentionBlocks[evt.index];
+              if (blk && blk.type === "tool_use") {
+                // Show what file is being read
+                var toolInput = {};
+                try { toolInput = JSON.parse(blk.inputJson); } catch (e) {}
+                if (blk.name === "Read" && toolInput.file_path) {
+                  var fname = toolInput.file_path.split(/[/\\]/).pop();
+                  if (currentOnActivity) currentOnActivity("Reading " + fname + "...");
+                } else if (blk.name === "Grep" && toolInput.pattern) {
+                  if (currentOnActivity) currentOnActivity("Searching: " + toolInput.pattern.substring(0, 30) + "...");
+                } else if (blk.name === "Glob" && toolInput.pattern) {
+                  if (currentOnActivity) currentOnActivity("Finding: " + toolInput.pattern.substring(0, 30) + "...");
+                }
+              }
+              delete mentionBlocks[evt.index];
+            }
+
+          } else if (sdkMsg.type === "assistant" && !responseStreamedText && sdkMsg.message && sdkMsg.message.content) {
+            // Fallback: if text was not streamed via deltas, extract from assistant message
+            var content = sdkMsg.message.content;
+            if (Array.isArray(content)) {
+              for (var ci = 0; ci < content.length; ci++) {
+                if (content[ci].type === "text" && content[ci].text) {
+                  responseFullText += content[ci].text;
+                  if (currentOnDelta) currentOnDelta(content[ci].text);
+                }
+              }
+            }
+          } else if (sdkMsg.type === "result") {
+            // One response complete. Signal done and reset for next message.
+            if (currentOnActivity) currentOnActivity(null);
+            if (currentOnDone) {
+              currentOnDone(responseFullText);
+            }
+            currentOnDelta = null;
+            currentOnDone = null;
+            currentOnError = null;
+            currentOnActivity = null;
+            mentionBlocks = {};
+            responseFullText = "";
+            responseStreamedText = false;
+          }
+        }
+      } catch (err) {
+        if (currentOnError) {
+          if (err.name === "AbortError" || (abortController && abortController.signal.aborted)) {
+            currentOnError("Mention query was cancelled.");
+          } else {
+            currentOnError(err.message || String(err));
+          }
+        }
+      }
+      alive = false;
+    })();
+
+    return {
+      // Push a follow-up message to the existing mention session
+      pushMessage: function (text, callbacks) {
+        currentOnDelta = callbacks.onDelta;
+        currentOnDone = callbacks.onDone;
+        currentOnError = callbacks.onError;
+        currentOnActivity = callbacks.onActivity || null;
+        mentionBlocks = {};
+        responseFullText = "";
+        responseStreamedText = false;
+        mq.push({
+          type: "user",
+          message: { role: "user", content: [{ type: "text", text: text }] },
+        });
+      },
+      close: function () {
+        alive = false;
+        try { mq.end(); } catch (e) {}
+      },
+      isAlive: function () { return alive; },
+    };
+  }
+
   return {
     createMessageQueue: createMessageQueue,
     processSDKMessage: processSDKMessage,
@@ -1746,6 +1930,7 @@ function createSDKBridge(opts) {
     permissionPushBody: permissionPushBody,
     warmup: warmup,
     stopTask: stopTask,
+    createMentionSession: createMentionSession,
   };
 }
 

package/lib/sessions.js

@@ -395,6 +395,16 @@ function createSessionManager(opts) {
     }
   }
 
+  function cleanupMentionSessions(session) {
+    if (session._mentionSessions) {
+      var mateIds = Object.keys(session._mentionSessions);
+      for (var mi = 0; mi < mateIds.length; mi++) {
+        try { session._mentionSessions[mateIds[mi]].close(); } catch (e) {}
+      }
+      session._mentionSessions = {};
+    }
+  }
+
   function deleteSession(localId, targetWs) {
     var session = sessions.get(localId);
     if (!session) return;
@@ -402,6 +412,8 @@ function createSessionManager(opts) {
     // Clean up unread tracking
     delete singleUserUnread[localId];
 
+    cleanupMentionSessions(session);
+
     if (session.abortController) {
       try { session.abortController.abort(); } catch(e) {}
     }
@@ -431,6 +443,7 @@ function createSessionManager(opts) {
     var session = sessions.get(localId);
     if (!session) return;
     delete singleUserUnread[localId];
+    cleanupMentionSessions(session);
     if (session.abortController) {
       try { session.abortController.abort(); } catch(e) {}
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clay-server",
-  "version": "2.17.0",
+  "version": "2.18.0-beta.2",
   "description": "Web UI for Claude Code. Any device. Push notifications.",
   "bin": {
     "clay-server": "./bin/cli.js",