merge from main#2230
Closed
ashishrp-aws wants to merge 75 commits into
Closed
Conversation
* 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 <blakelaz@amazon.com>
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 <bywang@amazon.com>
* 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 <jiatonli@amazon.com>
… state (#2143) Co-authored-by: Laxman Reddy <141967714+laileni-aws@users.noreply.github.com>
* 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 <bywang@amazon.com>
Co-authored-by: Laxman Reddy <141967714+laileni-aws@users.noreply.github.com>
…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
This reverts commit aa87ae2.
* emit errorMessage in addMessage * fix: emit errorMessage in addMessage
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
* feat: enabling model selection for code review tool * feat: added unit test for model selection for code review tool * fix: making modelId required for codeReviewTool in input schema validation * fix: fixing unit tests --------- Co-authored-by: Laxman Reddy <141967714+laileni-aws@users.noreply.github.com>
…ved from agent config (#2206)
* chore: bump agentic version: 1.31.0 * chore: empty commit to trigger release workflow (#2203) --------- Co-authored-by: aws-toolkit-automation <>
* fix(amazonq): fix to correct the client for getProfile request * fix(amazonq): removed unneccessary constructor objects * fix: fix to add assigned VARs in unit tests
* feat: add supplemental context API * feat: add supplemental context API support
* feat: add custom_transformation folder support to artifact.zip * feat: add custom transformation folder support with async file operations * fix: improve custom transformation folder access logging message --------- Co-authored-by: huawenm <72728725+huawenm@users.noreply.github.com>
* feat(amazonq): default to diff-based scans * feat(amazonq): make /review behavior clearly show it is a diff scan * fix(amazonq): clean up commented lines * fix(amazonq): fix maximum finding count in CodeReview tool description * fix(amazonq): improve messaging for diff vs full scans * feat(amazonq): have codeReview tool ask for clarification if it is not sure what scope to review * feat(amazonq): when there is no diff, fall back to a full review * Update chat-client/src/client/mynahUi.ts Co-authored-by: Tai Lai <ctlai95@gmail.com> * fix(amazonq): fix test * fix(amazonq): fix another test --------- Co-authored-by: Blake Lazarine <blakelaz@amazon.com> Co-authored-by: Tai Lai <ctlai95@gmail.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: chungjac <chungjac@amazon.com>
…rvice (#2223) * Sync feature smus inline suggestions branch from main commits (#2109) * fix(amazonq): leverage lcs to find the chars added and removed (#2092) * fix: update client name to support Sagemaker AI origin for agentic chat (#2093) Co-authored-by: chungjac <chungjac@amazon.com> * chore(release): release packages from branch main (#2073) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * chore: format version.json after incrementing (#2068) * chore: merge agentic version 1.27.0 (#2107) * Bump agentic version: 1.27.0 * Revert "feat(amazonq): read tool ui revamp" This reverts commit c65428b. * fix: the style in version json (#2106) --------- Co-authored-by: aws-toolkit-automation <> Co-authored-by: Tai Lai <tlaiamz@amazon.com> Co-authored-by: Christopher Christou <39839589+awschristou@users.noreply.github.com> * fix(amazonq): persist mcp configs in agent json on start-up (#2112) --------- Co-authored-by: andrewyuq <89420755+andrewyuq@users.noreply.github.com> Co-authored-by: chungjac <chungjac@amazon.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Christopher Christou <39839589+awschristou@users.noreply.github.com> Co-authored-by: Sherry Lu <75588211+XiaoxuanLu@users.noreply.github.com> Co-authored-by: Tai Lai <tlaiamz@amazon.com> Co-authored-by: Dung Dong <dungdong@amazon.com> * feat(amazonq): Integrate IAM Auth support for InlineSuggestions in Flare (#2134) * Chore: Sync test smus branch with main branch commits (#2097) * fix(amazonq): skips continuous monitoring when WCS sees workspace as idle (#2066) * fix(amazonq): skips continuous monitoring when WCS sees workspace as idle * fix(amazonq): skips creating remote workspace at the start --------- Co-authored-by: Jiatong Li <jiatonli@amazon.com> * fix: sessionManager misused because there are 2 types of manager now (#2090) * chore: mapping adt plugin to abap to let inline suggestion work (#2085) * chore: support inline suggestion in adt plugin for eclipse * fix: add import URI * chore: add detailed error description for uri is empty for language id * 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: creating a new sesion for Edits trigger with next token (#2094) * chore: bump @aws/mynah-ui to 4.36.4 (#2096) --------- Co-authored-by: Jiatong Li <lijiatong1997@outlook.com> Co-authored-by: Jiatong Li <jiatonli@amazon.com> Co-authored-by: Will Lo <96078566+Will-ShaoHua@users.noreply.github.com> Co-authored-by: Sherry Lu <75588211+XiaoxuanLu@users.noreply.github.com> Co-authored-by: Tai Lai <ctlai95@gmail.com> Co-authored-by: atontb <104926752+atonaamz@users.noreply.github.com> * feat(amazonq): add inline suggestion support for iam auth client * fix(amazonq): skips continuous monitoring when WCS sees workspace as idle (#2066) * fix(amazonq): skips continuous monitoring when WCS sees workspace as idle * fix(amazonq): skips creating remote workspace at the start --------- Co-authored-by: Jiatong Li <jiatonli@amazon.com> * fix: sessionManager misused because there are 2 types of manager now (#2090) * chore: mapping adt plugin to abap to let inline suggestion work (#2085) * fix(amazonq): leverage lcs to find the chars added and removed (#2092) * fix: update client name to support Sagemaker AI origin for agentic chat (#2093) Co-authored-by: chungjac <chungjac@amazon.com> * chore(release): release packages from branch main (#2073) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * chore: fix test failures in merge due to missing init of IdleWorkspaceManager --------- Co-authored-by: Jiatong Li <lijiatong1997@outlook.com> Co-authored-by: Jiatong Li <jiatonli@amazon.com> Co-authored-by: Will Lo <96078566+Will-ShaoHua@users.noreply.github.com> Co-authored-by: Sherry Lu <75588211+XiaoxuanLu@users.noreply.github.com> Co-authored-by: Tai Lai <ctlai95@gmail.com> Co-authored-by: atontb <104926752+atonaamz@users.noreply.github.com> Co-authored-by: andrewyuq <89420755+andrewyuq@users.noreply.github.com> Co-authored-by: chungjac <chungjac@amazon.com> 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> * fix: add unit tests for IAM flow, remove redundant logs added for testing * fix: file formatting * fix: rebase from main, clean up redundant logs * fix: remove old code refs and debug logs * feat: use cw proxy server based on iam auth logic check * fix: todo comment and unused imports * fix: update codewhisperer server to use proper manager based on iam auth logic check * feat: create new codewhisperer server instance with dynamic service manager logic and add unit tests * fix: address pr comments, fix unit tests as per updated service manager logic --------- Co-authored-by: andrewyuq <89420755+andrewyuq@users.noreply.github.com> Co-authored-by: chungjac <chungjac@amazon.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Christopher Christou <39839589+awschristou@users.noreply.github.com> Co-authored-by: Sherry Lu <75588211+XiaoxuanLu@users.noreply.github.com> Co-authored-by: Tai Lai <tlaiamz@amazon.com> Co-authored-by: Dung Dong <dungdong@amazon.com> Co-authored-by: Jiatong Li <lijiatong1997@outlook.com> Co-authored-by: Jiatong Li <jiatonli@amazon.com> Co-authored-by: Will Lo <96078566+Will-ShaoHua@users.noreply.github.com> Co-authored-by: Tai Lai <ctlai95@gmail.com> Co-authored-by: atontb <104926752+atonaamz@users.noreply.github.com> Co-authored-by: invictus <149003065+ashishrp-aws@users.noreply.github.com> Co-authored-by: Laxman Reddy <141967714+laileni-aws@users.noreply.github.com>
* feat: upgrade node version to 24 * fix: adding node 24 to overrides.json and using curl instead wget
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
This is updated automatically by the build scripts
`download-node.sh` incorrectly reports success if `jq` fails
Co-authored-by: aws-toolkit-automation <>
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 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.
Problem
Solution
License
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.