Skip to content

Conversation

LokeshDogga13
Copy link
Contributor

@LokeshDogga13 LokeshDogga13 commented Jul 28, 2025

Problem

  • Currently there is no way for users to track their AmazonQ usage information in the IDEs
  • We want to provide an Account Details option in the IDEs where they can track their usage information and also subscription information

For BuilderID users

  • They can track activity in account details option in the IDE
  • If they have reached the monthly request limit, they have an option to upgrade to next tier or enable overages.

For Enterprise users

  • They can track activity in account details option in the IDE
  • If they have reached the monthly request limit, they have to reach out to their admin and ask them to upgrade to next tier or enable overages.

Solution

Flow for Enterprise Users

IDC.Users.Limit.Reached.mp4

License

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

awschristou and others added 4 commits July 17, 2025 10:55
* chore: update runtimes, runtimes-types, chat types deps

* feat: initial subscription details handling
…pt (#1931)

* chore: update GetUsageLimits

* feat: hook up call to getUsageLimits
* feat: adding ui for account details tab

* feat: adding request limit reached sticker in chat

* feat: adding chat item if monthly limit is reached

* feat: updating service client to use next reset date

* feat: updating UI with new runtimes changes

* feat: addressing code review comments
@LokeshDogga13 LokeshDogga13 requested a review from a team as a code owner July 28, 2025 21:23
* chore(amazonq): updating contract for getusagelimits

* chore(amazonq): updating getusagelimits logic according to server side changes
@codecov-commenter
Copy link

codecov-commenter commented Jul 28, 2025

Codecov Report

❌ Patch coverage is 52.36077% with 1574 lines in your changes missing coverage. Please review.
✅ Project coverage is 60.83%. Comparing base (caaefef) to head (e17e8f5).
⚠️ Report is 52 commits behind head on main.

Files with missing lines Patch % Lines
.../language-server/agenticChat/tools/mcp/mcpUtils.ts 40.47% 328 Missing ⚠️
chat-client/src/client/mynahUi.ts 21.24% 213 Missing and 2 partials ⚠️
...ge-server/agenticChat/tools/mcp/mcpEventHandler.ts 21.94% 185 Missing ⚠️
...anguage-server/agenticChat/tools/mcp/mcpManager.ts 65.47% 163 Missing and 1 partial ⚠️
...nguage-server/agenticChat/agenticChatController.ts 43.59% 163 Missing ⚠️
.../language-server/agenticChat/tools/mcp/mcpTypes.ts 22.50% 62 Missing ⚠️
server/aws-lsp-codewhisperer/src/shared/utils.ts 10.00% 44 Missing and 1 partial ⚠️
...orkspaceContext/dependency/dependencyDiscoverer.ts 2.43% 40 Missing ⚠️
...anguage-server/workspaceContext/artifactManager.ts 11.62% 38 Missing ⚠️
...-server/workspaceContext/workspaceFolderManager.ts 3.03% 32 Missing ⚠️
... and 32 more

❗ There is a different number of reports uploaded between BASE (caaefef) and HEAD (e17e8f5). Click for more details.

HEAD has 1 upload less than BASE
Flag BASE (caaefef) HEAD (e17e8f5)
unittests 2 1
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1994      +/-   ##
==========================================
- Coverage   65.84%   60.83%   -5.02%     
==========================================
  Files         238      240       +2     
  Lines       50441    52456    +2015     
  Branches     3355     3125     -230     
==========================================
- Hits        33214    31910    -1304     
- Misses      17167    20486    +3319     
  Partials       60       60              
Flag Coverage Δ
unittests 60.83% <52.36%> (-5.02%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

LokeshDogga13 and others added 4 commits July 28, 2025 15:47
* fix: treat `echo`/`find`/`grep` as mutating (#1921)

* fix: treat `echo`/`find`/`grep` as mutating

as discussed in internal channels

* tst

* fix: pinned `@Code` symbols do not persist between IDE sessions (#1887)

* fix: replace thinking with working and replace stop with cancel (#1922)

* fix: editor state does not use the same language id as file context (#1924)

* chore(release): release packages from branch main (#1911)

* 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]>

* build: bump runtime to 0.2.112 (#1926)

* build: aws/lsp-core (#1928)

* fix: update ChatHandlers before adding new types dependency (#1925)

* fix: remove hardcoded EDITS predictionTypes for trigger on acceptance (#1937)

* fix(amazonq): continueous edits trigger returns earlier as first session is already closed (#1907)

* fix(amazonq): make JSTSDependencyHandler process scoped packages correctly (#1910)

Co-authored-by: Jiatong Li <[email protected]>

* fix: Make the classifier of auto trigger output the same score as the 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

* fix(amazonq): fix for mcp server unnecessary refresh from file watchers (#1933)

* fix: bug for credential refresh in StreamingClientServiceIAM (#1944)

Added expiration time to credential provider so SDK will refresh creds automatically.

Co-authored-by: Dharani Srinivasan <[email protected]>

* fix: replace cancel with stop (#1935)

* fix(amazonq): update mcp and persona config to agent config (#1897)

* 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 (#1916)

* 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 (#1859)

* 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

* fix: put compaction feature behind a feature flag (#1945)

* feat: adding extra context as a workspace config for inline chat (#1942)

Co-authored-by: Supraja Venkatesh <[email protected]>

* fix: fix to remove config from agent file for failed initialization (#1948)

* chore(amazonq): upgrade mynah-ui to 4.36.0 (#1950)

* fix(amazonq): avoid workspace context server missing historical dependency events (#1946)

Co-authored-by: Jiatong Li <[email protected]>

* feat(chat-client): add shortcut for stop/reject/run commands (#1932)

* 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

* feat(chat-client): add auto-approve (trust mode) for built-in tools (#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>

* chore(release): release packages from branch main (#1938)

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

* feat(amazonq): enable show logs feature (#1947)

* chore(release): release packages from branch main (#1951)

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

* test(amazonq): add integ tests for built-in tools (#1952)

* fix: dependency vulnerabilities (#1953)

* feat: enable webforms to blazor transformation via validation bypass (#1929)

* feat: enable webforms to blazor transformation via validation bypass

* feat: add unit tests for webforms validation bypass

* fix(amazonq): stop continuous monitor when WCS sees ServiceQuotaExceeded (#1957)

Co-authored-by: Jiatong Li <[email protected]>

* fix: fix for mcp delete to remove it from mcp config file (#1956)

* fix: fix for mcp delete to remove it from mcp config file

* fix: fix for unit test failure

* revert: revert for all commits for emergency deployment (#1966)

* 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.

* fix(amazonq): revert commit f17b631 (#1965)

* fix: npm security vulnerabilities (#1968)

* chore(release): release packages from branch main (#1963)

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

* feat(amazonq): redirect /review, rename CodeReview tool, emit metrics, 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 (#1955)

* feat(amazonq): enhance workspaceContext classpath generation

* test(amazonq): add unit test for language detection

* fix: enable repomap for all users (#1967)

* build: bump lsp runtime to 0.2.116 (#1976)

* test(amazonq): verify truncation respects additionalContext order when mixed file and image context (#1970)

* fix(amazonq): wrong path in the logs for the function (#1978)

* fix: remove malicious characters from MCP tool description (#1977)

* chore(amazonq): revert for emergency reverts for auto-approve feature (#1973)

* Revert "revert: revert for all commits for emergency deployment (#1966)"

This reverts commit 519f75d.

* Revert "fix(amazonq): revert commit f17b631 (#1965)"

This reverts commit 8c2cab6.

* fix: fix for CI test failure

* fix: emit metric for tool error (#1954)

* refactor: move telemetry functions outside codewhispererServer.ts (#1983)

* refactor: move telemetry functions outside codewhispererServer.ts

* refactor: patch

* fix: move network commands out of ro category (#1985)

* build: make q client endpoint configurable via IDE client (#1980)

* feat(amazonq): enable compaction, minor UI changes (#1979)

* feat(amazonq): enable compaction, minor UI changes

* feat: add compaction metric

* fix: metrics

* chore(amazonq): upgrade mynah-ui to 4.36.2 (#1993)

---------

Co-authored-by: Richard Li <[email protected]>
Co-authored-by: Avi Alpert <[email protected]>
Co-authored-by: chungjac <[email protected]>
Co-authored-by: Will Lo <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Christopher Christou <[email protected]>
Co-authored-by: atontb <[email protected]>
Co-authored-by: Jiatong Li <[email protected]>
Co-authored-by: Jiatong Li <[email protected]>
Co-authored-by: Lei Gao <[email protected]>
Co-authored-by: invictus <[email protected]>
Co-authored-by: sdharani91 <[email protected]>
Co-authored-by: Dharani Srinivasan <[email protected]>
Co-authored-by: manodnyab <[email protected]>
Co-authored-by: yzhangok <[email protected]>
Co-authored-by: Jason Guo <[email protected]>
Co-authored-by: suprajaven <[email protected]>
Co-authored-by: Supraja Venkatesh <[email protected]>
Co-authored-by: Dung Dong <[email protected]>
Co-authored-by: liumofei-amazon <[email protected]>
Co-authored-by: Tai Lai <[email protected]>
Co-authored-by: abhraina-aws <[email protected]>
Co-authored-by: Rajanna-Karthik <[email protected]>
Co-authored-by: BlakeLazarine <[email protected]>
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]>
Co-authored-by: Boyu <[email protected]>
* fix: treat `echo`/`find`/`grep` as mutating (#1921)

* fix: treat `echo`/`find`/`grep` as mutating

as discussed in internal channels

* tst

* fix: pinned `@Code` symbols do not persist between IDE sessions (#1887)

* fix: replace thinking with working and replace stop with cancel (#1922)

* fix: editor state does not use the same language id as file context (#1924)

* chore(release): release packages from branch main (#1911)

* 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]>

* build: bump runtime to 0.2.112 (#1926)

* build: aws/lsp-core (#1928)

* fix: update ChatHandlers before adding new types dependency (#1925)

* fix: remove hardcoded EDITS predictionTypes for trigger on acceptance (#1937)

* fix(amazonq): continueous edits trigger returns earlier as first session is already closed (#1907)

* fix(amazonq): make JSTSDependencyHandler process scoped packages correctly (#1910)

Co-authored-by: Jiatong Li <[email protected]>

* fix: Make the classifier of auto trigger output the same score as the 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

* fix(amazonq): fix for mcp server unnecessary refresh from file watchers (#1933)

* fix: bug for credential refresh in StreamingClientServiceIAM (#1944)

Added expiration time to credential provider so SDK will refresh creds automatically.

Co-authored-by: Dharani Srinivasan <[email protected]>

* fix: replace cancel with stop (#1935)

* fix(amazonq): update mcp and persona config to agent config (#1897)

* 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 (#1916)

* 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 (#1859)

* 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

* fix: put compaction feature behind a feature flag (#1945)

* feat: adding extra context as a workspace config for inline chat (#1942)

Co-authored-by: Supraja Venkatesh <[email protected]>

* fix: fix to remove config from agent file for failed initialization (#1948)

* chore(amazonq): upgrade mynah-ui to 4.36.0 (#1950)

* fix(amazonq): avoid workspace context server missing historical dependency events (#1946)

Co-authored-by: Jiatong Li <[email protected]>

* feat(chat-client): add shortcut for stop/reject/run commands (#1932)

* 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

* feat(chat-client): add auto-approve (trust mode) for built-in tools (#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>

* chore(release): release packages from branch main (#1938)

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

* feat(amazonq): enable show logs feature (#1947)

* chore(release): release packages from branch main (#1951)

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

* test(amazonq): add integ tests for built-in tools (#1952)

* fix: dependency vulnerabilities (#1953)

* feat: enable webforms to blazor transformation via validation bypass (#1929)

* feat: enable webforms to blazor transformation via validation bypass

* feat: add unit tests for webforms validation bypass

* fix(amazonq): stop continuous monitor when WCS sees ServiceQuotaExceeded (#1957)

Co-authored-by: Jiatong Li <[email protected]>

* fix: fix for mcp delete to remove it from mcp config file (#1956)

* fix: fix for mcp delete to remove it from mcp config file

* fix: fix for unit test failure

* revert: revert for all commits for emergency deployment (#1966)

* 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.

* fix(amazonq): revert commit f17b631 (#1965)

* fix: npm security vulnerabilities (#1968)

* chore(release): release packages from branch main (#1963)

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

* feat(amazonq): redirect /review, rename CodeReview tool, emit metrics, 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 (#1955)

* feat(amazonq): enhance workspaceContext classpath generation

* test(amazonq): add unit test for language detection

* fix: enable repomap for all users (#1967)

* build: bump lsp runtime to 0.2.116 (#1976)

* test(amazonq): verify truncation respects additionalContext order when mixed file and image context (#1970)

* fix(amazonq): wrong path in the logs for the function (#1978)

* fix: remove malicious characters from MCP tool description (#1977)

* chore(amazonq): revert for emergency reverts for auto-approve feature (#1973)

* Revert "revert: revert for all commits for emergency deployment (#1966)"

This reverts commit 519f75d.

* Revert "fix(amazonq): revert commit f17b631 (#1965)"

This reverts commit 8c2cab6.

* fix: fix for CI test failure

* fix: emit metric for tool error (#1954)

* refactor: move telemetry functions outside codewhispererServer.ts (#1983)

* refactor: move telemetry functions outside codewhispererServer.ts

* refactor: patch

* fix: move network commands out of ro category (#1985)

* build: make q client endpoint configurable via IDE client (#1980)

* feat(amazonq): enable compaction, minor UI changes (#1979)

* feat(amazonq): enable compaction, minor UI changes

* feat: add compaction metric

* fix: metrics

* chore(amazonq): upgrade mynah-ui to 4.36.2 (#1993)

* feat(amazonq): add new model error handling code (#1972)

* change error handling to 429

* add unit tests

---------

Co-authored-by: Richard Li <[email protected]>
Co-authored-by: Avi Alpert <[email protected]>
Co-authored-by: chungjac <[email protected]>
Co-authored-by: Will Lo <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: atontb <[email protected]>
Co-authored-by: Jiatong Li <[email protected]>
Co-authored-by: Jiatong Li <[email protected]>
Co-authored-by: Lei Gao <[email protected]>
Co-authored-by: invictus <[email protected]>
Co-authored-by: sdharani91 <[email protected]>
Co-authored-by: Dharani Srinivasan <[email protected]>
Co-authored-by: manodnyab <[email protected]>
Co-authored-by: yzhangok <[email protected]>
Co-authored-by: Jason Guo <[email protected]>
Co-authored-by: suprajaven <[email protected]>
Co-authored-by: Supraja Venkatesh <[email protected]>
Co-authored-by: Dung Dong <[email protected]>
Co-authored-by: liumofei-amazon <[email protected]>
Co-authored-by: Tai Lai <[email protected]>
Co-authored-by: abhraina-aws <[email protected]>
Co-authored-by: Rajanna-Karthik <[email protected]>
Co-authored-by: BlakeLazarine <[email protected]>
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]>
Co-authored-by: Boyu <[email protected]>
Co-authored-by: Yaofu Zuo <[email protected]>
* fix: treat `echo`/`find`/`grep` as mutating (#1921)

* fix: treat `echo`/`find`/`grep` as mutating

as discussed in internal channels

* tst

* fix: pinned `@Code` symbols do not persist between IDE sessions (#1887)

* fix: replace thinking with working and replace stop with cancel (#1922)

* fix: editor state does not use the same language id as file context (#1924)

* chore(release): release packages from branch main (#1911)

* 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]>

* build: bump runtime to 0.2.112 (#1926)

* build: aws/lsp-core (#1928)

* fix: update ChatHandlers before adding new types dependency (#1925)

* fix: remove hardcoded EDITS predictionTypes for trigger on acceptance (#1937)

* fix(amazonq): continueous edits trigger returns earlier as first session is already closed (#1907)

* fix(amazonq): make JSTSDependencyHandler process scoped packages correctly (#1910)

Co-authored-by: Jiatong Li <[email protected]>

* fix: Make the classifier of auto trigger output the same score as the 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

* fix(amazonq): fix for mcp server unnecessary refresh from file watchers (#1933)

* fix: bug for credential refresh in StreamingClientServiceIAM (#1944)

Added expiration time to credential provider so SDK will refresh creds automatically.

Co-authored-by: Dharani Srinivasan <[email protected]>

* fix: replace cancel with stop (#1935)

* fix(amazonq): update mcp and persona config to agent config (#1897)

* 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 (#1916)

* 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 (#1859)

* 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

* fix: put compaction feature behind a feature flag (#1945)

* feat: adding extra context as a workspace config for inline chat (#1942)

Co-authored-by: Supraja Venkatesh <[email protected]>

* fix: fix to remove config from agent file for failed initialization (#1948)

* chore(amazonq): upgrade mynah-ui to 4.36.0 (#1950)

* fix(amazonq): avoid workspace context server missing historical dependency events (#1946)

Co-authored-by: Jiatong Li <[email protected]>

* feat(chat-client): add shortcut for stop/reject/run commands (#1932)

* 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

* feat(chat-client): add auto-approve (trust mode) for built-in tools (#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>

* chore(release): release packages from branch main (#1938)

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

* feat(amazonq): enable show logs feature (#1947)

* chore(release): release packages from branch main (#1951)

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

* test(amazonq): add integ tests for built-in tools (#1952)

* fix: dependency vulnerabilities (#1953)

* feat: enable webforms to blazor transformation via validation bypass (#1929)

* feat: enable webforms to blazor transformation via validation bypass

* feat: add unit tests for webforms validation bypass

* fix(amazonq): stop continuous monitor when WCS sees ServiceQuotaExceeded (#1957)

Co-authored-by: Jiatong Li <[email protected]>

* fix: fix for mcp delete to remove it from mcp config file (#1956)

* fix: fix for mcp delete to remove it from mcp config file

* fix: fix for unit test failure

* revert: revert for all commits for emergency deployment (#1966)

* 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.

* fix(amazonq): revert commit f17b631 (#1965)

* fix: npm security vulnerabilities (#1968)

* chore(release): release packages from branch main (#1963)

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

* feat(amazonq): redirect /review, rename CodeReview tool, emit metrics, 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 (#1955)

* feat(amazonq): enhance workspaceContext classpath generation

* test(amazonq): add unit test for language detection

* fix: enable repomap for all users (#1967)

* build: bump lsp runtime to 0.2.116 (#1976)

* test(amazonq): verify truncation respects additionalContext order when mixed file and image context (#1970)

* fix(amazonq): wrong path in the logs for the function (#1978)

* fix: remove malicious characters from MCP tool description (#1977)

* chore(amazonq): revert for emergency reverts for auto-approve feature (#1973)

* Revert "revert: revert for all commits for emergency deployment (#1966)"

This reverts commit 519f75d.

* Revert "fix(amazonq): revert commit f17b631 (#1965)"

This reverts commit 8c2cab6.

* fix: fix for CI test failure

* fix: emit metric for tool error (#1954)

* refactor: move telemetry functions outside codewhispererServer.ts (#1983)

* refactor: move telemetry functions outside codewhispererServer.ts

* refactor: patch

* fix: move network commands out of ro category (#1985)

* build: make q client endpoint configurable via IDE client (#1980)

* feat(amazonq): enable compaction, minor UI changes (#1979)

* feat(amazonq): enable compaction, minor UI changes

* feat: add compaction metric

* fix: metrics

* chore(amazonq): upgrade mynah-ui to 4.36.2 (#1993)

* feat(amazonq): add new model error handling code (#1972)

* change error handling to 429

* add unit tests

* chore(amazonq): fixing the account details to showup without introduction

---------

Co-authored-by: Richard Li <[email protected]>
Co-authored-by: Avi Alpert <[email protected]>
Co-authored-by: chungjac <[email protected]>
Co-authored-by: Will Lo <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Christopher Christou <[email protected]>
Co-authored-by: atontb <[email protected]>
Co-authored-by: Jiatong Li <[email protected]>
Co-authored-by: Jiatong Li <[email protected]>
Co-authored-by: Lei Gao <[email protected]>
Co-authored-by: invictus <[email protected]>
Co-authored-by: sdharani91 <[email protected]>
Co-authored-by: Dharani Srinivasan <[email protected]>
Co-authored-by: manodnyab <[email protected]>
Co-authored-by: yzhangok <[email protected]>
Co-authored-by: Jason Guo <[email protected]>
Co-authored-by: suprajaven <[email protected]>
Co-authored-by: Supraja Venkatesh <[email protected]>
Co-authored-by: Dung Dong <[email protected]>
Co-authored-by: liumofei-amazon <[email protected]>
Co-authored-by: Tai Lai <[email protected]>
Co-authored-by: abhraina-aws <[email protected]>
Co-authored-by: Rajanna-Karthik <[email protected]>
Co-authored-by: BlakeLazarine <[email protected]>
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]>
Co-authored-by: Boyu <[email protected]>
Co-authored-by: Yaofu Zuo <[email protected]>
…main (#1998)

Problem
Feature branch continues to report merge conflicts despite attempts to resolve it.

Solution
Try touching the affected files instead of collapsing the conflicts into a no-op commit.
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.

3 participants