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/autoapprove git merge origin/main git commit git push origin HEAD:refs/heads/autoMerge/feature/autoapprove 
Will-ShaoHua and others added 30 commits July 23, 2025 14:54
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
…#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
) * refactor: move telemetry functions outside codewhispererServer.ts * refactor: patch
* feat(amazonq): enable compaction, minor UI changes * feat: add compaction metric * fix: metrics
* change error handling to 429 * add unit tests
…ors (#1969) This PR adds comprehensive logging to the Amazon Q Developer Profiles fetching process to help diagnose the "failed to fetch: developerProfiles" error that customers are experiencing with ATX transformation. The enhanced logging captures detailed information about endpoints accessed, regions queried, profiles returned, and provides structured error details without modifying any existing functionality. Key improvements: - Log all endpoints and regions being queried - Capture raw API responses and request parameters - Track profile retrieval success/failure by region - Provide detailed error information including HTTP status codes and AWS metadata - Summarize total profiles fetched across all regions These changes will help identify the root cause of login issues by providing visibility into the profile fetching process. * feat: enhance profile fetching logs to diagnose developerProfiles errors * feat: enhance profile fetching logs and add exception handling for debugging * feat: enhance profile fetching logs and add exception handling for debugging * refactor: remove unused endpoint parameter from fetchProfilesFromRegion
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
* feat: mcpmanager changes to support http/sse * fix: fix mcp sse transport headers issue * fix: fix unit tests for mcp http/sse support * feat: ux changes for mcp http/sse support * feat: ux changes for mcp http/sse support
* feat: adding inline chat telemetry * feat: adding error metrics, updating the names of params --------- Co-authored-by: Supraja Venkatesh <suprajav@amazon.com>
* refactor: separate auto trigger and manual trigger code path * fix: unit test * fix: fix unit test
* fix: use fast glob streaming when collecting files * fix: lower threshold * fix: adjust max files
This change is a test using LFS. It has one small hello world zip (containing a text file that says "hello world"). The purpose of this change is to test some internal processes to ensure they are able to successfully consume the repo once it has LFS contents in it. * chore: define LFS content in a binaries folder as a test * chore: add sample LFS file for a test
chungjac and others added 30 commits October 9, 2025 11:10
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 <>
## 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 <96078566+Will-ShaoHua@users.noreply.github.com>
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
Co-authored-by: Boyu <bywang@amazon.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment