Skip to content

Agentic mcp merge 2 #1539

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 59 commits into from
Jun 5, 2025
Merged

Conversation

ashishrp-aws
Copy link
Contributor

Problem

Solution

License

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

tsmithsz and others added 30 commits May 20, 2025 13:52
* Revert "fix: remove the unused center stop message and add comment"

This reverts commit 654a25a.

* Revert "fix: when user input a prompt, it wont have stop message before the new prompt"

This reverts commit f6e9904.
* fix: set source to 'IDE' for chat client

---------

Co-authored-by: Alice Koreman <[email protected]>
* feat: pass remote workspaceId in agentic chat API calls

* feat: removed dev logs

* feat: add unit test

* feat: bumping up dependency version

* chore: updating package-lock.json

* fix: install new streaming client correctly

---------

Co-authored-by: Ege Ozcan <[email protected]>
aws#1389 this change broke LSP initialization as the file does not add the required import for crypto.
Added the required import
…mpletion (aws#1402)

* feat(amazonq): integrate workspace context with inline completion

* fix: replace got with axios for s3 uploads in workspace context capability

---------

Co-authored-by: Jiatong Li <[email protected]>
Co-authored-by: Ege Ozcan <[email protected]>
* fix: resolve symlink of python dependency upload

* fix: bundle events from dependency watcher

* fix: correct watcher.close() with watcher.dispose()

* fix: fix dependency watcher event

* fix: add additional log for error cases of watcher and symlink resolver

---------

Co-authored-by: Jiatong Li <[email protected]>
* chore(release): release packages from branch main

* chore: apply missing package updates

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Natalia Durlik <[email protected]>
…bump runtimes (aws#1424)

This change bumps runtimes to include fix related to didWorkspaceChangeFolders handling in aws/language-server-runtimes#522
In addition this change makes a fix in the localProjectContextServer where onDidChangeWorkpaceFolders event didn't update the workspaceFolders list used for indexing. It now updates to reflect the change.
* fix: fix uncaught exception in workspaceFolderManager

* fix: fix agenticChatTriggerContexts test

* chore: set a filter to run SSPC on supported extensions

* fix: axios upload presigned url

* fix: update log comments of extension filter

---------

Co-authored-by: Jiatong Li <[email protected]>
Bumps the typescript-eslint group with 2 updates: [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) and [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser).


Updates `@typescript-eslint/eslint-plugin` from 8.31.0 to 8.32.1
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v8.32.1/packages/eslint-plugin)

Updates `@typescript-eslint/parser` from 8.31.0 to 8.32.1
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v8.32.1/packages/parser)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/eslint-plugin"
  dependency-version: 8.32.1
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: typescript-eslint
- dependency-name: "@typescript-eslint/parser"
  dependency-version: 8.32.1
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: typescript-eslint
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
In pagination cases, in a certain condition when user has made a decision before a
paginated response arrived to flare,  an extra discard UTD event will be sent after
an accept/reject event corresponding to a user action, this is incorrect
…s not stored properly (aws#1400)

`OnPromptInputOptionChange` event when the agentic mode button is toggled on and off, the mynahUI store was not updated properly to store the updated value. This resulted in "insert to cursor" option being disabled/hidden in a codeblock shown in an agentic mode OFF response.

Solution
With this change, on prompt option change event, the MynahUi store is now updated to preserve the latest value of "pair-programmer-mode" option. I verified the insert to cursor option now appears on toggle
…ws#1440)

* fix: properly tokenize command args using shlex.split() for Windows

* fix: handle built-in windows commands in validation check
…rics emitAgencticLoop_InvokeLLM (aws#1458)

* fix: flatten array into string before emitting telemetry metric

* fix: rename the toolName to toolNames for better readability
…take down server (aws#1464)

for example, if file is renamed from supported language to unsupported language,
or upload itself fails, the server crashes.
ege0zcan and others added 25 commits May 30, 2025 15:06
* chore: bump runtimes version to 0.2.89

* chore: bump chat client types dependency

---------

Co-authored-by: Supraja Venkatesh <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
* Improve the executeBash tool spec

* Remove unnecessary instructions
* feat: model selection for agentic chat

* move modelId to userInputMessage

* add modelId to sendTelemetryEvent

* support per-region selection

* update modelId values

* feat: add custom model exception handling

* merge main and adapt to new changes in runtime with new mynah

* change code to 500

* remove unwanted changes

* persist modelId selection in fs

* model change indicator

* keep model selection for other tabs

* fix tests

* update mynahui version

* remove region for now

* remove comment

* fix issues after merge

* only persist selection for the current tab

---------

Co-authored-by: Yaofu Zuo <[email protected]>
Fix Windows GrepSearch path
…t context (aws#1497)

* fix(amazonq): pagination request should also used truncated left/right context

also fixes a fallout that the function call should be used for isIndexingEnabled()

* fix: add tests
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
* feat: added configurable token cache location

- Add support for configuring token cache location through LSP initialization options
- Move default token cache from local .cache directory to $HOMEDIR/.aws/device-sso-lsp/cache
- Update README with configuration documentation
- Pass token cache location through the authentication flow components

* fix: use standard aws/sso/cache location
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
…1524)

webviews can be forced to be reloaded, which breaks history and related features that rely on
chat-db to have a correct 'view' of what the UI is currently showing.

mynah-ui will only send 'aws/chat/ready' once on initialize,
so we should not need to guard against restoring tab multiple times if a client is requesting this
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@ashishrp-aws ashishrp-aws requested a review from a team as a code owner June 5, 2025 21:35
@ashishrp-aws ashishrp-aws reopened this Jun 5, 2025
@ashishrp-aws ashishrp-aws merged commit a06bed8 into aws:agentic-mcp Jun 5, 2025
@ashishrp-aws ashishrp-aws deleted the agentic-mcp-merge-2 branch June 5, 2025 22:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.