Fix: Persist total API cost after message deletion

.changeset/persist-deleted-api-costs.md

@@ -0,0 +1,5 @@
+---
+"kilo-code": patch
+---
+
+Fix: Persist total API cost after message deletion

packages/types/src/vscode-extension-host.ts

@@ -574,6 +574,7 @@ export type ExtensionState = Pick<
 	clineMessages: ClineMessage[]
 	currentTaskItem?: HistoryItem
 	currentTaskTodos?: TodoItem[] // Initial todos for the current task
+	currentTaskCumulativeCost?: number // kilocode_change: cumulative cost including deleted messages
 	apiConfiguration: ProviderSettings
 	uriScheme?: string
 	uiKind?: string // kilocode_change

src/core/task-persistence/taskMetadata.ts

@@ -30,6 +30,13 @@ export type TaskMetadataOptions = {
 	 * continue using this protocol even if user settings change.
 	 */
 	toolProtocol?: ToolProtocol
+	// kilocode_change start
+	/**
+	 * cumulative total cost including deleted messages.
+	 * if provided, this overrides the calculated totalCost from messages.
+	 */
+	cumulativeTotalCost?: number
+	// kilocode_change end
 }
 
 export async function taskMetadata({
@@ -44,6 +51,7 @@ export async function taskMetadata({
 	apiConfigName,
 	initialStatus,
 	toolProtocol,
+	cumulativeTotalCost, // kilocode_change
 }: TaskMetadataOptions) {
 	const taskDir = await getTaskDirectoryPath(globalStoragePath, id)
 
@@ -114,7 +122,7 @@ export async function taskMetadata({
 		tokensOut: tokenUsage.totalTokensOut,
 		cacheWrites: tokenUsage.totalCacheWrites,
 		cacheReads: tokenUsage.totalCacheReads,
-		totalCost: tokenUsage.totalCost,
+		totalCost: cumulativeTotalCost !== undefined ? cumulativeTotalCost : tokenUsage.totalCost, // kilocode_change
 		size: taskDirSize,
 		workspace,
 		mode,

src/core/task/Task.ts

@@ -372,6 +372,13 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
 	apiConversationHistory: ApiMessage[] = []
 	clineMessages: ClineMessage[] = []
 
+	/**
+	 * cumulative cost of API calls from messages that were deleted during this session.
+	 * this ensures the total cost displayed to the user reflects all API usage,
+	 * even if messages are removed from the conversation history.
+	 */
+	private _deletedApiCost: number = 0 // kilocode_change
+
 	// Ask
 	private askResponse?: ClineAskResponse
 	private askResponseText?: string
@@ -1323,6 +1330,7 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
 				apiConfigName: this._taskApiConfigName, // Use the task's own provider profile, not the current provider profile.
 				initialStatus: this.initialStatus,
 				toolProtocol: this._taskToolProtocol, // Persist the locked tool protocol.
+				cumulativeTotalCost: this.getCumulativeTotalCost(), // kilocode_change: include deleted message costs.
 			})
 
 			// Emit token/tool usage updates using debounced function
@@ -4983,9 +4991,35 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
 		return combineApiRequests(combineCommandSequences(messages))
 	}
 
+	// kilocod_change start
 	public getTokenUsage(): TokenUsage {
-		return getApiMetrics(this.combineMessages(this.clineMessages.slice(1)))
+		const metrics = getApiMetrics(this.combineMessages(this.clineMessages.slice(1)))
+		// add deleted API costs to the total cost
+		return {
+			...metrics,
+			totalCost: metrics.totalCost + this._deletedApiCost,
+		}
+	}
+
+	/**
+	 * get cumulative total cost including deleted messages.
+	 * this is the cost that should be persisted in history.
+	 */
+	public getCumulativeTotalCost(): number {
+		const metrics = getApiMetrics(this.combineMessages(this.clineMessages.slice(1)))
+		return metrics.totalCost + this._deletedApiCost
+	}
+
+	/**
+	 * add cost from deleted messages to the cumulative total.
+	 * called by message deletion handlers to preserve true session cost.
+	 */
+	public addDeletedApiCost(cost: number): void {
+		if (cost > 0) {
+			this._deletedApiCost += cost
+		}
 	}
+	// kilocod_change end
 
 	public recordToolUsage(toolName: ToolName) {
 		if (!this.toolUsage[toolName]) {

src/core/webview/ClineProvider.ts

@@ -2397,6 +2397,7 @@ export class ClineProvider
 				: undefined,
 			clineMessages: this.getCurrentTask()?.clineMessages || [],
 			currentTaskTodos: this.getCurrentTask()?.todoList || [],
+			currentTaskCumulativeCost: this.getCurrentTask()?.getCumulativeTotalCost(), // kilocode_change
 			messageQueue: this.getCurrentTask()?.messageQueueService?.messages,
 			taskHistoryFullLength: taskHistory.length, // kilocode_change
 			taskHistoryVersion: this.kiloCodeTaskHistoryVersion, // kilocode_change

src/core/webview/__tests__/ClineProvider.apiHandlerRebuild.spec.ts

@@ -118,6 +118,7 @@ vi.mock("../../task/Task", () => ({
 			updateApiConfiguration: vi.fn().mockImplementation(function (this: any, newConfig: any) {
 				this.apiConfiguration = newConfig
 			}),
+			getCumulativeTotalCost: vi.fn().mockReturnValue(0), // kilocode_change
 		}
 		// Define apiConfiguration as a property so tests can read it
 		Object.defineProperty(mockTask, "apiConfiguration", {

src/core/webview/__tests__/ClineProvider.spec.ts

@@ -235,6 +235,7 @@ vi.mock("../../task/Task", () => ({
 		setRootTask: vi.fn(),
 		taskId: options?.historyItem?.id || "test-task-id",
 		emit: vi.fn(),
+		getCumulativeTotalCost: vi.fn().mockReturnValue(0), // kilocode_change
 	})),
 }))
 
@@ -379,6 +380,7 @@ describe("ClineProvider", () => {
 				setRootTask: vi.fn(),
 				taskId: options?.historyItem?.id || "test-task-id",
 				emit: vi.fn(),
+				getCumulativeTotalCost: vi.fn().mockReturnValue(0), // kilocode_change
 			}
 
 			Object.defineProperty(task, "messageManager", {

src/core/webview/__tests__/ClineProvider.sticky-mode.spec.ts

@@ -82,6 +82,7 @@ vi.mock("../../task/Task", () => ({
 		emit: vi.fn(),
 		parentTask: options.parentTask,
 		updateApiConfiguration: vi.fn(),
+		getCumulativeTotalCost: vi.fn().mockReturnValue(0), // kilocode_change
 	})),
 }))
 
@@ -359,6 +360,7 @@ describe("ClineProvider - Sticky Mode", () => {
 				clineMessages: [],
 				apiConversationHistory: [],
 				updateApiConfiguration: vi.fn(),
+				getCumulativeTotalCost: vi.fn().mockReturnValue(0), // kilocode_change
 			}
 
 			// Add task to provider stack
@@ -812,6 +814,7 @@ describe("ClineProvider - Sticky Mode", () => {
 				clineMessages: [],
 				apiConversationHistory: [],
 				updateApiConfiguration: vi.fn(),
+				getCumulativeTotalCost: vi.fn().mockReturnValue(0), // kilocode_change
 			}
 
 			// Add task to provider stack
@@ -879,6 +882,7 @@ describe("ClineProvider - Sticky Mode", () => {
 				clineMessages: [],
 				apiConversationHistory: [],
 				updateApiConfiguration: vi.fn(),
+				getCumulativeTotalCost: vi.fn().mockReturnValue(0), // kilocode_change
 			}
 
 			// Add task to provider stack
@@ -931,6 +935,7 @@ describe("ClineProvider - Sticky Mode", () => {
 				clineMessages: [],
 				apiConversationHistory: [],
 				updateApiConfiguration: vi.fn(),
+				getCumulativeTotalCost: vi.fn().mockReturnValue(0), // kilocode_change
 			}
 
 			// Add task to provider stack
@@ -966,6 +971,7 @@ describe("ClineProvider - Sticky Mode", () => {
 				clineMessages: [],
 				apiConversationHistory: [],
 				updateApiConfiguration: vi.fn(),
+				getCumulativeTotalCost: vi.fn().mockReturnValue(0), // kilocode_change
 			}
 
 			// Add task to provider stack
@@ -1022,6 +1028,7 @@ describe("ClineProvider - Sticky Mode", () => {
 				clineMessages: [],
 				apiConversationHistory: [],
 				updateApiConfiguration: vi.fn(),
+				getCumulativeTotalCost: vi.fn().mockReturnValue(0), // kilocode_change
 			}
 
 			// Add task to provider stack
@@ -1069,6 +1076,7 @@ describe("ClineProvider - Sticky Mode", () => {
 				clineMessages: [],
 				apiConversationHistory: [],
 				updateApiConfiguration: vi.fn(),
+				getCumulativeTotalCost: vi.fn().mockReturnValue(0), // kilocode_change
 			}
 
 			const task2 = {
@@ -1079,6 +1087,7 @@ describe("ClineProvider - Sticky Mode", () => {
 				clineMessages: [],
 				apiConversationHistory: [],
 				updateApiConfiguration: vi.fn(),
+				getCumulativeTotalCost: vi.fn().mockReturnValue(0), // kilocode_change
 			}
 
 			const task3 = {
@@ -1089,6 +1098,7 @@ describe("ClineProvider - Sticky Mode", () => {
 				clineMessages: [],
 				apiConversationHistory: [],
 				updateApiConfiguration: vi.fn(),
+				getCumulativeTotalCost: vi.fn().mockReturnValue(0), // kilocode_change
 			}
 
 			// Add tasks to provider stack
@@ -1231,6 +1241,7 @@ describe("ClineProvider - Sticky Mode", () => {
 				clineMessages: [],
 				apiConversationHistory: [],
 				updateApiConfiguration: vi.fn(),
+				getCumulativeTotalCost: vi.fn().mockReturnValue(0), // kilocode_change
 			}))
 
 			// Add all tasks to provider

src/core/webview/__tests__/ClineProvider.sticky-profile.spec.ts

@@ -82,6 +82,7 @@ vi.mock("../../task/Task", () => ({
 		setTaskApiConfigName: vi.fn(),
 		_taskApiConfigName: options.historyItem?.apiConfigName,
 		taskApiConfigName: options.historyItem?.apiConfigName,
+		getCumulativeTotalCost: vi.fn().mockReturnValue(0), // kilocode_change
 	})),
 }))
 
@@ -300,6 +301,7 @@ describe("ClineProvider - Sticky Provider Profile", () => {
 				clineMessages: [],
 				apiConversationHistory: [],
 				updateApiConfiguration: vi.fn(),
+				getCumulativeTotalCost: vi.fn().mockReturnValue(0), // kilocode_change
 			}
 
 			// Add task to provider stack
@@ -365,6 +367,7 @@ describe("ClineProvider - Sticky Provider Profile", () => {
 				clineMessages: [],
 				apiConversationHistory: [],
 				updateApiConfiguration: vi.fn(),
+				getCumulativeTotalCost: vi.fn().mockReturnValue(0), // kilocode_change
 			}
 
 			// Add task to provider stack
@@ -421,6 +424,7 @@ describe("ClineProvider - Sticky Provider Profile", () => {
 				clineMessages: [],
 				apiConversationHistory: [],
 				updateApiConfiguration: vi.fn(),
+				getCumulativeTotalCost: vi.fn().mockReturnValue(0), // kilocode_change
 			}
 
 			await provider.addClineToStack(mockTask as any)
@@ -610,6 +614,7 @@ describe("ClineProvider - Sticky Provider Profile", () => {
 				clineMessages: [],
 				apiConversationHistory: [],
 				updateApiConfiguration: vi.fn(),
+				getCumulativeTotalCost: vi.fn().mockReturnValue(0), // kilocode_change
 			}
 
 			// Mock getGlobalState to return task history with our task
@@ -677,6 +682,7 @@ describe("ClineProvider - Sticky Provider Profile", () => {
 				clineMessages: [],
 				apiConversationHistory: [],
 				updateApiConfiguration: vi.fn(),
+				getCumulativeTotalCost: vi.fn().mockReturnValue(0), // kilocode_change
 			}
 
 			// Create task 2 with profile B
@@ -691,6 +697,7 @@ describe("ClineProvider - Sticky Provider Profile", () => {
 				clineMessages: [],
 				apiConversationHistory: [],
 				updateApiConfiguration: vi.fn(),
+				getCumulativeTotalCost: vi.fn().mockReturnValue(0), // kilocode_change
 			}
 
 			// Add task 1 to stack
@@ -775,6 +782,7 @@ describe("ClineProvider - Sticky Provider Profile", () => {
 				clineMessages: [],
 				apiConversationHistory: [],
 				updateApiConfiguration: vi.fn(),
+				getCumulativeTotalCost: vi.fn().mockReturnValue(0), // kilocode_change
 			}
 
 			// Add task to provider stack

src/core/webview/webviewMessageHandler.ts

@@ -256,6 +256,28 @@ export const webviewMessageHandler = async (
 					vscode.window.showWarningMessage("No checkpoint found before this message")
 				}
 			} else {
+				// kilocode_change start: calculate the cost of messages being deleted before removing them
+				const messagesToDelete = currentCline.clineMessages.slice(messageIndex)
+				let deletedCost = 0
+				for (const msg of messagesToDelete) {
+					if (msg.say === "api_req_started" && msg.text) {
+						try {
+							const apiReqInfo = JSON.parse(msg.text)
+							if (apiReqInfo.cost && typeof apiReqInfo.cost === "number") {
+								deletedCost += apiReqInfo.cost
+							}
+						} catch {
+							// ignore parse errors
+						}
+					}
+				}
+
+				// add the deleted cost to the task's cumulative total
+				if (deletedCost > 0) {
+					currentCline.addDeletedApiCost(deletedCost)
+				}
+				// kilocode_change end
+
 				// For non-checkpoint deletes, preserve checkpoint associations for remaining messages
 				// Store checkpoints from messages that will be preserved
 				const preservedCheckpoints = new Map<number, any>()

webview-ui/src/components/chat/ChatView.tsx

@@ -111,6 +111,7 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro
 		clineMessages: messages,
 		currentTaskItem,
 		currentTaskTodos,
+		currentTaskCumulativeCost, // kilocode_change
 		taskHistoryFullLength, // kilocode_change
 		taskHistoryVersion, // kilocode_change
 		apiConfiguration,
@@ -176,7 +177,19 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro
 	const modifiedMessages = useMemo(() => combineApiRequests(combineCommandSequences(messages.slice(1))), [messages])
 
 	// Has to be after api_req_finished are all reduced into api_req_started messages.
-	const apiMetrics = useMemo(() => getApiMetrics(modifiedMessages), [modifiedMessages])
+	// kilocode_change start
+	const apiMetrics = useMemo(() => {
+		const metrics = getApiMetrics(modifiedMessages)
+		// use cumulative cost from backend if available, otherwise fall back to calculated cost
+		if (currentTaskCumulativeCost !== undefined) {
+			return {
+				...metrics,
+				totalCost: currentTaskCumulativeCost,
+			}
+		}
+		return metrics
+	}, [modifiedMessages, currentTaskCumulativeCost])
+	// kilocode_change end
 
 	const [inputValue, setInputValue] = useState("")
 	const inputValueRef = useRef(inputValue)