@chatpanel/bridge 0.10.1 → 0.10.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chatpanel/bridge",
-  "version": "0.10.1",
+  "version": "0.10.3",
   "type": "module",
   "description": "Local bridge that exposes the AI coding agents installed on your machine — Claude Code (CLI), Codex (CLI), and Gemini CLI — to the ChatPanel Chrome extension over a localhost SSE endpoint. Bring your own agent.",
   "keywords": [

package/src/engines/antigravity.js

@@ -15,6 +15,7 @@ import { mkdirSync, writeFileSync, unlinkSync } from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
 import { findAgentBin } from '../env.js';
+import { buildCliPrompt } from './prompt.js';
 
 const IDLE_MS = Number(process.env.CHATPANEL_AGY_TIMEOUT_MS) || 180_000;
 const SCRATCH = path.join(os.tmpdir(), 'chatpanel-agy-scratch');
@@ -77,20 +78,6 @@ function writeImages(images, dir) {
   return files;
 }
 
-// The bridge is stateless, so replay the conversation as a single prompt.
-function buildPrompt(messages, system) {
-  let p = system ? `${system}\n\n` : '';
-  const history = messages.slice(0, -1);
-  const last = messages[messages.length - 1];
-  if (history.length) {
-    p += 'Conversation so far:\n';
-    for (const m of history) p += `${m.role === 'user' ? 'User' : 'Assistant'}: ${m.content}\n\n`;
-    p += '---\n\n';
-  }
-  p += last ? last.content : '';
-  return p;
-}
-
 export async function chat({ messages, system, options, images }, emit) {
   try {
     mkdirSync(SCRATCH, { recursive: true });
@@ -104,7 +91,7 @@ export async function chat({ messages, system, options, images }, emit) {
   // read-tool approval is needed in headless `-p` mode. (Confirmed working.)
   const imageFiles = writeImages(images, cwd);
   const cleanup = () => imageFiles.forEach((f) => { try { unlinkSync(f); } catch { /* gone */ } });
-  let prompt = buildPrompt(messages, system);
+  let prompt = buildCliPrompt(messages, system);
   if (imageFiles.length) {
     prompt += `\n\nThe user attached image(s): ${imageFiles.map((f) => '@' + path.basename(f)).join(' ')}`;
   }

package/src/engines/claude.js

@@ -17,7 +17,8 @@ import { spawn } from 'node:child_process';
 import { writeFile, unlink } from 'node:fs/promises';
 import os from 'node:os';
 import path from 'node:path';
-import { resolveClaude, buildSpawnSpec, isCompiledBinary } from '../env.js';
+import { resolveClaude, buildSpawnSpec, isCompiledBinary, selfMcpStdio } from '../env.js';
+import { buildCliPrompt } from './prompt.js';
 
 // Write base64 data-URL images to temp files. Claude Code reads them with its
 // Read tool (which feeds images to the model as vision), so we just reference the
@@ -79,18 +80,16 @@ export async function listModels() {
   return ['opus', 'sonnet', 'haiku'];
 }
 
-// The bridge is stateless, so we replay the conversation as a single prompt.
-function buildPrompt(messages) {
-  const history = messages.slice(0, -1);
-  const last = messages[messages.length - 1];
-  let prompt = '';
-  if (history.length) {
-    prompt += 'Conversation so far:\n';
-    for (const m of history) prompt += `${m.role === 'user' ? 'User' : 'Assistant'}: ${m.content}\n\n`;
-    prompt += '---\n\n';
-  }
-  prompt += last ? last.content : '';
-  return prompt;
+export function claudeMcpConfig(mcp) {
+  if (!mcp?.url || !Array.isArray(mcp.specs) || !mcp.specs.length) return null;
+  const serverName = mcp.serverName || 'chatpanel_browser';
+  const { command, args } = selfMcpStdio(mcp.url);
+  const toolNames = [...new Set(mcp.specs.map((s) => s?.name).filter(Boolean))];
+  return {
+    serverName,
+    config: { mcpServers: { [serverName]: { command, args } } },
+    allowedTools: toolNames.map((name) => `mcp__${serverName}__${name}`),
+  };
 }
 
 // Spawn claude (however it resolves) and stream its stream-json output via
@@ -198,19 +197,20 @@ export async function chat({ messages, system, options, images }, emit) {
   const tag = `${Date.now()}-${Math.random().toString(36).slice(2)}`;
   const args = ['--print', '--output-format', 'stream-json', '--include-partial-messages', '--verbose'];
 
-  // Browser-tools relay: ChatPanel hands this CLI the page-action tools over an
-  // HTTP MCP server the bridge hosts (which relays each call to the extension).
+  // Browser-tools relay: ChatPanel hands this CLI the page-action tools through
+  // the bridge's stdio MCP proxy, which forwards each call to the per-chat HTTP
+  // MCP session and then to the extension.
   // options.mcp = { url, serverName, specs }. We pre-allow the tools so a headless
   // run doesn't block on approval, and merge alongside the user's own MCP servers.
   const mcpFiles = [];
   const mcpAllow = [];
-  if (options.mcp?.url && Array.isArray(options.mcp.specs) && options.mcp.specs.length) {
-    const serverName = options.mcp.serverName || 'chatpanel_browser';
+  const mcpConfig = claudeMcpConfig(options.mcp);
+  if (mcpConfig) {
     const cfgFile = path.join(os.tmpdir(), `chatpanel-mcp-${tag}.json`);
-    await writeFile(cfgFile, JSON.stringify({ mcpServers: { [serverName]: { type: 'http', url: options.mcp.url } } }));
+    await writeFile(cfgFile, JSON.stringify(mcpConfig.config));
     mcpFiles.push(cfgFile);
     args.push('--mcp-config', cfgFile);
-    for (const s of options.mcp.specs) mcpAllow.push(`mcp__${serverName}__${s.name}`);
+    mcpAllow.push(...mcpConfig.allowedTools);
   }
 
   // Gate writes/shell behind the chosen mode; otherwise restrict to read-only
@@ -237,7 +237,7 @@ export async function chat({ messages, system, options, images }, emit) {
     imageFiles.forEach((f) => unlink(f).catch(() => {}));
     mcpFiles.forEach((f) => unlink(f).catch(() => {}));
   };
-  let prompt = buildPrompt(messages);
+  let prompt = buildCliPrompt(messages);
   if (imageFiles.length) {
     prompt += `\n\nThe user attached ${imageFiles.length} image file(s). Use the Read tool to view ${
       imageFiles.length === 1 ? 'it' : 'them'
@@ -323,7 +323,7 @@ async function sdkChat({ messages, system, options }, emit) {
   let streamedAny = false;
   let resultText = '';
   const iterator = query({
-    prompt: buildPrompt(messages),
+    prompt: buildCliPrompt(messages),
     options: {
       cwd,
       permissionMode,

package/src/engines/codex.js

@@ -20,6 +20,7 @@ import { existsSync, mkdirSync, symlinkSync, readFileSync } from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
 import { findAgentBin, selfMcpStdio } from '../env.js';
+import { buildCliPrompt } from './prompt.js';
 
 // Idle timeout: re-armed on every stdout/stderr chunk, so a long run that keeps
 // streaming never trips it — only true silence does. Override with
@@ -97,19 +98,6 @@ export async function available() {
     : { ok: false, reason: 'codex not found on PATH. Install it and run `codex login`.' };
 }
 
-function buildPrompt(messages, system) {
-  let p = system ? `${system}\n\n` : '';
-  const history = messages.slice(0, -1);
-  const last = messages[messages.length - 1];
-  if (history.length) {
-    p += 'Conversation so far:\n';
-    for (const m of history) p += `${m.role === 'user' ? 'User' : 'Assistant'}: ${m.content}\n\n`;
-    p += '---\n\n';
-  }
-  p += last ? last.content : '';
-  return p;
-}
-
 export function codexMcpConfigArgs(mcp) {
   if (!mcp?.url) return [];
   const name = mcp.serverName || 'chatpanel_browser';
@@ -247,7 +235,7 @@ export async function chat({ messages, system, options, images }, emit) {
       }
     });
 
-    child.stdin.write(buildPrompt(messages, system));
+    child.stdin.write(buildCliPrompt(messages, system));
     child.stdin.end();
   });
 }

package/src/engines/custom.js

@@ -22,6 +22,7 @@ import path from 'node:path';
 import { resolveCommand, buildSpawnSpec, selfMcpStdio } from '../env.js';
 import { isProEntitled } from '../entitlement.js';
 import { handleMessage } from './claude.js';
+import { buildCliPrompt } from './prompt.js';
 
 // Write base64 data-URL images to temp files so a custom CLI can take them via
 // its configured `imageArg` template (e.g. "-i {path}", "@{path}"). Returns paths.
@@ -125,20 +126,6 @@ export async function listSpecModels(command, listModelsArgs, workingDir) {
   return parseModelList(stdout);
 }
 
-// The bridge is stateless, so replay the conversation as a single prompt.
-function buildPrompt(messages, system) {
-  let p = system ? `${system}\n\n` : '';
-  const history = messages.slice(0, -1);
-  const last = messages[messages.length - 1];
-  if (history.length) {
-    p += 'Conversation so far:\n';
-    for (const m of history) p += `${m.role === 'user' ? 'User' : 'Assistant'}: ${m.content}\n\n`;
-    p += '---\n\n';
-  }
-  p += last ? last.content : '';
-  return p;
-}
-
 function mcpToolSpecs(mcp) {
   return (mcp?.specs || []).filter((s) => s?.name);
 }
@@ -272,7 +259,7 @@ export async function runSpec(spec, { messages, system, options = {}, images },
     throw new Error(`Couldn't find "${spec.command}". Enter its full path, or install it on your PATH (or in WSL).`);
   }
 
-  const prompt = buildPrompt(messages, system);
+  const prompt = buildCliPrompt(messages, system);
   let cwd = options.workingDir ? path.resolve(options.workingDir) : null;
   const label = spec.label || spec.command;
   const fmt = ['claude-stream-json', 'opencode-json'].includes(spec.format) ? spec.format : 'text';

package/src/engines/prompt.js

@@ -0,0 +1,28 @@
+function roleLabel(role) {
+  return role === 'assistant' ? 'Assistant' : 'User';
+}
+
+export function buildCliPrompt(messages = [], system = '') {
+  const cleanSystem = String(system || '').trim();
+  const list = Array.isArray(messages) ? messages : [];
+  const history = list.slice(0, -1);
+  const current = list[list.length - 1];
+  const parts = [];
+
+  if (cleanSystem) parts.push(cleanSystem);
+
+  if (history.length) {
+    const transcript = history
+      .map((m) => `${roleLabel(m.role)}: ${String(m.content || '').trim()}`)
+      .join('\n\n');
+    parts.push(`Conversation history (context only; do not answer these prior turns):\n${transcript}`);
+  }
+
+  if (current) {
+    parts.push(
+      `Current ${roleLabel(current.role).toLowerCase()} message (answer this message now; use the history above only as context):\n${String(current.content || '').trim()}`,
+    );
+  }
+
+  return parts.join('\n\n---\n\n');
+}

package/src/server.js

@@ -30,7 +30,7 @@ import { callLocalMcp } from './mcp-local.js';
 // Hardcoded (not read from package.json) so it survives Bun's single-file
 // --compile, where package.json isn't on a readable FS. CI fails the publish if
 // this drifts from package.json, so the two can't silently diverge.
-const VERSION = '0.10.1';
+const VERSION = '0.10.3';
 const HOST = process.env.CHATPANEL_BRIDGE_HOST || '127.0.0.1';
 const PORT = Number(process.env.CHATPANEL_BRIDGE_PORT) || 4319;