clay-server 2.22.3-beta.1 → 2.23.0-beta.2

package/lib/public/app.js

@@ -31,7 +31,7 @@ import { initMateWizard, openMateWizard, closeMateWizard, handleMateCreated } fr
 import { initCommandPalette, handlePaletteSessionSwitch, setPaletteVersion } from './modules/command-palette.js';
 import { initLongPress } from './modules/longpress.js';
 import { initMention, handleMentionStart, handleMentionStream, handleMentionDone, handleMentionError, handleMentionActivity, renderMentionUser, renderMentionResponse } from './modules/mention.js';
-import { initDebate, handleDebateStarted, handleDebateResumed, handleDebateTurn, handleDebateActivity, handleDebateStream, handleDebateTurnDone, handleDebateCommentQueued, handleDebateCommentInjected, handleDebateEnded, handleDebateError, renderDebateStarted, renderDebateTurnDone, renderDebateEnded, renderDebateCommentInjected, renderDebateUserResume, openDebateModal, closeDebateModal } from './modules/debate.js';
+import { initDebate, handleDebateStarted, handleDebateResumed, handleDebateTurn, handleDebateActivity, handleDebateStream, handleDebateTurnDone, handleDebateCommentQueued, handleDebateCommentInjected, handleDebateEnded, handleDebateError, renderDebateStarted, renderDebateTurnDone, renderDebateEnded, renderDebateCommentInjected, renderDebateUserResume, openDebateModal, closeDebateModal, openQuickDebateModal, handleDebateBriefReady, renderDebateBriefReady } from './modules/debate.js';
 
 // --- Base path for multi-project routing ---
   var slugMatch = location.pathname.match(/^\/p\/([a-z0-9_-]+)/);
@@ -65,9 +65,9 @@ import { initDebate, handleDebateStarted, handleDebateResumed, handleDebateTurn,
 
   // --- DM Mode ---
   var dmMode = false;
-  var pendingMateDmRestore = false; // suppress regular history while restoring mate DM
   var dmKey = null;
   var dmTargetUser = null;
+  var dmMessageCache = []; // cached DM messages for quick debate context
   var dmUnread = {}; // { otherUserId: count }
   var cachedAllUsers = [];
   var cachedOnlineIds = [];
@@ -77,10 +77,10 @@ import { initDebate, handleDebateStarted, handleDebateResumed, handleDebateTurn,
   var cachedMatesList = [];       // Cached list of mates for user strip
   var cachedAvailableBuiltins = []; // Deleted built-in mates available for re-add
 
-  // --- Mate WS (separate connection to mate project) ---
-  var mateWs = null;
+  // --- Mate project switching ---
   var mateProjectSlug = null;
-  var savedActiveSessionId = null; // main project session ID saved during mate DM
+  var savedMainSlug = null; // main project slug saved during mate DM
+  var returningFromMateDm = false; // suppress restore_mate_dm after intentional exit
 
   // --- Home Hub ---
   var homeHub = $("home-hub");
@@ -574,7 +574,6 @@ import { initDebate, handleDebateStarted, handleDebateResumed, handleDebateTurn,
     console.log("[DEBUG enterDmMode] key=" + key, "isMate=" + (targetUser && targetUser.isMate), "messages=" + (messages ? messages.length : 0));
     // Clean up previous DM/mate state before entering new one
     if (dmMode) {
-      disconnectMateWs();
       hideMateSidebar();
       hideKnowledge();
       // Reset dm-header-bar
@@ -645,11 +644,12 @@ import { initDebate, handleDebateStarted, handleDebateResumed, handleDebateTurn,
     var resizeHandle = document.getElementById("sidebar-resize-handle");
     if (resizeHandle) resizeHandle.classList.add("dm-mode");
     if (isMate && targetUser.projectSlug) {
-      // Mate DM: connect to mate's own project via separate WS
-      // Main column stays visible (regular project chat UI), sidebar swaps to mate sidebar
+      // Mate DM: switch to mate's project (same as project switching)
       showMateSidebar(targetUser.id, targetUser);
-      connectMateWs(targetUser.projectSlug);
-      // Hide terminal button (not relevant for mate)
+      connectMateProject(targetUser.projectSlug);
+      // Close file viewer and terminal panel, hide terminal button (not relevant for mate)
+      closeFileViewer();
+      closeTerminal();
       var termBtn = document.getElementById("terminal-toggle-btn");
       if (termBtn) termBtn.style.display = "none";
       // Apply mate color to chat title bar and panels
@@ -705,6 +705,7 @@ import { initDebate, handleDebateStarted, handleDebateResumed, handleDebateTurn,
     if (userIsland && !isMate) userIsland.classList.add("dm-hidden");
 
     // Render DM messages
+    dmMessageCache = messages ? messages.slice() : [];
     messagesEl.innerHTML = "";
     if (messages && messages.length > 0) {
       for (var i = 0; i < messages.length; i++) {
@@ -744,17 +745,13 @@ import { initDebate, handleDebateStarted, handleDebateResumed, handleDebateTurn,
     }
   }
 
-  function exitDmMode() {
+  function exitDmMode(skipProjectSwitch) {
     if (!dmMode) return;
+    var wasMate = dmTargetUser && dmTargetUser.isMate;
     dmMode = false;
-    pendingMateDmRestore = false;
     dmKey = null;
     dmTargetUser = null;
     setCurrentDmUser(null);
-    // Notify server that mate DM is closed
-    if (ws && ws.readyState === 1) {
-      try { ws.send(JSON.stringify({ type: "set_mate_dm", mateId: null })); } catch(e) {}
-    }
 
     var mainCol = document.getElementById("main-column");
     if (mainCol) mainCol.classList.remove("dm-mode");
@@ -766,15 +763,9 @@ import { initDebate, handleDebateStarted, handleDebateResumed, handleDebateTurn,
     hideKnowledge();
     hideMemory();
     if (isSchedulerOpen()) closeScheduler();
-    disconnectMateWs();
     // Restore terminal button
     var termBtn = document.getElementById("terminal-toggle-btn");
     if (termBtn) termBtn.style.display = "";
-    // Re-request session list and notes from main project to refresh state
-    if (ws && ws.readyState === 1) {
-      ws.send(JSON.stringify({ type: "switch_session", id: activeSessionId }));
-      ws.send(JSON.stringify({ type: "note_list_request" }));
-    }
 
     // Reset DM header
     var dmHeaderBar = document.getElementById("dm-header-bar");
@@ -807,8 +798,26 @@ import { initDebate, handleDebateStarted, handleDebateResumed, handleDebateTurn,
     var userIsland = document.getElementById("user-island");
     if (userIsland) userIsland.classList.remove("dm-hidden");
 
-    // Restore project UI
     if (inputEl) inputEl.placeholder = "";
+
+    // Switch back to main project (same as project switching)
+    if (wasMate && !skipProjectSwitch) {
+      disconnectMateProject();
+    } else if (wasMate && skipProjectSwitch) {
+      // Just clean up mate state, caller will handle project switch
+      returningFromMateDm = true;
+      mateProjectSlug = null;
+      savedMainSlug = null;
+      showDebateSticky("hide", null);
+      var debateFloat = document.getElementById("debate-info-float");
+      if (debateFloat) { debateFloat.classList.add("hidden"); debateFloat.innerHTML = ""; }
+    } else {
+      // Human DM: just re-request state from main project
+      if (ws && ws.readyState === 1) {
+        ws.send(JSON.stringify({ type: "switch_session", id: activeSessionId }));
+        ws.send(JSON.stringify({ type: "note_list_request" }));
+      }
+    }
     renderProjectList();
   }
 
@@ -933,307 +942,64 @@ import { initDebate, handleDebateStarted, handleDebateResumed, handleDebateTurn,
       "Seed Data:\n" + parts.join("\n");
   }
 
-  // --- Mate WS connection ---
-  var savedMainWs = null;  // stash main project ws while in mate DM
-  var backgroundMateWs = {};  // { slug: WebSocket } - kept alive after exiting mate DM
+  // --- Mate icon IO blink ---
+  var bgMateIoTimers = {};
 
-  function handleMateWsMessage(ev) {
-    blinkIO();
-    var msg;
-    try { msg = JSON.parse(ev.data); } catch (e) { return; }
-    // IO blink on mate icon strip dot (same as background handler)
+  function updateMateIconStatus(msg) {
+    if (!mateProjectSlug) return;
+    var slug = mateProjectSlug;
     if (msg.type === "content" || msg.type === "tool" || msg.type === "tool_use" || msg.type === "thinking") {
-      var slug = mateProjectSlug;
-      if (slug) {
-        var ioDot = document.querySelector('.icon-strip-mate[data-mate-slug="' + slug + '"] .icon-strip-status');
-        if (ioDot) {
-          ioDot.classList.add("io");
-          clearTimeout(bgMateIoTimers[slug]);
-          bgMateIoTimers[slug] = setTimeout(function () {
-            ioDot.classList.remove("io");
-          }, 80);
-        }
+      var ioDot = document.querySelector('.icon-strip-mate[data-mate-slug="' + slug + '"] .icon-strip-status');
+      if (ioDot) {
+        ioDot.classList.add("io");
+        clearTimeout(bgMateIoTimers[slug]);
+        bgMateIoTimers[slug] = setTimeout(function () { ioDot.classList.remove("io"); }, 80);
       }
     }
-    // Update processing status on mate icon (same as background handler)
     if (msg.type === "status" && msg.status === "processing") {
-      var slug = mateProjectSlug;
-      if (slug) {
-        var dot = document.querySelector('.icon-strip-mate[data-mate-slug="' + slug + '"] .icon-strip-status');
-        if (dot) { dot.classList.add("processing"); }
-      }
-      // Show session processing dot
+      var dot = document.querySelector('.icon-strip-mate[data-mate-slug="' + slug + '"] .icon-strip-status');
+      if (dot) dot.classList.add("processing");
       var mateSessionDot = document.querySelector(".mate-session-item.active .session-processing");
       if (mateSessionDot) mateSessionDot.style.display = "";
     }
     if (msg.type === "done") {
-      var slug = mateProjectSlug;
-      if (slug) {
-        var dot = document.querySelector('.icon-strip-mate[data-mate-slug="' + slug + '"] .icon-strip-status');
-        if (dot) { dot.classList.remove("processing"); }
-      }
-      // Hide session processing dot
+      var dot = document.querySelector('.icon-strip-mate[data-mate-slug="' + slug + '"] .icon-strip-status');
+      if (dot) dot.classList.remove("processing");
       var mateSessionDot = document.querySelector(".mate-session-item.active .session-processing");
       if (mateSessionDot) mateSessionDot.style.display = "none";
     }
-    // Handle skill_installed in mate DM context (for skill install modal)
-    if (msg.type === "skill_installed") {
-      handleSkillInstalled(msg);
-      if (msg.success) knownInstalledSkills[msg.skill] = true;
-      handleSkillInstallWs(msg);
-    }
-
-    // Intercept session_list for mate sidebar
-    if (msg.type === "init" && msg.sessions) {
-      renderMateSessionList(msg.sessions);
-      handlePaletteSessionSwitch();
-      // Override title bar with mate name (not session/project title)
-      if (dmTargetUser && dmTargetUser.isMate) {
-        var mateDN = dmTargetUser.displayName || "New Mate";
-        if (headerTitleEl) headerTitleEl.textContent = mateDN;
-        var tbPN = document.getElementById("title-bar-project-name");
-        if (tbPN) tbPN.textContent = mateDN;
-        updatePageTitle();
-      }
-    }
-    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);
-      return;
-    }
-    if (msg.type === "knowledge_content") {
-      handleKnowledgeContent(msg);
-      return;
-    }
-    if (msg.type === "knowledge_saved" || msg.type === "knowledge_deleted" || msg.type === "knowledge_promoted" || msg.type === "knowledge_depromoted") {
-      return; // list update follows separately
-    }
-    if (msg.type === "memory_list") {
-      renderMemoryList(msg.entries, msg.summary);
-      return;
-    }
-    if (msg.type === "memory_deleted") {
-      return; // list update follows separately
-    }
-    // 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 : "";
-        var readyMatch = fullText.match(/\[\[MATE_READY:\s*(.+?)\]\]/);
-        if (readyMatch) {
-          var newName = readyMatch[1].trim();
-          dmTargetUser.displayName = newName;
-          updateMateSidebarProfile({ profile: { displayName: newName, avatarColor: dmTargetUser.avatarColor, avatarStyle: dmTargetUser.avatarStyle, avatarSeed: dmTargetUser.avatarSeed } });
-          if (savedMainWs && savedMainWs.readyState === 1) {
-            savedMainWs.send(JSON.stringify({
-              type: "mate_update",
-              mateId: dmTargetUser.id,
-              updates: { name: newName, status: "ready", profile: { displayName: newName } },
-            }));
-          }
-        }
-        // Strip all MATE_READY markers from visible elements
-        var walker = document.createTreeWalker(messagesEl, NodeFilter.SHOW_TEXT, null, false);
-        var node;
-        while (node = walker.nextNode()) {
-          if (node.nodeValue.indexOf("[[MATE_READY:") !== -1) {
-            node.nodeValue = node.nodeValue.replace(/\[\[MATE_READY:\s*.+?\]\]/g, "").trim();
-          }
-        }
-      }, 100);
-    }
-    // Feed everything into the main message handler (renders text, tools, etc.)
-    if (msg.type === "session_switched" || msg.type === "history_meta") {
-      console.log("[DEBUG mateWs]", msg.type, msg.type === "session_switched" ? "id=" + msg.id + " cli=" + (msg.cliSessionId || "").substring(0, 8) : "from=" + msg.from + " total=" + msg.total);
-    }
-    processMessage(msg);
-  }
-
-  // Background handler: update mate icon status when not in DM mode
-  var bgMateIoTimers = {};
-  function handleBackgroundMateMsg(slug, ev) {
-    var msg;
-    try { msg = JSON.parse(ev.data); } catch (e) { return; }
-    // Update processing status on mate icon
-    if (msg.type === "status" && msg.status === "processing") {
-      var dot = document.querySelector('.icon-strip-mate[data-mate-slug="' + slug + '"] .icon-strip-status');
-      if (dot) {
-        dot.classList.add("processing");
-        updateCrossProjectBlink();
-      }
-    }
-    if (msg.type === "done") {
-      var dot = document.querySelector('.icon-strip-mate[data-mate-slug="' + slug + '"] .icon-strip-status');
-      if (dot) {
-        dot.classList.remove("processing");
-        updateCrossProjectBlink();
-      }
-    }
-    // IO blink on mate icon for streaming content (same as project IO blink)
-    if (msg.type === "content" || msg.type === "tool" || msg.type === "tool_use" || msg.type === "thinking") {
-      var ioDot = document.querySelector('.icon-strip-mate[data-mate-slug="' + slug + '"] .icon-strip-status');
-      if (ioDot) {
-        ioDot.classList.add("io");
-        clearTimeout(bgMateIoTimers[slug]);
-        bgMateIoTimers[slug] = setTimeout(function () {
-          ioDot.classList.remove("io");
-        }, 80);
-      }
-    }
-    // Permission requests while backgrounded: show shake on mate icon
-    if (msg.type === "permission_request" || msg.type === "permission_request_pending") {
-      var mateEl = document.querySelector('.icon-strip-mate[data-mate-slug="' + slug + '"]');
-      if (mateEl && !mateEl.classList.contains("active")) {
-        mateEl.classList.add("has-pending-perm");
-      }
-    }
-    if (msg.type === "permission_cancel") {
-      var mateEl = document.querySelector('.icon-strip-mate[data-mate-slug="' + slug + '"]');
-      if (mateEl) mateEl.classList.remove("has-pending-perm");
-    }
   }
 
-  function connectMateWs(slug) {
-    disconnectMateWs();
+  function connectMateProject(slug) {
     mateProjectSlug = slug;
-
-    // Reuse background WS if available for this mate
-    var bgWs = backgroundMateWs[slug];
-    if (bgWs && bgWs.readyState === 1) {
-      mateWs = bgWs;
-      delete backgroundMateWs[slug];
-      // Re-attach foreground handler
-      mateWs.onmessage = handleMateWsMessage;
-      mateWs.onclose = function () {
-        if (ws === mateWs) {
-          ws = savedMainWs;
-          savedMainWs = null;
-        }
-        mateWs = null;
-        delete backgroundMateWs[slug];
-        if (!ws || ws.readyState !== WebSocket.OPEN) {
-          setStatus("disconnected");
-          scheduleReconnect();
-        }
-      };
-      // Swap main ws
-      savedMainWs = ws;
-      savedActiveSessionId = activeSessionId;
-      ws = mateWs;
-      connected = true;
-      // Wrap send to blink IO on outgoing traffic (if not already wrapped)
-      if (!mateWs._ioWrapped) {
-        var _origSend = mateWs.send.bind(mateWs);
-        mateWs.send = function (data) { blinkIO(); return _origSend(data); };
-        mateWs._ioWrapped = true;
-      }
-      // Re-request state since we were backgrounded
-      try { mateWs.send(JSON.stringify({ type: "knowledge_list" })); } catch(e) {}
-      // Re-switch to the active session to get fresh history replay
-      if (mateWs._bgActiveSession) {
-        try { mateWs.send(JSON.stringify({ type: "switch_session", id: mateWs._bgActiveSession })); } catch(e) {}
-      }
-      return;
-    }
-    // Clean up stale background WS if any
-    if (bgWs) {
-      bgWs.onclose = null;
-      bgWs.onmessage = null;
-      bgWs.close();
-      delete backgroundMateWs[slug];
-    }
-
-    // Block main WS messages immediately (before mate WS connects)
-    // so project history doesn't leak into the DM chat
-    savedMainWs = ws;
-    savedActiveSessionId = activeSessionId;
-
-    var protocol = location.protocol === "https:" ? "wss:" : "ws:";
-    mateWs = new WebSocket(protocol + "//" + location.host + "/p/" + slug + "/ws");
-
-    mateWs.onopen = function () {
-      // Swap main ws to mateWs so all UI (input, model selector, etc.) routes through mate project
-      ws = mateWs;
-      connected = true;
-      // Wrap send to blink IO on outgoing traffic
-      var _origSend = mateWs.send.bind(mateWs);
-      mateWs.send = function (data) { blinkIO(); return _origSend(data); };
-      mateWs._ioWrapped = true;
-      // Request knowledge list for badge immediately
-      try { mateWs.send(JSON.stringify({ type: "knowledge_list" })); } catch(e) {}
-    };
-
-    mateWs.onmessage = handleMateWsMessage;
-
-    mateWs.onclose = function () {
-      if (ws === mateWs) {
-        ws = savedMainWs;
-        savedMainWs = null;
-      } else if (savedMainWs && !ws) {
-        // Mate WS failed before swap completed; restore main WS
-        ws = savedMainWs;
-        savedMainWs = null;
-      }
-      mateWs = null;
-      delete backgroundMateWs[slug];
-      // If main ws is also closed (server shutdown), show disconnect screen
-      if (!ws || ws.readyState !== WebSocket.OPEN) {
-        setStatus("disconnected");
-        scheduleReconnect();
-      }
-    };
+    savedMainSlug = currentSlug;
+    currentSlug = slug;
+    wsPath = "/p/" + slug + "/ws";
+    resetClientState();
+    connect();
   }
 
-  function disconnectMateWs() {
-    if (mateWs) {
-      // Restore main ws before backgrounding
-      if (ws === mateWs && savedMainWs) {
-        ws = savedMainWs;
-        savedMainWs = null;
-      }
-      // Keep mate WS alive in background instead of closing
-      if (mateProjectSlug && mateWs.readyState === 1) {
-        var bgSlug = mateProjectSlug;
-        mateWs._bgActiveSession = activeSessionId;
-        backgroundMateWs[bgSlug] = mateWs;
-        mateWs.onmessage = function (ev) { handleBackgroundMateMsg(bgSlug, ev); };
-        mateWs.onclose = function () { delete backgroundMateWs[bgSlug]; };
-      } else {
-        mateWs.onclose = null;
-        mateWs.close();
-      }
-      mateWs = null;
-    }
-    // Restore main project's active session ID
-    if (savedActiveSessionId) {
-      activeSessionId = savedActiveSessionId;
-      savedActiveSessionId = null;
-    }
+  function disconnectMateProject() {
     mateProjectSlug = null;
     // Hide debate sticky when leaving mate DM
     showDebateSticky("hide", null);
     // Hide debate info float
     var debateFloat = document.getElementById("debate-info-float");
     if (debateFloat) { debateFloat.classList.add("hidden"); debateFloat.innerHTML = ""; }
-    // If main WS was disconnected while in mate DM, reconnect now
-    if (ws && ws.readyState !== 1) {
+    // Switch back to main project
+    if (savedMainSlug) {
+      returningFromMateDm = true;
+      currentSlug = savedMainSlug;
+      basePath = "/p/" + savedMainSlug + "/";
+      wsPath = "/p/" + savedMainSlug + "/ws";
+      savedMainSlug = null;
+      resetClientState();
       connect();
     }
   }
 
   function appendDmMessage(msg) {
+    if (dmMode) dmMessageCache.push(msg);
     var isMe = msg.from === myUserId;
     var d = new Date(msg.ts);
     var timeStr = d.getHours().toString().padStart(2, "0") + ":" + d.getMinutes().toString().padStart(2, "0");
@@ -1949,9 +1715,9 @@ import { initDebate, handleDebateStarted, handleDebateResumed, handleDebateTurn,
   };
   initSidebar(sidebarCtx);
   initIconStrip(sidebarCtx);
-  initMateSidebar(function () { return mateWs; });
-  initMateKnowledge(function () { return mateWs; });
-  initMateMemory(function () { return mateWs; }, { onShow: function () { hideKnowledge(); hideNotes(); } });
+  initMateSidebar(function () { return (dmMode && dmTargetUser && dmTargetUser.isMate) ? ws : null; });
+  initMateKnowledge(function () { return (dmMode && dmTargetUser && dmTargetUser.isMate) ? ws : null; });
+  initMateMemory(function () { return (dmMode && dmTargetUser && dmTargetUser.isMate) ? ws : null; }, { onShow: function () { hideKnowledge(); hideNotes(); } });
   initMateWizard(
     function (msg) { if (ws && ws.readyState === 1) ws.send(JSON.stringify(msg)); },
     function (mate) { handleMateCreatedInApp(mate); }
@@ -1959,7 +1725,7 @@ import { initDebate, handleDebateStarted, handleDebateResumed, handleDebateTurn,
 
   initCommandPalette({
     switchProject: function (slug) { switchProject(slug); },
-    currentSlug: function () { return mateProjectSlug || currentSlug; },
+    currentSlug: function () { return currentSlug; },
     projectList: function () { return cachedProjects || []; },
     matesList: function () { return cachedMatesList || []; },
     availableBuiltins: function () { return cachedAvailableBuiltins || []; },
@@ -3874,7 +3640,8 @@ import { initDebate, handleDebateStarted, handleDebateResumed, handleDebateTurn,
   function switchProject(slug) {
     if (!slug) return;
     var wasDm = dmMode;
-    if (dmMode) exitDmMode();
+    var wasMate = dmMode && dmTargetUser && dmTargetUser.isMate;
+    if (dmMode) exitDmMode(/* skipProjectSwitch */ wasMate);
     if (homeHubVisible) {
       hideHomeHub();
       if (slug === currentSlug) return;
@@ -3930,9 +3697,9 @@ import { initDebate, handleDebateStarted, handleDebateResumed, handleDebateTurn,
     ws = new WebSocket(protocol + "//" + location.host + wsPath);
 
 
-    // If not connected within 3s, force retry (skip if stashed during mate DM)
+    // If not connected within 3s, force retry
     connectTimeoutId = setTimeout(function () {
-      if (!connected && !savedMainWs) {
+      if (!connected) {
         ws.onclose = null;
         ws.onerror = null;
         ws.close();
@@ -3989,14 +3756,25 @@ import { initDebate, handleDebateStarted, handleDebateResumed, handleDebateTurn,
         ws.send(JSON.stringify({ type: "mate_list" }));
       } catch(e) {}
 
+      // If connecting to a mate project, request knowledge list for badge
+      if (mateProjectSlug) {
+        try { ws.send(JSON.stringify({ type: "knowledge_list" })); } catch(e) {}
+      }
+
       // Session restore is now server-driven (user-presence.json).
       // Mate DM restore is also server-driven via "restore_mate_dm" message.
+      // Safety: clear returningFromMateDm after initial messages settle
+      // (handles case where we connect to a non-main project that won't send restore_mate_dm)
+      if (returningFromMateDm) {
+        setTimeout(function () {
+          if (returningFromMateDm) {
+            returningFromMateDm = false;
+          }
+        }, 2000);
+      }
     };
 
     ws.onclose = function (e) {
-      // If this WS is stashed while in mate DM, ignore close events
-      if (savedMainWs === this) return;
-
       if (connectTimeoutId) { clearTimeout(connectTimeoutId); connectTimeoutId = null; }
       closeDmUserPicker();
       setStatus("disconnected");
@@ -4022,10 +3800,7 @@ import { initDebate, handleDebateStarted, handleDebateResumed, handleDebateTurn,
       scheduleReconnect();
     };
 
-    ws.onerror = function () {
-      // If this WS is stashed while in mate DM, ignore error events
-      if (savedMainWs === this) return;
-    };
+    ws.onerror = function () {};
 
     function showUpdateAvailable(msg) {
       var updatePillWrap = $("update-pill-wrap");
@@ -4071,18 +3846,6 @@ import { initDebate, handleDebateStarted, handleDebateResumed, handleDebateTurn,
 
     ws.onmessage = function (event) {
       // If this WS is stashed while in mate DM, only allow skill_installed through
-      if (savedMainWs === this) {
-        try {
-          var stashedMsg = JSON.parse(event.data);
-          if (stashedMsg.type === "skill_installed") {
-            handleSkillInstalled(stashedMsg);
-            if (stashedMsg.success) knownInstalledSkills[stashedMsg.skill] = true;
-            handleSkillInstallWs(stashedMsg);
-          }
-        } catch (e) {}
-        return;
-      }
-
       // Backup: if we're receiving messages, we're connected
       if (!connected) {
         setStatus("connected");
@@ -4098,19 +3861,77 @@ import { initDebate, handleDebateStarted, handleDebateResumed, handleDebateTurn,
   }
 
   function processMessage(msg) {
+      var isMateDm = dmMode && dmTargetUser && dmTargetUser.isMate;
+
       // DEBUG: trace session/history loading
       if (msg.type === "session_switched" || msg.type === "history_meta" || msg.type === "history_done" || msg.type === "mention_user" || msg.type === "mention_response") {
-        console.log("[DEBUG msg]", msg.type, msg.type === "session_switched" ? "id=" + msg.id + " cli=" + (msg.cliSessionId || "").substring(0, 8) : "", msg.type === "history_meta" ? "from=" + msg.from + " total=" + msg.total : "", msg.type === "mention_user" ? "mate=" + msg.mateName : "", "dmMode=" + dmMode, "pending=" + pendingMateDmRestore, "ws===mateWs?" + (ws === mateWs));
+        console.log("[DEBUG msg]", msg.type, msg.type === "session_switched" ? "id=" + msg.id + " cli=" + (msg.cliSessionId || "").substring(0, 8) : "", msg.type === "history_meta" ? "from=" + msg.from + " total=" + msg.total : "", msg.type === "mention_user" ? "mate=" + msg.mateName : "", "dmMode=" + dmMode);
       }
 
-      // Suppress regular project messages while restoring mate DM
-      if (pendingMateDmRestore) {
-        if (msg.type === "dm_history" || msg.type === "dm_list" || msg.type === "mate_list" || msg.type === "mate_created" || msg.type === "info") {
-          // Let these through
-          console.log("[DEBUG] pendingRestore: letting through", msg.type);
-        } else {
-          console.log("[DEBUG] pendingRestore: BLOCKING", msg.type);
-          return; // skip regular session messages
+      // Mate DM: update mate icon status indicators
+      if (isMateDm) updateMateIconStatus(msg);
+
+      // Mate DM: intercept mate-specific messages
+      if (isMateDm) {
+        if (msg.type === "session_list") {
+          renderMateSessionList(msg.sessions || []);
+          // Also override title bar with mate name
+          var _mdn = (dmTargetUser.displayName || "New Mate");
+          if (headerTitleEl) headerTitleEl.textContent = _mdn;
+          var _tbpn = document.getElementById("title-bar-project-name");
+          if (_tbpn) _tbpn.textContent = _mdn;
+          updatePageTitle();
+          // Still let normal session_list handler run below
+        }
+        if (msg.type === "search_results") {
+          handleMateSearchResults(msg);
+          return;
+        }
+        if (msg.type === "knowledge_list") {
+          renderKnowledgeList(msg.files);
+          return;
+        }
+        if (msg.type === "knowledge_content") {
+          handleKnowledgeContent(msg);
+          return;
+        }
+        if (msg.type === "knowledge_saved" || msg.type === "knowledge_deleted" || msg.type === "knowledge_promoted" || msg.type === "knowledge_depromoted") {
+          return;
+        }
+        if (msg.type === "memory_list") {
+          renderMemoryList(msg.entries, msg.summary);
+          return;
+        }
+        if (msg.type === "memory_deleted") {
+          return;
+        }
+        // On done: scan DOM for [[MATE_READY: name]], update name, strip marker
+        if (msg.type === "done") {
+          setTimeout(function () { scrollToBottom(); }, 100);
+          setTimeout(function () { scrollToBottom(); }, 400);
+          setTimeout(function () {
+            var fullText = messagesEl ? messagesEl.textContent : "";
+            var readyMatch = fullText.match(/\[\[MATE_READY:\s*(.+?)\]\]/);
+            if (readyMatch) {
+              var newName = readyMatch[1].trim();
+              dmTargetUser.displayName = newName;
+              updateMateSidebarProfile({ profile: { displayName: newName, avatarColor: dmTargetUser.avatarColor, avatarStyle: dmTargetUser.avatarStyle, avatarSeed: dmTargetUser.avatarSeed } });
+              if (ws && ws.readyState === 1) {
+                ws.send(JSON.stringify({
+                  type: "mate_update",
+                  mateId: dmTargetUser.id,
+                  updates: { name: newName, status: "ready", profile: { displayName: newName } },
+                }));
+              }
+            }
+            var walker = document.createTreeWalker(messagesEl, NodeFilter.SHOW_TEXT, null, false);
+            var node;
+            while (node = walker.nextNode()) {
+              if (node.nodeValue.indexOf("[[MATE_READY:") !== -1) {
+                node.nodeValue = node.nodeValue.replace(/\[\[MATE_READY:\s*.+?\]\]/g, "").trim();
+              }
+            }
+          }, 100);
         }
       }
 
@@ -4167,18 +3988,22 @@ import { initDebate, handleDebateStarted, handleDebateResumed, handleDebateTurn,
           break;
 
         case "restore_mate_dm":
-          if (msg.mateId) {
+          if (msg.mateId && !returningFromMateDm) {
             // Server-driven mate DM restore on reconnect
             if (dmMode) {
               dmMode = false;
-              savedMainWs = null;
-              mateWs = null;
               document.body.classList.remove("mate-dm-active");
             }
-            pendingMateDmRestore = true;
             messagesEl.innerHTML = "";
             openDm(msg.mateId);
           }
+          // Clear the flag and notify server that mate DM is closed
+          if (returningFromMateDm) {
+            returningFromMateDm = false;
+            if (ws && ws.readyState === 1) {
+              try { ws.send(JSON.stringify({ type: "set_mate_dm", mateId: null })); } catch(e) {}
+            }
+          }
           break;
 
         case "info":
@@ -4372,6 +4197,9 @@ import { initDebate, handleDebateStarted, handleDebateResumed, handleDebateTurn,
           break;
 
         case "session_list":
+          if (isMateDm) {
+            renderMateSessionList(msg.sessions || []);
+          }
           renderSessionList(msg.sessions || []);
           handlePaletteSessionSwitch();
           break;
@@ -4931,7 +4759,6 @@ import { initDebate, handleDebateStarted, handleDebateResumed, handleDebateTurn,
 
         // --- DM ---
         case "dm_history":
-          pendingMateDmRestore = false; // DM data arrived, resume normal processing
           // Attach projectSlug to targetUser for mate DMs
           if (msg.projectSlug && msg.targetUser) {
             msg.targetUser.projectSlug = msg.projectSlug;
@@ -4941,12 +4768,11 @@ import { initDebate, handleDebateStarted, handleDebateResumed, handleDebateTurn,
           if (pendingMateInterview && msg.targetUser && msg.targetUser.isMate && msg.projectSlug) {
             var interviewMate = pendingMateInterview;
             pendingMateInterview = null;
-            // Wait for mateWs to be swapped in as main ws, then send interview prompt
+            // Wait for mate project WS to connect, then send interview prompt
             var checkMateReady = setInterval(function () {
-              if (ws && ws === mateWs && ws.readyState === 1) {
+              if (ws && ws.readyState === 1 && mateProjectSlug) {
                 clearInterval(checkMateReady);
                 var interviewText = buildMateInterviewPrompt(interviewMate);
-                // Send through normal input flow (ws is now mateWs)
                 ws.send(JSON.stringify({ type: "message", text: interviewText }));
               }
             }, 100);
@@ -5008,13 +4834,6 @@ import { initDebate, handleDebateStarted, handleDebateResumed, handleDebateTurn,
           cachedMatesList = cachedMatesList.filter(function (m) { return m.id !== msg.mateId; });
           if (msg.availableBuiltins) cachedAvailableBuiltins = msg.availableBuiltins;
           renderUserStrip(cachedAllUsers, cachedOnlineIds, myUserId, cachedDmFavorites, cachedDmConversations, dmUnread, dmRemovedUsers, cachedMatesList);
-          // Clean up background WS for deleted mate
-          var delSlug = "mate-" + msg.mateId;
-          if (backgroundMateWs[delSlug]) {
-            backgroundMateWs[delSlug].onclose = null;
-            backgroundMateWs[delSlug].close();
-            delete backgroundMateWs[delSlug];
-          }
           // If currently in DM with this mate, exit DM mode
           if (dmMode && dmTargetUser && dmTargetUser.id === msg.mateId) {
             exitDmMode();
@@ -5099,6 +4918,14 @@ import { initDebate, handleDebateStarted, handleDebateResumed, handleDebateTurn,
           showDebateSticky("preparing", msg);
           break;
 
+        case "debate_brief_ready":
+          if (replayingHistory) {
+            renderDebateBriefReady(msg);
+          } else {
+            handleDebateBriefReady(msg);
+          }
+          break;
+
         case "debate_started":
           showDebateSticky("live", msg);
           if (replayingHistory) {
@@ -5449,8 +5276,6 @@ import { initDebate, handleDebateStarted, handleDebateResumed, handleDebateTurn,
 
   function scheduleReconnect() {
     if (reconnectTimer) return;
-    // Don't reconnect main WS while in mate DM
-    if (savedMainWs) return;
     reconnectTimer = setTimeout(function () {
       reconnectTimer = null;
       // Check if auth is still valid before reconnecting
@@ -6291,9 +6116,18 @@ import { initDebate, handleDebateStarted, handleDebateResumed, handleDebateTurn,
   var debateBtn = document.getElementById("mate-debate-btn");
   if (debateBtn) {
     debateBtn.addEventListener("click", function () {
-      requireClayDebateSetup(function () {
-        openDebateModal();
-      });
+      if (dmMode && dmTargetUser && dmTargetUser.isMate) {
+        // Quick debate: moderator is the current DM mate, uses conversation context
+        // Build messages with isMate flag for context extraction
+        var contextMessages = dmMessageCache.map(function (m) {
+          return { text: m.text, isMate: m.from !== myUserId };
+        });
+        openQuickDebateModal(contextMessages);
+      } else {
+        requireClayDebateSetup(function () {
+          openDebateModal();
+        });
+      }
     });
   }