@eeacms/volto-eea-chatbot 2.0.2 → 2.0.4

package/CHANGELOG.md

@@ -4,7 +4,35 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
-### [2.0.2](https://github.com/eea/volto-eea-chatbot/compare/2.0.1...2.0.2) - 8 April 2026
+### [2.0.4](https://github.com/eea/volto-eea-chatbot/compare/2.0.3...2.0.4) - 28 May 2026
+
+#### :bug: Bug Fixes
+
+- fix: Remove console.logs [Alin Voinea - [`fed3b08`](https://github.com/eea/volto-eea-chatbot/commit/fed3b086b35fb74bbf03d39d679c8167d3a2e29b)]
+
+#### :hammer_and_wrench: Others
+
+- Revert "fixed summary while streaming" [Alin Voinea - [`9c59b72`](https://github.com/eea/volto-eea-chatbot/commit/9c59b7210bd1dc49b61ba90ae7e218b858ebc360)]
+- fixed summary while streaming [Zoltan Szabo - [`3ff7468`](https://github.com/eea/volto-eea-chatbot/commit/3ff74680c716be39de75f5dee2cdf92096edfd5a)]
+### [2.0.3](https://github.com/eea/volto-eea-chatbot/compare/2.0.2...2.0.3) - 19 May 2026
+
+#### :rocket: New Features
+
+- feat: integrate Onyx 3.x support [Zoltan Szabo - [`6b0d9d5`](https://github.com/eea/volto-eea-chatbot/commit/6b0d9d5a847995953680a5a9a46281bfc3997b70)]
+
+#### :house: Internal changes
+
+- style: Automated code fix [eea-jenkins - [`ba195ce`](https://github.com/eea/volto-eea-chatbot/commit/ba195cec917b06faa70211b05c7def1d025d5356)]
+
+#### :hammer_and_wrench: Others
+
+- fixes for eslint [Zoltan Szabo - [`ec926dd`](https://github.com/eea/volto-eea-chatbot/commit/ec926dd32106105fb87cff226b5f92a495a1eadf)]
+- increase test coverage [Zoltan Szabo - [`d4d1178`](https://github.com/eea/volto-eea-chatbot/commit/d4d1178fd52d215a755480c710b300f71f674f3f)]
+- Rather than dealing with complex and fragile Webpack/Babel config transpilation rules for ES Modules, the cleanest solution is to remove the dependency entirely [Zoltan Szabo - [`3cdedee`](https://github.com/eea/volto-eea-chatbot/commit/3cdedee16ecddf695779b179eb6beeecde16295d)]
+- updated snapshots [Zoltan Szabo - [`58dd3b8`](https://github.com/eea/volto-eea-chatbot/commit/58dd3b8e7d795032338b3580e33cd10c24576911)]
+- fixed jest-addon.config.js [Zoltan Szabo - [`95c4c6f`](https://github.com/eea/volto-eea-chatbot/commit/95c4c6f494c71a9d5e9171b7d56bb1609dccc9f3)]
+- updated dependencies [Zoltan Szabo - [`44e174e`](https://github.com/eea/volto-eea-chatbot/commit/44e174e4c3634d11241f78b46d86deefe0ed6191)]
+### [2.0.2](https://github.com/eea/volto-eea-chatbot/compare/2.0.1...2.0.2) - 9 April 2026
 
 ### [2.0.1](https://github.com/eea/volto-eea-chatbot/compare/2.0.0...2.0.1) - 2 April 2026
 

package/artifacts/ONYX_V3_INTEGRATION.md

@@ -0,0 +1,34 @@
+# Onyx v3 Integration for Volto EEA Chatbot
+
+This document summarizes the major architectural changes and features implemented to support **Onyx 3.x** while maintaining full backward compatibility with **Onyx 2.x**.
+
+## 1. Version Switching & Configuration
+- **Onyx Version Toggle**: Added a configuration setting in the Chat Block schema to switch between Onyx 2 and 3.
+- **Dynamic Routing**: The `streamingService` now branches logic based on the selected version, targeting the appropriate API endpoints:
+  - **v2**: `/send-message`
+  - **v3**: `/send-chat-message`
+
+## 2. Packet-Based Architecture (v3)
+Implemented support for the new Onyx 3.x packet schema, which utilizes turn indices (`ind`) for better synchronization:
+- **New Packet Types**: Integrated support for `search_tool_start`, `search_tool_queries_delta`, `search_tool_documents_delta`, `citation_info`, and `reasoning_done`.
+- **Packet Normalization**: Developed a normalization layer in `streamingService.ts` to map v3 packets into the chatbot's internal `Packet` structure.
+- **Turn Index Mapping**: Updated `MessageProcessor` to use explicit `ind` values from the backend for reliable turn completion detection, replacing the synthetic index fallback used in v2.
+
+## 3. Streaming & UI Visibility
+- **Eager Rendering**: Updated `MultiToolRenderer` and `SearchToolRenderer` to display search queries and documents as they arrive via delta packets, rather than waiting for tool completion.
+- **Improved Context**: Added distinct labels for "Web Queries" and "Internal Search Queries" in the Search Tool UI.
+- **Reasoning Support**: Enhanced `ReasoningRenderer` to handle v3 reasoning packets and provide a smoother transition between "thinking" and "answering" phases.
+
+## 4. Related Questions (RQ) Restoration
+- **Middleware Routing**: Updated the RQ workflow to route through the specialized `/_rq/` middleware proxy for both session creation and message sending.
+- **Dedicated Sessions**: Ensured that Related Questions use a fresh chat session correctly targeting the QGen assistant on the appropriate version backend.
+- **Completion Resiliency**: Patched a race condition where missing `section_end` packets for the main message turn would block RQ interrogation. The system now automatically synthesizes turn completion when the stream ends.
+
+## 5. Middleware & Proxying
+- **Proxy Expansion**: Synchronized `middleware.js` to handle both standard (`/_da/`) and related questions (`/_rq/`) paths for all v3 endpoints.
+- **Payload Alignment**: Updated the payload builders to support v3-specific fields like `alternate_assistant_id`, `file_descriptors`, and `internal_search_filters`.
+
+## 6. Bug Fixes & Stability
+- **Citation Fallback**: Added a fallback for citations in v3 if explicit `citation_info` packets are missing, leveraging the `final_documents` array in `message_start`.
+- **Typewriter Synchronization**: Adjusted `MessageTextRenderer` to coordinate with the new turn-based completion logic, ensuring the UI remains interactive.
+- **Logging & Observability**: Injected comprehensive tracing logs (`[RQ]`, `[sendMessage]`, `[MessageProcessor]`) to monitor the end-to-end flow of packets.

package/jest-addon.config.js

@@ -377,7 +377,7 @@ const getCoveragePatterns = () => {
           arg === reserved || arg.startsWith(reserved.split('=')[0] + '='),
       ) &&
       process.argv.indexOf(arg) >
-        process.argv.findIndex((item) => item === 'test'),
+      process.argv.findIndex((item) => item === 'test'),
   );
 
   if (directoryArg) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-eea-chatbot",
-  "version": "2.0.2",
+  "version": "2.0.4",
   "description": "@eeacms/volto-eea-chatbot: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",

package/src/ChatBlock/chat/AIMessage.tsx

@@ -1,7 +1,7 @@
 import type { ChatMessageProps } from '@eeacms/volto-eea-chatbot/ChatBlock/types/interfaces';
 import { useState, useMemo, useEffect } from 'react';
 import cx from 'classnames';
-import { visit } from 'unist-util-visit';
+
 import loadable from '@loadable/component';
 import {
   Tab,
@@ -41,6 +41,17 @@ const HalloumiFeedback: any = loadable(
     import('@eeacms/volto-eea-chatbot/ChatBlock/components/HalloumiFeedback'),
 );
 
+function visit(node: any, type: string, visitor: (node: any, idx?: number, parent?: any) => void, idx?: number, parent?: any) {
+  if (node.type === type) {
+    visitor(node, idx, parent);
+  }
+  if (node.children && Array.isArray(node.children)) {
+    node.children.forEach((child: any, cidx: number) => {
+      visit(child, type, visitor, cidx, node);
+    });
+  }
+}
+
 function addQualityMarkersPlugin() {
   return function (tree: any) {
     visit(tree, 'element', function (node: any) {
@@ -320,8 +331,11 @@ export function AIMessage({
     if (isFetchingRelatedQuestions || typeof relatedQuestions !== 'undefined') {
       return;
     }
-    if (messageDisplayed && isComplete && onFetchRelatedQuestions) {
-      onFetchRelatedQuestions();
+    if (isLastMessage && isComplete && onFetchRelatedQuestions) {
+      console.log(`[AIMessage] Triggering RQ: messageDisplayed=${messageDisplayed}, isComplete=${isComplete}, hasContent=${!!message.message}`);
+      if (messageDisplayed) {
+        onFetchRelatedQuestions();
+      }
     }
   }, [
     messageDisplayed,
@@ -329,6 +343,8 @@ export function AIMessage({
     isComplete,
     onFetchRelatedQuestions,
     isFetchingRelatedQuestions,
+    isLastMessage,
+    message.message,
   ]);
 
   useEffect(() => {

package/src/ChatBlock/chat/ChatWindow.tsx

@@ -48,6 +48,7 @@ interface ChatWindowProps {
   enableMatomoTracking?: boolean;
   onDemandInputToggle?: boolean;
   maxContextSegments?: number;
+  onyxVersion?: '2' | '3';
   isPlaywrightTest?: boolean;
   [key: string]: any;
 }
@@ -83,6 +84,7 @@ function ChatWindow({
     enableMatomoTracking = true,
     onDemandInputToggle = true,
     maxContextSegments = 0,
+    onyxVersion = '2',
   } = data;
   const [qualityCheckEnabled, setQualityCheckEnabled] = useState(
     onDemandInputToggle ?? true,
@@ -117,6 +119,7 @@ function ChatWindow({
     qgenAsistantId,
     enableQgen,
     deepResearch,
+    onyxVersion,
   });
 
   const [showLandingPage, setShowLandingPage] = useState(true);

package/src/ChatBlock/hooks/useChatController.ts

@@ -13,6 +13,7 @@ interface UseChatControllerProps {
   enableQgen?: boolean;
   qgenAsistantId?: number;
   deepResearch?: string;
+  onyxVersion?: '2' | '3';
 }
 
 interface RelatedQuestion {
@@ -21,14 +22,42 @@ interface RelatedQuestion {
 
 // Extract JSON array from related questions response
 function extractRelatedQuestions(str: string): RelatedQuestion[] {
-  if (str.toLowerCase().includes('no_response')) {
-    throw new Error('Related questions were not generated properly');
+  if (!str || str.toLowerCase().includes('no_response')) {
+    return [];
+  }
+
+  // Try to parse as JSON first if it looks like JSON
+  const trimmed = str.trim();
+  if (trimmed.startsWith('[') || trimmed.startsWith('{')) {
+    try {
+      const parsed = JSON.parse(trimmed);
+      const items = Array.isArray(parsed) ? parsed : parsed.questions || [];
+      if (Array.isArray(items)) {
+        return items
+          .map((item) => {
+            if (typeof item === 'string') return { question: item };
+            if (item && typeof item === 'object' && item.question)
+              return { question: item.question };
+            return null;
+          })
+          .filter((i): i is RelatedQuestion => i !== null);
+      }
+    } catch (e) {
+      // Fallback to line parsing
+    }
   }
 
+  // Fallback: split by lines and clean up common list formats
   return str
     .split('\n')
-    .filter((line) => line.trim())
-    .map((question) => ({ question }));
+    .map((line) => line.trim())
+    .filter((line) => line.length > 0)
+    .map((line) => {
+      // Remove leading numbers or bullets like "1. ", "- ", "* ", etc.
+      const cleaned = line.replace(/^[\d\.\-\*\s]+/, '').trim();
+      return cleaned ? { question: cleaned } : null;
+    })
+    .filter((i): i is RelatedQuestion => i !== null);
 }
 
 // Fetch related questions using the qgen assistant
@@ -36,12 +65,16 @@ async function fetchRelatedQuestions(
   query: string,
   answer: string,
   qgenAsistantId: number,
+  onyxVersion: '2' | '3' = '2',
 ): Promise<RelatedQuestion[]> {
   try {
+    console.log(`[RQ] Creating session for assistant ${qgenAsistantId} (Onyx v${onyxVersion})`);
     const chatSessionId = await createChatSession(
       qgenAsistantId,
       `Q: ${query}`,
+      true,
     );
+    console.log(`[RQ] Session created: ${chatSessionId}`);
 
     const params = {
       message: `Question: ${query}\nAnswer:\n${answer}`,
@@ -49,23 +82,35 @@ async function fetchRelatedQuestions(
       fileDescriptors: [],
       parentMessageId: null,
       chatSessionId,
-      promptId: 0,
       filters: null,
       selectedDocumentIds: [],
       use_agentic_search: false,
       regenerate: false,
+      onyxVersion,
     };
 
+    if (onyxVersion === '3') {
+      console.log('[Onyx v3] Sending RQ prompt:', params.message);
+    }
+
     let result = '';
     for await (const packets of sendMessage(params, true)) {
       for (const packet of packets) {
-        if (packet.obj.type === PacketType.MESSAGE_DELTA) {
-          result += packet.obj.content;
+        if (onyxVersion === '3') {
+          // console.log('[Onyx v3] RQ Packet:', packet);
+        }
+        if (
+          packet.obj.type === PacketType.MESSAGE_DELTA ||
+          packet.obj.type === PacketType.MESSAGE_START
+        ) {
+          result += (packet.obj as any).content || '';
         }
       }
     }
-
-    return extractRelatedQuestions(result);
+    console.log(`[RQ] Final response string: "${result}"`);
+    const extracted = extractRelatedQuestions(result);
+    console.log(`[RQ] Extracted ${extracted.length} questions`);
+    return extracted;
   } catch (error) {
     console.error('Error fetching related questions:', error);
     return [];
@@ -77,6 +122,7 @@ export function useChatController({
   enableQgen = false,
   qgenAsistantId,
   deepResearch,
+  onyxVersion = '2',
 }: UseChatControllerProps) {
   const [messages, setMessages] = useState<Message[]>([]);
   const [chatSessionId, setChatSessionId] = useState<string | null>(null);
@@ -229,6 +275,7 @@ export function useChatController({
             regenerate: false,
             filters: null,
             selectedDocumentIds: [],
+            onyxVersion,
           },
           assistantNodeId,
           userNodeId,
@@ -250,6 +297,7 @@ export function useChatController({
   );
 
   const onFetchRelatedQuestions = useCallback(async () => {
+    console.log('[RQ] onFetchRelatedQuestions triggered');
     const latestAssistantMessage = messages
       .filter((m) => m.type === 'assistant')
       .pop();
@@ -259,6 +307,7 @@ export function useChatController({
       qgenAsistantId &&
       latestAssistantMessage?.type === 'assistant'
     ) {
+      console.log(`[RQ] Criteria met: assistantNodeId=${latestAssistantMessage.nodeId}, qgenAssistant=${qgenAsistantId}`);
       if (isDeepResearchEnabled) {
         setMessages((prev) => {
           return prev.map((m) =>
@@ -284,6 +333,7 @@ export function useChatController({
             userMessage.message,
             latestAssistantMessage.message,
             qgenAsistantId,
+            onyxVersion,
           );
         }
       } catch (error) {
@@ -299,7 +349,7 @@ export function useChatController({
         setIsFetchingRelatedQuestions(false);
       }
     }
-  }, [messages, enableQgen, qgenAsistantId, isDeepResearchEnabled]);
+  }, [messages, enableQgen, qgenAsistantId, isDeepResearchEnabled, onyxVersion]);
 
   const clearChat = useCallback(() => {
     setMessages([]);

package/src/ChatBlock/hooks/useToolDisplayTiming.ts

@@ -76,5 +76,6 @@ export function useToolDisplayTiming(
     visibleTools,
     handleToolComplete,
     allToolsDisplayed,
+    toolStates,
   };
 }

package/src/ChatBlock/packets/MultiToolRenderer.tsx

@@ -19,7 +19,7 @@ interface MultiToolRendererProps {
 
 export function MultiToolRenderer({
   toolGroups,
-  showTools = [PacketType.SEARCH_TOOL_START],
+  showTools = [PacketType.SEARCH_TOOL_START, PacketType.REASONING_START],
   message,
   libs,
   onAllToolsDisplayed,
@@ -28,22 +28,33 @@ export function MultiToolRenderer({
   const { isFinalMessageComing = false, isComplete = false } = message;
 
   // Filter tool groups based on allowed tool types
-  const filteredToolGroups = useMemo(
-    () =>
-      toolGroups.filter((group) =>
-        group.packets?.some((packet) =>
-          showTools?.includes(packet.obj.type as PacketType),
-        ),
+  const filteredToolGroups = useMemo(() => {
+    const expandedShowTools = [...(showTools || [])];
+    if (showTools?.includes(PacketType.SEARCH_TOOL_START)) {
+      expandedShowTools.push(
+        PacketType.SEARCH_TOOL_START_V3,
+        PacketType.SEARCH_TOOL_QUERIES_DELTA,
+        PacketType.SEARCH_TOOL_DOCUMENTS_DELTA,
+        PacketType.SEARCH_TOOL_DELTA,
+      );
+    }
+    if (showTools?.includes(PacketType.REASONING_START)) {
+      expandedShowTools.push(
+        PacketType.REASONING_DELTA,
+        PacketType.REASONING_DONE,
+        PacketType.REASONING_END as any,
+      );
+    }
+    return toolGroups.filter((group) =>
+      group.packets?.some((packet) =>
+        expandedShowTools.includes(packet.obj.type as PacketType),
       ),
-    [toolGroups, showTools],
-  );
+    );
+  }, [toolGroups, showTools]);
 
   // Manage tool display timing
-  const { allToolsDisplayed, handleToolComplete } = useToolDisplayTiming(
-    filteredToolGroups,
-    isFinalMessageComing,
-    isComplete,
-  );
+  const { allToolsDisplayed, handleToolComplete, toolStates } =
+    useToolDisplayTiming(filteredToolGroups, isFinalMessageComing, isComplete);
 
   // Notify parent when all tools are displayed
   useEffect(() => {
@@ -64,27 +75,29 @@ export function MultiToolRenderer({
 
   if (filteredToolGroups.length === 0) return null;
 
-  const isStreaming = !allToolsDisplayed;
+  const isOverallStreaming = !allToolsDisplayed;
 
   const count = filteredToolGroups.length;
 
-  const ariaLabel = `${count} ${isStreaming ? 'processing' : 'completed'} ${
-    count === 1 ? 'step' : 'steps'
-  }, ${isExpanded ? 'expanded' : 'collapsed'}`;
+  const ariaLabel = `${count} ${
+    isOverallStreaming ? 'processing' : 'completed'
+  } ${count === 1 ? 'step' : 'steps'}, ${isExpanded ? 'expanded' : 'collapsed'}`;
 
   return (
     <div
       className={cx('multi-tool-renderer', {
-        streaming: isStreaming,
-        complete: !isStreaming,
+        streaming: isOverallStreaming,
+        complete: !isOverallStreaming,
       })}
     >
       {/* Header */}
-      <div className={cx({ 'tools-container collapsed-view': isStreaming })}>
+      <div
+        className={cx({ 'tools-container collapsed-view': isOverallStreaming })}
+      >
         <div
           className={cx({
-            'tools-collapsed-header': isStreaming,
-            'tools-summary-header': !isStreaming,
+            'tools-collapsed-header': isOverallStreaming,
+            'tools-summary-header': !isOverallStreaming,
           })}
           onClick={toggleExpanded}
           role="button"
@@ -109,21 +122,25 @@ export function MultiToolRenderer({
         {/* Tools List */}
         <div
           className={cx({
-            'tools-collapsed-list': isStreaming,
-            'tools-expanded-content': !isStreaming,
-            expanded: isExpanded && isStreaming,
-            visible: isExpanded && !isStreaming,
+            'tools-collapsed-list': isOverallStreaming,
+            'tools-expanded-content': !isOverallStreaming,
+            expanded: isExpanded && isOverallStreaming,
+            visible: isExpanded && !isOverallStreaming,
           })}
         >
-          <div className={cx({ 'tools-list': isStreaming })}>
+          <div className={cx({ 'tools-list': isOverallStreaming })}>
             <div>
               {filteredToolGroups.map((toolGroup, index) => {
                 const isLastItem = index === filteredToolGroups.length - 1;
+                const toolState = toolStates.get(toolGroup.ind);
+                const isToolCompleted = toolState?.isCompleted;
 
                 return (
                   <div
                     key={toolGroup.ind}
-                    className={cx({ 'tool-collaps ed-wrapper': isStreaming })}
+                    className={cx({
+                      'tool-collapsed-wrapper': isOverallStreaming,
+                    })}
                   >
                     <RendererComponent
                       packets={toolGroup.packets}
@@ -143,32 +160,46 @@ export function MultiToolRenderer({
                         ) : (
                           <span
                             className={cx({
-                              'tool-icon-dot': isStreaming,
-                              'tool-icon-default': !isStreaming,
+                              'tool-icon-dot': isOverallStreaming,
+                              'tool-icon-default': !isOverallStreaming,
                             })}
                           />
                         );
 
-                        // Streaming: collapsed view (status only)
-                        if (isStreaming) {
-                          return (
-                            <div
-                              className={cx('tool-item-collapsed', {
-                                active: isLastItem,
-                                completed: !isLastItem,
-                              })}
-                            >
-                              <div className="tool-collapsed-icon">
-                                {finalIcon}
-                              </div>
-                              <span className="tool-collapsed-status">
-                                {status}
-                              </span>
-                            </div>
+                        // If tool is not completed and we are overall streaming, show collapsed view
+                        // EXCEPT for reasoning and search which we want to see while they stream/progress
+                        if (isOverallStreaming && !isToolCompleted) {
+                          const isDetailedTool = toolGroup.packets.some(
+                            (p) =>
+                              p.obj.type === PacketType.REASONING_START ||
+                              p.obj.type === PacketType.REASONING_DELTA ||
+                              p.obj.type === PacketType.SEARCH_TOOL_START ||
+                              p.obj.type === PacketType.SEARCH_TOOL_START_V3 ||
+                              p.obj.type === PacketType.SEARCH_TOOL_DELTA ||
+                              p.obj.type === PacketType.SEARCH_TOOL_QUERIES_DELTA ||
+                              p.obj.type === PacketType.SEARCH_TOOL_DOCUMENTS_DELTA,
                           );
+
+                          if (!isDetailedTool || !content) {
+                            return (
+                              <div
+                                className={cx('tool-item-collapsed', {
+                                  active: isLastItem,
+                                  completed: isToolCompleted,
+                                })}
+                              >
+                                <div className="tool-collapsed-icon">
+                                  {finalIcon}
+                                </div>
+                                <span className="tool-collapsed-status">
+                                  {status}
+                                </span>
+                              </div>
+                            );
+                          }
                         }
 
-                        // Complete: expanded view (full content)
+                        // Expanded view (full content) - used for completed tools or when overall complete
                         return (
                           <div className="tool-item-expanded">
                             <div className="tool-connector-line" />

package/src/ChatBlock/packets/RendererComponent.tsx

@@ -26,7 +26,10 @@ function isChatPacket(packet: Packet): boolean {
 }
 
 function isSearchToolPacket(packet: Packet): boolean {
-  return packet.obj.type === PacketType.SEARCH_TOOL_START;
+  return (
+    packet.obj.type === PacketType.SEARCH_TOOL_START ||
+    packet.obj.type === PacketType.SEARCH_TOOL_START_V3
+  );
 }
 
 function isImageToolPacket(packet: Packet): boolean {
@@ -44,7 +47,9 @@ function isFetchToolPacket(packet: Packet): boolean {
 function isReasoningPacket(packet: Packet): boolean {
   return (
     packet.obj.type === PacketType.REASONING_START ||
-    packet.obj.type === PacketType.REASONING_DELTA
+    packet.obj.type === PacketType.REASONING_DELTA ||
+    packet.obj.type === PacketType.REASONING_DONE ||
+    packet.obj.type === PacketType.REASONING_END
   );
 }
 

package/src/ChatBlock/packets/renderers/MessageTextRenderer.tsx

@@ -90,7 +90,11 @@ export const MessageTextRenderer: MessageRenderer<ChatPacket> = ({
           // If we're far behind, catch up faster
           const increment =
             remaining > CATCH_UP_THRESHOLD ? PACKETS_PER_TICK : 1;
-          return Math.min(prev + increment, packets.length);
+          const next = Math.min(prev + increment, packets.length);
+          if (isStreamFinished && next === packets.length) {
+            console.log(`[MessageTextRenderer] Animation finished: ${next}/${packets.length}`);
+          }
+          return next;
         });
       }, PACKET_DELAY_MS);
 
@@ -121,6 +125,7 @@ export const MessageTextRenderer: MessageRenderer<ChatPacket> = ({
       ) {
         return;
       }
+      console.log(`[MessageTextRenderer] Calling onComplete: packets=${packets.length}, finished=${isStreamFinished}`);
       onComplete();
     }
   }, [

package/src/ChatBlock/packets/renderers/ReasoningRenderer.tsx

@@ -21,6 +21,7 @@ function constructCurrentReasoningState(packets: ReasoningPacket[]) {
   const hasEnd = packets.some(
     (p) =>
       p.obj.type === PacketType.SECTION_END ||
+      p.obj.type === PacketType.REASONING_DONE ||
       // Support either convention for reasoning completion
       (p.obj as any).type === PacketType.REASONING_END,
   );

package/src/ChatBlock/packets/renderers/SearchToolRenderer.tsx

@@ -55,26 +55,33 @@ const constructCurrentSearchState = (
   isInternetSearch: boolean;
 } => {
   const searchStart = packets.find(
-    (packet) => packet.obj.type === PacketType.SEARCH_TOOL_START,
+    (packet) =>
+      packet.obj.type === PacketType.SEARCH_TOOL_START ||
+      packet.obj.type === PacketType.SEARCH_TOOL_START_V3,
   )?.obj as SearchToolStart | null;
 
   const searchDeltas = packets
-    .filter((packet) => packet.obj.type === PacketType.SEARCH_TOOL_DELTA)
-    .map((packet) => packet.obj as SearchToolDelta);
+    .filter(
+      (packet) =>
+        packet.obj.type === PacketType.SEARCH_TOOL_DELTA ||
+        packet.obj.type === PacketType.SEARCH_TOOL_QUERIES_DELTA ||
+        packet.obj.type === PacketType.SEARCH_TOOL_DOCUMENTS_DELTA,
+    )
+    .map((packet) => packet.obj);
 
   const searchEnd = packets.find(
     (packet) => packet.obj.type === PacketType.SECTION_END,
   )?.obj as SectionEnd | null;
 
-  // Extract queries from ToolDelta packets
+  // Extract queries from various delta packets
   const queries = searchDeltas
-    .flatMap((delta) => delta?.queries || [])
+    .flatMap((delta: any) => delta?.queries || [])
     .filter((query, index, arr) => arr.indexOf(query) === index); // Remove duplicates
 
   const seenDocIds = new Set<string>();
   const results = searchDeltas
-    .flatMap((delta) => delta?.documents || [])
-    .filter((doc) => {
+    .flatMap((delta: any) => delta?.documents || [])
+    .filter((doc: OnyxDocument) => {
       if (!doc || !doc.document_id) return false;
       if (seenDocIds.has(doc.document_id)) return false;
       seenDocIds.add(doc.document_id);
@@ -202,8 +209,8 @@ export const SearchToolRenderer: MessageRenderer<SearchToolPacket> = ({
     <SVGIcon name={isInternetSearch ? GlobeIcon : SearchIcon} size={size} />
   );
 
-  // Don't render anything if search hasn't started
-  if (queries.length === 0) {
+  // Don't render anything if search hasn't started or has no data yet
+  if (queries.length === 0 && results.length === 0) {
     return children({
       icon: IconComponent,
       status: status,
@@ -218,7 +225,9 @@ export const SearchToolRenderer: MessageRenderer<SearchToolPacket> = ({
       <div className="search-tool-renderer">
         <div className="queries-section">
           <div className="queries-header">
-            <strong>Queries</strong>
+            <strong>
+              {isInternetSearch ? 'Web Queries' : 'Internal Search Queries'}
+            </strong>
           </div>
           <div className="queries-list">
             {queries.slice(0, queriesToShow).map((query, index) => (
@@ -262,7 +271,7 @@ export const SearchToolRenderer: MessageRenderer<SearchToolPacket> = ({
 
         <div className="results-section">
           <div className="results-header">
-            <strong>{isInternetSearch ? 'Results' : 'Documents'}</strong>
+            <strong>{isInternetSearch ? 'Web Results' : 'Documents'}</strong>
           </div>
 
           <div className="results-list">

package/src/ChatBlock/schema.jsx

@@ -104,6 +104,7 @@ export function ChatBlockSchema({ assistants, data }) {
           'scrollToInput',
           'showAssistantTitle',
           'showAssistantDescription',
+          'onyxVersion',
         ],
       },
     ],
@@ -368,6 +369,18 @@ range is from 0 to 100`,
         type: 'boolean',
         default: true,
       },
+      onyxVersion: {
+        title: 'Onyx API version',
+        choices: [
+          ['2', 'Onyx 2.x'],
+          ['3', 'Onyx 3.x'],
+        ],
+        default: '2',
+        description:
+          'Select which Onyx API version the backend is running. ' +
+          'Onyx 2.x uses the legacy send-message payload; ' +
+          'Onyx 3.x uses the new send-message payload with placement-based streaming.',
+      },
       showAssistantPrompts: {
         title: 'Show predefined prompts',
         type: 'boolean',

package/src/ChatBlock/services/messageProcessor.ts

@@ -111,17 +111,26 @@ export class MessageProcessor {
       this.indicesStarted.push(packet.ind);
     }
 
-    // Send synthetic SECTION_END when needed
-    if (
-      packet.obj.type === PacketType.SECTION_END &&
-      this.indicesStarted.length > 0
-    ) {
-      processedPacket = getSynteticPacket(
-        this.indicesStarted.shift()!,
-        PacketType.SECTION_END,
-      );
-    } else if (packet.obj.type === PacketType.SECTION_END) {
-      return;
+    // Handle SECTION_END (v2/v3 compatible)
+    if (packet.obj.type === PacketType.SECTION_END) {
+      let targetInd = packet.ind;
+
+      // If ind is -1 (common in v2), use synthetic logic
+      if (targetInd === -1 && this.indicesStarted.length > 0) {
+        targetInd = this.indicesStarted.shift()!;
+      } else if (targetInd !== -1) {
+        // If ind is provided (v3), remove it from indicesStarted if present
+        const startIdx = this.indicesStarted.indexOf(targetInd);
+        if (startIdx > -1) {
+          this.indicesStarted.splice(startIdx, 1);
+        }
+      }
+
+      if (targetInd === -1) {
+        return; // Skip if we can't map it to a turn
+      }
+
+      processedPacket = getSynteticPacket(targetInd, PacketType.SECTION_END);
     }
 
     const { ind } = processedPacket;
@@ -129,6 +138,10 @@ export class MessageProcessor {
     // Store processed packet for later aggregation
     this.packets.push(processedPacket);
 
+    if (processedPacket.obj.type === PacketType.MESSAGE_START || processedPacket.obj.type === PacketType.SECTION_END) {
+        console.log(`[MessageProcessor] Processed ${processedPacket.obj.type} for ind=${processedPacket.ind}`);
+    }
+
     // Group packets by index for later processing
     if (!this.groupedPackets.has(ind)) {
       this.groupedPackets.set(ind, []);
@@ -174,6 +187,7 @@ export class MessageProcessor {
         PacketType.MESSAGE_START,
         PacketType.SEARCH_TOOL_DELTA,
         PacketType.FETCH_TOOL_START,
+        PacketType.SEARCH_TOOL_DOCUMENTS_DELTA,
       ].includes(packet.obj.type)
     ) {
       return;
@@ -181,7 +195,8 @@ export class MessageProcessor {
     let newDocuments = false;
     const data = packet.obj as any;
     const documents = data.final_documents || data.documents;
-    if (documents) {
+
+    if (documents && Array.isArray(documents)) {
       documents.forEach((doc: OnyxDocument) => {
         const docId = doc.document_id;
         if (docId && !this.documentMap.has(docId)) {
@@ -190,8 +205,23 @@ export class MessageProcessor {
         }
       });
     }
+
     if (newDocuments) {
       this._documents = Array.from(this.documentMap.values());
+
+      // If we have final_documents and no citations yet, create a fallback mapping
+      // This ensures the Sources tab shows up in v3 when citation_info is missing
+      if (
+        packet.obj.type === PacketType.MESSAGE_START &&
+        data.final_documents &&
+        this._citations.size === 0
+      ) {
+        data.final_documents.forEach((doc: OnyxDocument, index: number) => {
+          if (doc.document_id) {
+            this._citations.set(index + 1, doc.document_id);
+          }
+        });
+      }
     }
   }
 
@@ -200,6 +230,16 @@ export class MessageProcessor {
    * Updates the internal citation collection and notifies when new citations are added
    */
   private processCitations(packet: Packet) {
+    if (packet.obj.type === PacketType.CITATION_INFO) {
+      const citationInfo = packet.obj as any;
+      if (citationInfo.citation_number && citationInfo.document_id) {
+        this._citations.set(
+          citationInfo.citation_number,
+          citationInfo.document_id,
+        );
+      }
+      return;
+    }
     if (packet.obj.type !== PacketType.CITATION_DELTA) {
       return;
     }
@@ -237,6 +277,13 @@ export class MessageProcessor {
    */
   private processStreamEnd(packet: Packet) {
     if ([PacketType.STOP, PacketType.ERROR].includes(packet.obj.type)) {
+      // Close any remaining open sections (especially the last one)
+      while (this.indicesStarted.length > 0) {
+        const ind = this.indicesStarted.shift()!;
+        console.log(`[MessageProcessor] Stream ended. Synthesizing section_end for ind=${ind}`);
+        const synthetic = getSynteticPacket(ind, PacketType.SECTION_END);
+        this.processPacket(synthetic);
+      }
       this._isComplete = true;
     }
   }
@@ -248,7 +295,9 @@ export class MessageProcessor {
   private extractToolCall(packets: Packet[]): ToolCallMetadata | null {
     // Look for search tool packets
     const searchToolStart = packets.find(
-      (p) => p.obj.type === PacketType.SEARCH_TOOL_START,
+      (p) =>
+        p.obj.type === PacketType.SEARCH_TOOL_START ||
+        p.obj.type === PacketType.SEARCH_TOOL_START_V3,
     );
 
     if (!searchToolStart) {
@@ -260,7 +309,10 @@ export class MessageProcessor {
     const processedDocs: Record<string, any> = {};
 
     for (const packet of packets) {
-      if (packet.obj.type === PacketType.SEARCH_TOOL_DELTA) {
+      if (
+        packet.obj.type === PacketType.SEARCH_TOOL_DELTA ||
+        packet.obj.type === PacketType.SEARCH_TOOL_DOCUMENTS_DELTA
+      ) {
         const delta = packet.obj as any;
         if (delta.documents && Array.isArray(delta.documents)) {
           delta.documents.forEach((doc: any) => {

package/src/ChatBlock/services/packetUtils.ts

@@ -11,11 +11,15 @@ export function getSynteticPacket(ind: number, type: PacketType): Packet {
 export function isToolPacket(packet: Packet): boolean {
   const toolPacketTypes = [
     PacketType.SEARCH_TOOL_START,
+    PacketType.SEARCH_TOOL_START_V3,
+    PacketType.SEARCH_TOOL_QUERIES_DELTA,
+    PacketType.SEARCH_TOOL_DOCUMENTS_DELTA,
     PacketType.SEARCH_TOOL_DELTA,
     PacketType.CUSTOM_TOOL_START,
     PacketType.CUSTOM_TOOL_DELTA,
     PacketType.REASONING_START,
     PacketType.REASONING_DELTA,
+    PacketType.REASONING_DONE,
     PacketType.FETCH_TOOL_START,
   ];
 
@@ -40,9 +44,15 @@ export function isFinalAnswerComplete(packets: Packet[]): boolean {
     return false;
   }
 
-  return packets.some(
+  const hasSectionEnd = packets.some(
     (packet) =>
       packet.obj.type === PacketType.SECTION_END &&
       packet.ind === messageStartPacket.ind,
   );
+
+  if (hasSectionEnd) {
+    console.log(`[isFinalAnswerComplete] Complete! ind=${messageStartPacket.ind}`);
+  }
+
+  return hasSectionEnd;
 }

package/src/ChatBlock/services/streamingService.ts

@@ -30,6 +30,7 @@ export interface SendMessageParams {
   enabledToolIds?: number[];
   forcedToolIds?: number[];
   retrieval_options?: any;
+  onyxVersion?: '2' | '3';
 }
 
 export interface StreamResponse {
@@ -90,11 +91,131 @@ export const processRawChunkString = (
   return [parsedChunkSections, currPartialChunk];
 };
 
+// ─── Payload Templates ─────────────────────────────────────────────────────
+
+/**
+ * Build the Onyx 2.x send-message payload
+ */
+function buildPayloadV2(params: SendMessageParams): Record<string, unknown> {
+  const documentsAreSelected =
+    params.selectedDocumentIds && params.selectedDocumentIds.length > 0;
+
+  return {
+    alternate_assistant_id: params.alternateAssistantId,
+    chat_session_id: params.chatSessionId,
+    parent_message_id: params.parentMessageId,
+    message: params.message,
+    prompt_id: null,
+    search_doc_ids: documentsAreSelected ? params.selectedDocumentIds : null,
+    file_descriptors: params.fileDescriptors,
+    current_message_files: params.currentMessageFiles,
+    regenerate: params.regenerate,
+    retrieval_options:
+      params.retrieval_options ??
+      (!documentsAreSelected
+        ? {
+            run_search:
+              params.queryOverride || params.forceSearch ? 'always' : 'auto',
+            real_time: true,
+            filters: params.filters,
+          }
+        : null),
+    query_override: params.queryOverride,
+    prompt_override: {
+      ...(params.systemPromptOverride
+        ? { system_prompt: params.systemPromptOverride }
+        : {}),
+      ...(params.taskPromptOverride
+        ? { task_prompt: params.taskPromptOverride }
+        : {}),
+    },
+    llm_override:
+      params.temperature || params.modelVersion
+        ? {
+            temperature: params.temperature,
+            model_provider: params.modelProvider,
+            model_version: params.modelVersion,
+          }
+        : null,
+    use_existing_user_message: params.useExistingUserMessage,
+    use_agentic_search: params.useAgentSearch ?? false,
+    allowed_tool_ids: params.enabledToolIds,
+    forced_tool_ids: params.forcedToolIds,
+  };
+}
+
+/**
+ * Build the Onyx 3.x send-message payload
+ */
+function buildPayloadV3(params: SendMessageParams): Record<string, unknown> {
+  const payload = {
+    message: params.message,
+    chat_session_id: params.chatSessionId,
+    parent_message_id: params.parentMessageId,
+    file_descriptors: params.fileDescriptors ?? [],
+    internal_search_filters: {
+      source_type: params.filters?.source_type ?? ['web', 'github'],
+      document_set: params.filters?.document_set ?? null,
+      time_cutoff: params.filters?.time_cutoff ?? null,
+      tags: params.filters?.tags ?? [],
+    },
+    deep_research: params.useAgentSearch ?? false,
+    allowed_tool_ids: params.enabledToolIds?.length
+      ? params.enabledToolIds
+      : [1],
+    forced_tool_id: params.forcedToolIds?.[0] ?? null,
+    llm_override: {
+      temperature: params.temperature ?? 0.5,
+      model_provider:
+        params.modelProvider || 'Inhouse LiteLLM provider oss 120b',
+      model_version: params.modelVersion || 'Inhouse-LLM/gpt-oss-120b',
+    },
+    llm_overrides: null,
+    origin: 'webapp',
+    additional_context: null,
+    alternate_assistant_id: params.alternateAssistantId ?? null,
+    stream: true,
+  };
+  return payload;
+}
+
+/**
+ * Normalise a raw Onyx 3.x stream object into the canonical { ind, obj } Packet shape.
+ */
+function normaliseV3Chunk(raw: any): Packet | null {
+  // Bare identity packet (user/assistant message IDs – no placement wrapper)
+  if ('user_message_id' in raw && 'reserved_assistant_message_id' in raw) {
+    return {
+      ind: -1,
+      obj: {
+        type: PacketType.MESSAGE_END_ID_INFO,
+        user_message_id: raw.user_message_id,
+        reserved_assistant_message_id: raw.reserved_assistant_message_id,
+      },
+    } as Packet;
+  }
+
+  if (!raw.placement || typeof raw.obj !== 'object') return null;
+
+  const ind: number = raw.placement.turn_index ?? 0;
+  const obj = raw.obj;
+
+  // Map citation_number to citation_num for compatibility with CitationDelta consumers
+  if (obj.type === PacketType.CITATION_INFO && 'citation_number' in obj) {
+    obj.citation_num = obj.citation_number;
+  }
+
+  const normalised = { ind, obj } as Packet;
+  // console.log('[Onyx v3] Normalised packet:', normalised);
+  return normalised;
+}
+
 /**
  * Handle streaming response from the backend
  */
 export async function* handleStream(
   streamingResponse: Response,
+  onyxVersion: '2' | '3' = '2',
 ): AsyncGenerator<Packet[], void, unknown> {
   const reader = streamingResponse.body?.getReader();
   if (!reader) {
@@ -120,6 +241,10 @@ export async function* handleStream(
       previousPartialChunk,
     );
 
+    if (onyxVersion === '3' && completedChunks.length > 0) {
+      // console.log('[Onyx v3] Raw completed chunks:', completedChunks);
+    }
+
     if (!completedChunks.length && !partialChunk) {
       break;
     }
@@ -130,6 +255,10 @@ export async function* handleStream(
     const packets: Packet[] = completedChunks
       .filter((chunk) => chunk && typeof chunk === 'object')
       .map((chunk) => {
+        if (onyxVersion === '3') {
+          return normaliseV3Chunk(chunk);
+        }
+
         // Onyx v2 format: { ind: number, obj: { type: string, ... } }
         if ('ind' in chunk && 'obj' in chunk) {
           return chunk as Packet;
@@ -173,77 +302,24 @@ export async function* handleStream(
  * Send a message and stream the response
  */
 export async function* sendMessage(
-  {
-    regenerate,
-    retrieval_options,
-    message,
-    fileDescriptors,
-    currentMessageFiles,
-    parentMessageId,
-    chatSessionId,
-    filters,
-    selectedDocumentIds,
-    queryOverride,
-    forceSearch,
-    modelProvider,
-    modelVersion,
-    temperature,
-    systemPromptOverride,
-    taskPromptOverride,
-    useExistingUserMessage,
-    alternateAssistantId,
-    signal,
-    useAgentSearch,
-    enabledToolIds,
-    forcedToolIds,
-  }: SendMessageParams,
+  params: SendMessageParams,
   isRelatedQuestion: boolean = false,
 ): AsyncGenerator<Packet[], void, unknown> {
-  const documentsAreSelected =
-    selectedDocumentIds && selectedDocumentIds.length > 0;
+  const { onyxVersion = '2', signal } = params;
 
-  const payload = {
-    alternate_assistant_id: alternateAssistantId,
-    chat_session_id: chatSessionId,
-    parent_message_id: parentMessageId,
-    message,
-    prompt_id: null,
-    search_doc_ids: documentsAreSelected ? selectedDocumentIds : null,
-    file_descriptors: fileDescriptors,
-    current_message_files: currentMessageFiles,
-    regenerate,
-    retrieval_options:
-      retrieval_options ??
-      (!documentsAreSelected
-        ? {
-            run_search: queryOverride || forceSearch ? 'always' : 'auto',
-            real_time: true,
-            filters: filters,
-          }
-        : null),
-    query_override: queryOverride,
-    prompt_override: {
-      ...(systemPromptOverride ? { system_prompt: systemPromptOverride } : {}),
-      ...(taskPromptOverride ? { task_prompt: taskPromptOverride } : {}),
-    },
-    llm_override:
-      temperature || modelVersion
-        ? {
-            temperature,
-            model_provider: modelProvider,
-            model_version: modelVersion,
-          }
-        : null,
-    use_existing_user_message: useExistingUserMessage,
-    use_agentic_search: useAgentSearch ?? false,
-    allowed_tool_ids: enabledToolIds,
-    forced_tool_ids: forcedToolIds,
-  };
+  const payload =
+    onyxVersion === '3' ? buildPayloadV3(params) : buildPayloadV2(params);
 
   const body = JSON.stringify(payload);
 
   const middleware = isRelatedQuestion ? '_rq' : '_da';
-  const sendMessageResponse = await fetch(`/${middleware}/chat/send-message`, {
+  const endpoint =
+    onyxVersion === '3' ? 'send-chat-message' : 'send-message';
+
+  console.log(`[sendMessage] Target URL: /${middleware}/chat/${endpoint} (v${onyxVersion})`);
+  console.log(`[sendMessage] Payload:`, payload);
+
+  const sendMessageResponse = await fetch(`/${middleware}/chat/${endpoint}`, {
     method: 'POST',
     headers: {
       'Content-Type': 'application/json',
@@ -258,7 +334,7 @@ export async function* sendMessage(
     throw new Error(`Failed to send message - ${errorMsg}`);
   }
 
-  yield* handleStream(sendMessageResponse);
+  yield* handleStream(sendMessageResponse, onyxVersion);
 }
 
 /**
@@ -267,8 +343,13 @@ export async function* sendMessage(
 export async function createChatSession(
   personaId: number,
   description?: string,
+  isRelatedQuestion: boolean = false,
 ): Promise<string> {
-  const response = await fetch('/_da/chat/create-chat-session', {
+  const middleware = isRelatedQuestion ? '_rq' : '_da';
+  const url = `/${middleware}/chat/create-chat-session`;
+  console.log(`[createChatSession] URL: ${url}`);
+
+  const response = await fetch(url, {
     method: 'POST',
     headers: {
       'Content-Type': 'application/json',

package/src/ChatBlock/types/streamingModels.ts

@@ -51,6 +51,13 @@ export enum PacketType {
   MESSAGE_END_ID_INFO = 'message_end_id_info',
 
   ERROR = 'error',
+
+  // Onyx v3 replacements
+  SEARCH_TOOL_START_V3 = 'search_tool_start',
+  SEARCH_TOOL_QUERIES_DELTA = 'search_tool_queries_delta',
+  SEARCH_TOOL_DOCUMENTS_DELTA = 'search_tool_documents_delta',
+  CITATION_INFO = 'citation_info',
+  REASONING_DONE = 'reasoning_done',
 }
 
 // Basic Message Packets
@@ -174,12 +181,44 @@ export interface ErrorObj extends BaseObj {
   error: string;
 }
 
+// Onyx v3 Specific Packets
+export interface SearchToolStartV3 extends BaseObj {
+  type: PacketType.SEARCH_TOOL_START_V3;
+  is_internet_search?: boolean;
+}
+
+export interface SearchToolQueriesDelta extends BaseObj {
+  type: PacketType.SEARCH_TOOL_QUERIES_DELTA;
+  queries: string[];
+}
+
+export interface SearchToolDocumentsDelta extends BaseObj {
+  type: PacketType.SEARCH_TOOL_DOCUMENTS_DELTA;
+  documents: OnyxDocument[];
+}
+
+export interface CitationInfo extends BaseObj {
+  type: PacketType.CITATION_INFO;
+  citation_number: number;
+  document_id: string;
+}
+
+export interface ReasoningDone extends BaseObj {
+  type: PacketType.REASONING_DONE;
+}
+
 export type ChatObj = MessageStart | MessageDelta | MessageEnd;
 export type StopObj = Stop;
 export type SectionEndObj = SectionEnd;
 
 // Specific tool objects
-export type SearchToolObj = SearchToolStart | SearchToolDelta | SectionEnd;
+export type SearchToolObj =
+  | SearchToolStart
+  | SearchToolDelta
+  | SearchToolStartV3
+  | SearchToolQueriesDelta
+  | SearchToolDocumentsDelta
+  | SectionEnd;
 export type ImageGenerationToolObj =
   | ImageGenerationToolStart
   | ImageGenerationToolDelta
@@ -196,6 +235,7 @@ export type ReasoningObj =
   | ReasoningStart
   | ReasoningDelta
   | ReasoningEnd
+  | ReasoningDone
   | SectionEnd;
 export type CitationObj =
   | CitationStart
@@ -212,7 +252,12 @@ export type ObjTypes =
   | SectionEndObj
   | CitationObj
   | ErrorObj
-  | MessageEndIdInfo;
+  | MessageEndIdInfo
+  | SearchToolStartV3
+  | SearchToolQueriesDelta
+  | SearchToolDocumentsDelta
+  | CitationInfo
+  | ReasoningDone;
 
 // Packet wrapper for streaming objects
 export interface Packet {

package/src/middleware.js

@@ -186,11 +186,21 @@ async function send_onyx_request(
     options.body = JSON.stringify(req.body);
   }
 
+  // console.log('[Middleware] Sending request to Onyx:', {
+  //   url,
+  //   method: req.method,
+  //   hasBody: !!req.body,
+  //   body: JSON.stringify(req.body, null, 2),
+  // });
+
   const mock_file = is_related_question
     ? process.env.MOCK_LLM_FILE_PATH_RQ
     : process.env.MOCK_LLM_FILE_PATH;
 
-  if (mock_file && req.url.endsWith('send-message')) {
+  if (
+    mock_file &&
+    (req.url.endsWith('send-message') || req.url.endsWith('send-chat-message'))
+  ) {
     try {
       await new Promise((resolve) => setTimeout(resolve, 2000));
       mock_send_message(res, is_related_question);
@@ -210,6 +220,13 @@ async function send_onyx_request(
     log(`Fetching ${url}`);
     const response = await fetch(url, options, req.body);
 
+    // console.log('[Middleware] Received response from Onyx:', {
+    //   url,
+    //   status: response.status,
+    //   statusText: response.statusText,
+    //   headers: response.headers.raw(),
+    // });
+
     if (process.env.DUMP_LLM_FILE_PATH && !is_related_question) {
       const filePath = process.env.DUMP_LLM_FILE_PATH;
       const writer = fs.createWriteStream(filePath);

package/src/middleware.test.js

@@ -18,6 +18,7 @@ jest.mock('node-fetch', () => {
     status: 200,
     headers: {
       get: jest.fn().mockReturnValue('application/json'),
+      raw: jest.fn().mockReturnValue({}),
     },
     body: { pipe: mockPipe },
   });
@@ -220,4 +221,17 @@ describe('src/middleware', () => {
 
     expect(res.write).toHaveBeenCalled();
   });
+
+  it('dumps LLM response when DUMP_LLM_FILE_PATH is set', async () => {
+    process.env.ONYX_API_KEY = 'test-key';
+    process.env.ONYX_URL = 'http://localhost:3000';
+    process.env.DUMP_LLM_FILE_PATH = '/tmp/dumped_response.jsonl';
+
+    await middleware(req, res, next);
+
+    const fs = require('fs');
+    expect(fs.createWriteStream).toHaveBeenCalledWith(
+      '/tmp/dumped_response.jsonl',
+    );
+  });
 });