@agentuity/cli 0.0.108 → 0.0.110

package/src/cmd/build/vite/metadata-generator.ts

@@ -478,12 +478,10 @@ export async function generateMetadata(options: MetadataGeneratorOptions): Promi
 		if (options.deploymentOptions.pullRequestNumber) {
 			git.pull_request = {
 				number: options.deploymentOptions.pullRequestNumber,
-				commentId: options.deploymentOptions.pullRequestCommentId,
-				url: options.deploymentOptions.pullRequestURL,
+				url: options.deploymentOptions.pullRequestUrl,
 			};
-			delete git.pullRequestCommentId;
 			delete git.pullRequestNumber;
-			delete git.pullRequestURL;
+			delete git.pullRequestUrl;
 		}
 		metadata.deployment.git = git;
 	}
@@ -706,10 +704,10 @@ function generateAgentsMd(metadata: BuildMetadata): string {
 	lines.push('.agentuity/');
 	lines.push('├── app.js                     # Bundled server application');
 	lines.push('├── agentuity.metadata.json    # Build metadata and schemas');
-	if (metadata.assets?.some((a) => a.filename.startsWith('client/'))) {
+	if (metadata.assets?.some((a: { filename: string }) => a.filename.startsWith('client/'))) {
 		lines.push('├── client/                # Frontend assets (fallback, CDN by default)');
 	}
-	if (metadata.assets?.some((a) => a.filename.startsWith('public/'))) {
+	if (metadata.assets?.some((a: { filename: string }) => a.filename.startsWith('public/'))) {
 		lines.push('├── public/                # Static assets');
 	}
 	lines.push('└── AGENTS.md                  # This file');

package/src/cmd/build/vite/registry-generator.ts

@@ -36,11 +36,14 @@ export function generateAgentRegistry(srcDir: string, agents: AgentMetadata[]):
 	const generatedDir = join(srcDir, 'generated');
 	const registryPath = join(generatedDir, 'registry.ts');
 
+	// Sort agents by name for deterministic output
+	const sortedAgents = [...agents].sort((a, b) => a.name.localeCompare(b.name));
+
 	// Detect naming collisions in generated identifiers
 	const generatedNames = new Set<string>();
 	const collisions: string[] = [];
 
-	for (const agent of agents) {
+	for (const agent of sortedAgents) {
 		const camelName = toCamelCase(agent.name);
 
 		if (generatedNames.has(camelName)) {
@@ -59,7 +62,7 @@ export function generateAgentRegistry(srcDir: string, agents: AgentMetadata[]):
 	}
 
 	// Generate imports for all agents
-	const imports = agents
+	const imports = sortedAgents
 		.map(({ name, filename }) => {
 			const camelName = toCamelCase(name);
 			// Handle both './agent/...' and 'src/agent/...' formats
@@ -80,7 +83,7 @@ export function generateAgentRegistry(srcDir: string, agents: AgentMetadata[]):
 		.join('\n');
 
 	// Generate schema type exports for all agents
-	const schemaTypeExports = agents
+	const schemaTypeExports = sortedAgents
 		.map(({ name, description }) => {
 			const camelName = toCamelCase(name);
 			const pascalName = toPascalCase(name);
@@ -122,7 +125,7 @@ export function generateAgentRegistry(srcDir: string, agents: AgentMetadata[]):
 		.join('\n');
 
 	// Generate flat registry structure with JSDoc
-	const registry = agents
+	const registry = sortedAgents
 		.map(({ name, description }) => {
 			const camelName = toCamelCase(name);
 			const pascalName = toPascalCase(name);
@@ -138,7 +141,7 @@ export function generateAgentRegistry(srcDir: string, agents: AgentMetadata[]):
 
 	// Generate flat agent type definitions for AgentRegistry interface augmentation
 	// Uses the exported Agent types defined above
-	const runtimeAgentTypes = agents
+	const runtimeAgentTypes = sortedAgents
 		.map(({ name }) => {
 			const camelName = toCamelCase(name);
 			const pascalName = toPascalCase(name);
@@ -231,7 +234,7 @@ function generateRPCRegistryType(
 	apiRoutes: RouteInfo[],
 	websocketRoutes: RouteInfo[],
 	sseRoutes: RouteInfo[],
-	_agentImports: Map<string, string>,
+	agentImports: Map<string, string>,
 	_schemaImportAliases: Map<string, Map<string, string>>,
 	agentMetadataMap: Map<string, AgentMetadata>
 ): string {
@@ -263,6 +266,10 @@ function generateRPCRegistryType(
 		// Add path segments - sanitize for valid TypeScript property names
 		for (let i = 0; i < pathParts.length; i++) {
 			const part = sanitizePathSegment(pathParts[i]);
+			// Skip empty segments (e.g., wildcards like '*' that sanitize to '')
+			if (!part) {
+				continue;
+			}
 			if (!current[part]) {
 				current[part] = {};
 			}
@@ -292,8 +299,12 @@ function generateRPCRegistryType(
 		// Only reference type names if route has actual schemas extracted, otherwise use 'never'
 		// Note: hasValidator may be true (e.g., zValidator('query', ...)) but no schemas extracted
 		// because only 'json' validators extract input schemas
+		// Also check if agentVariable exists but import wasn't added (missing agentImportPath)
+		const hasValidAgentImport = route.agentVariable
+			? !!agentImports.get(route.agentVariable)
+			: false;
 		const hasSchemas =
-			route.inputSchemaVariable || route.outputSchemaVariable || route.agentVariable;
+			route.inputSchemaVariable || route.outputSchemaVariable || hasValidAgentImport;
 
 		current[terminalMethod] = {
 			input: hasSchemas ? `${pascalName}Input` : 'never',
@@ -315,7 +326,9 @@ function generateRPCRegistryType(
 	function treeToTypeString(node: NestedNode, indent: string = '\t\t'): string {
 		const lines: string[] = [];
 
-		for (const [key, value] of Object.entries(node)) {
+		// Sort entries alphabetically for deterministic output
+		const sortedEntries = Object.entries(node).sort(([a], [b]) => a.localeCompare(b));
+		for (const [key, value] of sortedEntries) {
 			if (
 				value &&
 				typeof value === 'object' &&
@@ -400,6 +413,10 @@ function generateRPCRuntimeMetadata(
 		// Sanitize path segments for valid property names (must match type generation)
 		for (const part of pathParts) {
 			const sanitized = sanitizePathSegment(part);
+			// Skip empty segments (e.g., wildcards like '*' that sanitize to '')
+			if (!sanitized) {
+				continue;
+			}
 			if (!current[sanitized]) current[sanitized] = {};
 			current = current[sanitized];
 		}
@@ -421,7 +438,21 @@ function generateRPCRuntimeMetadata(
 	websocketRoutes.forEach((r) => addRoute(r, 'websocket'));
 	sseRoutes.forEach((r) => addRoute(r, 'sse'));
 
-	return JSON.stringify(tree, null, '\t\t');
+	// Sort object keys recursively for deterministic output
+	const sortObject = (obj: MetadataNode): MetadataNode => {
+		const sorted: MetadataNode = {};
+		for (const key of Object.keys(obj).sort()) {
+			const value = obj[key];
+			if (value && typeof value === 'object' && !('type' in value)) {
+				sorted[key] = sortObject(value as MetadataNode);
+			} else {
+				sorted[key] = value;
+			}
+		}
+		return sorted;
+	};
+
+	return JSON.stringify(sortObject(tree), null, '\t\t');
 }
 
 /**
@@ -450,10 +481,13 @@ export function generateRouteRegistry(
 		// If we can't read package.json, assume no React dependency
 	}
 
-	// Filter routes by type
-	const apiRoutes = routes.filter((r) => r.routeType === 'api' || r.routeType === 'stream');
-	const websocketRoutes = routes.filter((r) => r.routeType === 'websocket');
-	const sseRoutes = routes.filter((r) => r.routeType === 'sse');
+	// Filter routes by type and sort by path for deterministic output
+	const sortByPath = (a: RouteInfo, b: RouteInfo) => a.path.localeCompare(b.path);
+	const apiRoutes = routes
+		.filter((r) => r.routeType === 'api' || r.routeType === 'stream')
+		.sort(sortByPath);
+	const websocketRoutes = routes.filter((r) => r.routeType === 'websocket').sort(sortByPath);
+	const sseRoutes = routes.filter((r) => r.routeType === 'sse').sort(sortByPath);
 
 	const allRoutes = [...apiRoutes, ...websocketRoutes, ...sseRoutes];
 
@@ -637,8 +671,10 @@ export function generateRouteRegistry(
 				agentMeta = agentMetadataMap.get(route.agentVariable);
 			}
 
-			if (route.agentVariable) {
-				const importName = agentImports.get(route.agentVariable)!;
+			// Only generate agent-based types if the import was successfully added
+			// (import is only added when hasValidator && agentVariable && agentImportPath are all present)
+			const importName = route.agentVariable ? agentImports.get(route.agentVariable) : undefined;
+			if (importName) {
 				inputType = `InferInput<typeof ${importName}['inputSchema']>`;
 				outputType = `InferOutput<typeof ${importName}['outputSchema']>`;
 				inputSchemaType = `typeof ${importName} extends { inputSchema?: infer I } ? I : never`;
@@ -724,10 +760,16 @@ export function generateRouteRegistry(
 			.replace(/_+/g, '_');
 		const pascalName = toPascalCase(safeName);
 
+		// Use the exported schema types we generated above
+		// Note: agentImports.get() may return undefined if import wasn't added
+		const importName = route.agentVariable ? agentImports.get(route.agentVariable) : null;
+
 		// Use 'never' types if no schemas were actually extracted
 		// Note: hasValidator may be true (e.g., zValidator('query', ...)) but no schemas extracted
 		// because only 'json' validators extract input schemas
-		if (!route.inputSchemaVariable && !route.outputSchemaVariable && !route.agentVariable) {
+		// Also check if agentVariable exists but import wasn't added (missing agentImportPath)
+		const hasValidAgentImport = route.agentVariable ? !!importName : false;
+		if (!route.inputSchemaVariable && !route.outputSchemaVariable && !hasValidAgentImport) {
 			const streamValue = route.stream === true ? 'true' : 'false';
 			return `\t'${routeKey}': {
 \t\tinputSchema: never;
@@ -735,9 +777,6 @@ export function generateRouteRegistry(
 \t\tstream: ${streamValue};
 \t};`;
 		}
-
-		// Use the exported schema types we generated above
-		const importName = route.agentVariable ? agentImports.get(route.agentVariable)! : null;
 		const streamValue = importName
 			? `typeof ${importName} extends { stream?: infer S } ? S : false`
 			: route.stream === true

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

@@ -10,6 +10,7 @@ import { createRequire } from 'node:module';
 import type { InlineConfig, Plugin } from 'vite';
 import type { Logger, DeployOptions } from '../../../types';
 import { browserEnvPlugin } from './browser-env-plugin';
+import type { BuildReportCollector } from '../../../build-report';
 
 /**
  * Vite plugin to flatten the output structure for index.html
@@ -56,6 +57,8 @@ export interface ViteBuildOptions {
 	workbenchEnabled?: boolean;
 	logger: Logger;
 	deploymentOptions?: DeployOptions;
+	/** Optional collector for structured error reporting */
+	collector?: BuildReportCollector;
 }
 
 /**
@@ -86,6 +89,11 @@ export async function runViteBuild(options: ViteBuildOptions): Promise<void> {
 		const { generateLifecycleTypes } = await import('./lifecycle-generator');
 		await generateLifecycleTypes(rootDir, srcDir, logger);
 
+		// Load workbench config for entry file generation
+		const { loadAgentuityConfig, getWorkbenchConfig } = await import('./config-loader');
+		const config = await loadAgentuityConfig(rootDir, logger);
+		const workbenchConfig = getWorkbenchConfig(config, dev);
+
 		// Then, generate the entry file
 		const { generateEntryFile } = await import('../entry-generator');
 		await generateEntryFile({
@@ -94,6 +102,7 @@ export async function runViteBuild(options: ViteBuildOptions): Promise<void> {
 			deploymentId: deploymentId || '',
 			logger,
 			mode: dev ? 'dev' : 'prod',
+			workbench: workbenchConfig.enabled ? workbenchConfig : undefined,
 		});
 
 		// Finally, build with Bun.build
@@ -250,7 +259,7 @@ interface BuildResult {
  * Run all builds in sequence: client -> workbench (if enabled) -> server
  */
 export async function runAllBuilds(options: Omit<ViteBuildOptions, 'mode'>): Promise<BuildResult> {
-	const { rootDir, projectId = '', dev = false, logger } = options;
+	const { rootDir, projectId = '', dev = false, logger, collector } = options;
 
 	if (!dev) {
 		rmSync(join(rootDir, '.agentuity'), { force: true, recursive: true });
@@ -305,6 +314,7 @@ export async function runAllBuilds(options: Omit<ViteBuildOptions, 'mode'>): Pro
 	// 2. Build client (only if web frontend exists)
 	if (hasWebFrontend) {
 		logger.debug('Building client assets...');
+		const endClientDiagnostic = collector?.startDiagnostic('client-build');
 		const started = Date.now();
 		await runViteBuild({
 			...options,
@@ -314,6 +324,7 @@ export async function runAllBuilds(options: Omit<ViteBuildOptions, 'mode'>): Pro
 		});
 		result.client.included = true;
 		result.client.duration = Date.now() - started;
+		endClientDiagnostic?.();
 	} else {
 		logger.debug('Skipping client build - no src/web/index.html found');
 	}
@@ -321,6 +332,7 @@ export async function runAllBuilds(options: Omit<ViteBuildOptions, 'mode'>): Pro
 	// 3. Build workbench (if enabled in config)
 	if (workbenchConfig.enabled) {
 		logger.debug('Building workbench assets...');
+		const endWorkbenchDiagnostic = collector?.startDiagnostic('workbench-build');
 		const started = Date.now();
 		await runViteBuild({
 			...options,
@@ -330,17 +342,21 @@ export async function runAllBuilds(options: Omit<ViteBuildOptions, 'mode'>): Pro
 		});
 		result.workbench.included = true;
 		result.workbench.duration = Date.now() - started;
+		endWorkbenchDiagnostic?.();
 	}
 
 	// 4. Build server
 	logger.debug('Building server...');
+	const endServerDiagnostic = collector?.startDiagnostic('server-build');
 	const serverStarted = Date.now();
 	await runViteBuild({ ...options, mode: 'server' });
 	result.server.included = true;
 	result.server.duration = Date.now() - serverStarted;
+	endServerDiagnostic?.();
 
 	// 5. Generate metadata (after all builds complete)
 	logger.debug('Generating metadata...');
+	const endMetadataDiagnostic = collector?.startDiagnostic('metadata-generation');
 	const { generateMetadata, writeMetadataFile } = await import('./metadata-generator');
 
 	// Generate metadata
@@ -357,6 +373,7 @@ export async function runAllBuilds(options: Omit<ViteBuildOptions, 'mode'>): Pro
 	});
 
 	writeMetadataFile(rootDir, metadata, dev, logger);
+	endMetadataDiagnostic?.();
 	logger.debug('Registry and metadata generation complete');
 
 	logger.debug('All builds complete');

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

@@ -12,6 +12,7 @@ import { runAllBuilds } from './vite/vite-builder';
 import { checkAndUpgradeDependencies } from '../../utils/dependency-checker';
 import { checkBunVersion } from '../../utils/bun-version-checker';
 import * as tui from '../../tui';
+import type { BuildReportCollector } from '../../build-report';
 
 const AppFileNotFoundError = StructuredError('AppFileNotFoundError');
 const BuildFailedError = StructuredError('BuildFailedError');
@@ -26,6 +27,8 @@ export interface ViteBundleOptions {
 	port?: number;
 	logger: Logger;
 	deploymentOptions?: DeployOptions;
+	/** Optional collector for structured error reporting */
+	collector?: BuildReportCollector;
 }
 
 /**
@@ -41,6 +44,7 @@ export async function viteBundle(options: ViteBundleOptions): Promise<{ output:
 		port = 3500,
 		logger,
 		deploymentOptions,
+		collector,
 	} = options;
 
 	const output: string[] = [];
@@ -52,8 +56,10 @@ export async function viteBundle(options: ViteBundleOptions): Promise<{ output:
 	// Verify app.ts exists
 	const appFile = join(rootDir, 'app.ts');
 	if (!(await Bun.file(appFile).exists())) {
+		const errorMessage = `App file not found at expected location: ${appFile}`;
+		collector?.addGeneralError('build', errorMessage, 'BUILD001');
 		throw new AppFileNotFoundError({
-			message: `App file not found at expected location: ${appFile}`,
+			message: errorMessage,
 		});
 	}
 
@@ -63,16 +69,20 @@ export async function viteBundle(options: ViteBundleOptions): Promise<{ output:
 		.then((s) => s.isDirectory())
 		.catch(() => false);
 	if (!srcDirExists) {
+		const errorMessage = `Source directory not found: ${srcDir}`;
+		collector?.addGeneralError('build', errorMessage, 'BUILD002');
 		throw new BuildFailedError({
-			message: `Source directory not found: ${srcDir}`,
+			message: errorMessage,
 		});
 	}
 
 	// Check and upgrade @agentuity/* dependencies if needed
 	const upgradeResult = await checkAndUpgradeDependencies(rootDir, logger);
 	if (upgradeResult.failed.length > 0 && process.stdin.isTTY) {
+		const errorMessage = `Failed to upgrade dependencies: ${upgradeResult.failed.join(', ')}`;
+		collector?.addGeneralError('build', errorMessage, 'BUILD003');
 		throw new BuildFailedError({
-			message: `Failed to upgrade dependencies: ${upgradeResult.failed.join(', ')}`,
+			message: errorMessage,
 		});
 	}
 
@@ -90,6 +100,7 @@ export async function viteBundle(options: ViteBundleOptions): Promise<{ output:
 			deploymentId,
 			logger,
 			deploymentOptions,
+			collector,
 		});
 
 		if (result.client.included) {
@@ -106,8 +117,10 @@ export async function viteBundle(options: ViteBundleOptions): Promise<{ output:
 
 		return { output };
 	} catch (error) {
+		const errorMessage = `Build failed: ${error instanceof Error ? error.message : String(error)}`;
+		collector?.addGeneralError('build', errorMessage, 'BUILD004');
 		throw new BuildFailedError({
-			message: `Build failed: ${error instanceof Error ? error.message : String(error)}`,
+			message: errorMessage,
 		});
 	}
 }

package/src/cmd/cloud/deploy.ts

@@ -45,6 +45,7 @@ import { getCommand } from '../../command-prefix';
 import * as domain from '../../domain';
 import { ErrorCode } from '../../errors';
 import { typecheck } from '../build/typecheck';
+import { BuildReportCollector, setGlobalCollector, clearGlobalCollector } from '../../build-report';
 
 const DeploymentCancelledError = StructuredError(
 	'DeploymentCancelled',
@@ -93,7 +94,12 @@ export const deploySubcommand = createSubcommand({
 		options: z.intersection(
 			DeployOptionsSchema,
 			z.object({
-				saveTypeErrors: z.string().optional().describe('file path to save typecheck errors'),
+				reportFile: z
+					.string()
+					.optional()
+					.describe(
+						'file path to save build report JSON with errors, warnings, and diagnostics'
+					),
 			})
 		),
 		response: DeployResponseSchema,
@@ -102,6 +108,14 @@ export const deploySubcommand = createSubcommand({
 	async handler(ctx) {
 		const { project, apiClient, projectDir, config, options, logger, opts } = ctx;
 
+		// Initialize build report collector if reportFile is specified
+		const collector = new BuildReportCollector();
+		if (opts.reportFile) {
+			collector.setOutputPath(opts.reportFile);
+			collector.enableAutoWrite();
+			setGlobalCollector(collector);
+		}
+
 		let deployment: Deployment | undefined;
 		let build: BuildMetadata | undefined;
 		let instructions: DeploymentInstructions | undefined;
@@ -239,8 +253,13 @@ export const deploySubcommand = createSubcommand({
 							}
 							let capturedOutput: string[] = [];
 							const rootDir = resolve(projectDir);
+
+							// Run typecheck with collector for error reporting
+							const endTypecheckDiagnostic = collector.startDiagnostic('typecheck');
 							const started = Date.now();
-							const typeResult = await typecheck(rootDir);
+							const typeResult = await typecheck(rootDir, { collector });
+							endTypecheckDiagnostic();
+
 							if (typeResult.success) {
 								capturedOutput.push(
 									tui.muted(
@@ -248,9 +267,10 @@ export const deploySubcommand = createSubcommand({
 									)
 								);
 							} else {
-								if ('errors' in typeResult && opts.saveTypeErrors) {
-									const f = Bun.file(opts.saveTypeErrors);
-									await f.write(JSON.stringify(typeResult.errors));
+								// Errors already added to collector by typecheck()
+								// Write report before returning error
+								if (opts.reportFile) {
+									await collector.forceWrite();
 								}
 								return stepError('Typecheck failed\n\n' + typeResult.output);
 							}
@@ -264,6 +284,7 @@ export const deploySubcommand = createSubcommand({
 									region: project.region,
 									logger: ctx.logger,
 									deploymentOptions: opts,
+									collector,
 								});
 								capturedOutput = [...capturedOutput, ...bundleResult.output];
 								build = await loadBuildMetadata(join(projectDir, '.agentuity'));
@@ -275,6 +296,10 @@ export const deploySubcommand = createSubcommand({
 								return stepSuccess(capturedOutput.length > 0 ? capturedOutput : undefined);
 							} catch (ex) {
 								const _ex = ex as Error;
+								// Write report before returning error
+								if (opts.reportFile) {
+									await collector.forceWrite();
+								}
 								return stepError(
 									_ex.message ?? 'Error building your project',
 									_ex,
@@ -294,6 +319,8 @@ export const deploySubcommand = createSubcommand({
 								return stepError('deployment instructions were null');
 							}
 
+							// Start diagnostic for zip/encrypt phase
+							const endZipDiagnostic = collector.startDiagnostic('zip-package');
 							progress(5);
 							ctx.logger.trace('Starting deployment zip creation');
 							// zip up the assets folder
@@ -319,8 +346,11 @@ export const deploySubcommand = createSubcommand({
 							});
 							ctx.logger.trace(`Deployment zip created: ${deploymentZip}`);
 
+							endZipDiagnostic();
+
 							progress(20);
 							// Encrypt the deployment zip using the public key from deployment
+							const endEncryptDiagnostic = collector.startDiagnostic('encrypt');
 							const encryptedZip = join(tmpdir(), `${deployment.id}.enc.zip`);
 							try {
 								ctx.logger.trace('Creating public key');
@@ -348,8 +378,11 @@ export const deploySubcommand = createSubcommand({
 									dst.end();
 								});
 								ctx.logger.trace('Stream finished');
+								endEncryptDiagnostic();
 
 								progress(50);
+								// Start code upload diagnostic
+								const endCodeUploadDiagnostic = collector.startDiagnostic('code-upload');
 								ctx.logger.trace(`Uploading deployment to ${instructions.deployment}`);
 								const zipfile = Bun.file(encryptedZip);
 								const fileSize = await zipfile.size;
@@ -364,8 +397,15 @@ export const deploySubcommand = createSubcommand({
 								});
 								ctx.logger.trace(`Upload response: ${resp.status}`);
 								if (!resp.ok) {
-									return stepError(`Error uploading deployment: ${await resp.text()}`);
+									endCodeUploadDiagnostic();
+									const errorMsg = `Error uploading deployment: ${await resp.text()}`;
+									collector.addGeneralError('deploy', errorMsg, 'DEPLOY002');
+									if (opts.reportFile) {
+										await collector.forceWrite();
+									}
+									return stepError(errorMsg);
 								}
+								endCodeUploadDiagnostic();
 
 								progress(70);
 								ctx.logger.trace('Consuming response body');
@@ -385,11 +425,17 @@ export const deploySubcommand = createSubcommand({
 							progress(80);
 							let bytes = 0;
 							if (build?.assets) {
+								// Start CDN upload diagnostic
+								const endCdnUploadDiagnostic = collector.startDiagnostic('cdn-upload');
 								ctx.logger.trace(`Uploading ${build.assets.length} assets`);
 								if (!instructions.assets) {
-									return stepError(
-										'server did not provide asset upload URLs; upload aborted'
-									);
+									const errorMsg =
+										'server did not provide asset upload URLs; upload aborted';
+									collector.addGeneralError('deploy', errorMsg, 'DEPLOY006');
+									if (opts.reportFile) {
+										await collector.forceWrite();
+									}
+									return stepError(errorMsg);
 								}
 
 								// Workaround for Bun crash in compiled executables (https://github.com/agentuity/sdk/issues/191)
@@ -452,11 +498,17 @@ export const deploySubcommand = createSubcommand({
 									const resps = await Promise.all(promises);
 									for (const r of resps) {
 										if (!r.ok) {
-											return stepError(`error uploading asset: ${await r.text()}`);
+											const errorMsg = `error uploading asset: ${await r.text()}`;
+											collector.addGeneralError('deploy', errorMsg, 'DEPLOY006');
+											if (opts.reportFile) {
+												await collector.forceWrite();
+											}
+											return stepError(errorMsg);
 										}
 									}
 								}
 								ctx.logger.trace('Asset uploads complete');
+								endCdnUploadDiagnostic();
 								progress(95);
 							}
 
@@ -503,6 +555,7 @@ export const deploySubcommand = createSubcommand({
 			const dashboard = `${appUrl}/r/${deployment.id}`;
 
 			// Poll for deployment status with optional log streaming
+			const endDeploymentWaitDiagnostic = collector.startDiagnostic('deployment-wait');
 			const pollInterval = 500;
 			const maxAttempts = 600;
 			let attempts = 0;
@@ -615,11 +668,16 @@ export const deploySubcommand = createSubcommand({
 							},
 						})
 						.then(() => {
+							endDeploymentWaitDiagnostic();
 							tui.success('Your project was deployed!');
 						})
-						.catch((ex) => {
+						.catch(async (ex) => {
+							endDeploymentWaitDiagnostic();
 							// Handle cancellation
 							if (ex instanceof DeploymentCancelledError) {
+								if (opts.reportFile) {
+									await collector.forceWrite();
+								}
 								tui.warning('Deployment cancelled');
 								process.exit(130); // Standard exit code for SIGINT
 							}
@@ -628,6 +686,18 @@ export const deploySubcommand = createSubcommand({
 								exwithmessage.message === 'Deployment failed'
 									? ''
 									: exwithmessage.toString();
+
+							// Add error to collector
+							const isTimeout = exwithmessage.message === 'Deployment timed out';
+							collector.addGeneralError(
+								'deploy',
+								msg || 'Deployment failed',
+								isTimeout ? 'DEPLOY003' : 'DEPLOY004'
+							);
+							if (opts.reportFile) {
+								await collector.forceWrite();
+							}
+
 							tui.error(`Your deployment failed to start${msg ? `: ${msg}` : ''}`);
 							if (logs.length) {
 								const logsDir = join(getDefaultConfigDir(), 'logs');
@@ -687,9 +757,22 @@ export const deploySubcommand = createSubcommand({
 						},
 					});
 
+					endDeploymentWaitDiagnostic();
 					tui.success('Your project was deployed!');
 				}
 			} catch (ex) {
+				endDeploymentWaitDiagnostic();
+				const exwithmessage = ex as { message: string };
+				const isTimeout = exwithmessage?.message === 'Deployment timed out';
+				collector.addGeneralError(
+					'deploy',
+					exwithmessage?.message || String(ex),
+					isTimeout ? 'DEPLOY003' : 'DEPLOY004'
+				);
+				if (opts.reportFile) {
+					await collector.forceWrite();
+				}
+
 				const lines = [`${ex}`, ''];
 				lines.push(
 					`${tui.ICONS.arrow} ${
@@ -741,6 +824,12 @@ export const deploySubcommand = createSubcommand({
 				});
 			}
 
+			// Write final report on success
+			if (opts.reportFile) {
+				await collector.forceWrite();
+			}
+			clearGlobalCollector();
+
 			return {
 				success: true,
 				deploymentId: deployment.id,
@@ -756,6 +845,11 @@ export const deploySubcommand = createSubcommand({
 					: undefined,
 			};
 		} catch (ex) {
+			collector.addGeneralError('deploy', String(ex), 'DEPLOY004');
+			if (opts.reportFile) {
+				await collector.forceWrite();
+			}
+			clearGlobalCollector();
 			tui.fatal(`unexpected error trying to deploy project. ${ex}`);
 		}
 	},

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

@@ -36,7 +36,6 @@ const DeploymentShowResponseSchema = z.object({
 						.object({
 							number: z.number(),
 							url: z.string().optional(),
-							commentId: z.string().optional(),
 						})
 						.optional(),
 				})