@aws/lsp-codewhisperer 0.0.75 → 0.0.77

package/CHANGELOG.md

@@ -1,5 +1,60 @@
 # Changelog
 
+## [0.0.77](https://github.com/aws/language-servers/compare/lsp-codewhisperer/v0.0.76...lsp-codewhisperer/v0.0.77) (2025-09-02)
+
+
+### Features
+
+* passing suggestionTypes and pluginVersion/lspVersion to STE ([#2180](https://github.com/aws/language-servers/issues/2180)) ([66742ad](https://github.com/aws/language-servers/commit/66742adfc44f33efbd8dd33b803000e08241e5ce))
+
+
+### Bug Fixes
+
+* auto trigger should only respect previous decisions in the past 2mins ([#2189](https://github.com/aws/language-servers/issues/2189)) ([852b21b](https://github.com/aws/language-servers/commit/852b21b66f793102c52e35c2baec07a772e5134a))
+* compact UI is not updated correctly when multiple nudges are displayed ([#2192](https://github.com/aws/language-servers/issues/2192)) ([ef7d793](https://github.com/aws/language-servers/commit/ef7d7931954f5083e4a5c358e67c6dc652fa1a40))
+* emit acceptedLineCount metric and AgenticCodeAccepted interaction type ([#2167](https://github.com/aws/language-servers/issues/2167)) ([c53f672](https://github.com/aws/language-servers/commit/c53f672b6173ebda530917ccb4e0c2f26f5c8f79))
+* emit errorMessage in addMessage ([#2197](https://github.com/aws/language-servers/issues/2197)) ([58f2064](https://github.com/aws/language-servers/commit/58f20649d345f159080006120e23cde559826df1))
+* fix calculation for num-lines contributed by the LLM ([#2191](https://github.com/aws/language-servers/issues/2191)) ([fd71e6c](https://github.com/aws/language-servers/commit/fd71e6cf3fc843242936564061061418edf83f56))
+* should send classifier score after taking sigmoid ([#2188](https://github.com/aws/language-servers/issues/2188)) ([f4e2e6e](https://github.com/aws/language-servers/commit/f4e2e6e885e665834a5d7b7cbb5f4ba4ff9bbb65))
+
+
+### Performance Improvements
+
+* only process edit requests 1 at a time ([#2187](https://github.com/aws/language-servers/issues/2187)) ([b497540](https://github.com/aws/language-servers/commit/b4975409a3ed518550290b72ac310895a293be4b))
+
+
+### Reverts
+
+* PR 2172 dedupe openTabs supplemental contexts ([#2194](https://github.com/aws/language-servers/issues/2194)) ([94723d4](https://github.com/aws/language-servers/commit/94723d46073a1ea8211e7ae8f9dfce3fcb809604))
+
+## [0.0.76](https://github.com/aws/language-servers/compare/lsp-codewhisperer/v0.0.75...lsp-codewhisperer/v0.0.76) (2025-08-27)
+
+
+### Features
+
+* add basic OAuth client for remote MCP ([#2136](https://github.com/aws/language-servers/issues/2136)) ([2fb896e](https://github.com/aws/language-servers/commit/2fb896e094de0bc5a1b4881067e7dcceb3826015))
+* **amazonq:** emit metric for each issue ([#2179](https://github.com/aws/language-servers/issues/2179)) ([5a3f481](https://github.com/aws/language-servers/commit/5a3f481ebe8c6033e3833abcd81799d26c2aa03e))
+* Auto fetch models from listAvailableModels API ([#2171](https://github.com/aws/language-servers/issues/2171)) ([8600c52](https://github.com/aws/language-servers/commit/8600c524877abb459e9338399352446c0dcff6f0))
+* disable pkce flow during plugin load ([#2153](https://github.com/aws/language-servers/issues/2153)) ([71b3595](https://github.com/aws/language-servers/commit/71b35952333e7581921644ce40fabbc1e6d3c02f))
+* update MCP manager and utilities ([#2158](https://github.com/aws/language-servers/issues/2158)) ([b99df82](https://github.com/aws/language-servers/commit/b99df82826d0ba1a1d52df578cb80674c90505b9))
+
+
+### Bug Fixes
+
+* adding streakTracker to track streakLength across Completions and Edits ([#2147](https://github.com/aws/language-servers/issues/2147)) ([a6c64f2](https://github.com/aws/language-servers/commit/a6c64f2995a17697e3d71d30a1f411f5cf0db279))
+* **amazonq:** dedupe openTabs supplemental contexts ([#2172](https://github.com/aws/language-servers/issues/2172)) ([aa87ae2](https://github.com/aws/language-servers/commit/aa87ae2bd95edc1f38bf90f56093c5bf5ff18c53))
+* **amazonq:** fix for mcp servers operations to edit server config only ([#2165](https://github.com/aws/language-servers/issues/2165)) ([d28df09](https://github.com/aws/language-servers/commit/d28df09ae41871430cd53064eac1f3050c95ea84))
+* **amazonq:** fix to add mcp server tool error handling and status for card ([#2176](https://github.com/aws/language-servers/issues/2176)) ([23f5ec3](https://github.com/aws/language-servers/commit/23f5ec343cb4e0de32926204dbcf99e51af829f9))
+* **amazonq:** status message update for mcp tool permission accpetance ([#2178](https://github.com/aws/language-servers/issues/2178)) ([4893344](https://github.com/aws/language-servers/commit/489334466fa084774d6e4737569468d654dc6359))
+* fix pkce windows url path ([#2173](https://github.com/aws/language-servers/issues/2173)) ([d7b184c](https://github.com/aws/language-servers/commit/d7b184cb12979877722fa0293e9aebec91ff2c18))
+* multiple fixes on auth flow edge cases ([#2155](https://github.com/aws/language-servers/issues/2155)) ([472220a](https://github.com/aws/language-servers/commit/472220a745cff4fe91a2cabae4ae059a164ceddd))
+* reduce auto trigger frequency for VSC ([#2168](https://github.com/aws/language-servers/issues/2168)) ([00e11ff](https://github.com/aws/language-servers/commit/00e11ff48eafaa0baec48177fa4aa6d60048af2f))
+
+
+### Reverts
+
+* reduce auto trigger frequency for VSC ([#2168](https://github.com/aws/language-servers/issues/2168))" ([#2177](https://github.com/aws/language-servers/issues/2177)) ([08720c6](https://github.com/aws/language-servers/commit/08720c6c3fa83f9b3b6775d4ae4d848ce145b94b))
+
 ## [0.0.75](https://github.com/aws/language-servers/compare/lsp-codewhisperer/v0.0.74...lsp-codewhisperer/v0.0.75) (2025-08-21)
 
 

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

@@ -1890,6 +1890,10 @@
             "type": "string",
             "enum": ["BLOCK", "LINE"]
         },
+        "SuggestionType": {
+            "type": "string",
+            "enum": ["COMPLETIONS", "EDITS"]
+        },
         "Completions": {
             "type": "list",
             "member": {
@@ -3622,6 +3626,10 @@
                     "shape": "Models",
                     "documentation": "<p>List of available models</p>"
                 },
+                "defaultModel": {
+                    "shape": "Model",
+                    "documentation": "<p>Default model set by the client</p>"
+                },
                 "nextToken": {
                     "shape": "Base64EncodedPaginationToken",
                     "documentation": "<p>Token for retrieving the next page of results</p>"
@@ -3955,6 +3963,10 @@
                     "shape": "ModelId",
                     "documentation": "<p>Unique identifier for the model</p>"
                 },
+                "modelName": {
+                    "shape": "ModelName",
+                    "documentation": "<p>User-facing display name</p>"
+                },
                 "description": {
                     "shape": "Description",
                     "documentation": "<p>Description of the model</p>"
@@ -3972,6 +3984,13 @@
             "min": 1,
             "pattern": "[a-zA-Z0-9_:.-]+"
         },
+        "ModelName": {
+            "type": "string",
+            "documentation": "<p>Identifier for the model Name</p>",
+            "max": 1024,
+            "min": 1,
+            "pattern": "[a-zA-Z0-9-_.]+"
+        },
         "ModelMetadata": {
             "type": "structure",
             "members": {
@@ -6284,6 +6303,12 @@
                 },
                 "ideVersion": {
                     "shape": "String"
+                },
+                "pluginVersion": {
+                    "shape": "String"
+                },
+                "lspVersion": {
+                    "shape": "String"
                 }
             }
         },
@@ -6525,6 +6550,9 @@
                 },
                 "streakLength": {
                     "shape": "UserTriggerDecisionEventStreakLengthInteger"
+                },
+                "suggestionType": {
+                    "shape": "SuggestionType"
                 }
             }
         },

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

@@ -4,8 +4,7 @@
  */
 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';
+import { Status, ButtonClickParams, ButtonClickResult, InlineChatResultParams, PromptInputOptionChangeParams, RuleClickParams, ListRulesParams, ActiveEditorChangedParams, PinnedContextParams, ExecuteCommandParams, FollowUpClickParams, ListAvailableModelsParams, ListAvailableModelsResult, OpenFileDialogParams, OpenFileDialogResult, 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';
 import { ChatSessionManagementService } from '../chat/chatSessionManagementService';
@@ -54,6 +53,18 @@ export declare class AgenticChatController implements ChatHandlers {
         list: import("@aws/language-server-runtimes/protocol").DetailedListGroup[];
     }>;
     onMcpServerClick(params: McpServerClickParams): Promise<any>;
+    /**
+     * This function handles the model selection process for the chat interface.
+     * It first attempts to retrieve models from cache or API, then determines the appropriate model to select
+     * based on the following priority:
+     * 1. When errors occur or session is invalid: Use the default model as a fallback
+     * 2. When user has previously selected a model: Use that model (or its mapped version if the model ID has changed)
+     * 3. When there's a default model from the API: Use the server-recommended default model
+     * 4. Last resort: Use the newest model defined in modelSelection constants
+     *
+     * This ensures users maintain consistent model selection across sessions while also handling
+     * API failures and model ID migrations gracefully.
+     */
     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

@@ -11,7 +11,6 @@ const os = require("os");
 const codewhisperer_streaming_1 = require("@amzn/codewhisperer-streaming");
 const toolConstants_1 = require("./constants/toolConstants");
 const protocol_1 = require("@aws/language-server-runtimes/protocol");
-const protocol_2 = require("@aws/language-server-runtimes/protocol");
 const server_interface_1 = require("@aws/language-server-runtimes/server-interface");
 const uuid_1 = require("uuid");
 const types_1 = require("../../shared/telemetry/types");
@@ -41,6 +40,7 @@ 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 fileModificationMetrics_1 = require("./utils/fileModificationMetrics");
 const grepSearch_1 = require("./tools/grepSearch");
 const fileSearch_1 = require("./tools/fileSearch");
 const fsReplace_1 = require("./tools/fsReplace");
@@ -62,9 +62,9 @@ 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");
 const activeUserTracker_1 = require("../../shared/activeUserTracker");
 const displayFindings_1 = require("./tools/qCodeAnalysis/displayFindings");
+const constants_3 = require("../../shared/constants");
 const IdleWorkspaceManager_1 = require("../workspaceContext/IdleWorkspaceManager");
 class AgenticChatController {
     #features;
@@ -145,7 +145,7 @@ class AgenticChatController {
             // @ts-ignore
             this.#features.chat.chatOptionsUpdate({ region });
         });
-        this.#chatHistoryDb = new chatDb_1.ChatDatabase(features);
+        this.#chatHistoryDb = chatDb_1.ChatDatabase.getInstance(features);
         this.#tabBarController = new tabBarController_1.TabBarController(features, this.#chatHistoryDb, telemetryService, (tabId) => this.sendPinnedContext(tabId));
         this.#additionalContextProvider = new additionalContextProvider_1.AdditionalContextProvider(features, this.#chatHistoryDb);
         this.#contextCommandsProvider = new contextCommandsProvider_1.ContextCommandsProvider(this.#features.logging, this.#features.chat, this.#features.workspace, this.#features.lsp);
@@ -431,21 +431,116 @@ class AgenticChatController {
     async onMcpServerClick(params) {
         return this.#mcpEventHandler.onMcpServerClick(params);
     }
+    /**
+     * Fetches available models either from cache or API
+     * If cache is valid (less than 5 minutes old), returns cached models
+     * If cache is invalid or empty, makes an API call and stores results in cache
+     * If the API throws errors (e.g., throttling), falls back to default models
+     */
+    async #fetchModelsWithCache() {
+        let models = [];
+        let defaultModelId;
+        let errorFromAPI = false;
+        // Check if cache is valid (less than 5 minutes old)
+        if (this.#chatHistoryDb.isCachedModelsValid()) {
+            const cachedData = this.#chatHistoryDb.getCachedModels();
+            if (cachedData && cachedData.models && cachedData.models.length > 0) {
+                this.#log('Using cached models, last updated at:', new Date(cachedData.timestamp).toISOString());
+                return {
+                    models: cachedData.models,
+                    defaultModelId: cachedData.defaultModelId,
+                    errorFromAPI: false,
+                };
+            }
+        }
+        // If cache is invalid or empty, make an API call
+        this.#log('Cache miss or expired, fetching models from API');
+        try {
+            const client = AmazonQTokenServiceManager_1.AmazonQTokenServiceManager.getInstance().getCodewhispererService();
+            const responseResult = await client.listAvailableModels({
+                origin: constants_3.IDE,
+                profileArn: AmazonQTokenServiceManager_1.AmazonQTokenServiceManager.getInstance().getConnectionType()
+                    ? AmazonQTokenServiceManager_1.AmazonQTokenServiceManager.getInstance().getActiveProfileArn()
+                    : undefined,
+            });
+            // Wait for the response to be completed before proceeding
+            this.#log('Model Response: ', JSON.stringify(responseResult, null, 2));
+            models = Object.values(responseResult.models).map(({ modelId, modelName }) => ({
+                id: modelId,
+                name: modelName ?? modelId,
+            }));
+            defaultModelId = responseResult.defaultModel?.modelId;
+            // Cache the models with defaultModelId
+            this.#chatHistoryDb.setCachedModels(models, defaultModelId);
+        }
+        catch (err) {
+            // In case of API throttling or other errors, fall back to hardcoded models
+            this.#log('Error fetching models from API, using fallback models:', (0, utils_2.fmtError)(err));
+            errorFromAPI = true;
+            models = modelSelection_1.FALLBACK_MODEL_OPTIONS;
+        }
+        return {
+            models,
+            defaultModelId,
+            errorFromAPI,
+        };
+    }
+    /**
+     * This function handles the model selection process for the chat interface.
+     * It first attempts to retrieve models from cache or API, then determines the appropriate model to select
+     * based on the following priority:
+     * 1. When errors occur or session is invalid: Use the default model as a fallback
+     * 2. When user has previously selected a model: Use that model (or its mapped version if the model ID has changed)
+     * 3. When there's a default model from the API: Use the server-recommended default model
+     * 4. Last resort: Use the newest model defined in modelSelection constants
+     *
+     * This ensures users maintain consistent model selection across sessions while also handling
+     * API failures and model ID migrations gracefully.
+     */
     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;
+        // Get models from cache or API
+        const { models, defaultModelId, errorFromAPI } = await this.#fetchModelsWithCache();
+        // Get the first fallback model option as default
+        const defaultModelOption = modelSelection_1.FALLBACK_MODEL_OPTIONS[1];
+        const DEFAULT_MODEL_ID = defaultModelId || defaultModelOption?.id;
         const sessionResult = this.#chatSessionManagementService.getSession(params.tabId);
         const { data: session, success } = sessionResult;
-        if (!success) {
+        // Handle error cases by returning default model
+        if (!success || errorFromAPI) {
             return {
                 tabId: params.tabId,
                 models: models,
+                selectedModelId: DEFAULT_MODEL_ID,
             };
         }
-        const savedModelId = this.#chatHistoryDb.getModelId();
-        const selectedModelId = savedModelId && models.some(model => model.id === savedModelId)
-            ? savedModelId
-            : (0, agenticChatControllerHelper_1.getLatestAvailableModel)(region).id;
+        // Determine selected model ID based on priority
+        let selectedModelId;
+        let modelId = this.#chatHistoryDb.getModelId();
+        // Helper function to get model label from FALLBACK_MODEL_RECORD
+        const getModelLabel = (modelKey) => modelSelection_1.FALLBACK_MODEL_RECORD[modelKey]?.label || modelKey;
+        // Helper function to map enum model ID to API model ID
+        const getMappedModelId = (modelKey) => modelSelection_1.BEDROCK_MODEL_TO_MODEL_ID[modelKey] || modelKey;
+        // Determine selected model ID based on priority
+        if (modelId) {
+            const mappedModelId = getMappedModelId(modelId);
+            // Priority 1: Use mapped modelId if it exists in available models from backend
+            if (models.some(model => model.id === mappedModelId)) {
+                selectedModelId = mappedModelId;
+            }
+            // Priority 2: Use mapped version if modelId exists in FALLBACK_MODEL_RECORD and no backend models available
+            else if (models.length === 0 && modelId in modelSelection_1.FALLBACK_MODEL_RECORD) {
+                selectedModelId = getModelLabel(modelId);
+            }
+            // Priority 3: Fall back to default or system default
+            else {
+                selectedModelId = defaultModelId || getMappedModelId(DEFAULT_MODEL_ID);
+            }
+        }
+        else {
+            // No user-selected model - use API default or system default
+            selectedModelId = defaultModelId || getMappedModelId(DEFAULT_MODEL_ID);
+        }
+        // Store the selected model in the session
         session.modelId = selectedModelId;
         return {
             tabId: params.tabId,
@@ -474,7 +569,7 @@ class AgenticChatController {
         const sessionResult = this.#chatSessionManagementService.getSession(params.tabId);
         const { data: session, success } = sessionResult;
         if (!success) {
-            return new server_interface_1.ResponseError(protocol_2.ErrorCodes.InternalError, sessionResult.error);
+            return new server_interface_1.ResponseError(protocol_1.ErrorCodes.InternalError, sessionResult.error);
         }
         const compactIds = session.getAllDeferredCompactMessageIds();
         await this.#invalidateCompactCommand(params.tabId, compactIds);
@@ -1312,6 +1407,13 @@ class AgenticChatController {
                             });
                         }
                         this.#telemetryController.emitInteractWithAgenticChat('GeneratedDiff', tabId, session.pairProgrammingMode, session.getConversationType(), this.#abTestingAllocation?.experimentName, this.#abTestingAllocation?.userVariation);
+                        // Emit acceptedLineCount when write tool is used and code changes are accepted
+                        const acceptedLineCount = (0, fileModificationMetrics_1.calculateModifiedLines)(toolUse, doc?.getText());
+                        await this.#telemetryController.emitInteractWithMessageMetric(tabId, {
+                            cwsprChatMessageId: chatResult.messageId ?? toolUse.toolUseId,
+                            cwsprChatInteractionType: types_1.ChatInteractionType.AgenticCodeAccepted,
+                            codewhispererCustomizationArn: this.#customizationArn,
+                        }, acceptedLineCount);
                         await chatResultStream.writeResultBlock(chatResult);
                         break;
                     case codeReview_1.CodeReview.toolName:
@@ -1400,6 +1502,48 @@ class AgenticChatController {
                     // only emit if this is an actual tool error (not a user rejecting/canceling tool)
                     this.#telemetryController.emitToolUseSuggested(toolUse, session.conversationId ?? '', this.#features.runtime.serverInfo.version ?? '', undefined, session.pairProgrammingMode, this.#abTestingAllocation?.experimentName, this.#abTestingAllocation?.userVariation, 'Failed');
                 }
+                // Handle MCP tool failures
+                const originalNames = mcpManager_1.McpManager.instance.getOriginalToolNames(toolUse.name);
+                if (originalNames && toolUse.toolUseId) {
+                    const { toolName } = originalNames;
+                    const cachedToolUse = session.toolUseLookup.get(toolUse.toolUseId);
+                    const cachedButtonBlockId = cachedToolUse?.cachedButtonBlockId;
+                    const customerFacingError = (0, errors_2.getCustomerFacingErrorMessage)(err);
+                    const errorResult = {
+                        type: 'tool',
+                        messageId: toolUse.toolUseId,
+                        summary: {
+                            content: {
+                                header: {
+                                    icon: 'tools',
+                                    body: `${toolName}`,
+                                    status: {
+                                        status: 'error',
+                                        icon: 'cancel-circle',
+                                        text: 'Error',
+                                        description: customerFacingError,
+                                    },
+                                },
+                            },
+                            collapsedContent: [
+                                {
+                                    header: { body: 'Parameters' },
+                                    body: `\`\`\`json\n${JSON.stringify(toolUse.input, null, 2)}\n\`\`\``,
+                                },
+                                {
+                                    header: { body: 'Error' },
+                                    body: customerFacingError,
+                                },
+                            ],
+                        },
+                    };
+                    if (cachedButtonBlockId !== undefined) {
+                        await chatResultStream.overwriteResultBlock(errorResult, cachedButtonBlockId);
+                    }
+                    else {
+                        await chatResultStream.writeResultBlock(errorResult);
+                    }
+                }
                 // display fs write failure status in the UX of that file card
                 if ((toolUse.name === toolConstants_1.FS_WRITE || toolUse.name === toolConstants_1.FS_REPLACE) && toolUse.toolUseId) {
                     const existingCard = chatResultStream.getMessageBlockId(toolUse.toolUseId);
@@ -1729,7 +1873,7 @@ class AgenticChatController {
                                 status: {
                                     status: isAccept ? 'success' : 'error',
                                     icon: isAccept ? 'ok' : 'cancel',
-                                    text: isAccept ? 'Completed' : 'Rejected',
+                                    text: isAccept ? 'Accepted' : 'Rejected',
                                 },
                                 fileList: undefined,
                             },
@@ -1807,6 +1951,7 @@ class AgenticChatController {
         session.setDeferredToolExecution(messageId, deferred.resolve, deferred.reject);
         this.#log(`Prompting for compaction approval for messageId: ${messageId}`);
         await deferred.promise;
+        session.removeDeferredToolExecution(messageId);
         // Note: we want to overwrite the button block because it already exists in the stream.
         await resultStream.overwriteResultBlock(this.#getUpdateCompactConfirmResult(messageId), promptBlockId);
     }
@@ -2344,7 +2489,7 @@ class AgenticChatController {
      * Handles errors that occur during the request
      */
     async #handleRequestError(conversationId, err, errorMessageId, tabId, metric, agenticCodingMode) {
-        const errorMessage = (0, utils_2.getErrorMsg)(err);
+        const errorMessage = (0, utils_2.getErrorMsg)(err) ?? constants_2.GENERIC_ERROR_MS;
         const requestID = (0, utils_2.getRequestID)(err) ?? '';
         metric.setDimension('cwsprChatResponseCode', (0, utils_2.getHttpStatusCode)(err) ?? 0);
         metric.setDimension('languageServerVersion', this.#features.runtime.serverInfo.version);
@@ -2353,7 +2498,7 @@ class AgenticChatController {
         metric.metric.requestIds = [requestID];
         metric.metric.cwsprChatMessageId = errorMessageId;
         metric.metric.cwsprChatConversationId = conversationId;
-        await this.#telemetryController.emitAddMessageMetric(tabId, metric.metric, 'Failed');
+        await this.#telemetryController.emitAddMessageMetric(tabId, metric.metric, 'Failed', errorMessage);
         if ((0, utils_2.isUsageLimitError)(err)) {
             if (this.#paidTierMode !== 'paidtier') {
                 this.setPaidTierMode(tabId, 'freetier-limit');
@@ -2380,7 +2525,7 @@ class AgenticChatController {
             this.#telemetryController.emitMessageResponseError(tabId, metric.metric, requestID, customErrMessage, agenticCodingMode);
         }
         else {
-            this.#telemetryController.emitMessageResponseError(tabId, metric.metric, requestID, errorMessage ?? constants_2.GENERIC_ERROR_MS, agenticCodingMode);
+            this.#telemetryController.emitMessageResponseError(tabId, metric.metric, requestID, errorMessage, agenticCodingMode);
         }
         let authFollowType = undefined;
         // first check if there is an AmazonQ related auth follow up
@@ -2554,8 +2699,8 @@ class AgenticChatController {
         const workspaceEdit = {
             edit: {
                 documentChanges: [
-                    protocol_2.TextDocumentEdit.create({ uri: params.textDocument.uri, version: 0 }, [
-                        protocol_2.TextEdit.insert(cursorPosition, textWithIndent),
+                    protocol_1.TextDocumentEdit.create({ uri: params.textDocument.uri, version: 0 }, [
+                        protocol_1.TextEdit.insert(cursorPosition, textWithIndent),
                     ]),
                 ],
             },
@@ -2639,23 +2784,6 @@ class AgenticChatController {
         });
     }
     onSourceLinkClick() { }
-    /**
-     * @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.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
-            modelId = 'CLAUDE_3_7_SONNET_20250219_V1_0';
-            // @ts-ignore
-            this.#features.chat.chatOptionsUpdate({ region });
-        }
-        this.#features.chat.chatOptionsUpdate({ modelId: modelId, tabId: tabId });
-        session.modelId = modelId;
-    }
     onTabAdd(params) {
         this.#telemetryController.activeTabId = params.tabId;
         if (!params.restoredTab) {
@@ -2664,22 +2792,21 @@ class AgenticChatController {
         const sessionResult = this.#chatSessionManagementService.createSession(params.tabId);
         const { data: session, success } = sessionResult;
         if (!success) {
-            return new server_interface_1.ResponseError(protocol_2.ErrorCodes.InternalError, sessionResult.error);
+            return new server_interface_1.ResponseError(protocol_1.ErrorCodes.InternalError, sessionResult.error);
         }
-        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;
+        if (session) {
+            // Set the logging object on the session
+            session.setLogging(this.#features.logging);
+        }
         // Update the client with the initial pair programming mode
         this.#features.chat.chatOptionsUpdate({
             tabId: params.tabId,
             // Type assertion to support pairProgrammingMode
             ...(session.pairProgrammingMode !== undefined ? { pairProgrammingMode: session.pairProgrammingMode } : {}),
         });
-        if (success && session) {
-            // Set the logging object on the session
-            session.setLogging(this.#features.logging);
-        }
         this.setPaidTierMode(params.tabId);
     }
     onTabChange(params) {
@@ -3393,6 +3520,13 @@ class AgenticChatController {
                 }
                 else {
                     // Fallback to creating a new card
+                    if (toolResultCard.summary?.content?.header) {
+                        toolResultCard.summary.content.header.status = {
+                            status: 'success',
+                            icon: 'ok',
+                            text: 'Completed',
+                        };
+                    }
                     this.#log(`Warning: No blockId found for tool use ${toolUse.toolUseId}, creating new card`);
                     await chatResultStream.writeResultBlock(toolResultCard);
                 }