@eeacms/volto-eea-chatbot 2.0.1 → 2.0.3

package/.eslintrc.js

@@ -16,16 +16,16 @@ if (configFile) {
     voltoPath = `./${jsConfig.baseUrl}/${pathsConfig['@plone/volto'][0]}`;
 }
 
-const AddonConfigurationRegistry = require(`${voltoPath}/addon-registry.js`);
-const reg = new AddonConfigurationRegistry(projectRootPath);
+const { AddonRegistry } = require('@plone/registry/addon-registry');
+const { registry } = AddonRegistry.init(projectRootPath);
 
 // Extends ESlint configuration for adding aliases to `src` directories in Volto addons
-const addonAliases = Object.keys(reg.packages).map((o) => [
+const addonAliases = Object.keys(registry.packages).map((o) => [
   o,
-  reg.packages[o].modulePath,
+  registry.packages[o].modulePath,
 ]);
 
-const addonExtenders = reg.getEslintExtenders().map((m) => require(m));
+const addonExtenders = registry.getEslintExtenders().map((m) => require(m));
 
 const defaultConfig = {
   extends: `${voltoPath}/.eslintrc`,
@@ -34,7 +34,7 @@ const defaultConfig = {
       alias: {
         map: [
           ['@plone/volto', '@plone/volto/src'],
-          ['@plone/volto-slate', '@plone/volto/packages/volto-slate/src'],
+          ['@plone/volto-slate', '@plone/volto-slate/src'],
           ...addonAliases,
           ['@package', `${__dirname}/src`],
           ['@root', `${__dirname}/src`],

package/CHANGELOG.md

@@ -4,6 +4,26 @@ 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.3](https://github.com/eea/volto-eea-chatbot/compare/2.0.2...2.0.3) - 18 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
 
 #### :bug: Bug Fixes

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) {
@@ -423,6 +423,7 @@ module.exports = {
     'schema\\.[jt]s?$',
     'index\\.[jt]s?$',
     'config\\.[jt]sx?$',
+    '/types/',
   ],
   moduleNameMapper: {
     '\\.(css|less|scss|sass)$': 'identity-obj-proxy',

package/package.json

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

package/src/ChatBlock/ChatBlockEdit.jsx

@@ -1,7 +1,8 @@
 import React from 'react';
 import { compose } from 'redux';
 import superagent from 'superagent';
-import { BlockDataForm, SidebarPortal } from '@plone/volto/components';
+import SidebarPortal from '@plone/volto/components/manage/Sidebar/SidebarPortal';
+import BlockDataForm from '@plone/volto/components/manage/Form/BlockDataForm';
 
 import ChatBlockView from './ChatBlockView';
 import { ChatBlockSchema } from './schema';

package/src/ChatBlock/chat/AIMessage.tsx

@@ -1,7 +1,7 @@
-import type { ChatMessageProps } from '../types/interfaces';
+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,
@@ -14,27 +14,42 @@ import {
   useDeepCompareMemoize,
   useQualityMarkers,
   useScrollonStream,
-} from '../hooks';
-import { MultiToolRenderer, RendererComponent } from '../packets';
-import { addCitations } from '../utils/citations';
-import SVGIcon from '../components/Icon';
-import BotIcon from '../../icons/bot.svg';
-import ClearIcon from '../../icons/clear.svg';
+} from '@eeacms/volto-eea-chatbot/ChatBlock/hooks';
+import {
+  MultiToolRenderer,
+  RendererComponent,
+} from '@eeacms/volto-eea-chatbot/ChatBlock/packets';
+import { addCitations } from '@eeacms/volto-eea-chatbot/ChatBlock/utils/citations';
+import SVGIcon from '@eeacms/volto-eea-chatbot/ChatBlock/components/Icon';
+import BotIcon from '@eeacms/volto-eea-chatbot/icons/bot.svg';
+import ClearIcon from '@eeacms/volto-eea-chatbot/icons/clear.svg';
 
 // Lazy load heavy components
-const SourceDetails: any = loadable(() => import('../components/Source'));
+const SourceDetails: any = loadable(
+  () => import('@eeacms/volto-eea-chatbot/ChatBlock/components/Source'),
+);
 const UserActionsToolbar: any = loadable(
-  () => import('../components/UserActionsToolbar'),
+  () =>
+    import('@eeacms/volto-eea-chatbot/ChatBlock/components/UserActionsToolbar'),
 );
 const RelatedQuestions: any = loadable(
-  () => import('../components/RelatedQuestions'),
+  () =>
+    import('@eeacms/volto-eea-chatbot/ChatBlock/components/RelatedQuestions'),
 );
 const HalloumiFeedback: any = loadable(
-  () => import('../components/HalloumiFeedback'),
+  () =>
+    import('@eeacms/volto-eea-chatbot/ChatBlock/components/HalloumiFeedback'),
 );
 
-function capitalize(str: string) {
-  return str.charAt(0).toUpperCase() + str.slice(1);
+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() {
@@ -316,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,
@@ -325,6 +343,8 @@ export function AIMessage({
     isComplete,
     onFetchRelatedQuestions,
     isFetchingRelatedQuestions,
+    isLastMessage,
+    message.message,
   ]);
 
   useEffect(() => {

package/src/ChatBlock/chat/ChatMessage.tsx

@@ -1,5 +1,5 @@
 import { Message as SemanticMessage } from 'semantic-ui-react';
-import type { ChatMessageProps } from '../types/interfaces';
+import type { ChatMessageProps } from '@eeacms/volto-eea-chatbot/ChatBlock/types/interfaces';
 import { UserMessage, AIMessage } from '.';
 
 export function ChatMessage(props: ChatMessageProps) {

package/src/ChatBlock/chat/ChatWindow.tsx

@@ -5,21 +5,21 @@ import React, {
   useMemo,
   useCallback,
 } from 'react';
-import type { Persona } from '../types/interfaces';
+import type { Persona } from '@eeacms/volto-eea-chatbot/ChatBlock/types/interfaces';
 import { Button, Form, Segment, Checkbox } from 'semantic-ui-react';
 import { injectLazyLibs } from '@plone/volto/helpers/Loadable';
 import { trackEvent } from '@eeacms/volto-matomo/utils';
 
 import { ChatMessage } from '.';
-import { PacketType } from '../types/streamingModels';
-import AutoResizeTextarea from '../components/AutoResizeTextarea';
-import QualityCheckToggle from '../components/QualityCheckToggle';
-import EmptyState from '../components/EmptyState';
-import { useChatController } from '../hooks';
-import SVGIcon from '../components/Icon';
-import PenIcon from '../../icons/square-pen.svg';
+import { PacketType } from '@eeacms/volto-eea-chatbot/ChatBlock/types/streamingModels';
+import AutoResizeTextarea from '@eeacms/volto-eea-chatbot/ChatBlock/components/AutoResizeTextarea';
+import QualityCheckToggle from '@eeacms/volto-eea-chatbot/ChatBlock/components/QualityCheckToggle';
+import EmptyState from '@eeacms/volto-eea-chatbot/ChatBlock/components/EmptyState';
+import { useChatController } from '@eeacms/volto-eea-chatbot/ChatBlock/hooks';
+import SVGIcon from '@eeacms/volto-eea-chatbot/ChatBlock/components/Icon';
+import PenIcon from '@eeacms/volto-eea-chatbot/icons/square-pen.svg';
 
-import '../style.less';
+import '@eeacms/volto-eea-chatbot/ChatBlock/style.less';
 
 interface ChatWindowProps {
   block_id?: string;
@@ -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);
@@ -182,9 +185,8 @@ function ChatWindow({
               style={{ maxHeight: height }}
             >
               {messages.map((message, index) => (
-                <React.Fragment>
+                <React.Fragment key={message.messageId}>
                   <ChatMessage
-                    key={message.messageId}
                     prevMessage={messages[index - 1]}
                     message={message}
                     isLoading={isStreaming}

package/src/ChatBlock/chat/UserMessage.tsx

@@ -1,8 +1,8 @@
-import type { ChatMessageProps } from '../types/interfaces';
+import type { ChatMessageProps } from '@eeacms/volto-eea-chatbot/ChatBlock/types/interfaces';
 import loadable from '@loadable/component';
-import SVGIcon from '../components/Icon';
-import { components } from '../components/markdown';
-import UserIcon from '../../icons/user.svg';
+import SVGIcon from '@eeacms/volto-eea-chatbot/ChatBlock/components/Icon';
+import { components } from '@eeacms/volto-eea-chatbot/ChatBlock/components/markdown';
+import UserIcon from '@eeacms/volto-eea-chatbot/icons/user.svg';
 
 const Markdown: any = loadable(() => import('react-markdown'));
 

package/src/ChatBlock/components/AutoResizeTextarea.jsx

@@ -4,7 +4,7 @@ import { trackEvent } from '@eeacms/volto-matomo/utils';
 import TextareaAutosize from 'react-textarea-autosize';
 
 import SVGIcon from './Icon';
-import SendIcon from '../../icons/send.svg';
+import SendIcon from '@eeacms/volto-eea-chatbot/icons/send.svg';
 
 export default React.forwardRef(function AutoResizeTextarea(props, ref) {
   const { onSubmit, isStreaming, enableMatomoTracking, persona, ...rest } =

package/src/ChatBlock/components/ChatMessageFeedback.jsx

@@ -2,8 +2,8 @@ import { useState } from 'react';
 import { Button, Icon } from 'semantic-ui-react';
 import FeedbackModal from './FeedbackModal';
 import SVGIcon from './Icon';
-import ThumbsUpIcon from '../../icons/thumbs-up.svg';
-import ThumbsDownIcon from '../../icons/thumbs-down.svg';
+import ThumbsUpIcon from '@eeacms/volto-eea-chatbot/icons/thumbs-up.svg';
+import ThumbsDownIcon from '@eeacms/volto-eea-chatbot/icons/thumbs-down.svg';
 
 const Toast = ({ message, type, isActive }) => (
   <div className={`feedback-toast ${type} ${isActive ? 'active' : ''}`}>

package/src/ChatBlock/components/EmptyState.jsx

@@ -1,5 +1,5 @@
 import { Button } from 'semantic-ui-react';
-import { debounce } from '../utils';
+import { debounce } from '@eeacms/volto-eea-chatbot/ChatBlock/utils';
 
 function StarterMessage({ msg, onClick }) {
   if (!(msg.name || msg.message)) return null;

package/src/ChatBlock/components/FeedbackModal.jsx

@@ -1,7 +1,7 @@
 import React, { useState } from 'react';
 import { trackEvent } from '@eeacms/volto-matomo/utils';
 import { Modal, Button, TextArea, Form, Icon } from 'semantic-ui-react';
-import { createChatMessageFeedback } from '../utils';
+import { createChatMessageFeedback } from '@eeacms/volto-eea-chatbot/ChatBlock/utils';
 
 const FeedbackModal = ({
   modalOpen,

package/src/ChatBlock/components/HalloumiFeedback.jsx

@@ -6,8 +6,8 @@ import Spinner from './Spinner';
 import SVGIcon from './Icon';
 import { getSupportedBgColor } from './markdown/colors';
 
-import GlassesIcon from '../../icons/glasses.svg';
-import RotateIcon from '../../icons/rotate.svg';
+import GlassesIcon from '@eeacms/volto-eea-chatbot/icons/glasses.svg';
+import RotateIcon from '@eeacms/volto-eea-chatbot/icons/rotate.svg';
 
 const VERIFY_CLAIM_MESSAGES = [
   'Going through each claim and verify against the referenced documents...',

package/src/ChatBlock/components/Source.jsx

@@ -1,8 +1,8 @@
 import { Popup } from 'semantic-ui-react';
 import SVGIcon from './Icon';
 
-import FileIcon from '../../icons/file.svg';
-import GlobeIcon from '../../icons/globe.svg';
+import FileIcon from '@eeacms/volto-eea-chatbot/icons/file.svg';
+import GlobeIcon from '@eeacms/volto-eea-chatbot/icons/globe.svg';
 
 import { injectLazyLibs } from '@plone/volto/helpers/Loadable/Loadable';
 

package/src/ChatBlock/components/UserActionsToolbar.jsx

@@ -1,11 +1,11 @@
 import cx from 'classnames';
 import { Button } from 'semantic-ui-react';
-import { useCopyToClipboard } from '../utils';
+import { useCopyToClipboard } from '@eeacms/volto-eea-chatbot/ChatBlock/utils';
 import SVGIcon from './Icon';
 import ChatMessageFeedback from './ChatMessageFeedback';
 
-import CopyIcon from '../../icons/copy.svg';
-import CheckIcon from '../../icons/check.svg';
+import CopyIcon from '@eeacms/volto-eea-chatbot/icons/copy.svg';
+import CheckIcon from '@eeacms/volto-eea-chatbot/icons/check.svg';
 
 const UserActionsToolbar = ({
   className,

package/src/ChatBlock/components/WebResultIcon.tsx

@@ -1,7 +1,7 @@
 import { useState } from 'react';
 import SVGIcon from './Icon';
-import FileIcon from '../../icons/file.svg';
-import GlobeIcon from '../../icons/globe.svg';
+import FileIcon from '@eeacms/volto-eea-chatbot/icons/file.svg';
+import GlobeIcon from '@eeacms/volto-eea-chatbot/icons/globe.svg';
 
 interface WebResultIconProps {
   url: string;

package/src/ChatBlock/components/markdown/ClaimModal.jsx

@@ -1,11 +1,11 @@
 import { Modal, ModalContent, ModalHeader } from 'semantic-ui-react';
 import cx from 'classnames';
-import { convertToPercentage } from '../../utils';
-import SVGIcon from '../Icon';
+import { convertToPercentage } from '@eeacms/volto-eea-chatbot/ChatBlock/utils';
+import SVGIcon from '@eeacms/volto-eea-chatbot/ChatBlock/components/Icon';
 import { getSupportedBgColor } from './colors';
 import { ClaimSegments } from './ClaimSegments';
 
-import BotIcon from '../../../icons/bot.svg';
+import BotIcon from '@eeacms/volto-eea-chatbot/icons/bot.svg';
 
 const stripHtml = (html) => {
   const tmp = document.createElement('div');

package/src/ChatBlock/components/markdown/ClaimSegments.jsx

@@ -1,10 +1,10 @@
 import React from 'react';
 import { Tab, TabPane } from 'semantic-ui-react';
-import SVGIcon from '../Icon';
+import SVGIcon from '@eeacms/volto-eea-chatbot/ChatBlock/components/Icon';
 import { RenderClaimView } from './RenderClaimView';
-import LinkIcon from '../../../icons/external-link.svg';
-import FileIcon from '../../../icons/file.svg';
-import GlobeIcon from '../../../icons/globe.svg';
+import LinkIcon from '@eeacms/volto-eea-chatbot/icons/external-link.svg';
+import FileIcon from '@eeacms/volto-eea-chatbot/icons/file.svg';
+import GlobeIcon from '@eeacms/volto-eea-chatbot/icons/globe.svg';
 
 const VISIBLE_SEGMENTS = 50; // Number of citations to show by default
 

package/src/ChatBlock/components/markdown/{index.js → index.jsx}

@@ -1,7 +1,7 @@
 import React from 'react';
 import { ClaimModal } from './ClaimModal';
 import { Citation } from './Citation';
-import { transformEmailsToLinks } from '../../utils';
+import { transformEmailsToLinks } from '@eeacms/volto-eea-chatbot/ChatBlock/utils';
 
 export function components(message, markers, citedSources) {
   return {

package/src/ChatBlock/hooks/useChatController.ts

@@ -1,15 +1,19 @@
-import type { Message } from '../types/interfaces';
+import type { Message } from '@eeacms/volto-eea-chatbot/ChatBlock/types/interfaces';
 import { useState, useCallback, useRef, useEffect } from 'react';
 import { useChatStreaming } from './useChatStreaming';
-import { createChatSession, sendMessage } from '../services/streamingService';
-import { PacketType } from '../types/streamingModels';
-import { ResearchType } from '../types/interfaces';
+import {
+  createChatSession,
+  sendMessage,
+} from '@eeacms/volto-eea-chatbot/ChatBlock/services/streamingService';
+import { PacketType } from '@eeacms/volto-eea-chatbot/ChatBlock/types/streamingModels';
+import { ResearchType } from '@eeacms/volto-eea-chatbot/ChatBlock/types/interfaces';
 
 interface UseChatControllerProps {
   personaId: number;
   enableQgen?: boolean;
   qgenAsistantId?: number;
   deepResearch?: string;
+  onyxVersion?: '2' | '3';
 }
 
 interface RelatedQuestion {
@@ -18,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
@@ -33,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}`,
@@ -46,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 [];
@@ -74,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);
@@ -226,6 +275,7 @@ export function useChatController({
             regenerate: false,
             filters: null,
             selectedDocumentIds: [],
+            onyxVersion,
           },
           assistantNodeId,
           userNodeId,
@@ -247,6 +297,7 @@ export function useChatController({
   );
 
   const onFetchRelatedQuestions = useCallback(async () => {
+    console.log('[RQ] onFetchRelatedQuestions triggered');
     const latestAssistantMessage = messages
       .filter((m) => m.type === 'assistant')
       .pop();
@@ -256,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) =>
@@ -281,6 +333,7 @@ export function useChatController({
             userMessage.message,
             latestAssistantMessage.message,
             qgenAsistantId,
+            onyxVersion,
           );
         }
       } catch (error) {
@@ -296,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/useChatStreaming.ts

@@ -1,8 +1,8 @@
-import type { Message } from '../types/interfaces';
-import type { SendMessageParams } from '../services/streamingService';
+import type { Message } from '@eeacms/volto-eea-chatbot/ChatBlock/types/interfaces';
+import type { SendMessageParams } from '@eeacms/volto-eea-chatbot/ChatBlock/services/streamingService';
 import { useState, useCallback, useRef } from 'react';
-import { sendMessage } from '../services/streamingService';
-import { MessageProcessor } from '../services/messageProcessor';
+import { sendMessage } from '@eeacms/volto-eea-chatbot/ChatBlock/services/streamingService';
+import { MessageProcessor } from '@eeacms/volto-eea-chatbot/ChatBlock/services/messageProcessor';
 
 interface UseChatStreamingProps {
   onMessageUpdate?: (message: Message, processor: MessageProcessor) => void;

package/src/ChatBlock/hooks/useToolDisplayTiming.ts

@@ -1,4 +1,4 @@
-import type { Packet } from '../types/streamingModels';
+import type { Packet } from '@eeacms/volto-eea-chatbot/ChatBlock/types/streamingModels';
 import { useMemo, useState, useCallback, useEffect } from 'react';
 
 interface ToolState {
@@ -76,5 +76,6 @@ export function useToolDisplayTiming(
     visibleTools,
     handleToolComplete,
     allToolsDisplayed,
+    toolStates,
   };
 }