billion-context 0.1.67 → 0.1.68-pr.428.255

package/dist/index.js

@@ -1141,14 +1141,14 @@ var require_util = __commonJS({
         }
         const port = url.port != null ? url.port : url.protocol === "https:" ? 443 : 80;
         let origin = url.origin != null ? url.origin : `${url.protocol || ""}//${url.hostname || ""}:${port}`;
-        let path16 = url.path != null ? url.path : `${url.pathname || ""}${url.search || ""}`;
+        let path17 = url.path != null ? url.path : `${url.pathname || ""}${url.search || ""}`;
         if (origin[origin.length - 1] === "/") {
           origin = origin.slice(0, origin.length - 1);
         }
-        if (path16 && path16[0] !== "/") {
-          path16 = `/${path16}`;
+        if (path17 && path17[0] !== "/") {
+          path17 = `/${path17}`;
         }
-        return new URL(`${origin}${path16}`);
+        return new URL(`${origin}${path17}`);
       }
       if (!isHttpOrHttpsPrefixed(url.origin || url.protocol)) {
         throw new InvalidArgumentError("Invalid URL protocol: the URL must start with `http:` or `https:`.");
@@ -1969,9 +1969,9 @@ var require_diagnostics = __commonJS({
         "undici:client:sendHeaders",
         (evt) => {
           const {
-            request: { method, path: path16, origin }
+            request: { method, path: path17, origin }
           } = evt;
-          debugLog("sending request to %s %s%s", method, origin, path16);
+          debugLog("sending request to %s %s%s", method, origin, path17);
         }
       );
     }
@@ -1989,14 +1989,14 @@ var require_diagnostics = __commonJS({
         "undici:request:headers",
         (evt) => {
           const {
-            request: { method, path: path16, origin },
+            request: { method, path: path17, origin },
             response: { statusCode }
           } = evt;
           debugLog(
             "received response to %s %s%s - HTTP %d",
             method,
             origin,
-            path16,
+            path17,
             statusCode
           );
         }
@@ -2005,23 +2005,23 @@ var require_diagnostics = __commonJS({
         "undici:request:trailers",
         (evt) => {
           const {
-            request: { method, path: path16, origin }
+            request: { method, path: path17, origin }
           } = evt;
-          debugLog("trailers received from %s %s%s", method, origin, path16);
+          debugLog("trailers received from %s %s%s", method, origin, path17);
         }
       );
       diagnosticsChannel.subscribe(
         "undici:request:error",
         (evt) => {
           const {
-            request: { method, path: path16, origin },
+            request: { method, path: path17, origin },
             error
           } = evt;
           debugLog(
             "request to %s %s%s errored - %s",
             method,
             origin,
-            path16,
+            path17,
             error.message
           );
         }
@@ -2136,7 +2136,7 @@ var require_request = __commonJS({
     var kHandler = /* @__PURE__ */ Symbol("handler");
     var Request = class {
       constructor(origin, {
-        path: path16,
+        path: path17,
         method,
         body,
         headers,
@@ -2153,11 +2153,11 @@ var require_request = __commonJS({
         maxRedirections,
         typeOfService
       }, handler) {
-        if (typeof path16 !== "string") {
+        if (typeof path17 !== "string") {
           throw new InvalidArgumentError("path must be a string");
-        } else if (path16[0] !== "/" && !(path16.startsWith("http://") || path16.startsWith("https://")) && method !== "CONNECT") {
+        } else if (path17[0] !== "/" && !(path17.startsWith("http://") || path17.startsWith("https://")) && method !== "CONNECT") {
           throw new InvalidArgumentError("path must be an absolute URL or start with a slash");
-        } else if (invalidPathRegex.test(path16)) {
+        } else if (invalidPathRegex.test(path17)) {
           throw new InvalidArgumentError("invalid request path");
         }
         if (typeof method !== "string") {
@@ -2232,7 +2232,7 @@ var require_request = __commonJS({
         this.completed = false;
         this.aborted = false;
         this.upgrade = upgrade || null;
-        this.path = query ? serializePathWithQuery(path16, query) : path16;
+        this.path = query ? serializePathWithQuery(path17, query) : path17;
         this.origin = origin;
         this.protocol = getProtocolFromUrlString(origin);
         this.idempotent = idempotent == null ? method === "HEAD" || method === "GET" : idempotent;
@@ -7415,7 +7415,7 @@ var require_client_h1 = __commonJS({
       return method !== "GET" && method !== "HEAD" && method !== "OPTIONS" && method !== "TRACE" && method !== "CONNECT";
     }
     function writeH1(client, request) {
-      const { method, path: path16, host, upgrade, blocking, reset } = request;
+      const { method, path: path17, host, upgrade, blocking, reset } = request;
       let { body, headers, contentLength } = request;
       const expectsPayload = method === "PUT" || method === "POST" || method === "PATCH" || method === "QUERY" || method === "PROPFIND" || method === "PROPPATCH";
       if (util.isFormDataLike(body)) {
@@ -7493,7 +7493,7 @@ var require_client_h1 = __commonJS({
       if (socket.setTypeOfService) {
         socket.setTypeOfService(request.typeOfService);
       }
-      let header = `${method} ${path16} HTTP/1.1\r
+      let header = `${method} ${path17} HTTP/1.1\r
 `;
       if (typeof host === "string") {
         header += `host: ${host}\r
@@ -8146,7 +8146,7 @@ var require_client_h2 = __commonJS({
     function writeH2(client, request) {
       const requestTimeout = request.bodyTimeout ?? client[kBodyTimeout];
       const session = client[kHTTP2Session];
-      const { method, path: path16, host, upgrade, expectContinue, signal, protocol, headers: reqHeaders } = request;
+      const { method, path: path17, host, upgrade, expectContinue, signal, protocol, headers: reqHeaders } = request;
       let { body } = request;
       if (upgrade != null && upgrade !== "websocket") {
         util.errorRequest(client, request, new InvalidArgumentError(`Custom upgrade "${upgrade}" not supported over HTTP/2`));
@@ -8214,7 +8214,7 @@ var require_client_h2 = __commonJS({
           }
           headers[HTTP2_HEADER_METHOD] = "CONNECT";
           headers[HTTP2_HEADER_PROTOCOL] = "websocket";
-          headers[HTTP2_HEADER_PATH] = path16;
+          headers[HTTP2_HEADER_PATH] = path17;
           if (protocol === "ws:" || protocol === "wss:") {
             headers[HTTP2_HEADER_SCHEME] = protocol === "ws:" ? "http" : "https";
           } else {
@@ -8255,7 +8255,7 @@ var require_client_h2 = __commonJS({
         stream2.setTimeout(requestTimeout);
         return true;
       }
-      headers[HTTP2_HEADER_PATH] = path16;
+      headers[HTTP2_HEADER_PATH] = path17;
       headers[HTTP2_HEADER_SCHEME] = protocol === "http:" ? "http" : "https";
       const expectsPayload = method === "PUT" || method === "POST" || method === "PATCH";
       if (body && typeof body.read === "function") {
@@ -10598,10 +10598,10 @@ var require_proxy_agent = __commonJS({
         };
         const {
           origin,
-          path: path16 = "/",
+          path: path17 = "/",
           headers = {}
         } = opts;
-        opts.path = origin + path16;
+        opts.path = origin + path17;
         if (!("host" in headers) && !("Host" in headers)) {
           const { host } = new URL(origin);
           headers.host = host;
@@ -12684,20 +12684,20 @@ var require_mock_utils = __commonJS({
       }
       return normalizedQp;
     }
-    function safeUrl(path16) {
-      if (typeof path16 !== "string") {
-        return path16;
+    function safeUrl(path17) {
+      if (typeof path17 !== "string") {
+        return path17;
       }
-      const pathSegments = path16.split("?", 3);
+      const pathSegments = path17.split("?", 3);
       if (pathSegments.length !== 2) {
-        return path16;
+        return path17;
       }
       const qp = new URLSearchParams(pathSegments.pop());
       qp.sort();
       return [...pathSegments, qp.toString()].join("?");
     }
-    function matchKey(mockDispatch2, { path: path16, method, body, headers }) {
-      const pathMatch = matchValue(mockDispatch2.path, path16);
+    function matchKey(mockDispatch2, { path: path17, method, body, headers }) {
+      const pathMatch = matchValue(mockDispatch2.path, path17);
       const methodMatch = matchValue(mockDispatch2.method, method);
       const bodyMatch = typeof mockDispatch2.body !== "undefined" ? matchValue(mockDispatch2.body, body) : true;
       const headersMatch = matchHeaders(mockDispatch2, headers);
@@ -12722,8 +12722,8 @@ var require_mock_utils = __commonJS({
       const basePath = key.query ? serializePathWithQuery(key.path, key.query) : key.path;
       const resolvedPath = typeof basePath === "string" ? safeUrl(basePath) : basePath;
       const resolvedPathWithoutTrailingSlash = removeTrailingSlash(resolvedPath);
-      let matchedMockDispatches = mockDispatches.filter(({ consumed }) => !consumed).filter(({ path: path16, ignoreTrailingSlash }) => {
-        return ignoreTrailingSlash ? matchValue(removeTrailingSlash(safeUrl(path16)), resolvedPathWithoutTrailingSlash) : matchValue(safeUrl(path16), resolvedPath);
+      let matchedMockDispatches = mockDispatches.filter(({ consumed }) => !consumed).filter(({ path: path17, ignoreTrailingSlash }) => {
+        return ignoreTrailingSlash ? matchValue(removeTrailingSlash(safeUrl(path17)), resolvedPathWithoutTrailingSlash) : matchValue(safeUrl(path17), resolvedPath);
       });
       if (matchedMockDispatches.length === 0) {
         throw new MockNotMatchedError(`Mock dispatch not matched for path '${resolvedPath}'`);
@@ -12762,19 +12762,19 @@ var require_mock_utils = __commonJS({
         mockDispatches.splice(index, 1);
       }
     }
-    function removeTrailingSlash(path16) {
-      while (path16.endsWith("/")) {
-        path16 = path16.slice(0, -1);
+    function removeTrailingSlash(path17) {
+      while (path17.endsWith("/")) {
+        path17 = path17.slice(0, -1);
       }
-      if (path16.length === 0) {
-        path16 = "/";
+      if (path17.length === 0) {
+        path17 = "/";
       }
-      return path16;
+      return path17;
     }
     function buildKey(opts) {
-      const { path: path16, method, body, headers, query } = opts;
+      const { path: path17, method, body, headers, query } = opts;
       return {
-        path: path16,
+        path: path17,
         method,
         body,
         headers,
@@ -13464,10 +13464,10 @@ var require_pending_interceptors_formatter = __commonJS({
       }
       format(pendingInterceptors) {
         const withPrettyHeaders = pendingInterceptors.map(
-          ({ method, path: path16, data: { statusCode }, persist, times, timesInvoked, origin }) => ({
+          ({ method, path: path17, data: { statusCode }, persist, times, timesInvoked, origin }) => ({
             Method: method,
             Origin: origin,
-            Path: path16,
+            Path: path17,
             "Status code": statusCode,
             Persistent: persist ? PERSISTENT : NOT_PERSISTENT,
             Invocations: timesInvoked,
@@ -13549,9 +13549,9 @@ var require_mock_agent = __commonJS({
         const acceptNonStandardSearchParameters = this[kMockAgentAcceptsNonStandardSearchParameters];
         const dispatchOpts = { ...opts };
         if (acceptNonStandardSearchParameters && dispatchOpts.path) {
-          const [path16, searchParams] = dispatchOpts.path.split("?");
+          const [path17, searchParams] = dispatchOpts.path.split("?");
           const normalizedSearchParams = normalizeSearchParams(searchParams, acceptNonStandardSearchParameters);
-          dispatchOpts.path = `${path16}?${normalizedSearchParams}`;
+          dispatchOpts.path = `${path17}?${normalizedSearchParams}`;
         }
         return this[kAgent].dispatch(dispatchOpts, handler);
       }
@@ -13952,12 +13952,12 @@ var require_snapshot_recorder = __commonJS({
        * @return {Promise<void>} - Resolves when snapshots are loaded
        */
       async loadSnapshots(filePath) {
-        const path16 = filePath || this.#snapshotPath;
-        if (!path16) {
+        const path17 = filePath || this.#snapshotPath;
+        if (!path17) {
           throw new InvalidArgumentError("Snapshot path is required");
         }
         try {
-          const data = await readFile3(resolve(path16), "utf8");
+          const data = await readFile3(resolve(path17), "utf8");
           const parsed = JSON.parse(data);
           if (Array.isArray(parsed)) {
             this.#snapshots.clear();
@@ -13971,7 +13971,7 @@ var require_snapshot_recorder = __commonJS({
           if (error.code === "ENOENT") {
             this.#snapshots.clear();
           } else {
-            throw new UndiciError(`Failed to load snapshots from ${path16}`, { cause: error });
+            throw new UndiciError(`Failed to load snapshots from ${path17}`, { cause: error });
           }
         }
       }
@@ -13982,11 +13982,11 @@ var require_snapshot_recorder = __commonJS({
        * @returns {Promise<void>} - Resolves when snapshots are saved
        */
       async saveSnapshots(filePath) {
-        const path16 = filePath || this.#snapshotPath;
-        if (!path16) {
+        const path17 = filePath || this.#snapshotPath;
+        if (!path17) {
           throw new InvalidArgumentError("Snapshot path is required");
         }
-        const resolvedPath = resolve(path16);
+        const resolvedPath = resolve(path17);
         await mkdir3(dirname5(resolvedPath), { recursive: true });
         const data = Array.from(this.#snapshots.entries()).map(([hash, snapshot]) => ({
           hash,
@@ -14618,15 +14618,15 @@ var require_redirect_handler = __commonJS({
           return;
         }
         const { origin, pathname, search } = util.parseURL(new URL(this.location, this.opts.origin && new URL(this.opts.path, this.opts.origin)));
-        const path16 = search ? `${pathname}${search}` : pathname;
-        const redirectUrlString = `${origin}${path16}`;
+        const path17 = search ? `${pathname}${search}` : pathname;
+        const redirectUrlString = `${origin}${path17}`;
         for (const historyUrl of this.history) {
           if (historyUrl.toString() === redirectUrlString) {
             throw new InvalidArgumentError(`Redirect loop detected. Cannot redirect to ${origin}. This typically happens when using a Client or Pool with cross-origin redirects. Use an Agent for cross-origin redirects.`);
           }
         }
         this.opts.headers = cleanRequestHeaders(this.opts.headers, statusCode === 303, this.opts.origin !== origin);
-        this.opts.path = path16;
+        this.opts.path = path17;
         this.opts.origin = origin;
         this.opts.query = null;
       }
@@ -14903,7 +14903,7 @@ var require_dns = __commonJS({
   "node_modules/undici/lib/interceptor/dns.js"(exports, module) {
     "use strict";
     var { isIP } = __require("net");
-    var { lookup } = __require("dns");
+    var { lookup: lookup2 } = __require("dns");
     var DecoratorHandler = require_decorator_handler();
     var { InvalidArgumentError, InformationalError } = require_errors();
     var maxInt = Math.pow(2, 31) - 1;
@@ -15093,7 +15093,7 @@ var require_dns = __commonJS({
         }
       }
       #defaultLookup(origin, opts, cb) {
-        lookup(
+        lookup2(
           origin.hostname,
           {
             all: true,
@@ -16395,10 +16395,10 @@ var require_cache_handler = __commonJS({
       }
       return locationUrl.pathname + locationUrl.search;
     }
-    function deleteCachedUri(store, cacheKey, path16) {
+    function deleteCachedUri(store, cacheKey, path17) {
       deleteCachedValue(store, {
         ...cacheKey,
-        path: path16
+        path: path17
       });
       for (let i = 0; i < util.safeHTTPMethods.length; i++) {
         const method = util.safeHTTPMethods[i];
@@ -16406,7 +16406,7 @@ var require_cache_handler = __commonJS({
           deleteCachedValue(store, {
             ...cacheKey,
             method,
-            path: path16
+            path: path17
           });
         }
       }
@@ -16417,9 +16417,9 @@ var require_cache_handler = __commonJS({
       }
       const values = Array.isArray(headerValue3) ? headerValue3 : [headerValue3];
       for (let i = 0; i < values.length; i++) {
-        const path16 = getSameOriginPath(cacheKey, values[i]);
-        if (path16 !== void 0) {
-          deleteCachedUri(store, cacheKey, path16);
+        const path17 = getSameOriginPath(cacheKey, values[i]);
+        if (path17 !== void 0) {
+          deleteCachedUri(store, cacheKey, path17);
         }
       }
     }
@@ -21297,11 +21297,11 @@ var require_fetch = __commonJS({
       function dispatch({ body }) {
         const url = requestCurrentURL(request);
         const agent = fetchParams.controller.dispatcher;
-        const path16 = url.pathname + url.search;
+        const path17 = url.pathname + url.search;
         const hasTrailingQuestionMark = url.search.length === 0 && url.href[url.href.length - url.hash.length - 1] === "?";
         return new Promise((resolve, reject) => agent.dispatch(
           {
-            path: hasTrailingQuestionMark ? `${path16}?` : path16,
+            path: hasTrailingQuestionMark ? `${path17}?` : path17,
             origin: url.origin,
             method: request.method,
             body: agent.isMockActive ? request.body && (request.body.source || request.body.stream) : body,
@@ -22248,9 +22248,9 @@ var require_util4 = __commonJS({
         }
       }
     }
-    function validateCookiePath(path16) {
-      for (let i = 0; i < path16.length; ++i) {
-        const code = path16.charCodeAt(i);
+    function validateCookiePath(path17) {
+      for (let i = 0; i < path17.length; ++i) {
+        const code = path17.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
         code > 126 || // exclude DEL and non-ascii
         code === 59) {
@@ -25487,11 +25487,11 @@ var require_undici = __commonJS({
           if (typeof opts.path !== "string") {
             throw new InvalidArgumentError("invalid opts.path");
           }
-          let path16 = opts.path;
+          let path17 = opts.path;
           if (!opts.path.startsWith("/")) {
-            path16 = `/${path16}`;
+            path17 = `/${path17}`;
           }
-          url = new URL(util.parseOrigin(url).origin + path16);
+          url = new URL(util.parseOrigin(url).origin + path17);
         } else {
           if (!opts) {
             opts = typeof url === "object" ? url : {};
@@ -47033,9 +47033,6 @@ function stateDir() {
 function defaultLogFile() {
   return path.join(stateDir(), "bili.log");
 }
-function proxyOriginFile() {
-  return path.join(stateDir(), "proxy-origin");
-}
 function caDir() {
   return path.join(dataDir(), "ca");
 }
@@ -47622,13 +47619,13 @@ function getUpstreamConnectionStatus() {
 }
 
 // src/config.ts
-function safeReadJson(path16) {
+function safeReadJson(path17) {
   try {
-    const raw = readFileSync(path16, "utf8").replace(/^\uFEFF/, "");
+    const raw = readFileSync(path17, "utf8").replace(/^\uFEFF/, "");
     return JSON.parse(raw);
   } catch (e) {
     if (e.code !== "ENOENT") {
-      log("error", `[acp-config] failed to parse ${path16}: ${String(e)}`);
+      log("error", `[acp-config] failed to parse ${path17}: ${String(e)}`);
     }
     return void 0;
   }
@@ -47908,8 +47905,8 @@ function rejectLegacyRoute(key, value) {
 
 // src/server.ts
 import http from "http";
-import fs6 from "fs";
-import { randomUUID as randomUUID3 } from "crypto";
+import fs7 from "fs";
+import { randomUUID as randomUUID4 } from "crypto";
 
 // src/compress-settings.ts
 function resolveContextLimitValue(raw, nativeLimit) {
@@ -50158,15 +50155,11 @@ function resolveDecompress(args, ctx) {
     body = view.text;
     count = view.count;
   } else {
-    const collected = collectBlockContent(ctx.session.state, block, ctx.messages, { full });
+    const collected = collectBlockContent(ctx.session.state, block, ctx.compressMessages ?? ctx.messages, { full });
     body = collected.text || block.summary;
     count = collected.count;
   }
-  if (count > 0 || cached) {
-    ctx.session.state = deactivateBlock(ctx.session.state, [blockId]);
-    ctx.session.blockContents.delete(blockId);
-  }
-  const header = `[Restored block ${blockId} \u2014 ${count} item(s)${full ? ", full" : ""}]`;
+  const header = `[Block ${blockId} content \u2014 ${count} item(s)${full ? ", full" : ""}]`;
   const safeBlockId = blockId.replace(/[^a-zA-Z0-9_-]/g, "-");
   const outPath = body.length > 1e4 ? join2(tmpdir(), `acp-decompress-${safeBlockId}-${Date.now()}.txt`) : null;
   if (outPath) {
@@ -51151,6 +51144,140 @@ function reapOrphanBlocks(session, visible, deactivate) {
   return { reaped };
 }
 
+// src/instance.ts
+import { randomUUID as randomUUID3 } from "crypto";
+import fs3 from "fs";
+import path7 from "path";
+function isProxyInstanceFile(v2) {
+  return v2 !== void 0 && "instanceId" in v2;
+}
+function readProxyInstanceFile(file) {
+  let raw;
+  try {
+    raw = fs3.readFileSync(file ?? instanceFilePath(), "utf8").trim();
+  } catch {
+    return void 0;
+  }
+  if (raw.startsWith("{")) {
+    try {
+      const parsed = JSON.parse(raw);
+      if (typeof parsed.origin === "string" && /^https?:\/\/\S+$/.test(parsed.origin)) {
+        const windows = {};
+        if (parsed.modelWindows && typeof parsed.modelWindows === "object") {
+          for (const [k2, v2] of Object.entries(parsed.modelWindows)) {
+            const n = Number(v2);
+            if (Number.isFinite(n) && n > 0) windows[k2] = n;
+          }
+        }
+        return {
+          origin: parsed.origin,
+          instanceId: typeof parsed.instanceId === "string" ? parsed.instanceId : "",
+          pid: typeof parsed.pid === "number" ? parsed.pid : 0,
+          startedAt: typeof parsed.startedAt === "number" ? parsed.startedAt : 0,
+          host: typeof parsed.host === "string" ? parsed.host : "",
+          port: typeof parsed.port === "number" ? parsed.port : 0,
+          passthrough: Boolean(parsed.passthrough),
+          mitmDomains: Array.isArray(parsed.mitmDomains) ? parsed.mitmDomains.map(String) : [],
+          modelWindows: windows,
+          launchToken: typeof parsed.launchToken === "string" ? parsed.launchToken : void 0
+        };
+      }
+    } catch {
+    }
+  }
+  if (/^https?:\/\/\S+$/.test(raw)) return { origin: raw };
+  return void 0;
+}
+function instanceFilePath() {
+  return path7.join(stateDir(), "proxy-origin");
+}
+function atomicWriteInstanceFile(info, file) {
+  const filePath = file ?? instanceFilePath();
+  fs3.mkdirSync(path7.dirname(filePath), { recursive: true });
+  const tempPath = `${filePath}.${process.pid}.${randomUUID3()}.tmp`;
+  let descriptor;
+  try {
+    descriptor = fs3.openSync(tempPath, "wx", 420);
+    fs3.writeSync(descriptor, JSON.stringify(info) + "\n", null, "utf8");
+    fs3.fsyncSync(descriptor);
+    fs3.closeSync(descriptor);
+    descriptor = void 0;
+    fs3.renameSync(tempPath, filePath);
+  } catch (error) {
+    if (descriptor !== void 0) {
+      try {
+        fs3.closeSync(descriptor);
+      } catch {
+      }
+    }
+    try {
+      fs3.unlinkSync(tempPath);
+    } catch {
+    }
+    throw error;
+  }
+}
+function clearProxyInstanceFile(instanceId, file) {
+  const filePath = file ?? instanceFilePath();
+  const current = readProxyInstanceFile(filePath);
+  if (isProxyInstanceFile(current) && current.instanceId === instanceId) {
+    try {
+      fs3.unlinkSync(filePath);
+    } catch {
+    }
+  }
+}
+function isPidAlive(pid) {
+  if (!Number.isInteger(pid) || pid <= 0) return false;
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch (err2) {
+    return err2.code === "EPERM";
+  }
+}
+function registryFilePath() {
+  return path7.join(stateDir(), "instances.json");
+}
+function registerInstanceAndWarn(entry, warn) {
+  const file = registryFilePath();
+  const entries = [];
+  try {
+    const parsed = JSON.parse(fs3.readFileSync(file, "utf8"));
+    if (Array.isArray(parsed.instances)) {
+      for (const e of parsed.instances) {
+        if (e && typeof e.instanceId === "string" && e.instanceId !== entry.instanceId && isPidAlive(e.pid)) {
+          entries.push(e);
+        }
+      }
+    }
+  } catch {
+  }
+  for (const other of entries) {
+    warn(
+      `another bili instance is running (pid ${other.pid}, ${other.origin}) \u2014 both processes will write the same sessions directory; stop one to avoid state pollution (#394)`
+    );
+  }
+  entries.push(entry);
+  try {
+    fs3.mkdirSync(path7.dirname(file), { recursive: true });
+    fs3.writeFileSync(file, JSON.stringify({ instances: entries }) + "\n");
+  } catch {
+  }
+}
+function unregisterInstance(instanceId) {
+  const file = registryFilePath();
+  try {
+    const parsed = JSON.parse(fs3.readFileSync(file, "utf8"));
+    if (!Array.isArray(parsed.instances)) return;
+    const kept = parsed.instances.filter(
+      (e) => !(e && typeof e.instanceId === "string" && e.instanceId === instanceId) && isPidAlive(e.pid)
+    );
+    fs3.writeFileSync(file, JSON.stringify({ instances: kept }) + "\n");
+  } catch {
+  }
+}
+
 // src/compress-loop.ts
 function buildVisibilityMarker(toolName, result) {
   const lines = result.split("\n").map((l) => l.trim()).filter((l) => l.length > 0);
@@ -51469,11 +51596,11 @@ async function* runCompressLoop(upstream, ctx, requestBody, requestOptions, adap
       let newBody = adapter.buildRequest(coreMessages, systemPrompt, requestBody);
       if (process.env.ACP_DUMP_BODY === "1") {
         try {
-          const fs11 = await import("fs");
+          const fs12 = await import("fs");
           const dumpDir = process.env.ACP_DUMP_DIR || `${process.env.HOME}/.local/state/billion-context/dumps`;
-          fs11.mkdirSync(dumpDir, { recursive: true });
+          fs12.mkdirSync(dumpDir, { recursive: true });
           const sid = ctx.session.id ?? "unknown";
-          fs11.writeFileSync(`${dumpDir}/req-${Date.now()}-${sid}-REREQUEST.json`, JSON.stringify(newBody, null, 2));
+          fs12.writeFileSync(`${dumpDir}/req-${Date.now()}-${sid}-REREQUEST.json`, JSON.stringify(newBody, null, 2));
         } catch {
         }
       }
@@ -51591,25 +51718,18 @@ function reserveOutputHeadroom(window2, maxOutput) {
   }
   return window2;
 }
-function hoistMidSystemMessages(messages) {
-  let lead = 0;
-  while (lead < messages.length && (messages[lead].role === "system" || messages[lead].role === "developer")) lead++;
-  if (lead === messages.length) return messages;
-  let midCount = 0;
-  for (let i = lead; i < messages.length; i++) {
-    const r = messages[i].role;
-    if (r === "system" || r === "developer") midCount++;
-  }
-  if (midCount === 0) return messages;
-  const head = messages.slice(0, lead);
-  const mid = [];
-  const rest = [];
-  for (let i = lead; i < messages.length; i++) {
-    const r = messages[i].role;
-    if (r === "system" || r === "developer") mid.push(messages[i]);
-    else rest.push(messages[i]);
-  }
-  return [...head, ...mid, ...rest];
+function systemToUser(messages) {
+  let hasSys = false;
+  for (const m2 of messages) {
+    if (m2.role === "system" || m2.role === "developer") {
+      hasSys = true;
+      break;
+    }
+  }
+  if (!hasSys) return messages;
+  return messages.map(
+    (m2) => m2.role === "system" || m2.role === "developer" ? { ...m2, role: "user" } : m2
+  );
 }
 function shouldReserveOutputHeadroom(protocol) {
   return protocol !== "anthropic";
@@ -52272,7 +52392,7 @@ function createOpenaiAdapter(requestBody, clientSystem) {
   );
   return {
     buildRequest(coreMessages, systemPrompt, body) {
-      const messages = hoistMidSystemMessages(coreToOpenai(coreMessages));
+      const messages = systemToUser(coreToOpenai(coreMessages));
       const withSys = injectOpenaiSystem(messages, [clientSystem, systemPrompt].filter((p2) => typeof p2 === "string" && p2.length > 0));
       return { ...body, messages: withSys };
     },
@@ -53630,13 +53750,13 @@ function buildStatusPanel(input) {
 
 // src/plugin.ts
 import { fileURLToPath as fileURLToPath2 } from "url";
-import fs3 from "fs";
-import path7 from "path";
+import fs4 from "fs";
+import path8 from "path";
 var PROXY_VERSION = (() => {
   try {
     const here = fileURLToPath2(import.meta.url);
-    const pkg = path7.join(path7.dirname(here), "..", "package.json");
-    return JSON.parse(fs3.readFileSync(pkg, "utf8")).version ?? "dev";
+    const pkg = path8.join(path8.dirname(here), "..", "package.json");
+    return JSON.parse(fs4.readFileSync(pkg, "utf8")).version ?? "dev";
   } catch {
     return "dev";
   }
@@ -53648,8 +53768,8 @@ var PLUGIN_PROTOCOL_VERSION = 1;
 var VERSION = (() => {
   try {
     const here = fileURLToPath2(import.meta.url);
-    const pkg = path7.join(path7.dirname(here), "..", "package.json");
-    return JSON.parse(fs3.readFileSync(pkg, "utf8")).version ?? "dev";
+    const pkg = path8.join(path8.dirname(here), "..", "package.json");
+    return JSON.parse(fs4.readFileSync(pkg, "utf8")).version ?? "dev";
   } catch {
     return "dev";
   }
@@ -53678,14 +53798,20 @@ function pluginReportedContextWindow(headers) {
 var MAX_PLUGIN_CONVERSATIONS = 1024;
 var conversations = /* @__PURE__ */ new Map();
 var remembered = /* @__PURE__ */ new Map();
-var conversationsFile = () => path7.join(stateDir(), "plugin-conversations.json");
+var conversationsFile = () => path8.join(stateDir(), "plugin-conversations.json");
 var conversationsSaveTimer;
+var conversationsDirty = false;
 function writeConversationsFile() {
+  if (!conversationsDirty) return;
   try {
     const obj = {};
     for (const [k2, v2] of conversations) obj[k2] = v2;
-    fs3.mkdirSync(stateDir(), { recursive: true });
-    fs3.writeFileSync(conversationsFile(), JSON.stringify(obj));
+    fs4.mkdirSync(stateDir(), { recursive: true });
+    const filePath = conversationsFile();
+    const draft = `${filePath}.${process.pid}.bili-tmp`;
+    fs4.writeFileSync(draft, JSON.stringify(obj));
+    fs4.renameSync(draft, filePath);
+    conversationsDirty = false;
   } catch {
   }
 }
@@ -53704,8 +53830,13 @@ function flushConversations() {
   writeConversationsFile();
 }
 function loadConversations() {
+  let raw;
+  try {
+    raw = fs4.readFileSync(conversationsFile(), "utf8");
+  } catch {
+    return;
+  }
   try {
-    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) {
@@ -53713,11 +53844,18 @@ function loadConversations() {
       }
     }
   } catch {
+    try {
+      fs4.renameSync(conversationsFile(), `${conversationsFile()}.corrupt-${Date.now()}`);
+    } catch {
+    }
+    log("warn", "[plugin] plugin-conversations.json is corrupt \u2014 backed up beside the original, starting an empty routing table");
   }
+  conversationsDirty = false;
 }
 function recordPluginSession(conversationId2, sessionId) {
   conversations.delete(conversationId2);
   conversations.set(conversationId2, { sessionId, lastSeen: Date.now() });
+  conversationsDirty = true;
   if (conversations.size > MAX_PLUGIN_CONVERSATIONS) {
     const oldest = conversations.keys().next().value;
     if (oldest !== void 0) conversations.delete(oldest);
@@ -54167,14 +54305,14 @@ async function pipePluginJson(stream2, res, session, protocol) {
 import tls3 from "tls";
 
 // src/discover.ts
-import fs5 from "fs";
+import fs6 from "fs";
 import os2 from "os";
-import path9 from "path";
+import path10 from "path";
 
 // src/client-config.ts
-import fs4 from "fs";
+import fs5 from "fs";
 import os from "os";
-import path8 from "path";
+import path9 from "path";
 function toModelWindow(id, contextWindow) {
   return typeof id === "string" && id.length > 0 && typeof contextWindow === "number" && Number.isFinite(contextWindow) && contextWindow > 0 ? { id, contextWindow: Math.floor(contextWindow) } : null;
 }
@@ -54183,7 +54321,7 @@ function nonEmpty2(s3) {
 }
 function readJsonObject(filePath) {
   try {
-    const txt = fs4.readFileSync(filePath, "utf8");
+    const txt = fs5.readFileSync(filePath, "utf8");
     const parsed = JSON.parse(txt);
     return parsed && typeof parsed === "object" && !Array.isArray(parsed) ? parsed : null;
   } catch {
@@ -54192,19 +54330,19 @@ function readJsonObject(filePath) {
 }
 function resolvePiHome(env) {
   const h = os.homedir();
-  return nonEmpty2(env.PI_CODING_AGENT_DIR) ? env.PI_CODING_AGENT_DIR : nonEmpty2(env.PI_HOME) ? env.PI_HOME : path8.join(h, ".pi", "agent");
+  return nonEmpty2(env.PI_CODING_AGENT_DIR) ? env.PI_CODING_AGENT_DIR : nonEmpty2(env.PI_HOME) ? env.PI_HOME : path9.join(h, ".pi", "agent");
 }
 function resolveOmpHome(env) {
   const h = os.homedir();
-  return nonEmpty2(env.PI_CODING_AGENT_DIR) ? env.PI_CODING_AGENT_DIR : path8.join(h, ".omp", "agent");
+  return nonEmpty2(env.PI_CODING_AGENT_DIR) ? env.PI_CODING_AGENT_DIR : path9.join(h, ".omp", "agent");
 }
 function resolveHermesHome(env) {
   const h = os.homedir();
-  return nonEmpty2(env.HERMES_HOME) ? env.HERMES_HOME : path8.join(h, ".hermes");
+  return nonEmpty2(env.HERMES_HOME) ? env.HERMES_HOME : path9.join(h, ".hermes");
 }
 function resolveDshHome(env) {
   const h = os.homedir();
-  return nonEmpty2(env.DSH_HOME) ? env.DSH_HOME : path8.join(h, ".dsh");
+  return nonEmpty2(env.DSH_HOME) ? env.DSH_HOME : path9.join(h, ".dsh");
 }
 function parseDshSettingsYaml(text) {
   const out = [];
@@ -54223,7 +54361,7 @@ function parseDshSettingsYaml(text) {
 function readDshConfig(dshHome) {
   let text;
   try {
-    text = fs4.readFileSync(path8.join(dshHome, "settings.yaml"), "utf8");
+    text = fs5.readFileSync(path9.join(dshHome, "settings.yaml"), "utf8");
   } catch {
     return { baseUrls: [] };
   }
@@ -54231,8 +54369,8 @@ function readDshConfig(dshHome) {
 }
 function readClaudeSettings(homeDir, cwd, env = process.env) {
   const files = [
-    path8.join(homeDir, ".claude", "settings.json"),
-    path8.join(cwd, ".claude", "settings.json")
+    path9.join(homeDir, ".claude", "settings.json"),
+    path9.join(cwd, ".claude", "settings.json")
   ];
   let anthropicBaseUrl;
   let model;
@@ -54305,17 +54443,17 @@ function parseCodexToml(text) {
   return result;
 }
 function readCodexConfig(codexHome) {
-  const cfgPath = path8.join(codexHome, "config.toml");
+  const cfgPath = path9.join(codexHome, "config.toml");
   let text;
   try {
-    text = fs4.readFileSync(cfgPath, "utf8");
+    text = fs5.readFileSync(cfgPath, "utf8");
   } catch {
     return { providers: {} };
   }
   return parseCodexToml(text);
 }
 function readPiConfig(piHome) {
-  const cfgPath = path8.join(piHome, "models.json");
+  const cfgPath = path9.join(piHome, "models.json");
   const obj = readJsonObject(cfgPath);
   const providers = {};
   const rawProviders = obj?.providers;
@@ -54396,10 +54534,10 @@ function parseOmpYaml(text) {
   return result;
 }
 function readOmpConfig(ompHome) {
-  const cfgPath = path8.join(ompHome, "models.yml");
+  const cfgPath = path9.join(ompHome, "models.yml");
   let text;
   try {
-    text = fs4.readFileSync(cfgPath, "utf8");
+    text = fs5.readFileSync(cfgPath, "utf8");
   } catch {
     return { providers: {} };
   }
@@ -54472,10 +54610,10 @@ function parseHermesYaml(text) {
   return result;
 }
 function readHermesConfig(hermesHome) {
-  const cfgPath = path8.join(hermesHome, "config.yaml");
+  const cfgPath = path9.join(hermesHome, "config.yaml");
   let text;
   try {
-    text = fs4.readFileSync(cfgPath, "utf8");
+    text = fs5.readFileSync(cfgPath, "utf8");
   } catch {
     return { providers: {} };
   }
@@ -54483,13 +54621,13 @@ function readHermesConfig(hermesHome) {
 }
 function resolveOpencodeConfigFile(env) {
   if (nonEmpty2(env.OPENCODE_CONFIG)) return env.OPENCODE_CONFIG;
-  const xdg2 = nonEmpty2(env.XDG_CONFIG_HOME) ? env.XDG_CONFIG_HOME : path8.join(os.homedir(), ".config");
-  return path8.join(xdg2, "opencode", "opencode.json");
+  const xdg2 = nonEmpty2(env.XDG_CONFIG_HOME) ? env.XDG_CONFIG_HOME : path9.join(os.homedir(), ".config");
+  return path9.join(xdg2, "opencode", "opencode.json");
 }
 function readOpencodeConfig(file) {
   let text;
   try {
-    text = fs4.readFileSync(file, "utf8");
+    text = fs5.readFileSync(file, "utf8");
   } catch {
     return { providers: {} };
   }
@@ -54546,10 +54684,10 @@ function parseZcodeConfig(obj) {
   return result;
 }
 function readZcodeConfig(zcodeHome) {
-  const cfgPath = path8.join(zcodeHome, "v2", "config.json");
+  const cfgPath = path9.join(zcodeHome, "v2", "config.json");
   let txt;
   try {
-    txt = fs4.readFileSync(cfgPath, "utf8");
+    txt = fs5.readFileSync(cfgPath, "utf8");
   } catch {
     return { providers: {} };
   }
@@ -54565,10 +54703,10 @@ function loadClientConfig(env, cwd) {
   const home = os.homedir();
   const config = {};
   config.claude = readClaudeSettings(home, cwd, env);
-  const codexHome = nonEmpty2(env.CODEX_HOME) ? env.CODEX_HOME : path8.join(home, ".codex");
+  const codexHome = nonEmpty2(env.CODEX_HOME) ? env.CODEX_HOME : path9.join(home, ".codex");
   config.codex = readCodexConfig(codexHome);
   config.pi = readPiConfig(resolvePiHome(env));
-  const zcodeHome = nonEmpty2(env.ZCODE_DATA_BASE_DIR) ? env.ZCODE_DATA_BASE_DIR : path8.join(home, ".zcode");
+  const zcodeHome = nonEmpty2(env.ZCODE_DATA_BASE_DIR) ? env.ZCODE_DATA_BASE_DIR : path9.join(home, ".zcode");
   config.zcode = readZcodeConfig(zcodeHome);
   config.omp = readOmpConfig(resolveOmpHome(env));
   config.opencode = readOpencodeConfig(resolveOpencodeConfigFile(env));
@@ -54628,21 +54766,21 @@ function extractHttpsHosts(config) {
 }
 function configFilePaths(env) {
   const home = os2.homedir();
-  const codexHome = nonEmpty2(env.CODEX_HOME) ? env.CODEX_HOME : path9.join(home, ".codex");
-  const zcodeHome = nonEmpty2(env.ZCODE_DATA_BASE_DIR) ? env.ZCODE_DATA_BASE_DIR : path9.join(home, ".zcode");
+  const codexHome = nonEmpty2(env.CODEX_HOME) ? env.CODEX_HOME : path10.join(home, ".codex");
+  const zcodeHome = nonEmpty2(env.ZCODE_DATA_BASE_DIR) ? env.ZCODE_DATA_BASE_DIR : path10.join(home, ".zcode");
   return [
-    path9.join(home, ".claude", "settings.json"),
-    path9.join(process.cwd(), ".claude", "settings.json"),
-    path9.join(codexHome, "config.toml"),
-    path9.join(resolvePiHome(env), "models.json"),
-    path9.join(zcodeHome, "v2", "config.json")
+    path10.join(home, ".claude", "settings.json"),
+    path10.join(process.cwd(), ".claude", "settings.json"),
+    path10.join(codexHome, "config.toml"),
+    path10.join(resolvePiHome(env), "models.json"),
+    path10.join(zcodeHome, "v2", "config.json")
   ];
 }
 function readMtimes(paths) {
   const mtimes = /* @__PURE__ */ new Map();
   for (const p2 of paths) {
     try {
-      const st2 = fs5.statSync(p2);
+      const st2 = fs6.statSync(p2);
       mtimes.set(p2, st2.mtimeMs);
     } catch {
     }
@@ -54810,6 +54948,108 @@ function readMitmUpstream(socket) {
   return socket[MITM_UPSTREAM_KEY];
 }
 
+// src/tunnel-guard.ts
+import { lookup } from "dns/promises";
+import { networkInterfaces } from "os";
+var BILI_TUNNEL_HEADER = "x-bili-tunnel";
+function parseIpLiteral(s3) {
+  const t = s3.trim().toLowerCase();
+  if (/^\d{1,3}(\.\d{1,3}){3}$/.test(t)) return t;
+  if (t.includes(":")) return t;
+  return null;
+}
+function classifyIp(ip) {
+  const lit = parseIpLiteral(ip);
+  if (!lit) return "public";
+  if (lit.includes(":")) {
+    if (lit === "::1" || lit === "::") return "loopback";
+    const mapped = lit.match(/^::ffff:(\d+\.\d+\.\d+\.\d+)$/);
+    if (mapped) return classifyIp(mapped[1]);
+    if (lit.startsWith("fe8") || lit.startsWith("fe9") || lit.startsWith("fea") || lit.startsWith("feb")) return "linkLocal";
+    if (lit.startsWith("fc") || lit.startsWith("fd")) return "private";
+    return "public";
+  }
+  const parts = lit.split(".").map(Number);
+  const [a, b2] = parts;
+  if (a === 127) return "loopback";
+  if (a === 169 && b2 === 254) return "linkLocal";
+  if (a === 10 || a === 0) return "private";
+  if (a === 172 && b2 >= 16 && b2 <= 31) return "private";
+  if (a === 192 && b2 === 168) return "private";
+  if (a === 100 && b2 >= 64 && b2 <= 127) return "private";
+  return "public";
+}
+var dnsResolveHost = async (host) => {
+  const res = await lookup(host, { all: true, family: 0 });
+  return res.map((r) => r.address);
+};
+var localAddrCache;
+function localMachineIps() {
+  const now = Date.now();
+  if (!localAddrCache || now - localAddrCache.at > 3e4) {
+    const ips = /* @__PURE__ */ new Set(["127.0.0.1", "::1"]);
+    for (const list of Object.values(networkInterfaces())) {
+      for (const ni2 of list ?? []) {
+        if (ni2.address) ips.add(ni2.address.toLowerCase());
+      }
+    }
+    for (let i = 0; i <= 255; i++) ips.add(`127.0.0.${i}`);
+    localAddrCache = { at: now, ips };
+  }
+  return localAddrCache.ips;
+}
+function allowlistHit(host, port, allowlist) {
+  const h = host.toLowerCase();
+  const hp = `${h}:${port}`;
+  return allowlist.some((e) => e === h || e === hp);
+}
+async function checkTunnelDestination(origin, ctx) {
+  let u2;
+  try {
+    u2 = new URL(origin);
+  } catch {
+    return { ok: false, code: "unresolvable", message: `invalid tunnel destination ${origin}` };
+  }
+  const host = u2.hostname.replace(/^\[|\]$/g, "").toLowerCase();
+  const port = u2.port ? Number(u2.port) : u2.protocol === "https:" ? 443 : 80;
+  let ips;
+  const literal = parseIpLiteral(host);
+  if (literal) {
+    ips = [literal];
+  } else {
+    try {
+      ips = await (ctx.resolveHost ?? dnsResolveHost)(host);
+    } catch {
+      return { ok: false, code: "unresolvable", message: `cannot resolve tunnel destination ${host}` };
+    }
+    if (ips.length === 0) return { ok: false, code: "unresolvable", message: `no addresses for tunnel destination ${host}` };
+  }
+  if (ctx.selfPort !== void 0 && port === ctx.selfPort) {
+    const mine = (ctx.localIps ?? localMachineIps)();
+    if (ips.some((ip) => mine.has(ip.toLowerCase()) || mine.has(`::ffff:${ip.toLowerCase()}`))) {
+      return { ok: false, code: "self", message: "the bili tunnel may not target the proxy itself" };
+    }
+  }
+  const classes = ips.map((ip) => classifyIp(ip));
+  if (classes.includes("linkLocal")) {
+    return { ok: false, code: "linkLocal", message: "link-local / metadata destinations are blocked from the bili tunnel" };
+  }
+  if (!classes.every((c) => c === "public")) {
+    if (ctx.clientLoopback) return { ok: true };
+    if (allowlistHit(host, port, ctx.allowlist)) return { ok: true };
+    return {
+      ok: false,
+      code: "privateRemote",
+      message: `tunnel destination ${host} resolves to a loopback/private address; remote clients may only reach it via BILI_TUNNEL_ALLOWED_HOSTS`
+    };
+  }
+  return { ok: true };
+}
+function tunnelAllowlistFromEnv(env = process.env) {
+  const raw = env.BILI_TUNNEL_ALLOWED_HOSTS ?? "";
+  return raw.split(",").map((s3) => s3.trim().toLowerCase()).filter((s3) => s3.length > 0);
+}
+
 // src/content-encoding.ts
 import { promisify } from "util";
 import { brotliDecompress, gunzip, inflate, inflateRaw } from "zlib";
@@ -55652,7 +55892,7 @@ function resolveUpstream(_opts, reqUrl, req) {
     if (rest.startsWith("http://") || rest.startsWith("https://")) {
       try {
         const u2 = new URL(rest);
-        return { upstream: `${u2.protocol}//${u2.host}`, rewrittenUrl: rest, explicitProtocol };
+        return { upstream: `${u2.protocol}//${u2.host}`, rewrittenUrl: rest, explicitProtocol, tunnel: true };
       } catch {
       }
     }
@@ -55664,17 +55904,20 @@ async function startServer(opts) {
   const core = createCore();
   const config = opts.kernelConfig;
   const log2 = (level, msg) => logMsg(opts, level, msg);
-  const instanceId = randomUUID3();
+  const instanceId = randomUUID4();
+  const instanceStartedAt = Date.now();
   await initSessions();
   loadConversations();
   log2("info", `[persist] ${getStore().enabled ? "enabled" : "disabled"}`);
+  const tunnelAllowlist = tunnelAllowlistFromEnv();
+  if (tunnelAllowlist.length > 0) log2("info", `[tunnel] remote-client allowlist: ${tunnelAllowlist.join(", ")}`);
   if (filePath) {
     log2("info", `[log] writing to ${filePath}`);
   }
   void loadRegistry();
   const server = http.createServer(async (req, res) => {
     try {
-      await handle(req, res, opts, core, config, log2, instanceId);
+      await handle(req, res, opts, core, config, log2, instanceId, instanceStartedAt);
     } catch (err2) {
       const msg = String(err2);
       log2("error", msg);
@@ -55705,33 +55948,65 @@ Content-Length: ${Buffer.byteLength(body)}\r
     const allowRemoteConnect = opts.host === "0.0.0.0" || opts.host === "::" || !isLoopbackAddress(opts.host);
     setupMitm(server, opts.mitm.domains, (msg) => log2("info", msg), (host) => resolveProxy(opts.routes, opts.proxy, `https://${host}`, opts.proxyFallback), allowRemoteConnect);
   }
-  server.listen(opts.port, opts.host, () => {
+  const launchToken = process.env.BILI_LAUNCH_TOKEN?.trim();
+  const MAX_LISTEN_ATTEMPTS = 17;
+  let listenAttempts = 0;
+  let lastTriedPort = opts.port;
+  const announceListening = () => {
+    const actualPort = server.address() === null ? opts.port : server.address().port;
     const nonLoopbackBind = opts.host === "0.0.0.0" || opts.host === "::" || !isLoopbackAddress(opts.host);
     const displayHost = nonLoopbackBind ? opts.host : opts.host === "0.0.0.0" ? "localhost" : opts.host;
+    const originHost = opts.host === "0.0.0.0" || opts.host === "::" || opts.host === "localhost" ? "127.0.0.1" : opts.host.includes(":") && !opts.host.startsWith("[") ? `[${opts.host}]` : opts.host;
+    const origin = `http://${originHost}:${actualPort}`;
     try {
-      fs6.mkdirSync(stateDir(), { recursive: true });
-      const originHost = opts.host === "0.0.0.0" || opts.host === "::" || opts.host === "localhost" ? "127.0.0.1" : opts.host.includes(":") && !opts.host.startsWith("[") ? `[${opts.host}]` : opts.host;
-      fs6.writeFileSync(proxyOriginFile(), `http://${originHost}:${server.address() === null ? opts.port : server.address().port}
-`);
+      fs7.mkdirSync(stateDir(), { recursive: true });
+      atomicWriteInstanceFile({
+        origin,
+        instanceId,
+        pid: process.pid,
+        startedAt: instanceStartedAt,
+        host: opts.host,
+        port: actualPort,
+        passthrough: opts.passthrough,
+        mitmDomains: opts.mitm.enabled ? opts.mitm.domains : [],
+        modelWindows: { ...LAUNCHER_MODEL_WINDOWS },
+        launchToken: launchToken || void 0
+      });
     } catch {
     }
+    registerInstanceAndWarn(
+      { instanceId, pid: process.pid, port: actualPort, origin, startedAt: instanceStartedAt },
+      (msg) => log2("warn", `[instances] ${msg}`)
+    );
     const nOverrides = Object.keys(opts.routes).length;
     log2(
       "info",
-      `acp-proxy listening on http://${displayHost}:${opts.port} \u2014 web UI: http://${displayHost}:${opts.port}/__bili/ \u2014 zero-config: prefix any baseURL with http://${displayHost}:${opts.port}/bili/` + (nOverrides ? ` \u2014 context overrides for ${nOverrides} upstream URL(s)` : "") + (opts.mitm.enabled ? ` \u2014 MITM proxy on (whitelist)${opts.mitm.domains.length ? ` +${opts.mitm.domains.join(",")}` : ""}` : "")
+      `acp-proxy listening on http://${displayHost}:${actualPort} \u2014 web UI: http://${displayHost}:${actualPort}/__bili/ \u2014 zero-config: prefix any baseURL with http://${displayHost}:${actualPort}/bili/` + (nOverrides ? ` \u2014 context overrides for ${nOverrides} upstream URL(s)` : "") + (opts.mitm.enabled ? ` \u2014 MITM proxy on (whitelist)${opts.mitm.domains.length ? ` +${opts.mitm.domains.join(",")}` : ""}` : "")
     );
     if (nonLoopbackBind) {
       log2(
         "warn",
-        `[security] bound to ${opts.host} \u2014 proxy endpoints (/bili/, CONNECT for whitelisted model hosts) are reachable from the network with NO authentication; /__bili/ management endpoints stay loopback-only. Restrict access with a firewall on untrusted networks. Remote agents: point baseURL at http://<this-host>:${opts.port}/bili/`
+        `[security] bound to ${opts.host} \u2014 proxy endpoints (/bili/, CONNECT for whitelisted model hosts) are reachable from the network with NO authentication; /__bili/ management endpoints stay loopback-only. Restrict access with a firewall on untrusted networks. Remote agents: point baseURL at http://<this-host>:${actualPort}/bili/`
       );
     }
     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)`);
     }
-  });
+  };
+  const attemptListen = (port) => {
+    lastTriedPort = port;
+    server.listen(port, opts.host, announceListening);
+  };
+  attemptListen(opts.port);
   server.on("error", (err2) => {
-    const hint = err2.code === "EADDRINUSE" ? ` \u2014 port ${opts.port} is already in use. Stop the other process or use --port <N>.` : err2.code === "EACCES" ? ` \u2014 port ${opts.port} requires privileges. Use a port >= 1024.` : "";
+    if (err2.code === "EADDRINUSE" && launchToken && listenAttempts < MAX_LISTEN_ATTEMPTS) {
+      listenAttempts += 1;
+      const next = listenAttempts === MAX_LISTEN_ATTEMPTS ? 0 : lastTriedPort + 1;
+      log2("warn", `port ${lastTriedPort} busy \u2014 ${next === 0 ? "retrying on an ephemeral port" : `retrying on port ${next}`}`);
+      attemptListen(next);
+      return;
+    }
+    const hint = err2.code === "EADDRINUSE" ? ` \u2014 port ${lastTriedPort} is already in use. Stop the other process or use --port <N>.` : err2.code === "EACCES" ? ` \u2014 port ${lastTriedPort} requires privileges. Use a port >= 1024.` : "";
     log2("error", `listen failed: ${err2.code ?? ""} ${err2.message}${hint}`);
     shuttingDown = true;
     server.close();
@@ -55748,24 +56023,24 @@ Content-Length: ${Buffer.byteLength(body)}\r
     log2("error", `unhandledRejection: ${String(reason)}`);
   });
   let shuttingDown = false;
+  const finishShutdown = () => {
+    clearProxyInstanceFile(instanceId);
+    unregisterInstance(instanceId);
+    closeLogger();
+    process.exit(0);
+  };
   const shutdown = (sig) => {
     if (shuttingDown) return;
     shuttingDown = true;
     log2("info", `${sig} received \u2014 flushing sessions\u2026`);
     server.close(() => {
       flushConversations();
-      void flushAllSessions().finally(() => {
-        closeLogger();
-        process.exit(0);
-      });
+      void flushAllSessions().finally(finishShutdown);
     });
     setTimeout(() => {
       log2("warn", "shutdown grace window elapsed; forcing exit");
       flushConversations();
-      void flushAllSessions().finally(() => {
-        closeLogger();
-        process.exit(0);
-      });
+      void flushAllSessions().finally(finishShutdown);
     }, 1e4).unref?.();
   };
   process.on("SIGTERM", () => shutdown("SIGTERM"));
@@ -55773,6 +56048,13 @@ Content-Length: ${Buffer.byteLength(body)}\r
   if (process.platform === "win32") {
     process.on("SIGBREAK", () => shutdown("SIGBREAK"));
   }
+  const parentPid = Number.parseInt(process.env.BILI_PARENT_PID ?? "", 10);
+  if (Number.isInteger(parentPid) && parentPid > 0 && parentPid !== process.pid) {
+    const watcher = setInterval(() => {
+      if (!isPidAlive(parentPid)) shutdown(`parent-gone (pid ${parentPid})`);
+    }, 2e3);
+    watcher.unref?.();
+  }
   return server;
 }
 function isTrustedAdminOrigin(origin, host, trustedHosts) {
@@ -55799,8 +56081,13 @@ function adminTrustedHosts(bindHost, port) {
   }
   return set;
 }
-async function handle(req, res, opts, core, config, log2, instanceId) {
+async function handle(req, res, opts, core, config, log2, instanceId, instanceStartedAt) {
   const isAdminPath = req.url === "/__bili/" || req.url?.startsWith("/__bili/") || req.url === "/__acp/" || req.url?.startsWith("/__acp/");
+  if (isAdminPath && headerValue2(req, BILI_TUNNEL_HEADER) !== void 0) {
+    res.writeHead(403, { "content-type": "application/json" });
+    res.end(JSON.stringify({ error: "management endpoints are not reachable through the bili tunnel" }));
+    return;
+  }
   if (isAdminPath && !isLoopbackAddress(req.socket.remoteAddress)) {
     res.writeHead(403, { "content-type": "application/json" });
     res.end(JSON.stringify({ error: "management endpoints are loopback-only; access denied for " + (req.socket.remoteAddress ?? "unknown") }));
@@ -55825,7 +56112,7 @@ async function handle(req, res, opts, core, config, log2, instanceId) {
   }
   if (req.method === "GET" && req.url === "/__bili/health") {
     res.writeHead(200, { "content-type": "application/json" });
-    res.end(JSON.stringify({ ok: true, upstream: opts.upstream }));
+    res.end(JSON.stringify({ ok: true, upstream: opts.upstream, instanceId, pid: process.pid, startedAt: instanceStartedAt }));
     return;
   }
   if (req.method === "GET" && req.url === "/__bili/") {
@@ -55946,6 +56233,19 @@ async function handle(req, res, opts, core, config, log2, instanceId) {
     urlPath = url.split("?", 2)[0];
     responsesCompact = urlPath.endsWith("/responses/compact");
     route = resolveUpstream(opts, req.url ?? "", req);
+    if (route?.tunnel) {
+      const verdict = await checkTunnelDestination(route.upstream, {
+        selfPort: req.socket.localPort ?? void 0,
+        clientLoopback: isLoopbackAddress(req.socket.remoteAddress),
+        allowlist: tunnelAllowlistFromEnv()
+      });
+      if (!verdict.ok) {
+        log2("warn", `[tunnel] denied ${maskUrlsInText(route.upstream)}: ${verdict.message}`);
+        res.writeHead(403, { "content-type": "application/json" });
+        res.end(JSON.stringify({ error: verdict.message, code: "tunnel_destination_denied", detail: verdict.code }));
+        return;
+      }
+    }
     upstreamOrigin = route ? route.upstream : /^https?:\/\//i.test(url) ? new URL(url).origin : opts.upstream;
     protocol = route?.explicitProtocol ?? (req.method === "POST" && bodyBuffer.length > 0 ? urlPath.endsWith("/chat/completions") ? "openai" : urlPath.endsWith("/v1/messages") || urlPath.endsWith("/messages") ? "anthropic" : urlPath.endsWith("/responses") || responsesCompact ? "responses" : null : null);
     if (protocol !== null && bodyBuffer.length > 0) {
@@ -55989,14 +56289,14 @@ async function handle(req, res, opts, core, config, log2, instanceId) {
     try {
       const rawDir = process.env.ACP_RAW_DUMP_DIR || `${stateDir()}/raw`;
       try {
-        fs6.mkdirSync(rawDir, { recursive: true });
+        fs7.mkdirSync(rawDir, { recursive: true });
       } catch {
       }
       const hdrs = maskHeadersForLog(
         Object.fromEntries(Object.entries(req.headers).map(([k2, v2]) => [k2, Array.isArray(v2) ? v2.join(",") : String(v2)]))
       );
       const hdrText = Object.entries(hdrs).map(([k2, v2]) => `${k2}: ${v2}`).join("\n");
-      fs6.writeFileSync(`${rawDir}/${Date.now()}-INCOMING.txt`, `${req.method} ${maskUrlsInText(req.url ?? "")}
+      fs7.writeFileSync(`${rawDir}/${Date.now()}-INCOMING.txt`, `${req.method} ${maskUrlsInText(req.url ?? "")}
 ${hdrText}
 
 ${bodyBuffer.toString("utf8")}`);
@@ -56338,7 +56638,7 @@ function prepareOpenai(parsed, req, opts, core, config, prompts, log2, session,
     log2("info", diagNudge(turn, sessionId, tokenCount, config.modelContextLimit, parsed.model));
     processedMessages = stripKernelSummaries(turn.messages, turn.state);
     reapOrphanBlocks(session, msgs, deactivateBlock);
-    rebuiltMessages = hoistMidSystemMessages(coreToOpenai(processedMessages));
+    rebuiltMessages = systemToUser(coreToOpenai(processedMessages));
     const sysParts = [];
     if (systemText) sysParts.push(systemText);
     if (shouldInject) sysParts.push(buildCompressSystemPrompt(prompts));
@@ -56675,6 +56975,7 @@ function buildForwardTarget(req, opts, route, affinity, hopMarker) {
     headers[k2] = Array.isArray(v2) ? v2.join(", ") : v2;
   }
   if (hopMarker !== void 0) headers[BILI_HOP_HEADER] = hopMarker;
+  if (route?.tunnel) headers[BILI_TUNNEL_HEADER] = "1";
   headers["host"] = new URL(upstreamUrl).host;
   const betaKey = Object.keys(headers).find((h) => h.toLowerCase() === "x-codex-beta-features");
   if (betaKey) {
@@ -56786,16 +57087,16 @@ async function forward(req, res, opts, body, prepared, core, config, log2, route
       if (bodyDumpEnabled() && process.env.ACP_DUMP_REQ !== "0") {
         const dumpDir = process.env.ACP_DUMP_DIR || `${stateDir()}/dumps`;
         try {
-          fs6.mkdirSync(dumpDir, { recursive: true });
+          fs7.mkdirSync(dumpDir, { recursive: true });
         } catch {
         }
         const sid = prepared?.session.id ?? "unknown";
         const out = `${dumpDir}/req-${Date.now()}-${safeSessionId(sid)}.json`;
         try {
           const pretty = JSON.stringify(JSON.parse(body), null, 2);
-          fs6.writeFileSync(out, pretty);
+          fs7.writeFileSync(out, pretty);
         } catch {
-          fs6.writeFileSync(out, body);
+          fs7.writeFileSync(out, body);
         }
         log2("info", `[debug] forwarded body written to ${out}`);
       }
@@ -56815,7 +57116,7 @@ async function forward(req, res, opts, body, prepared, core, config, log2, route
   const rawBase = bodyDumpEnabled() ? (() => {
     try {
       const rawDir = process.env.ACP_RAW_DUMP_DIR || `${stateDir()}/raw`;
-      fs6.mkdirSync(rawDir, { recursive: true });
+      fs7.mkdirSync(rawDir, { recursive: true });
       return `${rawDir}/${Date.now()}-${safeSessionId(prepared?.session.id)}`;
     } catch {
       return "";
@@ -56826,7 +57127,7 @@ async function forward(req, res, opts, body, prepared, core, config, log2, route
       const hdrText = Object.entries(maskHeadersForLog(headers)).map(([k2, v2]) => `${k2}: ${v2}`).join("\n");
       const bodyText = req.method === "GET" || req.method === "HEAD" ? "" : typeof body === "string" ? body : Buffer.from(body).toString("utf8");
       const reqPath = `${rawBase}-REQ.txt`;
-      fs6.writeFileSync(reqPath, `${req.method ?? "POST"} ${maskUrlForLog(upstreamUrl)}
+      fs7.writeFileSync(reqPath, `${req.method ?? "POST"} ${maskUrlForLog(upstreamUrl)}
 ${hdrText}
 
 ${bodyText}`);
@@ -56876,7 +57177,7 @@ ${bodyText}`);
     try {
       const hdrText = Object.entries(maskHeadersForLog(respHeaders)).map(([k2, v2]) => `${k2}: ${v2}`).join("\n");
       const resPath = `${rawBase}-RES.txt`;
-      fs6.writeFileSync(resPath, `${upstream.status}
+      fs7.writeFileSync(resPath, `${upstream.status}
 ${hdrText}
 `);
       log2("info", `[debug] RAW response dump: ${resPath}`);
@@ -59175,7 +59476,7 @@ var hr = /* @__PURE__ */ Symbol("entry");
 var cs = /* @__PURE__ */ Symbol("entryOpt");
 var ui = /* @__PURE__ */ Symbol("writeEntryClass");
 var lr = /* @__PURE__ */ Symbol("write");
-var fs7 = /* @__PURE__ */ Symbol("ondrain");
+var fs8 = /* @__PURE__ */ Symbol("ondrain");
 var wt = class extends A {
   sync = false;
   opt;
@@ -59209,8 +59510,8 @@ var wt = class extends A {
       if ((t.gzip ? 1 : 0) + (t.brotli ? 1 : 0) + (t.zstd ? 1 : 0) > 1) throw new TypeError("gzip, brotli, zstd are mutually exclusive");
       if (t.gzip && (typeof t.gzip != "object" && (t.gzip = {}), this.portable && (t.gzip.portable = true), this.zip = new ze(t.gzip)), t.brotli && (typeof t.brotli != "object" && (t.brotli = {}), this.zip = new We(t.brotli)), t.zstd && (typeof t.zstd != "object" && (t.zstd = {}), this.zip = new Ye(t.zstd)), !this.zip) throw new Error("impossible");
       let e = this.zip;
-      e.on("data", (i) => super.write(i)), e.on("end", () => super.end()), e.on("drain", () => this[fs7]()), this.on("resume", () => e.resume());
-    } else this.on("drain", this[fs7]);
+      e.on("data", (i) => super.write(i)), e.on("end", () => super.end()), e.on("drain", () => this[fs8]()), this.on("resume", () => e.resume());
+    } else this.on("drain", this[fs8]);
     this.noDirRecurse = !!t.noDirRecurse, this.follow = !!t.follow, this.noMtime = !!t.noMtime, t.mtime && (this.mtime = t.mtime), this.filter = typeof t.filter == "function" ? t.filter : () => true, this[W] = new hi(), this[G] = 0, this.jobs = Number(t.jobs) || 4, this[Ee] = false, this[me] = false;
   }
   [lr](t) {
@@ -59323,7 +59624,7 @@ var wt = class extends A {
       this.emit("error", e);
     }
   }
-  [fs7]() {
+  [fs8]() {
     this[Et] && this[Et].entry && this[Et].entry.resume();
   }
   [di](t) {
@@ -60208,12 +60509,12 @@ var To = (s3) => {
 };
 
 // src/update.ts
-import path10 from "path";
+import path11 from "path";
 import { fileURLToPath as fileURLToPath3 } from "url";
 var REGISTRY_BASE = "https://registry.npmjs.org";
 var CHECK_INTERVAL_MS = 3 * 60 * 1e3;
-var THROTTLE_FILE = path10.join(cacheDir(), ".update-check");
-var LOCK_FILE = path10.join(cacheDir(), ".update-lock");
+var THROTTLE_FILE = path11.join(cacheDir(), ".update-check");
+var LOCK_FILE = path11.join(cacheDir(), ".update-lock");
 var LOCK_MAX_AGE_MS = 30 * 60 * 1e3;
 function shouldStealLock(holderAlive, ageMs) {
   return !holderAlive || ageMs >= LOCK_MAX_AGE_MS;
@@ -60248,27 +60549,27 @@ async function readLastCheck() {
 }
 async function writeLastCheck(ts2) {
   try {
-    await mkdir2(path10.dirname(THROTTLE_FILE), { recursive: true });
+    await mkdir2(path11.dirname(THROTTLE_FILE), { recursive: true });
     await writeFile2(THROTTLE_FILE, String(ts2), "utf-8");
   } catch {
   }
 }
 async function findInstallDir(packageName) {
-  let dir = path10.dirname(fileURLToPath3(import.meta.url));
+  let dir = path11.dirname(fileURLToPath3(import.meta.url));
   for (; ; ) {
     try {
-      const pkg = JSON.parse(await readFile2(path10.join(dir, "package.json"), "utf-8"));
+      const pkg = JSON.parse(await readFile2(path11.join(dir, "package.json"), "utf-8"));
       if (pkg.name === packageName) return dir;
     } catch {
     }
-    const parent = path10.dirname(dir);
+    const parent = path11.dirname(dir);
     if (parent === dir) return void 0;
     dir = parent;
   }
 }
 async function readDiskVersion(installDir) {
   try {
-    const pkg = JSON.parse(await readFile2(path10.join(installDir, "package.json"), "utf-8"));
+    const pkg = JSON.parse(await readFile2(path11.join(installDir, "package.json"), "utf-8"));
     return pkg.version;
   } catch {
     return void 0;
@@ -60305,13 +60606,13 @@ async function syntaxCheckEntry(entryAbs) {
   } catch (e) {
     return `entry unreadable: ${String(e)}`;
   }
-  const tmpCheck = path10.join(cacheDir(), ".update-syntax-check.mjs");
+  const tmpCheck = path11.join(cacheDir(), ".update-syntax-check.mjs");
   try {
     await mkdir2(cacheDir(), { recursive: true });
     await writeFile2(tmpCheck, source);
     const r = await runNodeCheck(tmpCheck);
     if (r.code !== 0) {
-      return `entry does not parse (${path10.basename(entryAbs)}): ${r.stderr.split("\n").filter(Boolean).slice(0, 3).join(" | ").slice(0, 300)}`;
+      return `entry does not parse (${path11.basename(entryAbs)}): ${r.stderr.split("\n").filter(Boolean).slice(0, 3).join(" | ").slice(0, 300)}`;
     }
     return null;
   } finally {
@@ -60324,7 +60625,7 @@ async function syntaxCheckEntry(entryAbs) {
 async function verifyEntries(dir, label) {
   let pkg;
   try {
-    pkg = JSON.parse(await readFile2(path10.join(dir, "package.json"), "utf-8"));
+    pkg = JSON.parse(await readFile2(path11.join(dir, "package.json"), "utf-8"));
   } catch (e) {
     return `${label}: package.json unreadable: ${String(e)}`;
   }
@@ -60334,11 +60635,11 @@ async function verifyEntries(dir, label) {
   }
   for (const rel2 of entries) {
     try {
-      await access(path10.join(dir, rel2));
+      await access(path11.join(dir, rel2));
     } catch {
       return `${label}: entry missing: ${rel2}`;
     }
-    const reason = await syntaxCheckEntry(path10.join(dir, rel2));
+    const reason = await syntaxCheckEntry(path11.join(dir, rel2));
     if (reason) return `${label}: ${reason}`;
   }
   return null;
@@ -60543,14 +60844,14 @@ async function installViaTarball(version2, tarballUrl, installDir, integrity, sh
   if (!v2.ok) {
     return { ok: false, error: `tarball integrity verification failed: ${v2.error}` };
   }
-  const tmpFile = path10.join(cacheDir(), `.update-${version2}.tgz`);
+  const tmpFile = path11.join(cacheDir(), `.update-${version2}.tgz`);
   try {
     await mkdir2(cacheDir(), { recursive: true });
     await writeFile2(tmpFile, tgzBuffer);
   } catch (e) {
     return { ok: false, error: `failed to write temp file ${tmpFile}: ${String(e)}` };
   }
-  const stagingDir = path10.join(cacheDir(), `.update-staging-${version2}`);
+  const stagingDir = path11.join(cacheDir(), `.update-staging-${version2}`);
   try {
     await rm2(stagingDir, { recursive: true, force: true });
     await mkdir2(stagingDir, { recursive: true });
@@ -60572,7 +60873,7 @@ async function installViaTarball(version2, tarballUrl, installDir, integrity, sh
   } finally {
     await rm2(tmpFile, { force: true });
   }
-  const backupDir = path10.join(cacheDir(), `.update-backup-${version2}`);
+  const backupDir = path11.join(cacheDir(), `.update-backup-${version2}`);
   try {
     await rm2(backupDir, { recursive: true, force: true });
     await cp(installDir, backupDir, { recursive: true, force: true });
@@ -60628,14 +60929,14 @@ function startAutoUpdate(opts) {
 }
 
 // src/mcp.ts
-import fs8 from "fs";
-import path11 from "path";
+import fs9 from "fs";
+import path12 from "path";
 import { fileURLToPath as fileURLToPath4 } from "url";
 var VERSION2 = (() => {
   try {
     const here = fileURLToPath4(import.meta.url);
-    const pkg = path11.join(path11.dirname(here), "..", "package.json");
-    return JSON.parse(fs8.readFileSync(pkg, "utf8")).version ?? "dev";
+    const pkg = path12.join(path12.dirname(here), "..", "package.json");
+    return JSON.parse(fs9.readFileSync(pkg, "utf8")).version ?? "dev";
   } catch {
     return "dev";
   }
@@ -60644,11 +60945,8 @@ var DEFAULT_PROXY_ORIGIN = "http://127.0.0.1:8787";
 function resolveProxyOrigin() {
   const fromEnv = process.env.BILI_MCP_PROXY?.trim();
   if (fromEnv && fromEnv.length > 0) return fromEnv;
-  try {
-    const discovered = fs8.readFileSync(proxyOriginFile(), "utf8").trim();
-    if (/^https?:\/\/\S+$/.test(discovered)) return discovered;
-  } catch {
-  }
+  const discovered = readProxyInstanceFile();
+  if (discovered && /^https?:\/\/\S+$/.test(discovered.origin)) return discovered.origin;
   return DEFAULT_PROXY_ORIGIN;
 }
 var TOOL_TIMEOUT_MS = 6e4;
@@ -60807,30 +61105,42 @@ if (process.argv[1] && /(?:^|[\\/])mcp\.(?:ts|js)$/.test(process.argv[1])) {
 }
 
 // src/plugin-install.ts
-import fs9 from "fs";
-import path12 from "path";
+import fs10 from "fs";
+import path13 from "path";
 import os4 from "os";
 import { execFileSync as execFileSync2 } from "child_process";
 import { fileURLToPath as fileURLToPath5 } from "url";
+function proxyOriginForInstall() {
+  const fromEnv = process.env.BILI_MCP_PROXY?.trim();
+  if (fromEnv && fromEnv.length > 0) return fromEnv;
+  const inst = readProxyInstanceFile();
+  if (inst === void 0) {
+    throw new Error("no bili proxy origin found \u2014 start bili first (`bili start` or `bili <client>`), then retry, or set BILI_MCP_PROXY explicitly");
+  }
+  if (isProxyInstanceFile(inst) && !isPidAlive(inst.pid)) {
+    throw new Error(`the recorded bili proxy (pid ${inst.pid}, ${inst.origin}) is not running \u2014 start bili and retry so a dead origin is not frozen into the client config`);
+  }
+  return inst.origin;
+}
 var PLUGIN_AGENTS = ["pi", "omp", "claude", "codex", "opencode"];
 function selfPackageRoot() {
   const here = fileURLToPath5(import.meta.url);
-  return path12.resolve(path12.dirname(here), "..");
+  return path13.resolve(path13.dirname(here), "..");
 }
 function homeFile(rel2, envOverride) {
   const raw = (envOverride !== void 0 ? process.env[envOverride] : void 0)?.trim();
   const base = raw && raw.length > 0 ? raw : os4.homedir();
-  return path12.join(base, rel2);
+  return path13.join(base, rel2);
 }
 function backupOnce(file) {
-  if (fs9.existsSync(file) && !fs9.existsSync(`${file}.bili-bak`)) {
-    fs9.copyFileSync(file, `${file}.bili-bak`);
+  if (fs10.existsSync(file) && !fs10.existsSync(`${file}.bili-bak`)) {
+    fs10.copyFileSync(file, `${file}.bili-bak`);
   }
 }
 function readJson(file) {
   let text;
   try {
-    text = fs9.readFileSync(file, "utf8");
+    text = fs10.readFileSync(file, "utf8");
   } catch (err2) {
     if (err2.code === "ENOENT") return {};
     throw err2;
@@ -60839,7 +61149,7 @@ function readJson(file) {
   try {
     parsed = JSON.parse(text);
   } catch (err2) {
-    throw new Error(`${file}: not valid JSON (${err2 instanceof Error ? err2.message : String(err2)}) \u2014 fix it or restore ${path12.basename(file)}.bili-bak first; refusing to overwrite`);
+    throw new Error(`${file}: not valid JSON (${err2 instanceof Error ? err2.message : String(err2)}) \u2014 fix it or restore ${path13.basename(file)}.bili-bak first; refusing to overwrite`);
   }
   if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) {
     throw new Error(`${file}: expected a JSON object at top level, refusing to overwrite`);
@@ -60847,18 +61157,18 @@ function readJson(file) {
   return parsed;
 }
 function writeJson(file, data) {
-  fs9.mkdirSync(path12.dirname(file), { recursive: true });
+  fs10.mkdirSync(path13.dirname(file), { recursive: true });
   backupOnce(file);
-  fs9.writeFileSync(file, JSON.stringify(data, null, 2) + "\n");
+  fs10.writeFileSync(file, JSON.stringify(data, null, 2) + "\n");
 }
 function requireDistFile(file) {
-  if (!fs9.existsSync(file)) {
+  if (!fs10.existsSync(file)) {
     process.stderr.write(`bili plugin: warning: ${file} does not exist yet (run \`npm run build\` in ${selfPackageRoot()}) \u2014 the entry will be dead until built
 `);
   }
 }
 function piSettingsFile() {
-  return path12.join(resolvePiHome(process.env), "settings.json");
+  return path13.join(resolvePiHome(process.env), "settings.json");
 }
 function isPiEntry(entry, root) {
   return entry === root || /^npm:billion-context(-pi)?(@|$)/.test(entry) || /(^|[/\\])node_modules[/\\]billion-context(-pi)?([\/\\]|$)/.test(entry) || /(^|[/\\])billion-context(-pi)?$/.test(entry);
@@ -60895,35 +61205,80 @@ function piStatus() {
   const list = Array.isArray(packages) ? packages.map(String) : [];
   return list.some((p2) => p2 === root) ? "installed" : "not installed";
 }
+var OMP_ENTRY_RE = /[\\/]dist[\\/]agent[\\/]omp\.js$/;
+function ompExtensionItemLines(text) {
+  const lines = text.split("\n");
+  let keyIdx = -1;
+  for (let i = 0; i < lines.length; i++) {
+    if (/^extensions:(\s+(#.*)?)?$/.test(lines[i])) {
+      if (keyIdx !== -1) return [];
+      keyIdx = i;
+    }
+  }
+  if (keyIdx === -1) return [];
+  const items = [];
+  for (let i = keyIdx + 1; i < lines.length; i++) {
+    const t = lines[i].trimStart();
+    if (t === "" || t.startsWith("#")) continue;
+    if (t === "-" || t.startsWith("- ")) items.push(i);
+    else break;
+  }
+  return items;
+}
 function ompConfigFile() {
   const raw = process.env.PI_CODING_AGENT_DIR?.trim();
-  if (raw && raw.length > 0) return path12.join(raw, "config.yml");
-  return path12.join(os4.homedir(), ".omp", "agent", "config.yml");
+  if (raw && raw.length > 0) {
+    if (raw.endsWith("-bili") && raw.length > "-bili".length) {
+      const realHome = raw.slice(0, -"-bili".length);
+      process.stderr.write(
+        `bili plugin: PI_CODING_AGENT_DIR points at the bili overlay ${raw} \u2014 operating on the real omp home ${realHome} instead
+`
+      );
+      return path13.join(realHome, "config.yml");
+    }
+    return path13.join(raw, "config.yml");
+  }
+  return path13.join(os4.homedir(), ".omp", "agent", "config.yml");
 }
 function ompExtensionPath() {
-  return path12.join(selfPackageRoot(), "dist", "agent", "omp.js");
+  return path13.join(selfPackageRoot(), "dist", "agent", "omp.js");
 }
 function ompEntryValue(line) {
   return line.replace(/#.*$/, "").trim().replace(/^-\s*/, "").replace(/^["']|["']$/g, "").trim();
 }
+function ompBlockLoaded(text) {
+  const lines = text.split("\n");
+  return ompExtensionItemLines(text).some((i) => {
+    const v2 = ompEntryValue(lines[i]);
+    return OMP_ENTRY_RE.test(v2) && fs10.existsSync(v2);
+  });
+}
 function ompRemove() {
   const file = ompConfigFile();
-  const entry = ompExtensionPath();
-  if (!fs9.existsSync(file)) return `omp: not installed (${file})`;
-  const text = fs9.readFileSync(file, "utf8");
-  const cleaned = text.split("\n").filter((line) => ompEntryValue(line) !== entry).join("\n");
-  if (cleaned === text) return `omp: not installed (${file})`;
+  if (!fs10.existsSync(file)) return `omp: not installed (${file})`;
+  const text = fs10.readFileSync(file, "utf8");
+  const lines = text.split("\n");
+  const drop = new Set(
+    ompExtensionItemLines(text).filter((i) => OMP_ENTRY_RE.test(ompEntryValue(lines[i])))
+  );
+  if (drop.size === 0) return `omp: not installed (${file})`;
+  const cleaned = lines.filter((_2, i) => !drop.has(i)).join("\n");
   backupOnce(file);
-  fs9.writeFileSync(file, cleaned);
+  fs10.writeFileSync(file, cleaned);
   return `omp: removed from ${file}`;
 }
 function ompInstall() {
   const file = ompConfigFile();
   const entry = ompExtensionPath();
   requireDistFile(entry);
-  fs9.mkdirSync(path12.dirname(file), { recursive: true });
-  const text = fs9.existsSync(file) ? fs9.readFileSync(file, "utf8") : "";
-  if (text.split("\n").some((line) => ompEntryValue(line) === entry)) return `omp: already installed (${file})`;
+  fs10.mkdirSync(path13.dirname(file), { recursive: true });
+  let text = fs10.existsSync(file) ? fs10.readFileSync(file, "utf8") : "";
+  if (ompBlockLoaded(text)) return `omp: already installed (${file})`;
+  {
+    const lines = text.split("\n");
+    const stale = new Set(ompExtensionItemLines(text).filter((i) => ompEntryValue(lines[i]) === entry));
+    if (stale.size > 0) text = lines.filter((_2, i) => !stale.has(i)).join("\n");
+  }
   const keyCount = (text.match(/^extensions:/gm) ?? []).length;
   if (keyCount > 1) throw new Error(`${file}: multiple \`extensions:\` keys \u2014 fix the file first, refusing to edit`);
   if (/^extensions:\s*\S/m.test(text) && !/^extensions:\s*$/m.test(text)) {
@@ -60953,26 +61308,31 @@ ${tail}`;
   - ${entry}
 `;
   }
-  const occurrences = out.split("\n").filter((line) => ompEntryValue(line) === entry).length;
+  const outLines = out.split("\n");
+  const occurrences = ompExtensionItemLines(out).filter((i) => ompEntryValue(outLines[i]) === entry).length;
   if (occurrences !== 1) {
     throw new Error(`${file}: edit would leave ${occurrences} copies of the entry \u2014 aborting without writing`);
   }
   backupOnce(file);
-  fs9.writeFileSync(file, out);
+  fs10.writeFileSync(file, out);
   return `omp: installed -> ${file} extensions += ${entry}`;
 }
 function ompStatus() {
   const file = ompConfigFile();
-  const text = fs9.existsSync(file) ? fs9.readFileSync(file, "utf8") : "";
-  return text.split("\n").some((line) => ompEntryValue(line) === ompExtensionPath()) ? "installed" : "not installed";
+  const text = fs10.existsSync(file) ? fs10.readFileSync(file, "utf8") : "";
+  const lines = text.split("\n");
+  let broken = false;
+  for (const i of ompExtensionItemLines(text)) {
+    const v2 = ompEntryValue(lines[i]);
+    if (!OMP_ENTRY_RE.test(v2)) continue;
+    if (fs10.existsSync(v2)) return "installed";
+    broken = true;
+  }
+  return broken ? "broken" : "not installed";
 }
 function ompPluginLoadedFrom(ompHome) {
   try {
-    const text = fs9.readFileSync(path12.join(ompHome, "config.yml"), "utf8");
-    return text.split("\n").some((line) => {
-      const v2 = ompEntryValue(line);
-      return /[\\/]dist[\\/]agent[\\/]omp\.js$/.test(v2) && fs9.existsSync(v2);
-    });
+    return ompBlockLoaded(fs10.readFileSync(path13.join(ompHome, "config.yml"), "utf8"));
   } catch {
     return false;
   }
@@ -60983,11 +61343,11 @@ function claudeMcpJson() {
 }
 function claudeInstall() {
   const root = selfPackageRoot();
-  const mcpJs = path12.join(root, "dist", "mcp.js");
+  const mcpJs = path13.join(root, "dist", "mcp.js");
   requireDistFile(mcpJs);
   const claude = process.env.CLAUDE?.trim() || "claude";
   try {
-    execFileSync2(claude, ["mcp", "add", "bili", "--scope", "user", "-e", `BILI_MCP_PROXY=${resolveProxyOrigin()}`, "--", process.execPath, mcpJs], { stdio: ["ignore", "pipe", "pipe"], timeout: CLAUDE_EXEC_TIMEOUT_MS });
+    execFileSync2(claude, ["mcp", "add", "bili", "--scope", "user", "-e", `BILI_MCP_PROXY=${proxyOriginForInstall()}`, "--", process.execPath, mcpJs], { stdio: ["ignore", "pipe", "pipe"], timeout: CLAUDE_EXEC_TIMEOUT_MS });
     return `claude: installed via \`claude mcp add\` (user scope) -> ${claudeMcpJson()}`;
   } catch (err2) {
     const stderr = err2 instanceof Error && "stderr" in err2 ? String(err2.stderr ?? "") : "";
@@ -61010,38 +61370,38 @@ function claudeStatus() {
 }
 function codexToml() {
   const raw = process.env.CODEX_HOME?.trim();
-  if (raw && raw.length > 0) return path12.join(raw, "config.toml");
+  if (raw && raw.length > 0) return path13.join(raw, "config.toml");
   return homeFile(".codex/config.toml");
 }
 function codexBlock() {
   return `
 [mcp_servers.bili]
 command = ${JSON.stringify(process.execPath)}
-args = [${JSON.stringify(path12.join(selfPackageRoot(), "dist", "mcp.js"))}]
-env = { BILI_MCP_PROXY = ${JSON.stringify(resolveProxyOrigin())} }
+args = [${JSON.stringify(path13.join(selfPackageRoot(), "dist", "mcp.js"))}]
+env = { BILI_MCP_PROXY = ${JSON.stringify(proxyOriginForInstall())} }
 `;
 }
 function codexInstall() {
   const file = codexToml();
-  const text = fs9.existsSync(file) ? fs9.readFileSync(file, "utf8") : "";
+  const text = fs10.existsSync(file) ? fs10.readFileSync(file, "utf8") : "";
   const existing = /^[ \t]*\[mcp_servers\.bili\][ \t]*$/m.exec(text);
   if (existing !== null) {
     const block = text.slice(existing.index, text.indexOf("\n[", existing.index + 1) === -1 ? void 0 : text.indexOf("\n[", existing.index + 1));
-    if (block.includes(`BILI_MCP_PROXY = ${JSON.stringify(resolveProxyOrigin())}`)) return `codex: already installed (${file})`;
+    if (block.includes(`BILI_MCP_PROXY = ${JSON.stringify(proxyOriginForInstall())}`)) return `codex: already installed (${file})`;
     const refreshed = text.slice(0, existing.index) + codexBlock().replace(/^\n/, "") + text.slice(existing.index + block.length);
     backupOnce(file);
-    fs9.writeFileSync(file, refreshed);
+    fs10.writeFileSync(file, refreshed);
     return `codex: refreshed proxy origin -> ${file} [mcp_servers.bili]`;
   }
-  fs9.mkdirSync(path12.dirname(file), { recursive: true });
+  fs10.mkdirSync(path13.dirname(file), { recursive: true });
   backupOnce(file);
-  fs9.writeFileSync(file, text + (text.endsWith("\n") || text.length === 0 ? "" : "\n") + codexBlock());
+  fs10.writeFileSync(file, text + (text.endsWith("\n") || text.length === 0 ? "" : "\n") + codexBlock());
   return `codex: installed -> ${file} [mcp_servers.bili]`;
 }
 function codexRemove() {
   const file = codexToml();
-  if (!fs9.existsSync(file)) return `codex: not installed (${file})`;
-  const text = fs9.readFileSync(file, "utf8");
+  if (!fs10.existsSync(file)) return `codex: not installed (${file})`;
+  const text = fs10.readFileSync(file, "utf8");
   const start = (() => {
     const m2 = /^[ \t]*\[mcp_servers\.bili\][ \t]*$/m.exec(text);
     return m2 === null ? -1 : m2.index;
@@ -61054,28 +61414,28 @@ function codexRemove() {
   const end = nextTable >= 0 ? start + firstNewline + 1 + nextTable : text.length;
   const cleaned = (text.slice(0, lineStart).replace(/\n+$/, "\n") + text.slice(end)).replace(/^\n+/, "");
   backupOnce(file);
-  fs9.writeFileSync(file, cleaned);
+  fs10.writeFileSync(file, cleaned);
   return `codex: removed from ${file}`;
 }
 function codexStatus() {
-  const text = fs9.existsSync(codexToml()) ? fs9.readFileSync(codexToml(), "utf8") : "";
+  const text = fs10.existsSync(codexToml()) ? fs10.readFileSync(codexToml(), "utf8") : "";
   return /^\[mcp_servers\.bili\]\s*$/m.test(text) ? "installed" : "not installed";
 }
 function opencodeJson() {
   const raw = process.env.OPENCODE_CONFIG?.trim();
   if (raw && raw.length > 0) return raw;
   const xdg2 = process.env.XDG_CONFIG_HOME?.trim();
-  if (xdg2 && xdg2.length > 0) return path12.join(xdg2, "opencode/opencode.json");
-  return path12.join(os4.homedir(), ".config", "opencode", "opencode.json");
+  if (xdg2 && xdg2.length > 0) return path13.join(xdg2, "opencode/opencode.json");
+  return path13.join(os4.homedir(), ".config", "opencode", "opencode.json");
 }
 function opencodeInstall() {
   const file = opencodeJson();
-  const mcpJs = path12.join(selfPackageRoot(), "dist", "mcp.js");
+  const mcpJs = path13.join(selfPackageRoot(), "dist", "mcp.js");
   requireDistFile(mcpJs);
   const data = readJson(file);
   const mcp = data.mcp ?? {};
   if ("bili" in mcp) return `opencode: already installed (${file})`;
-  mcp.bili = { type: "local", command: [process.execPath, mcpJs], environment: { BILI_MCP_PROXY: resolveProxyOrigin() }, enabled: true };
+  mcp.bili = { type: "local", command: [process.execPath, mcpJs], environment: { BILI_MCP_PROXY: proxyOriginForInstall() }, enabled: true };
   data.mcp = mcp;
   writeJson(file, data);
   return `opencode: installed -> ${file} mcp.bili`;
@@ -61121,15 +61481,15 @@ function pluginStatusAll() {
 }
 
 // src/launcher.ts
-import { randomUUID as randomUUID4 } from "crypto";
-import fs10 from "fs";
+import { randomUUID as randomUUID5 } from "crypto";
+import fs11 from "fs";
 import net2 from "net";
 import os5 from "os";
-import path13 from "path";
+import path14 from "path";
 import { pathToFileURL } from "url";
 import { spawn } from "child_process";
 function selfDistFile(name) {
-  return path13.join(selfPackageRoot(), "dist", name);
+  return path14.join(selfPackageRoot(), "dist", name);
 }
 var LAUNCHER_DEFAULT_HOST = "127.0.0.1";
 var LAUNCHER_DEFAULT_PORT = 8787;
@@ -61165,12 +61525,12 @@ function unwrapUpstream2(url) {
   return idx >= 0 ? url.slice(idx + "/bili/".length) : url;
 }
 function resolveCaCertPath(env) {
-  const base = env.XDG_DATA_HOME || path13.join(os5.homedir(), ".local/share");
-  return path13.join(base, "billion-context", "ca", "root-ca.pem");
+  const base = env.XDG_DATA_HOME || path14.join(os5.homedir(), ".local/share");
+  return path14.join(base, "billion-context", "ca", "root-ca.pem");
 }
 function resolveCombinedCaPath(env) {
-  const base = env.XDG_DATA_HOME || path13.join(os5.homedir(), ".local/share");
-  return path13.join(base, "billion-context", "ca", "combined-ca.pem");
+  const base = env.XDG_DATA_HOME || path14.join(os5.homedir(), ".local/share");
+  return path14.join(base, "billion-context", "ca", "combined-ca.pem");
 }
 function discoverRoutes(client, config) {
   const httpsDomains = [];
@@ -61403,12 +61763,12 @@ function buildCodexMcpArgs(origin, conversationId2) {
   ];
 }
 function overlayLockPath(overlay) {
-  return path13.join(overlay, ".bili-launch.pid");
+  return path14.join(overlay, ".bili-launch.pid");
 }
 function livePidHoldsOverlay(overlay) {
   let raw;
   try {
-    raw = fs10.readFileSync(overlayLockPath(overlay), "utf8");
+    raw = fs11.readFileSync(overlayLockPath(overlay), "utf8");
   } catch {
     return void 0;
   }
@@ -61422,10 +61782,10 @@ function livePidHoldsOverlay(overlay) {
   return pid;
 }
 function linkOverlayEntry(realHome, overlay, entry) {
-  const target = path13.join(realHome, entry);
-  const link = path13.join(overlay, entry);
+  const target = path14.join(realHome, entry);
+  const link = path14.join(overlay, entry);
   try {
-    fs10.symlinkSync(target, link);
+    fs11.symlinkSync(target, link);
     return true;
   } catch (err2) {
     const code = err2.code;
@@ -61433,24 +61793,24 @@ function linkOverlayEntry(realHome, overlay, entry) {
   }
   let st2;
   try {
-    st2 = fs10.lstatSync(target);
+    st2 = fs11.lstatSync(target);
   } catch {
     return false;
   }
   if (st2.isDirectory()) {
     try {
-      fs10.symlinkSync(target, link, "junction");
+      fs11.symlinkSync(target, link, "junction");
       return true;
     } catch {
       return false;
     }
   }
   try {
-    fs10.linkSync(target, link);
+    fs11.linkSync(target, link);
     return true;
   } catch {
     try {
-      fs10.copyFileSync(target, link);
+      fs11.copyFileSync(target, link);
       return true;
     } catch {
       return false;
@@ -61460,7 +61820,7 @@ function linkOverlayEntry(realHome, overlay, entry) {
 function isWriteThroughHardlink(overlayPath, realPath, st2) {
   if (st2.isDirectory() || st2.isSymbolicLink() || st2.nlink <= 1) return false;
   try {
-    const realSt = fs10.lstatSync(realPath);
+    const realSt = fs11.lstatSync(realPath);
     return st2.dev === realSt.dev && st2.ino === realSt.ino;
   } catch {
     return false;
@@ -61472,7 +61832,7 @@ function sqliteSetMembers(base) {
 function mergeSqliteSet(overlay, realHome, base) {
   const members = sqliteSetMembers(base).filter((m2) => {
     try {
-      return fs10.lstatSync(path13.join(overlay, m2)).isFile();
+      return fs11.lstatSync(path14.join(overlay, m2)).isFile();
     } catch {
       return false;
     }
@@ -61490,44 +61850,44 @@ function mergeSqliteSet(overlay, realHome, base) {
   };
   try {
     for (const m2 of members) {
-      const src = path13.join(overlay, m2);
-      const dst = path13.join(realHome, m2);
+      const src = path14.join(overlay, m2);
+      const dst = path14.join(realHome, m2);
       let dstStat;
       try {
-        dstStat = fs10.lstatSync(dst);
+        dstStat = fs11.lstatSync(dst);
       } catch {
       }
       if (dstStat && dstStat.isDirectory()) {
         rollback();
         return false;
       }
-      const srcStat = fs10.lstatSync(src);
+      const srcStat = fs11.lstatSync(src);
       if (dstStat && dstStat.mtimeMs >= srcStat.mtimeMs) {
         try {
-          fs10.renameSync(src, `${dst}.bili-conflict`);
+          fs11.renameSync(src, `${dst}.bili-conflict`);
         } catch {
           rollback();
           return false;
         }
-        undo.push(() => fs10.renameSync(`${dst}.bili-conflict`, src));
+        undo.push(() => fs11.renameSync(`${dst}.bili-conflict`, src));
         continue;
       }
       if (dstStat) {
         try {
-          fs10.renameSync(dst, `${dst}.bili-conflict`);
+          fs11.renameSync(dst, `${dst}.bili-conflict`);
         } catch {
           rollback();
           return false;
         }
-        undo.push(() => fs10.renameSync(`${dst}.bili-conflict`, dst));
+        undo.push(() => fs11.renameSync(`${dst}.bili-conflict`, dst));
       }
       try {
-        fs10.renameSync(src, dst);
+        fs11.renameSync(src, dst);
       } catch {
         rollback();
         return false;
       }
-      undo.push(() => fs10.renameSync(dst, src));
+      undo.push(() => fs11.renameSync(dst, src));
     }
     return true;
   } catch {
@@ -61537,7 +61897,7 @@ function mergeSqliteSet(overlay, realHome, base) {
 }
 function refreshOverlayHome(realHome, overlay, generatedFile) {
   try {
-    fs10.mkdirSync(overlay, { recursive: true });
+    fs11.mkdirSync(overlay, { recursive: true });
   } catch {
     return false;
   }
@@ -61548,19 +61908,19 @@ function refreshOverlayHome(realHome, overlay, generatedFile) {
     );
   }
   try {
-    fs10.writeFileSync(overlayLockPath(overlay), `${process.pid}
+    fs11.writeFileSync(overlayLockPath(overlay), `${process.pid}
 `);
   } catch {
   }
   const realEntries = /* @__PURE__ */ new Set();
   try {
-    for (const entry of fs10.readdirSync(realHome)) realEntries.add(entry);
+    for (const entry of fs11.readdirSync(realHome)) realEntries.add(entry);
   } catch {
   }
   try {
     let overlayEntries;
     try {
-      overlayEntries = fs10.readdirSync(overlay);
+      overlayEntries = fs11.readdirSync(overlay);
     } catch {
       overlayEntries = [];
     }
@@ -61571,10 +61931,10 @@ function refreshOverlayHome(realHome, overlay, generatedFile) {
       if (!members.some((m2) => m2 !== entry && overlayEntries.includes(m2))) continue;
       let mainSt;
       try {
-        mainSt = fs10.lstatSync(path13.join(overlay, entry));
+        mainSt = fs11.lstatSync(path14.join(overlay, entry));
       } catch {
       }
-      const keepSidecars = mainSt !== void 0 && isWriteThroughHardlink(path13.join(overlay, entry), path13.join(realHome, entry), mainSt);
+      const keepSidecars = mainSt !== void 0 && isWriteThroughHardlink(path14.join(overlay, entry), path14.join(realHome, entry), mainSt);
       dbSets.push({ base: entry, keepSidecars });
     }
     const skipEntries = /* @__PURE__ */ new Set();
@@ -61585,10 +61945,10 @@ function refreshOverlayHome(realHome, overlay, generatedFile) {
     }
     for (const entry of overlayEntries) {
       if (entry === generatedFile) continue;
-      const overlayPath = path13.join(overlay, entry);
+      const overlayPath = path14.join(overlay, entry);
       if (entry.startsWith(`.${generatedFile}.`) && entry.endsWith(".tmp")) {
         try {
-          fs10.unlinkSync(overlayPath);
+          fs11.unlinkSync(overlayPath);
         } catch {
         }
         continue;
@@ -61596,33 +61956,33 @@ function refreshOverlayHome(realHome, overlay, generatedFile) {
       if (skipEntries.has(entry)) continue;
       let st2;
       try {
-        st2 = fs10.lstatSync(overlayPath);
+        st2 = fs11.lstatSync(overlayPath);
       } catch {
         continue;
       }
       if (st2.isSymbolicLink()) {
         let target;
         try {
-          target = fs10.readlinkSync(overlayPath);
+          target = fs11.readlinkSync(overlayPath);
         } catch {
         }
-        const wanted = realEntries.has(entry) ? path13.join(realHome, entry) : void 0;
+        const wanted = realEntries.has(entry) ? path14.join(realHome, entry) : void 0;
         if (!wanted || target !== wanted) {
           try {
-            fs10.unlinkSync(overlayPath);
+            fs11.unlinkSync(overlayPath);
           } catch {
           }
         }
       } else if (realEntries.has(entry)) {
-        const realPath = path13.join(realHome, entry);
+        const realPath = path14.join(realHome, entry);
         if (isWriteThroughHardlink(overlayPath, realPath, st2)) {
           try {
-            fs10.unlinkSync(overlayPath);
+            fs11.unlinkSync(overlayPath);
           } catch {
           }
-        } else if (mergeOverlayEntry(overlayPath, realPath)) {
+        } else if (mergeOverlayEntry(overlayPath, realPath, generatedFile)) {
           try {
-            fs10.rmSync(overlayPath, { recursive: true, force: true });
+            fs11.rmSync(overlayPath, { recursive: true, force: true });
           } catch {
           }
         } else {
@@ -61644,10 +62004,10 @@ function refreshOverlayHome(realHome, overlay, generatedFile) {
     for (const entry of realEntries) {
       if (entry === generatedFile) continue;
       total += 1;
-      const overlayPath = path13.join(overlay, entry);
+      const overlayPath = path14.join(overlay, entry);
       let present = false;
       try {
-        fs10.lstatSync(overlayPath);
+        fs11.lstatSync(overlayPath);
         present = true;
       } catch {
       }
@@ -61676,47 +62036,48 @@ function refreshOverlayHome(realHome, overlay, generatedFile) {
   }
   return true;
 }
-function mergeOverlayEntry(src, dst) {
+function mergeOverlayEntry(src, dst, excludedName) {
   let st2;
   try {
-    st2 = fs10.lstatSync(src);
+    st2 = fs11.lstatSync(src);
   } catch {
     return true;
   }
   let dstStat;
   try {
-    dstStat = fs10.lstatSync(dst);
+    dstStat = fs11.lstatSync(dst);
   } catch {
   }
   if (st2.isDirectory()) {
     if (dstStat && !dstStat.isDirectory()) {
       try {
-        fs10.renameSync(dst, `${dst}.bili-conflict`);
+        fs11.renameSync(dst, `${dst}.bili-conflict`);
         dstStat = void 0;
       } catch {
         return false;
       }
     }
     try {
-      fs10.mkdirSync(dst, { recursive: true });
+      fs11.mkdirSync(dst, { recursive: true });
     } catch {
       return false;
     }
     let entries;
     try {
-      entries = fs10.readdirSync(src);
+      entries = fs11.readdirSync(src);
     } catch {
       return false;
     }
     let ok = true;
     for (const entry of entries) {
-      if (!mergeOverlayEntry(path13.join(src, entry), path13.join(dst, entry))) ok = false;
+      if (excludedName !== void 0 && entry === excludedName) continue;
+      if (!mergeOverlayEntry(path14.join(src, entry), path14.join(dst, entry), excludedName)) ok = false;
     }
     return ok;
   }
   if (dstStat && dstStat.isDirectory()) {
     try {
-      fs10.renameSync(src, `${dst}.bili-conflict`);
+      fs11.renameSync(src, `${dst}.bili-conflict`);
       return true;
     } catch {
       return false;
@@ -61725,13 +62086,13 @@ function mergeOverlayEntry(src, dst) {
   if (st2.isSymbolicLink()) {
     if (dstStat) {
       try {
-        fs10.unlinkSync(src);
+        fs11.unlinkSync(src);
       } catch {
       }
       return true;
     }
     try {
-      fs10.renameSync(src, dst);
+      fs11.renameSync(src, dst);
     } catch {
       return false;
     }
@@ -61739,7 +62100,7 @@ function mergeOverlayEntry(src, dst) {
   }
   if (dstStat && dstStat.mtimeMs >= st2.mtimeMs) {
     try {
-      fs10.renameSync(src, `${dst}.bili-conflict`);
+      fs11.renameSync(src, `${dst}.bili-conflict`);
       return true;
     } catch {
       return false;
@@ -61747,13 +62108,13 @@ function mergeOverlayEntry(src, dst) {
   }
   if (dstStat) {
     try {
-      fs10.renameSync(dst, `${dst}.bili-conflict`);
+      fs11.renameSync(dst, `${dst}.bili-conflict`);
     } catch {
       return false;
     }
   }
   try {
-    fs10.renameSync(src, dst);
+    fs11.renameSync(src, dst);
     return true;
   } catch {
     return false;
@@ -61763,7 +62124,7 @@ function piPluginInstalled(piHome) {
   const root = selfPackageRoot();
   if (!root) return false;
   try {
-    const parsed = JSON.parse(fs10.readFileSync(path13.join(piHome, "settings.json"), "utf8"));
+    const parsed = JSON.parse(fs11.readFileSync(path14.join(piHome, "settings.json"), "utf8"));
     const list = Array.isArray(parsed.packages) ? parsed.packages.map(String) : [];
     return list.some((p2) => isBiliPiEntry(p2, root));
   } catch {
@@ -61771,23 +62132,23 @@ function piPluginInstalled(piHome) {
   }
 }
 function writeOverlayFileAtomic(overlay, fileName, contents) {
-  const draft = path13.join(overlay, `.${fileName}.${process.pid}.tmp`);
+  const draft = path14.join(overlay, `.${fileName}.${process.pid}.tmp`);
   try {
-    fs10.writeFileSync(draft, contents);
-    fs10.renameSync(draft, path13.join(overlay, fileName));
+    fs11.writeFileSync(draft, contents);
+    fs11.renameSync(draft, path14.join(overlay, fileName));
   } catch {
     try {
-      fs10.rmSync(draft, { force: true });
+      fs11.rmSync(draft, { force: true });
     } catch {
     }
   }
 }
 function preparePiHttpRewrite(piHome, origin, httpRewrites, httpsRewrites) {
   if (httpRewrites.length === 0 && httpsRewrites.length === 0) return void 0;
-  const modelsPath = path13.join(piHome, "models.json");
+  const modelsPath = path14.join(piHome, "models.json");
   let txt;
   try {
-    txt = fs10.readFileSync(modelsPath, "utf8");
+    txt = fs11.readFileSync(modelsPath, "utf8");
   } catch {
     return void 0;
   }
@@ -61823,12 +62184,64 @@ function preparePiHttpRewrite(piHome, origin, httpRewrites, httpsRewrites) {
   writeOverlayFileAtomic(overlay, "models.json", JSON.stringify(root));
   return overlay;
 }
+function atomicWriteTextFile(filePath, contents) {
+  const draft = `${filePath}.${process.pid}.bili-tmp`;
+  try {
+    fs11.writeFileSync(draft, contents);
+    fs11.renameSync(draft, filePath);
+  } catch {
+    try {
+      fs11.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 = fs11.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 prepareOmpHttpRewrite(ompHome, origin, httpRewrites, httpsRewrites) {
+  const modelsPath = path14.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}`);
+  }
   if (httpRewrites.length === 0 && httpsRewrites.length === 0) return void 0;
-  const modelsPath = path13.join(ompHome, "models.yml");
   let txt;
   try {
-    txt = fs10.readFileSync(modelsPath, "utf8");
+    txt = fs11.readFileSync(modelsPath, "utf8");
   } catch {
     return void 0;
   }
@@ -61872,10 +62285,10 @@ function prepareOmpHttpRewrite(ompHome, origin, httpRewrites, httpsRewrites) {
 }
 function prepareHermesHome(hermesHome, origin, rewrites) {
   if (rewrites.length === 0) return void 0;
-  const cfgPath = path13.join(hermesHome, "config.yaml");
+  const cfgPath = path14.join(hermesHome, "config.yaml");
   let txt;
   try {
-    txt = fs10.readFileSync(cfgPath, "utf8");
+    txt = fs11.readFileSync(cfgPath, "utf8");
   } catch {
     return void 0;
   }
@@ -61902,21 +62315,21 @@ function prepareHermesHome(hermesHome, origin, rewrites) {
 }
 function writeHermesIdentityPlugin(hermesHome, overlay, rewrites) {
   try {
-    if (fs10.existsSync(path13.join(hermesHome, "plugins"))) return false;
+    if (fs11.existsSync(path14.join(hermesHome, "plugins"))) return false;
   } catch {
     return false;
   }
-  const dir = path13.join("plugins", "model-providers", "bili-session-identity");
+  const dir = path14.join("plugins", "model-providers", "bili-session-identity");
   try {
-    fs10.mkdirSync(path13.join(overlay, dir), { recursive: true });
+    fs11.mkdirSync(path14.join(overlay, dir), { recursive: true });
   } catch {
     return false;
   }
   const keys = rewrites.map((r) => r.key);
-  const pluginDir = path13.join(overlay, dir);
+  const pluginDir = path14.join(overlay, dir);
   try {
-    fs10.writeFileSync(path13.join(pluginDir, "__init__.py"), hermesIdentityPluginSource(keys));
-    fs10.writeFileSync(path13.join(pluginDir, "plugin.yaml"), [
+    fs11.writeFileSync(path14.join(pluginDir, "__init__.py"), hermesIdentityPluginSource(keys));
+    fs11.writeFileSync(path14.join(pluginDir, "plugin.yaml"), [
       "name: bili-session-identity",
       "kind: model-provider",
       "version: 1.0.0",
@@ -61928,7 +62341,7 @@ function writeHermesIdentityPlugin(hermesHome, overlay, rewrites) {
     return false;
   }
   try {
-    return fs10.existsSync(path13.join(overlay, dir, "__init__.py"));
+    return fs11.existsSync(path14.join(overlay, dir, "__init__.py"));
   } catch {
     return false;
   }
@@ -61985,10 +62398,10 @@ function hermesIdentityPluginSource(providerKeys) {
   ].join("\n");
 }
 function prepareDshHome(dshHome, origin, rewrites) {
-  const cfgPath = path13.join(dshHome, "settings.yaml");
+  const cfgPath = path14.join(dshHome, "settings.yaml");
   let txt;
   try {
-    txt = fs10.readFileSync(cfgPath, "utf8");
+    txt = fs11.readFileSync(cfgPath, "utf8");
   } catch {
     return void 0;
   }
@@ -62016,16 +62429,16 @@ function writeDshAcpPatch(dshHome) {
   const pluginUrl = pathToFileURL(selfDistFile("agent/dsh-acp.js")).href;
   const dir = `${dshHome}-bili`;
   try {
-    fs10.mkdirSync(dir, { recursive: true });
+    fs11.mkdirSync(dir, { recursive: true });
   } catch {
     return void 0;
   }
   writeOverlayFileAtomic(dir, ".bili-acp.patch.yml", `- insert:
     - name: ${pluginUrl}
 `);
-  const file = path13.join(dir, ".bili-acp.patch.yml");
+  const file = path14.join(dir, ".bili-acp.patch.yml");
   try {
-    return fs10.existsSync(file) ? file : void 0;
+    return fs11.existsSync(file) ? file : void 0;
   } catch {
     return void 0;
   }
@@ -62040,7 +62453,7 @@ function prepareOpencodeHttpRewrite(configFile2, origin, httpRewrites, httpsRewr
   if (httpRewrites.length === 0 && httpsRewrites.length === 0 && !pluginPath) return void 0;
   let root = {};
   try {
-    const txt = fs10.readFileSync(configFile2, "utf8");
+    const txt = fs11.readFileSync(configFile2, "utf8");
     const parsed = JSON.parse(txt);
     if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
       root = { ...parsed };
@@ -62068,9 +62481,9 @@ function prepareOpencodeHttpRewrite(configFile2, origin, httpRewrites, httpsRewr
     if (!plugins.includes(pluginPath)) plugins.push(pluginPath);
     root.plugin = plugins;
   }
-  const tmp = fs10.mkdtempSync(path13.join(os5.tmpdir(), "bili-opencode-"));
-  const tmpFile = path13.join(tmp, "opencode.json");
-  fs10.writeFileSync(tmpFile, JSON.stringify(root));
+  const tmp = fs11.mkdtempSync(path14.join(os5.tmpdir(), "bili-opencode-"));
+  const tmpFile = path14.join(tmp, "opencode.json");
+  fs11.writeFileSync(tmpFile, JSON.stringify(root));
   return tmpFile;
 }
 function dedupeInOrder(list) {
@@ -62104,27 +62517,33 @@ async function probeHealth(origin, fetchImpl) {
     return false;
   }
 }
-function findFreePort(preferred, host = LAUNCHER_DEFAULT_HOST) {
-  const tryBind = (port) => new Promise((resolve) => {
-    const srv = net2.createServer();
-    srv.once("error", () => resolve(false));
-    srv.once("listening", () => srv.close(() => resolve(true)));
-    srv.listen(port, host);
-  });
-  return tryBind(preferred).then((free) => {
-    if (free) return preferred;
-    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"));
-        });
-      });
-    });
-  });
+async function fetchHealthInfoDefault(origin) {
+  try {
+    const res = await fetch(healthUrl(origin), { signal: AbortSignal.timeout(PROBE_TIMEOUT_MS) });
+    if (!res.ok) return void 0;
+    const data = await res.json();
+    return { ok: Boolean(data.ok), instanceId: typeof data.instanceId === "string" ? data.instanceId : void 0 };
+  } catch {
+    return void 0;
+  }
+}
+function instanceCompatible(inst, opts) {
+  if (inst.host !== opts.host || inst.passthrough !== opts.passthrough) return false;
+  const wantDomains = opts.mitmDomains ?? [];
+  if (inst.mitmDomains.length !== wantDomains.length || inst.mitmDomains.some((d, i) => d !== wantDomains[i])) return false;
+  const wantWindows = opts.modelWindows ?? {};
+  const keys = Object.keys(wantWindows);
+  if (Object.keys(inst.modelWindows).length !== keys.length) return false;
+  return keys.every((k2) => inst.modelWindows[k2] === wantWindows[k2]);
+}
+async function probeExistingInstance(readInstance, fetchHealthInfo) {
+  const inst = readInstance();
+  if (!isProxyInstanceFile(inst)) return void 0;
+  if (!isPidAlive(inst.pid)) return void 0;
+  const health = await fetchHealthInfo(inst.origin);
+  if (!health || !health.ok) return void 0;
+  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 stripInheritedProxy(env) {
@@ -62140,25 +62559,34 @@ function proxyStartArgs(opts) {
 }
 async function ensureProxyRunning(opts, deps = {}) {
   const fetchImpl = deps.fetchImpl ?? defaultFetch;
+  const fetchHealthInfo = deps.fetchHealthInfo ?? fetchHealthInfoDefault;
+  const readInstance = deps.readInstanceFile ?? readProxyInstanceFile;
   const spawnImpl = deps.spawnImpl ?? spawn;
   const now = deps.now ?? Date.now;
   const sleepImpl = deps.sleep ?? ((ms2) => new Promise((r) => setTimeout(r, ms2)));
-  const port = await findFreePort(opts.port, opts.host);
-  const spawnedOrigin = proxyOrigin(opts.host, port);
+  const existing = await probeExistingInstance(readInstance, fetchHealthInfo);
+  if (existing && instanceCompatible(existing, opts)) {
+    console.error(`bili: attaching to running proxy at ${existing.origin} (pid ${existing.pid})`);
+    return { origin: existing.origin, port: existing.port, attached: true };
+  }
+  const launchToken = randomUUID5();
+  const port = opts.port;
   const script = process.argv[1];
   if (!script) throw new Error("bili: cannot resolve launcher script path");
-  const logPath2 = path13.join(os5.tmpdir(), `bili-proxy-${port}.log`);
-  const logFd = fs10.openSync(logPath2, "a");
+  const logPath2 = path14.join(os5.tmpdir(), `bili-proxy-${port}.log`);
+  const logFd = fs11.openSync(logPath2, "a");
   let child;
   try {
     child = spawnImpl(
       process.execPath,
-      [script, ...proxyStartArgs({ ...opts, port, debug: true })],
+      [script, ...proxyStartArgs(opts)],
       {
         detached: true,
         stdio: ["ignore", logFd, logFd],
         env: {
           ...stripInheritedProxy(process.env),
+          BILI_LAUNCH_TOKEN: launchToken,
+          BILI_PARENT_PID: String(process.pid),
           ...opts.mitmDomains && opts.mitmDomains.length ? { BILI_MITM_DOMAINS: opts.mitmDomains.join(",") } : {},
           ...opts.modelWindows && Object.keys(opts.modelWindows).length > 0 ? { BILI_LAUNCHER_MODEL_WINDOWS: JSON.stringify(opts.modelWindows) } : {}
         }
@@ -62166,7 +62594,7 @@ async function ensureProxyRunning(opts, deps = {}) {
     );
   } finally {
     try {
-      fs10.closeSync(logFd);
+      fs11.closeSync(logFd);
     } catch {
     }
   }
@@ -62177,16 +62605,28 @@ async function ensureProxyRunning(opts, deps = {}) {
   const deadline = now() + SPAWN_WAIT_MS;
   while (now() < deadline) {
     await sleepImpl(HEALTH_POLL_INTERVAL_MS);
-    if (await probeHealth(spawnedOrigin, fetchImpl)) {
-      return { origin: spawnedOrigin, port, child, logPath: logPath2 };
+    const inst = readInstance();
+    if (isProxyInstanceFile(inst) && inst.launchToken === launchToken) {
+      if (await probeHealth(inst.origin, fetchImpl)) {
+        return { origin: inst.origin, port: inst.port, child, logPath: logPath2 };
+      }
+      continue;
+    }
+    const stale = !isProxyInstanceFile(inst) || !isPidAlive(inst.pid);
+    if (stale && await probeHealth(proxyOrigin(opts.host, port), fetchImpl)) {
+      return { origin: proxyOrigin(opts.host, port), port, child, logPath: logPath2 };
     }
   }
-  throw new Error(`bili: proxy did not become healthy at ${spawnedOrigin} within ${SPAWN_WAIT_MS}ms`);
+  throw new Error(`bili: proxy did not become healthy within ${SPAWN_WAIT_MS}ms (log: ${logPath2})`);
 }
 function stopProxy(handle2) {
+  if (handle2.attached) return;
   const child = handle2.child;
   if (!child || child.pid === void 0) return;
-  if (process.platform !== "win32" && child.pid > 0) {
+  if (process.platform === "win32") {
+    return;
+  }
+  if (child.pid > 0) {
     try {
       process.kill(-child.pid);
     } catch {
@@ -62213,12 +62653,12 @@ var PATH_EXTS = process.platform === "win32" ? [".cmd", ".bat", ".exe", ""] : ["
 function resolveOnPath(name, env) {
   const p2 = env.PATH;
   if (!p2) return void 0;
-  for (const dir of p2.split(path13.delimiter)) {
+  for (const dir of p2.split(path14.delimiter)) {
     if (!dir) continue;
     for (const ext of PATH_EXTS) {
-      const f2 = path13.join(dir, name + ext);
+      const f2 = path14.join(dir, name + ext);
       try {
-        if (fs10.existsSync(f2) && fs10.statSync(f2).isFile()) return f2;
+        if (fs11.existsSync(f2) && fs11.statSync(f2).isFile()) return f2;
       } catch {
       }
     }
@@ -62236,7 +62676,7 @@ function resolveClientCommand(client, env) {
     if (piBin) return { command: piBin, prefixArgs: [] };
     const piResolved = resolveOnPath("pi", env);
     if (piResolved) return { command: piResolved, prefixArgs: [] };
-    const cli = path13.join(
+    const cli = path14.join(
       os5.homedir(),
       ".pi/agent/npm/node_modules/@earendil-works/pi-coding-agent/dist/cli.js"
     );
@@ -62308,7 +62748,7 @@ async function runLaunch(params, deps = {}) {
     piOverlayHome = preparePiHttpRewrite(resolvePiHome(process.env), origin, routes.httpRewrites, routes.httpsRewrites);
     if (piOverlayHome) env.PI_CODING_AGENT_DIR = piOverlayHome;
     const piExt = selfDistFile("agent/pi.js");
-    if (piExt && fs10.existsSync(piExt) && !piPluginInstalled(resolvePiHome(process.env))) {
+    if (piExt && fs11.existsSync(piExt) && !piPluginInstalled(resolvePiHome(process.env))) {
       clientArgs = ["-e", piExt, ...clientArgs];
     }
   } else if (base === "omp") {
@@ -62316,13 +62756,13 @@ async function runLaunch(params, deps = {}) {
     ompOverlayHome = prepareOmpHttpRewrite(resolveOmpHome(process.env), origin, routes.httpRewrites, routes.httpsRewrites);
     if (ompOverlayHome) env.PI_CODING_AGENT_DIR = ompOverlayHome;
     const ompExt = selfDistFile("agent/omp.js");
-    if (ompExt && fs10.existsSync(ompExt) && !ompPluginLoadedFrom(resolveOmpHome(process.env))) {
+    if (ompExt && fs11.existsSync(ompExt) && !ompPluginLoadedFrom(resolveOmpHome(process.env))) {
       clientArgs = ["-e", ompExt, ...clientArgs];
     }
   } else if (base === "opencode") {
     env = { ...process.env, HTTPS_PROXY: origin, NODE_EXTRA_CA_CERTS: ca, BILLION_CONTEXT_PROXY: origin };
     const opencodePlugin = selfDistFile("agent/opencode.js");
-    const opencodePluginPath = opencodePlugin && fs10.existsSync(opencodePlugin) ? opencodePlugin : void 0;
+    const opencodePluginPath = opencodePlugin && fs11.existsSync(opencodePlugin) ? opencodePlugin : void 0;
     opencodeTmpFile = prepareOpencodeHttpRewrite(resolveOpencodeConfigFile(process.env), origin, routes.httpRewrites, routes.httpsRewrites, opencodePluginPath);
     if (opencodeTmpFile) env.OPENCODE_CONFIG = opencodeTmpFile;
   } else if (base === "hermes") {
@@ -62360,7 +62800,7 @@ async function runLaunch(params, deps = {}) {
     const dshAcpPatch = writeDshAcpPatch(dshHomeDir);
     if (dshAcpPatch) clientArgs = dshArgsWithPatch(clientArgs, dshAcpPatch);
   } else if (base === "codex") {
-    const codexConversationId = injectMcp ? randomUUID4() : void 0;
+    const codexConversationId = injectMcp ? randomUUID5() : void 0;
     if (directUrl) {
       env = { ...process.env, BILLION_CONTEXT_PROXY: origin };
       if (codexConversationId) clientArgs = [...buildCodexMcpArgs(origin, codexConversationId), ...clientArgs];
@@ -62395,8 +62835,8 @@ async function runLaunch(params, deps = {}) {
       console.error(`bili: claude budget aligned \u2014 CLAUDE_CODE_AUTO_COMPACT_WINDOW=${claudeBudget.CLAUDE_CODE_AUTO_COMPACT_WINDOW}`);
     }
     if (injectMcp) {
-      const mcpFile = path13.join(os5.tmpdir(), `bili-mcp-${Date.now()}.json`);
-      fs10.writeFileSync(mcpFile, JSON.stringify(buildMcpConfig(origin)));
+      const mcpFile = path14.join(os5.tmpdir(), `bili-mcp-${Date.now()}.json`);
+      fs11.writeFileSync(mcpFile, JSON.stringify(buildMcpConfig(origin)));
       tmpFiles.push(mcpFile);
       clientArgs = ["--mcp-config", mcpFile, ...clientArgs];
     }
@@ -62415,13 +62855,13 @@ async function runLaunch(params, deps = {}) {
     stopProxy(handle2);
     if (opencodeTmpFile) {
       try {
-        fs10.rmSync(path13.dirname(opencodeTmpFile), { recursive: true, force: true });
+        fs11.rmSync(path14.dirname(opencodeTmpFile), { recursive: true, force: true });
       } catch {
       }
     }
     for (const f2 of tmpFiles) {
       try {
-        fs10.rmSync(f2, { force: true });
+        fs11.rmSync(f2, { force: true });
       } catch {
       }
     }
@@ -62447,8 +62887,8 @@ async function runTestPi(params, deps = {}) {
   }
   const ca = resolveCaCertPath(process.env);
   const env = buildPiEnv(handle2.origin, ca, process.env);
-  const sessionDir = path13.join(os5.tmpdir(), `bili-pi-test-${Date.now()}`);
-  fs10.mkdirSync(sessionDir, { recursive: true });
+  const sessionDir = path14.join(os5.tmpdir(), `bili-pi-test-${Date.now()}`);
+  fs11.mkdirSync(sessionDir, { recursive: true });
   const args = [
     "-p",
     "--no-session",
@@ -62476,7 +62916,7 @@ async function runTestPi(params, deps = {}) {
 
 // src/export.ts
 import { mkdirSync as mkdirSync5, writeFileSync as writeFileSync4 } from "fs";
-import path14 from "path";
+import path15 from "path";
 function fmtDate(ms2) {
   return ms2 ? new Date(ms2).toISOString().replace("T", " ").slice(0, 19) + " UTC" : "\u2014";
 }
@@ -62608,7 +63048,7 @@ async function exportSession(selector, opts = {}) {
   }
   const markdown = renderHandoff(matches[0], opts.full ?? false);
   if (opts.output) {
-    mkdirSync5(path14.dirname(path14.resolve(opts.output)), { recursive: true });
+    mkdirSync5(path15.dirname(path15.resolve(opts.output)), { recursive: true });
     writeFileSync4(opts.output, markdown, "utf8");
     return `written to ${opts.output}`;
   }
@@ -62618,11 +63058,11 @@ async function exportSession(selector, opts = {}) {
 // src/cli.ts
 import { readFileSync as readFileSync4 } from "fs";
 import { fileURLToPath as fileURLToPath6 } from "url";
-import path15 from "path";
+import path16 from "path";
 var VERSION3 = (() => {
   try {
     const here = fileURLToPath6(import.meta.url);
-    const pkg = path15.join(path15.dirname(here), "..", "package.json");
+    const pkg = path16.join(path16.dirname(here), "..", "package.json");
     return JSON.parse(readFileSync4(pkg, "utf8")).version ?? "dev";
   } catch {
     return "dev";
@@ -62631,7 +63071,7 @@ var VERSION3 = (() => {
 var PACKAGE_NAME = (() => {
   try {
     const here = fileURLToPath6(import.meta.url);
-    const pkg = path15.join(path15.dirname(here), "..", "package.json");
+    const pkg = path16.join(path16.dirname(here), "..", "package.json");
     return JSON.parse(readFileSync4(pkg, "utf8")).name ?? "billion-context";
   } catch {
     return "billion-context";