From f93c8ea524daa0e7ff9ef0b7887ced8eaac09499 Mon Sep 17 00:00:00 2001 From: yiling Date: Thu, 23 Jul 2026 11:11:48 +0800 Subject: [PATCH] refactor(agent): invoke harness.subscribe directly without typeof check --- packages/agent/src/activities/agent.test.ts | 7 +++ packages/agent/src/activities/agent.ts | 60 ++++++++++----------- packages/core/src/ai-usage/ai-usage.ts | 1 - 3 files changed, 36 insertions(+), 32 deletions(-) diff --git a/packages/agent/src/activities/agent.test.ts b/packages/agent/src/activities/agent.test.ts index c797a41c..fb27c0ab 100644 --- a/packages/agent/src/activities/agent.test.ts +++ b/packages/agent/src/activities/agent.test.ts @@ -56,6 +56,7 @@ describe('Agent Activities', () => { it('should call agentChatActivity and prompt the harness', async () => { const mockHarness = { + subscribe: vi.fn(), prompt: vi.fn().mockResolvedValue({ content: [{ type: 'text', text: 'AI response' }], usage: { input: 10, output: 20 }, @@ -185,6 +186,7 @@ describe('Agent Activities', () => { }) const mockHarness = { + subscribe: vi.fn(), prompt: vi.fn().mockReturnValue(promptPromise), abort: vi.fn(), } @@ -252,6 +254,7 @@ describe('Agent Activities', () => { }) const mockHarness = { + subscribe: vi.fn(), prompt: vi.fn().mockReturnValue(promptPromise), abort: vi.fn(), } @@ -312,6 +315,7 @@ describe('Agent Activities', () => { it('should include error message in text when stopReason is error', async () => { const mockHarness = { + subscribe: vi.fn(), prompt: vi.fn().mockResolvedValue({ content: [], usage: { input: 0, output: 0 }, @@ -352,6 +356,7 @@ describe('Agent Activities', () => { it('should pass thinkingLevel from agent config to createAgentSession', async () => { const mockHarness = { + subscribe: vi.fn(), prompt: vi.fn().mockResolvedValue({ content: [], usage: { input: 0, output: 0 }, @@ -400,6 +405,7 @@ describe('Agent Activities', () => { it('should call autofillAiActivity and run autofill tool', async () => { const mockHarness = { + subscribe: vi.fn(), prompt: vi.fn().mockResolvedValue({ content: [{ type: 'text', text: 'Captured' }], usage: { input: 5, output: 5 }, @@ -1040,6 +1046,7 @@ describe('Agent Database Activities Integration', () => { }) const mockHarness = { + subscribe: vi.fn(), prompt: vi.fn().mockResolvedValue({ content: [{ type: 'text', text: ' "Summarized Chat Title" ' }], }), diff --git a/packages/agent/src/activities/agent.ts b/packages/agent/src/activities/agent.ts index e0726580..46350680 100644 --- a/packages/agent/src/activities/agent.ts +++ b/packages/agent/src/activities/agent.ts @@ -219,41 +219,39 @@ If you need to create files in the local filesystem (for example, a temporary fi let grandTotalTokens = 0 let totalCost = 0 - if (typeof harness.subscribe === 'function') { - harness.subscribe(async (event) => { - if (event.type === 'message_end' && event.message.role === 'assistant') { - const assistantMsg = event.message - const u = assistantMsg.usage - if (u) { - const inputTokens = u.input || 0 - const outputTokens = u.output || 0 - const cacheReadTokens = u.cacheRead || 0 - const totalTokens = u.totalTokens || inputTokens + outputTokens - const cost = u.cost?.total || 0 + harness.subscribe(async (event) => { + if (event.type === 'message_end' && event.message.role === 'assistant') { + const assistantMsg = event.message + const u = assistantMsg.usage + if (u) { + const inputTokens = u.input || 0 + const outputTokens = u.output || 0 + const cacheReadTokens = u.cacheRead || 0 + const totalTokens = u.totalTokens || inputTokens + outputTokens + const cost = u.cost?.total || 0 - totalInputTokens += inputTokens - totalOutputTokens += outputTokens - totalCacheReadTokens += cacheReadTokens - grandTotalTokens += totalTokens - totalCost += cost + totalInputTokens += inputTokens + totalOutputTokens += outputTokens + totalCacheReadTokens += cacheReadTokens + grandTotalTokens += totalTokens + totalCost += cost - try { - await aiUsageService.recordUsage({ - teamId: params.teamId, - userId: params.userId, - inputTokens, - outputTokens, - cacheReadTokens, - totalTokens, - cost, - }) - } catch (err) { - logger.error({ err }, 'Failed to record AI usage') - } + try { + await aiUsageService.recordUsage({ + teamId: params.teamId, + userId: params.userId, + inputTokens, + outputTokens, + cacheReadTokens, + totalTokens, + cost, + }) + } catch (err) { + logger.error({ err }, 'Failed to record AI usage') } } - }) - } + } + }) const assistantMessage = await harness.prompt(params.prompt, { images: imagesToPass }) diff --git a/packages/core/src/ai-usage/ai-usage.ts b/packages/core/src/ai-usage/ai-usage.ts index ccb3662a..3c97b64c 100644 --- a/packages/core/src/ai-usage/ai-usage.ts +++ b/packages/core/src/ai-usage/ai-usage.ts @@ -119,7 +119,6 @@ export class AiUsageService { since.setMinutes(0, 0, 0) - if (!params.userId) { // Return Team-Level Usage (userId = null) const teamRecords = await prisma.aiUsage.findMany({