@litmers/cursorflow-orchestrator 0.1.18 → 0.1.26

package/src/utils/enhanced-logger.ts

@@ -14,10 +14,10 @@
 import * as fs from 'fs';
 import * as path from 'path';
 import { Transform, TransformCallback } from 'stream';
-import { EnhancedLogConfig } from './types';
-
-// Re-export for backwards compatibility
-export { EnhancedLogConfig } from './types';
+import * as logger from './logger';
+import { EnhancedLogConfig, ParsedMessage, JsonLogEntry, LogSession } from '../types';
+export { EnhancedLogConfig, ParsedMessage, JsonLogEntry, LogSession };
+import { safeJoin } from './path';
 
 export const DEFAULT_LOG_CONFIG: EnhancedLogConfig = {
   enabled: true,
@@ -26,6 +26,8 @@ export const DEFAULT_LOG_CONFIG: EnhancedLogConfig = {
   maxFileSize: 50 * 1024 * 1024, // 50MB
   maxFiles: 5,
   keepRawLogs: true,
+  keepAbsoluteRawLogs: false,
+  raw: false,
   writeJsonLog: true,
   timestampFormat: 'iso',
 };
@@ -207,14 +209,6 @@ export class StreamingMessageParser {
   }
 }
 
-export interface ParsedMessage {
-  type: 'system' | 'user' | 'assistant' | 'tool' | 'tool_result' | 'result' | 'thinking';
-  role: string;
-  content: string;
-  timestamp: number;
-  metadata?: Record<string, any>;
-}
-
 /**
  * ANSI escape sequence regex pattern
  * Matches:
@@ -275,35 +269,12 @@ export function formatTimestamp(format: 'iso' | 'relative' | 'short', startTime?
 }
 
 /**
- * JSON log entry structure
- */
-export interface JsonLogEntry {
-  timestamp: string;
-  level: 'stdout' | 'stderr' | 'info' | 'error' | 'debug' | 'session';
-  source?: string;
-  task?: string;
-  lane?: string;
-  message: string;
-  raw?: string;
-  metadata?: Record<string, any>;
-}
-
-/**
- * Session context for logging
- */
-export interface LogSession {
-  id: string;
-  laneName: string;
-  taskName?: string;
-  model?: string;
-  startTime: number;
-  metadata?: Record<string, any>;
-}
-
-/**
- * Regex to detect if a line already has an ISO timestamp at the start
+ * Regex to detect if a line already has a timestamp at the start
+ * Matches:
+ * - ISO format: [2024-01-01T12:34:56...]
+ * - Short format: [12:34:56]
  */
-const EXISTING_TIMESTAMP_REGEX = /^\[\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}/;
+const EXISTING_TIMESTAMP_REGEX = /^\[(\d{4}-\d{2}-\d{2}T)?\d{2}:\d{2}:\d{2}/;
 
 /**
  * Check if a line already has a timestamp
@@ -387,16 +358,19 @@ export class EnhancedLogManager {
   
   private cleanLogPath: string;
   private rawLogPath: string;
+  private absoluteRawLogPath: string;
   private jsonLogPath: string;
   private readableLogPath: string;
   
   private cleanLogFd: number | null = null;
   private rawLogFd: number | null = null;
+  private absoluteRawLogFd: number | null = null;
   private jsonLogFd: number | null = null;
   private readableLogFd: number | null = null;
   
   private cleanLogSize: number = 0;
   private rawLogSize: number = 0;
+  private absoluteRawLogSize: number = 0;
   
   private cleanTransform: CleanLogTransform | null = null;
   private streamingParser: StreamingMessageParser | null = null;
@@ -405,6 +379,12 @@ export class EnhancedLogManager {
 
   constructor(logDir: string, session: LogSession, config: Partial<EnhancedLogConfig> = {}, onParsedMessage?: (msg: ParsedMessage) => void) {
     this.config = { ...DEFAULT_LOG_CONFIG, ...config };
+    
+    // Support 'raw' as alias for 'keepAbsoluteRawLogs'
+    if (this.config.raw) {
+      this.config.keepAbsoluteRawLogs = true;
+    }
+    
     this.session = session;
     this.logDir = logDir;
     this.onParsedMessage = onParsedMessage;
@@ -413,10 +393,15 @@ export class EnhancedLogManager {
     fs.mkdirSync(logDir, { recursive: true });
     
     // Set up log file paths
-    this.cleanLogPath = path.join(logDir, 'terminal.log');
-    this.rawLogPath = path.join(logDir, 'terminal-raw.log');
-    this.jsonLogPath = path.join(logDir, 'terminal.jsonl');
-    this.readableLogPath = path.join(logDir, 'terminal-readable.log');
+    this.cleanLogPath = safeJoin(logDir, 'terminal.log');
+    this.rawLogPath = safeJoin(logDir, 'terminal-raw.log');
+    this.absoluteRawLogPath = safeJoin(logDir, 'terminal-absolute-raw.log');
+    this.jsonLogPath = safeJoin(logDir, 'terminal.jsonl');
+    this.readableLogPath = safeJoin(logDir, 'terminal-readable.log');
+
+    if (this.config.raw) {
+      logger.info(`[${session.laneName}] 📄 Raw data capture enabled: ${this.absoluteRawLogPath}`);
+    }
     
     // Initialize log files
     this.initLogFiles();
@@ -431,6 +416,9 @@ export class EnhancedLogManager {
     if (this.config.keepRawLogs) {
       this.rotateIfNeeded(this.rawLogPath, 'raw');
     }
+    if (this.config.keepAbsoluteRawLogs) {
+      this.rotateIfNeeded(this.absoluteRawLogPath, 'raw');
+    }
     
     // Open file descriptors
     this.cleanLogFd = fs.openSync(this.cleanLogPath, 'a');
@@ -438,6 +426,10 @@ export class EnhancedLogManager {
     if (this.config.keepRawLogs) {
       this.rawLogFd = fs.openSync(this.rawLogPath, 'a');
     }
+
+    if (this.config.keepAbsoluteRawLogs) {
+      this.absoluteRawLogFd = fs.openSync(this.absoluteRawLogPath, 'a');
+    }
     
     if (this.config.writeJsonLog) {
       this.jsonLogFd = fs.openSync(this.jsonLogPath, 'a');
@@ -452,9 +444,13 @@ export class EnhancedLogManager {
       if (this.config.keepRawLogs) {
         this.rawLogSize = fs.statSync(this.rawLogPath).size;
       }
+      if (this.config.keepAbsoluteRawLogs) {
+        this.absoluteRawLogSize = fs.statSync(this.absoluteRawLogPath).size;
+      }
     } catch {
       this.cleanLogSize = 0;
       this.rawLogSize = 0;
+      this.absoluteRawLogSize = 0;
     }
     
     // Write session header
@@ -620,8 +616,8 @@ export class EnhancedLogManager {
     
     // Shift existing rotated files
     for (let i = this.config.maxFiles - 1; i >= 1; i--) {
-      const oldPath = path.join(dir, `${base}.${i}${ext}`);
-      const newPath = path.join(dir, `${base}.${i + 1}${ext}`);
+      const oldPath = safeJoin(dir, `${base}.${i}${ext}`);
+      const newPath = safeJoin(dir, `${base}.${i + 1}${ext}`);
       
       if (fs.existsSync(oldPath)) {
         if (i === this.config.maxFiles - 1) {
@@ -633,7 +629,7 @@ export class EnhancedLogManager {
     }
     
     // Rotate current to .1
-    const rotatedPath = path.join(dir, `${base}.1${ext}`);
+    const rotatedPath = safeJoin(dir, `${base}.1${ext}`);
     fs.renameSync(logPath, rotatedPath);
   }
 
@@ -675,6 +671,25 @@ export class EnhancedLogManager {
     }
   }
 
+  /**
+   * Write to absolute raw log with size tracking
+   */
+  private writeToAbsoluteRawLog(data: string | Buffer): void {
+    if (this.absoluteRawLogFd === null) return;
+    
+    const buffer = typeof data === 'string' ? Buffer.from(data) : data;
+    fs.writeSync(this.absoluteRawLogFd, buffer);
+    this.absoluteRawLogSize += buffer.length;
+    
+    // Check if rotation needed
+    if (this.absoluteRawLogSize >= this.config.maxFileSize) {
+      fs.closeSync(this.absoluteRawLogFd);
+      this.rotateLog(this.absoluteRawLogPath);
+      this.absoluteRawLogFd = fs.openSync(this.absoluteRawLogPath, 'a');
+      this.absoluteRawLogSize = 0;
+    }
+  }
+
   /**
    * Write a JSON log entry
    */
@@ -691,6 +706,11 @@ export class EnhancedLogManager {
   public writeStdout(data: Buffer | string): void {
     const text = data.toString();
     
+    // Write absolute raw log
+    if (this.config.keepAbsoluteRawLogs) {
+      this.writeToAbsoluteRawLog(data);
+    }
+    
     // Write raw log
     if (this.config.keepRawLogs) {
       this.writeToRawLog(text);
@@ -710,7 +730,7 @@ export class EnhancedLogManager {
       const cleanLine = stripAnsi(line).trim();
       if (!cleanLine) continue;
 
-      // Handle streaming JSON messages (for boxes, etc. in readable log)
+      // Handle streaming JSON messages
       if (cleanLine.startsWith('{')) {
         if (this.streamingParser) {
           this.streamingParser.parseLine(cleanLine);
@@ -724,8 +744,10 @@ export class EnhancedLogManager {
             let metadata = { ...json };
 
             // Extract cleaner text for significant AI message types
-            if (json.type === 'thinking' && json.text) {
-              displayMsg = json.text;
+            if ((json.type === 'thinking' || json.type === 'thought') && (json.text || json.thought)) {
+              displayMsg = json.text || json.thought;
+              // Clean up any double newlines at the end of deltas
+              displayMsg = displayMsg.replace(/\n+$/, '\n');
             } else if (json.type === 'assistant' && json.message?.content) {
               displayMsg = json.message.content
                 .filter((c: any) => c.type === 'text')
@@ -760,6 +782,25 @@ export class EnhancedLogManager {
             // Not valid JSON or error, fall through to regular logging
           }
         }
+      } else {
+        // Parse standard text logs into ParsedMessage
+        // Format: [HH:MM:SS] [LANE] ℹ️  INFO    message
+        const textLogRegex = /^\[(\d{2}:\d{2}:\d{2})\]\s+\[(.*?)\]\s+(.*?)\s+(INFO|WARN|ERROR|SUCCESS|DONE|PROGRESS)\s+(.*)/;
+        const match = cleanLine.match(textLogRegex);
+        
+        if (match && this.onParsedMessage) {
+          const [, time, , emoji, level, content] = match;
+          // Convert HH:MM:SS to a timestamp for today
+          const [h, m, s] = time!.split(':').map(Number);
+          const timestamp = new Date().setHours(h!, m!, s!, 0);
+          
+          this.onParsedMessage({
+            type: level!.toLowerCase().replace('done', 'result').replace('success', 'result') as any,
+            role: 'system',
+            content: `${emoji} ${content}`,
+            timestamp,
+          });
+        }
       }
 
       // Also include significant info/status lines in readable log (compact)
@@ -809,6 +850,11 @@ export class EnhancedLogManager {
   public writeStderr(data: Buffer | string): void {
     const text = data.toString();
     
+    // Write absolute raw log
+    if (this.config.keepAbsoluteRawLogs) {
+      this.writeToAbsoluteRawLog(data);
+    }
+    
     // Write raw log
     if (this.config.keepRawLogs) {
       this.writeToRawLog(text);
@@ -853,7 +899,7 @@ export class EnhancedLogManager {
    */
   public log(level: 'info' | 'error' | 'debug', message: string, metadata?: Record<string, any>): void {
     const ts = formatTimestamp(this.config.timestampFormat, this.session.startTime);
-    const prefix = level.toUpperCase().padEnd(5);
+    const prefix = level.toUpperCase().padEnd(8);
     
     const line = `[${ts}] [${prefix}] ${message}\n`;
     this.writeToCleanLog(line);
@@ -862,6 +908,10 @@ export class EnhancedLogManager {
       this.writeToRawLog(line);
     }
     
+    if (this.config.keepAbsoluteRawLogs) {
+      this.writeToAbsoluteRawLog(line);
+    }
+    
     // Write to readable log (compact)
     if (this.readableLogFd !== null) {
       const typeLabel = level === 'error' ? '❌ ERROR' : level === 'info' ? 'ℹ️ INFO' : '🔍 DEBUG';
@@ -894,6 +944,9 @@ export class EnhancedLogManager {
     if (this.config.keepRawLogs) {
       this.writeToRawLog(line);
     }
+    if (this.config.keepAbsoluteRawLogs) {
+      this.writeToAbsoluteRawLog(line);
+    }
 
     // Write to readable log (compact)
     if (this.readableLogFd !== null) {
@@ -951,10 +1004,11 @@ export class EnhancedLogManager {
   /**
    * Get paths to all log files
    */
-  public getLogPaths(): { clean: string; raw?: string; json?: string; readable: string } {
+  public getLogPaths(): { clean: string; raw?: string; absoluteRaw?: string; json?: string; readable: string } {
     return {
       clean: this.cleanLogPath,
       raw: this.config.keepRawLogs ? this.rawLogPath : undefined,
+      absoluteRaw: this.config.keepAbsoluteRawLogs ? this.absoluteRawLogPath : undefined,
       json: this.config.writeJsonLog ? this.jsonLogPath : undefined,
       readable: this.readableLogPath,
     };
@@ -1008,6 +1062,11 @@ export class EnhancedLogManager {
       this.rawLogFd = null;
     }
     
+    if (this.absoluteRawLogFd !== null) {
+      fs.closeSync(this.absoluteRawLogFd);
+      this.absoluteRawLogFd = null;
+    }
+    
     if (this.jsonLogFd !== null) {
       this.writeJsonEntry({
         timestamp: new Date().toISOString(),
@@ -1101,8 +1160,8 @@ export function exportLogs(
   format: 'text' | 'json' | 'markdown' | 'html',
   outputPath?: string
 ): string {
-  const cleanLogPath = path.join(laneRunDir, 'terminal.log');
-  const jsonLogPath = path.join(laneRunDir, 'terminal.jsonl');
+  const cleanLogPath = safeJoin(laneRunDir, 'terminal.log');
+  const jsonLogPath = safeJoin(laneRunDir, 'terminal.jsonl');
   
   let output = '';
   
@@ -1168,8 +1227,10 @@ function exportToMarkdown(jsonLogPath: string, cleanLogPath: string): string {
     md += `### Task: ${task}\n\n`;
     md += '```\n';
     for (const entry of taskEntries) {
-      if (entry.level !== 'session') {
-        md += `[${entry.timestamp}] [${entry.level.toUpperCase()}] ${entry.message}\n`;
+      const level = entry.level || 'info';
+      const message = entry.message || '';
+      if (level !== 'session') {
+        md += `[${entry.timestamp}] [${level.toUpperCase()}] ${message}\n`;
       }
     }
     md += '```\n\n';
@@ -1208,11 +1269,13 @@ function exportToHtml(jsonLogPath: string, cleanLogPath: string): string {
 `;
   
   for (const entry of entries) {
-    html += `  <div class="entry ${entry.level}">
+    const level = entry.level || 'info';
+    const message = entry.message || '';
+    html += `  <div class="entry ${level}">
     <span class="timestamp">${entry.timestamp}</span>
-    <span class="level">[${entry.level}]</span>
+    <span class="level">[${level}]</span>
     ${entry.task ? `<span class="task">[${entry.task}]</span>` : ''}
-    <pre>${escapeHtml(entry.message)}</pre>
+    <pre>${escapeHtml(message)}</pre>
   </div>\n`;
   }
   
@@ -1228,4 +1291,3 @@ function escapeHtml(text: string): string {
     .replace(/"/g, '&quot;')
     .replace(/'/g, '&#039;');
 }
-