better abort handling

Author: shadowfax92

src/lib/agent/BrowserAgent.ts

@@ -779,13 +779,22 @@ export class BrowserAgent {
    */
   private _handleExecutionError(error: unknown, task: string): void {
     // Check if this is a user cancellation - handle silently
+    const isAbortError = error instanceof Error && error.name === 'AbortError';
+    const abortReason = this.executionContext.abortSignal.reason as any;
+    const isUserInitiated = abortReason?.userInitiated === true;
+    
     const isUserCancellation = error instanceof AbortError || 
                                this.executionContext.isUserCancellation() || 
-                               (error instanceof Error && error.name === "AbortError");
+                               (isAbortError && isUserInitiated);
 
     if (isUserCancellation) {
-      // Don't publish message here - already handled in _subscribeToExecutionStatus
-      // when the cancelled status event is received
+      // User-initiated cancellation - don't rethrow, let execution end gracefully
+      Logging.log('BrowserAgent', 'Execution cancelled by user');
+      return;  // Don't rethrow
+    } else if (isAbortError) {
+      // System abort (not user-initiated) - still throw
+      Logging.log('BrowserAgent', 'Execution aborted by system');
+      throw error;
     } else {
       // Log error metric with details
       const errorMessage = error instanceof Error ? error.message : String(error);

src/lib/agent/ChatAgent.ts

@@ -132,9 +132,23 @@ export class ChatAgent {
       Logging.log('ChatAgent', 'Q&A response completed')
 
     } catch (error) {
-      if (error instanceof AbortError) {
-        Logging.log('ChatAgent', 'Execution aborted by user')
-        // Don't publish message here - already handled in _subscribeToExecutionStatus
+      // Check if this is a user cancellation - handle silently
+      const isAbortError = error instanceof Error && error.name === 'AbortError'
+      const abortReason = this.executionContext.abortSignal.reason as any
+      const isUserInitiated = abortReason?.userInitiated === true
+      
+      const isUserCancellation = error instanceof AbortError || 
+                                 this.executionContext.isUserCancellation() || 
+                                 (isAbortError && isUserInitiated)
+      
+      if (isUserCancellation) {
+        // User-initiated cancellation - don't rethrow, let execution end gracefully
+        Logging.log('ChatAgent', 'Execution cancelled by user')
+        return  // Don't rethrow
+      } else if (isAbortError) {
+        // System abort (not user-initiated) - still throw
+        Logging.log('ChatAgent', 'Execution aborted by system')
+        throw error
       } else {
         const errorMessage = error instanceof Error ? error.message : String(error)
         const errorType = error instanceof Error ? error.name : 'UnknownError'
@@ -150,8 +164,8 @@ export class ChatAgent {
 
         Logging.log('ChatAgent', `Execution failed: ${errorMessage}`, 'error')
         this.pubsub.publishMessage(PubSub.createMessage(`Error: ${errorMessage}`, 'error'))
+        throw error
       }
-      throw error
     }
   }
 

src/lib/execution/Execution.ts

@@ -143,6 +143,7 @@ export class Execution {
       return
     }
 
+
     // Send pause message to the user
     if (this.pubsub) {
       this.pubsub.publishMessage({
@@ -153,8 +154,9 @@ export class Execution {
       })
     }
 
-    // Abort the current execution
-    this.currentAbortController.abort()
+    // Abort the current execution with reason
+    const abortReason = { userInitiated: true, message: 'User cancelled execution' }
+    this.currentAbortController.abort(abortReason)
     this.currentAbortController = null
 
     Logging.log('Execution', `Cancelled execution ${this.id}`)
@@ -168,7 +170,8 @@ export class Execution {
   reset(): void {
     // Cancel current execution if running
     if (this.currentAbortController) {
-      this.currentAbortController.abort()
+    const abortReason = { userInitiated: true, message: 'User cancelled execution' }
+      this.currentAbortController.abort(abortReason)
       this.currentAbortController = null
     }