@brightsideoy/kama 0.1.0-alpha.155 → 0.1.0-alpha.157

package/bin/cli.js

@@ -1,10 +1,16 @@
 #!/usr/bin/env node
 import { execSync } from 'node:child_process';
 import { existsSync, mkdirSync, writeFileSync, readFileSync, readdirSync, cpSync, statSync, unlinkSync, appendFileSync } from 'node:fs';
-import { join, dirname, basename, resolve, relative } from 'node:path';
+import { join, dirname, basename, resolve } from 'node:path';
 import { fileURLToPath, pathToFileURL } from 'node:url';
 import * as readline from 'node:readline/promises';
 
+// 🎯 Always use the absolute newest ecosystem
+const ASTRO_LATEST = "latest";
+const ASTRO_NODE_LATEST = "latest";
+const ASTRO_CF_LATEST = "latest";
+const WRANGLER_LATEST = "latest";
+
 // Dynamically resolve current package version
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
@@ -247,11 +253,13 @@ async function createFullWorkspace() {
         dependencies: {
             '@brightsideoy/kama': currentKamaVersion,
         },
-        devDependencies: {
-            'wrangler': '^4.0.0'
-        }
+        devDependencies: {}
     };
 
+    if (isCloudflare) {
+        rootPkg.devDependencies['wrangler'] = WRANGLER_LATEST;
+    }
+
     if (shouldCreateSite) {
         rootPkg.devDependencies['concurrently'] = '^9.0.0';
         rootPkg.scripts['dev:site'] = `npm run dev -w sites/${siteFolderName}`;
@@ -263,10 +271,7 @@ async function createFullWorkspace() {
         rootPkg.scripts['dev'] = 'npm run dev:cms';
     }
 
-    writeFileSync(
-        join(rootDir, 'package.json'),
-        JSON.stringify(rootPkg, null, 2)
-    );
+    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');
@@ -319,7 +324,7 @@ export default {
                     '@libsql/client': '^0.14.0'
                 },
                 devDependencies: {
-                    "wrangler": "^4.0.0"
+                    "wrangler": WRANGLER_LATEST
                 },
             }, null, 2)
         );
@@ -330,41 +335,29 @@ export default {
             main: 'index.js',
             compatibility_date: '2024-09-23',
             compatibility_flags: ['nodejs_compat'],
-            cache: {
-                enabled: true
-            },
-            assets: {
-                directory: '../node_modules/@brightsideoy/kama/dist',
-                binding: 'ASSETS'
-            },
-            images: {
-                binding: 'IMAGES'
-            },
+            dev: { host: 'localhost', port: 8787 },
+            cache: { enabled: true },
+            assets: { directory: '../node_modules/@brightsideoy/kama/dist', binding: 'ASSETS' },
+            images: { binding: 'IMAGES' },
             vars: {
-                CDN_DOMAIN: cmsDomain,
-                PUBLIC_FRONTEND_URL: (shouldCreateSite) ? `https://${siteDomain}` : 'http://localhost:4321',
+                CDN_DOMAIN: cmsDomain || 'localhost:8787',
+                PUBLIC_FRONTEND_URL: (shouldCreateSite) ? (siteDomain && siteDomain !== 'localhost:4321' ? `https://${siteDomain}` : 'http://localhost:4321') : 'http://localhost:4321',
                 CLOUDFLARE_ZONE_ID: "REPLACE_WITH_YOUR_32_CHAR_ZONE_ID",
                 KAMA_RUNTIME: 'cloudflare'
             },
-            d1_databases: [{
-                binding: 'DB',
-                database_name: dbName,
-                database_id: d1DatabaseId,
-            }],
-            r2_buckets: [{
-                binding: 'MEDIA_BUCKET',
-                bucket_name: bucketName,
-            }],
-            routes: [{ pattern: cmsDomain, custom_domain: true }]
+            d1_databases: [{ binding: 'DB', database_name: dbName, database_id: d1DatabaseId }],
+            r2_buckets: [{ binding: 'MEDIA_BUCKET', bucket_name: bucketName }],
+            routes: cmsDomain ? [{ pattern: cmsDomain, custom_domain: true }] : [{ pattern: "", custom_domain: true }]
         };
 
         writeFileSync(join(cmsDir, 'wrangler.json'), JSON.stringify(cmsWranglerConfig, null, 2));
 
+        // 🎯 FIX: CDN_DOMAIN left empty to auto-detect http://localhost:8787
         writeFileSync(join(cmsDir, '.dev.vars'), `# Cloudflare Edge Cache Purging Secrets
 CLOUDFLARE_API_TOKEN=cfut_YOUR_CUSTOM_PURGE_TOKEN
 
 # Local Development Overrides (Takes precedence over wrangler.json vars during local dev)
-CDN_DOMAIN=http://localhost:8787
+CDN_DOMAIN=
 PUBLIC_FRONTEND_URL=http://localhost:4321
 `);
     } else {
@@ -451,14 +444,7 @@ serve({ fetch: kamaApp.fetch, port }, (info) => {
         );
 
         // For Node mode, localhost is explicitly used
-        writeFileSync(join(cmsDir, '.env'), `PORT=8787
-KAMA_RUNTIME=node
-DB_PATH=./kama.db
-LOCAL_MEDIA_PATH=./public/media
-PUBLIC_CMS_URL=http://localhost:8787
-PUBLIC_API_URL=http://localhost:8787
-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);
@@ -470,18 +456,14 @@ PUBLIC_FRONTEND_URL=http://localhost:4321
     }
 
     console.log(`\n✨ Workspace ready! Next steps:`);
-    if (!isCurrentDir) {
-        console.log(`  1. cd ${projName}`);
-        console.log(`  2. npm install`);
-    } else {
-        console.log(`  1. npm install`);
-    }
+    if (!isCurrentDir) console.log(`  1. cd ${projName}`);
+    console.log(`  2. npm install`);
 
     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 with your actual Zone ID`);
+        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 {
@@ -492,7 +474,6 @@ PUBLIC_FRONTEND_URL=http://localhost:4321
 
 /**
  * COMMAND: npx kama add site
- * Add Astro Site to existing workspace
  */
 async function createNewSiteOnly() {
     const rootDir = process.cwd();
@@ -505,18 +486,13 @@ async function createNewSiteOnly() {
     let targetWorkerName = 'kama-worker';
     let detectedCmsDomain = '';
 
-    // 🎯 Auto-detect existing worker name & CMS domain from kama-worker/wrangler.json
     const cmsWranglerPath = join(rootDir, 'kama-worker', 'wrangler.json');
     if (existsSync(cmsWranglerPath)) {
         try {
             const cmsWrangler = JSON.parse(readFileSync(cmsWranglerPath, 'utf-8'));
             if (cmsWrangler.name) targetWorkerName = cmsWrangler.name;
-
-            if (cmsWrangler.vars?.CDN_DOMAIN) {
-                detectedCmsDomain = cmsWrangler.vars.CDN_DOMAIN;
-            } else if (cmsWrangler.routes?.[0]?.pattern) {
-                detectedCmsDomain = cmsWrangler.routes[0].pattern;
-            }
+            if (cmsWrangler.vars?.CDN_DOMAIN) detectedCmsDomain = cmsWrangler.vars.CDN_DOMAIN;
+            else if (cmsWrangler.routes?.[0]?.pattern) detectedCmsDomain = cmsWrangler.routes[0].pattern;
         } catch (e) { }
     }
 
@@ -527,21 +503,14 @@ async function createNewSiteOnly() {
     const isCloudflare = envChoice.trim() === '2';
 
     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();
-
         if (detectedCmsDomain) {
-            // 🎯 Automatically use the detected CMS Admin Domain
-            cmsFullUrl = detectedCmsDomain.startsWith('http')
-                ? detectedCmsDomain
-                : `https://${detectedCmsDomain.replace(/^https?:\/\//, '')}`;
-            console.log(`ℹ️ Auto-detected CMS Admin Domain: ${cmsFullUrl}`);
+            cmsFullUrl = detectedCmsDomain.startsWith('http') ? detectedCmsDomain : `https://${detectedCmsDomain.replace(/^https?:\/\//, '')}`;
         } else {
-            // Fallback prompt only if no wrangler config was found
             const cmsDomainInput = (await rl.question('CMS API Domain (e.g., admin.brand.com): ')).trim();
             cmsFullUrl = `https://${cmsDomainInput.replace(/^https?:\/\//, '')}`;
         }
@@ -551,7 +520,6 @@ async function createNewSiteOnly() {
 
     console.log(`\n✨ Site created in sites/${siteFolder}!`);
     console.log(`📦 Run 'npm install' at workspace root.`);
-    console.log(`🌱 Run 'npm run dev' to boot up and seed the new site data.`);
 }
 
 /**
@@ -559,20 +527,12 @@ async function createNewSiteOnly() {
  */
 async function bundleWorkspaceSchemas(targetRootDir) {
     let rootDir = targetRootDir || process.cwd();
-
-    if (basename(rootDir) === 'kama-worker') {
-        rootDir = resolve(rootDir, '..');
-    }
+    if (basename(rootDir) === 'kama-worker') rootDir = resolve(rootDir, '..');
 
     try {
         let compilerPath = join(__dirname, '../dist/schema-compiler.js');
-
-        if (!existsSync(compilerPath)) {
-            compilerPath = join(__dirname, '../scripts/schema-compiler.ts');
-        }
-
-        const compilerUrl = pathToFileURL(compilerPath).href;
-        await import(compilerUrl);
+        if (!existsSync(compilerPath)) compilerPath = join(__dirname, '../scripts/schema-compiler.ts');
+        await import(pathToFileURL(compilerPath).href);
     } catch (e) {
         console.error(`❌ Schema compilation failed:`, e.message || e);
     }
@@ -580,100 +540,166 @@ async function bundleWorkspaceSchemas(targetRootDir) {
 
 /**
  * COMMAND: npx kama promote
- * Promote current Local workspace to Cloudflare Edge
  */
 async function promoteLocalToCloudflare() {
     const rootDir = process.cwd();
-    const workerWranglerPath = join(rootDir, 'kama-worker', 'wrangler.json');
+    const workerDir = join(rootDir, 'kama-worker');
+    const rootPkgPath = join(rootDir, 'package.json');
 
-    if (!existsSync(workerWranglerPath)) {
-        console.error('❌ Error: Could not find kama-worker/wrangler.json. Run this command inside your workspace root.');
+    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;
     }
 
-    console.log('\n🌐 --- PROMOTING WORKSPACE TO CLOUDFLARE EDGE --- 🌐\n');
+    console.log('\n🌐 --- UPGRADING WORKSPACE TO CLOUDFLARE EDGE --- 🌐\n');
 
     try {
         execSync('npx wrangler whoami', { stdio: 'pipe' });
         console.log('✅ Logged in to Cloudflare.');
     } catch (e) {
         console.log('🌐 Launching browser for Cloudflare login...');
-        try {
-            execSync('npx wrangler login', { stdio: 'inherit' });
-        } catch (loginError) {
-            console.log('❌ Cloudflare login failed or was cancelled.');
-            return;
-        }
+        try { execSync('npx wrangler login', { stdio: 'inherit' }); }
+        catch (loginError) { console.log('❌ Cloudflare login failed.'); return; }
     }
 
     const cmsDomain = (await rl.question('\nCMS Admin Domain (e.g., admin.yourdomain.com): ')).trim();
 
     const sitesFolderDir = join(rootDir, 'sites');
     let siteDomain = '';
+    let siteDir = null;
     if (existsSync(sitesFolderDir)) {
-        siteDomain = (await rl.question('Frontend Website Domain (e.g., yourdomain.com): ')).trim();
+        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();
+        }
     }
 
-    const currentConfig = JSON.parse(readFileSync(workerWranglerPath, 'utf-8'));
-    const dbName = currentConfig.d1_databases?.[0]?.database_name || 'kama_db';
-
-    console.log(`\n🗄️ Provisioning remote Cloudflare D1 Database '${dbName}'...`);
+    const projName = basename(rootDir);
+    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: '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 (err) {
-        console.log('⚠️ Could not auto-create D1 (it may already exist). Please verify on your Cloudflare dashboard.');
-    }
+    } catch (err) { }
+
+    // 1. Upgrade Root
+    const rootPkg = JSON.parse(readFileSync(rootPkgPath, 'utf-8'));
+    rootPkg.devDependencies = rootPkg.devDependencies || {};
+    rootPkg.devDependencies['wrangler'] = WRANGLER_LATEST;
+    writeFileSync(rootPkgPath, JSON.stringify(rootPkg, null, 2));
+
+    // 2. Upgrade Worker
+    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' }
+        };
 
+    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}`;
-    }
+    if (siteDomain) currentConfig.vars.PUBLIC_FRONTEND_URL = `https://${siteDomain}`;
     currentConfig.routes = [{ pattern: cmsDomain, custom_domain: true }];
-    if (currentConfig.d1_databases?.[0]) {
-        currentConfig.d1_databases[0].database_id = d1DatabaseId;
-    }
+    currentConfig.d1_databases = [{ binding: 'DB', database_name: dbName, database_id: d1DatabaseId }];
+    currentConfig.r2_buckets = [{ binding: 'MEDIA_BUCKET', bucket_name: bucketName }];
 
     writeFileSync(workerWranglerPath, JSON.stringify(currentConfig, null, 2));
 
-    if (siteDomain && existsSync(sitesFolderDir)) {
-        const sites = readdirSync(sitesFolderDir);
-        if (sites.length > 0) {
-            const siteWranglerPath = join(sitesFolderDir, sites[0], 'wrangler.json');
-            if (existsSync(siteWranglerPath)) {
-                const siteConfig = JSON.parse(readFileSync(siteWranglerPath, 'utf-8'));
-
-                siteConfig.cache = { enabled: true };
-                siteConfig.routes = [{
-                    pattern: siteDomain,
-                    zone_name: siteDomain,
-                    custom_domain: true,
-                    enabled: true,
-                    previews_enabled: false
-                }];
-
-                siteConfig.assets = {
-                    directory: "./dist/client",
-                    binding: "ASSETS",
-                    run_worker_first: true
-                };
-
-                siteConfig.vars = siteConfig.vars || {};
-                siteConfig.vars.PUBLIC_CMS_URL = `https://${cmsDomain}`;
-                siteConfig.vars.PUBLIC_API_URL = `https://${cmsDomain}`;
-
-                writeFileSync(siteWranglerPath, JSON.stringify(siteConfig, null, 2));
-            }
+    // 🎯 FIX: CDN_DOMAIN left empty to auto-detect http://localhost:8787
+    if (!existsSync(join(workerDir, '.dev.vars'))) {
+        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)) {
+        writeFileSync(workerIndexPath, `import kamaWorker from '@brightsideoy/kama';\nimport * as localBundle from './bundled-definitions.js';\nexport default {\n  async fetch(request, env, ctx) {\n    const schemas = localBundle.BUNDLED_DEFINITIONS || localBundle.default || localBundle;\n    const customEnv = { ...env, BUNDLED_DEFINITIONS: schemas, KAMA_RUNTIME: 'cloudflare' };\n    if (kamaWorker && typeof kamaWorker.fetch === 'function') return kamaWorker.fetch(request, customEnv, ctx);\n    if (kamaWorker && kamaWorker.app && typeof kamaWorker.app.fetch === 'function') return kamaWorker.app.fetch(request, customEnv, ctx);\n    return new Response('Kama Engine Worker Ready', { status: 200 });\n  }\n};\n`);
+    }
+
+    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.devDependencies = workerPkg.devDependencies || {};
+        workerPkg.devDependencies.wrangler = WRANGLER_LATEST;
+        writeFileSync(workerPkgPath, JSON.stringify(workerPkg, null, 2));
+    }
+
+    // 3. Upgrade Site
+    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: '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: 'pipe' });
+            if (cacheOut.match(/"id":\s*"([a-f0-9]{32})"/)) htmlCacheId = cacheOut.match(/"id":\s*"([a-f0-9]{32})"/)[1];
+        } catch (err) { }
+
+        const siteWranglerPath = join(siteDir, 'wrangler.json');
+        const siteConfig = {
+            $schema: "node_modules/wrangler/config-schema.json",
+            name: `${basename(siteDir).toLowerCase().replace(/[^a-z0-9-]/g, '-')}-site`,
+            compatibility_date: "2024-09-23",
+            compatibility_flags: ["nodejs_compat"],
+            dev: { host: 'localhost', port: 4321 },
+            cache: { enabled: true },
+            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: currentConfig.name }],
+            routes: [{ pattern: siteDomain, zone_name: siteDomain, custom_domain: true, enabled: true, previews_enabled: false }],
+            vars: { PUBLIC_CMS_URL: `https://${cmsDomain}`, PUBLIC_API_URL: `https://${cmsDomain}` }
+        };
+        writeFileSync(siteWranglerPath, JSON.stringify(siteConfig, null, 2));
+
+        const sitePkgPath = join(siteDir, 'package.json');
+        if (existsSync(sitePkgPath)) {
+            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));
+        }
+
+        // 🎯 100% BULLETPROOF CONFIG WRITE FOR CLOUDFLARE
+        const astroConfigPath = join(siteDir, 'astro.config.mjs');
+        const cfConfigContent = `import { defineConfig } from 'astro/config';\nimport cloudflare from '@astrojs/cloudflare';\nimport path from 'node:path';\nimport { fileURLToPath } from 'node:url';\n\nconst __dirname = path.dirname(fileURLToPath(import.meta.url));\n\nexport default defineConfig({\n    output: 'server',\n    trailingSlash: 'ignore',\n    image: { service: { entrypoint: './src/lib/media/kama-image-service.ts' } },\n    adapter: cloudflare({ imageService: process.env.NODE_ENV === 'production' ? "cloudflare" : "passthrough" }),\n    vite: {\n        resolve: { alias: { '@': path.resolve(__dirname, './src') } },\n        ssr: {\n            external: ['cloudflare:workers', 'tinyexec', 'node:child_process', 'node:fs', 'node:url', 'node:path', 'node:stream', 'node:readline', 'node:stream/promises']\n        },\n        environments: {\n            ssr: {\n                external: ['cloudflare:workers', 'tinyexec', 'node:child_process', 'node:fs', 'node:url', 'node:path', 'node:stream', 'node:readline', 'node:stream/promises']\n            }\n        }\n    }\n});\n`;
+        writeFileSync(astroConfigPath, cfConfigContent);
+
+        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));
         }
     }
 
-    console.log(`\n✅ Workspace successfully configured for Cloudflare Edge!`);
-    console.log(`\nNext steps:`);
-    console.log(`  1. Run 'npm run deploy:cms' from the root to publish your backend and database.`);
+    console.log(`\n✅ Workspace successfully upgraded to Cloudflare Edge!`);
 }
 
 /**
@@ -687,19 +713,54 @@ async function generateAstroSite(rootDir, siteFolder, siteDomain, cmsFullUrl, wo
 
     if (!existsSync(templateDir)) {
         console.error(`❌ Error: Astro template not found at ${templateDir}`);
-        console.error(`Please ensure your Kama package installation is complete and templates are published.`);
         return;
     }
 
     cpSync(templateDir, siteDir, { recursive: true });
 
+    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));
+
     const templatePkgPath = join(siteDir, 'package.json.template');
     if (existsSync(templatePkgPath)) {
-        const pkgContent = readFileSync(templatePkgPath, 'utf-8')
+        const rawContent = readFileSync(templatePkgPath, 'utf-8')
             .replace(/\{\{SITE_NAME\}\}/g, siteFolder)
             .replace(/\{\{KAMA_VERSION\}\}/g, currentKamaVersion);
 
-        writeFileSync(join(siteDir, 'package.json'), pkgContent);
+        const sitePkg = JSON.parse(rawContent);
+
+        sitePkg.dependencies = sitePkg.dependencies || {};
+        sitePkg.dependencies['astro'] = ASTRO_LATEST;
+
+        if (!isCloudflare) {
+            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;
+
+            // 🎯 100% BULLETPROOF CONFIG WRITE FOR NODE
+            const astroConfigPath = join(siteDir, 'astro.config.mjs');
+            const nodeConfigContent = `import { defineConfig } from 'astro/config';\nimport node from '@astrojs/node';\nimport path from 'node:path';\nimport { fileURLToPath } from 'node:url';\n\nconst __dirname = path.dirname(fileURLToPath(import.meta.url));\n\nexport default defineConfig({\n    output: 'server',\n    trailingSlash: 'ignore',\n    image: { service: { entrypoint: './src/lib/media/kama-image-service.ts' } },\n    adapter: node({ mode: "standalone" }),\n    vite: {\n        resolve: { alias: { '@': path.resolve(__dirname, './src') } },\n        ssr: {\n            external: ['cloudflare:workers', 'tinyexec', 'node:child_process', 'node:fs', 'node:url', 'node:path', 'node:stream', 'node:readline', 'node:stream/promises']\n        },\n        environments: {\n            ssr: {\n                external: ['cloudflare:workers', 'tinyexec', 'node:child_process', 'node:fs', 'node:url', 'node:path', 'node:stream', 'node:readline', 'node:stream/promises']\n            }\n        }\n    }\n});\n`;
+            writeFileSync(astroConfigPath, nodeConfigContent);
+
+        } 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;
+
+            // 🎯 100% BULLETPROOF CONFIG WRITE FOR CLOUDFLARE
+            const astroConfigPath = join(siteDir, 'astro.config.mjs');
+            const cfConfigContent = `import { defineConfig } from 'astro/config';\nimport cloudflare from '@astrojs/cloudflare';\nimport path from 'node:path';\nimport { fileURLToPath } from 'node:url';\n\nconst __dirname = path.dirname(fileURLToPath(import.meta.url));\n\nexport default defineConfig({\n    output: 'server',\n    trailingSlash: 'ignore',\n    image: { service: { entrypoint: './src/lib/media/kama-image-service.ts' } },\n    adapter: cloudflare({ imageService: process.env.NODE_ENV === 'production' ? "cloudflare" : "passthrough" }),\n    vite: {\n        resolve: { alias: { '@': path.resolve(__dirname, './src') } },\n        ssr: {\n            external: ['cloudflare:workers', 'tinyexec', 'node:child_process', 'node:fs', 'node:url', 'node:path', 'node:stream', 'node:readline', 'node:stream/promises']\n        },\n        environments: {\n            ssr: {\n                external: ['cloudflare:workers', 'tinyexec', 'node:child_process', 'node:fs', 'node:url', 'node:path', 'node:stream', 'node:readline', 'node:stream/promises']\n            }\n        }\n    }\n});\n`;
+            writeFileSync(astroConfigPath, cfConfigContent);
+        }
+
+        writeFileSync(join(siteDir, 'package.json'), JSON.stringify(sitePkg, null, 2));
         unlinkSync(templatePkgPath);
     }
 
@@ -707,114 +768,51 @@ async function generateAstroSite(rootDir, siteFolder, siteDomain, cmsFullUrl, wo
     const safeSiteLabel = siteLabel.replace(/'/g, "''");
     const channelKey = siteFolder.replace(/[^a-z0-9_-]/gi, '-').toLowerCase();
     const treeKey = 'main-tree';
-
-    // 🎯 FIX: Completely Generate wrangler.json structurally from scratch with `-site` name appended
     const safeWorkerName = `${siteFolder.toLowerCase().replace(/[^a-z0-9-]/g, '-')}-site`;
 
-    const wranglerPath = join(siteDir, 'wrangler.json');
-    const siteConfig = {
-        $schema: "node_modules/wrangler/config-schema.json",
-        name: safeWorkerName, // 🎯 Uses sanitized name (e.g. doc-kamaengine-com-site)
-        compatibility_date: "2024-09-23",
-        compatibility_flags: ["nodejs_compat"],
-        cache: { enabled: true },
-        assets: {
-            directory: "./dist/client",
-            binding: "ASSETS",
-            run_worker_first: true
-        },
-        kv_namespaces: [
-            {
-                binding: "SESSION",
-                id: "REPLACE_WITH_YOUR_SESSION_KV_ID"
-            },
-            {
-                binding: "HTML_CACHE",
-                id: "REPLACE_WITH_YOUR_HTML_CACHE_KV_ID"
-            }
-        ],
-        services: [
-            {
-                binding: "CMS_WORKER",
-                service: workerName // 🎯 Correctly links back to the CMS worker
-            }
-        ],
-        vars: {
-            PUBLIC_CMS_URL: cmsFullUrl,
-            PUBLIC_API_URL: cmsFullUrl,
-            PUBLIC_CHANNEL_ID: channelKey,
-            PUBLIC_TREE_ID: treeKey,
-            PUBLIC_HOME_SLUG: "home",
-            PUBLIC_SITE_NAME: siteLabel
-        }
-    };
+    if (isCloudflare) {
+        let sessionId = "REPLACE_WITH_YOUR_SESSION_KV_ID";
+        let htmlCacheId = "REPLACE_WITH_YOUR_HTML_CACHE_KV_ID";
 
-    if (isCloudflare && siteDomain !== 'localhost:4321') {
-        siteConfig.routes = [{
-            pattern: siteDomain,
-            zone_name: siteDomain,
-            custom_domain: true,
-            enabled: true,
-            previews_enabled: false
-        }];
-    }
+        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: '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: 'pipe' });
+            if (cacheOut.match(/"id":\s*"([a-f0-9]{32})"/)) htmlCacheId = cacheOut.match(/"id":\s*"([a-f0-9]{32})"/)[1];
+        } catch (err) { }
+
+        const siteConfig = {
+            $schema: "node_modules/wrangler/config-schema.json",
+            name: safeWorkerName,
+            compatibility_date: "2024-09-23",
+            compatibility_flags: ["nodejs_compat"],
+            dev: { host: "localhost", port: 4321 },
+            cache: { enabled: true },
+            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: "home", PUBLIC_SITE_NAME: siteLabel }
+        };
 
-    writeFileSync(wranglerPath, JSON.stringify(siteConfig, null, 2));
+        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 seedSql = `
 -- Seed data for site: ${safeSiteLabel}
-
--- 1. Create the Channel
-INSERT OR IGNORE INTO channels (key, label, channelType, defaultLanguage, isHidden, dataJson)
-VALUES ('${channelKey}', '${safeSiteLabel}', 'website', 'en', 0, '{}');
-
--- 2. Create the Tree and link it to the Channel
-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');
-
--- 3. Create the Home Page
-INSERT INTO content_nodes (contentType, title, slug, language, status, dataJson)
-SELECT 'page', 'Welcome to ${safeSiteLabel}', 'home', 'en', 'published', '{"titleSuffix":"– ${safeSiteLabel}","layoutId":"single-column","subpageLayoutId":"two-column","logoText":"${safeSiteLabel}"}'
-WHERE NOT EXISTS (SELECT 1 FROM content_nodes WHERE slug = 'home' AND title = 'Welcome to ${safeSiteLabel}');
-
--- 4. Attach the Home Page to the Channel
-INSERT OR IGNORE INTO node_channels (nodeId, channelId)
-VALUES (
-  (SELECT id FROM content_nodes WHERE slug = 'home' AND title = 'Welcome to ${safeSiteLabel}' ORDER BY id DESC LIMIT 1),
-  (SELECT id FROM channels WHERE key = '${channelKey}')
-);
-
--- 5. Attach the Home Page to the Main Tree
-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 = 'home' AND title = 'Welcome to ${safeSiteLabel}' ORDER BY id DESC LIMIT 1),
-  NULL,
-  0
-);
+INSERT OR IGNORE INTO channels (key, label, channelType, defaultLanguage, isHidden, dataJson) VALUES ('${channelKey}', '${safeSiteLabel}', 'website', 'en', 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}', 'home', 'en', 'published', '{"titleSuffix":"– ${safeSiteLabel}","layoutId":"single-column","subpageLayoutId":"two-column","logoText":"${safeSiteLabel}"}' WHERE NOT EXISTS (SELECT 1 FROM content_nodes WHERE slug = 'home' AND title = 'Welcome to ${safeSiteLabel}');
+INSERT OR IGNORE INTO node_channels (nodeId, channelId) VALUES ((SELECT id FROM content_nodes WHERE slug = 'home' 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 = 'home' AND title = 'Welcome to ${safeSiteLabel}' ORDER BY id DESC LIMIT 1), NULL, 0);
 `;
 
     const workerDir = join(rootDir, 'kama-worker');
-    const seedPath = join(workerDir, 'seed.sql');
-    if (existsSync(workerDir)) {
-        appendFileSync(seedPath, seedSql);
-    }
+    if (existsSync(workerDir)) appendFileSync(join(workerDir, 'seed.sql'), seedSql);
 
-    // Local Development Overrides
-    const envContent = [
-        `# Local Development Overrides (Production uses wrangler.json vars)`,
-        `PUBLIC_CMS_URL="http://localhost:8787"`,
-        `PUBLIC_API_URL="http://localhost:8787"`,
-        `PUBLIC_CHANNEL_ID="${channelKey}"`,
-        `PUBLIC_TREE_ID="${treeKey}"`,
-        `PUBLIC_HOME_SLUG="home"`,
-        `PUBLIC_SITE_NAME="${siteLabel.replace(/"/g, '\\"')}"`
-    ].join('\n') + '\n';
-
-    writeFileSync(join(siteDir, '.env'), envContent);
+    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="home"\nPUBLIC_SITE_NAME="${siteLabel.replace(/"/g, '\\"')}"\n`);
 }
 
 main().catch(console.error);