@theia/ai-chat-ui 1.76.0-next.7 → 1.76.0

package/lib/common/toolcall-utils.spec.js

@@ -87,15 +87,103 @@ describe('extractJsonStringField', () => {
             const result = (0, toolcall_utils_1.extractJsonStringField)('{"pat', 'path');
             (0, chai_1.expect)(result).to.be.undefined;
         });
-        it('should handle escaped quotes - regex stops at first unescaped quote', () => {
+        it('should handle escaped quotes in complete JSON', () => {
             // With complete JSON, JSON.parse handles escapes correctly
             const result = (0, toolcall_utils_1.extractJsonStringField)('{"cmd": "echo \\"hello\\""}', 'cmd');
             (0, chai_1.expect)(result).to.equal('echo "hello"');
         });
-        it('should handle escaped quotes in partial JSON - regex captures up to first quote', () => {
-            // With incomplete JSON, regex stops at the first unescaped quote character
+        it('should unescape escaped quotes in partial JSON', () => {
             const result = (0, toolcall_utils_1.extractJsonStringField)('{"cmd": "echo \\"hello', 'cmd');
-            (0, chai_1.expect)(result).to.equal('echo \\');
+            (0, chai_1.expect)(result).to.equal('echo "hello');
+        });
+    });
+    describe('parse/scan boundary', () => {
+        it('should unescape via JSON.parse when complete JSON has trailing whitespace', () => {
+            const result = (0, toolcall_utils_1.extractJsonStringField)('{"cmd": "echo \\"hello\\""}\n', 'cmd');
+            (0, chai_1.expect)(result).to.equal('echo "hello"');
+        });
+        it('should extract by scanning when JSON ends with a brace but is still incomplete', () => {
+            const result = (0, toolcall_utils_1.extractJsonStringField)('{"path": "src/index.ts", "meta": {"x": "y"}', 'path');
+            (0, chai_1.expect)(result).to.equal('src/index.ts');
+        });
+        it('should return undefined for a complete array without the field', () => {
+            const result = (0, toolcall_utils_1.extractJsonStringField)('[{"path": "src/index.ts"}]', 'other');
+            (0, chai_1.expect)(result).to.be.undefined;
+        });
+        it('should return undefined for an incomplete array, which has no top-level field', () => {
+            const result = (0, toolcall_utils_1.extractJsonStringField)('[{"path": "src/index.ts"', 'path');
+            (0, chai_1.expect)(result).to.be.undefined;
+        });
+    });
+    describe('top-level fields only (streaming)', () => {
+        it('should ignore a matching key inside a nested object', () => {
+            const result = (0, toolcall_utils_1.extractJsonStringField)('{"meta": {"path": "inner.ts"}, "path": "outer.ts', 'path');
+            (0, chai_1.expect)(result).to.equal('outer.ts');
+        });
+        it('should ignore a matching key inside a nested array of objects', () => {
+            const result = (0, toolcall_utils_1.extractJsonStringField)('{"edits": [{"path": "inner.ts"}], "path": "outer.ts', 'path');
+            (0, chai_1.expect)(result).to.equal('outer.ts');
+        });
+        it('should ignore a matching key inside a string value', () => {
+            const result = (0, toolcall_utils_1.extractJsonStringField)('{"content": "{\\"path\\": \\"inner.ts\\"}", "path": "outer.ts', 'path');
+            (0, chai_1.expect)(result).to.equal('outer.ts');
+        });
+        it('should return undefined when the field only occurs nested', () => {
+            const result = (0, toolcall_utils_1.extractJsonStringField)('{"meta": {"path": "inner.ts"}, "content": "abc', 'path');
+            (0, chai_1.expect)(result).to.be.undefined;
+        });
+        it('should return undefined while a nested object is still streaming', () => {
+            const result = (0, toolcall_utils_1.extractJsonStringField)('{"meta": {"path": "inner.ts', 'path');
+            (0, chai_1.expect)(result).to.be.undefined;
+        });
+        it('should return undefined when the top-level field is not a string', () => {
+            const result = (0, toolcall_utils_1.extractJsonStringField)('{"path": 42, "content": "abc', 'path');
+            (0, chai_1.expect)(result).to.be.undefined;
+        });
+        it('should extract a field that follows a non-string top-level value', () => {
+            const result = (0, toolcall_utils_1.extractJsonStringField)('{"line": 42, "path": "src/index.ts', 'path');
+            (0, chai_1.expect)(result).to.equal('src/index.ts');
+        });
+        it('should extract a field that follows a nested object', () => {
+            const result = (0, toolcall_utils_1.extractJsonStringField)('{"meta": {"a": {"b": "c"}}, "path": "src/index.ts', 'path');
+            (0, chai_1.expect)(result).to.equal('src/index.ts');
+        });
+        it('should not match a key whose name merely ends with the field name', () => {
+            const result = (0, toolcall_utils_1.extractJsonStringField)('{"filepath": "wrong.ts", "path": "right.ts', 'path');
+            (0, chai_1.expect)(result).to.equal('right.ts');
+        });
+    });
+    describe('escapes in streaming values', () => {
+        it('should not end the value at an escaped quote', () => {
+            const result = (0, toolcall_utils_1.extractJsonStringField)('{"path": "a\\"b", "other": "x', 'path');
+            (0, chai_1.expect)(result).to.equal('a"b');
+        });
+        it('should unescape backslashes in a streaming Windows path', () => {
+            const result = (0, toolcall_utils_1.extractJsonStringField)('{"path": "C:\\\\Users\\\\me', 'path');
+            (0, chai_1.expect)(result).to.equal('C:\\Users\\me');
+        });
+        it('should drop a trailing incomplete escape', () => {
+            const result = (0, toolcall_utils_1.extractJsonStringField)('{"path": "a\\', 'path');
+            (0, chai_1.expect)(result).to.equal('a');
+        });
+        it('should drop a trailing incomplete unicode escape', () => {
+            const result = (0, toolcall_utils_1.extractJsonStringField)('{"path": "a\\u00', 'path');
+            (0, chai_1.expect)(result).to.equal('a');
+        });
+        it('should keep a completed escaped backslash at the end of a streaming value', () => {
+            const result = (0, toolcall_utils_1.extractJsonStringField)('{"path": "a\\\\', 'path');
+            (0, chai_1.expect)(result).to.equal('a\\');
+        });
+        it('should keep literal text that looks like an escape', () => {
+            const result = (0, toolcall_utils_1.extractJsonStringField)('{"path": "a\\\\u0041', 'path');
+            (0, chai_1.expect)(result).to.equal('a\\u0041');
+        });
+    });
+    describe('large streaming payloads', () => {
+        it('should extract a field that follows a very large content value', () => {
+            const content = 'x'.repeat(1_000_000);
+            const result = (0, toolcall_utils_1.extractJsonStringField)(`{"content": "${content}", "path": "src/index.ts`, 'path');
+            (0, chai_1.expect)(result).to.equal('src/index.ts');
         });
     });
 });

package/lib/common/toolcall-utils.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"toolcall-utils.spec.js","sourceRoot":"","sources":["../../src/common/toolcall-utils.spec.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;AAEhF,+BAA8B;AAC9B,qDAA0D;AAE1D,QAAQ,CAAC,wBAAwB,EAAE,GAAG,EAAE;IACpC,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;QAC3B,EAAE,CAAC,+CAA+C,EAAE,GAAG,EAAE;YACrD,MAAM,MAAM,GAAG,IAAA,uCAAsB,EAAC,8CAA8C,EAAE,MAAM,CAAC,CAAC;YAC9F,IAAA,aAAM,EAAC,MAAM,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;QAC5C,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,kDAAkD,EAAE,GAAG,EAAE;YACxD,MAAM,MAAM,GAAG,IAAA,uCAAsB,EAAC,+CAA+C,EAAE,QAAQ,CAAC,CAAC;YACjG,IAAA,aAAM,EAAC,MAAM,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;QAC3C,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,iEAAiE,EAAE,GAAG,EAAE;YACvE,MAAM,MAAM,GAAG,IAAA,uCAAsB,EAAC,kBAAkB,EAAE,MAAM,CAAC,CAAC;YAClE,IAAA,aAAM,EAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,SAAS,CAAC;QACnC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,0DAA0D,EAAE,GAAG,EAAE;YAChE,MAAM,MAAM,GAAG,IAAA,uCAAsB,EAAC,eAAe,EAAE,OAAO,CAAC,CAAC;YAChE,IAAA,aAAM,EAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,SAAS,CAAC;QACnC,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,6BAA6B,EAAE,GAAG,EAAE;QACzC,EAAE,CAAC,sDAAsD,EAAE,GAAG,EAAE;YAC5D,MAAM,MAAM,GAAG,IAAA,uCAAsB,EAAC,yBAAyB,EAAE,MAAM,CAAC,CAAC;YACzE,IAAA,aAAM,EAAC,MAAM,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;QAC5C,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,oEAAoE,EAAE,GAAG,EAAE;YAC1E,MAAM,MAAM,GAAG,IAAA,uCAAsB,EAAC,wBAAwB,EAAE,MAAM,CAAC,CAAC;YACxE,IAAA,aAAM,EAAC,MAAM,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;QAC5C,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,yCAAyC,EAAE,GAAG,EAAE;YAC/C,MAAM,MAAM,GAAG,IAAA,uCAAsB,EAAC,qBAAqB,EAAE,SAAS,CAAC,CAAC;YACxE,IAAA,aAAM,EAAC,MAAM,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QACtC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,4EAA4E,EAAE,GAAG,EAAE;YAClF,MAAM,MAAM,GAAG,IAAA,uCAAsB,EAAC,YAAY,EAAE,MAAM,CAAC,CAAC;YAC5D,IAAA,aAAM,EAAC,MAAM,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAChC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,gDAAgD,EAAE,GAAG,EAAE;YACtD,MAAM,MAAM,GAAG,IAAA,uCAAsB,EAAC,uBAAuB,EAAE,MAAM,CAAC,CAAC;YACvE,IAAA,aAAM,EAAC,MAAM,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;QAC5C,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,qEAAqE,EAAE,GAAG,EAAE;YAC3E,MAAM,MAAM,GAAG,IAAA,uCAAsB,EAAC,0CAA0C,EAAE,MAAM,CAAC,CAAC;YAC1F,IAAA,aAAM,EAAC,MAAM,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;QAC5C,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,mDAAmD,EAAE,GAAG,EAAE;YACzD,MAAM,MAAM,GAAG,IAAA,uCAAsB,EAAC,2CAA2C,EAAE,QAAQ,CAAC,CAAC;YAC7F,IAAA,aAAM,EAAC,MAAM,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QACzC,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,YAAY,EAAE,GAAG,EAAE;QACxB,EAAE,CAAC,6CAA6C,EAAE,GAAG,EAAE;YACnD,MAAM,MAAM,GAAG,IAAA,uCAAsB,EAAC,SAAS,EAAE,MAAM,CAAC,CAAC;YACzD,IAAA,aAAM,EAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,SAAS,CAAC;QACnC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,gDAAgD,EAAE,GAAG,EAAE;YACtD,MAAM,MAAM,GAAG,IAAA,uCAAsB,EAAC,EAAE,EAAE,MAAM,CAAC,CAAC;YAClD,IAAA,aAAM,EAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,SAAS,CAAC;QACnC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,mEAAmE,EAAE,GAAG,EAAE;YACzE,MAAM,MAAM,GAAG,IAAA,uCAAsB,EAAC,kBAAkB,EAAE,MAAM,CAAC,CAAC;YAClE,IAAA,aAAM,EAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,SAAS,CAAC;QACnC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,wDAAwD,EAAE,GAAG,EAAE;YAC9D,MAAM,MAAM,GAAG,IAAA,uCAAsB,EAAC,eAAe,EAAE,MAAM,CAAC,CAAC;YAC/D,IAAA,aAAM,EAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,SAAS,CAAC;QACnC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,8CAA8C,EAAE,GAAG,EAAE;YACpD,MAAM,MAAM,GAAG,IAAA,uCAAsB,EAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YACvD,IAAA,aAAM,EAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,SAAS,CAAC;QACnC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,qEAAqE,EAAE,GAAG,EAAE;YAC3E,2DAA2D;YAC3D,MAAM,MAAM,GAAG,IAAA,uCAAsB,EAAC,6BAA6B,EAAE,KAAK,CAAC,CAAC;YAC5E,IAAA,aAAM,EAAC,MAAM,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;QAC5C,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,iFAAiF,EAAE,GAAG,EAAE;YACvF,2EAA2E;YAC3E,MAAM,MAAM,GAAG,IAAA,uCAAsB,EAAC,wBAAwB,EAAE,KAAK,CAAC,CAAC;YACvE,IAAA,aAAM,EAAC,MAAM,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QACvC,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
+{"version":3,"file":"toolcall-utils.spec.js","sourceRoot":"","sources":["../../src/common/toolcall-utils.spec.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,20 +1,20 @@
 {
   "name": "@theia/ai-chat-ui",
-  "version": "1.76.0-next.7+7c303b183",
+  "version": "1.76.0",
   "description": "Theia - AI Chat UI Extension",
   "dependencies": {
-    "@theia/ai-chat": "1.76.0-next.7+7c303b183",
-    "@theia/ai-core": "1.76.0-next.7+7c303b183",
-    "@theia/core": "1.76.0-next.7+7c303b183",
-    "@theia/editor": "1.76.0-next.7+7c303b183",
-    "@theia/editor-preview": "1.76.0-next.7+7c303b183",
-    "@theia/filesystem": "1.76.0-next.7+7c303b183",
-    "@theia/monaco": "1.76.0-next.7+7c303b183",
+    "@theia/ai-chat": "1.76.0",
+    "@theia/ai-core": "1.76.0",
+    "@theia/core": "1.76.0",
+    "@theia/editor": "1.76.0",
+    "@theia/editor-preview": "1.76.0",
+    "@theia/filesystem": "1.76.0",
+    "@theia/monaco": "1.76.0",
     "@theia/monaco-editor-core": "1.108.201",
-    "@theia/preferences": "1.76.0-next.7+7c303b183",
-    "@theia/workspace": "1.76.0-next.7+7c303b183",
+    "@theia/preferences": "1.76.0",
+    "@theia/workspace": "1.76.0",
     "date-fns": "^4.4.0",
-    "mermaid": "^11.16.1",
+    "mermaid": "^11.17.2",
     "tslib": "^2.8.1"
   },
   "publishConfig": {
@@ -51,10 +51,10 @@
     "watch": "theiaext watch"
   },
   "devDependencies": {
-    "@theia/ext-scripts": "1.75.0"
+    "@theia/ext-scripts": "1.76.0"
   },
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "7c303b1836421183d7013f0bd679a9a30ff0b5dc"
+  "gitHead": "b9b54c500b46515512e2b44371bc0c7122947bed"
 }

package/src/browser/ai-chat-ui-frontend-module.ts

@@ -54,6 +54,8 @@ import {
 } from './chat-response-renderer/ai-selection-resolver';
 import { QuestionPartRenderer } from './chat-response-renderer/question-part-renderer';
 import { ExternalResourceAllowlistContribution } from './chat-response-renderer/external-resource-allowlist-contribution';
+import { ChatFindContribution } from './chat-find/chat-find-contribution';
+import { ChatFindMatcher } from './chat-find/chat-find-matcher';
 import { createChatViewTreeWidget, ChatWelcomeMessageProvider } from './chat-tree-view';
 import { ChatViewTreeWidget } from './chat-tree-view/chat-view-tree-widget';
 import { ChatViewMenuContribution } from './chat-view-contribution';
@@ -106,6 +108,10 @@ export default new ContainerModule((bind, _unbind, _isBound, rebind) => {
     bind(CommandContribution).toService(ChatFocusContribution);
     bind(KeybindingContribution).toService(ChatFocusContribution);
 
+    bind(ChatFindContribution).toSelf().inSingletonScope();
+    bind(CommandContribution).toService(ChatFindContribution);
+    bind(KeybindingContribution).toService(ChatFindContribution);
+
     bind(ChatCapabilitiesServiceImpl).toSelf().inSingletonScope();
     bind(ChatCapabilitiesService).toService(ChatCapabilitiesServiceImpl);
 
@@ -144,6 +150,7 @@ export default new ContainerModule((bind, _unbind, _isBound, rebind) => {
         createWidget: () => container.get(AIChatInputWidget)
     })).inSingletonScope();
 
+    bind(ChatFindMatcher).toSelf().inSingletonScope();
     bind(ChatViewTreeWidget).toDynamicValue(ctx =>
         createChatViewTreeWidget(ctx.container)
     );

package/src/browser/chat-find/chat-find-contribution.ts

@@ -0,0 +1,74 @@
+// *****************************************************************************
+// Copyright (C) 2026 Safi Seid-Ahmad, K2view and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { Command, CommandContribution, CommandRegistry } from '@theia/core';
+import { ApplicationShell, KeybindingContribution, KeybindingRegistry } from '@theia/core/lib/browser';
+import { inject, injectable } from '@theia/core/shared/inversify';
+import { ChatCommands } from '../chat-view-commands';
+import { ChatViewWidget } from '../chat-view-widget';
+
+export const CHAT_FIND_COMMAND = Command.toLocalizedCommand({
+    id: 'ai-chat.find',
+    category: ChatCommands.CHAT_CATEGORY,
+    label: 'Find in Chat'
+}, 'theia/ai/chat-ui/find', ChatCommands.CHAT_CATEGORY_KEY);
+
+export const CHAT_FIND_HIDE_COMMAND = Command.toLocalizedCommand({
+    id: 'ai-chat.find.hide',
+    category: ChatCommands.CHAT_CATEGORY,
+    label: 'Hide Find in Chat'
+}, 'theia/ai/chat-ui/findHide', ChatCommands.CHAT_CATEGORY_KEY);
+
+/**
+ * Ctrl+F in the chat response tree opens the find bar over it; in the chat input, Ctrl+F keeps its default
+ * behavior. The binding is only enabled while the session has content to search. It takes precedence over core's
+ * `CommonCommands.FIND` and Monaco's `actions.find` because it is registered later within the default scope,
+ * the same mechanism `ChatInputPasteContribution` relies on for Ctrl+V.
+ */
+@injectable()
+export class ChatFindContribution implements CommandContribution, KeybindingContribution {
+
+    @inject(ApplicationShell)
+    protected readonly shell: ApplicationShell;
+
+    registerCommands(commands: CommandRegistry): void {
+        commands.registerCommand(CHAT_FIND_COMMAND, {
+            isEnabled: () => this.findActiveChatViewWidget()?.treeWidget.canFind === true,
+            execute: () => this.findActiveChatViewWidget()?.treeWidget.showFind()
+        });
+        commands.registerCommand(CHAT_FIND_HIDE_COMMAND, {
+            isEnabled: () => this.findActiveChatViewWidget()?.treeWidget.isFindVisible === true,
+            execute: () => this.findActiveChatViewWidget()?.treeWidget.hideFind()
+        });
+    }
+
+    registerKeybindings(keybindings: KeybindingRegistry): void {
+        keybindings.registerKeybinding({
+            command: CHAT_FIND_COMMAND.id,
+            keybinding: 'ctrlcmd+f',
+            when: 'chatResponseFocus'
+        });
+        keybindings.registerKeybinding({
+            command: CHAT_FIND_HIDE_COMMAND.id,
+            keybinding: 'esc',
+            when: 'chatFindVisible && chatResponseFocus'
+        });
+    }
+
+    protected findActiveChatViewWidget(): ChatViewWidget | undefined {
+        return ChatViewWidget.findActive(this.shell);
+    }
+}

package/src/browser/chat-find/chat-find-highlighter.spec.ts

@@ -0,0 +1,313 @@
+// *****************************************************************************
+// Copyright (C) 2026 Safi Seid-Ahmad, K2view and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { enableJSDOM } from '@theia/core/lib/browser/test/jsdom';
+let disableJSDOM = enableJSDOM();
+import { expect } from 'chai';
+import { Container, injectable } from '@theia/core/shared/inversify';
+import { SimpleMonacoEditor } from '@theia/monaco/lib/browser/simple-monaco-editor';
+import { CodeWrapperEditors } from '../chat-response-renderer/code-wrapper-editors';
+import { ChatFindHighlighter, ChatFindHighlightRegistry } from './chat-find-highlighter';
+import { ChatFindMatch, ChatFindMatcher } from './chat-find-matcher';
+disableJSDOM();
+
+class FakeRegistry implements ChatFindHighlightRegistry {
+    readonly highlights = new Map<string, Range[]>();
+    set(name: string, ranges: Range[]): void {
+        this.highlights.set(name, ranges);
+    }
+    delete(name: string): void {
+        this.highlights.delete(name);
+    }
+    texts(name: string): string[] {
+        return (this.highlights.get(name) ?? []).map(range => range.toString());
+    }
+}
+
+@injectable()
+class TestHighlighter extends ChatFindHighlighter {
+    static registry: ChatFindHighlightRegistry | undefined;
+    protected override createRegistry(): ChatFindHighlightRegistry | undefined {
+        return TestHighlighter.registry;
+    }
+}
+
+function createHighlighter(registry: ChatFindHighlightRegistry | undefined): ChatFindHighlighter {
+    TestHighlighter.registry = registry;
+    const container = new Container();
+    container.bind(ChatFindMatcher).toSelf().inSingletonScope();
+    container.bind(TestHighlighter).toSelf();
+    return container.get(TestHighlighter);
+}
+
+interface FakeDecoration { start: number, end: number, className: string }
+
+/** A stand-in for the editor of a code part: offsets are used as columns of a single line. */
+function fakeEditor(): { editor: SimpleMonacoEditor, decorations: () => FakeDecoration[], setCount: () => number } {
+    let decorations: FakeDecoration[] = [];
+    let sets = 0;
+    const collection = {
+        set: (items: { range: { startColumn: number, endColumn: number }, options: { className: string } }[]) => {
+            sets++;
+            decorations = items.map(item => ({ start: item.range.startColumn - 1, end: item.range.endColumn - 1, className: item.options.className }));
+        },
+        clear: () => { decorations = []; }
+    };
+    const editor = {
+        document: { textEditorModel: { getPositionAt: (offset: number) => ({ lineNumber: 1, column: offset + 1 }), getVersionId: () => 1 } },
+        getControl: () => ({ createDecorationsCollection: () => collection })
+    } as unknown as SimpleMonacoEditor;
+    return { editor, decorations: () => decorations, setCount: () => sets };
+}
+
+/** Gives an element the layout jsdom does not compute. */
+function layout(element: Element, rect: { top: number, height: number }): void {
+    element.getBoundingClientRect = () => ({
+        top: rect.top, bottom: rect.top + rect.height, height: rect.height,
+        left: 0, right: 0, width: 0, x: 0, y: rect.top, toJSON: () => ({})
+    }) as DOMRect;
+}
+
+function scrollable(element: HTMLElement, scrollHeight: number, clientHeight: number): void {
+    element.style.overflowY = 'auto';
+    Object.defineProperty(element, 'scrollHeight', { value: scrollHeight, configurable: true });
+    Object.defineProperty(element, 'clientHeight', { value: clientHeight, configurable: true });
+}
+
+describe('ChatFindHighlighter', () => {
+    let root: HTMLElement;
+    let registry: FakeRegistry;
+    let highlighter: ChatFindHighlighter;
+
+    const requestMatch = (occurrence: number): ChatFindMatch => ({ nodeId: 'r1', kind: ChatFindMatch.REQUEST_KIND, occurrence, start: 0, end: 7 });
+    // Offsets of 'find me and find me', the text of content 1.
+    const contentMatch = (contentIndex: number, occurrence: number, kind = 'markdownContent'): ChatFindMatch =>
+        ({ nodeId: 'r1-response', kind, contentIndex, occurrence, start: occurrence * 12, end: occurrence * 12 + 7 });
+
+    before(() => disableJSDOM = enableJSDOM());
+    after(() => disableJSDOM());
+
+    beforeEach(() => {
+        root = document.createElement('div');
+        document.body.appendChild(root);
+        root.innerHTML = `
+            <div data-node-id="r1"><div class="theia-RequestNode"><p><span>find </span><span>me</span></p></div></div>
+            <div data-node-id="r1-response"><div class="theia-ResponseNode">
+                <div class="theia-ResponseNode-Content"><p>a tool call that would find me too</p></div>
+                <div class="theia-ResponseNode-Content"><p>find <strong>me</strong> and find me</p></div>
+            </div></div>`;
+        registry = new FakeRegistry();
+        highlighter = createHighlighter(registry);
+    });
+
+    afterEach(() => {
+        highlighter.dispose();
+        document.body.removeChild(root);
+    });
+
+    it('highlights only the content the matcher searched, never unsearched parts', () => {
+        // The matcher skips tool calls, reasoning and delegated sub-chats, so content 0 has no matches.
+        highlighter.update(root, /find me/gi, [contentMatch(1, 0), contentMatch(1, 1)], undefined);
+        const ranges = registry.highlights.get(ChatFindHighlighter.MATCH_HIGHLIGHT)!;
+        const contents = root.querySelectorAll('.theia-ResponseNode-Content');
+        expect(ranges).to.have.length(2);
+        expect(ranges.every(r => contents[1].contains(r.startContainer))).to.be.true;
+        expect(ranges.some(r => contents[0].contains(r.startContainer))).to.be.false;
+    });
+
+    it('resolves content parts among the row\'s own nodes, not those of a delegated sub-chat inside a part', () => {
+        // A delegation renders the sub-chat's response node inline (collapsed) inside the outer content element.
+        root.querySelectorAll('.theia-ResponseNode-Content')[0].innerHTML = '<details><div class="theia-ResponseNode">' +
+            '<div class="theia-ResponseNode-Content"><p>find me in the sub-chat</p></div></div></details>';
+        const match = contentMatch(1, 0);
+        highlighter.update(root, /find me/gi, [match], match);
+        const inSubChat = (range: Range): boolean => !!range.startContainer.parentElement!.closest('details');
+        const ranges = registry.highlights.get(ChatFindHighlighter.MATCH_HIGHLIGHT)!;
+        expect(ranges).to.have.length(2);
+        expect(ranges.some(inSubChat)).to.be.false;
+        const current = registry.highlights.get(ChatFindHighlighter.CURRENT_HIGHLIGHT)!;
+        expect(current.map(range => range.toString())).to.deep.equal(['find me']);
+        expect(current.some(inSubChat)).to.be.false;
+    });
+
+    it('does not highlight text inside <style> or <script>, e.g. a diagram stylesheet', () => {
+        root.querySelectorAll('.theia-ResponseNode-Content')[1].innerHTML =
+            '<svg><style>.find-me-node{fill:#fff}</style>' +
+            '<foreignObject><div><span>find me</span></div></foreignObject></svg>' +
+            '<script>const findMe = "find me";</script>';
+        highlighter.update(root, /find me/gi, [contentMatch(1, 0)], undefined);
+        const ranges = registry.highlights.get(ChatFindHighlighter.MATCH_HIGHLIGHT)!;
+        expect(ranges).to.have.length(1);
+        expect(ranges[0].startContainer.parentElement!.nodeName.toLowerCase()).to.equal('span');
+    });
+
+    it('highlights request text when the match belongs to a request row', () => {
+        highlighter.update(root, /find me/gi, [requestMatch(0)], undefined);
+        expect(registry.texts(ChatFindHighlighter.MATCH_HIGHLIGHT)).to.deep.equal(['find me']);
+    });
+
+    it('marks the current match by content index and occurrence', () => {
+        highlighter.update(root, /find me/gi, [contentMatch(1, 0), contentMatch(1, 1)], contentMatch(1, 1));
+        const current = registry.highlights.get(ChatFindHighlighter.CURRENT_HIGHLIGHT)!;
+        expect(current).to.have.length(1);
+        expect(current[0].toString()).to.equal('find me');
+        // the second occurrence lives in the trailing text node ' and find me'
+        expect(current[0].startOffset).to.equal(5);
+    });
+
+    it('marks the current match by its offsets, not by counting occurrences in the DOM', () => {
+        // The DOM holds an occurrence the match list does not (e.g. still being streamed): offsets still pick the right one.
+        root.querySelectorAll('.theia-ResponseNode-Content')[1].innerHTML = '<p>find me <em>and</em> find me</p>';
+        const second: ChatFindMatch = { ...contentMatch(1, 0), start: 12, end: 19 };
+        highlighter.update(root, /find me/gi, [second], second);
+        const current = registry.highlights.get(ChatFindHighlighter.CURRENT_HIGHLIGHT)!;
+        expect(current).to.have.length(1);
+        expect(current[0].startContainer.textContent).to.equal(' find me');
+    });
+
+    it('marks nothing as current when the DOM has no such occurrence', () => {
+        highlighter.update(root, /find me/gi, [contentMatch(1, 5)], contentMatch(1, 5));
+        expect(registry.highlights.get(ChatFindHighlighter.CURRENT_HIGHLIGHT)).to.deep.equal([]);
+    });
+
+    it('searches only the message of an error part', () => {
+        root.querySelectorAll('.theia-ResponseNode-Content')[1].innerHTML = '<div class="theia-ChatPart-Error">' +
+            '<div class="theia-ChatPart-Error-headline"><div class="theia-ChatPart-Error-prefix">Error find me:</div>' +
+            '<div class="theia-ChatPart-Error-message">find me</div></div><details><pre>find me</pre></details></div>';
+        const match = contentMatch(1, 0, 'error');
+        highlighter.update(root, /find me/gi, [match], match);
+        const ranges = registry.highlights.get(ChatFindHighlighter.MATCH_HIGHLIGHT)!;
+        expect(ranges).to.have.length(1);
+        expect(ranges[0].startContainer.parentElement!.className).to.equal('theia-ChatPart-Error-message');
+    });
+
+    it('skips blocked-resource placeholders and treats non-breaking spaces as spaces', () => {
+        root.querySelectorAll('.theia-ResponseNode-Content')[1].innerHTML =
+            '<p><span class="theia-blocked-resource">find me</span>find\u00a0me</p>';
+        highlighter.update(root, /find me/gi, [contentMatch(1, 0)], contentMatch(1, 0));
+        const ranges = registry.highlights.get(ChatFindHighlighter.MATCH_HIGHLIGHT)!;
+        expect(ranges).to.have.length(1);
+        expect(ranges[0].startContainer.parentElement!.nodeName.toLowerCase()).to.equal('p');
+        expect(registry.highlights.get(ChatFindHighlighter.CURRENT_HIGHLIGHT)).to.have.length(1);
+    });
+
+    describe('code parts', () => {
+        let wrapper: HTMLElement;
+        let fake: ReturnType<typeof fakeEditor>;
+
+        beforeEach(() => {
+            root.querySelectorAll('.theia-ResponseNode-Content')[1].innerHTML =
+                `<div class="theia-CodePartRenderer-root"><div class="${CodeWrapperEditors.CLASS}"><span>find\u00a0me</span></div></div>`;
+            wrapper = root.querySelector(`.${CodeWrapperEditors.CLASS}`)!;
+            fake = fakeEditor();
+            CodeWrapperEditors.set(wrapper, fake.editor);
+        });
+
+        it('decorates matches in the editor instead of highlighting its DOM', () => {
+            const first = contentMatch(1, 0, 'code');
+            const second = contentMatch(1, 1, 'code');
+            highlighter.update(root, /find me/gi, [first, second], second);
+            expect(fake.decorations()).to.deep.equal([
+                { start: 0, end: 7, className: 'findMatch' },
+                { start: 12, end: 19, className: 'currentFindMatch' }
+            ]);
+            expect(registry.highlights.get(ChatFindHighlighter.MATCH_HIGHLIGHT)).to.deep.equal([]);
+            expect(registry.highlights.get(ChatFindHighlighter.CURRENT_HIGHLIGHT)).to.deep.equal([]);
+        });
+
+        it('does not set unchanged decorations again, so decorating does not loop through the mutation observer', () => {
+            const match = contentMatch(1, 0, 'code');
+            highlighter.update(root, /find me/gi, [match], match);
+            highlighter.refresh();
+            expect(fake.setCount()).to.equal(1);
+        });
+
+        it('clears the decorations when the find is cleared', () => {
+            highlighter.update(root, /find me/gi, [contentMatch(1, 0, 'code')], undefined);
+            highlighter.update(root, undefined, [], undefined);
+            expect(fake.decorations()).to.deep.equal([]);
+        });
+    });
+
+    it('clears both highlights when the regexp is removed', () => {
+        highlighter.update(root, /find/gi, [contentMatch(1, 0)], undefined);
+        highlighter.update(root, undefined, [], undefined);
+        expect(registry.highlights.has(ChatFindHighlighter.MATCH_HIGHLIGHT)).to.be.false;
+        expect(registry.highlights.has(ChatFindHighlighter.CURRENT_HIGHLIGHT)).to.be.false;
+    });
+
+    it('does nothing without a registry', () => {
+        const noop = createHighlighter(undefined);
+        noop.update(root, /find/gi, [contentMatch(1, 0)], undefined);
+        noop.dispose();
+        expect(registry.highlights.size).to.equal(0);
+    });
+
+    it('re-applies after DOM mutations', async () => {
+        highlighter.update(root, /find/gi, [contentMatch(1, 0), contentMatch(1, 1)], undefined);
+        const before = registry.texts(ChatFindHighlighter.MATCH_HIGHLIGHT).length;
+        root.querySelectorAll('.theia-ResponseNode-Content')[1].insertAdjacentHTML('beforeend', '<p>find again</p>');
+        await new Promise(resolve => setTimeout(resolve, 50));
+        expect(registry.texts(ChatFindHighlighter.MATCH_HIGHLIGHT).length).to.equal(before + 1);
+    });
+
+    describe('scrollCurrentIntoView', () => {
+        let outer: HTMLElement;
+        let scroller: HTMLElement;
+        let scrollIntoViewCalls: number;
+
+        beforeEach(() => {
+            scrollIntoViewCalls = 0;
+            Element.prototype.scrollIntoView = function (): void { scrollIntoViewCalls++; };
+            // An element outside the root that must never be scrolled (stands in for the Theia shell).
+            outer = document.createElement('div');
+            scrollable(outer, 2000, 400);
+            document.body.appendChild(outer);
+            outer.appendChild(root);
+            // The tree's own scroll container, inside the root.
+            scroller = document.createElement('div');
+            scrollable(scroller, 1000, 200);
+            layout(scroller, { top: 0, height: 200 });
+            root.insertBefore(scroller, root.firstChild);
+            scroller.innerHTML = '<div data-node-id="r9"><div class="theia-ResponseNode">' +
+                '<div class="theia-ResponseNode-Content"><p>find me</p></div></div></div>';
+        });
+
+        afterEach(() => {
+            document.body.removeChild(outer);
+            document.body.appendChild(root);
+        });
+
+        const match = (): ChatFindMatch => ({ nodeId: 'r9', kind: 'markdownContent', contentIndex: 0, occurrence: 0, start: 0, end: 7 });
+
+        it('scrolls the tree scroll container and never an ancestor outside the root', () => {
+            layout(scroller.querySelector('p')!, { top: 500, height: 20 });
+            highlighter.update(root, /find me/gi, [match()], match());
+            highlighter.scrollCurrentIntoView(root);
+            expect(scroller.scrollTop).to.equal(410); // 500 - (200 - 20) / 2
+            expect(outer.scrollTop).to.equal(0);
+            expect(scrollIntoViewCalls).to.equal(0);
+        });
+
+        it('leaves the scroll position alone when the match is already visible', () => {
+            layout(scroller.querySelector('p')!, { top: 50, height: 20 });
+            scroller.scrollTop = 120;
+            highlighter.update(root, /find me/gi, [match()], match());
+            highlighter.scrollCurrentIntoView(root);
+            expect(scroller.scrollTop).to.equal(120);
+        });
+    });
+});