Merge master into feature/amazonqLSP-auth #7322

aws-toolkit-automation · 2025-05-15T19:48:14Z

Automatic merge failed

Resolve conflicts and push to this PR branch.
Do not squash-merge this PR. Use the "Create a merge commit" option to do a regular merge.

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):

git stash
git fetch --all
git checkout origin/feature/amazonqLSP-auth
git merge origin/master
git commit
git push origin HEAD:refs/heads/autoMerge/feature/amazonqLSP-auth

…ompletion acceptance (#7783) ## Problem https://github.com/user-attachments/assets/56c70784-f92b-43dc-8f7e-b38b873a3784 When an inline completion is accepted, there can be extra ) ] } ' " that breaks the syntax. ## Solution https://github.com/user-attachments/assets/c84f1e6a-4f80-4605-a2e1-074047ac19bf Bring back old code that was used to remove the extra ) ] } ' " . https://github.com/user-attachments/assets/35a65fce-98c1-4819-8bc5-3cb5c9aad5ab Ref: https://github.com/aws/aws-toolkit-vscode/blob/amazonq/v1.74.0/packages/core/src/codewhisperer/util/closingBracketUtil.ts --- - 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 There is a bug in VS Code inline completion API, when hitting Enter, the context.triggerKind is Invoke (0) when hitting other keystrokes, the context.triggerKind is Automatic (1) we should only mark option + C as manual trigger Invoke(0) ## Solution Use timestamp to decide what is manual trigger and what is auto trigger. --- - 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 The AppComposer generate feature is moving from a call to the Q extension to a call to our owned CDN, the same CDN that hosts our webview, or CFN template partials. ## Solution This PR updates the code that used to make a call to the Q extension and instead replaces it with fetch call to the CDN to gather data. Error cases (such as the requested file not being found or the CDN being down) are handled by the existing code. --- - 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 Need to differentiate internal vs external customers. ## Solution add startUrl to more metrics. --- - 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.

#7792) ## Problem The unifiedDiff from suggestionResponse is outdated due to the change of context, resulting to the wrong line getting highlighted while rendering. ## Solution Calculate the addedLines and removedLines using the current code content and new code suggestion. --- - 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 if token is not available or the target branch is not master, then coverage upload command will report failure additionally, coverage upload failure should not fail the build ## Solution suppress failure --- - 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.

…7780) ## Problem During the inline completion migration to Flare, the timeout handling of inline completion API was lost. It was there in earlier versions. The IDE -> Flare call is a local network call that should have a timeout. ## Solution Add the inline completion call with timeout back. See https://github.com/aws/aws-toolkit-vscode/blob/amazonq/v1.74.0/packages/core/src/codewhisperer/util/commonUtil.ts#L21 --- - 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.

#7802) … to menu string ## Problem Customer reported issue here: #7796 ## Solution Fix next edit suggestion, inline accept and reject edit to menu string ## Testing <img width="608" height="87" alt="Screenshot 2025-08-01 at 2 37 51 PM" src="https://github.com/user-attachments/assets/0004dc9b-32b9-40fb-a5c4-528a8b15c2a2" /> <img width="608" height="105" alt="Screenshot 2025-08-01 at 2 38 54 PM" src="https://github.com/user-attachments/assets/783b4065-a1ae-40df-b16d-55c747b38489" /> <img width="608" height="105" alt="Screenshot 2025-08-01 at 2 39 17 PM" src="https://github.com/user-attachments/assets/31578cf4-2e46-4c30-a6b4-e762543e5252" /> --- - 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 The test is checking for a popup to confirm overwrite of the SAM template. It is most likely getting blocked due to the "Scanning cloudformation template" warning popup that shows up before. ## Solution #3510 says disabling AWS SAM Codelens removes the aforementioned popup so I added a statement to disable the statement beforehand, and enabled it after this test runs so as not to impact other 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 This merges the released changes for rc-20251030 into main. MCM-137408423 ## 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: tobixlea <tobixlea@amazon.com> Co-authored-by: aws-toolkit-automation <>

## Problem Customer feedback about wanting more job attributes to be present in the job history table. ## Solution Add more info columns to the job history table. --- - 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 <davhasan@amazon.com>

## Problem In the Amazon Q Welcome Walkthrough, the "Scan your current project" button under "Check for security vulnerabilities" feature is non-functional and does not initiate any scanning process when clicked. #### Steps to Reproduce - Click the 3-dot menu (⋯) above the chat interface - Select "Help" from the dropdown menu - Choose "Welcome Walkthrough" option - Navigate to "Check for security vulnerabilities" section - Click the "Scan your current project" button <img width="2778" height="1896" alt="image" src="https://github.com/user-attachments/assets/3e1a271a-c617-4e51-ae11-3fa538e54c3b" /> ## Solution - Remove this user experience as this is a part of agentic chat experience. --- - 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: seshubaws <116689586+seshubaws@users.noreply.github.com>

## Problem One of our previous PR: #7997 removed one of the intended user-agent for remote debugging. Adding this back ## Solution Add the intended user-agent back --- - 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.

#8249) ## Problem Users will face a host identification issue when reconnecting to a Space after restarting it, if the Space name has capital letters. This occurs because the Space's hostname is written to the known_hosts file in lowercase, but hostname matching during reconnection is case-sensitive. ## Solution When removing the Space hostname from the known_hosts file, ensure to remove lines that match the lowercase variant of the Space hostname. --- - 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: Laxman Reddy <141967714+laileni-aws@users.noreply.github.com>

…n process (#8247) ## Problem Users had no idea what was happening during connecting to remote space, which can take few seconds to connect. User clicks "Connect" → Nothing visible happens for few seconds → Either success or failure ## Solution Adds progress tracking for SageMaker space connections which shows connection status with space name in progress dialog Test cases are not being added because it is just showing the user about progress during Space operations for good user experience. ## Testing Tested for both SM-AI and SMUS Spaces. 1. https://github.com/user-attachments/assets/20b02db3-7b6b-44d3-8e83-66d4e468da2c 2. https://github.com/user-attachments/assets/e2196483-b935-45d3-ae00-86e4163d298e --- - 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: Laxman Reddy <141967714+laileni-aws@users.noreply.github.com>

#8261) ## Problem - Connect button only appeared for spaces with remote access enabled. When users landed on the toolkit and saw running spaces without remote access, there was no connect button visible. This created confusion because: -- Users expected to be able to connect to any running space -- No visual indication that connection was possible -- Users didn't understand why some spaces were "connectable" and others weren't ## Solution - Always show connect button for all spaces (running and stopped, regardless of remote access status). When users click connect on a space without remote access, show clear dialog explaining what needs to happen and get their consent upfront. - There is no breaking change. - Tested for all use-cases SM-AI and SMUS ## Current User Exp --- https://github.com/user-attachments/assets/9c5c8634-42df-4cd1-988b-12cc8008d69e - 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 need a new parameter to differentiate implicit and explicit reject for inline ## Solution Include reason for inline notification --- - 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 This merges the released changes for rc-20251106 into main. MCM-137924316 ## 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: aws-toolkit-automation <>

…pe (#8276) ## Problem - Fixes crash when connecting to spaces that have been stopped for long - The code was incorrectly accessing node.spaceApp.App.AppType, but the App object is undefined for spaces stopped for long as it deletes the App resource . This caused below error ``` Error running command aws.smus.openRemoteConnection: Remote connection failed: Cannot read properties of undefined (reading 'AppType'). This is likely caused by the extension that contributes aws.smus.openRemoteConnection. ``` ## Solution Changed to use node.spaceApp.SpaceSettingsSummary.AppType instead, which - - Is always available (part of space configuration, not runtime state) - Contains the correct AppType value needed for start/stop operations - SpaceSettingsSummary comes from ListSpaces API call and it will always returns SpaceSettingsSummary as part of the SpaceDetails. - AppType is a required field in SpaceSettingsSummary because every SageMaker space must have an application type (JupyterLab or CodeEditor). --- - 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.

…he space

…he space (#8282) ## Problem - Users could click start/stop buttons on SageMaker spaces while they were already in the process of starting or stopping. ## Solution - Disables start/stop buttons when SageMaker space is in STARTING or STOPPING state to prevent invalid operations during state transitions. - Added pending state check in getContext() method - Returns specific context values for pending states (smusSpacePendingNode/awsSagemakerSpacePendingNode) in package.json [openRemoteConnection] --- - 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.

**Description** PR adds deeplink support for SageMaker Unified Studio. Details: 1. Uses a new URI handler for SMUS to have distinct path for SMUS and SM AI. This helps distinguish between the two to special case behavior and also to avoid older toolkit releases from picking up SMUS deeplinks. 2. For SMUS, we are not able to trigger the refresh flow yet. So we will show an error page and ask user to retry from portal again. 3. Added smus specific telemetry and added optional params that we will get from query params. Since we do not have creds or connection info already, all telemetry data has to come from deeplink. 4. Had to change from vscode default context to Toolkit wrapper of that context to be able to register URI. **Motivation** Support deeplink for smus, improve discoverability of feature. **Testing Done** Unit tests. Tested locally, sharing recording with team offline. --- - 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: Bhargava Varadharajan <vabharga@amazon.com>

@dylanraws

…art (#8277) ## Problem Occasionally, then a user clicks the Connect button for a Space that is in the Stopped status, the corresponding App that gets created eventually takes too long to become Running, so the user is shown the following error message. ``` Remote connection failed: Timed out waiting for app "default-b97e54b8-e0e1-70b7-a216-856fcbb3cc61" to reach "InService" status. | Timed out waiting for app "default-b97e54b8-e0e1-70b7-a216-856fcbb3cc61" to reach "InService" status. ``` We can't prevent this from happening as it depends on the SageMaker platform, but we can improve the user experience around this. ## Solution * Add more time to hard timeout * update the process messages when App takes longer than usual to connect ## Appearance ### currently: <img width="474" height="67" alt="Screenshot 2025-11-12 at 12 13 53 PM (3)" src="https://github.com/user-attachments/assets/2b543afa-621f-4ac0-8838-3b1d0ca74276" /> (2 min 30 sec) -> <img width="469" height="161" alt="Screenshot 2025-11-12 at 12 05 16 PM" src="https://github.com/user-attachments/assets/ce4d7f3f-7d52-48ed-937d-b07a7e09175d" /> ### this change: <img width="474" height="67" alt="Screenshot 2025-11-12 at 12 13 53 PM (3)" src="https://github.com/user-attachments/assets/2b543afa-621f-4ac0-8838-3b1d0ca74276" /> (1 min) -> **Note: Based on @dylanraws' and ricokyle@'s suggestions, the exact wording is changed to "Connecting to testX: Starting the Space is taking longer than usual. The space will connect when ready"** <img width="478" height="127" alt="Screenshot 2025-11-11 at 10 02 37 AM" src="https://github.com/user-attachments/assets/b9d0c4b2-e25b-4c05-8ea5-ecb65c9b3fa5" /> (9 min) -> <img width="469" height="161" alt="Screenshot 2025-11-12 at 12 05 16 PM" src="https://github.com/user-attachments/assets/ce4d7f3f-7d52-48ed-937d-b07a7e09175d" /> --- - 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.

fix(sagemaker): better UX exp for user facing messages.

## Notes - remove duplicate change log --- - 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: manodnyab <66754471+manodnyab@users.noreply.github.com>

build(amazonq): merge release candidate version rc-20251114

aws-toolkit-automation requested review from a team as code owners May 15, 2025 19:48

aws-toolkit-automation requested a review from a team as a code owner June 19, 2025 18:25

aws-toolkit-automation and others added 26 commits July 30, 2025 22:43

Merge public/master to private/staging

c4641e7

Merge staging into feature/smus

7e3f4dd

Merge public/master to private/staging

5cf3a8c

Merge public/master to private/staging

db0492a

Merge staging into feature/smus

9bdce0e

Release 1.87.0

42b7fb9

Update version to snapshot version: 1.88.0-SNAPSHOT

841b568

Merge public/master to private/staging

cd2cd06

Merge staging into feature/smus

37d3258

Merge public/master to private/staging

df9dc44

Merge public/master to private/staging

3ba0187

Merge staging into feature/smus

5d64e81

Merge public/master to private/staging

10b56d2

Merge staging into feature/smus

605d62a

Merge public/master to private/staging

f1798a9

Merge staging into feature/smus

aa5c07b

Merge public/master to private/staging

7e26cf2

Merge staging into feature/smus

24ee443

seshubaws and others added 30 commits October 27, 2025 11:25

fix(smus): unble to refresh status on newly created App bug (#8258)

7a03794

fix(sagemaker): Disable start/stop button for intermediate state of t…

c9bd715

…he space

chore: trigger CI

7b80f7d

Merge branch 'aws:master' into master

1b7c4c4

fix(sagemaker): Fix various SMUS bugs

7abfff7

Merge branch 'master' into fix/riv-bugs-clean

419a727

Merge pull request #8292 from bhavya2109sharma/fix/riv-bugs-clean

3b2f8b3

fix(sagemaker): better UX exp for user facing messages.

Update third-party license attribution for release/rc-20251114

a62cdad

Release 3.84.0

37d6c7a

Release 1.104.0

952d0ae

Update version to snapshot version: 3.85.0-SNAPSHOT

6daab01

Update version to snapshot version: 1.105.0-SNAPSHOT

3c87052

Merge branch 'master' into release/rc-20251114

483c814

Merge pull request #8296 from laileni-aws/release/rc-20251114

7442e21

build(amazonq): merge release candidate version rc-20251114

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Merge master into feature/amazonqLSP-auth #7322

Merge master into feature/amazonqLSP-auth #7322

Uh oh!

aws-toolkit-automation commented May 15, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

40 participants

Merge master into feature/amazonqLSP-auth #7322

Are you sure you want to change the base?

Merge master into feature/amazonqLSP-auth #7322

Uh oh!

Conversation

aws-toolkit-automation commented May 15, 2025

Automatic merge failed

Command line hint

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

40 participants