claude-bridge-cli 2.0.20 → 2.0.22

package/lib/bridge.js

@@ -434,14 +434,59 @@ function searchSessions(query, limit = 30) {
     let content;
     try { content = fs.readFileSync(filePath, "utf8"); } catch { continue; }
 
-    const lower = content.toLowerCase();
-    const idx = lower.indexOf(q);
-    if (idx < 0) continue;
-
-    const matchCount = lower.split(q).length - 1;
-    const snippetStart = Math.max(0, idx - 40);
-    const snippetEnd = Math.min(content.length, idx + q.length + 80);
-    const snippet = content.slice(snippetStart, snippetEnd).replace(/\n/g, " ").trim();
+    // Cheap prefilter: if the raw file can't contain it, skip the parse.
+    if (!content.toLowerCase().includes(q)) continue;
+
+    // Match against CONVERSATION CONTENT, not the raw JSONL. Grepping the file
+    // as one string matched JSON keys, uuids, base64 and other machinery, and
+    // produced snippets that were a slice of raw JSON — which is why results
+    // here looked far worse than the Python bridge's. Parse each record and
+    // search: user text, assistant text, tool_use inputs, and tool_result
+    // output (an id from an email often exists ONLY in a command or its
+    // output, so tool activity must be searched — just not the plumbing).
+    let matchCount = 0, snippet = "";
+    for (const line of content.split("\n")) {
+      if (!line) continue;
+      let rec;
+      try { rec = JSON.parse(line); } catch { continue; }
+      const t = rec.type;
+      if (t !== "user" && t !== "assistant") continue;
+      const msg = rec.message || {};
+      const texts = [];
+      const c = msg.content;
+      if (typeof c === "string") texts.push(c);
+      else if (Array.isArray(c)) {
+        for (const b of c) {
+          if (!b || typeof b !== "object") continue;
+          if (b.type === "text" && typeof b.text === "string") texts.push(b.text);
+          else if (b.type === "tool_use" && b.input) {
+            try { texts.push(JSON.stringify(b.input)); } catch {}
+          } else if (b.type === "tool_result") {
+            const rc = b.content;
+            if (typeof rc === "string") texts.push(rc);
+            else if (Array.isArray(rc)) {
+              for (const rb of rc) {
+                if (rb && rb.type === "text" && typeof rb.text === "string") texts.push(rb.text);
+              }
+            }
+          }
+        }
+      }
+      for (const text of texts) {
+        if (!text) continue;
+        const tl = text.toLowerCase();
+        let from = tl.indexOf(q);
+        if (from < 0) continue;
+        while (from >= 0) { matchCount++; from = tl.indexOf(q, from + q.length); }
+        if (!snippet) {
+          const i = tl.indexOf(q);
+          const s = Math.max(0, i - 40), e = Math.min(text.length, i + q.length + 80);
+          snippet = (s > 0 ? "…" : "") + text.slice(s, e).replace(/\s+/g, " ").trim()
+                  + (e < text.length ? "…" : "");
+        }
+      }
+    }
+    if (!matchCount) continue;   // matched only machinery — not a real hit
 
     let aiTitle = "", customTitle = "", msgCount = 0, realCwd = "";
     try {
@@ -842,8 +887,26 @@ function askClaude(config, { prompt, session_id, images, cwd, plan_mode, allow_t
       }
     } catch {}
 
+    // A newline in ANY argument truncates the command line there — cmd.exe's
+    // second parse ends the command at the line break, so every argument that
+    // FOLLOWS is silently discarded. The prompt was routed through @file for
+    // exactly this reason (see the note above), but the lesson was applied to
+    // one argument instead of to the rule. 2.0.18 added the first multi-line
+    // --append-system-prompt and re-opened the hole one argument over: the
+    // trailing --add-dir / --resume / --model were dropped, so on Windows
+    // every "resume" silently began a NEW session, on the default model, with
+    // no error to explain it. Newlines are not meaningful in any value we
+    // pass, so flatten them for cmd-shim spawns and close the whole class.
+    const flattenForCmd = (a) =>
+      typeof a === "string" ? a.replace(/\r\n|\r|\n/g, " ") : a;
+    const shellSafeArgs = isCmdShim ? args.map(flattenForCmd) : args;
+    if (isCmdShim && process.env.CLAUDE_BRIDGE_DEBUG) {
+      const n = args.filter((a, i) => a !== shellSafeArgs[i]).length;
+      if (n) console.error("[bridge] flattened newlines in %d arg(s) for cmd.exe", n);
+    }
+
     const bin = isCmdShim ? process.env.COMSPEC || "cmd.exe" : config.claudeBin;
-    const fullArgs = isCmdShim ? ["/c", config.claudeBin, ...args] : args;
+    const fullArgs = isCmdShim ? ["/c", config.claudeBin, ...shellSafeArgs] : args;
 
     // Opt-in spawn tracing (CLAUDE_BRIDGE_DEBUG=1). Nothing recorded WHAT the
     // bridge actually ran, so when a turn misbehaved there was no evidence to

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-bridge-cli",
-  "version": "2.0.20",
+  "version": "2.0.22",
   "description": "Use Claude Code from your browser. Runs a local server that connects your browser tools to the Claude CLI.",
   "main": "lib/bridge.js",
   "bin": {