From 1e594ac4ec7ee86467bed21d1b47b20b7770297c Mon Sep 17 00:00:00 2001
From: dal <dallin@buster.so>
Date: Tue, 12 Aug 2025 16:38:20 -0600
Subject: [PATCH] Refactor chat message handling by removing unused fields

- Eliminated `responseMessages`, `reasoning`, and `rawLlmMessages` from chat creation and handling functions to streamline data processing.
- Updated the `generateJsonbArraySql` function to accept pre-stringified JSON for better performance and clarity.

These changes enhance the efficiency of chat message management and reduce unnecessary complexity in the codebase.
---
 .../src/api/v2/chats/services/chat-helpers.ts     |  3 ---
 packages/database/src/queries/chats/chats.ts      |  3 ---
 .../queries/messages/update-message-entries.ts    | 15 +++++++++------
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/apps/server/src/api/v2/chats/services/chat-helpers.ts b/apps/server/src/api/v2/chats/services/chat-helpers.ts
index a9cb862bc..287fdb3be 100644
--- a/apps/server/src/api/v2/chats/services/chat-helpers.ts
+++ b/apps/server/src/api/v2/chats/services/chat-helpers.ts
@@ -326,10 +326,7 @@ export async function handleNewChat({
           chatId: newChat.id,
           createdBy: user.id,
           requestMessage: prompt,
-          responseMessages: {},
-          reasoning: {},
           title: prompt,
-          rawLlmMessages: {},
           isCompleted: false,
         })
         .returning();
diff --git a/packages/database/src/queries/chats/chats.ts b/packages/database/src/queries/chats/chats.ts
index b5cab903c..1d5a9cb52 100644
--- a/packages/database/src/queries/chats/chats.ts
+++ b/packages/database/src/queries/chats/chats.ts
@@ -134,10 +134,7 @@ export async function createMessage(input: CreateMessageInput): Promise<Message>
           chatId: validated.chatId,
           createdBy: validated.userId,
           requestMessage: validated.content,
-          responseMessages: {},
-          reasoning: {},
           title: validated.content.substring(0, 255), // Ensure title fits in database
-          rawLlmMessages: {},
           isCompleted: false,
         })
         .returning();
diff --git a/packages/database/src/queries/messages/update-message-entries.ts b/packages/database/src/queries/messages/update-message-entries.ts
index d94e3ca42..c7b2ea728 100644
--- a/packages/database/src/queries/messages/update-message-entries.ts
+++ b/packages/database/src/queries/messages/update-message-entries.ts
@@ -27,14 +27,16 @@ type MessageFieldName = keyof typeof MESSAGE_FIELD_MAPPING;
 
 /**
  * Helper function to generate SQL for updating or appending to a JSONB array field
+ * @param fieldName - The field name to update
+ * @param jsonString - Pre-stringified JSON to insert/update
+ * @param mode - Whether to append or update the last element
  */
 function generateJsonbArraySql(
   fieldName: MessageFieldName,
-  entry: unknown,
+  jsonString: string,
   mode: UpdateMessageEntriesMode
 ): SQL {
   const field = MESSAGE_FIELD_MAPPING[fieldName];
-  const jsonString = JSON.stringify(entry);
 
   if (mode === 'append') {
     return sql`COALESCE(${field}, '[]'::jsonb) || ${jsonString}::jsonb`;
@@ -43,7 +45,7 @@ function generateJsonbArraySql(
   // Update mode: replace last element or create new array
   return sql`
     CASE 
-      WHEN jsonb_array_length(${field}) > 0 THEN
+      WHEN ${field} IS NOT NULL AND jsonb_array_length(${field}) > 0 THEN
         jsonb_set(
           ${field},
           ARRAY[jsonb_array_length(${field}) - 1]::text[],
@@ -73,16 +75,17 @@ export async function updateMessageEntries({
     };
 
     // Add each field conditionally using the helper function
+    // Stringify the entries before passing them to SQL to ensure proper JSONB casting
     if (rawLlmMessage) {
-      setValues.rawLlmMessages = generateJsonbArraySql('rawLlmMessages', rawLlmMessage, mode);
+      setValues.rawLlmMessages = generateJsonbArraySql('rawLlmMessages', JSON.stringify(rawLlmMessage), mode);
     }
 
     if (responseEntry) {
-      setValues.responseMessages = generateJsonbArraySql('responseMessages', responseEntry, mode);
+      setValues.responseMessages = generateJsonbArraySql('responseMessages', JSON.stringify(responseEntry), mode);
     }
 
     if (reasoningEntry) {
-      setValues.reasoning = generateJsonbArraySql('reasoning', reasoningEntry, mode);
+      setValues.reasoning = generateJsonbArraySql('reasoning', JSON.stringify(reasoningEntry), mode);
     }
 
     await db