Skip to content

Commit e24101c

Browse files
laura-codesslaura-codess
authored
Merge pull request #7790 from aws/autoMerge/feature/ui-e2e-tests
Merge master into feature/ui-e2e-tests
2 parents b020242 + 32329de commit e24101c

File tree

253 files changed

+380543
-386
lines changed

Some content is hidden

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

253 files changed

+380543
-386
lines changed

‎buildspec/linuxTests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ phases:
4848
- VCS_COMMIT_ID="${CODEBUILD_RESOLVED_SOURCE_VERSION}"
4949
- CI_BUILD_URL=$(echo $CODEBUILD_BUILD_URL | sed 's/#/%23/g') # Encode `#` in the URL because otherwise the url is clipped in the Codecov.io site
5050
- CI_BUILD_ID="${CODEBUILD_BUILD_ID}"
51-
- test -n "${CODECOV_TOKEN}" && [ "$TARGET_BRANCH" = "master" ] && ./codecov --token=${CODECOV_TOKEN} --branch=${CODEBUILD_RESOLVED_SOURCE_VERSION} --repository=${CODEBUILD_SOURCE_REPO_URL} --file=./coverage/amazonq/lcov.info --file=./coverage/toolkit/lcov.info
51+
- test -n "${CODECOV_TOKEN}" && [ "$TARGET_BRANCH" = "master" ] && ./codecov --token=${CODECOV_TOKEN} --branch=${CODEBUILD_RESOLVED_SOURCE_VERSION} --repository=${CODEBUILD_SOURCE_REPO_URL} --file=./coverage/amazonq/lcov.info --file=./coverage/toolkit/lcov.info || true
5252

5353
reports:
5454
unit-test:

‎package-lock.json

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

‎packages/amazonq/.changes/1.86.0.json

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"date": "2025-07-30",
3+
"version": "1.86.0",
4+
"entries": [
5+
{
6+
"type": "Bug Fix",
7+
"description": "Let Enter invoke auto completion more consistently"
8+
},
9+
{
10+
"type": "Bug Fix",
11+
"description": "Faster and more responsive inline completion UX"
12+
},
13+
{
14+
"type": "Bug Fix",
15+
"description": "Use documentChangeEvent as auto trigger condition"
16+
}
17+
]
18+
}

‎packages/amazonq/.changes/1.87.0.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"date": "2025-07-31",
3+
"version": "1.87.0",
4+
"entries": []
5+
}

‎packages/amazonq/.changes/1.88.0.json

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"date": "2025-08-06",
3+
"version": "1.88.0",
4+
"entries": [
5+
{
6+
"type": "Feature",
7+
"description": "Amazon Q Chat provides error explanations and fixes when hovering or right-clicking on error indicators and messages"
8+
},
9+
{
10+
"type": "Feature",
11+
"description": "/transform: Show transformation history in Transformation Hub and allow users to resume jobs"
12+
}
13+
]
14+
}

‎packages/amazonq/CHANGELOG.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
## 1.88.0 2025-08-06
2+
3+
- **Feature** Amazon Q Chat provides error explanations and fixes when hovering or right-clicking on error indicators and messages
4+
- **Feature** /transform: Show transformation history in Transformation Hub and allow users to resume jobs
5+
6+
## 1.87.0 2025-07-31
7+
8+
- Miscellaneous non-user-facing changes
9+
10+
## 1.86.0 2025-07-30
11+
12+
- **Bug Fix** Let Enter invoke auto completion more consistently
13+
- **Bug Fix** Faster and more responsive inline completion UX
14+
- **Bug Fix** Use documentChangeEvent as auto trigger condition
15+
116
## 1.85.0 2025-07-19
217

318
- Miscellaneous non-user-facing changes

‎packages/amazonq/README.md

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,49 +3,47 @@
33
[![Youtube Channel Views](https://img.shields.io/youtube/channel/views/UCd6MoB9NC6uYN2grvUNT-Zg?style=flat-square&logo=youtube&label=Youtube)](https://www.youtube.com/@amazonwebservices)
44
![Marketplace Installs](https://img.shields.io/vscode-marketplace/i/AmazonWebServices.amazon-q-vscode.svg?label=Installs&style=flat-square)
55

6-
# Agent capabilities
6+
# Agentic coding experience
7+
8+
Amazon Q Developer uses information across native and MCP server-based tools to intelligently perform actions beyond code suggestions, such as reading files, generating code diffs, and running commands based on your natural language instruction. Simply type your prompt in your preferred language and Q Developer will provide continuous status updates and iteratively apply changes based on your feedback, helping you accomplish tasks faster.
79

810
### Implement new features
911

10-
`/dev` to task Amazon Q with generating new code across your entire project and implement features.
12+
Generate new code across your entire project and implement features.
1113

1214
### Generate documentation
1315

14-
`/doc` to task Amazon Q with writing API, technical design, and onboarding documentation.
16+
Write API, technical design, and onboarding documentation.
1517

1618
### Automate code reviews
1719

18-
`/review` to ask Amazon Q to perform code reviews, flagging suspicious code patterns and assessing deployment risk.
20+
Perform code reviews, flagging suspicious code patterns and assessing deployment risk.
1921

2022
### Generate unit tests
2123

22-
`/test` to ask Amazon Q to generate unit tests and add them to your project, helping you improve code quality, fast.
23-
24-
### Transform workloads
25-
26-
`/transform` to upgrade your Java applications in minutes, not weeks.
24+
Generate unit tests and add them to your project, helping you improve code quality, fast.
2725

2826
<br>
2927

3028
# Core features
3129

32-
### Inline chat
33-
34-
Seamlessly initiate chat within the inline coding experience. Select a section of code that you need assistance with and initiate chat within the editor to request actions such as "Optimize this code", "Add comments", or "Write tests".
35-
36-
### Chat
30+
### MCP support
3731

38-
Generate code, explain code, and get answers about software development.
32+
Add Model Context Protocol (MCP) servers to give Amazon Q Developer access to important context.
3933

4034
### Inline suggestions
4135

4236
Receive real-time code suggestions ranging from snippets to full functions based on your comments and existing code.
4337

4438
[_15+ languages supported including Python, TypeScript, Rust, Terraform, AWS Cloudformation, and more_](https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/q-language-ide-support.html)
4539

46-
### Code reference log
40+
### Inline chat
41+
42+
Seamlessly chat within the inline coding experience. Select a section of code that you need assistance with and initiate chat within the editor to request actions such as "Optimize this code", "Add comments", or "Write tests".
4743

48-
Attribute code from Amazon Q that is similar to training data. When code suggestions similar to training data are accepted, they will be added to the code reference log.
44+
### Chat
45+
46+
Generate code, explain code, and get answers about software development.
4947

5048
<br>
5149

@@ -55,8 +53,6 @@ Attribute code from Amazon Q that is similar to training data. When code suggest
5553

5654
**Pro Tier** - if your organization is on the Amazon Q Developer Pro tier, log in with single sign-on.
5755

58-
![Authentication gif](https://raw.githubusercontent.com/aws/aws-toolkit-vscode/HEAD/docs/marketplace/vscode/amazonq/auth-Q.gif)
59-
6056
# Troubleshooting & feedback
6157

6258
[File a bug](https://github.com/aws/aws-toolkit-vscode/issues/new?assignees=&labels=bug&projects=&template=bug_report.md) or [submit a feature request](https://github.com/aws/aws-toolkit-vscode/issues/new?assignees=&labels=feature-request&projects=&template=feature_request.md) on our Github repository.

‎packages/amazonq/package.json

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"name": "amazon-q-vscode",
33
"displayName": "Amazon Q",
4-
"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.86.0-SNAPSHOT",
4+
"description": "The most capable generative AI–powered assistant for software development.",
5+
"version": "1.89.0-SNAPSHOT",
66
"extensionKind": [
77
"workspace"
88
],
@@ -743,7 +743,7 @@
743743
},
744744
{
745745
"command": "aws.amazonq.showHistoryInHub",
746-
"title": "%AWS.command.q.transform.viewJobStatus%"
746+
"title": "%AWS.command.q.transform.viewJobHistory%"
747747
},
748748
{
749749
"command": "aws.amazonq.selectCustomization",
@@ -849,15 +849,21 @@
849849
},
850850
{
851851
"command": "aws.amazonq.inline.acceptEdit",
852-
"title": "%aws.amazonq.inline.acceptEdit%"
852+
"title": "%AWS.amazonq.inline.acceptEdit%",
853+
"category": "%AWS.amazonq.title%",
854+
"enablement": "aws.codewhisperer.connected"
853855
},
854856
{
855857
"command": "aws.amazonq.inline.rejectEdit",
856-
"title": "%aws.amazonq.inline.rejectEdit%"
858+
"title": "%AWS.amazonq.inline.rejectEdit%",
859+
"category": "%AWS.amazonq.title%",
860+
"enablement": "aws.codewhisperer.connected"
857861
},
858862
{
859863
"command": "aws.amazonq.toggleNextEditPredictionPanel",
860-
"title": "%aws.amazonq.toggleNextEditPredictionPanel%"
864+
"title": "%AWS.amazonq.toggleNextEditPredictionPanel%",
865+
"category": "%AWS.amazonq.title%",
866+
"enablement": "aws.codewhisperer.connected"
861867
}
862868
],
863869
"keybindings": [

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

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import { Messenger } from './chat/controller/messenger/messenger'
1919
import { UIMessageListener } from './chat/views/actions/uiMessageListener'
2020
import { debounce } from 'lodash'
2121
import { Commands, placeholder } from 'aws-core-vscode/shared'
22+
import { codeReviewInChat } from './models/constants'
2223

2324
export function init(appContext: AmazonQAppInitContext) {
2425
const scanChatControllerEventEmitters: ScanChatControllerEventEmitters = {
@@ -74,17 +75,19 @@ export function init(appContext: AmazonQAppInitContext) {
7475
return debouncedEvent()
7576
})
7677

77-
Commands.register('aws.amazonq.security.scan-statusbar', async () => {
78-
if (AuthUtil.instance.isConnectionExpired()) {
79-
await AuthUtil.instance.notifyReauthenticate()
80-
}
81-
return focusAmazonQPanel.execute(placeholder, 'amazonq.security.scan').then(() => {
82-
DefaultAmazonQAppInitContext.instance.getAppsToWebViewMessagePublisher().publish({
83-
sender: 'amazonqCore',
84-
command: 'review',
78+
if (!codeReviewInChat) {
79+
Commands.register('aws.amazonq.security.scan-statusbar', async () => {
80+
if (AuthUtil.instance.isConnectionExpired()) {
81+
await AuthUtil.instance.notifyReauthenticate()
82+
}
83+
return focusAmazonQPanel.execute(placeholder, 'amazonq.security.scan').then(() => {
84+
DefaultAmazonQAppInitContext.instance.getAppsToWebViewMessagePublisher().publish({
85+
sender: 'amazonqCore',
86+
command: 'review',
87+
})
8588
})
8689
})
87-
})
90+
}
8891

8992
codeScanState.setChatControllers(scanChatControllerEventEmitters)
9093
onDemandFileScanState.setChatControllers(scanChatControllerEventEmitters)

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,3 +97,5 @@ const getIconForStep = (targetStep: number, currentStep: number) => {
9797
? checkIcons.done
9898
: checkIcons.wait
9999
}
100+
101+
export const codeReviewInChat = true

0 commit comments

Comments
 (0)