Skip to content

Commit 55d1541

Browse files
opieter-awsopieter-aws
authored
Merge branch 'feature/amazonqLSP-auth' into feature/amazonqLSP-auth
2 parents 6ec4e5d + 0cf097b commit 55d1541

File tree

91 files changed

+3303
-278
lines changed

Some content is hidden

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

91 files changed

+3303
-278
lines changed

‎package-lock.json‎

Lines changed: 14 additions & 31 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/amazonq/.changes/1.55.0.json‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
{
2+
"date": "2025-04-09",
3+
"version": "1.55.0",
4+
"entries": [
5+
{
6+
"type": "Bug Fix",
7+
"description": "Amazon Q Chat: Update chat history icon"
8+
},
9+
{
10+
"type": "Bug Fix",
11+
"description": "Amazon Q Chat: chat occasionally freezes and displays gray screen"
12+
},
13+
{
14+
"type": "Bug Fix",
15+
"description": "Amazon Q Chat: Set owner-only permissions for chat history and saved prompt files"
16+
},
17+
{
18+
"type": "Feature",
19+
"description": "`/test` generates tests in all languages, not only Java/Python"
20+
},
21+
{
22+
"type": "Feature",
23+
"description": "Amazon Q chat: Click export icon to save chat transcript in Markdown or HTML"
24+
},
25+
{
26+
"type": "Feature",
27+
"description": "SageMaker: Disable the unsupported agentic commands and welcome prompt"
28+
},
29+
{
30+
"type": "Feature",
31+
"description": "Amazon Q Chat: Add `@code` context for PHP, Ruby, Scala, Shell, and Swift projects"
32+
},
33+
{
34+
"type": "Feature",
35+
"description": "Enterprise users can choose their preferred Amazon Q profile to improve personalization and workflow across different business regions"
36+
}
37+
]
38+
}

‎packages/amazonq/.changes/1.56.0.json‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"date": "2025-04-09",
3+
"version": "1.56.0",
4+
"entries": [
5+
{
6+
"type": "Bug Fix",
7+
"description": "Improve status message while loading Amazon Q Profiles during login"
8+
},
9+
{
10+
"type": "Bug Fix",
11+
"description": "\"failed to run command\" error"
12+
}
13+
]
14+
}

‎packages/amazonq/.changes/1.57.0.json‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"date": "2025-04-10",
3+
"version": "1.57.0",
4+
"entries": [
5+
{
6+
"type": "Bug Fix",
7+
"description": "Fix bug where generate fix does not work"
8+
},
9+
{
10+
"type": "Bug Fix",
11+
"description": "Fix bug where review shows 0 findings"
12+
}
13+
]
14+
}

‎packages/amazonq/CHANGELOG.md‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,24 @@
1+
## 1.57.0 2025-04-10
2+
3+
- **Bug Fix** Fix bug where generate fix does not work
4+
- **Bug Fix** Fix bug where review shows 0 findings
5+
6+
## 1.56.0 2025-04-09
7+
8+
- **Bug Fix** Improve status message while loading Amazon Q Profiles during login
9+
- **Bug Fix** "failed to run command" error
10+
11+
## 1.55.0 2025-04-09
12+
13+
- **Bug Fix** Amazon Q Chat: Update chat history icon
14+
- **Bug Fix** Amazon Q Chat: chat occasionally freezes and displays gray screen
15+
- **Bug Fix** Amazon Q Chat: Set owner-only permissions for chat history and saved prompt files
16+
- **Feature** `/test` generates tests in all languages, not only Java/Python
17+
- **Feature** Amazon Q chat: Click export icon to save chat transcript in Markdown or HTML
18+
- **Feature** SageMaker: Disable the unsupported agentic commands and welcome prompt
19+
- **Feature** Amazon Q Chat: Add `@code` context for PHP, Ruby, Scala, Shell, and Swift projects
20+
- **Feature** Enterprise users can choose their preferred Amazon Q profile to improve personalization and workflow across different business regions
21+
122
## 1.54.0 2025-04-03
223

324
- **Bug Fix** Amazon Q chat: `@prompts` not added to context

‎packages/amazonq/package.json‎

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "amazon-q-vscode",
33
"displayName": "Amazon Q",
44
"description": "The most capable generative AI-powered assistant for building, operating, and transforming software, with advanced capabilities for managing data and AI",
5-
"version": "1.55.0-SNAPSHOT",
5+
"version": "1.58.0-SNAPSHOT",
66
"extensionKind": [
77
"workspace"
88
],
@@ -127,6 +127,10 @@
127127
"amazonQWorkspaceLspManifestMessage": {
128128
"type": "boolean",
129129
"default": false
130+
},
131+
"amazonQChatDisclaimer": {
132+
"type": "boolean",
133+
"default": false
130134
}
131135
},
132136
"additionalProperties": false
@@ -357,6 +361,11 @@
357361
"when": "view =~ /^aws\\.amazonq/",
358362
"group": "1_amazonQ@1"
359363
},
364+
{
365+
"command": "aws.amazonq.selectRegionProfile",
366+
"when": "view == aws.amazonq.AmazonQChatView && aws.amazonq.connectedSsoIdc == true",
367+
"group": "1_amazonQ@1"
368+
},
360369
{
361370
"command": "aws.amazonq.signout",
362371
"when": "(view == aws.amazonq.AmazonQChatView) && aws.codewhisperer.connected && !aws.isSageMakerUnifiedStudio",
@@ -434,6 +443,7 @@
434443
},
435444
{
436445
"command": "aws.amazonq.generateUnitTests",
446+
"when": "!aws.isSageMaker",
437447
"group": "cw_chat@5"
438448
},
439449
{
@@ -469,6 +479,7 @@
469479
},
470480
{
471481
"command": "aws.amazonq.exploreAgents",
482+
"when": "!aws.isSageMaker",
472483
"group": "1_help@2"
473484
},
474485
{
@@ -523,7 +534,7 @@
523534
"command": "aws.amazonq.security.scan-statusbar",
524535
"title": "%AWS.command.amazonq.security.scan%",
525536
"category": "%AWS.amazonq.title%",
526-
"enablement": "aws.codewhisperer.connected"
537+
"enablement": "aws.codewhisperer.connected && !aws.isSageMaker"
527538
},
528539
{
529540
"command": "aws.amazonq.refactorCode",
@@ -553,7 +564,7 @@
553564
"command": "aws.amazonq.generateUnitTests",
554565
"title": "%AWS.command.amazonq.generateUnitTests%",
555566
"category": "%AWS.amazonq.title%",
556-
"enablement": "aws.codewhisperer.connected"
567+
"enablement": "aws.codewhisperer.connected && !aws.isSageMaker"
557568
},
558569
{
559570
"command": "aws.amazonq.reconnect",
@@ -567,6 +578,12 @@
567578
"category": "%AWS.amazonq.title%",
568579
"enablement": "aws.codewhisperer.connected"
569580
},
581+
{
582+
"command": "aws.amazonq.selectRegionProfile",
583+
"title": "Change Profile",
584+
"category": "%AWS.amazonq.title%",
585+
"enablement": "aws.codewhisperer.connected"
586+
},
570587
{
571588
"command": "aws.amazonq.transformationHub.reviewChanges.acceptChanges",
572589
"title": "%AWS.command.q.transform.acceptChanges%"
@@ -757,7 +774,7 @@
757774
"command": "aws.amazonq.exploreAgents",
758775
"title": "%AWS.amazonq.exploreAgents%",
759776
"category": "%AWS.amazonq.title%",
760-
"enablement": "aws.codewhisperer.connected"
777+
"enablement": "aws.codewhisperer.connected && !aws.isSageMaker"
761778
},
762779
{
763780
"command": "aws.amazonq.walkthrough.show",

‎packages/amazonq/src/app/amazonqScan/app.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,9 @@ export function init(appContext: AmazonQAppInitContext) {
7070
AuthUtil.instance.secondaryAuth.onDidChangeActiveConnection(() => {
7171
return debouncedEvent()
7272
})
73+
AuthUtil.instance.regionProfileManager.onDidChangeRegionProfile(() => {
74+
return debouncedEvent()
75+
})
7376

7477
Commands.register('aws.amazonq.security.scan-statusbar', async () => {
7578
if (AuthUtil.instance.isConnectionExpired()) {

‎packages/amazonq/src/app/amazonqScan/chat/controller/controller.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,10 @@ export class ScanController {
108108
interactionType: data.vote,
109109
})
110110
})
111+
112+
AuthUtil.instance.regionProfileManager.onDidChangeRegionProfile(() => {
113+
this.sessionStorage.removeActiveTab()
114+
})
111115
}
112116

113117
private async tabOpened(message: any) {

‎packages/amazonq/src/app/inline/sessionManager.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
import { InlineCompletionItemWithReferences } from '@aws/language-server-runtimes-types/inlineCompletionWithReferences'
6+
import { InlineCompletionItemWithReferences } from '@aws/language-server-runtimes-types'
77

88
// TODO: add more needed data to the session interface
99
interface CodeWhispererSession {

‎packages/amazonq/src/extension.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,9 @@ export async function activateAmazonQCommon(context: vscode.ExtensionContext, is
147147
// Hide the Amazon Q tree in toolkit explorer
148148
await setContext('aws.toolkit.amazonq.dismissed', true)
149149

150+
// set context var to check if its SageMaker AI or not
151+
await setContext('aws.isSageMaker', isSageMaker())
152+
150153
// set context var to check if its SageMaker Unified Studio or not
151154
await setContext('aws.isSageMakerUnifiedStudio', isSageMaker('SMUS'))
152155

0 commit comments

Comments
 (0)