billion-context 0.1.89-pr.612.430 → 0.1.89-pr.613.432

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

@@ -57645,6 +57645,7 @@ var LAUNCHER_MODEL_WINDOWS = parseLauncherModelWindows(process.env.BILI_LAUNCHER
 function launcherContextWindow(model) {
   return LAUNCHER_MODEL_WINDOWS[model];
 }
+var windowSourceLogged = /* @__PURE__ */ new Set();
 function anthropicBetaContextWindow(headers) {
   const raw = headers["anthropic-beta"];
   if (raw === void 0) return void 0;
@@ -58253,6 +58254,13 @@ ${bodyBuffer.toString("utf8")}`);
         if (native) nativeFromFallback = false;
       }
       reqConfig = resolveRequestConfig(config, opts.routes, embeddedUrl, model, native, opts.compress);
+      {
+        if (!windowSourceLogged.has(model)) {
+          windowSourceLogged.add(model);
+          const wsSource = betaWindow ? "anthropic-beta" : pluginWindow ? "plugin" : launcherWindow ? "launcher" : configuredWindow ? "configured" : peekWindow ? "registry-peek" : native ? "table-or-registry" : "default";
+          log2("info", `[window] model=${model} source=${wsSource} native=${native ?? "none"} effective=${reqConfig.modelContextLimit} launcher=${launcherWindow ?? "none"} configured=${configuredWindow ?? "none"} peek=${peekWindow ?? "none"} fallback=${nativeFromFallback}`);
+        }
+      }
       const aligned = operatorWindowTuned ? { limit: reqConfig.modelContextLimit, clamped: false } : codexAlignedWindow(reqConfig.modelContextLimit, model, req.headers);
       if (aligned.clamped) {
         const before = reqConfig.modelContextLimit;
@@ -63185,6 +63193,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;
@@ -63207,9 +63221,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`);
@@ -63245,7 +63261,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 {
@@ -63282,7 +63298,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)" };
   }
@@ -63297,7 +63313,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}` };
     }
@@ -63426,11 +63445,22 @@ var VERSION2 = (() => {
   }
 })();
 var DEFAULT_PROXY_ORIGIN = "http://127.0.0.1:8787";
+var warnedStaleRecord = false;
 function resolveProxyOrigin() {
   const fromEnv = process.env.BILI_MCP_PROXY?.trim();
   if (fromEnv && fromEnv.length > 0) return fromEnv;
   const discovered = readProxyInstanceFile();
-  if (discovered && /^https?:\/\/\S+$/.test(discovered.origin)) return discovered.origin;
+  if (discovered && /^https?:\/\/\S+$/.test(discovered.origin)) {
+    if (isProxyInstanceFile(discovered) && discovered.pid > 0 && !isPidAlive(discovered.pid)) {
+      if (!warnedStaleRecord) {
+        warnedStaleRecord = true;
+        process.stderr.write(`[bili-mcp] recorded bili proxy (${discovered.origin}, pid ${discovered.pid}) is not running \u2014 falling back to ${DEFAULT_PROXY_ORIGIN}; set BILI_MCP_PROXY if your proxy listens elsewhere
+`);
+      }
+      return DEFAULT_PROXY_ORIGIN;
+    }
+    return discovered.origin;
+  }
   return DEFAULT_PROXY_ORIGIN;
 }
 var TOOL_TIMEOUT_MS = 6e4;
@@ -64910,8 +64940,16 @@ async function ensureProxyRunning(opts, deps = {}) {
     child.unref?.();
   } catch {
   }
+  let childExit;
+  child.on?.("exit", (...rest) => {
+    childExit = {
+      code: typeof rest[0] === "number" ? rest[0] : null,
+      signal: typeof rest[1] === "string" ? rest[1] : null
+    };
+  });
   const deadline = now() + SPAWN_WAIT_MS;
   while (now() < deadline) {
+    if (childExit) break;
     await sleepImpl(HEALTH_POLL_INTERVAL_MS);
     const inst = readInstance();
     if (isProxyInstanceFile(inst) && inst.launchToken === launchToken) {
@@ -64925,6 +64963,10 @@ async function ensureProxyRunning(opts, deps = {}) {
       return { origin: proxyOrigin(opts.host, port), port, child, logPath: logPath2 };
     }
   }
+  if (childExit) {
+    const detail = childExit.code !== null ? `code ${childExit.code}` : childExit.signal ? `signal ${childExit.signal}` : "unknown reason";
+    throw new Error(`bili: proxy child exited before becoming healthy (${detail}) (log: ${logPath2})`);
+  }
   throw new Error(`bili: proxy did not become healthy within ${SPAWN_WAIT_MS}ms (log: ${logPath2})`);
 }
 function stopProxy(handle2) {
@@ -65708,7 +65750,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") {
@@ -65730,7 +65785,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)
+    });
   }
 }