Resolve conflicts between feature/subscription and main #1997
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
* fix: treat `echo`/`find`/`grep` as mutating as discussed in internal channels * tst
* chore(release): release packages from branch main * build: add missing packagelock file (#1927) --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Will Lo <[email protected]>
…ion is already closed (#1907)
…ectly (#1910) Co-authored-by: Jiatong Li <[email protected]>
… IDE auto trigger classifier (#1930) * add debug log * fix: correct os implementation * fix: unit test * unit test * fix: process quit * fix: unit test * fix: unit test
Added expiration time to credential provider so SDK will refresh creds automatically. Co-authored-by: Dharani Srinivasan <[email protected]>
* fix(amazonq): update mcp and persona config to agent config * fix: fix for migrating persona config to agent * fix: fix for enabled check for initialization * fix: fix to migrate to agent only workpsace config exists * fix: fix for unit tests for mcpEventHandler * fix: fix for unit test failure on mcpUtils * fix: fix to add skip for failed test in mcpMynahUi
* fix: fix blocking regex calls being made before indexing * fix: add file limit for indexing and remove not required packages * fix: fix tests * fix: remove not required file * fix: remove unused import * fix: include folders in indexing * fix: don't throw an error when file can't be read log it
* fix(amazonq): add image context to chat history * fix(amazonq): remove un-used import * fix(amazonq): truncate image blocks * fix(amazonq): updaterequestinput reset * fix(amazonq): add image context to additionalContext * fix(amazonq): rebase * fix(amazonq): add comments * fix(amazonq): fix test * fix(amazonq): comments * fix(amazonq): change variable name * fix(amazonq): change variable name * fix(amazonq): change variable name
Co-authored-by: Supraja Venkatesh <[email protected]>
…dency events (#1946) Co-authored-by: Jiatong Li <[email protected]>
* feat(amazonq): add keyboard shortcut for run/reject/stop shell commands * feat(amazonq): add feature flag for keyboard shortcut and update key for run * fix: update package lock * fix: remove debug logs * feat: add back reject shortcut keyboard * fix: update keybind and resolve interface for KeyBinding to make it for general usage * fix: dont support user change default keybind for p0 * feat: add tooltip to Stop button on chat-item-card * fix: remove invalid interface * chore: clean up codes * fix: add type to executeShellCommandShortCut() params * fix: make shift shortcut text to icon instead * fix: update type name and UI for tooltip * chore: bump to the latest mynah-ui and lsr version * fix: bump up LSR version and change string to enum for executeShellCommandShortcut * fix(chat-client): properly stop chat through shortcut, make shortcut only available if focus
…1949) * feat: add built-in tool permissions in MCP config page (auto-approve) (#1710) * fix: wrong teneray expression (#1821) * fix: update mcp page title to align with the latest mock * fix: update tooltip of mcp icon * fix(chat-client): resolved out of workspace issue * fix: shorten built-in tools description, combine fsWrite and fsReplace * feat: disable fsWrite dropdown; always allow read only cmd in workspace regardless permission * chore: refactor constant * fix(chat-client): handle uncategory commands * feat(chat-client): add description to permssion of tools * fix(amazonq): resolve issues after updating agents config * feat(chat-client): bumping up mynah-ui version --------- Co-authored-by: invictus <[email protected]> Co-authored-by: Jason Guo <[email protected]> Co-authored-by: sdharani91 <[email protected]> Co-authored-by: Dharani Srinivasan <[email protected]> Co-authored-by: liumofei-amazon <[email protected]> Co-authored-by: Tai Lai <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
…1929) * feat: enable webforms to blazor transformation via validation bypass * feat: add unit tests for webforms validation bypass
…ded (#1957) Co-authored-by: Jiatong Li <[email protected]>
* fix: fix for mcp delete to remove it from mcp config file * fix: fix for unit test failure
* Revert "fix: fix for mcp delete to remove it from mcp config file (#1956)" This reverts commit ad71312. * Revert "fix(amazonq): stop continuous monitor when WCS sees ServiceQuotaExceeded (#1957)" This reverts commit 81e19b9. * Revert "feat: enable webforms to blazor transformation via validation bypass (#1929)" This reverts commit 528f820. * Revert "fix: dependency vulnerabilities (#1953)" This reverts commit 2980dab.
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
…, modify prompts (#1964) * Emitting metrics for QCodeReview operations * fix(amazonq): add scope attribute in the metric data for Scan metrics * fix(amazonq): increase code review tool timeout * fix(amazonq): add metrics metadata to QAgenticReview tool * fix(amazonq): update metric metadata attribute names for QCodeReview tools * fix(amazonq): redirect /review to use agentic chat * fix(amazonq): rename QCodeReview tool to CodeReview * fix(amazonq): fix the casing of variables * fix(amazonq): emitting metrics based on definitions * fix(amazonq): update prompts for tool & /review * fix(amazonq): update prompts for tool * feat(amazonq): redirect commands to use the agentic reviewer * fix(amazonq): putting agentic review redirect behind feature flag * fix(amazonq): change the review reroute card text * fix(amazonq): when no active file is provided, ask the user for more input * fix(amazonq): remove summary suppressor in prompt * fix(amazonq): add programmingLanguages in telemetry * fix(amazonq): change genericCommandString back to original format * fix(amazonq): update codeReview unit tests --------- Co-authored-by: mkovelam <[email protected]> Co-authored-by: Nitish <[email protected]> Co-authored-by: Nitish Kumar Singh <[email protected]> Co-authored-by: Blake Lazarine <[email protected]>
* feat(amazonq): enhance workspaceContext classpath generation * test(amazonq): add unit test for language detection
…n mixed file and image context (#1970)
* feat(amazonq): enable compaction, minor UI changes * feat: add compaction metric * fix: metrics
* change error handling to 429 * add unit tests
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## feature/subscription #1997 +/- ##
========================================================
+ Coverage 60.79% 60.88% +0.08%
========================================================
Files 240 240
Lines 52436 52450 +14
Branches 3113 3131 +18
========================================================
+ Hits 31879 31933 +54
+ Misses 20498 20457 -41
- Partials 59 60 +1
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
LokeshDogga13
approved these changes
Jul 28, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This change resolves merge conflicts between main and feature/subscription
License
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.