aiplang 2.2.0 → 2.4.0

package/aiplang-knowledge.md

@@ -330,9 +330,9 @@ aiplang serve        # dev → localhost:3000
 aiplang build pages/ # compile → dist/
 
 # Full-stack (Node.js backend)
-aiplang start app.flux
+aiplang start app.aiplang
 
 # Go binary (production, v2)
-aiplangd dev app.flux
-aiplangd build app.flux
+aiplangd dev app.aiplang
+aiplangd build app.aiplang
 ```

package/bin/aiplang.js

@@ -5,7 +5,7 @@ const fs   = require('fs')
 const path = require('path')
 const http = require('http')
 
-const VERSION     = '2.2.0'
+const VERSION     = '2.4.0'
 const RUNTIME_DIR = path.join(__dirname, '..', 'runtime')
 const cmd         = process.argv[2]
 const args        = process.argv.slice(3)
@@ -34,16 +34,31 @@ if (!cmd||cmd==='--help'||cmd==='-h') {
   AI-first web language — full apps in ~20 lines.
 
   Usage:
-    npx aiplang init [name]                 create project
-    npx aiplang init --template saas|landing|crud
-    npx aiplang serve [dir]                 dev server + hot reload
-    npx aiplang build [dir/file]            compile → static HTML
-    npx aiplang new <page>                  new page template
+    npx aiplang init [name]                  create project (default template)
+    npx aiplang init [name] --template <t>   use template: saas|landing|crud|dashboard|portfolio|blog
+    npx aiplang init [name] --template ./my.aiplang     use a local .aiplang file as template
+    npx aiplang init [name] --template my-custom     use a saved custom template
+    npx aiplang serve [dir]                  dev server + hot reload
+    npx aiplang build [dir/file]             compile → static HTML
+    npx aiplang new <page>                   new page template
     npx aiplang --version
 
   Full-stack:
-    npx aiplang start app.flux           start full-stack server (API + DB + frontend)
-    PORT=8080 aiplang start app.flux     custom port
+    npx aiplang start app.aiplang           start full-stack server (API + DB + frontend)
+    PORT=8080 aiplang start app.aiplang     custom port
+
+  Templates:
+    npx aiplang template list                list all templates (built-in + custom)
+    npx aiplang template save <n>            save current project as template
+    npx aiplang template save <n> --from <f> save a specific .aiplang file as template
+    npx aiplang template edit <n>            open template in editor
+    npx aiplang template show <n>            print template source
+    npx aiplang template export <n>          export template to .aiplang file
+    npx aiplang template remove <n>          delete a custom template
+
+  Custom template variables:
+    {{name}}  project name
+    {{year}}  current year
 
   Customization:
     ~theme accent=#7c3aed radius=1.5rem font=Syne bg=#000 text=#fff
@@ -59,66 +74,360 @@ if (!cmd||cmd==='--help'||cmd==='-h') {
 }
 if (cmd==='--version'||cmd==='-v') { console.log(`aiplang v${VERSION}`); process.exit(0) }
 
-// ── Templates ────────────────────────────────────────────────────
-const TEMPLATES = {
-  saas: (n,y) => `# ${n}
+// ─────────────────────────────────────────────────────────────────
+// TEMPLATE SYSTEM
+// Custom templates stored at ~/.aiplang/templates/<name>.aiplang
+// ─────────────────────────────────────────────────────────────────
+
+const TEMPLATES_DIR = path.join(require('os').homedir(), '.aiplang', 'templates')
+
+function ensureTemplatesDir() {
+  if (!fs.existsSync(TEMPLATES_DIR)) fs.mkdirSync(TEMPLATES_DIR, { recursive: true })
+}
+
+// Built-in templates (interpolate {{name}} and {{year}})
+const BUILTIN_TEMPLATES = {
+  saas: `# {{name}}
+~db sqlite ./app.db
+~auth jwt $JWT_SECRET expire=7d
+~admin /admin
+
+model User {
+  id       : uuid : pk auto
+  name     : text : required
+  email    : text : required unique
+  password : text : required hashed
+  plan     : enum : free,starter,pro : default=free
+  role     : enum : user,admin : default=user
+  ~soft-delete
+}
+
+api POST /api/auth/register {
+  ~validate name required | email required email | password min=8
+  ~unique User email $body.email | 409
+  ~hash password
+  insert User($body)
+  return jwt($inserted) 201
+}
+
+api POST /api/auth/login {
+  $user = User.findBy(email=$body.email)
+  ~check password $body.password $user.password | 401
+  return jwt($user) 200
+}
+
+api GET /api/me {
+  ~guard auth
+  return $auth.user
+}
+
+api GET /api/stats {
+  return User.count()
+}
+
 %home dark /
 @stats = {}
 ~mount GET /api/stats => @stats
-nav{${n}>/features:Features>/pricing:Pricing>/login:Sign in}
-hero{Ship faster with AI|Zero config, infinite scale.>/signup:Start free>/demo:View demo} animate:fade-up
-stats{@stats.users:Users|@stats.mrr:MRR|@stats.uptime:Uptime}
-row3{rocket>Deploy instantly>Push to git, live in 3 seconds.|shield>Enterprise ready>SOC2, GDPR, SSO built-in.|chart>Full observability>Real-time errors and performance.} animate:stagger
-testimonial{Sarah Chen, CEO @ Acme|"Cut deployment time by 90%. Absolutely game-changing."|img:https://i.pravatar.cc/64?img=47}
-foot{© ${y} ${n}>/privacy:Privacy>/terms:Terms}`,
-
-  landing: (n,y) => `# ${n}
-%home dark /
-nav{${n}>/about:About>/login:Sign in}
-hero{The future is now|${n} — built for the next generation.>/signup:Get started for free} animate:blur-in
-row3{rocket>Fast>Zero config, instant results.|bolt>Simple>One command to deploy.|globe>Global>CDN in 180+ countries.}
-foot{© ${y} ${n}}`,
+nav{{{name}}>/pricing:Pricing>/login:Sign in}
+hero{Ship faster with AI|Zero config, infinite scale.>/signup:Start free>/demo:View demo} animate:blur-in
+stats{@stats:Users|99.9%:Uptime|$0:Start free}
+row3{rocket>Deploy instantly>Push to git, live in seconds.|shield>Enterprise ready>SOC2, GDPR built-in.|chart>Full observability>Real-time errors.} animate:stagger
+pricing{Free>$0/mo>3 projects>/signup:Get started|Pro>$29/mo>Unlimited>/signup:Start trial|Enterprise>Custom>SSO + SLA>/contact:Talk}
+testimonial{Sarah Chen, CEO @ Acme|"Cut deployment time by 90%."|img:https://i.pravatar.cc/64?img=47} animate:fade-up
+foot{© {{year}} {{name}}>/privacy:Privacy>/terms:Terms}
+
+---
+
+%login dark /login
+nav{{{name}}>/signup:Create account}
+hero{Welcome back|Sign in to continue.}
+form POST /api/auth/login => redirect /dashboard { Email:email | Password:password }
+foot{© {{year}} {{name}}}
+
+---
 
-  crud: (n,y) => `# ${n}
-%users dark /users
+%signup dark /signup
+nav{{{name}}>/login:Sign in}
+hero{Start for free|No credit card required.}
+form POST /api/auth/register => redirect /dashboard { Name:text | Email:email | Password:password }
+foot{© {{year}} {{name}}}
+
+---
+
+%dashboard dark /dashboard
 @users = []
+@stats = {}
 ~mount GET /api/users => @users
-nav{${n}>/users:Users>/settings:Settings}
-sect{User Management}
-table @users { Name:name | Email:email | Plan:plan | Status:status | edit PUT /api/users/{id} | delete /api/users/{id} | empty: No users yet. }
-sect{Add User}
-form POST /api/users => @users.push($result) { Full name:text:Alice Johnson | Email:email:alice@company.com | Plan:select:starter,pro,enterprise }
-foot{© ${y} ${n}}`,
-
-  default: (n,y) => `# ${n}
+~mount GET /api/stats => @stats
+nav{{{name}}>/logout:Sign out}
+stats{@stats:Total users}
+sect{Users}
+table @users { Name:name | Email:email | Plan:plan | edit PUT /api/users/{id} | delete /api/users/{id} | empty: No users yet. }
+foot{{{name}} Dashboard}`,
+
+  landing: `# {{name}}
+%home dark /
+nav{{{name}}>/about:About>/contact:Contact}
+hero{The future is now|{{name}} — built for the next generation.>/signup:Get started for free} animate:blur-in
+row3{rocket>Fast>Zero config, instant results.|bolt>Simple>One command to deploy.|globe>Global>CDN in 180+ countries.}
+foot{© {{year}} {{name}}}`,
+
+  crud: `# {{name}}
+%items dark /
+@items = []
+~mount GET /api/items => @items
+nav{{{name}}>/items:Items>/settings:Settings}
+sect{Manage Items}
+table @items { Name:name | Status:status | edit PUT /api/items/{id} | delete /api/items/{id} | empty: No items yet. }
+form POST /api/items => @items.push($result) { Name:text:Item name | Status:select:active,inactive }
+foot{© {{year}} {{name}}}`,
+
+  blog: `# {{name}}
+%home dark /
+@posts = []
+~mount GET /api/posts => @posts
+nav{{{name}}>/about:About}
+hero{{{name}}|A blog about things that matter.} animate:fade-up
+table @posts { Title:title | Date:created_at | empty: No posts yet. }
+foot{© {{year}} {{name}}}`,
+
+  portfolio: `# {{name}}
+~theme accent=#f59e0b radius=2rem font=Syne bg=#0c0a09 text=#fafaf9
+
+%home dark /
+nav{{{name}}>/work:Work>/contact:Contact}
+hero{Design & code.|Creative work for bold brands.>/work:See my work} animate:blur-in
+row3{globe>10+ countries>Clients from 3 continents.|star>50+ projects>From startups to Fortune 500.|check>On time>98% on-schedule delivery.} animate:stagger
+gallery{https://images.unsplash.com/photo-1518770660439?w=600|https://images.unsplash.com/photo-1561070791-2526d30994b5?w=600|https://images.unsplash.com/photo-1558655146?w=600}
+testimonial{Marco Rossi, CEO|"Exceptional work from start to finish."|img:https://i.pravatar.cc/64?img=11}
+foot{© {{year}} {{name}}>/github:GitHub>/linkedin:LinkedIn}`,
+
+  dashboard: `# {{name}}
+%main dark /
+@stats = {}
+@items = []
+~mount GET /api/stats => @stats
+~mount GET /api/items => @items
+~interval 30000 GET /api/stats => @stats
+nav{{{name}}>/logout:Sign out}
+stats{@stats.total:Total|@stats.active:Active|@stats.revenue:Revenue}
+sect{Recent Items}
+table @items { Name:name | Status:status | Date:created_at | edit PUT /api/items/{id} | delete /api/items/{id} | empty: No data. }
+sect{Add Item}
+form POST /api/items => @items.push($result) { Name:text | Status:select:active,inactive }
+foot{{{name}}}`,
+
+  default: `# {{name}}
 %home dark /
-nav{${n}>/login:Sign in}
-hero{Welcome to ${n}|Edit pages/home.flux to get started.>/signup:Get started} animate:fade-up
+nav{{{name}}>/login:Sign in}
+hero{Welcome to {{name}}|Edit pages/home.aiplang to get started.>/signup:Get started} animate:fade-up
 row3{rocket>Fast>Renders in under 1ms.|bolt>AI-native>Written by Claude in seconds.|globe>Deploy anywhere>Static files. Any host.}
-foot{© ${y} ${n}}`,
+foot{© {{year}} {{name}}}`,
+}
+
+function applyTemplateVars(src, name, year) {
+  return src.replace(/\{\{name\}\}/g, name).replace(/\{\{year\}\}/g, year)
+}
+
+function getTemplate(tplName, name, year) {
+  ensureTemplatesDir()
+
+  // 1. Local file path: --template ./my-template.aiplang or --template /abs/path.aiplang
+  if (tplName.startsWith('./') || tplName.startsWith('../') || tplName.startsWith('/')) {
+    const full = path.resolve(tplName)
+    if (!fs.existsSync(full)) { console.error(`\n  ✗  Template file not found: ${full}\n`); process.exit(1) }
+    return applyTemplateVars(fs.readFileSync(full, 'utf8'), name, year)
+  }
+
+  // 2. User custom template: ~/.aiplang/templates/<name>.aiplang
+  const customPath = path.join(TEMPLATES_DIR, tplName + '.aiplang')
+  if (fs.existsSync(customPath)) {
+    return applyTemplateVars(fs.readFileSync(customPath, 'utf8'), name, year)
+  }
+
+  // 3. Built-in template
+  const builtin = BUILTIN_TEMPLATES[tplName]
+  if (builtin) return applyTemplateVars(builtin, name, year)
+
+  // Not found — show what's available
+  const customs = fs.existsSync(TEMPLATES_DIR)
+    ? fs.readdirSync(TEMPLATES_DIR).filter(f=>f.endsWith('.aiplang')).map(f=>f.replace('.aiplang',''))
+    : []
+  const all = [...Object.keys(BUILTIN_TEMPLATES).filter(k=>k!=='default'), ...customs]
+  console.error(`\n  ✗  Template "${tplName}" not found.\n  Available: ${all.join(', ')}\n`)
+  process.exit(1)
+}
+
+function listTemplates() {
+  ensureTemplatesDir()
+  const builtins = Object.keys(BUILTIN_TEMPLATES).filter(k=>k!=='default')
+  const customs  = fs.readdirSync(TEMPLATES_DIR).filter(f=>f.endsWith('.aiplang')).map(f=>f.replace('.aiplang',''))
+  console.log(`\n  aiplang templates\n`)
+  console.log(`  Built-in:`)
+  builtins.forEach(t => console.log(`    ${t}`))
+  if (customs.length) {
+    console.log(`\n  Custom (${TEMPLATES_DIR}):`)
+    customs.forEach(t => console.log(`    ${t}  ✓`))
+  } else {
+    console.log(`\n  Custom:  (none yet — use "aiplang template save <name>" to create one)`)
+  }
+  console.log()
+}
+
+// ── template subcommand ──────────────────────────────────────────
+if (cmd === 'template') {
+  const sub = args[0]
+  ensureTemplatesDir()
+
+  // aiplang template list
+  if (!sub || sub === 'list' || sub === 'ls') {
+    listTemplates(); process.exit(0)
+  }
+
+  // aiplang template save <name> [--from <file>]
+  if (sub === 'save' || sub === 'add') {
+    const tname = args[1]
+    if (!tname) { console.error('\n  ✗  Usage: aiplang template save <name> [--from <file>]\n'); process.exit(1) }
+    const fromIdx = args.indexOf('--from')
+    let src
+    if (fromIdx !== -1 && args[fromIdx+1]) {
+      const fp = path.resolve(args[fromIdx+1])
+      if (!fs.existsSync(fp)) { console.error(`\n  ✗  File not found: ${fp}\n`); process.exit(1) }
+      src = fs.readFileSync(fp, 'utf8')
+    } else {
+      // Auto-detect: use pages/ directory or app.aiplang
+      const sources = ['pages', 'app.aiplang', 'index.aiplang']
+      const found = sources.find(s => fs.existsSync(s))
+      if (!found) { console.error('\n  ✗  No .aiplang files found. Use --from <file> to specify source.\n'); process.exit(1) }
+      if (fs.statSync(found).isDirectory()) {
+        src = fs.readdirSync(found).filter(f=>f.endsWith('.aiplang'))
+          .map(f => fs.readFileSync(path.join(found,f),'utf8')).join('\n---\n')
+      } else {
+        src = fs.readFileSync(found, 'utf8')
+      }
+    }
+    const dest = path.join(TEMPLATES_DIR, tname + '.aiplang')
+    fs.writeFileSync(dest, src)
+    console.log(`\n  ✓  Template saved: ${tname}\n     ${dest}\n\n  Use it: aiplang init my-app --template ${tname}\n`)
+    process.exit(0)
+  }
+
+  // aiplang template remove <name>
+  if (sub === 'remove' || sub === 'rm' || sub === 'delete') {
+    const tname = args[1]
+    if (!tname) { console.error('\n  ✗  Usage: aiplang template remove <name>\n'); process.exit(1) }
+    const dest = path.join(TEMPLATES_DIR, tname + '.aiplang')
+    if (!fs.existsSync(dest)) { console.error(`\n  ✗  Template "${tname}" not found.\n`); process.exit(1) }
+    fs.unlinkSync(dest)
+    console.log(`\n  ✓  Removed template: ${tname}\n`); process.exit(0)
+  }
+
+  // aiplang template edit <name>
+  if (sub === 'edit' || sub === 'open') {
+    const tname = args[1]
+    if (!tname) { console.error('\n  ✗  Usage: aiplang template edit <name>\n'); process.exit(1) }
+    let dest = path.join(TEMPLATES_DIR, tname + '.aiplang')
+    if (!fs.existsSync(dest)) {
+      // create from built-in if exists
+      const builtin = BUILTIN_TEMPLATES[tname]
+      if (builtin) { fs.writeFileSync(dest, builtin); console.log(`\n  ✓  Copied built-in "${tname}" to custom templates.\n`) }
+      else { console.error(`\n  ✗  Template "${tname}" not found.\n`); process.exit(1) }
+    }
+    const editor = process.env.EDITOR || process.env.VISUAL || 'code'
+    try { require('child_process').spawnSync(editor, [dest], { stdio: 'inherit' }) }
+    catch { console.log(`\n  Template path: ${dest}\n  Open it in your editor.\n`) }
+    process.exit(0)
+  }
+
+  // aiplang template show <name>
+  if (sub === 'show' || sub === 'cat') {
+    const tname = args[1] || 'default'
+    const customPath = path.join(TEMPLATES_DIR, tname + '.aiplang')
+    if (fs.existsSync(customPath)) { console.log(fs.readFileSync(customPath,'utf8')); process.exit(0) }
+    const builtin = BUILTIN_TEMPLATES[tname]
+    if (builtin) { console.log(builtin); process.exit(0) }
+    console.error(`\n  ✗  Template "${tname}" not found.\n`); process.exit(1)
+  }
+
+  // aiplang template export <name> [--out <file>]
+  if (sub === 'export') {
+    const tname = args[1]
+    if (!tname) { console.error('\n  ✗  Usage: aiplang template export <name>\n'); process.exit(1) }
+    const outIdx = args.indexOf('--out')
+    const outFile = outIdx !== -1 ? args[outIdx+1] : `./${tname}.aiplang`
+    const customPath = path.join(TEMPLATES_DIR, tname + '.aiplang')
+    const src = fs.existsSync(customPath) ? fs.readFileSync(customPath,'utf8') : BUILTIN_TEMPLATES[tname]
+    if (!src) { console.error(`\n  ✗  Template "${tname}" not found.\n`); process.exit(1) }
+    fs.writeFileSync(outFile, src)
+    console.log(`\n  ✓  Exported "${tname}" → ${outFile}\n`)
+    process.exit(0)
+  }
+
+  console.error(`\n  ✗  Unknown template command: ${sub}\n  Commands: list, save, remove, edit, show, export\n`)
+  process.exit(1)
 }
 
 // ── Init ─────────────────────────────────────────────────────────
 if (cmd==='init') {
   const tplIdx = args.indexOf('--template')
-  const tplName = tplIdx!==-1 ? args[tplIdx+1] : 'default'
+  const tplName = tplIdx !== -1 ? args[tplIdx+1] : 'default'
   const name = args.find(a=>!a.startsWith('--')&&a!==tplName)||'aiplang-app'
   const dir  = path.resolve(name), year = new Date().getFullYear()
+
   if (fs.existsSync(dir)) { console.error(`\n  ✗  Directory "${name}" already exists.\n`); process.exit(1) }
-  fs.mkdirSync(path.join(dir,'pages'), {recursive:true})
-  fs.mkdirSync(path.join(dir,'public'), {recursive:true})
-  for (const f of ['aiplang-runtime.js','aiplang-hydrate.js']) {
-    const src=path.join(RUNTIME_DIR,f); if(fs.existsSync(src)) fs.copyFileSync(src,path.join(dir,'public',f))
+
+  // Get template source (built-in, custom, or file path)
+  const tplSrc = getTemplate(tplName, name, year)
+
+  // Check if template has full-stack backend (models/api blocks)
+  const isFullStack = tplSrc.includes('\nmodel ') || tplSrc.includes('\napi ')
+  const isMultiFile = tplSrc.includes('\n---\n')
+
+  if (isFullStack) {
+    // Full-stack project: single app.aiplang
+    fs.mkdirSync(dir, { recursive: true })
+    fs.writeFileSync(path.join(dir, 'app.aiplang'), tplSrc)
+    fs.writeFileSync(path.join(dir, 'package.json'), JSON.stringify({
+      name, version:'0.1.0',
+      scripts: { dev: 'npx aiplang start app.aiplang', start: 'npx aiplang start app.aiplang' },
+      devDependencies: { 'aiplang': `^${VERSION}` }
+    }, null, 2))
+    fs.writeFileSync(path.join(dir, '.env.example'), 'JWT_SECRET=change-me-in-production\n# STRIPE_SECRET_KEY=sk_test_...\n# AWS_ACCESS_KEY_ID=...\n# AWS_SECRET_ACCESS_KEY=...\n# S3_BUCKET=...\n')
+    fs.writeFileSync(path.join(dir, '.gitignore'), '*.db\nnode_modules/\ndist/\n.env\nuploads/\n')
+    fs.writeFileSync(path.join(dir, 'README.md'), `# ${name}\n\nGenerated with [aiplang](https://npmjs.com/package/aiplang) v${VERSION}\n\n## Run\n\n\`\`\`bash\nnpx aiplang start app.aiplang\n\`\`\`\n`)
+    const label = tplName !== 'default' ? ` (template: ${tplName})` : ''
+    console.log(`\n  ✓  Created ${name}/${label}\n\n     app.aiplang  ← full-stack app (backend + frontend)\n\n  Next:\n     cd ${name} && npx aiplang start app.aiplang\n`)
+  } else if (isMultiFile) {
+    // Multi-page SSG project: pages/*.aiplang
+    fs.mkdirSync(path.join(dir,'pages'), {recursive:true})
+    fs.mkdirSync(path.join(dir,'public'), {recursive:true})
+    for (const f of ['aiplang-runtime.js','aiplang-hydrate.js']) {
+      const src=path.join(RUNTIME_DIR,f); if(fs.existsSync(src)) fs.copyFileSync(src,path.join(dir,'public',f))
+    }
+    const pageBlocks = tplSrc.split('\n---\n')
+    pageBlocks.forEach((block, i) => {
+      const m = block.match(/^%([a-zA-Z0-9_-]+)/m)
+      const pageName = m ? m[1] : (i === 0 ? 'home' : `page${i}`)
+      fs.writeFileSync(path.join(dir,'pages',`${pageName}.aiplang`), block.trim())
+    })
+    fs.writeFileSync(path.join(dir,'package.json'), JSON.stringify({name,version:'0.1.0',scripts:{dev:'npx aiplang serve',build:'npx aiplang build pages/ --out dist/'},devDependencies:{'aiplang':`^${VERSION}`}},null,2))
+    fs.writeFileSync(path.join(dir,'.gitignore'),'dist/\nnode_modules/\n')
+    const label = tplName !== 'default' ? ` (template: ${tplName})` : ''
+    const files = fs.readdirSync(path.join(dir,'pages')).map(f=>f).join(', ')
+    console.log(`\n  ✓  Created ${name}/${label}\n\n     pages/{${files}}  ← edit these\n\n  Next:\n     cd ${name} && npx aiplang serve\n`)
+  } else {
+    // Single-page SSG project
+    fs.mkdirSync(path.join(dir,'pages'), {recursive:true})
+    fs.mkdirSync(path.join(dir,'public'), {recursive:true})
+    for (const f of ['aiplang-runtime.js','aiplang-hydrate.js']) {
+      const src=path.join(RUNTIME_DIR,f); if(fs.existsSync(src)) fs.copyFileSync(src,path.join(dir,'public',f))
+    }
+    fs.writeFileSync(path.join(dir,'pages','home.aiplang'), tplSrc)
+    fs.writeFileSync(path.join(dir,'package.json'), JSON.stringify({name,version:'0.1.0',scripts:{dev:'npx aiplang serve',build:'npx aiplang build pages/ --out dist/'},devDependencies:{'aiplang':`^${VERSION}`}},null,2))
+    fs.writeFileSync(path.join(dir,'.gitignore'),'dist/\nnode_modules/\n')
+    const label = tplName !== 'default' ? ` (template: ${tplName})` : ''
+    console.log(`\n  ✓  Created ${name}/${label}\n\n     pages/home.aiplang  ← edit this\n\n  Next:\n     cd ${name} && npx aiplang serve\n`)
   }
-  fs.writeFileSync(path.join(dir,'public','index.html'),`<!DOCTYPE html>
-<html lang="en"><head><meta charset="UTF-8"><meta name="viewport" content="width=device-width,initial-scale=1"><title>${name}</title>
-<meta http-equiv="refresh" content="0; url=/">
-</head><body><p>Run <code>npx aiplang serve</code> to start the dev server.</p></body></html>`)
-  fs.writeFileSync(path.join(dir,'pages','home.flux'), (TEMPLATES[tplName]||TEMPLATES.default)(name, year))
-  fs.writeFileSync(path.join(dir,'package.json'), JSON.stringify({name,version:'0.1.0',scripts:{dev:'npx aiplang serve',build:'npx aiplang build pages/ --out dist/'},devDependencies:{'aiplang':`^${VERSION}`}},null,2))
-  fs.writeFileSync(path.join(dir,'.gitignore'),'dist/\nnode_modules/\n')
-  const label = tplName!=='default' ? ` (template: ${tplName})` : ''
-  console.log(`\n  ✓  Created ${name}/${label}\n\n     pages/home.flux  ← edit this\n\n  Next:\n     cd ${name} && npx aiplang serve\n`)
   process.exit(0)
 }
 
@@ -126,7 +435,7 @@ if (cmd==='init') {
 if (cmd==='new') {
   const name=args[0]; if(!name){console.error('\n  ✗  Usage: aiplang new <page>\n');process.exit(1)}
   const dir=fs.existsSync('pages')?'pages':'.'
-  const file=path.join(dir,`${name}.flux`)
+  const file=path.join(dir,`${name}.aiplang`)
   if(fs.existsSync(file)){console.error(`\n  ✗  ${file} exists.\n`);process.exit(1)}
   const cap=name.charAt(0).toUpperCase()+name.slice(1)
   fs.writeFileSync(file,`# ${name}\n%${name} dark /${name}\n\nnav{AppName>/home:Home}\nhero{${cap}|Description.>/action:Get started}\nfoot{© ${new Date().getFullYear()} AppName}\n`)
@@ -141,9 +450,9 @@ if (cmd==='build') {
   const input=args.filter((a,i)=>!a.startsWith('--')&&i!==outIdx+1)[0]||'pages/'
   const files=[]
   if(fs.existsSync(input)&&fs.statSync(input).isDirectory()){
-    fs.readdirSync(input).filter(f=>f.endsWith('.flux')).forEach(f=>files.push(path.join(input,f)))
-  } else if(input.endsWith('.flux')&&fs.existsSync(input)){ files.push(input) }
-  if(!files.length){console.error(`\n  ✗  No .flux files in: ${input}\n`);process.exit(1)}
+    fs.readdirSync(input).filter(f=>f.endsWith('.aiplang')).forEach(f=>files.push(path.join(input,f)))
+  } else if(input.endsWith('.aiplang')&&fs.existsSync(input)){ files.push(input) }
+  if(!files.length){console.error(`\n  ✗  No .aiplang files in: ${input}\n`);process.exit(1)}
   const src=files.map(f=>fs.readFileSync(f,'utf8')).join('\n---\n')
   const pages=parseFlux(src)
   if(!pages.length){console.error('\n  ✗  No pages found.\n');process.exit(1)}
@@ -162,7 +471,7 @@ if (cmd==='build') {
   }
   const hf=path.join(RUNTIME_DIR,'aiplang-hydrate.js')
   if(fs.existsSync(hf)){const dst=path.join(outDir,'aiplang-hydrate.js');fs.copyFileSync(hf,dst);total+=fs.statSync(dst).size;console.log(`  ✓  ${dst.padEnd(40)} ${hSize(fs.statSync(dst).size)}`)}
-  if(fs.existsSync('public'))fs.readdirSync('public').filter(f=>!f.endsWith('.flux')).forEach(f=>fs.copyFileSync(path.join('public',f),path.join(outDir,f)))
+  if(fs.existsSync('public'))fs.readdirSync('public').filter(f=>!f.endsWith('.aiplang')).forEach(f=>fs.copyFileSync(path.join('public',f),path.join(outDir,f)))
   console.log(`\n  ${pages.length} page(s) — ${hSize(total)} total\n\n  Preview: npx serve ${outDir}\n  Deploy:  Vercel, Netlify, S3, any static host\n`)
   process.exit(0)
 }
@@ -171,13 +480,13 @@ if (cmd==='build') {
 if (cmd==='serve'||cmd==='dev') {
   const root=path.resolve(args[0]||'.')
   const port=parseInt(process.env.PORT||'3000')
-  const MIME={'.html':'text/html;charset=utf-8','.js':'application/javascript','.css':'text/css','.flux':'text/plain','.json':'application/json','.wasm':'application/wasm','.svg':'image/svg+xml','.png':'image/png','.jpg':'image/jpeg','.ico':'image/x-icon'}
+  const MIME={'.html':'text/html;charset=utf-8','.js':'application/javascript','.css':'text/css','.aiplang':'text/plain','.json':'application/json','.wasm':'application/wasm','.svg':'image/svg+xml','.png':'image/png','.jpg':'image/jpeg','.ico':'image/x-icon'}
   let clients=[]
   const mtimes={}
   setInterval(()=>{
     const pd=path.join(root,'pages')
     if(!fs.existsSync(pd))return
-    fs.readdirSync(pd).filter(f=>f.endsWith('.flux')).forEach(f=>{
+    fs.readdirSync(pd).filter(f=>f.endsWith('.aiplang')).forEach(f=>{
       const fp=path.join(pd,f),mt=fs.statSync(fp).mtimeMs
       if(mtimes[fp]&&mtimes[fp]!==mt)clients.forEach(c=>{try{c.write('data: reload\n\n')}catch{}})
       mtimes[fp]=mt
@@ -192,7 +501,7 @@ if (cmd==='serve'||cmd==='dev') {
     let p=req.url.split('?')[0];if(p==='/') p='/index.html'
     let fp=null
     for(const c of [path.join(root,'public',p),path.join(root,p)]){if(fs.existsSync(c)&&fs.statSync(c).isFile()){fp=c;break}}
-    if(!fp&&p.endsWith('.flux')){const c=path.join(root,'pages',path.basename(p));if(fs.existsSync(c))fp=c}
+    if(!fp&&p.endsWith('.aiplang')){const c=path.join(root,'pages',path.basename(p));if(fs.existsSync(c))fp=c}
     if(!fp){res.writeHead(404);res.end('Not found');return}
     let content=fs.readFileSync(fp)
     if(path.extname(fp)==='.html'){
@@ -201,7 +510,7 @@ if (cmd==='serve'||cmd==='dev') {
     }
     res.writeHead(200,{'Content-Type':MIME[path.extname(fp)]||'application/octet-stream','Access-Control-Allow-Origin':'*'})
     res.end(content)
-  }).listen(port,()=>console.log(`\n  ✓  aiplang dev server\n\n  →  http://localhost:${port}\n\n  Hot reload ON — edit .flux files and browser refreshes.\n  Ctrl+C to stop.\n`))
+  }).listen(port,()=>console.log(`\n  ✓  aiplang dev server\n\n  →  http://localhost:${port}\n\n  Hot reload ON — edit .aiplang files and browser refreshes.\n  Ctrl+C to stop.\n`))
   return
 }
 
@@ -209,7 +518,7 @@ if (cmd==='serve'||cmd==='dev') {
 if (cmd === 'start' || cmd === 'run') {
   const aipFile = args[0]
   if (!aipFile || !fs.existsSync(aipFile)) {
-    console.error(`\n  ✗  Usage: aiplang start <app.flux>\n`)
+    console.error(`\n  ✗  Usage: aiplang start <app.aiplang>\n`)
     process.exit(1)
   }
   const port = parseInt(process.env.PORT || args[1] || '3000')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aiplang",
-  "version": "2.2.0",
+  "version": "2.4.0",
   "description": "AI-first full-stack language. Frontend + Backend + DB + Auth in one file. Competes with Laravel.",
   "keywords": [
     "aiplang",

package/runtime/aiplang-runtime.js

@@ -957,108 +957,108 @@ html{scroll-behavior:smooth}
 body{font-family:-apple-system,'Segoe UI',system-ui,sans-serif;-webkit-font-smoothing:antialiased}
 a{text-decoration:none;color:inherit}
 input,button,select{font-family:inherit}
-.flux-root{min-height:100vh}
-.flux-theme-dark{background:#030712;color:#f1f5f9}
-.flux-theme-light{background:#fff;color:#0f172a}
-.flux-theme-acid{background:#000;color:#a3e635}
+.aiplang-root{min-height:100vh}
+.aiplang-theme-dark{background:#030712;color:#f1f5f9}
+.aiplang-theme-light{background:#fff;color:#0f172a}
+.aiplang-theme-acid{background:#000;color:#a3e635}
 .fx-nav{display:flex;align-items:center;justify-content:space-between;padding:1rem 2.5rem;position:sticky;top:0;z-index:50;backdrop-filter:blur(12px)}
-.flux-theme-dark .fx-nav{border-bottom:1px solid #1e293b;background:rgba(3,7,18,.85)}
-.flux-theme-light .fx-nav{border-bottom:1px solid #e2e8f0;background:rgba(255,255,255,.85)}
-.flux-theme-acid .fx-nav{border-bottom:1px solid #1a2e05;background:rgba(0,0,0,.9)}
+.aiplang-theme-dark .fx-nav{border-bottom:1px solid #1e293b;background:rgba(3,7,18,.85)}
+.aiplang-theme-light .fx-nav{border-bottom:1px solid #e2e8f0;background:rgba(255,255,255,.85)}
+.aiplang-theme-acid .fx-nav{border-bottom:1px solid #1a2e05;background:rgba(0,0,0,.9)}
 .fx-brand{font-size:1.25rem;font-weight:800;letter-spacing:-.03em}
 .fx-nav-links{display:flex;align-items:center;gap:1.75rem}
 .fx-nav-link{font-size:.875rem;font-weight:500;opacity:.65;transition:opacity .15s;cursor:pointer}
 .fx-nav-link:hover{opacity:1}
-.flux-theme-dark .fx-nav-link{color:#cbd5e1}
-.flux-theme-light .fx-nav-link{color:#475569}
-.flux-theme-acid .fx-nav-link{color:#86efac}
+.aiplang-theme-dark .fx-nav-link{color:#cbd5e1}
+.aiplang-theme-light .fx-nav-link{color:#475569}
+.aiplang-theme-acid .fx-nav-link{color:#86efac}
 .fx-hero{display:flex;align-items:center;justify-content:center;min-height:92vh;padding:4rem 1.5rem}
 .fx-hero-inner{max-width:56rem;text-align:center;display:flex;flex-direction:column;align-items:center;gap:1.5rem}
 .fx-title{font-size:clamp(2.5rem,8vw,5.5rem);font-weight:900;letter-spacing:-.04em;line-height:1}
 .fx-sub{font-size:clamp(1rem,2vw,1.25rem);line-height:1.75;max-width:40rem}
-.flux-theme-dark .fx-sub{color:#94a3b8}
-.flux-theme-light .fx-sub{color:#475569}
+.aiplang-theme-dark .fx-sub{color:#94a3b8}
+.aiplang-theme-light .fx-sub{color:#475569}
 .fx-cta{display:inline-flex;align-items:center;padding:.875rem 2.5rem;border-radius:.75rem;font-weight:700;font-size:1rem;letter-spacing:-.01em;transition:transform .15s,box-shadow .15s;margin:.25rem;cursor:pointer}
 .fx-cta:hover{transform:translateY(-1px)}
-.flux-theme-dark .fx-cta{background:#2563eb;color:#fff;box-shadow:0 8px 24px rgba(37,99,235,.35)}
-.flux-theme-light .fx-cta{background:#2563eb;color:#fff}
-.flux-theme-acid .fx-cta{background:#a3e635;color:#000;font-weight:800}
+.aiplang-theme-dark .fx-cta{background:#2563eb;color:#fff;box-shadow:0 8px 24px rgba(37,99,235,.35)}
+.aiplang-theme-light .fx-cta{background:#2563eb;color:#fff}
+.aiplang-theme-acid .fx-cta{background:#a3e635;color:#000;font-weight:800}
 .fx-stats{display:grid;grid-template-columns:repeat(auto-fit,minmax(180px,1fr));gap:3rem;padding:5rem 2.5rem;text-align:center}
 .fx-stat-val{font-size:clamp(2.5rem,5vw,4rem);font-weight:900;letter-spacing:-.04em;line-height:1}
 .fx-stat-lbl{font-size:.75rem;font-weight:600;text-transform:uppercase;letter-spacing:.1em;margin-top:.5rem}
-.flux-theme-dark .fx-stat-lbl{color:#64748b}
-.flux-theme-light .fx-stat-lbl{color:#94a3b8}
+.aiplang-theme-dark .fx-stat-lbl{color:#64748b}
+.aiplang-theme-light .fx-stat-lbl{color:#94a3b8}
 .fx-grid{display:grid;gap:1.25rem;padding:1rem 2.5rem 5rem}
 .fx-grid-2{grid-template-columns:repeat(auto-fit,minmax(280px,1fr))}
 .fx-grid-3{grid-template-columns:repeat(auto-fit,minmax(240px,1fr))}
 .fx-grid-4{grid-template-columns:repeat(auto-fit,minmax(200px,1fr))}
 .fx-card{border-radius:1rem;padding:1.75rem;transition:transform .2s,box-shadow .2s}
 .fx-card:hover{transform:translateY(-2px)}
-.flux-theme-dark .fx-card{background:#0f172a;border:1px solid #1e293b}
-.flux-theme-light .fx-card{background:#f8fafc;border:1px solid #e2e8f0}
-.flux-theme-acid .fx-card{background:#0a0f00;border:1px solid #1a2e05}
-.flux-theme-dark .fx-card:hover{box-shadow:0 20px 40px rgba(0,0,0,.5)}
-.flux-theme-light .fx-card:hover{box-shadow:0 20px 40px rgba(0,0,0,.08)}
+.aiplang-theme-dark .fx-card{background:#0f172a;border:1px solid #1e293b}
+.aiplang-theme-light .fx-card{background:#f8fafc;border:1px solid #e2e8f0}
+.aiplang-theme-acid .fx-card{background:#0a0f00;border:1px solid #1a2e05}
+.aiplang-theme-dark .fx-card:hover{box-shadow:0 20px 40px rgba(0,0,0,.5)}
+.aiplang-theme-light .fx-card:hover{box-shadow:0 20px 40px rgba(0,0,0,.08)}
 .fx-icon{font-size:2rem;margin-bottom:1rem}
 .fx-card-title{font-size:1.0625rem;font-weight:700;letter-spacing:-.02em;margin-bottom:.5rem}
 .fx-card-body{font-size:.875rem;line-height:1.65}
-.flux-theme-dark .fx-card-body{color:#64748b}
-.flux-theme-light .fx-card-body{color:#475569}
+.aiplang-theme-dark .fx-card-body{color:#64748b}
+.aiplang-theme-light .fx-card-body{color:#475569}
 .fx-card-link{font-size:.8125rem;font-weight:600;display:inline-block;margin-top:1rem;opacity:.6;transition:opacity .15s}
 .fx-card-link:hover{opacity:1}
 .fx-sect{padding:5rem 2.5rem}
 .fx-sect-title{font-size:clamp(1.75rem,4vw,3rem);font-weight:800;letter-spacing:-.04em;margin-bottom:1.5rem;text-align:center}
 .fx-sect-body{font-size:1rem;line-height:1.75;text-align:center;max-width:48rem;margin:0 auto}
-.flux-theme-dark .fx-sect-body{color:#64748b}
+.aiplang-theme-dark .fx-sect-body{color:#64748b}
 .fx-form-wrap{padding:3rem 2.5rem;display:flex;justify-content:center}
 .fx-form{width:100%;max-width:28rem;border-radius:1.25rem;padding:2.5rem}
-.flux-theme-dark .fx-form{background:#0f172a;border:1px solid #1e293b}
-.flux-theme-light .fx-form{background:#f8fafc;border:1px solid #e2e8f0}
+.aiplang-theme-dark .fx-form{background:#0f172a;border:1px solid #1e293b}
+.aiplang-theme-light .fx-form{background:#f8fafc;border:1px solid #e2e8f0}
 .fx-field{margin-bottom:1.25rem}
 .fx-label{display:block;font-size:.8125rem;font-weight:600;margin-bottom:.5rem}
-.flux-theme-dark .fx-label{color:#94a3b8}
-.flux-theme-light .fx-label{color:#475569}
+.aiplang-theme-dark .fx-label{color:#94a3b8}
+.aiplang-theme-light .fx-label{color:#475569}
 .fx-input{width:100%;padding:.75rem 1rem;border-radius:.625rem;font-size:.9375rem;outline:none;transition:box-shadow .15s;background:transparent}
 .fx-input:focus{box-shadow:0 0 0 3px rgba(37,99,235,.35)}
-.flux-theme-dark .fx-input{background:#020617;border:1px solid #1e293b;color:#f1f5f9}
-.flux-theme-dark .fx-input::placeholder{color:#334155}
-.flux-theme-light .fx-input{background:#fff;border:1px solid #cbd5e1;color:#0f172a}
-.flux-theme-acid .fx-input{background:#000;border:1px solid #1a2e05;color:#a3e635}
+.aiplang-theme-dark .fx-input{background:#020617;border:1px solid #1e293b;color:#f1f5f9}
+.aiplang-theme-dark .fx-input::placeholder{color:#334155}
+.aiplang-theme-light .fx-input{background:#fff;border:1px solid #cbd5e1;color:#0f172a}
+.aiplang-theme-acid .fx-input{background:#000;border:1px solid #1a2e05;color:#a3e635}
 .fx-btn{width:100%;padding:.875rem 1.5rem;border:none;border-radius:.625rem;font-size:.9375rem;font-weight:700;cursor:pointer;margin-top:.5rem;transition:transform .15s,opacity .15s;letter-spacing:-.01em}
 .fx-btn:hover{transform:translateY(-1px)}
 .fx-btn:disabled{opacity:.5;cursor:not-allowed;transform:none}
-.flux-theme-dark .fx-btn{background:#2563eb;color:#fff;box-shadow:0 4px 14px rgba(37,99,235,.4)}
-.flux-theme-light .fx-btn{background:#2563eb;color:#fff}
-.flux-theme-acid .fx-btn{background:#a3e635;color:#000;font-weight:800}
+.aiplang-theme-dark .fx-btn{background:#2563eb;color:#fff;box-shadow:0 4px 14px rgba(37,99,235,.4)}
+.aiplang-theme-light .fx-btn{background:#2563eb;color:#fff}
+.aiplang-theme-acid .fx-btn{background:#a3e635;color:#000;font-weight:800}
 .fx-form-msg{font-size:.8125rem;padding:.5rem 0;min-height:1.5rem;text-align:center}
 .fx-form-err{color:#f87171}
 .fx-form-ok{color:#4ade80}
 .fx-table-wrap{overflow-x:auto;padding:0 2.5rem 4rem}
 .fx-table{width:100%;border-collapse:collapse;font-size:.875rem}
 .fx-th{text-align:left;padding:.875rem 1.25rem;font-size:.75rem;font-weight:700;text-transform:uppercase;letter-spacing:.06em}
-.flux-theme-dark .fx-th{color:#475569;border-bottom:1px solid #1e293b}
-.flux-theme-light .fx-th{color:#94a3b8;border-bottom:1px solid #e2e8f0}
+.aiplang-theme-dark .fx-th{color:#475569;border-bottom:1px solid #1e293b}
+.aiplang-theme-light .fx-th{color:#94a3b8;border-bottom:1px solid #e2e8f0}
 .fx-tr{transition:background .1s}
 .fx-td{padding:.875rem 1.25rem}
-.flux-theme-dark .fx-tr:hover{background:#0f172a}
-.flux-theme-light .fx-tr:hover{background:#f8fafc}
-.flux-theme-dark .fx-td{border-bottom:1px solid #0f172a}
-.flux-theme-light .fx-td{border-bottom:1px solid #f1f5f9}
+.aiplang-theme-dark .fx-tr:hover{background:#0f172a}
+.aiplang-theme-light .fx-tr:hover{background:#f8fafc}
+.aiplang-theme-dark .fx-td{border-bottom:1px solid #0f172a}
+.aiplang-theme-light .fx-td{border-bottom:1px solid #f1f5f9}
 .fx-td-empty{padding:2rem 1.25rem;text-align:center;opacity:.4}
 .fx-list-wrap{padding:1rem 2.5rem 4rem;display:flex;flex-direction:column;gap:.75rem}
 .fx-list-item{border-radius:.75rem;padding:1.25rem 1.5rem}
-.flux-theme-dark .fx-list-item{background:#0f172a;border:1px solid #1e293b}
+.aiplang-theme-dark .fx-list-item{background:#0f172a;border:1px solid #1e293b}
 .fx-list-field{font-size:.9375rem;line-height:1.5}
 .fx-list-link{font-size:.8125rem;font-weight:600;opacity:.6;transition:opacity .15s}
 .fx-list-link:hover{opacity:1}
 .fx-alert{padding:1rem 2.5rem;font-size:.9375rem;font-weight:500;border-radius:.75rem;margin:1rem 2.5rem}
-.flux-theme-dark .fx-alert{background:rgba(239,68,68,.1);border:1px solid rgba(239,68,68,.3);color:#fca5a5}
+.aiplang-theme-dark .fx-alert{background:rgba(239,68,68,.1);border:1px solid rgba(239,68,68,.3);color:#fca5a5}
 .fx-if-wrap{display:contents}
 .fx-footer{padding:3rem 2.5rem;text-align:center}
-.flux-theme-dark .fx-footer{border-top:1px solid #1e293b}
-.flux-theme-light .fx-footer{border-top:1px solid #e2e8f0}
+.aiplang-theme-dark .fx-footer{border-top:1px solid #1e293b}
+.aiplang-theme-light .fx-footer{border-top:1px solid #e2e8f0}
 .fx-footer-text{font-size:.8125rem}
-.flux-theme-dark .fx-footer-text{color:#334155}
+.aiplang-theme-dark .fx-footer-text{color:#334155}
 .fx-footer-link{font-size:.8125rem;margin:0 .75rem;opacity:.5;transition:opacity .15s}
 .fx-footer-link:hover{opacity:1}
 `

package/server/server.js

@@ -1137,7 +1137,7 @@ function getMime(filename) {
 //     name: 'my-plugin',
 //     setup(server, app, utils) {
 //       // server  = AiplangServer instance (.addRoute, .models)
-//       // app     = parsed .flux app definition
+//       // app     = parsed .aiplang app definition
 //       // utils   = { uuid, now, emit, on, dispatch, resolveEnv, dbRun, dbAll, dbGet }
 //     }
 //   }
@@ -1364,7 +1364,7 @@ async function startServer(aipFile, port = 3000) {
 module.exports = { startServer, parseApp, Model, getDB, dispatch, on, emit, sendMail, setupStripe, registerStripeRoutes, setupS3, registerS3Routes, s3Upload, s3Delete, s3PresignedUrl, PLUGIN_UTILS }
 if (require.main === module) {
   const f=process.argv[2], p=parseInt(process.argv[3]||process.env.PORT||'3000')
-  if (!f) { console.error('Usage: node server.js <app.flux> [port]'); process.exit(1) }
+  if (!f) { console.error('Usage: node server.js <app.aiplang> [port]'); process.exit(1) }
   startServer(f, p).catch(e=>{console.error(e);process.exit(1)})
 }