@agentuity/cli 2.0.0-beta.0 → 2.0.0-beta.1

package/src/cmd/build/vite/tailwind-source-plugin.ts

@@ -0,0 +1,73 @@
+/**
+ * Vite plugin to fix Tailwind v4 oxide scanner hang in containers
+ *
+ * The Tailwind v4 oxide scanner (native Rust binary) can hang or fail when
+ * scanning the filesystem in containerized environments. Adding source(none)
+ * to @import "tailwindcss" disables the oxide filesystem scanner, and an
+ * explicit @source directive pointing at the project's src/ directory tells
+ * Tailwind exactly where to find utility classes.
+ *
+ * @see https://github.com/tailwindlabs/tailwindcss/discussions/19661
+ * @see https://tailwindcss.com/docs/detecting-classes-in-source-files
+ */
+
+import { dirname, join, relative, sep } from 'node:path';
+import type { Plugin } from 'vite';
+
+export function tailwindSourcePlugin(): Plugin {
+	let root: string;
+
+	return {
+		name: 'agentuity:tailwind-source',
+		enforce: 'pre',
+
+		configResolved(config) {
+			root = config.root;
+		},
+
+		transform(code, id) {
+			// Only transform CSS files
+			if (!id.endsWith('.css')) {
+				return null;
+			}
+
+			// Check if the file contains @import "tailwindcss" (with either quote type)
+			if (!/@import\s+["']tailwindcss["']/.test(code)) {
+				return null;
+			}
+
+			// Compute relative path from CSS file to project's src/ directory
+			const cssDir = dirname(id);
+			const srcDir = join(root, 'src');
+			let relPath = relative(cssDir, srcDir).split(sep).join('/');
+			if (relPath === '') {
+				relPath = '.';
+			} else if (!relPath.startsWith('.')) {
+				relPath = './' + relPath;
+			}
+
+			// Transform @import "tailwindcss" → @import "tailwindcss" source(none)
+			// and add explicit @source so Tailwind knows where to scan for classes.
+			// Does NOT transform if source() is already specified.
+			const transformed = code.replace(
+				/@import\s+(["'])tailwindcss\1([^;]*);/g,
+				(match, quote, rest) => {
+					// If source() is already present, don't modify
+					if (/source\s*\(/.test(rest)) {
+						return match;
+					}
+					return `@import ${quote}tailwindcss${quote}${rest} source(none);\n@source "${relPath}";`;
+				}
+			);
+
+			if (transformed !== code) {
+				return {
+					code: transformed,
+					map: null,
+				};
+			}
+
+			return null;
+		},
+	};
+}

package/src/cmd/build/vite/vite-asset-server-config.ts

@@ -7,7 +7,6 @@
 
 import { join } from 'node:path';
 import { existsSync } from 'node:fs';
-import { createRequire } from 'node:module';
 import type { InlineConfig, Plugin } from 'vite';
 import type { Logger } from '../../../types';
 
@@ -168,22 +167,6 @@ export async function generateAssetServerConfig(
 ): Promise<InlineConfig> {
 	const { rootDir, logger, workbenchPath, port, backendPort, routePaths = ['/api'] } = options;
 
-	// Load custom user config for define values and plugins
-	const { loadAgentuityConfig } = await import('./config-loader');
-	const userConfig = await loadAgentuityConfig(rootDir, logger);
-	const userDefine = userConfig?.define || {};
-	const userPlugins = userConfig?.plugins || [];
-
-	if (Object.keys(userDefine).length > 0) {
-		logger.debug(
-			'Loaded %d custom define(s) from agentuity.config.ts',
-			Object.keys(userDefine).length
-		);
-	}
-	if (userPlugins.length > 0) {
-		logger.debug('Loaded %d custom plugin(s) from agentuity.config.ts', userPlugins.length);
-	}
-
 	// Load path aliases from tsconfig.json if available
 	const tsconfigPath = join(rootDir, 'tsconfig.json');
 	let alias = {};
@@ -217,16 +200,14 @@ export async function generateAssetServerConfig(
 
 		resolve: {
 			alias,
-			// Deduplicate React to prevent multiple instances
+			// Deduplicate React to prevent multiple instances (if used)
 			dedupe: ['react', 'react-dom', 'react/jsx-runtime', 'react/jsx-dev-runtime'],
 		},
 
-		// Pre-bundle dependencies to avoid React preamble issues with pre-built JSX
+		// Pre-bundle dependencies to avoid issues with pre-built packages
 		// Only include @agentuity/workbench if workbench is enabled
 		optimizeDeps: {
-			include: workbenchPath
-				? ['@agentuity/workbench', '@agentuity/core', '@agentuity/react']
-				: ['@agentuity/core', '@agentuity/react'],
+			include: workbenchPath ? ['@agentuity/workbench', '@agentuity/core'] : ['@agentuity/core'],
 		},
 
 		// Only allow frontend env vars (server uses process.env)
@@ -288,9 +269,6 @@ export async function generateAssetServerConfig(
 
 		// Define environment variables for browser
 		define: {
-			// Merge user-defined constants first
-			...userDefine,
-			// Then add default defines (these will override any user-defined protected keys)
 			...(workbenchPath
 				? { 'import.meta.env.AGENTUITY_PUBLIC_WORKBENCH_PATH': JSON.stringify(workbenchPath) }
 				: {}),
@@ -300,33 +278,12 @@ export async function generateAssetServerConfig(
 			'process.env.NODE_ENV': JSON.stringify('development'),
 		},
 
-		// Plugins: User plugins first (includes framework plugin like React/Svelte/Vue), then browser env
-		// Try project's node_modules first, fall back to CLI's bundled version
+		// Agentuity-specific plugins (Vite loads user plugins from vite.config.ts automatically)
 		plugins: await (async () => {
 			const { browserEnvPlugin } = await import('./browser-env-plugin');
 			const { publicAssetPathPlugin } = await import('./public-asset-path-plugin');
-			const { hasFrameworkPlugin } = await import('./config-loader');
-
-			// Auto-add React plugin if no framework plugin is present (backwards compatibility)
-			const resolvedUserPlugins = [...userPlugins];
-			if (resolvedUserPlugins.length === 0 || !hasFrameworkPlugin(resolvedUserPlugins)) {
-				logger.debug(
-					'No framework plugin found in agentuity.config.ts plugins, adding React automatically for dev server'
-				);
-				const projectRequire = createRequire(join(rootDir, 'package.json'));
-				let reactPluginPath = '@vitejs/plugin-react';
-				try {
-					reactPluginPath = projectRequire.resolve('@vitejs/plugin-react');
-				} catch {
-					// Project doesn't have @vitejs/plugin-react, use CLI's bundled version
-				}
-				const reactModule = await import(reactPluginPath);
-				resolvedUserPlugins.unshift(reactModule.default());
-			}
 
 			return [
-				// User-defined plugins from agentuity.config.ts (framework plugin + extras)
-				...resolvedUserPlugins,
 				// Browser env plugin to map process.env to import.meta.env
 				browserEnvPlugin(),
 				// Warn about incorrect public asset paths in dev mode

package/src/cmd/build/vite/vite-builder.ts

@@ -5,47 +5,11 @@
  */
 
 import { join } from 'node:path';
-import { existsSync, renameSync, rmSync } from 'node:fs';
-import { createRequire } from 'node:module';
-import type { InlineConfig, Plugin } from 'vite';
+import { existsSync, rmSync } from 'node:fs';
+import type { InlineConfig } from 'vite';
 import type { Logger, DeployOptions } from '../../../types';
-import { browserEnvPlugin } from './browser-env-plugin';
-import { beaconPlugin } from './beacon-plugin';
-import { publicAssetPathPlugin } from './public-asset-path-plugin';
 import type { BuildReportCollector } from '../../../build-report';
 
-/**
- * Vite plugin to flatten the output structure for index.html
- *
- * When root is set to the project root (for TanStack Router compatibility),
- * Vite outputs index.html to .agentuity/client/src/web/index.html instead of
- * .agentuity/client/index.html. This plugin moves it to the expected location.
- */
-function flattenHtmlOutputPlugin(outDir: string): Plugin {
-	return {
-		name: 'agentuity:flatten-html-output',
-		apply: 'build',
-		closeBundle() {
-			const nestedHtmlPath = join(outDir, 'src', 'web', 'index.html');
-			const targetHtmlPath = join(outDir, 'index.html');
-
-			if (existsSync(nestedHtmlPath)) {
-				renameSync(nestedHtmlPath, targetHtmlPath);
-
-				// Clean up empty src/web directory structure
-				const srcWebDir = join(outDir, 'src', 'web');
-				const srcDir = join(outDir, 'src');
-				try {
-					rmSync(srcWebDir, { recursive: true, force: true });
-					rmSync(srcDir, { recursive: true, force: true });
-				} catch {
-					// Ignore cleanup errors
-				}
-			}
-		},
-	};
-}
-
 export interface ViteBuildOptions {
 	rootDir: string;
 	mode: 'client' | 'server' | 'workbench';
@@ -74,7 +38,7 @@ export interface ViteBuildOptions {
  * Uses inline Vite config (customizable via agentuity.config.ts)
  */
 export async function runViteBuild(options: ViteBuildOptions): Promise<void> {
-	const { rootDir, mode, dev = false, deploymentId = '', logger, profile } = options;
+	const { rootDir, mode, dev = false, logger, profile } = options;
 
 	logger.debug(`Running Vite build for mode: ${mode}`);
 
@@ -117,136 +81,56 @@ export async function runViteBuild(options: ViteBuildOptions): Promise<void> {
 		return;
 	}
 
-	// Dynamically import vite and react plugin
-	// Try project's node_modules first (for custom vite configs), fall back to CLI's
-	const projectRequire = createRequire(join(rootDir, 'package.json'));
-	let vitePath = 'vite';
-	let reactPluginPath = '@vitejs/plugin-react';
-	try {
-		vitePath = projectRequire.resolve('vite');
-		reactPluginPath = projectRequire.resolve('@vitejs/plugin-react');
-	} catch {
-		// Project doesn't have vite, use CLI's bundled version
-	}
-	const { build: viteBuild } = await import(vitePath);
-	const reactModule = await import(reactPluginPath);
-	const react = reactModule.default;
+	// Dynamically import vite for workbench builds
+	const { build: viteBuild } = await import('vite');
 
-	// For client/workbench, use inline config (no agentuity plugin needed)
+	// For client/workbench, use inline config with vite.config.ts loading
 	let viteConfig: InlineConfig;
 
 	if (mode === 'client') {
-		// Vite needs index.html as entry point for web apps
-		const htmlPath = join(rootDir, 'src', 'web', 'index.html');
-
-		// Use workbench config passed from runAllBuilds
-		const {
-			workbenchEnabled = false,
-			workbenchRoute = '/workbench',
-			analyticsEnabled = false,
-		} = options;
-
-		// Determine CDN base URL for production builds
-		// Use CDN for all non-dev builds with a deploymentId (including local region)
-		const isLocalRegion = options.region === 'local';
-		const cdnDomain = isLocalRegion
-			? 'localstack-static-assets.t3.storageapi.dev'
-			: 'cdn.agentuity.com';
-		const cdnBaseUrl =
-			!dev && deploymentId ? `https://${cdnDomain}/${deploymentId}/client/` : undefined;
-
-		// Load custom user plugins from agentuity.config.ts if it exists
+		// For client builds, spawn vite as a subprocess.
+		// This avoids issues with Bun's module loading that cause problems
+		// with certain plugins like @sveltejs/vite-plugin-svelte.
+		// The vite.config.ts in the project handles all configuration.
+		const buildMode = dev ? 'development' : 'production';
 		const clientOutDir = join(rootDir, '.agentuity/client');
-		const { loadAgentuityConfig, hasFrameworkPlugin } = await import('./config-loader');
-		const userConfig = await loadAgentuityConfig(rootDir, logger);
-		const userPlugins = userConfig?.plugins || [];
-
-		// Auto-add React plugin if no framework plugin is present (backwards compatibility)
-		if (userPlugins.length === 0 || !hasFrameworkPlugin(userPlugins)) {
-			logger.debug(
-				'No framework plugin found in agentuity.config.ts plugins, adding React automatically'
-			);
-			userPlugins.unshift(react());
-		}
 
-		if (userPlugins.length > 0) {
-			logger.debug('Loaded %d custom plugin(s) from agentuity.config.ts', userPlugins.length);
-		}
+		logger.debug('Spawning vite build for client (subprocess mode)');
+		logger.debug('  outDir: %s', clientOutDir);
+		logger.debug('  mode: %s', buildMode);
+
+		const viteProcess = Bun.spawn(
+			['bun', 'x', 'vite', 'build', '--mode', buildMode, '--outDir', clientOutDir],
+			{
+				cwd: rootDir,
+				stdout: 'inherit',
+				stderr: 'inherit',
+			}
+		);
 
-		const plugins = [
-			...userPlugins,
-			browserEnvPlugin(),
-			// Fix incorrect public asset paths and rewrite to CDN URLs
-			publicAssetPathPlugin({ cdnBaseUrl }),
-			flattenHtmlOutputPlugin(clientOutDir),
-			// Emit analytics beacon as hashed CDN asset (prod builds only)
-			beaconPlugin({ enabled: analyticsEnabled && !dev }),
-		];
-
-		// Merge custom define values from user config
-		const userDefine = userConfig?.define || {};
-		if (Object.keys(userDefine).length > 0) {
-			logger.debug(
-				'Loaded %d custom define(s) from agentuity.config.ts',
-				Object.keys(userDefine).length
-			);
+		const exitCode = await viteProcess.exited;
+
+		if (exitCode !== 0) {
+			throw new Error(`Vite build exited with code ${exitCode}`);
 		}
 
-		viteConfig = {
-			// Use project root as Vite root so plugins (e.g., TanStack Router) resolve paths
-			// from the repo root, matching where agentuity.config.ts is located
-			root: rootDir,
-			plugins,
-			envPrefix: ['VITE_', 'AGENTUITY_PUBLIC_', 'PUBLIC_'],
-			publicDir: join(rootDir, 'src', 'web', 'public'),
-			base: cdnBaseUrl, // CDN URL for production assets
-			define: {
-				// Merge user-defined constants first
-				...userDefine,
-				// Then add default defines (these will override any user-defined protected keys)
-				// Set workbench path if enabled (use import.meta.env for client code)
-				'import.meta.env.AGENTUITY_PUBLIC_WORKBENCH_PATH': workbenchEnabled
-					? JSON.stringify(workbenchRoute)
-					: 'undefined',
-			},
-			build: {
-				outDir: clientOutDir,
-				rollupOptions: {
-					input: htmlPath,
-				},
-				manifest: true,
-				emptyOutDir: true,
-				// Copy public files to output for CDN upload (production builds only)
-				// In dev mode, Vite serves them directly from src/web/public/
-				copyPublicDir: !dev,
-			},
-			logLevel: 'warn',
-		};
+		logger.debug('Vite build complete for mode: client');
+		return;
 	} else if (mode === 'workbench') {
 		const { workbenchRoute = '/workbench' } = options;
 		// Ensure route ends with / for Vite base
 		const base = workbenchRoute.endsWith('/') ? workbenchRoute : `${workbenchRoute}/`;
 
-		// Load custom user config for define values (same as client mode)
-		const { loadAgentuityConfig } = await import('./config-loader');
-		const userConfig = await loadAgentuityConfig(rootDir, logger);
-		const userDefine = userConfig?.define || {};
-		if (Object.keys(userDefine).length > 0) {
-			logger.debug(
-				'Loaded %d custom define(s) from agentuity.config.ts for workbench',
-				Object.keys(userDefine).length
-			);
-		}
+		// Workbench is built with React (internal UI)
+		// Use CLI's bundled React plugin since workbench is our code
+		const reactModule = await import('@vitejs/plugin-react');
+		const react = reactModule.default;
 
 		viteConfig = {
 			root: join(rootDir, '.agentuity/workbench-src'), // Use generated workbench source
 			base, // All workbench assets are under the configured route
 			plugins: [react()],
 			envPrefix: ['VITE_', 'AGENTUITY_PUBLIC_', 'PUBLIC_'],
-			define: {
-				// Merge user-defined constants
-				...userDefine,
-			},
 			build: {
 				outDir: join(rootDir, '.agentuity/workbench'),
 				rollupOptions: {
@@ -261,8 +145,7 @@ export async function runViteBuild(options: ViteBuildOptions): Promise<void> {
 		throw new Error(`Unknown build mode: ${mode}`);
 	}
 
-	// Build with Vite
-	// Force the build to use the correct mode
+	// For workbench mode, use programmatic vite build
 	const buildMode = dev ? 'development' : 'production';
 
 	await viteBuild({
@@ -297,21 +180,11 @@ export async function runAllBuilds(options: Omit<ViteBuildOptions, 'mode'>): Pro
 		static: { included: false, duration: 0, routes: 0 },
 	};
 
-	// Load config to check if workbench is enabled (dev mode only)
-	const { loadAgentuityConfig, getWorkbenchConfig } = await import('./config-loader');
-	const config = await loadAgentuityConfig(rootDir, logger);
-
-	// Copy bundle files if configured (before build so build output takes priority)
-	if (config?.bundle?.length) {
-		const { copyBundleFiles } = await import('./bundle-files');
-		const outDir = join(rootDir, '.agentuity');
-		const count = await copyBundleFiles(rootDir, outDir, config.bundle, logger);
-		if (count > 0) {
-			logger.debug(`Copied ${count} bundle file(s) to .agentuity`);
-		}
-	}
+	// Load runtime config from createApp() in app.ts (v2 approach)
+	const { getWorkbenchConfig, loadRuntimeConfig } = await import('./config-loader');
+	const runtimeConfig = await loadRuntimeConfig(rootDir, logger);
 
-	const workbenchConfig = getWorkbenchConfig(config, dev);
+	const workbenchConfig = getWorkbenchConfig(dev, runtimeConfig);
 	// Generate workbench files BEFORE any builds if enabled (dev mode only)
 	if (workbenchConfig.enabled) {
 		logger.debug('Workbench enabled (dev mode), generating files before build...');
@@ -339,7 +212,10 @@ export async function runAllBuilds(options: Omit<ViteBuildOptions, 'mode'>): Pro
 	const hasWebFrontend = await Bun.file(join(rootDir, 'src', 'web', 'index.html')).exists();
 
 	// Check if analytics is enabled
-	const analyticsEnabled = config?.analytics !== false;
+	// v2: analytics config comes from createApp()
+	const analyticsFromRuntime = runtimeConfig?.analytics;
+	const analyticsEnabled =
+		analyticsFromRuntime !== undefined ? analyticsFromRuntime !== false : true;
 
 	// 2. Build client (only if web frontend exists)
 	if (hasWebFrontend) {
@@ -360,15 +236,15 @@ export async function runAllBuilds(options: Omit<ViteBuildOptions, 'mode'>): Pro
 		logger.debug('Skipping client build - no src/web/index.html found');
 	}
 
-	// 2b. Static rendering (if configured)
-	if (config?.render === 'static' && hasWebFrontend) {
+	// 2b. Static rendering (if entry-server.tsx exists)
+	const entryServerPath = join(rootDir, 'src', 'web', 'entry-server.tsx');
+	if (existsSync(entryServerPath) && hasWebFrontend) {
 		logger.debug('Running static rendering (pre-rendering all routes)...');
 		const endStaticDiagnostic = collector?.startDiagnostic('static-render');
 		const { runStaticRender } = await import('./static-renderer');
 		const staticResult = await runStaticRender({
 			rootDir,
 			logger,
-			userPlugins: config?.plugins || [],
 		});
 		result.static.included = true;
 		result.static.duration = staticResult.duration;

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

@@ -8,6 +8,7 @@ import { AgentSchema } from './schema';
 
 export const getSubcommand = createSubcommand({
 	name: 'get',
+	aliases: ['show', 'info'],
 	description: 'Get details about a specific agent',
 	requires: { auth: true, apiClient: true, project: true },
 	examples: [

package/src/cmd/cloud/apikey/delete.ts

@@ -12,7 +12,7 @@ const APIKeyDeleteResponseSchema = z.object({
 
 export const deleteSubcommand = createSubcommand({
 	name: 'delete',
-	aliases: ['del', 'rm'],
+	aliases: ['rm', 'del', 'remove', 'terminate'],
 	description: 'Delete an API key (soft delete)',
 	tags: ['destructive', 'deletes-resource', 'slow', 'requires-auth'],
 	idempotent: true,

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

@@ -7,6 +7,7 @@ import { ErrorCode } from '../../../errors';
 
 export const getSubcommand = createSubcommand({
 	name: 'get',
+	aliases: ['show', 'info'],
 	description: 'Get a specific API key by id',
 	tags: ['read-only', 'fast', 'requires-auth'],
 	examples: [{ command: getCommand('cloud apikey get <id>'), description: 'Get item details' }],

package/src/cmd/cloud/apikey/index.ts

@@ -7,6 +7,7 @@ import { getCommand } from '../../../command-prefix';
 
 export const command = createCommand({
 	name: 'apikey',
+	aliases: ['apikeys'],
 	description: 'Manage API keys',
 	tags: ['fast', 'requires-auth'],
 	examples: [

package/src/cmd/cloud/db/delete.ts

@@ -12,7 +12,7 @@ import { createSubcommand } from '../../../types';
 
 export const deleteSubcommand = createSubcommand({
 	name: 'delete',
-	aliases: ['rm', 'del'],
+	aliases: ['rm', 'del', 'remove', 'terminate'],
 	description: 'Delete a database resource',
 	tags: ['destructive', 'deletes-resource', 'slow', 'requires-auth', 'requires-deployment'],
 	idempotent: false,

package/src/cmd/cloud/deploy.ts

@@ -801,9 +801,9 @@ export const deploySubcommand = createSubcommand({
 								ctx.logger.trace(`Upload file size: ${fileSize} bytes`);
 								const resp = await fetch(instructions.deployment, {
 									method: 'PUT',
-									duplex: 'half',
 									headers: {
 										'Content-Type': 'application/zip',
+										'Content-Length': String(fileSize),
 									},
 									body: zipfile,
 									signal: stepCtx.signal,

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

@@ -4,33 +4,33 @@ import * as tui from '../../../tui';
 import { projectDeploymentDelete } from '@agentuity/server';
 import { resolveProjectId } from './utils';
 import { getCommand } from '../../../command-prefix';
-const DeploymentRemoveResponseSchema = z.object({
-	success: z.boolean().describe('Whether the removal succeeded'),
+const DeploymentDeleteResponseSchema = z.object({
+	success: z.boolean().describe('Whether the deletion succeeded'),
 	projectId: z.string().describe('Project ID'),
-	deploymentId: z.string().describe('Deployment ID that was removed'),
+	deploymentId: z.string().describe('Deployment ID that was deleted'),
 });
 
 export const removeSubcommand = createSubcommand({
-	name: 'remove',
-	description: 'Remove a specific deployment',
+	name: 'delete',
+	aliases: ['rm', 'del', 'remove', 'terminate'],
+	description: 'Delete a specific deployment',
 	tags: ['destructive', 'deletes-resource', 'slow', 'requires-auth', 'requires-deployment'],
 	examples: [
 		{
-			command: getCommand('cloud deployment remove dep_abc123xyz'),
-			description: 'Remove with confirmation',
+			command: getCommand('cloud deployment delete deploy_abc123xyz'),
+			description: 'Delete with confirmation',
 		},
 		{
-			command: getCommand('cloud deployment remove dep_abc123xyz --force'),
-			description: 'Remove without confirmation',
+			command: getCommand('cloud deployment delete deploy_abc123xyz --force'),
+			description: 'Delete without confirmation',
 		},
 		{
 			command: getCommand(
-				'cloud deployment remove deployment-2024-11-20 --project-id=proj_abc123xyz'
+				'cloud deployment delete deploy_2024-11-20 --project-id=proj_abc123xyz'
 			),
-			description: 'Remove deployment from specific project',
+			description: 'Delete deployment from specific project',
 		},
 	],
-	aliases: ['rm', 'delete'],
 	idempotent: false,
 	requires: { auth: true, apiClient: true },
 	optional: { project: true },
@@ -41,9 +41,9 @@ export const removeSubcommand = createSubcommand({
 		}),
 		options: z.object({
 			projectId: z.string().optional().describe('filter by project id'),
-			force: z.boolean().default(false).describe('Force removal without confirmation'),
+			force: z.boolean().default(false).describe('Force deletion without confirmation'),
 		}),
-		response: DeploymentRemoveResponseSchema,
+		response: DeploymentDeleteResponseSchema,
 	},
 	async handler(ctx) {
 		const projectId = resolveProjectId(ctx, { projectId: ctx.opts.projectId });
@@ -51,7 +51,7 @@ export const removeSubcommand = createSubcommand({
 
 		if (!opts.force) {
 			const confirmed = await tui.confirm(
-				`Are you sure you want to remove deployment ${args.deployment_id}?`
+				`Are you sure you want to delete deployment ${args.deployment_id}?`
 			);
 			if (!confirmed) {
 				tui.info('Operation cancelled');
@@ -61,7 +61,7 @@ export const removeSubcommand = createSubcommand({
 
 		try {
 			await projectDeploymentDelete(apiClient, projectId, args.deployment_id);
-			tui.success(`Deployment ${args.deployment_id} removed successfully.`);
+			tui.success(`Deployment ${args.deployment_id} deleted successfully.`);
 
 			return {
 				success: true,
@@ -69,7 +69,7 @@ export const removeSubcommand = createSubcommand({
 				deploymentId: args.deployment_id,
 			};
 		} catch (ex) {
-			tui.fatal(`Failed to remove deployment: ${ex}`);
+			tui.fatal(`Failed to delete deployment: ${ex}`);
 		}
 	},
 });

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

@@ -60,7 +60,7 @@ export const showSubcommand = createSubcommand({
 	tags: ['read-only', 'fast', 'requires-auth', 'requires-deployment'],
 	examples: [
 		{
-			command: `${getCommand('cloud deployment show')} dep_abc123xyz`,
+			command: `${getCommand('cloud deployment show')} deploy_abc123xyz`,
 			description: 'Show deployment details by ID',
 		},
 		{

package/src/cmd/cloud/email/create.ts

@@ -8,7 +8,7 @@ import { defaultProfileName, getDefaultRegion } from '../../../config';
 
 export const createSubcommand = createCommand({
 	name: 'create',
-	aliases: ['add'],
+	aliases: ['new', 'add'],
 	description: 'Create an email address',
 	tags: ['mutating', 'creates-resource', 'requires-auth'],
 	requires: { auth: true },

package/src/cmd/cloud/email/delete.ts

@@ -10,7 +10,7 @@ const DeleteResponseSchema = z.object({
 
 export const deleteSubcommand = createCommand({
 	name: 'delete',
-	aliases: ['rm', 'del'],
+	aliases: ['rm', 'del', 'remove', 'terminate'],
 	description: 'Delete an email address',
 	tags: ['destructive', 'deletes-resource', 'requires-auth'],
 	requires: { auth: true },

package/src/cmd/cloud/email/destination/delete.ts

@@ -11,7 +11,7 @@ const DeleteDestinationResponseSchema = z.object({
 
 export const deleteSubcommand = createCommand({
 	name: 'delete',
-	aliases: ['rm', 'del'],
+	aliases: ['rm', 'del', 'remove', 'terminate'],
 	description: 'Delete a destination from an email address',
 	tags: ['destructive', 'deletes-resource', 'requires-auth'],
 	requires: { auth: true },

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

@@ -5,6 +5,7 @@ import { createEmailAdapter, EmailAddressSchema } from './util';
 
 export const getSubcommand = createCommand({
 	name: 'get',
+	aliases: ['show', 'info'],
 	description: 'Get an email address by ID',
 	tags: ['read-only', 'requires-auth'],
 	requires: { auth: true },

package/src/cmd/cloud/email/inbound/get.ts

@@ -6,6 +6,7 @@ import { EmailInboundSchema } from './schemas';
 
 export const getSubcommand = createCommand({
 	name: 'get',
+	aliases: ['show', 'info'],
 	description: 'Get a received email by ID',
 	tags: ['read-only', 'requires-auth'],
 	requires: { auth: true },