fix: build RAG context directly from attachments, enable sources after

Build the source ID list from both attachments and already-enabled
sources before querying the vector store. Call enableSource after
context is built to avoid stale state issues with phantom chats.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: NorbertKlockiewicz

components/chat-screen/ChatScreen.tsx

@@ -131,34 +131,25 @@ export default function ChatScreen({
     // Build context from attachments + persisted sources
     const context: string[] = [];
 
+    // Collect all source IDs: from attachments + already enabled on chat
+    const attachmentSourceIds = (attachments || [])
+      .filter((a) => a.type === 'document' && a.strategy === 'rag' && a.sourceId)
+      .map((a) => a.sourceId!);
+    const allSourceIds = [
+      ...new Set([...enabledSources, ...attachmentSourceIds]),
+    ];
+
     console.log('[SEND] userInput:', userInput);
     console.log('[SEND] imagePath:', imagePath);
     console.log('[SEND] attachments:', JSON.stringify(attachments?.map(a => ({
       id: a.id, type: a.type, strategy: a.strategy, status: a.status,
       name: a.name, sourceId: a.sourceId,
       inlineTextLen: a.inlineText?.length, firstChunkLen: a.firstChunk?.length,
     }))));
-    console.log('[SEND] enabledSources (before):', enabledSources);
+    console.log('[SEND] allSourceIds:', allSourceIds);
 
-    // Enable new attachments for this chat (persists for future messages)
+    // Inline documents: inject full text
     if (attachments) {
-      for (const att of attachments) {
-        if (
-          att.type === 'document' &&
-          att.strategy === 'rag' &&
-          att.sourceId &&
-          !enabledSources.includes(att.sourceId)
-        ) {
-          console.log('[SEND] enabling source:', att.sourceId, att.name);
-          await enableSource(chatId!, att.sourceId);
-          await sendEventMessage(
-            chatId!,
-            `${att.name || 'Document'} has been added as a source file`
-          );
-        }
-      }
-
-      // Inline documents: inject full text
       for (const att of attachments) {
         if (
           att.type === 'document' &&
@@ -173,25 +164,24 @@ export default function ChatScreen({
       }
     }
 
-    // RAG context from all enabled sources (persisted + newly attached)
-    // Read fresh from store — enableSource updates Zustand state which
-    // isn't reflected in the stale `chat` closure captured at render time
-    const freshChat = useChatStore.getState().getChatById(chatId!);
-    const freshPhantom = useChatStore.getState().phantomChat;
-    const currentEnabledSources =
-      freshChat?.enabledSources || freshPhantom?.enabledSources || [];
-    console.log('[SEND] currentEnabledSources (after):', currentEnabledSources);
-
-    if (currentEnabledSources.length > 0) {
+    // RAG context from all sources (persisted + newly attached)
+    if (allSourceIds.length > 0) {
       const ragContext = await prepareContext(
         userInput || 'document summary',
-        currentEnabledSources,
+        allSourceIds,
         vectorStore!
       );
       console.log('[SEND] ragContext chunks:', ragContext.length, 'chars:', ragContext.join('').length);
       context.push(...ragContext);
     }
 
+    // Enable new sources for this chat (persists for future messages)
+    for (const sourceId of attachmentSourceIds) {
+      if (!enabledSources.includes(sourceId)) {
+        await enableSource(chatId!, sourceId);
+      }
+    }
+
     console.log('[SEND] total context entries:', context.length);
     console.log('[SEND] total context chars:', context.join('').length);