@alexkroman1/aai-cli 5.7.0 → 5.8.1

package/dist/{_init-D7JIT-IJ.mjs → _init-Dei2JRmn.mjs}

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import { c as readJson, d as writeJson, s as isEexist } from "./_utils-Ch0J4s6a.mjs";
 import { r as isDevMode, t as getMonorepoRoot } from "./_agent-2nVugrN3.mjs";
-import { REPO_URL, downloadAndMergeTemplate } from "./_templates-Bt6u9_68.mjs";
+import { REPO_URL, downloadAndMergeTemplate } from "./_templates-BfyRyE7z.mjs";
 import path from "node:path";
 import fs from "node:fs/promises";
 //#region _init.ts

package/dist/{_templates-Bt6u9_68.mjs → _templates-BfyRyE7z.mjs}

@@ -46,6 +46,78 @@ async function listTemplates(root = resolveTemplatesDir()) {
 	}
 	return available.filter((e) => e.isDirectory()).map((e) => e.name).sort();
 }
+/** package.json fields merged key-by-key rather than whole. */
+const MERGED_MANIFEST_FIELDS = [
+	"dependencies",
+	"devDependencies",
+	"scripts"
+];
+function isRecord(value) {
+	return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+/**
+* Fill a manifest's gaps from the scaffold's, `existing` always winning.
+*
+* The same rule the file layering uses, one level deeper: a top-level field
+* the manifest already declares is left alone, and for the three map fields
+* it is each ENTRY that is left alone. Per-entry matters both ways — a
+* workspace manifest pins its `dependencies` to exact installed versions and
+* must keep them, while a single agent-added `devDependencies` entry must not
+* shadow the whole toolchain block.
+*
+* Returns null when nothing was missing, so the common case writes no file.
+*/
+function mergeScaffoldManifest(existing, scaffold) {
+	const merged = { ...existing };
+	let changed = false;
+	for (const [key, value] of Object.entries(scaffold)) {
+		const mine = merged[key];
+		if (mine === void 0) {
+			merged[key] = value;
+			changed = true;
+			continue;
+		}
+		if (!MERGED_MANIFEST_FIELDS.includes(key)) continue;
+		if (!(isRecord(mine) && isRecord(value))) continue;
+		const entries = { ...mine };
+		for (const [dep, spec] of Object.entries(value)) {
+			if (dep in entries) continue;
+			entries[dep] = spec;
+			changed = true;
+		}
+		merged[key] = entries;
+	}
+	return changed ? merged : null;
+}
+/**
+* Merge the scaffold's package.json UNDER the one already in `targetDir`.
+*
+* The file-level layering below can only skip a manifest that already exists,
+* and for `aai pull` that manifest is the studio workspace's — which declares
+* its runtime dependencies and nothing else. Toolchain packages are baked into
+* the guest sandbox, so the workspace deliberately never names them (see
+* aai-guest/studio-project-shape.ts); on a laptop nothing bakes them, so
+* `pnpm install` fetched no `vite`, no `@vitejs/plugin-react`, no
+* `@tailwindcss/vite`, and `aai dev` died resolving the vite.config.ts the
+* very same layering had just written. Completing the manifest is the same job
+* as completing the file tree.
+*/
+async function layerScaffoldManifest(scaffoldDir, targetDir) {
+	const target = path.join(targetDir, "package.json");
+	const [mine, theirs] = await Promise.all([readJsonFile(target), readJsonFile(path.join(scaffoldDir, "package.json"))]);
+	if (!(mine && theirs)) return;
+	const merged = mergeScaffoldManifest(mine, theirs);
+	if (merged) await fs.writeFile(target, `${JSON.stringify(merged, null, 2)}\n`, "utf-8");
+}
+/** Parse a JSON file, or null when it is missing or unparseable. */
+async function readJsonFile(file) {
+	try {
+		const parsed = JSON.parse(await fs.readFile(file, "utf-8"));
+		return isRecord(parsed) ? parsed : null;
+	} catch {
+		return null;
+	}
+}
 /**
 * Layer the base scaffold (package.json, tsconfig, …) into targetDir
 * WITHOUT overwriting anything already there. Shared by `aai init`
@@ -53,14 +125,19 @@ async function listTemplates(root = resolveTemplatesDir()) {
 * files — the workspace stores source, and the scaffold completes it into a
 * runnable project the same way the guest's `ensureProjectShape` does
 * before an in-sandbox build).
+*
+* package.json is the one file merged rather than skipped — see
+* {@link layerScaffoldManifest}.
 */
 async function layerScaffold(targetDir) {
 	const scaffoldDir = path.join(resolveTemplatesDir(), "scaffold");
-	if (existsSync(scaffoldDir)) await fs.cp(scaffoldDir, targetDir, {
+	if (!existsSync(scaffoldDir)) return;
+	await fs.cp(scaffoldDir, targetDir, {
 		recursive: true,
 		force: false,
 		errorOnExist: false
 	});
+	await layerScaffoldManifest(scaffoldDir, targetDir);
 }
 /**
 * Copy a template into targetDir, merging scaffold files underneath.

package/dist/_templates.d.ts

@@ -21,6 +21,20 @@ export declare function bundledTemplatesDir(): string;
  * can never drift.
  */
 export declare function listTemplates(root?: string): Promise<string[]>;
+type Manifest = Record<string, unknown>;
+/**
+ * Fill a manifest's gaps from the scaffold's, `existing` always winning.
+ *
+ * The same rule the file layering uses, one level deeper: a top-level field
+ * the manifest already declares is left alone, and for the three map fields
+ * it is each ENTRY that is left alone. Per-entry matters both ways — a
+ * workspace manifest pins its `dependencies` to exact installed versions and
+ * must keep them, while a single agent-added `devDependencies` entry must not
+ * shadow the whole toolchain block.
+ *
+ * Returns null when nothing was missing, so the common case writes no file.
+ */
+export declare function mergeScaffoldManifest(existing: Manifest, scaffold: Manifest): Manifest | null;
 /**
  * Layer the base scaffold (package.json, tsconfig, …) into targetDir
  * WITHOUT overwriting anything already there. Shared by `aai init`
@@ -28,9 +42,13 @@ export declare function listTemplates(root?: string): Promise<string[]>;
  * files — the workspace stores source, and the scaffold completes it into a
  * runnable project the same way the guest's `ensureProjectShape` does
  * before an in-sandbox build).
+ *
+ * package.json is the one file merged rather than skipped — see
+ * {@link layerScaffoldManifest}.
  */
 export declare function layerScaffold(targetDir: string): Promise<void>;
 /**
  * Copy a template into targetDir, merging scaffold files underneath.
  */
 export declare function downloadAndMergeTemplate(template: string, targetDir: string): Promise<void>;
+export {};

package/dist/cli.mjs

@@ -165,7 +165,7 @@ const list = defineCommand({
 	async run({ args }) {
 		await runCommand(args, async () => {
 			const cwd = resolveCwd();
-			const { executeList } = await import("./studio-sXvYUxr5.mjs");
+			const { executeList } = await import("./studio-_UBBvh5V.mjs");
 			return executeList({
 				cwd,
 				server: args.server
@@ -200,7 +200,7 @@ const pull = defineCommand({
 	async run({ args }) {
 		await runCommand(args, async () => {
 			const cwd = resolveCwd();
-			const { executePull } = await import("./studio-sXvYUxr5.mjs");
+			const { executePull } = await import("./studio-_UBBvh5V.mjs");
 			return executePull({
 				cwd,
 				project: args.project,
@@ -228,7 +228,7 @@ const push = defineCommand({
 	async run({ args }) {
 		await runCommand(args, async () => {
 			const cwd = await setup({ agent: true });
-			const { executePush } = await import("./studio-sXvYUxr5.mjs");
+			const { executePush } = await import("./studio-_UBBvh5V.mjs");
 			return executePush({
 				cwd,
 				server: args.server,
@@ -258,7 +258,7 @@ const publish = defineCommand({
 	async run({ args }) {
 		await runCommand(args, async () => {
 			const cwd = await setup({ agent: true });
-			const { executePublish } = await import("./studio-sXvYUxr5.mjs");
+			const { executePublish } = await import("./studio-_UBBvh5V.mjs");
 			return executePublish({
 				cwd,
 				server: args.server,
@@ -316,7 +316,7 @@ const init = defineCommand({
 	},
 	async run({ args }) {
 		await runCommand(args, async (mode) => {
-			const { executeInit } = await import("./init-BT-IU9AR.mjs");
+			const { executeInit } = await import("./init-BpBbttOv.mjs");
 			return executeInit({
 				dir: args.dir,
 				force: args.force,
@@ -623,7 +623,7 @@ const templates = defineCommand({
 	args: { json: sharedArgs.json },
 	async run({ args }) {
 		await runCommand(args, async (mode) => {
-			const { listTemplates } = await import("./_templates-Bt6u9_68.mjs");
+			const { listTemplates } = await import("./_templates-BfyRyE7z.mjs");
 			const names = await listTemplates();
 			if (mode === "human") {
 				for (const name of names) log.message(name);

package/dist/{init-BT-IU9AR.mjs → init-BpBbttOv.mjs}

@@ -74,7 +74,7 @@ function resolveTargetDir(dir) {
 }
 /** Publish after init and return deploy metadata if successful. */
 async function tryPublish(cwd, server) {
-	const { executePublish } = await import("./studio-sXvYUxr5.mjs");
+	const { executePublish } = await import("./studio-_UBBvh5V.mjs");
 	try {
 		const result = await executePublish({
 			cwd,
@@ -93,7 +93,7 @@ async function tryPublish(cwd, server) {
 }
 /** Scaffold the project, optionally showing a spinner. */
 async function scaffoldProject(dir, cwd, template, silent) {
-	const { runInit } = await import("./_init-D7JIT-IJ.mjs");
+	const { runInit } = await import("./_init-Dei2JRmn.mjs");
 	const s = silent ? void 0 : p.spinner();
 	s?.start(`Creating ${dir}`);
 	await runInit({

package/dist/scaffold/CLAUDE.md

@@ -196,7 +196,7 @@ export default agent({
 
 **Prefer pipeline mode** — the default — unless the user specifically
 asks for the speech-to-speech API. Nearly every template ships this way, and
-it is what the App Builder defaults to. The host runs the LLM loop locally
+it is what AssemblyAI Build defaults to. The host runs the LLM loop locally
 (Vercel AI SDK) with your chosen STT, LLM, and TTS. You want explicit
 providers when:
 

package/dist/scaffold/package.json

@@ -11,15 +11,15 @@
     "publish:agent": "aai publish"
   },
   "dependencies": {
-    "@alexkroman1/aai": "^5.7.0",
-    "@alexkroman1/aai-ui": "^5.7.0",
+    "@alexkroman1/aai": "^5.8.1",
+    "@alexkroman1/aai-ui": "^5.8.1",
     "react": "^19.2.8",
     "react-dom": "^19.2.8",
     "tailwindcss": "^4.0.0",
     "zod": "^4.4.3"
   },
   "devDependencies": {
-    "@alexkroman1/aai-cli": "^5.7.0",
+    "@alexkroman1/aai-cli": "^5.8.1",
     "@tailwindcss/vite": "^4.3.3",
     "@types/node": "^26.1.1",
     "@types/react": "^19.2.17",

package/dist/{studio-sXvYUxr5.mjs → studio-_UBBvh5V.mjs}

@@ -3,7 +3,7 @@ import { n as log, o as CliError, t as fmtUrl, u as ok } from "./_ui-8kOEB-JH.mj
 import { s as updateProjectConfig } from "./_config-Y5V-5Krn.mjs";
 import { t as resolveServerEnv } from "./_server-common-CnaP_Urf.mjs";
 import { i as resolveDeployTarget } from "./_agent-2nVugrN3.mjs";
-import { layerScaffold } from "./_templates-Bt6u9_68.mjs";
+import { layerScaffold } from "./_templates-BfyRyE7z.mjs";
 import { n as apiRequest } from "./_api-client-B-upMGkc.mjs";
 import path from "node:path";
 import { mkdir, readFile, readdir, stat, writeFile } from "node:fs/promises";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alexkroman1/aai-cli",
-  "version": "5.7.0",
+  "version": "5.8.1",
   "type": "module",
   "bin": {
     "aai": "dist/cli.mjs"
@@ -37,8 +37,8 @@
     "p-timeout": "^7.0.1",
     "vite": "^8.1.5",
     "zod": "^4.4.3",
-    "@alexkroman1/aai": "5.7.0",
-    "@alexkroman1/aai-ui": "5.7.0"
+    "@alexkroman1/aai-ui": "5.8.1",
+    "@alexkroman1/aai": "5.8.1"
   },
   "devDependencies": {
     "playwright": "^1.61.1",