clay-server 2.34.0-beta.3 → 2.34.0-beta.5

package/lib/public/index.html

@@ -1855,7 +1855,7 @@
             <div class="mate-intro-step"><span class="mate-intro-step-num">2</span> Have a short interview where your Mate gets to know you</div>
             <div class="mate-intro-step"><span class="mate-intro-step-num">3</span> Start talking</div>
           </div>
-          <p class="mate-intro-privacy">Mates run on Claude Code. No separate API keys or external services needed. Your conversations stay on your Clay server and are never stored elsewhere.</p>
+          <p class="mate-intro-privacy">Mates run on Claude Code or ChatGPT Codex, your choice. No separate API keys or external services needed. Your conversations stay on your Clay server and are never stored elsewhere.</p>
         </div>
       </div>
       <!-- Step 1: Relationship -->
@@ -1996,26 +1996,24 @@
         </div>
       </div>
 
-      <!-- Step 4: Autonomy -->
+      <!-- Step 4: Vendor -->
       <div class="mate-step" data-step="4">
-        <h3>How much should they do on their own?</h3>
-        <p class="mate-hint">This is about how much freedom your mate gets before checking with you.</p>
-        <div class="mate-autonomy-options">
-          <button class="mate-autonomy-btn" data-value="always_ask">
-            <span class="mate-autonomy-title">Ask me everything</span>
-            <span class="mate-autonomy-desc">"Before you do anything, run it by me first."</span>
-          </button>
-          <button class="mate-autonomy-btn active" data-value="minor_stuff_ok">
-            <span class="mate-autonomy-title">Small stuff is fine</span>
-            <span class="mate-autonomy-desc">"Little things, just do it. Anything big, ask me."</span>
-          </button>
-          <button class="mate-autonomy-btn" data-value="mostly_autonomous">
-            <span class="mate-autonomy-title">Mostly free</span>
-            <span class="mate-autonomy-desc">"Do your thing. Only check if it's really important."</span>
+        <h3>Which model should power them?</h3>
+        <p class="mate-hint">You can switch this anytime from the mate's settings.</p>
+        <div class="mate-vendor-option-list">
+          <button class="mate-vendor-option-btn active" data-value="claude">
+            <img src="/claude-code-avatar.png" class="mate-vendor-option-icon" alt="Claude Code">
+            <div class="mate-vendor-option-text">
+              <span class="mate-vendor-option-title">Claude Code</span>
+              <span class="mate-vendor-option-desc">Anthropic's Claude. Thoughtful, conversational, strong at nuanced reasoning and long-form writing. A good default for most mates.</span>
+            </div>
           </button>
-          <button class="mate-autonomy-btn" data-value="fully_autonomous">
-            <span class="mate-autonomy-title">Full freedom</span>
-            <span class="mate-autonomy-desc">"Just get it done and tell me after."</span>
+          <button class="mate-vendor-option-btn" data-value="codex">
+            <img src="/codex-avatar.png" class="mate-vendor-option-icon" alt="ChatGPT Codex">
+            <div class="mate-vendor-option-text">
+              <span class="mate-vendor-option-title">ChatGPT Codex</span>
+              <span class="mate-vendor-option-desc">OpenAI's GPT coding agent. Fast and direct, strong at code generation and tight execution loops. Good for builder-type mates.</span>
+            </div>
           </button>
         </div>
       </div>

package/lib/public/modules/app-dm.js

@@ -474,8 +474,6 @@ export function buildMateInterviewPrompt(mate) {
     var styles = sd.communicationStyle.map(function (s) { return styleLabels[s] || s.replace(/_/g, " "); });
     parts.push("Communication: " + styles.join(", "));
   }
-  if (sd.autonomy) parts.push("Autonomy: " + sd.autonomy.replace(/_/g, " "));
-
   return "Use the /clay-mate-interview skill to start the interview.\n\n" +
     "Mate ID: " + mate.id + "\n" +
     "Mate Directory: .claude/mates/" + mate.id + "\n\n" +

package/lib/public/modules/app-messages.js

@@ -732,6 +732,8 @@ export function processMessage(msg) {
           getTools()[msg.id] = { el: null, name: msg.name, input: null, done: true, hidden: true };
         } else if (msg.name === "propose_debate" || (msg.name && msg.name.indexOf("propose_debate") !== -1)) {
           getTools()[msg.id] = { el: null, name: msg.name, input: null, done: true, hidden: true };
+        } else if (msg.name === "ask_user_questions") {
+          getTools()[msg.id] = { el: null, name: msg.name, input: null, done: true, hidden: true };
         } else if (getTodoTools()[msg.name]) {
           getTools()[msg.id] = { el: null, name: msg.name, input: null, done: true, hidden: true };
         } else {

package/lib/public/modules/mate-sidebar.js

@@ -225,15 +225,6 @@ export function showMateSidebar(mateId, mateData) {
     if (sd.communicationStyle && sd.communicationStyle.length > 0) {
       seedTooltip.appendChild(makeSeedTags("Style", sd.communicationStyle.map(function (s) { return s.replace(/_/g, " "); })));
     }
-    if (sd.autonomy) {
-      var autonomyLabels = {
-        always_ask: "Ask me everything",
-        minor_stuff_ok: "Small stuff is fine",
-        mostly_autonomous: "Mostly free",
-        fully_autonomous: "Full freedom",
-      };
-      seedTooltip.appendChild(makeSeedRow("Autonomy", autonomyLabels[sd.autonomy] || sd.autonomy.replace(/_/g, " ")));
-    }
   }
 
   // Clear session list

package/lib/public/modules/mate-wizard.js

@@ -6,7 +6,7 @@ var mateWizardData = {
   relationship: null,
   activity: [],
   communicationStyle: [],
-  autonomy: "minor_stuff_ok",
+  vendor: "claude",
 };
 
 var _sendWs = null;
@@ -85,19 +85,19 @@ export function initMateWizard(sendWs, onMateCreated) {
     })(styleCards[i]);
   }
 
-  // Step 4: Autonomy button clicks
-  var autonomyBtns = document.querySelectorAll("#mate-wizard .mate-autonomy-btn");
-  for (var i = 0; i < autonomyBtns.length; i++) {
+  // Step 4: Vendor button clicks
+  var vendorBtns = document.querySelectorAll("#mate-wizard .mate-vendor-option-btn");
+  for (var i = 0; i < vendorBtns.length; i++) {
     (function (btn) {
       btn.addEventListener("click", function () {
-        var allBtns = document.querySelectorAll("#mate-wizard .mate-autonomy-btn");
+        var allBtns = document.querySelectorAll("#mate-wizard .mate-vendor-option-btn");
         for (var j = 0; j < allBtns.length; j++) {
           allBtns[j].classList.remove("active");
         }
         btn.classList.add("active");
-        mateWizardData.autonomy = btn.dataset.value;
+        mateWizardData.vendor = btn.dataset.value;
       });
-    })(autonomyBtns[i]);
+    })(vendorBtns[i]);
   }
 }
 
@@ -107,7 +107,7 @@ export function openMateWizard() {
     relationship: null,
     activity: [],
     communicationStyle: [],
-    autonomy: "minor_stuff_ok",
+    vendor: "claude",
   };
 
   // Reset UI
@@ -136,12 +136,12 @@ export function openMateWizard() {
     styleCards[i].classList.remove("selected");
   }
 
-  // Reset autonomy
-  var autonomyBtns = el.querySelectorAll(".mate-autonomy-btn");
-  for (var i = 0; i < autonomyBtns.length; i++) {
-    autonomyBtns[i].classList.remove("active");
-    if (autonomyBtns[i].dataset.value === "minor_stuff_ok") {
-      autonomyBtns[i].classList.add("active");
+  // Reset vendor
+  var vendorBtns = el.querySelectorAll(".mate-vendor-option-btn");
+  for (var i = 0; i < vendorBtns.length; i++) {
+    vendorBtns[i].classList.remove("active");
+    if (vendorBtns[i].dataset.value === "claude") {
+      vendorBtns[i].classList.add("active");
     }
   }
 
@@ -220,7 +220,7 @@ function collectMateWizardData() {
     mateWizardData.communicationStyle.push(selectedStyles[i].dataset.value);
   }
 
-  // Autonomy (already set via button clicks)
+  // Vendor (already set via button clicks)
 }
 
 function mateWizardNext() {

package/lib/public/modules/tools.js

@@ -1587,14 +1587,32 @@ export function stopThinking(duration) {
   } else {
     currentThinking.el.querySelector(".thinking-duration").textContent = " " + secs.toFixed(1) + "s";
   }
-  // In mate mode: hide sparkle activity, show compact expandable thinking header
+  // If no thinking text was streamed (e.g. Codex reasoning items arrive
+  // with encrypted/hidden content, or Claude without extended-thinking),
+  // the expand affordance is misleading because there's nothing inside.
+  // Strip the chevron and the click handler so the header reads as a
+  // plain label.
+  var hasContent = !!(currentThinking.fullText && currentThinking.fullText.length > 0);
+  if (!hasContent) {
+    currentThinking.el.classList.add("empty");
+    var chev = currentThinking.el.querySelector(".thinking-chevron");
+    if (chev) chev.style.display = "none";
+    var hdr = currentThinking.el.querySelector(".thinking-header");
+    if (hdr) {
+      hdr.style.cursor = "default";
+      // Replace click listener by cloning the node (cheapest way to strip listeners).
+      var clone = hdr.cloneNode(true);
+      hdr.parentNode.replaceChild(clone, hdr);
+    }
+  }
+  // In mate mode: hide sparkle activity, show compact thinking header.
   if (currentThinking.el.classList.contains("mate-thinking")) {
     var actRow = currentThinking.el.querySelector(".mate-thinking-activity");
     if (actRow) actRow.style.display = "none";
     var header = currentThinking.el.querySelector(".thinking-header");
     if (header) {
       header.style.display = "";
-      header.style.cursor = "pointer";
+      header.style.cursor = hasContent ? "pointer" : "default";
     }
   }
   currentThinking = null;

package/lib/sdk-bridge.js

@@ -1210,21 +1210,30 @@ function createSDKBridge(opts) {
       }
     }
 
-    // Use vendor-specific model: if session vendor differs from default, use that vendor's default model
+    // Pick a model that belongs to the session's vendor. sm.currentModel is
+    // shared project-wide, so a Codex session that last set it to
+    // "gpt-5.4-mini" would otherwise leak into a Claude session in the same
+    // project (or in another session that switches vendor to claude) and
+    // Claude would reject the unknown model. We validate against the
+    // session vendor's model list regardless of which vendor happens to be
+    // the project's default adapter.
     var queryModel = ls.model || sm.currentModel || undefined;
-    if (session.vendor && session.vendor !== (adapter && adapter.vendor)) {
-      var vendorModels = (sm.modelsByVendor && sm.modelsByVendor[session.vendor]) || [];
+    var sessionVendor = session.vendor || (adapter && adapter.vendor) || null;
+    if (sessionVendor) {
+      var vendorModels = (sm.modelsByVendor && sm.modelsByVendor[sessionVendor]) || [];
       if (vendorModels.length > 0 && queryModel && vendorModels.indexOf(queryModel) === -1) {
         queryModel = vendorModels[0];
       }
     }
 
     var codexConfig = getCodexConfig(sm);
+    var mergedMcpServers = mergeMcpServers(getMcpServers(), getRemoteMcpServers) || undefined;
     var queryOpts = {
       cwd: cwd,
       model: queryModel,
       effort: ls.effort || sm.currentEffort || undefined,
-      toolServers: mergeMcpServers(getMcpServers(), getRemoteMcpServers) || undefined,
+      toolServers: mergedMcpServers,
+      toolServerDescriptors: extractMcpDescriptors(mergedMcpServers) || undefined,
       resumeSessionId: session.cliSessionId || undefined,
       abortController: linuxUser ? undefined : session.abortController,
       canUseTool: function(toolName, input, toolOpts) {
@@ -1233,6 +1242,9 @@ function createSDKBridge(opts) {
       onElicitation: function(request, elicitOpts) {
         return handleElicitation(session, request, elicitOpts);
       },
+      callMcpTool: function(serverName, toolName, args) {
+        return callMcpToolHandler(mergedMcpServers, serverName, toolName, args);
+      },
       adapterOptions: {
         CLAUDE: claudeOpts,
         CODEX: {
@@ -1443,22 +1455,14 @@ function createSDKBridge(opts) {
       }
     }
 
-    // Initialize other adapters in parallel (skip if already have models cached)
+    // Non-default adapters are NOT eagerly initialized here. Doing so used
+    // to spawn a CodexAppServer and an mcp-bridge child per project even
+    // when the user never touched that vendor. Lazy paths cover the gap:
+    //   - get_vendor_models (project.js) inits a vendor when the user
+    //     opens its model picker.
+    //   - ensureVendorReady (this file) inits a vendor when a session
+    //     actually issues a query with it.
     sm.modelsByVendor = sm.modelsByVendor || {};
-    var otherVendors = Object.keys(adapters).filter(function(v) {
-      return v !== defaultVendor && !sm.modelsByVendor[v];
-    });
-    for (var i = 0; i < otherVendors.length; i++) {
-      (function(v) {
-        adapters[v].init({ cwd: cwd, clayPort: clayPort, clayTls: clayTls, clayAuthToken: clayAuthToken, slug: slug }).then(function(r) {
-          sm.modelsByVendor[v] = r.models || [];
-          sm.capabilitiesByVendor[v] = r.capabilities || {};
-          if (r.slashCommands) sm.setSlashCommandsForVendor(v, r.slashCommands);
-        }).catch(function(e) {
-          console.error("[sdk-bridge] warmup: " + v + " init failed:", e.message || e);
-        });
-      })(otherVendors[i]);
-    }
 
     // Detect installed vendors per-user (binary existence check)
     sm.installedVendors = detectInstalledVendors(linuxUser);

package/lib/sdk-message-processor.js

@@ -370,12 +370,23 @@ function attachMessageProcessor(ctx) {
       session.sentToolResults = {};
       session.pendingPermissions = {};
       session.pendingElicitations = {};
-      // Record ask_user_answered for any leftover pending questions so replay pairs correctly
+      // Record ask_user_answered for any leftover pending questions so replay pairs correctly.
+      // EXCEPTION: "mcp" mode entries are stateless — the tool returned immediately and the
+      // turn is expected to end while the card is still awaiting the user's answer. Those
+      // entries must survive across turns so the eventual ask_user_response can inject the
+      // answer as the next user message. Only blocking modes (Claude canUseTool) get closed.
       var leftoverAskIds = Object.keys(session.pendingAskUser);
+      var keptAskUser = {};
       for (var lai = 0; lai < leftoverAskIds.length; lai++) {
-        sendAndRecord(session, { type: "ask_user_answered", toolId: leftoverAskIds[lai] });
+        var lid = leftoverAskIds[lai];
+        var lentry = session.pendingAskUser[lid];
+        if (lentry && lentry.mode === "mcp") {
+          keptAskUser[lid] = lentry;
+          continue;
+        }
+        sendAndRecord(session, { type: "ask_user_answered", toolId: lid });
       }
-      session.pendingAskUser = {};
+      session.pendingAskUser = keptAskUser;
       session.activeTaskToolIds = {};
       session.taskIdMap = {};
       // Only clear rateLimitResetsAt on genuine success (non-zero cost).

package/lib/server.js

@@ -459,75 +459,6 @@ function createServer(opts) {
       return;
     }
 
-    // --- Global MCP bridge endpoint (localhost only) ---
-    // Used by Codex mcp-bridge-server.js which can't know the active project slug.
-    // Aggregates MCP tools from all project contexts.
-    if (req.method === "POST" && fullUrl === "/api/mcp-bridge") {
-      var mcpRemoteAddr = req.socket.remoteAddress || "";
-      var mcpIsLocal = mcpRemoteAddr === "127.0.0.1" || mcpRemoteAddr === "::1" || mcpRemoteAddr === "::ffff:127.0.0.1";
-      if (!mcpIsLocal) {
-        res.writeHead(403, { "Content-Type": "application/json" });
-        res.end('{"error":"Forbidden"}');
-        return;
-      }
-      var parseJsonBody = function(r) {
-        return new Promise(function(resolve, reject) {
-          var chunks = [];
-          r.on("data", function(c) { chunks.push(c); });
-          r.on("end", function() {
-            try { resolve(JSON.parse(Buffer.concat(chunks).toString("utf8"))); }
-            catch(e) { reject(e); }
-          });
-        });
-      };
-      parseJsonBody(req).then(function(body) {
-        // Find the first project context that has a MCP bridge handler
-        var handler = null;
-        projects.forEach(function(ctx) {
-          if (handler) return;
-          if (ctx.getMcpBridgeHandler) {
-            var h = ctx.getMcpBridgeHandler();
-            if (h) handler = h;
-          }
-        });
-        if (!handler) {
-          res.writeHead(500, { "Content-Type": "application/json" });
-          res.end('{"error":"No MCP bridge handler available"}');
-          return;
-        }
-        if (body.action === "list_tools") {
-          handler.listTools().then(function(tools) {
-            var serverCounts = {};
-            for (var ti = 0; ti < tools.length; ti++) {
-              serverCounts[tools[ti].server] = (serverCounts[tools[ti].server] || 0) + 1;
-            }
-            console.log("[mcp-bridge-http] global list_tools:", tools.length, "tools -", Object.keys(serverCounts).map(function(s) { return s + "(" + serverCounts[s] + ")"; }).join(", ") || "(none)");
-            res.writeHead(200, { "Content-Type": "application/json" });
-            res.end(JSON.stringify({ tools: tools }));
-          }).catch(function(err) {
-            res.writeHead(500, { "Content-Type": "application/json" });
-            res.end(JSON.stringify({ error: err.message }));
-          });
-        } else if (body.action === "call_tool") {
-          console.log("[mcp-bridge-http] global call_tool:", body.server + "/" + body.tool);
-          handler.callTool(body.server, body.tool, body.args || {}).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 }));
-          });
-        } else {
-          res.writeHead(400, { "Content-Type": "application/json" });
-          res.end('{"error":"Unknown action"}');
-        }
-      }).catch(function() {
-        res.writeHead(400, { "Content-Type": "application/json" });
-        res.end('{"error":"Invalid JSON"}');
-      });
-      return;
-    }
-
     // --- Skills routes (delegated to server-skills) ---
     if (skills.handleRequest(req, res, fullUrl)) return;
 
@@ -1090,7 +1021,11 @@ function createServer(opts) {
       getProject: function (s) { return projects.get(s) || null; },
     });
     projects.set(slug, ctx);
-    ctx.warmup();
+    // ctx.warmup() is now deferred to the first websocket connection into
+    // this project (see project-connection.js handleConnection). Warming
+    // every project at startup spawned a CodexAppServer and an mcp-bridge
+    // child for each one, which cost 30+ processes on daemons with many
+    // projects/mates even though the user typically only opens one.
     // Schedule project registry refresh for all mates when a non-mate project is added
     if (!extra.isMate) scheduleRegistryRefresh();
     return true;
@@ -1126,8 +1061,13 @@ function createServer(opts) {
     var ctx = projects.get(slug);
     if (!ctx) return false;
     var wasMate = ctx.getStatus().isMate;
-    ctx.destroy();
+    var shutdownResult = ctx.destroy();
     projects.delete(slug);
+    if (shutdownResult && typeof shutdownResult.catch === "function") {
+      shutdownResult.catch(function(err) {
+        console.error("[server] Project destroy failed for " + slug + ":", err && err.message ? err.message : err);
+      });
+    }
     if (!wasMate) scheduleRegistryRefresh();
     return true;
   }
@@ -1289,12 +1229,26 @@ function createServer(opts) {
     });
   }
 
+  function forEachProject(fn) {
+    projects.forEach(function (ctx, slug) {
+      fn(ctx, slug);
+    });
+  }
+
   function destroyAll() {
+    var shutdowns = [];
     projects.forEach(function (ctx, slug) {
       console.log("[server] Destroying project:", slug);
-      ctx.destroy();
+      var result = ctx.destroy();
+      if (result && typeof result.then === "function") {
+        shutdowns.push(result.catch(function(err) {
+          console.error("[server] Project destroy failed for " + slug + ":", err && err.message ? err.message : err);
+          return false;
+        }));
+      }
     });
     projects.clear();
+    return Promise.all(shutdowns);
   }
 
   // --- Periodic cleanup of old chat images ---
@@ -1358,6 +1312,8 @@ function createServer(opts) {
     setRecovery: auth.setRecovery,
     clearRecovery: auth.clearRecovery,
     broadcastAll: broadcastAll,
+    forEachProject: forEachProject,
+    destroyProject: removeProject,
     destroyAll: destroyAll,
   };
 }

package/lib/sessions.js

@@ -680,35 +680,82 @@ function createSessionManager(opts) {
     var session = sessions.get(localId);
     if (!session) return { hits: [], total: 0 };
     var q = query.toLowerCase();
+    var qLen = query.length;
     var history = session.history;
     var hits = [];
-    var lastAssistantHitTurn = -1; // track current assistant turn to deduplicate delta hits
-    var currentTurnStart = -1;
+
+    // Assistant turns can consist of many streaming deltas (especially Codex,
+    // where agentMessage/delta fragments arrive in small chunks). We accumulate
+    // delta text per turn, scan for ALL occurrences of the query across the
+    // accumulated buffer, then map each occurrence back to the historyIndex of
+    // the delta that contains its starting offset. This catches multiple
+    // matches within a single turn and also matches that straddle delta
+    // boundaries.
+    var turnBuffer = "";
+    var turnSegments = []; // [{ start, end, historyIndex, ts }]
+
+    function pushScalarHits(text, historyIndex, role, ts) {
+      if (!text) return;
+      var lower = text.toLowerCase();
+      var from = 0;
+      while (true) {
+        var idx = lower.indexOf(q, from);
+        if (idx === -1) break;
+        var s = Math.max(0, idx - 15);
+        var e = Math.min(text.length, idx + qLen + 15);
+        var snippet = (s > 0 ? "\u2026" : "") + text.substring(s, e) + (e < text.length ? "\u2026" : "");
+        hits.push({ historyIndex: historyIndex, snippet: snippet, role: role, ts: ts });
+        from = idx + qLen;
+      }
+    }
+
+    function flushTurn() {
+      if (!turnBuffer || turnSegments.length === 0) {
+        turnBuffer = "";
+        turnSegments = [];
+        return;
+      }
+      var lowerBuf = turnBuffer.toLowerCase();
+      var from = 0;
+      var segCursor = 0;
+      while (true) {
+        var idx = lowerBuf.indexOf(q, from);
+        if (idx === -1) break;
+        // Advance segCursor to the segment containing idx.
+        while (segCursor < turnSegments.length - 1 && turnSegments[segCursor].end <= idx) {
+          segCursor++;
+        }
+        var seg = turnSegments[segCursor];
+        var s = Math.max(0, idx - 15);
+        var e = Math.min(turnBuffer.length, idx + qLen + 15);
+        var snippet = (s > 0 ? "\u2026" : "") + turnBuffer.substring(s, e) + (e < turnBuffer.length ? "\u2026" : "");
+        hits.push({ historyIndex: seg.historyIndex, snippet: snippet, role: "assistant", ts: seg.ts });
+        from = idx + qLen;
+      }
+      turnBuffer = "";
+      turnSegments = [];
+    }
+
     for (var i = 0; i < history.length; i++) {
       var entry = history[i];
-      if (entry.type === "user_message" || entry.type === "mention_user") {
-        currentTurnStart = i;
-        lastAssistantHitTurn = -1;
-      }
-      if ((entry.type === "delta" || entry.type === "user_message" || entry.type === "mention_user" || entry.type === "mention_response" || entry.type === "debate_turn_done" || entry.type === "debate_comment_injected") && entry.text) {
-        // Skip duplicate delta hits within the same assistant turn
-        if (entry.type === "delta" && currentTurnStart === lastAssistantHitTurn) continue;
-        var text = entry.text;
-        var lowerText = text.toLowerCase();
-        var idx = lowerText.indexOf(q);
-        if (idx === -1) continue;
-        var start = Math.max(0, idx - 15);
-        var end = Math.min(text.length, idx + query.length + 15);
-        var snippet = (start > 0 ? "\u2026" : "") + text.substring(start, end) + (end < text.length ? "\u2026" : "");
-        if (entry.type === "delta") lastAssistantHitTurn = currentTurnStart;
-        hits.push({
+      var t = entry.type;
+      if (t === "user_message" || t === "mention_user") {
+        flushTurn();
+        pushScalarHits(entry.text, i, t === "user_message" ? "user" : "assistant", entry._ts || null);
+      } else if (t === "delta" && entry.text) {
+        turnSegments.push({
+          start: turnBuffer.length,
+          end: turnBuffer.length + entry.text.length,
           historyIndex: i,
-          snippet: snippet,
-          role: entry.type === "user_message" ? "user" : "assistant",
           ts: entry._ts || null,
         });
+        turnBuffer += entry.text;
+      } else if ((t === "mention_response" || t === "debate_turn_done" || t === "debate_comment_injected") && entry.text) {
+        flushTurn();
+        pushScalarHits(entry.text, i, "assistant", entry._ts || null);
       }
     }
+    flushTurn();
     return { hits: hits, total: history.length };
   }