clay-server 2.35.1 → 2.36.0-beta.2

package/lib/public/modules/mention.js

@@ -9,10 +9,14 @@ var ctx;
 // --- State ---
 var mentionActive = false;       // @ autocomplete is visible
 var mentionAtIdx = -1;           // position of the @ in input
-var mentionFiltered = [];        // filtered mate list
+var mentionFiltered = [];        // filtered candidate list (mates + users)
 var mentionActiveIdx = -1;       // highlighted item in dropdown
-var selectedMateId = null;       // selected mate for pending send
-var selectedMateName = null;     // display name of selected mate
+// "kind" = "mate" | "user". Both keep the same chip UX so most existing code
+// branches only on the kind at send time. Variable names retain "Mate" prefix
+// for backwards compatibility with consumers like input.js / app-messages.js.
+var selectedMateKind = null;     // "mate" | "user" | null
+var selectedMateId = null;       // mate id OR user id
+var selectedMateName = null;     // display name
 var selectedMateColor = null;    // avatar color for sticky re-apply
 var selectedMateAvatar = null;   // avatar src for sticky re-apply
 
@@ -53,27 +57,109 @@ export function checkForMention(value, cursorPos) {
 }
 
 // --- Autocomplete dropdown ---
-export function showMentionMenu(query) {
-  // Mates UI gate: if the user has turned Mates off in User Settings,
-  // the @-mention dropdown is the entry point for sending a message to a
-  // mate from the regular session input, so suppress it entirely. Once
-  // we surface user-to-user DMs from this dropdown we can scope this
-  // check tighter, but for now the dropdown is mate-only.
-  if (store.get('matesEnabled') === false) {
-    hideMentionMenu();
-    return;
+// Build the unified candidate list of mates + users. Each candidate is
+// normalized to { kind, id, name, color, avatarSrc, vendor, bio, primary, raw }.
+// Plain @mention targets. Vendor-only entries with no persona or memory; the
+// server-side handler (lib/project-mate-interaction.js) recognises these IDs
+// and routes them through the matching vendor adapter directly.
+var PLAIN_MENTION_CANDIDATES = [
+  {
+    kind: "mate",
+    id: "plain:claude",
+    name: "Claude Code",
+    color: "#cc785c",
+    avatarSrc: "/claude-code-avatar.png",
+    vendor: "claude",
+    bio: "Plain Claude Code, no persona, no memory",
+    primary: false,
+    plain: true,
+    raw: null,
+  },
+  {
+    kind: "mate",
+    id: "plain:codex",
+    name: "Codex",
+    color: "#10a37f",
+    avatarSrc: "/codex-avatar.png",
+    vendor: "codex",
+    bio: "Plain Codex, no persona, no memory",
+    primary: false,
+    plain: true,
+    raw: null,
+  },
+];
+
+function buildMentionCandidates() {
+  var candidates = [];
+
+  // Plain vendor mentions (always available, regardless of Mates toggle).
+  // Hide the plain entry that matches the current session's vendor: there is
+  // no point asking Claude for a second opinion while you are already in a
+  // Claude session, and likewise for Codex.
+  var sessionVendor = store.get('currentVendor') || "claude";
+  for (var pi = 0; pi < PLAIN_MENTION_CANDIDATES.length; pi++) {
+    if (PLAIN_MENTION_CANDIDATES[pi].vendor === sessionVendor) continue;
+    candidates.push(PLAIN_MENTION_CANDIDATES[pi]);
+  }
+
+  // Mates: only when the Mates UI is enabled
+  if (store.get('matesEnabled') !== false) {
+    var mates = ctx.matesList ? ctx.matesList() : [];
+    for (var mi = 0; mi < mates.length; mi++) {
+      var m = mates[mi];
+      if (m.status === "interviewing") continue;
+      candidates.push({
+        kind: "mate",
+        id: m.id,
+        name: (m.profile && m.profile.displayName) || m.name || "Mate",
+        color: (m.profile && m.profile.avatarColor) || "#6c5ce7",
+        avatarSrc: mateAvatarUrl(m, 24),
+        vendor: m.vendor || "claude",
+        bio: m.bio || (m.profile && m.profile.bio) || "",
+        primary: !!m.primary,
+        raw: m,
+      });
+    }
   }
-  var mates = ctx.matesList ? ctx.matesList() : [];
-  if (!mates || mates.length === 0) {
+
+  // Users: every other signed-in user (always available, even if Mates UI is off).
+  // We use the cached user list pushed by the server in projects_updated.
+  var allUsers = ctx.allUsers ? ctx.allUsers() : [];
+  var myId = ctx.myUserId ? ctx.myUserId() : null;
+  for (var ui = 0; ui < allUsers.length; ui++) {
+    var u = allUsers[ui];
+    if (!u || !u.id) continue;
+    if (myId && u.id === myId) continue; // never @-mention yourself
+    candidates.push({
+      kind: "user",
+      id: u.id,
+      name: u.displayName || u.username || "User",
+      color: u.avatarColor || "#7c3aed",
+      // Build dicebear url from style+seed; matches userAvatarUrl shape.
+      avatarSrc: "https://api.dicebear.com/7.x/" + (u.avatarStyle || "thumbs") + "/svg?seed=" + encodeURIComponent(u.avatarSeed || u.username || u.id),
+      vendor: null,
+      bio: u.username ? "@" + u.username : "",
+      primary: false,
+      raw: u,
+    });
+  }
+
+  return candidates;
+}
+
+export function showMentionMenu(query) {
+  var candidates = buildMentionCandidates();
+  if (candidates.length === 0) {
     hideMentionMenu();
     return;
   }
 
-  var lowerQuery = query.toLowerCase();
-  mentionFiltered = mates.filter(function (m) {
-    if (m.status === "interviewing") return false;
-    var name = ((m.profile && m.profile.displayName) || m.name || "").toLowerCase();
-    return name.indexOf(lowerQuery) !== -1;
+  var lowerQuery = (query || "").toLowerCase();
+  mentionFiltered = candidates.filter(function (c) {
+    if (!lowerQuery) return true;
+    if (c.name.toLowerCase().indexOf(lowerQuery) !== -1) return true;
+    if (c.kind === "user" && c.raw && c.raw.username && c.raw.username.toLowerCase().indexOf(lowerQuery) !== -1) return true;
+    return false;
   });
 
   if (mentionFiltered.length === 0) {
@@ -87,24 +173,21 @@ export function showMentionMenu(query) {
   var menuEl = document.getElementById("mention-menu");
   if (!menuEl) return;
 
-  menuEl.innerHTML = '<div class="mention-hint">Mention a Mate to get advice on your current session<button class="mention-close-btn" aria-label="Close">&times;</button></div>' +
-  mentionFiltered.map(function (m, i) {
-    var name = (m.profile && m.profile.displayName) || m.name || "Mate";
-    var color = (m.profile && m.profile.avatarColor) || "#6c5ce7";
-    var bio = m.bio || (m.profile && m.profile.bio) || "";
-    var avatarSrc = mateAvatarUrl(m, 24);
-    var mVendor = m.vendor || "claude";
+  menuEl.innerHTML = '<div class="mention-hint">Mention a Mate or teammate &mdash; the coding agent stays out of this exchange until your next message<button class="mention-close-btn" aria-label="Close">&times;</button></div>' +
+  mentionFiltered.map(function (c, i) {
     var vendorIcons = { claude: "/claude-code-avatar.png", codex: "/codex-avatar.png" };
-    var vendorBadge = vendorIcons[mVendor] ? '<img class="mention-item-vendor-badge" src="' + vendorIcons[mVendor] + '" alt="' + mVendor + '">' : '';
+    var vendorBadge = (c.kind === "mate" && vendorIcons[c.vendor]) ? '<img class="mention-item-vendor-badge" src="' + vendorIcons[c.vendor] + '" alt="' + escapeHtml(c.vendor) + '">' : '';
+    var kindBadge = c.kind === "user"
+      ? ' <span class="mention-item-badge mention-item-badge-user">USER</span>'
+      : (c.plain ? ' <span class="mention-item-badge">PLAIN</span>'
+        : (c.primary ? ' <span class="mention-item-badge">SYSTEM</span>' : ''));
     return '<div class="mention-item' + (i === 0 ? ' active' : '') + '" data-idx="' + i + '">' +
-      '<div class="mention-item-avatar-wrap"><img class="mention-item-avatar" src="' + escapeHtml(avatarSrc) + '" width="24" height="24" />' + vendorBadge + '</div>' +
+      '<div class="mention-item-avatar-wrap"><img class="mention-item-avatar" src="' + escapeHtml(c.avatarSrc) + '" width="24" height="24" />' + vendorBadge + '</div>' +
       '<div class="mention-item-info">' +
-        '<span class="mention-item-name">' + escapeHtml(name) +
-          (m.primary ? ' <span class="mention-item-badge">SYSTEM</span>' : '') +
-        '</span>' +
-        (bio ? '<span class="mention-item-bio">' + escapeHtml(bio) + '</span>' : '') +
+        '<span class="mention-item-name">' + escapeHtml(c.name) + kindBadge + '</span>' +
+        (c.bio ? '<span class="mention-item-bio">' + escapeHtml(c.bio) + '</span>' : '') +
       '</div>' +
-      '<span class="mention-item-dot" style="background:' + escapeHtml(color) + '"></span>' +
+      '<span class="mention-item-dot" style="background:' + escapeHtml(c.color) + '"></span>' +
       '</div>';
   }).join("");
   menuEl.classList.add("visible");
@@ -175,14 +258,15 @@ export function mentionMenuKeydown(e) {
 
 function selectMentionItem(idx) {
   if (idx < 0 || idx >= mentionFiltered.length) return;
-  var mate = mentionFiltered[idx];
-  var name = (mate.profile && mate.profile.displayName) || mate.name || "Mate";
-  var color = (mate.profile && mate.profile.avatarColor) || "#6c5ce7";
-  var avatarSrc = mateAvatarUrl(mate, 20);
-
-  selectedMateId = mate.id;
-  selectedMateName = name;
-  selectedMateColor = color;
+  var c = mentionFiltered[idx];
+  // mentionFiltered now holds normalized candidates ({ kind, id, name, color, avatarSrc, ... }).
+  // Use a smaller avatar for the chip than the dropdown (20 vs 24).
+  var avatarSrc = c.kind === "mate" && c.raw ? mateAvatarUrl(c.raw, 20) : c.avatarSrc;
+
+  selectedMateKind = c.kind;
+  selectedMateId = c.id;
+  selectedMateName = c.name;
+  selectedMateColor = c.color;
   selectedMateAvatar = avatarSrc;
 
   // Remove the @query text from the textarea, keep remaining text
@@ -197,7 +281,7 @@ function selectMentionItem(idx) {
   }
 
   // Show visual chip in input area
-  showInputMentionChip(name, color, avatarSrc);
+  showInputMentionChip(selectedMateName, selectedMateColor, avatarSrc);
 
   hideMentionMenu();
 }
@@ -230,6 +314,10 @@ function color_mix_lighten(r, g, b, amount) {
     .map(function (v) { return v.toString(16).padStart(2, "0"); }).join("");
 }
 
+// Saved textarea placeholder so we can restore it when the chip is removed.
+// Set on first chip show, cleared on chip removal.
+var savedInputPlaceholder = null;
+
 function showInputMentionChip(name, color, avatarSrc) {
   removeInputMentionChip();
   var textColor = ensureChipContrast(color);
@@ -248,6 +336,16 @@ function showInputMentionChip(name, color, avatarSrc) {
     inputRow.insertBefore(chip, textareaWrap);
   }
 
+  // Swap the textarea placeholder so the user sees "Ask @{name}..." instead of
+  // the session-vendor placeholder ("Message Claude Code...") while a mention
+  // is queued. Save the original once so re-shows don't clobber it.
+  if (ctx && ctx.inputEl) {
+    if (savedInputPlaceholder === null) {
+      savedInputPlaceholder = ctx.inputEl.placeholder || "";
+    }
+    ctx.inputEl.placeholder = "Ask @" + name + "...";
+  }
+
   chip.querySelector(".input-mention-chip-remove").addEventListener("click", function (e) {
     e.preventDefault();
     e.stopPropagation();
@@ -258,10 +356,15 @@ function showInputMentionChip(name, color, avatarSrc) {
 function removeInputMentionChip() {
   var existing = document.getElementById("input-mention-chip");
   if (existing) existing.remove();
+  if (ctx && ctx.inputEl && savedInputPlaceholder !== null) {
+    ctx.inputEl.placeholder = savedInputPlaceholder;
+    savedInputPlaceholder = null;
+  }
 }
 
 export function removeMentionChip() {
   removeInputMentionChip();
+  selectedMateKind = null;
   selectedMateId = null;
   selectedMateName = null;
   selectedMateColor = null;
@@ -285,16 +388,27 @@ export function setMentionAtIdx(idx) {
 }
 
 // --- Mention send ---
-// Returns { mateId, mateName, text } if input has an @mention, or null
+// Returns { kind, mateId, userId, mateName, text } if input has an @mention, or null.
+// `mateId` and `userId` are kept as separate fields so call sites can dispatch
+// to the right server message type without inspecting `kind` (legacy callers
+// that only read `mateId` keep working for mate mentions).
 export function parseMentionFromInput(text) {
   if (!selectedMateId || !selectedMateName) return null;
   // The chip is shown separately; textarea contains only the message text
-  var mentionText = text.trim();
+  var mentionText = (text || "").trim();
   if (!mentionText) return null;
-  return { mateId: selectedMateId, mateName: selectedMateName, text: mentionText };
+  var kind = selectedMateKind || "mate";
+  return {
+    kind: kind,
+    mateId: kind === "mate" ? selectedMateId : null,
+    userId: kind === "user" ? selectedMateId : null,
+    mateName: selectedMateName,
+    text: mentionText,
+  };
 }
 
 export function clearMentionState() {
+  selectedMateKind = null;
   selectedMateId = null;
   selectedMateName = null;
   selectedMateColor = null;
@@ -303,17 +417,19 @@ export function clearMentionState() {
   removeInputMentionChip();
 }
 
-// Re-apply the same mate mention after sending (sticky mention).
-// Keeps the chip visible so the next message also goes to the same mate.
+// Re-apply the same mention after sending (sticky mention).
+// Keeps the chip visible so the next message also goes to the same target.
 export function stickyReapplyMention() {
   if (!selectedMateId || !selectedMateName) return;
+  var kind = selectedMateKind;
   var id = selectedMateId;
   var name = selectedMateName;
   var color = selectedMateColor || "#6c5ce7";
   var avatarSrc = selectedMateAvatar || "";
-  // Reset index but keep mate selection
+  // Reset index but keep selection
   mentionAtIdx = -1;
   removeInputMentionChip();
+  selectedMateKind = kind;
   selectedMateId = id;
   selectedMateName = name;
   selectedMateColor = color;
@@ -321,6 +437,7 @@ export function stickyReapplyMention() {
   showInputMentionChip(name, color, avatarSrc);
 }
 
+// Send a mate @mention. Existing call sites keep using this verbatim.
 export function sendMention(mateId, text, pastes, images) {
   if (!ctx.ws || !ctx.connected) return;
   var payload = { type: "mention", mateId: mateId, text: text };
@@ -329,6 +446,17 @@ export function sendMention(mateId, text, pastes, images) {
   ctx.ws.send(JSON.stringify(payload));
 }
 
+// Send a user-to-user @mention. Server stores it in session.history, broadcasts
+// to other session viewers, fires an alarm-center notification + push for the
+// target user, and queues the transcript for the next coding-agent turn.
+export function sendUserMention(userId, text, pastes, images) {
+  if (!ctx.ws || !ctx.connected) return;
+  var payload = { type: "user_mention", targetUserId: userId, text: text };
+  if (pastes && pastes.length > 0) payload.pastes = pastes;
+  if (images && images.length > 0) payload.images = images;
+  ctx.ws.send(JSON.stringify(payload));
+}
+
 // --- Mention response rendering ---
 
 // Recreate the mention block if it was lost (e.g. session switch)
@@ -647,6 +775,120 @@ function buildMentionAvatarUrl(meta) {
   return "https://api.dicebear.com/7.x/" + (meta.avatarStyle || "bottts") + "/svg?seed=" + encodeURIComponent(meta.avatarSeed || meta.mateId);
 }
 
+function buildUserAvatarUrlFromEntry(entry, who) {
+  // who = "from" | "target"
+  var style = entry[who + "AvatarStyle"] || "thumbs";
+  var seed = entry[who + "AvatarSeed"] || entry[who === "from" ? "fromName" : "targetName"] || entry[who === "from" ? "from" : "targetUserId"];
+  return "https://api.dicebear.com/7.x/" + style + "/svg?seed=" + encodeURIComponent(seed || "user");
+}
+
+// Render a user-to-user @mention bubble (live receive AND history replay).
+// Shape mirrors renderMentionUser (the user-side @mate render) but tags the
+// target user explicitly so it's clear who the side conversation is between.
+// `entry` shape:
+//   { type: "user_mention", from, fromName, targetUserId, targetName,
+//     targetUsername?, targetAvatarStyle?, targetAvatarSeed?,
+//     text, pastes?, images?, _ts? }
+export function renderUserMention(entry) {
+  var div = document.createElement("div");
+  div.className = "msg-user msg-user-mention";
+
+  var bubble = document.createElement("div");
+  bubble.className = "bubble";
+  bubble.dir = "auto";
+
+  // Images
+  if (entry.images && entry.images.length > 0) {
+    var imgRow = document.createElement("div");
+    imgRow.className = "bubble-images";
+    for (var ii = 0; ii < entry.images.length; ii++) {
+      var img = document.createElement("img");
+      if (entry.images[ii].url) {
+        img.src = entry.images[ii].url;
+      } else if (entry.images[ii].data) {
+        img.src = "data:" + entry.images[ii].mediaType + ";base64," + entry.images[ii].data;
+      }
+      img.loading = "lazy";
+      img.className = "bubble-img";
+      img.addEventListener("click", function () {
+        if (ctx.showImageModal) ctx.showImageModal(this.src);
+      });
+      img.addEventListener("error", function () {
+        var placeholder = document.createElement("div");
+        placeholder.className = "bubble-img-expired";
+        placeholder.textContent = "Image deleted";
+        this.parentNode.replaceChild(placeholder, this);
+      });
+      imgRow.appendChild(img);
+    }
+    bubble.appendChild(imgRow);
+  }
+
+  // Pastes
+  if (entry.pastes && entry.pastes.length > 0) {
+    var pasteRow = document.createElement("div");
+    pasteRow.className = "bubble-pastes";
+    for (var pi = 0; pi < entry.pastes.length; pi++) {
+      (function (pasteText) {
+        var chip = document.createElement("div");
+        chip.className = "bubble-paste";
+        var preview = pasteText.substring(0, 60).replace(/\n/g, " ");
+        if (pasteText.length > 60) preview += "...";
+        chip.innerHTML = '<span class="bubble-paste-preview">' + escapeHtml(preview) + '</span><span class="bubble-paste-label">PASTED</span>';
+        chip.addEventListener("click", function (e) {
+          e.stopPropagation();
+          if (ctx.showPasteModal) ctx.showPasteModal(pasteText);
+        });
+        pasteRow.appendChild(chip);
+      })(entry.pastes[pi]);
+    }
+    bubble.appendChild(pasteRow);
+  }
+
+  var targetName = entry.targetName || "user";
+  var fromName = entry.fromName || "Someone";
+  var textEl = document.createElement("span");
+  textEl.innerHTML =
+    '<span class="mention-chip mention-chip-user">@' + escapeHtml(targetName) + '</span> ' +
+    escapeHtml(entry.text || "");
+  bubble.appendChild(textEl);
+
+  // Sender avatar (from)
+  var avi = document.createElement("img");
+  avi.className = "dm-bubble-avatar dm-bubble-avatar-me";
+  avi.src = buildUserAvatarUrlFromEntry(entry, "from");
+  div.appendChild(avi);
+
+  var contentWrap = document.createElement("div");
+  contentWrap.className = "dm-bubble-content";
+
+  var header = document.createElement("div");
+  header.className = "dm-bubble-header";
+  var nameSpan = document.createElement("span");
+  nameSpan.className = "dm-bubble-name";
+  nameSpan.textContent = fromName;
+  header.appendChild(nameSpan);
+
+  var sideTag = document.createElement("span");
+  sideTag.className = "mention-badge mention-badge-user";
+  sideTag.textContent = "@" + targetName.toUpperCase();
+  sideTag.title = "Side conversation with " + targetName + ". The coding agent will see this on the next message.";
+  header.appendChild(sideTag);
+
+  var ts = document.createElement("span");
+  ts.className = "dm-bubble-time";
+  ts.textContent = timeStr();
+  header.appendChild(ts);
+
+  contentWrap.appendChild(header);
+  contentWrap.appendChild(bubble);
+  div.appendChild(contentWrap);
+
+  if (ctx.addToMessages) ctx.addToMessages(div);
+  else if (ctx.messagesEl) ctx.messagesEl.appendChild(div);
+  refreshIcons();
+}
+
 // --- History replay: render saved mention entries ---
 export function renderMentionUser(entry) {
   // Render user message with @mention indicator

package/lib/server.js

@@ -239,6 +239,7 @@ function createServer(opts) {
   var { attachNotifications: _attachNotifications } = require("./project-notifications");
   var _globalNotifications = _attachNotifications({
     broadcastAll: function (msg) { broadcastAll(msg); },
+    sendToUser: function (userId, msg) { sendToUser(userId, msg); },
     pushModule: pushModule,
   });
 
@@ -1019,6 +1020,7 @@ function createServer(opts) {
       broadcastAll: broadcastAll,
       notificationsModule: _globalNotifications,
       getProject: function (s) { return projects.get(s) || null; },
+      isUserOnline: isUserOnline,
     });
     projects.set(slug, ctx);
     // ctx.warmup() is now deferred to the first websocket connection into
@@ -1229,6 +1231,38 @@ function createServer(opts) {
     });
   }
 
+  // Send a message to every live ws belonging to a specific user across all projects.
+  // Used by user-targeted notifications (e.g. user-to-user @mentions).
+  function sendToUser(userId, msg) {
+    if (!userId) return;
+    var data = JSON.stringify(msg);
+    projects.forEach(function (ctx) {
+      if (typeof ctx.forEachClient !== "function") return;
+      ctx.forEachClient(function (ws) {
+        if (ws._clayUser && ws._clayUser.id === userId && ws.readyState === 1) {
+          ws.send(data);
+        }
+      });
+    });
+  }
+
+  // True if the user has any live ws across any project.
+  function isUserOnline(userId) {
+    if (!userId) return false;
+    var found = false;
+    projects.forEach(function (ctx) {
+      if (found) return;
+      if (typeof ctx.forEachClient !== "function") return;
+      ctx.forEachClient(function (ws) {
+        if (found) return;
+        if (ws._clayUser && ws._clayUser.id === userId && ws.readyState === 1) {
+          found = true;
+        }
+      });
+    });
+    return found;
+  }
+
   function forEachProject(fn) {
     projects.forEach(function (ctx, slug) {
       fn(ctx, slug);

package/lib/yoke/adapters/claude-worker.js

@@ -24,6 +24,73 @@ if (!socketPath) {
   process.exit(1);
 }
 
+// --- Per-user Claude binary resolver ---
+// In OS-level multi-user mode, the worker runs as a different OS user than the
+// Clay daemon. Each user may have their own `claude` install (nvm, asdf,
+// ~/.npm-global, etc.), and the daemon's resolved path may not be executable
+// by the worker user. Resolve from the worker's own environment, falling back
+// to whatever the daemon passed in.
+var _workerClaudeBinary = null;
+var _workerClaudeBinaryResolved = false;
+function resolveWorkerClaudeBinary() {
+  if (_workerClaudeBinaryResolved) return _workerClaudeBinary;
+  _workerClaudeBinaryResolved = true;
+
+  // 1. Explicit env var override
+  if (process.env.CLAUDE_CODE_PATH && fs.existsSync(process.env.CLAUDE_CODE_PATH)) {
+    _workerClaudeBinary = process.env.CLAUDE_CODE_PATH;
+    return _workerClaudeBinary;
+  }
+
+  // 2. `which claude` in the worker user's PATH
+  try {
+    var which = require("child_process").execSync("which claude", { encoding: "utf8", timeout: 5000 }).trim();
+    if (which && fs.existsSync(which)) {
+      _workerClaudeBinary = which;
+      return _workerClaudeBinary;
+    }
+  } catch (e) {}
+
+  // 3. Common per-user and system locations
+  var home = process.env.HOME || "";
+  var candidates = [];
+  if (home) {
+    candidates.push(home + "/.npm-global/bin/claude");
+    candidates.push(home + "/.local/bin/claude");
+    candidates.push(home + "/.volta/bin/claude");
+    candidates.push(home + "/.bun/bin/claude");
+    candidates.push(home + "/bin/claude");
+  }
+  candidates.push("/usr/local/bin/claude");
+  candidates.push("/usr/bin/claude");
+  candidates.push("/opt/homebrew/bin/claude");
+  for (var i = 0; i < candidates.length; i++) {
+    try { if (fs.existsSync(candidates[i])) { _workerClaudeBinary = candidates[i]; return _workerClaudeBinary; } } catch (e) {}
+  }
+
+  // 4. Resolve via require for the bundled CLI entry
+  try {
+    var resolved = require.resolve("@anthropic-ai/claude-code/cli.js");
+    if (resolved && fs.existsSync(resolved)) {
+      _workerClaudeBinary = resolved;
+      return _workerClaudeBinary;
+    }
+  } catch (e) {}
+
+  return null;
+}
+
+function applyWorkerClaudeBinary(options) {
+  if (!options) return options;
+  var workerBinary = resolveWorkerClaudeBinary();
+  if (workerBinary) {
+    // Worker's own resolution wins: per-user environment is authoritative
+    options.pathToClaudeCodeExecutable = workerBinary;
+  }
+  // If worker can't resolve, leave whatever the daemon passed (best-effort fallback)
+  return options;
+}
+
 // --- State ---
 var sdkModule = null;
 var queryInstance = null;
@@ -338,6 +405,7 @@ async function handleQueryStart(msg) {
   options.abortController = abortController;
   options.debug = true;
   options.debugFile = "/tmp/clay-cli-debug-" + process.pid + ".log";
+  applyWorkerClaudeBinary(options);
   if (options.mcpServerDescriptors && options.mcpServerDescriptors.length) {
     try {
       var mcpServers = buildMcpServersFromDescriptors(options.mcpServerDescriptors, sdk);
@@ -560,6 +628,7 @@ async function handleWarmup(msg) {
 
   var warmupOptions = msg.options || {};
   warmupOptions.abortController = ac;
+  applyWorkerClaudeBinary(warmupOptions);
 
   try {
     var stream = sdk.query({

package/lib/yoke/adapters/claude.js

@@ -943,10 +943,40 @@ function createWorkerQueryHandle(worker, canUseTool, onElicitation, callMcpTool)
 // --- Adapter factory ---
 
 function resolveClaudeBinaryPath() {
+  // 1. Explicit env var override
+  if (process.env.CLAUDE_CODE_PATH && fs.existsSync(process.env.CLAUDE_CODE_PATH)) {
+    return process.env.CLAUDE_CODE_PATH;
+  }
+
+  // 2. `which claude` in the daemon's PATH
   try {
     var result = require("child_process").execSync("which claude", { encoding: "utf8", timeout: 5000 }).trim();
     if (result && fs.existsSync(result)) return result;
   } catch (e) {}
+
+  // 3. Common per-user and system locations (best-effort fallback for the daemon user)
+  var home = process.env.HOME || "";
+  var candidates = [];
+  if (home) {
+    candidates.push(home + "/.npm-global/bin/claude");
+    candidates.push(home + "/.local/bin/claude");
+    candidates.push(home + "/.volta/bin/claude");
+    candidates.push(home + "/.bun/bin/claude");
+    candidates.push(home + "/bin/claude");
+  }
+  candidates.push("/usr/local/bin/claude");
+  candidates.push("/usr/bin/claude");
+  candidates.push("/opt/homebrew/bin/claude");
+  for (var i = 0; i < candidates.length; i++) {
+    try { if (fs.existsSync(candidates[i])) return candidates[i]; } catch (e) {}
+  }
+
+  // 4. Bundled CLI entry from the SDK's peer
+  try {
+    var resolved = require.resolve("@anthropic-ai/claude-code/cli.js");
+    if (resolved && fs.existsSync(resolved)) return resolved;
+  } catch (e) {}
+
   return null;
 }