claude-bridge-cli 2.0.0 → 2.0.2

package/lib/bridge.js

@@ -290,15 +290,44 @@ const INTERNAL_USER_PATTERNS = [
 function extractUserText(content) {
   // Only extract type:"text" parts. tool_result records don't have a text
   // part so they return empty string and get filtered out.
-  if (typeof content === "string") return content;
-  if (Array.isArray(content)) {
+  let raw = "";
+  if (typeof content === "string") raw = content;
+  else if (Array.isArray(content)) {
     for (const part of content) {
       if (part && typeof part === "object" && part.type === "text") {
-        return part.text || "";
+        raw = part.text || "";
+        break;
       }
     }
   }
-  return "";
+  return resolveAtFileRefs(raw);
+}
+
+// When the bridge sends a multi-line prompt to claude on Windows it writes
+// the prompt to a temp file and passes "@C:\...\claude-prompt-NNN.txt" as
+// the -p arg. claude records that literal @path in the session JSONL as
+// the user message. When we read the session back we want to show the
+// actual content, not the path — otherwise history looks like a wall of
+// temp-file paths. If the file still exists on disk, inline its contents;
+// otherwise leave the @path alone so the user at least sees something.
+function resolveAtFileRefs(text) {
+  if (!text || typeof text !== "string") return text;
+  // Match a leading @<path> that points at a claude-prompt-*.txt temp file.
+  // Restrict to the temp-file pattern we generate ourselves — never inline
+  // arbitrary user-typed @file references (which are a real Claude Code
+  // feature that should remain as-is).
+  const trimmed = text.trim();
+  if (!trimmed.startsWith("@")) return text;
+  const m = trimmed.match(/^@(.+?claude-prompt-\d+-[a-z0-9]+\.txt)\s*$/i);
+  if (!m) return text;
+  const filePath = m[1];
+  try {
+    if (fs.existsSync(filePath)) {
+      const body = fs.readFileSync(filePath, "utf8");
+      if (body && body.length) return body;
+    }
+  } catch {}
+  return text;
 }
 
 function shouldSkipUserText(text) {
@@ -349,7 +378,26 @@ function getSessionMessages(sessionId) {
         }
       } catch {}
     }
-    return { session_id: sessionId, messages, in_progress: running.has(sessionId) };
+    // Match the Python bridge's shape so the app's reconnect/resume loader can
+    // detect completion. Without `status` (and end-of-turn markers on the
+    // trailing assistant), the loader never finalizes — it shows "still working"
+    // forever even though Claude is done (the stuck-loader bug on this bridge).
+    const inProgress = running.has(sessionId);
+    const last_event_ts = messages.length ? (messages[messages.length - 1].timestamp || null) : null;
+    if (!inProgress && messages.length) {
+      const last = messages[messages.length - 1];
+      if (last.role === "assistant" && last.text) {
+        last.stop_reason = "end_turn";
+        last.final_text = last.text;
+      }
+    }
+    return {
+      session_id: sessionId,
+      messages,
+      in_progress: inProgress,
+      status: inProgress ? "in_progress" : "complete",
+      last_event_ts,
+    };
   }
   return { error: "session not found" };
 }
@@ -404,7 +452,7 @@ function renameSession(sessionId, title) {
 
 // ── Run claude -p ──
 
-function askClaude(config, { prompt, session_id, images, cwd, plan_mode, allow_tools }) {
+function askClaude(config, { prompt, session_id, images, cwd, plan_mode, allow_tools, model }) {
   return new Promise((resolve) => {
     let finalPrompt = prompt;
     if (images && images.length) {
@@ -468,6 +516,8 @@ function askClaude(config, { prompt, session_id, images, cwd, plan_mode, allow_t
       }
     }
     if (plan_mode) args.push("--plan");
+    // Optional model override from the extension's model picker (alias or id).
+    if (model && String(model).trim()) args.push("--model", String(model).trim());
 
     const bin = isCmdShim ? process.env.COMSPEC || "cmd.exe" : config.claudeBin;
     const fullArgs = isCmdShim ? ["/c", config.claudeBin, ...args] : args;

package/package.json

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