fix(subagents): roll announce token stats over to m

steipete · steipete · commit a6a6c10f96cd · 2026-05-31T23:52:13.000+01:00
diff --git a/src/agents/subagent-announce-output.test.ts b/src/agents/subagent-announce-output.test.ts
@@ -2,13 +2,19 @@ import { afterEach, describe, expect, it, vi } from "vitest";
 import {
   testing,
   applySubagentWaitOutcome,
+  buildCompactAnnounceStatsLine,
   buildChildCompletionFindings,
   readSubagentOutput,
 } from "./subagent-announce-output.js";
 
 type CallGateway = typeof import("../gateway/call.js").callGateway;
+type GetRuntimeConfig = typeof import("./subagent-announce.runtime.js").getRuntimeConfig;
+type ReadSessionEntry = typeof import("./subagent-announce.runtime.js").readSessionEntry;
 type ReadSessionMessagesAsync =
   typeof import("./subagent-announce.runtime.js").readSessionMessagesAsync;
+type ResolveAgentIdFromSessionKey =
+  typeof import("./subagent-announce.runtime.js").resolveAgentIdFromSessionKey;
+type ResolveStorePath = typeof import("./subagent-announce.runtime.js").resolveStorePath;
 
 function installOutputDeps(params: {
   messages: Array<unknown>;
@@ -53,6 +59,31 @@ function sessionsYieldTurn(message = "Waiting for subagent completion.") {
   ];
 }
 
+describe("buildCompactAnnounceStatsLine", () => {
+  afterEach(() => {
+    testing.setDepsForTest();
+  });
+
+  it("rolls one-decimal thousand token stats over to the million unit", async () => {
+    testing.setDepsForTest({
+      getRuntimeConfig: (() => ({ session: { store: "memory" } })) as GetRuntimeConfig,
+      readSessionEntry: (() => ({
+        inputTokens: 999_999,
+        outputTokens: 0,
+        totalTokens: 999_999,
+      })) as ReadSessionEntry,
+      resolveAgentIdFromSessionKey: (() => "main") as ResolveAgentIdFromSessionKey,
+      resolveStorePath: (() => "/tmp/openclaw-session-store") as ResolveStorePath,
+    });
+
+    await expect(
+      buildCompactAnnounceStatsLine({
+        sessionKey: "agent:main:subagent:child",
+      }),
+    ).resolves.toBe("Stats: runtime n/a • tokens 1.0m (in 1.0m / out 0)");
+  });
+});
+
 describe("readSubagentOutput", () => {
   afterEach(() => {
     testing.setDepsForTest();
diff --git a/src/agents/subagent-announce-output.ts b/src/agents/subagent-announce-output.ts
@@ -511,7 +511,13 @@ function formatTokenCount(value?: number) {
     return `${(value / 1_000_000).toFixed(1)}m`;
   }
   if (value >= 1_000) {
-    return `${(value / 1_000).toFixed(1)}k`;
+    const formattedThousands = (value / 1_000).toFixed(1);
+    // Keep the compact stats unit scheme stable when one-decimal rounding
+    // reaches the next unit, e.g. 999_999 -> 1000.0k.
+    if (Number(formattedThousands) >= 1_000) {
+      return `${(value / 1_000_000).toFixed(1)}m`;
+    }
+    return `${formattedThousands}k`;
   }
   return String(Math.round(value));
 }

Original file line number	Diff line number	Diff line change
`@@ -511,7 +511,13 @@ function formatTokenCount(value?: number) {`
`511`	`511`	return `${(value / 1_000_000).toFixed(1)}m`;
`512`	`512`	`}`
`513`	`513`	`if (value >= 1_000) {`
`514`		- return `${(value / 1_000).toFixed(1)}k`;
	`514`	`+ const formattedThousands = (value / 1_000).toFixed(1);`
	`515`	`+ // Keep the compact stats unit scheme stable when one-decimal rounding`
	`516`	`+ // reaches the next unit, e.g. 999_999 -> 1000.0k.`
	`517`	`+ if (Number(formattedThousands) >= 1_000) {`
	`518`	+ return `${(value / 1_000_000).toFixed(1)}m`;
	`519`	`+ }`
	`520`	+ return `${formattedThousands}k`;
`515`	`521`	`}`
`516`	`522`	`return String(Math.round(value));`
`517`	`523`	`}`