@tiflis-io/tiflis-code-workstation 0.3.28 → 0.3.30

package/dist/main.js

@@ -1398,7 +1398,7 @@ function getMessageType(data) {
 }
 
 // src/infrastructure/websocket/tunnel-client.ts
-var TunnelClient = class {
+var TunnelClient = class _TunnelClient {
   config;
   callbacks;
   logger;
@@ -1412,6 +1412,8 @@ var TunnelClient = class {
   reconnectTimeout = null;
   registrationTimeout = null;
   messageBuffer = [];
+  static MAX_SEND_RETRIES = 3;
+  static SEND_RETRY_DELAY_MS = 100;
   constructor(config2, callbacks) {
     this.config = config2;
     this.callbacks = callbacks;
@@ -1514,8 +1516,9 @@ var TunnelClient = class {
     this.messageBuffer = [];
   }
   /**
-   * Sends a message to the tunnel (for forwarding to clients).
-   * Detects send failures and triggers reconnection.
+   * Sends a message to the tunnel (for forwarding to clients) with retry logic (FIX #3).
+   * Buffers during reconnection, retries on transient failures with exponential backoff.
+   * Returns true if send was successful or queued for retry.
    */
   send(message) {
     if (this.state !== "registered" || !this.ws) {
@@ -1528,18 +1531,55 @@ var TunnelClient = class {
     if (this.ws.readyState !== WebSocket.OPEN) {
       this.logger.warn(
         { readyState: this.ws.readyState },
-        "Socket not open, triggering reconnection"
+        "Socket not open, buffering message and triggering reconnection"
       );
+      this.messageBuffer.push(message);
       this.handleSendFailure();
+      return true;
+    }
+    return this.sendWithRetry(message, 0);
+  }
+  /**
+   * FIX #3: Send with exponential backoff retry.
+   * On failure, schedules retry with exponential delay (100ms, 200ms, 400ms).
+   */
+  sendWithRetry(message, attempt) {
+    if (!this.ws || this.ws.readyState !== WebSocket.OPEN) {
+      if (attempt === 0) {
+        this.messageBuffer.push(message);
+      }
       return false;
     }
-    this.ws.send(message, (error) => {
-      if (error) {
-        this.logger.error({ error }, "Send failed, triggering reconnection");
-        this.handleSendFailure();
+    try {
+      this.ws.send(message, (error) => {
+        if (error) {
+          if (attempt < _TunnelClient.MAX_SEND_RETRIES) {
+            const delay = _TunnelClient.SEND_RETRY_DELAY_MS * Math.pow(2, attempt);
+            this.logger.debug(
+              { attempt: attempt + 1, delay, errorType: error.name },
+              "Send failed, scheduling retry with exponential backoff"
+            );
+            setTimeout(() => {
+              this.sendWithRetry(message, attempt + 1);
+            }, delay);
+          } else {
+            this.logger.error(
+              { error: error.message, attempts: attempt + 1 },
+              "Send failed after all retries, buffering message"
+            );
+            this.messageBuffer.push(message);
+            this.handleSendFailure();
+          }
+        }
+      });
+      return true;
+    } catch (error) {
+      this.logger.error({ error: error.message }, "Unexpected error in send");
+      if (attempt === 0) {
+        this.messageBuffer.push(message);
       }
-    });
-    return true;
+      return false;
+    }
   }
   /**
    * Handles send failure by disconnecting and scheduling reconnection.
@@ -3055,39 +3095,32 @@ var HeadlessAgentExecutor = class extends EventEmitter {
       cwd: this.workingDir,
       env: {
         ...shellEnv,
-        // Apply alias env vars (e.g., CLAUDE_CONFIG_DIR)
         ...aliasEnvVars,
-        // Ensure proper terminal environment
         TERM: "xterm-256color",
-        // Disable interactive prompts
         CI: "true"
       },
       stdio: ["ignore", "pipe", "pipe"],
-      // stdin ignored, stdout/stderr piped
-      detached: true,
-      // Create new process group for clean termination
-      // Ensure child doesn't interfere with parent's signal handling
-      // @ts-expect-error - Node.js 16+ option
-      ignoreParentSignals: true
+      detached: true
     });
-    this.subprocess.stdout?.on("data", (data) => {
+    const proc = this.subprocess;
+    proc.stdout?.on("data", (data) => {
       if (this.isKilled) return;
       const text2 = data.toString();
       this.emit("stdout", text2);
     });
-    this.subprocess.stderr?.on("data", (data) => {
+    proc.stderr?.on("data", (data) => {
       if (this.isKilled) return;
       const text2 = data.toString();
       this.emit("stderr", text2);
     });
-    this.subprocess.on("exit", (code) => {
+    proc.on("exit", (code) => {
       this.clearExecutionTimeout();
       if (!this.isKilled) {
         this.emit("exit", code);
       }
       this.subprocess = null;
     });
-    this.subprocess.on("error", (error) => {
+    proc.on("error", (error) => {
       this.clearExecutionTimeout();
       if (!this.isKilled) {
         this.emit("error", error);
@@ -5067,13 +5100,58 @@ var SubscriptionService = class {
 };
 
 // src/application/services/message-broadcaster-impl.ts
-var MessageBroadcasterImpl = class {
+var MessageBroadcasterImpl = class _MessageBroadcasterImpl {
   deps;
   logger;
+  /** FIX #4: Buffer messages for devices during auth flow */
+  authBuffers = /* @__PURE__ */ new Map();
+  static AUTH_BUFFER_TTL_MS = 5e3;
+  // 5 second buffer TTL
   constructor(deps) {
     this.deps = deps;
     this.logger = deps.logger.child({ service: "broadcaster" });
   }
+  /**
+   * FIX #4: Buffers a message for a device during auth flow.
+   * Called when subscribing clients are not yet authenticated.
+   * Messages are buffered with TTL and flushed when auth completes.
+   */
+  bufferMessageForAuth(deviceId, sessionId, message) {
+    if (!this.authBuffers.has(deviceId)) {
+      this.authBuffers.set(deviceId, []);
+    }
+    const buffer = this.authBuffers.get(deviceId) ?? [];
+    buffer.push({ sessionId, message, timestamp: Date.now() });
+    const now = Date.now();
+    const filtered = buffer.filter(
+      (item) => now - item.timestamp < _MessageBroadcasterImpl.AUTH_BUFFER_TTL_MS
+    );
+    this.authBuffers.set(deviceId, filtered);
+    this.logger.debug(
+      { deviceId, bufferSize: filtered.length },
+      "Buffered message for authenticating device"
+    );
+  }
+  /**
+   * FIX #4: Flushes buffered messages for a device after authentication.
+   * Called from main.ts after subscription restore completes.
+   * Returns buffered messages so they can be sent to subscribed sessions.
+   */
+  flushAuthBuffer(deviceId) {
+    const buffer = this.authBuffers.get(deviceId) ?? [];
+    this.authBuffers.delete(deviceId);
+    const now = Date.now();
+    const validMessages = buffer.filter(
+      (item) => now - item.timestamp < _MessageBroadcasterImpl.AUTH_BUFFER_TTL_MS
+    );
+    if (validMessages.length > 0) {
+      this.logger.info(
+        { deviceId, messageCount: validMessages.length },
+        "Flushing auth buffer - delivering buffered messages"
+      );
+    }
+    return validMessages;
+  }
   /**
    * Broadcasts a message to all connected clients via tunnel.
    * The tunnel handles client filtering and delivery.
@@ -5113,21 +5191,97 @@ var MessageBroadcasterImpl = class {
   }
   /**
    * Broadcasts a message to all clients subscribed to a session (by session ID string).
-   * Sends targeted messages to each subscriber individually via forward.to_device.
+   * Sends targeted messages to each subscriber in parallel with timeout.
+   * Prevents slow clients from blocking others.
+   *
+   * FIX #4: Also buffers messages for unauthenticated subscribers during auth flow.
    */
-  broadcastToSubscribers(sessionId, message) {
+  async broadcastToSubscribers(sessionId, message) {
     const session = new SessionId(sessionId);
     const subscribers = this.deps.clientRegistry.getSubscribers(session);
     const authenticatedSubscribers = subscribers.filter(
       (c) => c.isAuthenticated
     );
     if (authenticatedSubscribers.length === 0) {
+      const unauthenticatedCount = subscribers.length - authenticatedSubscribers.length;
+      if (unauthenticatedCount > 0) {
+        this.logger.debug(
+          { sessionId, unauthenticatedCount },
+          "Subscribers are authenticating - buffering message for delivery after auth"
+        );
+        for (const client of subscribers) {
+          if (!client.isAuthenticated) {
+            this.bufferMessageForAuth(client.deviceId.value, sessionId, message);
+          }
+        }
+      } else {
+        let messageType = "unknown";
+        try {
+          const parsed = JSON.parse(message);
+          messageType = parsed.type ?? "unknown";
+        } catch {
+        }
+        this.logger.debug(
+          { sessionId, messageType },
+          "No subscribers found for session"
+        );
+      }
       return;
     }
-    for (const client of authenticatedSubscribers) {
-      this.deps.tunnelClient.sendToDevice(client.deviceId.value, message);
+    const SEND_TIMEOUT_MS = 2e3;
+    this.logger.debug(
+      { sessionId, subscriberCount: authenticatedSubscribers.length },
+      "Broadcasting message to subscribers"
+    );
+    const sendPromises = authenticatedSubscribers.map(async (client) => {
+      try {
+        await Promise.race([
+          new Promise((resolve2, reject) => {
+            const sent = this.deps.tunnelClient.sendToDevice(
+              client.deviceId.value,
+              message
+            );
+            if (sent) {
+              resolve2();
+            } else {
+              reject(new Error(`sendToDevice returned false for ${client.deviceId.value}`));
+            }
+          }),
+          new Promise(
+            (_, reject) => setTimeout(
+              () => reject(new Error(`Send timeout for ${client.deviceId.value}`)),
+              SEND_TIMEOUT_MS
+            )
+          )
+        ]);
+        this.logger.debug(
+          { deviceId: client.deviceId.value, sessionId },
+          "Message sent to subscriber"
+        );
+      } catch (error) {
+        this.logger.warn(
+          {
+            deviceId: client.deviceId.value,
+            sessionId,
+            error: error instanceof Error ? error.message : String(error)
+          },
+          "Failed to send to subscriber (timeout or error)"
+        );
+      }
+    });
+    const results = await Promise.allSettled(sendPromises);
+    const failedCount = results.filter((r) => r.status === "rejected").length;
+    if (failedCount > 0) {
+      this.logger.warn(
+        { sessionId, totalSubscribers: authenticatedSubscribers.length, failedCount },
+        "Some subscribers failed to receive message"
+      );
     }
   }
+  getAuthenticatedDeviceIds() {
+    const clients = this.deps.clientRegistry.getAll();
+    return clients.filter((c) => c.isAuthenticated).map((c) => c.deviceId.value);
+  }
 };
 
 // src/infrastructure/persistence/repositories/message-repository.ts
@@ -6619,6 +6773,7 @@ import { EventEmitter as EventEmitter4 } from "events";
 import { ChatOpenAI } from "@langchain/openai";
 import { createReactAgent } from "@langchain/langgraph/prebuilt";
 import { HumanMessage, AIMessage, isAIMessage } from "@langchain/core/messages";
+import AsyncLock from "async-lock";
 
 // src/infrastructure/agents/supervisor/tools/workspace-tools.ts
 import { tool } from "@langchain/core/tools";
@@ -7524,7 +7679,7 @@ function formatSize(bytes) {
 }
 
 // src/infrastructure/agents/supervisor/supervisor-agent.ts
-var SupervisorAgent = class extends EventEmitter4 {
+var SupervisorAgent = class _SupervisorAgent extends EventEmitter4 {
   logger;
   agent;
   getMessageBroadcaster;
@@ -7537,6 +7692,11 @@ var SupervisorAgent = class extends EventEmitter4 {
   isProcessingCommand = false;
   /** Timestamp when current execution started (for race condition protection) */
   executionStartedAt = 0;
+  clearContextLock = new AsyncLock();
+  static CLEAR_CONTEXT_TIMEOUT_MS = 1e4;
+  // 10 seconds
+  /** FIX #6: Broadcast acknowledgment tracking */
+  broadcastAcknowledgments = /* @__PURE__ */ new Map();
   constructor(config2) {
     super();
     this.logger = config2.logger.child({ component: "SupervisorAgent" });
@@ -7562,7 +7722,11 @@ var SupervisorAgent = class extends EventEmitter4 {
         config2.workspacesRoot,
         config2.getMessageBroadcaster,
         config2.getChatHistoryService,
-        () => this.clearContext(),
+        () => {
+          this.clearContext().catch((error) => {
+            this.logger.error({ error }, "Failed to clear supervisor context");
+          });
+        },
         terminateSessionCallback
       ),
       ...createFilesystemTools(config2.workspacesRoot)
@@ -7824,27 +7988,86 @@ var SupervisorAgent = class extends EventEmitter4 {
     this.logger.info("Global conversation history cleared");
   }
   /**
-   * Clears supervisor context completely:
-   * - In-memory conversation history
-   * - Persistent history in database
-   * - Notifies all connected clients
+   * Clears supervisor context completely with multi-device synchronization:
+   * - Acquires lock to prevent concurrent execution during clear
+   * - Cancels active execution streams
+   * - Clears in-memory conversation history
+   * - Clears persistent history in database
+   * - Broadcasts notification to all clients with ack tracking (FIX #6, #9)
+   */
+  async clearContext() {
+    await this.clearContextLock.acquire("clear", async () => {
+      this.logger.info({ isExecuting: this.isExecuting }, "Acquiring lock for context clear");
+      if (this.isExecuting || this.isProcessingCommand) {
+        this.logger.info("Active execution detected, cancelling before clear");
+        this.cancel();
+        await new Promise((resolve2) => setTimeout(resolve2, 50));
+      }
+      this.conversationHistory = [];
+      this.isCancelled = false;
+      const chatHistoryService = this.getChatHistoryService?.();
+      if (chatHistoryService) {
+        try {
+          chatHistoryService.clearSupervisorHistory();
+          this.logger.debug("Persistent supervisor history cleared");
+        } catch (error) {
+          this.logger.error({ error }, "Failed to clear persistent supervisor history");
+        }
+      }
+      const broadcaster = this.getMessageBroadcaster?.();
+      if (broadcaster) {
+        const broadcastId = `clear_${Date.now()}_${Math.random().toString(36).slice(2, 9)}`;
+        const clearNotification = JSON.stringify({
+          type: "supervisor.context_cleared",
+          payload: { timestamp: Date.now(), broadcast_id: broadcastId }
+        });
+        try {
+          const deviceIds = new Set(broadcaster.getAuthenticatedDeviceIds());
+          if (deviceIds.size > 0) {
+            this.broadcastAcknowledgments.set(broadcastId, {
+              deviceIds,
+              timestamp: Date.now(),
+              timeout: setTimeout(() => {
+                const ack = this.broadcastAcknowledgments.get(broadcastId);
+                if (ack && ack.deviceIds.size > 0) {
+                  this.logger.warn({
+                    broadcastId,
+                    missingDevices: Array.from(ack.deviceIds)
+                  }, "Context clear broadcast - missing acks from devices");
+                }
+                this.broadcastAcknowledgments.delete(broadcastId);
+              }, 5e3)
+              // 5 second timeout
+            });
+          }
+          broadcaster.broadcastToAll(clearNotification);
+          this.logger.info({
+            broadcastId,
+            deviceCount: deviceIds.size
+          }, "Broadcasted context cleared notification to all clients");
+        } catch (error) {
+          this.logger.error({ error }, "Failed to broadcast context cleared");
+        }
+      } else {
+        this.logger.warn("MessageBroadcaster not available");
+      }
+      this.logger.info("Supervisor context cleared (lock released)");
+    }, { timeout: _SupervisorAgent.CLEAR_CONTEXT_TIMEOUT_MS });
+  }
+  /**
+   * FIX #6: Records acknowledgment from a device for context clear broadcast.
    */
-  clearContext() {
-    this.conversationHistory = [];
-    this.isCancelled = false;
-    const chatHistoryService = this.getChatHistoryService?.();
-    if (chatHistoryService) {
-      chatHistoryService.clearSupervisorHistory();
-    }
-    const broadcaster = this.getMessageBroadcaster?.();
-    if (broadcaster) {
-      const clearNotification = JSON.stringify({
-        type: "supervisor.context_cleared",
-        payload: { timestamp: Date.now() }
-      });
-      broadcaster.broadcastToAll(clearNotification);
+  recordClearAck(broadcastId, deviceId) {
+    const ack = this.broadcastAcknowledgments.get(broadcastId);
+    if (ack) {
+      ack.deviceIds.delete(deviceId);
+      this.logger.debug({ broadcastId, deviceId, remaining: ack.deviceIds.size }, "Received clear ack");
+      if (ack.deviceIds.size === 0) {
+        clearTimeout(ack.timeout);
+        this.broadcastAcknowledgments.delete(broadcastId);
+        this.logger.info({ broadcastId }, "All devices acknowledged context clear");
+      }
     }
-    this.logger.info("Supervisor context cleared (in-memory, persistent, and clients notified)");
   }
   /**
    * Resets the cancellation state.
@@ -8339,9 +8562,15 @@ var MockSupervisorAgent = class extends EventEmitter5 {
   getConversationHistory() {
     return [...this.conversationHistory];
   }
-  /**
-   * Sleep utility.
-   */
+  clearContext() {
+    this.conversationHistory = [];
+    this.isCancelled = false;
+    this.logger.info("Mock context cleared");
+    return Promise.resolve();
+  }
+  // eslint-disable-next-line @typescript-eslint/no-empty-function
+  recordClearAck(_broadcastId, _deviceId) {
+  }
   sleep(ms) {
     return new Promise((resolve2) => setTimeout(resolve2, ms));
   }
@@ -9145,7 +9374,7 @@ function handleTunnelMessage(rawMessage, tunnelClient, messageBroadcaster, creat
     );
   }
 }
-function handleAuthMessageViaTunnel(data, tunnelClient, authenticateClient, logger, subscriptionService) {
+function handleAuthMessageViaTunnel(data, tunnelClient, authenticateClient, logger, subscriptionService, messageBroadcaster) {
   const authResult = AuthMessageSchema.safeParse(data);
   if (!authResult.success) {
     logger.warn(
@@ -9175,6 +9404,32 @@ function handleAuthMessageViaTunnel(data, tunnelClient, authenticateClient, logg
         );
       }
     }
+    if (messageBroadcaster) {
+      const bufferedMessages = messageBroadcaster.flushAuthBuffer(deviceId);
+      if (bufferedMessages.length > 0) {
+        logger.info(
+          { deviceId, messageCount: bufferedMessages.length },
+          "Flushing buffered messages after subscription restore"
+        );
+        (async () => {
+          for (const bufferedMsg of bufferedMessages) {
+            try {
+              await messageBroadcaster.broadcastToSubscribers(
+                bufferedMsg.sessionId,
+                bufferedMsg.message
+              );
+            } catch (error) {
+              logger.error(
+                { error, deviceId, sessionId: bufferedMsg.sessionId },
+                "Failed to send buffered message"
+              );
+            }
+          }
+        })().catch((error) => {
+          logger.error({ error, deviceId }, "Error flushing buffered messages");
+        });
+      }
+    }
     const responseJson = JSON.stringify(result);
     if (tunnelClient.send(responseJson)) {
       logger.info(
@@ -9413,7 +9668,7 @@ async function bootstrap() {
     }
   };
   const createMessageHandlers = () => ({
-    auth: (socket, message) => {
+    auth: async (socket, message) => {
       const authMessage = message;
       const deviceId = authMessage.payload.device_id;
       const result = authenticateClient.execute({
@@ -9431,6 +9686,21 @@ async function bootstrap() {
           );
         }
       }
+      if (broadcaster) {
+        const bufferedMessages = broadcaster.flushAuthBuffer(deviceId);
+        if (bufferedMessages.length > 0) {
+          logger.info(
+            { deviceId, messageCount: bufferedMessages.length },
+            "Flushing buffered messages after subscription restore"
+          );
+          for (const bufferedMsg of bufferedMessages) {
+            await broadcaster.broadcastToSubscribers(
+              bufferedMsg.sessionId,
+              bufferedMsg.message
+            );
+          }
+        }
+      }
       sendToDevice(socket, deviceId, JSON.stringify(result));
       return Promise.resolve();
     },
@@ -9875,13 +10145,13 @@ async function bootstrap() {
       return Promise.resolve();
     },
     // Clear supervisor conversation history (global)
-    "supervisor.clear_context": (socket, message) => {
+    "supervisor.clear_context": async (socket, message) => {
       const clearMessage = message;
       const directClient = clientRegistry.getBySocket(socket);
       const tunnelClient2 = clearMessage.device_id ? clientRegistry.getByDeviceId(new DeviceId(clearMessage.device_id)) : void 0;
       const isAuthenticated = directClient?.isAuthenticated ?? tunnelClient2?.isAuthenticated;
       if (isAuthenticated) {
-        supervisorAgent.clearContext();
+        await supervisorAgent.clearContext();
         sendToDevice(
           socket,
           clearMessage.device_id,
@@ -10132,7 +10402,7 @@ async function bootstrap() {
                 message_id: messageId
               }
             };
-            messageBroadcaster.broadcastToSubscribers(
+            await messageBroadcaster.broadcastToSubscribers(
               sessionId,
               JSON.stringify(errorEvent)
             );
@@ -10168,7 +10438,7 @@ async function bootstrap() {
                 from_device_id: deviceId
               }
             };
-            messageBroadcaster.broadcastToSubscribers(
+            await messageBroadcaster.broadcastToSubscribers(
               sessionId,
               JSON.stringify(transcriptionEvent)
             );
@@ -10259,7 +10529,7 @@ async function bootstrap() {
                 timestamp: Date.now()
               }
             };
-            messageBroadcaster.broadcastToSubscribers(
+            await messageBroadcaster.broadcastToSubscribers(
               sessionId,
               JSON.stringify(errorEvent)
             );
@@ -10387,14 +10657,20 @@ async function bootstrap() {
               is_complete: true
             }
           };
-          messageBroadcaster.broadcastToSubscribers(
+          void messageBroadcaster.broadcastToSubscribers(
             sessionId,
             JSON.stringify(cancelOutput)
-          );
-          logger.info(
-            { sessionId },
-            "Broadcasted cancel message to subscribers"
-          );
+          ).then(() => {
+            logger.info(
+              { sessionId },
+              "Broadcasted cancel message to subscribers"
+            );
+          }).catch((error) => {
+            logger.error(
+              { sessionId, error },
+              "Failed to broadcast cancel message"
+            );
+          });
           chatHistoryService.saveAgentMessage(sessionId, "assistant", "", [
             cancelBlock
           ]);
@@ -10827,8 +11103,27 @@ async function bootstrap() {
               tunnelClient,
               authenticateClient,
               logger,
-              subscriptionService
+              subscriptionService,
+              broadcaster
             );
+          } else if (messageType === "supervisor.context_cleared.ack") {
+            try {
+              const ackData = data;
+              const broadcastId = ackData.payload?.broadcast_id;
+              const deviceId = ackData.payload?.device_id;
+              if (broadcastId && deviceId && supervisorAgent) {
+                supervisorAgent.recordClearAck(broadcastId, deviceId);
+                logger.debug(
+                  { broadcastId, deviceId },
+                  "Recorded context clear acknowledgment"
+                );
+              }
+            } catch (ackError) {
+              logger.warn(
+                { error: ackError, message: message.slice(0, 100) },
+                "Failed to process context clear acknowledgment"
+              );
+            }
           } else {
             handleTunnelMessage(
               message,
@@ -10880,9 +11175,13 @@ async function bootstrap() {
     subscriptionRepository,
     logger
   });
+  let supervisorMessageSequence = 0;
+  const agentMessageSequences = /* @__PURE__ */ new Map();
   const broadcaster = messageBroadcaster;
   const agentMessageAccumulator = /* @__PURE__ */ new Map();
   const agentStreamingMessageIds = /* @__PURE__ */ new Map();
+  const STREAMING_STATE_GRACE_PERIOD_MS = 1e4;
+  const agentCleanupTimeouts = /* @__PURE__ */ new Map();
   const getOrCreateAgentStreamingMessageId = (sessionId) => {
     let messageId = agentStreamingMessageIds.get(sessionId);
     if (!messageId) {
@@ -10892,7 +11191,16 @@ async function bootstrap() {
     return messageId;
   };
   const clearAgentStreamingMessageId = (sessionId) => {
-    agentStreamingMessageIds.delete(sessionId);
+    const existingTimeout = agentCleanupTimeouts.get(sessionId);
+    if (existingTimeout) {
+      clearTimeout(existingTimeout);
+    }
+    const timeout = setTimeout(() => {
+      agentStreamingMessageIds.delete(sessionId);
+      agentCleanupTimeouts.delete(sessionId);
+      logger.debug({ sessionId }, "Agent streaming state cleaned up after grace period");
+    }, STREAMING_STATE_GRACE_PERIOD_MS);
+    agentCleanupTimeouts.set(sessionId, timeout);
   };
   agentSessionManager.on(
     "blocks",
@@ -10966,10 +11274,14 @@ async function bootstrap() {
       }
       const mergedBlocks = mergeToolBlocks(accumulatedBlocks);
       const fullAccumulatedText = mergedBlocks.filter((b) => b.block_type === "text").map((b) => b.content).join("\n");
+      const currentSequence = agentMessageSequences.get(sessionId) ?? 0;
+      const newSequence = currentSequence + 1;
+      agentMessageSequences.set(sessionId, newSequence);
       const outputEvent = {
         type: "session.output",
         session_id: sessionId,
         streaming_message_id: streamingMessageId,
+        sequence: newSequence,
         payload: {
           content_type: "agent",
           content: fullAccumulatedText,
@@ -10980,13 +11292,19 @@ async function bootstrap() {
           is_complete: isComplete
         }
       };
-      broadcaster.broadcastToSubscribers(
+      await broadcaster.broadcastToSubscribers(
         sessionId,
         JSON.stringify(outputEvent)
       );
       if (isComplete) {
         clearAgentStreamingMessageId(sessionId);
-        agentMessageAccumulator.delete(sessionId);
+        setTimeout(() => {
+          agentMessageAccumulator.delete(sessionId);
+          logger.debug(
+            { sessionId, messageId: streamingMessageId },
+            "Agent message accumulator cleaned up after grace period"
+          );
+        }, STREAMING_STATE_GRACE_PERIOD_MS);
       }
       if (isComplete && fullTextContent.length > 0) {
         const pendingVoiceCommand = pendingAgentVoiceCommands.get(sessionId);
@@ -11045,7 +11363,7 @@ async function bootstrap() {
                 from_device_id: originDeviceId
               }
             };
-            broadcaster.broadcastToSubscribers(
+            await broadcaster.broadcastToSubscribers(
               sessionId,
               JSON.stringify(voiceOutputEvent)
             );
@@ -11090,6 +11408,7 @@ async function bootstrap() {
       const outputEvent = {
         type: "supervisor.output",
         streaming_message_id: streamingMessageId,
+        sequence: ++supervisorMessageSequence,
         payload: {
           content_type: "supervisor",
           content: textContent,
@@ -11101,7 +11420,13 @@ async function bootstrap() {
       const message = JSON.stringify(outputEvent);
       broadcaster.broadcastToAll(message);
       if (isComplete) {
-        supervisorMessageAccumulator.clear();
+        setTimeout(() => {
+          supervisorMessageAccumulator.clear();
+          logger.debug(
+            { messageId: streamingMessageId },
+            "Supervisor message accumulator cleaned up after grace period"
+          );
+        }, STREAMING_STATE_GRACE_PERIOD_MS);
       }
       if (isComplete && finalOutput && finalOutput.length > 0) {
         chatHistoryService.saveSupervisorMessage(
@@ -11230,21 +11555,23 @@ async function bootstrap() {
       batchIntervalMs: env.TERMINAL_BATCH_INTERVAL_MS,
       maxBatchSize: env.TERMINAL_BATCH_MAX_SIZE,
       onFlush: (batchedData) => {
-        const outputMessage = session.addOutputToBuffer(batchedData);
-        const outputEvent = {
-          type: "session.output",
-          session_id: sessionId.value,
-          payload: {
-            content_type: "terminal",
-            content: batchedData,
-            timestamp: outputMessage.timestamp,
-            sequence: outputMessage.sequence
-          }
-        };
-        broadcaster.broadcastToSubscribers(
-          sessionId.value,
-          JSON.stringify(outputEvent)
-        );
+        void (async () => {
+          const outputMessage = session.addOutputToBuffer(batchedData);
+          const outputEvent = {
+            type: "session.output",
+            session_id: sessionId.value,
+            payload: {
+              content_type: "terminal",
+              content: batchedData,
+              timestamp: outputMessage.timestamp,
+              sequence: outputMessage.sequence
+            }
+          };
+          await broadcaster.broadcastToSubscribers(
+            sessionId.value,
+            JSON.stringify(outputEvent)
+          );
+        })();
       }
     });
     session.onOutput((data) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tiflis-io/tiflis-code-workstation",
-  "version": "0.3.28",
+  "version": "0.3.30",
   "description": "Workstation server for tiflis-code - manages agent sessions and terminal access",
   "author": "Roman Barinov <rbarinov@gmail.com>",
   "license": "FSL-1.1-NC",
@@ -36,6 +36,7 @@
     "@langchain/core": "^0.3.26",
     "@langchain/langgraph": "^0.2.42",
     "@langchain/openai": "^0.3.17",
+    "async-lock": "^1.4.0",
     "better-sqlite3": "^11.7.0",
     "dotenv": "^16.4.7",
     "drizzle-orm": "^0.38.3",
@@ -51,6 +52,7 @@
   },
   "devDependencies": {
     "@eslint/js": "^9.17.0",
+    "@types/async-lock": "^1.4.2",
     "@types/better-sqlite3": "^7.6.12",
     "@types/node": "^22.10.2",
     "@types/ws": "^8.5.13",