@agentuity/cli 0.0.106 → 0.0.108

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

@@ -6,6 +6,7 @@
  */
 
 import { join } from 'node:path';
+import { createRequire } from 'node:module';
 import type { InlineConfig } from 'vite';
 import type { Logger } from '../../../types';
 
@@ -116,14 +117,22 @@ export async function generateAssetServerConfig(
 		},
 
 		// Plugins: User plugins first (e.g., Tailwind), then React and browser env
-		plugins: [
-			// User-defined plugins from agentuity.config.ts (e.g., Tailwind CSS)
-			...userPlugins,
-			// React plugin for JSX/TSX transformation and Fast Refresh
-			(await import('@vitejs/plugin-react')).default(),
-			// Browser env plugin to map process.env to import.meta.env
-			(await import('./browser-env-plugin')).browserEnvPlugin(),
-		],
+		// Resolve @vitejs/plugin-react from the project's node_modules
+		plugins: await (async () => {
+			const projectRequire = createRequire(join(rootDir, 'package.json'));
+			const reactPlugin = (
+				await import(projectRequire.resolve('@vitejs/plugin-react'))
+			).default();
+			const { browserEnvPlugin } = await import('./browser-env-plugin');
+			return [
+				// User-defined plugins from agentuity.config.ts (e.g., Tailwind CSS)
+				...userPlugins,
+				// React plugin for JSX/TSX transformation and Fast Refresh
+				reactPlugin,
+				// Browser env plugin to map process.env to import.meta.env
+				browserEnvPlugin(),
+			];
+		})(),
 
 		// Suppress build-related options (this is dev-only)
 		build: {

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

@@ -5,6 +5,8 @@
  * Does NOT handle API routes or WebSocket - the Bun server proxies to this.
  */
 
+import { join } from 'node:path';
+import { createRequire } from 'node:module';
 import type { ViteDevServer } from 'vite';
 import type { Logger } from '../../../types';
 import { generateAssetServerConfig } from './vite-asset-server-config';
@@ -43,8 +45,10 @@ export async function startViteAssetServer(
 		port: preferredPort,
 	});
 
-	// Dynamically import vite
-	const { createServer } = await import('vite');
+	// Dynamically import vite from the project's node_modules
+	// This ensures we resolve from the target project directory, not the CWD
+	const projectRequire = createRequire(join(rootDir, 'package.json'));
+	const { createServer } = await import(projectRequire.resolve('vite'));
 
 	// Create Vite server with config
 	const server = await createServer(config);

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

@@ -6,8 +6,9 @@
 
 import { join } from 'node:path';
 import { existsSync, renameSync, rmSync } from 'node:fs';
+import { createRequire } from 'node:module';
 import type { InlineConfig, Plugin } from 'vite';
-import type { Logger } from '../../../types';
+import type { Logger, DeployOptions } from '../../../types';
 import { browserEnvPlugin } from './browser-env-plugin';
 
 /**
@@ -54,6 +55,7 @@ export interface ViteBuildOptions {
 	workbenchRoute?: string;
 	workbenchEnabled?: boolean;
 	logger: Logger;
+	deploymentOptions?: DeployOptions;
 }
 
 /**
@@ -105,8 +107,18 @@ export async function runViteBuild(options: ViteBuildOptions): Promise<void> {
 	}
 
 	// Dynamically import vite and react plugin
-	const { build: viteBuild } = await import('vite');
-	const reactModule = await import('@vitejs/plugin-react');
+	// 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;
 
 	// For client/workbench, use inline config (no agentuity plugin needed)
@@ -341,6 +353,7 @@ export async function runAllBuilds(options: Omit<ViteBuildOptions, 'mode'>): Pro
 		routes,
 		logger,
 		dev,
+		deploymentOptions: options.deploymentOptions,
 	});
 
 	writeMetadataFile(rootDir, metadata, dev, logger);

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

@@ -7,7 +7,7 @@
 import { join } from 'node:path';
 import { stat } from 'node:fs/promises';
 import { StructuredError } from '@agentuity/core';
-import type { Logger } from '../../types';
+import type { Logger, DeployOptions } from '../../types';
 import { runAllBuilds } from './vite/vite-builder';
 import { checkAndUpgradeDependencies } from '../../utils/dependency-checker';
 import { checkBunVersion } from '../../utils/bun-version-checker';
@@ -25,6 +25,7 @@ export interface ViteBundleOptions {
 	deploymentId?: string;
 	port?: number;
 	logger: Logger;
+	deploymentOptions?: DeployOptions;
 }
 
 /**
@@ -39,6 +40,7 @@ export async function viteBundle(options: ViteBundleOptions): Promise<{ output:
 		deploymentId = '',
 		port = 3500,
 		logger,
+		deploymentOptions,
 	} = options;
 
 	const output: string[] = [];
@@ -87,6 +89,7 @@ export async function viteBundle(options: ViteBundleOptions): Promise<{ output:
 			region,
 			deploymentId,
 			logger,
+			deploymentOptions,
 		});
 
 		if (result.client.included) {

package/src/cmd/cloud/deploy.ts

@@ -5,7 +5,7 @@ import { createReadStream, createWriteStream, existsSync, mkdirSync, writeFileSy
 import { tmpdir } from 'node:os';
 import { StructuredError } from '@agentuity/core';
 import { isRunningFromExecutable } from '../upgrade';
-import { createSubcommand } from '../../types';
+import { createSubcommand, DeployOptionsSchema } from '../../types';
 import { getUserAgent } from '../../api';
 import * as tui from '../../tui';
 import { saveProjectDir, getDefaultConfigDir, loadProjectSDKKey } from '../../config';
@@ -43,8 +43,8 @@ import { zipDir } from '../../utils/zip';
 import { encryptFIPSKEMDEMStream } from '../../crypto/box';
 import { getCommand } from '../../command-prefix';
 import * as domain from '../../domain';
-import { DeployOptionsSchema } from '../../schemas/deploy';
 import { ErrorCode } from '../../errors';
+import { typecheck } from '../build/typecheck';
 
 const DeploymentCancelledError = StructuredError(
 	'DeploymentCancelled',
@@ -84,22 +84,23 @@ export const deploySubcommand = createSubcommand({
 			command: getCommand('cloud deploy --log-level=debug'),
 			description: 'Deploy with verbose output',
 		},
-		{
-			command: getCommand('cloud deploy --tag a --tag b'),
-			description: 'Deploy with specific tags',
-		},
 	],
 	toplevel: true,
 	idempotent: false,
 	requires: { auth: true, project: true, apiClient: true },
 	prerequisites: ['auth login'],
 	schema: {
-		options: DeployOptionsSchema,
+		options: z.intersection(
+			DeployOptionsSchema,
+			z.object({
+				saveTypeErrors: z.string().optional().describe('file path to save typecheck errors'),
+			})
+		),
 		response: DeployResponseSchema,
 	},
 
 	async handler(ctx) {
-		const { project, apiClient, projectDir, config, options, logger } = ctx;
+		const { project, apiClient, projectDir, config, options, logger, opts } = ctx;
 
 		let deployment: Deployment | undefined;
 		let build: BuildMetadata | undefined;
@@ -108,7 +109,17 @@ export const deploySubcommand = createSubcommand({
 		let statusResult: DeploymentStatusResult | undefined;
 		const logs: string[] = [];
 
-		// Check for pre-created deployment from CI/Nova
+		const sdkKey = await loadProjectSDKKey(ctx.logger, ctx.projectDir);
+
+		// Ensure SDK key is present before proceeding
+		if (!sdkKey) {
+			ctx.logger.fatal(
+				'The AGENTUITY_SDK_KEY value not found in the .env file in this folder. Ensure you are inside a valid Agentuity project folder and run "%s" to pull your environment from the cloud.',
+				getCommand('cloud env pull')
+			);
+		}
+
+		// Check for pre-created deployment from CI build environment
 		const deploymentEnv = process.env.AGENTUITY_DEPLOYMENT;
 		let useExistingDeployment = false;
 		if (deploymentEnv) {
@@ -123,29 +134,18 @@ export const deploySubcommand = createSubcommand({
 				if (result.success) {
 					deployment = result.data;
 					useExistingDeployment = true;
-					logger.info(`Using existing deployment: ${result.data.id}`);
+					logger.debug('Using existing deployment: %s', result.data.id);
 				} else {
 					const errors = result.error.issues
 						.map((i) => `${i.path.join('.')}: ${i.message}`)
 						.join(', ');
-					logger.warn(`Invalid AGENTUITY_DEPLOYMENT schema: ${errors}`);
+					logger.fatal(`Invalid AGENTUITY_DEPLOYMENT schema: ${errors}`);
 				}
 			} catch (err) {
-				logger.warn(
-					`Failed to parse AGENTUITY_DEPLOYMENT: ${err instanceof Error ? err.message : String(err)}`
-				);
+				logger.fatal(`Failed to parse AGENTUITY_DEPLOYMENT: ${err}`);
 			}
 		}
 
-		const sdkKey = await loadProjectSDKKey(ctx.logger, ctx.projectDir);
-
-		// Ensure SDK key is present before proceeding
-		if (!sdkKey) {
-			ctx.logger.fatal(
-				'SDK key not found. Run "agentuity auth login" to authenticate or set AGENTUITY_SDK_KEY environment variable.'
-			);
-		}
-
 		try {
 			await saveProjectDir(projectDir);
 
@@ -176,6 +176,9 @@ export const deploySubcommand = createSubcommand({
 						label: 'Sync Env & Secrets',
 						run: async () => {
 							try {
+								if (useExistingDeployment) {
+									return stepSkipped('skipped in CI build');
+								}
 								// Read env file
 								const envFilePath = await findExistingEnvFile(projectDir);
 								const localEnv = await readEnvFile(envFilePath);
@@ -212,8 +215,8 @@ export const deploySubcommand = createSubcommand({
 					{
 						label: 'Create Deployment',
 						run: async () => {
-							if (useExistingDeployment && deployment) {
-								return stepSkipped('using existing deployment');
+							if (useExistingDeployment) {
+								return stepSkipped('skipped in CI build');
 							}
 							try {
 								deployment = await projectDeploymentCreate(
@@ -235,17 +238,34 @@ export const deploySubcommand = createSubcommand({
 								return stepError('deployment was null');
 							}
 							let capturedOutput: string[] = [];
+							const rootDir = resolve(projectDir);
+							const started = Date.now();
+							const typeResult = await typecheck(rootDir);
+							if (typeResult.success) {
+								capturedOutput.push(
+									tui.muted(
+										`✓ Typechecked in ${Math.floor(Date.now() - started).toFixed(0)}ms`
+									)
+								);
+							} else {
+								if ('errors' in typeResult && opts.saveTypeErrors) {
+									const f = Bun.file(opts.saveTypeErrors);
+									await f.write(JSON.stringify(typeResult.errors));
+								}
+								return stepError('Typecheck failed\n\n' + typeResult.output);
+							}
 							try {
 								const bundleResult = await viteBundle({
-									rootDir: resolve(projectDir),
+									rootDir,
 									dev: false,
 									deploymentId: deployment.id,
 									orgId: deployment.orgId,
 									projectId: project.projectId,
 									region: project.region,
 									logger: ctx.logger,
+									deploymentOptions: opts,
 								});
-								capturedOutput = bundleResult.output;
+								capturedOutput = [...capturedOutput, ...bundleResult.output];
 								build = await loadBuildMetadata(join(projectDir, '.agentuity'));
 								instructions = await projectDeploymentUpdate(
 									apiClient,
@@ -462,7 +482,7 @@ export const deploySubcommand = createSubcommand({
 						},
 					},
 				].filter(Boolean) as Step[],
-				useExistingDeployment ? 'debug' : options.logLevel
+				options.logLevel
 			);
 
 			if (!deployment) {
@@ -473,7 +493,14 @@ export const deploySubcommand = createSubcommand({
 				};
 			}
 
+			// TODO: send the deployment failure to the backend otherwise we staying in a deploying state
+
 			const streamId = complete?.streamId;
+			const appUrl = getAppBaseURL(
+				process.env.AGENTUITY_REGION ?? config?.name,
+				config?.overrides
+			);
+			const dashboard = `${appUrl}/r/${deployment.id}`;
 
 			// Poll for deployment status with optional log streaming
 			const pollInterval = 500;
@@ -662,15 +689,24 @@ export const deploySubcommand = createSubcommand({
 
 					tui.success('Your project was deployed!');
 				}
+			} catch (ex) {
+				const lines = [`${ex}`, ''];
+				lines.push(
+					`${tui.ICONS.arrow} ${
+						tui.bold(tui.padRight('Dashboard:', 12)) + tui.link(dashboard)
+					}`
+				);
+				tui.banner(tui.colorError(`Deployment: ${deployment.id} Failed`), lines.join('\n'), {
+					centerTitle: false,
+					topSpacer: false,
+					bottomSpacer: false,
+				});
+				tui.fatal('Deployment failed', ErrorCode.BUILD_FAILED);
 			} finally {
 				// Clean up signal handler
 				process.off('SIGINT', sigintHandler);
 			}
 
-			const appUrl = getAppBaseURL(config?.name, config?.overrides);
-
-			const dashboard = `${appUrl}/r/${deployment.id}`;
-
 			// Show deployment URLs
 			if (complete?.publicUrls) {
 				const lines: string[] = [];