@agentuity/cli 0.0.79 → 0.0.80

package/src/cmd/build/ast.ts

@@ -366,10 +366,12 @@ function injectEvalMetadata(
 	configObj.properties.push(metadataObj);
 }
 
-function findAgentVariableAndImport(ast: ASTProgram): { varName: string; importPath: string } | undefined {
+function findAgentVariableAndImport(
+	ast: ASTProgram
+): { varName: string; importPath: string } | undefined {
 	// First, find what variable is being used in agent.createEval() calls
 	let agentVarName: string | undefined;
-	
+
 	for (const node of ast.body) {
 		if (node.type === 'ExportNamedDeclaration') {
 			const exportDecl = node as {
@@ -379,9 +381,12 @@ function findAgentVariableAndImport(ast: ASTProgram): { varName: string; importP
 				const variableDeclaration = exportDecl.declaration as {
 					declarations: Array<ASTVariableDeclarator>;
 				};
-				
+
 				for (const vardecl of variableDeclaration.declarations) {
-					if (vardecl.type === 'VariableDeclarator' && vardecl.init?.type === 'CallExpression') {
+					if (
+						vardecl.type === 'VariableDeclarator' &&
+						vardecl.init?.type === 'CallExpression'
+					) {
 						const call = vardecl.init as ASTCallExpression;
 						if (call.callee.type === 'MemberExpression') {
 							const memberExpr = call.callee as ASTMemberExpression;
@@ -402,9 +407,9 @@ function findAgentVariableAndImport(ast: ASTProgram): { varName: string; importP
 			}
 		}
 	}
-	
+
 	if (!agentVarName) return undefined;
-	
+
 	// Now find the import for this variable
 	for (const node of ast.body) {
 		if (node.type === 'ImportDeclaration') {
@@ -415,7 +420,7 @@ function findAgentVariableAndImport(ast: ASTProgram): { varName: string; importP
 					local: ASTNodeIdentifier;
 				}>;
 			};
-			
+
 			// Find default import specifier that matches our variable
 			for (const spec of importDecl.specifiers) {
 				if (spec.type === 'ImportDefaultSpecifier' && spec.local.name === agentVarName) {
@@ -427,7 +432,7 @@ function findAgentVariableAndImport(ast: ASTProgram): { varName: string; importP
 			}
 		}
 	}
-	
+
 	return undefined;
 }
 
@@ -439,17 +444,19 @@ export async function parseEvalMetadata(
 	deploymentId: string,
 	agentId?: string,
 	agentMetadata?: Map<string, Map<string, string>>
-): Promise<[
-	string,
-	Array<{
-		filename: string;
-		id: string;
-		version: string;
-		name: string;
-		evalId: string;
-		description?: string;
-	}>,
-]> {
+): Promise<
+	[
+		string,
+		Array<{
+			filename: string;
+			id: string;
+			version: string;
+			name: string;
+			evalId: string;
+			description?: string;
+		}>,
+	]
+> {
 	const logLevel = (process.env.AGENTUITY_LOG_LEVEL || 'info') as
 		| 'trace'
 		| 'debug'
@@ -479,8 +486,10 @@ export async function parseEvalMetadata(
 	if (!resolvedAgentId && agentMetadata) {
 		const agentInfo = findAgentVariableAndImport(ast);
 		if (agentInfo) {
-			logger.trace(`[EVAL METADATA] Found agent variable '${agentInfo.varName}' imported from '${agentInfo.importPath}'`);
-			
+			logger.trace(
+				`[EVAL METADATA] Found agent variable '${agentInfo.varName}' imported from '${agentInfo.importPath}'`
+			);
+
 			// Resolve the import path to actual file path
 			let resolvedPath = agentInfo.importPath;
 			if (resolvedPath.startsWith('./') || resolvedPath.startsWith('../')) {
@@ -492,19 +501,23 @@ export async function parseEvalMetadata(
 					resolvedPath += '.ts';
 				}
 			}
-			
+
 			// Find the agent metadata from the passed agentMetadata map
 			for (const [agentFile, metadata] of agentMetadata) {
 				// Check if this agent file matches the resolved import path
 				if (agentFile.includes(basename(resolvedPath)) && metadata.has('agentId')) {
 					resolvedAgentId = metadata.get('agentId');
-					logger.trace(`[EVAL METADATA] Resolved agentId from agent metadata: ${resolvedAgentId} (file: ${agentFile})`);
+					logger.trace(
+						`[EVAL METADATA] Resolved agentId from agent metadata: ${resolvedAgentId} (file: ${agentFile})`
+					);
 					break;
 				}
 			}
-			
+
 			if (!resolvedAgentId) {
-				logger.warn(`[EVAL METADATA] Could not find agent metadata for import path: ${resolvedPath}`);
+				logger.warn(
+					`[EVAL METADATA] Could not find agent metadata for import path: ${resolvedPath}`
+				);
 			}
 		}
 	}
@@ -600,7 +613,14 @@ export async function parseEvalMetadata(
 
 								// Inject eval metadata into the AST (same pattern as agents)
 								if (configObj) {
-									injectEvalMetadata(configObj, evalId, stableEvalId, version, rel, resolvedAgentId);
+									injectEvalMetadata(
+										configObj,
+										evalId,
+										stableEvalId,
+										version,
+										rel,
+										resolvedAgentId
+									);
 								}
 
 								evals.push({
@@ -1919,11 +1939,17 @@ export * from '${runtimeImportPath}/src/index';
  */
 export function analyzeWorkbench(content: string): WorkbenchAnalysis {
 	try {
+		if (!content.includes('@agentuity/workbench')) {
+			return {
+				hasWorkbench: false,
+				config: null,
+			};
+		}
 		const sourceFile = ts.createSourceFile('app.ts', content, ts.ScriptTarget.Latest, true);
 
 		let hasImport = false;
-		let hasUsage = false;
-		let config: WorkbenchConfig | null = null;
+		const workbenchVariables = new Map<string, WorkbenchConfig>();
+		let usedInServices = false;
 
 		function visitNode(node: ts.Node): void {
 			// Check for import declarations with createWorkbench
@@ -1937,18 +1963,55 @@ export function analyzeWorkbench(content: string): WorkbenchAnalysis {
 				}
 			}
 
-			// Check for createWorkbench function calls and extract config
-			if (ts.isCallExpression(node) && ts.isIdentifier(node.expression)) {
-				if (node.expression.text === 'createWorkbench') {
-					hasUsage = true;
-
+			// Track variables assigned from createWorkbench() calls
+			if (
+				ts.isVariableDeclaration(node) &&
+				node.initializer &&
+				ts.isCallExpression(node.initializer) &&
+				ts.isIdentifier(node.initializer.expression) &&
+				node.initializer.expression.text === 'createWorkbench'
+			) {
+				// Extract variable name
+				if (ts.isIdentifier(node.name)) {
 					// Extract configuration from the first argument (if any)
-					if (node.arguments.length > 0) {
-						const configArg = node.arguments[0];
-						config = parseConfigObject(configArg);
+					let varConfig: WorkbenchConfig;
+					if (node.initializer.arguments.length > 0) {
+						const configArg = node.initializer.arguments[0];
+						varConfig = parseConfigObject(configArg) || { route: '/workbench' };
 					} else {
 						// Default config if no arguments provided
-						config = { route: '/workbench' };
+						varConfig = { route: '/workbench' };
+					}
+					workbenchVariables.set(node.name.text, varConfig);
+				}
+			}
+
+			// Check if workbench variable is used in createApp's services config
+			if (
+				ts.isCallExpression(node) &&
+				ts.isIdentifier(node.expression) &&
+				node.expression.text === 'createApp' &&
+				node.arguments.length > 0
+			) {
+				const configArg = node.arguments[0];
+				if (ts.isObjectLiteralExpression(configArg)) {
+					// Find the services property
+					for (const prop of configArg.properties) {
+						if (
+							ts.isPropertyAssignment(prop) &&
+							ts.isIdentifier(prop.name) &&
+							prop.name.text === 'services'
+						) {
+							// Check if any workbench variable is referenced in services
+							const foundVariableName = checkForWorkbenchUsage(
+								prop.initializer,
+								workbenchVariables
+							);
+							if (foundVariableName) {
+								usedInServices = true;
+							}
+							break;
+						}
 					}
 				}
 			}
@@ -1957,15 +2020,94 @@ export function analyzeWorkbench(content: string): WorkbenchAnalysis {
 			ts.forEachChild(node, visitNode);
 		}
 
+		// Helper function to check if workbench variable is used in services config
+		// Returns the variable name if found, otherwise null
+		function checkForWorkbenchUsage(
+			node: ts.Node,
+			variables: Map<string, WorkbenchConfig>
+		): string | null {
+			let foundVar: string | null = null;
+
+			function visit(n: ts.Node): void {
+				if (foundVar) return; // Already found
+
+				// Check for identifier references
+				if (ts.isIdentifier(n) && variables.has(n.text)) {
+					foundVar = n.text;
+					return;
+				}
+
+				// Check for property shorthand: { workbench } in services
+				if (ts.isShorthandPropertyAssignment(n) && variables.has(n.name.text)) {
+					foundVar = n.name.text;
+					return;
+				}
+
+				// Check for property value: { workbench: workbench } in services
+				if (
+					ts.isPropertyAssignment(n) &&
+					n.initializer &&
+					ts.isIdentifier(n.initializer) &&
+					variables.has(n.initializer.text)
+				) {
+					foundVar = n.initializer.text;
+					return;
+				}
+
+				ts.forEachChild(n, visit);
+			}
+
+			visit(node);
+			return foundVar;
+		}
+
 		visitNode(sourceFile);
 
-		// Set default config if workbench is used but no config was parsed
-		if (hasImport && hasUsage && !config) {
-			config = { route: '/workbench', headers: {}, port: 3500 };
+		// Get the config from the first used workbench variable
+		let config: WorkbenchConfig | null = null;
+		if (hasImport && usedInServices) {
+			// Re-check which variable was used
+			const ast = sourceFile;
+			for (const [varName, varConfig] of workbenchVariables.entries()) {
+				// Simple check: walk through and find if this variable is used in services
+				let used = false;
+				function checkUsage(node: ts.Node): void {
+					if (
+						ts.isCallExpression(node) &&
+						ts.isIdentifier(node.expression) &&
+						node.expression.text === 'createApp' &&
+						node.arguments.length > 0
+					) {
+						const configArg = node.arguments[0];
+						if (ts.isObjectLiteralExpression(configArg)) {
+							for (const prop of configArg.properties) {
+								if (
+									ts.isPropertyAssignment(prop) &&
+									ts.isIdentifier(prop.name) &&
+									prop.name.text === 'services'
+								) {
+									const foundVar = checkForWorkbenchUsage(
+										prop.initializer,
+										workbenchVariables
+									);
+									if (foundVar === varName) {
+										used = true;
+										config = varConfig;
+									}
+									break;
+								}
+							}
+						}
+					}
+					ts.forEachChild(node, checkUsage);
+				}
+				checkUsage(ast);
+				if (used) break;
+			}
 		}
 
 		return {
-			hasWorkbench: hasImport && hasUsage,
+			hasWorkbench: hasImport && usedInServices,
 			config: config,
 		};
 	} catch (error) {

package/src/cmd/build/bundler.ts

@@ -11,8 +11,8 @@ import { getVersion } from '../../version';
 import type { Project } from '../../types';
 import { fixDuplicateExportsInDirectory } from './fix-duplicate-exports';
 import type { Logger } from '../../types';
-import { generateWorkbenchMainTsx, generateWorkbenchIndexHtml } from './workbench-templates';
-import { analyzeWorkbench } from './ast';
+import { generateWorkbenchMainTsx, generateWorkbenchIndexHtml } from './workbench';
+import { analyzeWorkbench, type WorkbenchAnalysis } from './ast';
 import { type DeployOptions } from '../../schemas/deploy';
 
 const minBunVersion = '>=1.3.3';
@@ -64,6 +64,7 @@ export interface BundleOptions extends DeployOptions {
 	outDir?: string;
 	region: string;
 	logger: Logger;
+	workbench?: WorkbenchAnalysis;
 }
 
 type BuildResult = Awaited<ReturnType<typeof Bun.build>>;
@@ -116,6 +117,7 @@ export async function bundle({
 	env,
 	region,
 	logger,
+	workbench,
 }: BundleOptions): Promise<{ output: string[] }> {
 	const output: string[] = [];
 
@@ -467,13 +469,15 @@ export async function bundle({
 
 	// Bundle workbench app if detected via setupWorkbench
 	if (existsSync(appFile)) {
-		const appContent = await Bun.file(appFile).text();
-		const analysis = analyzeWorkbench(appContent);
+		if (!workbench) {
+			const appContent = await Bun.file(appFile).text();
+			workbench = analyzeWorkbench(appContent);
+		}
 
-		if (analysis.hasWorkbench) {
+		if (workbench.hasWorkbench) {
 			// Create workbench config with proper defaults
 			const defaultConfig = { route: '/workbench', headers: {}, port: port || 3500 };
-			const config = { ...defaultConfig, ...analysis.config };
+			const config = { ...defaultConfig, ...workbench.config };
 			try {
 				// Generate workbench files on the fly instead of using files from package
 				const tempWorkbenchDir = join(outDir, 'temp-workbench');
@@ -485,7 +489,7 @@ export async function bundle({
 				await Bun.write(workbenchIndexFile, generateWorkbenchIndexHtml());
 
 				// Bundle workbench using generated files
-				// Use same strategy as web bundle - fully bundle all dependencies to avoid cross-bundle chunk conflicts
+				// Disable splitting to avoid CommonJS/ESM module resolution conflicts
 				const workbenchBuildConfig: Bun.BuildConfig = {
 					entrypoints: [workbenchIndexFile],
 					outdir: join(outDir, 'workbench'),
@@ -493,9 +497,9 @@ export async function bundle({
 					target: 'browser',
 					format: 'esm',
 					banner: `// Generated file. DO NOT EDIT`,
-					minify: true,
+					minify: !dev,
 					drop: isProd ? ['debugger'] : undefined,
-					splitting: true,
+					splitting: false,
 					packages: 'bundle',
 					conditions: ['browser', 'import', 'default'],
 					naming: {

package/src/cmd/build/index.ts

@@ -1,5 +1,5 @@
 import { z } from 'zod';
-import { resolve, join } from 'node:path';
+import { resolve, join, relative } from 'node:path';
 import { getServiceUrls } from '@agentuity/server';
 import { createCommand } from '../../types';
 import { bundle } from './bundler';
@@ -47,7 +47,10 @@ export const command = createCommand({
 		const outDir = opts.outdir ? resolve(opts.outdir) : join(absoluteProjectDir, '.agentuity');
 
 		try {
-			tui.info(`Bundling project at ${absoluteProjectDir} to ${outDir}`);
+			const rel = outDir.startsWith(absoluteProjectDir)
+				? relative(absoluteProjectDir, outDir)
+				: outDir;
+			tui.info(`Bundling project at ${absoluteProjectDir} to ${rel}`);
 
 			const env: Map<string, string> = new Map();
 

package/src/cmd/build/{workbench-templates.ts → workbench.ts}

@@ -1,4 +1,6 @@
+import { join } from 'node:path';
 import { encodeWorkbenchConfig, type WorkbenchConfig } from '@agentuity/core';
+import { analyzeWorkbench, WorkbenchAnalysis } from './ast';
 
 export function generateWorkbenchMainTsx(config: WorkbenchConfig): string {
 	const encodedConfig = encodeWorkbenchConfig(config);
@@ -35,3 +37,14 @@ export function generateWorkbenchIndexHtml(): string {
 </body>
 </html>`;
 }
+
+export async function getWorkbench(dir: string): Promise<WorkbenchAnalysis> {
+	const appFile = Bun.file(join(dir, 'app.ts'));
+	if (await appFile.exists()) {
+		return analyzeWorkbench(await appFile.text());
+	}
+	return {
+		hasWorkbench: false,
+		config: null,
+	};
+}

package/src/cmd/dev/index.ts

@@ -20,6 +20,7 @@ import { APIClient, getAPIBaseURL, getGravityDevModeURL } from '../../api';
 import { download } from './download';
 import { createDevmodeSyncService } from './sync';
 import { getDevmodeDeploymentId } from '../build/ast';
+import { getWorkbench } from '../build/workbench';
 import { BuildMetadata } from '@agentuity/server';
 import { getCommand } from '../../command-prefix';
 import { notifyWorkbenchClients } from '../../utils/workbench-notify';
@@ -159,16 +160,25 @@ export const command = createCommand({
 			}
 		}
 
+		const workbench = await getWorkbench(rootDir);
+
 		const canDoInput =
 			interactive && !!(process.stdin.isTTY && process.stdout.isTTY && !process.env.CI);
 
+		const padding = 12;
+
 		const devmodebody =
-			tui.muted(tui.padRight('Local:', 10)) +
+			tui.muted(tui.padRight('Local:', padding)) +
 			tui.link(`http://127.0.0.1:${opts.port}`) +
 			'\n' +
-			tui.muted(tui.padRight('Public:', 10)) +
+			tui.muted(tui.padRight('Public:', padding)) +
 			(devmode?.hostname ? tui.link(`https://${devmode.hostname}`) : tui.warn('Disabled')) +
 			'\n' +
+			tui.muted(tui.padRight('Workbench:', padding)) +
+			(workbench.hasWorkbench
+				? tui.link(`http://127.0.0.1:${opts.port}${workbench.config?.route ?? '/workbench'}`)
+				: tui.warn('Disabled')) +
+			'\n' +
 			(canDoInput
 				? '\n' + tui.muted('Press ') + tui.bold('h') + tui.muted(' for keyboard shortcuts')
 				: '');
@@ -520,6 +530,7 @@ export const command = createCommand({
 								port: opts.port,
 								region: project?.region ?? 'local',
 								logger,
+								workbench,
 							});
 							building = false;
 							buildCompletedAt = Date.now();

package/src/cmd/project/template-flow.ts

@@ -190,12 +190,24 @@ export async function runCreateFlow(options: CreateFlowOptions): Promise<void> {
 	} else if (skipPrompts) {
 		selectedTemplate = templates[0];
 	} else {
+		let maxLength = 15;
+		templates.forEach((t) => {
+			if (maxLength < t.name.length) {
+				maxLength = t.name.length;
+			}
+		});
+		maxLength = Math.min(maxLength + 1, 40);
+		const [_winWidth] = process.stdout.getWindowSize();
+		const winWidth = _winWidth - maxLength - 8; // space for the name and left indent
 		const templateId = await prompt.select({
 			message: 'Select a template:',
 			options: templates.map((t) => ({
 				value: t.id,
-				label: t.name,
-				hint: t.description,
+				label: t.name.padEnd(maxLength),
+				hint:
+					t.description.length > winWidth
+						? t.description.substring(0, winWidth - 3) + '...'
+						: t.description,
 			})),
 		});
 		const found = templates.find((t) => t.id === templateId);

package/src/sound.ts

@@ -1,26 +1,10 @@
-import { join } from 'node:path';
-
 export function playSound(): void {
 	const platform = process.platform;
 
 	let command: string[];
 	switch (platform) {
 		case 'darwin': {
-			const items = [
-				'Blow.aiff',
-				'Bottle.aiff',
-				'Frog.aiff',
-				'Funk.aiff',
-				'Glass.aiff',
-				'Hero.aiff',
-				'Morse.aiff',
-				'Ping.aiff',
-				'Pop.aiff',
-				'Purr.aiff',
-				'Sosumi.aiff',
-			] as const;
-			const file = items[Math.floor(Math.random() * items.length)];
-			command = ['afplay', join('/System/Library/Sounds', file)];
+			command = ['afplay', '/System/Library/Sounds/Blow.aiff'];
 			break;
 		}
 		case 'linux':

package/dist/cmd/build/workbench-templates.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"workbench-templates.d.ts","sourceRoot":"","sources":["../../../src/cmd/build/workbench-templates.ts"],"names":[],"mappings":"AAAA,OAAO,EAAyB,KAAK,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAE9E,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,eAAe,GAAG,MAAM,CAmBxE;AAED,wBAAgB,0BAA0B,IAAI,MAAM,CAanD"}

package/dist/cmd/build/workbench-templates.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"workbench-templates.js","sourceRoot":"","sources":["../../../src/cmd/build/workbench-templates.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAwB,MAAM,iBAAiB,CAAC;AAE9E,MAAM,UAAU,wBAAwB,CAAC,MAAuB;IAC/D,MAAM,aAAa,GAAG,qBAAqB,CAAC,MAAM,CAAC,CAAC;IACpD,OAAO;;;;;;;;;;;;;;gCAcwB,aAAa;iCACZ,aAAa;CAC7C,CAAC;AACF,CAAC;AAED,MAAM,UAAU,0BAA0B;IACzC,OAAO;;;;;;;;;;;QAWA,CAAC;AACT,CAAC"}