Sync feature smus inline suggestions branch from main commits

.github/workflows/create-release-candidate-branch.yml

@@ -44,6 +44,10 @@ jobs:
                   node-version: '20'
                   cache: 'npm'
 
+            # Needed to format the json file being checked in
+            - name: Install dependencies
+              run: npm ci
+
             - name: Calculate Release Version
               id: release-version
               env:
@@ -87,6 +91,9 @@ jobs:
 
                   git add "$VERSION_FILE"
 
+                  # Ensure the file does not cause issues when merged to main
+                  npm run format-staged
+
             - name: Create Release Candidate Branch
               id: release-branch
               env:
@@ -112,5 +119,5 @@ jobs:
                   git config --global user.name "aws-toolkit-automation"
                   # Configure git to use the PAT token for authentication
                   git remote set-url origin "https://x-access-token:${REPO_PAT}@github.com/${{ github.repository }}.git"
-                  git commit -m "Bump agentic version: $RELEASE_VERSION"
+                  git commit -m "chore: bump agentic version: $RELEASE_VERSION"
                   git push --set-upstream origin "$BRANCH_NAME"

.release-please-manifest.json

@@ -1,8 +1,8 @@
 {
-    "chat-client": "0.1.31",
+    "chat-client": "0.1.32",
     "core/aws-lsp-core": "0.0.13",
     "server/aws-lsp-antlr4": "0.1.17",
-    "server/aws-lsp-codewhisperer": "0.0.72",
+    "server/aws-lsp-codewhisperer": "0.0.73",
     "server/aws-lsp-json": "0.1.17",
     "server/aws-lsp-partiql": "0.0.16",
     "server/aws-lsp-yaml": "0.1.17"

app/aws-lsp-codewhisperer-runtimes/src/version.json

@@ -1,3 +1,3 @@
 {
-    "agenticChat": "1.26.0"
+    "agenticChat": "1.27.0"
 }

chat-client/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [0.1.32](https://github.com/aws/language-servers/compare/chat-client/v0.1.31...chat-client/v0.1.32) (2025-08-11)
+
+
+### Features
+
+* **amazonq:** read tool ui revamp ([c65428b](https://github.com/aws/language-servers/commit/c65428bab2cf5e47badf1e3a9453babcf881e60c))
+
 ## [0.1.31](https://github.com/aws/language-servers/compare/chat-client/v0.1.30...chat-client/v0.1.31) (2025-08-06)
 
 

chat-client/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@aws/chat-client",
-    "version": "0.1.31",
+    "version": "0.1.32",
     "description": "AWS Chat Client",
     "main": "out/index.js",
     "repository": {

chat-client/src/client/mynahUi.ts

@@ -1353,15 +1353,10 @@ export const createMynahUi = (
                     fileTreeTitle: '',
                     hideFileCount: true,
                     details: toDetailsWithoutIcon(header.fileList.details),
-                    renderAsPills:
-                        !header.fileList.details ||
-                        (Object.values(header.fileList.details).every(detail => !detail.changes) &&
-                            (!header.buttons || !header.buttons.some(button => button.id === 'undo-changes')) &&
-                            !header.status?.icon),
                 }
             }
             if (!isPartialResult) {
-                if (processedHeader && !message.header?.status) {
+                if (processedHeader) {
                     processedHeader.status = undefined
                 }
             }
@@ -1374,8 +1369,7 @@ export const createMynahUi = (
                 processedHeader.buttons !== null &&
                 processedHeader.buttons.length > 0) ||
                 processedHeader.status !== undefined ||
-                processedHeader.icon !== undefined ||
-                processedHeader.fileList !== undefined)
+                processedHeader.icon !== undefined)
 
         const padding =
             message.type === 'tool' ? (fileList ? true : message.messageId?.endsWith('_permission')) : undefined
@@ -1386,10 +1380,8 @@ export const createMynahUi = (
         // Adding this conditional check to show the stop message in the center.
         const contentHorizontalAlignment: ChatItem['contentHorizontalAlignment'] = undefined
 
-        // If message.header?.status?.text is Stopped or Rejected or Ignored etc.. card should be in disabled state.
-        const shouldMute =
-            message.header?.status?.text !== undefined &&
-            ['Stopped', 'Rejected', 'Ignored', 'Failed', 'Error'].includes(message.header.status.text)
+        // If message.header?.status?.text is Stopped or Rejected or Ignored or Completed etc.. card should be in disabled state.
+        const shouldMute = message.header?.status?.text !== undefined && message.header?.status?.text !== 'Completed'
 
         return {
             body: message.body,

integration-tests/q-agentic-chat-server/src/tests/agenticChatInteg.test.ts

@@ -169,11 +169,11 @@ describe('Q Agentic Chat Server Integration Tests', async () => {
 
         expect(decryptedResult.additionalMessages).to.be.an('array')
         const fsReadMessage = decryptedResult.additionalMessages?.find(
-            msg => msg.type === 'tool' && msg.header?.body === '1 file read'
+            msg => msg.type === 'tool' && msg.fileList?.rootFolderTitle === '1 file read'
         )
         expect(fsReadMessage).to.exist
         const expectedPath = path.join(rootPath, 'test.py')
-        const actualPaths = fsReadMessage?.header?.fileList?.filePaths?.map(normalizePath) || []
+        const actualPaths = fsReadMessage?.fileList?.filePaths?.map(normalizePath) || []
         expect(actualPaths).to.include.members([normalizePath(expectedPath)])
         expect(fsReadMessage?.messageId?.startsWith('tooluse_')).to.be.true
     })
@@ -191,10 +191,10 @@ describe('Q Agentic Chat Server Integration Tests', async () => {
 
         expect(decryptedResult.additionalMessages).to.be.an('array')
         const listDirectoryMessage = decryptedResult.additionalMessages?.find(
-            msg => msg.type === 'tool' && msg.header?.body === '1 directory listed'
+            msg => msg.type === 'tool' && msg.fileList?.rootFolderTitle === '1 directory listed'
         )
         expect(listDirectoryMessage).to.exist
-        const actualPaths = listDirectoryMessage?.header?.fileList?.filePaths?.map(normalizePath) || []
+        const actualPaths = listDirectoryMessage?.fileList?.filePaths?.map(normalizePath) || []
         expect(actualPaths).to.include.members([normalizePath(rootPath)])
         expect(listDirectoryMessage?.messageId?.startsWith('tooluse_')).to.be.true
     })
@@ -371,12 +371,11 @@ describe('Q Agentic Chat Server Integration Tests', async () => {
 
         expect(decryptedResult.additionalMessages).to.be.an('array')
         const fileSearchMessage = decryptedResult.additionalMessages?.find(
-            msg => msg.type === 'tool' && msg.header?.body === 'Searched for `test` in '
+            msg => msg.type === 'tool' && msg.fileList?.rootFolderTitle === '1 directory searched'
         )
         expect(fileSearchMessage).to.exist
         expect(fileSearchMessage?.messageId?.startsWith('tooluse_')).to.be.true
-        expect(fileSearchMessage?.header?.status?.text).to.equal('3 results found')
-        const actualPaths = fileSearchMessage?.header?.fileList?.filePaths?.map(normalizePath) || []
+        const actualPaths = fileSearchMessage?.fileList?.filePaths?.map(normalizePath) || []
         expect(actualPaths).to.include.members([normalizePath(rootPath)])
     })
 })

server/aws-lsp-codewhisperer/CHANGELOG.md

@@ -1,5 +1,25 @@
 # Changelog
 
+## [0.0.73](https://github.com/aws/language-servers/compare/lsp-codewhisperer/v0.0.72...lsp-codewhisperer/v0.0.73) (2025-08-11)
+
+
+### Features
+
+* **amazonq:** read tool ui revamp ([c65428b](https://github.com/aws/language-servers/commit/c65428bab2cf5e47badf1e3a9453babcf881e60c))
+
+
+### Bug Fixes
+
+* **amazonq:** add fallback classpath generation ([#2077](https://github.com/aws/language-servers/issues/2077)) ([3a6ef14](https://github.com/aws/language-servers/commit/3a6ef14e78fa2e75b837bba6524751d65038f416))
+* **amazonq:** emit failed status for amazonq_invokeLLM ([#2071](https://github.com/aws/language-servers/issues/2071)) ([ee52a41](https://github.com/aws/language-servers/commit/ee52a41bc869b275fff708d7955b59f43b93bbd4))
+* **amazonq:** fix fallout of [#2051](https://github.com/aws/language-servers/issues/2051) ([#2057](https://github.com/aws/language-servers/issues/2057)) ([565066b](https://github.com/aws/language-servers/commit/565066bb61adda60333c9646db958d4208bcc8af))
+* **amazonq:** leverage lcs to find the chars added and removed ([#2092](https://github.com/aws/language-servers/issues/2092)) ([40379a8](https://github.com/aws/language-servers/commit/40379a887f8d42cc184239ca3175b4e673cc5286))
+* **amazonq:** skips continuous monitoring when WCS sees workspace as idle ([#2066](https://github.com/aws/language-servers/issues/2066)) ([9cb959d](https://github.com/aws/language-servers/commit/9cb959d4cc450d0907f8bf5265ba01d2aa68bcd0))
+* creating a new sesion for Edits trigger with next token ([#2094](https://github.com/aws/language-servers/issues/2094)) ([1da8730](https://github.com/aws/language-servers/commit/1da8730b6ed6ad53b6561368bf722e56d59596a4))
+* remove edit cache logic ([#2079](https://github.com/aws/language-servers/issues/2079)) ([9bc5b9c](https://github.com/aws/language-servers/commit/9bc5b9c1d77e5fee6f518f7f5016d3a0043a5a77))
+* sessionManager misused because there are 2 types of manager now ([#2090](https://github.com/aws/language-servers/issues/2090)) ([8db059a](https://github.com/aws/language-servers/commit/8db059ab83d94fd7c3ba3eb265044add31c80aea))
+* update client name to support Sagemaker AI origin for agentic chat ([#2093](https://github.com/aws/language-servers/issues/2093)) ([a746fe8](https://github.com/aws/language-servers/commit/a746fe845d5e09563b475f01ce44059dca9fd10f))
+
 ## [0.0.72](https://github.com/aws/language-servers/compare/lsp-codewhisperer/v0.0.71...lsp-codewhisperer/v0.0.72) (2025-08-06)
 
 

server/aws-lsp-codewhisperer/package.json

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

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

@@ -451,7 +451,7 @@ describe('AgenticChatController', () => {
 
             assert.deepStrictEqual(chatResult, {
                 additionalMessages: [],
-                body: '\nHello World!',
+                body: '\n\nHello World!',
                 messageId: 'mock-message-id',
                 buttons: [],
                 codeReference: [],
@@ -1150,7 +1150,7 @@ describe('AgenticChatController', () => {
             sinon.assert.callCount(testFeatures.lsp.sendProgress, mockChatResponseList.length + 1) // response length + 1 loading messages
             assert.deepStrictEqual(chatResult, {
                 additionalMessages: [],
-                body: '\nHello World!',
+                body: '\n\nHello World!',
                 messageId: 'mock-message-id',
                 codeReference: [],
                 buttons: [],
@@ -1169,7 +1169,7 @@ describe('AgenticChatController', () => {
             sinon.assert.callCount(testFeatures.lsp.sendProgress, mockChatResponseList.length + 1) // response length + 1 loading message
             assert.deepStrictEqual(chatResult, {
                 additionalMessages: [],
-                body: '\nHello World!',
+                body: '\n\nHello World!',
                 messageId: 'mock-message-id',
                 buttons: [],
                 codeReference: [],