assistant-ui 0.0.121 → 0.0.122

package/dist/lib/utils/download.js

@@ -0,0 +1,41 @@
+import { downloadTemplate } from "giget";
+//#region src/lib/utils/download.ts
+const DOWNLOAD_TIMEOUT_MS = 3e4;
+function resolveGitHubAuthToken() {
+	return (process.env.GIGET_AUTH ?? process.env.GITHUB_TOKEN ?? process.env.GH_TOKEN)?.trim() || void 0;
+}
+async function withStagedDownload(source, options, timeoutMessage, cleanup, consumeDownload) {
+	const origDebug = process.env.DEBUG;
+	delete process.env.DEBUG;
+	let download;
+	let settled = false;
+	try {
+		const authToken = resolveGitHubAuthToken();
+		download = downloadTemplate(source, {
+			...options,
+			...authToken ? { auth: authToken } : {}
+		}).finally(() => {
+			settled = true;
+		});
+		let timer;
+		const timeout = new Promise((_, reject) => {
+			timer = setTimeout(() => reject(new Error(timeoutMessage)), DOWNLOAD_TIMEOUT_MS);
+		});
+		try {
+			return await consumeDownload(Promise.race([download, timeout]));
+		} finally {
+			clearTimeout(timer);
+		}
+	} finally {
+		try {
+			if (!download || settled) await cleanup();
+			else download.then(cleanup, cleanup);
+		} finally {
+			if (origDebug !== void 0) process.env.DEBUG = origDebug;
+		}
+	}
+}
+//#endregion
+export { DOWNLOAD_TIMEOUT_MS, resolveGitHubAuthToken, withStagedDownload };
+
+//# sourceMappingURL=download.js.map

package/dist/lib/utils/download.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"download.js","names":[],"sources":["../../../src/lib/utils/download.ts"],"sourcesContent":["import { downloadTemplate } from \"giget\";\n\nexport const DOWNLOAD_TIMEOUT_MS = 30_000;\n\nexport function resolveGitHubAuthToken(): string | undefined {\n  const token =\n    process.env.GIGET_AUTH ?? process.env.GITHUB_TOKEN ?? process.env.GH_TOKEN;\n  const trimmed = token?.trim();\n  return trimmed || undefined;\n}\n\nexport async function withStagedDownload<T>(\n  source: string,\n  options: NonNullable<Parameters<typeof downloadTemplate>[1]>,\n  timeoutMessage: string,\n  cleanup: () => void | Promise<void>,\n  consumeDownload: (download: Promise<unknown>) => Promise<T>,\n): Promise<T> {\n  // giget logs to console.debug whenever DEBUG is set, which the `debug`\n  // package does at module load for an unrelated namespace.\n  const origDebug = process.env.DEBUG;\n  delete process.env.DEBUG;\n  let download: Promise<unknown> | undefined;\n  let settled = false;\n  try {\n    const authToken = resolveGitHubAuthToken();\n    download = downloadTemplate(source, {\n      ...options,\n      ...(authToken ? { auth: authToken } : {}),\n    }).finally(() => {\n      settled = true;\n    });\n\n    let timer: ReturnType<typeof setTimeout>;\n    const timeout = new Promise<never>((_, reject) => {\n      timer = setTimeout(\n        () => reject(new Error(timeoutMessage)),\n        DOWNLOAD_TIMEOUT_MS,\n      );\n    });\n    try {\n      return await consumeDownload(Promise.race([download, timeout]));\n    } finally {\n      clearTimeout(timer!);\n    }\n  } finally {\n    try {\n      if (!download || settled) {\n        await cleanup();\n      } else {\n        void download.then(cleanup, cleanup);\n      }\n    } finally {\n      if (origDebug !== undefined) process.env.DEBUG = origDebug;\n    }\n  }\n}\n"],"mappings":";;AAEA,MAAa,sBAAsB;AAEnC,SAAgB,yBAA6C;CAI3D,QAFE,QAAQ,IAAI,cAAc,QAAQ,IAAI,gBAAgB,QAAQ,IAAI,SAAA,EAC7C,KAAK,KACV,KAAA;AACpB;AAEA,eAAsB,mBACpB,QACA,SACA,gBACA,SACA,iBACY;CAGZ,MAAM,YAAY,QAAQ,IAAI;CAC9B,OAAO,QAAQ,IAAI;CACnB,IAAI;CACJ,IAAI,UAAU;CACd,IAAI;EACF,MAAM,YAAY,uBAAuB;EACzC,WAAW,iBAAiB,QAAQ;GAClC,GAAG;GACH,GAAI,YAAY,EAAE,MAAM,UAAU,IAAI,CAAC;EACzC,CAAC,CAAC,CAAC,cAAc;GACf,UAAU;EACZ,CAAC;EAED,IAAI;EACJ,MAAM,UAAU,IAAI,SAAgB,GAAG,WAAW;GAChD,QAAQ,iBACA,OAAO,IAAI,MAAM,cAAc,CAAC,GACtC,mBACF;EACF,CAAC;EACD,IAAI;GACF,OAAO,MAAM,gBAAgB,QAAQ,KAAK,CAAC,UAAU,OAAO,CAAC,CAAC;EAChE,UAAU;GACR,aAAa,KAAM;EACrB;CACF,UAAU;EACR,IAAI;GACF,IAAI,CAAC,YAAY,SACf,MAAM,QAAQ;QAEd,SAAc,KAAK,SAAS,OAAO;EAEvC,UAAU;GACR,IAAI,cAAc,KAAA,GAAW,QAAQ,IAAI,QAAQ;EACnD;CACF;AACF"}

package/dist/lib/utils/file-scanner.d.ts

@@ -12,5 +12,4 @@ export declare function readProjectFiles(pattern: string, options: {
     content: string;
 }>;
 export declare function scanForImport(importPattern: string | string[], options?: ScanOptions): boolean;
-export declare function getFilesContaining(searchString: string, options?: ScanOptions): string[];
 //# sourceMappingURL=file-scanner.d.ts.map

package/dist/lib/utils/file-scanner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"file-scanner.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/file-scanner.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,WAAW;IAC1B,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;CACnB;AAED,wBAAiB,gBAAgB,CAC/B,OAAO,EAAE,MAAM,EACf,OAAO,EAAE;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAA;CAAE,GAC1C,SAAS,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC,CAYhE;AAED,wBAAgB,aAAa,CAC3B,aAAa,EAAE,MAAM,GAAG,MAAM,EAAE,EAChC,OAAO,GAAE,WAAgB,GACxB,OAAO,CAoBT;AAED,wBAAgB,kBAAkB,CAChC,YAAY,EAAE,MAAM,EACpB,OAAO,GAAE,WAAgB,GACxB,MAAM,EAAE,CAqBV"}
+{"version":3,"file":"file-scanner.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/file-scanner.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,WAAW;IAC1B,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;CACnB;AAED,wBAAiB,gBAAgB,CAC/B,OAAO,EAAE,MAAM,EACf,OAAO,EAAE;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAA;CAAE,GAC1C,SAAS,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC,CAYhE;AAED,wBAAgB,aAAa,CAC3B,aAAa,EAAE,MAAM,GAAG,MAAM,EAAE,EAChC,OAAO,GAAE,WAAgB,GACxB,OAAO,CAoBT"}

package/dist/lib/utils/file-scanner.js

@@ -32,22 +32,7 @@ function scanForImport(importPattern, options = {}) {
 	})) if (patterns.some((p) => content.includes(p))) return true;
 	return false;
 }
-function getFilesContaining(searchString, options = {}) {
-	const cwd = options.cwd || process.cwd();
-	const pattern = options.pattern || "**/*.{js,jsx,ts,tsx}";
-	const ignore = options.ignore || [
-		"**/node_modules/**",
-		"**/dist/**",
-		"**/build/**"
-	];
-	const result = [];
-	for (const { fullPath, content } of readProjectFiles(pattern, {
-		cwd,
-		ignore
-	})) if (content.includes(searchString)) result.push(fullPath);
-	return result;
-}
 //#endregion
-export { getFilesContaining, readProjectFiles, scanForImport };
+export { readProjectFiles, scanForImport };
 
 //# sourceMappingURL=file-scanner.js.map

package/dist/lib/utils/file-scanner.js.map

@@ -1 +1 @@
-{"version":3,"file":"file-scanner.js","names":["globSync","path","fs"],"sources":["../../../src/lib/utils/file-scanner.ts"],"sourcesContent":["import * as fs from \"node:fs\";\nimport * as path from \"node:path\";\nimport { sync as globSync } from \"glob\";\n\nexport interface ScanOptions {\n  cwd?: string;\n  pattern?: string;\n  ignore?: string[];\n}\n\nexport function* readProjectFiles(\n  pattern: string,\n  options: { cwd: string; ignore?: string[] },\n): Generator<{ file: string; fullPath: string; content: string }> {\n  const files = globSync(pattern, options);\n\n  for (const file of files) {\n    const fullPath = path.join(options.cwd, file);\n    try {\n      const content = fs.readFileSync(fullPath, \"utf8\");\n      yield { file, fullPath, content };\n    } catch {\n      continue;\n    }\n  }\n}\n\nexport function scanForImport(\n  importPattern: string | string[],\n  options: ScanOptions = {},\n): boolean {\n  const cwd = options.cwd || process.cwd();\n  const pattern = options.pattern || \"**/*.{js,jsx,ts,tsx}\";\n  const ignore = options.ignore || [\n    \"**/node_modules/**\",\n    \"**/dist/**\",\n    \"**/build/**\",\n  ];\n\n  const patterns = Array.isArray(importPattern)\n    ? importPattern\n    : [importPattern];\n\n  for (const { content } of readProjectFiles(pattern, { cwd, ignore })) {\n    if (patterns.some((p) => content.includes(p))) {\n      return true;\n    }\n  }\n\n  return false;\n}\n\nexport function getFilesContaining(\n  searchString: string,\n  options: ScanOptions = {},\n): string[] {\n  const cwd = options.cwd || process.cwd();\n  const pattern = options.pattern || \"**/*.{js,jsx,ts,tsx}\";\n  const ignore = options.ignore || [\n    \"**/node_modules/**\",\n    \"**/dist/**\",\n    \"**/build/**\",\n  ];\n\n  const result: string[] = [];\n\n  for (const { fullPath, content } of readProjectFiles(pattern, {\n    cwd,\n    ignore,\n  })) {\n    if (content.includes(searchString)) {\n      result.push(fullPath);\n    }\n  }\n\n  return result;\n}\n"],"mappings":";;;;AAUA,UAAiB,iBACf,SACA,SACgE;CAChE,MAAM,QAAQA,KAAS,SAAS,OAAO;CAEvC,KAAK,MAAM,QAAQ,OAAO;EACxB,MAAM,WAAWC,OAAK,KAAK,QAAQ,KAAK,IAAI;EAC5C,IAAI;GAEF,MAAM;IAAE;IAAM;IAAU,SADRC,KAAG,aAAa,UAAU,MACZ;GAAE;EAClC,QAAQ;GACN;EACF;CACF;AACF;AAEA,SAAgB,cACd,eACA,UAAuB,CAAC,GACf;CACT,MAAM,MAAM,QAAQ,OAAO,QAAQ,IAAI;CACvC,MAAM,UAAU,QAAQ,WAAW;CACnC,MAAM,SAAS,QAAQ,UAAU;EAC/B;EACA;EACA;CACF;CAEA,MAAM,WAAW,MAAM,QAAQ,aAAa,IACxC,gBACA,CAAC,aAAa;CAElB,KAAK,MAAM,EAAE,aAAa,iBAAiB,SAAS;EAAE;EAAK;CAAO,CAAC,GACjE,IAAI,SAAS,MAAM,MAAM,QAAQ,SAAS,CAAC,CAAC,GAC1C,OAAO;CAIX,OAAO;AACT;AAEA,SAAgB,mBACd,cACA,UAAuB,CAAC,GACd;CACV,MAAM,MAAM,QAAQ,OAAO,QAAQ,IAAI;CACvC,MAAM,UAAU,QAAQ,WAAW;CACnC,MAAM,SAAS,QAAQ,UAAU;EAC/B;EACA;EACA;CACF;CAEA,MAAM,SAAmB,CAAC;CAE1B,KAAK,MAAM,EAAE,UAAU,aAAa,iBAAiB,SAAS;EAC5D;EACA;CACF,CAAC,GACC,IAAI,QAAQ,SAAS,YAAY,GAC/B,OAAO,KAAK,QAAQ;CAIxB,OAAO;AACT"}
+{"version":3,"file":"file-scanner.js","names":["globSync","path","fs"],"sources":["../../../src/lib/utils/file-scanner.ts"],"sourcesContent":["import * as fs from \"node:fs\";\nimport * as path from \"node:path\";\nimport { sync as globSync } from \"glob\";\n\nexport interface ScanOptions {\n  cwd?: string;\n  pattern?: string;\n  ignore?: string[];\n}\n\nexport function* readProjectFiles(\n  pattern: string,\n  options: { cwd: string; ignore?: string[] },\n): Generator<{ file: string; fullPath: string; content: string }> {\n  const files = globSync(pattern, options);\n\n  for (const file of files) {\n    const fullPath = path.join(options.cwd, file);\n    try {\n      const content = fs.readFileSync(fullPath, \"utf8\");\n      yield { file, fullPath, content };\n    } catch {\n      continue;\n    }\n  }\n}\n\nexport function scanForImport(\n  importPattern: string | string[],\n  options: ScanOptions = {},\n): boolean {\n  const cwd = options.cwd || process.cwd();\n  const pattern = options.pattern || \"**/*.{js,jsx,ts,tsx}\";\n  const ignore = options.ignore || [\n    \"**/node_modules/**\",\n    \"**/dist/**\",\n    \"**/build/**\",\n  ];\n\n  const patterns = Array.isArray(importPattern)\n    ? importPattern\n    : [importPattern];\n\n  for (const { content } of readProjectFiles(pattern, { cwd, ignore })) {\n    if (patterns.some((p) => content.includes(p))) {\n      return true;\n    }\n  }\n\n  return false;\n}\n"],"mappings":";;;;AAUA,UAAiB,iBACf,SACA,SACgE;CAChE,MAAM,QAAQA,KAAS,SAAS,OAAO;CAEvC,KAAK,MAAM,QAAQ,OAAO;EACxB,MAAM,WAAWC,OAAK,KAAK,QAAQ,KAAK,IAAI;EAC5C,IAAI;GAEF,MAAM;IAAE;IAAM;IAAU,SADRC,KAAG,aAAa,UAAU,MACZ;GAAE;EAClC,QAAQ;GACN;EACF;CACF;AACF;AAEA,SAAgB,cACd,eACA,UAAuB,CAAC,GACf;CACT,MAAM,MAAM,QAAQ,OAAO,QAAQ,IAAI;CACvC,MAAM,UAAU,QAAQ,WAAW;CACnC,MAAM,SAAS,QAAQ,UAAU;EAC/B;EACA;EACA;CACF;CAEA,MAAM,WAAW,MAAM,QAAQ,aAAa,IACxC,gBACA,CAAC,aAAa;CAElB,KAAK,MAAM,EAAE,aAAa,iBAAiB,SAAS;EAAE;EAAK;CAAO,CAAC,GACjE,IAAI,SAAS,MAAM,MAAM,QAAQ,SAAS,CAAC,CAAC,GAC1C,OAAO;CAIX,OAAO;AACT"}

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

@@ -1,4 +1,11 @@
 export type PackageManagerName = "npm" | "pnpm" | "yarn" | "bun";
+export declare function dlxCommand(pm: PackageManagerName): [string, string[]];
+export declare function resolvePackageManager(opts: {
+    useNpm?: boolean;
+    usePnpm?: boolean;
+    useYarn?: boolean;
+    useBun?: boolean;
+}): PackageManagerName | undefined;
 export declare function askQuestion(query: string): Promise<string>;
 export declare function isPackageInstalled(pkg: string, cwd?: string): boolean;
 export interface InstallCommand {

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,MAAM,MAAM,kBAAkB,GAAG,KAAK,GAAG,MAAM,GAAG,MAAM,GAAG,KAAK,CAAC;AAEjE,wBAAgB,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAkC1D;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;AAYD,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,MAAM,EACX,cAAc,CAAC,EAAE,kBAAkB,GAClC,OAAO,CAAC,kBAAkB,CAAC,CAS7B;AAED,wBAAsB,cAAc,CAClC,WAAW,EAAE,MAAM,EACnB,GAAG,CAAC,EAAE,MAAM,GACX,OAAO,CAAC,OAAO,CAAC,CAUlB"}
+{"version":3,"file":"package-manager.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/package-manager.ts"],"names":[],"mappings":"AAOA,MAAM,MAAM,kBAAkB,GAAG,KAAK,GAAG,MAAM,GAAG,MAAM,GAAG,KAAK,CAAC;AAEjE,wBAAgB,UAAU,CAAC,EAAE,EAAE,kBAAkB,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAWrE;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE;IAC1C,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,GAAG,kBAAkB,GAAG,SAAS,CAMjC;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAkC1D;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;AAYD,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,MAAM,EACX,cAAc,CAAC,EAAE,kBAAkB,GAClC,OAAO,CAAC,kBAAkB,CAAC,CAS7B;AAED,wBAAsB,cAAc,CAClC,WAAW,EAAE,MAAM,EACnB,GAAG,CAAC,EAAE,MAAM,GACX,OAAO,CAAC,OAAO,CAAC,CAUlB"}

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

@@ -5,6 +5,20 @@ import * as path$1 from "node:path";
 import { detect } from "detect-package-manager";
 import * as readline from "node:readline";
 //#region src/lib/utils/package-manager.ts
+function dlxCommand(pm) {
+	switch (pm) {
+		case "pnpm": return ["pnpm", ["dlx"]];
+		case "yarn": return ["yarn", ["dlx"]];
+		case "bun": return ["bunx", []];
+		case "npm": return ["npx", ["--yes"]];
+	}
+}
+function resolvePackageManager(opts) {
+	if (opts.useNpm) return "npm";
+	if (opts.usePnpm) return "pnpm";
+	if (opts.useYarn) return "yarn";
+	if (opts.useBun) return "bun";
+}
 function askQuestion(query) {
 	return new Promise((resolve) => {
 		if (process.stdin.readableEnded) {
@@ -93,6 +107,6 @@ async function installPackage(packageName, cwd) {
 	}
 }
 //#endregion
-export { askQuestion, getInstallCommand, installPackage, isPackageInstalled, resolvePackageManagerForCwd };
+export { askQuestion, dlxCommand, getInstallCommand, installPackage, isPackageInstalled, resolvePackageManager, resolvePackageManagerForCwd };
 
 //# sourceMappingURL=package-manager.js.map

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

@@ -1 +1 @@
-{"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 { detect } from \"detect-package-manager\";\nimport * as readline from \"node:readline\";\nimport { logger } from \"./logger\";\nimport { runSpawn, SpawnSignalError } from \"../run-spawn\";\n\nexport type PackageManagerName = \"npm\" | \"pnpm\" | \"yarn\" | \"bun\";\n\nexport function askQuestion(query: string): Promise<string> {\n  return new Promise((resolve) => {\n    // A stream only reaches EOF once, so a run that already consumed stdin gets\n    // no further `end` and an interface built over it would wait on a `close`\n    // that cannot arrive. An upgrade asks up to three questions.\n    if (process.stdin.readableEnded) {\n      resolve(\"\");\n      return;\n    }\n    const rl = readline.createInterface({\n      input: process.stdin,\n      output: process.stdout,\n    });\n    // stdin at EOF (a piped or CI run) emits `close` without a `line`, so the\n    // question callback alone would leave this pending forever and the process\n    // would exit 0 with the remaining work silently skipped. An empty answer is\n    // what pressing Enter sends, so EOF lands on the prompt's own default.\n    // A final answer with no trailing newline arrives as `line` instead of\n    // through the callback, and has to win over that default.\n    // Ctrl-C in raw mode is delivered as this event rather than as a signal,\n    // and without a listener readline answers it by closing — which the EOF\n    // default would then read as approval. A cancelled prompt declines.\n    let cancelled = false;\n    rl.on(\"SIGINT\", () => {\n      cancelled = true;\n      rl.close();\n    });\n    rl.on(\"line\", resolve);\n    rl.on(\"close\", () => resolve(cancelled ? \"n\" : \"\"));\n    rl.question(query, (answer) => {\n      resolve(answer);\n      rl.close();\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\nfunction detectFromUserAgent(): PackageManagerName | undefined {\n  const ua = process.env.npm_config_user_agent;\n  if (!ua) return undefined;\n  if (ua.startsWith(\"bun/\")) return \"bun\";\n  if (ua.startsWith(\"pnpm/\")) return \"pnpm\";\n  if (ua.startsWith(\"yarn/\")) return \"yarn\";\n  if (ua.startsWith(\"npm/\")) return \"npm\";\n  return undefined;\n}\n\nexport async function resolvePackageManagerForCwd(\n  cwd: string,\n  packageManager?: PackageManagerName,\n): Promise<PackageManagerName> {\n  if (packageManager) return packageManager;\n  const fromAgent = detectFromUserAgent();\n  if (fromAgent) return fromAgent;\n  try {\n    return await detect({ cwd });\n  } catch {\n    return \"npm\";\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    await runSpawn(command, args, cwd);\n    return true;\n  } catch (e) {\n    if (e instanceof SpawnSignalError) throw e;\n    logger.error(`Installation failed: ${String(e)}`);\n    return false;\n  }\n}\n"],"mappings":";;;;;;;AASA,SAAgB,YAAY,OAAgC;CAC1D,OAAO,IAAI,SAAS,YAAY;EAI9B,IAAI,QAAQ,MAAM,eAAe;GAC/B,QAAQ,EAAE;GACV;EACF;EACA,MAAM,KAAK,SAAS,gBAAgB;GAClC,OAAO,QAAQ;GACf,QAAQ,QAAQ;EAClB,CAAC;EAUD,IAAI,YAAY;EAChB,GAAG,GAAG,gBAAgB;GACpB,YAAY;GACZ,GAAG,MAAM;EACX,CAAC;EACD,GAAG,GAAG,QAAQ,OAAO;EACrB,GAAG,GAAG,eAAe,QAAQ,YAAY,MAAM,EAAE,CAAC;EAClD,GAAG,SAAS,QAAQ,WAAW;GAC7B,QAAQ,MAAM;GACd,GAAG,MAAM;EACX,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,SAAS,sBAAsD;CAC7D,MAAM,KAAK,QAAQ,IAAI;CACvB,IAAI,CAAC,IAAI,OAAO,KAAA;CAChB,IAAI,GAAG,WAAW,MAAM,GAAG,OAAO;CAClC,IAAI,GAAG,WAAW,OAAO,GAAG,OAAO;CACnC,IAAI,GAAG,WAAW,OAAO,GAAG,OAAO;CACnC,IAAI,GAAG,WAAW,MAAM,GAAG,OAAO;AAEpC;AAEA,eAAsB,4BACpB,KACA,gBAC6B;CAC7B,IAAI,gBAAgB,OAAO;CAC3B,MAAM,YAAY,oBAAoB;CACtC,IAAI,WAAW,OAAO;CACtB,IAAI;EACF,OAAO,MAAM,OAAO,EAAE,IAAI,CAAC;CAC7B,QAAQ;EACN,OAAO;CACT;AACF;AAEA,eAAsB,eACpB,aACA,KACkB;CAClB,IAAI;EACF,MAAM,EAAE,SAAS,SAAS,MAAM,kBAAkB,aAAa,GAAG;EAClE,MAAM,SAAS,SAAS,MAAM,GAAG;EACjC,OAAO;CACT,SAAS,GAAG;EACV,IAAI,aAAa,kBAAkB,MAAM;EACzC,OAAO,MAAM,wBAAwB,OAAO,CAAC,GAAG;EAChD,OAAO;CACT;AACF"}
+{"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 { detect } from \"detect-package-manager\";\nimport * as readline from \"node:readline\";\nimport { logger } from \"./logger\";\nimport { runSpawn, SpawnSignalError } from \"../run-spawn\";\n\nexport type PackageManagerName = \"npm\" | \"pnpm\" | \"yarn\" | \"bun\";\n\nexport function dlxCommand(pm: PackageManagerName): [string, string[]] {\n  switch (pm) {\n    case \"pnpm\":\n      return [\"pnpm\", [\"dlx\"]];\n    case \"yarn\":\n      return [\"yarn\", [\"dlx\"]];\n    case \"bun\":\n      return [\"bunx\", []];\n    case \"npm\":\n      return [\"npx\", [\"--yes\"]];\n  }\n}\n\nexport function resolvePackageManager(opts: {\n  useNpm?: boolean;\n  usePnpm?: boolean;\n  useYarn?: boolean;\n  useBun?: boolean;\n}): PackageManagerName | undefined {\n  if (opts.useNpm) return \"npm\";\n  if (opts.usePnpm) return \"pnpm\";\n  if (opts.useYarn) return \"yarn\";\n  if (opts.useBun) return \"bun\";\n  return undefined;\n}\n\nexport function askQuestion(query: string): Promise<string> {\n  return new Promise((resolve) => {\n    // A stream only reaches EOF once, so a run that already consumed stdin gets\n    // no further `end` and an interface built over it would wait on a `close`\n    // that cannot arrive. An upgrade asks up to three questions.\n    if (process.stdin.readableEnded) {\n      resolve(\"\");\n      return;\n    }\n    const rl = readline.createInterface({\n      input: process.stdin,\n      output: process.stdout,\n    });\n    // stdin at EOF (a piped or CI run) emits `close` without a `line`, so the\n    // question callback alone would leave this pending forever and the process\n    // would exit 0 with the remaining work silently skipped. An empty answer is\n    // what pressing Enter sends, so EOF lands on the prompt's own default.\n    // A final answer with no trailing newline arrives as `line` instead of\n    // through the callback, and has to win over that default.\n    // Ctrl-C in raw mode is delivered as this event rather than as a signal,\n    // and without a listener readline answers it by closing — which the EOF\n    // default would then read as approval. A cancelled prompt declines.\n    let cancelled = false;\n    rl.on(\"SIGINT\", () => {\n      cancelled = true;\n      rl.close();\n    });\n    rl.on(\"line\", resolve);\n    rl.on(\"close\", () => resolve(cancelled ? \"n\" : \"\"));\n    rl.question(query, (answer) => {\n      resolve(answer);\n      rl.close();\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\nfunction detectFromUserAgent(): PackageManagerName | undefined {\n  const ua = process.env.npm_config_user_agent;\n  if (!ua) return undefined;\n  if (ua.startsWith(\"bun/\")) return \"bun\";\n  if (ua.startsWith(\"pnpm/\")) return \"pnpm\";\n  if (ua.startsWith(\"yarn/\")) return \"yarn\";\n  if (ua.startsWith(\"npm/\")) return \"npm\";\n  return undefined;\n}\n\nexport async function resolvePackageManagerForCwd(\n  cwd: string,\n  packageManager?: PackageManagerName,\n): Promise<PackageManagerName> {\n  if (packageManager) return packageManager;\n  const fromAgent = detectFromUserAgent();\n  if (fromAgent) return fromAgent;\n  try {\n    return await detect({ cwd });\n  } catch {\n    return \"npm\";\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    await runSpawn(command, args, cwd);\n    return true;\n  } catch (e) {\n    if (e instanceof SpawnSignalError) throw e;\n    logger.error(`Installation failed: ${String(e)}`);\n    return false;\n  }\n}\n"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "assistant-ui",
-  "version": "0.0.121",
+  "version": "0.0.122",
   "description": "CLI for assistant-ui",
   "keywords": [
     "cli",
@@ -49,7 +49,7 @@
     "@types/cross-spawn": "^6.0.6",
     "@types/debug": "^4.1.13",
     "@types/jscodeshift": "^17.3.0",
-    "@types/node": "^26.6.3",
+    "@types/node": "^26.6.4",
     "@types/semver": "^7.8.0",
     "@vitest/coverage-v8": "^5.0.3",
     "vitest": "^5.0.3"
@@ -70,7 +70,7 @@
   "scripts": {
     "build": "aui-build && node scripts/copy-cloud-harness-template.mjs",
     "test": "vitest run && node --test scripts/copy-cloud-harness-template.test.mjs",
-    "test:coverage": "vitest run --coverage --coverage.reporter=text --coverage.reporter=html --coverage.reporter=json-summary",
+    "test:coverage": "vitest run --coverage --coverage.reporter=text --coverage.reporter=html --coverage.reporter=json-summary && node --test scripts/copy-cloud-harness-template.test.mjs",
     "typecheck": "tsc --noEmit && tsc --noEmit -p tsconfig.test.json",
     "test:watch": "vitest"
   }

package/src/commands/add.ts

@@ -6,9 +6,10 @@ import {
   getComponentsJsonStyle,
   resolveRegistryItemUrl,
 } from "../lib/utils/registry";
-import { dlxCommand, resolvePackageManager } from "../lib/create-project";
 import { runSpawn, SpawnExitError, SpawnSignalError } from "../lib/run-spawn";
 import {
+  dlxCommand,
+  resolvePackageManager,
   type PackageManagerName,
   resolvePackageManagerForCwd,
 } from "../lib/utils/package-manager";

package/src/commands/create.ts

@@ -6,10 +6,8 @@ import * as p from "@clack/prompts";
 import { logger } from "../lib/utils/logger";
 import {
   cleanupPendingProjectDownloads,
-  dlxCommand,
   downloadProject,
   resolveLatestReleaseRef,
-  resolvePackageManager,
   scaffoldProject,
   transformProject,
   type TransformResult,
@@ -20,7 +18,11 @@ import {
   SpawnExitError,
   SpawnSignalError,
 } from "../lib/run-spawn";
-import { resolvePackageManagerForCwd } from "../lib/utils/package-manager";
+import {
+  dlxCommand,
+  resolvePackageManager,
+  resolvePackageManagerForCwd,
+} from "../lib/utils/package-manager";
 import {
   buildSkillsAddCommand,
   resolveSkillsInstall,

package/src/commands/init.ts

@@ -1,10 +1,13 @@
 import { Command, Option } from "commander";
 import fs from "node:fs";
 import path from "node:path";
-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 {
+  dlxCommand,
+  resolvePackageManager,
+  resolvePackageManagerForCwd,
+} from "../lib/utils/package-manager";
 import {
   getComponentsJsonStyle,
   resolveQuickStartRegistryUrl,

package/src/commands/mcp.ts

@@ -2,6 +2,14 @@ import { Command } from "commander";
 import fs from "node:fs";
 import path from "node:path";
 import os from "node:os";
+import {
+  applyEdits,
+  parse as parseJsonc,
+  parseTree,
+  stripComments,
+  type Node,
+  type ParseError,
+} from "jsonc-parser";
 import { logger } from "../lib/utils/logger";
 import { runSpawn, SpawnExitError, SpawnSignalError } from "../lib/run-spawn";
 import * as p from "@clack/prompts";
@@ -21,22 +29,17 @@ const MCP_CONFIGS: Record<
   {
     name: string;
     getPath: () => string;
-    config: object;
-    replaceServerKey?: string;
+    serverKey: string;
+    server: object;
+    jsonc?: boolean;
     postInstall?: string;
   }
 > = {
   cursor: {
     name: "Cursor",
     getPath: () => path.join(process.cwd(), ".cursor", "mcp.json"),
-    config: {
-      mcpServers: {
-        "assistant-ui": {
-          url: HOSTED_MCP_URL,
-        },
-      },
-    },
-    replaceServerKey: "mcpServers",
+    serverKey: "mcpServers",
+    server: { url: HOSTED_MCP_URL },
     postInstall:
       "Open Cursor Settings → MCP → find 'assistant-ui' and click enable.",
   },
@@ -44,47 +47,33 @@ const MCP_CONFIGS: Record<
     name: "Windsurf",
     getPath: () =>
       path.join(os.homedir(), ".codeium", "windsurf", "mcp_config.json"),
-    config: {
-      mcpServers: {
-        "assistant-ui": {
-          serverUrl: HOSTED_MCP_URL,
-        },
-      },
-    },
-    replaceServerKey: "mcpServers",
+    serverKey: "mcpServers",
+    server: { serverUrl: HOSTED_MCP_URL },
     postInstall: "Fully quit and re-open Windsurf to activate.",
   },
   vscode: {
     name: "VSCode",
     getPath: () => path.join(process.cwd(), ".vscode", "mcp.json"),
-    config: {
-      servers: {
-        "assistant-ui": {
-          type: "http",
-          url: HOSTED_MCP_URL,
-        },
-      },
-    },
-    replaceServerKey: "servers",
+    serverKey: "servers",
+    server: { type: "http", url: HOSTED_MCP_URL },
+    jsonc: true,
     postInstall:
       "Enable MCP in Settings → search 'MCP' → enable 'Chat > MCP'. Use Copilot Chat in Agent mode.",
   },
   zed: {
     name: "Zed",
+    serverKey: "context_servers",
+    jsonc: true,
     getPath: () => {
       if (process.platform === "win32") {
         return path.join(process.env.APPDATA || "", "Zed", "settings.json");
       }
       return path.join(os.homedir(), ".config", "zed", "settings.json");
     },
-    config: {
-      context_servers: {
-        "assistant-ui": {
-          command: {
-            path: "npx",
-            args: ["-y", "@assistant-ui/mcp-docs-server"],
-          },
-        },
+    server: {
+      command: {
+        path: "npx",
+        args: ["-y", "@assistant-ui/mcp-docs-server"],
       },
     },
     postInstall: "The server starts automatically with the Assistant Panel.",
@@ -107,13 +96,10 @@ const MCP_CONFIGS: Record<
         "claude_desktop_config.json",
       );
     },
-    config: {
-      mcpServers: {
-        "assistant-ui": {
-          command: "npx",
-          args: ["-y", "@assistant-ui/mcp-docs-server"],
-        },
-      },
+    serverKey: "mcpServers",
+    server: {
+      command: "npx",
+      args: ["-y", "@assistant-ui/mcp-docs-server"],
     },
     postInstall: "Restart Claude Desktop to activate.",
   },
@@ -147,6 +133,162 @@ class McpConfigParseError extends Error {
 const getTargetFlag = (target: Exclude<MCPTarget, "claude-code">) =>
   `--${target}`;
 
+const lastPropertyValue = (node: Node, key: string) =>
+  node.children?.findLast((property) => property.children?.[0]?.value === key)
+    ?.children?.[1];
+
+const lineStartAt = (content: string, offset: number) =>
+  content.lastIndexOf("\n", offset - 1) + 1;
+
+const lineIndentAt = (content: string, offset: number) =>
+  content.slice(lineStartAt(content, offset), offset).match(/^[\t ]*/)?.[0] ??
+  "";
+
+const getIndentUnit = (content: string, object: Node) => {
+  const objectLine = lineStartAt(content, object.offset);
+  const objectIndent = lineIndentAt(content, object.offset);
+  const multilineChild = object.children?.find(
+    (child) => lineStartAt(content, child.offset) > objectLine,
+  );
+  if (multilineChild) {
+    const childIndent = lineIndentAt(content, multilineChild.offset);
+    if (
+      childIndent.startsWith(objectIndent) &&
+      childIndent.length > objectIndent.length
+    ) {
+      return childIndent.slice(objectIndent.length);
+    }
+  }
+
+  const documentIndent = content.match(/(?:^|\r?\n)([\t ]+)(?=")/)?.[1];
+  if (documentIndent?.includes("\t")) return "\t";
+  return documentIndent || "  ";
+};
+
+const stringifyValue = (
+  value: object,
+  baseIndent: string,
+  indentUnit: string,
+  eol: string,
+) =>
+  JSON.stringify(value, null, indentUnit).replaceAll(
+    "\n",
+    `${eol}${baseIndent}`,
+  );
+
+const appendObjectProperty = (
+  content: string,
+  object: Node,
+  key: string,
+  value: object,
+  eol: string,
+) => {
+  const objectIndent = lineIndentAt(content, object.offset);
+  const indentUnit = getIndentUnit(content, object);
+  const propertyIndent = objectIndent + indentUnit;
+  const property = `${propertyIndent}${JSON.stringify(key)}: ${stringifyValue(
+    value,
+    propertyIndent,
+    indentUnit,
+    eol,
+  )}`;
+  const closeOffset = object.offset + object.length - 1;
+  const closeLineStart = lineStartAt(content, closeOffset);
+  const closeOnOwnLine = /^[\t ]*$/.test(
+    content.slice(closeLineStart, closeOffset),
+  );
+  const edits = [
+    {
+      offset: closeOnOwnLine ? closeLineStart : closeOffset,
+      length: 0,
+      content: closeOnOwnLine
+        ? `${property}${eol}`
+        : `${eol}${property}${eol}${objectIndent}`,
+    },
+  ];
+
+  const lastProperty = object.children?.at(-1);
+  if (lastProperty) {
+    const propertyEnd = lastProperty.offset + lastProperty.length;
+    const trailingContent = stripComments(
+      content.slice(propertyEnd, closeOffset),
+    ).trimStart();
+    if (!trailingContent.startsWith(",")) {
+      edits.unshift({ offset: propertyEnd, length: 0, content: "," });
+    }
+  }
+
+  return applyEdits(content, edits);
+};
+
+const replaceNodeValue = (
+  content: string,
+  node: Node,
+  container: Node,
+  value: object,
+  eol: string,
+) =>
+  applyEdits(content, [
+    {
+      offset: node.offset,
+      length: node.length,
+      content: stringifyValue(
+        value,
+        lineIndentAt(content, node.offset),
+        getIndentUnit(content, container),
+        eol,
+      ),
+    },
+  ]);
+
+function updateJsoncConfig(
+  content: string,
+  serverKey: string,
+  server: object,
+): string {
+  const eol = content.includes("\r\n") ? "\r\n" : "\n";
+  const root = parseTree(content, [], {
+    allowTrailingComma: true,
+    allowEmptyContent: true,
+  });
+  if (!root) {
+    const initialized = JSON.stringify(
+      { [serverKey]: { "assistant-ui": server } },
+      null,
+      2,
+    ).replaceAll("\n", eol);
+    if (!content.trim()) return `${initialized}${eol}`;
+    return `${content}${content.endsWith(eol) ? "" : eol}${initialized}${eol}`;
+  }
+
+  // JSONC resolves duplicate keys to the last value.
+  const servers = lastPropertyValue(root, serverKey);
+  if (!servers) {
+    return appendObjectProperty(
+      content,
+      root,
+      serverKey,
+      { "assistant-ui": server },
+      eol,
+    );
+  }
+
+  if (servers.type !== "object") {
+    return replaceNodeValue(
+      content,
+      servers,
+      root,
+      { "assistant-ui": server },
+      eol,
+    );
+  }
+
+  const existing = lastPropertyValue(servers, "assistant-ui");
+  return existing
+    ? replaceNodeValue(content, existing, servers, server, eol)
+    : appendObjectProperty(content, servers, "assistant-ui", server, eol);
+}
+
 async function installForTarget(target: MCPTarget): Promise<void> {
   if (target === "claude-code") {
     logger.info("Installing MCP server for Claude Code...");
@@ -209,10 +351,35 @@ async function installForTarget(target: MCPTarget): Promise<void> {
   }
 
   let existingConfig: any = {};
+  let content = "{}\n";
   if (fs.existsSync(configPath)) {
-    const content = fs.readFileSync(configPath, "utf-8");
+    content = fs.readFileSync(configPath, "utf-8");
     try {
-      existingConfig = JSON.parse(content);
+      if (targetConfig.jsonc) {
+        const errors: ParseError[] = [];
+        existingConfig = parseJsonc(content, errors, {
+          allowTrailingComma: true,
+          allowEmptyContent: true,
+        });
+        if (existingConfig === undefined) existingConfig = {};
+        if (
+          errors.length > 0 ||
+          existingConfig === null ||
+          typeof existingConfig !== "object" ||
+          Array.isArray(existingConfig)
+        ) {
+          throw new SyntaxError("Invalid MCP configuration");
+        }
+      } else {
+        existingConfig = JSON.parse(content);
+        if (
+          existingConfig === null ||
+          typeof existingConfig !== "object" ||
+          Array.isArray(existingConfig)
+        ) {
+          throw new SyntaxError("Invalid MCP configuration");
+        }
+      }
     } catch {
       const flag = getTargetFlag(target);
       logger.error(`Could not parse ${targetConfig.name} MCP config.`);
@@ -225,23 +392,23 @@ async function installForTarget(target: MCPTarget): Promise<void> {
     }
   }
 
-  const newConfig = deepMerge(existingConfig, targetConfig.config);
-
-  if (targetConfig.replaceServerKey) {
-    const key = targetConfig.replaceServerKey;
-    newConfig[key] = {
-      ...newConfig[key],
-      "assistant-ui": (targetConfig.config as any)[key]["assistant-ui"],
-    };
-  }
-
-  fs.writeFileSync(configPath, `${JSON.stringify(newConfig, null, 2)}\n`);
+  const updatedContent = updateJsoncConfig(
+    content,
+    targetConfig.serverKey,
+    target === "zed" || target === "claude-desktop"
+      ? deepMerge(
+          existingConfig[targetConfig.serverKey]?.["assistant-ui"] ?? {},
+          targetConfig.server,
+        )
+      : targetConfig.server,
+  );
+  fs.writeFileSync(configPath, updatedContent);
 
   logger.break();
   logger.success(`MCP server installed for ${targetConfig.name}!`);
   logger.info(`Config written to: ${configPath}`);
 
-  if (targetConfig.replaceServerKey) {
+  if (target === "cursor" || target === "windsurf" || target === "vscode") {
     logger.break();
     logger.info(
       `Connects to the hosted assistant-ui MCP server at ${HOSTED_MCP_URL}.`,