claude-code-workflow 6.3.18 → 6.3.20

package/ccw/dist/tools/cli-executor.js

@@ -1,1888 +1,7 @@
 /**
  * CLI Executor Tool - Unified execution for external CLI tools
- * Supports Gemini, Qwen, and Codex with streaming output
+ *
+ * Thin re-export facade to keep the public API stable.
  */
-import { z } from 'zod';
-import { spawn } from 'child_process';
-import { existsSync, readdirSync } from 'fs';
-import { join } from 'path';
-// Track current running child process for cleanup on interruption
-let currentChildProcess = null;
-/**
- * Kill the current running CLI child process
- * Called when parent process receives SIGINT/SIGTERM
- */
-export function killCurrentCliProcess() {
-    if (currentChildProcess && !currentChildProcess.killed) {
-        debugLog('KILL', 'Killing current child process', { pid: currentChildProcess.pid });
-        currentChildProcess.kill('SIGTERM');
-        // Force kill after 2 seconds if still running
-        setTimeout(() => {
-            if (currentChildProcess && !currentChildProcess.killed) {
-                currentChildProcess.kill('SIGKILL');
-            }
-        }, 2000);
-        return true;
-    }
-    return false;
-}
-// Debug logging utility - check env at runtime for --debug flag support
-function isDebugEnabled() {
-    return process.env.DEBUG === 'true' || process.env.DEBUG === '1' || process.env.CCW_DEBUG === 'true';
-}
-function debugLog(category, message, data) {
-    if (!isDebugEnabled())
-        return;
-    const timestamp = new Date().toISOString();
-    const prefix = `[${timestamp}] [CLI-DEBUG] [${category}]`;
-    if (data) {
-        console.error(`${prefix} ${message}`, JSON.stringify(data, null, 2));
-    }
-    else {
-        console.error(`${prefix} ${message}`);
-    }
-}
-function errorLog(category, message, error, context) {
-    const timestamp = new Date().toISOString();
-    const prefix = `[${timestamp}] [CLI-ERROR] [${category}]`;
-    console.error(`${prefix} ${message}`);
-    if (error instanceof Error) {
-        console.error(`${prefix} Error: ${error.message}`);
-        if (isDebugEnabled() && error.stack) {
-            console.error(`${prefix} Stack: ${error.stack}`);
-        }
-    }
-    else if (error) {
-        console.error(`${prefix} Error: ${String(error)}`);
-    }
-    if (context) {
-        console.error(`${prefix} Context:`, JSON.stringify(context, null, 2));
-    }
-}
-// LiteLLM integration
-import { executeLiteLLMEndpoint } from './litellm-executor.js';
-import { findEndpointById } from '../config/litellm-api-config-manager.js';
-// Native resume support
-import { trackNewSession, supportsNativeResume } from './native-session-discovery.js';
-import { determineResumeStrategy, buildContextPrefix, getResumeModeDescription } from './resume-strategy.js';
-import { isToolEnabled as isToolEnabledFromConfig, enableTool as enableToolFromConfig, disableTool as disableToolFromConfig, getPrimaryModel } from './cli-config-manager.js';
-import { StoragePaths, ensureStorageDir } from '../config/storage-paths.js';
-// Lazy-loaded SQLite store module
-let sqliteStoreModule = null;
-/**
- * Get or initialize SQLite store (async)
- */
-async function getSqliteStore(baseDir) {
-    if (!sqliteStoreModule) {
-        sqliteStoreModule = await import('./cli-history-store.js');
-    }
-    return sqliteStoreModule.getHistoryStore(baseDir);
-}
-/**
- * Get SQLite store (sync - uses cached module)
- */
-function getSqliteStoreSync(baseDir) {
-    if (!sqliteStoreModule) {
-        throw new Error('SQLite store not initialized. Call an async function first.');
-    }
-    return sqliteStoreModule.getHistoryStore(baseDir);
-}
-// Define Zod schema for validation
-const ParamsSchema = z.object({
-    tool: z.enum(['gemini', 'qwen', 'codex']),
-    prompt: z.string().min(1, 'Prompt is required'),
-    mode: z.enum(['analysis', 'write', 'auto']).default('analysis'),
-    format: z.enum(['plain', 'yaml', 'json']).default('plain'), // Multi-turn prompt concatenation format
-    model: z.string().optional(),
-    cd: z.string().optional(),
-    includeDirs: z.string().optional(),
-    timeout: z.number().default(0), // 0 = no internal timeout, controlled by external caller (e.g., bash timeout)
-    resume: z.union([z.boolean(), z.string()]).optional(), // true = last, string = single ID or comma-separated IDs
-    id: z.string().optional(), // Custom execution ID (e.g., IMPL-001-step1)
-    noNative: z.boolean().optional(), // Force prompt concatenation instead of native resume
-    category: z.enum(['user', 'internal', 'insight']).default('user'), // Execution category for tracking
-    parentExecutionId: z.string().optional(), // Parent execution ID for fork/retry scenarios
-    stream: z.boolean().default(false), // false = cache full output (default), true = stream output via callback
-});
-// Cache storage: Map<toolName, CachedToolAvailability>
-const toolAvailabilityCache = new Map();
-const CACHE_TTL_MS = 5 * 60 * 1000; // 5 minutes
-/**
- * Check if cache entry is still valid
- */
-function isCacheValid(cached) {
-    return Date.now() - cached.timestamp < CACHE_TTL_MS;
-}
-/**
- * Clear expired cache entries
- */
-function clearExpiredCache() {
-    const now = Date.now();
-    const entriesToDelete = [];
-    toolAvailabilityCache.forEach((cached, tool) => {
-        if (now - cached.timestamp >= CACHE_TTL_MS) {
-            entriesToDelete.push(tool);
-        }
-    });
-    entriesToDelete.forEach(tool => toolAvailabilityCache.delete(tool));
-}
-/**
- * Clear all cache entries (useful for testing or forced refresh)
- */
-export function clearToolCache() {
-    toolAvailabilityCache.clear();
-}
-/**
- * Check if a CLI tool is available (with caching)
- */
-async function checkToolAvailability(tool) {
-    debugLog('TOOL_CHECK', `Checking availability for tool: ${tool}`);
-    // Check cache first
-    const cached = toolAvailabilityCache.get(tool);
-    if (cached && isCacheValid(cached)) {
-        debugLog('TOOL_CHECK', `Cache hit for ${tool}`, { available: cached.result.available, path: cached.result.path });
-        return cached.result;
-    }
-    // Clear expired entries periodically
-    clearExpiredCache();
-    // Perform actual check
-    return new Promise((resolve) => {
-        const isWindows = process.platform === 'win32';
-        const command = isWindows ? 'where' : 'which';
-        debugLog('TOOL_CHECK', `Running ${command} ${tool}`, { platform: process.platform });
-        // Direct spawn - where/which are system commands that don't need shell wrapper
-        const child = spawn(command, [tool], {
-            shell: false,
-            stdio: ['ignore', 'pipe', 'pipe']
-        });
-        let stdout = '';
-        let stderr = '';
-        child.stdout.on('data', (data) => { stdout += data.toString(); });
-        child.stderr?.on('data', (data) => { stderr += data.toString(); });
-        child.on('close', (code) => {
-            const result = code === 0 && stdout.trim()
-                ? { available: true, path: stdout.trim().split('\n')[0] }
-                : { available: false, path: null };
-            if (result.available) {
-                debugLog('TOOL_CHECK', `Tool ${tool} found`, { path: result.path });
-                // Only cache positive results to avoid caching transient failures
-                toolAvailabilityCache.set(tool, {
-                    result,
-                    timestamp: Date.now()
-                });
-            }
-            else {
-                debugLog('TOOL_CHECK', `Tool ${tool} not found`, { exitCode: code, stderr: stderr.trim() || '(empty)' });
-            }
-            resolve(result);
-        });
-        child.on('error', (error) => {
-            errorLog('TOOL_CHECK', `Failed to check tool availability: ${tool}`, error, { command, tool });
-            // Don't cache errors - they may be transient
-            resolve({ available: false, path: null });
-        });
-        // Timeout after 5 seconds
-        setTimeout(() => {
-            child.kill();
-            debugLog('TOOL_CHECK', `Timeout checking tool ${tool} (5s)`);
-            // Don't cache timeouts - they may be transient
-            resolve({ available: false, path: null });
-        }, 5000);
-    });
-}
-/**
- * Build command arguments based on tool and options
- */
-function buildCommand(params) {
-    const { tool, prompt, mode = 'analysis', model, dir, include, nativeResume } = params;
-    debugLog('BUILD_CMD', `Building command for tool: ${tool}`, {
-        mode,
-        model: model || '(default)',
-        dir: dir || '(cwd)',
-        include: include || '(none)',
-        nativeResume: nativeResume ? { enabled: nativeResume.enabled, isLatest: nativeResume.isLatest, sessionId: nativeResume.sessionId } : '(none)',
-        promptLength: prompt.length
-    });
-    let command = tool;
-    let args = [];
-    // Default to stdin for all tools to avoid escaping issues on Windows
-    let useStdin = true;
-    switch (tool) {
-        case 'gemini':
-            // Native resume: gemini -r <uuid> or -r latest
-            if (nativeResume?.enabled) {
-                if (nativeResume.isLatest) {
-                    args.push('-r', 'latest');
-                }
-                else if (nativeResume.sessionId) {
-                    args.push('-r', nativeResume.sessionId);
-                }
-            }
-            if (model) {
-                args.push('-m', model);
-            }
-            if (mode === 'write') {
-                args.push('--approval-mode', 'yolo');
-            }
-            if (include) {
-                args.push('--include-directories', include);
-            }
-            break;
-        case 'qwen':
-            // Native resume: qwen --continue (latest) or --resume <uuid>
-            if (nativeResume?.enabled) {
-                if (nativeResume.isLatest) {
-                    args.push('--continue');
-                }
-                else if (nativeResume.sessionId) {
-                    args.push('--resume', nativeResume.sessionId);
-                }
-            }
-            if (model) {
-                args.push('-m', model);
-            }
-            if (mode === 'write') {
-                args.push('--approval-mode', 'yolo');
-            }
-            if (include) {
-                args.push('--include-directories', include);
-            }
-            break;
-        case 'codex':
-            // Codex supports stdin when using `-` as prompt argument
-            // Using stdin avoids Windows command line escaping issues with multi-line/special char prompts
-            useStdin = true;
-            // Native resume: codex resume <uuid> [prompt] or --last
-            if (nativeResume?.enabled) {
-                args.push('resume');
-                if (nativeResume.isLatest) {
-                    args.push('--last');
-                }
-                else if (nativeResume.sessionId) {
-                    args.push(nativeResume.sessionId);
-                }
-                // Codex resume still supports additional flags
-                // Note: -C is NOT used because spawn's cwd already sets the working directory
-                // Using both would cause path to be applied twice (e.g., codex-lens/codex-lens)
-                // Permission configuration based on mode:
-                // - analysis: --full-auto (read-only sandbox, no prompts) - safer for read operations
-                // - write/auto: --dangerously-bypass-approvals-and-sandbox (full access for modifications)
-                if (mode === 'write' || mode === 'auto') {
-                    args.push('--dangerously-bypass-approvals-and-sandbox');
-                }
-                else {
-                    args.push('--full-auto');
-                }
-                if (model) {
-                    args.push('-m', model);
-                }
-                if (include) {
-                    const dirs = include.split(',').map(d => d.trim()).filter(d => d);
-                    for (const addDir of dirs) {
-                        args.push('--add-dir', addDir);
-                    }
-                }
-                // Use `-` to indicate reading prompt from stdin
-                args.push('-');
-            }
-            else {
-                // Standard exec mode
-                args.push('exec');
-                // Note: -C is NOT used because spawn's cwd already sets the working directory
-                // Using both would cause path to be applied twice (e.g., codex-lens/codex-lens)
-                // Permission configuration based on mode:
-                // - analysis: --full-auto (read-only sandbox, no prompts) - safer for read operations
-                // - write/auto: --dangerously-bypass-approvals-and-sandbox (full access for modifications)
-                if (mode === 'write' || mode === 'auto') {
-                    args.push('--dangerously-bypass-approvals-and-sandbox');
-                }
-                else {
-                    args.push('--full-auto');
-                }
-                if (model) {
-                    args.push('-m', model);
-                }
-                if (include) {
-                    const dirs = include.split(',').map(d => d.trim()).filter(d => d);
-                    for (const addDir of dirs) {
-                        args.push('--add-dir', addDir);
-                    }
-                }
-                // Use `-` to indicate reading prompt from stdin (avoids Windows escaping issues)
-                args.push('-');
-            }
-            break;
-        case 'claude':
-            // Claude Code: claude -p "prompt" for non-interactive mode
-            args.push('-p'); // Print mode (non-interactive)
-            // Native resume: claude --resume <session-id> or --continue
-            if (nativeResume?.enabled) {
-                if (nativeResume.isLatest) {
-                    args.push('--continue');
-                }
-                else if (nativeResume.sessionId) {
-                    args.push('--resume', nativeResume.sessionId);
-                }
-            }
-            if (model) {
-                args.push('--model', model);
-            }
-            // Permission modes: write/auto → bypassPermissions, analysis → default
-            if (mode === 'write' || mode === 'auto') {
-                args.push('--permission-mode', 'bypassPermissions');
-            }
-            else {
-                args.push('--permission-mode', 'default');
-            }
-            // Output format for better parsing
-            args.push('--output-format', 'text');
-            // Add directories
-            if (include) {
-                const dirs = include.split(',').map(d => d.trim()).filter(d => d);
-                for (const addDir of dirs) {
-                    args.push('--add-dir', addDir);
-                }
-            }
-            break;
-        default:
-            errorLog('BUILD_CMD', `Unknown CLI tool: ${tool}`);
-            throw new Error(`Unknown CLI tool: ${tool}`);
-    }
-    debugLog('BUILD_CMD', `Command built successfully`, {
-        command,
-        args,
-        useStdin,
-        fullCommand: `${command} ${args.join(' ')}${useStdin ? ' (stdin)' : ''}`
-    });
-    return { command, args, useStdin };
-}
-/**
- * Ensure history directory exists (uses centralized storage)
- */
-function ensureHistoryDir(baseDir) {
-    const paths = StoragePaths.project(baseDir);
-    ensureStorageDir(paths.cliHistory);
-    return paths.cliHistory;
-}
-/**
- * Save conversation to SQLite
- * @param baseDir - Project base directory (NOT historyDir)
- */
-async function saveConversationAsync(baseDir, conversation) {
-    const store = await getSqliteStore(baseDir);
-    store.saveConversation(conversation);
-}
-/**
- * Sync wrapper for saveConversation (uses cached SQLite module)
- * @param baseDir - Project base directory (NOT historyDir)
- */
-function saveConversation(baseDir, conversation) {
-    try {
-        const store = getSqliteStoreSync(baseDir);
-        store.saveConversation(conversation);
-    }
-    catch {
-        // If sync not available, queue for async save
-        saveConversationAsync(baseDir, conversation).catch(err => {
-            console.error('[CLI Executor] Failed to save conversation:', err.message);
-        });
-    }
-}
-/**
- * Load existing conversation by ID from SQLite
- * @param baseDir - Project base directory (NOT historyDir)
- */
-async function loadConversationAsync(baseDir, conversationId) {
-    const store = await getSqliteStore(baseDir);
-    return store.getConversation(conversationId);
-}
-/**
- * Sync wrapper for loadConversation (uses cached SQLite module)
- * @param baseDir - Project base directory (NOT historyDir)
- */
-function loadConversation(baseDir, conversationId) {
-    try {
-        const store = getSqliteStoreSync(baseDir);
-        return store.getConversation(conversationId);
-    }
-    catch {
-        // SQLite not initialized yet, return null
-        return null;
-    }
-}
-/**
- * Convert legacy ExecutionRecord to ConversationRecord
- */
-function convertToConversation(record) {
-    return {
-        id: record.id,
-        created_at: record.timestamp,
-        updated_at: record.timestamp,
-        tool: record.tool,
-        model: record.model,
-        mode: record.mode,
-        category: 'user', // Legacy records default to user category
-        total_duration_ms: record.duration_ms,
-        turn_count: 1,
-        latest_status: record.status,
-        turns: [{
-                turn: 1,
-                timestamp: record.timestamp,
-                prompt: record.prompt,
-                duration_ms: record.duration_ms,
-                status: record.status,
-                exit_code: record.exit_code,
-                output: record.output
-            }]
-    };
-}
-function mergeConversations(conversations) {
-    const mergedTurns = [];
-    // Collect all turns with source tracking
-    for (const conv of conversations) {
-        for (const turn of conv.turns) {
-            mergedTurns.push({
-                ...turn,
-                source_id: conv.id
-            });
-        }
-    }
-    // Sort by timestamp
-    mergedTurns.sort((a, b) => new Date(a.timestamp).getTime() - new Date(b.timestamp).getTime());
-    // Re-number turns
-    mergedTurns.forEach((turn, idx) => {
-        turn.turn = idx + 1;
-    });
-    // Calculate total duration
-    const totalDuration = mergedTurns.reduce((sum, t) => sum + t.duration_ms, 0);
-    return {
-        mergedTurns,
-        sourceConversations: conversations,
-        totalDuration
-    };
-}
-/**
- * Build prompt from merged conversations
- */
-function buildMergedPrompt(mergeResult, newPrompt, format = 'plain') {
-    const concatenator = createPromptConcatenator({ format });
-    // Set metadata for merged conversations
-    concatenator.setMetadata('merged_sources', mergeResult.sourceConversations.map(c => c.id).join(', '));
-    // Add all merged turns with source tracking
-    for (const turn of mergeResult.mergedTurns) {
-        concatenator.addFromConversationTurn(turn, turn.source_id);
-    }
-    return concatenator.build(newPrompt);
-}
-/**
- * Execute CLI tool with streaming output
- */
-async function executeCliTool(params, onOutput) {
-    const parsed = ParamsSchema.safeParse(params);
-    if (!parsed.success) {
-        throw new Error(`Invalid params: ${parsed.error.message}`);
-    }
-    const { tool, prompt, mode, format, model, cd, includeDirs, timeout, resume, id: customId, noNative, category, parentExecutionId } = parsed.data;
-    // Determine working directory early (needed for conversation lookup)
-    const workingDir = cd || process.cwd();
-    ensureHistoryDir(workingDir); // Ensure history directory exists
-    // NEW: Check if model is a custom LiteLLM endpoint ID
-    if (model) {
-        const endpoint = findEndpointById(workingDir, model);
-        if (endpoint) {
-            // Route to LiteLLM executor
-            if (onOutput) {
-                onOutput({ type: 'stderr', data: `[Routing to LiteLLM endpoint: ${model}]\n` });
-            }
-            const result = await executeLiteLLMEndpoint({
-                prompt,
-                endpointId: model,
-                baseDir: workingDir,
-                cwd: cd,
-                includeDirs: includeDirs ? includeDirs.split(',').map(d => d.trim()) : undefined,
-                enableCache: true,
-                onOutput: onOutput || undefined,
-            });
-            // Convert LiteLLM result to ExecutionOutput format
-            const startTime = Date.now();
-            const endTime = Date.now();
-            const duration = endTime - startTime;
-            const execution = {
-                id: customId || `${Date.now()}-litellm`,
-                timestamp: new Date(startTime).toISOString(),
-                tool: 'litellm',
-                model: result.model,
-                mode,
-                prompt,
-                status: result.success ? 'success' : 'error',
-                exit_code: result.success ? 0 : 1,
-                duration_ms: duration,
-                output: {
-                    stdout: result.output,
-                    stderr: result.error || '',
-                    truncated: false,
-                },
-            };
-            const conversation = convertToConversation(execution);
-            // Try to save to history
-            try {
-                saveConversation(workingDir, conversation);
-            }
-            catch (err) {
-                console.error('[CLI Executor] Failed to save LiteLLM history:', err.message);
-            }
-            return {
-                success: result.success,
-                execution,
-                conversation,
-                stdout: result.output,
-                stderr: result.error || '',
-            };
-        }
-    }
-    // Get SQLite store for native session lookup
-    const store = await getSqliteStore(workingDir);
-    // Determine conversation ID and load existing conversation
-    // Logic:
-    // - If --resume <id1,id2,...> (multiple IDs): merge conversations
-    //   - With --id: create new merged conversation
-    //   - Without --id: append to ALL source conversations
-    // - If --resume <id> AND --id <newId>: fork - read context from resume ID, create new conversation with newId
-    // - If --id provided (no resume): use that ID (create new or append)
-    // - If --resume <id> without --id: use resume ID (append to existing)
-    // - No params: create new with auto-generated ID
-    let conversationId;
-    let existingConversation = null;
-    let contextConversation = null; // For fork scenario
-    let mergeResult = null; // For merge scenario
-    let sourceConversations = []; // All source conversations for merge
-    // Parse resume IDs (can be comma-separated for merge)
-    const resumeIds = resume
-        ? (typeof resume === 'string' ? resume.split(',').map(id => id.trim()).filter(Boolean) : [])
-        : [];
-    const isMerge = resumeIds.length > 1;
-    const resumeId = resumeIds.length === 1 ? resumeIds[0] : null;
-    if (isMerge) {
-        // Merge scenario: multiple resume IDs
-        sourceConversations = resumeIds
-            .map(id => loadConversation(workingDir, id))
-            .filter((c) => c !== null);
-        if (sourceConversations.length === 0) {
-            throw new Error('No valid conversations found for merge');
-        }
-        mergeResult = mergeConversations(sourceConversations);
-        if (customId) {
-            // Create new merged conversation with custom ID
-            conversationId = customId;
-            existingConversation = loadConversation(workingDir, customId);
-        }
-        else {
-            // Will append to ALL source conversations (handled in save logic)
-            // Use first source conversation ID as primary
-            conversationId = sourceConversations[0].id;
-            existingConversation = sourceConversations[0];
-        }
-    }
-    else if (customId && resumeId) {
-        // Fork: read context from resume ID, but create new conversation with custom ID
-        conversationId = customId;
-        contextConversation = loadConversation(workingDir, resumeId);
-        existingConversation = loadConversation(workingDir, customId);
-    }
-    else if (customId) {
-        // Use custom ID - may be new or existing
-        conversationId = customId;
-        existingConversation = loadConversation(workingDir, customId);
-    }
-    else if (resumeId) {
-        // Resume single ID without new ID - append to existing conversation
-        conversationId = resumeId;
-        existingConversation = loadConversation(workingDir, resumeId);
-    }
-    else if (resume) {
-        // resume=true: get last conversation for this tool
-        const history = getExecutionHistory(workingDir, { limit: 1, tool });
-        if (history.executions.length > 0) {
-            conversationId = history.executions[0].id;
-            existingConversation = loadConversation(workingDir, conversationId);
-        }
-        else {
-            // No previous conversation, create new
-            conversationId = `${Date.now()}-${tool}`;
-        }
-    }
-    else {
-        // New conversation with auto-generated ID
-        conversationId = `${Date.now()}-${tool}`;
-    }
-    // Determine resume strategy (native vs prompt-concat vs hybrid)
-    let resumeDecision = null;
-    let nativeResumeConfig;
-    // resume=true (latest) - use native latest if supported
-    if (resume === true && !noNative && supportsNativeResume(tool)) {
-        resumeDecision = {
-            strategy: 'native',
-            isLatest: true,
-            primaryConversationId: conversationId
-        };
-    }
-    // Use strategy engine for complex scenarios
-    else if (resumeIds.length > 0 && !noNative) {
-        resumeDecision = determineResumeStrategy({
-            tool,
-            resumeIds,
-            customId,
-            forcePromptConcat: noNative,
-            getNativeSessionId: (ccwId) => store.getNativeSessionId(ccwId),
-            getConversation: (ccwId) => loadConversation(workingDir, ccwId),
-            getConversationTool: (ccwId) => {
-                const conv = loadConversation(workingDir, ccwId);
-                return conv?.tool || null;
-            }
-        });
-    }
-    // Configure native resume if strategy decided to use it
-    if (resumeDecision && (resumeDecision.strategy === 'native' || resumeDecision.strategy === 'hybrid')) {
-        nativeResumeConfig = {
-            enabled: true,
-            sessionId: resumeDecision.nativeSessionId,
-            isLatest: resumeDecision.isLatest
-        };
-    }
-    // Build final prompt with conversation context
-    // For native: minimal prompt (native tool handles context)
-    // For hybrid: context prefix from other conversations + new prompt
-    // For prompt-concat: full multi-turn prompt
-    let finalPrompt = prompt;
-    if (resumeDecision?.strategy === 'native') {
-        // Native mode: just use the new prompt, tool handles context
-        finalPrompt = prompt;
-    }
-    else if (resumeDecision?.strategy === 'hybrid' && resumeDecision.contextTurns?.length) {
-        // Hybrid mode: add context prefix from other conversations
-        const contextPrefix = buildContextPrefix(resumeDecision.contextTurns, format);
-        finalPrompt = contextPrefix + prompt;
-    }
-    else if (mergeResult && mergeResult.mergedTurns.length > 0) {
-        // Full merge: use merged prompt
-        finalPrompt = buildMergedPrompt(mergeResult, prompt, format);
-    }
-    else {
-        // Standard prompt-concat
-        const conversationForContext = contextConversation || existingConversation;
-        if (conversationForContext && conversationForContext.turns.length > 0) {
-            finalPrompt = buildMultiTurnPrompt(conversationForContext, prompt, format);
-        }
-    }
-    // Check tool availability
-    const toolStatus = await checkToolAvailability(tool);
-    if (!toolStatus.available) {
-        throw new Error(`CLI tool not available: ${tool}. Please ensure it is installed and in PATH.`);
-    }
-    // Log resume mode for debugging
-    if (resumeDecision) {
-        const modeDesc = getResumeModeDescription(resumeDecision);
-        if (onOutput) {
-            onOutput({ type: 'stderr', data: `[Resume mode: ${modeDesc}]\n` });
-        }
-    }
-    // Use configured primary model if no explicit model provided
-    const effectiveModel = model || getPrimaryModel(workingDir, tool);
-    // Build command
-    const { command, args, useStdin } = buildCommand({
-        tool,
-        prompt: finalPrompt,
-        mode,
-        model: effectiveModel,
-        dir: cd,
-        include: includeDirs,
-        nativeResume: nativeResumeConfig
-    });
-    const startTime = Date.now();
-    debugLog('EXEC', `Starting CLI execution`, {
-        tool,
-        mode,
-        workingDir,
-        conversationId,
-        promptLength: finalPrompt.length,
-        hasResume: !!resume,
-        hasCustomId: !!customId
-    });
-    return new Promise((resolve, reject) => {
-        // Windows requires shell: true for npm global commands (.cmd files)
-        // Unix-like systems can use shell: false for direct execution
-        const isWindows = process.platform === 'win32';
-        debugLog('SPAWN', `Spawning process`, {
-            command,
-            args,
-            cwd: workingDir,
-            shell: isWindows,
-            useStdin,
-            platform: process.platform,
-            fullCommand: `${command} ${args.join(' ')}`
-        });
-        const child = spawn(command, args, {
-            cwd: workingDir,
-            shell: isWindows, // Enable shell on Windows for .cmd files
-            stdio: [useStdin ? 'pipe' : 'ignore', 'pipe', 'pipe']
-        });
-        // Track current child process for cleanup on interruption
-        currentChildProcess = child;
-        debugLog('SPAWN', `Process spawned`, { pid: child.pid });
-        // Write prompt to stdin if using stdin mode (for gemini/qwen)
-        if (useStdin && child.stdin) {
-            debugLog('STDIN', `Writing prompt to stdin (${finalPrompt.length} bytes)`);
-            child.stdin.write(finalPrompt);
-            child.stdin.end();
-        }
-        let stdout = '';
-        let stderr = '';
-        let timedOut = false;
-        // Handle stdout
-        child.stdout.on('data', (data) => {
-            const text = data.toString();
-            stdout += text;
-            if (onOutput) {
-                onOutput({ type: 'stdout', data: text });
-            }
-        });
-        // Handle stderr
-        child.stderr.on('data', (data) => {
-            const text = data.toString();
-            stderr += text;
-            if (onOutput) {
-                onOutput({ type: 'stderr', data: text });
-            }
-        });
-        // Handle completion
-        child.on('close', async (code) => {
-            // Clear current child process reference
-            currentChildProcess = null;
-            const endTime = Date.now();
-            const duration = endTime - startTime;
-            debugLog('CLOSE', `Process closed`, {
-                exitCode: code,
-                duration: `${duration}ms`,
-                timedOut,
-                stdoutLength: stdout.length,
-                stderrLength: stderr.length
-            });
-            // Determine status - prioritize output content over exit code
-            let status = 'success';
-            if (timedOut) {
-                status = 'timeout';
-                debugLog('STATUS', `Execution timed out after ${duration}ms`);
-            }
-            else if (code !== 0) {
-                // Non-zero exit code doesn't always mean failure
-                // Check if there's valid output (AI response) - treat as success
-                const hasValidOutput = stdout.trim().length > 0;
-                const hasFatalError = stderr.includes('FATAL') ||
-                    stderr.includes('Authentication failed') ||
-                    stderr.includes('API key') ||
-                    stderr.includes('rate limit exceeded');
-                debugLog('STATUS', `Non-zero exit code analysis`, {
-                    exitCode: code,
-                    hasValidOutput,
-                    hasFatalError,
-                    stderrPreview: stderr.substring(0, 500)
-                });
-                if (hasValidOutput && !hasFatalError) {
-                    // Has output and no fatal errors - treat as success despite exit code
-                    status = 'success';
-                    debugLog('STATUS', `Treating as success (has valid output, no fatal errors)`);
-                }
-                else {
-                    status = 'error';
-                    errorLog('EXEC', `CLI execution failed`, undefined, {
-                        exitCode: code,
-                        tool,
-                        command,
-                        args,
-                        workingDir,
-                        stderrFull: stderr,
-                        stdoutPreview: stdout.substring(0, 200)
-                    });
-                }
-            }
-            else {
-                debugLog('STATUS', `Execution successful (exit code 0)`);
-            }
-            // Create new turn - cache full output when not streaming (default)
-            const shouldCache = !parsed.data.stream;
-            const newTurnOutput = {
-                stdout: stdout.substring(0, 10240), // Truncate preview to 10KB
-                stderr: stderr.substring(0, 2048), // Truncate preview to 2KB
-                truncated: stdout.length > 10240 || stderr.length > 2048,
-                cached: shouldCache,
-                stdout_full: shouldCache ? stdout : undefined,
-                stderr_full: shouldCache ? stderr : undefined
-            };
-            // Determine base turn number for merge scenarios
-            const baseTurnNumber = isMerge && mergeResult
-                ? mergeResult.mergedTurns.length + 1
-                : (existingConversation ? existingConversation.turns.length + 1 : 1);
-            const newTurn = {
-                turn: baseTurnNumber,
-                timestamp: new Date(startTime).toISOString(),
-                prompt,
-                duration_ms: duration,
-                status,
-                exit_code: code,
-                output: newTurnOutput
-            };
-            // Create or update conversation record
-            let conversation;
-            if (isMerge && mergeResult && !customId) {
-                // Merge without --id: append to ALL source conversations
-                // Save new turn to each source conversation
-                const savedConversations = [];
-                for (const srcConv of sourceConversations) {
-                    const turnForSrc = {
-                        ...newTurn,
-                        turn: srcConv.turns.length + 1 // Use each conversation's turn count
-                    };
-                    const updatedConv = {
-                        ...srcConv,
-                        updated_at: new Date().toISOString(),
-                        total_duration_ms: srcConv.total_duration_ms + duration,
-                        turn_count: srcConv.turns.length + 1,
-                        latest_status: status,
-                        turns: [...srcConv.turns, turnForSrc]
-                    };
-                    savedConversations.push(updatedConv);
-                }
-                // Use first conversation as primary
-                conversation = savedConversations[0];
-                // Save all source conversations
-                try {
-                    for (const conv of savedConversations) {
-                        saveConversation(workingDir, conv);
-                    }
-                }
-                catch (err) {
-                    console.error('[CLI Executor] Failed to save merged histories:', err.message);
-                }
-            }
-            else if (isMerge && mergeResult && customId) {
-                // Merge with --id: create new conversation with merged turns + new turn
-                // Convert merged turns to regular turns (without source_id)
-                const mergedTurns = mergeResult.mergedTurns.map((mt, idx) => ({
-                    turn: idx + 1,
-                    timestamp: mt.timestamp,
-                    prompt: mt.prompt,
-                    duration_ms: mt.duration_ms,
-                    status: mt.status,
-                    exit_code: mt.exit_code,
-                    output: mt.output
-                }));
-                conversation = existingConversation
-                    ? {
-                        ...existingConversation,
-                        updated_at: new Date().toISOString(),
-                        total_duration_ms: existingConversation.total_duration_ms + duration,
-                        turn_count: existingConversation.turns.length + 1,
-                        latest_status: status,
-                        turns: [...existingConversation.turns, newTurn]
-                    }
-                    : {
-                        id: conversationId,
-                        created_at: new Date(startTime).toISOString(),
-                        updated_at: new Date().toISOString(),
-                        tool,
-                        model: model || 'default',
-                        mode,
-                        category,
-                        total_duration_ms: mergeResult.totalDuration + duration,
-                        turn_count: mergedTurns.length + 1,
-                        latest_status: status,
-                        turns: [...mergedTurns, newTurn]
-                    };
-                // Save merged conversation
-                try {
-                    saveConversation(workingDir, conversation);
-                }
-                catch (err) {
-                    console.error('[CLI Executor] Failed to save merged conversation:', err.message);
-                }
-            }
-            else {
-                // Normal scenario: single conversation
-                conversation = existingConversation
-                    ? {
-                        ...existingConversation,
-                        updated_at: new Date().toISOString(),
-                        total_duration_ms: existingConversation.total_duration_ms + duration,
-                        turn_count: existingConversation.turns.length + 1,
-                        latest_status: status,
-                        turns: [...existingConversation.turns, newTurn]
-                    }
-                    : {
-                        id: conversationId,
-                        created_at: new Date(startTime).toISOString(),
-                        updated_at: new Date().toISOString(),
-                        tool,
-                        model: model || 'default',
-                        mode,
-                        category,
-                        total_duration_ms: duration,
-                        turn_count: 1,
-                        latest_status: status,
-                        turns: [newTurn],
-                        parent_execution_id: parentExecutionId
-                    };
-                // Try to save conversation to history
-                try {
-                    saveConversation(workingDir, conversation);
-                }
-                catch (err) {
-                    // Non-fatal: continue even if history save fails
-                    console.error('[CLI Executor] Failed to save history:', err.message);
-                }
-            }
-            // Track native session after execution (awaited to prevent process hang)
-            // Pass prompt for precise matching in parallel execution scenarios
-            try {
-                const nativeSession = await trackNewSession(tool, new Date(startTime), workingDir, prompt);
-                if (nativeSession) {
-                    // Save native session mapping
-                    try {
-                        store.saveNativeSessionMapping({
-                            ccw_id: conversationId,
-                            tool,
-                            native_session_id: nativeSession.sessionId,
-                            native_session_path: nativeSession.filePath,
-                            project_hash: nativeSession.projectHash,
-                            created_at: new Date().toISOString()
-                        });
-                    }
-                    catch (err) {
-                        console.error('[CLI Executor] Failed to save native session mapping:', err.message);
-                    }
-                }
-            }
-            catch (err) {
-                console.error('[CLI Executor] Failed to track native session:', err.message);
-            }
-            // Create legacy execution record for backward compatibility
-            const execution = {
-                id: conversationId,
-                timestamp: new Date(startTime).toISOString(),
-                tool,
-                model: model || 'default',
-                mode,
-                prompt,
-                status,
-                exit_code: code,
-                duration_ms: duration,
-                output: newTurnOutput
-            };
-            resolve({
-                success: status === 'success',
-                execution,
-                conversation,
-                stdout,
-                stderr
-            });
-        });
-        // Handle errors
-        child.on('error', (error) => {
-            errorLog('SPAWN', `Failed to spawn process`, error, {
-                tool,
-                command,
-                args,
-                workingDir,
-                fullCommand: `${command} ${args.join(' ')}`,
-                platform: process.platform,
-                path: process.env.PATH?.split(process.platform === 'win32' ? ';' : ':').slice(0, 10).join('\n  ') + '...'
-            });
-            reject(new Error(`Failed to spawn ${tool}: ${error.message}\n  Command: ${command} ${args.join(' ')}\n  Working Dir: ${workingDir}`));
-        });
-        // Timeout handling (timeout=0 disables internal timeout, controlled by external caller)
-        let timeoutId = null;
-        if (timeout > 0) {
-            timeoutId = setTimeout(() => {
-                timedOut = true;
-                child.kill('SIGTERM');
-                setTimeout(() => {
-                    if (!child.killed) {
-                        child.kill('SIGKILL');
-                    }
-                }, 5000);
-            }, timeout);
-        }
-        child.on('close', () => {
-            if (timeoutId) {
-                clearTimeout(timeoutId);
-            }
-        });
-    });
-}
-// Tool schema for MCP
-export const schema = {
-    name: 'cli_executor',
-    description: `Execute external CLI tools (gemini/qwen/codex) with unified interface.
-Modes:
-- analysis: Read-only operations (default)
-- write: File modifications allowed
-- auto: Full autonomous operations (codex only)`,
-    inputSchema: {
-        type: 'object',
-        properties: {
-            tool: {
-                type: 'string',
-                enum: ['gemini', 'qwen', 'codex'],
-                description: 'CLI tool to execute'
-            },
-            prompt: {
-                type: 'string',
-                description: 'Prompt to send to the CLI tool'
-            },
-            mode: {
-                type: 'string',
-                enum: ['analysis', 'write', 'auto'],
-                description: 'Execution mode (default: analysis)',
-                default: 'analysis'
-            },
-            model: {
-                type: 'string',
-                description: 'Model override (tool-specific)'
-            },
-            cd: {
-                type: 'string',
-                description: 'Working directory for execution (-C for codex)'
-            },
-            includeDirs: {
-                type: 'string',
-                description: 'Additional directories (comma-separated). Maps to --include-directories for gemini/qwen, --add-dir for codex'
-            },
-            timeout: {
-                type: 'number',
-                description: 'Timeout in milliseconds (default: 0 = disabled, controlled by external caller)',
-                default: 0
-            }
-        },
-        required: ['tool', 'prompt']
-    }
-};
-// Handler function
-export async function handler(params) {
-    try {
-        const result = await executeCliTool(params);
-        return {
-            success: result.success,
-            result
-        };
-    }
-    catch (error) {
-        return {
-            success: false,
-            error: `CLI execution failed: ${error.message}`
-        };
-    }
-}
-/**
- * Find all project directories with CLI history in centralized storage
- * Returns list of project base directories (NOT history directories)
- */
-function findProjectsWithHistory() {
-    const projectDirs = [];
-    const projectsRoot = join(StoragePaths.global.root(), 'projects');
-    if (!existsSync(projectsRoot)) {
-        return projectDirs;
-    }
-    try {
-        const entries = readdirSync(projectsRoot, { withFileTypes: true });
-        for (const entry of entries) {
-            if (entry.isDirectory()) {
-                const paths = StoragePaths.projectById(entry.name);
-                if (existsSync(paths.historyDb)) {
-                    // Return project ID as identifier (actual project path is hashed)
-                    projectDirs.push(entry.name);
-                }
-            }
-        }
-    }
-    catch {
-        // Ignore permission errors
-    }
-    return projectDirs;
-}
-/**
- * Get execution history from SQLite (centralized storage)
- */
-export async function getExecutionHistoryAsync(baseDir, options = {}) {
-    const { limit = 50, tool = null, status = null, category = null, search = null, recursive = false } = options;
-    // Recursive mode: aggregate data from parent and all child projects
-    if (recursive) {
-        const { scanChildProjectsAsync } = await import('../config/storage-paths.js');
-        const childProjects = await scanChildProjectsAsync(baseDir);
-        let allExecutions = [];
-        let totalCount = 0;
-        // Query parent project - apply limit at source to reduce memory footprint
-        try {
-            const parentStore = await getSqliteStore(baseDir);
-            const parentResult = parentStore.getHistory({ limit, tool, status, category, search });
-            totalCount += parentResult.total;
-            for (const exec of parentResult.executions) {
-                allExecutions.push({ ...exec, sourceDir: baseDir });
-            }
-        }
-        catch (error) {
-            if (process.env.DEBUG) {
-                console.error(`[CLI History] Failed to query parent project ${baseDir}:`, error);
-            }
-        }
-        // Query all child projects - apply limit to each child
-        for (const child of childProjects) {
-            try {
-                const childStore = await getSqliteStore(child.projectPath);
-                const childResult = childStore.getHistory({ limit, tool, status, category, search });
-                totalCount += childResult.total;
-                for (const exec of childResult.executions) {
-                    allExecutions.push({
-                        ...exec,
-                        sourceDir: child.relativePath // Show relative path for clarity
-                    });
-                }
-            }
-            catch (error) {
-                if (process.env.DEBUG) {
-                    console.error(`[CLI History] Failed to query child project ${child.projectPath}:`, error);
-                }
-            }
-        }
-        // Sort by timestamp (newest first) and apply limit
-        allExecutions.sort((a, b) => Number(b.timestamp) - Number(a.timestamp));
-        const limitedExecutions = allExecutions.slice(0, limit);
-        return {
-            total: totalCount,
-            count: limitedExecutions.length,
-            executions: limitedExecutions
-        };
-    }
-    // Non-recursive mode: only query current project
-    const store = await getSqliteStore(baseDir);
-    return store.getHistory({ limit, tool, status, category, search });
-}
-/**
- * Get execution history (sync version - uses cached SQLite module)
- */
-export function getExecutionHistory(baseDir, options = {}) {
-    const { limit = 50, tool = null, status = null, recursive = false } = options;
-    try {
-        if (recursive) {
-            const { scanChildProjects } = require('../config/storage-paths.js');
-            const childProjects = scanChildProjects(baseDir);
-            let allExecutions = [];
-            let totalCount = 0;
-            // Query parent project - apply limit at source
-            try {
-                const parentStore = getSqliteStoreSync(baseDir);
-                const parentResult = parentStore.getHistory({ limit, tool, status });
-                totalCount += parentResult.total;
-                for (const exec of parentResult.executions) {
-                    allExecutions.push({ ...exec, sourceDir: baseDir });
-                }
-            }
-            catch (error) {
-                if (process.env.DEBUG) {
-                    console.error(`[CLI History Sync] Failed to query parent project ${baseDir}:`, error);
-                }
-            }
-            // Query all child projects - apply limit to each child
-            for (const child of childProjects) {
-                try {
-                    const childStore = getSqliteStoreSync(child.projectPath);
-                    const childResult = childStore.getHistory({ limit, tool, status });
-                    totalCount += childResult.total;
-                    for (const exec of childResult.executions) {
-                        allExecutions.push({
-                            ...exec,
-                            sourceDir: child.relativePath
-                        });
-                    }
-                }
-                catch (error) {
-                    if (process.env.DEBUG) {
-                        console.error(`[CLI History Sync] Failed to query child project ${child.projectPath}:`, error);
-                    }
-                }
-            }
-            // Sort by timestamp (newest first) and apply limit
-            allExecutions.sort((a, b) => Number(b.timestamp) - Number(a.timestamp));
-            return {
-                total: totalCount,
-                count: Math.min(allExecutions.length, limit),
-                executions: allExecutions.slice(0, limit)
-            };
-        }
-        const store = getSqliteStoreSync(baseDir);
-        return store.getHistory({ limit, tool, status });
-    }
-    catch {
-        // SQLite not initialized, return empty
-        return { total: 0, count: 0, executions: [] };
-    }
-}
-/**
- * Get conversation detail by ID (returns ConversationRecord)
- */
-export function getConversationDetail(baseDir, conversationId) {
-    // Pass baseDir directly - loadConversation will resolve the correct storage path
-    return loadConversation(baseDir, conversationId);
-}
-/**
- * Get conversation detail with native session info
- */
-export function getConversationDetailWithNativeInfo(baseDir, conversationId) {
-    try {
-        const store = getSqliteStoreSync(baseDir);
-        return store.getConversationWithNativeInfo(conversationId);
-    }
-    catch {
-        // SQLite not initialized, return null
-        return null;
-    }
-}
-/**
- * Get execution detail by ID (legacy, returns ExecutionRecord for backward compatibility)
- */
-export function getExecutionDetail(baseDir, executionId) {
-    const conversation = getConversationDetail(baseDir, executionId);
-    if (!conversation)
-        return null;
-    // Convert to legacy ExecutionRecord format (using latest turn)
-    const latestTurn = conversation.turns[conversation.turns.length - 1];
-    return {
-        id: conversation.id,
-        timestamp: conversation.created_at,
-        tool: conversation.tool,
-        model: conversation.model,
-        mode: conversation.mode,
-        prompt: latestTurn.prompt,
-        status: conversation.latest_status,
-        exit_code: latestTurn.exit_code,
-        duration_ms: conversation.total_duration_ms,
-        output: latestTurn.output
-    };
-}
-/**
- * Delete execution by ID (async version)
- */
-export async function deleteExecutionAsync(baseDir, executionId) {
-    const store = await getSqliteStore(baseDir);
-    return store.deleteConversation(executionId);
-}
-/**
- * Delete execution by ID (sync version - uses cached SQLite module)
- */
-export function deleteExecution(baseDir, executionId) {
-    try {
-        const store = getSqliteStoreSync(baseDir);
-        return store.deleteConversation(executionId);
-    }
-    catch {
-        return { success: false, error: 'SQLite store not initialized' };
-    }
-}
-/**
- * Batch delete executions (async)
- */
-export async function batchDeleteExecutionsAsync(baseDir, ids) {
-    const store = await getSqliteStore(baseDir);
-    const result = store.batchDelete(ids);
-    return { ...result, total: ids.length };
-}
-/**
- * Get status of all CLI tools
- */
-export async function getCliToolsStatus() {
-    const tools = ['gemini', 'qwen', 'codex', 'claude'];
-    const results = {};
-    await Promise.all(tools.map(async (tool) => {
-        results[tool] = await checkToolAvailability(tool);
-    }));
-    return results;
-}
-// CLI tool package mapping
-const CLI_TOOL_PACKAGES = {
-    gemini: '@google/gemini-cli',
-    qwen: '@qwen-code/qwen-code',
-    codex: '@openai/codex',
-    claude: '@anthropic-ai/claude-code'
-};
-// Disabled tools storage (in-memory fallback, main storage is in cli-config.json)
-const disabledTools = new Set();
-// Default working directory for config operations
-let configBaseDir = process.cwd();
-/**
- * Set the base directory for config operations
- */
-export function setConfigBaseDir(dir) {
-    configBaseDir = dir;
-}
-/**
- * Install a CLI tool via npm
- */
-export async function installCliTool(tool) {
-    const packageName = CLI_TOOL_PACKAGES[tool];
-    if (!packageName) {
-        return { success: false, error: `Unknown tool: ${tool}` };
-    }
-    return new Promise((resolve) => {
-        const child = spawn('npm', ['install', '-g', packageName], {
-            shell: true,
-            stdio: ['ignore', 'pipe', 'pipe']
-        });
-        let stderr = '';
-        child.stderr?.on('data', (data) => { stderr += data.toString(); });
-        child.on('close', (code) => {
-            // Clear cache to force re-check
-            toolAvailabilityCache.delete(tool);
-            if (code === 0) {
-                resolve({ success: true });
-            }
-            else {
-                resolve({ success: false, error: stderr || `npm install failed with code ${code}` });
-            }
-        });
-        child.on('error', (err) => {
-            resolve({ success: false, error: err.message });
-        });
-        // Timeout after 2 minutes
-        setTimeout(() => {
-            child.kill();
-            resolve({ success: false, error: 'Installation timed out' });
-        }, 120000);
-    });
-}
-/**
- * Uninstall a CLI tool via npm
- */
-export async function uninstallCliTool(tool) {
-    const packageName = CLI_TOOL_PACKAGES[tool];
-    if (!packageName) {
-        return { success: false, error: `Unknown tool: ${tool}` };
-    }
-    return new Promise((resolve) => {
-        const child = spawn('npm', ['uninstall', '-g', packageName], {
-            shell: true,
-            stdio: ['ignore', 'pipe', 'pipe']
-        });
-        let stderr = '';
-        child.stderr?.on('data', (data) => { stderr += data.toString(); });
-        child.on('close', (code) => {
-            // Clear cache to force re-check
-            toolAvailabilityCache.delete(tool);
-            if (code === 0) {
-                resolve({ success: true });
-            }
-            else {
-                resolve({ success: false, error: stderr || `npm uninstall failed with code ${code}` });
-            }
-        });
-        child.on('error', (err) => {
-            resolve({ success: false, error: err.message });
-        });
-        // Timeout after 1 minute
-        setTimeout(() => {
-            child.kill();
-            resolve({ success: false, error: 'Uninstallation timed out' });
-        }, 60000);
-    });
-}
-/**
- * Enable a CLI tool (updates config file)
- */
-export function enableCliTool(tool) {
-    try {
-        enableToolFromConfig(configBaseDir, tool);
-        disabledTools.delete(tool); // Also update in-memory fallback
-        return { success: true };
-    }
-    catch (err) {
-        console.error('[cli-executor] Error enabling tool:', err);
-        disabledTools.delete(tool); // Fallback to in-memory
-        return { success: true };
-    }
-}
-/**
- * Disable a CLI tool (updates config file)
- */
-export function disableCliTool(tool) {
-    try {
-        disableToolFromConfig(configBaseDir, tool);
-        disabledTools.add(tool); // Also update in-memory fallback
-        return { success: true };
-    }
-    catch (err) {
-        console.error('[cli-executor] Error disabling tool:', err);
-        disabledTools.add(tool); // Fallback to in-memory
-        return { success: true };
-    }
-}
-/**
- * Check if a tool is enabled (reads from config file)
- */
-export function isToolEnabled(tool) {
-    try {
-        return isToolEnabledFromConfig(configBaseDir, tool);
-    }
-    catch {
-        // Fallback to in-memory check
-        return !disabledTools.has(tool);
-    }
-}
-/**
- * Get full status of all CLI tools including enabled state
- */
-export async function getCliToolsFullStatus() {
-    const tools = Object.keys(CLI_TOOL_PACKAGES);
-    const results = {};
-    await Promise.all(tools.map(async (tool) => {
-        const availability = await checkToolAvailability(tool);
-        results[tool] = {
-            available: availability.available,
-            enabled: isToolEnabled(tool),
-            path: availability.path,
-            packageName: CLI_TOOL_PACKAGES[tool]
-        };
-    }));
-    return results;
-}
-/**
- * PromptConcatenator - Dedicated class for building multi-turn prompts
- * Supports multiple output formats: plain text, YAML, JSON
- */
-class PromptConcatenator {
-    turns = [];
-    options;
-    metadata = {};
-    constructor(options = {}) {
-        this.options = {
-            format: options.format || 'plain',
-            includeMetadata: options.includeMetadata ?? true,
-            includeTurnMarkers: options.includeTurnMarkers ?? true,
-            maxOutputLength: options.maxOutputLength || 8192
-        };
-    }
-    /**
-     * Set metadata for the conversation
-     */
-    setMetadata(key, value) {
-        this.metadata[key] = value;
-        return this;
-    }
-    /**
-     * Add a user turn
-     */
-    addUserTurn(content, options = {}) {
-        this.turns.push({
-            turn: this.turns.length + 1,
-            role: 'user',
-            content,
-            ...options
-        });
-        return this;
-    }
-    /**
-     * Add an assistant turn
-     */
-    addAssistantTurn(content, options = {}) {
-        // Truncate output if needed
-        const truncatedContent = content.length > this.options.maxOutputLength
-            ? content.substring(0, this.options.maxOutputLength) + '\n... [truncated]'
-            : content;
-        this.turns.push({
-            turn: this.turns.length + 1,
-            role: 'assistant',
-            content: truncatedContent,
-            ...options
-        });
-        return this;
-    }
-    /**
-     * Add a conversation turn from ConversationTurn
-     */
-    addFromConversationTurn(turn, sourceId) {
-        this.addUserTurn(turn.prompt, {
-            turn: turn.turn * 2 - 1,
-            timestamp: turn.timestamp,
-            source_id: sourceId
-        });
-        this.addAssistantTurn(turn.output.stdout || '[No output]', {
-            turn: turn.turn * 2,
-            timestamp: turn.timestamp,
-            status: turn.status,
-            duration_ms: turn.duration_ms,
-            source_id: sourceId
-        });
-        return this;
-    }
-    /**
-     * Load turns from an existing conversation
-     */
-    loadConversation(conversation) {
-        for (const turn of conversation.turns) {
-            this.addFromConversationTurn(turn);
-        }
-        return this;
-    }
-    /**
-     * Build the final prompt in plain text format
-     */
-    buildPlainText(newPrompt) {
-        const parts = [];
-        // Metadata section
-        if (this.options.includeMetadata && Object.keys(this.metadata).length > 0) {
-            parts.push('=== CONTEXT ===');
-            for (const [key, value] of Object.entries(this.metadata)) {
-                parts.push(`${key}: ${String(value)}`);
-            }
-            parts.push('');
-        }
-        // Conversation history
-        if (this.turns.length > 0) {
-            parts.push('=== CONVERSATION HISTORY ===');
-            parts.push('');
-            let currentTurn = 0;
-            for (let i = 0; i < this.turns.length; i += 2) {
-                currentTurn++;
-                const userTurn = this.turns[i];
-                const assistantTurn = this.turns[i + 1];
-                if (this.options.includeTurnMarkers) {
-                    const sourceMarker = userTurn.source_id ? ` [${userTurn.source_id}]` : '';
-                    parts.push(`--- Turn ${currentTurn}${sourceMarker} ---`);
-                }
-                parts.push('USER:');
-                parts.push(userTurn.content);
-                parts.push('');
-                if (assistantTurn) {
-                    parts.push('ASSISTANT:');
-                    parts.push(assistantTurn.content);
-                    parts.push('');
-                }
-            }
-        }
-        // New request
-        parts.push('=== NEW REQUEST ===');
-        parts.push('');
-        parts.push(newPrompt);
-        return parts.join('\n');
-    }
-    /**
-     * Build the final prompt in YAML format
-     */
-    buildYaml(newPrompt) {
-        const yamlLines = [];
-        // Metadata
-        if (this.options.includeMetadata && Object.keys(this.metadata).length > 0) {
-            yamlLines.push('context:');
-            for (const [key, value] of Object.entries(this.metadata)) {
-                yamlLines.push(`  ${key}: ${this.yamlValue(value)}`);
-            }
-            yamlLines.push('');
-        }
-        // Conversation history
-        if (this.turns.length > 0) {
-            yamlLines.push('conversation:');
-            let currentTurn = 0;
-            for (let i = 0; i < this.turns.length; i += 2) {
-                currentTurn++;
-                const userTurn = this.turns[i];
-                const assistantTurn = this.turns[i + 1];
-                yamlLines.push(`  - turn: ${currentTurn}`);
-                if (userTurn.source_id) {
-                    yamlLines.push(`    source: ${userTurn.source_id}`);
-                }
-                if (userTurn.timestamp) {
-                    yamlLines.push(`    timestamp: ${userTurn.timestamp}`);
-                }
-                // User message
-                yamlLines.push('    user: |');
-                const userLines = userTurn.content.split('\n');
-                for (const line of userLines) {
-                    yamlLines.push(`      ${line}`);
-                }
-                // Assistant message
-                if (assistantTurn) {
-                    if (assistantTurn.status) {
-                        yamlLines.push(`    status: ${assistantTurn.status}`);
-                    }
-                    if (assistantTurn.duration_ms) {
-                        yamlLines.push(`    duration_ms: ${assistantTurn.duration_ms}`);
-                    }
-                    yamlLines.push('    assistant: |');
-                    const assistantLines = assistantTurn.content.split('\n');
-                    for (const line of assistantLines) {
-                        yamlLines.push(`      ${line}`);
-                    }
-                }
-                yamlLines.push('');
-            }
-        }
-        // New request
-        yamlLines.push('new_request: |');
-        const requestLines = newPrompt.split('\n');
-        for (const line of requestLines) {
-            yamlLines.push(`  ${line}`);
-        }
-        return yamlLines.join('\n');
-    }
-    /**
-     * Build the final prompt in JSON format
-     */
-    buildJson(newPrompt) {
-        const data = {};
-        // Metadata
-        if (this.options.includeMetadata && Object.keys(this.metadata).length > 0) {
-            data.context = this.metadata;
-        }
-        // Conversation history
-        if (this.turns.length > 0) {
-            const conversation = [];
-            for (let i = 0; i < this.turns.length; i += 2) {
-                const userTurn = this.turns[i];
-                const assistantTurn = this.turns[i + 1];
-                const turnData = {
-                    turn: Math.ceil((i + 1) / 2),
-                    user: userTurn.content
-                };
-                if (userTurn.source_id)
-                    turnData.source = userTurn.source_id;
-                if (userTurn.timestamp)
-                    turnData.timestamp = userTurn.timestamp;
-                if (assistantTurn) {
-                    turnData.assistant = assistantTurn.content;
-                    if (assistantTurn.status)
-                        turnData.status = assistantTurn.status;
-                    if (assistantTurn.duration_ms)
-                        turnData.duration_ms = assistantTurn.duration_ms;
-                }
-                conversation.push(turnData);
-            }
-            data.conversation = conversation;
-        }
-        data.new_request = newPrompt;
-        return JSON.stringify(data, null, 2);
-    }
-    /**
-     * Helper to format YAML values
-     */
-    yamlValue(value) {
-        if (typeof value === 'string') {
-            // Quote strings that might be interpreted as other types
-            if (/[:\[\]{}#&*!|>'"@`]/.test(value) || value === '') {
-                return `"${value.replace(/"/g, '\\"')}"`;
-            }
-            return value;
-        }
-        if (typeof value === 'number' || typeof value === 'boolean') {
-            return String(value);
-        }
-        if (value === null || value === undefined) {
-            return 'null';
-        }
-        return JSON.stringify(value);
-    }
-    /**
-     * Build the final prompt string
-     */
-    build(newPrompt) {
-        switch (this.options.format) {
-            case 'yaml':
-                return this.buildYaml(newPrompt);
-            case 'json':
-                return this.buildJson(newPrompt);
-            case 'plain':
-            default:
-                return this.buildPlainText(newPrompt);
-        }
-    }
-    /**
-     * Reset the concatenator for reuse
-     */
-    reset() {
-        this.turns = [];
-        this.metadata = {};
-        return this;
-    }
-}
-/**
- * Create a prompt concatenator with specified options
- */
-function createPromptConcatenator(options) {
-    return new PromptConcatenator(options);
-}
-/**
- * Quick helper to build a multi-turn prompt in any format
- */
-function buildPrompt(conversation, newPrompt, format = 'plain') {
-    return createPromptConcatenator({ format })
-        .loadConversation(conversation)
-        .build(newPrompt);
-}
-/**
- * Build multi-turn prompt with full conversation history
- * Uses the PromptConcatenator with plain text format by default
- */
-function buildMultiTurnPrompt(conversation, newPrompt, format = 'plain') {
-    return buildPrompt(conversation, newPrompt, format);
-}
-/**
- * Build continuation prompt with previous conversation context (legacy)
- */
-function buildContinuationPrompt(previous, additionalPrompt) {
-    const parts = [];
-    // Add previous conversation context
-    parts.push('=== PREVIOUS CONVERSATION ===');
-    parts.push('');
-    parts.push('USER PROMPT:');
-    parts.push(previous.prompt);
-    parts.push('');
-    parts.push('ASSISTANT RESPONSE:');
-    parts.push(previous.output.stdout || '[No output recorded]');
-    parts.push('');
-    parts.push('=== CONTINUATION ===');
-    parts.push('');
-    if (additionalPrompt) {
-        parts.push(additionalPrompt);
-    }
-    else {
-        parts.push('Continue from where we left off. What should we do next?');
-    }
-    return parts.join('\n');
-}
-/**
- * Get previous execution for resume
- * @param baseDir - Working directory
- * @param tool - Tool to filter by
- * @param resume - true for last, or execution ID string
- */
-function getPreviousExecution(baseDir, tool, resume) {
-    if (typeof resume === 'string') {
-        // Resume specific execution by ID
-        return getExecutionDetail(baseDir, resume);
-    }
-    else if (resume === true) {
-        // Resume last execution for this tool
-        const history = getExecutionHistory(baseDir, { limit: 1, tool });
-        if (history.executions.length === 0) {
-            return null;
-        }
-        return getExecutionDetail(baseDir, history.executions[0].id);
-    }
-    return null;
-}
-/**
- * Get latest execution for a specific tool
- */
-export function getLatestExecution(baseDir, tool) {
-    const history = getExecutionHistory(baseDir, { limit: 1, tool: tool || null });
-    if (history.executions.length === 0) {
-        return null;
-    }
-    return getExecutionDetail(baseDir, history.executions[0].id);
-}
-// ========== Native Session Content Functions ==========
-/**
- * Get native session content by CCW ID
- * Parses the native session file and returns full conversation data
- */
-export async function getNativeSessionContent(baseDir, ccwId) {
-    const store = await getSqliteStore(baseDir);
-    return store.getNativeSessionContent(ccwId);
-}
-/**
- * Get formatted native conversation text
- */
-export async function getFormattedNativeConversation(baseDir, ccwId, options) {
-    const store = await getSqliteStore(baseDir);
-    return store.getFormattedNativeConversation(ccwId, options);
-}
-/**
- * Get conversation pairs from native session
- */
-export async function getNativeConversationPairs(baseDir, ccwId) {
-    const store = await getSqliteStore(baseDir);
-    return store.getNativeConversationPairs(ccwId);
-}
-/**
- * Get enriched conversation (CCW + native session merged)
- */
-export async function getEnrichedConversation(baseDir, ccwId) {
-    const store = await getSqliteStore(baseDir);
-    return store.getEnrichedConversation(ccwId);
-}
-/**
- * Get history with native session info
- * Supports recursive querying of child projects
- */
-export async function getHistoryWithNativeInfo(baseDir, options) {
-    const { limit = 50, recursive = false, ...queryOptions } = options || {};
-    // Non-recursive mode: query single project
-    if (!recursive) {
-        const store = await getSqliteStore(baseDir);
-        return store.getHistoryWithNativeInfo({ limit, ...queryOptions });
-    }
-    // Recursive mode: aggregate data from parent and all child projects
-    const { scanChildProjectsAsync } = await import('../config/storage-paths.js');
-    const childProjects = await scanChildProjectsAsync(baseDir);
-    const allExecutions = [];
-    let totalCount = 0;
-    // Query parent project
-    try {
-        const parentStore = await getSqliteStore(baseDir);
-        const parentResult = parentStore.getHistoryWithNativeInfo({ limit, ...queryOptions });
-        totalCount += parentResult.total;
-        for (const exec of parentResult.executions) {
-            allExecutions.push({ ...exec, sourceDir: baseDir });
-        }
-    }
-    catch (error) {
-        if (process.env.DEBUG) {
-            console.error(`[CLI History] Failed to query parent project ${baseDir}:`, error);
-        }
-    }
-    // Query all child projects
-    for (const child of childProjects) {
-        try {
-            const childStore = await getSqliteStore(child.projectPath);
-            const childResult = childStore.getHistoryWithNativeInfo({ limit, ...queryOptions });
-            totalCount += childResult.total;
-            for (const exec of childResult.executions) {
-                allExecutions.push({ ...exec, sourceDir: child.projectPath });
-            }
-        }
-        catch (error) {
-            if (process.env.DEBUG) {
-                console.error(`[CLI History] Failed to query child project ${child.projectPath}:`, error);
-            }
-        }
-    }
-    // Sort by updated_at descending and apply limit
-    allExecutions.sort((a, b) => {
-        const timeA = a.updated_at ? new Date(a.updated_at).getTime() : new Date(a.timestamp).getTime();
-        const timeB = b.updated_at ? new Date(b.updated_at).getTime() : new Date(b.timestamp).getTime();
-        return timeB - timeA;
-    });
-    const limitedExecutions = allExecutions.slice(0, limit);
-    return {
-        total: totalCount,
-        count: limitedExecutions.length,
-        executions: limitedExecutions
-    };
-}
-// Export utility functions and tool definition for backward compatibility
-export { executeCliTool, checkToolAvailability };
-// Export prompt concatenation utilities
-export { PromptConcatenator, createPromptConcatenator, buildPrompt, buildMultiTurnPrompt };
-// Note: Async storage functions (getExecutionHistoryAsync, deleteExecutionAsync,
-// batchDeleteExecutionsAsync) are exported at declaration site - SQLite storage only
-// Export tool definition (for legacy imports) - This allows direct calls to execute with onOutput
-export const cliExecutorTool = {
-    schema,
-    execute: executeCliTool // Use executeCliTool directly which supports onOutput callback
-};
+export * from './cli-executor-core.js';
 //# sourceMappingURL=cli-executor.js.map