Skip to content

Publish token usage metrics #7637

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Sep 3, 2025
Merged

Publish token usage metrics #7637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4d762a1
Publish token usage metrics
cte Sep 3, 2025
9a6d85f
Merge main
cte Sep 3, 2025
b174b6d
Bump @roo-code/types to 1.74.0
cte Sep 3, 2025
ddc8968
Fix tests
cte Sep 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions packages/cloud/src/bridge/ExtensionChannel.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,7 @@ export class ExtensionChannel extends BaseChannel<
{ from: RooCodeEventName.TaskUnpaused, to: ExtensionBridgeEventName.TaskUnpaused },
{ from: RooCodeEventName.TaskSpawned, to: ExtensionBridgeEventName.TaskSpawned },
{ from: RooCodeEventName.TaskUserMessage, to: ExtensionBridgeEventName.TaskUserMessage },
{ from: RooCodeEventName.TaskTokenUsageUpdated, to: ExtensionBridgeEventName.TaskTokenUsageUpdated },
] as const

eventMapping.forEach(({ from, to }) => {
Expand Down Expand Up @@ -229,11 +230,12 @@ export class ExtensionChannel extends BaseChannel<
task: task
? {
taskId: task.taskId,
parentTaskId: task.parentTaskId,
childTaskId: task.childTaskId,
taskStatus: task.taskStatus,
taskAsk: task?.taskAsk,
queuedMessages: task.queuedMessages,
parentTaskId: task.parentTaskId,
childTaskId: task.childTaskId,
tokenUsage: task.tokenUsage,
...task.metadata,
}
: { taskId: "", taskStatus: TaskStatus.None },
Expand Down
3 changes: 2 additions & 1 deletion packages/cloud/src/bridge/__tests__/ExtensionChannel.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ describe("ExtensionChannel", () => {
RooCodeEventName.TaskUnpaused,
RooCodeEventName.TaskSpawned,
RooCodeEventName.TaskUserMessage,
RooCodeEventName.TaskTokenUsageUpdated,
]

// Check that on() was called for each event
Expand Down Expand Up @@ -254,7 +255,7 @@ describe("ExtensionChannel", () => {
}

// Listeners should still be the same count (not accumulated)
expect(eventListeners.size).toBe(14)
expect(eventListeners.size).toBe(15)

// Each event should have exactly 1 listener
eventListeners.forEach((listeners) => {
Expand Down
2 changes: 1 addition & 1 deletion packages/types/npm/package.metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@roo-code/types",
"version": "1.73.0",
"version": "1.74.0",
"description": "TypeScript type definitions for Roo Code.",
"publishConfig": {
"access": "public",
Expand Down
11 changes: 10 additions & 1 deletion packages/types/src/cloud.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { TaskStatus, taskMetadataSchema } from "./task.js"
import { globalSettingsSchema } from "./global-settings.js"
import { providerSettingsWithIdSchema } from "./provider-settings.js"
import { mcpMarketplaceItemSchema } from "./marketplace.js"
import { clineMessageSchema, queuedMessageSchema } from "./message.js"
import { clineMessageSchema, queuedMessageSchema, tokenUsageSchema } from "./message.js"
import { staticAppPropertiesSchema, gitPropertiesSchema } from "./telemetry.js"

/**
Expand Down Expand Up @@ -363,6 +363,7 @@ const extensionTaskSchema = z.object({
queuedMessages: z.array(queuedMessageSchema).optional(),
parentTaskId: z.string().optional(),
childTaskId: z.string().optional(),
tokenUsage: tokenUsageSchema.optional(),
...taskMetadataSchema.shape,
})

Expand Down Expand Up @@ -412,6 +413,8 @@ export enum ExtensionBridgeEventName {

TaskUserMessage = RooCodeEventName.TaskUserMessage,

TaskTokenUsageUpdated = RooCodeEventName.TaskTokenUsageUpdated,

ModeChanged = RooCodeEventName.ModeChanged,
ProviderProfileChanged = RooCodeEventName.ProviderProfileChanged,

Expand Down Expand Up @@ -494,6 +497,12 @@ export const extensionBridgeEventSchema = z.discriminatedUnion("type", [
timestamp: z.number(),
}),

z.object({
type: z.literal(ExtensionBridgeEventName.TaskTokenUsageUpdated),
instance: extensionInstanceSchema,
timestamp: z.number(),
}),

z.object({
type: z.literal(ExtensionBridgeEventName.ModeChanged),
instance: extensionInstanceSchema,
Expand Down
3 changes: 3 additions & 0 deletions packages/types/src/task.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,8 @@ export type TaskProviderEvents = {

[RooCodeEventName.TaskUserMessage]: [taskId: string]

[RooCodeEventName.TaskTokenUsageUpdated]: [taskId: string, tokenUsage: TokenUsage]

[RooCodeEventName.ModeChanged]: [mode: string]
[RooCodeEventName.ProviderProfileChanged]: [config: { name: string; provider?: string }]
}
Expand Down Expand Up @@ -116,6 +118,7 @@ export interface TaskLike {
readonly taskStatus: TaskStatus
readonly taskAsk: ClineMessage | undefined
readonly queuedMessages: QueuedMessage[]
readonly tokenUsage: TokenUsage | undefined

on<K extends keyof TaskEvents>(event: K, listener: (...args: TaskEvents[K]) => void | Promise<void>): this
off<K extends keyof TaskEvents>(event: K, listener: (...args: TaskEvents[K]) => void | Promise<void>): this
Expand Down
Loading
Loading