Merge main into feature/mcp-legacy-loader-default#2710
Open
aws-toolkit-automation wants to merge 8 commits intofeature/mcp-legacy-loader-defaultfrom
Open
Merge main into feature/mcp-legacy-loader-default#2710aws-toolkit-automation wants to merge 8 commits intofeature/mcp-legacy-loader-defaultfrom
aws-toolkit-automation wants to merge 8 commits intofeature/mcp-legacy-loader-defaultfrom
Conversation
…2708) * feat(amazonq): add consent prompt for workspace-scoped MCP servers * fix(amazonq): suppress MCP consent re-prompts within session on deny (#2703) * test: add consent gate tests for workspace-scoped MCP servers (#2705) * fix: add missing closing brace in mcpManager.test.ts * fix: use getGlobalMcpConfigPath for cross-platform path in consent gate test * fix: addressing review feedback --------- Co-authored-by: Aseem Sharma <aseemxs@amazon.com> Co-authored-by: Aseem sharma <198968351+aseemxs@users.noreply.github.com>
* feat(amazonq): add consent prompt for workspace-scoped MCP servers * fix(amazonq): suppress MCP consent re-prompts within session on deny (#2703) * test: add consent gate tests for workspace-scoped MCP servers (#2705) * fix: add missing closing brace in mcpManager.test.ts * fix: use getGlobalMcpConfigPath for cross-platform path in consent gate test * fix: addressing review feedback * fix(amazonq): improve MCP consent gate reliability and cleanup - Fix spurious re-prompts on IDE reload by using OR matching in hasApproval: match on (serverName, fingerprint) OR (serverName, workspaceHash). The fingerprint can change slightly between reloads due to config migration, and the workspaceHash covers that case. - Add getGlobalPersonaConfigPath to the trusted set so persona configs don't trigger unnecessary consent prompts. - Clear sessionDeniedConsent in close() for consistency with other state. - Replace non-null assertion with inline Set initialization. - Evict stale approval entries when config changes for the same server and workspace instead of accumulating them. - Normalize configPath via normalizePathFromUri before consent checks. - Add removeApproval and call it from removeServer so deleting a workspace MCP server clears its persisted approval. - Improve prompt text to explain persistence semantics to the user. - Normalize paths with path.resolve and forward slashes for cross- platform consistency in fingerprintWorkspace. --------- Co-authored-by: Aseem Sharma <aseemxs@amazon.com> Co-authored-by: Aseem sharma <198968351+aseemxs@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
…PI selection (#2713) (#2714) The onInlineChatPrompt handler was hardcoded to call client.sendMessage() regardless of the authentication type. This caused Kiro Enterprise subscription users on Eclipse to get Your subscription does not support this application errors because SendMessage is not in the Kiro Enterprise API allowlist. Route inline chat through getChatResponse() which correctly selects GenerateAssistantResponse for token-based (SSO/IdC) clients and SendMessage only for IAM clients, matching the behavior of regular chat.
Co-authored-by: aws-toolkit-automation <>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: aws-toolkit-automation <>
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
3 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):