Skip to content

Merge main into feature/mcp-consent-fingerprint-additional-env - #2854

Open
aws-toolkit-automation wants to merge 4 commits into
feature/mcp-consent-fingerprint-additional-envfrom
autoMerge/feature/mcp-consent-fingerprint-additional-env
Open

Merge main into feature/mcp-consent-fingerprint-additional-env#2854
aws-toolkit-automation wants to merge 4 commits into
feature/mcp-consent-fingerprint-additional-envfrom
autoMerge/feature/mcp-consent-fingerprint-additional-env

Conversation

@aws-toolkit-automation

Copy link
Copy Markdown
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/mcp-consent-fingerprint-additional-env
git merge origin/main
git commit
git push origin HEAD:refs/heads/autoMerge/feature/mcp-consent-fingerprint-additional-env

getTransformInfo already resolves the interactive mode from the job
objective (cachedInteractiveMode) but never returned it. Add the
InteractiveMode field to AtxGetTransformInfoResponse and populate it at the
getTransformInfo wrapper so the IDE can restore the correct mode after a
restart instead of trusting its local settings store.

Paired with the IDE change in aws-toolkit-visual-studio-staging.
@aws-toolkit-automation
aws-toolkit-automation requested a review from a team as a code owner August 24, 2026 22:18
chungjac and others added 3 commits August 24, 2026 16:57
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: aws-toolkit-automation <>
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.

4 participants