clay-server 2.18.0-beta.2 → 2.18.0-beta.3

package/lib/project.js

@@ -3673,8 +3673,18 @@ function createProjectContext(opts) {
     var avatarStyle = (mate.profile && mate.profile.avatarStyle) || "bottts";
     var avatarSeed = (mate.profile && mate.profile.avatarSeed) || mate.id;
 
+    // Build full mention text (include pasted content)
+    var mentionFullInput = msg.text;
+    if (msg.pastes && msg.pastes.length > 0) {
+      for (var pi = 0; pi < msg.pastes.length; pi++) {
+        if (mentionFullInput) mentionFullInput += "\n\n";
+        mentionFullInput += msg.pastes[pi];
+      }
+    }
+
     // Save mention user message to session history
     var mentionUserEntry = { type: "mention_user", text: msg.text, mateId: msg.mateId, mateName: mateName };
+    if (msg.pastes && msg.pastes.length > 0) mentionUserEntry.pastes = msg.pastes;
     session.history.push(mentionUserEntry);
     sm.appendToSessionFile(session, mentionUserEntry);
     sendToSessionOthers(ws, session.localId, mentionUserEntry);
@@ -3769,7 +3779,7 @@ function createProjectContext(opts) {
     if (canContinue) {
       // Continue existing mention session with middle context
       var middleContext = buildMiddleContext(recentTurns, msg.mateId);
-      var continuationText = middleContext ? middleContext + "\n\n" + msg.text : msg.text;
+      var continuationText = middleContext ? middleContext + "\n\n" + mentionFullInput : mentionFullInput;
       existingSession.pushMessage(continuationText, mentionCallbacks);
     } else {
       // Clean up old session if it exists
@@ -3794,11 +3804,46 @@ function createProjectContext(opts) {
       sdk.createMentionSession({
         claudeMd: claudeMd,
         initialContext: mentionContext,
-        initialMessage: msg.text,
+        initialMessage: mentionFullInput,
         onActivity: mentionCallbacks.onActivity,
         onDelta: mentionCallbacks.onDelta,
         onDone: mentionCallbacks.onDone,
         onError: mentionCallbacks.onError,
+        canUseTool: function (toolName, input, toolOpts) {
+          var autoAllow = { Read: true, Glob: true, Grep: true };
+          if (autoAllow[toolName]) {
+            return Promise.resolve({ behavior: "allow", updatedInput: input });
+          }
+          // Route through the project session's permission system
+          return new Promise(function (resolve) {
+            var requestId = crypto.randomUUID();
+            session.pendingPermissions[requestId] = {
+              resolve: resolve,
+              requestId: requestId,
+              toolName: toolName,
+              toolInput: input,
+              toolUseId: toolOpts ? toolOpts.toolUseID : undefined,
+              decisionReason: (toolOpts && toolOpts.decisionReason) || "",
+            };
+            sendToSession(session.localId, {
+              type: "permission_request",
+              requestId: requestId,
+              toolName: toolName,
+              toolInput: input,
+              toolUseId: toolOpts ? toolOpts.toolUseID : undefined,
+              decisionReason: (toolOpts && toolOpts.decisionReason) || "",
+            });
+            onProcessingChanged();
+            if (toolOpts && toolOpts.signal) {
+              toolOpts.signal.addEventListener("abort", function () {
+                delete session.pendingPermissions[requestId];
+                sendToSession(session.localId, { type: "permission_cancel", requestId: requestId });
+                onProcessingChanged();
+                resolve({ behavior: "deny", message: "Request cancelled" });
+              });
+            }
+          });
+        },
       }).then(function (mentionSession) {
         if (mentionSession) {
           session._mentionSessions[msg.mateId] = mentionSession;

package/lib/public/modules/input.js

@@ -92,9 +92,10 @@ export function sendMessage() {
   if (mention) {
     hideMentionMenu();
     if (ctx.hideSuggestionChips) ctx.hideSuggestionChips();
+    var mentionPastes = pendingPastes.map(function (p) { return p.text; });
     // Render user message with mention chip (same as history replay)
     renderMentionUser({ mateName: mention.mateName, text: mention.text });
-    sendMention(mention.mateId, mention.text);
+    sendMention(mention.mateId, mention.text, mentionPastes);
     clearMentionState();
     ctx.inputEl.value = "";
     sendInputSync();

package/lib/public/modules/mention.js

@@ -233,9 +233,11 @@ export function clearMentionState() {
   removeInputMentionChip();
 }
 
-export function sendMention(mateId, text) {
+export function sendMention(mateId, text, pastes) {
   if (!ctx.ws || !ctx.connected) return;
-  ctx.ws.send(JSON.stringify({ type: "mention", mateId: mateId, text: text }));
+  var payload = { type: "mention", mateId: mateId, text: text };
+  if (pastes && pastes.length > 0) payload.pastes = pastes;
+  ctx.ws.send(JSON.stringify(payload));
 }
 
 // --- Mention response rendering ---

package/lib/sdk-bridge.js

@@ -1773,7 +1773,7 @@ function createSDKBridge(opts) {
           settingSources: ["user"],
           includePartialMessages: true,
           abortController: abortController,
-          canUseTool: function (toolName, input) {
+          canUseTool: opts.canUseTool || function (toolName, input) {
             var allowed = { Read: true, Glob: true, Grep: true };
             if (allowed[toolName]) {
               return Promise.resolve({ behavior: "allow", updatedInput: input });
@@ -1866,16 +1866,21 @@ function createSDKBridge(opts) {
           } else if (sdkMsg.type === "result") {
             // One response complete. Signal done and reset for next message.
             if (currentOnActivity) currentOnActivity(null);
-            if (currentOnDone) {
-              currentOnDone(responseFullText);
+            var doneRef = currentOnDone;
+            if (doneRef) {
+              doneRef(responseFullText);
+            }
+            // Only reset if pushMessage was not called during onDone
+            // (pushMessage swaps callbacks and resets state itself)
+            if (currentOnDone === doneRef) {
+              currentOnDelta = null;
+              currentOnDone = null;
+              currentOnError = null;
+              currentOnActivity = null;
+              mentionBlocks = {};
+              responseFullText = "";
+              responseStreamedText = false;
             }
-            currentOnDelta = null;
-            currentOnDone = null;
-            currentOnError = null;
-            currentOnActivity = null;
-            mentionBlocks = {};
-            responseFullText = "";
-            responseStreamedText = false;
           }
         }
       } catch (err) {

package/package.json

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