claude-bridge-cli 2.0.19 → 2.0.21

package/lib/bridge.js

@@ -787,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) {
@@ -841,9 +842,35 @@ function askClaude(config, { prompt, session_id, images, cwd, plan_mode, allow_t
       }
     } catch {}
 
-    const bin = isCmdShim ? process.env.COMSPEC || "cmd.exe" : config.claudeBin;
-    const fullArgs = isCmdShim ? ["/c", config.claudeBin, ...args] : args;
+    // 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, ...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
+    // 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,
@@ -871,6 +898,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);
@@ -892,6 +930,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.19",
+  "version": "2.0.21",
   "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": {