@tiflis-io/tiflis-code-workstation 0.3.12 → 0.3.14

package/dist/main.js

@@ -110,8 +110,8 @@ var EnvSchema = z.object({
   // ─────────────────────────────────────────────────────────────
   // Headless Agents Configuration
   // ─────────────────────────────────────────────────────────────
-  /** Timeout for agent command execution in seconds (default: 15 minutes) */
-  AGENT_EXECUTION_TIMEOUT: z.coerce.number().default(900),
+  /** Timeout for agent command execution in seconds (default: 2 hours) */
+  AGENT_EXECUTION_TIMEOUT: z.coerce.number().default(7200),
   CLAUDE_SESSION_LOCK_WAIT_MS: z.coerce.number().default(1500),
   // ─────────────────────────────────────────────────────────────
   // Agent Visibility Configuration
@@ -127,7 +127,11 @@ var EnvSchema = z.object({
   // Terminal Configuration
   // ─────────────────────────────────────────────────────────────
   /** Terminal output buffer size (number of messages, in-memory only, does not survive restarts) */
-  TERMINAL_OUTPUT_BUFFER_SIZE: z.coerce.number().default(100),
+  TERMINAL_OUTPUT_BUFFER_SIZE: z.coerce.number().default(1e4),
+  /** Terminal output batch interval in milliseconds (how long to wait before flushing) */
+  TERMINAL_BATCH_INTERVAL_MS: z.coerce.number().default(64),
+  /** Terminal output batch max size in bytes (flush immediately when exceeded) */
+  TERMINAL_BATCH_MAX_SIZE: z.coerce.number().default(4096),
   // Legacy (fallback for STT/TTS if specific keys not set)
   OPENAI_API_KEY: z.string().optional(),
   // ─────────────────────────────────────────────────────────────
@@ -283,7 +287,7 @@ var SESSION_CONFIG = {
   /** Data retention period for terminated sessions (30 days in ms) */
   DATA_RETENTION_MS: 30 * 24 * 60 * 60 * 1e3,
   /** Default terminal output buffer size (number of messages) */
-  DEFAULT_TERMINAL_OUTPUT_BUFFER_SIZE: 100
+  DEFAULT_TERMINAL_OUTPUT_BUFFER_SIZE: 1e4
 };
 var AGENT_COMMANDS = {
   cursor: {
@@ -339,8 +343,8 @@ var AGENT_COMMANDS = {
   }
 };
 var AGENT_EXECUTION_CONFIG = {
-  /** Default execution timeout (seconds) - 15 minutes for complex tasks */
-  DEFAULT_TIMEOUT_SECONDS: 900,
+  /** Default execution timeout (seconds) - 2 hours for complex tasks */
+  DEFAULT_TIMEOUT_SECONDS: 7200,
   /** Timeout for waiting on process termination during graceful shutdown (ms) */
   GRACEFUL_SHUTDOWN_TIMEOUT_MS: 2e3,
   /** Maximum buffer size for JSON line parsing (bytes) */
@@ -2588,15 +2592,12 @@ var TerminalSession = class extends Session {
     return this._masterDeviceId;
   }
   /**
-   * Sets the master device ID. Only sets if not already set (first subscriber wins).
-   * @returns true if this device became master, false if master was already set
+   * Sets the master device ID. Always overrides the current master (new subscriber wins).
+   * @returns true (new subscriber always becomes master)
    */
   setMaster(deviceId) {
-    if (this._masterDeviceId === null) {
-      this._masterDeviceId = deviceId;
-      return true;
-    }
-    return this._masterDeviceId === deviceId;
+    this._masterDeviceId = deviceId;
+    return true;
   }
   /**
    * Checks if the given device is the master for this session.
@@ -2917,6 +2918,75 @@ var PtyManager = class {
   }
 };
 
+// src/infrastructure/terminal/terminal-output-batcher.ts
+var TerminalOutputBatcher = class {
+  buffer = "";
+  timeout = null;
+  lastActivityTime = Date.now();
+  outputRate = 0;
+  // Bytes/second estimate (exponential moving average)
+  batchIntervalMs;
+  maxBatchSize;
+  onFlush;
+  constructor(config2) {
+    this.batchIntervalMs = config2.batchIntervalMs;
+    this.maxBatchSize = config2.maxBatchSize;
+    this.onFlush = config2.onFlush;
+  }
+  /**
+   * Appends data to the batch buffer.
+   * Triggers flush based on size threshold or adaptive timeout.
+   */
+  append(chunk) {
+    this.buffer += chunk;
+    const now = Date.now();
+    const elapsed = Math.max(now - this.lastActivityTime, 1);
+    const instantRate = chunk.length / elapsed * 1e3;
+    this.outputRate = this.outputRate * 0.7 + instantRate * 0.3;
+    this.lastActivityTime = now;
+    if (this.buffer.length >= this.maxBatchSize) {
+      this.flush();
+      return;
+    }
+    if (this.timeout === null) {
+      const adaptiveInterval = this.outputRate > 1e3 ? this.batchIntervalMs : Math.min(8, this.batchIntervalMs);
+      this.timeout = setTimeout(() => this.flush(), adaptiveInterval);
+    }
+  }
+  /**
+   * Immediately flushes the buffer, invoking the onFlush callback.
+   */
+  flush() {
+    if (this.timeout !== null) {
+      clearTimeout(this.timeout);
+      this.timeout = null;
+    }
+    if (this.buffer.length > 0) {
+      const data = this.buffer;
+      this.buffer = "";
+      this.onFlush(data);
+    }
+  }
+  /**
+   * Disposes the batcher, flushing any pending data.
+   */
+  dispose() {
+    this.flush();
+  }
+  /**
+   * Returns current buffer size (for debugging/monitoring).
+   */
+  get pendingSize() {
+    return this.buffer.length;
+  }
+  /**
+   * Returns estimated output rate in bytes/second.
+   */
+  get currentOutputRate() {
+    return this.outputRate;
+  }
+};
+
 // src/infrastructure/agents/agent-session-manager.ts
 import { EventEmitter as EventEmitter2 } from "events";
 import { randomUUID as randomUUID2 } from "crypto";
@@ -5103,7 +5173,8 @@ var MessageRepository = class {
     const result = db2.select({ maxSeq: max(messages.sequence) }).from(messages).where(eq3(messages.sessionId, params.sessionId)).get();
     const nextSequence = (result?.maxSeq ?? 0) + 1;
     const newMessage = {
-      id: nanoid2(16),
+      id: params.messageId ?? nanoid2(16),
+      // Use provided ID or generate new one
       sessionId: params.sessionId,
       sequence: nextSequence,
       role: params.role,
@@ -5776,8 +5847,9 @@ var ChatHistoryService = class _ChatHistoryService {
    * Saves a supervisor message to the database.
    * Messages are shared across all devices connected to this workstation.
    * @param contentBlocks - Optional structured content blocks (for assistant messages)
+   * @param messageId - Optional ID to use (e.g., streaming_message_id for deduplication)
    */
-  saveSupervisorMessage(role, content, contentBlocks) {
+  saveSupervisorMessage(role, content, contentBlocks, messageId) {
     this.ensureSupervisorSession();
     const sessionId = _ChatHistoryService.SUPERVISOR_SESSION_ID;
     const params = {
@@ -5786,7 +5858,9 @@ var ChatHistoryService = class _ChatHistoryService {
       contentType: "text",
       content,
       contentBlocks: contentBlocks ? JSON.stringify(contentBlocks) : void 0,
-      isComplete: true
+      isComplete: true,
+      messageId
+      // Pass through to repository for consistent IDs
     };
     const saved = this.messageRepo.create(params);
     this.logger.debug(
@@ -5875,14 +5949,16 @@ var ChatHistoryService = class _ChatHistoryService {
    * @param content - Text content (summary for assistant messages)
    * @param contentBlocks - Structured content blocks for rich UI
    */
-  saveAgentMessage(sessionId, role, content, contentBlocks) {
+  saveAgentMessage(sessionId, role, content, contentBlocks, messageId) {
     const params = {
       sessionId,
       role,
       contentType: "text",
       content,
       contentBlocks: contentBlocks ? JSON.stringify(contentBlocks) : void 0,
-      isComplete: true
+      isComplete: true,
+      messageId
+      // Pass through to repository
     };
     const saved = this.messageRepo.create(params);
     this.logger.debug(
@@ -9461,7 +9537,7 @@ async function bootstrap() {
       let currentStreamingBlocks;
       if (supervisorIsExecuting) {
         const blocks = supervisorMessageAccumulator.get();
-        if (blocks && blocks.length > 0) {
+        if (blocks.length > 0) {
           currentStreamingBlocks = blocks;
         }
       }
@@ -10538,9 +10614,9 @@ async function bootstrap() {
           const isExecuting = supervisorAgent.isProcessing();
           let currentStreamingBlocks;
           let streamingMessageId;
-          if (isExecuting && !beforeSequence) {
+          if (isExecuting) {
             const blocks = supervisorMessageAccumulator.get();
-            if (blocks && blocks.length > 0) {
+            if (blocks.length > 0) {
               currentStreamingBlocks = blocks;
               streamingMessageId = supervisorMessageAccumulator.getStreamingMessageId() ?? void 0;
             }
@@ -10594,7 +10670,7 @@ async function bootstrap() {
           const isExecuting = agentSessionManager.isExecuting(sessionId);
           let currentStreamingBlocks;
           let streamingMessageId;
-          if (isExecuting && !beforeSequence) {
+          if (isExecuting) {
             const blocks = agentMessageAccumulator.get(sessionId);
             if (blocks && blocks.length > 0) {
               currentStreamingBlocks = blocks;
@@ -10850,11 +10926,11 @@ async function bootstrap() {
           );
         }
       }
+      const accumulatedBlocks = agentMessageAccumulator.get(sessionId) ?? [];
+      const streamingMessageId = getOrCreateAgentStreamingMessageId(sessionId);
       let fullTextContent = "";
       if (isComplete) {
-        const allBlocks = agentMessageAccumulator.get(sessionId) ?? [];
-        agentMessageAccumulator.delete(sessionId);
-        if (allBlocks.length === 0) {
+        if (accumulatedBlocks.length === 0) {
           logger.warn(
             {
               sessionId,
@@ -10864,8 +10940,8 @@ async function bootstrap() {
             "Completion received but no blocks were accumulated - blocks may be lost"
           );
         }
-        if (allBlocks.length > 0) {
-          const blockTypeCounts = allBlocks.reduce(
+        if (accumulatedBlocks.length > 0) {
+          const blockTypeCounts = accumulatedBlocks.reduce(
             (acc, b) => {
               acc[b.block_type] = (acc[b.block_type] ?? 0) + 1;
               return acc;
@@ -10875,26 +10951,25 @@ async function bootstrap() {
           logger.info(
             {
               sessionId,
-              totalBlocks: allBlocks.length,
+              totalBlocks: accumulatedBlocks.length,
               blockTypes: blockTypeCounts
             },
             "Saving agent message with accumulated blocks"
           );
-          fullTextContent = allBlocks.filter((b) => b.block_type === "text").map((b) => b.content).join("\n");
-          const hasError = allBlocks.some((b) => b.block_type === "error");
+          fullTextContent = accumulatedBlocks.filter((b) => b.block_type === "text").map((b) => b.content).join("\n");
+          const hasError = accumulatedBlocks.some((b) => b.block_type === "error");
           const role = hasError ? "system" : "assistant";
           chatHistoryService.saveAgentMessage(
             sessionId,
             role,
             fullTextContent,
-            allBlocks
+            accumulatedBlocks,
+            streamingMessageId
           );
         }
       }
-      const accumulatedBlocks = agentMessageAccumulator.get(sessionId) ?? [];
       const mergedBlocks = mergeToolBlocks(accumulatedBlocks);
       const fullAccumulatedText = mergedBlocks.filter((b) => b.block_type === "text").map((b) => b.content).join("\n");
-      const streamingMessageId = getOrCreateAgentStreamingMessageId(sessionId);
       const outputEvent = {
         type: "session.output",
         session_id: sessionId,
@@ -10915,6 +10990,7 @@ async function bootstrap() {
       );
       if (isComplete) {
         clearAgentStreamingMessageId(sessionId);
+        agentMessageAccumulator.delete(sessionId);
       }
       if (isComplete && fullTextContent.length > 0) {
         const pendingVoiceCommand = pendingAgentVoiceCommands.get(sessionId);
@@ -11035,7 +11111,8 @@ async function bootstrap() {
         chatHistoryService.saveSupervisorMessage(
           "assistant",
           finalOutput,
-          mergedBlocks
+          mergedBlocks,
+          streamingMessageId ?? void 0
         );
         const pendingVoiceCommand = pendingSupervisorVoiceCommands.get(deviceId);
         if (pendingVoiceCommand && ttsService) {
@@ -11153,23 +11230,35 @@ async function bootstrap() {
       }
     };
     broadcaster.broadcastToAll(JSON.stringify(broadcastMessage));
+    const batcher = new TerminalOutputBatcher({
+      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)
+        );
+      }
+    });
     session.onOutput((data) => {
-      const outputMessage = session.addOutputToBuffer(data);
-      const outputEvent = {
-        type: "session.output",
-        session_id: sessionId.value,
-        payload: {
-          content_type: "terminal",
-          content: data,
-          timestamp: outputMessage.timestamp,
-          sequence: outputMessage.sequence
-        }
-      };
-      broadcaster.broadcastToSubscribers(
-        sessionId.value,
-        JSON.stringify(outputEvent)
-      );
+      batcher.append(data);
     });
+    const originalTerminate = session.terminate.bind(session);
+    session.terminate = async () => {
+      batcher.dispose();
+      return originalTerminate();
+    };
   });
   if (env.MOCK_MODE) {
     const terminalSession = await sessionManager.createSession({
@@ -11401,6 +11490,14 @@ bootstrap().catch((error) => {
  * @copyright 2025 Roman Barinov <rbarinov@gmail.com>
  * @license FSL-1.1-NC
  */
+/**
+ * @file terminal-output-batcher.ts
+ * @copyright 2025 Roman Barinov <rbarinov@gmail.com>
+ * @license FSL-1.1-NC
+ *
+ * Batches terminal output chunks to reduce message frequency and improve performance.
+ * Uses adaptive batching based on output rate for optimal responsiveness.
+ */
 /**
  * @file headless-agent-executor.ts
  * @copyright 2025 Roman Barinov <rbarinov@gmail.com>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tiflis-io/tiflis-code-workstation",
-  "version": "0.3.12",
+  "version": "0.3.14",
   "description": "Workstation server for tiflis-code - manages agent sessions and terminal access",
   "author": "Roman Barinov <rbarinov@gmail.com>",
   "license": "FSL-1.1-NC",