clay-server 2.26.0-beta.1 → 2.26.0-beta.11

package/lib/project.js

@@ -16,8 +16,36 @@ var matesModule = require("./mates");
 var sessionSearch = require("./session-search");
 var userPresence = require("./user-presence");
 var { attachDebate } = require("./project-debate");
+var { attachMemory } = require("./project-memory");
+var { attachMateInteraction } = require("./project-mate-interaction");
 var MAX_UPLOAD_BYTES = 50 * 1024 * 1024; // 50 MB
 
+// --- Context Sources persistence ---
+var _ctxSrcConfig = require("./config");
+var _ctxSrcDir = path.join(_ctxSrcConfig.CONFIG_DIR, "context-sources");
+
+function loadContextSources(slug) {
+  try {
+    var filePath = path.join(_ctxSrcDir, slug + ".json");
+    var data = JSON.parse(fs.readFileSync(filePath, "utf8"));
+    return data.active || [];
+  } catch (e) {
+    return [];
+  }
+}
+
+function saveContextSources(slug, activeIds) {
+  try {
+    if (!fs.existsSync(_ctxSrcDir)) {
+      fs.mkdirSync(_ctxSrcDir, { recursive: true });
+    }
+    var filePath = path.join(_ctxSrcDir, slug + ".json");
+    fs.writeFileSync(filePath, JSON.stringify({ active: activeIds }), "utf8");
+  } catch (e) {
+    console.error("[context-sources] Failed to save:", e.message);
+  }
+}
+
 // Validate environment variable string (KEY=VALUE per line)
 // Returns null if valid, or an error string if invalid
 function validateEnvString(str) {
@@ -133,8 +161,13 @@ function createProjectContext(opts) {
   var worktreeMeta = opts.worktreeMeta || null; // { parentSlug, branch, accessible }
   var isMate = opts.isMate || false;
   var onCreateWorktree = opts.onCreateWorktree || null;
+  var serverPort = opts.port || 2633;
+  var serverTls = opts.tls || false;
   var latestVersion = null;
 
+  // Browser MCP server runs in-process via createSdkMcpServer (no child process spawn).
+  // Do NOT write to .claude-local/settings.json -- the SDK reads that too, causing duplicate spawns.
+
   // --- Chat image storage ---
   var _imgConfig = require("./config");
   var _imgUtils = require("./utils");
@@ -144,7 +177,18 @@ function createProjectContext(opts) {
 
   // Convert imageRefs in history entries to images with URLs for the client
   function hydrateImageRefs(entry) {
-    if (!entry || !entry.imageRefs) return entry;
+    if (!entry) return entry;
+    // Hydrate context_preview: convert screenshotFile to screenshotUrl
+    if (entry.type === "context_preview" && entry.tab && entry.tab.screenshotFile) {
+      var hydrated = {};
+      for (var k in entry) hydrated[k] = entry[k];
+      hydrated.tab = {};
+      for (var tk in entry.tab) hydrated.tab[tk] = entry.tab[tk];
+      hydrated.tab.screenshotUrl = "/p/" + slug + "/images/" + entry.tab.screenshotFile;
+      delete hydrated.tab.screenshotFile;
+      return hydrated;
+    }
+    if (!entry.imageRefs) return entry;
     if (entry.type !== "user_message" && entry.type !== "mention_user") return entry;
     var images = [];
     for (var ri = 0; ri < entry.imageRefs.length; ri++) {
@@ -152,8 +196,8 @@ function createProjectContext(opts) {
       images.push({ mediaType: ref.mediaType, url: "/p/" + slug + "/images/" + ref.file });
     }
     var hydrated = {};
-    for (var k in entry) {
-      if (k !== "imageRefs") hydrated[k] = entry[k];
+    for (var k2 in entry) {
+      if (k2 !== "imageRefs") hydrated[k2] = entry[k2];
     }
     hydrated.images = images;
     return hydrated;
@@ -247,6 +291,60 @@ function createProjectContext(opts) {
   // --- Per-project clients ---
   var clients = new Set();
 
+  // --- Browser extension state ---
+  var _browserTabList = {}; // tabId -> { id, url, title, favIconUrl }
+  var _extensionWs = null; // WebSocket of the client with the Chrome extension
+  var _extToken = crypto.randomUUID(); // Auth token for MCP server bridge
+  var pendingExtensionRequests = {}; // requestId -> { resolve, timer }
+
+  function sendExtensionCommand(ws, command, args, timeout) {
+    return new Promise(function(resolve) {
+      var requestId = crypto.randomUUID();
+      var ms = timeout || 3000;
+      var timer = setTimeout(function() {
+        delete pendingExtensionRequests[requestId];
+        resolve(null);
+      }, ms);
+      pendingExtensionRequests[requestId] = { resolve: resolve, timer: timer };
+      sendTo(ws, {
+        type: "extension_command",
+        command: command,
+        args: args,
+        requestId: requestId
+      });
+    });
+  }
+
+  // Send extension command via the tracked extension client (for MCP bridge)
+  function sendExtensionCommandAny(command, args, timeout) {
+    if (!_extensionWs || _extensionWs.readyState !== 1) {
+      return Promise.reject(new Error("Browser extension not connected"));
+    }
+    return sendExtensionCommand(_extensionWs, command, args, timeout);
+  }
+
+  function requestTabContext(ws, tabId) {
+    // Try inject first (best-effort), then request all data in parallel.
+    // Even if inject fails (CSP etc.), page text and screenshot still work.
+    return sendExtensionCommand(ws, "tab_inject", { tabId: tabId }).then(function() {}, function() {}).then(function() {
+      return Promise.all([
+        sendExtensionCommand(ws, "tab_console", { tabId: tabId }),
+        sendExtensionCommand(ws, "tab_network", { tabId: tabId }),
+        sendExtensionCommand(ws, "tab_page_text", { tabId: tabId }),
+        sendExtensionCommand(ws, "tab_screenshot", { tabId: tabId })
+      ]);
+    }).then(function(results) {
+      return {
+        console: results[0],
+        network: results[1],
+        pageText: results[2],
+        screenshot: results[3]
+      };
+    }).catch(function() {
+      return null;
+    });
+  }
+
   function send(obj) {
     var data = JSON.stringify(obj);
     for (var ws of clients) {
@@ -459,6 +557,45 @@ function createProjectContext(opts) {
     mateDisplayName: opts.mateDisplayName || "",
     isMate: isMate,
     dangerouslySkipPermissions: dangerouslySkipPermissions,
+    mcpServers: isMate ? undefined : (function () {
+      try {
+        var browserMcp = require("./browser-mcp-server");
+        var mcpConfig = browserMcp.create(sendExtensionCommandAny, function () {
+          return Object.values(_browserTabList || {});
+        }, {
+          watchTab: function (tabId) {
+            var key = "tab:" + tabId;
+            var active = loadContextSources(slug);
+            if (active.indexOf(key) === -1) {
+              active.push(key);
+              saveContextSources(slug, active);
+              var msg = JSON.stringify({ type: "context_sources_state", active: active });
+              for (var c of clients) { if (c.readyState === 1) c.send(msg); }
+            }
+            return active;
+          },
+          unwatchTab: function (tabId) {
+            var key = "tab:" + tabId;
+            var active = loadContextSources(slug);
+            var idx = active.indexOf(key);
+            if (idx !== -1) {
+              active.splice(idx, 1);
+              saveContextSources(slug, active);
+              var msg = JSON.stringify({ type: "context_sources_state", active: active });
+              for (var c of clients) { if (c.readyState === 1) c.send(msg); }
+            }
+            return active;
+          },
+        });
+        if (!mcpConfig) return undefined;
+        var servers = {};
+        servers[mcpConfig.name || "clay-browser"] = mcpConfig;
+        return servers;
+      } catch (e) {
+        console.error("[project] Failed to create browser MCP server:", e.message);
+        return undefined;
+      }
+    })(),
     onProcessingChanged: onProcessingChanged,
     onTurnDone: isMate ? function (session, preview) { digestDmTurn(session, preview); } : null,
     scheduleMessage: function (session, text, resetsAt) {
@@ -1235,6 +1372,9 @@ function createProjectContext(opts) {
     }
     sendTo(ws, { type: "config_state", model: sm.currentModel || "", mode: sm.currentPermissionMode || "default", effort: sm.currentEffort || "medium", betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
     sendTo(ws, { type: "term_list", terminals: tm.list() });
+    // Restore context sources (keep tab: sources — validated against _browserTabList at query time)
+    var restoredSources = loadContextSources(slug);
+    sendTo(ws, { type: "context_sources_state", active: restoredSources });
     sendTo(ws, { type: "notes_list", notes: nm.list() });
     sendTo(ws, { type: "loop_registry_updated", records: getHubSchedules() });
 
@@ -1383,7 +1523,19 @@ function createProjectContext(opts) {
         }
         sendTo(ws, hydrateImageRefs(_hitem));
       }
-      sendTo(ws, { type: "history_done" });
+      // Include last result data + cached context usage for accurate restore
+      var _lastUsage = null, _lastModelUsage = null, _lastCost = null, _lastStreamInputTokens = null;
+      for (var _ri = total - 1; _ri >= 0; _ri--) {
+        if (active.history[_ri].type === "result") {
+          var _r = active.history[_ri];
+          _lastUsage = _r.usage || null;
+          _lastModelUsage = _r.modelUsage || null;
+          _lastCost = _r.cost != null ? _r.cost : null;
+          _lastStreamInputTokens = _r.lastStreamInputTokens || null;
+          break;
+        }
+      }
+      sendTo(ws, { type: "history_done", lastUsage: _lastUsage, lastModelUsage: _lastModelUsage, lastCost: _lastCost, lastStreamInputTokens: _lastStreamInputTokens, contextUsage: active.lastContextUsage || null });
 
       if (active.isProcessing) {
         sendTo(ws, { type: "status", status: "processing" });
@@ -1505,6 +1657,7 @@ function createProjectContext(opts) {
         }
         session._mentionInProgress = false;
         sendToSession(session.localId, { type: "mention_done", mateId: mateId, stopped: true });
+        send({ type: "mention_processing", mateId: mateId, active: false });
       }
       return;
     }
@@ -1514,6 +1667,10 @@ function createProjectContext(opts) {
       handleDebateStart(ws, msg);
       return;
     }
+    if (msg.type === "debate_hand_raise") {
+      handleDebateHandRaise(ws);
+      return;
+    }
     if (msg.type === "debate_comment") {
       handleDebateComment(ws, msg);
       return;
@@ -1530,6 +1687,10 @@ function createProjectContext(opts) {
       handleDebateConfirmBrief(ws);
       return;
     }
+    if (msg.type === "debate_user_floor_response") {
+      handleDebateUserFloorResponse(ws, msg);
+      return;
+    }
 
     // --- Knowledge file management ---
     if (msg.type === "knowledge_list") {
@@ -1694,80 +1855,10 @@ function createProjectContext(opts) {
       return;
     }
 
-    // --- Memory (session digests) management ---
-    if (msg.type === "memory_list") {
-      var digestFile = path.join(cwd, "knowledge", "session-digests.jsonl");
-      var summaryFile = path.join(cwd, "knowledge", "memory-summary.md");
-      var entries = [];
-      var summary = "";
-      try {
-        var raw = fs.readFileSync(digestFile, "utf8").trim();
-        if (raw) {
-          var lines = raw.split("\n");
-          for (var mi = 0; mi < lines.length; mi++) {
-            try {
-              var obj = JSON.parse(lines[mi]);
-              obj.index = mi;
-              entries.push(obj);
-            } catch (e) {}
-          }
-        }
-      } catch (e) { /* file may not exist */ }
-      try {
-        if (fs.existsSync(summaryFile)) {
-          summary = fs.readFileSync(summaryFile, "utf8").trim();
-        }
-      } catch (e) {}
-      // Return newest first
-      entries.reverse();
-      sendTo(ws, { type: "memory_list", entries: entries, summary: summary });
-      return;
-    }
-
-    if (msg.type === "memory_search") {
-      if (!msg.query || typeof msg.query !== "string") {
-        sendTo(ws, { type: "memory_search_results", results: [], query: "" });
-        return;
-      }
-      var digestFile = path.join(cwd, "knowledge", "session-digests.jsonl");
-      try {
-        var results = sessionSearch.searchDigests(digestFile, msg.query, {
-          maxResults: msg.maxResults || 10,
-          minScore: msg.minScore || 0.5,
-          dateFrom: msg.dateFrom || null,
-          dateTo: msg.dateTo || null
-        });
-        sendTo(ws, {
-          type: "memory_search_results",
-          results: sessionSearch.formatForMemoryUI(results),
-          query: msg.query
-        });
-      } catch (e) {
-        console.error("[session-search] Search failed:", e.message);
-        sendTo(ws, { type: "memory_search_results", results: [], query: msg.query });
-      }
-      return;
-    }
-
-    if (msg.type === "memory_delete") {
-      if (typeof msg.index !== "number") return;
-      var digestFile = path.join(cwd, "knowledge", "session-digests.jsonl");
-      try {
-        var raw = fs.readFileSync(digestFile, "utf8").trim();
-        var lines = raw ? raw.split("\n") : [];
-        if (msg.index >= 0 && msg.index < lines.length) {
-          lines.splice(msg.index, 1);
-          if (lines.length === 0) {
-            fs.unlinkSync(digestFile);
-          } else {
-            fs.writeFileSync(digestFile, lines.join("\n") + "\n");
-          }
-        }
-      } catch (e) {}
-      sendTo(ws, { type: "memory_deleted", index: msg.index });
-      handleMessage(ws, { type: "memory_list" });
-      return;
-    }
+    // --- Memory (session digests) management (delegated to project-memory.js) ---
+    if (msg.type === "memory_list") { _memory.handleMemoryList(ws); return; }
+    if (msg.type === "memory_search") { _memory.handleMemorySearch(ws, msg); return; }
+    if (msg.type === "memory_delete") { _memory.handleMemoryDelete(ws, msg); return; }
 
     if (msg.type === "push_subscribe") {
       var _pushUserId = ws._clayUser ? ws._clayUser.id : null;
@@ -2204,6 +2295,8 @@ function createProjectContext(opts) {
     if (msg.type === "rewind_preview") {
       var session = getSessionForWs(ws);
       if (!session || !session.cliSessionId || !msg.uuid) return;
+      // Reject preview requests while a rewind is executing
+      if (session._rewindInProgress) return;
 
       (async function () {
         var result;
@@ -2233,6 +2326,12 @@ function createProjectContext(opts) {
     if (msg.type === "rewind_execute") {
       var session = getSessionForWs(ws);
       if (!session || !session.cliSessionId || !msg.uuid) return;
+      // Guard against concurrent rewind executions
+      if (session._rewindInProgress) {
+        sendTo(ws, { type: "rewind_error", text: "Rewind already in progress." });
+        return;
+      }
+      session._rewindInProgress = true;
       var mode = msg.mode || "both";
 
       (async function () {
@@ -2293,6 +2392,7 @@ function createProjectContext(opts) {
         } catch (err) {
           sendTo(ws, { type: "rewind_error", text: "Rewind failed: " + err.message });
         } finally {
+          session._rewindInProgress = false;
           if (result && result.isTemp) result.cleanup();
         }
       })();
@@ -3328,7 +3428,7 @@ function createProjectContext(opts) {
           return;
         }
       }
-      var t = tm.create(msg.cols || 80, msg.rows || 24, getOsUserInfoForWs(ws));
+      var t = tm.create(msg.cols || 80, msg.rows || 24, getOsUserInfoForWs(ws), ws);
       if (!t) {
         sendTo(ws, { type: "term_error", error: "Cannot create terminal (node-pty not available or limit reached)" });
         return;
@@ -3356,7 +3456,7 @@ function createProjectContext(opts) {
 
     if (msg.type === "term_resize") {
       if (msg.id && msg.cols > 0 && msg.rows > 0) {
-        tm.resize(msg.id, msg.cols, msg.rows);
+        tm.resize(msg.id, msg.cols, msg.rows, ws);
       }
       return;
     }
@@ -3365,6 +3465,14 @@ function createProjectContext(opts) {
       if (msg.id) {
         tm.close(msg.id);
         send({ type: "term_list", terminals: tm.list() });
+        // Remove closed terminal from context sources
+        var saved = loadContextSources(slug);
+        var termKey = "term:" + msg.id;
+        var filtered = saved.filter(function(id) { return id !== termKey; });
+        if (filtered.length !== saved.length) {
+          saveContextSources(slug, filtered);
+          send({ type: "context_sources_state", active: filtered });
+        }
       }
       return;
     }
@@ -3377,6 +3485,34 @@ function createProjectContext(opts) {
       return;
     }
 
+    // --- Context Sources ---
+    if (msg.type === "context_sources_save") {
+      var activeIds = msg.active || [];
+      saveContextSources(slug, activeIds);
+      return;
+    }
+
+    // --- Browser Extension ---
+    if (msg.type === "browser_tab_list") {
+      _extensionWs = ws; // Track which client has the extension
+      var tabs = msg.tabs || [];
+      _browserTabList = {};
+      for (var bti = 0; bti < tabs.length; bti++) {
+        _browserTabList[tabs[bti].id] = tabs[bti];
+      }
+      return;
+    }
+
+    if (msg.type === "extension_result") {
+      var pending = pendingExtensionRequests[msg.requestId];
+      if (pending) {
+        clearTimeout(pending.timer);
+        pending.resolve(msg.result);
+        delete pendingExtensionRequests[msg.requestId];
+      }
+      return;
+    }
+
     // --- Scheduled tasks permission gate ---
     if (msg.type === "loop_start" || msg.type === "loop_stop" || msg.type === "loop_registry_files" ||
         msg.type === "loop_registry_list" || msg.type === "loop_registry_update" || msg.type === "loop_registry_rename" ||
@@ -3757,6 +3893,26 @@ function createProjectContext(opts) {
       return;
     }
 
+    if (msg.type === "send_scheduled_now") {
+      var nowSession = getSessionForWs(ws);
+      if (!nowSession || !nowSession.scheduledMessage) return;
+      var schedText = nowSession.scheduledMessage.text;
+      clearTimeout(nowSession.scheduledMessage.timer);
+      nowSession.scheduledMessage = null;
+      console.log("[project] Scheduled message sent immediately for session " + nowSession.localId);
+      sm.sendAndRecord(nowSession, { type: "scheduled_message_sent" });
+      var userMsg = { type: "user_message", text: schedText };
+      nowSession.history.push(userMsg);
+      sm.appendToSessionFile(nowSession, userMsg);
+      sendToSession(nowSession.localId, userMsg);
+      nowSession.isProcessing = true;
+      onProcessingChanged();
+      sendToSession(nowSession.localId, { type: "status", status: "processing" });
+      sdk.startQuery(nowSession, schedText, null, getLinuxUserForSession(nowSession));
+      sm.broadcastSessionList();
+      return;
+    }
+
     if (msg.type !== "message") return;
     if (!msg.text && (!msg.images || msg.images.length === 0) && (!msg.pastes || msg.pastes.length === 0)) return;
 
@@ -3835,1326 +3991,315 @@ function createProjectContext(opts) {
       fullText = mentionPrefix + "\n\n" + fullText;
     }
 
-    if (!session.isProcessing) {
-      session.isProcessing = true;
-      onProcessingChanged();
-      session.sentToolResults = {};
-      sendToSession(session.localId, { type: "status", status: "processing" });
-      if (!session.queryInstance && (!session.worker || session.messageQueue !== "worker")) {
-        // No active query (or worker idle between queries): start a new query
-        session._queryStartTs = Date.now();
-        console.log("[PERF] project.js: startQuery called, localId=" + session.localId + " t=0ms");
-        sdk.startQuery(session, fullText, msg.images, getLinuxUserForSession(session));
-      } else {
-        sdk.pushMessage(session, fullText, msg.images);
-      }
-    } else {
-      sdk.pushMessage(session, fullText, msg.images);
-    }
-    sm.broadcastSessionList();
-  }
-
-  // --- @Mention handler ---
-  var MENTION_WINDOW = 20; // turns to check for session continuity
-
-  function getRecentTurns(session, n) {
-    var turns = [];
-    var history = session.history;
-    // Walk backwards through history, collect user/assistant/mention text turns
-    var assistantBuffer = "";
-    for (var i = history.length - 1; i >= 0 && turns.length < n; i--) {
-      var entry = history[i];
-      if (entry.type === "user_message") {
-        if (assistantBuffer) {
-          turns.push({ role: "assistant", text: assistantBuffer.trim() });
-          assistantBuffer = "";
-        }
-        turns.push({ role: "user", text: entry.text || "" });
-      } else if (entry.type === "delta" || entry.type === "text") {
-        assistantBuffer = (entry.text || "") + assistantBuffer;
-      } else if (entry.type === "mention_response") {
-        if (assistantBuffer) {
-          turns.push({ role: "assistant", text: assistantBuffer.trim() });
-          assistantBuffer = "";
-        }
-        turns.push({ role: "@" + (entry.mateName || "Mate"), text: entry.text || "", mateId: entry.mateId });
-      } else if (entry.type === "mention_user") {
-        if (assistantBuffer) {
-          turns.push({ role: "assistant", text: assistantBuffer.trim() });
-          assistantBuffer = "";
-        }
-        turns.push({ role: "user", text: "@" + (entry.mateName || "Mate") + " " + (entry.text || ""), mateId: entry.mateId });
-      }
-    }
-    if (assistantBuffer) {
-      turns.push({ role: "assistant", text: assistantBuffer.trim() });
-    }
-    turns.reverse();
-    return turns;
-  }
-
-  // Check if the given mate has a mention response in the recent window
-  function hasMateInWindow(recentTurns, mateId) {
-    for (var i = 0; i < recentTurns.length; i++) {
-      if (recentTurns[i].mateId === mateId && recentTurns[i].role.charAt(0) === "@") {
-        return true;
-      }
-    }
-    return false;
-  }
-
-  // Build the "middle context": conversation turns since the mate's last response
-  function buildMiddleContext(recentTurns, mateId) {
-    // Find the last mention response from this mate
-    var lastIdx = -1;
-    for (var i = recentTurns.length - 1; i >= 0; i--) {
-      if (recentTurns[i].mateId === mateId && recentTurns[i].role.charAt(0) === "@") {
-        lastIdx = i;
-        break;
-      }
-    }
-    if (lastIdx === -1 || lastIdx >= recentTurns.length - 1) return "";
-
-    // Collect turns after the last mention response
-    var lines = ["[Conversation since your last response:]", "---"];
-    for (var j = lastIdx + 1; j < recentTurns.length; j++) {
-      var turn = recentTurns[j];
-      lines.push(turn.role + ": " + turn.text);
-    }
-    lines.push("---");
-    return lines.join("\n");
-  }
-
-  function buildMentionContext(userName, recentTurns) {
-    var lines = [
-      "You were @mentioned in a project session by " + userName + ".",
-      "You are responding inline in their conversation. Keep your response focused on what was asked.",
-      "You have read-only access to the project files but cannot make changes.",
-      "",
-      "Recent conversation context:",
-      "---",
-    ];
-    for (var i = 0; i < recentTurns.length; i++) {
-      var turn = recentTurns[i];
-      lines.push(turn.role + ": " + turn.text);
-    }
-    lines.push("---");
-    return lines.join("\n");
-  }
-
-  // --- Shared digest worker: one reusable Haiku session for gate+digest ---
-  // Combines gate check and digest generation into a single prompt,
-  // processes jobs sequentially from a queue, reuses the session across calls.
-  // Session is recycled after DIGEST_WORKER_MAX_TURNS to prevent context bloat.
-  var _digestWorker = null;
-  var _digestQueue = [];
-  var _digestBusy = false;
-  var _digestWorkerTurns = 0;
-  var DIGEST_WORKER_MAX_TURNS = 20;
-
-  function enqueueDigest(job) {
-    _digestQueue.push(job);
-    if (!_digestBusy) processDigestQueue();
-  }
-
-  function processDigestQueue() {
-    if (_digestQueue.length === 0) { _digestBusy = false; return; }
-    _digestBusy = true;
-    var job = _digestQueue.shift();
-
-    var mateDir = matesModule.getMateDir(job.mateCtx, job.mateId);
-    var knowledgeDir = path.join(mateDir, "knowledge");
-
-    // Load mate role for gate context
-    var mateRole = "";
-    try {
-      var yamlRaw = fs.readFileSync(path.join(mateDir, "mate.yaml"), "utf8");
-      var roleMatch = yamlRaw.match(/^relationship:\s*(.+)$/m);
-      if (roleMatch) mateRole = roleMatch[1].trim();
-    } catch (e) {}
-
-    // Combined gate + digest in one prompt (saves a full round-trip vs separate gate)
-    var prompt = [
-      "[SYSTEM: Memory Gate + Digest]",
-      "You are a memory system for an AI Mate (role: " + (mateRole || "assistant") + ").",
-      "",
-      "Conversation (" + job.type + "):",
-      job.conversationContent,
-      "",
-      "STEP 1: Should this be saved to memory?",
-      'Answer "no" ONLY if the entire conversation is trivial (e.g. just "hi"/"hello").',
-      "When in doubt, save it.",
-      "",
-      'STEP 2: If yes, output a JSON digest. If no, output exactly: {"skip":true}',
-      "",
-      "JSON schema (output ONLY the JSON, no markdown, no fences):",
-      "{",
-      '  "date": "YYYY-MM-DD",',
-      '  "type": "' + job.type + '",',
-      '  "topic": "short topic description",',
-      '  "summary": "2-3 sentence summary",',
-      '  "key_quotes": ["user quotes, verbatim, max 5"],',
-      '  "user_context": "personal/project context or null",',
-      '  "my_position": "what I said/recommended",',
-      job.type === "dm" ? '  "user_intent": "what the user wanted",' : '  "other_perspectives": "key points from others",',
-      '  "decisions": "what was decided or null",',
-      '  "open_items": "what remains unresolved",',
-      '  "user_sentiment": "how user felt",',
-      '  "confidence": "high|medium|low",',
-      '  "revisit_later": true/false,',
-      '  "tags": ["topic", "tags"],',
-      '  "user_observations": [{"category":"pattern|decision|reaction|preference","observation":"...","evidence":"..."}]',
-      "}",
-      "",
-      "user_observations: OPTIONAL array. Include ONLY if you noticed meaningful patterns about the USER themselves (not the topic).",
-      "Categories: pattern (repeated behavior 2+ times), decision (explicit choice with reasoning), reaction (emotional/attitude signal), preference (tool/style/communication preference).",
-      "Omit the field entirely if nothing notable about the user.",
-    ].join("\n");
-
-    function handleResult(text) {
-      var cleaned = text.trim();
-      if (cleaned.indexOf("```") === 0) {
-        cleaned = cleaned.replace(/^```[a-z]*\n?/, "").replace(/\n?```$/, "").trim();
-      }
-
-      var digestObj = null;
-      try { digestObj = JSON.parse(cleaned); } catch (e) {
-        console.error("[digest-worker] Parse failed for " + job.mateId + ":", e.message);
-        digestObj = { date: new Date().toISOString().slice(0, 10), topic: "parse_failed", raw: text.substring(0, 500) };
-      }
-
-      if (digestObj && digestObj.skip) {
-        console.log("[digest-worker] Gate declined for " + job.mateId);
-        if (job.onDone) job.onDone();
-        processDigestQueue();
-        return;
-      }
-
-      try {
-        fs.mkdirSync(knowledgeDir, { recursive: true });
-        var digestFile = path.join(knowledgeDir, "session-digests.jsonl");
-        fs.appendFileSync(digestFile, JSON.stringify(digestObj) + "\n");
-      } catch (e) {
-        console.error("[digest-worker] Write failed for " + job.mateId + ":", e.message);
-      }
-
-      // Write user observations if present
-      if (digestObj.user_observations && digestObj.user_observations.length > 0) {
-        try {
-          var obsFile = path.join(knowledgeDir, "user-observations.jsonl");
-          var obsMate = matesModule.getMate(job.mateCtx, job.mateId);
-          var obsMateName = (obsMate && obsMate.name) || job.mateId;
-          var obsLines = [];
-          for (var oi = 0; oi < digestObj.user_observations.length; oi++) {
-            var obs = digestObj.user_observations[oi];
-            obsLines.push(JSON.stringify({
-              date: digestObj.date || new Date().toISOString().slice(0, 10),
-              category: obs.category || "pattern",
-              observation: obs.observation || "",
-              evidence: obs.evidence || "",
-              confidence: digestObj.confidence || "medium",
-              mateName: obsMateName,
-              mateId: job.mateId
-            }));
+    // Inject active terminal context sources (delta only: send new output since last message)
+    var TERM_CONTEXT_MAX = 8192; // 8KB max per terminal per message
+    var TERM_HEAD_SIZE = 2048;   // keep first 2KB for error context
+    var TERM_TAIL_SIZE = 6144;   // keep last 6KB for recent state
+    var ctxSources = loadContextSources(slug);
+    if (ctxSources.length > 0) {
+      if (!session._termContextCursors) session._termContextCursors = {};
+      var termContextParts = [];
+      for (var ci = 0; ci < ctxSources.length; ci++) {
+        var srcId = ctxSources[ci];
+        if (srcId.startsWith("term:")) {
+          var termId = parseInt(srcId.split(":")[1], 10);
+          var sb = tm.getScrollback(termId);
+          if (sb) {
+            var lastCursor;
+            if (termId in session._termContextCursors) {
+              lastCursor = session._termContextCursors[termId];
+              // Terminal was recycled (closed and reopened with same ID) — reset cursor
+              if (lastCursor > sb.totalBytesWritten) lastCursor = 0;
+            } else {
+              // First time seeing this terminal — include last 8KB (what user can see now)
+              lastCursor = Math.max(0, sb.totalBytesWritten - TERM_CONTEXT_MAX);
+            }
+            var newBytes = sb.totalBytesWritten - lastCursor;
+            session._termContextCursors[termId] = sb.totalBytesWritten;
+            if (newBytes <= 0) continue;
+            // Build timestamped delta from chunks
+            var deltaChunks = [];
+            var bytePos = sb.bufferStart;
+            for (var chunkIdx = 0; chunkIdx < sb.chunks.length; chunkIdx++) {
+              var chunk = sb.chunks[chunkIdx];
+              var chunkEnd = bytePos + chunk.data.length;
+              if (chunkEnd > lastCursor) {
+                // This chunk has new content
+                var chunkData = chunk.data;
+                if (bytePos < lastCursor) {
+                  // Partial chunk: only the part after lastCursor
+                  chunkData = chunkData.slice(lastCursor - bytePos);
+                }
+                deltaChunks.push({ ts: chunk.ts, data: chunkData });
+              }
+              bytePos = chunkEnd;
+            }
+            if (deltaChunks.length === 0) continue;
+            // Format with timestamps: group by second to avoid excessive timestamps
+            var lines = [];
+            var lastTimeSec = 0;
+            for (var di = 0; di < deltaChunks.length; di++) {
+              var dc = deltaChunks[di];
+              var cleaned = dc.data.replace(/\x1b\[[0-9;]*[a-zA-Z]/g, "");
+              if (!cleaned) continue;
+              var timeSec = Math.floor(dc.ts / 1000);
+              if (timeSec !== lastTimeSec) {
+                var d = new Date(dc.ts);
+                var timeStr = d.toTimeString().slice(0, 8); // HH:MM:SS
+                lines.push("[" + timeStr + "] " + cleaned);
+                lastTimeSec = timeSec;
+              } else {
+                lines.push(cleaned);
+              }
+            }
+            var delta = lines.join("").trim();
+            if (!delta) continue;
+            var termInfo = tm.list().find(function(t) { return t.id === termId; });
+            var termTitle = termInfo ? termInfo.title : "Terminal " + termId;
+            var header;
+            if (delta.length > TERM_CONTEXT_MAX) {
+              var head = delta.slice(0, TERM_HEAD_SIZE);
+              var tail = delta.slice(-TERM_TAIL_SIZE);
+              var omittedBytes = delta.length - TERM_HEAD_SIZE - TERM_TAIL_SIZE;
+              var omittedLines = delta.slice(TERM_HEAD_SIZE, delta.length - TERM_TAIL_SIZE).split("\n").length;
+              delta = head + "\n\n... (" + omittedLines + " lines / " + Math.round(omittedBytes / 1024) + "KB omitted) ...\n\n" + tail;
+              header = "[New terminal output from " + termTitle + " (large output, head+tail shown)]";
+            } else {
+              header = "[New terminal output from " + termTitle + "]";
+            }
+            termContextParts.push(header + "\n```\n" + delta + "\n```");
           }
-          fs.appendFileSync(obsFile, obsLines.join("\n") + "\n");
-        } catch (e) {
-          console.error("[digest-worker] Observations write failed for " + job.mateId + ":", e.message);
         }
       }
-
-      updateMemorySummary(job.mateCtx, job.mateId, digestObj);
-      maybeSynthesizeUserProfile(job.mateCtx, job.mateId);
-      if (job.onDone) job.onDone();
-      processDigestQueue();
-    }
-
-    // Recycle worker session if it has exceeded max turns
-    if (_digestWorker && _digestWorkerTurns >= DIGEST_WORKER_MAX_TURNS) {
-      try { _digestWorker.close(); } catch (e) {}
-      _digestWorker = null;
-      _digestWorkerTurns = 0;
-    }
-
-    var responseText = "";
-    if (_digestWorker && _digestWorker.isAlive()) {
-      _digestWorkerTurns++;
-      _digestWorker.pushMessage(prompt, {
-        onActivity: function () {},
-        onDelta: function (d) { responseText += d; },
-        onDone: function () { handleResult(responseText); },
-        onError: function (err) {
-          console.error("[digest-worker] Error:", err);
-          _digestWorker = null;
-          _digestWorkerTurns = 0;
-          if (job.onDone) job.onDone();
-          processDigestQueue();
-        },
-      });
-    } else {
-      sdk.createMentionSession({
-        claudeMd: "",
-        model: "haiku",
-        initialContext: "[Digest Worker] You generate memory digests. Respond with ONLY JSON.",
-        initialMessage: prompt,
-        onActivity: function () {},
-        onDelta: function (d) { responseText += d; },
-        onDone: function () { handleResult(responseText); },
-        onError: function (err) {
-          console.error("[digest-worker] Create error:", err);
-          _digestWorker = null;
-          if (job.onDone) job.onDone();
-          processDigestQueue();
-        },
-      }).then(function (ws) { _digestWorker = ws; _digestWorkerTurns = 1; }).catch(function () {
-        if (job.onDone) job.onDone();
-        processDigestQueue();
-      });
-    }
-  }
-
-  function digestMentionSession(session, mateId, mateCtx, mateResponse, userQuestion) {
-    if (!session._mentionSessions || !session._mentionSessions[mateId]) return;
-    var mentionSession = session._mentionSessions[mateId];
-    if (!mentionSession.isAlive()) return;
-
-    mentionSession._digesting = true;
-
-    var mateDir = matesModule.getMateDir(mateCtx, mateId);
-    var knowledgeDir = path.join(mateDir, "knowledge");
-
-    // Migration: generate initial summary if missing
-    var summaryFile = path.join(knowledgeDir, "memory-summary.md");
-    var digestFile = path.join(knowledgeDir, "session-digests.jsonl");
-    if (!fs.existsSync(summaryFile) && fs.existsSync(digestFile)) {
-      initMemorySummary(mateCtx, mateId, function () {});
-    }
-
-    var userQ = userQuestion || "(unknown)";
-    var mateR = mateResponse || "(unknown)";
-    var conversationContent = "User: " + (userQ.length > 2000 ? userQ.substring(0, 2000) + "..." : userQ) +
-      "\nMate: " + (mateR.length > 2000 ? mateR.substring(0, 2000) + "..." : mateR);
-
-    enqueueDigest({
-      mateCtx: mateCtx,
-      mateId: mateId,
-      type: "mention",
-      conversationContent: conversationContent,
-      onDone: function () { mentionSession._digesting = false; },
-    });
-  }
-
-  // Digest DM turn for mate projects - uses shared digest worker
-  var _dmDigestPending = false;
-  function digestDmTurn(session, responsePreview) {
-    if (!isMate || _dmDigestPending) return;
-    var mateId = path.basename(cwd);
-    var mateCtx = matesModule.buildMateCtx(projectOwnerId);
-    if (!matesModule.isMate(mateCtx, mateId)) return;
-
-    // Collect full conversation from session history (all user + mate turns)
-    var conversationParts = [];
-    var totalLen = 0;
-    var CONV_CAP = 6000;
-    for (var hi = 0; hi < session.history.length; hi++) {
-      var entry = session.history[hi];
-      if (entry.type === "user_message" && entry.text) {
-        var uText = entry.text;
-        if (totalLen + uText.length > CONV_CAP) {
-          uText = uText.substring(0, Math.max(200, CONV_CAP - totalLen)) + "...";
-        }
-        conversationParts.push("User: " + uText);
-        totalLen += uText.length;
-      } else if (entry.type === "assistant_message" && entry.text) {
-        var aText = entry.text;
-        if (totalLen + aText.length > CONV_CAP) {
-          aText = aText.substring(0, Math.max(200, CONV_CAP - totalLen)) + "...";
-        }
-        conversationParts.push("Mate: " + aText);
-        totalLen += aText.length;
-      }
-      if (totalLen >= CONV_CAP) break;
-    }
-    var lastResponseText = responsePreview || "";
-    if (lastResponseText && conversationParts.length > 0) {
-      var lastPart = conversationParts[conversationParts.length - 1];
-      if (lastPart.indexOf("Mate:") !== 0 || lastPart.indexOf(lastResponseText.substring(0, 50)) === -1) {
-        var rText = lastResponseText;
-        if (totalLen + rText.length > CONV_CAP) {
-          rText = rText.substring(0, Math.max(200, CONV_CAP - totalLen)) + "...";
-        }
-        conversationParts.push("Mate: " + rText);
+      if (termContextParts.length > 0) {
+        fullText = termContextParts.join("\n\n") + "\n\n" + fullText;
       }
     }
-    if (conversationParts.length === 0) return;
-
-    var mateDir = matesModule.getMateDir(mateCtx, mateId);
-    var knowledgeDir = path.join(mateDir, "knowledge");
-
-    // Migration: if memory-summary.md missing but digests exist, generate initial summary
-    var summaryFile = path.join(knowledgeDir, "memory-summary.md");
-    var digestFile = path.join(knowledgeDir, "session-digests.jsonl");
-    if (!fs.existsSync(summaryFile) && fs.existsSync(digestFile)) {
-      initMemorySummary(mateCtx, mateId, function () {
-        console.log("[memory-migrate] Initial summary generated for mate " + mateId);
-      });
-    }
 
-    _dmDigestPending = true;
-
-    enqueueDigest({
-      mateCtx: mateCtx,
-      mateId: mateId,
-      type: "dm",
-      conversationContent: conversationParts.join("\n"),
-      onDone: function () { _dmDigestPending = false; },
+    // Collect browser tab context (async: requires round-trip to client extension)
+    var tabSources = ctxSources.filter(function(id) {
+      if (!id.startsWith("tab:")) return false;
+      // Only include tabs that currently exist in the browser
+      var tid = parseInt(id.split(":")[1], 10);
+      return !!_browserTabList[tid];
     });
-  }
-
-  function handleMention(ws, msg) {
-    if (!msg.mateId) return;
-    if (!msg.text && (!msg.images || msg.images.length === 0) && (!msg.pastes || msg.pastes.length === 0)) return;
-
-    var session = getSessionForWs(ws);
-    if (!session) return;
-
-    // Block mentions during an active debate
-    if (session._debate && session._debate.phase === "live") {
-      sendTo(ws, { type: "mention_error", mateId: msg.mateId, error: "Cannot use @mentions during an active debate." });
-      return;
-    }
-
-    // Check if a mention is already in progress for this session
-    if (session._mentionInProgress) {
-      sendTo(ws, { type: "mention_error", mateId: msg.mateId, error: "A mention is already in progress." });
-      return;
-    }
-
-    var userId = ws._clayUser ? ws._clayUser.id : null;
-    var mateCtx = matesModule.buildMateCtx(userId);
-    var mate = matesModule.getMate(mateCtx, msg.mateId);
-    if (!mate) {
-      sendTo(ws, { type: "mention_error", mateId: msg.mateId, error: "Mate not found" });
-      return;
-    }
-
-    var mateName = (mate.profile && mate.profile.displayName) || mate.name || "Mate";
-    var avatarColor = (mate.profile && mate.profile.avatarColor) || "#6c5ce7";
-    var avatarStyle = (mate.profile && mate.profile.avatarStyle) || "bottts";
-    var avatarSeed = (mate.profile && mate.profile.avatarSeed) || mate.id;
-
-    // Build full mention text (include pasted content)
-    var mentionFullInput = msg.text || "";
-    if (msg.pastes && msg.pastes.length > 0) {
-      for (var pi = 0; pi < msg.pastes.length; pi++) {
-        if (mentionFullInput) mentionFullInput += "\n\n";
-        mentionFullInput += msg.pastes[pi];
-      }
-    }
-
-    // Save images to disk (same pattern as regular messages)
-    var imageRefs = [];
-    if (msg.images && msg.images.length > 0) {
-      for (var imgIdx = 0; imgIdx < msg.images.length; imgIdx++) {
-        var img = msg.images[imgIdx];
-        var savedName = saveImageFile(img.mediaType, img.data, getLinuxUserForSession(session));
-        if (savedName) {
-          imageRefs.push({ mediaType: img.mediaType, file: savedName });
-        }
-      }
-    }
-
-    // Save mention user message to session history
-    var mentionUserEntry = { type: "mention_user", text: msg.text, mateId: msg.mateId, mateName: mateName };
-    if (msg.pastes && msg.pastes.length > 0) mentionUserEntry.pastes = msg.pastes;
-    if (imageRefs.length > 0) mentionUserEntry.imageRefs = imageRefs;
-    session.history.push(mentionUserEntry);
-    sm.appendToSessionFile(session, mentionUserEntry);
-    sendToSessionOthers(ws, session.localId, hydrateImageRefs(mentionUserEntry));
-
-    // Extract recent turns for continuity check
-    var recentTurns = getRecentTurns(session, MENTION_WINDOW);
-
-    // Determine user name for context
-    var userName = "User";
-    if (ws._clayUser) {
-      var p = ws._clayUser.profile || {};
-      userName = p.name || ws._clayUser.displayName || ws._clayUser.username || "User";
-    }
-
-    session._mentionInProgress = true;
-
-    // Send mention start indicator
-    sendToSession(session.localId, {
-      type: "mention_start",
-      mateId: msg.mateId,
-      mateName: mateName,
-      avatarColor: avatarColor,
-      avatarStyle: avatarStyle,
-      avatarSeed: avatarSeed,
-    });
-
-    // Shared callbacks for both new and continued sessions
-    var mentionCallbacks = {
-      onActivity: function (activity) {
-        sendToSession(session.localId, {
-          type: "mention_activity",
-          mateId: msg.mateId,
-          activity: activity,
-        });
-      },
-      onDelta: function (delta) {
-        sendToSession(session.localId, {
-          type: "mention_stream",
-          mateId: msg.mateId,
-          mateName: mateName,
-          delta: delta,
-        });
-      },
-      onDone: function (fullText) {
-        session._mentionInProgress = false;
-
-        // Save mention response to session history
-        var mentionResponseEntry = {
-          type: "mention_response",
-          mateId: msg.mateId,
-          mateName: mateName,
-          text: fullText,
-          avatarColor: avatarColor,
-          avatarStyle: avatarStyle,
-          avatarSeed: avatarSeed,
-        };
-        session.history.push(mentionResponseEntry);
-        sm.appendToSessionFile(session, mentionResponseEntry);
-
-        // Queue mention context for injection into the current agent's next turn
-        if (!session.pendingMentionContexts) session.pendingMentionContexts = [];
-        session.pendingMentionContexts.push(
-          "[Context: @" + mateName + " was mentioned and responded]\n\n" +
-          "User asked @" + mateName + ": " + msg.text + "\n" +
-          mateName + " responded: " + fullText + "\n\n" +
-          "[End of @mention context. This is for your reference only. Do not re-execute or repeat this response.]"
-        );
-
-        sendToSession(session.localId, { type: "mention_done", mateId: msg.mateId });
-
-        // Check if the mate wrote a debate brief during this turn
-        checkForDmDebateBrief(session, msg.mateId, mateCtx);
-
-        // Generate session digest for mate's long-term memory
-        digestMentionSession(session, msg.mateId, mateCtx, fullText, msg.text);
-      },
-      onError: function (errMsg) {
-        session._mentionInProgress = false;
-        // Clean up dead session
-        if (session._mentionSessions && session._mentionSessions[msg.mateId]) {
-          delete session._mentionSessions[msg.mateId];
-        }
-        console.error("[mention] Error for mate " + msg.mateId + ":", errMsg);
-        sendToSession(session.localId, { type: "mention_error", mateId: msg.mateId, error: errMsg });
-      },
-    };
-
-    // Initialize mention sessions map if needed
-    if (!session._mentionSessions) session._mentionSessions = {};
-
-    // Session continuity: check if this mate has a response in the recent window
-    var existingSession = session._mentionSessions[msg.mateId];
-    // Don't reuse a session that's still generating a digest (would mix digest output into mention stream)
-    var canContinue = existingSession && existingSession.isAlive() && !existingSession._digesting && hasMateInWindow(recentTurns, msg.mateId);
 
-    if (canContinue) {
-      // Continue existing mention session with middle context
-      var middleContext = buildMiddleContext(recentTurns, msg.mateId);
-      var continuationText = middleContext ? middleContext + "\n\n" + mentionFullInput : mentionFullInput;
-      existingSession.pushMessage(continuationText, mentionCallbacks, msg.images);
-    } else {
-      // Clean up old session if it exists
-      if (existingSession) {
-        existingSession.close();
-        delete session._mentionSessions[msg.mateId];
-      }
-
-      // Load Mate CLAUDE.md
-      var mateDir = matesModule.getMateDir(mateCtx, msg.mateId);
-      var claudeMd = "";
-      try {
-        claudeMd = fs.readFileSync(path.join(mateDir, "CLAUDE.md"), "utf8");
-      } catch (e) {
-        // CLAUDE.md may not exist for new mates
-      }
-
-      // Load session digests (unified: uses memory-summary.md if available)
-      // Pass user's message as query for BM25 search of relevant past sessions
-      var recentDigests = loadMateDigests(mateCtx, msg.mateId, mentionFullInput);
-
-      // Build initial mention context
-      var mentionContext = buildMentionContext(userName, recentTurns) + recentDigests;
-
-      // Create new persistent mention session
-      sdk.createMentionSession({
-        claudeMd: claudeMd,
-        initialContext: mentionContext,
-        initialMessage: mentionFullInput,
-        initialImages: msg.images || null,
-        onActivity: mentionCallbacks.onActivity,
-        onDelta: mentionCallbacks.onDelta,
-        onDone: mentionCallbacks.onDone,
-        onError: mentionCallbacks.onError,
-        canUseTool: function (toolName, input, toolOpts) {
-          var autoAllow = { Read: true, Glob: true, Grep: true, WebFetch: true, WebSearch: true };
-          if (autoAllow[toolName]) {
-            return Promise.resolve({ behavior: "allow", updatedInput: input });
-          }
-          // Route through the project session's permission system
-          return new Promise(function (resolve) {
-            var requestId = crypto.randomUUID();
-            session.pendingPermissions[requestId] = {
-              resolve: resolve,
-              requestId: requestId,
-              toolName: toolName,
-              toolInput: input,
-              toolUseId: toolOpts ? toolOpts.toolUseID : undefined,
-              decisionReason: (toolOpts && toolOpts.decisionReason) || "",
-              mateId: msg.mateId,
-            };
-            sendToSession(session.localId, {
-              type: "permission_request",
-              requestId: requestId,
-              toolName: toolName,
-              toolInput: input,
-              toolUseId: toolOpts ? toolOpts.toolUseID : undefined,
-              decisionReason: (toolOpts && toolOpts.decisionReason) || "",
-              mateId: msg.mateId,
-            });
-            onProcessingChanged();
-            if (toolOpts && toolOpts.signal) {
-              toolOpts.signal.addEventListener("abort", function () {
-                delete session.pendingPermissions[requestId];
-                sendToSession(session.localId, { type: "permission_cancel", requestId: requestId });
-                onProcessingChanged();
-                resolve({ behavior: "deny", message: "Request cancelled" });
-              });
-            }
-          });
-        },
-      }).then(function (mentionSession) {
-        if (mentionSession) {
-          session._mentionSessions[msg.mateId] = mentionSession;
-        }
-      }).catch(function (err) {
-        session._mentionInProgress = false;
-        console.error("[mention] Failed to create session for mate " + msg.mateId + ":", err.message || err);
-        sendToSession(session.localId, { type: "mention_error", mateId: msg.mateId, error: "Failed to create mention session." });
-      });
-    }
-  }
-
-  // --- Shared mate helpers (used by debate module and other code) ---
-
-  function escapeRegex(str) {
-    return str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-  }
-
-  function getMateProfile(mateCtx, mateId) {
-    var mate = matesModule.getMate(mateCtx, mateId);
-    if (!mate) return { name: "Mate", avatarColor: "#6c5ce7", avatarStyle: "bottts", avatarSeed: mateId };
-    return {
-      name: (mate.profile && mate.profile.displayName) || mate.name || "Mate",
-      avatarColor: (mate.profile && mate.profile.avatarColor) || "#6c5ce7",
-      avatarStyle: (mate.profile && mate.profile.avatarStyle) || "bottts",
-      avatarSeed: (mate.profile && mate.profile.avatarSeed) || mateId,
-    };
-  }
-
-  function loadMateClaudeMd(mateCtx, mateId) {
-    var mateDir = matesModule.getMateDir(mateCtx, mateId);
-    try {
-      return fs.readFileSync(path.join(mateDir, "CLAUDE.md"), "utf8");
-    } catch (e) {
-      return "";
-    }
-  }
-
-  function formatRawDigests(rawLines, headerLabel) {
-    if (!rawLines || rawLines.length === 0) return "";
-    var lines = ["\n\n" + (headerLabel || "Your recent session memories:")];
-    for (var i = 0; i < rawLines.length; i++) {
-      try {
-        var d = JSON.parse(rawLines[i]);
-        if (d.type === "debate" && d.my_role) {
-          // Debate memories are role-played positions, not genuine opinions
-          lines.push("- [" + (d.date || "?") + "] DEBATE (role: " + d.my_role + ") " + (d.topic || "unknown") +
-            ": argued " + (d.my_position || "N/A") + " (assigned role, not my actual opinion)" +
-            (d.outcome ? " | Outcome: " + d.outcome : "") +
-            (d.open_items ? " | Open: " + d.open_items : ""));
+    function dispatchToSdk(finalText) {
+      if (!session.isProcessing) {
+        session.isProcessing = true;
+        onProcessingChanged();
+        session.sentToolResults = {};
+        sendToSession(session.localId, { type: "status", status: "processing" });
+        if (!session.queryInstance && (!session.worker || session.messageQueue !== "worker")) {
+          // No active query (or worker idle between queries): start a new query
+          session._queryStartTs = Date.now();
+          console.log("[PERF] project.js: startQuery called, localId=" + session.localId + " t=0ms");
+          sdk.startQuery(session, finalText, msg.images, getLinuxUserForSession(session));
         } else {
-          lines.push("- [" + (d.date || "?") + "] " + (d.topic || "unknown") + ": " + (d.my_position || "") +
-            (d.decisions ? " | Decisions: " + d.decisions : "") +
-            (d.open_items ? " | Open: " + d.open_items : ""));
-        }
-      } catch (e) {}
-    }
-    return lines.join("\n");
-  }
-
-  function loadMateDigests(mateCtx, mateId, query) {
-    var mateDir = matesModule.getMateDir(mateCtx, mateId);
-    var knowledgeDir = path.join(mateDir, "knowledge");
-    var mate = matesModule.getMate(mateCtx, mateId);
-    var hasGlobalSearch = mate && mate.globalSearch;
-
-    // Load shared user profile (available to ALL mates)
-    var userProfileResult = "";
-    try {
-      var matesRoot = matesModule.resolveMatesRoot(mateCtx);
-      var userProfilePath = path.join(matesRoot, "user-profile.md");
-      if (fs.existsSync(userProfilePath)) {
-        var profileContent = fs.readFileSync(userProfilePath, "utf8").trim();
-        if (profileContent && profileContent.length > 50) {
-          userProfileResult = "\n\n" + profileContent;
+          sdk.pushMessage(session, finalText, msg.images);
         }
+      } else {
+        sdk.pushMessage(session, finalText, msg.images);
       }
-    } catch (e) {}
-
-    // Check for memory-summary.md first
-    var summaryFile = path.join(knowledgeDir, "memory-summary.md");
-    var hasSummary = false;
-    var summaryContent = "";
-    try {
-      if (fs.existsSync(summaryFile)) {
-        summaryContent = fs.readFileSync(summaryFile, "utf8").trim();
-        if (summaryContent) hasSummary = true;
-      }
-    } catch (e) {}
-
-    // Load raw digests
-    var allLines = [];
-    var digestFile = path.join(knowledgeDir, "session-digests.jsonl");
-    try {
-      if (fs.existsSync(digestFile)) {
-        allLines = fs.readFileSync(digestFile, "utf8").trim().split("\n").filter(function (l) { return l.trim(); });
-      }
-    } catch (e) {}
-
-    var result = userProfileResult;
-
-    if (hasSummary) {
-      // Load summary + latest 5 raw digests for richer context
-      var recent = allLines.slice(-5);
-      result = "\n\nYour memory summary:\n" + summaryContent;
-      if (recent.length > 0) {
-        result += formatRawDigests(recent, "Latest raw session memories:");
-      }
-    } else {
-      // Backward compatible: latest 8 raw digests
-      var recent = allLines.slice(-8);
-      result = formatRawDigests(recent, "Your recent session memories:");
+      sm.broadcastSessionList();
     }
 
-    // Global search: always load team memory summaries for globalSearch mates
-    var otherDigests = [];
-    if (hasGlobalSearch) {
-      try {
-        var allMates = matesModule.getAllMates(mateCtx);
-        var teamSummaries = [];
-        for (var mi = 0; mi < allMates.length; mi++) {
-          if (allMates[mi].id === mateId) continue;
-          var otherDir = matesModule.getMateDir(mateCtx, allMates[mi].id);
-          var mateName = allMates[mi].name || allMates[mi].id;
-
-          // Collect digest files for BM25 search
-          var otherDigest = path.join(otherDir, "knowledge", "session-digests.jsonl");
-          if (fs.existsSync(otherDigest)) {
-            otherDigests.push({ path: otherDigest, mateName: mateName });
+    if (tabSources.length > 0) {
+      // Request tab context from all active browser tab sources
+      var tabPromises = tabSources.map(function(srcId) {
+        var tabId = parseInt(srcId.split(":")[1], 10);
+        return requestTabContext(ws, tabId);
+      });
+      Promise.all(tabPromises).then(function(results) {
+        var tabContextParts = [];
+        var screenshotImages = [];
+
+        for (var ti = 0; ti < results.length; ti++) {
+          if (!results[ti]) continue;
+          var tabId2 = parseInt(tabSources[ti].split(":")[1], 10);
+          var tabInfo = _browserTabList[tabId2];
+          var tabLabel = tabInfo ? (tabInfo.title || tabInfo.url || "Tab " + tabId2) : "Tab " + tabId2;
+          var r = results[ti];
+          var parts = [];
+
+          // Console logs
+          if (r.console && r.console.logs) {
+            try {
+              var logs = typeof r.console.logs === "string" ? JSON.parse(r.console.logs) : r.console.logs;
+              if (logs && logs.length > 0) {
+                var logLines = [];
+                var logSlice = logs.slice(-50);
+                for (var li = 0; li < logSlice.length; li++) {
+                  var entry = logSlice[li];
+                  var ts = entry.ts ? new Date(entry.ts).toTimeString().slice(0, 8) : "";
+                  var lvl = (entry.level || "log").toUpperCase();
+                  logLines.push("[" + ts + " " + lvl + "] " + (entry.text || ""));
+                }
+                parts.push("Console:\n" + logLines.join("\n"));
+              }
+            } catch (e) {
+              // ignore parse errors
+            }
           }
 
-          // Collect memory summaries for direct context injection
-          var otherSummary = path.join(otherDir, "knowledge", "memory-summary.md");
-          try {
-            if (fs.existsSync(otherSummary)) {
-              var summaryText = fs.readFileSync(otherSummary, "utf8").trim();
-              if (summaryText && summaryText.length > 50) {
-                teamSummaries.push({ mateName: mateName, summary: summaryText });
+          // Network requests
+          if (r.network && r.network.network) {
+            try {
+              var netLog = typeof r.network.network === "string" ? JSON.parse(r.network.network) : r.network.network;
+              if (netLog && netLog.length > 0) {
+                var netLines = [];
+                var netSlice = netLog.slice(-30);
+                for (var ni = 0; ni < netSlice.length; ni++) {
+                  var req = netSlice[ni];
+                  var line = (req.method || "GET") + " " + (req.url || "") + " " + (req.status || 0) + " " + (req.duration || 0) + "ms";
+                  if (req.error) line += " [" + req.error + "]";
+                  netLines.push(line);
+                }
+                parts.push("Network (last " + netSlice.length + " requests):\n" + netLines.join("\n"));
               }
+            } catch (e) {
+              // ignore parse errors
             }
-          } catch (e) {}
-        }
-
-        // Inject team memory summaries into context
-        if (teamSummaries.length > 0) {
-          result += "\n\nTeam memory summaries (other mates' accumulated context):";
-          for (var tsi = 0; tsi < teamSummaries.length; tsi++) {
-            var ts = teamSummaries[tsi];
-            // Cap each summary to avoid context overflow
-            var capped = ts.summary.length > 2000 ? ts.summary.substring(0, 2000) + "\n...(truncated)" : ts.summary;
-            result += "\n\n--- @" + ts.mateName + " ---\n" + capped;
           }
-        }
-      } catch (e) {}
 
-      // Inject recent user observations from all mates (newest first, max 15)
-      try {
-        var allObservations = [];
-        var allMatesForObs = matesModule.getAllMates(mateCtx);
-        for (var moi = 0; moi < allMatesForObs.length; moi++) {
-          var moDir = matesModule.getMateDir(mateCtx, allMatesForObs[moi].id);
-          var moFile = path.join(moDir, "knowledge", "user-observations.jsonl");
-          try {
-            if (fs.existsSync(moFile)) {
-              var moLines = fs.readFileSync(moFile, "utf8").trim().split("\n").filter(function (l) { return l.trim(); });
-              for (var mli = 0; mli < moLines.length; mli++) {
-                try {
-                  var moEntry = JSON.parse(moLines[mli]);
-                  moEntry._mateName = moEntry.mateName || allMatesForObs[moi].name || allMatesForObs[moi].id;
-                  allObservations.push(moEntry);
-                } catch (e) {}
+          // Page text (from tab_page_text command)
+          if (r.pageText && (r.pageText.text || r.pageText.value)) {
+            var pageContent = r.pageText.text || r.pageText.value;
+            if (pageContent.length > 0) {
+              if (pageContent.length > 32768) {
+                pageContent = pageContent.substring(0, 32768) + "\n... (truncated)";
               }
+              parts.push("Page text:\n" + pageContent);
             }
-          } catch (e) {}
-        }
-        if (allObservations.length > 0) {
-          // Sort by date descending
-          allObservations.sort(function (a, b) { return (b.date || "").localeCompare(a.date || ""); });
-          var recentObs = allObservations.slice(0, 15);
-          result += "\n\nRecent user observations from all mates:";
-          for (var roi = 0; roi < recentObs.length; roi++) {
-            var ro = recentObs[roi];
-            result += "\n- [" + (ro.date || "?") + "] [@" + ro._mateName + "] [" + (ro.category || "?") + "] " + (ro.observation || "") + (ro.evidence ? " (evidence: " + ro.evidence + ")" : "");
           }
-        }
-      } catch (e) {}
-
-      // Inject recent activity timeline across all projects (chronological)
-      try {
-        var timelineEntries = [];
-
-        // Own sessions
-        sm.sessions.forEach(function (s) {
-          if (s.hidden || !s.history || s.history.length === 0) return;
-          timelineEntries.push({
-            title: s.title || "New Session",
-            project: null,
-            ts: s.lastActivity || s.createdAt || 0
-          });
-        });
 
-        // Cross-project sessions
-        var crossForTimeline = getAllProjectSessions();
-        for (var cti = 0; cti < crossForTimeline.length; cti++) {
-          var cs = crossForTimeline[cti];
-          timelineEntries.push({
-            title: cs.title || "New Session",
-            project: cs._projectTitle || null,
-            ts: cs.lastActivity || cs.createdAt || 0
-          });
-        }
-
-        // Sort by time descending, take latest 20
-        timelineEntries.sort(function (a, b) { return b.ts - a.ts; });
-        timelineEntries = timelineEntries.slice(0, 20);
-
-        if (timelineEntries.length > 0) {
-          result += "\n\nRecent activity timeline (newest first):";
-          for (var ti = 0; ti < timelineEntries.length; ti++) {
-            var te = timelineEntries[ti];
-            var dateStr = te.ts ? new Date(te.ts).toISOString().replace("T", " ").substring(0, 16) : "?";
-            var line = "- [" + dateStr + "] " + te.title;
-            if (te.project) line += " (project: " + te.project + ")";
-            result += "\n" + line;
+          // Screenshot — save to disk and add to images for SDK
+          if (r.screenshot && r.screenshot.image) {
+            try {
+              var screenshotData = r.screenshot.image;
+              var screenshotName = saveImageFile("image/png", screenshotData, getLinuxUserForSession(session));
+              if (screenshotName) {
+                var screenshotPath = path.join(imagesDir, screenshotName);
+                // Add to images array for SDK multimodal
+                screenshotImages.push({
+                  mediaType: "image/png",
+                  data: screenshotData,
+                  file: screenshotName,
+                  tabTitle: tabLabel,
+                  tabUrl: tabInfo ? tabInfo.url : ""
+                });
+                parts.push("[Screenshot saved: " + screenshotPath + "]");
+              }
+            } catch (e) {
+              // ignore screenshot save errors
+            }
           }
-        }
-      } catch (e) {}
-    }
 
-    // BM25 unified search: digests + session history for current topic
-    // globalSearch mates always search (they see everything); others need enough digests
-    if (query && (hasGlobalSearch || allLines.length > 5)) {
-      try {
-        // Collect mate's own sessions
-        var mateSessions = [];
-        sm.sessions.forEach(function (s) {
-          if (!s.hidden && s.history && s.history.length > 0) {
-            mateSessions.push(s);
+          if (r.console && r.console.error) {
+            parts.push("(Console error: " + r.console.error + ")");
           }
-        });
-
-        // globalSearch: also collect sessions from all other projects + knowledge files
-        var knowledgeFiles = [];
-        if (hasGlobalSearch) {
-          var crossSessions = getAllProjectSessions();
-          for (var cs = 0; cs < crossSessions.length; cs++) {
-            mateSessions.push(crossSessions[cs]);
+          if (r.network && r.network.error) {
+            parts.push("(Network error: " + r.network.error + ")");
           }
 
-          // Collect knowledge files from all mates
-          try {
-            var allMatesForKnowledge = matesModule.getAllMates(mateCtx);
-            for (var mk = 0; mk < allMatesForKnowledge.length; mk++) {
-              var mkDir = matesModule.getMateDir(mateCtx, allMatesForKnowledge[mk].id);
-              var mkName = allMatesForKnowledge[mk].name || allMatesForKnowledge[mk].id;
-              var mkKnowledgeDir = path.join(mkDir, "knowledge");
-              try {
-                var kFiles = fs.readdirSync(mkKnowledgeDir);
-                for (var kfi = 0; kfi < kFiles.length; kfi++) {
-                  var kfName = kFiles[kfi];
-                  // Skip system files (digests, identity, base-template)
-                  if (kfName === "session-digests.jsonl" || kfName === "memory-summary.md" ||
-                      kfName === "identity-backup.md" || kfName === "identity-history.jsonl" ||
-                      kfName === "base-template.md") continue;
-                  knowledgeFiles.push({
-                    filePath: path.join(mkKnowledgeDir, kfName),
-                    name: kfName,
-                    mateName: mkName
-                  });
-                }
-              } catch (e) {}
-            }
-          } catch (e) {}
+          if (parts.length > 0) {
+            tabContextParts.push("[Browser tab: " + tabLabel + "]\n" + parts.join("\n\n"));
+          }
         }
 
-        var searchResults = sessionSearch.searchMate({
-          digestFilePath: digestFile,
-          otherDigests: otherDigests,
-          sessions: mateSessions,
-          knowledgeFiles: knowledgeFiles,
-          query: query,
-          maxResults: hasGlobalSearch ? 12 : 5,
-          minScore: 1.0
-        });
-        var contextStr = sessionSearch.formatForContext(searchResults);
-        if (contextStr) result += contextStr;
-      } catch (e) {
-        console.error("[session-search] Mate search failed:", e.message);
-      }
-    }
-
-    return result;
-  }
-
-  // Gate check: ask Haiku whether this conversation contains anything worth remembering
-  function gateMemory(mateCtx, mateId, conversationContent, callback, opts) {
-    opts = opts || {};
-    var mateDir = matesModule.getMateDir(mateCtx, mateId);
-    var knowledgeDir = path.join(mateDir, "knowledge");
-
-    // Load mate role/activities from mate.yaml (lightweight, no full CLAUDE.md)
-    var mateRole = "";
-    var mateActivities = "";
-    try {
-      var yamlRaw = fs.readFileSync(path.join(mateDir, "mate.yaml"), "utf8");
-      var roleMatch = yamlRaw.match(/^relationship:\s*(.+)$/m);
-      var actMatch = yamlRaw.match(/^activities:\s*(.+)$/m);
-      if (roleMatch) mateRole = roleMatch[1].trim();
-      if (actMatch) mateActivities = actMatch[1].trim();
-    } catch (e) {}
-
-    // Load existing memory summary if available
-    var summaryContent = "";
-    try {
-      var summaryFile = path.join(knowledgeDir, "memory-summary.md");
-      if (fs.existsSync(summaryFile)) {
-        summaryContent = fs.readFileSync(summaryFile, "utf8").trim();
-      }
-    } catch (e) {}
-
-    // Cap conversation content for gate
-    var cappedContent = conversationContent;
-    if (cappedContent.length > 3000) {
-      cappedContent = cappedContent.substring(0, 3000) + "...";
-    }
-
-    var gateContext = [
-      "[SYSTEM: Memory Gate]",
-      "You are a memory filter for an AI Mate.",
-      "",
-      "Mate role: " + (mateRole || "assistant"),
-      "Mate activities: " + (mateActivities || "general"),
-      "",
-      "Current memory summary:",
-      summaryContent || "No memory summary yet.",
-      "",
-      "Conversation just ended:",
-      cappedContent,
-    ].join("\n");
-
-    var gatePrompt = opts.gatePrompt || [
-      'Should this conversation be saved to long-term memory?',
-      'Answer "yes" if ANY of these apply:',
-      "- A new decision, commitment, or direction",
-      "- A change in position or strategy",
-      "- New information relevant to this Mate's role",
-      "- A user preference, opinion, or pattern not already in the summary",
-      "- The user shared personal context, project details, or goals",
-      "- The user expressed what they like, dislike, or care about",
-      "- The user gave instructions on how they want things done",
-      "- Anything the user would reasonably expect to be remembered next time",
-      "",
-      'Answer "no" ONLY if:',
-      "- It exactly duplicates what is already in the memory summary",
-      "- The entire conversation is a single trivial exchange (e.g. just 'hi' / 'hello')",
-      "",
-      "When in doubt, answer yes. It is better to remember too much than to forget something important.",
-      "",
-      'Answer with ONLY "yes" or "no". Nothing else.',
-    ].join("\n");
-    var defaultOnError = opts.defaultYes !== undefined ? !!opts.defaultYes : true;
-
-    var gateText = "";
-    var _gateSession = null;
-    sdk.createMentionSession({
-      claudeMd: "",
-      model: "haiku",
-      initialContext: gateContext,
-      initialMessage: gatePrompt,
-      onActivity: function () {},
-      onDelta: function (delta) {
-        gateText += delta;
-      },
-      onDone: function () {
-        var answer = gateText.trim().toLowerCase();
-        var shouldRemember = answer.indexOf("yes") !== -1;
-        if (_gateSession) try { _gateSession.close(); } catch (e) {}
-        callback(shouldRemember);
-      },
-      onError: function (err) {
-        console.error("[memory-gate] Gate check failed for mate " + mateId + ":", err);
-        if (_gateSession) try { _gateSession.close(); } catch (e) {}
-        callback(defaultOnError);
-      },
-    }).then(function (gs) {
-      _gateSession = gs;
-      if (!gs) callback(defaultOnError);
-    }).catch(function (err) {
-      console.error("[memory-gate] Failed to create gate session for mate " + mateId + ":", err);
-      callback(defaultOnError);
-    });
-  }
-
-  // Update (or create) memory-summary.md based on a new digest
-  function updateMemorySummary(mateCtx, mateId, digestObj) {
-    var mateDir = matesModule.getMateDir(mateCtx, mateId);
-    var knowledgeDir = path.join(mateDir, "knowledge");
-    var summaryFile = path.join(knowledgeDir, "memory-summary.md");
+        if (tabContextParts.length > 0) {
+          fullText = tabContextParts.join("\n\n---\n\n") + "\n\n" + fullText;
+        }
 
-    // Check if summary exists; if not, try initial generation first
-    var summaryExists = false;
-    var summaryContent = "";
-    try {
-      if (fs.existsSync(summaryFile)) {
-        summaryContent = fs.readFileSync(summaryFile, "utf8").trim();
-        if (summaryContent) summaryExists = true;
-      }
-    } catch (e) {}
+        // If screenshots were captured, send context preview cards and add to SDK images
+        if (screenshotImages.length > 0) {
+          if (!msg.images) msg.images = [];
+          for (var si = 0; si < screenshotImages.length; si++) {
+            var ss = screenshotImages[si];
+            // Save context_preview to history so it restores on session load
+            var previewEntry = {
+              type: "context_preview",
+              tab: {
+                title: ss.tabTitle || "",
+                url: ss.tabUrl || "",
+                screenshotFile: ss.file
+              }
+            };
+            session.history.push(previewEntry);
+            // Send context card to all clients
+            sendToSession(session.localId, {
+              type: "context_preview",
+              tab: {
+                title: ss.tabTitle || "",
+                url: ss.tabUrl || "",
+                screenshotUrl: "/p/" + slug + "/images/" + ss.file
+              }
+            });
+            // Add to SDK images for multimodal
+            msg.images.push({ mediaType: ss.mediaType, data: ss.data });
+          }
+          sm.saveSessionFile(session);
+        }
 
-    if (!summaryExists) {
-      // Try initial summary generation from existing digests (migration)
-      initMemorySummary(mateCtx, mateId, function () {
-        // After init, do incremental update with the new digest
-        doIncrementalUpdate(mateCtx, mateId, knowledgeDir, summaryFile, digestObj);
+        dispatchToSdk(fullText);
       });
     } else {
-      doIncrementalUpdate(mateCtx, mateId, knowledgeDir, summaryFile, digestObj);
+      dispatchToSdk(fullText);
     }
   }
 
-  // Incremental update of memory-summary.md with a single new digest
-  function doIncrementalUpdate(mateCtx, mateId, knowledgeDir, summaryFile, digestObj) {
-    var existingSummary = "";
-    try {
-      if (fs.existsSync(summaryFile)) {
-        existingSummary = fs.readFileSync(summaryFile, "utf8").trim();
-      }
-    } catch (e) {}
-
-    var updateContext = [
-      "[SYSTEM: Memory Summary Update]",
-      "You are updating an AI Mate's long-term memory summary.",
-      "",
-      "Current summary:",
-      existingSummary || "(empty, this is the first entry)",
-      "",
-      "New session digest to incorporate:",
-      JSON.stringify(digestObj, null, 2),
-    ].join("\n");
-
-    var updatePrompt = [
-      "Update the summary by:",
-      "1. Adding new information from this session",
-      "2. Updating existing entries if positions changed",
-      "3. Moving resolved open threads out of \"Open Threads\"",
-      "4. Adding to \"My Track Record\" if a past prediction/recommendation can now be evaluated",
-      "5. Removing outdated or redundant information",
-      "6. Preserving important user quotes and context from key_quotes and user_context fields",
-      "",
-      "Maintain this structure:",
-      "",
-      "# Memory Summary",
-      "Last updated: YYYY-MM-DD (session count: N+1)",
-      "",
-      "## User Context",
-      "(who they are, what they work on, project details, goals)",
-      "## User Patterns",
-      "(preferences, work style, communication style, likes/dislikes)",
-      "## Key Decisions",
-      "## Notable Quotes",
-      "(important things the user said, verbatim when possible)",
-      "## My Track Record",
-      "## Open Threads",
-      "## Recurring Topics",
-      "",
-      "Keep it concise. Each section should have at most 10 bullet points.",
-      "Drop the oldest/least relevant if needed.",
-      "The Notable Quotes section is valuable for preserving the user's voice and intent.",
-      "Output ONLY the updated markdown. Nothing else.",
-    ].join("\n");
-
-    var updateText = "";
-    var _updateSession = null;
-    sdk.createMentionSession({
-      claudeMd: "",
-      model: "haiku",
-      initialContext: updateContext,
-      initialMessage: updatePrompt,
-      onActivity: function () {},
-      onDelta: function (delta) {
-        updateText += delta;
-      },
-      onDone: function () {
-        try {
-          var cleaned = updateText.trim();
-          if (cleaned.indexOf("```") === 0) {
-            cleaned = cleaned.replace(/^```[a-z]*\n?/, "").replace(/\n?```$/, "").trim();
-          }
-          fs.mkdirSync(knowledgeDir, { recursive: true });
-          fs.writeFileSync(summaryFile, cleaned + "\n", "utf8");
-          console.log("[memory-summary] Updated memory-summary.md for mate " + mateId);
-        } catch (e) {
-          console.error("[memory-summary] Failed to write memory-summary.md for mate " + mateId + ":", e.message);
-        }
-        if (_updateSession) try { _updateSession.close(); } catch (e) {}
-      },
-      onError: function (err) {
-        console.error("[memory-summary] Summary update failed for mate " + mateId + ":", err);
-        if (_updateSession) try { _updateSession.close(); } catch (e) {}
-      },
-    }).then(function (us) {
-      _updateSession = us;
-    }).catch(function (err) {
-      console.error("[memory-summary] Failed to create summary update session for mate " + mateId + ":", err);
-    });
-  }
-
-  // User profile synthesis: collect observations from all mates, synthesize unified profile
-  var USER_PROFILE_SYNTHESIS_THRESHOLD = 8;
-
-  function maybeSynthesizeUserProfile(mateCtx, mateId) {
-    var mate = matesModule.getMate(mateCtx, mateId);
-    if (!mate || !mate.globalSearch) return; // Only primary/globalSearch mates synthesize
-
-    var matesRoot = matesModule.resolveMatesRoot(mateCtx);
-    var profilePath = path.join(matesRoot, "user-profile.md");
-
-    // Collect all observations across all mates
-    var allObs = [];
-    try {
-      var allMates = matesModule.getAllMates(mateCtx);
-      for (var mi = 0; mi < allMates.length; mi++) {
-        var moDir = matesModule.getMateDir(mateCtx, allMates[mi].id);
-        var moFile = path.join(moDir, "knowledge", "user-observations.jsonl");
-        try {
-          if (fs.existsSync(moFile)) {
-            var lines = fs.readFileSync(moFile, "utf8").trim().split("\n").filter(function (l) { return l.trim(); });
-            for (var li = 0; li < lines.length; li++) {
-              try { allObs.push(JSON.parse(lines[li])); } catch (e) {}
-            }
-          }
-        } catch (e) {}
-      }
-    } catch (e) { return; }
-
-    if (allObs.length === 0) return;
+  // --- Shared helpers ---
 
-    // Check if synthesis is needed (threshold since last synthesis)
-    var existingProfile = "";
-    var lastObsCount = 0;
-    try {
-      if (fs.existsSync(profilePath)) {
-        existingProfile = fs.readFileSync(profilePath, "utf8").trim();
-        var countMatch = existingProfile.match(/from (\d+) observations/);
-        if (countMatch) lastObsCount = parseInt(countMatch[1], 10) || 0;
-      }
-    } catch (e) {}
-
-    if (allObs.length - lastObsCount < USER_PROFILE_SYNTHESIS_THRESHOLD) return;
-
-    // Sort newest first for synthesis
-    allObs.sort(function (a, b) { return (b.date || "").localeCompare(a.date || ""); });
-
-    var synthContext = [
-      "[SYSTEM: User Profile Synthesis]",
-      "You are synthesizing a user profile from observations collected by multiple AI teammates.",
-      "",
-      "Current profile:",
-      existingProfile || "(none yet, first synthesis)",
-      "",
-      "All observations (" + allObs.length + " total, newest first):",
-      allObs.map(function (o) {
-        return "[" + (o.date || "?") + "] [@" + (o.mateName || o.mateId || "?") + "] [" + (o.category || "?") + "] " + (o.observation || "") + (o.evidence ? " (evidence: " + o.evidence + ")" : "");
-      }).join("\n"),
-    ].join("\n");
-
-    var synthPrompt = [
-      "Synthesize a unified user profile from these observations.",
-      "",
-      "Rules:",
-      "1. Organize by: Communication Style, Decision Patterns, Working Habits, Technical Preferences, Emotional Signals",
-      "2. Each point: observation + source mates and dates in parentheses",
-      "3. If observations contradict, note both with dates. Preferences evolve.",
-      "4. Mark patterns seen 3+ times as [strong], 2 times as [emerging]",
-      "5. Keep under 800 words. This is a reference card, not a biography.",
-      '6. End with: "Last synthesized: YYYY-MM-DD from N observations across M mates"',
-      "",
-      "Output ONLY the markdown profile. No fences, no extra text.",
-    ].join("\n");
-
-    var synthText = "";
-    sdk.createMentionSession({
-      claudeMd: "",
-      model: "haiku",
-      initialContext: synthContext,
-      initialMessage: synthPrompt,
-      onActivity: function () {},
-      onDelta: function (delta) { synthText += delta; },
-      onDone: function () {
-        try {
-          var cleaned = synthText.trim();
-          if (cleaned.indexOf("```") === 0) {
-            cleaned = cleaned.replace(/^```[a-z]*\n?/, "").replace(/\n?```$/, "").trim();
-          }
-          fs.mkdirSync(path.dirname(profilePath), { recursive: true });
-          fs.writeFileSync(profilePath, cleaned + "\n", "utf8");
-          console.log("[user-profile] Synthesized user-profile.md from " + allObs.length + " observations");
-        } catch (e) {
-          console.error("[user-profile] Failed to write user-profile.md:", e.message);
-        }
-      },
-      onError: function (err) {
-        console.error("[user-profile] Synthesis failed:", err);
-      },
-    }).catch(function (err) {
-      console.error("[user-profile] Failed to create synthesis session:", err);
-    });
+  function escapeRegex(str) {
+    return str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
   }
 
-  // Initial summary generation (migration): read latest 20 digests and generate first summary
-  function initMemorySummary(mateCtx, mateId, callback) {
-    var mateDir = matesModule.getMateDir(mateCtx, mateId);
-    var knowledgeDir = path.join(mateDir, "knowledge");
-    var summaryFile = path.join(knowledgeDir, "memory-summary.md");
-    var digestFile = path.join(knowledgeDir, "session-digests.jsonl");
-
-    // Check if digests exist
-    var allLines = [];
-    try {
-      if (fs.existsSync(digestFile)) {
-        allLines = fs.readFileSync(digestFile, "utf8").trim().split("\n").filter(function (l) { return l.trim(); });
-      }
-    } catch (e) {}
-
-    if (allLines.length === 0) {
-      // No digests to summarize, just callback
-      callback();
-      return;
-    }
-
-    var recent = allLines.slice(-20);
-    var digestsText = [];
-    for (var i = 0; i < recent.length; i++) {
-      try {
-        var d = JSON.parse(recent[i]);
-        digestsText.push(JSON.stringify(d));
-      } catch (e) {}
-    }
-
-    if (digestsText.length === 0) {
-      callback();
-      return;
-    }
-
-    var initContext = [
-      "[SYSTEM: Initial Memory Summary]",
-      "You are creating the first long-term memory summary for an AI Mate.",
-      "",
-      "Here are the most recent session digests (up to 20):",
-      digestsText.join("\n"),
-    ].join("\n");
-
-    var initPrompt = [
-      "Create a memory summary from these sessions.",
-      "",
-      "Structure:",
-      "",
-      "# Memory Summary",
-      "Last updated: YYYY-MM-DD (session count: N)",
-      "",
-      "## User Context",
-      "(who they are, what they work on, project details, goals)",
-      "## User Patterns",
-      "(preferences, work style, communication style, likes/dislikes)",
-      "## Key Decisions",
-      "## Notable Quotes",
-      "(important things the user said, verbatim when possible)",
-      "## My Track Record",
-      "## Open Threads",
-      "## Recurring Topics",
-      "",
-      "Keep it concise. Focus on patterns, decisions, and the user's own words.",
-      "Each section should have at most 10 bullet points.",
-      "Preserve key_quotes from digests in the Notable Quotes section.",
-      "Set session count to " + digestsText.length + ".",
-      "Output ONLY the markdown. Nothing else.",
-    ].join("\n");
-
-    var initText = "";
-    var _initSession = null;
-    sdk.createMentionSession({
-      claudeMd: "",
-      model: "haiku",
-      initialContext: initContext,
-      initialMessage: initPrompt,
-      onActivity: function () {},
-      onDelta: function (delta) {
-        initText += delta;
-      },
-      onDone: function () {
-        try {
-          var cleaned = initText.trim();
-          if (cleaned.indexOf("```") === 0) {
-            cleaned = cleaned.replace(/^```[a-z]*\n?/, "").replace(/\n?```$/, "").trim();
-          }
-          fs.mkdirSync(knowledgeDir, { recursive: true });
-          fs.writeFileSync(summaryFile, cleaned + "\n", "utf8");
-          console.log("[memory-summary] Generated initial memory-summary.md for mate " + mateId + " from " + digestsText.length + " digests");
-        } catch (e) {
-          console.error("[memory-summary] Failed to write initial memory-summary.md for mate " + mateId + ":", e.message);
-        }
-        if (_initSession) try { _initSession.close(); } catch (e) {}
-        callback();
-      },
-      onError: function (err) {
-        console.error("[memory-summary] Initial summary generation failed for mate " + mateId + ":", err);
-        if (_initSession) try { _initSession.close(); } catch (e) {}
-        callback();
-      },
-    }).then(function (is) {
-      _initSession = is;
-      if (!is) callback();
-    }).catch(function (err) {
-      console.error("[memory-summary] Failed to create init summary session for mate " + mateId + ":", err);
-      callback();
-    });
-  }
+  // --- Memory engine (delegated to project-memory.js) ---
+  var _memory = attachMemory({
+    cwd: cwd,
+    sm: sm,
+    sdk: sdk,
+    sendTo: sendTo,
+    matesModule: matesModule,
+    sessionSearch: sessionSearch,
+    getAllProjectSessions: getAllProjectSessions,
+    projectOwnerId: projectOwnerId,
+    handleMessage: handleMessage,
+  });
+  var loadMateDigests = _memory.loadMateDigests;
+  var gateMemory = _memory.gateMemory;
+  var updateMemorySummary = _memory.updateMemorySummary;
+  var initMemorySummary = _memory.initMemorySummary;
+
+  // --- Mate interaction engine (delegated to project-mate-interaction.js) ---
+  // Note: checkForDmDebateBrief comes from _debate (initialized below),
+  // so we use a lazy getter that resolves at call time.
+  var _mateInteraction = attachMateInteraction({
+    cwd: cwd,
+    sm: sm,
+    sdk: sdk,
+    send: send,
+    sendTo: sendTo,
+    sendToSession: sendToSession,
+    sendToSessionOthers: sendToSessionOthers,
+    matesModule: matesModule,
+    isMate: isMate,
+    projectOwnerId: projectOwnerId,
+    getSessionForWs: getSessionForWs,
+    getLinuxUserForSession: getLinuxUserForSession,
+    saveImageFile: saveImageFile,
+    hydrateImageRefs: hydrateImageRefs,
+    onProcessingChanged: onProcessingChanged,
+    loadMateDigests: loadMateDigests,
+    updateMemorySummary: updateMemorySummary,
+    initMemorySummary: initMemorySummary,
+    get checkForDmDebateBrief() { return checkForDmDebateBrief; },
+  });
+  var handleMention = _mateInteraction.handleMention;
+  var getMateProfile = _mateInteraction.getMateProfile;
+  var loadMateClaudeMd = _mateInteraction.loadMateClaudeMd;
+  var digestDmTurn = _mateInteraction.digestDmTurn;
+  var enqueueDigest = _mateInteraction.enqueueDigest;
 
   // --- Debate engine (delegated to project-debate.js) ---
   var _debate = attachDebate({
@@ -5176,10 +4321,12 @@ function createProjectContext(opts) {
     initMemorySummary: initMemorySummary,
   });
   var handleDebateStart = _debate.handleDebateStart;
+  var handleDebateHandRaise = _debate.handleDebateHandRaise;
   var handleDebateComment = _debate.handleDebateComment;
   var handleDebateStop = _debate.handleDebateStop;
   var handleDebateConcludeResponse = _debate.handleDebateConcludeResponse;
   var handleDebateConfirmBrief = _debate.handleDebateConfirmBrief;
+  var handleDebateUserFloorResponse = _debate.handleDebateUserFloorResponse;
   var restoreDebateState = _debate.restoreDebateState;
   var checkForDmDebateBrief = _debate.checkForDmDebateBrief;
 
@@ -5231,6 +4378,44 @@ function createProjectContext(opts) {
 
   // --- Handle project-scoped HTTP requests ---
   function handleHTTP(req, res, urlPath) {
+    // Browser MCP extension bridge: forward commands to Chrome extension
+    if (req.method === "POST" && urlPath === "/ext-command") {
+      parseJsonBody(req).then(function (body) {
+        // Validate auth token
+        if (!body.token || body.token !== _extToken) {
+          res.writeHead(403, { "Content-Type": "application/json" });
+          res.end('{"error":"Invalid token"}');
+          return;
+        }
+        var command = body.command;
+        var args = body.args || {};
+        var timeout = Math.min(body.timeout || 5000, 30000); // max 30s
+
+        // Special command: list_tabs (no extension round-trip needed)
+        if (command === "list_tabs") {
+          var tabArr = [];
+          for (var tid in _browserTabList) {
+            tabArr.push(_browserTabList[tid]);
+          }
+          res.writeHead(200, { "Content-Type": "application/json" });
+          res.end(JSON.stringify({ result: { tabs: tabArr } }));
+          return;
+        }
+
+        sendExtensionCommandAny(command, args, timeout).then(function (result) {
+          res.writeHead(200, { "Content-Type": "application/json" });
+          res.end(JSON.stringify({ result: result || {} }));
+        }).catch(function (err) {
+          res.writeHead(200, { "Content-Type": "application/json" });
+          res.end(JSON.stringify({ error: err.message || "Extension command failed" }));
+        });
+      }).catch(function () {
+        res.writeHead(400, { "Content-Type": "application/json" });
+        res.end('{"error":"Invalid JSON body"}');
+      });
+      return true;
+    }
+
     // Serve chat images
     if (req.method === "GET" && urlPath.indexOf("/images/") === 0) {
       var imgName = path.basename(urlPath);
@@ -5265,7 +4450,7 @@ function createProjectContext(opts) {
           return;
         }
         // Sanitize filename — strip path separators
-        var safeName = path.basename(fileName).replace(/[^a-zA-Z0-9._\-\(\)\[\] ]/g, "_");
+        var safeName = path.basename(fileName).replace(/[\x00-\x1f\/\\:*?"<>|]/g, "_");
         if (!safeName) safeName = "upload";
 
         // Check size