billion-context 0.1.83 → 0.1.84-pr.360.366

package/dist/index.js

@@ -49370,6 +49370,7 @@ function subagentNamespace(identityValue, instructions) {
 
 // src/persist.ts
 import { createHash as createHash3 } from "crypto";
+import { existsSync as existsSync3, mkdirSync as mkdirSync3, writeFileSync as writeFileSync2 } from "fs";
 import { rm } from "fs/promises";
 import * as path5 from "path";
 
@@ -49806,6 +49807,7 @@ function rel(p2, base) {
 
 // src/persist.ts
 var PERSIST_VERSION = 3;
+var MIGRATION_MARKER = ".bili-migration-286.done";
 function mergeState(parsed) {
   const fresh = createInitialState();
   return {
@@ -49865,6 +49867,21 @@ var SessionStore = class {
     }
     return out;
   }
+  /** Single-pass boot (#401): ONE loadAll walk+parse, then the #286
+   *  identity migration over the SAME parsed map (no extra directory
+   *  walk), then hydration into Sessions. initSessions calls this instead
+   *  of migrateLegacyIds()+loadAll(), which walked and parsed the whole
+   *  tree twice per start. */
+  async boot() {
+    if (!this.enabled) return /* @__PURE__ */ new Map();
+    const loaded = await this.store.loadAll();
+    await this.applyLegacyMigration(loaded);
+    const out = /* @__PURE__ */ new Map();
+    for (const [id, envelope] of loaded) {
+      out.set(id, buildSession(envelope.payload));
+    }
+    return out;
+  }
   /** One-time migration for the #286 identity change: sessions persisted
    *  under the old derived hash id are re-keyed to the client-provided
    *  conversation value stored in meta.label (which is now the session id
@@ -49873,10 +49890,21 @@ var SessionStore = class {
    *  session, are deleted. Records without a label cannot be mapped and are
    *  left in place (they load under their old id but are never requested
    *  again — the new proxy 400s anonymous requests). Self-terminating:
-   *  after one pass no loaded id differs from its label. */
+   *  after one pass no loaded id differs from its label. A completion
+   *  marker makes it run ONCE EVER (#401): the old code re-scanned the tree
+   *  on every boot because unlabeled files are intentionally kept, so the
+   *  "one-time" log line repeated forever. */
   async migrateLegacyIds() {
     if (!this.enabled) return;
+    if (existsSync3(this.markerPath())) return;
     const loaded = await this.store.loadAll();
+    await this.applyLegacyMigration(loaded);
+  }
+  markerPath() {
+    return path5.join(this.dir, MIGRATION_MARKER);
+  }
+  async applyLegacyMigration(loaded) {
+    if (existsSync3(this.markerPath())) return;
     const claimed = /* @__PURE__ */ new Set();
     const byLabel = /* @__PURE__ */ new Map();
     let unlabeled = 0;
@@ -49894,24 +49922,39 @@ var SessionStore = class {
       }
       const prev = byLabel.get(label);
       if (!prev || envelope.savedAt >= prev.savedAt) {
-        if (prev) await this.removeLegacyFile(prev.id, prev.session);
+        if (prev) {
+          await this.removeLegacyFile(prev.id, prev.session);
+          loaded.delete(prev.id);
+        }
         byLabel.set(label, { id, savedAt: envelope.savedAt, session });
       } else {
         await this.removeLegacyFile(id, session);
+        loaded.delete(id);
       }
     }
     let rekeyed = 0;
     for (const [label, { id, session }] of byLabel) {
       if (claimed.has(label)) {
         await this.removeLegacyFile(id, session);
+        loaded.delete(id);
         continue;
       }
       session.id = label;
       await this.store.writeNow(label, () => buildRecord(session));
       await this.removeLegacyFile(id, session);
+      const envelope = loaded.get(id);
+      if (envelope) {
+        loaded.set(label, { ...envelope, id: label, payload: { ...envelope.payload, id: label } });
+      }
+      loaded.delete(id);
       claimed.add(label);
       rekeyed++;
     }
+    try {
+      mkdirSync3(this.dir, { recursive: true });
+      writeFileSync2(this.markerPath(), String(Date.now()), "utf8");
+    } catch {
+    }
     if (rekeyed || unlabeled) {
       log("info", `[persist] one-time migration (#286): rekeyed ${rekeyed} legacy session(s), left ${unlabeled} unlabeled legacy file(s) in place`);
     }
@@ -49997,10 +50040,21 @@ function buildRecord(session) {
     createdAt: session.createdAt
   };
 }
+function isBlockView(v2) {
+  return !!v2 && typeof v2 === "object" && typeof v2.text === "string" && typeof v2.count === "number";
+}
 function buildSession(parsed) {
   const blockContents = /* @__PURE__ */ new Map();
   for (const [bid, content] of Object.entries(parsed.blockContents ?? {})) {
-    if (content && typeof content === "object") blockContents.set(bid, content);
+    if (!content || typeof content !== "object") continue;
+    const full = content.full;
+    if (!isBlockView(full)) continue;
+    const one = content.one;
+    const oneView = isBlockView(one) ? one : null;
+    blockContents.set(bid, {
+      one: oneView && !(oneView.text === full.text && oneView.count === full.count) ? oneView : null,
+      full
+    });
   }
   const meta = parsed.meta ?? {};
   const stats = parsed.stats ?? {};
@@ -50085,8 +50139,7 @@ async function initSessions() {
   initialized = true;
   const store = getStore();
   if (!store.enabled) return;
-  await store.migrateLegacyIds();
-  const loaded = await store.loadAll();
+  const loaded = await store.boot();
   if (loaded.size > MAX_SESSIONS) {
     const freshness = (s3) => Math.max(s3.createdAt ?? 0, s3.lastSeen ?? 0);
     const entries = [...loaded.entries()].sort((a, b2) => freshness(b2[1]) - freshness(a[1]));
@@ -50292,7 +50345,7 @@ function withStagedCompressGuidance(text) {
 }
 
 // src/decompress-shared.ts
-import { mkdirSync as mkdirSync3, unlinkSync, writeFileSync as writeFileSync2 } from "fs";
+import { mkdirSync as mkdirSync4, unlinkSync, writeFileSync as writeFileSync3 } from "fs";
 import { dirname as dirname2, join as join2 } from "path";
 import { tmpdir } from "os";
 var trackedTempFiles = [];
@@ -50339,7 +50392,7 @@ function resolveDecompress(args, ctx) {
   let body;
   let count;
   if (cached) {
-    const view = full ? cached.full : cached.one;
+    const view = full ? cached.full : cached.one ?? cached.full;
     body = view.text;
     count = view.count;
   } else {
@@ -50352,8 +50405,8 @@ function resolveDecompress(args, ctx) {
   const outPath = body.length > 1e4 ? join2(tmpdir(), `acp-decompress-${safeBlockId}-${Date.now()}.txt`) : null;
   if (outPath) {
     try {
-      mkdirSync3(dirname2(outPath), { recursive: true });
-      writeFileSync2(outPath, body, "utf8");
+      mkdirSync4(dirname2(outPath), { recursive: true });
+      writeFileSync3(outPath, body, "utf8");
       trackedTempFiles.push({ path: outPath, mtimeMs: Date.now() });
       reapTempFiles();
       return `${header}
@@ -50649,8 +50702,9 @@ ${reasons.map((r) => `- ${r}`).join("\n")}` : "";
       const full = collectBlockContent(res.state, b2, ctx.messages, { full: true });
       const one = collectBlockContent(res.state, b2, ctx.messages, { full: false });
       if (full.count > 0 || one.count > 0) {
+        const sameView = one.text === full.text && one.count === full.count;
         cacheBlockContent(ctx.session, b2.blockId, {
-          one: { text: one.text, count: one.count },
+          one: sameView ? null : { text: one.text, count: one.count },
           full: { text: full.text, count: full.count }
         });
       }
@@ -51032,7 +51086,7 @@ import { dirname as dirname4, join as join3 } from "path";
 import { fileURLToPath } from "url";
 
 // src/web/page.ts
-import { existsSync as existsSync3 } from "fs";
+import { existsSync as existsSync4 } from "fs";
 
 // src/ca.ts
 var import_node_forge = __toESM(require_lib(), 1);
@@ -51103,7 +51157,7 @@ function generateRootCA() {
   cert.setSubject(attrs);
   cert.setIssuer(attrs);
   cert.setExtensions([
-    { name: "basicConstraints", cA: true },
+    { name: "basicConstraints", cA: true, critical: true },
     { name: "keyUsage", keyCertSign: true, cRLSign: true, digitalSignature: true },
     { name: "subjectKeyIdentifier" }
   ]);
@@ -51139,16 +51193,10 @@ function ensureRootCA() {
   rootKey = import_node_forge.default.pki.privateKeyFromPem(key);
   writeCombinedBundle();
 }
-function getSecureContext(host) {
+function mintHostCert(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;
@@ -51158,16 +51206,35 @@ function getSecureContext(host) {
   cert.validity.notAfter.setFullYear(cert.validity.notBefore.getFullYear() + 2);
   cert.setSubject([{ name: "commonName", value: host }]);
   cert.setIssuer(rootCert.subject.attributes);
+  const rootSki = rootCert.generateSubjectKeyIdentifier().getBytes();
   cert.setExtensions([
     { name: "basicConstraints", cA: false },
     { name: "keyUsage", digitalSignature: true, keyEncipherment: true },
     { name: "extKeyUsage", serverAuth: true },
-    { name: "subjectAltName", altNames: [{ type: 2, value: host }] }
+    { name: "subjectAltName", altNames: [{ type: 2, value: host }] },
+    { name: "subjectKeyIdentifier" },
+    { name: "authorityKeyIdentifier", keyIdentifier: rootSki }
   ]);
   cert.sign(rootKey, import_node_forge.default.md.sha256.create());
+  return {
+    certPem: import_node_forge.default.pki.certificateToPem(cert),
+    keyPem: import_node_forge.default.pki.privateKeyToPem(keys.privateKey)
+  };
+}
+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 { certPem, keyPem } = mintHostCert(host);
   const ctx = tls2.createSecureContext({
-    cert: import_node_forge.default.pki.certificateToPem(cert),
-    key: import_node_forge.default.pki.privateKeyToPem(keys.privateKey),
+    cert: certPem,
+    key: keyPem,
     ca: rootCertPem
   });
   secureContextCache.set(host, ctx);
@@ -51216,7 +51283,7 @@ function escapeHtml(value) {
 function renderPage(origin, version2) {
   const caPath = rootCaPath();
   const caPathEsc = escapeHtml(caPath);
-  const caReady = existsSync3(caPath);
+  const caReady = existsSync4(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>
@@ -51238,7 +51305,7 @@ function renderPage(origin, version2) {
 }
 
 // src/web/api.ts
-import { closeSync, existsSync as existsSync4, fsyncSync, mkdirSync as mkdirSync4, openSync, renameSync as renameSync2, unlinkSync as unlinkSync2, writeFileSync as writeFileSync3 } from "fs";
+import { closeSync, existsSync as existsSync5, fsyncSync, mkdirSync as mkdirSync5, openSync, renameSync as renameSync2, unlinkSync as unlinkSync2, writeFileSync as writeFileSync4 } from "fs";
 import { dirname as dirname3 } from "path";
 import { randomUUID as randomUUID2 } from "crypto";
 function readConfig() {
@@ -51246,7 +51313,7 @@ function readConfig() {
   return parsed && typeof parsed === "object" && !Array.isArray(parsed) ? parsed : {};
 }
 function configParseError() {
-  if (!existsSync4(configFile())) return null;
+  if (!existsSync5(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()}`;
@@ -51264,12 +51331,12 @@ function readUpstreamSettings() {
 }
 function atomicWriteConfig(config) {
   const filePath = configFile();
-  mkdirSync4(dirname3(filePath), { recursive: true });
+  mkdirSync5(dirname3(filePath), { recursive: true });
   const tempPath = `${filePath}.${process.pid}.${randomUUID2()}.tmp`;
   let descriptor;
   try {
     descriptor = openSync(tempPath, "wx", 384);
-    writeFileSync3(descriptor, JSON.stringify(config, null, 2) + "\n", "utf8");
+    writeFileSync4(descriptor, JSON.stringify(config, null, 2) + "\n", "utf8");
     fsyncSync(descriptor);
     closeSync(descriptor);
     descriptor = void 0;
@@ -51947,10 +52014,11 @@ async function* runCompressLoop(upstream, ctx, requestBody, requestOptions, adap
         if (realCalls > 0) ctx.log(`[acp-loop] round ${round}: ${realCalls} real tool call(s) forwarded to client`);
       }
       if (proxyResults.length > 0) {
+        const requiresThinkingSignature = ctx.protocol === "anthropic";
         if (reasoningSegments.length > 0) {
           for (let i = 0; i < reasoningSegments.length; i++) {
             const seg = reasoningSegments[i];
-            if (seg.text.length === 0 || seg.signature.length === 0) continue;
+            if (seg.text.length === 0 || requiresThinkingSignature && seg.signature.length === 0) continue;
             const reasoningMsg = {
               id: i === 0 ? `acp_loop_r${round}_reasoning` : `acp_loop_r${round}_reasoning_${i + 1}`,
               role: "assistant",
@@ -52073,7 +52141,7 @@ async function* runCompressLoop(upstream, ctx, requestBody, requestOptions, adap
         try {
           respResult = await fetchUpstream(newBody);
         } catch (e) {
-          if (!(e instanceof UpstreamHttpError) || e.status < 400 || e.status >= 500 || degradedRetried || !coreMessages.some(isLoopThinking)) {
+          if (!(e instanceof UpstreamHttpError) || e.status < 400 || e.status >= 500 || degradedRetried || ctx.protocol !== "anthropic" || !coreMessages.some(isLoopThinking)) {
             throw e;
           }
           degradedRetried = true;
@@ -52295,6 +52363,7 @@ data: ${JSON.stringify(obj)}
 }
 async function* iterSseEvents(stream2) {
   const reader = stream2.getReader();
+  const decoder = new TextDecoder();
   let buf = "";
   try {
     while (true) {
@@ -52306,7 +52375,7 @@ async function* iterSseEvents(stream2) {
         break;
       }
       if (done) break;
-      buf += new TextDecoder().decode(value, { stream: true });
+      buf += decoder.decode(value, { stream: true });
       buf = buf.replace(/\r\n|\r/g, "\n");
       let idx;
       while ((idx = buf.indexOf("\n\n")) >= 0) {
@@ -52784,6 +52853,7 @@ function filterRealToolFragments(parsed, realIndexes) {
 }
 async function* iterSseChunks(stream2) {
   const reader = stream2.getReader();
+  const decoder = new TextDecoder();
   let buf = "";
   try {
     while (true) {
@@ -52795,7 +52865,7 @@ async function* iterSseChunks(stream2) {
         break;
       }
       if (done) break;
-      buf += new TextDecoder().decode(value, { stream: true });
+      buf += decoder.decode(value, { stream: true });
       buf = buf.replace(/\r\n|\r/g, "\n");
       let idx;
       while ((idx = buf.indexOf("\n\n")) >= 0) {
@@ -53121,6 +53191,7 @@ function createOpenaiAdapter(requestBody, clientSystem) {
 // src/loop/adapter-anthropic.ts
 async function* iterSseEvents2(stream2) {
   const reader = stream2.getReader();
+  const decoder = new TextDecoder();
   let buf = "";
   try {
     while (true) {
@@ -53132,7 +53203,7 @@ async function* iterSseEvents2(stream2) {
         break;
       }
       if (done) break;
-      buf += new TextDecoder().decode(value, { stream: true });
+      buf += decoder.decode(value, { stream: true });
       buf = buf.replace(/\r\n|\r/g, "\n");
       let idx;
       while ((idx = buf.indexOf("\n\n")) >= 0) {
@@ -53779,6 +53850,76 @@ ${FAKE_COMPLETION_HINT}`;
   return JSON.stringify(obj);
 }
 
+// src/acp-panel.ts
+var PANEL_BOX_TOP = "\u256D";
+var PANEL_BOX_TITLE = "ACP Context Analysis";
+var PANEL_BOX_FOOTER = "Tag visibility: tags injected to LLM only (deep copy), not persisted in session, not shown in terminal.";
+var PANEL_FALLBACK_HEADER = "\u{1F4CA} ACP status";
+function isAcpPanelText(text) {
+  const t = text.trim();
+  if (t.length === 0) return false;
+  return isBoxPanel(t) || isFallbackPanel(t);
+}
+function isBoxPanel(t) {
+  return t.startsWith(PANEL_BOX_TOP) && t.includes(PANEL_BOX_TITLE) && t.endsWith(PANEL_BOX_FOOTER);
+}
+function isFallbackPanel(t) {
+  const lines = t.split("\n");
+  if (lines[0] !== PANEL_FALLBACK_HEADER) return false;
+  for (let i = 1; i < lines.length; i++) {
+    const line = lines[i];
+    if (line.length > 0 && !line.startsWith("  ")) return false;
+  }
+  return true;
+}
+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") 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;
@@ -55505,6 +55646,7 @@ function readOmpConfig(ompHome) {
 }
 function parseHermesYaml(text) {
   const result = { providers: {} };
+  const candidates = /* @__PURE__ */ new Map();
   let mode = "none";
   let sectionIndent = -1;
   let entryIndent = -1;
@@ -55549,8 +55691,8 @@ function parseHermesYaml(text) {
         current = m2 ? m2[1] : null;
         if (current && !result.providers[current]) result.providers[current] = {};
       } else if (indent > entryIndent && current) {
-        const apiMatch = /^api:\s*(\S+)/.exec(trimmed);
-        if (apiMatch) result.providers[current].api = apiMatch[1];
+        const apiMatch = /^(base_url|url|api):\s*(\S+)/.exec(trimmed);
+        if (apiMatch) candidates.set(`${current}\0${apiMatch[1]}`, apiMatch[2]);
       }
     } else {
       const dashMatch = /^-\s+(.*)$/.exec(trimmed);
@@ -55567,6 +55709,10 @@ function parseHermesYaml(text) {
       }
     }
   }
+  for (const name of Object.keys(result.providers)) {
+    const pick = candidates.get(`${name}\0base_url`) ?? candidates.get(`${name}\0url`) ?? candidates.get(`${name}\0api`);
+    if (pick !== void 0) result.providers[name].api = pick;
+  }
   return result;
 }
 function readHermesConfig(hermesHome) {
@@ -56867,6 +57013,16 @@ function resolveUpstream(_opts, reqUrl, req) {
       }
     }
   }
+  if (reqUrl.startsWith("http://") || reqUrl.startsWith("https://")) {
+    try {
+      const u2 = new URL(reqUrl);
+      const ownHost = (req?.headers.host ?? "").toLowerCase();
+      if (u2.host.toLowerCase() !== ownHost) {
+        return { upstream: `${u2.protocol}//${u2.host}`, rewrittenUrl: reqUrl, tunnel: true };
+      }
+    } catch {
+    }
+  }
   return void 0;
 }
 async function startServer(opts) {
@@ -56964,7 +57120,7 @@ Content-Length: ${Buffer.byteLength(body)}\r
       );
     }
     if (opts.debug) {
-      log2("info", `[debug] build features: raw-HTTP-capture(on) | remote_compaction_v2-strip(on) | cert-MITM-launcher(on) | strip-acp-summary(on) \u2014 seeing this line confirms the launcher build (not registry 0.1.34)`);
+      log2("info", `[debug] build features: raw-HTTP-capture(${bodyDumpEnabled() ? "on" : "off"}) | remote_compaction_v2-strip(on) | cert-MITM-launcher(on) | strip-acp-summary(on) \u2014 seeing this line confirms the launcher build (not registry 0.1.34)`);
     }
   };
   const attemptListen = (port) => {
@@ -57604,6 +57760,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;
@@ -57693,6 +57853,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;
@@ -57778,6 +57942,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);
@@ -58640,10 +58808,10 @@ async function pipeThrough(stream2, res) {
   }
 }
 async function dumpStreamToFile(stream2, dir, name) {
-  const { mkdirSync: mkdirSync6, createWriteStream: createWriteStream2 } = await import("fs");
+  const { mkdirSync: mkdirSync7, createWriteStream: createWriteStream2 } = await import("fs");
   const { join: join4 } = await import("path");
   try {
-    mkdirSync6(dir, { recursive: true });
+    mkdirSync7(dir, { recursive: true });
     const ws2 = createWriteStream2(join4(dir, name));
     ws2.on("error", (e) => {
       logDumpFailure("SSE stream dump", e);
@@ -62704,7 +62872,6 @@ function selfDistFile(name) {
   return path15.join(selfPackageRoot(), "dist", name);
 }
 var LAUNCHER_DEFAULT_HOST = "127.0.0.1";
-var LAUNCHER_DEFAULT_PORT = 8787;
 var LAUNCH_CLIENTS = ["pi", "codex", "claude", "omp", "opencode", "hermes", "dsh", "pi-test"];
 var HEALTH_PATH = "/__bili/health";
 var HEALTH_POLL_INTERVAL_MS = 200;
@@ -62809,8 +62976,16 @@ function discoverRoutes(client, config) {
         if (url.protocol !== "http:" && url.protocol !== "https:") continue;
         if (hermesSeen.has(name)) continue;
         hermesSeen.add(name);
-        rewriteKeys.add(name);
-        httpRewrites.push({ key: name, realUpstream: real });
+        if (url.protocol === "https:") {
+          const host = url.hostname.toLowerCase();
+          if (host && !httpsSeen.has(host)) {
+            httpsSeen.add(host);
+            httpsDomains.push(host);
+          }
+        } else if (!rewriteKeys.has(name)) {
+          rewriteKeys.add(name);
+          httpRewrites.push({ key: name, realUpstream: real });
+        }
       } catch {
       }
     }
@@ -62841,8 +63016,23 @@ function discoverRoutes(client, config) {
 function discoverDomains(client, config) {
   return discoverRoutes(client, config).httpsDomains;
 }
-function buildPiEnv(origin, caPath, baseEnv) {
-  return { ...baseEnv, HTTPS_PROXY: origin, NODE_EXTRA_CA_CERTS: caPath, BILLION_CONTEXT_PROXY: origin };
+function buildPiEnv(origin, caPath, baseEnv, httpRewrites = [], httpsRewrites = []) {
+  const manifest = {};
+  for (const r of httpRewrites) {
+    if (r.key.length === 0 || r.realUpstream.length === 0) continue;
+    manifest[r.key] = wrapUpstream(origin, r.realUpstream);
+  }
+  for (const r of httpsRewrites) {
+    if (r.key.length === 0 || r.realUpstream.length === 0) continue;
+    manifest[r.key] = r.realUpstream;
+  }
+  return {
+    ...baseEnv,
+    HTTPS_PROXY: origin,
+    NODE_EXTRA_CA_CERTS: caPath,
+    BILLION_CONTEXT_PROXY: origin,
+    ...Object.keys(manifest).length > 0 ? { BILI_PROVIDER_REWRITES: JSON.stringify(manifest) } : {}
+  };
 }
 function buildCodexEnv(origin, caPath, baseEnv) {
   return { ...baseEnv, HTTPS_PROXY: origin, SSL_CERT_FILE: caPath, BILLION_CONTEXT_PROXY: origin };
@@ -63373,363 +63563,6 @@ function writeOverlayFileAtomic(overlay, fileName, contents) {
     }
   }
 }
-function writePiCompactionDisabledSettings(piHome, overlay) {
-  let settings = {};
-  try {
-    const parsed = JSON.parse(fs12.readFileSync(path15.join(piHome, "settings.json"), "utf8"));
-    if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
-      settings = parsed;
-    }
-  } catch {
-  }
-  const compactionRaw = settings.compaction;
-  const compaction = compactionRaw && typeof compactionRaw === "object" && !Array.isArray(compactionRaw) ? { ...compactionRaw } : {};
-  compaction.enabled = false;
-  settings.compaction = compaction;
-  writeOverlayFileAtomic(overlay, "settings.json", JSON.stringify(settings, null, 2));
-}
-function preparePiHttpRewrite(piHome, origin, httpRewrites, httpsRewrites) {
-  if (!fs12.existsSync(piHome)) return void 0;
-  const overlay = `${piHome}-bili`;
-  const generated = ["settings.json"];
-  let modelsRoot;
-  try {
-    const parsed = JSON.parse(fs12.readFileSync(path15.join(piHome, "models.json"), "utf8"));
-    if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
-      modelsRoot = parsed;
-      generated.push("models.json");
-    }
-  } catch {
-  }
-  if (!refreshOverlayHome(piHome, overlay, generated)) return void 0;
-  if (modelsRoot) {
-    const providersVal = modelsRoot.providers;
-    if (providersVal && typeof providersVal === "object" && !Array.isArray(providersVal)) {
-      const providers = providersVal;
-      for (const r of httpRewrites) {
-        const prov = providers[r.key];
-        if (prov && typeof prov === "object" && !Array.isArray(prov)) {
-          const p2 = prov;
-          const existing = typeof p2.baseUrl === "string" ? p2.baseUrl : r.realUpstream;
-          p2.baseUrl = wrapUpstream(origin, unwrapUpstream2(existing));
-        }
-      }
-      for (const r of httpsRewrites) {
-        const prov = providers[r.key];
-        if (prov && typeof prov === "object" && !Array.isArray(prov)) {
-          const p2 = prov;
-          p2.baseUrl = r.realUpstream;
-        }
-      }
-    }
-    writeOverlayFileAtomic(overlay, "models.json", JSON.stringify(modelsRoot));
-  }
-  writePiCompactionDisabledSettings(piHome, overlay);
-  return overlay;
-}
-function atomicWriteTextFile(filePath, contents) {
-  const draft = `${filePath}.${process.pid}.bili-tmp`;
-  try {
-    fs12.writeFileSync(draft, contents);
-    fs12.renameSync(draft, filePath);
-  } catch {
-    try {
-      fs12.rmSync(draft, { force: true });
-    } catch {
-    }
-    throw new Error(`bili: could not write ${filePath}`);
-  }
-}
-function liveProxyPorts() {
-  const ports = /* @__PURE__ */ new Set();
-  const inst = readProxyInstanceFile();
-  if (isProxyInstanceFile(inst)) {
-    if (isPidAlive(inst.pid)) ports.add(inst.port);
-  } else if (inst) {
-    try {
-      ports.add(new URL(inst.origin).port === "" ? 80 : Number(new URL(inst.origin).port));
-    } catch {
-    }
-  }
-  return ports;
-}
-function unpackDeadProxyUrlsInFile(filePath, livePorts) {
-  let txt;
-  try {
-    txt = fs12.readFileSync(filePath, "utf8");
-  } catch {
-    return 0;
-  }
-  const re2 = /https?:\/\/(?:127\.0\.0\.1|localhost|\[::1\]):(\d+)\/bili\/(https?:\/\/\S+)/g;
-  let changed = 0;
-  const out = txt.replace(re2, (full, portStr, raw) => {
-    if (livePorts.has(Number(portStr))) return full;
-    changed += 1;
-    return raw;
-  });
-  if (changed === 0) return 0;
-  try {
-    atomicWriteTextFile(filePath, out);
-  } catch {
-    return 0;
-  }
-  return changed;
-}
-function mergeOmpCompactionDisabledYaml(text) {
-  const lines = text.split(/\r?\n/);
-  let compactionLine = -1;
-  for (let i = 0; i < lines.length; i++) {
-    const rawLine = lines[i];
-    const trimmed = rawLine.trim();
-    if (!trimmed || trimmed.startsWith("#")) continue;
-    const indent = rawLine.length - rawLine.trimStart().length;
-    if (indent === 0 && /^compaction:\s*(#.*)?$/.test(trimmed)) {
-      compactionLine = i;
-      break;
-    }
-  }
-  if (compactionLine === -1) {
-    const base = text === "" || text.endsWith("\n") ? text : `${text}
-`;
-    return `${base}compaction:
-  enabled: false
-`;
-  }
-  for (let i = compactionLine + 1; i < lines.length; i++) {
-    const rawLine = lines[i];
-    const trimmed = rawLine.trim();
-    if (!trimmed || trimmed.startsWith("#")) continue;
-    const indent = rawLine.length - rawLine.trimStart().length;
-    if (indent === 0) break;
-    if (/^enabled:/.test(trimmed)) {
-      const leading = rawLine.slice(0, rawLine.length - rawLine.trimStart().length);
-      const commentMatch = /\s+#.*$/.exec(rawLine);
-      const comment = commentMatch ? commentMatch[0] : "";
-      lines[i] = `${leading}enabled: false${comment}`;
-      return lines.join("\n");
-    }
-  }
-  let childIndent = 2;
-  for (let i = compactionLine + 1; i < lines.length; i++) {
-    const rawLine = lines[i];
-    const trimmed = rawLine.trim();
-    if (!trimmed || trimmed.startsWith("#")) continue;
-    const indent = rawLine.length - rawLine.trimStart().length;
-    if (indent === 0) break;
-    childIndent = indent;
-    break;
-  }
-  lines.splice(compactionLine + 1, 0, `${" ".repeat(childIndent)}enabled: false`);
-  return lines.join("\n");
-}
-function writeOmpCompactionDisabledConfig(ompHome, overlay) {
-  let base;
-  let baseIsJson = false;
-  for (const name of ["config.yml", "config.yaml"]) {
-    try {
-      base = fs12.readFileSync(path15.join(ompHome, name), "utf8");
-      break;
-    } catch {
-    }
-  }
-  if (base === void 0) {
-    try {
-      base = fs12.readFileSync(path15.join(ompHome, "settings.json"), "utf8");
-      baseIsJson = true;
-    } catch {
-    }
-  }
-  let merged;
-  if (base === void 0) {
-    merged = "compaction:\n  enabled: false\n";
-  } else if (baseIsJson) {
-    let settings = {};
-    try {
-      const parsed = JSON.parse(base);
-      if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
-        settings = parsed;
-      }
-    } catch {
-    }
-    const compactionRaw = settings.compaction;
-    const compaction = compactionRaw && typeof compactionRaw === "object" && !Array.isArray(compactionRaw) ? { ...compactionRaw } : {};
-    compaction.enabled = false;
-    settings.compaction = compaction;
-    merged = JSON.stringify(settings, null, 2);
-  } else {
-    merged = mergeOmpCompactionDisabledYaml(base);
-  }
-  writeOverlayFileAtomic(overlay, "config.yml", merged);
-}
-function prepareOmpHttpRewrite(ompHome, origin, httpRewrites, httpsRewrites) {
-  if (!fs12.existsSync(ompHome)) return void 0;
-  const overlay = `${ompHome}-bili`;
-  const generated = ["config.yml"];
-  const modelsPath = path15.join(ompHome, "models.yml");
-  const unpacked = unpackDeadProxyUrlsInFile(modelsPath, liveProxyPorts());
-  if (unpacked > 0) {
-    console.error(`bili: unpacked ${unpacked} dead proxy URL(s) from the real ${modelsPath}`);
-  }
-  let modelsText;
-  try {
-    modelsText = fs12.readFileSync(modelsPath, "utf8");
-    generated.push("models.yml");
-  } catch {
-  }
-  if (!refreshOverlayHome(ompHome, overlay, generated)) return void 0;
-  if (modelsText !== void 0) {
-    const httpMap = new Map(httpRewrites.map((r) => [r.key, wrapUpstream(origin, r.realUpstream)]));
-    const httpsMap = new Map(httpsRewrites.map((r) => [r.key, r.realUpstream]));
-    const lines = modelsText.split(/\r?\n/);
-    let providersIndent = -1;
-    let providerIndent = -1;
-    let currentProvider = null;
-    for (let i = 0; i < lines.length; i++) {
-      const rawLine = lines[i];
-      const trimmed = rawLine.trim();
-      if (!trimmed || trimmed.startsWith("#")) continue;
-      const indent = rawLine.length - rawLine.trimStart().length;
-      if (providersIndent === -1) {
-        if (/^providers:\s*(#.*)?$/.test(trimmed)) providersIndent = indent;
-        continue;
-      }
-      if (indent <= providersIndent) break;
-      if (providerIndent === -1) providerIndent = indent;
-      if (indent === providerIndent) {
-        const m2 = /^([A-Za-z0-9_.-]+):/.exec(trimmed);
-        currentProvider = m2 ? m2[1] : null;
-      } else if (indent > providerIndent && currentProvider) {
-        const baseMatch = /^(baseUrl:\s*)(\S+)/.exec(trimmed);
-        if (baseMatch) {
-          const target = httpMap.get(currentProvider) ?? httpsMap.get(currentProvider);
-          if (target) {
-            const leading = rawLine.slice(0, rawLine.length - rawLine.trimStart().length);
-            const commentMatch = /\s+#.*$/.exec(rawLine);
-            const comment = commentMatch ? commentMatch[0] : "";
-            lines[i] = `${leading}baseUrl: ${target}${comment}`;
-          }
-        }
-      }
-    }
-    writeOverlayFileAtomic(overlay, "models.yml", lines.join("\n"));
-  }
-  writeOmpCompactionDisabledConfig(ompHome, overlay);
-  return overlay;
-}
-function prepareHermesHome(hermesHome, origin, rewrites) {
-  if (rewrites.length === 0) return void 0;
-  const cfgPath = path15.join(hermesHome, "config.yaml");
-  let txt;
-  try {
-    txt = fs12.readFileSync(cfgPath, "utf8");
-  } catch {
-    return void 0;
-  }
-  const wrapSet = new Set(rewrites.map((r) => r.realUpstream));
-  const eol = txt.includes("\r\n") ? "\r\n" : "\n";
-  const lines = txt.split(/\r?\n/);
-  let changed = false;
-  for (let i = 0; i < lines.length; i++) {
-    const rawLine = lines[i];
-    const m2 = /^(\s*(?:api|base_url|url):\s*)(\S+)(\s+#.*)?$/.exec(rawLine);
-    if (!m2) continue;
-    const rawUrl = m2[2].replace(/^["']|["']$/g, "");
-    if (!/^https?:\/\//i.test(rawUrl)) continue;
-    const real = unwrapUpstream2(rawUrl);
-    if (!wrapSet.has(real)) continue;
-    lines[i] = `${m2[1]}${wrapUpstream(origin, real)}${m2[3] ?? ""}`;
-    changed = true;
-  }
-  if (!changed) return void 0;
-  const overlay = `${hermesHome}-bili`;
-  if (!refreshOverlayHome(hermesHome, overlay, "config.yaml")) return void 0;
-  writeOverlayFileAtomic(overlay, "config.yaml", lines.join(eol));
-  return overlay;
-}
-function writeHermesIdentityPlugin(hermesHome, overlay, rewrites) {
-  try {
-    if (fs12.existsSync(path15.join(hermesHome, "plugins"))) return false;
-  } catch {
-    return false;
-  }
-  const dir = path15.join("plugins", "model-providers", "bili-session-identity");
-  try {
-    fs12.mkdirSync(path15.join(overlay, dir), { recursive: true });
-  } catch {
-    return false;
-  }
-  const keys = rewrites.map((r) => r.key);
-  const pluginDir = path15.join(overlay, dir);
-  try {
-    fs12.writeFileSync(path15.join(pluginDir, "__init__.py"), hermesIdentityPluginSource(keys));
-    fs12.writeFileSync(path15.join(pluginDir, "plugin.yaml"), [
-      "name: bili-session-identity",
-      "kind: model-provider",
-      "version: 1.0.0",
-      "description: billion-context session identity (installed by `bili hermes` \u2014 safe to delete)",
-      "author: billion-context",
-      ""
-    ].join("\n"));
-  } catch {
-    return false;
-  }
-  try {
-    return fs12.existsSync(path15.join(overlay, dir, "__init__.py"));
-  } catch {
-    return false;
-  }
-}
-function hermesIdentityPluginSource(providerKeys) {
-  return [
-    '"""Installed by `bili hermes` (billion-context) \u2014 safe to delete.',
-    "",
-    "Re-registers hermes's `custom` provider profile (plus a `custom:<name>`",
-    "profile for every provider the proxy fronts) with one addition: the",
-    "REAL hermes session id is sent as `prompt_cache_key` on every request,",
-    "which the billion-context proxy uses as the stable conversation",
-    "identity for its compression sessions. Removing this file restores",
-    'stock behavior (no prompt_cache_key)."""',
-    "from providers import get_provider_profile, register_provider",
-    "from providers.base import ProviderProfile",
-    "",
-    `_PROVIDER_KEYS = ${JSON.stringify(providerKeys)}`,
-    "",
-    '_custom = get_provider_profile("custom")',
-    "_BASE = type(_custom) if _custom is not None else ProviderProfile",
-    "",
-    "",
-    "class _BiliSessionIdentity(_BASE):",
-    "    def build_api_kwargs_extras(self, *, session_id=None, **ctx):",
-    "        extra_body, top_level = _BASE.build_api_kwargs_extras(",
-    "            self, session_id=session_id, **ctx",
-    "        )",
-    '        sid = str(session_id or "").strip()',
-    "        if sid:",
-    '            top_level.setdefault("prompt_cache_key", sid[:64])',
-    "        return extra_body, top_level",
-    "",
-    "",
-    "def _register(name, template, with_aliases):",
-    "    fields = {}",
-    "    if template is not None:",
-    "        # Aliases are copied ONLY for the canonical custom",
-    "        # re-registration: copying them onto custom:<name> entries",
-    "        # would steal the aliases (register_provider re-points each",
-    "        # alias at the registering name).",
-    '        for attr in (("aliases",) if with_aliases else ()) + ("env_vars", "base_url", "default_max_tokens"):',
-    "            value = getattr(template, attr, None)",
-    "            if value:",
-    "                fields[attr] = value",
-    "    register_provider(_BiliSessionIdentity(name=name, **fields))",
-    "",
-    "",
-    "if _custom is not None:",
-    '    _register("custom", _custom, True)',
-    "for _key in _PROVIDER_KEYS:",
-    '    _register("custom:" + _key, _custom, False)',
-    ""
-  ].join("\n");
-}
 function prepareDshHome(dshHome, origin, rewrites) {
   const cfgPath = path15.join(dshHome, "settings.yaml");
   let txt;
@@ -63878,7 +63711,29 @@ async function probeExistingInstance(readInstance, fetchHealthInfo) {
   if (health.instanceId !== void 0 && health.instanceId !== inst.instanceId) return void 0;
   return inst;
 }
-var INHERITED_PROXY_VARS = ["http_proxy", "https_proxy", "all_proxy", "HTTP_PROXY", "HTTPS_PROXY", "ALL_PROXY"];
+function pickEphemeralPort(host = LAUNCHER_DEFAULT_HOST) {
+  return new Promise((resolve, reject) => {
+    const srv = net2.createServer();
+    srv.once("error", reject);
+    srv.listen(0, host, () => {
+      const addr = srv.address();
+      srv.close(() => {
+        if (addr && typeof addr === "object") resolve(addr.port);
+        else reject(new Error("could not allocate a free port"));
+      });
+    });
+  });
+}
+var INHERITED_PROXY_VARS = [
+  "http_proxy",
+  "https_proxy",
+  "all_proxy",
+  "HTTP_PROXY",
+  "HTTPS_PROXY",
+  "ALL_PROXY",
+  "no_proxy",
+  "NO_PROXY"
+];
 function stripInheritedProxy(env) {
   const cleaned = { ...env };
   for (const key of INHERITED_PROXY_VARS) delete cleaned[key];
@@ -63903,7 +63758,7 @@ async function ensureProxyRunning(opts, deps = {}) {
     return { origin: existing.origin, port: existing.port, attached: true };
   }
   const launchToken = randomUUID5();
-  const port = opts.port;
+  const port = opts.port > 0 ? opts.port : await pickEphemeralPort(opts.host);
   const script = process.argv[1];
   if (!script) throw new Error("bili: cannot resolve launcher script path");
   const logPath2 = path15.join(os5.tmpdir(), `bili-proxy-${port}.log`);
@@ -63912,7 +63767,7 @@ async function ensureProxyRunning(opts, deps = {}) {
   try {
     child = spawnImpl(
       process.execPath,
-      [script, ...proxyStartArgs(opts)],
+      [script, ...proxyStartArgs({ ...opts, port })],
       {
         detached: true,
         stdio: ["ignore", logFd, logFd],
@@ -64019,8 +63874,9 @@ function resolveClientCommand(client, env) {
   return { command: resolved ?? client, prefixArgs: [] };
 }
 function parsePort(raw) {
-  const port = raw && raw.trim() ? parseInt(raw, 10) : LAUNCHER_DEFAULT_PORT;
-  if (!Number.isFinite(port) || port <= 0 || port > 65535) {
+  if (!raw || !raw.trim()) return 0;
+  const port = parseInt(raw, 10);
+  if (!Number.isFinite(port) || port < 1 || port > 65535) {
     console.error(`bili: invalid --port "${raw}"`);
     process.exit(2);
   }
@@ -64031,9 +63887,30 @@ async function runLaunch(params, deps = {}) {
   const port = parsePort(params.overrides.ACP_PORT ?? process.env.ACP_PORT);
   const passthrough = params.overrides.ACP_PASSTHROUGH === "1";
   const debug = params.overrides.ACP_DEBUG === "1";
-  const config = loadClientConfig(process.env, process.cwd());
   const base = baseClientName(params.client);
+  const discoveryEnv = base === "pi" || base === "omp" ? { ...process.env, PI_CODING_AGENT_DIR: void 0 } : process.env;
+  const config = loadClientConfig(discoveryEnv, process.cwd());
   const routes = discoverRoutes(base, config);
+  const piRealHome = resolvePiHome({ ...process.env, PI_CODING_AGENT_DIR: void 0 });
+  const ompRealHome = resolveOmpHome({ ...process.env, PI_CODING_AGENT_DIR: void 0 });
+  if (base === "pi" && (routes.httpRewrites.length > 0 || routes.httpsRewrites.length > 0)) {
+    const piExt = selfDistFile("agent/pi.js");
+    const extAvailable = piExt !== void 0 && fs12.existsSync(piExt) || piPluginInstalled(piRealHome);
+    if (!extAvailable) {
+      throw new Error(
+        "bili: pi needs provider URL rewrites but the bili extension cannot load (dist/agent/pi.js missing and the plugin is not installed in ~/.pi/agent/settings.json) \u2014 reinstall billion-context or run `bili plugin install pi`"
+      );
+    }
+  }
+  if (base === "omp" && routes.httpRewrites.length > 0) {
+    const ompExt = selfDistFile("agent/omp.js");
+    const extAvailable = ompExt !== void 0 && fs12.existsSync(ompExt) || ompPluginLoadedFrom(ompRealHome);
+    if (!extAvailable) {
+      throw new Error(
+        "bili: omp needs provider URL rewrites but the bili extension cannot load (dist/agent/omp.js missing and the plugin is not installed in ~/.omp/agent/config.yml) \u2014 reinstall billion-context or run `bili plugin install omp`"
+      );
+    }
+  }
   const biliRoutes = loadRoutes(process.env);
   const domains = dedupeInOrder([...routes.httpsDomains, ...params.mitmDomains ?? []]);
   const handle2 = await ensureProxyRunning({ host, port, passthrough, debug, mitmDomains: domains, modelWindows: collectModelWindows(config, base) }, deps);
@@ -64046,10 +63923,7 @@ async function runLaunch(params, deps = {}) {
   const ca = resolveCaCertPath(process.env);
   let env;
   let clientArgs = params.clientArgs;
-  let piOverlayHome;
-  let ompOverlayHome;
   let opencodeTmpFile;
-  let hermesOverlayHome;
   let dshOverlayHome;
   const tmpFiles = [];
   const directUrl = launcherDirectUrl(process.env);
@@ -64077,19 +63951,17 @@ async function runLaunch(params, deps = {}) {
   }
   const origin = handle2.origin;
   if (base === "pi") {
-    env = buildPiEnv(origin, ca, process.env);
-    piOverlayHome = preparePiHttpRewrite(resolvePiHome(process.env), origin, routes.httpRewrites, routes.httpsRewrites);
-    if (piOverlayHome) env.PI_CODING_AGENT_DIR = piOverlayHome;
+    env = buildPiEnv(origin, ca, process.env, routes.httpRewrites, routes.httpsRewrites);
+    delete env.PI_CODING_AGENT_DIR;
     const piExt = selfDistFile("agent/pi.js");
-    if (piExt && fs12.existsSync(piExt) && !piPluginInstalled(resolvePiHome(process.env))) {
+    if (piExt && fs12.existsSync(piExt) && !piPluginInstalled(piRealHome)) {
       clientArgs = ["-e", piExt, ...clientArgs];
     }
   } else if (base === "omp") {
-    env = buildPiEnv(origin, ca, process.env);
-    ompOverlayHome = prepareOmpHttpRewrite(resolveOmpHome(process.env), origin, routes.httpRewrites, routes.httpsRewrites);
-    if (ompOverlayHome) env.PI_CODING_AGENT_DIR = ompOverlayHome;
+    env = buildPiEnv(origin, ca, process.env, routes.httpRewrites);
+    delete env.PI_CODING_AGENT_DIR;
     const ompExt = selfDistFile("agent/omp.js");
-    if (ompExt && fs12.existsSync(ompExt) && !ompPluginLoadedFrom(resolveOmpHome(process.env))) {
+    if (ompExt && fs12.existsSync(ompExt) && !ompPluginLoadedFrom(ompRealHome)) {
       clientArgs = ["-e", ompExt, ...clientArgs];
     }
   } else if (base === "opencode") {
@@ -64099,18 +63971,12 @@ async function runLaunch(params, deps = {}) {
     opencodeTmpFile = prepareOpencodeHttpRewrite(resolveOpencodeConfigFile(process.env), origin, routes.httpRewrites, routes.httpsRewrites, opencodePluginPath);
     if (opencodeTmpFile) env.OPENCODE_CONFIG = opencodeTmpFile;
   } else if (base === "hermes") {
-    env = { ...process.env };
-    hermesOverlayHome = prepareHermesHome(resolveHermesHome(process.env), origin, routes.httpRewrites);
-    if (hermesOverlayHome) {
-      env.HERMES_HOME = hermesOverlayHome;
-      if (!writeHermesIdentityPlugin(resolveHermesHome(process.env), hermesOverlayHome, routes.httpRewrites)) {
-        console.error(
-          "bili: ~/.hermes has its own plugins/ \u2014 skipping the session-identity plugin; hermes requests will be rejected by the proxy without an identity (see #286)."
-        );
-      }
-    } else {
+    env = stripInheritedProxy(process.env);
+    env.HTTPS_PROXY = origin;
+    env.HERMES_CA_BUNDLE = ca;
+    if (routes.httpRewrites.length === 0 && routes.httpsDomains.length === 0) {
       console.error(
-        routes.httpRewrites.length === 0 ? "bili: no hermes providers found in ~/.hermes/config.yaml \u2014 traffic will NOT go through the proxy (configure a provider first)." : "bili: hermes config.yaml could not be rewritten (unreadable or no matching provider endpoints) \u2014 traffic will NOT go through the proxy."
+        "bili: no hermes providers found in ~/.hermes/config.yaml \u2014 traffic will NOT go through the proxy (configure a provider first)."
       );
     }
   } else if (base === "dsh") {
@@ -64248,7 +64114,7 @@ async function runTestPi(params, deps = {}) {
 }
 
 // src/export.ts
-import { mkdirSync as mkdirSync5, writeFileSync as writeFileSync4 } from "fs";
+import { mkdirSync as mkdirSync6, writeFileSync as writeFileSync5 } from "fs";
 import path16 from "path";
 function fmtDate(ms2) {
   return ms2 ? new Date(ms2).toISOString().replace("T", " ").slice(0, 19) + " UTC" : "\u2014";
@@ -64381,8 +64247,8 @@ async function exportSession(selector, opts = {}) {
   }
   const markdown = renderHandoff(matches[0], opts.full ?? false);
   if (opts.output) {
-    mkdirSync5(path16.dirname(path16.resolve(opts.output)), { recursive: true });
-    writeFileSync4(opts.output, markdown, "utf8");
+    mkdirSync6(path16.dirname(path16.resolve(opts.output)), { recursive: true });
+    writeFileSync5(opts.output, markdown, "utf8");
     return `written to ${opts.output}`;
   }
   return markdown;
@@ -64459,7 +64325,7 @@ Launcher (bili pi / bili codex / bili claude / bili omp / bili opencode / bili h
 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)
+  --port <N>                       listen port (start: 8787; launcher default: random free port)
   --host <ADDR>                    listen host (default 127.0.0.1)
   --mitm-domain <domain>           extra MITM domain (repeatable; launcher only)
   --config <FILE>                  path to config JSON (default: XDG location)