timonel 2.8.3 → 2.9.1

package/dist/cli.js

@@ -1,31 +1,34 @@
 #!/usr/bin/env node
-import { spawnSync, execSync } from 'child_process';
-import { mkdirSync, existsSync, writeFileSync, rmSync, unlinkSync } from 'fs';
-import { join, dirname, isAbsolute, resolve } from 'path';
+import { spawnSync } from 'child_process';
+import fs from 'fs';
+import path from 'path';
 import { fileURLToPath } from 'url';
-import * as fs from 'fs';
-import * as path from 'path';
 import { SecurityUtils } from './lib/security.js';
 const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
-const HELM_INSTALL_URL = 'https://helm.sh/docs/intro/install/';
-const HELM_ENV_VAR_MSG = 'Or set HELM_BIN environment variable to helm binary path.';
+const __dirname = path.dirname(__filename);
+const UMBRELLA_CONFIG_FILE = 'umbrella.config.json';
+const UMBRELLA_FILE_NAME = 'umbrella.ts';
+function log(msg, silent = false) {
+    if (!silent) {
+        console.log(msg);
+    }
+}
 function usageAndExit(msg) {
-    if (msg)
-        console.error(SecurityUtils.sanitizeLogMessage(msg));
+    if (msg) {
+        console.error(`Error: ${msg}`);
+    }
     console.log([
-        'timonel (tl) - programmatic Helm chart generator',
+        'Usage: tl <command> [options]',
         '',
-        'Usage:',
-        '  tl init <chart-name>                 Scaffold example at charts/<name>/chart.ts',
-        '  tl synth <projectDir> [outDir]       Run charts/<...>/chart.ts and write chart',
-        '  tl validate <projectDir>             Validate chart.ts without generating files',
-        '  tl diff <projectDir> <chartDir>      Compare generated chart with existing',
-        '  tl deploy <projectDir> <release>     Synth and deploy with helm install/upgrade',
-        '  tl package <chartDir> [outDir]       Run `helm package` into outDir (requires Helm)',
+        'Commands:',
+        '  tl init <chart-name>              Create new chart',
+        '  tl synth [outDir]                 Generate Helm chart',
+        '  tl validate                       Validate chart',
+        '  tl deploy <release> [namespace]   Deploy chart',
+        '  tl templates                      List available templates',
         '',
         'Umbrella Charts:',
-        '  tl umbrella init <name>              Create umbrella chart structure',
+        '  tl umbrella init <n>              Create umbrella chart structure',
         '  tl umbrella add <subchart>           Add subchart to umbrella',
         '  tl umbrella synth [outDir]           Generate umbrella chart',
         '',
@@ -34,17 +37,16 @@ function usageAndExit(msg) {
         '  --silent                             Suppress output (useful for CI)',
         '  --env <environment>                  Use environment-specific values',
         '  --set <key=value>                    Override values (can be used multiple times)',
-        '  --version, -v                        Show version information',
         '  --help, -h                           Show this help message',
         '',
         'Examples:',
         '  tl init my-app',
-        '  tl synth charts/my-app charts/my-app/dist',
-        '  tl validate charts/my-app',
-        '  tl deploy charts/my-app my-release --env prod',
-        '  tl synth charts/my-app --dry-run --silent',
-        '  tl synth charts/my-app --set replicas=5 --set image.tag=v2.0.0',
-        '  tl deploy charts/my-app my-release --set service.port=8080',
+        '  tl synth my-app my-app/dist',
+        '  tl validate my-app',
+        '  tl deploy my-app my-release --env prod',
+        '  tl synth my-app --dry-run --silent',
+        '  tl synth my-app --set replicas=5 --set image.tag=v2.0.0',
+        '  tl deploy my-app my-release --set service.port=8080',
     ].join('\n'));
     process.exit(msg ? 1 : 0);
 }
@@ -53,100 +55,50 @@ async function cmdInit(name, silent = false) {
         usageAndExit('Missing <chart-name>');
     const validName = name;
     if (!SecurityUtils.isValidChartName(validName)) {
-        usageAndExit('Invalid chart name: must be RFC 1123 compliant (lowercase alphanumeric with hyphens)');
+        usageAndExit('Invalid chart name. Must be lowercase, start with a letter, and contain only letters, numbers, and dashes.');
     }
-    const sanitizedName = validName;
-    const base = SecurityUtils.validatePath(join(process.cwd(), 'charts', sanitizedName), process.cwd());
-    const file = join(base, 'chart.ts');
-    mkdirSync(base, { recursive: true });
-    if (existsSync(file)) {
-        console.error(`File already exists: ${file}`);
-        process.exit(1);
-    }
-    writeFileSync(file, exampleChartTs(validName));
-    log(SecurityUtils.sanitizeLogMessage(`Scaffold created at ${file}`), silent);
+    const base = path.join(process.cwd(), validName);
+    const chartFile = path.join(base, 'chart.ts');
+    fs.mkdirSync(base, { recursive: true });
+    const { generateBasicChart } = await import('./lib/templates/basic-chart.js');
+    fs.writeFileSync(chartFile, generateBasicChart(validName));
+    log(`Chart created at ${base}`, silent);
+    log(`Generated chart.ts file`, silent);
+    log(`Run 'tl synth ${validName}' to generate complete Helm chart`, silent);
 }
-async function cmdValidate(projectDir, silent = false) {
-    if (!projectDir)
-        usageAndExit('Missing <projectDir>');
-    const proj = projectDir;
-    const basePath = isAbsolute(proj) ? dirname(proj) : process.cwd();
-    const chartTs = isAbsolute(proj)
-        ? SecurityUtils.validatePath(join(proj, 'chart.ts'), basePath)
-        : SecurityUtils.validatePath(join(process.cwd(), proj, 'chart.ts'), process.cwd());
-    if (!existsSync(chartTs)) {
-        console.error(SecurityUtils.sanitizeLogMessage(`chart.ts not found at ${chartTs}`));
+async function cmdSynth(chartDirOrOutDir, flags) {
+    let chartDir = process.cwd();
+    let outDir;
+    if (chartDirOrOutDir && fs.existsSync(path.join(chartDirOrOutDir, 'chart.ts'))) {
+        chartDir = path.resolve(chartDirOrOutDir);
+    }
+    else {
+        outDir = chartDirOrOutDir;
+    }
+    const chartFile = path.join(chartDir, 'chart.ts');
+    const defaultOutDir = path.join(chartDir, 'dist');
+    if (!fs.existsSync(chartFile)) {
+        console.error('chart.ts not found. Run `tl init` first.');
         process.exit(1);
     }
-    const helm = process.env['HELM_BIN'] || 'helm';
-    try {
-        execSync(`${helm} version --short`, { stdio: 'ignore' });
-    }
-    catch {
-        console.error('✗ Helm not found. Install Helm to enable chart validation.');
-        console.error(`  Install: ${HELM_INSTALL_URL}`);
-        console.error(`  ${HELM_ENV_VAR_MSG}`);
-        process.exit(1);
-    }
-    const tempDir = join(process.cwd(), '.timonel-validate');
-    try {
-        await cmdSynth(projectDir, tempDir, { dryRun: false, silent: true, set: {} });
-        const lintResult = spawnSync(helm, ['lint', tempDir], {
-            stdio: silent ? 'pipe' : 'inherit',
-            encoding: 'utf8',
-        });
-        if (lintResult.status !== 0) {
-            if (silent && lintResult.stderr) {
-                console.error(SecurityUtils.sanitizeLogMessage(lintResult.stderr));
-            }
-            console.error('✗ Chart validation failed: Helm lint errors found');
-            process.exit(1);
-        }
-        log('✓ Chart validation passed', silent);
-    }
-    catch (error) {
-        const errorMsg = error instanceof Error ? error.message : String(error);
-        console.error('✗ Chart validation failed:', SecurityUtils.sanitizeLogMessage(errorMsg));
-        process.exit(1);
-    }
-    finally {
-        if (existsSync(tempDir)) {
-            rmSync(tempDir, { recursive: true, force: true });
-        }
-    }
-}
-async function executeTypeScriptChart(resolvedPath, outDir, flags) {
+    const resolvedOutDir = outDir ? path.resolve(outDir) : defaultOutDir;
+    const originalContent = fs.readFileSync(chartFile, 'utf8');
+    const modifiedContent = originalContent.replace(/chart\.writeHelmChart\(['"][^'"]*['"]\)/, `chart.writeHelmChart('${resolvedOutDir}')`);
+    const tempChartFile = path.join(chartDir, '.timonel-temp-chart.ts');
+    fs.writeFileSync(tempChartFile, modifiedContent);
     const wrapperScript = `
 import { pathToFileURL } from 'url';
 
-const mod = await import(pathToFileURL('${resolvedPath}').href);
-const runner = mod.default || mod.run || mod.synth;
-if (typeof runner !== 'function') {
-  console.error('chart.ts must export a default/run/synth function');
-  process.exit(1);
-}
-
-${flags?.set && Object.keys(flags.set).length > 0
-        ? `
-// Apply --set overrides if provided
-if (mod.rutter && typeof mod.rutter.setValues === 'function') {
-  mod.rutter.setValues(${JSON.stringify(flags.set)});
-}
-`
-        : ''}
-
-const outDir = '${outDir}';
-const fs = await import('fs');
-fs.mkdirSync(outDir, { recursive: true });
-await Promise.resolve(runner(outDir));
-console.log('Chart written to ' + outDir);
+// Import the modified chart file which should execute the synthesis directly
+await import(pathToFileURL('${tempChartFile}').href);
 `;
-    const wrapperFile = join(process.cwd(), '.timonel-wrapper.mjs');
+    const wrapperFile = path.join(chartDir, '.timonel-wrapper.mjs');
     try {
-        writeFileSync(wrapperFile, wrapperScript);
-        const result = spawnSync('npx', ['tsx', wrapperFile], {
+        fs.writeFileSync(wrapperFile, wrapperScript);
+        const result = spawnSync('npx', ['tsx', wrapperFile].filter(Boolean), {
             stdio: flags?.silent ? 'pipe' : 'inherit',
             encoding: 'utf8',
+            cwd: chartDir,
         });
         if (result.status !== 0) {
             if (flags?.silent && result.stderr) {
@@ -156,118 +108,77 @@ console.log('Chart written to ' + outDir);
         }
     }
     finally {
-        if (existsSync(wrapperFile)) {
-            unlinkSync(wrapperFile);
-        }
-    }
-}
-async function cmdSynth(projectDir, out, flags) {
-    if (!projectDir)
-        usageAndExit('Missing <projectDir>');
-    const proj = projectDir;
-    const basePath = isAbsolute(proj) ? dirname(proj) : process.cwd();
-    const chartTs = isAbsolute(proj)
-        ? SecurityUtils.validatePath(join(proj, 'chart.ts'), basePath)
-        : SecurityUtils.validatePath(join(process.cwd(), proj, 'chart.ts'), process.cwd());
-    if (!existsSync(chartTs)) {
-        console.error(SecurityUtils.sanitizeLogMessage(`chart.ts not found at ${chartTs}`));
-        process.exit(1);
-    }
-    if (!SecurityUtils.isValidTypeScriptFile(chartTs)) {
-        console.error('Security: Only TypeScript files (.ts) are allowed');
-        process.exit(1);
-    }
-    const resolvedPath = resolve(chartTs);
-    const outDir = out || join(dirname(chartTs), 'dist');
-    if (flags?.dryRun) {
-        log(`[DRY RUN] Would write chart to ${outDir}`, flags.silent);
-        return;
-    }
-    try {
-        await executeTypeScriptChart(resolvedPath, outDir, flags);
-    }
-    catch (error) {
-        const errorMsg = error instanceof Error ? error.message : String(error);
-        console.error(SecurityUtils.sanitizeLogMessage(`Failed to execute chart: ${errorMsg}`));
-        process.exit(1);
-    }
-}
-async function cmdDiff(projectDir, chartDir, silent = false) {
-    if (!projectDir || !chartDir)
-        usageAndExit('Missing <projectDir> or <chartDir>');
-    const validProjectDir = projectDir;
-    const validChartDir = chartDir;
-    const tempDir = join(process.cwd(), '.timonel-temp');
-    try {
-        await cmdSynth(validProjectDir, tempDir);
-        const diffCmd = process.platform === 'win32' ? 'fc' : 'diff';
-        const args = process.platform === 'win32'
-            ? ['/N', validChartDir, tempDir]
-            : ['-r', validChartDir, tempDir];
-        log(`> ${diffCmd} ${args.join(' ')}`, silent);
-        const res = spawnSync(diffCmd, args, { stdio: 'inherit' });
-        if (res.status === 0) {
-            log('✓ No differences found', silent);
+        if (fs.existsSync(wrapperFile)) {
+            fs.unlinkSync(wrapperFile);
         }
-        else if (res.status === 1) {
-            log('⚠ Differences found', silent);
-            process.exit(1);
+        if (fs.existsSync(tempChartFile)) {
+            fs.unlinkSync(tempChartFile);
         }
     }
-    finally {
-        if (existsSync(tempDir)) {
-            rmSync(tempDir, { recursive: true, force: true });
+}
+async function cmdValidate(flags) {
+    const result = spawnSync('helm', ['lint', '.'], {
+        stdio: flags?.silent ? 'pipe' : 'inherit',
+        encoding: 'utf8',
+    });
+    if (result.status !== 0) {
+        if (flags?.silent && result.stderr) {
+            console.error(SecurityUtils.sanitizeLogMessage(result.stderr));
         }
+        process.exit(result.status ?? 1);
     }
 }
-async function cmdDeploy(projectDir, releaseName, flags) {
-    if (!projectDir || !releaseName)
-        usageAndExit('Missing <projectDir> or <release>');
-    const validProjectDir = projectDir;
-    const validReleaseName = releaseName;
-    const helm = process.env['HELM_BIN'] || 'helm';
-    try {
-        execSync(`${helm} version --short`, { stdio: 'ignore' });
-    }
-    catch {
-        console.error('✗ Helm not found. Install Helm to enable deployment.');
-        console.error(`  Install: ${HELM_INSTALL_URL}`);
-        console.error(`  ${HELM_ENV_VAR_MSG}`);
-        process.exit(1);
-    }
-    const tempDir = join(process.cwd(), '.timonel-deploy');
-    try {
-        await cmdSynth(validProjectDir, tempDir, flags);
-        const checkCmd = `${helm} status ${releaseName}`;
-        const releaseExists = spawnSync('sh', ['-c', checkCmd], { stdio: 'ignore' }).status === 0;
-        const action = releaseExists ? 'upgrade' : 'install';
-        const args = [action, validReleaseName, tempDir];
-        if (flags?.env) {
-            const valuesFile = join(tempDir, `values-${flags.env}.yaml`);
-            if (existsSync(valuesFile)) {
-                args.push('-f', valuesFile);
-            }
-        }
-        if (flags?.dryRun) {
-            args.push('--dry-run');
-        }
-        log(`> ${helm} ${args.join(' ')}`, flags?.silent);
-        const res = spawnSync(helm, args, { stdio: 'inherit' });
-        if (res.status !== 0) {
-            process.exit(res.status ?? 1);
+async function cmdDeploy(release, namespace, flags) {
+    if (!release)
+        usageAndExit('Missing <release>');
+    const args = ['upgrade', '--install', release, '.'];
+    if (namespace) {
+        args.push('--namespace', namespace);
+    }
+    const result = spawnSync('helm', args.filter((arg) => Boolean(arg)), {
+        stdio: flags?.silent ? 'pipe' : 'inherit',
+        encoding: 'utf8',
+    });
+    if (result.status !== 0) {
+        if (flags?.silent && result.stderr) {
+            console.error(SecurityUtils.sanitizeLogMessage(result.stderr));
         }
-        log(`✓ ${action === 'install' ? 'Deployed' : 'Updated'} release ${validReleaseName}`, flags?.silent);
+        process.exit(result.status ?? 1);
     }
-    finally {
-        if (existsSync(tempDir)) {
-            rmSync(tempDir, { recursive: true, force: true });
-        }
+}
+async function cmdTemplates(flags) {
+    const templates = [
+        {
+            name: 'basic-chart',
+            description: 'Basic chart with deployment and service',
+            usage: 'tl init my-app',
+        },
+        {
+            name: 'umbrella-chart',
+            description: 'Umbrella chart for managing multiple subcharts',
+            usage: 'tl umbrella init my-app',
+        },
+        {
+            name: 'subchart',
+            description: 'Subchart for use with umbrella charts',
+            usage: 'tl umbrella add my-subchart',
+        },
+    ];
+    if (flags?.silent) {
+        console.log(JSON.stringify(templates));
+    }
+    else {
+        console.log('Available templates:');
+        templates.forEach((t) => {
+            console.log(`\n${t.name}`);
+            console.log(`  Description: ${t.description}`);
+            console.log(`  Usage: ${t.usage}`);
+        });
     }
 }
 async function cmdUmbrella(subcommand, args, flags) {
-    const UMBRELLA_USAGE_MSG = 'Missing umbrella subcommand (init|add|synth)';
     if (!subcommand)
-        usageAndExit(UMBRELLA_USAGE_MSG);
+        usageAndExit('Missing umbrella subcommand');
     switch (subcommand) {
         case 'init':
             await cmdUmbrellaInit(args?.[0], flags?.silent);
@@ -282,8 +193,6 @@ async function cmdUmbrella(subcommand, args, flags) {
             usageAndExit(`Unknown umbrella subcommand: ${subcommand}`);
     }
 }
-const UMBRELLA_CONFIG_FILE = 'umbrella.config.json';
-const UMBRELLA_FILE_NAME = 'umbrella.ts';
 async function cmdUmbrellaInit(name, silent = false) {
     const MISSING_NAME_MSG = 'Missing umbrella chart name';
     if (!name)
@@ -293,64 +202,91 @@ async function cmdUmbrellaInit(name, silent = false) {
     const umbrellaFile = path.join(base, UMBRELLA_FILE_NAME);
     const configFile = path.join(base, UMBRELLA_CONFIG_FILE);
     fs.mkdirSync(base, { recursive: true });
-    fs.mkdirSync(path.join(base, 'charts'), { recursive: true });
-    fs.writeFileSync(umbrellaFile, exampleUmbrellaTs(validName));
+    const { generateUmbrellaChart } = await import('./lib/templates/umbrella-chart.js');
+    fs.writeFileSync(umbrellaFile, generateUmbrellaChart(validName));
     const config = {
         name: validName,
         version: '0.1.0',
-        description: `${name} umbrella chart`,
+        description: `${validName} umbrella chart`,
         subcharts: [],
     };
     fs.writeFileSync(configFile, JSON.stringify(config, null, 2));
+    const chartsDir = path.join(base, 'charts');
+    fs.mkdirSync(chartsDir, { recursive: true });
     log(`Umbrella chart structure created at ${base}`, silent);
     log(`Add subcharts with: tl umbrella add <subchart-name>`, silent);
 }
-function updateUmbrellaTs(subchartPath, subchartName) {
-    const umbrellaFile = path.join(process.cwd(), UMBRELLA_FILE_NAME);
-    if (!fs.existsSync(umbrellaFile)) {
-        console.error('umbrella.ts not found.');
-        return;
-    }
-    let content = fs.readFileSync(umbrellaFile, 'utf8');
-    const chartName = subchartName || path.basename(subchartPath);
-    const camelCaseName = chartName.replace(/-([a-z])/g, (_, letter) => letter.toUpperCase());
-    const importStatement = `import { rutter as ${camelCaseName} } from './charts/${subchartPath}/chart';`;
-    const importRegex = /import\s+.*?from\s+['"].*?['"];?/g;
-    const imports = content.match(importRegex) || [];
-    if (imports.length > 0) {
-        const lastImport = imports[imports.length - 1];
-        if (!lastImport) {
-            throw new Error('No valid import statements found');
+function toCamelCase(str) {
+    return str.replace(/-([a-z])/g, (g) => g[1]?.toUpperCase() || '');
+}
+function findLastImportIndex(lines) {
+    let lastImportIndex = -1;
+    for (let i = 0; i < lines.length; i++) {
+        if (lines[i]?.trim().startsWith('import ')) {
+            lastImportIndex = i;
         }
-        const lastImportIndex = content.lastIndexOf(lastImport);
-        const insertIndex = lastImportIndex + lastImport.length;
-        if (!content.includes(importStatement)) {
-            content = content.slice(0, insertIndex) + '\n' + importStatement + content.slice(insertIndex);
+        else if (lines[i]?.trim() && !lines[i]?.trim().startsWith('import ')) {
+            break;
         }
     }
+    return lastImportIndex;
+}
+function addImportStatement(content, importStatement) {
+    if (content.includes(importStatement)) {
+        return content;
+    }
+    const lines = content.split('\n');
+    const lastImportIndex = findLastImportIndex(lines);
+    if (lastImportIndex >= 0) {
+        lines.splice(lastImportIndex + 1, 0, importStatement);
+    }
+    else {
+        lines.splice(0, 0, importStatement);
+    }
+    return lines.join('\n');
+}
+function buildSubchartsContent(subchartsContent, subchartEntry) {
+    const hasExistingEntries = /\{\s*name:\s*['"]/.test(subchartsContent || '');
+    if (!hasExistingEntries) {
+        return `\n    // Add your subcharts here:\n    ${subchartEntry},\n  `;
+    }
+    const trimmedContent = subchartsContent?.trimEnd() ?? '';
+    const needsComma = !trimmedContent.endsWith(',');
+    const comma = needsComma ? ',' : '';
+    return trimmedContent + `${comma}\n    ${subchartEntry}`;
+}
+function addSubchartToArray(content, chartName, camelCaseName) {
     const subchartsRegex = /subcharts:\s*\[([\s\S]*?)\]/;
     const match = content.match(subchartsRegex);
-    if (match) {
-        const subchartsContent = match[1];
-        if (subchartsContent === undefined) {
-            throw new Error('Unable to parse subcharts content');
-        }
-        if (!subchartsContent.includes(`name: '${chartName}'`)) {
-            let newSubchartsContent;
-            const subchartEntry = `{ name: '${chartName}', rutter: ${camelCaseName} }`;
-            const hasExistingEntries = /\{\s*name:\s*['"]/.test(subchartsContent);
-            if (!hasExistingEntries) {
-                newSubchartsContent = `\n    // Add your subcharts here:\n    ${subchartEntry},\n  `;
-            }
-            else {
-                const trimmedContent = subchartsContent.trimEnd();
-                newSubchartsContent = trimmedContent + `,\n    ${subchartEntry}`;
-            }
-            content = content.replace(subchartsRegex, `subcharts: [${newSubchartsContent}\n  ]`);
-        }
+    if (!match) {
+        return content;
     }
+    const subchartsContent = match[1];
+    if (subchartsContent?.includes(`name: '${chartName}'`)) {
+        return content;
+    }
+    const subchartEntry = `{ name: '${chartName}', chart: ${camelCaseName} }`;
+    const newSubchartsContent = buildSubchartsContent(subchartsContent, subchartEntry);
+    return content.replace(subchartsRegex, `subcharts: [${newSubchartsContent}\n  ]`);
+}
+function updateUmbrellaTs(subchartPath, chartName) {
+    const umbrellaFile = path.join(process.cwd(), UMBRELLA_FILE_NAME);
+    const content = processUmbrellaFile(umbrellaFile, subchartPath, chartName);
     fs.writeFileSync(umbrellaFile, content);
 }
+function processUmbrellaFile(umbrellaFile, subchartPath, chartName) {
+    let content = fs.readFileSync(umbrellaFile, 'utf8');
+    const importData = createImportData(subchartPath, chartName);
+    content = addImportStatement(content, importData.importStatement);
+    content = addSubchartToArray(content, chartName, importData.camelCaseName);
+    return content;
+}
+function createImportData(subchartPath, chartName) {
+    const importPath = `./charts/${subchartPath}/chart`;
+    const camelCaseName = toCamelCase(chartName);
+    const importStatement = `import ${camelCaseName} from '${importPath}';`;
+    return { importPath, camelCaseName, importStatement };
+}
 async function cmdUmbrellaAdd(subchartPath, silent = false) {
     const MISSING_SUBCHART_MSG = 'Missing subchart name or path';
     if (!subchartPath)
@@ -366,7 +302,9 @@ async function cmdUmbrellaAdd(subchartPath, silent = false) {
     const subchartDir = path.join(process.cwd(), 'charts', validSubchartPath);
     fs.mkdirSync(subchartDir, { recursive: true });
     const chartFile = path.join(subchartDir, 'chart.ts');
-    fs.writeFileSync(chartFile, exampleSubchartTs(subchartName));
+    const { generateSubchartTemplate } = await import('./lib/templates/subchart.js');
+    const subchartContent = generateSubchartTemplate(subchartName);
+    fs.writeFileSync(chartFile, subchartContent);
     config.subcharts.push({
         name: subchartName,
         version: '0.1.0',
@@ -376,6 +314,16 @@ async function cmdUmbrellaAdd(subchartPath, silent = false) {
     updateUmbrellaTs(validSubchartPath, subchartName);
     log(`Subchart ${subchartName} added to umbrella at path '${validSubchartPath}'`, silent);
 }
+async function cmdUmbrellaSynth(outDir, flags) {
+    const umbrellaFile = path.join(process.cwd(), UMBRELLA_FILE_NAME);
+    const defaultOutDir = path.join(process.cwd(), 'dist');
+    if (!fs.existsSync(umbrellaFile)) {
+        console.error('umbrella.ts not found. Run `tl umbrella init` first.');
+        process.exit(1);
+    }
+    const resolvedOutDir = outDir ? path.resolve(outDir) : defaultOutDir;
+    await executeTypeScriptUmbrella(umbrellaFile, resolvedOutDir, flags);
+}
 async function executeTypeScriptUmbrella(resolvedPath, outDir, flags) {
     const wrapperScript = `
 import { pathToFileURL } from 'url';
@@ -396,7 +344,7 @@ console.log('Umbrella chart written to ' + output);
     const wrapperFile = path.join(process.cwd(), '.timonel-umbrella-wrapper.mjs');
     try {
         fs.writeFileSync(wrapperFile, wrapperScript);
-        const result = spawnSync('npx', ['tsx', wrapperFile], {
+        const result = spawnSync('npx', ['tsx', wrapperFile].filter(Boolean), {
             stdio: flags?.silent ? 'pipe' : 'inherit',
             encoding: 'utf8',
         });
@@ -413,453 +361,80 @@ console.log('Umbrella chart written to ' + output);
         }
     }
 }
-async function cmdUmbrellaSynth(outDir, flags) {
-    const configFile = path.join(process.cwd(), UMBRELLA_CONFIG_FILE);
-    if (!fs.existsSync(configFile)) {
-        console.error(`${UMBRELLA_CONFIG_FILE} not found. Run \`tl umbrella init\` first.`);
-        process.exit(1);
-    }
-    const umbrellaFile = path.join(process.cwd(), UMBRELLA_FILE_NAME);
-    if (!fs.existsSync(umbrellaFile)) {
-        console.error('umbrella.ts not found.');
-        process.exit(1);
-    }
-    if (!SecurityUtils.isValidTypeScriptFile(umbrellaFile)) {
-        console.error('Security: Only TypeScript files (.ts) are allowed');
-        process.exit(1);
-    }
-    const validatedPath = SecurityUtils.validatePath(umbrellaFile, process.cwd());
-    const resolvedPath = path.resolve(validatedPath);
-    const output = outDir || path.join(process.cwd(), 'dist');
-    if (flags?.dryRun) {
-        log(`[DRY RUN] Would write umbrella chart to ${output}`, flags.silent);
-        return;
-    }
-    try {
-        await executeTypeScriptUmbrella(resolvedPath, output, flags);
-    }
-    catch (error) {
-        const errorMsg = error instanceof Error ? error.message : String(error);
-        console.error(SecurityUtils.sanitizeLogMessage(`Failed to execute umbrella: ${errorMsg}`));
-        process.exit(1);
-    }
-}
-async function cmdPackage(chartDir, out, silent = false) {
-    if (!chartDir)
-        usageAndExit('Missing <chartDir>');
-    const validChartDir = chartDir;
-    const src = path.isAbsolute(validChartDir)
-        ? validChartDir
-        : path.join(process.cwd(), validChartDir);
-    const chartYaml = path.join(src, 'Chart.yaml');
-    if (!fs.existsSync(chartYaml)) {
-        console.error(`Chart.yaml not found in ${src}`);
-        process.exit(1);
-    }
-    const outDir = out ? (path.isAbsolute(out) ? out : path.join(process.cwd(), out)) : src;
-    fs.mkdirSync(outDir, { recursive: true });
-    const helm = process.env['HELM_BIN'] || 'helm';
-    const args = ['package', src, '-d', outDir];
-    log(`> ${helm} ${args.join(' ')}`, silent);
-    const res = spawnSync(helm, args, { stdio: 'inherit' });
-    if (res.error) {
-        console.error(`✗ Failed to execute Helm: ${res.error.message}`);
-        console.error(`  Install: ${HELM_INSTALL_URL}`);
-        console.error(`  ${HELM_ENV_VAR_MSG}`);
-        process.exit(1);
-    }
-    if (res.status !== 0) {
-        process.exit(res.status ?? 1);
-    }
-}
-function exampleUmbrellaTs(name) {
-    return `import { createUmbrella } from 'timonel';
-import { Rutter } from 'timonel';
-
-// Import subcharts (these will be created with 'tl umbrella add')
-// import { rutter as fluentBit } from './charts/fluent-bit/chart';
-// import { rutter as openObserve } from './charts/openobserve/chart';
-
-// Create umbrella chart
-const umbrella = createUmbrella({
-  meta: {
-    name: '${name}',
-    version: '0.1.0',
-    description: '${name} umbrella chart',
-    appVersion: '1.0.0',
-  },
-  subcharts: [
-    // Add your subcharts here:
-    // { name: 'fluent-bit', rutter: fluentBit },
-    // { name: 'openobserve', rutter: openObserve },
-  ],
-  defaultValues: {
-    global: {
-      // Global values shared across subcharts
-    },
-  },
-  envValues: {
-    dev: {
-      // Development environment overrides
-    },
-    prod: {
-      // Production environment overrides
-    },
-  },
-});
-
-export default function run(outDir: string) {
-  umbrella.write(outDir);
-}
-`;
-}
-function exampleSubchartTs(name) {
-    return `import { Rutter } from 'timonel';
-import { valuesRef, helm } from 'timonel/lib/helm';
-
-// Create a new Rutter instance
-const rutter = new Rutter({
-  meta: {
-    name: '${name}',
-    version: '0.1.0',
-    description: '${name} subchart',
-    appVersion: '1.0.0',
-  },
-  defaultValues: {
-    image: { repository: 'nginx', tag: '1.27' },
-    replicas: 1,
-    service: { port: 80 },
-  },
-});
-
-// Add Deployment using addManifest with native Kubernetes object
-rutter.addManifest({
-    apiVersion: 'apps/v1',
-    kind: 'Deployment',
-    metadata: {
-      name: '${name}',
-      labels: {
-        app: '${name}'
-      }
-    },
-    spec: {
-      replicas: valuesRef('replicas'),
-      selector: {
-        matchLabels: {
-          app: '${name}'
-        }
-      },
-      template: {
-        metadata: {
-          labels: {
-            app: '${name}'
-          }
-        },
-        spec: {
-          containers: [
-            {
-              name: '${name}',
-              image: String(valuesRef('image.repository')) + ':' + String(valuesRef('image.tag')),
-              ports: [
-                {
-                  name: 'http',
-                  containerPort: 80,
-                  protocol: 'TCP'
-                }
-              ]
+function parseFlags(args) {
+    const flags = {};
+    while (args.length > 0 && args[0]?.startsWith('-')) {
+        const flag = args.shift();
+        switch (flag) {
+            case '--dry-run':
+                flags.dryRun = true;
+                break;
+            case '--silent':
+                flags.silent = true;
+                break;
+            case '--env': {
+                const envValue = args.shift();
+                if (envValue)
+                    flags.env = envValue;
+                break;
             }
-          ]
-        }
-      }
-    }
-  }, '${name}-deployment');
-
-// Add Service using addManifest with native Kubernetes object
-rutter.addManifest({
-    apiVersion: 'v1',
-    kind: 'Service',
-    metadata: {
-      name: '${name}',
-      labels: {
-        app: '${name}'
-      }
-    },
-    spec: {
-      type: 'ClusterIP',
-      ports: [
-        {
-          port: valuesRef('service.port'),
-          targetPort: 'http',
-          protocol: 'TCP',
-          name: 'http'
-        }
-      ],
-      selector: {
-        app: '${name}'
-      }
-    }
-  }, '${name}-service');
-
-export default function run(outDir: string) {
-  rutter.write(outDir);
-}
-
-// Export rutter for umbrella chart
-export { rutter };
-`;
-}
-function exampleChartTs(name) {
-    return `import { Rutter } from 'timonel';
-import { valuesRef, helm } from 'timonel/lib/helm';
-
-// Define chart metadata and default/env values
-const rutter = new Rutter({
-  meta: {
-    name: '${name}',
-    version: '0.1.0',
-    description: 'Example Helm chart generated with timonel + cdk8s',
-    appVersion: '1.0.0',
-  },
-  defaultValues: {
-    image: { repository: 'nginx', tag: '1.27' },
-    replicas: 1,
-    service: { port: 80 },
-    ingress: { enabled: false, host: 'example.com', className: 'nginx' },
-    namespace: { create: false, name: '${name}' },
-  },
-  envValues: {
-    dev: { replicas: 1 },
-    prod: { replicas: 3 },
-  },
-});
-
-// Add Deployment using addManifest with native Kubernetes object
-rutter.addManifest({
-  apiVersion: 'apps/v1',
-  kind: 'Deployment',
-  metadata: {
-    name: '${name}',
-    labels: {
-      app: '${name}'
-    }
-  },
-  spec: {
-    replicas: valuesRef('replicas'),
-    selector: {
-      matchLabels: {
-        app: '${name}'
-      }
-    },
-    template: {
-      metadata: {
-        labels: {
-          app: '${name}'
-        }
-      },
-      spec: {
-        containers: [
-          {
-            name: '${name}',
-            image: String(valuesRef('image.repository')) + ':' + String(valuesRef('image.tag')),
-            ports: [
-              {
-                name: 'http',
-                containerPort: 80,
-                protocol: 'TCP'
-              }
-            ],
-            env: [
-              {
-                name: 'APP_NAME',
-                value: '${name}'
-              },
-              {
-                name: 'RELEASE',
-                value: helm.releaseName
-              }
-            ]
-          }
-        ]
-      }
-    }
-  }
-}, '${name}-deployment');
-
-// Add Service using addManifest with native Kubernetes object
-rutter.addManifest({
-  apiVersion: 'v1',
-  kind: 'Service',
-  metadata: {
-    name: '${name}',
-    labels: {
-      app: '${name}'
-    }
-  },
-  spec: {
-    type: 'ClusterIP',
-    ports: [
-      {
-        port: valuesRef('service.port'),
-        targetPort: 'http',
-        protocol: 'TCP',
-        name: 'http'
-      }
-    ],
-    selector: {
-      app: '${name}'
-    }
-  }
-}, '${name}-service');
-
-// Add Ingress using addConditionalManifest with native Kubernetes object
-rutter.addConditionalManifest({
-  apiVersion: 'networking.k8s.io/v1',
-  kind: 'Ingress',
-  metadata: {
-    name: '${name}',
-    labels: {
-      app: '${name}'
-    }
-  },
-  spec: {
-    ingressClassName: String(valuesRef('ingress.className')),
-    rules: [
-      {
-        host: String(valuesRef('ingress.host')),
-        http: {
-          paths: [
-            {
-              path: '/',
-              pathType: 'Prefix',
-              backend: {
-                service: {
-                  name: '${name}',
-                  port: {
-                    number: valuesRef('service.port')
-                  }
-                }
-              }
-            }
-          ]
-        }
-      }
-    ]
-  }
-}, valuesRef('ingress.enabled'), '${name}-ingress');
-
-// Add Namespace using addConditionalManifest
-rutter.addConditionalManifest({
-  apiVersion: 'v1',
-  kind: 'Namespace',
-  metadata: {
-    name: String(valuesRef('namespace.name')),
-    labels: {
-      app: '${name}',
-      'app.kubernetes.io/name': '${name}',
-      'app.kubernetes.io/instance': helm.releaseName
-    }
-  }
-}, valuesRef('namespace.create'), '${name}-namespace');
-
-export default function run(outDir: string) {
-  rutter.write(outDir);
-}
-`;
-}
-function parseArgs() {
-    const argv = process.argv.slice(2);
-    const flags = { dryRun: false, silent: false, set: {} };
-    const args = [];
-    let cmd = '';
-    for (let i = 0; i < argv.length; i++) {
-        const arg = argv[i];
-        if (arg === '--dry-run') {
-            flags.dryRun = true;
-        }
-        else if (arg === '--silent') {
-            flags.silent = true;
-        }
-        else if (arg === '--env' && i + 1 < argv.length) {
-            const nextArg = argv[++i];
-            if (nextArg)
-                flags.env = nextArg;
-        }
-        else if (arg === '--version-bump' && i + 1 < argv.length) {
-            const nextArg = argv[++i];
-            if (nextArg)
-                flags.versionBump = nextArg;
-        }
-        else if (arg === '--set' && i + 1 < argv.length) {
-            const setValue = argv[++i];
-            if (setValue) {
-                const [key, value] = setValue.split('=', 2);
-                if (key && value !== undefined) {
-                    flags.set[key] = value;
+            case '--set': {
+                const setValue = args.shift();
+                if (setValue) {
+                    flags.set = flags.set || [];
+                    flags.set.push(setValue);
                 }
+                break;
             }
+            case '--version':
+            case '-v':
+                console.log('Timonel v0.1.0');
+                process.exit(0);
+                break;
+            case '--help':
+            case '-h':
+                usageAndExit();
+                break;
+            default:
+                usageAndExit(`Unknown flag: ${flag}`);
         }
-        else if (arg === '--version' || arg === '-v') {
-            showVersion();
-            process.exit(0);
-        }
-        else if (arg === '--help' || arg === '-h') {
-            usageAndExit();
-        }
-        else if (arg && !arg.startsWith('--')) {
-            if (!cmd) {
-                cmd = arg;
-            }
-            else {
-                args.push(arg);
-            }
-        }
-    }
-    return { cmd, args, flags };
-}
-function showVersion() {
-    const packagePath = path.join(__dirname, '..', 'package.json');
-    try {
-        const packageJson = JSON.parse(fs.readFileSync(packagePath, 'utf8'));
-        console.log(`timonel v${packageJson.version}`);
-    }
-    catch {
-        console.log('timonel (version unknown)');
-    }
-}
-function log(message, silent = false) {
-    if (!silent) {
-        console.log(message);
     }
+    return flags;
 }
-async function main() {
-    const { cmd, args, flags } = parseArgs();
-    switch (cmd) {
+async function executeCommand(command, args, flags) {
+    switch (command) {
         case 'init':
             await cmdInit(args[0], flags.silent);
             break;
-        case 'validate':
-            await cmdValidate(args[0], flags.silent);
-            break;
         case 'synth':
-            await cmdSynth(args[0], args[1], flags);
+            await cmdSynth(args[0], flags);
             break;
-        case 'diff':
-            await cmdDiff(args[0], args[1], flags.silent);
+        case 'validate':
+            await cmdValidate(flags);
             break;
         case 'deploy':
             await cmdDeploy(args[0], args[1], flags);
             break;
-        case 'package':
-            await cmdPackage(args[0], args[1], flags.silent);
+        case 'templates':
+            await cmdTemplates(flags);
             break;
         case 'umbrella':
             await cmdUmbrella(args[0], args.slice(1), flags);
             break;
+        case undefined:
+            usageAndExit('Missing command');
+            break;
         default:
-            usageAndExit();
+            usageAndExit(`Unknown command: ${command}`);
     }
 }
-main().catch((err) => {
-    console.error(err);
+async function main() {
+    const args = process.argv.slice(2);
+    const command = args.shift();
+    const flags = parseFlags(args);
+    await executeCommand(command, args, flags);
+}
+main().catch((error) => {
+    console.error('Error:', error.message);
     process.exit(1);
 });