fix(cli): vendor thread sources in standalone templates

Author: FranciscoMoretti

packages/cli/src/helpers/scaffold.test.ts

@@ -198,13 +198,24 @@ describe("scaffoldFromTemplate", () => {
 			packageManager?: string;
 			dependencies: Record<string, string>;
 			overrides?: Record<string, string>;
+			scripts?: Record<string, string>;
 		};
 
 		expect(packageJson.packageManager).toBe("bun@1.3.1");
 		expect(packageJson.dependencies["@better-auth/core"]).toBe("1.5.6");
 		expect(packageJson.dependencies["@better-auth/electron"]).toBe("1.5.6");
 		expect(packageJson.dependencies["better-auth"]).toBe("1.5.6");
+		expect(packageJson.dependencies["@chatjs/thread"]).toBeUndefined();
 		expect(packageJson.overrides?.["@better-auth/core"]).toBe("1.5.6");
+		expect(packageJson.scripts?.prebuild).not.toContain("@chatjs/thread");
+		expect(existsSync(join(destination, "lib", "thread", "react.ts"))).toBe(
+			true,
+		);
+		const chatStoreSource = await readFile(
+			join(destination, "lib", "stores", "with-threads.ts"),
+			"utf8",
+		);
+		expect(chatStoreSource).toContain('from "@/lib/thread"');
 	});
 
 	it("rewrites the generated web app to be npm-friendly", async () => {

packages/cli/src/helpers/scaffold.ts

@@ -13,6 +13,7 @@ import {
   createEmptyUiTemplate,
 } from "../utils/inject-tool";
 import { runCommand } from "../utils/run-command";
+import { vendorThreadPackage } from "./vendor-thread-package";
 
 const CHAT_APP_EXCLUDED_SEGMENTS = new Set([
   "node_modules",
@@ -207,6 +208,11 @@ async function applyChatTemplateSourceTransforms(
   };
   packageJson.packageManager = rootPackageJson.packageManager;
   await writeFile(packageJsonPath, `${JSON.stringify(packageJson, null, 2)}\n`);
+
+  await vendorThreadPackage({
+    destination,
+    threadSourceDir: join(getRepoRoot(), "packages", "thread", "src"),
+  });
 }
 
 async function applyElectronTemplateSourceTransforms(

packages/cli/src/helpers/vendor-thread-package.ts

@@ -0,0 +1,59 @@
+import { cp, readdir, readFile, rm, writeFile } from "node:fs/promises";
+import { extname, join } from "node:path";
+
+const THREAD_IMPORT_REPLACEMENTS = [
+	["@chatjs/thread/react", "@/lib/thread/react"],
+	["@chatjs/thread", "@/lib/thread"],
+] as const;
+
+async function rewriteThreadImports(directory: string): Promise<void> {
+	const entries = await readdir(directory, { withFileTypes: true });
+
+	await Promise.all(
+		entries.map(async (entry) => {
+			const path = join(directory, entry.name);
+			if (entry.isDirectory()) {
+				await rewriteThreadImports(path);
+				return;
+			}
+			if (!(entry.isFile() && [".ts", ".tsx"].includes(extname(entry.name)))) {
+				return;
+			}
+
+			const source = await readFile(path, "utf8");
+			let rewritten = source;
+			for (const [packageImport, localImport] of THREAD_IMPORT_REPLACEMENTS) {
+				rewritten = rewritten.replaceAll(packageImport, localImport);
+			}
+			if (rewritten !== source) {
+				await writeFile(path, rewritten);
+			}
+		}),
+	);
+}
+
+export async function vendorThreadPackage(options: {
+	destination: string;
+	threadSourceDir: string;
+}): Promise<void> {
+	const localThreadDir = join(options.destination, "lib", "thread");
+	await rm(localThreadDir, { recursive: true, force: true });
+	await cp(options.threadSourceDir, localThreadDir, { recursive: true });
+	await rewriteThreadImports(options.destination);
+
+	const packageJsonPath = join(options.destination, "package.json");
+	const packageJson = JSON.parse(await readFile(packageJsonPath, "utf8")) as {
+		dependencies?: Record<string, string>;
+		scripts?: Record<string, string>;
+	};
+	if (packageJson.dependencies) {
+		delete packageJson.dependencies["@chatjs/thread"];
+	}
+	if (packageJson.scripts?.prebuild) {
+		packageJson.scripts.prebuild = packageJson.scripts.prebuild.replace(
+			"bun --filter @chatjs/thread build && ",
+			"",
+		);
+	}
+	await writeFile(packageJsonPath, `${JSON.stringify(packageJson, null, 2)}\n`);
+}

scripts/sync-template.ts

@@ -11,6 +11,7 @@ import {
 } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import { join, relative, resolve, sep } from "node:path";
+import { vendorThreadPackage } from "../packages/cli/src/helpers/vendor-thread-package";
 
 const rootDir = resolve(import.meta.dir, "..");
 const isCheck = process.argv.includes("--check");
@@ -142,6 +143,11 @@ async function applyTemplateTransforms(destination: string): Promise<void> {
   );
   await writeFile(globalsCssPath, globalsCss);
 
+  await vendorThreadPackage({
+    destination,
+    threadSourceDir: join(rootDir, "packages", "thread", "src"),
+  });
+
   // Stamp the template with the monorepo-controlled Bun version at build time.
   const rootPackageJson = JSON.parse(
     await readFile(rootPackageJsonPath, "utf8")