assistant-ui 0.0.106 → 0.0.107

package/src/commands/doctor.ts

@@ -3,6 +3,7 @@ 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",
@@ -39,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);
 
@@ -183,14 +178,23 @@ function walkPnpmStore(
 }
 
 // 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, and scans the
-// pnpm `.pnpm` virtual store, which the hoisted walk cannot reach.
+// 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);
-  walkPnpmStore(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;
 }
 
@@ -369,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

@@ -6,6 +6,9 @@ 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
@@ -89,25 +92,6 @@ function getInstalledVersion(pkg: string, cwd: string): string | null {
   return null;
 }
 
-export function findWorkspaceRoot(cwd: string): string | null {
-  let dir = cwd;
-  const root = path.parse(dir).root;
-  while (true) {
-    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
-      }
-    }
-    if (dir === root) return null;
-    dir = path.dirname(dir);
-  }
-}
-
 function readProjectDeps(
   projectPkg: Record<string, unknown>,
 ): Record<string, string> {
@@ -197,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 }> {
@@ -230,6 +227,7 @@ interface PackageInfo {
 }
 
 interface InfoData {
+  cliVersion: string;
   os: string;
   node: string;
   pm: { name: string; version: string };
@@ -317,6 +315,7 @@ async function collectInfo(
   const warnings = collectWarnings(packages, cwd, projectPkg);
 
   return {
+    cliVersion: getCliVersion(),
     os: getOsInfo(),
     node: process.version,
     pm,
@@ -344,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}`);
@@ -370,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}`);
@@ -415,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/lib/create-project.ts

@@ -210,22 +210,25 @@ export async function resolvePackageManagerForCwd(
   }
 }
 
+export interface TransformResult {
+  registryInstallFailure?: { retryCommand: string };
+}
+
 export async function transformProject(
   projectDir: string,
   opts: TransformOptions,
-): Promise<void> {
+): Promise<TransformResult> {
   logger.step("Transforming package.json...");
   transformPackageJson(projectDir);
 
+  logger.step("Transforming project files...");
+  transformTsConfig(projectDir);
+  transformCssFiles(projectDir);
+
   let assistantUI: string[] | undefined;
   let shadcnUI: string[] | undefined;
 
   if (!opts.hasLocalComponents) {
-    logger.step("Transforming project files...");
-
-    transformTsConfig(projectDir);
-    transformCssFiles(projectDir);
-
     const components = scanRequiredComponents(projectDir);
     assistantUI = components.assistantUI;
     shadcnUI = components.shadcnUI;
@@ -249,8 +252,15 @@ export async function transformProject(
     const auiComponents = assistantUI.map((c) => `@assistant-ui/${c}`);
     const components = [...allShadcn, ...auiComponents];
     logger.step(`Installing components: ${components.join(", ")}...`);
-    await installShadcnRegistry(projectDir, components, "components", pm);
+    const failure = await installShadcnRegistry(
+      projectDir,
+      components,
+      "components",
+      pm,
+    );
+    if (failure) return { registryInstallFailure: failure };
   }
+  return {};
 }
 
 function transformPackageJson(projectDir: string): void {
@@ -326,7 +336,8 @@ function transformTsConfig(projectDir: string): void {
         Array.isArray(targets) &&
         targets.some(
           (target) =>
-            typeof target === "string" && target.includes("packages/ui/"),
+            typeof target === "string" &&
+            (target.includes("packages/ui/") || target.startsWith("../")),
         );
       if (workspaceKeys.has(key) || targetsWorkspace) {
         delete tsconfig.compilerOptions.paths[key];
@@ -461,20 +472,20 @@ async function installShadcnRegistry(
   components: string[],
   label: string,
   pm: PackageManagerName,
-): Promise<void> {
+): Promise<{ retryCommand: string } | undefined> {
   const [cmd, dlxArgs] = dlxCommand(pm);
   // For npm, dlxArgs may already include `--yes` for npx auto-install.
   // The trailing `--yes` is for shadcn's own confirmation prompt.
-  const addArgs = [...dlxArgs, "shadcn@latest", "add", ...components, "--yes"];
+  const retryArgs = [...dlxArgs, "shadcn@latest", "add", ...components];
+  const addArgs = [...retryArgs, "--yes"];
 
   try {
     await runSpawn(cmd, addArgs, projectDir);
+    return undefined;
   } catch (error) {
     if (error instanceof SpawnExitError) {
-      logger.warn(
-        `shadcn exited with code ${error.code}. Run the following to retry:\n  ${cmd} ${addArgs.slice(0, -1).join(" ")}`,
-      );
-      return;
+      logger.warn(`shadcn exited with code ${error.code}.`);
+      return { retryCommand: `${cmd} ${retryArgs.join(" ")}` };
     }
 
     const message = error instanceof Error ? error.message : String(error);

package/src/lib/utils/registry.test.ts

@@ -94,9 +94,15 @@ describe("resolveRegistryItemUrl", () => {
     );
   });
 
-  it("uses the plain URL without a style", () => {
+  it("uses the base URL without a style", () => {
     expect(resolveRegistryItemUrl("thread")).toBe(
-      "https://r.assistant-ui.com/thread.json",
+      "https://r.assistant-ui.com/base/thread.json",
+    );
+  });
+
+  it("uses the base URL for an explicit undefined style", () => {
+    expect(resolveRegistryItemUrl("thread", undefined)).toBe(
+      "https://r.assistant-ui.com/base/thread.json",
     );
   });
 

package/src/lib/utils/registry.ts

@@ -31,7 +31,11 @@ export function resolveRegistryItemUrl(
   component: string,
   style?: string,
 ): string {
-  const registryUrl = style?.startsWith("base-")
+  if (style === undefined) {
+    return `${REGISTRY_BASE_URL}/base/${encodeURIComponent(component)}.json`;
+  }
+
+  const registryUrl = style.startsWith("base-")
     ? `${REGISTRY_BASE_URL}/styles/${encodeURIComponent(style)}`
     : REGISTRY_BASE_URL;
 

package/src/lib/utils/workspace.ts

@@ -0,0 +1,34 @@
+import * as fs from "node:fs";
+import * as path from "node:path";
+
+export function resolveRealPath(inputPath: string): string {
+  const resolved = path.resolve(inputPath);
+
+  try {
+    return fs.realpathSync(resolved);
+  } catch {
+    return resolved;
+  }
+}
+
+export function findWorkspaceRoot(cwd: string): string | null {
+  let dir = path.resolve(cwd);
+  const root = path.parse(dir).root;
+
+  while (true) {
+    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 {
+        // Malformed package manifests are not workspace markers.
+      }
+    }
+
+    if (dir === root) return null;
+    dir = path.dirname(dir);
+  }
+}