claude-relay 2.1.2 → 2.2.0

package/lib/public/modules/tools.js

@@ -12,6 +12,8 @@ var planContent = null;
 // --- Todo state ---
 var todoItems = [];
 var todoWidgetEl = null;
+var todoWidgetVisible = true; // whether in-chat widget is in viewport
+var todoObserver = null;
 
 // --- Tool tracking ---
 var tools = {};
@@ -232,6 +234,14 @@ function submitAskUserAnswer(container, toolId, questions, answers, multiSelecti
   }
 }
 
+export function markAskUserAnswered(toolId) {
+  var container = document.querySelector('.ask-user-container[data-tool-id="' + toolId + '"]');
+  if (container && !container.classList.contains("answered")) {
+    container.classList.add("answered");
+    enableMainInput();
+  }
+}
+
 // --- Permission request ---
 function permissionInputSummary(toolName, input) {
   if (!input || typeof input !== "object") return "";
@@ -250,6 +260,12 @@ export function renderPermissionRequest(requestId, toolName, toolInput, decision
   ctx.finalizeAssistantBlock();
   stopThinking();
 
+  // ExitPlanMode: render as plan confirmation instead of generic permission
+  if (toolName === "ExitPlanMode") {
+    renderPlanPermission(requestId);
+    return;
+  }
+
   var container = document.createElement("div");
   container.className = "permission-container";
   container.dataset.requestId = requestId;
@@ -335,6 +351,54 @@ export function renderPermissionRequest(requestId, toolName, toolInput, decision
   ctx.scrollToBottom();
 }
 
+function renderPlanPermission(requestId) {
+  var container = document.createElement("div");
+  container.className = "permission-container plan-permission";
+  container.dataset.requestId = requestId;
+
+  // Header
+  var header = document.createElement("div");
+  header.className = "permission-header plan-permission-header";
+  header.innerHTML =
+    '<span class="permission-icon">' + iconHtml("check-circle") + '</span>' +
+    '<span class="permission-title">Plan Approval</span>';
+
+  // Body (plan content already visible above, no need to repeat)
+  var body = document.createElement("div");
+  body.className = "permission-body";
+
+  // Actions
+  var actions = document.createElement("div");
+  actions.className = "permission-actions";
+
+  var approveBtn = document.createElement("button");
+  approveBtn.className = "permission-btn permission-allow";
+  approveBtn.textContent = "Approve Plan";
+  approveBtn.addEventListener("click", function () {
+    sendPermissionResponse(container, requestId, "allow");
+  });
+
+  var rejectBtn = document.createElement("button");
+  rejectBtn.className = "permission-btn permission-deny";
+  rejectBtn.textContent = "Reject Plan";
+  rejectBtn.addEventListener("click", function () {
+    sendPermissionResponse(container, requestId, "deny");
+  });
+
+  actions.appendChild(approveBtn);
+  actions.appendChild(rejectBtn);
+
+  container.appendChild(header);
+  container.appendChild(body);
+  container.appendChild(actions);
+  ctx.addToMessages(container);
+
+  pendingPermissions[requestId] = container;
+  refreshIcons();
+  ctx.setActivity(null);
+  ctx.scrollToBottom();
+}
+
 function sendPermissionResponse(container, requestId, decision) {
   if (container.classList.contains("resolved")) return;
   container.classList.add("resolved");
@@ -439,6 +503,7 @@ export function renderPlanCard(content) {
   header.innerHTML =
     '<span class="plan-card-icon">' + iconHtml("file-text") + '</span>' +
     '<span class="plan-card-title">Implementation Plan</span>' +
+    '<button class="plan-card-copy" title="Copy plan">' + iconHtml("copy") + '</button>' +
     '<span class="plan-card-chevron">' + iconHtml("chevron-down") + '</span>';
 
   var body = document.createElement("div");
@@ -447,6 +512,21 @@ export function renderPlanCard(content) {
   highlightCodeBlocks(body);
   renderMermaidBlocks(body);
 
+  var copyBtn = header.querySelector(".plan-card-copy");
+  if (copyBtn) {
+    copyBtn.addEventListener("click", function (e) {
+      e.stopPropagation();
+      navigator.clipboard.writeText(content).then(function () {
+        copyBtn.innerHTML = iconHtml("check");
+        refreshIcons();
+        setTimeout(function () {
+          copyBtn.innerHTML = iconHtml("copy");
+          refreshIcons();
+        }, 1500);
+      });
+    });
+  }
+
   header.addEventListener("click", function () {
     el.classList.toggle("collapsed");
   });
@@ -513,6 +593,9 @@ export function handleTaskUpdate(input) {
 function renderTodoWidget() {
   if (todoItems.length === 0) {
     if (todoWidgetEl) { todoWidgetEl.remove(); todoWidgetEl = null; }
+    if (todoObserver) { todoObserver.disconnect(); todoObserver = null; }
+    todoWidgetVisible = true;
+    updateTodoSticky();
     return;
   }
 
@@ -549,11 +632,104 @@ function renderTodoWidget() {
 
   if (isNew) {
     ctx.addToMessages(todoWidgetEl);
+    setupTodoObserver();
   }
+  updateTodoSticky();
   refreshIcons();
   ctx.scrollToBottom();
 }
 
+function setupTodoObserver() {
+  if (todoObserver) { todoObserver.disconnect(); todoObserver = null; }
+  if (!todoWidgetEl) return;
+
+  var messagesEl = document.getElementById("messages");
+  if (!messagesEl) return;
+
+  todoObserver = new IntersectionObserver(function (entries) {
+    todoWidgetVisible = entries[0].isIntersecting;
+    updateTodoStickyVisibility();
+  }, { root: messagesEl, threshold: 0 });
+
+  todoObserver.observe(todoWidgetEl);
+}
+
+function updateTodoStickyVisibility() {
+  var stickyEl = document.getElementById("todo-sticky");
+  if (!stickyEl) return;
+
+  if (todoWidgetVisible) {
+    stickyEl.classList.add("hidden");
+  } else {
+    // Only show if there are active (non-completed) tasks
+    var hasActive = false;
+    for (var i = 0; i < todoItems.length; i++) {
+      if (todoItems[i].status !== "completed") { hasActive = true; break; }
+    }
+    if (hasActive) {
+      stickyEl.classList.remove("hidden");
+    }
+  }
+}
+
+function updateTodoSticky() {
+  var stickyEl = document.getElementById("todo-sticky");
+  if (!stickyEl) return;
+
+  // Hide if no active tasks (all completed or empty)
+  var hasActive = false;
+  for (var i = 0; i < todoItems.length; i++) {
+    if (todoItems[i].status !== "completed") { hasActive = true; break; }
+  }
+  if (!hasActive) {
+    stickyEl.classList.add("hidden");
+    return;
+  }
+
+  var completed = 0;
+  for (var i = 0; i < todoItems.length; i++) {
+    if (todoItems[i].status === "completed") completed++;
+  }
+  var pct = Math.round(completed / todoItems.length * 100);
+  var wasCollapsed = stickyEl.classList.contains("collapsed");
+
+  var html = '<div class="todo-sticky-inner">' +
+    '<div class="todo-sticky-header">' +
+    '<span class="todo-sticky-icon">' + iconHtml("list-checks") + '</span>' +
+    '<span class="todo-sticky-title">Tasks</span>' +
+    '<span class="todo-sticky-count">' + completed + '/' + todoItems.length + '</span>' +
+    '<span class="todo-sticky-chevron">' + iconHtml("chevron-down") + '</span>' +
+    '</div>' +
+    '<div class="todo-sticky-progress"><div class="todo-sticky-progress-bar" style="width:' + pct + '%"></div></div>' +
+    '<div class="todo-sticky-items">';
+
+  for (var i = 0; i < todoItems.length; i++) {
+    var t = todoItems[i];
+    var statusClass = t.status === "completed" ? "completed" : t.status === "in_progress" ? "in-progress" : "pending";
+    html += '<div class="todo-sticky-item ' + statusClass + '">' +
+      '<span class="todo-sticky-item-icon">' + todoStatusIcon(t.status) + '</span>' +
+      '<span class="todo-sticky-item-text">' + escapeHtml(t.status === "in_progress" && t.activeForm ? t.activeForm : t.content) + '</span>' +
+      '</div>';
+  }
+
+  html += '</div></div>';
+  stickyEl.innerHTML = html;
+
+  // Only show sticky when in-chat widget is not visible in viewport
+  if (todoWidgetVisible) {
+    stickyEl.classList.add("hidden");
+  } else {
+    stickyEl.classList.remove("hidden");
+  }
+  if (wasCollapsed) stickyEl.classList.add("collapsed");
+
+  stickyEl.querySelector(".todo-sticky-header").addEventListener("click", function () {
+    stickyEl.classList.toggle("collapsed");
+  });
+
+  refreshIcons();
+}
+
 // --- Thinking ---
 export function startThinking() {
   ctx.finalizeAssistantBlock();
@@ -640,6 +816,164 @@ export function updateToolExecuting(id, name, input) {
   ctx.scrollToBottom();
 }
 
+function buildUnifiedDiff(oldLines, newLines) {
+  var body = document.createElement("div");
+  body.className = "edit-diff-body";
+
+  var gutter = document.createElement("pre");
+  gutter.className = "edit-diff-gutter";
+
+  var content = document.createElement("pre");
+  content.className = "edit-diff-content";
+
+  var gutterLines = [];
+
+  for (var i = 0; i < oldLines.length; i++) {
+    gutterLines.push(String(i + 1));
+    var span = document.createElement("span");
+    span.className = "diff-del";
+    span.textContent = "- " + oldLines[i];
+    content.appendChild(span);
+    content.appendChild(document.createTextNode("\n"));
+  }
+  for (var i = 0; i < newLines.length; i++) {
+    gutterLines.push(String(i + 1));
+    var span = document.createElement("span");
+    span.className = "diff-add";
+    span.textContent = "+ " + newLines[i];
+    content.appendChild(span);
+    if (i < newLines.length - 1) content.appendChild(document.createTextNode("\n"));
+  }
+
+  gutter.textContent = gutterLines.join("\n");
+  body.appendChild(gutter);
+  body.appendChild(content);
+  return body;
+}
+
+function buildSplitDiff(oldLines, newLines) {
+  var body = document.createElement("div");
+  body.className = "edit-diff-body edit-diff-split";
+
+  var leftGutter = document.createElement("pre");
+  leftGutter.className = "edit-diff-gutter";
+  var leftContent = document.createElement("pre");
+  leftContent.className = "edit-diff-content edit-diff-side-old";
+  var rightGutter = document.createElement("pre");
+  rightGutter.className = "edit-diff-gutter";
+  var rightContent = document.createElement("pre");
+  rightContent.className = "edit-diff-content edit-diff-side-new";
+
+  var maxLen = Math.max(oldLines.length, newLines.length);
+  var leftNums = [];
+  var rightNums = [];
+
+  for (var i = 0; i < maxLen; i++) {
+    if (i < oldLines.length) {
+      leftNums.push(String(i + 1));
+      var span = document.createElement("span");
+      span.className = "diff-del";
+      span.textContent = oldLines[i];
+      leftContent.appendChild(span);
+    } else {
+      leftNums.push("");
+      leftContent.appendChild(document.createTextNode(""));
+    }
+    if (i < oldLines.length - 1 || (i >= oldLines.length && i < maxLen - 1)) {
+      leftContent.appendChild(document.createTextNode("\n"));
+    }
+
+    if (i < newLines.length) {
+      rightNums.push(String(i + 1));
+      var span = document.createElement("span");
+      span.className = "diff-add";
+      span.textContent = newLines[i];
+      rightContent.appendChild(span);
+    } else {
+      rightNums.push("");
+      rightContent.appendChild(document.createTextNode(""));
+    }
+    if (i < newLines.length - 1 || (i >= newLines.length && i < maxLen - 1)) {
+      rightContent.appendChild(document.createTextNode("\n"));
+    }
+  }
+
+  leftGutter.textContent = leftNums.join("\n");
+  rightGutter.textContent = rightNums.join("\n");
+
+  body.appendChild(leftGutter);
+  body.appendChild(leftContent);
+  body.appendChild(rightGutter);
+  body.appendChild(rightContent);
+  return body;
+}
+
+function renderEditDiff(oldStr, newStr, filePath) {
+  var wrapper = document.createElement("div");
+  wrapper.className = "edit-diff";
+
+  var oldLines = oldStr.split("\n");
+  var newLines = newStr.split("\n");
+
+  // Header with file path and split toggle (desktop only)
+  var header = document.createElement("div");
+  header.className = "edit-diff-header";
+
+  var pathSpan = document.createElement("span");
+  pathSpan.className = "edit-diff-path";
+  pathSpan.textContent = filePath || "";
+  header.appendChild(pathSpan);
+
+  var isMobile = "ontouchstart" in window;
+  var isSplit = false;
+
+  var unifiedBtn = document.createElement("button");
+  unifiedBtn.className = "edit-diff-toggle active";
+  unifiedBtn.innerHTML = iconHtml("list");
+  unifiedBtn.title = "Unified view";
+
+  var splitBtn = document.createElement("button");
+  splitBtn.className = "edit-diff-toggle";
+  splitBtn.innerHTML = iconHtml("columns-2");
+  splitBtn.title = "Split view";
+
+  var toggleWrap = document.createElement("span");
+  toggleWrap.className = "edit-diff-toggles";
+  if (isMobile) toggleWrap.style.display = "none";
+  toggleWrap.appendChild(unifiedBtn);
+  toggleWrap.appendChild(splitBtn);
+  header.appendChild(toggleWrap);
+
+  wrapper.appendChild(header);
+
+  var currentBody = buildUnifiedDiff(oldLines, newLines);
+  wrapper.appendChild(currentBody);
+
+  unifiedBtn.addEventListener("click", function () {
+    if (!isSplit) return;
+    isSplit = false;
+    unifiedBtn.classList.add("active");
+    splitBtn.classList.remove("active");
+    wrapper.removeChild(currentBody);
+    currentBody = buildUnifiedDiff(oldLines, newLines);
+    wrapper.appendChild(currentBody);
+    refreshIcons();
+  });
+
+  splitBtn.addEventListener("click", function () {
+    if (isSplit) return;
+    isSplit = true;
+    splitBtn.classList.add("active");
+    unifiedBtn.classList.remove("active");
+    wrapper.removeChild(currentBody);
+    currentBody = buildSplitDiff(oldLines, newLines);
+    wrapper.appendChild(currentBody);
+    refreshIcons();
+  });
+
+  return wrapper;
+}
+
 function isDiffContent(text) {
   var lines = text.split("\n");
   var diffMarkers = 0;
@@ -723,7 +1057,8 @@ export function updateToolResult(id, content, isError) {
   displayContent = displayContent.replace(/<system-reminder>[\s\S]*?<\/system-reminder>/g, "").trim();
   if (displayContent.length > 10000) displayContent = displayContent.substring(0, 10000) + "\n... (truncated)";
 
-  var expandByDefault = !isError && tool.name === "Edit" && isDiffContent(displayContent);
+  var hasEditDiff = !isError && tool.name === "Edit" && tool.input && tool.input.old_string && tool.input.new_string;
+  var expandByDefault = hasEditDiff || (!isError && tool.name === "Edit" && isDiffContent(displayContent));
   if (expandByDefault) {
     resultBlock.className = "tool-result-block";
     tool.el.classList.add("expanded");
@@ -731,7 +1066,9 @@ export function updateToolResult(id, content, isError) {
     resultBlock.className = "tool-result-block collapsed";
   }
 
-  if (!isError && isDiffContent(displayContent)) {
+  if (hasEditDiff) {
+    resultBlock.appendChild(renderEditDiff(tool.input.old_string, tool.input.new_string, tool.input.file_path));
+  } else if (!isError && isDiffContent(displayContent)) {
     resultBlock.appendChild(renderDiffPre(displayContent));
   } else if (!isError && tool.name === "Read" && tool.input && tool.input.file_path) {
     var parsed = parseLineNumberedContent(displayContent);
@@ -861,6 +1198,9 @@ export function restoreToolState(saved) {
   todoWidgetEl = saved.todoWidgetEl;
   inPlanMode = saved.inPlanMode;
   planContent = saved.planContent;
+  if (todoWidgetEl) {
+    setupTodoObserver();
+  }
 }
 
 export function resetToolState() {
@@ -870,7 +1210,11 @@ export function resetToolState() {
   planContent = null;
   todoItems = [];
   todoWidgetEl = null;
+  todoWidgetVisible = true;
+  if (todoObserver) { todoObserver.disconnect(); todoObserver = null; }
   pendingPermissions = {};
+  var stickyEl = document.getElementById("todo-sticky");
+  if (stickyEl) { stickyEl.classList.add("hidden"); stickyEl.innerHTML = ""; }
 }
 
 export function initTools(_ctx) {

package/lib/public/sw.js

@@ -32,11 +32,8 @@ self.addEventListener("push", function (event) {
   event.waitUntil(
     self.clients.matchAll({ type: "window", includeUncontrolled: true }).then(function (clientList) {
       // Skip notification if app is focused (user is already looking at it)
-      // But always show permission requests, questions, and errors regardless
-      if (data.type !== "permission_request" && data.type !== "ask_user" && data.type !== "error") {
-        for (var i = 0; i < clientList.length; i++) {
-          if (clientList[i].focused || clientList[i].visibilityState === "visible") return;
-        }
+      for (var i = 0; i < clientList.length; i++) {
+        if (clientList[i].focused || clientList[i].visibilityState === "visible") return;
       }
       return self.registration.showNotification(data.title || "Claude Relay", options);
     }).catch(function () {})

package/lib/push.js

@@ -59,6 +59,22 @@ function initPush() {
 
   save();
 
+  // Purge stale subscriptions on startup
+  var startupEndpoints = Array.from(subscriptions.keys());
+  for (var si = 0; si < startupEndpoints.length; si++) {
+    (function (ep) {
+      var sub = subscriptions.get(ep);
+      webpush.sendNotification(sub, JSON.stringify({ type: "test" }), { TTL: 0, vapidDetails: vapidDetails })
+        .then(function () {})
+        .catch(function (err) {
+          if (err.statusCode === 403 || err.statusCode === 410 || err.statusCode === 404) {
+            subscriptions.delete(ep);
+            save();
+          }
+        });
+    })(startupEndpoints[si]);
+  }
+
   function addSubscription(sub) {
     if (!sub || !sub.endpoint) return;
     // Store immediately, then validate async. Invalid subs get cleaned on first sendPush.

package/lib/sdk-bridge.js

@@ -75,7 +75,7 @@ function createSDKBridge(opts) {
       }
     }
 
-    // Cache slash_commands from CLI init message
+    // Cache slash_commands and model from CLI init message
     if (parsed.type === "system" && parsed.subtype === "init") {
       if (parsed.skills) {
         sm.skillNames = new Set(parsed.skills);
@@ -86,6 +86,10 @@ function createSDKBridge(opts) {
         });
         send({ type: "slash_commands", commands: sm.slashCommands });
       }
+      if (parsed.model) {
+        sm.currentModel = parsed.model;
+        send({ type: "model_info", model: parsed.model, models: sm.availableModels || [] });
+      }
     }
 
     if (parsed.type === "stream_event" && parsed.event) {
@@ -214,6 +218,7 @@ function createSDKBridge(opts) {
         type: "result",
         cost: parsed.total_cost_usd,
         duration: parsed.duration_ms,
+        usage: parsed.usage || null,
         sessionId: parsed.session_id,
       });
       sendAndRecord(session, { type: "done", code: 0 });
@@ -232,6 +237,14 @@ function createSDKBridge(opts) {
       session.streamedText = false;
       sm.broadcastSessionList();
 
+    } else if (parsed.type === "system" && parsed.subtype === "status") {
+      if (parsed.status === "compacting") {
+        sendAndRecord(session, { type: "compacting", active: true });
+      } else if (session.compacting) {
+        sendAndRecord(session, { type: "compacting", active: false });
+      }
+      session.compacting = parsed.status === "compacting";
+
     } else if (parsed.type && parsed.type !== "system" && parsed.type !== "user") {
     }
   }
@@ -336,13 +349,20 @@ function createSDKBridge(opts) {
   async function getOrCreateRewindQuery(session) {
     if (session.queryInstance) return { query: session.queryInstance, isTemp: false, cleanup: function() {} };
 
-    var sdk = await getSDK();
+    var sdk;
+    try {
+      sdk = await getSDK();
+    } catch (e) {
+      send({ type: "error", text: "Failed to load Claude SDK: " + (e.message || e) });
+      throw e;
+    }
     var mq = createMessageQueue();
 
     var tempQuery = sdk.query({
       prompt: mq,
       options: {
         cwd: cwd,
+        settingSources: ["user", "project", "local"],
         enableFileCheckpointing: true,
         resume: session.cliSessionId,
       },
@@ -361,7 +381,13 @@ function createSDKBridge(opts) {
   }
 
   async function startQuery(session, text, images) {
-    var sdk = await getSDK();
+    var sdk;
+    try {
+      sdk = await getSDK();
+    } catch (e) {
+      send({ type: "error", text: "Failed to load Claude SDK: " + (e.message || e) });
+      return;
+    }
 
     session.messageQueue = createMessageQueue();
     session.blocks = {};
@@ -392,6 +418,7 @@ function createSDKBridge(opts) {
 
     var queryOptions = {
       cwd: cwd,
+      settingSources: ["user", "project", "local"],
       includePartialMessages: true,
       enableFileCheckpointing: true,
       extraArgs: { "replay-user-messages": null },
@@ -480,7 +507,7 @@ function createSDKBridge(opts) {
     return text;
   }
 
-  // SDK warmup: grab slash_commands from SDK init message, then abort
+  // SDK warmup: grab slash_commands, model, and available models from SDK init
   async function warmup() {
     try {
       var sdk = await getSDK();
@@ -490,7 +517,7 @@ function createSDKBridge(opts) {
       mq.end();
       var stream = sdk.query({
         prompt: mq,
-        options: { cwd: cwd, abortController: ac },
+        options: { cwd: cwd, settingSources: ["user", "project", "local"], abortController: ac },
       });
       for await (var msg of stream) {
         if (msg.type === "system" && msg.subtype === "init") {
@@ -503,12 +530,34 @@ function createSDKBridge(opts) {
             });
             send({ type: "slash_commands", commands: sm.slashCommands });
           }
+          if (msg.model) {
+            sm.currentModel = msg.model;
+          }
+          // Fetch available models before aborting
+          try {
+            var models = await stream.supportedModels();
+            sm.availableModels = models || [];
+          } catch (e) {}
+          send({ type: "model_info", model: sm.currentModel || "", models: sm.availableModels || [] });
           ac.abort();
           break;
         }
       }
     } catch (e) {
-      // Expected: AbortError after we abort
+      if (e && e.name !== "AbortError" && !(e.message && e.message.indexOf("aborted") !== -1)) {
+        send({ type: "error", text: "Failed to load Claude SDK: " + (e.message || e) });
+      }
+    }
+  }
+
+  async function setModel(session, model) {
+    if (!session.queryInstance) return;
+    try {
+      await session.queryInstance.setModel(model);
+      sm.currentModel = model;
+      send({ type: "model_info", model: model, models: sm.availableModels || [] });
+    } catch (e) {
+      send({ type: "error", text: "Failed to switch model: " + (e.message || e) });
     }
   }
 
@@ -520,6 +569,7 @@ function createSDKBridge(opts) {
     getOrCreateRewindQuery: getOrCreateRewindQuery,
     startQuery: startQuery,
     pushMessage: pushMessage,
+    setModel: setModel,
     permissionPushTitle: permissionPushTitle,
     permissionPushBody: permissionPushBody,
     warmup: warmup,

package/lib/server.js

@@ -262,7 +262,10 @@ function createServer(opts) {
     // Global info endpoint (auth required)
     if (req.method === "GET" && req.url === "/info") {
       if (!isAuthed(req, authToken)) {
-        res.writeHead(401, { "Content-Type": "application/json" });
+        res.writeHead(401, {
+          "Content-Type": "application/json",
+          "Access-Control-Allow-Origin": "*",
+        });
         res.end('{"error":"unauthorized"}');
         return;
       }

package/lib/sessions.js

@@ -181,6 +181,8 @@ function createSessionManager(opts) {
     for (var i = fromIndex; i < total; i++) {
       send(session.history[i]);
     }
+
+    send({ type: "history_done" });
   }
 
   function switchSession(localId) {
@@ -281,6 +283,37 @@ function createSessionManager(opts) {
     activeSessionId = lastSession.localId;
   }
 
+  function searchSessions(query) {
+    if (!query) return [];
+    var q = query.toLowerCase();
+    var results = [];
+    sessions.forEach(function (session) {
+      var titleMatch = (session.title || "New Session").toLowerCase().indexOf(q) !== -1;
+      var contentMatch = false;
+      for (var i = 0; i < session.history.length; i++) {
+        var entry = session.history[i];
+        if ((entry.type === "delta" || entry.type === "user_message") && entry.text) {
+          if (entry.text.toLowerCase().indexOf(q) !== -1) {
+            contentMatch = true;
+            break;
+          }
+        }
+      }
+      if (titleMatch || contentMatch) {
+        results.push({
+          id: session.localId,
+          cliSessionId: session.cliSessionId || null,
+          title: session.title || "New Session",
+          active: session.localId === activeSessionId,
+          isProcessing: session.isProcessing,
+          lastActivity: session.lastActivity || session.createdAt || 0,
+          matchType: titleMatch && contentMatch ? "both" : titleMatch ? "title" : "content",
+        });
+      }
+    });
+    return results;
+  }
+
   return {
     get activeSessionId() { return activeSessionId; },
     get nextLocalId() { return nextLocalId; },
@@ -301,6 +334,7 @@ function createSessionManager(opts) {
     sendAndRecord: doSendAndRecord,
     findTurnBoundary: findTurnBoundary,
     replayHistory: replayHistory,
+    searchSessions: searchSessions,
   };
 }