From 0cedc495d72f7e9e679cd1f69f95f754577e147e Mon Sep 17 00:00:00 2001
From: Aadesh Kheria <kheriaaadesh@gmail.com>
Date: Tue, 5 May 2026 13:15:17 -0700
Subject: [PATCH] Refactor AI query logging to handle serialization errors
 gracefully and improve async task management

---
 apps/backend/src/lib/ai/ai-query-handlers.ts       | 4 ++--
 apps/backend/src/lib/ai/loggers/ai-query-logger.ts | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/backend/src/lib/ai/ai-query-handlers.ts b/apps/backend/src/lib/ai/ai-query-handlers.ts
index df4326d2e..8b9916d03 100644
--- a/apps/backend/src/lib/ai/ai-query-handlers.ts
+++ b/apps/backend/src/lib/ai/ai-query-handlers.ts
@@ -51,7 +51,7 @@ export function handleStreamMode(ctx: ModeContext & {
         text,
         usage,
         providerMetadata,
-        openrouterGenerationId: response?.id,
+        openrouterGenerationId: response.id,
       });
       logIfMcpToolCall({
         mcpCallMetadata,
@@ -142,7 +142,7 @@ export async function handleGenerateMode(ctx: ModeContext & {
     text: result.text,
     usage: result.usage,
     providerMetadata: result.providerMetadata,
-    openrouterGenerationId: result.response?.id,
+    openrouterGenerationId: result.response.id,
   });
 
   const responseConversationId = mcpCallMetadata != null ? conversationIdForLog : undefined;
diff --git a/apps/backend/src/lib/ai/loggers/ai-query-logger.ts b/apps/backend/src/lib/ai/loggers/ai-query-logger.ts
index ccc8b9caf..89f9816d3 100644
--- a/apps/backend/src/lib/ai/loggers/ai-query-logger.ts
+++ b/apps/backend/src/lib/ai/loggers/ai-query-logger.ts
@@ -142,7 +142,7 @@ export function logAiQuerySuccess(args: {
     inputTokens: usage.inputTokens ?? undefined,
     outputTokens: usage.outputTokens ?? undefined,
     cachedInputTokens: extractCachedTokens(providerMetadata),
-    cacheCreationTokens: usage.inputTokenDetails?.cacheWriteTokens ?? undefined,
+    cacheCreationTokens: usage.inputTokenDetails.cacheWriteTokens ?? undefined,
     costUsd: rawCost.costUsd ?? extractOpenRouterCost(providerMetadata),
     cacheDiscountUsd: undefined, // backfilled by refineGenerationCost below
     openrouterGenerationId,