WIP

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

Author: ThomasK33

src/browser/components/ChatInput/index.tsx

@@ -185,15 +185,15 @@ export const ChatInput: React.FC<ChatInputProps> = (props) => {
   const creationState = useCreationWorkspace(
     variant === "creation"
       ? {
-        projectPath: props.projectPath,
-        onWorkspaceCreated: props.onWorkspaceCreated,
-      }
+          projectPath: props.projectPath,
+          onWorkspaceCreated: props.onWorkspaceCreated,
+        }
       : {
-        // Dummy values for workspace variant (never used)
-        projectPath: "",
-        // eslint-disable-next-line @typescript-eslint/no-empty-function
-        onWorkspaceCreated: () => { },
-      }
+          // Dummy values for workspace variant (never used)
+          projectPath: "",
+          // eslint-disable-next-line @typescript-eslint/no-empty-function
+          onWorkspaceCreated: () => {},
+        }
   );
 
   const focusMessageInput = useCallback(() => {
@@ -756,11 +756,15 @@ export const ChatInput: React.FC<ChatInputProps> = (props) => {
               }
 
               // Only show success toast if prompt sent successfully (or no prompt to send)
-              setToast({
-                id: Date.now().toString(),
-                type: exitCode === 0 ? "success" : "warning",
-                message: toastMessage,
-              });
+              // AND if there is a message to show (either from file or fallback)
+              // If it was empty/success (common for silent scripts), don't show empty toast
+              if (toastMessage && toastMessage.trim().length > 0) {
+                setToast({
+                  id: Date.now().toString(),
+                  type: exitCode === 0 ? "success" : "warning",
+                  message: toastMessage,
+                });
+              }
 
               // Log the full output to console for debugging
               if (toolResult.output) {

src/node/services/agentSession.ts

@@ -505,6 +505,20 @@ export class AgentSession {
     } satisfies AgentSessionChatEvent);
   }
 
+  private _isScriptRunning = false;
+
+  public get isScriptRunning(): boolean {
+    return this._isScriptRunning;
+  }
+
+  public setScriptRunning(value: boolean): void {
+    this._isScriptRunning = value;
+  }
+
+  public processQueue(): void {
+    this.sendQueuedMessages();
+  }
+
   queueMessage(message: string, options?: SendMessageOptions & { imageParts?: ImagePart[] }): void {
     this.assertNotDisposed("queueMessage");
     this.messageQueue.add(message, options);

src/node/services/ipcMain.ts

@@ -960,8 +960,11 @@ export class IpcMain {
           // Update recency on user message (fire and forget)
           void this.extensionMetadata.updateRecency(workspaceId);
 
-          // Queue new messages during streaming, but allow edits through
-          if (this.aiService.isStreaming(workspaceId) && !options?.editMessageId) {
+          // Queue new messages during streaming OR script execution, but allow edits through
+          if (
+            (this.aiService.isStreaming(workspaceId) || session.isScriptRunning) &&
+            !options?.editMessageId
+          ) {
             session.queueMessage(message, options);
             return Ok(undefined);
           }
@@ -1111,8 +1114,8 @@ export class IpcMain {
           const historyResult = await this.historyService.getHistory(workspaceId);
           const deletedSequences = historyResult.success
             ? historyResult.data
-              .map((msg) => msg.metadata?.historySequence ?? -1)
-              .filter((s) => s >= 0)
+                .map((msg) => msg.metadata?.historySequence ?? -1)
+                .filter((s) => s >= 0)
             : [];
 
           // Clear entire history
@@ -1254,6 +1257,9 @@ export class IpcMain {
             ? metadata.projectPath
             : runtimeInstance.getWorkspacePath(metadata.projectPath, metadata.name);
 
+          const session = this.getOrCreateSession(workspaceId);
+          session.setScriptRunning(true);
+
           try {
             // 1. Create and persist script execution message immediately
             // This ensures the user sees "Executing script..." in the timeline while it runs
@@ -1333,6 +1339,9 @@ export class IpcMain {
           } catch (error) {
             const message = error instanceof Error ? error.message : String(error);
             return Err(`Failed to execute script: ${message}`);
+          } finally {
+            session.setScriptRunning(false);
+            session.processQueue();
           }
         } catch (error) {
           const message = error instanceof Error ? error.message : String(error);
@@ -1920,10 +1929,10 @@ export class IpcMain {
     config:
       | { type: "local"; workspacePath: string }
       | {
-        type: "ssh";
-        sshConfig: Extract<RuntimeConfig, { type: "ssh" }>;
-        remotePath: string;
-      }
+          type: "ssh";
+          sshConfig: Extract<RuntimeConfig, { type: "ssh" }>;
+          remotePath: string;
+        }
   ): Promise<void> {
     const isSSH = config.type === "ssh";