@aws/lsp-codewhisperer 0.0.60 → 0.0.62

package/CHANGELOG.md

@@ -1,5 +1,39 @@
 # Changelog
 
+## [0.0.62](https://github.com/aws/language-servers/compare/lsp-codewhisperer/v0.0.61...lsp-codewhisperer/v0.0.62) (2025-07-02)
+
+
+### Bug Fixes
+
+* **amazonq:** show active file in Context dropdown ([#1815](https://github.com/aws/language-servers/issues/1815)) ([fe1156c](https://github.com/aws/language-servers/commit/fe1156cdd6becbda4b7218cbb06f615a5d919def))
+
+## [0.0.61](https://github.com/aws/language-servers/compare/lsp-codewhisperer/v0.0.60...lsp-codewhisperer/v0.0.61) (2025-07-02)
+
+
+### Features
+
+* add logic to merge with previous suggestions for EDITS ([#1791](https://github.com/aws/language-servers/issues/1791)) ([072d13b](https://github.com/aws/language-servers/commit/072d13b08168f256ea3695bea03cf37b27d91f81))
+* **amazonq:** migrating / agents to q agentic chat ([#1799](https://github.com/aws/language-servers/issues/1799)) ([559b2ba](https://github.com/aws/language-servers/commit/559b2baec7da7b8fffb697990e3b249ffffcb85c))
+* **amazonq:** read and validate the images as context ([#1716](https://github.com/aws/language-servers/issues/1716)) ([7a5d41f](https://github.com/aws/language-servers/commit/7a5d41f3cff7309d04d952fbb5dc063fb8658a06))
+
+
+### Bug Fixes
+
+* adjust vs code auto trigger coefficients ([#1806](https://github.com/aws/language-servers/issues/1806)) ([25b1d1a](https://github.com/aws/language-servers/commit/25b1d1a1930f7d0cb922d3a085cbaac2a09340b9))
+* **amazonq:** remove the stack trace check from service unavailable exceptions ([#1810](https://github.com/aws/language-servers/issues/1810)) ([a5677f0](https://github.com/aws/language-servers/commit/a5677f03d54aa8e42a71e71c524700c23825ed35))
+
+* **amazonq:** send pinned context and rules as message pair ([#1762](https://github.com/aws/language-servers/issues/1762)) ([322add6](https://github.com/aws/language-servers/commit/322add6f8b3b6edd5b3e4b37fc783a1079f15596))
+* connect chat history to workspace file ([#1767](https://github.com/aws/language-servers/issues/1767)) ([4575727](https://github.com/aws/language-servers/commit/4575727911a4efb21a3f24a3d400c7844451c243))
+* do not auto trigger when there is immediate right context for VSC/JB ([#1802](https://github.com/aws/language-servers/issues/1802)) ([fdb29d4](https://github.com/aws/language-servers/commit/fdb29d472c5a0bc7e0a89f5611245248c380cfe8))
+* setting shouldDisplayMessage to false for /agents ([#1811](https://github.com/aws/language-servers/issues/1811)) ([4a72cf7](https://github.com/aws/language-servers/commit/4a72cf7bbc9081f65c4e88c3ab42441a21ec6e03))
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * dependencies
+    * @aws/lsp-core bumped from ^0.0.10 to ^0.0.11
+
 ## [0.0.60](https://github.com/aws/language-servers/compare/lsp-codewhisperer/v0.0.59...lsp-codewhisperer/v0.0.60) (2025-06-30)
 
 

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

@@ -4,7 +4,7 @@
  */
 import { ToolUse } from '@amzn/codewhisperer-streaming';
 import { ChatCommandInput } from '../../shared/streamingClientService';
-import { Status, ButtonClickParams, ButtonClickResult, InlineChatResultParams, PromptInputOptionChangeParams, RuleClickParams, ListRulesParams, ActiveEditorChangedParams, PinnedContextParams, ExecuteCommandParams, FollowUpClickParams } from '@aws/language-server-runtimes/protocol';
+import { Status, ButtonClickParams, ButtonClickResult, InlineChatResultParams, PromptInputOptionChangeParams, RuleClickParams, ListRulesParams, ActiveEditorChangedParams, PinnedContextParams, ExecuteCommandParams, FollowUpClickParams, OpenFileDialogParams, OpenFileDialogResult } from '@aws/language-server-runtimes/protocol';
 import { FeedbackParams, InsertToCursorPositionParams, InlineChatParams, ConversationClickParams, ListConversationsParams, ListMcpServersParams, McpServerClickParams, TabBarActionParams, CreatePromptParams, FileClickParams } from '@aws/language-server-runtimes/protocol';
 import { CancellationToken, Chat, ChatParams, ChatResult, EndChatParams, QuickActionParams, ResponseError, TabAddParams, TabRemoveParams, TabChangeParams, InlineChatResult } from '@aws/language-server-runtimes/server-interface';
 import { Features, LspHandlers } from '../types';
@@ -14,13 +14,15 @@ import { AmazonQBaseServiceManager } from '../../shared/amazonQServiceManager/Ba
 import { AmazonQWorkspaceConfig } from '../../shared/amazonQServiceManager/configurationUtils';
 import { ChatSessionService } from '../chat/chatSessionService';
 import { AgenticChatResultStream } from './agenticChatResultStream';
+import { AdditionalContentEntryAddition } from './context/agenticChatTriggerContext';
 import { PaidTierMode } from '../paidTier/paidTier';
-type ChatHandlers = Omit<LspHandlers<Chat>, 'openTab' | 'sendChatUpdate' | 'sendContextCommands' | 'onListConversations' | 'onConversationClick' | 'onListMcpServers' | 'onMcpServerClick' | 'onTabBarAction' | 'getSerializedChat' | 'chatOptionsUpdate' | 'onListMcpServers' | 'onMcpServerClick' | 'onListRules' | 'sendPinnedContext' | 'onActiveEditorChanged' | 'onPinnedContextAdd' | 'onPinnedContextRemove' | 'onOpenFileDialog'>;
+type ChatHandlers = Omit<LspHandlers<Chat>, 'openTab' | 'sendChatUpdate' | 'sendContextCommands' | 'onListConversations' | 'onConversationClick' | 'onListMcpServers' | 'onMcpServerClick' | 'onTabBarAction' | 'getSerializedChat' | 'chatOptionsUpdate' | 'onListMcpServers' | 'onMcpServerClick' | 'onListRules' | 'sendPinnedContext' | 'onActiveEditorChanged' | 'onPinnedContextAdd' | 'onPinnedContextRemove' | 'onOpenFileDialog' | 'onListAvailableModels'>;
 export declare class AgenticChatController implements ChatHandlers {
     #private;
     constructor(chatSessionManagementService: ChatSessionManagementService, features: Features, telemetryService: TelemetryService, serviceManager?: AmazonQBaseServiceManager);
     onExecuteCommand(params: ExecuteCommandParams, _token: CancellationToken): Promise<any>;
     onButtonClick(params: ButtonClickParams): Promise<ButtonClickResult>;
+    onOpenFileDialog(params: OpenFileDialogParams, token: CancellationToken): Promise<OpenFileDialogResult>;
     onCreatePrompt(params: CreatePromptParams): Promise<void>;
     dispose(): void;
     onListConversations(params: ListConversationsParams): Promise<import("@aws/language-server-runtimes/protocol").ListConversationsResult>;
@@ -41,12 +43,13 @@ export declare class AgenticChatController implements ChatHandlers {
     }>;
     onMcpServerClick(params: McpServerClickParams): Promise<any>;
     onChatPrompt(params: ChatParams, token: CancellationToken): Promise<ChatResult | ResponseError<ChatResult>>;
+    truncatePinnedContext(remainingCharacterBudget: number, pinnedContext?: AdditionalContentEntryAddition[]): number;
     /**
      * performs truncation of request before sending to backend service.
      * Returns the remaining character budget for chat history.
      * @param request
      */
-    truncateRequest(request: ChatCommandInput): number;
+    truncateRequest(request: ChatCommandInput, pinnedContext?: AdditionalContentEntryAddition[]): number;
     /**
      * Creates a promise that does not resolve until the user accepts or rejects the tool usage.
      * @param toolUseId

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

@@ -28,7 +28,7 @@ const agenticChatEventParser_1 = require("./agenticChatEventParser");
 const agenticChatResultStream_1 = require("./agenticChatResultStream");
 const textFormatting_1 = require("./textFormatting");
 const agenticChatTriggerContext_1 = require("./context/agenticChatTriggerContext");
-const addtionalContextProvider_1 = require("./context/addtionalContextProvider");
+const additionalContextProvider_1 = require("./context/additionalContextProvider");
 const contextUtils_1 = require("./context/contextUtils");
 const contextCommandsProvider_1 = require("./context/contextCommandsProvider");
 const localProjectContextController_1 = require("../../shared/localProjectContextController");
@@ -54,6 +54,8 @@ const mcpManager_1 = require("./tools/mcp/mcpManager");
 const mcpTool_1 = require("./tools/mcp/mcpTool");
 const paidTier_1 = require("../paidTier/paidTier");
 const util_1 = require("./tools/chatDb/util");
+const imageVerification_1 = require("../../shared/imageVerification");
+const path_1 = require("@aws/lsp-core/out/util/path");
 class AgenticChatController {
     #features;
     #chatSessionManagementService;
@@ -104,7 +106,7 @@ class AgenticChatController {
         });
         this.#chatHistoryDb = new chatDb_1.ChatDatabase(features);
         this.#tabBarController = new tabBarController_1.TabBarController(features, this.#chatHistoryDb, telemetryService, (tabId) => this.sendPinnedContext(tabId));
-        this.#additionalContextProvider = new addtionalContextProvider_1.AdditionalContextProvider(features, this.#chatHistoryDb);
+        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);
         this.#mcpEventHandler = new mcpEventHandler_1.McpEventHandler(features, telemetryService);
         this.#origin = (0, utils_2.getOriginFromClientInfo)(this.#features.lsp.getClientInitializeParams()?.clientInfo?.name);
@@ -261,6 +263,71 @@ class AgenticChatController {
             await this.onButtonClick({ buttonId: 'undo-changes', messageId, tabId });
         }
     }
+    async onOpenFileDialog(params, token) {
+        if (params.fileType === 'image') {
+            // 1. Prompt user for file selection
+            const supportedExtensions = imageVerification_1.DEFAULT_IMAGE_VERIFICATION_OPTIONS.supportedExtensions;
+            const filters = { 'Image Files': supportedExtensions.map(ext => `*.${ext}`) };
+            const result = await this.#features.lsp.window.showOpenDialog({
+                canSelectFiles: true,
+                canSelectFolders: false,
+                canSelectMany: false,
+                filters,
+            });
+            if (!result.uris || result.uris.length === 0) {
+                return {
+                    tabId: params.tabId,
+                    filePaths: [],
+                    fileType: params.fileType,
+                    insertPosition: params.insertPosition,
+                    errorMessage: 'No file selected.',
+                };
+            }
+            const validFilePaths = [];
+            let errorMessage;
+            for (const filePath of result.uris) {
+                // Extract filename from the URI for error messages
+                const fileName = filePath.split('/').pop() || '';
+                const sanitizedPath = (0, path_1.sanitize)(filePath);
+                // Get file size and content for verification
+                const size = await this.#features.workspace.fs.getFileSize(sanitizedPath);
+                const fileContent = await this.#features.workspace.fs.readFile(sanitizedPath, {
+                    encoding: 'binary',
+                });
+                const imageBuffer = Buffer.from(fileContent, 'binary');
+                // Use centralized verification utility
+                const verificationResult = await (0, imageVerification_1.verifyServerImage)(fileName, size.size, imageBuffer);
+                if (verificationResult.isValid) {
+                    validFilePaths.push(filePath);
+                }
+                else {
+                    errorMessage = verificationResult.errors[0]; // Use first error message
+                }
+            }
+            if (validFilePaths.length === 0) {
+                return {
+                    tabId: params.tabId,
+                    filePaths: [],
+                    fileType: params.fileType,
+                    insertPosition: params.insertPosition,
+                    errorMessage: errorMessage || 'No valid image selected.',
+                };
+            }
+            // All valid files
+            return {
+                tabId: params.tabId,
+                filePaths: validFilePaths,
+                fileType: params.fileType,
+                insertPosition: params.insertPosition,
+            };
+        }
+        return {
+            tabId: params.tabId,
+            filePaths: [],
+            fileType: params.fileType,
+            insertPosition: params.insertPosition,
+        };
+    }
     async onCreatePrompt(params) {
         if (params.isRule) {
             let workspaceFolders = lsp_core_1.workspaceUtils.getWorkspaceFolderPaths(this.#features.workspace);
@@ -370,17 +437,31 @@ class AgenticChatController {
             });
             session.setConversationType('AgenticChat');
             const additionalContext = await this.#additionalContextProvider.getAdditionalContext(triggerContext, params.tabId, params.context);
-            if (additionalContext.length) {
-                triggerContext.documentReference =
-                    this.#additionalContextProvider.getFileListFromContext(additionalContext);
-            }
+            // Add active file to context list if it exists
+            const activeFile = triggerContext.text && triggerContext.relativeFilePath && triggerContext.activeFilePath
+                ? [
+                    {
+                        name: path.basename(triggerContext.relativeFilePath),
+                        description: '',
+                        type: 'file',
+                        relativePath: triggerContext.relativeFilePath,
+                        path: triggerContext.activeFilePath,
+                        startLine: -1,
+                        endLine: -1,
+                    },
+                ]
+                : [];
+            // Combine additional context with active file and get file list to display at top of response
+            const contextItems = [...additionalContext, ...activeFile];
+            triggerContext.documentReference = this.#additionalContextProvider.getFileListFromContext(contextItems);
+            const customContext = await this.#additionalContextProvider.getImageBlocksFromContext(params.context, params.tabId);
             // Get the initial request input
-            const initialRequestInput = await this.#prepareRequestInput(params, session, triggerContext, additionalContext, chatResultStream);
+            const initialRequestInput = await this.#prepareRequestInput(params, session, triggerContext, additionalContext, chatResultStream, customContext);
             // Generate a unique ID for this prompt
             const promptId = crypto.randomUUID();
             session.setCurrentPromptId(promptId);
             // Start the agent loop
-            const finalResult = await this.#runAgentLoop(initialRequestInput, session, metric, chatResultStream, params.tabId, promptId, session.conversationId, token, triggerContext.documentReference);
+            const finalResult = await this.#runAgentLoop(initialRequestInput, session, metric, chatResultStream, params.tabId, promptId, session.conversationId, token, triggerContext.documentReference, additionalContext.filter(item => item.pinned));
             // Phase 5: Result Handling - This happens only once
             return await this.#handleFinalResult(finalResult, session, params, metric, triggerContext, isNewConversation, chatResultStream);
         }
@@ -414,17 +495,17 @@ class AgenticChatController {
     /**
      * Prepares the initial request input for the chat prompt
      */
-    async #prepareRequestInput(params, session, triggerContext, additionalContext, chatResultStream) {
+    async #prepareRequestInput(params, session, triggerContext, additionalContext, chatResultStream, customContext) {
         this.#debug('Preparing request input');
         // Get profileArn from the service manager if available
         const profileArn = this.#serviceManager?.getActiveProfileArn();
-        const requestInput = await this.#triggerContext.getChatParamsFromTrigger(params, triggerContext, codewhisperer_streaming_1.ChatTriggerType.MANUAL, this.#customizationArn, chatResultStream, profileArn, [], this.#getTools(session), additionalContext, session.modelId, this.#origin);
+        const requestInput = await this.#triggerContext.getChatParamsFromTrigger(params, triggerContext, codewhisperer_streaming_1.ChatTriggerType.MANUAL, this.#customizationArn, chatResultStream, profileArn, [], this.#getTools(session), additionalContext, session.modelId, this.#origin, customContext);
         return requestInput;
     }
     /**
      * Runs the agent loop, making requests and processing tool uses until completion
      */
-    async #runAgentLoop(initialRequestInput, session, metric, chatResultStream, tabId, promptId, conversationIdentifier, token, documentReference) {
+    async #runAgentLoop(initialRequestInput, session, metric, chatResultStream, tabId, promptId, conversationIdentifier, token, documentReference, pinnedContext) {
         let currentRequestInput = { ...initialRequestInput };
         let finalResult = null;
         let iterationCount = 0;
@@ -441,17 +522,20 @@ class AgenticChatController {
                 this.#debug('Stopping agent loop - cancelled by user');
                 throw new lsp_core_1.CancellationError('user');
             }
-            this.truncateRequest(currentRequestInput);
+            this.truncateRequest(currentRequestInput, pinnedContext);
             const currentMessage = currentRequestInput.conversationState?.currentMessage;
             const conversationId = conversationIdentifier ?? '';
             if (!currentMessage || !conversationId) {
                 this.#debug(`Warning: ${!currentMessage ? 'currentMessage' : ''}${!currentMessage && !conversationId ? ' and ' : ''}${!conversationId ? 'conversationIdentifier' : ''} is empty in agent loop iteration ${iterationCount}.`);
             }
             let messages = [];
+            // Prepend pinned context to history as a fake message pair
+            // This ensures pinned context doesn't get added to history file, and fulfills API contract requiring message pairs.
+            let pinnedContextMessages = await this.#additionalContextProvider.convertPinnedContextToChatMessages(pinnedContext, this.#features.workspace.getWorkspaceFolder);
             if (currentMessage) {
                 //  Get and process the messages from history DB to maintain invariants for service requests
                 try {
-                    messages = this.#chatHistoryDb.fixAndGetHistory(tabId, currentMessage);
+                    messages = this.#chatHistoryDb.fixAndGetHistory(tabId, currentMessage, pinnedContextMessages);
                 }
                 catch (err) {
                     if (err instanceof chatDb_1.ToolResultValidationError) {
@@ -493,7 +577,8 @@ class AgenticChatController {
                         userIntent: currentMessage.userInputMessage?.userIntent,
                         origin: currentMessage.userInputMessage?.origin,
                         userInputMessageContext: currentMessage.userInputMessage?.userInputMessageContext,
-                        shouldDisplayMessage: shouldDisplayMessage,
+                        shouldDisplayMessage: shouldDisplayMessage &&
+                            !currentMessage.userInputMessage?.content?.startsWith('You are Amazon Q'),
                         timestamp: new Date(),
                     });
                 }
@@ -614,12 +699,30 @@ class AgenticChatController {
             data: { chatResult: {}, toolUses: {} },
         });
     }
+    truncatePinnedContext(remainingCharacterBudget, pinnedContext) {
+        if (!pinnedContext) {
+            return remainingCharacterBudget;
+        }
+        for (const [i, pinnedContextEntry] of pinnedContext.entries()) {
+            const pinnedContextEntryLength = pinnedContextEntry.innerContext?.length || 0;
+            if (remainingCharacterBudget >= pinnedContextEntryLength) {
+                remainingCharacterBudget -= pinnedContextEntryLength;
+            }
+            else {
+                // Budget exceeded, truncate the array at this point
+                pinnedContext.splice(i);
+                remainingCharacterBudget = 0;
+                break;
+            }
+        }
+        return remainingCharacterBudget;
+    }
     /**
      * performs truncation of request before sending to backend service.
      * Returns the remaining character budget for chat history.
      * @param request
      */
-    truncateRequest(request) {
+    truncateRequest(request, pinnedContext) {
         // TODO: Confirm if this limit applies to SendMessage and rename this constant
         let remainingCharacterBudget = constants_2.generateAssistantResponseInputLimit;
         if (!request?.conversationState?.currentMessage?.userInputMessage) {
@@ -668,6 +771,10 @@ class AgenticChatController {
             request.conversationState.currentMessage.userInputMessage.userInputMessageContext.editorState.document =
                 truncatedCurrentDocument;
         }
+        // 4. try to fit pinned context into budget
+        if (pinnedContext && pinnedContext.length > 0) {
+            remainingCharacterBudget = this.truncatePinnedContext(remainingCharacterBudget, pinnedContext);
+        }
         return remainingCharacterBudget;
     }
     /**