@agentuity/cli 0.0.71 → 0.0.72

package/src/cmd/cloud/deploy.ts

@@ -1,23 +1,25 @@
 import { z } from 'zod';
 import { join, resolve } from 'node:path';
 import { createPublicKey } from 'node:crypto';
-import { createReadStream, createWriteStream } from 'node:fs';
+import { createReadStream, createWriteStream, existsSync, mkdirSync, writeFileSync } from 'node:fs';
 import { tmpdir } from 'node:os';
 import { createSubcommand } from '../../types';
 import * as tui from '../../tui';
-import { saveProjectDir } from '../../config';
+import { saveProjectDir, getDefaultConfigDir } from '../../config';
 import { runSteps, stepSuccess, stepSkipped, stepError, Step, ProgressCallback } from '../../steps';
 import { bundle } from '../build/bundler';
-import { loadBuildMetadata } from '../../config';
+import { loadBuildMetadata, getStreamURL } from '../../config';
 import {
 	projectEnvUpdate,
 	projectDeploymentCreate,
 	projectDeploymentUpdate,
 	projectDeploymentComplete,
+	projectDeploymentStatus,
 	type Deployment,
 	type BuildMetadata,
 	type DeploymentInstructions,
 	type DeploymentComplete,
+	type DeploymentStatusResult,
 } from '@agentuity/server';
 import {
 	findEnvFile,
@@ -30,11 +32,13 @@ import { encryptFIPSKEMDEMStream } from '../../crypto/box';
 import { getCommand } from '../../command-prefix';
 import { checkCustomDomainForDNS } from './domain';
 import { DeployOptionsSchema } from '../../schemas/deploy';
+import { ErrorCode } from '../../errors';
 
 const DeployResponseSchema = z.object({
 	success: z.boolean().describe('Whether deployment succeeded'),
 	deploymentId: z.string().describe('Deployment ID'),
 	projectId: z.string().describe('Project ID'),
+	logs: z.array(z.string()).optional().describe('The deployment startup logs'),
 	urls: z
 		.object({
 			deployment: z.string().describe('Deployment-specific URL'),
@@ -77,12 +81,14 @@ export const deploySubcommand = createSubcommand({
 	},
 
 	async handler(ctx) {
-		const { project, apiClient, projectDir, config, options, opts } = ctx;
+		const { project, apiClient, projectDir, config, options, opts, logger } = ctx;
 
 		let deployment: Deployment | undefined;
 		let build: BuildMetadata | undefined;
 		let instructions: DeploymentInstructions | undefined;
 		let complete: DeploymentComplete | undefined;
+		let statusResult: DeploymentStatusResult | undefined;
+		const logs: string[] = [];
 
 		try {
 			await saveProjectDir(projectDir);
@@ -237,7 +243,6 @@ export const deploySubcommand = createSubcommand({
 									if (relative.startsWith('.env')) return false;
 									if (relative.startsWith('.git/')) return false;
 									if (relative.startsWith('.ssh/')) return false;
-									if (relative.startsWith('node_modules/')) return false;
 									if (relative === '.DS_Store') return false;
 									return true;
 								},
@@ -367,9 +372,174 @@ export const deploySubcommand = createSubcommand({
 				].filter(Boolean) as Step[],
 				options.logLevel
 			);
-			tui.success('Your project was deployed!');
 
-			if (complete?.publicUrls && deployment) {
+			if (!deployment) {
+				return {
+					success: false,
+					deploymentId: '',
+					projectId: project.projectId,
+				};
+			}
+
+			const streamId = complete?.streamId;
+
+			// Poll for deployment status with optional log streaming
+			const pollInterval = 500;
+			const maxAttempts = 600;
+			let attempts = 0;
+
+			if (streamId) {
+				// Use progress logger to stream logs while polling
+				const streamsUrl = getStreamURL(project.region, config);
+
+				await tui
+					.progress({
+						message: 'Deploying project...',
+						type: 'logger',
+						maxLines: 2,
+						clearOnSuccess: true,
+						callback: async (log) => {
+							// Start log streaming
+							const logStreamController = new AbortController();
+							const logStreamPromise = (async () => {
+								try {
+									logger.debug('fetching stream: %s/%s', streamsUrl, streamId);
+									const resp = await fetch(`${streamsUrl}/${streamId}`, {
+										signal: logStreamController.signal,
+									});
+									if (!resp.ok || !resp.body) {
+										ctx.logger.trace(
+											`Failed to connect to warmup log stream: ${resp.status}`
+										);
+										return;
+									}
+									const reader = resp.body.getReader();
+									const decoder = new TextDecoder();
+									let buffer = '';
+									while (true) {
+										const { done, value } = await reader.read();
+										if (done) break;
+										buffer += decoder.decode(value, { stream: true });
+										const lines = buffer.split('\n');
+										buffer = lines.pop() || ''; // Keep incomplete line in buffer
+										for (const line of lines) {
+											// Strip ISO 8601 timestamp prefix if present
+											const message = line.replace(
+												/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d+Z\s?/,
+												''
+											);
+											if (message) {
+												logs.push(message);
+												log(message);
+											}
+										}
+									}
+								} catch (err) {
+									if (err instanceof Error && err.name === 'AbortError') {
+										return;
+									}
+									ctx.logger.trace(`Warmup log stream error: ${err}`);
+								}
+							})();
+
+							// Poll for deployment status
+							while (attempts < maxAttempts) {
+								attempts++;
+								try {
+									statusResult = await projectDeploymentStatus(
+										apiClient,
+										deployment?.id ?? ''
+									);
+
+									logger.trace('status result: %s', statusResult);
+
+									if (statusResult.state === 'completed') {
+										logStreamController.abort();
+										break;
+									}
+
+									if (statusResult.state === 'failed') {
+										throw new Error('Deployment failed');
+									}
+
+									await Bun.sleep(pollInterval);
+								} catch (err) {
+									logStreamController.abort();
+									throw err;
+								}
+							}
+
+							// Wait for log stream to finish
+							await logStreamPromise;
+
+							if (attempts >= maxAttempts) {
+								throw new Error('Deployment timed out');
+							}
+						},
+					})
+					.then(() => {
+						tui.success('Your project was deployed!');
+					})
+					.catch((ex) => {
+						const exwithmessage = ex as { message: string };
+						const msg =
+							exwithmessage.message === 'Deployment failed' ? '' : exwithmessage.toString();
+						tui.error(`Your deployment failed to start${msg ? `: ${msg}` : ''}`);
+						if (logs.length) {
+							const logsDir = join(getDefaultConfigDir(), 'logs');
+							if (!existsSync(logsDir)) {
+								mkdirSync(logsDir, { recursive: true });
+							}
+							const errorFile = join(logsDir, `${deployment?.id ?? Date.now()}.txt`);
+							writeFileSync(errorFile, logs.join('\n'));
+							const count = Math.min(logs.length, 10);
+							const last = logs.length - count;
+							tui.newline();
+							tui.warning(`The last ${count} lines of the log:`);
+							let offset = last + 1; // we want to show the offset from inside the log starting at 1
+							const max = String(logs.length).length;
+							for (const _log of logs.slice(last)) {
+								console.log(tui.muted(`${offset.toFixed().padEnd(max)} | ${_log}`));
+								offset++;
+							}
+							tui.newline();
+							tui.fatal(`The logs were written to ${errorFile}`, ErrorCode.BUILD_FAILED);
+						}
+						tui.fatal('Deployment failed', ErrorCode.BUILD_FAILED);
+					});
+			} else {
+				// No stream ID - poll without log streaming
+				await tui.spinner({
+					message: 'Deploying project...',
+					type: 'simple',
+					clearOnSuccess: true,
+					callback: async () => {
+						while (attempts < maxAttempts) {
+							attempts++;
+							statusResult = await projectDeploymentStatus(apiClient, deployment?.id ?? '');
+
+							if (statusResult.state === 'completed') {
+								break;
+							}
+
+							if (statusResult.state === 'failed') {
+								throw new Error('Deployment failed');
+							}
+
+							await Bun.sleep(pollInterval);
+						}
+
+						if (attempts >= maxAttempts) {
+							throw new Error('Deployment timed out');
+						}
+					},
+				});
+
+				tui.success('Your project was deployed!');
+			}
+
+			// Show deployment URLs
+			if (complete?.publicUrls) {
 				tui.arrow(tui.bold(tui.padRight('Deployment ID:', 17)) + tui.link(deployment.id));
 				if (complete.publicUrls.custom?.length) {
 					for (const url of complete.publicUrls.custom) {
@@ -386,25 +556,18 @@ export const deploySubcommand = createSubcommand({
 				}
 			}
 
-			// Return deployment result (if available)
-			if (deployment && complete?.publicUrls) {
-				return {
-					success: true,
-					deploymentId: deployment.id,
-					projectId: project.projectId,
-					urls: {
-						deployment: complete.publicUrls.deployment,
-						latest: complete.publicUrls.latest,
-						custom: complete.publicUrls.custom,
-					},
-				};
-			}
-
-			// Fallback response
 			return {
-				success: false,
-				deploymentId: '',
+				success: true,
+				deploymentId: deployment.id,
 				projectId: project.projectId,
+				logs,
+				urls: complete?.publicUrls
+					? {
+							deployment: complete.publicUrls.deployment,
+							latest: complete.publicUrls.latest,
+							custom: complete.publicUrls.custom,
+						}
+					: undefined,
 			};
 		} catch (ex) {
 			tui.fatal(`unexpected error trying to deploy project. ${ex}`);

package/src/cmd/cloud/session/get.ts

@@ -125,8 +125,8 @@ export const getSubcommand = createSubcommand({
 		response: SessionGetResponseSchema,
 	},
 	async handler(ctx) {
-		const { config, logger, auth, args, options, region } = ctx;
-		const catalystClient = getCatalystAPIClient(config, logger, auth, region);
+		const { logger, auth, args, options, region } = ctx;
+		const catalystClient = getCatalystAPIClient(logger, auth, region);
 
 		try {
 			const enriched = await sessionGet(catalystClient, { id: args.session_id });

package/src/cmd/cloud/session/list.ts

@@ -89,8 +89,8 @@ export const listSubcommand = createSubcommand({
 		response: SessionListResponseSchema,
 	},
 	async handler(ctx) {
-		const { config, logger, auth, project, opts, options, region } = ctx;
-		const catalystClient = getCatalystAPIClient(config, logger, auth, region);
+		const { logger, auth, project, opts, options, region } = ctx;
+		const catalystClient = getCatalystAPIClient(logger, auth, region);
 
 		const projectId = opts.projectId || project?.projectId;
 

package/src/cmd/cloud/storage/create.ts

@@ -35,7 +35,7 @@ export const createSubcommand = defineSubcommand({
 	},
 
 	async handler(ctx) {
-		const { logger, orgId, region, config, auth, options } = ctx;
+		const { logger, orgId, region, auth, options } = ctx;
 
 		// Handle dry-run mode
 		if (isDryRunMode(options)) {
@@ -51,7 +51,7 @@ export const createSubcommand = defineSubcommand({
 			};
 		}
 
-		const catalystClient = getCatalystAPIClient(config, logger, auth, region);
+		const catalystClient = getCatalystAPIClient(logger, auth, region);
 
 		const created = await tui.spinner({
 			message: `Creating storage in ${region}`,

package/src/cmd/cloud/storage/delete.ts

@@ -49,9 +49,9 @@ export const deleteSubcommand = createSubcommand({
 	},
 
 	async handler(ctx) {
-		const { logger, args, opts, config, orgId, region, auth, options } = ctx;
+		const { logger, args, opts, orgId, region, auth, options } = ctx;
 
-		const catalystClient = getCatalystAPIClient(config, logger, auth, region);
+		const catalystClient = getCatalystAPIClient(logger, auth, region);
 
 		const resources = await tui.spinner({
 			message: `Fetching storage for ${orgId} in ${region}`,

package/src/cmd/cloud/storage/download.ts

@@ -51,9 +51,9 @@ export const downloadSubcommand = createSubcommand({
 	},
 
 	async handler(ctx) {
-		const { logger, args, opts, options, orgId, region, config, auth } = ctx;
+		const { logger, args, opts, options, orgId, region, auth } = ctx;
 
-		const catalystClient = getCatalystAPIClient(config, logger, auth, region);
+		const catalystClient = getCatalystAPIClient(logger, auth, region);
 
 		// Fetch bucket credentials
 		const resources = await tui.spinner({

package/src/cmd/cloud/storage/get.ts

@@ -51,9 +51,9 @@ export const getSubcommand = createSubcommand({
 	},
 
 	async handler(ctx) {
-		const { logger, args, opts, options, orgId, region, config, auth } = ctx;
+		const { logger, args, opts, options, orgId, region, auth } = ctx;
 
-		const catalystClient = getCatalystAPIClient(config, logger, auth, region);
+		const catalystClient = getCatalystAPIClient(logger, auth, region);
 
 		const resources = await tui.spinner({
 			message: `Fetching storage bucket ${args.name}`,

package/src/cmd/cloud/storage/list.ts

@@ -74,9 +74,9 @@ export const listSubcommand = createSubcommand({
 	},
 
 	async handler(ctx) {
-		const { logger, args, opts, options, orgId, region, config, auth } = ctx;
+		const { logger, args, opts, options, orgId, region, auth } = ctx;
 
-		const catalystClient = getCatalystAPIClient(config, logger, auth, region);
+		const catalystClient = getCatalystAPIClient(logger, auth, region);
 
 		const resources = await tui.spinner({
 			message: `Fetching storage for ${orgId} in ${region}`,

package/src/cmd/cloud/storage/upload.ts

@@ -49,9 +49,9 @@ export const uploadSubcommand = createSubcommand({
 	},
 
 	async handler(ctx) {
-		const { logger, args, opts, options, orgId, region, config, auth } = ctx;
+		const { logger, args, opts, options, orgId, region, auth } = ctx;
 
-		const catalystClient = getCatalystAPIClient(config, logger, auth, region);
+		const catalystClient = getCatalystAPIClient(logger, auth, region);
 
 		// Fetch bucket credentials
 		const resources = await tui.spinner({

package/src/cmd/cloud/thread/delete.ts

@@ -24,8 +24,8 @@ export const deleteSubcommand = createSubcommand({
 		}),
 	},
 	async handler(ctx) {
-		const { config, logger, auth, args, region } = ctx;
-		const catalystClient = getCatalystAPIClient(config, logger, auth, region);
+		const { logger, auth, args, region } = ctx;
+		const catalystClient = getCatalystAPIClient(logger, auth, region);
 
 		try {
 			await threadDelete(catalystClient, { id: args.thread_id });

package/src/cmd/cloud/thread/get.ts

@@ -37,8 +37,8 @@ export const getSubcommand = createSubcommand({
 		response: ThreadGetResponseSchema,
 	},
 	async handler(ctx) {
-		const { config, logger, auth, args, options, region } = ctx;
-		const catalystClient = getCatalystAPIClient(config, logger, auth, region);
+		const { logger, auth, args, options, region } = ctx;
+		const catalystClient = getCatalystAPIClient(logger, auth, region);
 
 		try {
 			const thread = await threadGet(catalystClient, { id: args.thread_id });

package/src/cmd/cloud/thread/list.ts

@@ -62,8 +62,8 @@ export const listSubcommand = createSubcommand({
 		response: ThreadListResponseSchema,
 	},
 	async handler(ctx) {
-		const { config, logger, auth, project, opts, options, region } = ctx;
-		const catalystClient = getCatalystAPIClient(config, logger, auth, region);
+		const { logger, auth, project, opts, options, region } = ctx;
+		const catalystClient = getCatalystAPIClient(logger, auth, region);
 
 		const projectId = opts.projectId || project?.projectId;
 		const orgId = opts.orgId;

package/src/config.ts

@@ -727,12 +727,7 @@ export async function loadProjectSDKKey(
 	logger.trace(`[SDK_KEY] AGENTUITY_SDK_KEY not found in any file`);
 }
 
-export function getCatalystAPIClient(
-	config: Config | null,
-	logger: Logger,
-	auth: AuthData,
-	region: string
-) {
+export function getCatalystAPIClient(logger: Logger, auth: AuthData, region: string) {
 	const serviceUrls = getServiceUrls(region);
 	const catalystUrl = serviceUrls.catalyst;
 	return new ServerAPIClient(catalystUrl, logger, auth.apiKey);
@@ -745,3 +740,11 @@ export function getIONHost(config: Config | null) {
 	const url = new URL(config?.overrides?.ion_url ?? 'https://ion.agentuity.cloud');
 	return url.hostname;
 }
+
+export function getStreamURL(region: string, config: Config | null) {
+	if (config?.name === 'local') {
+		return 'https://streams.agentuity.io';
+	}
+	const serviceUrls = getServiceUrls(region);
+	return serviceUrls.stream;
+}

package/src/output.ts

@@ -39,7 +39,13 @@ export function isQuietMode(options: GlobalOptions): boolean {
  * Check if progress indicators should be disabled
  */
 export function shouldDisableProgress(options: GlobalOptions): boolean {
-	return options.noProgress === true || options.json === true || options.quiet === true;
+	return (
+		options.noProgress === true ||
+		options.json === true ||
+		options.quiet === true ||
+		options.logLevel === 'debug' ||
+		options.logLevel === 'trace'
+	);
 }
 
 /**