Merge main into feature/model-selection #2344

aws-toolkit-automation · 2025-09-24T23:27:59Z

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

Co-authored-by: Blake Lazarine <blakelaz@amazon.com>

…2052) * fix(amazonq): fix to add disable/enable feature back to mcp servers * fix(amazonq): fix to add unit tests * fix: fix to add unit test coverage for mcpUtils

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

* fix(amazonq): fix fallout of #2051 avoid buggy global states * fix(amazonq): fix tests fix should report UTD test case

* Bump agentic version: 1.26.0 * chore: format version json --------- Co-authored-by: aws-toolkit-automation <>

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

…2090)

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

…at (#2093) Co-authored-by: chungjac <chungjac@amazon.com>

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

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

…2000) * feat(amazonq): added mcp admin level configuration with GetProfile * feat(amazonq): added UX message for mcp admin control * test: add unit tests for ProfileStatusMonitor static functionality * test: add comprehensive unit tests for MCP admin control features * fix: fix to wait for serviceManager is initialzied to initialize mcp managers * fix: fix for unit test failures * fix: fix for UI changes * fix(amazonq): fix to to rename mcp enabled function and max time limit of 10 seconds * fix: fix to add async initialization for mcp manager * fix: fix to move action buttons to mcpEventHandler for listMcpServers * fix: added try and catch block for mcp initialization * fix: fix for merge conflicts * fix: fix for test failure * fix: remove the unnecessary feature flag * fix: fix for mynah test failure * fix: fix to retry function to common util * fix: fix to add retryUtils

…pyter Notebook (#2114)

* 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

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

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

…ersions compatible and add refresh logic to codewhisperer IAM client (#2349) ## Problem Chat and InlineSuggestions doesnt work in Sagemaker instances after initial credential expiration since refresh logic isnt using expiration field properly ## Solution - Standardizes IAM credentials expiration field handling across the codebase to support both AWS SDK v2 (`expireTime`) and v3 (`expiration`) formats - Add credential fetch and refresh lazy loading logic to Codewhisperer IAM client to ensure fresh credentials are used

Co-authored-by: aws-toolkit-automation <43144436+aws-toolkit-automation@users.noreply.github.com>

…2356) * fix(amazonq): send full finding details to plugin, only send key fields to agent * fix(amazonq): add unit test --------- Co-authored-by: Blake Lazarine <blakelaz@amazon.com>

* fix: mapping of private packages to reference list * fix: relative path comparison to the lowercase on in artifact reference * fix: packages being filtered in the artifact generation

* fix(amazonq): escaping user input to mitigate xss issue * fix: adding conditional check for applying sanitizeinput

* fix: update the node version to 24 * Fix mock-fs Windows compatibility by using relative cache paths * style: fix code formatting for mock-fs test files * fix: use fake timers in chat-client tests for Node.js 24 compatibility Node.js 24 has stricter timer handling that caused setTimeout calls in production code to hang tests. Using fake timers ensures proper test isolation and prevents timeouts. * style: fix prettier formatting for chat-client test * fix: stub handleChatPrompt in mynahUi test to prevent timeout * fix: update test assertion to match stubbed behavior * fix: use proper module reference for handleChatPrompt stub * fix: make test async and wait for setTimeout calls to complete * fix: stub setTimeout to execute immediately and increase test timeout * fix: add setTimeout stubs to all sendGenericCommand tests --------- Co-authored-by: laileni <laileni@amazon.com>

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

Will-ShaoHua and others added 30 commits August 5, 2025 15:37

refactor: split edit from completion code path (#2058)

e1e286c

feat(amazonq): add two more tips for the did you know section (#2063)

9949c6d

fix(amazonq): make display findings tool run more often (#2067)

479ccd0

Co-authored-by: Blake Lazarine <blakelaz@amazon.com>

fix(amazonq): fix to add disable/enable feature back to mcp servers (#…

c03e017

…2052) * fix(amazonq): fix to add disable/enable feature back to mcp servers * fix(amazonq): fix to add unit tests * fix: fix to add unit test coverage for mcpUtils

feat(amazonq): enable sonnet 4 for fra region (#2069)

3a4b8df

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

8f6a7e6

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

fix(amazonq): emit failed status for amazonq_invokeLLM (#2071)

ee52a41

chore: generate completion log string (#2072)

cd30e9c

fix(amazonq): fix fallout of #2051 (#2057)

565066b

* fix(amazonq): fix fallout of #2051 avoid buggy global states * fix(amazonq): fix tests fix should report UTD test case

chore: merge agentic version 1.26.0 (#2076)

0955154

* Bump agentic version: 1.26.0 * chore: format version json --------- Co-authored-by: aws-toolkit-automation <>

fix(amazonq): bundle corect registry.node for windows (#2061)

b0c6572

chore: bump runtimes to 0.2.123 (#2082)

13d6355

fix: remove edit cache logic (#2079)

9bc5b9c

fix(amazonq): add fallback classpath generation (#2077)

3a6ef14

fix(amazonq): skips continuous monitoring when WCS sees workspace as …

9cb959d

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

8db059a

…2090)

chore: mapping adt plugin to abap to let inline suggestion work (#2085)

67e3208

* 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

fix: creating a new sesion for Edits trigger with next token (#2094)

1da8730

chore: bump @aws/mynah-ui to 4.36.4 (#2096)

c759910

fix(amazonq): leverage lcs to find the chars added and removed (#2092)

40379a8

fix: update client name to support Sagemaker AI origin for agentic ch…

a746fe8

…at (#2093) Co-authored-by: chungjac <chungjac@amazon.com>

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

0dd7f48

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

chore: format version.json after incrementing (#2068)

2a54bb5

fix(amazonq): persist mcp configs in agent json on start-up (#2112)

817cfe2

fix: Use file context override in the inline completion params for Ju…

91c8398

…pyter Notebook (#2114)

refactor: improve generateCompletion logging format (#2125)

8975f10

Will-ShaoHua and others added 3 commits September 24, 2025 10:05

fix: inline latency telemetry should account for preprocess time (#2323)

68c6d14

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

140a9c3

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

chore: bump agentic version: 1.35.0 (#2332)

f0364c3

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

aws-toolkit-automation requested a review from a team as a code owner September 24, 2025 23:28

parameja1 and others added 23 commits September 25, 2025 13:50

fix: improve history management (#2312) (#2357)

e7aa2a6

Co-authored-by: aws-toolkit-automation <43144436+aws-toolkit-automation@users.noreply.github.com>

fix(amazonq): send full finding details to plugin, partial to agent (#…

961e6ca

…2356) * fix(amazonq): send full finding details to plugin, only send key fields to agent * fix(amazonq): add unit test --------- Co-authored-by: Blake Lazarine <blakelaz@amazon.com>

fix: trim new line when emitting error message (#2359)

d8733a7

fix: private package mapping during artifact generation (#2348)

d56bfa1

* fix: mapping of private packages to reference list * fix: relative path comparison to the lowercase on in artifact reference * fix: packages being filtered in the artifact generation

fix(amazonq): escaping user input to mitigate xss issue (#2360)

45b86be

* fix(amazonq): escaping user input to mitigate xss issue * fix: adding conditional check for applying sanitizeinput

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

692e77b

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

rli deleted the branch feature/model-selection October 7, 2025 18:19

rli closed this Oct 7, 2025

rli deleted the autoMerge/feature/model-selection branch October 7, 2025 18:19

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Merge main into feature/model-selection #2344

Merge main into feature/model-selection #2344

Uh oh!

aws-toolkit-automation commented Sep 24, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

30 participants

Merge main into feature/model-selection #2344

Merge main into feature/model-selection #2344

Uh oh!

Conversation

aws-toolkit-automation commented Sep 24, 2025

Automatic merge failed

Command line hint

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

30 participants