@aws/lsp-codewhisperer 0.0.82 → 0.0.84

package/CHANGELOG.md

@@ -1,5 +1,48 @@
 # Changelog
 
+## [0.0.84](https://github.com/aws/language-servers/compare/lsp-codewhisperer/v0.0.83...lsp-codewhisperer/v0.0.84) (2025-10-09)
+
+
+### Features
+
+* add model description to dropdown ([#2374](https://github.com/aws/language-servers/issues/2374)) ([ed8c6dd](https://github.com/aws/language-servers/commit/ed8c6dda1312f728e9ee7472f7ca447196ad9d84))
+* **amazonq:** adding classification based retry strategy for chat ([#2234](https://github.com/aws/language-servers/issues/2234)) ([#2409](https://github.com/aws/language-servers/issues/2409)) ([15d1b1f](https://github.com/aws/language-servers/commit/15d1b1f5947a1b83dab65c9d3fef901ab8a033c9))
+* **amazonq:** env var change for JupyterLab conversation history on refresh support ([#2395](https://github.com/aws/language-servers/issues/2395)) ([a908195](https://github.com/aws/language-servers/commit/a9081954bcaf20b7d0fbe0af11e61b8f82c7e82f))
+* **amazonq:** support JupyterLab conversation history on refresh ([#2325](https://github.com/aws/language-servers/issues/2325)) ([0980351](https://github.com/aws/language-servers/commit/09803514d1ce31ca77a532161e071e1d037e3fb1))
+
+
+### Bug Fixes
+
+* add in-loop compaction ([#2387](https://github.com/aws/language-servers/issues/2387)) ([35f0795](https://github.com/aws/language-servers/commit/35f0795fa5d09f3610e6a29cb72d49f32cc5534e))
+* addonly EDITS should be handled as COMPLETIONS ([#2133](https://github.com/aws/language-servers/issues/2133)) ([4f5a9da](https://github.com/aws/language-servers/commit/4f5a9dacf3bfd68aeb40920fb800adf001ed43d5))
+* patch [#2133](https://github.com/aws/language-servers/issues/2133) and handle more variants of FIM suggestions ([#2407](https://github.com/aws/language-servers/issues/2407)) ([f3086d7](https://github.com/aws/language-servers/commit/f3086d71808bd49336e0df9ba30f5be5fda837c3))
+
+## [0.0.83](https://github.com/aws/language-servers/compare/lsp-codewhisperer/v0.0.82...lsp-codewhisperer/v0.0.83) (2025-10-01)
+
+
+### Bug Fixes
+
+* **amazonq:** escaping user input to mitigate xss issue ([#2360](https://github.com/aws/language-servers/issues/2360)) ([45b86be](https://github.com/aws/language-servers/commit/45b86bef1a93cf9ced6fbf0c222cf5410de04c81))
+* **amazonq:** fix to add opt-out header to streaming client ([#2365](https://github.com/aws/language-servers/issues/2365)) ([692e77b](https://github.com/aws/language-servers/commit/692e77bc99770ac7d676928e95e3dc43bb91e7f0))
+* **amazonq:** handle IAM credentials expiration field to be aws sdk versions compatible and add refresh logic to codewhisperer IAM client ([#2349](https://github.com/aws/language-servers/issues/2349)) ([5eb3768](https://github.com/aws/language-servers/commit/5eb3768bf020d61d0ade767d62e13839048146e4))
+* **amazonq:** send full finding details to plugin, partial to agent ([#2356](https://github.com/aws/language-servers/issues/2356)) ([961e6ca](https://github.com/aws/language-servers/commit/961e6ca11b122481685f9f65b3da14c6a2497cc4))
+* improve history management ([#2312](https://github.com/aws/language-servers/issues/2312)) ([#2357](https://github.com/aws/language-servers/issues/2357)) ([e7aa2a6](https://github.com/aws/language-servers/commit/e7aa2a6545bcb1a8238abfde69a05432be0b6615))
+* optimize memory bank token usage and add new tab support ([#2366](https://github.com/aws/language-servers/issues/2366)) ([3057d56](https://github.com/aws/language-servers/commit/3057d56e4a3047d1715d6e3560e9f934d1de469c))
+* private package mapping during artifact generation ([#2348](https://github.com/aws/language-servers/issues/2348)) ([d56bfa1](https://github.com/aws/language-servers/commit/d56bfa191954fac8068e2bf390c2d0b88ef8b168))
+* trim new line when emitting error message ([#2359](https://github.com/aws/language-servers/issues/2359)) ([d8733a7](https://github.com/aws/language-servers/commit/d8733a75487f74815302b838802eccbf3ffec55e))
+
+
+### Reverts
+
+* fix to add opt-out header to streaming client ([#2365](https://github.com/aws/language-servers/issues/2365)) ([#2370](https://github.com/aws/language-servers/issues/2370)) ([b29478f](https://github.com/aws/language-servers/commit/b29478fa1ecc58e331ff330ff79f46b0d8c38d9e))
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * dependencies
+    * @aws/lsp-core bumped from ^0.0.15 to ^0.0.16
+
 ## [0.0.82](https://github.com/aws/language-servers/compare/lsp-codewhisperer/v0.0.81...lsp-codewhisperer/v0.0.82) (2025-09-24)
 
 

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

@@ -66,7 +66,6 @@ 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");
-const escapeHTML = require("escape-html");
 const semanticSearch_1 = require("./tools/workspaceContext/semanticSearch");
 const memoryBankController_1 = require("./context/memorybank/memoryBankController");
 class AgenticChatController {
@@ -470,9 +469,10 @@ class AgenticChatController {
             });
             // 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 }) => ({
+            models = Object.values(responseResult.models).map(({ modelId, modelName, description }) => ({
                 id: modelId,
                 name: modelName ?? modelId,
+                description: description ?? '',
             }));
             defaultModelId = responseResult.defaultModel?.modelId;
             // Cache the models with defaultModelId
@@ -506,7 +506,7 @@ class AgenticChatController {
         // 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 defaultModelOption = modelSelection_1.FALLBACK_MODEL_OPTIONS[0];
         const DEFAULT_MODEL_ID = defaultModelId || defaultModelOption?.id;
         const sessionResult = this.#chatSessionManagementService.getSession(params.tabId);
         const { data: session, success } = sessionResult;
@@ -565,11 +565,17 @@ class AgenticChatController {
     }
     async onChatPrompt(params, token) {
         // Phase 1: Initial Setup - This happens only once
-        params.prompt.prompt = (0, utils_2.sanitizeInput)(params.prompt.prompt || '');
+        params.prompt.prompt = (0, utils_2.sanitizeInput)(params.prompt.prompt || '', true);
         IdleWorkspaceManager_1.IdleWorkspaceManager.recordActivityTimestamp();
+        const sessionResult = this.#chatSessionManagementService.getSession(params.tabId);
+        const { data: session, success } = sessionResult;
+        if (!success) {
+            return new server_interface_1.ResponseError(protocol_1.ErrorCodes.InternalError, sessionResult.error);
+        }
         // Memory Bank Creation Flow - Delegate to MemoryBankController
         if (this.#memoryBankController.isMemoryBankCreationRequest(params.prompt.prompt)) {
             this.#features.logging.info(`Memory Bank creation request detected for tabId: ${params.tabId}`);
+            session.isMemoryBankGeneration = true;
             // Store original prompt to prevent data loss on failure
             const originalPrompt = params.prompt.prompt;
             try {
@@ -639,19 +645,21 @@ class AgenticChatController {
                 this.#features.logging.error(`Memory Bank preparation failed: ${error}`);
                 // Restore original prompt to ensure no data loss
                 params.prompt.prompt = originalPrompt;
+                // Reset memory bank flag since preparation failed
+                session.isMemoryBankGeneration = false;
             }
         }
         const maybeDefaultResponse = !params.prompt.command && (0, utils_1.getDefaultChatResponse)(params.prompt.prompt);
         if (maybeDefaultResponse) {
             return maybeDefaultResponse;
         }
-        const sessionResult = this.#chatSessionManagementService.getSession(params.tabId);
-        const { data: session, success } = sessionResult;
-        if (!success) {
-            return new server_interface_1.ResponseError(protocol_1.ErrorCodes.InternalError, sessionResult.error);
-        }
         const compactIds = session.getAllDeferredCompactMessageIds();
         await this.#invalidateCompactCommand(params.tabId, compactIds);
+        // Set compactionDeclined flag if there were pending compaction requests
+        // This prevents endless compaction warning loops when user declines compaction once
+        if (compactIds.length > 0) {
+            session.compactionDeclined = true;
+        }
         session.rejectAllDeferredToolExecutions(new toolShared_1.ToolApprovalException('Command ignored: new prompt', false));
         await this.#invalidateAllShellCommands(params.tabId, session);
         const metric = new metric_1.Metric({
@@ -683,6 +691,10 @@ class AgenticChatController {
                 session.abortRequest();
                 const compactIds = session.getAllDeferredCompactMessageIds();
                 await this.#invalidateCompactCommand(params.tabId, compactIds);
+                // Set compactionDeclined flag if there were pending compaction requests
+                if (compactIds.length > 0) {
+                    session.compactionDeclined = true;
+                }
                 void this.#invalidateAllShellCommands(params.tabId, session);
                 session.rejectAllDeferredToolExecutions(new lsp_core_1.CancellationError('user'));
                 // Then update UI to inform the user
@@ -696,6 +708,13 @@ class AgenticChatController {
                 await this.#telemetryController.emitAddMessageMetric(params.tabId, metric.metric, 'Cancelled');
             });
             session.setConversationType('AgenticChat');
+            // Set up delay notification callback to show retry progress to users
+            session.setDelayNotificationCallback(notification => {
+                if (notification.thresholdExceeded) {
+                    this.#log(`Updating progress message: ${notification.message}`);
+                    void chatResultStream.updateProgressMessage(notification.message);
+                }
+            });
             const additionalContext = await this.#additionalContextProvider.getAdditionalContext(triggerContext, params.tabId, params.context, params.prompt.prompt);
             // Add active file to context list if it's not already there
             const activeFile = triggerContext.text &&
@@ -738,7 +757,12 @@ class AgenticChatController {
                 finalResult = await this.#runAgentLoop(initialRequestInput, session, metric, chatResultStream, params.tabId, promptId, session.conversationId, token, triggerContext.documentReference, additionalContext);
             }
             // Result Handling - This happens only once
-            return await this.#handleFinalResult(finalResult, session, params.tabId, metric, triggerContext, isNewConversation, chatResultStream);
+            const result = await this.#handleFinalResult(finalResult, session, params.tabId, metric, triggerContext, isNewConversation, chatResultStream);
+            // Reset compactionDeclined flag after successful completion
+            if (session.compactionDeclined) {
+                session.compactionDeclined = false;
+            }
+            return result;
         }
         catch (err) {
             // HACK: the chat-client needs to have a partial event with the associated messageId sent before it can accept the final result.
@@ -780,20 +804,20 @@ class AgenticChatController {
     /**
      * Prepares the initial request input for the chat prompt
      */
-    #getCompactionRequestInput(session) {
+    #getCompactionRequestInput(session, toolResults) {
         this.#debug('Preparing compaction request input');
         // Get profileArn from the service manager if available
         const profileArn = this.#serviceManager?.getActiveProfileArn();
-        const requestInput = this.#triggerContext.getCompactionChatCommandInput(profileArn, this.#getTools(session), session.modelId, this.#origin);
+        const requestInput = this.#triggerContext.getCompactionChatCommandInput(profileArn, this.#getTools(session), session.modelId, this.#origin, toolResults);
         return requestInput;
     }
     /**
      * Runs the compaction, making requests and processing tool uses until completion
      */
-    #shouldCompact(currentRequestCount) {
-        // 80% of 570K limit
-        if (currentRequestCount > 456_000) {
-            this.#debug(`Current request total character count is: ${currentRequestCount}, prompting user to compact`);
+    #shouldCompact(currentRequestCount, session) {
+        const EFFECTIVE_COMPACTION_THRESHOLD = constants_2.COMPACTION_CHARACTER_THRESHOLD - constants_2.COMPACTION_PROMPT.length;
+        if (currentRequestCount > EFFECTIVE_COMPACTION_THRESHOLD && !session.compactionDeclined) {
+            this.#debug(`Current request total character count is: ${currentRequestCount}, prompting user to compact (threshold: ${EFFECTIVE_COMPACTION_THRESHOLD})`);
             return true;
         }
         else {
@@ -821,7 +845,7 @@ class AgenticChatController {
         if (currentMessage) {
             //  Get and process the messages from history DB to maintain invariants for service requests
             try {
-                const { history: historyMessages, historyCount: historyCharCount } = this.#chatHistoryDb.fixAndGetHistory(tabId, conversationIdentifier ?? '', currentMessage, []);
+                const { history: historyMessages, historyCount: historyCharCount } = this.#chatHistoryDb.fixAndGetHistory(tabId, currentMessage, []);
                 messages = historyMessages;
                 characterCount = historyCharCount;
             }
@@ -913,6 +937,8 @@ class AgenticChatController {
         let shouldDisplayMessage = true;
         let currentRequestCount = 0;
         const pinnedContext = additionalContext?.filter(item => item.pinned);
+        // Store initial non-empty prompt for compaction handoff
+        const initialPrompt = initialRequestInput.conversationState?.currentMessage?.userInputMessage?.content?.trim() || '';
         metric.recordStart();
         this.logSystemInformation();
         while (true) {
@@ -939,7 +965,7 @@ class AgenticChatController {
             if (currentMessage) {
                 //  Get and process the messages from history DB to maintain invariants for service requests
                 try {
-                    const { history: historyMessages, historyCount: historyCharacterCount, currentCount: currentInputCount, } = this.#chatHistoryDb.fixAndGetHistory(tabId, conversationId, currentMessage, pinnedContextMessages);
+                    const { history: historyMessages, historyCount: historyCharacterCount, currentCount: currentInputCount, } = this.#chatHistoryDb.fixAndGetHistory(tabId, currentMessage, pinnedContextMessages);
                     messages = historyMessages;
                     currentRequestCount = currentInputCount + historyCharacterCount;
                     this.#debug(`Request total character count: ${currentRequestCount}`);
@@ -962,6 +988,34 @@ class AgenticChatController {
             this.#llmRequestStartTime = Date.now();
             // Phase 3: Request Execution
             currentRequestInput = (0, utils_2.sanitizeRequestInput)(currentRequestInput);
+            if (this.#shouldCompact(currentRequestCount, session)) {
+                this.#features.logging.info(`Entering mid-loop compaction at iteration ${iterationCount} with ${currentRequestCount} characters`);
+                this.#telemetryController.emitMidLoopCompaction(currentRequestCount, iterationCount, this.#features.runtime.serverInfo.version ?? '');
+                const messageId = this.#getMessageIdForCompact((0, uuid_1.v4)());
+                const confirmationResult = this.#processCompactConfirmation(messageId, currentRequestCount);
+                const cachedButtonBlockId = await chatResultStream.writeResultBlock(confirmationResult);
+                await this.waitForCompactApproval(messageId, chatResultStream, cachedButtonBlockId, session);
+                // Run compaction
+                const toolResults = currentRequestInput.conversationState?.currentMessage?.userInputMessage?.userInputMessageContext
+                    ?.toolResults || [];
+                const compactionRequestInput = this.#getCompactionRequestInput(session, toolResults);
+                const compactionResult = await this.#runCompaction(compactionRequestInput, session, metric, chatResultStream, tabId, promptId, types_1.CompactHistoryActionType.Nudge, session.conversationId, token, documentReference);
+                if (!compactionResult.success) {
+                    this.#features.logging.error(`Compaction failed: ${compactionResult.error}`);
+                    return compactionResult;
+                }
+                // Show compaction summary to user before continuing
+                await chatResultStream.writeResultBlock({
+                    type: 'answer',
+                    body: (compactionResult.data?.chatResult.body || '') +
+                        '\n\nConversation history has been compacted successfully!',
+                    messageId: (0, uuid_1.v4)(),
+                });
+                currentRequestInput = this.#updateRequestInputWithToolResults(currentRequestInput, [], constants_2.MID_LOOP_COMPACTION_HANDOFF_PROMPT + initialPrompt);
+                shouldDisplayMessage = false;
+                this.#features.logging.info(`Completed mid-loop compaction, restarting loop with handoff prompt`);
+                continue;
+            }
             // Note: these logs are very noisy, but contain information redacted on the backend.
             this.#debug(`generateAssistantResponse/SendMessage Request: ${JSON.stringify(currentRequestInput, this.#imageReplacer, 2)}`);
             const response = await session.getChatResponse(currentRequestInput);
@@ -980,7 +1034,7 @@ class AgenticChatController {
                 }
                 else {
                     this.#chatHistoryDb.addMessage(tabId, 'cwc', conversationIdentifier, {
-                        body: escapeHTML(currentMessage.userInputMessage?.content ?? ''),
+                        body: currentMessage.userInputMessage?.content ?? '',
                         type: 'prompt',
                         userIntent: currentMessage.userInputMessage?.userIntent,
                         origin: currentMessage.userInputMessage?.origin,
@@ -1104,7 +1158,7 @@ class AgenticChatController {
             }
             currentRequestInput = this.#updateRequestInputWithToolResults(currentRequestInput, toolResults, content);
         }
-        if (this.#shouldCompact(currentRequestCount)) {
+        if (this.#shouldCompact(currentRequestCount, session)) {
             this.#telemetryController.emitCompactNudge(currentRequestCount, this.#features.runtime.serverInfo.version ?? '');
             const messageId = this.#getMessageIdForCompact((0, uuid_1.v4)());
             const confirmationResult = this.#processCompactConfirmation(messageId, currentRequestCount);
@@ -1322,7 +1376,9 @@ class AgenticChatController {
                             [toolConstants_1.FILE_SEARCH]: { Tool: fileSearch_1.FileSearch },
                         };
                         const { Tool } = toolMap[toolUse.name];
-                        const tool = new Tool(this.#features);
+                        const tool = toolUse.name === toolConstants_1.FS_READ && session.isMemoryBankGeneration
+                            ? new Tool(this.#features, constants_2.FSREAD_MEMORY_BANK_MAX_PER_FILE, constants_2.FSREAD_MEMORY_BANK_MAX_TOTAL)
+                            : new Tool(this.#features);
                         // For MCP tools, get the permission from McpManager
                         // const permission = McpManager.instance.getToolPerm('Built-in', toolUse.name)
                         // If permission is 'alwaysAllow', we don't need to ask for acceptance
@@ -1428,6 +1484,25 @@ class AgenticChatController {
                 const ws = this.#getWritableStream(chatResultStream, toolUse);
                 const result = await this.#features.agent.runTool(toolUse.name, toolUse.input, token, ws);
                 let toolResultContent;
+                if (toolUse.name === codeReview_1.CodeReview.toolName) {
+                    // no need to write tool result for code review, this is handled by model via chat
+                    // Push result in message so that it is picked by IDE plugin to show in issues panel
+                    const codeReviewResult = result;
+                    if (codeReviewResult?.output?.kind === 'json' &&
+                        codeReviewResult.output.success &&
+                        codeReviewResult.output.content?.findingsByFile) {
+                        await chatResultStream.writeResultBlock({
+                            type: 'tool',
+                            messageId: toolUse.toolUseId + codeReviewConstants_1.CODE_REVIEW_FINDINGS_MESSAGE_SUFFIX,
+                            body: codeReviewResult.output.content.findingsByFile,
+                        });
+                        codeReviewResult.output.content = {
+                            codeReviewId: codeReviewResult.output.content.codeReviewId,
+                            message: codeReviewResult.output.content.message,
+                            findingsByFileSimplified: codeReviewResult.output.content.findingsByFileSimplified,
+                        };
+                    }
+                }
                 if (typeof result === 'string') {
                     toolResultContent = { text: result };
                 }
@@ -1499,18 +1574,6 @@ class AgenticChatController {
                         await chatResultStream.writeResultBlock(chatResult);
                         break;
                     case codeReview_1.CodeReview.toolName:
-                        // no need to write tool result for code review, this is handled by model via chat
-                        // Push result in message so that it is picked by IDE plugin to show in issues panel
-                        const codeReviewResult = result;
-                        if (codeReviewResult?.output?.kind === 'json' &&
-                            codeReviewResult.output.success &&
-                            codeReviewResult.output.content?.findingsByFile) {
-                            await chatResultStream.writeResultBlock({
-                                type: 'tool',
-                                messageId: toolUse.toolUseId + codeReviewConstants_1.CODE_REVIEW_FINDINGS_MESSAGE_SUFFIX,
-                                body: codeReviewResult.output.content.findingsByFile,
-                            });
-                        }
                         break;
                     case displayFindings_1.DisplayFindings.toolName:
                         // no need to write tool result for code review, this is handled by model via chat
@@ -2017,7 +2080,7 @@ class AgenticChatController {
             body: constants_2.COMPACTION_HEADER_BODY,
             buttons,
         };
-        const body = (0, constants_2.COMPACTION_BODY)(Math.round((characterCount / chatDb_1.MaxOverallCharacters) * 100));
+        const body = (0, constants_2.COMPACTION_BODY)(Math.round((characterCount / constants_2.MAX_OVERALL_CHARACTERS) * 100));
         return {
             type: 'tool',
             messageId,
@@ -2568,13 +2631,15 @@ class AgenticChatController {
                     .filter(prompt => prompt.length > 0)),
             },
         });
+        // Reset memory bank flag after completion
+        session.isMemoryBankGeneration = false;
         return chatResultStream.getResult();
     }
     /**
      * Handles errors that occur during the request
      */
     async #handleRequestError(conversationId, err, errorMessageId, tabId, metric, agenticCodingMode) {
-        const errorMessage = (0, utils_2.getErrorMsg)(err) ?? constants_2.GENERIC_ERROR_MS;
+        const errorMessage = ((0, utils_2.getErrorMsg)(err) ?? constants_2.GENERIC_ERROR_MS).replace(/[\r\n]+/g, ' '); // replace new lines with empty space
         const requestID = (0, utils_2.getRequestID)(err) ?? '';
         metric.setDimension('cwsprChatResponseCode', (0, utils_2.getHttpStatusCode)(err) ?? 0);
         metric.setDimension('languageServerVersion', this.#features.runtime.serverInfo.version);
@@ -2585,6 +2650,11 @@ class AgenticChatController {
         metric.metric.cwsprChatConversationId = conversationId;
         const errorCode = err.code ?? '';
         await this.#telemetryController.emitAddMessageMetric(tabId, metric.metric, 'Failed', errorMessage, errorCode);
+        // Reset memory bank flag on request error
+        const sessionResult = this.#chatSessionManagementService.getSession(tabId);
+        if (sessionResult.success) {
+            sessionResult.data.isMemoryBankGeneration = false;
+        }
         if ((0, utils_2.isUsageLimitError)(err)) {
             if (this.#paidTierMode !== 'paidtier') {
                 this.setPaidTierMode(tabId, 'freetier-limit');