@agentuity/cli 0.0.95 → 0.0.96

package/src/cli.ts

@@ -20,7 +20,7 @@ import enquirer from 'enquirer';
 import * as tui from './tui';
 import { parseArgsSchema, parseOptionsSchema, buildValidationInput } from './schema-parser';
 import { defaultProfileName, loadProjectConfig } from './config';
-import { APIClient, getAPIBaseURL, type APIClient as APIClientType } from './api';
+import { APIClient, getAPIBaseURL, getAppBaseURL, type APIClient as APIClientType } from './api';
 import { ErrorCode, ExitCode, createError, exitWithError } from './errors';
 import { getCommand } from './command-prefix';
 import { isValidateMode, outputValidation, type ValidationResult } from './output';
@@ -55,6 +55,38 @@ function createAPIClient(baseCtx: CommandContext, config: Config | null): APICli
 	}
 }
 
+type WebUrlSpec = string | ((ctx: CommandContext) => string | undefined | null);
+
+function resolveWebUrl(ctx: CommandContext, spec?: WebUrlSpec): string | undefined {
+	if (!spec) return undefined;
+
+	const raw = typeof spec === 'function' ? spec(ctx) : spec;
+	if (!raw) return undefined;
+
+	if (raw.startsWith('http://') || raw.startsWith('https://')) {
+		return raw;
+	}
+
+	const appBase = getAppBaseURL(ctx.config ?? null).replace(/\/$/, '');
+	const path = raw.startsWith('/') ? raw : `/${raw}`;
+	return `${appBase}${path}`;
+}
+
+function maybeRenderWebLink(ctx: CommandContext, spec?: WebUrlSpec): void {
+	if (ctx.options.json) return;
+	if (isValidateMode(ctx.options)) return;
+
+	const url = resolveWebUrl(ctx, spec);
+	if (!url) return;
+
+	if (tui.supportsHyperlinks()) {
+		tui.output(tui.muted(`→ ${tui.link(url, 'View on the web', '')}`));
+	} else {
+		tui.output(tui.muted(`→ View on the web: ${url}`));
+	}
+	tui.newline();
+}
+
 /**
  * Execute handler or output validation result based on mode
  */
@@ -62,7 +94,8 @@ async function executeOrValidate(
 	ctx: CommandContext,
 	commandName: string,
 	handler?: (ctx: CommandContext) => unknown | Promise<unknown>,
-	hasResponseSchema?: boolean
+	hasResponseSchema?: boolean,
+	webUrl?: WebUrlSpec
 ): Promise<void> {
 	if (isValidateMode(ctx.options)) {
 		// In validate mode, just output success (validation already passed via Zod)
@@ -72,6 +105,9 @@ async function executeOrValidate(
 		};
 		outputValidation(result, ctx.options);
 	} else if (handler) {
+		// Render "View on the web" link before normal execution
+		maybeRenderWebLink(ctx, webUrl);
+
 		// Normal execution
 		const result = await handler(ctx);
 
@@ -225,6 +261,82 @@ function handleProjectConfigError(
 	throw error;
 }
 
+/**
+ * Prompt user to select a project from their available projects
+ */
+async function promptProjectSelection(baseCtx: CommandContext): Promise<ProjectConfig | null> {
+	const { config } = baseCtx;
+
+	// Need auth and API client to fetch projects
+	const auth = await requireAuth(baseCtx);
+	if (!auth) {
+		return null;
+	}
+
+	const apiClient = createAPIClient(baseCtx, config);
+
+	// Fetch available projects
+	const { projectList } = await import('@agentuity/server');
+	const projects = await projectList(apiClient);
+
+	if (!projects || projects.length === 0) {
+		tui.warning('No projects found. Please create a project first.');
+		return null;
+	}
+
+	// Sort projects: prioritize those matching orgId in preferences
+	const preferredOrgId = config?.preferences?.orgId;
+	const sortedProjects = [...projects].sort((a, b) => {
+		// Prioritize preferred org
+		if (preferredOrgId) {
+			if (a.orgId === preferredOrgId && b.orgId !== preferredOrgId) return -1;
+			if (b.orgId === preferredOrgId && a.orgId !== preferredOrgId) return 1;
+		}
+		// Otherwise sort by name
+		return a.name.localeCompare(b.name);
+	});
+
+	// Build select options with aligned formatting
+	const { createPrompt } = tui;
+	const prompt = createPrompt();
+
+	// Calculate max name length for padding (with reasonable max)
+	const maxNameLength = Math.min(40, Math.max(...sortedProjects.map((p) => p.name.length)));
+
+	const selectedProjectId = await prompt.select<string>({
+		message: 'Select a project',
+		options: sortedProjects.map((p) => {
+			// Truncate and pad name for alignment
+			const displayName =
+				p.name.length > maxNameLength
+					? p.name.substring(0, maxNameLength - 1) + '…'
+					: p.name.padEnd(maxNameLength);
+
+			return {
+				value: p.id,
+				label: `${displayName}  ${tui.muted(p.id)}`,
+			};
+		}),
+	});
+
+	// Cleanup stdin after prompt to prevent hanging
+	if (process.stdin.isTTY) {
+		process.stdin.pause();
+	}
+
+	const selectedProject = sortedProjects.find((p) => p.id === selectedProjectId);
+	if (!selectedProject) {
+		return null;
+	}
+
+	// Convert to ProjectConfig format
+	return {
+		projectId: selectedProject.id,
+		orgId: selectedProject.orgId,
+		region: selectedProject.cloudRegion || '',
+	};
+}
+
 export async function createCLI(version: string): Promise<Command> {
 	const program = new Command();
 
@@ -370,11 +482,13 @@ export async function createCLI(version: string): Promise<Command> {
 			// Format each section (show banner for root command)
 			let output = '';
 
-			// Show banner if this is the root command (no parent)
+			// Show banner (full for root, compact for subcommands)
 			// eslint-disable-next-line @typescript-eslint/no-explicit-any
 			const isRootCommand = !(cmd as any).parent;
 			if (isRootCommand) {
 				output += `${generateBanner(version)}\n\n`;
+			} else {
+				output += `${generateBanner(version, true)}\n`;
 			}
 
 			// Description
@@ -610,6 +724,7 @@ async function registerSubcommand(
 				cmd.help();
 			});
 
+		// Don't add options to parent commands - only to leaf commands
 		return;
 	}
 
@@ -647,6 +762,9 @@ async function registerSubcommand(
 		}
 	}
 
+	// Track if projectId is defined in schema options
+	let hasProjectIdInSchema = false;
+
 	if (subcommand.schema?.options) {
 		const parsed = parseOptionsSchema(subcommand.schema.options);
 		for (const opt of parsed) {
@@ -654,6 +772,12 @@ async function registerSubcommand(
 				.replace(/([a-z0-9])([A-Z])/g, '$1-$2')
 				.replace(/([A-Z]+)([A-Z][a-z])/g, '$1-$2')
 				.toLowerCase();
+
+			// Track if this schema defines projectId (as 'projectId' or 'project-id')
+			if (opt.name === 'projectId' || opt.name === 'project-id' || flag === 'project-id') {
+				hasProjectIdInSchema = true;
+			}
+
 			const desc = opt.description || '';
 			// Add short flag alias for verbose
 			const flagSpec = flag === 'verbose' ? `-v, --${flag}` : `--${flag}`;
@@ -710,6 +834,11 @@ async function registerSubcommand(
 		}
 	}
 
+	// Add --project-id if command requires/optional project and doesn't define it in schema
+	if ((requiresProject || optionalProject) && !hasProjectIdInSchema) {
+		cmd.option('--project-id <id>', 'project ID (alternative to --dir)');
+	}
+
 	cmd.action(async (...rawArgs: unknown[]) => {
 		const cmdObj = rawArgs[rawArgs.length - 1] as { opts: () => Record<string, unknown> };
 		const options = cmdObj.opts();
@@ -726,35 +855,99 @@ async function registerSubcommand(
 		const dirNeeded = normalized.requiresProject || normalized.optionalProject;
 
 		if (dirNeeded) {
-			const dir = (options.dir as string | undefined) ?? process.cwd();
-			projectDir = dir;
-			if (projectDir.startsWith('~/')) {
-				projectDir = projectDir.replace('~/', homedir());
-			}
-			projectDir = resolve(projectDir);
-			try {
-				project = await loadProjectConfig(dir, baseCtx.config);
-			} catch (error) {
-				if (normalized.requiresProject) {
-					if (
-						error &&
-						typeof error === 'object' &&
-						'name' in error &&
-						error.name === 'ProjectConfigNotFoundExpection'
-					) {
+			const projectId = options.projectId as string | undefined;
+
+			// If --project-id is provided, fetch project details from API
+			if (projectId) {
+				try {
+					const auth = await requireAuth(baseCtx);
+					if (auth) {
+						const apiClient = createAPIClient(baseCtx, baseCtx.config);
+						const { projectGet } = await import('@agentuity/server');
+						const projectDetails = await projectGet(apiClient, { id: projectId, mask: true });
+						project = {
+							projectId: projectDetails.id,
+							orgId: projectDetails.orgId,
+							region: projectDetails.cloudRegion || '',
+						};
+					}
+				} catch (_error) {
+					if (normalized.requiresProject) {
 						exitWithError(
-							createError(ErrorCode.PROJECT_NOT_FOUND, 'Invalid project folder', undefined, [
-								'Use --dir to specify a different directory',
-								'Change to a directory containing agentuity.json',
-								`Run "${getCommand('project create')}" to create a new project`,
-							]),
+							createError(
+								ErrorCode.PROJECT_NOT_FOUND,
+								`Project not found: ${projectId}`,
+								undefined,
+								[
+									'Verify the project ID is correct',
+									`Run "${getCommand('project list')}" to see available projects`,
+								]
+							),
 							baseCtx.logger,
 							baseCtx.options.errorFormat
 						);
 					}
-					throw error;
 				}
-				// For optional projects, silently continue without project config
+			} else {
+				// Try to load from directory
+				const dir = (options.dir as string | undefined) ?? process.cwd();
+				projectDir = dir;
+				if (projectDir.startsWith('~/')) {
+					projectDir = projectDir.replace('~/', homedir());
+				}
+				projectDir = resolve(projectDir);
+				try {
+					project = await loadProjectConfig(dir, baseCtx.config);
+				} catch (error) {
+					if (normalized.requiresProject) {
+						if (
+							error &&
+							typeof error === 'object' &&
+							'name' in error &&
+							error.name === 'ProjectConfigNotFoundExpection'
+						) {
+							// If TTY is available, prompt user to select a project
+							const hasTTY = process.stdin.isTTY && process.stdout.isTTY;
+
+							if (hasTTY) {
+								// Try to prompt for project selection
+								try {
+									const selectedProject = await promptProjectSelection(baseCtx);
+									if (selectedProject) {
+										// Set the project ID in options so it can be used by the command
+										(options as Record<string, unknown>).projectId =
+											selectedProject.projectId;
+										project = selectedProject;
+									}
+								} catch (promptError) {
+									// If prompting fails, fall through to the original error
+									baseCtx.logger.trace('Project selection prompt failed: %s', promptError);
+								}
+							}
+
+							if (!project) {
+								exitWithError(
+									createError(
+										ErrorCode.PROJECT_NOT_FOUND,
+										'Invalid project folder',
+										undefined,
+										[
+											'Use --dir to specify a different directory',
+											'Use --project-id to specify a project by ID',
+											'Change to a directory containing agentuity.json',
+											`Run "${getCommand('project create')}" to create a new project`,
+										]
+									),
+									baseCtx.logger,
+									baseCtx.options.errorFormat
+								);
+							}
+						} else {
+							throw error;
+						}
+					}
+					// For optional projects, silently continue without project config
+				}
 			}
 		}
 
@@ -833,7 +1026,8 @@ async function registerSubcommand(
 						ctx as CommandContext,
 						`${parent.name()} ${subcommand.name}`,
 						subcommand.handler,
-						!!subcommand.schema?.response
+						!!subcommand.schema?.response,
+						subcommand.webUrl
 					);
 				} catch (error) {
 					if (error && typeof error === 'object' && 'issues' in error) {
@@ -896,6 +1090,7 @@ async function registerSubcommand(
 					}
 				}
 				if (subcommand.handler) {
+					maybeRenderWebLink(ctx as CommandContext, subcommand.webUrl);
 					const result = await subcommand.handler(ctx as CommandContext);
 
 					// If --json flag is set
@@ -1010,7 +1205,8 @@ async function registerSubcommand(
 						ctx as CommandContext,
 						`${parent.name()} ${subcommand.name}`,
 						subcommand.handler,
-						!!subcommand.schema?.response
+						!!subcommand.schema?.response,
+						subcommand.webUrl
 					);
 				} catch (error) {
 					if (error && typeof error === 'object' && 'issues' in error) {
@@ -1069,6 +1265,7 @@ async function registerSubcommand(
 					}
 				}
 				if (subcommand.handler) {
+					maybeRenderWebLink(ctx as CommandContext, subcommand.webUrl);
 					const result = await subcommand.handler(ctx as CommandContext);
 
 					// If --json flag is set
@@ -1133,7 +1330,8 @@ async function registerSubcommand(
 						ctx as CommandContext,
 						`${parent.name()} ${subcommand.name}`,
 						subcommand.handler,
-						!!subcommand.schema?.response
+						!!subcommand.schema?.response,
+						subcommand.webUrl
 					);
 				} catch (error) {
 					if (error && typeof error === 'object' && 'issues' in error) {
@@ -1179,6 +1377,7 @@ async function registerSubcommand(
 					}
 				}
 				if (subcommand.handler) {
+					maybeRenderWebLink(ctx as CommandContext, subcommand.webUrl);
 					const result = await subcommand.handler(ctx as CommandContext);
 
 					// If --json flag is set