assistant-ui 0.0.90 → 0.0.92

package/src/commands/add.ts

@@ -1,10 +1,49 @@
 import { Command } from "commander";
-import { spawn } from "cross-spawn";
 import { logger } from "../lib/utils/logger";
 import { hasConfig } from "../lib/utils/config";
+import {
+  dlxCommand,
+  resolvePackageManager,
+  resolvePackageManagerForCwd,
+  type PackageManagerName,
+} from "../lib/create-project";
+import { runSpawn, SpawnExitError } from "../lib/run-spawn";
 
 const REGISTRY_BASE_URL = "https://r.assistant-ui.com";
 
+export interface AddComponentsPlan {
+  command: string;
+  args: string[];
+}
+
+export function createAddComponentsPlan(params: {
+  components: string[];
+  packageManager: PackageManagerName;
+  yes?: boolean;
+  overwrite?: boolean;
+  cwd?: string;
+  path?: string;
+}): AddComponentsPlan {
+  const componentsToAdd = params.components.map((c) => {
+    if (!/^[a-zA-Z0-9-/]+$/.test(c)) {
+      throw new Error(`Invalid component name: ${c}`);
+    }
+    return `${REGISTRY_BASE_URL}/${encodeURIComponent(c)}.json`;
+  });
+
+  const [command, dlxArgs] = dlxCommand(params.packageManager);
+  const args = [...dlxArgs, "shadcn@latest", "add", ...componentsToAdd];
+
+  // For npm, dlxArgs may already include `--yes` for npx auto-install.
+  // This flag is for shadcn's own confirmation prompt.
+  if (params.yes) args.push("--yes");
+  if (params.overwrite) args.push("--overwrite");
+  if (params.cwd) args.push("--cwd", params.cwd);
+  if (params.path) args.push("--path", params.path);
+
+  return { command, args };
+}
+
 export const add = new Command()
   .name("add")
   .description("add a component to your project")
@@ -17,7 +56,11 @@ export const add = new Command()
     process.cwd(),
   )
   .option("-p, --path <path>", "the path to add the component to.")
-  .action((components: string[], opts) => {
+  .option("--use-npm", "explicitly use npm")
+  .option("--use-pnpm", "explicitly use pnpm")
+  .option("--use-yarn", "explicitly use yarn")
+  .option("--use-bun", "explicitly use bun")
+  .action(async (components: string[], opts) => {
     // Check if project is initialized
     if (!hasConfig(opts.cwd)) {
       logger.warn(
@@ -26,38 +69,32 @@ export const add = new Command()
       logger.break();
     }
 
-    const componentsToAdd = components.map((c) => {
-      if (!/^[a-zA-Z0-9-/]+$/.test(c)) {
-        throw new Error(`Invalid component name: ${c}`);
-      }
-      return `${REGISTRY_BASE_URL}/${encodeURIComponent(c)}.json`;
-    });
-
     logger.step(`Adding ${components.length} component(s)...`);
 
-    const args = [`shadcn@latest`, "add", ...componentsToAdd];
-
-    if (opts.yes) args.push("--yes");
-    if (opts.overwrite) args.push("--overwrite");
-    if (opts.cwd) args.push("--cwd", opts.cwd);
-    if (opts.path) args.push("--path", opts.path);
-
-    const child = spawn("npx", args, {
-      stdio: "inherit",
-      shell: true,
+    const packageManager = await resolvePackageManagerForCwd(
+      opts.cwd,
+      resolvePackageManager(opts),
+    );
+    const { command, args } = createAddComponentsPlan({
+      components,
+      packageManager,
+      yes: opts.yes,
+      overwrite: opts.overwrite,
+      cwd: opts.cwd,
+      path: opts.path,
     });
 
-    child.on("error", (error) => {
-      logger.error(`Failed to add components: ${error.message}`);
+    try {
+      await runSpawn(command, args, opts.cwd);
+    } catch (error) {
+      if (error instanceof SpawnExitError) {
+        logger.error(`Process exited with code ${error.code}`);
+        process.exit(error.code);
+      }
+      const message = error instanceof Error ? error.message : String(error);
+      logger.error(`Failed to add components: ${message}`);
       process.exit(1);
-    });
+    }
 
-    child.on("close", (code) => {
-      if (code !== 0) {
-        logger.error(`Process exited with code ${code}`);
-        process.exit(code || 1);
-      } else {
-        logger.success("Components added successfully!");
-      }
-    });
+    logger.success("Components added successfully!");
   });

package/src/commands/create.ts

@@ -1,6 +1,5 @@
-import { Command } from "commander";
+import { Command, Option } 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";
@@ -9,10 +8,12 @@ import {
   dlxCommand,
   downloadProject,
   resolveLatestReleaseRef,
-  resolvePackageManagerName,
+  resolvePackageManager,
+  resolvePackageManagerForCwd,
+  scaffoldProject,
   transformProject,
-  type PackageManagerName,
 } from "../lib/create-project";
+import { runSpawn, SpawnExitError } from "../lib/run-spawn";
 
 export interface ProjectMetadata {
   name: string;
@@ -31,7 +32,7 @@ export const PROJECT_METADATA: ProjectMetadata[] = [
     description: "Default template with Vercel AI SDK",
     category: "template",
     path: "templates/default",
-    hasLocalComponents: true,
+    hasLocalComponents: false,
   },
   {
     name: "minimal",
@@ -47,7 +48,7 @@ export const PROJECT_METADATA: ProjectMetadata[] = [
     description: "Cloud-backed persistence starter",
     category: "template",
     path: "templates/cloud",
-    hasLocalComponents: true,
+    hasLocalComponents: false,
   },
   {
     name: "cloud-clerk",
@@ -55,7 +56,7 @@ export const PROJECT_METADATA: ProjectMetadata[] = [
     description: "Cloud-backed starter with Clerk auth",
     category: "template",
     path: "templates/cloud-clerk",
-    hasLocalComponents: true,
+    hasLocalComponents: false,
   },
   {
     name: "langgraph",
@@ -63,15 +64,15 @@ export const PROJECT_METADATA: ProjectMetadata[] = [
     description: "LangGraph starter template",
     category: "template",
     path: "templates/langgraph",
-    hasLocalComponents: true,
+    hasLocalComponents: false,
   },
   {
     name: "mcp",
     label: "MCP",
-    description: "MCP starter template",
+    description: "MCP tools + MCP Apps renderer starter",
     category: "template",
     path: "templates/mcp",
-    hasLocalComponents: true,
+    hasLocalComponents: false,
   },
   // Examples
   {
@@ -276,7 +277,7 @@ export async function resolveProject(params: {
     isCancel = p.isCancel,
   } = params;
 
-  if (template) {
+  if (template !== undefined) {
     const meta = PROJECT_METADATA.find(
       (m) => m.name === template && m.category === "template",
     );
@@ -288,7 +289,7 @@ export async function resolveProject(params: {
     return meta;
   }
 
-  if (example) {
+  if (example !== undefined) {
     const meta = PROJECT_METADATA.find(
       (m) => m.name === example && m.category === "example",
     );
@@ -342,37 +343,6 @@ export async function resolveProject(params: {
   return meta;
 }
 
-class SpawnExitError extends Error {
-  code: number;
-
-  constructor(code: number) {
-    super(`Process exited with code ${code}`);
-    this.code = code;
-  }
-}
-
-async function runSpawn(
-  command: string,
-  args: string[],
-  cwd?: string,
-): Promise<void> {
-  return new Promise((resolve, reject) => {
-    const child = spawn(command, args, {
-      stdio: "inherit",
-      cwd,
-    });
-
-    child.on("error", (error) => reject(error));
-    child.on("close", (code) => {
-      if (code !== 0) {
-        reject(new SpawnExitError(code || 1));
-      } else {
-        resolve();
-      }
-    });
-  });
-}
-
 export function resolveCreateProjectDirectory(params: {
   projectDirectory?: string;
   stdinIsTTY?: boolean;
@@ -384,19 +354,6 @@ export function resolveCreateProjectDirectory(params: {
   return undefined;
 }
 
-export function resolvePackageManager(opts: {
-  useNpm?: boolean;
-  usePnpm?: boolean;
-  useYarn?: boolean;
-  useBun?: boolean;
-}): PackageManagerName | undefined {
-  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";
 
@@ -407,6 +364,68 @@ export function resolvePresetUrl(preset: string): string {
   return `${PLAYGROUND_PRESET_BASE_URL}?preset=${encodeURIComponent(preset)}`;
 }
 
+export interface ScaffoldSelectorOptions {
+  template?: string;
+  example?: string;
+  preset?: string;
+  native?: boolean;
+  ink?: boolean;
+}
+
+export interface ResolvedScaffoldSelector {
+  template?: string;
+  example?: string;
+  preset?: string;
+}
+
+const scaffoldSelectorHelp =
+  "Choose one scaffold selector: --template <name>, --example <name>, --native, or --ink. --preset <name-or-url> can be used with --template or by itself.";
+
+function getPresetConflict(opts: ScaffoldSelectorOptions): string | undefined {
+  if (opts.example !== undefined) return "--example";
+  if (opts.native) return "--native";
+  if (opts.ink) return "--ink";
+  return undefined;
+}
+
+export function resolveScaffoldSelector(
+  opts: ScaffoldSelectorOptions,
+): ResolvedScaffoldSelector {
+  const hasPreset = opts.preset !== undefined;
+  const presetConflict = getPresetConflict(opts);
+  const selectors = [
+    opts.template !== undefined ? "--template" : undefined,
+    opts.example !== undefined ? "--example" : undefined,
+    opts.native ? "--native" : undefined,
+    opts.ink ? "--ink" : undefined,
+  ].filter((selector): selector is string => selector !== undefined);
+
+  if (selectors.length > 1) {
+    throw new Error(
+      `Only one scaffold selector can be provided (${selectors.join(", ")}). ${scaffoldSelectorHelp}`,
+    );
+  }
+
+  if (hasPreset && presetConflict) {
+    throw new Error(
+      `Cannot use --preset with ${presetConflict}. ${scaffoldSelectorHelp}`,
+    );
+  }
+
+  if (opts.native) return { example: "with-expo" };
+  if (opts.ink) return { example: "with-react-ink" };
+
+  if (opts.preset !== undefined && opts.template === undefined) {
+    return { template: "default", preset: opts.preset };
+  }
+
+  return {
+    ...(opts.template !== undefined && { template: opts.template }),
+    ...(opts.example !== undefined && { example: opts.example }),
+    ...(hasPreset && { preset: opts.preset }),
+  };
+}
+
 export const create = new Command()
   .name("create")
   .description("create a new project")
@@ -431,27 +450,30 @@ export const create = new Command()
   .option("--native", "create an Expo / React Native project")
   .option("--ink", "create a React Ink terminal project")
   .option("--skip-install", "skip installing packages")
+  .addOption(
+    new Option(
+      "--debug-source-root <path>",
+      "copy templates/examples from a local assistant-ui repo root",
+    ).hideHelp(),
+  )
   .action(async (projectDirectory, opts) => {
-    if (opts.native) {
-      opts.example = "with-expo";
-    }
-
-    if (opts.ink) {
-      opts.example = "with-react-ink";
-    }
-
-    if (opts.example && opts.preset) {
-      logger.error("Cannot use --preset with --example.");
+    let scaffoldSelector: ResolvedScaffoldSelector;
+    try {
+      scaffoldSelector = resolveScaffoldSelector(opts);
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      logger.error(message);
       process.exit(1);
     }
 
-    if (opts.template && opts.example) {
-      logger.error("Cannot use both --template and --example.");
-      process.exit(1);
-    }
+    const localSourceRoot = opts.debugSourceRoot
+      ? path.resolve(opts.debugSourceRoot)
+      : undefined;
 
     // Start release ref resolution early (runs during user prompts)
-    const refPromise = resolveLatestReleaseRef();
+    const refPromise = localSourceRoot
+      ? Promise.resolve(undefined)
+      : resolveLatestReleaseRef();
 
     // 1. Resolve project directory
     let resolvedProjectDirectory = resolveCreateProjectDirectory({
@@ -510,10 +532,7 @@ export const create = new Command()
     }
 
     // 2. Resolve scaffold target
-    const project = await resolveProject({
-      template: opts.template,
-      example: opts.example,
-    });
+    const project = await resolveProject(scaffoldSelector);
     if (!project) {
       p.cancel("Project creation cancelled.");
       process.exit(0);
@@ -522,8 +541,8 @@ export const create = new Command()
     logger.info(`Creating project from ${project.category}: ${project.label}`);
     logger.break();
 
-    const pm = await resolvePackageManagerName(
-      absoluteProjectDir,
+    const pm = await resolvePackageManagerForCwd(
+      path.dirname(absoluteProjectDir),
       resolvePackageManager(opts),
     );
 
@@ -535,19 +554,32 @@ export const create = new Command()
 
     try {
       // 3. Resolve latest release ref (started before prompts)
-      logger.step("Resolving latest release...");
+      if (!localSourceRoot) {
+        logger.step("Resolving latest release...");
+      }
       const ref = await refPromise;
-      if (!ref) {
+      if (!localSourceRoot && !ref) {
         logger.warn("Could not resolve latest release, downloading from HEAD");
       }
 
-      // 4. Download project
-      logger.step("Downloading project...");
+      // 4. Scaffold project
+      logger.step(
+        localSourceRoot
+          ? `Copying project from local source: ${localSourceRoot}`
+          : "Downloading project...",
+      );
       try {
-        await downloadProject(project.path, absoluteProjectDir, ref);
+        const source = localSourceRoot
+          ? { kind: "local" as const, rootDir: localSourceRoot }
+          : {
+              kind: "github" as const,
+              ref,
+            };
+        await scaffoldProject(project.path, absoluteProjectDir, source);
 
         // If the template didn't exist at the release tag, retry from HEAD
         if (
+          !localSourceRoot &&
           ref &&
           !fs.existsSync(path.join(absoluteProjectDir, "package.json"))
         ) {
@@ -571,8 +603,8 @@ export const create = new Command()
       }
 
       // 6. Apply preset if provided
-      if (opts.preset) {
-        const presetUrl = resolvePresetUrl(opts.preset);
+      if (scaffoldSelector.preset) {
+        const presetUrl = resolvePresetUrl(scaffoldSelector.preset);
         logger.info("Applying preset configuration...");
         logger.break();
         const [dlxCmd, dlxArgs] = dlxCommand(pm);

package/src/commands/init.ts

@@ -1,23 +1,18 @@
 import { Command, Option } from "commander";
-import { spawn } from "cross-spawn";
 import fs from "node:fs";
 import path from "node:path";
-import { dlxCommand, resolvePackageManagerName } from "../lib/create-project";
+import {
+  dlxCommand,
+  resolvePackageManager,
+  resolvePackageManagerForCwd,
+} from "../lib/create-project";
+import { runSpawn, SpawnExitError } from "../lib/run-spawn";
 import { logger } from "../lib/utils/logger";
-import { create, resolvePackageManager } from "./create";
+import { create } from "./create";
 
 const DEFAULT_REGISTRY_URL =
   "https://r.assistant-ui.com/chat/b/ai-sdk-quick-start/json";
 
-class SpawnExitError extends Error {
-  code: number;
-
-  constructor(code: number) {
-    super(`Process exited with code ${code}`);
-    this.code = code;
-  }
-}
-
 interface ExistingProjectInitPlan {
   initArgs: string[] | null;
   addArgs: string[];
@@ -52,31 +47,6 @@ export function isNonInteractiveShell(
   return !stdinIsTTY;
 }
 
-async function runSpawn(
-  command: string,
-  args: string[],
-  cwd: string,
-): Promise<void> {
-  return new Promise((resolve, reject) => {
-    const child = spawn(command, args, {
-      stdio: "inherit",
-      cwd,
-    });
-
-    child.on("error", (error) => {
-      reject(error);
-    });
-
-    child.on("close", (code) => {
-      if (code !== 0) {
-        reject(new SpawnExitError(code || 1));
-      } else {
-        resolve();
-      }
-    });
-  });
-}
-
 export const init = new Command()
   .name("init")
   .description("initialize assistant-ui in an existing project")
@@ -152,11 +122,8 @@ export const init = new Command()
     }
 
     try {
-      // resolvePackageManagerName calls detect({ cwd: path.dirname(dir) }),
-      // which is designed for `create` where the dir doesn't exist yet.
-      // For init, targetDir IS the project root, so append a dummy segment.
-      const pm = await resolvePackageManagerName(
-        path.join(targetDir, "_"),
+      const pm = await resolvePackageManagerForCwd(
+        targetDir,
         resolvePackageManager(opts),
       );
       const [dlxCmd, dlxArgs] = dlxCommand(pm);