pacnpal/Roo-Code
1
0
Fork 0
mirror of https://github.com/pacnpal/Roo-Code.git synced 2025-12-20 04:11:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: update context token calculation to match upstream

Browse Source 
The context token calculation has been updated to:
- Include cache tokens (cacheWrites + cacheReads) in the total context size
- Use a cleaner approach to find the last valid API request
- Fix issue where placeholder messages without token info were being counted
- Match upstream's implementation of getTotalTokensFromMessage

This fixes the issue where context size was incorrectly showing as 139 tokens
without any API requests being made.
This commit is contained in:
MFPires
2025-02-01 17:38:52 -03:00
parent 1edb939bde
commit 70af1d2cb3
1 changed files with 20 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/shared/getApiMetrics.ts
View File

@@ -6,7 +6,7 @@ interface ApiMetrics {
totalCacheWrites?: number totalCacheWrites?: number
totalCacheReads?: number totalCacheReads?: number
totalCost: number totalCost: number
contextTokens: number // Total tokens in conversation (last message's tokensIn + tokensOut) contextTokens: number // Total tokens in conversation (last message's tokensIn + tokensOut + cacheWrites + cacheReads)
} }
/** /**
@@ -17,7 +17,7 @@ interface ApiMetrics {
* It extracts and sums up the tokensIn, tokensOut, cacheWrites, cacheReads, and cost from these messages. * It extracts and sums up the tokensIn, tokensOut, cacheWrites, cacheReads, and cost from these messages.
* *
* @param messages - An array of ClineMessage objects to process. * @param messages - An array of ClineMessage objects to process.
* @returns An ApiMetrics object containing totalTokensIn, totalTokensOut, totalCacheWrites, totalCacheReads, and totalCost. * @returns An ApiMetrics object containing totalTokensIn, totalTokensOut, totalCacheWrites, totalCacheReads, totalCost, and contextTokens.
* *
* @example * @example
* const messages = [ * const messages = [
@@ -36,27 +36,30 @@ export function getApiMetrics(messages: ClineMessage[]): ApiMetrics {
contextTokens: 0, contextTokens: 0,
} }
// Find the last api_req_started message that has valid token information // Helper function to get total tokens from a message
const lastApiReq = [...messages].reverse().find((message) => { const getTotalTokensFromMessage = (message: ClineMessage): number => {
if (message.type === "say" && message.say === "api_req_started" && message.text) { if (!message.text) return 0
try { try {
const parsedData = JSON.parse(message.text) const { tokensIn, tokensOut, cacheWrites, cacheReads } = JSON.parse(message.text)
return typeof parsedData.tokensIn === "number" && typeof parsedData.tokensOut === "number" return (tokensIn || 0) + (tokensOut || 0) + (cacheWrites || 0) + (cacheReads || 0)
} catch { } catch {
return false return 0
} }
} }
// Find the last api_req_started message that has any tokens
const lastApiReq = [...messages].reverse().find((message) => {
if (message.type === "say" && message.say === "api_req_started") {
return getTotalTokensFromMessage(message) > 0
}
return false return false
}) })
// Keep track of the last valid context tokens // Calculate running totals
let lastValidContextTokens = 0
messages.forEach((message) => { messages.forEach((message) => {
if (message.type === "say" && message.say === "api_req_started" && message.text) { if (message.type === "say" && message.say === "api_req_started" && message.text) {
try { try {
const parsedData = JSON.parse(message.text) const { tokensIn, tokensOut, cacheWrites, cacheReads, cost } = JSON.parse(message.text)
const { tokensIn, tokensOut, cacheWrites, cacheReads, cost } = parsedData
if (typeof tokensIn === "number") { if (typeof tokensIn === "number") {
result.totalTokensIn += tokensIn result.totalTokensIn += tokensIn
@@ -74,15 +77,9 @@ export function getApiMetrics(messages: ClineMessage[]): ApiMetrics {
result.totalCost += cost result.totalCost += cost
} }
// Update last valid context tokens whenever we have valid input and output tokens // If this is the last api request with tokens, use its total for context size
if (tokensIn > 0 && tokensOut > 0) {
lastValidContextTokens = tokensIn + tokensOut
}
// If this is the last api request, use its tokens for context size
if (message === lastApiReq) { if (message === lastApiReq) {
// Use the last valid context tokens if the current request doesn't have valid tokens result.contextTokens = getTotalTokensFromMessage(message)
result.contextTokens = tokensIn > 0 && tokensOut > 0 ? tokensIn + tokensOut : lastValidContextTokens
} }
} catch (error) { } catch (error) {
console.error("Error parsing JSON:", error) console.error("Error parsing JSON:", error)