@agentuity/cli 0.0.95 → 0.0.96

package/src/cmd/cloud/deploy.ts

@@ -3,6 +3,7 @@ import { join, resolve } from 'node:path';
 import { createPublicKey } from 'node:crypto';
 import { createReadStream, createWriteStream, existsSync, mkdirSync, writeFileSync } from 'node:fs';
 import { tmpdir } from 'node:os';
+import { StructuredError } from '@agentuity/core';
 import { createSubcommand } from '../../types';
 import * as tui from '../../tui';
 import { saveProjectDir, getDefaultConfigDir } from '../../config';
@@ -14,7 +15,7 @@ import {
 	type Step,
 	type StepContext,
 } from '../../steps';
-import { bundle } from '../build/bundler';
+import { viteBundle } from '../build/vite-bundler';
 import { loadBuildMetadata, getStreamURL } from '../../config';
 import {
 	projectEnvUpdate,
@@ -42,6 +43,11 @@ import { checkCustomDomainForDNS } from './domain';
 import { DeployOptionsSchema } from '../../schemas/deploy';
 import { ErrorCode } from '../../errors';
 
+const DeploymentCancelledError = StructuredError(
+	'DeploymentCancelled',
+	'Deployment cancelled by user'
+);
+
 const DeployResponseSchema = z.object({
 	success: z.boolean().describe('Whether deployment succeeded'),
 	deploymentId: z.string().describe('Deployment ID'),
@@ -90,7 +96,7 @@ export const deploySubcommand = createSubcommand({
 	},
 
 	async handler(ctx) {
-		const { project, apiClient, projectDir, config, options, opts, logger } = ctx;
+		const { project, apiClient, projectDir, config, options, logger } = ctx;
 
 		let deployment: Deployment | undefined;
 		let build: BuildMetadata | undefined;
@@ -190,18 +196,12 @@ export const deploySubcommand = createSubcommand({
 							}
 							let capturedOutput: string[] = [];
 							try {
-								const bundleResult = await bundle({
+								const bundleResult = await viteBundle({
 									rootDir: resolve(projectDir),
 									dev: false,
 									deploymentId: deployment.id,
 									orgId: deployment.orgId,
 									projectId: project.projectId,
-									project,
-									commitUrl: opts?.commitUrl,
-									logsUrl: opts?.logsUrl,
-									provider: opts?.provider,
-									trigger: opts?.trigger,
-									tag: opts?.tag,
 									region: project.region,
 									logger: ctx.logger,
 								});
@@ -240,18 +240,17 @@ export const deploySubcommand = createSubcommand({
 							const deploymentZip = join(tmpdir(), `${deployment.id}.zip`);
 							await zipDir(join(projectDir, '.agentuity'), deploymentZip, {
 								filter: (_filename: string, relative: string) => {
-									// we don't include assets in the deployment
-									if (relative.startsWith('web/assets/')) {
+									// Exclude Vite-specific build artifacts
+									if (relative.endsWith('.generated.ts')) {
 										return false;
 									}
-									if (relative.startsWith('web/chunk/')) {
+									if (relative.startsWith('.vite/')) {
 										return false;
 									}
-									if (relative.startsWith('web/public/')) {
+									if (relative.startsWith('workbench-src/')) {
 										return false;
 									}
-									// exclude sourcemaps from deployment
-									if (relative.endsWith('.map')) {
+									if (relative.startsWith('workbench/')) {
 										return false;
 									}
 									// ignore common stuff we never want to include in the zip
@@ -345,9 +344,8 @@ export const deploySubcommand = createSubcommand({
 										);
 									}
 
-									const file = Bun.file(
-										join(projectDir, '.agentuity', 'web', asset.filename)
-									);
+									// Asset filename already includes the subdirectory (e.g., "client/assets/main-abc123.js")
+									const file = Bun.file(join(projectDir, '.agentuity', asset.filename));
 									promises.push(
 										fetch(assetUrl, {
 											method: 'PUT',
@@ -403,154 +401,187 @@ export const deploySubcommand = createSubcommand({
 			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?/,
-												''
+			// Create abort controller to allow Ctrl+C to interrupt polling
+			const pollAbortController = new AbortController();
+			const sigintHandler = () => {
+				pollAbortController.abort();
+			};
+			process.on('SIGINT', sigintHandler);
+
+			try {
+				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}`
 											);
-											if (message) {
-												logs.push(message);
-												log(message);
+											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}`);
 									}
-								} catch (err) {
-									if (err instanceof Error && err.name === 'AbortError') {
-										return;
+								})();
+
+								// Poll for deployment status
+								while (attempts < maxAttempts) {
+									// Check if user pressed Ctrl+C
+									if (pollAbortController.signal.aborted) {
+										logStreamController.abort();
+										throw new DeploymentCancelledError();
 									}
-									ctx.logger.trace(`Warmup log stream error: ${err}`);
-								}
-							})();
 
-							// Poll for deployment status
-							while (attempts < maxAttempts) {
-								attempts++;
-								try {
-									statusResult = await projectDeploymentStatus(
-										apiClient,
-										deployment?.id ?? ''
-									);
+									attempts++;
+									try {
+										statusResult = await projectDeploymentStatus(
+											apiClient,
+											deployment?.id ?? ''
+										);
+
+										logger.trace('status result: %s', statusResult);
 
-									logger.trace('status result: %s', statusResult);
+										if (statusResult.state === 'completed') {
+											logStreamController.abort();
+											break;
+										}
+
+										if (statusResult.state === 'failed') {
+											throw new Error('Deployment failed');
+										}
 
-									if (statusResult.state === 'completed') {
+										await Bun.sleep(pollInterval);
+									} catch (err) {
 										logStreamController.abort();
-										break;
+										throw err;
 									}
+								}
 
-									if (statusResult.state === 'failed') {
-										throw new Error('Deployment failed');
-									}
+								// Wait for log stream to finish
+								await logStreamPromise;
 
-									await Bun.sleep(pollInterval);
-								} catch (err) {
-									logStreamController.abort();
-									throw err;
+								if (attempts >= maxAttempts) {
+									throw new Error('Deployment timed out');
+								}
+							},
+						})
+						.then(() => {
+							tui.success('Your project was deployed!');
+						})
+						.catch((ex) => {
+							// Handle cancellation
+							if (ex instanceof DeploymentCancelledError) {
+								tui.warning('Deployment cancelled');
+								process.exit(130); // Standard exit code for SIGINT
+							}
+							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) {
+								// Check if user pressed Ctrl+C
+								if (pollAbortController.signal.aborted) {
+									throw new DeploymentCancelledError();
+								}
+
+								attempts++;
+								statusResult = await projectDeploymentStatus(
+									apiClient,
+									deployment?.id ?? ''
+								);
+
+								if (statusResult.state === 'completed') {
+									break;
+								}
+
+								if (statusResult.state === 'failed') {
+									throw new Error('Deployment failed');
+								}
 
-							// Wait for log stream to finish
-							await logStreamPromise;
+								await Bun.sleep(pollInterval);
+							}
 
 							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!');
+					tui.success('Your project was deployed!');
+				}
+			} finally {
+				// Clean up signal handler
+				process.off('SIGINT', sigintHandler);
 			}
 
 			const appUrl = getAppBaseURL(config?.name, config?.overrides);

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

@@ -60,6 +60,10 @@ export const listSubcommand = createSubcommand({
 		}),
 		response: DeploymentListResponseSchema,
 	},
+	webUrl: (ctx) => {
+		const projectId = ctx.opts?.['project-id'] || ctx.project?.projectId;
+		return projectId ? `/projects/${encodeURIComponent(projectId)}/deployments` : undefined;
+	},
 	async handler(ctx) {
 		const projectId = resolveProjectId(ctx, { projectId: ctx.opts['project-id'] });
 		const { apiClient, opts, options } = ctx;

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

@@ -29,6 +29,7 @@ export const listSubcommand = createSubcommand({
 		}),
 		response: EnvListResponseSchema,
 	},
+	webUrl: (ctx) => `/projects/${encodeURIComponent(ctx.project.projectId)}/settings`,
 
 	async handler(ctx) {
 		const { opts, apiClient, project, options } = ctx;

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

@@ -27,6 +27,7 @@ export const getSubcommand = createCommand({
 		}),
 		response: KVGetResponseSchema,
 	},
+	webUrl: (ctx) => `/services/kv/${encodeURIComponent(ctx.args.namespace)}`,
 	idempotent: true,
 
 	async handler(ctx) {

package/src/cmd/cloud/keyvalue/keys.ts

@@ -26,6 +26,7 @@ export const keysSubcommand = createCommand({
 		}),
 		response: KVKeysResponseSchema,
 	},
+	webUrl: (ctx) => `/services/kv/${encodeURIComponent(ctx.args.name)}`,
 
 	async handler(ctx) {
 		const { args, options } = ctx;

package/src/cmd/cloud/keyvalue/list-namespaces.ts

@@ -19,6 +19,7 @@ export const listNamespacesSubcommand = createCommand({
 	schema: {
 		response: NamespaceListResponseSchema,
 	},
+	webUrl: '/services/kv',
 	idempotent: true,
 
 	async handler(ctx) {

package/src/cmd/cloud/keyvalue/stats.ts

@@ -42,6 +42,8 @@ export const statsSubcommand = createCommand({
 		}),
 		response: KVStatsResponseSchema,
 	},
+	webUrl: (ctx) =>
+		ctx.args.name ? `/services/kv/${encodeURIComponent(ctx.args.name)}` : '/services/kv',
 
 	async handler(ctx) {
 		const { args, options } = ctx;

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

@@ -26,6 +26,7 @@ export const listSubcommand = createSubcommand({
 		}),
 		response: SecretListResponseSchema,
 	},
+	webUrl: (ctx) => `/projects/${encodeURIComponent(ctx.project.projectId)}/settings`,
 
 	async handler(ctx) {
 		const { opts, apiClient, project, options } = ctx;

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

@@ -88,6 +88,10 @@ export const listSubcommand = createSubcommand({
 		}),
 		response: SessionListResponseSchema,
 	},
+	webUrl: (ctx) => {
+		const projectId = ctx.opts?.projectId || ctx.project?.projectId;
+		return projectId ? `/projects/${encodeURIComponent(projectId)}/sessions` : undefined;
+	},
 	async handler(ctx) {
 		const { logger, auth, project, opts, options, region } = ctx;
 		const catalystClient = getCatalystAPIClient(logger, auth, region);

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

@@ -49,6 +49,7 @@ export const getSubcommand = createSubcommand({
 		}),
 		response: StorageGetResponseSchema,
 	},
+	webUrl: (ctx) => `/services/storage/${encodeURIComponent(ctx.args.name)}`,
 
 	async handler(ctx) {
 		const { logger, args, opts, options, orgId, region, auth } = ctx;

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

@@ -72,6 +72,10 @@ export const listSubcommand = createSubcommand({
 		}),
 		response: StorageListResponseSchema,
 	},
+	webUrl: (ctx) =>
+		ctx.args.name
+			? `/services/storage/${encodeURIComponent(ctx.args.name)}`
+			: '/services/storage',
 
 	async handler(ctx) {
 		const { logger, args, opts, options, orgId, region, auth } = ctx;

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

@@ -46,6 +46,7 @@ export const getSubcommand = createCommand({
 		}),
 		response: GetStreamResponseSchema,
 	},
+	webUrl: (ctx) => `/services/stream/${encodeURIComponent(ctx.args.id)}`,
 
 	async handler(ctx) {
 		const { args, opts, options } = ctx;

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

@@ -56,6 +56,7 @@ export const listSubcommand = createCommand({
 		}),
 		response: ListStreamsResponseSchema,
 	},
+	webUrl: '/services/stream',
 
 	async handler(ctx) {
 		const { opts, options } = ctx;

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

@@ -39,6 +39,7 @@ export const getSubcommand = createCommand({
 		}),
 		response: VectorGetResponseSchema,
 	},
+	webUrl: (ctx) => `/services/vector/${encodeURIComponent(ctx.args.namespace)}`,
 
 	async handler(ctx) {
 		const { args, options } = ctx;

package/src/cmd/cloud/vector/search.ts

@@ -66,6 +66,7 @@ export const searchSubcommand = createCommand({
 		}),
 		response: VectorSearchResponseSchema,
 	},
+	webUrl: '/services/vector',
 
 	async handler(ctx) {
 		const { args, opts, options } = ctx;