Merge main into feature/mcp-governance-dev #2513

aws-toolkit-automation · 2025-11-21T00:05:54Z

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-governance-dev
git merge origin/main
git commit
git push origin HEAD:refs/heads/autoMerge/feature/mcp-governance-dev

* 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 <43144436+aws-toolkit-automation@users.noreply.github.com> Co-authored-by: Richard Li <742829+rli@users.noreply.github.com>

* 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 <ashishrp@amazon.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 <>

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 <pranavfi@amazon.com> Co-authored-by: pranav firake <pranav.firake7@gmail.com> Co-authored-by: Jordan Miao <gzmiao@amazon.com> * 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 <pranavfi@amazon.com> Co-authored-by: pranav firake <pranav.firake7@gmail.com> Co-authored-by: Jordan Miao <gzmiao@amazon.com> Co-authored-by: Sherry Lu <75588211+XiaoxuanLu@users.noreply.github.com> Co-authored-by: Chris Long <longachr@amazon.com>

* 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 <manodnyb@amazon.com>

Co-authored-by: aws-toolkit-automation <>

Co-authored-by: Pranav Firake <pranavfi@amazon.com>

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

Co-authored-by: aws-toolkit-automation <>

* feat: use dynamic token limits from listAvailableModels API * fix: dependency issues * refactor: encapsulate model ID and token limits in session

* fix: corrected plan upload extension type * fix: updated plan path for failed validation and fixed profile update bugs

* refactor: removed unreferenced code and refactored log messages * refactor: removed test for unused methods * fix: reverted error string messaging

…tests (#2547) * refactor: moved common utility functions to a single file for transform handlers * refactor: addressed comments * fix: fixed uncaught error problem with worklogs * fix: format changes

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: chungjac <chungjac@amazon.com>

Co-authored-by: aws-toolkit-automation <>

## Problem transitive dependency `ansi-regex@2.1.1` was introduced with #654 associated CVE link https://nvd.nist.gov/vuln/detail/CVE-2021-3807 ``` (base) ➜ runtimes git:(main) npm ls registry-js @amzn/monorepo-language-server-runtimes@1.0.0 /Volumes/workplace/ide/language-server-runtimes └─┬ @aws/language-server-runtimes@0.3.9 -> ./runtimes └── registry-js@1.16.1 (base) ➜ runtimes git:(main) npm ls ansi-regex @amzn/monorepo-language-server-runtimes@1.0.0 /Volumes/workplace/ide/language-server-runtimes └─┬ @aws/language-server-runtimes@0.3.9 -> ./runtimes ├─┬ copyfiles@2.4.1 │ └─┬ yargs@16.2.0 │ └─┬ cliui@7.0.4 │ └─┬ strip-ansi@6.0.1 │ └── ansi-regex@5.0.1 └─┬ registry-js@1.16.1 └─┬ prebuild-install@5.3.6 └─┬ npmlog@4.1.2 └─┬ gauge@2.7.4 └─┬ strip-ansi@3.0.1 └── ansi-regex@2.1.1 ``` ## Solution use `winreg` Microsoft winreg example https://github.com/microsoft/azure-pipelines-tasks-common-packages/blob/680f186a1e10568b1493503c81d403220a2eeb22/common-npm-packages/webdeployment-common/msdeployutility.ts#L311-L320 ## npm ls ``` (base) ➜ runtimes git:(security-v2) npm ls registry-js @amzn/monorepo-language-server-runtimes@1.0.0 /Volumes/workplace/ide/language-server-runtimes └── (empty) ``` ``` (base) ➜ runtimes git:(security-v2) npm ls ansi-regex @amzn/monorepo-language-server-runtimes@1.0.0 /Volumes/workplace/ide/language-server-runtimes └─┬ @aws/language-server-runtimes@0.3.9 -> ./runtimes └─┬ copyfiles@2.4.1 └─┬ yargs@16.2.0 └─┬ cliui@7.0.4 └─┬ strip-ansi@6.0.1 └── ansi-regex@5.0.1 ```

* fix: fix for mcp servers refresh * fix: fix for failing unit tests

* feat: add websearch tool (#2540) * feat: add webfetch tool (#2542) * feat: add webfetch tool * fix: typo * fix: remove snippets from web search (#2543) * fix: filter out invalid urls (#2546) --------- Co-authored-by: aws-toolkit-automation <43144436+aws-toolkit-automation@users.noreply.github.com>

…ation (#2555) * feat: add alphabetical sorting for MCP registry servers and improve URL validation * fix: fix for failing unit test

…aid tier users (#2556)

* feat: update SMAI clients to use SM_AI_STUDIO_IDE origin * fix: apply prettier formatting to utils.ts * fix: formatting issues * test: add tests for full coverage * ci: trigger CI rerun

…ers (#2557)

…2562) * fix: prevent MCP server process duplicates with lightweight tracking * fix: reduce excessive logging in MCP process deduplication * fix: separate connection try-catch from process tracking

…es (#2564) This reverts the web search functionality from commit 09c4769 while preserving the streaming client packages that contain updated Origin type definitions needed by existing code. Preserved files: - core/codewhisperer-streaming/amzn-codewhisperer-streaming-1.0.0.tgz - core/q-developer-streaming-client/amzn-amazon-q-developer-streaming-client-1.0.0.tgz - package-lock.json - server/aws-lsp-codewhisperer/package.json

* fix: remove s3 artifact upload and download timeout * fix: update unit tests for s3 timeout removal * fix: remove comment --------- Co-authored-by: invictus <149003065+ashishrp-aws@users.noreply.github.com>

* chore(release): release packages from branch main * chore: update package-lock.json from npm install (#2565) --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: invictus <149003065+ashishrp-aws@users.noreply.github.com>

Co-authored-by: aws-toolkit-automation <>

…nges on windows machine (#2568) * fix: network connection error caused by server runtime dependency changes for windows users * chore: update package-lock

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Shruti Sinha <44882001+shruti0085@users.noreply.github.com>

…#2570) This reverts commit c12c376.

Co-authored-by: aws-toolkit-automation <>

* feat(amazonq): show kiro pricing information for Amazon Q builderId paid tier users * fix(amazonq): adding failed state for pin context features.

…2577)

aws-toolkit-automation requested a review from a team as a code owner November 21, 2025 00:05

ashishrp-aws and others added 28 commits November 20, 2025 17:06

fix: preserve registry server config when updating permissions (#2515)

49ca3bb

chore: bump agentic version: 1.47.0 (#2516)

7db0277

Co-authored-by: aws-toolkit-automation <>

fix: fix for permission update for servers (#2517)

ef86b5c

chore(release): release packages from branch main (#2518)

d15c421

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

chore: bump agentic version: 1.47.1 (#2519)

1eb3910

Co-authored-by: aws-toolkit-automation <>

fix: fix for mcp tool resgistration on smus (#2524)

8584723

chore(release): release packages from branch main (#2525)

adb95de

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

chore: bump agentic version: 1.48.0 (#2526)

2fb3f0e

Co-authored-by: aws-toolkit-automation <>

chore: bump agentic version: 1.49.0 (#2529)

f76d5ed

Co-authored-by: aws-toolkit-automation <>

feat: adding new regions (#2532)

29f08a6

Co-authored-by: Pranav Firake <pranavfi@amazon.com>

chore(release): release packages from branch main (#2533)

c7b2296

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

chore: bump agentic version: 1.50.0 (#2536)

92402ec

Co-authored-by: aws-toolkit-automation <>

chore: log format (#2545)

d8c5c16

feat: use dynamic token limits from listAvailableModels API (#2539)

f87ac9f

* feat: use dynamic token limits from listAvailableModels API * fix: dependency issues * refactor: encapsulate model ID and token limits in session

fix: ATX Transform Fix Retrieve Job Erroring on Profile changes (#2538)

870d540

* fix: corrected plan upload extension type * fix: updated plan path for failed validation and fixed profile update bugs

refactor: Removed unreferenced code and debug logs (#2541)

5d0cc7b

* refactor: removed unreferenced code and refactored log messages * refactor: removed test for unused methods * fix: reverted error string messaging

refactor: Created utility file for both transform handlers and added …

cf4dc5b

…tests (#2547) * refactor: moved common utility functions to a single file for transform handlers * refactor: addressed comments * fix: fixed uncaught error problem with worklogs * fix: format changes

chore(release): release packages from branch main (#2548)

32d2b12

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: chungjac <chungjac@amazon.com>

chore: bump agentic version: 1.51.0 (#2551)

c168c9b

Co-authored-by: aws-toolkit-automation <>

fix: fix for mcp servers refresh (#2550)

cd75394

* fix: fix for mcp servers refresh * fix: fix for failing unit tests

feat: add alphabetical sorting for MCP registry servers and URL valid…

d936673

…ation (#2555) * feat: add alphabetical sorting for MCP registry servers and improve URL validation * fix: fix for failing unit test

feat(amazonq): show kiro pricing information for Amazon Q builderId p…

5896298

…aid tier users (#2556)

feat: Update SMAI clients to return SM_AI_STUDIO_IDE origin (#2558)

dc1d216

* feat: update SMAI clients to use SM_AI_STUDIO_IDE origin * fix: apply prettier formatting to utils.ts * fix: formatting issues * test: add tests for full coverage * ci: trigger CI rerun

chungjac and others added 15 commits December 15, 2025 10:36

fix: update inputLimit calculation to use fixed 100K reserved charact…

ef04639

…ers (#2557)

fix: fix null value for codewhisperer percentage (#2523)

e898ab4

fix: fix for mcp registry error handling (#2561)

f5f8b36

fix: prevent MCP server process duplicates with lightweight tracking (#…

4ba6eb2

…2562) * fix: prevent MCP server process duplicates with lightweight tracking * fix: reduce excessive logging in MCP process deduplication * fix: separate connection try-catch from process tracking

fix: remove s3 artifact upload and download timeout (#2560)

c0b3523

* fix: remove s3 artifact upload and download timeout * fix: update unit tests for s3 timeout removal * fix: remove comment --------- Co-authored-by: invictus <149003065+ashishrp-aws@users.noreply.github.com>

chore: bump agentic version: 1.52.0 (#2566)

9a74ad3

Co-authored-by: aws-toolkit-automation <>

fix: network connection error caused by server runtime dependency cha…

5d38b12

…nges on windows machine (#2568) * fix: network connection error caused by server runtime dependency changes for windows users * chore: update package-lock

fix: dependency oss-attribution-generator vulnerabilities (#2567)

c12c376

chore(release): release packages from branch main (#2569)

50d1e19

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Shruti Sinha <44882001+shruti0085@users.noreply.github.com>

revert: dependency oss-attribution-generator vulnerabilities (#2567)" (…

67778df

…#2570) This reverts commit c12c376.

chore: bump agentic version: 1.53.0 (#2571)

af3ffcd

Co-authored-by: aws-toolkit-automation <>

fix(amazonq): adding failed state for pin context features (#2573)

981c6e1

* feat(amazonq): show kiro pricing information for Amazon Q builderId paid tier users * fix(amazonq): adding failed state for pin context features.

fix: let missing registry servers fail naturally during installation (#…

ecde90a

…2577)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Merge main into feature/mcp-governance-dev #2513

Merge main into feature/mcp-governance-dev #2513

Uh oh!

aws-toolkit-automation commented Nov 21, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

13 participants

Merge main into feature/mcp-governance-dev #2513

Are you sure you want to change the base?

Merge main into feature/mcp-governance-dev #2513

Uh oh!

Conversation

aws-toolkit-automation commented Nov 21, 2025

Automatic merge failed

Command line hint

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

13 participants