Merge master into feature/agentic-chat #6868
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
## Problem `ReferenceError: IntersectionObserver is not defined` in E2E tests due to JSDOM ## Solution Add mock for IntersectionObserver --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). - License: I confirm that my contribution is made under the terms of the Apache 2.0 license.
## Problem Some users are reporting S3 upload failures but we don't have the id2 that S3 team requires to investigate further. Related Commons change: [#1005](aws/aws-toolkit-common#1005) ## Solution Emit amazonq_createUpload metric with id2, and add logs for these ids so customers can use too.
|
## Problem Hide a feedback form since we haven't gotten the Legal-approved text yet. ## Solution --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). - License: I confirm that my contribution is made under the terms of the Apache 2.0 license. Co-authored-by: David Hasani <[email protected]>
## Problem ``` * Executing task in folder amazonq: yarn run watch zsh:1: command not found: yarn * The terminal process "/opt/homebrew/bin/zsh '-l', '-c', 'yarn run watch'" failed to launch (exit code: 127). * Terminal will be reused by tasks, press any key to close it. ``` Seems to be a vscode issue. - microsoft/vscode#181006 - microsoft/vscode#159465 Given that we already have `npm.packageManager` set to `npm` in this repo, I'm not sure why it keeps trying to use `yarn`. ## Solution Run the watch task as a shell script --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). - License: I confirm that my contribution is made under the terms of the Apache 2.0 license.
ctlai95
approved these changes
Mar 28, 2025
#6172) ## Context We currently allow multiple build processes to run at the same time for the same template. ## Problem When running a build, it’s possible to start a second build for the same project. This results in both builds failings ## Solution Prevent parallel builds on the same template --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). License: I confirm that my contribution is made under the terms of the Apache 2.0 license.
## Problem Includes fix for background input color introduced in 4.26.0. No changelog needed because previous version hasn't been released ## Solution update mynah-ui
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Automatic merge failed
Command line hint
To perform the merge from the command line, you could do something like the following (where "origin" is the name of the remote in your local git repo):