@agentuity/cli 0.0.51 → 0.0.53

package/src/cmd/build/plugin.ts

@@ -1,6 +1,6 @@
 import type { BunPlugin } from 'bun';
 import { dirname, basename, join, resolve } from 'node:path';
-import { existsSync, writeFileSync, mkdirSync } from 'node:fs';
+import { existsSync, writeFileSync, mkdirSync, unlinkSync } from 'node:fs';
 import type { BuildMetadata } from '@agentuity/server';
 import { parseAgentMetadata, parseRoute, parseEvalMetadata } from './ast';
 import { applyPatch, generatePatches } from './patch';
@@ -123,86 +123,63 @@ function generateAgentRegistry(srcDir: string, agentInfo: Array<Record<string, s
 		})
 		.join('\n');
 
-	// Generate nested agent type definitions
-	const agentTypeLines: string[] = [];
+	// Generate nested agent type definitions for Hono Context augmentation
+	const honoAgentTypeLines: string[] = [];
 	for (const parentAgent of parentAgents) {
 		const parentCamelName = toCamelCase(parentAgent.name);
 		const children = subagentsByParent.get(parentAgent.name) || [];
 
 		if (children.length === 0) {
 			// No subagents
-			agentTypeLines.push(
-				`	   ${parentCamelName}: AgentRunner<AgentRegistry['${parentCamelName}']['inputSchema'], AgentRegistry['${parentCamelName}']['outputSchema'], AgentRegistry['${parentCamelName}']['stream'] extends true ? true : false>;`
+			honoAgentTypeLines.push(
+				`	   ${parentCamelName}: AgentRunner<LocalAgentRegistry['${parentCamelName}']['inputSchema'], LocalAgentRegistry['${parentCamelName}']['outputSchema'], LocalAgentRegistry['${parentCamelName}']['stream'] extends true ? true : false>;`
 			);
 		} else {
 			// Has subagents - create intersection type
-			agentTypeLines.push(
-				`	   ${parentCamelName}: AgentRunner<AgentRegistry['${parentCamelName}']['inputSchema'], AgentRegistry['${parentCamelName}']['outputSchema'], AgentRegistry['${parentCamelName}']['stream'] extends true ? true : false> & {`
+			honoAgentTypeLines.push(
+				`	   ${parentCamelName}: AgentRunner<LocalAgentRegistry['${parentCamelName}']['inputSchema'], LocalAgentRegistry['${parentCamelName}']['outputSchema'], LocalAgentRegistry['${parentCamelName}']['stream'] extends true ? true : false> & {`
 			);
 			for (const child of children) {
 				const childCamelName = toCamelCase(child.name);
 				const fullChildName = toCamelCase(`${parentAgent.name}_${child.name}`);
-				agentTypeLines.push(
+				honoAgentTypeLines.push(
 					`	     ${childCamelName}: AgentRunner<typeof ${fullChildName}Agent['inputSchema'], typeof ${fullChildName}Agent['outputSchema'], typeof ${fullChildName}Agent['stream'] extends true ? true : false>;`
 				);
 			}
-			agentTypeLines.push(`	   };`);
+			honoAgentTypeLines.push(`	   };`);
 		}
 	}
-	const agentTypes = agentTypeLines.join('\n');
+	const honoAgentTypes = honoAgentTypeLines.join('\n');
 
-	const generatedContent = `// Auto-generated by Agentuity - do not edit manually
-${imports}${evalsImportsStr}
-import type { AgentRunner, Logger } from '@agentuity/runtime';
-import type { KeyValueStorage, ObjectStorage, StreamStorage, VectorStorage } from '@agentuity/core';
-
-export const agentRegistry = {
-${registry}
-} as const;
-
-export type AgentName = keyof typeof agentRegistry;
-export type AgentRegistry = typeof agentRegistry;
-
-// Typed runners for each agent
-${typeExports}
-
-// Augment Context to provide strongly-typed agents
-declare module "hono" {
-	interface Context {
-	   agentName: AgentName;
-	   agent: {
-${agentTypes}
-	   };
-	   waitUntil: (promise: Promise<void> | (() => void | Promise<void>)) => void;
-	   logger: Logger;
-	   kv: KeyValueStorage;
-	   objectstore: ObjectStorage;
-	   stream: StreamStorage;
-	   vector: VectorStorage;
-  }
-}
-`;
-
-	const agentsDir = join(srcDir, 'agents');
-	const registryPath = join(agentsDir, 'registry.generated.ts');
+	// Generate agent type definitions for AgentRegistry interface augmentation
+	const runtimeAgentTypeLines: string[] = [];
+	for (const parentAgent of parentAgents) {
+		const parentCamelName = toCamelCase(parentAgent.name);
+		const children = subagentsByParent.get(parentAgent.name) || [];
 
-	// Ensure agents directory exists
-	if (!existsSync(agentsDir)) {
-		mkdirSync(agentsDir, { recursive: true });
+		if (children.length === 0) {
+			// No subagents - use typeof the imported agent
+			runtimeAgentTypeLines.push(
+				`		${parentCamelName}: AgentRunner<typeof ${parentCamelName}Agent['inputSchema'], typeof ${parentCamelName}Agent['outputSchema'], typeof ${parentCamelName}Agent['stream'] extends true ? true : false>;`
+			);
+		} else {
+			// Has subagents - create intersection type using typeof
+			runtimeAgentTypeLines.push(
+				`		${parentCamelName}: AgentRunner<typeof ${parentCamelName}Agent['inputSchema'], typeof ${parentCamelName}Agent['outputSchema'], typeof ${parentCamelName}Agent['stream'] extends true ? true : false> & {`
+			);
+			for (const child of children) {
+				const childCamelName = toCamelCase(child.name);
+				const fullChildName = toCamelCase(`${parentAgent.name}_${child.name}`);
+				runtimeAgentTypeLines.push(
+					`			${childCamelName}: AgentRunner<typeof ${fullChildName}Agent['inputSchema'], typeof ${fullChildName}Agent['outputSchema'], typeof ${fullChildName}Agent['stream'] extends true ? true : false>;`
+				);
+			}
+			runtimeAgentTypeLines.push(`		};`);
+		}
 	}
-
-	writeFileSync(registryPath, generatedContent, 'utf-8');
+	const runtimeAgentTypes = runtimeAgentTypeLines.join('\n');
 
 	// Generate React client types with nested structure
-	const clientImports = agentInfo
-		.map(({ name, path, parent }) => {
-			const fullName = parent ? `${parent}_${name}` : name;
-			const camelName = toCamelCase(fullName);
-			const relativePath = path.replace(/^\.\/agents\//, './');
-			return `import type ${camelName}Agent from '${relativePath}';`;
-		})
-		.join('\n');
-
 	const clientAgentTypeLines: string[] = [];
 	for (const parentAgent of parentAgents) {
 		const parentCamelName = toCamelCase(parentAgent.name);
@@ -226,21 +203,75 @@ ${agentTypes}
 			}
 		}
 	}
+	const reactAgentTypes = clientAgentTypeLines.join('\n');
 
-	const clientTypesContent = `// Auto-generated by Agentuity - do not edit manually
-// This file augments @agentuity/react with your project's agent types
-${clientImports}
+	const generatedContent = `/// <reference types="hono" />
+// Auto-generated by Agentuity - do not edit manually
+${imports}${evalsImportsStr}
+import type { AgentRunner, Logger } from '@agentuity/runtime';
+import type { KeyValueStorage, ObjectStorage, StreamStorage, VectorStorage } from '@agentuity/core';
 import type { Agent } from '@agentuity/react';
 
+export const agentRegistry = {
+${registry}
+} as const;
+
+// Local type aliases for Hono augmentation
+type LocalAgentName = keyof typeof agentRegistry;
+type LocalAgentRegistry = typeof agentRegistry;
+
+// Typed runners for each agent
+${typeExports}
+
+// Augment @agentuity/runtime types with strongly-typed agents from this project
+declare module "@agentuity/runtime" {
+	// Augment the AgentRegistry interface with project-specific strongly-typed agents
+	// eslint-disable-next-line @typescript-eslint/no-empty-object-type
+	export interface AgentRegistry {
+${runtimeAgentTypes}
+	}
+}
+
+// Augment Hono Context to provide strongly-typed agents and runtime services
+// Note: Properties are added to Context via middleware in @agentuity/runtime
+declare module "hono" {
+	interface Context {
+		agentName: LocalAgentName;
+		agent: {
+${honoAgentTypes}
+		};
+		waitUntil: (promise: Promise<void> | (() => void | Promise<void>)) => void;
+		logger: Logger;
+		kv: KeyValueStorage;
+		objectstore: ObjectStorage;
+		stream: StreamStorage;
+		vector: VectorStorage;
+	}
+}
+
+// Augment @agentuity/react types with strongly-typed agents from this project
 declare module '@agentuity/react' {
 	interface AgentRegistry {
-${clientAgentTypeLines.join('\n')}
+${reactAgentTypes}
 	}
 }
 `;
 
-	const clientTypesPath = join(agentsDir, 'types.generated.d.ts');
-	writeFileSync(clientTypesPath, clientTypesContent, 'utf-8');
+	const agentsDir = join(srcDir, 'agents');
+	const registryPath = join(agentsDir, 'registry.generated.ts');
+	const legacyTypesPath = join(agentsDir, 'types.generated.d.ts');
+
+	// Ensure agents directory exists
+	if (!existsSync(agentsDir)) {
+		mkdirSync(agentsDir, { recursive: true });
+	}
+
+	writeFileSync(registryPath, generatedContent, 'utf-8');
+
+	// Remove legacy types.generated.d.ts if it exists (now consolidated into registry.generated.ts)
+	if (existsSync(legacyTypesPath)) {
+		unlinkSync(legacyTypesPath);
+	}
 }
 
 let metadata: Partial<BuildMetadata>;

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

@@ -27,15 +27,19 @@ const SessionGetResponseSchema = z.object({
 	route_id: z.string().describe('Route ID'),
 	thread_id: z.string().describe('Thread ID'),
 	agentNames: z.array(z.string()).describe('Agent names'),
-	evalRuns: z.array(z.object({
-		id: z.string(),
-		created_at: z.string(),
-		eval_id: z.string(),
-		pending: z.boolean(),
-		success: z.boolean(),
-		error: z.string().nullable(),
-		result: z.string().nullable(),
-	})).describe('Eval runs'),
+	evalRuns: z
+		.array(
+			z.object({
+				id: z.string(),
+				created_at: z.string(),
+				eval_id: z.string(),
+				pending: z.boolean(),
+				success: z.boolean(),
+				error: z.string().nullable(),
+				result: z.string().nullable(),
+			})
+		)
+		.describe('Eval runs'),
 });
 
 export const getSubcommand = createSubcommand({
@@ -80,7 +84,7 @@ export const getSubcommand = createSubcommand({
 				route_id: session.route_id,
 				thread_id: session.thread_id,
 				agentNames: enriched.agentNames,
-				evalRuns: enriched.evalRuns.map(run => ({
+				evalRuns: enriched.evalRuns.map((run) => ({
 					id: run.id,
 					eval_id: run.eval_id,
 					created_at: run.created_at,
@@ -122,10 +126,12 @@ export const getSubcommand = createSubcommand({
 				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})`)}`;
-				}).join(', ');
+				const agentDisplay = enriched.agentNames
+					.map((name, idx) => {
+						const agentId = session.agent_ids[idx];
+						return `${name} ${tui.muted(`(${agentId})`)}`;
+					})
+					.join(', ');
 				console.log(tui.bold('Agents:      ') + agentDisplay);
 			}
 			console.log(tui.bold('Route ID:    ') + session.route_id);

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

@@ -70,7 +70,7 @@ export const listSubcommand = createSubcommand({
 	async handler(ctx) {
 		const { config, logger, auth, project, opts, options } = ctx;
 		const catalystClient = getCatalystAPIClient(config, logger, auth);
-		
+
 		const projectId = opts.projectId || project?.projectId;
 
 		try {