Uplift of #29263 (squashed) to beta

Author: brave-builds

components/ai_chat/resources/untrusted_conversation_frame/components/conversation_entries/index.test.tsx

@@ -0,0 +1,76 @@
+/* Copyright (c) 2025 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+import * as React from 'react'
+import * as Mojom from '../../../common/mojom'
+import { render } from '@testing-library/react'
+import '@testing-library/jest-dom'
+import { useUntrustedConversationContext }
+  from '../../untrusted_conversation_context'
+import ConversationEntries from '.'
+
+const assistantResponseMock = jest.fn(() => <div />)
+
+jest.mock('../assistant_response', () => ({
+  __esModule: true,
+  default: (props: any) => {
+    assistantResponseMock(props)
+    return <div />
+  }
+}))
+
+jest.mock('../../untrusted_conversation_context', () => ({
+  useUntrustedConversationContext: jest.fn()
+}))
+
+describe('ConversationEntries allowedLinks per response', () => {
+  beforeEach(() => {
+    assistantResponseMock.mockClear()
+
+    const turn1 = {
+      characterType: Mojom.CharacterType.ASSISTANT,
+      events: [
+        { completionEvent: { completion: 'Response 1' } },
+        {
+          sourcesEvent: {
+            sources: [{ url: { url: 'https://a.com' } }]
+          }
+        }
+      ]
+    }
+
+    const turn2 = {
+      characterType: Mojom.CharacterType.ASSISTANT,
+      events: [
+        { completionEvent: { completion: 'Response 2' } },
+        {
+          sourcesEvent: {
+            sources: [{ url: { url: 'https://b.com' } }]
+          }
+        }
+      ]
+    }
+
+    ;(useUntrustedConversationContext as jest.Mock).mockReturnValue({
+      conversationHistory: [turn1, turn2],
+      isGenerating: false,
+      isMobile: false,
+      isLeoModel: true,
+      allModels: [],
+      canSubmitUserEntries: true,
+      conversationHandler: null,
+      trimmedTokens: 0,
+      totalTokens: 100,
+      contentUsedPercentage: 100
+    })
+  })
+
+  it('passes correct allowedLinks to each AssistantResponse', () => {
+    render(<ConversationEntries />)
+    expect(assistantResponseMock).toHaveBeenCalledTimes(2)
+    expect(assistantResponseMock.mock.calls[0][0].allowedLinks).toEqual(['https://a.com'])
+    expect(assistantResponseMock.mock.calls[1][0].allowedLinks).toEqual(['https://b.com'])
+  })
+})

components/ai_chat/resources/untrusted_conversation_frame/components/conversation_entries/index.tsx

@@ -58,13 +58,6 @@ function ConversationEntries() {
     return event?.completionEvent?.completion ?? ''
   }
 
-  const allAllowedLinks: string[] = conversationContext.conversationHistory
-    .flatMap(turn =>
-    turn.events?.flatMap(event =>
-      event.sourcesEvent?.sources?.map(source => source.url.url) || []
-    ) || []
-  )
-
   return (
     <>
       <div>
@@ -85,6 +78,12 @@ function ConversationEntries() {
           const showEditIndicator = !showEditInput && !!turn.edits?.length
           const latestEdit = turn.edits?.at(-1)
           const latestTurn = latestEdit ?? turn
+          const allowedLinksForTurn: string[] =
+            latestTurn.events?.flatMap(event =>
+              event.sourcesEvent?.sources?.map(
+                source => source.url.url
+              ) || []
+            ) || []
           const latestTurnText = isAIAssistant
             ? getCompletion(latestTurn)
             : latestTurn.text
@@ -157,7 +156,7 @@ function ConversationEntries() {
                     <AssistantResponse
                       entry={latestTurn}
                       isEntryInProgress={isEntryInProgress}
-                      allowedLinks={allAllowedLinks}
+                      allowedLinks={allowedLinksForTurn}
                       isLeoModel={conversationContext.isLeoModel}
                     />
                   )}