fix(compaction): count bashExecution and summary turns in pre-prompt overflow precheck (openclaw#97861)

yetval · web-flow · commit 24626e5266b7 · 2026-06-29T10:47:45.000-07:00
estimateMessageTokenPressure special-cased toolResult, tool, and
assistant roles and otherwise read record.content. bashExecution stores
its payload in command/output and branchSummary/compactionSummary store
theirs in summary, so record.content was undefined and those turns
scored as bare boundary overhead. The provider request expands them via
convertToLlm into full user text, so bash-heavy sessions skipped the
preflight overflow gate and submitted oversized prompts.

Estimate each affected role from the exact text convertToLlm renders:
bashExecutionToText for bash turns (zero for excludeFromContext records,
which convertToLlm drops), and the summary prefix/suffix plus summary
text for the two summary roles.
diff --git a/src/agents/embedded-agent-runner/run/preemptive-compaction.bashexec.test.ts b/src/agents/embedded-agent-runner/run/preemptive-compaction.bashexec.test.ts
@@ -0,0 +1,85 @@
+import type { AgentMessage } from "openclaw/plugin-sdk/agent-core";
+import { describe, expect, it } from "vitest";
+import { convertToLlm } from "../../../../packages/agent-core/src/harness/messages.js";
+import {
+  estimateLlmBoundaryTokenPressure,
+  shouldPreemptivelyCompactBeforePrompt,
+} from "./preemptive-compaction.js";
+
+const BIG_OUTPUT = "build log line ".repeat(90000);
+
+function bashExecMessage(output = BIG_OUTPUT): AgentMessage {
+  return {
+    role: "bashExecution",
+    command: "npm run build",
+    output,
+    exitCode: 0,
+    cancelled: false,
+    truncated: false,
+    timestamp: 1,
+  } as unknown as AgentMessage;
+}
+
+function compactionSummaryMessage(summary: string): AgentMessage {
+  return {
+    role: "compactionSummary",
+    summary,
+    tokensBefore: 0,
+    timestamp: 1,
+  } as unknown as AgentMessage;
+}
+
+function providerTokenApprox(message: AgentMessage): number {
+  const [llm] = convertToLlm([message]);
+  const content =
+    llm && Array.isArray((llm as { content?: unknown }).content)
+      ? (llm as { content: { type: string; text?: string }[] }).content
+      : [];
+  const text = content
+    .filter((b) => b.type === "text")
+    .map((b) => b.text ?? "")
+    .join("");
+  return Math.ceil(text.length / 4);
+}
+
+describe("preemptive precheck counts bashExecution and summary turns", () => {
+  it("estimates a large bash turn near its provider-rendered size", () => {
+    const msg = bashExecMessage();
+    const realProviderTokens = providerTokenApprox(msg);
+    const precheckTokens = estimateLlmBoundaryTokenPressure({ messages: [msg], prompt: "" });
+
+    expect(realProviderTokens).toBeGreaterThan(50000);
+    expect(precheckTokens).toBeGreaterThanOrEqual(realProviderTokens);
+  });
+
+  it("counts compactionSummary text instead of bare boundary overhead", () => {
+    const msg = compactionSummaryMessage("recap ".repeat(20000));
+    const realProviderTokens = providerTokenApprox(msg);
+    const precheckTokens = estimateLlmBoundaryTokenPressure({ messages: [msg], prompt: "" });
+
+    expect(realProviderTokens).toBeGreaterThan(20000);
+    expect(precheckTokens).toBeGreaterThanOrEqual(realProviderTokens);
+  });
+
+  it("drops a bash turn excluded from context", () => {
+    const excluded = {
+      ...(bashExecMessage() as unknown as Record<string, unknown>),
+      excludeFromContext: true,
+    } as unknown as AgentMessage;
+
+    expect(estimateLlmBoundaryTokenPressure({ messages: [excluded], prompt: "" })).toBeLessThan(50);
+  });
+
+  it("routes an oversized bash transcript to compaction", () => {
+    const decision = shouldPreemptivelyCompactBeforePrompt({
+      messages: [bashExecMessage()],
+      prompt: "continue",
+      contextTokenBudget: 128000,
+      reserveTokens: 16384,
+    });
+
+    expect(decision.route).not.toBe("fits");
+    expect(decision.shouldCompact).toBe(true);
+    expect(decision.overflowTokens).toBeGreaterThan(0);
+  });
+});
diff --git a/src/agents/embedded-agent-runner/run/preemptive-compaction.ts b/src/agents/embedded-agent-runner/run/preemptive-compaction.ts
@@ -9,7 +9,14 @@ import {
   MIN_PROMPT_BUDGET_TOKENS,
 } from "../../agent-compaction-constants.js";
 import { SAFETY_MARGIN } from "../../compaction.js";
-import type { AgentMessage } from "../../runtime/index.js";
+import type { AgentMessage, BashExecutionMessage } from "../../runtime/index.js";
+import {
+  BRANCH_SUMMARY_PREFIX,
+  BRANCH_SUMMARY_SUFFIX,
+  bashExecutionToText,
+  COMPACTION_SUMMARY_PREFIX,
+  COMPACTION_SUMMARY_SUFFIX,
+} from "../../runtime/index.js";
 import { estimateToolResultReductionPotential } from "../tool-result-truncation.js";
 import type { PreemptiveCompactionRoute } from "./preemptive-compaction.types.js";
 
@@ -158,6 +165,30 @@ function estimateMessageTokenPressure(message: AgentMessage): number {
     return tokens;
   }
 
+  if (record.role === "bashExecution") {
+    if (record.excludeFromContext === true) {
+      return 0;
+    }
+    tokens += estimateStringTokenPressure(
+      bashExecutionToText(record as unknown as BashExecutionMessage),
+    );
+    return tokens;
+  }
+
+  if (record.role === "branchSummary") {
+    const summary = typeof record.summary === "string" ? record.summary : "";
+    tokens += estimateStringTokenPressure(BRANCH_SUMMARY_PREFIX + summary + BRANCH_SUMMARY_SUFFIX);
+    return tokens;
+  }
+
+  if (record.role === "compactionSummary") {
+    const summary = typeof record.summary === "string" ? record.summary : "";
+    tokens += estimateStringTokenPressure(
+      COMPACTION_SUMMARY_PREFIX + summary + COMPACTION_SUMMARY_SUFFIX,
+    );
+    return tokens;
+  }
+
   if (record.role === "assistant") {
     const content = record.content;
     if (Array.isArray(content)) {
