Skip to content

Merge main into feature/read-ui-revamp #2346

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
wants to merge 159 commits into
base: feature/read-ui-revamp
Choose a base branch
from
Open

Merge main into feature/read-ui-revamp #2346

wants to merge 159 commits into from

Conversation

@aws-toolkit-automation
Copy link
Collaborator

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

dungdong-aws and others added 30 commits August 12, 2025 17:03
@dungdong-aws
fix(amazonq): persist mcp configs in agent json on start-up (#2112)
817cfe2
@ashishrp-aws
feat(amazonq): added mcp admin level configuration with GetProfile (#…
fd6e9a8 
…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
@leigaol
fix: Use file context override in the inline completion params for Ju…
91c8398 
…pyter Notebook (#2114)
@ctlai95
feat(amazonq): read tool ui revamp (#2113) (#2121)
93cf229 
* 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
@Will-ShaoHua
refactor: improve generateCompletion logging format (#2125)
8975f10
@BlakeLazarine @blakelaz-amazon
fix(amazonq): handle case where multiple rules are provided with the …
0e23e2d 
…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 <[email protected]>
@Will-ShaoHua
perf: remove edit completion retry mechanism on document change (#2124)
963b6e9
@rli
ci: remove need for custom PAT for release branch workflow (#2126)
0bf825e 
The token from GitHub Actions is sufficient
@chungjac
fix: proper path handling for additional context (#2129)
971eaa5 
* fix: proper pathing for additonal context

* fix: update existing tests to also mock path.join()
@dungdong-aws @bywang56
fix(amazonq): fix regression of mcp config in agent config (#2101)
e4e8bbb 
* 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 <[email protected]>
@Rajanna-Karthik
feat: remove project type validation from LSP layer (#2103)
d397161 
* feat: remove project type validation from LSP layer

* refactor: remove unused validation functions from LSP layer
@ashishrp-aws
fix: fix for button text and remove profilearn caching (#2137)
2a4171a
@tsmithsz
chore: bump runtimes to 0.2.126 (#2138)
b3938c1
@ashishrp-aws
fix: fix to add disk caching for mcp admin state (#2139)
f947e1a 
* 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
@Will-ShaoHua
refactor: cleanup old nep code path which is no longered being used i…
43bc9b1 
…n codewhispererServer.ts (#2141)
@LiGaCu
fix(amazonq): add server side control for WCS features (#2128)
5e4435d 
Co-authored-by: Jiatong Li <[email protected]>
@Will-ShaoHua
chore: update STE userContext version metadata (#2142)
b76cd85
@ashishrp-aws @laileni-aws
fix: fix to turn on and off MCP servers incase of error based on last…
04588df 
… state (#2143)

Co-authored-by: Laxman Reddy <[email protected]>
@Will-ShaoHua
fix: empty userTriggerDecision not being sent for NEP code path (#2140)
b8e5268 
* 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
@github-actions
chore(release): release packages from branch main (#2117)
c5468cb
@andrewyuq
fix(amazonq): don't let flare send discard for the still valid sugges…
0767e07 
…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
@github-actions
chore(release): release packages from branch main (#2149)
d3cd455 
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@manodnyab
chore: merge agentic version 1.29.0 (#2151)
28d46a7 
* chore: bump agentic version: 1.29.0

* chore: empty commit to start Github Action (#2150)

---------

Co-authored-by: aws-toolkit-automation <>
@bywang56
feat: add basic OAuth client for remote MCP (#2136)
2fb896e 
* 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
@atonaamz
fix: adding streakTracker to track streakLength across Completions an…
a6c64f2 
…d Edits (#2147)
@bywang56
feat: disable pkce flow during plugin load (#2153)
71b3595
@chungjac
chore: bump runtimes to 0.2.127 (#2156)
7296f93
@bywang56
fix: multiple fixes on auth flow edge cases (#2155)
472220a
@ashishrp-aws @bywang56
feat: update MCP manager and utilities (#2158)
b99df82 
Co-authored-by: Boyu <[email protected]>
@ctlai95
fix(amazonq): disable typewriter animation (#2160)
db45d01
chungjac and others added 30 commits October 6, 2025 16:37
@chungjac
feat: add model description to dropdown (#2374)
ed8c6dd 
* feat: add model description to dropdown

* fix: bump up mynah version to enable hover
@Will-ShaoHua
fix: addonly EDITS should be handled as COMPLETIONS (#2133)
4f5a9da
@atonaamz
chore(amazonq): adding test for editCompletionHandler (#2396)
4ce9d8f
@ruotingx
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 <[email protected]>
@ashishrp-aws
feat(amazonq): adding classification based retry strategy for chat (#…
15d1b1f 
…2234) (#2409)
@Will-ShaoHua @atonaamz
fix: patch #2133 and handle more variants of FIM suggestions (#2407)
f3086d7 
* 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 <[email protected]>
@github-actions
chore(release): release packages from branch main (#2384)
06fbeb2 
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@chungjac
build: temporarily lock node.js version to 24.9.0 (#2413)
12e089b
@chungjac
chore: bump agentic version: 1.38.0 (#2416)
0e8e36d 
Co-authored-by: aws-toolkit-automation <>
@chungjac @aws-toolkit-automation @ctlai95
refactor: migrate aws-sdk v2 to v3 (#2418)
178deec 
* 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 <[email protected]>
Co-authored-by: Tai Lai <[email protected]>
Co-authored-by: Tai Lai <[email protected]>
@Will-ShaoHua
fix: inline, nep telemetry not sent and throw sessionId not found (#2419
c96106d 
)
@akoreman
fix: set resolveProvider to false in init handler json and yaml langu…
e11c544 
…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 <[email protected]>
@github-actions
chore(release): release packages from branch main (#2421)
ac4f2a4
@shruti0085
chore: bump agentic version: 1.39.0 (#2422)
088f0ba
@ashishrp-aws
revert: revert for mid-loop compaction
3f48b12 
This reverts commit 35f0795.
@github-actions
chore(release): release packages from branch main (#2426)
6e9c384
@shruti0085
chore: bump agentic version: 1.40.0 (#2427)
bf9f997
@XiaoxuanLu
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
@XiaoxuanLu @constewart9 @manodnyab
feat: send pinned context button immediately with pending state (#2353)
bee5cad 
* feat: context command pending state passed to ui, triggered when indexing complete

* refactored pending flow

* fix: removed extra spaces

* fix: workspace pending turned back on when building index (when config is changed)

* fix: log errors if inital context commands fail to send

* refactor: changed pending state from boolean to string to send to ui

* refactor: update from pending to disabledText

* fix: send intial pending state before any other action in contextCommandsProvider

* fix: send initial pending context commands onReady, instead of before

* test: added unit test for onReady

* test: added unit test for when indexingInProgress is changed

* chore: fix the mynal ui test

* chore: fix the mynal test for lack of disabled field

---------

Co-authored-by: Conor Stewart <[email protected]>
Co-authored-by: constewart9 <[email protected]>
Co-authored-by: manodnyab <[email protected]>
@yueny2020 @laileni-aws
feat(amazonq): add user requirement to zipfile for code review tool (#…
2c33b38 
…2430)

Co-authored-by: Laxman Reddy <[email protected]>
@Will-ShaoHua
feat: nep auto trigger (#2424)
2292bd7 
## Problem
The existing edit trigger criteria is too loose (1) non empty right context (2) edit history in the past 20s.


## Solution
Build a logistic regression classifier and use users editor state as the features of the formula.
<!---
    REMINDER:
    - Read CONTRIBUTING.md first.
    - Add test coverage for your changes.
    - Link to related issues/commits.
    - Testing: how did you test your changes?
    - Screenshots if applicable
-->

## License

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
@Will-ShaoHua
fix: classifier last token sometimes fail to capture the right values (…
7420d59 
…#2434)
@github-actions
chore(release): release packages from branch main (#2429)
7cf19e6 
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@laileni-aws
chore: bump agentic version: 1.41.0 (#2435)
a53d14e 
Co-authored-by: aws-toolkit-automation <>
@XiaoxuanLu
fix: add venv in the common gitignore patterns (#2445)
d030288
@Will-ShaoHua
fix: strenghen NEP trigger conditions (#2438)
82e2340 
## Problem
Bring the code we removed previously back https://github.com/aws/language-servers/pull/2424/files#diff-10a12088df160c3eec8bb5eedd826e4ee475614c9b3a544fa2393cdeed92bc24L231-L238 and make the trigger criteria more strict.


1. Non empty right context starting next line
2. Recent edits in the past 20 seconds
3. Classifier result is greater than the threshold

## Solution

<!---
    REMINDER:
    - Read CONTRIBUTING.md first.
    - Add test coverage for your changes.
    - Link to related issues/commits.
    - Testing: how did you test your changes?
    - Screenshots if applicable
-->

## License

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
@ashishrp-aws
fix: enforce MAX_TOOL_NAME_LENGTH check in createNamespacedToolName (#…
6663f87 
…2447)
@github-actions
chore(release): release packages from branch main (#2446)
db777f8 
🤖 I have created a release *beep* *boop*
---


<details><summary>lsp-codewhisperer: 0.0.88</summary>

## [0.0.88](lsp-codewhisperer/v0.0.87...lsp-codewhisperer/v0.0.88) (2025-10-28)


### Bug Fixes

* add venv in the common gitignore patterns ([#2445](#2445)) ([d030288](d030288))
* enforce MAX_TOOL_NAME_LENGTH check in createNamespacedToolName ([#2447](#2447)) ([6663f87](6663f87))
* strenghen NEP trigger conditions ([#2438](#2438)) ([82e2340](82e2340))
</details>

---
This PR was generated with [Release Please](https://github.com/googleapis/release-please) bot. When you are ready to release these changes, merge this PR.

**Blocking GitHub Checks Issue:** if GitHub checks do not run, close and immediately re-open this PR manually.
@Will-ShaoHua
chore: bump agentic version: 1.42.0 (#2451)
550e0ea 
Co-authored-by: aws-toolkit-automation <>
@laileni-aws
fix(amazonq): mcp tool panel blocks amazon q chat interface when usin…
11900ca 
…g right-click context menu (#2442)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.