@agentuity/cli 0.0.29 → 0.0.31

package/dist/cmd/bundle/bundler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bundler.d.ts","sourceRoot":"","sources":["../../../src/cmd/bundle/bundler.ts"],"names":[],"mappings":"AAMA,MAAM,WAAW,aAAa;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,OAAO,CAAC;CACd;AAED,wBAAsB,MAAM,CAAC,EAAE,GAAW,EAAE,OAAO,EAAE,EAAE,aAAa,iBA4EnE"}
+{"version":3,"file":"bundler.d.ts","sourceRoot":"","sources":["../../../src/cmd/bundle/bundler.ts"],"names":[],"mappings":"AAMA,MAAM,WAAW,aAAa;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,OAAO,CAAC;CACd;AAED,wBAAsB,MAAM,CAAC,EAAE,GAAW,EAAE,OAAO,EAAE,EAAE,aAAa,iBA8HnE"}

package/dist/cmd/bundle/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../src/cmd/bundle/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,KAAK,CAAC;AAwGrC,QAAA,MAAM,gBAAgB,EAAE,SAwJvB,CAAC;AAEF,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../src/cmd/bundle/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,KAAK,CAAC;AAwGrC,QAAA,MAAM,gBAAgB,EAAE,SAgJvB,CAAC;AAEF,eAAe,gBAAgB,CAAC"}

package/dist/cmd/dev/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cmd/dev/index.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,OAAO,mCAuVlB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cmd/dev/index.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,OAAO,mCAiXlB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@agentuity/cli",
-	"version": "0.0.29",
+	"version": "0.0.31",
 	"type": "module",
 	"main": "./src/index.ts",
 	"types": "./dist/index.d.ts",
@@ -28,7 +28,7 @@
 		"prepublishOnly": "bun run clean && bun run build"
 	},
 	"dependencies": {
-		"@agentuity/core": "0.0.11",
+		"@agentuity/core": "0.0.29",
 		"acorn-loose": "^8.5.2",
 		"astring": "^1.9.0",
 		"commander": "^14.0.2",

package/src/cmd/bundle/bundler.ts

@@ -1,5 +1,5 @@
-import { join } from 'node:path';
-import { existsSync, rmSync } from 'node:fs';
+import { join, resolve } from 'node:path';
+import { cpSync, existsSync, rmSync } from 'node:fs';
 import AgentuityBundler from './plugin';
 import { getFilesRecursively } from './file';
 import { getVersion } from '../../version';
@@ -17,9 +17,9 @@ export async function bundle({ dev = false, rootDir }: BundleOptions) {
 	const outDir = join(rootDir, '.agentuity');
 	const srcDir = join(rootDir, 'src');
 
-	const entrypoints: string[] = [];
+	const appEntrypoints: string[] = [];
 
-	for (const folder of ['apis', 'agents', 'web']) {
+	for (const folder of ['apis', 'agents']) {
 		const dir = join(srcDir, folder);
 		if (!existsSync(dir)) {
 			if (folder === 'agents') {
@@ -29,13 +29,14 @@ export async function bundle({ dev = false, rootDir }: BundleOptions) {
 		}
 		const files = await getFilesRecursively(dir);
 		for (const filename of files) {
-			if (/\.[jt]sx?$/.test(filename)) {
-				entrypoints.push(filename);
+			if (/\.[jt]s?$/.test(filename)) {
+				appEntrypoints.push(filename);
 			}
 		}
 	}
+	appEntrypoints.push(appFile);
 
-	entrypoints.push(appFile);
+	const webDir = join(srcDir, 'web');
 
 	if (existsSync(outDir)) {
 		rmSync(outDir, { recursive: true, force: true });
@@ -43,7 +44,6 @@ export async function bundle({ dev = false, rootDir }: BundleOptions) {
 
 	const pkgFile = Bun.file('./package.json');
 	const pkgContents = JSON.parse(await pkgFile.text());
-
 	const isProd = !dev;
 
 	const define = {
@@ -51,38 +51,88 @@ export async function bundle({ dev = false, rootDir }: BundleOptions) {
 		'process.env.NODE_ENV': JSON.stringify(isProd ? 'production' : 'development'),
 	};
 
-	const config: Bun.BuildConfig = {
-		entrypoints,
-		root: rootDir,
-		outdir: outDir,
-		define,
-		sourcemap: dev ? 'inline' : 'external',
-		env: 'AGENTUITY_CLOUD_*',
-		plugins: [AgentuityBundler],
-		target: 'bun',
-		format: 'esm',
-		banner: `// Generated file. DO NOT EDIT`,
-		minify: isProd,
-		drop: isProd ? ['debugger'] : undefined,
-		naming: isProd
-			? {
-					entry: '[dir]/[name].js',
-					chunk: 'chunks/[name]-[hash].js',
-					asset: 'assets/[name]-[hash].[ext]',
+	await (async () => {
+		const config: Bun.BuildConfig = {
+			entrypoints: appEntrypoints,
+			root: rootDir,
+			outdir: outDir,
+			define,
+			sourcemap: dev ? 'inline' : 'external',
+			env: 'AGENTUITY_CLOUD_*',
+			plugins: [AgentuityBundler],
+			target: 'bun',
+			format: 'esm',
+			banner: `// Generated file. DO NOT EDIT`,
+			minify: isProd,
+			drop: isProd ? ['debugger'] : undefined,
+			conditions: [isProd ? 'production' : 'development', 'bun'],
+		};
+		try {
+			await Bun.build(config);
+		} catch (ex) {
+			console.error(ex);
+			process.exit(1);
+		}
+	})();
+
+	await (async () => {
+		// Find workspace root for monorepo support
+		let workspaceRoot = rootDir;
+		let currentDir = rootDir;
+		while (currentDir !== '/') {
+			const pkgPath = join(currentDir, 'package.json');
+			if (existsSync(pkgPath)) {
+				const pkg = JSON.parse(await Bun.file(pkgPath).text());
+				if (pkg.workspaces) {
+					workspaceRoot = currentDir;
+					break;
 				}
-			: undefined,
-		conditions: [isProd ? 'production' : 'development', 'bun'],
-	};
+			}
+			currentDir = resolve(currentDir, '..');
+		}
+
+		// Make webEntrypoints - just the HTML files themselves
+		const webEntrypoints = [...new Bun.Glob('**.html').scanSync(webDir)].map((htmlFile) =>
+			resolve(webDir, htmlFile)
+		);
+
+		const config: Bun.BuildConfig = {
+			entrypoints: webEntrypoints,
+			root: webDir,
+			outdir: join(outDir, 'web'),
+			define,
+			sourcemap: dev ? 'inline' : 'linked',
+			env: 'AGENTUITY_CLOUD_*',
+			plugins: [AgentuityBundler],
+			target: 'browser',
+			format: 'cjs',
+			banner: `// Generated file. DO NOT EDIT`,
+			minify: isProd,
+			drop: isProd ? ['debugger'] : undefined,
+			naming: {
+				entry: '[name].js',
+				chunk: 'chunk/[name]-[hash].js',
+				asset: 'asset/[name]-[hash].[ext]',
+			},
+			packages: 'bundle',
+			external: workspaceRoot !== rootDir ? [] : undefined,
+		};
+		try {
+			await Bun.build(config);
+		} catch (ex) {
+			console.error(ex);
+			process.exit(1);
+		}
+	})();
+
+	const webPublicDir = join(webDir, 'public');
+	if (existsSync(webPublicDir)) {
+		const webOutPublicDir = join(outDir, 'web', 'public');
+		cpSync(webPublicDir, webOutPublicDir, { recursive: true });
+	}
 
 	await Bun.write(
 		`${outDir}/package.json`,
 		JSON.stringify({ name: pkgContents.name, version: pkgContents.version }, null, 2)
 	);
-
-	const agentuityYAML = Bun.file('./agentuity.yaml');
-	if (await agentuityYAML.exists()) {
-		await Bun.write(`${outDir}/agentuity.yaml`, agentuityYAML);
-	}
-
-	await Bun.build(config);
 }

package/src/cmd/bundle/plugin.ts

@@ -146,6 +146,9 @@ const AgentuityBundler: BunPlugin = {
 				namespace: 'file',
 			},
 			async (args) => {
+				if (build.config.target !== 'bun') {
+					return;
+				}
 				await args.defer();
 
 				const inserts: string[] = [];
@@ -199,30 +202,19 @@ const AgentuityBundler: BunPlugin = {
 					inserts.push(buffer);
 				}
 
-				const indexFile = join(srcDir, 'web', 'app.tsx');
+				const indexFile = join(srcDir, 'web', 'index.html');
 
 				if (existsSync(indexFile)) {
-					const uniqid = Math.random().toString(36);
-					const clientjscode = `
-import React from "react";
-import { createRoot } from "react-dom/client";
-import { App } from "./app";
-
-const root = createRoot(document.getElementById("root"));
-root.render(<App />);
-`;
-					const clientFile = join(srcDir, 'web', 'client.generated.js');
-					writeFileSync(clientFile, clientjscode);
-
 					inserts.unshift(`await (async () => {
-    const { renderToString } = require('react-dom/server');
     const { serveStatic } = require('hono/bun');
     const { getApp } = await import('@agentuity/runtime');
     const app = getApp()!;
-    const routehtml = renderToString(require("./src/web/app").default);
-    app.get("/", (c) => c.html(\`<html><body><div id="root">\${routehtml}</div><script src="/web/${uniqid}/client.js" type="module"></script></body></html>\`));
-    app.get("/web/${uniqid}/client.js", (c) => new Response(Bun.file('./src/web/client.generated.js'), { type: 'text/javascript', headers: { 'Cache-Control': 'public, max-age=31536000, immutable' } }));
-    app.get('/public/*', serveStatic({ root: './src/web' }));
+	const index = await Bun.file(import.meta.dir + '/web/index.js').text();
+	const webstatic = serveStatic({ root: import.meta.dir + '/web' });
+	app.get('/', (c) => c.html(index));
+    app.get('/chunk/*', webstatic);
+    app.get('/asset/*', webstatic);
+	app.get('/public/*', webstatic);
 })();`);
 				}
 

package/src/cmd/dev/index.ts

@@ -53,6 +53,7 @@ export const command = createCommand({
 		let restarting = false;
 		let shuttingDownForRestart = false;
 		let pendingRestart = false;
+		let building = false;
 
 		// Track restart timestamps to detect restart loops
 		const restartTimestamps: number[] = [];
@@ -177,11 +178,14 @@ export const command = createCommand({
 					}),
 					tui.spinner('Building project', async () => {
 						try {
+							building = true;
 							await bundle({
 								rootDir,
 								dev: true,
 							});
+							building = false;
 						} catch {
+							building = false;
 							failure('Build failed');
 						}
 					}),
@@ -292,6 +296,17 @@ export const command = createCommand({
 				const watcher = watch(watchDir, { recursive: true }, (eventType, changedFile) => {
 					const absPath = changedFile ? join(watchDir, changedFile) : watchDir;
 
+					// Ignore file changes during active build to prevent loops
+					if (building) {
+						logger.trace(
+							'File change ignored (build in progress): %s (event: %s, file: %s)',
+							watchDir,
+							eventType,
+							changedFile
+						);
+						return;
+					}
+
 					// Ignore node_modules folder
 					if (absPath.includes('node_modules')) {
 						logger.trace(
@@ -314,6 +329,17 @@ export const command = createCommand({
 						return;
 					}
 
+					// Ignore changes to src/web/public directory (static assets, not code)
+					if (changedFile && changedFile === 'src/web/public') {
+						logger.trace(
+							'File change ignored (static assets dir): %s (event: %s, file: %s)',
+							watchDir,
+							eventType,
+							changedFile
+						);
+						return;
+					}
+
 					// Ignore generated files to prevent restart loops
 					if (changedFile) {
 						for (const pattern of ignorePatterns) {