@aws/lsp-codewhisperer 0.0.64 → 0.0.65

package/CHANGELOG.md

@@ -1,5 +1,33 @@
 # Changelog
 
+## [0.0.65](https://github.com/aws/language-servers/compare/lsp-codewhisperer/v0.0.64...lsp-codewhisperer/v0.0.65) (2025-07-15)
+
+
+### Features
+
+* **amazonq:** add a/b testing info into agenticChat toolkit metrics ([#1898](https://github.com/aws/language-servers/issues/1898)) ([6ab9b2c](https://github.com/aws/language-servers/commit/6ab9b2cef0125846c2f20fd8554f591808b59cd0))
+* **amazonq:** added full system information to the logs ([#1875](https://github.com/aws/language-servers/issues/1875)) ([7795c6b](https://github.com/aws/language-servers/commit/7795c6b43274211731aa9bb295b41ec89db41a6d))
+* **amazonq:** Adding QCodeReview tool to amazonQ ([#1882](https://github.com/aws/language-servers/issues/1882)) ([07e343b](https://github.com/aws/language-servers/commit/07e343b9fcef319bdbec80c48388e44b4b19269a))
+* **amazonq:** allow opt-out for workspace context server ([#1867](https://github.com/aws/language-servers/issues/1867)) ([72b6d76](https://github.com/aws/language-servers/commit/72b6d76c5ed8e240aad6be80f65eab3497caaacf))
+* **chat-client:** add built-in tool permission and enable auto-approve ([#1890](https://github.com/aws/language-servers/issues/1890)) ([03b59c8](https://github.com/aws/language-servers/commit/03b59c8fba58db0f6b6c387cf5d53227c3f54673))
+* **chat-client:** handle keyboard shortcut for run/reject/stop shell commands and tooltips ([#1885](https://github.com/aws/language-servers/issues/1885)) ([f8e9461](https://github.com/aws/language-servers/commit/f8e94615b5ce8a3f4bf8837627fa4816a09cbef2))
+* update UserTriggerDecisionEventStreakLengthInteger min value ([#1878](https://github.com/aws/language-servers/issues/1878)) ([e06f180](https://github.com/aws/language-servers/commit/e06f18017864ea33e316059a708cb87aa6d8c562))
+
+
+### Bug Fixes
+
+* **amazonq:** additional checks for binary and credential files ([#1866](https://github.com/aws/language-servers/issues/1866)) ([76656c9](https://github.com/aws/language-servers/commit/76656c9b2bb5080f64f581bb3b39cd55a3015bdf))
+* **amazonq:** catch mcp initialization errors ([#1873](https://github.com/aws/language-servers/issues/1873)) ([afdd6a4](https://github.com/aws/language-servers/commit/afdd6a4bd1db7c3990a7a279ebbbfbe0640e27c3))
+* **chat-client:** revert for add built-in tool permission and enable auto-approve ([#1890](https://github.com/aws/language-servers/issues/1890)) ([#1900](https://github.com/aws/language-servers/issues/1900)) ([34b41b8](https://github.com/aws/language-servers/commit/34b41b8f87c21d2ee6b98643339dbdfa71efcb77))
+* **chat-client:** revert for amazon q keyboard shortcuts feature ([#1901](https://github.com/aws/language-servers/issues/1901)) ([522f8de](https://github.com/aws/language-servers/commit/522f8de6dba8dfa9b4363934cd7fcea905add1ce))
+* Disable Concurrent inline completion handler ([#1880](https://github.com/aws/language-servers/issues/1880)) ([61eeb8c](https://github.com/aws/language-servers/commit/61eeb8c93b5454c5a99ebb79b5593007d08007e5))
+* Forward slash shown in rules list in multi-root workspaces on windows ([#1855](https://github.com/aws/language-servers/issues/1855)) ([061caa6](https://github.com/aws/language-servers/commit/061caa6450946e20cd1630b92f9b6dada8058edd))
+
+
+### Reverts
+
+* adding streakLength back for UserTriggerDecisionEvent ([#1877](https://github.com/aws/language-servers/issues/1877)) ([b199100](https://github.com/aws/language-servers/commit/b199100153aa0629890c49e12a56efbb9c627154))
+
 ## [0.0.64](https://github.com/aws/language-servers/compare/lsp-codewhisperer/v0.0.63...lsp-codewhisperer/v0.0.64) (2025-07-11)
 
 

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

@@ -6453,7 +6453,7 @@
         },
         "UserTriggerDecisionEventStreakLengthInteger": {
             "type": "integer",
-            "min": 0
+            "min": -1
         },
         "ValidationException": {
             "type": "structure",

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

@@ -16,9 +16,14 @@ import { ChatSessionService } from '../chat/chatSessionService';
 import { AgenticChatResultStream } from './agenticChatResultStream';
 import { AdditionalContentEntryAddition } from './context/agenticChatTriggerContext';
 import { PaidTierMode } from '../paidTier/paidTier';
+import { UserContext } from '../../client/token/codewhispererbearertokenclient';
 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;
+    /**
+     * Logs system information that can be helpful for debugging customer issues
+     */
+    private logSystemInformation;
     constructor(chatSessionManagementService: ChatSessionManagementService, features: Features, telemetryService: TelemetryService, serviceManager?: AmazonQBaseServiceManager);
     onExecuteCommand(params: ExecuteCommandParams, _token: CancellationToken): Promise<any>;
     onButtonClick(params: ButtonClickParams): Promise<ButtonClickResult>;
@@ -143,5 +148,6 @@ export declare class AgenticChatController implements ChatHandlers {
     onPromptInputOptionChange(params: PromptInputOptionChangeParams): void;
     updateConfiguration: (newConfig: AmazonQWorkspaceConfig) => void;
     restorePreviousChats(): Promise<void>;
+    scheduleABTestingFetching(userContext: UserContext | undefined): void;
 }
 export {};

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

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AgenticChatController = void 0;
 const crypto = require("crypto");
 const path = require("path");
+const os = require("os");
 const codewhisperer_streaming_1 = require("@amzn/codewhisperer-streaming");
 const protocol_1 = require("@aws/language-server-runtimes/protocol");
 const protocol_2 = require("@aws/language-server-runtimes/protocol");
@@ -49,6 +50,8 @@ const errors_2 = require("./errors");
 const vscode_uri_1 = require("vscode-uri");
 const executeBash_2 = require("./tools/executeBash");
 const userWrittenCodeTracker_1 = require("../../shared/userWrittenCodeTracker");
+const qCodeReview_1 = require("./tools/qCodeAnalysis/qCodeReview");
+const qCodeReviewConstants_1 = require("./tools/qCodeAnalysis/qCodeReviewConstants");
 const mcpEventHandler_1 = require("./tools/mcp/mcpEventHandler");
 const mcpUtils_1 = require("./tools/mcp/mcpUtils");
 const mcpManager_1 = require("./tools/mcp/mcpManager");
@@ -85,6 +88,9 @@ class AgenticChatController {
     #timeToFirstChunk = -1;
     #timeBetweenChunks = [];
     #lastChunkTime = 0;
+    // A/B testing allocation
+    #abTestingFetchingTimeout;
+    #abTestingAllocation;
     /**
      * Determines the appropriate message ID for a tool use based on tool type and name
      * @param toolType The type of tool being used
@@ -96,6 +102,23 @@ class AgenticChatController {
         // Return plain toolUseId for executeBash, add "_permission" suffix for all other tools
         return toolUse.name === 'executeBash' || toolType === 'executeBash' ? toolUseId : `${toolUseId}_permission`;
     }
+    /**
+     * Logs system information that can be helpful for debugging customer issues
+     */
+    logSystemInformation() {
+        const clientInfo = this.#features.lsp.getClientInitializeParams()?.clientInfo;
+        const systemInfo = {
+            languageServerVersion: this.#features.runtime.serverInfo.version ?? 'unknown',
+            clientName: clientInfo?.name ?? 'unknown',
+            clientVersion: clientInfo?.version ?? 'unknown',
+            OS: os.platform(),
+            OSVersion: os.release(),
+            ComputeEnv: process.env.COMPUTE_ENV ?? 'unknown',
+            extensionVersion: this.#features.lsp.getClientInitializeParams()?.initializationOptions?.aws?.clientInfo?.extension
+                ?.version,
+        };
+        this.#features.logging.info(`System Information: ${JSON.stringify(systemInfo)}`);
+    }
     constructor(chatSessionManagementService, features, telemetryService, serviceManager) {
         this.#features = features;
         this.#chatSessionManagementService = chatSessionManagementService;
@@ -162,7 +185,7 @@ class AgenticChatController {
             try {
                 await this.#undoFileChange(toolUseId, session.data);
                 this.#updateUndoButtonAfterClick(params.tabId, toolUseId, session.data);
-                this.#telemetryController.emitInteractWithAgenticChat('RejectDiff', params.tabId, session.data?.pairProgrammingMode, session.data?.getConversationType());
+                this.#telemetryController.emitInteractWithAgenticChat('RejectDiff', params.tabId, session.data?.pairProgrammingMode, session.data?.getConversationType(), this.#abTestingAllocation?.experimentName, this.#abTestingAllocation?.userVariation);
             }
             catch (err) {
                 return { success: false, failureReason: err.message };
@@ -371,6 +394,7 @@ class AgenticChatController {
         this.#contextCommandsProvider?.dispose();
         this.#userWrittenCodeTracker?.dispose();
         this.#mcpEventHandler.dispose();
+        clearInterval(this.#abTestingFetchingTimeout);
     }
     async onListConversations(params) {
         return this.#tabBarController.onListConversations(params);
@@ -437,6 +461,8 @@ class AgenticChatController {
         await this.#invalidateAllShellCommands(params.tabId, session);
         const metric = new metric_1.Metric({
             cwsprChatConversationType: 'AgenticChat',
+            experimentName: this.#abTestingAllocation?.experimentName,
+            userVariation: this.#abTestingAllocation?.userVariation,
         });
         try {
             const triggerContext = await this.#getTriggerContext(params, metric);
@@ -462,7 +488,7 @@ class AgenticChatController {
                 await this.#showUndoAllIfRequired(chatResultStream, session);
                 await chatResultStream.updateOngoingProgressResult('Canceled');
                 // Finally, send telemetry/metrics
-                this.#telemetryController.emitInteractWithAgenticChat('StopChat', params.tabId, session.pairProgrammingMode, session.getConversationType());
+                this.#telemetryController.emitInteractWithAgenticChat('StopChat', params.tabId, session.pairProgrammingMode, session.getConversationType(), this.#abTestingAllocation?.experimentName, this.#abTestingAllocation?.userVariation);
                 metric.setDimension('languageServerVersion', this.#features.runtime.serverInfo.version);
                 metric.setDimension('codewhispererCustomizationArn', this.#customizationArn);
                 metric.setDimension('enabled', session.pairProgrammingMode);
@@ -470,8 +496,11 @@ class AgenticChatController {
             });
             session.setConversationType('AgenticChat');
             const additionalContext = await this.#additionalContextProvider.getAdditionalContext(triggerContext, params.tabId, params.context);
-            // Add active file to context list if it exists
-            const activeFile = triggerContext.text && triggerContext.relativeFilePath && triggerContext.activeFilePath
+            // Add active file to context list if it's not already there
+            const activeFile = triggerContext.text &&
+                triggerContext.relativeFilePath &&
+                triggerContext.activeFilePath &&
+                !additionalContext.some(item => item.path === triggerContext.activeFilePath)
                 ? [
                     {
                         name: path.basename(triggerContext.relativeFilePath),
@@ -546,6 +575,7 @@ class AgenticChatController {
         let iterationCount = 0;
         let shouldDisplayMessage = true;
         metric.recordStart();
+        this.logSystemInformation();
         while (true) {
             iterationCount++;
             this.#debug(`Agent loop iteration ${iterationCount} for conversation id:`, conversationIdentifier || '');
@@ -683,7 +713,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.#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);
                 finalResult = result;
                 break;
             }
@@ -704,7 +734,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 ?? '', session.modelId, 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, this.#abTestingAllocation?.experimentName, this.#abTestingAllocation?.userVariation);
             }
             else {
                 // Send an error card to UI?
@@ -713,7 +743,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 ?? '', session.modelId, 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, this.#abTestingAllocation?.experimentName, this.#abTestingAllocation?.userVariation);
                 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.';
@@ -909,17 +939,20 @@ class AgenticChatController {
                             cachedButtonBlockId = await chatResultStream.writeResultBlock(confirmationResult);
                             const isExecuteBash = toolUse.name === 'executeBash';
                             if (isExecuteBash) {
-                                this.#telemetryController.emitInteractWithAgenticChat('GeneratedCommand', tabId, session.pairProgrammingMode, session.getConversationType());
+                                this.#telemetryController.emitInteractWithAgenticChat('GeneratedCommand', tabId, session.pairProgrammingMode, session.getConversationType(), this.#abTestingAllocation?.experimentName, this.#abTestingAllocation?.userVariation);
                             }
                             if (requiresAcceptance) {
                                 await this.waitForToolApproval(toolUse, chatResultStream, cachedButtonBlockId, session, toolUse.name);
                             }
                             if (isExecuteBash) {
-                                this.#telemetryController.emitInteractWithAgenticChat('RunCommand', tabId, session.pairProgrammingMode, session.getConversationType());
+                                this.#telemetryController.emitInteractWithAgenticChat('RunCommand', tabId, session.pairProgrammingMode, session.getConversationType(), this.#abTestingAllocation?.experimentName, this.#abTestingAllocation?.userVariation);
                             }
                         }
                         break;
                     }
+                    case qCodeReview_1.QCodeReview.toolName:
+                        // no need to write tool message for code review
+                        break;
                     // — DEFAULT ⇒ Only MCP tools, but can also handle generic tool execution messages
                     default:
                         // Get original server and tool names from the mapping
@@ -969,6 +1002,22 @@ class AgenticChatController {
                         fileChange: { before: document?.getText() },
                     });
                 }
+                if (toolUse.name === qCodeReview_1.QCodeReview.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;
+                        }
+                        toolUse.input = initialInput;
+                    }
+                    catch (e) {
+                        this.#features.logging.warn(`could not parse QCodeReview tool input: ${e}`);
+                    }
+                }
                 // After approval, add the path to the approved paths in the session
                 const inputPath = toolUse.input?.path || toolUse.input?.cwd;
                 if (inputPath) {
@@ -1033,9 +1082,23 @@ class AgenticChatController {
                                 fileChange: { ...cachedToolUse.fileChange, after: doc?.getText() },
                             });
                         }
-                        this.#telemetryController.emitInteractWithAgenticChat('GeneratedDiff', tabId, session.pairProgrammingMode, session.getConversationType());
+                        this.#telemetryController.emitInteractWithAgenticChat('GeneratedDiff', tabId, session.pairProgrammingMode, session.getConversationType(), this.#abTestingAllocation?.experimentName, this.#abTestingAllocation?.userVariation);
                         await chatResultStream.writeResultBlock(chatResult);
                         break;
+                    case qCodeReview_1.QCodeReview.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 qCodeReviewResult = result;
+                        if (qCodeReviewResult?.output?.kind === 'json' &&
+                            qCodeReviewResult.output.success &&
+                            qCodeReviewResult.output.content?.findingsByFile) {
+                            await chatResultStream.writeResultBlock({
+                                type: 'tool',
+                                messageId: toolUse.toolUseId + qCodeReviewConstants_1.FINDINGS_MESSAGE_SUFFIX,
+                                body: qCodeReviewResult.output.content.findingsByFile,
+                            });
+                        }
+                        break;
                     // — DEFAULT ⇒ MCP tools
                     default:
                         await this.#handleMcpToolResult(toolUse, result, session, chatResultStream);
@@ -1056,7 +1119,7 @@ class AgenticChatController {
                             });
                         }
                     }
-                    this.#telemetryController.emitToolUseSuggested(toolUse, session.conversationId ?? '', this.#features.runtime.serverInfo.version ?? '', latency, session.pairProgrammingMode);
+                    this.#telemetryController.emitToolUseSuggested(toolUse, session.conversationId ?? '', this.#features.runtime.serverInfo.version ?? '', latency, session.pairProgrammingMode, this.#abTestingAllocation?.experimentName, this.#abTestingAllocation?.userVariation);
                 }
             }
             catch (err) {
@@ -1283,7 +1346,31 @@ class AgenticChatController {
                 return undefined;
         }
     }
+    #getToolOverWritableStream(chatResultStream, toolUse) {
+        const toolMsgId = toolUse.toolUseId;
+        return new WritableStream({
+            write: async (chunk) => {
+                if (this.#stoppedToolUses.has(toolMsgId))
+                    return;
+                await chatResultStream.removeResultBlockAndUpdateUI(toolMsgId);
+                await chatResultStream.writeResultBlock({
+                    type: 'tool',
+                    messageId: toolMsgId,
+                    body: chunk,
+                });
+            },
+            close: async () => {
+                if (this.#stoppedToolUses.has(toolMsgId))
+                    return;
+                await chatResultStream.removeResultBlockAndUpdateUI(toolMsgId);
+                this.#stoppedToolUses.add(toolMsgId);
+            },
+        });
+    }
     #getWritableStream(chatResultStream, toolUse) {
+        if (toolUse.name === qCodeReview_1.QCodeReview.toolName) {
+            return this.#getToolOverWritableStream(chatResultStream, toolUse);
+        }
         if (toolUse.name !== 'executeBash') {
             return;
         }
@@ -2900,6 +2987,40 @@ class AgenticChatController {
             body: (0, textFormatting_1.toolResultMessage)(toolUse, result),
         });
     }
+    scheduleABTestingFetching(userContext) {
+        if (!userContext) {
+            return;
+        }
+        this.#abTestingFetchingTimeout = setInterval(() => {
+            let codeWhispererServiceToken;
+            try {
+                codeWhispererServiceToken = AmazonQTokenServiceManager_1.AmazonQTokenServiceManager.getInstance().getCodewhispererService();
+            }
+            catch (error) {
+                // getCodewhispererService only returns the cwspr client if the service manager was initialized
+                // i.e. profile was selected otherwise it throws an error
+                // we will not evaluate a/b status until profile is selected and service manager is fully initialized
+                return;
+            }
+            // Clear interval once we have the CodewhispererService
+            clearInterval(this.#abTestingFetchingTimeout);
+            this.#abTestingFetchingTimeout = undefined;
+            codeWhispererServiceToken
+                .listFeatureEvaluations({ userContext })
+                .then(result => {
+                const feature = result.featureEvaluations?.find(feature => feature.feature === 'MaestroWorkspaceContext');
+                if (feature) {
+                    this.#abTestingAllocation = {
+                        experimentName: feature.feature,
+                        userVariation: feature.variation,
+                    };
+                }
+            })
+                .catch(error => {
+                this.#features.logging.debug(`Error fetching AB testing result: ${error}`);
+            });
+        }, 5000);
+    }
     #log(...messages) {
         this.#features.logging.log(messages.join(' '));
     }