@agentuity/cli 0.0.54 → 0.0.56

package/src/cmd/build/ast.ts

@@ -126,7 +126,7 @@ function getAgentId(
 	filename: string,
 	version: string
 ): string {
-	return `agent_${hashSHA1(projectId, deploymentId, filename, version)}`;
+	return `agentid_${hashSHA1(projectId, deploymentId, filename, version)}`;
 }
 
 function getEvalId(
@@ -152,7 +152,7 @@ function generateRouteId(
 }
 
 function generateStableAgentId(projectId: string, name: string): string {
-	return `agentid_${hashSHA1(projectId, name)}`.substring(0, 64);
+	return `agent_${hashSHA1(projectId, name)}`.substring(0, 64);
 }
 
 function generateStableEvalId(projectId: string, agentId: string, name: string): string {
@@ -164,7 +164,7 @@ type AcornParseResultType = ReturnType<typeof acornLoose.parse>;
 function augmentAgentMetadataNode(
 	projectId: string,
 	id: string,
-	name: string,
+	identifier: string,
 	rel: string,
 	version: string,
 	ast: AcornParseResultType,
@@ -178,7 +178,8 @@ function augmentAgentMetadataNode(
 			`missing required metadata.name in ${filename}${location}. This Agent should have a unique and human readable name for this project.`
 		);
 	}
-	if (metadata.has('identifier') && name !== metadata.get('identifier')) {
+	const name = metadata.get('name')!;
+	if (metadata.has('identifier') && identifier !== metadata.get('identifier')) {
 		const location = ast.loc?.start ? ` on line ${ast.loc.start}` : '';
 		throw new Error(
 			`metadata.identifier (${metadata.get('identifier')}) in ${filename}${location} is mismatched (${name}). This is an internal error.`
@@ -188,7 +189,7 @@ function augmentAgentMetadataNode(
 	const description = descriptionNode ? (descriptionNode as ASTLiteral).value : '';
 	const agentId = generateStableAgentId(projectId, name);
 	metadata.set('version', version);
-	metadata.set('identifier', name);
+	metadata.set('identifier', identifier);
 	metadata.set('filename', rel);
 	metadata.set('id', id);
 	metadata.set('agentId', agentId);
@@ -789,111 +790,137 @@ export async function parseRoute(
 	const routes: RouteDefinition = [];
 	const routePrefix = filename.includes('src/agents') ? '/agent' : '/api';
 
-	for (const body of ast.body) {
-		if (body.type === 'ExpressionStatement') {
-			const statement = body as ASTExpressionStatement;
-			const callee = statement.expression.callee;
-			if (callee.object.type === 'Identifier') {
-				const identifier = callee.object as ASTNodeIdentifier;
-				if (identifier.name === variableName) {
-					let method = (callee.property as ASTNodeIdentifier).name;
-					let type = 'api';
-					const action = statement.expression.arguments[0];
-					let suffix = '';
-					let config: Record<string, unknown> | undefined;
-					switch (method) {
-						case 'get':
-						case 'put':
-						case 'post':
-						case 'patch':
-						case 'delete': {
-							const theaction = action as ASTLiteral;
-							if (theaction.type === 'Literal') {
-								suffix = theaction.value;
+	try {
+		for (const body of ast.body) {
+			if (body.type === 'ExpressionStatement') {
+				const statement = body as ASTExpressionStatement;
+
+				// Validate that the expression is a call expression (e.g. function call)
+				if (statement.expression.type !== 'CallExpression') {
+					continue;
+				}
+
+				const callee = statement.expression.callee;
+
+				// Validate that the callee is a member expression (e.g. object.method())
+				// This handles cases like 'console.log()' or 'router.get()'
+				// direct function calls like 'myFunc()' have type 'Identifier' and will be skipped
+				if (callee.type !== 'MemberExpression') {
+					continue;
+				}
+
+				if (callee.object.type === 'Identifier' && statement.expression.arguments?.length > 0) {
+					const identifier = callee.object as ASTNodeIdentifier;
+					if (identifier.name === variableName) {
+						let method = (callee.property as ASTNodeIdentifier).name;
+						let type = 'api';
+						const action = statement.expression.arguments[0];
+						let suffix = '';
+						let config: Record<string, unknown> | undefined;
+						switch (method) {
+							case 'get':
+							case 'put':
+							case 'post':
+							case 'patch':
+							case 'delete': {
+								if (action && (action as ASTLiteral).type === 'Literal') {
+									suffix = (action as ASTLiteral).value;
+								} else {
+									throw new Error(
+										`unsupported HTTP method ${method} in ${filename} at line ${body.start}`
+									);
+								}
 								break;
 							}
-							break;
-						}
-						case 'stream':
-						case 'sse':
-						case 'websocket': {
-							type = method;
-							method = 'post';
-							const theaction = action as ASTLiteral;
-							if (theaction.type === 'Literal') {
-								suffix = theaction.value;
+							case 'stream':
+							case 'sse':
+							case 'websocket': {
+								type = method;
+								method = 'post';
+								const theaction = action as ASTLiteral;
+								if (theaction.type === 'Literal') {
+									suffix = theaction.value;
+									break;
+								}
 								break;
 							}
-							break;
-						}
-						case 'sms': {
-							type = method;
-							method = 'post';
-							const theaction = action as ASTObjectExpression;
-							if (theaction.type === 'ObjectExpression') {
-								config = {};
-								theaction.properties.forEach((p) => {
-									if (p.value.type === 'Literal') {
-										const literal = p.value as ASTLiteral;
-										config![p.key.name] = literal.value;
+							case 'sms': {
+								type = method;
+								method = 'post';
+								const theaction = action as ASTObjectExpression;
+								if (theaction.type === 'ObjectExpression') {
+									config = {};
+									theaction.properties.forEach((p) => {
+										if (p.value.type === 'Literal') {
+											const literal = p.value as ASTLiteral;
+											config![p.key.name] = literal.value;
+										}
+									});
+									const number = theaction.properties.find((p) => p.key.name === 'number');
+									if (number && number.value.type === 'Literal') {
+										const phoneNumber = number.value as ASTLiteral;
+										suffix = hash(phoneNumber.value);
+										break;
 									}
-								});
-								const number = theaction.properties.find((p) => p.key.name === 'number');
-								if (number && number.value.type === 'Literal') {
-									const phoneNumber = number.value as ASTLiteral;
-									suffix = hash(phoneNumber.value);
-									break;
 								}
+								break;
 							}
-							break;
-						}
-						case 'email': {
-							type = method;
-							method = 'post';
-							const theaction = action as ASTLiteral;
-							if (theaction.type === 'Literal') {
-								const email = theaction.value;
-								suffix = hash(email);
+							case 'email': {
+								type = method;
+								method = 'post';
+								const theaction = action as ASTLiteral;
+								if (theaction.type === 'Literal') {
+									const email = theaction.value;
+									suffix = hash(email);
+									break;
+								}
 								break;
 							}
-							break;
-						}
-						case 'cron': {
-							type = method;
-							method = 'post';
-							const theaction = action as ASTLiteral;
-							if (theaction.type === 'Literal') {
-								const number = theaction.value;
-								suffix = hash(number);
+							case 'cron': {
+								type = method;
+								method = 'post';
+								const theaction = action as ASTLiteral;
+								if (theaction.type === 'Literal') {
+									const number = theaction.value;
+									suffix = hash(number);
+									break;
+								}
 								break;
 							}
-							break;
+							default: {
+								throw new Error(
+									`unsupported router method ${method} in ${filename} at line ${body.start}`
+								);
+							}
 						}
+						const thepath = `${routePrefix}/${routeName}/${suffix}`
+							.replaceAll(/\/{2,}/g, '/')
+							.replaceAll(/\/$/g, '');
+						const id = generateRouteId(
+							projectId,
+							deploymentId,
+							type,
+							method,
+							rel,
+							thepath,
+							version
+						);
+						routes.push({
+							id,
+							method: method as 'get' | 'post' | 'put' | 'delete' | 'patch',
+							type: type as 'api' | 'sms' | 'email' | 'cron',
+							filename: rel,
+							path: thepath,
+							version,
+							config,
+						});
 					}
-					const thepath = `${routePrefix}/${routeName}/${suffix}`
-						.replaceAll(/\/{2,}/g, '/')
-						.replaceAll(/\/$/g, '');
-					const id = generateRouteId(
-						projectId,
-						deploymentId,
-						type,
-						method,
-						rel,
-						thepath,
-						version
-					);
-					routes.push({
-						id,
-						method: method as 'get' | 'post' | 'put' | 'delete' | 'patch',
-						type: type as 'api' | 'sms' | 'email' | 'cron',
-						filename: rel,
-						path: thepath,
-						version,
-						config,
-					});
 				}
 			}
 		}
+	} catch (error) {
+		const err = error instanceof Error ? error : new Error(String(error));
+		throw new Error(`Failed to parse route file ${filename}: ${err.message}`);
 	}
 	return routes;
 }

package/src/cmd/build/bundler.ts

@@ -50,7 +50,7 @@ export async function bundle({
 		}
 		const files = await getFilesRecursively(dir);
 		for (const filename of files) {
-			if (/\.[jt]s?$/.test(filename)) {
+			if (/\.[jt]s?$/.test(filename) && !filename.includes('.generated.')) {
 				appEntrypoints.push(filename);
 			}
 		}
@@ -358,13 +358,16 @@ export async function bundle({
 						.map((s) => s.trim())
 						.filter(Boolean);
 				}
-				const branch = $`git branch --show-current`.nothrow().quiet();
-				if (branch) {
-					const _branch = await branch.text();
-					if (_branch) {
-						buildmetadata.deployment.git.branch = _branch.trim();
+				let branch = process.env.GITHUB_HEAD_REF;
+				if (!branch) {
+					const branchText = $`git branch --show-current`.nothrow().quiet();
+					if (branchText) {
+						branch = await branchText.text();
 					}
 				}
+				if (branch) {
+					buildmetadata.deployment.git.branch = branch.trim();
+				}
 				const commit = $`git rev-parse HEAD`.nothrow().quiet();
 				if (commit) {
 					const sha = await commit.text();

package/src/cmd/build/index.ts

@@ -39,6 +39,8 @@ export const command = createCommand({
 				rootDir: projectDir,
 				dev: opts.dev || false,
 				project,
+				orgId: project?.orgId,
+				projectId: project?.projectId,
 			});
 
 			// Run TypeScript type checking after registry generation (skip in dev mode)

package/src/cmd/build/plugin.ts

@@ -493,7 +493,6 @@ const AgentuityBundler: BunPlugin = {
 						projectId,
 						deploymentId
 					);
-					routeDefinitions = [...routeDefinitions, ...definitions];
 
 					let agentDetail: Record<string, string> = {};
 
@@ -504,6 +503,7 @@ const AgentuityBundler: BunPlugin = {
 						}
 						agentDetail = {
 							name,
+							id: md.get('id')!,
 							path: `.${agent}`,
 							filename: md.get('filename')!,
 							identifier: md.get('identifier')!,
@@ -514,8 +514,14 @@ const AgentuityBundler: BunPlugin = {
 							agentDetail.parent = parentName;
 						}
 						agentInfo.push(agentDetail);
+						for (const def of definitions) {
+							def.agentIds = [agentDetail.agentId, agentDetail.id];
+						}
 					}
 
+					// do this after handling the agent association (if any)
+					routeDefinitions = [...routeDefinitions, ...definitions];
+
 					let buffer = `await (async() => {
     const { createAgentMiddleware, getRouter, registerAgent } = await import('@agentuity/runtime');
     const router = getRouter()!;
@@ -599,9 +605,7 @@ if (route !== '/workbench') {
 				// 1. Evals are already imported when agents are registered (see line 421-422)
 				// 2. The registry is for type definitions only, not runtime execution
 				// 3. Importing it causes bundler resolution issues since it's generated during build
-				if (agentInfo.length > 0) {
-					generateAgentRegistry(srcDir, agentInfo);
-				}
+				generateAgentRegistry(srcDir, agentInfo);
 
 				// create the workbench routes
 				inserts.push(`await (async() => {
@@ -659,6 +663,9 @@ if (route !== '/workbench') {
 					if (!v.has('name')) {
 						throw new Error('agent metadata is missing expected name property');
 					}
+					if (!v.has('agentId')) {
+						throw new Error('agent metadata is missing expected agentId property');
+					}
 
 					const parentName = v.get('parent');
 					if (parentName) {

package/src/cmd/cloud/session/get.ts

@@ -1,11 +1,29 @@
 import { z } from 'zod';
 import { createSubcommand } from '../../../types';
 import * as tui from '../../../tui';
-import { sessionGet } from '@agentuity/server';
+import { sessionGet, type SpanNode } from '@agentuity/server';
 import { getCommand } from '../../../command-prefix';
 import { ErrorCode } from '../../../errors';
 import { getCatalystAPIClient } from '../../../config';
 
+const SpanNodeSchema: z.ZodType<SpanNode> = z.lazy(() =>
+	z.object({
+		id: z.string().describe('Span ID'),
+		duration: z.number().describe('Duration in milliseconds'),
+		operation: z.string().describe('Operation name'),
+		attributes: z.record(z.string(), z.unknown()).describe('Span attributes'),
+		children: z.array(SpanNodeSchema).optional().describe('Child spans'),
+	})
+);
+
+const RouteInfoSchema = z
+	.object({
+		id: z.string().describe('Route ID'),
+		method: z.string().describe('HTTP method'),
+		path: z.string().describe('Route path'),
+	})
+	.nullable();
+
 const SessionGetResponseSchema = z.object({
 	id: z.string().describe('Session ID'),
 	created_at: z.string().describe('Creation timestamp'),
@@ -26,8 +44,15 @@ const SessionGetResponseSchema = z.object({
 	url: z.string().describe('Request URL'),
 	route_id: z.string().describe('Route ID'),
 	thread_id: z.string().describe('Thread ID'),
-	agentNames: z.array(z.string()).describe('Agent names'),
-	evalRuns: z
+	agents: z
+		.array(
+			z.object({
+				name: z.string(),
+				identifier: z.string(),
+			})
+		)
+		.describe('Agents'),
+	eval_runs: z
 		.array(
 			z.object({
 				id: z.string(),
@@ -40,8 +65,41 @@ const SessionGetResponseSchema = z.object({
 			})
 		)
 		.describe('Eval runs'),
+	timeline: SpanNodeSchema.nullable().optional().describe('Session timeline'),
+	route: RouteInfoSchema.optional().describe('Route information'),
 });
 
+function formatDuration(ms: number): string {
+	if (ms < 1) {
+		return `${(ms * 1000).toFixed(0)}µs`;
+	}
+	if (ms < 1000) {
+		return `${ms.toFixed(1)}ms`;
+	}
+	return `${(ms / 1000).toFixed(2)}s`;
+}
+
+function printTimeline(node: SpanNode, prefix: string, isLast = true): void {
+	const connector = isLast ? '└── ' : '├── ';
+	const duration = tui.muted(`(${formatDuration(node.duration)})`);
+	let extra = '';
+	if (node.operation.startsWith('agentuity.')) {
+		if ('name' in node.attributes && 'key' in node.attributes) {
+			extra = tui.colorSuccess(`${node.attributes.name} ${node.attributes.key}`) + ' ';
+		}
+	}
+	if (node.operation.startsWith('HTTP ') && 'http.url' in node.attributes) {
+		extra = `${tui.colorSuccess(node.attributes['http.url'] as string)} `;
+	}
+	console.log(`${prefix}${connector}${node.operation} ${extra}${duration}`);
+
+	const childPrefix = prefix + (isLast ? '    ' : '│   ');
+	const children = node.children ?? [];
+	children.forEach((child, index) => {
+		printTimeline(child, childPrefix, index === children.length - 1);
+	});
+}
+
 export const getSubcommand = createSubcommand({
 	name: 'get',
 	description: 'Get details about a specific session',
@@ -83,8 +141,8 @@ export const getSubcommand = createSubcommand({
 				url: session.url,
 				route_id: session.route_id,
 				thread_id: session.thread_id,
-				agentNames: enriched.agentNames,
-				evalRuns: enriched.evalRuns.map((run) => ({
+				agents: enriched.agents,
+				eval_runs: enriched.evalRuns.map((run) => ({
 					id: run.id,
 					eval_id: run.eval_id,
 					created_at: run.created_at,
@@ -93,6 +151,8 @@ export const getSubcommand = createSubcommand({
 					error: run.error,
 					result: run.result,
 				})),
+				timeline: enriched.timeline,
+				route: enriched.route,
 			};
 
 			if (options.json) {
@@ -100,17 +160,14 @@ export const getSubcommand = createSubcommand({
 				return result;
 			}
 
-			tui.banner(`Session ${session.id}`, `Status: ${session.success ? 'Success' : 'Failed'}`);
-
 			console.log(tui.bold('ID:          ') + session.id);
 			console.log(tui.bold('Project:     ') + session.project_id);
 			console.log(tui.bold('Deployment:  ') + (session.deployment_id || '-'));
-			console.log(tui.bold('Created:     ') + new Date(session.created_at).toLocaleString());
 			console.log(tui.bold('Start:       ') + new Date(session.start_time).toLocaleString());
 			if (session.end_time) {
 				console.log(tui.bold('End:         ') + new Date(session.end_time).toLocaleString());
 			}
-			if (session.duration) {
+			if (session.duration && session.end_time) {
 				console.log(
 					tui.bold('Duration:    ') + `${(session.duration / 1_000_000).toFixed(0)}ms`
 				);
@@ -118,23 +175,32 @@ export const getSubcommand = createSubcommand({
 			console.log(tui.bold('Method:      ') + session.method);
 			console.log(tui.bold('URL:         ') + tui.link(session.url, session.url));
 			console.log(tui.bold('Trigger:     ') + session.trigger);
-			console.log(tui.bold('Environment: ') + session.env);
+			if (session.env !== 'production') {
+				console.log(tui.bold('Environment: ') + session.env);
+			}
 			console.log(tui.bold('Dev Mode:    ') + (session.devmode ? 'Yes' : 'No'));
-			console.log(tui.bold('Success:     ') + (session.success ? '✓' : '✗'));
+			console.log(
+				tui.bold('Success:     ') +
+					(session.success ? tui.colorSuccess('✓') : tui.colorError('✗'))
+			);
 			console.log(tui.bold('Pending:     ') + (session.pending ? 'Yes' : 'No'));
 			if (session.error) {
 				console.log(tui.bold('Error:       ') + tui.error(session.error));
 			}
-			if (enriched.agentNames.length > 0) {
-				const agentDisplay = enriched.agentNames
-					.map((name, idx) => {
-						const agentId = session.agent_ids[idx];
-						return `${name} ${tui.muted(`(${agentId})`)}`;
-					})
+			if (enriched.agents.length > 0) {
+				const agentDisplay = enriched.agents
+					.map((agent) => `${agent.name} ${tui.muted(`(${agent.identifier})`)}`)
 					.join(', ');
 				console.log(tui.bold('Agents:      ') + agentDisplay);
 			}
-			console.log(tui.bold('Route ID:    ') + session.route_id);
+			if (enriched.route) {
+				console.log(
+					tui.bold('Route:       ') +
+						`${enriched.route.method.toUpperCase()} ${enriched.route.path} ${tui.muted(`(${enriched.route.id})`)}`
+				);
+			} else {
+				console.log(tui.bold('Route ID:    ') + session.route_id);
+			}
 			console.log(tui.bold('Thread ID:   ') + session.thread_id);
 
 			if (enriched.evalRuns.length > 0) {
@@ -143,7 +209,7 @@ export const getSubcommand = createSubcommand({
 				const evalTableData = enriched.evalRuns.map((run) => ({
 					ID: run.id,
 					'Eval ID': run.eval_id,
-					Success: run.success ? '✓' : '✗',
+					Success: run.success ? tui.colorSuccess('✓') : tui.colorError('✗'),
 					Pending: run.pending ? '⏳' : '✓',
 					Error: run.error || 'No',
 					Created: new Date(run.created_at).toLocaleString(),
@@ -159,6 +225,12 @@ export const getSubcommand = createSubcommand({
 				]);
 			}
 
+			if (result.timeline) {
+				console.log('');
+				console.log(tui.bold('Timeline:'));
+				printTimeline(result.timeline, '');
+			}
+
 			return result;
 		} catch (ex) {
 			tui.fatal(

package/src/cmd/dev/index.ts

@@ -236,6 +236,7 @@ export const command = createCommand({
 		let showInitialReadyMessage = true;
 		let serverStartTime = 0;
 		let gravityClient: Bun.Subprocess | undefined;
+		let initialStartupComplete = false;
 
 		if (gravityBin && devmode && project) {
 			const sdkKey = await loadProjectSDKKey(rootDir);
@@ -259,7 +260,7 @@ export const command = createCommand({
 								'--url',
 								config?.overrides?.gravity_url ?? 'grpc://devmode.agentuity.com',
 								'--log-level',
-								'error',
+								process.env.AGENTUITY_GRAVITY_LOG_LEVEL ?? 'error',
 							],
 							{
 								cwd: rootDir,
@@ -412,17 +413,10 @@ export const command = createCommand({
 					logger.trace('Initial server start');
 				}
 				logger.trace('Starting typecheck and build...');
-				await Promise.all([
-					tui.runCommand({
-						command: 'tsc',
-						cmd: ['bunx', 'tsc', '--noEmit'],
-						cwd: rootDir,
-						clearOnSuccess: true,
-						truncate: false,
-						maxLinesOutput: 2,
-						maxLinesOnFailure: 15,
-					}),
-					tui.spinner('Building project', async () => {
+				await tui.spinner({
+					message: 'Building project',
+					clearOnSuccess: true,
+					callback: async () => {
 						try {
 							logger.trace('Bundle starting...');
 							building = true;
@@ -436,13 +430,26 @@ export const command = createCommand({
 							building = false;
 							buildCompletedAt = Date.now();
 							logger.trace('Bundle completed successfully');
+							logger.trace('tsc starting...');
+							await tui.runCommand({
+								command: 'tsc',
+								cmd: ['bunx', 'tsc', '--noEmit'],
+								cwd: rootDir,
+								clearOnSuccess: true,
+								truncate: false,
+								maxLinesOutput: 2,
+								maxLinesOnFailure: 15,
+							});
+							logger.trace('tsc completed successfully');
 						} catch (error) {
 							building = false;
 							logger.trace('Bundle failed: %s', error);
 							failure('Build failed');
+							return;
 						}
-					}),
-				]);
+					},
+				});
+
 				logger.trace('Typecheck and build completed');
 
 				if (failed) {
@@ -541,8 +548,14 @@ export const command = createCommand({
 
 				if (showInitialReadyMessage) {
 					showInitialReadyMessage = false;
+					// Clear any lingering spinner/command output - clear everything below cursor
+					process.stderr.write('\x1B[J'); // Clear from cursor to end of screen
+					process.stdout.write('\x1B[J'); // Clear from cursor to end of screen
 					logger.info('DevMode ready 🚀');
 					logger.trace('Initial ready message logged');
+					// Mark initial startup complete immediately to prevent watcher restarts
+					initialStartupComplete = true;
+					logger.trace('Initial startup complete, file watcher restarts now enabled');
 				}
 
 				logger.trace('Attaching exit handler to dev server process...');
@@ -634,6 +647,7 @@ export const command = createCommand({
 		logger.trace('Starting initial build and server');
 		await restart();
 		logger.trace('Initial restart completed, setting up watchers');
+		logger.trace('initialStartupComplete is now: %s', initialStartupComplete);
 
 		// Setup keyboard shortcuts (only if we have a TTY)
 		if (canDoInput) {
@@ -743,6 +757,17 @@ export const command = createCommand({
 				const watcher = watch(watchDir, { recursive: true }, (eventType, changedFile) => {
 					const absPath = changedFile ? resolve(watchDir, changedFile) : watchDir;
 
+					// Ignore file changes during initial startup to prevent spurious restarts
+					if (!initialStartupComplete) {
+						logger.trace(
+							'File change ignored (initial startup): %s (event: %s, file: %s)',
+							watchDir,
+							eventType,
+							changedFile
+						);
+						return;
+					}
+
 					// Ignore file changes during active build to prevent loops
 					if (building) {
 						logger.trace(

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

@@ -325,6 +325,7 @@ export async function runCreateFlow(options: CreateFlowOptions): Promise<void> {
 					deployment: {
 						resources: resourceConfig,
 					},
+					region: region ?? 'usc',
 				});
 			},
 		});