billion-context 0.1.43 → 0.1.45

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 path12 = url.path != null ? url.path : `${url.pathname || ""}${url.search || ""}`;
+        let path15 = url.path != null ? url.path : `${url.pathname || ""}${url.search || ""}`;
         if (origin[origin.length - 1] === "/") {
           origin = origin.slice(0, origin.length - 1);
         }
-        if (path12 && path12[0] !== "/") {
-          path12 = `/${path12}`;
+        if (path15 && path15[0] !== "/") {
+          path15 = `/${path15}`;
         }
-        return new URL(`${origin}${path12}`);
+        return new URL(`${origin}${path15}`);
       }
       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: path12, origin }
+            request: { method, path: path15, origin }
           } = evt;
-          debugLog("sending request to %s %s%s", method, origin, path12);
+          debugLog("sending request to %s %s%s", method, origin, path15);
         }
       );
     }
@@ -1989,14 +1989,14 @@ var require_diagnostics = __commonJS({
         "undici:request:headers",
         (evt) => {
           const {
-            request: { method, path: path12, origin },
+            request: { method, path: path15, origin },
             response: { statusCode }
           } = evt;
           debugLog(
             "received response to %s %s%s - HTTP %d",
             method,
             origin,
-            path12,
+            path15,
             statusCode
           );
         }
@@ -2005,23 +2005,23 @@ var require_diagnostics = __commonJS({
         "undici:request:trailers",
         (evt) => {
           const {
-            request: { method, path: path12, origin }
+            request: { method, path: path15, origin }
           } = evt;
-          debugLog("trailers received from %s %s%s", method, origin, path12);
+          debugLog("trailers received from %s %s%s", method, origin, path15);
         }
       );
       diagnosticsChannel.subscribe(
         "undici:request:error",
         (evt) => {
           const {
-            request: { method, path: path12, origin },
+            request: { method, path: path15, origin },
             error
           } = evt;
           debugLog(
             "request to %s %s%s errored - %s",
             method,
             origin,
-            path12,
+            path15,
             error.message
           );
         }
@@ -2136,7 +2136,7 @@ var require_request = __commonJS({
     var kHandler = /* @__PURE__ */ Symbol("handler");
     var Request = class {
       constructor(origin, {
-        path: path12,
+        path: path15,
         method,
         body,
         headers,
@@ -2153,11 +2153,11 @@ var require_request = __commonJS({
         maxRedirections,
         typeOfService
       }, handler) {
-        if (typeof path12 !== "string") {
+        if (typeof path15 !== "string") {
           throw new InvalidArgumentError("path must be a string");
-        } else if (path12[0] !== "/" && !(path12.startsWith("http://") || path12.startsWith("https://")) && method !== "CONNECT") {
+        } else if (path15[0] !== "/" && !(path15.startsWith("http://") || path15.startsWith("https://")) && method !== "CONNECT") {
           throw new InvalidArgumentError("path must be an absolute URL or start with a slash");
-        } else if (invalidPathRegex.test(path12)) {
+        } else if (invalidPathRegex.test(path15)) {
           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(path12, query) : path12;
+        this.path = query ? serializePathWithQuery(path15, query) : path15;
         this.origin = origin;
         this.protocol = getProtocolFromUrlString(origin);
         this.idempotent = idempotent == null ? method === "HEAD" || method === "GET" : idempotent;
@@ -6068,20 +6068,20 @@ var require_formdata_parser = __commonJS({
       );
       let value;
       if (isExtended) {
-        const headerValue2 = collectASequenceOfBytes(
+        const headerValue3 = collectASequenceOfBytes(
           (char) => char !== 32 && char !== 13 && char !== 10 && char !== 59,
           // not space, CRLF, or ;
           input,
           position
         );
-        if (headerValue2[0] !== 117 && headerValue2[0] !== 85 || // u or U
-        headerValue2[1] !== 116 && headerValue2[1] !== 84 || // t or T
-        headerValue2[2] !== 102 && headerValue2[2] !== 70 || // f or F
-        headerValue2[3] !== 45 || // -
-        headerValue2[4] !== 56) {
+        if (headerValue3[0] !== 117 && headerValue3[0] !== 85 || // u or U
+        headerValue3[1] !== 116 && headerValue3[1] !== 84 || // t or T
+        headerValue3[2] !== 102 && headerValue3[2] !== 70 || // f or F
+        headerValue3[3] !== 45 || // -
+        headerValue3[4] !== 56) {
           throw parsingError("unknown encoding, expected utf-8''");
         }
-        value = decodeURIComponent(decoder.decode(headerValue2.subarray(7)));
+        value = decodeURIComponent(decoder.decode(headerValue3.subarray(7)));
       } else if (input[position.position] === 34) {
         position.position++;
         const quotedValue = collectASequenceOfBytes(
@@ -6170,23 +6170,23 @@ var require_formdata_parser = __commonJS({
             break;
           }
           case "content-type": {
-            let headerValue2 = collectASequenceOfBytes(
+            let headerValue3 = collectASequenceOfBytes(
               (char) => char !== 10 && char !== 13,
               input,
               position
             );
-            headerValue2 = removeChars(headerValue2, false, true, (char) => char === 9 || char === 32);
-            contentType = isomorphicDecode(headerValue2);
+            headerValue3 = removeChars(headerValue3, false, true, (char) => char === 9 || char === 32);
+            contentType = isomorphicDecode(headerValue3);
             break;
           }
           case "content-transfer-encoding": {
-            let headerValue2 = collectASequenceOfBytes(
+            let headerValue3 = collectASequenceOfBytes(
               (char) => char !== 10 && char !== 13,
               input,
               position
             );
-            headerValue2 = removeChars(headerValue2, false, true, (char) => char === 9 || char === 32);
-            encoding = isomorphicDecode(headerValue2);
+            headerValue3 = removeChars(headerValue3, false, true, (char) => char === 9 || char === 32);
+            encoding = isomorphicDecode(headerValue3);
             break;
           }
           default: {
@@ -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: path12, host, upgrade, blocking, reset } = request;
+      const { method, path: path15, 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} ${path12} HTTP/1.1\r
+      let header = `${method} ${path15} 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: path12, host, upgrade, expectContinue, signal, protocol, headers: reqHeaders } = request;
+      const { method, path: path15, 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] = path12;
+          headers[HTTP2_HEADER_PATH] = path15;
           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] = path12;
+      headers[HTTP2_HEADER_PATH] = path15;
       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: path12 = "/",
+          path: path15 = "/",
           headers = {}
         } = opts;
-        opts.path = origin + path12;
+        opts.path = origin + path15;
         if (!("host" in headers) && !("Host" in headers)) {
           const { host } = new URL(origin);
           headers.host = host;
@@ -12612,8 +12612,8 @@ var require_mock_utils = __commonJS({
     }
     function lowerCaseEntries(headers) {
       return Object.fromEntries(
-        Object.entries(headers).map(([headerName, headerValue2]) => {
-          return [headerName.toLocaleLowerCase(), headerValue2];
+        Object.entries(headers).map(([headerName, headerValue3]) => {
+          return [headerName.toLocaleLowerCase(), headerValue3];
         })
       );
     }
@@ -12653,8 +12653,8 @@ var require_mock_utils = __commonJS({
         return false;
       }
       for (const [matchHeaderName, matchHeaderValue] of Object.entries(mockDispatch2.headers)) {
-        const headerValue2 = getHeaderByName(headers, matchHeaderName);
-        if (!matchValue(matchHeaderValue, headerValue2)) {
+        const headerValue3 = getHeaderByName(headers, matchHeaderName);
+        if (!matchValue(matchHeaderValue, headerValue3)) {
           return false;
         }
       }
@@ -12684,20 +12684,20 @@ var require_mock_utils = __commonJS({
       }
       return normalizedQp;
     }
-    function safeUrl(path12) {
-      if (typeof path12 !== "string") {
-        return path12;
+    function safeUrl(path15) {
+      if (typeof path15 !== "string") {
+        return path15;
       }
-      const pathSegments = path12.split("?", 3);
+      const pathSegments = path15.split("?", 3);
       if (pathSegments.length !== 2) {
-        return path12;
+        return path15;
       }
       const qp = new URLSearchParams(pathSegments.pop());
       qp.sort();
       return [...pathSegments, qp.toString()].join("?");
     }
-    function matchKey(mockDispatch2, { path: path12, method, body, headers }) {
-      const pathMatch = matchValue(mockDispatch2.path, path12);
+    function matchKey(mockDispatch2, { path: path15, method, body, headers }) {
+      const pathMatch = matchValue(mockDispatch2.path, path15);
       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: path12, ignoreTrailingSlash }) => {
-        return ignoreTrailingSlash ? matchValue(removeTrailingSlash(safeUrl(path12)), resolvedPathWithoutTrailingSlash) : matchValue(safeUrl(path12), resolvedPath);
+      let matchedMockDispatches = mockDispatches.filter(({ consumed }) => !consumed).filter(({ path: path15, ignoreTrailingSlash }) => {
+        return ignoreTrailingSlash ? matchValue(removeTrailingSlash(safeUrl(path15)), resolvedPathWithoutTrailingSlash) : matchValue(safeUrl(path15), 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(path12) {
-      while (path12.endsWith("/")) {
-        path12 = path12.slice(0, -1);
+    function removeTrailingSlash(path15) {
+      while (path15.endsWith("/")) {
+        path15 = path15.slice(0, -1);
       }
-      if (path12.length === 0) {
-        path12 = "/";
+      if (path15.length === 0) {
+        path15 = "/";
       }
-      return path12;
+      return path15;
     }
     function buildKey(opts) {
-      const { path: path12, method, body, headers, query } = opts;
+      const { path: path15, method, body, headers, query } = opts;
       return {
-        path: path12,
+        path: path15,
         method,
         body,
         headers,
@@ -13464,10 +13464,10 @@ var require_pending_interceptors_formatter = __commonJS({
       }
       format(pendingInterceptors) {
         const withPrettyHeaders = pendingInterceptors.map(
-          ({ method, path: path12, data: { statusCode }, persist, times, timesInvoked, origin }) => ({
+          ({ method, path: path15, data: { statusCode }, persist, times, timesInvoked, origin }) => ({
             Method: method,
             Origin: origin,
-            Path: path12,
+            Path: path15,
             "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 [path12, searchParams] = dispatchOpts.path.split("?");
+          const [path15, searchParams] = dispatchOpts.path.split("?");
           const normalizedSearchParams = normalizeSearchParams(searchParams, acceptNonStandardSearchParameters);
-          dispatchOpts.path = `${path12}?${normalizedSearchParams}`;
+          dispatchOpts.path = `${path15}?${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 path12 = filePath || this.#snapshotPath;
-        if (!path12) {
+        const path15 = filePath || this.#snapshotPath;
+        if (!path15) {
           throw new InvalidArgumentError("Snapshot path is required");
         }
         try {
-          const data = await readFile3(resolve(path12), "utf8");
+          const data = await readFile3(resolve(path15), "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 ${path12}`, { cause: error });
+            throw new UndiciError(`Failed to load snapshots from ${path15}`, { cause: error });
           }
         }
       }
@@ -13982,11 +13982,11 @@ var require_snapshot_recorder = __commonJS({
        * @returns {Promise<void>} - Resolves when snapshots are saved
        */
       async saveSnapshots(filePath) {
-        const path12 = filePath || this.#snapshotPath;
-        if (!path12) {
+        const path15 = filePath || this.#snapshotPath;
+        if (!path15) {
           throw new InvalidArgumentError("Snapshot path is required");
         }
-        const resolvedPath = resolve(path12);
+        const resolvedPath = resolve(path15);
         await mkdir3(dirname6(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 path12 = search ? `${pathname}${search}` : pathname;
-        const redirectUrlString = `${origin}${path12}`;
+        const path15 = search ? `${pathname}${search}` : pathname;
+        const redirectUrlString = `${origin}${path15}`;
         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 = path12;
+        this.opts.path = path15;
         this.opts.origin = origin;
         this.opts.query = null;
       }
@@ -15748,8 +15748,8 @@ var require_cache = __commonJS({
         if (!isValidHTTPToken(trimmedHeader)) {
           return void 0;
         }
-        const headerValue2 = headers[trimmedHeader];
-        output[trimmedHeader] = Array.isArray(headerValue2) ? headerValue2.slice() : headerValue2 ?? null;
+        const headerValue3 = headers[trimmedHeader];
+        output[trimmedHeader] = Array.isArray(headerValue3) ? headerValue3.slice() : headerValue3 ?? null;
       }
       return output;
     }
@@ -16395,10 +16395,10 @@ var require_cache_handler = __commonJS({
       }
       return locationUrl.pathname + locationUrl.search;
     }
-    function deleteCachedUri(store, cacheKey, path12) {
+    function deleteCachedUri(store, cacheKey, path15) {
       deleteCachedValue(store, {
         ...cacheKey,
-        path: path12
+        path: path15
       });
       for (let i = 0; i < util.safeHTTPMethods.length; i++) {
         const method = util.safeHTTPMethods[i];
@@ -16406,20 +16406,20 @@ var require_cache_handler = __commonJS({
           deleteCachedValue(store, {
             ...cacheKey,
             method,
-            path: path12
+            path: path15
           });
         }
       }
     }
-    function deleteLocationTargets(store, cacheKey, headerValue2) {
-      if (headerValue2 === void 0) {
+    function deleteLocationTargets(store, cacheKey, headerValue3) {
+      if (headerValue3 === void 0) {
         return;
       }
-      const values = Array.isArray(headerValue2) ? headerValue2 : [headerValue2];
+      const values = Array.isArray(headerValue3) ? headerValue3 : [headerValue3];
       for (let i = 0; i < values.length; i++) {
-        const path12 = getSameOriginPath(cacheKey, values[i]);
-        if (path12 !== void 0) {
-          deleteCachedUri(store, cacheKey, path12);
+        const path15 = getSameOriginPath(cacheKey, values[i]);
+        if (path15 !== void 0) {
+          deleteCachedUri(store, cacheKey, path15);
         }
       }
     }
@@ -18206,7 +18206,7 @@ var require_sqlite_cache_store = __commonJS({
     var { Writable } = __require("stream");
     var { assertCacheKey, assertCacheValue } = require_cache();
     var DatabaseSync;
-    var VERSION2 = 3;
+    var VERSION4 = 3;
     var MAX_ENTRY_SIZE = 2 * 1e3 * 1e3 * 1e3;
     module.exports = class SqliteCacheStore {
       #maxEntrySize = MAX_ENTRY_SIZE;
@@ -18277,7 +18277,7 @@ var require_sqlite_cache_store = __commonJS({
       PRAGMA temp_store = memory;
       PRAGMA optimize;
 
-      CREATE TABLE IF NOT EXISTS cacheInterceptorV${VERSION2} (
+      CREATE TABLE IF NOT EXISTS cacheInterceptorV${VERSION4} (
         -- Data specific to us
         id INTEGER PRIMARY KEY AUTOINCREMENT,
         url TEXT NOT NULL,
@@ -18296,8 +18296,8 @@ var require_sqlite_cache_store = __commonJS({
         staleAt INTEGER NOT NULL
       );
 
-      CREATE INDEX IF NOT EXISTS idx_cacheInterceptorV${VERSION2}_getValuesQuery ON cacheInterceptorV${VERSION2}(url, method, deleteAt);
-      CREATE INDEX IF NOT EXISTS idx_cacheInterceptorV${VERSION2}_deleteByUrlQuery ON cacheInterceptorV${VERSION2}(deleteAt);
+      CREATE INDEX IF NOT EXISTS idx_cacheInterceptorV${VERSION4}_getValuesQuery ON cacheInterceptorV${VERSION4}(url, method, deleteAt);
+      CREATE INDEX IF NOT EXISTS idx_cacheInterceptorV${VERSION4}_deleteByUrlQuery ON cacheInterceptorV${VERSION4}(deleteAt);
     `);
         this.#getValuesQuery = this.#db.prepare(`
       SELECT
@@ -18312,7 +18312,7 @@ var require_sqlite_cache_store = __commonJS({
         vary,
         cachedAt,
         staleAt
-      FROM cacheInterceptorV${VERSION2}
+      FROM cacheInterceptorV${VERSION4}
       WHERE
         url = ?
         AND method = ?
@@ -18320,7 +18320,7 @@ var require_sqlite_cache_store = __commonJS({
         deleteAt ASC
     `);
         this.#updateValueQuery = this.#db.prepare(`
-      UPDATE cacheInterceptorV${VERSION2} SET
+      UPDATE cacheInterceptorV${VERSION4} SET
         body = ?,
         deleteAt = ?,
         statusCode = ?,
@@ -18334,7 +18334,7 @@ var require_sqlite_cache_store = __commonJS({
         id = ?
     `);
         this.#insertValueQuery = this.#db.prepare(`
-      INSERT INTO cacheInterceptorV${VERSION2} (
+      INSERT INTO cacheInterceptorV${VERSION4} (
         url,
         method,
         body,
@@ -18350,20 +18350,20 @@ var require_sqlite_cache_store = __commonJS({
       ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
     `);
         this.#deleteByUrlQuery = this.#db.prepare(
-          `DELETE FROM cacheInterceptorV${VERSION2} WHERE url = ?`
+          `DELETE FROM cacheInterceptorV${VERSION4} WHERE url = ?`
         );
         this.#countEntriesQuery = this.#db.prepare(
-          `SELECT COUNT(*) AS total FROM cacheInterceptorV${VERSION2}`
+          `SELECT COUNT(*) AS total FROM cacheInterceptorV${VERSION4}`
         );
         this.#deleteExpiredValuesQuery = this.#db.prepare(
-          `DELETE FROM cacheInterceptorV${VERSION2} WHERE deleteAt <= ?`
+          `DELETE FROM cacheInterceptorV${VERSION4} WHERE deleteAt <= ?`
         );
         this.#deleteOldValuesQuery = this.#maxCount === Infinity ? null : this.#db.prepare(`
-        DELETE FROM cacheInterceptorV${VERSION2}
+        DELETE FROM cacheInterceptorV${VERSION4}
         WHERE id IN (
           SELECT
             id
-          FROM cacheInterceptorV${VERSION2}
+          FROM cacheInterceptorV${VERSION4}
           ORDER BY cachedAt ASC
           LIMIT ?
         )
@@ -21297,11 +21297,11 @@ var require_fetch = __commonJS({
       function dispatch({ body }) {
         const url = requestCurrentURL(request);
         const agent = fetchParams.controller.dispatcher;
-        const path12 = url.pathname + url.search;
+        const path15 = 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 ? `${path12}?` : path12,
+            path: hasTrailingQuestionMark ? `${path15}?` : path15,
             origin: url.origin,
             method: request.method,
             body: agent.isMockActive ? request.body && (request.body.source || request.body.stream) : body,
@@ -21851,8 +21851,8 @@ var require_cache3 = __commonJS({
        * @returns {requestResponseList}
        */
       #batchCacheOperations(operations) {
-        const cache3 = this.#relevantRequestResponseList;
-        const backupCache = [...cache3];
+        const cache4 = this.#relevantRequestResponseList;
+        const backupCache = [...cache4];
         const addedItems = [];
         const resultList = [];
         try {
@@ -21879,9 +21879,9 @@ var require_cache3 = __commonJS({
                 return [];
               }
               for (const requestResponse of requestResponses) {
-                const idx = cache3.indexOf(requestResponse);
+                const idx = cache4.indexOf(requestResponse);
                 assert(idx !== -1);
-                cache3.splice(idx, 1);
+                cache4.splice(idx, 1);
               }
             } else if (operation.type === "put") {
               if (operation.response == null) {
@@ -21911,11 +21911,11 @@ var require_cache3 = __commonJS({
               }
               requestResponses = this.#queryCache(operation.request);
               for (const requestResponse of requestResponses) {
-                const idx = cache3.indexOf(requestResponse);
+                const idx = cache4.indexOf(requestResponse);
                 assert(idx !== -1);
-                cache3.splice(idx, 1);
+                cache4.splice(idx, 1);
               }
-              cache3.push([operation.request, operation.response]);
+              cache4.push([operation.request, operation.response]);
               addedItems.push([operation.request, operation.response]);
             }
             resultList.push([operation.request, operation.response]);
@@ -22092,13 +22092,13 @@ var require_cachestorage = __commonJS({
         if (options.cacheName != null) {
           if (this.#caches.has(options.cacheName)) {
             const cacheList = this.#caches.get(options.cacheName);
-            const cache3 = new Cache(kConstruct, cacheList);
-            return await cache3.match(request, options);
+            const cache4 = new Cache(kConstruct, cacheList);
+            return await cache4.match(request, options);
           }
         } else {
           for (const cacheList of this.#caches.values()) {
-            const cache3 = new Cache(kConstruct, cacheList);
-            const response = await cache3.match(request, options);
+            const cache4 = new Cache(kConstruct, cacheList);
+            const response = await cache4.match(request, options);
             if (response !== void 0) {
               return response;
             }
@@ -22128,12 +22128,12 @@ var require_cachestorage = __commonJS({
         webidl.argumentLengthCheck(arguments, 1, prefix);
         cacheName = webidl.converters.DOMString(cacheName, prefix, "cacheName");
         if (this.#caches.has(cacheName)) {
-          const cache4 = this.#caches.get(cacheName);
-          return new Cache(kConstruct, cache4);
+          const cache5 = this.#caches.get(cacheName);
+          return new Cache(kConstruct, cache5);
         }
-        const cache3 = [];
-        this.#caches.set(cacheName, cache3);
-        return new Cache(kConstruct, cache3);
+        const cache4 = [];
+        this.#caches.set(cacheName, cache4);
+        return new Cache(kConstruct, cache4);
       }
       /**
        * @see https://w3c.github.io/ServiceWorker/#cache-storage-delete
@@ -22248,9 +22248,9 @@ var require_util4 = __commonJS({
         }
       }
     }
-    function validateCookiePath(path12) {
-      for (let i = 0; i < path12.length; ++i) {
-        const code = path12.charCodeAt(i);
+    function validateCookiePath(path15) {
+      for (let i = 0; i < path15.length; ++i) {
+        const code = path15.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
         code > 126 || // exclude DEL and non-ascii
         code === 59) {
@@ -23096,8 +23096,8 @@ var require_util5 = __commonJS({
           return false;
         }
       }
-      const num = Number.parseInt(value, 10);
-      return num >= 8 && num <= 15;
+      const num2 = Number.parseInt(value, 10);
+      return num2 >= 8 && num2 <= 15;
     }
     function getURLRecord(url, baseURL) {
       let urlRecord;
@@ -25487,11 +25487,11 @@ var require_undici = __commonJS({
           if (typeof opts.path !== "string") {
             throw new InvalidArgumentError("invalid opts.path");
           }
-          let path12 = opts.path;
+          let path15 = opts.path;
           if (!opts.path.startsWith("/")) {
-            path12 = `/${path12}`;
+            path15 = `/${path15}`;
           }
-          url = new URL(util.parseOrigin(url).origin + path12);
+          url = new URL(util.parseOrigin(url).origin + path15);
         } else {
           if (!opts) {
             opts = typeof url === "object" ? url : {};
@@ -25523,14 +25523,14 @@ var require_undici = __commonJS({
       if (stack && (stack.includes(filename) || stack.includes(normalizedFilename))) {
         return;
       }
-      const capture = {};
-      Error.captureStackTrace(capture, appendFetchStackTrace);
-      if (!capture.stack) {
+      const capture2 = {};
+      Error.captureStackTrace(capture2, appendFetchStackTrace);
+      if (!capture2.stack) {
         return;
       }
-      const captureLines = capture.stack.split("\n").slice(1).join("\n");
+      const captureLines = capture2.stack.split("\n").slice(1).join("\n");
       err2.stack = stack ? `${stack}
-${captureLines}` : capture.stack;
+${captureLines}` : capture2.stack;
     }
     module.exports.fetch = function fetch2(init, options = void 0) {
       return fetchImpl(init, options).catch((err2) => {
@@ -26930,11 +26930,11 @@ var require_util7 = __commonJS({
       }
       var b2 = util.createBuffer();
       for (var i = 0; i < ip.length; ++i) {
-        var num = parseInt(ip[i], 10);
-        if (isNaN(num)) {
+        var num2 = parseInt(ip[i], 10);
+        if (isNaN(num2)) {
           return null;
         }
-        b2.putByte(num);
+        b2.putByte(num2);
       }
       return b2.getBytes();
     };
@@ -27873,8 +27873,8 @@ var require_cipherModes = __commonJS({
     function inc32(block) {
       block[block.length - 1] = block[block.length - 1] + 1 & 4294967295;
     }
-    function from64To32(num) {
-      return [num / 4294967296 | 0, num & 4294967295];
+    function from64To32(num2) {
+      return [num2 / 4294967296 | 0, num2 & 4294967295];
     }
   }
 });
@@ -28859,7 +28859,7 @@ var require_asn1 = __commonJS({
       }
       return bytes.getSignedInt(n);
     };
-    asn1.validate = function(obj, v2, capture, errors) {
+    asn1.validate = function(obj, v2, capture2, errors) {
       var rval = false;
       if ((obj.tagClass === v2.tagClass || typeof v2.tagClass === "undefined") && (obj.type === v2.type || typeof v2.type === "undefined")) {
         if (obj.constructed === v2.constructed || typeof v2.constructed === "undefined") {
@@ -28892,7 +28892,7 @@ var require_asn1 = __commonJS({
                   break;
                 }
               }
-              var childRval = asn1.validate(objChild, schemaItem, capture, errors);
+              var childRval = asn1.validate(objChild, schemaItem, capture2, errors);
               if (childRval) {
                 ++j2;
                 rval = true;
@@ -28904,20 +28904,20 @@ var require_asn1 = __commonJS({
               }
             }
           }
-          if (rval && capture) {
+          if (rval && capture2) {
             if (v2.capture) {
-              capture[v2.capture] = obj.value;
+              capture2[v2.capture] = obj.value;
             }
             if (v2.captureAsn1) {
-              capture[v2.captureAsn1] = obj;
+              capture2[v2.captureAsn1] = obj;
             }
             if (v2.captureBitStringContents && "bitStringContents" in obj) {
-              capture[v2.captureBitStringContents] = obj.bitStringContents;
+              capture2[v2.captureBitStringContents] = obj.bitStringContents;
             }
             if (v2.captureBitStringValue && "bitStringContents" in obj) {
               var value;
               if (obj.bitStringContents.length < 2) {
-                capture[v2.captureBitStringValue] = "";
+                capture2[v2.captureBitStringValue] = "";
               } else {
                 var unused = obj.bitStringContents.charCodeAt(0);
                 if (unused !== 0) {
@@ -28925,7 +28925,7 @@ var require_asn1 = __commonJS({
                     "captureBitStringValue only supported for zero unused bits"
                   );
                 }
-                capture[v2.captureBitStringValue] = obj.bitStringContents.slice(1);
+                capture2[v2.captureBitStringValue] = obj.bitStringContents.slice(1);
               }
             }
           }
@@ -32653,9 +32653,9 @@ var require_prime = __commonJS({
         return primeincFindPrimeWithoutWorkers(bits, rng, options, callback);
       }
       function primeincFindPrimeWithoutWorkers(bits, rng, options, callback) {
-        var num = generateRandom(bits, rng);
+        var num2 = generateRandom(bits, rng);
         var deltaIdx = 0;
-        var mrTests = getMillerRabinTests(num.bitLength());
+        var mrTests = getMillerRabinTests(num2.bitLength());
         if ("millerRabinTests" in options) {
           mrTests = options.millerRabinTests;
         }
@@ -32663,28 +32663,28 @@ var require_prime = __commonJS({
         if ("maxBlockTime" in options) {
           maxBlockTime = options.maxBlockTime;
         }
-        _primeinc(num, bits, rng, deltaIdx, mrTests, maxBlockTime, callback);
+        _primeinc(num2, bits, rng, deltaIdx, mrTests, maxBlockTime, callback);
       }
-      function _primeinc(num, bits, rng, deltaIdx, mrTests, maxBlockTime, callback) {
+      function _primeinc(num2, bits, rng, deltaIdx, mrTests, maxBlockTime, callback) {
         var start = +/* @__PURE__ */ new Date();
         do {
-          if (num.bitLength() > bits) {
-            num = generateRandom(bits, rng);
+          if (num2.bitLength() > bits) {
+            num2 = generateRandom(bits, rng);
           }
-          if (num.isProbablePrime(mrTests)) {
-            return callback(null, num);
+          if (num2.isProbablePrime(mrTests)) {
+            return callback(null, num2);
           }
-          num.dAddOffset(GCD_30_DELTA[deltaIdx++ % 8], 0);
+          num2.dAddOffset(GCD_30_DELTA[deltaIdx++ % 8], 0);
         } while (maxBlockTime < 0 || +/* @__PURE__ */ new Date() - start < maxBlockTime);
         forge2.util.setImmediate(function() {
-          _primeinc(num, bits, rng, deltaIdx, mrTests, maxBlockTime, callback);
+          _primeinc(num2, bits, rng, deltaIdx, mrTests, maxBlockTime, callback);
         });
       }
       function primeincFindPrimeWithWorkers(bits, rng, options, callback) {
         if (typeof Worker === "undefined") {
           return primeincFindPrimeWithoutWorkers(bits, rng, options, callback);
         }
-        var num = generateRandom(bits, rng);
+        var num2 = generateRandom(bits, rng);
         var numWorkers = options.workers;
         var workLoad = options.workLoad || 100;
         var range = workLoad * 30 / 8;
@@ -32723,26 +32723,26 @@ var require_prime = __commonJS({
               found = true;
               return callback(null, new BigInteger(data.prime, 16));
             }
-            if (num.bitLength() > bits) {
-              num = generateRandom(bits, rng);
+            if (num2.bitLength() > bits) {
+              num2 = generateRandom(bits, rng);
             }
-            var hex = num.toString(16);
+            var hex = num2.toString(16);
             e.target.postMessage({
               hex,
               workLoad
             });
-            num.dAddOffset(range, 0);
+            num2.dAddOffset(range, 0);
           }
         }
       }
       function generateRandom(bits, rng) {
-        var num = new BigInteger(bits, rng);
+        var num2 = new BigInteger(bits, rng);
         var bits1 = bits - 1;
-        if (!num.testBit(bits1)) {
-          num.bitwiseTo(BigInteger.ONE.shiftLeft(bits1), op_or, num);
+        if (!num2.testBit(bits1)) {
+          num2.bitwiseTo(BigInteger.ONE.shiftLeft(bits1), op_or, num2);
         }
-        num.dAddOffset(31 - num.mod(THIRTY).byteValue(), 0);
-        return num;
+        num2.dAddOffset(31 - num2.mod(THIRTY).byteValue(), 0);
+        return num2;
       }
       function getMillerRabinTests(bits) {
         if (bits <= 100) return 27;
@@ -33462,16 +33462,16 @@ var require_rsa = __commonJS({
               var obj = asn1.fromDer(d2, {
                 parseAllBytes: options._parseAllDigestBytes
               });
-              var capture = {};
+              var capture2 = {};
               var errors = [];
-              if (!asn1.validate(obj, digestInfoValidator, capture, errors) || obj.value.length !== 2) {
+              if (!asn1.validate(obj, digestInfoValidator, capture2, errors) || obj.value.length !== 2) {
                 var error = new Error(
                   "ASN.1 object does not contain a valid RSASSA-PKCS1-v1_5 DigestInfo value."
                 );
                 error.errors = errors;
                 throw error;
               }
-              var oid = asn1.derToOid(capture.algorithmIdentifier);
+              var oid = asn1.derToOid(capture2.algorithmIdentifier);
               if (!(oid === forge2.oids.md2 || oid === forge2.oids.md5 || oid === forge2.oids.sha1 || oid === forge2.oids.sha224 || oid === forge2.oids.sha256 || oid === forge2.oids.sha384 || oid === forge2.oids.sha512 || oid === forge2.oids["sha512-224"] || oid === forge2.oids["sha512-256"])) {
                 var error = new Error(
                   "Unknown RSASSA-PKCS1-v1_5 DigestAlgorithm identifier."
@@ -33480,13 +33480,13 @@ var require_rsa = __commonJS({
                 throw error;
               }
               if (oid === forge2.oids.md2 || oid === forge2.oids.md5) {
-                if (!("parameters" in capture)) {
+                if (!("parameters" in capture2)) {
                   throw new Error(
                     "ASN.1 object does not contain a valid RSASSA-PKCS1-v1_5 DigestInfo value. Missing algorithm identifier NULL parameters."
                   );
                 }
               }
-              return digest2 === capture.digest;
+              return digest2 === capture2.digest;
             }
           };
         } else if (scheme === "NONE" || scheme === "NULL" || scheme === null) {
@@ -33585,27 +33585,27 @@ var require_rsa = __commonJS({
       ]);
     };
     pki.privateKeyFromAsn1 = function(obj) {
-      var capture = {};
+      var capture2 = {};
       var errors = [];
-      if (asn1.validate(obj, privateKeyValidator, capture, errors)) {
-        obj = asn1.fromDer(forge2.util.createBuffer(capture.privateKey));
+      if (asn1.validate(obj, privateKeyValidator, capture2, errors)) {
+        obj = asn1.fromDer(forge2.util.createBuffer(capture2.privateKey));
       }
-      capture = {};
+      capture2 = {};
       errors = [];
-      if (!asn1.validate(obj, rsaPrivateKeyValidator, capture, errors)) {
+      if (!asn1.validate(obj, rsaPrivateKeyValidator, capture2, errors)) {
         var error = new Error("Cannot read private key. ASN.1 object does not contain an RSAPrivateKey.");
         error.errors = errors;
         throw error;
       }
       var n, e, d, p2, q2, dP, dQ, qInv;
-      n = forge2.util.createBuffer(capture.privateKeyModulus).toHex();
-      e = forge2.util.createBuffer(capture.privateKeyPublicExponent).toHex();
-      d = forge2.util.createBuffer(capture.privateKeyPrivateExponent).toHex();
-      p2 = forge2.util.createBuffer(capture.privateKeyPrime1).toHex();
-      q2 = forge2.util.createBuffer(capture.privateKeyPrime2).toHex();
-      dP = forge2.util.createBuffer(capture.privateKeyExponent1).toHex();
-      dQ = forge2.util.createBuffer(capture.privateKeyExponent2).toHex();
-      qInv = forge2.util.createBuffer(capture.privateKeyCoefficient).toHex();
+      n = forge2.util.createBuffer(capture2.privateKeyModulus).toHex();
+      e = forge2.util.createBuffer(capture2.privateKeyPublicExponent).toHex();
+      d = forge2.util.createBuffer(capture2.privateKeyPrivateExponent).toHex();
+      p2 = forge2.util.createBuffer(capture2.privateKeyPrime1).toHex();
+      q2 = forge2.util.createBuffer(capture2.privateKeyPrime2).toHex();
+      dP = forge2.util.createBuffer(capture2.privateKeyExponent1).toHex();
+      dQ = forge2.util.createBuffer(capture2.privateKeyExponent2).toHex();
+      qInv = forge2.util.createBuffer(capture2.privateKeyCoefficient).toHex();
       return pki.setRsaPrivateKey(
         new BigInteger(n, 16),
         new BigInteger(e, 16),
@@ -33685,25 +33685,25 @@ var require_rsa = __commonJS({
       ]);
     };
     pki.publicKeyFromAsn1 = function(obj) {
-      var capture = {};
+      var capture2 = {};
       var errors = [];
-      if (asn1.validate(obj, publicKeyValidator, capture, errors)) {
-        var oid = asn1.derToOid(capture.publicKeyOid);
+      if (asn1.validate(obj, publicKeyValidator, capture2, errors)) {
+        var oid = asn1.derToOid(capture2.publicKeyOid);
         if (oid !== pki.oids.rsaEncryption) {
           var error = new Error("Cannot read public key. Unknown OID.");
           error.oid = oid;
           throw error;
         }
-        obj = capture.rsaPublicKey;
+        obj = capture2.rsaPublicKey;
       }
       errors = [];
-      if (!asn1.validate(obj, rsaPublicKeyValidator, capture, errors)) {
+      if (!asn1.validate(obj, rsaPublicKeyValidator, capture2, errors)) {
         var error = new Error("Cannot read public key. ASN.1 object does not contain an RSAPublicKey.");
         error.errors = errors;
         throw error;
       }
-      var n = forge2.util.createBuffer(capture.publicKeyModulus).toHex();
-      var e = forge2.util.createBuffer(capture.publicKeyExponent).toHex();
+      var n = forge2.util.createBuffer(capture2.publicKeyModulus).toHex();
+      var e = forge2.util.createBuffer(capture2.publicKeyExponent).toHex();
       return pki.setRsaPublicKey(
         new BigInteger(n, 16),
         new BigInteger(e, 16)
@@ -33852,11 +33852,11 @@ var require_rsa = __commonJS({
       }
       generate();
       function generate() {
-        getPrime(state.pBits, function(err2, num) {
+        getPrime(state.pBits, function(err2, num2) {
           if (err2) {
             return callback(err2);
           }
-          state.p = num;
+          state.p = num2;
           if (state.q !== null) {
             return finish(err2, state.q);
           }
@@ -33866,11 +33866,11 @@ var require_rsa = __commonJS({
       function getPrime(bits, callback2) {
         forge2.prime.generateProbablePrime(bits, opts, callback2);
       }
-      function finish(err2, num) {
+      function finish(err2, num2) {
         if (err2) {
           return callback(err2);
         }
-        state.q = num;
+        state.q = num2;
         if (state.p.compareTo(state.q) < 0) {
           var tmp = state.p;
           state.p = state.q;
@@ -34266,16 +34266,16 @@ var require_pbe = __commonJS({
     };
     pki.decryptPrivateKeyInfo = function(obj, password) {
       var rval = null;
-      var capture = {};
+      var capture2 = {};
       var errors = [];
-      if (!asn1.validate(obj, encryptedPrivateKeyValidator, capture, errors)) {
+      if (!asn1.validate(obj, encryptedPrivateKeyValidator, capture2, errors)) {
         var error = new Error("Cannot read encrypted private key. ASN.1 object is not a supported EncryptedPrivateKeyInfo.");
         error.errors = errors;
         throw error;
       }
-      var oid = asn1.derToOid(capture.encryptionOid);
-      var cipher = pki.pbe.getCipher(oid, capture.encryptionParams, password);
-      var encrypted = forge2.util.createBuffer(capture.encryptedData);
+      var oid = asn1.derToOid(capture2.encryptionOid);
+      var cipher = pki.pbe.getCipher(oid, capture2.encryptionParams, password);
+      var encrypted = forge2.util.createBuffer(capture2.encryptedData);
       cipher.update(encrypted);
       if (cipher.finish()) {
         rval = asn1.fromDer(cipher.output);
@@ -34530,21 +34530,21 @@ var require_pbe = __commonJS({
       }
     };
     pki.pbe.getCipherForPBES2 = function(oid, params, password) {
-      var capture = {};
+      var capture2 = {};
       var errors = [];
-      if (!asn1.validate(params, PBES2AlgorithmsValidator, capture, errors)) {
+      if (!asn1.validate(params, PBES2AlgorithmsValidator, capture2, errors)) {
         var error = new Error("Cannot read password-based-encryption algorithm parameters. ASN.1 object is not a supported EncryptedPrivateKeyInfo.");
         error.errors = errors;
         throw error;
       }
-      oid = asn1.derToOid(capture.kdfOid);
+      oid = asn1.derToOid(capture2.kdfOid);
       if (oid !== pki.oids["pkcs5PBKDF2"]) {
         var error = new Error("Cannot read encrypted private key. Unsupported key derivation function OID.");
         error.oid = oid;
         error.supportedOids = ["pkcs5PBKDF2"];
         throw error;
       }
-      oid = asn1.derToOid(capture.encOid);
+      oid = asn1.derToOid(capture2.encOid);
       if (oid !== pki.oids["aes128-CBC"] && oid !== pki.oids["aes192-CBC"] && oid !== pki.oids["aes256-CBC"] && oid !== pki.oids["des-EDE3-CBC"] && oid !== pki.oids["desCBC"]) {
         var error = new Error("Cannot read encrypted private key. Unsupported encryption scheme OID.");
         error.oid = oid;
@@ -34557,8 +34557,8 @@ var require_pbe = __commonJS({
         ];
         throw error;
       }
-      var salt = capture.kdfSalt;
-      var count = forge2.util.createBuffer(capture.kdfIterationCount);
+      var salt = capture2.kdfSalt;
+      var count = forge2.util.createBuffer(capture2.kdfIterationCount);
       count = count.getInt(count.length() << 3);
       var dkLen;
       var cipherFn;
@@ -34584,23 +34584,23 @@ var require_pbe = __commonJS({
           cipherFn = forge2.des.createDecryptionCipher;
           break;
       }
-      var md = prfOidToMessageDigest(capture.prfOid);
+      var md = prfOidToMessageDigest(capture2.prfOid);
       var dk = forge2.pkcs5.pbkdf2(password, salt, count, dkLen, md);
-      var iv = capture.encIv;
+      var iv = capture2.encIv;
       var cipher = cipherFn(dk);
       cipher.start(iv);
       return cipher;
     };
     pki.pbe.getCipherForPKCS12PBE = function(oid, params, password) {
-      var capture = {};
+      var capture2 = {};
       var errors = [];
-      if (!asn1.validate(params, pkcs12PbeParamsValidator, capture, errors)) {
+      if (!asn1.validate(params, pkcs12PbeParamsValidator, capture2, errors)) {
         var error = new Error("Cannot read password-based-encryption algorithm parameters. ASN.1 object is not a supported EncryptedPrivateKeyInfo.");
         error.errors = errors;
         throw error;
       }
-      var salt = forge2.util.createBuffer(capture.salt);
-      var count = forge2.util.createBuffer(capture.iterations);
+      var salt = forge2.util.createBuffer(capture2.salt);
+      var count = forge2.util.createBuffer(capture2.iterations);
       count = count.getInt(count.length() << 3);
       var dkLen, dIvLen, cipherFn;
       switch (oid) {
@@ -34623,7 +34623,7 @@ var require_pbe = __commonJS({
           error.oid = oid;
           throw error;
       }
-      var md = prfOidToMessageDigest(capture.prfOid);
+      var md = prfOidToMessageDigest(capture2.prfOid);
       var key = pki.pbe.generatePkcs12Key(password, salt, 1, count, dkLen, md);
       md.start();
       var iv = pki.pbe.generatePkcs12Key(password, salt, 2, count, dIvLen, md);
@@ -35689,25 +35689,25 @@ var require_x509 = __commonJS({
           saltLength: 20
         };
       }
-      var capture = {};
+      var capture2 = {};
       var errors = [];
-      if (!asn1.validate(obj, rsassaPssParameterValidator, capture, errors)) {
+      if (!asn1.validate(obj, rsassaPssParameterValidator, capture2, errors)) {
         var error = new Error("Cannot read RSASSA-PSS parameter block.");
         error.errors = errors;
         throw error;
       }
-      if (capture.hashOid !== void 0) {
+      if (capture2.hashOid !== void 0) {
         params.hash = params.hash || {};
-        params.hash.algorithmOid = asn1.derToOid(capture.hashOid);
+        params.hash.algorithmOid = asn1.derToOid(capture2.hashOid);
       }
-      if (capture.maskGenOid !== void 0) {
+      if (capture2.maskGenOid !== void 0) {
         params.mgf = params.mgf || {};
-        params.mgf.algorithmOid = asn1.derToOid(capture.maskGenOid);
+        params.mgf.algorithmOid = asn1.derToOid(capture2.maskGenOid);
         params.mgf.hash = params.mgf.hash || {};
-        params.mgf.hash.algorithmOid = asn1.derToOid(capture.maskGenHashOid);
+        params.mgf.hash.algorithmOid = asn1.derToOid(capture2.maskGenHashOid);
       }
-      if (capture.saltLength !== void 0) {
-        params.saltLength = capture.saltLength.charCodeAt(0);
+      if (capture2.saltLength !== void 0) {
+        params.saltLength = capture2.saltLength.charCodeAt(0);
       }
       return params;
     };
@@ -36040,49 +36040,49 @@ var require_x509 = __commonJS({
       return cert;
     };
     pki.certificateFromAsn1 = function(obj, computeHash) {
-      var capture = {};
+      var capture2 = {};
       var errors = [];
-      if (!asn1.validate(obj, x509CertificateValidator, capture, errors)) {
+      if (!asn1.validate(obj, x509CertificateValidator, capture2, errors)) {
         var error = new Error("Cannot read X.509 certificate. ASN.1 object is not an X509v3 Certificate.");
         error.errors = errors;
         throw error;
       }
-      var oid = asn1.derToOid(capture.publicKeyOid);
+      var oid = asn1.derToOid(capture2.publicKeyOid);
       if (oid !== pki.oids.rsaEncryption) {
         throw new Error("Cannot read public key. OID is not RSA.");
       }
       var cert = pki.createCertificate();
-      cert.version = capture.certVersion ? capture.certVersion.charCodeAt(0) : 0;
-      var serial = forge2.util.createBuffer(capture.certSerialNumber);
+      cert.version = capture2.certVersion ? capture2.certVersion.charCodeAt(0) : 0;
+      var serial = forge2.util.createBuffer(capture2.certSerialNumber);
       cert.serialNumber = serial.toHex();
-      cert.signatureOid = forge2.asn1.derToOid(capture.certSignatureOid);
+      cert.signatureOid = forge2.asn1.derToOid(capture2.certSignatureOid);
       cert.signatureParameters = _readSignatureParameters(
         cert.signatureOid,
-        capture.certSignatureParams,
+        capture2.certSignatureParams,
         true
       );
-      cert.siginfo.algorithmOid = forge2.asn1.derToOid(capture.certinfoSignatureOid);
+      cert.siginfo.algorithmOid = forge2.asn1.derToOid(capture2.certinfoSignatureOid);
       cert.siginfo.parameters = _readSignatureParameters(
         cert.siginfo.algorithmOid,
-        capture.certinfoSignatureParams,
+        capture2.certinfoSignatureParams,
         false
       );
-      cert.signature = capture.certSignature;
+      cert.signature = capture2.certSignature;
       var validity = [];
-      if (capture.certValidity1UTCTime !== void 0) {
-        validity.push(asn1.utcTimeToDate(capture.certValidity1UTCTime));
+      if (capture2.certValidity1UTCTime !== void 0) {
+        validity.push(asn1.utcTimeToDate(capture2.certValidity1UTCTime));
       }
-      if (capture.certValidity2GeneralizedTime !== void 0) {
+      if (capture2.certValidity2GeneralizedTime !== void 0) {
         validity.push(asn1.generalizedTimeToDate(
-          capture.certValidity2GeneralizedTime
+          capture2.certValidity2GeneralizedTime
         ));
       }
-      if (capture.certValidity3UTCTime !== void 0) {
-        validity.push(asn1.utcTimeToDate(capture.certValidity3UTCTime));
+      if (capture2.certValidity3UTCTime !== void 0) {
+        validity.push(asn1.utcTimeToDate(capture2.certValidity3UTCTime));
       }
-      if (capture.certValidity4GeneralizedTime !== void 0) {
+      if (capture2.certValidity4GeneralizedTime !== void 0) {
         validity.push(asn1.generalizedTimeToDate(
-          capture.certValidity4GeneralizedTime
+          capture2.certValidity4GeneralizedTime
         ));
       }
       if (validity.length > 2) {
@@ -36093,7 +36093,7 @@ var require_x509 = __commonJS({
       }
       cert.validity.notBefore = validity[0];
       cert.validity.notAfter = validity[1];
-      cert.tbsCertificate = capture.tbsCertificate;
+      cert.tbsCertificate = capture2.tbsCertificate;
       if (computeHash) {
         cert.md = _createSignatureDigest({
           signatureOid: cert.signatureOid,
@@ -36103,7 +36103,7 @@ var require_x509 = __commonJS({
         cert.md.update(bytes.getBytes());
       }
       var imd = forge2.md.sha1.create();
-      var ibytes = asn1.toDer(capture.certIssuer);
+      var ibytes = asn1.toDer(capture2.certIssuer);
       imd.update(ibytes.getBytes());
       cert.issuer.getField = function(sn2) {
         return _getAttribute(cert.issuer, sn2);
@@ -36112,13 +36112,13 @@ var require_x509 = __commonJS({
         _fillMissingFields([attr]);
         cert.issuer.attributes.push(attr);
       };
-      cert.issuer.attributes = pki.RDNAttributesAsArray(capture.certIssuer);
-      if (capture.certIssuerUniqueId) {
-        cert.issuer.uniqueId = capture.certIssuerUniqueId;
+      cert.issuer.attributes = pki.RDNAttributesAsArray(capture2.certIssuer);
+      if (capture2.certIssuerUniqueId) {
+        cert.issuer.uniqueId = capture2.certIssuerUniqueId;
       }
       cert.issuer.hash = imd.digest().toHex();
       var smd = forge2.md.sha1.create();
-      var sbytes = asn1.toDer(capture.certSubject);
+      var sbytes = asn1.toDer(capture2.certSubject);
       smd.update(sbytes.getBytes());
       cert.subject.getField = function(sn2) {
         return _getAttribute(cert.subject, sn2);
@@ -36127,17 +36127,17 @@ var require_x509 = __commonJS({
         _fillMissingFields([attr]);
         cert.subject.attributes.push(attr);
       };
-      cert.subject.attributes = pki.RDNAttributesAsArray(capture.certSubject);
-      if (capture.certSubjectUniqueId) {
-        cert.subject.uniqueId = capture.certSubjectUniqueId;
+      cert.subject.attributes = pki.RDNAttributesAsArray(capture2.certSubject);
+      if (capture2.certSubjectUniqueId) {
+        cert.subject.uniqueId = capture2.certSubjectUniqueId;
       }
       cert.subject.hash = smd.digest().toHex();
-      if (capture.certExtensions) {
-        cert.extensions = pki.certificateExtensionsFromAsn1(capture.certExtensions);
+      if (capture2.certExtensions) {
+        cert.extensions = pki.certificateExtensionsFromAsn1(capture2.certExtensions);
       } else {
         cert.extensions = [];
       }
-      cert.publicKey = pki.publicKeyFromAsn1(capture.subjectPublicKeyInfo);
+      cert.publicKey = pki.publicKeyFromAsn1(capture2.subjectPublicKeyInfo);
       return cert;
     };
     pki.certificateExtensionsFromAsn1 = function(exts) {
@@ -36257,33 +36257,33 @@ var require_x509 = __commonJS({
       return e;
     };
     pki.certificationRequestFromAsn1 = function(obj, computeHash) {
-      var capture = {};
+      var capture2 = {};
       var errors = [];
-      if (!asn1.validate(obj, certificationRequestValidator, capture, errors)) {
+      if (!asn1.validate(obj, certificationRequestValidator, capture2, errors)) {
         var error = new Error("Cannot read PKCS#10 certificate request. ASN.1 object is not a PKCS#10 CertificationRequest.");
         error.errors = errors;
         throw error;
       }
-      var oid = asn1.derToOid(capture.publicKeyOid);
+      var oid = asn1.derToOid(capture2.publicKeyOid);
       if (oid !== pki.oids.rsaEncryption) {
         throw new Error("Cannot read public key. OID is not RSA.");
       }
       var csr = pki.createCertificationRequest();
-      csr.version = capture.csrVersion ? capture.csrVersion.charCodeAt(0) : 0;
-      csr.signatureOid = forge2.asn1.derToOid(capture.csrSignatureOid);
+      csr.version = capture2.csrVersion ? capture2.csrVersion.charCodeAt(0) : 0;
+      csr.signatureOid = forge2.asn1.derToOid(capture2.csrSignatureOid);
       csr.signatureParameters = _readSignatureParameters(
         csr.signatureOid,
-        capture.csrSignatureParams,
+        capture2.csrSignatureParams,
         true
       );
-      csr.siginfo.algorithmOid = forge2.asn1.derToOid(capture.csrSignatureOid);
+      csr.siginfo.algorithmOid = forge2.asn1.derToOid(capture2.csrSignatureOid);
       csr.siginfo.parameters = _readSignatureParameters(
         csr.siginfo.algorithmOid,
-        capture.csrSignatureParams,
+        capture2.csrSignatureParams,
         false
       );
-      csr.signature = capture.csrSignature;
-      csr.certificationRequestInfo = capture.certificationRequestInfo;
+      csr.signature = capture2.csrSignature;
+      csr.certificationRequestInfo = capture2.certificationRequestInfo;
       if (computeHash) {
         csr.md = _createSignatureDigest({
           signatureOid: csr.signatureOid,
@@ -36301,11 +36301,11 @@ var require_x509 = __commonJS({
         csr.subject.attributes.push(attr);
       };
       csr.subject.attributes = pki.RDNAttributesAsArray(
-        capture.certificationRequestInfoSubject,
+        capture2.certificationRequestInfoSubject,
         smd
       );
       csr.subject.hash = smd.digest().toHex();
-      csr.publicKey = pki.publicKeyFromAsn1(capture.subjectPublicKeyInfo);
+      csr.publicKey = pki.publicKeyFromAsn1(capture2.subjectPublicKeyInfo);
       csr.getAttribute = function(sn2) {
         return _getAttribute(csr, sn2);
       };
@@ -36314,7 +36314,7 @@ var require_x509 = __commonJS({
         csr.attributes.push(attr);
       };
       csr.attributes = pki.CRIAttributesAsArray(
-        capture.certificationRequestInfoAttributes || []
+        capture2.certificationRequestInfoAttributes || []
       );
       return csr;
     };
@@ -37544,15 +37544,15 @@ var require_pkcs12 = __commonJS({
       } else if (strict === void 0) {
         strict = true;
       }
-      var capture = {};
+      var capture2 = {};
       var errors = [];
-      if (!asn1.validate(obj, pfxValidator, capture, errors)) {
+      if (!asn1.validate(obj, pfxValidator, capture2, errors)) {
         var error = new Error("Cannot read PKCS#12 PFX. ASN.1 object is not an PKCS#12 PFX.");
         error.errors = error;
         throw error;
       }
       var pfx = {
-        version: capture.version.charCodeAt(0),
+        version: capture2.version.charCodeAt(0),
         safeContents: [],
         /**
          * Gets bags with matching attributes.
@@ -37638,25 +37638,25 @@ var require_pkcs12 = __commonJS({
           );
         }
       };
-      if (capture.version.charCodeAt(0) !== 3) {
+      if (capture2.version.charCodeAt(0) !== 3) {
         var error = new Error("PKCS#12 PFX of version other than 3 not supported.");
-        error.version = capture.version.charCodeAt(0);
+        error.version = capture2.version.charCodeAt(0);
         throw error;
       }
-      if (asn1.derToOid(capture.contentType) !== pki.oids.data) {
+      if (asn1.derToOid(capture2.contentType) !== pki.oids.data) {
         var error = new Error("Only PKCS#12 PFX in password integrity mode supported.");
-        error.oid = asn1.derToOid(capture.contentType);
+        error.oid = asn1.derToOid(capture2.contentType);
         throw error;
       }
-      var data = capture.content.value[0];
+      var data = capture2.content.value[0];
       if (data.tagClass !== asn1.Class.UNIVERSAL || data.type !== asn1.Type.OCTETSTRING) {
         throw new Error("PKCS#12 authSafe content data is not an OCTET STRING.");
       }
       data = _decodePkcs7Data(data);
-      if (capture.mac) {
+      if (capture2.mac) {
         var md = null;
         var macKeyBytes = 0;
-        var macAlgorithm = asn1.derToOid(capture.macAlgorithm);
+        var macAlgorithm = asn1.derToOid(capture2.macAlgorithm);
         switch (macAlgorithm) {
           case pki.oids.sha1:
             md = forge2.md.sha1.create();
@@ -37682,8 +37682,8 @@ var require_pkcs12 = __commonJS({
         if (md === null) {
           throw new Error("PKCS#12 uses unsupported MAC algorithm: " + macAlgorithm);
         }
-        var macSalt = new forge2.util.ByteBuffer(capture.macSalt);
-        var macIterations = "macIterations" in capture ? parseInt(forge2.util.bytesToHex(capture.macIterations), 16) : 1;
+        var macSalt = new forge2.util.ByteBuffer(capture2.macSalt);
+        var macIterations = "macIterations" in capture2 ? parseInt(forge2.util.bytesToHex(capture2.macIterations), 16) : 1;
         var macKey = p12.generateKey(
           password,
           macSalt,
@@ -37696,7 +37696,7 @@ var require_pkcs12 = __commonJS({
         mac.start(md, macKey);
         mac.update(data.value);
         var macValue = mac.getMac();
-        if (macValue.getBytes() !== capture.macDigest) {
+        if (macValue.getBytes() !== capture2.macDigest) {
           throw new Error("PKCS#12 MAC could not be verified. Invalid password?");
         }
       } else if (Array.isArray(obj.value) && obj.value.length > 2) {
@@ -37723,9 +37723,9 @@ var require_pkcs12 = __commonJS({
       }
       for (var i = 0; i < authSafe.value.length; i++) {
         var contentInfo = authSafe.value[i];
-        var capture = {};
+        var capture2 = {};
         var errors = [];
-        if (!asn1.validate(contentInfo, contentInfoValidator, capture, errors)) {
+        if (!asn1.validate(contentInfo, contentInfoValidator, capture2, errors)) {
           var error = new Error("Cannot read ContentInfo.");
           error.errors = errors;
           throw error;
@@ -37734,8 +37734,8 @@ var require_pkcs12 = __commonJS({
           encrypted: false
         };
         var safeContents = null;
-        var data = capture.content.value[0];
-        switch (asn1.derToOid(capture.contentType)) {
+        var data = capture2.content.value[0];
+        switch (asn1.derToOid(capture2.contentType)) {
           case pki.oids.data:
             if (data.tagClass !== asn1.Class.UNIVERSAL || data.type !== asn1.Type.OCTETSTRING) {
               throw new Error("PKCS#12 SafeContents Data is not an OCTET STRING.");
@@ -37748,7 +37748,7 @@ var require_pkcs12 = __commonJS({
             break;
           default:
             var error = new Error("Unsupported PKCS#12 contentType.");
-            error.contentType = asn1.derToOid(capture.contentType);
+            error.contentType = asn1.derToOid(capture2.contentType);
             throw error;
         }
         obj.safeBags = _decodeSafeContents(safeContents, strict, password);
@@ -37756,19 +37756,19 @@ var require_pkcs12 = __commonJS({
       }
     }
     function _decryptSafeContents(data, password) {
-      var capture = {};
+      var capture2 = {};
       var errors = [];
       if (!asn1.validate(
         data,
         forge2.pkcs7.asn1.encryptedDataValidator,
-        capture,
+        capture2,
         errors
       )) {
         var error = new Error("Cannot read EncryptedContentInfo.");
         error.errors = errors;
         throw error;
       }
-      var oid = asn1.derToOid(capture.contentType);
+      var oid = asn1.derToOid(capture2.contentType);
       if (oid !== pki.oids.data) {
         var error = new Error(
           "PKCS#12 EncryptedContentInfo ContentType is not Data."
@@ -37776,9 +37776,9 @@ var require_pkcs12 = __commonJS({
         error.oid = oid;
         throw error;
       }
-      oid = asn1.derToOid(capture.encAlgorithm);
-      var cipher = pki.pbe.getCipher(oid, capture.encParameter, password);
-      var encryptedContentAsn1 = _decodePkcs7Data(capture.encryptedContentAsn1);
+      oid = asn1.derToOid(capture2.encAlgorithm);
+      var cipher = pki.pbe.getCipher(oid, capture2.encParameter, password);
+      var encryptedContentAsn1 = _decodePkcs7Data(capture2.encryptedContentAsn1);
       var encrypted = forge2.util.createBuffer(encryptedContentAsn1.value);
       cipher.update(encrypted);
       if (!cipher.finish()) {
@@ -37799,20 +37799,20 @@ var require_pkcs12 = __commonJS({
       var res = [];
       for (var i = 0; i < safeContents.value.length; i++) {
         var safeBag = safeContents.value[i];
-        var capture = {};
+        var capture2 = {};
         var errors = [];
-        if (!asn1.validate(safeBag, safeBagValidator, capture, errors)) {
+        if (!asn1.validate(safeBag, safeBagValidator, capture2, errors)) {
           var error = new Error("Cannot read SafeBag.");
           error.errors = errors;
           throw error;
         }
         var bag = {
-          type: asn1.derToOid(capture.bagId),
-          attributes: _decodeBagAttributes(capture.bagAttributes)
+          type: asn1.derToOid(capture2.bagId),
+          attributes: _decodeBagAttributes(capture2.bagAttributes)
         };
         res.push(bag);
         var validator, decoder;
-        var bagAsn1 = capture.bagValue.value[0];
+        var bagAsn1 = capture2.bagValue.value[0];
         switch (bag.type) {
           case pki.oids.pkcs8ShroudedKeyBag:
             bagAsn1 = pki.decryptPrivateKeyInfo(bagAsn1, password);
@@ -37834,14 +37834,14 @@ var require_pkcs12 = __commonJS({
           case pki.oids.certBag:
             validator = certBagValidator;
             decoder = function() {
-              if (asn1.derToOid(capture.certId) !== pki.oids.x509Certificate) {
+              if (asn1.derToOid(capture2.certId) !== pki.oids.x509Certificate) {
                 var error2 = new Error(
                   "Unsupported certificate type, only X.509 supported."
                 );
-                error2.oid = asn1.derToOid(capture.certId);
+                error2.oid = asn1.derToOid(capture2.certId);
                 throw error2;
               }
-              var certAsn1 = asn1.fromDer(capture.cert, strict);
+              var certAsn1 = asn1.fromDer(capture2.cert, strict);
               try {
                 bag.cert = pki.certificateFromAsn1(certAsn1, true);
               } catch (e) {
@@ -37855,7 +37855,7 @@ var require_pkcs12 = __commonJS({
             error.oid = bag.type;
             throw error;
         }
-        if (validator !== void 0 && !asn1.validate(bagAsn1, validator, capture, errors)) {
+        if (validator !== void 0 && !asn1.validate(bagAsn1, validator, capture2, errors)) {
           var error = new Error("Cannot read PKCS#12 " + validator.name);
           error.errors = errors;
           throw error;
@@ -37868,20 +37868,20 @@ var require_pkcs12 = __commonJS({
       var decodedAttrs = {};
       if (attributes !== void 0) {
         for (var i = 0; i < attributes.length; ++i) {
-          var capture = {};
+          var capture2 = {};
           var errors = [];
-          if (!asn1.validate(attributes[i], attributeValidator, capture, errors)) {
+          if (!asn1.validate(attributes[i], attributeValidator, capture2, errors)) {
             var error = new Error("Cannot read PKCS#12 BagAttribute.");
             error.errors = errors;
             throw error;
           }
-          var oid = asn1.derToOid(capture.oid);
+          var oid = asn1.derToOid(capture2.oid);
           if (pki.oids[oid] === void 0) {
             continue;
           }
           decodedAttrs[pki.oids[oid]] = [];
-          for (var j2 = 0; j2 < capture.values.length; ++j2) {
-            decodedAttrs[pki.oids[oid]].push(capture.values[j2].value);
+          for (var j2 = 0; j2 < capture2.values.length; ++j2) {
+            decodedAttrs[pki.oids[oid]].push(capture2.values[j2].value);
           }
         }
       }
@@ -39943,20 +39943,20 @@ var require_tls = __commonJS({
       }
       return !c.fail;
     };
-    tls4.createSessionCache = function(cache3, capacity) {
+    tls4.createSessionCache = function(cache4, capacity) {
       var rval = null;
-      if (cache3 && cache3.getSession && cache3.setSession && cache3.order) {
-        rval = cache3;
+      if (cache4 && cache4.getSession && cache4.setSession && cache4.order) {
+        rval = cache4;
       } else {
         rval = {};
-        rval.cache = cache3 || {};
+        rval.cache = cache4 || {};
         rval.capacity = Math.max(capacity || 100, 1);
         rval.order = [];
-        for (var key2 in cache3) {
+        for (var key2 in cache4) {
           if (rval.order.length <= capacity) {
             rval.order.push(key2);
           } else {
-            delete cache3[key2];
+            delete cache4[key2];
           }
         }
         rval.getSession = function(sessionId) {
@@ -40994,20 +40994,20 @@ var require_ed25519 = __commonJS({
       return { publicKey: pk, privateKey: sk };
     };
     ed25519.privateKeyFromAsn1 = function(obj) {
-      var capture = {};
+      var capture2 = {};
       var errors = [];
-      var valid = forge2.asn1.validate(obj, privateKeyValidator, capture, errors);
+      var valid = forge2.asn1.validate(obj, privateKeyValidator, capture2, errors);
       if (!valid) {
         var error = new Error("Invalid Key.");
         error.errors = errors;
         throw error;
       }
-      var oid = forge2.asn1.derToOid(capture.privateKeyOid);
+      var oid = forge2.asn1.derToOid(capture2.privateKeyOid);
       var ed25519Oid = forge2.oids.EdDSA25519;
       if (oid !== ed25519Oid) {
         throw new Error('Invalid OID "' + oid + '"; OID must be "' + ed25519Oid + '".');
       }
-      var privateKey = capture.privateKey;
+      var privateKey = capture2.privateKey;
       var privateKeyBytes = messageToNativeBuffer({
         message: forge2.asn1.fromDer(privateKey).value,
         encoding: "binary"
@@ -41015,20 +41015,20 @@ var require_ed25519 = __commonJS({
       return { privateKeyBytes };
     };
     ed25519.publicKeyFromAsn1 = function(obj) {
-      var capture = {};
+      var capture2 = {};
       var errors = [];
-      var valid = forge2.asn1.validate(obj, publicKeyValidator, capture, errors);
+      var valid = forge2.asn1.validate(obj, publicKeyValidator, capture2, errors);
       if (!valid) {
         var error = new Error("Invalid Key.");
         error.errors = errors;
         throw error;
       }
-      var oid = forge2.asn1.derToOid(capture.publicKeyOid);
+      var oid = forge2.asn1.derToOid(capture2.publicKeyOid);
       var ed25519Oid = forge2.oids.EdDSA25519;
       if (oid !== ed25519Oid) {
         throw new Error('Invalid OID "' + oid + '"; OID must be "' + ed25519Oid + '".');
       }
-      var publicKeyBytes = capture.ed25519PublicKey;
+      var publicKeyBytes = capture2.ed25519PublicKey;
       if (publicKeyBytes.length !== ed25519.constants.PUBLIC_KEY_BYTE_LENGTH) {
         throw new Error("Key length is invalid.");
       }
@@ -41485,31 +41485,31 @@ var require_ed25519 = __commonJS({
       }
     }
     function unpackneg(r, p2) {
-      var t = gf(), chk = gf(), num = gf(), den = gf(), den2 = gf(), den4 = gf(), den6 = gf();
+      var t = gf(), chk = gf(), num2 = gf(), den = gf(), den2 = gf(), den4 = gf(), den6 = gf();
       set25519(r[2], gf1);
       unpack25519(r[1], p2);
-      S2(num, r[1]);
-      M2(den, num, D);
-      Z2(num, num, r[2]);
+      S2(num2, r[1]);
+      M2(den, num2, D);
+      Z2(num2, num2, r[2]);
       A2(den, r[2], den);
       S2(den2, den);
       S2(den4, den2);
       M2(den6, den4, den2);
-      M2(t, den6, num);
+      M2(t, den6, num2);
       M2(t, t, den);
       pow2523(t, t);
-      M2(t, t, num);
+      M2(t, t, num2);
       M2(t, t, den);
       M2(t, t, den);
       M2(r[0], t, den);
       S2(chk, r[0]);
       M2(chk, chk, den);
-      if (neq25519(chk, num)) {
+      if (neq25519(chk, num2)) {
         M2(r[0], r[0], I2);
       }
       S2(chk, r[0]);
       M2(chk, chk, den);
-      if (neq25519(chk, num)) {
+      if (neq25519(chk, num2)) {
         return -1;
       }
       if (par25519(r[0]) === p2[31] >> 7) {
@@ -42344,14 +42344,14 @@ var require_pkcs7 = __commonJS({
       return forge2.pem.encode(pemObj, { maxline });
     };
     p7.messageFromAsn1 = function(obj) {
-      var capture = {};
+      var capture2 = {};
       var errors = [];
-      if (!asn1.validate(obj, p7.asn1.contentInfoValidator, capture, errors)) {
+      if (!asn1.validate(obj, p7.asn1.contentInfoValidator, capture2, errors)) {
         var error = new Error("Cannot read PKCS#7 message. ASN.1 object is not an PKCS#7 ContentInfo.");
         error.errors = errors;
         throw error;
       }
-      var contentType = asn1.derToOid(capture.contentType);
+      var contentType = asn1.derToOid(capture2.contentType);
       var msg2;
       switch (contentType) {
         case forge2.pki.oids.envelopedData:
@@ -42366,7 +42366,7 @@ var require_pkcs7 = __commonJS({
         default:
           throw new Error("Cannot read PKCS#7 message. ContentType with OID " + contentType + " is not (yet) supported.");
       }
-      msg2.fromAsn1(capture.content.value[0]);
+      msg2.fromAsn1(capture2.content.value[0]);
       return msg2;
     };
     p7.createSignedData = function() {
@@ -42787,8 +42787,8 @@ var require_pkcs7 = __commonJS({
          * @param obj the ASN.1 representation of the EnvelopedData content block.
          */
         fromAsn1: function(obj) {
-          var capture = _fromAsn1(msg2, obj, p7.asn1.envelopedDataValidator);
-          msg2.recipients = _recipientsFromAsn1(capture.recipientInfos.value);
+          var capture2 = _fromAsn1(msg2, obj, p7.asn1.envelopedDataValidator);
+          msg2.recipients = _recipientsFromAsn1(capture2.recipientInfos.value);
         },
         toAsn1: function() {
           return asn1.create(asn1.Class.UNIVERSAL, asn1.Type.SEQUENCE, true, [
@@ -42977,21 +42977,21 @@ var require_pkcs7 = __commonJS({
       return msg2;
     };
     function _recipientFromAsn1(obj) {
-      var capture = {};
+      var capture2 = {};
       var errors = [];
-      if (!asn1.validate(obj, p7.asn1.recipientInfoValidator, capture, errors)) {
+      if (!asn1.validate(obj, p7.asn1.recipientInfoValidator, capture2, errors)) {
         var error = new Error("Cannot read PKCS#7 RecipientInfo. ASN.1 object is not an PKCS#7 RecipientInfo.");
         error.errors = errors;
         throw error;
       }
       return {
-        version: capture.version.charCodeAt(0),
-        issuer: forge2.pki.RDNAttributesAsArray(capture.issuer),
-        serialNumber: forge2.util.createBuffer(capture.serial).toHex(),
+        version: capture2.version.charCodeAt(0),
+        issuer: forge2.pki.RDNAttributesAsArray(capture2.issuer),
+        serialNumber: forge2.util.createBuffer(capture2.serial).toHex(),
         encryptedContent: {
-          algorithm: asn1.derToOid(capture.encAlgorithm),
-          parameter: capture.encParameter ? capture.encParameter.value : void 0,
-          content: capture.encKey
+          algorithm: asn1.derToOid(capture2.encAlgorithm),
+          parameter: capture2.encParameter ? capture2.encParameter.value : void 0,
+          content: capture2.encKey
         }
       };
     }
@@ -43220,52 +43220,52 @@ var require_pkcs7 = __commonJS({
       ];
     }
     function _fromAsn1(msg2, obj, validator) {
-      var capture = {};
+      var capture2 = {};
       var errors = [];
-      if (!asn1.validate(obj, validator, capture, errors)) {
+      if (!asn1.validate(obj, validator, capture2, errors)) {
         var error = new Error("Cannot read PKCS#7 message. ASN.1 object is not a supported PKCS#7 message.");
         error.errors = error;
         throw error;
       }
-      var contentType = asn1.derToOid(capture.contentType);
+      var contentType = asn1.derToOid(capture2.contentType);
       if (contentType !== forge2.pki.oids.data) {
         throw new Error("Unsupported PKCS#7 message. Only wrapped ContentType Data supported.");
       }
-      if (capture.encryptedContent) {
+      if (capture2.encryptedContent) {
         var content = "";
-        if (forge2.util.isArray(capture.encryptedContent)) {
-          for (var i = 0; i < capture.encryptedContent.length; ++i) {
-            if (capture.encryptedContent[i].type !== asn1.Type.OCTETSTRING) {
+        if (forge2.util.isArray(capture2.encryptedContent)) {
+          for (var i = 0; i < capture2.encryptedContent.length; ++i) {
+            if (capture2.encryptedContent[i].type !== asn1.Type.OCTETSTRING) {
               throw new Error("Malformed PKCS#7 message, expecting encrypted content constructed of only OCTET STRING objects.");
             }
-            content += capture.encryptedContent[i].value;
+            content += capture2.encryptedContent[i].value;
           }
         } else {
-          content = capture.encryptedContent;
+          content = capture2.encryptedContent;
         }
         msg2.encryptedContent = {
-          algorithm: asn1.derToOid(capture.encAlgorithm),
-          parameter: forge2.util.createBuffer(capture.encParameter.value),
+          algorithm: asn1.derToOid(capture2.encAlgorithm),
+          parameter: forge2.util.createBuffer(capture2.encParameter.value),
           content: forge2.util.createBuffer(content)
         };
       }
-      if (capture.content) {
+      if (capture2.content) {
         var content = "";
-        if (forge2.util.isArray(capture.content)) {
-          for (var i = 0; i < capture.content.length; ++i) {
-            if (capture.content[i].type !== asn1.Type.OCTETSTRING) {
+        if (forge2.util.isArray(capture2.content)) {
+          for (var i = 0; i < capture2.content.length; ++i) {
+            if (capture2.content[i].type !== asn1.Type.OCTETSTRING) {
               throw new Error("Malformed PKCS#7 message, expecting content constructed of only OCTET STRING objects.");
             }
-            content += capture.content[i].value;
+            content += capture2.content[i].value;
           }
         } else {
-          content = capture.content;
+          content = capture2.content;
         }
         msg2.content = forge2.util.createBuffer(content);
       }
-      msg2.version = capture.version.charCodeAt(0);
-      msg2.rawCapture = capture;
-      return capture;
+      msg2.version = capture2.version.charCodeAt(0);
+      msg2.rawCapture = capture2;
+      return capture2;
     }
     function _decryptContent(msg2) {
       if (msg2.encryptedContent.key === void 0) {
@@ -43425,8 +43425,8 @@ var require_ssh = __commonJS({
     }
     function _sha1() {
       var sha = forge2.md.sha1.create();
-      var num = arguments.length;
-      for (var i = 0; i < num; ++i) {
+      var num2 = arguments.length;
+      for (var i = 0; i < num2; ++i) {
         sha.update(arguments[i]);
       }
       return sha.digest();
@@ -43868,8 +43868,13 @@ function resolveBoundaries(input) {
   input.messages.forEach(
     (message, index) => indexByRawId.set(message.id, index)
   );
-  let startIndex = resolveAnchorIndex(start, input.state, indexByRawId, "start");
-  let endIndex = resolveAnchorIndex(end, input.state, indexByRawId, "end");
+  let snappedBoundaries = [];
+  const startAnchor = resolveAnchorIndex(start, input.state, indexByRawId, "start");
+  if (startAnchor.snapped) snappedBoundaries.push(startAnchor.snapped);
+  const endAnchor = resolveAnchorIndex(end, input.state, indexByRawId, "end");
+  if (endAnchor.snapped) snappedBoundaries.push(endAnchor.snapped);
+  let startIndex = startAnchor.index;
+  let endIndex = endAnchor.index;
   if (startIndex > endIndex) {
     [startIndex, endIndex] = [endIndex, startIndex];
   }
@@ -43897,7 +43902,8 @@ function resolveBoundaries(input) {
     messageIds,
     nestedBlockIds,
     boundaryKind,
-    protectedGaps
+    protectedGaps,
+    snappedBoundaries
   };
 }
 function resolveAnchorIndex(boundary, state, indexByRawId, endpoint) {
@@ -43912,14 +43918,21 @@ function resolveAnchorIndex(boundary, state, indexByRawId, endpoint) {
       );
     }
     const index = indexByRawId.get(rawId);
-    if (index === void 0) {
-      throw new BoundaryNotFoundError(
-        "consumed",
-        endpoint,
-        `${label}="${boundary.raw}" not found in visible context (likely consumed by an existing block).`
-      );
+    if (index !== void 0) {
+      return { index, snapped: null };
     }
-    return index;
+    const owner2 = activeOwnerAnchor(state, [rawId], indexByRawId);
+    if (owner2 !== null) {
+      return {
+        index: owner2,
+        snapped: `${label}="${boundary.raw}" refers to a message already compressed into an active block \u2014 anchored to that block's summary instead.`
+      };
+    }
+    throw new BoundaryNotFoundError(
+      "consumed",
+      endpoint,
+      `${label}="${boundary.raw}" not found in visible context (likely consumed by an existing block).`
+    );
   }
   const block = blockById(state, `b${boundary.numericId}`);
   if (!block) {
@@ -43929,6 +43942,19 @@ function resolveAnchorIndex(boundary, state, indexByRawId, endpoint) {
       `${label}="b${boundary.numericId}" does not exist in this session (typo or wrong session) \u2014 run acp_status for current refs.`
     );
   }
+  if (block.active) {
+    const anchor = earliestIndexOfIds(block.effectiveMessageIds, indexByRawId);
+    if (anchor !== null) {
+      return { index: anchor, snapped: null };
+    }
+  }
+  const owner = activeOwnerAnchor(state, block.effectiveMessageIds, indexByRawId);
+  if (owner !== null) {
+    return {
+      index: owner,
+      snapped: `${label}="b${boundary.numericId}" was consumed by a higher-tier block \u2014 anchored to the active block covering its content instead.`
+    };
+  }
   if (!block.active) {
     throw new BoundaryNotFoundError(
       "consumed",
@@ -43936,15 +43962,26 @@ function resolveAnchorIndex(boundary, state, indexByRawId, endpoint) {
       `${label}="b${boundary.numericId}" not found in visible context (block distilled/consumed by a higher-tier block).`
     );
   }
-  const anchor = earliestIndexOfIds(block.effectiveMessageIds, indexByRawId);
-  if (anchor === null) {
-    throw new BoundaryNotFoundError(
-      "consumed",
-      endpoint,
-      `${label}="b${boundary.numericId}" not found in visible context (block messages consumed by a higher-tier block).`
-    );
+  throw new BoundaryNotFoundError(
+    "consumed",
+    endpoint,
+    `${label}="b${boundary.numericId}" not found in visible context (block messages consumed by a higher-tier block).`
+  );
+}
+function activeOwnerAnchor(state, ownedIds, indexByRawId) {
+  if (ownedIds.length === 0) return null;
+  const owned = new Set(ownedIds);
+  let best = null;
+  for (const block of state.blocks) {
+    if (!block.active) continue;
+    const anchor = earliestIndexOfIds(block.effectiveMessageIds, indexByRawId);
+    if (anchor === null) continue;
+    const ownsContent = block.effectiveMessageIds.some((id) => owned.has(id));
+    if (ownsContent && (best === null || anchor < best)) {
+      best = anchor;
+    }
   }
-  return anchor;
+  return best;
 }
 function formatPaddedRef(index) {
   return `m${String(index).padStart(5, "0")}`;
@@ -44010,7 +44047,7 @@ function truncateLargeToolOutputs(messages, tokenCount, config, countTokens, opt
   );
   return { messages: updated, truncatedCount, savedTokens };
 }
-var KEEP_LAST_ORPHANED = 0;
+var KEEP_LAST_ORPHANED = 2;
 function rangeKey(startRef, endRef) {
   return `${startRef}::${endRef}`;
 }
@@ -44565,6 +44602,10 @@ function runPipeline(nodes, initial, ctx) {
 function rangeError(spec, message) {
   return `range ${spec.startRef}..${spec.endRef}: ${message}`;
 }
+function numericBlockId(id) {
+  const parsed = /^b(\d+)$/.exec(id);
+  return parsed ? Number(parsed[1]) : 0;
+}
 function createCore(ports = {}) {
   const countTokens = ports.countTokens ?? defaultCountTokens;
   function applyCompression(input) {
@@ -44610,6 +44651,12 @@ function createCore(ports = {}) {
         }
       }
     }
+    let resolvableCount = 0;
+    let unknownCount = 0;
+    for (const resolution of classifications.values()) {
+      if (resolution.status === "ok") resolvableCount++;
+      else if (resolution.status === "unknown") unknownCount++;
+    }
     const rangeIndexSets = [];
     for (const [spec, resolution] of classifications) {
       if (resolution.status !== "ok") continue;
@@ -44654,7 +44701,9 @@ function createCore(ports = {}) {
         }
       }
       if (!hasBlockBoundaryRange && totalRangeChars < input.config.compress.minCompressRange) {
-        const gateMessage = consumedRanges.length > 0 ? `Requested range(s) already compressed (e.g. ${consumedRanges[0].startRef}..${consumedRanges[0].endRef}); remaining compressible content ${totalRangeChars} chars < min ${input.config.compress.minCompressRange}. Nothing to do \u2014 run acp_status to see current compressible ranges.` : `Total compressible content too small (${totalRangeChars} chars across ${countedRanges} range(s), min ${input.config.compress.minCompressRange}). Combine more messages into your range(s) to meet the threshold.`;
+        const live = activeBlocks(state).map((b2) => b2.blockId).sort((x, y) => numericBlockId(x) - numericBlockId(y));
+        const liveHint = live.length > 0 ? ` Current active blocks span ${live[0]}..${live[live.length - 1]} \u2014 retry with startId/endId set to active block IDs in that span.` : "";
+        const gateMessage = resolvableCount === 0 && consumedRanges.length === 0 && unknownCount > 0 ? `None of the ${input.ranges.length} requested range(s) resolved \u2014 every ref failed with "does not exist in this session". Refs recorded before an earlier compress are stale: each successful compress renumbers the remaining refs. Run acp_status, then re-issue the compress in the same turn using only the refs it reports.` : consumedRanges.length > 0 ? `Requested range(s) already compressed (e.g. ${consumedRanges[0].startRef}..${consumedRanges[0].endRef}); remaining compressible content ${totalRangeChars} chars < min ${input.config.compress.minCompressRange}. Nothing to do.${liveHint}` : `Total compressible content too small (${totalRangeChars} chars across ${countedRanges} range(s), min ${input.config.compress.minCompressRange}). Combine more messages into your range(s) to meet the threshold.`;
         return {
           state: input.state,
           result: {
@@ -44680,6 +44729,7 @@ function createCore(ports = {}) {
         errors.push(rangeError(spec, resolution.error.message));
         continue;
       }
+      warnings.push(...resolution.resolved.snappedBoundaries);
       try {
         const outcome = applySingleRange({
           spec,
@@ -45845,14 +45895,14 @@ function renderUncompressedRanges(visible) {
   };
   const merged = [];
   for (const m2 of visible) {
-    const num = refNum2(m2.ref);
+    const num2 = refNum2(m2.ref);
     const last = merged[merged.length - 1];
-    if (last && num === last.startNum + last.count) {
+    if (last && num2 === last.startNum + last.count) {
       last.endRef = m2.ref;
       last.count += 1;
       last.tokens += m2.tokens;
     } else {
-      merged.push({ startRef: m2.ref, endRef: m2.ref, startNum: num, count: 1, tokens: m2.tokens, tool: m2.tool });
+      merged.push({ startRef: m2.ref, endRef: m2.ref, startNum: num2, count: 1, tokens: m2.tokens, tool: m2.tool });
     }
   }
   for (const r of merged.slice(0, 30)) {
@@ -45919,24 +45969,6 @@ function renderCompressedDrilldown(blocks, state, sort, limit, countTokens) {
   }
   return lines.join("\n");
 }
-var substringAlgorithm = {
-  name: "substring",
-  description: "Exact substring counting (original baseline). Predictable, no normalization.",
-  score(docs, query) {
-    const terms = query.toLowerCase().trim().split(/\s+/).filter((t) => t.length > 0);
-    if (terms.length === 0) return docs.map((d) => ({ ref: d.ref, score: 0 }));
-    return docs.map((d) => {
-      const haystack = d.text.toLowerCase();
-      let score = 0;
-      for (const term of terms) score += countOccurrences2(haystack, term);
-      return { ref: d.ref, score };
-    });
-  }
-};
-function countOccurrences2(haystack, needle) {
-  if (!needle) return 0;
-  return haystack.split(needle).length - 1;
-}
 function stem(word) {
   let w2 = word;
   if (w2.length <= 3) return w2;
@@ -45955,8 +45987,17 @@ function stem(word) {
   return w2;
 }
 var CJK = /[\u3400-\u9fff\uf900-\ufaff\u3040-\u30ff\uac00-\ud7af]/;
-var CJK_RUN = new RegExp(`${CJK.source}+`, "g");
 var LATIN_WORD = /[a-z][a-z0-9_]*[a-z0-9]|[a-z0-9]/g;
+var cjkSegmenter = new Intl.Segmenter("zh", { granularity: "word" });
+function cjkRunTokens(segs) {
+  const words = segs.filter((w2) => w2.length >= 2);
+  if (words.length > 0) return words;
+  const run = segs.join("");
+  const out = [];
+  for (let i = 0; i < run.length - 1; i++) out.push(run.slice(i, i + 2));
+  for (const ch of run) out.push(ch);
+  return out;
+}
 function tokenize(text, opts = {}) {
   const lower = text.toLowerCase();
   const tokens = [];
@@ -45967,15 +46008,23 @@ function tokenize(text, opts = {}) {
       tokens.push(w2);
     }
   }
-  const cjkRuns = lower.match(CJK_RUN) ?? [];
-  for (const run of cjkRuns) {
-    if (run.length === 1) {
-      tokens.push(run);
-    } else {
-      for (let i = 0; i < run.length - 1; i++) tokens.push(run.slice(i, i + 2));
-      for (const ch of run) tokens.push(ch);
+  if (!CJK.test(lower)) return tokens;
+  const runSegs = [];
+  let cur = null;
+  for (const s3 of cjkSegmenter.segment(lower)) {
+    const t = s3.segment;
+    if (t.length === 0) continue;
+    if (CJK.test(t)) {
+      (cur ??= []).push(t);
+    } else if (cur) {
+      runSegs.push(cur);
+      cur = null;
     }
   }
+  if (cur) runSegs.push(cur);
+  for (const segs of runSegs) {
+    tokens.push(...cjkRunTokens(segs));
+  }
   return tokens;
 }
 function charBigrams(text) {
@@ -45991,6 +46040,50 @@ function tfMap(text, stem2) {
   for (const t of tokenize(text, { stem: stem2 })) m2.set(t, (m2.get(t) ?? 0) + 1);
   return m2;
 }
+var DEFAULT_CAP_CHARS = 8 * 1024 * 1024;
+var capChars = DEFAULT_CAP_CHARS;
+var cache = /* @__PURE__ */ new Map();
+var cachedChars = 0;
+function build(text) {
+  const tf = tfMap(text, true);
+  let len = 0;
+  for (const v2 of tf.values()) len += v2;
+  const lower = text.toLowerCase();
+  return { tf, len, lower, grams: new Set(charBigrams(lower)) };
+}
+function docFeatures(text) {
+  const hit = cache.get(text);
+  if (hit) return hit;
+  const f2 = build(text);
+  if (text.length > 0 && text.length <= capChars) {
+    while (cachedChars + text.length > capChars && cache.size > 0) {
+      const k2 = cache.keys().next().value;
+      cachedChars -= k2.length;
+      cache.delete(k2);
+    }
+    cache.set(text, f2);
+    cachedChars += text.length;
+  }
+  return f2;
+}
+var substringAlgorithm = {
+  name: "substring",
+  description: "Exact substring counting (original baseline). Predictable, no normalization.",
+  score(docs, query) {
+    const terms = query.toLowerCase().trim().split(/\s+/).filter((t) => t.length > 0);
+    if (terms.length === 0) return docs.map((d) => ({ ref: d.ref, score: 0 }));
+    return docs.map((d) => {
+      const haystack = docFeatures(d.text).lower;
+      let score = 0;
+      for (const term of terms) score += countOccurrences2(haystack, term);
+      return { ref: d.ref, score };
+    });
+  }
+};
+function countOccurrences2(haystack, needle) {
+  if (!needle) return 0;
+  return haystack.split(needle).length - 1;
+}
 var bm25Algorithm = {
   name: "bm25",
   description: "BM25 with stemming + CJK bigram tokenization. IR-standard relevance ranking.",
@@ -45999,11 +46092,8 @@ var bm25Algorithm = {
     const k1 = 1.2;
     const b2 = 0.75;
     const parsed = docs.map((d) => {
-      const text = d.text;
-      const tf = tfMap(text, true);
-      let len = 0;
-      for (const v2 of tf.values()) len += v2;
-      return { id: d.ref, tf, len };
+      const f2 = docFeatures(d.text);
+      return { id: d.ref, tf: f2.tf, len: f2.len };
     });
     const avgdl = parsed.reduce((s3, d) => s3 + d.len, 0) / (N2 || 1);
     const qTerms = tokenize(query, { stem: true });
@@ -46030,14 +46120,13 @@ var fuzzyAlgorithm = {
   name: "fuzzy",
   description: "Character bigram overlap. Typo-tolerant, script-agnostic, high recall.",
   score(docs, query) {
-    const qTokens = query.toLowerCase().split(/[\s,]+/).filter((t) => t.length >= 4);
+    const qTokens = query.toLowerCase().split(/[\s,]+/).filter((t) => t.length >= 4 || t.length >= 2 && CJK.test(t));
     if (qTokens.length === 0) return docs.map((d) => ({ ref: d.ref, score: 0 }));
     const qGrams = /* @__PURE__ */ new Set();
     for (const t of qTokens) for (const g2 of charBigrams(t)) qGrams.add(g2);
     if (qGrams.size === 0) return docs.map((d) => ({ ref: d.ref, score: 0 }));
     return docs.map((d) => {
-      const haystack = d.text.toLowerCase();
-      const docGrams = new Set(charBigrams(haystack));
+      const docGrams = docFeatures(d.text).grams;
       let hits = 0;
       for (const g2 of qGrams) if (docGrams.has(g2)) hits++;
       return { ref: d.ref, score: hits / qGrams.size };
@@ -46108,6 +46197,9 @@ 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");
 }
@@ -46164,7 +46256,14 @@ function configureLogger(file) {
   stream = openStream(file);
   return file;
 }
+var capture = null;
 var log = (level, msg2) => {
+  if (capture) {
+    try {
+      capture(level, msg2);
+    } catch {
+    }
+  }
   const ts2 = (/* @__PURE__ */ new Date()).toISOString();
   const line = `${ts2} [${level}] ${msg2}
 `;
@@ -46430,13 +46529,32 @@ function openProxySocket(proxy) {
   }
   return net.connect(proxy.port, proxy.host);
 }
+var CONNECT_TIMEOUT_MS = 1e4;
+var connectFactory = (port, host) => net.connect(port, host);
+function connectDirect(host, port, timeoutMs = CONNECT_TIMEOUT_MS) {
+  return new Promise((resolve, reject) => {
+    const socket = connectFactory(port, host);
+    let settled = false;
+    const finishError = (error) => {
+      if (settled) return;
+      settled = true;
+      clearTimeout(timer2);
+      socket.destroy();
+      reject(error);
+    };
+    const timer2 = setTimeout(() => finishError(new Error(`upstream connect ${host}:${port} timed out after ${timeoutMs}ms`)), timeoutMs);
+    socket.once("error", finishError);
+    socket.once("connect", () => {
+      if (settled) return;
+      settled = true;
+      clearTimeout(timer2);
+      resolve(socket);
+    });
+  });
+}
 function connectThroughProxy(host, port, proxyUrl) {
   if (!proxyUrl) {
-    return new Promise((resolve, reject) => {
-      const socket = net.connect(port, host);
-      socket.once("connect", () => resolve(socket));
-      socket.once("error", reject);
-    });
+    return connectDirect(host, port);
   }
   const proxy = parseHttpProxy(proxyUrl);
   if (!proxy) return Promise.reject(new Error(`invalid upstream proxy: ${redactProxyUrl(proxyUrl)}`));
@@ -46450,7 +46568,7 @@ function connectThroughProxy(host, port, proxyUrl) {
       socket.destroy();
       reject(error);
     };
-    const timer2 = setTimeout(() => finishError(new Error(`upstream proxy CONNECT ${host}:${port} handshake timeout`)), 1e4);
+    const timer2 = setTimeout(() => finishError(new Error(`upstream proxy CONNECT ${host}:${port} handshake timeout`)), CONNECT_TIMEOUT_MS);
     socket.once("error", finishError);
     const connectedEvent = proxy.protocol === "https:" ? "secureConnect" : "connect";
     socket.once(connectedEvent, () => {
@@ -46538,13 +46656,13 @@ function getUpstreamConnectionStatus() {
 }
 
 // src/config.ts
-function safeReadJson(path12) {
+function safeReadJson(path15) {
   try {
-    const raw = readFileSync(path12, "utf8").replace(/^\uFEFF/, "");
+    const raw = readFileSync(path15, "utf8").replace(/^\uFEFF/, "");
     return JSON.parse(raw);
   } catch (e) {
     if (e.code !== "ENOENT") {
-      log("error", `[acp-config] failed to parse ${path12}: ${String(e)}`);
+      log("error", `[acp-config] failed to parse ${path15}: ${String(e)}`);
     }
     return void 0;
   }
@@ -46624,7 +46742,8 @@ function loadOptions(env = process.env) {
   if (!Number.isInteger(port) || port < 1 || port > 65535) {
     throw new Error(`Invalid port ${Number.isNaN(port) ? "(not a number)" : port}; must be 1-65535`);
   }
-  const host = env.ACP_HOST ?? fileConfig.host ?? "127.0.0.1";
+  const rawHost = env.ACP_HOST ?? fileConfig.host ?? "127.0.0.1";
+  const host = rawHost === "localhost" ? "127.0.0.1" : rawHost;
   const upstream = (env.ACP_UPSTREAM ?? fileConfig.upstream ?? "https://api.anthropic.com").replace(/\/$/, "");
   const routes = loadRoutes(env);
   const modelContextLimit = parseInt(env.ACP_MODEL_CONTEXT_LIMIT ?? `${fileConfig.modelContextLimit ?? 2e5}`, 10);
@@ -46823,7 +46942,7 @@ function rejectLegacyRoute(key, value) {
 
 // src/server.ts
 import http from "http";
-import fs5 from "fs";
+import fs6 from "fs";
 
 // src/compress-settings.ts
 function resolveContextLimitValue(raw, nativeLimit) {
@@ -46924,7 +47043,7 @@ import path3 from "path";
 var REGISTRY_URL = "https://models.dev/models.json";
 var CACHE_FILE = path3.join(cacheDir(), "models-dev.json");
 var TTL_MS = 24 * 60 * 60 * 1e3;
-var cache = null;
+var cache2 = null;
 var loading = null;
 function parse(raw) {
   try {
@@ -46976,25 +47095,25 @@ async function fetchFresh() {
   }
 }
 async function loadRegistry() {
-  if (cache) return cache;
+  if (cache2) return cache2;
   if (diskCacheFresh()) {
     const disk = await readDiskCache();
     if (disk) {
-      cache = disk;
-      return cache;
+      cache2 = disk;
+      return cache2;
     }
   }
   if (loading) return loading;
   loading = (async () => {
     const fresh = await fetchFresh();
     if (fresh) {
-      cache = fresh;
+      cache2 = fresh;
       log("info", `[acp-registry] loaded models.dev (${Object.keys(fresh).length} models)`);
       return fresh;
     }
     const disk = await readDiskCache();
     if (disk) {
-      cache = disk;
+      cache2 = disk;
       log("info", `[acp-registry] using stale disk cache (${Object.keys(disk).length} models, fetch failed)`);
       return disk;
     }
@@ -47229,8 +47348,8 @@ function coreToAnthropic(messages, cacheControls) {
   flush();
   return out;
 }
-function conversationSignalAnthropic(body, headerValue2) {
-  if (headerValue2 && headerValue2.trim()) return headerValue2.trim();
+function conversationSignalAnthropic(body, headerValue3) {
+  if (headerValue3 && headerValue3.trim()) return headerValue3.trim();
   const firstUser = body.messages.find((m2) => m2.role === "user");
   const seed = firstUser ? JSON.stringify(firstUser.content) : "default";
   return hashId(seed);
@@ -47268,14 +47387,17 @@ function openaiToCore(body) {
       }
       case "user": {
         const text = stringContent(m2.content);
-        const img = firstImagePart(m2.content);
+        const imgs = allImageParts(m2.content);
+        const firstImg = imgs[0];
+        const firstUrl = firstImg ? firstImg.image_url.url : void 0;
+        const firstParsed = firstUrl ? parseDataUrl(firstUrl) : void 0;
         const base = deriveMessageId("user", "text", text);
         msgs.push({
           id: clusters.next(base),
           role: "user",
           contentType: "text",
           text,
-          ...img ? { rawOpenaiContent: img.part, imageMediaType: img.mediaType, imageBase64: img.base64 } : {}
+          ...imgs.length === 1 && firstParsed ? { rawOpenaiContent: imgs[0], imageMediaType: firstParsed.mediaType, imageBase64: firstParsed.base64 } : imgs.length > 1 ? { rawOpenaiContentParts: imgs } : {}
         });
         break;
       }
@@ -47370,10 +47492,12 @@ function coreToOpenai(messages) {
       if (m2.role === "system") {
         out.push({ role: m2.originalRole === "developer" ? "developer" : "system", content: m2.text ?? "" });
       } else if (m2.role === "user") {
-        if (m2.rawOpenaiContent || m2.imageBase64) {
+        if (m2.rawOpenaiContent || m2.imageBase64 || m2.rawOpenaiContentParts) {
           const parts = [];
           if (m2.text) parts.push({ type: "text", text: m2.text });
-          if (m2.rawOpenaiContent) {
+          if (m2.rawOpenaiContentParts && m2.rawOpenaiContentParts.length > 0) {
+            for (const part of m2.rawOpenaiContentParts) parts.push(part);
+          } else if (m2.rawOpenaiContent) {
             parts.push(m2.rawOpenaiContent);
           } else if (m2.imageBase64 && m2.imageMediaType) {
             parts.push({ type: "image_url", image_url: { url: `data:${m2.imageMediaType};base64,${m2.imageBase64}` } });
@@ -47405,8 +47529,8 @@ ${extra}` : extra;
   }
   return [{ role: "system", content: extra }, ...messages];
 }
-function conversationSignalOpenai(body, headerValue2) {
-  if (headerValue2 && headerValue2.trim()) return headerValue2.trim();
+function conversationSignalOpenai(body, headerValue3) {
+  if (headerValue3 && headerValue3.trim()) return headerValue3.trim();
   const firstUser = body.messages.find((m2) => m2.role === "user");
   const seed = firstUser ? stringContent(firstUser.content) : "default";
   return hashId(seed);
@@ -47419,19 +47543,17 @@ function stringContent(content) {
   }
   return "";
 }
-function firstImagePart(content) {
-  if (!Array.isArray(content)) return void 0;
+function allImageParts(content) {
+  if (!Array.isArray(content)) return [];
+  const out = [];
   for (const p2 of content) {
-    if (p2 && typeof p2 === "object" && p2.type === "image_url") {
-      const iu = p2.image_url;
-      const url = iu?.url;
-      if (typeof url === "string") {
-        const parsed = parseDataUrl(url);
-        if (parsed) return { part: p2, mediaType: parsed.mediaType, base64: parsed.base64 };
-      }
-    }
+    if (typeof p2 !== "object" || p2 === null) continue;
+    if (!("type" in p2) || p2.type !== "image_url" || !("image_url" in p2)) continue;
+    const imagePart = p2;
+    const url = imagePart.image_url.url;
+    if (typeof url === "string" && parseDataUrl(url)) out.push(p2);
   }
-  return void 0;
+  return out;
 }
 var OPAQUE_ITEM_TYPES = /* @__PURE__ */ new Set([
   "additional_tools",
@@ -47691,8 +47813,8 @@ function injectResponsesDeveloperMessage(input, content) {
   items.splice(index, 0, { type: "message", role: "developer", content });
   return items;
 }
-function conversationIdentityResponses(body, headerValue2) {
-  if (headerValue2?.trim()) return { value: headerValue2.trim(), source: "header", clientProvided: true };
+function conversationIdentityResponses(body, headerValue3) {
+  if (headerValue3?.trim()) return { value: headerValue3.trim(), source: "header", clientProvided: true };
   if (typeof body.session_id === "string" && body.session_id.trim()) {
     return { value: body.session_id.trim(), source: "body-session", clientProvided: true };
   }
@@ -47705,8 +47827,8 @@ function conversationIdentityResponses(body, headerValue2) {
   }
   return { value: hashId(JSON.stringify(body.input ?? [])), source: "content-fingerprint", clientProvided: false };
 }
-function conversationSignalResponses(body, headerValue2) {
-  return conversationIdentityResponses(body, headerValue2).value;
+function conversationSignalResponses(body, headerValue3) {
+  return conversationIdentityResponses(body, headerValue3).value;
 }
 function createSubagentNamespaces() {
   const anchors = /* @__PURE__ */ new Map();
@@ -48176,6 +48298,9 @@ async function withSessionLock(session, fn) {
 function listSessions() {
   return [...sessions.values()].sort((a, b2) => b2.lastSeen - a.lastSeen);
 }
+function peekSession(id) {
+  return sessions.get(id);
+}
 function snapshotMessages(session, messages) {
   if (messages.length > 0) session.lastMessages = messages;
 }
@@ -48278,8 +48403,17 @@ function parseCompressInput(input, callId) {
     return [];
   }
   const obj = input;
+  let content = obj.content;
+  if (typeof content === "string") {
+    try {
+      content = JSON.parse(content);
+    } catch {
+      log("warn", `[acp-compress-input] content is a string but not valid JSON; parsed 0 valid ranges`);
+      return [];
+    }
+  }
   const single = toRange(obj);
-  const ranges = Array.isArray(obj.content) ? obj.content.map((r) => toRange(r)).filter((r) => r !== null) : single ? [single] : [];
+  const ranges = Array.isArray(content) ? content.map((r) => toRange(r)).filter((r) => r !== null) : single ? [single] : [];
   if (ranges.length === 0) {
     log("warn", `[acp-compress-input] parsed 0 valid ranges. top keys: ${Object.keys(obj).join(",")}`);
   }
@@ -48584,6 +48718,12 @@ ${body.slice(0, 4e3)}...`;
 ${body}`;
 }
 
+// src/sse-util.ts
+function normalizeSseLineEndings(buf) {
+  if (buf.indexOf("\r") === -1) return buf;
+  return buf.replace(/\r\n|\r/g, "\n");
+}
+
 // src/stream.ts
 function executeAnthropicProxyTool(toolName, args, ctx) {
   if (toolName === COMPRESS_TOOL_NAME) {
@@ -48735,7 +48875,7 @@ function renderPage(origin, version2) {
 <p class="hint">\u5728\u5BA2\u6237\u7AEF\u914D\u7F6E\u91CC\u628A\u539F baseURL \u524D\u52A0\u4E0A <span class="mono">${origin}/bili/</span> \u5373\u53EF\uFF0C\u5176\u4F59\u4E0D\u53D8\u3002</p>
 <div class="card"><div class="card-head"><h2>OpenCode</h2><button class="btn small copy-btn" data-copy="${origin}/bili/https://open.bigmodel.cn/api/coding/paas/v4">\u590D\u5236</button></div><dl class="kv"><dt>\u914D\u7F6E\u6587\u4EF6</dt><dd class="mono">~/.config/opencode/opencode.json</dd><dt>baseURL</dt><dd class="mono">${origin}/bili/https://open.bigmodel.cn/api/coding/paas/v4</dd></dl></div>
 <div class="card"><div class="card-head"><h2>Codex\uFF08API key\uFF09</h2><button class="btn small copy-btn" data-copy="${origin}/bili/https://api.openai.com/v1">\u590D\u5236</button></div><dl class="kv"><dt>\u914D\u7F6E\u6587\u4EF6</dt><dd class="mono">~/.codex/config.toml</dd><dt>base_url</dt><dd class="mono">${origin}/bili/https://api.openai.com/v1</dd></dl></div>
-<div class="card"><div class="card-head"><h2>Codex\uFF08ChatGPT \u767B\u5F55\uFF09</h2><button class="btn small copy-btn" data-copy="model_provider = &quot;openai&quot;&#10;openai_base_url = &quot;${origin}/bili/https://chatgpt.com/backend-api/codex&quot;">\u590D\u5236\u914D\u7F6E</button></div><dl class="kv"><dt>\u914D\u7F6E\u6587\u4EF6</dt><dd class="mono">~/.codex/config.toml</dd><dt>\u914D\u7F6E</dt><dd class="mono">model_provider = "openai"<br>openai_base_url = "${origin}/bili/https://chatgpt.com/backend-api/codex"</dd><dt>\u8BA4\u8BC1</dt><dd><span class="mono">codex login</span>\uFF08OAuth token \u900F\u4F20\uFF0C\u65E0\u9700\u8BC1\u4E66\uFF09</dd></dl></div>
+<div class="card"><div class="card-head"><h2>Codex\uFF08ChatGPT \u767B\u5F55\uFF09</h2><button class="btn small copy-btn" data-copy="openai_base_url = &quot;${origin}/bili/https://chatgpt.com/backend-api/codex&quot;">\u590D\u5236\u914D\u7F6E</button></div><dl class="kv"><dt>\u914D\u7F6E\u6587\u4EF6</dt><dd class="mono">~/.codex/config.toml</dd><dt>\u914D\u7F6E</dt><dd class="mono">openai_base_url = "${origin}/bili/https://chatgpt.com/backend-api/codex"</dd><dt>\u8BA4\u8BC1</dt><dd><span class="mono">codex login</span>\uFF08OAuth token \u900F\u4F20\uFF0C\u65E0\u9700\u8BC1\u4E66\uFF09</dd><dt>\u8BF4\u660E</dt><dd>\u9ED8\u8BA4 provider \u5C31\u662F openai\uFF0C\u65E0\u9700 model_provider\uFF1B\u82E5 config.toml \u91CC\u6539\u8FC7 <span class="mono">model_provider</span>\uFF0C\u9700\u518D\u52A0\u4E00\u884C <span class="mono">model_provider = "openai"</span>\u3002\u8FDE\u4E0D\u4E0A\u65F6\u68C0\u67E5\u4EE3\u7406\u73AF\u5883\u53D8\u91CF\uFF1A\u8BBE\u4E86 HTTP(S)_PROXY \u9700\u52A0 <span class="mono">NO_PROXY=localhost,127.0.0.1</span>\uFF1Bbili \u8DD1\u5728 WSL2/Docker \u91CC\u65F6 Windows \u4FA7\u8BF7\u7528 <span class="mono">localhost</span>\uFF08\u81EA\u52A8\u8F6C\u53D1\uFF09\uFF0C127.0.0.1 \u4E0D\u901A\u3002</dd></dl></div>
 <div class="card"><div class="card-head"><h2>Claude Code\uFF08API key\uFF09</h2><button class="btn small copy-btn" data-copy="${origin}/bili/https://api.anthropic.com">\u590D\u5236</button></div><dl class="kv"><dt>\u73AF\u5883\u53D8\u91CF</dt><dd class="mono">ANTHROPIC_BASE_URL=${origin}/bili/https://api.anthropic.com</dd></dl></div>
 <div class="card"><div class="card-head"><h2>Pi</h2><span class="badge">\u4E0D\u63A8\u8350</span><button class="btn small copy-btn" data-copy="${origin}/bili/https://api.anthropic.com">\u590D\u5236</button></div><dl class="kv"><dt>\u914D\u7F6E\u6587\u4EF6</dt><dd class="mono">~/.pi/agent/models.json</dd><dt>baseUrl</dt><dd class="mono">${origin}/bili/https://api.anthropic.com</dd></dl><p class="hint">\u26A0\uFE0F \u4E0D\u63A8\u8350\uFF1APi \u7684 session \u7BA1\u7406\u4E0E bili \u538B\u7F29\u72B6\u6001\u5B58\u5728\u51B2\u7A81\uFF0C\u8BE6\u89C1 README\u3002</p></div>
 <div class="card"><div class="card-head"><h2>\u5176\u4ED6\uFF08Cursor / Aider / Continue\uFF09</h2><button class="btn small copy-btn" data-copy="${origin}/bili/">\u590D\u5236</button></div><dl class="kv"><dt>\u89C4\u5219</dt><dd>\u4EFB\u610F baseURL \u524D\u52A0 <span class="mono">${origin}/bili/</span></dd><dt>\u793A\u4F8B</dt><dd class="mono">${origin}/bili/https://api.openai.com/v1</dd></dl></div>
@@ -49026,16 +49166,18 @@ function recordUsage(ctx, usage, round) {
   const prompt = usage.inputTokens;
   const cached = usage.cachedTokens;
   const out = usage.outputTokens;
-  if (typeof prompt === "number") ctx.session.stats.inputTokens += prompt;
-  ctx.session.stats.lastInputTokens = (typeof prompt === "number" ? prompt : 0) + (typeof cached === "number" ? cached : 0);
+  const includesCached = ctx.protocol === "openai" || ctx.protocol === "responses";
+  const total = (typeof prompt === "number" ? prompt : 0) + (!includesCached && typeof cached === "number" ? cached : 0);
+  if (total > 0) ctx.session.stats.inputTokens += total;
+  ctx.session.stats.lastInputTokens = total;
   if (typeof cached === "number") {
     ctx.session.stats.cachedTokens += cached;
     ctx.session.stats.cacheSamples += 1;
   }
   if (typeof out === "number") ctx.session.stats.outputTokens += out;
-  const hitPct = typeof prompt === "number" && typeof cached === "number" && prompt + cached > 0 ? Math.round(cached / (prompt + cached) * 100) : 0;
+  const hitPct = typeof cached === "number" && total > 0 ? Math.round(cached / total * 100) : 0;
   ctx.log(
-    `[acp-usage] round ${round} input=${ctx.session.stats.lastInputTokens} cached=${cached ?? 0} (cache hit ${hitPct}%)`
+    `[acp-usage] round ${round} input=${total} cached=${cached ?? 0} (cache hit ${hitPct}%)`
   );
 }
 async function* runCompressLoop(upstream, ctx, requestBody, requestOptions, adapter, systemPrompt, signal) {
@@ -49222,11 +49364,11 @@ async function* runCompressLoop(upstream, ctx, requestBody, requestOptions, adap
       const newBody = adapter.buildRequest(coreMessages, systemPrompt, requestBody);
       if (process.env.ACP_DUMP_REQ !== "0" && ctx.debug) {
         try {
-          const fs8 = await import("fs");
+          const fs11 = await import("fs");
           const dumpDir = process.env.ACP_DUMP_DIR || `${process.env.HOME}/.local/state/billion-context/dumps`;
-          fs8.mkdirSync(dumpDir, { recursive: true });
+          fs11.mkdirSync(dumpDir, { recursive: true });
           const sid = ctx.session.id ?? "unknown";
-          fs8.writeFileSync(`${dumpDir}/req-${Date.now()}-${sid}-REREQUEST.json`, JSON.stringify(newBody, null, 2));
+          fs11.writeFileSync(`${dumpDir}/req-${Date.now()}-${sid}-REREQUEST.json`, JSON.stringify(newBody, null, 2));
         } catch {
         }
       }
@@ -49865,6 +50007,7 @@ function createOpenaiAdapter(requestBody) {
       const usage = opts?.usage ? {
         prompt_tokens: opts.usage.inputTokens,
         completion_tokens: opts.usage.outputTokens,
+        total_tokens: (opts.usage.inputTokens ?? 0) + (opts.usage.outputTokens ?? 0),
         ...typeof opts.usage.cachedTokens === "number" ? { prompt_tokens_details: { cached_tokens: opts.usage.cachedTokens } } : {}
       } : null;
       return Buffer.concat([buildFinish(finishReason, usage), Buffer.from("data: [DONE]\n\n", "utf8")]);
@@ -50101,8 +50244,8 @@ ${systemPrompt}` : systemPrompt;
         } else if (type === "message_delta") {
           const u2 = data.usage ?? {};
           if (typeof u2.output_tokens === "number") roundOutput = u2.output_tokens;
-          if (typeof u2.input_tokens === "number") roundInput = u2.input_tokens;
-          if (typeof u2.cache_read_input_tokens === "number") roundCached = u2.cache_read_input_tokens;
+          if (typeof u2.input_tokens === "number" && u2.input_tokens > 0) roundInput = u2.input_tokens;
+          if (typeof u2.cache_read_input_tokens === "number" && u2.cache_read_input_tokens > 0) roundCached = u2.cache_read_input_tokens;
           const d = data.delta ?? {};
           if (typeof d.stop_reason === "string") stopReason = d.stop_reason;
           if (!usageYielded) {
@@ -50367,6 +50510,71 @@ function safeJsonParse(s3) {
 function isLoopbackAddress(addr) {
   return !!addr && (addr.startsWith("127.") || addr === "::1" || addr.startsWith("::ffff:127."));
 }
+function usageTotals(protocol, usage) {
+  const num2 = (v2) => typeof v2 === "number" && Number.isFinite(v2) ? v2 : void 0;
+  if (protocol === "anthropic") {
+    const fresh = num2(usage["input_tokens"]);
+    const read = num2(usage["cache_read_input_tokens"]);
+    const creation = num2(usage["cache_creation_input_tokens"]);
+    const any = fresh !== void 0 || read !== void 0 || creation !== void 0;
+    return {
+      total: any ? (fresh ?? 0) + (read ?? 0) + (creation ?? 0) : void 0,
+      cached: read
+    };
+  }
+  if (protocol === "openai") {
+    return {
+      total: num2(usage["prompt_tokens"]),
+      cached: num2(usage["prompt_tokens_details"]?.["cached_tokens"])
+    };
+  }
+  return {
+    total: num2(usage["input_tokens"]),
+    cached: num2(usage["input_tokens_details"]?.["cached_tokens"])
+  };
+}
+var CONTEXT_OVERFLOW_PATTERNS = [
+  /context_length_exceeded/i,
+  /context length exceeded/i,
+  /maximum context length/i,
+  /max context length/i,
+  /maximum context size/i,
+  /exceeds the context window/i,
+  /exceeded model token limit/i,
+  /prompt is too long/i,
+  /prompt_too_long/i,
+  /prompt_is_too_long/i,
+  /request_too_large/i,
+  /token limit exceeded/i
+];
+function toTokenNumber(s3) {
+  const n = parseInt(s3.replace(/,/g, ""), 10);
+  return Number.isFinite(n) && n >= 1e3 ? n : void 0;
+}
+function parseOverflowWindow(text) {
+  let m2 = text.match(/>\s*(\d[\d,]*)\s*maximum/i);
+  if (m2) return toTokenNumber(m2[1]);
+  m2 = text.match(/maximum context length is (\d[\d,]*)/i) ?? text.match(/maximum context length of (\d[\d,]*)/i) ?? text.match(/maximum context size (?:is|of) (\d[\d,]*)/i) ?? text.match(/(?:maximum|max)\s+(?:context\s+)?length\s+(?:is\s+)?(\d[\d,]*)/i) ?? text.match(/limit of (\d[\d,]*)\s*token/i) ?? text.match(/(\d[\d,]*)\s*maximum\b/i);
+  if (m2) return toTokenNumber(m2[1]);
+  return void 0;
+}
+function inspectContextOverflow(status, bodyText) {
+  const message = (bodyText ?? "").slice(0, 300);
+  if (status !== 400 && status !== 413) return { isOverflow: false, message };
+  if (!bodyText) return { isOverflow: false, message };
+  const isOverflow = CONTEXT_OVERFLOW_PATTERNS.some((p2) => p2.test(bodyText));
+  if (!isOverflow) return { isOverflow: false, message };
+  return { isOverflow: true, window: parseOverflowWindow(bodyText), message };
+}
+function reserveOutputHeadroom(window2, maxOutput) {
+  if (Number.isFinite(window2) && window2 > 0 && Number.isFinite(maxOutput) && maxOutput > 0 && maxOutput < window2) {
+    return window2 - maxOutput;
+  }
+  return window2;
+}
+function shouldReserveOutputHeadroom(protocol) {
+  return protocol !== "anthropic";
+}
 
 // src/stream-openai.ts
 function rewriteOpenaiJsonResponse(body, ctx) {
@@ -50526,8 +50734,10 @@ function extractKey(headers) {
   return "(no-key)";
 }
 function clientConversationHeader(headers) {
-  const names = ["x-claude-code-session-id", "x-session-affinity", "x-acp-session", "x-session-id", "x-opencode-session", "session-id", "session_id"];
+  const pluginMarker = typeof headers["x-bili-plugin"] === "string";
+  const names = ["x-bili-plugin-conversation", "x-claude-code-session-id", "x-session-affinity", "x-acp-session", "x-session-id", "x-opencode-session", "session-id", "session_id"];
   for (const name of names) {
+    if (name === "x-bili-plugin-conversation" && !pluginMarker) continue;
     const v2 = headers[name];
     if (typeof v2 === "string" && v2.trim().length > 0) return v2.trim();
   }
@@ -50542,13 +50752,351 @@ function affinityToken(identity) {
   return identity.clientProvided ? identity.value : void 0;
 }
 
+// src/plugin.ts
+import { fileURLToPath as fileURLToPath2 } from "url";
+import fs2 from "fs";
+import path5 from "path";
+var PLUGIN_AGENT_HEADER = "x-bili-plugin";
+var PLUGIN_CONVERSATION_HEADER = "x-bili-plugin-conversation";
+var PLUGIN_CONTEXT_WINDOW_HEADER = "x-bili-plugin-context-window";
+var PLUGIN_PROTOCOL_VERSION = 1;
+var VERSION = (() => {
+  try {
+    const here = fileURLToPath2(import.meta.url);
+    const pkg = path5.join(path5.dirname(here), "..", "package.json");
+    return JSON.parse(fs2.readFileSync(pkg, "utf8")).version ?? "dev";
+  } catch {
+    return "dev";
+  }
+})();
+function headerValue(headers, name) {
+  const v2 = headers[name];
+  const s3 = typeof v2 === "string" ? v2 : Array.isArray(v2) ? v2[0] : void 0;
+  const t = s3?.trim();
+  return t && t.length > 0 ? t : void 0;
+}
+function pluginAgentHeader(headers) {
+  return headerValue(headers, PLUGIN_AGENT_HEADER);
+}
+function pluginConversationHeader(headers) {
+  return headerValue(headers, PLUGIN_CONVERSATION_HEADER);
+}
+function pluginContextWindowHeader(headers) {
+  const raw = headerValue(headers, PLUGIN_CONTEXT_WINDOW_HEADER);
+  if (raw === void 0) return void 0;
+  const n = Number.parseInt(raw, 10);
+  return Number.isFinite(n) && n > 0 ? n : void 0;
+}
+function pluginReportedContextWindow(headers) {
+  return pluginAgentHeader(headers) !== void 0 ? pluginContextWindowHeader(headers) : void 0;
+}
+var MAX_PLUGIN_CONVERSATIONS = 1024;
+var conversations = /* @__PURE__ */ new Map();
+var remembered = /* @__PURE__ */ new Map();
+function recordPluginSession(conversationId2, sessionId) {
+  conversations.delete(conversationId2);
+  conversations.set(conversationId2, { sessionId, lastSeen: Date.now() });
+  if (conversations.size > MAX_PLUGIN_CONVERSATIONS) {
+    const oldest = conversations.keys().next().value;
+    if (oldest !== void 0) conversations.delete(oldest);
+  }
+}
+function rememberPluginMessages(sessionId, processed, original, nudge) {
+  const staleSessionIds = new Set(
+    [...remembered.keys()].filter((id) => id === sessionId || !peekSession(id))
+  );
+  for (const id of staleSessionIds) remembered.delete(id);
+  remembered.set(sessionId, { processed, original, nudge });
+}
+var MAX_PENDING_REGISTERS = 64;
+var pendingRegisters = [];
+function queuePluginRegister(conversationId2, agent, identity) {
+  if (!identity) {
+    for (let i = 0; i < pendingRegisters.length; i++) {
+      if (pendingRegisters[i].conversationId === conversationId2) {
+        pendingRegisters.splice(i, 1);
+        break;
+      }
+    }
+    pendingRegisters.push({ conversationId: conversationId2, agent, ts: Date.now() });
+    while (pendingRegisters.length > MAX_PENDING_REGISTERS) pendingRegisters.shift();
+  } else {
+    registeredIds.set(conversationId2, agent);
+    while (registeredIds.size > MAX_PENDING_REGISTERS) {
+      const oldest = registeredIds.keys().next().value;
+      if (oldest !== void 0) registeredIds.delete(oldest);
+    }
+  }
+}
+var PENDING_REGISTER_TTL_MS = 10 * 60 * 1e3;
+function takePendingPluginRegister() {
+  const now = Date.now();
+  while (pendingRegisters.length > 0 && now - pendingRegisters[0].ts > PENDING_REGISTER_TTL_MS) {
+    pendingRegisters.shift();
+  }
+  return pendingRegisters.shift();
+}
+var registeredIds = /* @__PURE__ */ new Map();
+function consumePluginRegisterFor(conversationId2) {
+  const agent = registeredIds.get(conversationId2);
+  if (agent !== void 0) registeredIds.delete(conversationId2);
+  return agent;
+}
+function handlePluginRegister(payload, res) {
+  let parsed;
+  try {
+    parsed = JSON.parse(payload);
+  } catch {
+    res.writeHead(400, { "content-type": "application/json" });
+    res.end(JSON.stringify({ ok: false, error: "invalid JSON body" }));
+    return;
+  }
+  const conversationId2 = typeof parsed.conversationId === "string" ? parsed.conversationId.trim() : "";
+  if (!conversationId2) {
+    res.writeHead(400, { "content-type": "application/json" });
+    res.end(JSON.stringify({ ok: false, error: "conversationId is required" }));
+    return;
+  }
+  const agent = typeof parsed.agent === "string" && parsed.agent.trim() ? parsed.agent.trim() : "launcher";
+  queuePluginRegister(conversationId2, agent, parsed.identity === true);
+  res.end(JSON.stringify({ ok: true, conversationId: conversationId2, agent }));
+}
+function handlePluginManifest(res) {
+  res.writeHead(200, { "content-type": "application/json" });
+  res.end(JSON.stringify({
+    ok: true,
+    protocolVersion: PLUGIN_PROTOCOL_VERSION,
+    proxy: "billion-context",
+    version: VERSION,
+    toolNames: [...PROXY_TOOL_NAMES],
+    tools: {
+      anthropic: ACP_TOOLS_ANTHROPIC,
+      openai: ACP_TOOLS_OPENAI,
+      responses: ACP_TOOLS_RESPONSES
+    },
+    headers: { agent: PLUGIN_AGENT_HEADER, conversation: PLUGIN_CONVERSATION_HEADER, contextWindow: PLUGIN_CONTEXT_WINDOW_HEADER },
+    toolEndpoint: "/__bili/plugin/tool",
+    statusEndpoint: "/__bili/plugin/status"
+  }));
+}
+function handlePluginStatus(conversationId2, res) {
+  const entry = conversations.get(conversationId2);
+  const session = entry ? peekSession(entry.sessionId) : void 0;
+  if (!entry || !session) {
+    res.writeHead(404, { "content-type": "application/json" });
+    res.end(JSON.stringify({ ok: false, error: "unknown plugin conversation" }));
+    return;
+  }
+  entry.lastSeen = Date.now();
+  const limit = session.metadata.effectiveContextLimit;
+  res.writeHead(200, { "content-type": "application/json" });
+  res.end(JSON.stringify({
+    ok: true,
+    conversationId: conversationId2,
+    sessionId: session.id,
+    label: session.meta.label ?? null,
+    pluginAgent: session.metadata.pluginAgent ?? null,
+    contextLimit: typeof limit === "number" ? limit : null,
+    contextTokens: session.stats.lastInputTokens,
+    inputTokens: session.stats.inputTokens,
+    outputTokens: session.stats.outputTokens,
+    cachedTokens: session.stats.cachedTokens,
+    requests: session.stats.requests,
+    blocks: session.state.blocks.map((b2) => ({ id: b2.blockId, tier: b2.tier, active: b2.active })),
+    lastSeen: session.lastSeen
+  }));
+}
+async function handlePluginTool(payload, res, deps) {
+  let parsed;
+  try {
+    parsed = JSON.parse(payload);
+  } catch {
+    res.writeHead(400, { "content-type": "application/json" });
+    res.end(JSON.stringify({ ok: false, error: "invalid JSON body" }));
+    return;
+  }
+  const conversationId2 = typeof parsed.conversationId === "string" ? parsed.conversationId.trim() : "";
+  const tool = typeof parsed.tool === "string" ? parsed.tool : "";
+  if (!conversationId2) {
+    res.writeHead(400, { "content-type": "application/json" });
+    res.end(JSON.stringify({ ok: false, error: `conversationId is required (send the same value as the ${PLUGIN_CONVERSATION_HEADER} header)` }));
+    return;
+  }
+  if (!PROXY_TOOL_NAMES.has(tool)) {
+    res.writeHead(400, { "content-type": "application/json" });
+    res.end(JSON.stringify({ ok: false, error: `unknown tool "${tool}" (expected one of: ${[...PROXY_TOOL_NAMES].join(", ")})` }));
+    return;
+  }
+  const entry = conversations.get(conversationId2);
+  const session = entry ? peekSession(entry.sessionId) : void 0;
+  if (!entry || !session) {
+    res.writeHead(404, { "content-type": "application/json" });
+    res.end(JSON.stringify({ ok: false, error: "unknown plugin conversation (no model request has arrived with this conversation id yet)" }));
+    return;
+  }
+  entry.lastSeen = Date.now();
+  const args = parsed.args && typeof parsed.args === "object" ? parsed.args : {};
+  const callId = `plugin_${Date.now().toString(36)}`;
+  acquireInFlight(session);
+  let result;
+  try {
+    result = await withSessionLock(session, async () => {
+      const mem = remembered.get(session.id);
+      const messages = mem ? mem.processed.length > 0 ? mem.processed : mem.original : [];
+      return executeProxyTool(tool, args, {
+        core: deps.core,
+        config: deps.config,
+        messages,
+        session,
+        log: (m2) => deps.log("info", `[${session.id}] [plugin] ${m2}`),
+        nudge: mem?.nudge
+      }, callId);
+    });
+  } catch (err2) {
+    releaseInFlight(session);
+    deps.log("warn", `[${session.id}] [plugin] tool ${tool} threw: ${String(err2)}`);
+    res.writeHead(500, { "content-type": "application/json" });
+    res.end(JSON.stringify({ ok: false, error: String(err2) }));
+    return;
+  }
+  releaseInFlight(session);
+  markDirty(session);
+  deps.log("info", `[${session.id}] [plugin] tool ${tool} executed via plugin (${result.length} chars)`);
+  res.writeHead(200, { "content-type": "application/json" });
+  res.end(JSON.stringify({ ok: true, tool, conversationId: conversationId2, result }));
+}
+function num(v2) {
+  return typeof v2 === "number" && Number.isFinite(v2) ? v2 : void 0;
+}
+function usageFromSseEvent(obj) {
+  const type = obj["type"];
+  if (type === "message_start") {
+    const usage2 = obj["message"]?.["usage"];
+    if (!usage2) return void 0;
+    const input = num(usage2["input_tokens"]);
+    if (input === void 0) return void 0;
+    return { inputTokens: input, cachedTokens: num(usage2["cache_read_input_tokens"]) };
+  }
+  if (type === "message_delta") {
+    const usage2 = obj["usage"];
+    if (!usage2) return void 0;
+    const input = num(usage2["input_tokens"]);
+    return { inputTokens: input && input > 0 ? input : void 0, outputTokens: num(usage2["output_tokens"]) };
+  }
+  if (type === "response.completed") {
+    const usage2 = obj["response"]?.["usage"];
+    if (!usage2) return void 0;
+    return {
+      inputTokens: num(usage2["input_tokens"]),
+      outputTokens: num(usage2["output_tokens"]),
+      cachedTokens: num(usage2["input_tokens_details"]?.["cached_tokens"])
+    };
+  }
+  const usage = obj["usage"];
+  if (usage && (num(usage["prompt_tokens"]) !== void 0 || num(usage["completion_tokens"]) !== void 0)) {
+    return {
+      inputTokens: num(usage["prompt_tokens"]),
+      outputTokens: num(usage["completion_tokens"]),
+      cachedTokens: num(usage["prompt_tokens_details"]?.["cached_tokens"])
+    };
+  }
+  return void 0;
+}
+function applyUsageSample(session, sample, protocol) {
+  const includesCached = protocol === "openai" || protocol === "responses";
+  if (sample.cachedTokens !== void 0) {
+    session.stats.cachedTokens += sample.cachedTokens;
+    session.stats.cacheSamples += 1;
+  }
+  if (sample.inputTokens !== void 0) {
+    const total = sample.inputTokens + (!includesCached && sample.cachedTokens !== void 0 ? sample.cachedTokens : 0);
+    session.stats.inputTokens += total;
+    session.stats.lastInputTokens = total;
+  }
+  if (sample.outputTokens !== void 0) session.stats.outputTokens += sample.outputTokens;
+}
+function mergeUsageSample(acc, sample) {
+  if (sample.inputTokens !== void 0) acc.inputTokens = sample.inputTokens;
+  if (sample.cachedTokens !== void 0) acc.cachedTokens = sample.cachedTokens;
+  if (sample.outputTokens !== void 0) acc.outputTokens = sample.outputTokens;
+}
+async function pipeThroughWithUsage(stream2, res, session, protocol) {
+  const reader = stream2.getReader();
+  const decoder = new TextDecoder("utf-8");
+  let buf = "";
+  const acc = {};
+  try {
+    for (; ; ) {
+      const { done, value } = await reader.read();
+      if (done) break;
+      if (value && value.length > 0) {
+        if (!res.write(Buffer.from(value))) {
+          await new Promise((r) => res.once("drain", () => r()));
+        }
+        buf = normalizeSseLineEndings(buf + decoder.decode(value, { stream: true }));
+        let idx;
+        while ((idx = buf.indexOf("\n\n")) !== -1) {
+          const rawEvent = buf.slice(0, idx);
+          buf = buf.slice(idx + 2);
+          const dataLines = rawEvent.split("\n").filter((l) => l.startsWith("data:"));
+          if (dataLines.length === 0) continue;
+          const jsonStr = dataLines.map((l) => l.slice(5).replace(/^ /, "")).join("\n").trim();
+          if (!jsonStr || jsonStr === "[DONE]") continue;
+          try {
+            const ev = JSON.parse(jsonStr);
+            const sample = usageFromSseEvent(ev);
+            if (sample) mergeUsageSample(acc, sample);
+          } catch {
+          }
+        }
+      }
+      if (res.destroyed || res.writableEnded) break;
+    }
+    if (acc.inputTokens !== void 0 || acc.outputTokens !== void 0 || acc.cachedTokens !== void 0) {
+      applyUsageSample(session, acc, protocol);
+      markDirty(session);
+    }
+  } finally {
+    reader.releaseLock();
+    res.end();
+  }
+}
+async function pipePluginJson(stream2, res, session, protocol) {
+  const reader = stream2.getReader();
+  const chunks = [];
+  for (; ; ) {
+    const { done, value } = await reader.read();
+    if (done) break;
+    if (value && value.length > 0) chunks.push(Buffer.from(value));
+  }
+  reader.releaseLock();
+  const text = Buffer.concat(chunks).toString("utf8");
+  try {
+    const json = JSON.parse(text);
+    const usage = json["usage"];
+    if (usage) {
+      const input = num(usage["prompt_tokens"]) ?? num(usage["input_tokens"]);
+      if (input !== void 0) {
+        applyUsageSample(session, {
+          inputTokens: input,
+          outputTokens: num(usage["completion_tokens"]) ?? num(usage["output_tokens"]),
+          cachedTokens: num(usage["prompt_tokens_details"]?.["cached_tokens"]) ?? num(usage["input_tokens_details"]?.["cached_tokens"]) ?? num(usage["cache_read_input_tokens"])
+        }, protocol);
+        markDirty(session);
+      }
+    }
+  } catch {
+  }
+  res.end(text);
+}
+
 // src/mitm.ts
 import tls3 from "tls";
 
 // src/ca.ts
 var import_node_forge = __toESM(require_lib(), 1);
-import fs2 from "fs";
-import path5 from "path";
+import fs3 from "fs";
+import path6 from "path";
 import tls2 from "tls";
 var ROOT_CERT_FILE = "root-ca.pem";
 var ROOT_KEY_FILE = "root-ca-key.pem";
@@ -50572,7 +51120,7 @@ function collectSystemCaPems(env = process.env) {
   const seen = /* @__PURE__ */ new Set();
   const pushFile = (file) => {
     try {
-      const text = fs2.readFileSync(file, "utf8");
+      const text = fs3.readFileSync(file, "utf8");
       if (!text.includes("BEGIN CERTIFICATE") || seen.has(text)) return false;
       seen.add(text);
       pems.push(text);
@@ -50594,7 +51142,7 @@ function writeCombinedBundle() {
   for (const pem of tls2.rootCertificates) certs.add(pem.trim());
   certs.add(rootCertPem.trim());
   const body = [...certs].map((pem) => pem.endsWith("\n") ? pem : pem + "\n").join("");
-  fs2.writeFileSync(path5.join(caDir(), COMBINED_CA_FILE), body, { mode: 420 });
+  fs3.writeFileSync(path6.join(caDir(), COMBINED_CA_FILE), body, { mode: 420 });
 }
 function generateRootCA() {
   const keys = import_node_forge.default.pki.rsa.generateKeyPair({ bits: 2048 });
@@ -50627,20 +51175,20 @@ function ensureRootCA() {
     return;
   }
   const dir = caDir();
-  fs2.mkdirSync(dir, { recursive: true });
-  const certPath = path5.join(dir, ROOT_CERT_FILE);
-  const keyPath = path5.join(dir, ROOT_KEY_FILE);
-  if (fs2.existsSync(certPath) && fs2.existsSync(keyPath)) {
-    rootCertPem = fs2.readFileSync(certPath, "utf8");
-    rootKeyPem = fs2.readFileSync(keyPath, "utf8");
+  fs3.mkdirSync(dir, { recursive: true });
+  const certPath = path6.join(dir, ROOT_CERT_FILE);
+  const keyPath = path6.join(dir, ROOT_KEY_FILE);
+  if (fs3.existsSync(certPath) && fs3.existsSync(keyPath)) {
+    rootCertPem = fs3.readFileSync(certPath, "utf8");
+    rootKeyPem = fs3.readFileSync(keyPath, "utf8");
     rootCert = import_node_forge.default.pki.certificateFromPem(rootCertPem);
     rootKey = import_node_forge.default.pki.privateKeyFromPem(rootKeyPem);
     writeCombinedBundle();
     return;
   }
   const { cert, key } = generateRootCA();
-  fs2.writeFileSync(certPath, cert, { mode: 420 });
-  fs2.writeFileSync(keyPath, key, { mode: 384 });
+  fs3.writeFileSync(certPath, cert, { mode: 420 });
+  fs3.writeFileSync(keyPath, key, { mode: 384 });
   rootCertPem = cert;
   rootKeyPem = key;
   rootCert = import_node_forge.default.pki.certificateFromPem(cert);
@@ -50687,20 +51235,20 @@ function getSecureContext(host) {
 }
 
 // src/discover.ts
-import fs4 from "fs";
+import fs5 from "fs";
 import os2 from "os";
-import path7 from "path";
+import path8 from "path";
 
 // src/client-config.ts
-import fs3 from "fs";
+import fs4 from "fs";
 import os from "os";
-import path6 from "path";
+import path7 from "path";
 function nonEmpty2(s3) {
   return typeof s3 === "string" && s3.trim().length > 0;
 }
 function readJsonObject(filePath) {
   try {
-    const txt = fs3.readFileSync(filePath, "utf8");
+    const txt = fs4.readFileSync(filePath, "utf8");
     const parsed = JSON.parse(txt);
     return parsed && typeof parsed === "object" && !Array.isArray(parsed) ? parsed : null;
   } catch {
@@ -50709,12 +51257,12 @@ 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 : path6.join(h, ".pi", "agent");
+  return nonEmpty2(env.PI_CODING_AGENT_DIR) ? env.PI_CODING_AGENT_DIR : nonEmpty2(env.PI_HOME) ? env.PI_HOME : path7.join(h, ".pi", "agent");
 }
 function readClaudeSettings(homeDir, cwd) {
   const files = [
-    path6.join(homeDir, ".claude", "settings.json"),
-    path6.join(cwd, ".claude", "settings.json")
+    path7.join(homeDir, ".claude", "settings.json"),
+    path7.join(cwd, ".claude", "settings.json")
   ];
   let anthropicBaseUrl;
   for (const f2 of files) {
@@ -50757,17 +51305,17 @@ function parseCodexToml(text) {
   return result;
 }
 function readCodexConfig(codexHome) {
-  const cfgPath = path6.join(codexHome, "config.toml");
+  const cfgPath = path7.join(codexHome, "config.toml");
   let text;
   try {
-    text = fs3.readFileSync(cfgPath, "utf8");
+    text = fs4.readFileSync(cfgPath, "utf8");
   } catch {
     return { providers: {} };
   }
   return parseCodexToml(text);
 }
 function readPiConfig(piHome) {
-  const cfgPath = path6.join(piHome, "models.json");
+  const cfgPath = path7.join(piHome, "models.json");
   const obj = readJsonObject(cfgPath);
   const providers = {};
   const rawProviders = obj?.providers;
@@ -50798,10 +51346,10 @@ function parseZcodeConfig(obj) {
   return result;
 }
 function readZcodeConfig(zcodeHome) {
-  const cfgPath = path6.join(zcodeHome, "v2", "config.json");
+  const cfgPath = path7.join(zcodeHome, "v2", "config.json");
   let txt;
   try {
-    txt = fs3.readFileSync(cfgPath, "utf8");
+    txt = fs4.readFileSync(cfgPath, "utf8");
   } catch {
     return { providers: {} };
   }
@@ -50817,10 +51365,10 @@ function loadClientConfig(env, cwd) {
   const home = os.homedir();
   const config = {};
   config.claude = readClaudeSettings(home, cwd);
-  const codexHome = nonEmpty2(env.CODEX_HOME) ? env.CODEX_HOME : path6.join(home, ".codex");
+  const codexHome = nonEmpty2(env.CODEX_HOME) ? env.CODEX_HOME : path7.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 : path6.join(home, ".zcode");
+  const zcodeHome = nonEmpty2(env.ZCODE_DATA_BASE_DIR) ? env.ZCODE_DATA_BASE_DIR : path7.join(home, ".zcode");
   config.zcode = readZcodeConfig(zcodeHome);
   return config;
 }
@@ -50863,21 +51411,21 @@ function extractHttpsHosts(config) {
 }
 function configFilePaths(env) {
   const home = os2.homedir();
-  const codexHome = nonEmpty2(env.CODEX_HOME) ? env.CODEX_HOME : path7.join(home, ".codex");
-  const zcodeHome = nonEmpty2(env.ZCODE_DATA_BASE_DIR) ? env.ZCODE_DATA_BASE_DIR : path7.join(home, ".zcode");
+  const codexHome = nonEmpty2(env.CODEX_HOME) ? env.CODEX_HOME : path8.join(home, ".codex");
+  const zcodeHome = nonEmpty2(env.ZCODE_DATA_BASE_DIR) ? env.ZCODE_DATA_BASE_DIR : path8.join(home, ".zcode");
   return [
-    path7.join(home, ".claude", "settings.json"),
-    path7.join(process.cwd(), ".claude", "settings.json"),
-    path7.join(codexHome, "config.toml"),
-    path7.join(resolvePiHome(env), "models.json"),
-    path7.join(zcodeHome, "v2", "config.json")
+    path8.join(home, ".claude", "settings.json"),
+    path8.join(process.cwd(), ".claude", "settings.json"),
+    path8.join(codexHome, "config.toml"),
+    path8.join(resolvePiHome(env), "models.json"),
+    path8.join(zcodeHome, "v2", "config.json")
   ];
 }
 function readMtimes(paths) {
   const mtimes = /* @__PURE__ */ new Map();
   for (const p2 of paths) {
     try {
-      const st2 = fs4.statSync(p2);
+      const st2 = fs5.statSync(p2);
       mtimes.set(p2, st2.mtimeMs);
     } catch {
     }
@@ -50891,21 +51439,21 @@ function mtimesEqual(a, b2) {
   }
   return true;
 }
-var cache2 = null;
+var cache3 = null;
 function discoverMitmDomains(env = process.env) {
   const now = Date.now();
-  if (cache2 && now - cache2.checkedAt < TTL_MS2) {
-    return cache2.domains;
+  if (cache3 && now - cache3.checkedAt < TTL_MS2) {
+    return cache3.domains;
   }
   const paths = configFilePaths(env);
   const mtimes = readMtimes(paths);
-  if (cache2 && mtimesEqual(mtimes, cache2.mtimes)) {
-    cache2.checkedAt = now;
-    return cache2.domains;
+  if (cache3 && mtimesEqual(mtimes, cache3.mtimes)) {
+    cache3.checkedAt = now;
+    return cache3.domains;
   }
   const config = loadClientConfig(env, process.cwd());
   const domains = extractHttpsHosts(config);
-  cache2 = { checkedAt: now, mtimes, domains };
+  cache3 = { checkedAt: now, mtimes, domains };
   return domains;
 }
 
@@ -51841,11 +52389,32 @@ async function startServer(opts) {
       }
     }
   });
+  server.on("upgrade", (req, socket) => {
+    log2("info", `[ws] rejected ${req.method} ${req.url ?? ""} host=${req.headers.host ?? "?"} with 426`);
+    socket.on("error", () => {
+    });
+    const body = JSON.stringify({ error: "WebSocket upgrades are not supported; use HTTP POST" });
+    socket.end(
+      `HTTP/1.1 426 Upgrade Required\r
+Connection: close\r
+Content-Type: application/json\r
+Content-Length: ${Buffer.byteLength(body)}\r
+\r
+` + body
+    );
+  });
   if (opts.mitm.enabled) {
     setupMitm(server, opts.mitm.domains, (msg2) => log2("info", msg2), (host) => resolveProxy(opts.routes, opts.proxy, `https://${host}`, opts.proxyFallback));
   }
   server.listen(opts.port, opts.host, () => {
     const displayHost = opts.host === "0.0.0.0" ? "localhost" : opts.host;
+    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}
+`);
+    } catch {
+    }
     const nOverrides = Object.keys(opts.routes).length;
     log2(
       "info",
@@ -52018,10 +52587,37 @@ async function handle(req, res, opts, core, config, log2) {
     }
     return;
   }
-  if (req.headers.upgrade === "websocket") {
-    res.writeHead(426, { "content-type": "application/json" });
-    res.end(JSON.stringify({ error: "WebSocket upgrades are not supported; use HTTP POST" }));
-    return;
+  if (req.method === "GET" && req.url === "/__bili/plugin/manifest") return handlePluginManifest(res);
+  if (req.method === "GET" && req.url?.startsWith("/__bili/plugin/status")) {
+    const query = req.url.slice(req.url.indexOf("?") + 1);
+    const conversationId2 = new URLSearchParams(query).get("conversationId")?.trim() ?? "";
+    if (!conversationId2) {
+      res.writeHead(400, { "content-type": "application/json" });
+      res.end(JSON.stringify({ ok: false, error: "conversationId query parameter is required" }));
+      return;
+    }
+    return handlePluginStatus(conversationId2, res);
+  }
+  if (req.method === "POST" && req.url === "/__bili/plugin/tool") {
+    try {
+      const body = await readBody(req);
+      return await handlePluginTool(body.toString("utf8"), res, { core, config, log: log2 });
+    } catch (err2) {
+      res.writeHead(err2 instanceof BodyTooLargeError ? 413 : 400, { "content-type": "application/json" });
+      res.end(JSON.stringify({ ok: false, error: String(err2) }));
+      return;
+    }
+  }
+  if (req.method === "POST" && req.url === "/__bili/plugin/register") {
+    try {
+      const body = await readBody(req);
+      handlePluginRegister(body.toString("utf8"), res);
+      return;
+    } catch (err2) {
+      res.writeHead(err2 instanceof BodyTooLargeError ? 413 : 400, { "content-type": "application/json" });
+      res.end(JSON.stringify({ ok: false, error: String(err2) }));
+      return;
+    }
   }
   let bodyBuffer;
   let urlPath;
@@ -52038,7 +52634,7 @@ async function handle(req, res, opts, core, config, log2) {
     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) {
-      const decoded = await decodeRequestBody(headerValue(req, "content-encoding"), bodyBuffer, MAX_REQUEST_BYTES);
+      const decoded = await decodeRequestBody(headerValue2(req, "content-encoding"), bodyBuffer, MAX_REQUEST_BYTES);
       bodyBuffer = decoded.body;
       if (decoded.decoded) delete req.headers["content-encoding"];
     }
@@ -52071,11 +52667,11 @@ async function handle(req, res, opts, core, config, log2) {
       log2("info", `[debug] INCOMING previous_response_id=${hasPrev ? String(p2.previous_response_id).slice(0, 16) : "absent"} input_items=${inLen} instructions=${p2.instructions !== void 0 ? "present" : "absent"}`);
       const rawDir = `${stateDir()}/raw`;
       try {
-        fs5.mkdirSync(rawDir, { recursive: true });
+        fs6.mkdirSync(rawDir, { recursive: true });
       } catch {
       }
       const hdrs = Object.entries(req.headers).filter(([k2]) => !/authorization|x-api-key|cookie/i.test(k2)).map(([k2, v2]) => `${k2}: ${Array.isArray(v2) ? v2.join(",") : v2}`).join("\n");
-      fs5.writeFileSync(`${rawDir}/${Date.now()}-INCOMING.txt`, `${req.method} ${req.url}
+      fs6.writeFileSync(`${rawDir}/${Date.now()}-INCOMING.txt`, `${req.method} ${req.url}
 ${hdrs}
 
 ${bodyBuffer.toString("utf8")}`);
@@ -52088,7 +52684,7 @@ ${bodyBuffer.toString("utf8")}`);
     const model = parsed.model;
     if (model) {
       const embeddedUrl = route?.rewrittenUrl;
-      let native = resolveContextLimit(opts.routes, embeddedUrl, model);
+      let native = pluginReportedContextWindow(req.headers) ?? resolveContextLimit(opts.routes, embeddedUrl, model);
       if (!native && embeddedUrl) {
         const host = (() => {
           try {
@@ -52105,7 +52701,9 @@ ${bodyBuffer.toString("utf8")}`);
   }
   let prepared = null;
   if (!opts.passthrough && protocol && parsed && typeof parsed === "object") {
-    const sessionHeader = headerValue(req, opts.sessionHeader);
+    const sessionHeader = headerValue2(req, opts.sessionHeader);
+    let pluginAgent = pluginAgentHeader(req.headers);
+    let pluginConversation = pluginConversationHeader(req.headers);
     const clientConv = clientConversationHeader(req.headers);
     const convHeader = clientConv ?? sessionHeader;
     const responsesIdentity = protocol === "responses" ? conversationIdentityResponses(parsed, convHeader) : void 0;
@@ -52121,11 +52719,51 @@ ${bodyBuffer.toString("utf8")}`);
     });
     const clientLabel = responsesIdentity?.clientProvided ? responsesIdentity.value : clientConversationHeader(req.headers);
     const session = getSession(sessionId, { protocol, upstreamOrigin, label: clientLabel ?? void 0 });
+    if (!pluginAgent) {
+      const identityAgent = consumePluginRegisterFor(clientConv ?? conversation);
+      if (identityAgent) {
+        pluginAgent = identityAgent;
+        pluginConversation = clientConv ?? conversation;
+      }
+    }
+    if (!pluginAgent && session.stats.requests === 0) {
+      const pending = takePendingPluginRegister();
+      if (pending) {
+        pluginAgent = pending.agent;
+        pluginConversation = pending.conversationId;
+      }
+    }
+    if (!pluginAgent && typeof session.metadata.pluginAgent === "string") pluginAgent = session.metadata.pluginAgent;
+    if (pluginAgent && !pluginConversation) pluginConversation = conversation;
+    if (pluginAgent) {
+      if (session.metadata.pluginAgent !== pluginAgent) session.metadata.pluginAgent = pluginAgent;
+      session.metadata.effectiveContextLimit = reqConfig.modelContextLimit;
+      recordPluginSession(pluginConversation ?? conversation, session.id);
+    }
+    const pluginMode = pluginAgent !== void 0;
+    const reqModel = parsed.model;
+    const learnedMap = session.metadata.learnedContextLimits;
+    const learnedLimit = (reqModel && learnedMap ? learnedMap[reqModel] : void 0) ?? session.metadata.learnedContextLimit;
+    if (learnedLimit && learnedLimit > 0 && learnedLimit < reqConfig.modelContextLimit) {
+      const resolved = reqConfig.modelContextLimit;
+      reqConfig = { ...reqConfig, modelContextLimit: learnedLimit };
+      log2("info", `[${session.id}] self-healed context window: ${resolved} \u2192 ${learnedLimit} (learned from an upstream overflow)`);
+    }
+    if (shouldReserveOutputHeadroom(protocol)) {
+      const p2 = parsed;
+      const rawMax = p2.max_tokens ?? p2.max_completion_tokens ?? p2.max_output_tokens;
+      const maxOutput = typeof rawMax === "number" ? rawMax : 0;
+      const reserved = reserveOutputHeadroom(reqConfig.modelContextLimit, maxOutput);
+      if (reserved !== reqConfig.modelContextLimit) reqConfig = { ...reqConfig, modelContextLimit: reserved };
+    }
     acquireInFlight(session);
     try {
       await withSessionLock(session, async () => {
-        prepared = countTokens ? prepareCountTokens(parsed, core, reqConfig, log2, session) : protocol === "anthropic" ? prepareAnthropic(parsed, req, opts, core, reqConfig, reqPrompts, log2, session) : protocol === "openai" ? prepareOpenai(parsed, req, opts, core, reqConfig, reqPrompts, log2, session) : responsesCompact ? prepareResponsesCompact(bodyBuffer, parsed, session) : prepareResponses(parsed, req, opts, core, reqConfig, reqPrompts, log2, session, responsesIdentity);
+        prepared = countTokens ? prepareCountTokens(parsed, core, reqConfig, log2, session) : protocol === "anthropic" ? prepareAnthropic(parsed, req, opts, core, reqConfig, reqPrompts, log2, session, pluginMode) : protocol === "openai" ? prepareOpenai(parsed, req, opts, core, reqConfig, reqPrompts, log2, session, pluginMode) : responsesCompact ? prepareResponsesCompact(bodyBuffer, parsed, session) : prepareResponses(parsed, req, opts, core, reqConfig, reqPrompts, log2, session, responsesIdentity, pluginMode);
         await forward(req, res, opts, prepared.body, prepared, core, reqConfig, log2, route, affinity);
+        if (pluginMode && prepared) {
+          rememberPluginMessages(sessionId, prepared.processedMessages, prepared.originalMessages, prepared.nudge);
+        }
       });
     } finally {
       releaseInFlight(session);
@@ -52167,10 +52805,11 @@ function diagNudge(turn, sessionId, tokenCount, limit, model) {
   const modelTag = model ? ` model=${model}` : "";
   return `[${sessionId}] nudge ${inject}: usage=${pct2} (${tokenCount}/${limit}), growth=${growth}/${floor} (ref=${ref}, interval=${interval}), pendingT1=${pendingT1}/${interval}${modelTag}, reason="${n.reason.slice(0, 120)}"`;
 }
-function prepareAnthropic(parsed, req, opts, core, config, prompts, log2, session) {
+function prepareAnthropic(parsed, req, opts, core, config, prompts, log2, session, pluginMode) {
   const sessionId = session.id;
   const stream2 = parsed.stream === true;
   ++session.stats.requests;
+  const injectTools = opts.compress.injectTool && !pluginMode;
   let processedMessages = [];
   let originalMessages = [];
   let nudge;
@@ -52196,7 +52835,7 @@ function prepareAnthropic(parsed, req, opts, core, config, prompts, log2, sessio
     reapOrphanBlocks(session, msgs, deactivateBlock);
     rebuiltMessages = coreToAnthropic(processedMessages, cacheControls);
     systemOut = injectSystem(parsed, opts, prompts);
-    if (opts.compress.injectTool) {
+    if (injectTools) {
       toolsOut = injectTool(parsed.tools);
     }
     if (opts.compress.injectNudge && turn.nudge?.shouldInject) {
@@ -52215,9 +52854,9 @@ function prepareAnthropic(parsed, req, opts, core, config, prompts, log2, sessio
   snapshotMessages(session, originalMessages);
   markDirty(session);
   const rebuilt = { ...parsed, messages: rebuiltMessages, system: systemOut, tools: toolsOut };
-  return { body: JSON.stringify(rebuilt), session, processedMessages, originalMessages, anthropicSystem: parsed.system, protocol: "anthropic", stream: stream2, compressInjected: opts.compress.injectTool, nudge, prompts };
+  return { body: JSON.stringify(rebuilt), session, processedMessages, originalMessages, anthropicSystem: parsed.system, protocol: "anthropic", stream: stream2, compressInjected: injectTools, pluginMode, nudge, prompts };
 }
-function prepareOpenai(parsed, req, opts, core, config, prompts, log2, session) {
+function prepareOpenai(parsed, req, opts, core, config, prompts, log2, session, pluginMode) {
   const sessionId = session.id;
   const stream2 = parsed.stream === true;
   ++session.stats.requests;
@@ -52229,6 +52868,7 @@ function prepareOpenai(parsed, req, opts, core, config, prompts, log2, session)
   const maxTokens = typeof parsed.max_tokens === "number" ? parsed.max_tokens : 8192;
   const isTitleGen = maxTokens <= 200;
   const shouldInject = opts.compress.injectTool && !isTitleGen;
+  const injectTools = shouldInject && !pluginMode;
   try {
     const { msgs } = openaiToCore(parsed);
     originalMessages = msgs;
@@ -52249,7 +52889,7 @@ function prepareOpenai(parsed, req, opts, core, config, prompts, log2, session)
     const sysParts = [];
     if (shouldInject) sysParts.push(buildCompressSystemPrompt(prompts));
     rebuiltMessages = injectOpenaiSystem(rebuiltMessages, sysParts);
-    if (shouldInject) {
+    if (injectTools) {
       toolsOut = injectOpenaiTool(parsed.tools);
     }
     if (opts.compress.injectNudge && turn.nudge?.shouldInject && shouldInject) {
@@ -52271,9 +52911,9 @@ function prepareOpenai(parsed, req, opts, core, config, prompts, log2, session)
   }
   snapshotMessages(session, originalMessages);
   markDirty(session);
-  return { body: JSON.stringify(rebuilt), session, processedMessages, originalMessages, protocol: "openai", stream: stream2, compressInjected: shouldInject, nudge, prompts };
+  return { body: JSON.stringify(rebuilt), session, processedMessages, originalMessages, protocol: "openai", stream: stream2, compressInjected: injectTools, pluginMode, nudge, prompts };
 }
-function prepareResponses(parsed, req, opts, core, config, prompts, log2, session, identity) {
+function prepareResponses(parsed, req, opts, core, config, prompts, log2, session, identity, pluginMode) {
   const sessionId = session.id;
   const stream2 = parsed.stream === true;
   ++session.stats.requests;
@@ -52287,6 +52927,7 @@ function prepareResponses(parsed, req, opts, core, config, prompts, log2, sessio
   let rebuiltInput = parsed.input;
   let toolsOut = parsed.tools;
   const shouldInject = opts.compress.injectTool;
+  const injectTools = shouldInject && !pluginMode;
   const responsesTextProtocol = FORCE_TEXT_PROTOCOL || resolveCompressProtocol(opts.routes, session.meta.upstreamOrigin) === "marker";
   try {
     const projection = responsesToCore(parsed);
@@ -52314,7 +52955,7 @@ function prepareResponses(parsed, req, opts, core, config, prompts, log2, sessio
       const prompt = responsesTextProtocol ? buildCompressHybridSystemPrompt(prompts) : buildCompressSystemPrompt(prompts);
       const devContent = [...projection.systemParts, prompt].join("\n\n---\n\n");
       rebuiltInput = injectResponsesDeveloperMessage(rebuiltInput, devContent);
-      if (!process.env.ACP_NO_INJECT_TOOL) {
+      if (!process.env.ACP_NO_INJECT_TOOL && injectTools) {
         toolsOut = responsesTextProtocol ? injectResponsesTool(parsed.tools, ACP_READONLY_TOOLS_RESPONSES) : injectResponsesTool(parsed.tools);
       }
     } else if (projection.systemParts.length > 0) {
@@ -52363,7 +53004,8 @@ function prepareResponses(parsed, req, opts, core, config, prompts, log2, sessio
     responsesProjection,
     protocol: "responses",
     stream: stream2,
-    compressInjected: shouldInject,
+    compressInjected: injectTools,
+    pluginMode,
     responsesTextProtocol,
     nudge,
     prompts
@@ -52494,16 +53136,16 @@ async function forward(req, res, opts, body, prepared, core, config, log2, route
       if (process.env.ACP_DUMP_REQ !== "0") {
         const dumpDir = process.env.ACP_DUMP_DIR || `${stateDir()}/dumps`;
         try {
-          fs5.mkdirSync(dumpDir, { recursive: true });
+          fs6.mkdirSync(dumpDir, { recursive: true });
         } catch {
         }
         const sid = prepared?.session.id ?? "unknown";
         const out = `${dumpDir}/req-${Date.now()}-${sid}.json`;
         try {
           const pretty = JSON.stringify(JSON.parse(body), null, 2);
-          fs5.writeFileSync(out, pretty);
+          fs6.writeFileSync(out, pretty);
         } catch {
-          fs5.writeFileSync(out, body);
+          fs6.writeFileSync(out, body);
         }
         log2("info", `[debug] forwarded body written to ${out}`);
       }
@@ -52538,7 +53180,7 @@ async function forward(req, res, opts, body, prepared, core, config, log2, route
   const rawBase = opts.debug ? (() => {
     try {
       const rawDir = process.env.ACP_RAW_DUMP_DIR || `${stateDir()}/raw`;
-      fs5.mkdirSync(rawDir, { recursive: true });
+      fs6.mkdirSync(rawDir, { recursive: true });
       return `${rawDir}/${Date.now()}-${prepared?.session.id ?? "unknown"}`;
     } catch {
       return "";
@@ -52550,7 +53192,7 @@ async function forward(req, res, opts, body, prepared, core, config, log2, route
       const hdrText = Object.entries(headers).map(([k2, v2]) => `${k2}: ${maskHdr(k2, String(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`;
-      fs5.writeFileSync(reqPath, `${req.method ?? "POST"} ${upstreamUrl}
+      fs6.writeFileSync(reqPath, `${req.method ?? "POST"} ${upstreamUrl}
 ${hdrText}
 
 ${bodyText}`);
@@ -52565,9 +53207,13 @@ ${bodyText}`);
     body: req.method === "GET" || req.method === "HEAD" ? void 0 : body
   };
   if (dispatcher) init.dispatcher = dispatcher;
+  const clientAbort = new AbortController();
+  res.on("close", () => {
+    if (!res.writableEnded) clientAbort.abort();
+  });
   let upstreamResult;
   try {
-    upstreamResult = await fetchWithTimeout(upstreamUrl, init);
+    upstreamResult = await fetchWithTimeout(upstreamUrl, init, void 0, clientAbort.signal);
     recordUpstreamConnection(upstreamUrl, proxyUrl);
   } catch (error) {
     recordUpstreamConnection(upstreamUrl, proxyUrl, error);
@@ -52595,7 +53241,7 @@ ${bodyText}`);
       const maskHdr = (k2, v2) => /key|auth|token/i.test(k2) ? `<masked ${v2.length} chars>` : v2;
       const hdrText = Object.entries(respHeaders).map(([k2, v2]) => `${k2}: ${maskHdr(k2, v2)}`).join("\n");
       const resPath = `${rawBase}-RES.txt`;
-      fs5.writeFileSync(resPath, `${upstream.status}
+      fs6.writeFileSync(resPath, `${upstream.status}
 ${hdrText}
 `);
       log2("info", `[debug] RAW response dump: ${resPath}`);
@@ -52603,8 +53249,53 @@ ${hdrText}
     }
   }
   if (!upstream.ok) {
-    res.writeHead(upstream.status, respHeaders);
-    if (upstream.body) await pipeThrough(upstream.body, res);
+    let errBody = null;
+    if (upstream.body) {
+      try {
+        errBody = await readStreamToBuffer(upstream.body);
+      } catch {
+        errBody = null;
+      }
+    }
+    if (prepared?.session && errBody) {
+      const s3 = prepared.session;
+      const info = inspectContextOverflow(upstream.status, errBody.toString("utf8"));
+      if (info.isOverflow) {
+        let reqModel;
+        try {
+          const rawBody = typeof prepared.body === "string" ? prepared.body : prepared.body.toString("utf8");
+          reqModel = JSON.parse(rawBody).model;
+        } catch {
+          reqModel = void 0;
+        }
+        const learnedMap = s3.metadata.learnedContextLimits ?? {};
+        if (info.window) {
+          const prev = (reqModel ? learnedMap[reqModel] : void 0) ?? s3.metadata.learnedContextLimit;
+          if (reqModel) learnedMap[reqModel] = info.window;
+          else s3.metadata.learnedContextLimit = info.window;
+          s3.metadata.learnedContextLimits = learnedMap;
+          log2("warn", `[${s3.id}] upstream context overflow \u2014 learned real window ${info.window} for ${reqModel ?? "(unknown model)"} (was ${prev ?? "unset"}); arming emergency shrink`);
+        } else {
+          log2("warn", `[${s3.id}] upstream context overflow (window not parseable): ${info.message}`);
+        }
+        const floor = info.window ?? (reqModel ? learnedMap[reqModel] : void 0) ?? s3.metadata.learnedContextLimit ?? s3.metadata.effectiveContextLimit ?? 0;
+        if (floor > 0) s3.stats.lastInputTokens = Math.max(s3.stats.lastInputTokens, floor);
+        markDirty(s3);
+      }
+    }
+    const errSid = prepared?.session.id ?? "unknown";
+    const reqId = upstream.headers.get("x-request-id") ?? upstream.headers.get("request-id");
+    const reqIdText = reqId ? ` request-id=${reqId}` : "";
+    const bodyText = errBody ? new TextDecoder().decode(errBody) : "";
+    let snippet = bodyText.slice(0, 600).replace(/\s+/g, " ").trim();
+    if (bodyText.length > 600) snippet += " \u2026";
+    if (!snippet) snippet = "(no body)";
+    log("warn", `[${errSid}] \u2190 upstream ${upstream.status}${reqIdText}: ${snippet}`);
+    const errHeaders = { ...respHeaders };
+    delete errHeaders["content-length"];
+    delete errHeaders["transfer-encoding"];
+    res.writeHead(upstream.status, errHeaders);
+    res.end(errBody ?? void 0);
     clearUpstreamTimer();
     return;
   }
@@ -52618,6 +53309,15 @@ ${hdrText}
     }
     return;
   }
+  if (prepared?.pluginMode) {
+    if (prepared.stream) {
+      await pipeThroughWithUsage(upstream.body, res, prepared.session, prepared.protocol);
+    } else {
+      await pipePluginJson(upstream.body, res, prepared.session, prepared.protocol);
+    }
+    clearUpstreamTimer();
+    return;
+  }
   const useRewriter = prepared !== null && prepared.compressInjected && prepared.processedMessages.length > 0;
   if (!useRewriter || prepared === null) {
     await pipeThrough(upstream.body, res);
@@ -52650,20 +53350,17 @@ ${hdrText}
       const textProtocol = prepared.protocol === "responses" && !!prepared.responsesTextProtocol;
       const systemPrompt = textProtocol ? buildCompressHybridSystemPrompt(prepared.prompts ?? defaultPrompts) : buildCompressSystemPrompt(prepared.prompts ?? defaultPrompts);
       const adapter = pickAdapter(prepared.protocol, parsedReq, textProtocol, prepared.responsesProjection, prepared.anthropicSystem);
-      const abortCtrl = new AbortController();
-      req.on("close", () => {
-        if (!res.writableEnded) abortCtrl.abort();
-      });
       const loop = runCompressLoop(
         streamToRead,
-        { core, config, messages: prepared.processedMessages.length > 0 ? prepared.processedMessages : prepared.originalMessages, session: prepared.session, log: ctx.log, proxyUrl, textProtocol, debug: opts.debug, nudge: prepared.nudge },
+        { core, config, messages: prepared.processedMessages.length > 0 ? prepared.processedMessages : prepared.originalMessages, session: prepared.session, log: ctx.log, proxyUrl, protocol: prepared.protocol, textProtocol, debug: opts.debug, nudge: prepared.nudge },
         parsedReq,
         { url: upstreamUrl, headers: reqHeaders },
         adapter,
         systemPrompt,
-        abortCtrl.signal
+        clientAbort.signal
       );
       for await (const chunk of loop) {
+        if (res.destroyed || res.writableEnded) break;
         {
           const s3 = chunk.toString("utf8");
           if (s3.includes("<acp ") || s3.includes("</acp")) {
@@ -52703,13 +53400,10 @@ ${hdrText}
           );
         }
         const u2 = json.usage ?? {};
-        const prompt = u2.prompt_tokens ?? u2.input_tokens;
-        if (typeof prompt === "number") {
-          prepared.session.stats.inputTokens += prompt;
-          const promptDetails = u2.prompt_tokens_details;
-          const inputDetails = u2.input_tokens_details;
-          const cached = promptDetails?.cached_tokens ?? inputDetails?.cached_tokens ?? u2.cache_read_input_tokens;
-          prepared.session.stats.lastInputTokens = prompt + (typeof cached === "number" ? cached : 0);
+        const { total, cached } = usageTotals(prepared.protocol, u2);
+        if (typeof total === "number") {
+          prepared.session.stats.inputTokens += total;
+          prepared.session.stats.lastInputTokens = total;
           if (typeof cached === "number") {
             prepared.session.stats.cachedTokens += cached;
             prepared.session.stats.cacheSamples += 1;
@@ -52734,6 +53428,25 @@ ${hdrText}
   }
   markDirty(prepared.session);
 }
+async function readStreamToBuffer(stream2, maxBytes = 1 << 20) {
+  const reader = stream2.getReader();
+  const chunks = [];
+  let kept = 0;
+  try {
+    for (; ; ) {
+      const { done, value } = await reader.read();
+      if (done) break;
+      if (value && kept < maxBytes) {
+        const take = Math.min(value.length, maxBytes - kept);
+        chunks.push(Buffer.from(value.subarray(0, take)));
+        kept += take;
+      }
+    }
+  } finally {
+    reader.releaseLock();
+  }
+  return Buffer.concat(chunks);
+}
 async function pipeThrough(stream2, res) {
   const reader = stream2.getReader();
   try {
@@ -52810,7 +53523,7 @@ function sendStats(res) {
   res.writeHead(200, { "content-type": "application/json" });
   res.end(JSON.stringify({ sessions: sessions2 }, null, 2));
 }
-function headerValue(req, name) {
+function headerValue2(req, name) {
   const lower = name.toLowerCase();
   for (const [k2, v2] of Object.entries(req.headers)) {
     if (k2.toLowerCase() === lower) return Array.isArray(v2) ? v2[0] : v2;
@@ -52856,6 +53569,7 @@ function logMsg(opts, level, msg2) {
 
 // src/update.ts
 import { readFile as readFile2, writeFile as writeFile2, mkdir as mkdir2, access, constants, rm, cp, unlink } from "fs/promises";
+import { execFile } from "child_process";
 import crypto from "crypto";
 
 // node_modules/tar/dist/esm/index.min.js
@@ -54795,7 +55509,7 @@ var hr = /* @__PURE__ */ Symbol("entry");
 var cs = /* @__PURE__ */ Symbol("entryOpt");
 var ui = /* @__PURE__ */ Symbol("writeEntryClass");
 var lr = /* @__PURE__ */ Symbol("write");
-var fs6 = /* @__PURE__ */ Symbol("ondrain");
+var fs7 = /* @__PURE__ */ Symbol("ondrain");
 var wt = class extends A {
   sync = false;
   opt;
@@ -54829,8 +55543,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[fs6]()), this.on("resume", () => e.resume());
-    } else this.on("drain", this[fs6]);
+      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]);
     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) {
@@ -54943,7 +55657,7 @@ var wt = class extends A {
       this.emit("error", e);
     }
   }
-  [fs6]() {
+  [fs7]() {
     this[Et] && this[Et].entry && this[Et].entry.resume();
   }
   [di](t) {
@@ -55828,12 +56542,12 @@ var To = (s3) => {
 };
 
 // src/update.ts
-import path8 from "path";
-import { fileURLToPath as fileURLToPath2 } from "url";
+import path9 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 = path8.join(cacheDir(), ".update-check");
-var LOCK_FILE = path8.join(cacheDir(), ".update-lock");
+var THROTTLE_FILE = path9.join(cacheDir(), ".update-check");
+var LOCK_FILE = path9.join(cacheDir(), ".update-lock");
 var LOCK_MAX_AGE_MS = 30 * 60 * 1e3;
 function shouldStealLock(holderAlive, ageMs) {
   return !holderAlive || ageMs >= LOCK_MAX_AGE_MS;
@@ -55865,32 +56579,101 @@ async function readLastCheck() {
 }
 async function writeLastCheck(ts2) {
   try {
-    await mkdir2(path8.dirname(THROTTLE_FILE), { recursive: true });
+    await mkdir2(path9.dirname(THROTTLE_FILE), { recursive: true });
     await writeFile2(THROTTLE_FILE, String(ts2), "utf-8");
   } catch {
   }
 }
 async function findInstallDir(packageName) {
-  let dir = path8.dirname(fileURLToPath2(import.meta.url));
+  let dir = path9.dirname(fileURLToPath3(import.meta.url));
   for (; ; ) {
     try {
-      const pkg = JSON.parse(await readFile2(path8.join(dir, "package.json"), "utf-8"));
+      const pkg = JSON.parse(await readFile2(path9.join(dir, "package.json"), "utf-8"));
       if (pkg.name === packageName) return dir;
     } catch {
     }
-    const parent = path8.dirname(dir);
+    const parent = path9.dirname(dir);
     if (parent === dir) return void 0;
     dir = parent;
   }
 }
 async function readDiskVersion(installDir) {
   try {
-    const pkg = JSON.parse(await readFile2(path8.join(installDir, "package.json"), "utf-8"));
+    const pkg = JSON.parse(await readFile2(path9.join(installDir, "package.json"), "utf-8"));
     return pkg.version;
   } catch {
     return void 0;
   }
 }
+function declaredEntryRelPaths(pkg) {
+  const entries = /* @__PURE__ */ new Set();
+  if (typeof pkg.main === "string") entries.add(pkg.main);
+  const bin = pkg.bin;
+  if (typeof bin === "string") entries.add(bin);
+  else if (bin && typeof bin === "object") {
+    for (const v2 of Object.values(bin)) {
+      if (typeof v2 === "string") entries.add(v2);
+    }
+  }
+  return [...entries];
+}
+function runNodeCheck(file) {
+  return new Promise((resolve) => {
+    execFile(
+      process.execPath,
+      ["--check", file],
+      { timeout: 15e3, maxBuffer: 4 * 1024 * 1024 },
+      (err2, _stdout, stderr) => {
+        resolve({ code: err2 ? 1 : 0, stderr: String(stderr) });
+      }
+    );
+  });
+}
+async function syntaxCheckEntry(entryAbs) {
+  let source;
+  try {
+    source = await readFile2(entryAbs, "utf-8");
+  } catch (e) {
+    return `entry unreadable: ${String(e)}`;
+  }
+  const tmpCheck = path9.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 (${path9.basename(entryAbs)}): ${r.stderr.split("\n").filter(Boolean).slice(0, 3).join(" | ").slice(0, 300)}`;
+    }
+    return null;
+  } finally {
+    try {
+      await rm(tmpCheck, { force: true });
+    } catch {
+    }
+  }
+}
+async function verifyEntries(dir, label) {
+  let pkg;
+  try {
+    pkg = JSON.parse(await readFile2(path9.join(dir, "package.json"), "utf-8"));
+  } catch (e) {
+    return `${label}: package.json unreadable: ${String(e)}`;
+  }
+  const entries = declaredEntryRelPaths(pkg);
+  if (entries.length === 0) {
+    return `${label}: no declared entry (main/bin)`;
+  }
+  for (const rel of entries) {
+    try {
+      await access(path9.join(dir, rel));
+    } catch {
+      return `${label}: entry missing: ${rel}`;
+    }
+    const reason = await syntaxCheckEntry(path9.join(dir, rel));
+    if (reason) return `${label}: ${reason}`;
+  }
+  return null;
+}
 async function tryAcquireLock() {
   const pid = process.pid;
   const now = Date.now();
@@ -56087,14 +56870,14 @@ async function installViaTarball(version2, tarballUrl, installDir, integrity, sh
   if (!v2.ok) {
     return { ok: false, error: `tarball integrity verification failed: ${v2.error}` };
   }
-  const tmpFile = path8.join(cacheDir(), `.update-${version2}.tgz`);
+  const tmpFile = path9.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 = path8.join(cacheDir(), `.update-staging-${version2}`);
+  const stagingDir = path9.join(cacheDir(), `.update-staging-${version2}`);
   try {
     await rm(stagingDir, { recursive: true, force: true });
     await mkdir2(stagingDir, { recursive: true });
@@ -56107,22 +56890,57 @@ async function installViaTarball(version2, tarballUrl, installDir, integrity, sh
     if (stagingVersion !== version2) {
       return { ok: false, error: `staging verification failed: version is ${stagingVersion ?? "missing"}, expected ${version2}` };
     }
+    const stagingEntryErr = await verifyEntries(stagingDir, "staging verification failed");
+    if (stagingEntryErr) {
+      return { ok: false, error: stagingEntryErr };
+    }
   } catch (e) {
     return { ok: false, error: `extraction failed: ${String(e)}` };
   } finally {
     await rm(tmpFile, { force: true });
   }
+  const backupDir = path9.join(cacheDir(), `.update-backup-${version2}`);
+  try {
+    await rm(backupDir, { recursive: true, force: true });
+    await cp(installDir, backupDir, { recursive: true, force: true });
+  } catch (e) {
+    return { ok: false, error: `backup of current install failed (install left untouched): ${String(e)}` };
+  }
+  const restoreFromBackup = async () => {
+    try {
+      await rm(installDir, { recursive: true, force: true });
+      await cp(backupDir, installDir, { recursive: true, force: true });
+      return null;
+    } catch (e) {
+      return `ROLLBACK FAILED \u2014 restore ${backupDir} to ${installDir} manually: ${String(e)}`;
+    }
+  };
+  let copyError = null;
   try {
     await cp(stagingDir, installDir, { recursive: true, force: true });
   } catch (e) {
-    return { ok: false, error: `failed to copy to install dir: ${String(e)}` };
+    copyError = `failed to copy to install dir: ${String(e)}`;
   } finally {
     await rm(stagingDir, { recursive: true, force: true });
   }
+  if (copyError !== null) {
+    const rb2 = await restoreFromBackup();
+    return { ok: false, error: rb2 ?? copyError };
+  }
   const newVersion = await readDiskVersion(installDir);
   if (newVersion !== version2) {
-    return { ok: false, error: `post-install verification failed: package.json version is ${newVersion ?? "missing"}, expected ${version2}` };
+    const rb2 = await restoreFromBackup();
+    return {
+      ok: false,
+      error: rb2 ?? `post-install verification failed: package.json version is ${newVersion ?? "missing"}, expected ${version2}`
+    };
+  }
+  const postEntryErr = await verifyEntries(installDir, "post-install verification failed");
+  if (postEntryErr) {
+    const rb2 = await restoreFromBackup();
+    return { ok: false, error: rb2 ?? postEntryErr };
   }
+  await rm(backupDir, { recursive: true, force: true });
   return { ok: true };
 }
 function startAutoUpdate(opts) {
@@ -56136,11 +56954,490 @@ function startAutoUpdate(opts) {
   timer.unref?.();
 }
 
+// src/mcp.ts
+import fs8 from "fs";
+import path10 from "path";
+import { fileURLToPath as fileURLToPath4 } from "url";
+var VERSION2 = (() => {
+  try {
+    const here = fileURLToPath4(import.meta.url);
+    const pkg = path10.join(path10.dirname(here), "..", "package.json");
+    return JSON.parse(fs8.readFileSync(pkg, "utf8")).version ?? "dev";
+  } catch {
+    return "dev";
+  }
+})();
+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 {
+  }
+  return DEFAULT_PROXY_ORIGIN;
+}
+var TOOL_TIMEOUT_MS = 6e4;
+var CONVERSATION_FROM_ENV = process.env.CLAUDE_CODE_SESSION_ID?.trim() || process.env.BILI_CONVERSATION_ID?.trim() || void 0;
+var IDENTITY_BINDING = Boolean(process.env.CLAUDE_CODE_SESSION_ID?.trim());
+var manifestTools = [];
+var conversationId = CONVERSATION_FROM_ENV;
+var registered = false;
+var initialized2 = false;
+function send(msg2) {
+  process.stdout.write(JSON.stringify(msg2) + "\n");
+}
+function sendResult(id, result) {
+  if (id === null) return;
+  send({ jsonrpc: "2.0", id, result });
+}
+function sendError2(id, code, message) {
+  if (id === null) return;
+  send({ jsonrpc: "2.0", id, error: { code, message } });
+}
+async function fetchManifest() {
+  const res = await fetch(`${resolveProxyOrigin()}/__bili/plugin/manifest`, { signal: AbortSignal.timeout(5e3) });
+  if (!res.ok) throw new Error(`manifest fetch failed: ${res.status}`);
+  const data = await res.json();
+  const anthropic = data.tools?.anthropic ?? [];
+  manifestTools = anthropic.map((t) => ({ name: t.name, description: t.description, inputSchema: t.input_schema }));
+  if (manifestTools.length === 0) throw new Error("manifest served no anthropic tools");
+}
+var manifestPromise = null;
+function ensureManifest() {
+  manifestPromise ??= fetchManifest().catch((err2) => {
+    manifestPromise = null;
+    throw err2;
+  });
+  return manifestPromise;
+}
+async function forwardTool(tool, args, timeoutMs = TOOL_TIMEOUT_MS) {
+  let res;
+  try {
+    res = await fetch(`${resolveProxyOrigin()}/__bili/plugin/tool`, {
+      method: "POST",
+      headers: { "content-type": "application/json" },
+      body: JSON.stringify({ conversationId, tool, args }),
+      signal: AbortSignal.timeout(timeoutMs)
+    });
+  } catch (err2) {
+    if (err2 instanceof Error && err2.name === "TimeoutError") throw new Error(`tool forward timed out after ${timeoutMs}ms: ${tool}`);
+    throw err2;
+  }
+  const data = await res.json();
+  if (!res.ok || !data.ok) throw new Error(data.error ?? `tool forward failed: ${res.status}`);
+  return data.result ?? "";
+}
+var ERR_TOOL = -32602;
+async function handleMessage(msg2) {
+  const { id = null, method } = msg2;
+  const params = typeof msg2.params === "object" && msg2.params !== null ? msg2.params : {};
+  switch (method) {
+    case "initialize": {
+      const fromMeta = params._meta?.ui?.sessionId?.trim();
+      if (fromMeta) conversationId ??= fromMeta;
+      initialized2 = true;
+      if (conversationId && !registered) {
+        const registerFetch = fetch(`${resolveProxyOrigin()}/__bili/plugin/register`, {
+          method: "POST",
+          headers: { "content-type": "application/json" },
+          body: JSON.stringify({ conversationId, agent: "mcp", identity: IDENTITY_BINDING }),
+          signal: AbortSignal.timeout(5e3)
+        });
+        registered = true;
+        if (IDENTITY_BINDING) {
+          void registerFetch.catch(() => {
+          });
+        } else {
+          await registerFetch.catch(() => {
+          });
+        }
+      }
+      sendResult(id, {
+        protocolVersion: "2025-06-18",
+        serverInfo: { name: "bili", version: VERSION2 },
+        capabilities: { tools: {} }
+      });
+      return;
+    }
+    case "notifications/initialized":
+      return;
+    case "tools/list": {
+      if (!initialized2) {
+        sendError2(id, -32002, "server not initialized");
+        return;
+      }
+      try {
+        await ensureManifest();
+        sendResult(id, { tools: manifestTools });
+      } catch (err2) {
+        sendError2(id, -32003, `bili proxy unreachable at ${resolveProxyOrigin()} (${err2 instanceof Error ? err2.message : String(err2)}) \u2014 start bili or set BILI_MCP_PROXY`);
+      }
+      return;
+    }
+    case "tools/call": {
+      const tool = typeof params.name === "string" ? params.name : "";
+      const args = params.arguments && typeof params.arguments === "object" ? params.arguments : {};
+      if (!tool) {
+        sendError2(id, ERR_TOOL, "params.name is required");
+        return;
+      }
+      if (!conversationId) {
+        sendError2(id, ERR_TOOL, "no conversation id (set BILI_CONVERSATION_ID or connect via Claude Code MCP session meta)");
+        return;
+      }
+      try {
+        const text = await forwardTool(tool, args);
+        sendResult(id, { content: [{ type: "text", text }], isError: false });
+      } catch (err2) {
+        sendResult(id, { content: [{ type: "text", text: `bili tool error: ${err2 instanceof Error ? err2.message : String(err2)}` }], isError: true });
+      }
+      return;
+    }
+    case "ping":
+      sendResult(id, {});
+      return;
+    default:
+      if (method?.startsWith("notifications/")) return;
+      sendError2(id, -32601, `method not found: ${method ?? "(none)"}`);
+  }
+}
+async function mcpMain() {
+  let buf = "";
+  process.stdin.setEncoding("utf8");
+  process.stdin.on("data", (chunk) => {
+    buf += chunk;
+    let nl;
+    while ((nl = buf.indexOf("\n")) >= 0) {
+      const line = buf.slice(0, nl).trim();
+      buf = buf.slice(nl + 1);
+      if (!line) continue;
+      let parsed;
+      try {
+        parsed = JSON.parse(line);
+      } catch {
+        continue;
+      }
+      if (parsed && typeof parsed === "object") {
+        void handleMessage(parsed);
+      }
+    }
+  });
+  process.stdin.on("end", () => process.exit(0));
+}
+function runMcpStdio() {
+  void mcpMain();
+}
+if (process.argv[1] && /(?:^|[\\/])mcp\.(?:ts|js)$/.test(process.argv[1])) {
+  void mcpMain();
+}
+
+// src/plugin-install.ts
+import fs9 from "fs";
+import path11 from "path";
+import os4 from "os";
+import { execFileSync as execFileSync2 } from "child_process";
+import { fileURLToPath as fileURLToPath5 } from "url";
+var PLUGIN_AGENTS = ["pi", "omp", "claude", "codex", "opencode"];
+function selfPackageRoot() {
+  const here = fileURLToPath5(import.meta.url);
+  return path11.resolve(path11.dirname(here), "..");
+}
+function homeFile(rel, envOverride) {
+  const raw = (envOverride !== void 0 ? process.env[envOverride] : void 0)?.trim();
+  const base = raw && raw.length > 0 ? raw : os4.homedir();
+  return path11.join(base, rel);
+}
+function backupOnce(file) {
+  if (fs9.existsSync(file) && !fs9.existsSync(`${file}.bili-bak`)) {
+    fs9.copyFileSync(file, `${file}.bili-bak`);
+  }
+}
+function readJson(file) {
+  let text;
+  try {
+    text = fs9.readFileSync(file, "utf8");
+  } catch (err2) {
+    if (err2.code === "ENOENT") return {};
+    throw err2;
+  }
+  let parsed;
+  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 ${path11.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`);
+  }
+  return parsed;
+}
+function writeJson(file, data) {
+  fs9.mkdirSync(path11.dirname(file), { recursive: true });
+  backupOnce(file);
+  fs9.writeFileSync(file, JSON.stringify(data, null, 2) + "\n");
+}
+function requireDistFile(file) {
+  if (!fs9.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 path11.join(resolvePiHome(process.env), "settings.json");
+}
+function isPiEntry(entry, root) {
+  return entry === root || entry === `npm:billion-context` || /^npm:billion-context@/.test(entry) || /(^|\/)node_modules\/billion-context(\/|$)/.test(entry);
+}
+function piInstall() {
+  const root = selfPackageRoot();
+  const file = piSettingsFile();
+  const settings = readJson(file);
+  const packages = Array.isArray(settings.packages) ? settings.packages.map(String) : [];
+  if (packages.some((p2) => p2 === root)) return `pi: already installed (${file})`;
+  const kept = packages.filter((p2) => !isPiEntry(p2, root));
+  kept.push(root);
+  settings.packages = kept;
+  writeJson(file, settings);
+  return `pi: installed -> ${file} packages += ${root}`;
+}
+function piRemove() {
+  const root = selfPackageRoot();
+  const file = piSettingsFile();
+  const settings = readJson(file);
+  const packages = Array.isArray(settings.packages) ? settings.packages.map(String) : [];
+  const kept = packages.filter((p2) => !isPiEntry(p2, root));
+  if (kept.length === packages.length) return `pi: not installed (${file})`;
+  settings.packages = kept;
+  writeJson(file, settings);
+  return `pi: removed from ${file}`;
+}
+function piStatus() {
+  const root = selfPackageRoot();
+  const packages = readJson(piSettingsFile()).packages;
+  const list = Array.isArray(packages) ? packages.map(String) : [];
+  return list.some((p2) => isPiEntry(p2, root)) ? "installed" : "not installed";
+}
+function ompConfigFile() {
+  const raw = process.env.PI_CODING_AGENT_DIR?.trim();
+  if (raw && raw.length > 0) return path11.join(raw, "config.yml");
+  return path11.join(os4.homedir(), ".omp", "agent", "config.yml");
+}
+function ompExtensionPath() {
+  return path11.join(selfPackageRoot(), "dist", "agent", "omp.js");
+}
+function ompEntryValue(line) {
+  return line.replace(/#.*$/, "").trim().replace(/^-\s*/, "").replace(/^["']|["']$/g, "").trim();
+}
+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})`;
+  backupOnce(file);
+  fs9.writeFileSync(file, cleaned);
+  return `omp: removed from ${file}`;
+}
+function ompInstall() {
+  const file = ompConfigFile();
+  const entry = ompExtensionPath();
+  requireDistFile(entry);
+  fs9.mkdirSync(path11.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})`;
+  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)) {
+    throw new Error(`${file}: \`extensions:\` uses flow style or an inline value; convert it to a block list first, refusing to edit`);
+  }
+  let out;
+  const extMatch = /^extensions:\s*$/m.exec(text);
+  if (extMatch !== null) {
+    const afterKey = text.indexOf("\n", extMatch.index);
+    const rest = afterKey < 0 ? "" : text.slice(afterKey + 1);
+    const firstNonList = rest.search(/^(?!\s*-\s)\S/m);
+    const existingIndent = /^(\s*)-\s\S/m.exec(rest)?.[1] ?? "  ";
+    let head;
+    let tail;
+    if (firstNonList >= 0) {
+      head = text.slice(0, afterKey + 1 + firstNonList);
+      tail = text.slice(afterKey + 1 + firstNonList);
+    } else {
+      head = text.length === 0 || text.endsWith("\n") ? text : text + "\n";
+      tail = "";
+    }
+    out = `${head}${existingIndent}- ${entry}
+${tail}`;
+  } else {
+    out = text.endsWith("\n") || text.length === 0 ? text : text + "\n";
+    out += `extensions:
+  - ${entry}
+`;
+  }
+  const occurrences = out.split("\n").filter((line) => ompEntryValue(line) === 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);
+  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";
+}
+var CLAUDE_EXEC_TIMEOUT_MS = 15e3;
+function claudeMcpJson() {
+  return homeFile(".claude.json", "CLAUDE_CONFIG_DIR");
+}
+function claudeInstall() {
+  const root = selfPackageRoot();
+  const mcpJs = path11.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 });
+    return `claude: installed via \`claude mcp add\` (user scope) -> ${claudeMcpJson()}`;
+  } catch (err2) {
+    const stderr = err2 instanceof Error && "stderr" in err2 ? String(err2.stderr ?? "") : "";
+    throw new Error(`claude: install failed (${stderr.trim() || (err2 instanceof Error ? err2.message : String(err2))}) \u2014 is the claude CLI on PATH?`);
+  }
+}
+function claudeRemove() {
+  if (claudeStatus() === "not installed") return `claude: not installed (${claudeMcpJson()})`;
+  const claude = process.env.CLAUDE?.trim() || "claude";
+  try {
+    execFileSync2(claude, ["mcp", "remove", "bili", "--scope", "user"], { stdio: ["ignore", "pipe", "pipe"], timeout: CLAUDE_EXEC_TIMEOUT_MS });
+    return "claude: removed";
+  } catch (err2) {
+    throw new Error(`claude: remove failed (${err2 instanceof Error ? err2.message : String(err2)})`);
+  }
+}
+function claudeStatus() {
+  const data = readJson(claudeMcpJson());
+  return data.mcpServers && "bili" in data.mcpServers ? "installed" : "not installed";
+}
+function codexToml() {
+  const raw = process.env.CODEX_HOME?.trim();
+  if (raw && raw.length > 0) return path11.join(raw, "config.toml");
+  return homeFile(".codex/config.toml");
+}
+function codexBlock() {
+  return `
+[mcp_servers.bili]
+command = ${JSON.stringify(process.execPath)}
+args = [${JSON.stringify(path11.join(selfPackageRoot(), "dist", "mcp.js"))}]
+env = { BILI_MCP_PROXY = ${JSON.stringify(resolveProxyOrigin())} }
+`;
+}
+function codexInstall() {
+  const file = codexToml();
+  const text = fs9.existsSync(file) ? fs9.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})`;
+    const refreshed = text.slice(0, existing.index) + codexBlock().replace(/^\n/, "") + text.slice(existing.index + block.length);
+    backupOnce(file);
+    fs9.writeFileSync(file, refreshed);
+    return `codex: refreshed proxy origin -> ${file} [mcp_servers.bili]`;
+  }
+  fs9.mkdirSync(path11.dirname(file), { recursive: true });
+  backupOnce(file);
+  fs9.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");
+  const start = (() => {
+    const m2 = /^[ \t]*\[mcp_servers\.bili\][ \t]*$/m.exec(text);
+    return m2 === null ? -1 : m2.index;
+  })();
+  if (start < 0) return `codex: not installed (${file})`;
+  const lineStart = text.lastIndexOf("\n", start - 1) + 1;
+  const after = text.slice(start);
+  const nextTable = after.slice(after.indexOf("\n") + 1).search(/^[ \t]*\[/m);
+  const end = nextTable >= 0 ? start + after.indexOf("\n") + 1 + nextTable : text.length;
+  const cleaned = (text.slice(0, lineStart).replace(/\n+$/, "\n") + text.slice(end)).replace(/^\n+/, "");
+  backupOnce(file);
+  fs9.writeFileSync(file, cleaned);
+  return `codex: removed from ${file}`;
+}
+function codexStatus() {
+  const text = fs9.existsSync(codexToml()) ? fs9.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 path11.join(xdg2, "opencode/opencode.json");
+  return path11.join(os4.homedir(), ".config", "opencode", "opencode.json");
+}
+function opencodeInstall() {
+  const file = opencodeJson();
+  const mcpJs = path11.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 };
+  data.mcp = mcp;
+  writeJson(file, data);
+  return `opencode: installed -> ${file} mcp.bili`;
+}
+function opencodeRemove() {
+  const file = opencodeJson();
+  const data = readJson(file);
+  const mcp = data.mcp;
+  if (!mcp || !("bili" in mcp)) return `opencode: not installed (${file})`;
+  delete mcp.bili;
+  if (Object.keys(mcp).length === 0) delete data.mcp;
+  writeJson(file, data);
+  return `opencode: removed from ${file}`;
+}
+function opencodeStatus() {
+  const mcp = readJson(opencodeJson()).mcp;
+  return mcp && "bili" in mcp ? "installed" : "not installed";
+}
+function isPluginAgent(value) {
+  return PLUGIN_AGENTS.includes(value);
+}
+function pluginInstall(agent) {
+  return agent === "pi" ? piInstall() : agent === "omp" ? ompInstall() : agent === "claude" ? claudeInstall() : agent === "codex" ? codexInstall() : opencodeInstall();
+}
+function pluginRemove(agent) {
+  return agent === "pi" ? piRemove() : agent === "omp" ? ompRemove() : agent === "claude" ? claudeRemove() : agent === "codex" ? codexRemove() : opencodeRemove();
+}
+function pluginStatusAll() {
+  const checks = [
+    ["pi", piStatus],
+    ["omp", ompStatus],
+    ["claude", claudeStatus],
+    ["codex", codexStatus],
+    ["opencode", opencodeStatus]
+  ];
+  return checks.map(([agent, check]) => {
+    try {
+      return { agent, status: check() };
+    } catch (err2) {
+      return { agent, status: `error: ${err2 instanceof Error ? err2.message : String(err2)}` };
+    }
+  });
+}
+
 // src/launcher.ts
-import fs7 from "fs";
+import { randomUUID as randomUUID2 } from "crypto";
+import fs10 from "fs";
 import net2 from "net";
-import os4 from "os";
-import path9 from "path";
+import os5 from "os";
+import path12 from "path";
 import { spawn } from "child_process";
 var LAUNCHER_DEFAULT_HOST = "127.0.0.1";
 var LAUNCHER_DEFAULT_PORT = 8787;
@@ -56184,12 +57481,12 @@ function unwrapUpstream2(url) {
   return idx >= 0 ? url.slice(idx + "/bili/".length) : url;
 }
 function resolveCaCertPath(env) {
-  const base = env.XDG_DATA_HOME || path9.join(os4.homedir(), ".local/share");
-  return path9.join(base, "billion-context", "ca", "root-ca.pem");
+  const base = env.XDG_DATA_HOME || path12.join(os5.homedir(), ".local/share");
+  return path12.join(base, "billion-context", "ca", "root-ca.pem");
 }
 function resolveCombinedCaPath(env) {
-  const base = env.XDG_DATA_HOME || path9.join(os4.homedir(), ".local/share");
-  return path9.join(base, "billion-context", "ca", "combined-ca.pem");
+  const base = env.XDG_DATA_HOME || path12.join(os5.homedir(), ".local/share");
+  return path12.join(base, "billion-context", "ca", "combined-ca.pem");
 }
 function discoverRoutes(client, config) {
   const httpsDomains = [];
@@ -56243,10 +57540,10 @@ function discoverDomains(client, config) {
   return discoverRoutes(client, config).httpsDomains;
 }
 function buildPiEnv(origin, caPath, baseEnv) {
-  return { ...baseEnv, HTTPS_PROXY: origin, NODE_EXTRA_CA_CERTS: caPath };
+  return { ...baseEnv, HTTPS_PROXY: origin, NODE_EXTRA_CA_CERTS: caPath, BILLION_CONTEXT_PROXY: origin };
 }
 function buildCodexEnv(origin, caPath, baseEnv) {
-  return { ...baseEnv, HTTPS_PROXY: origin, SSL_CERT_FILE: caPath };
+  return { ...baseEnv, HTTPS_PROXY: origin, SSL_CERT_FILE: caPath, BILLION_CONTEXT_PROXY: origin };
 }
 function buildCodexArgs(origin, httpRewrites, httpsRewrites, extra) {
   const args = [];
@@ -56260,19 +57557,55 @@ function buildCodexArgs(origin, httpRewrites, httpsRewrites, extra) {
   return args;
 }
 function buildClaudeEnv(origin, caPath, httpRewrites, httpsRewrites, baseEnv) {
-  const env = { ...baseEnv, HTTPS_PROXY: origin, NODE_EXTRA_CA_CERTS: caPath };
+  const env = { ...baseEnv, HTTPS_PROXY: origin, NODE_EXTRA_CA_CERTS: caPath, BILLION_CONTEXT_PROXY: origin };
   const r = httpRewrites.find((rw) => rw.key === "ANTHROPIC_BASE_URL");
   if (r) env.ANTHROPIC_BASE_URL = wrapUpstream(origin, r.realUpstream);
   const hr2 = httpsRewrites.find((rw) => rw.key === "ANTHROPIC_BASE_URL");
   if (hr2) env.ANTHROPIC_BASE_URL = hr2.realUpstream;
   return env;
 }
+function launcherDirectUrl(env) {
+  return env.BILI_LAUNCHER_DIRECT === "1";
+}
+function launcherInjectMcp(env, base) {
+  return base !== "pi" && env.BILI_LAUNCHER_PLUGIN === "1";
+}
+function buildMcpConfig(origin) {
+  const script = process.argv[1] ? path12.resolve(path12.dirname(process.argv[1]), "mcp.js") : "bili-mcp";
+  return {
+    mcpServers: {
+      bili: {
+        command: process.execPath,
+        args: [script],
+        env: { BILI_MCP_PROXY: origin }
+      }
+    }
+  };
+}
+function buildClaudePluginEnv(origin, directUrl, baseEnv) {
+  if (!directUrl) return baseEnv;
+  const upstream = baseEnv.BILI_CLAUDE_UPSTREAM?.trim() || "https://api.anthropic.com";
+  return { ...baseEnv, ANTHROPIC_BASE_URL: wrapUpstream(origin, upstream) };
+}
+function buildCodexMcpArgs(origin, conversationId2) {
+  const script = process.argv[1] ? path12.resolve(path12.dirname(process.argv[1]), "mcp.js") : "bili-mcp";
+  return [
+    "-c",
+    `mcp_servers.bili.command=${JSON.stringify(process.execPath)}`,
+    "-c",
+    `mcp_servers.bili.args=${JSON.stringify([script])}`,
+    "-c",
+    `mcp_servers.bili.env.BILI_MCP_PROXY=${JSON.stringify(origin)}`,
+    "-c",
+    `mcp_servers.bili.env.BILI_CONVERSATION_ID=${JSON.stringify(conversationId2)}`
+  ];
+}
 function preparePiHttpRewrite(piHome, origin, httpRewrites, httpsRewrites) {
   if (httpRewrites.length === 0 && httpsRewrites.length === 0) return void 0;
-  const modelsPath = path9.join(piHome, "models.json");
+  const modelsPath = path12.join(piHome, "models.json");
   let txt;
   try {
-    txt = fs7.readFileSync(modelsPath, "utf8");
+    txt = fs10.readFileSync(modelsPath, "utf8");
   } catch {
     return void 0;
   }
@@ -56303,18 +57636,18 @@ function preparePiHttpRewrite(piHome, origin, httpRewrites, httpsRewrites) {
       }
     }
   }
-  const tmp = fs7.mkdtempSync(path9.join(os4.tmpdir(), "bili-pi-"));
+  const tmp = fs10.mkdtempSync(path12.join(os5.tmpdir(), "bili-pi-"));
   try {
-    for (const entry of fs7.readdirSync(piHome)) {
+    for (const entry of fs10.readdirSync(piHome)) {
       if (entry === "models.json") continue;
       try {
-        fs7.symlinkSync(path9.join(piHome, entry), path9.join(tmp, entry));
+        fs10.symlinkSync(path12.join(piHome, entry), path12.join(tmp, entry));
       } catch {
       }
     }
   } catch {
   }
-  fs7.writeFileSync(path9.join(tmp, "models.json"), JSON.stringify(root));
+  fs10.writeFileSync(path12.join(tmp, "models.json"), JSON.stringify(root));
   return tmp;
 }
 function dedupeInOrder(list) {
@@ -56395,8 +57728,8 @@ async function ensureProxyRunning(opts, deps = {}) {
   const spawnedOrigin = proxyOrigin(opts.host, port);
   const script = process.argv[1];
   if (!script) throw new Error("bili: cannot resolve launcher script path");
-  const logPath2 = path9.join(os4.tmpdir(), `bili-proxy-${port}.log`);
-  const logFd = fs7.openSync(logPath2, "a");
+  const logPath2 = path12.join(os5.tmpdir(), `bili-proxy-${port}.log`);
+  const logFd = fs10.openSync(logPath2, "a");
   let child;
   try {
     child = spawnImpl(
@@ -56413,7 +57746,7 @@ async function ensureProxyRunning(opts, deps = {}) {
     );
   } finally {
     try {
-      fs7.closeSync(logFd);
+      fs10.closeSync(logFd);
     } catch {
     }
   }
@@ -56460,12 +57793,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(path9.delimiter)) {
+  for (const dir of p2.split(path12.delimiter)) {
     if (!dir) continue;
     for (const ext of PATH_EXTS) {
-      const f2 = path9.join(dir, name + ext);
+      const f2 = path12.join(dir, name + ext);
       try {
-        if (fs7.existsSync(f2) && fs7.statSync(f2).isFile()) return f2;
+        if (fs10.existsSync(f2) && fs10.statSync(f2).isFile()) return f2;
       } catch {
       }
     }
@@ -56478,8 +57811,8 @@ function resolveClientCommand(client, env) {
     if (piBin) return { command: piBin, prefixArgs: [] };
     const piResolved = resolveOnPath("pi", env);
     if (piResolved) return { command: piResolved, prefixArgs: [] };
-    const cli = path9.join(
-      os4.homedir(),
+    const cli = path12.join(
+      os5.homedir(),
       ".pi/agent/npm/node_modules/@earendil-works/pi-coding-agent/dist/cli.js"
     );
     return { command: process.execPath, prefixArgs: [cli] };
@@ -56515,15 +57848,47 @@ async function runLaunch(params, deps = {}) {
   let env;
   let clientArgs = params.clientArgs;
   let piTmpHome;
+  const tmpFiles = [];
+  const directUrl = launcherDirectUrl(process.env);
+  if (directUrl) {
+    if (base === "codex") {
+      console.error(
+        "bili: direct-URL mode \u2014 codex's LLM traffic does NOT go through the proxy, so compression is not applied (only the bili MCP tool calls do). For full compression use the default MITM mode (unset BILI_LAUNCHER_DIRECT)."
+      );
+    } else if (base === "claude") {
+      console.error(
+        "bili: direct-URL mode \u2014 claude's ANTHROPIC_BASE_URL is overridden to the proxy; a pre-configured relay is bypassed unless BILI_CLAUDE_UPSTREAM=<relay> is set. OAuth-subscription traffic requires the default MITM mode."
+      );
+    }
+  }
+  const injectMcp = launcherInjectMcp(process.env, base);
+  if (!injectMcp && (base === "claude" || base === "codex")) {
+    console.error("bili: plugin mode off \u2014 set BILI_LAUNCHER_PLUGIN=1 to enable native MCP tools (experimental; verified with claude 2.1.227 / codex 0.147.0).");
+  }
+  const origin = handle2.origin;
   if (base === "pi") {
-    env = buildPiEnv(handle2.origin, ca, process.env);
-    piTmpHome = preparePiHttpRewrite(resolvePiHome(process.env), handle2.origin, routes.httpRewrites, routes.httpsRewrites);
+    env = buildPiEnv(origin, ca, process.env);
+    piTmpHome = preparePiHttpRewrite(resolvePiHome(process.env), origin, routes.httpRewrites, routes.httpsRewrites);
     if (piTmpHome) env.PI_CODING_AGENT_DIR = piTmpHome;
   } else if (base === "codex") {
-    env = buildCodexEnv(handle2.origin, resolveCombinedCaPath(process.env), process.env);
-    clientArgs = buildCodexArgs(handle2.origin, routes.httpRewrites, routes.httpsRewrites, params.clientArgs);
+    const codexConversationId = injectMcp ? randomUUID2() : void 0;
+    if (directUrl) {
+      env = { ...process.env, BILLION_CONTEXT_PROXY: origin };
+      if (codexConversationId) clientArgs = [...buildCodexMcpArgs(origin, codexConversationId), ...clientArgs];
+    } else {
+      env = buildCodexEnv(origin, resolveCombinedCaPath(process.env), process.env);
+      clientArgs = buildCodexArgs(origin, routes.httpRewrites, routes.httpsRewrites, clientArgs);
+      if (injectMcp && codexConversationId) clientArgs = [...buildCodexMcpArgs(origin, codexConversationId), ...clientArgs];
+    }
   } else {
-    env = buildClaudeEnv(handle2.origin, ca, routes.httpRewrites, routes.httpsRewrites, process.env);
+    env = directUrl ? buildClaudePluginEnv(origin, true, process.env) : buildClaudeEnv(origin, ca, routes.httpRewrites, routes.httpsRewrites, process.env);
+    if (directUrl) env.BILLION_CONTEXT_PROXY = origin;
+    if (injectMcp) {
+      const mcpFile = path12.join(os5.tmpdir(), `bili-mcp-${Date.now()}.json`);
+      fs10.writeFileSync(mcpFile, JSON.stringify(buildMcpConfig(origin)));
+      tmpFiles.push(mcpFile);
+      clientArgs = ["--mcp-config", mcpFile, ...clientArgs];
+    }
   }
   const { command, prefixArgs } = resolveClientCommand(base, process.env);
   const effectiveClientArgs = piTestArgs(params.client, clientArgs);
@@ -56539,7 +57904,13 @@ async function runLaunch(params, deps = {}) {
     if (!handle2.reused) stopProxy(handle2);
     if (piTmpHome) {
       try {
-        fs7.rmSync(piTmpHome, { recursive: true, force: true });
+        fs10.rmSync(piTmpHome, { recursive: true, force: true });
+      } catch {
+      }
+    }
+    for (const f2 of tmpFiles) {
+      try {
+        fs10.rmSync(f2, { force: true });
       } catch {
       }
     }
@@ -56565,8 +57936,8 @@ async function runTestPi(params, deps = {}) {
   }
   const ca = resolveCaCertPath(process.env);
   const env = buildPiEnv(handle2.origin, ca, process.env);
-  const sessionDir = path9.join(os4.tmpdir(), `bili-pi-test-${Date.now()}`);
-  fs7.mkdirSync(sessionDir, { recursive: true });
+  const sessionDir = path12.join(os5.tmpdir(), `bili-pi-test-${Date.now()}`);
+  fs10.mkdirSync(sessionDir, { recursive: true });
   const args = [
     "-p",
     "--no-session",
@@ -56594,7 +57965,7 @@ async function runTestPi(params, deps = {}) {
 
 // src/export.ts
 import { mkdirSync as mkdirSync6, writeFileSync as writeFileSync5 } from "fs";
-import path10 from "path";
+import path13 from "path";
 function fmtDate(ms2) {
   return ms2 ? new Date(ms2).toISOString().replace("T", " ").slice(0, 19) + " UTC" : "\u2014";
 }
@@ -56726,7 +58097,7 @@ async function exportSession(selector, opts = {}) {
   }
   const markdown = renderHandoff(matches[0], opts.full ?? false);
   if (opts.output) {
-    mkdirSync6(path10.dirname(path10.resolve(opts.output)), { recursive: true });
+    mkdirSync6(path13.dirname(path13.resolve(opts.output)), { recursive: true });
     writeFileSync5(opts.output, markdown, "utf8");
     return `written to ${opts.output}`;
   }
@@ -56735,12 +58106,12 @@ async function exportSession(selector, opts = {}) {
 
 // src/cli.ts
 import { readFileSync as readFileSync5 } from "fs";
-import { fileURLToPath as fileURLToPath3 } from "url";
-import path11 from "path";
-var VERSION = (() => {
+import { fileURLToPath as fileURLToPath6 } from "url";
+import path14 from "path";
+var VERSION3 = (() => {
   try {
-    const here = fileURLToPath3(import.meta.url);
-    const pkg = path11.join(path11.dirname(here), "..", "package.json");
+    const here = fileURLToPath6(import.meta.url);
+    const pkg = path14.join(path14.dirname(here), "..", "package.json");
     return JSON.parse(readFileSync5(pkg, "utf8")).version ?? "dev";
   } catch {
     return "dev";
@@ -56748,14 +58119,14 @@ var VERSION = (() => {
 })();
 var PACKAGE_NAME = (() => {
   try {
-    const here = fileURLToPath3(import.meta.url);
-    const pkg = path11.join(path11.dirname(here), "..", "package.json");
+    const here = fileURLToPath6(import.meta.url);
+    const pkg = path14.join(path14.dirname(here), "..", "package.json");
     return JSON.parse(readFileSync5(pkg, "utf8")).name ?? "billion-context";
   } catch {
     return "billion-context";
   }
 })();
-var HELP = `bili ${VERSION} \u2014 billion-context proxy
+var HELP = `bili ${VERSION3} \u2014 billion-context proxy
 
 Usage:
   bili [start] [options]           start the proxy (default: reads ${configFile()})
@@ -56767,6 +58138,13 @@ Usage:
   bili export [session] [--full]   list sessions / export one as a Markdown handoff
                                     (--full includes original messages; --output FILE)
   bili update                      check for & install a newer version now
+  bili plugin install <agent>      install the thin plugin into a host (pi/omp/
+                                    claude/codex/opencode; original backed up once)
+  bili plugin remove <agent>       remove it again
+  bili plugin list                 show install status for every host
+  bili mcp                         run the bili MCP server standalone (stdio)
+  bili plugin-register <id>        pre-bind a conversation to the plugin mode
+                                    (--origin URL, --agent name)
   bili --version                   print version
   bili --help                      show this help
 
@@ -56809,8 +58187,11 @@ function parseArgs(argv) {
   let clientArgs = [];
   const mitmDomains = [];
   let exportSelector;
+  let registerConversationId;
   let exportOutput;
   let exportFull = false;
+  let pluginAction;
+  let pluginAgent;
   for (let i = 0; i < argv.length; i++) {
     const a = argv[i];
     if (!client && positional.length === 0 && isLaunchClient(a)) {
@@ -56862,15 +58243,19 @@ function parseArgs(argv) {
       }
       case "--port":
       case "--host":
-      case "--config": {
+      case "--config":
+      case "--origin":
+      case "--agent": {
         const val = argv[++i];
-        if (val === void 0) {
-          console.error(`bili: ${a} requires a value`);
+        if (val === void 0 || val.length === 0) {
+          console.error(`bili: ${a} requires a non-empty value`);
           process.exit(2);
         }
         if (a === "--port") overrides.ACP_PORT = val;
         else if (a === "--host") overrides.ACP_HOST = val;
-        else overrides.BILI_CONFIG_FILE = val;
+        else if (a === "--config") overrides.BILI_CONFIG_FILE = val;
+        else if (a === "--origin") overrides.BILI_MCP_PROXY = val;
+        else overrides.BILI_PLUGIN_AGENT = val;
         break;
       }
       default:
@@ -56898,6 +58283,32 @@ function parseArgs(argv) {
     } else if (cmd === "export") {
       command = "export";
       exportSelector = positional[1];
+    } else if (cmd === "plugin-register") {
+      command = "plugin-register";
+      registerConversationId = positional[1];
+    } else if (cmd === "mcp") {
+      command = "mcp";
+    } else if (cmd === "plugin") {
+      command = "plugin";
+      const action = positional[1];
+      if (action === "install" || action === "remove" || action === "list") {
+        pluginAction = action;
+      } else {
+        console.error(`bili plugin: unknown action "${action ?? ""}" (try "bili plugin install|remove|list <agent>")`);
+        process.exit(2);
+      }
+      const agent = positional[2];
+      if (agent !== void 0) {
+        if (!isPluginAgent(agent)) {
+          console.error(`bili plugin: unknown agent "${agent}" (try one of: ${PLUGIN_AGENTS.join(", ")})`);
+          process.exit(2);
+        }
+        pluginAgent = agent;
+      }
+      if (pluginAction !== "list" && pluginAgent === void 0) {
+        console.error(`bili plugin ${pluginAction}: agent is required (try one of: ${PLUGIN_AGENTS.join(", ")})`);
+        process.exit(2);
+      }
     } else if (cmd === "test") {
       const target = positional[1];
       if (target && isLaunchClient(target)) {
@@ -56912,18 +58323,72 @@ function parseArgs(argv) {
       process.exit(2);
     }
   }
-  return { command, client, clientArgs, mitmDomains, overrides, exportSelector, exportOutput, exportFull };
+  return { command, client, clientArgs, mitmDomains, overrides, exportSelector, exportOutput, exportFull, registerConversationId, pluginAction, pluginAgent };
 }
 async function main() {
-  const { command, client, clientArgs, mitmDomains, overrides, exportSelector, exportOutput, exportFull } = parseArgs(process.argv.slice(2));
+  const { command, client, clientArgs, mitmDomains, overrides, exportSelector, exportOutput, exportFull, registerConversationId, pluginAction, pluginAgent } = parseArgs(process.argv.slice(2));
   if (command === "help") {
     process.stdout.write(HELP);
     return;
   }
   if (command === "version") {
-    process.stdout.write(VERSION + "\n");
+    process.stdout.write(VERSION3 + "\n");
+    return;
+  }
+  if (command === "plugin-register") {
+    const conversationId2 = registerConversationId?.trim();
+    if (!conversationId2) {
+      console.error('bili plugin-register: conversation id is required (e.g. bili plugin-register "$CLAUDE_SESSION_ID" --origin http://127.0.0.1:8787 --agent claude)');
+      process.exit(2);
+    }
+    const agent = (overrides.BILI_PLUGIN_AGENT ?? process.env.BILI_PLUGIN_AGENT ?? "claude").trim() || "claude";
+    const origin = (overrides.BILI_MCP_PROXY ?? process.env.BILI_MCP_PROXY ?? "http://127.0.0.1:8787").replace(/\/$/, "");
+    try {
+      const res = await fetch(`${origin}/__bili/plugin/register`, {
+        method: "POST",
+        headers: { "content-type": "application/json" },
+        body: JSON.stringify({ conversationId: conversationId2, agent, identity: true }),
+        signal: AbortSignal.timeout(5e3)
+      });
+      const data = await res.json();
+      if (!res.ok || !data.ok) throw new Error(data.error ?? `HTTP ${res.status}`);
+    } catch (error) {
+      console.error(`bili plugin-register: ${error instanceof Error ? error.message : String(error)}`);
+      process.exit(1);
+    }
     return;
   }
+  if (command === "mcp") {
+    runMcpStdio();
+    return;
+  }
+  if (command === "plugin") {
+    if (overrides.BILI_MCP_PROXY !== void 0) process.env.BILI_MCP_PROXY = overrides.BILI_MCP_PROXY;
+    if (pluginAction === "list") {
+      for (const row of pluginStatusAll()) {
+        console.log(`${row.agent.padEnd(10)} ${row.status}`);
+      }
+      return;
+    }
+    if (pluginAction === "install") {
+      try {
+        console.log(pluginInstall(pluginAgent));
+      } catch (error) {
+        console.error(`bili plugin: ${error instanceof Error ? error.message : String(error)}`);
+        process.exit(1);
+      }
+      return;
+    }
+    if (pluginAction === "remove") {
+      try {
+        console.log(pluginRemove(pluginAgent));
+      } catch (error) {
+        console.error(`bili plugin: ${error instanceof Error ? error.message : String(error)}`);
+        process.exit(1);
+      }
+      return;
+    }
+  }
   if (command === "export") {
     try {
       const text = await exportSession(exportSelector, { output: exportOutput, full: exportFull });
@@ -56935,7 +58400,7 @@ async function main() {
     return;
   }
   if (command === "update") {
-    await checkForUpdate({ packageName: PACKAGE_NAME, currentVersion: VERSION, autoUpdate: true }, true);
+    await checkForUpdate({ packageName: PACKAGE_NAME, currentVersion: VERSION3, autoUpdate: true }, true);
     return;
   }
   if (command === "test") {
@@ -56957,7 +58422,7 @@ async function main() {
   const opts = loadOptions();
   await startServer(opts);
   if (opts.autoUpdate) {
-    startAutoUpdate({ packageName: PACKAGE_NAME, currentVersion: VERSION, autoUpdate: true });
+    startAutoUpdate({ packageName: PACKAGE_NAME, currentVersion: VERSION3, autoUpdate: true });
   }
 }