@agentuity/cli 0.1.11 → 0.1.12

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

@@ -342,11 +342,25 @@ export async function runCreateFlow(options: CreateFlowOptions): Promise<void> {
 		}
 		switch (choices.db_action) {
 			case 'Create New': {
+				const dbName = await prompt.text({
+					message: 'Database name',
+					hint: 'Optional - press Enter to auto-generate',
+				});
+				const dbDescription = await prompt.text({
+					message: 'Database description',
+					hint: 'Optional - press Enter to skip',
+				});
 				const created = await tui.spinner({
 					message: 'Provisioning New SQL Database',
 					clearOnSuccess: true,
 					callback: async () => {
-						return createResources(catalystClient, orgId, region!, [{ type: 'db' }]);
+						return createResources(catalystClient, orgId, region!, [
+							{
+								type: 'db',
+								name: dbName || undefined,
+								description: dbDescription || undefined,
+							},
+						]);
 					},
 				});
 				// Collect env vars from newly created resource

package/src/cmd/setup/index.ts

@@ -1,9 +1,12 @@
 import { z } from 'zod';
 import { createCommand } from '../../types';
+import { hasLoggedInBefore } from '../../auth';
 import { showBanner } from '../../banner';
 import * as tui from '../../tui';
 import { getCommand } from '../../command-prefix';
 
+const validateToken = /[\d]{7,}\.[\w-_.]{22}/;
+
 export const command = createCommand({
 	name: 'setup',
 	description: 'Display first-run setup information (internal use)',
@@ -11,22 +14,57 @@ export const command = createCommand({
 	skipUpgradeCheck: true,
 	skipSkill: true,
 	tags: ['read-only', 'fast'],
-	optional: { auth: true },
 	schema: {
 		options: z.object({
 			nonInteractive: z.boolean().optional().describe('Run in non-interactive mode'),
+			setupToken: z.string().optional().describe('Use a one-time use setup token'),
 		}),
 	},
 
 	async handler(ctx) {
-		const { opts, auth } = ctx;
+		const { opts } = ctx;
 		const _nonInteractive = opts.nonInteractive ?? false;
 
+		// validate the one time setup token if provided
+		if (opts?.setupToken && opts.setupToken !== '-' && validateToken.test(opts.setupToken)) {
+			const [hours] = opts.setupToken.split('.');
+			const tokenInterval = Number(hours);
+			if (!Number.isNaN(tokenInterval)) {
+				const now = Math.round(Date.now() / (60_000 * 5));
+				if (tokenInterval === now || tokenInterval === now - 1) {
+					const ok = await tui.spinner({
+						message: 'Validating your identity',
+						clearOnSuccess: true,
+						callback: async () => {
+							const newargs = process.argv.map((x) => (x === 'setup' ? 'login' : x));
+							const r = Bun.spawn({
+								cmd: newargs.concat('--json'),
+								stdout: 'pipe',
+								stderr: 'inherit',
+							});
+							await r.exited;
+							try {
+								const res = JSON.parse(await r.stdout.text()) as { success: boolean };
+								return res.success;
+							} catch {
+								/* fall through */
+							}
+							return false;
+						},
+					});
+					if (ok) {
+						/* TODO */
+						return;
+					}
+				}
+			}
+		}
+
 		tui.newline();
 		showBanner();
 		tui.newline();
 
-		if (!auth?.expires) {
+		if (!(await hasLoggedInBefore())) {
 			tui.output(`${tui.muted('To get started, run:')}`);
 			tui.newline();
 			tui.output(

package/src/config.ts

@@ -298,11 +298,12 @@ export async function saveAuth(auth: AuthData): Promise<void> {
 		try {
 			await saveAuthToKeychain(profileName, authData);
 
-			// Successfully stored in keychain, remove from config if present
+			// Successfully stored in keychain, remove auth from config if present
+			// but always save config to ensure profile file exists
 			if (config.auth) {
 				delete config.auth;
-				await saveConfig(config);
 			}
+			await saveConfig(config);
 			return;
 		} catch (error) {
 			// Keychain failed, fall back to config file

package/src/steps.ts

@@ -518,7 +518,8 @@ async function runStepsTUI(steps: Step[]): Promise<void> {
 			// Handle errors
 			if (stepState.status === 'error') {
 				const errorColor = getColor('red');
-				console.error(`\n${errorColor}Error: ${stepState.errorMessage}${COLORS.reset}`);
+				const errorMsg = stepState.errorMessage || 'An unknown error occurred';
+				console.error(`\n${errorColor}Error: ${errorMsg}${COLORS.reset}`);
 				if (
 					stepState.errorCause instanceof ValidationInputError ||
 					stepState.errorCause instanceof ValidationOutputError
@@ -611,7 +612,8 @@ async function runStepsPlain(steps: Step[]): Promise<void> {
 				console.log('');
 			}
 			const errorColor = getColor('red');
-			console.error(`\n${errorColor}Error: ${outcome.message}${COLORS.reset}`);
+			const errorMsg = outcome.message || 'An unknown error occurred';
+			console.error(`\n${errorColor}Error: ${errorMsg}${COLORS.reset}`);
 			if (
 				outcome.cause instanceof ValidationInputError ||
 				outcome.cause instanceof ValidationOutputError

package/src/tui.ts

@@ -807,19 +807,26 @@ export function showSignupBenefits(): void {
 
 /**
  * Display a message when unauthenticated to let the user know certain capabilities are disabled
+ * @param hasProfile - If true, user has logged in before so only show "Login" instead of "Sign up / Login"
  */
-export function showLoggedOutMessage(): void {
+export function showLoggedOutMessage(appBaseUrl: string, hasProfile = false): void {
 	const YELLOW = Bun.color('yellow', 'ansi-16m');
 	const TEXT =
 		currentColorScheme === 'dark' ? Bun.color('white', 'ansi') : Bun.color('black', 'ansi');
 	const RESET = '\x1b[0m';
 
-	const signupTitle = 'Sign up / Login';
+	const signupTitle = hasProfile ? 'Login' : 'Sign up / Login';
+	const signupURL = hasProfile
+		? `${appBaseUrl}/sign-in`
+		: `${appBaseUrl}/sign-up`;
 	const showInline = supportsHyperlinks();
-	const signupURL = 'https://app-v1.agentuity.com/sign-up';
 	const signupLink = showInline
 		? link(signupURL, signupTitle)
 		: ' '.repeat(stringWidth(signupTitle));
+	// Box inner width is 46 chars, "unauthenticated. " = 17 chars
+	// 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}            ║`;
 
 	const lines = [
@@ -828,7 +835,7 @@ export function showLoggedOutMessage(): void {
 		'║                                              ║',
 		`║ ${TEXT}Certain capabilities such as the AI services${YELLOW} ║`,
 		`║ ${TEXT}and devmode remote are unavailable when${YELLOW}      ║`,
-		`║ ${TEXT}unauthenticated.${YELLOW} ${signupLink}${YELLOW}             ║`,
+		`║ ${TEXT}unauthenticated.${YELLOW} ${signupLink}${YELLOW}${padding}║`,
 		showNewLine,
 		'╚══════════════════════════════════════════════╝',
 	];
@@ -837,6 +844,36 @@ export function showLoggedOutMessage(): void {
 	lines.filter(Boolean).map((line) => console.log(YELLOW + line + RESET));
 }
 
+/**
+ * Display a warning when running in local-only mode (no agentuity.json project config)
+ * This is shown during `agentuity dev` when the project hasn't been registered with Agentuity Cloud
+ */
+export function showLocalOnlyWarning(): void {
+	const YELLOW = Bun.color('yellow', 'ansi-16m');
+	const TEXT =
+		currentColorScheme === 'dark' ? Bun.color('white', 'ansi') : Bun.color('black', 'ansi');
+	const RESET = '\x1b[0m';
+
+	const lines = [
+		'╔═══════════════════════════════════════════════════════════════╗',
+		`║ ⨺ Local-only mode                                             ║`,
+		'║                                                               ║',
+		`║ ${TEXT}This project is not registered with Agentuity Cloud.${YELLOW}          ║`,
+		`║ ${TEXT}The following features are disabled:${YELLOW}                          ║`,
+		`║   ${TEXT}• AI Gateway (LLM calls require provider API keys)${YELLOW}          ║`,
+		`║   ${TEXT}• Public URL / Remote access${YELLOW}                                ║`,
+		`║   ${TEXT}• Dashboard / Tracing / Observability${YELLOW}                       ║`,
+		'║                                                               ║',
+		`║ ${TEXT}To enable cloud features, create a project and login.${YELLOW}         ║`,
+		`║ ${TEXT}Or set provider API keys (e.g. OPENAI_API_KEY) in .env${YELLOW}        ║`,
+		'╚═══════════════════════════════════════════════════════════════╝',
+	];
+
+	console.log('');
+	lines.map((line) => console.log(YELLOW + line + RESET));
+	console.log('');
+}
+
 /**
  * Copy text to clipboard
  * Returns true if successful, false otherwise
@@ -1675,11 +1712,14 @@ export async function selectOrganization(
 		);
 	}
 
+	// Find the index of the initial org to pre-select it in the list
+	const initialIndex = initial ? orgs.findIndex((o) => o.id === initial) : -1;
+
 	const response = await enquirer.prompt<{ action: string }>({
 		type: 'select',
 		name: 'action',
 		message: 'Select an organization',
-		initial: initial || (orgs.length === 1 ? orgs[0].id : undefined),
+		initial: initialIndex >= 0 ? initialIndex : 0,
 		choices: orgs.map((o) => ({ message: o.name, name: o.id })),
 	});
 
@@ -1830,6 +1870,11 @@ export interface TableOptions {
 	 * - 'auto': Automatically choose based on terminal width (default)
 	 */
 	layout?: 'horizontal' | 'vertical' | 'auto';
+
+	/**
+	 * the padding before any label
+	 */
+	padStart?: string;
 }
 
 /**
@@ -1838,10 +1883,11 @@ export interface TableOptions {
  */
 function calculateTableWidth<T extends Record<string, unknown>>(
 	data: T[],
-	columnNames: string[]
+	columnNames: string[],
+	padStart = ''
 ): number {
 	const columnWidths = columnNames.map((colName) => {
-		let maxWidth = getDisplayWidth(colName);
+		let maxWidth = getDisplayWidth(padStart + colName);
 		for (const row of data) {
 			const value = row[colName];
 			const valueStr = value !== undefined && value !== null ? String(value) : '';
@@ -1866,14 +1912,17 @@ function calculateTableWidth<T extends Record<string, unknown>>(
  */
 function renderVerticalTable<T extends Record<string, unknown>>(
 	data: T[],
-	columnNames: string[]
+	columnNames: string[],
+	padStart = ''
 ): string {
 	const lines: string[] = [];
 	const mutedColor = getColor('muted');
 	const reset = getColor('reset');
 
 	// Calculate max column name width for alignment
-	const maxLabelWidth = Math.max(...columnNames.map((name) => 1 + getDisplayWidth(name)));
+	const maxLabelWidth = Math.max(
+		...columnNames.map((name) => 1 + getDisplayWidth(padStart + name))
+	);
 
 	for (let i = 0; i < data.length; i++) {
 		const row = data[i];
@@ -1881,7 +1930,7 @@ function renderVerticalTable<T extends Record<string, unknown>>(
 		for (const colName of columnNames) {
 			const value = row[colName];
 			const valueStr = value !== undefined && value !== null ? String(value) : '';
-			const paddedLabel = `${colName}:`.padEnd(maxLabelWidth);
+			const paddedLabel = `${padStart}${colName}:`.padEnd(maxLabelWidth);
 			lines.push(`${mutedColor}${paddedLabel}${reset}  ${valueStr}`);
 		}
 
@@ -1942,13 +1991,13 @@ export function table<T extends Record<string, unknown>>(
 	// Determine layout mode
 	const layout = options?.layout ?? 'auto';
 	const termWidth = getTerminalWidth(80);
-	const tableWidth = calculateTableWidth(data, columnNames);
+	const tableWidth = calculateTableWidth(data, columnNames, options?.padStart);
 	const useVertical = layout === 'vertical' || (layout === 'auto' && tableWidth > termWidth);
 
 	let output: string;
 
 	if (useVertical) {
-		output = renderVerticalTable(data, columnNames);
+		output = renderVerticalTable(data, columnNames, options?.padStart);
 	} else {
 		// eslint-disable-next-line @typescript-eslint/no-require-imports
 		const Table = require('cli-table3') as new (options?: {