@aws/lsp-codewhisperer 0.0.62 → 0.0.63

package/CHANGELOG.md

@@ -1,5 +1,37 @@
 # Changelog
 
+## [0.0.63](https://github.com/aws/language-servers/compare/lsp-codewhisperer/v0.0.62...lsp-codewhisperer/v0.0.63) (2025-07-08)
+
+
+### Features
+
+* added file watchers to listen to mcp and persona config ([#1714](https://github.com/aws/language-servers/issues/1714)) ([4c5a7f8](https://github.com/aws/language-servers/commit/4c5a7f893bad37bea1946d37d06f57197c3ef04b))
+* adding streakLength back for UserTriggerDecisionEvent ([#1841](https://github.com/aws/language-servers/issues/1841)) ([7052132](https://github.com/aws/language-servers/commit/7052132a5198944ef05ddbf857d622ba518e71da))
+* **amazonq:** add transformation preferences functionality to input gen ([#1792](https://github.com/aws/language-servers/issues/1792)) ([095f737](https://github.com/aws/language-servers/commit/095f737b86e6234b2568c6d4deafbbb90967bdbc))
+* **amazonq:** update workspace context server A/B testing filter ([#1830](https://github.com/aws/language-servers/issues/1830)) ([faeeee3](https://github.com/aws/language-servers/commit/faeeee3da7a8712f3501055ba8d485528185cdb6))
+* **flags:** change flag name to enablewebformtransform([#1804](https://github.com/aws/language-servers/issues/1804)) ([3b6c3be](https://github.com/aws/language-servers/commit/3b6c3be7630248cd00c19c16637f016d799ef8d1))
+* passing partialResultToken to onInlineCompletionHandler result for EDITS ([#1840](https://github.com/aws/language-servers/issues/1840)) ([270d5a3](https://github.com/aws/language-servers/commit/270d5a3c5adba6b49d938f310ac89ae9b7fbc401))
+* support listAvailableModels server request ([#1808](https://github.com/aws/language-servers/issues/1808)) ([9f1ddb3](https://github.com/aws/language-servers/commit/9f1ddb327778dba6da49337b79c5fef19023b52d))
+
+
+### Bug Fixes
+
+* adding agenticcoding field to amazonqaddMessage metric([#1849](https://github.com/aws/language-servers/issues/1849)) ([d677c52](https://github.com/aws/language-servers/commit/d677c52c6139859bc0f2dd8e7ffe6a85b87db3f6))
+* adding files on VSC windows properly triggers reindexing ([#1820](https://github.com/aws/language-servers/issues/1820)) ([0c2d8eb](https://github.com/aws/language-servers/commit/0c2d8eb7dd875dfe86d1b2d094ec53a2a1221b97))
+* **amazonq:** allow taking .jpg file as image context, add image cont… ([#1814](https://github.com/aws/language-servers/issues/1814)) ([4d36fa4](https://github.com/aws/language-servers/commit/4d36fa4a0a04692dba720bc0288c6cee7f45a1fc))
+* **amazonq:** change the customer UI message to out of the workspace ([#1822](https://github.com/aws/language-servers/issues/1822)) ([624def5](https://github.com/aws/language-servers/commit/624def51e4d9e21ee8d045ffe528455b69cdfecb))
+* **amazonq:** change the image filter used in open file dialog ([#1838](https://github.com/aws/language-servers/issues/1838)) ([d9da4cb](https://github.com/aws/language-servers/commit/d9da4cbb7b1995ef43aaba1b7e67d26fd61a3c57))
+* **amazonq:** fix to add upper limit validation for tool description ([#1760](https://github.com/aws/language-servers/issues/1760)) ([2d18a3b](https://github.com/aws/language-servers/commit/2d18a3ba69d22b26dea5170656d79b9eacc202b1))
+* **amazonq:** fix typo in image context list ([#1836](https://github.com/aws/language-servers/issues/1836)) ([179b553](https://github.com/aws/language-servers/commit/179b553a1444201e696fd52e7705dc0c05154eab))
+* **amazonq:** handle undefined paths gracefully and retry ([#1825](https://github.com/aws/language-servers/issues/1825)) ([c52b017](https://github.com/aws/language-servers/commit/c52b017eef0666433cbb0b6d8086254dc1af5fee))
+* **amazonq:** include tsx and jsx files in workspace context server ([#1790](https://github.com/aws/language-servers/issues/1790)) ([79691ef](https://github.com/aws/language-servers/commit/79691ef607d9bc98032fe2e59a5031601a4dba9a))
+* **amazonq:** make workspace context server upload dependency chunks sequentially ([#1769](https://github.com/aws/language-servers/issues/1769)) ([c8329e6](https://github.com/aws/language-servers/commit/c8329e6b90be2c24d72a4525b8903384746de2ab))
+* **amazonq:** prevent WCS matching workspaceFolder with only prefix ([#1782](https://github.com/aws/language-servers/issues/1782)) ([988d952](https://github.com/aws/language-servers/commit/988d952485b0f026200a19d17cacd323cd9e359e))
+* **amazonq:** shouldn't exit inline  flow before we're sure there is no Edit/Completion trigger ([#1819](https://github.com/aws/language-servers/issues/1819)) ([dc8d89b](https://github.com/aws/language-servers/commit/dc8d89b39ee230aba6cfb032f81bda3476a5cc84))
+* imagecontext image name bug, mutliple images in pinned context ([#1834](https://github.com/aws/language-servers/issues/1834)) ([27d60ab](https://github.com/aws/language-servers/commit/27d60ab5f5249635a9e73be1ee96ecb820133f9a))
+* remove redundent thinking... for file operations ([#1839](https://github.com/aws/language-servers/issues/1839)) ([0078602](https://github.com/aws/language-servers/commit/00786023c9c257c9bb8066c36715864b32b4e069))
+* should always trigger EDIT suggestion if triggering via acceptance ([#1826](https://github.com/aws/language-servers/issues/1826)) ([6c9e522](https://github.com/aws/language-servers/commit/6c9e5225a58d7cf43931d84e7ae63275d6f9c066))
+
 ## [0.0.62](https://github.com/aws/language-servers/compare/lsp-codewhisperer/v0.0.61...lsp-codewhisperer/v0.0.62) (2025-07-02)
 
 

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

@@ -4,7 +4,7 @@
  */
 import { ToolUse } from '@amzn/codewhisperer-streaming';
 import { ChatCommandInput } from '../../shared/streamingClientService';
-import { Status, ButtonClickParams, ButtonClickResult, InlineChatResultParams, PromptInputOptionChangeParams, RuleClickParams, ListRulesParams, ActiveEditorChangedParams, PinnedContextParams, ExecuteCommandParams, FollowUpClickParams, OpenFileDialogParams, OpenFileDialogResult } from '@aws/language-server-runtimes/protocol';
+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';
 import { CancellationToken, Chat, ChatParams, ChatResult, EndChatParams, QuickActionParams, ResponseError, TabAddParams, TabRemoveParams, TabChangeParams, InlineChatResult } from '@aws/language-server-runtimes/server-interface';
 import { Features, LspHandlers } from '../types';
@@ -16,7 +16,7 @@ import { ChatSessionService } from '../chat/chatSessionService';
 import { AgenticChatResultStream } from './agenticChatResultStream';
 import { AdditionalContentEntryAddition } from './context/agenticChatTriggerContext';
 import { PaidTierMode } from '../paidTier/paidTier';
-type ChatHandlers = Omit<LspHandlers<Chat>, 'openTab' | 'sendChatUpdate' | 'sendContextCommands' | 'onListConversations' | 'onConversationClick' | 'onListMcpServers' | 'onMcpServerClick' | 'onTabBarAction' | 'getSerializedChat' | 'chatOptionsUpdate' | 'onListMcpServers' | 'onMcpServerClick' | 'onListRules' | 'sendPinnedContext' | 'onActiveEditorChanged' | 'onPinnedContextAdd' | 'onPinnedContextRemove' | 'onOpenFileDialog' | 'onListAvailableModels'>;
+type ChatHandlers = Omit<LspHandlers<Chat>, 'openTab' | 'sendChatUpdate' | 'sendContextCommands' | 'onListConversations' | 'onConversationClick' | 'onListMcpServers' | 'onMcpServerClick' | 'onTabBarAction' | 'getSerializedChat' | 'chatOptionsUpdate' | 'onListRules' | 'sendPinnedContext' | 'onActiveEditorChanged' | 'onPinnedContextAdd' | 'onPinnedContextRemove' | 'onOpenFileDialog' | 'onListAvailableModels'>;
 export declare class AgenticChatController implements ChatHandlers {
     #private;
     constructor(chatSessionManagementService: ChatSessionManagementService, features: Features, telemetryService: TelemetryService, serviceManager?: AmazonQBaseServiceManager);
@@ -42,6 +42,7 @@ export declare class AgenticChatController implements ChatHandlers {
         list: import("@aws/language-server-runtimes/protocol").DetailedListGroup[];
     }>;
     onMcpServerClick(params: McpServerClickParams): Promise<any>;
+    onListAvailableModels(params: ListAvailableModelsParams): Promise<ListAvailableModelsResult>;
     onChatPrompt(params: ChatParams, token: CancellationToken): Promise<ChatResult | ResponseError<ChatResult>>;
     truncatePinnedContext(remainingCharacterBudget: number, pinnedContext?: AdditionalContentEntryAddition[]): number;
     /**

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

@@ -38,12 +38,13 @@ const listDirectory_1 = require("./tools/listDirectory");
 const fsWrite_1 = require("./tools/fsWrite");
 const executeBash_1 = require("./tools/executeBash");
 const toolShared_1 = require("./tools/toolShared");
+const pathValidation_1 = require("./utils/pathValidation");
 const grepSearch_1 = require("./tools/grepSearch");
 const fileSearch_1 = require("./tools/fileSearch");
 const fsReplace_1 = require("./tools/fsReplace");
 const lsp_core_2 = require("@aws/lsp-core");
 const diff_1 = require("diff");
-const constants_2 = require("./constants");
+const constants_2 = require("./constants/constants");
 const errors_2 = require("./errors");
 const vscode_uri_1 = require("vscode-uri");
 const executeBash_2 = require("./tools/executeBash");
@@ -54,8 +55,10 @@ const mcpManager_1 = require("./tools/mcp/mcpManager");
 const mcpTool_1 = require("./tools/mcp/mcpTool");
 const paidTier_1 = require("../paidTier/paidTier");
 const util_1 = require("./tools/chatDb/util");
+const modelSelection_1 = require("./constants/modelSelection");
 const imageVerification_1 = require("../../shared/imageVerification");
 const path_1 = require("@aws/lsp-core/out/util/path");
+const agenticChatControllerHelper_1 = require("./utils/agenticChatControllerHelper");
 class AgenticChatController {
     #features;
     #chatSessionManagementService;
@@ -267,7 +270,7 @@ class AgenticChatController {
         if (params.fileType === 'image') {
             // 1. Prompt user for file selection
             const supportedExtensions = imageVerification_1.DEFAULT_IMAGE_VERIFICATION_OPTIONS.supportedExtensions;
-            const filters = { 'Image Files': supportedExtensions.map(ext => `*.${ext}`) };
+            const filters = { 'Image Files': supportedExtensions };
             const result = await this.#features.lsp.window.showOpenDialog({
                 canSelectFiles: true,
                 canSelectFolders: false,
@@ -287,7 +290,7 @@ class AgenticChatController {
             let errorMessage;
             for (const filePath of result.uris) {
                 // Extract filename from the URI for error messages
-                const fileName = filePath.split('/').pop() || '';
+                const fileName = path.basename(filePath) || '';
                 const sanitizedPath = (0, path_1.sanitize)(filePath);
                 // Get file size and content for verification
                 const size = await this.#features.workspace.fs.getFileSize(sanitizedPath);
@@ -363,6 +366,7 @@ class AgenticChatController {
         this.#chatHistoryDb.close();
         this.#contextCommandsProvider?.dispose();
         this.#userWrittenCodeTracker?.dispose();
+        this.#mcpEventHandler.dispose();
     }
     async onListConversations(params) {
         return this.#tabBarController.onListConversations(params);
@@ -382,6 +386,28 @@ class AgenticChatController {
     async onMcpServerClick(params) {
         return this.#mcpEventHandler.onMcpServerClick(params);
     }
+    async onListAvailableModels(params) {
+        const region = AmazonQTokenServiceManager_1.AmazonQTokenServiceManager.getInstance().getRegion();
+        const models = region && modelSelection_1.MODEL_OPTIONS_FOR_REGION[region] ? modelSelection_1.MODEL_OPTIONS_FOR_REGION[region] : modelSelection_1.MODEL_OPTIONS;
+        const sessionResult = this.#chatSessionManagementService.getSession(params.tabId);
+        const { data: session, success } = sessionResult;
+        if (!success) {
+            return {
+                tabId: params.tabId,
+                models: models,
+            };
+        }
+        const savedModelId = this.#chatHistoryDb.getModelId();
+        const selectedModelId = savedModelId && models.some(model => model.id === savedModelId)
+            ? savedModelId
+            : (0, agenticChatControllerHelper_1.getLatestAvailableModel)(region).id;
+        session.modelId = selectedModelId;
+        return {
+            tabId: params.tabId,
+            models: models,
+            selectedModelId: selectedModelId,
+        };
+    }
     async #sendProgressToClient(chunk, partialResultToken) {
         if (!(0, utils_2.isNullish)(partialResultToken)) {
             await this.#features.lsp.sendProgress(protocol_1.chatRequestType, partialResultToken, chunk);
@@ -433,6 +459,9 @@ class AgenticChatController {
                 await chatResultStream.updateOngoingProgressResult('Canceled');
                 // Finally, send telemetry/metrics
                 this.#telemetryController.emitInteractWithAgenticChat('StopChat', params.tabId, session.pairProgrammingMode, session.getConversationType());
+                metric.setDimension('languageServerVersion', this.#features.runtime.serverInfo.version);
+                metric.setDimension('codewhispererCustomizationArn', this.#customizationArn);
+                metric.setDimension('enabled', session.pairProgrammingMode);
                 await this.#telemetryController.emitAddMessageMetric(params.tabId, metric.metric, 'Cancelled');
             });
             session.setConversationType('AgenticChat');
@@ -455,6 +484,8 @@ class AgenticChatController {
             const contextItems = [...additionalContext, ...activeFile];
             triggerContext.documentReference = this.#additionalContextProvider.getFileListFromContext(contextItems);
             const customContext = await this.#additionalContextProvider.getImageBlocksFromContext(params.context, params.tabId);
+            // Add image context to triggerContext.documentReference for transparency
+            await this.#additionalContextProvider.appendCustomContextToTriggerContext(triggerContext, params.context, params.tabId);
             // Get the initial request input
             const initialRequestInput = await this.#prepareRequestInput(params, session, triggerContext, additionalContext, chatResultStream, customContext);
             // Generate a unique ID for this prompt
@@ -593,7 +624,7 @@ class AgenticChatController {
             this.#debug(`LLM Response Latency: ${llmLatency}`);
             // This is needed to handle the case where the response stream times out
             // and we want to auto-retry
-            if (!result.success && result.error.startsWith(constants_2.responseTimeoutPartialMsg)) {
+            if (!result.success && result.error.startsWith(constants_2.RESPONSE_TIMEOUT_PARTIAL_MSG)) {
                 const content = 'You took too long to respond - try to split up the work into smaller steps. Do not apologize.';
                 if (this.#isPromptCanceled(token, session, promptId)) {
                     // Only skip adding message to the history DB, continue executing to avoid unexpected stop for the conversation
@@ -648,7 +679,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 ?? '', llmLatency, this.#toolCallLatencies, this.#timeToFirstChunk, this.#timeBetweenChunks, session.pairProgrammingMode);
+                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);
                 finalResult = result;
                 break;
             }
@@ -669,7 +700,7 @@ class AgenticChatController {
                 metric.setDimension('requestIds', metric.metric.requestIds);
                 const toolNames = this.#toolUseLatencies.map(item => item.toolName);
                 const toolUseIds = this.#toolUseLatencies.map(item => item.toolUseId);
-                this.#telemetryController.emitAgencticLoop_InvokeLLM(response.$metadata.requestId, conversationId, 'AgenticChatWithToolUse', toolNames ?? undefined, toolUseIds ?? undefined, 'Succeeded', this.#features.runtime.serverInfo.version ?? '', llmLatency, this.#toolCallLatencies, this.#timeToFirstChunk, this.#timeBetweenChunks, session.pairProgrammingMode);
+                this.#telemetryController.emitAgencticLoop_InvokeLLM(response.$metadata.requestId, conversationId, 'AgenticChatWithToolUse', toolNames ?? undefined, toolUseIds ?? undefined, 'Succeeded', this.#features.runtime.serverInfo.version ?? '', session.modelId, llmLatency, this.#toolCallLatencies, this.#timeToFirstChunk, this.#timeBetweenChunks, session.pairProgrammingMode);
             }
             else {
                 // Send an error card to UI?
@@ -678,7 +709,7 @@ class AgenticChatController {
                     status: codewhisperer_streaming_1.ToolResultStatus.ERROR,
                     content: [{ text: result.error }],
                 }));
-                this.#telemetryController.emitAgencticLoop_InvokeLLM(response.$metadata.requestId, conversationId, 'AgenticChatWithToolUse', undefined, undefined, 'Failed', this.#features.runtime.serverInfo.version ?? '', llmLatency, this.#toolCallLatencies, this.#timeToFirstChunk, this.#timeBetweenChunks, session.pairProgrammingMode);
+                this.#telemetryController.emitAgencticLoop_InvokeLLM(response.$metadata.requestId, conversationId, 'AgenticChatWithToolUse', undefined, undefined, 'Failed', this.#features.runtime.serverInfo.version ?? '', session.modelId, llmLatency, this.#toolCallLatencies, this.#timeToFirstChunk, this.#timeBetweenChunks, session.pairProgrammingMode);
                 if (result.error.startsWith('ToolUse input is invalid JSON:')) {
                     content =
                         'Your toolUse input is incomplete, try again. If the error happens consistently, break this task down into multiple tool uses with smaller input. Do not apologize.';
@@ -724,7 +755,7 @@ class AgenticChatController {
      */
     truncateRequest(request, pinnedContext) {
         // TODO: Confirm if this limit applies to SendMessage and rename this constant
-        let remainingCharacterBudget = constants_2.generateAssistantResponseInputLimit;
+        let remainingCharacterBudget = constants_2.GENERATE_ASSISTANT_RESPONSE_INPUT_LIMIT;
         if (!request?.conversationState?.currentMessage?.userInputMessage) {
             return remainingCharacterBudget;
         }
@@ -732,9 +763,9 @@ class AgenticChatController {
         // 1. prioritize user input message
         let truncatedUserInputMessage = '';
         if (message) {
-            if (message.length > constants_2.generateAssistantResponseInputLimit) {
-                this.#debug(`Truncating userInputMessage to ${constants_2.generateAssistantResponseInputLimit} characters}`);
-                truncatedUserInputMessage = message.substring(0, constants_2.generateAssistantResponseInputLimit);
+            if (message.length > constants_2.GENERATE_ASSISTANT_RESPONSE_INPUT_LIMIT) {
+                this.#debug(`Truncating userInputMessage to ${constants_2.GENERATE_ASSISTANT_RESPONSE_INPUT_LIMIT} characters}`);
+                truncatedUserInputMessage = message.substring(0, constants_2.GENERATE_ASSISTANT_RESPONSE_INPUT_LIMIT);
                 remainingCharacterBudget = remainingCharacterBudget - truncatedUserInputMessage.length;
                 request.conversationState.currentMessage.userInputMessage.content = truncatedUserInputMessage;
             }
@@ -1135,7 +1166,7 @@ class AgenticChatController {
     #shouldSendBackErrorContent(toolResult) {
         if (toolResult.status === codewhisperer_streaming_1.ToolResultStatus.ERROR) {
             for (const content of toolResult.content ?? []) {
-                if (content.json && JSON.stringify(content.json).includes(constants_2.outputLimitExceedsPartialMsg)) {
+                if (content.json && JSON.stringify(content.json).includes(constants_2.OUTPUT_LIMIT_EXCEEDS_PARTIAL_MSG)) {
                     // do not send the content response back for this case to avoid unnecessary messages
                     return false;
                 }
@@ -1230,7 +1261,7 @@ class AgenticChatController {
         }
         if ((result.text && result.text.length > maxToolResponseSize) ||
             (result.json && JSON.stringify(result.json).length > maxToolResponseSize)) {
-            throw Error(`${toolUse.name} ${constants_2.outputLimitExceedsPartialMsg} ${maxToolResponseSize}`);
+            throw Error(`${toolUse.name} ${constants_2.OUTPUT_LIMIT_EXCEEDS_PARTIAL_MSG} ${maxToolResponseSize}`);
         }
     }
     /**
@@ -1463,9 +1494,11 @@ class AgenticChatController {
                 body = '```shell\n' + commandString;
                 break;
             }
-            case 'fsReplace':
             case 'fsWrite': {
                 const writeFilePath = toolUse.input.path;
+                // Validate the path using our synchronous utility
+                (0, pathValidation_1.validatePathBasic)(writeFilePath);
+                this.#debug(`Processing ${toolUse.name} for path: ${writeFilePath}`);
                 buttons = [{ id: 'allow-tools', text: 'Allow', icon: 'ok', status: 'clear' }];
                 header = {
                     icon: 'warning',
@@ -1477,7 +1510,26 @@ class AgenticChatController {
                 };
                 body = builtInPermission
                     ? `I need permission to modify files.\n\`${writeFilePath}\``
-                    : `I need permission to modify files in your workspace.\n\`${writeFilePath}\``;
+                    : `I need permission to modify files outside of your workspace.\n\`${writeFilePath}\``;
+                break;
+            }
+            case 'fsReplace': {
+                const writeFilePath = toolUse.input.path;
+                // For replace, we need to verify the file exists
+                (0, pathValidation_1.validatePathExists)(writeFilePath);
+                this.#debug(`Processing ${toolUse.name} for path: ${writeFilePath}`);
+                buttons = [{ id: 'allow-tools', text: 'Allow', icon: 'ok', status: 'clear' }];
+                header = {
+                    icon: 'warning',
+                    iconForegroundStatus: 'warning',
+                    body: builtInPermission
+                        ? '#### Allow file modification'
+                        : '#### Allow file modification outside of your workspace',
+                    buttons,
+                };
+                body = builtInPermission
+                    ? `I need permission to modify files.\n\`${writeFilePath}\``
+                    : `I need permission to modify files outside of your workspace.\n\`${writeFilePath}\``;
                 break;
             }
             case 'fsRead':
@@ -1493,6 +1545,9 @@ class AgenticChatController {
                 };
                 if (toolName === 'fsRead') {
                     const paths = toolUse.input.paths;
+                    // Validate paths using our synchronous utility
+                    (0, pathValidation_1.validatePaths)(paths);
+                    this.#debug(`Processing ${toolUse.name} for paths: ${JSON.stringify(paths)}`);
                     const formattedPaths = [];
                     paths.forEach(element => formattedPaths.push(`\`${element}\``));
                     body = builtInPermission
@@ -1501,6 +1556,9 @@ class AgenticChatController {
                 }
                 else {
                     const readFilePath = toolUse.input.path;
+                    // Validate the path using our synchronous utility
+                    (0, pathValidation_1.validatePathExists)(readFilePath);
+                    this.#debug(`Processing ${toolUse.name} for path: ${readFilePath}`);
                     body = builtInPermission
                         ? `I need permission to list directories.\n\`${readFilePath}\``
                         : `I need permission to list directories outside the workspace.\n\`${readFilePath}\``;
@@ -1811,6 +1869,8 @@ class AgenticChatController {
         const requestID = (0, utils_2.getRequestID)(err) ?? '';
         metric.setDimension('cwsprChatResponseCode', (0, utils_2.getHttpStatusCode)(err) ?? 0);
         metric.setDimension('languageServerVersion', this.#features.runtime.serverInfo.version);
+        metric.setDimension('codewhispererCustomizationArn', this.#customizationArn);
+        metric.setDimension('enabled', agenticCodingMode);
         metric.metric.requestIds = [requestID];
         metric.metric.cwsprChatMessageId = errorMessageId;
         metric.metric.cwsprChatConversationId = conversationId;
@@ -1841,7 +1901,7 @@ class AgenticChatController {
             this.#telemetryController.emitMessageResponseError(tabId, metric.metric, requestID, customErrMessage, agenticCodingMode);
         }
         else {
-            this.#telemetryController.emitMessageResponseError(tabId, metric.metric, requestID, errorMessage ?? constants_2.genericErrorMsg, agenticCodingMode);
+            this.#telemetryController.emitMessageResponseError(tabId, metric.metric, requestID, errorMessage ?? constants_2.GENERIC_ERROR_MS, agenticCodingMode);
         }
         let authFollowType = undefined;
         // first check if there is an AmazonQ related auth follow up
@@ -1907,7 +1967,7 @@ class AgenticChatController {
         this.#features.logging.error(`Unknown Error: ${lsp_core_2.loggingUtils.formatErr(err)}`);
         return new server_interface_1.ResponseError(server_interface_1.LSPErrorCodes.RequestFailed, err.message, {
             type: 'answer',
-            body: requestID ? `${constants_2.genericErrorMsg} \n\nRequest ID: ${requestID}` : constants_2.genericErrorMsg,
+            body: requestID ? `${constants_2.GENERIC_ERROR_MS} \n\nRequest ID: ${requestID}` : constants_2.GENERIC_ERROR_MS,
             messageId: errorMessageId,
             buttons: [],
         });
@@ -2099,11 +2159,13 @@ class AgenticChatController {
         });
     }
     onSourceLinkClick() { }
-    onTabAdd(params) {
-        this.#telemetryController.activeTabId = params.tabId;
+    /**
+     * @deprecated use aws/chat/listAvailableModels server request instead
+     */
+    #legacySetModelId(tabId, session) {
         // Since model selection is mandatory, the only time modelId is not set is when the chat history is empty.
         // In that case, we use the default modelId.
-        let modelId = this.#chatHistoryDb.getModelId() ?? constants_2.defaultModelId;
+        let modelId = this.#chatHistoryDb.getModelId() ?? constants_2.DEFAULT_MODEL_ID;
         const region = AmazonQTokenServiceManager_1.AmazonQTokenServiceManager.getInstance().getRegion();
         if (region === 'eu-central-1') {
             // Only 3.7 Sonnet is available in eu-central-1 for now
@@ -2111,7 +2173,11 @@ class AgenticChatController {
             // @ts-ignore
             this.#features.chat.chatOptionsUpdate({ region });
         }
-        this.#features.chat.chatOptionsUpdate({ modelId: modelId, tabId: params.tabId });
+        this.#features.chat.chatOptionsUpdate({ modelId: modelId, tabId: tabId });
+        session.modelId = modelId;
+    }
+    onTabAdd(params) {
+        this.#telemetryController.activeTabId = params.tabId;
         if (!params.restoredTab) {
             this.sendPinnedContext(params.tabId);
         }
@@ -2120,7 +2186,7 @@ class AgenticChatController {
         if (!success) {
             return new server_interface_1.ResponseError(protocol_2.ErrorCodes.InternalError, sessionResult.error);
         }
-        session.modelId = modelId;
+        this.#legacySetModelId(params.tabId, session);
         // Get the saved pair programming mode from the database or default to true if not found
         const savedPairProgrammingMode = this.#chatHistoryDb.getPairProgrammingMode();
         session.pairProgrammingMode = savedPairProgrammingMode !== undefined ? savedPairProgrammingMode : true;
@@ -2486,8 +2552,8 @@ class AgenticChatController {
         const timeoutPromise = new Promise((_, reject) => {
             timeoutId = setTimeout(() => {
                 abortController.abort();
-                reject(new errors_2.AgenticChatError(`${constants_2.responseTimeoutPartialMsg} ${constants_2.responseTimeoutMs}ms`, 'ResponseProcessingTimeout'));
-            }, constants_2.responseTimeoutMs);
+                reject(new errors_2.AgenticChatError(`${constants_2.RESPONSE_TIMEOUT_PARTIAL_MSG} ${constants_2.RESPONSE_TIMEOUT_MS}ms`, 'ResponseProcessingTimeout'));
+            }, constants_2.RESPONSE_TIMEOUT_MS);
         });
         const streamWriter = chatResultStream.getResultStreamWriter();
         const processResponsePromise = this.#processAgenticChatResponse(response, metric, chatResultStream, streamWriter, session, contextList, abortController.signal);
@@ -2622,6 +2688,10 @@ class AgenticChatController {
      * nothing is happening.
      */
     async #showLoadingIfRequired(toolUseEvent, streamWriter, toolUseStartTimes, toolUseLoadingTimeouts) {
+        const canWrite = new Set(this.#features.agent.getBuiltInWriteToolNames());
+        if (toolUseEvent.name && canWrite.has(toolUseEvent.name)) {
+            return;
+        }
         const toolUseId = toolUseEvent.toolUseId;
         if (!toolUseEvent.stop && toolUseId) {
             if (!toolUseStartTimes[toolUseId]) {
@@ -2632,9 +2702,9 @@ class AgenticChatController {
                 }
                 this.#debug(`ToolUseEvent ${toolUseId} started`);
                 toolUseLoadingTimeouts[toolUseId] = setTimeout(async () => {
-                    this.#debug(`ToolUseEvent ${toolUseId} is taking longer than ${constants_2.loadingThresholdMs}ms, showing loading indicator`);
+                    this.#debug(`ToolUseEvent ${toolUseId} is taking longer than ${constants_2.LOADING_THRESHOLD_MS}ms, showing loading indicator`);
                     await streamWriter.write({ ...constants_1.loadingMessage, messageId: `loading-${toolUseId}` });
-                }, constants_2.loadingThresholdMs);
+                }, constants_2.LOADING_THRESHOLD_MS);
             }
         }
         else if (toolUseEvent.stop && toolUseId) {