Merge main into feature/temp-rules#2658
Open
aws-toolkit-automation wants to merge 16 commits intofeature/temp-rulesfrom
Open
Merge main into feature/temp-rules#2658aws-toolkit-automation wants to merge 16 commits intofeature/temp-rulesfrom
aws-toolkit-automation wants to merge 16 commits intofeature/temp-rulesfrom
Conversation
Co-authored-by: aws-toolkit-automation <>
* fix: rules created in default file is not workin * fix: rules created in default file is not working Use dependency injection for McpManager.getResources() in AdditionalContextProvider to avoid pulling node:process and node:stream into the webworker webpack bundle, which caused packaging to fail with UnhandledSchemeError. * fix: rules created in default file is not working Use dependency injection for McpManager.getResources() in AdditionalContextProvider to avoid pulling node:process and node:stream into the webworker webpack bundle, which caused packaging to fail with UnhandledSchemeError. Co-authored-by: aws-toolkit-automation <43144436+aws-toolkit-automation@users.noreply.github.com>
* fix: rules created in default file is not working (#2652) * fix: rules created in default file is not workin * fix: rules created in default file is not working Use dependency injection for McpManager.getResources() in AdditionalContextProvider to avoid pulling node:process and node:stream into the webworker webpack bundle, which caused packaging to fail with UnhandledSchemeError. * fix: rules created in default file is not working Use dependency injection for McpManager.getResources() in AdditionalContextProvider to avoid pulling node:process and node:stream into the webworker webpack bundle, which caused packaging to fail with UnhandledSchemeError. * fix: deduplicate rules in multi workspace mode (#2659) * fix: rules created in default file is not workin * fix: rules created in default file is not working Use dependency injection for McpManager.getResources() in AdditionalContextProvider to avoid pulling node:process and node:stream into the webworker webpack bundle, which caused packaging to fail with UnhandledSchemeError. * fix: rules created in default file is not working Use dependency injection for McpManager.getResources() in AdditionalContextProvider to avoid pulling node:process and node:stream into the webworker webpack bundle, which caused packaging to fail with UnhandledSchemeError. * fix: rules created in default file is not working Use dependency injection for McpManager.getResources() in AdditionalContextProvider to avoid pulling node:process and node:stream into the webworker webpack bundle, which caused packaging to fail with UnhandledSchemeError. --------- Co-authored-by: aws-toolkit-automation <43144436+aws-toolkit-automation@users.noreply.github.com>
…vent (#2665) (#2668) Add a dedicated boolean metric to distinguish @workspace usage from regular folder context in telemetry. Previously both were counted under cwsprChatFolderContextCount with no way to differentiate. The metric is true when the user uses @workspace (inline or pinned), false otherwise. Wired through the existing triggerContext.hasWorkspace flag into the telemetry pipeline. Co-authored-by: aws-toolkit-automation <43144436+aws-toolkit-automation@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: aws-toolkit-automation <>
…nToken API calls (#2680) * fix: cache subscription status to prevent excessive CreateSubscriptionToken API calls setPaidTierMode() was calling getSubscriptionStatus() (which invokes CreateSubscriptionToken) on every tab add and tab change event, even though the subscription status rarely changes during a session. With the upcoming Kiro/Stripe integration requiring a lower throttle limit (0.25 TPS), these redundant calls would cause both unnecessary and legitimate requests to be throttled. Now, when setPaidTierMode() is called without an explicit mode, it reuses the cached #paidTierMode if already known, and only calls the API on the first invocation when the status is still unknown. Resolves: V1880021966 * test: add test * fix: deduplicate concurrent getSubscriptionStatus calls with a stored promise The previous cache only helped after the first getSubscriptionStatus() resolved. If multiple tabs opened before that promise settled, each would see #paidTierMode as falsy and fire its own API call — the burst this fix is meant to prevent. Store the in-flight promise in #subscriptionStatusPromise so all concurrent setPaidTierMode(!mode) callers attach to the same request. The promise is cleared on error (allowing a retry) and alongside #paidTierMode on configuration updates. Also adds a test that verifies 5 rapid tab-adds result in only one API call.
* feat(amazonq): align mcp oauth client with mcp sdk auth patterns * fix(amazonq): log errors in OAuth discovery catch blocks instead of silently swallowing
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: aws-toolkit-automation <>
* perf(amazonq): cap context command payload and throttle indexing updates - Cap context commands sent to webview at 10,000 items - Throttle onIndexingInProgressChanged with 500ms coalescing - Cache full item list before applying cap for reuse - Add preservation property-based tests - Update unit tests for throttle behavior * chore: error * fix: newly added files are not be loaded * fix: bugfix * perf: handle context commands in server * perf: add server-side filtering for context commands in large repos * chore: bump language-server-runtimes, runtimes-types, and mynah-ui * chore: remove redundant debug log * fix: filter out externally deleted files from context command results Files deleted outside the IDE (e.g. git revert/checkout) were not removed from the cached context commands because LSP workspace file operation events only fire for IDE-initiated deletions. Add an fs.existsSync check when returning results to the client so stale entries are excluded regardless of how the file was removed. * chore: remove debug logs from context commands and indexing paths * fix: scope filterContextCommandsResponse to requesting tab Previously, filter responses updated contextCommands in all tabs, causing a search in one tab to overwrite the default list in others. Track the originating tabId and scope the store update accordingly. * fix: address PR review feedback for context command filtering
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
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
5 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):