2 files changed, 65 insertions, 7 deletions

diff --git a/packages/cli/src/ui/hooks/shellCommandProcessor.ts b/packages/cli/src/ui/hooks/shellCommandProcessor.ts
index 59e337b4..d6c837d1 100644
--- a/packages/cli/src/ui/hooks/shellCommandProcessor.ts
+++ b/packages/cli/src/ui/hooks/shellCommandProcessor.ts
@@ -37,7 +37,7 @@ export const useShellCommandProcessor = (
    * @returns True if the query was handled as a shell command, false otherwise.
    */
   const handleShellCommand = useCallback(
-    (rawQuery: PartListUnion): boolean => {
+    (rawQuery: PartListUnion, signal?: AbortSignal): boolean => {
       if (typeof rawQuery !== 'string') {
         return false;
       }
@@ -120,6 +120,7 @@ export const useShellCommandProcessor = (
           const child = spawn('bash', ['-c', commandToExecute], {
             cwd: targetDir,
             stdio: ['ignore', 'pipe', 'pipe'],
+            detached: true, // Important for process group killing
           });
 
           let exited = false;
@@ -148,18 +149,75 @@ export const useShellCommandProcessor = (
             error = err;
           });
 
-          child.on('exit', (code, signal) => {
+          const abortHandler = () => {
+            if (child.pid && !exited) {
+              onDebugMessage(
+                `Aborting shell command (PID: ${child.pid}) due to signal.`,
+              );
+              try {
+                // attempt to SIGTERM process group (negative PID)
+                // if SIGTERM fails after 200ms, attempt SIGKILL
+                process.kill(-child.pid, 'SIGTERM');
+                setTimeout(() => {
+                  // if SIGTERM fails, attempt SIGKILL
+                  try {
+                    if (child.pid && !exited) {
+                      process.kill(-child.pid, 'SIGKILL');
+                    }
+                  } catch (_e) {
+                    console.error(
+                      `failed to kill shell process ${child.pid}: ${_e}`,
+                    );
+                  }
+                }, 200);
+              } catch (_e) {
+                // if group kill fails, fall back to killing just the main process
+                try {
+                  if (child.pid) {
+                    child.kill('SIGKILL');
+                  }
+                } catch (_e) {
+                  console.error(
+                    `failed to kill shell process ${child.pid}: ${_e}`,
+                  );
+                }
+              }
+            }
+          };
+
+          if (signal) {
+            if (signal.aborted) {
+              abortHandler();
+              // No need to add listener if already aborted
+            } else {
+              signal.addEventListener('abort', abortHandler, { once: true });
+            }
+          }
+
+          child.on('exit', (code, processSignal) => {
             exited = true;
+            if (signal) {
+              signal.removeEventListener('abort', abortHandler);
+            }
             setPendingHistoryItem(null);
             output = output.trim() || '(Command produced no output)';
             if (error) {
               const text = `${error.message.replace(commandToExecute, rawQuery)}\n${output}`;
               addItemToHistory({ type: 'error', text }, userMessageTimestamp);
-            } else if (code !== 0) {
+            } else if (code !== null && code !== 0) {
               const text = `Command exited with code ${code}\n${output}`;
               addItemToHistory({ type: 'error', text }, userMessageTimestamp);
-            } else if (signal) {
-              const text = `Command terminated with signal ${signal}\n${output}`;
+            } else if (signal?.aborted) {
+              addItemToHistory(
+                {
+                  type: 'info',
+                  text: `Command was cancelled.\n${output}`,
+                },
+                userMessageTimestamp,
+              );
+            } else if (processSignal) {
+              const text = `Command terminated with signal ${processSignal}
+${output}`;
               addItemToHistory({ type: 'error', text }, userMessageTimestamp);
             } else {
               addItemToHistory(
diff --git a/packages/cli/src/ui/hooks/useGeminiStream.ts b/packages/cli/src/ui/hooks/useGeminiStream.ts
index afaf0ccd..66fb317a 100644
--- a/packages/cli/src/ui/hooks/useGeminiStream.ts
+++ b/packages/cli/src/ui/hooks/useGeminiStream.ts
@@ -199,7 +199,7 @@ export const useGeminiStream = (
           return { queryToSend: null, shouldProceed: false }; // Handled by scheduling the tool
         }
 
-        if (shellModeActive && handleShellCommand(trimmedQuery)) {
+        if (shellModeActive && handleShellCommand(trimmedQuery, signal)) {
           return { queryToSend: null, shouldProceed: false };
         }
 
@@ -492,7 +492,7 @@ export const useGeminiStream = (
       const userMessageTimestamp = Date.now();
       setShowHelp(false);
 
-      abortControllerRef.current ??= new AbortController();
+      abortControllerRef.current = new AbortController();
       const signal = abortControllerRef.current.signal;
 
       const { queryToSend, shouldProceed } = await prepareQueryForGemini(