billion-context 0.1.69-pr.448.271 → 0.1.69-pr.455.273

package/dist/index.js

@@ -51584,6 +51584,20 @@ async function* runCompressLoop(upstream, ctx, requestBody, requestOptions, adap
             coreMessages.push(...hidden.messages);
           }
         }
+        if (ctx.refreshFolded && proxyResults.some((pr2) => pr2.name === "compress" && !pr2.result.includes("FAILED"))) {
+          try {
+            const refreshed = ctx.refreshFolded(coreMessages);
+            if (refreshed.length > 0) {
+              coreMessages.length = 0;
+              coreMessages.push(...refreshed);
+              ctx.session.stats.compressCreditTokens = 0;
+              ctx.log(`[acp-loop] round ${round}: re-request view refreshed to post-compress fold`);
+            }
+          } catch (err2) {
+            ctx.log(`[acp-loop] round ${round}: fold refresh failed (${String(err2)}); keeping pre-compress view`);
+            log("warn", `[acp-loop] fold refresh failed: ${String(err2)}`);
+          }
+        }
       }
       for (const tc of realToolCalls) {
         if (tc.passthrough) continue;
@@ -56654,7 +56668,7 @@ function prepareAnthropic(parsed, req, opts, core, config, prompts, log2, sessio
   markDirty(session);
   const rebuilt = { ...parsed, messages: rebuiltMessages, system: systemOut, tools: toolsOut };
   delete rebuilt.prompt_cache_key;
-  return { body: JSON.stringify(rebuilt), session, processedMessages, originalMessages, anthropicSystem: parsed.system, protocol: "anthropic", stream: stream2, compressInjected: injectTools, pluginMode, nudge, prompts };
+  return { body: JSON.stringify(rebuilt), session, processedMessages, originalMessages, anthropicSystem: parsed.system, protocol: "anthropic", stream: stream2, compressInjected: injectTools, pluginMode, nudge, prompts, renderTags: "text-only" };
 }
 function prepareOpenai(parsed, req, opts, core, config, prompts, log2, session, pluginMode) {
   const sessionId = session.id;
@@ -56717,7 +56731,7 @@ function prepareOpenai(parsed, req, opts, core, config, prompts, log2, session,
   }
   snapshotMessages(session, originalMessages);
   markDirty(session);
-  return { body: JSON.stringify(rebuilt), session, processedMessages, originalMessages, protocol: "openai", stream: stream2, compressInjected: injectTools, pluginMode, nudge, prompts, openaiSystemText };
+  return { body: JSON.stringify(rebuilt), session, processedMessages, originalMessages, protocol: "openai", stream: stream2, compressInjected: injectTools, pluginMode, nudge, prompts, openaiSystemText, renderTags: "text-only" };
 }
 function prepareResponses(parsed, req, opts, core, config, prompts, log2, session, identity, pluginMode, upstreamOrigin) {
   const sessionId = session.id;
@@ -56755,6 +56769,7 @@ function prepareResponses(parsed, req, opts, core, config, prompts, log2, sessio
   const injectTools = shouldInject && !pluginMode;
   const isCompactionTrigger = hasCompactionTrigger(parsed.input);
   const responsesTextProtocol = FORCE_TEXT_PROTOCOL || resolveCompressProtocol(opts.routes, upstreamOrigin) === "marker";
+  const renderTags = process.env.ACP_RENDER_NONE || isCompactionTrigger ? "none" : "text-only";
   try {
     const projection = responsesToCore(parsed);
     responsesProjection = projection;
@@ -56764,7 +56779,7 @@ function prepareResponses(parsed, req, opts, core, config, prompts, log2, sessio
       log2("info", `[${sessionId}] input items: ${Array.isArray(parsed.input) ? parsed.input.map((i) => i.type).join(",") : "(string)"}`);
     }
     const tokenCount = session.stats.lastInputTokens;
-    const turn = core.processTurn({ messages: msgs, state: session.state, config, tokenCount, renderTags: process.env.ACP_RENDER_NONE || isCompactionTrigger ? "none" : "text-only" });
+    const turn = core.processTurn({ messages: msgs, state: session.state, config, tokenCount, renderTags });
     session.state = turn.state;
     session.stats.compressCreditTokens = 0;
     if (turn.nudge) turn.nudge.compressibleRanges = viableRanges(turn.nudge.compressibleRanges);
@@ -56858,6 +56873,7 @@ function prepareResponses(parsed, req, opts, core, config, prompts, log2, sessio
     responsesTextProtocol,
     nudge,
     prompts,
+    renderTags,
     resetAfterSuccess: isCompactionTrigger,
     codexForge
   };
@@ -57360,9 +57376,21 @@ ${hdrText}
       const textProtocol = prepared.protocol === "responses" && !!prepared.responsesTextProtocol;
       const systemPrompt = textProtocol ? buildCompressHybridSystemPrompt(prepared.prompts ?? defaultPrompts) : buildCompressSystemPrompt(prepared.prompts ?? defaultPrompts);
       const adapter = pickAdapter(prepared.protocol, parsedReq, textProtocol, prepared.responsesProjection, prepared.anthropicSystem, prepared.openaiSystemText);
+      const refreshFolded = (current) => {
+        const turn = core.processTurn({
+          messages: prepared.originalMessages,
+          state: prepared.session.state,
+          config,
+          tokenCount: prepared.session.stats.lastInputTokens,
+          renderTags: prepared.renderTags ?? "text-only"
+        });
+        prepared.session.state = turn.state;
+        const records = current.filter((m2) => typeof m2.id === "string" && m2.id.startsWith("acp_loop_"));
+        return stripKernelSummaries([...turn.messages, ...records], turn.state);
+      };
       const loop = runCompressLoop(
         streamToRead,
-        { core, config, messages: prepared.processedMessages.length > 0 ? prepared.processedMessages : prepared.originalMessages, compressMessages: prepared.originalMessages, session: prepared.session, log: ctx.log, proxyUrl, protocol: prepared.protocol, textProtocol, debug: opts.debug, nudge: prepared.nudge },
+        { core, config, messages: prepared.processedMessages.length > 0 ? prepared.processedMessages : prepared.originalMessages, compressMessages: prepared.originalMessages, session: prepared.session, log: ctx.log, proxyUrl, protocol: prepared.protocol, textProtocol, debug: opts.debug, nudge: prepared.nudge, refreshFolded },
         parsedReq,
         { url: upstreamUrl, headers: reqHeaders },
         adapter,
@@ -61947,8 +61975,6 @@ function mergeSqliteSet(overlay, realHome, base) {
   }
 }
 function refreshOverlayHome(realHome, overlay, generatedFile) {
-  const generatedFiles = new Set(Array.isArray(generatedFile) ? generatedFile : [generatedFile]);
-  const isGeneratedDraft = (name) => [...generatedFiles].some((g2) => name.startsWith(`.${g2}.`) && name.endsWith(".tmp"));
   try {
     fs11.mkdirSync(overlay, { recursive: true });
   } catch {
@@ -61979,7 +62005,7 @@ function refreshOverlayHome(realHome, overlay, generatedFile) {
     }
     const dbSets = [];
     for (const entry of overlayEntries) {
-      if (!entry.endsWith(".db") || generatedFiles.has(entry)) continue;
+      if (!entry.endsWith(".db") || entry === generatedFile) continue;
       const members = sqliteSetMembers(entry);
       if (!members.some((m2) => m2 !== entry && overlayEntries.includes(m2))) continue;
       let mainSt;
@@ -61997,9 +62023,9 @@ function refreshOverlayHome(realHome, overlay, generatedFile) {
       }
     }
     for (const entry of overlayEntries) {
-      if (generatedFiles.has(entry)) continue;
+      if (entry === generatedFile) continue;
       const overlayPath = path14.join(overlay, entry);
-      if (isGeneratedDraft(entry)) {
+      if (entry.startsWith(`.${generatedFile}.`) && entry.endsWith(".tmp")) {
         try {
           fs11.unlinkSync(overlayPath);
         } catch {
@@ -62033,7 +62059,7 @@ function refreshOverlayHome(realHome, overlay, generatedFile) {
             fs11.unlinkSync(overlayPath);
           } catch {
           }
-        } else if (mergeOverlayEntry(overlayPath, realPath, generatedFiles)) {
+        } else if (mergeOverlayEntry(overlayPath, realPath, generatedFile)) {
           try {
             fs11.rmSync(overlayPath, { recursive: true, force: true });
           } catch {
@@ -62055,7 +62081,7 @@ function refreshOverlayHome(realHome, overlay, generatedFile) {
     let total = 0;
     const linkFailures = [];
     for (const entry of realEntries) {
-      if (generatedFiles.has(entry)) continue;
+      if (entry === generatedFile) continue;
       total += 1;
       const overlayPath = path14.join(overlay, entry);
       let present = false;
@@ -62089,7 +62115,7 @@ function refreshOverlayHome(realHome, overlay, generatedFile) {
   }
   return true;
 }
-function mergeOverlayEntry(src, dst, excludedNames) {
+function mergeOverlayEntry(src, dst, excludedName) {
   let st2;
   try {
     st2 = fs11.lstatSync(src);
@@ -62123,8 +62149,8 @@ function mergeOverlayEntry(src, dst, excludedNames) {
     }
     let ok = true;
     for (const entry of entries) {
-      if (excludedNames?.has(entry)) continue;
-      if (!mergeOverlayEntry(path14.join(src, entry), path14.join(dst, entry), excludedNames)) ok = false;
+      if (excludedName !== void 0 && entry === excludedName) continue;
+      if (!mergeOverlayEntry(path14.join(src, entry), path14.join(dst, entry), excludedName)) ok = false;
     }
     return ok;
   }
@@ -62196,58 +62222,45 @@ function writeOverlayFileAtomic(overlay, fileName, contents) {
     }
   }
 }
-function writePiCompactionDisabledSettings(piHome, overlay) {
-  let settings = {};
+function preparePiHttpRewrite(piHome, origin, httpRewrites, httpsRewrites) {
+  if (httpRewrites.length === 0 && httpsRewrites.length === 0) return void 0;
+  const modelsPath = path14.join(piHome, "models.json");
+  let txt;
   try {
-    const parsed = JSON.parse(fs11.readFileSync(path14.join(piHome, "settings.json"), "utf8"));
-    if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
-      settings = parsed;
-    }
+    txt = fs11.readFileSync(modelsPath, "utf8");
   } catch {
+    return void 0;
   }
-  const compactionRaw = settings.compaction;
-  const compaction = compactionRaw && typeof compactionRaw === "object" && !Array.isArray(compactionRaw) ? { ...compactionRaw } : {};
-  compaction.enabled = false;
-  settings.compaction = compaction;
-  writeOverlayFileAtomic(overlay, "settings.json", JSON.stringify(settings, null, 2));
-}
-function preparePiHttpRewrite(piHome, origin, httpRewrites, httpsRewrites) {
-  if (!fs11.existsSync(piHome)) return void 0;
-  const overlay = `${piHome}-bili`;
-  const generated = ["settings.json"];
-  let modelsRoot;
+  let parsed;
   try {
-    const parsed = JSON.parse(fs11.readFileSync(path14.join(piHome, "models.json"), "utf8"));
-    if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
-      modelsRoot = parsed;
-      generated.push("models.json");
-    }
+    parsed = JSON.parse(txt);
   } catch {
+    return void 0;
   }
-  if (!refreshOverlayHome(piHome, overlay, generated)) return void 0;
-  if (modelsRoot) {
-    const providersVal = modelsRoot.providers;
-    if (providersVal && typeof providersVal === "object" && !Array.isArray(providersVal)) {
-      const providers = providersVal;
-      for (const r of httpRewrites) {
-        const prov = providers[r.key];
-        if (prov && typeof prov === "object" && !Array.isArray(prov)) {
-          const p2 = prov;
-          const existing = typeof p2.baseUrl === "string" ? p2.baseUrl : r.realUpstream;
-          p2.baseUrl = wrapUpstream(origin, unwrapUpstream2(existing));
-        }
+  if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) return void 0;
+  const root = parsed;
+  const providersVal = root.providers;
+  if (providersVal && typeof providersVal === "object" && !Array.isArray(providersVal)) {
+    const providers = providersVal;
+    for (const r of httpRewrites) {
+      const prov = providers[r.key];
+      if (prov && typeof prov === "object" && !Array.isArray(prov)) {
+        const p2 = prov;
+        const existing = typeof p2.baseUrl === "string" ? p2.baseUrl : r.realUpstream;
+        p2.baseUrl = wrapUpstream(origin, unwrapUpstream2(existing));
       }
-      for (const r of httpsRewrites) {
-        const prov = providers[r.key];
-        if (prov && typeof prov === "object" && !Array.isArray(prov)) {
-          const p2 = prov;
-          p2.baseUrl = r.realUpstream;
-        }
+    }
+    for (const r of httpsRewrites) {
+      const prov = providers[r.key];
+      if (prov && typeof prov === "object" && !Array.isArray(prov)) {
+        const p2 = prov;
+        p2.baseUrl = r.realUpstream;
       }
     }
-    writeOverlayFileAtomic(overlay, "models.json", JSON.stringify(modelsRoot));
   }
-  writePiCompactionDisabledSettings(piHome, overlay);
+  const overlay = `${piHome}-bili`;
+  if (!refreshOverlayHome(piHome, overlay, "models.json")) return void 0;
+  writeOverlayFileAtomic(overlay, "models.json", JSON.stringify(root));
   return overlay;
 }
 function atomicWriteTextFile(filePath, contents) {