assistant-ui 0.0.80 → 0.0.82

package/README.md

@@ -20,7 +20,7 @@ Passing `--preset` to `init` also forwards to `create` for compatibility.
 
 Use the `create` command to scaffold a new Next.js project with assistant-ui.
 
-The `create` command uses `create-next-app` with assistant-ui starter templates.
+The `create` command scaffolds a project from assistant-ui starter templates or examples.
 
 ```bash
 npx assistant-ui@latest create my-app

package/dist/commands/agent.d.ts

@@ -0,0 +1,3 @@
+import { Command } from "commander";
+export declare const agent: Command;
+//# sourceMappingURL=agent.d.ts.map

package/dist/commands/agent.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"agent.d.ts","sourceRoot":"","sources":["../../src/commands/agent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAqBpC,eAAO,MAAM,KAAK,SAcd,CAAC"}

package/dist/commands/agent.js

@@ -0,0 +1,34 @@
+import { Command } from "commander";
+import { resolve, dirname } from "node:path";
+import { existsSync } from "node:fs";
+import { fileURLToPath } from "node:url";
+import { launch } from "@assistant-ui/agent-launcher";
+const __dirname = dirname(fileURLToPath(import.meta.url));
+function getPluginPath() {
+    // In dist/, plugin is at ../../plugin relative to dist/commands/agent.js
+    // In dev (src/), plugin is at ../../plugin relative to src/commands/
+    const candidates = [
+        resolve(__dirname, "..", "..", "plugin"),
+        resolve(__dirname, "..", "plugin"),
+    ];
+    for (const candidate of candidates) {
+        if (existsSync(candidate))
+            return candidate;
+    }
+    return candidates[0];
+}
+export const agent = new Command()
+    .name("agent")
+    .description("launch Claude Code with assistant-ui skills")
+    .argument("<prompt...>", "prompt for the agent")
+    .option("--dry", "print the command instead of running it")
+    .action((promptParts, opts) => {
+    const prompt = promptParts.join(" ");
+    launch({
+        pluginDir: getPluginPath(),
+        skillName: "assistant-ui",
+        prompt,
+        dry: opts.dry,
+    });
+});
+//# sourceMappingURL=agent.js.map

package/dist/commands/agent.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"agent.js","sourceRoot":"","sources":["../../src/commands/agent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AAEtD,MAAM,SAAS,GAAG,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AAE1D,SAAS,aAAa;IACpB,yEAAyE;IACzE,qEAAqE;IACrE,MAAM,UAAU,GAAG;QACjB,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,CAAC;QACxC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,QAAQ,CAAC;KACnC,CAAC;IACF,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;QACnC,IAAI,UAAU,CAAC,SAAS,CAAC;YAAE,OAAO,SAAS,CAAC;IAC9C,CAAC;IACD,OAAO,UAAU,CAAC,CAAC,CAAE,CAAC;AACxB,CAAC;AAED,MAAM,CAAC,MAAM,KAAK,GAAG,IAAI,OAAO,EAAE;KAC/B,IAAI,CAAC,OAAO,CAAC;KACb,WAAW,CAAC,6CAA6C,CAAC;KAC1D,QAAQ,CAAC,aAAa,EAAE,sBAAsB,CAAC;KAC/C,MAAM,CAAC,OAAO,EAAE,yCAAyC,CAAC;KAC1D,MAAM,CAAC,CAAC,WAAqB,EAAE,IAAI,EAAE,EAAE;IACtC,MAAM,MAAM,GAAG,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAErC,MAAM,CAAC;QACL,SAAS,EAAE,aAAa,EAAE;QAC1B,SAAS,EAAE,cAAc;QACzB,MAAM;QACN,GAAG,EAAE,IAAI,CAAC,GAAG;KACd,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/commands/create.d.ts

@@ -1,57 +1,25 @@
 import { Command } from "commander";
 import * as p from "@clack/prompts";
-declare const templates: {
-    readonly default: {
-        readonly url: "https://github.com/assistant-ui/assistant-ui-starter";
-        readonly label: "Default";
-        readonly hint: "Default template with Vercel AI SDK";
-    };
-    readonly minimal: {
-        readonly url: "https://github.com/assistant-ui/assistant-ui-starter-minimal";
-        readonly label: "Minimal";
-        readonly hint: "Bare-bones starting point";
-    };
-    readonly cloud: {
-        readonly url: "https://github.com/assistant-ui/assistant-cloud-starter";
-        readonly label: "Cloud";
-        readonly hint: "Cloud-backed persistence starter";
-    };
-    readonly "cloud-clerk": {
-        readonly url: "https://github.com/assistant-ui/assistant-ui-starter-cloud-clerk";
-        readonly label: "Cloud + Clerk";
-        readonly hint: "Cloud-backed starter with Clerk auth";
-    };
-    readonly langgraph: {
-        readonly url: "https://github.com/assistant-ui/assistant-ui-starter-langgraph";
-        readonly label: "LangGraph";
-        readonly hint: "LangGraph starter template";
-    };
-    readonly mcp: {
-        readonly url: "https://github.com/assistant-ui/assistant-ui-starter-mcp";
-        readonly label: "MCP";
-        readonly hint: "MCP starter template";
-    };
-};
-type TemplateName = keyof typeof templates;
-export declare function resolveCreateTemplateName(params: {
+export interface ProjectMetadata {
+    name: string;
+    label: string;
+    description?: string;
+    category: "template" | "example";
+    path: string;
+    hasLocalComponents: boolean;
+}
+export declare const PROJECT_METADATA: ProjectMetadata[];
+export declare function resolveProject(params: {
     template?: string;
+    example?: string;
     stdinIsTTY?: boolean;
     select?: typeof p.select;
     isCancel?: typeof p.isCancel;
-}): Promise<TemplateName | null>;
-export declare function buildCreateNextAppArgs(params: {
-    projectDirectory?: string;
-    useNpm?: boolean;
-    usePnpm?: boolean;
-    useYarn?: boolean;
-    useBun?: boolean;
-    skipInstall?: boolean;
-    templateUrl: string;
-}): string[];
+}): Promise<ProjectMetadata | null>;
 export declare function resolveCreateProjectDirectory(params: {
     projectDirectory?: string;
     stdinIsTTY?: boolean;
 }): string | undefined;
+export declare function resolvePresetUrl(preset: string): string;
 export declare const create: Command;
-export {};
 //# sourceMappingURL=create.d.ts.map

package/dist/commands/create.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../src/commands/create.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAIpC,OAAO,KAAK,CAAC,MAAM,gBAAgB,CAAC;AAKpC,QAAA,MAAM,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA+BL,CAAC;AAEX,KAAK,YAAY,GAAG,MAAM,OAAO,SAAS,CAAC;AAa3C,wBAAsB,yBAAyB,CAAC,MAAM,EAAE;IACtD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC,MAAM,CAAC;IACzB,QAAQ,CAAC,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC;CAC9B,GAAG,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,CA0B/B;AAiCD,wBAAgB,sBAAsB,CAAC,MAAM,EAAE;IAC7C,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;CACrB,GAAG,MAAM,EAAE,CAqBX;AAED,wBAAgB,6BAA6B,CAAC,MAAM,EAAE;IACpD,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB,GAAG,MAAM,GAAG,SAAS,CAMrB;AAMD,eAAO,MAAM,MAAM,SAkHf,CAAC"}
+{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../src/commands/create.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAKpC,OAAO,KAAK,CAAC,MAAM,gBAAgB,CAAC;AAWpC,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,UAAU,GAAG,SAAS,CAAC;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,kBAAkB,EAAE,OAAO,CAAC;CAC7B;AAED,eAAO,MAAM,gBAAgB,EAAE,eAAe,EA2K7C,CAAC;AAUF,wBAAsB,cAAc,CAAC,MAAM,EAAE;IAC3C,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC,MAAM,CAAC;IACzB,QAAQ,CAAC,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC;CAC9B,GAAG,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC,CAyElC;AAiCD,wBAAgB,6BAA6B,CAAC,MAAM,EAAE;IACpD,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB,GAAG,MAAM,GAAG,SAAS,CAMrB;AAkBD,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAKvD;AAED,eAAO,MAAM,MAAM,SAwMf,CAAC"}

package/dist/commands/create.js

@@ -1,65 +1,242 @@
 import { Command } from "commander";
 import chalk from "chalk";
 import { spawn } from "cross-spawn";
+import fs from "node:fs";
 import path from "node:path";
 import * as p from "@clack/prompts";
 import { logger } from "../lib/utils/logger.js";
-import { createFromExample } from "../lib/create-from-example.js";
-// Keep in sync with packages/create-assistant-ui/src/index.ts
-const templates = {
-    default: {
-        url: "https://github.com/assistant-ui/assistant-ui-starter",
+import { dlxCommand, downloadProject, resolveLatestReleaseRef, resolvePackageManagerName, transformProject, } from "../lib/create-project.js";
+export const PROJECT_METADATA = [
+    // Templates
+    {
+        name: "default",
         label: "Default",
-        hint: "Default template with Vercel AI SDK",
+        description: "Default template with Vercel AI SDK",
+        category: "template",
+        path: "templates/default",
+        hasLocalComponents: true,
     },
-    minimal: {
-        url: "https://github.com/assistant-ui/assistant-ui-starter-minimal",
+    {
+        name: "minimal",
         label: "Minimal",
-        hint: "Bare-bones starting point",
+        description: "Bare-bones starting point",
+        category: "template",
+        path: "templates/minimal",
+        hasLocalComponents: true,
     },
-    cloud: {
-        url: "https://github.com/assistant-ui/assistant-cloud-starter",
+    {
+        name: "cloud",
         label: "Cloud",
-        hint: "Cloud-backed persistence starter",
+        description: "Cloud-backed persistence starter",
+        category: "template",
+        path: "templates/cloud",
+        hasLocalComponents: true,
     },
-    "cloud-clerk": {
-        url: "https://github.com/assistant-ui/assistant-ui-starter-cloud-clerk",
+    {
+        name: "cloud-clerk",
         label: "Cloud + Clerk",
-        hint: "Cloud-backed starter with Clerk auth",
+        description: "Cloud-backed starter with Clerk auth",
+        category: "template",
+        path: "templates/cloud-clerk",
+        hasLocalComponents: true,
     },
-    langgraph: {
-        url: "https://github.com/assistant-ui/assistant-ui-starter-langgraph",
+    {
+        name: "langgraph",
         label: "LangGraph",
-        hint: "LangGraph starter template",
+        description: "LangGraph starter template",
+        category: "template",
+        path: "templates/langgraph",
+        hasLocalComponents: true,
     },
-    mcp: {
-        url: "https://github.com/assistant-ui/assistant-ui-starter-mcp",
+    {
+        name: "mcp",
         label: "MCP",
-        hint: "MCP starter template",
-    },
-};
-const templateNames = Object.keys(templates);
-const templatePickerOptions = templateNames.map((name) => ({
-    value: name,
-    label: templates[name].label,
-    hint: templates[name].hint,
-}));
-export async function resolveCreateTemplateName(params) {
-    const { template, stdinIsTTY = process.stdin.isTTY, select = p.select, isCancel = p.isCancel, } = params;
+        description: "MCP starter template",
+        category: "template",
+        path: "templates/mcp",
+        hasLocalComponents: true,
+    },
+    // Examples
+    {
+        name: "with-ag-ui",
+        label: "AG-UI",
+        description: "AG-UI protocol integration",
+        category: "example",
+        path: "examples/with-ag-ui",
+        hasLocalComponents: false,
+    },
+    {
+        name: "with-ai-sdk-v6",
+        label: "AI SDK v6",
+        description: "Vercel AI SDK v6",
+        category: "example",
+        path: "examples/with-ai-sdk-v6",
+        hasLocalComponents: false,
+    },
+    {
+        name: "with-artifacts",
+        label: "Artifacts",
+        description: "Artifact rendering",
+        category: "example",
+        path: "examples/with-artifacts",
+        hasLocalComponents: false,
+    },
+    {
+        name: "with-assistant-transport",
+        label: "Assistant Transport",
+        description: "Assistant transport protocol",
+        category: "example",
+        path: "examples/with-assistant-transport",
+        hasLocalComponents: false,
+    },
+    {
+        name: "with-chain-of-thought",
+        label: "Chain of Thought",
+        description: "Chain-of-thought rendering",
+        category: "example",
+        path: "examples/with-chain-of-thought",
+        hasLocalComponents: false,
+    },
+    {
+        name: "with-cloud",
+        label: "Cloud Example",
+        description: "Cloud integration example",
+        category: "example",
+        path: "examples/with-cloud",
+        hasLocalComponents: false,
+    },
+    {
+        name: "with-custom-thread-list",
+        label: "Custom Thread List",
+        description: "Custom thread list UI",
+        category: "example",
+        path: "examples/with-custom-thread-list",
+        hasLocalComponents: false,
+    },
+    {
+        name: "with-elevenlabs-scribe",
+        label: "ElevenLabs Scribe",
+        description: "Audio/speech integration",
+        category: "example",
+        path: "examples/with-elevenlabs-scribe",
+        hasLocalComponents: false,
+    },
+    {
+        name: "with-external-store",
+        label: "External Store",
+        description: "Custom message store",
+        category: "example",
+        path: "examples/with-external-store",
+        hasLocalComponents: false,
+    },
+    {
+        name: "with-ffmpeg",
+        label: "FFmpeg",
+        description: "File processing",
+        category: "example",
+        path: "examples/with-ffmpeg",
+        hasLocalComponents: false,
+    },
+    {
+        name: "with-langgraph",
+        label: "LangGraph Example",
+        description: "LangGraph integration",
+        category: "example",
+        path: "examples/with-langgraph",
+        hasLocalComponents: false,
+    },
+    {
+        name: "with-parent-id-grouping",
+        label: "Parent ID Grouping",
+        description: "Message grouping strategy",
+        category: "example",
+        path: "examples/with-parent-id-grouping",
+        hasLocalComponents: false,
+    },
+    {
+        name: "with-react-hook-form",
+        label: "React Hook Form",
+        description: "Form integration",
+        category: "example",
+        path: "examples/with-react-hook-form",
+        hasLocalComponents: false,
+    },
+    {
+        name: "with-react-router",
+        label: "React Router",
+        description: "React Router v7 + Vite",
+        category: "example",
+        path: "examples/with-react-router",
+        hasLocalComponents: false,
+    },
+    {
+        name: "with-tanstack",
+        label: "TanStack",
+        description: "TanStack/React Router + Vite",
+        category: "example",
+        path: "examples/with-tanstack",
+        hasLocalComponents: false,
+    },
+];
+const templateNames = PROJECT_METADATA.filter((m) => m.category === "template").map((m) => m.name);
+const exampleNames = PROJECT_METADATA.filter((m) => m.category === "example").map((m) => m.name);
+export async function resolveProject(params) {
+    const { template, example, stdinIsTTY = process.stdin.isTTY, select = p.select, isCancel = p.isCancel, } = params;
     if (template) {
-        return template;
+        const meta = PROJECT_METADATA.find((m) => m.name === template && m.category === "template");
+        if (!meta) {
+            logger.error(`Unknown template: ${template}`);
+            logger.info(`Available templates: ${templateNames.join(", ")}`);
+            process.exit(1);
+        }
+        return meta;
+    }
+    if (example) {
+        const meta = PROJECT_METADATA.find((m) => m.name === example && m.category === "example");
+        if (!meta) {
+            logger.error(`Unknown example: ${example}`);
+            logger.info(`Available examples: ${exampleNames.join(", ")}`);
+            process.exit(1);
+        }
+        return meta;
     }
     if (!stdinIsTTY) {
-        return "default";
+        return PROJECT_METADATA.find((m) => m.name === "default");
     }
     const selected = await select({
-        message: "Select a template:",
-        options: templatePickerOptions,
+        message: "Select a project to scaffold:",
+        options: [
+            {
+                value: "_separator",
+                label: "────── Starter Templates ──────",
+                disabled: true,
+            },
+            ...PROJECT_METADATA.filter((m) => m.category === "template").map((m) => ({
+                value: m.name,
+                label: m.label,
+                ...(m.description ? { hint: m.description } : {}),
+            })),
+            {
+                value: "_separator",
+                label: "────── Feature Examples ──────",
+                disabled: true,
+            },
+            ...PROJECT_METADATA.filter((m) => m.category === "example").map((m) => ({
+                value: m.name,
+                label: m.label,
+                ...(m.description ? { hint: m.description } : {}),
+            })),
+        ],
     });
     if (isCancel(selected)) {
         return null;
     }
-    return selected;
+    const meta = PROJECT_METADATA.find((m) => m.name === selected);
+    if (!meta) {
+        logger.error(`Unknown selection: ${String(selected)}`);
+        process.exit(1);
+    }
+    return meta;
 }
 class SpawnExitError extends Error {
     code;
@@ -85,24 +262,6 @@ async function runSpawn(command, args, cwd) {
         });
     });
 }
-export function buildCreateNextAppArgs(params) {
-    const { projectDirectory, useNpm, usePnpm, useYarn, useBun, skipInstall, templateUrl, } = params;
-    const args = ["create-next-app@latest"];
-    if (projectDirectory)
-        args.push(projectDirectory);
-    if (useNpm)
-        args.push("--use-npm");
-    if (usePnpm)
-        args.push("--use-pnpm");
-    if (useYarn)
-        args.push("--use-yarn");
-    if (useBun)
-        args.push("--use-bun");
-    if (skipInstall)
-        args.push("--skip-install");
-    args.push("-e", templateUrl);
-    return args;
-}
 export function resolveCreateProjectDirectory(params) {
     const { projectDirectory, stdinIsTTY = process.stdin.isTTY } = params;
     if (projectDirectory)
@@ -111,8 +270,23 @@ export function resolveCreateProjectDirectory(params) {
         return "my-aui-app";
     return undefined;
 }
-function buildPresetAddArgs(presetUrl) {
-    return ["shadcn@latest", "add", "--yes", presetUrl];
+function resolvePackageManager(opts) {
+    if (opts.useNpm)
+        return "npm";
+    if (opts.usePnpm)
+        return "pnpm";
+    if (opts.useYarn)
+        return "yarn";
+    if (opts.useBun)
+        return "bun";
+    return undefined;
+}
+const PLAYGROUND_PRESET_BASE_URL = "https://www.assistant-ui.com/playground/init";
+export function resolvePresetUrl(preset) {
+    if (preset.startsWith("http://") || preset.startsWith("https://")) {
+        return preset;
+    }
+    return `${PLAYGROUND_PRESET_BASE_URL}?preset=${encodeURIComponent(preset)}`;
 }
 export const create = new Command()
     .name("create")
@@ -120,80 +294,151 @@ export const create = new Command()
     .argument("[project-directory]")
     .usage(`${chalk.green("[project-directory]")} [options]`)
     .option("-t, --template <template>", `template to use (${templateNames.join(", ")})`)
-    .option("-e, --example <example>", "create from an example (e.g., with-langgraph, with-ai-sdk-v6)")
-    .option("-p, --preset <url>", "preset URL from playground (e.g., https://www.assistant-ui.com/playground/init?preset=chatgpt)")
+    .option("-e, --example <example>", `create from an example (${exampleNames.join(", ")})`)
+    .option("-p, --preset <name-or-url>", "preset name or URL (e.g., chatgpt or https://www.assistant-ui.com/playground/init?preset=chatgpt)")
     .option("--use-npm", "explicitly use npm")
     .option("--use-pnpm", "explicitly use pnpm")
     .option("--use-yarn", "explicitly use yarn")
     .option("--use-bun", "explicitly use bun")
     .option("--skip-install", "skip installing packages")
     .action(async (projectDirectory, opts) => {
-    const resolvedProjectDirectory = resolveCreateProjectDirectory({
-        projectDirectory,
-    });
     if (opts.example && opts.preset) {
         logger.error("Cannot use --preset with --example.");
         process.exit(1);
     }
-    if (opts.preset && !resolvedProjectDirectory) {
-        logger.error("Project directory is required when using --preset.");
+    if (opts.template && opts.example) {
+        logger.error("Cannot use both --template and --example.");
         process.exit(1);
     }
-    // Handle --example option
-    if (opts.example) {
-        if (!resolvedProjectDirectory) {
-            logger.error("Project directory is required when using --example");
+    // Start release ref resolution early (runs during user prompts)
+    const refPromise = resolveLatestReleaseRef();
+    // 1. Resolve project directory
+    let resolvedProjectDirectory = resolveCreateProjectDirectory({
+        projectDirectory,
+    });
+    if (!resolvedProjectDirectory) {
+        const result = await p.text({
+            message: "Project name:",
+            placeholder: "my-aui-app",
+            defaultValue: "my-aui-app",
+            validate: (value) => {
+                const name = (value ?? "").trim();
+                if (!name)
+                    return "Project name cannot be empty";
+                if (name === "." || name === "..")
+                    return "Project name cannot be . or ..";
+                if (name.includes("/") || name.includes("\\"))
+                    return "Project name cannot contain path separators";
+                return undefined;
+            },
+        });
+        if (p.isCancel(result)) {
+            p.cancel("Project creation cancelled.");
+            process.exit(0);
+        }
+        resolvedProjectDirectory = result;
+    }
+    // Check directory
+    const absoluteProjectDir = path.resolve(resolvedProjectDirectory);
+    try {
+        const files = fs.readdirSync(absoluteProjectDir);
+        if (files.length > 0) {
+            logger.error(`Directory ${resolvedProjectDirectory} already exists and is not empty`);
             process.exit(1);
         }
-        await createFromExample(resolvedProjectDirectory, opts.example, {
-            skipInstall: opts.skipInstall,
-            useNpm: opts.useNpm,
-            usePnpm: opts.usePnpm,
-            useYarn: opts.useYarn,
-            useBun: opts.useBun,
-        });
-        return;
     }
-    // Handle --template option
-    const templateName = await resolveCreateTemplateName({
+    catch (err) {
+        if (err.code === "ENOENT") {
+            // Directory doesn't exist — good, proceed
+        }
+        else if (err.code === "ENOTDIR") {
+            logger.error(`${resolvedProjectDirectory} already exists and is not a directory`);
+            process.exit(1);
+        }
+        else {
+            logger.error(`Cannot access ${resolvedProjectDirectory}: ${err.message}`);
+            process.exit(1);
+        }
+    }
+    // 2. Resolve scaffold target
+    const project = await resolveProject({
         template: opts.template,
+        example: opts.example,
     });
-    if (!templateName) {
+    if (!project) {
         p.cancel("Project creation cancelled.");
         process.exit(0);
     }
-    const templateUrl = templates[templateName]?.url;
-    if (!templateUrl) {
-        logger.error(`Unknown template: ${opts.template}`);
-        logger.info(`Available templates: ${templateNames.join(", ")}`);
-        process.exit(1);
-    }
-    logger.info(`Creating project with template: ${templateName}`);
+    logger.info(`Creating project from ${project.category}: ${project.label}`);
     logger.break();
-    const createNextAppArgs = buildCreateNextAppArgs({
-        ...(resolvedProjectDirectory
-            ? { projectDirectory: resolvedProjectDirectory }
-            : {}),
-        ...(opts.useNpm ? { useNpm: true } : {}),
-        ...(opts.usePnpm ? { usePnpm: true } : {}),
-        ...(opts.useYarn ? { useYarn: true } : {}),
-        ...(opts.useBun ? { useBun: true } : {}),
-        ...(opts.skipInstall ? { skipInstall: true } : {}),
-        templateUrl,
-    });
+    const pm = await resolvePackageManagerName(absoluteProjectDir, resolvePackageManager(opts));
+    // Clean up partial project directory on unexpected exit (e.g. Ctrl+C)
+    const cleanupOnExit = () => {
+        fs.rmSync(absoluteProjectDir, { recursive: true, force: true });
+    };
+    process.once("exit", cleanupOnExit);
     try {
-        await runSpawn("npx", createNextAppArgs);
-        if (opts.preset) {
-            if (!resolvedProjectDirectory) {
-                logger.error("Project directory is required when using --preset.");
-                process.exit(1);
+        // 3. Resolve latest release ref (started before prompts)
+        logger.step("Resolving latest release...");
+        const ref = await refPromise;
+        if (!ref) {
+            logger.warn("Could not resolve latest release, downloading from HEAD");
+        }
+        // 4. Download project
+        logger.step("Downloading project...");
+        try {
+            await downloadProject(project.path, absoluteProjectDir, ref);
+            // If the template didn't exist at the release tag, retry from HEAD
+            if (ref &&
+                !fs.existsSync(path.join(absoluteProjectDir, "package.json"))) {
+                fs.rmSync(absoluteProjectDir, { recursive: true, force: true });
+                logger.warn("Template not found at release tag, downloading from HEAD");
+                await downloadProject(project.path, absoluteProjectDir);
             }
+            // 5. Run transform pipeline
+            await transformProject(absoluteProjectDir, {
+                hasLocalComponents: project.hasLocalComponents,
+                skipInstall: opts.skipInstall,
+                packageManager: pm,
+            });
+        }
+        catch (err) {
+            // Clean up partially created project directory
+            fs.rmSync(absoluteProjectDir, { recursive: true, force: true });
+            throw err;
+        }
+        // 6. Apply preset if provided
+        if (opts.preset) {
+            const presetUrl = resolvePresetUrl(opts.preset);
             logger.info("Applying preset configuration...");
             logger.break();
-            await runSpawn("npx", buildPresetAddArgs(opts.preset), path.resolve(process.cwd(), resolvedProjectDirectory));
+            const [dlxCmd, dlxArgs] = dlxCommand(pm);
+            try {
+                await runSpawn(dlxCmd, [
+                    ...dlxArgs,
+                    "shadcn@latest",
+                    "add",
+                    "--yes",
+                    "--overwrite",
+                    presetUrl,
+                ], absoluteProjectDir);
+            }
+            catch {
+                logger.warn(`Preset application failed. You can retry manually with:\n  ${dlxCmd} ${[...dlxArgs, "shadcn@latest", "add", presetUrl].join(" ")}`);
+            }
         }
+        process.removeListener("exit", cleanupOnExit);
         logger.break();
         logger.success("Project created successfully!");
+        logger.break();
+        const runCmd = pm === "npm" ? "npm run" : pm;
+        logger.info("Next steps:");
+        logger.info(`  cd ${resolvedProjectDirectory}`);
+        if (opts.skipInstall) {
+            logger.info(`  ${pm} install`);
+        }
+        logger.info("  # Set up your environment variables in .env.local");
+        logger.info(`  ${runCmd} dev`);
     }
     catch (error) {
         if (error instanceof SpawnExitError) {