merge main into feature/read-ui-revamp

.release-please-manifest.json

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

app/aws-lsp-antlr4-runtimes/package.json

@@ -12,7 +12,7 @@
         "webpack": "webpack"
     },
     "dependencies": {
-        "@aws/language-server-runtimes": "^0.2.121",
+        "@aws/language-server-runtimes": "^0.2.123",
         "@aws/lsp-antlr4": "*",
         "antlr4-c3": "^3.4.1",
         "antlr4ng": "^3.0.4"

app/aws-lsp-buildspec-runtimes/package.json

@@ -7,7 +7,7 @@
         "compile": "tsc --build"
     },
     "dependencies": {
-        "@aws/language-server-runtimes": "^0.2.121",
+        "@aws/language-server-runtimes": "^0.2.123",
         "@aws/lsp-buildspec": "^0.0.1"
     }
 }

app/aws-lsp-cloudformation-runtimes/package.json

@@ -7,7 +7,7 @@
         "compile": "tsc --build"
     },
     "dependencies": {
-        "@aws/language-server-runtimes": "^0.2.121",
+        "@aws/language-server-runtimes": "^0.2.123",
         "@aws/lsp-cloudformation": "^0.0.1"
     }
 }

app/aws-lsp-codewhisperer-runtimes/README.md

@@ -76,6 +76,17 @@ The server is managed via scripts/dev-server.js, which ensures:
 
 **NOTE**: Tests are currently disabled for Windows as we currently face issues with automatically shutting down devserver and cleaning resources after tests are executed.
 
+## Binary Dependencies
+
+### registry.node
+The file `_bundle-assets/registry-js/win32-x64/registry.node` is a precompiled binary downloaded from the [registry-js](https://github.com/desktop/registry-js) project.
+
+- **Current version**: v1.16.1 (released May 21, 2024)
+- **Source**: https://github.com/desktop/registry-js/releases
+- **Purpose**: Provides Windows registry access functionality
+
+**To update**: Download the latest `registry.node` binary for win32-x64 from the registry-js releases page and replace the existing file.
+
 #### Tests configuration
 - Test settings are defined in `wdio.conf.ts`
 - The actual test implementation is in the `test/e2e` folder

app/aws-lsp-codewhisperer-runtimes/package.json

@@ -10,10 +10,11 @@
         "package:prod": "npm run compile && cross-env NODE_OPTIONS=--max_old_space_size=8172 npm run webpack:prod",
         "webpack": "webpack",
         "webpack:prod": "webpack --config webpack.config.prod.js",
+        "copy:native-deps:agent-standalone": "copyfiles -f _bundle-assets/registry-js/win32-x64/registry.node build/private/bundle/agent-standalone",
         "copy:resources:agent-standalone": "copyfiles -f --error ../../node_modules/@aws/lsp-identity/src/sso/authorizationCodePkce/resources/**/* build/private/bundle/agent-standalone/resources",
         "generate:node-assets": "./scripts/download-node.sh && ts-node src/scripts/copy-node-assets.ts",
         "generate:build-archive": "./scripts/package.sh",
-        "ci:generate:agent-standalone": "npm run package:prod && npm run copy:resources:agent-standalone && npm run generate:node-assets && npm run generate:build-archive",
+        "ci:generate:agent-standalone": "npm run package:prod && npm run copy:native-deps:agent-standalone && npm run copy:resources:agent-standalone && npm run generate:node-assets && npm run generate:build-archive",
         "ci:generate:manifest": "ts-node scripts/create-repo-manifest.ts",
         "start": "cross-env NODE_OPTIONS=--max_old_space_size=8172 node scripts/dev-server.js start",
         "stop-dev-server": "node scripts/dev-server.js stop",
@@ -22,7 +23,7 @@
         "local-build": "node scripts/local-build.js"
     },
     "dependencies": {
-        "@aws/language-server-runtimes": "^0.2.121",
+        "@aws/language-server-runtimes": "^0.2.123",
         "@aws/lsp-codewhisperer": "*",
         "copyfiles": "^2.4.1",
         "cross-env": "^7.0.3",

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

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

app/aws-lsp-identity-runtimes/package.json

@@ -7,7 +7,7 @@
         "compile": "tsc --build"
     },
     "dependencies": {
-        "@aws/language-server-runtimes": "^0.2.121",
+        "@aws/language-server-runtimes": "^0.2.123",
         "@aws/lsp-identity": "^0.0.1"
     }
 }

app/aws-lsp-json-runtimes/package.json

@@ -11,7 +11,7 @@
         "webpack": "webpack"
     },
     "dependencies": {
-        "@aws/language-server-runtimes": "^0.2.121",
+        "@aws/language-server-runtimes": "^0.2.123",
         "@aws/lsp-json": "*"
     },
     "devDependencies": {

app/aws-lsp-notification-runtimes/package.json

@@ -7,7 +7,7 @@
         "compile": "tsc --build"
     },
     "dependencies": {
-        "@aws/language-server-runtimes": "^0.2.121",
+        "@aws/language-server-runtimes": "^0.2.123",
         "@aws/lsp-notification": "^0.0.1"
     }
 }

app/aws-lsp-s3-runtimes/package.json

@@ -10,7 +10,7 @@
         "compile": "tsc --build"
     },
     "dependencies": {
-        "@aws/language-server-runtimes": "^0.2.121",
+        "@aws/language-server-runtimes": "^0.2.123",
         "@aws/lsp-s3": "^0.0.1"
     }
 }

app/aws-lsp-yaml-json-webworker/package.json

@@ -11,7 +11,7 @@
         "serve:webpack": "NODE_ENV=development webpack serve"
     },
     "dependencies": {
-        "@aws/language-server-runtimes": "^0.2.121",
+        "@aws/language-server-runtimes": "^0.2.123",
         "@aws/lsp-json": "*",
         "@aws/lsp-yaml": "*"
     },

app/aws-lsp-yaml-runtimes/package.json

@@ -11,7 +11,7 @@
         "webpack": "webpack"
     },
     "dependencies": {
-        "@aws/language-server-runtimes": "^0.2.121",
+        "@aws/language-server-runtimes": "^0.2.123",
         "@aws/lsp-yaml": "*"
     },
     "devDependencies": {

app/hello-world-lsp-runtimes/package.json

@@ -15,7 +15,7 @@
     },
     "dependencies": {
         "@aws/hello-world-lsp": "^0.0.1",
-        "@aws/language-server-runtimes": "^0.2.121"
+        "@aws/language-server-runtimes": "^0.2.123"
     },
     "devDependencies": {
         "@types/chai": "^4.3.5",

chat-client/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## [0.1.31](https://github.com/aws/language-servers/compare/chat-client/v0.1.30...chat-client/v0.1.31) (2025-08-06)
+
+
+### Features
+
+* **amazonq:** add two more tips for the did you know section ([#2063](https://github.com/aws/language-servers/issues/2063)) ([9949c6d](https://github.com/aws/language-servers/commit/9949c6dd81c56b5ea82563310da2eaee4d00a059))
+* **amazonq:** enable sonnet 4 for fra region ([#2069](https://github.com/aws/language-servers/issues/2069)) ([3a4b8df](https://github.com/aws/language-servers/commit/3a4b8df981b2c3b0532360a11472169fffec7924))
+
+
+### Bug Fixes
+
+* **amazonq:** fix to add disable/enable feature back to mcp servers ([#2052](https://github.com/aws/language-servers/issues/2052)) ([c03e017](https://github.com/aws/language-servers/commit/c03e017b9ccbbbb9c80a3c3afd5da38a50bd6cff))
+
 ## [0.1.30](https://github.com/aws/language-servers/compare/chat-client/v0.1.29...chat-client/v0.1.30) (2025-08-04)
 
 

chat-client/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@aws/chat-client",
-    "version": "0.1.30",
+    "version": "0.1.31",
     "description": "AWS Chat Client",
     "main": "out/index.js",
     "repository": {
@@ -25,7 +25,7 @@
     },
     "dependencies": {
         "@aws/chat-client-ui-types": "^0.1.56",
-        "@aws/language-server-runtimes": "^0.2.121",
+        "@aws/language-server-runtimes": "^0.2.123",
         "@aws/language-server-runtimes-types": "^0.1.50",
         "@aws/mynah-ui": "^4.36.2"
     },

chat-client/src/client/mcpMynahUi.test.ts

@@ -577,8 +577,9 @@ describe('McpMynahUi', () => {
             assert.strictEqual(detailedList.header.actions[0].id, 'mcp-details-menu')
 
             // Verify the mcp-details-menu items
-            assert.strictEqual(detailedList.header.actions[0].items.length, 1)
-            assert.strictEqual(detailedList.header.actions[0].items[0].id, 'mcp-delete-server')
+            assert.strictEqual(detailedList.header.actions[0].items.length, 2)
+            assert.strictEqual(detailedList.header.actions[0].items[0].id, 'mcp-disable-server')
+            assert.strictEqual(detailedList.header.actions[0].items[1].id, 'mcp-delete-server')
 
             assert.strictEqual(detailedList.filterOptions.length, 1)
             assert.strictEqual(detailedList.filterOptions[0].id, 'permission')

chat-client/src/client/mcpMynahUi.ts

@@ -167,11 +167,11 @@ export class McpMynahUi {
                     id: MCP_IDS.DETAILS_MENU,
                     icon: toMynahIcon('ellipsis'),
                     items: [
-                        // {
-                        //     id: MCP_IDS.DISABLE_SERVER,
-                        //     text: `Disable MCP server`,
-                        //     data: { serverName },
-                        // },
+                        {
+                            id: MCP_IDS.DISABLE_SERVER,
+                            text: `Disable MCP server`,
+                            data: { serverName },
+                        },
                         {
                             id: MCP_IDS.DELETE_SERVER,
                             confirmation: {
@@ -220,10 +220,10 @@ export class McpMynahUi {
                     ...(action.id === MCP_IDS.DETAILS_MENU
                         ? {
                               items: [
-                                  //   {
-                                  //       id: MCP_IDS.DISABLE_SERVER,
-                                  //       text: `Disable MCP server`,
-                                  //   },
+                                  {
+                                      id: MCP_IDS.DISABLE_SERVER,
+                                      text: `Disable MCP server`,
+                                  },
                                   {
                                       id: MCP_IDS.DELETE_SERVER,
                                       confirmation: {

chat-client/src/client/tabs/tabFactory.ts

@@ -187,6 +187,8 @@ Select code & ask me to explain, debug or optimize it, or type \`/\` for quick a
             'MCP is available in Amazon Q!',
             'Pinned context is always included in future chat messages',
             'Create and add Saved Prompts using the @ context menu',
+            'Compact your conversation with /compact',
+            'Ask Q to review your code and see results in the code issues panel!',
         ]
 
         const randomIndex = Math.floor(Math.random() * hints.length)

chat-client/src/client/texts/modelSelection.test.ts

@@ -39,18 +39,15 @@ describe('modelSelection', () => {
             )
         })
 
-        it('should provide limited models for eu-central-1 region', () => {
+        it('should provide all models for eu-central-1 region', () => {
             const euCentral1ModelSelection = modelSelectionForRegion['eu-central-1']
             assert.ok(euCentral1ModelSelection, 'euCentral1ModelSelection should exist')
             assert.ok(euCentral1ModelSelection.type === 'select', 'euCentral1ModelSelection should be type select')
             assert.ok(Array.isArray(euCentral1ModelSelection.options), 'options should be an array')
-            assert.strictEqual(euCentral1ModelSelection.options.length, 1, 'should have 1 option')
+            assert.strictEqual(euCentral1ModelSelection.options.length, 2, 'should have 2 option')
 
             const modelIds = euCentral1ModelSelection.options.map(option => option.value)
-            assert.ok(
-                !modelIds.includes(BedrockModel.CLAUDE_SONNET_4_20250514_V1_0),
-                'should not include Claude Sonnet 4'
-            )
+            assert.ok(modelIds.includes(BedrockModel.CLAUDE_SONNET_4_20250514_V1_0), 'should include Claude Sonnet 4')
             assert.ok(
                 modelIds.includes(BedrockModel.CLAUDE_3_7_SONNET_20250219_V1_0),
                 'should include Claude Sonnet 3.7'

chat-client/src/client/texts/modelSelection.ts

@@ -37,10 +37,7 @@ const modelSelection: ChatItemFormItem = {
  */
 export const modelSelectionForRegion: Record<string, ChatItemFormItem> = {
     'us-east-1': modelSelection,
-    'eu-central-1': {
-        ...modelSelection,
-        options: modelOptions.filter(option => option.value !== BedrockModel.CLAUDE_SONNET_4_20250514_V1_0),
-    },
+    'eu-central-1': modelSelection,
 }
 
 export const getModelSelectionChatItem = (modelName: string): ChatItem => ({

client/vscode/package.json

@@ -352,7 +352,7 @@
         "@aws-sdk/credential-providers": "^3.731.1",
         "@aws-sdk/types": "^3.734.0",
         "@aws/chat-client-ui-types": "^0.1.56",
-        "@aws/language-server-runtimes": "^0.2.121",
+        "@aws/language-server-runtimes": "^0.2.123",
         "@types/uuid": "^9.0.8",
         "@types/vscode": "^1.98.0",
         "jose": "^5.2.4",

core/aws-lsp-core/package.json

@@ -28,7 +28,7 @@
         "prepack": "shx cp ../../LICENSE ../../NOTICE ../../SECURITY.md ."
     },
     "dependencies": {
-        "@aws/language-server-runtimes": "^0.2.121",
+        "@aws/language-server-runtimes": "^0.2.123",
         "@gerhobbelt/gitignore-parser": "^0.2.0-9",
         "cross-spawn": "7.0.6",
         "jose": "^5.2.4",

integration-tests/q-agentic-chat-server/package.json

@@ -9,7 +9,7 @@
         "test-integ": "npm run compile && mocha --timeout 30000 \"./out/**/*.test.js\" --retries 2"
     },
     "dependencies": {
-        "@aws/language-server-runtimes": "^0.2.121",
+        "@aws/language-server-runtimes": "^0.2.123",
         "@aws/lsp-core": "*"
     },
     "devDependencies": {