diff --git a/browser_tests/fixtures/agentPromptHistoryFixture.ts b/browser_tests/fixtures/agentPromptHistoryFixture.ts index 90f2272c55d..3635f2f8dba 100644 --- a/browser_tests/fixtures/agentPromptHistoryFixture.ts +++ b/browser_tests/fixtures/agentPromptHistoryFixture.ts @@ -41,6 +41,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 +150,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 } + const 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 + } + } satisfies AgentWsEvent) + ) } }) } diff --git a/browser_tests/fixtures/agentWorkflowSelectionFixture.ts b/browser_tests/fixtures/agentWorkflowSelectionFixture.ts index 5ca479d0a2d..d08d61b333b 100644 --- a/browser_tests/fixtures/agentWorkflowSelectionFixture.ts +++ b/browser_tests/fixtures/agentWorkflowSelectionFixture.ts @@ -1,5 +1,6 @@ import { networkIsolationFixture as base } from '@e2e/fixtures/networkIsolationFixture' +import type { RemoteConfig } from '@/platform/remoteConfig/types' import type { UserDataFullInfo } from '@/platform/remote/comfyui/types' import type { ComfyNodeDef } from '@/schemas/nodeDefSchema' import type { CloudWorkflowEntry } from '@/workbench/extensions/agent/schemas/agentApiSchema' @@ -41,15 +42,21 @@ function moveSavedWorkflow( export const workflowSelectionTest = base.extend<{ nodeDefinitions: Record | undefined + workflowSelectionFeatures: Partial | undefined workflowSelection: WorkflowSelection }>({ nodeDefinitions: [undefined, { option: true }], - workflowSelection: async ({ page, nodeDefinitions }, use) => { + workflowSelectionFeatures: [undefined, { option: true }], + workflowSelection: async ( + { page, nodeDefinitions, workflowSelectionFeatures }, + use + ) => { if (nodeDefinitions) await page.route('**/api/object_info', (route) => route.fulfill(jsonRoute(nodeDefinitions)) ) await bootAgentApp(page, true, { + features: workflowSelectionFeatures, objectInfo: nodeDefinitions ? 'server' : undefined }) const workflows: CloudWorkflowEntry[] = [] diff --git a/browser_tests/tests/agent/agentCreditUsageSummary.spec.ts b/browser_tests/tests/agent/agentCreditUsageSummary.spec.ts new file mode 100644 index 00000000000..dc607f779a1 --- /dev/null +++ b/browser_tests/tests/agent/agentCreditUsageSummary.spec.ts @@ -0,0 +1,45 @@ +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' + +test.describe.configure({ timeout: 120_000 }) +test.use({ + workflowSelectionFeatures: { + 'agent-credit-usage-summary': 'treatment' + } +}) + +test( + 'shows server-reported Agent credits when a turn completes', + { 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') + } +) diff --git a/packages/ingest-types/src/index.ts b/packages/ingest-types/src/index.ts index 0c9a69727e6..99916dd8baf 100644 --- a/packages/ingest-types/src/index.ts +++ b/packages/ingest-types/src/index.ts @@ -106,6 +106,8 @@ export type { AgentLlmTracesResponse, AgentLlmTracesResponses, AgentMessage, + AgentMessageDoneData, + AgentMessageDoneFrame, AgentPausedContext, AgentPendingAsk, AgentPendingAskBase, @@ -147,6 +149,8 @@ export type { AgentToolCallData, AgentToolCallFrame, AgentTurnAccepted, + AgentTurnRefusal, + AgentTurnUsage, AgentViewableAttachmentExtension, Asset, AssetCreated, diff --git a/packages/ingest-types/src/types.gen.ts b/packages/ingest-types/src/types.gen.ts index fb955b23409..a423d5727a8 100644 --- a/packages/ingest-types/src/types.gen.ts +++ b/packages/ingest-types/src/types.gen.ts @@ -7485,6 +7485,36 @@ export type AgentViewableAttachmentExtension = | '.heic' | '.heif' +/** + * Usage of a completed turn, as carried on agent_message_done. Mirrors `$defs.agent_message_done.data.usage` in services/agent/api/agent_events.schema.json; TestMessageDoneFrameMatchesContract holds the two definitions to the same fields and constraints. charge_micro_usd appears only when the server durably captured priced billing for at least one round. It is the exact charge in millionths of a US dollar; clients convert that denomination to catalog credits for display and must not read its absence as a zero charge. + */ +export type AgentTurnUsage = { + cache_creation_input_tokens: number + cache_read_input_tokens: number + charge_micro_usd?: number + input_tokens: number + output_tokens: number + total_tokens: number +} + +/** + * Present on agent_message_done only when the model service refused the turn. Mirrors `$defs.agent_message_done.data.refusal` in services/agent/api/agent_events.schema.json, which states the full rendering rules. Absence must not be read as the account having credit. + */ +export type AgentTurnRefusal = { + /** + * Whether adding credit to the account clears this refusal. True only for no_funds. + */ + can_add_credit: boolean + /** + * What refused the turn. Clients must treat an unknown kind like payment_required (show the text) rather than fail. + */ + kind: 'no_funds' | 'manual_block' | 'payment_required' | 'auth' | 'rate_limit' + /** + * Ingest's error.reason from the refused 402, verbatim, for logging and analytics. Render from kind and can_add_credit, not from this field. + */ + reason?: string +} + /** * Acknowledgement that a turn was accepted. The agent runs asynchronously; output streams over the WebSocket (agent_message_delta, agent_tool_call, agent_message_done); canvas edits arrive as doc_update frames. */ @@ -8040,6 +8070,27 @@ export type AgentPendingAsk = kind: 'delete_approval' } & AgentPendingDeleteApproval) +/** + * Server-to-client agent_message_done frame on /ws. Closed, like the canonical envelope. + */ +export type AgentMessageDoneFrame = { + data: AgentMessageDoneData + type: 'agent_message_done' +} + +/** + * The `data` of an agent_message_done WebSocket event: the assistant message is complete. Mirrors `$defs.agent_message_done.data` in services/agent/api/agent_events.schema.json. + */ +export type AgentMessageDoneData = { + message_id: string + refusal?: AgentTurnRefusal + thread_id: string + /** + * Null on a turn that failed or was refused; its rounds were billed as they ran, and the failed round has no usage. + */ + usage: AgentTurnUsage | null +} + /** * A persisted message in an agent thread. */ @@ -13187,6 +13238,10 @@ export type GetFeaturesResponses = { | 'near-composer' | 'above-input' | 'inside-input' + /** + * Authenticated assignment for the Agent per-turn credit usage experiment. Control renders no usage line; treatment renders the authoritative server-reported charge beneath completed replies. It remains optional so older environments and partial fixtures fail closed. Reading this field is not exposure; the frontend records exposure only when a charged reply is rendered. + */ + 'agent-credit-usage-summary'?: 'control' | 'treatment' /** * Authenticated assignment for the Agent starter-prompt experiment. Current Cloud responses include it and default to control when the caller is unauthenticated, evaluation is unavailable, or no treatment is assigned. It remains optional in the client contract so older environments and partial feature fixtures fail closed. Reading this field does not constitute experiment exposure; the frontend emits the custom exposure event only after rendering the starter prompt surface. */ diff --git a/packages/ingest-types/src/zod.gen.ts b/packages/ingest-types/src/zod.gen.ts index 3b6342952f3..cd475ddee4e 100644 --- a/packages/ingest-types/src/zod.gen.ts +++ b/packages/ingest-types/src/zod.gen.ts @@ -4434,6 +4434,33 @@ export const zAgentViewableAttachmentExtension = z.enum([ '.heif' ]) +/** + * Usage of a completed turn, as carried on agent_message_done. Mirrors `$defs.agent_message_done.data.usage` in services/agent/api/agent_events.schema.json; TestMessageDoneFrameMatchesContract holds the two definitions to the same fields and constraints. charge_micro_usd appears only when the server durably captured priced billing for at least one round. It is the exact charge in millionths of a US dollar; clients convert that denomination to catalog credits for display and must not read its absence as a zero charge. + */ +export const zAgentTurnUsage = z.object({ + cache_creation_input_tokens: z.int().gte(0), + cache_read_input_tokens: z.int().gte(0), + charge_micro_usd: z.int().gte(1).optional(), + input_tokens: z.int().gte(0), + output_tokens: z.int().gte(0), + total_tokens: z.int().gte(0) +}) + +/** + * Present on agent_message_done only when the model service refused the turn. Mirrors `$defs.agent_message_done.data.refusal` in services/agent/api/agent_events.schema.json, which states the full rendering rules. Absence must not be read as the account having credit. + */ +export const zAgentTurnRefusal = z.object({ + can_add_credit: z.boolean(), + kind: z.enum([ + 'no_funds', + 'manual_block', + 'payment_required', + 'auth', + 'rate_limit' + ]), + reason: z.string().optional() +}) + /** * Acknowledgement that a turn was accepted. The agent runs asynchronously; output streams over the WebSocket (agent_message_delta, agent_tool_call, agent_message_done); canvas edits arrive as doc_update frames. */ @@ -4837,6 +4864,24 @@ export const zAgentPendingAsk = z.union([ .and(zAgentPendingDeleteApproval) ]) +/** + * The `data` of an agent_message_done WebSocket event: the assistant message is complete. Mirrors `$defs.agent_message_done.data` in services/agent/api/agent_events.schema.json. + */ +export const zAgentMessageDoneData = z.object({ + message_id: z.string(), + refusal: zAgentTurnRefusal.optional(), + thread_id: z.string(), + usage: zAgentTurnUsage.nullable() +}) + +/** + * Server-to-client agent_message_done frame on /ws. Closed, like the canonical envelope. + */ +export const zAgentMessageDoneFrame = z.object({ + data: zAgentMessageDoneData, + type: z.enum(['agent_message_done']) +}) + /** * A persisted message in an agent thread. */ @@ -5981,6 +6026,10 @@ export const zGetFeaturesResponse = z.object({ ]) .optional() .default('control'), + 'agent-credit-usage-summary': z + .enum(['control', 'treatment']) + .optional() + .default('control'), 'agent-starter-prompt-set': z .enum(['control', 'test']) .optional() diff --git a/packages/shared-frontend-utils/src/creditsUtil.test.ts b/packages/shared-frontend-utils/src/creditsUtil.test.ts index 09b59c0d43c..011ce275ef0 100644 --- a/packages/shared-frontend-utils/src/creditsUtil.test.ts +++ b/packages/shared-frontend-utils/src/creditsUtil.test.ts @@ -12,6 +12,7 @@ import { formatCreditsFromUsd, formatUsd, formatUsdFromCents, + microUsdToCredits, usdToCents, usdToCredits } from './creditsUtil' @@ -50,6 +51,10 @@ describe('comfyCredits helpers', () => { expect(creditsToUsd(211)).toBe(1) // 211 credits = 1 USD }) + test('converts micro-USD to fractional credits without rounding', () => { + expect(microUsdToCredits(6038)).toBeCloseTo(1.274) + }) + test('formats credits and USD values using en-US locale', () => { const locale = 'en-US' expect(formatCredits({ value: 1234.567, locale })).toBe('1,234.57') diff --git a/packages/shared-frontend-utils/src/creditsUtil.ts b/packages/shared-frontend-utils/src/creditsUtil.ts index 32abfc108f7..6f68fb74d80 100644 --- a/packages/shared-frontend-utils/src/creditsUtil.ts +++ b/packages/shared-frontend-utils/src/creditsUtil.ts @@ -42,6 +42,9 @@ export const creditsToCents = (credits: number): number => export const usdToCredits = (usd: number): number => Math.round(usd * CREDITS_PER_USD) +export const microUsdToCredits = (microUsd: number): number => + (microUsd * CREDITS_PER_USD) / 1_000_000 + export const creditsToUsd = (credits: number): number => Math.round((credits / CREDITS_PER_USD) * 100) / 100 diff --git a/packages/telemetry/src/TelemetryRegistry.ts b/packages/telemetry/src/TelemetryRegistry.ts index f453a3170a6..60fe2524aaf 100644 --- a/packages/telemetry/src/TelemetryRegistry.ts +++ b/packages/telemetry/src/TelemetryRegistry.ts @@ -14,6 +14,7 @@ import type { AgentConsentResolvedMetadata, AgentConsentShownMetadata, AgentCreditTransitionNoticeMetadata, + AgentCreditUsageExposureMetadata, AgentPaywallCtaMetadata, AgentPaywallShownMetadata, AgentEntryButtonClickedMetadata, @@ -496,6 +497,14 @@ export class TelemetryRegistry implements TelemetryDispatcher { this.dispatch((provider) => provider.trackAgentFreeUseExposure?.(metadata)) } + trackAgentCreditUsageExposure( + metadata: AgentCreditUsageExposureMetadata + ): void { + this.dispatch((provider) => + provider.trackAgentCreditUsageExposure?.(metadata) + ) + } + trackAgentNodeTagged(metadata: AgentNodeTaggedMetadata): void { this.dispatch((provider) => provider.trackAgentNodeTagged?.(metadata)) } diff --git a/packages/telemetry/src/types.ts b/packages/telemetry/src/types.ts index 555de856221..4f2d2d3fa96 100644 --- a/packages/telemetry/src/types.ts +++ b/packages/telemetry/src/types.ts @@ -898,6 +898,14 @@ export interface AgentFreeUseExposureMetadata extends Record { placement: AgentFreeUseVariant '$feature/agent-free-use-message-placement': AgentFreeUseVariant } +export type AgentCreditUsageVariant = 'control' | 'treatment' +export interface AgentCreditUsageExposureMetadata extends Record< + string, + unknown +> { + variant: AgentCreditUsageVariant + '$feature/agent-credit-usage-summary': AgentCreditUsageVariant +} /** * Interactions with the notice itself. This event adds what the existing * outcome events cannot say: whether the notice was actually on screen in its @@ -1580,6 +1588,9 @@ export interface TelemetryProvider { ): void trackAgentFreeUseNotice?(metadata: AgentFreeUseNoticeMetadata): void trackAgentFreeUseExposure?(metadata: AgentFreeUseExposureMetadata): void + trackAgentCreditUsageExposure?( + metadata: AgentCreditUsageExposureMetadata + ): void trackAgentNodeTagged?(metadata: AgentNodeTaggedMetadata): void trackAgentAttachButtonClicked?( metadata: AgentAttachButtonClickedMetadata @@ -1769,6 +1780,7 @@ export const TelemetryEvents = { AGENT_STARTER_PROMPT_CLICKED: 'app:agent_starter_prompt_clicked', AGENT_FREE_USE_NOTICE: 'app:agent_free_use_notice', AGENT_FREE_USE_EXPOSURE: 'app:agent_free_use_exposure', + AGENT_CREDIT_USAGE_EXPOSURE: 'app:agent_credit_usage_exposure', AGENT_CREDIT_TRANSITION_NOTICE: 'app:agent_credit_transition_notice', AGENT_NODE_TAGGED: 'app:agent_node_tagged', AGENT_ATTACH_BUTTON_CLICKED: 'app:agent_attach_button_clicked', diff --git a/src/i18n.ts b/src/i18n.ts index ab77871c93a..d5e3db61f58 100644 --- a/src/i18n.ts +++ b/src/i18n.ts @@ -1,4 +1,5 @@ import { createI18n } from 'vue-i18n' +import type { PluralizationRule } from 'vue-i18n' import { getDefaultLocale, @@ -291,6 +292,29 @@ type LocaleMessages = typeof en & { export const FALLBACK_LOCALE = 'en' +const russianPluralRules = new Intl.PluralRules('ru') + +const russianPluralRule: PluralizationRule = ( + choice, + choicesLength, + defaultRule +) => { + if (choicesLength !== 4) { + return defaultRule ? defaultRule(choice, choicesLength) : 0 + } + + switch (russianPluralRules.select(choice)) { + case 'one': + return 0 + case 'few': + return 1 + case 'many': + return 2 + default: + return 3 + } +} + function createAppI18n() { const messages: Partial> = { en: buildLocale(en, enNodes, enCommands, enSettings) @@ -300,6 +324,7 @@ function createAppI18n() { locale: getDefaultLocale(), fallbackLocale: FALLBACK_LOCALE, escapeParameter: true, + pluralRules: { ru: russianPluralRule }, messages, missingWarn: /^(?!settings\.Comfy_Locale\.options\.).+/, fallbackWarn: /^(?!settings\.Comfy_Locale\.options\.).+/ diff --git a/src/locales/ar/main.json b/src/locales/ar/main.json index df681e1c06b..0e63a6c71f4 100644 --- a/src/locales/ar/main.json +++ b/src/locales/ar/main.json @@ -83,6 +83,7 @@ "copyMarkdown": "نسخ بصيغة markdown", "copyUnavailable": "لا يمكن نسخ سوى المحادثة الحالية في هذا الإصدار", "creditTransitionNotice": "لقد استخدمت أرصدة الوكيل المجانية. تستخدم أنشطة الوكيل اللاحقة أرصدة مساحة العمل الخاصة بك، والتي قد تتضمن أرصدة مدفوعة.", + "creditsUsed": "استخدم الوكيل {credits} رصيد | استخدم الوكيل {credits} من الأرصدة", "currentTab": "علامة التبويب الحالية", "delete": "حذف", "deleteApproval": { diff --git a/src/locales/de/main.json b/src/locales/de/main.json index b7ea650392d..7bd61c79de5 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} Credit verwendet | 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..9fc3b30f3b9 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} credit | 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..51eba5984ce 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édito | 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..9b49ac867e5 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} اعتبار مصرف کرد | عامل {credits} اعتبار مصرف کرد", "currentTab": "زبانهٔ فعلی", "delete": "حذف", "deleteApproval": { diff --git a/src/locales/fr/main.json b/src/locales/fr/main.json index 326ec6645a2..aeea681d442 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édit | 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..89112fc94a0 100644 --- a/src/locales/he/main.json +++ b/src/locales/he/main.json @@ -83,6 +83,7 @@ "copyMarkdown": "העתק כ-Markdown", "copyUnavailable": "בגרסה זו ניתן להעתיק רק את השיחה הנוכחית", "creditTransitionNotice": "ניצלת את הקרדיטים החינמיים של הסוכן. פעילות נוספת של הסוכן משתמשת בקרדיטים של סביבת העבודה שלך, שעשויים לכלול קרדיטים בתשלום.", + "creditsUsed": "הסוכן השתמש בקרדיט {credits} | הסוכן השתמש ב־{credits} קרדיטים", "currentTab": "הלשונית הנוכחית", "delete": "מחק", "deleteApproval": { diff --git a/src/locales/it/main.json b/src/locales/it/main.json index 2caf1d44999..b3dbcaadc5a 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} credito | 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..e41c5ad1fc0 100644 --- a/src/locales/ja/main.json +++ b/src/locales/ja/main.json @@ -83,6 +83,7 @@ "copyMarkdown": "Markdownとしてコピー", "copyUnavailable": "このバージョンでは、現在の会話のみコピーできます", "creditTransitionNotice": "無料のエージェントクレジットを使い切りました。以降のエージェント操作ではワークスペースのクレジットが使用され、有料クレジットが含まれる場合があります。", + "creditsUsed": "エージェントは {credits} クレジットを使用しました | エージェントは {credits} クレジットを使用しました", "currentTab": "現在のタブ", "delete": "削除", "deleteApproval": { diff --git a/src/locales/ko/main.json b/src/locales/ko/main.json index a38a6f4533e..975bec14ffe 100644 --- a/src/locales/ko/main.json +++ b/src/locales/ko/main.json @@ -83,6 +83,7 @@ "copyMarkdown": "markdown으로 복사", "copyUnavailable": "이 버전에서는 현재 대화만 복사할 수 있습니다", "creditTransitionNotice": "무료 에이전트 크레딧을 모두 사용했습니다. 이후 에이전트 활동에는 유료 크레딧을 포함할 수 있는 워크스페이스 크레딧이 사용됩니다.", + "creditsUsed": "에이전트가 {credits} 크레딧을 사용했습니다 | 에이전트가 {credits} 크레딧을 사용했습니다", "currentTab": "현재 탭", "delete": "삭제", "deleteApproval": { diff --git a/src/locales/pt-BR/main.json b/src/locales/pt-BR/main.json index a61f650d846..5285a037e36 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édito | 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..4e21d4e8cc3 100644 --- a/src/locales/ru/main.json +++ b/src/locales/ru/main.json @@ -83,6 +83,7 @@ "copyMarkdown": "Копировать как markdown", "copyUnavailable": "В этой версии можно скопировать только текущий разговор", "creditTransitionNotice": "Вы использовали бесплатные кредиты агента. Дальнейшая работа агента использует кредиты вашего рабочего пространства, которые могут включать платные кредиты.", + "creditsUsed": "Агент использовал {credits} кредит | Агент использовал {credits} кредита | Агент использовал {credits} кредитов | Агент использовал {credits} кредита", "currentTab": "Текущая вкладка", "delete": "Удалить", "deleteApproval": { diff --git a/src/locales/tr/main.json b/src/locales/tr/main.json index 0a50d4148a8..0407fe29848 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ı | 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..a08593500c6 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} 點積分 | 代理程式使用了 {credits} 點積分", "currentTab": "目前分頁", "delete": "刪除", "deleteApproval": { diff --git a/src/locales/zh/main.json b/src/locales/zh/main.json index d96a7a1d701..b8911982cbf 100644 --- a/src/locales/zh/main.json +++ b/src/locales/zh/main.json @@ -83,6 +83,7 @@ "copyMarkdown": "复制为 Markdown", "copyUnavailable": "此版本只能复制当前对话", "creditTransitionNotice": "您已用完免费的智能体积分。后续智能体活动将使用您工作区的积分,其中可能包含付费积分。", + "creditsUsed": "智能体使用了 {credits} 个积分 | 智能体使用了 {credits} 个积分", "currentTab": "当前标签页", "delete": "删除", "deleteApproval": { diff --git a/src/platform/telemetry/TelemetryRegistry.test.ts b/src/platform/telemetry/TelemetryRegistry.test.ts index f08d28ba251..2bed9981ca9 100644 --- a/src/platform/telemetry/TelemetryRegistry.test.ts +++ b/src/platform/telemetry/TelemetryRegistry.test.ts @@ -8,6 +8,7 @@ import { TelemetryRegistry } from '@comfyorg/telemetry/TelemetryRegistry' import type { AgentConsentResolvedMetadata, AgentConsentShownMetadata, + AgentCreditUsageExposureMetadata, AgentCreditTransitionNoticeMetadata, AgentEntryButtonClickedMetadata, AgentErrorMetadata, @@ -381,6 +382,10 @@ describe('TelemetryRegistry', () => { const creditTransitionNoticeMetadata = { action: 'shown' } satisfies AgentCreditTransitionNoticeMetadata + const creditUsageExposureMetadata = { + variant: 'treatment', + '$feature/agent-credit-usage-summary': 'treatment' + } satisfies AgentCreditUsageExposureMetadata const cases = [ { @@ -408,6 +413,12 @@ describe('TelemetryRegistry', () => { creditTransitionNoticeMetadata ) }, + { + method: 'trackAgentCreditUsageExposure', + expected: { ...creditUsageExposureMetadata }, + invoke: (registry) => + registry.trackAgentCreditUsageExposure(creditUsageExposureMetadata) + }, { method: 'trackAgentMessageFeedback', expected: { ...feedbackMetadata }, diff --git a/src/platform/telemetry/providers/cloud/PostHogTelemetryProvider.test.ts b/src/platform/telemetry/providers/cloud/PostHogTelemetryProvider.test.ts index a22ce988bbd..c0b47f54264 100644 --- a/src/platform/telemetry/providers/cloud/PostHogTelemetryProvider.test.ts +++ b/src/platform/telemetry/providers/cloud/PostHogTelemetryProvider.test.ts @@ -732,6 +732,24 @@ describe('PostHogTelemetryProvider', () => { ) }) + it('captures credit-usage experiment exposure with the PostHog arm', async () => { + const provider = createProvider() + await vi.dynamicImportSettled() + + provider.trackAgentCreditUsageExposure({ + variant: 'treatment', + '$feature/agent-credit-usage-summary': 'treatment' + }) + + expect(hoisted.mockCapture).toHaveBeenCalledWith( + TelemetryEvents.AGENT_CREDIT_USAGE_EXPOSURE, + { + variant: 'treatment', + '$feature/agent-credit-usage-summary': 'treatment' + } + ) + }) + it('captures link dedup drop events with metadata', async () => { const provider = createProvider() await vi.dynamicImportSettled() diff --git a/src/platform/telemetry/providers/cloud/PostHogTelemetryProvider.ts b/src/platform/telemetry/providers/cloud/PostHogTelemetryProvider.ts index ae9a5444881..39196d1f639 100644 --- a/src/platform/telemetry/providers/cloud/PostHogTelemetryProvider.ts +++ b/src/platform/telemetry/providers/cloud/PostHogTelemetryProvider.ts @@ -39,6 +39,7 @@ import type { AgentConsentResolvedMetadata, AgentConsentShownMetadata, AgentCreditTransitionNoticeMetadata, + AgentCreditUsageExposureMetadata, AgentEntryButtonClickedMetadata, AgentErrorMetadata, AgentFreeUseExposureMetadata, @@ -903,6 +904,12 @@ export class PostHogTelemetryProvider implements TelemetryProvider { this.trackEvent(TelemetryEvents.AGENT_FREE_USE_EXPOSURE, metadata) } + trackAgentCreditUsageExposure( + metadata: AgentCreditUsageExposureMetadata + ): void { + this.trackEvent(TelemetryEvents.AGENT_CREDIT_USAGE_EXPOSURE, metadata) + } + trackAgentNodeTagged(metadata: AgentNodeTaggedMetadata): void { this.trackEvent(TelemetryEvents.AGENT_NODE_TAGGED, metadata) } diff --git a/src/platform/telemetry/providers/host/HostTelemetrySink.test.ts b/src/platform/telemetry/providers/host/HostTelemetrySink.test.ts index 72a400d649f..4f7fd4a197f 100644 --- a/src/platform/telemetry/providers/host/HostTelemetrySink.test.ts +++ b/src/platform/telemetry/providers/host/HostTelemetrySink.test.ts @@ -384,6 +384,18 @@ describe('HostTelemetrySink', () => { '$feature/agent-free-use-message-placement': 'control' } }, + { + name: TelemetryEvents.AGENT_CREDIT_USAGE_EXPOSURE, + track: (sink: HostTelemetrySink) => + sink.trackAgentCreditUsageExposure({ + variant: 'control', + '$feature/agent-credit-usage-summary': 'control' + }), + properties: { + variant: 'control', + '$feature/agent-credit-usage-summary': 'control' + } + }, { name: TelemetryEvents.AGENT_CONSENT_SHOWN, track: (sink: HostTelemetrySink) => diff --git a/src/platform/telemetry/providers/host/HostTelemetrySink.ts b/src/platform/telemetry/providers/host/HostTelemetrySink.ts index 17b9c1bfe1b..377789b13c8 100644 --- a/src/platform/telemetry/providers/host/HostTelemetrySink.ts +++ b/src/platform/telemetry/providers/host/HostTelemetrySink.ts @@ -15,6 +15,7 @@ import type { AgentConsentResolvedMetadata, AgentConsentShownMetadata, AgentCreditTransitionNoticeMetadata, + AgentCreditUsageExposureMetadata, AgentEntryButtonClickedMetadata, AgentFreeUseExposureMetadata, AgentFreeUseNoticeMetadata, @@ -399,6 +400,12 @@ export class HostTelemetrySink implements TelemetryProvider { this.capture(TelemetryEvents.AGENT_FREE_USE_EXPOSURE, metadata) } + trackAgentCreditUsageExposure( + metadata: AgentCreditUsageExposureMetadata + ): void { + this.capture(TelemetryEvents.AGENT_CREDIT_USAGE_EXPOSURE, metadata) + } + trackAgentNodeTagged(metadata: AgentNodeTaggedMetadata): void { this.capture(TelemetryEvents.AGENT_NODE_TAGGED, metadata) } 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..632ed430806 100644 --- a/src/workbench/extensions/agent/components/agent/message/AgentMessage.test.ts +++ b/src/workbench/extensions/agent/components/agent/message/AgentMessage.test.ts @@ -1,8 +1,13 @@ import { render, screen, within } from '@testing-library/vue' import userEvent from '@testing-library/user-event' -import { describe, expect, it, vi } from 'vitest' +import { beforeEach, describe, expect, it, vi } from 'vitest' import { ref } from 'vue' -import { i18n } from '@/i18n' +import { microUsdToCredits } from '@comfyorg/shared-frontend-utils/creditsUtil' +import { i18n, loadLocale } from '@/i18n' +import { + authenticatedRemoteConfigState, + remoteConfig +} from '@/platform/remoteConfig/remoteConfig' import type { TurnId } from '@/workbench/extensions/agent/schemas/agentApiSchema' import { toTurnId } from '@/workbench/extensions/agent/schemas/agentApiSchema' import { createAgentEventTransport } from '@/workbench/extensions/agent/services/agent/agentEventTransport' @@ -41,6 +46,173 @@ function paywallMessage(message?: string): AssistantMessage { } } +describe('AgentMessage credit usage', () => { + beforeEach(() => { + authenticatedRemoteConfigState.value = 'authenticated' + remoteConfig.value = { 'agent-credit-usage-summary': 'treatment' } + }) + + 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('uses singular copy for exactly one credit', () => { + render(AgentMessage, { + props: { + message: { + ...createAssistantMessage(toTurnId('msg-one-credit')), + parts: [{ type: 'text', text: 'Done', state: 'done' }], + streaming: false, + creditsUsed: 1 + } + }, + global: { plugins: [i18n] } + }) + + expect(screen.getByTestId('agent-credit-usage')).toHaveTextContent( + /^Agent used 1 credit$/ + ) + }) + + it('chooses the plural form from the displayed amount', () => { + render(AgentMessage, { + props: { + message: { + ...createAssistantMessage(toTurnId('msg-rounded-credit')), + parts: [{ type: 'text', text: 'Done', state: 'done' }], + streaming: false, + creditsUsed: 1.001 + } + }, + global: { plugins: [i18n] } + }) + + expect(screen.getByTestId('agent-credit-usage')).toHaveTextContent( + /^Agent used 1 credit$/ + ) + }) + + it('localizes the below-minimum amount', () => { + const previousLocale = i18n.global.locale.value + i18n.global.locale.value = 'fr' + try { + render(AgentMessage, { + props: { + message: { + ...createAssistantMessage(toTurnId('msg-tiny-credit')), + parts: [{ type: 'text', text: 'Done', state: 'done' }], + streaming: false, + creditsUsed: 0.004 + } + }, + global: { plugins: [i18n] } + }) + + const usage = screen.getByTestId('agent-credit-usage') + expect(usage).toHaveTextContent('<0,01') + expect(usage).not.toHaveTextContent('<0.01') + } finally { + i18n.global.locale.value = previousLocale + } + }) + + it('renders fractional Russian credits without hiding the usage row', async () => { + const previousLocale = i18n.global.locale.value + await loadLocale('ru') + i18n.global.locale.value = 'ru' + try { + render(AgentMessage, { + props: { + message: { + ...createAssistantMessage(toTurnId('msg-russian-credit')), + parts: [{ type: 'text', text: 'Done', state: 'done' }], + streaming: false, + creditsUsed: microUsdToCredits(6038) + } + }, + global: { plugins: [i18n] } + }) + + expect(screen.getByTestId('agent-credit-usage')).toHaveTextContent( + /^Агент использовал 1,27 кредита$/ + ) + } finally { + i18n.global.locale.value = previousLocale + } + }) + + it('pluralizes the Russian below-minimum amount from its displayed bound', async () => { + const previousLocale = i18n.global.locale.value + await loadLocale('ru') + i18n.global.locale.value = 'ru' + try { + render(AgentMessage, { + props: { + message: { + ...createAssistantMessage(toTurnId('msg-russian-tiny-credit')), + parts: [{ type: 'text', text: 'Done', state: 'done' }], + streaming: false, + creditsUsed: microUsdToCredits(1) + } + }, + global: { plugins: [i18n] } + }) + + expect(screen.getByTestId('agent-credit-usage')).toHaveTextContent( + /^Агент использовал <0,01 кредита$/ + ) + } finally { + i18n.global.locale.value = previousLocale + } + }) + + 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() + }) + + it('hides usage in the control arm', () => { + remoteConfig.value = { 'agent-credit-usage-summary': 'control' } + render(AgentMessage, { + props: { + message: { + ...createAssistantMessage(toTurnId('msg-control')), + parts: [{ type: 'text', text: 'Done', state: 'done' }], + streaming: false, + creditsUsed: 1.274 + } + }, + 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..e0f5166713d 100644 --- a/src/workbench/extensions/agent/components/agent/message/AgentMessage.vue +++ b/src/workbench/extensions/agent/components/agent/message/AgentMessage.vue @@ -1,9 +1,10 @@