Fix: Removing the spinner component after Reject and code diff is clicked

Author: laileni-aws

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

@@ -777,9 +777,7 @@ export class ChatController {
             }
             const tool: Tool = result
             await ToolUtils.validate(tool)
-
-            const chatStream = new ChatStream(this.messenger, message.tabID, randomUUID(), clonedToolUse)
-            await ToolUtils.invoke(tool, chatStream)
+            await ToolUtils.invoke(tool)
 
             // Check if fileExists=false, If yes, return instead of showing broken diff experience.
             if (!tempFilePath) {

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

@@ -65,8 +65,19 @@ export class ExecuteBash {
         }
     }
 
-    public async invoke(updates: Writable): Promise<InvokeOutput> {
+    public async invoke(updates?: Writable): Promise<InvokeOutput> {
         this.logger.info(`Invoking bash command: "${this.command}" in cwd: "${this.workingDirectory}"`)
+        if (!updates) {
+            // updates passed as undefined only in the code diff is clicked to avoid showing Q Streaming spinner component to the user.
+            return new Promise(async (resolve) => {
+                resolve({
+                    output: {
+                        kind: OutputKind.Json,
+                        content: '',
+                    },
+                })
+            })
+        }
 
         return new Promise(async (resolve, reject) => {
             this.logger.debug(`Spawning process with command: bash -c "${this.command}" (cwd=${this.workingDirectory})`)

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

@@ -57,7 +57,7 @@ export class FsRead {
         updates.end()
     }
 
-    public async invoke(updates: Writable): Promise<InvokeOutput> {
+    public async invoke(updates?: Writable): Promise<InvokeOutput> {
         try {
             const fileUri = vscode.Uri.file(this.fsPath)
 

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

@@ -44,7 +44,7 @@ export class FsWrite {
 
     constructor(private readonly params: FsWriteParams) {}
 
-    public async invoke(updates: Writable): Promise<InvokeOutput> {
+    public async invoke(updates?: Writable): Promise<InvokeOutput> {
         const sanitizedPath = sanitizePath(this.params.path)
 
         switch (this.params.command) {

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

@@ -43,7 +43,7 @@ export class ToolUtils {
         }
     }
 
-    static async invoke(tool: Tool, updates: Writable): Promise<InvokeOutput> {
+    static async invoke(tool: Tool, updates?: Writable): Promise<InvokeOutput> {
         switch (tool.type) {
             case ToolType.FsRead:
                 return tool.tool.invoke(updates)

packages/core/src/test/codewhispererChat/tools/toolShared.test.ts

@@ -90,7 +90,7 @@ describe('ToolUtils', function () {
             const result = await ToolUtils.invoke(tool, mockWritable as unknown as Writable)
 
             assert.deepStrictEqual(result, expectedOutput)
-            assert(mockFsRead.invoke.calledOnceWith(mockWritable))
+            assert(mockFsRead.invoke.calledOnceWith(mockWritable as unknown as Writable | undefined))
         })
 
         it('delegates to FsWrite tool invoke method', async function () {
@@ -106,7 +106,7 @@ describe('ToolUtils', function () {
             const result = await ToolUtils.invoke(tool, mockWritable as unknown as Writable)
 
             assert.deepStrictEqual(result, expectedOutput)
-            assert(mockFsWrite.invoke.calledOnceWith(mockWritable))
+            assert(mockFsWrite.invoke.calledOnceWith(mockWritable as unknown as Writable | undefined))
         })
 
         it('delegates to ExecuteBash tool invoke method', async function () {
@@ -122,7 +122,7 @@ describe('ToolUtils', function () {
             const result = await ToolUtils.invoke(tool, mockWritable as unknown as Writable)
 
             assert.deepStrictEqual(result, expectedOutput)
-            assert(mockExecuteBash.invoke.calledOnceWith(mockWritable))
+            assert(mockExecuteBash.invoke.calledOnceWith(mockWritable as unknown as Writable | undefined))
         })
     })