@tiflis-io/tiflis-code-workstation 0.3.13 → 0.3.17

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
@@ -343,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) */
@@ -2466,7 +2466,7 @@ var Session = class {
     this._workspacePath = props.workspacePath;
     this._workingDir = props.workingDir;
     this._status = "active";
-    this._createdAt = /* @__PURE__ */ new Date();
+    this._createdAt = props.createdAt ?? /* @__PURE__ */ new Date();
     this._lastActivityAt = /* @__PURE__ */ new Date();
   }
   get id() {
@@ -5173,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,
@@ -5846,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 = {
@@ -5856,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(
@@ -5945,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(
@@ -10608,7 +10614,7 @@ async function bootstrap() {
           const isExecuting = supervisorAgent.isProcessing();
           let currentStreamingBlocks;
           let streamingMessageId;
-          if (isExecuting && !beforeSequence) {
+          if (isExecuting) {
             const blocks = supervisorMessageAccumulator.get();
             if (blocks.length > 0) {
               currentStreamingBlocks = blocks;
@@ -10664,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;
@@ -10920,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,
@@ -10934,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;
@@ -10945,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,
@@ -10985,6 +10990,7 @@ async function bootstrap() {
       );
       if (isComplete) {
         clearAgentStreamingMessageId(sessionId);
+        agentMessageAccumulator.delete(sessionId);
       }
       if (isComplete && fullTextContent.length > 0) {
         const pendingVoiceCommand = pendingAgentVoiceCommands.get(sessionId);
@@ -11105,7 +11111,8 @@ async function bootstrap() {
         chatHistoryService.saveSupervisorMessage(
           "assistant",
           finalOutput,
-          mergedBlocks
+          mergedBlocks,
+          streamingMessageId ?? void 0
         );
         const pendingVoiceCommand = pendingSupervisorVoiceCommands.get(deviceId);
         if (pendingVoiceCommand && ttsService) {
@@ -11321,7 +11328,7 @@ async function bootstrap() {
   } catch (error) {
     logger.error({ error }, "Failed to connect to tunnel (will retry)");
   }
-  const SHUTDOWN_TIMEOUT_MS = 1e4;
+  const SHUTDOWN_TIMEOUT_MS = 5e3;
   let isShuttingDown = false;
   const shutdown = async (signal) => {
     if (isShuttingDown) {
@@ -11342,7 +11349,7 @@ async function bootstrap() {
       logger.info("Terminating all sessions...");
       const terminatePromise = sessionManager.terminateAll();
       const sessionTimeoutPromise = new Promise((_, reject) => {
-        setTimeout(() => reject(new Error("Session termination timeout")), 5e3);
+        setTimeout(() => reject(new Error("Session termination timeout")), 2e3);
       });
       try {
         await Promise.race([terminatePromise, sessionTimeoutPromise]);
@@ -11353,7 +11360,7 @@ async function bootstrap() {
       logger.info("Closing HTTP server...");
       const closePromise = app.close();
       const closeTimeoutPromise = new Promise((_, reject) => {
-        setTimeout(() => reject(new Error("HTTP server close timeout")), 2e3);
+        setTimeout(() => reject(new Error("HTTP server close timeout")), 1e3);
       });
       try {
         await Promise.race([closePromise, closeTimeoutPromise]);
@@ -11371,8 +11378,18 @@ async function bootstrap() {
       process.exit(1);
     }
   };
-  process.on("SIGTERM", () => void shutdown("SIGTERM"));
-  process.on("SIGINT", () => void shutdown("SIGINT"));
+  let signalCount = 0;
+  const handleSignal = (signal) => {
+    signalCount++;
+    if (signalCount === 1) {
+      void shutdown(signal);
+    } else {
+      logger.warn({ signal, count: signalCount }, "Force exit on repeated signal");
+      process.exit(1);
+    }
+  };
+  process.on("SIGTERM", () => handleSignal("SIGTERM"));
+  process.on("SIGINT", () => handleSignal("SIGINT"));
   process.on("unhandledRejection", (reason, promise) => {
     logger.error({ reason, promise }, "Unhandled rejection");
   });

package/package.json

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