bridgerapi 1.9.1 → 2.0.0

package/dist/cli.js

@@ -25,7 +25,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 
 // src/server.ts
 var import_http = require("http");
-var import_crypto = require("crypto");
+var import_crypto2 = require("crypto");
 
 // src/messages.ts
 function extractText(content) {
@@ -41,17 +41,24 @@ function messagesToPrompt(messages) {
   for (const m of messages) {
     const text = extractText(m.content).trim();
     if (!text) continue;
-    if (m.role === "system") {
-      system.push(text);
-    } else if (m.role === "assistant") {
-      turns.push(`Assistant: ${text}`);
-    } else {
-      turns.push(`User: ${text}`);
+    switch (m.role) {
+      case "system":
+        system.push(text);
+        break;
+      case "assistant":
+        turns.push(`Assistant: ${text}`);
+        break;
+      case "tool":
+        turns.push(`Tool result: ${text}`);
+        break;
+      default:
+        turns.push(`User: ${text}`);
+        break;
     }
   }
   const parts = [];
   if (system.length) parts.push("System instructions:\n" + system.join("\n"));
-  if (turns.length) parts.push(turns.join("\n"));
+  if (turns.length) parts.push(turns.join("\n\n"));
   return parts.join("\n\n");
 }
 
@@ -63,6 +70,7 @@ var import_path2 = require("path");
 
 // src/config.ts
 var import_fs = require("fs");
+var import_crypto = require("crypto");
 var import_os = require("os");
 var import_path = require("path");
 var CONFIG_DIR = (0, import_path.join)((0, import_os.homedir)(), ".bridgerapi");
@@ -80,12 +88,19 @@ function saveConfig(cfg) {
   (0, import_fs.mkdirSync)(CONFIG_DIR, { recursive: true });
   (0, import_fs.writeFileSync)(CONFIG_FILE, JSON.stringify(cfg, null, 2) + "\n");
 }
+function getOrCreateApiKey() {
+  const cfg = loadConfig();
+  if (cfg.apiKey) return cfg.apiKey;
+  const key = `sk-bridger-${(0, import_crypto.randomBytes)(24).toString("hex")}`;
+  saveConfig({ ...cfg, apiKey: key });
+  return key;
+}
 
 // src/backends.ts
 var HOME = (0, import_os2.homedir)();
-function which(cmd2) {
+function which(cmd) {
   try {
-    return (0, import_child_process.execFileSync)("which", [cmd2], { encoding: "utf8" }).trim();
+    return (0, import_child_process.execFileSync)("which", [cmd], { encoding: "utf8" }).trim();
   } catch {
     return "";
   }
@@ -150,8 +165,8 @@ async function tryDiscover(bin, strategies) {
   }
   return [];
 }
-async function* spawnStream(cmd2, args, stdin) {
-  const proc = (0, import_child_process.spawn)(cmd2, args, { env: process.env, stdio: ["pipe", "pipe", "pipe"] });
+async function* spawnStream(cmd, args, stdin) {
+  const proc = (0, import_child_process.spawn)(cmd, args, { env: process.env, stdio: ["pipe", "pipe", "pipe"] });
   if (stdin !== void 0) proc.stdin.end(stdin);
   const stderrBufs = [];
   proc.stderr.on("data", (c) => stderrBufs.push(c));
@@ -169,7 +184,7 @@ async function* spawnStream(cmd2, args, stdin) {
   });
   if (!hasOutput && exitCode !== 0) {
     const stderr = Buffer.concat(stderrBufs).toString().trim();
-    throw new Error(stderr || `${(0, import_path2.basename)(cmd2)} exited with code ${exitCode}`);
+    throw new Error(stderr || `${(0, import_path2.basename)(cmd)} exited with code ${exitCode}`);
   }
 }
 var GenericBackend = class {
@@ -199,11 +214,11 @@ var GenericBackend = class {
     }
     return this.def.models ?? [];
   }
-  buildArgs(model2) {
-    return this.def.args.map((a) => a === "{model}" ? model2 : a);
+  buildArgs(model) {
+    return this.def.args.map((a) => a === "{model}" ? model : a);
   }
-  async runBlocking(prompt, model2) {
-    const args = this.buildArgs(model2);
+  async runBlocking(prompt, model) {
+    const args = this.buildArgs(model);
     let out;
     try {
       if (this.def.promptMode === "stdin") {
@@ -216,8 +231,8 @@ var GenericBackend = class {
     }
     return [out.trim(), null];
   }
-  async *stream(prompt, model2) {
-    const args = this.buildArgs(model2);
+  async *stream(prompt, model) {
+    const args = this.buildArgs(model);
     if (this.def.promptMode === "stdin") {
       yield* spawnStream(this.bin, args, prompt);
     } else {
@@ -248,21 +263,22 @@ var ClaudeBackend = class {
     return [
       "claude-opus-4-6",
       "claude-opus-4-6-fast",
+      "claude-opus-4-5-20251101",
       "claude-sonnet-4-6",
       "claude-sonnet-4-5-20250929",
       "claude-haiku-4-5-20251001"
     ];
   }
-  async runBlocking(prompt, model2) {
+  async runBlocking(prompt, model) {
     let out;
     try {
-      out = (0, import_child_process.execFileSync)(this.bin, ["-p", "--output-format", "json", "--model", model2], {
+      out = (0, import_child_process.execFileSync)(this.bin, ["-p", "--output-format", "json", "--model", model], {
         input: prompt,
         encoding: "utf8",
         timeout: 3e5
       });
     } catch (e) {
-      throw new Error(e.stderr?.trim() || `claude exited non-zero`);
+      throw new Error(e.stderr?.trim() || "claude exited non-zero");
     }
     try {
       const data = JSON.parse(out.trim() || "{}");
@@ -271,8 +287,8 @@ var ClaudeBackend = class {
       return [out.trim(), null];
     }
   }
-  async *stream(prompt, model2) {
-    yield* spawnStream(this.bin, ["-p", "--output-format", "text", "--model", model2], prompt);
+  async *stream(prompt, model) {
+    yield* spawnStream(this.bin, ["-p", "--output-format", "text", "--model", model], prompt);
   }
 };
 var GeminiBackend = class {
@@ -297,18 +313,16 @@ var GeminiBackend = class {
     if (found.length > 0) return found;
     return [
       "gemini-3.1-pro-preview",
-      "gemini-3-pro-preview",
       "gemini-3-flash-preview",
       "gemini-2.5-pro",
       "gemini-2.5-flash",
-      "gemini-2.0-flash",
-      "gemini-1.5-pro"
+      "gemini-2.0-flash"
     ];
   }
-  async runBlocking(prompt, model2) {
+  async runBlocking(prompt, model) {
     let out;
     try {
-      out = (0, import_child_process.execFileSync)(this.bin, ["--output-format", "json", "--model", model2, "--approval-mode", "yolo"], {
+      out = (0, import_child_process.execFileSync)(this.bin, ["--output-format", "json", "--model", model, "--approval-mode", "yolo"], {
         input: prompt,
         encoding: "utf8",
         timeout: 3e5,
@@ -317,8 +331,8 @@ var GeminiBackend = class {
     } catch (e) {
       const err = e.stderr?.trim() ?? "";
       if (/auth|login|sign.?in/i.test(err))
-        throw new Error(`Gemini not authenticated. Run: gemini auth  OR  export GEMINI_API_KEY=<key>`);
-      throw new Error(err || `gemini exited non-zero`);
+        throw new Error("Gemini not authenticated. Run: gemini auth  OR  export GEMINI_API_KEY=<key>");
+      throw new Error(err || "gemini exited non-zero");
     }
     const raw = out.trim();
     try {
@@ -328,10 +342,10 @@ var GeminiBackend = class {
       return [raw, null];
     }
   }
-  async *stream(prompt, model2) {
+  async *stream(prompt, model) {
     yield* spawnStream(
       this.bin,
-      ["--output-format", "text", "--model", model2, "--approval-mode", "yolo"],
+      ["--output-format", "text", "--model", model, "--approval-mode", "yolo"],
       prompt
     );
   }
@@ -339,7 +353,7 @@ var GeminiBackend = class {
 var CodexBackend = class {
   constructor() {
     this.name = "codex";
-    this.prefixes = ["gpt", "o3", "o4", "o1"];
+    this.prefixes = ["gpt", "o3", "o4"];
   }
   get bin() {
     return process.env.CODEX_BIN ?? which("codex") ?? "codex";
@@ -356,38 +370,35 @@ var CodexBackend = class {
     ]);
     if (found.length > 0) return found;
     return [
-      "gpt-5-codex",
-      "gpt-5.1-codex",
-      "gpt-5.1-codex-max",
-      "gpt-5.1",
       "gpt-5.2",
       "gpt-5.2-codex",
       "gpt-5.3-codex",
-      "gpt-5-2025-08-07",
+      "gpt-5.4",
+      "gpt-5.4-mini",
       "o4-mini",
       "o3"
     ];
   }
-  async runBlocking(prompt, model2) {
+  async runBlocking(prompt, model) {
     let out;
     try {
-      out = (0, import_child_process.execFileSync)(this.bin, ["-q", "--model", model2, prompt], {
+      out = (0, import_child_process.execFileSync)(this.bin, ["-q", "--model", model, prompt], {
         encoding: "utf8",
         timeout: 3e5
       });
     } catch (e) {
-      throw new Error(e.stderr?.trim() || `codex exited non-zero`);
+      throw new Error(e.stderr?.trim() || "codex exited non-zero");
     }
     return [out.trim(), null];
   }
-  async *stream(prompt, model2) {
-    yield* spawnStream(this.bin, ["-q", "--model", model2, prompt]);
+  async *stream(prompt, model) {
+    yield* spawnStream(this.bin, ["-q", "--model", model, prompt]);
   }
 };
 var CopilotBackend = class {
   constructor() {
     this.name = "copilot";
-    this.prefixes = ["copilot", "github-copilot"];
+    this.prefixes = ["copilot"];
   }
   get bin() {
     return process.env.GH_BIN ?? which("gh") ?? "gh";
@@ -404,53 +415,47 @@ var CopilotBackend = class {
   async models() {
     const found = await tryDiscover(this.bin, [
       ["copilot", "models"],
-      ["copilot", "models", "list"],
-      ["copilot", "--list-models"]
+      ["copilot", "models", "list"]
     ]);
     if (found.length > 0) return found;
     return ["copilot"];
   }
-  async runBlocking(prompt, model2) {
+  async runBlocking(prompt, model) {
     let out;
     try {
-      out = (0, import_child_process.execFileSync)(this.bin, ["copilot", "suggest", "-t", "general", prompt], {
+      out = (0, import_child_process.execFileSync)(this.bin, ["copilot", "explain", prompt], {
         encoding: "utf8",
         timeout: 12e4
       });
     } catch (e) {
-      throw new Error(e.stderr?.trim() || `gh copilot exited non-zero`);
+      throw new Error(e.stderr?.trim() || "gh copilot exited non-zero");
     }
     return [out.trim(), null];
   }
-  async *stream(prompt, model2) {
-    yield* spawnStream(this.bin, ["copilot", "suggest", "-t", "general", prompt]);
+  async *stream(prompt, model) {
+    yield* spawnStream(this.bin, ["copilot", "explain", prompt]);
   }
 };
 var DroidBackend = class _DroidBackend {
   constructor() {
     this.name = "droid";
-    this.prefixes = ["droid", "glm", "kimi", "minimax"];
+    this.prefixes = ["droid", "factory", "glm", "kimi", "minimax"];
   }
   static {
-    // Up-to-date as of March 2026 — source: Factory docs + droid exec --help
     this.KNOWN_MODELS = [
-      "gpt-5-codex",
-      "gpt-5.1-codex",
-      "gpt-5.1-codex-max",
-      "gpt-5.1",
-      "gpt-5.2",
-      "gpt-5.2-codex",
-      "gpt-5.3-codex",
-      "gpt-5-2025-08-07",
       "claude-opus-4-6",
       "claude-opus-4-6-fast",
-      "claude-opus-4-1-20250805",
+      "claude-opus-4-5-20251101",
+      "claude-sonnet-4-6",
       "claude-sonnet-4-5-20250929",
       "claude-haiku-4-5-20251001",
+      "gpt-5.2",
+      "gpt-5.2-codex",
+      "gpt-5.3-codex",
+      "gpt-5.4",
+      "gpt-5.4-mini",
       "gemini-3.1-pro-preview",
-      "gemini-3-pro-preview",
       "gemini-3-flash-preview",
-      "glm-4.6",
       "glm-4.7",
       "glm-5",
       "kimi-k2.5",
@@ -476,23 +481,23 @@ var DroidBackend = class _DroidBackend {
     }
     return _DroidBackend.KNOWN_MODELS;
   }
-  async runBlocking(prompt, model2) {
+  async runBlocking(prompt, model) {
     let out;
     try {
       out = (0, import_child_process.execFileSync)(
         which("droid") || this.bin,
-        ["exec", "--output-format", "text", "--model", model2, "-"],
+        ["exec", "--output-format", "text", "--model", model],
         { input: prompt, encoding: "utf8", timeout: 3e5 }
       );
     } catch (e) {
-      throw new Error(e.stderr?.trim() || `droid exited non-zero`);
+      throw new Error(e.stderr?.trim() || "droid exited non-zero");
     }
     return [out.trim(), null];
   }
-  async *stream(prompt, model2) {
+  async *stream(prompt, model) {
     yield* spawnStream(
       which("droid") || this.bin,
-      ["exec", "--output-format", "text", "--model", model2, "-"],
+      ["exec", "--output-format", "text", "--model", model],
       prompt
     );
   }
@@ -513,13 +518,13 @@ function loadUserBackends() {
   }
 }
 var BACKENDS = [...BUILTIN, ...loadUserBackends()];
-function pickBackend(model2) {
+function pickBackend(model) {
   const override = process.env.BRIDGERAPI_BACKEND?.toLowerCase();
   if (override) {
     const forced = BACKENDS.find((b) => b.name === override && b.available());
     if (forced) return forced;
   }
-  const m = model2.toLowerCase();
+  const m = model.toLowerCase();
   for (const b of BACKENDS) {
     if (b.prefixes.some((p) => m.startsWith(p)) && b.available()) return b;
   }
@@ -532,23 +537,23 @@ function sse(data) {
 
 `;
 }
-function chunk(id, ts, model2, delta, finish) {
+function chunk(id, ts, model, delta, finish) {
   return sse({
     id,
     object: "chat.completion.chunk",
     created: ts,
-    model: model2,
+    model,
     choices: [{ index: 0, delta, finish_reason: finish ?? null }]
   });
 }
-function completion(id, ts, model2, text, usage) {
+function completion(id, ts, model, text, usage) {
   const pt = usage ? (usage.input_tokens ?? 0) + (usage.cache_creation_input_tokens ?? 0) + (usage.cache_read_input_tokens ?? 0) + (usage.promptTokenCount ?? 0) : 0;
   const ct = usage ? (usage.output_tokens ?? 0) + (usage.candidatesTokenCount ?? 0) : 0;
   return {
     id,
     object: "chat.completion",
     created: ts,
-    model: model2,
+    model,
     choices: [{ index: 0, message: { role: "assistant", content: text }, finish_reason: "stop" }],
     usage: { prompt_tokens: pt, completion_tokens: ct, total_tokens: pt + ct }
   };
@@ -595,10 +600,10 @@ async function handleModels(res) {
   }
   sendJson(res, 200, { object: "list", data: allModels });
 }
-function handleHealth(res, port2) {
+function handleHealth(res, port) {
   const backends = {};
   for (const b of BACKENDS) backends[b.name] = b.available();
-  sendJson(res, 200, { status: "ok", port: port2, backends });
+  sendJson(res, 200, { status: "ok", port, backends });
 }
 async function handleChat(req, res) {
   let body;
@@ -613,68 +618,74 @@ async function handleChat(req, res) {
     sendJson(res, 400, { error: { message: "messages required", type: "invalid_request_error" } });
     return;
   }
-  const model2 = body.model ?? "claude-sonnet-4-6";
+  const model = body.model ?? "claude-opus-4-6";
   const streaming = Boolean(body.stream);
   const prompt = messagesToPrompt(messages);
-  const backend2 = pickBackend(model2);
-  const id = `chatcmpl-${(0, import_crypto.randomUUID)().replace(/-/g, "").slice(0, 20)}`;
+  const backend = pickBackend(model);
+  const id = `chatcmpl-${(0, import_crypto2.randomUUID)().replace(/-/g, "").slice(0, 20)}`;
   const ts = Math.floor(Date.now() / 1e3);
-  console.log(`  ${backend2.name}  model=${model2}  stream=${streaming}  turns=${messages.length}`);
+  console.log(`  ${backend.name}  model=${model}  stream=${streaming}  turns=${messages.length}`);
   if (streaming) {
     cors(res, 200);
     res.setHeader("Content-Type", "text/event-stream");
     res.setHeader("Cache-Control", "no-cache");
     res.setHeader("X-Accel-Buffering", "no");
     res.flushHeaders();
-    res.write(chunk(id, ts, model2, { role: "assistant" }));
+    res.write(chunk(id, ts, model, { role: "assistant" }));
     try {
-      for await (const raw of backend2.stream(prompt, model2)) {
-        res.write(chunk(id, ts, model2, { content: raw.toString("utf8") }));
+      for await (const raw of backend.stream(prompt, model)) {
+        res.write(chunk(id, ts, model, { content: raw.toString("utf8") }));
       }
     } catch (err) {
       const msg = err.message ?? String(err);
-      console.error(`  stream error [${backend2.name}]: ${msg}`);
-      res.write(chunk(id, ts, model2, { content: `
+      console.error(`  stream error [${backend.name}]: ${msg}`);
+      res.write(chunk(id, ts, model, { content: `
 
-\u26A0\uFE0F  ${backend2.name} error: ${msg}` }));
+[bridgerapi] ${backend.name} error: ${msg}` }));
     }
-    res.write(chunk(id, ts, model2, {}, "stop"));
+    res.write(chunk(id, ts, model, {}, "stop"));
     res.write("data: [DONE]\n\n");
     res.end();
   } else {
     try {
-      const [text, usage] = await backend2.runBlocking(prompt, model2);
-      sendJson(res, 200, completion(id, ts, model2, text, usage));
+      const [text, usage] = await backend.runBlocking(prompt, model);
+      sendJson(res, 200, completion(id, ts, model, text, usage));
     } catch (err) {
       console.error(`  error: ${err.message}`);
       sendJson(res, 500, { error: { message: err.message, type: "server_error" } });
     }
   }
 }
-function createBridgeServer(port2) {
-  const server = (0, import_http.createServer)(async (req, res) => {
-    const path = (req.url ?? "/").split("?")[0];
-    const method = req.method ?? "GET";
-    if (method === "OPTIONS") {
-      cors(res, 200);
-      res.end();
-      return;
-    }
-    if (method === "GET" && (path === "/v1/models" || path === "/models")) {
-      await handleModels(res);
-      return;
-    }
-    if (method === "GET" && path === "/health") {
-      handleHealth(res, port2);
-      return;
-    }
-    if (method === "POST" && (path === "/v1/chat/completions" || path === "/chat/completions")) {
-      await handleChat(req, res);
-      return;
+function createBridgeServer(port) {
+  return (0, import_http.createServer)(async (req, res) => {
+    try {
+      const path = (req.url ?? "/").split("?")[0];
+      const method = req.method ?? "GET";
+      if (method === "OPTIONS") {
+        cors(res, 200);
+        res.end();
+        return;
+      }
+      if (method === "GET" && (path === "/v1/models" || path === "/models")) {
+        await handleModels(res);
+        return;
+      }
+      if (method === "GET" && path === "/health") {
+        handleHealth(res, port);
+        return;
+      }
+      if (method === "POST" && (path === "/v1/chat/completions" || path === "/chat/completions")) {
+        await handleChat(req, res);
+        return;
+      }
+      sendJson(res, 404, { error: { message: "not found", type: "not_found_error" } });
+    } catch (err) {
+      console.error("  unhandled server error:", err.message);
+      if (!res.headersSent) {
+        sendJson(res, 500, { error: { message: "internal server error", type: "server_error" } });
+      }
     }
-    sendJson(res, 404, { error: { message: "not found", type: "not_found_error" } });
   });
-  return server;
 }
 
 // src/service.ts
@@ -687,13 +698,13 @@ var LABEL = "com.bridgerapi.server";
 function plistPath() {
   return (0, import_path3.join)(HOME2, "Library/LaunchAgents", `${LABEL}.plist`);
 }
-function writePlist(port2, scriptPath, nodePath, backend2) {
+function writePlist(port, scriptPath, nodePath, backend) {
   const logDir = (0, import_path3.join)(HOME2, ".bridgerapi");
   (0, import_fs3.mkdirSync)(logDir, { recursive: true });
   (0, import_fs3.mkdirSync)((0, import_path3.join)(HOME2, "Library/LaunchAgents"), { recursive: true });
-  const backendEntry = backend2 ? `
+  const backendEntry = backend ? `
     <key>BRIDGERAPI_BACKEND</key>
-    <string>${backend2}</string>` : "";
+    <string>${backend}</string>` : "";
   const plist = `<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN"
   "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
@@ -712,13 +723,11 @@ function writePlist(port2, scriptPath, nodePath, backend2) {
   <key>EnvironmentVariables</key>
   <dict>
     <key>BRIDGERAPI_PORT</key>
-    <string>${port2}</string>
+    <string>${port}</string>
     <key>PATH</key>
     <string>${HOME2}/.local/bin:/usr/local/bin:/usr/bin:/bin:/opt/homebrew/bin</string>
     <key>HOME</key>
-    <string>${HOME2}</string>
-    <key>CUSTOM_OKBRIDGER_API_KEY</key>
-    <string>local</string>${backendEntry}
+    <string>${HOME2}</string>${backendEntry}
   </dict>
 
   <key>StandardOutPath</key>
@@ -739,12 +748,12 @@ function unitPath() {
   const configHome = process.env.XDG_CONFIG_HOME ?? (0, import_path3.join)(HOME2, ".config");
   return (0, import_path3.join)(configHome, "systemd/user/bridgerapi.service");
 }
-function writeUnit(port2, scriptPath, nodePath, backend2) {
+function writeUnit(port, scriptPath, nodePath, backend) {
   const logDir = (0, import_path3.join)(HOME2, ".bridgerapi");
   (0, import_fs3.mkdirSync)(logDir, { recursive: true });
   (0, import_fs3.mkdirSync)((0, import_path3.join)(HOME2, ".config/systemd/user"), { recursive: true });
-  const backendLine = backend2 ? `
-Environment=BRIDGERAPI_BACKEND=${backend2}` : "";
+  const backendLine = backend ? `
+Environment=BRIDGERAPI_BACKEND=${backend}` : "";
   const unit = `[Unit]
 Description=bridgerapi \u2014 OpenAI-compatible bridge for AI CLIs
 After=network.target
@@ -752,9 +761,8 @@ After=network.target
 [Service]
 Type=simple
 ExecStart=${nodePath} ${scriptPath} start
-Environment=BRIDGERAPI_PORT=${port2}
+Environment=BRIDGERAPI_PORT=${port}
 Environment=HOME=${HOME2}
-Environment=CUSTOM_OKBRIDGER_API_KEY=local
 Environment=PATH=${HOME2}/.local/bin:/usr/local/bin:/usr/bin:/bin${backendLine}
 Restart=always
 StandardOutput=append:${logDir}/server.log
@@ -765,7 +773,7 @@ WantedBy=default.target
 `;
   (0, import_fs3.writeFileSync)(unitPath(), unit);
 }
-function installService(port2, backend2) {
+function installService(port, backend) {
   const scriptPath = process.argv[1];
   const nodePath = process.execPath;
   const os = (0, import_os3.platform)();
@@ -774,17 +782,17 @@ function installService(port2, backend2) {
       (0, import_child_process2.execSync)(`launchctl unload "${plistPath()}" 2>/dev/null`, { stdio: "ignore" });
     } catch {
     }
-    writePlist(port2, scriptPath, nodePath, backend2);
+    writePlist(port, scriptPath, nodePath, backend);
     (0, import_child_process2.execSync)(`launchctl load -w "${plistPath()}"`);
-    console.log(`\u2713  LaunchAgent installed \u2192 ${plistPath()}`);
+    console.log(`  LaunchAgent installed -> ${plistPath()}`);
   } else if (os === "linux") {
-    writeUnit(port2, scriptPath, nodePath, backend2);
+    writeUnit(port, scriptPath, nodePath, backend);
     try {
       (0, import_child_process2.execSync)("systemctl --user daemon-reload");
     } catch {
     }
     (0, import_child_process2.execSync)("systemctl --user enable --now bridgerapi");
-    console.log(`\u2713  systemd user service installed`);
+    console.log("  systemd user service installed");
   } else {
     throw new Error(`Auto-install not supported on ${os}. Run 'bridgerapi start' manually.`);
   }
@@ -799,7 +807,7 @@ function uninstallService() {
       } catch {
       }
       (0, import_fs3.unlinkSync)(p);
-      console.log("\u2713  LaunchAgent removed");
+      console.log("  LaunchAgent removed");
     } else {
       console.log("  bridgerapi service is not installed");
     }
@@ -816,7 +824,7 @@ function uninstallService() {
       } catch {
       }
     }
-    console.log("\u2713  systemd service removed");
+    console.log("  systemd service removed");
   } else {
     throw new Error(`Not supported on ${os}`);
   }
@@ -860,6 +868,24 @@ function ask(question) {
     });
   });
 }
+function printBanner(port, activeBackend) {
+  const apiKey = getOrCreateApiKey();
+  const available = BACKENDS.filter((b) => b.available());
+  const backendLabel = activeBackend ? `${activeBackend}  (all requests routed here)` : available.map((b) => b.name).join(", ") + "  (auto-routed by model prefix)";
+  console.log();
+  console.log("  bridgerapi is running");
+  console.log();
+  console.log(`  Base URL : http://127.0.0.1:${port}/v1`);
+  console.log(`  API Key  : ${apiKey}`);
+  console.log();
+  console.log(`  Backend  : ${backendLabel}`);
+  console.log(`  Logs     : ${LOG_DIR}/server.log`);
+  console.log();
+  console.log("  Goose / OpenAI-compatible config:");
+  console.log(`    OPENAI_API_BASE=http://127.0.0.1:${port}/v1`);
+  console.log(`    OPENAI_API_KEY=${apiKey}`);
+  console.log();
+}
 async function cmdSetup() {
   console.log();
   console.log("  bridgerapi \u2014 OpenAI-compatible API bridge for AI CLI tools");
@@ -869,8 +895,8 @@ async function cmdSetup() {
   console.log("  Backends detected:\n");
   for (const b of BACKENDS) {
     const ok = b.available();
-    console.log(`    ${ok ? "\u2713" : "\u2717"}  ${b.name}`);
-    if (!ok) console.log(`         \u2192 ${INSTALL_HINTS[b.name]}`);
+    console.log(`    ${ok ? "+" : "-"}  ${b.name}`);
+    if (!ok) console.log(`         -> ${INSTALL_HINTS[b.name] ?? "not installed"}`);
   }
   console.log();
   if (available.length === 0) {
@@ -887,7 +913,7 @@ async function cmdSetup() {
     const defaultIdx = names.indexOf(currentDefault);
     console.log("  Which backend do you want to use as default?\n");
     names.forEach((name, i) => {
-      const marker = i === defaultIdx ? "  \u2190 default" : "";
+      const marker = i === defaultIdx ? "  <- default" : "";
       console.log(`    ${i + 1}  ${name}${marker}`);
     });
     console.log();
@@ -899,8 +925,8 @@ async function cmdSetup() {
   }
   const defaultPort = cfg.port ?? DEFAULT_PORT;
   const portAnswer = await ask(`  Port [${defaultPort}]: `);
-  const port2 = portAnswer ? parseInt(portAnswer) || defaultPort : defaultPort;
-  saveConfig({ backend: chosenBackend, port: port2 });
+  const port = portAnswer ? parseInt(portAnswer) || defaultPort : defaultPort;
+  saveConfig({ ...cfg, backend: chosenBackend, port });
   console.log();
   console.log("  How do you want to run bridgerapi?");
   console.log("    1  Foreground  (stops when terminal closes)");
@@ -909,66 +935,51 @@ async function cmdSetup() {
   const choice = await ask("  Choose [1/2]: ");
   console.log();
   if (choice === "2") {
-    cmdInstall(port2, chosenBackend);
+    cmdInstall(port, chosenBackend);
   } else {
-    cmdStart(port2, chosenBackend);
+    cmdStart(port, chosenBackend);
   }
 }
-function cmdStart(port2, backend2) {
+function cmdStart(port, backend) {
   (0, import_fs4.mkdirSync)(LOG_DIR, { recursive: true });
   const cfg = loadConfig();
-  const activeBackend = backend2 ?? cfg.backend;
+  const activeBackend = backend ?? cfg.backend;
   if (activeBackend) process.env.BRIDGERAPI_BACKEND = activeBackend;
   const available = BACKENDS.filter((b) => b.available());
   if (available.length === 0) {
     console.error("  No CLI backends found. Run: bridgerapi  to see setup instructions.");
     process.exit(1);
   }
-  const server = createBridgeServer(port2);
-  server.listen(port2, "127.0.0.1", () => {
-    console.log(`  bridgerapi is running`);
-    console.log();
-    console.log(`  Base URL : http://127.0.0.1:${port2}/v1`);
-    console.log(`  API Key  : local`);
-    console.log();
-    const backendLabel = activeBackend ? `${activeBackend}  (all requests routed here)` : available.map((b) => b.name).join(", ") + "  (auto-routed by model prefix)";
-    console.log(`  Backend  : ${backendLabel}`);
-    console.log(`  Logs     : ${LOG_DIR}/server.log`);
-    console.log();
+  const server = createBridgeServer(port);
+  server.listen(port, "127.0.0.1", () => {
+    printBanner(port, activeBackend);
     console.log("  Ctrl+C to stop.");
   });
   server.on("error", (err) => {
     if (err.code === "EADDRINUSE") {
-      console.error(`  Port ${port2} is already in use. Try: bridgerapi start --port 9000`);
+      console.error(`  Port ${port} is already in use. Try: bridgerapi start --port 9000`);
     } else {
       console.error("  Server error:", err.message);
     }
     process.exit(1);
   });
 }
-function cmdInstall(port2, backend2) {
+function cmdInstall(port, backend) {
   const cfg = loadConfig();
-  const activeBackend = backend2 ?? cfg.backend;
+  const activeBackend = backend ?? cfg.backend;
   try {
-    installService(port2, activeBackend);
+    installService(port, activeBackend);
     console.log();
-    console.log("  Waiting for server to start\u2026");
+    console.log("  Waiting for server to start...");
     let attempts = 0;
     const poll = setInterval(async () => {
       attempts++;
       try {
         const http = await import("http");
-        http.get(`http://127.0.0.1:${port2}/health`, (res) => {
+        http.get(`http://127.0.0.1:${port}/health`, (res) => {
           if (res.statusCode === 200) {
             clearInterval(poll);
-            console.log();
-            console.log(`  bridgerapi is running`);
-            console.log();
-            console.log(`  Base URL : http://127.0.0.1:${port2}/v1`);
-            console.log(`  API Key  : local`);
-            if (activeBackend) console.log(`  Backend  : ${activeBackend}`);
-            console.log();
-            console.log(`  Logs  : tail -f ${LOG_DIR}/server.log`);
+            printBanner(port, activeBackend);
             console.log(`  Stop  : bridgerapi uninstall`);
             process.exit(0);
           }
@@ -996,20 +1007,48 @@ function cmdUninstall() {
     process.exit(1);
   }
 }
-function cmdStatus(port2) {
+function cmdStatus(port) {
   const cfg = loadConfig();
   const { running, pid } = serviceStatus();
   if (running) {
+    const apiKey = getOrCreateApiKey();
     console.log(`  bridgerapi is running${pid ? ` (pid ${pid})` : ""}`);
-    console.log(`  Base URL : http://127.0.0.1:${port2}/v1`);
-    console.log(`  API Key  : local`);
+    console.log(`  Base URL : http://127.0.0.1:${port}/v1`);
+    console.log(`  API Key  : ${apiKey}`);
     if (cfg.backend) console.log(`  Backend  : ${cfg.backend}`);
   } else {
     console.log("  bridgerapi is not running.");
-    console.log("  Run: bridgerapi          \u2192  setup wizard");
-    console.log("  Run: bridgerapi start    \u2192  start in foreground");
-    console.log("  Run: bridgerapi install  \u2192  install background service");
+    console.log("  Run: bridgerapi          ->  setup wizard");
+    console.log("  Run: bridgerapi start    ->  start in foreground");
+    console.log("  Run: bridgerapi install  ->  install background service");
+  }
+}
+function cmdKey(args) {
+  if (args[0] === "reset") {
+    const cfg2 = loadConfig();
+    delete cfg2.apiKey;
+    saveConfig(cfg2);
+    const newKey = getOrCreateApiKey();
+    console.log(`  API key regenerated: ${newKey}`);
+    return;
   }
+  const apiKey = getOrCreateApiKey();
+  const cfg = loadConfig();
+  const port = cfg.port ?? DEFAULT_PORT;
+  console.log();
+  console.log("  bridgerapi API key (OpenAI-compatible)");
+  console.log("  \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500");
+  console.log();
+  console.log(`  ${apiKey}`);
+  console.log();
+  console.log("  Use this as your OPENAI_API_KEY in Goose, Cursor, etc.");
+  console.log();
+  console.log("  Quick setup:");
+  console.log(`    export OPENAI_API_BASE=http://127.0.0.1:${port}/v1`);
+  console.log(`    export OPENAI_API_KEY=${apiKey}`);
+  console.log();
+  console.log("  Reset:  bridgerapi key reset");
+  console.log();
 }
 function cmdConfig(args) {
   const cfg = loadConfig();
@@ -1030,7 +1069,7 @@ function cmdConfig(args) {
           process.exit(1);
         }
         cfg.backend = val;
-        console.log(`  backend \u2192 ${val}`);
+        console.log(`  backend -> ${val}`);
       } else if (key === "port") {
         const p = parseInt(val);
         if (isNaN(p) || p < 1 || p > 65535) {
@@ -1038,7 +1077,7 @@ function cmdConfig(args) {
           process.exit(1);
         }
         cfg.port = p;
-        console.log(`  port \u2192 ${p}`);
+        console.log(`  port -> ${p}`);
       } else {
         console.error(`  Unknown key: ${key}`);
         console.error(`  Valid keys: backend, port`);
@@ -1059,12 +1098,13 @@ function cmdConfig(args) {
   console.log("  \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500");
   console.log(`  backend  : ${cfg.backend ?? "(auto \u2014 routed by model prefix)"}`);
   console.log(`  port     : ${cfg.port ?? `${DEFAULT_PORT} (default)`}`);
+  console.log(`  apiKey   : ${cfg.apiKey ?? "(not generated yet \u2014 run: bridgerapi key)"}`);
   console.log(`  file     : ${(0, import_path4.join)((0, import_os4.homedir)(), ".bridgerapi/config.json")}`);
   console.log();
   console.log("  To change:");
-  console.log(`  bridgerapi config set backend=claude`);
-  console.log(`  bridgerapi config set port=9000`);
-  console.log(`  bridgerapi config reset`);
+  console.log("    bridgerapi config set backend=droid");
+  console.log("    bridgerapi config set port=9000");
+  console.log("    bridgerapi config reset");
   console.log();
 }
 async function cmdBackendAdd() {
@@ -1088,8 +1128,8 @@ async function cmdBackendAdd() {
   const modeChoice = await ask("  Choose [1/2]: ");
   const promptMode = modeChoice === "2" ? "arg" : "stdin";
   console.log();
-  console.log(`  Command arguments template. Use {model} as placeholder for the model name.`);
-  console.log(`  Example: exec --output-format text --model {model} -`);
+  console.log("  Command arguments template. Use {model} as placeholder for the model name.");
+  console.log("  Example: exec --output-format text --model {model}");
   const argsRaw = await ask("  Args: ");
   const args = argsRaw.trim().split(/\s+/).filter(Boolean);
   const modelsCmdRaw = await ask("  Args to list models (leave blank to skip): ");
@@ -1104,11 +1144,8 @@ async function cmdBackendAdd() {
   else existing.push(def);
   saveConfig({ ...cfg, customBackends: existing });
   console.log();
-  console.log(`  \u2713  ${name} backend saved.`);
-  console.log(`  Restart bridgerapi for it to take effect.`);
-  console.log();
-  console.log("  Example JSON entry in ~/.bridgerapi/config.json:");
-  console.log(`  ${JSON.stringify(def, null, 2).split("\n").join("\n  ")}`);
+  console.log(`  ${name} backend saved.`);
+  console.log("  Restart bridgerapi for it to take effect.");
   console.log();
 }
 async function cmdBackendList() {
@@ -1117,34 +1154,34 @@ async function cmdBackendList() {
   for (const b of BACKENDS) {
     if (!b.available()) {
       const hint = INSTALL_HINTS[b.name] ?? "not installed";
-      console.log(`  \u2717  ${b.name}`);
-      console.log(`     \u2192 ${hint}
+      console.log(`  -  ${b.name}`);
+      console.log(`     -> ${hint}
 `);
       continue;
     }
-    process.stdout.write(`  \u2713  ${b.name}  (discovering models\u2026)\r`);
+    process.stdout.write(`  +  ${b.name}  (discovering models...)\r`);
     const modelList = await b.models();
     const preview = modelList.slice(0, 6).join("  ");
     const extra = modelList.length > 6 ? `  +${modelList.length - 6} more` : "";
-    console.log(`  \u2713  ${b.name}                                    `);
+    console.log(`  +  ${b.name}                                    `);
     console.log(`     ${preview}${extra}
 `);
   }
 }
-async function cmdChat(model2, backendFlag) {
+async function cmdChat(model, backendFlag) {
   const cfg = loadConfig();
-  const activeBackend = backendFlag ?? (model2 && BACKENDS.find((b) => b.name === model2?.toLowerCase())?.name) ?? cfg.backend;
+  const activeBackend = backendFlag ?? (model && BACKENDS.find((b) => b.name === model?.toLowerCase())?.name) ?? cfg.backend;
   if (activeBackend) process.env.BRIDGERAPI_BACKEND = activeBackend;
-  const resolvedModel = model2 && BACKENDS.find((b) => b.name === model2.toLowerCase()) ? void 0 : model2;
+  const resolvedModel = model && BACKENDS.find((b) => b.name === model.toLowerCase()) ? void 0 : model;
   const available = BACKENDS.filter((b) => b.available());
   if (available.length === 0) {
     console.error("  No backends found. Run: bridgerapi  to see setup instructions.");
     process.exit(1);
   }
   const fallbackModel = `${activeBackend ?? available[0].name}-default`;
-  const backend2 = pickBackend(resolvedModel ?? fallbackModel);
+  const backend = pickBackend(resolvedModel ?? fallbackModel);
   console.log();
-  console.log(`  bridgerapi chat  \u2014  ${backend2.name}`);
+  console.log(`  bridgerapi chat  \u2014  ${backend.name}`);
   console.log("  \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500");
   console.log("  Type a message and press Enter. Ctrl+C to exit.");
   console.log();
@@ -1165,8 +1202,8 @@ async function cmdChat(model2, backendFlag) {
       process.stdout.write("\n");
       let reply = "";
       try {
-        process.stdout.write(`${backend2.name}: `);
-        for await (const chunk2 of backend2.stream(messagesToPrompt(history), resolvedModel ?? fallbackModel)) {
+        process.stdout.write(`${backend.name}: `);
+        for await (const chunk2 of backend.stream(messagesToPrompt(history), resolvedModel ?? fallbackModel)) {
           const piece = chunk2.toString("utf8");
           process.stdout.write(piece);
           reply += piece;
@@ -1188,79 +1225,89 @@ function showHelp() {
 
   Usage:
     bridgerapi                          Interactive setup wizard
-    bridgerapi chat [--model m]         Chat in the terminal (routes by model prefix)
-    bridgerapi chat --backend <name>    Chat using a specific backend
     bridgerapi start [--port n]         Start API server in the foreground
-    bridgerapi start --backend <name>   Start forcing a specific backend for all requests
+    bridgerapi start --backend <name>   Start forcing a specific backend
+    bridgerapi chat [--model m]         Chat in the terminal
+    bridgerapi chat --backend <name>    Chat using a specific backend
+    bridgerapi key                      Show your OpenAI-compatible API key
+    bridgerapi key reset                Regenerate the API key
     bridgerapi install [--port n]       Install as a background service
     bridgerapi uninstall                Remove background service
     bridgerapi status                   Show service status
     bridgerapi config                   Show saved configuration
-    bridgerapi config set backend=<b>   Set default backend (claude|gemini|codex|copilot|droid)
+    bridgerapi config set backend=<b>   Set default backend
     bridgerapi config set port=<n>      Set default port
     bridgerapi config reset             Clear saved configuration
     bridgerapi backend                  List all backends (built-in + custom)
     bridgerapi backend add              Add a custom CLI backend interactively
 
   Built-in backends: claude, gemini, codex, copilot, droid
-  Custom backends:   add any AI CLI via "bridgerapi backend add"
   `.trim());
 }
 function parseArgs() {
   const cfg = loadConfig();
   const args = process.argv.slice(2);
-  const cmd2 = args[0] ?? "";
-  let port2 = cfg.port ?? DEFAULT_PORT;
-  let model2;
-  let backend2;
-  const rest2 = [];
+  const cmd = args[0] ?? "";
+  let port = cfg.port ?? DEFAULT_PORT;
+  let model;
+  let backend;
+  const rest = [];
   for (let i = 1; i < args.length; i++) {
     if ((args[i] === "--port" || args[i] === "-p") && args[i + 1]) {
-      port2 = parseInt(args[++i]);
+      port = parseInt(args[++i]);
     } else if ((args[i] === "--model" || args[i] === "-m") && args[i + 1]) {
-      model2 = args[++i];
+      model = args[++i];
     } else if ((args[i] === "--backend" || args[i] === "-b") && args[i + 1]) {
-      backend2 = args[++i];
+      backend = args[++i];
     } else {
-      rest2.push(args[i]);
+      rest.push(args[i]);
     }
   }
-  return { cmd: cmd2, port: port2, model: model2, backend: backend2, rest: rest2 };
+  return { cmd, port, model, backend, rest };
 }
-var { cmd, port, model, backend, rest } = parseArgs();
-switch (cmd) {
-  case "":
-  case "setup":
-    cmdSetup();
-    break;
-  case "chat":
-    cmdChat(model, backend);
-    break;
-  case "start":
-    cmdStart(port, backend);
-    break;
-  case "install":
-    cmdInstall(port, backend);
-    break;
-  case "uninstall":
-    cmdUninstall();
-    break;
-  case "status":
-    cmdStatus(port);
-    break;
-  case "config":
-    cmdConfig(rest);
-    break;
-  case "backend":
-    if (rest[0] === "add") cmdBackendAdd();
-    else cmdBackendList();
-    break;
-  case "help":
-  case "--help":
-  case "-h":
-    showHelp();
-    break;
-  default:
-    showHelp();
-    process.exit(1);
+async function main() {
+  const { cmd, port, model, backend, rest } = parseArgs();
+  switch (cmd) {
+    case "":
+    case "setup":
+      await cmdSetup();
+      break;
+    case "chat":
+      await cmdChat(model, backend);
+      break;
+    case "start":
+      cmdStart(port, backend);
+      break;
+    case "install":
+      cmdInstall(port, backend);
+      break;
+    case "uninstall":
+      cmdUninstall();
+      break;
+    case "status":
+      cmdStatus(port);
+      break;
+    case "key":
+      cmdKey(rest);
+      break;
+    case "config":
+      cmdConfig(rest);
+      break;
+    case "backend":
+      if (rest[0] === "add") await cmdBackendAdd();
+      else await cmdBackendList();
+      break;
+    case "help":
+    case "--help":
+    case "-h":
+      showHelp();
+      break;
+    default:
+      showHelp();
+      process.exit(1);
+  }
 }
+main().catch((err) => {
+  console.error("  Fatal:", err.message);
+  process.exit(1);
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bridgerapi",
-  "version": "1.9.1",
+  "version": "2.0.0",
   "description": "Turn any AI CLI (Claude Code, Gemini, Codex, GitHub Copilot) into an OpenAI-compatible API — no API keys needed",
   "keywords": [
     "claude",