@brightsideoy/kama 1.0.0-alpha.2 → 1.0.0-alpha.3

package/bin/cli.js

@@ -3,7 +3,30 @@ import { execSync } from 'node:child_process';
 import { existsSync, mkdirSync, writeFileSync, readFileSync, readdirSync, cpSync, unlinkSync, appendFileSync } from 'node:fs';
 import { join, dirname, basename, resolve } from 'node:path';
 import { fileURLToPath, pathToFileURL } from 'node:url';
-import * as readline from 'node:readline/promises';
+
+// 🎯 Modern CLI UI Components
+import { intro, outro, text, select, confirm, spinner, note, isCancel, cancel } from '@clack/prompts';
+
+// --- UI HELPERS (Zero Dependency Colors) ---
+const pc = {
+    green: (t) => `\x1b[32m${t}\x1b[0m`,
+    cyan: (t) => `\x1b[36m${t}\x1b[0m`,
+    dim: (t) => `\x1b[2m${t}\x1b[0m`,
+    yellow: (t) => `\x1b[33m${t}\x1b[0m`,
+    red: (t) => `\x1b[31m${t}\x1b[0m`,
+    bgCyan: (t) => `\x1b[46m\x1b[30m ${t} \x1b[0m`,
+    bold: (t) => `\x1b[1m${t}\x1b[0m`,
+    reset: '\x1b[0m'
+};
+
+// Graceful exit handler for Ctrl+C
+function handleCancel(value) {
+    if (isCancel(value)) {
+        cancel('Operation cancelled.');
+        process.exit(0);
+    }
+    return value;
+}
 
 // 🎯 Always use the absolute newest ecosystem
 const ASTRO_LATEST = "latest";
@@ -25,28 +48,25 @@ try {
     console.warn("⚠️ Could not detect Kama version, defaulting to 'alpha'");
 }
 
-const rl = readline.createInterface({
-    input: process.stdin,
-    output: process.stdout,
-});
-
 function showHelp() {
-    console.log('\n🔥 --- KAMA ENGINE CLI --- 🔥\n');
+    console.log(`\n${pc.bgCyan(' KAMA • ENGINE CLI ')}\n`);
     console.log('Usage: npx kama <command> [options]\n');
-    console.log('Commands:');
+
+    console.log(pc.cyan('Commands:'));
     console.log('  init         Kickstart a new Monorepo (CMS Worker + Optional Astro Site)');
     console.log('  add site     Add a new Astro Frontend Site to the current workspace (sites/)');
     console.log('  bundle       Compile and bundle YAML schemas into bundled-definitions.js for Edge deployment');
     console.log('  promote      Promote the current Local workspace to Cloudflare Edge');
     console.log('  help, -h     Show this help message\n');
 
-    console.log('Workspace Scripts (Run from project root):');
+    console.log(pc.cyan('Workspace Scripts (Run from project root):'));
     console.log('  npm update           Update to latest KAMA version');
+    console.log('  npm run setup        Initialize database schema and seed data (Run Once)');
     console.log('  npm run dev          Boot up the CMS backend and Astro frontend concurrently');
     console.log('  npm run deploy:cms   Deploy the backend worker and database to Cloudflare');
     console.log('  npm run deploy:site  Deploy the Astro frontend site to Cloudflare\n');
 
-    console.log('Examples:');
+    console.log(pc.cyan('Examples:'));
     console.log('  npx kama init');
     console.log('  npx kama add site');
     console.log('  npx kama bundle\n');
@@ -57,13 +77,13 @@ async function main() {
     const command = args[0]?.toLowerCase();
     const subCommand = args[1]?.toLowerCase();
 
-    if (command === 'help' || command === '--help' || command === '-h') {
+    if (['help', '--help', '-h'].includes(command)) {
         showHelp();
-        rl.close();
         process.exit(0);
     }
 
-    console.log('\n🔥 --- KAMA ENGINE CLI --- 🔥\n');
+    console.clear();
+    intro(`${pc.bgCyan(' KAMA • ENGINE ')} ${pc.dim('v' + currentKamaVersion.replace('^', ''))}`);
 
     if (command === 'init') {
         await createFullWorkspace();
@@ -74,29 +94,34 @@ async function main() {
     } else if (command === 'bundle') {
         await bundleWorkspaceSchemas();
     } else {
-        console.log('Available Commands:');
-        console.log('  1) npx kama init         - Kickstart new Monorepo (CMS + Optional Site)');
-        console.log('  2) npx kama add site     - Add new Astro Site to current workspace (sites/)');
-        console.log('  3) npx kama bundle       - Compile and bundle YAML schemas for Edge deployment');
-        console.log('  4) npx kama promote      - Promote current Local workspace to Cloudflare Edge');
-        console.log('  5) Help                  - Show all commands and usage');
-
-        const choice = (await rl.question('\nSelect choice [1/2/3/4/5]: ')).trim();
-
-        if (choice === '5') {
+        const choice = handleCancel(await select({
+            message: 'What would you like to do?',
+            options: [
+                { value: 'init', label: 'Init', hint: 'Kickstart new Workspace (CMS + Optional Site)' },
+                { value: 'add_site', label: 'Add Site', hint: 'Add Astro Site to current workspace (sites/)' },
+                { value: 'bundle', label: 'Bundle', hint: 'Compile YAML schemas for Edge deployment' },
+                { value: 'promote', label: 'Promote', hint: 'Promote current Local workspace to Cloudflare Edge' },
+                { value: 'help', label: 'Help', hint: 'Show all commands and usage' },
+                { value: 'exit', label: 'Exit' }
+            ]
+        }));
+
+        if (choice === 'help') {
             showHelp();
-        } else if (choice === '4') {
+            process.exit(0);
+        } else if (choice === 'promote') {
             await promoteLocalToCloudflare();
-        } else if (choice === '3') {
+        } else if (choice === 'bundle') {
             await bundleWorkspaceSchemas();
-        } else if (choice === '2') {
+        } else if (choice === 'add_site') {
             await createNewSiteOnly();
-        } else {
+        } else if (choice === 'init') {
             await createFullWorkspace();
+        } else {
+            outro('Goodbye!');
+            process.exit(0);
         }
     }
-
-    rl.close();
 }
 
 /**
@@ -120,37 +145,54 @@ function convertAstroConfigToCloudflare(siteDir) {
 async function createFullWorkspace() {
     const cwdName = basename(process.cwd());
     const hasExistingPkg = existsSync(join(process.cwd(), 'package.json'));
-
     const defaultDirPrompt = hasExistingPkg ? '.' : cwdName;
-    const inputName = await rl.question(`Project folder name (use '.' for current dir) [${defaultDirPrompt}]: `);
+
+    const inputName = handleCancel(await text({
+        message: 'Project folder name (use "." for current dir):',
+        placeholder: defaultDirPrompt,
+        defaultValue: defaultDirPrompt
+    }));
 
     const chosenFolder = inputName.trim() || defaultDirPrompt;
     const isCurrentDir = chosenFolder === '.';
-
     const projName = isCurrentDir ? cwdName : chosenFolder;
     const rootDir = isCurrentDir ? process.cwd() : join(process.cwd(), projName);
 
-    console.log('\n🌍 Choose your Deployment Architecture:');
-    console.log('  1) VPS / Local Server (Node.js, SQLite, Sharp cropping)');
-    console.log('  2) Cloudflare Edge (Workers, D1, R2, CF Image Resizing)');
-    const envChoice = await rl.question('\nChoice [1/2]: ');
-    const isCloudflare = envChoice.trim() === '2';
+    const isCloudflare = handleCancel(await select({
+        message: 'Choose your Deployment Architecture:',
+        options: [
+            { value: true, label: 'Cloudflare Edge', hint: 'Workers, D1, R2, CF Image Resizing' },
+            { value: false, label: 'VPS / Local Server', hint: 'Node.js, SQLite, Sharp cropping' }
+        ]
+    }));
 
-    const createSiteInput = await rl.question('\n🚀 Do you want to scaffold an initial Astro frontend site? (y/n) [y]: ');
-    const shouldCreateSite = createSiteInput.trim().toLowerCase() !== 'n';
+    const shouldCreateSite = handleCancel(await confirm({
+        message: 'Do you want to scaffold an initial Astro frontend site?',
+        initialValue: true
+    }));
 
     let siteFolderName = 'kama-starter';
     let siteDomain = 'localhost:4321';
     let cmsDomain = 'localhost:8787';
 
     if (shouldCreateSite) {
-        siteFolderName = (await rl.question('Astro package/folder name (e.g., my-website) [kama-starter]: ')).trim() || 'kama-starter';
+        siteFolderName = handleCancel(await text({
+            message: 'Astro package/folder name (e.g., my-website.eu):',
+            placeholder: 'kama-starter',
+            defaultValue: 'kama-starter'
+        }));
     }
 
     if (isCloudflare) {
-        cmsDomain = (await rl.question('\nCMS Admin Domain (e.g., admin.yourdomain.com): ')).trim();
+        cmsDomain = handleCancel(await text({
+            message: 'CMS Admin Domain (e.g., admin.yourdomain.com):',
+            defaultValue: ''
+        }));
         if (shouldCreateSite) {
-            siteDomain = (await rl.question('First Website Domain (e.g., yourdomain.com): ')).trim();
+            siteDomain = handleCancel(await text({
+                message: 'First Website Domain (e.g., yourdomain.com):',
+                defaultValue: ''
+            }));
         }
     }
 
@@ -161,11 +203,11 @@ async function createFullWorkspace() {
     let dbName = `${projName}-db`.replace(/[^a-zA-Z0-9_-]/g, '_');
     const bucketName = `${projName}-media-prod`.toLowerCase().replace(/[^a-z0-9_-]/g, '-');
 
+    const s = spinner();
+    s.start('Provisioning workspace...');
+
     if (!isCurrentDir) {
-        console.log(`\n📁 Creating workspace folder at ./${projName}...`);
         mkdirSync(rootDir, { recursive: true });
-    } else {
-        console.log(`\n📁 Initializing workspace in current directory (${rootDir})...`);
     }
 
     writeFileSync(
@@ -173,40 +215,35 @@ async function createFullWorkspace() {
         `node_modules/\n.env\n.DS_Store\nkama-worker/.dev.vars\nkama-worker/.env\nkama-worker/.wrangler/\nkama-worker/public/\nkama-worker/*.db\nsites/*/.env\nsites/*/.astro/\nsites/*/dist/\nkama-worker/bundled-definitions.js\n`
     );
 
-    console.log(`\n📄 Copying default content definitions...`);
     const sourceDefsDir = join(__dirname, '../content/definitions');
     const targetDefsDir = join(rootDir, 'content', 'definitions');
     if (existsSync(sourceDefsDir)) {
         cpSync(sourceDefsDir, targetDefsDir, { recursive: true });
-    } else {
-        console.warn(`⚠️ Could not find default content definitions at ${sourceDefsDir}`);
     }
 
     let d1DatabaseId = '00000000-0000-0000-0000-000000000000';
     let isAuthenticated = false;
 
     if (isCloudflare) {
-        console.log(`\n🔑 Checking Cloudflare authentication...`);
+        s.message('Checking Cloudflare authentication...');
         try {
-            // Pass stdio: 'ignore' so child process doesn't drain parent stdin stream!
             execSync('npx wrangler whoami', { stdio: 'ignore' });
             isAuthenticated = true;
-            console.log(`✅ Logged in to Cloudflare.`);
         } catch (error) {
-            console.log(`⚠️ You are not logged in to Cloudflare.`);
-            console.log(`🌐 Launching browser for Cloudflare login...`);
+            s.stop('Not authenticated with Cloudflare.', true);
+            console.log(pc.dim('Launching browser for Cloudflare login...'));
             try {
-                execSync('npx wrangler login', { stdio: 'ignore' });
+                execSync('npx wrangler login', { stdio: 'inherit' });
                 isAuthenticated = true;
-                console.log(`✅ Successfully logged in!`);
             } catch (loginError) {
-                console.log(`❌ Login failed or was cancelled.`);
+                // Ignore
             }
+            s.start('Resuming provisioning...');
         }
 
         if (isAuthenticated) {
             try {
-                console.log(`\n🗄️ Checking existing Cloudflare D1 databases...`);
+                s.message('Checking existing Cloudflare D1 databases...');
                 const listOutput = execSync(`npx wrangler d1 list --json`, { encoding: 'utf-8', stdio: ['ignore', 'pipe', 'pipe'] });
                 const jsonStart = listOutput.indexOf('[');
                 const jsonEnd = listOutput.lastIndexOf(']') + 1;
@@ -219,44 +256,44 @@ async function createFullWorkspace() {
                 const existingDb = databases.find(db => db.name === dbName);
 
                 if (existingDb) {
-                    console.log(`⚠️ Database '${dbName}' already exists on your account.`);
-                    const useExisting = await rl.question(`Do you want to link this existing database? (y/n) [y]: `);
+                    s.stop(`Database '${dbName}' already exists on your account.`);
+                    const useExisting = handleCancel(await confirm({
+                        message: 'Do you want to link this existing database?',
+                        initialValue: true
+                    }));
 
-                    if (useExisting.toLowerCase() !== 'n') {
+                    if (useExisting) {
                         d1DatabaseId = existingDb.uuid;
-                        console.log(`✅ Linked existing database ID: ${d1DatabaseId}`);
+                        s.start(`Linked existing database ID: ${d1DatabaseId}`);
                     } else {
-                        dbName = (await rl.question(`Enter a new database name: `)).trim();
-                        console.log(`\n🗄️ Creating new database '${dbName}'...`);
+                        dbName = handleCancel(await text({
+                            message: 'Enter a new database name:'
+                        }));
+                        s.start(`Creating new database '${dbName}'...`);
                         const d1Output = execSync(`npx wrangler d1 create ${dbName}`, { encoding: 'utf-8', stdio: ['ignore', 'pipe', 'pipe'] });
                         const match = d1Output.match(/[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}/);
                         if (match) {
                             d1DatabaseId = match[0];
-                            console.log(`✅ Success! Database ID bound: ${d1DatabaseId}`);
                         }
                     }
                 } else {
-                    console.log(`\n🗄️ Attempting to auto-create Cloudflare D1 Database '${dbName}'...`);
+                    s.message(`Attempting to auto-create Cloudflare D1 Database '${dbName}'...`);
                     const d1Output = execSync(`npx wrangler d1 create ${dbName}`, { encoding: 'utf-8', stdio: ['ignore', 'pipe', 'pipe'] });
                     const match = d1Output.match(/[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}/);
                     if (match) {
                         d1DatabaseId = match[0];
-                        console.log(`✅ Success! Database ID bound: ${d1DatabaseId}`);
                     }
                 }
             } catch (error) {
-                console.log(`⚠️ Database operation failed. We'll leave a placeholder.`);
+                // Placeholder
             }
-        } else {
-            console.log(`⚠️ Skipping database creation. We'll leave a placeholder in wrangler.json.`);
         }
-    } else {
-        console.log(`\n💻 Local VPS mode selected. Skipping Cloudflare authentication and domain setup...`);
     }
 
+    s.message('Writing configuration files...');
+
     const rootScripts = {
-        'dev:cms': 'npm run dev -w kama-worker',
-        'deploy:cms': 'npm run deploy -w kama-worker',
+        'setup': 'npm run setup:local -w kama-worker',
     };
 
     const rootPkg = {
@@ -279,16 +316,17 @@ async function createFullWorkspace() {
         rootPkg.devDependencies['concurrently'] = '^9.0.0';
         rootPkg.scripts['dev:site'] = `npm run dev -w sites/${siteFolderName}`;
         rootPkg.scripts['predev'] = 'npx kama bundle';
-        rootPkg.scripts['dev'] = 'npx concurrently "npm run dev:cms" "npm run dev:site"';
+        rootPkg.scripts['dev'] = 'npx concurrently "npm run dev -w kama-worker" "npm run dev -w sites/' + siteFolderName + '"';
         rootPkg.scripts['deploy:site'] = `npm run deploy -w sites/${siteFolderName}`;
+        rootPkg.scripts['deploy:cms'] = `npm run deploy -w kama-worker`;
     } else {
         rootPkg.scripts['predev'] = 'npx kama bundle';
-        rootPkg.scripts['dev'] = 'npm run dev:cms';
+        rootPkg.scripts['dev'] = 'npm run dev -w kama-worker';
+        rootPkg.scripts['deploy:cms'] = `npm run deploy -w kama-worker`;
     }
 
     writeFileSync(join(rootDir, 'package.json'), JSON.stringify(rootPkg, null, 2));
 
-    console.log(`\n☁️ Configuring CMS Worker '${workerName}' (${cmsDomain || 'localhost:8787'})...`);
     const cmsDir = join(rootDir, 'kama-worker');
     mkdirSync(cmsDir, { recursive: true });
 
@@ -310,12 +348,10 @@ async function createFullWorkspace() {
                 type: 'module',
                 version: '1.0.0',
                 scripts: {
-                    "schema:local": `wrangler d1 execute ${dbName} --local --file=../node_modules/@brightsideoy/kama/schema.sql > /dev/null 2>&1`,
-                    "schema:remote": `wrangler d1 execute ${dbName} --remote --file=../node_modules/@brightsideoy/kama/schema.sql`,
-                    "seed:local": `wrangler d1 execute ${dbName} --local --file=seed.sql > /dev/null 2>&1`,
-                    "seed:remote": `wrangler d1 execute ${dbName} --remote --file=seed.sql`,
-                    "dev": "npm run schema:local && npm run seed:local && wrangler dev --port 8787 --inspector-port 9239",
-                    "deploy": "npm run schema:remote && npm run seed:remote && wrangler deploy"
+                    "setup:local": `wrangler d1 execute ${dbName} --local --file=../node_modules/@brightsideoy/kama/schema.sql > /dev/null 2>&1 && wrangler d1 execute ${dbName} --local --file=seed.sql > /dev/null 2>&1`,
+                    "setup:remote": `wrangler d1 execute ${dbName} --remote --file=../node_modules/@brightsideoy/kama/schema.sql && wrangler d1 execute ${dbName} --remote --file=seed.sql`,
+                    "dev": "wrangler dev --port 8787 --inspector-port 9239",
+                    "deploy": "npm run setup:remote && wrangler deploy"
                 },
                 dependencies: {
                     '@brightsideoy/kama': currentKamaVersion,
@@ -350,13 +386,7 @@ async function createFullWorkspace() {
 
         writeFileSync(join(cmsDir, 'wrangler.json'), JSON.stringify(cmsWranglerConfig, null, 2));
 
-        writeFileSync(join(cmsDir, '.dev.vars'), `# Cloudflare Edge Cache Purging Secrets
-CLOUDFLARE_API_TOKEN=cfut_YOUR_CUSTOM_PURGE_TOKEN
-
-# Local Development Overrides
-CDN_DOMAIN=
-PUBLIC_FRONTEND_URL=http://localhost:4321
-`);
+        writeFileSync(join(cmsDir, '.dev.vars'), `# Cloudflare Edge Cache Purging Secrets\nCLOUDFLARE_API_TOKEN=cfut_YOUR_CUSTOM_PURGE_TOKEN\n\n# Local Development Overrides\nCDN_DOMAIN=\nPUBLIC_FRONTEND_URL=http://localhost:4321\n`);
     } else {
         const templateServerPath = join(__dirname, '../templates/kama-worker/server.js');
         if (existsSync(templateServerPath)) {
@@ -370,9 +400,8 @@ PUBLIC_FRONTEND_URL=http://localhost:4321
                 type: 'module',
                 version: '1.0.0',
                 scripts: {
-                    "schema:local": "sqlite3 kama.db < ../node_modules/@brightsideoy/kama/schema.sql",
-                    "seed:local": "sqlite3 kama.db < seed.sql",
-                    "dev": "npm run schema:local && npm run seed:local && tsx server.js",
+                    "setup:local": "sqlite3 kama.db < ../node_modules/@brightsideoy/kama/schema.sql && sqlite3 kama.db < seed.sql",
+                    "dev": "tsx server.js",
                     "start": "node server.js"
                 },
                 dependencies: {
@@ -391,29 +420,31 @@ PUBLIC_FRONTEND_URL=http://localhost:4321
         writeFileSync(join(cmsDir, '.env'), `PORT=8787\nKAMA_RUNTIME=node\nDB_PATH=./kama.db\nLOCAL_MEDIA_PATH=./public/media\nPUBLIC_CMS_URL=http://127.0.0.1:8787\nPUBLIC_API_URL=http://127.0.0.1:8787\nPUBLIC_FRONTEND_URL=http://127.0.0.1:4321\n`);
     }
 
-    await bundleWorkspaceSchemas(rootDir);
+    s.message('Bundling schemas...');
+    await bundleWorkspaceSchemas(rootDir, true);
 
     if (shouldCreateSite) {
+        s.message(`Scaffolding Astro site (${siteFolderName})...`);
         await generateAstroSite(rootDir, siteFolderName, siteDomain, cmsFullUrl, workerName, isCloudflare);
-    } else {
-        console.log(`\nℹ️ Skipping Astro site creation. You can add a site later by running 'npx kama add site' inside this workspace.`);
     }
 
-    console.log(`\n✨ Workspace ready! Next steps:`);
-    if (!isCurrentDir) console.log(`  1. cd ${projName}`);
-    console.log(`  2. npm install`);
+    s.stop('Workspace provisioned successfully.');
+
+    let nextSteps = '';
+    let stepCount = 1;
+    if (!isCurrentDir) nextSteps += `${stepCount++}. cd ${projName}\n`;
+    nextSteps += `${stepCount++}. npm install\n`;
+    nextSteps += `${stepCount++}. npm run setup  ${pc.dim('<- Run this once to init the database!')}\n`;
+    nextSteps += `${stepCount++}. npm run dev\n`;
 
     if (isCloudflare) {
-        if (d1DatabaseId === '00000000-0000-0000-0000-000000000000') {
-            console.log(`  3. Run 'npx wrangler login' and create a D1 database manually.`);
-        }
-        console.log(`  4. Update CLOUDFLARE_ZONE_ID in kama-worker/wrangler.json`);
-        console.log(`  5. Securely store your purge token: cd kama-worker && npx wrangler secret put CLOUDFLARE_API_TOKEN`);
-        console.log(`  6. Run 'npm run dev' from the workspace root to start everything.`);
-    } else {
-        console.log(`  3. Run 'npm run dev' from the workspace root to start the local backend and frontend.`);
-        console.log(`\n💡 Note: You can deploy to Cloudflare later by running 'npx kama promote'.`);
+        nextSteps += `\n${pc.dim('Cloudflare Note:')}\n`;
+        nextSteps += `${pc.dim('Update CLOUDFLARE_ZONE_ID in wrangler.json')}\n`;
+        nextSteps += `${pc.dim('Set API token: npx wrangler secret put CLOUDFLARE_API_TOKEN')}`;
     }
+
+    note(nextSteps, 'Next steps');
+    outro(`KAMA • ENGINE is ready! 🚀`);
 }
 
 /**
@@ -423,8 +454,8 @@ async function createNewSiteOnly() {
     const rootDir = process.cwd();
 
     if (!existsSync(join(rootDir, 'package.json'))) {
-        console.error('❌ Error: Must run this command inside the root of your workspace.');
-        return;
+        cancel('Error: Must run this command inside the root of your workspace.');
+        process.exit(1);
     }
 
     let targetWorkerName = 'kama-worker';
@@ -440,45 +471,64 @@ async function createNewSiteOnly() {
         } catch (e) { }
     }
 
-    console.log('\n🌍 Deployment Mode:');
-    console.log('  1) VPS / Local Server (Node.js)');
-    console.log('  2) Cloudflare Edge');
-    const envChoice = await rl.question('\nChoice [1/2]: ');
-    const isCloudflare = envChoice.trim() === '2';
+    const isCloudflare = handleCancel(await select({
+        message: 'Deployment Architecture for this site:',
+        options: [
+            { value: true, label: 'Cloudflare Edge' },
+            { value: false, label: 'VPS / Local Server' }
+        ]
+    }));
+
+    const siteFolder = handleCancel(await text({
+        message: 'Astro package/folder name (e.g., my-new-site):',
+        placeholder: 'kama-starter',
+        defaultValue: 'kama-starter'
+    }));
 
-    const siteFolder = (await rl.question('Astro package/folder name (e.g., my-new-site) [kama-starter]: ')).trim() || 'kama-starter';
     let siteDomain = 'localhost:4321';
     let cmsFullUrl = 'http://localhost:8787';
 
     if (isCloudflare) {
-        siteDomain = (await rl.question('Website Domain (e.g., brand.com): ')).trim();
+        siteDomain = handleCancel(await text({
+            message: 'Website Domain (e.g., brand.com):',
+            defaultValue: ''
+        }));
         if (detectedCmsDomain) {
             cmsFullUrl = detectedCmsDomain.startsWith('http') ? detectedCmsDomain : `https://${detectedCmsDomain.replace(/^https?:\/\//, '')}`;
         } else {
-            const cmsDomainInput = (await rl.question('CMS API Domain (e.g., admin.brand.com): ')).trim();
+            const cmsDomainInput = handleCancel(await text({
+                message: 'CMS API Domain (e.g., admin.brand.com):',
+                defaultValue: ''
+            }));
             cmsFullUrl = `https://${cmsDomainInput.replace(/^https?:\/\//, '')}`;
         }
     }
 
+    const s = spinner();
+    s.start(`Generating Astro site...`);
     await generateAstroSite(rootDir, siteFolder, siteDomain, cmsFullUrl, targetWorkerName, isCloudflare);
+    s.stop(`Site created in sites/${siteFolder}!`);
 
-    console.log(`\n✨ Site created in sites/${siteFolder}!`);
-    console.log(`📦 Run 'npm install' at workspace root.`);
+    note(`1. npm install\n2. npm run setup  ${pc.dim('<- Re-run to register the new site seed data')}`, 'Next steps');
+    outro('Site added successfully! 🚀');
 }
 
 /**
  * COMMAND: npx kama bundle
  */
-async function bundleWorkspaceSchemas(targetRootDir) {
+async function bundleWorkspaceSchemas(targetRootDir, silent = false) {
     let rootDir = targetRootDir || process.cwd();
     if (basename(rootDir) === 'kama-worker') rootDir = resolve(rootDir, '..');
 
+    const s = spinner();
+    if (!silent) s.start('Bundling schemas...');
     try {
         let compilerPath = join(__dirname, '../dist/schema-compiler.js');
         if (!existsSync(compilerPath)) compilerPath = join(__dirname, '../scripts/schema-compiler.ts');
         await import(pathToFileURL(compilerPath).href);
+        if (!silent) s.stop('Schemas bundled successfully.');
     } catch (e) {
-        console.error(`❌ Schema compilation failed:`, e.message || e);
+        if (!silent) s.stop(`Schema compilation failed: ${e.message}`, true);
     }
 }
 
@@ -491,22 +541,27 @@ async function promoteLocalToCloudflare() {
     const rootPkgPath = join(rootDir, 'package.json');
 
     if (!existsSync(workerDir) || !existsSync(rootPkgPath)) {
-        console.error('❌ Error: Could not find kama-worker folder or package.json. Run this command inside your workspace root.');
-        return;
+        cancel('Error: Could not find kama-worker folder or package.json. Run this command inside your workspace root.');
+        process.exit(1);
     }
 
-    console.log('\n🌐 --- UPGRADING WORKSPACE TO CLOUDFLARE EDGE --- 🌐\n');
+    const s = spinner();
+    s.start('Checking Cloudflare authentication...');
 
     try {
         execSync('npx wrangler whoami', { stdio: 'ignore' });
-        console.log('✅ Logged in to Cloudflare.');
+        s.stop('Logged in to Cloudflare.');
     } catch (e) {
-        console.log('🌐 Launching browser for Cloudflare login...');
+        s.stop('Not logged in to Cloudflare.', true);
+        console.log(pc.dim('Launching browser for Cloudflare login...'));
         try { execSync('npx wrangler login', { stdio: 'ignore' }); }
-        catch (loginError) { console.log('❌ Cloudflare login failed.'); return; }
+        catch (loginError) { cancel('Cloudflare login failed.'); process.exit(1); }
     }
 
-    const cmsDomain = (await rl.question('\nCMS Admin Domain (e.g., admin.yourdomain.com): ')).trim();
+    const cmsDomain = handleCancel(await text({
+        message: 'CMS Admin Domain (e.g., admin.yourdomain.com):',
+        defaultValue: ''
+    }));
 
     const sitesFolderDir = join(rootDir, 'sites');
     let siteDomain = '';
@@ -515,10 +570,15 @@ async function promoteLocalToCloudflare() {
         const sites = readdirSync(sitesFolderDir);
         if (sites.length > 0) {
             siteDir = join(sitesFolderDir, sites[0]);
-            siteDomain = (await rl.question('Frontend Website Domain (e.g., yourdomain.com): ')).trim();
+            siteDomain = handleCancel(await text({
+                message: `Frontend Website Domain for ${sites[0]} (e.g., yourdomain.com):`,
+                defaultValue: ''
+            }));
         }
     }
 
+    s.start('Upgrading workspace to Cloudflare Edge...');
+
     const projName = basename(rootDir);
     let dbName = `${projName}-db`.replace(/[^a-zA-Z0-9_-]/g, '_');
     let d1DatabaseId = '00000000-0000-0000-0000-000000000000';
@@ -576,10 +636,10 @@ async function promoteLocalToCloudflare() {
     const workerPkgPath = join(workerDir, 'package.json');
     if (existsSync(workerPkgPath)) {
         const workerPkg = JSON.parse(readFileSync(workerPkgPath, 'utf-8'));
-        workerPkg.scripts.dev = "npm run schema:local && npm run seed:local && wrangler dev --port 8787 --inspector-port 9239";
-        workerPkg.scripts.deploy = "npm run schema:remote && npm run seed:remote && wrangler deploy";
-        workerPkg.scripts["schema:remote"] = `wrangler d1 execute ${dbName} --remote --file=../node_modules/@brightsideoy/kama/schema.sql`;
-        workerPkg.scripts["seed:remote"] = `wrangler d1 execute ${dbName} --remote --file=seed.sql`;
+        workerPkg.scripts.dev = "wrangler dev --port 8787 --inspector-port 9239";
+        workerPkg.scripts.deploy = "npm run setup:remote && wrangler deploy";
+        workerPkg.scripts["setup:local"] = `wrangler d1 execute ${dbName} --local --file=../node_modules/@brightsideoy/kama/schema.sql && wrangler d1 execute ${dbName} --local --file=seed.sql`;
+        workerPkg.scripts["setup:remote"] = `wrangler d1 execute ${dbName} --remote --file=../node_modules/@brightsideoy/kama/schema.sql && wrangler d1 execute ${dbName} --remote --file=seed.sql`;
         workerPkg.devDependencies = workerPkg.devDependencies || {};
         workerPkg.devDependencies.wrangler = WRANGLER_LATEST;
         writeFileSync(workerPkgPath, JSON.stringify(workerPkg, null, 2));
@@ -639,20 +699,18 @@ async function promoteLocalToCloudflare() {
         }
     }
 
-    console.log(`\n✅ Workspace successfully upgraded to Cloudflare Edge!`);
+    s.stop('Workspace successfully upgraded to Cloudflare Edge!');
+    outro('Promotion complete. 🚀');
 }
 
 /**
  * Helper: Copies the Astro starter template and hydrates runtime tokens
  */
 async function generateAstroSite(rootDir, siteFolder, siteDomain, cmsFullUrl, workerName = 'kama-worker', isCloudflare = false) {
-    console.log(`\n🚀 Scaffolding Astro site (${siteFolder}) mapped to ${siteDomain} (Service: ${workerName})...`);
-
     const siteDir = join(rootDir, 'sites', siteFolder);
     const templateDir = join(__dirname, '../templates/astro-starter');
 
     if (!existsSync(templateDir)) {
-        console.error(`❌ Error: Astro template not found at ${templateDir}`);
         return;
     }
 
@@ -698,6 +756,7 @@ async function generateAstroSite(rootDir, siteFolder, siteDomain, cmsFullUrl, wo
     const siteLabel = siteFolder.split(/[-_]/).map(word => word.charAt(0).toUpperCase() + word.slice(1)).join(' ');
     const safeSiteLabel = siteLabel.replace(/'/g, "''");
     const channelKey = siteFolder.replace(/[^a-z0-9_-]/gi, '-').toLowerCase();
+    const homeSlug = `welcome-to-${channelKey}`;
     const treeKey = 'main-tree';
     const safeWorkerName = `${siteFolder.toLowerCase().replace(/[^a-z0-9-]/g, '-')}-site`;
 
@@ -723,27 +782,86 @@ async function generateAstroSite(rootDir, siteFolder, siteDomain, cmsFullUrl, wo
             assets: { directory: "./dist/client", binding: "ASSETS", run_worker_first: true },
             kv_namespaces: [{ binding: "SESSION", id: sessionId }, { binding: "HTML_CACHE", id: htmlCacheId }],
             services: [{ binding: "CMS_WORKER", service: workerName }],
-            vars: { PUBLIC_CMS_URL: cmsFullUrl, PUBLIC_API_URL: cmsFullUrl, PUBLIC_CHANNEL_ID: channelKey, PUBLIC_TREE_ID: treeKey, PUBLIC_HOME_SLUG: "index", PUBLIC_SITE_NAME: siteLabel }
+            vars: { PUBLIC_CMS_URL: cmsFullUrl, PUBLIC_API_URL: cmsFullUrl, PUBLIC_CHANNEL_ID: channelKey, PUBLIC_TREE_ID: treeKey, PUBLIC_SITE_NAME: siteLabel }
         };
 
         if (siteDomain !== 'localhost:4321') siteConfig.routes = [{ pattern: siteDomain, custom_domain: true, enabled: true, previews_enabled: false }];
         writeFileSync(join(siteDir, 'wrangler.json'), JSON.stringify(siteConfig, null, 2));
     }
 
+    const siteUrl = (siteDomain === 'localhost:4321' || !isCloudflare) ? `http://${siteDomain}` : `https://${siteDomain}`;
+
     const seedSql = `
 -- Seed data for site: ${safeSiteLabel}
-INSERT OR IGNORE INTO channels (key, label, channelType, defaultLanguage, isHidden, dataJson) VALUES ('${channelKey}', '${safeSiteLabel}', 'website', '', 0, '{}');
-INSERT OR IGNORE INTO trees (key, label, treeType, channelId, isHidden, dataJson) VALUES ('${treeKey}', 'Main Tree', 'navigation', (SELECT id FROM channels WHERE key = '${channelKey}'), 0, '{}');
-INSERT OR IGNORE INTO channel_trees (channelId, treeId, key) VALUES ((SELECT id FROM channels WHERE key = '${channelKey}'), (SELECT id FROM trees WHERE key = '${treeKey}'), 'main');
-INSERT INTO content_nodes (contentType, title, slug, language, status, dataJson) SELECT 'page', 'Welcome to ${safeSiteLabel}', 'index', '', 'published', '{"titleSuffix":"– ${safeSiteLabel}","layoutId":"single-column","subpageLayoutId":"two-column","logoText":"${safeSiteLabel}"}' WHERE NOT EXISTS (SELECT 1 FROM content_nodes WHERE slug = 'index' AND title = 'Welcome to ${safeSiteLabel}');
-INSERT OR IGNORE INTO node_channels (nodeId, channelId) VALUES ((SELECT id FROM content_nodes WHERE slug = 'index' AND title = 'Welcome to ${safeSiteLabel}' ORDER BY id DESC LIMIT 1), (SELECT id FROM channels WHERE key = '${channelKey}'));
-INSERT OR IGNORE INTO tree_nodes (treeId, contentId, parentId, sortOrder) VALUES ((SELECT id FROM trees WHERE key = '${treeKey}'), (SELECT id FROM content_nodes WHERE slug = 'index' AND title = 'Welcome to ${safeSiteLabel}' ORDER BY id DESC LIMIT 1), NULL, 0);
+
+-- 1. Create content node
+INSERT INTO content_nodes (contentType, title, slug, language, status, hasUnpublishedChanges, disabledRegionsJson, dataJson, draftDataJson, publishedDataJson, publishedAt) 
+SELECT 'page', 'Welcome to ${safeSiteLabel}', '${homeSlug}', '', 'published', 0, '{}',
+    '{"titleSuffix":"– ${safeSiteLabel}","layoutId":"single-column","subpageLayoutId":"two-column","logoText":"${safeSiteLabel}","schemaType":"WebPage"}',
+    '{"titleSuffix":"– ${safeSiteLabel}","layoutId":"single-column","subpageLayoutId":"two-column","logoText":"${safeSiteLabel}","schemaType":"WebPage"}',
+    '{"titleSuffix":"– ${safeSiteLabel}","layoutId":"single-column","subpageLayoutId":"two-column","logoText":"${safeSiteLabel}","schemaType":"WebPage"}',
+    CURRENT_TIMESTAMP
+WHERE NOT EXISTS (SELECT 1 FROM content_nodes WHERE slug = '${homeSlug}' AND title = 'Welcome to ${safeSiteLabel}');
+
+-- 2. Create channel
+INSERT OR IGNORE INTO channels (key, label, channelType, baseUrl, defaultLanguage, isHidden, dataJson) 
+VALUES ('${channelKey}', '${safeSiteLabel}', 'website', '${siteUrl}', '', 0, '{}');
+
+-- 3. Link channelRoot in channel JSON
+UPDATE channels 
+SET dataJson = json_patch(
+    COALESCE(NULLIF(dataJson, ''), '{}'), 
+    json_object(
+      'channelRoot', json_object(
+        'href', '#node:' || (SELECT id FROM content_nodes WHERE slug = '${homeSlug}' AND title = 'Welcome to ${safeSiteLabel}' ORDER BY id DESC LIMIT 1),
+        'kind', 'node',
+        'target', '_self',
+        'label', 'Welcome to ${safeSiteLabel}',
+        'nodeId', (SELECT id FROM content_nodes WHERE slug = '${homeSlug}' AND title = 'Welcome to ${safeSiteLabel}' ORDER BY id DESC LIMIT 1)
+      )
+    )
+) 
+WHERE key = '${channelKey}';
+
+-- 4. Create Trees & Relations
+INSERT OR IGNORE INTO trees (key, label, treeType, channelId, isHidden, dataJson) 
+VALUES ('${treeKey}', 'Main Tree', 'navigation', (SELECT id FROM channels WHERE key = '${channelKey}'), 0, '{}');
+
+INSERT OR IGNORE INTO channel_trees (channelId, treeId, key) 
+VALUES ((SELECT id FROM channels WHERE key = '${channelKey}'), (SELECT id FROM trees WHERE key = '${treeKey}'), 'main');
+
+INSERT OR IGNORE INTO node_channels (nodeId, channelId) 
+VALUES ((SELECT id FROM content_nodes WHERE slug = '${homeSlug}' ORDER BY id DESC LIMIT 1), (SELECT id FROM channels WHERE key = '${channelKey}'));
+
+INSERT OR IGNORE INTO tree_nodes (treeId, contentId, parentId, sortOrder) 
+VALUES ((SELECT id FROM trees WHERE key = '${treeKey}'), (SELECT id FROM content_nodes WHERE slug = '${homeSlug}' ORDER BY id DESC LIMIT 1), NULL, 0);
+
+-- 5. Node Routing (TWO records: Canonical '/' and Redirect '/slug' -> '/')
+INSERT OR IGNORE INTO node_routes (path, channelId, nodeId, treeId, isCanonical, redirectUrl)
+VALUES (
+    '/',
+    (SELECT id FROM channels WHERE key = '${channelKey}'),
+    (SELECT id FROM content_nodes WHERE slug = '${homeSlug}' ORDER BY id DESC LIMIT 1),
+    (SELECT id FROM trees WHERE key = '${treeKey}'),
+    1,
+    NULL
+);
+
+INSERT OR IGNORE INTO node_routes (path, channelId, nodeId, treeId, isCanonical, redirectUrl)
+VALUES (
+    '/${homeSlug}',
+    (SELECT id FROM channels WHERE key = '${channelKey}'),
+    (SELECT id FROM content_nodes WHERE slug = '${homeSlug}' ORDER BY id DESC LIMIT 1),
+    NULL,
+    0,
+    '/'
+);
 `;
 
     const workerDir = join(rootDir, 'kama-worker');
     if (existsSync(workerDir)) appendFileSync(join(workerDir, 'seed.sql'), seedSql);
 
-    writeFileSync(join(siteDir, '.env'), `# Local Development Overrides\nPUBLIC_CMS_URL="http://127.0.0.1:8787"\nPUBLIC_API_URL="http://127.0.0.1:8787"\nPUBLIC_CHANNEL_ID="${channelKey}"\nPUBLIC_TREE_ID="${treeKey}"\nPUBLIC_HOME_SLUG="index"\nPUBLIC_SITE_NAME="${siteLabel.replace(/"/g, '\\"')}"\n`);
+    writeFileSync(join(siteDir, '.env'), `# Local Development Overrides\nPUBLIC_CMS_URL="http://127.0.0.1:8787"\nPUBLIC_API_URL="http://127.0.0.1:8787"\nPUBLIC_CHANNEL_ID="${channelKey}"\nPUBLIC_TREE_ID="${treeKey}"\nPUBLIC_SITE_NAME="${siteLabel.replace(/"/g, '\\"')}"\n`);
 }
 
 main().catch(console.error);