billion-context 0.1.94 → 0.1.95-pr.634.455

package/dist/index.js

@@ -43650,7 +43650,7 @@ function formatRanges(compressible, protectedRanges) {
   if (compressible.length === 0 && protectedRanges.length === 0) {
     return "[No specific ranges detected \u2014 compress any consumed content.]";
   }
-  const refNum4 = (ref) => {
+  const refNum3 = (ref) => {
     const m2 = ref.match(/\d+/);
     return m2 ? parseInt(m2[0], 10) : 0;
   };
@@ -43659,8 +43659,8 @@ function formatRanges(compressible, protectedRanges) {
     entries.push({
       startRef: r.startRef,
       endRef: r.endRef,
-      startNum: refNum4(r.startRef),
-      endNum: refNum4(r.endRef),
+      startNum: refNum3(r.startRef),
+      endNum: refNum3(r.endRef),
       count: r.count,
       tokens: r.tokens,
       toolPct: r.toolPct,
@@ -43677,8 +43677,8 @@ function formatRanges(compressible, protectedRanges) {
     entries.push({
       startRef: r.startRef,
       endRef: r.endRef,
-      startNum: refNum4(r.startRef),
-      endNum: refNum4(r.endRef),
+      startNum: refNum3(r.startRef),
+      endNum: refNum3(r.endRef),
       count: r.count,
       tokens: r.tokens,
       toolPct: 0,
@@ -45328,10 +45328,6 @@ function adjustBoundariesForReasoningPairs(startIndex, endIndex, messages) {
   }
   return { startIndex: newStartIndex, endIndex: newEndIndex };
 }
-function refNum(ref) {
-  const n = parseInt(ref.slice(1), 10);
-  return Number.isNaN(n) ? -1 : n;
-}
 function estimateTextTokens(text) {
   return Math.ceil(text.length / 4);
 }
@@ -45384,42 +45380,50 @@ function buildCompressibleRanges(messages, state, config, protectedZoneRefs, cou
   const compressibleMsgs = [];
   const protectedMsgs = [];
   const protectedCallIds = collectProtectedToolCallIds(messages, config);
+  let skipSinceCompressible = false;
+  let skipSinceProtected = false;
   for (const msg of messages) {
-    if (isSyntheticOrPruned(msg, state)) continue;
     const ref = state.messageRefs.byRaw[msg.id];
     if (!ref || ref === "BLOCKED") continue;
-    const rn2 = refNum(ref);
+    if (isSyntheticOrPruned(msg, state)) {
+      skipSinceCompressible = true;
+      skipSinceProtected = true;
+      continue;
+    }
     if (isMessageProtectedWithPairing(msg, config, protectedCallIds)) {
       protectedMsgs.push({
         ref,
-        refNum: rn2,
+        gapBefore: skipSinceProtected,
         tokens: countTokens(msg.text ?? ""),
         tools: msg.toolName ? [msg.toolName] : []
       });
+      skipSinceProtected = false;
+      skipSinceCompressible = true;
       continue;
     }
     if (protectedZoneRefs?.has(ref)) {
+      skipSinceCompressible = true;
+      skipSinceProtected = true;
       continue;
     }
     compressibleMsgs.push({
       ref,
-      refNum: rn2,
+      gapBefore: skipSinceCompressible,
       tokens: countTokens(msg.text ?? ""),
       chars: (msg.text ?? "").length,
       isTool: isToolMessage(msg),
       isUser: msg.role === "user"
     });
+    skipSinceCompressible = false;
+    skipSinceProtected = true;
   }
   const compressible = [];
   let cur = null;
-  let prevRefNum = -2;
   for (const info of compressibleMsgs) {
-    const hasGap = info.refNum > prevRefNum + 1;
-    if (cur && (info.isUser && cur.count >= 3 || hasGap)) {
+    if (cur && (info.isUser && cur.count >= 3 || info.gapBefore)) {
       compressible.push(cur);
       cur = null;
     }
-    prevRefNum = info.refNum;
     if (!cur) {
       cur = {
         startRef: info.ref,
@@ -45446,14 +45450,11 @@ function buildCompressibleRanges(messages, state, config, protectedZoneRefs, cou
   if (cur) compressible.push(cur);
   const protectedRanges = [];
   let pcur = null;
-  let pPrevRefNum = -2;
   for (const info of protectedMsgs) {
-    const hasGap = info.refNum > pPrevRefNum + 1;
-    if (pcur && hasGap) {
+    if (pcur && info.gapBefore) {
       protectedRanges.push(pcur);
       pcur = null;
     }
-    pPrevRefNum = info.refNum;
     if (!pcur) {
       pcur = {
         startRef: info.ref,
@@ -46647,7 +46648,7 @@ function renderUncompressedRanges(visible) {
     lines.push("  (no uncompressed messages)");
     return lines.join("\n");
   }
-  const refNum22 = (ref) => {
+  const refNum3 = (ref) => {
     const m2 = ref.match(/\d+/);
     return m2 ? parseInt(m2[0], 10) : 0;
   };
@@ -46664,7 +46665,7 @@ function renderUncompressedRanges(visible) {
   };
   const merged = [];
   for (const m2 of visible) {
-    const num3 = refNum22(m2.ref);
+    const num3 = refNum3(m2.ref);
     const last = merged[merged.length - 1];
     if (last && num3 === last.startNum + last.count) {
       last.endRef = m2.ref;
@@ -46828,6 +46829,23 @@ function parseStringInput(raw, callId, diag) {
   diag.rawPrefix = raw.slice(0, 800);
   diag.length = raw.length;
   const cleaned = stripFence(raw.trim());
+  const first = parseStringCore(cleaned, callId, diag);
+  if (first.ranges.length === 0 || first.diagnostics.invalidItems > 0) {
+    const normalized = normalizeSingleQuotes(cleaned);
+    if (normalized !== void 0) {
+      const retryDiag = { ok: false, kind: "ok", invalidItems: 0 };
+      retryDiag.rawPrefix = diag.rawPrefix;
+      retryDiag.length = diag.length;
+      const retry = parseStringCore(normalized, callId, retryDiag);
+      if (retry.ranges.length > first.ranges.length) {
+        retryDiag.quoteSalvage = true;
+        return retry;
+      }
+    }
+  }
+  return first;
+}
+function parseStringCore(cleaned, callId, diag) {
   if (cleaned === "") {
     diag.kind = "empty-input";
     return finish([], diag);
@@ -46871,6 +46889,7 @@ function parseObjectValue(value, callId, diag) {
     }
     entries = parsed.entries;
     salvaged = parsed.salvaged;
+    if (parsed.quoteRepaired) diag.quoteSalvage = true;
   } else {
     diag.kind = "content-not-array";
     return finish([], diag);
@@ -46892,7 +46911,17 @@ function parseObjectValue(value, callId, diag) {
 }
 function parseContentArray(s3) {
   const cleaned = stripFence(s3.trim());
-  let value = cleaned === "" ? void 0 : tryParseLenient(cleaned);
+  const direct = parseContentArrayCore(cleaned);
+  if (direct !== null && direct.entries.length > 0) return direct;
+  const normalized = normalizeSingleQuotes(cleaned);
+  if (normalized !== void 0) {
+    const retry = parseContentArrayCore(normalized);
+    if (retry !== null && retry.entries.length > 0) return { ...retry, quoteRepaired: true };
+  }
+  return direct;
+}
+function parseContentArrayCore(s3) {
+  let value = s3 === "" ? void 0 : tryParseLenient(s3);
   if (typeof value === "string") {
     value = tryParseLenient(stripFence(value));
   }
@@ -46900,7 +46929,7 @@ function parseContentArray(s3) {
     return { entries: value, salvaged: false };
   }
   if (value === void 0) {
-    const entries = salvageContentEntries('{"content": ' + cleaned);
+    const entries = salvageContentEntries('{"content": ' + s3);
     return { entries, salvaged: entries.length > 0 };
   }
   return null;
@@ -46973,6 +47002,71 @@ function tryParseLenient(s3) {
   }
   return void 0;
 }
+function normalizeSingleQuotes(raw) {
+  if (!raw.includes("'") || !raw.includes("{") && !raw.includes("[")) return void 0;
+  let out = "";
+  let changed = false;
+  let inDouble = false;
+  let inSingle = false;
+  for (let i = 0; i < raw.length; i++) {
+    const ch = raw.charAt(i);
+    if (inDouble) {
+      out += ch;
+      if (ch === "\\" && i + 1 < raw.length) {
+        out += raw.charAt(i + 1);
+        i++;
+      } else if (ch === '"') {
+        inDouble = false;
+      }
+      continue;
+    }
+    if (inSingle) {
+      if (ch === "\\" && i + 1 < raw.length) {
+        const next = raw.charAt(i + 1);
+        out += next === "'" ? "'" : "\\" + next;
+        i++;
+        continue;
+      }
+      if (ch === "'") {
+        out += '"';
+        inSingle = false;
+        changed = true;
+        continue;
+      }
+      if (ch === '"') {
+        out += '\\"';
+        continue;
+      }
+      if (ch === "\n") {
+        out += "\\n";
+        continue;
+      }
+      if (ch === "\r") {
+        out += "\\r";
+        continue;
+      }
+      if (ch === "	") {
+        out += "\\t";
+        continue;
+      }
+      out += ch;
+      continue;
+    }
+    if (ch === '"') {
+      inDouble = true;
+      out += ch;
+      continue;
+    }
+    if (ch === "'") {
+      inSingle = true;
+      out += '"';
+      changed = true;
+      continue;
+    }
+    out += ch;
+  }
+  return changed ? out : void 0;
+}
 function stripFence(s3) {
   if (!s3.startsWith("```")) return s3;
   const firstNewline = s3.indexOf("\n");
@@ -49210,6 +49304,7 @@ function anthropicToCore(body) {
   const msgs = [];
   const cacheControls = /* @__PURE__ */ new Map();
   const clusters = new ClusterCounter();
+  const toolNames = /* @__PURE__ */ new Map();
   for (const m2 of body.messages) {
     const blocks = typeof m2.content === "string" ? [{ type: "text", text: m2.content }] : m2.content;
     for (const b2 of blocks) {
@@ -49235,6 +49330,7 @@ function anthropicToCore(body) {
             toolCallId: b2.id,
             text: safeStringify(b2.input)
           });
+          toolNames.set(b2.id, b2.name);
           if (b2.cache_control) cacheControls.set(id, b2.cache_control);
           break;
         }
@@ -49242,12 +49338,14 @@ function anthropicToCore(body) {
           const text = typeof b2.content === "string" ? b2.content : b2.content.map((c) => c.text).join("\n");
           const base = deriveMessageId("tool", "tool-result", text, { toolCallId: b2.tool_use_id });
           const id = clusters.next(base);
+          const name = toolNames.get(b2.tool_use_id);
           msgs.push({
             id,
             role: "tool",
             contentType: "tool-result",
             toolCallId: b2.tool_use_id,
             text,
+            ...name ? { toolName: name } : {},
             ...b2.is_error === true ? { toolIsError: true } : {}
           });
           if (b2.cache_control) cacheControls.set(id, b2.cache_control);
@@ -49395,6 +49493,7 @@ function openaiToCore(body) {
   const msgs = [];
   const systemParts = [];
   const clusters = new ClusterCounter();
+  const toolNames = /* @__PURE__ */ new Map();
   for (const m2 of body.messages) {
     switch (m2.role) {
       case "system":
@@ -49462,6 +49561,7 @@ function openaiToCore(body) {
               toolCallId: tc.id,
               text: tc.function.arguments ?? ""
             });
+            toolNames.set(tc.id, tc.function.name);
           }
         }
         break;
@@ -49470,12 +49570,14 @@ function openaiToCore(body) {
         const base = deriveMessageId("tool", "tool-result", stringContent(m2.content), {
           toolCallId: m2.tool_call_id ?? ""
         });
+        const name = m2.name || toolNames.get(m2.tool_call_id ?? "");
         msgs.push({
           id: clusters.next(base),
           role: "tool",
           contentType: "tool-result",
           toolCallId: m2.tool_call_id ?? "",
-          text: stringContent(m2.content)
+          text: stringContent(m2.content),
+          ...name ? { toolName: name } : {}
         });
         break;
       }
@@ -49580,7 +49682,7 @@ function allImageParts(content) {
     if (typeof p2 !== "object" || p2 === null) continue;
     if (!("type" in p2) || p2.type !== "image_url" || !("image_url" in p2)) continue;
     const imagePart = p2;
-    const url = imagePart.image_url.url;
+    const url = imagePart.image_url?.url;
     if (typeof url === "string" && parseDataUrl(url)) out.push(p2);
   }
   return out;
@@ -49592,6 +49694,14 @@ var OPAQUE_ITEM_TYPES = /* @__PURE__ */ new Set([
 function isOpaqueItem(item) {
   return OPAQUE_ITEM_TYPES.has(item.type);
 }
+var EASY_INPUT_ROLES = /* @__PURE__ */ new Set(["user", "assistant", "system", "developer"]);
+function normalizeEasyInputItem(item) {
+  if (typeof item.type === "string") return item;
+  if (EASY_INPUT_ROLES.has(String(item.role))) {
+    return { ...item, type: "message" };
+  }
+  return item;
+}
 function shouldDropAllReasoning() {
   return (process.env.ACP_REASONING_KEEP ?? "").trim().toLowerCase() === "none";
 }
@@ -49628,6 +49738,7 @@ function responsesToCore(body) {
   const layout = [];
   let droppedReasoning = 0;
   const clusters = new ClusterCounter();
+  const toolNames = /* @__PURE__ */ new Map();
   let idx = 0;
   if (typeof body.instructions === "string" && body.instructions.trim()) systemParts.push(body.instructions);
   if (typeof body.input === "string") {
@@ -49635,7 +49746,8 @@ function responsesToCore(body) {
     msgs.push({ id, role: "user", contentType: "text", text: body.input });
     return { msgs, systemParts, preamble, customToolCallIds, layout, droppedReasoning, stringInput: { original: body.input, coreId: id } };
   }
-  for (const item of body.input) {
+  for (const raw of body.input) {
+    const item = normalizeEasyInputItem(raw);
     let coreId;
     if (isOpaqueItem(item)) preamble.push(item);
     switch (item.type) {
@@ -49710,13 +49822,15 @@ function responsesToCore(body) {
           text: call.arguments ?? "",
           rawResponsesItem: item
         });
+        toolNames.set(call.call_id, call.name);
         break;
       }
       case "function_call_output": {
         const output = item;
         const text = typeof output.output === "string" ? output.output : JSON.stringify(output.output);
         coreId = clusters.next(deriveMessageId("tool", "tool-result", text, { toolCallId: output.call_id }));
-        msgs.push({ id: coreId, role: "tool", contentType: "tool-result", toolCallId: output.call_id, text, rawResponsesItem: item });
+        const name = toolNames.get(output.call_id);
+        msgs.push({ id: coreId, role: "tool", contentType: "tool-result", toolCallId: output.call_id, text, ...name ? { toolName: name } : {}, rawResponsesItem: item });
         break;
       }
       case "computer_call":
@@ -49738,6 +49852,7 @@ function responsesToCore(body) {
         const argText = ctc.input ?? ctc.arguments ?? "";
         coreId = clusters.next(deriveMessageId("assistant", "tool-call", argText, { toolCallId: callId, toolName: ctc.name ?? "custom" }));
         msgs.push({ id: coreId, role: "assistant", contentType: "tool-call", toolName: ctc.name ?? "custom", toolCallId: callId, text: argText, rawResponsesItem: item });
+        toolNames.set(callId, ctc.name ?? "custom");
         break;
       }
       case "custom_tool_call_output": {
@@ -49746,7 +49861,8 @@ function responsesToCore(body) {
         customToolCallIds.add(callId);
         const outText = typeof ctco.output === "string" ? ctco.output : JSON.stringify(ctco.output ?? "");
         coreId = clusters.next(deriveMessageId("tool", "tool-result", outText, { toolCallId: callId }));
-        msgs.push({ id: coreId, role: "tool", contentType: "tool-result", toolCallId: callId, text: outText, rawResponsesItem: item });
+        const name = toolNames.get(callId);
+        msgs.push({ id: coreId, role: "tool", contentType: "tool-result", toolCallId: callId, text: outText, ...name ? { toolName: name } : {}, rawResponsesItem: item });
         break;
       }
       default:
@@ -51067,97 +51183,14 @@ var ABSORB_TOOL_RESPONSES = {
   parameters: ABSORB_TOOL_OPENAI.function.parameters
 };
 function parseCompressInput(input, callId) {
-  const first = parseCompressArgs(input, { callId });
-  if (first.ranges.length === 0 || first.diagnostics.invalidItems > 0) {
-    const normalized = normalizeQuoteShape(input);
-    if (normalized !== void 0) {
-      const retry = parseCompressArgs(normalized, { callId });
-      if (retry.ranges.length > first.ranges.length) {
-        log("warn", `[acp-compress-input] quote-salvage: recovered ${retry.ranges.length} range(s) after single->double quote normalization (was ${first.ranges.length}, kind=${first.diagnostics.kind})`);
-        return { ranges: retry.ranges, diagnostics: retry.diagnostics };
-      }
-    }
-  }
-  if (!first.diagnostics.ok && first.diagnostics.kind !== "ok") {
-    log("warn", `[acp-compress-input] rejected: kind=${first.diagnostics.kind} invalidItems=${first.diagnostics.invalidItems}${first.diagnostics.keys ? ` keys=[${first.diagnostics.keys.join(",")}]` : ""}${first.diagnostics.length !== void 0 ? ` len=${first.diagnostics.length}` : ""}${first.diagnostics.invalidReasons && first.diagnostics.invalidReasons.length > 0 ? ` reasons=[${first.diagnostics.invalidReasons.join(" | ")}]` : ""}`);
+  const parsed = parseCompressArgs(input, { callId });
+  if (parsed.diagnostics.quoteSalvage === true) {
+    log("warn", `[acp-compress-input] quote-salvage: recovered ${parsed.ranges.length} range(s) after single->double quote normalization (kind=${parsed.diagnostics.kind})`);
   }
-  return { ranges: first.ranges, diagnostics: first.diagnostics };
-}
-function normalizeQuoteShape(input) {
-  if (typeof input === "string") return normalizeSingleQuotes(input);
-  if (input !== null && typeof input === "object" && !Array.isArray(input)) {
-    const obj = input;
-    if (typeof obj["content"] === "string") {
-      const fixed = normalizeSingleQuotes(obj["content"]);
-      if (fixed !== void 0) return { ...obj, content: fixed };
-    }
+  if (!parsed.diagnostics.ok && parsed.diagnostics.kind !== "ok") {
+    log("warn", `[acp-compress-input] rejected: kind=${parsed.diagnostics.kind} invalidItems=${parsed.diagnostics.invalidItems}${parsed.diagnostics.keys ? ` keys=[${parsed.diagnostics.keys.join(",")}]` : ""}${parsed.diagnostics.length !== void 0 ? ` len=${parsed.diagnostics.length}` : ""}${parsed.diagnostics.invalidReasons && parsed.diagnostics.invalidReasons.length > 0 ? ` reasons=[${parsed.diagnostics.invalidReasons.join(" | ")}]` : ""}`);
   }
-  return void 0;
-}
-function normalizeSingleQuotes(raw) {
-  if (!raw.includes("'") || !raw.includes("{") && !raw.includes("[")) return void 0;
-  let out = "";
-  let changed = false;
-  let inDouble = false;
-  let inSingle = false;
-  for (let i = 0; i < raw.length; i++) {
-    const ch = raw.charAt(i);
-    if (inDouble) {
-      out += ch;
-      if (ch === "\\" && i + 1 < raw.length) {
-        out += raw.charAt(i + 1);
-        i++;
-      } else if (ch === '"') {
-        inDouble = false;
-      }
-      continue;
-    }
-    if (inSingle) {
-      if (ch === "\\" && i + 1 < raw.length) {
-        const next = raw.charAt(i + 1);
-        out += next === "'" ? "'" : "\\" + next;
-        i++;
-        continue;
-      }
-      if (ch === "'") {
-        out += '"';
-        inSingle = false;
-        changed = true;
-        continue;
-      }
-      if (ch === '"') {
-        out += '\\"';
-        continue;
-      }
-      if (ch === "\n") {
-        out += "\\n";
-        continue;
-      }
-      if (ch === "\r") {
-        out += "\\r";
-        continue;
-      }
-      if (ch === "	") {
-        out += "\\t";
-        continue;
-      }
-      out += ch;
-      continue;
-    }
-    if (ch === '"') {
-      inDouble = true;
-      out += ch;
-      continue;
-    }
-    if (ch === "'") {
-      inSingle = true;
-      out += '"';
-      changed = true;
-      continue;
-    }
-    out += ch;
-  }
-  return changed ? out : void 0;
+  return { ranges: parsed.ranges, diagnostics: parsed.diagnostics };
 }
 var STAGED_COMPRESS_GUIDANCE = "\n\n[Smooth-transition guidance: when you compress, prefer a SMALLER, TAIL-biased range \u2014 compress the most recent large content and keep the stable prefix (the earliest messages) intact. A large single rewrite changes the request shape sharply and can trip provider risk-control; smaller tail-biased folds keep the prefix cache alive and the transition gentle.]";
 function withStagedCompressGuidance(text) {
@@ -51604,7 +51637,7 @@ ${lines.join("\n\n")}`;
   }
   return `[Unknown proxy tool: ${toolName}]`;
 }
-function refNum2(ref) {
+function refNum(ref) {
   return Number(ref.replace(/\D/g, "")) || 0;
 }
 function applyRanges(parsed, ctx) {
@@ -51653,7 +51686,7 @@ ${reasons.map((r) => `- ${r}`).join("\n")}` : "";
     }
     const preContext = ctx.session.stats.lastInputTokens;
     const shrinkRatio = preContext > 0 ? r.tokensCompressed / preContext : 0;
-    const foldPoint = [...ranges].sort((a, b2) => refNum2(a.startRef) - refNum2(b2.startRef))[0]?.startRef ?? "unknown";
+    const foldPoint = [...ranges].sort((a, b2) => refNum(a.startRef) - refNum(b2.startRef))[0]?.startRef ?? "unknown";
     ctx.session.lastCompress = { at: Date.now(), shrinkRatio, foldPoint, blocks: r.blocksCreated, tokensCompressed: r.tokensCompressed };
     ctx.log(`[acp-compress-obs] shrink ${Math.round(shrinkRatio * 100)}% (~${r.tokensCompressed}/${preContext} tok) foldPoint=${foldPoint} blocks=${r.blocksCreated}`);
     const warn = r.warnings.length > 0 ? ` ${r.warnings.join("; ")}` : "";
@@ -51720,7 +51753,7 @@ function refMaps(messages, state) {
   });
   return { refToIdx, idxToRef };
 }
-function refNum3(ref) {
+function refNum2(ref) {
   return Number(ref.replace(/\D/g, "")) || 0;
 }
 function estimateCoreMessages(messages) {
@@ -51970,7 +52003,7 @@ async function preflightCompress(deps, messages) {
       failure = { kind: "exhausted", detail: relaxed ? relaxedExhaustedDetail : "no compressible ranges remain in the conversation" };
       break;
     }
-    const ordered = [...ranges].sort((a, b2) => refNum3(a.startRef) - refNum3(b2.startRef));
+    const ordered = [...ranges].sort((a, b2) => refNum2(a.startRef) - refNum2(b2.startRef));
     let appliedThisRound = 0;
     for (const range of ordered) {
       if (currentTokens < limit) break;