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/upgrade-modified-files-ux
git merge origin/main
git commit
git push origin HEAD:refs/heads/autoMerge/feature/upgrade-modified-files-ux

* feat: add MCP registry service and validator for governance (#2433)

* feat: add MCP registry service and validator for governance

* fix: fix for unit tests

* fix: fix for using httpUtils with proxy agent

* feat: add MCP registry validation and server config conversion (#2440)

* feat: add MCP registry validation and server config conversion

* fix: fix for mcpManager failures

* feat: implement MCP registry service with validation, error handling, and synchronization (#2443)

* feat(amazonq): add MCP registry sync, enterprise validation. (#2450)

* feat(amazonq): add MCP registry sync, enterprise validation, ACG support, version caching

* fix: fix for test failures

* fix: removed Agentcore check

* feat: add OCI registry support, improve MCP initialization flow (#2465)

* feat: add OCI registry support, improve MCP initialization flow, and enhance registry validation

* fix: fix for failing tests

* fix: fix to make registryActive non-optional

* fix(amazonq): separate server discovery from init (#2480)

* fix(amazonq): separate server discovery from init and improve error handling

* fix: update package-lock.json

* fix: fix for delete, save and cancel buttons for registry mcps

* fix: fix to add addiotnal header and variables to registry mcps

* fix: fix for failing registryUrl tests

* fix: move OCI environment variables to config.env and correct mcpRegistryUrl property name (#2486)

* fix: fix for arguments for local docker mcp servers (#2489)

* fix: fix for env variables for local docker mcp servers

* fix: imporve readability for oci check

* feat: add Docker env var support and enable timeout config for MCP (#2494)

* feat: add Docker env var support and enable timeout config for MCP registry servers

* fix: fix for unit tests

* fix: fix for compilation failure

* fix(amazonq): fix for server refresh

* fix: fix for server refresh

* fix: fix for server init

* fix: fix to add the mcp command in logs (#2499)

* fix: fix to add the mcp command in logs

* fix: fix to add stderr logs

* fix: fix to provide error messages for removed errors from registry (#2511)

* fix: fix upgarde the lsp version to 1.47.0

* fix: fix to provide server error messages for removed errors

* revert: revert package-lock.json changes

* Revert "fix: fix upgarde the lsp version to 1.47.0"

This reverts commit 4086962.

* revert: revert for check interval

* fix: fix for failing unit tests

---------

Co-authored-by: aws-toolkit-automation <[email protected]>
Co-authored-by: Richard Li <[email protected]>
@aws-toolkit-automation aws-toolkit-automation requested a review from a team as a code owner November 21, 2025 00:17
ashishrp-aws and others added 15 commits November 20, 2025 17:06
* chore(release): release packages from branch main

* fix: fix for dependency failures

* fix: fix for install failures

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Ashish Reddy Podduturi <[email protected]>
Co-authored-by: aws-toolkit-automation <>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: aws-toolkit-automation <>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: aws-toolkit-automation <>
* Atx riv final (#2520)

* feat: add atx fes integration for transform profiles

* feat: implement Transform profile discovery via ATX FES with cache clearing

* fix: remove unsupported eu-central-1 region from ATX FES endpoints

* feat: add separate flow for RTS and ATX listavailableprofile api

* fix: remove profile handling from atxnettransformserver

* feat: separating qdev and aws transform

* fix: fixing unit tests

* fix: adding tests

* fix: updating as per langugae server runtime updates

* feat: add starttranform and workspace

* feat: added getTransformInfo and its support methods

* fix: with new runtimes

* feat: add stopjob support

* merged stopjob and added upload plan

* chore: force use of new runtimes

* fix: completed getting plan, worklogs, and final artifact

* chore: deleting unused RPC messages

* feat: added list worklogs before planning

* fix: remove unused methods

---------

Co-authored-by: Pranav Firake <[email protected]>
Co-authored-by: pranav firake <[email protected]>
Co-authored-by: Jordan Miao <[email protected]>

* fix: adding atxcredentials details

* fix: updating plan for completed status

* fix: separating aws atx and q credentials storage

* fix: changed customer_output to customer_input

* fix: added new atx-fes-client models to allow CUSTOMER_INPUT types

* fix: multiple accounts token auth

* fix: auto-sync transform profiles using TransformConfigurationServer and prevent us-east-1 defaults

* fix: set default fallback transform request from net 8 to net 10

* fix: changed back q flow to net 8, added target framework to create job requests

* fix: updates aws-server-runtimes to 0.3.8 and added Syd endpoint to constants

* fix: maintaining backwards compatibility

* fix: fixing failing test

* fix: fixing tests

* fix: get endpoints by stage

* fix: regex for appUrl not handling gamma stage and return default region

* fix: fix for initInstance and moved init of atx servers to be after base server is initialized

* fix: fixing tests

* fix: fixing tests

* fix: fixing tests

* chore: bumping lsp version to 0.3.8

* chore: revert naming from Q back to codewhisperer

* chore: deleting stale function

* chore: updating folder

* fix: changed transformserver to log caught errors instead of throwing

* chore: reverting changes and adding todo

* fix: tests with changes

* fix: tests with changes

* chore: removing debug logs

---------

Co-authored-by: Pranav Firake <[email protected]>
Co-authored-by: pranav firake <[email protected]>
Co-authored-by: Jordan Miao <[email protected]>
Co-authored-by: Sherry Lu <[email protected]>
Co-authored-by: Chris Long <[email protected]>
* chore(release): release packages from branch main

* fix(release): update package-lock.json

* fix(release): manually update versions in packages

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Manodnya Bhoite <[email protected]>
Co-authored-by: aws-toolkit-automation <>
Co-authored-by: Pranav Firake <[email protected]>
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.

6 participants