assistant-ui 0.0.105 → 0.0.107

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "assistant-ui",
-  "version": "0.0.105",
+  "version": "0.0.107",
   "description": "CLI for assistant-ui",
   "keywords": [
     "cli",
@@ -26,27 +26,30 @@
   ],
   "sideEffects": false,
   "dependencies": {
-    "@clack/prompts": "^1.6.0",
+    "@clack/prompts": "^1.7.0",
     "chalk": "^5.6.2",
     "cli-progress": "^3.12.0",
     "commander": "^15.0.0",
     "cross-spawn": "^7.0.6",
     "debug": "^4.4.3",
     "detect-package-manager": "^3.0.2",
-    "giget": "^3.3.0",
+    "giget": "^3.3.1",
     "glob": "^13.0.6",
-    "jscodeshift": "^17.3.0",
-    "@assistant-ui/agent-launcher": "0.1.8"
+    "jscodeshift": "^17.4.0",
+    "jsonc-parser": "^3.3.1",
+    "semver": "^7.8.5",
+    "@assistant-ui/agent-launcher": "0.1.9"
   },
   "devDependencies": {
     "@types/cli-progress": "^3.11.6",
     "@types/cross-spawn": "^6.0.6",
     "@types/debug": "^4.1.13",
     "@types/jscodeshift": "^17.3.0",
-    "@types/node": "^26.0.0",
-    "@vitest/coverage-v8": "^4.1.9",
-    "vitest": "^4.1.9",
-    "@assistant-ui/x-buildutils": "0.0.17"
+    "@types/node": "^26.1.1",
+    "@types/semver": "^7.7.1",
+    "@vitest/coverage-v8": "^4.1.10",
+    "vitest": "^4.1.10",
+    "@assistant-ui/x-buildutils": "0.0.19"
   },
   "publishConfig": {
     "access": "public",

package/plugin/skills/assistant-ui/SKILL.md

@@ -24,20 +24,39 @@ This initializes shadcn and installs the default assistant-ui chat components.
 Install components via the shadcn registry:
 
 ```bash
-npx shadcn@latest add "https://r.assistant-ui.com/chat/b/ai-sdk-quick-start/json"
+npx shadcn@latest add "https://r.assistant-ui.com/base/chat/b/ai-sdk-quick-start/json"
 ```
 
+For Radix-styled projects (`components.json` style not starting with `base-`), use `https://r.assistant-ui.com/chat/b/ai-sdk-quick-start/json` instead.
+
 Available component presets:
 
 | Preset | Registry URL |
 |--------|-------------|
-| AI SDK Quick Start | `https://r.assistant-ui.com/chat/b/ai-sdk-quick-start/json` |
+| AI SDK Quick Start | `https://r.assistant-ui.com/base/chat/b/ai-sdk-quick-start/json` |
+
+You can also add individual assistant-ui components with the assistant-ui CLI, which picks the right flavor from `components.json`:
+
+```bash
+npx assistant-ui add thread
+npx assistant-ui add markdown-text
+```
+
+To use the shadcn CLI directly instead, add the assistant-ui registry to `components.json`:
+
+```json
+{
+  "registries": {
+    "@assistant-ui": "https://r.assistant-ui.com/styles/{style}/{name}.json"
+  }
+}
+```
 
-You can also add individual assistant-ui shadcn components:
+Then add components with the namespaced form:
 
 ```bash
-npx shadcn@latest add assistant-ui/thread
-npx shadcn@latest add assistant-ui/markdown-text
+npx shadcn@latest add @assistant-ui/thread
+npx shadcn@latest add @assistant-ui/markdown-text
 ```
 
 ## Step 3: Runtime Setup

package/src/commands/add.ts

@@ -1,6 +1,10 @@
 import { Command } from "commander";
 import { logger } from "../lib/utils/logger";
 import { hasConfig } from "../lib/utils/config";
+import {
+  getComponentsJsonStyle,
+  resolveRegistryItemUrl,
+} from "../lib/utils/registry";
 import {
   dlxCommand,
   resolvePackageManager,
@@ -9,8 +13,6 @@ import {
 } 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[];
@@ -23,12 +25,13 @@ export function createAddComponentsPlan(params: {
   overwrite?: boolean;
   cwd?: string;
   path?: string;
+  style?: 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`;
+    return resolveRegistryItemUrl(c, params.style);
   });
 
   const [command, dlxArgs] = dlxCommand(params.packageManager);
@@ -64,7 +67,7 @@ export const add = new Command()
     // Check if project is initialized
     if (!hasConfig(opts.cwd)) {
       logger.warn(
-        "It looks like you haven't initialized your project yet. Run 'assistant-ui init' first.",
+        "It looks like you haven't initialized your project yet — defaulting to Base UI flavored components. Run 'assistant-ui init' first for a configured setup.",
       );
       logger.break();
     }
@@ -75,6 +78,7 @@ export const add = new Command()
       opts.cwd,
       resolvePackageManager(opts),
     );
+    const style = getComponentsJsonStyle(opts.cwd);
     const { command, args } = createAddComponentsPlan({
       components,
       packageManager,
@@ -82,6 +86,7 @@ export const add = new Command()
       overwrite: opts.overwrite,
       cwd: opts.cwd,
       path: opts.path,
+      ...(style === undefined ? {} : { style }),
     });
 
     try {

package/src/commands/create.ts

@@ -12,6 +12,7 @@ import {
   resolvePackageManagerForCwd,
   scaffoldProject,
   transformProject,
+  type TransformResult,
 } from "../lib/create-project";
 import { runSpawn, SpawnExitError } from "../lib/run-spawn";
 import {
@@ -104,11 +105,11 @@ export const PROJECT_METADATA: ProjectMetadata[] = [
     hasLocalComponents: false,
   },
   {
-    name: "with-ai-sdk-v6",
-    label: "AI SDK v6",
-    description: "Vercel AI SDK v6",
+    name: "with-ai-sdk-v7",
+    label: "AI SDK v7",
+    description: "Vercel AI SDK v7",
     category: "example",
-    path: "examples/with-ai-sdk-v6",
+    path: "examples/with-ai-sdk-v7",
     hasLocalComponents: false,
   },
   {
@@ -165,7 +166,7 @@ export const PROJECT_METADATA: ProjectMetadata[] = [
     description: "Realtime voice with ElevenLabs",
     category: "example",
     path: "examples/with-elevenlabs-conversational",
-    hasLocalComponents: true,
+    hasLocalComponents: false,
   },
   {
     name: "with-elevenlabs-scribe",
@@ -181,7 +182,7 @@ export const PROJECT_METADATA: ProjectMetadata[] = [
     description: "Realtime voice with LiveKit",
     category: "example",
     path: "examples/with-livekit",
-    hasLocalComponents: true,
+    hasLocalComponents: false,
   },
   {
     name: "with-expo",
@@ -197,7 +198,7 @@ export const PROJECT_METADATA: ProjectMetadata[] = [
     description: "AI-driven interactive UI components",
     category: "example",
     path: "examples/with-interactables",
-    hasLocalComponents: true,
+    hasLocalComponents: false,
   },
   {
     name: "with-external-store",
@@ -255,6 +256,14 @@ export const PROJECT_METADATA: ProjectMetadata[] = [
     path: "examples/with-tanstack",
     hasLocalComponents: false,
   },
+  {
+    name: "with-resumable-stream",
+    label: "Resumable Stream",
+    description: "Resumable LLM stream that survives reload mid-response",
+    category: "example",
+    path: "examples/with-resumable-stream",
+    hasLocalComponents: false,
+  },
 ];
 
 // Examples that exist in the monorepo but are intentionally excluded from the CLI:
@@ -601,6 +610,7 @@ export const create = new Command()
           ? `Copying project from local source: ${localSourceRoot}`
           : "Downloading project...",
       );
+      let transformResult: TransformResult;
       try {
         const source = localSourceRoot
           ? { kind: "local" as const, rootDir: localSourceRoot }
@@ -624,7 +634,7 @@ export const create = new Command()
         }
 
         // 5. Run transform pipeline
-        await transformProject(absoluteProjectDir, {
+        transformResult = await transformProject(absoluteProjectDir, {
           hasLocalComponents: project.hasLocalComponents,
           skipInstall: opts.skipInstall,
           packageManager: pm,
@@ -649,6 +659,16 @@ export const create = new Command()
         throw err;
       }
 
+      if (transformResult.registryInstallFailure) {
+        process.removeListener("exit", cleanupOnExit);
+        logger.break();
+        logger.error("Project created with missing components.");
+        logger.info("Retry the component install with:");
+        logger.info(`  cd ${resolvedProjectDirectory}`);
+        logger.info(`  ${transformResult.registryInstallFailure.retryCommand}`);
+        process.exit(1);
+      }
+
       // 6. Apply preset if provided
       if (scaffoldSelector.preset) {
         const presetUrl = resolvePresetUrl(scaffoldSelector.preset);

package/src/commands/doctor.ts

@@ -2,6 +2,8 @@ import { Command } from "commander";
 import * as fs from "node:fs";
 import * as path from "node:path";
 import chalk from "chalk";
+import { compare, valid } from "semver";
+import { findWorkspaceRoot, resolveRealPath } from "../lib/utils/workspace";
 
 const ASSISTANT_UI_PACKAGE_NAMES = new Set([
   "assistant-stream",
@@ -38,13 +40,7 @@ function processPackageDir(
   results: DiscoveredPackage[],
   visited: ProcessedDir,
 ): void {
-  const real = (() => {
-    try {
-      return fs.realpathSync(pkgDir);
-    } catch {
-      return pkgDir;
-    }
-  })();
+  const real = resolveRealPath(pkgDir);
   if (visited.set.has(real)) return;
   visited.set.add(real);
 
@@ -106,13 +102,99 @@ function walkNodeModulesAt(
   }
 }
 
+// pnpm keeps every real package dir in the `.pnpm` virtual store as
+// `node_modules/.pnpm/<pkg>@<ver>[_<peerhash>]/node_modules/<pkg>` and never
+// nests a package's deps inside its own dir, so the hoisted-layout walk above
+// only ever reaches the project's direct deps. The store dir name encodes the
+// package, so filtering by a tracked prefix keeps this pass O(tracked entries).
+const TRACKED_PNPM_ENTRY_PREFIXES = [
+  "@assistant-ui+",
+  "assistant-ui@",
+  "assistant-stream@",
+  "assistant-cloud@",
+];
+
+function isTrackedPnpmEntry(dirName: string): boolean {
+  return TRACKED_PNPM_ENTRY_PREFIXES.some((p) => dirName.startsWith(p));
+}
+
+function processTrackedPackagesIn(
+  nm: string,
+  results: DiscoveredPackage[],
+  visited: ProcessedDir,
+): void {
+  let entries: fs.Dirent[];
+  try {
+    entries = fs.readdirSync(nm, { withFileTypes: true });
+  } catch {
+    return;
+  }
+
+  for (const entry of entries) {
+    if (entry.name.startsWith(".")) continue;
+    if (!entry.isDirectory() && !entry.isSymbolicLink()) continue;
+
+    if (entry.name.startsWith("@")) {
+      const scopeDir = path.join(nm, entry.name);
+      let scoped: fs.Dirent[];
+      try {
+        scoped = fs.readdirSync(scopeDir, { withFileTypes: true });
+      } catch {
+        continue;
+      }
+      for (const s of scoped) {
+        if (!s.isDirectory() && !s.isSymbolicLink()) continue;
+        if (!isTrackedPackage(`${entry.name}/${s.name}`)) continue;
+        processPackageDir(path.join(scopeDir, s.name), results, visited);
+      }
+    } else if (isTrackedPackage(entry.name)) {
+      processPackageDir(path.join(nm, entry.name), results, visited);
+    }
+  }
+}
+
+function walkPnpmStore(
+  cwd: string,
+  results: DiscoveredPackage[],
+  visited: ProcessedDir,
+): void {
+  const storeDir = path.join(cwd, "node_modules", ".pnpm");
+  let entries: fs.Dirent[];
+  try {
+    entries = fs.readdirSync(storeDir, { withFileTypes: true });
+  } catch {
+    return;
+  }
+
+  for (const entry of entries) {
+    if (!entry.isDirectory() && !entry.isSymbolicLink()) continue;
+    if (!isTrackedPnpmEntry(entry.name)) continue;
+    processTrackedPackagesIn(
+      path.join(storeDir, entry.name, "node_modules"),
+      results,
+      visited,
+    );
+  }
+}
+
 // Discover every installation of an assistant-ui-family package reachable
-// from `cwd`. Recurses into nested node_modules so transitive copies
-// (the real source of duplicate-version bugs) are not missed.
+// from `cwd`. Node resolves packages through ancestor node_modules directories,
+// so inspect each level to include workspace-hoisted installs. Nested installs
+// and pnpm virtual stores are scanned to catch duplicate transitive copies.
 export function discoverInstalledPackages(cwd: string): DiscoveredPackage[] {
   const results: DiscoveredPackage[] = [];
   const visited: ProcessedDir = { set: new Set() };
-  walkNodeModulesAt(cwd, results, visited);
+  let dir = resolveRealPath(cwd);
+  const scanRoot = findWorkspaceRoot(dir) ?? dir;
+
+  while (true) {
+    walkNodeModulesAt(dir, results, visited);
+    walkPnpmStore(dir, results, visited);
+
+    if (dir === scanRoot) break;
+    dir = path.dirname(dir);
+  }
+
   return results;
 }
 
@@ -177,40 +259,11 @@ async function fetchAllLatestVersions(
   return new Map(entries);
 }
 
-interface SemverParts {
-  major: number;
-  minor: number;
-  patch: number;
-  prerelease: string;
-}
-
-function parseSemver(v: string): SemverParts | null {
-  const m = /^(\d+)\.(\d+)\.(\d+)(?:-([^+\s]+))?/.exec(v);
-  if (!m) return null;
-  return {
-    major: parseInt(m[1]!, 10),
-    minor: parseInt(m[2]!, 10),
-    patch: parseInt(m[3]!, 10),
-    prerelease: m[4] ?? "",
-  };
-}
-
 export function compareSemver(a: string, b: string): number {
-  const pa = parseSemver(a);
-  const pb = parseSemver(b);
-  if (!pa || !pb) return a.localeCompare(b);
-  if (pa.major !== pb.major) return pa.major - pb.major;
-  if (pa.minor !== pb.minor) return pa.minor - pb.minor;
-  if (pa.patch !== pb.patch) return pa.patch - pb.patch;
-
-  // Per SemVer §11: a version with a prerelease tag is *less than* the
-  // same x.y.z without one. We compare tags lexically for a stable
-  // ordering across prereleases — good enough for doctor's "is X older
-  // than the npm latest" check.
-  if (pa.prerelease === pb.prerelease) return 0;
-  if (!pa.prerelease) return 1;
-  if (!pb.prerelease) return -1;
-  return pa.prerelease.localeCompare(pb.prerelease);
+  const validA = valid(a);
+  const validB = valid(b);
+  if (!validA || !validB) return a.localeCompare(b);
+  return compare(validA, validB);
 }
 
 export interface OutdatedPackage {
@@ -320,7 +373,7 @@ export const doctor = new Command()
   )
   .option("--no-network", "Skip the npm registry check for latest versions.")
   .action(async (opts: { cwd: string; network: boolean }) => {
-    const cwd = path.resolve(opts.cwd);
+    const cwd = resolveRealPath(opts.cwd);
     const packageJsonPath = path.join(cwd, "package.json");
 
     if (!fs.existsSync(packageJsonPath)) {

package/src/commands/info.ts

@@ -5,6 +5,10 @@ import * as path from "node:path";
 import { spawnSync } from "node:child_process";
 import chalk from "chalk";
 import { detect } from "detect-package-manager";
+import { satisfies } from "semver";
+import { findWorkspaceRoot, resolveRealPath } from "../lib/utils/workspace";
+
+export { findWorkspaceRoot };
 
 const ASSISTANT_UI_PACKAGES = [
   // Distribution
@@ -88,25 +92,6 @@ function getInstalledVersion(pkg: string, cwd: string): string | null {
   return null;
 }
 
-function findWorkspaceRoot(cwd: string): string | null {
-  let dir = path.dirname(cwd);
-  const root = path.parse(dir).root;
-  while (dir !== root) {
-    if (fs.existsSync(path.join(dir, "pnpm-workspace.yaml"))) return dir;
-    const pkgPath = path.join(dir, "package.json");
-    if (fs.existsSync(pkgPath)) {
-      try {
-        const pkg = JSON.parse(fs.readFileSync(pkgPath, "utf8"));
-        if (pkg.workspaces) return dir;
-      } catch {
-        // ignore
-      }
-    }
-    dir = path.dirname(dir);
-  }
-  return null;
-}
-
 function readProjectDeps(
   projectPkg: Record<string, unknown>,
 ): Record<string, string> {
@@ -116,6 +101,16 @@ function readProjectDeps(
   };
 }
 
+function getAssistantUiPackageNames(
+  projectPkg: Record<string, unknown>,
+): string[] {
+  const declaredPackages = Object.keys(readProjectDeps(projectPkg))
+    .filter((name) => name.startsWith("@assistant-ui/"))
+    .sort();
+
+  return [...new Set([...ASSISTANT_UI_PACKAGES, ...declaredPackages])];
+}
+
 function getSpecifiedRange(
   pkg: string,
   projectPkg: Record<string, unknown>,
@@ -186,6 +181,19 @@ function getOsInfo(): string {
   }
 }
 
+function getCliVersion(): string {
+  try {
+    const packageJson = JSON.parse(
+      fs.readFileSync(new URL("../../package.json", import.meta.url), "utf8"),
+    ) as { version?: unknown };
+    return typeof packageJson.version === "string"
+      ? packageJson.version
+      : "unknown";
+  } catch {
+    return "unknown";
+  }
+}
+
 async function getPackageManagerInfo(
   cwd: string,
 ): Promise<{ name: string; version: string }> {
@@ -198,27 +206,18 @@ async function getPackageManagerInfo(
   return { name: pm, version };
 }
 
-function satisfiesRange(version: string, range: string): boolean {
-  if (range === "*" || range === "any") return true;
-
-  const clean = (v: string) => v.replace(/^[^\d]*/, "");
-  const major = (v: string) => parseInt(clean(v).split(".")[0]!, 10);
-
-  if (range.includes("||")) {
-    return range
-      .split("||")
-      .some((part) => satisfiesRange(version, part.trim()));
-  }
-
-  const rangeMajor = major(range);
-  const versionMajor = major(version);
-
-  if (Number.isNaN(rangeMajor) || Number.isNaN(versionMajor)) return true;
-
-  if (range.startsWith("^")) return versionMajor >= rangeMajor;
-  if (range.startsWith(">=")) return versionMajor >= rangeMajor;
-
-  return versionMajor >= rangeMajor;
+export function satisfiesRange(version: string, range: string): boolean {
+  const normalizedRange = range.startsWith("workspace:")
+    ? range.slice("workspace:".length)
+    : range;
+
+  return (
+    normalizedRange === "" ||
+    normalizedRange === "^" ||
+    normalizedRange === "~" ||
+    normalizedRange === "any" ||
+    satisfies(version, normalizedRange, { includePrerelease: true })
+  );
 }
 
 interface PackageInfo {
@@ -228,6 +227,7 @@ interface PackageInfo {
 }
 
 interface InfoData {
+  cliVersion: string;
   os: string;
   node: string;
   pm: { name: string; version: string };
@@ -306,11 +306,16 @@ async function collectInfo(
   projectPkg: Record<string, unknown>,
 ): Promise<InfoData> {
   const pm = await getPackageManagerInfo(cwd);
-  const packages = collectPackages(ASSISTANT_UI_PACKAGES, cwd, projectPkg);
+  const packages = collectPackages(
+    getAssistantUiPackageNames(projectPkg),
+    cwd,
+    projectPkg,
+  );
   const ecosystem = collectPackages(ECOSYSTEM_PACKAGES, cwd, projectPkg);
   const warnings = collectWarnings(packages, cwd, projectPkg);
 
   return {
+    cliVersion: getCliVersion(),
     os: getOsInfo(),
     node: process.version,
     pm,
@@ -338,6 +343,7 @@ function renderPlain(data: InfoData): string[] {
   const lines: string[] = [];
 
   lines.push("Environment:");
+  lines.push(`  assistant-ui CLI: ${data.cliVersion}`);
   lines.push(`  OS:               ${data.os}`);
   lines.push(`  Node.js:          ${data.node}`);
   lines.push(`  Package Manager:  ${data.pm.name} ${data.pm.version}`);
@@ -364,6 +370,7 @@ function renderColored(data: InfoData): string[] {
   const lines: string[] = [];
 
   lines.push(chalk.bold("Environment:"));
+  lines.push(`  assistant-ui CLI: ${data.cliVersion}`);
   lines.push(`  OS:               ${data.os}`);
   lines.push(`  Node.js:          ${data.node}`);
   lines.push(`  Package Manager:  ${data.pm.name} ${data.pm.version}`);
@@ -409,7 +416,7 @@ export const info = new Command()
     process.cwd(),
   )
   .action(async (opts) => {
-    const cwd = path.resolve(opts.cwd);
+    const cwd = resolveRealPath(opts.cwd);
     const packageJsonPath = path.join(cwd, "package.json");
 
     if (!fs.existsSync(packageJsonPath)) {

package/src/commands/init.ts

@@ -8,35 +8,28 @@ import {
 } from "../lib/create-project";
 import { runSpawn, SpawnExitError } from "../lib/run-spawn";
 import { logger } from "../lib/utils/logger";
+import {
+  getComponentsJsonStyle,
+  resolveQuickStartRegistryUrl,
+} from "../lib/utils/registry";
 import { create } from "./create";
 
-const DEFAULT_REGISTRY_URL =
-  "https://r.assistant-ui.com/chat/b/ai-sdk-quick-start/json";
-
 interface ExistingProjectInitPlan {
-  initArgs: string[] | null;
+  initArgs: string[];
   addArgs: string[];
 }
 
 export function createExistingProjectInitPlan(params: {
   yes: boolean;
   overwrite: boolean;
-  registryUrl: string;
 }): ExistingProjectInitPlan {
-  const { yes, overwrite, registryUrl } = params;
-
-  if (!yes) {
-    const addArgs = [`shadcn@latest`, "add"];
-    if (overwrite) addArgs.push("--overwrite");
-    addArgs.push(registryUrl);
-    return { initArgs: null, addArgs };
-  }
-
-  const initArgs = [`shadcn@latest`, "init", "--defaults", "--yes"];
-
-  const addArgs = [`shadcn@latest`, "add", "--yes"];
+  const { yes, overwrite } = params;
+  const initArgs = yes
+    ? [`shadcn@latest`, "init", "--defaults", "--yes"]
+    : [`shadcn@latest`, "init"];
+  const addArgs = [`shadcn@latest`, "add"];
+  if (yes) addArgs.push("--yes");
   if (overwrite) addArgs.push("--overwrite");
-  addArgs.push(registryUrl);
 
   return { initArgs, addArgs };
 }
@@ -106,7 +99,6 @@ export const init = new Command()
       return;
     }
 
-    const registryUrl = DEFAULT_REGISTRY_URL;
     logger.info("Initializing assistant-ui in existing project...");
     logger.break();
 
@@ -131,13 +123,13 @@ export const init = new Command()
       const { initArgs, addArgs } = createExistingProjectInitPlan({
         yes: opts.yes,
         overwrite: opts.overwrite,
-        registryUrl,
       });
 
-      if (initArgs) {
-        await runSpawn(dlxCmd, [...dlxArgs, ...initArgs], targetDir);
-      }
-      await runSpawn(dlxCmd, [...dlxArgs, ...addArgs], targetDir);
+      await runSpawn(dlxCmd, [...dlxArgs, ...initArgs], targetDir);
+      const registryUrl = resolveQuickStartRegistryUrl(
+        getComponentsJsonStyle(targetDir),
+      );
+      await runSpawn(dlxCmd, [...dlxArgs, ...addArgs, registryUrl], targetDir);
 
       logger.break();
       logger.success("Project initialized successfully!");