From 35a7fe2d34e006607a51ace8321062293ef1c008 Mon Sep 17 00:00:00 2001 From: Christian Byrne Date: Thu, 29 Oct 2026 09:31:40 -0700 Subject: [PATCH 1/8] fix(agent): show per-turn credit usage --- .../fixtures/agentPromptHistoryFixture.ts | 37 +++++++++++++ .../agent/agentCreditUsageSummary.spec.ts | 54 +++++++++++++++++++ src/locales/ar/main.json | 1 + src/locales/de/main.json | 1 + src/locales/en/main.json | 1 + src/locales/es/main.json | 1 + src/locales/fa/main.json | 1 + src/locales/fr/main.json | 1 + src/locales/he/main.json | 1 + src/locales/it/main.json | 1 + src/locales/ja/main.json | 1 + src/locales/ko/main.json | 1 + src/locales/pt-BR/main.json | 1 + src/locales/ru/main.json | 1 + src/locales/tr/main.json | 1 + src/locales/zh-TW/main.json | 1 + src/locales/zh/main.json | 1 + .../agent/message/AgentMessage.test.ts | 35 ++++++++++++ .../components/agent/message/AgentMessage.vue | 23 +++++++- .../agent/schemas/agentApiSchema.test.ts | 10 +++- .../agent/schemas/agentApiSchema.ts | 3 +- .../agent/agentEventTransport.test.ts | 18 +++++++ .../services/agent/agentEventTransport.ts | 17 ++++-- .../agent/services/agent/agentMessageParts.ts | 15 ++++++ .../services/agent/agentTranscript.test.ts | 9 ++++ .../stores/agent/agentConversationStore.ts | 2 + 26 files changed, 230 insertions(+), 8 deletions(-) create mode 100644 browser_tests/tests/agent/agentCreditUsageSummary.spec.ts diff --git a/browser_tests/fixtures/agentPromptHistoryFixture.ts b/browser_tests/fixtures/agentPromptHistoryFixture.ts index 90f2272c55d..3f014859ead 100644 --- a/browser_tests/fixtures/agentPromptHistoryFixture.ts +++ b/browser_tests/fixtures/agentPromptHistoryFixture.ts @@ -32,6 +32,7 @@ type MockAgentMessageContent = Omit< } type MockAgentMessage = Omit & { content?: MockAgentMessageContent + token_usage?: Record } export const promptHistoryTest = base.extend<{ @@ -41,6 +42,7 @@ export const promptHistoryTest = base.extend<{ historyReads: () => number historyRequestThreadIds: string[] completeLatestTurn: (content: MockAgentMessageContent) => void + finishLatestTurn: (reply: string, chargeMicroUsd: number) => Promise } }>({ agentPanel: async ({ page }, use) => { @@ -149,6 +151,41 @@ export const promptHistoryTest = base.extend<{ if (!turn) throw new Error('No turn has been sent yet') turn.status = 'complete' turn.content = content + }, + finishLatestTurn: async (reply, chargeMicroUsd) => { + const turn = messages.findLast(({ role }) => role === 'assistant') + if (!turn) throw new Error('No turn has been sent yet') + turn.status = 'complete' + turn.content = { text: reply } + turn.token_usage = { + input_tokens: 10, + output_tokens: 5, + total_tokens: 15, + cache_creation_input_tokens: 0, + cache_read_input_tokens: 0, + charge_micro_usd: chargeMicroUsd + } + const socket = await getAgentSocket() + socket.send( + JSON.stringify({ + type: 'agent_message_delta', + data: { + message_id: turn.id, + thread_id: threadId, + delta: reply + } + } satisfies AgentWsEvent) + ) + socket.send( + JSON.stringify({ + type: 'agent_message_done', + data: { + message_id: turn.id, + thread_id: threadId, + usage: turn.token_usage + } + } satisfies AgentWsEvent) + ) } }) } diff --git a/browser_tests/tests/agent/agentCreditUsageSummary.spec.ts b/browser_tests/tests/agent/agentCreditUsageSummary.spec.ts new file mode 100644 index 00000000000..423123d0e9a --- /dev/null +++ b/browser_tests/tests/agent/agentCreditUsageSummary.spec.ts @@ -0,0 +1,54 @@ +import { expect } from '@playwright/test' + +import enMessages from '@/locales/en/main.json' with { type: 'json' } + +import { promptHistoryTest as test } from '@e2e/fixtures/agentPromptHistoryFixture' +import { AgentPanel } from '@e2e/fixtures/components/AgentPanel' + +// PM-1440: a user must see the Agent credits charged for a completed turn, +// including after the transcript is rebuilt from persisted conversation rows. +test.describe.configure({ timeout: 120_000 }) + +test( + 'shows server-reported Agent credits live and after reload', + { tag: ['@cloud', '@ui'] }, + async ({ page, promptHistory, workflowSelection }) => { + await expect( + page.getByTestId('integrated-tab-bar-actions') + ).toHaveAttribute('data-agent-gate-settled', 'true', { timeout: 8_000 }) + const agentPanel = new AgentPanel(page) + await agentPanel.open() + await page + .getByRole('button', { + name: enMessages.sideToolbar.newBlankWorkflow, + exact: true + }) + .click() + await agentPanel.workflowPicker.click() + await page + .getByRole('menuitemradio', { name: 'Unsaved Workflow', exact: true }) + .click() + await expect.poll(() => workflowSelection.savedPaths.length).toBe(1) + workflowSelection.finishSave(true) + + await agentPanel.composer.fill('Add a KSampler node.') + await agentPanel.sendButton.click() + await expect.poll(() => promptHistory.requests.length).toBe(1) + await promptHistory.finishLatestTurn('Done.', 6038) + + const liveUsage = agentPanel.root.getByTestId('agent-credit-usage') + await expect(liveUsage).toHaveText('Agent used 1.27 credits') + + const historyReadsBeforeReload = promptHistory.historyReads() + await page.reload() + await expect + .poll(() => promptHistory.historyReads()) + .toBeGreaterThan(historyReadsBeforeReload) + await expect(page.locator('#agent-panel-root')).toBeVisible({ + timeout: 30_000 + }) + await expect( + page.locator('#agent-panel-root').getByTestId('agent-credit-usage') + ).toHaveText('Agent used 1.27 credits') + } +) diff --git a/src/locales/ar/main.json b/src/locales/ar/main.json index df681e1c06b..c726f67d650 100644 --- a/src/locales/ar/main.json +++ b/src/locales/ar/main.json @@ -83,6 +83,7 @@ "copyMarkdown": "نسخ بصيغة markdown", "copyUnavailable": "لا يمكن نسخ سوى المحادثة الحالية في هذا الإصدار", "creditTransitionNotice": "لقد استخدمت أرصدة الوكيل المجانية. تستخدم أنشطة الوكيل اللاحقة أرصدة مساحة العمل الخاصة بك، والتي قد تتضمن أرصدة مدفوعة.", + "creditsUsed": "استخدم الوكيل {credits} من الأرصدة", "currentTab": "علامة التبويب الحالية", "delete": "حذف", "deleteApproval": { diff --git a/src/locales/de/main.json b/src/locales/de/main.json index b7ea650392d..1db228beab9 100644 --- a/src/locales/de/main.json +++ b/src/locales/de/main.json @@ -83,6 +83,7 @@ "copyMarkdown": "Als Markdown kopieren", "copyUnavailable": "In dieser Version kann nur die aktuelle Unterhaltung kopiert werden", "creditTransitionNotice": "Sie haben Ihre kostenlosen Agent-Credits verbraucht. Weitere Agent-Aktivitäten verwenden die Credits Ihres Workspaces, die kostenpflichtige Credits enthalten können.", + "creditsUsed": "Der Agent hat {credits} Credits verwendet", "currentTab": "Aktueller Tab", "delete": "Löschen", "deleteApproval": { diff --git a/src/locales/en/main.json b/src/locales/en/main.json index 14a210e40ad..dff29587a8e 100644 --- a/src/locales/en/main.json +++ b/src/locales/en/main.json @@ -5976,6 +5976,7 @@ "entryFailedReason": "ComfyUI could not start the agent: {reason}", "entryStartingReason": "ComfyUI is starting the agent: {reason}", "feedbackCaption": "Share feedback", + "creditsUsed": "Agent used {credits} credits", "freeUseNoticeLabel": "Free use notice", "freeUseNotice": "Try your first chat for free!", "creditTransitionNotice": "You've used your free agent credits. Further agent activity uses your workspace credits, which may include paid credits.", diff --git a/src/locales/es/main.json b/src/locales/es/main.json index d1a71b4fc9c..bc2d336828b 100644 --- a/src/locales/es/main.json +++ b/src/locales/es/main.json @@ -83,6 +83,7 @@ "copyMarkdown": "Copiar como markdown", "copyUnavailable": "Solo se puede copiar la conversación actual en esta versión", "creditTransitionNotice": "Has usado tus créditos gratuitos del agente. Las actividades posteriores del agente usarán los créditos de tu espacio de trabajo, que pueden incluir créditos de pago.", + "creditsUsed": "El agente usó {credits} créditos", "currentTab": "Pestaña actual", "delete": "Eliminar", "deleteApproval": { diff --git a/src/locales/fa/main.json b/src/locales/fa/main.json index 420e86553b8..80b8ad3c3c2 100644 --- a/src/locales/fa/main.json +++ b/src/locales/fa/main.json @@ -83,6 +83,7 @@ "copyMarkdown": "کپی به‌صورت مارک‌داون", "copyUnavailable": "در این نسخه فقط گفت‌وگوی فعلی قابل کپی است", "creditTransitionNotice": "از اعتبارهای رایگان agent خود استفاده کرده‌اید. فعالیت‌های بعدی agent از اعتبارهای workspace شما استفاده می‌کنند که ممکن است شامل اعتبارهای پولی باشند.", + "creditsUsed": "عامل {credits} اعتبار مصرف کرد", "currentTab": "زبانهٔ فعلی", "delete": "حذف", "deleteApproval": { diff --git a/src/locales/fr/main.json b/src/locales/fr/main.json index 326ec6645a2..def8a27ab64 100644 --- a/src/locales/fr/main.json +++ b/src/locales/fr/main.json @@ -83,6 +83,7 @@ "copyMarkdown": "Copier au format markdown", "copyUnavailable": "Seule la conversation actuelle peut être copiée dans cette version", "creditTransitionNotice": "Vous avez utilisé vos crédits d'agent gratuits. Toute activité ultérieure de l'agent utilise les crédits de votre espace de travail, qui peuvent inclure des crédits payants.", + "creditsUsed": "L’agent a utilisé {credits} crédits", "currentTab": "Onglet actuel", "delete": "Supprimer", "deleteApproval": { diff --git a/src/locales/he/main.json b/src/locales/he/main.json index 54a525b4a33..5c53854e767 100644 --- a/src/locales/he/main.json +++ b/src/locales/he/main.json @@ -83,6 +83,7 @@ "copyMarkdown": "העתק כ-Markdown", "copyUnavailable": "בגרסה זו ניתן להעתיק רק את השיחה הנוכחית", "creditTransitionNotice": "ניצלת את הקרדיטים החינמיים של הסוכן. פעילות נוספת של הסוכן משתמשת בקרדיטים של סביבת העבודה שלך, שעשויים לכלול קרדיטים בתשלום.", + "creditsUsed": "הסוכן השתמש ב־{credits} קרדיטים", "currentTab": "הלשונית הנוכחית", "delete": "מחק", "deleteApproval": { diff --git a/src/locales/it/main.json b/src/locales/it/main.json index 2caf1d44999..ed9eb1f7533 100644 --- a/src/locales/it/main.json +++ b/src/locales/it/main.json @@ -83,6 +83,7 @@ "copyMarkdown": "Copia come markdown", "copyUnavailable": "In questa versione è possibile copiare solo la conversazione corrente", "creditTransitionNotice": "Hai usato i tuoi crediti gratuiti dell'agente. Le ulteriori attività dell'agente usano i crediti del tuo workspace, che potrebbero includere crediti a pagamento.", + "creditsUsed": "L’agente ha utilizzato {credits} crediti", "currentTab": "Scheda corrente", "delete": "Elimina", "deleteApproval": { diff --git a/src/locales/ja/main.json b/src/locales/ja/main.json index 35ad28a5e02..a32ca3ea3bc 100644 --- a/src/locales/ja/main.json +++ b/src/locales/ja/main.json @@ -83,6 +83,7 @@ "copyMarkdown": "Markdownとしてコピー", "copyUnavailable": "このバージョンでは、現在の会話のみコピーできます", "creditTransitionNotice": "無料のエージェントクレジットを使い切りました。以降のエージェント操作ではワークスペースのクレジットが使用され、有料クレジットが含まれる場合があります。", + "creditsUsed": "エージェントは {credits} クレジットを使用しました", "currentTab": "現在のタブ", "delete": "削除", "deleteApproval": { diff --git a/src/locales/ko/main.json b/src/locales/ko/main.json index a38a6f4533e..0ed1098a77f 100644 --- a/src/locales/ko/main.json +++ b/src/locales/ko/main.json @@ -83,6 +83,7 @@ "copyMarkdown": "markdown으로 복사", "copyUnavailable": "이 버전에서는 현재 대화만 복사할 수 있습니다", "creditTransitionNotice": "무료 에이전트 크레딧을 모두 사용했습니다. 이후 에이전트 활동에는 유료 크레딧을 포함할 수 있는 워크스페이스 크레딧이 사용됩니다.", + "creditsUsed": "에이전트가 {credits} 크레딧을 사용했습니다", "currentTab": "현재 탭", "delete": "삭제", "deleteApproval": { diff --git a/src/locales/pt-BR/main.json b/src/locales/pt-BR/main.json index a61f650d846..30468fa60fb 100644 --- a/src/locales/pt-BR/main.json +++ b/src/locales/pt-BR/main.json @@ -83,6 +83,7 @@ "copyMarkdown": "Copiar como markdown", "copyUnavailable": "Somente a conversa atual pode ser copiada nesta versão", "creditTransitionNotice": "Você usou seus créditos gratuitos do agente. As atividades futuras do agente usam os créditos do seu espaço de trabalho, que podem incluir créditos pagos.", + "creditsUsed": "O agente usou {credits} créditos", "currentTab": "Aba atual", "delete": "Excluir", "deleteApproval": { diff --git a/src/locales/ru/main.json b/src/locales/ru/main.json index e695e4256a2..b5e9e03a384 100644 --- a/src/locales/ru/main.json +++ b/src/locales/ru/main.json @@ -83,6 +83,7 @@ "copyMarkdown": "Копировать как markdown", "copyUnavailable": "В этой версии можно скопировать только текущий разговор", "creditTransitionNotice": "Вы использовали бесплатные кредиты агента. Дальнейшая работа агента использует кредиты вашего рабочего пространства, которые могут включать платные кредиты.", + "creditsUsed": "Агент использовал {credits} кредитов", "currentTab": "Текущая вкладка", "delete": "Удалить", "deleteApproval": { diff --git a/src/locales/tr/main.json b/src/locales/tr/main.json index 0a50d4148a8..f6bca0a0169 100644 --- a/src/locales/tr/main.json +++ b/src/locales/tr/main.json @@ -83,6 +83,7 @@ "copyMarkdown": "Markdown olarak kopyala", "copyUnavailable": "Bu sürümde yalnızca geçerli konuşma kopyalanabilir", "creditTransitionNotice": "Ücretsiz ajan kredilerinizi kullandınız. Sonraki ajan etkinlikleri, ücretli kredileri içerebilecek çalışma alanı kredilerinizi kullanır.", + "creditsUsed": "Ajan {credits} kredi kullandı", "currentTab": "Geçerli sekme", "delete": "Sil", "deleteApproval": { diff --git a/src/locales/zh-TW/main.json b/src/locales/zh-TW/main.json index c4037ea8308..47acbf4cfbd 100644 --- a/src/locales/zh-TW/main.json +++ b/src/locales/zh-TW/main.json @@ -83,6 +83,7 @@ "copyMarkdown": "複製為 Markdown", "copyUnavailable": "此版本僅能複製目前的對話", "creditTransitionNotice": "您已用完免費的代理程式點數。後續的代理程式活動會使用您的工作區點數,其中可能包含付費點數。", + "creditsUsed": "代理程式使用了 {credits} 點積分", "currentTab": "目前分頁", "delete": "刪除", "deleteApproval": { diff --git a/src/locales/zh/main.json b/src/locales/zh/main.json index d96a7a1d701..be774e3fd99 100644 --- a/src/locales/zh/main.json +++ b/src/locales/zh/main.json @@ -83,6 +83,7 @@ "copyMarkdown": "复制为 Markdown", "copyUnavailable": "此版本只能复制当前对话", "creditTransitionNotice": "您已用完免费的智能体积分。后续智能体活动将使用您工作区的积分,其中可能包含付费积分。", + "creditsUsed": "智能体使用了 {credits} 个积分", "currentTab": "当前标签页", "delete": "删除", "deleteApproval": { diff --git a/src/workbench/extensions/agent/components/agent/message/AgentMessage.test.ts b/src/workbench/extensions/agent/components/agent/message/AgentMessage.test.ts index 9bc78333811..ec16e9896b7 100644 --- a/src/workbench/extensions/agent/components/agent/message/AgentMessage.test.ts +++ b/src/workbench/extensions/agent/components/agent/message/AgentMessage.test.ts @@ -41,6 +41,41 @@ function paywallMessage(message?: string): AssistantMessage { } } +describe('AgentMessage credit usage', () => { + it('shows the completed turn charge without presenting it as a session total', () => { + render(AgentMessage, { + props: { + message: { + ...createAssistantMessage(toTurnId('msg-credits')), + parts: [{ type: 'text', text: 'Done', state: 'done' }], + streaming: false, + creditsUsed: 1.274 + } + }, + global: { plugins: [i18n] } + }) + + expect(screen.getByTestId('agent-credit-usage')).toHaveTextContent( + 'Agent used 1.27 credits' + ) + }) + + it('hides unavailable usage', () => { + render(AgentMessage, { + props: { + message: { + ...createAssistantMessage(toTurnId('msg-no-credits')), + parts: [{ type: 'text', text: 'Done', state: 'done' }], + streaming: false + } + }, + global: { plugins: [i18n] } + }) + + expect(screen.queryByTestId('agent-credit-usage')).not.toBeInTheDocument() + }) +}) + describe('AgentMessage paywall reply', () => { it('renders the usage-limit card as an inline assistant reply', () => { render(AgentMessage, { diff --git a/src/workbench/extensions/agent/components/agent/message/AgentMessage.vue b/src/workbench/extensions/agent/components/agent/message/AgentMessage.vue index 6fa1b194558..b774ab87223 100644 --- a/src/workbench/extensions/agent/components/agent/message/AgentMessage.vue +++ b/src/workbench/extensions/agent/components/agent/message/AgentMessage.vue @@ -35,7 +35,7 @@ const { answeringAskIds?: ReadonlySet paywallPresentation?: AgentPaywallPresentation }>() -const { t } = useI18n() +const { locale, t } = useI18n() const emit = defineEmits<{ feedback: [vote: 'up' | 'down' | null] @@ -72,6 +72,18 @@ const showActions = computed( () => !message.streaming && markdown.value.length > 0 ) +const creditUsage = computed(() => { + if (message.streaming || !message.creditsUsed || message.creditsUsed <= 0) + return null + const credits = + message.creditsUsed < 0.01 + ? '<0.01' + : new Intl.NumberFormat(locale.value, { + maximumFractionDigits: 2 + }).format(message.creditsUsed) + return t('agent.creditsUsed', { credits }) +}) + const replyAssets = computed(() => showActions.value ? htmlReplyAssets(renderMarkdownToHtml(markdown.value)) : [] ) @@ -139,6 +151,15 @@ const status = computed(() => { {{ status.text }} +
+