assistant-ui 0.0.91 → 0.0.93

package/dist/lib/utils/package-manager.d.ts

@@ -1,9 +1,12 @@
-export declare function askQuestion(query: string): Promise<string>;
-export declare function isPackageInstalled(pkg: string, cwd?: string): boolean;
-export interface InstallCommand {
-    command: string;
-    args: string[];
+//#region src/lib/utils/package-manager.d.ts
+declare function askQuestion(query: string): Promise<string>;
+declare function isPackageInstalled(pkg: string, cwd?: string): boolean;
+interface InstallCommand {
+  command: string;
+  args: string[];
 }
-export declare function getInstallCommand(packageName: string | string[], cwd?: string): Promise<InstallCommand>;
-export declare function installPackage(packageName: string, cwd?: string): Promise<boolean>;
+declare function getInstallCommand(packageName: string | string[], cwd?: string): Promise<InstallCommand>;
+declare function installPackage(packageName: string, cwd?: string): Promise<boolean>;
+//#endregion
+export { InstallCommand, askQuestion, getInstallCommand, installPackage, isPackageInstalled };
 //# sourceMappingURL=package-manager.d.ts.map

package/dist/lib/utils/package-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"package-manager.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/package-manager.ts"],"names":[],"mappings":"AAOA,wBAAgB,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAW1D;AAED,wBAAgB,kBAAkB,CAChC,GAAG,EAAE,MAAM,EACX,GAAG,GAAE,MAAsB,GAC1B,OAAO,CAgBT;AAED,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,EAAE,CAAC;CAChB;AAED,wBAAsB,iBAAiB,CACrC,WAAW,EAAE,MAAM,GAAG,MAAM,EAAE,EAC9B,GAAG,CAAC,EAAE,MAAM,GACX,OAAO,CAAC,cAAc,CAAC,CAazB;AAED,wBAAsB,cAAc,CAClC,WAAW,EAAE,MAAM,EACnB,GAAG,CAAC,EAAE,MAAM,GACX,OAAO,CAAC,OAAO,CAAC,CAmBlB"}
+{"version":3,"file":"package-manager.d.ts","names":[],"sources":["../../../src/lib/utils/package-manager.ts"],"mappings":";iBAOgB,WAAA,CAAY,KAAA,WAAgB,OAAO;AAAA,iBAanC,kBAAA,CACd,GAAA,UACA,GAA2B;AAAA,UAmBZ,cAAA;EACf,OAAA;EACA,IAAI;AAAA;AAAA,iBAGgB,iBAAA,CACpB,WAAA,qBACA,GAAA,YACC,OAAO,CAAC,cAAA;AAAA,iBAeW,cAAA,CACpB,WAAA,UACA,GAAA,YACC,OAAO"}

package/dist/lib/utils/package-manager.js

@@ -1,66 +1,75 @@
-import * as fs from "node:fs";
-import * as path from "node:path";
-import { spawnSync } from "node:child_process";
+import { logger } from "./logger.js";
+import * as fs$1 from "node:fs";
+import * as path$1 from "node:path";
 import { detect } from "detect-package-manager";
+import { spawnSync } from "node:child_process";
 import * as readline from "node:readline";
-import { logger } from "./logger.js";
-export function askQuestion(query) {
-    return new Promise((resolve) => {
-        const rl = readline.createInterface({
-            input: process.stdin,
-            output: process.stdout,
-        });
-        rl.question(query, (answer) => {
-            rl.close();
-            resolve(answer);
-        });
-    });
+//#region src/lib/utils/package-manager.ts
+function askQuestion(query) {
+	return new Promise((resolve) => {
+		const rl = readline.createInterface({
+			input: process.stdin,
+			output: process.stdout
+		});
+		rl.question(query, (answer) => {
+			rl.close();
+			resolve(answer);
+		});
+	});
 }
-export function isPackageInstalled(pkg, cwd = process.cwd()) {
-    try {
-        const pkgJsonPath = path.join(cwd, "package.json");
-        if (fs.existsSync(pkgJsonPath)) {
-            const pkgJson = JSON.parse(fs.readFileSync(pkgJsonPath, "utf8"));
-            const deps = pkgJson.dependencies || {};
-            const devDeps = pkgJson.devDependencies || {};
-            if (deps[pkg] || devDeps[pkg]) {
-                return true;
-            }
-        }
-    }
-    catch {
-        // Fall back to node_modules check below.
-    }
-    const modulePath = path.join(cwd, "node_modules", ...pkg.split("/"));
-    return fs.existsSync(modulePath);
+function isPackageInstalled(pkg, cwd = process.cwd()) {
+	try {
+		const pkgJsonPath = path$1.join(cwd, "package.json");
+		if (fs$1.existsSync(pkgJsonPath)) {
+			const pkgJson = JSON.parse(fs$1.readFileSync(pkgJsonPath, "utf8"));
+			const deps = pkgJson.dependencies || {};
+			const devDeps = pkgJson.devDependencies || {};
+			if (deps[pkg] || devDeps[pkg]) return true;
+		}
+	} catch {}
+	const modulePath = path$1.join(cwd, "node_modules", ...pkg.split("/"));
+	return fs$1.existsSync(modulePath);
 }
-export async function getInstallCommand(packageName, cwd) {
-    const pm = await detect({ cwd });
-    const packages = Array.isArray(packageName) ? packageName : [packageName];
-    switch (pm) {
-        case "yarn":
-            return { command: "yarn", args: ["add", ...packages] };
-        case "pnpm":
-            return { command: "pnpm", args: ["add", ...packages] };
-        case "bun":
-            return { command: "bun", args: ["add", ...packages] };
-        default:
-            return { command: "npm", args: ["install", ...packages] };
-    }
+async function getInstallCommand(packageName, cwd) {
+	const pm = await detect({ cwd });
+	const packages = Array.isArray(packageName) ? packageName : [packageName];
+	switch (pm) {
+		case "yarn": return {
+			command: "yarn",
+			args: ["add", ...packages]
+		};
+		case "pnpm": return {
+			command: "pnpm",
+			args: ["add", ...packages]
+		};
+		case "bun": return {
+			command: "bun",
+			args: ["add", ...packages]
+		};
+		default: return {
+			command: "npm",
+			args: ["install", ...packages]
+		};
+	}
 }
-export async function installPackage(packageName, cwd) {
-    try {
-        const { command, args } = await getInstallCommand(packageName, cwd);
-        const result = spawnSync(command, args, { stdio: "inherit", cwd });
-        if (result.error || result.status !== 0) {
-            logger.error(`Installation failed${result.error ? `: ${String(result.error)}` : "."}`);
-            return false;
-        }
-        return true;
-    }
-    catch (e) {
-        logger.error(`Installation failed: ${String(e)}`);
-        return false;
-    }
+async function installPackage(packageName, cwd) {
+	try {
+		const { command, args } = await getInstallCommand(packageName, cwd);
+		const result = spawnSync(command, args, {
+			stdio: "inherit",
+			cwd
+		});
+		if (result.error || result.status !== 0) {
+			logger.error(`Installation failed${result.error ? `: ${String(result.error)}` : "."}`);
+			return false;
+		}
+		return true;
+	} catch (e) {
+		logger.error(`Installation failed: ${String(e)}`);
+		return false;
+	}
 }
+//#endregion
+export { askQuestion, getInstallCommand, installPackage, isPackageInstalled };
+
 //# sourceMappingURL=package-manager.js.map

package/dist/lib/utils/package-manager.js.map

@@ -1 +1 @@
-{"version":3,"file":"package-manager.js","sourceRoot":"","sources":["../../../src/lib/utils/package-manager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"package-manager.js","names":["path","fs"],"sources":["../../../src/lib/utils/package-manager.ts"],"sourcesContent":["import * as fs from \"node:fs\";\nimport * as path from \"node:path\";\nimport { spawnSync } from \"node:child_process\";\nimport { detect } from \"detect-package-manager\";\nimport * as readline from \"node:readline\";\nimport { logger } from \"./logger\";\n\nexport function askQuestion(query: string): Promise<string> {\n  return new Promise((resolve) => {\n    const rl = readline.createInterface({\n      input: process.stdin,\n      output: process.stdout,\n    });\n    rl.question(query, (answer) => {\n      rl.close();\n      resolve(answer);\n    });\n  });\n}\n\nexport function isPackageInstalled(\n  pkg: string,\n  cwd: string = process.cwd(),\n): boolean {\n  try {\n    const pkgJsonPath = path.join(cwd, \"package.json\");\n    if (fs.existsSync(pkgJsonPath)) {\n      const pkgJson = JSON.parse(fs.readFileSync(pkgJsonPath, \"utf8\"));\n      const deps = pkgJson.dependencies || {};\n      const devDeps = pkgJson.devDependencies || {};\n      if (deps[pkg] || devDeps[pkg]) {\n        return true;\n      }\n    }\n  } catch {\n    // Fall back to node_modules check below.\n  }\n  const modulePath = path.join(cwd, \"node_modules\", ...pkg.split(\"/\"));\n  return fs.existsSync(modulePath);\n}\n\nexport interface InstallCommand {\n  command: string;\n  args: string[];\n}\n\nexport async function getInstallCommand(\n  packageName: string | string[],\n  cwd?: string,\n): Promise<InstallCommand> {\n  const pm = await detect({ cwd });\n  const packages = Array.isArray(packageName) ? packageName : [packageName];\n  switch (pm) {\n    case \"yarn\":\n      return { command: \"yarn\", args: [\"add\", ...packages] };\n    case \"pnpm\":\n      return { command: \"pnpm\", args: [\"add\", ...packages] };\n    case \"bun\":\n      return { command: \"bun\", args: [\"add\", ...packages] };\n    default:\n      return { command: \"npm\", args: [\"install\", ...packages] };\n  }\n}\n\nexport async function installPackage(\n  packageName: string,\n  cwd?: string,\n): Promise<boolean> {\n  try {\n    const { command, args } = await getInstallCommand(packageName, cwd);\n    const result = spawnSync(command, args, { stdio: \"inherit\", cwd });\n\n    if (result.error || result.status !== 0) {\n      logger.error(\n        `Installation failed${\n          result.error ? `: ${String(result.error)}` : \".\"\n        }`,\n      );\n      return false;\n    }\n\n    return true;\n  } catch (e) {\n    logger.error(`Installation failed: ${String(e)}`);\n    return false;\n  }\n}\n"],"mappings":";;;;;;;AAOA,SAAgB,YAAY,OAAgC;CAC1D,OAAO,IAAI,SAAS,YAAY;EAC9B,MAAM,KAAK,SAAS,gBAAgB;GAClC,OAAO,QAAQ;GACf,QAAQ,QAAQ;EAClB,CAAC;EACD,GAAG,SAAS,QAAQ,WAAW;GAC7B,GAAG,MAAM;GACT,QAAQ,MAAM;EAChB,CAAC;CACH,CAAC;AACH;AAEA,SAAgB,mBACd,KACA,MAAc,QAAQ,IAAI,GACjB;CACT,IAAI;EACF,MAAM,cAAcA,OAAK,KAAK,KAAK,cAAc;EACjD,IAAIC,KAAG,WAAW,WAAW,GAAG;GAC9B,MAAM,UAAU,KAAK,MAAMA,KAAG,aAAa,aAAa,MAAM,CAAC;GAC/D,MAAM,OAAO,QAAQ,gBAAgB,CAAC;GACtC,MAAM,UAAU,QAAQ,mBAAmB,CAAC;GAC5C,IAAI,KAAK,QAAQ,QAAQ,MACvB,OAAO;EAEX;CACF,QAAQ,CAER;CACA,MAAM,aAAaD,OAAK,KAAK,KAAK,gBAAgB,GAAG,IAAI,MAAM,GAAG,CAAC;CACnE,OAAOC,KAAG,WAAW,UAAU;AACjC;AAOA,eAAsB,kBACpB,aACA,KACyB;CACzB,MAAM,KAAK,MAAM,OAAO,EAAE,IAAI,CAAC;CAC/B,MAAM,WAAW,MAAM,QAAQ,WAAW,IAAI,cAAc,CAAC,WAAW;CACxE,QAAQ,IAAR;EACE,KAAK,QACH,OAAO;GAAE,SAAS;GAAQ,MAAM,CAAC,OAAO,GAAG,QAAQ;EAAE;EACvD,KAAK,QACH,OAAO;GAAE,SAAS;GAAQ,MAAM,CAAC,OAAO,GAAG,QAAQ;EAAE;EACvD,KAAK,OACH,OAAO;GAAE,SAAS;GAAO,MAAM,CAAC,OAAO,GAAG,QAAQ;EAAE;EACtD,SACE,OAAO;GAAE,SAAS;GAAO,MAAM,CAAC,WAAW,GAAG,QAAQ;EAAE;CAC5D;AACF;AAEA,eAAsB,eACpB,aACA,KACkB;CAClB,IAAI;EACF,MAAM,EAAE,SAAS,SAAS,MAAM,kBAAkB,aAAa,GAAG;EAClE,MAAM,SAAS,UAAU,SAAS,MAAM;GAAE,OAAO;GAAW;EAAI,CAAC;EAEjE,IAAI,OAAO,SAAS,OAAO,WAAW,GAAG;GACvC,OAAO,MACL,sBACE,OAAO,QAAQ,KAAK,OAAO,OAAO,KAAK,MAAM,KAEjD;GACA,OAAO;EACT;EAEA,OAAO;CACT,SAAS,GAAG;EACV,OAAO,MAAM,wBAAwB,OAAO,CAAC,GAAG;EAChD,OAAO;CACT;AACF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "assistant-ui",
-  "version": "0.0.91",
+  "version": "0.0.93",
   "description": "CLI for assistant-ui",
   "keywords": [
     "cli",
@@ -26,7 +26,7 @@
   ],
   "sideEffects": false,
   "dependencies": {
-    "@clack/prompts": "^1.3.0",
+    "@clack/prompts": "^1.4.0",
     "chalk": "^5.6.2",
     "cli-progress": "^3.12.0",
     "commander": "^14.0.3",
@@ -36,17 +36,17 @@
     "giget": "^3.2.0",
     "glob": "^13.0.6",
     "jscodeshift": "^17.3.0",
-    "@assistant-ui/agent-launcher": "0.1.4"
+    "@assistant-ui/agent-launcher": "0.1.5"
   },
   "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": "^25.6.0",
-    "@vitest/coverage-v8": "^4.1.5",
-    "vitest": "^4.1.5",
-    "@assistant-ui/x-buildutils": "0.0.7"
+    "@types/node": "^25.9.1",
+    "@vitest/coverage-v8": "^4.1.7",
+    "vitest": "^4.1.7",
+    "@assistant-ui/x-buildutils": "0.0.9"
   },
   "publishConfig": {
     "access": "public",

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

@@ -64,7 +64,7 @@ export async function POST(req: Request) {
   const { messages, config } = await req.json();
 
   const result = streamText({
-    model: openai("gpt-4o"),
+    model: openai("gpt-5.4-nano"),
     messages,
     ...config,
   });
@@ -106,7 +106,7 @@ import { streamText, tool } from "ai";
 import { z } from "zod";
 
 const result = streamText({
-  model: openai("gpt-4o"),
+  model: openai("gpt-5.4-nano"),
   messages,
   tools: {
     get_weather: tool({

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!");
   });