Skip to content

Commit dbad5aa

Browse files
liramon1liramon1
committed
Merge branch 'split-codewhisperer' into unified-cw1
2 parents 535663f + d41f3a3 commit dbad5aa

File tree

77 files changed

+4163
-1589
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+4163
-1589
lines changed

‎.release-please-manifest.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
2-
"chat-client": "0.1.25",
2+
"chat-client": "0.1.28",
33
"core/aws-lsp-core": "0.0.12",
44
"server/aws-lsp-antlr4": "0.1.16",
5-
"server/aws-lsp-codewhisperer": "0.0.66",
5+
"server/aws-lsp-codewhisperer": "0.0.69",
66
"server/aws-lsp-json": "0.1.16",
77
"server/aws-lsp-partiql": "0.0.15",
88
"server/aws-lsp-yaml": "0.1.16"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"local-build": "node scripts/local-build.js"
1616
},
1717
"dependencies": {
18-
"@aws/language-server-runtimes": "^0.2.112",
18+
"@aws/language-server-runtimes": "^0.2.115",
1919
"@aws/lsp-codewhisperer": "*",
2020
"copyfiles": "^2.4.1",
2121
"cross-env": "^7.0.3",

‎chat-client/CHANGELOG.md‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,34 @@
11
# Changelog
22

3+
## [0.1.28](https://github.com/aws/language-servers/compare/chat-client/v0.1.27...chat-client/v0.1.28) (2025-07-23)
4+
5+
6+
### Bug Fixes
7+
8+
* **amazonq:** revert commit f17b631d9e06371a11ef8e9cb1413762fb51a143 ([#1965](https://github.com/aws/language-servers/issues/1965)) ([8c2cab6](https://github.com/aws/language-servers/commit/8c2cab6995922c96030b5bbdf3cbbdef7eadd7c2))
9+
10+
## [0.1.27](https://github.com/aws/language-servers/compare/chat-client/v0.1.26...chat-client/v0.1.27) (2025-07-22)
11+
12+
13+
### Features
14+
15+
* **amazonq:** enable show logs feature ([#1947](https://github.com/aws/language-servers/issues/1947)) ([86ea83d](https://github.com/aws/language-servers/commit/86ea83dd53b447f6decccf16559b76f4989ea712))
16+
17+
## [0.1.26](https://github.com/aws/language-servers/compare/chat-client/v0.1.25...chat-client/v0.1.26) (2025-07-22)
18+
19+
20+
### Features
21+
22+
* **chat-client:** add auto-approve (trust mode) for built-in tools ([#1949](https://github.com/aws/language-servers/issues/1949)) ([f17b631](https://github.com/aws/language-servers/commit/f17b631d9e06371a11ef8e9cb1413762fb51a143))
23+
* **chat-client:** add shortcut for stop/reject/run commands ([#1932](https://github.com/aws/language-servers/issues/1932)) ([087f338](https://github.com/aws/language-servers/commit/087f3387ba736e92d014274e195f7ef76e377f1e))
24+
25+
26+
### Bug Fixes
27+
28+
* **amazonq:** fix for mcp server unnecessary refresh from file watchers ([#1933](https://github.com/aws/language-servers/issues/1933)) ([208909b](https://github.com/aws/language-servers/commit/208909b55ecda40ff8d412b2b3be890eccee70bc))
29+
* **amazonq:** update mcp and persona config to agent config ([#1897](https://github.com/aws/language-servers/issues/1897)) ([530977f](https://github.com/aws/language-servers/commit/530977f8c73c7946a0205f02014248d71b4b1fe0))
30+
* replace cancel with stop ([#1935](https://github.com/aws/language-servers/issues/1935)) ([2f51923](https://github.com/aws/language-servers/commit/2f51923f9d3497469c70162235482b569e2d796e))
31+
332
## [0.1.25](https://github.com/aws/language-servers/compare/chat-client/v0.1.24...chat-client/v0.1.25) (2025-07-17)
433

534

‎chat-client/package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@aws/chat-client",
3-
"version": "0.1.25",
3+
"version": "0.1.28",
44
"description": "AWS Chat Client",
55
"main": "out/index.js",
66
"repository": {
@@ -24,10 +24,10 @@
2424
"package": "webpack"
2525
},
2626
"dependencies": {
27-
"@aws/chat-client-ui-types": "^0.1.51",
28-
"@aws/language-server-runtimes": "^0.2.112",
29-
"@aws/language-server-runtimes-types": "^0.1.45",
30-
"@aws/mynah-ui": "^4.35.9"
27+
"@aws/chat-client-ui-types": "^0.1.56",
28+
"@aws/language-server-runtimes": "^0.2.114",
29+
"@aws/language-server-runtimes-types": "^0.1.50",
30+
"@aws/mynah-ui": "^4.36.0"
3131
},
3232
"devDependencies": {
3333
"@types/jsdom": "^21.1.6",

‎chat-client/src/client/chat.ts‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ import {
107107
OpenFileDialogParams,
108108
OPEN_FILE_DIALOG_METHOD,
109109
OpenFileDialogResult,
110+
EXECUTE_SHELL_COMMAND_SHORTCUT_METHOD,
110111
} from '@aws/language-server-runtimes-types'
111112
import { ConfigTexts, MynahUIDataModel, MynahUITabStoreModel } from '@aws/mynah-ui'
112113
import { ServerMessage, TELEMETRY, TelemetryParams } from '../contracts/serverContracts'
@@ -130,6 +131,7 @@ type ChatClientConfig = Pick<MynahUIDataModel, 'quickActionCommands'> & {
130131
agenticMode?: boolean
131132
modelSelectionEnabled?: boolean
132133
stringOverrides?: Partial<ConfigTexts>
134+
os?: string
133135
}
134136

135137
export const createChat = (
@@ -183,6 +185,9 @@ export const createChat = (
183185
}
184186

185187
switch (message?.command) {
188+
case EXECUTE_SHELL_COMMAND_SHORTCUT_METHOD:
189+
mynahApi.executeShellCommandShortCut(message.params)
190+
break
186191
case CHAT_REQUEST_METHOD:
187192
mynahApi.addChatResponse(message.params, message.tabId, message.isPartialResult)
188193
break
@@ -289,6 +294,10 @@ export const createChat = (
289294
tabFactory.enableReroute()
290295
}
291296

297+
if ((params as any)?.codeReviewInChat) {
298+
tabFactory.enableCodeReviewInChat()
299+
}
300+
292301
if (params?.quickActions?.quickActionsCommandGroups) {
293302
const quickActionCommandGroups = params.quickActions.quickActionsCommandGroups.map(group => ({
294303
...group,
@@ -312,6 +321,10 @@ export const createChat = (
312321
tabFactory.enableExport()
313322
}
314323

324+
if (params?.showLogs) {
325+
tabFactory.enableShowLogs()
326+
}
327+
315328
const allExistingTabs: MynahUITabStoreModel = mynahUi.getAllTabs()
316329
const highlightCommand = featureConfig.get('highlightCommand')
317330

@@ -537,7 +550,8 @@ export const createChat = (
537550
chatClientAdapter,
538551
featureConfig,
539552
!!config?.agenticMode,
540-
config?.stringOverrides
553+
config?.stringOverrides,
554+
config?.os
541555
)
542556

543557
mynahApi = api

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -577,9 +577,8 @@ describe('McpMynahUi', () => {
577577
assert.strictEqual(detailedList.header.actions[0].id, 'mcp-details-menu')
578578

579579
// Verify the mcp-details-menu items
580-
assert.strictEqual(detailedList.header.actions[0].items.length, 2)
581-
assert.strictEqual(detailedList.header.actions[0].items[0].id, 'mcp-disable-server')
582-
assert.strictEqual(detailedList.header.actions[0].items[1].id, 'mcp-delete-server')
580+
assert.strictEqual(detailedList.header.actions[0].items.length, 1)
581+
assert.strictEqual(detailedList.header.actions[0].items[0].id, 'mcp-delete-server')
583582

584583
assert.strictEqual(detailedList.filterOptions.length, 1)
585584
assert.strictEqual(detailedList.filterOptions[0].id, 'permission')

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

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -166,11 +166,11 @@ export class McpMynahUi {
166166
id: MCP_IDS.DETAILS_MENU,
167167
icon: toMynahIcon('ellipsis'),
168168
items: [
169-
{
170-
id: MCP_IDS.DISABLE_SERVER,
171-
text: `Disable MCP server`,
172-
data: { serverName },
173-
},
169+
// {
170+
// id: MCP_IDS.DISABLE_SERVER,
171+
// text: `Disable MCP server`,
172+
// data: { serverName },
173+
// },
174174
{
175175
id: MCP_IDS.DELETE_SERVER,
176176
confirmation: {
@@ -219,10 +219,10 @@ export class McpMynahUi {
219219
...(action.id === MCP_IDS.DETAILS_MENU
220220
? {
221221
items: [
222-
{
223-
id: MCP_IDS.DISABLE_SERVER,
224-
text: `Disable MCP server`,
225-
},
222+
// {
223+
// id: MCP_IDS.DISABLE_SERVER,
224+
// text: `Disable MCP server`,
225+
// },
226226
{
227227
id: MCP_IDS.DELETE_SERVER,
228228
confirmation: {
@@ -508,6 +508,7 @@ export class McpMynahUi {
508508
},
509509
onClose: () => {
510510
this.messager.onMcpServerClick(MCP_IDS.SAVE_PERMISSION_CHANGE)
511+
this.isMcpServersListActive = false
511512
},
512513
onBackClick: () => {
513514
this.messager.onMcpServerClick(MCP_IDS.SAVE_PERMISSION_CHANGE)

0 commit comments

Comments
 (0)