billion-context-pi 0.1.65 → 0.1.66-pr.363.154

package/dist/index.js

@@ -1650,8 +1650,12 @@ function adjustBoundariesForReasoningPairs(startIndex, endIndex, messages) {
         j2++;
       }
       const companion = messages[j2 + 1];
-      if (companion !== void 0 && companion.role === "assistant" && (companion.contentType === "text" || companion.contentType === "tool-call") && j2 + 1 > newEndIndex) {
-        newEndIndex = j2 + 1;
+      if (companion !== void 0 && companion.role === "assistant" && (companion.contentType === "text" || companion.contentType === "tool-call")) {
+        let e = j2 + 1;
+        while (e + 1 < messages.length && messages[e + 1].role === "assistant" && (messages[e + 1].contentType === "text" || messages[e + 1].contentType === "tool-call")) {
+          e++;
+        }
+        if (e > newEndIndex) newEndIndex = e;
       }
     }
     if (msg.role === "assistant" && (msg.contentType === "text" || msg.contentType === "tool-call")) {
@@ -1667,6 +1671,64 @@ function adjustBoundariesForReasoningPairs(startIndex, endIndex, messages) {
   }
   return { startIndex: newStartIndex, endIndex: newEndIndex };
 }
+function isAssistantAct(msg) {
+  return msg.role === "assistant" && (msg.contentType === "text" || msg.contentType === "tool-call");
+}
+function computeTurnGroups(messages) {
+  const resultIdByCallId = /* @__PURE__ */ new Map();
+  for (const msg of messages) {
+    if (msg.contentType === "tool-result" && typeof msg.toolCallId === "string" && msg.id) {
+      if (!resultIdByCallId.has(msg.toolCallId))
+        resultIdByCallId.set(msg.toolCallId, msg.id);
+    }
+  }
+  const grouped = /* @__PURE__ */ new Set();
+  const groups = [];
+  for (let i = 0; i < messages.length; i++) {
+    const msg = messages[i];
+    if (!msg.id || grouped.has(msg.id)) continue;
+    if (!(msg.contentType === "reasoning" || isAssistantAct(msg))) continue;
+    let reasoningStart = i;
+    if (msg.contentType === "reasoning") {
+      while (reasoningStart > 0 && messages[reasoningStart - 1].contentType === "reasoning") {
+        reasoningStart--;
+      }
+    } else {
+      let s = i;
+      while (s > 0 && isAssistantAct(messages[s - 1])) s--;
+      reasoningStart = s;
+      while (reasoningStart > 0 && messages[reasoningStart - 1].contentType === "reasoning") {
+        reasoningStart--;
+      }
+    }
+    const burstStart = (() => {
+      let s = reasoningStart;
+      while (s < messages.length && messages[s].contentType === "reasoning")
+        s++;
+      return s;
+    })();
+    if (burstStart >= messages.length || !isAssistantAct(messages[burstStart])) {
+      continue;
+    }
+    let burstEnd = burstStart;
+    while (burstEnd + 1 < messages.length && isAssistantAct(messages[burstEnd + 1])) {
+      burstEnd++;
+    }
+    const members = /* @__PURE__ */ new Set();
+    for (let k = reasoningStart; k <= burstEnd; k++) {
+      const m2 = messages[k];
+      if (!m2.id) continue;
+      members.add(m2.id);
+      if (m2.role === "assistant" && m2.contentType === "tool-call" && typeof m2.toolCallId === "string") {
+        const rid = resultIdByCallId.get(m2.toolCallId);
+        if (rid) members.add(rid);
+      }
+    }
+    for (const id of members) grouped.add(id);
+    groups.push([...members]);
+  }
+  return groups;
+}
 function estimateTextTokens(text) {
   return Math.ceil(text.length / 4);
 }
@@ -2381,6 +2443,42 @@ function applySingleRange(input) {
       )} from compression range (recent/last-user zone).`
     );
   }
+  {
+    const reasoningIds = /* @__PURE__ */ new Set();
+    const callIds = /* @__PURE__ */ new Set();
+    for (const m2 of input.messages) {
+      if (!m2.id) continue;
+      if (m2.contentType === "reasoning") reasoningIds.add(m2.id);
+      if (m2.role === "assistant" && m2.contentType === "tool-call") callIds.add(m2.id);
+    }
+    const withdrawIds = /* @__PURE__ */ new Set();
+    let splitTurnCount = 0;
+    for (const group of computeTurnGroups(input.messages)) {
+      const foldHasReasoning = group.some(
+        (id) => effectiveMessageIds.has(id) && reasoningIds.has(id)
+      );
+      if (!foldHasReasoning) continue;
+      const keptHasCall = group.some(
+        (id) => !effectiveMessageIds.has(id) && callIds.has(id)
+      );
+      if (!keptHasCall) continue;
+      splitTurnCount++;
+      for (const id of group) withdrawIds.add(id);
+    }
+    if (withdrawIds.size > 0) {
+      for (const id of withdrawIds) effectiveMessageIds.delete(id);
+      const beforeWithdraw = filteredIds.length;
+      filteredIds = filteredIds.filter((id) => !withdrawIds.has(id));
+      if (filteredIds.length === 0 && consumedBlockIds.length === 0) {
+        throw new Error(
+          `Range would split ${splitTurnCount} turn(s) at the protected-zone boundary: a visible tool-call must keep its reasoning run (strict-echo providers reject a rebuilt request that lost it). Shrink the range to end before the turn starts, or wait until the whole turn ages out of the protected zone.`
+        );
+      }
+      warnings.push(
+        `Withdrawn ${beforeWithdraw - filteredIds.length} message(s) from compression range to keep ${splitTurnCount} turn(s) intact (visible tool-call would lose its reasoning run).`
+      );
+    }
+  }
   if (!isBlockBoundary && filteredIds.length === 0 && consumedBlockIds.length > 0) {
     const first = consumedBlockIds[0];
     const last = consumedBlockIds[consumedBlockIds.length - 1];
@@ -3986,6 +4084,13 @@ function resolveReasoningDrop(cfg) {
   }
   return { drop: cfg?.drop !== false, threshold };
 }
+function isStrictReasoningEcho(provider, baseUrl) {
+  return /deepseek/i.test(baseUrl ?? "") || /deepseek/i.test(provider ?? "");
+}
+function applyStrictReasoningGate(cfg, provider, baseUrl) {
+  if (!cfg.drop || !isStrictReasoningEcho(provider, baseUrl)) return cfg;
+  return { ...cfg, drop: false };
+}
 function isThinking(part) {
   const p = part;
   return p?.type === "thinking" && typeof p.thinking === "string";
@@ -5235,6 +5340,7 @@ function createRuntime(adapter) {
   function dropTokenScale(sid) {
     tokenScaleStale.delete(sid);
   }
+  const strictEchoLogged = /* @__PURE__ */ new Set();
   const compressOutcomeSeen = /* @__PURE__ */ new Set();
   let compressFailTurnKey = null;
   let compressFailCount = 0;
@@ -5289,7 +5395,16 @@ function createRuntime(adapter) {
   }
   function reasoningDropFor(ctx) {
     const m2 = ctx.model;
-    return resolveReasoningDrop(resolveCompress(adapterRef.compress, m2?.provider, m2?.id).reasoning);
+    const resolved = resolveReasoningDrop(resolveCompress(adapterRef.compress, m2?.provider, m2?.id).reasoning);
+    const gated = applyStrictReasoningGate(resolved, m2?.provider, m2?.baseUrl);
+    if (resolved.drop && !gated.drop) {
+      const sid = ctx.sessionManager.getSessionId();
+      if (!strictEchoLogged.has(sid)) {
+        strictEchoLogged.add(sid);
+        logInfo("runtime", { sid, event: "compress-reasoning-auto-disabled", reason: "strict-echo-upstream", provider: m2?.provider ?? null, issue: "#361" });
+      }
+    }
+    return gated;
   }
   async function reloadConfig(cwd) {
     let user;
@@ -16867,7 +16982,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.65" ? `billion-context-pi@${"0.1.65"}` : void 0;
+  const versionStr = "0.1.66" ? `billion-context-pi@${"0.1.66"}` : void 0;
   let text = buildStatusPanel({
     version: versionStr,
     tokenCount: sessionTokens,
@@ -17565,7 +17680,7 @@ async function autoInstallLatest(latest, extDirOverride) {
       "--no-fund",
       "--no-save"
     ];
-    const prevVersion = (await readPackageJson(join11(extDir, "package.json")))?.version ?? "0.1.65";
+    const prevVersion = (await readPackageJson(join11(extDir, "package.json")))?.version ?? "0.1.66";
     const { code, stderr } = await runNpmImpl(installArgs(latest), { cwd: npmDir, timeout: 6e4 });
     if (code !== 0) {
       logWarn("update", {
@@ -17583,7 +17698,7 @@ async function autoInstallLatest(latest, extDirOverride) {
     }
     const verify = await verifyInstall(npmDir, latest);
     if (!verify.ok) {
-      const rollbackTo = SEMVER_RE.test(prevVersion) ? prevVersion : "0.1.65";
+      const rollbackTo = SEMVER_RE.test(prevVersion) ? prevVersion : "0.1.66";
       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 });
@@ -17658,7 +17773,7 @@ async function checkForUpdate(autoUpdate, notify) {
     }
     const latest = await fetchLatestVersion(tag);
     if (!latest) return;
-    const current = runtimeVersion ?? "0.1.65";
+    const current = runtimeVersion ?? "0.1.66";
     const hasUpdate = isVersionNewer(latest, current);
     debug.event("update-check", {
       current,
@@ -17836,7 +17951,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.65" : 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.66" : null, model: modelInfo?.id ?? null, modelApi: modelInfo?.api ?? null, contextWindow: modelInfo?.contextWindow ?? null });
     try {
       await runtime.reloadConfig(ctx.cwd);
       const delegateCfg = resolveDelegate(runtime.adapter);