@agentuity/cli 0.0.43 → 0.0.44

package/src/auth.ts

@@ -1,9 +1,12 @@
 import { existsSync } from 'node:fs';
 import enquirer from 'enquirer';
-import { getDefaultConfigDir, getAuth, saveConfig, loadConfig } from './config';
+import { getDefaultConfigDir, getAuth, saveConfig, loadConfig, saveOrgId } from './config';
 import { getCommand } from './command-prefix';
 import type { CommandContext, AuthData } from './types';
 import * as tui from './tui';
+import { defaultProfileName } from './config';
+import { listOrganizations } from '@agentuity/server';
+import { APIClient, getAPIBaseURL, type APIClient as APIClientType } from './api';
 
 export function isTTY(): boolean {
 	return process.stdin.isTTY === true && process.stdout.isTTY === true;
@@ -22,7 +25,7 @@ export async function isAuthenticated(): Promise<boolean> {
 	return auth.expires > new Date();
 }
 
-export async function requireAuth(ctx: CommandContext<false>): Promise<AuthData> {
+export async function requireAuth(ctx: CommandContext<undefined>): Promise<AuthData> {
 	const { logger } = ctx;
 	const auth = await getAuth();
 
@@ -69,7 +72,17 @@ export async function requireAuth(ctx: CommandContext<false>): Promise<AuthData>
 
 	// Import and run login flow
 	const { loginCommand } = await import('./cmd/auth/login');
-	await loginCommand.handler(ctx);
+
+	// Ensure apiClient is available for login handler
+	const loginCtx = ctx as unknown as Record<string, unknown>;
+	if (!loginCtx.apiClient) {
+		const apiUrl = getAPIBaseURL(ctx.config ?? null);
+		loginCtx.apiClient = new APIClient(apiUrl, ctx.logger, ctx.config ?? null);
+	}
+
+	if (loginCommand.handler) {
+		await loginCommand.handler(loginCtx as CommandContext);
+	}
 
 	// After login completes, verify we have auth
 	const newAuth = await getAuth();
@@ -82,7 +95,7 @@ export async function requireAuth(ctx: CommandContext<false>): Promise<AuthData>
 }
 
 export async function optionalAuth(
-	ctx: CommandContext<false>,
+	ctx: CommandContext<undefined>,
 	continueText?: string
 ): Promise<AuthData | null> {
 	const auth = await getAuth();
@@ -103,7 +116,7 @@ export async function optionalAuth(
 			tui.showSignupBenefits();
 
 			if (!config) {
-				ctx.config = { name: 'production' };
+				ctx.config = { name: defaultProfileName };
 			} else {
 				ctx.config = config;
 			}
@@ -141,7 +154,17 @@ export async function optionalAuth(
 
 			// Import and run login flow
 			const { loginCommand } = await import('./cmd/auth/login');
-			await loginCommand.handler(ctx);
+
+			// Ensure apiClient is available for login handler
+			const loginCtx1 = ctx as unknown as Record<string, unknown>;
+			if (!loginCtx1.apiClient) {
+				const apiUrl = getAPIBaseURL(ctx.config ?? null);
+				loginCtx1.apiClient = new APIClient(apiUrl, ctx.logger, ctx.config ?? null);
+			}
+
+			if (loginCommand.handler) {
+				await loginCommand.handler(loginCtx1 as CommandContext);
+			}
 			return getAuth();
 		}
 
@@ -173,10 +196,96 @@ export async function optionalAuth(
 
 			// Import and run login flow
 			const { loginCommand } = await import('./cmd/auth/login');
-			await loginCommand.handler(ctx);
+
+			// Ensure apiClient is available for login handler
+			const loginCtx2 = ctx as unknown as Record<string, unknown>;
+			if (!loginCtx2.apiClient) {
+				const apiUrl = getAPIBaseURL(ctx.config ?? null);
+				loginCtx2.apiClient = new APIClient(apiUrl, ctx.logger, ctx.config ?? null);
+			}
+
+			if (loginCommand.handler) {
+				await loginCommand.handler(loginCtx2 as CommandContext);
+			}
 			return getAuth();
 		}
 	}
 
 	return null;
 }
+
+export async function requireOrg(
+	ctx: CommandContext & { apiClient: APIClientType }
+): Promise<string> {
+	const { options, config, apiClient } = ctx;
+
+	// Check if org is provided via --org-id flag
+	if (options.orgId) {
+		return options.orgId;
+	}
+
+	// Check if org is saved in config preferences
+	if (config?.preferences?.orgId) {
+		return config.preferences.orgId;
+	}
+
+	// Fetch organizations
+	const orgs = await tui.spinner('Fetching organizations', async () => {
+		return listOrganizations(apiClient);
+	});
+
+	if (orgs.length === 0) {
+		tui.fatal('No organizations found for your account');
+	}
+
+	// Use selectOrganization which handles single org and prompting
+	// Pass the saved preference as initial selection
+	const orgId = await tui.selectOrganization(orgs, config?.preferences?.orgId);
+
+	// Save selected org to config if different
+	if (orgId !== config?.preferences?.orgId) {
+		await saveOrgId(orgId);
+	}
+
+	return orgId;
+}
+
+export async function optionalOrg(
+	ctx: CommandContext & { apiClient?: APIClientType; auth?: AuthData }
+): Promise<string | undefined> {
+	const { options, config, apiClient, auth } = ctx;
+
+	// If not authenticated or no API client, skip org selection
+	if (!auth || !apiClient) {
+		return undefined;
+	}
+
+	// Check if org is provided via --org-id flag
+	if (options.orgId) {
+		return options.orgId;
+	}
+
+	// Check if org is saved in config preferences
+	if (config?.preferences?.orgId) {
+		return config.preferences.orgId;
+	}
+
+	// Fetch organizations
+	const orgs = await tui.spinner('Fetching organizations', async () => {
+		return listOrganizations(apiClient);
+	});
+
+	if (orgs.length === 0) {
+		return undefined;
+	}
+
+	// Use selectOrganization which handles single org and prompting
+	const orgId = await tui.selectOrganization(orgs, config?.preferences?.orgId);
+
+	// Save selected org to config if different
+	if (orgId !== config?.preferences?.orgId) {
+		await saveOrgId(orgId);
+	}
+
+	return orgId;
+}

package/src/banner.ts

@@ -1,13 +1,20 @@
 import { getVersion } from './version';
-
-function shouldUseColors(): boolean {
-	return !process.env.NO_COLOR && process.env.TERM !== 'dumb' && !!process.stdout.isTTY;
-}
+import { shouldUseColors, isDarkMode } from './tui';
 
 export function showBanner(version?: string): void {
 	const _version = version ?? getVersion();
 	const USE_COLORS = shouldUseColors();
-	const CYAN = USE_COLORS ? Bun.color('cyan', 'ansi-16m') : '';
+	const dark = isDarkMode();
+	const CYAN = USE_COLORS
+		? dark
+			? Bun.color('cyan', 'ansi-16m')
+			: Bun.color('#008B8B', 'ansi-16m')
+		: '';
+	const WHITE = USE_COLORS
+		? dark
+			? Bun.color('white', 'ansi-16m')
+			: Bun.color('black', 'ansi-16m')
+		: '';
 	const RESET = USE_COLORS ? '\x1b[0m' : '';
 
 	const width = 52; // Content width between pipes
@@ -16,7 +23,7 @@ export function showBanner(version?: string): void {
 
 	const lines = [
 		'╭────────────────────────────────────────────────────╮',
-		'│ ⨺ Agentuity     Build, manage and deploy AI agents │',
+		`│ ⨺ Agentuity     ${WHITE}Build, manage and deploy AI agents${CYAN} │`,
 		'│                                                    │',
 		`│${versionLabel}${_version.padEnd(versionPadding)} │`,
 		'│ Docs:           https://agentuity.dev              │',