claude-bridge-cli 2.0.18 → 2.0.20

package/lib/bridge.js

@@ -443,7 +443,7 @@ function searchSessions(query, limit = 30) {
     const snippetEnd = Math.min(content.length, idx + q.length + 80);
     const snippet = content.slice(snippetStart, snippetEnd).replace(/\n/g, " ").trim();
 
-    let aiTitle = "", msgCount = 0, realCwd = "";
+    let aiTitle = "", customTitle = "", msgCount = 0, realCwd = "";
     try {
       const lines = content.split("\n").filter(Boolean);
       msgCount = lines.length;
@@ -454,11 +454,18 @@ function searchSessions(query, limit = 30) {
           if (obj.type === "result" && obj.result?.metadata?.title?.value) {
             aiTitle = obj.result.metadata.title.value;
           }
-          if (obj.type === "ai-title" && obj.title) aiTitle = obj.title;
-          if (obj.type === "custom-title" && obj.title) aiTitle = obj.title;
+          // The records carry `aiTitle` / `customTitle` — NOT `title`. Reading
+          // obj.title (as this did) matched nothing, so every search result
+          // rendered untitled and renames were invisible here even though the
+          // session LIST resolved them correctly. Track the two separately:
+          // a user rename must WIN, because the CLI re-appends its ai-title
+          // after every turn and last-record-wins would revert it.
+          if (obj.type === "ai-title") aiTitle = obj.aiTitle || obj.title || aiTitle;
+          if (obj.type === "custom-title") customTitle = obj.customTitle || obj.title || customTitle;
         } catch {}
       }
     } catch {}
+    aiTitle = customTitle || aiTitle;
 
     results.push({
       id, project,
@@ -780,6 +787,7 @@ function askClaude(config, { prompt, session_id, images, cwd, plan_mode, allow_t
       // anything INTO the Files drawer it's now told about.
       "--add-dir", path.join(dataDir(), "images")];
     let resumeCwd = null;
+    let divergedFrom = null;   // set if the CLI answers under a different session
     if (session_id) {
       const existing = scanSessionFiles().find(s => s.id === session_id);
       if (existing) {
@@ -837,6 +845,14 @@ function askClaude(config, { prompt, session_id, images, cwd, plan_mode, allow_t
     const bin = isCmdShim ? process.env.COMSPEC || "cmd.exe" : config.claudeBin;
     const fullArgs = isCmdShim ? ["/c", config.claudeBin, ...args] : 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
+    // separate "we built the wrong command" from "the CLI ignored it" — a
+    // resume regression took hours to narrow with no way to see the argv.
+    if (process.env.CLAUDE_BRIDGE_DEBUG) {
+      console.error("[bridge] spawn bin=%s cwd=%s args=%s",
+        bin, effCwd, JSON.stringify(fullArgs));
+    }
     const proc = spawn(bin, fullArgs, {
       cwd: effCwd,
       timeout: config.timeout,
@@ -864,6 +880,17 @@ function askClaude(config, { prompt, session_id, images, cwd, plan_mode, allow_t
         const finalText = result.result || result.assistantMessage || "";
         writeCompletionMarker(sid, finalText);
         if (session_id && session_id !== sid) writeCompletionMarker(session_id, finalText);
+        // The CLI answered under a DIFFERENT session than we asked to resume:
+        // the turn's history is not where the user is looking, and the session
+        // they see can never update again. This was handled silently, so the
+        // symptom reaching the user was "Claude keeps repeating its last reply"
+        // with nothing anywhere to explain it. Never swallow it again — log it,
+        // and hand it to the client so the UI can say so.
+        if (session_id && session_id !== sid) {
+          console.error("[bridge] WARNING resume diverged: asked=%s answered=%s "
+            + "(the turn was written to a different session)", session_id, sid);
+          divergedFrom = session_id;
+        }
         if (images && images.length && session_id === "pending" && sid !== "pending") {
           const oldDir = path.join(dataDir(), "images", "pending");
           const newDir = path.join(dataDir(), "images", sid);
@@ -885,6 +912,10 @@ function askClaude(config, { prompt, session_id, images, cwd, plan_mode, allow_t
           duration_ms: result.duration_ms || null,
           context: result.context || null,
           permission_denials,
+          // Non-null when the CLI answered under a different session than the
+          // one we asked to resume. The client shows the conversation it is
+          // displaying will not receive this turn, and where the turn went.
+          resume_diverged_from: divergedFrom,
         });
       } catch {
         if (stdout.trim()) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-bridge-cli",
-  "version": "2.0.18",
+  "version": "2.0.20",
   "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": {