create-nextblock 0.2.77 → 0.8.0

package/bin/create-nextblock.js

@@ -1,5 +1,6 @@
 #!/usr/bin/env node
 
+// eslint-disable-next-line @nx/enforce-module-boundaries
 import * as clack from '@clack/prompts';
 import { spawn } from 'node:child_process';
 import crypto from 'node:crypto';
@@ -10,7 +11,6 @@ import { execa } from 'execa';
 import { program } from 'commander';
 import chalk from 'chalk';
 import fs from 'fs-extra';
-import open from 'open';
 
 const DEFAULT_PROJECT_NAME = 'nextblock-cms';
 const __filename = fileURLToPath(import.meta.url);
@@ -52,17 +52,20 @@ const PACKAGE_VERSION_SOURCES = {
   '@nextblock-cms/sdk': resolve(REPO_ROOT, 'libs/sdk/package.json'),
 };
 
+program.name('create-nextblock').description('NextBlock™ CMS CLI');
+
 program
-  .name('create-nextblock')
-  .description('Bootstrap a NextBlock CMS project')
-  .argument(
-    '[project-directory]',
-    'The name of the project directory to create',
-  )
+  .command('create [project-directory]', { isDefault: true })
+  .description('Bootstrap a NextBlock™ CMS project')
   .option('--skip-install', 'Skip installing dependencies')
   .option('-y, --yes', 'Skip all interactive prompts and use defaults')
   .action(handleCommand);
 
+program
+  .command('activate [module]')
+  .description('Activate a premium NextBlock™ CMS module')
+  .action(handleActivateCommand);
+
 await program.parseAsync(process.argv).catch((error) => {
   console.error(
     chalk.red(error instanceof Error ? error.message : String(error)),
@@ -180,7 +183,7 @@ async function handleCommand(projectDirectory, options) {
 
     console.log(
       chalk.green(
-        `\nSuccess! Your NextBlock CMS project "${projectName}" is ready.\n`,
+        `\nSuccess! Your NextBlock™ CMS project "${projectName}" is ready.\n`,
       ),
     );
     console.log(chalk.cyan('Next step:'));
@@ -195,482 +198,778 @@ async function handleCommand(projectDirectory, options) {
   }
 }
 
-async function runSetupWizard(projectDir, projectName) {
-  const projectPath = resolve(projectDir);
-  process.chdir(projectPath);
+async function handleActivateCommand(moduleName) {
+  if (!moduleName || moduleName !== 'ecommerce') {
+    console.error(
+      chalk.red('Invalid module name. Supported modules: ecommerce'),
+    );
+    process.exit(1);
+  }
 
-  clack.intro('🚀 Welcome to the NextBlock setup wizard!');
+  clack.intro(`🚀 Activating NextBlock™ module: ${moduleName}`);
 
-  const supabaseDir = resolve(projectPath, 'supabase');
-  await fs.ensureDir(supabaseDir);
-  await resetSupabaseProjectRef(projectPath);
+  const projectPath = process.cwd();
 
-  clack.note(
-    'Before proceeding, ensure you have a Supabase project ready.\n\n' +
-      '1. Supabase Cloud: Create a project at https://supabase.com/dashboard\n' +
-      '2. Vercel Storage: If created via Vercel > Storage, check your .env.local snippet on Vercel for keys.',
-    'Supabase Prerequisites',
+  // 1. Install NPM package
+  clack.note(`Installing @nextblock-cms/${moduleName}...`);
+
+  await execa(
+    'npm',
+    ['install', `@nextblock-cms/ecommerce@npm:@nextblock-cms/ecom@latest`],
+    { cwd: projectPath, stdio: 'inherit' },
   );
+  clack.note('NPM package installed!');
+
+  // 2. Inject Route Wrappers
+  clack.note('Injecting route wrappers...');
+
+  const routesToInject = {
+    'app/cms/orders/page.tsx': `import { OrdersPage as OrdersPageUI } from '@nextblock-cms/ecommerce';
+import { verifyPackageOnline } from '@nextblock-cms/db/server';
+import { redirect } from 'next/navigation';
+
+export default async function OrdersPage() {
+  const isOnline = await verifyPackageOnline('ecommerce');
+  if (!isOnline) {
+    redirect('/cms/settings/packages');
+  }
+
+  return <OrdersPageUI />;
+}`,
+    'app/cms/orders/[id]/page.tsx': `import { OrderDetailPage as OrderDetailPageUI } from '@nextblock-cms/ecommerce';
+import { verifyPackageOnline } from '@nextblock-cms/db/server';
+import { redirect } from 'next/navigation';
+
+export default async function OrderDetailPage({
+  params,
+}: {
+  params: Promise<{ id: string }>;
+}) {
+  const isOnline = await verifyPackageOnline('ecommerce');
+  if (!isOnline) {
+    redirect('/cms/settings/packages');
+  }
+  const resolvedParams = await params;
+  return <OrderDetailPageUI params={resolvedParams} />;
+}`,
+    'app/cms/products/page.tsx': `import { ProductsPage as ProductsPageUI } from '@nextblock-cms/ecommerce';
+import { verifyPackageOnline } from '@nextblock-cms/db/server';
+import { redirect } from 'next/navigation';
+
+export default async function ProductsPage() {
+  const isOnline = await verifyPackageOnline('ecommerce');
+  if (!isOnline) {
+    redirect('/cms/settings/packages');
+  }
+
+  return <ProductsPageUI />;
+}`,
+    'app/cms/products/new/page.tsx': `import { NewProductPage as NewProductPageUI } from '@nextblock-cms/ecommerce';
+import { verifyPackageOnline } from '@nextblock-cms/db/server';
+import { redirect } from 'next/navigation';
 
-  clack.note('Connecting to Supabase...');
-  clack.note('I will now open your browser to log into Supabase.');
-  await runSupabaseCli(['login'], { cwd: projectPath });
+export default async function NewProductPage() {
+  const isOnline = await verifyPackageOnline('ecommerce');
+  if (!isOnline) {
+    redirect('/cms/settings/packages');
+  }
 
-  clack.note('Now, please select your NextBlock project when prompted.');
-  await runSupabaseCli(['link'], { cwd: projectPath });
-  if (process.stdin.isTTY) {
-    try {
-      process.stdin.setRawMode(false);
-    } catch {
-      // ignore
+  return <NewProductPageUI />;
+}`,
+    'app/cms/products/[id]/edit/page.tsx': `import { EditProductPage as EditProductPageUI } from '@nextblock-cms/ecommerce';
+import { verifyPackageOnline } from '@nextblock-cms/db/server';
+import { redirect } from 'next/navigation';
+
+export default async function EditProductPage({ params }: { params: Promise<{ id: string }> }) {
+  const isOnline = await verifyPackageOnline('ecommerce');
+  if (!isOnline) {
+    redirect('/cms/settings/packages');
+  }
+
+  const resolvedParams = await params;
+  return <EditProductPageUI params={resolvedParams} />;
+}`,
+    'app/cms/payments/page.tsx': `import { PaymentsPage as PaymentsPageUI } from '@nextblock-cms/ecommerce';
+import { verifyPackageOnline } from '@nextblock-cms/db/server';
+import { redirect } from 'next/navigation';
+
+export default async function PaymentsPage() {
+  const isOnline = await verifyPackageOnline('ecommerce');
+  if (!isOnline) {
+    redirect('/cms/settings/packages');
+  }
+
+  return <PaymentsPageUI />;
+}`,
+    'app/cms/coupons/page.tsx': `import { CouponsPage as CouponsPageUI } from '@nextblock-cms/ecommerce/server';
+import { verifyPackageOnline } from '@nextblock-cms/db/server';
+import { redirect } from 'next/navigation';
+
+export default async function CouponsPage({
+  searchParams,
+}: {
+  searchParams: Promise<{ status?: string; q?: string }>;
+}) {
+  const isOnline = await verifyPackageOnline('ecommerce');
+  if (!isOnline) {
+    redirect('/cms/settings/packages');
+  }
+
+  return <CouponsPageUI searchParams={await searchParams} />;
+}`,
+    'app/cms/coupons/[id]/edit/page.tsx': `import { EditCouponPage as EditCouponPageUI } from '@nextblock-cms/ecommerce/server';
+import { verifyPackageOnline } from '@nextblock-cms/db/server';
+import { redirect } from 'next/navigation';
+
+export default async function EditCouponPage({
+  params,
+}: {
+  params: Promise<{ id: string }>;
+}) {
+  const isOnline = await verifyPackageOnline('ecommerce');
+  if (!isOnline) {
+    redirect('/cms/settings/packages');
+  }
+
+  return <EditCouponPageUI params={params} />;
+}`,
+    'app/checkout/success/page.tsx': `import { CheckoutSuccessPage as CheckoutSuccessPageUI } from '@nextblock-cms/ecommerce';
+import { verifyPackageOnline } from '@nextblock-cms/db/server';
+import { notFound } from 'next/navigation';
+
+export default async function CheckoutSuccessPage() {
+  const isOnline = await verifyPackageOnline('ecommerce');
+  if (!isOnline) {
+    notFound();
+  }
+
+  return <CheckoutSuccessPageUI />;
+}`,
+    'app/api/checkout/route.ts': `import { NextResponse } from 'next/server';
+import { getPaymentProvider } from '@nextblock-cms/ecommerce/server';
+import { createClient, verifyPackageOnline } from '@nextblock-cms/db/server';
+import { normalizeCustomerAddress } from '@nextblock-cms/ecommerce';
+
+function resolveProviderFromItem(item) {
+  if (item?.provider === 'stripe' || item?.provider === 'freemius') {
+    return item.provider;
+  }
+
+  if (item?.payment_provider === 'stripe' || item?.payment_provider === 'freemius') {
+    return item.payment_provider;
+  }
+
+  if (item?.product_type === 'digital') {
+    return 'freemius';
+  }
+
+  if (item?.product_type === 'physical') {
+    return 'stripe';
+  }
+
+  if (item?.freemius_product_id) {
+    return 'freemius';
+  }
+
+  return null;
+}
+
+export async function POST(req: Request) {
+  try {
+    const isOnline = await verifyPackageOnline('ecommerce');
+    if (!isOnline) {
+      return NextResponse.json({ error: 'Ecommerce module license is inactive' }, { status: 403 });
+    }
+
+    const {
+      items,
+      customerEmail,
+      customerPhone,
+      billingAddress,
+      shippingAddress,
+      shippingMethodId,
+      currencyCode,
+      locale,
+      couponCode,
+      couponContextItems,
+    } = await req.json();
+
+    if (!items || !Array.isArray(items)) {
+      return NextResponse.json({ error: 'Invalid items data' }, { status: 400 });
+    }
+
+    const providerNames = Array.from(
+      new Set(items.map((item) => resolveProviderFromItem(item)).filter(Boolean))
+    );
+
+    if (providerNames.length === 0) {
+      return NextResponse.json(
+        { error: 'Each checkout request must include provider-aware cart items.' },
+        { status: 400 }
+      );
+    }
+
+    if (providerNames.length > 1) {
+      return NextResponse.json(
+        { error: 'Mixed-provider carts must be checked out in separate steps.' },
+        { status: 400 }
+      );
     }
-    process.stdin.setEncoding('utf8');
-    process.stdin.resume();
+
+    const providerName = providerNames[0];
+
+    if (providerName === 'freemius' && items.length !== 1) {
+      return NextResponse.json(
+        { error: 'Freemius items must be checked out one at a time.' },
+        { status: 400 }
+      );
+    }
+
+    if (!billingAddress) {
+      return NextResponse.json({ error: 'Billing address is required' }, { status: 400 });
+    }
+
+    const supabase = createClient();
+    const provider = getPaymentProvider(providerName);
+
+    const { data: { user } } = await supabase.auth.getUser();
+    const userId = user?.id;
+    const resolvedCustomerEmail = user?.email || customerEmail || null;
+
+    const { url, error, errorKey, errorParams, errorStatus, customProps } =
+      await provider.createCheckoutSession({
+        items,
+        customerEmail: resolvedCustomerEmail,
+        customerPhone,
+        userId,
+        billingAddress: normalizeCustomerAddress(billingAddress) ?? billingAddress,
+        shippingAddress:
+          providerName === 'stripe'
+            ? normalizeCustomerAddress(shippingAddress)
+            : null,
+        shippingMethodId: providerName === 'stripe' ? shippingMethodId : null,
+        currencyCode: typeof currencyCode === 'string' ? currencyCode : null,
+        locale: typeof locale === 'string' ? locale : null,
+        couponCode: typeof couponCode === 'string' ? couponCode : null,
+        couponContextItems: Array.isArray(couponContextItems) ? couponContextItems : items,
+      });
+
+    if (error) {
+      console.error('Checkout Error:', error);
+      return NextResponse.json(
+        { error, errorKey, errorParams },
+        { status: errorStatus ?? 500 }
+      );
+    }
+
+    return NextResponse.json({ url, customProps });
+  } catch (err: any) {
+    console.error('Checkout API Error:', err);
+    return NextResponse.json({ error: 'Internal Server Error' }, { status: 500 });
   }
+}`,
+  };
 
-  let projectId = await readSupabaseProjectRef(projectPath);
+  for (const [routePath, content] of Object.entries(routesToInject)) {
+    const fullPath = resolve(projectPath, routePath);
+    await fs.ensureDir(dirname(fullPath));
+    await fs.writeFile(fullPath, content);
+  }
 
-  if (!projectId) {
-    clack.note('I could not detect your Supabase project ref automatically.');
-    const manual = await clack.text({
-      message:
-        'Enter your Supabase project ref (from the Supabase dashboard URL or the link output, e.g., abcdefghijklmnopqrstu):',
-      validate: (val) => (!val ? 'Project ref is required' : undefined),
-    });
-    if (clack.isCancel(manual)) {
-      handleWizardCancel('Setup cancelled.');
+  clack.outro(
+    '✅ Ecommerce module activated successfully! You can now use the storefront features.',
+  );
+}
+
+// clack validator that rejects empty/whitespace-only input with a labelled message.
+function requiredValue(label) {
+  return (value) =>
+    value && String(value).trim() ? undefined : `${label} is required`;
+}
+
+// Read the current value of a `KEY=` line from an .env file body (handles quotes),
+// so re-runs can reuse already-generated secrets instead of regenerating them.
+function readEnvValue(envContent, key) {
+  for (const line of envContent.split(/\r?\n/)) {
+    if (line.startsWith(key)) {
+      return line.slice(key.length).trim().replace(/^"(.*)"$/, '$1');
     }
-    projectId = manual.trim();
   }
-  await ensureSupabaseAssets(projectPath, { required: true });
+  return '';
+}
+
+function generateSecret() {
+  return crypto.randomBytes(32).toString('hex');
+}
+
+async function runSetupWizard(projectDir, projectName) {
+  const projectPath = resolve(projectDir);
+  process.chdir(projectPath);
+
+  clack.intro('🚀 NextBlock™ CMS setup wizard');
+
+  // 0. Prerequisites — mirror `npm run setup` (tools/scripts/setup.mjs). Make sure the
+  //    developer has everything BEFORE we start prompting.
+  clack.note(
+    [
+      '1. A Supabase project   https://supabase.com/dashboard',
+      '   • Reference ID             — Project Settings > General > "Reference ID"',
+      '   • Connection string        — Connect (top bar) > Direct connection > URI',
+      '   • anon + service_role keys — Project Settings > API Keys',
+      '   • Personal Access Token    — Account > Access Tokens > Generate new token',
+      '',
+      '2. A Cloudflare R2 bucket   https://dash.cloudflare.com  > R2',
+      '   • Create a bucket, then enable its Public Development URL (Bucket > Settings > General)',
+      '   • Create an R2 API token (Object Read & Write); copy the Access Key ID + Secret (shown once)',
+      '',
+      '3. SMTP credentials   SMTP2GO works very well: https://www.smtp2go.com',
+      '   • Required so Supabase can email the confirmation link your first admin needs to sign in',
+    ].join('\n'),
+    'Before you continue, have all of the following ready',
+  );
 
-  const siteUrlPrompt = await clack.text({
-    message: 'What is the public URL of your site? (NEXT_PUBLIC_URL)',
-    initialValue: 'http://localhost:3000',
-    validate: (val) => (!val ? 'URL is required' : undefined),
+  const ready = await clack.confirm({
+    message: 'Do you have your Supabase, Cloudflare R2, and SMTP details ready?',
+    initialValue: true,
   });
-  if (clack.isCancel(siteUrlPrompt)) {
+  if (clack.isCancel(ready)) {
     handleWizardCancel('Setup cancelled.');
   }
-  const siteUrl = siteUrlPrompt.trim();
+  if (!ready) {
+    clack.note(
+      'No problem — your project files are ready. Gather the items above, then copy\n.env.example to .env.local and fill it in. Full guide: docs/05-DEVELOPER-GUIDE.md',
+      'Setup paused',
+    );
+    return;
+  }
 
-  clack.note(
-    'Please go to your Supabase project dashboard to get the following secrets.\n' +
-      'Note: For "Access Token", go to Account > Access Tokens > Generate New Token.',
-  );
-  const supabaseKeys = await clack.group(
+  await fs.ensureDir(resolve(projectPath, 'supabase'));
+
+  // 1. Supabase — same questions/order as setup.mjs. Nothing is masked: you are pasting
+  //    keys you just copied, and seeing them makes paste mistakes easy to spot.
+  clack.note('Get these from https://supabase.com/dashboard', 'Supabase project');
+  const supabase = await clack.group(
     {
+      projectId: () =>
+        clack.text({
+          message: 'Project ID (Project Settings > General > "Reference ID"):',
+          validate: requiredValue('Project Reference ID'),
+        }),
       postgresUrl: () =>
         clack.text({
           message:
-            'What is your Connection String? (Supabase: Project Dashboard > Connect (Top Left) > Connection String > URI | Vercel: POSTGRES_URL)',
+            'Connection String (Connect > Direct connection > URI — replace [YOUR-PASSWORD] with your DB password):',
           placeholder: 'postgresql://...',
-          validate: (val) =>
-            !val ? 'Connection string is required' : undefined,
+          validate: requiredValue('Connection string'),
         }),
       anonKey: () =>
-        clack.password({
-          message:
-            'What is your Project API Key (anon key)? (Supabase: Project Settings > API Keys > Project Legacy API Keys | Vercel: SUPABASE_ANON_KEY)',
-          validate: (val) => (!val ? 'Anon Key is required' : undefined),
+        clack.text({
+          message: 'Project API Key — anon / public (Project Settings > API Keys):',
+          validate: requiredValue('Anon key'),
         }),
       serviceKey: () =>
-        clack.password({
-          message:
-            'What is your Service Role Key (service_role key)? (Supabase: Project Settings > API Keys > Project Legacy API Keys | Vercel: SUPABASE_SERVICE_ROLE_KEY)',
-          validate: (val) =>
-            !val ? 'Service Role Key is required' : undefined,
+        clack.text({
+          message: 'Service Role Key — service_role (Project Settings > API Keys):',
+          validate: requiredValue('Service role key'),
         }),
       accessToken: () =>
-        clack.password({
+        clack.text({
           message:
-            'What is your Personal Access Token? (Supabase: Account > Access Tokens). Required for deployment.',
-          validate: (val) =>
-            !val ? 'Access Token is required for deployment' : undefined,
+            'Personal Access Token (Account > Access Tokens > Generate new token):',
+          validate: requiredValue('Access token'),
+        }),
+      siteUrl: () =>
+        clack.text({
+          // Standalone `npm run dev` is plain `next dev` on :3000 (NOT `nx serve` on :4200),
+          // so the local default differs from the monorepo setup wizard on purpose.
+          message: 'Public site URL [NEXT_PUBLIC_URL]:',
+          initialValue: 'http://localhost:3000',
+          validate: requiredValue('Site URL'),
         }),
     },
     { onCancel: () => handleWizardCancel('Setup cancelled.') },
   );
 
-  clack.note('Generating local secrets...');
-  const revalidationToken = crypto.randomBytes(32).toString('hex');
+  const projectId = supabase.projectId.trim();
+  const postgresUrl = supabase.postgresUrl.trim();
+  const siteUrl = supabase.siteUrl.trim().replace(/\/+$/, '');
   const supabaseUrl = `https://${projectId}.supabase.co`;
 
-  const postgresUrl = supabaseKeys.postgresUrl;
+  // Extract the database password from the connection string; prompt if it is missing
+  // or still the [YOUR-PASSWORD] placeholder.
   let dbPassword = '';
   try {
-    const parsedUrl = new URL(postgresUrl);
-    dbPassword = parsedUrl.password;
+    dbPassword = decodeURIComponent(new URL(postgresUrl).password);
   } catch {
-    // Fallback if URL parsing fails, though validation above checks for non-empty
+    // Fall through to the manual prompt below.
   }
-
-  if (!dbPassword) {
-    const passwordPrompt = await clack.password({
+  if (!dbPassword || /YOUR-PASSWORD/i.test(dbPassword)) {
+    const passwordPrompt = await clack.text({
       message:
-        'Could not extract password from URL. What is your Database Password?',
-      validate: (val) => (!val ? 'Password is required' : undefined),
+        'Could not read the DB password from the URI. Enter your Postgres database password:',
+      validate: requiredValue('Database password'),
     });
     if (clack.isCancel(passwordPrompt)) {
       handleWizardCancel('Setup cancelled.');
     }
-    dbPassword = passwordPrompt;
+    dbPassword = passwordPrompt.trim();
   }
 
-  const envPath = resolve(projectPath, '.env');
-  const appendEnvBlock = async (label, lines) => {
-    const normalized = lines.join('\n');
-    const blockContent = normalized.endsWith('\n')
-      ? normalized
-      : `${normalized}\n`;
-    if (canWriteEnv) {
-      await fs.appendFile(envPath, blockContent);
-    } else {
-      clack.note(
-        `Add the following ${label} values to your existing .env:\n${blockContent}`,
-      );
-    }
+  // 2. Cloudflare R2 — required. Powers media uploads, image processing, and backups.
+  clack.note('https://dash.cloudflare.com  > R2', 'Cloudflare R2 storage');
+  const r2 = await clack.group(
+    {
+      accountId: () =>
+        clack.text({
+          message: 'R2 Account ID (R2 overview > Account details):',
+          validate: requiredValue('R2 Account ID'),
+        }),
+      bucketName: () =>
+        clack.text({
+          message: 'R2 Bucket Name:',
+          validate: requiredValue('R2 Bucket Name'),
+        }),
+      publicBaseUrl: () =>
+        clack.text({
+          message:
+            'R2 Public Development URL (Bucket > Settings > Public Development URL, e.g. https://pub-xxxx.r2.dev):',
+          validate: requiredValue('R2 Public Development URL'),
+        }),
+      accessKey: () =>
+        clack.text({
+          message: 'R2 Access Key ID (R2 > Manage API Tokens):',
+          validate: requiredValue('R2 Access Key ID'),
+        }),
+      secretKey: () =>
+        clack.text({
+          message:
+            'R2 Secret Access Key (shown only once when the token is created):',
+          validate: requiredValue('R2 Secret Access Key'),
+        }),
+    },
+    { onCancel: () => handleWizardCancel('Setup cancelled.') },
+  );
+
+  // 3. SMTP — required. Sends the sign-up confirmation email your first admin needs.
+  clack.note('SMTP2GO works very well: https://www.smtp2go.com', 'SMTP email');
+  const smtp = await clack.group(
+    {
+      host: () =>
+        clack.text({
+          message: 'SMTP Host (e.g. mail.smtp2go.com):',
+          validate: requiredValue('SMTP Host'),
+        }),
+      port: () =>
+        clack.text({
+          message: 'SMTP Port (465 = SSL, 587 = STARTTLS):',
+          initialValue: '465',
+          validate: requiredValue('SMTP Port'),
+        }),
+      user: () =>
+        clack.text({
+          message: 'SMTP User:',
+          validate: requiredValue('SMTP User'),
+        }),
+      pass: () =>
+        clack.text({
+          message: 'SMTP Password:',
+          validate: requiredValue('SMTP Password'),
+        }),
+      fromEmail: () =>
+        clack.text({
+          message: 'From Email (the address confirmation emails are sent from):',
+          validate: requiredValue('From Email'),
+        }),
+      fromName: () =>
+        clack.text({
+          message: 'From Name (e.g. NextBlock):',
+          validate: requiredValue('From Name'),
+        }),
+    },
+    { onCancel: () => handleWizardCancel('Setup cancelled.') },
+  );
+
+  const smtpValues = {
+    host: smtp.host,
+    port: smtp.port,
+    user: smtp.user,
+    pass: smtp.pass,
+    fromEmail: smtp.fromEmail,
+    fromName: smtp.fromName,
   };
-  const envLines = [
-    `NEXT_PUBLIC_URL=${siteUrl}`,
-    '# Vercel / Supabase',
-    `SUPABASE_PROJECT_ID=${projectId}`,
-    `NEXT_PUBLIC_SUPABASE_URL=${supabaseUrl}`,
-    `NEXT_PUBLIC_SUPABASE_ANON_KEY=${supabaseKeys.anonKey}`,
-    `SUPABASE_SERVICE_ROLE_KEY=${supabaseKeys.serviceKey}`,
-    `SUPABASE_ACCESS_TOKEN=${supabaseKeys.accessToken}`,
-    `POSTGRES_URL=${postgresUrl}`,
-    '',
-    '# Revalidation',
-    `REVALIDATE_SECRET_TOKEN=${revalidationToken}`,
-    '',
-  ];
 
-  let canWriteEnv = true;
+  // 4. Write .env.local with everything we collected. Mirror setup.mjs: seed from the
+  //    template .env.example when present, replace keys line-by-line, append any missing,
+  //    and reuse already-generated secrets so re-runs are idempotent. .env.local is what
+  //    `next dev` loads first and is covered by the generated .gitignore.
+  clack.note('Writing .env.local...');
+  const envPath = resolve(projectPath, '.env.local');
+  const envExamplePath = resolve(projectPath, '.env.example');
+  let envContent = '';
   if (await fs.pathExists(envPath)) {
-    const overwrite = await clack.confirm({
-      message: '.env already exists. Overwrite with generated values?',
-      initialValue: false,
-    });
-    if (clack.isCancel(overwrite)) {
-      handleWizardCancel('Setup cancelled.');
-    }
-    if (!overwrite) {
-      canWriteEnv = false;
-      clack.note(
-        'Keeping existing .env. Add/merge the generated values manually.',
-      );
+    envContent = await fs.readFile(envPath, 'utf8');
+  } else if (await fs.pathExists(envExamplePath)) {
+    envContent = await fs.readFile(envExamplePath, 'utf8');
+  }
+
+  const cronSecret = readEnvValue(envContent, 'CRON_SECRET=') || generateSecret();
+  const draftSecret =
+    readEnvValue(envContent, 'DRAFT_MODE_SECRET=') || generateSecret();
+  const revalidateSecret =
+    readEnvValue(envContent, 'REVALIDATE_SECRET_TOKEN=') || generateSecret();
+
+  const replacements = {
+    'SUPABASE_PROJECT_ID=': `SUPABASE_PROJECT_ID=${projectId}`,
+    'POSTGRES_URL=': `POSTGRES_URL=${postgresUrl}`,
+    'POSTGRES_PASSWORD=': `POSTGRES_PASSWORD="${dbPassword}"`,
+    'NEXT_PUBLIC_SUPABASE_URL=': `NEXT_PUBLIC_SUPABASE_URL=${supabaseUrl}`,
+    'NEXT_PUBLIC_SUPABASE_ANON_KEY=': `NEXT_PUBLIC_SUPABASE_ANON_KEY=${supabase.anonKey}`,
+    'SUPABASE_SERVICE_ROLE_KEY=': `SUPABASE_SERVICE_ROLE_KEY=${supabase.serviceKey}`,
+    'SUPABASE_ACCESS_TOKEN=': `SUPABASE_ACCESS_TOKEN=${supabase.accessToken}`,
+    'NEXT_PUBLIC_URL=': `NEXT_PUBLIC_URL=${siteUrl}`,
+    'CRON_SECRET=': `CRON_SECRET=${cronSecret}`,
+    'DRAFT_MODE_SECRET=': `DRAFT_MODE_SECRET=${draftSecret}`,
+    'REVALIDATE_SECRET_TOKEN=': `REVALIDATE_SECRET_TOKEN=${revalidateSecret}`,
+    // The R2 public URL is consumed under two names (next/image remotePatterns + CSP, and
+    // media URL resolution) — write the same value to both, matching setup.mjs.
+    'NEXT_PUBLIC_R2_PUBLIC_URL=': `NEXT_PUBLIC_R2_PUBLIC_URL=${r2.publicBaseUrl}`,
+    'NEXT_PUBLIC_R2_BASE_URL=': `NEXT_PUBLIC_R2_BASE_URL=${r2.publicBaseUrl}`,
+    'R2_ACCOUNT_ID=': `R2_ACCOUNT_ID=${r2.accountId}`,
+    'R2_BUCKET_NAME=': `R2_BUCKET_NAME=${r2.bucketName}`,
+    'R2_ACCESS_KEY_ID=': `R2_ACCESS_KEY_ID=${r2.accessKey}`,
+    'R2_SECRET_ACCESS_KEY=': `R2_SECRET_ACCESS_KEY=${r2.secretKey}`,
+    'SMTP_HOST=': `SMTP_HOST=${smtpValues.host}`,
+    'SMTP_PORT=': `SMTP_PORT=${smtpValues.port}`,
+    'SMTP_USER=': `SMTP_USER=${smtpValues.user}`,
+    'SMTP_PASS=': `SMTP_PASS=${smtpValues.pass}`,
+    'SMTP_FROM_EMAIL=': `SMTP_FROM_EMAIL=${smtpValues.fromEmail}`,
+    'SMTP_FROM_NAME=': `SMTP_FROM_NAME=${smtpValues.fromName}`,
+    'SUPABASE_AUTH_RATE_LIMIT_EMAIL_SENT=':
+      'SUPABASE_AUTH_RATE_LIMIT_EMAIL_SENT=30',
+  };
+
+  const appliedKeys = new Set();
+  const updatedLines = envContent.split(/\r?\n/).map((line) => {
+    for (const [key, value] of Object.entries(replacements)) {
+      if (line.startsWith(key)) {
+        appliedKeys.add(key);
+        return value;
+      }
     }
-  }
+    return line;
+  });
 
-  if (canWriteEnv) {
-    await fs.writeFile(envPath, envLines.join('\n'));
-    clack.note('Supabase configuration saved to .env');
+  // Append any keys missing from the seed so nothing is silently dropped.
+  for (const [key, value] of Object.entries(replacements)) {
+    if (!appliedKeys.has(key)) {
+      updatedLines.push(value);
+    }
   }
 
-  clack.note('Setting up your database...');
-
-  const dbPushSpinner = clack.spinner();
-  dbPushSpinner.start('Pushing database schema...');
-  try {
-    process.env.POSTGRES_URL = postgresUrl;
-    const migrationsDir = resolve(projectPath, 'supabase', 'migrations');
-    const hasMigrations = async () =>
-      (await fs.pathExists(migrationsDir)) &&
-      (await fs.readdir(migrationsDir)).some((name) => name.endsWith('.sql'));
-
-    if (!(await hasMigrations())) {
-      await ensureSupabaseAssets(projectPath);
-    }
+  await fs.writeFile(envPath, updatedLines.join('\n'), 'utf8');
+  clack.note(
+    'Supabase, R2, SMTP, site URL, and generated secrets saved to .env.local',
+  );
 
-    if (!(await hasMigrations())) {
-      dbPushSpinner.stop(
-        `No migrations found in ${migrationsDir}; skipping db push. Ensure @nextblock-cms/db includes supabase/migrations.`,
-      );
-    } else {
-      const supabaseBin = await getSupabaseBinary(projectPath);
-      const command = supabaseBin === 'npx' ? 'npx' : supabaseBin;
+  // 5. Materialize Supabase assets (migrations, config.toml, branded auth email
+  //    templates) out of the installed @nextblock-cms/db package.
+  await ensureSupabaseAssets(projectPath, { required: true });
 
-      // 1. Link the project explicitly
-      dbPushSpinner.message('Linking to Supabase project...');
-      const linkArgs = supabaseBin === 'npx' ? ['supabase', 'link'] : ['link'];
-      linkArgs.push('--project-ref', projectId);
-      linkArgs.push('--password', dbPassword);
+  // 6. Link the project and apply the schema. These are the standalone equivalents of the
+  //    monorepo `npm run db:link` + `npm run db:migrate:fresh` (which do not exist in a
+  //    generated project): we drive the Supabase CLI directly, authenticating with the
+  //    access token so no browser login is required.
+  const supabaseBin = await getSupabaseBinary(projectPath);
+  const command = supabaseBin === 'npx' ? 'npx' : supabaseBin;
+  const sbArgs = (args) => (supabaseBin === 'npx' ? ['supabase', ...args] : args);
+  const supabaseEnv = {
+    ...process.env,
+    SUPABASE_ACCESS_TOKEN: supabase.accessToken,
+    SUPABASE_DB_PASSWORD: dbPassword,
+    POSTGRES_URL: postgresUrl,
+    // Available for env() substitution in supabase config.toml during `config push`.
+    NEXT_PUBLIC_URL: siteUrl,
+  };
 
-      await execa(command, linkArgs, {
-        stdio: 'inherit',
-        cwd: projectPath,
-      });
+  const applySchema = await clack.confirm({
+    message:
+      'Apply the database schema to the linked project now? (Safe for a new database; does not delete existing data.)',
+    initialValue: true,
+  });
+  if (clack.isCancel(applySchema)) {
+    handleWizardCancel('Setup cancelled.');
+  }
 
-      // 2. Push the schema using the linked state
-      dbPushSpinner.message('Pushing database schema...');
-      const pushArgs =
-        supabaseBin === 'npx' ? ['supabase', 'db', 'push'] : ['db', 'push'];
-      pushArgs.push('--include-all');
+  const dbSpinner = clack.spinner();
+  dbSpinner.start('Linking to your Supabase project...');
+  try {
+    await execa(
+      command,
+      sbArgs(['link', '--project-ref', projectId, '--password', dbPassword]),
+      { stdio: 'inherit', cwd: projectPath, env: supabaseEnv },
+    );
 
-      await execa(command, pushArgs, {
+    if (applySchema) {
+      dbSpinner.message('Pushing database schema...');
+      await execa(command, sbArgs(['db', 'push', '--include-all']), {
         stdio: ['pipe', 'inherit', 'inherit'],
         cwd: projectPath,
         input: 'y\n', // Auto-confirm the push prompt
-        env: {
-          ...process.env,
-          SUPABASE_DB_PASSWORD: dbPassword,
-        },
+        env: supabaseEnv,
       });
 
-      // 3. Push the config (for Auth settings like site_url)
-      dbPushSpinner.message('Pushing Supabase config (auth settings)...');
-      const configPushArgs =
-        supabaseBin === 'npx'
-          ? ['supabase', 'config', 'push']
-          : ['config', 'push'];
-
-      await execa(command, configPushArgs, {
+      dbSpinner.message('Pushing Supabase config (auth settings)...');
+      await execa(command, sbArgs(['config', 'push']), {
         stdio: ['pipe', 'inherit', 'inherit'],
         cwd: projectPath,
-        env: {
-          ...process.env,
-          SUPABASE_DB_PASSWORD: dbPassword,
-          // Ensure NEXT_PUBLIC_URL is available for env() substitution in config.toml
-          NEXT_PUBLIC_URL: siteUrl,
-        },
+        env: supabaseEnv,
       });
 
-      dbPushSpinner.stop('Database schema and config pushed successfully!');
+      dbSpinner.stop('Database schema and config applied.');
+    } else {
+      dbSpinner.stop(
+        'Linked. Skipped schema push — run `npx supabase db push --include-all` when ready.',
+      );
     }
   } catch (error) {
-    dbPushSpinner.stop(
-      'Database push failed. Please run `npx supabase db push` manually.',
+    dbSpinner.stop(
+      'Database setup failed. You can run `npx supabase db push --include-all` manually.',
     );
     if (error instanceof Error) {
       clack.note(error.message);
     }
   }
 
-  clack.note(
-    'Optional Cloudflare R2 Setup:\nHave your Account ID, API token (Access + Secret), bucket name, and public bucket URL handy if you want media storage ready now.',
-  );
-  const setupR2 = await clack.confirm({
-    message:
-      'Do you want to set up Cloudflare R2 for media storage now? (Optional > populate .env keys)',
+  // 7. Sync hosted Supabase Auth: custom SMTP + branded email templates. SMTP and the
+  //    access token are required, so this always runs (matching setup.mjs). This is what
+  //    lets Supabase email your first admin their confirmation link.
+  await enableSupabaseSmtpConfig(projectPath);
+  await configureHostedSupabaseAuth(projectPath, {
+    projectId,
+    siteUrl,
+    accessToken: supabase.accessToken,
+    smtpValues,
   });
-  if (clack.isCancel(setupR2)) {
-    handleWizardCancel('Setup cancelled.');
-  }
-
-  let r2Values = {
-    publicBaseUrl: '',
-    accountId: '',
-    bucketName: '',
-    accessKey: '',
-    secretKey: '',
-  };
-
-  if (setupR2) {
-    clack.note(
-      'I will open your browser to the R2 dashboard.\nYou need to create a bucket and an R2 API Token.',
-    );
-    await open('https://dash.cloudflare.com/?to=/:account/r2', { wait: false });
-
-    const r2Keys = await clack.group(
-      {
-        accountId: () =>
-          clack.text({
-            message:
-              'R2: Paste your Cloudflare Account ID (Overview > Account Details - Bottom right):',
-            validate: (val) => (!val ? 'Account ID is required' : undefined),
-          }),
-        bucketName: () =>
-          clack.text({
-            message: 'R2: Paste your Bucket Name:',
-            validate: (val) => (!val ? 'Bucket name is required' : undefined),
-          }),
-        accessKey: () =>
-          clack.password({
-            message: 'R2: Paste your Access Key ID (create API tokens):',
-            validate: (val) => (!val ? 'Access Key ID is required' : undefined),
-          }),
-        secretKey: () =>
-          clack.password({
-            message: 'R2: Paste your Secret Access Key:',
-            validate: (val) =>
-              !val ? 'Secret Access Key is required' : undefined,
-          }),
-        publicBaseUrl: () =>
-          clack.text({
-            message:
-              'R2: Public Base URL (Bucket > Settings > Public Development URL-Enable: e.g., https://pub-xxx.r2.dev)',
-            validate: (val) =>
-              !val ? 'Public base URL is required' : undefined,
-          }),
-      },
-      { onCancel: () => handleWizardCancel('Setup cancelled.') },
-    );
 
-    r2Values = {
-      publicBaseUrl: r2Keys.publicBaseUrl,
-      accountId: r2Keys.accountId,
-      bucketName: r2Keys.bucketName,
-      accessKey: r2Keys.accessKey,
-      secretKey: r2Keys.secretKey,
-    };
-  }
-
-  await appendEnvBlock('Cloudflare R2', [
-    '',
-    '# Cloudflare',
-    `NEXT_PUBLIC_R2_BASE_URL=${r2Values.publicBaseUrl}`,
-    `R2_ACCOUNT_ID=${r2Values.accountId}`,
-    `R2_BUCKET_NAME=${r2Values.bucketName}`,
-    `R2_ACCESS_KEY_ID=${r2Values.accessKey}`,
-    `R2_SECRET_ACCESS_KEY=${r2Values.secretKey}`,
-    '',
-  ]);
-  if (setupR2) {
-    clack.note('Cloudflare R2 configuration saved!');
-  } else if (canWriteEnv) {
-    clack.note(
-      'Cloudflare R2 placeholders added to .env. Configure them later when ready.',
-    );
-  }
-
-  clack.note(
-    'Optional SMTP Setup:\nProvide the host, port, credentials, and from details for your email provider (e.g., Resend, Postmark) to send transactional emails immediately.',
-  );
-  const setupSMTP = await clack.confirm({
-    message: 'Do you want to set up an SMTP server for emails now? (Optional)',
+  // 8. Optional premium modules (CLI-specific; requires a license + registry access).
+  const setupPremium = await clack.confirm({
+    message: 'Do you have a license and want to install premium modules now?',
+    initialValue: false,
   });
-  if (clack.isCancel(setupSMTP)) {
+  if (clack.isCancel(setupPremium)) {
     handleWizardCancel('Setup cancelled.');
   }
-
-  let smtpValues = {
-    host: '',
-    port: '',
-    user: '',
-    pass: '',
-    fromEmail: '',
-    fromName: '',
-  };
-
-  if (setupSMTP) {
-    const smtpKeys = await clack.group(
+  if (setupPremium) {
+    clack.note('Installing @nextblock-cms/ecommerce...');
+    await execa(
+      'npm',
+      ['install', '@nextblock-cms/ecommerce@npm:@nextblock-cms/ecom@latest'],
       {
-        host: () =>
-          clack.text({
-            message: 'SMTP: Host (e.g., smtp.resend.com):',
-            validate: (val) => (!val ? 'SMTP host is required' : undefined),
-          }),
-        port: () =>
-          clack.text({
-            message: 'SMTP: Port (e.g., 465):',
-            validate: (val) => (!val ? 'SMTP port is required' : undefined),
-          }),
-        user: () =>
-          clack.text({
-            message: 'SMTP: User (e.g., apikey):',
-            validate: (val) => (!val ? 'SMTP user is required' : undefined),
-          }),
-        pass: () =>
-          clack.password({
-            message: 'SMTP: Password:',
-            validate: (val) => (!val ? 'SMTP password is required' : undefined),
-          }),
-        fromEmail: () =>
-          clack.text({
-            message: 'SMTP: From Email (e.g., onboarding@my.site):',
-            validate: (val) => (!val ? 'From email is required' : undefined),
-          }),
-        fromName: () =>
-          clack.text({
-            message: 'SMTP: From Name (e.g., NextBlock):',
-            validate: (val) => (!val ? 'From name is required' : undefined),
-          }),
+        cwd: projectPath,
+        stdio: 'inherit',
       },
-      { onCancel: () => handleWizardCancel('Setup cancelled.') },
     );
-
-    smtpValues = {
-      host: smtpKeys.host,
-      port: smtpKeys.port,
-      user: smtpKeys.user,
-      pass: smtpKeys.pass,
-      fromEmail: smtpKeys.fromEmail,
-      fromName: smtpKeys.fromName,
-    };
+    clack.note('Premium module installed!');
   }
 
-  clack.note(
-    'Optional Premium Module Setup:\nIf you have a nextblock license, you can install the premium modules now.',
+  clack.outro(
+    [
+      `🎉 Your NextBlock™ project ${projectName ? `"${projectName}" ` : ''}is ready!`,
+      '',
+      'Next steps:',
+      `  1. Start the app:       cd ${projectName} && npm run dev   → ${siteUrl}`,
+      `  2. Create your account: open ${siteUrl}/sign-up`,
+      '     The FIRST account to sign up automatically becomes the ADMIN.',
+      '  3. Confirm your email:  click the link sent to your inbox',
+      `  4. Sign in — you'll land in the CMS at ${siteUrl}/cms/dashboard`,
+    ].join('\n'),
   );
-  const setupPremium = await clack.confirm({
-    message:
-      'Do you have a GitHub Personal Access Token (PAT) for premium modules?',
-    initialValue: false,
-  });
+}
 
-  if (clack.isCancel(setupPremium)) {
-    handleWizardCancel('Setup cancelled.');
+async function enableSupabaseSmtpConfig(projectDir) {
+  const configPath = resolve(projectDir, 'supabase', 'config.toml');
+
+  if (!(await fs.pathExists(configPath))) {
+    return;
   }
 
-  if (setupPremium) {
-    const patPrompt = await clack.text({
-      message: 'Your GitHub Personal Access Token (PAT):',
-      placeholder: 'ghp_ or github_pat_...',
-      validate: (val) => {
-        if (!val) return 'PAT is required';
-        if (!val.startsWith('ghp_') && !val.startsWith('github_pat_')) {
-          return 'Token must start with ghp_ or github_pat_';
-        }
-      },
-    });
+  const smtpBlock = `# [auth.email.smtp]
+# host = "env(SMTP_HOST)"
+# port = 587
+# user = "env(SMTP_USER)"
+# pass = "env(SMTP_PASS)"
+# admin_email = "env(SMTP_FROM_EMAIL)"
+# sender_name = "env(SMTP_FROM_NAME)"`;
 
-    if (clack.isCancel(patPrompt)) {
-      handleWizardCancel('Setup cancelled.');
-    }
-
-    const pat = patPrompt.trim();
+  const enabledSmtpBlock = `[auth.email.smtp]
+host = "env(SMTP_HOST)"
+port = 587
+user = "env(SMTP_USER)"
+pass = "env(SMTP_PASS)"
+admin_email = "env(SMTP_FROM_EMAIL)"
+sender_name = "env(SMTP_FROM_NAME)"`;
 
-    // Configure .npmrc for the project
-    const npmrcPath = resolve(projectPath, '.npmrc');
-    const npmrcContent = [
-      '@nextblock-cms:registry=https://npm.pkg.github.com',
-      `//npm.pkg.github.com/:_authToken=${pat}`,
-      '',
-    ].join('\n');
+  const configContents = await fs.readFile(configPath, 'utf8');
 
-    await fs.writeFile(npmrcPath, npmrcContent);
-    clack.note('Premium modules configured in .npmrc!');
+  if (configContents.includes(enabledSmtpBlock)) {
+    return;
+  }
 
-    clack.note('Installing @nextblock-cms/ecom...');
-    await runCommand('npm', ['install', '@nextblock-cms/ecom'], {
-      cwd: projectPath,
-    });
-    clack.note('Premium module installed!');
+  if (!configContents.includes(smtpBlock)) {
+    throw new Error(
+      `Could not find the SMTP placeholder block in ${configPath}.`,
+    );
   }
 
-  await appendEnvBlock('SMTP', [
-    '',
-    '# Email SMTP Configuration',
-    `SMTP_HOST=${smtpValues.host}`,
-    `SMTP_PORT=${smtpValues.port}`,
-    `SMTP_USER=${smtpValues.user}`,
-    `SMTP_PASS=${smtpValues.pass}`,
-    `SMTP_FROM_EMAIL=${smtpValues.fromEmail}`,
-    `SMTP_FROM_NAME=${smtpValues.fromName}`,
-    '',
-  ]);
-  if (setupSMTP) {
-    clack.note('SMTP configuration saved!');
-  } else if (canWriteEnv) {
+  await fs.writeFile(
+    configPath,
+    configContents.replace(smtpBlock, enabledSmtpBlock),
+    'utf8',
+  );
+}
+
+async function configureHostedSupabaseAuth(
+  projectDir,
+  { projectId, siteUrl, accessToken, smtpValues },
+) {
+  if (!projectId || !siteUrl || !accessToken) {
     clack.note(
-      'SMTP placeholders added to .env. Configure them later when ready.',
+      'Skipped hosted Supabase Auth sync because the project ref, site URL, or access token is missing.',
     );
+    return;
   }
 
-  clack.outro(
-    `🎉 Your NextBlock project ${projectName ? `"${projectName}" ` : ''}is ready!`,
-  );
+  const spinner = clack.spinner();
+  spinner.start('Syncing hosted Supabase Auth SMTP and branded email templates...');
+
+  try {
+    await execa('node', ['tools/configure-supabase-auth.js'], {
+      cwd: projectDir,
+      env: {
+        ...process.env,
+        SUPABASE_PROJECT_ID: projectId,
+        NEXT_PUBLIC_URL: siteUrl,
+        SUPABASE_ACCESS_TOKEN: accessToken,
+        SMTP_HOST: smtpValues.host,
+        SMTP_PORT: smtpValues.port,
+        SMTP_USER: smtpValues.user,
+        SMTP_PASS: smtpValues.pass,
+        SMTP_FROM_EMAIL: smtpValues.fromEmail,
+        SMTP_FROM_NAME: smtpValues.fromName,
+        SUPABASE_AUTH_RATE_LIMIT_EMAIL_SENT:
+          process.env.SUPABASE_AUTH_RATE_LIMIT_EMAIL_SENT || '30',
+      },
+    });
+    spinner.stop('Hosted Supabase Auth configured.');
+  } catch (error) {
+    spinner.stop(
+      'Hosted Supabase Auth sync skipped. You can rerun it later with npm run configure:supabase-auth.',
+    );
+    clack.note(
+      error instanceof Error ? error.message : String(error),
+      'Supabase Auth Sync',
+    );
+  }
 }
 
 function handleWizardCancel(message) {
@@ -875,23 +1174,30 @@ async function ensureEnvExample(projectDir) {
     }
   }
 
-  const placeholder = `# Environment variables for NextBlock CMS
+  const placeholder = `# Environment variables for NextBlock™ CMS
 NEXT_PUBLIC_URL=
-# Vercel / Supabase
+
+# Supabase  —  the setup wizard fills this whole block.
 SUPABASE_PROJECT_ID=
 POSTGRES_URL=
+POSTGRES_PASSWORD=
 NEXT_PUBLIC_SUPABASE_URL=
 NEXT_PUBLIC_SUPABASE_ANON_KEY=
 SUPABASE_SERVICE_ROLE_KEY=
+SUPABASE_ACCESS_TOKEN=
+
+# Auto-generated by the setup wizard.
+CRON_SECRET=
+DRAFT_MODE_SECRET=
+REVALIDATE_SECRET_TOKEN=
 
-# Cloudflare
+# Cloudflare R2  —  setup writes the public URL to both keys.
+NEXT_PUBLIC_R2_PUBLIC_URL=
 NEXT_PUBLIC_R2_BASE_URL=
+R2_ACCOUNT_ID=
+R2_BUCKET_NAME=
 R2_ACCESS_KEY_ID=
 R2_SECRET_ACCESS_KEY=
-R2_BUCKET_NAME=
-R2_ACCOUNT_ID=
-
-REVALIDATE_SECRET_TOKEN=
 
 # Email SMTP Configuration
 SMTP_HOST=
@@ -900,6 +1206,7 @@ SMTP_USER=
 SMTP_PASS=
 SMTP_FROM_EMAIL=
 SMTP_FROM_NAME=
+SUPABASE_AUTH_RATE_LIMIT_EMAIL_SENT=30
 `;
 
   await fs.writeFile(destination, placeholder);
@@ -949,6 +1256,19 @@ async function ensureSupabaseAssets(projectDir, options = {}) {
     migrationsCopied = true;
   }
 
+  // Branded Auth email templates. configure-supabase-auth.js resolves the supabase dir by
+  // requiring a templates/ subdir, and uploads these via the Management API. Without them
+  // the hosted-auth + SMTP sync silently skips and the first admin never gets a
+  // confirmation email — so copy them alongside config.toml + migrations.
+  const sourceTemplates = resolve(packageSupabaseDir, 'templates');
+  const destTemplates = resolve(destSupabaseDir, 'templates');
+  if (await fs.pathExists(sourceTemplates)) {
+    await fs.copy(sourceTemplates, destTemplates, {
+      overwrite: true,
+      errorOnExist: false,
+    });
+  }
+
   if (required) {
     if (!configCopied) {
       throw new Error(
@@ -1027,32 +1347,6 @@ async function resolvePackageSupabaseDir(projectDir) {
   return { dir: null, triedPaths };
 }
 
-async function readSupabaseProjectRef(projectDir) {
-  const projectRefPath = resolve(
-    projectDir,
-    'supabase',
-    '.temp',
-    'project-ref',
-  );
-  if (await fs.pathExists(projectRefPath)) {
-    const value = (await fs.readFile(projectRefPath, 'utf8')).trim();
-    if (/^[a-z0-9]{20,}$/i.test(value)) {
-      return value;
-    }
-  }
-
-  return null;
-}
-
-async function resetSupabaseProjectRef(projectDir) {
-  const tempDir = resolve(projectDir, 'supabase', '.temp');
-  await fs.ensureDir(tempDir);
-  const projectRefPath = resolve(tempDir, 'project-ref');
-  if (await fs.pathExists(projectRefPath)) {
-    await fs.remove(projectRefPath);
-  }
-}
-
 async function ensureClientComponents(projectDir) {
   const relativePaths = [
     'components/env-var-warning.tsx',
@@ -1237,7 +1531,6 @@ async function sanitizeLayout(projectDir) {
 
   const requiredImports = [
     "import '@nextblock-cms/ui/styles/globals.css';",
-    "import '@nextblock-cms/editor/styles/editor.css';",
   ];
 
   const content = await fs.readFile(layoutPath, 'utf8');
@@ -1559,35 +1852,6 @@ function runCommand(command, args, options = {}) {
   });
 }
 
-async function runSupabaseCli(args, options = {}) {
-  const { cwd } = options;
-  const supabaseBin = await getSupabaseBinary(cwd);
-  const command = supabaseBin === 'npx' ? 'npx' : supabaseBin;
-  const cmdArgs = supabaseBin === 'npx' ? ['supabase', ...args] : args;
-
-  return new Promise((resolve, reject) => {
-    const child = spawn(command, cmdArgs, {
-      cwd,
-      shell: IS_WINDOWS,
-      stdio: 'inherit',
-    });
-
-    child.on('error', (error) => {
-      reject(error);
-    });
-
-    child.on('close', (code) => {
-      if (code === 0) {
-        resolve();
-      } else {
-        reject(
-          new Error(`supabase ${args.join(' ')} exited with code ${code}`),
-        );
-      }
-    });
-  });
-}
-
 async function getSupabaseBinary(projectDir) {
   const binDir = resolve(projectDir, 'node_modules', '.bin');
   const ext = IS_WINDOWS ? '.cmd' : '';
@@ -1643,18 +1907,7 @@ function buildNextConfigContent(editorUtilNames) {
     '    minimumCacheTTL: 31536000,',
     '    dangerouslyAllowSVG: false,',
     "    contentSecurityPolicy: \"default-src 'self'; script-src 'none'; sandbox;\",",
-    '    remotePatterns: [',
-    "      { protocol: 'https', hostname: 'pub-a31e3f1a87d144898aeb489a8221f92e.r2.dev' },",
-    "      { protocol: 'https', hostname: 'e260676f72b0b18314b868f136ed72ae.r2.cloudflarestorage.com' },",
-    '      ...(process.env.NEXT_PUBLIC_URL',
-    '        ? [',
-    '            {',
-    "              protocol: /** @type {'http' | 'https'} */ (new URL(process.env.NEXT_PUBLIC_URL).protocol.slice(0, -1)),",
-    '              hostname: new URL(process.env.NEXT_PUBLIC_URL).hostname,',
-    '            },',
-    '          ]',
-    '        : []),',
-    '    ],',
+    '    remotePatterns: getRemotePatterns(),',
     '  },',
     '  experimental: {',
     '    optimizeCss: true,',
@@ -1736,6 +1989,34 @@ function buildNextConfigContent(editorUtilNames) {
     '};',
     '',
     'module.exports = nextConfig;',
+    '',
+    'function getRemotePatterns() {',
+    '  /** @type {Array<{ protocol: "http" | "https", hostname: string, pathname: string }>} */',
+    '  const patterns = [];',
+    '  // Whitelist this project R2 public/base URLs and the site URL for next/image.',
+    '  const sources = [',
+    '    process.env.NEXT_PUBLIC_R2_PUBLIC_URL,',
+    '    process.env.NEXT_PUBLIC_R2_BASE_URL,',
+    '    process.env.NEXT_PUBLIC_URL,',
+    '  ];',
+    '  for (const value of sources) {',
+    '    if (!value) continue;',
+    '    try {',
+    '      const parsed = new URL(value);',
+    "      if (parsed.protocol !== 'http:' && parsed.protocol !== 'https:') continue;",
+    '      const hostname = parsed.hostname;',
+    '      if (patterns.some((pattern) => pattern.hostname === hostname)) continue;',
+    '      patterns.push({',
+    "        protocol: parsed.protocol === 'https:' ? 'https' : 'http',",
+    '        hostname,',
+    "        pathname: '/**',",
+    '      });',
+    '    } catch {',
+    '      // ignore malformed value',
+    '    }',
+    '  }',
+    '  return patterns;',
+    '}',
   );
 
   return lines.join('\n');