claude-bridge-cli 2.0.8 → 2.0.12

package/lib/bridge.js

@@ -245,7 +245,7 @@ function looksLikeInternal(text) {
 }
 
 function parseSessionFile(filePath) {
-  let preview = "", aiTitle = "", customTitle = "", msgCount = 0, lastPrompt = "";
+  let preview = "", aiTitle = "", customTitle = "", msgCount = 0, lastPrompt = "", cwd = "";
   try {
     // For listing, read just the first 64KB and the last 64KB.
     // First chunk: get preview + ai_title from early events.
@@ -262,6 +262,11 @@ function parseSessionFile(filePath) {
         if (!line) continue;
         try {
           const obj = JSON.parse(line);
+          // The real working directory is recorded on the session's events;
+          // capture the first one. Far more accurate than decoding the project
+          // dir name (which is lossy — it can't recover ":" or distinguish a
+          // path separator from a literal "-", e.g. Windows "C:\GIT\…").
+          if (!cwd && typeof obj.cwd === "string" && obj.cwd) cwd = obj.cwd;
           if (obj.type === "summary" && obj.summary) preview = preview || obj.summary.slice(0, 200);
           if (obj.type === "user" && obj.message?.content) {
             const text = typeof obj.message.content === "string" ? obj.message.content : JSON.stringify(obj.message.content);
@@ -304,7 +309,7 @@ function parseSessionFile(filePath) {
       fs.closeSync(fd);
     }
   } catch {}
-  return { preview, ai_title: customTitle || aiTitle, message_count: msgCount, last_prompt: lastPrompt };
+  return { preview, ai_title: customTitle || aiTitle, message_count: msgCount, last_prompt: lastPrompt, cwd };
 }
 
 function projectDirToCwd(name) {
@@ -327,7 +332,7 @@ function listSessions(opts = {}) {
     const title = titleOverrides[id] || parsed.ai_title;
     sessions.push({
       id, project,
-      cwd: projectDirToCwd(project),
+      cwd: parsed.cwd || projectDirToCwd(project),
       mtime: stat.mtimeMs / 1000,
       mtime_iso: stat.mtime.toISOString(),
       preview: parsed.preview,
@@ -376,13 +381,14 @@ 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;
+    let aiTitle = "", msgCount = 0, realCwd = "";
     try {
       const lines = content.split("\n").filter(Boolean);
       msgCount = lines.length;
       for (const line of lines) {
         try {
           const obj = JSON.parse(line);
+          if (!realCwd && typeof obj.cwd === "string" && obj.cwd) realCwd = obj.cwd;
           if (obj.type === "result" && obj.result?.metadata?.title?.value) {
             aiTitle = obj.result.metadata.title.value;
           }
@@ -394,7 +400,7 @@ function searchSessions(query, limit = 30) {
 
     results.push({
       id, project,
-      cwd: projectDirToCwd(project),
+      cwd: realCwd || projectDirToCwd(project),
       mtime: stat.mtimeMs / 1000,
       mtime_iso: stat.mtime.toISOString(),
       ai_title: titleOverrides[id] || aiTitle,
@@ -620,7 +626,22 @@ function renameSession(sessionId, title) {
 
 // ── Run claude -p ──
 
-function askClaude(config, { prompt, session_id, images, cwd, plan_mode, allow_tools, model }) {
+// Injected into every turn (--append-system-prompt) so Claude never ends a turn
+// promising async follow-up it can't keep: a bridge turn is one-shot and atomic —
+// nothing re-invokes Claude after it stops, so "I'll report once the build
+// completes" is a promise that never resolves (it leaves the UI dead-ended).
+const ATOMIC_TURN_PROMPT =
+  "You are running inside a one-shot, non-interactive bridge: THIS TURN IS ATOMIC. " +
+  "It ends the moment you stop producing output, and nothing re-invokes you afterward. " +
+  "You cannot do work in the background, report back later, be re-triggered when an " +
+  "external job (build/CI/deploy/long command) finishes, or continue on your own. " +
+  "Therefore NEVER end a turn by promising future follow-up such as 'I'll report once " +
+  "it completes', 'I'll continue when CI is done', or 'waiting on X to finish'. Instead, " +
+  "run any work to completion within this turn and report the actual result now. If a " +
+  "task genuinely cannot finish in this turn, say so plainly and tell the user the exact " +
+  "command(s) to run or the next message to send to continue — do not imply you will resume.";
+
+function askClaude(config, { prompt, session_id, images, cwd, plan_mode, allow_tools, model, fork }) {
   return new Promise((resolve) => {
     let finalPrompt = prompt;
     if (images && images.length) {
@@ -654,22 +675,36 @@ function askClaude(config, { prompt, session_id, images, cwd, plan_mode, allow_t
       fs.writeFileSync(tmpFile, finalPrompt, "utf8");
     }
 
+    // Allow list — the caller (extension) can override via `allow_tools`, e.g.
+    // after the user clicks "Allow <tool>" on a permission denial, so an MCP
+    // tool (mcp__server__tool) or any other non-default tool can be granted for
+    // the session. Falls back to the default working set. Mirrors the Python
+    // bridge so both behave identically.
+    const defaultAllow = ["Read", "Write", "Edit", "Bash", "Grep", "Glob", "WebFetch", "WebSearch",
+                          "Task", "TaskCreate", "TaskList", "TaskGet", "TaskUpdate", "NotebookEdit"];
+    const allow = (Array.isArray(allow_tools) && allow_tools.length &&
+                   allow_tools.every(x => typeof x === "string")) ? allow_tools : defaultAllow;
     const settings = JSON.stringify({
       permissions: {
         defaultMode: "acceptEdits",
-        allow: ["Read", "Write", "Edit", "Bash", "Grep", "Glob", "WebFetch", "WebSearch",
-                "Task", "TaskCreate", "TaskList", "TaskGet", "TaskUpdate", "NotebookEdit"],
+        allow,
         deny: ["AskUserQuestion"],
       }
     });
     const promptArg = useTempFile ? `@${tmpFile}` : finalPrompt;
     const args = ["-p", promptArg, "--output-format", "json",
-      "--settings", settings, "--permission-mode", "acceptEdits"];
+      "--settings", settings, "--permission-mode", "acceptEdits",
+      "--append-system-prompt", ATOMIC_TURN_PROMPT];
     let resumeCwd = null;
     if (session_id) {
       const existing = scanSessionFiles().find(s => s.id === session_id);
       if (existing) {
         args.push("--resume", session_id);
+        // Fork: replay this session's history into a BRAND-NEW session id instead
+        // of appending to the original. claude returns the new id in the result,
+        // which the client adopts (leaving the original untouched). --fork-session
+        // only works alongside --resume.
+        if (fork) args.push("--fork-session");
         // Scan JSONL for the first event with a cwd field
         try {
           const lines = fs.readFileSync(existing.filePath, "utf8").split("\n");
@@ -724,12 +759,22 @@ function askClaude(config, { prompt, session_id, images, cwd, plan_mode, allow_t
           const newDir = path.join(dataDir(), "images", sid);
           try { fs.renameSync(oldDir, newDir); } catch {}
         }
+        // Surface tool-permission denials so the extension can show an "Allow
+        // <tool>" button (then resend with allow_tools including it). Without
+        // this, a tool that needs approval — notably any MCP tool, which isn't
+        // in the default allow list — silently fails with no way to grant it in
+        // headless -p mode. Mirrors the Python bridge's shape.
+        const rawDenials = Array.isArray(result.permission_denials) ? result.permission_denials : [];
+        const permission_denials = rawDenials
+          .filter(x => x && typeof x === "object")
+          .map(x => ({ tool_name: x.tool_name || "?", tool_input: x.tool_input || {} }));
         resolve({
           response: result.result || result.assistantMessage || stdout.slice(0, 5000),
           session_id: sid,
           cost_usd: result.cost_usd || null,
           duration_ms: result.duration_ms || null,
           context: result.context || null,
+          permission_denials,
         });
       } catch {
         if (stdout.trim()) {

package/package.json

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