@eeacms/volto-eea-chatbot 3.0.1 → 4.1.0

package/CHANGELOG.md

@@ -4,7 +4,59 @@ 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).
 
-### [3.0.1](https://github.com/eea/volto-eea-chatbot/compare/3.0.0...3.0.1) - 5 August 2026
+### [4.1.0](https://github.com/eea/volto-eea-chatbot/compare/4.0.0...4.1.0) - 31 August 2026
+
+#### :rocket: New Features
+
+- feat: expose message context + thread extra markdown into classic message [Tiberiu Ichim - [`b1600ce`](https://github.com/eea/volto-eea-chatbot/commit/b1600cede2221b846d36be42247f9068f22f06c4)]
+- feat: allow presentations to plug custom components into message rendering [Tiberiu Ichim - [`3f7d82b`](https://github.com/eea/volto-eea-chatbot/commit/3f7d82b9231fc2a8a92c72471068998988dadde5)]
+- feat: block presentation variations registry [Tiberiu Ichim - [`bc92ba7`](https://github.com/eea/volto-eea-chatbot/commit/bc92ba7a98b832cf34f644b8eb7294ae4542f04d)]
+- feat: add configurable batch size for fact-checking [Tiberiu Ichim - [`4e81cb9`](https://github.com/eea/volto-eea-chatbot/commit/4e81cb94075f8f31a70affed6f02ac8495863a57)]
+
+#### :bug: Bug Fixes
+
+- fix: stop hand-declaring the 'variation' schema field [Tiberiu Ichim - [`f0ada7e`](https://github.com/eea/volto-eea-chatbot/commit/f0ada7e7fb1843c562b0af44235f3a07b5253e7d)]
+- fix: skip citations with empty document_id in CITATION_DELTA [Tiberiu Ichim - [`81c9441`](https://github.com/eea/volto-eea-chatbot/commit/81c9441fa041b966f0e05b13fe271d44d9ee1421)]
+
+#### :house: Internal changes
+
+- chore: bump version to 4.1.0 (block presentation variations) [Tiberiu Ichim - [`45d7d3d`](https://github.com/eea/volto-eea-chatbot/commit/45d7d3db43158664c960d47585ffe749c490782c)]
+- chore: change default batchSize from 30 to 20 [Tiberiu Ichim - [`c5c5f4c`](https://github.com/eea/volto-eea-chatbot/commit/c5c5f4cb90fd74accd534ccd266f79592e38ec3a)]
+
+#### :house: Documentation changes
+
+- docs: document block presentation variations API [Tiberiu Ichim - [`8e98061`](https://github.com/eea/volto-eea-chatbot/commit/8e98061c3ce53eb701c78d3cb1eb783c8cb47234)]
+
+#### :hammer_and_wrench: Others
+
+- test: update citation delta test to match restored behavior [Tiberiu Ichim - [`de9f40e`](https://github.com/eea/volto-eea-chatbot/commit/de9f40e4dfd4a69f800aaf9f1b83fdf7e197b9ab)]
+- revert: restore original CITATION_DELTA handling in messageProcessor [Tiberiu Ichim - [`1d19fd3`](https://github.com/eea/volto-eea-chatbot/commit/1d19fd382bda782d7165d34d7edba4310ea65a25)]
+## [4.0.0](https://github.com/eea/volto-eea-chatbot/compare/3.0.1...4.0.0) - 13 August 2026
+
+#### :bug: Bug Fixes
+
+- fix: correct 100.00% → High in ClaimModal snapshot [Tiberiu Ichim - [`2f3e620`](https://github.com/eea/volto-eea-chatbot/commit/2f3e620627faae3b050f0cb6ba1e3db4015dc5db)]
+- fix: avoid Betterleaks false positive on LLM_API_KEY example [Tiberiu Ichim - [`44e05bc`](https://github.com/eea/volto-eea-chatbot/commit/44e05bc74a042e7f08cc0e6878930f9acc1964b9)]
+- fix: filter skipped claims in span processor to prevent text duplication [Tiberiu Ichim - [`9477a42`](https://github.com/eea/volto-eea-chatbot/commit/9477a42d363d6961f4def628ed567a2409b316ea)]
+
+#### :house: Internal changes
+
+- chore: bump version to 4.0.0 (breaking change) [Tiberiu Ichim - [`e1038b6`](https://github.com/eea/volto-eea-chatbot/commit/e1038b6db64612f7c772a898b99ff802b3c133e9)]
+- style: Automated code fix [eea-jenkins - [`03891e2`](https://github.com/eea/volto-eea-chatbot/commit/03891e24e48ccd0eccb55d4ed42aabbcdf34251f)]
+
+#### :house: Documentation changes
+
+- docs: document rag-facts-check backend dependency for quality checks [Tiberiu Ichim - [`123c7ea`](https://github.com/eea/volto-eea-chatbot/commit/123c7ea5d56ee48e6d5c787049a010b6bebd5aef)]
+- docs: update README for rag-fact-checker integration [Tiberiu Ichim - [`4ae32b4`](https://github.com/eea/volto-eea-chatbot/commit/4ae32b41e838176d4a3ba1ea55367fc21e1a8cae)]
+
+#### :hammer_and_wrench: Others
+
+- test: update ClaimModal snapshots for categorical score labels [Tiberiu Ichim - [`3794be1`](https://github.com/eea/volto-eea-chatbot/commit/3794be1fc112b9f209a58c6577f99649350b1d59)]
+- Deduplicate sources by text before sending to fact-checker [Tiberiu Ichim - [`67dc793`](https://github.com/eea/volto-eea-chatbot/commit/67dc793f955058d9ba5dbc92ea23a652e4586172)]
+- Fix: use doc.content from final_documents when tool packets lack content [Tiberiu Ichim - [`4174212`](https://github.com/eea/volto-eea-chatbot/commit/4174212a90742c139ad2399f7a07feb99d619fbc)]
+- Replace numeric claim scores with categorical labels [Tiberiu Ichim - [`d0aaf77`](https://github.com/eea/volto-eea-chatbot/commit/d0aaf779a69340386af81e9af4aa5147d93be388)]
+- Send structured sources with document titles to fact-checker [Tiberiu Ichim - [`190c79b`](https://github.com/eea/volto-eea-chatbot/commit/190c79b2a888a7d655157e683633fd9901b8871c)]
+### [3.0.1](https://github.com/eea/volto-eea-chatbot/compare/3.0.0...3.0.1) - 7 August 2026
 
 #### :bug: Bug Fixes
 
@@ -35,7 +87,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 #### :house: Internal changes
 
 - chore: bump version to 3.0.0 (EEA design system dependency) [skip ci] [Tiberiu Ichim - [`bc5a8c1`](https://github.com/eea/volto-eea-chatbot/commit/bc5a8c1f72d4e706b096cb96d0d24c2c3f5ac0f8)]
-- chore: [JENKINSFILE] sanitize sonarqube command Refs #305084 [valentinab25 - [`83bf08b`](https://github.com/eea/volto-eea-chatbot/commit/83bf08b7188548a50801b8e464a4d113f0cbbac4)]
 
 #### :house: Documentation changes
 
@@ -113,7 +164,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 #### :house: Internal changes
 
 - style: Automated code fix [eea-jenkins - [`8a8c3c4`](https://github.com/eea/volto-eea-chatbot/commit/8a8c3c4172a4f669661378cf1b5a3569d85609e6)]
-- chore: [JENKINSFILE] add package version in sonarqube [valentinab25 - [`535d986`](https://github.com/eea/volto-eea-chatbot/commit/535d986b7adc77743a668bc4ac63f835eef58df3)]
 
 #### :hammer_and_wrench: Others
 
@@ -124,7 +174,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 #### :house: Internal changes
 
 - style: Automated code fix [eea-jenkins - [`fdcd884`](https://github.com/eea/volto-eea-chatbot/commit/fdcd8848fd4c3f990ca5ea021f407487aebd6010)]
-- chore: [JENKINSFILE] use sonarqube branches [EEA Jenkins - [`3d428d7`](https://github.com/eea/volto-eea-chatbot/commit/3d428d72f32c3d05452b0961c76f5db1c416e05c)]
 
 #### :hammer_and_wrench: Others
 

package/README.md

@@ -40,7 +40,7 @@ The **Volto Chatbot** block allows the integration of an AI-powered chatbot into
 | `enableShowTotalFailMessage` | Show total failure message.                                                     | Boolean  | `false`                          |
 | `showAssistantTitle`         | Display or hide the assistant's title in the chat interface.                    | Boolean  | `true`                           |
 | `showAssistantDescription`   | Display or hide the assistant's description in the chat interface.              | Boolean  | `true`                           |
-| `qualityCheck`               | Show Halloumi-based automated quality check.                                    | Dropdown | `Disabled`                       |
+| `qualityCheck`               | Show automated fact-checking of AI answers against source documents.            | Dropdown | `Disabled`                       |
 | `onDemandInputToggle`        | Sets the default state of the fact-check AI toggle.                             | Boolean  | `true`                           |
 | `showTools`                  | Show or hide tools in the chat interface.                                       | Array    | `["internal_search_tool_start"]` |
 | `scrollToInput`              | Automatically scroll the page to focus on the chat input when interacting.      | Boolean  | `false`                          |
@@ -116,6 +116,116 @@ Go to http://localhost:3000
 
    For a legacy Volto 17 project, install the package with `yarn` and restart the frontend as usual.
 
+## Block presentation variations
+
+Since 4.1.0 the chatbot block's presentation is pluggable. The block ships with the default `classic` presentation (the standard chat window), and other add-ons can register additional presentations ("variations") — e.g. to re-style the chat, replace the sources UI, or render custom elements inline in the assistant's answer. When two or more variations are registered, Volto core automatically adds a **Presentation** choice field to the block's edit sidebar, so editors can pick the variation per block. Old block content without a `variation` value keeps resolving to the default.
+
+### Registering a variation
+
+Push your variation onto `blocksConfig.eeaChatbot.variations` from your add-on's `applyConfig` (same cross-add-on pattern as `volto-tabs-block`):
+
+```js
+export default function applyConfig(config) {
+  const block = config.blocks.blocksConfig.eeaChatbot;
+  if (block) {
+    block.variations = block.variations || [];
+    if (!block.variations.find((v) => v.id === 'catalogue')) {
+      block.variations.push({
+        id: 'catalogue',
+        title: 'Catalogue',
+        isDefault: false,
+        view: CatalogueChatView,
+      });
+    }
+  }
+  return config;
+}
+```
+
+A variation is `{ id, title, isDefault, view }` (optionally `edit` / `schemaEnhancer`); `view` is the React component rendered for the block.
+
+### Variation view contract
+
+The variation `view` receives the block's fields as **top-level props** (there is no `data` prop), plus presentation props:
+
+```
+<View
+  persona={assistantData}   // the selected assistant
+  block_id                  // the block's internal id
+  isEditMode
+  isPlaywrightTest          // ?playwright=yes query flag
+  initialQuery              // ?query=… pre-filled question
+  initialDeepResearch       // ?deepResearch=… flag
+  {...blockFields}          // assistant, onyxVersion, height, …
+/>
+```
+
+If the registry is empty the block falls back to the classic `ChatWindow`, so registering a variation can never break the block.
+
+### Reusing the classic chat window
+
+A variation does not have to build a presentation from scratch — it can wrap the classic `ChatWindow` and only change what it needs to:
+
+```jsx
+import { ChatWindow } from '@eeacms/volto-eea-chatbot/ChatBlock/chat';
+
+export default function CatalogueChatView(props) {
+  return (
+    <ChatWindow
+      {...props}
+      hideSourcesTab
+      extraRemarkPlugins={[myRemarkPlugin]}
+      extraMarkdownComponents={{ myElement: MyElementComponent }}
+    />
+  );
+}
+```
+
+- `hideSourcesTab` — suppresses the classic Sources tab, sidebar and inline citation list only (the answer text and the quality-check logic are unaffected).
+- `extraRemarkPlugins` / `extraRehypePlugins` / `extraMarkdownComponents` — additional remark/rehype plugins and react-markdown component overrides, merged with the built-ins (the same mechanism the quality markers use). This lets a variation render custom inline elements inside the streamed answer.
+
+Custom markdown components can read the message that owns them through `ChatMessageContext` (also exported from `@eeacms/volto-eea-chatbot/ChatBlock/chat`): `ChatMessage` wraps every message in the context provider, so a component rendered from the answer text can e.g. match a marker against `message.documents`.
+
+> **Note:** the variations registry, `hideSourcesTab`, the extra-markdown pass-through props and `ChatMessageContext` are new in 4.1.0. If your project resolves an older published version, these seams don't exist — import the module namespace (e.g. `import * as chat from '…/ChatBlock/chat'`) and guard against `undefined` instead of using named imports.
+
+## Quality Checks (Fact-Checking)
+
+When `qualityCheck` is enabled, the chatbot sends AI answers and their source
+documents to a fact-checking backend that extracts claims, verifies each
+against the sources, and returns per-claim verdicts with evidence.
+
+### Backend dependency
+
+The fact-checking feature requires the
+[eea/rag-facts-check](https://github.com/eea/rag-facts-check) service running
+and reachable at the URL configured in `RAG_FACT_CHECKER_URL`.
+
+**Without this backend, quality checks will fail with a connection error.**
+
+The backend exposes a halloumi-compatible endpoint (`POST /halloumi/generate`)
+so the frontend can call it without code changes. It also provides a native
+`POST /check` endpoint with a richer response schema.
+
+### Deploying the backend
+
+```bash
+# Clone and build
+ git clone https://github.com/eea/rag-facts-check.git
+cd rag-facts-check
+docker build -t rag-fact-check .
+
+# Run (requires an LLM endpoint)
+# Set LLM_API_KEY to your actual API key before running
+docker run -p 8000:8000 \
+  -e LLM_API_BASE=http://your-llm:4002/v1 \
+  -e LLM_API_KEY \
+  -e LLM_MODEL=gemma \
+  rag-fact-check
+```
+
+See the [backend README](https://github.com/eea/rag-facts-check#rag-facts-check)
+for full configuration options.
+
 ## Environment Configuration
 
 To properly configure the middleware and authenticate with the Onyx service, ensure that the following environment variables are set:
@@ -131,20 +241,13 @@ This document lists the environment variables used in the Volto Chatbot project.
 - `JEST_USE_SETUP`
   Used in Jest configuration. When set to 'ON', it enables a specific Jest setup.
 
-- `LLMGW_URL`
-  The URL for the LLM Gateway service.
-
-- `LLMGW_TOKEN`
-  The token for authenticating with the LLM Gateway service.
+- `RAG_FACT_CHECKER_URL`
+  The base URL for the [rag-facts-check](https://github.com/eea/rag-facts-check)
+  fact-checking backend. Required when `qualityCheck` is enabled.
+  Default: `http://localhost:8000`.
 
 ### Development-specific environment variables
 
-- `MOCK_HALLOUMI_FILE_PATH`
-  When set, this specifies the absolute path to the JSON file containing the mocked Halloumi response. Setting this variable enables mocking of Halloumi API calls.
-
-- `DUMP_HALLOUMI_FILE_PATH`
-  When set, the Halloumi response will be dumped to the specified absolute file path for debugging or to create new mock files.
-
 - `MOCK_LLM_FILE_PATH`
   When set, this specifies the absolute path to the JSONL file containing the mocked Onyx stream response. Setting this variable enables mocking of Onyx LLM calls.
 

package/package.json

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

package/src/ChatBlock/ChatBlockView.jsx

@@ -3,6 +3,7 @@ import superagent from 'superagent';
 import { parse } from 'qs';
 import withOnyxData from './hocs/withOnyxData';
 import { ChatWindow } from './chat';
+import { getChatVariation } from './variations';
 
 function ChatBlockView(props) {
   const { id, assistantData, data, isEditMode, location } = props;
@@ -25,8 +26,13 @@ function ChatBlockView(props) {
     }
   }, [id, isPlaywrightTest, data]);
 
+  // Resolve the presentation variation for this block. Falls back to the
+  // classic ChatWindow so the block keeps working even if the registry is
+  // somehow empty.
+  const Presentation = getChatVariation(data)?.view || ChatWindow;
+
   return assistantData ? (
-    <ChatWindow
+    <Presentation
       persona={assistantData}
       isEditMode={isEditMode}
       isPlaywrightTest={isPlaywrightTest}

package/src/ChatBlock/chat/AIMessage.tsx

@@ -81,31 +81,21 @@ function addQualityMarkersPlugin() {
   };
 }
 
-export function addHalloumiContext(doc: any, text: string) {
-  // TODO: CLEAN UP
-  // const updatedDate = doc.updated_at
-  //   ? new Date(doc.updated_at).toLocaleString('en-GB', {
-  //       year: 'numeric',
-  //       month: 'long',
-  //       day: '2-digit',
-  //       hour: '2-digit',
-  //       minute: '2-digit',
-  //     })
-  //   : '';
-
-  // const docIndex = doc.index ? `DOCUMENT ${doc.index}: ` : '';
-  // const sources: any = { web: 'Website', file: 'File' };
-
-  // const sourceType = doc.source_type
-  //   ? sources[doc.source_type] || capitalize(doc.source_type)
-  //   : '';
-
-  // const header = `${docIndex}${doc.semantic_identifier}${
-  //   sourceType ? `\nSource: ${sourceType}` : ''
-  // }${updatedDate ? `\nUpdated: ${updatedDate}` : ''}`;
-
-  // return `${header}\n${text}`;
-  return text.replace(/\u00A0/g, ' ');
+/**
+ * Build a structured source object for the fact-checker backend.
+ *
+ * The backend accepts {text, title, source_type} dicts so it can
+ * include document titles in LLM prompts without polluting the raw
+ * text (which would break span-offset matching).
+ */
+export function buildHalloumiSource(doc: any, text: string) {
+  const cleanedText = text.replace(/\u00A0/g, ' ');
+  return {
+    text: cleanedText,
+    title: doc.semantic_identifier || null,
+    source_type: doc.source_type || null,
+    link: doc.link || null,
+  };
 }
 
 function mapToolDocumentsToText(message: any) {
@@ -135,24 +125,36 @@ function getContextSources(
   const documentIdToText = mapToolDocumentsToText(message);
 
   return qualityCheckContext === 'citations'
-    ? sources.map((doc: any) => ({
-        ...doc,
-        id: doc.document_id,
-        text: documentIdToText[doc.document_id] || '',
-        halloumiContext: addHalloumiContext(
-          doc,
-          documentIdToText[doc.document_id] || '',
-        ),
-      }))
+    ? sources.map((doc: any) => {
+        // Prefer content from tool packets (may have enriched text),
+        // but fall back to doc.content from final_documents.
+        // Without this fallback, sources sent to the fact-checker are
+        // empty strings when tool packets don't carry full content.
+        const text = documentIdToText[doc.document_id] || doc.content || '';
+        const cleanedText = text.replace(/\u00A0/g, ' ');
+        return {
+          ...doc,
+          id: doc.document_id,
+          text,
+          // Keep for ClaimSegments span highlighting (plain text)
+          halloumiContext: cleanedText,
+          // Structured source for the fact-checker backend
+          halloumiSource: buildHalloumiSource(doc, text),
+        };
+      })
     : (message.toolCalls || []).reduce(
         (acc: any, cur: any) => [
           ...acc,
-          ...(cur.tool_result || []).map((doc: any) => ({
-            ...doc,
-            id: doc.document_id,
-            text: doc.content,
-            halloumiContext: addHalloumiContext(doc, doc.content),
-          })),
+          ...(cur.tool_result || []).map((doc: any) => {
+            const cleanedText = (doc.content || '').replace(/\u00A0/g, ' ');
+            return {
+              ...doc,
+              id: doc.document_id,
+              text: doc.content,
+              halloumiContext: cleanedText,
+              halloumiSource: buildHalloumiSource(doc, doc.content || ''),
+            };
+          }),
         ], // TODO: make sure we don't add multiple times the same doc
         // TODO: this doesn't have the index for source
         [],
@@ -203,10 +205,15 @@ export function AIMessage({
   enableMatomoTracking,
   persona,
   maxContextSegments,
+  batchSize,
   isLastMessage,
   className = '',
   chatWindowEndRef,
   showTools,
+  hideSourcesTab,
+  extraRemarkPlugins,
+  extraMarkdownComponents,
+  extraRehypePlugins,
 }: ChatMessageProps) {
   const [allToolsDisplayed, setAllToolsDisplayed] = useState(false);
   const [messageDisplayed, setMessageDisplayed] = useState(false);
@@ -275,13 +282,36 @@ export function AIMessage({
 
   const showSources = messageDisplayed && sources.length > 0;
 
+  // Whether to actually render the classic Sources UI (tab, sidebar, inline
+  // list). `hideSourcesTab` lets a variation present the cited documents a
+  // different way (e.g. inline catalogue cards) while keeping quality-check
+  // logic intact.
+  const showSourcesTab = showSources && !hideSourcesTab;
+
   const contextSources = getContextSources(
     message,
     sources,
     qualityCheckContext,
   );
 
-  const stableContextSources = useDeepCompareMemoize(contextSources);
+  // Deduplicate sources by text content. The streaming backend often sends
+  // the same document in multiple packets (MESSAGE_START, SEARCH_TOOL_DELTA,
+  // etc.), resulting in 40+ copies of the same text. Dedup keeps the first
+  // occurrence, preserving order. Critical: texts must remain identical
+  // between frontend (span highlighting) and backend (evidence spans).
+  const dedupedSources = useMemo(() => {
+    const seen = new Set<string>();
+    return contextSources.filter((src: any) => {
+      const key = src.halloumiContext || src.halloumiSource?.text || '';
+      if (key && !seen.has(key)) {
+        seen.add(key);
+        return true;
+      }
+      return false;
+    });
+  }, [contextSources]);
+
+  const stableContextSources = useDeepCompareMemoize(dedupedSources);
 
   const doQualityControl =
     messageDisplayed &&
@@ -300,6 +330,7 @@ export function AIMessage({
     addCitations(message.message, message),
     stableContextSources,
     maxContextSegments,
+    batchSize,
   );
 
   const claims = markers?.claims || [];
@@ -365,7 +396,7 @@ export function AIMessage({
   const answerTab = (
     <div className="answer-tab">
       {/* Show first 3 sources inline */}
-      {showSources && (
+      {showSourcesTab && (
         <div className="sources">
           {sources.slice(0, 3).map((source: any, i: number) => (
             <SourceDetails source={source} key={i} index={source.index} />
@@ -429,6 +460,9 @@ export function AIMessage({
                 markers={markers}
                 stableContextSources={stableContextSources}
                 addQualityMarkersPlugin={addQualityMarkersPlugin}
+                extraRemarkPlugins={extraRemarkPlugins}
+                extraMarkdownComponents={extraMarkdownComponents}
+                extraRehypePlugins={extraRehypePlugins}
               >
                 {({ content }) => (
                   <div className="message-text-wrapper">{content}</div>
@@ -505,7 +539,7 @@ export function AIMessage({
       menuItem: { key: 'answer', content: 'Answer', className: 'answer-tab' },
       pane: <Tab.Pane key="answer">{answerTab}</Tab.Pane>,
     },
-    ...(showSources && !error
+    ...(showSourcesTab && !error
       ? [
           {
             menuItem: {
@@ -554,14 +588,14 @@ export function AIMessage({
               secondary: true,
               pointing: true,
               fluid: true,
-              className: cx({ 'without-sources': !showSources }),
+              className: cx({ 'without-sources': !showSourcesTab }),
             }}
             panes={panes}
             renderActiveOnly={false}
           />
 
           {/* Sources sidebar */}
-          {showSources && !error && (
+          {showSourcesTab && !error && (
             <Sidebar
               visible={showSourcesSidebar}
               animation="overlay"

package/src/ChatBlock/chat/ChatMessage.tsx

@@ -1,12 +1,15 @@
 import { Message as SemanticMessage } from 'semantic-ui-react';
 import type { ChatMessageProps } from '@eeacms/volto-eea-chatbot/ChatBlock/types/interfaces';
 import { UserMessage, AIMessage } from '.';
+import { ChatMessageContext } from './MessageContext';
 
 export function ChatMessage(props: ChatMessageProps) {
   const { message, libs, className = '' } = props;
 
+  let content: React.ReactNode = null;
+
   if (message.type === 'user') {
-    return (
+    content = (
       <UserMessage
         message={message}
         libs={libs}
@@ -14,14 +17,10 @@ export function ChatMessage(props: ChatMessageProps) {
         isLoading={props.isLoading}
       />
     );
-  }
-
-  if (message.type === 'assistant') {
-    return <AIMessage {...props} />;
-  }
-
-  if (message.type === 'error') {
-    return (
+  } else if (message.type === 'assistant') {
+    content = <AIMessage {...props} />;
+  } else if (message.type === 'error') {
+    content = (
       <div className="message-error">
         <SemanticMessage color="red" className="error-message">
           <div className="error-title">Error</div>
@@ -31,5 +30,13 @@ export function ChatMessage(props: ChatMessageProps) {
     );
   }
 
-  return null;
+  if (content === null) return null;
+
+  // Expose the owning message to deeply-nested descendants (e.g. custom
+  // markdown components injected by addons via `extraMarkdownComponents`).
+  return (
+    <ChatMessageContext.Provider value={message}>
+      {content}
+    </ChatMessageContext.Provider>
+  );
 }

package/src/ChatBlock/chat/ChatWindow.tsx

@@ -49,6 +49,7 @@ interface ChatWindowProps {
   enableMatomoTracking?: boolean;
   onDemandInputToggle?: boolean;
   maxContextSegments?: number;
+  batchSize?: number;
   onyxVersion?: '2' | '3';
   isPlaywrightTest?: boolean;
   initialQuery?: string | null;
@@ -89,7 +90,12 @@ function ChatWindow({
     enableMatomoTracking = true,
     onDemandInputToggle = true,
     maxContextSegments = 0,
+    batchSize,
     onyxVersion = '2',
+    hideSourcesTab,
+    extraRemarkPlugins,
+    extraMarkdownComponents,
+    extraRehypePlugins,
   } = data;
   const [qualityCheckEnabled, setQualityCheckEnabled] = useState(
     onDemandInputToggle ?? true,
@@ -231,6 +237,7 @@ function ChatWindow({
                     enableMatomoTracking={enableMatomoTracking}
                     persona={persona.id}
                     maxContextSegments={maxContextSegments}
+                    batchSize={batchSize}
                     isLastMessage={index === messages.length - 1}
                     className={
                       index === messages.length - 1 ? 'most-recent' : ''
@@ -238,6 +245,10 @@ function ChatWindow({
                     chatWindowRef={chatWindowRef}
                     chatWindowEndRef={chatWindowEndRef}
                     showTools={showTools}
+                    hideSourcesTab={hideSourcesTab}
+                    extraRemarkPlugins={extraRemarkPlugins}
+                    extraMarkdownComponents={extraMarkdownComponents}
+                    extraRehypePlugins={extraRehypePlugins}
                   />
                 </React.Fragment>
               ))}

package/src/ChatBlock/chat/MessageContext.ts

@@ -0,0 +1,12 @@
+import { createContext } from 'react';
+import type { Message } from '@eeacms/volto-eea-chatbot/ChatBlock/types/interfaces';
+
+/**
+ * Provides the currently-rendered chat message to deeply-nested descendants
+ * (e.g. custom react-markdown components injected by an addon).
+ *
+ * Set by `ChatMessage`, so any component rendered inside a given message
+ * (including custom markdown elements) can read the message that owns it —
+ * e.g. to match a `![[doc: Title]]` marker against `message.documents`.
+ */
+export const ChatMessageContext = createContext<Message | null>(null);

package/src/ChatBlock/chat/index.ts

@@ -1,4 +1,5 @@
 export { default as ChatWindow } from './ChatWindow';
 export { ChatMessage } from './ChatMessage';
+export { ChatMessageContext } from './MessageContext';
 export { AIMessage } from './AIMessage';
 export { UserMessage } from './UserMessage';

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

@@ -1,6 +1,6 @@
 import { Modal, ModalContent, ModalHeader } from 'semantic-ui-react';
 import cx from 'classnames';
-import { convertToPercentage } from '@eeacms/volto-eea-chatbot/ChatBlock/utils';
+import { scoreToLabel } 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';
@@ -70,9 +70,9 @@ export function ClaimModal({ claim, markers, text, citedSources }) {
           <div className="score-badge-section">
             <div className="score-badge">
               <span className="score-percentage">
-                {convertToPercentage(claim.score)}
+                {scoreToLabel(claim.score)}
               </span>
-              <span className="score-label">Citation Support</span>
+              <span className="score-label">Verification</span>
             </div>
             <div className="score-progress-bar">
               <div

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

@@ -43,6 +43,7 @@ export function components(message, markers, citedSources) {
         const end = child.position.end.offset;
         const claims = markers.claims?.filter(
           (claim) =>
+            !claim.skipped &&
             claim.score !== null &&
             ((start >= claim.startOffset && end <= claim.endOffset) ||
               (start <= claim.endOffset && end >= claim.endOffset) ||