Skip to content

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

andrewyuq and others added 30 commits August 26, 2025 15:51
* Updating the model of listAvailableModels (#2064)

* fix(amazonq): fix flickering issue for model selection dropdown and agenticCoding toggle (#2065)

* fix(amazonq): fix flickering issue for modelId and agenticCoding

* fix(amazonq): Fixing flaky tests

* feat(amazonq): Fetching models from backend and adding cache implementation. (#2075)

* fix: removing and refactoring legacy code before implementing model selection

* feat(amazonq): adding cache implementation and fetching models from listAvailableModels api

* feat(amazonq): adding selected model in error case

* feat(amazonq): adding test cases

* fix: addressing comments

* fix: fixing test cases and adding modelName to models

* fix: minor edits

* fix: minor edits

* fix: minor modifications in logs

* fix: adding default model if api throws any errors

* fix: refactoring code

* fix:  Improve model selection fallback logic when user's preferred model is unavailable (#2089)

* fix: if user preferred model does not exist, fall back to default model

* fix: minor test changes

* fix: to support backward compatibility for vs and eclipse, adding back modelSelection in chat-client (#2095)

* fix: check available models from backend before selecting default model from fallback models (#2102)

* feat(amazonq): use model display names (#2123)

* fix: cached model list should be invalidated on sign out (#2131)

* fix: cached model list should be invalidated on sign out

* fix test

* avoid throwing error

* fix: adding default modelId and setting cache ttl to 30 minutes (#2161)

* fix: adding defaultmodelId and setting cache ttl to 30 minutes

* fix: fixing tests

* fix: updating comments

* Updating the model of listAvailableModels (#2064)

* fix(amazonq): fix flickering issue for model selection dropdown and agenticCoding toggle (#2065)

* fix(amazonq): fix flickering issue for modelId and agenticCoding

* fix(amazonq): Fixing flaky tests

* feat(amazonq): Fetching models from backend and adding cache implementation. (#2075)

* fix: removing and refactoring legacy code before implementing model selection

* feat(amazonq): adding cache implementation and fetching models from listAvailableModels api

* feat(amazonq): adding selected model in error case

* feat(amazonq): adding test cases

* fix: addressing comments

* fix: fixing test cases and adding modelName to models

* fix: minor edits

* fix: minor edits

* fix: minor modifications in logs

* fix: adding default model if api throws any errors

* fix: refactoring code

* fix:  Improve model selection fallback logic when user's preferred model is unavailable (#2089)

* fix: if user preferred model does not exist, fall back to default model

* fix: minor test changes

* fix: to support backward compatibility for vs and eclipse, adding back modelSelection in chat-client (#2095)

* fix: check available models from backend before selecting default model from fallback models (#2102)

* feat(amazonq): use model display names (#2123)

* fix: cached model list should be invalidated on sign out (#2131)

* fix: cached model list should be invalidated on sign out

* fix test

* avoid throwing error

* fix: adding default modelId and setting cache ttl to 30 minutes (#2161)

* fix: adding defaultmodelId and setting cache ttl to 30 minutes

* fix: fixing tests

* fix: updating comments

* fix: lint issue while resolving merge conflicts

---------

Co-authored-by: Tai Lai <[email protected]>
042c98e6: optimizing memory usage in Indexing
Need to emit a metric for each issue found by the agentic reviewer to reach parity with old behavior.
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
This reverts commit 28567e3.

indexing bundle contains a crypto polyfill that is needed for some reason
* emit errorMessage in addMessage

* fix: emit errorMessage in addMessage
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
* feat: enabling model selection for code review tool

* feat: added unit test for model selection for code review tool

* fix: making modelId required for codeReviewTool in input schema validation

* fix: fixing unit tests

---------

Co-authored-by: Laxman Reddy <[email protected]>
* chore: bump agentic version: 1.31.0

* chore: empty commit to trigger release workflow (#2203)

---------

Co-authored-by: aws-toolkit-automation <>
* fix(amazonq): fix to correct the client for getProfile request

* fix(amazonq): removed unneccessary constructor objects

* fix: fix to add assigned VARs in unit tests
* feat: add supplemental context API

* feat: add supplemental context API support
XiaoxuanLu and others added 30 commits October 28, 2025 10:40
## 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.
🤖 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.
Co-authored-by: aws-toolkit-automation <>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Will Lo <[email protected]>
Co-authored-by: aws-toolkit-automation <>
* chore: add the dummpy package back the the script

* chore: fix the zip to cp

* chore: move the file into zip folder
#2475)

* feat: differenciate implicit and explicit reject for inline completion

* fix: add UT for inline reject metric type
* fix: McpManager not initialized error

* fix: adding more try catch to avoid crashes due to mcpmanager initialization error

* fix: adding error to debug logs
* Revert "chore: patch 940da04 PR #2478 (#2482)"

This reverts commit bfd2780.

* Revert "chore: update indexing bundle to 4f4fd25d (#2478)"

This reverts commit 940da04.

* chore: update q project context assets 4f4fd25d
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Will Lo <[email protected]>
Co-authored-by: aws-toolkit-automation <>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: aws-toolkit-automation <>
* Revert "fix(amazonq): send full finding details to plugin, partial to agent (#2356)"

This reverts commit 961e6ca.

* feat(amazonq): if there are more than 30 findings, do not send to agent, only to code issues panel

* fix(amazonq): do not stop calling listFindings if there are more than 30 findings

* fix(amazonq): do not stop calling listFindings if there are more than 30 findings

---------

Co-authored-by: Blake Lazarine <[email protected]>
Error handling in `setPaidTierMode` is broken as it attempts to JSON stringify a circular type which results in the Flare process crashing. This codepath is not new but is now being hit due to a service side change.
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
…ead of empty object (#2492)

* fix(amazonq): prevent base64 encoding error by passing undefined instead of empty object

Fixes #8253, #7896, #8076, #8184

When userInputMessageContext was undefined, it was being replaced with an
empty object {}. The AWS SDK's base64 encoder attempted to encode this
empty object and threw: "toBase64 encoder function only accepts string |
Uint8Array".

Changed messageToStreamingMessage() and chatMessageToMessage() to pass
undefined instead of {} when userInputMessageContext is not provided.

* fix(amazonq): prevent base64 encoding error by passing undefined instead of empty object (#2459)

Fixes #8253, #7896, #8076, #8184

When userInputMessageContext was undefined, it was being replaced with an
empty object {}. The AWS SDK's base64 encoder attempted to encode this
empty object and threw: "toBase64 encoder function only accepts string |
Uint8Array".

Changed messageToStreamingMessage() and chatMessageToMessage() to pass
undefined instead of {} when userInputMessageContext is not provided.

---------

Co-authored-by: aws-toolkit-automation <[email protected]>
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.