mkctx 4.0.0 → 4.0.1

package/bin/mkctx.js

@@ -1,20 +1,21 @@
 #!/usr/bin/env node
 
-const fs = require('fs');
+'use strict';
+
+const fs   = require('fs');
 const path = require('path');
 
 // ============================================
-// LAZY LOAD DEPENDENCIES (for faster startup)
+// LAZY-LOADED DEPENDENCIES
 // ============================================
 
 let inquirer, chalk, ora;
 
 function loadDependencies() {
-    if (!inquirer) {
-        inquirer = require('inquirer');
-        chalk = require('chalk');
-        ora = require('ora');
-    }
+    if (inquirer) return;
+    inquirer = require('inquirer');
+    chalk    = require('chalk');
+    ora      = require('ora');
 }
 
 // ============================================
@@ -23,29 +24,29 @@ function loadDependencies() {
 
 const CONFIG_FILE = 'mkctx.config.json';
 
-const DEFAULT_PROJECT_CONFIG = {
-    src: ".",
-    ignore: "mkctx.config.json, pnpm-lock.yaml, **/.titan/, mkctx/, node_modules/, .git/, dist/, build/, target/, .next/, out/, .cache, package-lock.json, *.log, temp/, tmp/, coverage/, .nyc_output, .env, .env.local, .env.development.local, .env.test.local, .env.production.local, npm-debug.log*, yarn-debug.log*, yarn-error.log*, .npm, .yarn-integrity, .parcel-cache, .vuepress/dist, .svelte-kit, **/*.rs.bk, .idea/, .vscode/, .DS_Store, Thumbs.db, *.swp, *.swo, .~lock.*, Cargo.lock, .cargo/registry/, .cargo/git/, .rustup/, *.pdb, *.dSYM/, *.so, *.dll, *.dylib, *.exe, *.lib, *.a, *.o, *.rlib, *.d, *.tmp, *.bak, *.orig, *.rej, *.pyc, *.pyo, *.class, *.jar, *.war, *.ear, *.zip, *.tar.gz, *.rar, *.7z, *.iso, *.img, *.dmg, *.pdf, *.doc, *.docx, *.xls, *.xlsx, *.ppt, *.pptx",
-    output: "./mkctx",
-    first_comment: "/* Project Context */",
-    last_comment: "/* End of Context */"
+const DEFAULT_CONFIG = {
+    src:           '.',
+    ignore:        'mkctx.config.json, pnpm-lock.yaml, **/.titan/, mkctx/, node_modules/, .git/, dist/, build/, target/, .next/, out/, .cache, package-lock.json, *.log, temp/, tmp/, coverage/, .nyc_output, .env, .env.local, .env.development.local, .env.test.local, .env.production.local, npm-debug.log*, yarn-debug.log*, yarn-error.log*, .npm, .yarn-integrity, .parcel-cache, .vuepress/dist, .svelte-kit, **/*.rs.bk, .idea/, .vscode/, .DS_Store, Thumbs.db, *.swp, *.swo, .~lock.*, Cargo.lock, .cargo/registry/, .cargo/git/, .rustup/, *.pdb, *.dSYM/, *.so, *.dll, *.dylib, *.exe, *.lib, *.a, *.o, *.rlib, *.d, *.tmp, *.bak, *.orig, *.rej, *.pyc, *.pyo, *.class, *.jar, *.war, *.ear, *.zip, *.tar.gz, *.rar, *.7z, *.iso, *.img, *.dmg, *.pdf, *.doc, *.docx, *.xls, *.xlsx, *.ppt, *.pptx',
+    output:        './mkctx',
+    first_comment: '/* Project Context */',
+    last_comment:  '/* End of Context */',
 };
 
-// Language mapping for syntax highlighting
+const VALID_FORMATS = ['json', 'md', 'toon', 'xml'];
+
 const LANG_MAP = {
-    js: 'javascript', ts: 'typescript', jsx: 'jsx', tsx: 'tsx',
-    py: 'python', rb: 'ruby', go: 'go', rs: 'rust',
-    java: 'java', kt: 'kotlin', cs: 'csharp', cpp: 'cpp',
-    c: 'c', h: 'c', hpp: 'cpp', php: 'php',
-    sh: 'bash', bash: 'bash', zsh: 'bash', ps1: 'powershell',
-    sql: 'sql', html: 'html', css: 'css', scss: 'scss',
-    sass: 'sass', less: 'less', json: 'json', xml: 'xml',
-    yaml: 'yaml', yml: 'yaml', md: 'markdown', vue: 'vue',
+    js: 'javascript', ts: 'typescript', jsx: 'jsx',    tsx: 'tsx',
+    py: 'python',     rb: 'ruby',       go: 'go',      rs: 'rust',
+    java: 'java',     kt: 'kotlin',     cs: 'csharp',  cpp: 'cpp',
+    c: 'c',           h: 'c',           hpp: 'cpp',    php: 'php',
+    sh: 'bash',       bash: 'bash',     zsh: 'bash',   ps1: 'powershell',
+    sql: 'sql',       html: 'html',     css: 'css',    scss: 'scss',
+    sass: 'sass',     less: 'less',     json: 'json',  xml: 'xml',
+    yaml: 'yaml',     yml: 'yaml',      md: 'markdown', vue: 'vue',
     svelte: 'svelte', dockerfile: 'dockerfile', makefile: 'makefile',
-    toml: 'toml', ini: 'ini', cfg: 'ini', env: 'bash'
+    toml: 'toml',     ini: 'ini',       cfg: 'ini',    env: 'bash',
 };
 
-// Text file extensions
 const TEXT_EXTENSIONS = new Set([
     '.js', '.ts', '.jsx', '.tsx', '.mjs', '.cjs',
     '.py', '.pyw', '.rb', '.rake', '.go', '.rs',
@@ -65,7 +66,7 @@ const TEXT_EXTENSIONS = new Set([
     '.ex', '.exs', '.erl', '.hrl', '.clj', '.cljs', '.cljc',
     '.hs', '.lhs', '.elm', '.pug', '.jade',
     '.ejs', '.hbs', '.handlebars', '.twig', '.blade.php',
-    '.astro', '.prisma', '.sol'
+    '.astro', '.prisma', '.sol',
 ]);
 
 const KNOWN_FILES = new Set([
@@ -75,359 +76,393 @@ const KNOWN_FILES = new Set([
     '.eslintrc', '.prettierrc', '.babelrc',
     '.env', '.env.example', '.env.local',
     'readme.md', 'readme.txt', 'readme',
-    'license', 'license.md', 'license.txt'
+    'license', 'license.md', 'license.txt',
+]);
+
+const SYSTEM_IGNORES = [
+    '.git', '.DS_Store', 'Thumbs.db', 'node_modules',
+    '.svn', '.hg', '__pycache__', '.pytest_cache',
+    '.mypy_cache', '.vscode', '.idea',
+];
+
+// Flags that take a value (not boolean)
+const VALUE_FLAGS = new Set([
+    'src', 'output', 'format', 'ignore', 'name', 'first-comment', 'last-comment',
+    's', 'o', 'f', 'n',
+]);
+
+// Flags that trigger non-interactive mode
+const NON_INTERACTIVE_FLAGS = new Set([
+    'src', 's', 'output', 'o', 'format', 'f',
+    'ignore', 'name', 'n', 'first-comment', 'last-comment',
 ]);
 
 // ============================================
-// CONFIGURATION MANAGEMENT
+// CLI ARGUMENT PARSING
 // ============================================
 
-function loadProjectConfig() {
-    if (fs.existsSync(CONFIG_FILE)) {
-        try {
-            const config = JSON.parse(fs.readFileSync(CONFIG_FILE, 'utf-8'));
-            return { ...DEFAULT_PROJECT_CONFIG, ...config };
-        } catch (err) {
-            console.log(chalk.yellow('⚠️  Error parsing config file, using defaults'));
-            return { ...DEFAULT_PROJECT_CONFIG };
+function parseArgs(argv) {
+    const args  = argv.slice(2);
+    const flags = {};
+    let command = null;
+
+    if (args.length > 0 && !args[0].startsWith('-')) {
+        command = args[0];
+    }
+
+    for (let i = 0; i < args.length; i++) {
+        const arg = args[i];
+
+        if (arg.startsWith('--') && arg.includes('=')) {
+            const eq = arg.indexOf('=');
+            flags[arg.slice(2, eq)] = arg.slice(eq + 1);
+            continue;
+        }
+
+        if (arg.startsWith('-') && !arg.startsWith('--') && arg.includes('=')) {
+            const eq = arg.indexOf('=');
+            flags[arg.slice(1, eq)] = arg.slice(eq + 1);
+            continue;
+        }
+
+        if (arg.startsWith('--')) {
+            const key  = arg.slice(2);
+            const next = args[i + 1];
+            if (VALUE_FLAGS.has(key) && next !== undefined && !isFlagToken(next)) {
+                flags[key] = next;
+                i++;
+            } else {
+                flags[key] = true;
+            }
+            continue;
+        }
+
+        if (arg.startsWith('-') && arg.length === 2) {
+            const key  = arg.slice(1);
+            const next = args[i + 1];
+            if (VALUE_FLAGS.has(key) && next !== undefined && !isFlagToken(next)) {
+                flags[key] = next;
+                i++;
+            } else {
+                flags[key] = true;
+            }
         }
     }
-    return null;
+
+    return { command, flags };
 }
 
-function hasProjectConfig() {
-    return fs.existsSync(CONFIG_FILE);
+function isFlagToken(str) {
+    return /^--[a-zA-Z]/.test(str) || /^-[a-zA-Z]/.test(str);
 }
 
-function createProjectConfig() {
-    loadDependencies();
+function isNonInteractiveMode(flags) {
+    return Object.keys(flags).some(f => NON_INTERACTIVE_FLAGS.has(f));
+}
+
+// Resolve short aliases to canonical names
+function resolveFlags(flags) {
+    return {
+        src:          flags.src    || flags.s,
+        output:       flags.output || flags.o,
+        format:       flags.format || flags.f,
+        name:         flags.name   || flags.n,
+        ignore:       flags.ignore,
+        firstComment: flags['first-comment'],
+        lastComment:  flags['last-comment'],
+    };
+}
 
-    if (!fs.existsSync('mkctx')) {
-        fs.mkdirSync('mkctx', { recursive: true });
+// ============================================
+// CONFIG MANAGEMENT
+// ============================================
+
+function configFileExists() {
+    return fs.existsSync(CONFIG_FILE);
+}
+
+function loadConfig() {
+    if (!configFileExists()) return null;
+    try {
+        const raw = JSON.parse(fs.readFileSync(CONFIG_FILE, 'utf-8'));
+        return { ...DEFAULT_CONFIG, ...raw };
+    } catch {
+        console.log(chalk.yellow('⚠️  Error parsing config file, using defaults'));
+        return { ...DEFAULT_CONFIG };
     }
+}
 
-    fs.writeFileSync(CONFIG_FILE, JSON.stringify(DEFAULT_PROJECT_CONFIG, null, 2));
-    updateGitignore();
+function buildConfig(cliFlags = {}) {
+    const base = configFileExists() ? loadConfig() : { ...DEFAULT_CONFIG };
+    if (cliFlags.src)          base.src           = cliFlags.src;
+    if (cliFlags.output)       base.output        = cliFlags.output;
+    if (cliFlags.ignore)       base.ignore        = cliFlags.ignore;
+    if (cliFlags.firstComment) base.first_comment = cliFlags.firstComment;
+    if (cliFlags.lastComment)  base.last_comment  = cliFlags.lastComment;
+    return base;
+}
 
+function createConfigFile() {
+    loadDependencies();
+    fs.mkdirSync('mkctx', { recursive: true });
+    fs.writeFileSync(CONFIG_FILE, JSON.stringify(DEFAULT_CONFIG, null, 2));
+    appendToGitignore();
     console.log(chalk.green('\n✅ Configuration created:'));
     console.log(chalk.white('   - mkctx.config.json'));
     console.log(chalk.white('   - mkctx/ folder'));
     console.log(chalk.white('   - Entry in .gitignore\n'));
 }
 
-function updateGitignore() {
+function appendToGitignore() {
     const gitignorePath = '.gitignore';
-    let content = '';
-
-    if (fs.existsSync(gitignorePath)) {
-        content = fs.readFileSync(gitignorePath, 'utf-8');
+    const current = fs.existsSync(gitignorePath)
+        ? fs.readFileSync(gitignorePath, 'utf-8')
+        : '';
+    if (!current.includes('mkctx/')) {
+        fs.writeFileSync(gitignorePath, current + '\n# mkctx - generated context\nmkctx/\n');
     }
+}
+
+// ============================================
+// FORMAT RESOLUTION
+// ============================================
+
+function resolveFormats(formatArg) {
+    if (!formatArg)            return ['md'];
+    if (formatArg === 'all')   return [...VALID_FORMATS];
+
+    const requested = formatArg.split(',').map(f => f.trim().toLowerCase());
+    const invalid   = requested.filter(f => !VALID_FORMATS.includes(f));
 
-    if (!content.includes('mkctx/')) {
-        const entry = '\n# mkctx - generated context\nmkctx/\n';
-        content += entry;
-        fs.writeFileSync(gitignorePath, content);
+    if (invalid.length > 0) {
+        console.error(`❌ Invalid format(s): ${invalid.join(', ')}. Valid: ${VALID_FORMATS.join(', ')}, all`);
+        process.exit(1);
     }
+
+    return requested;
 }
 
 // ============================================
-// UTILITY FUNCTIONS
+// UTILITY HELPERS
 // ============================================
 
 function formatSize(bytes) {
-    const sizes = ['B', 'KB', 'MB', 'GB'];
+    const units = ['B', 'KB', 'MB', 'GB'];
     if (bytes === 0) return '0 B';
     const i = Math.floor(Math.log(bytes) / Math.log(1024));
-    return `${(bytes / Math.pow(1024, i)).toFixed(2)} ${sizes[i]}`;
+    return `${(bytes / Math.pow(1024, i)).toFixed(2)} ${units[i]}`;
 }
 
 function estimateTokens(text) {
     return Math.ceil(text.length / 4);
 }
 
-// Normalize path to always use forward slashes
-function normalizePath(filePath) {
+function toUnixPath(filePath) {
     return filePath.replace(/\\/g, '/');
 }
 
 // ============================================
-// FILE OPERATIONS
+// FILE FILTERING
 // ============================================
 
 function isTextFile(filename) {
-    const ext = path.extname(filename).toLowerCase();
+    const ext      = path.extname(filename).toLowerCase();
     const basename = path.basename(filename).toLowerCase();
-
-    if (KNOWN_FILES.has(basename)) return true;
-    if (ext && TEXT_EXTENSIONS.has(ext)) return true;
-
-    return false;
+    return KNOWN_FILES.has(basename) || (!!ext && TEXT_EXTENSIONS.has(ext));
 }
 
 function getLanguage(filename) {
-    const ext = path.extname(filename).slice(1).toLowerCase();
+    const ext      = path.extname(filename).slice(1).toLowerCase();
     const basename = path.basename(filename).toLowerCase();
-
-    if (basename === 'dockerfile') return 'dockerfile';
-    if (basename === 'makefile') return 'makefile';
-    if (basename.startsWith('.env')) return 'bash';
-
+    if (basename === 'dockerfile')      return 'dockerfile';
+    if (basename === 'makefile')        return 'makefile';
+    if (basename.startsWith('.env'))    return 'bash';
     return LANG_MAP[ext] || ext || 'text';
 }
 
 function parseIgnorePatterns(ignoreString) {
     if (!ignoreString) return [];
-    return ignoreString
-        .split(',')
-        .map(p => p.trim())
-        .filter(Boolean);
+    return ignoreString.split(',').map(p => p.trim()).filter(Boolean);
 }
 
-function matchWildcard(pattern, filename) {
-    const regexPattern = pattern
-        .replace(/\./g, '\\.')
-        .replace(/\*\*/g, '.*')
-        .replace(/\*/g, '[^/]*');
-    const regex = new RegExp(`^${regexPattern}$`, 'i');
-    return regex.test(filename);
+function matchWildcard(pattern, subject) {
+    const regex = new RegExp(
+        '^' + pattern
+            .replace(/\./g, '\\.')
+            .replace(/\*\*/g, '.*')
+            .replace(/\*/g, '[^/]*') + '$',
+        'i'
+    );
+    return regex.test(subject);
 }
 
 function shouldIgnore(fullPath, name, relativePath, patterns) {
-    // Normalize paths for comparison
-    const normalizedFull = normalizePath(fullPath);
-    const normalizedRelative = normalizePath(relativePath);
-
-    const systemIgnores = [
-        '.git', '.DS_Store', 'Thumbs.db', 'node_modules',
-        '.svn', '.hg', '__pycache__', '.pytest_cache',
-        '.mypy_cache', '.vscode', '.idea'
-    ];
-
-    for (const ignore of systemIgnores) {
-        if (normalizedFull.includes('/' + ignore + '/') ||
-            normalizedFull.includes('/' + ignore) ||
-            normalizedFull.endsWith('/' + ignore) ||
-            name === ignore) {
-            return true;
-        }
-    }
+    const normFull     = toUnixPath(fullPath);
+    const normRelative = toUnixPath(relativePath);
+
+    const inSystemIgnore = SYSTEM_IGNORES.some(ig =>
+        normFull.includes(`/${ig}/`) ||
+        normFull.includes(`/${ig}`)  ||
+        normFull.endsWith(`/${ig}`)  ||
+        name === ig
+    );
+    if (inSystemIgnore) return true;
 
-    for (const pattern of patterns) {
+    return patterns.some(pattern => {
         if (pattern.includes('*')) {
-            if (matchWildcard(pattern, name)) return true;
-            if (matchWildcard(pattern, normalizedRelative)) return true;
+            return matchWildcard(pattern, name) || matchWildcard(pattern, normRelative);
         }
-
         if (pattern.endsWith('/')) {
             const dir = pattern.slice(0, -1);
-            if (normalizedFull.includes('/' + dir + '/') ||
-                normalizedFull.endsWith('/' + dir) ||
-                name === dir) {
-                return true;
-            }
+            return normFull.includes(`/${dir}/`) ||
+                   normFull.endsWith(`/${dir}`)  ||
+                   name === dir;
         }
-
-        if (normalizedRelative === pattern || name === pattern) {
-            return true;
-        }
-    }
-
-    return false;
+        return normRelative === pattern || name === pattern;
+    });
 }
 
 // ============================================
-// SCAN AND BUILD JSON IN ONE PASS
+// FILE SCANNING
 // ============================================
 
-function scanAndBuildJson(srcPath, config) {
-    const jsonArray = [];
+function scanFiles(srcPath, config) {
     const ignorePatterns = parseIgnorePatterns(config.ignore);
-    let totalSize = 0;
-    let totalLines = 0;
-    const filesByExt = {};
+    const files          = [];
+    const stats          = { files: 0, totalSize: 0, totalLines: 0, filesByExt: {} };
 
     function walk(dir) {
         if (!fs.existsSync(dir)) return;
 
         let entries;
-        try {
-            entries = fs.readdirSync(dir, { withFileTypes: true });
-        } catch (err) {
-            return;
-        }
+        try { entries = fs.readdirSync(dir, { withFileTypes: true }); }
+        catch { return; }
 
         for (const entry of entries) {
-            const fullPath = path.join(dir, entry.name);
+            const fullPath     = path.join(dir, entry.name);
             const relativePath = path.relative(srcPath, fullPath);
 
-            if (shouldIgnore(fullPath, entry.name, relativePath, ignorePatterns)) {
-                continue;
-            }
+            if (shouldIgnore(fullPath, entry.name, relativePath, ignorePatterns)) continue;
 
-            if (entry.isDirectory()) {
-                walk(fullPath);
-            } else if (entry.isFile() && isTextFile(entry.name)) {
-                // Read file immediately when found
-                let content;
-                try {
-                    content = fs.readFileSync(fullPath, 'utf-8');
-                } catch (err) {
-                    // Skip files that can't be read
-                    continue;
-                }
+            if (entry.isDirectory()) { walk(fullPath); continue; }
+            if (!entry.isFile() || !isTextFile(entry.name)) continue;
 
-                const ext = path.extname(entry.name).slice(1).toLowerCase() || null;
-                const lines = content.split('\n').length;
-                const size = Buffer.byteLength(content, 'utf-8');
-                const language = getLanguage(entry.name);
-
-                // Update stats
-                totalSize += size;
-                totalLines += lines;
-                filesByExt[ext || 'other'] = (filesByExt[ext || 'other'] || 0) + 1;
-
-                // Add to JSON array immediately
-                jsonArray.push({
-                    path: normalizePath(relativePath),
-                    name: entry.name,
-                    extension: ext,
-                    language: language,
-                    lines: lines,
-                    size: size,
-                    content: content
-                });
-            }
+            let content;
+            try { content = fs.readFileSync(fullPath, 'utf-8'); }
+            catch { continue; }
+
+            const ext      = path.extname(entry.name).slice(1).toLowerCase() || null;
+            const lines    = content.split('\n').length;
+            const size     = Buffer.byteLength(content, 'utf-8');
+            const language = getLanguage(entry.name);
+
+            stats.totalSize  += size;
+            stats.totalLines += lines;
+            stats.filesByExt[ext || 'other'] = (stats.filesByExt[ext || 'other'] || 0) + 1;
+
+            files.push({ path: toUnixPath(relativePath), name: entry.name, extension: ext, language, lines, size, content });
         }
     }
 
     walk(srcPath);
+    files.sort((a, b) => a.path.localeCompare(b.path));
+    stats.files = files.length;
 
-    // Sort by path for consistency
-    jsonArray.sort((a, b) => a.path.localeCompare(b.path));
-
-    const stats = {
-        files: jsonArray.length,
-        totalSize,
-        totalLines,
-        filesByExt
-    };
-
-    return { jsonArray, stats };
+    return { files, stats };
 }
 
 // ============================================
-// FORMAT CONVERTERS (from base JSON)
+// OUTPUT FORMATTERS
 // ============================================
 
-function toJson(baseJson) {
-    return JSON.stringify(baseJson, null, 2);
+function toJson(files) {
+    return JSON.stringify(files, null, 2);
 }
 
-function toMarkdown(baseJson, config) {
-    let content = '';
-
-    if (config.first_comment) {
-        content += config.first_comment + '\n\n';
-    }
-
-    // Project structure
-    content += '## Project Structure\n\n```\n';
-    const dirs = new Set();
-    baseJson.forEach(f => {
-        const dir = path.dirname(f.path);
-        if (dir !== '.') dirs.add(dir);
-    });
-    Array.from(dirs).sort().forEach(d => content += `📁 ${d}/\n`);
-    content += `\n${baseJson.length} files total\n\`\`\`\n\n`;
-
-    // Source files
-    content += '## Source Files\n\n';
-
-    for (const file of baseJson) {
-        content += `### ${file.path}\n\n`;
-        content += '```' + file.language + '\n';
-        content += file.content;
-        if (!file.content.endsWith('\n')) {
-            content += '\n';
-        }
-        content += '```\n\n';
-    }
-
-    if (config.last_comment) {
-        content += config.last_comment;
-    }
-
-    return content;
+function toMarkdown(files, config) {
+    const dirs = [...new Set(
+        files.map(f => path.dirname(f.path)).filter(d => d !== '.')
+    )].sort();
+
+    const structure = dirs.map(d => `📁 ${d}/`).join('\n');
+
+    const sources = files.map(file => {
+        const body = file.content.endsWith('\n') ? file.content : file.content + '\n';
+        return `### ${file.path}\n\n\`\`\`${file.language}\n${body}\`\`\`\n`;
+    }).join('\n');
+
+    return [
+        config.first_comment,
+        '',
+        '## Project Structure',
+        '',
+        '```',
+        structure,
+        '',
+        `${files.length} files total`,
+        '```',
+        '',
+        '## Source Files',
+        '',
+        sources,
+        config.last_comment,
+    ].join('\n');
 }
 
-function toToon(baseJson, stats) {
-    let content = '';
-
-    // Meta header
-    content += `# Project Context\n`;
-    content += `# Generated: ${new Date().toISOString()}\n`;
-    content += `# Files: ${baseJson.length}\n`;
-    content += `# Lines: ${stats.totalLines}\n`;
-    content += `# Size: ${stats.totalSize} bytes\n\n`;
-
-    // Files table (compact tabular format - TOON's strength)
-    content += `files[${baseJson.length}]{path,name,extension,language,lines,size}:\n`;
-    for (const file of baseJson) {
-        const ext = file.extension || '';
-        content += `  ${escapeToonValue(file.path)},${escapeToonValue(file.name)},${ext},${file.language},${file.lines},${file.size}\n`;
-    }
-
-    content += '\n';
-
-    // File contents
-    for (let i = 0; i < baseJson.length; i++) {
-        const file = baseJson[i];
-        content += `---\n`;
-        content += `[${i}] ${file.path}\n`;
-        content += `language: ${file.language}\n`;
-        content += `content:\n`;
-        // Indent each line with 2 spaces
-        const lines = file.content.split('\n');
-        for (const line of lines) {
-            content += `  ${line}\n`;
-        }
-    }
-
-    return content;
+function toToon(files, stats) {
+    const header = [
+        '# Project Context',
+        `# Generated: ${new Date().toISOString()}`,
+        `# Files: ${files.length}`,
+        `# Lines: ${stats.totalLines}`,
+        `# Size: ${stats.totalSize} bytes`,
+        '',
+        `files[${files.length}]{path,name,extension,language,lines,size}:`,
+        ...files.map(f =>
+            `  ${escapeToon(f.path)},${escapeToon(f.name)},${f.extension || ''},${f.language},${f.lines},${f.size}`
+        ),
+        '',
+    ].join('\n');
+
+    const bodies = files.map((f, i) => [
+        '---',
+        `[${i}] ${f.path}`,
+        `language: ${f.language}`,
+        'content:',
+        ...f.content.split('\n').map(l => `  ${l}`),
+    ].join('\n')).join('\n');
+
+    return header + bodies;
 }
 
-function escapeToonValue(value) {
-    if (value === null || value === undefined) return '';
-    const str = String(value);
-    if (str.includes(',') || str.includes('\n') || str.includes('"') ||
-        str.startsWith(' ') || str.endsWith(' ')) {
-        return '"' + str.replace(/"/g, '""').replace(/\n/g, '\\n') + '"';
-    }
-    return str;
-}
-
-function toXml(baseJson) {
-    let content = '<?xml version="1.0" encoding="UTF-8"?>\n';
-    content += '<context>\n';
-
-    for (const file of baseJson) {
-        content += `  <file>\n`;
-        content += `    <path>${escapeXml(file.path)}</path>\n`;
-        content += `    <name>${escapeXml(file.name)}</name>\n`;
-        content += `    <extension>${escapeXml(file.extension || '')}</extension>\n`;
-        content += `    <language>${escapeXml(file.language)}</language>\n`;
-        content += `    <lines>${file.lines}</lines>\n`;
-        content += `    <size>${file.size}</size>\n`;
-        content += `    <content><![CDATA[\n${file.content}${file.content.endsWith('\n') ? '' : '\n'}]]></content>\n`;
-        content += `  </file>\n`;
-    }
+function escapeToon(value) {
+    if (value == null) return '';
+    const str         = String(value);
+    const needsQuotes = str.includes(',') || str.includes('\n') || str.includes('"')
+        || str.startsWith(' ') || str.endsWith(' ');
+    return needsQuotes
+        ? `"${str.replace(/"/g, '""').replace(/\n/g, '\\n')}"`
+        : str;
+}
 
-    content += '</context>\n';
-    return content;
+function toXml(files) {
+    const fileEntries = files.map(f => [
+        '  <file>',
+        `    <path>${escapeXml(f.path)}</path>`,
+        `    <name>${escapeXml(f.name)}</name>`,
+        `    <extension>${escapeXml(f.extension || '')}</extension>`,
+        `    <language>${escapeXml(f.language)}</language>`,
+        `    <lines>${f.lines}</lines>`,
+        `    <size>${f.size}</size>`,
+        `    <content><![CDATA[\n${f.content}${f.content.endsWith('\n') ? '' : '\n'}]]></content>`,
+        '  </file>',
+    ].join('\n')).join('\n');
+
+    return `<?xml version="1.0" encoding="UTF-8"?>\n<context>\n${fileEntries}\n</context>\n`;
 }
 
 function escapeXml(str) {
-    if (str === null || str === undefined) return '';
+    if (str == null) return '';
     return String(str)
         .replace(/&/g, '&amp;')
         .replace(/</g, '&lt;')
@@ -436,125 +471,76 @@ function escapeXml(str) {
         .replace(/'/g, '&apos;');
 }
 
+function renderFormat(format, files, stats, config) {
+    switch (format) {
+        case 'json': return { content: toJson(files),             ext: 'json' };
+        case 'md':   return { content: toMarkdown(files, config), ext: 'md'   };
+        case 'toon': return { content: toToon(files, stats),      ext: 'toon' };
+        case 'xml':  return { content: toXml(files),              ext: 'xml'  };
+    }
+}
+
 // ============================================
 // CONTEXT GENERATION
 // ============================================
 
-async function generateContextDynamic() {
-    loadDependencies();
-
-    const { srcPath } = await inquirer.prompt([
-        {
-            type: 'input',
-            name: 'srcPath',
-            message: 'Enter the source path to analyze:',
-            default: '.',
-            validate: (input) => {
-                if (!fs.existsSync(input)) {
-                    return `Path does not exist: ${input}`;
-                }
-                return true;
-            }
-        }
-    ]);
-
-    const config = { ...DEFAULT_PROJECT_CONFIG, src: srcPath };
-    return generateContext(config, srcPath);
-}
+function generateContext(config) {
+    const spinner = ora(`Scanning ${config.src}...`).start();
 
-async function generateContextFromConfigFile() {
-    loadDependencies();
-
-    const config = loadProjectConfig();
-    if (!config) {
-        console.log(chalk.yellow('\n⚠️  No config file found.'));
+    if (!fs.existsSync(config.src)) {
+        spinner.fail(`Source path does not exist: ${config.src}`);
         return null;
     }
 
-    return generateContext(config, config.src);
-}
-
-function generateContext(config, srcPath) {
-    const spinner = ora(`Scanning and reading files from ${srcPath}...`).start();
+    const { files, stats } = scanFiles(config.src, config);
 
-    if (!fs.existsSync(srcPath)) {
-        spinner.fail(`Source path does not exist: ${srcPath}`);
+    if (files.length === 0) {
+        spinner.fail(`No files found in: ${config.src}`);
         return null;
     }
 
-    // Single pass: scan AND build JSON at the same time
-    const { jsonArray, stats } = scanAndBuildJson(srcPath, config);
-
-    if (jsonArray.length === 0) {
-        spinner.fail(`No files found in: ${srcPath}`);
-        return null;
-    }
-
-    spinner.succeed(`Context built: ${chalk.yellow(jsonArray.length)} files, ${chalk.yellow(formatSize(stats.totalSize))}`);
-
-    return {
-        baseJson: jsonArray,
-        stats: stats,
-        config
-    };
+    spinner.succeed(`Context built: ${chalk.yellow(files.length)} files, ${chalk.yellow(formatSize(stats.totalSize))}`);
+    return { files, stats, config };
 }
 
-// ============================================
-// SAVE CONTEXT
-// ============================================
+function printSummary(stats) {
+    console.log(chalk.cyan('\n📊 Context Summary:'));
+    console.log(chalk.white(`   Files: ${stats.files}`));
+    console.log(chalk.white(`   Lines: ${stats.totalLines.toLocaleString()}`));
+    console.log(chalk.white(`   Size:  ${formatSize(stats.totalSize)}`));
+}
 
 // ============================================
 // SAVE CONTEXT
 // ============================================
 
-async function saveContext(result, formats) {
+async function saveContext(result, formats, fileName) {
     loadDependencies();
 
-    const { fileName } = await inquirer.prompt([
-        {
-            type: 'input',
-            name: 'fileName',
+    if (!fileName) {
+        const answer = await inquirer.prompt([{
+            type: 'input', name: 'fileName',
             message: 'Enter a name for the output files:',
-            default: 'context'
-        }
-    ]);
-
-    let outputPath = result.config.output || './mkctx';
-
-    if (!fs.existsSync(outputPath)) {
-        fs.mkdirSync(outputPath, { recursive: true });
+            default: 'context',
+        }]);
+        fileName = answer.fileName;
     }
 
+    const outputDir = result.config.output || './mkctx';
+    fs.mkdirSync(outputDir, { recursive: true });
+
     const savedFiles = [];
 
     for (const format of formats) {
-        let content;
-        let filename;
-
-        switch (format) {
-            case 'json':
-                content = toJson(result.baseJson);
-                filename = `${fileName}.json`;
-                break;
-            case 'md':
-                content = toMarkdown(result.baseJson, result.config);
-                filename = `${fileName}.md`;
-                break;
-            case 'toon':
-                content = toToon(result.baseJson, result.stats);
-                filename = `${fileName}.toon`;
-                break;
-            case 'xml':
-                content = toXml(result.baseJson);
-                filename = `${fileName}.xml`;
-                break;
-        }
-
-        const outputFile = path.join(outputPath, filename);
-        fs.writeFileSync(outputFile, content);
-        const size = Buffer.byteLength(content, 'utf-8');
-        const tokens = estimateTokens(content);
-        savedFiles.push({ format, file: outputFile, size, tokens });
+        const { content, ext } = renderFormat(format, result.files, result.stats, result.config);
+        const outputPath = path.join(outputDir, `${fileName}.${ext}`);
+        fs.writeFileSync(outputPath, content);
+        savedFiles.push({
+            format,
+            file:   outputPath,
+            size:   Buffer.byteLength(content, 'utf-8'),
+            tokens: estimateTokens(content),
+        });
     }
 
     console.log(chalk.green('\n✅ Context saved:\n'));
@@ -567,59 +553,38 @@ async function saveContext(result, formats) {
 }
 
 // ============================================
-// FORMAT SELECTION
+// INTERACTIVE PROMPTS
 // ============================================
 
-async function selectFormat() {
-    loadDependencies();
-
-    const { format } = await inquirer.prompt([
-        {
-            type: 'list',
-            name: 'format',
-            message: 'Select output format:',
-            default: 'all',
-            choices: [
-                {
-                    name: chalk.magenta('📦 All formats (MD, JSON, TOON, XML)'),
-                    value: 'all'
-                },
-                new inquirer.Separator(),
-                {
-                    name: chalk.blue('📝 Markdown (.md)'),
-                    value: 'md'
-                },
-                {
-                    name: chalk.green('🔧 JSON (.json) - Simple array'),
-                    value: 'json'
-                },
-                {
-                    name: chalk.yellow('🎒 TOON (.toon) - Token-optimized'),
-                    value: 'toon'
-                },
-                {
-                    name: chalk.red('📄 XML (.xml)'),
-                    value: 'xml'
-                }
-            ]
-        }
-    ]);
-
-    if (format === 'all') {
-        return ['json', 'md', 'toon', 'xml'];
-    }
-
-    return [format];
+async function promptSrcPath() {
+    const { srcPath } = await inquirer.prompt([{
+        type: 'input', name: 'srcPath',
+        message: 'Enter the source path to analyze:',
+        default: '.',
+        validate: input => fs.existsSync(input) || `Path does not exist: ${input}`,
+    }]);
+    return srcPath;
 }
 
-// ============================================
-// MAIN MENU
-// ============================================
-
-async function showMainMenu() {
-    loadDependencies();
+async function promptFormat() {
+    const { format } = await inquirer.prompt([{
+        type: 'list', name: 'format',
+        message: 'Select output format:',
+        default: 'all',
+        choices: [
+            { name: chalk.magenta('📦 All formats (MD, JSON, TOON, XML)'), value: 'all'  },
+            new inquirer.Separator(),
+            { name: chalk.blue('📝 Markdown (.md)'),                       value: 'md'   },
+            { name: chalk.green('🔧 JSON (.json) - Simple array'),          value: 'json' },
+            { name: chalk.yellow('🎒 TOON (.toon) - Token-optimized'),      value: 'toon' },
+            { name: chalk.red('📄 XML (.xml)'),                             value: 'xml'  },
+        ],
+    }]);
+    return resolveFormats(format);
+}
 
-    const hasConfig = hasProjectConfig();
+async function promptMainMenu() {
+    const hasConfig = configFileExists();
 
     console.log(chalk.cyan('\n╔════════════════════════════════════════╗'));
     console.log(chalk.cyan('║') + chalk.cyan.bold('     📄 mkctx - Make Context            ') + chalk.cyan('║'));
@@ -628,116 +593,96 @@ async function showMainMenu() {
     const choices = [];
 
     if (hasConfig) {
-        choices.push({
-            name: chalk.green('📁 Generate from config file'),
-            value: 'from-config'
-        });
+        choices.push({ name: chalk.green('📁 Generate from config file'), value: 'from-config' });
     }
 
     choices.push(
-        {
-            name: chalk.blue('🔍 Generate dynamically (choose path)'),
-            value: 'dynamic'
-        },
+        { name: chalk.blue('🔍 Generate dynamically (choose path)'), value: 'dynamic' },
         new inquirer.Separator(),
         {
-            name: hasConfig
-                ? chalk.gray('⚙️  View configuration')
-                : chalk.yellow('⚙️  Create configuration file'),
-            value: 'config'
+            name:  hasConfig ? chalk.gray('⚙️  View configuration') : chalk.yellow('⚙️  Create configuration file'),
+            value: 'config',
         },
         new inquirer.Separator(),
-        {
-            name: chalk.red('❌ Exit'),
-            value: 'exit'
-        }
+        { name: chalk.red('❌ Exit'), value: 'exit' },
     );
 
-    const { action } = await inquirer.prompt([
-        {
-            type: 'list',
-            name: 'action',
-            message: 'What would you like to do?',
-            choices
-        }
-    ]);
+    const { action } = await inquirer.prompt([{
+        type: 'list', name: 'action',
+        message: 'What would you like to do?',
+        choices,
+    }]);
 
     return action;
 }
 
 // ============================================
-// MAIN APPLICATION
+// EXECUTION FLOWS
 // ============================================
 
-async function main() {
-    const args = process.argv.slice(2);
+async function runNonInteractive(rawFlags) {
+    loadDependencies();
 
-    if (args.includes('--help') || args.includes('-h') || args[0] === 'help') {
-        showHelp();
-        return;
-    }
+    const cli     = resolveFlags(rawFlags);
+    const config  = buildConfig(cli);
+    const formats = resolveFormats(cli.format);
+    const fileName = cli.name || 'context';
 
-    if (args.includes('--version') || args.includes('-v') || args[0] === 'version') {
-        showVersion();
-        return;
+    if (!fs.existsSync(config.src)) {
+        console.error(`❌ Source path does not exist: ${config.src}`);
+        process.exit(1);
     }
 
-    if (args[0] === 'config') {
-        loadDependencies();
-        createProjectConfig();
-        return;
-    }
+    const result = generateContext(config);
+    if (!result) process.exit(1);
 
+    printSummary(result.stats);
+    await saveContext(result, formats, fileName);
+    console.log(chalk.yellow('👋 Done!\n'));
+}
+
+async function runInteractive() {
     loadDependencies();
 
     let running = true;
 
     while (running) {
-        const action = await showMainMenu();
+        const action = await promptMainMenu();
 
         switch (action) {
             case 'from-config': {
-                const result = await generateContextFromConfigFile();
-                if (result) {
-                    console.log(chalk.cyan('\n📊 Context Summary:'));
-                    console.log(chalk.white(`   Files: ${result.stats.files}`));
-                    console.log(chalk.white(`   Lines: ${result.stats.totalLines.toLocaleString()}`));
-                    console.log(chalk.white(`   Size: ${formatSize(result.stats.totalSize)}`));
-
-                    const formats = await selectFormat();
-                    await saveContext(result, formats);
-
-                    console.log(chalk.yellow('👋 Done!\n'));
-                    running = false;
-                }
+                const config = loadConfig();
+                if (!config) { console.log(chalk.yellow('\n⚠️  No config file found.')); break; }
+                const result = generateContext(config);
+                if (!result) break;
+                printSummary(result.stats);
+                const formats = await promptFormat();
+                await saveContext(result, formats);
+                console.log(chalk.yellow('👋 Done!\n'));
+                running = false;
                 break;
             }
 
             case 'dynamic': {
-                const result = await generateContextDynamic();
-                if (result) {
-                    console.log(chalk.cyan('\n📊 Context Summary:'));
-                    console.log(chalk.white(`   Files: ${result.stats.files}`));
-                    console.log(chalk.white(`   Lines: ${result.stats.totalLines.toLocaleString()}`));
-                    console.log(chalk.white(`   Size: ${formatSize(result.stats.totalSize)}`));
-
-                    const formats = await selectFormat();
-                    await saveContext(result, formats);
-
-                    console.log(chalk.yellow('👋 Done!\n'));
-                    running = false;
-                }
+                const srcPath = await promptSrcPath();
+                const config  = { ...DEFAULT_CONFIG, src: srcPath };
+                const result  = generateContext(config);
+                if (!result) break;
+                printSummary(result.stats);
+                const formats = await promptFormat();
+                await saveContext(result, formats);
+                console.log(chalk.yellow('👋 Done!\n'));
+                running = false;
                 break;
             }
 
             case 'config':
-                if (hasProjectConfig()) {
+                if (configFileExists()) {
                     console.log(chalk.cyan('\n📄 Current configuration:\n'));
-                    const config = loadProjectConfig();
-                    console.log(JSON.stringify(config, null, 2));
+                    console.log(JSON.stringify(loadConfig(), null, 2));
                     console.log(chalk.gray(`\n   Edit ${CONFIG_FILE} to modify settings.\n`));
                 } else {
-                    createProjectConfig();
+                    createConfigFile();
                 }
                 break;
 
@@ -749,9 +694,12 @@ async function main() {
     }
 }
 
+// ============================================
+// HELP & VERSION
+// ============================================
+
 function showHelp() {
     loadDependencies();
-
     console.log(chalk.cyan(`
 ╔════════════════════════════════════════════════════════════╗
 ║  📄 mkctx - Make Context for AI Code Analysis              ║
@@ -760,28 +708,35 @@ function showHelp() {
  ${chalk.white('Generate context files from your codebase for AI analysis.')}
 
  ${chalk.yellow('Usage:')}
-  mkctx                    Interactive mode (recommended)
-  mkctx config             Create configuration file
-  mkctx help               Show this help message
-  mkctx version            Show version
+  mkctx                         Interactive mode
+  mkctx config                  Create configuration file
+  mkctx help / --help           Show this help message
+  mkctx version / --version     Show version
+
+ ${chalk.yellow('Non-interactive flags (skip all prompts):')}
+  --src      <path>             Source directory              (default: .)
+  --output   <path>             Output directory              (default: ./mkctx)
+  --format   <fmt>              md, json, toon, xml, all, or comma-separated
+  --name     <filename>         Output file base name         (default: context)
+  --ignore   <patterns>         Comma-separated ignore patterns
+  --first-comment <text>        Override first comment header
+  --last-comment  <text>        Override last comment footer
+
+ ${chalk.yellow('Short aliases:')}
+  -s  --src     -o  --output     -f  --format     -n  --name
+
+ ${chalk.yellow('Examples:')}
+  mkctx --src ./src
+  mkctx --src . --format all --name my-project --output ./docs
+  mkctx --src ./app --format md,json --ignore "*.test.ts,__tests__/"
+  mkctx -s ./src -f toon -n snapshot
 
  ${chalk.yellow('Output Formats:')}
-  ${chalk.green('JSON')}    Simple array of file objects (base format)
+  ${chalk.green('JSON')}    Simple array of file objects
   ${chalk.blue('MD')}      Markdown with code blocks
   ${chalk.yellow('TOON')}    Token-Oriented Object Notation (LLM optimized)
   ${chalk.red('XML')}     XML with CDATA sections
 
- ${chalk.yellow('JSON Structure:')}
-  [{
-    "path": "src/index.ts",
-    "name": "index.ts", 
-    "extension": "ts",
-    "language": "typescript",
-    "lines": 150,
-    "size": 4096,
-    "content": "..."
-  }]
-
  ${chalk.gray('More info: https://github.com/pnkkzero/mkctx')}
 `));
 }
@@ -796,13 +751,25 @@ function showVersion() {
 }
 
 // ============================================
-// RUN
+// ENTRY POINT
 // ============================================
 
-main().catch((err) => {
-    console.error(`\n❌ Error: ${err.message}`);
-    if (process.env.DEBUG) {
-        console.error(err.stack);
+async function main() {
+    const { command, flags } = parseArgs(process.argv);
+
+    if (flags.help || flags.h || command === 'help')       return showHelp();
+    if (flags.version || flags.v || command === 'version') return showVersion();
+    if (command === 'config') { loadDependencies(); return createConfigFile(); }
+
+    if (isNonInteractiveMode(flags)) {
+        await runNonInteractive(flags);
+    } else {
+        await runInteractive();
     }
+}
+
+main().catch(err => {
+    console.error(`\n❌ Error: ${err.message}`);
+    if (process.env.DEBUG) console.error(err.stack);
     process.exit(1);
 });