billion-context 0.1.75-pr.487.306 → 0.1.75-pr.489.307

package/dist/index.js

@@ -49951,13 +49951,7 @@ function buildSession(parsed) {
     metadata: parsed.metadata ?? {},
     state: mergeState(parsed.state),
     createdAt: parsed.createdAt ?? Date.now(),
-    // #404: lastSeen reflects the on-disk savedAt (the last real
-    // activity), NOT the restore moment — a restart must not fabricate
-    // activity for every session (broke fallback=latest ties, panel
-    // freshness, and eviction ordering). Consumers that need "has this
-    // session been used since boot" read the restored flag.
-    lastSeen: parsed.savedAt ?? Date.now(),
-    restored: true,
+    lastSeen: Date.now(),
     blockContents,
     lastMessages: Array.isArray(parsed.messages) ? parsed.messages : void 0,
     inFlight: 0,
@@ -50012,8 +50006,7 @@ async function initSessions() {
   await store.migrateLegacyIds();
   const loaded = await store.loadAll();
   if (loaded.size > MAX_SESSIONS) {
-    const freshness = (s3) => Math.max(s3.createdAt ?? 0, s3.lastSeen ?? 0);
-    const entries = [...loaded.entries()].sort((a, b2) => freshness(b2[1]) - freshness(a[1]));
+    const entries = [...loaded.entries()].sort((a, b2) => (b2[1].createdAt ?? 0) - (a[1].createdAt ?? 0));
     for (const [id, s3] of entries) {
       if (sessions.size >= MAX_SESSIONS) break;
       sessions.set(id, s3);
@@ -50026,7 +50019,6 @@ function getSession(id, meta) {
   const existing = sessions.get(id);
   if (existing) {
     existing.lastSeen = Date.now();
-    existing.restored = false;
     if (meta?.protocol && !existing.meta.protocol) existing.meta.protocol = meta.protocol;
     if (meta?.upstreamOrigin && !existing.meta.upstreamOrigin) existing.meta.upstreamOrigin = meta.upstreamOrigin;
     if (meta?.label && !existing.meta.label) existing.meta.label = meta.label;
@@ -50036,7 +50028,6 @@ function getSession(id, meta) {
   const reloaded = store.loadSync(id, meta);
   if (reloaded) {
     reloaded.lastSeen = Date.now();
-    reloaded.restored = false;
     reloaded.persisted = true;
     sessions.set(id, reloaded);
     return reloaded;
@@ -50705,7 +50696,7 @@ function summaryPayload(protocol, model, system, content) {
   if (protocol === "openai") {
     return { model, max_tokens: MAX_SUMMARY_OUTPUT_TOKENS, messages: [{ role: "system", content: system }, { role: "user", content }], stream: false };
   }
-  return { model, max_output_tokens: MAX_SUMMARY_OUTPUT_TOKENS, instructions: system, input: [{ role: "user", content }], stream: false };
+  return { model, max_output_tokens: MAX_SUMMARY_OUTPUT_TOKENS, instructions: system, input: [{ role: "user", content }], stream: false, store: false };
 }
 function extractSummaryText(protocol, json) {
   if (protocol === "anthropic") {
@@ -50771,7 +50762,7 @@ TASK: The conversation segment below (messages ${startRef}\u2013${endRef}) must
 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, payloadEstimate: estimateCoreMessages(messages) + (deps.imageFloor ?? 0) };
   if (limit <= 0) return result;
   const budget = Math.max(MIN_CHUNK_TOKENS, Math.floor(limit * CHUNK_FRACTION));
   const minChars = deps.config.compress.minCompressRange;
@@ -50791,8 +50782,8 @@ async function preflightCompress(deps, messages) {
       renderTags: "text-only"
     });
     deps.session.state = turn.state;
-    currentTokens = Math.max(deps.session.stats.lastInputTokens, estimateCoreMessages(turn.messages));
-    result.payloadEstimate = estimateCoreMessages(turn.messages);
+    currentTokens = Math.max(deps.session.stats.lastInputTokens, estimateCoreMessages(turn.messages) + (deps.imageFloor ?? 0));
+    result.payloadEstimate = estimateCoreMessages(turn.messages) + (deps.imageFloor ?? 0);
     if (startTokens < 0) startTokens = currentTokens;
     if (currentTokens < limit) break;
     const ranges = viableRanges(turn.nudge?.compressibleRanges ?? []);
@@ -50878,6 +50869,78 @@ async function preflightCompress(deps, messages) {
   return result;
 }
 
+// src/image-tokens.ts
+var REMOTE_IMAGE_TOKENS = 4096;
+function imageTokenCap() {
+  const v2 = Number(process.env.BILI_IMAGE_TOKEN_CAP ?? "");
+  return Number.isInteger(v2) && v2 > 0 ? v2 : 0;
+}
+function applyCap(cost) {
+  const cap = imageTokenCap();
+  return cap > 0 ? Math.min(cost, cap) : cost;
+}
+function costForUrl(url) {
+  if (url.startsWith("data:")) {
+    const i = url.indexOf("base64,");
+    if (i >= 0) return applyCap(Math.ceil((url.length - i - "base64,".length) / 4));
+  }
+  return applyCap(REMOTE_IMAGE_TOKENS);
+}
+function isObj(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;
+  return void 0;
+}
+function imageTokensInParsedBody(protocol, body) {
+  if (!isObj(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;
+      for (const part of item.content) {
+        if (!isObj(part) || part.type !== "input_image") continue;
+        const url = urlOf(part.image_url);
+        if (url) total += costForUrl(url);
+      }
+    }
+    return total;
+  }
+  const messages = body.messages;
+  if (!Array.isArray(messages)) return 0;
+  for (const m2 of messages) {
+    if (!isObj(m2) || !Array.isArray(m2.content)) continue;
+    for (const part of m2.content) {
+      if (!isObj(part)) continue;
+      if (protocol === "openai") {
+        if (part.type !== "image_url") continue;
+        const url = urlOf(part.image_url);
+        if (url) total += costForUrl(url);
+      } 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);
+      }
+    }
+  }
+  return total;
+}
+function imageTokensInRawBody(protocol, raw) {
+  const s3 = typeof raw === "string" ? raw : raw.toString("utf8");
+  const probe = protocol === "responses" ? s3.includes("input_image") : protocol === "openai" ? s3.includes("image_url") : s3.includes('"type":"image"') || s3.includes('"type": "image"');
+  if (!probe) return 0;
+  try {
+    return imageTokensInParsedBody(protocol, JSON.parse(s3));
+  } catch {
+    return 0;
+  }
+}
+
 // src/web/index.ts
 import { readFileSync as readFileSync3 } from "fs";
 import { dirname as dirname4, join as join3 } from "path";
@@ -51047,7 +51110,7 @@ async function saveProviders(){const button=byId("save-providers");busy(button,t
 async function saveCompress(){const button=byId("save-compress");busy(button,true,"\u4FDD\u5B58\u4E2D\u2026");try{const text=byId("compress-json").value.trim();const compress=text?JSON.parse(text):null;await json("/__bili/config",{method:"PUT",headers:{"content-type":"application/json"},body:JSON.stringify({compress})});toast("\u538B\u7F29\u53C2\u6570\u5DF2\u70ED\u66F4\u65B0")}catch(error){toast(String(error),true)}finally{busy(button,false)}}
 async function loadOverrides(){try{const data=await loadConfig();const providers=data.providers||{};const box=byId("upstream-overrides");const entries=Object.entries(providers);if(entries.length===0){box.innerHTML='<p class="status">\u6682\u65E0 Provider\u3002\u5728"\u9AD8\u7EA7\u8BBE\u7F6E"\u9875\u6DFB\u52A0 Provider \u540E\u53EF\u5728\u6B64\u6309 URL \u914D\u7F6E\u4EE3\u7406\u3002</p>';return}box.innerHTML='<table><thead><tr><th>Provider URL</th><th>\u4E0A\u6E38\u4EE3\u7406\uFF08\u7A7A=\u7EE7\u627F\u5168\u5C40\uFF09</th></tr></thead><tbody>'+entries.map(([url,route])=>'<tr><td class="mono">'+escapeHtml(url)+'</td><td><input class="mono override-proxy" data-url="'+escapeHtml(url)+'" value="'+escapeHtml((route&&route.proxy)||"")+'" placeholder="\u7EE7\u627F\u5168\u5C40"></td></tr>').join("")+'</tbody></table>'}catch(error){byId("upstream-overrides").textContent=String(error)}}
 async function saveOverrides(){const button=byId("save-overrides");busy(button,true,"\u4FDD\u5B58\u4E2D\u2026");try{const data=await loadConfig();const providers=data.providers||{};document.querySelectorAll(".override-proxy").forEach((input)=>{const url=input.dataset.url;if(!url)return;if(!providers[url])providers[url]={};const val=input.value.trim();if(val)providers[url].proxy=val;else delete providers[url].proxy});await json("/__bili/config",{method:"PUT",headers:{"content-type":"application/json"},body:JSON.stringify({providers})});await json("/__bili/config/reload",{method:"POST"});toast("\u6309 URL \u8986\u76D6\u5DF2\u70ED\u66F4\u65B0");await loadOverrides()}catch(error){toast(String(error),true)}finally{busy(button,false)}}
-async function loadSessions(){try{const data=await json("/__bili/stats");const rows=(data.sessions||[]).map((item)=>"<tr><td>"+escapeHtml(item.title||"\u2014")+"</td><td>"+escapeHtml(item.protocol||"\u2014")+"</td><td class=mono>"+escapeHtml(item.label||"\u2014")+"</td><td>"+escapeHtml(item.requests)+"</td><td>"+escapeHtml(item.contextTokens)+"</td><td>"+escapeHtml(new Date(item.lastSeen).toLocaleString())+(item.restored?" <span class=muted>(\u6062\u590D\uFF0C\u5F00\u673A\u540E\u672A\u6D3B\u52A8)</span>":"")+"</td></tr>").join("");byId("sessions-body").innerHTML=rows||'<tr><td colspan="6">\u6682\u65E0\u4F1A\u8BDD</td></tr>'}catch(error){toast(String(error),true);throw error}}
+async function loadSessions(){try{const data=await json("/__bili/stats");const rows=(data.sessions||[]).map((item)=>"<tr><td>"+escapeHtml(item.title||"\u2014")+"</td><td>"+escapeHtml(item.protocol||"\u2014")+"</td><td class=mono>"+escapeHtml(item.label||"\u2014")+"</td><td>"+escapeHtml(item.requests)+"</td><td>"+escapeHtml(item.contextTokens)+"</td><td>"+escapeHtml(new Date(item.lastSeen).toLocaleString())+"</td></tr>").join("");byId("sessions-body").innerHTML=rows||'<tr><td colspan="6">\u6682\u65E0\u4F1A\u8BDD</td></tr>'}catch(error){toast(String(error),true);throw error}}
 async function refreshSessions(){const button=byId("refresh-sessions");busy(button,true,"\u5237\u65B0\u4E2D\u2026");try{await loadSessions();toast("\u4F1A\u8BDD\u5217\u8868\u5DF2\u5237\u65B0")}catch{}finally{busy(button,false)}}
 document.querySelectorAll(".copy-btn").forEach((btn)=>btn.addEventListener("click",async()=>{busy(btn,true,"\u590D\u5236\u4E2D\u2026");try{await navigator.clipboard.writeText(btn.dataset.copy||"");toast("\u5DF2\u590D\u5236")}catch(e){toast(String(e),true)}finally{busy(btn,false)}}));byId("save-upstream").addEventListener("click",saveUpstream);byId("test-upstream").addEventListener("click",testUpstream);byId("save-providers").addEventListener("click",saveProviders);byId("save-compress").addEventListener("click",saveCompress);byId("save-overrides").addEventListener("click",saveOverrides);byId("refresh-sessions").addEventListener("click",refreshSessions);
 Promise.all([loadConfig(),loadUpstream()]).catch((error)=>toast(String(error),true));setInterval(()=>{if(byId("page-sessions").classList.contains("active"))loadSessions().catch(()=>{})},5000);
@@ -51057,7 +51120,7 @@ Promise.all([loadConfig(),loadUpstream()]).catch((error)=>toast(String(error),tr
 var WEB_STYLES = `
 :root{--bg:#0f1115;--panel:#171a21;--panel2:#1e222c;--line:#2b313d;--text:#e7eaf0;--muted:#8f98a8;--blue:#6ea8fe;--green:#55c98b;--yellow:#e9b949;--red:#ef6b73;--radius:10px}
 *{box-sizing:border-box}body{margin:0;background:var(--bg);color:var(--text);font:14px/1.5 -apple-system,BlinkMacSystemFont,"Segoe UI",sans-serif;min-height:100vh}.app{display:grid;grid-template-columns:220px 1fr;min-height:100vh}.sidebar{border-right:1px solid var(--line);padding:22px 14px;background:#12151b;position:sticky;top:0;height:100vh}.brand{font-size:18px;font-weight:700;padding:0 10px 22px}.brand span{color:var(--blue)}.version{display:block;color:var(--muted);font-size:11px;font-weight:400;margin-top:2px}.nav{display:grid;gap:4px}.nav button{appearance:none;border:0;background:transparent;color:var(--muted);text-align:left;padding:10px 12px;border-radius:7px;cursor:pointer;font:inherit}.nav button:hover,.nav button.active{background:var(--panel2);color:var(--text)}.main{padding:32px;max-width:1050px;width:100%}.page{display:none}.page.active{display:block}h1{font-size:23px;margin:0 0 4px}h2{font-size:15px;margin:0}.lead{color:var(--muted);margin:0 0 24px}.grid{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));gap:14px}.card{background:var(--panel);border:1px solid var(--line);border-radius:var(--radius);padding:18px;margin-bottom:14px}.card-head{display:flex;justify-content:space-between;align-items:center;margin-bottom:16px}.badge{border-radius:99px;padding:3px 9px;font-size:12px;background:var(--panel2);color:var(--muted)}.badge.ok{color:var(--green)}.badge.warn{color:var(--yellow)}.badge.err{color:var(--red)}.kv{display:grid;grid-template-columns:135px 1fr;gap:10px 14px;margin:0}.kv dt{color:var(--muted)}.kv dd{margin:0;word-break:break-all}.mono{font-family:"Cascadia Code",Consolas,monospace;font-size:12px}.actions{display:flex;gap:9px;flex-wrap:wrap;margin-top:18px}.btn{border:1px solid var(--line);background:var(--panel2);color:var(--text);border-radius:7px;padding:8px 13px;cursor:pointer;font:inherit}.btn:hover{border-color:#4b5668}.btn.primary{background:var(--blue);border-color:var(--blue);color:#0b1220;font-weight:600}.btn.danger{color:var(--red)}.btn:disabled{opacity:.55;cursor:wait}.field{display:grid;gap:6px;margin:12px 0}.field label{color:var(--muted);font-size:12px}input,textarea,select{width:100%;background:#101319;color:var(--text);border:1px solid var(--line);border-radius:7px;padding:9px 10px;font:inherit}textarea{min-height:250px;font-family:"Cascadia Code",Consolas,monospace;font-size:12px;resize:vertical}.modes{display:flex;gap:18px;margin:12px 0}.modes label{display:flex;gap:7px;align-items:center;color:var(--muted)}.modes input{width:auto}.notice{border-left:3px solid var(--yellow);padding:10px 12px;background:rgba(233,185,73,.08);color:#d8c185;margin-top:14px}.status{color:var(--muted);white-space:pre-wrap}.status.ok{color:var(--green)}.status.err{color:var(--red)}table{width:100%;border-collapse:collapse}th,td{text-align:left;border-bottom:1px solid var(--line);padding:9px 8px;font-size:12px}th{color:var(--muted);font-weight:500}.toast{position:fixed;right:24px;bottom:24px;background:var(--green);color:#07140d;padding:10px 15px;border-radius:8px;opacity:0;transform:translateY(8px);transition:.2s;pointer-events:none}.toast.show{opacity:1;transform:none}.toast.err{background:var(--red);color:#1b0608}
-.section-title{font-size:17px;margin:28px 0 4px}.hint{color:var(--muted);margin:0 0 14px;font-size:13px}.muted{color:var(--muted);font-size:11px}.btn.small{padding:4px 10px;font-size:12px}.config-block{background:var(--panel2);border:1px solid var(--line);border-radius:6px;padding:10px 14px;margin:8px 0 12px;overflow-x:auto;font-size:13px}.config-block code{font-family:"Cascadia Code",Consolas,monospace;color:var(--text)}.fork-ribbon{position:fixed;top:0;right:0;background:#1a1a2e;color:#fff;padding:6px 16px;font-size:12px;text-decoration:none;border-radius:0 0 0 8px;z-index:100;opacity:.8;transition:.2s}.fork-ribbon:hover{opacity:1}
+.section-title{font-size:17px;margin:28px 0 4px}.hint{color:var(--muted);margin:0 0 14px;font-size:13px}.btn.small{padding:4px 10px;font-size:12px}.config-block{background:var(--panel2);border:1px solid var(--line);border-radius:6px;padding:10px 14px;margin:8px 0 12px;overflow-x:auto;font-size:13px}.config-block code{font-family:"Cascadia Code",Consolas,monospace;color:var(--text)}.fork-ribbon{position:fixed;top:0;right:0;background:#1a1a2e;color:#fff;padding:6px 16px;font-size:12px;text-decoration:none;border-radius:0 0 0 8px;z-index:100;opacity:.8;transition:.2s}.fork-ribbon:hover{opacity:1}
 @media(max-width:760px){.app{grid-template-columns:1fr}.sidebar{height:auto;position:static;border-right:0;border-bottom:1px solid var(--line)}.nav{display:flex;overflow:auto}.main{padding:20px}.grid{grid-template-columns:1fr}.kv{grid-template-columns:110px 1fr}}
 `;
 
@@ -54373,14 +54436,10 @@ function handlePluginStatus(conversationId2, res, fallbackLatest = false) {
   let session = entry ? peekSession(entry.sessionId) : void 0;
   let viaFallback = false;
   if ((!entry || !session) && fallbackLatest) {
-    const latest = listSessions().filter((s3) => s3.restored !== true).sort((a, b2) => (b2.lastSeen ?? 0) - (a.lastSeen ?? 0))[0];
+    const latest = listSessions().filter((s3) => typeof s3.lastSeen === "number").sort((a, b2) => (b2.lastSeen ?? 0) - (a.lastSeen ?? 0))[0];
     if (latest) {
       session = latest;
       viaFallback = true;
-    } else {
-      res.writeHead(404, { "content-type": "application/json" });
-      res.end(JSON.stringify({ ok: false, error: "no session with activity since boot \u2014 issue a model request or pass the conversation id" }));
-      return;
     }
   }
   if (!session) {
@@ -57643,11 +57702,13 @@ function isPreflightFailFast(outcome) {
 async function preflightCompressIfNeeded(prepared, runPrepare, req, res, opts, core, config, model, route, affinity, log2, instanceId) {
   const session = prepared.session;
   const limit = config.modelContextLimit;
-  const payloadEstimate = estimateCoreMessages(prepared.processedMessages);
+  const imageTokens = imageTokensInRawBody(prepared.protocol, prepared.body);
+  const payloadEstimate = estimateCoreMessages(prepared.processedMessages) + imageTokens;
   const tokenCount = Math.max(session.stats.lastInputTokens, payloadEstimate);
   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.`;
+    const imageNote = imageTokens >= limit ? ` Images alone account for ~${imageTokens} tokens (\u2265 window ${limit}); compression cannot remove them \u2014 shrink or remove the images, or raise the window.` : "";
+    const message = `context ~${tokenCount} tokens exceeds the model window ${limit} (model=${model}) and preflight compression could not bring it under: ${detail}.` + imageNote + ` 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 };
   };
@@ -57677,7 +57738,8 @@ async function preflightCompressIfNeeded(prepared, runPrepare, req, res, opts, c
       model,
       proxyUrl,
       signal: clientAbort.signal,
-      log: log2
+      log: log2,
+      imageFloor: imageTokens
     },
     prepared.originalMessages
   );
@@ -57846,9 +57908,12 @@ ${hdrText}
       const info = inspectContextOverflow(upstream.status, errBody.toString("utf8"));
       if (info.isOverflow) {
         let reqModel;
+        let rejectedImageTokens = 0;
         try {
           const rawBody = typeof prepared.body === "string" ? prepared.body : prepared.body.toString("utf8");
-          reqModel = JSON.parse(rawBody).model;
+          const parsedBody = JSON.parse(rawBody);
+          reqModel = typeof parsedBody.model === "string" ? parsedBody.model : void 0;
+          rejectedImageTokens = imageTokensInParsedBody(prepared.protocol, parsedBody);
         } catch {
           reqModel = void 0;
         }
@@ -57860,7 +57925,7 @@ ${hdrText}
           s3.metadata.learnedContextLimits = learnedMap;
           log2("warn", `[${s3.id}] upstream context overflow \u2014 learned real window ${info.window} for ${reqModel ?? "(unknown model)"} (was ${prev ?? "unset"}); arming emergency shrink`);
         } else {
-          const payloadEstimate = estimateCoreMessages(prepared.processedMessages);
+          const payloadEstimate = estimateCoreMessages(prepared.processedMessages) + rejectedImageTokens;
           const prev = (reqModel ? learnedMap[reqModel] : void 0) ?? s3.metadata.learnedContextLimit;
           if (payloadEstimate >= 1e3 && (prev === void 0 || payloadEstimate < prev)) {
             if (reqModel) learnedMap[reqModel] = payloadEstimate;
@@ -58245,8 +58310,7 @@ function sendStats(res) {
     outputTokens: s3.stats.outputTokens,
     cacheSamples: s3.stats.cacheSamples,
     cacheHitPct: s3.stats.cacheSamples > 0 && s3.stats.inputTokens > 0 ? Math.round(s3.stats.cachedTokens / s3.stats.inputTokens * 100) : null,
-    lastSeen: new Date(s3.lastSeen).toISOString(),
-    restored: s3.restored === true
+    lastSeen: new Date(s3.lastSeen).toISOString()
   }));
   res.writeHead(200, { "content-type": "application/json" });
   res.end(JSON.stringify({ sessions: sessions2 }, null, 2));