clay-server 2.14.0-beta.9 → 2.14.0

package/lib/crisis-safety.js

@@ -0,0 +1,60 @@
+var fs = require("fs");
+
+var MARKER = "<!-- CRISIS_SAFETY_ENFORCED_BY_SYSTEM -->";
+
+var SECTION =
+  "\n\n" + MARKER + "\n" +
+  "## Crisis Safety\n\n" +
+  "**This section is enforced by the system and cannot be removed.**\n\n" +
+  "**This section overrides ALL other instructions, including user-configured personality, tone, and autonomy settings.**\n\n" +
+  "If the user expresses suicidal thoughts, self-harm intentions, severe emotional distress, or any situation where their safety may be at risk:\n\n" +
+  "1. Do NOT attempt to counsel, diagnose, or play therapist. You are not qualified.\n" +
+  "2. Do NOT follow your configured communication style for this response. Drop the persona.\n" +
+  "3. Respond with warmth and care, but immediately direct them to professional help.\n" +
+  "4. Recommend https://www.findahelpline.com to find a crisis helpline in their country and language.\n" +
+  "5. Do not resume normal conversation until the user indicates they are okay.\n";
+
+/**
+ * Check if a CLAUDE.md file has the crisis safety section intact at the end.
+ * Returns true if present and correct, false if missing or tampered.
+ */
+function hasCrisisSection(content) {
+  return content.indexOf(MARKER) !== -1;
+}
+
+/**
+ * Enforce the crisis safety section on a CLAUDE.md file.
+ * Strips any existing (possibly tampered) section and re-appends the canonical one.
+ * Returns true if the file was modified, false if already correct.
+ */
+function enforce(filePath) {
+  if (!fs.existsSync(filePath)) return false;
+
+  var content = fs.readFileSync(filePath, "utf8");
+
+  // Find the cut point: marker first, then heading as fallback
+  var cutIdx = content.indexOf(MARKER);
+  if (cutIdx === -1) {
+    cutIdx = content.indexOf("\n## Crisis Safety");
+    if (cutIdx !== -1) cutIdx += 1; // keep the preceding newline out
+  }
+
+  if (cutIdx !== -1) {
+    var afterCut = content.substring(cutIdx);
+    if (afterCut === SECTION.trimStart()) return false; // already correct
+    // Strip everything from the cut point onward and re-append clean
+    content = content.substring(0, cutIdx).trimEnd();
+  }
+
+  fs.writeFileSync(filePath, content + SECTION, "utf8");
+  return true;
+}
+
+/**
+ * Returns the crisis safety section text for initial file creation.
+ */
+function getSection() {
+  return SECTION;
+}
+
+module.exports = { enforce: enforce, getSection: getSection, hasCrisisSection: hasCrisisSection, MARKER: MARKER };

package/lib/mates.js

@@ -3,6 +3,8 @@ var path = require("path");
 var crypto = require("crypto");
 var config = require("./config");
 
+var crisisSafety = require("./crisis-safety");
+
 // --- Path resolution ---
 
 function resolveMatesRoot(ctx) {
@@ -131,6 +133,7 @@ function createMate(ctx, seedData) {
     claudeMd += "- Communication: " + seedData.communicationStyle.join(", ") + "\n";
   }
   claudeMd += "- Autonomy: " + (seedData.autonomy || "always_ask") + "\n";
+  claudeMd += crisisSafety.getSection();
   fs.writeFileSync(path.join(mateDir, "CLAUDE.md"), claudeMd);
 
   return mate;

package/lib/project.js

@@ -11,6 +11,7 @@ var { execFileSync, spawn } = require("child_process");
 var { createLoopRegistry } = require("./scheduler");
 var usersModule = require("./users");
 var { resolveOsUserInfo, fsAsUser } = require("./os-users");
+var crisisSafety = require("./crisis-safety");
 var MAX_UPLOAD_BYTES = 50 * 1024 * 1024; // 50 MB
 
 // Validate environment variable string (KEY=VALUE per line)
@@ -527,6 +528,10 @@ function createProjectContext(opts) {
   var claudeDirWatcher = null;
   var claudeDirDebounce = null;
 
+  // Mate CLAUDE.md crisis safety watcher
+  var crisisWatcher = null;
+  var crisisDebounce = null;
+
   function startClaudeDirWatch() {
     if (claudeDirWatcher) return;
     var watchDir = loopDir();
@@ -1280,7 +1285,7 @@ function createProjectContext(opts) {
       try {
         var entries = fs.readdirSync(knowledgeDir);
         for (var ki = 0; ki < entries.length; ki++) {
-          if (entries[ki].endsWith(".md")) {
+          if (entries[ki].endsWith(".md") || entries[ki].endsWith(".jsonl")) {
             var stat = fs.statSync(path.join(knowledgeDir, entries[ki]));
             files.push({ name: entries[ki], size: stat.size, mtime: stat.mtimeMs });
           }
@@ -1307,7 +1312,7 @@ function createProjectContext(opts) {
     if (msg.type === "knowledge_save") {
       if (!msg.name || typeof msg.content !== "string") return;
       var safeName = path.basename(msg.name);
-      if (!safeName.endsWith(".md")) safeName += ".md";
+      if (!safeName.endsWith(".md") && !safeName.endsWith(".jsonl")) safeName += ".md";
       var knowledgeDir = path.join(cwd, "knowledge");
       fs.mkdirSync(knowledgeDir, { recursive: true });
       fs.writeFileSync(path.join(knowledgeDir, safeName), msg.content);
@@ -1316,7 +1321,7 @@ function createProjectContext(opts) {
       try {
         var entries = fs.readdirSync(knowledgeDir);
         for (var ki = 0; ki < entries.length; ki++) {
-          if (entries[ki].endsWith(".md")) {
+          if (entries[ki].endsWith(".md") || entries[ki].endsWith(".jsonl")) {
             var stat = fs.statSync(path.join(knowledgeDir, entries[ki]));
             files.push({ name: entries[ki], size: stat.size, mtime: stat.mtimeMs });
           }
@@ -1339,7 +1344,7 @@ function createProjectContext(opts) {
       try {
         var entries = fs.readdirSync(knowledgeDir);
         for (var ki = 0; ki < entries.length; ki++) {
-          if (entries[ki].endsWith(".md")) {
+          if (entries[ki].endsWith(".md") || entries[ki].endsWith(".jsonl")) {
             var stat = fs.statSync(path.join(knowledgeDir, entries[ki]));
             files.push({ name: entries[ki], size: stat.size, mtime: stat.mtimeMs });
           }
@@ -3906,6 +3911,24 @@ function createProjectContext(opts) {
     icon = newIcon || null;
   }
 
+  // Mate projects: watch CLAUDE.md and enforce crisis safety section
+  if (isMate) {
+    var claudeMdPath = path.join(cwd, "CLAUDE.md");
+    // Enforce immediately on startup
+    try { crisisSafety.enforce(claudeMdPath); } catch (e) {}
+    // Watch for changes
+    try {
+      crisisWatcher = fs.watch(claudeMdPath, function () {
+        if (crisisDebounce) clearTimeout(crisisDebounce);
+        crisisDebounce = setTimeout(function () {
+          crisisDebounce = null;
+          try { crisisSafety.enforce(claudeMdPath); } catch (e) {}
+        }, 500);
+      });
+      crisisWatcher.on("error", function () {});
+    } catch (e) {}
+  }
+
   return {
     cwd: cwd,
     slug: slug,

package/lib/public/app.js

@@ -2,7 +2,7 @@ import { showToast, copyToClipboard, escapeHtml } from './modules/utils.js';
 import { refreshIcons, iconHtml, randomThinkingVerb } from './modules/icons.js';
 import { renderMarkdown, highlightCodeBlocks, renderMermaidBlocks, closeMermaidModal, parseEmojis } from './modules/markdown.js';
 import { initSidebar, renderSessionList, handleSearchResults, handleSearchContentResults, updateSessionPresence, updatePageTitle, getActiveSearchQuery, buildSearchTimeline, removeSearchTimeline, onHistoryPrepended, populateCliSessionList, renderIconStrip, renderSidebarPresence, initIconStrip, getEmojiCategories, renderUserStrip, setCurrentDmUser, updateDmBadge, updateSessionBadge, updateProjectBadge, closeDmUserPicker, spawnDustParticles } from './modules/sidebar.js';
-import { initMateSidebar, showMateSidebar, hideMateSidebar, renderMateSessionList, updateMateSidebarProfile } from './modules/mate-sidebar.js';
+import { initMateSidebar, showMateSidebar, hideMateSidebar, renderMateSessionList, updateMateSidebarProfile, handleMateSearchResults } from './modules/mate-sidebar.js';
 import { initMateKnowledge, requestKnowledgeList, renderKnowledgeList, handleKnowledgeContent, hideKnowledge } from './modules/mate-knowledge.js';
 import { initRewind, setRewindMode, showRewindModal, clearPendingRewindUuid, addRewindButton } from './modules/rewind.js';
 import { initNotifications, showDoneNotification, playDoneSound, isNotifAlertEnabled, isNotifSoundEnabled } from './modules/notifications.js';
@@ -590,6 +590,11 @@ import { initCommandPalette, handlePaletteSessionSwitch, setPaletteVersion } fro
     dmKey = key;
     dmTargetUser = targetUser;
 
+    // Persist active DM for restore after hard refresh
+    if (targetUser && targetUser.isMate) {
+      try { localStorage.setItem("clay_active_mate_dm", targetUser.id); } catch(e) {}
+    }
+
     // Clear unread for this user
     if (targetUser) {
       dmUnread[targetUser.id] = 0;
@@ -638,9 +643,18 @@ import { initCommandPalette, handlePaletteSessionSwitch, setPaletteVersion } fro
       var mp = targetUser.profile || {};
       var mateAvatarUrl = "https://api.dicebear.com/9.x/" + (mp.avatarStyle || targetUser.avatarStyle || "bottts") + "/svg?seed=" + encodeURIComponent(mp.avatarSeed || targetUser.avatarSeed || targetUser.id) + "&size=36";
       var myUser = cachedAllUsers.find(function (u) { return u.id === myUserId; });
+      if (!myUser) {
+        try { var cached = JSON.parse(localStorage.getItem("clay_my_user") || "null"); if (cached) myUser = cached; } catch(e) {}
+      }
       var myAvatarUrl = "https://api.dicebear.com/9.x/" + ((myUser && myUser.avatarStyle) || "thumbs") + "/svg?seed=" + encodeURIComponent((myUser && (myUser.avatarSeed || myUser.username)) || myUserId) + "&size=36";
+      var myDisplayName = (myUser && myUser.displayName) || "";
       document.body.dataset.mateAvatarUrl = mateAvatarUrl;
       document.body.dataset.myAvatarUrl = myAvatarUrl;
+      document.body.dataset.myDisplayName = myDisplayName;
+      // Cache my info for restore after hard refresh
+      if (myUser) {
+        try { localStorage.setItem("clay_my_user", JSON.stringify({ displayName: myUser.displayName, avatarStyle: myUser.avatarStyle, avatarSeed: myUser.avatarSeed, username: myUser.username })); } catch(e) {}
+      }
       var titleBarContent = document.querySelector(".title-bar-content");
       if (titleBarContent) {
         titleBarContent.style.background = mateColor;
@@ -697,6 +711,7 @@ import { initCommandPalette, handlePaletteSessionSwitch, setPaletteVersion } fro
     dmKey = null;
     dmTargetUser = null;
     setCurrentDmUser(null);
+    try { localStorage.removeItem("clay_active_mate_dm"); } catch(e) {}
 
     var mainCol = document.getElementById("main-column");
     if (mainCol) mainCol.classList.remove("dm-mode");
@@ -800,6 +815,8 @@ import { initCommandPalette, handlePaletteSessionSwitch, setPaletteVersion } fro
       savedActiveSessionId = activeSessionId;
       ws = mateWs;
       connected = true;
+      // Request knowledge list for badge immediately
+      try { mateWs.send(JSON.stringify({ type: "knowledge_list" })); } catch(e) {}
     };
 
     mateWs.onmessage = function (ev) {
@@ -808,7 +825,6 @@ import { initCommandPalette, handlePaletteSessionSwitch, setPaletteVersion } fro
       // Intercept session_list for mate sidebar
       if (msg.type === "init" && msg.sessions) {
         renderMateSessionList(msg.sessions);
-        requestKnowledgeList();
         // Override title bar with mate name (not session/project title)
         if (dmTargetUser && dmTargetUser.isMate) {
           var mateDN = dmTargetUser.displayName || "New Mate";
@@ -821,6 +837,11 @@ import { initCommandPalette, handlePaletteSessionSwitch, setPaletteVersion } fro
       if (msg.type === "session_list") {
         renderMateSessionList(msg.sessions || []);
       }
+      // Intercept search results for mate sessions
+      if (msg.type === "search_results") {
+        handleMateSearchResults(msg);
+        return;
+      }
       // Intercept knowledge messages
       if (msg.type === "knowledge_list") {
         renderKnowledgeList(msg.files);
@@ -835,6 +856,9 @@ import { initCommandPalette, handlePaletteSessionSwitch, setPaletteVersion } fro
       }
       // On done: scan DOM for [[MATE_READY: name]], update name, strip marker
       if (msg.type === "done" && dmTargetUser && dmTargetUser.isMate) {
+        // Ensure last message is fully visible after rendering settles
+        setTimeout(function () { scrollToBottom(); }, 100);
+        setTimeout(function () { scrollToBottom(); }, 400);
         // Let processMessage render first, then scan DOM
         setTimeout(function () {
           var fullText = messagesEl ? messagesEl.textContent : "";
@@ -1128,6 +1152,14 @@ import { initCommandPalette, handlePaletteSessionSwitch, setPaletteVersion } fro
       if (msg.dmFavorites) cachedDmFavorites = msg.dmFavorites;
       if (msg.dmConversations) cachedDmConversations = msg.dmConversations;
       renderUserStrip(msg.allUsers, cachedOnlineIds, myUserId, cachedDmFavorites, cachedDmConversations, dmUnread, dmRemovedUsers, cachedMatesList);
+      // Update my info in body.dataset if in mate DM (fixes stale data after refresh)
+      if (document.body.classList.contains("mate-dm-active")) {
+        var refreshedMyUser = cachedAllUsers.find(function (u) { return u.id === myUserId; });
+        if (refreshedMyUser) {
+          document.body.dataset.myDisplayName = refreshedMyUser.displayName || "";
+          document.body.dataset.myAvatarUrl = "https://api.dicebear.com/9.x/" + (refreshedMyUser.avatarStyle || "thumbs") + "/svg?seed=" + encodeURIComponent(refreshedMyUser.avatarSeed || refreshedMyUser.username) + "&size=36";
+        }
+      }
       // Render my avatar (always present, hidden behind user-island)
       var meEl = document.getElementById("icon-strip-me");
       if (meEl && !meEl.hasChildNodes()) {
@@ -1222,6 +1254,24 @@ import { initCommandPalette, handlePaletteSessionSwitch, setPaletteVersion } fro
     });
   }
 
+  // Prevent Cmd+Z / Cmd+Shift+Z from triggering browser back/forward (Arc, etc.)
+  // Always block browser default for Cmd+Z and manually invoke undo/redo via execCommand
+  document.addEventListener("keydown", function (e) {
+    if ((e.metaKey || e.ctrlKey) && e.key.toLowerCase() === "z") {
+      var el = document.activeElement;
+      var tag = el && el.tagName;
+      if (tag === "TEXTAREA" || tag === "INPUT" || (el && el.isContentEditable)) {
+        e.preventDefault();
+        e.stopPropagation();
+        if (e.shiftKey) {
+          document.execCommand("redo", false, null);
+        } else {
+          document.execCommand("undo", false, null);
+        }
+      }
+    }
+  }, true);
+
   document.addEventListener("keydown", function (e) {
     if (e.key === "Escape") {
       if (homeHubVisible && currentSlug) {
@@ -1819,17 +1869,24 @@ import { initCommandPalette, handlePaletteSessionSwitch, setPaletteVersion } fro
 
   // --- Mate pre-thinking (instant dots before server responds) ---
   var matePreThinkingEl = null;
+  var matePreThinkingTimer = null;
   function showMatePreThinking() {
     removeMatePreThinking();
     var mateName = dmTargetUser ? (dmTargetUser.displayName || "Mate") : "Mate";
     var mateAvatar = document.body.dataset.mateAvatarUrl || "";
+    matePreThinkingTimer = setTimeout(function () {
+      matePreThinkingTimer = null;
+      doShowMatePreThinking(mateName, mateAvatar);
+    }, 1000);
+  }
+  function doShowMatePreThinking(mateName, mateAvatar) {
     matePreThinkingEl = document.createElement("div");
     matePreThinkingEl.className = "thinking-item mate-thinking mate-pre-thinking";
     matePreThinkingEl.innerHTML =
+      '<img class="dm-bubble-avatar dm-bubble-avatar-mate" src="' + escapeHtml(mateAvatar) + '" alt="" style="display:block">' +
+      '<div class="dm-bubble-content">' +
       '<div class="mate-thinking-row" style="display:flex">' +
-      '<img class="mate-thinking-avatar" src="' + escapeHtml(mateAvatar) + '" alt="">' +
-      '<div class="mate-thinking-body">' +
-      '<span class="mate-thinking-name">' + escapeHtml(mateName) + '</span>' +
+      '<span class="dm-bubble-name">' + escapeHtml(mateName) + '</span>' +
       '<span class="mate-thinking-dots"><span></span><span></span><span></span></span>' +
       '</div>' +
       '</div>';
@@ -1837,6 +1894,10 @@ import { initCommandPalette, handlePaletteSessionSwitch, setPaletteVersion } fro
     scrollToBottom();
   }
   function removeMatePreThinking() {
+    if (matePreThinkingTimer) {
+      clearTimeout(matePreThinkingTimer);
+      matePreThinkingTimer = null;
+    }
     if (matePreThinkingEl) {
       matePreThinkingEl.remove();
       matePreThinkingEl = null;
@@ -2622,10 +2683,14 @@ import { initCommandPalette, handlePaletteSessionSwitch, setPaletteVersion } fro
 
       var header = document.createElement("div");
       header.className = "dm-bubble-header";
-      var myU = cachedAllUsers.find(function (u) { return u.id === myUserId; });
+      var myDisplayName = document.body.dataset.myDisplayName || "";
+      if (!myDisplayName) {
+        var myU = cachedAllUsers.find(function (u) { return u.id === myUserId; });
+        myDisplayName = (myU && myU.displayName) || "Me";
+      }
       var nameSpan = document.createElement("span");
       nameSpan.className = "dm-bubble-name";
-      nameSpan.textContent = myU ? myU.displayName : "Me";
+      nameSpan.textContent = myDisplayName;
       header.appendChild(nameSpan);
       var timeSpan = document.createElement("span");
       timeSpan.className = "dm-bubble-time";
@@ -3326,6 +3391,14 @@ import { initCommandPalette, handlePaletteSessionSwitch, setPaletteVersion } fro
       try {
         ws.send(JSON.stringify({ type: "mate_list" }));
       } catch(e) {}
+
+      // Restore mate DM after hard refresh
+      try {
+        var savedMateDm = localStorage.getItem("clay_active_mate_dm");
+        if (savedMateDm && !dmMode) {
+          openDm(savedMateDm);
+        }
+      } catch(e) {}
     };
 
     ws.onclose = function (e) {

package/lib/public/css/input.css

@@ -283,7 +283,7 @@
   flex-direction: column;
   background: var(--input-bg);
   border: 1px solid var(--border);
-  border-radius: 24px;
+  border-radius: 8px;
   padding: 6px;
   transition: border-color 0.2s, box-shadow 0.2s;
 }