@agentuity/cli 0.0.53 → 0.0.54

package/src/cmd/build/bundler.ts

@@ -1,5 +1,6 @@
 import { $ } from 'bun';
 import { join, relative, resolve, dirname } from 'node:path';
+import { createRequire } from 'node:module';
 import { cpSync, existsSync, mkdirSync, rmSync } from 'node:fs';
 import gitParseUrl from 'git-url-parse';
 import AgentuityBundler, { getBuildMetadata } from './plugin';
@@ -7,6 +8,8 @@ import { getFilesRecursively } from './file';
 import { getVersion } from '../../version';
 import type { Project } from '../../types';
 import { fixDuplicateExportsInDirectory } from './fix-duplicate-exports';
+import { createLogger } from '@agentuity/server';
+import type { LogLevel } from '../../types';
 
 export interface BundleOptions {
 	rootDir: string;
@@ -16,6 +19,7 @@ export interface BundleOptions {
 	projectId?: string;
 	deploymentId?: string;
 	project?: Project;
+	port?: number;
 }
 
 export async function bundle({
@@ -25,6 +29,7 @@ export async function bundle({
 	dev = false,
 	rootDir,
 	project,
+	port,
 }: BundleOptions) {
 	const appFile = join(rootDir, 'app.ts');
 	if (!existsSync(appFile)) {
@@ -246,26 +251,87 @@ export async function bundle({
 				}
 			}
 		})();
+	}
 
-		if (!dev && buildmetadata) {
-			const webPublicDir = join(webDir, 'public');
-			if (existsSync(webPublicDir)) {
-				const assets = buildmetadata.assets;
-				const webOutPublicDir = join(outDir, 'web', 'public');
-				cpSync(webPublicDir, webOutPublicDir, { recursive: true });
-				[...new Bun.Glob('**.*').scanSync(webOutPublicDir)].forEach((f) => {
-					const bf = Bun.file(join(webOutPublicDir, f));
-					assets.push({
-						filename: join('public', f),
-						kind: 'static',
-						contentType: bf.type,
-						size: bf.size,
-					});
-				});
+	// Bundle workbench app if detected via setupWorkbench
+	const { analyzeWorkbench } = await import('./ast');
+	if (existsSync(appFile)) {
+		const appContent = await Bun.file(appFile).text();
+		const analysis = await analyzeWorkbench(appContent);
+
+		if (analysis.hasWorkbench) {
+			// Encode workbench config for environment variable
+			const { encodeWorkbenchConfig } = await import('@agentuity/core');
+			const config = analysis.config || { route: '/workbench', headers: {} };
+			// Add port to config (defaults to 3500 if not provided)
+			const configWithPort = { ...config, port: port || 3500 };
+			const encodedConfig = encodeWorkbenchConfig(configWithPort);
+			const workbenchDefine = {
+				...define,
+				AGENTUITY_WORKBENCH_CONFIG_INLINE: JSON.stringify(encodedConfig),
+			};
+			const logger = createLogger((process.env.AGENTUITY_LOG_LEVEL as LogLevel) || 'info');
+			try {
+				const projectRequire = createRequire(resolve(rootDir, 'package.json'));
+				const workbenchPkgPath = projectRequire.resolve('@agentuity/workbench/package.json');
+				const workbenchAppDir = join(dirname(workbenchPkgPath), 'src', 'app');
+
+				if (existsSync(workbenchAppDir)) {
+					const workbenchIndexFile = join(workbenchAppDir, 'index.html');
+					if (existsSync(workbenchIndexFile)) {
+						// Bundle workbench using same config as main web app
+						const workbenchBuildConfig: Bun.BuildConfig = {
+							entrypoints: [workbenchIndexFile],
+							root: workbenchAppDir,
+							outdir: join(outDir, 'workbench'),
+							define: workbenchDefine,
+							sourcemap: dev ? 'inline' : 'linked',
+							plugins: [AgentuityBundler],
+							target: 'browser',
+							format: 'esm',
+							banner: `// Generated file. DO NOT EDIT`,
+							minify: true,
+							splitting: true,
+							packages: 'bundle',
+							naming: {
+								entry: '[dir]/[name].[ext]',
+								chunk: 'workbench/chunk/[name]-[hash].[ext]',
+								asset: 'workbench/asset/[name]-[hash].[ext]',
+							},
+						};
+
+						const workbenchResult = await Bun.build(workbenchBuildConfig);
+						if (workbenchResult.success) {
+							logger.debug('Workbench bundled successfully');
+						} else {
+							logger.error('Workbench bundling failed:', workbenchResult.logs.join('\n'));
+						}
+					}
+				}
+			} catch (error) {
+				logger.error('Failed to bundle workbench:', error);
 			}
 		}
 	}
 
+	if (!dev && buildmetadata) {
+		const webPublicDir = join(webDir, 'public');
+		if (existsSync(webPublicDir)) {
+			const assets = buildmetadata.assets;
+			const webOutPublicDir = join(outDir, 'web', 'public');
+			cpSync(webPublicDir, webOutPublicDir, { recursive: true });
+			[...new Bun.Glob('**.*').scanSync(webOutPublicDir)].forEach((f) => {
+				const bf = Bun.file(join(webOutPublicDir, f));
+				assets.push({
+					filename: join('public', f),
+					kind: 'static',
+					contentType: bf.type,
+					size: bf.size,
+				});
+			});
+		}
+	}
+
 	if (!dev && Bun.which('git') && buildmetadata?.deployment) {
 		buildmetadata.deployment.git = {
 			commit: process.env.GIT_SHA || process.env.GITHUB_SHA,

package/src/cmd/build/plugin.ts

@@ -2,7 +2,14 @@ import type { BunPlugin } from 'bun';
 import { dirname, basename, join, resolve } from 'node:path';
 import { existsSync, writeFileSync, mkdirSync, unlinkSync } from 'node:fs';
 import type { BuildMetadata } from '@agentuity/server';
-import { parseAgentMetadata, parseRoute, parseEvalMetadata } from './ast';
+import {
+	parseAgentMetadata,
+	parseRoute,
+	parseEvalMetadata,
+	analyzeWorkbench,
+	checkRouteConflicts,
+	type WorkbenchConfig,
+} from './ast';
 import { applyPatch, generatePatches } from './patch';
 import { detectSubagent } from '../../utils/detectSubagent';
 import { createLogger } from '@agentuity/server';
@@ -19,6 +26,50 @@ function toPascalCase(str: string): string {
 	return camel.charAt(0).toUpperCase() + camel.slice(1);
 }
 
+/**
+ * Setup workbench configuration by analyzing app.ts file
+ */
+async function setupWorkbench(srcDir: string): Promise<WorkbenchConfig | null> {
+	// Look for app.ts in both root and src directories
+	const rootAppFile = join(dirname(srcDir), 'app.ts');
+	const srcAppFile = join(srcDir, 'app.ts');
+
+	let appFile = '';
+	if (existsSync(rootAppFile)) {
+		appFile = rootAppFile;
+	} else if (existsSync(srcAppFile)) {
+		appFile = srcAppFile;
+	}
+
+	if (!appFile || !existsSync(appFile)) {
+		return null;
+	}
+
+	const appContent = await Bun.file(appFile).text();
+	const analysis = await analyzeWorkbench(appContent);
+
+	if (!analysis.hasWorkbench) {
+		return null;
+	}
+
+	const workbenchConfig = analysis.config;
+
+	// Check for route conflicts if workbench is being used
+	if (workbenchConfig?.route) {
+		const hasConflict = await checkRouteConflicts(appContent, workbenchConfig.route);
+		if (hasConflict) {
+			const logger = createLogger((process.env.AGENTUITY_LOG_LEVEL as LogLevel) || 'info');
+			logger.error(`🚨 Route conflict detected!\n`);
+			logger.error(
+				`   Workbench route '${workbenchConfig.route}' conflicts with existing application route`
+			);
+			logger.error(`   Please use a different route or remove the conflicting route.\n`);
+		}
+	}
+
+	return workbenchConfig;
+}
+
 function generateAgentRegistry(srcDir: string, agentInfo: Array<Record<string, string>>) {
 	// Separate parent agents and subagents
 	const parentAgents = agentInfo.filter((a) => !a.parent);
@@ -226,7 +277,6 @@ ${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}
 	}
@@ -291,6 +341,10 @@ const AgentuityBundler: BunPlugin = {
 		const deploymentId = build.config.define?.['process.env.AGENTUITY_CLOUD_DEPLOYMENT_ID']
 			? JSON.parse(build.config.define['process.env.AGENTUITY_CLOUD_DEPLOYMENT_ID'])
 			: '';
+		const isDevMode =
+			(build.config.define?.['process.env.NODE_ENV']
+				? JSON.parse(build.config.define['process.env.NODE_ENV'])
+				: 'production') === 'development';
 		const routes: Set<string> = new Set();
 		const agentInfo: Array<Record<string, string>> = [];
 		const agentMetadata: Map<string, Map<string, string>> = new Map<
@@ -493,11 +547,45 @@ const AgentuityBundler: BunPlugin = {
 				const indexFile = join(srcDir, 'web', 'index.html');
 
 				if (existsSync(indexFile)) {
+					// Setup workbench configuration - evaluate fresh each time during builds
+					const workbenchConfig = await setupWorkbench(srcDir);
+
 					inserts.unshift(`await (async () => {
     const { serveStatic } = require('hono/bun');
-    const { getRouter } = await import('@agentuity/runtime');
+    const { getRouter, registerDevModeRoutes } = await import('@agentuity/runtime');
     const router = getRouter()!;
-	const index = await Bun.file(import.meta.dir + '/web/index.html').text();
+	
+	// Setup workbench routes if workbench was bundled
+	const workbenchIndexPath = import.meta.dir + '/workbench/index.html';
+	if (await Bun.file(workbenchIndexPath).exists()) {
+		let workbenchIndex = await Bun.file(workbenchIndexPath).text();
+		
+		// Always serve assets at /workbench/* regardless of HTML route
+		const workbenchStatic = serveStatic({ root: import.meta.dir + '/workbench' });
+		router.get('/workbench/*', workbenchStatic);
+		
+		// Use the workbench config determined at build time
+		const route = ${JSON.stringify(workbenchConfig?.route || '/workbench')};
+
+// If using custom route, update HTML to point to absolute /workbench/ paths
+if (route !== '/workbench') {
+			workbenchIndex = workbenchIndex.replace(new RegExp('src="\\\\.\\\\/workbench\\\\/', 'g'), 'src="/workbench/');
+		}
+		
+		// Serve HTML at the configured route
+		router.get(route, (c) => c.html(workbenchIndex));
+	}
+	
+	let index = await Bun.file(import.meta.dir + '/web/index.html').text();
+	if (${isDevMode}) {
+		const end = index.lastIndexOf('</html>');
+		const html = registerDevModeRoutes(router);
+		if (end > 0) {
+			index = index.substring(0,end) + html + index.substring(end);
+		} else {
+			index += html;
+		}
+	}
 	const webstatic = serveStatic({ root: import.meta.dir + '/web' });
 	router.get('/', (c) => c.html(index));
     router.get('/web/chunk/*', webstatic);

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

@@ -53,42 +53,46 @@ export const listSubcommand = createSubcommand({
 	},
 	async handler(ctx) {
 		const projectId = resolveProjectId(ctx, { projectId: ctx.opts['project-id'] });
-		const { apiClient, opts } = ctx;
+		const { apiClient, opts, options } = ctx;
 
 		try {
 			const deployments = await projectDeploymentList(apiClient, projectId, opts.count);
 
-			if (deployments.length === 0) {
-				tui.info('No deployments found.');
-				return [];
-			}
-
-			const tableData = deployments.map((d) => ({
-				ID: d.id,
-				State: d.state || 'unknown',
-				Active: d.active ? 'Yes' : '',
-				Created: new Date(d.createdAt).toLocaleString(),
-				Message: d.message || '',
-				Tags: d.tags.join(', '),
-			}));
-
-			tui.table(tableData, [
-				{ name: 'ID', alignment: 'left' },
-				{ name: 'State', alignment: 'left' },
-				{ name: 'Active', alignment: 'center' },
-				{ name: 'Created', alignment: 'left' },
-				{ name: 'Message', alignment: 'left' },
-				{ name: 'Tags', alignment: 'left' },
-			]);
-
-			return deployments.map((d) => ({
+			const result = deployments.map((d) => ({
 				id: d.id,
 				state: d.state,
 				active: d.active,
 				createdAt: d.createdAt,
-				message: d.message,
+				message: d.message ?? undefined,
 				tags: d.tags,
 			}));
+
+			// Skip TUI output in JSON mode
+			if (!options.json) {
+				if (deployments.length === 0) {
+					tui.info('No deployments found.');
+				} else {
+					const tableData = deployments.map((d) => ({
+						ID: d.id,
+						State: d.state || 'unknown',
+						Active: d.active ? 'Yes' : '',
+						Created: new Date(d.createdAt).toLocaleString(),
+						Message: d.message || '',
+						Tags: d.tags.join(', '),
+					}));
+
+					tui.table(tableData, [
+						{ name: 'ID', alignment: 'left' },
+						{ name: 'State', alignment: 'left' },
+						{ name: 'Active', alignment: 'center' },
+						{ name: 'Created', alignment: 'left' },
+						{ name: 'Message', alignment: 'left' },
+						{ name: 'Tags', alignment: 'left' },
+					]);
+				}
+			}
+
+			return result;
 		} catch (ex) {
 			tui.fatal(
 				`Failed to list deployments: ${ex instanceof Error ? ex.message : String(ex)}`,

package/src/cmd/cloud/deployment/show.ts

@@ -42,63 +42,68 @@ export const showSubcommand = createSubcommand({
 	idempotent: true,
 	async handler(ctx) {
 		const projectId = resolveProjectId(ctx, { projectId: ctx.opts['project-id'] });
-		const { apiClient, args } = ctx;
+		const { apiClient, args, options } = ctx;
 
 		try {
 			const deployment = await projectDeploymentGet(apiClient, projectId, args.deployment_id);
 
-			tui.banner(`Deployment ${deployment.id}`, `State: ${deployment.state || 'unknown'}`);
+			// Skip TUI output in JSON mode
+			if (!options.json) {
+				tui.banner(`Deployment ${deployment.id}`, `State: ${deployment.state || 'unknown'}`);
 
-			console.log(tui.bold('ID:       ') + deployment.id);
-			console.log(tui.bold('Project:  ') + projectId);
-			console.log(tui.bold('State:    ') + (deployment.state || 'unknown'));
-			console.log(tui.bold('Active:   ') + (deployment.active ? 'Yes' : 'No'));
-			console.log(tui.bold('Created:  ') + new Date(deployment.createdAt).toLocaleString());
-			if (deployment.updatedAt) {
-				console.log(tui.bold('Updated:  ') + new Date(deployment.updatedAt).toLocaleString());
-			}
-			if (deployment.message) {
-				console.log(tui.bold('Message:  ') + deployment.message);
-			}
-			if (deployment.tags.length > 0) {
-				console.log(tui.bold('Tags:     ') + deployment.tags.join(', '));
-			}
-			if (deployment.customDomains && deployment.customDomains.length > 0) {
-				console.log(tui.bold('Domains:  ') + deployment.customDomains.join(', '));
-			}
-			if (deployment.cloudRegion) {
-				console.log(tui.bold('Region:   ') + deployment.cloudRegion);
-			}
+				console.log(tui.bold('ID:       ') + deployment.id);
+				console.log(tui.bold('Project:  ') + projectId);
+				console.log(tui.bold('State:    ') + (deployment.state || 'unknown'));
+				console.log(tui.bold('Active:   ') + (deployment.active ? 'Yes' : 'No'));
+				console.log(tui.bold('Created:  ') + new Date(deployment.createdAt).toLocaleString());
+				if (deployment.updatedAt) {
+					console.log(
+						tui.bold('Updated:  ') + new Date(deployment.updatedAt).toLocaleString()
+					);
+				}
+				if (deployment.message) {
+					console.log(tui.bold('Message:  ') + deployment.message);
+				}
+				if (deployment.tags.length > 0) {
+					console.log(tui.bold('Tags:     ') + deployment.tags.join(', '));
+				}
+				if (deployment.customDomains && deployment.customDomains.length > 0) {
+					console.log(tui.bold('Domains:  ') + deployment.customDomains.join(', '));
+				}
+				if (deployment.cloudRegion) {
+					console.log(tui.bold('Region:   ') + deployment.cloudRegion);
+				}
 
-			// Metadata
-			const origin = deployment.metadata?.origin;
-			if (origin?.commit) {
-				tui.newline();
-				tui.info('Origin Information');
-				if (origin.trigger) console.log(`  Trigger:  ${origin.trigger}`);
-				if (origin.provider) console.log(`  Provider: ${origin.provider}`);
-				if (origin.event) console.log(`  Event:    ${origin.event}`);
-				if (origin.branch) console.log(`  Branch:   ${origin.branch}`);
+				// Metadata
+				const origin = deployment.metadata?.origin;
+				if (origin?.commit) {
+					tui.newline();
+					tui.info('Origin Information');
+					if (origin.trigger) console.log(`  Trigger:  ${origin.trigger}`);
+					if (origin.provider) console.log(`  Provider: ${origin.provider}`);
+					if (origin.event) console.log(`  Event:    ${origin.event}`);
+					if (origin.branch) console.log(`  Branch:   ${origin.branch}`);
 
-				if (origin.commit) {
-					console.log(`  Commit:   ${origin.commit.hash}`);
-					if (origin.commit.message) console.log(`  Message:  ${origin.commit.message}`);
-					if (origin.commit.author?.name)
-						console.log(`  Author:   ${origin.commit.author.name}`);
+					if (origin.commit) {
+						console.log(`  Commit:   ${origin.commit.hash}`);
+						if (origin.commit.message) console.log(`  Message:  ${origin.commit.message}`);
+						if (origin.commit.author?.name)
+							console.log(`  Author:   ${origin.commit.author.name}`);
+					}
 				}
 			}
 
 			return {
 				id: deployment.id,
-				state: deployment.state,
+				state: deployment.state ?? undefined,
 				active: deployment.active,
 				createdAt: deployment.createdAt,
-				updatedAt: deployment.updatedAt,
-				message: deployment.message,
+				updatedAt: deployment.updatedAt ?? undefined,
+				message: deployment.message ?? undefined,
 				tags: deployment.tags,
-				customDomains: deployment.customDomains,
-				cloudRegion: deployment.cloudRegion,
-				metadata: deployment.metadata,
+				customDomains: deployment.customDomains ?? undefined,
+				cloudRegion: deployment.cloudRegion ?? undefined,
+				metadata: deployment.metadata ?? undefined,
 			};
 		} catch (ex) {
 			tui.fatal(`Failed to show deployment: ${ex instanceof Error ? ex.message : String(ex)}`);

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

@@ -32,7 +32,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 environment variables', () => {
@@ -46,18 +46,20 @@ export const getSubcommand = createSubcommand({
 			tui.fatal(`Environment variable '${args.key}' not found`, ErrorCode.RESOURCE_NOT_FOUND);
 		}
 
-		// Display the value, masked if requested
-		if (process.stdout.isTTY) {
-			if (opts?.mask) {
-				tui.success(`${args.key}=${maskSecret(value)}`);
+		if (!options.json) {
+			// Display the value, masked if requested
+			if (process.stdout.isTTY) {
+				if (opts?.mask) {
+					tui.success(`${args.key}=${maskSecret(value)}`);
+				} else {
+					tui.success(`${args.key}=${value}`);
+				}
 			} else {
-				tui.success(`${args.key}=${value}`);
-			}
-		} else {
-			if (opts?.mask) {
-				console.log(`${args.key}=${maskSecret(value)}`);
-			} else {
-				console.log(`${args.key}=${value}`);
+				if (opts?.mask) {
+					console.log(`${args.key}=${maskSecret(value)}`);
+				} else {
+					console.log(`${args.key}=${value}`);
+				}
 			}
 		}
 

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

@@ -29,7 +29,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 environment variables', () => {
@@ -38,28 +38,30 @@ export const listSubcommand = createSubcommand({
 
 		const env = projectData.env || {};
 
-		if (Object.keys(env).length === 0) {
-			tui.info('No environment variables found');
-			return {};
-		}
-
-		// Display the variables
-		if (process.stdout.isTTY) {
-			tui.newline();
-			tui.info(`Environment Variables (${Object.keys(env).length}):`);
-			tui.newline();
-		}
-
-		const sortedKeys = Object.keys(env).sort();
-		// For env vars, masking should be explicitly opted-in (default false)
-		const shouldMask = opts?.mask === true;
-		for (const key of sortedKeys) {
-			const value = env[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(env).length === 0) {
+				tui.info('No environment variables found');
 			} else {
-				console.log(`${key}=${displayValue}`);
+				// Display the variables
+				if (process.stdout.isTTY) {
+					tui.newline();
+					tui.info(`Environment Variables (${Object.keys(env).length}):`);
+					tui.newline();
+				}
+
+				const sortedKeys = Object.keys(env).sort();
+				// For env vars, masking should be explicitly opted-in (default false)
+				const shouldMask = opts?.mask === true;
+				for (const key of sortedKeys) {
+					const value = env[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/keyvalue/get.ts

@@ -31,27 +31,32 @@ export const getSubcommand = createCommand({
 	idempotent: true,
 
 	async handler(ctx) {
-		const { args } = ctx;
+		const { args, options } = ctx;
 		const storage = await createStorageAdapter(ctx);
 		const started = Date.now();
 		const res = await storage.get(args.namespace, args.key);
-		if (res.exists) {
-			if (res.data) {
-				if (res.contentType?.includes('json')) {
-					const val = tryParseJSON(res.data as unknown as string);
-					tui.json(val);
-				} else if (res.contentType?.includes('text')) {
-					console.log(String(res.data));
+
+		if (!options.json) {
+			if (res.exists) {
+				if (res.data) {
+					if (res.contentType?.includes('json')) {
+						const val = tryParseJSON(res.data as unknown as string);
+						tui.json(val);
+					} else if (res.contentType?.includes('text')) {
+						console.log(String(res.data));
+					} else {
+						const b = res.data as ArrayBuffer;
+						tui.info(`Read ${b.byteLength} bytes (${res.contentType})`);
+					}
+					tui.success(
+						`retrieved in ${(Date.now() - started).toFixed(1)}ms (${res.contentType})`
+					);
 				} else {
-					const b = res.data as ArrayBuffer;
-					tui.info(`Read ${b.byteLength} bytes (${res.contentType})`);
+					tui.warning(`${args.key} returned empty data for ${args.namespace}`);
 				}
-				tui.success(`retrieved in ${(Date.now() - started).toFixed(1)}ms (${res.contentType})`);
 			} else {
-				tui.warning(`${args.key} returned empty data for ${args.namespace}`);
+				tui.warning(`${args.key} does not exist in ${args.namespace}`);
 			}
-		} else {
-			tui.warning(`${args.key} does not exist in ${args.namespace}`);
 		}
 
 		return {

package/src/cmd/cloud/keyvalue/keys.ts

@@ -29,22 +29,20 @@ export const keysSubcommand = createCommand({
 	},
 
 	async handler(ctx) {
-		const { args } = ctx;
+		const { args, options } = ctx;
 		const kv = await createStorageAdapter(ctx);
 
 		const keys = await kv.getKeys(args.name);
 
-		if (keys.length === 0) {
-			tui.info(`No keys found in namespace ${tui.bold(args.name)}`);
-			return {
-				namespace: args.name,
-				keys: [],
-			};
-		}
-
-		tui.info(`Found ${keys.length} key(s) in ${tui.bold(args.name)}:`);
-		for (const key of keys) {
-			tui.info(`  ${key}`);
+		if (!options.json) {
+			if (keys.length === 0) {
+				tui.info(`No keys found in namespace ${tui.bold(args.name)}`);
+			} else {
+				tui.info(`Found ${keys.length} key(s) in ${tui.bold(args.name)}:`);
+				for (const key of keys) {
+					tui.info(`  ${key}`);
+				}
+			}
 		}
 
 		return {

package/src/cmd/cloud/keyvalue/list-namespaces.ts

@@ -23,17 +23,19 @@ export const listNamespacesSubcommand = createCommand({
 	idempotent: true,
 
 	async handler(ctx) {
+		const { options } = ctx;
 		const storage = await createStorageAdapter(ctx);
 		const namespaces = await storage.getNamespaces();
 
-		if (namespaces.length === 0) {
-			tui.info('No namespaces found');
-			return [];
-		}
-
-		tui.info(`Found ${namespaces.length} namespace(s):`);
-		for (const name of namespaces) {
-			tui.arrow(name);
+		if (!options.json) {
+			if (namespaces.length === 0) {
+				tui.info('No namespaces found');
+			} else {
+				tui.info(`Found ${namespaces.length} namespace(s):`);
+				for (const name of namespaces) {
+					tui.arrow(name);
+				}
+			}
 		}
 
 		return namespaces;