billion-context 0.1.63 → 0.1.64-pr.358.209

package/dist/index.js

@@ -47708,8 +47708,9 @@ function loadOptions(env = process.env) {
   const webProxy = nonEmpty(fileConfig.upstreamProxy);
   const configProxy = nonEmpty(fileConfig.proxy);
   const rawProxyMode = env.BILI_UPSTREAM_PROXY_MODE ?? fileConfig.upstreamProxyMode ?? (webProxy ? "manual" : void 0);
-  const proxyMode = parseUpstreamProxyMode(rawProxyMode);
-  const explicitDirect = proxyMode === "direct" && rawProxyMode === "direct";
+  const effectiveMode = rawProxyMode ?? "direct";
+  const proxyMode = parseUpstreamProxyMode(effectiveMode);
+  const explicitDirect = proxyMode === "direct" && !biliProxy;
   const proxy = biliProxy ?? (proxyMode === "direct" ? "" : proxyMode === "manual" ? webProxy ?? configProxy : configProxy);
   const proxySource = biliProxy ? "bili-env" : proxyMode === "direct" ? "direct" : proxyMode === "manual" && webProxy ? "web-manual" : configProxy ? "config" : "auto";
   const httpProxy = nonEmpty(env.HTTP_PROXY ?? env.http_proxy);
@@ -56445,6 +56446,20 @@ function injectResponsesTool(tools, toolsToAdd = ACP_TOOLS_RESPONSES) {
   const additions = toolsToAdd.filter((t) => !present.has(t.name));
   return [...tools, ...additions];
 }
+var loggedUpstreamProxyDecisions = /* @__PURE__ */ new Set();
+function logUpstreamProxyDecision(opts, upstreamUrl, decision) {
+  if (!upstreamUrl) return;
+  let host = upstreamUrl;
+  try {
+    host = new URL(upstreamUrl).host;
+  } catch {
+  }
+  const key = `${host}|${decision.proxy ?? ""}|${decision.source}`;
+  if (loggedUpstreamProxyDecisions.has(key)) return;
+  loggedUpstreamProxyDecisions.add(key);
+  const via = decision.proxy ? `via ${maskUrlForLog(decision.proxy)}` : "direct";
+  logMsg(opts, "info", `[upstream-proxy] ${maskHostPortForLog(host)} ${via} (source=${decision.source})`);
+}
 function buildForwardTarget(req, opts, route, affinity, hopMarker) {
   const reqUrl = req.url ?? "";
   const isAbsoluteUrl = /^https?:\/\//i.test(reqUrl);
@@ -56468,8 +56483,9 @@ function buildForwardTarget(req, opts, route, affinity, hopMarker) {
   if (affinity && !clientConversationHeader(req.headers)) {
     headers["x-session-id"] = affinity;
   }
-  const proxyUrl = resolveProxy(opts.routes, opts.proxy, route?.rewrittenUrl ?? upstreamUrl, opts.proxyFallback);
-  return { upstreamUrl, headers, proxyUrl };
+  const decision = resolveProxyDecision(opts.routes, opts.proxy, route?.rewrittenUrl ?? upstreamUrl, opts.proxyFallback);
+  logUpstreamProxyDecision(opts, upstreamUrl, decision);
+  return { upstreamUrl, headers, proxyUrl: decision.proxy };
 }
 function isPreflightFailFast(outcome) {
   return "failFast" in outcome;
@@ -62263,6 +62279,8 @@ Launcher (bili pi / bili codex / bili claude / bili omp / bili opencode / bili h
   auto-whitelisted for MITM so the proxy TLS-terminates exactly the hosts the
   client uses; HTTP / localhost providers go direct. pi/claude trust the CA
   via NODE_EXTRA_CA_CERTS, codex via SSL_CERT_FILE. Proxy killed on client exit.
+  bili flags (-F, --mitm-domain, --port, ...) must precede the client name;
+  everything after the client name is passed through to the client.
     bili pi                               # launch pi through the proxy
     bili pi -- print "hi"                 # args after the client are passed through
     bili pi-test                          # pi through the proxy with extensions off (proxy owns compression)
@@ -62272,9 +62290,12 @@ Launcher (bili pi / bili codex / bili claude / bili omp / bili opencode / bili h
     bili hermes                           # launch hermes-agent through the proxy (/bili/ rewrite of ~/.hermes/config.yaml)
     bili dsh --profile web "task"         # launch deepseek-harness through the proxy (/bili/ rewrite of ~/.dsh/settings.yaml)
     bili test pi                          # quick end-to-end check of the pi path
-    bili pi --mitm-domain api.foo.com     # add a domain to the MITM whitelist
+    bili --mitm-domain api.foo.com pi     # add a domain to the MITM whitelist (flags precede the client)
+    bili -F http://127.0.0.1:7897 codex   # route bili's upstream through a proxy (gost-style -F)
 
 Options (override config file / env):
+  -F <url>                         upstream proxy to forward through (gost-style;
+                                   http://host:port; must precede the client name)
   --port <N>                       listen port (default 8787)
   --host <ADDR>                    listen host (default 127.0.0.1)
   --mitm-domain <domain>           extra MITM domain (repeatable; launcher only)
@@ -62353,6 +62374,7 @@ function parseArgs(argv) {
         exportOutput = val;
         break;
       }
+      case "-F":
       case "--port":
       case "--host":
       case "--config":
@@ -62369,6 +62391,7 @@ function parseArgs(argv) {
         else if (a === "--config") overrides.BILI_CONFIG_FILE = val;
         else if (a === "--origin") overrides.BILI_MCP_PROXY = val;
         else if (a === "--bin") process.env.BILI_CLIENT_BIN = val;
+        else if (a === "-F") overrides.BILI_UPSTREAM_PROXY = val;
         else overrides.BILI_PLUGIN_AGENT = val;
         break;
       }