@aws/lsp-codewhisperer 0.0.72 → 0.0.74

package/CHANGELOG.md

@@ -1,5 +1,60 @@
 # Changelog
 
+## [0.0.74](https://github.com/aws/language-servers/compare/lsp-codewhisperer/v0.0.73...lsp-codewhisperer/v0.0.74) (2025-08-19)
+
+
+### Features
+
+* **amazonq:** added mcp admin level configuration with GetProfile ([#2000](https://github.com/aws/language-servers/issues/2000)) ([fd6e9a8](https://github.com/aws/language-servers/commit/fd6e9a829c6229c276de5340dffce52b426a864d))
+* **amazonq:** read tool ui revamp ([#2113](https://github.com/aws/language-servers/issues/2113)) ([#2121](https://github.com/aws/language-servers/issues/2121)) ([93cf229](https://github.com/aws/language-servers/commit/93cf229149ba60491f9f5763793db4a9f570b611))
+* remove project type validation from LSP layer ([#2103](https://github.com/aws/language-servers/issues/2103)) ([d397161](https://github.com/aws/language-servers/commit/d397161cc3448c63016e27f5ac2a1917cdaae1cb))
+
+
+### Bug Fixes
+
+* **amazonq:** add server side control for WCS features ([#2128](https://github.com/aws/language-servers/issues/2128)) ([5e4435d](https://github.com/aws/language-servers/commit/5e4435dfaea7bf8c00e6a27b9bb0d40f699d4e01))
+* **amazonq:** fix regression of mcp config in agent config ([#2101](https://github.com/aws/language-servers/issues/2101)) ([e4e8bbb](https://github.com/aws/language-servers/commit/e4e8bbb89e4b597926582bead2b14ffc43f2a7f8))
+* **amazonq:** handle case where multiple rules are provided with the same name ([#2118](https://github.com/aws/language-servers/issues/2118)) ([0e23e2d](https://github.com/aws/language-servers/commit/0e23e2d29b8cad14403d372b9bbb08ca8ffa7ac7))
+* **amazonq:** persist mcp configs in agent json on start-up ([#2112](https://github.com/aws/language-servers/issues/2112)) ([817cfe2](https://github.com/aws/language-servers/commit/817cfe2656cb1deec6111c699c4ba46b4ba53e00))
+* empty userTriggerDecision not being sent for NEP code path ([#2140](https://github.com/aws/language-servers/issues/2140)) ([b8e5268](https://github.com/aws/language-servers/commit/b8e52682ac2b2337e1d0a32759e8beccde889cee))
+* fix for button text and remove profilearn caching ([#2137](https://github.com/aws/language-servers/issues/2137)) ([2a4171a](https://github.com/aws/language-servers/commit/2a4171a74c15c23c23c481060496162bcc9e6284))
+* fix to add disk caching for mcp admin state ([#2139](https://github.com/aws/language-servers/issues/2139)) ([f947e1a](https://github.com/aws/language-servers/commit/f947e1a9da4431d6089b22825f992010c30a470b))
+* fix to turn on and off MCP servers incase of error based on last state ([#2143](https://github.com/aws/language-servers/issues/2143)) ([04588df](https://github.com/aws/language-servers/commit/04588dfc33f0d85dbd488814a474b5e354398df0))
+* proper path handling for additional context ([#2129](https://github.com/aws/language-servers/issues/2129)) ([971eaa5](https://github.com/aws/language-servers/commit/971eaa505d948e9d2090c85f9b965f554ea7f2c8))
+* Use file context override in the inline completion params for Jupyter Notebook ([#2114](https://github.com/aws/language-servers/issues/2114)) ([91c8398](https://github.com/aws/language-servers/commit/91c839857f8aa4d79098189f9fb620b361c51289))
+
+
+### Performance Improvements
+
+* remove edit completion retry mechanism on document change ([#2124](https://github.com/aws/language-servers/issues/2124)) ([963b6e9](https://github.com/aws/language-servers/commit/963b6e9b7887da23a85a826c55a6ed95ff36d956))
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * dependencies
+    * @aws/lsp-core bumped from ^0.0.13 to ^0.0.14
+
+## [0.0.73](https://github.com/aws/language-servers/compare/lsp-codewhisperer/v0.0.72...lsp-codewhisperer/v0.0.73) (2025-08-11)
+
+
+### Features
+
+* **amazonq:** read tool ui revamp ([c65428b](https://github.com/aws/language-servers/commit/c65428bab2cf5e47badf1e3a9453babcf881e60c))
+
+
+### Bug Fixes
+
+* **amazonq:** add fallback classpath generation ([#2077](https://github.com/aws/language-servers/issues/2077)) ([3a6ef14](https://github.com/aws/language-servers/commit/3a6ef14e78fa2e75b837bba6524751d65038f416))
+* **amazonq:** emit failed status for amazonq_invokeLLM ([#2071](https://github.com/aws/language-servers/issues/2071)) ([ee52a41](https://github.com/aws/language-servers/commit/ee52a41bc869b275fff708d7955b59f43b93bbd4))
+* **amazonq:** fix fallout of [#2051](https://github.com/aws/language-servers/issues/2051) ([#2057](https://github.com/aws/language-servers/issues/2057)) ([565066b](https://github.com/aws/language-servers/commit/565066bb61adda60333c9646db958d4208bcc8af))
+* **amazonq:** leverage lcs to find the chars added and removed ([#2092](https://github.com/aws/language-servers/issues/2092)) ([40379a8](https://github.com/aws/language-servers/commit/40379a887f8d42cc184239ca3175b4e673cc5286))
+* **amazonq:** skips continuous monitoring when WCS sees workspace as idle ([#2066](https://github.com/aws/language-servers/issues/2066)) ([9cb959d](https://github.com/aws/language-servers/commit/9cb959d4cc450d0907f8bf5265ba01d2aa68bcd0))
+* creating a new sesion for Edits trigger with next token ([#2094](https://github.com/aws/language-servers/issues/2094)) ([1da8730](https://github.com/aws/language-servers/commit/1da8730b6ed6ad53b6561368bf722e56d59596a4))
+* remove edit cache logic ([#2079](https://github.com/aws/language-servers/issues/2079)) ([9bc5b9c](https://github.com/aws/language-servers/commit/9bc5b9c1d77e5fee6f518f7f5016d3a0043a5a77))
+* sessionManager misused because there are 2 types of manager now ([#2090](https://github.com/aws/language-servers/issues/2090)) ([8db059a](https://github.com/aws/language-servers/commit/8db059ab83d94fd7c3ba3eb265044add31c80aea))
+* update client name to support Sagemaker AI origin for agentic chat ([#2093](https://github.com/aws/language-servers/issues/2093)) ([a746fe8](https://github.com/aws/language-servers/commit/a746fe845d5e09563b475f01ce44059dca9fd10f))
+
 ## [0.0.72](https://github.com/aws/language-servers/compare/lsp-codewhisperer/v0.0.71...lsp-codewhisperer/v0.0.72) (2025-08-06)
 
 

package/out/client/token/bearer-token-service.json

@@ -516,6 +516,37 @@
             ],
             "documentation": "<p>API to get code transformation status.</p>"
         },
+        "GetProfile": {
+            "name": "GetProfile",
+            "http": {
+                "method": "POST",
+                "requestUri": "/"
+            },
+            "input": {
+                "shape": "GetProfileRequest"
+            },
+            "output": {
+                "shape": "GetProfileResponse"
+            },
+            "errors": [
+                {
+                    "shape": "ThrottlingException"
+                },
+                {
+                    "shape": "ResourceNotFoundException"
+                },
+                {
+                    "shape": "InternalServerException"
+                },
+                {
+                    "shape": "ValidationException"
+                },
+                {
+                    "shape": "AccessDeniedException"
+                }
+            ],
+            "documentation": "<p>Get the requested CodeWhisperer profile.</p>"
+        },
         "GetUsageLimits": {
             "name": "GetUsageLimits",
             "http": {
@@ -3126,6 +3157,24 @@
                 }
             }
         },
+        "GetProfileRequest": {
+            "type": "structure",
+            "required": ["profileArn"],
+            "members": {
+                "profileArn": {
+                    "shape": "ProfileArn"
+                }
+            }
+        },
+        "GetProfileResponse": {
+            "type": "structure",
+            "required": ["profile"],
+            "members": {
+                "profile": {
+                    "shape": "ProfileInfo"
+                }
+            }
+        },
         "GetTaskAssistCodeGenerationRequest": {
             "type": "structure",
             "required": ["conversationId", "codeGenerationId"],
@@ -3787,6 +3836,15 @@
             "type": "long",
             "box": true
         },
+        "MCPConfiguration": {
+            "type": "structure",
+            "required": ["toggle"],
+            "members": {
+                "toggle": {
+                    "shape": "OptInFeatureToggle"
+                }
+            }
+        },
         "MemoryEntry": {
             "type": "structure",
             "required": ["id", "memoryEntryString", "metadata"],
@@ -3995,6 +4053,9 @@
                 },
                 "workspaceContext": {
                     "shape": "WorkspaceContext"
+                },
+                "mcpConfiguration": {
+                    "shape": "MCPConfiguration"
                 }
             }
         },
@@ -4189,6 +4250,30 @@
                 }
             }
         },
+        "ProfileInfo": {
+            "type": "structure",
+            "required": ["arn"],
+            "members": {
+                "arn": {
+                    "shape": "ProfileArn"
+                },
+                "profileName": {
+                    "shape": "ProfileName"
+                },
+                "description": {
+                    "shape": "ProfileDescription"
+                },
+                "status": {
+                    "shape": "ProfileStatus"
+                },
+                "profileType": {
+                    "shape": "ProfileType"
+                },
+                "optInFeatures": {
+                    "shape": "OptInFeatures"
+                }
+            }
+        },
         "ProfileArn": {
             "type": "string",
             "max": 950,

package/out/language-server/agenticChat/agenticChatController.d.ts

@@ -2,7 +2,7 @@
  * Copied from ../chat/chatController.ts for the purpose of developing a divergent implementation.
  * Will be deleted or merged.
  */
-import { ToolUse } from '@amzn/codewhisperer-streaming';
+import { ToolResult, ToolUse } from '@amzn/codewhisperer-streaming';
 import { ChatCommandInput } from '../../shared/streamingClientService';
 import { Status, ButtonClickParams, ButtonClickResult, InlineChatResultParams, PromptInputOptionChangeParams, RuleClickParams, ListRulesParams, ActiveEditorChangedParams, PinnedContextParams, ExecuteCommandParams, FollowUpClickParams, ListAvailableModelsParams, ListAvailableModelsResult, OpenFileDialogParams, OpenFileDialogResult } from '@aws/language-server-runtimes/protocol';
 import { FeedbackParams, InsertToCursorPositionParams, InlineChatParams, ConversationClickParams, ListConversationsParams, ListMcpServersParams, McpServerClickParams, TabBarActionParams, CreatePromptParams, FileClickParams } from '@aws/language-server-runtimes/protocol';
@@ -43,6 +43,13 @@ export declare class AgenticChatController implements ChatHandlers {
                 icon: string;
                 status: Status;
             } | undefined;
+            actions: {
+                id: string;
+                icon: string;
+                status: string;
+                text: string;
+                description: string;
+            }[];
         };
         list: import("@aws/language-server-runtimes/protocol").DetailedListGroup[];
     }>;
@@ -65,6 +72,12 @@ export declare class AgenticChatController implements ChatHandlers {
      * @param session
      */
     waitForToolApproval(toolUse: ToolUse, resultStream: AgenticChatResultStream, promptBlockId: number, session: ChatSessionService, toolName: string): Promise<void>;
+    /**
+     * Processes tool uses by running the tools and collecting results
+     */
+    processToolUses(toolUses: Array<ToolUse & {
+        stop: boolean;
+    }>, chatResultStream: AgenticChatResultStream, session: ChatSessionService, tabId: string, token?: CancellationToken, additionalContext?: AdditionalContentEntryAddition[]): Promise<ToolResult[]>;
     /**
      * Determines if error is thrown as a result of a user action (Ex. rejecting tool, stop button)
      * @param err

package/out/language-server/agenticChat/agenticChatController.js

@@ -65,6 +65,7 @@ const path_1 = require("@aws/lsp-core/out/util/path");
 const agenticChatControllerHelper_1 = require("./utils/agenticChatControllerHelper");
 const activeUserTracker_1 = require("../../shared/activeUserTracker");
 const displayFindings_1 = require("./tools/qCodeAnalysis/displayFindings");
+const IdleWorkspaceManager_1 = require("../workspaceContext/IdleWorkspaceManager");
 class AgenticChatController {
     #features;
     #chatSessionManagementService;
@@ -465,6 +466,7 @@ class AgenticChatController {
     async onChatPrompt(params, token) {
         // Phase 1: Initial Setup - This happens only once
         params.prompt.prompt = (0, utils_2.sanitizeInput)(params.prompt.prompt || '');
+        IdleWorkspaceManager_1.IdleWorkspaceManager.recordActivityTimestamp();
         const maybeDefaultResponse = !params.prompt.command && (0, utils_1.getDefaultChatResponse)(params.prompt.prompt);
         if (maybeDefaultResponse) {
             return maybeDefaultResponse;
@@ -844,6 +846,8 @@ class AgenticChatController {
                 shouldDisplayMessage = false;
                 // set the in progress tool use UI status to Error
                 await chatResultStream.updateOngoingProgressResult('Error');
+                // emit invokeLLM event with status Failed for timeout calls
+                this.#telemetryController.emitAgencticLoop_InvokeLLM(response.$metadata.requestId, conversationId, 'AgenticChat', undefined, undefined, 'Failed', this.#features.runtime.serverInfo.version ?? '', session.modelId, llmLatency, this.#toolCallLatencies, this.#timeToFirstChunk, this.#timeBetweenChunks, session.pairProgrammingMode, this.#abTestingAllocation?.experimentName, this.#abTestingAllocation?.userVariation);
                 continue;
             }
             // Add the current assistantResponse message to the history DB
@@ -881,7 +885,7 @@ class AgenticChatController {
             if (pendingToolUses.length === 0) {
                 this.recordChunk('agent_loop_done');
                 // No more tool uses, we're done
-                this.#telemetryController.emitAgencticLoop_InvokeLLM(response.$metadata.requestId, conversationId, 'AgenticChat', undefined, undefined, 'Succeeded', this.#features.runtime.serverInfo.version ?? '', session.modelId, llmLatency, this.#toolCallLatencies, this.#timeToFirstChunk, this.#timeBetweenChunks, session.pairProgrammingMode, this.#abTestingAllocation?.experimentName, this.#abTestingAllocation?.userVariation);
+                this.#telemetryController.emitAgencticLoop_InvokeLLM(response.$metadata.requestId, conversationId, 'AgenticChat', undefined, undefined, result.success ? 'Succeeded' : 'Failed', this.#features.runtime.serverInfo.version ?? '', session.modelId, llmLatency, this.#toolCallLatencies, this.#timeToFirstChunk, this.#timeBetweenChunks, session.pairProgrammingMode, this.#abTestingAllocation?.experimentName, this.#abTestingAllocation?.userVariation);
                 finalResult = result;
                 break;
             }
@@ -890,7 +894,7 @@ class AgenticChatController {
             session.setConversationType('AgenticChatWithToolUse');
             if (result.success) {
                 // Process tool uses and update the request input for the next iteration
-                toolResults = await this.#processToolUses(pendingToolUses, chatResultStream, session, tabId, token);
+                toolResults = await this.processToolUses(pendingToolUses, chatResultStream, session, tabId, token, additionalContext);
                 if (toolResults.some(toolResult => this.#shouldSendBackErrorContent(toolResult))) {
                     content = 'There was an error processing one or more tool uses. Try again, do not apologize.';
                     shouldDisplayMessage = false;
@@ -1090,7 +1094,7 @@ class AgenticChatController {
     /**
      * Processes tool uses by running the tools and collecting results
      */
-    async #processToolUses(toolUses, chatResultStream, session, tabId, token) {
+    async processToolUses(toolUses, chatResultStream, session, tabId, token, additionalContext) {
         const results = [];
         for (const toolUse of toolUses) {
             // Store buttonBlockId to use it in `catch` block if needed
@@ -1112,8 +1116,7 @@ class AgenticChatController {
                 this.#toolStartTime = Date.now();
                 // remove progress UI
                 await chatResultStream.removeResultBlockAndUpdateUI(agenticChatResultStream_1.progressPrefix + toolUse.toolUseId);
-                // fsRead and listDirectory write to an existing card and could show nothing in the current position
-                if (![toolConstants_1.FS_WRITE, toolConstants_1.FS_REPLACE, toolConstants_1.FS_READ, toolConstants_1.LIST_DIRECTORY].includes(toolUse.name)) {
+                if (![toolConstants_1.FS_WRITE, toolConstants_1.FS_REPLACE].includes(toolUse.name)) {
                     await this.#showUndoAllIfRequired(chatResultStream, session);
                 }
                 // fsWrite can take a long time, so we render fsWrite  Explanatory upon partial streaming responses.
@@ -1229,12 +1232,10 @@ class AgenticChatController {
                 if (toolUse.name === codeReview_1.CodeReview.toolName) {
                     try {
                         let initialInput = JSON.parse(JSON.stringify(toolUse.input));
-                        let ruleArtifacts = await this.#additionalContextProvider.collectWorkspaceRules(tabId);
-                        if (ruleArtifacts !== undefined || ruleArtifacts !== null) {
-                            this.#features.logging.info(`RuleArtifacts: ${JSON.stringify(ruleArtifacts)}`);
-                            let pathsToRulesMap = ruleArtifacts.map(ruleArtifact => ({ path: ruleArtifact.id }));
-                            this.#features.logging.info(`PathsToRules: ${JSON.stringify(pathsToRulesMap)}`);
-                            initialInput['ruleArtifacts'] = pathsToRulesMap;
+                        if (additionalContext !== undefined) {
+                            initialInput['ruleArtifacts'] = additionalContext
+                                .filter(c => c.type === 'rule')
+                                .map(c => ({ path: c.path }));
                         }
                         toolUse.input = initialInput;
                     }
@@ -1270,10 +1271,14 @@ class AgenticChatController {
                 switch (toolUse.name) {
                     case toolConstants_1.FS_READ:
                     case toolConstants_1.LIST_DIRECTORY:
+                        const readToolResult = await this.#processReadTool(toolUse, chatResultStream);
+                        if (readToolResult) {
+                            await chatResultStream.writeResultBlock(readToolResult);
+                        }
+                        break;
                     case toolConstants_1.FILE_SEARCH:
-                        const initialListDirResult = this.#processReadOrListOrSearch(toolUse, chatResultStream);
-                        if (initialListDirResult) {
-                            await chatResultStream.writeResultBlock(initialListDirResult);
+                        if ((0, fileSearch_1.isFileSearchParams)(toolUse.input)) {
+                            await this.#processFileSearchTool(toolUse.input, toolUse.toolUseId, result, chatResultStream);
                         }
                         break;
                     // no need to write tool result for listDir,fsRead,fileSearch into chat stream
@@ -1617,7 +1622,6 @@ class AgenticChatController {
             return;
         }
         const toolMsgId = toolUse.toolUseId;
-        const chatMsgId = chatResultStream.getResult().messageId;
         let headerEmitted = false;
         const initialHeader = {
             body: 'shell',
@@ -1649,12 +1653,6 @@ class AgenticChatController {
                     body: '```',
                     header: completedHeader,
                 });
-                await chatResultStream.writeResultBlock({
-                    type: 'answer',
-                    messageId: chatMsgId,
-                    body: '',
-                    header: undefined,
-                });
                 this.#stoppedToolUses.add(toolMsgId);
             },
         });
@@ -2085,72 +2083,123 @@ class AgenticChatController {
             },
         };
     }
-    #processReadOrListOrSearch(toolUse, chatResultStream) {
-        let messageIdToUpdate = toolUse.toolUseId;
-        const currentId = chatResultStream.getMessageIdToUpdateForTool(toolUse.name);
-        if (currentId) {
-            messageIdToUpdate = currentId;
-        }
-        else {
-            chatResultStream.setMessageIdToUpdateForTool(toolUse.name, messageIdToUpdate);
-        }
+    async #processFileSearchTool(toolInput, toolUseId, result, chatResultStream) {
+        if (typeof result.output.content !== 'string')
+            return;
+        const { queryName, path: inputPath } = toolInput;
+        const resultCount = result.output.content
+            .split('\n')
+            .filter(line => line.trim().startsWith('[F]') || line.trim().startsWith('[D]')).length;
+        const chatMessage = {
+            type: 'tool',
+            messageId: toolUseId,
+            header: {
+                body: `Searched for "${queryName}" in `,
+                icon: 'search',
+                status: {
+                    text: `${resultCount} result${resultCount !== 1 ? 's' : ''} found`,
+                },
+                fileList: {
+                    filePaths: [inputPath],
+                    details: {
+                        [inputPath]: {
+                            description: inputPath,
+                            visibleName: path.basename(inputPath),
+                            clickable: false,
+                        },
+                    },
+                },
+            },
+        };
+        await chatResultStream.writeResultBlock(chatMessage);
+    }
+    async #processReadTool(toolUse, chatResultStream) {
         let currentPaths = [];
         if (toolUse.name === toolConstants_1.FS_READ) {
-            currentPaths = toolUse.input?.paths;
+            currentPaths = toolUse.input?.paths || [];
         }
-        else {
-            currentPaths.push(toolUse.input?.path);
+        else if (toolUse.name === toolConstants_1.LIST_DIRECTORY) {
+            const singlePath = toolUse.input?.path;
+            if (singlePath) {
+                currentPaths = [singlePath];
+            }
         }
-        if (!currentPaths)
-            return;
-        for (const currentPath of currentPaths) {
-            const existingPaths = chatResultStream.getMessageOperation(messageIdToUpdate)?.filePaths || [];
-            // Check if path already exists in the list
-            const isPathAlreadyProcessed = existingPaths.some(path => path.relativeFilePath === currentPath);
-            if (!isPathAlreadyProcessed) {
-                const currentFileDetail = {
-                    relativeFilePath: currentPath,
-                    lineRanges: [{ first: -1, second: -1 }],
-                };
-                chatResultStream.addMessageOperation(messageIdToUpdate, toolUse.name, [
-                    ...existingPaths,
-                    currentFileDetail,
-                ]);
+        else if (toolUse.name === toolConstants_1.FILE_SEARCH) {
+            const queryName = toolUse.input?.queryName;
+            if (queryName) {
+                currentPaths = [queryName];
             }
         }
+        else {
+            return;
+        }
+        if (currentPaths.length === 0)
+            return;
+        // Check if the last message is the same tool type
+        const lastMessage = chatResultStream.getLastMessage();
+        const isSameToolType = lastMessage?.type === 'tool' && lastMessage.header?.icon === this.#toolToIcon(toolUse.name);
+        let allPaths = currentPaths;
+        if (isSameToolType && lastMessage.messageId) {
+            // Combine with existing paths and overwrite the last message
+            const existingPaths = lastMessage.header?.fileList?.filePaths || [];
+            allPaths = [...existingPaths, ...currentPaths];
+            const blockId = chatResultStream.getMessageBlockId(lastMessage.messageId);
+            if (blockId !== undefined) {
+                // Create the updated message with combined paths
+                const updatedMessage = this.#createFileListToolMessage(toolUse, allPaths, lastMessage.messageId);
+                // Overwrite the existing block
+                await chatResultStream.overwriteResultBlock(updatedMessage, blockId);
+                return undefined; // Don't return a message since we already wrote it
+            }
+        }
+        // Create new message with current paths
+        return this.#createFileListToolMessage(toolUse, allPaths, toolUse.toolUseId);
+    }
+    #createFileListToolMessage(toolUse, filePaths, messageId) {
+        const itemCount = filePaths.length;
         let title;
-        const itemCount = chatResultStream.getMessageOperation(messageIdToUpdate)?.filePaths.length;
-        const filePathsPushed = chatResultStream.getMessageOperation(messageIdToUpdate)?.filePaths ?? [];
-        if (!itemCount) {
+        if (itemCount === 0) {
             title = 'Gathering context';
         }
         else {
             title =
                 toolUse.name === toolConstants_1.FS_READ
                     ? `${itemCount} file${itemCount > 1 ? 's' : ''} read`
-                    : toolUse.name === toolConstants_1.FILE_SEARCH
-                        ? `${itemCount} ${itemCount === 1 ? 'directory' : 'directories'} searched`
-                        : `${itemCount} ${itemCount === 1 ? 'directory' : 'directories'} listed`;
+                    : toolUse.name === toolConstants_1.LIST_DIRECTORY
+                        ? `${itemCount} ${itemCount === 1 ? 'directory' : 'directories'} listed`
+                        : '';
         }
         const details = {};
-        for (const item of filePathsPushed) {
-            details[item.relativeFilePath] = {
-                lineRanges: item.lineRanges,
-                description: item.relativeFilePath,
+        for (const filePath of filePaths) {
+            details[filePath] = {
+                description: filePath,
+                visibleName: path.basename(filePath),
+                clickable: toolUse.name === toolConstants_1.FS_READ,
             };
         }
-        const fileList = {
-            rootFolderTitle: title,
-            filePaths: filePathsPushed.map(item => item.relativeFilePath),
-            details,
-        };
         return {
             type: 'tool',
-            fileList,
-            messageId: messageIdToUpdate,
-            body: '',
+            header: {
+                body: title,
+                icon: this.#toolToIcon(toolUse.name),
+                fileList: {
+                    filePaths,
+                    details,
+                },
+            },
+            messageId,
         };
     }
+    #toolToIcon(toolName) {
+        switch (toolName) {
+            case toolConstants_1.FS_READ:
+                return 'eye';
+            case toolConstants_1.LIST_DIRECTORY:
+                return 'check-list';
+            default:
+                return undefined;
+        }
+    }
     /**
      * Process grep search results and format them for display in the chat UI
      */
@@ -2158,14 +2207,7 @@ class AgenticChatController {
         if (toolUse.name !== toolConstants_1.GREP_SEARCH) {
             return undefined;
         }
-        let messageIdToUpdate = toolUse.toolUseId;
-        const currentId = chatResultStream.getMessageIdToUpdateForTool(toolUse.name);
-        if (currentId) {
-            messageIdToUpdate = currentId;
-        }
-        else {
-            chatResultStream.setMessageIdToUpdateForTool(toolUse.name, messageIdToUpdate);
-        }
+        const messageIdToUpdate = toolUse.toolUseId;
         // Extract search results from the tool output
         const output = result.output.content;
         if (!output || !output.fileMatches || !Array.isArray(output.fileMatches)) {
@@ -2414,6 +2456,7 @@ class AgenticChatController {
         const metric = new metric_1.Metric({
             cwsprChatConversationType: 'Chat',
         });
+        IdleWorkspaceManager_1.IdleWorkspaceManager.recordActivityTimestamp();
         const triggerContext = await this.#getInlineChatTriggerContext(params);
         let response;
         let requestInput;