WIP

Signed-off-by: Thomas Kosiewski <tk@coder.com>

Author: ThomasK33

src/node/services/agentSession.ts

@@ -505,14 +505,26 @@ export class AgentSession {
     } satisfies AgentSessionChatEvent);
   }
 
-  private _isScriptRunning = false;
+  private scriptAbortController: AbortController | null = null;
 
   public get isScriptRunning(): boolean {
-    return this._isScriptRunning;
+    return this.scriptAbortController !== null;
   }
 
-  public setScriptRunning(value: boolean): void {
-    this._isScriptRunning = value;
+  public startScriptExecution(): AbortSignal {
+    this.scriptAbortController = new AbortController();
+    return this.scriptAbortController.signal;
+  }
+
+  public endScriptExecution(): void {
+    this.scriptAbortController = null;
+  }
+
+  public abortScript(): void {
+    if (this.scriptAbortController) {
+      this.scriptAbortController.abort();
+      this.scriptAbortController = null;
+    }
   }
 
   public processQueue(): void {

src/node/services/ipcMain.ts

@@ -1027,6 +1027,10 @@ export class IpcMain {
         try {
           const session = this.getOrCreateSession(workspaceId);
           const stopResult = await session.interruptStream();
+
+          // Also abort any running scripts
+          session.abortScript();
+
           if (!stopResult.success) {
             log.error("Failed to stop stream:", stopResult.error);
             return { success: false, error: stopResult.error };
@@ -1258,7 +1262,7 @@ export class IpcMain {
             : runtimeInstance.getWorkspacePath(metadata.projectPath, metadata.name);
 
           const session = this.getOrCreateSession(workspaceId);
-          session.setScriptRunning(true);
+          const signal = session.startScriptExecution();
 
           try {
             // 1. Create and persist script execution message immediately
@@ -1305,7 +1309,8 @@ export class IpcMain {
               args,
               {}, // Extra env
               secretsToRecord(projectSecrets),
-              300 // timeout
+              300, // timeout
+              signal
             );
 
             if (!execResult.success) {
@@ -1340,7 +1345,7 @@ export class IpcMain {
             const message = error instanceof Error ? error.message : String(error);
             return Err(`Failed to execute script: ${message}`);
           } finally {
-            session.setScriptRunning(false);
+            session.endScriptExecution();
             session.processQueue();
           }
         } catch (error) {