Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions .changeset/vscode-model-usage.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
"@kilocode/cli": patch
Comment thread
alex-alecu marked this conversation as resolved.
Resolved
"@kilocode/sdk": patch
"kilo-code": patch
---

Include session-tree IDs in model usage API responses and show full task token usage with a provider-grouped model breakdown in the VS Code session header.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
97 changes: 85 additions & 12 deletions packages/kilo-vscode/src/KiloProvider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -359,6 +359,7 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper
private promptRecoveryQueued = false
private promptRecovery: Promise<void> | null = null
private trackedSessionIds: Set<string> = new Set()
private modelUsageSessionIds: Set<string> = new Set()
private syncedChildSessions: Set<string> = new Set()
private readonly checkpoints = new Map<string, Promise<void>>()
private readonly sessionCreations = new Map<string, Promise<{ sid: string; dir: string }>>()
Expand Down Expand Up @@ -1014,6 +1015,9 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper
case "loadSessions":
this.handleLoadSessions().catch((e) => console.error("[Kilo New] handleLoadSessions failed:", e))
break
case "requestSessionModelUsage":
void this.fetchAndSendSessionModelUsage(message.sessionID, message.requestID)
break
case "login": {
const attempt = ++this.loginAttempt
await handleLogin(this.authCtx, attempt, () => this.loginAttempt)
Expand Down Expand Up @@ -1346,17 +1350,7 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper
break
}
case "toggleFavorite": {
const current = validateFavorites(this.extensionContext?.globalState.get("favoriteModels"))
const key = `${message.providerID}/${message.modelID}`
const exists = current.some((f) => `${f.providerID}/${f.modelID}` === key)
const favorites =
message.action === "add" && !exists
? [...current, { providerID: message.providerID, modelID: message.modelID }]
: message.action === "remove" && exists
? current.filter((f) => `${f.providerID}/${f.modelID}` !== key)
: current
await this.extensionContext?.globalState.update("favoriteModels", favorites)
this.connectionService.notifyFavoritesChanged(favorites)
await this.toggleFavorite(message)
break
}
case "requestFavorites": {
Expand Down Expand Up @@ -1424,6 +1418,24 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper
})
}

private async toggleFavorite(message: {
action: "add" | "remove"
providerID: string
modelID: string
}): Promise<void> {
const current = validateFavorites(this.extensionContext?.globalState.get("favoriteModels"))
const key = `${message.providerID}/${message.modelID}`
const exists = current.some((f) => `${f.providerID}/${f.modelID}` === key)
const favorites =
message.action === "add" && !exists
? [...current, { providerID: message.providerID, modelID: message.modelID }]
: message.action === "remove" && exists
? current.filter((f) => `${f.providerID}/${f.modelID}` !== key)
: current
await this.extensionContext?.globalState.update("favoriteModels", favorites)
this.connectionService.notifyFavoritesChanged(favorites)
}

/**
* Initialize connection to the CLI backend server.
* Subscribes to the shared KiloConnectionService.
Expand Down Expand Up @@ -1708,6 +1720,21 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper
.catch((e: unknown) => console.error("[Kilo New] KiloProvider: Failed to fetch session statuses:", e))
}

private fetchAndSendSessionModelUsage(sessionID: string, requestID: string): Promise<void> {
const directory = this.getWorkspaceDirectory(sessionID)
return this.connectionService
.getClientAsync(directory)
.then((client) => client.kilocode.sessionModelUsage({ sessionID, directory }, { throwOnError: true }))
Comment thread
alex-alecu marked this conversation as resolved.
Resolved
.then((response) => {
this.modelUsageSessionIds = new Set(response.data.sessionIDs)
this.postMessage({ type: "sessionModelUsageLoaded", sessionID, requestID, data: response.data })
})
.catch((error: unknown) => {
console.warn("[Kilo New] KiloProvider: Failed to load session model usage:", error)
this.postMessage({ type: "sessionModelUsageLoaded", sessionID, requestID })
})
}

private async handleLoadMessages(
sessionID: string,
options: { mode?: MessageLoadMode; before?: string; limit?: number; preserveStream?: boolean } = {},
Expand Down Expand Up @@ -3470,7 +3497,10 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper
: sessionPatchToWebview(event.properties.sessionID, event.properties.info),
}
case "session.deleted":
return null
return {
type: "sessionDeleted" as const,
sessionID: event.properties.sessionID,
}
}
}

Expand All @@ -3492,6 +3522,41 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper
}
}

private postModelUsageChanged(event: ProviderEvent, sessionID: string | undefined): boolean {
if (!sessionID || this.trackedSessionIds.has(sessionID)) return false
if (event.type === "session.created") {
const parent = event.properties.info.parentID
if (!parent || !this.modelUsageSessionIds.has(parent)) return false
this.modelUsageSessionIds.add(sessionID)
this.postMessage({ type: "sessionModelUsageChanged", sessionID })
return true
}
if (!this.modelUsageSessionIds.has(sessionID)) return false
Comment thread
alex-alecu marked this conversation as resolved.
Resolved
if (event.type === "message.part.updated") {
const part = event.properties.part as {
type?: string
tool?: string
metadata?: { sessionId?: string }
state?: { metadata?: { sessionId?: string } }
}
const child = childID(part)
if (child && !this.modelUsageSessionIds.has(child)) {
this.modelUsageSessionIds.add(child)
this.postMessage({ type: "sessionModelUsageChanged", sessionID: child })
return true
}
}
const changed =
event.type === "message.removed" ||
event.type === "message.part.removed" ||
event.type === "session.deleted" ||
(event.type === "message.part.updated" && event.properties.part.type === "step-finish")
if (!changed) return false
if (event.type === "session.deleted") this.modelUsageSessionIds.delete(sessionID)
this.postMessage({ type: "sessionModelUsageChanged", sessionID })
return true
}

/**
* Handle SSE events from the CLI backend.
* Filters events by project ID and tracked session IDs so each webview only sees its own sessions.
Expand Down Expand Up @@ -3558,6 +3623,7 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper
// Events with sessionID → only forward if this webview tracks that session
// message.part.* events are always session-scoped; drop if session unknown.
if (!sessionID && isSessionScopedPartEvent(event.type)) return
if (this.postModelUsageChanged(event, sessionID)) return
if (event.type !== "indexing.status" && sessionID && !this.trackedSessionIds.has(sessionID)) {
return
}
Expand Down Expand Up @@ -3607,6 +3673,13 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper
this.setCurrentSession(applySessionPatch(this.currentSession, event.properties.info))
this.contextSessionID = event.properties.sessionID
}
if (event.type === "session.deleted") {
const sid = event.properties.sessionID
this.trackedSessionIds.delete(sid)
this.modelUsageSessionIds.delete(sid)
this.sessionDirectories.delete(sid)
this.connectionService.pruneSession(sid)
}

// Auto-adopt child sessions as soon as the task tool part reveals their ID.
// This means the child's permission/question events are tracked immediately —
Expand Down
66 changes: 66 additions & 0 deletions packages/kilo-vscode/tests/unit/model-usage.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
import { describe, expect, test } from "bun:test"
import type { Provider, SessionModelUsage } from "../../webview-ui/src/types/messages"
import {
groupModelUsage,
hasModelUsage,
isSameSessionTree,
modelUsageName,
tokenSummary,
} from "../../webview-ui/src/context/model-usage"

const tokens = { input: 10, output: 2, reasoning: 1, cache: { read: 20, write: 5 } }
const models = [
{ providerID: "kilo", modelID: "qwen/qwen3.7-plus-20260602", steps: 1, cost: 0.01, tokens },
{ providerID: "minimax", modelID: "minimax-m3", steps: 1, cost: 0.02, tokens },
]
const usage = {
sessionIDs: ["root", "child"],
totals: { steps: 2, cost: 0.03, tokens },
models,
} satisfies SessionModelUsage
const providers = {
kilo: {
id: "kilo",
name: "Kilo Gateway",
models: {
"qwen/qwen3.7-plus": { id: "qwen/qwen3.7-plus", name: "Qwen: Qwen3.7 Plus (20% off)" },
},
},
minimax: {
id: "minimax",
name: "MiniMax",
models: { "minimax-m3": { id: "minimax-m3", name: "MiniMax M3" } },
},
} satisfies Record<string, Provider>

describe("model usage", () => {
test("groups billing routes and resolves compact catalog names", () => {
expect(hasModelUsage(usage)).toBeTrue()
expect(
hasModelUsage({
sessionIDs: [],
totals: { steps: 0, cost: 0, tokens: { input: 0, output: 0, reasoning: 0, cache: { read: 0, write: 0 } } },
models: [],
}),
).toBeFalse()
expect(tokenSummary(usage)).toEqual({ input: 10, output: 2, cached: 20 })
expect(groupModelUsage(models, providers).map((group) => group.providerName)).toEqual(["Kilo Gateway", "MiniMax"])
expect(modelUsageName(models[0], providers)).toBe("Qwen 3.7 Plus")
expect(modelUsageName(models[1], providers)).toBe("MiniMax M3")
expect(modelUsageName({ ...models[0], modelID: "moonshotai/kimi-k2.7-code-20260612" }, {})).toBe("kimi-k2.7-code")
})

test("matches sessions through their top-level tree", () => {
const sessions = new Map([
["root", {}],
["child", { parentID: "root" }],
["sibling", { parentID: "root" }],
["other", {}],
])
const get = (id: string) => sessions.get(id)

expect(isSameSessionTree("child", "sibling", get)).toBeTrue()
expect(isSameSessionTree("child", "new", get, "sibling")).toBeTrue()
expect(isSameSessionTree("child", "other", get)).toBeFalse()
})
})
39 changes: 7 additions & 32 deletions packages/kilo-vscode/webview-ui/src/components/chat/TaskHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ import { useLanguage } from "../../context/language"
import { useVSCode } from "../../context/vscode"
import { TaskTimeline } from "./TaskTimeline"
import { ContextProgress } from "./ContextProgress"
import { TaskUsage } from "./TaskUsage"
import { hasModelUsage, tokenSummary } from "../../context/model-usage"
import { SessionRenameEditor } from "../shared/SessionRenameEditor"
import { target as todoTarget } from "../../context/todo-revert"
import type { Part, TodoItem, ExtensionMessage } from "../../types/messages"
Expand Down Expand Up @@ -68,7 +70,10 @@ export const TaskHeader: Component<TaskHeaderProps> = (props) => {
return { tokens, pct }
})

const tokens = createMemo(() => calcTokenUsage(session.visibleMessages()))
const tokens = createMemo(() => {
const usage = session.modelUsage()
return hasModelUsage(usage) ? tokenSummary(usage) : calcTokenUsage(session.visibleMessages())
})

const hasTimeline = createMemo(() => {
for (const m of session.visibleMessages()) {
Expand All @@ -78,12 +83,6 @@ export const TaskHeader: Component<TaskHeaderProps> = (props) => {
return false
})

const fmtNum = (n: number): string => {
if (n >= 1_000_000) return `${(n / 1_000_000).toFixed(1)}M`
if (n >= 1_000) return `${(n / 1_000).toFixed(1)}K`
return String(n)
}

const vscode = useVSCode()
const [expanded, setExpanded] = createSignal(true)

Expand Down Expand Up @@ -233,31 +232,7 @@ export const TaskHeader: Component<TaskHeaderProps> = (props) => {
<div data-slot="task-header-graph-row">
<ContextProgress />
</div>
<Show when={tokens()}>
{(tk) => (
<div class="task-header-tokens">
<span class="task-header-tokens-label">Tokens</span>
<Show when={tk().input > 0}>
<span class="task-header-tokens-value">
<Icon name="arrow-up" size="small" />
{fmtNum(tk().input)}
</span>
</Show>
<Show when={tk().output > 0}>
<span class="task-header-tokens-value">
<Icon name="arrow-down-to-line" size="small" />
{fmtNum(tk().output)}
</span>
</Show>
<Show when={tk().cached > 0}>
<span class="task-header-tokens-value">
<Icon name="arrow-down-to-line" size="small" />
cache {fmtNum(tk().cached)}
</span>
</Show>
</div>
)}
</Show>
<Show when={tokens()}>{(tk) => <TaskUsage tokens={tk()} usage={session.modelUsage()} />}</Show>
</div>
</Show>
<Show when={hasTodos()}>
Expand Down
Loading
Loading