undo

Author: ethanndickson

src/node/services/agentSession.ts

@@ -396,10 +396,7 @@ export class AgentSession {
   }
 
   private attachAiListeners(): void {
-    const forward = (
-      event: string,
-      handler: (payload: WorkspaceChatMessage) => void | Promise<void>
-    ) => {
+  const forward = (event: string, handler: (payload: WorkspaceChatMessage) => void) => {
       const wrapped = (...args: unknown[]) => {
         const [payload] = args;
         if (
@@ -410,7 +407,7 @@ export class AgentSession {
         ) {
           return;
         }
-        void handler(payload as WorkspaceChatMessage);
+        handler(payload as WorkspaceChatMessage);
       };
       this.aiListeners.push({ event, handler: wrapped });
       this.aiService.on(event, wrapped as never);
@@ -424,17 +421,16 @@ export class AgentSession {
     forward("reasoning-delta", (payload) => this.emitChatEvent(payload));
     forward("reasoning-end", (payload) => this.emitChatEvent(payload));
 
-    forward("stream-end", async (payload) => {
+    forward("stream-end", (payload) => {
+      this.emitChatEvent(payload);
       // Stream end: auto-send queued messages
       if (!this.messageQueue.isEmpty()) {
         const { message, options } = this.messageQueue.produceMessage();
         this.messageQueue.clear();
         this.emitQueuedMessageChanged();
 
-        await this.sendMessage(message, options);
+        void this.sendMessage(message, options);
       }
-      // Don't update the frontend until the message is sent
-      this.emitChatEvent(payload);
     });
 
     forward("stream-abort", (payload) => {