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

awschristou and others added 30 commits July 31, 2025 12:11
This change sets up the repo to:
- produce agentic chat builds
- maintain alpha/preprod releases
- produce release candidate branches

This change merges in the feature branch feature/ci-builds.

* revert: revert: produce agentic chat bundle from repo (#1827) (#1858)

This reverts commit 06b425a.

* revert: revert: create GitHub releases for agentic chat alpha, feature, and rc

This reverts commit bbd4651.

* chore: set agentic version to 1.19.0

* chore: automate creation of release candidate branches (#1842)

* fix: ci build packaging (#1879)

* chore: produce agentic chat license attribution (#1883)

* chore: update qchat binaries, adjust agentic chat version to 1.24.0 (#2016)

To prepare this feature branch for a merge to main, this change updates the qserver binaries to the latest version, and sets the agentic chat version manifest to the current version (1.24.0).

* chore: update qserver binaries
* chore: set agentic version to 1.24.0
- Extend timeout from 10 to 15 minutes (MAX_POLLING_ATTEMPTS: 60 → 90)
- Add latency tracking for performance monitoring
- Improve error messages for better user experience
- Standardize error handling to throw exceptions consistently
- Update tests to properly handle exception-based error flow
- Add better documentation for timeout constants
* feat(amazonq): implement displayFindings tool

* feat(amazonq): add unit tests for display findings tool

* fix(amazonq): simplify displayFindings unit tests, collapse switch statement

* fix(amazonq): emit metrics for displayFindings, fix error handling, improve unit tests
* fix: add bash command parsing for telemetry metrics

* fix: handle metric withint executeBash tool itself
…context (#2040)

* fix: pass correct open tab files for inline completion

* fix: add open tab in the cross file context of inline completion
* chore(release): release packages from branch main

* fix: add missing package lock entry

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Christopher Christou <chrstou@amazon.com>
…2032)

* feat: add support for SMUS Q CodeEditor client to send MD IDE origin

* refactor: move smus service name to constants file and typecase argument getClientName util
* Bump agentic version: 1.25.0

* chore: fix formatting in version.json

---------

Co-authored-by: aws-toolkit-automation <>
Co-authored-by: invictus <149003065+ashishrp-aws@users.noreply.github.com>
XiaoxuanLu and others added 30 commits October 1, 2025 18:28
Co-authored-by: aws-toolkit-automation <>
)

Allow multiple loadChats() calls in JupyterLab environment.

Co-authored-by: ruotingx <ruotingx@amazon.com>
* 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>
* 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>
* chore: bump chat-client-ui-types to latest

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

* chore: bump language-server-runtimes to latest
* 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 <conorstw@amazon.com>
Co-authored-by: constewart9 <150978709+constewart9@users.noreply.github.com>
Co-authored-by: manodnyab <66754471+manodnyab@users.noreply.github.com>
…2430)

Co-authored-by: Laxman Reddy <141967714+laileni-aws@users.noreply.github.com>
## 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.
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: aws-toolkit-automation <>
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.