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

package/bin/cli.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import { execSync } from 'node:child_process';
-import { existsSync, mkdirSync, writeFileSync, readFileSync, readdirSync, cpSync, unlinkSync, appendFileSync } from 'node:fs';
+import { existsSync, mkdirSync, writeFileSync, readFileSync, readdirSync, cpSync, unlinkSync } from 'node:fs';
 import { join, dirname, basename, resolve } from 'node:path';
 import { fileURLToPath, pathToFileURL } from 'node:url';
 
@@ -48,28 +48,78 @@ try {
     console.warn("⚠️ Could not detect Kama version, defaulting to 'alpha'");
 }
 
+/**
+ * 🎯 BULLETPROOF WRANGLER EXECUTION RESOLVER
+ * Forces npx to load wrangler via explicit --package definition to prevent 
+ * subshell binary resolution crashes inside automated npx contexts.
+ */
+function getWranglerCmd() {
+    try {
+        execSync('wrangler --version', { stdio: 'ignore' });
+        return 'wrangler';
+    } catch (e) {
+        return 'npx --yes --package=wrangler wrangler';
+    }
+}
+
+/**
+ * 🎯 ROBUST WRANGLER RUNNER
+ * Inherits full process environment and executes safely across isolated subshells.
+ */
+function runWrangler(cmd, options = {}) {
+    const baseWrangler = getWranglerCmd();
+    try {
+        return execSync(`${baseWrangler} ${cmd}`, {
+            encoding: 'utf-8',
+            stdio: options.stdio || ['ignore', 'pipe', 'pipe'],
+            env: {
+                ...process.env,
+                PATH: process.env.PATH
+            }
+        });
+    } catch (e) {
+        if (options.throw) throw e;
+        return null;
+    }
+}
+
+/**
+ * 🎯 BULLETPROOF KV PROVISIONING ENGINE
+ */
+function getOrCreateKV(title) {
+    const out = runWrangler(`kv namespace create "${title}"`);
+    if (out) {
+        const match = out.match(/"id":\s*"([a-fA-F0-9]{32})"/);
+        if (match) return match[1];
+    }
+
+    const listOut = runWrangler(`kv namespace list`);
+    if (listOut) {
+        try {
+            const namespaces = JSON.parse(listOut);
+            const found = namespaces.find(n => n.title === title);
+            if (found) return found.id;
+        } catch (err) { }
+    }
+
+    return `REPLACE_WITH_${title}_ID`;
+}
+
 function showHelp() {
     console.log(`\n${pc.bgCyan(' KAMA • ENGINE CLI ')}\n`);
     console.log('Usage: npx kama <command> [options]\n');
-
     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(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 setup        Initialize database schema (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(pc.cyan('Examples:'));
-    console.log('  npx kama init');
-    console.log('  npx kama add site');
-    console.log('  npx kama bundle\n');
 }
 
 async function main() {
@@ -124,9 +174,6 @@ async function main() {
     }
 }
 
-/**
- * Helper to update astro.config.mjs for Cloudflare
- */
 function convertAstroConfigToCloudflare(siteDir) {
     const configPath = join(siteDir, 'astro.config.mjs');
     if (existsSync(configPath)) {
@@ -140,7 +187,6 @@ function convertAstroConfigToCloudflare(siteDir) {
 
 /**
  * COMMAND: npx kama init
- * Kickstart full Monorepo Workspace
  */
 async function createFullWorkspace() {
     const cwdName = basename(process.cwd());
@@ -206,9 +252,7 @@ async function createFullWorkspace() {
     const s = spinner();
     s.start('Provisioning workspace...');
 
-    if (!isCurrentDir) {
-        mkdirSync(rootDir, { recursive: true });
-    }
+    if (!isCurrentDir) mkdirSync(rootDir, { recursive: true });
 
     writeFileSync(
         join(rootDir, '.gitignore'),
@@ -217,100 +261,78 @@ async function createFullWorkspace() {
 
     const sourceDefsDir = join(__dirname, '../content/definitions');
     const targetDefsDir = join(rootDir, 'content', 'definitions');
-    if (existsSync(sourceDefsDir)) {
-        cpSync(sourceDefsDir, targetDefsDir, { recursive: true });
-    }
+    if (existsSync(sourceDefsDir)) cpSync(sourceDefsDir, targetDefsDir, { recursive: true });
 
     let d1DatabaseId = '00000000-0000-0000-0000-000000000000';
+    let backendCacheId = 'REPLACE_WITH_CACHE_KV_ID';
     let isAuthenticated = false;
 
     if (isCloudflare) {
         s.message('Checking Cloudflare authentication...');
-        try {
-            execSync('npx wrangler whoami', { stdio: 'ignore' });
+        const whoami = runWrangler('whoami');
+        if (whoami && (whoami.includes('Getting User Settings') || whoami.includes('You are logged in'))) {
             isAuthenticated = true;
-        } catch (error) {
+        } else {
             s.stop('Not authenticated with Cloudflare.', true);
             console.log(pc.dim('Launching browser for Cloudflare login...'));
-            try {
-                execSync('npx wrangler login', { stdio: 'inherit' });
-                isAuthenticated = true;
-            } catch (loginError) {
-                // Ignore
-            }
+            const login = runWrangler('login', { stdio: 'inherit' });
+            if (login !== null) isAuthenticated = true;
             s.start('Resuming provisioning...');
         }
 
         if (isAuthenticated) {
-            try {
-                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;
-                let databases = [];
-
-                if (jsonStart !== -1 && jsonEnd !== -1) {
-                    databases = JSON.parse(listOutput.substring(jsonStart, jsonEnd));
-                }
-
-                const existingDb = databases.find(db => db.name === dbName);
-
-                if (existingDb) {
-                    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) {
-                        d1DatabaseId = existingDb.uuid;
-                        s.start(`Linked existing database ID: ${d1DatabaseId}`);
-                    } else {
-                        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];
+            s.message('Provisioning backend KV Cache...');
+            backendCacheId = getOrCreateKV(`CACHE_KV_${workerName.toUpperCase().replace(/-/g, '_')}`);
+
+            s.message('Checking existing Cloudflare D1 databases...');
+            const listOutput = runWrangler('d1 list --json');
+            if (listOutput) {
+                try {
+                    const jsonStart = listOutput.indexOf('[');
+                    const jsonEnd = listOutput.lastIndexOf(']') + 1;
+                    let databases = [];
+
+                    if (jsonStart !== -1 && jsonEnd !== -1) databases = JSON.parse(listOutput.substring(jsonStart, jsonEnd));
+                    const existingDb = databases.find(db => db.name === dbName);
+
+                    if (existingDb) {
+                        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) {
+                            d1DatabaseId = existingDb.uuid;
+                            s.start(`Linked existing database ID: ${d1DatabaseId}`);
+                        } else {
+                            dbName = handleCancel(await text({ message: 'Enter a new database name:' }));
+                            s.start(`Creating new database '${dbName}'...`);
+                            const d1Output = runWrangler(`d1 create ${dbName}`);
+                            const match = d1Output ? 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}/) : null;
+                            if (match) d1DatabaseId = match[0];
                         }
+                    } else {
+                        s.message(`Attempting to auto-create Cloudflare D1 Database '${dbName}'...`);
+                        const d1Output = runWrangler(`d1 create ${dbName}`);
+                        const match = d1Output ? 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}/) : null;
+                        if (match) d1DatabaseId = match[0];
                     }
-                } else {
-                    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];
-                    }
-                }
-            } catch (error) {
-                // Placeholder
+                } catch (error) { }
             }
         }
     }
 
     s.message('Writing configuration files...');
 
-    const rootScripts = {
-        'setup': 'npm run setup:local -w kama-worker',
-    };
-
     const rootPkg = {
         name: projName,
         private: true,
         type: 'module',
         workspaces: ['kama-worker', 'sites/*'],
-        scripts: rootScripts,
-        dependencies: {
-            '@brightsideoy/kama': currentKamaVersion,
-        },
+        scripts: { 'setup': 'npm run setup:local -w kama-worker' },
+        dependencies: { '@brightsideoy/kama': currentKamaVersion },
         devDependencies: {}
     };
 
-    if (isCloudflare) {
-        rootPkg.devDependencies['wrangler'] = WRANGLER_LATEST;
-    }
+    if (isCloudflare) rootPkg.devDependencies['wrangler'] = WRANGLER_LATEST;
 
     if (shouldCreateSite) {
         rootPkg.devDependencies['concurrently'] = '^9.0.0';
@@ -330,16 +352,12 @@ async function createFullWorkspace() {
     const cmsDir = join(rootDir, 'kama-worker');
     mkdirSync(cmsDir, { recursive: true });
 
-    writeFileSync(join(cmsDir, 'seed.sql'), '-- Kama Auto-Generated Seed File\nSELECT 1;\n');
-
     const emptyDefs = `{ nodes: {}, trees: {}, blocks: {}, nodeLayouts: {}, blockLayouts: {}, channels: {} }`;
     writeFileSync(join(cmsDir, 'bundled-definitions.js'), `const defs = ${emptyDefs};\nexport const BUNDLED_DEFINITIONS = defs;\nexport default defs;\n`);
 
     if (isCloudflare) {
         const templateIndexPath = join(__dirname, '../templates/kama-worker/index.js');
-        if (existsSync(templateIndexPath)) {
-            cpSync(templateIndexPath, join(cmsDir, 'index.js'));
-        }
+        if (existsSync(templateIndexPath)) cpSync(templateIndexPath, join(cmsDir, 'index.js'));
 
         writeFileSync(
             join(cmsDir, 'package.json'),
@@ -348,18 +366,13 @@ async function createFullWorkspace() {
                 type: 'module',
                 version: '1.0.0',
                 scripts: {
-                    "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`,
+                    "setup:local": `wrangler d1 execute ${dbName} --local --file=../node_modules/@brightsideoy/kama/schema.sql > /dev/null 2>&1`,
+                    "setup:remote": `wrangler d1 execute ${dbName} --remote --file=../node_modules/@brightsideoy/kama/schema.sql`,
                     "dev": "wrangler dev --port 8787 --inspector-port 9239",
                     "deploy": "npm run setup:remote && wrangler deploy"
                 },
-                dependencies: {
-                    '@brightsideoy/kama': currentKamaVersion,
-                    '@libsql/client': '^0.14.0'
-                },
-                devDependencies: {
-                    "wrangler": WRANGLER_LATEST
-                },
+                dependencies: { '@brightsideoy/kama': currentKamaVersion, '@libsql/client': '^0.14.0' },
+                devDependencies: { "wrangler": WRANGLER_LATEST },
             }, null, 2)
         );
 
@@ -370,9 +383,9 @@ async function createFullWorkspace() {
             compatibility_date: '2024-09-23',
             compatibility_flags: ['nodejs_compat'],
             dev: { host: 'localhost', port: 8787 },
-            cache: { enabled: true },
             assets: { directory: '../node_modules/@brightsideoy/kama/dist', binding: 'ASSETS' },
             images: { binding: 'IMAGES' },
+            kv_namespaces: [{ binding: 'CACHE_KV', id: backendCacheId }],
             vars: {
                 CDN_DOMAIN: cmsDomain || 'localhost:8787',
                 PUBLIC_FRONTEND_URL: (shouldCreateSite) ? (siteDomain && siteDomain !== 'localhost:4321' ? `https://${siteDomain}` : 'http://localhost:4321') : 'http://localhost:4321',
@@ -385,13 +398,10 @@ async function createFullWorkspace() {
         };
 
         writeFileSync(join(cmsDir, 'wrangler.json'), JSON.stringify(cmsWranglerConfig, null, 2));
-
         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)) {
-            cpSync(templateServerPath, join(cmsDir, 'server.js'));
-        }
+        if (existsSync(templateServerPath)) cpSync(templateServerPath, join(cmsDir, 'server.js'));
 
         writeFileSync(
             join(cmsDir, 'package.json'),
@@ -400,20 +410,12 @@ async function createFullWorkspace() {
                 type: 'module',
                 version: '1.0.0',
                 scripts: {
-                    "setup:local": "sqlite3 kama.db < ../node_modules/@brightsideoy/kama/schema.sql && sqlite3 kama.db < seed.sql",
+                    "setup:local": "sqlite3 kama.db < ../node_modules/@brightsideoy/kama/schema.sql",
                     "dev": "tsx server.js",
                     "start": "node server.js"
                 },
-                dependencies: {
-                    '@brightsideoy/kama': currentKamaVersion,
-                    '@hono/node-server': '^1.13.0',
-                    '@libsql/client': '^0.14.0',
-                    'sharp': '^0.33.5',
-                    'dotenv': '^16.4.5'
-                },
-                devDependencies: {
-                    "tsx": "^4.19.0"
-                },
+                dependencies: { '@brightsideoy/kama': currentKamaVersion, '@hono/node-server': '^1.13.0', '@libsql/client': '^0.14.0', 'sharp': '^0.33.5', 'dotenv': '^16.4.5' },
+                devDependencies: { "tsx": "^4.19.0" },
             }, null, 2)
         );
 
@@ -434,7 +436,7 @@ async function createFullWorkspace() {
     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 setup  ${pc.dim('<- Run this once to init the database schema!')}\n`;
     nextSteps += `${stepCount++}. npm run dev\n`;
 
     if (isCloudflare) {
@@ -489,17 +491,11 @@ async function createNewSiteOnly() {
     let cmsFullUrl = 'http://localhost:8787';
 
     if (isCloudflare) {
-        siteDomain = handleCancel(await text({
-            message: 'Website Domain (e.g., brand.com):',
-            defaultValue: ''
-        }));
+        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 = handleCancel(await text({
-                message: 'CMS API Domain (e.g., admin.brand.com):',
-                defaultValue: ''
-            }));
+            const cmsDomainInput = handleCancel(await text({ message: 'CMS API Domain (e.g., admin.brand.com):', defaultValue: '' }));
             cmsFullUrl = `https://${cmsDomainInput.replace(/^https?:\/\//, '')}`;
         }
     }
@@ -509,7 +505,7 @@ async function createNewSiteOnly() {
     await generateAstroSite(rootDir, siteFolder, siteDomain, cmsFullUrl, targetWorkerName, isCloudflare);
     s.stop(`Site created in sites/${siteFolder}!`);
 
-    note(`1. npm install\n2. npm run setup  ${pc.dim('<- Re-run to register the new site seed data')}`, 'Next steps');
+    note(`1. npm install\n2. npm run dev`, 'Next steps');
     outro('Site added successfully! 🚀');
 }
 
@@ -541,27 +537,27 @@ async function promoteLocalToCloudflare() {
     const rootPkgPath = join(rootDir, 'package.json');
 
     if (!existsSync(workerDir) || !existsSync(rootPkgPath)) {
-        cancel('Error: Could not find kama-worker folder or package.json. Run this command inside your workspace root.');
+        cancel('Error: Could not find kama-worker folder or package.json.');
         process.exit(1);
     }
 
     const s = spinner();
     s.start('Checking Cloudflare authentication...');
 
-    try {
-        execSync('npx wrangler whoami', { stdio: 'ignore' });
+    const whoami = runWrangler('whoami');
+    if (whoami && (whoami.includes('Getting User Settings') || whoami.includes('You are logged in'))) {
         s.stop('Logged in to Cloudflare.');
-    } catch (e) {
+    } else {
         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) { cancel('Cloudflare login failed.'); process.exit(1); }
+        const login = runWrangler('login', { stdio: 'inherit' });
+        if (login === null) {
+            cancel('Cloudflare login failed.');
+            process.exit(1);
+        }
     }
 
-    const cmsDomain = handleCancel(await text({
-        message: 'CMS Admin Domain (e.g., admin.yourdomain.com):',
-        defaultValue: ''
-    }));
+    const cmsDomain = handleCancel(await text({ message: 'CMS Admin Domain (e.g., admin.yourdomain.com):', defaultValue: '' }));
 
     const sitesFolderDir = join(rootDir, 'sites');
     let siteDomain = '';
@@ -570,10 +566,7 @@ async function promoteLocalToCloudflare() {
         const sites = readdirSync(sitesFolderDir);
         if (sites.length > 0) {
             siteDir = join(sitesFolderDir, sites[0]);
-            siteDomain = handleCancel(await text({
-                message: `Frontend Website Domain for ${sites[0]} (e.g., yourdomain.com):`,
-                defaultValue: ''
-            }));
+            siteDomain = handleCancel(await text({ message: `Frontend Website Domain for ${sites[0]}:`, defaultValue: '' }));
         }
     }
 
@@ -583,41 +576,41 @@ async function promoteLocalToCloudflare() {
     let dbName = `${projName}-db`.replace(/[^a-zA-Z0-9_-]/g, '_');
     let d1DatabaseId = '00000000-0000-0000-0000-000000000000';
 
-    try {
-        const d1Output = execSync(`npx wrangler d1 create ${dbName}`, { encoding: 'utf-8', stdio: ['ignore', 'pipe', 'pipe'] });
+    const d1Output = runWrangler(`d1 create ${dbName}`);
+    if (d1Output) {
         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];
-    } catch (err) { }
+    }
+
+    const workerName = `${projName}-worker`.toLowerCase().replace(/[^a-z0-9_-]/g, '-');
+    const bucketName = `${projName}-media-prod`.toLowerCase().replace(/[^a-z0-9_-]/g, '-');
+
+    const backendCacheId = getOrCreateKV(`CACHE_KV_${workerName.toUpperCase().replace(/-/g, '_')}`);
 
     const rootPkg = JSON.parse(readFileSync(rootPkgPath, 'utf-8'));
     rootPkg.devDependencies = rootPkg.devDependencies || {};
     rootPkg.devDependencies['wrangler'] = WRANGLER_LATEST;
     writeFileSync(rootPkgPath, JSON.stringify(rootPkg, null, 2));
 
-    const workerName = `${projName}-worker`.toLowerCase().replace(/[^a-z0-9_-]/g, '-');
-    const bucketName = `${projName}-media-prod`.toLowerCase().replace(/[^a-z0-9_-]/g, '-');
     const workerWranglerPath = join(workerDir, 'wrangler.json');
-
-    let currentConfig = existsSync(workerWranglerPath)
-        ? JSON.parse(readFileSync(workerWranglerPath, 'utf-8'))
-        : {
-            $schema: '../node_modules/wrangler/config-schema.json',
-            name: workerName,
-            main: 'index.js',
-            compatibility_date: '2024-09-23',
-            compatibility_flags: ['nodejs_compat'],
-            assets: { directory: '../node_modules/@brightsideoy/kama/dist', binding: 'ASSETS' },
-            images: { binding: 'IMAGES' },
-            vars: { CLOUDFLARE_ZONE_ID: "REPLACE_WITH_YOUR_32_CHAR_ZONE_ID", KAMA_RUNTIME: 'cloudflare' }
-        };
+    let currentConfig = existsSync(workerWranglerPath) ? JSON.parse(readFileSync(workerWranglerPath, 'utf-8')) : {
+        $schema: '../node_modules/wrangler/config-schema.json',
+        name: workerName,
+        main: 'index.js',
+        compatibility_date: '2024-09-23',
+        compatibility_flags: ['nodejs_compat'],
+        assets: { directory: '../node_modules/@brightsideoy/kama/dist', binding: 'ASSETS' },
+        images: { binding: 'IMAGES' },
+        vars: { CLOUDFLARE_ZONE_ID: "REPLACE_WITH_YOUR_32_CHAR_ZONE_ID", KAMA_RUNTIME: 'cloudflare' }
+    };
 
     currentConfig.dev = currentConfig.dev || { host: 'localhost', port: 8787 };
-    currentConfig.cache = { enabled: true };
     currentConfig.vars.CDN_DOMAIN = cmsDomain;
     if (siteDomain) currentConfig.vars.PUBLIC_FRONTEND_URL = `https://${siteDomain}`;
     currentConfig.routes = [{ pattern: cmsDomain, custom_domain: true }];
     currentConfig.d1_databases = [{ binding: 'DB', database_name: dbName, database_id: d1DatabaseId }];
     currentConfig.r2_buckets = [{ binding: 'MEDIA_BUCKET', bucket_name: bucketName }];
+    currentConfig.kv_namespaces = [{ binding: 'CACHE_KV', id: backendCacheId }];
 
     writeFileSync(workerWranglerPath, JSON.stringify(currentConfig, null, 2));
 
@@ -625,37 +618,22 @@ async function promoteLocalToCloudflare() {
         writeFileSync(join(workerDir, '.dev.vars'), `CLOUDFLARE_API_TOKEN=cfut_YOUR_CUSTOM_PURGE_TOKEN\nCDN_DOMAIN=\nPUBLIC_FRONTEND_URL=http://localhost:4321\n`);
     }
 
-    const workerIndexPath = join(workerDir, 'index.js');
-    if (!existsSync(workerIndexPath)) {
-        const templateIndexPath = join(__dirname, '../templates/kama-worker/index.js');
-        if (existsSync(templateIndexPath)) {
-            cpSync(templateIndexPath, workerIndexPath);
-        }
-    }
-
     const workerPkgPath = join(workerDir, 'package.json');
     if (existsSync(workerPkgPath)) {
         const workerPkg = JSON.parse(readFileSync(workerPkgPath, 'utf-8'));
         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.scripts["setup:local"] = `wrangler d1 execute ${dbName} --local --file=../node_modules/@brightsideoy/kama/schema.sql`;
+        workerPkg.scripts["setup:remote"] = `wrangler d1 execute ${dbName} --remote --file=../node_modules/@brightsideoy/kama/schema.sql`;
         workerPkg.devDependencies = workerPkg.devDependencies || {};
         workerPkg.devDependencies.wrangler = WRANGLER_LATEST;
         writeFileSync(workerPkgPath, JSON.stringify(workerPkg, null, 2));
     }
 
     if (siteDir && siteDomain) {
-        let sessionId = "REPLACE_WITH_YOUR_SESSION_KV_ID";
-        let htmlCacheId = "REPLACE_WITH_YOUR_HTML_CACHE_KV_ID";
         const prefix = basename(siteDir).replace(/[^a-zA-Z0-9]/g, '_').toUpperCase();
-
-        try {
-            const sessionOut = execSync(`npx wrangler kv namespace create "SESSION_${prefix}"`, { encoding: 'utf-8', stdio: ['ignore', 'pipe', 'pipe'] });
-            if (sessionOut.match(/"id":\s*"([a-f0-9]{32})"/)) sessionId = sessionOut.match(/"id":\s*"([a-f0-9]{32})"/)[1];
-            const cacheOut = execSync(`npx wrangler kv namespace create "HTML_CACHE_${prefix}"`, { encoding: 'utf-8', stdio: ['ignore', 'pipe', 'pipe'] });
-            if (cacheOut.match(/"id":\s*"([a-f0-9]{32})"/)) htmlCacheId = cacheOut.match(/"id":\s*"([a-f0-9]{32})"/)[1];
-        } catch (err) { }
+        const sessionId = getOrCreateKV(`SESSION_${prefix}`);
+        const htmlCacheId = getOrCreateKV(`HTML_CACHE_${prefix}`);
 
         const siteWranglerPath = join(siteDir, 'wrangler.json');
         const siteConfig = {
@@ -678,25 +656,14 @@ async function promoteLocalToCloudflare() {
             const sitePkg = JSON.parse(readFileSync(sitePkgPath, 'utf-8'));
             sitePkg.dependencies = sitePkg.dependencies || {};
             sitePkg.dependencies['astro'] = ASTRO_LATEST;
-
             if (sitePkg.dependencies['@astrojs/node']) delete sitePkg.dependencies['@astrojs/node'];
             sitePkg.dependencies['@astrojs/cloudflare'] = ASTRO_CF_LATEST;
-
             sitePkg.devDependencies = sitePkg.devDependencies || {};
             sitePkg.devDependencies['wrangler'] = WRANGLER_LATEST;
-
             writeFileSync(sitePkgPath, JSON.stringify(sitePkg, null, 2));
         }
 
         convertAstroConfigToCloudflare(siteDir);
-
-        const tsConfigPath = join(siteDir, 'tsconfig.json');
-        if (existsSync(tsConfigPath)) {
-            const tsConfig = JSON.parse(readFileSync(tsConfigPath, 'utf-8'));
-            tsConfig.compilerOptions = tsConfig.compilerOptions || {};
-            tsConfig.compilerOptions.types = ["@cloudflare/workers-types"];
-            writeFileSync(tsConfigPath, JSON.stringify(tsConfig, null, 2));
-        }
     }
 
     s.stop('Workspace successfully upgraded to Cloudflare Edge!');
@@ -710,16 +677,11 @@ async function generateAstroSite(rootDir, siteFolder, siteDomain, cmsFullUrl, wo
     const siteDir = join(rootDir, 'sites', siteFolder);
     const templateDir = join(__dirname, '../templates/astro-starter');
 
-    if (!existsSync(templateDir)) {
-        return;
-    }
+    if (!existsSync(templateDir)) return;
 
     cpSync(templateDir, siteDir, { recursive: true });
 
-    const tsConfig = {
-        extends: "astro/tsconfigs/strict",
-        compilerOptions: { baseUrl: ".", paths: { "@/*": ["src/*"] } }
-    };
+    const tsConfig = { extends: "astro/tsconfigs/strict", compilerOptions: { baseUrl: ".", paths: { "@/*": ["src/*"] } } };
     if (isCloudflare) tsConfig.compilerOptions.types = ["@cloudflare/workers-types"];
     writeFileSync(join(siteDir, 'tsconfig.json'), JSON.stringify(tsConfig, null, 2));
 
@@ -728,7 +690,6 @@ async function generateAstroSite(rootDir, siteFolder, siteDomain, cmsFullUrl, wo
         const rawContent = readFileSync(templatePkgPath, 'utf-8')
             .replace(/\{\{SITE_NAME\}\}/g, siteFolder)
             .replace(/\{\{KAMA_VERSION\}\}/g, currentKamaVersion);
-
         const sitePkg = JSON.parse(rawContent);
 
         sitePkg.dependencies = sitePkg.dependencies || {};
@@ -738,14 +699,12 @@ async function generateAstroSite(rootDir, siteFolder, siteDomain, cmsFullUrl, wo
             if (sitePkg.dependencies['@astrojs/cloudflare']) delete sitePkg.dependencies['@astrojs/cloudflare'];
             if (sitePkg.dependencies['wrangler']) delete sitePkg.dependencies['wrangler'];
             if (sitePkg.devDependencies && sitePkg.devDependencies['wrangler']) delete sitePkg.devDependencies['wrangler'];
-
             sitePkg.dependencies['@astrojs/node'] = ASTRO_NODE_LATEST;
         } else {
             sitePkg.dependencies['@astrojs/cloudflare'] = ASTRO_CF_LATEST;
             if (sitePkg.dependencies['wrangler']) delete sitePkg.dependencies['wrangler'];
             sitePkg.devDependencies = sitePkg.devDependencies || {};
             sitePkg.devDependencies['wrangler'] = WRANGLER_LATEST;
-
             convertAstroConfigToCloudflare(siteDir);
         }
 
@@ -754,23 +713,14 @@ 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`;
 
     if (isCloudflare) {
-        let sessionId = "REPLACE_WITH_YOUR_SESSION_KV_ID";
-        let htmlCacheId = "REPLACE_WITH_YOUR_HTML_CACHE_KV_ID";
-
-        try {
-            const prefix = siteFolder.replace(/[^a-zA-Z0-9]/g, '_').toUpperCase();
-            const sessionOut = execSync(`npx wrangler kv namespace create "SESSION_${prefix}"`, { encoding: 'utf-8', stdio: ['ignore', 'pipe', 'pipe'] });
-            if (sessionOut.match(/"id":\s*"([a-f0-9]{32})"/)) sessionId = sessionOut.match(/"id":\s*"([a-f0-9]{32})"/)[1];
-            const cacheOut = execSync(`npx wrangler kv namespace create "HTML_CACHE_${prefix}"`, { encoding: 'utf-8', stdio: ['ignore', 'pipe', 'pipe'] });
-            if (cacheOut.match(/"id":\s*"([a-f0-9]{32})"/)) htmlCacheId = cacheOut.match(/"id":\s*"([a-f0-9]{32})"/)[1];
-        } catch (err) { }
+        const prefix = siteFolder.replace(/[^a-zA-Z0-9]/g, '_').toUpperCase();
+        const sessionId = getOrCreateKV(`SESSION_${prefix}`);
+        const htmlCacheId = getOrCreateKV(`HTML_CACHE_${prefix}`);
 
         const siteConfig = {
             $schema: "node_modules/wrangler/config-schema.json",
@@ -789,78 +739,6 @@ async function generateAstroSite(rootDir, siteFolder, siteDomain, cmsFullUrl, wo
         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}
-
--- 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_SITE_NAME="${siteLabel.replace(/"/g, '\\"')}"\n`);
 }