billion-context 0.1.90 → 0.1.91-pr.618.439

package/README.md

@@ -344,6 +344,9 @@ Rules:
 - Both outbound paths are covered: `/bili/` path-mode (fetch) AND MITM CONNECT
   tunnels (the proxy's connection to the real upstream goes through the HTTP
   CONNECT proxy).
+- The auto-updater's own egress (npm registry check + tarball download) uses
+  the same decision for its hosts, so `bili update` and auto-update work on
+  hosts where npm is only reachable through the proxy (#609).
 
 Env override: `BILI_UPSTREAM_PROXY=http://127.0.0.1:20172` (higher priority than
 the config file). On Windows, common Clash/Mihomo static system proxies are

package/dist/index.js

@@ -48218,13 +48218,17 @@ function parseCompressSettings(v2) {
     }
     out[key] = typeof obj[key] === "string" ? obj[key].trim() : obj[key];
   }
-  for (const key of ["nudgeGrowthTokens", "preserveRecentMessages", "preserveRecentTokens", "minCompressRange", "minCompressRangeChars"]) {
+  for (const key of ["nudgeGrowthTokens", "preserveRecentMessages", "preserveRecentTokens", "minCompressRange", "minCompressRangeChars", "stripImagesKeepRecent"]) {
     takeNumber(key);
   }
   if ("tiers" in obj) {
     if (typeof obj.tiers !== "boolean") ok = false;
     else out.tiers = obj.tiers;
   }
+  if ("stripImages" in obj) {
+    if (typeof obj.stripImages !== "boolean") ok = false;
+    else out.stripImages = obj.stripImages;
+  }
   for (const key of ["injectTool", "injectNudge"]) {
     if (key in obj) {
       if (typeof obj[key] !== "boolean") ok = false;
@@ -48295,7 +48299,9 @@ function mergeCompress(global2, provider, model) {
     minCompressRangeChars: rangeOf(model) ?? rangeOf(provider) ?? rangeOf(global2),
     tiers: pick("tiers"),
     prompts: promptLevels.length > 0 ? Object.assign({}, ...promptLevels) : void 0,
-    acknowledgePromptsRisk: pick("acknowledgePromptsRisk")
+    acknowledgePromptsRisk: pick("acknowledgePromptsRisk"),
+    stripImages: pick("stripImages"),
+    stripImagesKeepRecent: pick("stripImagesKeepRecent")
   };
 }
 function resolveCompress(routes, upstreamUrl, model, global2) {
@@ -48363,6 +48369,69 @@ function resolveRequestConfig(base, routes, embeddedUrl, model, native, globalCo
   return applyCompressSettings(base, limit, compress);
 }
 
+// src/strip-images.ts
+var DEFAULT_STRIP_IMAGES_KEEP_RECENT = 5;
+var IMAGE_PLACEHOLDER = "[image]";
+function isObj(v2) {
+  return typeof v2 === "object" && v2 !== null;
+}
+function isImagePart(protocol, part) {
+  if (!isObj(part)) return false;
+  if (protocol === "responses") return part.type === "input_image";
+  if (protocol === "openai") return part.type === "image_url";
+  return part.type === "image";
+}
+function placeholderContent(protocol) {
+  const type = protocol === "responses" ? "input_text" : "text";
+  return [{ type, text: IMAGE_PLACEHOLDER }];
+}
+function stripHistoricalImages(body, protocol, keepRecent) {
+  if (!protocol || !isObj(body)) return { body, removed: 0 };
+  const recentCount = Math.max(0, Math.floor(keepRecent));
+  if (protocol === "responses") {
+    const input = body.input;
+    if (!Array.isArray(input)) return { body, removed: 0 };
+    const cutoff2 = input.length - recentCount;
+    let removed2 = 0;
+    let touched2 = false;
+    const nextInput = input.map((item, i) => {
+      if (i < cutoff2 && isObj(item) && Array.isArray(item.content)) {
+        const content = item.content;
+        const imgs = content.filter((p2) => isImagePart("responses", p2)).length;
+        if (imgs > 0) {
+          removed2 += imgs;
+          touched2 = true;
+          const kept = content.filter((p2) => !isImagePart("responses", p2));
+          return { ...item, content: kept.length > 0 ? kept : placeholderContent("responses") };
+        }
+      }
+      return item;
+    });
+    if (!touched2) return { body, removed: 0 };
+    return { body: { ...body, input: nextInput }, removed: removed2 };
+  }
+  const messages = body.messages;
+  if (!Array.isArray(messages)) return { body, removed: 0 };
+  const cutoff = messages.length - recentCount;
+  let removed = 0;
+  let touched = false;
+  const nextMessages = messages.map((m2, i) => {
+    if (i < cutoff && isObj(m2) && Array.isArray(m2.content)) {
+      const content = m2.content;
+      const imgs = content.filter((p2) => isImagePart(protocol, p2)).length;
+      if (imgs > 0) {
+        removed += imgs;
+        touched = true;
+        const kept = content.filter((p2) => !isImagePart(protocol, p2));
+        return { ...m2, content: kept.length > 0 ? kept : placeholderContent(protocol) };
+      }
+    }
+    return m2;
+  });
+  if (!touched) return { body, removed: 0 };
+  return { body: { ...body, messages: nextMessages }, removed };
+}
+
 // src/registry.ts
 import { readFile, writeFile, mkdir } from "fs/promises";
 import { existsSync as existsSync2, statSync as statSync2 } from "fs";
@@ -51551,24 +51620,24 @@ function costForUrl(url) {
   }
   return applyCap(REMOTE_IMAGE_TOKENS);
 }
-function isObj(v2) {
+function isObj2(v2) {
   return typeof v2 === "object" && v2 !== null;
 }
 function urlOf(v2) {
   if (typeof v2 === "string") return v2;
-  if (isObj(v2) && typeof v2.url === "string") return v2.url;
+  if (isObj2(v2) && typeof v2.url === "string") return v2.url;
   return void 0;
 }
 function imageTokensInParsedBody(protocol, body) {
-  if (!isObj(body)) return 0;
+  if (!isObj2(body)) return 0;
   let total = 0;
   if (protocol === "responses") {
     const input = body.input;
     if (!Array.isArray(input)) return 0;
     for (const item of input) {
-      if (!isObj(item) || !Array.isArray(item.content)) continue;
+      if (!isObj2(item) || !Array.isArray(item.content)) continue;
       for (const part of item.content) {
-        if (!isObj(part) || part.type !== "input_image") continue;
+        if (!isObj2(part) || part.type !== "input_image") continue;
         const url = urlOf(part.image_url);
         if (url) total += costForUrl(url);
       }
@@ -51578,9 +51647,9 @@ function imageTokensInParsedBody(protocol, body) {
   const messages = body.messages;
   if (!Array.isArray(messages)) return 0;
   for (const m2 of messages) {
-    if (!isObj(m2) || !Array.isArray(m2.content)) continue;
+    if (!isObj2(m2) || !Array.isArray(m2.content)) continue;
     for (const part of m2.content) {
-      if (!isObj(part)) continue;
+      if (!isObj2(part)) continue;
       if (protocol === "openai") {
         if (part.type !== "image_url") continue;
         const url = urlOf(part.image_url);
@@ -51588,8 +51657,8 @@ function imageTokensInParsedBody(protocol, body) {
       } else {
         if (part.type !== "image") continue;
         const src = part.source;
-        if (isObj(src) && src.type === "base64" && typeof src.data === "string") total += applyCap(Math.ceil(src.data.length / 4));
-        else if (isObj(src) && src.type === "url" && typeof src.url === "string") total += costForUrl(src.url);
+        if (isObj2(src) && src.type === "base64" && typeof src.data === "string") total += applyCap(Math.ceil(src.data.length / 4));
+        else if (isObj2(src) && src.type === "url" && typeof src.url === "string") total += costForUrl(src.url);
       }
     }
   }
@@ -51829,7 +51898,7 @@ function renderPage(origin, version2) {
 <div class="card"><div class="card-head"><h2>ZCode\uFF08\u7F16\u7A0B\u5957\u9910\uFF09</h2><span class="badge">MITM</span><button class="btn small copy-btn" data-copy="${caPathEsc}">\u590D\u5236 CA \u8DEF\u5F84</button></div><dl class="kv"><dt>\u65B9\u5F0F</dt><dd>MITM \u900F\u660E\u4EE3\u7406</dd><dt>\u8BBE\u7F6E</dt><dd>Settings \u2192 Network \u2192 HTTP Proxy = <span class="mono">${origin}</span></dd><dt>CA \u8BC1\u4E66</dt><dd class="mono">${caPathEsc}${caReady ? "" : "\uFF08\u5C1A\u672A\u751F\u6210\uFF0C\u542F\u52A8\u4EE3\u7406\u540E\u81EA\u52A8\u521B\u5EFA\uFF09"}</dd></dl><p class="hint">CA \u8DEF\u5F84\u662F\u672C\u673A bili \u5B9E\u9645\u751F\u6210\u7684\u7EDD\u5BF9\u8DEF\u5F84\uFF0C\u70B9"\u590D\u5236 CA \u8DEF\u5F84"\u540E\u76F4\u63A5\u7C98\u8D34\u8FDB ZCode\u3002\u26A0\uFE0F Windows \u4E0A ZCode \u4E0D\u4F1A\u5C55\u5F00 <span class="mono">~</span>\uFF0C\u8BF7\u52FF\u624B\u586B <span class="mono">~/\u2026</span> \u5F62\u5F0F\u7684\u8DEF\u5F84\u3002</p></div></section>
 <section id="page-upstream" class="page"><h1>\u4E0A\u6E38\u7F51\u7EDC</h1><p class="lead">\u63A7\u5236 bili \u5982\u4F55\u8BBF\u95EE\u771F\u5B9E Provider\uFF0C\u4E0D\u4F1A\u6539\u53D8\u5BA2\u6237\u7AEF\u7684\u672C\u5730\u8DEF\u7531\u5730\u5740\u3002</p><div class="card"><div class="card-head"><h2>\u5168\u5C40\u4EE3\u7406</h2></div><div class="modes"><label><input type="radio" name="proxy-mode" value="direct" checked>\u76F4\u8FDE\uFF08\u9ED8\u8BA4\uFF09</label><label><input type="radio" name="proxy-mode" value="manual">\u624B\u52A8\u4EE3\u7406</label><label><input type="radio" name="proxy-mode" value="auto">\u81EA\u52A8\uFF08\u8DDF\u968F\u7CFB\u7EDF\uFF09</label></div><div class="field"><label>HTTP / HTTPS Proxy</label><input id="proxy-url" class="mono" placeholder="http://127.0.0.1:7897"></div><dl class="kv"><dt>\u5F53\u524D\u6765\u6E90</dt><dd id="upstream-source">\u76F4\u8FDE</dd><dt>\u6709\u6548\u4EE3\u7406</dt><dd id="upstream-effective" class="mono">direct</dd><dt>\u7CFB\u7EDF PAC</dt><dd id="upstream-pac" class="mono">\u2014</dd><dt>\u72B6\u6001</dt><dd id="upstream-state" class="status">\u5C1A\u672A\u6D4B\u8BD5</dd></dl><div class="actions"><button id="save-upstream" class="btn primary">\u4FDD\u5B58\u5E76\u70ED\u66F4\u65B0</button><button id="test-upstream" class="btn">\u6D4B\u8BD5\u8FDE\u63A5</button></div></div><div class="card"><div class="card-head"><h2>\u6309 URL \u8986\u76D6</h2></div><p class="status">\u4E3A\u7279\u5B9A Provider \u5355\u72EC\u8BBE\u7F6E\u4E0A\u6E38\u4EE3\u7406\uFF0C\u8986\u76D6\u5168\u5C40\u8BBE\u7F6E\u3002\u7559\u7A7A = \u7EE7\u627F\u5168\u5C40\u3002</p><div id="upstream-overrides" class="status">\u52A0\u8F7D\u4E2D</div><div class="actions"><button id="save-overrides" class="btn primary">\u4FDD\u5B58\u8986\u76D6\u5E76\u70ED\u66F4\u65B0</button></div></div></section>
 <section id="page-sessions" class="page"><div class="card-head"><div><h1>\u4F1A\u8BDD</h1><p class="lead">ACP \u538B\u7F29\u72B6\u6001\u4E0E\u4E0A\u6E38\u7528\u91CF\u3002</p></div><button id="refresh-sessions" class="btn">\u5237\u65B0</button></div><div class="card"><table><thead><tr><th>\u6807\u9898</th><th>\u534F\u8BAE</th><th>\u6807\u8BC6</th><th>\u8BF7\u6C42</th><th>\u4E0A\u4E0B\u6587</th><th>\u6700\u540E\u6D3B\u52A8</th></tr></thead><tbody id="sessions-body"></tbody></table></div></section>
-<section id="page-settings" class="page"><h1>\u9AD8\u7EA7\u8BBE\u7F6E</h1><p class="lead">\u76F4\u63A5\u7F16\u8F91 providers JSON\uFF08\u6DFB\u52A0\u65B0 Provider\u3001\u914D\u7F6E\u6A21\u578B\u4E0A\u4E0B\u6587\u7A97\u53E3\u3001\u6309 URL \u4EE3\u7406\u7B49\uFF09\uFF1B\u4FDD\u5B58\u540E\u7ACB\u5373\u70ED\u66F4\u65B0\u3002</p><div class="card"><div class="field"><label>providers JSON</label><textarea id="providers-json">{}</textarea></div><div class="actions"><button id="save-providers" class="btn primary">\u4FDD\u5B58\u5E76\u5E94\u7528</button></div></div><div class="card"><div class="card-head"><h2>\u538B\u7F29\u53C2\u6570\uFF08\u5168\u5C40\uFF09</h2></div><p class="status">\u5168\u5C40 compress \u914D\u7F6E\uFF08modelContextLimit / maxContextLimit / emergencyThresholdPercent / nudgeGrowthTokens / preserveRecentMessages / preserveRecentTokens / minCompressRangeChars\uFF08\u5355\u4F4D\uFF1A\u5B57\u7B26\uFF0C\u65E7\u540D minCompressRange \u517C\u5BB9\uFF09 / tiers / injectTool / injectNudge\uFF09\u3002\u4FDD\u5B58\u540E\u70ED\u66F4\u65B0\uFF0C\u65E0\u9700\u91CD\u542F\u3002\u7F6E\u7A7A = \u6062\u590D\u9ED8\u8BA4\u3002</p><div class="field"><label>compress JSON</label><textarea id="compress-json" placeholder='{"modelContextLimit": 200000}'></textarea></div><div class="actions"><button id="save-compress" class="btn primary">\u4FDD\u5B58\u5E76\u70ED\u66F4\u65B0</button></div></div></section></main></div><div id="toast" class="toast"></div><script>${WEB_CLIENT}</script></body></html>`;
+<section id="page-settings" class="page"><h1>\u9AD8\u7EA7\u8BBE\u7F6E</h1><p class="lead">\u76F4\u63A5\u7F16\u8F91 providers JSON\uFF08\u6DFB\u52A0\u65B0 Provider\u3001\u914D\u7F6E\u6A21\u578B\u4E0A\u4E0B\u6587\u7A97\u53E3\u3001\u6309 URL \u4EE3\u7406\u7B49\uFF09\uFF1B\u4FDD\u5B58\u540E\u7ACB\u5373\u70ED\u66F4\u65B0\u3002</p><div class="card"><div class="field"><label>providers JSON</label><textarea id="providers-json">{}</textarea></div><div class="actions"><button id="save-providers" class="btn primary">\u4FDD\u5B58\u5E76\u5E94\u7528</button></div></div><div class="card"><div class="card-head"><h2>\u538B\u7F29\u53C2\u6570\uFF08\u5168\u5C40\uFF09</h2></div><p class="status">\u5168\u5C40 compress \u914D\u7F6E\uFF08modelContextLimit / maxContextLimit / emergencyThresholdPercent / nudgeGrowthTokens / preserveRecentMessages / preserveRecentTokens / minCompressRangeChars\uFF08\u5355\u4F4D\uFF1A\u5B57\u7B26\uFF0C\u65E7\u540D minCompressRange \u517C\u5BB9\uFF09 / stripImages / stripImagesKeepRecent\uFF08\u5386\u53F2\u56FE\u50CF\u5265\u79BB\uFF0C\u9ED8\u8BA4\u5173\uFF09 / tiers / injectTool / injectNudge\uFF09\u3002\u4FDD\u5B58\u540E\u70ED\u66F4\u65B0\uFF0C\u65E0\u9700\u91CD\u542F\u3002\u7F6E\u7A7A = \u6062\u590D\u9ED8\u8BA4\u3002</p><div class="field"><label>compress JSON</label><textarea id="compress-json" placeholder='{"modelContextLimit": 200000}'></textarea></div><div class="actions"><button id="save-compress" class="btn primary">\u4FDD\u5B58\u5E76\u70ED\u66F4\u65B0</button></div></div></section></main></div><div id="toast" class="toast"></div><script>${WEB_CLIENT}</script></body></html>`;
 }
 
 // src/web/api.ts
@@ -58533,7 +58602,16 @@ ${bodyBuffer.toString("utf8")}`);
     acquireInFlight(session);
     try {
       await withSessionLock(session, async () => {
-        const runPrepare = () => 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, nativeWindow) : responsesCompact ? prepareResponsesCompact(bodyBuffer, parsed, session, req, core, reqConfig, log2) : prepareResponses(parsed, req, opts, core, reqConfig, reqPrompts, log2, session, responsesIdentity, pluginMode, upstreamOrigin, nativeWindow);
+        const runPrepare = () => {
+          const cs2 = resolveCompress(opts.routes, route?.rewrittenUrl, parsed.model, opts.compress);
+          const keepRecent = cs2.stripImagesKeepRecent ?? DEFAULT_STRIP_IMAGES_KEEP_RECENT;
+          const stripped = cs2.stripImages ? stripHistoricalImages(parsed, protocol, keepRecent) : { body: parsed, removed: 0 };
+          if (opts.debug && stripped.removed > 0) {
+            log2("info", `[debug] strip-images: dropped ${stripped.removed} historical image part(s), kept last ${keepRecent} (session=${session.id})`);
+          }
+          const work = stripped.body;
+          return countTokens ? prepareCountTokens(work, core, reqConfig, log2, session) : protocol === "anthropic" ? prepareAnthropic(work, req, opts, core, reqConfig, reqPrompts, log2, session, pluginMode) : protocol === "openai" ? prepareOpenai(work, req, opts, core, reqConfig, reqPrompts, log2, session, pluginMode, nativeWindow) : responsesCompact ? prepareResponsesCompact(stripped.removed > 0 ? Buffer.from(JSON.stringify(work)) : bodyBuffer, work, session, req, core, reqConfig, log2) : prepareResponses(work, req, opts, core, reqConfig, reqPrompts, log2, session, responsesIdentity, pluginMode, upstreamOrigin, nativeWindow);
+        };
         const isCodexCompactTrigger = protocol === "responses" && !responsesCompact && isCodexClient(req.headers) && hasCompactionTrigger(parsed.input);
         if (isCodexCompactTrigger) {
           const mode = codexCompactMode();
@@ -63303,6 +63381,12 @@ async function tryAcquireLock() {
     }
   };
 }
+function egressDispatcher(opts, url) {
+  return proxyDispatcher(opts.resolveProxy?.(url));
+}
+function fetchWithEgress(url, init) {
+  return fetch(url, init);
+}
 async function checkForUpdate(opts, force = false) {
   if (!opts.autoUpdate && !force) return;
   if (inFlight) return;
@@ -63325,9 +63409,11 @@ async function checkForUpdate(opts, force = false) {
     }
     log("info", `[update] checking npm registry for ${opts.packageName}${sinceLastSec < 0 ? " (startup check)" : sinceLastSec === 0 ? "" : ` (last check ${sinceLastSec}s ago)`}\u2026`);
     const url = `${REGISTRY_BASE}/${opts.packageName}/latest`;
-    const res = await fetch(url, {
+    const registryDispatcher = egressDispatcher(opts, url);
+    const res = await fetchWithEgress(url, {
       signal: AbortSignal.timeout(5e3),
-      headers: { Accept: "application/json" }
+      headers: { Accept: "application/json" },
+      ...registryDispatcher ? { dispatcher: registryDispatcher } : {}
     });
     if (!res.ok) {
       log("warn", `[update] registry returned ${res.status} ${res.statusText}, skipping`);
@@ -63363,7 +63449,7 @@ async function checkForUpdate(opts, force = false) {
       return;
     }
     try {
-      const result = await installViaTarball(latest, tarballUrl, installDir, integrity, shasum);
+      const result = await installViaTarball(latest, tarballUrl, installDir, integrity, shasum, egressDispatcher(opts, tarballUrl));
       if (result.ok) {
         log("info", `[update] installed ${currentVersion} \u2192 ${latest}. Restart to finish.`);
       } else {
@@ -63400,7 +63486,7 @@ function verifyTarballIntegrity(buf, integrity, shasum) {
   }
   return { ok: false, error: "no integrity or shasum from registry" };
 }
-async function installViaTarball(version2, tarballUrl, installDir, integrity, shasum) {
+async function installViaTarball(version2, tarballUrl, installDir, integrity, shasum, dispatcher) {
   if (!installDir) {
     return { ok: false, error: "cannot determine install directory (package.json not found walking up from running binary)" };
   }
@@ -63415,7 +63501,10 @@ async function installViaTarball(version2, tarballUrl, installDir, integrity, sh
   const MAX_TARBALL_BYTES = 100 * 1024 * 1024;
   let tgzBuffer;
   try {
-    const tgzRes = await fetch(tarballUrl, { signal: AbortSignal.timeout(6e4) });
+    const tgzRes = await fetchWithEgress(tarballUrl, {
+      signal: AbortSignal.timeout(6e4),
+      ...dispatcher ? { dispatcher } : {}
+    });
     if (!tgzRes.ok) {
       return { ok: false, error: `tarball download failed: HTTP ${tgzRes.status} ${tgzRes.statusText}` };
     }
@@ -65849,7 +65938,20 @@ async function main() {
     return;
   }
   if (command === "update") {
-    await checkForUpdate({ packageName: PACKAGE_NAME, currentVersion: VERSION3, autoUpdate: true }, true);
+    for (const [k2, v2] of Object.entries(overrides)) {
+      if (v2 !== void 0) process.env[k2] = v2;
+    }
+    let updaterResolveProxy;
+    try {
+      const o = loadOptions();
+      updaterResolveProxy = (url) => resolveProxy(o.routes, o.proxy, url, o.proxyFallback);
+    } catch (e) {
+      console.error(`bili update: config load failed (${String(e)}); updater egress goes direct`);
+    }
+    await checkForUpdate(
+      { packageName: PACKAGE_NAME, currentVersion: VERSION3, autoUpdate: true, resolveProxy: updaterResolveProxy },
+      true
+    );
     return;
   }
   if (command === "test") {
@@ -65871,7 +65973,12 @@ async function main() {
   const opts = loadOptions();
   await startServer(opts);
   if (opts.autoUpdate) {
-    startAutoUpdate({ packageName: PACKAGE_NAME, currentVersion: VERSION3, autoUpdate: true });
+    startAutoUpdate({
+      packageName: PACKAGE_NAME,
+      currentVersion: VERSION3,
+      autoUpdate: true,
+      resolveProxy: (url) => resolveProxy(opts.routes, opts.proxy, url, opts.proxyFallback)
+    });
   }
 }