fix(amazonq): Grouping read tool messages under contextList #6975

laileni-aws · 2025-04-09T18:08:52Z

Problem

We show read tool message for each file read which is occupying the entire chat with these messages which is not super important.

Solution

Group all the read tool messaged under ContextList.

Treat all work as PUBLIC. Private feature/x branches will not be squash-merged at release time.
Your code changes must meet the guidelines in CONTRIBUTING.md.
License: I confirm that my contribution is made under the terms of the Apache 2.0 license.

github-actions · 2025-04-09T18:09:05Z

This pull request modifies code in src/* but no tests were added/updated.
- Confirm whether tests should be added or ensure the PR description explains why tests are not required.
This pull request implements a feat or fix, so it must include a changelog entry (unless the fix is for an unreleased feature). Review the changelog guidelines.
- Note: beta or "experiment" features that have active users should announce fixes in the changelog.
- If this is not a feature or fix, use an appropriate type from the title guidelines. For example, telemetry-only changes should use the telemetry type.

packages/core/src/codewhispererChat/controllers/chat/controller.ts

packages/core/src/codewhispererChat/controllers/chat/messenger/messenger.ts

packages/core/src/codewhispererChat/tools/chatStream.ts

ctlai95 · 2025-04-09T20:17:59Z

This doesn't group listDirectory messages yet, right?

packages/core/src/codewhispererChat/tools/chatStream.ts

ctlai95 · 2025-04-09T20:22:24Z

packages/core/src/codewhispererChat/controllers/chat/messenger/messenger.ts

+        if (toolUse?.name === ToolType.FsRead) {
+            this.dispatcher.sendToolMessage(


I think it might be cleaner if you move this check inside sendToolMessage

I am using sendToolMessage for FsRead and ListDirectory and sendChatMessage for FsWrite and ExecuteBash tool output.

but can we not always use sendToolMessage and then inside that function have a condition to use onChatAnswerUpdated or onChatAnswerReceived

Where do we have this conditional logic?
We can not do this in webview ?
I think not in connector.ts too So, messenger will be the best place to do this!

laileni-aws · 2025-04-09T23:33:17Z

/retryBuilds

ctlai95 · 2025-04-10T00:20:48Z

packages/core/src/codewhispererChat/controllers/chat/messenger/messenger.ts

+        if (toolUse?.name === ToolType.FsRead || toolUse?.name === ToolType.ListDirectory) {
+            return this.sendReadAndListDirToolMessage(toolUse, session, tabID, triggerID, messageIdToUpdate)
+        }


nit: this is still confusing, I think the condition should not happen in this function and always call processToolMessage

ctlai95

Approving to unblock, please follow up in a future PR

…ile names in contextList

## Problem - Reverting PR: #6975 as this is causing regression in some cases. ## Solution --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). - License: I confirm that my contribution is made under the terms of the Apache 2.0 license.

- We show read tool message for each file read which is occupying the entire chat with these messages which is not super important. - Group all the read tool messaged under ContextList. ![image](https://github.com/user-attachments/assets/194e4ca1-7645-4419-8b9b-b5ac9a58279f) --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). - License: I confirm that my contribution is made under the terms of the Apache 2.0 license.

laileni-aws and others added 2 commits April 9, 2025 11:05

Grouping read tool messages together.

5aace55

Merge branch 'aws:feature/agentic-chat' into feature/agentic-chat

47f12c6

laileni-aws marked this pull request as ready for review April 9, 2025 18:14

laileni-aws requested a review from a team as a code owner April 9, 2025 18:14

jguoamz reviewed Apr 9, 2025

View reviewed changes

packages/core/src/codewhispererChat/controllers/chat/controller.ts Outdated Show resolved Hide resolved

packages/core/src/codewhispererChat/controllers/chat/messenger/messenger.ts Show resolved Hide resolved

UX Polish

234e0c5

laileni-aws force-pushed the feature/agentic-chat branch from 652ae34 to 234e0c5 Compare April 9, 2025 19:40

laileni-aws requested a review from jguoamz April 9, 2025 19:41