assistant-ui 0.0.112 → 0.0.113

package/src/commands/create.ts

@@ -9,12 +9,17 @@ import {
   downloadProject,
   resolveLatestReleaseRef,
   resolvePackageManager,
-  resolvePackageManagerForCwd,
   scaffoldProject,
   transformProject,
   type TransformResult,
 } from "../lib/create-project";
-import { runSpawn, SpawnExitError } from "../lib/run-spawn";
+import {
+  hasActiveSpawn,
+  runSpawn,
+  SpawnExitError,
+  SpawnSignalError,
+} from "../lib/run-spawn";
+import { resolvePackageManagerForCwd } from "../lib/utils/package-manager";
 import {
   buildSkillsAddCommand,
   resolveSkillsInstall,
@@ -597,10 +602,31 @@ export const create = new Command()
     );
 
     // Clean up partial project directory on unexpected exit (e.g. Ctrl+C)
+    let cleanupArmed = true;
     const cleanupOnExit = () => {
+      if (!cleanupArmed) return;
+      cleanupArmed = false;
       fs.rmSync(absoluteProjectDir, { recursive: true, force: true });
     };
+    const disarmCleanup = () => {
+      cleanupArmed = false;
+      process.removeListener("exit", cleanupOnExit);
+      process.removeListener("SIGINT", cleanupOnSignal);
+      process.removeListener("SIGTERM", cleanupOnSignal);
+    };
+    // Node emits no "exit" when a signal kills the process. An in-flight
+    // runSpawn forwards the signal itself, so the directory is removed on the
+    // error path once the child is reaped rather than while it is still writing.
+    const cleanupOnSignal = (signal: NodeJS.Signals) => {
+      if (hasActiveSpawn()) return;
+      cleanupOnExit();
+      disarmCleanup();
+      process.kill(process.pid, signal);
+    };
+
     process.once("exit", cleanupOnExit);
+    process.on("SIGINT", cleanupOnSignal);
+    process.on("SIGTERM", cleanupOnSignal);
 
     try {
       // 3. Resolve latest release ref (started before prompts)
@@ -655,7 +681,8 @@ export const create = new Command()
           });
           try {
             await runSpawn(skillsCmd, skillsArgs, absoluteProjectDir);
-          } catch {
+          } catch (error) {
+            if (error instanceof SpawnSignalError) throw error;
             logger.warn(
               `Could not add assistant-ui agent skills. You can add them later with:\n  ${skillsCmd} ${skillsArgs.join(" ")}`,
             );
@@ -663,12 +690,13 @@ export const create = new Command()
         }
       } catch (err) {
         // Clean up partially created project directory
-        fs.rmSync(absoluteProjectDir, { recursive: true, force: true });
+        cleanupOnExit();
+        disarmCleanup();
         throw err;
       }
 
       if (transformResult.registryInstallFailure) {
-        process.removeListener("exit", cleanupOnExit);
+        disarmCleanup();
         logger.break();
         logger.error("Project created with missing components.");
         logger.info("Retry the component install with:");
@@ -696,14 +724,15 @@ export const create = new Command()
             ],
             absoluteProjectDir,
           );
-        } catch {
+        } catch (error) {
+          if (error instanceof SpawnSignalError) throw error;
           logger.warn(
             `Preset application failed. You can retry manually with:\n  ${dlxCmd} ${[...dlxArgs, "shadcn@latest", "add", presetUrl].join(" ")}`,
           );
         }
       }
 
-      process.removeListener("exit", cleanupOnExit);
+      disarmCleanup();
 
       logger.break();
       logger.success("Project created successfully!");
@@ -736,6 +765,11 @@ export const create = new Command()
       logger.info(`  # Set up your environment variables in ${envFile}`);
       logger.info(`  ${runCmd} ${devScript}`);
     } catch (error) {
+      if (error instanceof SpawnSignalError) {
+        cleanupOnExit();
+        disarmCleanup();
+        throw error;
+      }
       if (error instanceof SpawnExitError) {
         logger.error(`Project creation failed with code ${error.code}`);
         process.exit(error.code);

package/src/commands/info.ts

@@ -26,6 +26,7 @@ const ASSISTANT_UI_PACKAGES = [
   "@assistant-ui/cloud-ai-sdk",
   // Adapters
   "@assistant-ui/eve",
+  "@assistant-ui/ai-sdk",
   "@assistant-ui/react-ai-sdk",
   "@assistant-ui/react-langgraph",
   "@assistant-ui/react-ag-ui",

package/src/commands/init.ts

@@ -1,13 +1,10 @@
 import { Command, Option } from "commander";
 import fs from "node:fs";
 import path from "node:path";
-import {
-  dlxCommand,
-  resolvePackageManager,
-  resolvePackageManagerForCwd,
-} from "../lib/create-project";
-import { runSpawn, SpawnExitError } from "../lib/run-spawn";
+import { dlxCommand, resolvePackageManager } from "../lib/create-project";
+import { runSpawn, SpawnExitError, SpawnSignalError } from "../lib/run-spawn";
 import { logger } from "../lib/utils/logger";
+import { resolvePackageManagerForCwd } from "../lib/utils/package-manager";
 import {
   getComponentsJsonStyle,
   resolveQuickStartRegistryUrl,
@@ -135,6 +132,7 @@ export const init = new Command()
       logger.success("Project initialized successfully!");
       logger.info("You can now add more components with 'assistant-ui add'");
     } catch (error) {
+      if (error instanceof SpawnSignalError) throw error;
       if (error instanceof SpawnExitError) {
         logger.error(`Initialization failed with code ${error.code}`);
         process.exit(error.code);

package/src/commands/mcp.ts

@@ -2,8 +2,8 @@ import { Command } from "commander";
 import fs from "node:fs";
 import path from "node:path";
 import os from "node:os";
-import { spawn } from "cross-spawn";
 import { logger } from "../lib/utils/logger";
+import { runSpawn, SpawnExitError, SpawnSignalError } from "../lib/run-spawn";
 import * as p from "@clack/prompts";
 
 type MCPTarget =
@@ -152,9 +152,8 @@ async function installForTarget(target: MCPTarget): Promise<void> {
     logger.info("Installing MCP server for Claude Code...");
     logger.break();
 
-    const child = spawn(
-      "claude",
-      [
+    try {
+      await runSpawn("claude", [
         "mcp",
         "add",
         "assistant-ui",
@@ -162,35 +161,26 @@ async function installForTarget(target: MCPTarget): Promise<void> {
         "npx",
         "-y",
         "@assistant-ui/mcp-docs-server",
-      ],
-      {
-        stdio: "inherit",
-      },
-    );
-
-    return new Promise((resolve, reject) => {
-      child.on("error", (error) => {
+      ]);
+    } catch (error) {
+      if (error instanceof SpawnSignalError) throw error;
+      if (error instanceof SpawnExitError) {
+        logger.error(`Installation failed with code ${error.code}`);
+      } else if (error instanceof Error) {
         logger.error(`Failed to install: ${error.message}`);
         logger.info(
           "Make sure Claude Code CLI is installed: https://docs.anthropic.com/en/docs/claude-code",
         );
-        reject(error);
-      });
+      }
+      throw error;
+    }
 
-      child.on("close", (code) => {
-        if (code !== 0) {
-          logger.error(`Installation failed with code ${code}`);
-          reject(new Error(`Exit code ${code}`));
-        } else {
-          logger.break();
-          logger.success("MCP server installed for Claude Code!");
-          logger.info(
-            "The server starts automatically. Try asking about assistant-ui!",
-          );
-          resolve();
-        }
-      });
-    });
+    logger.break();
+    logger.success("MCP server installed for Claude Code!");
+    logger.info(
+      "The server starts automatically. Try asking about assistant-ui!",
+    );
+    return;
   }
 
   if (target === "claude-desktop" && process.platform === "linux") {
@@ -288,7 +278,8 @@ export const mcp = new Command()
     for (const target of targets) {
       try {
         await installForTarget(target);
-      } catch {
+      } catch (error) {
+        if (error instanceof SpawnSignalError) throw error;
         process.exit(1);
       }
     }

package/src/commands/update.ts

@@ -1,10 +1,10 @@
 import { Command } from "commander";
 import fs from "node:fs";
 import path from "node:path";
-import { sync as spawnSync } from "cross-spawn";
 import { logger } from "../lib/utils/logger";
 import { logPackageJsonParseError } from "../lib/utils/package-json";
 import { getInstallCommand } from "../lib/utils/package-manager";
+import { runSpawn, SpawnExitError, SpawnSignalError } from "../lib/run-spawn";
 
 export const update = new Command()
   .name("update")
@@ -73,14 +73,12 @@ export const update = new Command()
     }
 
     logger.step("Updating packages...");
-    const result = spawnSync(installCmd.command, installCmd.args, {
-      stdio: "inherit",
-      cwd: opts.cwd,
-    });
-
-    if (result.status !== 0) {
+    try {
+      await runSpawn(installCmd.command, installCmd.args, opts.cwd);
+    } catch (error) {
+      if (error instanceof SpawnSignalError) throw error;
       logger.error("Package manager update failed.");
-      process.exit(result.status || 1);
+      process.exit(error instanceof SpawnExitError ? error.code : 1);
     }
 
     logger.break();

package/src/commands/upgrade.ts

@@ -1,6 +1,7 @@
 import { Command } from "commander";
 import { transform } from "../lib/transform";
 import { upgrade } from "../lib/upgrade";
+import { SpawnSignalError } from "../lib/run-spawn";
 import debug from "debug";
 
 export interface TransformOptions {
@@ -30,10 +31,11 @@ export const codemodCommand = addTransformOptions(
     .description("CLI tool for running codemods")
     .argument("<codemod>", "Codemod to run (e.g., rewrite-framework-imports)")
     .argument("<source>", "Path to source files or directory to transform"),
-).action((codemod, source, options: TransformOptions) => {
+).action(async (codemod, source, options: TransformOptions) => {
   try {
-    transform(codemod, source, options);
+    await transform(codemod, source, options);
   } catch (err) {
+    if (err instanceof SpawnSignalError) throw err;
     const errorMessage = err instanceof Error ? err.message : String(err);
     const errorStack = err instanceof Error ? err.stack : undefined;
     error(`Error transforming: ${errorMessage}`);
@@ -52,6 +54,7 @@ export const upgradeCommand = addTransformOptions(
   try {
     await upgrade(options);
   } catch (err) {
+    if (err instanceof SpawnSignalError) throw err;
     const errorMessage = err instanceof Error ? err.message : String(err);
     const errorStack = err instanceof Error ? err.stack : undefined;
     error(`Error upgrading: ${errorMessage}`);

package/src/index.ts

@@ -1,11 +1,6 @@
 #!/usr/bin/env node
 
+import { handleCliError } from "./lib/handle-cli-error";
 import { runCli } from "./run";
 
-process.on("SIGINT", () => process.exit(0));
-process.on("SIGTERM", () => process.exit(0));
-
-void runCli().catch((error: unknown) => {
-  console.error(error);
-  process.exitCode = 1;
-});
+void runCli().catch(handleCliError);

package/src/lib/agent-skill.ts

@@ -1,4 +1,5 @@
-import { dlxCommand, type PackageManagerName } from "./create-project";
+import { dlxCommand } from "./create-project";
+import { type PackageManagerName } from "./utils/package-manager";
 
 export const SKILLS_PACKAGE = "assistant-ui/skills";
 

package/src/lib/create-project.ts

@@ -1,17 +1,15 @@
 import * as fs from "node:fs";
 import * as path from "node:path";
 import { downloadTemplate } from "giget";
-import { sync as globSync } from "glob";
-import { detect } from "detect-package-manager";
 import {
   parse as parseJsonc,
   printParseErrorCode,
   type ParseError,
 } from "jsonc-parser";
 import { logger } from "./utils/logger";
-import { runSpawn, SpawnExitError } from "./run-spawn";
-
-export type PackageManagerName = "npm" | "pnpm" | "yarn" | "bun";
+import { runSpawn, SpawnExitError, SpawnSignalError } from "./run-spawn";
+import { type PackageManagerName } from "./utils/package-manager";
+import { readProjectFiles } from "./utils/file-scanner";
 
 export function dlxCommand(pm: PackageManagerName): [string, string[]] {
   switch (pm) {
@@ -186,30 +184,6 @@ export async function scaffoldProject(
   }
 }
 
-function detectFromUserAgent(): PackageManagerName | undefined {
-  const ua = process.env.npm_config_user_agent;
-  if (!ua) return undefined;
-  if (ua.startsWith("bun/")) return "bun";
-  if (ua.startsWith("pnpm/")) return "pnpm";
-  if (ua.startsWith("yarn/")) return "yarn";
-  if (ua.startsWith("npm/")) return "npm";
-  return undefined;
-}
-
-export async function resolvePackageManagerForCwd(
-  cwd: string,
-  packageManager?: PackageManagerName,
-): Promise<PackageManagerName> {
-  if (packageManager) return packageManager;
-  const fromAgent = detectFromUserAgent();
-  if (fromAgent) return fromAgent;
-  try {
-    return await detect({ cwd });
-  } catch {
-    return "npm";
-  }
-}
-
 export interface TransformResult {
   registryInstallFailure?: { retryCommand: string };
 }
@@ -383,16 +357,11 @@ function transformTsConfig(projectDir: string): void {
 }
 
 function transformCssFiles(projectDir: string): void {
-  const cssFiles = globSync("**/*.css", {
+  for (const { fullPath, content } of readProjectFiles("**/*.css", {
     cwd: projectDir,
     ignore: LOCAL_PROJECT_ARTIFACT_GLOB_IGNORES,
-  });
-
-  for (const file of cssFiles) {
-    const fullPath = path.join(projectDir, file);
+  })) {
     try {
-      const content = fs.readFileSync(fullPath, "utf-8");
-
       const newContent = content.replace(
         /@source\s+["'][^"']*packages\/ui\/src[^"']*["'];\s*\n?/g,
         "",
@@ -402,7 +371,7 @@ function transformCssFiles(projectDir: string): void {
         fs.writeFileSync(fullPath, newContent);
       }
     } catch {
-      // Ignore files that cannot be read/written
+      continue;
     }
   }
 }
@@ -417,31 +386,22 @@ function stripImportExtension(component: string): string {
 }
 
 function scanRequiredComponents(projectDir: string): RequiredComponents {
-  const files = globSync("**/*.{ts,tsx}", {
-    cwd: projectDir,
-    ignore: LOCAL_PROJECT_ARTIFACT_GLOB_IGNORES,
-  });
-
   const assistantUIComponents = new Set<string>();
   const shadcnUIComponents = new Set<string>();
 
-  for (const file of files) {
-    const fullPath = path.join(projectDir, file);
-    try {
-      const content = fs.readFileSync(fullPath, "utf-8");
-
-      const assistantUIRegex =
-        /from\s+["']@\/components\/assistant-ui\/([^"']+)["']/g;
-      for (const match of content.matchAll(assistantUIRegex)) {
-        assistantUIComponents.add(stripImportExtension(match[1]!));
-      }
+  for (const { content } of readProjectFiles("**/*.{ts,tsx}", {
+    cwd: projectDir,
+    ignore: LOCAL_PROJECT_ARTIFACT_GLOB_IGNORES,
+  })) {
+    const assistantUIRegex =
+      /from\s+["']@\/components\/assistant-ui\/([^"']+)["']/g;
+    for (const match of content.matchAll(assistantUIRegex)) {
+      assistantUIComponents.add(stripImportExtension(match[1]!));
+    }
 
-      const uiRegex = /from\s+["']@\/components\/ui\/([^"']+)["']/g;
-      for (const match of content.matchAll(uiRegex)) {
-        shadcnUIComponents.add(stripImportExtension(match[1]!));
-      }
-    } catch {
-      // Ignore files that cannot be read
+    const uiRegex = /from\s+["']@\/components\/ui\/([^"']+)["']/g;
+    for (const match of content.matchAll(uiRegex)) {
+      shadcnUIComponents.add(stripImportExtension(match[1]!));
     }
   }
 
@@ -459,6 +419,9 @@ async function installDependencies(
   try {
     await runSpawn(pm, args, projectDir);
   } catch (error) {
+    if (error instanceof SpawnSignalError) {
+      throw error;
+    }
     if (error instanceof SpawnExitError) {
       throw new Error(`${pm} install exited with code ${error.code}`);
     }
@@ -483,6 +446,9 @@ async function installShadcnRegistry(
     await runSpawn(cmd, addArgs, projectDir);
     return undefined;
   } catch (error) {
+    if (error instanceof SpawnSignalError) {
+      throw error;
+    }
     if (error instanceof SpawnExitError) {
       logger.warn(`shadcn exited with code ${error.code}.`);
       return { retryCommand: `${cmd} ${retryArgs.join(" ")}` };

package/src/lib/handle-cli-error.test.ts

@@ -0,0 +1,67 @@
+import { afterEach, describe, expect, it, vi } from "vitest";
+
+import { handleCliError } from "./handle-cli-error";
+import { SpawnExitError, SpawnSignalError } from "./run-spawn";
+
+describe("handleCliError", () => {
+  afterEach(() => {
+    vi.restoreAllMocks();
+    process.exitCode = undefined;
+  });
+
+  it("exits by the forwarded signal's status and re-raises it", () => {
+    const kill = vi.spyOn(process, "kill").mockReturnValue(true);
+
+    handleCliError(new SpawnSignalError("SIGINT", true));
+
+    expect(process.exitCode).toBe(130);
+    expect(kill).toHaveBeenCalledWith(process.pid, "SIGINT");
+  });
+
+  it("maps SIGTERM to 143", () => {
+    const kill = vi.spyOn(process, "kill").mockReturnValue(true);
+
+    handleCliError(new SpawnSignalError("SIGTERM", true));
+
+    expect(process.exitCode).toBe(143);
+    expect(kill).toHaveBeenCalledWith(process.pid, "SIGTERM");
+  });
+
+  it("reports a signal the child raised on itself without re-raising it", () => {
+    const consoleError = vi
+      .spyOn(console, "error")
+      .mockImplementation(() => {});
+    const kill = vi.spyOn(process, "kill").mockReturnValue(true);
+
+    handleCliError(new SpawnSignalError("SIGKILL", false));
+
+    expect(process.exitCode).toBe(137);
+    expect(kill).not.toHaveBeenCalled();
+    expect(consoleError).toHaveBeenCalledWith("Process terminated by SIGKILL");
+  });
+
+  it("stays silent on a signal the user sent", () => {
+    const consoleError = vi
+      .spyOn(console, "error")
+      .mockImplementation(() => {});
+    vi.spyOn(process, "kill").mockReturnValue(true);
+
+    handleCliError(new SpawnSignalError("SIGINT", true));
+
+    expect(consoleError).not.toHaveBeenCalled();
+  });
+
+  it("reports any other failure as exit 1", () => {
+    const consoleError = vi
+      .spyOn(console, "error")
+      .mockImplementation(() => {});
+    const kill = vi.spyOn(process, "kill").mockReturnValue(true);
+    const error = new SpawnExitError(7);
+
+    handleCliError(error);
+
+    expect(process.exitCode).toBe(1);
+    expect(kill).not.toHaveBeenCalled();
+    expect(consoleError).toHaveBeenCalledWith(error);
+  });
+});

package/src/lib/handle-cli-error.ts

@@ -0,0 +1,17 @@
+import { constants } from "node:os";
+import { SpawnSignalError } from "./run-spawn";
+
+export function handleCliError(error: unknown): void {
+  if (error instanceof SpawnSignalError) {
+    process.exitCode = 128 + (constants.signals[error.signal] ?? 0);
+    if (error.forwarded) {
+      process.kill(process.pid, error.signal);
+    } else {
+      console.error(error.message);
+    }
+    return;
+  }
+
+  console.error(error);
+  process.exitCode = 1;
+}

package/src/lib/install-ai-sdk-lib.ts

@@ -1,6 +1,18 @@
 import { installPackageIfNeeded } from "./utils/package-installer";
 
 export default async function installAiSdkLib(): Promise<void> {
+  await installPackageIfNeeded({
+    packageName: "@assistant-ui/ai-sdk",
+    importPatterns: ["@assistant-ui/ai-sdk"],
+    promptMessage:
+      "AI SDK imports were added but @assistant-ui/ai-sdk is not installed. Do you want to install it? (Y/n) ",
+    skipMessage:
+      "@assistant-ui/ai-sdk is already installed. Skipping installation.",
+    notFoundMessage: "No AI SDK imports found; skipping installation.",
+  });
+
+  // The previous name is a separate package, so an import of it needs that
+  // package installed; the neutral one would not make it resolvable.
   await installPackageIfNeeded({
     packageName: "@assistant-ui/react-ai-sdk",
     importPatterns: ["@assistant-ui/react-ai-sdk"],
@@ -8,6 +20,6 @@ export default async function installAiSdkLib(): Promise<void> {
       "AI SDK imports were added but @assistant-ui/react-ai-sdk is not installed. Do you want to install it? (Y/n) ",
     skipMessage:
       "@assistant-ui/react-ai-sdk is already installed. Skipping installation.",
-    notFoundMessage: "No AI SDK imports found; skipping installation.",
+    notFoundMessage: "No legacy AI SDK imports found; skipping installation.",
   });
 }

package/src/lib/install-edge-lib.ts

@@ -1,17 +1,16 @@
 import { installPackageIfNeeded } from "./utils/package-installer";
 
 export default async function installEdgeLib(): Promise<void> {
+  // Only the retired edge specifier is unambiguous here. `useChatRuntime` and
+  // the AI SDK package specifiers are shared by both AI SDK packages, so
+  // installAiSdkLib resolves those by the specifier the file actually imports.
   await installPackageIfNeeded({
-    packageName: "@assistant-ui/react-ai-sdk",
-    importPatterns: [
-      "@assistant-ui/react-edge",
-      "@assistant-ui/react-ai-sdk",
-      "useChatRuntime",
-    ],
+    packageName: "@assistant-ui/ai-sdk",
+    importPatterns: ["@assistant-ui/react-edge"],
     promptMessage:
-      "Edge Runtime imports were detected but @assistant-ui/react-ai-sdk is not installed. Do you want to install it? (Y/n) ",
+      "Edge Runtime imports were detected but @assistant-ui/ai-sdk is not installed. Do you want to install it? (Y/n) ",
     skipMessage:
-      "@assistant-ui/react-ai-sdk is already installed. Skipping installation.",
+      "@assistant-ui/ai-sdk is already installed. Skipping installation.",
     notFoundMessage: "No Edge Runtime imports found; skipping installation.",
   });
 }