+ const assistantBody = (hasAssistantProse || showStreamingCursor || isTextRenderingPending || assistantArtifacts.length > 0) ? (
+
{showStreamingCursor ? (
) : (
diff --git a/ui/src/components/chat-v2/useChatHistorySearch.render.test.tsx b/ui/src/components/chat-v2/useChatHistorySearch.render.test.tsx
new file mode 100644
index 000000000..db508032d
--- /dev/null
+++ b/ui/src/components/chat-v2/useChatHistorySearch.render.test.tsx
@@ -0,0 +1,64 @@
+// @vitest-environment jsdom
+import { useRef } from 'react';
+import { act, cleanup, fireEvent, render } from '@testing-library/react';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import { useChatHistorySearch } from './useChatHistorySearch';
+import type { SearchableChatMessageInput } from './chatHistorySearchUtils';
+
+vi.mock('../../contexts/FindShortcutContext', () => ({ useRegisterFindShortcutTarget: () => {} }));
+const messages: SearchableChatMessageInput[] = [{
+ messageKey: 'target', message: { id: 'target', type: 'assistant', timestamp: '2026-09-05T00:00:00Z', content: '[Guide](https://example.com/unique-reference)', isStreaming: false },
+}];
+const heights = [100];
+const loadAllMessages = () => {};
+let frames: Map
;
+let frameId: number;
+let search: ReturnType;
+function Harness({ pending }: { pending: boolean }) {
+ const ref = useRef(null);
+ search = useChatHistorySearch({
+ scrollContainerRef: ref, keyedMessages: messages, measuredItemHeights: heights,
+ allMessagesLoaded: true, hasMoreMessages: false, loadAllMessages, sessionId: 'session',
+ });
+ return ;
+}
+async function flushFrame() {
+ await act(async () => {});
+ await act(async () => {
+ const callbacks = [...frames.values()];
+ frames.clear();
+ callbacks.forEach((callback) => callback(performance.now()));
+ });
+}
+beforeEach(() => {
+ frames = new Map(); frameId = 0;
+ vi.stubGlobal('requestAnimationFrame', (callback: FrameRequestCallback) => { frames.set(++frameId, callback); return frameId; });
+ vi.stubGlobal('cancelAnimationFrame', (id: number) => frames.delete(id));
+});
+afterEach(() => { cleanup(); vi.unstubAllGlobals(); });
+
+describe('search fallback rendering readiness', () => {
+ it.each([false, true])('reacts to completion with no text-node change (cancelled: %s)', async (cancelled) => {
+ const { getByTestId, rerender } = render();
+ const viewport = getByTestId('viewport');
+ const scrollTo = vi.fn();
+ viewport.scrollTo = scrollTo;
+ act(() => { search.openSearch(); search.setQuery('unique-reference'); });
+ await flushFrame();
+ // Backend completion alone is insufficient while displayed text is pending.
+ expect(scrollTo).not.toHaveBeenCalled();
+ if (cancelled) fireEvent.wheel(viewport, { deltaY: -30 });
+ rerender();
+ await flushFrame();
+ expect(viewport.querySelector('mark')).toBeNull();
+ expect(scrollTo).toHaveBeenCalledTimes(cancelled ? 0 : 1);
+ // Later DOM updates must not restart successful or cancelled navigation.
+ act(() => { viewport.querySelector('a')!.textContent = 'Updated guide label'; });
+ await flushFrame();
+ expect(scrollTo).toHaveBeenCalledTimes(cancelled ? 0 : 1);
+ });
+});
diff --git a/ui/src/components/chat-v2/useChatHistorySearch.ts b/ui/src/components/chat-v2/useChatHistorySearch.ts
index 68dc639ca..baefd2a81 100644
--- a/ui/src/components/chat-v2/useChatHistorySearch.ts
+++ b/ui/src/components/chat-v2/useChatHistorySearch.ts
@@ -161,15 +161,18 @@ export function useChatHistorySearch({
void revealMatch(activeMatch);
}, [activeMatch, isOpen, query, revealMatch, scrollContainerRef, sessionId]);
- // The search index sees complete text before the typewriter exposes it. Watch
- // the rendered content until the actual mark exists; mounting its row alone
- // does not complete navigation. Disconnect while marking our own DOM changes.
+ // The search index sees complete text before the typewriter exposes it. Wait
+ // for a mark or for the row to finish rendering: cross-node phrases and hidden
+ // link URLs may never produce a mark. Disconnect while marking our DOM changes.
useEffect(() => {
const container = scrollContainerRef.current;
if (!container || !isOpen || !query.trim()) return;
let frame: number | null = null;
const observer = new MutationObserver(() => schedule());
- const observe = () => observer.observe(container, { childList: true, characterData: true, subtree: true });
+ const observe = () => observer.observe(container, {
+ childList: true, characterData: true, subtree: true,
+ attributes: true, attributeFilter: ['data-chat-search-render-pending'],
+ });
const refresh = () => {
frame = null;
observer.disconnect();
@@ -177,7 +180,9 @@ export function useChatHistorySearch({
observe();
const pending = pendingRevealRef.current;
if (!pending?.ready || pending.navigation !== navigationRef.current) return;
- if (target?.matches('mark[aria-current="true"]')) {
+ const canReveal = target && (target.matches('mark[aria-current="true"]')
+ || !target.querySelector('[data-chat-search-render-pending="true"]'));
+ if (canReveal) {
scrollSearchTargetIntoView(container, target, pending.coarseJumped ? 'auto' : 'smooth');
onNavigate?.();
pendingRevealRef.current = null;