Merge master into feature/agentic-chat #6900
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
…json (#6826) ## Problem - manifest suppression messages were missing from package.json and directly written to settings gen, causing them to be overridden on every `npm install` ## Solution - add manifest suppression to package.json - make this field available in the config --- - 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 - We previously thought inline completion was going to be launched first so we didn't end up putting it behind a feature flag ## Solution - Add inline completion behind a feature flag --- - 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 `@Prompts` not being sent to context due to change in [last week's release](https://github.com/aws/aws-toolkit-vscode/pull/6831/files#r2021948984) ## Solution Add 'file' label to user prompts
## Problem There was no implementation for the `authFollowUpClicked` message received from LSP for Amazon Q. Because of that, the `authenticate` button that appears in case of expired SSO connection had no effect. ## Solution I added the implementation as follows: * If the received `authFollowUpType` is `'re-auth'` or `'missing_scopes'`, initiate a re-authentication * If the received `authFollowUpType` is `'full-auth'` or `'use-supported-auth'`, delete the connection so a new full authentication flow kicks off I added a unit test file for this message type, which is extendable for every command handled in `registerLanguageServerEventListener` --- - 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 We don't yet have legal approval to show users a feedback form. It is currently disabled / commented out, but better to remove the unused code until we get approval, since it may take a while and may not even happen. ## Solution Remove unused code and fix test.
Upgrade to mynah-ui 4.27.0 https://github.com/aws/mynah-ui/releases/tag/v4.27.0 Includes a visual change: Code blocks now have max-height of 21 lines
## Problem AppSec has required that we give the user an indication if they are about to run a potentially dangerous command ## Solution - Parse bash command to determine whether or not commands are dangerous or not. - Display message warning to user ## Tests  --- - 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 In Sagemaker Unified Studio(SMUS), user shouldnt be allowed to sign out of Q Chat extension as per business requirement. In addition to that, Q Chat Introduction message should display Q Free Tier is only supported with the upcoming SMUS release ## Solution 1. `isSageMaker` is used to identify if it is SageMaker AI (CodeEditor) which comes from [here](https://github.com/aws/sagemaker-code-editor/blob/main/patched-vscode/product.json#L2-L3) as shared by Sagemaker team. Since SageMaker Unified Studio also uses the same repository/branch for CodeEditor we required a new environment variable `SERVICE_NAME` to differentiate SMUS case. 2. Read `SERVICE_NAME` and set a new vscode env context variable `aws.isSagemakerStudio` to control visibility of Sign out label 3. Sign out option to users is controlled at two places: - VS Code command palette - Quick pick UI action - Both the sign out options are disabled based on the SMUS flag 4. Similarly Q Chat Introduction message in WebView is modified for SMUS case alone
ctlai95
approved these changes
Apr 1, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
9 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):