plusui-native 0.2.4 → 0.2.7

package/src/index.js

@@ -1,904 +1,957 @@
-#!/usr/bin/env node
-
-import { mkdir, readFile, stat, rm, readdir, writeFile } from 'fs/promises';
-import { existsSync, watch, statSync } from 'fs';
-import { exec, spawn, execSync } from 'child_process';
-import { join, dirname, basename, resolve } from 'path';
-import { fileURLToPath } from 'url';
-import { createInterface } from 'readline';
-import { createServer as createViteServer } from 'vite';
-import { runDoctor } from './doctor/index.js';
-import { TemplateManager } from '../templates/manager.js';
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
-
-const COLORS = {
-    reset: '\x1b[0m',
-    bright: '\x1b[1m',
-    dim: '\x1b[2m',
-    green: '\x1b[32m',
-    blue: '\x1b[34m',
-    yellow: '\x1b[33m',
-    red: '\x1b[31m',
-    cyan: '\x1b[36m',
-    magenta: '\x1b[35m',
-};
-
-function log(msg, color = 'reset') {
-    console.log(`${COLORS[color]}${msg}${COLORS.reset}`);
-}
-
-function logSection(title) {
-    console.log(`\n${COLORS.bright}${COLORS.blue}=== ${title} ===${COLORS.reset}\n`);
-}
-
-function error(msg) {
-    console.error(`${COLORS.red}Error: ${msg}${COLORS.reset}`);
-    process.exit(1);
-}
-
-function checkTools() {
-    const platform = process.platform;
-    const required = [];
-
-    const cmakePaths = [
-        'cmake',
-        'C:\\Program Files\\CMake\\bin\\cmake.exe',
-        'C:\\Program Files (x86)\\CMake\\bin\\cmake.exe',
-        '/usr/local/bin/cmake',
-        '/usr/bin/cmake'
-    ];
-
-    let cmakeFound = false;
-    for (const p of cmakePaths) {
-        try {
-            execSync(`"${p}" --version`, { stdio: 'ignore' });
-            cmakeFound = true;
-            break;
-        } catch { }
-    }
-
-    if (!cmakeFound) {
-        if (platform === 'win32') {
-            required.push({ name: 'CMake', install: 'winget install Kitware.CMake', auto: 'winget install -e --id Kitware.CMake' });
-        } else if (platform === 'darwin') {
-            required.push({ name: 'CMake', install: 'brew install cmake', auto: 'brew install cmake' });
-        } else {
-            required.push({ name: 'CMake', install: 'sudo apt install cmake', auto: 'sudo apt install cmake' });
-        }
-    }
-
-    if (platform === 'win32') {
-        const vsPaths = [
-            'C:\\Program Files\\Microsoft Visual Studio\\2022\\Community\\VC\\Tools\\MSVC',
-            'C:\\Program Files\\Microsoft Visual Studio\\2022\\Professional\\VC\\Tools\\MSVC',
-            'C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\VC\\Tools\\MSVC'
-        ];
-
-        let vsFound = false;
-        for (const p of vsPaths) {
-            if (existsSync(p)) {
-                vsFound = true;
-                break;
-            }
-        }
-
-        if (!vsFound) {
-            required.push({ name: 'Visual Studio 2022', install: 'Download from visualstudio.microsoft.com with C++ workload', auto: null });
-        }
-    } else if (platform === 'darwin') {
-        try {
-            execSync('clang++ --version', { stdio: 'ignore' });
-        } catch {
-            required.push({ name: 'Xcode', install: 'xcode-select --install', auto: 'xcode-select --install' });
-        }
-    } else {
-        try {
-            execSync('g++ --version', { stdio: 'ignore' });
-        } catch {
-            required.push({ name: 'GCC/Clang', install: 'sudo apt install build-essential', auto: 'sudo apt install build-essential' });
-        }
-    }
-
-    if (required.length > 0) {
-        log('\n=== Missing Required Tools ===', 'yellow');
-
-        for (const tool of required) {
-            log(`\n  ${tool.name}`, 'bright');
-            log(`  Install: ${tool.install}`, 'reset');
-            if (tool.auto) {
-                log(`  Run:     ${tool.auto}`, 'green');
-            }
-        }
-
-        log('\n');
-        return { missing: required };
-    }
-    return null;
-}
-
-const USAGE = `
-${COLORS.bright}PlusUI CLI${COLORS.reset} - Build C++ desktop apps with web tech
-
-${COLORS.bright}Usage:${COLORS.reset}
-  plusui doctor              Check development environment
-  plusui doctor --fix        Check and auto-install missing tools
-  plusui create <name>       Create a new PlusUI project
-  plusui dev                 Run in development mode (Vite HMR + C++ app)
-  plusui build               Build for current platform (production)
-  plusui build:frontend      Build frontend only
-  plusui build:backend       Build C++ backend only
-  plusui build:all           Build for all platforms
-  plusui run                 Run the built application
-  plusui clean               Clean build artifacts
-  plusui bind                Generate bindings for current app (alias: bindgen)
-  plusui help                Show this help message
-
-${COLORS.bright}Platform Builds:${COLORS.reset}
-  plusui build:windows       Build for Windows
-  plusui build:macos         Build for macOS
-  plusui build:linux         Build for Linux
-
-${COLORS.bright}Asset Commands:${COLORS.reset}
-  plusui icons [input]       Generate platform icons from source icon
-  plusui embed [platform]    Embed resources for platform (win32/darwin/linux/all)
-
-${COLORS.bright}Options:${COLORS.reset}
-  -h, --help                 Show this help message
-  -v, --version              Show version number
-  -t, --template             Specify template (solid, react)
-
-${COLORS.bright}Assets:${COLORS.reset}
-  Place assets/icon.png (512x512+ recommended) for automatic icon generation.
-  All assets in "assets/" are embedded into the binary for single-exe distribution.
-  Embedded resources are accessible via plusui::resources::getResource("path").
-`;
-
-// Platform configuration
-const PLATFORMS = {
-    win32: { name: 'Windows', folder: 'Windows', ext: '.exe', generator: null },
-    darwin: { name: 'macOS', folder: 'MacOS', ext: '', generator: 'Xcode' },
-    linux: { name: 'Linux', folder: 'Linux', ext: '', generator: 'Ninja' },
-    android: { name: 'Android', folder: 'Android', ext: '.apk', generator: 'Ninja' },
-    ios: { name: 'iOS', folder: 'iOS', ext: '.app', generator: 'Xcode' },
-};
-
-function getProjectName() {
-    try {
-        const pkg = JSON.parse(execSync('npm pkg get name', { encoding: 'utf8', stdio: ['pipe', 'pipe', 'ignore'] }));
-        return typeof pkg === 'string' ? pkg.replace(/"/g, '') : basename(process.cwd());
-    } catch {
-        return basename(process.cwd());
-    }
-}
-
-function getCMakePath() {
-    const paths = [
-        'cmake',
-        'C:\\Program Files\\CMake\\bin\\cmake.exe',
-        'C:\\Program Files (x86)\\CMake\\bin\\cmake.exe',
-        '/usr/local/bin/cmake',
-        '/usr/bin/cmake'
-    ];
-    for (const p of paths) {
-        try {
-            execSync(`"${p}" --version`, { stdio: 'ignore' });
-            return p;
-        } catch { }
-    }
-    return 'cmake';
-}
-
-function runCMake(args, options = {}) {
-    const cmake = getCMakePath();
-    return execSync(`"${cmake}" ${args}`, { stdio: 'inherit', ...options });
-}
-
-function getAppBindgenPaths() {
-    return {
-        featuresDir: join(process.cwd(), 'src', 'features'),
-        outputDir: join(process.cwd(), 'src', 'Bindings_Generated'),
-    };
-}
-
-function promptTemplateSelection() {
-    return new Promise((resolve) => {
-        const rl = createInterface({
-            input: process.stdin,
-            output: process.stdout
-        });
-
-        console.log(`\n${COLORS.bright}Select a template:${COLORS.reset}`);
-        console.log(`  ${COLORS.cyan}1)${COLORS.reset} solid   - SolidJS + TypeScript (lightweight, reactive)`);
-        console.log(`  ${COLORS.cyan}2)${COLORS.reset} react   - React + TypeScript (popular, familiar)`);
-
-        rl.question(`\n${COLORS.yellow}Enter choice [1-2] (default: solid):${COLORS.reset} `, (answer) => {
-            rl.close();
-            const choice = answer.trim() || '1';
-            const templates = { '1': 'solid', '2': 'react' };
-            const template = templates[choice] || 'solid';
-            console.log(`${COLORS.green}✓${COLORS.reset} Selected: ${COLORS.cyan}${template}${COLORS.reset}\n`);
-            resolve(template);
-        });
-    });
-}
-
-async function createProject(name, options = {}) {
-    try {
-        const templateManager = new TemplateManager();
-        await templateManager.create(name, options);
-    } catch (e) {
-        error(e.message);
-    }
-}
-
-// ============================================================
-// BUILD FUNCTIONS
-// ============================================================
-
-function buildFrontend() {
-    logSection('Building Frontend');
-
-    if (existsSync('frontend')) {
-        log('Running Vite build...', 'blue');
-        execSync('cd frontend && npm run build', { stdio: 'inherit', shell: true });
-        log('Frontend built successfully!', 'green');
-    } else {
-        log('No frontend directory found, skipping...', 'yellow');
-    }
-}
-
-function buildBackend(platform = null, devMode = false) {
-    const targetPlatform = platform || process.platform;
-    const platformConfig = PLATFORMS[targetPlatform] || PLATFORMS[Object.keys(PLATFORMS).find(k => PLATFORMS[k].folder.toLowerCase() === targetPlatform?.toLowerCase())];
-
-    if (!platformConfig) {
-        error(`Unsupported platform: ${targetPlatform}`);
-    }
-
-    logSection(`Building Backend (${platformConfig.name})`);
-
-    const projectName = getProjectName();
-    const buildDir = `build/${platformConfig.folder}`;
-
-    // Create build directory
-    if (!existsSync(buildDir)) {
-        execSync(`mkdir -p "${buildDir}"`, { stdio: 'ignore', shell: true });
-    }
-
-    // CMake configure
-    let cmakeArgs = `-S . -B "${buildDir}" -DCMAKE_BUILD_TYPE=Release`;
-
-    if (devMode) {
-        cmakeArgs += ' -DPLUSUI_DEV_MODE=ON';
-    }
-
-    if (platformConfig.generator) {
-        cmakeArgs += ` -G "${platformConfig.generator}"`;
-    }
-
-    log(`Configuring CMake...`, 'blue');
-    runCMake(cmakeArgs);
-
-    // CMake build
-    log(`Building...`, 'blue');
-    runCMake(`--build "${buildDir}" --config Release`);
-
-    log(`Backend built: ${buildDir}`, 'green');
-
-    return buildDir;
-}
-
-async function generateIcons(inputPath = null) {
-    logSection('Generating Platform Icons');
-
-    const { IconGenerator } = await import('./assets/icon-generator.js');
-    const generator = new IconGenerator();
-
-    const srcIcon = inputPath || join(process.cwd(), 'assets', 'icon.png');
-    const outputBase = join(process.cwd(), 'assets', 'icons');
-
-    if (!existsSync(srcIcon)) {
-        log(`Icon not found: ${srcIcon}`, 'yellow');
-        log('Place a 512x512+ PNG icon at assets/icon.png', 'dim');
-        return;
-    }
-
-    await generator.generate(srcIcon, outputBase);
-}
-
-async function embedResources(platform = null) {
-    const targetPlatform = platform || process.platform;
-    logSection(`Embedding Resources (${targetPlatform})`);
-
-    const { ResourceEmbedder } = await import('./assets/resource-embedder.js');
-    const embedder = new ResourceEmbedder({ verbose: true });
-
-    const frontendDist = join(process.cwd(), 'frontend', 'dist');
-    const outputDir = join(process.cwd(), 'generated', 'resources');
-
-    if (!existsSync(frontendDist)) {
-        log('Frontend not built yet. Run: plusui build:frontend', 'yellow');
-        return;
-    }
-
-    if (platform === 'all') {
-        await embedder.embedAll(frontendDist, outputDir);
-    } else {
-        await embedder.embed(frontendDist, outputDir, targetPlatform);
-    }
-}
-
-async function embedAssets() {
-    const assetsDir = join(process.cwd(), 'assets');
-    if (!existsSync(assetsDir)) {
-        try {
-            await mkdir(assetsDir, { recursive: true });
-        } catch(e) {}
-    }
-
-    logSection('Embedding Assets');
-    
-    // Always generate the header file, even if empty
-    let headerContent = '#pragma once\n\n';
-    headerContent += '// THIS FILE IS AUTO-GENERATED BY PLUSUI CLI\n';
-    headerContent += '// DO NOT MODIFY MANUALLY\n\n';
-    
-    const files = existsSync(assetsDir) 
-        ? (await readdir(assetsDir)).filter(f => !statSync(join(assetsDir, f)).isDirectory())
-        : [];
-    
-    if (files.length === 0) {
-        log('No assets found in assets/ folder', 'dim');
-    } else {
-        for (const file of files) {
-            const filePath = join(assetsDir, file);
-            log(`Processing ${file}...`, 'dim');
-            
-            const varName = file.replace(/[^a-zA-Z0-9]/g, '_').toUpperCase();
-            const data = await readFile(filePath);
-            
-            headerContent += `static const unsigned char ASSET_${varName}[] = {`;
-            for (let i = 0; i < data.length; i++) {
-                if (i % 16 === 0) headerContent += '\n  ';
-                headerContent += `0x${data[i].toString(16).padStart(2, '0')}, `;
-            }
-            headerContent += '\n};\n';
-            headerContent += `static const unsigned int ASSET_${varName}_LEN = ${data.length};\n\n`;
-        }
-    }
-
-    const genDir = join(process.cwd(), 'generated');
-    if (!existsSync(genDir)) await mkdir(genDir, { recursive: true });
-    
-    await writeFile(join(genDir, 'assets.h'), headerContent);
-    log(`✓ Assets header generated: generated/assets.h`, 'green');
-}
-
-
-
-async function build(production = true) {
-    logSection('Building PlusUI Application');
-
-    // Embed assets
-    await embedAssets();
-
-    // Build frontend first
-    if (production) {
-        buildFrontend();
-    }
-
-    // Build backend
-    const buildDir = buildBackend(null, !production);
-
-    log('\nBuild complete!', 'green');
-    return buildDir;
-}
-
-function buildAll() {
-    logSection('Building for All Platforms');
-
-    buildFrontend();
-
-    const supportedPlatforms = ['win32', 'darwin', 'linux'];
-
-    for (const platform of supportedPlatforms) {
-        try {
-            buildBackend(platform, false);
-        } catch (e) {
-            log(`Failed to build for ${PLATFORMS[platform].name}: ${e.message}`, 'yellow');
-        }
-    }
-
-    log('\nAll platform builds complete!', 'green');
-    log('\nOutput directories:', 'bright');
-    log('  build/Windows/', 'cyan');
-    log('  build/MacOS/', 'cyan');
-    log('  build/Linux/', 'cyan');
-}
-
-function buildPlatform(platform) {
-    logSection(`Building for ${PLATFORMS[platform]?.name || platform}`);
-    buildFrontend();
-    buildBackend(platform, false);
-}
-
-// ============================================================
-// DEVELOPMENT FUNCTIONS
-// ============================================================
-
-let viteServer = null;
-let cppProcess = null;
-
-async function startViteServer() {
-    log('Starting Vite dev server...', 'blue');
-
-    viteServer = await createViteServer({
-        root: 'frontend',
-        server: {
-            port: 5173,
-            strictPort: true,
-        },
-    });
-
-    await viteServer.listen();
-
-    log('Vite server: http://localhost:5173', 'green');
-    return viteServer;
-}
-
-async function startBackend() {
-    logSection('Building C++ Backend (Dev Mode)');
-
-    const projectName = getProjectName();
-    killProcessByName(projectName);
-
-    const buildDir = 'build/dev';
-
-    // Configure with dev mode if not configured
-    if (!existsSync(join(buildDir, 'CMakeCache.txt'))) {
-        log('Configuring CMake...', 'blue');
-        runCMake(`-S . -B "${buildDir}" -DPLUSUI_DEV_MODE=ON`);
-    }
-
-    log('Compiling...', 'blue');
-    runCMake(`--build "${buildDir}"`);
-
-    // Find executable
-    let exePath;
-    if (process.platform === 'win32') {
-        // Visual Studio puts exe in build/dev/<projectname>/Debug/<projectname>.exe
-        exePath = join(buildDir, projectName, 'Debug', `${projectName}.exe`);
-        if (!existsSync(exePath)) {
-            exePath = join(buildDir, 'Debug', `${projectName}.exe`);
-        }
-        if (!existsSync(exePath)) {
-            exePath = join(buildDir, 'bin', `${projectName}.exe`);
-        }
-        if (!existsSync(exePath)) {
-            exePath = join(buildDir, `${projectName}.exe`);
-        }
-    } else {
-        exePath = join(buildDir, projectName);
-        if (!existsSync(exePath)) {
-            exePath = join(buildDir, 'bin', projectName);
-        }
-    }
-
-    if (!existsSync(exePath)) {
-        error(`Executable not found. Expected: ${exePath}`);
-    }
-
-    log('Starting C++ app...', 'blue');
-
-    cppProcess = spawn(exePath, [], {
-        shell: true,
-        stdio: 'inherit',
-        env: { ...process.env, PLUSUI_DEV: '1' }
-    });
-
-    cppProcess.on('error', (err) => {
-        log(`Failed to start app: ${err.message}`, 'red');
-    });
-
-    return cppProcess;
-}
-
-async function killPort(port) {
-    log(`Checking port ${port}...`, 'dim');
-    try {
-        if (process.platform === 'win32') {
-            try {
-                const output = execSync(`netstat -ano | findstr :${port}`, { encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'] });
-                const lines = output.split('\n').filter(line => line.includes(`:${port}`) && line.includes('LISTENING'));
-                
-                for (const line of lines) {
-                    const parts = line.trim().split(/\s+/);
-                    const pid = parts[parts.length - 1];
-                    if (pid && /^\d+$/.test(pid)) {
-                        log(`Killing process ${pid} on port ${port}...`, 'yellow');
-                        try {
-                            execSync(`taskkill /PID ${pid} /F`, { stdio: 'ignore' });
-                        } catch (e) {
-                            // Ignore if already dead
-                        }
-                    }
-                }
-            } catch (e) {
-                // findstr returns exit code 1 if no match found
-            }
-        } else {
-            try {
-                execSync(`lsof -i :${port} -t | xargs kill -9`, { stdio: 'ignore' });
-            } catch {
-                // Ignore if no process found
-            }
-        }
-    } catch (e) {
-        // Ignore general errors
-    }
-}
-
-function killProcessByName(name) {
-    const processName = process.platform === 'win32' ? `${name}.exe` : name;
-    log(`Cleaning up previous instance (${processName})...`, 'dim');
-    try {
-        if (process.platform === 'win32') {
-            execSync(`taskkill /IM "${processName}" /F`, { stdio: 'ignore' });
-        } else {
-            execSync(`pkill -f "${processName}"`, { stdio: 'ignore' });
-        }
-    } catch (e) {
-        // Ignore if process not found
-    }
-}
-
-async function dev() {
-    logSection('PlusUI Development Mode');
-
-    const toolCheck = checkTools();
-    if (toolCheck && toolCheck.missing) {
-        error('Missing required build tools. Run: plusui doctor --fix');
-    }
-
-    // Embed assets
-    await embedAssets();
-
-    await runBindgen([], { skipIfNoInput: true, source: 'dev' });
-
-    // specific port cleaning
-    await killPort(5173);
-
-    // Start Vite first
-    try {
-        viteServer = await startViteServer();
-    } catch (e) {
-        log(`Vite failed to start: ${e.message}`, 'red');
-        error('Could not start development server');
-    }
-
-    // Build and start C++ backend
-    await startBackend();
-
-    log('\n' + '='.repeat(50), 'dim');
-    log('Development mode active', 'green');
-    log('='.repeat(50), 'dim');
-    log('\nFrontend: http://localhost:5173 (HMR enabled)', 'cyan');
-    log('Backend:  C++ app running with webview', 'cyan');
-    log('\nEdit frontend/src/* for live reload', 'dim');
-    log('Edit main.cpp and restart for C++ changes', 'dim');
-    log('\nPress Ctrl+C to stop\n', 'yellow');
-
-    // Handle shutdown
-    process.on('SIGINT', async () => {
-        log('\nShutting down...', 'yellow');
-        if (viteServer) await viteServer.close();
-        if (cppProcess) cppProcess.kill();
-        process.exit(0);
-    });
-}
-
-async function devFrontend() {
-    logSection('Frontend Development Mode');
-
-    // specific port cleaning
-    await killPort(5173);
-
-    viteServer = await createViteServer({
-        root: 'frontend',
-        server: { port: 5173 },
-    });
-
-    await viteServer.listen();
-
-    log('Frontend: http://localhost:5173', 'green');
-    log('HMR enabled - changes will reflect instantly!\n', 'green');
-
-    process.on('SIGINT', async () => {
-        if (viteServer) await viteServer.close();
-        process.exit(0);
-    });
-}
-
-function devBackend() {
-    logSection('Backend Development Mode');
-
-    const projectName = getProjectName();
-    killProcessByName(projectName);
-
-    const buildDir = 'build/dev';
-
-    if (!existsSync(join(buildDir, 'CMakeCache.txt'))) {
-        log('Configuring CMake...', 'blue');
-        runCMake(`-S . -B "${buildDir}" -DPLUSUI_DEV_MODE=ON`);
-    }
-
-    runCMake(`--build "${buildDir}"`);
-
-    let exePath;
-    if (process.platform === 'win32') {
-        exePath = join(buildDir, projectName, 'Debug', `${projectName}.exe`);
-        if (!existsSync(exePath)) exePath = join(buildDir, 'Debug', `${projectName}.exe`);
-        if (!existsSync(exePath)) exePath = join(buildDir, `${projectName}.exe`);
-    } else {
-        exePath = join(buildDir, projectName);
-    }
-
-    function runApp() {
-        if (cppProcess) cppProcess.kill();
-
-        cppProcess = spawn(exePath, [], { shell: true, stdio: 'inherit' });
-
-        cppProcess.on('close', (code) => {
-            if (code !== null && code !== 0) {
-                log(`App exited with code ${code}`, 'yellow');
-            }
-        });
-    }
-
-    runApp();
-
-    log('\nWatching C++ files for changes...', 'yellow');
-    log('Press Ctrl+C to stop\n', 'dim');
-
-    // Watch main.cpp and features/ folder (if exists)
-    const watchItems = ['main.cpp'];
-    if (existsSync('features')) watchItems.push('features');
-
-    const watchers = watchItems.map(item => {
-        const isDir = existsSync(item) && statSync(item).isDirectory();
-        const w = isDir ? watch(item, { recursive: true }) : watch(item);
-        w.on('change', (eventType, filename) => {
-            const file = item === 'main.cpp' ? 'main.cpp' : filename;
-            if (file && (file.endsWith('.cpp') || file.endsWith('.hpp'))) {
-                log(`Changed: ${file}`, 'yellow');
-                log('Rebuilding...', 'blue');
-                try {
-                    killProcessByName(projectName);
-                    runCMake(`--build "${buildDir}"`);
-                    runApp();
-                } catch (e) {
-                    log('Build failed, waiting for fixes...', 'red');
-                }
-            }
-        });
-        return w;
-    });
-
-    process.on('SIGINT', () => {
-        if (cppProcess) cppProcess.kill();
-        watchers.forEach(w => w.close());
-        process.exit(0);
-    });
-}
-
-// ============================================================
-// RUN FUNCTION
-// ============================================================
-
-function run() {
-    const projectName = getProjectName();
-    const platform = PLATFORMS[process.platform];
-    const buildDir = `build/${platform?.folder || 'dev'}`;
-
-    let exePath;
-    if (process.platform === 'win32') {
-        exePath = join(buildDir, 'Release', `${projectName}.exe`);
-        if (!existsSync(exePath)) exePath = join(buildDir, 'bin', `${projectName}.exe`);
-        if (!existsSync(exePath)) exePath = join(buildDir, `${projectName}.exe`);
-    } else {
-        exePath = join(buildDir, projectName);
-        if (!existsSync(exePath)) exePath = join(buildDir, 'bin', projectName);
-    }
-
-    if (!existsSync(exePath)) {
-        error(`Build not found at ${exePath}. Run "plusui build" first.`);
-    }
-
-    log(`Running: ${exePath}`, 'blue');
-
-    const proc = spawn(exePath, [], { shell: true, stdio: 'inherit' });
-
-    proc.on('close', (code) => {
-        process.exit(code);
-    });
-}
-
-// ============================================================
-// CLEAN FUNCTION
-// ============================================================
-
-async function clean() {
-    logSection('Cleaning Build Artifacts');
-
-    const dirs = ['build', 'frontend/dist'];
-
-    for (const dir of dirs) {
-        if (existsSync(dir)) {
-            log(`Removing: ${dir}`, 'yellow');
-            await rm(dir, { recursive: true, force: true });
-        }
-    }
-
-    log('\nClean complete!', 'green');
-}
-
-// ============================================================
-// BINDGEN FUNCTION
-// ============================================================
-
-async function runBindgen(providedArgs = null, options = {}) {
-    logSection('Running Binding Generator');
-
-    const { skipIfNoInput = false, source = 'manual' } = options;
-
-    // Try to find the bindgen script
-    let scriptPath = resolve(__dirname, '../../plusui-bindgen/src/index.js');
-    if (!existsSync(scriptPath)) {
-    // Try installed location (node_modules/plusui-native-bindgen)
-        scriptPath = resolve(__dirname, '../../../plusui-native-bindgen/src/index.js');
-    }
-
-    if (!existsSync(scriptPath)) {
-        error(`Bindgen script not found. Please ensure plusui-native-bindgen is installed.`);
-    }
-
-    log(`Using bindgen: ${scriptPath}`, 'dim');
-
-    // plusui bindgen [featuresDir] [outputDir]
-    // Defaults to app-local paths when available.
-    const args = providedArgs ?? process.argv.slice(3);
-    let bindgenArgs = [...args];
-
-    if (bindgenArgs.length === 0) {
-        const { featuresDir: appFeaturesDir, outputDir: appOutputDir } = getAppBindgenPaths();
-
-        if (existsSync(appFeaturesDir)) {
-            bindgenArgs = [appFeaturesDir, appOutputDir];
-            log(`App mode: ${appFeaturesDir} -> ${appOutputDir}`, 'dim');
-        } else {
-            if (skipIfNoInput) {
-                log(`No src/features folder found; skipping binding refresh for ${source}.`, 'dim');
-                return;
-            } else {
-                error('No bindgen input found. Create src/features in your app or pass paths: plusui bindgen <featuresDir> <outputDir>');
-            }
-        }
-    }
-    
-    // Spawn node process
-    const proc = spawn(process.execPath, [scriptPath, ...bindgenArgs], {
-        stdio: 'inherit',
-        env: process.env
-    });
-
-    return new Promise((resolve, reject) => {
-        proc.on('close', (code) => {
-            if (code === 0) {
-                log('\nBindgen complete!', 'green');
-                resolve();
-            } else {
-                reject(new Error(`Bindgen failed with code ${code}`));
-            }
-        });
-    });
-}
-
-// ============================================================
-// MAIN
-// ============================================================
-
-async function main() {
-    const args = process.argv.slice(2);
-    const cmd = args[0];
-
-    switch (cmd) {
-        case 'doctor':
-            await runDoctor({
-                fix: args.includes('--fix'),
-                json: args.includes('--json'),
-                quick: args.includes('--quick')
-            });
-            break;
-        case 'create':
-            if (!args[1] || args[1].startsWith('-')) error('Project name required');
-            const template = await promptTemplateSelection();
-            await createProject(args[1], { template });
-            break;
-        case 'dev':
-            await dev();
-            break;
-        case 'dev:frontend':
-            await devFrontend();
-            break;
-        case 'dev:backend':
-            await runBindgen([], { skipIfNoInput: true, source: 'dev:backend' });
-            devBackend();
-            break;
-        case 'build':
-            await runBindgen([], { skipIfNoInput: true, source: 'build' });
-            await build(true);
-            break;
-        case 'build:frontend':
-            buildFrontend();
-            break;
-        case 'build:backend':
-            await runBindgen([], { skipIfNoInput: true, source: 'build:backend' });
-            buildBackend(null, false);
-            break;
-        case 'build:all':
-            await runBindgen([], { skipIfNoInput: true, source: 'build:all' });
-            buildAll();
-            break;
-        case 'build:windows':
-            await runBindgen([], { skipIfNoInput: true, source: 'build:windows' });
-            buildPlatform('win32');
-            break;
-        case 'build:macos':
-            await runBindgen([], { skipIfNoInput: true, source: 'build:macos' });
-            buildPlatform('darwin');
-            break;
-        case 'build:linux':
-            await runBindgen([], { skipIfNoInput: true, source: 'build:linux' });
-            buildPlatform('linux');
-            break;
-        case 'build:android':
-            await runBindgen([], { skipIfNoInput: true, source: 'build:android' });
-            buildPlatform('android');
-            break;
-        case 'build:ios':
-            await runBindgen([], { skipIfNoInput: true, source: 'build:ios' });
-            buildPlatform('ios');
-            break;
-        case 'run':
-            run();
-            break;
-        case 'clean':
-            await clean();
-            break;
-        case 'bind':
-        case 'bindgen':
-            await runBindgen();
-            break;
-        case 'icons':
-            await generateIcons(args[1]);
-            break;
-        case 'embed':
-            await embedResources(args[1]);
-            break;
-        case 'help':
-        case '-h':
-        case '--help':
-            console.log(USAGE);
-            break;
-        case '-v':
-        case '--version':
-            console.log('plusui-cli v0.2.0');
-            break;
-        default:
-            console.log(USAGE);
-    }
-}
-
-main().catch(e => error(e.message));
+#!/usr/bin/env node
+
+import { mkdir, readFile, stat, rm, readdir, writeFile, copyFile } from 'fs/promises';
+import { existsSync, watch, statSync, mkdirSync } from 'fs';
+import { exec, spawn, execSync } from 'child_process';
+import { join, dirname, basename, resolve } from 'path';
+import { fileURLToPath } from 'url';
+import { createInterface } from 'readline';
+import { createServer as createViteServer } from 'vite';
+import { runDoctor } from './doctor/index.js';
+import { TemplateManager } from '../templates/manager.js';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+
+const COLORS = {
+    reset: '\x1b[0m',
+    bright: '\x1b[1m',
+    dim: '\x1b[2m',
+    green: '\x1b[32m',
+    blue: '\x1b[34m',
+    yellow: '\x1b[33m',
+    red: '\x1b[31m',
+    cyan: '\x1b[36m',
+    magenta: '\x1b[35m',
+};
+
+function log(msg, color = 'reset') {
+    console.log(`${COLORS[color]}${msg}${COLORS.reset}`);
+}
+
+function logSection(title) {
+    console.log(`\n${COLORS.bright}${COLORS.blue}=== ${title} ===${COLORS.reset}\n`);
+}
+
+function error(msg) {
+    console.error(`${COLORS.red}Error: ${msg}${COLORS.reset}`);
+    process.exit(1);
+}
+
+function checkTools() {
+    const platform = process.platform;
+    const required = [];
+
+    const cmakePaths = [
+        'cmake',
+        'C:\\Program Files\\CMake\\bin\\cmake.exe',
+        'C:\\Program Files (x86)\\CMake\\bin\\cmake.exe',
+        '/usr/local/bin/cmake',
+        '/usr/bin/cmake'
+    ];
+
+    let cmakeFound = false;
+    for (const p of cmakePaths) {
+        try {
+            execSync(`"${p}" --version`, { stdio: 'ignore' });
+            cmakeFound = true;
+            break;
+        } catch { }
+    }
+
+    if (!cmakeFound) {
+        if (platform === 'win32') {
+            required.push({ name: 'CMake', install: 'winget install Kitware.CMake', auto: 'winget install -e --id Kitware.CMake' });
+        } else if (platform === 'darwin') {
+            required.push({ name: 'CMake', install: 'brew install cmake', auto: 'brew install cmake' });
+        } else {
+            required.push({ name: 'CMake', install: 'sudo apt install cmake', auto: 'sudo apt install cmake' });
+        }
+    }
+
+    if (platform === 'win32') {
+        const vsPaths = [
+            'C:\\Program Files\\Microsoft Visual Studio\\2022\\Community\\VC\\Tools\\MSVC',
+            'C:\\Program Files\\Microsoft Visual Studio\\2022\\Professional\\VC\\Tools\\MSVC',
+            'C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\VC\\Tools\\MSVC'
+        ];
+
+        let vsFound = false;
+        for (const p of vsPaths) {
+            if (existsSync(p)) {
+                vsFound = true;
+                break;
+            }
+        }
+
+        if (!vsFound) {
+            required.push({ name: 'Visual Studio 2022', install: 'Download from visualstudio.microsoft.com with C++ workload', auto: null });
+        }
+    } else if (platform === 'darwin') {
+        try {
+            execSync('clang++ --version', { stdio: 'ignore' });
+        } catch {
+            required.push({ name: 'Xcode', install: 'xcode-select --install', auto: 'xcode-select --install' });
+        }
+    } else {
+        try {
+            execSync('g++ --version', { stdio: 'ignore' });
+        } catch {
+            required.push({ name: 'GCC/Clang', install: 'sudo apt install build-essential', auto: 'sudo apt install build-essential' });
+        }
+    }
+
+    if (required.length > 0) {
+        log('\n=== Missing Required Tools ===', 'yellow');
+
+        for (const tool of required) {
+            log(`\n  ${tool.name}`, 'bright');
+            log(`  Install: ${tool.install}`, 'reset');
+            if (tool.auto) {
+                log(`  Run:     ${tool.auto}`, 'green');
+            }
+        }
+
+        log('\n');
+        return { missing: required };
+    }
+    return null;
+}
+
+const USAGE = `
+${COLORS.bright}PlusUI CLI${COLORS.reset} - Build C++ desktop apps with web tech
+
+${COLORS.bright}Usage:${COLORS.reset}
+  plusui doctor              Check development environment
+  plusui doctor --fix        Check and auto-install missing tools
+  plusui create <name>       Create a new PlusUI project
+  plusui dev                 Run in development mode (Vite HMR + C++ app)
+  plusui build               Build for current platform (production)
+  plusui build:frontend      Build frontend only
+  plusui build:backend       Build C++ backend only
+  plusui build:all           Build for all platforms
+  plusui run                 Run the built application
+  plusui clean               Clean build artifacts
+  plusui bind                Generate bindings for current app (alias: bindgen)
+  plusui help                Show this help message
+
+${COLORS.bright}Platform Builds:${COLORS.reset}
+  plusui build:windows       Build for Windows
+  plusui build:macos         Build for macOS
+  plusui build:linux         Build for Linux
+
+${COLORS.bright}Asset Commands:${COLORS.reset}
+  plusui icons [input]       Generate platform icons from source icon
+  plusui embed [platform]    Embed resources for platform (win32/darwin/linux/all)
+
+${COLORS.bright}Options:${COLORS.reset}
+  -h, --help                 Show this help message
+  -v, --version              Show version number
+  -t, --template             Specify template (solid, react)
+
+${COLORS.bright}Assets:${COLORS.reset}
+  Place assets/icon.png (512x512+ recommended) for automatic icon generation.
+  All assets in "assets/" are embedded into the binary for single-exe distribution.
+  Embedded resources are accessible via plusui::resources::getResource("path").
+`;
+
+// Platform configuration
+const PLATFORMS = {
+    win32: { name: 'Windows', folder: 'Windows', ext: '.exe', generator: null },
+    darwin: { name: 'macOS', folder: 'MacOS', ext: '', generator: 'Xcode' },
+    linux: { name: 'Linux', folder: 'Linux', ext: '', generator: 'Ninja' },
+    android: { name: 'Android', folder: 'Android', ext: '.apk', generator: 'Ninja' },
+    ios: { name: 'iOS', folder: 'iOS', ext: '.app', generator: 'Xcode' },
+};
+
+function getProjectName() {
+    try {
+        const pkg = JSON.parse(execSync('npm pkg get name', { encoding: 'utf8', stdio: ['pipe', 'pipe', 'ignore'] }));
+        return typeof pkg === 'string' ? pkg.replace(/"/g, '') : basename(process.cwd());
+    } catch {
+        return basename(process.cwd());
+    }
+}
+
+function getCMakePath() {
+    const paths = [
+        'cmake',
+        'C:\\Program Files\\CMake\\bin\\cmake.exe',
+        'C:\\Program Files (x86)\\CMake\\bin\\cmake.exe',
+        '/usr/local/bin/cmake',
+        '/usr/bin/cmake'
+    ];
+    for (const p of paths) {
+        try {
+            execSync(`"${p}" --version`, { stdio: 'ignore' });
+            return p;
+        } catch { }
+    }
+    return 'cmake';
+}
+
+function runCMake(args, options = {}) {
+    const cmake = getCMakePath();
+    return execSync(`"${cmake}" ${args}`, { stdio: 'inherit', ...options });
+}
+
+function getAppBindgenPaths() {
+    return {
+        featuresDir: join(process.cwd(), 'src', 'features'),
+        outputDir: join(process.cwd(), 'src', 'Bindings_Generated'),
+        frontendOutputDir: join(process.cwd(), 'frontend', 'src', 'Bindings_Generated'),
+    };
+}
+
+function ensureBuildLayout() {
+    const buildRoot = join(process.cwd(), 'build');
+    for (const platform of Object.values(PLATFORMS)) {
+        mkdirSync(join(buildRoot, platform.folder), { recursive: true });
+    }
+}
+
+function resolveBindgenScriptPath() {
+    const candidates = [
+        resolve(__dirname, '../../plusui-bindgen/src/index.js'),
+        resolve(__dirname, '../../plusui-native-bindgen/src/index.js'),
+        resolve(__dirname, '../../../plusui-native-bindgen/src/index.js'),
+        resolve(process.cwd(), 'node_modules', 'plusui-native-bindgen', 'src', 'index.js'),
+    ];
+
+    for (const candidate of candidates) {
+        if (existsSync(candidate)) {
+            return candidate;
+        }
+    }
+
+    return null;
+}
+
+async function syncGeneratedTsBindings(backendOutputDir, frontendOutputDir) {
+    const generatedTsPath = join(backendOutputDir, 'bindings.gen.ts');
+    if (!existsSync(generatedTsPath)) {
+        return;
+    }
+
+    await mkdir(frontendOutputDir, { recursive: true });
+    const frontendTsPath = join(frontendOutputDir, 'bindings.gen.ts');
+    await copyFile(generatedTsPath, frontendTsPath);
+    log(`Synced TS bindings: ${frontendTsPath}`, 'dim');
+}
+
+function promptTemplateSelection() {
+    return new Promise((resolve) => {
+        const rl = createInterface({
+            input: process.stdin,
+            output: process.stdout
+        });
+
+        console.log(`\n${COLORS.bright}Select a template:${COLORS.reset}`);
+        console.log(`  ${COLORS.cyan}1)${COLORS.reset} solid   - SolidJS + TypeScript (lightweight, reactive)`);
+        console.log(`  ${COLORS.cyan}2)${COLORS.reset} react   - React + TypeScript (popular, familiar)`);
+
+        rl.question(`\n${COLORS.yellow}Enter choice [1-2] (default: solid):${COLORS.reset} `, (answer) => {
+            rl.close();
+            const choice = answer.trim() || '1';
+            const templates = { '1': 'solid', '2': 'react' };
+            const template = templates[choice] || 'solid';
+            console.log(`${COLORS.green}✓${COLORS.reset} Selected: ${COLORS.cyan}${template}${COLORS.reset}\n`);
+            resolve(template);
+        });
+    });
+}
+
+async function createProject(name, options = {}) {
+    try {
+        const templateManager = new TemplateManager();
+        await templateManager.create(name, options);
+    } catch (e) {
+        error(e.message);
+    }
+}
+
+// ============================================================
+// BUILD FUNCTIONS
+// ============================================================
+
+function buildFrontend() {
+    logSection('Building Frontend');
+
+    if (existsSync('frontend')) {
+        log('Running Vite build...', 'blue');
+        execSync('cd frontend && npm run build', { stdio: 'inherit', shell: true });
+        log('Frontend built successfully!', 'green');
+    } else {
+        log('No frontend directory found, skipping...', 'yellow');
+    }
+}
+
+function buildBackend(platform = null, devMode = false) {
+    const targetPlatform = platform || process.platform;
+    const platformConfig = PLATFORMS[targetPlatform] || PLATFORMS[Object.keys(PLATFORMS).find(k => PLATFORMS[k].folder.toLowerCase() === targetPlatform?.toLowerCase())];
+
+    if (!platformConfig) {
+        error(`Unsupported platform: ${targetPlatform}`);
+    }
+
+    logSection(`Building Backend (${platformConfig.name})`);
+
+    const buildDir = `build/${platformConfig.folder}`;
+
+    ensureBuildLayout();
+
+    // Create build directory
+    if (!existsSync(buildDir)) {
+        execSync(`mkdir -p "${buildDir}"`, { stdio: 'ignore', shell: true });
+    }
+
+    // CMake configure
+    let cmakeArgs = `-S . -B "${buildDir}" -DCMAKE_BUILD_TYPE=Release`;
+
+    if (devMode) {
+        cmakeArgs += ' -DPLUSUI_DEV_MODE=ON';
+    }
+
+    if (platformConfig.generator) {
+        cmakeArgs += ` -G "${platformConfig.generator}"`;
+    }
+
+    log(`Configuring CMake...`, 'blue');
+    runCMake(cmakeArgs);
+
+    // CMake build
+    log(`Building...`, 'blue');
+    runCMake(`--build "${buildDir}" --config Release`);
+
+    log(`Backend built: ${buildDir}`, 'green');
+
+    return buildDir;
+}
+
+async function generateIcons(inputPath = null) {
+    logSection('Generating Platform Icons');
+
+    const { IconGenerator } = await import('./assets/icon-generator.js');
+    const generator = new IconGenerator();
+
+    const srcIcon = inputPath || join(process.cwd(), 'assets', 'icon.png');
+    const outputBase = join(process.cwd(), 'assets', 'icons');
+
+    if (!existsSync(srcIcon)) {
+        log(`Icon not found: ${srcIcon}`, 'yellow');
+        log('Place a 512x512+ PNG icon at assets/icon.png', 'dim');
+        return;
+    }
+
+    await generator.generate(srcIcon, outputBase);
+}
+
+async function embedResources(platform = null) {
+    const targetPlatform = platform || process.platform;
+    logSection(`Embedding Resources (${targetPlatform})`);
+
+    const { ResourceEmbedder } = await import('./assets/resource-embedder.js');
+    const embedder = new ResourceEmbedder({ verbose: true });
+
+    const frontendDist = join(process.cwd(), 'frontend', 'dist');
+    const outputDir = join(process.cwd(), 'generated', 'resources');
+
+    if (!existsSync(frontendDist)) {
+        log('Frontend not built yet. Run: plusui build:frontend', 'yellow');
+        return;
+    }
+
+    if (platform === 'all') {
+        await embedder.embedAll(frontendDist, outputDir);
+    } else {
+        await embedder.embed(frontendDist, outputDir, targetPlatform);
+    }
+}
+
+async function embedAssets() {
+    const assetsDir = join(process.cwd(), 'assets');
+    if (!existsSync(assetsDir)) {
+        try {
+            await mkdir(assetsDir, { recursive: true });
+        } catch(e) {}
+    }
+
+    logSection('Embedding Assets');
+    
+    // Always generate the header file, even if empty
+    let headerContent = '#pragma once\n\n';
+    headerContent += '// THIS FILE IS AUTO-GENERATED BY PLUSUI CLI\n';
+    headerContent += '// DO NOT MODIFY MANUALLY\n\n';
+    
+    const files = existsSync(assetsDir) 
+        ? (await readdir(assetsDir)).filter(f => !statSync(join(assetsDir, f)).isDirectory())
+        : [];
+    
+    if (files.length === 0) {
+        log('No assets found in assets/ folder', 'dim');
+    } else {
+        for (const file of files) {
+            const filePath = join(assetsDir, file);
+            log(`Processing ${file}...`, 'dim');
+            
+            const varName = file.replace(/[^a-zA-Z0-9]/g, '_').toUpperCase();
+            const data = await readFile(filePath);
+            
+            headerContent += `static const unsigned char ASSET_${varName}[] = {`;
+            for (let i = 0; i < data.length; i++) {
+                if (i % 16 === 0) headerContent += '\n  ';
+                headerContent += `0x${data[i].toString(16).padStart(2, '0')}, `;
+            }
+            headerContent += '\n};\n';
+            headerContent += `static const unsigned int ASSET_${varName}_LEN = ${data.length};\n\n`;
+        }
+    }
+
+    const genDir = join(process.cwd(), 'generated');
+    if (!existsSync(genDir)) await mkdir(genDir, { recursive: true });
+    
+    await writeFile(join(genDir, 'assets.h'), headerContent);
+    log(`✓ Assets header generated: generated/assets.h`, 'green');
+}
+
+
+
+async function build(production = true) {
+    logSection('Building PlusUI Application');
+
+    // Embed assets
+    await embedAssets();
+
+    // Build frontend first
+    if (production) {
+        buildFrontend();
+    }
+
+    // Build backend
+    const buildDir = buildBackend(null, !production);
+
+    log('\nBuild complete!', 'green');
+    return buildDir;
+}
+
+function buildAll() {
+    logSection('Building for All Platforms');
+
+    ensureBuildLayout();
+
+    buildFrontend();
+
+    const supportedPlatforms = ['win32', 'darwin', 'linux'];
+
+    for (const platform of supportedPlatforms) {
+        try {
+            buildBackend(platform, false);
+        } catch (e) {
+            log(`Failed to build for ${PLATFORMS[platform].name}: ${e.message}`, 'yellow');
+        }
+    }
+
+    log('\nAll platform builds complete!', 'green');
+    log('\nOutput directories:', 'bright');
+    log('  build/Windows/', 'cyan');
+    log('  build/MacOS/', 'cyan');
+    log('  build/Linux/', 'cyan');
+    log('  build/Android/', 'cyan');
+    log('  build/iOS/', 'cyan');
+}
+
+function buildPlatform(platform) {
+    logSection(`Building for ${PLATFORMS[platform]?.name || platform}`);
+    buildFrontend();
+    buildBackend(platform, false);
+}
+
+// ============================================================
+// DEVELOPMENT FUNCTIONS
+// ============================================================
+
+let viteServer = null;
+let cppProcess = null;
+
+async function startViteServer() {
+    log('Starting Vite dev server...', 'blue');
+
+    viteServer = await createViteServer({
+        root: 'frontend',
+        server: {
+            port: 5173,
+            strictPort: true,
+        },
+    });
+
+    await viteServer.listen();
+
+    log('Vite server: http://localhost:5173', 'green');
+    return viteServer;
+}
+
+async function startBackend() {
+    logSection('Building C++ Backend (Dev Mode)');
+
+    const projectName = getProjectName();
+    killProcessByName(projectName);
+
+    const platformFolder = PLATFORMS[process.platform]?.folder || 'Windows';
+    const buildDir = join('build', platformFolder, 'dev');
+
+    // Configure with dev mode if not configured
+    if (!existsSync(join(buildDir, 'CMakeCache.txt'))) {
+        log('Configuring CMake...', 'blue');
+        runCMake(`-S . -B "${buildDir}" -DPLUSUI_DEV_MODE=ON`);
+    }
+
+    log('Compiling...', 'blue');
+    runCMake(`--build "${buildDir}"`);
+
+    // Find executable
+    let exePath;
+    if (process.platform === 'win32') {
+        // Visual Studio puts exe in build/dev/<projectname>/Debug/<projectname>.exe
+        exePath = join(buildDir, projectName, 'Debug', `${projectName}.exe`);
+        if (!existsSync(exePath)) {
+            exePath = join(buildDir, 'Debug', `${projectName}.exe`);
+        }
+        if (!existsSync(exePath)) {
+            exePath = join(buildDir, 'bin', `${projectName}.exe`);
+        }
+        if (!existsSync(exePath)) {
+            exePath = join(buildDir, `${projectName}.exe`);
+        }
+    } else {
+        exePath = join(buildDir, projectName);
+        if (!existsSync(exePath)) {
+            exePath = join(buildDir, 'bin', projectName);
+        }
+    }
+
+    if (!existsSync(exePath)) {
+        error(`Executable not found. Expected: ${exePath}`);
+    }
+
+    log('Starting C++ app...', 'blue');
+
+    cppProcess = spawn(exePath, [], {
+        shell: true,
+        stdio: 'inherit',
+        env: { ...process.env, PLUSUI_DEV: '1' }
+    });
+
+    cppProcess.on('error', (err) => {
+        log(`Failed to start app: ${err.message}`, 'red');
+    });
+
+    return cppProcess;
+}
+
+async function killPort(port) {
+    log(`Checking port ${port}...`, 'dim');
+    try {
+        if (process.platform === 'win32') {
+            try {
+                const output = execSync(`netstat -ano | findstr :${port}`, { encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'] });
+                const lines = output.split('\n').filter(line => line.includes(`:${port}`) && line.includes('LISTENING'));
+                
+                for (const line of lines) {
+                    const parts = line.trim().split(/\s+/);
+                    const pid = parts[parts.length - 1];
+                    if (pid && /^\d+$/.test(pid)) {
+                        log(`Killing process ${pid} on port ${port}...`, 'yellow');
+                        try {
+                            execSync(`taskkill /PID ${pid} /F`, { stdio: 'ignore' });
+                        } catch (e) {
+                            // Ignore if already dead
+                        }
+                    }
+                }
+            } catch (e) {
+                // findstr returns exit code 1 if no match found
+            }
+        } else {
+            try {
+                execSync(`lsof -i :${port} -t | xargs kill -9`, { stdio: 'ignore' });
+            } catch {
+                // Ignore if no process found
+            }
+        }
+    } catch (e) {
+        // Ignore general errors
+    }
+}
+
+function killProcessByName(name) {
+    const processName = process.platform === 'win32' ? `${name}.exe` : name;
+    log(`Cleaning up previous instance (${processName})...`, 'dim');
+    try {
+        if (process.platform === 'win32') {
+            execSync(`taskkill /IM "${processName}" /F`, { stdio: 'ignore' });
+        } else {
+            execSync(`pkill -f "${processName}"`, { stdio: 'ignore' });
+        }
+    } catch (e) {
+        // Ignore if process not found
+    }
+}
+
+async function dev() {
+    logSection('PlusUI Development Mode');
+
+    const toolCheck = checkTools();
+    if (toolCheck && toolCheck.missing) {
+        error('Missing required build tools. Run: plusui doctor --fix');
+    }
+
+    // Embed assets
+    await embedAssets();
+
+    await runBindgen([], { skipIfNoInput: true, source: 'dev' });
+
+    // specific port cleaning
+    await killPort(5173);
+
+    // Start Vite first
+    try {
+        viteServer = await startViteServer();
+    } catch (e) {
+        log(`Vite failed to start: ${e.message}`, 'red');
+        error('Could not start development server');
+    }
+
+    // Build and start C++ backend
+    await startBackend();
+
+    log('\n' + '='.repeat(50), 'dim');
+    log('Development mode active', 'green');
+    log('='.repeat(50), 'dim');
+    log('\nFrontend: http://localhost:5173 (HMR enabled)', 'cyan');
+    log('Backend:  C++ app running with webview', 'cyan');
+    log('\nEdit frontend/src/* for live reload', 'dim');
+    log('Edit main.cpp and restart for C++ changes', 'dim');
+    log('\nPress Ctrl+C to stop\n', 'yellow');
+
+    // Handle shutdown
+    process.on('SIGINT', async () => {
+        log('\nShutting down...', 'yellow');
+        if (viteServer) await viteServer.close();
+        if (cppProcess) cppProcess.kill();
+        process.exit(0);
+    });
+}
+
+async function devFrontend() {
+    logSection('Frontend Development Mode');
+
+    // specific port cleaning
+    await killPort(5173);
+
+    viteServer = await createViteServer({
+        root: 'frontend',
+        server: { port: 5173 },
+    });
+
+    await viteServer.listen();
+
+    log('Frontend: http://localhost:5173', 'green');
+    log('HMR enabled - changes will reflect instantly!\n', 'green');
+
+    process.on('SIGINT', async () => {
+        if (viteServer) await viteServer.close();
+        process.exit(0);
+    });
+}
+
+function devBackend() {
+    logSection('Backend Development Mode');
+
+    const projectName = getProjectName();
+    killProcessByName(projectName);
+
+    const platformFolder = PLATFORMS[process.platform]?.folder || 'Windows';
+    const buildDir = join('build', platformFolder, 'dev');
+
+    if (!existsSync(join(buildDir, 'CMakeCache.txt'))) {
+        log('Configuring CMake...', 'blue');
+        runCMake(`-S . -B "${buildDir}" -DPLUSUI_DEV_MODE=ON`);
+    }
+
+    runCMake(`--build "${buildDir}"`);
+
+    let exePath;
+    if (process.platform === 'win32') {
+        exePath = join(buildDir, projectName, 'Debug', `${projectName}.exe`);
+        if (!existsSync(exePath)) exePath = join(buildDir, 'Debug', `${projectName}.exe`);
+        if (!existsSync(exePath)) exePath = join(buildDir, `${projectName}.exe`);
+    } else {
+        exePath = join(buildDir, projectName);
+    }
+
+    function runApp() {
+        if (cppProcess) cppProcess.kill();
+
+        cppProcess = spawn(exePath, [], { shell: true, stdio: 'inherit' });
+
+        cppProcess.on('close', (code) => {
+            if (code !== null && code !== 0) {
+                log(`App exited with code ${code}`, 'yellow');
+            }
+        });
+    }
+
+    runApp();
+
+    log('\nWatching C++ files for changes...', 'yellow');
+    log('Press Ctrl+C to stop\n', 'dim');
+
+    // Watch main.cpp and features/ folder (if exists)
+    const watchItems = ['main.cpp'];
+    if (existsSync('features')) watchItems.push('features');
+
+    const watchers = watchItems.map(item => {
+        const isDir = existsSync(item) && statSync(item).isDirectory();
+        const w = isDir ? watch(item, { recursive: true }) : watch(item);
+        w.on('change', (eventType, filename) => {
+            const file = item === 'main.cpp' ? 'main.cpp' : filename;
+            if (file && (file.endsWith('.cpp') || file.endsWith('.hpp'))) {
+                log(`Changed: ${file}`, 'yellow');
+                log('Rebuilding...', 'blue');
+                try {
+                    killProcessByName(projectName);
+                    runCMake(`--build "${buildDir}"`);
+                    runApp();
+                } catch (e) {
+                    log('Build failed, waiting for fixes...', 'red');
+                }
+            }
+        });
+        return w;
+    });
+
+    process.on('SIGINT', () => {
+        if (cppProcess) cppProcess.kill();
+        watchers.forEach(w => w.close());
+        process.exit(0);
+    });
+}
+
+// ============================================================
+// RUN FUNCTION
+// ============================================================
+
+function run() {
+    const projectName = getProjectName();
+    const platform = PLATFORMS[process.platform];
+    const buildDir = `build/${platform?.folder || 'Windows'}`;
+
+    let exePath;
+    if (process.platform === 'win32') {
+        exePath = join(buildDir, 'Release', `${projectName}.exe`);
+        if (!existsSync(exePath)) exePath = join(buildDir, 'bin', `${projectName}.exe`);
+        if (!existsSync(exePath)) exePath = join(buildDir, `${projectName}.exe`);
+    } else {
+        exePath = join(buildDir, projectName);
+        if (!existsSync(exePath)) exePath = join(buildDir, 'bin', projectName);
+    }
+
+    if (!existsSync(exePath)) {
+        error(`Build not found at ${exePath}. Run "plusui build" first.`);
+    }
+
+    log(`Running: ${exePath}`, 'blue');
+
+    const proc = spawn(exePath, [], { shell: true, stdio: 'inherit' });
+
+    proc.on('close', (code) => {
+        process.exit(code);
+    });
+}
+
+// ============================================================
+// CLEAN FUNCTION
+// ============================================================
+
+async function clean() {
+    logSection('Cleaning Build Artifacts');
+
+    const dirs = ['build', 'frontend/dist'];
+
+    for (const dir of dirs) {
+        if (existsSync(dir)) {
+            log(`Removing: ${dir}`, 'yellow');
+            await rm(dir, { recursive: true, force: true });
+        }
+    }
+
+    log('\nClean complete!', 'green');
+}
+
+// ============================================================
+// BINDGEN FUNCTION
+// ============================================================
+
+async function runBindgen(providedArgs = null, options = {}) {
+    logSection('Running Binding Generator');
+
+    const { skipIfNoInput = false, source = 'manual' } = options;
+
+    const scriptPath = resolveBindgenScriptPath();
+
+    if (!scriptPath) {
+        error(`Bindgen script not found. Please ensure plusui-native-bindgen is installed.`);
+    }
+
+    log(`Using bindgen: ${scriptPath}`, 'dim');
+
+    // plusui bindgen [featuresDir] [outputDir]
+    // Defaults to app-local paths when available.
+    const args = providedArgs ?? process.argv.slice(3);
+    let bindgenArgs = [...args];
+
+    let usedDefaultAppMode = false;
+    let defaultOutputDir = null;
+    let defaultFrontendOutputDir = null;
+
+    if (bindgenArgs.length === 0) {
+        const { featuresDir: appFeaturesDir, outputDir: appOutputDir, frontendOutputDir } = getAppBindgenPaths();
+
+        if (existsSync(appFeaturesDir)) {
+            bindgenArgs = [appFeaturesDir, appOutputDir];
+            usedDefaultAppMode = true;
+            defaultOutputDir = appOutputDir;
+            defaultFrontendOutputDir = frontendOutputDir;
+            log(`App mode: ${appFeaturesDir} -> ${appOutputDir}`, 'dim');
+        } else {
+            if (skipIfNoInput) {
+                log(`No src/features folder found; skipping binding refresh for ${source}.`, 'dim');
+                return;
+            } else {
+                error('No bindgen input found. Create src/features in your app or pass paths: plusui bindgen <featuresDir> <outputDir>');
+            }
+        }
+    }
+    
+    // Spawn node process
+    const proc = spawn(process.execPath, [scriptPath, ...bindgenArgs], {
+        stdio: 'inherit',
+        env: process.env
+    });
+
+    return new Promise((resolve, reject) => {
+        proc.on('close', async (code) => {
+            if (code === 0) {
+                try {
+                    if (usedDefaultAppMode && defaultOutputDir && defaultFrontendOutputDir) {
+                        await syncGeneratedTsBindings(defaultOutputDir, defaultFrontendOutputDir);
+                    }
+                    log('\nBindgen complete!', 'green');
+                    resolve();
+                } catch (syncErr) {
+                    reject(syncErr);
+                }
+            } else {
+                reject(new Error(`Bindgen failed with code ${code}`));
+            }
+        });
+    });
+}
+
+// ============================================================
+// MAIN
+// ============================================================
+
+async function main() {
+    const args = process.argv.slice(2);
+    const cmd = args[0];
+
+    switch (cmd) {
+        case 'doctor':
+            await runDoctor({
+                fix: args.includes('--fix'),
+                json: args.includes('--json'),
+                quick: args.includes('--quick')
+            });
+            break;
+        case 'create':
+            if (!args[1] || args[1].startsWith('-')) error('Project name required');
+            const template = await promptTemplateSelection();
+            await createProject(args[1], { template });
+            break;
+        case 'dev':
+            await dev();
+            break;
+        case 'dev:frontend':
+            await devFrontend();
+            break;
+        case 'dev:backend':
+            await runBindgen([], { skipIfNoInput: true, source: 'dev:backend' });
+            devBackend();
+            break;
+        case 'build':
+            await runBindgen([], { skipIfNoInput: true, source: 'build' });
+            await build(true);
+            break;
+        case 'build:frontend':
+            buildFrontend();
+            break;
+        case 'build:backend':
+            await runBindgen([], { skipIfNoInput: true, source: 'build:backend' });
+            buildBackend(null, false);
+            break;
+        case 'build:all':
+            await runBindgen([], { skipIfNoInput: true, source: 'build:all' });
+            buildAll();
+            break;
+        case 'build:windows':
+            await runBindgen([], { skipIfNoInput: true, source: 'build:windows' });
+            buildPlatform('win32');
+            break;
+        case 'build:macos':
+            await runBindgen([], { skipIfNoInput: true, source: 'build:macos' });
+            buildPlatform('darwin');
+            break;
+        case 'build:linux':
+            await runBindgen([], { skipIfNoInput: true, source: 'build:linux' });
+            buildPlatform('linux');
+            break;
+        case 'build:android':
+            await runBindgen([], { skipIfNoInput: true, source: 'build:android' });
+            buildPlatform('android');
+            break;
+        case 'build:ios':
+            await runBindgen([], { skipIfNoInput: true, source: 'build:ios' });
+            buildPlatform('ios');
+            break;
+        case 'run':
+            run();
+            break;
+        case 'clean':
+            await clean();
+            break;
+        case 'bind':
+        case 'bindgen':
+            await runBindgen();
+            break;
+        case 'icons':
+            await generateIcons(args[1]);
+            break;
+        case 'embed':
+            await embedResources(args[1]);
+            break;
+        case 'help':
+        case '-h':
+        case '--help':
+            console.log(USAGE);
+            break;
+        case '-v':
+        case '--version':
+            console.log('plusui-cli v0.2.0');
+            break;
+        default:
+            console.log(USAGE);
+    }
+}
+
+main().catch(e => error(e.message));