billion-context-pi 0.1.60 → 0.1.61-pr.346.140

package/dist/index.js

@@ -193,7 +193,7 @@ function formatRanges(compressible, protectedRanges) {
   if (compressible.length === 0 && protectedRanges.length === 0) {
     return "[No specific ranges detected \u2014 compress any consumed content.]";
   }
-  const refNum2 = (ref) => {
+  const refNum = (ref) => {
     const m2 = ref.match(/\d+/);
     return m2 ? parseInt(m2[0], 10) : 0;
   };
@@ -202,8 +202,8 @@ function formatRanges(compressible, protectedRanges) {
     entries.push({
       startRef: r.startRef,
       endRef: r.endRef,
-      startNum: refNum2(r.startRef),
-      endNum: refNum2(r.endRef),
+      startNum: refNum(r.startRef),
+      endNum: refNum(r.endRef),
       count: r.count,
       tokens: r.tokens,
       toolPct: r.toolPct,
@@ -220,8 +220,8 @@ function formatRanges(compressible, protectedRanges) {
     entries.push({
       startRef: r.startRef,
       endRef: r.endRef,
-      startNum: refNum2(r.startRef),
-      endNum: refNum2(r.endRef),
+      startNum: refNum(r.startRef),
+      endNum: refNum(r.endRef),
       count: r.count,
       tokens: r.tokens,
       toolPct: 0,
@@ -1012,25 +1012,71 @@ var KEEP_LAST_ORPHANED = 2;
 function rangeKey(startRef, endRef) {
   return `${startRef}::${endRef}`;
 }
-function rewriteCompressText(text, liveKeys) {
+function parseCallText(text) {
+  const raw = text ?? "";
+  const start = raw.indexOf("{");
+  if (start < 0) return null;
   let parsed;
   try {
-    parsed = JSON.parse(text ?? "");
+    parsed = JSON.parse(raw.slice(start));
   } catch {
     return null;
   }
   if (!parsed || typeof parsed !== "object") return null;
   const obj = parsed;
-  const content = obj.content;
-  if (!Array.isArray(content) || content.length === 0) return null;
+  let content = null;
+  let contentWasString = false;
+  if (Array.isArray(obj.content)) {
+    content = obj.content;
+  } else if (typeof obj.content === "string") {
+    contentWasString = true;
+    try {
+      const inner = JSON.parse(obj.content);
+      if (Array.isArray(inner)) content = inner;
+    } catch {
+      content = null;
+    }
+  }
+  if (!content || content.length === 0) return null;
+  return { prefix: raw.slice(0, start), obj, content, contentWasString };
+}
+function rewriteCompressText(text, liveKeys) {
+  const parsed = parseCallText(text);
+  if (!parsed) return null;
+  const { prefix, obj, content, contentWasString } = parsed;
   const kept = content.filter((entry) => {
     if (!entry || typeof entry !== "object") return false;
-    const s = typeof entry.startId === "string" ? entry.startId : typeof entry.messageId === "string" ? entry.messageId : "";
-    const e = typeof entry.endId === "string" ? entry.endId : typeof entry.messageId === "string" ? entry.messageId : "";
-    return liveKeys.has(rangeKey(s, e));
+    const e = entry;
+    const s = typeof e.startId === "string" ? e.startId : typeof e.messageId === "string" ? e.messageId : "";
+    const end = typeof e.endId === "string" ? e.endId : typeof e.messageId === "string" ? e.messageId : "";
+    return liveKeys.has(rangeKey(s, end));
+  });
+  if (kept.length === 0) return null;
+  return prefix + serializeCompacted(obj, kept, contentWasString).text;
+}
+var SUMMARY_STUB_CHARS = 200;
+function compactEntry(entry) {
+  if (!entry || typeof entry !== "object") return entry;
+  const e = entry;
+  if (typeof e.summary !== "string" || e.summary.length <= SUMMARY_STUB_CHARS) return entry;
+  return { ...e, summary: `${e.summary.slice(0, SUMMARY_STUB_CHARS - 1)}\u2026` };
+}
+function serializeCompacted(obj, content, contentWasString) {
+  let changed = false;
+  const compacted = content.map((entry) => {
+    const out = compactEntry(entry);
+    if (out !== entry) changed = true;
+    return out;
   });
-  if (kept.length === content.length || kept.length === 0) return null;
-  return JSON.stringify({ ...obj, content: kept });
+  const outContent = contentWasString ? JSON.stringify(compacted) : compacted;
+  return { text: JSON.stringify({ ...obj, content: outContent }), changed };
+}
+function compactCompressText(text) {
+  const parsed = parseCallText(text);
+  if (!parsed) return null;
+  const { prefix, obj, content, contentWasString } = parsed;
+  const { text: out, changed } = serializeCompacted(obj, content, contentWasString);
+  return changed ? prefix + out : null;
 }
 function hideConsumedCompressCalls(state, messages) {
   const allBlockCallIds = /* @__PURE__ */ new Set();
@@ -1089,6 +1135,11 @@ function hideConsumedCompressCalls(state, messages) {
           continue;
         }
       }
+      const compacted = compactCompressText(message.text);
+      if (compacted !== null) {
+        result.push({ ...message, text: compacted });
+        continue;
+      }
     }
     result.push(message);
   }
@@ -1609,10 +1660,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);
 }
@@ -1665,42 +1712,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 rn = refNum(ref);
+    if (isSyntheticOrPruned(msg, state)) {
+      skipSinceCompressible = true;
+      skipSinceProtected = true;
+      continue;
+    }
     if (isMessageProtectedWithPairing(msg, config, protectedCallIds)) {
       protectedMsgs.push({
         ref,
-        refNum: rn,
+        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: rn,
+      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,
@@ -1727,14 +1782,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,
@@ -2904,7 +2956,7 @@ function renderUncompressedRanges(visible) {
     lines.push("  (no uncompressed messages)");
     return lines.join("\n");
   }
-  const refNum2 = (ref) => {
+  const refNum = (ref) => {
     const m2 = ref.match(/\d+/);
     return m2 ? parseInt(m2[0], 10) : 0;
   };
@@ -2921,7 +2973,7 @@ function renderUncompressedRanges(visible) {
   };
   const merged = [];
   for (const m2 of visible) {
-    const num2 = refNum2(m2.ref);
+    const num2 = refNum(m2.ref);
     const last = merged[merged.length - 1];
     if (last && num2 === last.startNum + last.count) {
       last.endRef = m2.ref;
@@ -3017,6 +3069,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);
@@ -3060,6 +3129,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);
@@ -3081,7 +3151,17 @@ function parseObjectValue(value, callId, diag) {
 }
 function parseContentArray(s) {
   const cleaned = stripFence(s.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(s) {
+  let value = s === "" ? void 0 : tryParseLenient(s);
   if (typeof value === "string") {
     value = tryParseLenient(stripFence(value));
   }
@@ -3089,7 +3169,7 @@ function parseContentArray(s) {
     return { entries: value, salvaged: false };
   }
   if (value === void 0) {
-    const entries = salvageContentEntries('{"content": ' + cleaned);
+    const entries = salvageContentEntries('{"content": ' + s);
     return { entries, salvaged: entries.length > 0 };
   }
   return null;
@@ -3162,6 +3242,71 @@ function tryParseLenient(s) {
   }
   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(s) {
   if (!s.startsWith("```")) return s;
   const firstNewline = s.indexOf("\n");
@@ -3999,6 +4144,10 @@ function safeStringify(value) {
 function coreOutToAgentMessages(coreOut, originalById) {
   const out = [];
   const emittedSplit = /* @__PURE__ */ new Set();
+  const kernelTextByCallId = /* @__PURE__ */ new Map();
+  for (const core of coreOut) {
+    if (core.toolCallId && core.text) kernelTextByCallId.set(core.toolCallId, core.text);
+  }
   for (const core of coreOut) {
     if (core.id.startsWith("acp_summary_")) continue;
     const hashIdx = core.id.indexOf("#");
@@ -4015,11 +4164,37 @@ function coreOutToAgentMessages(coreOut, originalById) {
     const survivingCallIds = new Set(
       coreOut.filter((c) => c.id.startsWith(`${baseId}#`) && !c.id.startsWith("acp_summary_")).map((c) => c.toolCallId).filter((id) => !!id)
     );
-    out.push(reconstructToolCallMessage(original, core, survivingCallIds));
+    out.push(reconstructToolCallMessage(original, core, survivingCallIds, kernelTextByCallId));
   }
   return out;
 }
-function reconstructToolCallMessage(original, firstCore, survivingCallIds) {
+function compactedArgsFrom(kernelText, originalArgs) {
+  if (!kernelText) return null;
+  const start = kernelText.indexOf("{");
+  if (start < 0) return null;
+  let parsed;
+  try {
+    parsed = JSON.parse(kernelText.slice(start));
+  } catch {
+    return null;
+  }
+  if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) return null;
+  if (safeStringify(parsed) === safeStringify(originalArgs)) return null;
+  return parsed;
+}
+function syncToolCallArgs(blocks, kernelTextFor) {
+  let changed = false;
+  const out = blocks.map((block) => {
+    const b2 = block;
+    if (b2.type !== "toolCall" || !b2.id) return block;
+    const compacted = compactedArgsFrom(kernelTextFor(b2.id), b2.arguments);
+    if (compacted === null) return block;
+    changed = true;
+    return { ...b2, arguments: compacted };
+  });
+  return changed ? out : blocks;
+}
+function reconstructToolCallMessage(original, firstCore, survivingCallIds, kernelTextByCallId) {
   const base = original;
   const match = firstCore.text ? firstCore.text.match(REF_TAG) : null;
   const tag = match ? match[0] : null;
@@ -4030,7 +4205,10 @@ function reconstructToolCallMessage(original, firstCore, survivingCallIds) {
       if (b2.type === "toolCall") return survivingCallIds.has(b2.id ?? "");
       return true;
     });
-    const peeled2 = peelRefTagBlocks(filtered2);
+    const peeled2 = syncToolCallArgs(
+      peelRefTagBlocks(filtered2),
+      (callId) => kernelTextByCallId.get(callId)
+    );
     return { ...original, content: peeled2 };
   }
   const rawBlocks = Array.isArray(base.content) ? base.content : typeof base.content === "string" ? [{ type: "text", text: base.content }] : [];
@@ -4039,7 +4217,10 @@ function reconstructToolCallMessage(original, firstCore, survivingCallIds) {
     if (b2.type === "toolCall") return survivingCallIds.has(b2.id ?? "");
     return true;
   });
-  const peeled = peelRefTagBlocks(filtered);
+  const peeled = syncToolCallArgs(
+    peelRefTagBlocks(filtered),
+    (callId) => kernelTextByCallId.get(callId)
+  );
   const stableTag = rewriteTagTokens(tag, coreBodyOf(firstCore.text ?? "", tag));
   const lastTextIdx = [...peeled].reverse().findIndex((b2) => b2.type === "text");
   if (lastTextIdx >= 0) {
@@ -4060,11 +4241,23 @@ function coreBodyOf(coreText, tag) {
   return coreText.slice(bodyStart);
 }
 function patchRefTag(original, core) {
+  const base = original;
+  if (base.role === "assistant") {
+    if (core.contentType === "tool-call" && core.toolCallId) {
+      const rawBlocks2 = Array.isArray(base.content) ? base.content : [];
+      const synced = syncToolCallArgs(
+        rawBlocks2,
+        (callId) => callId === core.toolCallId ? core.text : void 0
+      );
+      if (synced !== rawBlocks2) {
+        return { ...original, content: synced };
+      }
+    }
+    return original;
+  }
   const match = core.text ? core.text.match(REF_TAG) : null;
   const tag = match ? match[0] : null;
   if (!tag) return original;
-  const base = original;
-  if (base.role === "assistant") return original;
   const coreBody = coreBodyOf(core.text ?? "", tag);
   const originalBody = extractText(base.content);
   const trimEnd = (s) => s.replace(/\s+$/, "");
@@ -9731,6 +9924,21 @@ function tier3OnlyRewrite(newBlocks, allBlocks) {
   }
   return spans;
 }
+function tierReadyHint(state, config) {
+  if (!config.tiers.enabled) return "";
+  const active = state.blocks.filter((b2) => b2.active);
+  const first = (bs) => bs[0]?.blockId ?? "";
+  const last = (bs) => bs[bs.length - 1]?.blockId ?? "";
+  const t2 = active.filter((b2) => b2.tier === 2);
+  if (t2.length >= config.tiers.tier3Trigger) {
+    return `Actionable now: condense tier-2 blocks ${first(t2)}..${last(t2)} into a single tier-3 block (compress({ content: [{ startId: "${first(t2)}", endId: "${last(t2)}", summary: "..." }] })).`;
+  }
+  const t1 = active.filter((b2) => b2.tier === 1);
+  if (t1.length >= config.tiers.tier2Trigger) {
+    return `Actionable now: distill tier-1 blocks ${first(t1)}..${last(t1)} into a single tier-2 block (compress({ content: [{ startId: "${first(t1)}", endId: "${last(t1)}", summary: "..." }] })).`;
+  }
+  return "";
+}
 async function handleCompress(args, runtime, ctx, toolCallId) {
   const maybeRanges = normalizeRanges(args);
   if (typeof maybeRanges === "string") throw new Error(maybeRanges);
@@ -9801,8 +10009,9 @@ async function handleCompress(args, runtime, ctx, toolCallId) {
       event: "tier3-rewrite-rejected",
       spans: rewriteSpans
     });
+    const hint = tierReadyHint(state, config);
     throw new Error(
-      `Range ${rewriteSpans.join(", ")} only re-condenses terminal tier-3 block(s) \u2014 T3 is the highest tier, so rewriting it reclaims nothing and can repeat forever (dog/billion-context-pi#3). Nothing was compressed. Use search_context or decompress to retrieve details, or pick a range containing uncompressed messages (acp_status lists compressible ranges).`
+      `Range ${rewriteSpans.join(", ")} only re-condenses terminal tier-3 block(s) \u2014 T3 is the highest tier, so rewriting it reclaims nothing and can repeat forever (dog/billion-context-pi#3). Nothing was compressed. ` + (hint ? `${hint} ` : "") + `Use search_context or decompress to retrieve details, or pick a range containing uncompressed messages (acp_status lists compressible ranges).`
     );
   }
   await runtime.save(applied.state, ctx);
@@ -16540,7 +16749,7 @@ async function statusReport(runtime, ctx) {
   const sentTokens = estimateTokens(coreMessages, coveredIds, imageTokens) + systemPromptTokens;
   const viewSentTokens = adjustedTokenCount(runtime.core, coreMessages, state, config, sentTokens, imageTokens, systemPromptTokens);
   const turn = runtime.core.processTurn({ messages: coreMessages, state, config, tokenCount: anchorStale ? viewSentTokens : Math.max(viewSentTokens, realUsage?.tokens ?? 0) });
-  const versionStr = "0.1.60" ? `billion-context-pi@${"0.1.60"}` : void 0;
+  const versionStr = "0.1.61" ? `billion-context-pi@${"0.1.61"}` : void 0;
   let text = buildStatusPanel({
     version: versionStr,
     tokenCount: sessionTokens,
@@ -17074,7 +17283,7 @@ async function autoInstallLatest(latest, extDirOverride) {
       "--no-fund",
       "--no-save"
     ];
-    const prevVersion = (await readPackageJson(join11(extDir, "package.json")))?.version ?? "0.1.60";
+    const prevVersion = (await readPackageJson(join11(extDir, "package.json")))?.version ?? "0.1.61";
     const { code, stderr } = await runNpmImpl(installArgs(latest), { cwd: npmDir, timeout: 6e4 });
     if (code !== 0) {
       logWarn("update", {
@@ -17092,7 +17301,7 @@ async function autoInstallLatest(latest, extDirOverride) {
     }
     const verify = await verifyInstall(npmDir, latest);
     if (!verify.ok) {
-      const rollbackTo = SEMVER_RE.test(prevVersion) ? prevVersion : "0.1.60";
+      const rollbackTo = SEMVER_RE.test(prevVersion) ? prevVersion : "0.1.61";
       logWarn("update", { event: "auto-install-verify-failed", latest, reason: verify.reason, rollbackTo });
       const rb = await runNpmImpl(installArgs(rollbackTo), { cwd: npmDir, timeout: 6e4 });
       logInfo("update", { event: "rollback", from: latest, to: rollbackTo, ok: rb.code === 0 });
@@ -17167,7 +17376,7 @@ async function checkForUpdate(autoUpdate, notify) {
     }
     const latest = await fetchLatestVersion(tag);
     if (!latest) return;
-    const current = runtimeVersion ?? "0.1.60";
+    const current = runtimeVersion ?? "0.1.61";
     const hasUpdate = isVersionNewer(latest, current);
     debug.event("update-check", {
       current,
@@ -17345,7 +17554,7 @@ function wireSessionLifecycle(pi, runtime, standDownIfProxied) {
     setDelegatePolicy(DEFAULT_DELEGATE_POLICY);
     const sid = ctx.sessionManager.getSessionId();
     const modelInfo = ctx.model;
-    logInfo("session", { event: "start", sid, cwd: ctx.cwd, debug: runtime.adapter.debug ?? null, version: true ? "0.1.60" : null, model: modelInfo?.id ?? null, modelApi: modelInfo?.api ?? null, contextWindow: modelInfo?.contextWindow ?? null });
+    logInfo("session", { event: "start", sid, cwd: ctx.cwd, debug: runtime.adapter.debug ?? null, version: true ? "0.1.61" : null, model: modelInfo?.id ?? null, modelApi: modelInfo?.api ?? null, contextWindow: modelInfo?.contextWindow ?? null });
     try {
       await runtime.reloadConfig(ctx.cwd);
       const delegateCfg = resolveDelegate(runtime.adapter);