Merge main into feature/historyV3 #2358
Open
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
Co-authored-by: aws-toolkit-automation <[email protected]>
…2356) * fix(amazonq): send full finding details to plugin, only send key fields to agent * fix(amazonq): add unit test --------- Co-authored-by: Blake Lazarine <[email protected]>
* fix: mapping of private packages to reference list * fix: relative path comparison to the lowercase on in artifact reference * fix: packages being filtered in the artifact generation
* fix(amazonq): escaping user input to mitigate xss issue * fix: adding conditional check for applying sanitizeinput
* fix: update the node version to 24 * Fix mock-fs Windows compatibility by using relative cache paths * style: fix code formatting for mock-fs test files * fix: use fake timers in chat-client tests for Node.js 24 compatibility Node.js 24 has stricter timer handling that caused setTimeout calls in production code to hang tests. Using fake timers ensures proper test isolation and prevents timeouts. * style: fix prettier formatting for chat-client test * fix: stub handleChatPrompt in mynahUi test to prevent timeout * fix: update test assertion to match stubbed behavior * fix: use proper module reference for handleChatPrompt stub * fix: make test async and wait for setTimeout calls to complete * fix: stub setTimeout to execute immediately and increase test timeout * fix: add setTimeout stubs to all sendGenericCommand tests --------- Co-authored-by: laileni <[email protected]>
* chore: bump agentic version: 1.36.0 * fix(amazonq): fix to add opt-out header to streaming client (#2365) (#2369) --------- Co-authored-by: aws-toolkit-automation <> Co-authored-by: invictus <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: aws-toolkit-automation <>
) Allow multiple loadChats() calls in JupyterLab environment. Co-authored-by: ruotingx <[email protected]>
* 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 <[email protected]>
* 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]>
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 <[email protected]> Co-authored-by: Tai Lai <[email protected]> Co-authored-by: Tai Lai <[email protected]>
* feat: use dynamic token limits from listAvailableModels API * fix: dependency issues * refactor: encapsulate model ID and token limits in session
* fix: corrected plan upload extension type * fix: updated plan path for failed validation and fixed profile update bugs
* refactor: removed unreferenced code and refactored log messages * refactor: removed test for unused methods * fix: reverted error string messaging
…tests (#2547) * refactor: moved common utility functions to a single file for transform handlers * refactor: addressed comments * fix: fixed uncaught error problem with worklogs * fix: format changes
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: chungjac <[email protected]>
Co-authored-by: aws-toolkit-automation <>
## Problem transitive dependency `[email protected]` was introduced with #654 associated CVE link https://nvd.nist.gov/vuln/detail/CVE-2021-3807 ``` (base) ➜ runtimes git:(main) npm ls registry-js @amzn/[email protected] /Volumes/workplace/ide/language-server-runtimes └─┬ @aws/[email protected] -> ./runtimes └── [email protected] (base) ➜ runtimes git:(main) npm ls ansi-regex @amzn/[email protected] /Volumes/workplace/ide/language-server-runtimes └─┬ @aws/[email protected] -> ./runtimes ├─┬ [email protected] │ └─┬ [email protected] │ └─┬ [email protected] │ └─┬ [email protected] │ └── [email protected] └─┬ [email protected] └─┬ [email protected] └─┬ [email protected] └─┬ [email protected] └─┬ [email protected] └── [email protected] ``` ## Solution use `winreg` Microsoft winreg example https://github.com/microsoft/azure-pipelines-tasks-common-packages/blob/680f186a1e10568b1493503c81d403220a2eeb22/common-npm-packages/webdeployment-common/msdeployutility.ts#L311-L320 ## npm ls ``` (base) ➜ runtimes git:(security-v2) npm ls registry-js @amzn/[email protected] /Volumes/workplace/ide/language-server-runtimes └── (empty) ``` ``` (base) ➜ runtimes git:(security-v2) npm ls ansi-regex @amzn/[email protected] /Volumes/workplace/ide/language-server-runtimes └─┬ @aws/[email protected] -> ./runtimes └─┬ [email protected] └─┬ [email protected] └─┬ [email protected] └─┬ [email protected] └── [email protected] ```
* fix: fix for mcp servers refresh * fix: fix for failing unit tests
* feat: add websearch tool (#2540) * feat: add webfetch tool (#2542) * feat: add webfetch tool * fix: typo * fix: remove snippets from web search (#2543) * fix: filter out invalid urls (#2546) --------- Co-authored-by: aws-toolkit-automation <[email protected]>
…ation (#2555) * feat: add alphabetical sorting for MCP registry servers and improve URL validation * fix: fix for failing unit test
* feat: update SMAI clients to use SM_AI_STUDIO_IDE origin * fix: apply prettier formatting to utils.ts * fix: formatting issues * test: add tests for full coverage * ci: trigger CI rerun
…2562) * fix: prevent MCP server process duplicates with lightweight tracking * fix: reduce excessive logging in MCP process deduplication * fix: separate connection try-catch from process tracking
…es (#2564) This reverts the web search functionality from commit 09c4769 while preserving the streaming client packages that contain updated Origin type definitions needed by existing code. Preserved files: - core/codewhisperer-streaming/amzn-codewhisperer-streaming-1.0.0.tgz - core/q-developer-streaming-client/amzn-amazon-q-developer-streaming-client-1.0.0.tgz - package-lock.json - server/aws-lsp-codewhisperer/package.json
* fix: remove s3 artifact upload and download timeout * fix: update unit tests for s3 timeout removal * fix: remove comment --------- Co-authored-by: invictus <[email protected]>
* chore(release): release packages from branch main * chore: update package-lock.json from npm install (#2565) --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: invictus <[email protected]>
Co-authored-by: aws-toolkit-automation <>
…nges on windows machine (#2568) * fix: network connection error caused by server runtime dependency changes for windows users * chore: update package-lock
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Shruti Sinha <[email protected]>
Co-authored-by: aws-toolkit-automation <>
* feat(amazonq): show kiro pricing information for Amazon Q builderId paid tier users * fix(amazonq): adding failed state for pin context features.
…nager causing performance issues #6111 (#2578)
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
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):