@aws/lsp-codewhisperer 0.0.52 → 0.0.54

package/CHANGELOG.md

@@ -1,5 +1,35 @@
 # Changelog
 
+## [0.0.54](https://github.com/aws/language-servers/compare/lsp-codewhisperer/v0.0.53...lsp-codewhisperer/v0.0.54) (2025-06-19)
+
+
+### Features
+
+* adding current working directory to the stdio transport for mcp… ([#1691](https://github.com/aws/language-servers/issues/1691)) ([02c4d64](https://github.com/aws/language-servers/commit/02c4d645a8c2778deab7af9f5377c26e99d01f20))
+
+
+### Bug Fixes
+
+* add fsReplace tool to batch edits ([#1533](https://github.com/aws/language-servers/issues/1533)) ([4125134](https://github.com/aws/language-servers/commit/4125134f6e7eee8276d6146a507834b3309c2ec5))
+* **amazonq:** itemid was accidentally removed by [#1689](https://github.com/aws/language-servers/issues/1689) ([#1698](https://github.com/aws/language-servers/issues/1698)) ([33524c0](https://github.com/aws/language-servers/commit/33524c092af8088705a3cbae09c6249ad5940ce6))
+* **amazonq:** profile is not set after re-auth ([#1690](https://github.com/aws/language-servers/issues/1690)) ([2a445ee](https://github.com/aws/language-servers/commit/2a445eef4cc2a70471fd1fc49e6ca4e301051442))
+* diff reports no lines added or removed ([#1549](https://github.com/aws/language-servers/issues/1549)) ([562f13e](https://github.com/aws/language-servers/commit/562f13e0223a8a01fefc9ca449aad02da9734709))
+* thinking doesn't get removed if response is empty ([#1699](https://github.com/aws/language-servers/issues/1699)) ([9a63c99](https://github.com/aws/language-servers/commit/9a63c99b3195c9da0f537980324998138f25a3fa))
+
+
+### Reverts
+
+* **amazonq:** bring back [#1684](https://github.com/aws/language-servers/issues/1684) ([#1697](https://github.com/aws/language-servers/issues/1697)) ([5e7aa76](https://github.com/aws/language-servers/commit/5e7aa76b6ebcf8e0a7489d3574cc14ed3d0ceebe))
+* **amazonq:** bring back [#1689](https://github.com/aws/language-servers/issues/1689) ([5b84b0e](https://github.com/aws/language-servers/commit/5b84b0e4c42c344d91ef9c99a04d3a2671221aa1))
+
+## [0.0.53](https://github.com/aws/language-servers/compare/lsp-codewhisperer/v0.0.52...lsp-codewhisperer/v0.0.53) (2025-06-18)
+
+
+### Reverts
+
+* **amazonq:** fix filter languages at workspace context server onDeleteFiles ([403c26a](https://github.com/aws/language-servers/commit/403c26a91f25d0035d92bfd21835b747a0dbafce))
+* **amazonq:** nep cherrypick codewhispererService.ts ([#1689](https://github.com/aws/language-servers/issues/1689))" ([#1692](https://github.com/aws/language-servers/issues/1692)) ([69f1071](https://github.com/aws/language-servers/commit/69f10717c2eff8d4479ffa8a18220e15c03f865d))
+
 ## [0.0.52](https://github.com/aws/language-servers/compare/lsp-codewhisperer/v0.0.51...lsp-codewhisperer/v0.0.52) (2025-06-17)
 
 

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

@@ -40,6 +40,7 @@ const executeBash_1 = require("./tools/executeBash");
 const toolShared_1 = require("./tools/toolShared");
 const grepSearch_1 = require("./tools/grepSearch");
 const fileSearch_1 = require("./tools/fileSearch");
+const fsReplace_1 = require("./tools/fsReplace");
 const lsp_core_2 = require("@aws/lsp-core");
 const diff_1 = require("diff");
 const constants_2 = require("./constants");
@@ -718,11 +719,11 @@ class AgenticChatController {
                 // remove progress UI
                 await chatResultStream.removeResultBlockAndUpdateUI(agenticChatResultStream_1.progressPrefix + toolUse.toolUseId);
                 // fsRead and listDirectory write to an existing card and could show nothing in the current position
-                if (!['fsWrite', 'fsRead', 'listDirectory'].includes(toolUse.name)) {
+                if (!['fsWrite', 'fsReplace', 'fsRead', 'listDirectory'].includes(toolUse.name)) {
                     await this.#showUndoAllIfRequired(chatResultStream, session);
                 }
                 // fsWrite can take a long time, so we render fsWrite  Explanatory upon partial streaming responses.
-                if (toolUse.name !== 'fsWrite') {
+                if (toolUse.name !== 'fsWrite' && toolUse.name !== 'fsReplace') {
                     const { explanation } = toolUse.input;
                     if (explanation) {
                         await chatResultStream.writeResultBlock({
@@ -738,11 +739,13 @@ class AgenticChatController {
                     case 'grepSearch':
                     case 'fileSearch':
                     case 'fsWrite':
+                    case 'fsReplace':
                     case 'executeBash': {
                         const toolMap = {
                             fsRead: { Tool: fsRead_1.FsRead },
                             listDirectory: { Tool: listDirectory_1.ListDirectory },
                             fsWrite: { Tool: fsWrite_1.FsWrite },
+                            fsReplace: { Tool: fsReplace_1.FsReplace },
                             executeBash: { Tool: executeBash_1.ExecuteBash },
                             grepSearch: { Tool: grepSearch_1.GrepSearch },
                             fileSearch: { Tool: fileSearch_1.FileSearch },
@@ -776,9 +779,6 @@ class AgenticChatController {
                         }
                         break;
                     }
-                    case 'codeSearch':
-                        // no need to write tool message for code search.
-                        break;
                     // — DEFAULT ⇒ Only MCP tools, but can also handle generic tool execution messages
                     default:
                         // Get original server and tool names from the mapping
@@ -811,9 +811,9 @@ class AgenticChatController {
                         }
                         break;
                 }
-                if (toolUse.name === 'fsWrite') {
+                if (toolUse.name === 'fsWrite' || toolUse.name === 'fsReplace') {
                     const input = toolUse.input;
-                    const document = await this.#triggerContext.getTextDocument(input.path);
+                    const document = await this.#triggerContext.getTextDocumentFromPath(input.path, true, true);
                     session.toolUseLookup.set(toolUse.toolUseId, {
                         ...toolUse,
                         fileChange: { before: document?.getText() },
@@ -864,9 +864,16 @@ class AgenticChatController {
                             await chatResultStream.writeResultBlock(grepSearchResult);
                         }
                         break;
+                    case 'fsReplace':
                     case 'fsWrite':
                         const input = toolUse.input;
-                        const doc = await this.#triggerContext.getTextDocument(input.path);
+                        // Load from the filesystem instead of workspace.
+                        // Workspace is likely out of date - when files
+                        // are modified external to the IDE, many IDEs
+                        // will only update their file contents (which
+                        // then propagates to the LSP) if/when that
+                        // document receives focus.
+                        const doc = await this.#triggerContext.getTextDocumentFromPath(input.path, false, true);
                         const chatResult = await this.#getFsWriteChatResult(toolUse, doc, session);
                         const cachedToolUse = session.toolUseLookup.get(toolUse.toolUseId);
                         if (cachedToolUse) {
@@ -934,7 +941,7 @@ class AgenticChatController {
                     }
                 }
                 // display fs write failure status in the UX of that file card
-                if (toolUse.name === 'fsWrite' && toolUse.toolUseId) {
+                if ((toolUse.name === 'fsWrite' || toolUse.name === 'fsReplace') && toolUse.toolUseId) {
                     const existingCard = chatResultStream.getMessageBlockId(toolUse.toolUseId);
                     const fsParam = toolUse.input;
                     const fileName = path.basename(fsParam.path);
@@ -1025,7 +1032,7 @@ class AgenticChatController {
         if (toolUse.name === 'fsRead' || toolUse.name === 'listDirectory') {
             return;
         }
-        if (toolUse.name === 'fsWrite') {
+        if (toolUse.name === 'fsWrite' || toolUse.name === 'fsReplace') {
             if (session.currentUndoAllId === undefined) {
                 session.currentUndoAllId = toolUse.toolUseId;
             }
@@ -1203,6 +1210,7 @@ class AgenticChatController {
         let header;
         let body;
         switch (toolName) {
+            case 'fsReplace':
             case 'fsWrite':
             case 'fsRead':
             case 'listDirectory':
@@ -1336,6 +1344,7 @@ class AgenticChatController {
                 body = '```shell\n' + commandString;
                 break;
             }
+            case 'fsReplace':
             case 'fsWrite': {
                 const writeFilePath = toolUse.input.path;
                 buttons = [{ id: 'allow-tools', text: 'Allow', icon: 'ok', status: 'clear' }];
@@ -1890,7 +1899,7 @@ class AgenticChatController {
         const session = this.#chatSessionManagementService.getSession(params.tabId);
         const toolUseId = params.messageId;
         const toolUse = toolUseId ? session.data?.toolUseLookup.get(toolUseId) : undefined;
-        if (toolUse?.name === 'fsWrite') {
+        if (toolUse?.name === 'fsWrite' || toolUse?.name === 'fsReplace') {
             const input = toolUse.input;
             this.#features.lsp.workspace.openFileDiff({
                 originalFileUri: input.path,
@@ -2355,7 +2364,7 @@ class AgenticChatController {
         }
         const toolUses = Object.values(data.toolUses);
         for (const toolUse of toolUses) {
-            if (toolUse.name === 'fsWrite' && typeof toolUse.input === 'string') {
+            if ((toolUse.name === 'fsWrite' || toolUse.name === 'fsReplace') && typeof toolUse.input === 'string') {
                 const filepath = extractKey(toolUse.input, 'path');
                 const msgId = agenticChatResultStream_1.progressPrefix + toolUse.toolUseId;
                 // render fs write UI as soon as fs write starts
@@ -2382,7 +2391,7 @@ class AgenticChatController {
                         },
                     });
                 }
-                // render the tool use explanatory as soon as this is received for fsWrite
+                // render the tool use explanatory as soon as this is received for fsWrite/fsReplace
                 const explanation = extractKey(toolUse.input, 'explanation');
                 const messageId = agenticChatResultStream_1.progressPrefix + toolUse.toolUseId + '_explanation';
                 if (explanation && !chatResultStream.hasMessage(messageId)) {
@@ -2407,7 +2416,9 @@ class AgenticChatController {
         }
         const toolUseStartTimes = {};
         const toolUseLoadingTimeouts = {};
+        let isEmptyResponse = true;
         for await (const chatEvent of response.generateAssistantResponseResponse) {
+            isEmptyResponse = false;
             if (abortSignal?.aborted) {
                 throw new Error('Operation was aborted');
             }
@@ -2433,6 +2444,10 @@ class AgenticChatController {
                 await this.#showToolUseIntermediateResult(result.data, chatResultStream, streamWriter);
             }
         }
+        if (isEmptyResponse) {
+            // If the response is empty, we need to send an empty answer message to remove the Thinking... indicator
+            await streamWriter.write({ type: 'answer', body: '', messageId: (0, uuid_1.v4)() });
+        }
         await streamWriter.close();
         metric.mergeWith({
             cwsprChatFullResponseLatency: metric.getTimeElapsed(),
@@ -2538,7 +2553,7 @@ class AgenticChatController {
         const allTools = this.#features.agent.getTools({ format: 'bedrock' });
         if (!(0, mcpUtils_1.enabledMCP)(this.#features.lsp.getClientInitializeParams())) {
             if (!session.pairProgrammingMode) {
-                return allTools.filter(tool => !['fsWrite', 'executeBash'].includes(tool.toolSpecification?.name || ''));
+                return allTools.filter(tool => !['fsWrite', 'fsReplace', 'executeBash'].includes(tool.toolSpecification?.name || ''));
             }
             return allTools;
         }