From c2eed441502cfdf733f85c6c074a7662c0f5817e Mon Sep 17 00:00:00 2001
From: perf3ct <jonfuller2012@gmail.com>
Date: Sat, 7 Jun 2025 20:15:11 +0000
Subject: [PATCH] fix(llm): make sure that we're referencing the correct Note
 ID when saving

---
 .../src/widgets/type_widgets/ai_chat.ts       | 23 +++++++++++++++----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/apps/client/src/widgets/type_widgets/ai_chat.ts b/apps/client/src/widgets/type_widgets/ai_chat.ts
index f733b499b..7f015d334 100644
--- a/apps/client/src/widgets/type_widgets/ai_chat.ts
+++ b/apps/client/src/widgets/type_widgets/ai_chat.ts
@@ -182,17 +182,30 @@ export default class AiChatTypeWidget extends TypeWidget {
 
     // Save chat data to the note
     async saveData(data: any) {
-        if (!this.note) {
+        // If we have a noteId in the data, that's the AI Chat note we should save to
+        // This happens when the chat panel is saving its conversation
+        const targetNoteId = data.noteId;
+        
+        // If no noteId in data, use the current note (for new chats)
+        const noteIdToUse = targetNoteId || this.note?.noteId;
+        
+        if (!noteIdToUse) {
+            console.warn("Cannot save AI Chat data: no note ID available");
             return;
         }
 
         try {
-            console.log(`AiChatTypeWidget: Saving data for note ${this.note.noteId}`);
+            console.log(`AiChatTypeWidget: Saving data for note ${noteIdToUse} (current note: ${this.note?.noteId}, data.noteId: ${data.noteId})`);
+
+            // Safety check: if we have both IDs and they don't match, warn about it
+            if (targetNoteId && this.note?.noteId && targetNoteId !== this.note.noteId) {
+                console.warn(`Note ID mismatch: saving to ${targetNoteId} but current note is ${this.note.noteId}`);
+            }
 
             // Format the data properly - this is the canonical format of the data
             const formattedData = {
                 messages: data.messages || [],
-                noteId: this.note.noteId, // Always use the note's own ID
+                noteId: noteIdToUse, // Always preserve the correct note ID
                 toolSteps: data.toolSteps || [],
                 sources: data.sources || [],
                 metadata: {
@@ -201,8 +214,8 @@ export default class AiChatTypeWidget extends TypeWidget {
                 }
             };
 
-            // Save the data to the note
-            await server.put(`notes/${this.note.noteId}/data`, {
+            // Save the data to the correct note
+            await server.put(`notes/${noteIdToUse}/data`, {
                 content: JSON.stringify(formattedData, null, 2)
             });
         } catch (e) {