diff --git a/docs/content/docs/api-reference/cli.mdx b/docs/content/docs/api-reference/cli.mdx
index e118550e0..55f87b406 100644
--- a/docs/content/docs/api-reference/cli.mdx
+++ b/docs/content/docs/api-reference/cli.mdx
@@ -58,6 +58,7 @@ openui create [options]
 | `-n, --name <string>`             | Project name (interactive default: `openui-agent`)                            |
 | `-t, --template <template>`       | AI backend: `openui-cloud` (Gateway; recommended) or `openui-self-hosted`     |
 | `--backend-framework <framework>` | Backend integration: `default`, `langgraph`, `vercel-ai-sdk`, or `vercel-eve` |
+| `-e, --example <example>`         | Scaffold any example from the OpenUI Repository    |
 | `--api-key <key>`                 | OpenUI Gateway API key; skips sign-in for the Gateway setup                   |
 | `--auth <method>`                 | Gateway auth method: `oauth` or `skip`; `manual` is deprecated                |
 | `--skill`                         | Install the OpenUI agent skill for AI coding assistants                       |
@@ -68,7 +69,7 @@ openui create [options]
 | `--no-interactive`                | Fail instead of prompting for missing input                                   |
 | `--agent-name <name>`             | Declare the invoking coding-agent slug (default: `unknown`)                   |
 
-When run interactively (default), the CLI prompts for any missing options, including the backend framework, then asks whether to start the development server after installing dependencies with the detected package manager. The start prompt defaults to yes; answering no preserves the existing install-and-exit behavior and prints the `cd` and dev commands. For most prototypes and evaluations, start with **OpenUI Gateway, the recommended default**: hosted models, managed conversation history and streaming, built-in tools, and ready-to-use reports and presentations without operating the model, storage, or artifact infrastructure. Choose **self-hosted** when owning the OpenAI-compatible provider, AI route, and persistence is a requirement.
+When run interactively (default), the CLI prompts for any missing options, including the backend framework or an example, then asks whether to start the development server after installing dependencies with the detected package manager. The start prompt defaults to yes; answering no preserves the existing install-and-exit behavior and prints the `cd` and dev commands. For most prototypes and evaluations, start with **OpenUI Gateway, the recommended default**: hosted models, managed conversation history and streaming, built-in tools, and ready-to-use reports and presentations without operating the model, storage, or artifact infrastructure. Choose **self-hosted** when owning the OpenAI-compatible provider, AI route, and persistence is a requirement.
 
 `openui-cloud` remains the CLI template identifier for the Gateway-backed setup.
 
@@ -78,8 +79,8 @@ In non-interactive mode, dependencies are installed without starting the long-ru
 
 **What it does**
 
-1. Resolves the project name, AI setup, and backend framework
-2. Copies the selected Next.js template into `<name>/`
+1. Resolves the project name, picks a backend-framework overlay or an OpenUI example
+2. Copies the selected Next.js template or example into `<name>/`
 3. Rewrites `workspace:*` dependency versions to `latest`
 4. Writes the relevant `.env` values, including Thesys sign-in/API-key setup for OpenUI Gateway
 5. Optionally installs the [OpenUI agent skill](/docs/mcp#install-via-the-skills-cli-recommended) for AI coding assistants (e.g. Claude, Cursor, Copilot)
@@ -101,6 +102,10 @@ For Gateway-backed LangGraph and Vercel AI SDK variants, the framework owns orch
 
 Every framework overlay includes a `get_weather` example backed by Open-Meteo. Ask “What’s the weather in Berlin?” to verify the selected framework’s native multi-step tool loop.
 
+**OpenUI examples**
+
+Interactive `openui create` lists starter templates, and option to create an app from listed [OpenUI examples](https://github.com/thesysdev/openui/blob/main/examples). `--example <name>` skips both menus. `--example` cannot be combined with `--template` or `--backend-framework`. Any other folder name in the catalog works the same way.
+
 **Conversation storage**
 
 Every Gateway-backed variant uses Gateway as its durable conversation and artifact store. The browser connects directly through `useOpenuiCloudStorage()` with a short-lived frontend token. For default, LangGraph, and Vercel AI SDK routes, the `threadId` sent to `/api/chat` is the Gateway conversation ID, and each backend appends model turns to it with `conversation: threadId` and `store: true`. The Vercel AI SDK route does not create a second store. The Eve Gateway overlay keeps that Gateway thread store and maps each Gateway `threadId` to an Eve session cursor in the browser; it does not use `/api/chat`. The Gateway-backed LangGraph relay creates and deletes a temporary Agent Server thread for each run; configure a separate LangGraph checkpointer only when graph state, interrupts, or resumable runs must persist independently.
@@ -132,6 +137,11 @@ pnpx @openuidev/cli@latest create --name my-app --template openui-self-hosted --
 pnpx @openuidev/cli@latest create --name my-app --template openui-self-hosted --backend-framework vercel-ai-sdk
 pnpx @openuidev/cli@latest create --name my-app --template openui-self-hosted --backend-framework vercel-eve
 
+# Select an example
+pnpx @openuidev/cli@latest create --name my-app --example shadcn
+pnpx @openuidev/cli@latest create --name my-app --example mastra
+pnpx @openuidev/cli@latest create --name my-app --example vue
+
 # Non-interactive
 pnpx @openuidev/cli@latest create --no-interactive --name my-app --template openui-cloud --auth skip
 
@@ -156,6 +166,11 @@ bunx @openuidev/cli@latest create --name my-app --template openui-self-hosted --
 bunx @openuidev/cli@latest create --name my-app --template openui-self-hosted --backend-framework vercel-ai-sdk
 bunx @openuidev/cli@latest create --name my-app --template openui-self-hosted --backend-framework vercel-eve
 
+# Select an example
+bunx @openuidev/cli@latest create --name my-app --example shadcn
+bunx @openuidev/cli@latest create --name my-app --example mastra
+bunx @openuidev/cli@latest create --name my-app --example vue
+
 # Non-interactive
 bunx @openuidev/cli@latest create --no-interactive --name my-app --template openui-cloud --auth skip
 
@@ -180,6 +195,11 @@ yarn dlx @openuidev/cli@latest create --name my-app --template openui-self-hoste
 yarn dlx @openuidev/cli@latest create --name my-app --template openui-self-hosted --backend-framework vercel-ai-sdk
 yarn dlx @openuidev/cli@latest create --name my-app --template openui-self-hosted --backend-framework vercel-eve
 
+# Select an example
+yarn dlx @openuidev/cli@latest create --name my-app --example shadcn
+yarn dlx @openuidev/cli@latest create --name my-app --example mastra
+yarn dlx @openuidev/cli@latest create --name my-app --example vue
+
 # Non-interactive
 yarn dlx @openuidev/cli@latest create --no-interactive --name my-app --template openui-cloud --auth skip
 
@@ -204,6 +224,11 @@ npx @openuidev/cli@latest create --name my-app --template openui-self-hosted --b
 npx @openuidev/cli@latest create --name my-app --template openui-self-hosted --backend-framework vercel-ai-sdk
 npx @openuidev/cli@latest create --name my-app --template openui-self-hosted --backend-framework vercel-eve
 
+# Select an example
+npx @openuidev/cli@latest create --name my-app --example shadcn
+npx @openuidev/cli@latest create --name my-app --example mastra
+npx @openuidev/cli@latest create --name my-app --example vue
+
 # Non-interactive
 npx @openuidev/cli@latest create --no-interactive --name my-app --template openui-cloud --auth skip
 
diff --git a/examples/examples.json b/examples/examples.json
index 3ffc40748..8d3b918e5 100644
--- a/examples/examples.json
+++ b/examples/examples.json
@@ -4,103 +4,103 @@
       "title": "Google ADK",
       "description": "A Google ADK TypeScript agent streaming OpenUI Lang to a Next.js client.",
       "path": "agent-frameworks/google-adk",
-      "featured": false
+      "envKey": "THESYS_API_KEY"
     },
     {
       "title": "LangGraph Platform",
       "description": "A DeepAgents graph on LangGraph Platform, streamed to OpenUI through the LangChain adapter.",
       "path": "agent-frameworks/langgraph-platform",
-      "featured": false
+      "envKey": "THESYS_API_KEY"
     },
     {
       "title": "Mastra",
       "description": "A Mastra agent connected to OpenUI through AG-UI.",
       "path": "agent-frameworks/mastra",
-      "featured": true
+      "envKey": "THESYS_API_KEY"
     },
     {
       "title": "Vercel AI SDK",
       "description": "AgentInterface over a Vercel AI SDK streamText backend.",
       "path": "agent-frameworks/vercel-ai-sdk",
-      "featured": false
+      "envKey": "THESYS_API_KEY"
     },
     {
       "title": "Vercel Eve",
       "description": "An Eve agent rendered through Agent Interface.",
       "path": "agent-frameworks/vercel-eve",
-      "featured": false
+      "envKey": "THESYS_API_KEY"
     },
     {
       "title": "FastAPI",
       "description": "A Python FastAPI streaming backend with a React OpenUI client.",
       "path": "app-frameworks/fastapi",
-      "featured": true
+      "envKey": "THESYS_API_KEY"
     },
     {
       "title": "React Native",
       "description": "An Expo client rendering native OpenUI components from a Next.js backend stream.",
       "path": "app-frameworks/react-native",
-      "featured": true
+      "envKey": "THESYS_API_KEY"
     },
     {
       "title": "Svelte",
       "description": "OpenUI Lang parsing and rendering in SvelteKit.",
       "path": "app-frameworks/svelte",
-      "featured": false
+      "envKey": "THESYS_API_KEY"
     },
     {
       "title": "Vue",
       "description": "OpenUI Lang parsing and rendering in Nuxt and Vue.",
       "path": "app-frameworks/vue",
-      "featured": false
+      "envKey": "THESYS_API_KEY"
     },
     {
       "title": "Material UI",
       "description": "A broad Material UI component library for generated interfaces.",
       "path": "design-systems/material-ui",
-      "featured": false
+      "envKey": "THESYS_API_KEY"
     },
     {
       "title": "shadcn/ui",
       "description": "A broad shadcn/ui component library for generated interfaces.",
       "path": "design-systems/shadcn",
-      "featured": true
+      "envKey": "THESYS_API_KEY"
     },
     {
       "title": "Grok Build",
       "description": "Grok Build coding sessions rendered with OpenUI Cloud.",
       "path": "harnesses/grok-build",
-      "featured": false
+      "envKey": "XAI_API_KEY"
     },
     {
       "title": "Pi",
       "description": "A Pi coding-agent session on OpenUI Cloud.",
       "path": "harnesses/pi",
-      "featured": false
+      "envKey": "THESYS_API_KEY"
     },
     {
       "title": "Handsontable",
       "description": "Generated spreadsheet interfaces backed by Handsontable.",
       "path": "miscellaneous/handsontable",
-      "featured": false
+      "envKey": "THESYS_API_KEY"
     },
     {
       "title": "HTML artifact",
       "description": "Sandboxed HTML artifacts as an OpenUI capability.",
       "path": "miscellaneous/html-artifact",
-      "featured": false
+      "envKey": "THESYS_API_KEY"
     },
     {
       "title": "React Email",
       "description": "Generating and previewing emails with the OpenUI React Email library.",
       "path": "miscellaneous/react-email",
-      "featured": false
+      "envKey": "THESYS_API_KEY"
     },
     {
       "title": "Supabase",
       "description": "Persisted OpenUI conversations and threads with Supabase.",
       "path": "miscellaneous/supabase",
-      "featured": false
+      "envKey": "THESYS_API_KEY"
     }
   ]
 }
diff --git a/packages/openui-cli/README.md b/packages/openui-cli/README.md
index 3c27fec24..3956a9a48 100644
--- a/packages/openui-cli/README.md
+++ b/packages/openui-cli/README.md
@@ -13,6 +13,7 @@ It currently supports:
   - **OpenUI Cloud (recommended)** — hosted models with managed conversations, streaming, built-in tools, and ready-to-use report and presentation artifacts
   - **Self-hosted** — bring an OpenAI-compatible model key and own the AI route and persistence
 - keeping the default minimal SDK route or adding a LangGraph, Vercel AI SDK, or Vercel Eve backend to either template
+- scaffolding an example from [OpenUI Examples](https://github.com/thesysdev/openui/blob/main/examples)
 - minting an OpenUI Cloud API key into an existing project's env file
 - generating a system prompt or JSON Schema from a `createLibrary()` export
 
@@ -41,7 +42,7 @@ npx @openuidev/cli@latest create --template openui-cloud
 npx @openuidev/cli@latest create --template openui-self-hosted
 ```
 
-Choose a backend framework directly (the default is `default`, the template's minimal SDK route):
+Choose a backend framework or example directly:
 
 ```bash
 npx @openuidev/cli@latest create --template openui-cloud --backend-framework langgraph
@@ -50,6 +51,8 @@ npx @openuidev/cli@latest create --template openui-cloud --backend-framework ver
 npx @openuidev/cli@latest create --template openui-self-hosted --backend-framework langgraph
 npx @openuidev/cli@latest create --template openui-self-hosted --backend-framework vercel-ai-sdk
 npx @openuidev/cli@latest create --template openui-self-hosted --backend-framework vercel-eve
+npx @openuidev/cli@latest create --example shadcn
+npx @openuidev/cli@latest create --example mastra
 ```
 
 Mint an OpenUI Cloud API key into the current project's `.env`:
@@ -84,8 +87,9 @@ openui create [options]
 Options:
 
 - `-n, --name <string>`: Project name (interactive default: `openui-agent`)
-- `-t, --template <template>`: AI backend — `openui-cloud` (managed) or `openui-self-hosted` (bring your provider)
-- `--backend-framework <framework>`: API route implementation — `default`, `langgraph`, `vercel-ai-sdk`, or `vercel-eve`
+- `-t, --template <template>`: AI backend `key` from `templates/templates.json` — interactive default `openui-cloud`
+- `--backend-framework <framework>`: Overlay `key` from that template's `overlays` list (plus `default` for the base template)
+- `-e, --example <example>`: Scaffold any example
 - `--skill`: Install the OpenUI agent skill for AI coding assistants
 - `--no-skill`: Skip installing the OpenUI agent skill
 - `--no-install`: Scaffold without running the package install
@@ -102,8 +106,8 @@ What it does:
 
 - prompts for the project name, defaulting to `openui-agent`, if you do not pass `--name`
 - uses the `openui-cloud` template when you do not pass `--template` (interactive runs no longer ask; `--template openui-self-hosted` still works)
-- prompts for a backend framework after the template; non-interactive usage defaults to `default`
-- copies the bundled template into a new directory
+- prompts for a backend framework or example after the template; non-interactive usage defaults to `default`
+- copies the bundled template or example into a new directory
 - rewrites monorepo-local dependencies (`workspace:`, `file:`, `catalog:`) in the generated `package.json` to `latest`
 - installs dependencies automatically using the detected package manager (unless `--no-install`)
 - in interactive sessions, starts the development server and opens its local URL in the default browser; pass `--no-immediate` to install and exit instead
@@ -135,6 +139,16 @@ The Cloud graph needs `THESYS_API_KEY`; the self-hosted graph needs the selected
 
 Every framework overlay includes `get_weather` as its example app-owned function tool. Ask “What’s the weather in Berlin?” to exercise the selected backend’s native tool loop.
 
+#### OpenUI examples
+
+Interactive `openui create` offers to scaffold [OpenUI Examples from Github](https://github.com/thesysdev/openui/blob/main/examples). Pass `--example <name>` to skip the menus. `--example` cannot be combined with `--template` or `--backend-framework`.
+
+```bash
+openui create --example shadcn
+openui create --name my-mastra-app --example mastra --no-immediate
+openui create --example vue
+```
+
 #### Conversation storage
 
 Every OpenUI Cloud variant uses OpenUI Cloud as its only durable conversation and artifact store. The browser connects directly through `useOpenuiCloudStorage()` with a short-lived frontend token, and `/api/chat` appends each turn to the same Cloud conversation with `conversation: threadId` and `store: true`. Vercel does not add a second store. Configure a LangGraph checkpointer separately only when the graph itself needs durable state, interrupts, or resumable runs.
@@ -164,6 +178,7 @@ openui create --name my-app --template openui-cloud --auth oauth
 openui create --name my-app --template openui-cloud --backend-framework langgraph --auth oauth
 openui create --name my-app --template openui-cloud --backend-framework vercel-ai-sdk --auth oauth
 openui create --name my-app --template openui-cloud --backend-framework vercel-eve --auth oauth
+openui create --name my-shadcn-app --example shadcn
 openui create --name my-app --template openui-cloud --api-key tk_your_key
 openui create --name my-app --template openui-self-hosted
 openui create --name my-app --template openui-cloud --immediate
diff --git a/packages/openui-cli/src/auth/mint.ts b/packages/openui-cli/src/auth/mint.ts
index 4b346f9d2..020bf04ad 100644
--- a/packages/openui-cli/src/auth/mint.ts
+++ b/packages/openui-cli/src/auth/mint.ts
@@ -198,6 +198,14 @@ export async function resolveCloudApiKey(opts: {
   if (method === "skip") return { key: null, method: "skip" };
 
   if (method === "manual") {
+    if (!opts.interactive) {
+      throw new CloudAuthError(
+        "manual_key_prompt",
+        "AUTH_REQUIRED",
+        `An API key is required in non-interactive mode. Pass --api-key <key> ` +
+          `(get one at ${THESYS_KEYS_URL}).`,
+      );
+    }
     console.warn(
       "[!] --auth manual is deprecated. Use browser sign-in or pass --api-key for scripted setup.",
     );
diff --git a/packages/openui-cli/src/commands/create-app.ts b/packages/openui-cli/src/commands/create-app.ts
index 1e1a027e2..a5396d2c8 100644
--- a/packages/openui-cli/src/commands/create-app.ts
+++ b/packages/openui-cli/src/commands/create-app.ts
@@ -1,28 +1,35 @@
 import * as fs from "node:fs";
-import * as os from "node:os";
 import * as path from "node:path";
 
 import { resolveCloudApiKey, THESYS_KEYS_URL } from "../auth/mint";
-import { printLogTail, QUIET_COMMAND_CAPTURE_LIMIT } from "../lib/command-output";
-import { aiSetupFromTemplate, createFunnelProps } from "../lib/create-telemetry";
-import type { CreateAppOptions, EnvResult, OverlayName, TemplateName } from "../lib/create-types";
 import {
-  resolveInstallPackageManager,
-  type PackageManagerName,
-} from "../lib/detect-package-manager";
-import { runDevCommand } from "../lib/dev-server";
-import { runSkillInstall, shouldInstallSkill } from "../lib/install-skill";
+  formatCreateDoneMessage,
+  runScaffoldDependencyInstall,
+  runScaffoldDevCommand,
+  runScaffoldSkillInstall,
+} from "../lib/create-finish";
+import { promptForProviderKey, resolveImmediate, withProgress } from "../lib/create-helpers";
+import { aiSetupFromTemplate, createFunnelProps } from "../lib/create-telemetry";
+import type { CreateAppOptions, EnvResult, TemplateName } from "../lib/create-types";
+import { resolveInstallPackageManager } from "../lib/detect-package-manager";
+import { loadExamplesCatalog } from "../lib/examples-catalog";
+import { shouldInstallSkill } from "../lib/install-skill";
+import { applyOverlay, OVERLAYS_DIR, resolveOverlay, type TemplateOverlay } from "../lib/overlays";
 import {
-  applyOverlay,
-  OVERLAYS_DIR,
-  resolveOverlay,
-  type OverlayManifest,
-  type TemplateOverlay,
-} from "../lib/overlays";
-import { runCommand } from "../lib/process-runner";
+  findExample,
+  rejectConflictingScaffoldSelectors,
+  resolveProject,
+  templatesFromOverlays,
+  type ExampleProject,
+} from "../lib/projects";
 import { resolveArgs } from "../lib/resolve-args";
+import {
+  pruneScaffoldLockfiles,
+  restoreDotfiles,
+  rewriteScaffoldPackageJson,
+  syncNpmLockRoot,
+} from "../lib/scaffold-package";
 import { resolveTemplateSource } from "../lib/scaffold-template";
-import { withSpinner } from "../lib/spinner";
 import { resolveAvailableTarget } from "../lib/target-dir";
 import { CliCancelledError, CreateError, telemetry } from "../lib/telemetry";
 import {
@@ -30,8 +37,11 @@ import {
   findCatalogOverlay,
   findCatalogTemplate,
   loadTemplatesCatalog,
+  type CatalogTemplate,
 } from "../lib/templates-catalog";
-import { cliErrorProperties, processErrorProperties } from "../lib/utils";
+import { cliErrorProperties } from "../lib/utils";
+
+import { runCreateExample } from "./create-example";
 
 function shouldCopyTemplatePath(templateDir: string, src: string): boolean {
   const rel = path.relative(templateDir, src);
@@ -42,17 +52,6 @@ function shouldCopyTemplatePath(templateDir: string, src: string): boolean {
   return ![OVERLAYS_DIR, "node_modules", ".next", ".turbo", "dist"].includes(top);
 }
 
-function restoreDotfiles(projectDir: string) {
-  // Templates ship `gitignore` un-dotted: npm silently strips `.gitignore`
-  // files (at any depth) from published packages, so a dotted copy never
-  // reaches the scaffold — and freshly created apps would commit `.env`.
-  // Restore the real name here instead.
-  const plain = path.join(projectDir, "gitignore");
-  if (fs.existsSync(plain)) {
-    fs.renameSync(plain, path.join(projectDir, ".gitignore"));
-  }
-}
-
 function buildAppId(name: string): string {
   // Stable per-scaffold identity (see writeEnv). Slugified because the name is
   // free-form and APP_ID lands in .env and ?app_id= query params; the random
@@ -65,94 +64,6 @@ function requiredApiKeyEnv(template: TemplateName): "THESYS_API_KEY" | "OPENAI_A
   return template === "openui-cloud" ? "THESYS_API_KEY" : "OPENAI_API_KEY";
 }
 
-/** Match npm/pnpm install: keep dependency keys alphabetically sorted. */
-function sortPackageRecord<T>(record: Record<string, T>): Record<string, T> {
-  return Object.fromEntries(Object.entries(record).sort(([a], [b]) => a.localeCompare(b)));
-}
-
-function rewritePackageJson(
-  projectDir: string,
-  name: string,
-  packageManager: PackageManagerName,
-  overlayPackageJson?: OverlayManifest["packageJson"],
-) {
-  // package.json: set the project name and de-vendor monorepo-local deps
-  // (workspace:* / file: / catalog:) to the published "latest". link: deps are
-  // rewritten to an absolute file: path so locally-linked packages (e.g.
-  // @openuidev/thesys) keep resolving against the developer's checkout under any
-  // package manager — npm rejects link:, and ~ isn't expanded. Temporary, until
-  // these packages are published.
-  const pkgPath = path.join(projectDir, "package.json");
-  const pkg = JSON.parse(fs.readFileSync(pkgPath, "utf8")) as {
-    name: string;
-    scripts?: Record<string, string>;
-    dependencies?: Record<string, string>;
-    devDependencies?: Record<string, string>;
-    pnpm?: unknown;
-  };
-  pkg.name = name;
-  if (packageManager !== "pnpm") delete pkg.pnpm;
-
-  if (overlayPackageJson) {
-    pkg.dependencies ??= {};
-    for (const dependency of overlayPackageJson.removeDependencies ?? []) {
-      delete pkg.dependencies[dependency];
-    }
-    Object.assign(pkg.dependencies, overlayPackageJson.dependencies ?? {});
-    Object.assign((pkg.devDependencies ??= {}), overlayPackageJson.devDependencies ?? {});
-    Object.assign((pkg.scripts ??= {}), overlayPackageJson.scripts ?? {});
-  }
-
-  for (const section of ["dependencies", "devDependencies"] as const) {
-    const deps = pkg[section];
-    if (!deps) continue;
-    for (const key of Object.keys(deps)) {
-      const v = deps[key];
-      if (!v) continue;
-      if (v.startsWith("link:")) {
-        const target = v.slice("link:".length);
-        const abs = target.startsWith("~")
-          ? path.join(os.homedir(), target.slice(1))
-          : path.resolve(target);
-        deps[key] = `file:${abs}`;
-        continue;
-      }
-      // workspace:/file:/catalog: are monorepo-only protocols npm/yarn/bun
-      // can't resolve standalone — pin them to the published "latest".
-      if (/^(workspace:|file:|catalog:)/.test(v)) deps[key] = "latest";
-    }
-    // Object.assign appends overlay packages at the end; re-sort so the
-    // scaffolded package.json matches what `npm install` / `pnpm add` write.
-    pkg[section] = sortPackageRecord(deps);
-  }
-  fs.writeFileSync(pkgPath, JSON.stringify(pkg, null, 2) + "\n");
-
-  // Keep the copied npm lockfile's root package metadata aligned so npm ci can
-  // consume the template without having to rewrite or re-resolve it.
-  const lockPath = path.join(projectDir, "package-lock.json");
-  if (fs.existsSync(lockPath)) {
-    const lock = JSON.parse(fs.readFileSync(lockPath, "utf8")) as {
-      name?: string;
-      packages?: Record<
-        string,
-        {
-          name?: string;
-          dependencies?: Record<string, string>;
-          devDependencies?: Record<string, string>;
-        }
-      >;
-    };
-    lock.name = name;
-    const lockRoot = lock.packages?.[""];
-    if (lockRoot) {
-      lockRoot.name = name;
-      lockRoot.dependencies = pkg.dependencies;
-      lockRoot.devDependencies = pkg.devDependencies;
-    }
-    fs.writeFileSync(lockPath, JSON.stringify(lock, null, 2) + "\n");
-  }
-}
-
 export async function runCreateApp(options: CreateAppOptions): Promise<void> {
   const interactive = !options.noInteractive;
   const packageManager = resolveInstallPackageManager();
@@ -164,28 +75,65 @@ export async function runCreateApp(options: CreateAppOptions): Promise<void> {
     has_name_arg: Boolean(options.name),
     has_template_arg: Boolean(options.template),
     has_backend_framework_arg: Boolean(options.backendFramework),
+    has_example_arg: Boolean(options.example),
     has_api_key_arg: Boolean(options.apiKey),
     has_auth_arg: Boolean(options.auth),
     no_install: Boolean(options.noInstall),
     immediate_arg: options.immediate,
   });
 
+  rejectConflictingScaffoldSelectors({
+    example: options.example,
+    backendFramework: options.backendFramework,
+    template: options.template,
+  });
+
   // Interactive runs always scaffold the Cloud backend; openui-self-hosted stays
   // available, but only when requested explicitly with --template.
-  if (!options.template && !interactive) {
-    throw new CreateError(
-      "args_resolution",
-      "Missing required argument --template",
-      "invalid_input",
-      "MISSING_REQUIRED_ARG",
-    );
+  if (!interactive) {
+    if (!options.name) {
+      throw new CreateError(
+        "args_resolution",
+        "Missing required argument --name",
+        "invalid_input",
+        "MISSING_REQUIRED_ARG",
+      );
+    }
+    if (!options.example && !options.template) {
+      throw new CreateError(
+        "args_resolution",
+        "Missing required argument --template",
+        "invalid_input",
+        "MISSING_REQUIRED_ARG",
+      );
+    }
   }
 
-  const catalog = await loadTemplatesCatalog();
-  const template: TemplateName = options.template ?? DEFAULT_TEMPLATE_KEY;
-  const templateEntry = findCatalogTemplate(catalog, template);
-  if (options.backendFramework) {
-    findCatalogOverlay(templateEntry, options.backendFramework);
+  let examples: ExampleProject[] = [];
+  let template: TemplateName | undefined;
+  let templateEntry: CatalogTemplate | undefined;
+
+  if (options.example) {
+    examples = await loadExamplesCatalog();
+    findExample(options.example, examples);
+  } else if (interactive) {
+    const [catalog, loadedExamples] = await Promise.all([
+      loadTemplatesCatalog(),
+      loadExamplesCatalog(),
+    ]);
+    examples = loadedExamples;
+    template = options.template ?? DEFAULT_TEMPLATE_KEY;
+    templateEntry = findCatalogTemplate(catalog, template);
+    if (options.backendFramework) {
+      findCatalogOverlay(templateEntry, options.backendFramework);
+    }
+  } else {
+    const catalog = await loadTemplatesCatalog();
+    template = options.template ?? DEFAULT_TEMPLATE_KEY;
+    templateEntry = findCatalogTemplate(catalog, template);
+    if (options.backendFramework) {
+      findCatalogOverlay(templateEntry, options.backendFramework);
+    }
   }
 
   const nameArgs = await resolveArgs(
@@ -204,28 +152,37 @@ export async function runCreateApp(options: CreateAppOptions): Promise<void> {
     interactive,
   );
 
-  const overlayChoices = templateEntry.overlays;
-  const frameworkArgs = await resolveArgs(
-    {
-      backendFramework:
-        options.backendFramework || !interactive
-          ? { value: options.backendFramework ?? "default" }
-          : {
-              prompt: {
-                type: "select",
-                message: "Choose your backend framework",
-                choices: overlayChoices.map((overlay) => ({
-                  value: overlay.key,
-                  name: overlay.name,
-                  description: overlay.description,
-                })),
-              },
-              required: true,
-            },
-    },
+  const project = await resolveProject({
+    backendFramework: options.backendFramework,
+    example: options.example,
+    examples,
+    templates: templatesFromOverlays(templateEntry?.overlays ?? []),
     interactive,
-  );
-  const backendFramework = (frameworkArgs as { backendFramework: OverlayName }).backendFramework;
+  });
+
+  if (project.category === "example") {
+    await runCreateExample({
+      options,
+      interactive,
+      packageManager,
+      t0,
+      name,
+      targetDir,
+      example: project,
+    });
+    return;
+  }
+
+  if (!template || !templateEntry) {
+    throw new CreateError(
+      "args_resolution",
+      "Missing required argument --template",
+      "invalid_input",
+      "MISSING_REQUIRED_ARG",
+    );
+  }
+
+  const backendFramework = project.name;
   findCatalogOverlay(templateEntry, backendFramework);
 
   const aiSetup = aiSetupFromTemplate(template);
@@ -287,23 +244,20 @@ export async function runCreateApp(options: CreateAppOptions): Promise<void> {
       });
       restoreDotfiles(targetDir);
       applyOverlay(targetDir, overlay);
-      rewritePackageJson(targetDir, name, packageManager.name, overlay?.manifest.packageJson);
-      // An overlay that changes dependencies without a lock must not keep the base lock
+      const pkg = rewriteScaffoldPackageJson({
+        pkgPath: path.join(targetDir, "package.json"),
+        name,
+        packageManager: packageManager.name,
+        overlayPackageJson: overlay?.manifest.packageJson,
+      });
+      syncNpmLockRoot(targetDir, name, pkg);
       const overlayShipsNpmLock = Boolean(
         overlay && fs.existsSync(path.join(overlay.dir, "package-lock.json")),
       );
-      if (packageManager.name !== "npm" || (overlay && !overlayShipsNpmLock)) {
-        fs.rmSync(path.join(targetDir, "package-lock.json"), { force: true });
-      }
-      // The Cloud template ships pnpm's lock/workspace files for reproducible pnpm
-      // installs and native-build policy. A framework changes dependencies, so
-      // regenerate its lock; non-pnpm scaffolds do not need either pnpm file.
-      if (packageManager.name !== "pnpm" || backendFramework !== "default") {
-        fs.rmSync(path.join(targetDir, "pnpm-lock.yaml"), { force: true });
-      }
-      if (packageManager.name !== "pnpm") {
-        fs.rmSync(path.join(targetDir, "pnpm-workspace.yaml"), { force: true });
-      }
+      pruneScaffoldLockfiles(targetDir, packageManager.name, {
+        keepNpmLock: packageManager.name === "npm" && !(overlay && !overlayShipsNpmLock),
+        keepPnpmLock: packageManager.name === "pnpm" && backendFramework === "default",
+      });
       await writeEnv(
         targetDir,
         envResult,
@@ -333,11 +287,12 @@ export async function runCreateApp(options: CreateAppOptions): Promise<void> {
   };
 
   console.info();
-  if (options.verbose) {
-    console.info(`Scaffolding ${template} into "${name}"...\n`);
-    await runScaffold();
-  } else {
-    await withSpinner("Scaffolding...", runScaffold);
+  await withProgress(
+    options.verbose ? `Scaffolding ${template} into "${name}"...` : "Scaffolding...",
+    runScaffold,
+    options.verbose,
+  );
+  if (!options.verbose) {
     console.info("✓ Scaffolded");
   }
   telemetry.capture("cli_scaffold_succeeded", {
@@ -354,171 +309,21 @@ export async function runCreateApp(options: CreateAppOptions): Promise<void> {
     auth_succeeded: envResult.authSucceeded,
   });
 
-  // Framework scaffolds without an npm lock must resolve ranges against the
-  // registry (`npm install`). When a backend overlay ships package-lock.json,
-  // keep the normal `npm ci` path. --prefer-offline is only safe for `npm ci`,
-  // where the lockfile pins exact versions and cache hits are content-addressed;
-  // bare `npm install` can fail with ETARGET on a stale packument cache.
-  const frameworkInstall = backendFramework !== "default";
-  const hasNpmLock = fs.existsSync(path.join(targetDir, "package-lock.json"));
-  const installCmd =
-    frameworkInstall && packageManager.name === "npm" && !hasNpmLock
-      ? "npm install --no-audit --no-fund --progress=false"
-      : frameworkInstall && packageManager.name === "pnpm"
-        ? "pnpm install --no-frozen-lockfile"
-        : packageManager.installCmd;
-  const installArgs =
-    frameworkInstall && packageManager.name === "npm" && !hasNpmLock
-      ? ["install", "--no-audit", "--no-fund", "--progress=false"]
-      : frameworkInstall && packageManager.name === "pnpm"
-        ? ["install", "--no-frozen-lockfile"]
-        : packageManager.installArgs;
-  let dependencyInstalled = false;
-
-  if (!immediateResolution.installDependencies) {
-    telemetry.capture("cli_dependency_install_skipped", {
-      skip_reason: "no_install_flag",
-    });
-    console.info(`Skipping dependency install (--no-install). Run \`${installCmd}\` later.`);
-  } else {
-    telemetry.capture("cli_dependency_install_started", {
-      ...createFunnelProps("dependency_install_started"),
-      template,
-      ai_setup: aiSetup,
-    });
-    const runInstall = () =>
-      options.verbose
-        ? runCommand(packageManager.runCmd, installArgs, targetDir)
-        : runCommand(packageManager.runCmd, installArgs, targetDir, {
-            echo: false,
-            stdin: "ignore",
-            captureLimit: QUIET_COMMAND_CAPTURE_LIMIT,
-            env: {
-              ...process.env,
-              npm_config_loglevel: "error",
-              NPM_CONFIG_LOGLEVEL: "error",
-            },
-          });
-
-    if (options.verbose) {
-      console.info(`Installing dependencies with: ${installCmd}\n`);
-    }
-    const installResult = options.verbose
-      ? await runInstall()
-      : await withSpinner("Installing dependencies...", runInstall);
-    if (!installResult.error && installResult.status === 0) {
-      dependencyInstalled = true;
-      if (!options.verbose) {
-        console.info("✓ Dependencies installed");
-      }
-      telemetry.capture("cli_dependency_install_succeeded", {
-        ...createFunnelProps("dependency_install_succeeded"),
-        template,
-        ai_setup: aiSetup,
-        dependency_installed: dependencyInstalled,
-      });
-    } else {
-      if (!options.verbose) {
-        printLogTail(installResult.diagnosticTail, "install log (tail)");
-      }
-      const properties = processErrorProperties(installResult, "dependency_install", {
-        error_class: "dependency",
-        error_code: "NONZERO_EXIT",
-      });
-      if (properties.error_class === "user_cancelled") {
-        telemetry.capture("cli_dependency_install_cancelled", {
-          ...createFunnelProps("dependency_install_cancelled"),
-          template,
-          ai_setup: aiSetup,
-          dependency_installed: false,
-          ...properties,
-        });
-        throw new CliCancelledError(
-          "dependency_install",
-          properties.cancellation_exit_code ?? 0,
-          properties,
-        );
-      }
-      telemetry.capture("cli_dependency_install_failed", {
-        ...createFunnelProps("dependency_install_failed"),
-        template,
-        ai_setup: aiSetup,
-        dependency_installed: dependencyInstalled,
-        ...properties,
-      });
-      const { failure_stage, error_class, error_code, ...metadata } = properties;
-      throw new CreateError(
-        failure_stage,
-        "dependency install failed",
-        error_class,
-        error_code,
-        metadata,
-      );
-    }
-  }
+  const { dependencyInstalled, installCmd } = await runScaffoldDependencyInstall({
+    verbose: options.verbose,
+    packageManager,
+    targetDir,
+    unlockedInstall: backendFramework !== "default",
+    installDependencies: immediateResolution.installDependencies,
+    telemetryProps: { template, ai_setup: aiSetup },
+  });
 
-  let skillInstalled = false;
-  if (installSkill) {
-    telemetry.capture("cli_skill_install_started", {
-      ...createFunnelProps("skill_install_started"),
-      skill_installed: installSkill,
-    });
-    const runSkill = () =>
-      options.verbose
-        ? runSkillInstall(targetDir)
-        : runSkillInstall(targetDir, {
-            echo: false,
-            stdin: "ignore",
-            captureLimit: QUIET_COMMAND_CAPTURE_LIMIT,
-          });
-    if (options.verbose) {
-      console.info("Installing OpenUI agent skill...\n");
-    }
-    const skillResult = options.verbose
-      ? await runSkill()
-      : await withSpinner("Installing OpenUI agent skill...", runSkill);
-    skillInstalled = !skillResult.error && skillResult.status === 0;
-    if (skillInstalled) {
-      if (!options.verbose) {
-        console.info("✓ OpenUI agent skill installed");
-      }
-      telemetry.capture("cli_skill_install_finished", {
-        ...createFunnelProps("skill_install_finished"),
-        skill_installed: true,
-        duration_ms: skillResult.durationMs,
-        exit_code: skillResult.status,
-      });
-    } else {
-      const properties = processErrorProperties(skillResult, "skill_install", {
-        error_class: "dependency",
-        error_code: "SKILL_INSTALL_FAILED",
-      });
-      if (properties.error_class === "user_cancelled") {
-        telemetry.capture("cli_skill_install_cancelled", {
-          ...createFunnelProps("skill_install_cancelled"),
-          skill_installed: false,
-          ...properties,
-        });
-        throw new CliCancelledError(
-          "skill_install",
-          properties.cancellation_exit_code ?? 0,
-          properties,
-        );
-      }
-      telemetry.capture("cli_skill_install_failed", {
-        ...createFunnelProps("skill_install_failed"),
-        skill_installed: false,
-        ...properties,
-      });
-      console.warn(
-        "\nCould not install the OpenUI agent skill automatically.\n" +
-          "You can install it manually later with:\n\n" +
-          "  npx skills add thesysdev/skills --skill openui\n",
-      );
-    }
-  }
+  const skillInstalled = await runScaffoldSkillInstall({
+    enabled: installSkill,
+    verbose: options.verbose,
+    targetDir,
+  });
 
-  const devCmd = packageManager.runCmd;
   const startDev =
     immediateResolution.immediate && dependencyInstalled && !devStartBlockedByMissingApiKey;
 
@@ -531,101 +336,39 @@ export async function runCreateApp(options: CreateAppOptions): Promise<void> {
     env_written: envResult.envWritten,
     dependency_installed: dependencyInstalled,
   });
+  const envNote =
+    template === "openui-cloud"
+      ? envResult.envWritten
+        ? "✅ .env created with your OpenUI Cloud API key + base URL."
+        : `[!] .env created without a key. Add THESYS_API_KEY=… (get one at ${THESYS_KEYS_URL}).`
+      : envResult.envWritten
+        ? "✅ .env created with your API key."
+        : "Add your API key to .env:\nOPENAI_API_KEY=sk-your-key-here";
+  const frameworkNote = overlay?.manifest.gettingStarted?.replaceAll(
+    "{{packageManager}}",
+    packageManager.runCmd,
+  );
   console.info(
-    getStartedMessage({
-      name,
-      devCmd,
-      template,
-      backendGettingStarted: overlay?.manifest.gettingStarted,
+    formatCreateDoneMessage({
       skillInstalled,
-      envWritten: envResult.envWritten,
-      startDev,
+      envNote,
+      extraNotes: frameworkNote ? [frameworkNote] : undefined,
+      name,
+      devCmd: packageManager.runCmd,
       installCmd,
+      startDev,
       dependencyInstalled,
     }),
   );
 
-  if (devStartBlockedByMissingApiKey) {
-    telemetry.capture("cli_dev_command_skipped", {
-      skip_reason: "missing_api_key",
-      required_env: apiKeyEnv,
-    });
-    process.exitCode = 1;
-    return;
-  }
-
-  if (!startDev) {
-    telemetry.capture("cli_dev_command_skipped", {
-      skip_reason: options.noInstall ? "dependencies_not_installed" : "not_immediate",
-    });
-    return;
-  }
-
-  telemetry.capture("cli_dev_command_started", {
-    package_manager: packageManager.name,
+  await runScaffoldDevCommand({
+    name,
+    targetDir,
+    packageManager,
+    startDev,
+    noInstall: options.noInstall,
+    missingApiKey: devStartBlockedByMissingApiKey ? { env: apiKeyEnv } : undefined,
   });
-  const devResult = await runDevCommand(devCmd, targetDir);
-  const stoppedNormally =
-    devResult.status === 0 ||
-    devResult.status === 130 ||
-    devResult.status === 143 ||
-    devResult.signal === "SIGINT" ||
-    devResult.signal === "SIGTERM";
-
-  if (stoppedNormally) {
-    telemetry.capture("cli_dev_command_stopped", {
-      package_manager: packageManager.name,
-      duration_ms: devResult.durationMs,
-      exit_code: devResult.status,
-      failure_signal: devResult.signal,
-    });
-  } else {
-    const exitCode = devResult.status ?? 1;
-    const properties = processErrorProperties(devResult, "dev_server", {
-      error_class: "process",
-      error_code: "NONZERO_EXIT",
-    });
-    telemetry.capture("cli_dev_command_failed", {
-      package_manager: packageManager.name,
-      failure_reason: devResult.error ? "spawn_error" : "nonzero_exit",
-      ...properties,
-    });
-    console.error(
-      `\nDevelopment server exited. Retry with:\n\n> cd ${name}\n> ${devCmd} run dev\n`,
-    );
-    process.exitCode = exitCode;
-  }
-}
-
-const isInteractiveTerminal = () => Boolean(process.stdin.isTTY && process.stdout.isTTY);
-
-function resolveImmediate(
-  immediate: boolean | undefined,
-  noInstall: boolean | undefined,
-  interactive: boolean,
-): {
-  immediate: boolean;
-  installDependencies: boolean;
-  source: "flag" | "interactive_default" | "no_install" | "noninteractive_default";
-} {
-  if (noInstall) {
-    return { immediate: false, installDependencies: false, source: "no_install" };
-  }
-  if (immediate !== undefined) {
-    return {
-      immediate,
-      installDependencies: true,
-      source: "flag",
-    };
-  }
-  if (!interactive || !isInteractiveTerminal()) {
-    return {
-      immediate: false,
-      installDependencies: true,
-      source: "noninteractive_default",
-    };
-  }
-  return { immediate: true, installDependencies: true, source: "interactive_default" };
 }
 
 async function writeEnv(targetDir: string, result: EnvResult, appId?: string): Promise<void> {
@@ -638,24 +381,6 @@ async function writeEnv(targetDir: string, result: EnvResult, appId?: string): P
   await fs.promises.writeFile(path.join(targetDir, ".env"), content);
 }
 
-async function promptForProviderKey(): Promise<string | null> {
-  try {
-    const { input } = await import("@inquirer/prompts");
-    const apiKey = (
-      await input({
-        message: "Enter your OpenAI-compatible provider API key (leave blank to skip):",
-      })
-    ).trim();
-    return apiKey || null;
-  } catch (error) {
-    const { ExitPromptError } = await import("@inquirer/core");
-    if (error instanceof ExitPromptError) {
-      throw new CliCancelledError("environment_resolution");
-    }
-    throw error;
-  }
-}
-
 async function resolveChatEnv(interactive: boolean): Promise<EnvResult> {
   const apiKey = interactive ? await promptForProviderKey() : null;
 
@@ -738,42 +463,3 @@ async function resolveCloudEnv(
     authSucceeded: apiKey != null,
   };
 }
-
-function getStartedMessage(o: {
-  name: string;
-  devCmd: string;
-  template: TemplateName;
-  backendGettingStarted?: string;
-  skillInstalled: boolean;
-  envWritten: boolean;
-  startDev: boolean;
-  installCmd: string;
-  dependencyInstalled: boolean;
-}): string {
-  const skillMessage = o.skillInstalled
-    ? "The OpenUI agent skill was installed.\nAI coding assistants will use it to help you build with OpenUI.\n"
-    : "";
-
-  const envNote =
-    o.template === "openui-cloud"
-      ? o.envWritten
-        ? "✅ .env created with your OpenUI Cloud API key + base URL."
-        : `[!] .env created without a key. Add THESYS_API_KEY=… (get one at ${THESYS_KEYS_URL}).`
-      : o.envWritten
-        ? "✅ .env created with your API key."
-        : "Add your API key to .env:\nOPENAI_API_KEY=sk-your-key-here";
-
-  const nextStep = o.startDev
-    ? `Starting the development server in "${o.name}"...\n\n> ${o.devCmd} run dev`
-    : [
-        `> cd ${o.name}`,
-        ...(o.dependencyInstalled ? [] : [`> ${o.installCmd}`]),
-        `> ${o.devCmd} run dev`,
-      ].join("\n");
-
-  const frameworkNote = o.backendGettingStarted?.replaceAll("{{packageManager}}", o.devCmd) ?? "";
-
-  return `\n${[skillMessage.trim(), "Done!", envNote, frameworkNote, nextStep]
-    .filter(Boolean)
-    .join("\n\n")}\n`;
-}
diff --git a/packages/openui-cli/src/commands/create-example.ts b/packages/openui-cli/src/commands/create-example.ts
new file mode 100644
index 000000000..a27fc9fdb
--- /dev/null
+++ b/packages/openui-cli/src/commands/create-example.ts
@@ -0,0 +1,223 @@
+import * as path from "node:path";
+
+import {
+  formatCreateDoneMessage,
+  resolveScaffoldInstall,
+  runScaffoldSkillInstall,
+} from "../lib/create-finish";
+import { promptForProviderKey, withProgress } from "../lib/create-helpers";
+import { createFunnelProps } from "../lib/create-telemetry";
+import type { CreateAppOptions, EnvResult } from "../lib/create-types";
+import { resolveInstallPackageManager } from "../lib/detect-package-manager";
+import { upsertEnvVar } from "../lib/env";
+import { shouldInstallSkill } from "../lib/install-skill";
+import type { ExampleProject } from "../lib/projects";
+import {
+  exampleDevCommand,
+  exampleLayout,
+  isNestedExample,
+  scaffoldExample,
+  type ExampleLayout,
+} from "../lib/scaffold-example";
+import { CreateError, telemetry } from "../lib/telemetry";
+import { cliErrorProperties } from "../lib/utils";
+
+export async function runCreateExample(params: {
+  options: CreateAppOptions;
+  interactive: boolean;
+  packageManager: ReturnType<typeof resolveInstallPackageManager>;
+  t0: number;
+  name: string;
+  targetDir: string;
+  example: ExampleProject;
+}): Promise<void> {
+  const { options, interactive, packageManager, t0, name, targetDir, example } = params;
+
+  telemetry.register({ example: example.name, project_category: "example" });
+  telemetry.capture("cli_example_selected", {
+    ...createFunnelProps("example_selected"),
+    example: example.name,
+    example_source: options.example ? "flag" : interactive ? "prompt" : "default",
+  });
+
+  telemetry.capture("cli_env_resolution_started", {
+    ...createFunnelProps("env_resolution_started"),
+    example: example.name,
+  });
+  const envResult = await resolveExampleEnv(example, interactive);
+
+  const installSkill = await shouldInstallSkill(options.skill, false);
+  telemetry.capture("cli_skill_installed", {
+    ...createFunnelProps("skill_prompt_resolved"),
+    skill_installed: installSkill,
+  });
+  telemetry.capture("cli_immediate_selected", {
+    immediate: false,
+    dependency_install_requested: false,
+    selection_source: "no_install",
+  });
+
+  console.info();
+  telemetry.capture("cli_scaffold_started", {
+    ...createFunnelProps("scaffold_started"),
+    example: example.name,
+  });
+  let layout: ExampleLayout | undefined;
+  try {
+    await withProgress(
+      "Scaffolding...",
+      async () => {
+        layout = await scaffoldExample({
+          example,
+          targetDir,
+          name,
+          packageManager: packageManager.name,
+        });
+      },
+      options.verbose,
+    );
+    if (!options.verbose) {
+      console.info("✓ Scaffolded");
+    }
+  } catch (err) {
+    const properties = cliErrorProperties(err, {
+      failure_stage: "scaffold",
+      error_class: "filesystem",
+      error_code: "SCAFFOLD_FAILED",
+    });
+    telemetry.capture("cli_scaffold_failed", {
+      ...createFunnelProps("scaffold_failed"),
+      example: example.name,
+      ...properties,
+    });
+    throw new CreateError(
+      properties.failure_stage,
+      err instanceof Error ? err.message : String(err),
+      properties.error_class,
+      properties.error_code,
+    );
+  }
+  telemetry.capture("cli_scaffold_succeeded", {
+    ...createFunnelProps("scaffold_succeeded"),
+    example: example.name,
+  });
+
+  try {
+    if (envResult.envKeyValue && example.envKey) {
+      upsertEnvVar(path.join(targetDir, example.envFile), example.envKey, envResult.envKeyValue);
+    }
+  } catch (err) {
+    const properties = cliErrorProperties(err, {
+      failure_stage: "environment_write",
+      error_class: "filesystem",
+      error_code: "WRITE_FAILED",
+    });
+    throw new CreateError(
+      properties.failure_stage,
+      err instanceof Error ? err.message : String(err),
+      properties.error_class,
+      properties.error_code,
+    );
+  }
+  telemetry.capture("cli_env_resolved", {
+    ...createFunnelProps("env_written"),
+    example: example.name,
+    env_written: envResult.envWritten,
+  });
+
+  layout ??= exampleLayout(targetDir);
+  const { installCmd } = resolveScaffoldInstall(packageManager, targetDir, true);
+  telemetry.capture("cli_dependency_install_skipped", {
+    skip_reason: "example_scaffold_only",
+  });
+  telemetry.capture("cli_dev_command_skipped", {
+    skip_reason: "not_immediate",
+  });
+
+  const skillInstalled = await runScaffoldSkillInstall({
+    enabled: installSkill,
+    verbose: options.verbose,
+    targetDir,
+  });
+
+  telemetry.capture("cli_create_succeeded", {
+    ...createFunnelProps("create_succeeded"),
+    example: example.name,
+    duration_ms: Date.now() - t0,
+    skill_installed: skillInstalled,
+    env_written: envResult.envWritten,
+    dependency_installed: false,
+  });
+  const envKey = example.envKey;
+  console.info(
+    formatCreateDoneMessage({
+      skillInstalled,
+      envNote: envKey
+        ? envResult.envWritten
+          ? `✅ ${example.envFile} updated with ${envKey}.`
+          : `Add ${envKey}=… to ${example.envFile} (see the example README).`
+        : `Add your API keys to ${example.envFile} (see the example README).`,
+      name,
+      devCmd: packageManager.runCmd,
+      installCmd,
+      startDev: false,
+      dependencyInstalled: false,
+      nextStep: isNestedExample(layout)
+        ? nestedExampleNextSteps({
+            name,
+            targetDir,
+            layout,
+            runCmd: packageManager.runCmd,
+            installCmd,
+          })
+        : undefined,
+    }),
+  );
+}
+
+async function resolveExampleEnv(
+  example: ExampleProject,
+  interactive: boolean,
+): Promise<EnvResult & { envKeyValue?: string }> {
+  if (!example.envKey) {
+    return { envWritten: false };
+  }
+
+  const apiKey = interactive ? await promptForProviderKey(example.envKey) : null;
+  return {
+    envWritten: apiKey != null,
+    envKeyValue: apiKey ?? undefined,
+  };
+}
+
+function posixJoin(...parts: string[]): string {
+  return parts.filter((part) => part && part !== ".").join("/");
+}
+
+function nestedExampleNextSteps(params: {
+  name: string;
+  targetDir: string;
+  layout: ExampleLayout;
+  runCmd: string;
+  installCmd: string;
+}): string {
+  const blocks: string[] = [];
+  for (const relative of params.layout.jsPackages) {
+    const pkgDir = relative === "." ? params.targetDir : path.join(params.targetDir, relative);
+    blocks.push(
+      [
+        `> cd ${posixJoin(params.name, relative)}`,
+        `> ${params.installCmd}`,
+        `> ${exampleDevCommand(pkgDir, params.runCmd)}`,
+      ].join("\n"),
+    );
+  }
+  for (const relative of params.layout.pythonPackages) {
+    blocks.push(
+      [`> cd ${posixJoin(params.name, relative)}`, `> uv run uvicorn app.main:app --reload`].join(
+        "\n",
+      ),
+    );
+  }
+  return blocks.join("\n\n");
+}
diff --git a/packages/openui-cli/src/index.ts b/packages/openui-cli/src/index.ts
index ce925bbba..452272896 100644
--- a/packages/openui-cli/src/index.ts
+++ b/packages/openui-cli/src/index.ts
@@ -10,6 +10,7 @@ import { runCreateApp } from "./commands/create-app";
 import { GenerateOptions, runGenerate } from "./commands/generate";
 import { runGenerateApiKey } from "./commands/generate-api-key";
 import { detectAgent, UNKNOWN_AGENT_NAME } from "./lib/detect-agent";
+import { rejectConflictingScaffoldSelectors } from "./lib/projects";
 import { rejectConflictingImmediateFlags, resolveArgs } from "./lib/resolve-args";
 import { telemetry } from "./lib/telemetry";
 import {
@@ -65,6 +66,7 @@ program
     "--backend-framework <framework>",
     "Backend framework: default | langgraph | vercel-ai-sdk | vercel-eve",
   )
+  .option("-e, --example <example>", "create from an example in examples/examples.json")
   .option("--api-key <key>", "OpenUI Cloud API key (cloud template; skips sign-in)")
   .option("--auth <method>", "Cloud auth method: oauth | skip (manual is deprecated)")
   .option("--skill", "Install the OpenUI agent skill for AI coding assistants")
@@ -93,6 +95,11 @@ Backend frameworks:
   langgraph      Bootstraps a LangGraph agent with the selected model backend.
   vercel-ai-sdk  Scaffolds a Vercel AI SDK agent with the selected model backend.
   vercel-eve     Scaffolds a Vercel Eve agent with the selected model backend.
+
+OpenUI examples:
+  Loaded at runtime from examples/examples.json in the OpenUI repo.
+  Pick "Scaffold from OpenUI Examples" in the interactive prompt, or pass
+  --example <name> with any catalog folder name.
 `,
   )
   .action(
@@ -100,6 +107,7 @@ Backend frameworks:
       name?: string;
       template?: string;
       backendFramework?: string;
+      example?: string;
       apiKey?: string;
       auth?: string;
       skill?: boolean;
@@ -110,10 +118,16 @@ Backend frameworks:
     }) => {
       try {
         rejectConflictingImmediateFlags(process.argv.slice(2));
+        rejectConflictingScaffoldSelectors({
+          example: options.example,
+          backendFramework: normalizeBackendFramework(options.backendFramework),
+          template: options.template,
+        });
         await runCreateApp({
           name: options.name,
           template: normalizeTemplate(options.template),
           backendFramework: normalizeBackendFramework(options.backendFramework),
+          example: options.example,
           apiKey: options.apiKey,
           auth: normalizeAuth(options.auth),
           skill: options.skill,
diff --git a/packages/openui-cli/src/lib/checkout.ts b/packages/openui-cli/src/lib/checkout.ts
index e94cfe27e..5feeacc7d 100644
--- a/packages/openui-cli/src/lib/checkout.ts
+++ b/packages/openui-cli/src/lib/checkout.ts
@@ -10,7 +10,7 @@ const FETCH_TIMEOUT_MS = 30_000;
 
 const SOURCE_OWNER = "thesysdev";
 const SOURCE_REPO = "openui";
-const SOURCE_REF = "main";
+const SOURCE_REF = "feat/cli-featured-examples";
 const SOURCE_GIT_URL = `https://github.com/${SOURCE_OWNER}/${SOURCE_REPO}.git`;
 
 export type SourceFetchOptions = {
@@ -29,6 +29,35 @@ function posixRepoPath(repoPath: string): string {
   return repoPath.replace(/\\/g, "/").replace(/^\/+/, "");
 }
 
+/**
+ * Local OpenUI checkout to read catalogs and scaffold from.
+ * `OPENUI_SOURCE_DIR` wins; otherwise a CLI built inside this repo uses the
+ * worktree on disk so `openui create` can be tested without a GitHub fetch.
+ */
+function localSourceRoot(): string | undefined {
+  const fromEnv = process.env["OPENUI_SOURCE_DIR"]?.trim();
+  if (fromEnv) return path.resolve(fromEnv);
+
+  const candidate = path.resolve(__dirname, "../../../../");
+  const hasCatalogs =
+    fs.existsSync(path.join(candidate, "templates", "templates.json")) &&
+    fs.existsSync(path.join(candidate, "examples", "examples.json"));
+  return hasCatalogs ? candidate : undefined;
+}
+
+function localSourcePath(repoPath: string): string {
+  const root = localSourceRoot();
+  if (!root) {
+    throw new CreateError(
+      "source_checkout",
+      "Local source root is not set.",
+      "filesystem",
+      "SOURCE_MISSING",
+    );
+  }
+  return path.join(root, ...posixRepoPath(repoPath).split("/"));
+}
+
 function runGit(
   args: string[],
   options: { cwd?: string; timeoutMs?: number } = {},
@@ -98,6 +127,20 @@ function runGit(
 
 export async function fetchSourceFile(repoPath: string): Promise<FetchedFile> {
   const normalizedPath = posixRepoPath(repoPath);
+  if (localSourceRoot()) {
+    const filePath = localSourcePath(normalizedPath);
+    try {
+      return { content: fs.readFileSync(filePath, "utf8") };
+    } catch {
+      throw new CreateError(
+        "source_checkout",
+        `Path "${normalizedPath}" was not in the local OpenUI checkout.`,
+        "filesystem",
+        "SOURCE_MISSING",
+      );
+    }
+  }
+
   const url = `https://raw.githubusercontent.com/${SOURCE_OWNER}/${SOURCE_REPO}/${SOURCE_REF}/${normalizedPath}`;
   const controller = new AbortController();
   const timer = setTimeout(() => controller.abort(), FETCH_TIMEOUT_MS);
@@ -134,6 +177,21 @@ export async function checkoutSource(
   opts: SourceFetchOptions = {},
 ): Promise<CheckedOutSource> {
   const normalizedPath = posixRepoPath(repoPath);
+  if (localSourceRoot()) {
+    const extracted = localSourcePath(normalizedPath);
+    if (!fs.existsSync(extracted)) {
+      throw new CreateError(
+        "source_checkout",
+        `Path "${normalizedPath}" was not in the local OpenUI checkout.`,
+        "filesystem",
+        "SOURCE_MISSING",
+      );
+    }
+    const dest = opts.dest ?? fs.mkdtempSync(path.join(os.tmpdir(), "openui-src-"));
+    copyDir(extracted, dest);
+    return { dir: dest };
+  }
+
   const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), "openui-src-"));
   try {
     await runGit(["init", "--quiet"], { cwd: tmpDir });
diff --git a/packages/openui-cli/src/lib/create-finish.ts b/packages/openui-cli/src/lib/create-finish.ts
new file mode 100644
index 000000000..f18c8edd7
--- /dev/null
+++ b/packages/openui-cli/src/lib/create-finish.ts
@@ -0,0 +1,271 @@
+import * as fs from "node:fs";
+import * as path from "node:path";
+
+import { QUIET_COMMAND_CAPTURE_LIMIT } from "./command-output";
+import { runDependencyInstall, withProgress } from "./create-helpers";
+import { createFunnelProps } from "./create-telemetry";
+import type { PackageManager } from "./detect-package-manager";
+import { runDevCommand } from "./dev-server";
+import { runSkillInstall } from "./install-skill";
+import { CliCancelledError, CreateError, telemetry } from "./telemetry";
+import { processErrorProperties } from "./utils";
+
+export function resolveScaffoldInstall(
+  packageManager: PackageManager,
+  targetDir: string,
+  unlocked: boolean,
+): { installCmd: string; installArgs: string[] } {
+  if (!unlocked) {
+    return { installCmd: packageManager.installCmd, installArgs: packageManager.installArgs };
+  }
+  const hasNpmLock = fs.existsSync(path.join(targetDir, "package-lock.json"));
+  if (packageManager.name === "npm" && !hasNpmLock) {
+    return {
+      installCmd: "npm install --no-audit --no-fund --progress=false",
+      installArgs: ["install", "--no-audit", "--no-fund", "--progress=false"],
+    };
+  }
+  if (packageManager.name === "pnpm") {
+    return {
+      installCmd: "pnpm install --no-frozen-lockfile",
+      installArgs: ["install", "--no-frozen-lockfile"],
+    };
+  }
+  return { installCmd: packageManager.installCmd, installArgs: packageManager.installArgs };
+}
+
+export async function runScaffoldDependencyInstall(params: {
+  verbose?: boolean;
+  packageManager: PackageManager;
+  targetDir: string;
+  unlockedInstall: boolean;
+  installDependencies: boolean;
+  telemetryProps?: Record<string, unknown>;
+}): Promise<{ dependencyInstalled: boolean; installCmd: string }> {
+  const { installCmd, installArgs } = resolveScaffoldInstall(
+    params.packageManager,
+    params.targetDir,
+    params.unlockedInstall,
+  );
+  const extra = params.telemetryProps ?? {};
+
+  if (!params.installDependencies) {
+    telemetry.capture("cli_dependency_install_skipped", {
+      skip_reason: "no_install_flag",
+    });
+    console.info(`Skipping dependency install (--no-install). Run \`${installCmd}\` later.`);
+    return { dependencyInstalled: false, installCmd };
+  }
+
+  telemetry.capture("cli_dependency_install_started", {
+    ...createFunnelProps("dependency_install_started"),
+    ...extra,
+  });
+  const installResult = await runDependencyInstall({
+    verbose: params.verbose,
+    command: params.packageManager.runCmd,
+    args: installArgs,
+    cwd: params.targetDir,
+    installCmd,
+  });
+  if (!installResult.error && installResult.status === 0) {
+    telemetry.capture("cli_dependency_install_succeeded", {
+      ...createFunnelProps("dependency_install_succeeded"),
+      ...extra,
+      dependency_installed: true,
+    });
+    return { dependencyInstalled: true, installCmd };
+  }
+
+  const properties = processErrorProperties(installResult, "dependency_install", {
+    error_class: "dependency",
+    error_code: "NONZERO_EXIT",
+  });
+  if (properties.error_class === "user_cancelled") {
+    telemetry.capture("cli_dependency_install_cancelled", {
+      ...createFunnelProps("dependency_install_cancelled"),
+      ...extra,
+      dependency_installed: false,
+      ...properties,
+    });
+    throw new CliCancelledError(
+      "dependency_install",
+      properties.cancellation_exit_code ?? 0,
+      properties,
+    );
+  }
+  telemetry.capture("cli_dependency_install_failed", {
+    ...createFunnelProps("dependency_install_failed"),
+    ...extra,
+    dependency_installed: false,
+    ...properties,
+  });
+  const { failure_stage, error_class, error_code, ...metadata } = properties;
+  throw new CreateError(
+    failure_stage,
+    "dependency install failed",
+    error_class,
+    error_code,
+    metadata,
+  );
+}
+
+export async function runScaffoldSkillInstall(params: {
+  enabled: boolean;
+  verbose?: boolean;
+  targetDir: string;
+}): Promise<boolean> {
+  if (!params.enabled) return false;
+
+  telemetry.capture("cli_skill_install_started", {
+    ...createFunnelProps("skill_install_started"),
+    skill_installed: true,
+  });
+  const runSkill = () =>
+    params.verbose
+      ? runSkillInstall(params.targetDir)
+      : runSkillInstall(params.targetDir, {
+          echo: false,
+          stdin: "ignore",
+          captureLimit: QUIET_COMMAND_CAPTURE_LIMIT,
+        });
+  const skillResult = await withProgress(
+    "Installing OpenUI agent skill...",
+    runSkill,
+    params.verbose,
+  );
+  const skillInstalled = !skillResult.error && skillResult.status === 0;
+  if (skillInstalled) {
+    if (!params.verbose) {
+      console.info("✓ OpenUI agent skill installed");
+    }
+    telemetry.capture("cli_skill_install_finished", {
+      ...createFunnelProps("skill_install_finished"),
+      skill_installed: true,
+      duration_ms: skillResult.durationMs,
+      exit_code: skillResult.status,
+    });
+    return true;
+  }
+
+  const properties = processErrorProperties(skillResult, "skill_install", {
+    error_class: "dependency",
+    error_code: "SKILL_INSTALL_FAILED",
+  });
+  if (properties.error_class === "user_cancelled") {
+    telemetry.capture("cli_skill_install_cancelled", {
+      ...createFunnelProps("skill_install_cancelled"),
+      skill_installed: false,
+      ...properties,
+    });
+    throw new CliCancelledError(
+      "skill_install",
+      properties.cancellation_exit_code ?? 0,
+      properties,
+    );
+  }
+  telemetry.capture("cli_skill_install_failed", {
+    ...createFunnelProps("skill_install_failed"),
+    skill_installed: false,
+    ...properties,
+  });
+  console.warn(
+    "\nCould not install the OpenUI agent skill automatically.\n" +
+      "You can install it manually later with:\n\n" +
+      "  npx skills add thesysdev/skills --skill openui\n",
+  );
+  return false;
+}
+
+export async function runScaffoldDevCommand(params: {
+  name: string;
+  targetDir: string;
+  packageManager: PackageManager;
+  startDev: boolean;
+  noInstall?: boolean;
+  missingApiKey?: { env: string; message?: string };
+}): Promise<void> {
+  const devCmd = params.packageManager.runCmd;
+
+  if (params.missingApiKey) {
+    telemetry.capture("cli_dev_command_skipped", {
+      skip_reason: "missing_api_key",
+      required_env: params.missingApiKey.env,
+    });
+    if (params.missingApiKey.message) console.error(params.missingApiKey.message);
+    process.exitCode = 1;
+    return;
+  }
+
+  if (!params.startDev) {
+    telemetry.capture("cli_dev_command_skipped", {
+      skip_reason: params.noInstall ? "dependencies_not_installed" : "not_immediate",
+    });
+    return;
+  }
+
+  telemetry.capture("cli_dev_command_started", {
+    package_manager: params.packageManager.name,
+  });
+  const devResult = await runDevCommand(devCmd, params.targetDir);
+  const stoppedNormally =
+    devResult.status === 0 ||
+    devResult.status === 130 ||
+    devResult.status === 143 ||
+    devResult.signal === "SIGINT" ||
+    devResult.signal === "SIGTERM";
+
+  if (stoppedNormally) {
+    telemetry.capture("cli_dev_command_stopped", {
+      package_manager: params.packageManager.name,
+      duration_ms: devResult.durationMs,
+      exit_code: devResult.status,
+      failure_signal: devResult.signal,
+    });
+    return;
+  }
+
+  const exitCode = devResult.status ?? 1;
+  const properties = processErrorProperties(devResult, "dev_server", {
+    error_class: "process",
+    error_code: "NONZERO_EXIT",
+  });
+  telemetry.capture("cli_dev_command_failed", {
+    package_manager: params.packageManager.name,
+    failure_reason: devResult.error ? "spawn_error" : "nonzero_exit",
+    ...properties,
+  });
+  console.error(
+    `\nDevelopment server exited. Retry with:\n\n> cd ${params.name}\n> ${devCmd} run dev\n`,
+  );
+  process.exitCode = exitCode;
+}
+
+export function formatCreateDoneMessage(o: {
+  skillInstalled: boolean;
+  envNote: string;
+  extraNotes?: string[];
+  name: string;
+  devCmd: string;
+  installCmd: string;
+  startDev: boolean;
+  dependencyInstalled: boolean;
+  nextStep?: string;
+}): string {
+  const skillMessage = o.skillInstalled
+    ? "The OpenUI agent skill was installed.\nAI coding assistants will use it to help you build with OpenUI."
+    : "";
+  const nextStep =
+    o.nextStep ??
+    (o.startDev
+      ? `Starting the development server in "${o.name}"...\n\n> ${o.devCmd} run dev`
+      : [
+          `> cd ${o.name}`,
+          ...(o.dependencyInstalled ? [] : [`> ${o.installCmd}`]),
+          `> ${o.devCmd} run dev`,
+        ].join("\n"));
+
+  return `\n${[skillMessage, "Done!", o.envNote, ...(o.extraNotes ?? []), nextStep]
+    .filter(Boolean)
+    .join("\n\n")}\n`;
+}
diff --git a/packages/openui-cli/src/lib/create-helpers.ts b/packages/openui-cli/src/lib/create-helpers.ts
new file mode 100644
index 000000000..c4be581cd
--- /dev/null
+++ b/packages/openui-cli/src/lib/create-helpers.ts
@@ -0,0 +1,99 @@
+import { printLogTail, QUIET_COMMAND_CAPTURE_LIMIT } from "./command-output";
+import { runCommand, type CommandResult } from "./process-runner";
+import { withSpinner } from "./spinner";
+import { CliCancelledError } from "./telemetry";
+
+const isInteractiveTerminal = () => Boolean(process.stdin.isTTY && process.stdout.isTTY);
+
+export function resolveImmediate(
+  immediate: boolean | undefined,
+  noInstall: boolean | undefined,
+  interactive: boolean,
+): {
+  immediate: boolean;
+  installDependencies: boolean;
+  source: "flag" | "interactive_default" | "no_install" | "noninteractive_default";
+} {
+  if (noInstall) {
+    return { immediate: false, installDependencies: false, source: "no_install" };
+  }
+  if (immediate !== undefined) {
+    return {
+      immediate,
+      installDependencies: true,
+      source: "flag",
+    };
+  }
+  if (!interactive || !isInteractiveTerminal()) {
+    return {
+      immediate: false,
+      installDependencies: true,
+      source: "noninteractive_default",
+    };
+  }
+  return { immediate: true, installDependencies: true, source: "interactive_default" };
+}
+
+/** Spinner in quiet mode; print the label and stream output when `--verbose`. */
+export async function withProgress<T>(
+  label: string,
+  run: () => Promise<T>,
+  verbose?: boolean,
+): Promise<T> {
+  if (verbose) {
+    console.info(`${label}\n`);
+    return run();
+  }
+  return withSpinner(label, run);
+}
+
+export async function runDependencyInstall(params: {
+  verbose?: boolean;
+  command: string;
+  args: string[];
+  cwd: string;
+  installCmd: string;
+}): Promise<CommandResult> {
+  const { verbose, command, args, cwd, installCmd } = params;
+  const runInstall = () =>
+    verbose
+      ? runCommand(command, args, cwd)
+      : runCommand(command, args, cwd, {
+          echo: false,
+          stdin: "ignore",
+          captureLimit: QUIET_COMMAND_CAPTURE_LIMIT,
+          env: {
+            ...process.env,
+            npm_config_loglevel: "error",
+            NPM_CONFIG_LOGLEVEL: "error",
+          },
+        });
+
+  if (verbose) console.info(`Installing dependencies with: ${installCmd}\n`);
+  const result = verbose
+    ? await runInstall()
+    : await withSpinner("Installing dependencies...", runInstall);
+
+  const ok = !result.error && result.status === 0;
+  if (ok && !verbose) console.info("✓ Dependencies installed");
+  if (!ok && !verbose) printLogTail(result.diagnosticTail, "install log (tail)");
+  return result;
+}
+
+export async function promptForProviderKey(envKey = "OPENAI_API_KEY"): Promise<string | null> {
+  try {
+    const { input } = await import("@inquirer/prompts");
+    const apiKey = (
+      await input({
+        message: `Enter your ${envKey} (leave blank to skip):`,
+      })
+    ).trim();
+    return apiKey || null;
+  } catch (error) {
+    const { ExitPromptError } = await import("@inquirer/core");
+    if (error instanceof ExitPromptError) {
+      throw new CliCancelledError("environment_resolution");
+    }
+    throw error;
+  }
+}
diff --git a/packages/openui-cli/src/lib/create-telemetry.ts b/packages/openui-cli/src/lib/create-telemetry.ts
index 7e2758b99..a1e9fb24d 100644
--- a/packages/openui-cli/src/lib/create-telemetry.ts
+++ b/packages/openui-cli/src/lib/create-telemetry.ts
@@ -9,6 +9,7 @@ const createFunnelSteps = {
   create_started: "0100",
   ai_setup_selected: "0200",
   backend_framework_selected: "0250",
+  example_selected: "0260",
   scaffold_started: "0300",
   scaffold_succeeded: "0310",
   scaffold_failed: "0320",
diff --git a/packages/openui-cli/src/lib/create-types.ts b/packages/openui-cli/src/lib/create-types.ts
index db853defb..573cb040e 100644
--- a/packages/openui-cli/src/lib/create-types.ts
+++ b/packages/openui-cli/src/lib/create-types.ts
@@ -9,6 +9,7 @@ export interface CreateAppOptions {
   name?: string;
   template?: TemplateName;
   backendFramework?: OverlayName;
+  example?: string;
   skill?: boolean;
   noInteractive?: boolean;
   noInstall?: boolean;
diff --git a/packages/openui-cli/src/lib/examples-catalog.ts b/packages/openui-cli/src/lib/examples-catalog.ts
new file mode 100644
index 000000000..3bc80a321
--- /dev/null
+++ b/packages/openui-cli/src/lib/examples-catalog.ts
@@ -0,0 +1,66 @@
+import { fetchSourceFile } from "./checkout";
+import type { ExampleProject } from "./projects";
+import { catalogError } from "./utils";
+
+export const EXAMPLES_CATALOG_PATH = "examples/examples.json";
+
+function parseCatalogEntry(item: unknown): ExampleProject {
+  const entry = item as {
+    title?: unknown;
+    description?: unknown;
+    path?: unknown;
+    envKey?: unknown;
+  };
+  if (
+    typeof entry.title !== "string" ||
+    typeof entry.description !== "string" ||
+    typeof entry.path !== "string"
+  ) {
+    throw catalogError(
+      "EXAMPLES_CATALOG_INVALID",
+      `${EXAMPLES_CATALOG_PATH} has an example missing title, description, or path.`,
+    );
+  }
+  const relative = entry.path.replace(/^\/+/, "");
+  const name = relative.split("/").filter(Boolean).at(-1);
+  if (!name) {
+    throw catalogError(
+      "EXAMPLES_CATALOG_INVALID",
+      `${EXAMPLES_CATALOG_PATH} has an example with an empty path.`,
+    );
+  }
+  if (entry.envKey !== undefined) {
+    if (typeof entry.envKey !== "string" || !/^[A-Za-z_][A-Za-z0-9_]*$/.test(entry.envKey)) {
+      throw catalogError(
+        "EXAMPLES_CATALOG_INVALID",
+        `${EXAMPLES_CATALOG_PATH} example "${name}" has an invalid envKey.`,
+      );
+    }
+  }
+  return {
+    name,
+    label: entry.title,
+    description: entry.description,
+    category: "example",
+    path: relative.startsWith("examples/") ? relative : `examples/${relative}`,
+    envFile: ".env",
+    envKey: typeof entry.envKey === "string" ? entry.envKey : undefined,
+  };
+}
+
+function parseExamplesCatalog(raw: string): ExampleProject[] {
+  const parsed = JSON.parse(raw) as { examples?: unknown };
+  if (!Array.isArray(parsed.examples) || parsed.examples.length === 0) {
+    throw catalogError(
+      "EXAMPLES_CATALOG_INVALID",
+      `${EXAMPLES_CATALOG_PATH} must contain a non-empty "examples" array.`,
+    );
+  }
+  return parsed.examples.map(parseCatalogEntry);
+}
+
+/** Prefetch the examples catalog from GitHub. */
+export async function loadExamplesCatalog(): Promise<ExampleProject[]> {
+  const { content } = await fetchSourceFile(EXAMPLES_CATALOG_PATH);
+  return parseExamplesCatalog(content);
+}
diff --git a/packages/openui-cli/src/lib/projects.ts b/packages/openui-cli/src/lib/projects.ts
new file mode 100644
index 000000000..eb6a25d78
--- /dev/null
+++ b/packages/openui-cli/src/lib/projects.ts
@@ -0,0 +1,207 @@
+import { styleText } from "node:util";
+
+import type { OverlayName } from "./create-types";
+import { promptSelect } from "./resolve-args";
+import { CreateError } from "./telemetry";
+import type { CatalogOverlay } from "./templates-catalog";
+import { findByNormalizedKey } from "./utils";
+
+export type ProjectCategory = "template" | "example";
+
+export type EnvFileHint = ".env" | ".env.local";
+
+export interface TemplateProject {
+  name: OverlayName;
+  label: string;
+  description: string;
+  category: "template";
+}
+
+export interface ExampleProject {
+  name: string;
+  label: string;
+  description: string;
+  category: "example";
+  /** Path inside the OpenUI repo, e.g. `examples/app-frameworks/vue`. */
+  path: string;
+  /** Where the example expects its primary API key. */
+  envFile: EnvFileHint;
+  /** Primary env var to prompt for. Omit when the example needs several keys. */
+  envKey?: string;
+}
+
+export type ProjectMetadata = TemplateProject | ExampleProject;
+
+const OPENUI_EXAMPLES_CHOICE = "openui-examples";
+const GO_BACK_CHOICE = "__back__";
+
+function erasePromptLines(count: number) {
+  const out = process.stdout;
+  if (!out.isTTY) return;
+  for (let i = 0; i < count; i++) {
+    out.moveCursor(0, -1);
+    out.clearLine(0);
+  }
+  out.cursorTo(0);
+}
+
+export function templatesFromOverlays(overlays: CatalogOverlay[]): TemplateProject[] {
+  return overlays.map((overlay) => ({
+    name: overlay.key,
+    label: overlay.name,
+    description: overlay.description,
+    category: "template",
+  }));
+}
+
+export function findTemplate(name: OverlayName, templates: TemplateProject[]): TemplateProject {
+  return findByNormalizedKey(
+    templates,
+    name,
+    (entry) => entry.name,
+    (available) =>
+      new CreateError(
+        "args_resolution",
+        `unknown backend framework "${name}". Use: ${available}.`,
+        "invalid_input",
+        "INVALID_BACKEND_FRAMEWORK",
+      ),
+  );
+}
+
+export function findExample(name: string, examples: ExampleProject[]): ExampleProject {
+  return findByNormalizedKey(
+    examples,
+    name,
+    (entry) => entry.name,
+    (available) =>
+      new CreateError(
+        "args_resolution",
+        `unknown example "${name}". Use: ${available}.`,
+        "invalid_input",
+        "INVALID_EXAMPLE",
+      ),
+  );
+}
+
+export function rejectConflictingScaffoldSelectors(opts: {
+  example?: string;
+  backendFramework?: OverlayName;
+  template?: string;
+}): void {
+  if (opts.example && opts.backendFramework) {
+    throw new CreateError(
+      "bad_args",
+      "Cannot use --example with --backend-framework. Choose one scaffold selector.",
+      "invalid_input",
+      "CONFLICTING_SCAFFOLD_SELECTORS",
+    );
+  }
+  if (opts.example && opts.template) {
+    throw new CreateError(
+      "bad_args",
+      "Cannot use --example with --template. Choose one scaffold selector.",
+      "invalid_input",
+      "CONFLICTING_SCAFFOLD_SELECTORS",
+    );
+  }
+}
+
+function heading(label: string): string {
+  return styleText("bold", label);
+}
+
+function categoryLabel(key: string): string {
+  return key
+    .split("-")
+    .map((part, index) => (index === 0 ? part.charAt(0).toUpperCase() + part.slice(1) : part))
+    .join(" ");
+}
+
+function groupedExampleChoices(
+  examples: ExampleProject[],
+  Separator: new (heading?: string) => object,
+): unknown[] {
+  const groups = new Map<string, ExampleProject[]>();
+  for (const example of examples) {
+    const key = example.path.replace(/^examples\//, "").split("/")[0] ?? "miscellaneous";
+    const group = groups.get(key) ?? [];
+    group.push(example);
+    groups.set(key, group);
+  }
+
+  const choices: unknown[] = [];
+  for (const [key, group] of groups) {
+    choices.push(new Separator(heading(categoryLabel(key))));
+    for (const project of group) {
+      choices.push({
+        value: project.name,
+        name: project.label,
+        description: project.description,
+      });
+    }
+  }
+  return choices;
+}
+
+export async function resolveProject(params: {
+  backendFramework?: OverlayName;
+  example?: string;
+  examples: ExampleProject[];
+  templates: TemplateProject[];
+  interactive: boolean;
+}): Promise<ProjectMetadata> {
+  const { backendFramework, example, examples, templates, interactive } = params;
+
+  if (example) return findExample(example, examples);
+  if (backendFramework) return findTemplate(backendFramework, templates);
+  if (!interactive) return findTemplate("default", templates);
+
+  const { Separator } = await import("@inquirer/prompts");
+  for (;;) {
+    const starterChoices: unknown[] = [
+      new Separator(" "),
+      new Separator(heading("Starter Templates")),
+      ...templates.map((project) => ({
+        value: project.name,
+        name: project.label,
+        description: project.description,
+      })),
+    ];
+    if (examples.length > 0) {
+      starterChoices.push(new Separator());
+      starterChoices.push({
+        value: OPENUI_EXAMPLES_CHOICE,
+        name: "Scaffold from OpenUI Examples →",
+        description: "Browse examples from the OpenUI repo",
+      });
+    }
+
+    const selected = await promptSelect("Select a project to scaffold:", starterChoices);
+    if (selected !== OPENUI_EXAMPLES_CHOICE) {
+      return findTemplate(selected as OverlayName, templates);
+    }
+
+    const exampleSelected = await promptSelect(
+      "Select an OpenUI example:",
+      [
+        { value: GO_BACK_CHOICE, name: "← Back" },
+        new Separator(),
+        ...groupedExampleChoices(examples, Separator),
+      ],
+      { pageSize: 10, loop: false, pinCount: 2 },
+    );
+    if (exampleSelected === GO_BACK_CHOICE) {
+      // Inquirer prints a ✔ line for every resolved select. Drop the
+      // examples visit so Back returns to a clean starter prompt.
+      erasePromptLines(2);
+      continue;
+    }
+    const selectedExample = findExample(exampleSelected, examples);
+    erasePromptLines(2);
+    const prefix = styleText("green", "✔");
+    const answer = styleText("cyan", selectedExample.label);
+    console.info(`${prefix} Select a project to scaffold: ${answer}`);
+    return selectedExample;
+  }
+}
diff --git a/packages/openui-cli/src/lib/prompt-select.ts b/packages/openui-cli/src/lib/prompt-select.ts
new file mode 100644
index 000000000..c87935114
--- /dev/null
+++ b/packages/openui-cli/src/lib/prompt-select.ts
@@ -0,0 +1,236 @@
+import { styleText } from "node:util";
+
+import { CliCancelledError } from "./telemetry";
+
+export type PromptSelectOptions = {
+  pageSize?: number;
+  loop?: boolean;
+  /** Keep the first N choices on screen while the rest scroll. */
+  pinCount?: number;
+};
+
+type NormalizedChoice = {
+  value: string;
+  name: string;
+  short: string;
+  disabled: boolean | string;
+  description?: string;
+};
+
+type SeparatorLike = { separator: string };
+type SelectItem = NormalizedChoice | SeparatorLike;
+
+function lastNavigableIndex(
+  items: SelectItem[],
+  isNavigable: (item: SelectItem) => boolean,
+): number {
+  for (let i = items.length - 1; i >= 0; i--) {
+    if (isNavigable(items[i]!)) return i;
+  }
+  return -1;
+}
+
+function isChoice(item: SelectItem): item is NormalizedChoice {
+  return "value" in item;
+}
+
+function renderChoice(
+  item: SelectItem,
+  isActive: boolean,
+  isSeparator: (item: SelectItem) => boolean,
+): string {
+  if (isSeparator(item) || !isChoice(item)) return ` ${(item as SeparatorLike).separator}`;
+  const cursor = isActive ? "❯" : " ";
+  const color = isActive ? (text: string) => styleText("cyan", text) : (text: string) => text;
+  return color(`${cursor} ${item.name}`);
+}
+
+type PinnedSelect = (config: {
+  message: string;
+  choices: readonly unknown[];
+  pageSize: number;
+  loop: boolean;
+  pinCount: number;
+}) => Promise<string>;
+
+let pinnedSelect: PinnedSelect | undefined;
+
+async function getPinnedSelect(): Promise<PinnedSelect> {
+  if (pinnedSelect) return pinnedSelect;
+
+  const {
+    createPrompt,
+    isDownKey,
+    isEnterKey,
+    isUpKey,
+    makeTheme,
+    Separator,
+    useKeypress,
+    useMemo,
+    usePagination,
+    usePrefix,
+    useState,
+  } = await import("@inquirer/core");
+
+  const isSeparator = (item: SelectItem): item is SeparatorLike => Separator.isSeparator(item);
+  const isNavigable = (item: SelectItem): boolean => !isSeparator(item) && !item.disabled;
+
+  const normalizeChoices = (choices: readonly unknown[]): SelectItem[] =>
+    choices.map((choice) => {
+      if (Separator.isSeparator(choice)) return choice;
+      if (typeof choice !== "object" || choice === null || !("value" in choice)) {
+        const name = String(choice);
+        return { value: name, name, short: name, disabled: false };
+      }
+      const raw = choice as {
+        value: unknown;
+        name?: unknown;
+        short?: unknown;
+        disabled?: unknown;
+        description?: unknown;
+      };
+      const name = typeof raw.name === "string" ? raw.name : String(raw.value);
+      return {
+        value: String(raw.value),
+        name,
+        short: typeof raw.short === "string" ? raw.short : name,
+        disabled: (raw.disabled as boolean | string | undefined) ?? false,
+        description: typeof raw.description === "string" ? raw.description : undefined,
+      };
+    });
+
+  pinnedSelect = createPrompt<
+    string,
+    {
+      message: string;
+      choices: readonly unknown[];
+      pageSize: number;
+      loop: boolean;
+      pinCount: number;
+    }
+  >((config, done) => {
+    const { pageSize, loop, pinCount } = config;
+    const theme = makeTheme();
+    const { keybindings } = theme;
+    const [status, setStatus] = useState("idle");
+    const prefix = usePrefix({ status, theme });
+    const items = useMemo(() => normalizeChoices(config.choices), [config.choices]);
+    const bounds = useMemo(
+      () => ({
+        first: items.findIndex(isNavigable),
+        last: lastNavigableIndex(items, isNavigable),
+      }),
+      [items],
+    );
+    const [active, setActive] = useState(bounds.first === -1 ? 0 : bounds.first);
+    const selected = items[active];
+
+    useKeypress((key) => {
+      if (selected == null || isSeparator(selected)) return;
+      if (isEnterKey(key)) {
+        if (!isNavigable(selected)) return;
+        setStatus("done");
+        done(selected.value);
+        return;
+      }
+      if (!isUpKey(key, keybindings) && !isDownKey(key, keybindings)) return;
+      const atStart = active === bounds.first;
+      const atEnd = active === bounds.last;
+      if (
+        !loop &&
+        ((isUpKey(key, keybindings) && atStart) || (isDownKey(key, keybindings) && atEnd))
+      ) {
+        return;
+      }
+      const offset = isUpKey(key, keybindings) ? -1 : 1;
+      let next = active;
+      do {
+        next = (next + offset + items.length) % items.length;
+      } while (!isNavigable(items[next]!));
+      setActive(next);
+    });
+
+    const rest = items.slice(pinCount);
+    const restActive = active < pinCount ? -1 : active - pinCount;
+    const restPage = usePagination({
+      items: rest,
+      active: Math.max(0, restActive),
+      renderItem({ item, index }) {
+        return renderChoice(item, restActive === index, isSeparator);
+      },
+      pageSize,
+      loop: false,
+    });
+
+    if (status === "done") {
+      const answer = selected && !isSeparator(selected) ? selected.short : "";
+      return [prefix, theme.style.message(config.message, status), theme.style.answer(answer)]
+        .filter(Boolean)
+        .join(" ");
+    }
+
+    const description =
+      selected && !isSeparator(selected) && selected.description
+        ? styleText("cyan", selected.description)
+        : "";
+    const pinnedLines = items
+      .slice(0, pinCount)
+      .map((item, index) => renderChoice(item, index === active, isSeparator))
+      .join("\n");
+    const helpLine = `${styleText("bold", "↑↓")} ${styleText("dim", "navigate")} ${styleText("dim", "•")} ${styleText("bold", "⏎")} ${styleText("dim", "select")}`;
+
+    return [
+      [prefix, theme.style.message(config.message, status)].filter(Boolean).join(" "),
+      pinnedLines,
+      restPage,
+      " ",
+      description,
+      helpLine,
+    ]
+      .filter(Boolean)
+      .join("\n");
+  });
+
+  return pinnedSelect;
+}
+
+export async function promptSelect(
+  message: string,
+  choices: readonly unknown[],
+  options?: number | PromptSelectOptions,
+): Promise<string> {
+  const resolved =
+    typeof options === "number"
+      ? { pageSize: options, loop: true, pinCount: 0 }
+      : {
+          pageSize: options?.pageSize ?? choices.length,
+          loop: options?.loop ?? true,
+          pinCount: options?.pinCount ?? 0,
+        };
+
+  try {
+    if (resolved.pinCount > 0) {
+      const selectPinned = await getPinnedSelect();
+      return await selectPinned({
+        message,
+        choices,
+        pageSize: resolved.pageSize,
+        loop: resolved.loop,
+        pinCount: resolved.pinCount,
+      });
+    }
+    const { select } = await import("@inquirer/prompts");
+    return await select<string>({
+      message,
+      choices: choices as never,
+      pageSize: resolved.pageSize,
+      loop: resolved.loop,
+    });
+  } catch (err) {
+    const { ExitPromptError } = await import("@inquirer/core");
+    if (err instanceof ExitPromptError) {
+      throw new CliCancelledError("args_resolution");
+    }
+    throw err;
+  }
+}
diff --git a/packages/openui-cli/src/lib/resolve-args.ts b/packages/openui-cli/src/lib/resolve-args.ts
index 53bd78035..482ebb7de 100644
--- a/packages/openui-cli/src/lib/resolve-args.ts
+++ b/packages/openui-cli/src/lib/resolve-args.ts
@@ -1,5 +1,9 @@
+import { promptSelect } from "./prompt-select";
 import { CliCancelledError, CreateError } from "./telemetry";
 
+export { promptSelect } from "./prompt-select";
+export type { PromptSelectOptions } from "./prompt-select";
+
 type InputPromptConfig = {
   type: "input";
   message: string;
@@ -31,14 +35,10 @@ export function rejectConflictingImmediateFlags(args: string[]): void {
 }
 
 async function resolveOne(prompt: PromptConfig): Promise<string> {
-  const { input, select } = await import("@inquirer/prompts");
   if (prompt.type === "select") {
-    return select({
-      message: prompt.message,
-      choices: prompt.choices,
-      pageSize: prompt.choices.length,
-    });
+    return promptSelect(prompt.message, prompt.choices);
   }
+  const { input } = await import("@inquirer/prompts");
   return input({ message: prompt.message, default: prompt.default });
 }
 
diff --git a/packages/openui-cli/src/lib/scaffold-example.ts b/packages/openui-cli/src/lib/scaffold-example.ts
new file mode 100644
index 000000000..b9d9cf00e
--- /dev/null
+++ b/packages/openui-cli/src/lib/scaffold-example.ts
@@ -0,0 +1,146 @@
+import * as fs from "node:fs";
+import * as path from "node:path";
+
+import { checkoutSource } from "./checkout";
+import type { PackageManagerName } from "./detect-package-manager";
+import type { ExampleProject } from "./projects";
+import {
+  pruneScaffoldLockfiles,
+  restoreDotfiles,
+  rewriteScaffoldPackageJson,
+} from "./scaffold-package";
+import { CreateError } from "./telemetry";
+
+const ARTIFACT_DIRS = new Set(["node_modules", ".next", ".turbo", "dist", ".nuxt", ".svelte-kit"]);
+
+const GENERATE_SCRIPT_RE =
+  /pnpm --filter @openuidev\/cli build && node (?:\.\.\/)+packages\/openui-cli\/dist\/index\.js generate/;
+const GENERATE_SCRIPT_FALLBACK_RE =
+  /node (?:\.\.\/)+packages\/openui-cli\/dist\/index\.js generate/;
+
+export type ExampleLayout = {
+  /** Directories with a `package.json`, relative to the example root (`"."` = root). */
+  jsPackages: string[];
+  /** Directories with a `pyproject.toml`, relative to the example root. */
+  pythonPackages: string[];
+};
+
+function collectRelativeDirs(dir: string, fileName: string, root = dir): string[] {
+  const found: string[] = [];
+  for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
+    if (ARTIFACT_DIRS.has(entry.name) || entry.name === ".git") continue;
+    const full = path.join(dir, entry.name);
+    if (entry.isDirectory()) {
+      found.push(...collectRelativeDirs(full, fileName, root));
+      continue;
+    }
+    if (entry.name !== fileName) continue;
+    const relative = path.relative(root, dir);
+    found.push(relative === "" ? "." : relative);
+  }
+  return found;
+}
+
+export function exampleLayout(projectDir: string): ExampleLayout {
+  return {
+    jsPackages: collectRelativeDirs(projectDir, "package.json"),
+    pythonPackages: collectRelativeDirs(projectDir, "pyproject.toml"),
+  };
+}
+
+export function isNestedExample(layout: ExampleLayout): boolean {
+  return layout.jsPackages.length > 0 && !layout.jsPackages.includes(".");
+}
+
+export function exampleDevCommand(pkgDir: string, runCmd: string): string {
+  const pkg = JSON.parse(fs.readFileSync(path.join(pkgDir, "package.json"), "utf8")) as {
+    scripts?: Record<string, string>;
+  };
+  if (pkg.scripts?.["dev"]) return `${runCmd} run dev`;
+  if (pkg.scripts?.["start"]) return `${runCmd} start`;
+  return `${runCmd} run dev`;
+}
+
+function rewriteGenerateScript(value: string): string {
+  if (GENERATE_SCRIPT_RE.test(value)) {
+    return value.replace(GENERATE_SCRIPT_RE, "npx @openuidev/cli generate");
+  }
+  if (GENERATE_SCRIPT_FALLBACK_RE.test(value)) {
+    return value.replace(GENERATE_SCRIPT_FALLBACK_RE, "npx @openuidev/cli generate");
+  }
+  return value;
+}
+
+function copyEnvExamples(projectDir: string): void {
+  const mappings: Array<[string, string]> = [
+    [".env.example", ".env"],
+    [".env.local.example", ".env.local"],
+    ["env.example", ".env"],
+  ];
+
+  const visit = (dir: string) => {
+    for (const [fromName, toName] of mappings) {
+      const from = path.join(dir, fromName);
+      const to = path.join(dir, toName);
+      if (fs.existsSync(from)) {
+        if (!fs.existsSync(to)) {
+          fs.copyFileSync(from, to);
+        }
+        fs.unlinkSync(from);
+      }
+    }
+    for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
+      if (!entry.isDirectory() || ARTIFACT_DIRS.has(entry.name)) continue;
+      visit(path.join(dir, entry.name));
+    }
+  };
+
+  visit(projectDir);
+}
+
+export async function scaffoldExample(params: {
+  example: ExampleProject;
+  targetDir: string;
+  name: string;
+  packageManager: PackageManagerName;
+}): Promise<ExampleLayout> {
+  const { example, targetDir, name, packageManager } = params;
+
+  try {
+    await checkoutSource(example.path, { dest: targetDir });
+  } catch (err) {
+    if (err instanceof CreateError) throw err;
+    throw new CreateError(
+      "scaffold",
+      err instanceof Error ? err.message : String(err),
+      "filesystem",
+      "EXAMPLE_SCAFFOLD_FAILED",
+    );
+  }
+
+  const layout = exampleLayout(targetDir);
+  if (layout.jsPackages.length === 0 && layout.pythonPackages.length === 0) {
+    throw new CreateError(
+      "scaffold",
+      `Example "${example.name}" was not found at ${example.path}.`,
+      "filesystem",
+      "EXAMPLE_MISSING",
+    );
+  }
+
+  restoreDotfiles(targetDir);
+
+  for (const relative of layout.jsPackages) {
+    const pkgDir = relative === "." ? targetDir : path.join(targetDir, relative);
+    rewriteScaffoldPackageJson({
+      pkgPath: path.join(pkgDir, "package.json"),
+      name: relative === "." ? name : undefined,
+      packageManager,
+      rewriteScript: rewriteGenerateScript,
+    });
+    pruneScaffoldLockfiles(pkgDir, packageManager, { keepPnpmWorkspace: true });
+  }
+
+  copyEnvExamples(targetDir);
+  return layout;
+}
diff --git a/packages/openui-cli/src/lib/scaffold-package.ts b/packages/openui-cli/src/lib/scaffold-package.ts
new file mode 100644
index 000000000..efd68ae78
--- /dev/null
+++ b/packages/openui-cli/src/lib/scaffold-package.ts
@@ -0,0 +1,141 @@
+import * as fs from "node:fs";
+import * as os from "node:os";
+import * as path from "node:path";
+
+import type { PackageManagerName } from "./detect-package-manager";
+
+type ScaffoldPackageJson = {
+  name?: string;
+  scripts?: Record<string, string>;
+  dependencies?: Record<string, string>;
+  devDependencies?: Record<string, string>;
+  pnpm?: unknown;
+};
+
+export type ScaffoldPackageJsonPatch = {
+  dependencies?: Record<string, string>;
+  devDependencies?: Record<string, string>;
+  scripts?: Record<string, string>;
+  removeDependencies?: string[];
+};
+
+/** Match npm/pnpm install: keep dependency keys alphabetically sorted. */
+function sortPackageRecord<T>(record: Record<string, T>): Record<string, T> {
+  return Object.fromEntries(Object.entries(record).sort(([a], [b]) => a.localeCompare(b)));
+}
+
+function rewritePublishedDependency(value: string, pkgDir: string): string {
+  if (value.startsWith("link:")) {
+    const target = value.slice("link:".length);
+    const abs = target.startsWith("~")
+      ? path.join(os.homedir(), target.slice(1))
+      : path.resolve(pkgDir, target);
+    return `file:${abs}`;
+  }
+  // workspace:/file:/catalog: are monorepo-only protocols npm/yarn/bun
+  // can't resolve standalone — pin them to the published "latest".
+  if (/^(workspace:|file:|catalog:)/.test(value)) return "latest";
+  return value;
+}
+
+/**
+ * Templates ship `gitignore` un-dotted: npm silently strips `.gitignore`
+ * files (at any depth) from published packages, so a dotted copy never
+ * reaches the scaffold — and freshly created apps would commit `.env`.
+ */
+export function restoreDotfiles(projectDir: string): void {
+  const plain = path.join(projectDir, "gitignore");
+  if (fs.existsSync(plain)) {
+    fs.renameSync(plain, path.join(projectDir, ".gitignore"));
+  }
+}
+
+export function rewriteScaffoldPackageJson(options: {
+  pkgPath: string;
+  name?: string;
+  packageManager: PackageManagerName;
+  overlayPackageJson?: ScaffoldPackageJsonPatch;
+  rewriteScript?: (value: string) => string;
+}): ScaffoldPackageJson {
+  const pkg = JSON.parse(fs.readFileSync(options.pkgPath, "utf8")) as ScaffoldPackageJson;
+  if (options.name) pkg.name = options.name;
+  if (options.packageManager !== "pnpm") delete pkg.pnpm;
+
+  if (options.overlayPackageJson) {
+    pkg.dependencies ??= {};
+    for (const dependency of options.overlayPackageJson.removeDependencies ?? []) {
+      delete pkg.dependencies[dependency];
+    }
+    Object.assign(pkg.dependencies, options.overlayPackageJson.dependencies ?? {});
+    Object.assign((pkg.devDependencies ??= {}), options.overlayPackageJson.devDependencies ?? {});
+    Object.assign((pkg.scripts ??= {}), options.overlayPackageJson.scripts ?? {});
+  }
+
+  const pkgDir = path.dirname(options.pkgPath);
+  for (const section of ["dependencies", "devDependencies"] as const) {
+    const deps = pkg[section];
+    if (!deps) continue;
+    for (const key of Object.keys(deps)) {
+      const value = deps[key];
+      if (!value) continue;
+      deps[key] = rewritePublishedDependency(value, pkgDir);
+    }
+    pkg[section] = sortPackageRecord(deps);
+  }
+
+  if (options.rewriteScript && pkg.scripts) {
+    for (const [key, value] of Object.entries(pkg.scripts)) {
+      pkg.scripts[key] = options.rewriteScript(value);
+    }
+  }
+
+  fs.writeFileSync(options.pkgPath, JSON.stringify(pkg, null, 2) + "\n");
+  return pkg;
+}
+
+/** Keep a copied npm lockfile's root metadata aligned so `npm ci` can consume it. */
+export function syncNpmLockRoot(
+  projectDir: string,
+  name: string,
+  pkg: Pick<ScaffoldPackageJson, "dependencies" | "devDependencies">,
+): void {
+  const lockPath = path.join(projectDir, "package-lock.json");
+  if (!fs.existsSync(lockPath)) return;
+
+  const lock = JSON.parse(fs.readFileSync(lockPath, "utf8")) as {
+    name?: string;
+    packages?: Record<
+      string,
+      {
+        name?: string;
+        dependencies?: Record<string, string>;
+        devDependencies?: Record<string, string>;
+      }
+    >;
+  };
+  lock.name = name;
+  const lockRoot = lock.packages?.[""];
+  if (lockRoot) {
+    lockRoot.name = name;
+    lockRoot.dependencies = pkg.dependencies;
+    lockRoot.devDependencies = pkg.devDependencies;
+  }
+  fs.writeFileSync(lockPath, JSON.stringify(lock, null, 2) + "\n");
+}
+
+export function pruneScaffoldLockfiles(
+  targetDir: string,
+  packageManager: PackageManagerName,
+  options: {
+    keepNpmLock?: boolean;
+    keepPnpmLock?: boolean;
+    keepPnpmWorkspace?: boolean;
+  } = {},
+): void {
+  const keepNpmLock = options.keepNpmLock ?? packageManager === "npm";
+  const keepPnpmLock = options.keepPnpmLock ?? packageManager === "pnpm";
+  const keepPnpmWorkspace = options.keepPnpmWorkspace ?? packageManager === "pnpm";
+  if (!keepNpmLock) fs.rmSync(path.join(targetDir, "package-lock.json"), { force: true });
+  if (!keepPnpmLock) fs.rmSync(path.join(targetDir, "pnpm-lock.yaml"), { force: true });
+  if (!keepPnpmWorkspace) fs.rmSync(path.join(targetDir, "pnpm-workspace.yaml"), { force: true });
+}
diff --git a/packages/openui-cli/src/lib/templates-catalog.ts b/packages/openui-cli/src/lib/templates-catalog.ts
index feb36da32..b9d3d305a 100644
--- a/packages/openui-cli/src/lib/templates-catalog.ts
+++ b/packages/openui-cli/src/lib/templates-catalog.ts
@@ -1,5 +1,6 @@
 import { fetchSourceFile } from "./checkout";
 import { CreateError } from "./telemetry";
+import { catalogError, findByNormalizedKey } from "./utils";
 
 export const TEMPLATES_CATALOG_PATH = "templates/templates.json";
 
@@ -18,10 +19,6 @@ export type CatalogTemplate = {
   overlays: CatalogOverlay[];
 };
 
-function catalogError(message: string): CreateError {
-  return new CreateError("args_resolution", message, "invalid_input", "TEMPLATE_CATALOG_INVALID");
-}
-
 function parseOverlay(item: unknown): CatalogOverlay {
   const overlay = item as CatalogOverlay;
   if (
@@ -30,6 +27,7 @@ function parseOverlay(item: unknown): CatalogOverlay {
     typeof overlay?.description !== "string"
   ) {
     throw catalogError(
+      "TEMPLATE_CATALOG_INVALID",
       `${TEMPLATES_CATALOG_PATH} has an overlay missing name, key, or description.`,
     );
   }
@@ -44,11 +42,12 @@ function parseTemplate(item: unknown): CatalogTemplate {
     typeof template?.description !== "string"
   ) {
     throw catalogError(
+      "TEMPLATE_CATALOG_INVALID",
       `${TEMPLATES_CATALOG_PATH} has a template missing name, key, or description.`,
     );
   }
   if (!Array.isArray(template.overlays) || template.overlays.length === 0) {
-    throw catalogError(`Template "${template.key}" has no overlays.`);
+    throw catalogError("TEMPLATE_CATALOG_INVALID", `Template "${template.key}" has no overlays.`);
   }
   return { ...template, overlays: template.overlays.map(parseOverlay) };
 }
@@ -56,7 +55,10 @@ function parseTemplate(item: unknown): CatalogTemplate {
 function parseTemplatesCatalog(raw: string): CatalogTemplate[] {
   const parsed = JSON.parse(raw) as { templates?: unknown };
   if (!Array.isArray(parsed.templates) || parsed.templates.length === 0) {
-    throw catalogError(`${TEMPLATES_CATALOG_PATH} must contain a non-empty "templates" array.`);
+    throw catalogError(
+      "TEMPLATE_CATALOG_INVALID",
+      `${TEMPLATES_CATALOG_PATH} must contain a non-empty "templates" array.`,
+    );
   }
   return parsed.templates.map(parseTemplate);
 }
@@ -68,31 +70,31 @@ export async function loadTemplatesCatalog(): Promise<CatalogTemplate[]> {
 }
 
 export function findCatalogTemplate(templates: CatalogTemplate[], key: string): CatalogTemplate {
-  const normalized = key.toLowerCase();
-  const match = templates.find((entry) => entry.key.toLowerCase() === normalized);
-  if (!match) {
-    const available = templates.map((entry) => entry.key).join(" | ");
-    throw new CreateError(
-      "args_resolution",
-      `unknown template "${key}". Use: ${available}.`,
-      "invalid_input",
-      "INVALID_TEMPLATE",
-    );
-  }
-  return match;
+  return findByNormalizedKey(
+    templates,
+    key,
+    (entry) => entry.key,
+    (available) =>
+      new CreateError(
+        "args_resolution",
+        `unknown template "${key}". Use: ${available}.`,
+        "invalid_input",
+        "INVALID_TEMPLATE",
+      ),
+  );
 }
 
 export function findCatalogOverlay(template: CatalogTemplate, key: string): CatalogOverlay {
-  const normalized = key.toLowerCase();
-  const match = template.overlays.find((entry) => entry.key.toLowerCase() === normalized);
-  if (!match) {
-    const available = template.overlays.map((entry) => entry.key).join(" | ");
-    throw new CreateError(
-      "args_resolution",
-      `unknown backend framework "${key}". Use: ${available}.`,
-      "invalid_input",
-      "INVALID_BACKEND_FRAMEWORK",
-    );
-  }
-  return match;
+  return findByNormalizedKey(
+    template.overlays,
+    key,
+    (entry) => entry.key,
+    (available) =>
+      new CreateError(
+        "args_resolution",
+        `unknown backend framework "${key}". Use: ${available}.`,
+        "invalid_input",
+        "INVALID_BACKEND_FRAMEWORK",
+      ),
+  );
 }
diff --git a/packages/openui-cli/src/lib/utils.ts b/packages/openui-cli/src/lib/utils.ts
index e3f0dbd8b..141a5182c 100644
--- a/packages/openui-cli/src/lib/utils.ts
+++ b/packages/openui-cli/src/lib/utils.ts
@@ -264,3 +264,22 @@ export function normalizeBackendFramework(framework?: string): OverlayName | und
       return framework.toLowerCase();
   }
 }
+
+export function catalogError(code: string, message: string): CreateError {
+  return new CreateError("args_resolution", message, "invalid_input", code);
+}
+
+export function findByNormalizedKey<T>(
+  items: readonly T[],
+  key: string,
+  getKey: (item: T) => string,
+  makeError: (available: string) => CreateError,
+): T {
+  const normalized = key.toLowerCase();
+  const match = items.find((item) => getKey(item).toLowerCase() === normalized);
+  if (!match) {
+    const available = items.map(getKey).join(" | ") || "(none loaded)";
+    throw makeError(available);
+  }
+  return match;
+}