fix for stopping bash executions

Author: ashishrp-aws

packages/core/src/amazonq/webview/ui/apps/cwChatConnector.ts

@@ -44,6 +44,7 @@ export class Connector extends BaseConnector {
     private readonly onChatAnswerUpdated
     private readonly onAsyncEventProgress
     private chatItems: Map<string, Map<string, ChatItem>> = new Map() // tabId -> messageId -> ChatItem
+    private tabIdToTriggerId: Map<string, string> = new Map() // tabId -> triggerId
 
     override getTabType(): TabType {
         return 'cwc'
@@ -135,6 +136,10 @@ export class Connector extends BaseConnector {
                 }
             }
 
+            if (messageData.tabID && messageData.triggerID && messageData.triggerID !== '') {
+                this.storetriggerId(messageData.tabID, messageData.triggerID)
+            }
+
             if (answer.messageId) {
                 this.storeChatItem(messageData.tabID, answer.messageId, answer)
             }
@@ -213,6 +218,14 @@ export class Connector extends BaseConnector {
         this.chatItems.get(tabId)?.set(messageId, { ...item })
     }
 
+    private storetriggerId(tabId: string, triggerId: string): void {
+        this.tabIdToTriggerId.set(tabId, triggerId)
+    }
+
+    private getTriggerId(tabId: string): string | undefined {
+        return this.tabIdToTriggerId.get(tabId)
+    }
+
     private getCurrentChatItem(tabId: string, messageId: string | undefined): ChatItem | undefined {
         if (!messageId) {
             return
@@ -351,7 +364,7 @@ export class Connector extends BaseConnector {
             formSelectedValues: action.formItemValues,
             tabType: this.getTabType(),
             tabID: tabId,
-            triggerId: triggerId,
+            triggerId: this.getTriggerId(tabId),
         })
 
         if (

packages/core/src/amazonq/webview/ui/connector.ts

@@ -744,7 +744,6 @@ export class Connector {
                         tabType: 'cwc',
                     })
                 } else {
-                    console.log('messageId:', messageId, 'event Id:', eventId)
                     this.cwChatConnector.onCustomFormAction(tabId, messageId ?? '', action, messageId ?? '')
                 }
                 break

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

@@ -709,9 +709,7 @@ export class ChatController {
         this.editorContextExtractor
             .extractContextForTrigger('ChatMessage')
             .then(async (context) => {
-                console.log('message for tool action:', message)
                 const triggerID = message.triggerId
-
                 // Check if this trigger has already been cancelled
                 if (this.isTriggerCancelled(triggerID)) {
                     return

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

@@ -249,16 +249,13 @@ export class ExecuteBash {
      * Check if the trigger has been cancelled using ConversationTracker
      */
     private isTriggerCancelled(): boolean {
-        // console.log('trigger cancellation check is happening')
         if (!this.triggerId) {
             return false
         }
 
         // Import here to avoid circular dependency
         const { ConversationTracker } = require('../storages/conversationTracker')
         const cancellationtracker = ConversationTracker.getInstance()
-        // console.log('trigger cancellation status:', cancellationtracker.getTokenForTrigger(this.triggerId))
-        // console.log('concealltion status:', cancellationtracker.isTriggerCancelled(this.triggerId))
         return cancellationtracker.isTriggerCancelled(this.triggerId)
     }
 
@@ -275,24 +272,26 @@ export class ExecuteBash {
 
             // Modify the command to make it more cancellable by using process groups
             // This ensures that when we kill the parent process, all child processes are also terminated
-            // The trap ensures cleanup on SIGTERM/SIGINT
+            // The trap ensures cleanup on SIGTERM/SIGINT and sends SIGTERM to the child process group
             const modifiedCommand = `
 exec bash -c "
   # Create a new process group
   set -m
   
   # Set up trap to kill the entire process group on exit
-  trap 'exit' TERM INT
+  trap 'kill -TERM -\\$CMD_PID 2>/dev/null || true; exit' TERM INT
   
   # Run the actual command in background
-  ${this.command} &
+  # Use '()' to create a subshell which becomes the process group leader
+  (${this.command}) &
   
   # Store the PID
   CMD_PID=\\$!
   
   # Wait for the command to finish
   wait \\$CMD_PID
-  exit \\$?
+  exit_code=\\$?
+  exit \\$exit_code
 "
 `
 
@@ -343,13 +342,40 @@ exec bash -c "
                 checkCancellationInterval = setInterval(() => {
                     if (this.isTriggerCancelled()) {
                         this.logger.debug('Trigger cancellation detected, killing child process')
-                        this.childProcess?.stop(false, 'SIGTERM')
+
+                        // First try to kill the entire process group
+                        if (this.childProcess && this.childProcess.pid) {
+                            try {
+                                // On Unix systems, negative PID kills the process group
+                                this.logger.debug(`Sending SIGTERM to process group -${this.childProcess.pid}`)
+                                process.kill(-this.childProcess.pid, 'SIGTERM')
+                            } catch (err) {
+                                this.logger.debug(`Failed to kill process group: ${err}`)
+                                // Fall back to regular process termination
+                                this.childProcess?.stop(false, 'SIGTERM')
+                            }
+                        } else {
+                            this.childProcess?.stop(false, 'SIGTERM')
+                        }
 
                         // After a short delay, force kill with SIGKILL if still running
                         setTimeout(() => {
                             if (this.childProcess && !this.childProcess.stopped) {
                                 this.logger.debug('Process still running after SIGTERM, sending SIGKILL')
-                                this.childProcess.stop(true, 'SIGKILL')
+
+                                // Try to kill the process group with SIGKILL
+                                if (this.childProcess.pid) {
+                                    try {
+                                        this.logger.debug(`Sending SIGKILL to process group -${this.childProcess.pid}`)
+                                        process.kill(-this.childProcess.pid, 'SIGKILL')
+                                    } catch (err) {
+                                        this.logger.debug(`Failed to kill process group with SIGKILL: ${err}`)
+                                        // Fall back to regular process termination
+                                        this.childProcess.stop(true, 'SIGKILL')
+                                    }
+                                } else {
+                                    this.childProcess.stop(true, 'SIGKILL')
+                                }
                             }
                         }, 500)
 
@@ -365,7 +391,11 @@ exec bash -c "
                     cwd: this.workingDirectory,
                     stdio: ['pipe', 'pipe', 'pipe'],
                     // Set detached to true to create a new process group
+                    // This allows us to kill the entire process group later
                     detached: true,
+                    // On Windows, we need to create a new process group
+                    // On Unix, we need to create a new session
+                    ...(process.platform === 'win32' ? { windowsVerbatimArguments: true } : {}),
                 },
                 collect: false,
                 waitForStreams: true,

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

@@ -14,7 +14,6 @@ import {
     fsReadToolResponseSize,
 } from './toolShared'
 import { ListDirectory, ListDirectoryParams } from './listDirectory'
-import { ConversationTracker } from '../storages/conversationTracker'
 
 export enum ToolType {
     FsRead = 'fsRead',
@@ -65,8 +64,7 @@ export class ToolUtils {
             case ToolType.ExecuteBash:
                 // If triggerId is provided, update the tool's triggerId
                 if (triggerId) {
-                    ;(tool.tool as ExecuteBash).triggerId =
-                        ConversationTracker.getInstance().getTriggerIdForToolUseId(triggerId)
+                    ;(tool.tool as ExecuteBash).triggerId = triggerId
                 }
                 return tool.tool.invoke(updates)
             case ToolType.ListDirectory:

packages/core/src/codewhispererChat/view/connector/connector.ts

@@ -518,7 +518,6 @@ export class AppToWebViewMessageDispatcher {
     }
 
     public sendCustomFormActionMessage(message: CustomFormActionMessage) {
-        console.log('sendCustomFormActionMessage', message)
         this.appsToWebViewMessagePublisher.publish(message)
     }
 

packages/core/src/shared/utilities/processUtils.ts

@@ -426,13 +426,38 @@ export class ChildProcess {
         const command = this.#command
         const pid = this.pid()
         if (!this.stopped) {
-            child.kill(signal)
+            // Try to kill the process group if possible (Unix systems only)
+            if (process.platform !== 'win32' && child.pid && child.spawnargs && child.spawnfile) {
+                try {
+                    // On Unix systems, negative PID kills the process group
+                    this.#log.debug(`Attempting to kill process group -${child.pid} with ${signal || 'SIGTERM'}`)
+                    process.kill(-child.pid, signal || 'SIGTERM')
+                } catch (err) {
+                    this.#log.debug(`Failed to kill process group: ${err}, falling back to regular kill`)
+                    child.kill(signal)
+                }
+            } else {
+                child.kill(signal)
+            }
 
             if (force === true) {
                 waitUntil(async () => this.stopped, { timeout: ChildProcess.stopTimeout, interval: 200, truthy: true })
                     .then((stopped) => {
                         if (!stopped) {
-                            child.kill('SIGKILL')
+                            // Try to kill the process group with SIGKILL if possible
+                            if (process.platform !== 'win32' && child.pid) {
+                                try {
+                                    this.#log.debug(`Attempting to kill process group -${child.pid} with SIGKILL`)
+                                    process.kill(-child.pid, 'SIGKILL')
+                                } catch (err) {
+                                    this.#log.debug(
+                                        `Failed to kill process group with SIGKILL: ${err}, falling back to regular kill`
+                                    )
+                                    child.kill('SIGKILL')
+                                }
+                            } else {
+                                child.kill('SIGKILL')
+                            }
                         }
                     })
                     .catch((e) => {