Merge master into feature/stepfunctions-execution #8218

aws-toolkit-automation · 2025-10-21T18:31:03Z

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/stepfunctions-execution
git merge origin/master
git commit
git push origin HEAD:refs/heads/autoMerge/feature/stepfunctions-execution

## Note **There is still a little bit more work needed for fully migrating aws-sdk v2 to v3, specifically all of these clients [here](https://github.com/aws/aws-toolkit-vscode/blob/59fd17fcfa22798e78d0df196290edb4a070f7ec/packages/core/scripts/build/generateServiceClient.ts#L232-L251) from the `generateServiceClient.ts` script** ## Problem AWS SDK V2 is at EOL ## Solution Migrate AWS SDK V2 to V3 This work has been done in the `feature/v2-to-v3-migration` feature branch and thus merging it into `master` Here are the PRs, which this does not include the merges from main and resolving conflicts: - #8043 - #8042 - #8046 - #8054 - #8041 - #8056 - #8081 - #8069 - #8067 - #8093 - #8095 - #8094 - #8171 - #8159 - #8175 - #8182 ## Testing Manually tested the [prerelease builds](https://github.com/aws/aws-toolkit-vscode/releases/tag/pre-v2-to-v3-migration) https://github.com/user-attachments/assets/b1d4795c-4027-462e-a195-509ac4a9d8ae --- - 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 <[email protected]> Co-authored-by: Tai Lai <[email protected]> Co-authored-by: invictus <[email protected]> Co-authored-by: Laxman Reddy <[email protected]>

## Problem When a user tries to connect to a SageMaker Space that is in the Stopped status (i.e., the underlying App is Deleted or has not been created), the Space will be automatically started by the toolkit before the connection is attempted. In some cases, the Space reaches the Running status (i.e., the App reaches the InService status) but the remote access capability is not yet ready as it starts asynchronously, leading to the SageMaker:StartSession API receiving an Internal Failure response. The client already retries, but the retries happen too quickly, before remote access becomes ready. ## Solution Adjust the SageMaker client retry configuration for StartSession calls made from the detached server (called via the `sagemaker_connect` script) to spread out the retries over multiple seconds. --- - 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 <[email protected]>

## Problem Some of the unit tests were flakey ## Solution Remove flakey test. We are okay to do this because the project scan flow is no longer in use --- - 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: Blake Lazarine <[email protected]>

- This merges the released changes for rc-20251022 into main. --- - 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 <>

…8229) - migrating this PR: aws/aws-toolkit-vscode-staging#2248 --- - 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-ides-bot <[email protected]> Co-authored-by: aws-toolkit-automation <[email protected]> Co-authored-by: tobixlea <[email protected]> Co-authored-by: Sherry Lu <[email protected]>

## Problem <img width="2353" height="362" alt="image" src="https://github.com/user-attachments/assets/4d98944f-8d7a-4dcd-98d2-8dd0e9fb1891" /> ## Solution - Skipping this test for now. Lambda team will work on a fix and reenable this soon. --- - 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 <[email protected]> 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 <[email protected]>

## 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 <[email protected]>

## 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 <[email protected]>

…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 <[email protected]>

#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.

- Add CloudFormation Language Server Protocol support with multiple provider options - Include CloudFormation explorer with stack, resource, and change set management - Add stack deployment, validation, and change set workflows with S3 upload support - Include drift detection and diff visualization capabilities - Add CloudFormation environment and project management with cfn-init integration - Include telemetry and authentication handling - Add comprehensive test coverage for all CloudFormation features - Update package configurations and language syntax highlighting

## 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

…ents - Remove resource type from list using right click - Few startup fixes for CloudFormation extension - Add exec permissions and support node versions - Add node to AWS Explorer CFN panel - Add prompt for deploymentMode and plumb to deployment - Coordinate stack views and add overview to CFN console - Fix extract to parameter cursor command

**Description** Noticed that if Q extension is installed alongside AWS Toolkit, the Show Logs option redirecting to Q logs were showing up in the toolkit views as well. This does not make sense, especially for SMUS as it is misleading. <img width="1045" height="483" alt="image" src="https://github.com/user-attachments/assets/9938af48-c039-4a89-b2fa-97ba93a6e235" /> Change now shows this only for amazonq views similar to the learn more option. **Motivation** Remove misleading show logs option from non Q views **Testing Done** Tested locally that it no longer shows up in Toolkit but shows in Q. <img width="1117" height="333" alt="image" src="https://github.com/user-attachments/assets/750590e1-e4c8-47c9-af4d-4adf9511680c" /> <img width="972" height="476" alt="image" src="https://github.com/user-attachments/assets/06bfdd91-0770-49eb-890a-46789a96813c" /> --- - 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 <[email protected]>

…es (#8303) Includes all CloudFormation improvements and fixes from November 9th through November 17th: - Integration tests and LSP server workflow scripts - Online error handling improvements - CommaDelimitedList validation and boolean support - Restart server command fixes and autocomplete improvements - CFN init typing and consolidated commands - LSP logs and exception handling - Pagination and search in import/clone commands - Resource type request handling - Environment command error handling - Project creation UI improvements - LSP integration tests for offline features - Reference-counted status bar implementation - Expand/collapse arrow and resource messaging updates - Stack events and resources loading improvements - Validation workflow enhancements - Resource management and provider naming - Non-blocking CFN operations and restart LSP functionality - Deep linking to stack information views - E2E test infrastructure setup - Deployment workflow alignment - Cached CFN server offline support - LSP installation process updates - Startup fixes and permission handling - AWS Explorer CFN panel integration - Deployment mode prompts and stack view coordination - Overview integration and parameter extraction fixes - Panel metrics and telemetry improvements - S3 upload support and file selection - Icon updates and environment warnings - Command palette fixes and document management - Related resources workflow improvements - Windows target fixes and validation improvements - Environment naming and resource state management - Stack description and telemetry configuration - Deployment/validation icons and usage tracking - Permission handling and resource loading - Environment file selection and experimental flag removal - Endpoint configuration and ChangeSet diff redesign - S3 upload validation and inline completion removal - Stack output viewing and installation cleanup - Resource detail views and change set functionality - Dry run fixes and icon updates - Related resources API and change set commands - Stack event fetching and authentication updates - Drift indication and change set deletion - Credential encryption and diff viewer improvements - CFN init UI and empty node set handling - Stack overview pages and environment selection - View diff improvements and resource command updates - CloudFormation prefix usage and change set logic - Command execution controls and deployment confirmation - Document management and resource node simplification - Region management and settings updates - Resource/stack pagination and explorer node additions - Version selection and color fixes - Stack refresh listeners and LSP server locator improvements - CFN-lint/guard settings and diff provider enhancements - Managed resource import warnings and resource import support - Telemetry/client ID configuration and regionality improvements - Clone/stack info restoration and package.json updates - LSP stream improvements and authentication fixes ## Problem ## 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: manodnyab <[email protected]>

## Problem The AWS SDK v2 to v3 migration in PR #8183 introduced breaking changes for LocalStack compatibility and Lambda debugging is not working anymore: 1. **User Agent format changed:** The migration changed from string-based user agents to AWS SDK v3's `UserAgent` pairs format (`[name, version]` tuples), but several places still used the old string format, breaking LocalStack's custom user agent for Lambda debugging and part of the integration with IoT 2. **Response headers no longer accessible**: AWS SDK v3 removed access to HTTP response headers via `$response.httpResponse.headers`, breaking LocalStack connection detection which relies on the `x-localstack-request-url` header These issues were not caught most likely because LocalStack compatibility was not tested during the SDK v3 migration. ## Solution 1. Fix user agent format for AWS SDK v3 * Migrated from string-based user agents to proper UserAgent pairs format: * Changed from "LAMBDA-DEBUG/1.0.0 AWS-Toolkit/..." (string) * To [['LAMBDA-DEBUG', '1.0.0'], ['AWS-Toolkit', '2.0'], ...] (pairs) * Updated awsClientBuilderV3 to use customUserAgent instead of userAgent 2. Add response headers middleware for AWS SDK v3 * Added `captureHeadersMiddleware` to `AWSClientBuilderV3` that attaches HTTP response headers to the output via `$httpHeaders` property * Updated `loginManager` to check for LocalStack connection using `$httpHeaders` instead of the removed `$response.httpResponse.headers` ## AWS SDK v3 Breaking Changes ### User Agent Format **SDK v2**: ```ts // String format in client options const options = { region: 'us-east-1', userAgent: 'LAMBDA-DEBUG/1.0.0 AWS-Toolkit/2.0.0' } ``` **SDK v3:** ```ts // Array of [name, version] tuples const options = { region: 'us-east-1', customUserAgent: [ ['LAMBDA-DEBUG', '1.0.0'], ['AWS-Toolkit', '2.0.0'] ] } ``` ### Response Headers Access **SDK v2**: ```ts const response = await client.send(command) // Headers directly accessible const headers = response.$response.httpResponse.headers const localStackUrl = headers['x-localstack-request-url'] ``` **SDK v3**: ```ts const response = await client.send(command) // Headers NOT accessible by default - requires custom middleware const headers = response.$httpHeaders // undefined without middleware ``` Supersedes #8289 and #8291 --- - 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: carole-lavillonniere <[email protected]> Co-authored-by: Cristian Pallarés <[email protected]> Co-authored-by: Laxman Reddy <[email protected]>

…#8294) ## Problem - There was a significant increase in call volume for the sso-oidc CreateToken operation from AmazonQ-For-VSCode clients. ## Solution - The root cause was identified as a race condition in concurrent asynchronous token refresh operations within the VSCode extension. When bearer tokens expired (after 1 hour), multiple simultaneous calls to getToken() independently triggered token refresh operations, resulting in duplicate OIDC API calls. - Implemented a "promise deduplication" pattern to prevent duplicate async OIDC calls. --- - 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.

--- - 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.

We'll add them in the future once we're sure they don't cause issues in other tests ## Problem ``` WebSocket close timed out, forcing termination WebSocket close timed out, forcing termination notifications: Attempting to fetch notifications for category: emergency at endpoint: https://idetoolkits-hostedfiles.amazonaws.com/Notifications/VSCode/emergency/1.x.json ``` ## Solution We manually verified this implementation. We want to add similar tests in the future, but that don't cause other issues. --- - 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.

…ges (#8319) ## Problem fix(cloudformation): fix a few testing issues ## Solution - Remove `**/cloudformation-languageserver/**` from tests coverage - Drop an integration test for SAM schema downloads --- - 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 <[email protected]>

feat(cloudformation): Update CloudFormation feature with latest changes

## Problem - https://d1ihu6zq92vp9p.cloudfront.net/45451b0f-383e-4f4a-adc0-ce623f5765be/report.html ``` Error: Activating extension 'redhat.java' failed: Java 21 or more recent is required to run the Java extension. Please download and install a recent JDK. You can still compile your projects with older JDKs by configuring ['java.configuration.runtimes'](https://github.com/redhat-developer/vscode-java/wiki/JDK-Requirements#java.configuration.runtimes). at v.n (/tmp/.vscode-test/vscode-linux-x64-1.83.0/resources/app/out/vs/workbench/api/node/extensionHostProcess.js:125:6274) at async v.m (/tmp/.vscode-test/vscode-linux-x64-1.83.0/resources/app/out/vs/workbench/api/node/extensionHostProcess.js:125:6168) at async v.l (/tmp/.vscode-test/vscode-linux-x64-1.83.0/resources/app/out/vs/workbench/api/node/extensionHostProcess.js:125:5625) ``` - The Python 3.14 version is coming from the external Serverless Land repository pattern (aws-samples/serverless-patterns) ## Solution - Fixed 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.

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

## Problem Remote debugging doesn't work well on custom function types which doesn't support SnapStart ## Solution disable until it's supported --- - 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 ## 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: Austin Jang <[email protected]> Co-authored-by: Arkaprava De <[email protected]> Co-authored-by: Roger Zhang <[email protected]>

## Problem need createToken metric ## Solution add createToken metric ## Testing <img width="1510" height="131" alt="vsc" src="https://github.com/user-attachments/assets/496bd6dc-dce3-4ddb-9471-f55aad6b27a0" /> --- - 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.

## Notes: This merges the released changes for rc-20251120 into main. --- - 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 <>

## Description This PR merges changes to add support in SMUS to use IAM-based domains. Previously we only supported IdC-based domains and with this, customers have the flexibility to use both the authentication options. --- - 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 <[email protected]> Co-authored-by: aws-ides-bot <[email protected]> Co-authored-by: Bhargava Varadharajan <[email protected]> Co-authored-by: kzr <[email protected]> Co-authored-by: Laxman Reddy <[email protected]> Co-authored-by: Sherry Lu <[email protected]> Co-authored-by: Sherry Lu <[email protected]> Co-authored-by: zulil <[email protected]> Co-authored-by: Zulin Liu <[email protected]> Co-authored-by: David <[email protected]> Co-authored-by: David Hasani <[email protected]> Co-authored-by: Arkaprava De <[email protected]> Co-authored-by: Arkaprava De <[email protected]> Co-authored-by: Keyu Wu <[email protected]> Co-authored-by: chungjac <[email protected]> Co-authored-by: aws-asolidu <[email protected]> Co-authored-by: Newton Der <[email protected]> Co-authored-by: Newton Der <[email protected]> Co-authored-by: Will Lo <[email protected]> Co-authored-by: Boyu <[email protected]> Co-authored-by: atontb <[email protected]> Co-authored-by: Richard Li <[email protected]> Co-authored-by: Shruti Sinha <[email protected]> Co-authored-by: Bhavya Sharma <[email protected]> Co-authored-by: Roger Zhang <[email protected]> Co-authored-by: Tai Lai <[email protected]> Co-authored-by: invictus <[email protected]> Co-authored-by: Dylan Ross <[email protected]> Co-authored-by: BlakeLazarine <[email protected]> Co-authored-by: Blake Lazarine <[email protected]> Co-authored-by: tobixlea <[email protected]> Co-authored-by: seshubaws <[email protected]> Co-authored-by: Bhavya Sharma <[email protected]> Co-authored-by: manodnyab <[email protected]>

…t interrupting execution (#8346) ## Problem - User experiences pop up error when connecting with a stopped space. - Attempt to connect without waiting for space to transition to running state. - Listing needs to check all clusters without stopping execution flow on initial discovered error ## Solution - Added delay for space to fully transition state before attempting to connect - Change throwing error to logging warnings --- - 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 <[email protected]>

aws-toolkit-automation requested a review from a team as a code owner October 21, 2025 18:31

dylanraws and others added 28 commits October 22, 2025 11:15

Merge master into feature/cloudformation

c882252

Merge master into feature/cloudformation

5657bc1

Add changelog entry for CloudFormation LSP integration

89434cb

Merge master into feature/cloudformation

dbe22cc

Merge master into feature/cloudformation

a1ffdb5

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

7a03794

Merge master into feature/cloudformation

e005c2a

Merge branch 'feature/cloudformation' into feature/cloudformation

e19e476

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

c9bd715

…he space

aws-toolkit-automation and others added 30 commits November 18, 2025 10:39

Merge master into feature/cloudformation

4a5cd22

Merge master into feature/cloudformation

1225595

Merge master into feature/cloudformation

b5ac5d6

Merge master into feature/cloudformation

9bc923d

Merge master into feature/cloudformation

f49a07f

Merge master into feature/cloudformation

dd1ba33

Merge pull request #8315 from aws/feature/cloudformation

c8809c6

feat(cloudformation): Update CloudFormation feature with latest changes

Release 3.85.0

9bf9629

Update version to snapshot version: 3.86.0-SNAPSHOT

ee178a4

Release 1.105.0

ca78e1d

Update version to snapshot version: 3.86.0-SNAPSHOT

a9c1ce1

Merge release into release/rc-20251119

6474ed6

Update version to snapshot version: 1.106.0-SNAPSHOT

6d212e3

Merge release into release/rc-20251119

5dfd797

Merge branch 'master' into manodnyb/release/rc-20251119

bb51565

Merge pull request #8336 from aws/manodnyb/release/rc-20251119

0e609ac

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Merge master into feature/stepfunctions-execution #8218

Merge master into feature/stepfunctions-execution #8218

aws-toolkit-automation commented Oct 21, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

18 participants

Merge master into feature/stepfunctions-execution #8218

Are you sure you want to change the base?

Merge master into feature/stepfunctions-execution #8218

Conversation

aws-toolkit-automation commented Oct 21, 2025

Automatic merge failed

Command line hint

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

18 participants