Merge main into feature/loop-debug #2343
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* feat(amazonq): read tool ui revamp * feat(amazonq): read tool message revamp (#2049) * feat(amazonq): read tool message revamp * fix tests * feat: file search ui (#2078) * feat: file search ui * fix tests * fix integration tests * remove unnecessary type check * fix: use quotes instead of backticks * fix header update issue * fix integration test
…same name (#2118) * fix(amazonq): handle case where multiple rules are provided with the same name * fix(amazonq): add unit test for duplicate custom guidelines * fix(amazonq): add unit test for processToolUses * fix(amazonq): set context type for AmazonQ.md to rule * fix(amazonq): add README.md back as rule context type --------- Co-authored-by: Blake Lazarine <[email protected]>
The token from GitHub Actions is sufficient
* fix: proper pathing for additonal context * fix: update existing tests to also mock path.join()
* fix(amazonq): update process-permission-updates to be the same as previous behavior * fix(chat-client): update package.json chat-client to prod * fix(amazonq): retain mcp permissions after disable/enable server * fix: dont call initOneServer on Built-in * fix: deny permission does not persist after restart IDE --------- Co-authored-by: Boyu <[email protected]>
* feat: remove project type validation from LSP layer * refactor: remove unused validation functions from LSP layer
* fix: fix to add disk caching for mcp admin state * fix: fix to add logging * fix: fix to initialize mcpManager in any case and discover servers based on mcpState * fix: fix for unit test failure
…n codewhispererServer.ts (#2141)
Co-authored-by: Jiatong Li <[email protected]>
… state (#2143) Co-authored-by: Laxman Reddy <[email protected]>
* refactor: clean up old NEP code path which is no longer used * fix: empty userTriggerDecision not being sent for NEP code path * test: disable telemetry test temporarily * fix: patch * revert: a * revert: a
…tion in JB (#2145) * fix(amazonq): don't let flare send discard for the still valid suggestion in JB if a valid sessionId is returned back to JB, JB will eventually send a decision for it, but when user types a character to reject the current suggestion, on JB side it will 1) send reject for the current one 2) send a new trigger for the latest context. 2) will happen before 1) which will discard the current active session on flare's end. We don't want flare to do that for JB. * fix(amazonq): createSession doesn't need to close the previous session it should be handled together with telemetry reporting * fix(amazonq): fix test * fix(amazonq): test fix attempt * fix(amazonq): test fix attempt
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
* chore: bump agentic version: 1.29.0 * chore: empty commit to start Github Action (#2150) --------- Co-authored-by: aws-toolkit-automation <>
* feat: add basic mcp oauth client * fix: relax condition for triggering oauth flow; add resilience checks for as availability * feat: add unit test for auth client * fix: multiple fixes for remote mcp error and timeout
Co-authored-by: Boyu <[email protected]>
Co-authored-by: Laxman Reddy <[email protected]>
…ly (#2165) * fix(amazonq): fix for mcp servers operations to edit server specific config * fix(amazonq): additional mcp server config fixes * fix: resolve test failures * fix: update MCP manager configuration
* fix: McpManager not initialized error * fix: adding more try catch to avoid crashes due to mcpmanager initialization error * fix: adding error to debug logs
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Will Lo <[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 <>
* Revert "fix(amazonq): send full finding details to plugin, partial to agent (#2356)" This reverts commit 961e6ca. * feat(amazonq): if there are more than 30 findings, do not send to agent, only to code issues panel * fix(amazonq): do not stop calling listFindings if there are more than 30 findings * fix(amazonq): do not stop calling listFindings if there are more than 30 findings --------- Co-authored-by: Blake Lazarine <[email protected]>
Error handling in `setPaidTierMode` is broken as it attempts to JSON stringify a circular type which results in the Flare process crashing. This codepath is not new but is now being hit due to a service side change.
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Same root cause as #2500
…ead of empty object (#2492) * fix(amazonq): prevent base64 encoding error by passing undefined instead of empty object Fixes #8253, #7896, #8076, #8184 When userInputMessageContext was undefined, it was being replaced with an empty object {}. The AWS SDK's base64 encoder attempted to encode this empty object and threw: "toBase64 encoder function only accepts string | Uint8Array". Changed messageToStreamingMessage() and chatMessageToMessage() to pass undefined instead of {} when userInputMessageContext is not provided. * fix(amazonq): prevent base64 encoding error by passing undefined instead of empty object (#2459) Fixes #8253, #7896, #8076, #8184 When userInputMessageContext was undefined, it was being replaced with an empty object {}. The AWS SDK's base64 encoder attempted to encode this empty object and threw: "toBase64 encoder function only accepts string | Uint8Array". Changed messageToStreamingMessage() and chatMessageToMessage() to pass undefined instead of {} when userInputMessageContext is not provided. --------- Co-authored-by: aws-toolkit-automation <[email protected]>
* 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]>
* 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 <>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
30 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Automatic merge failed
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):