clay-server 3.8.1 → 4.0.0-beta.2

package/lib/public/modules/mention.js

@@ -102,27 +102,25 @@ function buildMentionCandidates() {
     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) || "#5857fc",
-        avatarSrc: mateAvatarUrl(m, 24),
-        vendor: m.vendor || "claude",
-        bio: m.bio || (m.profile && m.profile.bio) || "",
-        primary: !!m.primary,
-        raw: m,
-      });
-    }
+  // Mate mentions are a project collaboration capability, not a Mate DM.
+  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) || "#5857fc",
+      avatarSrc: mateAvatarUrl(m, 24),
+      vendor: m.vendor || "claude",
+      bio: m.bio || (m.profile && m.profile.bio) || "",
+      primary: !!m.primary,
+      raw: m,
+    });
   }
 
-  // Users: every other signed-in user (always available, even if Mates UI is off).
+  // Users: every other signed-in user.
   // 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;

package/lib/public/modules/pane-bridge.js

@@ -23,6 +23,15 @@ export function reportPaneContext(data) {
   }, window.location.origin);
 }
 
+// A pane has no banner surface and no login modal of its own, so both panes
+// hitting auth_required would otherwise race to start their own login flow.
+// Hand the event to the parent shell, which owns the single flow.
+export function forwardPaneAuthRequired(message) {
+  if (!store.get('paneMode') || window.parent === window) return false;
+  window.parent.postMessage({ type: "clay-pane-auth-required", message: message }, window.location.origin);
+  return true;
+}
+
 export function forwardPaneMarkdownPresentation(message) {
   if (!store.get('paneMode') || window.parent === window) return false;
   window.parent.postMessage({ type: "clay-pane-present-markdown", message: message }, window.location.origin);

package/lib/public/modules/profile.js

@@ -531,12 +531,11 @@ export function initProfile(_ctx) {
       applyTerminalFont(data.terminalFont.family, data.terminalFont.size);
     }
 
-    // Apply Mates UI gate at boot so the sidebar avatars / DM picker
-    // entry / home-hub strip are hidden before the user opens settings.
-    // Default OFF: Mates is opt-in, so only enable when explicitly true.
+    // Apply the project-only Mate DM shortcut preference at boot. Home and
+    // the rest of the Mate capability surface remain available.
     var matesOn = data.matesEnabled === true;
-    store.set({ matesEnabled: matesOn });
-    if (document.body) document.body.classList.toggle('mates-disabled', !matesOn);
+    store.set({ projectMateDmsEnabled: matesOn });
+    if (document.body) document.body.classList.toggle('project-mate-dms-disabled', !matesOn);
   }).catch(function(err) {
     console.warn('[Profile] Failed to load:', err);
   });

package/lib/public/modules/project-settings.js

@@ -560,6 +560,15 @@ export function handleInstructionsWrite(msg) {
 
 // ===== Environment (key-value list) =====
 var envSaveTimer = null;
+var envStatusTimer = null;
+
+function showEnvSaveStatus(elementId, text, duration) {
+  var saveStatus = document.getElementById(elementId);
+  if (!saveStatus) return;
+  if (envStatusTimer) clearTimeout(envStatusTimer);
+  saveStatus.textContent = text;
+  envStatusTimer = setTimeout(function () { saveStatus.textContent = ""; }, duration);
+}
 
 function loadEnvironment() {
   var saveStatus = document.getElementById("ps-env-save-status");
@@ -571,9 +580,6 @@ function loadEnvironment() {
 }
 
 export function handleProjectEnv(msg) {
-  var notice = document.getElementById("ps-env-override-notice");
-  if (notice) notice.classList.toggle("hidden", !msg.hasEnvrc);
-
   // Parse envrc string into key-value pairs
   var list = document.getElementById("ps-env-list");
   if (!list) return;
@@ -606,9 +612,10 @@ export function parseEnvString(str) {
     if (eq === -1) continue;
     var key = line.substring(0, eq).trim();
     var val = line.substring(eq + 1).trim();
-    // Strip surrounding quotes
-    if ((val.charAt(0) === '"' && val.charAt(val.length - 1) === '"') ||
-        (val.charAt(0) === "'" && val.charAt(val.length - 1) === "'")) {
+    // Saved values are JSON-quoted so shell metacharacters remain data.
+    if (val.charAt(0) === '"' && val.charAt(val.length - 1) === '"') {
+      try { val = JSON.parse(val); } catch (e) { val = val.substring(1, val.length - 1); }
+    } else if (val.charAt(0) === "'" && val.charAt(val.length - 1) === "'") {
       val = val.substring(1, val.length - 1);
     }
     if (key) pairs.push({ key: key, value: val });
@@ -616,6 +623,10 @@ export function parseEnvString(str) {
   return pairs;
 }
 
+export function serializeEnvValue(value) {
+  return JSON.stringify(value == null ? "" : String(value));
+}
+
 function buildEnvString() {
   var list = document.getElementById("ps-env-list");
   if (!list) return "";
@@ -626,7 +637,7 @@ function buildEnvString() {
     var valInput = rows[i].querySelector(".ps-env-val");
     var key = keyInput ? keyInput.value.trim() : "";
     var val = valInput ? valInput.value : "";
-    if (key) lines.push("export " + key + "=" + val);
+    if (key) lines.push("export " + key + "=" + serializeEnvValue(val));
   }
   return lines.join("\n");
 }
@@ -719,28 +730,30 @@ function autoSaveEnv() {
     var envrc = buildEnvString();
     if (ctx.ws && ctx.connected) {
       ctx.ws.send(JSON.stringify({ type: "set_project_env", slug: currentSlug, envrc: envrc }));
-      var saveStatus = document.getElementById("ps-env-save-status");
-      if (saveStatus) {
-        saveStatus.textContent = "Saved";
-        setTimeout(function () { saveStatus.textContent = ""; }, 2000);
-      }
+      showEnvSaveStatus("ps-env-save-status", "Saving...", 2000);
     }
   }, 800);
 }
 
 export function handleProjectEnvSaved(msg) {
-  var saveStatus = document.getElementById("ps-env-save-status");
-  if (!saveStatus) return;
   if (msg.ok) {
-    saveStatus.textContent = "Saved";
-    setTimeout(function () { saveStatus.textContent = ""; }, 2000);
+    showEnvSaveStatus("ps-env-save-status", msg.timing || "Saved", 5000);
   } else {
-    saveStatus.textContent = "Error: " + (msg.error || "Failed to save");
+    showEnvSaveStatus("ps-env-save-status", "Error: " + (msg.error || "Failed to save"), 5000);
   }
 }
 
 // ===== Shared Environment (via tabs) =====
 var sharedEnvSaveTimer = null;
+var sharedEnvStatusTimer = null;
+
+function showSharedEnvSaveStatus(text, duration) {
+  var saveStatus = document.getElementById("ps-shared-env-save-status");
+  if (!saveStatus) return;
+  if (sharedEnvStatusTimer) clearTimeout(sharedEnvStatusTimer);
+  saveStatus.textContent = text;
+  sharedEnvStatusTimer = setTimeout(function () { saveStatus.textContent = ""; }, duration);
+}
 
 function loadSharedEnv() {
   var saveStatus = document.getElementById("ps-shared-env-save-status");
@@ -764,13 +777,10 @@ export function handleProjectSharedEnv(msg) {
 }
 
 export function handleProjectSharedEnvSaved(msg) {
-  var saveStatus = document.getElementById("ps-shared-env-save-status");
-  if (!saveStatus) return;
   if (msg.ok) {
-    saveStatus.textContent = "Saved";
-    setTimeout(function () { saveStatus.textContent = ""; }, 2000);
+    showSharedEnvSaveStatus(msg.timing || "Saved", 5000);
   } else {
-    saveStatus.textContent = "Error: " + (msg.error || "Failed to save");
+    showSharedEnvSaveStatus("Error: " + (msg.error || "Failed to save"), 5000);
   }
 }
 
@@ -784,7 +794,7 @@ function buildSharedEnvString() {
     var valInput = rows[i].querySelector(".ps-env-val");
     var key = keyInput ? keyInput.value.trim() : "";
     var val = valInput ? valInput.value : "";
-    if (key) lines.push("export " + key + "=" + val);
+    if (key) lines.push("export " + key + "=" + serializeEnvValue(val));
   }
   return lines.join("\n");
 }
@@ -873,11 +883,7 @@ function autoSaveSharedEnv() {
     var envrc = buildSharedEnvString();
     if (ctx.ws && ctx.connected) {
       ctx.ws.send(JSON.stringify({ type: "set_shared_env", envrc: envrc }));
-      var saveStatus = document.getElementById("ps-shared-env-save-status");
-      if (saveStatus) {
-        saveStatus.textContent = "Saved";
-        setTimeout(function () { saveStatus.textContent = ""; }, 2000);
-      }
+      showSharedEnvSaveStatus("Saving...", 2000);
     }
   }, 800);
 }

package/lib/public/modules/project-switcher.js

@@ -2,7 +2,7 @@
 //
 // Two modes share the same overlay:
 //   Cmd/Ctrl+E  → projects only (non-Mate), activates via switchProject
-//   Cmd/Ctrl+M  → Mates only, activates via openDm
+//   Cmd/Ctrl+M  → Mates only, activates in the home conversation pane
 //
 // While the modifier is still held, repeating the same shortcut cycles
 // forward and Shift cycles back. Releasing the modifier commits —
@@ -16,7 +16,8 @@
 import { store } from './store.js';
 import { refreshIcons } from './icons.js';
 import { getCachedProjects, switchProject } from './app-projects.js';
-import { openDm } from './app-dm.js';
+import { showHomeHub } from './app-home-hub.js';
+import { openHomeChat } from './home-mate-chat.js';
 import { mateAvatarUrl } from './avatar.js';
 import { parseEmojis } from './markdown.js';
 import { isExternalWorktree, externalWorktreeTooltip, appendExternalWorktreeBadge } from './worktree-location.js';
@@ -33,6 +34,7 @@ var _entries = [];
 
 export function openSwitcherForMode(mode) {
   if (mode !== 'project' && mode !== 'mate') return;
+  if (mode === 'mate' && store.get('projectMateDmsEnabled') === false) return;
   if (_open) closeSwitcher(false);
   openSwitcher(mode);
 }
@@ -93,11 +95,11 @@ export function initProjectSwitcher() {
   function refreshMateHintVisibility() {
     if (!mateHint) return;
     var mates = store.get('cachedMatesList') || [];
-    mateHint.classList.toggle('hidden', mates.length === 0);
+    mateHint.classList.toggle('hidden', mates.length === 0 || store.get('projectMateDmsEnabled') === false);
   }
   refreshMateHintVisibility();
   store.subscribe(function (state, prev) {
-    if (state.cachedMatesList !== prev.cachedMatesList) refreshMateHintVisibility();
+    if (state.cachedMatesList !== prev.cachedMatesList || state.projectMateDmsEnabled !== prev.projectMateDmsEnabled) refreshMateHintVisibility();
   });
 }
 
@@ -143,6 +145,7 @@ function handleKeyDown(e) {
   // same shortcut cycles.
   if (isMod && (k === 'e' || k === 'm')) {
     var requestedMode = k === 'e' ? 'project' : 'mate';
+    if (requestedMode === 'mate' && store.get('projectMateDmsEnabled') === false) return;
     e.preventDefault();
     e.stopPropagation();
     if (!_open) {
@@ -298,7 +301,10 @@ function closeSwitcher(commit) {
   var entry = _entries[_highlightedIndex];
   if (!entry || entry.disabled) return;
   if (_mode === 'mate') {
-    if (entry.key !== currentActiveKey()) openDm(entry.key);
+    if (entry.key !== currentActiveKey()) {
+      showHomeHub();
+      openHomeChat(entry.key);
+    }
   } else {
     if (entry.key !== store.get('currentSlug')) switchProject(entry.key);
   }

package/lib/public/modules/project-workspace-assignment.js

@@ -0,0 +1,23 @@
+import { addToMessages, scrollToBottom } from './app-rendering.js';
+import { createWorkspaceAssignmentCard, showWorkspaceAssignmentError } from './workspace-assignment-card.js';
+
+function findCard(assignmentId) {
+  var cards = document.querySelectorAll(".workspace-assignment-card:not(.home-workspace-assignment)");
+  for (var i = 0; i < cards.length; i++) if (cards[i].dataset.assignmentId === assignmentId) return cards[i];
+  return null;
+}
+
+export function renderProjectWorkspaceAssignment(msg) {
+  var assignment = msg && msg.assignment;
+  if (!assignment || !assignment.assignmentId) return false;
+  var previous = findCard(assignment.assignmentId);
+  var card = createWorkspaceAssignmentCard(assignment, { home: false });
+  if (previous && previous.parentNode) previous.parentNode.replaceChild(card, previous);
+  else addToMessages(card);
+  scrollToBottom();
+  return true;
+}
+
+export function showProjectWorkspaceAssignmentError(msg) {
+  return showWorkspaceAssignmentError(findCard(msg && msg.assignmentId), msg || {});
+}