@chatpanel/bridge 0.4.0 → 0.6.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chatpanel/bridge",
-  "version": "0.4.0",
+  "version": "0.6.0",
   "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/{gemini.js → antigravity.js}

@@ -1,12 +1,14 @@
-// Gemini engine — drives the Gemini CLI (`gemini -p`) using your local login.
+// Antigravity engine — drives the Antigravity CLI (`agy -p`) using your local
+// login. This replaces Gemini CLI as the default Google-model agent (the Gemini
+// CLI is being deprecated for individual users).
 //
-// Like the Codex engine, this shells out to the installed `gemini` binary in
-// non-interactive mode: `gemini -p "<prompt>"` runs once, prints the answer to
-// stdout, and exits. We run in an empty scratch dir for general chat so Gemini
-// never crawls the bridge's own files; set a working dir on the agent to point
-// it at a real project.
+//   agy -p "<prompt>"   → run one prompt non-interactively, print the answer, exit
+//   agy --model <id>    → pick the model      agy models → list models
 //
-// Install: `npm i -g @google/gemini-cli`, then run `gemini` once to sign in.
+// Images: Antigravity has no image flag, but it READS image files referenced by
+// path in the prompt (vision) — same approach as Claude Code. We write the image
+// into the workspace (cwd), grant read access with --add-dir, and reference the
+// path so the model opens it.
 
 import { spawn, spawnSync } from 'node:child_process';
 import { mkdirSync, writeFileSync, unlinkSync } from 'node:fs';
@@ -14,38 +16,50 @@ import os from 'node:os';
 import path from 'node:path';
 import { findAgentBin } from '../env.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
-// CHATPANEL_GEMINI_TIMEOUT_MS (ms).
-const IDLE_MS = Number(process.env.CHATPANEL_GEMINI_TIMEOUT_MS) || 180_000;
-const SCRATCH = path.join(os.tmpdir(), 'chatpanel-gemini-scratch');
+const IDLE_MS = Number(process.env.CHATPANEL_AGY_TIMEOUT_MS) || 180_000;
+const SCRATCH = path.join(os.tmpdir(), 'chatpanel-agy-scratch');
 
-// Gemini CLI has no "list models" command (--help only lists extensions/sessions)
-// and stores no model in settings.json, so offer the common current ids. Free
-// text still accepted.
+// `agy models` lists available models. Parse ids best-effort; free text is still
+// accepted by the picker, and [] just means "type a model or use the default".
 export async function listModels() {
-  return ['gemini-2.5-pro', 'gemini-2.5-flash', 'gemini-2.5-flash-lite'];
+  try {
+    const bin = findAgentBin('agy') || 'agy';
+    const r = spawnSync(bin, ['models'], { encoding: 'utf8', timeout: 15000 });
+    const ids = [];
+    const seen = new Set();
+    for (const line of String(r.stdout || '').split('\n')) {
+      const tok = line.trim().split(/\s+/)[0] || '';
+      if (!/^[A-Za-z0-9][\w./:-]{1,79}$/.test(tok)) continue;
+      if (/^(name|model|models|id|provider|available)$/i.test(tok)) continue;
+      if (seen.has(tok)) continue;
+      seen.add(tok);
+      ids.push(tok);
+      if (ids.length >= 100) break;
+    }
+    return ids;
+  } catch {
+    return [];
+  }
 }
 
 let installed = false;
 let lastProbe = 0;
 export async function available() {
-  // Cache a positive result, but keep re-probing (throttled) while not found, so
-  // it self-heals once gemini appears on PATH — never cache a negative forever.
+  // Cache a positive result; keep re-probing (throttled) while not found so it
+  // self-heals once agy appears on PATH — never cache a negative forever.
   if (!installed && Date.now() - lastProbe > 4000) {
     lastProbe = Date.now();
     try {
-      installed = !!findAgentBin('gemini');
+      installed = !!findAgentBin('agy');
     } catch {
       installed = false;
     }
   }
   return installed
     ? { ok: true }
-    : { ok: false, reason: 'gemini not found on PATH. Install @google/gemini-cli, then run `gemini` once to sign in.' };
+    : { ok: false, reason: 'agy not found on PATH. Install Antigravity, then run `agy` once to sign in.' };
 }
 
-// Write base64 data-URL images into `dir` so Gemini's `@<file>` can read them.
 function writeImages(images, dir) {
   const files = [];
   for (let i = 0; i < (images?.length || 0); i++) {
@@ -63,6 +77,7 @@ 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);
@@ -84,9 +99,9 @@ export async function chat({ messages, system, options, images }, emit) {
   }
   const cwd = options.workingDir ? path.resolve(options.workingDir) : SCRATCH;
 
-  // Images: write them into the cwd so Gemini's `@file` reference (which reads
-  // files — including images — as multimodal input) can resolve them. Cleaned up
-  // after the run. Written into cwd (not tmp) because `@` resolves to the workspace.
+  // Images: write into the cwd (workspace) and reference with `@<file>` — agy
+  // reads @-referenced files (incl. images) inline as multimodal input, so no
+  // 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);
@@ -94,22 +109,20 @@ export async function chat({ messages, system, options, images }, emit) {
     prompt += `\n\nThe user attached image(s): ${imageFiles.map((f) => '@' + path.basename(f)).join(' ')}`;
   }
 
-  // `-p` is non-interactive (no TTY prompts). `-m` picks the model. `-y` (yolo)
-  // auto-approves tool calls when the user opted into bypassPermissions — without
-  // it Gemini would block on an approval it can't show in a headless run.
+  // `-p` runs one prompt non-interactively. --model picks the model.
+  // --dangerously-skip-permissions auto-approves tool use (headless has no human
+  // approver) only when the user opted into bypassPermissions.
   const args = ['-p', prompt];
-  if (options.model) args.push('-m', options.model);
-  if (options.permissionMode === 'bypassPermissions') args.push('-y');
+  if (options.model) args.push('--model', options.model);
+  if (options.permissionMode === 'bypassPermissions') args.push('--dangerously-skip-permissions');
 
   await new Promise((resolve, reject) => {
     let child;
     try {
-      // stdin ignored: the prompt is passed via -p, and no TTY means no
-      // interactive "trust this folder?" dialog can block us.
-      child = spawn('gemini', args, { cwd, stdio: ['ignore', 'pipe', 'pipe'], env: { ...process.env } });
+      child = spawn('agy', args, { cwd, stdio: ['ignore', 'pipe', 'pipe'], env: { ...process.env } });
     } catch (e) {
       cleanup();
-      return reject(new Error(`Failed to start gemini: ${e.message}`));
+      return reject(new Error(`Failed to start agy: ${e.message}`));
     }
 
     let out = '';
@@ -121,7 +134,7 @@ export async function chat({ messages, system, options, images }, emit) {
       idleTimer = setTimeout(() => {
         child.kill('SIGKILL');
         cleanup();
-        reject(new Error(`Gemini timed out — no output for ${Math.round(IDLE_MS / 1000)}s.`));
+        reject(new Error(`Antigravity timed out — no output for ${Math.round(IDLE_MS / 1000)}s.`));
       }, IDLE_MS);
     };
     armIdle();
@@ -137,7 +150,7 @@ export async function chat({ messages, system, options, images }, emit) {
     child.on('error', (e) => {
       clearTimeout(idleTimer);
       cleanup();
-      reject(new Error(`Failed to start gemini: ${e.message}`));
+      reject(new Error(`Failed to start agy: ${e.message}`));
     });
     child.on('close', (code) => {
       clearTimeout(idleTimer);
@@ -147,7 +160,7 @@ export async function chat({ messages, system, options, images }, emit) {
         emit({ type: 'done', text: '' });
         resolve();
       } else {
-        reject(new Error(`Gemini exited ${code}: ${err.trim() || out.trim() || 'failed'}`));
+        reject(new Error(`Antigravity exited ${code}: ${err.trim() || out.trim() || 'failed'}`));
       }
     });
   });

package/src/engines/claude.js

@@ -195,13 +195,32 @@ export async function chat({ messages, system, options, images }, emit) {
   // Explicit project dir, else null → CLI runs in home (or WSL home).
   const cwd = options.workingDir ? path.resolve(options.workingDir) : null;
 
+  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).
+  // 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 cfgFile = path.join(os.tmpdir(), `chatpanel-mcp-${tag}.json`);
+    await writeFile(cfgFile, JSON.stringify({ mcpServers: { [serverName]: { type: 'http', url: options.mcp.url } } }));
+    mcpFiles.push(cfgFile);
+    args.push('--mcp-config', cfgFile);
+    for (const s of options.mcp.specs) mcpAllow.push(`mcp__${serverName}__${s.name}`);
+  }
+
   // Gate writes/shell behind the chosen mode; otherwise restrict to read-only
-  // tools so headless runs never block on an approval prompt.
+  // tools so headless runs never block on an approval prompt. The relayed browser
+  // tools are always pre-allowed (the user explicitly armed them this turn).
   if (permissionMode === 'bypassPermissions') args.push('--permission-mode', 'bypassPermissions');
-  else if (permissionMode === 'acceptEdits') args.push('--permission-mode', 'acceptEdits');
-  else args.push('--allowedTools', ...READONLY_TOOLS);
+  else if (permissionMode === 'acceptEdits') {
+    args.push('--permission-mode', 'acceptEdits');
+    if (mcpAllow.length) args.push('--allowedTools', ...mcpAllow);
+  } else args.push('--allowedTools', ...READONLY_TOOLS, ...mcpAllow);
 
   // Native Claude Code behavior; append the user's own system prompt if they set
   // one (no ChatPanel persona injected).
@@ -213,9 +232,11 @@ export async function chat({ messages, system, options, images }, emit) {
 
   // Attach images by writing them to temp files and asking Claude Code to Read
   // them — its Read tool loads images as vision (no special flag needed).
-  const tag = `${Date.now()}-${Math.random().toString(36).slice(2)}`;
   const imageFiles = await writeImages(images, tag);
-  const cleanup = () => imageFiles.forEach((f) => unlink(f).catch(() => {}));
+  const cleanup = () => {
+    imageFiles.forEach((f) => unlink(f).catch(() => {}));
+    mcpFiles.forEach((f) => unlink(f).catch(() => {}));
+  };
   let prompt = buildPrompt(messages);
   if (imageFiles.length) {
     prompt += `\n\nThe user attached ${imageFiles.length} image file(s). Use the Read tool to view ${

package/src/engines/cli-agents.js

@@ -0,0 +1,77 @@
+// Built-in CLI agents — pi, opencode, kiro — that reuse the shared custom-engine
+// runner (runSpec) with a FIXED spec each. Unlike the Pro "custom" engine, these
+// are NOT entitlement-gated: they ship as built-ins, and the extension bounds
+// free users to a single usable agent (FREE_LIMITS.bridgeAgents). Bring-your-own
+// arbitrary CLIs stay Pro via custom.js.
+//
+// Specs come from each CLI's actual flags:
+//   pi       — pi -p "<prompt>"        · --model · @{path} images · --list-models
+//   opencode — opencode run "<prompt>" · -m provider/model · -f {path} images · models
+//   kiro     — kiro-cli chat --no-interactive "<prompt>" · --model · --list-models
+
+import { runSpec, listSpecModels } from './custom.js';
+import { findAgentBin } from '../env.js';
+
+function makeCliAgent(command, spec, notFoundHint) {
+  let installed = false;
+  let lastProbe = 0;
+  return {
+    async available() {
+      // Cache a positive result; re-probe (throttled) while not found so it
+      // self-heals once the CLI appears on PATH.
+      if (!installed && Date.now() - lastProbe > 4000) {
+        lastProbe = Date.now();
+        try {
+          installed = !!findAgentBin(command);
+        } catch {
+          installed = false;
+        }
+      }
+      return installed ? { ok: true } : { ok: false, reason: notFoundHint };
+    },
+    listModels(options = {}) {
+      return listSpecModels(command, spec.listModelsArgs, options.workingDir);
+    },
+    chat(input, emit) {
+      return runSpec({ ...spec, command }, input, emit);
+    },
+  };
+}
+
+export const pi = makeCliAgent(
+  'pi',
+  {
+    args: '-p',
+    promptVia: 'arg',
+    modelArg: '--model {model}',
+    imageArg: '@{path}',
+    listModelsArgs: '--list-models',
+    label: 'Pi',
+  },
+  'pi not found on PATH. Install Pi, then run `pi` once to sign in.',
+);
+
+export const opencode = makeCliAgent(
+  'opencode',
+  {
+    args: 'run',
+    promptVia: 'arg',
+    modelArg: '-m {model}',
+    imageArg: '-f {path}',
+    listModelsArgs: 'models',
+    label: 'OpenCode',
+  },
+  'opencode not found on PATH. Install opencode, then sign in.',
+);
+
+export const kiro = makeCliAgent(
+  'kiro-cli',
+  {
+    args: 'chat --no-interactive',
+    promptVia: 'arg',
+    modelArg: '--model {model}',
+    listModelsArgs: '--list-models',
+    label: 'Kiro',
+  },
+  'kiro-cli not found on PATH. Install Kiro CLI, then sign in.',
+);

package/src/engines/custom.js

@@ -59,6 +59,12 @@ function imageTokensFor(imageArg, files) {
 // CHATPANEL_CUSTOM_TIMEOUT_MS (ms).
 const IDLE_MS = Number(process.env.CHATPANEL_CUSTOM_TIMEOUT_MS) || 180_000;
 
+// Many CLIs emit ANSI colour/escape codes even when piped (kiro-cli does), which
+// leak into the answer as `\x1b[38;5;141m…`. Strip them from text output. (We
+// 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, '');
+
 export async function available() {
   // The engine ships in every bridge; individual custom agents are user-defined
   // (Pro) and validated per request and via /agent-check.
@@ -92,19 +98,26 @@ export async function listModels(options = {}) {
     throw new Error('Custom agents require ChatPanel Pro.');
   }
   const spec = options.custom || {};
-  const listArgs = String(spec.listModelsArgs || '').trim();
-  if (!spec.command || !listArgs) return [];
-  const resolved = resolveCommand(spec.command);
-  if (!resolved) throw new Error(`Couldn't find "${spec.command}".`);
-  const cwd = options.workingDir ? path.resolve(options.workingDir) : null;
+  return listSpecModels(spec.command, spec.listModelsArgs, options.workingDir);
+}
+
+// Shared model listing (no Pro gate): run a CLI's list-models invocation and
+// parse it. Used by the Pro custom engine (gated above) AND built-in CLI agents.
+export async function listSpecModels(command, listModelsArgs, workingDir) {
+  const listArgs = String(listModelsArgs || '').trim();
+  if (!command || !listArgs) return [];
+  const resolved = resolveCommand(command);
+  if (!resolved) throw new Error(`Couldn't find "${command}".`);
+  const cwd = workingDir ? path.resolve(workingDir) : null;
   const [bin, argv, opts] = buildSpawnSpec(resolved, listArgs.split(/\s+/).filter(Boolean), cwd);
+  opts.env = { ...(opts.env || process.env), NO_COLOR: '1', CLICOLOR: '0' };
   const stdout = await new Promise((resolve, reject) => {
     let child;
-    try { child = spawn(bin, argv, opts); } catch (e) { return reject(new Error(`Failed to start ${spec.command}: ${e.message}`)); }
+    try { child = spawn(bin, argv, opts); } catch (e) { return reject(new Error(`Failed to start ${command}: ${e.message}`)); }
     let out = '';
     const timer = setTimeout(() => { child.kill('SIGKILL'); reject(new Error('Listing models timed out.')); }, 20000);
     child.stdout.on('data', (d) => (out += d.toString()));
-    child.on('error', (e) => { clearTimeout(timer); reject(new Error(`Failed to start ${spec.command}: ${e.message}`)); });
+    child.on('error', (e) => { clearTimeout(timer); reject(new Error(`Failed to start ${command}: ${e.message}`)); });
     child.on('close', () => { clearTimeout(timer); resolve(out); });
     try { child.stdin.end(); } catch { /* some CLIs don't read stdin */ }
   });
@@ -130,9 +143,14 @@ export async function chat({ messages, system, options, images }, emit) {
   if (!(await isProEntitled(options.entitlement))) {
     throw new Error('Custom agents require ChatPanel Pro. Upgrade in Settings to bring your own CLI agent.');
   }
+  return runSpec(options.custom || {}, { messages, system, options, images }, emit);
+}
 
-  const spec = options.custom || {};
-  if (!spec.command) throw new Error('This custom agent has no command configured.');
+// Run a CLI agent from a spec — SHARED by the Pro custom engine (gated in chat()
+// above) and the built-in CLI engines (pi/opencode/kiro). This never gates; the
+// built-in agents are bounded instead by the extension's free 1-agent limit.
+export async function runSpec(spec, { messages, system, options = {}, images }, emit) {
+  if (!spec.command) throw new Error('This agent has no command configured.');
 
   const resolved = resolveCommand(spec.command);
   if (!resolved) {
@@ -200,6 +218,8 @@ export async function chat({ messages, system, options, images }, emit) {
   }
 
   const [bin, argv, opts] = buildSpawnSpec(resolved, args, cwd);
+  // Discourage CLIs from colourizing output (kiro-cli etc.) when piped.
+  opts.env = { ...(opts.env || process.env), NO_COLOR: '1', FORCE_COLOR: '0', CLICOLOR: '0', TERM: 'dumb' };
 
   await new Promise((resolve, reject) => {
     let child;
@@ -248,7 +268,7 @@ export async function chat({ messages, system, options, images }, emit) {
         }
       } else {
         streamedAny = true;
-        emit({ type: 'delta', text: s });
+        emit({ type: 'delta', text: stripAnsi(s) });
       }
     });
     child.stderr.on('data', (d) => { armIdle(); stderr += d.toString(); });

package/src/env.js

@@ -1,4 +1,4 @@
-// Resolve a usable PATH for spawning the agent CLIs (codex, gemini).
+// Resolve a usable PATH for spawning the agent CLIs (codex, agy).
 //
 // When the bridge runs as a login service (LaunchAgent / Scheduled Task) — or as
 // a double-clicked app — it inherits a MINIMAL PATH, not your interactive shell's.
@@ -14,7 +14,7 @@ let enriched = false;
 
 // The agent CLIs the bridge shells out to. Claude has its own richer resolution
 // (resolveClaude: native / cli.js / WSL / SDK) below.
-const AGENT_CLIS = ['codex', 'gemini', 'claude'];
+const AGENT_CLIS = ['codex', 'claude', 'agy', 'pi', 'opencode', 'kiro-cli'];
 
 // Is `name` executable somewhere on the current PATH?
 function onPath(name) {

package/src/server.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 // ChatPanel Bridge — a tiny localhost server that exposes the coding agents
-// running on this machine (Claude Code, Codex and Gemini, each via its CLI) to
+// running on this machine (Claude Code, Codex and Antigravity, each via its CLI) to
 // the ChatPanel Chrome extension. Zero runtime dependencies.
 //
 //   GET  /health  → { ok, version, agents: [...], update: {current,latest,…} }
@@ -16,9 +16,11 @@
 
 import { createServer } from 'node:http';
 import os from 'node:os';
+import { randomUUID } from 'node:crypto';
 import * as claude from './engines/claude.js';
 import * as codex from './engines/codex.js';
-import * as gemini from './engines/gemini.js';
+import * as antigravity from './engines/antigravity.js';
+import { pi, opencode, kiro } from './engines/cli-agents.js';
 import * as custom from './engines/custom.js';
 import { installService, uninstallService, serviceStatus, restartService } from './service.js';
 import { enrichPath, findAgentBin, resolveCommand } from './env.js';
@@ -27,20 +29,76 @@ import { checkForUpdate, selfUpdate } from './update.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.4.0';
+const VERSION = '0.6.0';
 const HOST = process.env.CHATPANEL_BRIDGE_HOST || '127.0.0.1';
 const PORT = Number(process.env.CHATPANEL_BRIDGE_PORT) || 4319;
 
 const ENGINES = {
   claude: { engine: claude, label: 'Claude Code' },
   codex: { engine: codex, label: 'Codex' },
-  gemini: { engine: gemini, label: 'Gemini CLI' },
+  antigravity: { engine: antigravity, label: 'Antigravity' },
+  pi: { engine: pi, label: 'Pi' },
+  opencode: { engine: opencode, label: 'OpenCode' },
+  kiro: { engine: kiro, label: 'Kiro' },
   // "Bring your own" — one engine drives any user-onboarded CLI (Pro). Hidden
   // from /health (it's not a single installable agent; the extension manages the
   // list and validates commands via /agent-check).
   custom: { engine: custom, label: 'Custom', hidden: true },
 };
 
+// --------------------------------------------------------------------------
+// Browser-tools relay. When the extension arms "Act on page" for a CLI agent, it
+// sends the tool specs in /chat. We host an HTTP MCP server (/mcp/<session>) the
+// CLI connects to; each tools/call is RELAYED to the extension over the chat SSE
+// stream (a `tool_request` event), executed there (it owns the browser), and the
+// result POSTed back to /tool-result. The bridge itself never touches the page.
+// --------------------------------------------------------------------------
+const sessions = new Map(); // sessionId -> { id, emit, specs, pending: Map, nextId }
+
+function createSession(emit, specs) {
+  const id = randomUUID();
+  const s = { id, emit, specs, pending: new Map(), nextId: 0 };
+  sessions.set(id, s);
+  return s;
+}
+
+function deleteSession(id) {
+  const s = sessions.get(id);
+  if (!s) return;
+  for (const p of s.pending.values()) p.reject(new Error('chat ended'));
+  sessions.delete(id);
+}
+
+// Ask the extension to run a tool and await its result. Resolves to MCP content.
+function relayToolCall(session, name, input) {
+  return new Promise((resolve, reject) => {
+    const id = `t${++session.nextId}`;
+    const timer = setTimeout(() => {
+      session.pending.delete(id);
+      reject(new Error('tool call timed out'));
+    }, 120_000);
+    session.pending.set(id, {
+      resolve: (result) => { clearTimeout(timer); resolve(toMcpContent(result)); },
+      reject: (e) => { clearTimeout(timer); reject(e); },
+    });
+    session.emit({ type: 'tool_request', session: session.id, id, name, input });
+  });
+}
+
+// The extension returns a string OR { text, image(dataURL) }; map to MCP content.
+function toMcpContent(result) {
+  if (result == null) return { content: [{ type: 'text', text: 'ok' }] };
+  if (typeof result === 'string') return { content: [{ type: 'text', text: result }] };
+  const content = [];
+  if (result.text) content.push({ type: 'text', text: String(result.text) });
+  if (typeof result.image === 'string') {
+    const m = /^data:([^;]+);base64,(.+)$/s.exec(result.image);
+    if (m) content.push({ type: 'image', data: m[2], mimeType: m[1] });
+  }
+  if (!content.length) content.push({ type: 'text', text: 'ok' });
+  return { content };
+}
+
 // --------------------------------------------------------------------------
 // CORS — allow the extension (chrome-extension://…) and localhost dev origins.
 // --------------------------------------------------------------------------
@@ -135,26 +193,103 @@ async function handleChat(req, res) {
   let closed = false;
   req.on('close', () => (closed = true));
 
+  const safeEmit = (obj) => { if (!closed) emit(obj); };
+
+  // Browser-tools relay: when the extension sends page-tool specs, host an MCP
+  // server for this turn and tell the engine to point the CLI at it.
+  const options = { ...(body.options || {}) };
+  let session = null;
+  if (body.pageTools?.specs?.length) {
+    session = createSession(safeEmit, body.pageTools.specs);
+    options.mcp = {
+      url: `http://${HOST}:${PORT}/mcp/${session.id}`,
+      serverName: 'chatpanel_browser',
+      specs: body.pageTools.specs,
+    };
+  }
+
   try {
     await target.engine.chat(
       {
         messages: Array.isArray(body.messages) ? body.messages : [],
         system: body.system || '',
-        options: body.options || {},
+        options,
         images: Array.isArray(body.images) ? body.images : [],
       },
-      (obj) => {
-        if (!closed) emit(obj);
-      },
+      safeEmit,
     );
   } catch (e) {
     log('error', `${body.agent} chat failed: ${e?.message || e}`);
     emit({ type: 'error', error: e?.message || String(e) });
   } finally {
+    if (session) deleteSession(session.id);
     if (!res.writableEnded) res.end();
   }
 }
 
+// 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.
+async function handleMcp(req, res, sessionId) {
+  let msg;
+  try {
+    msg = await readBody(req);
+  } catch {
+    return json(res, 200, { jsonrpc: '2.0', id: null, error: { code: -32700, message: 'Parse error' } });
+  }
+  const session = sessions.get(sessionId);
+  const reply = (result) => {
+    if (sessionId) res.setHeader('Mcp-Session-Id', sessionId);
+    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 } });
+
+  // Notifications (no id) — ack and ignore.
+  if (msg.id == null) { res.writeHead(202); return res.end(); }
+
+  if (msg.method === 'initialize') {
+    return reply({
+      protocolVersion: msg.params?.protocolVersion || '2025-06-18',
+      capabilities: { tools: { listChanged: false } },
+      serverInfo: { name: 'chatpanel-browser', version: VERSION },
+    });
+  }
+  if (!session) return fail(-32001, 'Session not found (chat already ended)');
+  if (msg.method === 'tools/list') {
+    return reply({
+      tools: session.specs.map((s) => ({
+        name: s.name,
+        description: s.description,
+        inputSchema: s.parameters || { type: 'object', properties: {} },
+      })),
+    });
+  }
+  if (msg.method === 'tools/call') {
+    try {
+      return reply(await relayToolCall(session, msg.params?.name, msg.params?.arguments || {}));
+    } catch (e) {
+      return reply({ content: [{ type: 'text', text: `error: ${e?.message || e}` }], isError: true });
+    }
+  }
+  return fail(-32601, `Method not found: ${msg.method}`);
+}
+
+// POST /tool-result — the extension returns a relayed tool's result.
+async function handleToolResult(req, res) {
+  let body;
+  try {
+    body = await readBody(req);
+  } catch (e) {
+    return json(res, 400, { error: 'Bad JSON: ' + e.message });
+  }
+  const session = sessions.get(body.session);
+  if (!session) return json(res, 404, { error: 'no such session' });
+  const pending = session.pending.get(body.id);
+  if (!pending) return json(res, 404, { error: 'no such pending call' });
+  session.pending.delete(body.id);
+  pending.resolve(body.result);
+  return json(res, 200, { ok: true });
+}
+
 // POST /complete → { agent, prompt, model? } → { text } — a fast, single-shot
 // completion for prompt autocomplete. Uses the engine's complete() if it has one
 // (Claude: Haiku, no tools), else a one-shot chat collected into text.
@@ -253,11 +388,18 @@ const server = createServer(async (req, res) => {
         version: VERSION,
         home: os.homedir(),
         codex: findAgentBin('codex') || null,
-        gemini: findAgentBin('gemini') || null,
+        agy: findAgentBin('agy') || null,
         path: process.env.PATH,
       });
     }
     if (req.method === 'POST' && url.pathname === '/chat') return handleChat(req, res);
+    if (url.pathname.startsWith('/mcp/')) {
+      const sid = decodeURIComponent(url.pathname.slice(5));
+      if (req.method === 'POST') return handleMcp(req, res, sid);
+      if (req.method === 'GET') { res.writeHead(405); return res.end(); } // no server-initiated stream
+      if (req.method === 'DELETE') { deleteSession(sid); res.writeHead(204); return res.end(); }
+    }
+    if (req.method === 'POST' && url.pathname === '/tool-result') return handleToolResult(req, res);
     if (req.method === 'POST' && url.pathname === '/complete') return handleComplete(req, res);
     if (req.method === 'POST' && url.pathname === '/list-models') return handleListModels(req, res);
     if (req.method === 'POST' && url.pathname === '/agent-check') return handleAgentCheck(req, res);
@@ -282,7 +424,7 @@ function startServer() {
       const a = await engine.available().catch(() => ({ ok: false }));
       log('info', `  ${a.ok ? '✓' : '✕'} ${label}${a.ok ? '' : ' — ' + (a.reason || 'unavailable')}`);
     }
-    log('info', 'Open the ChatPanel side panel; installed agents (Claude Code, Codex, Gemini CLI) appear automatically.');
+    log('info', 'Open the ChatPanel side panel; installed agents (Claude Code, Codex, Antigravity) appear automatically.');
   });
 }