@litmers/cursorflow-orchestrator 0.2.3 → 0.2.5

package/CHANGELOG.md

@@ -5,6 +5,20 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.2.4] - 2025-12-28
+
+### Added
+- **Logging**: Introduced tool-specific labels (READ, EDIT, SHLL, etc.) and emojis for better visibility.
+- **Logging**: Added path simplification (absolute path to relative `./`) in tool execution logs.
+
+### Improved
+- **Logging**: Enhanced log color consistency by dimming unimportant system and info logs.
+- **Logging**: Improved multi-line thinking message formatting with proper indentation.
+
+### Fixed
+- **Logging**: Fixed box alignment issues for USER and SYS messages by accurately calculating terminal visual width for emojis.
+- **Logging**: Filtered out redundant or empty agent events from readable logs.
+
 ## [0.1.37] - 2025-12-26
 
 ### Fixed

package/README.md

@@ -313,13 +313,11 @@ Logs use the format `[{n}-{t}-{lanename}]`:
 Example: `[1-2-backend]` = Lane 1, Task 2, lane "backend"
 
 ### Features
-- **ANSI Stripping**: Clean logs without terminal escape codes
-- **Timestamps**: Automatic timestamps on each line (ISO, relative, or short format)
+- **ANSI Stripping**: Logs content without terminal escape codes
+- **Timestamps**: Automatic timestamps on each line (ISO format)
 - **Log Rotation**: Automatic rotation when files exceed size limits
-- **Multiple Formats**: 
-  - `terminal.log` - Clean, readable logs
-  - `terminal-raw.log` - Raw logs with ANSI codes
-  - `terminal.jsonl` - Structured JSON for programmatic access
+- **Unified Format**: 
+  - `terminal.jsonl` - Structured JSON for programmatic access and human-readable display via `cursorflow logs` or `monitor`.
 
 ### Usage
 
@@ -327,7 +325,7 @@ Example: `[1-2-backend]` = Lane 1, Task 2, lane "backend"
 # View logs summary for latest run
 cursorflow logs
 
-# View specific lane logs
+# View specific lane logs (automatically formatted from JSONL)
 cursorflow logs --lane api-setup
 
 # View ALL lanes merged (unified timeline)
@@ -377,12 +375,10 @@ module.exports = {
   // ... other config ...
   enhancedLogging: {
     enabled: true,           // Enable enhanced logging
-    stripAnsi: true,         // Strip ANSI codes for clean logs
-    addTimestamps: true,     // Add timestamps to each line
+    stripAnsi: true,         // Strip ANSI codes
     maxFileSize: 52428800,   // 50MB max before rotation
     maxFiles: 5,             // Keep 5 rotated files
-    keepRawLogs: true,       // Keep raw logs separately
-    writeJsonLog: true,      // Generate JSON logs
+    writeJsonLog: true,      // Generate JSON logs (main format)
     timestampFormat: 'iso',  // 'iso' | 'relative' | 'short'
   },
 };

package/dist/cli/complete.d.ts

@@ -0,0 +1,7 @@
+/**
+ * CursorFlow 'complete' command
+ *
+ * Consolidates all lanes of a flow into a single branch and cleans up.
+ */
+declare function complete(args: string[]): Promise<void>;
+export = complete;

package/dist/cli/complete.js

@@ -0,0 +1,304 @@
+"use strict";
+/**
+ * CursorFlow 'complete' command
+ *
+ * Consolidates all lanes of a flow into a single branch and cleans up.
+ */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+const fs = __importStar(require("fs"));
+const path = __importStar(require("path"));
+const logger = __importStar(require("../utils/logger"));
+const git = __importStar(require("../utils/git"));
+const config_1 = require("../utils/config");
+const path_1 = require("../utils/path");
+const run_service_1 = require("../utils/run-service");
+const flow_1 = require("../utils/flow");
+const process_1 = require("../services/process");
+function printHelp() {
+    console.log(`
+\x1b[1mcursorflow complete\x1b[0m - Flow 통합 및 마무리
+
+\x1b[1m사용법:\x1b[0m
+  cursorflow complete <flow-dir> [options]
+
+\x1b[1m설명:\x1b[0m
+  모든 레인의 작업이 완료된 후, 각 레인의 브랜치들을 하나의 통합 브랜치로 병합합니다.
+  병합이 성공하면 임시로 사용된 레인 브랜치들과 워크트리들을 삭제합니다.
+  
+  \x1b[33m참고:\x1b[0m Flow가 성공적으로 완료되면 자동으로 통합됩니다.
+  이 명령어는 자동 통합이 실패했을 때 수동으로 복구하거나,
+  특정 옵션으로 통합하고 싶을 때 사용합니다.
+
+\x1b[1m옵션:\x1b[0m
+  --branch <name>    통합 브랜치 이름 지정 (기본값: feature/<FlowName>-integrated)
+  --force            완료되지 않은 레인이 있어도 강제로 진행
+  --dry-run          실제로 병합하거나 삭제하지 않고 계획만 출력
+  --no-cleanup       병합 후 브랜치 및 워크트리를 삭제하지 않음
+  --help, -h         도움말 출력
+
+\x1b[1m예시:\x1b[0m
+  # 자동 통합 실패 후 수동 복구
+  cursorflow complete ShopFeature
+  
+  # 특정 브랜치 이름으로 통합
+  cursorflow complete ShopFeature --branch feat/shop-v1
+  
+  # 정리 없이 통합만 수행
+  cursorflow complete ShopFeature --no-cleanup
+  `);
+}
+function parseArgs(args) {
+    const branchIdx = args.indexOf('--branch');
+    return {
+        flowDir: args.find(a => !a.startsWith('--')),
+        targetBranch: branchIdx >= 0 ? args[branchIdx + 1] : undefined,
+        force: args.includes('--force'),
+        help: args.includes('--help') || args.includes('-h'),
+        dryRun: args.includes('--dry-run'),
+        noCleanup: args.includes('--no-cleanup'),
+    };
+}
+async function complete(args) {
+    const options = parseArgs(args);
+    if (options.help) {
+        printHelp();
+        return;
+    }
+    const config = (0, config_1.loadConfig)();
+    git.setVerboseGit(config.verboseGit || false);
+    const repoRoot = git.getRepoRoot();
+    const logsDir = (0, config_1.getLogsDir)(config);
+    const runService = (0, run_service_1.createRunService)(config.projectRoot);
+    // 1. Find Flow Directory
+    let flowDir = '';
+    if (!options.flowDir) {
+        flowDir = (0, flow_1.findLatestFlowOrTask)(config) || '';
+    }
+    else {
+        const flowsDir = (0, path_1.safeJoin)(config.projectRoot, config.flowsDir);
+        flowDir = (0, flow_1.findFlowDir)(flowsDir, options.flowDir) || path.resolve(options.flowDir);
+    }
+    if (!flowDir || !fs.existsSync(flowDir)) {
+        throw new Error(`Flow 디렉토리를 찾을 수 없습니다: ${options.flowDir || 'latest'}`);
+    }
+    logger.section(`🏁 Completing Flow: ${path.basename(flowDir)}`);
+    // 2. Find Latest Run
+    const runs = runService.listRuns().filter(run => {
+        // Check if this run belongs to the target flowDir
+        // We look at the first lane's state to check tasksFile
+        if (run.lanes.length === 0)
+            return false;
+        const laneDir = (0, path_1.safeJoin)(run.path, 'lanes', run.lanes[0].name);
+        const statePath = (0, path_1.safeJoin)(laneDir, 'state.json');
+        if (!fs.existsSync(statePath))
+            return false;
+        try {
+            const state = JSON.parse(fs.readFileSync(statePath, 'utf8'));
+            return state.tasksFile && path.resolve(path.dirname(state.tasksFile)) === path.resolve(flowDir);
+        }
+        catch {
+            return false;
+        }
+    });
+    if (runs.length === 0) {
+        throw new Error(`이 Flow에 대한 실행 기록(Run)을 찾을 수 없습니다.`);
+    }
+    const latestRun = runs[0];
+    logger.info(`Run ID: ${latestRun.id}`);
+    // 3. Verify Status
+    const summary = (0, process_1.getFlowSummary)(latestRun.path);
+    logger.info(`Status: ${summary.completed}/${summary.total} lanes completed`);
+    if (summary.completed < summary.total && !options.force) {
+        logger.error(`모든 레인이 완료되지 않았습니다 (${summary.completed}/${summary.total}).`);
+        logger.info('완료되지 않은 레인:');
+        const statuses = (0, process_1.getAllLaneProcessStatuses)(latestRun.path);
+        for (const s of statuses) {
+            if (s.actualStatus !== 'completed') {
+                logger.info(`  - ${s.laneName}: ${s.actualStatus}`);
+            }
+        }
+        logger.info('\n강제로 통합하려면 --force 옵션을 사용하세요.');
+        process.exit(1);
+    }
+    // 4. Determine Target Branch Name
+    const flowName = path.basename(flowDir).replace(/^\d+_/, '');
+    const targetBranch = options.targetBranch || `feature/${flowName}-integrated`;
+    // 5. Get Base Branch from flow.meta.json
+    let baseBranch = 'main';
+    const metaPath = (0, path_1.safeJoin)(flowDir, 'flow.meta.json');
+    if (fs.existsSync(metaPath)) {
+        try {
+            const meta = JSON.parse(fs.readFileSync(metaPath, 'utf8'));
+            baseBranch = meta.baseBranch || 'main';
+        }
+        catch (e) {
+            logger.warn(`flow.meta.json 읽기 실패, 기본값 main 사용: ${e}`);
+        }
+    }
+    logger.info(`Target Branch: ${targetBranch}`);
+    logger.info(`Base Branch: ${baseBranch}`);
+    const laneBranches = latestRun.lanes
+        .filter(l => l.pipelineBranch)
+        .map(l => l.pipelineBranch);
+    if (laneBranches.length === 0) {
+        throw new Error(`통합할 브랜치가 없습니다.`);
+    }
+    logger.info(`Lanes to merge: ${laneBranches.length}`);
+    for (const b of laneBranches) {
+        logger.info(`  - ${b}`);
+    }
+    if (options.dryRun) {
+        logger.section('🧪 Dry Run: No changes will be made');
+        logger.info(`Would create branch '${targetBranch}' from '${baseBranch}'`);
+        for (const b of laneBranches) {
+            logger.info(`Would merge '${b}' into '${targetBranch}'`);
+        }
+        if (!options.noCleanup) {
+            logger.info(`Would delete ${laneBranches.length} lane branches and ${latestRun.worktrees.length} worktrees`);
+        }
+        return;
+    }
+    // 6. Perform Merges
+    try {
+        // Ensure we are on a clean state in the main repo
+        const currentBranch = git.getCurrentBranch(repoRoot);
+        if (git.hasUncommittedChanges(repoRoot)) {
+            throw new Error('메인 저장소에 커밋되지 않은 변경사항이 있습니다. 커밋하거나 스태시한 후 다시 시도하세요.');
+        }
+        // Checkout base branch and create target branch
+        logger.info(`Creating target branch '${targetBranch}' from '${baseBranch}'...`);
+        git.runGit(['checkout', baseBranch], { cwd: repoRoot });
+        git.runGit(['checkout', '-B', targetBranch], { cwd: repoRoot });
+        // Merge each lane branch
+        for (const branch of laneBranches) {
+            logger.info(`Merging ${branch}...`);
+            // Fetch remote branch if needed
+            if (!git.branchExists(branch, { cwd: repoRoot })) {
+                logger.info(`  Fetching ${branch} from remote...`);
+                try {
+                    git.runGit(['fetch', 'origin', branch], { cwd: repoRoot });
+                }
+                catch (e) {
+                    logger.warn(`  Failed to fetch ${branch}: ${e}`);
+                }
+            }
+            const branchRef = git.branchExists(branch, { cwd: repoRoot }) ? branch : `origin/${branch}`;
+            const mergeResult = git.safeMerge(branchRef, {
+                cwd: repoRoot,
+                noFf: true,
+                message: `chore: merge lane ${branch} into flow integration`,
+                abortOnConflict: false, // We'll handle it below
+            });
+            if (!mergeResult.success) {
+                if (mergeResult.conflict) {
+                    logger.error(`❌ '${branch}' 병합 중 충돌이 발생했습니다.`);
+                    logger.error(`충돌 파일: ${mergeResult.conflictingFiles.join(', ')}`);
+                    logger.info('\n충돌을 해결한 후 다시 시도하거나, 수동으로 마무리하세요.');
+                    // Don't abort here, let the user see the state or suggest cleanup
+                    throw new Error('Merge conflict occurred during integration.');
+                }
+                else {
+                    throw new Error(`병합 실패 (${branch}): ${mergeResult.error}`);
+                }
+            }
+            logger.success(`✓ Merged ${branch}`);
+        }
+        // 7. Push final branch
+        logger.info(`Pushing '${targetBranch}' to remote...`);
+        git.push(targetBranch, { cwd: repoRoot, setUpstream: true });
+        logger.success(`✓ Pushed ${targetBranch}`);
+        // 8. Cleanup
+        if (!options.noCleanup) {
+            logger.section('🧹 Cleaning Up');
+            // Delete local and remote lane branches
+            for (const branch of laneBranches) {
+                logger.info(`Deleting branch: ${branch}`);
+                try {
+                    git.deleteBranch(branch, { cwd: repoRoot, force: true });
+                    // Try deleting remote branch too
+                    try {
+                        git.deleteBranch(branch, { cwd: repoRoot, remote: true });
+                    }
+                    catch {
+                        // Might not exist on remote or no permission
+                    }
+                }
+                catch (e) {
+                    logger.warn(`  Failed to delete branch ${branch}: ${e}`);
+                }
+            }
+            // Remove worktrees
+            for (const wtPath of latestRun.worktrees) {
+                if (fs.existsSync(wtPath)) {
+                    logger.info(`Removing worktree: ${wtPath}`);
+                    try {
+                        git.removeWorktree(wtPath, { cwd: repoRoot, force: true });
+                        if (fs.existsSync(wtPath)) {
+                            fs.rmSync(wtPath, { recursive: true, force: true });
+                        }
+                    }
+                    catch (e) {
+                        logger.warn(`  Failed to remove worktree ${wtPath}: ${e}`);
+                    }
+                }
+            }
+            // Optional: Delete run directory? Maybe keep logs for a while.
+            // logger.info(`Deleting run directory: ${latestRun.path}`);
+            // fs.rmSync(latestRun.path, { recursive: true, force: true });
+        }
+        // 9. Update flow status in meta
+        if (fs.existsSync(metaPath)) {
+            try {
+                const meta = JSON.parse(fs.readFileSync(metaPath, 'utf8'));
+                meta.status = 'completed';
+                meta.integratedBranch = targetBranch;
+                meta.integratedAt = new Date().toISOString();
+                fs.writeFileSync(metaPath, JSON.stringify(meta, null, 2));
+            }
+            catch (e) {
+                logger.warn(`flow.meta.json 업데이트 실패: ${e}`);
+            }
+        }
+        logger.section(`🎉 Flow Completion Success!`);
+        logger.info(`Final integrated branch: ${targetBranch}`);
+        logger.info(`You are now on branch: ${targetBranch}`);
+    }
+    catch (error) {
+        logger.error(`\n❌ Flow completion failed: ${error.message}`);
+        process.exit(1);
+    }
+}
+module.exports = complete;
+//# sourceMappingURL=complete.js.map

package/dist/cli/complete.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"complete.js","sourceRoot":"","sources":["../../src/cli/complete.ts"],"names":[],"mappings":"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"}

package/dist/cli/logs.js

@@ -41,7 +41,7 @@ const logger = __importStar(require("../utils/logger"));
 const config_1 = require("../utils/config");
 const path_1 = require("../utils/path");
 const enhanced_logger_1 = require("../utils/enhanced-logger");
-const log_formatter_1 = require("../utils/log-formatter");
+const formatter_1 = require("../services/logging/formatter");
 const log_constants_1 = require("../utils/log-constants");
 const log_viewer_1 = require("../ui/log-viewer");
 /**
@@ -154,26 +154,26 @@ function listLanes(runDir) {
         .filter(d => fs.statSync((0, path_1.safeJoin)(lanesDir, d)).isDirectory());
 }
 /**
- * Read and display text logs
+ * Read and display text logs (converted from JSONL)
  */
 function displayTextLogs(laneDir, options) {
-    let logFile;
-    const readableLog = (0, path_1.safeJoin)(laneDir, 'terminal-readable.log');
-    const rawLog = (0, path_1.safeJoin)(laneDir, 'terminal-raw.log');
-    if (options.raw) {
-        logFile = rawLog;
-    }
-    else {
-        // Default to readable log (clean option also uses readable now)
-        logFile = readableLog;
-    }
+    const logFile = (0, path_1.safeJoin)(laneDir, 'terminal.jsonl');
     if (!fs.existsSync(logFile)) {
         console.log('No log file found.');
         return;
     }
-    let content = fs.readFileSync(logFile, 'utf8');
-    let lines = content.split('\n');
-    // Apply filter (case-insensitive string match to avoid ReDoS)
+    const entries = (0, enhanced_logger_1.readJsonLog)(logFile);
+    let lines = entries.map(entry => {
+        const ts = new Date(entry.timestamp).toLocaleTimeString('en-US', { hour12: false });
+        const level = entry.level || 'info';
+        const content = entry.content || entry.message || '';
+        if (options.raw) {
+            // In "raw" mode for JSONL, we show a basic text representation
+            return `[${ts}] [${level.toUpperCase()}] ${content}`;
+        }
+        return `[${ts}] [${level.toUpperCase()}] ${(0, formatter_1.stripAnsi)(content)}`;
+    });
+    // Apply filter
     if (options.filter) {
         const filterLower = options.filter.toLowerCase();
         lines = lines.filter(line => line.toLowerCase().includes(filterLower));
@@ -182,10 +182,6 @@ function displayTextLogs(laneDir, options) {
     if (options.tail && lines.length > options.tail) {
         lines = lines.slice(-options.tail);
     }
-    // Clean ANSI if needed (for clean mode or default fallback)
-    if (!options.raw) {
-        lines = lines.map(line => (0, enhanced_logger_1.stripAnsi)(line));
-    }
     console.log(lines.join('\n'));
 }
 /**
@@ -207,7 +203,7 @@ function displayMainLogs(runDir, options) {
         lines = lines.slice(-options.tail);
     }
     if (options.clean) {
-        lines = lines.map(line => (0, enhanced_logger_1.stripAnsi)(line));
+        lines = lines.map(line => (0, formatter_1.stripAnsi)(line));
     }
     console.log(lines.join('\n'));
 }
@@ -245,7 +241,7 @@ function displayJsonLogs(laneDir, options) {
             const message = entry.message || '';
             const levelColor = getLevelColor(level);
             const ts = new Date(entry.timestamp).toLocaleTimeString();
-            const formattedMsg = (0, log_formatter_1.formatPotentialJsonMessage)(message);
+            const formattedMsg = (0, formatter_1.formatPotentialJsonMessage)(message);
             console.log(`${levelColor}[${ts}] [${level.toUpperCase().padEnd(6)}]${logger.COLORS.reset} ${formattedMsg}`);
         }
     }
@@ -375,7 +371,7 @@ function displayMergedLogs(runDir, options) {
             console.log(`${logger.COLORS.gray}[${ts}]${logger.COLORS.reset} ${laneColor}[${lanePad}]${logger.COLORS.reset} ${logger.COLORS.cyan}── Session Ended ──${logger.COLORS.reset}`);
             continue;
         }
-        const formattedMsg = (0, log_formatter_1.formatPotentialJsonMessage)(message);
+        const formattedMsg = (0, formatter_1.formatPotentialJsonMessage)(message);
         console.log(`${logger.COLORS.gray}[${ts}]${logger.COLORS.reset} ${laneColor}[${lanePad}]${logger.COLORS.reset} ${levelColor}[${levelPad}]${logger.COLORS.reset} ${formattedMsg}`);
     }
     console.log(`\n${logger.COLORS.cyan}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━${logger.COLORS.reset}`);
@@ -483,7 +479,7 @@ function followAllLogs(runDir, options) {
                 }
                 continue;
             }
-            const formattedMsg = (0, log_formatter_1.formatPotentialJsonMessage)(message);
+            const formattedMsg = (0, formatter_1.formatPotentialJsonMessage)(message);
             console.log(`${logger.COLORS.gray}[${ts}]${logger.COLORS.reset} ${entry.laneColor}[${lanePad}]${logger.COLORS.reset} ${levelColor}[${levelPad}]${logger.COLORS.reset} ${formattedMsg}`);
         }
     }, 100);
@@ -619,31 +615,19 @@ function escapeHtml(text) {
  * Follow logs in real-time
  */
 function followLogs(laneDir, options) {
-    let logFile;
-    const readableLog = (0, path_1.safeJoin)(laneDir, 'terminal-readable.log');
-    const rawLog = (0, path_1.safeJoin)(laneDir, 'terminal-raw.log');
-    if (options.raw) {
-        logFile = rawLog;
-    }
-    else {
-        // Default to readable log
-        logFile = readableLog;
-    }
+    const logFile = (0, path_1.safeJoin)(laneDir, 'terminal.jsonl');
     if (!fs.existsSync(logFile)) {
         console.log('Waiting for log file...');
     }
     let lastSize = 0;
     try {
-        // Use statSync directly to avoid TOCTOU race condition
         lastSize = fs.statSync(logFile).size;
     }
     catch {
-        // File doesn't exist yet or other error - start from 0
         lastSize = 0;
     }
     console.log(`${logger.COLORS.cyan}Following ${logFile}... (Ctrl+C to stop)${logger.COLORS.reset}\n`);
     const checkInterval = setInterval(() => {
-        // Use fstat on open fd to avoid TOCTOU race condition
         let fd = null;
         try {
             fd = fs.openSync(logFile, 'r');
@@ -651,25 +635,36 @@ function followLogs(laneDir, options) {
             if (stats.size > lastSize) {
                 const buffer = Buffer.alloc(stats.size - lastSize);
                 fs.readSync(fd, buffer, 0, buffer.length, lastSize);
-                let content = buffer.toString();
-                // Apply filter (case-insensitive string match to avoid ReDoS)
-                if (options.filter) {
-                    const filterLower = options.filter.toLowerCase();
-                    const lines = content.split('\n');
-                    content = lines.filter(line => line.toLowerCase().includes(filterLower)).join('\n');
-                }
-                // Clean ANSI if needed (unless raw mode)
-                if (!options.raw) {
-                    content = (0, enhanced_logger_1.stripAnsi)(content);
-                }
-                if (content.trim()) {
-                    process.stdout.write(content);
+                const content = buffer.toString();
+                const lines = content.split('\n').filter(l => l.trim());
+                for (const line of lines) {
+                    try {
+                        const entry = JSON.parse(line);
+                        const ts = new Date(entry.timestamp).toLocaleTimeString('en-US', { hour12: false });
+                        const level = entry.level || 'info';
+                        const levelColor = getLevelColor(level);
+                        const message = entry.content || entry.message || '';
+                        // Apply level filter
+                        if (options.level && level !== options.level)
+                            continue;
+                        // Apply filter
+                        if (options.filter) {
+                            const filterLower = options.filter.toLowerCase();
+                            if (!message.toLowerCase().includes(filterLower))
+                                continue;
+                        }
+                        const displayMsg = options.raw ? message : (0, formatter_1.stripAnsi)(message);
+                        console.log(`${logger.COLORS.gray}[${ts}]${logger.COLORS.reset} ${levelColor}[${level.toUpperCase().padEnd(6)}]${logger.COLORS.reset} ${displayMsg}`);
+                    }
+                    catch {
+                        // Skip invalid JSON
+                    }
                 }
                 lastSize = stats.size;
             }
         }
         catch {
-            // Ignore errors (file might be rotating)
+            // Ignore errors
         }
         finally {
             if (fd !== null) {
@@ -718,7 +713,7 @@ function followMainLogs(runDir, options) {
                     content = lines.filter(line => line.toLowerCase().includes(filterLower)).join('\n');
                 }
                 if (options.clean) {
-                    content = (0, enhanced_logger_1.stripAnsi)(content);
+                    content = (0, formatter_1.stripAnsi)(content);
                 }
                 if (content.trim()) {
                     process.stdout.write(content);
@@ -758,16 +753,11 @@ function displaySummary(runDir) {
     }
     for (const lane of lanes) {
         const laneDir = (0, path_1.safeJoin)(runDir, 'lanes', lane);
-        const rawLog = (0, path_1.safeJoin)(laneDir, 'terminal-raw.log');
-        const readableLog = (0, path_1.safeJoin)(laneDir, 'terminal-readable.log');
+        const jsonlLog = (0, path_1.safeJoin)(laneDir, 'terminal.jsonl');
         console.log(`  ${logger.COLORS.green}📁 ${lane}${logger.COLORS.reset}`);
-        if (fs.existsSync(readableLog)) {
-            const stats = fs.statSync(readableLog);
-            console.log(`     └─ terminal-readable.log ${formatSize(stats.size)} ${logger.COLORS.yellow}(default)${logger.COLORS.reset}`);
-        }
-        if (fs.existsSync(rawLog)) {
-            const stats = fs.statSync(rawLog);
-            console.log(`     └─ terminal-raw.log      ${formatSize(stats.size)}`);
+        if (fs.existsSync(jsonlLog)) {
+            const stats = fs.statSync(jsonlLog);
+            console.log(`     └─ terminal.jsonl ${formatSize(stats.size)} ${logger.COLORS.yellow}(unified)${logger.COLORS.reset}`);
         }
         console.log('');
     }
@@ -856,7 +846,7 @@ async function logs(args) {
             }
             let content = fs.readFileSync(logFile, 'utf8');
             if (options.clean) {
-                content = (0, enhanced_logger_1.stripAnsi)(content);
+                content = (0, formatter_1.stripAnsi)(content);
             }
             fs.writeFileSync(options.output, content, 'utf8');
             console.log(`Exported main log to: ${options.output}`);