fix for exiting fastly from cancellation

Author: ashishrp-aws

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

@@ -787,6 +787,7 @@ export class ChatController {
                             }
 
                             const output = await ToolUtils.invoke(tool, chatStream, triggerID)
+                            console.log('output', output)
                             ToolUtils.validateOutput(output, tool.type)
 
                             let status: ToolResultStatus = ToolResultStatus.SUCCESS
@@ -804,13 +805,21 @@ export class ChatController {
                                 status,
                             })
                         } catch (e: any) {
+                            if (this.isTriggerCancelled(triggerID)) {
+                                getLogger().debug(`Tool execution cancelled before invoke for tabID: ${tabID}`)
+                                return
+                            }
                             toolResults.push({
                                 content: [{ text: e.message }],
                                 toolUseId: toolUse.toolUseId,
                                 status: ToolResultStatus.ERROR,
                             })
                         }
                     } else {
+                        if (this.isTriggerCancelled(triggerID)) {
+                            getLogger().debug(`Tool execution cancelled before invoke for tabID: ${tabID}`)
+                            return
+                        }
                         const toolResult: ToolResult = result
                         toolResults.push(toolResult)
                     }

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

@@ -382,6 +382,11 @@ exec bash -c "
                         if (checkCancellationInterval) {
                             clearInterval(checkCancellationInterval)
                         }
+
+                        // Return from the function after cancellation
+                        reject(new Error('Command execution cancelled'))
+                        console.log('exiting the cancellation')
+                        return
                     }
                 }, 100) // Check every 100ms
             }