@brightsideoy/kama 1.0.0-alpha.11 → 1.0.0-alpha.13

package/bin/cli.js

@@ -50,8 +50,8 @@ try {
 }
 
 /**
- * 🎯 SECURE SECRET MANAGER
- * Gracefully retrieves an existing workspace secret, or generates and injects one if missing.
+- 🎯 SECURE SECRET MANAGER
+- Gracefully retrieves an existing workspace secret, or generates and injects one if missing.
  */
 function getOrGenerateWorkspaceSecret(workerDir) {
     const envPath = join(workerDir, '.env');
@@ -89,7 +89,7 @@ function getOrGenerateWorkspaceSecret(workerDir) {
 }
 
 /**
- * 🎯 BULLETPROOF WRANGLER EXECUTION RESOLVER
+- 🎯 BULLETPROOF WRANGLER EXECUTION RESOLVER
  */
 function getWranglerCmd() {
     try {
@@ -101,7 +101,7 @@ function getWranglerCmd() {
 }
 
 /**
- * 🎯 ROBUST WRANGLER RUNNER
+- 🎯 ROBUST WRANGLER RUNNER
  */
 function runWrangler(cmd, options = {}) {
     const baseWrangler = getWranglerCmd();
@@ -121,7 +121,7 @@ function runWrangler(cmd, options = {}) {
 }
 
 /**
- * 🎯 BULLETPROOF KV PROVISIONING ENGINE
+- 🎯 BULLETPROOF KV PROVISIONING ENGINE
  */
 function getOrCreateKV(title) {
     const out = runWrangler(`kv namespace create "${title}"`);
@@ -154,7 +154,7 @@ function showHelp() {
     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 (Run Once)');
-    console.log('  npm run seed -w kama-worker  Seed the database with mock test data'); // 🎯 NEW LINE
+    console.log('  npm run seed -w kama-worker  Seed the database with mock test data');
     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');
@@ -224,7 +224,7 @@ function convertAstroConfigToCloudflare(siteDir) {
 }
 
 /**
- * COMMAND: npx kama init
+- COMMAND: npx kama init
  */
 async function createFullWorkspace() {
     const cwdName = basename(process.cwd());
@@ -407,15 +407,16 @@ async function createFullWorkspace() {
                 type: 'module',
                 version: '1.0.0',
                 scripts: {
-                    // 🎯 Uses native node with the compiled dist/build-seed.js
-                    "seed": "node ../node_modules/@brightsideoy/kama/dist/build-seed.js && wrangler d1 execute " + dbName + " --local --file=seed.sql",
+                    "seed": "npm run seed:local",
+                    "seed:local": "node ../node_modules/@brightsideoy/kama/dist/build-seed.js && for f in seed-*.sql; do wrangler d1 execute " + dbName + " --local --file=\"$f\"; done",
+                    "seed:remote": "node ../node_modules/@brightsideoy/kama/dist/build-seed.js && for f in seed-*.sql; do wrangler d1 execute " + dbName + " --remote --file=\"$f\"; done",
                     "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 }, // 🎯 Removed TSX requirement
+                devDependencies: { "wrangler": WRANGLER_LATEST },
             }, null, 2)
         );
 
@@ -442,7 +443,6 @@ async function createFullWorkspace() {
 
         writeFileSync(join(cmsDir, 'wrangler.json'), JSON.stringify(cmsWranglerConfig, null, 2));
 
-        // 🎯 Inject API Secret directly into .dev.vars
         const publicFrontendUrl = (shouldCreateSite) ? (siteDomain && siteDomain !== 'localhost:4321' ? `https://${siteDomain}` : 'http://localhost:4321') : '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=${publicFrontendUrl}\n\n# Server-to-Server API Security\nFRONTEND_API_SECRET="${frontendApiSecret}"\n`);
     } else {
@@ -456,18 +456,17 @@ async function createFullWorkspace() {
                 type: 'module',
                 version: '1.0.0',
                 scripts: {
-                    // 🎯 Uses native node with the compiled dist/build-seed.js
-                    "seed": "node ../node_modules/@brightsideoy/kama/dist/build-seed.js && sqlite3 kama.db < seed.sql",
+                    "seed": "npm run seed:local",
+                    "seed:local": "node ../node_modules/@brightsideoy/kama/dist/build-seed.js && cat seed-*.sql | sqlite3 kama.db",
                     "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" }, // 🎯 Kept because "dev" uses it
+                devDependencies: { "tsx": "^4.19.0" },
             }, null, 2)
         );
 
-        // 🎯 Inject API Secret directly into .env
         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\n# Server-to-Server API Security\nFRONTEND_API_SECRET="${frontendApiSecret}"\n`);
     }
 
@@ -476,7 +475,6 @@ async function createFullWorkspace() {
 
     if (shouldCreateSite) {
         s.message(`Scaffolding Astro site (${siteFolderName})...`);
-        // 🎯 Pass secret to the frontend generator
         await generateAstroSite(rootDir, siteFolderName, siteDomain, cmsFullUrl, workerName, isCloudflare, frontendApiSecret);
     }
 
@@ -501,7 +499,7 @@ async function createFullWorkspace() {
 }
 
 /**
- * COMMAND: npx kama add site
+- COMMAND: npx kama add site
  */
 async function createNewSiteOnly() {
     const rootDir = process.cwd();
@@ -525,7 +523,6 @@ async function createNewSiteOnly() {
         } catch (e) { }
     }
 
-    // 🎯 Ensure secret exists in worker before provisioning site
     const frontendApiSecret = existsSync(workerDir) ? getOrGenerateWorkspaceSecret(workerDir) : crypto.randomBytes(32).toString('hex');
 
     const isCloudflare = handleCancel(await select({
@@ -558,7 +555,6 @@ async function createNewSiteOnly() {
     const s = spinner();
     s.start(`Generating Astro site...`);
 
-    // 🎯 Pass secret to the frontend generator
     await generateAstroSite(rootDir, siteFolder, siteDomain, cmsFullUrl, targetWorkerName, isCloudflare, frontendApiSecret);
 
     s.stop(`Site created in sites/${siteFolder}!`);
@@ -568,7 +564,7 @@ async function createNewSiteOnly() {
 }
 
 /**
- * COMMAND: npx kama bundle
+- COMMAND: npx kama bundle
  */
 async function bundleWorkspaceSchemas(targetRootDir, silent = false) {
     let rootDir = targetRootDir || process.cwd();
@@ -587,7 +583,7 @@ async function bundleWorkspaceSchemas(targetRootDir, silent = false) {
 }
 
 /**
- * COMMAND: npx kama promote
+- COMMAND: npx kama promote
  */
 async function promoteLocalToCloudflare() {
     const rootDir = process.cwd();
@@ -599,7 +595,6 @@ async function promoteLocalToCloudflare() {
         process.exit(1);
     }
 
-    // 🎯 Safely persist the secret during promotion
     const frontendApiSecret = getOrGenerateWorkspaceSecret(workerDir);
 
     const s = spinner();
@@ -635,12 +630,34 @@ async function promoteLocalToCloudflare() {
 
     const projName = basename(rootDir);
     let dbName = `${projName}-db`.replace(/[^a-zA-Z0-9_-]/g, '_');
+
+    // 🎯 1. ARCHITECTURE FIX: Check if the database already exists
     let d1DatabaseId = '00000000-0000-0000-0000-000000000000';
+    const listOutput = runWrangler('d1 list --json');
+    let dbExists = false;
 
-    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];
+    if (listOutput) {
+        try {
+            const jsonStart = listOutput.indexOf('[');
+            const jsonEnd = listOutput.lastIndexOf(']') + 1;
+            if (jsonStart !== -1 && jsonEnd !== -1) {
+                const databases = JSON.parse(listOutput.substring(jsonStart, jsonEnd));
+                const existingDb = databases.find(db => db.name === dbName);
+                if (existingDb) {
+                    d1DatabaseId = existingDb.uuid;
+                    dbExists = true;
+                }
+            }
+        } catch (e) { }
+    }
+
+    // 2. If it doesn't exist, create it safely
+    if (!dbExists) {
+        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];
+        }
     }
 
     const workerName = `${projName}-worker`.toLowerCase().replace(/[^a-z0-9_-]/g, '-');
@@ -687,12 +704,13 @@ async function promoteLocalToCloudflare() {
         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`;
 
-        // 🎯 Uses native node with the compiled dist/build-seed.js
-        workerPkg.scripts["seed"] = `node ../node_modules/@brightsideoy/kama/dist/build-seed.js && wrangler d1 execute ${dbName} --local --file=seed.sql`;
+        workerPkg.scripts["seed"] = "npm run seed:local";
+        // 🎯 3. ARCHITECTURE FIX: Chunked seed loops for promoted worker
+        workerPkg.scripts["seed:local"] = `node ../node_modules/@brightsideoy/kama/dist/build-seed.js && for f in seed-*.sql; do wrangler d1 execute ${dbName} --local --file="$f"; done`;
+        workerPkg.scripts["seed:remote"] = `node ../node_modules/@brightsideoy/kama/dist/build-seed.js && for f in seed-*.sql; do wrangler d1 execute ${dbName} --remote --file="$f"; done`;
 
         workerPkg.devDependencies = workerPkg.devDependencies || {};
         workerPkg.devDependencies.wrangler = WRANGLER_LATEST;
-        // 🎯 explicit deletion of TSX addition on promotion
         if (workerPkg.devDependencies.tsx) delete workerPkg.devDependencies.tsx;
 
         writeFileSync(workerPkgPath, JSON.stringify(workerPkg, null, 2));
@@ -714,7 +732,8 @@ async function promoteLocalToCloudflare() {
             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 }],
+            // 🎯 2. ARCHITECTURE FIX: Removed strict zone_name requirement
+            routes: [{ pattern: 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));
@@ -739,7 +758,7 @@ async function promoteLocalToCloudflare() {
 }
 
 /**
- * Helper: Copies the Astro starter template and hydrates runtime tokens
+- Helper: Copies the Astro starter template and hydrates runtime tokens
  */
 async function generateAstroSite(rootDir, siteFolder, siteDomain, cmsFullUrl, workerName = 'kama-worker', isCloudflare = false, frontendApiSecret = '') {
     const siteDir = join(rootDir, 'sites', siteFolder);
@@ -800,6 +819,7 @@ 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 }],
+            routes: [{ pattern: siteDomain, custom_domain: true, enabled: true, previews_enabled: false }],
             vars: { PUBLIC_CMS_URL: cmsFullUrl, PUBLIC_API_URL: cmsFullUrl, PUBLIC_CHANNEL_ID: channelKey, PUBLIC_TREE_ID: treeKey, PUBLIC_SITE_NAME: siteLabel }
         };
 
@@ -807,7 +827,6 @@ async function generateAstroSite(rootDir, siteFolder, siteDomain, cmsFullUrl, wo
         writeFileSync(join(siteDir, 'wrangler.json'), JSON.stringify(siteConfig, null, 2));
     }
 
-    // 🎯 Dynamically append the secret to the Astro environment setup
     let envContent = `# 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`;
 
     if (frontendApiSecret) {