@aws/lsp-codewhisperer 0.0.49 → 0.0.50

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # Changelog
 
+## [0.0.50](https://github.com/aws/language-servers/compare/lsp-codewhisperer/v0.0.49...lsp-codewhisperer/v0.0.50) (2025-06-16)
+
+
+### Features
+
+* add EnableWebFormsToBlazorTransform flag to support WebForms to Blazor transformation ([#1577](https://github.com/aws/language-servers/issues/1577)) ([8c6e9f6](https://github.com/aws/language-servers/commit/8c6e9f6e0a6fd1a7464b26572c1b613b3864b27a))
+* **amazonq:** edit predition auto trigger ([#1662](https://github.com/aws/language-servers/issues/1662)) ([cbcd82b](https://github.com/aws/language-servers/commit/cbcd82bf6632859539e46d1fbe12ec75ab505fb4))
+* **amazonq:** model throttling message as card instead of chat message ([#1657](https://github.com/aws/language-servers/issues/1657)) ([7ee1f2a](https://github.com/aws/language-servers/commit/7ee1f2ac0bdaa9f73fb63fc6d20d0de6d7b07523))
+* **amazonq:** pinned context and rules ([#1663](https://github.com/aws/language-servers/issues/1663)) ([25e7a5a](https://github.com/aws/language-servers/commit/25e7a5ab8b6630525a4fd6acc0524f67f00af817))
+* update list of models and set default to 4 ([#1659](https://github.com/aws/language-servers/issues/1659)) ([1991658](https://github.com/aws/language-servers/commit/19916584d3f46049d30f0c23b41c3857a07bc622))
+
+
+### Bug Fixes
+
+* **agenticChat:** UX fixes for MCP ([#1661](https://github.com/aws/language-servers/issues/1661)) ([bbdb4b4](https://github.com/aws/language-servers/commit/bbdb4b451352af50a914df684d7654686142a13b))
+* **amazonq:** properly deposit workspace context server resources on exit ([#1647](https://github.com/aws/language-servers/issues/1647)) ([34efb2b](https://github.com/aws/language-servers/commit/34efb2b0e4ded031b33ed1ed7b96cf41fbe8e03b))
+* increase timeout value for the streaming client ([#1654](https://github.com/aws/language-servers/issues/1654)) ([439a488](https://github.com/aws/language-servers/commit/439a488fc95683ab0da2df18a5044d66b689f4ed))
+
 ## [0.0.49](https://github.com/aws/language-servers/compare/lsp-codewhisperer/v0.0.48...lsp-codewhisperer/v0.0.49) (2025-06-13)
 
 

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

@@ -3,7 +3,7 @@
  * Will be deleted or merged.
  */
 import { GenerateAssistantResponseCommandInput, ToolUse } from '@aws/codewhisperer-streaming-client';
-import { Status, ButtonClickParams, ButtonClickResult, InlineChatResultParams, PromptInputOptionChangeParams, ExecuteCommandParams, FollowUpClickParams } from '@aws/language-server-runtimes/protocol';
+import { Status, ButtonClickParams, ButtonClickResult, InlineChatResultParams, PromptInputOptionChangeParams, RuleClickParams, ListRulesParams, ActiveEditorChangedParams, PinnedContextParams, ExecuteCommandParams, FollowUpClickParams } 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';
@@ -14,7 +14,7 @@ import { AmazonQWorkspaceConfig } from '../../shared/amazonQServiceManager/confi
 import { ChatSessionService } from '../chat/chatSessionService';
 import { AgenticChatResultStream } from './agenticChatResultStream';
 import { PaidTierMode } from '../paidTier/paidTier';
-type ChatHandlers = Omit<LspHandlers<Chat>, 'openTab' | 'sendChatUpdate' | 'sendContextCommands' | 'onListConversations' | 'onConversationClick' | 'onListMcpServers' | 'onMcpServerClick' | 'onTabBarAction' | 'getSerializedChat' | 'chatOptionsUpdate' | 'onListMcpServers' | 'onMcpServerClick'>;
+type ChatHandlers = Omit<LspHandlers<Chat>, 'openTab' | 'sendChatUpdate' | 'sendContextCommands' | 'onListConversations' | 'onConversationClick' | 'onListMcpServers' | 'onMcpServerClick' | 'onTabBarAction' | 'getSerializedChat' | 'chatOptionsUpdate' | 'onListMcpServers' | 'onMcpServerClick' | 'onListRules' | 'sendPinnedContext' | 'onActiveEditorChanged' | 'onPinnedContextAdd' | 'onPinnedContextRemove'>;
 export declare class AgenticChatController implements ChatHandlers {
     #private;
     constructor(chatSessionManagementService: ChatSessionManagementService, features: Features, telemetryService: TelemetryService, serviceManager?: AmazonQTokenServiceManager);
@@ -24,6 +24,8 @@ export declare class AgenticChatController implements ChatHandlers {
     dispose(): void;
     onListConversations(params: ListConversationsParams): Promise<import("@aws/language-server-runtimes/protocol").ListConversationsResult>;
     onConversationClick(params: ConversationClickParams): Promise<import("@aws/language-server-runtimes/protocol").ConversationClickResult>;
+    onRuleClick(params: RuleClickParams): Promise<import("@aws/language-server-runtimes/protocol").RuleClickResult>;
+    onListRules(params: ListRulesParams): Promise<import("@aws/language-server-runtimes/protocol").ListRulesResult>;
     onListMcpServers(params: ListMcpServersParams): Promise<{
         header: {
             title: string;
@@ -52,7 +54,7 @@ export declare class AgenticChatController implements ChatHandlers {
      * @param promptBlockId id of approval block. This allows us to overwrite the buttons with 'accepted' or 'rejected' text.
      * @param session
      */
-    waitForToolApproval(toolUse: ToolUse, resultStream: AgenticChatResultStream, promptBlockId: number, session: ChatSessionService): Promise<void>;
+    waitForToolApproval(toolUse: ToolUse, resultStream: AgenticChatResultStream, promptBlockId: number, session: ChatSessionService, toolName: string): Promise<void>;
     /**
      * Determines if error is thrown as a result of a user action (Ex. rejecting tool, stop button)
      * @param err
@@ -61,6 +63,7 @@ export declare class AgenticChatController implements ChatHandlers {
     isUserAction(err: unknown, token?: CancellationToken, session?: ChatSessionService): boolean;
     onInlineChatPrompt(params: InlineChatParams, token: CancellationToken): Promise<InlineChatResult | ResponseError<InlineChatResult>>;
     onInlineChatResult(params: InlineChatResultParams): Promise<void>;
+    onActiveEditorChanged(params: ActiveEditorChangedParams): Promise<void>;
     onCodeInsertToCursorPosition(params: InsertToCursorPositionParams): Promise<void>;
     onCopyCodeToClipboard(): void;
     onEndChat(params: EndChatParams, _token: CancellationToken): boolean;
@@ -76,6 +79,7 @@ export declare class AgenticChatController implements ChatHandlers {
     onSourceLinkClick(): void;
     onTabAdd(params: TabAddParams): ResponseError<ChatResult> | undefined;
     onTabChange(params: TabChangeParams): void;
+    sendPinnedContext(tabId: string): void;
     onTabRemove(params: TabRemoveParams): void;
     onQuickAction(params: QuickActionParams, _cancellationToken: CancellationToken): {
         messageId?: undefined;
@@ -84,6 +88,8 @@ export declare class AgenticChatController implements ChatHandlers {
         messageId: string;
         body: string;
     };
+    onPinnedContextAdd(params: PinnedContextParams): void;
+    onPinnedContextRemove(params: PinnedContextParams): void;
     onTabBarAction(params: TabBarActionParams): Promise<{
         success: boolean;
         tabId?: string;

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

@@ -90,8 +90,8 @@ class AgenticChatController {
         this.#telemetryService = telemetryService;
         this.#serviceManager = serviceManager;
         this.#chatHistoryDb = new chatDb_1.ChatDatabase(features);
-        this.#tabBarController = new tabBarController_1.TabBarController(features, this.#chatHistoryDb, telemetryService);
-        this.#additionalContextProvider = new addtionalContextProvider_1.AdditionalContextProvider(features.workspace);
+        this.#tabBarController = new tabBarController_1.TabBarController(features, this.#chatHistoryDb, telemetryService, (tabId) => this.sendPinnedContext(tabId));
+        this.#additionalContextProvider = new addtionalContextProvider_1.AdditionalContextProvider(features, this.#chatHistoryDb);
         this.#contextCommandsProvider = new contextCommandsProvider_1.ContextCommandsProvider(this.#features.logging, this.#features.chat, this.#features.workspace, this.#features.lsp);
         this.#mcpEventHandler = new mcpEventHandler_1.McpEventHandler(features, telemetryService);
     }
@@ -248,6 +248,23 @@ class AgenticChatController {
         }
     }
     async onCreatePrompt(params) {
+        if (params.isRule) {
+            let workspaceFolders = lsp_core_1.workspaceUtils.getWorkspaceFolderPaths(this.#features.workspace);
+            let workspaceRulesDirectory = path.join(workspaceFolders[0], '.amazonq', 'rules');
+            if (workspaceFolders.length > 0) {
+                const newFilePath = (0, contextUtils_1.getNewRuleFilePath)(params.promptName, workspaceRulesDirectory);
+                const newFileContent = '';
+                try {
+                    await this.#features.workspace.fs.mkdir(workspaceRulesDirectory, { recursive: true });
+                    await this.#features.workspace.fs.writeFile(newFilePath, newFileContent, { mode: 0o600 });
+                    await this.#features.lsp.window.showDocument({ uri: vscode_uri_1.URI.file(newFilePath).toString() });
+                }
+                catch (e) {
+                    this.#features.logging.warn(`Error creating rule file: ${e}`);
+                }
+                return;
+            }
+        }
         const newFilePath = (0, contextUtils_1.getNewPromptFilePath)(params.promptName);
         const newFileContent = '';
         try {
@@ -272,6 +289,12 @@ class AgenticChatController {
     async onConversationClick(params) {
         return this.#tabBarController.onConversationClick(params);
     }
+    async onRuleClick(params) {
+        return this.#additionalContextProvider.onRuleClick(params);
+    }
+    async onListRules(params) {
+        return this.#additionalContextProvider.onListRules(params);
+    }
     async onListMcpServers(params) {
         return this.#mcpEventHandler.onListMcpServers(params);
     }
@@ -337,7 +360,7 @@ class AgenticChatController {
                 await this.#telemetryController.emitAddMessageMetric(params.tabId, metric.metric, 'Cancelled');
             });
             session.setConversationType('AgenticChat');
-            const additionalContext = await this.#additionalContextProvider.getAdditionalContext(triggerContext, params.context);
+            const additionalContext = await this.#additionalContextProvider.getAdditionalContext(triggerContext, params.tabId, params.context);
             if (additionalContext.length) {
                 triggerContext.documentReference =
                     this.#additionalContextProvider.getFileListFromContext(additionalContext);
@@ -642,13 +665,13 @@ class AgenticChatController {
      * @param promptBlockId id of approval block. This allows us to overwrite the buttons with 'accepted' or 'rejected' text.
      * @param session
      */
-    async waitForToolApproval(toolUse, resultStream, promptBlockId, session) {
+    async waitForToolApproval(toolUse, resultStream, promptBlockId, session, toolName) {
         const deferred = this.#createDeferred();
         session.setDeferredToolExecution(toolUse.toolUseId, deferred.resolve, deferred.reject);
-        this.#log(`Prompting for tool approval for tool: ${toolUse.name}`);
+        this.#log(`Prompting for tool approval for tool: ${toolName ?? toolUse.name}`);
         await deferred.promise;
         // Note: we want to overwrite the button block because it already exists in the stream.
-        await resultStream.overwriteResultBlock(this.#getUpdateToolConfirmResult(toolUse, true), promptBlockId);
+        await resultStream.overwriteResultBlock(this.#getUpdateToolConfirmResult(toolUse, true, toolName), promptBlockId);
     }
     /**
      * Processes tool uses by running the tools and collecting results
@@ -724,7 +747,7 @@ class AgenticChatController {
                                 this.#telemetryController.emitInteractWithAgenticChat('GeneratedCommand', tabId, session.pairProgrammingMode, session.getConversationType());
                             }
                             if (requiresAcceptance) {
-                                await this.waitForToolApproval(toolUse, chatResultStream, cachedButtonBlockId, session);
+                                await this.waitForToolApproval(toolUse, chatResultStream, cachedButtonBlockId, session, toolUse.name);
                             }
                             if (isExecuteBash) {
                                 this.#telemetryController.emitInteractWithAgenticChat('RunCommand', tabId, session.pairProgrammingMode, session.getConversationType());
@@ -751,7 +774,7 @@ class AgenticChatController {
                                     const confirmation = this.#processToolConfirmation(toolUse, requiresAcceptance, warning, undefined, toolName // Pass the original tool name here
                                     );
                                     cachedButtonBlockId = await chatResultStream.writeResultBlock(confirmation);
-                                    await this.waitForToolApproval(toolUse, chatResultStream, cachedButtonBlockId, session);
+                                    await this.waitForToolApproval(toolUse, chatResultStream, cachedButtonBlockId, session, toolName);
                                 }
                                 // Store the blockId in the session for later use
                                 if (toolUse.toolUseId) {
@@ -863,7 +886,7 @@ class AgenticChatController {
                 if (this.isUserAction(err, token)) {
                     // Handle ToolApprovalException for any tool
                     if (err instanceof toolShared_1.ToolApprovalException && cachedButtonBlockId) {
-                        await chatResultStream.overwriteResultBlock(this.#getUpdateToolConfirmResult(toolUse, false), cachedButtonBlockId);
+                        await chatResultStream.overwriteResultBlock(this.#getUpdateToolConfirmResult(toolUse, false, toolUse.name), cachedButtonBlockId);
                         if (err.shouldShowMessage) {
                             await chatResultStream.writeResultBlock({
                                 type: 'answer',
@@ -1132,8 +1155,8 @@ class AgenticChatController {
      * @param toolType Optional tool type for specialized handling
      * @returns ChatResult with appropriate confirmation UI
      */
-    #getUpdateToolConfirmResult(toolUse, isAccept, toolType) {
-        const toolName = toolType || toolUse.name;
+    #getUpdateToolConfirmResult(toolUse, isAccept, originalToolName, toolType) {
+        const toolName = originalToolName ?? (toolType || toolUse.name);
         // Handle bash commands with special formatting
         if (toolName === 'executeBash') {
             return {
@@ -1184,7 +1207,7 @@ class AgenticChatController {
                 body = `File search ${isAccept ? 'allowed' : 'rejected'}: \`${searchPath}\``;
                 break;
             default:
-                // Default tool (not MCP)
+                // Default tool (not only MCP)
                 return {
                     type: 'tool',
                     messageId: toolUse.toolUseId,
@@ -1192,7 +1215,7 @@ class AgenticChatController {
                         content: {
                             header: {
                                 icon: 'tools',
-                                body: `${toolUse.name}`,
+                                body: `${toolName}`,
                                 status: {
                                     status: isAccept ? 'success' : 'error',
                                     icon: isAccept ? 'ok' : 'cancel',
@@ -1594,7 +1617,8 @@ class AgenticChatController {
                 cwsprChatHasContextList: triggerContext.documentReference?.filePaths?.length ? true : false,
                 cwsprChatFolderContextCount: triggerContext.contextInfo.contextCount.folderContextCount,
                 cwsprChatFileContextCount: triggerContext.contextInfo.contextCount.fileContextCount,
-                cwsprChatRuleContextCount: triggerContext.contextInfo.contextCount.ruleContextCount,
+                cwsprChatRuleContextCount: triggerContext.contextInfo.contextCount.activeRuleContextCount,
+                cwsprChatTotalRuleContextCount: triggerContext.contextInfo.contextCount.totalRuleContextCount,
                 cwsprChatPromptContextCount: triggerContext.contextInfo.contextCount.promptContextCount,
                 cwsprChatFileContextLength: triggerContext.contextInfo.contextLength.fileContextLength,
                 cwsprChatRuleContextLength: triggerContext.contextInfo.contextLength.ruleContextLength,
@@ -1602,6 +1626,10 @@ class AgenticChatController {
                 cwsprChatCodeContextCount: triggerContext.contextInfo.contextCount.codeContextCount,
                 cwsprChatCodeContextLength: triggerContext.contextInfo.contextLength.codeContextLength,
                 cwsprChatFocusFileContextLength: triggerContext.text?.length,
+                cwsprChatPinnedCodeContextCount: triggerContext.contextInfo.pinnedContextCount.codeContextCount,
+                cwsprChatPinnedFileContextCount: triggerContext.contextInfo.pinnedContextCount.fileContextCount,
+                cwsprChatPinnedFolderContextCount: triggerContext.contextInfo.pinnedContextCount.folderContextCount,
+                cwsprChatPinnedPromptContextCount: triggerContext.contextInfo.pinnedContextCount.promptContextCount,
             });
         }
         await this.#telemetryController.emitAddMessageMetric(params.tabId, metric.metric, 'Succeeded');
@@ -1676,6 +1704,21 @@ class AgenticChatController {
                 buttons: [],
             };
             if (err.code === 'QModelResponse') {
+                // special case for throttling where we show error card instead of chat message
+                if (err.message ===
+                    `The model you selected is temporarily unavailable. Please switch to a different model and try again.`) {
+                    this.#features.chat.sendChatUpdate({
+                        tabId: tabId,
+                        data: { messages: [{ messageId: 'modelUnavailable' }] },
+                    });
+                    const emptyChatResult = {
+                        type: 'answer',
+                        body: '',
+                        messageId: errorMessageId,
+                        buttons: [],
+                    };
+                    return emptyChatResult;
+                }
                 return responseData;
             }
             return new server_interface_1.ResponseError(server_interface_1.LSPErrorCodes.RequestFailed, err.message, responseData);
@@ -1730,6 +1773,11 @@ class AgenticChatController {
     async onInlineChatResult(params) {
         await this.#telemetryService.emitInlineChatResultLog(params);
     }
+    async onActiveEditorChanged(params) {
+        if (this.#telemetryController.activeTabId) {
+            this.sendPinnedContext(this.#telemetryController.activeTabId);
+        }
+    }
     async onCodeInsertToCursorPosition(params) {
         // Implementation based on https://github.com/aws/aws-toolkit-vscode/blob/1814cc84228d4bf20270574c5980b91b227f31cf/packages/core/src/amazonq/commons/controllers/contentController.ts#L38
         if (!params.textDocument || !params.cursorPosition || !params.code) {
@@ -1876,6 +1924,9 @@ class AgenticChatController {
         // In that case, we use the default modelId.
         const modelId = this.#chatHistoryDb.getModelId() ?? constants_2.defaultModelId;
         this.#features.chat.chatOptionsUpdate({ modelId: modelId, tabId: params.tabId });
+        if (!params.restoredTab) {
+            this.sendPinnedContext(params.tabId);
+        }
         const sessionResult = this.#chatSessionManagementService.createSession(params.tabId);
         const { data: session, success } = sessionResult;
         if (!success) {
@@ -1894,12 +1945,16 @@ class AgenticChatController {
             data: {},
         });
         this.#telemetryController.activeTabId = params.tabId;
+        this.sendPinnedContext(params.tabId);
         this.#telemetryController.emitConversationMetric({
             name: types_1.ChatTelemetryEventName.EnterFocusConversation,
             data: {},
         });
         this.setPaidTierMode(params.tabId);
     }
+    sendPinnedContext(tabId) {
+        this.#additionalContextProvider.sendPinnedContext(tabId);
+    }
     onTabRemove(params) {
         if (this.#telemetryController.activeTabId === params.tabId) {
             this.#telemetryController.emitConversationMetric({
@@ -1942,6 +1997,12 @@ class AgenticChatController {
                 return {};
         }
     }
+    onPinnedContextAdd(params) {
+        this.#additionalContextProvider.onPinnedContextAdd(params);
+    }
+    onPinnedContextRemove(params) {
+        this.#additionalContextProvider.onPinnedContextRemove(params);
+    }
     async onTabBarAction(params) {
         return this.#tabBarController.onTabBarAction(params);
     }