@chatpanel/bridge 0.9.0 → 0.10.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chatpanel/bridge",
-  "version": "0.9.0",
+  "version": "0.10.1",
   "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": [
@@ -34,6 +34,7 @@
   "scripts": {
     "start": "node src/server.js",
     "dev": "node --watch src/server.js",
+    "test": "node --test tests/*.test.mjs",
     "build:bin": "bash scripts/build-binaries.sh"
   },
   "dependencies": {},

package/src/engines/cli-agents.js

@@ -45,6 +45,7 @@ export const pi = makeCliAgent(
     promptVia: 'arg',
     modelArg: '--model {model}',
     imageArg: '@{path}',
+    toolAdapter: 'pi-extension',
     listModelsArgs: '--list-models',
     label: 'Pi',
   },
@@ -54,10 +55,18 @@ export const pi = makeCliAgent(
 export const opencode = makeCliAgent(
   'opencode',
   {
-    args: 'run',
+    // `--format json` → clean NDJSON events (the default emits a TUI that's
+    // garbage when piped). --dangerously-skip-permissions so headless tool use
+    // (incl. our relayed browser tools) doesn't block on an approval prompt.
+    args: 'run --format json --dangerously-skip-permissions',
     promptVia: 'arg',
     modelArg: '-m {model}',
     imageArg: '-f {path}',
+    format: 'opencode-json',
+    // Browser tools come via the bridge's STABLE /mcp endpoint, registered once
+    // with `opencode mcp add chatpanel --url http://127.0.0.1:4319/mcp` (opencode
+    // only loads MCP from its global config, not a per-run file).
+    requiresStableMcp: true,
     listModelsArgs: 'models',
     label: 'OpenCode',
   },

package/src/engines/codex.js

@@ -110,6 +110,29 @@ function buildPrompt(messages, system) {
   return p;
 }
 
+export function codexMcpConfigArgs(mcp) {
+  if (!mcp?.url) return [];
+  const name = mcp.serverName || 'chatpanel_browser';
+  const { command, args: pargs } = selfMcpStdio(mcp.url);
+  const args = [
+    '-c',
+    `mcp_servers.${name}.command=${JSON.stringify(command)}`,
+    '-c',
+    `mcp_servers.${name}.args=${JSON.stringify(pargs)}`,
+    '-c',
+    `mcp_servers.${name}.default_tools_approval_mode="approve"`,
+    '-c',
+    `mcp_servers.${name}.startup_timeout_sec=30`,
+    '-c',
+    `mcp_servers.${name}.tool_timeout_sec=120`,
+  ];
+  const toolNames = [...new Set((mcp.specs || []).map((s) => s?.name).filter(Boolean))];
+  if (toolNames.length) {
+    args.push('-c', `mcp_servers.${name}.enabled_tools=${JSON.stringify(toolNames)}`);
+  }
+  return args;
+}
+
 // Write base64 data-URL images to temp files so `codex exec -i <file>` can
 // attach them to the prompt as vision input. Returns the paths (caller cleans up).
 async function writeImages(images, tag) {
@@ -149,12 +172,7 @@ export async function chat({ messages, system, options, images }, emit) {
   // Browser tools: register the bridge's MCP server as a stdio MCP server (the
   // bridge binary in --mcp-stdio mode), so Codex can call our page-action tools.
   // `-c key=value` parses value as TOML; JSON.stringify yields valid TOML here.
-  if (options.mcp?.url) {
-    const name = options.mcp.serverName || 'chatpanel_browser';
-    const { command, args: pargs } = selfMcpStdio(options.mcp.url);
-    args.push('-c', `mcp_servers.${name}.command=${JSON.stringify(command)}`);
-    args.push('-c', `mcp_servers.${name}.args=${JSON.stringify(pargs)}`);
-  }
+  args.push(...codexMcpConfigArgs(options.mcp));
   if (options.model) args.push('-m', options.model);
   if (options.extraArgs) args.push(...String(options.extraArgs).split(/\s+/).filter(Boolean));
   for (const f of imageFiles) args.push('-i', f); // attach images to the initial prompt

package/src/engines/custom.js

@@ -16,7 +16,7 @@
 //                      speak it), reusing the Claude engine's parser.
 
 import { spawn } from 'node:child_process';
-import { writeFile, unlink } from 'node:fs/promises';
+import { readFile, writeFile, unlink } from 'node:fs/promises';
 import os from 'node:os';
 import path from 'node:path';
 import { resolveCommand, buildSpawnSpec, selfMcpStdio } from '../env.js';
@@ -64,6 +64,7 @@ const IDLE_MS = Number(process.env.CHATPANEL_CUSTOM_TIMEOUT_MS) || 180_000;
 // also set NO_COLOR on the child env, but this is the robust backstop.)
 const ANSI_RE = /\u001b\[[0-9;?]*[ -/]*[@-~]/g;
 const stripAnsi = (s) => s.replace(ANSI_RE, '');
+const OPENCODE_STABLE_MCP_URL = 'http://127.0.0.1:4319/mcp';
 
 export async function available() {
   // The engine ships in every bridge; individual custom agents are user-defined
@@ -138,6 +139,120 @@ function buildPrompt(messages, system) {
   return p;
 }
 
+function mcpToolSpecs(mcp) {
+  return (mcp?.specs || []).filter((s) => s?.name);
+}
+
+function jsIdentifier(name, index) {
+  const id = String(name).replace(/[^A-Za-z0-9_$]/g, '_');
+  return /^[A-Za-z_$]/.test(id) ? id : `tool_${index}_${id}`;
+}
+
+export function piToolArgs(extensionFile, mcp) {
+  return ['--extension', extensionFile];
+}
+
+export function buildPiExtensionSource(mcp) {
+  const specs = mcpToolSpecs(mcp);
+  const declarations = specs.map((spec, index) => {
+    const id = jsIdentifier(spec.name, index);
+    const schema = spec.parameters || { type: 'object', properties: {} };
+    return `const ${id}Tool = {
+  name: ${JSON.stringify(spec.name)},
+  label: ${JSON.stringify(spec.name)},
+  description: ${JSON.stringify(spec.description || spec.name)},
+  parameters: ${JSON.stringify(schema)},
+  async execute(toolCallId, params, signal) {
+    return callMcpTool(${JSON.stringify(spec.name)}, toolCallId, params, signal);
+  },
+};`;
+  }).join('\n\n');
+  const registrations = specs.map((spec, index) => {
+    const id = jsIdentifier(spec.name, index);
+    return `  pi.registerTool(${id}Tool);`;
+  }).join('\n');
+
+  return `import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+
+const MCP_URL = ${JSON.stringify(mcp.url)};
+
+function contentFromDataUrl(dataUrl) {
+  const match = /^data:([^;]+);base64,(.+)$/s.exec(String(dataUrl || ""));
+  return match ? { type: "image", data: match[2], mimeType: match[1] } : null;
+}
+
+function normalizeContent(content) {
+  const out = [];
+  for (const item of Array.isArray(content) ? content : []) {
+    if (item?.type === "text") {
+      out.push({ type: "text", text: String(item.text ?? "") });
+    } else if (item?.type === "image" && item.data) {
+      out.push({ type: "image", data: String(item.data), mimeType: String(item.mimeType || "image/png") });
+    } else if (typeof item?.image === "string") {
+      const img = contentFromDataUrl(item.image);
+      if (img) out.push(img);
+      if (item.text) out.push({ type: "text", text: String(item.text) });
+    }
+  }
+  return out.length ? out : [{ type: "text", text: "ok" }];
+}
+
+async function callMcpTool(toolName, toolCallId, params, signal) {
+  const response = await fetch(MCP_URL, {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify({
+      jsonrpc: "2.0",
+      id: toolCallId || String(Date.now()),
+      method: "tools/call",
+      params: { name: toolName, arguments: params || {} },
+    }),
+    signal,
+  });
+  const message = await response.json();
+  if (message.error) {
+    return {
+      content: [{ type: "text", text: \`error: \${message.error.message || JSON.stringify(message.error)}\` }],
+      details: { error: message.error },
+    };
+  }
+  return {
+    content: normalizeContent(message.result?.content),
+    details: message.result ?? {},
+  };
+}
+
+${declarations}
+
+export default function (pi: ExtensionAPI) {
+${registrations}
+}
+`;
+}
+
+async function writePiExtension(mcp, tag) {
+  const file = path.join(os.tmpdir(), `chatpanel-pi-tools-${tag}.ts`);
+  await writeFile(file, buildPiExtensionSource(mcp));
+  return file;
+}
+
+async function opencodeHasStableMcpConfig() {
+  const configHome = process.env.XDG_CONFIG_HOME || path.join(os.homedir(), '.config');
+  const files = [
+    path.join(configHome, 'opencode', 'opencode.jsonc'),
+    path.join(os.homedir(), 'Library', 'Application Support', 'opencode', 'opencode.jsonc'),
+  ];
+  for (const file of files) {
+    try {
+      const text = await readFile(file, 'utf8');
+      if (text.includes(OPENCODE_STABLE_MCP_URL)) return true;
+    } catch {
+      /* missing config is fine */
+    }
+  }
+  return false;
+}
+
 export async function chat({ messages, system, options, images }, emit) {
   // Pro gate — verified, not just UI. No valid signed entitlement → no run.
   if (!(await isProEntitled(options.entitlement))) {
@@ -158,9 +273,9 @@ export async function runSpec(spec, { messages, system, options = {}, images },
   }
 
   const prompt = buildPrompt(messages, system);
-  const cwd = options.workingDir ? path.resolve(options.workingDir) : null;
+  let cwd = options.workingDir ? path.resolve(options.workingDir) : null;
   const label = spec.label || spec.command;
-  const fmt = spec.format === 'claude-stream-json' ? 'claude-stream-json' : 'text';
+  const fmt = ['claude-stream-json', 'opencode-json'].includes(spec.format) ? spec.format : 'text';
 
   // Args: either a real array or a space-split string. With promptVia:'arg' we
   // substitute {prompt} (or append it if there's no placeholder); otherwise the
@@ -184,7 +299,10 @@ export async function runSpec(spec, { messages, system, options = {}, images },
     const injected = tmpl.includes('{model}')
       ? tmpl.replaceAll('{model}', options.model).split(/\s+/).filter(Boolean)
       : [...tmpl.split(/\s+/).filter(Boolean), options.model];
-    args = [...injected, ...args];
+    // APPEND (not prepend): subcommand CLIs (opencode `run`, kiro `chat`) must
+    // keep the subcommand first — `opencode -m X run` makes `run` look like a
+    // project path, so it never loads opencode.json / its MCP servers.
+    args = [...args, ...injected];
   }
   // Images: write to temp files, expand the agent's imageArg template, then place
   // the tokens. An explicit {images} placeholder in args wins; otherwise they go
@@ -198,7 +316,11 @@ export async function runSpec(spec, { messages, system, options = {}, images },
   // config file (spec.mcpArg, e.g. "--mcp-config {file}"), write a standard
   // mcpServers JSON pointing at the bridge's stdio MCP proxy and inject the flag.
   // Covers any CLI that reads the de-facto {mcpServers:{name:{command,args}}} shape.
-  if (options.mcp?.url && spec.mcpArg) {
+  if (options.mcp?.url && spec.toolAdapter === 'pi-extension') {
+    const extensionFile = await writePiExtension(options.mcp, tag);
+    mcpFiles.push(extensionFile);
+    args = [...piToolArgs(extensionFile, options.mcp), ...args];
+  } else if (options.mcp?.url && spec.mcpArg) {
     const name = options.mcp.serverName || 'chatpanel_browser';
     const { command, args: pargs } = selfMcpStdio(options.mcp.url);
     const cfgFile = path.join(os.tmpdir(), `chatpanel-mcp-${tag}.json`);
@@ -210,6 +332,16 @@ export async function runSpec(spec, { messages, system, options = {}, images },
       : [...tmpl.split(/\s+/).filter(Boolean), cfgFile];
     args = [...tokens, ...args];
   }
+  // NOTE: opencode only loads MCP from its GLOBAL config (~/.config/opencode),
+  // never a per-run/project file — so we can't inject it here. opencode reaches
+  // the browser tools via the bridge's STABLE /mcp endpoint, registered once with
+  // `opencode mcp add chatpanel --url http://127.0.0.1:4319/mcp`.
+  if (options.mcp?.url && spec.requiresStableMcp && !(await opencodeHasStableMcpConfig())) {
+    emit({
+      type: 'status',
+      text: `OpenCode needs one-time browser-tool setup: opencode mcp add chatpanel --url ${OPENCODE_STABLE_MCP_URL}`,
+    });
+  }
 
   const imageTokens = imageTokensFor(spec.imageArg, imageFiles);
   let placedImages = false;
@@ -289,6 +421,28 @@ export async function runSpec(spec, { messages, system, options = {}, images },
           if (r.streamed) streamedAny = true;
           if (r.result != null) resultText = r.result;
         }
+      } else if (fmt === 'opencode-json') {
+        // opencode `run --format json` emits newline-delimited events: text parts,
+        // tool/tool_use, and errors. Extract the answer text + surface tools/errors.
+        jsonBuf += s;
+        let nl;
+        while ((nl = jsonBuf.indexOf('\n')) >= 0) {
+          const line = jsonBuf.slice(0, nl).trim();
+          jsonBuf = jsonBuf.slice(nl + 1);
+          if (!line.startsWith('{')) continue;
+          let ev;
+          try { ev = JSON.parse(line); } catch { continue; }
+          if (ev.type === 'text' && ev.part?.text) {
+            streamedAny = true;
+            emit({ type: 'delta', text: ev.part.text });
+          } else if (ev.type === 'tool' || ev.type === 'tool_use') {
+            const p = ev.part || {};
+            emit({ type: 'tool', name: p.tool || p.name || p.type || 'tool', summary: '' });
+          } else if (ev.type === 'error') {
+            const msg = ev.error?.data?.message || ev.error?.message || ev.error?.name || 'error';
+            emit({ type: 'status', text: String(msg).slice(0, 300) });
+          }
+        }
       } else {
         streamedAny = true;
         emit({ type: 'delta', text: stripAnsi(s) });

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.9.0';
+const VERSION = '0.10.1';
 const HOST = process.env.CHATPANEL_BRIDGE_HOST || '127.0.0.1';
 const PORT = Number(process.env.CHATPANEL_BRIDGE_PORT) || 4319;
 
@@ -55,11 +55,13 @@ const ENGINES = {
 // result POSTed back to /tool-result. The bridge itself never touches the page.
 // --------------------------------------------------------------------------
 const sessions = new Map(); // sessionId -> { id, emit, specs, pending: Map, nextId }
+let latestSessionId = null; // for the stable /mcp endpoint (CLIs configured once)
 
 function createSession(emit, specs) {
   const id = randomUUID();
   const s = { id, emit, specs, pending: new Map(), nextId: 0 };
   sessions.set(id, s);
+  latestSessionId = id;
   return s;
 }
 
@@ -68,6 +70,17 @@ function deleteSession(id) {
   if (!s) return;
   for (const p of s.pending.values()) p.reject(new Error('chat ended'));
   sessions.delete(id);
+  if (latestSessionId === id) {
+    // fall back to the most-recently-created surviving session, if any
+    const ids = [...sessions.keys()];
+    latestSessionId = ids.length ? ids[ids.length - 1] : null;
+  }
+}
+
+// The session a sessionless /mcp request maps to (CLIs configured once with a
+// stable URL — e.g. `opencode mcp add chatpanel --url …/mcp`). The active chat.
+function activeSession() {
+  return (latestSessionId && sessions.get(latestSessionId)) || null;
 }
 
 // Ask the extension to run a tool and await its result. Resolves to MCP content.
@@ -228,8 +241,9 @@ async function handleChat(req, res) {
   }
 }
 
-// POST /mcp/<session> — the HTTP MCP server the CLI agent connects to. JSON-RPC
-// over POST; tools/call relays to the extension and waits for /tool-result.
+// POST /mcp/<session> (per-run, bridge-injected) OR POST /mcp (stable: routes to
+// the active chat — for CLIs configured once, e.g. `opencode mcp add … …/mcp`).
+// JSON-RPC; tools/call relays to the extension and waits for /tool-result.
 async function handleMcp(req, res, sessionId) {
   let msg;
   try {
@@ -237,9 +251,10 @@ async function handleMcp(req, res, sessionId) {
   } catch {
     return json(res, 200, { jsonrpc: '2.0', id: null, error: { code: -32700, message: 'Parse error' } });
   }
-  const session = sessions.get(sessionId);
+  // Explicit session id (per-run URL) or the active chat (stable /mcp).
+  const session = sessionId ? sessions.get(sessionId) : activeSession();
   const reply = (result) => {
-    if (sessionId) res.setHeader('Mcp-Session-Id', sessionId);
+    if (session) res.setHeader('Mcp-Session-Id', session.id);
     json(res, 200, { jsonrpc: '2.0', id: msg.id ?? null, result });
   };
   const fail = (code, message) => json(res, 200, { jsonrpc: '2.0', id: msg.id ?? null, error: { code, message } });
@@ -254,7 +269,12 @@ async function handleMcp(req, res, sessionId) {
       serverInfo: { name: 'chatpanel-browser', version: VERSION },
     });
   }
-  if (!session) return fail(-32001, 'Session not found (chat already ended)');
+  // No active chat → advertise zero tools rather than erroring, so a CLI with a
+  // standing /mcp config (run outside ChatPanel) starts cleanly instead of failing.
+  if (!session) {
+    if (msg.method === 'tools/list') return reply({ tools: [] });
+    return fail(-32001, 'No active ChatPanel session — open a chat with “Act on page” on.');
+  }
   if (msg.method === 'tools/list') {
     return reply({
       tools: session.specs.map((s) => ({
@@ -424,6 +444,12 @@ const server = createServer(async (req, res) => {
       });
     }
     if (req.method === 'POST' && url.pathname === '/chat') return handleChat(req, res);
+    // Stable endpoint: routes to the active chat. For CLIs configured once with a
+    // fixed URL (e.g. `opencode mcp add chatpanel --url http://127.0.0.1:4319/mcp`).
+    if (url.pathname === '/mcp') {
+      if (req.method === 'POST') return handleMcp(req, res, null);
+      if (req.method === 'GET') { res.writeHead(405); return res.end(); }
+    }
     if (url.pathname.startsWith('/mcp/')) {
       const sid = decodeURIComponent(url.pathname.slice(5));
       if (req.method === 'POST') return handleMcp(req, res, sid);