billion-context 0.1.55-pr.252.106 → 0.1.55

package/dist/index.js

@@ -49384,8 +49384,6 @@ function buildSession(parsed) {
       outputTokens: stats.outputTokens ?? parsed.outputTokens ?? 0,
       cacheSamples: stats.cacheSamples ?? parsed.cacheSamples ?? 0,
       lastInputTokens: stats.lastInputTokens ?? parsed.lastInputTokens ?? 0,
-      // In-memory only — a fresh process has no pending compress fold.
-      compressCreditTokens: 0,
       contextTokens: stats.contextTokens ?? parsed.contextTokens ?? 0
     },
     metadata: parsed.metadata ?? {},
@@ -49476,7 +49474,7 @@ function getSession(id, meta) {
   const session = {
     id,
     meta: { protocol: meta?.protocol, upstreamOrigin: meta?.upstreamOrigin, label: meta?.label },
-    stats: { requests: 0, tokensSaved: 0, inputTokens: 0, cachedTokens: 0, outputTokens: 0, cacheSamples: 0, lastInputTokens: 0, compressCreditTokens: 0, contextTokens: 0 },
+    stats: { requests: 0, tokensSaved: 0, inputTokens: 0, cachedTokens: 0, outputTokens: 0, cacheSamples: 0, lastInputTokens: 0, contextTokens: 0 },
     metadata: {},
     state: createInitialState(),
     createdAt: Date.now(),
@@ -49878,8 +49876,6 @@ function applyRanges(ranges, ctx) {
     const warn = r.warnings.length > 0 ? ` ${r.warnings.join("; ")}` : "";
     const msg = `[Compressed ${detail} \u2192 ${r.blocksCreated} block(s), ~${r.tokensCompressed} tokens saved.${warn}]`;
     ctx.log(`[acp-proxy: ${msg}]`);
-    ctx.session.stats.compressCreditTokens = (ctx.session.stats.compressCreditTokens ?? 0) + r.tokensCompressed;
-    ctx.session.stats.lastInputTokens = Math.max(0, ctx.session.stats.lastInputTokens - r.tokensCompressed);
     return msg;
   } catch (err2) {
     ctx.log(`[acp-proxy: compress failed: ${String(err2)}]`);
@@ -50273,7 +50269,7 @@ function recordUsage(ctx, usage, round) {
   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 = Math.max(0, total - (ctx.session.stats.compressCreditTokens ?? 0));
+  ctx.session.stats.lastInputTokens = total;
   if (typeof cached === "number") {
     ctx.session.stats.cachedTokens += cached;
     ctx.session.stats.cacheSamples += 1;
@@ -52621,7 +52617,7 @@ function applyUsageSample(session, sample, protocol) {
   if (sample.inputTokens !== void 0) {
     const total = sample.inputTokens + (!includesCached && sample.cachedTokens !== void 0 ? sample.cachedTokens : 0);
     session.stats.inputTokens += total;
-    session.stats.lastInputTokens = Math.max(0, total - (session.stats.compressCreditTokens ?? 0));
+    session.stats.lastInputTokens = total;
   }
   if (sample.outputTokens !== void 0) session.stats.outputTokens += sample.outputTokens;
 }
@@ -52853,9 +52849,6 @@ import path9 from "path";
 import fs4 from "fs";
 import os from "os";
 import path8 from "path";
-function toModelWindow(id, contextWindow) {
-  return typeof id === "string" && id.length > 0 && typeof contextWindow === "number" && Number.isFinite(contextWindow) && contextWindow > 0 ? { id, contextWindow: Math.floor(contextWindow) } : null;
-}
 function nonEmpty2(s3) {
   return typeof s3 === "string" && s3.trim().length > 0;
 }
@@ -52928,8 +52921,6 @@ function parseCodexToml(text) {
   const result = { providers: {} };
   let table = "";
   let curProvider = null;
-  let codexModel;
-  let codexContextWindow;
   for (const rawLine of text.split(/\r?\n/)) {
     const line = rawLine.trim();
     if (!line || line.startsWith("#")) continue;
@@ -52942,24 +52933,17 @@ function parseCodexToml(text) {
       }
       continue;
     }
-    const strMatch = /^([A-Za-z0-9_.-]+)\s*=\s*(?:"([^"]*)"|'([^']*)')/.exec(line);
-    const numMatch = /^([A-Za-z0-9_.-]+)\s*=\s*([0-9]+)\b/.exec(line);
-    if (strMatch) {
-      const key = strMatch[1];
-      const val = strMatch[2] !== void 0 ? strMatch[2] : strMatch[3];
-      if (table === "") {
-        if (key === "model_provider") result.modelProvider = val;
-        else if (key === "openai_base_url") result.openaiBaseUrl = val;
-        else if (key === "model") codexModel = val;
-      } else if (curProvider && key === "base_url") {
-        result.providers[curProvider].baseUrl = val;
-      }
-    } else if (numMatch && table === "" && numMatch[1] === "model_context_window") {
-      codexContextWindow = Number(numMatch[2]);
+    const m2 = /^([A-Za-z0-9_.-]+)\s*=\s*(?:"([^"]*)"|'([^']*)')/.exec(line);
+    if (!m2) continue;
+    const key = m2[1];
+    const val = m2[2] !== void 0 ? m2[2] : m2[3];
+    if (table === "") {
+      if (key === "model_provider") result.modelProvider = val;
+      else if (key === "openai_base_url") result.openaiBaseUrl = val;
+    } else if (curProvider && key === "base_url") {
+      result.providers[curProvider].baseUrl = val;
     }
   }
-  const win = toModelWindow(codexModel, codexContextWindow);
-  if (win) result.modelWindows = [win];
   return result;
 }
 function readCodexConfig(codexHome) {
@@ -52981,19 +52965,7 @@ function readPiConfig(piHome) {
     for (const [name, val] of Object.entries(rawProviders)) {
       if (val && typeof val === "object" && !Array.isArray(val)) {
         const baseUrl = val.baseUrl;
-        const models = val.models;
-        const windows = [];
-        if (Array.isArray(models)) {
-          for (const m2 of models) {
-            if (!m2 || typeof m2 !== "object") continue;
-            const win = toModelWindow(m2.id, m2.contextWindow);
-            if (win) windows.push(win);
-          }
-        }
-        providers[name] = {
-          ...typeof baseUrl === "string" ? { baseUrl } : {},
-          ...windows.length > 0 ? { models: windows } : {}
-        };
+        providers[name] = typeof baseUrl === "string" ? { baseUrl } : {};
       }
     }
   }
@@ -53004,9 +52976,6 @@ function parseOmpYaml(text) {
   let providersIndent = -1;
   let providerIndent = -1;
   let currentProvider = null;
-  let modelsIndent = -1;
-  let dashIndent = -1;
-  let currentModelId;
   for (const rawLine of text.split(/\r?\n/)) {
     const trimmed = rawLine.trim();
     if (!trimmed || trimmed.startsWith("#")) continue;
@@ -53018,9 +52987,6 @@ function parseOmpYaml(text) {
     if (indent <= providersIndent) break;
     if (providerIndent === -1) providerIndent = indent;
     if (indent === providerIndent) {
-      modelsIndent = -1;
-      dashIndent = -1;
-      currentModelId = void 0;
       const m2 = /^([A-Za-z0-9_.-]+):/.exec(trimmed);
       if (m2) {
         currentProvider = m2[1];
@@ -53029,26 +52995,8 @@ function parseOmpYaml(text) {
         currentProvider = null;
       }
     } else if (indent > providerIndent && currentProvider) {
-      const idMatch = /^-\s+id:\s*(\S+)/.exec(trimmed);
-      if (modelsIndent >= 0 && indent > modelsIndent && idMatch) {
-        currentModelId = idMatch[1];
-        dashIndent = indent;
-      } else if (modelsIndent >= 0 && dashIndent >= 0 && indent > dashIndent && /^contextWindow:\s*([0-9]+)/.test(trimmed)) {
-        const n = Number(/^contextWindow:\s*([0-9]+)/.exec(trimmed)[1]);
-        const win = toModelWindow(currentModelId, n);
-        if (win) {
-          const prov = result.providers[currentProvider];
-          prov.models = [...prov.models ?? [], win];
-        }
-        currentModelId = void 0;
-      } else if (/^models:\s*(#.*)?$/.test(trimmed)) {
-        modelsIndent = indent;
-        dashIndent = -1;
-        currentModelId = void 0;
-      } else if (modelsIndent < 0 || indent <= modelsIndent) {
-        const m2 = /^baseUrl:\s*(\S+)/.exec(trimmed);
-        if (m2) result.providers[currentProvider].baseUrl = m2[1];
-      }
+      const m2 = /^baseUrl:\s*(\S+)/.exec(trimmed);
+      if (m2) result.providers[currentProvider].baseUrl = m2[1];
     }
   }
   return result;
@@ -53169,19 +53117,6 @@ function readOpencodeConfig(file) {
           const baseURL = opts.baseURL;
           if (typeof baseURL === "string") providers[name] = { baseURL };
         }
-        const modelsRoot = value.models;
-        if (modelsRoot && typeof modelsRoot === "object" && !Array.isArray(modelsRoot) && providers[name]) {
-          const windows = [];
-          for (const [modelId, mv] of Object.entries(modelsRoot)) {
-            if (!mv || typeof mv !== "object") continue;
-            const limit = mv.limit;
-            if (typeof limit === "number") {
-              const win = toModelWindow(modelId, limit);
-              if (win) windows.push(win);
-            }
-          }
-          if (windows.length > 0) providers[name].models = windows;
-        }
       }
     }
   }
@@ -53234,19 +53169,6 @@ function loadClientConfig(env, cwd) {
   config.dsh = readDshConfig(resolveDshHome(env));
   return config;
 }
-function collectModelWindows(config) {
-  const out = {};
-  const add = (wins) => {
-    for (const w2 of wins ?? []) {
-      if (!out[w2.id] || w2.contextWindow > out[w2.id]) out[w2.id] = w2.contextWindow;
-    }
-  };
-  for (const p2 of Object.values(config.pi?.providers ?? {})) add(p2.models);
-  for (const p2 of Object.values(config.omp?.providers ?? {})) add(p2.models);
-  for (const p2 of Object.values(config.opencode?.providers ?? {})) add(p2.models);
-  add(config.codex?.modelWindows);
-  return out;
-}
 
 // src/discover.ts
 var TTL_MS2 = 2e3;
@@ -54176,24 +54098,6 @@ async function decodeRequestBody(contentEncoding, input, maxOutputBytes) {
 }
 
 // src/server.ts
-function parseLauncherModelWindows(raw) {
-  if (!raw) return {};
-  try {
-    const parsed = JSON.parse(raw);
-    if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) return {};
-    const out = {};
-    for (const [id, v2] of Object.entries(parsed)) {
-      if (typeof v2 === "number" && Number.isFinite(v2) && v2 > 0) out[id] = Math.floor(v2);
-    }
-    return out;
-  } catch {
-    return {};
-  }
-}
-var LAUNCHER_MODEL_WINDOWS = parseLauncherModelWindows(process.env.BILI_LAUNCHER_MODEL_WINDOWS);
-function launcherContextWindow(model) {
-  return LAUNCHER_MODEL_WINDOWS[model];
-}
 var UPSTREAM_HOP_HEADERS = /* @__PURE__ */ new Set([
   "host",
   "content-length",
@@ -54603,7 +54507,7 @@ ${bodyBuffer.toString("utf8")}`);
           return void 0;
         }
       })();
-      let native = pluginReportedContextWindow(req.headers) ?? launcherContextWindow(model) ?? (host ? peekRegistryContext(model, host) : void 0) ?? resolveContextLimit(opts.routes, embeddedUrl, model);
+      let native = pluginReportedContextWindow(req.headers) ?? (host ? peekRegistryContext(model, host) : void 0) ?? resolveContextLimit(opts.routes, embeddedUrl, model);
       if (!native && host) {
         native = await contextFromRegistry(model, host);
       }
@@ -54744,7 +54648,6 @@ function prepareAnthropic(parsed, req, opts, core, config, prompts, log2, sessio
     const tokenCount = session.stats.lastInputTokens;
     const turn = core.processTurn({ messages: msgs, state: session.state, config, tokenCount, renderTags: "text-only" });
     session.state = turn.state;
-    session.stats.compressCreditTokens = 0;
     if (turn.nudge) turn.nudge.compressibleRanges = viableRanges(turn.nudge.compressibleRanges);
     nudge = turn.nudge;
     session.stats.contextTokens = tokenCount;
@@ -54800,7 +54703,6 @@ function prepareOpenai(parsed, req, opts, core, config, prompts, log2, session,
     const tokenCount = session.stats.lastInputTokens;
     const turn = core.processTurn({ messages: msgs, state: session.state, config, tokenCount, renderTags: "text-only" });
     session.state = turn.state;
-    session.stats.compressCreditTokens = 0;
     if (turn.nudge) turn.nudge.compressibleRanges = viableRanges(turn.nudge.compressibleRanges);
     nudge = turn.nudge;
     session.stats.contextTokens = tokenCount;
@@ -54869,7 +54771,6 @@ function prepareResponses(parsed, req, opts, core, config, prompts, log2, sessio
     const tokenCount = session.stats.lastInputTokens;
     const turn = core.processTurn({ messages: msgs, state: session.state, config, tokenCount, renderTags: process.env.ACP_RENDER_NONE ? "none" : "text-only" });
     session.state = turn.state;
-    session.stats.compressCreditTokens = 0;
     if (turn.nudge) turn.nudge.compressibleRanges = viableRanges(turn.nudge.compressibleRanges);
     nudge = turn.nudge;
     session.stats.contextTokens = tokenCount;
@@ -55334,10 +55235,7 @@ ${hdrText}
         const { total, cached } = usageTotals(prepared.protocol, u2);
         if (typeof total === "number") {
           prepared.session.stats.inputTokens += total;
-          prepared.session.stats.lastInputTokens = Math.max(
-            0,
-            total - (prepared.session.stats.compressCreditTokens ?? 0)
-          );
+          prepared.session.stats.lastInputTokens = total;
           if (typeof cached === "number") {
             prepared.session.stats.cachedTokens += cached;
             prepared.session.stats.cacheSamples += 1;
@@ -60083,8 +59981,7 @@ async function ensureProxyRunning(opts, deps = {}) {
         stdio: ["ignore", logFd, logFd],
         env: {
           ...stripInheritedProxy(process.env),
-          ...opts.mitmDomains && opts.mitmDomains.length ? { BILI_MITM_DOMAINS: opts.mitmDomains.join(",") } : {},
-          ...opts.modelWindows && Object.keys(opts.modelWindows).length > 0 ? { BILI_LAUNCHER_MODEL_WINDOWS: JSON.stringify(opts.modelWindows) } : {}
+          ...opts.mitmDomains && opts.mitmDomains.length ? { BILI_MITM_DOMAINS: opts.mitmDomains.join(",") } : {}
         }
       }
     );
@@ -60186,7 +60083,7 @@ async function runLaunch(params, deps = {}) {
   const base = baseClientName(params.client);
   const routes = discoverRoutes(base, config);
   const domains = dedupeInOrder([...routes.httpsDomains, ...params.mitmDomains ?? []]);
-  const handle2 = await ensureProxyRunning({ host, port, passthrough, debug, mitmDomains: domains, modelWindows: collectModelWindows(config) }, deps);
+  const handle2 = await ensureProxyRunning({ host, port, passthrough, debug, mitmDomains: domains }, deps);
   console.error(
     `bili: started proxy at ${handle2.origin} (MITM domains: ${domains.length ? domains.join(", ") : "defaults"})` + (routes.httpRewrites.length > 0 ? ` (HTTP /bili/ rewrites: ${routes.httpRewrites.length})` : "") + (routes.httpsRewrites.length > 0 ? ` (HTTPS cert rewrites: ${routes.httpsRewrites.length})` : "") + (params.client === "pi-test" ? " (no extensions)" : "")
   );
@@ -60326,7 +60223,7 @@ async function runTestPi(params, deps = {}) {
     ...discoverDomains("pi", config),
     ...params.mitmDomains ?? []
   ]);
-  const handle2 = await ensureProxyRunning({ host, port, passthrough, debug, mitmDomains: domains, modelWindows: collectModelWindows(config) }, deps);
+  const handle2 = await ensureProxyRunning({ host, port, passthrough, debug, mitmDomains: domains }, deps);
   console.error(
     `bili: started proxy at ${handle2.origin} (MITM domains: ${domains.length ? domains.join(", ") : "defaults"})`
   );