Merge upstream/main into temp-merge-branch

Author: ashishrp-aws

.release-please-manifest.json

@@ -2,7 +2,7 @@
     "chat-client": "0.1.13",
     "core/aws-lsp-core": "0.0.9",
     "server/aws-lsp-antlr4": "0.1.10",
-    "server/aws-lsp-codewhisperer": "0.0.42",
+    "server/aws-lsp-codewhisperer": "0.0.44",
     "server/aws-lsp-json": "0.1.10",
     "server/aws-lsp-partiql": "0.0.11",
     "server/aws-lsp-yaml": "0.1.10"

chat-client/src/client/mynahUi.ts

@@ -817,6 +817,7 @@ export const createMynahUi = (
         if (chatResult.body === '' && isValidAuthFollowUp) {
             // @ts-expect-error - type for MynahUI differs from ChatResult types so we ignore it
             mynahUi.addChatItem(tabId, {
+                ...(chatResultWithoutType as ChatItem),
                 type: ChatItemType.SYSTEM_PROMPT,
                 ...chatResultWithoutTypeSummary,
             })

package-lock.json

@@ -1,5 +1,21 @@
 # Changelog
 
+## [0.0.44](https://github.com/aws/language-servers/compare/lsp-codewhisperer/v0.0.43...lsp-codewhisperer/v0.0.44) (2025-06-05)
+
+
+### Bug Fixes
+
+* **amazonq:** always restore chat tabs when onReady is received ([#1524](https://github.com/aws/language-servers/issues/1524)) ([54fa813](https://github.com/aws/language-servers/commit/54fa813eb124cc3e59c30390a9ec2cc7303f9a1d))
+* rename fuzzySearch tool name ([#1512](https://github.com/aws/language-servers/issues/1512)) ([4d65c92](https://github.com/aws/language-servers/commit/4d65c92c87fb1138fcaa6f023518122823b60ba4))
+
+## [0.0.43](https://github.com/aws/language-servers/compare/lsp-codewhisperer/v0.0.42...lsp-codewhisperer/v0.0.43) (2025-06-04)
+
+
+### Bug Fixes
+
+* disable grep search ([#1514](https://github.com/aws/language-servers/issues/1514)) ([f4f66fa](https://github.com/aws/language-servers/commit/f4f66fa3d5f8a335ae696506a4e92afe0deb262b))
+* model doesn't update in session for new tabs ([#1506](https://github.com/aws/language-servers/issues/1506)) ([89aa1ef](https://github.com/aws/language-servers/commit/89aa1efade5ff9421eaf8c66db55d0a9fb8bd283))
+
 ## [0.0.42](https://github.com/aws/language-servers/compare/lsp-codewhisperer/v0.0.41...lsp-codewhisperer/v0.0.42) (2025-06-02)
 
 

server/aws-lsp-codewhisperer/CHANGELOG.md

@@ -1,6 +1,6 @@
 {
     "name": "@aws/lsp-codewhisperer",
-    "version": "0.0.42",
+    "version": "0.0.44",
     "description": "CodeWhisperer Language Server",
     "main": "out/index.js",
     "repository": {

server/aws-lsp-codewhisperer/package.json

@@ -112,7 +112,7 @@ import { FsWrite, FsWriteParams } from './tools/fsWrite'
 import { ExecuteBash, ExecuteBashParams } from './tools/executeBash'
 import { ExplanatoryParams, ToolApprovalException } from './tools/toolShared'
 import { GrepSearch, SanitizedRipgrepOutput } from './tools/grepSearch'
-import { FuzzySearch, FuzzySearchParams } from './tools/fuzzySearch'
+import { FileSearch, FileSearchParams } from './tools/fileSearch'
 import { loggingUtils } from '@aws/lsp-core'
 import { diffLines } from 'diff'
 import {
@@ -125,12 +125,13 @@ import {
 } from './constants'
 import { AgenticChatError, customerFacingErrorCodes, isRequestAbortedError, unactionableErrorCodes } from './errors'
 import { URI } from 'vscode-uri'
-import { McpManager } from './tools/mcp/mcpManager'
-import { McpTool } from './tools/mcp/mcpTool'
+import { AgenticChatError, customerFacingErrorCodes, isRequestAbortedError, unactionableErrorCodes } from './errors'
 import { CommandCategory } from './tools/executeBash'
 import { UserWrittenCodeTracker } from '../../shared/userWrittenCodeTracker'
 import { McpEventHandler } from './tools/mcp/mcpEventHandler'
 import { enabledMCP, createNamespacedToolName } from './tools/mcp/mcpUtils'
+import { McpManager } from './tools/mcp/mcpManager'
+import { McpTool } from './tools/mcp/mcpTool'
 
 type ChatHandlers = Omit<
     LspHandlers<Chat>,
@@ -952,7 +953,7 @@ export class AgenticChatController implements ChatHandlers {
                     case 'fsRead':
                     case 'listDirectory':
                     case 'grepSearch':
-                    case 'fuzzySearch':
+                    case 'fileSearch':
                     case 'fsWrite':
                     case 'executeBash': {
                         const toolMap = {
@@ -2362,6 +2363,7 @@ export class AgenticChatController implements ChatHandlers {
             return new ResponseError<ChatResult>(ErrorCodes.InternalError, sessionResult.error)
         }
         session.modelId = modelId
+
         if (success && session) {
             // Set the logging object on the session
             session.setLogging(this.#features.logging)

server/aws-lsp-codewhisperer/src/language-server/agenticChat/agenticChatController.ts

@@ -37,34 +37,34 @@ describe('FuzzySearch Tool', () => {
     it('invalidates empty path', async () => {
         const fuzzySearch = new FuzzySearch(testFeatures)
         await assert.rejects(
-            fuzzySearch.validate({ path: '', queryName: 'test' }),
+            fileSearch.validate({ path: '', queryName: 'test' }),
             /Path cannot be empty/i,
             'Expected an error about empty path'
         )
     })
 
     it('invalidates invalid threshold pattern', async () => {
-        const fuzzySearch = new FuzzySearch(testFeatures)
+        const fileSearch = new FileSearch(testFeatures)
         await assert.rejects(
-            fuzzySearch.validate({ path: tempFolder.path, queryName: 'test', threshold: -1 }),
+            fileSearch.validate({ path: tempFolder.path, queryName: 'test', threshold: -1 }),
             /Invalid threshold/i,
             'Expected an error about invalid threshold'
         )
     })
 
     it('invalidates empty maxDepth', async () => {
-        const fuzzySearch = new FuzzySearch(testFeatures)
+        const fileSearch = new FileSearch(testFeatures)
         await assert.rejects(
-            fuzzySearch.validate({ path: tempFolder.path, queryName: 'test', maxDepth: -1 }),
+            fileSearch.validate({ path: tempFolder.path, queryName: 'test', maxDepth: -1 }),
             /MaxDepth cannot be negative/i,
             'Expected an error about negative maxDepth'
         )
     })
 
     it('invalidates empty queryName', async () => {
-        const fuzzySearch = new FuzzySearch(testFeatures)
+        const fileSearch = new FileSearch(testFeatures)
         await assert.rejects(
-            fuzzySearch.validate({ path: tempFolder.path, queryName: '' }),
+            fileSearch.validate({ path: tempFolder.path, queryName: '' }),
             /queryName cannot be empty/i,
             'Expected an error about empty queryName'
         )
@@ -208,7 +208,7 @@ describe('FuzzySearch Tool', () => {
         const fuzzySearch = new FuzzySearch(testFeatures)
 
         await assert.rejects(
-            fuzzySearch.invoke({ path: missingPath, queryName: '.*' }),
+            fileSearch.invoke({ path: missingPath, queryName: '.*' }),
             /Failed to search directory/i,
             'Expected an error about non-existent path'
         )

server/aws-lsp-codewhisperer/src/language-server/agenticChat/tools/fuzzySearch.test.ts

@@ -43,19 +43,16 @@ export class FuzzySearch {
         }
     }
 
-    public async queueDescription(params: FuzzySearchParams, updates: WritableStream, requiresAcceptance: boolean) {
+    public async queueDescription(params: FileSearchParams, updates: WritableStream, requiresAcceptance: boolean) {
         // deprecated, no-op
         return
     }
 
-    public async requiresAcceptance(
-        params: FuzzySearchParams,
-        approvedPaths?: Set<string>
-    ): Promise<CommandValidation> {
+    public async requiresAcceptance(params: FileSearchParams, approvedPaths?: Set<string>): Promise<CommandValidation> {
         return requiresPathAcceptance(params.path, this.workspace, this.logging, approvedPaths)
     }
 
-    public async invoke(params: FuzzySearchParams, token?: CancellationToken): Promise<InvokeOutput> {
+    public async invoke(params: FileSearchParams, token?: CancellationToken): Promise<InvokeOutput> {
         const path = sanitize(params.path)
         try {
             // Get all files and directories
@@ -117,7 +114,7 @@ export class FuzzySearch {
                 'It ignores common build and dependency directories.\n\n' +
                 '## When to use\n' +
                 '- When you need to locate files or folders by approximate names\n' +
-                "- When you don't know exact names\n" +
+                "- When you don't know exact names of files or directories\n" +
                 '- When you want to skip a listDirectory step\n\n' +
                 '## When not to use\n' +
                 '- When you need to search file contents\n' +

server/aws-lsp-codewhisperer/src/language-server/agenticChat/tools/fuzzySearch.ts

@@ -8,6 +8,8 @@ import { LspReadDocumentContents, LspReadDocumentContentsParams } from './lspRea
 import { LspApplyWorkspaceEdit, LspApplyWorkspaceEditParams } from './lspApplyWorkspaceEdit'
 import { AGENT_TOOLS_CHANGED, McpManager } from './mcp/mcpManager'
 import { McpTool } from './mcp/mcpTool'
+import { FileSearch, FileSearchParams } from './fileSearch'
+import { GrepSearch } from './grepSearch'
 import { McpToolDefinition } from './mcp/mcpTypes'
 import {
     getGlobalMcpConfigPath,
@@ -17,14 +19,12 @@ import {
     createNamespacedToolName,
     enabledMCP,
 } from './mcp/mcpUtils'
-import { FuzzySearch, FuzzySearchParams } from './fuzzySearch'
-import { GrepSearch, GrepSearchParams } from './grepSearch'
 
 export const FsToolsServer: Server = ({ workspace, logging, agent, lsp }) => {
     const fsReadTool = new FsRead({ workspace, lsp, logging })
     const fsWriteTool = new FsWrite({ workspace, lsp, logging })
     const listDirectoryTool = new ListDirectory({ workspace, logging, lsp })
-    const fuzzySearchTool = new FuzzySearch({ workspace, lsp, logging })
+    const fileSearchTool = new FileSearch({ workspace, lsp, logging })
     const grepSearchTool = new GrepSearch({ workspace, logging, lsp })
 
     agent.addTool(fsReadTool.getSpec(), async (input: FsReadParams) => {
@@ -42,9 +42,9 @@ export const FsToolsServer: Server = ({ workspace, logging, agent, lsp }) => {
         return await listDirectoryTool.invoke(input, token)
     })
 
-    agent.addTool(fuzzySearchTool.getSpec(), async (input: FuzzySearchParams, token?: CancellationToken) => {
-        await fuzzySearchTool.validate(input)
-        return await fuzzySearchTool.invoke(input, token)
+    agent.addTool(fileSearchTool.getSpec(), async (input: FileSearchParams, token?: CancellationToken) => {
+        await fileSearchTool.validate(input)
+        return await fileSearchTool.invoke(input, token)
     })
 
     // Temporarily disable grep search

server/aws-lsp-codewhisperer/src/language-server/agenticChat/tools/toolServer.ts

@@ -160,6 +160,7 @@ export class ChatSessionService {
                 if (this.#logging) {
                     this.#logging.error(`Error in generateAssistantResponse: ${loggingUtils.formatErr(e)}`)
                 }
+
                 if (isRequestAbortedError(e)) {
                     const requestId =
                         e instanceof CodeWhispererStreamingServiceException ? e.$metadata?.requestId : undefined