From ca39bab356856b3fcdf50460d3b302de33d9ee23 Mon Sep 17 00:00:00 2001
From: Ismail Pelaseyed <homanp@gmail.com>
Date: Mon, 21 Jul 2025 10:43:18 +0200
Subject: [PATCH] add press 'esc' to cancel agent (#10)

---
 src/agent/grok-agent.ts        | 53 ++++++++++++++++++++++++++++++++++
 src/hooks/use-input-handler.ts |  1 +
 2 files changed, 54 insertions(+)

diff --git a/src/agent/grok-agent.ts b/src/agent/grok-agent.ts
index 81676a6..eb0353e 100644
--- a/src/agent/grok-agent.ts
+++ b/src/agent/grok-agent.ts
@@ -34,6 +34,7 @@ export class GrokAgent extends EventEmitter {
   private chatHistory: ChatEntry[] = [];
   private messages: GrokMessage[] = [];
   private tokenCounter: TokenCounter;
+  private abortController: AbortController | null = null;
 
   constructor(apiKey: string) {
     super();
@@ -267,6 +268,9 @@ Current working directory: ${process.cwd()}`,
   async *processUserMessageStream(
     message: string
   ): AsyncGenerator<StreamingChunk, void, unknown> {
+    // Create new abort controller for this request
+    this.abortController = new AbortController();
+    
     // Add user message to conversation
     const userEntry: ChatEntry = {
       type: "user",
@@ -292,6 +296,16 @@ Current working directory: ${process.cwd()}`,
     try {
       // Agent loop - continue until no more tool calls or max rounds reached
       while (toolRounds < maxToolRounds) {
+        // Check if operation was cancelled
+        if (this.abortController?.signal.aborted) {
+          yield {
+            type: "content",
+            content: "\n\n[Operation cancelled by user]",
+          };
+          yield { type: "done" };
+          return;
+        }
+
         // Stream response and accumulate
         const stream = this.grokClient.chatStream(this.messages, GROK_TOOLS);
         let accumulatedMessage: any = {};
@@ -299,6 +313,16 @@ Current working directory: ${process.cwd()}`,
         let toolCallsYielded = false;
 
         for await (const chunk of stream) {
+          // Check for cancellation in the streaming loop
+          if (this.abortController?.signal.aborted) {
+            yield {
+              type: "content",
+              content: "\n\n[Operation cancelled by user]",
+            };
+            yield { type: "done" };
+            return;
+          }
+
           if (!chunk.choices?.[0]) continue;
 
           // Accumulate the message using reducer
@@ -371,6 +395,16 @@ Current working directory: ${process.cwd()}`,
 
           // Execute tools
           for (const toolCall of accumulatedMessage.tool_calls) {
+            // Check for cancellation before executing each tool
+            if (this.abortController?.signal.aborted) {
+              yield {
+                type: "content",
+                content: "\n\n[Operation cancelled by user]",
+              };
+              yield { type: "done" };
+              return;
+            }
+
             const result = await this.executeTool(toolCall);
 
             const toolResultEntry: ChatEntry = {
@@ -417,6 +451,16 @@ Current working directory: ${process.cwd()}`,
 
       yield { type: "done" };
     } catch (error: any) {
+      // Check if this was a cancellation
+      if (this.abortController?.signal.aborted) {
+        yield {
+          type: "content",
+          content: "\n\n[Operation cancelled by user]",
+        };
+        yield { type: "done" };
+        return;
+      }
+
       const errorEntry: ChatEntry = {
         type: "assistant",
         content: `Sorry, I encountered an error: ${error.message}`,
@@ -428,6 +472,9 @@ Current working directory: ${process.cwd()}`,
         content: errorEntry.content,
       };
       yield { type: "done" };
+    } finally {
+      // Clean up abort controller
+      this.abortController = null;
     }
   }
 
@@ -498,4 +545,10 @@ Current working directory: ${process.cwd()}`,
     this.tokenCounter.dispose();
     this.tokenCounter = createTokenCounter(model);
   }
+
+  abortCurrentOperation(): void {
+    if (this.abortController) {
+      this.abortController.abort();
+    }
+  }
 }
diff --git a/src/hooks/use-input-handler.ts b/src/hooks/use-input-handler.ts
index 8ba1e95..1c9063c 100644
--- a/src/hooks/use-input-handler.ts
+++ b/src/hooks/use-input-handler.ts
@@ -327,6 +327,7 @@ Available models: ${modelNames.join(", ")}`,
         return;
       }
       if (isProcessing || isStreaming) {
+        agent.abortCurrentOperation();
         setIsProcessing(false);
         setIsStreaming(false);
         setTokenCount(0);