clay-server 2.35.1 → 2.36.0-beta.2

package/lib/project-user-mention.js

@@ -0,0 +1,193 @@
+// project-user-mention.js - User-to-user @mention handling within a session.
+//
+// Mirrors the @mate mention pattern (see project-mate-interaction.js) but for
+// human users. Each user_mention is a one-shot side-channel message that:
+//   1. Is broadcast to all session viewers as a `user_mention` event
+//   2. Is recorded in session.history so it survives reload/replay
+//   3. Pushes a transcript line into session.pendingMentionContexts so the
+//      coding agent sees the exchange on its next regular turn
+//   4. Fires a notification + push for the targeted user
+//
+// Multi-target (`@a @b`) is intentionally NOT supported here -- callers send
+// one user_mention per target. This keeps the wire protocol and progress
+// tracking simple. Multi-target support can be layered on later.
+
+function attachUserMention(ctx) {
+  var slug = ctx.slug || "";
+  var sm = ctx.sm;
+  var send = ctx.send;
+  var sendTo = ctx.sendTo;
+  var sendToSession = ctx.sendToSession;
+  var sendToSessionOthers = ctx.sendToSessionOthers;
+  var getSessionForWs = ctx.getSessionForWs;
+  var getLinuxUserForSession = ctx.getLinuxUserForSession;
+  var saveImageFile = ctx.saveImageFile;
+  var hydrateImageRefs = ctx.hydrateImageRefs;
+  var usersModule = ctx.usersModule;
+  var pushModule = ctx.pushModule || null;
+  var isUserOnline = ctx.isUserOnline || function () { return false; };
+  var getNotificationsModule = ctx.getNotificationsModule || function () { return null; };
+  var getProjectTitle = ctx.getProjectTitle || function () { return slug; };
+
+  function buildPreview(text) {
+    var preview = (text || "").replace(/\s+/g, " ").trim();
+    if (preview.length > 140) preview = preview.substring(0, 140) + "...";
+    return preview;
+  }
+
+  function resolveSenderName(ws) {
+    if (!ws._clayUser) return "Someone";
+    var u = ws._clayUser;
+    var p = u.profile || {};
+    return p.name || u.displayName || u.username || "Someone";
+  }
+
+  function resolveSenderAvatar(ws) {
+    if (!ws._clayUser) return null;
+    var u = ws._clayUser;
+    var p = u.profile || {};
+    return {
+      style: p.avatarStyle || "thumbs",
+      seed: p.avatarSeed || u.username || u.id,
+      color: p.avatarColor || "#7c3aed",
+      custom: p.avatarCustom || "",
+    };
+  }
+
+  function resolveTargetUser(targetUserId) {
+    if (!targetUserId || !usersModule || typeof usersModule.findUserById !== "function") return null;
+    var u = usersModule.findUserById(targetUserId);
+    if (!u) return null;
+    var p = u.profile || {};
+    return {
+      id: u.id,
+      name: p.name || u.displayName || u.username || "User",
+      username: u.username,
+      avatarStyle: p.avatarStyle || "thumbs",
+      avatarSeed: p.avatarSeed || u.username,
+      avatarColor: p.avatarColor || "#7c3aed",
+    };
+  }
+
+  function handleUserMention(ws, msg) {
+    if (!msg.targetUserId) {
+      sendTo(ws, { type: "user_mention_error", error: "Missing targetUserId" });
+      return;
+    }
+    if (!msg.text && (!msg.images || msg.images.length === 0) && (!msg.pastes || msg.pastes.length === 0)) {
+      return;
+    }
+    var session = getSessionForWs(ws);
+    if (!session) return;
+
+    if (!ws._clayUser) {
+      sendTo(ws, { type: "user_mention_error", error: "You must be signed in to mention another user." });
+      return;
+    }
+    if (ws._clayUser.id === msg.targetUserId) {
+      sendTo(ws, { type: "user_mention_error", error: "You cannot mention yourself." });
+      return;
+    }
+
+    var target = resolveTargetUser(msg.targetUserId);
+    if (!target) {
+      sendTo(ws, { type: "user_mention_error", error: "Target user not found." });
+      return;
+    }
+
+    var fromId = ws._clayUser.id;
+    var fromName = resolveSenderName(ws);
+    var fromAvatar = resolveSenderAvatar(ws) || {};
+
+    // Save images to disk (same pattern as regular and mate-mention messages)
+    var imageRefs = [];
+    if (msg.images && msg.images.length > 0) {
+      for (var i = 0; i < msg.images.length; i++) {
+        var img = msg.images[i];
+        var savedName = saveImageFile(img.mediaType, img.data, getLinuxUserForSession(session));
+        if (savedName) {
+          imageRefs.push({ mediaType: img.mediaType, file: savedName });
+        }
+      }
+    }
+
+    var entry = {
+      type: "user_mention",
+      from: fromId,
+      fromName: fromName,
+      targetUserId: target.id,
+      targetName: target.name,
+      targetUsername: target.username,
+      targetAvatarStyle: target.avatarStyle,
+      targetAvatarSeed: target.avatarSeed,
+      targetAvatarColor: target.avatarColor,
+      text: msg.text || "",
+      _ts: Date.now(),
+    };
+    if (msg.pastes && msg.pastes.length > 0) entry.pastes = msg.pastes;
+    if (imageRefs.length > 0) entry.imageRefs = imageRefs;
+
+    session.history.push(entry);
+    sm.appendToSessionFile(session, entry);
+
+    // Hydrate image refs for live broadcast (clients want urls, not file names).
+    // Use sendToSessionOthers so the sender's tab renders the message locally
+    // (via input.js) without duplicating it from the WS echo.
+    var live = hydrateImageRefs ? hydrateImageRefs(entry) : entry;
+    sendToSessionOthers(ws, session.localId, live);
+
+    // Queue side-channel transcript for the coding agent's next turn so the
+    // agent sees what the humans discussed. Mirrors how mate mentions inject.
+    if (!session.pendingMentionContexts) session.pendingMentionContexts = [];
+    session.pendingMentionContexts.push(
+      "[Context: @" + fromName + " mentioned @" + target.name + " in a side conversation]\n" +
+      fromName + " to @" + target.name + ": " + (msg.text || "") + "\n" +
+      "[End of @mention context. This is for your reference only. Do not respond to it directly.]"
+    );
+
+    // Notification for the mentioned user
+    var preview = buildPreview(msg.text);
+    var notificationsModule = getNotificationsModule();
+    if (notificationsModule && typeof notificationsModule.notify === "function") {
+      notificationsModule.notify("user_mention", {
+        slug: slug,
+        sessionId: session.localId,
+        ownerId: session.ownerId || null,
+        targetUserId: target.id,
+        fromUserId: fromId,
+        fromName: fromName,
+        fromAvatarStyle: fromAvatar.style || null,
+        fromAvatarSeed: fromAvatar.seed || null,
+        fromAvatarColor: fromAvatar.color || null,
+        fromAvatarCustom: fromAvatar.custom || "",
+        preview: preview || "Mentioned you",
+      });
+    }
+
+    // Push notification: only if the target is offline. If they are online,
+    // the notification banner already handles in-app delivery. This prevents
+    // double-buzzing for users who are actively connected.
+    if (pushModule && typeof pushModule.sendPushToUser === "function" && !isUserOnline(target.id)) {
+      try {
+        pushModule.sendPushToUser(target.id, {
+          type: "user_mention",
+          title: "@" + fromName + " mentioned you",
+          body: preview || "Tap to open the session",
+          tag: "clay-user-mention-" + target.id,
+          data: {
+            slug: slug,
+            sessionId: session.localId,
+          },
+        });
+      } catch (e) {
+        console.error("[user-mention] push failed:", e && e.message ? e.message : e);
+      }
+    }
+  }
+
+  return {
+    handleUserMention: handleUserMention,
+  };
+}
+
+module.exports = { attachUserMention: attachUserMention };

package/lib/project.js

@@ -17,6 +17,7 @@ var userPresence = require("./user-presence");
 var { attachDebate } = require("./project-debate");
 var { attachMemory } = require("./project-memory");
 var { attachMateInteraction } = require("./project-mate-interaction");
+var { attachUserMention } = require("./project-user-mention");
 var { attachLoop } = require("./project-loop");
 var { attachFileWatch } = require("./project-file-watch");
 var { attachHTTP } = require("./project-http");
@@ -848,6 +849,12 @@ function createProjectContext(opts) {
       return;
     }
 
+    // --- @Mention: user-to-user side conversation in this session ---
+    if (msg.type === "user_mention") {
+      handleUserMention(ws, msg);
+      return;
+    }
+
     if (msg.type === "mention_stop") {
       var session = getSessionForWs(ws);
       if (session && session._mentionInProgress) {
@@ -1046,6 +1053,26 @@ function createProjectContext(opts) {
   var digestDmTurn = _mateInteraction.digestDmTurn;
   var enqueueDigest = _mateInteraction.enqueueDigest;
 
+  // --- User-to-user mention engine (delegated to project-user-mention.js) ---
+  var _userMention = attachUserMention({
+    slug: slug,
+    sm: sm,
+    send: send,
+    sendTo: sendTo,
+    sendToSession: sendToSession,
+    sendToSessionOthers: sendToSessionOthers,
+    getSessionForWs: getSessionForWs,
+    getLinuxUserForSession: getLinuxUserForSession,
+    saveImageFile: saveImageFile,
+    hydrateImageRefs: hydrateImageRefs,
+    usersModule: usersModule,
+    pushModule: pushModule,
+    isUserOnline: opts.isUserOnline || function () { return false; },
+    getNotificationsModule: function () { return _notifications; },
+    getProjectTitle: function () { return title || slug; },
+  });
+  var handleUserMention = _userMention.handleUserMention;
+
   // --- Debate engine (delegated to project-debate.js) ---
   var _debate = attachDebate({
     cwd: cwd,

package/lib/public/app.js

@@ -730,6 +730,12 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
     getMateAvatarUrl: function () { return document.body.dataset.mateAvatarUrl || ""; },
     showMatePreThinking: function () { showMatePreThinking(); },
     showClaudePreThinking: function () { showClaudePreThinking(); },
+    myUserId: function () { return store.get('myUserId'); },
+    myDisplayName: function () {
+      var u = null;
+      try { u = JSON.parse(localStorage.getItem("clay_my_user") || "null"); } catch (e) {}
+      return (u && (u.displayName || u.username)) || document.body.dataset.myDisplayName || "Me";
+    },
   });
 
   // --- @Mention module ---
@@ -740,6 +746,8 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
     messagesEl: messagesEl,
     matesList: function () { return store.get('cachedMatesList') || []; },
     availableBuiltins: function () { return store.get('cachedAvailableBuiltins') || []; },
+    allUsers: function () { return store.get('cachedAllUsers') || []; },
+    myUserId: function () { return store.get('myUserId'); },
     scrollToBottom: scrollToBottom,
     addUserMessage: addUserMessage,
     addCopyHandler: addCopyHandler,

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

@@ -53,7 +53,7 @@ import { showDebateSticky, showDebateConcludeConfirm, showDebateUserFloor, exitD
 import { handleSkillInstallWs } from './app-skills-install.js';
 import { handleNotificationsState, handleNotificationCreated, handleNotificationDismissed, handleNotificationDismissedAll, showUpdateBanner } from './app-notifications.js';
 import { handleDebatePreparing, handleDebateBriefReady, renderDebateBriefReady, handleDebateStarted, renderDebateStarted, handleDebateTurn, handleDebateActivity, handleDebateStream, handleDebateTurnDone, handleDebateCommentQueued, handleDebateCommentInjected, renderDebateCommentInjected, handleDebateResumed, handleDebateEnded, renderDebateEnded, handleDebateError, isDebateActive, renderMcpDebateProposal, renderDebateUserResume } from './debate.js';
-import { handleMentionStart, handleMentionActivity, handleMentionStream, handleMentionDone, handleMentionError, renderMentionUser, renderMentionResponse } from './mention.js';
+import { handleMentionStart, handleMentionActivity, handleMentionStream, handleMentionDone, handleMentionError, renderMentionUser, renderMentionResponse, renderUserMention } from './mention.js';
 
 // --- DOM refs (cached once, stable for page lifetime) ---
 var messagesEl = document.getElementById("messages");
@@ -1434,6 +1434,18 @@ export function processMessage(msg) {
         renderMentionResponse(msg);
         break;
 
+      case "user_mention":
+        // User-to-user side conversation entry. Renders for any session viewer
+        // (sender's other tabs and the mentioned user, if they are watching the
+        // session). On the sender's own tab, the server uses sendToSessionOthers
+        // so we never get a duplicate here.
+        finalizeAssistantBlock();
+        renderUserMention(msg);
+        break;
+      case "user_mention_error":
+        if (msg.error) showToast("@Mention: " + msg.error, "error");
+        break;
+
       // --- Debate ---
       case "debate_preparing":
         if (!store.get('replayingHistory')) showDebateSticky("preparing", msg);

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

@@ -9,7 +9,7 @@ import { getWs } from './ws-ref.js';
 import { openDm } from './app-dm.js';
 import { getCachedProjects } from './app-projects.js';
 import { switchProject } from './app-projects.js';
-import { mateAvatarUrl } from './avatar.js';
+import { mateAvatarUrl, userAvatarUrl } from './avatar.js';
 import { openTerminal } from './terminal.js';
 var notifications = [];
 var unreadCount = 0;
@@ -87,16 +87,20 @@ function showBanner(notif, autoDismissMs) {
   var isEmpty = notif.id === "_empty";
   var isPermission = notif.type === "permission_request" && notif.meta && notif.meta.requestId;
   var isAuthRequired = notif.type === "auth_required";
+  var isUserMention = notif.type === "user_mention";
   var projectIcon = isEmpty ? null : getProjectIcon(notif.slug);
   var projectName = isEmpty ? "" : (isAuthRequired ? "CLAY" : getProjectName(notif.slug));
   var mate = isEmpty ? null : getMateForNotification(notif);
+  var userMentionAvatarSrc = isUserMention ? buildUserMentionAvatarSrc(notif) : null;
 
   var banner = document.createElement("div");
-  banner.className = "notif-banner" + (isAuthRequired ? " notif-banner-update notif-banner-auth" : isPermission ? " notif-banner-permission" : "");
+  banner.className = "notif-banner" + (isAuthRequired ? " notif-banner-update notif-banner-auth" : isPermission ? " notif-banner-permission" : isUserMention ? " notif-banner-user-mention" : "");
   if (!isEmpty) banner.setAttribute("data-notif-id", notif.id);
   if (isAuthRequired) banner.setAttribute("data-auth-banner", "true");
 
-  var iconHtmlStr = mate
+  var iconHtmlStr = userMentionAvatarSrc
+    ? '<img class="notif-banner-avatar" src="' + escapeHtml(userMentionAvatarSrc) + '" alt="' + escapeHtml((notif.meta && notif.meta.fromName) || "User") + '">'
+    : mate
     ? '<img class="notif-banner-avatar" src="' + escapeHtml(mateAvatarUrl(mate, 32)) + '" alt="' + escapeHtml(mate.displayName || mate.name || "Mate") + '">'
     : isAuthRequired
       ? '<img src="/icon-banded-76.png" width="32" height="32" alt="Clay" style="border-radius:8px">'
@@ -428,7 +432,15 @@ export function handleNotificationCreated(msg) {
   unreadCount = msg.unreadCount;
   updateBadge();
 
-  var _autoDismiss = notif.type === "permission_request" || notif.type === "auth_required" ? false : true;
+  // user_mention banners are persistent (no auto-dismiss). They go away when:
+  //   1. The user clicks the banner (which navigates to the session — see
+  //      banner click handler in showBanner / navigateToNotification), OR
+  //   2. The user navigates to the target session by some other path, in which
+  //      case handleNotificationCreated above already dismissed the notif on
+  //      activeSessionId match, OR
+  //   3. The user clicks the X close button.
+  // Permission and auth banners are also persistent for the same UX reason.
+  var _autoDismiss = (notif.type === "permission_request" || notif.type === "auth_required" || notif.type === "user_mention") ? false : true;
   showBanner(notif, _autoDismiss);
 }
 
@@ -506,6 +518,30 @@ function deriveMateIdFromNotification(notif) {
   return null;
 }
 
+// Build the sender avatar URL for a user_mention notification banner.
+// Prefers the avatar fields stashed in `notif.meta` (set by the server when the
+// notification is created), and falls back to the cached user list from
+// `cachedAllUsers` so the banner still has a face even if meta is missing.
+function buildUserMentionAvatarSrc(notif) {
+  var meta = (notif && notif.meta) || {};
+  if (meta.fromAvatarStyle || meta.fromAvatarSeed || meta.fromAvatarCustom) {
+    return userAvatarUrl({
+      avatarStyle: meta.fromAvatarStyle,
+      avatarSeed: meta.fromAvatarSeed,
+      avatarCustom: meta.fromAvatarCustom || "",
+      username: meta.fromName,
+      id: meta.fromUserId,
+    }, 32);
+  }
+  if (meta.fromUserId) {
+    var users = store.get('cachedAllUsers') || [];
+    for (var i = 0; i < users.length; i++) {
+      if (users[i] && users[i].id === meta.fromUserId) return userAvatarUrl(users[i], 32);
+    }
+  }
+  return null;
+}
+
 function getMateForNotification(notif) {
   var mateId = notif && notif.meta ? notif.meta.avatarMateId : null;
   if (!mateId) mateId = deriveMateIdFromNotification(notif);

package/lib/public/modules/input.js

@@ -1,7 +1,7 @@
 import { iconHtml, refreshIcons } from './icons.js';
 import { setRewindMode, isRewindMode } from './rewind.js';
 import { renderPicker as renderContextPicker } from './context-sources.js';
-import { checkForMention, showMentionMenu, hideMentionMenu, isMentionMenuVisible, mentionMenuKeydown, setMentionAtIdx, parseMentionFromInput, clearMentionState, stickyReapplyMention, sendMention, renderMentionUser, removeMentionChip } from './mention.js';
+import { checkForMention, showMentionMenu, hideMentionMenu, isMentionMenuVisible, mentionMenuKeydown, setMentionAtIdx, parseMentionFromInput, clearMentionState, stickyReapplyMention, sendMention, sendUserMention, renderMentionUser, renderUserMention, removeMentionChip } from './mention.js';
 import { store } from './store.js';
 import { mateAvatarUrl } from './avatar.js';
 
@@ -152,9 +152,44 @@ export function sendMessage() {
     return;
   }
 
-  // Check for @mention: if a mate was selected, route to mention handler
-  // Exception: if we're in a DM with the same mate, send as regular message instead
+  // Check for @mention: if a mate or user was selected, route to mention handler.
+  // Exception: if we're in a DM with the same mate, send as regular message instead.
+  // (User mentions never short-circuit to DM mode; user-to-user side conversations
+  // are scoped to the active session, not pulled into DMs.)
   var mention = parseMentionFromInput(text);
+  if (mention && mention.kind === "user") {
+    hideMentionMenu();
+    if (ctx.hideSuggestionChips) ctx.hideSuggestionChips();
+    var uMentionImages = pendingImages.slice();
+    var uMentionPastes = pendingPastes.map(function (p) { return p.text; });
+    var uMentionFiles = pendingFiles.slice();
+    var uMentionText = mention.text;
+    if (uMentionFiles.length > 0) {
+      var uFilePaths = uMentionFiles.map(function (f) { return "[Uploaded file: " + f.path + "]"; }).join("\n");
+      uMentionText = uMentionText ? uFilePaths + "\n\n" + uMentionText : uFilePaths;
+    }
+    // Optimistic local render so the sender sees their own message immediately.
+    // The server uses sendToSessionOthers, so this tab does not get a duplicate echo.
+    var myUserId = ctx.myUserId ? ctx.myUserId() : null;
+    var myDisplayName = ctx.myDisplayName ? ctx.myDisplayName() : "Me";
+    renderUserMention({
+      from: myUserId,
+      fromName: myDisplayName,
+      targetUserId: mention.userId,
+      targetName: mention.mateName,
+      text: uMentionText,
+      images: uMentionImages.length > 0 ? uMentionImages : null,
+      pastes: uMentionPastes.length > 0 ? uMentionPastes : null,
+    });
+    sendUserMention(mention.userId, uMentionText, uMentionPastes, uMentionImages);
+    ctx.inputEl.value = "";
+    stickyReapplyMention();
+    sendInputSync();
+    clearPendingImages();
+    autoResize();
+    ctx.inputEl.focus();
+    return;
+  }
   if (mention) {
     var dmMateId = ctx.getDmMateId ? ctx.getDmMateId() : null;
     if (dmMateId && dmMateId === mention.mateId) {