Repository navigation
build: merge main into feature/dungdong - #243
Merged
dungdong-aws merged 4 commits intoNov 18, 2026
Merged
dungdong-aws merged 4 commits into
dungdong-aws merged 4 commits into
Conversation
…-Developer#234) Send `awsClientCapabilities.q.workspaceTrust` at initialize and `aws/updateConfiguration` (`aws.q.workspaceTrust`) when VS Code grants trust, so the language server starts local MCP servers only in trusted workspaces.
…-Q-Developer#230) (Amazon-Q-Developer#237) * fix(amazonq): read developer override settings from user settings only * fix(amazonq): scope packaged developer settings * fix(amazonq): use extension mode for dev overrides * fix(amazonq): defer developer settings until activation * fix(amazonq): own developer settings lifecycle * fix(amazonq): scope developer settings in manifest
…-Developer#239) * Release 2.10.0 * Update version to snapshot version: 2.11.0-SNAPSHOT --------- Co-authored-by: aws-toolkit-automation <>
# Conflicts: # packages/amazonq/test/unit/amazonq/lsp/config.test.ts
hezelin-work
approved these changes
Nov 18, 2026
laileni-aws
approved these changes
Nov 18, 2026
dungdong-aws
merged commit Nov 18, 2026
e340966
into
Amazon-Q-Developer:feature/dungdong
18 checks passed
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
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.
PR #242 (main → feature/dungdong) conflicts in
packages/amazonq/test/unit/amazonq/lsp/config.test.ts: #230 landed on both branches as separate commits, and #234 on main changed the adjacent lines.This branch merges
main(f1ef1f1) intofeature/dungdongand resolves that file to main's version, which already contains both #230 and #234. No other files conflicted. Supersedes #242.Please merge with Create a merge commit so main stays in this branch's history; squash or rebase would drop it and the next sync would conflict again.
License
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.