billion-context 0.1.63 → 0.1.64-pr.360.210

package/dist/index.js

@@ -47708,8 +47708,9 @@ function loadOptions(env = process.env) {
   const webProxy = nonEmpty(fileConfig.upstreamProxy);
   const configProxy = nonEmpty(fileConfig.proxy);
   const rawProxyMode = env.BILI_UPSTREAM_PROXY_MODE ?? fileConfig.upstreamProxyMode ?? (webProxy ? "manual" : void 0);
-  const proxyMode = parseUpstreamProxyMode(rawProxyMode);
-  const explicitDirect = proxyMode === "direct" && rawProxyMode === "direct";
+  const effectiveMode = rawProxyMode ?? "direct";
+  const proxyMode = parseUpstreamProxyMode(effectiveMode);
+  const explicitDirect = proxyMode === "direct" && !biliProxy;
   const proxy = biliProxy ?? (proxyMode === "direct" ? "" : proxyMode === "manual" ? webProxy ?? configProxy : configProxy);
   const proxySource = biliProxy ? "bili-env" : proxyMode === "direct" ? "direct" : proxyMode === "manual" && webProxy ? "web-manual" : configProxy ? "config" : "auto";
   const httpProxy = nonEmpty(env.HTTP_PROXY ?? env.http_proxy);
@@ -50625,6 +50626,153 @@ import { readFileSync as readFileSync3 } from "fs";
 import { dirname as dirname4, join as join3 } from "path";
 import { fileURLToPath } from "url";
 
+// src/web/page.ts
+import { existsSync as existsSync3 } from "fs";
+
+// src/ca.ts
+var import_node_forge = __toESM(require_lib(), 1);
+import fs2 from "fs";
+import path6 from "path";
+import tls2 from "tls";
+var ROOT_CERT_FILE = "root-ca.pem";
+var ROOT_KEY_FILE = "root-ca-key.pem";
+var COMBINED_CA_FILE = "combined-ca.pem";
+var ROOT_CN = "billion-context MITM Root CA";
+var PLATFORM_CA_CANDIDATES = process.platform === "darwin" ? ["/etc/ssl/cert.pem", "/private/etc/ssl/cert.pem"] : [
+  "/etc/ssl/certs/ca-certificates.crt",
+  "/etc/pki/tls/certs/ca-bundle.crt",
+  "/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem",
+  "/etc/ssl/ca-bundle.pem",
+  "/etc/ssl/cert.pem"
+];
+var rootCertPem;
+var rootKeyPem;
+var rootCert;
+var rootKey;
+var secureContextCache = /* @__PURE__ */ new Map();
+var SECURE_CONTEXT_CACHE_MAX = 64;
+function rootCaPath() {
+  return path6.join(caDir(), ROOT_CERT_FILE);
+}
+function collectSystemCaPems(env = process.env) {
+  const pems = [];
+  const seen = /* @__PURE__ */ new Set();
+  const pushFile = (file) => {
+    try {
+      const text = fs2.readFileSync(file, "utf8");
+      if (!text.includes("BEGIN CERTIFICATE") || seen.has(text)) return false;
+      seen.add(text);
+      pems.push(text);
+      return true;
+    } catch {
+    }
+    return false;
+  };
+  const userBundle = env.SSL_CERT_FILE?.trim();
+  if (userBundle && pushFile(userBundle)) return pems;
+  for (const candidate of PLATFORM_CA_CANDIDATES) {
+    if (pushFile(candidate)) break;
+  }
+  return pems;
+}
+function writeCombinedBundle() {
+  const certs = /* @__PURE__ */ new Set();
+  for (const pem of collectSystemCaPems()) certs.add(pem.trim());
+  for (const pem of tls2.rootCertificates) certs.add(pem.trim());
+  certs.add(rootCertPem.trim());
+  const body = [...certs].map((pem) => pem.endsWith("\n") ? pem : pem + "\n").join("");
+  fs2.writeFileSync(path6.join(caDir(), COMBINED_CA_FILE), body, { mode: 420 });
+}
+function generateRootCA() {
+  const keys = import_node_forge.default.pki.rsa.generateKeyPair({ bits: 2048 });
+  const cert = import_node_forge.default.pki.createCertificate();
+  cert.publicKey = keys.publicKey;
+  cert.serialNumber = "01";
+  cert.validity.notBefore = /* @__PURE__ */ new Date();
+  cert.validity.notAfter = /* @__PURE__ */ new Date();
+  cert.validity.notAfter.setFullYear(cert.validity.notBefore.getFullYear() + 10);
+  const attrs = [
+    { name: "commonName", value: ROOT_CN },
+    { name: "organizationName", value: "billion-context" }
+  ];
+  cert.setSubject(attrs);
+  cert.setIssuer(attrs);
+  cert.setExtensions([
+    { name: "basicConstraints", cA: true },
+    { name: "keyUsage", keyCertSign: true, cRLSign: true, digitalSignature: true },
+    { name: "subjectKeyIdentifier" }
+  ]);
+  cert.sign(keys.privateKey, import_node_forge.default.md.sha256.create());
+  return {
+    cert: import_node_forge.default.pki.certificateToPem(cert),
+    key: import_node_forge.default.pki.privateKeyToPem(keys.privateKey)
+  };
+}
+function ensureRootCA() {
+  if (rootCertPem && rootKeyPem) {
+    writeCombinedBundle();
+    return;
+  }
+  const dir = caDir();
+  fs2.mkdirSync(dir, { recursive: true });
+  const certPath = path6.join(dir, ROOT_CERT_FILE);
+  const keyPath = path6.join(dir, ROOT_KEY_FILE);
+  if (fs2.existsSync(certPath) && fs2.existsSync(keyPath)) {
+    rootCertPem = fs2.readFileSync(certPath, "utf8");
+    rootKeyPem = fs2.readFileSync(keyPath, "utf8");
+    rootCert = import_node_forge.default.pki.certificateFromPem(rootCertPem);
+    rootKey = import_node_forge.default.pki.privateKeyFromPem(rootKeyPem);
+    writeCombinedBundle();
+    return;
+  }
+  const { cert, key } = generateRootCA();
+  fs2.writeFileSync(certPath, cert, { mode: 420 });
+  fs2.writeFileSync(keyPath, key, { mode: 384 });
+  rootCertPem = cert;
+  rootKeyPem = key;
+  rootCert = import_node_forge.default.pki.certificateFromPem(cert);
+  rootKey = import_node_forge.default.pki.privateKeyFromPem(key);
+  writeCombinedBundle();
+}
+function getSecureContext(host) {
+  if (!rootCertPem || !rootKeyPem || !rootCert || !rootKey) {
+    throw new Error("CA not initialized \u2014 call ensureRootCA() first");
+  }
+  const cached = secureContextCache.get(host);
+  if (cached) {
+    secureContextCache.delete(host);
+    secureContextCache.set(host, cached);
+    return cached;
+  }
+  const keys = import_node_forge.default.pki.rsa.generateKeyPair({ bits: 2048 });
+  const cert = import_node_forge.default.pki.createCertificate();
+  cert.publicKey = keys.publicKey;
+  cert.serialNumber = Date.now().toString() + Math.floor(Math.random() * 1e6).toString();
+  cert.validity.notBefore = /* @__PURE__ */ new Date();
+  cert.validity.notAfter = /* @__PURE__ */ new Date();
+  cert.validity.notAfter.setFullYear(cert.validity.notBefore.getFullYear() + 2);
+  cert.setSubject([{ name: "commonName", value: host }]);
+  cert.setIssuer(rootCert.subject.attributes);
+  cert.setExtensions([
+    { name: "basicConstraints", cA: false },
+    { name: "keyUsage", digitalSignature: true, keyEncipherment: true },
+    { name: "extKeyUsage", serverAuth: true },
+    { name: "subjectAltName", altNames: [{ type: 2, value: host }] }
+  ]);
+  cert.sign(rootKey, import_node_forge.default.md.sha256.create());
+  const ctx = tls2.createSecureContext({
+    cert: import_node_forge.default.pki.certificateToPem(cert),
+    key: import_node_forge.default.pki.privateKeyToPem(keys.privateKey),
+    ca: rootCertPem
+  });
+  secureContextCache.set(host, ctx);
+  if (secureContextCache.size > SECURE_CONTEXT_CACHE_MAX) {
+    const oldest = secureContextCache.keys().next().value;
+    if (oldest !== void 0) secureContextCache.delete(oldest);
+  }
+  return ctx;
+}
+
 // src/web/client.ts
 var WEB_CLIENT = `
 const byId=(id)=>document.getElementById(id);
@@ -50657,7 +50805,13 @@ var WEB_STYLES = `
 `;
 
 // src/web/page.ts
+function escapeHtml(value) {
+  return value.replace(/[&<>"']/g, (char) => char === "&" ? "&amp;" : char === "<" ? "&lt;" : char === ">" ? "&gt;" : char === '"' ? "&quot;" : "&#39;");
+}
 function renderPage(origin, version2) {
+  const caPath = rootCaPath();
+  const caPathEsc = escapeHtml(caPath);
+  const caReady = existsSync3(caPath);
   return `<!doctype html><html lang="zh-CN"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><title>billion-context</title><style>${WEB_STYLES}</style></head><body>
 <div class="app"><aside class="sidebar"><div class="brand"><div class="brand-title">billion<span>-context</span></div><div class="version">v${version2}</div></div><a class="fork-ribbon" href="https://github.com/ranxianglei/billion-context" target="_blank" rel="noopener">\u2605 Fork me on GitHub</a><nav class="nav"><button class="active" data-page="overview">\u6982\u89C8</button><button data-page="routing">\u63A5\u5165</button><button data-page="upstream">\u4E0A\u6E38</button><button data-page="sessions">\u4F1A\u8BDD</button><button data-page="settings">\u8BBE\u7F6E</button></nav></aside>
 <main class="main"><section id="page-overview" class="page active"><h1>\u6982\u89C8</h1><p class="lead">\u672C\u5730\u8DEF\u7531\u4E0E\u4E0A\u6E38\u7F51\u7EDC\u76F8\u4E92\u72EC\u7ACB\uFF0CACP \u538B\u7F29\u8FD0\u884C\u5728\u4E24\u8005\u4E4B\u95F4\u3002</p><div class="grid"><div class="card"><h2>\u670D\u52A1\u5730\u5740</h2><p class="mono">${origin}</p></div><div class="card"><h2>\u5BA2\u6237\u7AEF\u63A5\u5165</h2><p class="status">\u5728"\u63A5\u5165"\u9875\u5C06\u5404\u5BA2\u6237\u7AEF\uFF08Codex / Claude Code / OpenCode / Pi \u7B49\uFF09\u7684\u6D41\u91CF\u8DEF\u7531\u5230 bili\u3002</p></div></div></section>
@@ -50672,14 +50826,14 @@ function renderPage(origin, version2) {
 <div class="card"><div class="card-head"><h2>\u5176\u4ED6\uFF08Cursor / Aider / Continue\uFF09</h2><button class="btn small copy-btn" data-copy="${origin}/bili/">\u590D\u5236</button></div><dl class="kv"><dt>\u89C4\u5219</dt><dd>\u4EFB\u610F baseURL \u524D\u52A0 <span class="mono">${origin}/bili/</span></dd><dt>\u793A\u4F8B</dt><dd class="mono">${origin}/bili/https://api.openai.com/v1</dd></dl></div>
 <h2 class="section-title">B. \u8BC1\u4E66\u63A5\u5165\u65B9\u5F0F\uFF08zcode \u7B49\u7C7B\u578B\uFF09</h2>
 <p class="hint">\u4E0D\u652F\u6301\u6539 URL \u7684\u5BA2\u6237\u7AEF\uFF08endpoint \u786C\u7F16\u7801\uFF09\u9700 MITM \u900F\u660E\u4EE3\u7406\uFF0C\u8BBE HTTPS_PROXY + \u4FE1\u4EFB CA \u8BC1\u4E66\u3002</p>
-<div class="card"><div class="card-head"><h2>ZCode\uFF08\u7F16\u7A0B\u5957\u9910\uFF09</h2><span class="badge">MITM</span></div><dl class="kv"><dt>\u65B9\u5F0F</dt><dd>MITM \u900F\u660E\u4EE3\u7406</dd><dt>\u8BBE\u7F6E</dt><dd>Settings \u2192 Network \u2192 HTTP Proxy = <span class="mono">${origin}</span></dd><dt>CA \u8BC1\u4E66</dt><dd class="mono">~/.local/share/billion-context/ca/root-ca.pem</dd></dl></div></section>
+<div class="card"><div class="card-head"><h2>ZCode\uFF08\u7F16\u7A0B\u5957\u9910\uFF09</h2><span class="badge">MITM</span><button class="btn small copy-btn" data-copy="${caPathEsc}">\u590D\u5236 CA \u8DEF\u5F84</button></div><dl class="kv"><dt>\u65B9\u5F0F</dt><dd>MITM \u900F\u660E\u4EE3\u7406</dd><dt>\u8BBE\u7F6E</dt><dd>Settings \u2192 Network \u2192 HTTP Proxy = <span class="mono">${origin}</span></dd><dt>CA \u8BC1\u4E66</dt><dd class="mono">${caPathEsc}${caReady ? "" : "\uFF08\u5C1A\u672A\u751F\u6210\uFF0C\u542F\u52A8\u4EE3\u7406\u540E\u81EA\u52A8\u521B\u5EFA\uFF09"}</dd></dl><p class="hint">CA \u8DEF\u5F84\u662F\u672C\u673A bili \u5B9E\u9645\u751F\u6210\u7684\u7EDD\u5BF9\u8DEF\u5F84\uFF0C\u70B9"\u590D\u5236 CA \u8DEF\u5F84"\u540E\u76F4\u63A5\u7C98\u8D34\u8FDB ZCode\u3002\u26A0\uFE0F Windows \u4E0A ZCode \u4E0D\u4F1A\u5C55\u5F00 <span class="mono">~</span>\uFF0C\u8BF7\u52FF\u624B\u586B <span class="mono">~/\u2026</span> \u5F62\u5F0F\u7684\u8DEF\u5F84\u3002</p></div></section>
 <section id="page-upstream" class="page"><h1>\u4E0A\u6E38\u7F51\u7EDC</h1><p class="lead">\u63A7\u5236 bili \u5982\u4F55\u8BBF\u95EE\u771F\u5B9E Provider\uFF0C\u4E0D\u4F1A\u6539\u53D8\u5BA2\u6237\u7AEF\u7684\u672C\u5730\u8DEF\u7531\u5730\u5740\u3002</p><div class="card"><div class="card-head"><h2>\u5168\u5C40\u4EE3\u7406</h2></div><div class="modes"><label><input type="radio" name="proxy-mode" value="direct" checked>\u76F4\u8FDE\uFF08\u9ED8\u8BA4\uFF09</label><label><input type="radio" name="proxy-mode" value="manual">\u624B\u52A8\u4EE3\u7406</label><label><input type="radio" name="proxy-mode" value="auto">\u81EA\u52A8\uFF08\u8DDF\u968F\u7CFB\u7EDF\uFF09</label></div><div class="field"><label>HTTP / HTTPS Proxy</label><input id="proxy-url" class="mono" placeholder="http://127.0.0.1:7897"></div><dl class="kv"><dt>\u5F53\u524D\u6765\u6E90</dt><dd id="upstream-source">\u76F4\u8FDE</dd><dt>\u6709\u6548\u4EE3\u7406</dt><dd id="upstream-effective" class="mono">direct</dd><dt>\u7CFB\u7EDF PAC</dt><dd id="upstream-pac" class="mono">\u2014</dd><dt>\u72B6\u6001</dt><dd id="upstream-state" class="status">\u5C1A\u672A\u6D4B\u8BD5</dd></dl><div class="actions"><button id="save-upstream" class="btn primary">\u4FDD\u5B58\u5E76\u70ED\u66F4\u65B0</button><button id="test-upstream" class="btn">\u6D4B\u8BD5\u8FDE\u63A5</button></div></div><div class="card"><div class="card-head"><h2>\u6309 URL \u8986\u76D6</h2></div><p class="status">\u4E3A\u7279\u5B9A Provider \u5355\u72EC\u8BBE\u7F6E\u4E0A\u6E38\u4EE3\u7406\uFF0C\u8986\u76D6\u5168\u5C40\u8BBE\u7F6E\u3002\u7559\u7A7A = \u7EE7\u627F\u5168\u5C40\u3002</p><div id="upstream-overrides" class="status">\u52A0\u8F7D\u4E2D</div><div class="actions"><button id="save-overrides" class="btn primary">\u4FDD\u5B58\u8986\u76D6\u5E76\u70ED\u66F4\u65B0</button></div></div></section>
 <section id="page-sessions" class="page"><div class="card-head"><div><h1>\u4F1A\u8BDD</h1><p class="lead">ACP \u538B\u7F29\u72B6\u6001\u4E0E\u4E0A\u6E38\u7528\u91CF\u3002</p></div><button id="refresh-sessions" class="btn">\u5237\u65B0</button></div><div class="card"><table><thead><tr><th>\u6807\u9898</th><th>\u534F\u8BAE</th><th>\u6807\u8BC6</th><th>\u8BF7\u6C42</th><th>\u4E0A\u4E0B\u6587</th><th>\u6700\u540E\u6D3B\u52A8</th></tr></thead><tbody id="sessions-body"></tbody></table></div></section>
 <section id="page-settings" class="page"><h1>\u9AD8\u7EA7\u8BBE\u7F6E</h1><p class="lead">\u76F4\u63A5\u7F16\u8F91 providers JSON\uFF08\u6DFB\u52A0\u65B0 Provider\u3001\u914D\u7F6E\u6A21\u578B\u4E0A\u4E0B\u6587\u7A97\u53E3\u3001\u6309 URL \u4EE3\u7406\u7B49\uFF09\uFF1B\u4FDD\u5B58\u540E\u7ACB\u5373\u70ED\u66F4\u65B0\u3002</p><div class="card"><div class="field"><label>providers JSON</label><textarea id="providers-json">{}</textarea></div><div class="actions"><button id="save-providers" class="btn primary">\u4FDD\u5B58\u5E76\u5E94\u7528</button></div></div><div class="card"><div class="card-head"><h2>\u538B\u7F29\u53C2\u6570\uFF08\u5168\u5C40\uFF09</h2></div><p class="status">\u5168\u5C40 compress \u914D\u7F6E\uFF08modelContextLimit / maxContextLimit / emergencyThresholdPercent / nudgeGrowthTokens / preserveRecentMessages / preserveRecentTokens / minCompressRange / tiers / injectTool / injectNudge\uFF09\u3002\u4FDD\u5B58\u540E\u70ED\u66F4\u65B0\uFF0C\u65E0\u9700\u91CD\u542F\u3002\u7F6E\u7A7A = \u6062\u590D\u9ED8\u8BA4\u3002</p><div class="field"><label>compress JSON</label><textarea id="compress-json" placeholder='{"modelContextLimit": 200000}'></textarea></div><div class="actions"><button id="save-compress" class="btn primary">\u4FDD\u5B58\u5E76\u70ED\u66F4\u65B0</button></div></div></section></main></div><div id="toast" class="toast"></div><script>${WEB_CLIENT}</script></body></html>`;
 }
 
 // src/web/api.ts
-import { closeSync, existsSync as existsSync3, fsyncSync, mkdirSync as mkdirSync4, openSync, renameSync as renameSync2, unlinkSync as unlinkSync2, writeFileSync as writeFileSync3 } from "fs";
+import { closeSync, existsSync as existsSync4, fsyncSync, mkdirSync as mkdirSync4, openSync, renameSync as renameSync2, unlinkSync as unlinkSync2, writeFileSync as writeFileSync3 } from "fs";
 import { dirname as dirname3 } from "path";
 import { randomUUID as randomUUID2 } from "crypto";
 function readConfig() {
@@ -50687,7 +50841,7 @@ function readConfig() {
   return parsed && typeof parsed === "object" && !Array.isArray(parsed) ? parsed : {};
 }
 function configParseError() {
-  if (!existsSync3(configFile())) return null;
+  if (!existsSync4(configFile())) return null;
   const parsed = safeReadJson(configFile());
   if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) return null;
   return `config file is not valid JSON: ${configFile()}`;
@@ -52736,6 +52890,65 @@ async function compressLoopResponsesJson(initialResponse, ctx, requestBody, requ
   return current;
 }
 
+// src/acp-panel.ts
+var PANEL_BOX_TOP = "\u256D";
+var PANEL_BOX_TITLE = "ACP Context Analysis";
+var PANEL_FALLBACK_HEADER = "\u{1F4CA} ACP status";
+function isAcpPanelText(text) {
+  const t = text.trim();
+  if (t.length === 0) return false;
+  if (t.startsWith(PANEL_BOX_TOP) && t.includes(PANEL_BOX_TITLE)) return true;
+  if (t.startsWith(PANEL_FALLBACK_HEADER)) return true;
+  return false;
+}
+function messageText(content) {
+  if (typeof content === "string") return content;
+  if (Array.isArray(content)) {
+    let joined = "";
+    for (const part of content) {
+      const p2 = part;
+      if (p2 === null || typeof p2 !== "object") return void 0;
+      const pt2 = p2.type;
+      if (pt2 !== void 0 && pt2 !== "text" && pt2 !== "input_text" && pt2 !== "output_text") return void 0;
+      if (typeof p2.text === "string") joined += p2.text;
+    }
+    return joined;
+  }
+  return void 0;
+}
+function stripAcpPanelMessages(messages) {
+  if (!Array.isArray(messages)) return 0;
+  let stripped = 0;
+  for (let i = messages.length - 1; i >= 0; i--) {
+    const rec = messages[i];
+    if (rec === null || typeof rec !== "object") continue;
+    if (rec.role !== "user") continue;
+    const text = messageText(rec.content);
+    if (text !== void 0 && isAcpPanelText(text)) {
+      messages.splice(i, 1);
+      stripped++;
+    }
+  }
+  return stripped;
+}
+function stripAcpPanelResponsesInput(input) {
+  if (!Array.isArray(input)) return 0;
+  let stripped = 0;
+  for (let i = input.length - 1; i >= 0; i--) {
+    const rec = input[i];
+    if (rec === null || typeof rec !== "object") continue;
+    const type = rec.type;
+    if (type !== "message" && type !== void 0) continue;
+    if (rec.role !== "user") continue;
+    const text = messageText(rec.content);
+    if (text !== void 0 && isAcpPanelText(text)) {
+      input.splice(i, 1);
+      stripped++;
+    }
+  }
+  return stripped;
+}
+
 // src/stream-openai.ts
 function rewriteOpenaiJsonResponse(body, ctx) {
   if (!body || typeof body !== "object") return body;
@@ -53344,13 +53557,13 @@ function buildStatusPanel(input) {
 
 // src/plugin.ts
 import { fileURLToPath as fileURLToPath2 } from "url";
-import fs2 from "fs";
-import path6 from "path";
+import fs3 from "fs";
+import path7 from "path";
 var PROXY_VERSION = (() => {
   try {
     const here = fileURLToPath2(import.meta.url);
-    const pkg = path6.join(path6.dirname(here), "..", "package.json");
-    return JSON.parse(fs2.readFileSync(pkg, "utf8")).version ?? "dev";
+    const pkg = path7.join(path7.dirname(here), "..", "package.json");
+    return JSON.parse(fs3.readFileSync(pkg, "utf8")).version ?? "dev";
   } catch {
     return "dev";
   }
@@ -53362,8 +53575,8 @@ var PLUGIN_PROTOCOL_VERSION = 1;
 var VERSION = (() => {
   try {
     const here = fileURLToPath2(import.meta.url);
-    const pkg = path6.join(path6.dirname(here), "..", "package.json");
-    return JSON.parse(fs2.readFileSync(pkg, "utf8")).version ?? "dev";
+    const pkg = path7.join(path7.dirname(here), "..", "package.json");
+    return JSON.parse(fs3.readFileSync(pkg, "utf8")).version ?? "dev";
   } catch {
     return "dev";
   }
@@ -53392,14 +53605,14 @@ function pluginReportedContextWindow(headers) {
 var MAX_PLUGIN_CONVERSATIONS = 1024;
 var conversations = /* @__PURE__ */ new Map();
 var remembered = /* @__PURE__ */ new Map();
-var conversationsFile = () => path6.join(stateDir(), "plugin-conversations.json");
+var conversationsFile = () => path7.join(stateDir(), "plugin-conversations.json");
 var conversationsSaveTimer;
 function writeConversationsFile() {
   try {
     const obj = {};
     for (const [k2, v2] of conversations) obj[k2] = v2;
-    fs2.mkdirSync(stateDir(), { recursive: true });
-    fs2.writeFileSync(conversationsFile(), JSON.stringify(obj));
+    fs3.mkdirSync(stateDir(), { recursive: true });
+    fs3.writeFileSync(conversationsFile(), JSON.stringify(obj));
   } catch {
   }
 }
@@ -53419,7 +53632,7 @@ function flushConversations() {
 }
 function loadConversations() {
   try {
-    const raw = fs2.readFileSync(conversationsFile(), "utf8");
+    const raw = fs3.readFileSync(conversationsFile(), "utf8");
     const obj = JSON.parse(raw);
     for (const [k2, v2] of Object.entries(obj)) {
       if (v2 && typeof v2.sessionId === "string" && v2.sessionId.length > 0) {
@@ -53880,147 +54093,6 @@ async function pipePluginJson(stream2, res, session, protocol) {
 // src/mitm.ts
 import tls3 from "tls";
 
-// src/ca.ts
-var import_node_forge = __toESM(require_lib(), 1);
-import fs3 from "fs";
-import path7 from "path";
-import tls2 from "tls";
-var ROOT_CERT_FILE = "root-ca.pem";
-var ROOT_KEY_FILE = "root-ca-key.pem";
-var COMBINED_CA_FILE = "combined-ca.pem";
-var ROOT_CN = "billion-context MITM Root CA";
-var PLATFORM_CA_CANDIDATES = process.platform === "darwin" ? ["/etc/ssl/cert.pem", "/private/etc/ssl/cert.pem"] : [
-  "/etc/ssl/certs/ca-certificates.crt",
-  "/etc/pki/tls/certs/ca-bundle.crt",
-  "/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem",
-  "/etc/ssl/ca-bundle.pem",
-  "/etc/ssl/cert.pem"
-];
-var rootCertPem;
-var rootKeyPem;
-var rootCert;
-var rootKey;
-var secureContextCache = /* @__PURE__ */ new Map();
-var SECURE_CONTEXT_CACHE_MAX = 64;
-function collectSystemCaPems(env = process.env) {
-  const pems = [];
-  const seen = /* @__PURE__ */ new Set();
-  const pushFile = (file) => {
-    try {
-      const text = fs3.readFileSync(file, "utf8");
-      if (!text.includes("BEGIN CERTIFICATE") || seen.has(text)) return false;
-      seen.add(text);
-      pems.push(text);
-      return true;
-    } catch {
-    }
-    return false;
-  };
-  const userBundle = env.SSL_CERT_FILE?.trim();
-  if (userBundle && pushFile(userBundle)) return pems;
-  for (const candidate of PLATFORM_CA_CANDIDATES) {
-    if (pushFile(candidate)) break;
-  }
-  return pems;
-}
-function writeCombinedBundle() {
-  const certs = /* @__PURE__ */ new Set();
-  for (const pem of collectSystemCaPems()) certs.add(pem.trim());
-  for (const pem of tls2.rootCertificates) certs.add(pem.trim());
-  certs.add(rootCertPem.trim());
-  const body = [...certs].map((pem) => pem.endsWith("\n") ? pem : pem + "\n").join("");
-  fs3.writeFileSync(path7.join(caDir(), COMBINED_CA_FILE), body, { mode: 420 });
-}
-function generateRootCA() {
-  const keys = import_node_forge.default.pki.rsa.generateKeyPair({ bits: 2048 });
-  const cert = import_node_forge.default.pki.createCertificate();
-  cert.publicKey = keys.publicKey;
-  cert.serialNumber = "01";
-  cert.validity.notBefore = /* @__PURE__ */ new Date();
-  cert.validity.notAfter = /* @__PURE__ */ new Date();
-  cert.validity.notAfter.setFullYear(cert.validity.notBefore.getFullYear() + 10);
-  const attrs = [
-    { name: "commonName", value: ROOT_CN },
-    { name: "organizationName", value: "billion-context" }
-  ];
-  cert.setSubject(attrs);
-  cert.setIssuer(attrs);
-  cert.setExtensions([
-    { name: "basicConstraints", cA: true },
-    { name: "keyUsage", keyCertSign: true, cRLSign: true, digitalSignature: true },
-    { name: "subjectKeyIdentifier" }
-  ]);
-  cert.sign(keys.privateKey, import_node_forge.default.md.sha256.create());
-  return {
-    cert: import_node_forge.default.pki.certificateToPem(cert),
-    key: import_node_forge.default.pki.privateKeyToPem(keys.privateKey)
-  };
-}
-function ensureRootCA() {
-  if (rootCertPem && rootKeyPem) {
-    writeCombinedBundle();
-    return;
-  }
-  const dir = caDir();
-  fs3.mkdirSync(dir, { recursive: true });
-  const certPath = path7.join(dir, ROOT_CERT_FILE);
-  const keyPath = path7.join(dir, ROOT_KEY_FILE);
-  if (fs3.existsSync(certPath) && fs3.existsSync(keyPath)) {
-    rootCertPem = fs3.readFileSync(certPath, "utf8");
-    rootKeyPem = fs3.readFileSync(keyPath, "utf8");
-    rootCert = import_node_forge.default.pki.certificateFromPem(rootCertPem);
-    rootKey = import_node_forge.default.pki.privateKeyFromPem(rootKeyPem);
-    writeCombinedBundle();
-    return;
-  }
-  const { cert, key } = generateRootCA();
-  fs3.writeFileSync(certPath, cert, { mode: 420 });
-  fs3.writeFileSync(keyPath, key, { mode: 384 });
-  rootCertPem = cert;
-  rootKeyPem = key;
-  rootCert = import_node_forge.default.pki.certificateFromPem(cert);
-  rootKey = import_node_forge.default.pki.privateKeyFromPem(key);
-  writeCombinedBundle();
-}
-function getSecureContext(host) {
-  if (!rootCertPem || !rootKeyPem || !rootCert || !rootKey) {
-    throw new Error("CA not initialized \u2014 call ensureRootCA() first");
-  }
-  const cached = secureContextCache.get(host);
-  if (cached) {
-    secureContextCache.delete(host);
-    secureContextCache.set(host, cached);
-    return cached;
-  }
-  const keys = import_node_forge.default.pki.rsa.generateKeyPair({ bits: 2048 });
-  const cert = import_node_forge.default.pki.createCertificate();
-  cert.publicKey = keys.publicKey;
-  cert.serialNumber = Date.now().toString() + Math.floor(Math.random() * 1e6).toString();
-  cert.validity.notBefore = /* @__PURE__ */ new Date();
-  cert.validity.notAfter = /* @__PURE__ */ new Date();
-  cert.validity.notAfter.setFullYear(cert.validity.notBefore.getFullYear() + 2);
-  cert.setSubject([{ name: "commonName", value: host }]);
-  cert.setIssuer(rootCert.subject.attributes);
-  cert.setExtensions([
-    { name: "basicConstraints", cA: false },
-    { name: "keyUsage", digitalSignature: true, keyEncipherment: true },
-    { name: "extKeyUsage", serverAuth: true },
-    { name: "subjectAltName", altNames: [{ type: 2, value: host }] }
-  ]);
-  cert.sign(rootKey, import_node_forge.default.md.sha256.create());
-  const ctx = tls2.createSecureContext({
-    cert: import_node_forge.default.pki.certificateToPem(cert),
-    key: import_node_forge.default.pki.privateKeyToPem(keys.privateKey),
-    ca: rootCertPem
-  });
-  secureContextCache.set(host, ctx);
-  if (secureContextCache.size > SECURE_CONTEXT_CACHE_MAX) {
-    const oldest = secureContextCache.keys().next().value;
-    if (oldest !== void 0) secureContextCache.delete(oldest);
-  }
-  return ctx;
-}
-
 // src/discover.ts
 import fs5 from "fs";
 import os2 from "os";
@@ -56070,6 +56142,10 @@ function prepareAnthropic(parsed, req, opts, core, config, prompts, log2, sessio
   let rebuiltMessages = parsed.messages;
   let systemOut = parsed.system;
   let toolsOut = parsed.tools;
+  const strippedPanels = stripAcpPanelMessages(parsed.messages);
+  if (strippedPanels > 0) {
+    log2("info", `[${sessionId}] stripped ${strippedPanels} ACP panel message(s) before projection (UI-only, issue #359)`);
+  }
   try {
     const { msgs, cacheControls } = anthropicToCore(parsed);
     originalMessages = msgs;
@@ -56126,6 +56202,10 @@ function prepareOpenai(parsed, req, opts, core, config, prompts, log2, session,
   const isTitleGen = maxTokens <= 200;
   const shouldInject = opts.compress.injectTool && !isTitleGen;
   const injectTools = shouldInject && !pluginMode;
+  const strippedPanels = stripAcpPanelMessages(parsed.messages);
+  if (strippedPanels > 0) {
+    log2("info", `[${sessionId}] stripped ${strippedPanels} ACP panel message(s) before projection (UI-only, issue #359)`);
+  }
   try {
     const { msgs, systemText } = openaiToCore(parsed);
     openaiSystemText = systemText;
@@ -56207,6 +56287,10 @@ function prepareResponses(parsed, req, opts, core, config, prompts, log2, sessio
   if (droppedEmpty > 0) {
     log2("info", `[${sessionId}] dropped ${droppedEmpty} whitespace-only message item(s) before projection (flattened-turn artifact)`);
   }
+  const strippedPanels = stripAcpPanelResponsesInput(parsed.input);
+  if (strippedPanels > 0) {
+    log2("info", `[${sessionId}] stripped ${strippedPanels} ACP panel message(s) before projection (UI-only, issue #359)`);
+  }
   const shouldInject = opts.compress.injectTool;
   const injectTools = shouldInject && !pluginMode;
   const isCompactionTrigger = hasCompactionTrigger(parsed.input);
@@ -56445,6 +56529,20 @@ function injectResponsesTool(tools, toolsToAdd = ACP_TOOLS_RESPONSES) {
   const additions = toolsToAdd.filter((t) => !present.has(t.name));
   return [...tools, ...additions];
 }
+var loggedUpstreamProxyDecisions = /* @__PURE__ */ new Set();
+function logUpstreamProxyDecision(opts, upstreamUrl, decision) {
+  if (!upstreamUrl) return;
+  let host = upstreamUrl;
+  try {
+    host = new URL(upstreamUrl).host;
+  } catch {
+  }
+  const key = `${host}|${decision.proxy ?? ""}|${decision.source}`;
+  if (loggedUpstreamProxyDecisions.has(key)) return;
+  loggedUpstreamProxyDecisions.add(key);
+  const via = decision.proxy ? `via ${maskUrlForLog(decision.proxy)}` : "direct";
+  logMsg(opts, "info", `[upstream-proxy] ${maskHostPortForLog(host)} ${via} (source=${decision.source})`);
+}
 function buildForwardTarget(req, opts, route, affinity, hopMarker) {
   const reqUrl = req.url ?? "";
   const isAbsoluteUrl = /^https?:\/\//i.test(reqUrl);
@@ -56468,8 +56566,9 @@ function buildForwardTarget(req, opts, route, affinity, hopMarker) {
   if (affinity && !clientConversationHeader(req.headers)) {
     headers["x-session-id"] = affinity;
   }
-  const proxyUrl = resolveProxy(opts.routes, opts.proxy, route?.rewrittenUrl ?? upstreamUrl, opts.proxyFallback);
-  return { upstreamUrl, headers, proxyUrl };
+  const decision = resolveProxyDecision(opts.routes, opts.proxy, route?.rewrittenUrl ?? upstreamUrl, opts.proxyFallback);
+  logUpstreamProxyDecision(opts, upstreamUrl, decision);
+  return { upstreamUrl, headers, proxyUrl: decision.proxy };
 }
 function isPreflightFailFast(outcome) {
   return "failFast" in outcome;
@@ -62263,6 +62362,8 @@ Launcher (bili pi / bili codex / bili claude / bili omp / bili opencode / bili h
   auto-whitelisted for MITM so the proxy TLS-terminates exactly the hosts the
   client uses; HTTP / localhost providers go direct. pi/claude trust the CA
   via NODE_EXTRA_CA_CERTS, codex via SSL_CERT_FILE. Proxy killed on client exit.
+  bili flags (-F, --mitm-domain, --port, ...) must precede the client name;
+  everything after the client name is passed through to the client.
     bili pi                               # launch pi through the proxy
     bili pi -- print "hi"                 # args after the client are passed through
     bili pi-test                          # pi through the proxy with extensions off (proxy owns compression)
@@ -62272,9 +62373,12 @@ Launcher (bili pi / bili codex / bili claude / bili omp / bili opencode / bili h
     bili hermes                           # launch hermes-agent through the proxy (/bili/ rewrite of ~/.hermes/config.yaml)
     bili dsh --profile web "task"         # launch deepseek-harness through the proxy (/bili/ rewrite of ~/.dsh/settings.yaml)
     bili test pi                          # quick end-to-end check of the pi path
-    bili pi --mitm-domain api.foo.com     # add a domain to the MITM whitelist
+    bili --mitm-domain api.foo.com pi     # add a domain to the MITM whitelist (flags precede the client)
+    bili -F http://127.0.0.1:7897 codex   # route bili's upstream through a proxy (gost-style -F)
 
 Options (override config file / env):
+  -F <url>                         upstream proxy to forward through (gost-style;
+                                   http://host:port; must precede the client name)
   --port <N>                       listen port (default 8787)
   --host <ADDR>                    listen host (default 127.0.0.1)
   --mitm-domain <domain>           extra MITM domain (repeatable; launcher only)
@@ -62353,6 +62457,7 @@ function parseArgs(argv) {
         exportOutput = val;
         break;
       }
+      case "-F":
       case "--port":
       case "--host":
       case "--config":
@@ -62369,6 +62474,7 @@ function parseArgs(argv) {
         else if (a === "--config") overrides.BILI_CONFIG_FILE = val;
         else if (a === "--origin") overrides.BILI_MCP_PROXY = val;
         else if (a === "--bin") process.env.BILI_CLIENT_BIN = val;
+        else if (a === "-F") overrides.BILI_UPSTREAM_PROXY = val;
         else overrides.BILI_PLUGIN_AGENT = val;
         break;
       }