fix(gateway): scope usage cost by agent filter

Alix-007 · steipete · commit 6079e7f3c0a9 · 2026-05-29T01:36:45.000+01:00
diff --git a/src/gateway/server-methods/usage.cost-usage-cache.test.ts b/src/gateway/server-methods/usage.cost-usage-cache.test.ts
@@ -86,14 +86,14 @@ describe("costUsageCache bounded growth", () => {
     // oldest-first, never the newest.
     const lastStartMs = Date.UTC(2026, 0, 1) + (ITERATIONS - 1) * DAY_MS;
     const lastEndMs = lastStartMs + ((ITERATIONS - 1) % 3 === 0 ? DAY_MS : 7 * DAY_MS) - 1;
-    const lastCacheKey = `${lastStartMs}-${lastEndMs}`;
+    const lastCacheKey = `__all__:${lastStartMs}-${lastEndMs}`;
     expect(testApi.costUsageCache.has(lastCacheKey)).toBe(true);
 
     // Tertiary: the oldest entry must have been evicted once the cap was
     // exceeded. Pre-fix all 600 entries remain and this fails too.
     const firstStartMs = Date.UTC(2026, 0, 1);
     const firstEndMs = firstStartMs + DAY_MS - 1;
-    const firstCacheKey = `${firstStartMs}-${firstEndMs}`;
+    const firstCacheKey = `__all__:${firstStartMs}-${firstEndMs}`;
     expect(testApi.costUsageCache.has(firstCacheKey)).toBe(false);
   });
 
@@ -125,7 +125,7 @@ describe("costUsageCache bounded growth", () => {
     });
     await Promise.resolve();
 
-    expect(testApi.costUsageCache.has("1-2")).toBe(true);
+    expect(testApi.costUsageCache.has("__all__:1-2")).toBe(true);
     expect(mocks.loadCostUsageSummaryFromCache).toHaveBeenCalledTimes(257);
     void inFlight.catch(() => {});
     void repeated.catch(() => {});
diff --git a/src/gateway/server-methods/usage.test.ts b/src/gateway/server-methods/usage.test.ts
@@ -18,7 +18,7 @@ vi.mock("../../infra/session-cost-usage.js", async () => {
 });
 
 import { loadCostUsageSummaryFromCache } from "../../infra/session-cost-usage.js";
-import { testApi } from "./usage.js";
+import { testApi, usageHandlers } from "./usage.js";
 
 describe("gateway usage helpers", () => {
   const dayMs = 24 * 60 * 60 * 1000;
@@ -161,4 +161,50 @@ describe("gateway usage helpers", () => {
       "background",
     );
   });
+
+  it("keeps cost usage cache entries scoped by agentId", async () => {
+    const config = {} as OpenClawConfig;
+
+    await testApi.loadCostUsageSummaryCached({
+      startMs: 1,
+      endMs: 2,
+      config,
+      agentId: "main",
+    });
+    await testApi.loadCostUsageSummaryCached({
+      startMs: 1,
+      endMs: 2,
+      config,
+      agentId: "research",
+    });
+    await testApi.loadCostUsageSummaryCached({
+      startMs: 1,
+      endMs: 2,
+      config,
+      agentId: "research",
+    });
+
+    expect(vi.mocked(loadCostUsageSummaryFromCache)).toHaveBeenCalledTimes(2);
+    expect(vi.mocked(loadCostUsageSummaryFromCache).mock.calls.at(0)?.[0]).toMatchObject({
+      agentId: "main",
+    });
+    expect(vi.mocked(loadCostUsageSummaryFromCache).mock.calls.at(1)?.[0]).toMatchObject({
+      agentId: "research",
+    });
+  });
+
+  it("passes usage.cost agentId through to the cost summary loader", async () => {
+    const respond = vi.fn();
+
+    await usageHandlers["usage.cost"]({
+      respond,
+      params: { startDate: "2026-02-01", endDate: "2026-02-02", agentId: "research" },
+      context: { getRuntimeConfig: () => ({}) },
+    } as unknown as Parameters<(typeof usageHandlers)["usage.cost"]>[0]);
+
+    expect(respond).toHaveBeenCalledWith(true, expect.any(Object), undefined);
+    expect(vi.mocked(loadCostUsageSummaryFromCache)).toHaveBeenCalledWith(
+      expect.objectContaining({ agentId: "research" }),
+    );
+  });
 });
diff --git a/src/gateway/server-methods/usage.ts b/src/gateway/server-methods/usage.ts
@@ -720,8 +720,9 @@ async function loadCostUsageSummaryCached(params: {
   startMs: number;
   endMs: number;
   config: OpenClawConfig;
+  agentId?: string;
 }): Promise<CostUsageSummary> {
-  const cacheKey = `${params.startMs}-${params.endMs}`;
+  const cacheKey = `${params.agentId ?? "__all__"}:${params.startMs}-${params.endMs}`;
   const now = Date.now();
   const cached = costUsageCache.get(cacheKey);
   if (
@@ -745,6 +746,7 @@ async function loadCostUsageSummaryCached(params: {
     startMs: params.startMs,
     endMs: params.endMs,
     config: params.config,
+    agentId: params.agentId,
     requestRefresh: true,
     refreshMode: "background",
   })
@@ -832,7 +834,8 @@ export const usageHandlers: GatewayRequestHandlers = {
       mode: params?.mode,
       utcOffset: params?.utcOffset,
     });
-    const summary = await loadCostUsageSummaryCached({ startMs, endMs, config });
+    const agentId = normalizeOptionalString(params?.agentId);
+    const summary = await loadCostUsageSummaryCached({ startMs, endMs, config, agentId });
     respond(true, summary, undefined);
   },
   "sessions.usage": async ({ respond, params, context }) => {
