feat(amazonq):streaming diff animation #7662

MarcoWang3 · 2025-07-14T19:02:27Z

Problem

The previous diff animation system is totally based on the VSC side to detect the file change events and render the diffAnimation. So all the diff animations can be only rendered after the codes are generated. Previous version uses customized webview for rendering the diff animation.

Solution

Update the mechanism of the current diff animation system: receive stream chunks from the language servers side and render partial diff animation based on them for fsWrite events. Receive a complete chunk for fsReplace and render diff animation line by line. Use VSC's built in diffview for rendering the diff animations.

Demo

create.a.file.mov

edit.a.file.mov

- Add messages.ts with streaming diff animation support - Add complete diffAnimation module with: - Animation queue management - Chat processing capabilities - Diff analysis and animation control - File system management - VSCode integration - Webview management - Streaming diff controller

github-actions · 2025-07-14T19:02:42Z

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.

github-actions · 2025-07-14T19:03:45Z

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.

- Eliminated duplicate temp file creation and diff view opening logic in StreamingDiffController - Consolidated session creation logic in DiffAnimationHandler - Created reusable cleanup helper function in Messages - Removed duplicate getCursorState function - Reduced codebase by 53+ lines of duplicate code

- Created comprehensive test suite for StreamingDiffController, DiffAnimationHandler, and AnimationQueueManager - Tests cover initialization, session management, content streaming, and queue operations - Uses Mocha/Sinon testing framework consistent with existing codebase - Includes sanity tests to improve code coverage for Codecov requirements

- Update diffAnimationHandler for better streaming control - Enhance streamingDiffController with improved state management - Refactor chat messages handling for diff animations

laileni-aws · 2025-08-04T16:27:51Z

packages/amazonq/src/lsp/chat/diffAnimation/streamingDiffController.ts

+     * Clean up all temporary files for a chat session
+     */
+    async cleanupChatSession(): Promise<void> {
+        const tempFilesToCleanup: string[] = []


nit:

const tempFilePaths: string[] = []; // Collect from active streaming sessions this.activeStreamingSessions.forEach(session => { if (session.tempFilePath) { tempFilePaths.push(session.tempFilePath); } }); // Collect from fs replace sessions this.fsReplaceSessionsByFile.forEach(session => { if (session.tempFilePath) { tempFilePaths.push(session.tempFilePath); } });

laileni-aws · 2025-08-04T16:30:21Z

packages/amazonq/src/lsp/chat/messages.ts


-    languageClient.onNotification(chatUpdateNotificationType.method, (params: ChatUpdateParams) => {
+    languageClient.onNotification(chatUpdateNotificationType.method, async (params: ChatUpdateParams) => {
+        if ((params.data as any)?.streamingChunk) {


Move this to separate function or file to make this more readable?

I have moved the streaming chunk processing logic to a seperate function!

laileni-aws · 2025-08-04T16:31:48Z

packages/amazonq/src/lsp/chat/messages.ts

+                    streamingChunk.isComplete || false
+                )
+
+                if (streamingChunk.isComplete) {


Can we avoid nested if statements?
Something like this?

if (!streamingChunk.isComplete || !streamingChunk.filePath) { return; } const toolUseIds = initializingStreamsByFile.get(streamingChunk.filePath); if (!toolUseIds) { return; } toolUseIds.delete(streamingChunk.toolUseId); if (toolUseIds.size === 0) { initializingStreamsByFile.delete(streamingChunk.filePath); }

Applies to above code too

laileni-aws · 2025-08-07T21:03:11Z

packages/amazonq/src/lsp/chat/diffAnimation/streamingDiffController.ts

+     * Scroll editor to line
+     */
+    private scrollEditorToLine(editor: vscode.TextEditor, line: number): void {
+        const scrollLine = line


We dont need this?

laileni-aws · 2025-08-07T21:04:39Z

packages/amazonq/src/lsp/chat/diffAnimation/streamingDiffController.ts

+            session.activeLineController.clear()
+
+            // Save the temp file one final time
+            const diffEditor = session.activeDiffEditor


This is not required var?

laileni-aws · 2025-08-07T21:06:07Z

packages/amazonq/src/lsp/chat/diffAnimation/streamingDiffController.ts

+    private async cleanupSessions(toolUseIds: Set<string>): Promise<void> {
+        for (const toolUseId of toolUseIds) {
+            const sessionToCleanup = this.activeStreamingSessions.get(toolUseId)
+            if (sessionToCleanup) {


but:
Can add continue here!

packages/amazonq/src/lsp/chat/diffAnimation/streamingDiffController.ts

…t-vscode into feature/StreamingDiffAnimation

…arcoWang3/aws-toolkit-vscode into feature/StreamingDiffAnimation

laileni-aws · 2025-08-08T00:44:50Z

packages/amazonq/src/lsp/chat/messages.ts

+
+    const processedChunks = new Map<string, Set<string>>() // toolUseId -> Set of content hashes
+
+    // Initialize DiffAnimationHandler


Why do we need this ?

Sometimes there are duplicated chunks are received and this is used for avoiding process them for multiple times

ashishrp-aws · 2025-08-11T18:51:41Z

packages/amazonq/src/lsp/chat/messages.ts

+/**
+ * Handle streaming chunk processing for diff animations
+ */
+async function handleStreamingChunk(


can we move this function to another class?

MarcoWang3 added 2 commits July 14, 2025 10:01

feat: streaming diff animation improvements

dd5e4c8

MarcoWang3 changed the title ~~Feature/streaming diff animation~~ feature:streaming diff animation Jul 14, 2025

MarcoWang3 closed this Jul 14, 2025

MarcoWang3 reopened this Jul 14, 2025

MarcoWang3 closed this Jul 14, 2025

MarcoWang3 changed the title ~~feature:streaming diff animation~~ feat:streaming diff animation Jul 14, 2025

MarcoWang3 reopened this Jul 14, 2025

MarcoWang3 changed the title ~~feat:streaming diff animation~~ feat(amazonq):streaming diff animation Jul 14, 2025

MarcoWang3 closed this Jul 14, 2025

MarcoWang3 reopened this Jul 14, 2025

MarcoWang3 closed this Jul 14, 2025

MarcoWang3 reopened this Jul 14, 2025

MarcoWang3 added 2 commits July 14, 2025 13:03

feat: improve diff animation streaming functionality

51fddf5

- Update diffAnimationHandler for better streaming control - Enhance streamingDiffController with improved state management - Refactor chat messages handling for diff animations

MarcoWang3 changed the base branch from master to feature/code-diff August 1, 2025 20:20

MarcoWang3 added 3 commits August 3, 2025 22:24

clean redundant codes for static diff view

c6f0fa4

clean logs and redundant codes

531584f

remove unnecessary changes

3c4a09b

MarcoWang3 changed the base branch from feature/code-diff to master August 4, 2025 08:18

MarcoWang3 changed the base branch from master to feature/code-diff August 4, 2025 08:19

Merge upstream/feature/code-diff into streaming diff animation branch

d906edf

MarcoWang3 force-pushed the feature/StreamingDiffAnimation branch from 467e84b to d906edf Compare August 4, 2025 08:29

MarcoWang3 added 2 commits August 4, 2025 01:35

remove unused types

a2ced9f

add feature flag for diffAnimation

1a75593

MarcoWang3 marked this pull request as ready for review August 4, 2025 15:59

MarcoWang3 requested a review from a team as a code owner August 4, 2025 15:59

laileni-aws reviewed Aug 4, 2025

View reviewed changes

MarcoWang3 added 4 commits August 4, 2025 12:19

address pr comments

62e9817

edit the comments

10541ca

fix the error handling issue

7783a7e

rename the temp file for animations

88bde6f

laileni-aws self-requested a review August 6, 2025 00:33

simplify the code base

120aba1

MarcoWang3 force-pushed the feature/StreamingDiffAnimation branch from 96ced1d to 120aba1 Compare August 6, 2025 17:14

Merge branch 'feature/code-diff' into feature/StreamingDiffAnimation

e389d92

laileni-aws reviewed Aug 7, 2025

View reviewed changes

packages/amazonq/src/lsp/chat/diffAnimation/streamingDiffController.ts Show resolved Hide resolved

MarcoWang3 added 3 commits August 7, 2025 14:21

Merge branch 'feature/code-diff' of https://github.com/aws/aws-toolki…

65fd3f8

…t-vscode into feature/StreamingDiffAnimation

Merge branch 'feature/StreamingDiffAnimation' of https://github.com/M…

75dde78

…arcoWang3/aws-toolkit-vscode into feature/StreamingDiffAnimation

address PR comments and add change logs

a170402

MarcoWang3 requested a review from laileni-aws August 7, 2025 21:43

laileni-aws reviewed Aug 8, 2025

View reviewed changes

laileni-aws approved these changes Aug 8, 2025

View reviewed changes

ashishrp-aws reviewed Aug 11, 2025

View reviewed changes

fix(amazonq): refactor the code base

6cd3f62

MarcoWang3 requested a review from ashishrp-aws August 11, 2025 20:40

MarcoWang3 added 2 commits August 11, 2025 15:44

fix(amazonq): refactor codes

f8ece81

Merge branch 'feature/code-diff' into feature/StreamingDiffAnimation

3301909

ashishrp-aws approved these changes Aug 13, 2025

View reviewed changes

ashishrp-aws added 2 commits August 12, 2025 17:33

Merge branch 'feature/code-diff' into feature/StreamingDiffAnimation

4ccdc5e

Merge branch 'feature/code-diff' into feature/StreamingDiffAnimation

8f709cc

ashishrp-aws merged commit 117cded into aws:feature/code-diff Aug 13, 2025
21 of 22 checks passed


		const processedChunks = new Map<string, Set<string>>() // toolUseId -> Set of content hashes

		// Initialize DiffAnimationHandler

feat(amazonq):streaming diff animation #7662

feat(amazonq):streaming diff animation #7662

Uh oh!

Conversation

MarcoWang3 commented Jul 14, 2025 • edited by laileni-aws Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Problem

Solution

Demo

Uh oh!

github-actions bot commented Jul 14, 2025

Uh oh!

github-actions bot commented Jul 14, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

MarcoWang3 commented Jul 14, 2025 •

edited by laileni-aws

Loading