Skip to content

Conversation

aws-toolkit-automation
Copy link
Collaborator

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

@aws-toolkit-automation aws-toolkit-automation requested a review from a team as a code owner April 14, 2025 15:23
Copy link

  • This pull request modifies code in src/* but no tests were added/updated.
    • Confirm whether tests should be added or ensure the PR description explains why tests are not required.

@aws-toolkit-automation aws-toolkit-automation requested a review from a team as a code owner April 15, 2025 15:08
@aws-toolkit-automation aws-toolkit-automation requested a review from a team as a code owner April 15, 2025 23:45
@aws-toolkit-automation aws-toolkit-automation requested a review from a team as a code owner May 1, 2025 03:05
@aws-toolkit-automation aws-toolkit-automation requested a review from a team as a code owner June 19, 2025 18:22
guntamb and others added 24 commits July 22, 2025 14:48
Improve the SageMaker Unified Studio project switching experience with the following changes:
- Add pagination support to fetch all projects via new fetchAllProjects method
- Sort projects by last updated time for better user experience
- Filter out the current project from the selection list to avoid redundant selection
- Implement proper tree view refresh after project selection
- Add getProject method to retrieve the current project
- Rename setSelectedProject to setProject for consistency
- Update error messages to be more specific

This change makes project switching more intuitive by showing recently updated projects first and ensuring the UI properly refreshes after selection.
**Description**

Added a basic flow to handle auth in SMUS explorer. Trying to keep the
authentication and credentials separate for the SMUS explorer from
AWSToolkit explorer - This will allow users to continue using AWS
explorer with credentials of their choice while using SMUS with
credentials vended by DZ.

Making incremental changes to ensure everyone is able to factor in
changes in their PRs.

Plan for PRs for auth :

PR 1 : UI to go from unauthenticated view to login and then redirect to
explorer with authenticated view. Basically mock auth and set the value
for DomainId and Region.
PR 2: Setup CredentialProvider - Authentication actually invokes SSO
PKCE flow and store SSO tokens in `~/.aws/sso/cache`
PR 3: Use tokens to obtain DER credentials and make it available in
credential provider.
PR 4 : Add environment role credential fetching and refresh
PR 5 : Cache and refresh for both credentials

**NOTE: Not really sure if the telemetry code is actually working.
Unable to access kibana. Will check with toolkit team**

**Motivation**

Support auth flow in AWSToolkit for SMUS.

**Testing Done**

Updated unit tests. Ran the extension locally and did manual testing.

## 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: Bhargava Varadharajan <[email protected]>
## Problem
We needed a solution to 1 click access the logs on the disk. 

## Solution
Implemented a button for it. And also wired the related language server
changes for this.

---

- 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(amazonq): fix finding suppression, change icon, change tool name
…ace condition (#7734)

## Problem

When Q is editing (on accept, on reject is in progress), if we trigger
again, the session is not closed yet, global state varaibles are still
in progress to be cleared, and we will report wrong user trigger
decision telemetry. This is worse for acceptance since it has a await
sleep for diagnostics to update.

## Solution

Do not let it trigger when Q is editing!  

This is not customer facing so no 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.
feat(auth): Display second quickpick for SSO linked IAM profiles
)

## Problem

Currently, users need to manually click buttons or use the command
palette to execute common shell
commands (reject/run/stop) in the IDE. This creates friction in the
developer workflow, especially
for power users who prefer keyboard shortcuts.

## Solution

Reopen [Na's PR](#7178)
that added keyboard shortcuts for reject/run/stop shell commands

Update to align with new requirements.

Add VS Code feature flag (shortcut)

Only available if Q is focused

## Screenshots


https://github.com/user-attachments/assets/84df262e-2b92-456d-a8ae-bc2f1fd6318c

---

- 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.
atonaamz and others added 30 commits August 27, 2025 20:30
## 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: David Hasani <[email protected]>
Co-authored-by: invictus <[email protected]>
…s project, start/stop space and data explorer (#2207)

## Problem
Telemetry is missing from the feature.

## Solution

- update packages/core/src/shared/telemetry/vscodeTelemetry.json with
new types, metrics, and metadata
- run npm run generateTelemetry in core package. this will create
required obj that are accessible via telemetry.{metric name}
- then emit metric in the 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.

---------

Co-authored-by: Keyvan Zare Rami <[email protected]>
Co-authored-by: Zulin Liu <[email protected]>
## 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.
…sec when a completion arrives (#7950)

## 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.
…ccount cases (#2209)

## Problem
1. In a cross region cross account set up. seeing error fetching space
2. The error message when cannot connect is not meaningful. I had to
check on telemetry log to see the error message

## Solution
Fixed the above issue


---

- 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: Zulin Liu <[email protected]>
## 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.
…ne requests (#7952)

## 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.
## Problem
Consistently reproducing a similar issue when attempting to
start/connect to a Stopped Space when remote access is initially
disabled. The Space is updated, started, and even connected to, but the
Space does not show the Connect button anymore, until the Project is
refreshed. This suggests the Space metadata is stale after the
UpdateSpace call.

## Solution
Tried to simply replace the spaceApp variable with the updated one got
from describeSpace API call, but find conflicts on variable definitions.
so update the variable names and update only remoteAccess variable to
minimize impact.

ListSpaces(original)

https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/sagemaker/command/ListSpacesCommand/

<img width="2556" height="1308" alt="Screenshot 2025-09-01 at 4 11
09 PM"
src="https://github.com/user-attachments/assets/64b4439e-4495-4822-9a56-c61470e269c6"
/>

DescribeSpace(updated)

https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-sagemaker/Interface/DescribeSpaceCommandOutput/
<img width="2523" height="1299" alt="Screenshot 2025-09-01 at 5 02
24 PM"
src="https://github.com/user-attachments/assets/37860497-8116-4d16-bc08-2562d0ea25bd"
/>

- pass SpaceSettingsSummary -> SpaceSettings in spaceApp type parameter 

- update remote access 
## Test 

manually debug and unit test

---

- 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
* SMUS users are missing the Call To Action of remotely connecting to
the spaces in ToolKit.
* Users that are added as project members via Groups were not able to
access project in toolkit.

## Solution
- Expand SageMaker Unified Studio project and compute nodes by default
to improve user experience and discoverability.
- Add description and tooltip for spaces to indicate call to action for
remote connect
- Updated test cases.
- Change project access visibility logic to now require ProjectCreds
access before
displaying compute and data nodes. Projects now only show full details
when user has appropriate ProjectCreds permissions. We moved away from
the ProjectAccess calls as the user could be in groups too and we don't
have a straight path to get groups assignments.
- Added isSMUS check for user activity monitoring

---

- 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: guntamb <[email protected]>
Co-authored-by: Laxman Reddy <[email protected]>
**Description**

Added a proactive cred check and refresh when SSH connections
are established.

Also updated the error messages to be actionable for users.

**Motivation**

Bug : Previously once cred expired, we were throwing blanket
error which did not tell user what the issue was and there
was no path to recovery as well. Now with proactive cred refresh,
user should be able to retry in ~10-15 seconds.

**Testing Done**

Tested all flows manually. Unit tests partial, needs to be updated.
## Problem
This merges the released changes for rc-20250904 into main.
MCM-133766629

## 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 <>
* SMUS needs to be activated in NodeJS environment only.
* Remove Notebook resources
* Added changelog
empty commit to trigger ci
feat(sagemakerunifiedstudio): Support for SageMaker Unified Studio
#2007

The Toolkit doesn't read the endpoint configured in an AWS profile
config.

The endpoint even before these changes is already being read from the
AWS config file, and it's included in the CredentialsProvider object,
but there wasn't a way to retrieve that. We're adding `getEndpointUrl()`
method to the different providers, and then we're retrieving that
endpoint in:
1. when loading the current profile, to add it to the credentialsCache
(`auth.ts -> createCachedCredentials()`, `loginManager.ts -> login()`).
Because of this, then we can get this endpoint alongside the credentials
when creating a new AWS client.
2. when creating the list of connections that then will be displayed for
the user to pick (`packages/core/src/auth/auth.ts ->
getIamConnection()`) (this required to make `getIamConnection` an async
…Walkthrough

Update AppBuilder Walkthrough wording and add LocalStack VS Code
extension
And general fixes when connection is to non-AWS endpoints
- Add helper function to identify when connected to LocalStack
- Make LiveTail and DocDB read endpoint URL if exists (they don't
use the generic ClientBuilder)
- Disable S3 virtual-host-style and host prefix for LocalStack
- Disable host prefixes for all services when using LocalStack
- Send telemetry for custom endpoints and for LocalStack connections
…lStack

- Add LocalStack detection for Lambda debugging webview, by refactoring into two
sub classes to handle the lifecycle of the debugging process.
- Hide and disable version publishing
- Await debugger start to slightly mitigate the race condition
- Add LocalStack Lambda Debug Mode config deletion upon stopping debugging
- Wait for function to be active before launching debugger
- Add user-agent integration
- Add temporary workaround to mitigate debugger attach timing issue
- Fix debugger attach race condition by waiting using the new GET API
- Add LDM error handling
- Handle LocalStack Lambda hot reloading gracefully
- Disable code download upon LocalStack hot reloading
- Skip file watcher for hot-reloaded Lambda function
- Disable Convert to SAM application for LocalStack
- Show message in Remote Invoke WebView when connected to Localstack
- Add telemetry for LocalStack case (including refactor some old telemetry)
The endpointUrl is only really valuable for IAMConnections, but we still
add it Optional in SsoConnections to keep TypeScript consistent.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.