@agentuity/cli 0.0.52 → 0.0.54

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

@@ -57,39 +57,49 @@ export const listSubcommand = createSubcommand({
 		});
 
 		// Output based on format
-		if (options.json) {
-			console.log(JSON.stringify(resources, null, 2));
-		} else {
+		if (!options.json) {
 			// Text table format
 			if (resources.db.length === 0 && resources.s3.length === 0) {
 				tui.info('No resources found');
-				return { db: [], s3: [] };
-			}
-
-			if (resources.db.length > 0) {
-				tui.info(tui.bold('Databases'));
-				tui.newline();
-				for (const db of resources.db) {
-					console.log(tui.bold(db.name));
-					if (db.url) console.log(` URL:        ${tui.muted(db.url)}`);
+			} else {
+				if (resources.db.length > 0) {
+					tui.info(tui.bold('Databases'));
 					tui.newline();
+					for (const db of resources.db) {
+						console.log(tui.bold(db.name));
+						if (db.url) console.log(` URL:        ${tui.muted(db.url)}`);
+						tui.newline();
+					}
 				}
-			}
 
-			if (resources.s3.length > 0) {
-				tui.info(tui.bold('Storage'));
-				tui.newline();
-				for (const s3 of resources.s3) {
-					console.log(tui.bold(s3.bucket_name));
-					if (s3.access_key) console.log(` Access Key: ${tui.muted(s3.access_key)}`);
-					if (s3.secret_key) console.log(` Secret Key: ${tui.muted(s3.secret_key)}`);
-					if (s3.region) console.log(` Region:     ${tui.muted(s3.region)}`);
-					if (s3.endpoint) console.log(` Endpoint:   ${tui.muted(s3.endpoint)}`);
+				if (resources.s3.length > 0) {
+					tui.info(tui.bold('Storage'));
 					tui.newline();
+					for (const s3 of resources.s3) {
+						console.log(tui.bold(s3.bucket_name));
+						if (s3.access_key) console.log(` Access Key: ${tui.muted(s3.access_key)}`);
+						if (s3.secret_key) console.log(` Secret Key: ${tui.muted(s3.secret_key)}`);
+						if (s3.region) console.log(` Region:     ${tui.muted(s3.region)}`);
+						if (s3.endpoint) console.log(` Endpoint:   ${tui.muted(s3.endpoint)}`);
+						tui.newline();
+					}
 				}
 			}
 		}
 
-		return resources;
+		// Convert null to undefined for schema compliance
+		return {
+			db: resources.db.map((db) => ({
+				name: db.name,
+				url: db.url ?? undefined,
+			})),
+			s3: resources.s3.map((s3) => ({
+				bucket_name: s3.bucket_name,
+				access_key: s3.access_key ?? undefined,
+				secret_key: s3.secret_key ?? undefined,
+				region: s3.region ?? undefined,
+				endpoint: s3.endpoint ?? undefined,
+			})),
+		};
 	},
 });

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

@@ -35,7 +35,7 @@ export const getSubcommand = createSubcommand({
 	idempotent: true,
 
 	async handler(ctx) {
-		const { args, opts, apiClient, project } = ctx;
+		const { args, opts, apiClient, project, options } = ctx;
 
 		// Fetch project with unmasked secrets
 		const projectData = await tui.spinner('Fetching secrets', () => {
@@ -49,19 +49,21 @@ export const getSubcommand = createSubcommand({
 			tui.fatal(`Secret '${args.key}' not found`, ErrorCode.RESOURCE_NOT_FOUND);
 		}
 
-		if (process.stdout.isTTY) {
-			// Display the value, masked by default
-			if (opts?.mask) {
-				tui.success(`${args.key}=${maskSecret(value)}`);
+		if (!options.json) {
+			if (process.stdout.isTTY) {
+				// Display the value, masked by default
+				if (opts?.mask) {
+					tui.success(`${args.key}=${maskSecret(value)}`);
+				} else {
+					tui.success(`${args.key}=${value}`);
+				}
 			} else {
-				tui.success(`${args.key}=${value}`);
-			}
-		} else {
-			// Display the value, masked by default
-			if (opts?.mask) {
-				console.log(`${args.key}=${maskSecret(value)}`);
-			} else {
-				console.log(`${args.key}=${value}`);
+				// Display the value, masked by default
+				if (opts?.mask) {
+					console.log(`${args.key}=${maskSecret(value)}`);
+				} else {
+					console.log(`${args.key}=${value}`);
+				}
 			}
 		}
 

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

@@ -26,7 +26,7 @@ export const listSubcommand = createSubcommand({
 	},
 
 	async handler(ctx) {
-		const { opts, apiClient, project } = ctx;
+		const { opts, apiClient, project, options } = ctx;
 
 		// Fetch project with unmasked secrets
 		const projectData = await tui.spinner('Fetching secrets', () => {
@@ -35,28 +35,30 @@ export const listSubcommand = createSubcommand({
 
 		const secrets = projectData.secrets || {};
 
-		if (Object.keys(secrets).length === 0) {
-			tui.info('No secrets found');
-			return {};
-		}
-
-		// Display the secrets
-		if (process.stdout.isTTY) {
-			tui.newline();
-			tui.success(`Secrets (${Object.keys(secrets).length}):`);
-			tui.newline();
-		}
-
-		const sortedKeys = Object.keys(secrets).sort();
-		// For secrets, masking is enabled by default in TTY (can be disabled with --no-mask)
-		const shouldMask = opts?.mask !== false;
-		for (const key of sortedKeys) {
-			const value = secrets[key];
-			const displayValue = shouldMask ? maskSecret(value) : value;
-			if (process.stdout.isTTY) {
-				console.log(`${tui.bold(key)}=${displayValue}`);
+		// Skip TUI output in JSON mode
+		if (!options.json) {
+			if (Object.keys(secrets).length === 0) {
+				tui.info('No secrets found');
 			} else {
-				console.log(`${key}=${displayValue}`);
+				// Display the secrets
+				if (process.stdout.isTTY) {
+					tui.newline();
+					tui.success(`Secrets (${Object.keys(secrets).length}):`);
+					tui.newline();
+				}
+
+				const sortedKeys = Object.keys(secrets).sort();
+				// For secrets, masking is enabled by default in TTY (can be disabled with --no-mask)
+				const shouldMask = opts?.mask !== false;
+				for (const key of sortedKeys) {
+					const value = secrets[key];
+					const displayValue = shouldMask ? maskSecret(value) : value;
+					if (process.stdout.isTTY) {
+						console.log(`${tui.bold(key)}=${displayValue}`);
+					} else {
+						console.log(`${key}=${displayValue}`);
+					}
+				}
 			}
 		}
 

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

@@ -32,29 +32,30 @@ export const logsSubcommand = createSubcommand({
 		response: SessionLogsResponseSchema,
 	},
 	async handler(ctx) {
-		const { apiClient, args } = ctx;
+		const { apiClient, args, options } = ctx;
 
 		try {
 			const logs = await sessionLogs(apiClient, { id: args.session_id });
 
-			if (logs.length === 0) {
-				tui.info('No logs found for this session.');
-				return [];
-			}
-
-			tui.banner(`Logs for Session ${args.session_id}`, `${logs.length} log entries`);
+			if (!options.json) {
+				if (logs.length === 0) {
+					tui.info('No logs found for this session.');
+				} else {
+					tui.banner(`Logs for Session ${args.session_id}`, `${logs.length} log entries`);
 
-			for (const log of logs) {
-				const timestamp = new Date(log.timestamp).toLocaleTimeString();
-				const severity = log.severity.padEnd(5);
-				const severityColor =
-					log.severity === 'ERROR'
-						? tui.error(severity)
-						: log.severity === 'WARN'
-							? tui.warning(severity)
-							: tui.muted(severity);
+					for (const log of logs) {
+						const timestamp = new Date(log.timestamp).toLocaleTimeString();
+						const severity = log.severity.padEnd(5);
+						const severityColor =
+							log.severity === 'ERROR'
+								? tui.error(severity)
+								: log.severity === 'WARN'
+									? tui.warning(severity)
+									: tui.muted(severity);
 
-				console.log(`${tui.muted(timestamp)} ${severityColor} ${log.body}`);
+						console.log(`${tui.muted(timestamp)} ${severityColor} ${log.body}`);
+					}
+				}
 			}
 
 			return logs;

package/src/cmd/dev/agents.ts

@@ -46,22 +46,30 @@ export const agentsSubcommand = createSubcommand({
 				.describe('Output format: json or table'),
 			verbose: z.boolean().optional().default(false).describe('Show full IDs and descriptions'),
 		}),
+		response: z.array(AgentSchema),
 	},
 	async handler(ctx) {
-		const { opts, apiClient, project } = ctx;
+		const { opts, apiClient, project, options } = ctx;
 		const projectId = project.projectId;
 		const format = opts?.format ?? 'table';
 		const verbose = opts?.verbose ?? false;
 
 		const deploymentId = opts?.deploymentId;
 		const queryParams = deploymentId ? `?deploymentId=${deploymentId}` : '';
-		const response = await tui.spinner('Fetching agents', async () => {
-			return apiClient.request(
-				'GET',
-				`/cli/agent/${projectId}${queryParams}`,
-				AgentsResponseSchema
-			);
-		});
+
+		const response = options.json
+			? await apiClient.request(
+					'GET',
+					`/cli/agent/${projectId}${queryParams}`,
+					AgentsResponseSchema
+				)
+			: await tui.spinner('Fetching agents', async () => {
+					return apiClient.request(
+						'GET',
+						`/cli/agent/${projectId}${queryParams}`,
+						AgentsResponseSchema
+					);
+				});
 
 		if (!response.success) {
 			tui.fatal(`Failed to fetch agents: ${response.message ?? 'Unknown error'}`);
@@ -69,54 +77,66 @@ export const agentsSubcommand = createSubcommand({
 
 		const agents = response.data;
 
-		if (format === 'json') {
+		if (format === 'json' && !options.json) {
 			console.log(JSON.stringify(agents, null, 2));
-			return;
+			return agents;
 		}
 
-		tui.info(`Agents (${agents.length})`);
-		if (agents.length === 0) {
-			tui.muted('No agents found');
-		} else {
-			console.table(
-				agents.map((agent) => ({
-					name: agent.name,
-					id: verbose ? agent.id : abbreviate(agent.id, 20),
-					identifier: verbose ? agent.identifier : abbreviate(agent.identifier, 20),
-					deployment: abbreviate(agent.deploymentId, 20),
-					version: verbose
-						? (agent.version ?? 'N/A')
-						: (abbreviate(agent.version, 20) ?? 'N/A'),
-					evals: agent.evals.length,
-					createdAt: new Date(agent.createdAt).toLocaleString(),
-				})),
-				['name', 'id', 'identifier', 'deployment', 'version', 'evals', 'createdAt']
-			);
+		if (!options.json) {
+			tui.info(`Agents (${agents.length})`);
+			if (agents.length === 0) {
+				tui.muted('No agents found');
+			} else {
+				console.table(
+					agents.map((agent) => ({
+						name: agent.name,
+						id: verbose ? agent.id : abbreviate(agent.id, 20),
+						identifier: verbose ? agent.identifier : abbreviate(agent.identifier, 20),
+						deployment: abbreviate(agent.deploymentId, 20),
+						version: verbose
+							? (agent.version ?? 'N/A')
+							: (abbreviate(agent.version, 20) ?? 'N/A'),
+						evals: agent.evals.length,
+						createdAt: new Date(agent.createdAt).toLocaleString(),
+					})),
+					['name', 'id', 'identifier', 'deployment', 'version', 'evals', 'createdAt']
+				);
 
-			// Show evals for each agent
-			for (const agent of agents) {
-				if (agent.evals.length > 0) {
-					console.log(`\n  Evals for ${agent.name}:`);
-					console.table(
-						agent.evals.map((evalItem) => ({
-							name: evalItem.name,
-							id: verbose ? evalItem.id : abbreviate(evalItem.id, 20),
-							identifier: verbose
-								? (evalItem.identifier ?? 'N/A')
-								: (abbreviate(evalItem.identifier, 20) ?? 'N/A'),
-							deployment: abbreviate(evalItem.deploymentId, 20),
-							version: verbose
-								? (evalItem.version ?? 'N/A')
-								: (abbreviate(evalItem.version, 20) ?? 'N/A'),
-							description: verbose
-								? (evalItem.description ?? 'N/A')
-								: abbreviateDescription(evalItem.description),
-							createdAt: new Date(evalItem.createdAt).toLocaleString(),
-						})),
-						['name', 'id', 'identifier', 'deployment', 'version', 'description', 'createdAt']
-					);
+				// Show evals for each agent
+				for (const agent of agents) {
+					if (agent.evals.length > 0) {
+						console.log(`\n  Evals for ${agent.name}:`);
+						console.table(
+							agent.evals.map((evalItem) => ({
+								name: evalItem.name,
+								id: verbose ? evalItem.id : abbreviate(evalItem.id, 20),
+								identifier: verbose
+									? (evalItem.identifier ?? 'N/A')
+									: (abbreviate(evalItem.identifier, 20) ?? 'N/A'),
+								deployment: abbreviate(evalItem.deploymentId, 20),
+								version: verbose
+									? (evalItem.version ?? 'N/A')
+									: (abbreviate(evalItem.version, 20) ?? 'N/A'),
+								description: verbose
+									? (evalItem.description ?? 'N/A')
+									: abbreviateDescription(evalItem.description),
+								createdAt: new Date(evalItem.createdAt).toLocaleString(),
+							})),
+							[
+								'name',
+								'id',
+								'identifier',
+								'deployment',
+								'version',
+								'description',
+								'createdAt',
+							]
+						);
+					}
 				}
 			}
 		}
+
+		return agents;
 	},
 });

package/src/cmd/dev/index.ts

@@ -326,6 +326,7 @@ export const command = createCommand({
 			logger.trace('Killing dev server (pid: %d)', pid);
 			shuttingDownForRestart = true;
 			running = false;
+			process.kill(pid, 'SIGINT');
 			try {
 				// Kill the process group (negative PID kills entire group)
 				process.kill(-pid, 'SIGTERM');
@@ -430,6 +431,7 @@ export const command = createCommand({
 								dev: true,
 								projectId: project?.projectId,
 								deploymentId,
+								port: opts.port,
 							});
 							building = false;
 							buildCompletedAt = Date.now();

package/src/cmd/profile/create.ts

@@ -59,7 +59,7 @@ export const createCommand = createSubcommand({
 			return logger.fatal(
 				`Profile "${name}" already exists at ${existing.filename}`,
 				ErrorCode.RESOURCE_ALREADY_EXISTS
-			);
+			) as never;
 		}
 
 		await ensureConfigDir();
@@ -103,10 +103,10 @@ export const createCommand = createSubcommand({
 		} catch (error) {
 			const message = error instanceof Error ? error.message : String(error);
 			const stack = error instanceof Error ? error.stack : undefined;
-			logger.fatal(
+			return logger.fatal(
 				`Failed to create profile: ${message}${stack ? `\n${stack}` : ''}`,
 				ErrorCode.INTERNAL_ERROR
-			);
+			) as never;
 		}
 	},
 });

package/src/cmd/profile/delete.ts

@@ -43,7 +43,7 @@ export const deleteCommand = createSubcommand({
 		const profile = profiles.find((p) => p.name === name);
 
 		if (!profile) {
-			return logger.fatal(`Profile "${name}" not found`, ErrorCode.RESOURCE_NOT_FOUND);
+			return logger.fatal(`Profile "${name}" not found`, ErrorCode.RESOURCE_NOT_FOUND) as never;
 		}
 
 		// Ask for confirmation unless --confirm flag is passed
@@ -66,7 +66,10 @@ export const deleteCommand = createSubcommand({
 
 			return { success: true, name };
 		} catch (error) {
-			logger.fatal(`Failed to delete profile: ${error}`);
+			return logger.fatal(
+				`Failed to delete profile: ${error}`,
+				ErrorCode.FILE_WRITE_ERROR
+			) as never;
 		}
 	},
 });

package/src/cmd/profile/list.ts

@@ -1,9 +1,18 @@
+import { z } from 'zod';
 import { createSubcommand } from '../../types';
 import { fetchProfiles } from '../../config';
 import { basename, dirname } from 'node:path';
 import * as tui from '../../tui';
 import { getCommand } from '../../command-prefix';
 
+const ProfileListResponseSchema = z.array(
+	z.object({
+		name: z.string().describe('Profile name'),
+		filename: z.string().describe('Profile file path'),
+		selected: z.boolean().describe('Whether this profile is currently selected'),
+	})
+);
+
 export const listCommand = createSubcommand({
 	name: 'list',
 	description: 'List all available profiles',
@@ -11,21 +20,32 @@ export const listCommand = createSubcommand({
 	idempotent: true,
 	aliases: ['ls'],
 	examples: [getCommand('profile list'), getCommand('profile ls')],
+	schema: {
+		response: ProfileListResponseSchema,
+	},
 
-	async handler() {
+	async handler(ctx) {
+		const { options } = ctx;
 		const profiles = await fetchProfiles();
 
-		if (profiles.length === 0) {
-			tui.info('No profiles found');
-			return;
+		if (!options.json) {
+			if (profiles.length === 0) {
+				tui.info('No profiles found');
+			} else {
+				console.log('Available profiles:');
+				for (const profile of profiles) {
+					const marker = profile.selected ? '•' : ' ';
+					const name = tui.padRight(profile.name, 15, ' ');
+					const path = `${basename(dirname(profile.filename))}/${basename(profile.filename)}`;
+					console.log(`${marker} ${name} ${tui.muted(path)}`);
+				}
+			}
 		}
 
-		console.log('Available profiles:');
-		for (const profile of profiles) {
-			const marker = profile.selected ? '•' : ' ';
-			const name = tui.padRight(profile.name, 15, ' ');
-			const path = `${basename(dirname(profile.filename))}/${basename(profile.filename)}`;
-			console.log(`${marker} ${name} ${tui.muted(path)}`);
-		}
+		return profiles.map((p) => ({
+			name: p.name,
+			filename: p.filename,
+			selected: p.selected,
+		}));
 	},
 });

package/src/cmd/profile/show.ts

@@ -19,9 +19,6 @@ export const showCommand = createSubcommand({
 		getCommand('profile show staging --json'),
 	],
 	schema: {
-		options: z.object({
-			json: z.boolean().optional().describe('Show the JSON config'),
-		}),
 		args: z
 			.object({
 				name: z.string().optional().describe('Profile name to show (optional)'),
@@ -32,7 +29,7 @@ export const showCommand = createSubcommand({
 	idempotent: true,
 
 	async handler(ctx) {
-		const { logger, args, opts } = ctx;
+		const { logger, args, options } = ctx;
 
 		try {
 			let current = false;
@@ -47,19 +44,25 @@ export const showCommand = createSubcommand({
 			const profile = profiles.find((p) => p.name === name);
 
 			if (!profile) {
-				return logger.fatal(`Profile "${name}" not found`, ErrorCode.RESOURCE_NOT_FOUND);
+				return logger.fatal(
+					`Profile "${name}" not found`,
+					ErrorCode.RESOURCE_NOT_FOUND
+				) as never;
 			}
 
 			const profilePath = profile.filename;
 			current = profile.selected;
 
-			tui.info(`Profile: ${profilePath}`);
-
 			const content = await loadConfig(current ? undefined : profilePath);
+			if (!content) {
+				return logger.fatal(
+					`Failed to load profile configuration`,
+					ErrorCode.INTERNAL_ERROR
+				) as never;
+			}
 
-			if (opts?.json) {
-				console.log(JSON.stringify(content, null, 2));
-			} else {
+			if (!options.json) {
+				tui.info(`Profile: ${profilePath}`);
 				tui.newline();
 				const textContent = await readFile(profilePath, 'utf-8');
 				console.log(textContent);
@@ -68,9 +71,9 @@ export const showCommand = createSubcommand({
 			return content;
 		} catch (error) {
 			if (error instanceof Error) {
-				logger.fatal(`Failed to show profile: ${error.message}`);
+				return logger.fatal(`Failed to show profile: ${error.message}`) as never;
 			} else {
-				logger.fatal('Failed to show profile');
+				return logger.fatal('Failed to show profile') as never;
 			}
 		}
 	},

package/src/cmd/project/delete.ts

@@ -59,7 +59,7 @@ export const deleteSubcommand = createSubcommand({
 
 			if (projects.length === 0) {
 				tui.info('No projects found to delete');
-				return;
+				return { success: false, projectIds: [], count: 0 };
 			}
 
 			// Sort projects by name

package/src/cmd/version/index.ts

@@ -24,7 +24,11 @@ export const command = createCommand({
 			return version;
 		} catch (error) {
 			const logger = createLogger();
-			logger.fatal('Failed to retrieve version: %s', error, ErrorCode.INTERNAL_ERROR);
+			return logger.fatal(
+				'Failed to retrieve version: %s',
+				error,
+				ErrorCode.INTERNAL_ERROR
+			) as never;
 		}
 	},
 });

package/src/tui.ts

@@ -831,7 +831,9 @@ export async function spinner<T>(
 						: await options.callback;
 
 			// If clearOnSuccess is true, don't show success message
-			if (!options.clearOnSuccess) {
+			// Also skip success message in JSON mode
+			const isJsonMode = outputOptions?.json === true;
+			if (!options.clearOnSuccess && !isJsonMode) {
 				const successColor = getColor('success');
 				console.error(`${successColor}${ICONS.success} ${message}${reset}`);
 			}

package/src/types.ts

@@ -252,6 +252,7 @@ export function createSubcommand<
 	O extends Optional | undefined = undefined,
 	A extends z.ZodType | undefined = undefined,
 	Op extends z.ZodType | undefined = undefined,
+	Res extends z.ZodType | undefined = undefined,
 >(definition: {
 	name: string;
 	description: string;
@@ -267,12 +268,22 @@ export function createSubcommand<
 	tags?: string[];
 	schema?: A extends z.ZodType
 		? Op extends z.ZodType
-			? { args: A; options: Op; response?: z.ZodType }
-			: { args: A; response?: z.ZodType }
+			? Res extends z.ZodType
+				? { args: A; options: Op; response: Res }
+				: { args: A; options: Op; response?: z.ZodType }
+			: Res extends z.ZodType
+				? { args: A; response: Res }
+				: { args: A; response?: z.ZodType }
 		: Op extends z.ZodType
-			? { options: Op; response?: z.ZodType }
-			: { response?: z.ZodType };
-	handler(ctx: CommandContext<R, O, A, Op>): unknown | Promise<unknown>;
+			? Res extends z.ZodType
+				? { options: Op; response: Res }
+				: { options: Op; response?: z.ZodType }
+			: Res extends z.ZodType
+				? { response: Res }
+				: { response?: z.ZodType };
+	handler(
+		ctx: CommandContext<R, O, A, Op>
+	): Res extends z.ZodType ? z.infer<Res> | Promise<z.infer<Res>> : unknown | Promise<unknown>;
 }): SubcommandDefinition {
 	return definition as unknown as SubcommandDefinition;
 }
@@ -282,6 +293,7 @@ export function createCommand<
 	O extends Optional | undefined = undefined,
 	A extends z.ZodType | undefined = undefined,
 	Op extends z.ZodType | undefined = undefined,
+	Res extends z.ZodType | undefined = undefined,
 >(definition: {
 	name: string;
 	description: string;
@@ -297,12 +309,22 @@ export function createCommand<
 	tags?: string[];
 	schema?: A extends z.ZodType
 		? Op extends z.ZodType
-			? { args: A; options: Op; response?: z.ZodType }
-			: { args: A; response?: z.ZodType }
+			? Res extends z.ZodType
+				? { args: A; options: Op; response: Res }
+				: { args: A; options: Op; response?: z.ZodType }
+			: Res extends z.ZodType
+				? { args: A; response: Res }
+				: { args: A; response?: z.ZodType }
 		: Op extends z.ZodType
-			? { options: Op; response?: z.ZodType }
-			: { response?: z.ZodType };
-	handler?(ctx: CommandContext<R, O, A, Op>): unknown | Promise<unknown>;
+			? Res extends z.ZodType
+				? { options: Op; response: Res }
+				: { options: Op; response?: z.ZodType }
+			: Res extends z.ZodType
+				? { response: Res }
+				: { response?: z.ZodType };
+	handler?(
+		ctx: CommandContext<R, O, A, Op>
+	): Res extends z.ZodType ? z.infer<Res> | Promise<z.infer<Res>> : unknown | Promise<unknown>;
 	subcommands?: SubcommandDefinition[];
 }): CommandDefinition {
 	return definition as unknown as CommandDefinition;