uniweb 0.8.3 → 0.8.5

package/README.md

@@ -27,6 +27,7 @@ Edit files in `site/pages/` and `foundation/src/sections/` to see changes instan
 | Template | Description |
 | --- | --- |
 | **Starter** | Foundation + site + sample content (default) |
+| **None** | Foundation + site with no content |
 | **Marketing** | Landing page, features, pricing, testimonials |
 | **Docs** | Documentation with sidebar and search |
 | **Academic** | Research site with publications and team |
@@ -34,7 +35,8 @@ Edit files in `site/pages/` and `foundation/src/sections/` to see changes instan
 | **Dynamic** | Live API data fetching with loading states |
 | **Store** | E-commerce with product grid |
 | **Extensions** | Multi-foundation with visual effects extension |
-| **Blank** | Empty workspace — grow with `uniweb add` |
+
+Use `--blank` for an empty workspace (no packages) — grow with `uniweb add`.
 
 **See them live:** [View all template demos](https://uniweb.github.io/templates/)
 
@@ -234,31 +236,32 @@ Start simple. Add what you need, when you need it:
 ```bash
 cd my-site
 
-# Add a second foundation
-npx uniweb add foundation blog
+# Add a co-located foundation + site pair
+npx uniweb add project blog
+
+# Add a second foundation at root
+npx uniweb add foundation ui
 
-# Add a site wired to the blog foundation
-npx uniweb add site blog --foundation blog
+# Add a site wired to a specific foundation
+npx uniweb add site docs --foundation ui
 
 # Add an extension (auto-wired to the only site)
 npx uniweb add extension effects
 
 # Scaffold + apply content from an official template
-npx uniweb add foundation marketing --from marketing
-npx uniweb add site main --from marketing --foundation marketing
+npx uniweb add project marketing --from marketing
 ```
 
-The workspace grows organically. `add` handles placement, wires dependencies, updates workspace globs, and generates root scripts. Use `--path` to override default placement, or `--project` for co-located layouts (e.g., `marketing/foundation/` + `marketing/site/`).
+The workspace grows organically. `add` handles placement, wires dependencies, updates workspace globs, and generates root scripts. The name you provide becomes both the directory name and the package name. Use `--path` to override default placement, or `--project` for explicit co-located layouts.
 
 > `npx uniweb` works before and after install. Once dependencies are installed, you can also use `pnpm uniweb` directly since `uniweb` is a project dependency.
 
 **Or start blank and build up:**
 
 ```bash
-pnpm create uniweb acme --template blank
+pnpm create uniweb acme --blank
 cd acme
-npx uniweb add foundation
-npx uniweb add site
+npx uniweb add project main
 pnpm install
 pnpm dev
 ```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "uniweb",
-  "version": "0.8.3",
+  "version": "0.8.5",
   "description": "Create structured Vite + React sites with content/code separation",
   "type": "module",
   "bin": {
@@ -41,9 +41,9 @@
     "js-yaml": "^4.1.0",
     "prompts": "^2.4.2",
     "tar": "^7.0.0",
-    "@uniweb/runtime": "0.6.4",
-    "@uniweb/build": "0.8.3",
     "@uniweb/core": "0.5.4",
-    "@uniweb/kit": "0.7.3"
+    "@uniweb/kit": "0.7.3",
+    "@uniweb/runtime": "0.6.4",
+    "@uniweb/build": "0.8.4"
   }
 }

package/partials/agents.md

@@ -27,17 +27,27 @@ pnpm create uniweb my-project
 cd my-project && pnpm install
 ```
 
-Use `--template blank` for an empty workspace, or `--template <name>` for an official template (`marketing`, `docs`, `academic`, etc.).
+This creates a workspace with foundation + site + starter content — two commands to a dev server. Use `--template <name>` for an official template (`marketing`, `docs`, `academic`, etc.), `--template none` for foundation + site with no content, or `--blank` for an empty workspace.
 
-### Adding to an existing workspace
+### Adding a co-located project
 
 ```bash
-pnpm uniweb add foundation myname --project myname
-pnpm uniweb add site myname --project myname
+pnpm uniweb add project docs
 pnpm install
 ```
 
-The `--project` flag co-locates foundation and site under `myname/`. The CLI names them `myname` (foundation) and `myname-site` (site) to avoid workspace name collisions.
+This creates `docs/foundation/` + `docs/site/` with package names `docs-foundation` and `docs-site`. Use `--from <template>` to apply template content to both packages.
+
+### Adding individual packages
+
+```bash
+pnpm uniweb add foundation           # First foundation → ./foundation/
+pnpm uniweb add foundation ui        # Named → ./ui/
+pnpm uniweb add site                 # First site → ./site/
+pnpm uniweb add site blog            # Named → ./blog/
+```
+
+The name is both the directory name and the package name. Use `--project <name>` to co-locate under a project directory (e.g., `--project docs` → `docs/foundation/`).
 
 ### What the CLI generates
 
@@ -805,7 +815,7 @@ Uniweb section types do more with less because the framework handles concerns th
 
 1. **Check if you're inside an existing Uniweb workspace** (look for `pnpm-workspace.yaml` and a `package.json` with `uniweb` as a dependency). If yes, use `pnpm uniweb add` to create projects inside it. If no, create a new workspace:
    ```bash
-   pnpm create uniweb my-project --template blank
+   pnpm create uniweb my-project --template none
    ```
 
 3. **Use named layouts** for different page groups — a marketing layout for landing pages, a docs layout for `/docs/*`. One site, multiple layouts, each with its own header/footer/sidebar content.

package/src/commands/add.js

@@ -1,9 +1,10 @@
 /**
  * Add Command
  *
- * Adds foundations, sites, or extensions to an existing workspace.
+ * Adds foundations, sites, extensions, or co-located projects to an existing workspace.
  *
  * Usage:
+ *   uniweb add project [name] [--from <template>]
  *   uniweb add foundation [name] [--from <template>] [--path <dir>] [--project <name>]
  *   uniweb add site [name] [--from <template>] [--foundation <name>] [--path <dir>] [--project <name>]
  *   uniweb add extension [name] [--from <template>] [--site <name>] [--path <dir>]
@@ -14,7 +15,7 @@ import { readFile, writeFile } from 'node:fs/promises'
 import { join, relative } from 'node:path'
 import prompts from 'prompts'
 import yaml from 'js-yaml'
-import { scaffoldFoundation, scaffoldSite, applyContent, mergeTemplateDependencies } from '../utils/scaffold.js'
+import { scaffoldFoundation, scaffoldSite, applyContent, applyStarter, mergeTemplateDependencies } from '../utils/scaffold.js'
 import {
   readWorkspaceConfig,
   addWorkspaceGlob,
@@ -25,6 +26,7 @@ import {
 import { validatePackageName, getExistingPackageNames, resolveUniqueName } from '../utils/names.js'
 import { findWorkspaceRoot } from '../utils/workspace.js'
 import { detectPackageManager, filterCmd, installCmd } from '../utils/pm.js'
+import { isNonInteractive, getCliPrefix, stripNonInteractiveFlag, formatOptions } from '../utils/interactive.js'
 import { resolveTemplate } from '../templates/index.js'
 import { validateTemplate } from '../templates/validator.js'
 import { getVersionsForTemplates } from '../versions.js'
@@ -91,13 +93,17 @@ function parseArgs(args) {
 /**
  * Main add command handler
  */
-export async function add(args) {
+export async function add(rawArgs) {
+  const nonInteractive = isNonInteractive(rawArgs)
+  const args = stripNonInteractiveFlag(rawArgs)
+
   if (args[0] === '--help' || args[0] === '-h') {
     showAddHelp()
     return
   }
 
   const pm = detectPackageManager()
+  const prefix = getCliPrefix()
 
   // Find workspace root
   const rootDir = findWorkspaceRoot()
@@ -110,11 +116,25 @@ export async function add(args) {
   // Interactive subcommand chooser when no args given
   let parsed
   if (!args.length || (args[0] && args[0].startsWith('--'))) {
+    if (nonInteractive) {
+      error(`Missing subcommand.\n`)
+      log(formatOptions([
+        { label: 'project', description: 'Co-located foundation + site pair' },
+        { label: 'foundation', description: 'Component library' },
+        { label: 'site', description: 'Content site' },
+        { label: 'extension', description: 'Additional component package' },
+      ]))
+      log('')
+      log(`Usage: ${prefix} add <project|foundation|site|extension> [name]`)
+      process.exit(1)
+    }
+
     const response = await prompts({
       type: 'select',
       name: 'subcommand',
       message: 'What would you like to add?',
       choices: [
+        { title: 'Project', value: 'project', description: 'Co-located foundation + site pair' },
         { title: 'Foundation', value: 'foundation', description: 'Component library' },
         { title: 'Site', value: 'site', description: 'Content site' },
         { title: 'Extension', value: 'extension', description: 'Additional component package' },
@@ -137,6 +157,9 @@ export async function add(args) {
   const projectName = rootPkg.name || 'my-project'
 
   switch (parsed.subcommand) {
+    case 'project':
+      await addProject(rootDir, projectName, parsed, pm)
+      break
     case 'foundation':
       await addFoundation(rootDir, projectName, parsed, pm)
       break
@@ -148,7 +171,7 @@ export async function add(args) {
       break
     default:
       error(`Unknown subcommand: ${parsed.subcommand}`)
-      log(`Valid subcommands: foundation, site, extension`)
+      log(`Valid subcommands: project, foundation, site, extension`)
       process.exit(1)
   }
 }
@@ -171,25 +194,28 @@ async function addFoundation(rootDir, projectName, opts, pm = 'pnpm') {
 
   // Interactive name prompt when name not provided and no --path
   if (!name && !opts.path) {
-    const foundations = await discoverFoundations(rootDir)
-    const hasDefault = foundations.length === 0 && !existsSync(join(rootDir, 'foundation'))
-    const response = await prompts({
-      type: 'text',
-      name: 'name',
-      message: 'Foundation name:',
-      initial: hasDefault ? 'foundation' : undefined,
-      validate: (value) => validatePackageName(value),
-    }, {
-      onCancel: () => {
-        log('\nCancelled.')
-        process.exit(0)
-      },
-    })
-    // Only set name if user chose something other than the default —
-    // null name tells resolveFoundationTarget to use default placement (./foundation/)
-    if (!hasDefault || response.name !== 'foundation') {
-      name = response.name
+    if (!isNonInteractive(process.argv)) {
+      const foundations = await discoverFoundations(rootDir)
+      const hasDefault = foundations.length === 0 && !existsSync(join(rootDir, 'foundation'))
+      const response = await prompts({
+        type: 'text',
+        name: 'name',
+        message: 'Foundation name:',
+        initial: hasDefault ? 'foundation' : undefined,
+        validate: (value) => validatePackageName(value),
+      }, {
+        onCancel: () => {
+          log('\nCancelled.')
+          process.exit(0)
+        },
+      })
+      // Only set name if user chose something other than the default —
+      // null name tells resolveFoundationTarget to use default placement (./foundation/)
+      if (!hasDefault || response.name !== 'foundation') {
+        name = response.name
+      }
     }
+    // Non-interactive without name: defaults to 'foundation' — resolveFoundationTarget handles it
   }
 
   const target = await resolveFoundationTarget(rootDir, name, opts)
@@ -200,10 +226,12 @@ async function addFoundation(rootDir, projectName, opts, pm = 'pnpm') {
     process.exit(1)
   }
 
-  // Compute package name — auto-suffix if it collides with an existing package
-  let packageName = name || opts.project || 'foundation'
+  // Package name = name or 'foundation'
+  const packageName = name || 'foundation'
   if (existingNames.has(packageName)) {
-    packageName = resolveUniqueName(packageName, '-foundation', existingNames)
+    error(`Package name '${packageName}' already exists in this workspace.`)
+    log(`Choose a different name: ${getCliPrefix()} add foundation <name>`)
+    process.exit(1)
   }
 
   // Scaffold
@@ -251,25 +279,28 @@ async function addSite(rootDir, projectName, opts, pm = 'pnpm') {
 
   // Interactive name prompt when name not provided and no --path
   if (!name && !opts.path) {
-    const existingSites = await discoverSites(rootDir)
-    const hasDefault = existingSites.length === 0 && !existsSync(join(rootDir, 'site'))
-    const response = await prompts({
-      type: 'text',
-      name: 'name',
-      message: 'Site name:',
-      initial: hasDefault ? 'site' : undefined,
-      validate: (value) => validatePackageName(value),
-    }, {
-      onCancel: () => {
-        log('\nCancelled.')
-        process.exit(0)
-      },
-    })
-    // Only set name if user chose something other than the default —
-    // null name tells resolveSiteTarget to use default placement (./site/)
-    if (!hasDefault || response.name !== 'site') {
-      name = response.name
+    if (!isNonInteractive(process.argv)) {
+      const existingSites = await discoverSites(rootDir)
+      const hasDefault = existingSites.length === 0 && !existsSync(join(rootDir, 'site'))
+      const response = await prompts({
+        type: 'text',
+        name: 'name',
+        message: 'Site name:',
+        initial: hasDefault ? 'site' : undefined,
+        validate: (value) => validatePackageName(value),
+      }, {
+        onCancel: () => {
+          log('\nCancelled.')
+          process.exit(0)
+        },
+      })
+      // Only set name if user chose something other than the default —
+      // null name tells resolveSiteTarget to use default placement (./site/)
+      if (!hasDefault || response.name !== 'site') {
+        name = response.name
+      }
     }
+    // Non-interactive without name: defaults to 'site' — resolveSiteTarget handles it
   }
 
   const target = await resolveSiteTarget(rootDir, name, opts)
@@ -282,17 +313,13 @@ async function addSite(rootDir, projectName, opts, pm = 'pnpm') {
 
   // Resolve foundation
   const foundation = await resolveFoundation(rootDir, opts.foundation)
-  let siteName
-  if (opts.project) {
-    // Co-located: convention is {project}-site (e.g., io-site)
-    siteName = (!name || name === opts.project) ? `${opts.project}-site` : name
-  } else {
-    siteName = name || 'site'
-  }
 
-  // Auto-suffix package name if it collides with an existing package
+  // Package name = name or 'site'
+  const siteName = name || 'site'
   if (existingNames.has(siteName)) {
-    siteName = resolveUniqueName(siteName, '-site', existingNames)
+    error(`Package name '${siteName}' already exists in this workspace.`)
+    log(`Choose a different name: ${getCliPrefix()} add site <name>`)
+    process.exit(1)
   }
 
   if (foundation) {
@@ -371,6 +398,12 @@ async function addExtension(rootDir, projectName, opts, pm = 'pnpm') {
 
   // Interactive name prompt when name not provided
   if (!name) {
+    if (isNonInteractive(process.argv)) {
+      error(`Missing extension name.\n`)
+      log(`Usage: ${getCliPrefix()} add extension <name>`)
+      process.exit(1)
+    }
+
     const response = await prompts({
       type: 'text',
       name: 'name',
@@ -446,8 +479,117 @@ async function addExtension(rootDir, projectName, opts, pm = 'pnpm') {
   log(`Next: ${colors.cyan}${installCmd(pm)}${colors.reset}`)
 }
 
+/**
+ * Add a co-located foundation + site pair to the workspace
+ */
+async function addProject(rootDir, projectName, opts, pm = 'pnpm') {
+  let name = opts.name
+  const existingNames = await getExistingPackageNames(rootDir)
+
+  // Validate name format
+  if (name) {
+    const valid = validatePackageName(name)
+    if (valid !== true) {
+      error(valid)
+      process.exit(1)
+    }
+  }
+
+  // Interactive name prompt when name not provided
+  if (!name) {
+    if (isNonInteractive(process.argv)) {
+      error(`Missing project name.\n`)
+      log(`Usage: ${getCliPrefix()} add project <name>`)
+      process.exit(1)
+    }
+
+    const response = await prompts({
+      type: 'text',
+      name: 'name',
+      message: 'Project name:',
+      validate: (value) => validatePackageName(value),
+    }, {
+      onCancel: () => {
+        log('\nCancelled.')
+        process.exit(0)
+      },
+    })
+    name = response.name
+  }
+
+  // Check directory doesn't already exist
+  const projectDir = join(rootDir, name)
+  if (existsSync(projectDir)) {
+    error(`Directory already exists: ${name}/`)
+    process.exit(1)
+  }
+
+  // Compute package names
+  const foundationPkgName = `${name}-foundation`
+  const sitePkgName = `${name}-site`
+
+  // Check package name collisions
+  for (const pkgName of [foundationPkgName, sitePkgName]) {
+    if (existingNames.has(pkgName)) {
+      error(`Package name '${pkgName}' already exists in this workspace.`)
+      process.exit(1)
+    }
+  }
+
+  const progressCb = (msg) => info(`  ${msg}`)
+
+  // Scaffold foundation
+  info(`Creating foundation: ${foundationPkgName}...`)
+  await scaffoldFoundation(join(projectDir, 'foundation'), {
+    name: foundationPkgName,
+    projectName,
+    isExtension: false,
+  }, { onProgress: progressCb })
+
+  // Scaffold site
+  info(`Creating site: ${sitePkgName}...`)
+  await scaffoldSite(join(projectDir, 'site'), {
+    name: sitePkgName,
+    projectName,
+    foundationName: foundationPkgName,
+    foundationPath: 'file:../foundation',
+    foundationRef: foundationPkgName,
+  }, { onProgress: progressCb })
+
+  // Apply template content if --from specified
+  if (opts.from) {
+    await applyFromTemplate(opts.from, 'foundation', join(projectDir, 'foundation'), projectName)
+    await applyFromTemplate(opts.from, 'site', join(projectDir, 'site'), projectName)
+  }
+
+  // Update workspace globs for co-located layout
+  await addWorkspaceGlob(rootDir, '*/foundation')
+  await addWorkspaceGlob(rootDir, '*/site')
+
+  // Update root scripts
+  const sites = await discoverSites(rootDir)
+  if (!sites.find(s => s.path === `${name}/site`)) {
+    sites.push({ name: sitePkgName, path: `${name}/site` })
+  }
+  await updateRootScripts(rootDir, sites, pm)
+
+  success(`Created project '${name}' at ${name}/`)
+  log(`  ${colors.dim}Foundation: ${name}/foundation/ (${foundationPkgName})${colors.reset}`)
+  log(`  ${colors.dim}Site: ${name}/site/ (${sitePkgName})${colors.reset}`)
+  log('')
+  log(`Next: ${colors.cyan}${installCmd(pm)} && ${filterCmd(pm, sitePkgName, 'dev')}${colors.reset}`)
+}
+
 /**
  * Resolve placement for a foundation
+ *
+ * Rules:
+ * - --path: use it directly
+ * - --project: {project}/foundation (co-located)
+ * - Existing co-located glob: follow pattern
+ * - Existing segregated glob: follow pattern
+ * - First foundation: dir name is the name (default: 'foundation')
+ * - Already have one: error in non-interactive, ask in interactive
  */
 async function resolveFoundationTarget(rootDir, name, opts) {
   if (opts.path) return opts.path
@@ -460,23 +602,43 @@ async function resolveFoundationTarget(rootDir, name, opts) {
   const { packages } = await readWorkspaceConfig(rootDir)
   const hasColocated = packages.some(p => p.includes('*/foundation'))
   const hasFoundationsGlob = packages.some(p => p.startsWith('foundations/'))
-  const hasSingleFoundation = existsSync(join(rootDir, 'foundation'))
 
-  if (hasColocated && opts.project) {
-    return `${opts.project}/foundation`
+  // Respect existing co-located layout
+  if (hasColocated && name) {
+    return `${name}/foundation`
   }
 
-  // No name and no foundations exist → ./foundation/
-  if (!name && !hasSingleFoundation && !hasFoundationsGlob) {
-    return 'foundation'
+  // Respect existing segregated layout
+  if (hasFoundationsGlob) {
+    return `foundations/${name || 'foundation'}`
   }
 
-  // Named foundation or existing foundation → ./foundations/{name}/
-  return `foundations/${name || 'foundation'}`
+  // dir name = name or 'foundation'
+  const dirName = name || 'foundation'
+
+  // Check if target already exists
+  if (!existsSync(join(rootDir, dirName))) {
+    return dirName
+  }
+
+  // Already have one at the target path — error with guidance
+  if (isNonInteractive(process.argv)) {
+    error(`Directory '${dirName}' already exists.`)
+    log(`\nTo add another foundation, specify a name:`)
+    log(`  ${getCliPrefix()} add foundation <name>`)
+    log(`\nOr use --path for explicit placement:`)
+    log(`  ${getCliPrefix()} add foundation --path <dir>`)
+    process.exit(1)
+  }
+
+  // Interactive: the existsSync check in addFoundation will catch it
+  return dirName
 }
 
 /**
  * Resolve placement for a site
+ *
+ * Same rules as resolveFoundationTarget, adapted for sites.
  */
 async function resolveSiteTarget(rootDir, name, opts) {
   if (opts.path) return opts.path
@@ -488,19 +650,37 @@ async function resolveSiteTarget(rootDir, name, opts) {
   const { packages } = await readWorkspaceConfig(rootDir)
   const hasColocated = packages.some(p => p.includes('*/site'))
   const hasSitesGlob = packages.some(p => p.startsWith('sites/'))
-  const hasSingleSite = existsSync(join(rootDir, 'site'))
 
-  if (hasColocated && opts.project) {
-    return `${opts.project}/site`
+  // Respect existing co-located layout
+  if (hasColocated && name) {
+    return `${name}/site`
+  }
+
+  // Respect existing segregated layout
+  if (hasSitesGlob) {
+    return `sites/${name || 'site'}`
+  }
+
+  // dir name = name or 'site'
+  const dirName = name || 'site'
+
+  // Check if target already exists
+  if (!existsSync(join(rootDir, dirName))) {
+    return dirName
   }
 
-  // No name and no sites exist → ./site/
-  if (!name && !hasSingleSite && !hasSitesGlob) {
-    return 'site'
+  // Already have one at the target path — error with guidance
+  if (isNonInteractive(process.argv)) {
+    error(`Directory '${dirName}' already exists.`)
+    log(`\nTo add another site, specify a name:`)
+    log(`  ${getCliPrefix()} add site <name>`)
+    log(`\nOr use --path for explicit placement:`)
+    log(`  ${getCliPrefix()} add site --path <dir>`)
+    process.exit(1)
   }
 
-  // Named site or existing site → ./sites/{name}/
-  return `sites/${name || 'site'}`
+  // Interactive: the existsSync check in addSite will catch it
+  return dirName
 }
 
 /**
@@ -529,7 +709,18 @@ async function resolveFoundation(rootDir, foundationFlag) {
     return foundations[0]
   }
 
-  // Multiple foundations — prompt
+  // Multiple foundations — prompt (or fail in non-interactive mode)
+  if (isNonInteractive(process.argv)) {
+    error(`Multiple foundations found. Specify which to use:\n`)
+    log(formatOptions(foundations.map(f => ({
+      label: f.name,
+      description: f.path,
+    }))))
+    log('')
+    log(`Usage: ${getCliPrefix()} add site <name> --foundation <name>`)
+    process.exit(1)
+  }
+
   const response = await prompts({
     type: 'select',
     name: 'foundation',
@@ -691,9 +882,10 @@ function showAddHelp() {
   log(`
 ${colors.cyan}${colors.bright}Uniweb Add${colors.reset}
 
-Add foundations, sites, or extensions to your workspace.
+Add projects, foundations, sites, or extensions to your workspace.
 
 ${colors.bright}Usage:${colors.reset}
+  uniweb add project [name] [options]
   uniweb add foundation [name] [options]
   uniweb add site [name] [options]
   uniweb add extension <name> [options]
@@ -713,11 +905,12 @@ ${colors.bright}Extension Options:${colors.reset}
   --site <name>      Site to wire extension URL into
 
 ${colors.bright}Examples:${colors.reset}
-  uniweb add foundation                                # Create ./foundation/
-  uniweb add foundation marketing                      # Create ./foundations/marketing/
-  uniweb add foundation marketing --from marketing     # Scaffold + marketing sections
-  uniweb add site blog --foundation marketing          # Create ./sites/blog/ wired to marketing
-  uniweb add site blog --from docs --foundation blog   # Scaffold + docs pages
+  uniweb add project docs                              # Create docs/foundation/ + docs/site/
+  uniweb add project docs --from academic              # Co-located pair + academic content
+  uniweb add foundation                                # Create ./foundation/ at root
+  uniweb add foundation ui                             # Create ./ui/ at root
+  uniweb add site                                      # Create ./site/ at root
+  uniweb add site blog --foundation marketing          # Create ./blog/ wired to marketing
   uniweb add extension effects --site site             # Create ./extensions/effects/
   uniweb add foundation --project docs                 # Create ./docs/foundation/ (co-located)
   uniweb add site --project docs                       # Create ./docs/site/ (co-located)

package/src/commands/docs.js

@@ -29,6 +29,7 @@ import {
   findFoundations,
   promptSelect,
 } from '../utils/workspace.js'
+import { isNonInteractive, getCliPrefix, formatOptions } from '../utils/interactive.js'
 
 // Colors for terminal output
 const colors = {
@@ -394,6 +395,12 @@ async function generateComponentDocs(args) {
     if (foundations.length === 1) {
       targetFoundation = foundations[0]
       info(`Found foundation: ${targetFoundation}`)
+    } else if (isNonInteractive(process.argv)) {
+      error(`Multiple foundations found. Specify which to target:\n`)
+      log(formatOptions(foundations.map(f => ({ label: f, description: '' }))))
+      log('')
+      log(`Usage: ${getCliPrefix()} docs --target <path>`)
+      process.exit(1)
     } else {
       log(`${colors.dim}Multiple foundations found in workspace.${colors.reset}\n`)
       targetFoundation = await promptSelect('Select foundation:', foundations)

package/src/index.js

@@ -29,6 +29,7 @@ import {
 import { validateTemplate } from './templates/validator.js'
 import { scaffoldWorkspace, scaffoldFoundation, scaffoldSite, applyContent, applyStarter, mergeTemplateDependencies } from './utils/scaffold.js'
 import { detectPackageManager, filterCmd, installCmd, runCmd } from './utils/pm.js'
+import { isNonInteractive, getCliPrefix, stripNonInteractiveFlag, formatOptions } from './utils/interactive.js'
 
 // Colors for terminal output
 const colors = {
@@ -43,8 +44,8 @@ const colors = {
 
 // Template choices for interactive prompt
 const TEMPLATE_CHOICES = [
+  { title: 'None', value: 'none', description: 'Foundation + site with no content' },
   { title: 'Starter', value: 'starter', description: 'Foundation + site + sample content' },
-  { title: 'Blank', value: 'blank', description: 'Empty workspace — grow with uniweb add' },
   { title: 'Marketing', value: 'marketing', description: 'Landing page, features, pricing, testimonials' },
   { title: 'Docs', value: 'docs', description: 'Documentation with sidebar and search' },
   { title: 'Academic', value: 'academic', description: 'Research site with publications and team' },
@@ -52,6 +53,7 @@ const TEMPLATE_CHOICES = [
   { title: 'International', value: 'international', description: 'Multilingual site with i18n and blog' },
   { title: 'Store', value: 'store', description: 'E-commerce with product grid' },
   { title: 'Extensions', value: 'extensions', description: 'Multi-foundation with visual effects extension' },
+  { title: 'Blank workspace', value: 'blank', description: 'Empty workspace — grow with uniweb add' },
 ]
 
 function log(message) {
@@ -74,7 +76,7 @@ function title(message) {
  * Create a project using the new package template flow (default)
  */
 async function createFromPackageTemplates(projectDir, projectName, options = {}) {
-  const { onProgress, onWarning, pm = 'pnpm' } = options
+  const { onProgress, onWarning, pm = 'pnpm', includeStarter = true } = options
 
   onProgress?.('Setting up workspace...')
 
@@ -106,9 +108,11 @@ async function createFromPackageTemplates(projectDir, projectName, options = {})
     foundationPath: 'file:../foundation',
   }, { onProgress, onWarning })
 
-  // 4. Apply starter content
-  onProgress?.('Adding starter content...')
-  await applyStarter(projectDir, { projectName }, { onProgress, onWarning })
+  // 4. Apply starter content (unless creating a "none" project)
+  if (includeStarter) {
+    onProgress?.('Adding starter content...')
+    await applyStarter(projectDir, { projectName }, { onProgress, onWarning })
+  }
 
   success(`Created project: ${projectName}`)
 }
@@ -288,7 +292,9 @@ function computeFoundationFilePath(sitePath, foundationPath) {
 }
 
 async function main() {
-  const args = process.argv.slice(2)
+  const rawArgs = process.argv.slice(2)
+  const nonInteractive = isNonInteractive(rawArgs)
+  const args = stripNonInteractiveFlag(rawArgs)
   const command = args[0]
   const pm = detectPackageManager()
 
@@ -361,6 +367,15 @@ async function main() {
     displayName = args[nameIndex + 1]
   }
 
+  // Check for --blank flag
+  let isBlank = args.includes('--blank')
+
+  // Handle --template blank as alias for --blank
+  if (templateType === 'blank') {
+    isBlank = true
+    templateType = null
+  }
+
   // Check for --no-git flag
   const noGit = args.includes('--no-git')
 
@@ -369,6 +384,20 @@ async function main() {
     projectName = null
   }
 
+  const prefix = getCliPrefix()
+
+  // Non-interactive: fail with actionable message instead of prompting
+  if (nonInteractive && !projectName) {
+    error(`Missing project name.\n`)
+    log(`Usage: ${prefix} create <project-name> [--template <name>] [--blank]`)
+    process.exit(1)
+  }
+
+  // Non-interactive: default to starter when no template specified
+  if (nonInteractive && !templateType && !isBlank) {
+    templateType = 'starter'
+  }
+
   // Interactive prompts
   const response = await prompts([
     {
@@ -398,13 +427,14 @@ async function main() {
     process.exit(1)
   }
 
-  // Prompt for template if not specified via --template
-  if (!templateType) {
+  // Prompt for template if not specified via --template or --blank
+  if (!templateType && !isBlank) {
     const templateResponse = await prompts({
       type: 'select',
       name: 'template',
       message: 'Template:',
       choices: TEMPLATE_CHOICES,
+      initial: 1,
     }, {
       onCancel: () => {
         log('\nScaffolding cancelled.')
@@ -412,6 +442,11 @@ async function main() {
       },
     })
     templateType = templateResponse.template
+    // Handle "blank" selection from interactive prompt
+    if (templateType === 'blank') {
+      isBlank = true
+      templateType = null
+    }
   }
 
   const effectiveName = displayName || projectName
@@ -428,13 +463,22 @@ async function main() {
   const progressCb = (msg) => log(`  ${colors.dim}${msg}${colors.reset}`)
   const warningCb = (msg) => log(`  ${colors.yellow}Warning: ${msg}${colors.reset}`)
 
-  if (templateType === 'blank') {
-    // Blank workspace
+  if (isBlank) {
+    // Blank workspace (--blank or --template blank)
     log('\nCreating blank workspace...')
     await createBlankWorkspace(projectDir, effectiveName, {
       onProgress: progressCb,
       onWarning: warningCb,
     })
+  } else if (templateType === 'none') {
+    // Foundation + site with no content
+    log('\nCreating project...')
+    await createFromPackageTemplates(projectDir, effectiveName, {
+      onProgress: progressCb,
+      onWarning: warningCb,
+      pm,
+      includeStarter: false,
+    })
   } else if (templateType === 'starter') {
     // Starter: foundation + site + sample content
     log('\nCreating project...')
@@ -498,11 +542,10 @@ async function main() {
   // Success message
   title('Project created successfully!')
 
-  if (templateType === 'blank') {
+  if (isBlank) {
     log(`Next steps:\n`)
     log(`  ${colors.cyan}cd ${projectName}${colors.reset}`)
-    log(`  ${colors.cyan}npx uniweb add foundation${colors.reset}`)
-    log(`  ${colors.cyan}npx uniweb add site${colors.reset}`)
+    log(`  ${colors.cyan}${prefix} add project${colors.reset}`)
     log(`  ${colors.cyan}${installCmd(pm)}${colors.reset}`)
     log(`  ${colors.cyan}${runCmd(pm, 'dev')}${colors.reset}`)
   } else {
@@ -530,15 +573,21 @@ ${colors.bright}Commands:${colors.reset}
   i18n <cmd>         Internationalization (extract, sync, status)
 
 ${colors.bright}Create Options:${colors.reset}
-  --template <type>  Project template (prompts if not specified)
+  --template <type>  Project template (default: starter)
+  --blank            Create an empty workspace (grow with uniweb add)
   --name <name>      Project display name
   --no-git           Skip git repository initialization
 
 ${colors.bright}Add Subcommands:${colors.reset}
+  add project [name]      Add a co-located foundation + site pair
   add foundation [name]   Add a foundation (--from, --path, --project)
   add site [name]         Add a site (--from, --foundation, --path, --project)
   add extension <name>    Add an extension (--from, --site, --path)
 
+${colors.bright}Global Options:${colors.reset}
+  --non-interactive    Fail with usage info instead of prompting
+                       Auto-detected when CI=true or no TTY (pipes, agents)
+
 ${colors.bright}Build Options:${colors.reset}
   --target <type>    Build target (foundation, site) - auto-detected if not specified
   --prerender        Force pre-rendering (overrides site.yml)
@@ -567,7 +616,7 @@ ${colors.bright}i18n Commands:${colors.reset}
 
 ${colors.bright}Template Types:${colors.reset}
   starter                       Foundation + site + sample content (default)
-  blank                         Empty workspace (grow with 'add')
+  none                          Foundation + site with no content
   marketing                     Official marketing template
   ./path/to/template            Local directory
   @scope/template-name          npm package
@@ -575,17 +624,17 @@ ${colors.bright}Template Types:${colors.reset}
   https://github.com/user/repo  GitHub URL
 
 ${colors.bright}Examples:${colors.reset}
-  npx uniweb create my-project                           # Interactive (prompts for template)
-  npx uniweb create my-project --template starter        # Foundation + site + starter content
-  npx uniweb create my-project --template blank          # Blank workspace
+  npx uniweb create my-project                           # Foundation + site + starter content
+  npx uniweb create my-project --template none           # Foundation + site, no content
+  npx uniweb create my-project --blank                   # Empty workspace
   npx uniweb create my-project --template marketing      # Official template
   npx uniweb create my-project --template ./my-template  # Local template
 
   cd my-project
-  npx uniweb add foundation marketing                    # Add foundations/marketing/
-  npx uniweb add foundation marketing --from marketing   # Scaffold + marketing sections
-  npx uniweb add site blog --foundation marketing        # Add sites/blog/ wired to marketing
-  npx uniweb add site blog --from docs --foundation blog # Scaffold + docs pages
+  npx uniweb add project docs                            # Add docs/foundation/ + docs/site/
+  npx uniweb add project docs --from academic            # Co-located pair + academic content
+  npx uniweb add foundation                              # Add foundation at root
+  npx uniweb add site blog --foundation marketing        # Add site wired to marketing
   npx uniweb add extension effects --site site           # Add extensions/effects/
 
   npx uniweb build

package/src/templates/resolver.js

@@ -3,7 +3,7 @@
  */
 
 // Built-in templates (programmatic, not file-based)
-export const BUILTIN_TEMPLATES = ['blank', 'starter']
+export const BUILTIN_TEMPLATES = ['blank', 'starter', 'none']
 
 // Official templates from @uniweb/templates package (downloaded from GitHub releases)
 export const OFFICIAL_TEMPLATES = ['marketing', 'academic', 'docs', 'international', 'dynamic', 'store', 'extensions']

package/src/utils/interactive.js

@@ -0,0 +1,53 @@
+/**
+ * Non-Interactive Mode Detection
+ *
+ * Detects when the CLI is running without a TTY (AI agents, CI, piped input)
+ * and provides helpers for printing actionable error messages.
+ */
+
+/**
+ * Detect if the CLI is running in non-interactive mode.
+ * True when --non-interactive flag, CI env var, or no TTY.
+ * @param {string[]} args - Command line arguments
+ * @returns {boolean}
+ */
+export function isNonInteractive(args) {
+  if (args.includes('--non-interactive')) return true
+  if (process.env.CI) return true
+  if (!process.stdin.isTTY) return true
+  return false
+}
+
+/**
+ * Get the CLI invocation prefix to use in suggested commands.
+ * Mirrors however the user actually ran the CLI.
+ * @returns {string}
+ */
+export function getCliPrefix() {
+  const ua = process.env.npm_config_user_agent || ''
+  if (ua.startsWith('pnpm/')) return 'pnpm uniweb'
+  if (ua.startsWith('npm/')) return 'npx uniweb'
+  return 'uniweb'
+}
+
+/**
+ * Strip --non-interactive from an args array so it doesn't interfere
+ * with positional argument parsing.
+ * @param {string[]} args
+ * @returns {string[]}
+ */
+export function stripNonInteractiveFlag(args) {
+  return args.filter(a => a !== '--non-interactive')
+}
+
+/**
+ * Format a list of options with aligned descriptions for terminal output.
+ * @param {{ label: string, description: string }[]} options
+ * @returns {string}
+ */
+export function formatOptions(options) {
+  const maxLen = Math.max(...options.map(o => o.label.length))
+  return options
+    .map(o => `  ${o.label.padEnd(maxLen + 3)}${o.description}`)
+    .join('\n')
+}

package/templates/site/theme.yml

@@ -1 +1,99 @@
-primary: '#3b82f6'
+# Theme Configuration
+# Controls colors, typography, and visual style for the site.
+# Only set what you want to change — everything has sensible defaults.
+
+# ─── Colors ────────────────────────────────────────────────────────────────────
+# Palette colors generate shades (50–950) used by semantic tokens.
+# Values: any CSS color (hex, rgb, hsl, oklch).
+
+colors:
+  primary: '#3b82f6'        # Brand color — buttons, links, focus rings
+  # secondary: '#64748b'    # Secondary actions
+  # accent: '#8b5cf6'       # Highlights, decorative elements
+  # neutral: stone           # Gray family — stone, zinc, gray, slate, neutral
+
+# ─── Fonts ─────────────────────────────────────────────────────────────────────
+# Font families for text, headings, and code blocks.
+# Default: system-ui stack. Uncomment to use custom fonts.
+
+# fonts:
+#   heading: '"Inter", system-ui, sans-serif'
+#   body: '"Inter", system-ui, sans-serif'
+#   mono: '"JetBrains Mono", ui-monospace, monospace'
+#   import:
+#     - url: https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600;700&display=swap
+#     - url: https://fonts.googleapis.com/css2?family=JetBrains+Mono:wght@400;500&display=swap
+
+# ─── Page Background ──────────────────────────────────────────────────────────
+# Background applied to the page body. Any CSS background value.
+
+# background: '#fafaf9'
+# background: 'linear-gradient(to bottom, #fafaf9, white)'
+
+# ─── Appearance ────────────────────────────────────────────────────────────────
+# Color scheme support. Simple value: light, dark, or system.
+# Or use the expanded form for more control.
+
+# appearance: light
+# appearance:
+#   default: light
+#   schemes: [light, dark]
+#   allowToggle: true
+#   respectSystemPreference: true
+
+# ─── Context Overrides ─────────────────────────────────────────────────────────
+# Sections declare a context (light, medium, dark) in frontmatter.
+# Each context maps semantic tokens to palette values.
+# Override individual tokens here — unlisted tokens keep their defaults.
+#
+# Available tokens:
+#   Surfaces:  section, card, muted
+#   Text:      body, heading, subtle
+#   Border:    border, ring
+#   Links:     link, link-hover
+#   Actions:   primary, primary-foreground, primary-hover
+#              secondary, secondary-foreground, secondary-hover
+#   Status:    success, warning, error, info (+ -subtle variants)
+
+# contexts:
+#   light:
+#     section: white
+#   medium:
+#     section: 'var(--neutral-100)'
+#   dark:
+#     heading: white
+
+# ─── Inline Text Styles ───────────────────────────────────────────────────────
+# Named styles for inline text in markdown: [text]{emphasis}
+# Each name maps to CSS properties.
+# Defaults: emphasis (colored + bold), muted (subtle).
+
+# inline:
+#   emphasis:
+#     color: 'var(--link)'
+#     font-weight: '600'
+#   muted:
+#     color: 'var(--subtle)'
+
+# ─── Code Blocks ───────────────────────────────────────────────────────────────
+# Syntax highlighting colors for code blocks (uses Shiki).
+
+# code:
+#   background: '#1e1e2e'
+#   foreground: '#cdd6f4'
+#   keyword: '#cba6f7'
+#   string: '#a6e3a1'
+#   number: '#fab387'
+#   comment: '#6c7086'
+#   function: '#89b4fa'
+#   variable: '#f5e0dc'
+#   type: '#f9e2af'
+#   property: '#94e2d5'
+#   tag: '#89b4fa'
+
+# ─── Foundation Variables ──────────────────────────────────────────────────────
+# Override variables declared by the foundation (e.g., header-height, max-width).
+# Available variables depend on the foundation — check its foundation.js.
+
+# vars:
+#   header-height: 5rem