Bug fixes

Author: Sg312

apps/sim/app/api/wand/route.ts

@@ -313,17 +313,29 @@ Use this context to calculate relative dates like "yesterday", "last week", "beg
               return
             }
 
+            let finalUsage: any = null
+            let usageRecorded = false
+
+            const recordUsage = async () => {
+              if (usageRecorded || !finalUsage) {
+                return
+              }
+
+              usageRecorded = true
+              await updateUserStatsForWand(session.user.id, finalUsage, requestId, isBYOK)
+            }
+
             try {
               let buffer = ''
               let chunkCount = 0
-              let finalUsage: any = null
               let activeEventType: string | undefined
 
               while (true) {
                 const { done, value } = await reader.read()
 
                 if (done) {
                   logger.info(`[${requestId}] Stream completed. Total chunks: ${chunkCount}`)
+                  await recordUsage()
                   controller.enqueue(encoder.encode(`data: ${JSON.stringify({ done: true })}\n\n`))
                   controller.close()
                   break
@@ -353,9 +365,7 @@ Use this context to calculate relative dates like "yesterday", "last week", "beg
                   if (data === '[DONE]') {
                     logger.info(`[${requestId}] Received [DONE] signal`)
 
-                    if (finalUsage) {
-                      await updateUserStatsForWand(session.user.id, finalUsage, requestId, isBYOK)
-                    }
+                    await recordUsage()
 
                     controller.enqueue(
                       encoder.encode(`data: ${JSON.stringify({ done: true })}\n\n`)
@@ -423,6 +433,12 @@ Use this context to calculate relative dates like "yesterday", "last week", "beg
                 stack: streamError?.stack,
               })
 
+              try {
+                await recordUsage()
+              } catch (usageError) {
+                logger.warn(`[${requestId}] Failed to record usage after stream error`, usageError)
+              }
+
               const errorData = `data: ${JSON.stringify({ error: 'Streaming failed', done: true })}\n\n`
               controller.enqueue(encoder.encode(errorData))
               controller.close()

apps/sim/providers/responses-utils.ts

@@ -310,6 +310,9 @@ export function extractResponseToolCalls(output: unknown): ResponsesToolCall[] {
 
 /**
  * Maps Responses API usage data to prompt/completion token counts.
+ *
+ * Note: output_tokens is expected to include reasoning tokens; fall back to reasoning_tokens
+ * when output_tokens is missing or zero.
  */
 export function parseResponsesUsage(usage: any): ResponsesUsageTokens | undefined {
   if (!usage || typeof usage !== 'object') {
@@ -320,8 +323,8 @@ export function parseResponsesUsage(usage: any): ResponsesUsageTokens | undefine
   const outputTokens = Number(usage.output_tokens ?? 0)
   const cachedTokens = Number(usage.input_tokens_details?.cached_tokens ?? 0)
   const reasoningTokens = Number(usage.output_tokens_details?.reasoning_tokens ?? 0)
-  const completionTokens = outputTokens
-  const totalTokens = inputTokens + outputTokens
+  const completionTokens = Math.max(outputTokens, reasoningTokens)
+  const totalTokens = inputTokens + completionTokens
 
   return {
     promptTokens: inputTokens,