Merge main into feature/chatProjectContext #2336

aws-toolkit-automation · 2025-09-24T23:18:12Z

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

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

…1948)

…dency events (#1946) Co-authored-by: Jiatong Li <jiatonli@amazon.com>

* 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 <149003065+ashishrp-aws@users.noreply.github.com> Co-authored-by: Jason Guo <81202082+jguoamz@users.noreply.github.com> Co-authored-by: sdharani91 <sdharani91@gmail.com> Co-authored-by: Dharani Srinivasan <srdharan@amazon.com> Co-authored-by: liumofei-amazon <98127670+liumofei-amazon@users.noreply.github.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: 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 <jiatonli@amazon.com>

* 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 <mkovelam@amazon.com> Co-authored-by: Nitish <149117626+singhAws@users.noreply.github.com> Co-authored-by: Nitish Kumar Singh <nkrsingh@amazon.com> Co-authored-by: Blake Lazarine <blakelaz@amazon.com>

* feat(amazonq): enhance workspaceContext classpath generation * test(amazonq): add unit test for language detection

…n mixed file and image context (#1970)

…#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

This reverts commit 692e77b.

* chore: bump agentic version: 1.36.0 * fix(amazonq): fix to add opt-out header to streaming client (#2365) (#2369) --------- Co-authored-by: aws-toolkit-automation <> Co-authored-by: invictus <149003065+ashishrp-aws@users.noreply.github.com>

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

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

) Allow multiple loadChats() calls in JupyterLab environment. Co-authored-by: ruotingx <ruotingx@amazon.com>

#2382)

* feat: add model description to dropdown * fix: bump up mynah version to enable hover

…refresh support (#2395) use SAGEMAKER_APP_TYPE_LOWERCASE env var Co-authored-by: ruotingx <ruotingx@amazon.com>

…2234) (#2409)

* fix: patch #2133 and handle more variants of FIM suggestions * fix: only consider FIM if the first edit line matches trigger position * fix: test --------- Co-authored-by: atontb <104926752+atonaamz@users.noreply.github.com>

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

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

* feat: migrate codewhisperer token service to aws-sdk-v3 (#2235) * feat: migrate codewhisperer token service to aws-sdk-v3 * fix captureHeaders middleware * feat: migrate codewhisperer iam service to aws-sdk-v3 (#2284) * refactor: remove aws-sdk v2 imports (#2290) * fix: compile errors from merge conflicts (#2331) * chore: bump runtimes to 0.3.0 (#2340) * chore: bump runtimes to 0.3.0 * fix antlr4ng version conflict * fix missing url polyfill * chore: remove old ignore entries (#2350) * chore: update versions * chore: fix more dependencies * fix: fallback to empty string in aws sdk v3 (#2414) * chore: update indexing bundle(#2417) This reverts commit baf20b7. --------- Co-authored-by: aws-toolkit-automation <43144436+aws-toolkit-automation@users.noreply.github.com> Co-authored-by: Tai Lai <ctlai95@gmail.com> Co-authored-by: Tai Lai <tlaiamz@amazon.com>

)

…age servers (#2391) Problem Currently, both the JSON and YAML generic language servers respond with resolveProvider: true in their initialization response. This signals to clients that these language servers support completion item resolve requests, which these servers don't actually support, resulting in errors when clients send resolve requests. Solution This updates resolveProvider to false to accurately describe the capabilities of these language servers. Co-authored-by: Alice Koreman <alicekor@amazon.nl>

This reverts commit 35f0795.

* chore: bump chat-client-ui-types to latest * chore: bump up language-server-runtimes-types to latest * chore: bump language-server-runtimes to latest

manodnyab and others added 30 commits July 21, 2025 14:39

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

51f4161

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

1b402bb

Co-authored-by: Supraja Venkatesh <suprajav@amazon.com>

fix: fix to remove config from agent file for failed initialization (#…

45645c2

…1948)

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

d428ddd

fix(amazonq): avoid workspace context server missing historical depen…

3362956

…dency events (#1946) Co-authored-by: Jiatong Li <jiatonli@amazon.com>

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

6d2d765

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

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

86ea83d

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

d3b65d0

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

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

d8f785c

fix: dependency vulnerabilities (#1953)

2980dab

feat: enable webforms to blazor transformation via validation bypass (#…

528f820

…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 ServiceQuotaExcee…

81e19b9

…ded (#1957) Co-authored-by: Jiatong Li <jiatonli@amazon.com>

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

ad71312

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

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

8c2cab6

fix: npm security vulnerabilities (#1968)

2c7597b

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

50b61a7

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

feat(amazonq): enhance workspaceContext classpath generation (#1955)

f7ed20b

* feat(amazonq): enhance workspaceContext classpath generation * test(amazonq): add unit test for language detection

fix: enable repomap for all users (#1967)

6954085

build: bump lsp runtime to 0.2.116 (#1976)

2f2cb95

test(amazonq): verify truncation respects additionalContext order whe…

d0a0cc8

…n mixed file and image context (#1970)

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

ed8b4f6

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

64d4e3e

fix: emit metric for tool error (#1954)

c3bbcea

ashishrp-aws and others added 30 commits September 30, 2025 18:52

revert: fix to add opt-out header to streaming client (#2365) (#2370)

b29478f

This reverts commit 692e77b.

refactor: removing some redundant code (#2364)

bde961f

chore: merge agentic version 1.36.0 (#2371)

9f2f306

* chore: bump agentic version: 1.36.0 * fix(amazonq): fix to add opt-out header to streaming client (#2365) (#2369) --------- Co-authored-by: aws-toolkit-automation <> Co-authored-by: invictus <149003065+ashishrp-aws@users.noreply.github.com>

chore(amazonq): refactor inline completion codes (#2367)

1f6b7f7

fix: optimize memory bank token usage and add new tab support (#2366)

3057d56

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

31cd87b

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

chore: bump agentic version: 1.37.0 (#2379)

8a2aa34

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

chore(amazonq): refactor codeWhispereServer.ts (#2373)

9f745a3

feat(amazonq): support JupyterLab conversation history on refresh (#2325

0980351

) Allow multiple loadChats() calls in JupyterLab environment. Co-authored-by: ruotingx <ruotingx@amazon.com>

chore(amazonq): move getTextDocument to textDocumentUtils and add test (

46643ba

#2382)

fix: add in-loop compaction (#2387)

35f0795

test(amazonq): add tests for inline utils files (#2385)

e4a1717

feat: add model description to dropdown (#2374)

ed8c6dd

* feat: add model description to dropdown * fix: bump up mynah version to enable hover

fix: addonly EDITS should be handled as COMPLETIONS (#2133)

4f5a9da

chore(amazonq): adding test for editCompletionHandler (#2396)

4ce9d8f

feat(amazonq): env var change for JupyterLab conversation history on …

a908195

…refresh support (#2395) use SAGEMAKER_APP_TYPE_LOWERCASE env var Co-authored-by: ruotingx <ruotingx@amazon.com>

feat(amazonq): adding classification based retry strategy for chat (#…

15d1b1f

…2234) (#2409)

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

06fbeb2

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

build: temporarily lock node.js version to 24.9.0 (#2413)

12e089b

chore: bump agentic version: 1.38.0 (#2416)

0e8e36d

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

fix: inline, nep telemetry not sent and throw sessionId not found (#2419

c96106d

)

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

ac4f2a4

chore: bump agentic version: 1.39.0 (#2422)

088f0ba

revert: revert for mid-loop compaction

3f48b12

This reverts commit 35f0795.

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

6e9c384

chore: bump agentic version: 1.40.0 (#2427)

bf9f997

chore: bump runtimes to 0.3.1 (#2428)

30b33a1

* chore: bump chat-client-ui-types to latest * chore: bump up language-server-runtimes-types to latest * chore: bump language-server-runtimes to latest

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Merge main into feature/chatProjectContext #2336

Merge main into feature/chatProjectContext #2336

aws-toolkit-automation commented Sep 24, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

37 participants

Merge main into feature/chatProjectContext #2336

Are you sure you want to change the base?

Merge main into feature/chatProjectContext #2336

Conversation

aws-toolkit-automation commented Sep 24, 2025

Automatic merge failed

Command line hint

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

37 participants