billion-context 0.1.65-pr.366.215 → 0.1.65-pr.370.220

package/dist/index.js

@@ -50005,8 +50005,7 @@ async function flushAllSessions() {
 function parseCompressInput(input, callId) {
   const { ranges, diagnostics } = parseCompressArgs(input, { callId });
   if (!diagnostics.ok && diagnostics.kind !== "ok") {
-    const category = diagnostics.kind === "missing-content" || diagnostics.kind === "empty-input" ? "empty-call" : diagnostics.kind === "malformed-json" || diagnostics.kind === "truncated" ? "stream-concat" : "validation";
-    log("warn", `[acp-compress-input] rejected: category=${category} kind=${diagnostics.kind} invalidItems=${diagnostics.invalidItems}${diagnostics.keys ? ` keys=[${diagnostics.keys.join(",")}]` : ""}${diagnostics.length !== void 0 ? ` len=${diagnostics.length}` : ""}${callId ? ` callId=${callId}` : ""}`);
+    log("warn", `[acp-compress-input] rejected: kind=${diagnostics.kind} invalidItems=${diagnostics.invalidItems}${diagnostics.keys ? ` keys=[${diagnostics.keys.join(",")}]` : ""}${diagnostics.length !== void 0 ? ` len=${diagnostics.length}` : ""}`);
   }
   return ranges;
 }
@@ -50104,17 +50103,23 @@ function normalizeSseLineEndings(buf) {
 var PAIRED = /\x3cacp\s[^<>]{0,256}>([^<>]{0,64})<\/acp>/;
 var LONE_OPEN = /\x3cacp(?:\s[^<>]{0,256})?>/;
 var LONE_CLOSE = /<\/acp(?=[\s>])[^<>]{0,32}>/;
-var PARTIAL_TAIL = /(\x3cacp\s[^<>]*|<\/?a?c?p?)$/;
+var PARTIAL_TAIL = /(\x3cacp\s[^<>]*|\x3c\/acp(?:\s[^<>]*)?|<\/?a?c?p?)$/;
 var TRUNC_OPEN = /\x3cacp\s[^<>]*$/;
+var TRUNC_CLOSE = /\x3c\/acp(?:\s[^<>]*)?$/;
 var CLOSE_TAG = "</acp";
 var HOLD_LIMIT = 128;
 var TAG_OPEN_CAP = 4096;
 var SWALLOW_CAP = 80;
 function stripAcpTags(text) {
-  return text.replace(new RegExp(PAIRED.source, "g"), "").replace(new RegExp(LONE_OPEN.source, "g"), "").replace(new RegExp(LONE_CLOSE.source, "g"), "").replace(new RegExp(TRUNC_OPEN.source), "");
+  return text.replace(new RegExp(PAIRED.source, "g"), "").replace(new RegExp(LONE_OPEN.source, "g"), "").replace(new RegExp(LONE_CLOSE.source, "g"), "").replace(new RegExp(TRUNC_OPEN.source), "").replace(new RegExp(TRUNC_CLOSE.source), "");
 }
+var RENDER_TAG_DETECT = /\x3c\/?acp(?=[\s>])|\\u003c\/?acp(?=[\s>\\])/;
 function containsRenderTagText(s3) {
-  return /\x3c\/?acp(?=[\s>])/.test(s3) || /\\u003c\/?acp(?=[\s>\\])/.test(s3);
+  return RENDER_TAG_DETECT.test(s3);
+}
+var TOOL_CALL_XML = /\x3c\/?(?:antml:)?(invoke|tool_calls|tool_call|parameter|parameters)\b[^<>]*\x3e|\\u003c\/?(?:antml:)?(invoke|tool_calls|tool_call|parameter|parameters)\b|\x3c\/?antml:[a-z_]+/i;
+function containsToolCallXmlFragment(s3) {
+  return TOOL_CALL_XML.test(s3);
 }
 function createTagEchoFilter(onDrop) {
   let held = "";
@@ -50163,7 +50168,7 @@ function createTagEchoFilter(onDrop) {
       if (!m2) {
         const t = PARTIAL_TAIL.exec(buf);
         if (t) {
-          const definite = /^\x3cacp\s/.test(t[0]);
+          const definite = /^\x3cacp\s/.test(t[0]) || /^\x3c\/acp/.test(t[0]);
           const cap = definite ? TAG_OPEN_CAP : HOLD_LIMIT;
           if (t[0].length <= cap) {
             held = t[0];
@@ -50210,6 +50215,11 @@ function createTagEchoFilter(onDrop) {
         drop(t[0]);
         return rest.slice(0, t.index);
       }
+      const tc = new RegExp(TRUNC_CLOSE.source).exec(rest);
+      if (tc) {
+        drop(tc[0]);
+        return rest.slice(0, tc.index);
+      }
       return rest;
     },
     dropped() {
@@ -51074,6 +51084,23 @@ function isLoopThinking(m2) {
 function stripLoopThinking(messages) {
   return messages.filter((m2) => !isLoopThinking(m2));
 }
+function canonicalArgs(args) {
+  try {
+    return JSON.stringify(sortKeys(JSON.parse(args)));
+  } catch {
+    return args;
+  }
+}
+function sortKeys(v2) {
+  if (Array.isArray(v2)) return v2.map(sortKeys);
+  if (v2 !== null && typeof v2 === "object") {
+    const src = v2;
+    const out = {};
+    for (const k2 of Object.keys(src).sort()) out[k2] = sortKeys(src[k2]);
+    return out;
+  }
+  return v2;
+}
 function executeProxyTool(toolName, args, ctx, callId) {
   if (toolName === "compress") {
     return applyRanges(parseCompressInput(args, callId), ctx);
@@ -51148,6 +51175,7 @@ async function* runCompressLoop(upstream, ctx, requestBody, requestOptions, adap
   let currentUpstream = upstream;
   const coreMessages = [...ctx.messages];
   let degradedRetried = false;
+  const failedSignatures = /* @__PURE__ */ new Set();
   try {
     for (let round = 1; round <= MAX_LOOP_ROUNDS; round++) {
       if (signal?.aborted) break;
@@ -51338,6 +51366,19 @@ async function* runCompressLoop(upstream, ctx, requestBody, requestOptions, adap
         yield adapter.emitCompletion({ finishReason: "length", usage });
         return;
       }
+      const failedMutating = proxyResults.filter(
+        (pr2) => (pr2.name === "compress" || pr2.name === "decompress") && pr2.result.includes("FAILED")
+      );
+      if (reRequest && failedMutating.length > 0 && failedMutating.length === proxyResults.length) {
+        const repeated = failedMutating.some((pr2) => failedSignatures.has(`${pr2.name}\0${canonicalArgs(pr2.arguments)}`));
+        if (repeated) {
+          ctx.log(`[acp-loop] round ${round}: model re-submitted an already-failed compress with identical arguments; stopping after ${round} round(s) instead of ${MAX_LOOP_ROUNDS}`);
+          log("warn", `[acp-loop] repeated identical compress failure at round ${round}; breaking early (#156)`);
+          yield adapter.emitCompletion({ finishReason: "length", usage });
+          return;
+        }
+      }
+      for (const pr2 of failedMutating) failedSignatures.add(`${pr2.name}\0${canonicalArgs(pr2.arguments)}`);
       ctx.log(`[acp-loop] round ${round}: proxy tool executed; re-requesting so the model sees the result`);
       if (signal?.aborted) break;
       const fetchUpstream = (body) => fetchWithRetry(
@@ -53215,14 +53256,14 @@ var MIN_TAIL_MATCH = 3;
 var MAX_STORED_ITEMS = 128;
 var MIN_FORK_PREFIX = 3;
 function stableStringify(value) {
-  return JSON.stringify(sortKeys(value));
+  return JSON.stringify(sortKeys2(value));
 }
-function sortKeys(value) {
-  if (Array.isArray(value)) return value.map(sortKeys);
+function sortKeys2(value) {
+  if (Array.isArray(value)) return value.map(sortKeys2);
   if (value && typeof value === "object") {
     const record = value;
     const out = {};
-    for (const key of Object.keys(record).sort()) out[key] = sortKeys(record[key]);
+    for (const key of Object.keys(record).sort()) out[key] = sortKeys2(record[key]);
     return out;
   }
   return value;
@@ -55421,6 +55462,28 @@ async function decodeRequestBody(contentEncoding, input, maxOutputBytes) {
 function bodyDumpEnabled() {
   return process.env.ACP_DUMP_BODY === "1";
 }
+var dumpFailCount = 0;
+var lastDumpFailLog = 0;
+function logDumpFailure(where, err2) {
+  dumpFailCount++;
+  const now = Date.now();
+  if (dumpFailCount === 1 || now - lastDumpFailLog >= 6e4) {
+    lastDumpFailLog = now;
+    const msg = err2 instanceof Error ? err2.message : String(err2);
+    log("warn", `[dump] ${where} failed (total ${dumpFailCount}x): ${msg}`);
+  }
+}
+var unrecognizedPathCounts = /* @__PURE__ */ new Map();
+function logUnrecognizedPath(log2, url) {
+  const key = maskUrlsInText(url.split("?")[0]);
+  const n = (unrecognizedPathCounts.get(key) ?? 0) + 1;
+  unrecognizedPathCounts.set(key, n);
+  if (n <= 3) {
+    log2("warn", `unrecognized path ${key} \u2014 not a known protocol (/chat/completions, /v1/messages, /responses, /responses/compact); forwarding unchanged`);
+  } else if (n === 4) {
+    log2("info", `unrecognized path ${key}: forwarding unchanged; further occurrences suppressed`);
+  }
+}
 var BILI_HOP_HEADER = "x-bili-hop";
 function parseLauncherModelWindows(raw) {
   if (!raw) return {};
@@ -55868,7 +55931,8 @@ async function handle(req, res, opts, core, config, log2, instanceId) {
 ${hdrText}
 
 ${bodyBuffer.toString("utf8")}`);
-    } catch {
+    } catch (err2) {
+      logDumpFailure("INCOMING dump", err2);
     }
   }
   let reqConfig = config;
@@ -56073,7 +56137,7 @@ ${bodyBuffer.toString("utf8")}`);
   }
   if (!prepared) {
     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`);
+      logUnrecognizedPath(log2, req.url ?? "");
     }
     await forward(req, res, opts, bodyBuffer, null, core, reqConfig, log2, route, instanceId, void 0);
   }
@@ -56698,7 +56762,8 @@ ${hdrText}
 
 ${bodyText}`);
       log2("info", `[debug] RAW request dump: ${reqPath}`);
-    } catch {
+    } catch (err2) {
+      logDumpFailure("REQ dump", err2);
     }
   }
   const dispatcher = proxyDispatcher(proxyUrl);
@@ -56746,7 +56811,8 @@ ${bodyText}`);
 ${hdrText}
 `);
       log2("info", `[debug] RAW response dump: ${resPath}`);
-    } catch {
+    } catch (err2) {
+      logDumpFailure("RES dump", err2);
     }
   }
   if (!upstream.ok) {
@@ -56882,12 +56948,16 @@ ${hdrText}
         systemPrompt,
         clientAbort.signal
       );
+      let protocolFragmentWarned = false;
       for await (const chunk of loop) {
         if (res.destroyed || res.writableEnded) break;
         {
           const s3 = chunk.toString("utf8");
           if (s3.includes("<acp ") || s3.includes("</acp")) {
             log2("warn", `[${prepared.session.id}] tag echo: ${prepared.protocol} response stream contains <acp tag`);
+          } else if (!protocolFragmentWarned && containsToolCallXmlFragment(s3)) {
+            protocolFragmentWarned = true;
+            log2("warn", `[${prepared.session.id}] tag echo: ${prepared.protocol} response stream contains tool-call XML fragment (possible tag echo; not stripped)`);
           }
         }
         res.write(chunk);
@@ -56995,7 +57065,7 @@ async function dumpStreamToFile(stream2, dir, name) {
     mkdirSync6(dir, { recursive: true });
     const ws2 = createWriteStream2(join4(dir, name));
     ws2.on("error", (e) => {
-      log("debug", `[dump] write stream error: ${e.message ?? e}`);
+      logDumpFailure("SSE stream dump", e);
     });
     const reader = stream2.getReader();
     try {
@@ -57008,7 +57078,8 @@ async function dumpStreamToFile(stream2, dir, name) {
       reader.releaseLock();
       ws2.end();
     }
-  } catch {
+  } catch (err2) {
+    logDumpFailure("SSE stream dump", err2);
   }
 }
 function deriveTitle(messages) {