@agentuity/cli 0.1.13 → 0.1.15

package/src/cmd/project/template-flow.ts

@@ -10,6 +10,7 @@ import {
 	getServiceUrls,
 	APIClient as ServerAPIClient,
 	createResources,
+	validateDatabaseName,
 } from '@agentuity/server';
 import type { Logger } from '@agentuity/core';
 import * as tui from '../../tui';
@@ -56,7 +57,20 @@ interface CreateFlowOptions {
 	apiClient?: APIClient;
 }
 
-export async function runCreateFlow(options: CreateFlowOptions): Promise<void> {
+export interface CreateFlowResult {
+	projectId?: string;
+	orgId?: string;
+	name: string;
+	path: string;
+	template: string;
+	installed: boolean;
+	built: boolean;
+	domains?: string[];
+	success: boolean;
+	error?: string;
+}
+
+export async function runCreateFlow(options: CreateFlowOptions): Promise<CreateFlowResult> {
 	const {
 		projectName: initialProjectName,
 		dir: targetDir,
@@ -168,7 +182,7 @@ export async function runCreateFlow(options: CreateFlowOptions): Promise<void> {
 			const home = homedir();
 			if (dest === '/' || dest === home) {
 				logger.fatal(`Refusing to delete protected path: ${dest}`, ErrorCode.VALIDATION_FAILED);
-				return;
+				return undefined as never;
 			}
 			rmSync(dest, { recursive: true, force: true });
 			tui.success(`Deleted ${dest}`);
@@ -193,7 +207,7 @@ export async function runCreateFlow(options: CreateFlowOptions): Promise<void> {
 				`Template "${initialTemplate}" not found\n\nAvailable templates:\n${availableTemplates}`,
 				ErrorCode.RESOURCE_NOT_FOUND
 			);
-			return;
+			return undefined as never;
 		}
 		selectedTemplate = found;
 	} else if (skipPrompts || templates.length === 1) {
@@ -222,7 +236,7 @@ export async function runCreateFlow(options: CreateFlowOptions): Promise<void> {
 		const found = templates.find((t) => t.id === templateId);
 		if (!found) {
 			logger.fatal('Template selection failed', ErrorCode.USER_CANCELLED);
-			return;
+			return undefined as never;
 		}
 		selectedTemplate = found;
 	}
@@ -237,7 +251,7 @@ export async function runCreateFlow(options: CreateFlowOptions): Promise<void> {
 	});
 
 	// Setup project (replace placeholders, install deps, build)
-	await setupProject({
+	const setupResult = await setupProject({
 		dest,
 		projectName: projectName === '.' ? basename(dest) : projectName,
 		dirName: dirName === '.' ? basename(dest) : dirName,
@@ -246,15 +260,24 @@ export async function runCreateFlow(options: CreateFlowOptions): Promise<void> {
 		logger,
 	});
 
-	// Re-display template selection after spinners clear it (only if user actually selected)
-	if (!skipPrompts && templates.length > 1) {
+	// If setup failed, skip resource prompts and registration - just show error and return
+	if (!setupResult.success) {
+		tui.warning('Project setup failed. Skipping resource configuration.');
+		return {
+			name: projectName,
+			path: dest,
+			template: selectedTemplate.id,
+			installed: !options.noInstall,
+			built: false,
+			success: false,
+			error: 'Project setup completed with errors',
+		};
+	}
+
+	// Add separator bar if we're going to show resource prompts
+	if (!skipPrompts && auth && apiClient && catalystClient && orgId && region) {
 		const { symbols, tuiColors } = tui;
-		console.log(`${tuiColors.completed(symbols.completed)}  Select a template:`);
-		console.log(`${tuiColors.secondary(symbols.bar)}  ${tuiColors.muted(selectedTemplate.name)}`);
-		// Only add bar if we're going to show resource prompts
-		if (auth && apiClient && catalystClient && orgId && region) {
-			console.log(tuiColors.secondary(symbols.bar));
-		}
+		console.log(tuiColors.secondary(symbols.bar));
 	}
 
 	let _domains = domains;
@@ -342,10 +365,17 @@ export async function runCreateFlow(options: CreateFlowOptions): Promise<void> {
 		}
 		switch (choices.db_action) {
 			case 'Create New': {
-				const dbName = await prompt.text({
+				const dbNameInput = await prompt.text({
 					message: 'Database name',
-					hint: 'Optional - press Enter to auto-generate',
+					hint: 'Optional - lowercase letters, digits, underscores only',
+					validate: (value: string) => {
+						const trimmed = value.trim();
+						if (trimmed === '') return true;
+						const result = validateDatabaseName(trimmed);
+						return result.valid ? true : result.error!;
+					},
 				});
+				const dbName = dbNameInput.trim() || undefined;
 				const dbDescription = await prompt.text({
 					message: 'Database description',
 					hint: 'Optional - press Enter to skip',
@@ -357,7 +387,7 @@ export async function runCreateFlow(options: CreateFlowOptions): Promise<void> {
 						return createResources(catalystClient, orgId, region!, [
 							{
 								type: 'db',
-								name: dbName || undefined,
+								name: dbName,
 								description: dbDescription || undefined,
 							},
 						]);
@@ -578,7 +608,11 @@ export async function runCreateFlow(options: CreateFlowOptions): Promise<void> {
 
 	// Show completion message
 	if (!skipPrompts) {
-		tui.success('✨ Project created successfully!\n');
+		if (setupResult.success) {
+			tui.success('✨ Project created successfully!\n');
+		} else {
+			tui.warning('Project created with errors (see above)\n');
+		}
 
 		// Show next steps in a box with primary color for commands
 		if (dirName !== '.') {
@@ -598,7 +632,11 @@ export async function runCreateFlow(options: CreateFlowOptions): Promise<void> {
 			`${tui.tuiColors.muted('⭐️ Follow us:')} ${tui.link('https://github.com/agentuity/sdk')}`
 		);
 	} else {
-		tui.success('✨ Project created successfully!');
+		if (setupResult.success) {
+			tui.success('✨ Project created successfully!');
+		} else {
+			tui.warning('Project created with errors');
+		}
 	}
 
 	playSound();
@@ -616,6 +654,19 @@ export async function runCreateFlow(options: CreateFlowOptions): Promise<void> {
 	if (authEnabled && !templateHasAuth) {
 		printIntegrationExamples();
 	}
+
+	return {
+		projectId,
+		orgId,
+		name: projectName,
+		path: dest,
+		template: selectedTemplate.id,
+		installed: !options.noInstall,
+		built: !options.noBuild && setupResult.success,
+		domains: _domains,
+		success: setupResult.success,
+		error: setupResult.success ? undefined : 'Project setup completed with errors',
+	};
 }
 
 /**

package/src/config.ts

@@ -359,6 +359,29 @@ export async function saveOrgId(orgId: string): Promise<void> {
 	await saveConfig(config);
 }
 
+export async function clearOrgId(): Promise<void> {
+	const config = await getOrInitConfig();
+	if (config.preferences) {
+		delete (config.preferences as Record<string, unknown>).orgId;
+		await saveConfig(config);
+	}
+}
+
+export async function saveRegion(region: string): Promise<void> {
+	const config = await getOrInitConfig();
+	config.preferences = config.preferences || {};
+	(config.preferences as Record<string, unknown>).region = region;
+	await saveConfig(config);
+}
+
+export async function clearRegion(): Promise<void> {
+	const config = await getOrInitConfig();
+	if (config.preferences) {
+		delete (config.preferences as Record<string, unknown>).region;
+		await saveConfig(config);
+	}
+}
+
 export async function getAuth(): Promise<AuthData | null> {
 	const config = await loadConfig();
 	const profileName = config?.name || defaultProfileName;
@@ -590,26 +613,29 @@ export async function createProjectConfig(dir: string, config: InitialProjectCon
 	await Bun.write(envPath, content);
 	await chmod(envPath, 0o600);
 
-	// generate the vscode settings
+	// generate the vscode settings (only if they don't already exist)
 	const vscodeDir = join(dir, '.vscode');
-	mkdirSync(vscodeDir);
-
-	const settings = {
-		'search.exclude': {
-			'**/.git/**': true,
-			'**/node_modules/**': true,
-			'**/bun.lock': true,
-			'**/.agentuity/**': true,
-		},
-		'json.schemas': [
-			{
-				fileMatch: ['agentuity.json'],
-				url: 'https://agentuity.dev/schema/cli/v1/agentuity.json',
+	const settingsPath = join(vscodeDir, 'settings.json');
+	if (!(await Bun.file(settingsPath).exists())) {
+		mkdirSync(vscodeDir, { recursive: true });
+
+		const settings = {
+			'search.exclude': {
+				'**/.git/**': true,
+				'**/node_modules/**': true,
+				'**/bun.lock': true,
+				'**/.agentuity/**': true,
 			},
-		],
-	};
+			'json.schemas': [
+				{
+					fileMatch: ['agentuity.json'],
+					url: 'https://agentuity.dev/schema/cli/v1/agentuity.json',
+				},
+			],
+		};
 
-	await Bun.write(join(vscodeDir, 'settings.json'), JSON.stringify(settings, null, 2));
+		await Bun.write(settingsPath, JSON.stringify(settings, null, 2));
+	}
 }
 
 export async function updateProjectConfig(
@@ -721,13 +747,18 @@ interface RegionsCacheData {
 /**
  * Get the default region using priority ordering:
  * 1. AGENTUITY_REGION environment variable
- * 2. First entry in region-{profile}.json (nearest region, sorted by distance)
- * 3. 'local' for local profile, 'usc' otherwise
+ * 2. 'local' for local profile
+ * 3. Saved region preference (config.preferences.region)
+ * 4. First entry in region-{profile}.json (nearest region, sorted by distance)
+ * 5. 'usc' fallback
  *
  * Used for API calls that can hit any Catalyst instance (global database operations).
  * Note: This is NOT called when --region flag is provided (handled at command level).
  */
-export async function getDefaultRegion(profileName = 'production'): Promise<string> {
+export async function getDefaultRegion(
+	profileName = 'production',
+	config?: Config | null
+): Promise<string> {
 	// 1. Check environment variable first
 	if (process.env.AGENTUITY_REGION) {
 		return process.env.AGENTUITY_REGION;
@@ -738,7 +769,12 @@ export async function getDefaultRegion(profileName = 'production'): Promise<stri
 		return 'local';
 	}
 
-	// 3. Check cached regions file (sorted by distance)
+	// 3. Check saved region preference
+	if (config?.preferences?.region) {
+		return config.preferences.region;
+	}
+
+	// 4. Check cached regions file (sorted by distance)
 	try {
 		const cachePath = join(getDefaultConfigDir(), `regions-${profileName}.json`);
 		const file = Bun.file(cachePath);
@@ -752,7 +788,7 @@ export async function getDefaultRegion(profileName = 'production'): Promise<stri
 		// Fall through to default
 	}
 
-	// 4. Final fallback
+	// 5. Final fallback
 	return 'usc';
 }
 

package/src/legacy-check.ts

@@ -23,6 +23,11 @@ export async function checkLegacyCLI(): Promise<void> {
 		join(homeDir, '.local/bin/agentuity'), // XDG user bin
 	];
 
+	// Exclude the currently running executable from the legacy check
+	// This prevents the new CLI from detecting itself as legacy when installed
+	// in standard system locations like /usr/local/bin
+	const currentExecutable = process.execPath;
+
 	const foundInstalls: LegacyInstall[] = [];
 
 	// Check if Homebrew manages the agentuity package
@@ -40,6 +45,11 @@ export async function checkLegacyCLI(): Promise<void> {
 
 	// Check file system locations
 	for (const location of legacyLocations) {
+		// Skip if this is the currently running executable
+		if (location === currentExecutable) {
+			continue;
+		}
+
 		const file = Bun.file(location);
 		if (await file.exists()) {
 			try {

package/src/program-ref.ts

@@ -0,0 +1,11 @@
+import type { Command } from 'commander';
+
+let programRef: Command | null = null;
+
+export function setProgram(program: Command): void {
+	programRef = program;
+}
+
+export function getProgram(): Command | null {
+	return programRef;
+}

package/src/regions.ts

@@ -0,0 +1,95 @@
+/**
+ * Region caching utilities for avoiding repeated API calls
+ */
+import { join } from 'node:path';
+import { mkdir, unlink } from 'node:fs/promises';
+import type { Logger } from '@agentuity/core';
+import { listRegions, type RegionList } from '@agentuity/server';
+import { getDefaultConfigDir } from './config';
+import type { APIClient } from './api';
+
+const REGIONS_CACHE_MAX_AGE_MS = 5 * 24 * 60 * 60 * 1000; // 5 days
+const LEGACY_REGIONS_CACHE_FILE = 'regions.json';
+
+function getRegionsCacheFile(profileName: string): string {
+	return `regions-${profileName}.json`;
+}
+
+async function removeLegacyRegionsCache(logger: Logger): Promise<void> {
+	try {
+		const legacyPath = join(getDefaultConfigDir(), LEGACY_REGIONS_CACHE_FILE);
+		const file = Bun.file(legacyPath);
+		if (await file.exists()) {
+			await unlink(legacyPath);
+			logger.trace('removed legacy regions cache file');
+		}
+	} catch {
+		// Ignore errors when removing legacy file
+	}
+}
+
+interface RegionsCacheData {
+	timestamp: number;
+	regions: RegionList;
+}
+
+async function getCachedRegions(profileName: string, logger: Logger): Promise<RegionList | null> {
+	try {
+		// Clean up legacy single-file cache from older versions
+		await removeLegacyRegionsCache(logger);
+
+		const cachePath = join(getDefaultConfigDir(), getRegionsCacheFile(profileName));
+		const file = Bun.file(cachePath);
+		if (!(await file.exists())) {
+			return null;
+		}
+		const data: RegionsCacheData = await file.json();
+		const age = Date.now() - data.timestamp;
+		if (age > REGIONS_CACHE_MAX_AGE_MS) {
+			logger.trace('regions cache expired for profile %s (age: %dms)', profileName, age);
+			return null;
+		}
+		logger.trace('using cached regions for profile %s (age: %dms)', profileName, age);
+		return data.regions;
+	} catch (error) {
+		logger.trace('failed to read regions cache for profile %s: %s', profileName, error);
+		return null;
+	}
+}
+
+async function saveRegionsCache(
+	profileName: string,
+	regions: RegionList,
+	logger: Logger
+): Promise<void> {
+	try {
+		const cacheDir = getDefaultConfigDir();
+		await mkdir(cacheDir, { recursive: true });
+		const cachePath = join(cacheDir, getRegionsCacheFile(profileName));
+		const data: RegionsCacheData = {
+			timestamp: Date.now(),
+			regions,
+		};
+		await Bun.write(cachePath, JSON.stringify(data));
+		logger.trace('saved regions cache for profile %s', profileName);
+	} catch (error) {
+		logger.trace('failed to save regions cache for profile %s: %s', profileName, error);
+	}
+}
+
+/**
+ * Fetch regions from API with caching
+ */
+export async function fetchRegionsWithCache(
+	profileName: string,
+	apiClient: APIClient,
+	logger: Logger
+): Promise<RegionList> {
+	const cached = await getCachedRegions(profileName, logger);
+	if (cached) {
+		return cached;
+	}
+	const regions = await listRegions(apiClient);
+	await saveRegionsCache(profileName, regions, logger);
+	return regions;
+}

package/src/tui/prompt.ts

@@ -166,9 +166,16 @@ export class PromptFlow {
 				readline.moveCursor(process.stdout, 0, -linesToClear);
 				readline.clearScreenDown(process.stdout);
 
-				process.stdout.write(
-					`${colors.completed(symbols.completed)}  ${message}\n${colors.secondary(symbols.bar)}  ${colors.muted(value)}\n${colors.secondary(symbols.bar)}\n`
-				);
+				// If value is empty, only show message and separator (no value line)
+				if (value === '') {
+					process.stdout.write(
+						`${colors.completed(symbols.completed)}  ${message}\n${colors.secondary(symbols.bar)}\n`
+					);
+				} else {
+					process.stdout.write(
+						`${colors.completed(symbols.completed)}  ${message}\n${colors.secondary(symbols.bar)}  ${colors.muted(value)}\n${colors.secondary(symbols.bar)}\n`
+					);
+				}
 
 				this.states.push({
 					type: 'completed',

package/src/tui.ts

@@ -247,7 +247,8 @@ export function getSeverityColor(severity: string): (text: string) => string {
 export function success(message: string): void {
 	const color = getColor('success');
 	const reset = getColor('reset');
-	process.stderr.write(`${color}${ICONS.success} ${message}${reset}\n`);
+	// Clear line first to ensure no leftover content from previous output
+	process.stderr.write(`\r\x1b[2K${color}${ICONS.success} ${message}${reset}\n`);
 }
 
 /**
@@ -348,6 +349,11 @@ export function link(url: string, title?: string, color = getColor('link')): str
  * Check if terminal supports OSC 8 hyperlinks
  */
 export function supportsHyperlinks(): boolean {
+	// No hyperlink support without a TTY
+	if (!process.stdout.isTTY) {
+		return false;
+	}
+
 	const term = process.env.TERM || '';
 	const termProgram = process.env.TERM_PROGRAM || '';
 	const wtSession = process.env.WT_SESSION || '';
@@ -360,7 +366,6 @@ export function supportsHyperlinks(): boolean {
 		termProgram.includes('Apple_Terminal') ||
 		termProgram.includes('Hyper') ||
 		term.includes('xterm-kitty') ||
-		term.includes('xterm-256color') ||
 		wtSession !== '' // Windows Terminal
 	);
 }
@@ -816,9 +821,7 @@ export function showLoggedOutMessage(appBaseUrl: string, hasProfile = false): vo
 	const RESET = '\x1b[0m';
 
 	const signupTitle = hasProfile ? 'Login' : 'Sign up / Login';
-	const signupURL = hasProfile
-		? `${appBaseUrl}/sign-in`
-		: `${appBaseUrl}/sign-up`;
+	const signupURL = hasProfile ? `${appBaseUrl}/sign-in` : `${appBaseUrl}/sign-up`;
 	const showInline = supportsHyperlinks();
 	const signupLink = showInline
 		? link(signupURL, signupTitle)
@@ -827,7 +830,11 @@ export function showLoggedOutMessage(appBaseUrl: string, hasProfile = false): vo
 	// Padding needed: 46 - 17 - signupTitle.length - 1 (space before link) = 28 - signupTitle.length
 	const paddingLength = 28 - signupTitle.length;
 	const padding = ' '.repeat(paddingLength);
-	const showNewLine = showInline ? '' : `║ ${RESET}${link(signupURL)}${YELLOW}            ║`;
+	// When not showing inline hyperlink, show URL on separate line with proper padding
+	// Box format: "║ " + content + "║" = 48 chars total
+	// Content area = 46 chars, with leading space = 45 chars for URL + padding
+	const urlPadding = Math.max(0, 45 - signupURL.length);
+	const showNewLine = showInline ? '' : `║ ${RESET}${link(signupURL)}${YELLOW}${' '.repeat(urlPadding)}║`;
 
 	const lines = [
 		'╔══════════════════════════════════════════════╗',
@@ -842,6 +849,8 @@ export function showLoggedOutMessage(appBaseUrl: string, hasProfile = false): vo
 
 	console.log('');
 	lines.filter(Boolean).map((line) => console.log(YELLOW + line + RESET));
+	console.log('');
+	console.log('');
 }
 
 /**
@@ -1301,11 +1310,17 @@ export async function spinner<T>(
 		// Stop animation
 		clearInterval(interval);
 
-		// Move cursor to start of output, clear all lines
+		// Move cursor to start of output, clear only our lines (not to end of screen)
 		if (linesRendered > 0) {
 			process.stderr.write(`\x1b[${linesRendered}A`);
+			for (let i = 0; i < linesRendered; i++) {
+				process.stderr.write('\x1b[2K'); // Clear entire line
+				if (i < linesRendered - 1) {
+					process.stderr.write('\x1b[B'); // Move down one line
+				}
+			}
+			process.stderr.write(`\x1b[${linesRendered}A\r`); // Move back up
 		}
-		process.stderr.write('\x1b[J'); // Clear from cursor to end of screen
 		process.stderr.write('\x1B[?25h'); // Show cursor
 
 		process.exit(130); // Standard exit code for SIGINT
@@ -1361,11 +1376,22 @@ export async function spinner<T>(
 		// Stop animation first
 		clearInterval(interval);
 
-		// Move cursor to start of output, clear all lines
+		// Move cursor to start of output, clear only our lines (not to end of screen)
 		if (linesRendered > 0) {
 			process.stderr.write(`\x1b[${linesRendered}A`);
+			for (let i = 0; i < linesRendered; i++) {
+				process.stderr.write('\r\x1b[2K'); // Clear entire line
+				if (i < linesRendered - 1) {
+					process.stderr.write('\x1b[B'); // Move down one line
+				}
+			}
+			// After loop, cursor is at last cleared line (linesRendered - 1 from start)
+			// Move up (linesRendered - 1) to get back to start position
+			if (linesRendered > 1) {
+				process.stderr.write(`\x1b[${linesRendered - 1}A`);
+			}
+			process.stderr.write('\r');
 		}
-		process.stderr.write('\x1b[J'); // Clear from cursor to end of screen
 		process.stderr.write('\x1B[?25h'); // Show cursor
 
 		// If clearOnSuccess is false, show success message
@@ -1382,11 +1408,22 @@ export async function spinner<T>(
 		// Stop animation first
 		clearInterval(interval);
 
-		// Move cursor to start of output, clear all lines
+		// Move cursor to start of output, clear only our lines (not to end of screen)
 		if (linesRendered > 0) {
 			process.stderr.write(`\x1b[${linesRendered}A`);
+			for (let i = 0; i < linesRendered; i++) {
+				process.stderr.write('\r\x1b[2K'); // Clear entire line
+				if (i < linesRendered - 1) {
+					process.stderr.write('\x1b[B'); // Move down one line
+				}
+			}
+			// After loop, cursor is at last cleared line (linesRendered - 1 from start)
+			// Move up (linesRendered - 1) to get back to start position
+			if (linesRendered > 1) {
+				process.stderr.write(`\x1b[${linesRendered - 1}A`);
+			}
+			process.stderr.write('\r');
 		}
-		process.stderr.write('\x1b[J'); // Clear from cursor to end of screen
 		process.stderr.write('\x1B[?25h'); // Show cursor
 
 		// Show error
@@ -1559,7 +1596,8 @@ export async function runCommand(options: CommandRunnerOptions): Promise<number>
 
 					for (const line of lines) {
 						if (line.trim()) {
-							allOutputLines.push(line);
+							// Strip ANSI codes from command output to prevent cursor/display issues
+							allOutputLines.push(stripAnsi(line));
 							renderOutput(maxLinesOutput); // Show last N lines while streaming
 						}
 					}
@@ -1580,25 +1618,44 @@ export async function runCommand(options: CommandRunnerOptions): Promise<number>
 			if (linesRendered > 0) {
 				// Move up to the command line
 				process.stdout.write(`\x1b[${linesRendered}A`);
-				// Clear each line (entire line) and move cursor back up
+				// Clear each line (entire line)
 				for (let i = 0; i < linesRendered; i++) {
-					process.stdout.write('\x1b[2K'); // Clear entire line
+					process.stdout.write('\r\x1b[2K'); // Clear entire line
 					if (i < linesRendered - 1) {
 						process.stdout.write('\x1b[B'); // Move down one line
 					}
 				}
-				// Move cursor back up to original position
-				process.stdout.write(`\x1b[${linesRendered}A\r`);
+				// After loop, cursor is at last cleared line (linesRendered - 1 from start)
+				// Move up (linesRendered - 1) to get back to start position
+				if (linesRendered > 1) {
+					process.stdout.write(`\x1b[${linesRendered - 1}A`);
+				}
+				process.stdout.write('\r');
 			}
 			return exitCode;
 		}
 
-		// Clear all rendered lines completely
+		// Determine how many lines to show in final output
+		const finalLinesToShow = exitCode === 0 ? maxLinesOutput : maxLinesOnFailure;
+		const finalOutputLines = allOutputLines.slice(-finalLinesToShow);
+
+		// Clear all rendered lines completely (only our lines, not previous output)
 		if (linesRendered > 0) {
 			// Move up to the command line (first line of our output)
 			process.stdout.write(`\x1b[${linesRendered}A`);
-			// Move to beginning of line and clear from cursor to end of screen
-			process.stdout.write('\r\x1b[J');
+			// Clear the lines we rendered during streaming
+			for (let i = 0; i < linesRendered; i++) {
+				process.stdout.write('\r\x1b[2K'); // Clear entire line
+				if (i < linesRendered - 1) {
+					process.stdout.write('\x1b[B'); // Move down one line
+				}
+			}
+			// After loop, cursor is at last cleared line (linesRendered - 1 from start)
+			// Move up (linesRendered - 1) to get back to start position
+			if (linesRendered > 1) {
+				process.stdout.write(`\x1b[${linesRendered - 1}A`);
+			}
+			process.stdout.write('\r');
 		}
 
 		// Determine icon based on exit code
@@ -1610,19 +1667,18 @@ export async function runCommand(options: CommandRunnerOptions): Promise<number>
 			`\r\x1b[K${statusColor}${icon}${reset} ${cmdColor}${displayCmd}${reset}\n`
 		);
 
-		// Determine how many lines to show in final output
-		const finalLinesToShow = exitCode === 0 ? maxLinesOutput : maxLinesOnFailure;
-
-		// Show final output lines
-		const finalOutputLines = allOutputLines.slice(-finalLinesToShow);
+		// Show final output lines (clearing each line first in case we're using more lines than before)
 		for (const line of finalOutputLines) {
 			const displayLine =
 				truncate && getDisplayWidth(line) > maxLineWidth
 					? truncateToWidth(line, maxLineWidth)
 					: line;
-			process.stdout.write(`\r\x1b[K${mutedColor}${displayLine}${reset}\n`);
+			process.stdout.write(`\x1b[2K${mutedColor}${displayLine}${reset}\n`);
 		}
 
+		// If we're showing more lines than we had before, the extra lines may contain old content
+		// We've already written over them, so they're clean now
+
 		return exitCode;
 	} catch (err) {
 		// Move cursor up to clear our UI

package/src/types.ts

@@ -50,6 +50,7 @@ export const ConfigSchema = zod.object({
 			last_legacy_warning: zod.number().optional().describe('Last legacy CLI warning timestamp'),
 			signup_banner_shown: zod.boolean().optional().describe('If the signup banner was shown'),
 			orgId: zod.string().optional().describe('Default organization ID'),
+			region: zod.string().optional().describe('Default cloud region'),
 			project_dir: zod.string().optional().describe('Last used project directory'),
 		})
 		.optional()
@@ -61,6 +62,7 @@ export const ConfigSchema = zod.object({
 		})
 		.optional()
 		.describe('the gravity client information'),
+
 });
 
 export type Config = zod.infer<typeof ConfigSchema>;