WIP

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

Author: ThomasK33

src/browser/stores/WorkspaceStore.ts

@@ -341,11 +341,13 @@ export class WorkspaceStore {
       const messages = aggregator.getAllMessages();
       const metadata = this.workspaceMetadata.get(workspaceId);
 
+      const canInterrupt = activeStreams.length > 0 || aggregator.hasPendingScriptExecution();
+
       return {
         name: metadata?.name ?? workspaceId, // Fall back to ID if metadata missing
         messages: aggregator.getDisplayedMessages(),
         queuedMessage: this.queuedMessages.get(workspaceId) ?? null,
-        canInterrupt: activeStreams.length > 0,
+        canInterrupt,
         isCompacting: aggregator.isCompacting(),
         loading: !hasMessages && !isCaughtUp,
         muxMessages: messages,

src/browser/utils/messages/StreamingMessageAggregator.test.ts

@@ -422,6 +422,72 @@ describe("StreamingMessageAggregator", () => {
       }
     });
 
+    test("tracks pending script executions until a result arrives", () => {
+      const aggregator = new StreamingMessageAggregator(TEST_CREATED_AT);
+      const timestamp = Date.now();
+
+      const pendingScript = createMuxMessage("script-2", "user", "Run script", {
+        historySequence: 1,
+        timestamp,
+        muxMetadata: {
+          type: "script-execution",
+          id: "script-exec-2",
+          historySequence: 1,
+          timestamp,
+          command: "/script wait",
+          scriptName: "wait",
+          args: [],
+        },
+      });
+
+      aggregator.addMessage(pendingScript);
+      expect(aggregator.hasPendingScriptExecution()).toBe(true);
+
+      const completedScript = createMuxMessage("script-2", "user", "Run script", {
+        historySequence: 1,
+        timestamp,
+        muxMetadata: {
+          type: "script-execution",
+          id: "script-exec-2",
+          historySequence: 1,
+          timestamp,
+          command: "/script wait",
+          scriptName: "wait",
+          args: [],
+          result: BASE_SCRIPT_RESULT,
+        },
+      });
+
+      aggregator.addMessage(completedScript);
+      expect(aggregator.hasPendingScriptExecution()).toBe(false);
+    });
+
+    test("clears pending script executions when messages are deleted", () => {
+      const aggregator = new StreamingMessageAggregator(TEST_CREATED_AT);
+      const timestamp = Date.now();
+
+      const pendingScript = createMuxMessage("script-3", "user", "Run script", {
+        historySequence: 7,
+        timestamp,
+        muxMetadata: {
+          type: "script-execution",
+          id: "script-exec-3",
+          historySequence: 7,
+          timestamp,
+          command: "/script cleanup",
+          scriptName: "cleanup",
+          args: [],
+        },
+      });
+
+      aggregator.addMessage(pendingScript);
+      expect(aggregator.hasPendingScriptExecution()).toBe(true);
+
+      const deleteEvent: DeleteMessage = { type: "delete", historySequences: [7] };
+      aggregator.handleDeleteMessage(deleteEvent);
+
+      expect(aggregator.hasPendingScriptExecution()).toBe(false);
+    });
     test("removes script logs when history is truncated", () => {
       const aggregator = new StreamingMessageAggregator(TEST_CREATED_AT);
 

src/browser/utils/messages/StreamingMessageAggregator.ts

@@ -100,6 +100,7 @@ export class StreamingMessageAggregator {
   // (or the user retries) so retry UI/backoff logic doesn't misfire on send failures.
 
   private pendingStreamStartTime: number | null = null;
+  private pendingScriptExecutions = new Set<string>();
 
   // Workspace creation timestamp (used for recency calculation)
   // REQUIRED: Backend guarantees every workspace has createdAt via config.ts
@@ -214,6 +215,7 @@ export class StreamingMessageAggregator {
 
     // Just store the message - backend assigns historySequence
     this.messages.set(message.id, message);
+    this.syncScriptExecutionState(message);
     this.invalidateCache();
   }
 
@@ -228,6 +230,7 @@ export class StreamingMessageAggregator {
     // First, add all messages to the map
     for (const message of messages) {
       this.messages.set(message.id, message);
+      this.syncScriptExecutionState(message);
     }
 
     // Then, reconstruct derived state from the most recent assistant message
@@ -277,6 +280,22 @@ export class StreamingMessageAggregator {
   private setPendingStreamStartTime(time: number | null): void {
     this.pendingStreamStartTime = time;
   }
+  hasPendingScriptExecution(): boolean {
+    return this.pendingScriptExecutions.size > 0;
+  }
+
+  private syncScriptExecutionState(message: MuxMessage): void {
+    const muxMetadata = message.metadata?.muxMetadata;
+    if (muxMetadata?.type === "script-execution" && muxMetadata.result === undefined) {
+      this.pendingScriptExecutions.add(message.id);
+    } else {
+      this.pendingScriptExecutions.delete(message.id);
+    }
+  }
+
+  private clearScriptExecutionState(messageId: string): void {
+    this.pendingScriptExecutions.delete(messageId);
+  }
 
   getActiveStreams(): StreamingContext[] {
     return Array.from(this.activeStreams.values());
@@ -324,6 +343,7 @@ export class StreamingMessageAggregator {
   clear(): void {
     this.messages.clear();
     this.activeStreams.clear();
+    this.pendingScriptExecutions.clear();
     this.streamSequenceCounter = 0;
     this.invalidateCache();
   }
@@ -339,6 +359,7 @@ export class StreamingMessageAggregator {
       const historySeq = message.metadata?.historySequence;
       if (historySeq !== undefined && sequencesToDelete.has(historySeq)) {
         this.messages.delete(messageId);
+        this.clearScriptExecutionState(messageId);
       }
     }
 
@@ -377,6 +398,7 @@ export class StreamingMessageAggregator {
     });
 
     this.messages.set(data.messageId, streamingMessage);
+    this.syncScriptExecutionState(streamingMessage);
     this.invalidateCache();
   }
 
@@ -454,6 +476,7 @@ export class StreamingMessageAggregator {
       };
 
       this.messages.set(data.messageId, message);
+      this.syncScriptExecutionState(message);
 
       // Clean up stream-scoped state (active stream tracking, TODOs)
       this.cleanupStreamState(data.messageId);
@@ -702,6 +725,7 @@ export class StreamingMessageAggregator {
             }
             for (const removeId of messagesToRemove) {
               this.messages.delete(removeId);
+              this.clearScriptExecutionState(removeId);
             }
             break; // Found and handled the conflict
           }