fix(clownfish): address review for ghcrawl-156678-autonomous-smoke (1)

openclaw-clownfish[bot] · 425072024 · openclaw-clownfish[bot] · commit 0f3740507ecb · 2026-06-14T23:05:39.000Z
Co-authored-by: HollyChou &lt;128659251+Hollychou924@users.noreply.github.com&gt;

Co-authored-by: de1ty &lt;7804799+de1tydev@users.noreply.github.com&gt;

Co-authored-by: 吴杨帆 &lt;39647285+leno23@users.noreply.github.com&gt;

Co-authored-by: Zhao Shiqi &lt;109639815+425072024@users.noreply.github.com&gt;
diff --git a/src/agents/compaction-usage.ts b/src/agents/compaction-usage.ts
@@ -20,7 +20,10 @@ function parseCompactionUsageTimestamp(value: unknown): number | null {
 
 export function stripStaleAssistantUsageBeforeLatestCompaction<TMessage extends AgentMessage>(
   messages: TMessage[],
-  options: { mutate?: boolean } = {},
+  options: {
+    mutate?: boolean;
+    whenMissingCompactionSummary?: "preserve" | "zeroAssistantUsage";
+  } = {},
 ): TMessage[] {
   let latestCompactionSummaryIndex = -1;
   let latestCompactionTimestamp: number | null = null;
@@ -34,7 +37,8 @@ export function stripStaleAssistantUsageBeforeLatestCompaction<TMessage extends
       (entry as { timestamp?: unknown }).timestamp ?? null,
     );
   }
-  if (latestCompactionSummaryIndex === -1) {
+  const hasCompactionSummary = latestCompactionSummaryIndex !== -1;
+  if (!hasCompactionSummary && options.whenMissingCompactionSummary !== "zeroAssistantUsage") {
     return messages;
   }
 
@@ -53,10 +57,13 @@ export function stripStaleAssistantUsageBeforeLatestCompaction<TMessage extends
 
     const messageTimestamp = parseCompactionUsageTimestamp(candidate.timestamp);
     const compactionTimestamp = latestCompactionTimestamp;
-    const hasTimestampBoundary = compactionTimestamp !== null && messageTimestamp !== null;
+    const hasTimestampBoundary =
+      hasCompactionSummary && compactionTimestamp !== null && messageTimestamp !== null;
+    const staleByMissingSummary = !hasCompactionSummary;
     const staleByTimestamp = hasTimestampBoundary && messageTimestamp <= compactionTimestamp;
-    const staleByLegacyOrdering = !hasTimestampBoundary && i < latestCompactionSummaryIndex;
-    if (!staleByTimestamp && !staleByLegacyOrdering) {
+    const staleByLegacyOrdering =
+      hasCompactionSummary && !hasTimestampBoundary && i < latestCompactionSummaryIndex;
+    if (!staleByMissingSummary && !staleByTimestamp && !staleByLegacyOrdering) {
       continue;
     }
 
diff --git a/src/agents/embedded-agent-subscribe.handlers.compaction.test.ts b/src/agents/embedded-agent-subscribe.handlers.compaction.test.ts
@@ -469,6 +469,38 @@ describe("handleCompactionEnd", () => {
     expect(freshAssistant.usage).toEqual(freshUsage);
   });
 
+  it("clears assistant usage when final compaction has no summary marker", async () => {
+    const firstUsage = makeUsageSnapshot(120_000);
+    const secondUsage = makeUsageSnapshot(1_250);
+    const messages = [
+      makeAssistantUsageMessage({
+        text: "first answer before marker-free compaction",
+        usage: firstUsage,
+      }),
+      { role: "user", content: "new question" },
+      makeAssistantUsageMessage({
+        text: "second answer before marker-free compaction",
+        usage: secondUsage,
+      }),
+    ] as AgentMessage[];
+    const tmp = await fs.mkdtemp(path.join(os.tmpdir(), "openclaw-compaction-no-summary-"));
+    const storePath = path.join(tmp, "sessions.json");
+    const sessionKey = "main";
+    const ctx = createCompactionContext({
+      storePath,
+      sessionKey,
+      initialCount: 0,
+      messages,
+    });
+
+    finishCompaction(ctx);
+
+    const firstAssistant = messages[0] as Extract<AgentMessage, { role: "assistant" }>;
+    const secondAssistant = messages[2] as Extract<AgentMessage, { role: "assistant" }>;
+    expect(firstAssistant.usage).toEqual(makeZeroUsageSnapshot());
+    expect(secondAssistant.usage).toEqual(makeZeroUsageSnapshot());
+  });
+
   it("does not let legacy index fallback erase timestamp-fresh usage", async () => {
     const freshUsage = makeUsageSnapshot(1_250);
     const messages = [
diff --git a/src/agents/embedded-agent-subscribe.handlers.compaction.ts b/src/agents/embedded-agent-subscribe.handlers.compaction.ts
@@ -197,5 +197,11 @@ function clearStaleAssistantUsageOnSessionMessages(ctx: EmbeddedAgentSubscribeCo
   if (!Array.isArray(messages)) {
     return;
   }
-  stripStaleAssistantUsageBeforeLatestCompaction(messages, { mutate: true });
+  // Marker-free final compaction has no fresh boundary to compare against.
+  // Clear all assistant usage or stale pre-compaction totals keep driving the
+  // context counter after cleanup.
+  stripStaleAssistantUsageBeforeLatestCompaction(messages, {
+    mutate: true,
+    whenMissingCompactionSummary: "zeroAssistantUsage",
+  });
 }

Original file line number	Diff line number	Diff line change
`@@ -197,5 +197,11 @@ function clearStaleAssistantUsageOnSessionMessages(ctx: EmbeddedAgentSubscribeCo`
`197`	`197`	`if (!Array.isArray(messages)) {`
`198`	`198`	`return;`
`199`	`199`	`}`
`200`		`- stripStaleAssistantUsageBeforeLatestCompaction(messages, { mutate: true });`
	`200`	`+ // Marker-free final compaction has no fresh boundary to compare against.`
	`201`	`+ // Clear all assistant usage or stale pre-compaction totals keep driving the`
	`202`	`+ // context counter after cleanup.`
	`203`	`+ stripStaleAssistantUsageBeforeLatestCompaction(messages, {`
	`204`	`+ mutate: true,`
	`205`	`+ whenMissingCompactionSummary: "zeroAssistantUsage",`
	`206`	`+ });`
`201`	`207`	`}`