@agentuity/cli 0.0.53 → 0.0.55

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;

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

@@ -37,28 +37,25 @@ export const searchSubcommand = createCommand({
 	},
 
 	async handler(ctx) {
-		const { args } = ctx;
+		const { args, options } = ctx;
 		const kv = await createStorageAdapter(ctx);
 
 		const results = await kv.search(args.name, args.keyword);
 		const keys = Object.keys(results);
 
-		if (keys.length === 0) {
-			tui.info(`No keys found matching ${tui.bold(args.keyword)} in ${tui.bold(args.name)}`);
-			return {
-				namespace: args.name,
-				keyword: args.keyword,
-				results: [],
-			};
-		}
-
-		tui.info(`Found ${keys.length} key(s) matching ${tui.bold(args.keyword)}:`);
-		for (const key of keys) {
-			const item = results[key];
-			if (!item) continue;
-			const sizeMB = (item.size / (1024 * 1024)).toFixed(2);
-			const date = new Date(item.updated_at).toLocaleString();
-			tui.info(`  ${tui.bold(key)}: ${sizeMB} MB, ${item.contentType}, updated ${date}`);
+		if (!options.json) {
+			if (keys.length === 0) {
+				tui.info(`No keys found matching ${tui.bold(args.keyword)} in ${tui.bold(args.name)}`);
+			} else {
+				tui.info(`Found ${keys.length} key(s) matching ${tui.bold(args.keyword)}:`);
+				for (const key of keys) {
+					const item = results[key];
+					if (!item) continue;
+					const sizeMB = (item.size / (1024 * 1024)).toFixed(2);
+					const date = new Date(item.updated_at).toLocaleString();
+					tui.info(`  ${tui.bold(key)}: ${sizeMB} MB, ${item.contentType}, updated ${date}`);
+				}
+			}
 		}
 
 		return {

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

@@ -42,53 +42,77 @@ export const statsSubcommand = createCommand({
 	},
 
 	async handler(ctx) {
-		const { args } = ctx;
+		const { args, options } = ctx;
 		const kv = await createStorageAdapter(ctx);
 
 		if (args.name) {
 			const stats = await kv.getStats(args.name);
-			tui.info(`Statistics for ${tui.bold(args.name)}:`);
-			tui.info(`  Keys: ${stats.count}`);
-			const sizeDisplay =
-				stats.sum < 1024 * 1024
-					? `${stats.sum.toLocaleString()} bytes`
-					: `${(stats.sum / (1024 * 1024)).toFixed(2)} MB`;
-			tui.info(`  Total size: ${sizeDisplay} (raw: ${stats.sum})`);
-			if (stats.createdAt) {
-				tui.info(`  Created: ${new Date(stats.createdAt).toLocaleString()}`);
-			}
-			if (stats.lastUsedAt) {
-				tui.info(`  Last used: ${new Date(stats.lastUsedAt).toLocaleString()}`);
+
+			if (!options.json) {
+				tui.info(`Statistics for ${tui.bold(args.name)}:`);
+				tui.info(`  Keys: ${stats.count}`);
+				const sizeDisplay =
+					stats.sum < 1024 * 1024
+						? `${stats.sum.toLocaleString()} bytes`
+						: `${(stats.sum / (1024 * 1024)).toFixed(2)} MB`;
+				tui.info(`  Total size: ${sizeDisplay} (raw: ${stats.sum})`);
+				if (stats.createdAt) {
+					tui.info(`  Created: ${new Date(stats.createdAt).toLocaleString()}`);
+				}
+				if (stats.lastUsedAt) {
+					tui.info(`  Last used: ${new Date(stats.lastUsedAt).toLocaleString()}`);
+				}
 			}
 
 			return {
 				namespace: args.name,
 				count: stats.count,
 				sum: stats.sum,
-				createdAt: stats.createdAt,
-				lastUsedAt: stats.lastUsedAt,
+				createdAt: stats.createdAt ? String(stats.createdAt) : undefined,
+				lastUsedAt: stats.lastUsedAt ? String(stats.lastUsedAt) : undefined,
 			};
 		} else {
 			const allStats = await kv.getAllStats();
 			const entries = Object.entries(allStats);
 
-			if (entries.length === 0) {
-				tui.info('No namespaces found');
-				return {};
+			if (!options.json) {
+				if (entries.length === 0) {
+					tui.info('No namespaces found');
+				} else {
+					tui.info(
+						`Found ${entries.length} ${tui.plural(entries.length, 'namespace', 'namespaces')}:`
+					);
+					for (const [name, stats] of entries) {
+						const sizeDisplay =
+							stats.sum < 1024 * 1024
+								? `${stats.sum.toLocaleString()} bytes`
+								: `${(stats.sum / (1024 * 1024)).toFixed(2)} MB`;
+						tui.arrow(
+							`${tui.bold(name.padEnd(15, ' '))}: ${stats.count} keys, ${sizeDisplay}`
+						);
+					}
+				}
 			}
 
-			tui.info(
-				`Found ${entries.length} ${tui.plural(entries.length, 'namespace', 'namespaces')}:`
-			);
+			// Convert timestamp fields to strings
+			const result: Record<
+				string,
+				{
+					count: number;
+					sum: number;
+					createdAt?: string;
+					lastUsedAt?: string;
+				}
+			> = {};
 			for (const [name, stats] of entries) {
-				const sizeDisplay =
-					stats.sum < 1024 * 1024
-						? `${stats.sum.toLocaleString()} bytes`
-						: `${(stats.sum / (1024 * 1024)).toFixed(2)} MB`;
-				tui.arrow(`${tui.bold(name.padEnd(15, ' '))}: ${stats.count} keys, ${sizeDisplay}`);
+				result[name] = {
+					count: stats.count,
+					sum: stats.sum,
+					createdAt: stats.createdAt ? String(stats.createdAt) : undefined,
+					lastUsedAt: stats.lastUsedAt ? String(stats.lastUsedAt) : undefined,
+				};
 			}
-
-			return allStats;
+			return result;
 		}
 	},
 });

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

@@ -31,26 +31,31 @@ 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.bucket, args.key);
-		if (res.exists) {
-			if (res.data) {
-				if (res.contentType?.includes('json')) {
-					const val = tryParseJSON(new TextDecoder().decode(res.data));
-					tui.json(val);
-				} else if (res.contentType?.includes('text')) {
-					console.log(new TextDecoder().decode(res.data));
+
+		if (!options.json) {
+			if (res.exists) {
+				if (res.data) {
+					if (res.contentType?.includes('json')) {
+						const val = tryParseJSON(new TextDecoder().decode(res.data));
+						tui.json(val);
+					} else if (res.contentType?.includes('text')) {
+						console.log(new TextDecoder().decode(res.data));
+					} else {
+						tui.info(`Read ${res.data.byteLength} bytes (${res.contentType})`);
+					}
+					tui.success(
+						`retrieved in ${(Date.now() - started).toFixed(1)}ms (${res.contentType})`
+					);
 				} else {
-					tui.info(`Read ${res.data.byteLength} bytes (${res.contentType})`);
+					tui.warning(`${args.key} returned empty data for bucket ${args.bucket}`);
 				}
-				tui.success(`retrieved in ${(Date.now() - started).toFixed(1)}ms (${res.contentType})`);
 			} else {
-				tui.warning(`${args.key} returned empty data for bucket ${args.bucket}`);
+				tui.warning(`${args.key} does not exist in bucket ${args.bucket}`);
 			}
-		} else {
-			tui.warning(`${args.key} does not exist in bucket ${args.bucket}`);
 		}
 
 		return {

package/src/cmd/cloud/objectstore/list-buckets.ts

@@ -24,18 +24,20 @@ export const listBucketsSubcommand = createCommand({
 	examples: [`${getCommand('objectstore list-buckets')} - List all buckets with stats`],
 
 	async handler(ctx) {
+		const { options } = ctx;
 		const storage = await createStorageAdapter(ctx);
 		const buckets = await storage.listBuckets();
 
-		if (buckets.length === 0) {
-			tui.info('No buckets found');
-			return [];
-		}
-
-		tui.info(`Found ${buckets.length} bucket(s):`);
-		for (const bucket of buckets) {
-			const sizeMB = (bucket.total_bytes / (1024 * 1024)).toFixed(2);
-			tui.info(`  ${tui.bold(bucket.name)}: ${bucket.object_count} objects, ${sizeMB} MB`);
+		if (!options.json) {
+			if (buckets.length === 0) {
+				tui.info('No buckets found');
+			} else {
+				tui.info(`Found ${buckets.length} bucket(s):`);
+				for (const bucket of buckets) {
+					const sizeMB = (bucket.total_bytes / (1024 * 1024)).toFixed(2);
+					tui.info(`  ${tui.bold(bucket.name)}: ${bucket.object_count} objects, ${sizeMB} MB`);
+				}
+			}
 		}
 
 		return buckets;

package/src/cmd/cloud/objectstore/list-keys.ts

@@ -36,21 +36,22 @@ export const listKeysSubcommand = createCommand({
 	},
 
 	async handler(ctx) {
-		const { args } = ctx;
+		const { args, options } = ctx;
 		const objectStore = await createStorageAdapter(ctx);
 
 		const objects = await objectStore.listKeys(args.bucket);
 
-		if (objects.length === 0) {
-			tui.info(`No objects found in bucket ${tui.bold(args.bucket)}`);
-			return { bucket: args.bucket, objects: [], count: 0 };
-		}
-
-		tui.info(`Found ${objects.length} object(s) in ${tui.bold(args.bucket)}:`);
-		for (const obj of objects) {
-			const sizeMB = (obj.size / (1024 * 1024)).toFixed(2);
-			const date = new Date(obj.updated_at).toLocaleString();
-			tui.info(`  ${tui.bold(obj.key)}: ${sizeMB} MB, updated ${date}`);
+		if (!options.json) {
+			if (objects.length === 0) {
+				tui.info(`No objects found in bucket ${tui.bold(args.bucket)}`);
+			} else {
+				tui.info(`Found ${objects.length} object(s) in ${tui.bold(args.bucket)}:`);
+				for (const obj of objects) {
+					const sizeMB = (obj.size / (1024 * 1024)).toFixed(2);
+					const date = new Date(obj.updated_at).toLocaleString();
+					tui.info(`  ${tui.bold(obj.key)}: ${sizeMB} MB, updated ${date}`);
+				}
+			}
 		}
 
 		return { bucket: args.bucket, objects, count: objects.length };

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,
+			})),
+		};
 	},
 });