billion-context 0.1.60-pr.306.164 → 0.1.60

package/dist/index.js

@@ -47852,7 +47852,6 @@ function rejectLegacyRoute(key, value) {
 // src/server.ts
 import http from "http";
 import fs6 from "fs";
-import { randomUUID as randomUUID2 } from "crypto";
 
 // src/compress-settings.ts
 function resolveContextLimitValue(raw, nativeLimit) {
@@ -50228,21 +50227,16 @@ TASK: The conversation segment below (messages ${startRef}\u2013${endRef}) must
     clearTimer();
   }
 }
-var ABORTED_FAILURE = { kind: "aborted", detail: "the client disconnected during preflight compression" };
 async function preflightCompress(deps, messages) {
   const limit = deps.config.modelContextLimit;
-  const result = { compressedRanges: 0, savedTokens: 0, payloadEstimate: estimateCoreMessages(messages) };
+  const result = { compressedRanges: 0, savedTokens: 0 };
   if (limit <= 0) return result;
   const budget = Math.max(MIN_CHUNK_TOKENS, Math.floor(limit * CHUNK_FRACTION));
   const minChars = deps.config.compress.minCompressRange;
   let currentTokens = deps.session.stats.lastInputTokens;
   let startTokens = -1;
-  let failure;
   for (let round = 0; round < MAX_PREFLIGHT_ROUNDS; round++) {
-    if (deps.signal?.aborted) {
-      failure = ABORTED_FAILURE;
-      break;
-    }
+    if (deps.signal?.aborted) break;
     const turn = deps.core.processTurn({
       messages,
       state: deps.session.state,
@@ -50252,29 +50246,19 @@ async function preflightCompress(deps, messages) {
     });
     deps.session.state = turn.state;
     currentTokens = Math.max(deps.session.stats.lastInputTokens, estimateCoreMessages(turn.messages));
-    result.payloadEstimate = estimateCoreMessages(turn.messages);
     if (startTokens < 0) startTokens = currentTokens;
     if (currentTokens < limit) break;
     const ranges = viableRanges(turn.nudge?.compressibleRanges ?? []);
-    if (ranges.length === 0) {
-      failure = { kind: "exhausted", detail: "no compressible ranges remain in the conversation" };
-      break;
-    }
+    if (ranges.length === 0) break;
     const range = [...ranges].sort((a, b2) => refNum2(a.startRef) - refNum2(b2.startRef))[0];
     const { refToIdx } = refMaps(messages, deps.session.state);
     const startIdx = refToIdx.get(range.startRef);
     const endIdx = refToIdx.get(range.endRef);
-    if (startIdx === void 0 || endIdx === void 0 || startIdx > endIdx) {
-      failure = { kind: "exhausted", detail: "the compressible range no longer resolves to payload messages" };
-      break;
-    }
+    if (startIdx === void 0 || endIdx === void 0 || startIdx > endIdx) break;
     let appliedThisRound = 0;
     for (const [cs2, ce2] of splitChunks(messages, startIdx, endIdx, budget)) {
       if (currentTokens < limit) break;
-      if (deps.signal?.aborted) {
-        failure = ABORTED_FAILURE;
-        break;
-      }
+      if (deps.signal?.aborted) break;
       const maps = refMaps(messages, deps.session.state);
       const startRef = maps.idxToRef.get(cs2);
       const endRef = maps.idxToRef.get(ce2);
@@ -50287,17 +50271,8 @@ async function preflightCompress(deps, messages) {
         summary = await summarizeRange(deps, content, startRef, endRef);
       } catch (err2) {
         if (err2 instanceof UpstreamHttpError) {
-          failure = {
-            kind: "upstream",
-            status: err2.status,
-            detail: err2.status === 429 ? `the summarization call was rate-limited by the upstream (HTTP 429)` : `the summarization call was rejected by the upstream (HTTP ${err2.status})`
-          };
           deps.log("warn", `[preflight] summarization failed: HTTP ${err2.status} ${err2.body.slice(0, 200)}`);
-        } else if (deps.signal?.aborted) {
-          failure = ABORTED_FAILURE;
-          deps.log("warn", `[preflight] summarization aborted: client disconnected`);
         } else {
-          failure = { kind: "upstream", detail: `the summarization call failed: ${String(err2)}` };
           deps.log("warn", `[preflight] summarization failed: ${String(err2)}`);
         }
         break;
@@ -50322,19 +50297,10 @@ async function preflightCompress(deps, messages) {
       appliedThisRound += 1;
       result.compressedRanges += 1;
     }
-    if (appliedThisRound === 0) {
-      if (!failure) {
-        failure = { kind: "exhausted", detail: "no range could be compressed (chunks below minCompressRange or the summarization responses were unusable)" };
-      }
-      break;
-    }
-  }
-  if (!failure && currentTokens >= limit) {
-    failure = { kind: "exhausted", detail: `the compress budget was exhausted after ${MAX_PREFLIGHT_ROUNDS} rounds` };
+    if (appliedThisRound === 0) break;
   }
   if (result.compressedRanges > 0) deps.session.stats.lastInputTokens = currentTokens;
   result.savedTokens = Math.max(0, startTokens - currentTokens);
-  if (currentTokens >= limit) result.failure = failure;
   return result;
 }
 
@@ -52180,15 +52146,8 @@ ${systemPrompt}` : systemPrompt;
         } else if (type === "message_delta") {
           const u2 = data.usage ?? {};
           if (typeof u2.output_tokens === "number") roundOutput = u2.output_tokens;
-          const input = typeof u2.input_tokens === "number" ? u2.input_tokens : void 0;
-          const cached = typeof u2.cache_read_input_tokens === "number" ? u2.cache_read_input_tokens : void 0;
-          if (input !== void 0 && input > 0 && cached !== void 0) {
-            roundInput = input;
-            roundCached = cached;
-          } else {
-            if (input !== void 0 && input > 0) roundInput = input;
-            if (cached !== void 0 && cached > 0) roundCached = cached;
-          }
+          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) {
@@ -54875,7 +54834,6 @@ async function decodeRequestBody(contentEncoding, input, maxOutputBytes) {
 function bodyDumpEnabled() {
   return process.env.ACP_DUMP_BODY === "1";
 }
-var BILI_HOP_HEADER = "x-bili-hop";
 function parseLauncherModelWindows(raw) {
   if (!raw) return {};
   try {
@@ -54894,21 +54852,6 @@ var LAUNCHER_MODEL_WINDOWS = parseLauncherModelWindows(process.env.BILI_LAUNCHER
 function launcherContextWindow(model) {
   return LAUNCHER_MODEL_WINDOWS[model];
 }
-function anthropicBetaContextWindow(headers) {
-  const raw = headers["anthropic-beta"];
-  if (raw === void 0) return void 0;
-  const list = Array.isArray(raw) ? raw.join(",") : raw;
-  let best;
-  for (const part of list.split(",")) {
-    const m2 = /^context-(\d+)m\b/.exec(part.trim().toLowerCase());
-    if (!m2) continue;
-    const n = Number.parseInt(m2[1], 10);
-    if (!Number.isFinite(n) || n <= 0) continue;
-    const w2 = n * 1e6;
-    if (best === void 0 || w2 > best) best = w2;
-  }
-  return best;
-}
 function safeSessionId(id) {
   return (id ?? "unknown").replace(/[^a-zA-Z0-9._-]/g, "_");
 }
@@ -54986,7 +54929,6 @@ async function startServer(opts) {
   const core = createCore();
   const config = opts.kernelConfig;
   const log2 = (level, msg) => logMsg(opts, level, msg);
-  const instanceId = randomUUID2();
   await initSessions();
   loadConversations();
   log2("info", `[persist] ${getStore().enabled ? "enabled" : "disabled"}`);
@@ -54996,7 +54938,7 @@ async function startServer(opts) {
   void loadRegistry();
   const server = http.createServer(async (req, res) => {
     try {
-      await handle(req, res, opts, core, config, log2, instanceId);
+      await handle(req, res, opts, core, config, log2);
     } catch (err2) {
       const msg = String(err2);
       log2("error", msg);
@@ -55121,7 +55063,7 @@ function adminTrustedHosts(bindHost, port) {
   }
   return set;
 }
-async function handle(req, res, opts, core, config, log2, instanceId) {
+async function handle(req, res, opts, core, config, log2) {
   const isAdminPath = req.url === "/__bili/" || req.url?.startsWith("/__bili/") || req.url === "/__acp/" || req.url?.startsWith("/__acp/");
   if (isAdminPath && !isLoopbackAddress(req.socket.remoteAddress)) {
     res.writeHead(403, { "content-type": "application/json" });
@@ -55282,11 +55224,6 @@ async function handle(req, res, opts, core, config, log2, instanceId) {
     res.end(JSON.stringify({ error: { type: "invalid_request", message: String(err2) } }));
     return;
   }
-  const hopMarker = headerValue2(req, BILI_HOP_HEADER);
-  if (hopMarker !== void 0) {
-    const selfLoop = hopMarker === instanceId;
-    log2("warn", selfLoop ? `[chain] inbound request carries THIS instance's ${BILI_HOP_HEADER} marker (${hopMarker}) \u2014 self-loop detected. Passing through without processing; check your upstream config (it may point back to this instance).` : `[chain] inbound request carries ${BILI_HOP_HEADER} from another bili instance (${hopMarker}) \u2014 bili\u2192bili chain detected. Passing through without processing to avoid double compression; keep only one bili instance in the chain.`);
-  }
   const countTokens = isCountTokensRequest(req.method ?? "GET", urlPath, bodyBuffer.length > 0);
   let parsed = null;
   if (protocol && bodyBuffer.length > 0) {
@@ -55334,14 +55271,13 @@ ${bodyBuffer.toString("utf8")}`);
           return void 0;
         }
       })();
-      const betaWindow = anthropicBetaContextWindow(req.headers);
       const pluginWindow = pluginReportedContextWindow(req.headers);
       const launcherWindow = launcherContextWindow(model);
       const peekWindow = host ? peekRegistryContext(model, host) : void 0;
       const configuredWindow = resolveConfiguredContextLimit(opts.routes, embeddedUrl, model);
-      let native = betaWindow ?? pluginWindow ?? launcherWindow ?? peekWindow ?? configuredWindow ?? lookupContextLimit(model);
+      let native = pluginWindow ?? launcherWindow ?? peekWindow ?? configuredWindow ?? lookupContextLimit(model);
       const operatorWindowTuned = resolveCompress(opts.routes, embeddedUrl, model, opts.compress).modelContextLimit !== void 0;
-      nativeFromFallback = !betaWindow && !pluginWindow && !launcherWindow && !peekWindow && !configuredWindow && !operatorWindowTuned;
+      nativeFromFallback = !pluginWindow && !launcherWindow && !peekWindow && !configuredWindow && !operatorWindowTuned;
       if (!native && host) {
         native = await contextFromRegistry(model, host);
         if (native) nativeFromFallback = false;
@@ -55351,7 +55287,7 @@ ${bodyBuffer.toString("utf8")}`);
     }
   }
   let prepared = null;
-  if (!opts.passthrough && hopMarker === void 0 && protocol && parsed && typeof parsed === "object") {
+  if (!opts.passthrough && protocol && parsed && typeof parsed === "object") {
     const sessionHeader = headerValue2(req, opts.sessionHeader);
     let pluginAgent = pluginAgentHeader(req.headers);
     let pluginConversation = pluginConversationHeader(req.headers);
@@ -55459,7 +55395,7 @@ ${bodyBuffer.toString("utf8")}`);
         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) : responsesCompact ? prepareResponsesCompact(bodyBuffer, parsed, session) : prepareResponses(parsed, req, opts, core, reqConfig, reqPrompts, log2, session, responsesIdentity, pluginMode, upstreamOrigin);
         prepared = runPrepare();
         if (!countTokens && !responsesCompact) {
-          const outcome = await preflightCompressIfNeeded(
+          prepared = await preflightCompressIfNeeded(
             prepared,
             runPrepare,
             req,
@@ -55470,29 +55406,10 @@ ${bodyBuffer.toString("utf8")}`);
             parsed.model,
             route,
             affinity,
-            log2,
-            instanceId
+            log2
           );
-          if (isPreflightFailFast(outcome)) {
-            if (outcome.respond && !res.headersSent && !res.destroyed) {
-              res.writeHead(outcome.status, {
-                "content-type": "application/json",
-                ...outcome.status === 503 ? { "retry-after": "30" } : {}
-              });
-              res.end(JSON.stringify({
-                error: {
-                  type: "server_error",
-                  code: "preflight_compress_failed",
-                  message: outcome.message,
-                  retryable: outcome.retryable
-                }
-              }));
-            }
-            return;
-          }
-          prepared = outcome;
         }
-        await forward(req, res, opts, prepared.body, prepared, core, reqConfig, log2, route, instanceId, affinity);
+        await forward(req, res, opts, prepared.body, prepared, core, reqConfig, log2, route, affinity);
         if (prepared) {
           rememberPluginMessages(sessionId, prepared.processedMessages, prepared.originalMessages, prepared.nudge);
         }
@@ -55505,7 +55422,7 @@ ${bodyBuffer.toString("utf8")}`);
     if (protocol === null && !opts.passthrough) {
       log2("warn", `unrecognized path ${maskUrlsInText(req.url ?? "")} \u2014 not a known protocol (/chat/completions, /v1/messages, /responses, /responses/compact); forwarding unchanged`);
     }
-    await forward(req, res, opts, bodyBuffer, null, core, reqConfig, log2, route, instanceId, void 0);
+    await forward(req, res, opts, bodyBuffer, null, core, reqConfig, log2, route, void 0);
   }
 }
 var ACP_TAG_MARK = "<acp ";
@@ -55866,7 +55783,7 @@ function injectResponsesTool(tools, toolsToAdd = ACP_TOOLS_RESPONSES) {
   const additions = toolsToAdd.filter((t) => !present.has(t.name));
   return [...tools, ...additions];
 }
-function buildForwardTarget(req, opts, route, affinity, hopMarker) {
+function buildForwardTarget(req, opts, route, affinity) {
   const reqUrl = req.url ?? "";
   const isAbsoluteUrl = /^https?:\/\//i.test(reqUrl);
   const rewritten = route ? route.rewrittenUrl : isAbsoluteUrl ? reqUrl : opts.upstream + reqUrl;
@@ -55878,7 +55795,6 @@ function buildForwardTarget(req, opts, route, affinity, hopMarker) {
     if (UPSTREAM_HOP_HEADERS.has(lower) || reqConnNamed.has(lower) || v2 === void 0) continue;
     headers[k2] = Array.isArray(v2) ? v2.join(", ") : v2;
   }
-  if (hopMarker !== void 0) headers[BILI_HOP_HEADER] = hopMarker;
   headers["host"] = new URL(upstreamUrl).host;
   const betaKey = Object.keys(headers).find((h) => h.toLowerCase() === "x-codex-beta-features");
   if (betaKey) {
@@ -55892,29 +55808,14 @@ function buildForwardTarget(req, opts, route, affinity, hopMarker) {
   const proxyUrl = resolveProxy(opts.routes, opts.proxy, route?.rewrittenUrl ?? upstreamUrl, opts.proxyFallback);
   return { upstreamUrl, headers, proxyUrl };
 }
-function isPreflightFailFast(outcome) {
-  return "failFast" in outcome;
-}
-async function preflightCompressIfNeeded(prepared, runPrepare, req, res, opts, core, config, model, route, affinity, log2, instanceId) {
+async function preflightCompressIfNeeded(prepared, runPrepare, req, res, opts, core, config, model, route, affinity, log2) {
   const session = prepared.session;
   const limit = config.modelContextLimit;
-  const payloadEstimate = estimateCoreMessages(prepared.processedMessages);
-  const tokenCount = Math.max(session.stats.lastInputTokens, payloadEstimate);
+  const tokenCount = Math.max(session.stats.lastInputTokens, estimateCoreMessages(prepared.processedMessages));
   if (limit <= 0 || !model || tokenCount < limit) return prepared;
-  const failFast = (status2, detail, retryable) => {
-    const message = `context ~${tokenCount} tokens exceeds the model window ${limit} (model=${model}) and preflight compression could not bring it under: ${detail}. The over-window payload was NOT forwarded.`;
-    log2("error", `[${session.id}] preflight fail-fast ${status2} (retryable=${retryable}): ${message}`);
-    return { failFast: true, status: status2, message, retryable, respond: !res.writableEnded };
-  };
-  if ((prepared.nudge?.compressibleRanges ?? []).length === 0) {
-    if (payloadEstimate < limit) {
-      log2("warn", `[${session.id}] preflight trigger fired on a stale baseline (~${tokenCount}) but the payload fits (~${payloadEstimate}/${limit}); forwarding as-is`);
-      return prepared;
-    }
-    return failFast(502, "no part of the conversation is compressible (nothing left to fold)", false);
-  }
+  if ((prepared.nudge?.compressibleRanges ?? []).length === 0) return prepared;
   log2("warn", `[${session.id}] context ${tokenCount} tokens exceeds model window ${limit} (model=${model}); preflight compressing before forward`);
-  const { upstreamUrl, headers, proxyUrl } = buildForwardTarget(req, opts, route, affinity, instanceId);
+  const { upstreamUrl, headers, proxyUrl } = buildForwardTarget(req, opts, route, affinity);
   const clientAbort = new AbortController();
   res.on("close", () => {
     if (!res.writableEnded) clientAbort.abort();
@@ -55936,26 +55837,17 @@ async function preflightCompressIfNeeded(prepared, runPrepare, req, res, opts, c
     },
     prepared.originalMessages
   );
-  if (result.payloadEstimate < limit) {
-    if (result.compressedRanges > 0) {
-      log2("info", `[${session.id}] preflight compressed ${result.compressedRanges} range(s), ~${result.savedTokens} tokens saved (${tokenCount} \u2192 ${session.stats.lastInputTokens}) in ${Date.now() - started}ms; rebuilding payload`);
-      const rebuilt = runPrepare();
-      session.stats.requests -= 1;
-      return rebuilt;
-    }
-    log2("warn", `[${session.id}] preflight made no progress but the payload fits (~${result.payloadEstimate}/${limit}); forwarding as-is`);
-    return prepared;
+  if (result.compressedRanges > 0) {
+    log2("info", `[${session.id}] preflight compressed ${result.compressedRanges} range(s), ~${result.savedTokens} tokens saved (${tokenCount} \u2192 ${session.stats.lastInputTokens}) in ${Date.now() - started}ms; rebuilding payload`);
+    const rebuilt = runPrepare();
+    session.stats.requests -= 1;
+    return rebuilt;
   }
-  const f2 = result.failure;
-  if (f2?.kind === "aborted") {
-    log2("warn", `[${session.id}] preflight aborted (${f2.detail}); not forwarding`);
-    return { failFast: true, status: 0, message: f2.detail, retryable: false, respond: false };
-  }
-  const status = f2?.kind === "upstream" && f2.status === 429 ? 503 : 502;
-  return failFast(status, f2?.detail ?? "unknown reason", status === 503);
+  log2("warn", `[${session.id}] preflight could not compress enough (~${result.savedTokens} tokens saved); forwarding as-is`);
+  return prepared;
 }
-async function forward(req, res, opts, body, prepared, core, config, log2, route, instanceId, affinity) {
-  const { upstreamUrl, headers, proxyUrl } = buildForwardTarget(req, opts, route, affinity, prepared !== null ? instanceId : void 0);
+async function forward(req, res, opts, body, prepared, core, config, log2, route, affinity) {
+  const { upstreamUrl, headers, proxyUrl } = buildForwardTarget(req, opts, route, affinity);
   log2("info", `forward ${req.method} \u2192 ${maskUrlForLog(upstreamUrl)}`);
   if (process.env.ACP_DEBUG && prepared) {
     const sid = prepared.session.id;
@@ -60295,7 +60187,7 @@ function pluginStatusAll() {
 }
 
 // src/launcher.ts
-import { randomUUID as randomUUID3 } from "crypto";
+import { randomUUID as randomUUID2 } from "crypto";
 import fs10 from "fs";
 import net2 from "net";
 import os5 from "os";
@@ -61275,7 +61167,7 @@ async function runLaunch(params, deps = {}) {
     const dshAcpPatch = writeDshAcpPatch(dshHomeDir);
     if (dshAcpPatch) clientArgs = dshArgsWithPatch(clientArgs, dshAcpPatch);
   } else if (base === "codex") {
-    const codexConversationId = injectMcp ? randomUUID3() : void 0;
+    const codexConversationId = injectMcp ? randomUUID2() : void 0;
     if (directUrl) {
       env = { ...process.env, BILLION_CONTEXT_PROXY: origin };
       if (codexConversationId) clientArgs = [...buildCodexMcpArgs(origin, codexConversationId), ...clientArgs];