Merge master into feature/agentic-chat-MCP #7080
Open
+35,499
−20,380
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…#7130) ## Problem When user accepts suggestion from inline completion or chat, there can be a change in the current open editor's IDE diagnostics, this can be used as a measure for code suggestion quality. Ref: aws/aws-toolkit-jetbrains#5613 This change is part of the server side workspace context. To reduce the risk of large blast radius, this change is only applied for users who are in the experiment of server side project context (both treatment and control), which is the Amzn idc users. E2E verifying request id: `97a3c4d4-0c78-4329-93ae-379d2ec66646`. ## Solution 1. Add changed IDE diagnostics after user acceptance --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). - License: I confirm that my contribution is made under the terms of the Apache 2.0 license.
## Problem Flare is marked as codeowners of the following: ``` packages/core/src/codewhispererChat/ @aws/flare packages/core/src/amazonq/ @aws/flare ``` AFAIK, the flare team hasn't done significant work in these folders, and does not have bandwidth to review changes here. - `packages/core/src/codewhispererChat/ ` will be mostly deleted when we complete the migration to Flare (ex. [here](#7237)). - `packages/core/src/amazonq/ ` contains most changes to the amazon q extension, which seems out of scope for the Flare team. Having flare as codeowners requires the toolkits team to bypass their approval on any PRs touching files in these directories. This can lead to delayed merges and confusion. ## Solution - remove flare as a code owner. --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). - License: I confirm that my contribution is made under the terms of the Apache 2.0 license.
## Problem Create E2E test for /review ## Solution --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). - License: I confirm that my contribution is made under the terms of the Apache 2.0 license.
## Problem
Misleading log message when a setting returns `null`, even if the caller
specified `defaultValue`:
[error] Settings (amazonQ): failed to read "workspaceIndexCacheDirPath":
Unexpected type cast: got object, expected primitive String
`cast()` considers `null` to be "object" type, which is misleading. If
the caller passed a `defaultValue`, they have intentionally opted-in to
ignoring this situation, and *don't* want this kind of log message.
## Solution
If a setting returns `null|undefined`, skip `cast()` and return
`defaultValue` immediately. Don't log an error message.
## Problem The default 5-minute timeout was insufficient for Amazon Q Feature Dev tests that involve code generation with multiple iterations. This was causing tests to fail prematurely before they could complete their full execution cycle. ## Solution Extended the test timeout to 15 minutes (900,000ms) specifically for the code generation test with multi-iteration scenarios. This provides adequate time for multi-iteration code generation tests to complete their execution while maintaining the existing test behavior.
…7242) ## Problem Customization will only have "1" parent profile, so theoretically we don't need another call of listAvailableCustomization to check if the new profile has access to given customization or not. Instead, we could simply switch to default customization (foundation). ## Solution --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). - License: I confirm that my contribution is made under the terms of the Apache 2.0 license.
…7196) ## Problem A metric was forwarded from Flare with missing fields. This resulted in some confusion about why the metric wasn't showing up properly in Kibana. ## Solution - refactor validation to check for missingFields and log a warning. - Ideally, we would throw in CI for these, but there is currently a significant number of metrics emitted without required fields. - add tests for this validation. ## Future Work - Fix existing cases of emitting with missing required fields, so we can throw in CI when this happens. --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). - License: I confirm that my contribution is made under the terms of the Apache 2.0 license.
…7246) ## Problem - IDE shows `Generate unit tests (python & java) for selected code` in quick actions but Q supports all the languages. ## Solution - Made change accordingly.  --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). - License: I confirm that my contribution is made under the terms of the Apache 2.0 license.
## Problem If a users firewall is blocking downloading the zips or reaching the manifest its not clear to the user what to do ## Solution If the user: 1. doesn't have the latest version cached 2. download of the manifest failed 3. they don't have any previous language servers downloaded it might be a firewall issue. Rather than just `Unable to find a compatible version of the Language Server` we show a more descriptive message to the user <img width="454" alt="Screenshot 2025-05-07 at 2 48 39 PM" src="https://github.com/user-attachments/assets/48053a0f-7dff-4ba2-8b7d-65769b30a56f" /> --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). - License: I confirm that my contribution is made under the terms of the Apache 2.0 license.
…#7254) ## Problem These errors show up in telemetry with reason `Error`. All of the `reasonDesc` are different since they include unique PID values. This makes it hard to count/quantify how often this is happening. ## Solution - attach a unique error code to these errors. For when node can't be run we have `FailedToRunNode`, and when the language server can't be started we have `FailedToStartLanguageServer`. --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). - License: I confirm that my contribution is made under the terms of the Apache 2.0 license.
#7259) ## Problem This test has been very flaky, and constantly failing CI (#7187). This test is run for almost 40 different cases, and does the following: - create a text document - write it to the filesystem. - run the check on the text document. One of the core issues is that when we write the text document to the filesystem, we create a new test workspace folder for each case. This involves creating a directory with a random id for each of the almost 40 different cases. These excessive file system operations could be leading to the flakiness in CI. ## Solution - reuse the same test workspace folder across all test cases. This should cut the file systems operations in half. ## Future Work - If this doesn't reduce flakiness, we could avoid writing the text document to the fs since its not needed by the underlying test, but this involves mocking the text document which is undesirable imo. --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). - License: I confirm that my contribution is made under the terms of the Apache 2.0 license.
…7252 ## Problem AmazonQ LSP needs an identifier for the IDE workspace, which should be stable and unique for each workspace, regardless of IDE restarts or system reboots. ## Solution Use [ExtensionContext.storageUri](https://code.visualstudio.com/api/references/vscode-api#ExtensionContext.storageUri) as such an identifier and pass it when initializing AmazonQ lsp.
## Problem We introduced `editorState` in data instrumentation launch. The service has a requirement of 40k character limit for the `text` field. ## Solution Implement a check on text length. If the text length exceeds 40k characters, section 20k max characters from the left and right side of current cursor position, so the final text is always less than 40k. validated prod endpoint inline working for files > 40k characters. Example request id: `57bbbe65-fbe7-47fc-81c4-c65262f47ce8` --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). - License: I confirm that my contribution is made under the terms of the Apache 2.0 license.
…lableCustomization (#7242) (#7266) This reverts commit 98b0d5d. ## Problem It regress #7181 and make 7181 not working: profile will be changed, but customization will be swapped to default always. ## Solution --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). - License: I confirm that my contribution is made under the terms of the Apache 2.0 license.
## Problem Inconsistent behavior when opening agent tabs (/review, /doc, etc). When the tab is reused it keeps the prompt input options visible, but when a new tab is created it doesn't. https://github.com/user-attachments/assets/2ff7264f-f7a3-46f6-9a34-e29835768833 ## Solution Set `promptInputOptions` to empty when an existing tab is reused. --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). - License: I confirm that my contribution is made under the terms of the Apache 2.0 license.
## Problem clientId from `clientParams.initializationOptions?.aws?.clientInfo?.clientId` is random on every restart ## Solution use the client id from telemetry utils --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). - License: I confirm that my contribution is made under the terms of the Apache 2.0 license.
When the server crashes and then restarts again, we will emit a metric to indicate it crashed. When querying look for: `metadata.metricName: languageServer_crash` & `metadata.id: AmazonQ` --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). - License: I confirm that my contribution is made under the terms of the Apache 2.0 license. Signed-off-by: nkomonen-amazon <[email protected]>
## Problem FileCreationFailed exceptions are displayed as UnknownException in telemetry. This exception is new and we want to separate this out from other unknown exceptions. ## Solution Return API service error with `FileCreationFailedException`
## Problem
Extension version sent to Q LSP is hardcoded.
## Solution
Ssend the actual extension version
BEFORE:
aws-sdk-nodejs/2.1692.0 darwin/v23.10.0 AWS-Language-Servers AWS-CodeWhisperer/0.1.0 AmazonQ-For-VSCode/0.0.1 Visual-Studio-Code---Insiders/1.100.0-insider ClientId/c342ab45-6aba-4118-b48c-44dcedb10a78 promise
AFTER
aws-sdk-nodejs/2.1692.0 darwin/v23.10.0 AWS-Language-Servers AWS-CodeWhisperer/0.1.0 AmazonQ-For-VSCode/testPluginVersion Visual-Studio-Code---Insiders/1.100.0-insider ClientId/c342ab45-6aba-4118-b48c-44dcedb10a78 promise
## Problem - No logs is being emitted for telemetry events. ## Solution - Adding logs if telemetry events are emitted. --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). - License: I confirm that my contribution is made under the terms of the Apache 2.0 license.
…r accepts an EDITS suggestion
…7565) ## Notes: - Migrating the /Agents(/dev, /doc and /test) to Q Agentic chat experience. - This does not disturb other /agents like /review and /transform. ### TODO: - Remove implementation code for above /agents from the VSC repository in followup PR's. --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). - License: I confirm that my contribution is made under the terms of the Apache 2.0 license. --------- Co-authored-by: laileni <[email protected]> Co-authored-by: Laxman Reddy <[email protected]>
## Problem ## Solution --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). - License: I confirm that my contribution is made under the terms of the Apache 2.0 license.
## Problem It's confusing when Q is saying it's thinking however sometimes the model returns empty suggestion thus nothing will be displayed to users. Thus the team decides to remove the UI. ## Solution --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). - License: I confirm that my contribution is made under the terms of the Apache 2.0 license.
…tsParams for EDITS telemetry
…tsParams for EDITS telemetry (#7623)
## Problem WebView emit event to open system file dialog to use the VSC api to open file dialog, and the event need to be handled by extension ## Solution 1. Register the request between WebView and language server by adding `case OPEN_FILE_DIALOG` 2. Add handling for event when language server request to open system file dialog, which is defined in `languageClient.onRequest(ShowOpenDialogRequestType.method, async (params: ShowOpenDialogParams)` --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). - License: I confirm that my contribution is made under the terms of the Apache 2.0 license.
fix(amazonq): duplicated onDidSaveTextDocument notification
…d Flare breakpoint work-around
fix(amazonq): improve feedback experience and min char limit
docs(amazonq): improve LSP documentation
## Problem Adding client side diagnostic data back after inline flare migration ## Solution Migrate existing logic for getting IDE diagnostic info and flow it to `LogInlineCompletionSessionResultsParams` Re-using https://github.com/aws/aws-toolkit-vscode/blob/ad2164b2937d324681f9504cb5a05d153c70eada/packages/core/src/codewhisperer/util/diagnosticsUtil.ts --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). - License: I confirm that my contribution is made under the terms of the Apache 2.0 license.
…s editing (NEP) (#7640) … ## Problem - not allow generate completion request to go through if the edit is made by Q (only affecting NEP path) - add logging - ## Solution --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). - License: I confirm that my contribution is made under the terms of the Apache 2.0 license.
…Token (#7641) ## Problem NEP on acceptance trigger should only happen if there is a next token ## Solution --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). - License: I confirm that my contribution is made under the terms of the Apache 2.0 license.
…ard (#7624) fixes #7618 ## Problem Introduced in #7601 is a bug where choosing to upload a Lambda function from a directory would not allow the user to actually select the directory. In the directory selection window, the button to select is disabled. This was an inadvertent change when adding new functionality. ## Solution Revert the breaking change. In addition to switching `canSelectFolders` to `true` and `canSelectFiles` to `false`, I have reverted the other changes in the upload flow that were added in the original PR. This is because these changes added another flow to the upload modal that doesn't fit with all the other added functionality, and just increases the complexity of the code without much benefit. Because this was the only place that used the `lambdaEdits` array from the `utils`, I removed that as well. --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). - License: I confirm that my contribution is made under the terms of the Apache 2.0 license.
…sion activation failure (#7599) ## Problem With updating Toolkit version to latest in SMUS CodeEditor Spaces, observing Toolkit throws an error as attached in screenshot below with error message ``` Attempted to get compute region without initializing ``` <img width="2039" alt="image" src="https://github.com/user-attachments/assets/a53e8fdc-bf7b-4c96-98fa-78c6db819a72" /> ## Solution - Issue is due to getComputeRegion() invoked first before compute region is initialized - hence solution is to Make `isCn()` resilient to uninitialized state and return a default value - Tested with a local debug artifact in SMUS CodeEditor space, toolkit activation completed and working - <img width="1886" alt="image" src="https://github.com/user-attachments/assets/988c208c-3fe8-4530-a477-3e8704f1f598" /> - Also Tested the changes in standalone VS code application and SMAI compute instance, and toolkit explorer view is seen working as expected -  -  - Also tested the vsix in china region cn-north-1, and working as expected - <img width="720" height="393" alt="image" src="https://github.com/user-attachments/assets/b0523567-82ad-4dcb-b218-a935983c3b47" /> --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). - License: I confirm that my contribution is made under the terms of the Apache 2.0 license.
…without calling provideInlineCompletionItems
…without calling provideInlineCompletionItems
feat(amazonq): add a opt-in checkbox for server-side context
revert: merge pull request #7629 from LiGaCu/wcs_optin
This PR contains updates for miscellaneous features related to the new Lambda quick edit. ## Handling of empty directories ### Problem Previously, having an empty directory in the Lambda quick edit flow led to errors when trying to view the function code in the explorer or in a workspace. An empty folder could be the result of an error during download. The unintended bug in the code was related to how we were checking for existence of a function saved locally. ### Solution Check if there are any files in the directory before determining if it exists locally. If the directory is empty, we must redownload the code (a Lambda function cannot be empty, so we know it is unintended) ## README updates ### Problem - A couple typographic errors - README was opening as separate tab, not as split pane - README was referencing "cloud deploy icon" rather than showing the actual icon, same with the invoke icon ### Solution - Fix errors - Adjust README open to use `markdown.showPreviewToSide` - Save the icons locally so we can display them in the actual README. ## Quick Edit Flow updates ### Problem - Some non-passive metrics were being emitted on activation - Downloading code on activation lead to race conditions with authentication - Downloading code on activation lead to extra slow load times ### Solution All of this is fixed by moving things around so that there is never any code downloaded during activation. This is beneficial because it keeps us from doing a lot of our main functionality on activation. Previously, opening a function in a workspace, which could be done through a URI handler or from the explorer, would cause the extension to restart. Once the extension restarted, at that point we would download the code and start the watchers. These changes download the code first, and only start the watchers on activation. Because the user doesn't need to be authenticated to start the watchers (only to deploy), this is not an issue for being authenticated. If it's a workspace folder, we're assuming the function exists locally, so that's why we know we've downloaded the code already. The only edge case is if the local code is out of sync with what's in the cloud; in this case, we prompt the user to overwrite their code, but they need to go to the explorer to manually download it to avoid the activation race conditions. --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). - License: I confirm that my contribution is made under the terms of the Apache 2.0 license.
## Problem Clients should support listAvailableModels lsp method ## Solution Add listAvailableModels to request handlers --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). - License: I confirm that my contribution is made under the terms of the Apache 2.0 license.
…line completion results (#7663) ## Problem Previous the pagination API call was blocking and it does not render until all pagination API calls are done. Without a force refresh of the inline ghost text, paginated response will not be rendered. ## Solution 1. Keep doing paginated API call in the background. 2. Refresh the ghost text of inline completion when user press Left or Right key to add paginated responses by calling VS Code native commands. Note that we can do such refresh below whenever the pagination session finish but that will result in inline completion flickering, hence it is better to do it on demand when Left or Right is pressed. ``` await vscode.commands.executeCommand('editor.action.inlineSuggest.hide') await vscode.commands.executeCommand('editor.action.inlineSuggest.trigger') ``` --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). - License: I confirm that my contribution is made under the terms of the Apache 2.0 license.
## Problem - added new metric in aws-toolkit-common: aws/aws-toolkit-common#1063 ## Solution - Consume latest version of aws-toolkit-common package --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). - License: I confirm that my contribution is made under the terms of the Apache 2.0 license.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Automatic merge failed
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):