@agentuity/cli 1.0.9 → 1.0.11

package/src/cmd/build/vite/config-loader.ts

@@ -71,3 +71,38 @@ export function getWorkbenchConfig(
 		headers: workbench.headers ?? {},
 	};
 }
+
+/**
+ * Known Vite framework plugin name prefixes.
+ * Each framework's Vite plugin registers one or more plugins whose names
+ * start with these prefixes. We match against these to detect whether the
+ * user has already configured a framework plugin in their agentuity.config.ts.
+ */
+const FRAMEWORK_PLUGIN_PREFIXES = [
+	'vite:react', // @vitejs/plugin-react  (vite:react-babel, vite:react-refresh, …)
+	'vite:preact', // @preact/preset-vite
+	'vite-plugin-svelte', // @sveltejs/vite-plugin-svelte
+	'vite:vue', // @vitejs/plugin-vue      (vite:vue, vite:vue-jsx)
+	'vite-plugin-solid', // vite-plugin-solid
+	'solid', // vite-plugin-solid also uses plain "solid"
+];
+
+/**
+ * Check if the user's plugins include any known UI-framework Vite plugin
+ * (React, Svelte, Vue, Solid, Preact, …).
+ *
+ * Detection is name-based: Vite plugins expose a `name` property and every
+ * major framework plugin uses a predictable prefix. This avoids dynamically
+ * importing every possible framework just to compare names.
+ */
+export function hasFrameworkPlugin(userPlugins: import('vite').PluginOption[]): boolean {
+	const flat = (userPlugins as unknown[]).flat(Infinity).filter(Boolean);
+	return flat.some(
+		(p: unknown) =>
+			p &&
+			typeof p === 'object' &&
+			'name' in p &&
+			typeof (p as { name: unknown }).name === 'string' &&
+			FRAMEWORK_PLUGIN_PREFIXES.some((prefix) => (p as { name: string }).name.startsWith(prefix))
+	);
+}

package/src/cmd/build/vite/index.ts

@@ -23,6 +23,8 @@ export interface AgentuityPluginOptions {
 	deploymentId?: string;
 	logLevel?: LogLevel;
 	deploymentOptions?: DeployOptions;
+	/** Deployment config from agentuity.json (resources, mode, dependencies, domains) */
+	deploymentConfig?: Record<string, unknown>;
 	/** Optional config profile name (e.g., 'staging', 'test') for .env.{profile} files */
 	profile?: string;
 }
@@ -48,6 +50,7 @@ export function agentuityPlugin(options: AgentuityPluginOptions): Plugin {
 		deploymentId = '',
 		logLevel = 'info',
 		deploymentOptions,
+		deploymentConfig,
 		profile,
 	} = options;
 	const logger = createLogger(logLevel);
@@ -173,6 +176,7 @@ export function agentuityPlugin(options: AgentuityPluginOptions): Plugin {
 				dev,
 				logger,
 				deploymentOptions,
+				deploymentConfig,
 			});
 
 			// Write metadata file

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

@@ -6,7 +6,8 @@
 
 import { join } from 'node:path';
 import { writeFileSync, mkdirSync, existsSync, readFileSync, statSync, readdirSync } from 'node:fs';
-import type { BuildMetadata } from '@agentuity/server';
+import { type BuildMetadata, DeploymentConfig } from '@agentuity/server';
+import type { z } from 'zod';
 import type { AgentMetadata } from './agent-discovery';
 import type { RouteMetadata } from './route-discovery';
 import type { Logger, DeployOptions } from '../../../types';
@@ -164,6 +165,8 @@ export interface MetadataGeneratorOptions {
 	dev?: boolean;
 	logger: Logger;
 	deploymentOptions?: DeployOptions;
+	/** Deployment config from agentuity.json (resources, mode, dependencies, domains) */
+	deploymentConfig?: z.infer<typeof DeploymentConfig>;
 }
 
 /**
@@ -473,6 +476,7 @@ export async function generateMetadata(options: MetadataGeneratorOptions): Promi
 			orgId,
 		},
 		deployment: {
+			...options.deploymentConfig, // deployment config from agentuity.json (resources, mode, dependencies, domains)
 			id: options.deploymentId || '',
 			date: new Date().toISOString(),
 			build: {

package/src/cmd/build/vite/route-discovery.ts

@@ -85,6 +85,10 @@ export async function discoverRoutes(
 
 	const transpiler = new Bun.Transpiler({ loader: 'ts', target: 'bun' });
 
+	// Track files that are mounted as sub-routers via .route()
+	// These files will be parsed standalone AND via .route() — we need to deduplicate
+	const mountedSubrouters = new Set<string>();
+
 	// Scan all .ts files in api directory
 	const glob = new Bun.Glob('**/*.ts');
 	for await (const file of glob.scan(apiDir)) {
@@ -104,7 +108,14 @@ export async function discoverRoutes(
 			const relativeFilename = './' + relative(srcDir, filePath);
 
 			try {
-				const parsedRoutes = await parseRoute(rootDir, filePath, projectId, deploymentId);
+				const parsedRoutes = await parseRoute(
+					rootDir,
+					filePath,
+					projectId,
+					deploymentId,
+					undefined,
+					mountedSubrouters
+				);
 
 				if (parsedRoutes.length > 0) {
 					logger.trace('Discovered %d route(s) in %s', parsedRoutes.length, relativeFilename);
@@ -165,6 +176,28 @@ export async function discoverRoutes(
 		}
 	}
 
+	// Filter out routes from standalone-parsed sub-router files
+	// When a file is mounted via .route(), its standalone routes have wrong prefixes
+	// Only the .route()-prefixed routes (attached to the parent file) are correct
+	if (mountedSubrouters.size > 0) {
+		const rootDir = join(srcDir, '..');
+		const subrouterRelPaths = new Set<string>();
+		for (const absPath of mountedSubrouters) {
+			subrouterRelPaths.add(relative(rootDir, absPath));
+		}
+
+		// Remove routes whose filename matches a sub-router file
+		// (these are the incorrectly-prefixed standalone routes)
+		const filteredRoutes = routes.filter((r) => !subrouterRelPaths.has(r.filename));
+		const filteredRouteInfoList = routeInfoList.filter((r) => !subrouterRelPaths.has(r.filename));
+
+		// Replace arrays in-place
+		routes.length = 0;
+		routes.push(...filteredRoutes);
+		routeInfoList.length = 0;
+		routeInfoList.push(...filteredRouteInfoList);
+	}
+
 	logger.debug('Discovered %d route(s)', routes.length);
 
 	// Check for route conflicts

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

@@ -128,24 +128,33 @@ export async function generateAssetServerConfig(
 			'process.env.NODE_ENV': JSON.stringify('development'),
 		},
 
-		// Plugins: User plugins first (e.g., Tailwind), then React and browser env
+		// Plugins: User plugins first (includes framework plugin like React/Svelte/Vue), then browser env
 		// Try project's node_modules first, fall back to CLI's bundled version
 		plugins: await (async () => {
-			const projectRequire = createRequire(join(rootDir, 'package.json'));
-			let reactPluginPath = '@vitejs/plugin-react';
-			try {
-				reactPluginPath = projectRequire.resolve('@vitejs/plugin-react');
-			} catch {
-				// Project doesn't have @vitejs/plugin-react, use CLI's bundled version
-			}
-			const reactPlugin = (await import(reactPluginPath)).default();
 			const { browserEnvPlugin } = await import('./browser-env-plugin');
 			const { publicAssetPathPlugin } = await import('./public-asset-path-plugin');
+			const { hasFrameworkPlugin } = await import('./config-loader');
+
+			// Auto-add React plugin if no framework plugin is present (backwards compatibility)
+			const resolvedUserPlugins = [...userPlugins];
+			if (resolvedUserPlugins.length === 0 || !hasFrameworkPlugin(resolvedUserPlugins)) {
+				logger.debug(
+					'No framework plugin found in agentuity.config.ts plugins, adding React automatically for dev server'
+				);
+				const projectRequire = createRequire(join(rootDir, 'package.json'));
+				let reactPluginPath = '@vitejs/plugin-react';
+				try {
+					reactPluginPath = projectRequire.resolve('@vitejs/plugin-react');
+				} catch {
+					// Project doesn't have @vitejs/plugin-react, use CLI's bundled version
+				}
+				const reactModule = await import(reactPluginPath);
+				resolvedUserPlugins.unshift(reactModule.default());
+			}
+
 			return [
-				// User-defined plugins from agentuity.config.ts (e.g., Tailwind CSS)
-				...userPlugins,
-				// React plugin for JSX/TSX transformation and Fast Refresh
-				reactPlugin,
+				// User-defined plugins from agentuity.config.ts (framework plugin + extras)
+				...resolvedUserPlugins,
 				// Browser env plugin to map process.env to import.meta.env
 				browserEnvPlugin(),
 				// Warn about incorrect public asset paths in dev mode

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

@@ -61,6 +61,8 @@ export interface ViteBuildOptions {
 	analyticsEnabled?: boolean;
 	logger: Logger;
 	deploymentOptions?: DeployOptions;
+	/** Deployment config from agentuity.json (resources, mode, dependencies, domains) */
+	deploymentConfig?: Record<string, unknown>;
 	/** Optional collector for structured error reporting */
 	collector?: BuildReportCollector;
 	/** Optional config profile name (e.g., 'staging', 'test') for .env.{profile} files */
@@ -180,8 +182,24 @@ export async function runViteBuild(options: ViteBuildOptions): Promise<void> {
 
 		// Load custom user plugins from agentuity.config.ts if it exists
 		const clientOutDir = join(rootDir, '.agentuity/client');
+		const { loadAgentuityConfig, hasFrameworkPlugin } = await import('./config-loader');
+		const userConfig = await loadAgentuityConfig(rootDir, logger);
+		const userPlugins = userConfig?.plugins || [];
+
+		// Auto-add React plugin if no framework plugin is present (backwards compatibility)
+		if (userPlugins.length === 0 || !hasFrameworkPlugin(userPlugins)) {
+			logger.debug(
+				'No framework plugin found in agentuity.config.ts plugins, adding React automatically'
+			);
+			userPlugins.unshift(react());
+		}
+
+		if (userPlugins.length > 0) {
+			logger.debug('Loaded %d custom plugin(s) from agentuity.config.ts', userPlugins.length);
+		}
+
 		const plugins = [
-			react(),
+			...userPlugins,
 			browserEnvPlugin(),
 			// Fix incorrect public asset paths and rewrite to CDN URLs
 			publicAssetPathPlugin({ cdnBaseUrl }),
@@ -189,13 +207,6 @@ export async function runViteBuild(options: ViteBuildOptions): Promise<void> {
 			// Emit analytics beacon as hashed CDN asset (prod builds only)
 			beaconPlugin({ enabled: analyticsEnabled && !dev }),
 		];
-		const { loadAgentuityConfig } = await import('./config-loader');
-		const userConfig = await loadAgentuityConfig(rootDir, logger);
-		const userPlugins = userConfig?.plugins || [];
-		plugins.push(...userPlugins);
-		if (userPlugins.length > 0) {
-			logger.debug('Loaded %d custom plugin(s) from agentuity.config.ts', userPlugins.length);
-		}
 
 		// Merge custom define values from user config
 		const userDefine = userConfig?.define || {};
@@ -412,6 +423,7 @@ export async function runAllBuilds(options: Omit<ViteBuildOptions, 'mode'>): Pro
 		logger,
 		dev,
 		deploymentOptions: options.deploymentOptions,
+		deploymentConfig: options.deploymentConfig,
 	});
 
 	writeMetadataFile(rootDir, metadata, dev, logger);

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

@@ -27,6 +27,8 @@ export interface ViteBundleOptions {
 	port?: number;
 	logger: Logger;
 	deploymentOptions?: DeployOptions;
+	/** Deployment config from agentuity.json (resources, mode, dependencies, domains) */
+	deploymentConfig?: Record<string, unknown>;
 	/** Optional collector for structured error reporting */
 	collector?: BuildReportCollector;
 }
@@ -44,6 +46,7 @@ export async function viteBundle(options: ViteBundleOptions): Promise<{ output:
 		port = 3500,
 		logger,
 		deploymentOptions,
+		deploymentConfig,
 		collector,
 	} = options;
 
@@ -100,6 +103,7 @@ export async function viteBundle(options: ViteBundleOptions): Promise<{ output:
 			deploymentId,
 			logger,
 			deploymentOptions,
+			deploymentConfig,
 			collector,
 		});
 

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

@@ -46,6 +46,14 @@ export const listSubcommand = createSubcommand({
 					'Show credentials in plain text (default: masked in terminal, unmasked in JSON)'
 				),
 			nameOnly: z.boolean().optional().describe('Print the name only'),
+			sort: z
+				.enum(['name', 'created'])
+				.optional()
+				.describe('field to sort by (default: created)'),
+			direction: z
+				.enum(['asc', 'desc'])
+				.optional()
+				.describe('sort direction (default: desc)'),
 		}),
 		response: DBListResponseSchema,
 	},
@@ -60,7 +68,12 @@ export const listSubcommand = createSubcommand({
 			message: 'Fetching databases',
 			clearOnSuccess: true,
 			callback: async () => {
-				return listOrgResources(catalystClient, { type: 'db', orgId: opts?.orgId });
+				return listOrgResources(catalystClient, {
+					type: 'db',
+					orgId: opts?.orgId,
+					sort: opts?.sort,
+					direction: opts?.direction,
+				});
 			},
 		});
 

package/src/cmd/cloud/deploy.ts

@@ -22,6 +22,7 @@ import {
 	stepSkipped,
 	stepError,
 	pauseStepUI,
+	StepInterruptError,
 	type Step,
 	type StepContext,
 } from '../../steps';
@@ -428,6 +429,13 @@ export const deploySubcommand = createSubcommand({
 			}
 		}
 
+		// Create a unified abort controller for the entire deploy flow
+		const deployAbortController = new AbortController();
+		const deployAbortHandler = () => {
+			deployAbortController.abort();
+		};
+		process.on('SIGINT', deployAbortHandler);
+
 		// Start malware check async (runs in parallel with build)
 		if (deployment) {
 			malwareCheckPromise = (async () => {
@@ -444,7 +452,8 @@ export const deploySubcommand = createSubcommand({
 					const result = await projectDeploymentMalwareCheck(
 						catalystClient,
 						deployment!.id,
-						packages
+						packages,
+						deployAbortController.signal
 					);
 					logger.debug(
 						'Malware check complete: action=%s, flagged=%d',
@@ -599,7 +608,7 @@ export const deploySubcommand = createSubcommand({
 
 					{
 						label: 'Build, Verify and Package',
-						run: async () => {
+						run: async (stepCtx: StepContext) => {
 							if (!deployment) {
 								return stepError('deployment was null');
 							}
@@ -636,6 +645,7 @@ export const deploySubcommand = createSubcommand({
 									region: project.region,
 									logger: ctx.logger,
 									deploymentOptions: opts,
+									deploymentConfig: project.deployment,
 									collector,
 								});
 								capturedOutput = [...capturedOutput, ...bundleResult.output];
@@ -643,7 +653,8 @@ export const deploySubcommand = createSubcommand({
 								instructions = await projectDeploymentUpdate(
 									apiClient,
 									deployment.id,
-									build
+									build,
+									stepCtx.signal
 								);
 								return stepSuccess(capturedOutput.length > 0 ? capturedOutput : undefined);
 							} catch (ex) {
@@ -789,6 +800,7 @@ export const deploySubcommand = createSubcommand({
 										'Content-Type': 'application/zip',
 									},
 									body: zipfile,
+									signal: stepCtx.signal,
 								});
 								ctx.logger.trace(`Upload response: ${resp.status}`);
 								if (!resp.ok) {
@@ -876,6 +888,7 @@ export const deploySubcommand = createSubcommand({
 												duplex: 'half',
 												headers,
 												body,
+												signal: stepCtx.signal,
 											})
 										);
 									}
@@ -910,11 +923,15 @@ export const deploySubcommand = createSubcommand({
 					},
 					{
 						label: 'Provision Deployment',
-						run: async () => {
+						run: async (stepCtx: StepContext) => {
 							if (!deployment) {
 								return stepError('deployment was null');
 							}
-							complete = await projectDeploymentComplete(apiClient, deployment.id);
+							complete = await projectDeploymentComplete(
+								apiClient,
+								deployment.id,
+								stepCtx.signal
+							);
 							return stepSuccess();
 						},
 					},
@@ -945,12 +962,7 @@ export const deploySubcommand = createSubcommand({
 			const maxAttempts = 600;
 			let attempts = 0;
 
-			// Create abort controller to allow Ctrl+C to interrupt polling
-			const pollAbortController = new AbortController();
-			const sigintHandler = () => {
-				pollAbortController.abort();
-			};
-			process.on('SIGINT', sigintHandler);
+			// Reuse the deploy abort controller for polling (already aborted on Ctrl+C)
 
 			try {
 				if (streamId) {
@@ -1014,7 +1026,7 @@ export const deploySubcommand = createSubcommand({
 								// Poll for deployment status
 								while (attempts < maxAttempts) {
 									// Check if user pressed Ctrl+C
-									if (pollAbortController.signal.aborted) {
+									if (deployAbortController.signal.aborted) {
 										logStreamController.abort();
 										throw new DeploymentCancelledError();
 									}
@@ -1023,7 +1035,8 @@ export const deploySubcommand = createSubcommand({
 									try {
 										statusResult = await projectDeploymentStatus(
 											apiClient,
-											deployment?.id ?? ''
+											deployment?.id ?? '',
+											deployAbortController.signal
 										);
 
 										logger.trace('status result: %s', statusResult);
@@ -1115,14 +1128,15 @@ export const deploySubcommand = createSubcommand({
 						callback: async () => {
 							while (attempts < maxAttempts) {
 								// Check if user pressed Ctrl+C
-								if (pollAbortController.signal.aborted) {
+								if (deployAbortController.signal.aborted) {
 									throw new DeploymentCancelledError();
 								}
 
 								attempts++;
 								statusResult = await projectDeploymentStatus(
 									apiClient,
-									deployment?.id ?? ''
+									deployment?.id ?? '',
+									deployAbortController.signal
 								);
 
 								if (statusResult.state === 'completed') {
@@ -1172,7 +1186,7 @@ export const deploySubcommand = createSubcommand({
 				tui.fatal('Deployment failed', ErrorCode.BUILD_FAILED);
 			} finally {
 				// Clean up signal handler
-				process.off('SIGINT', sigintHandler);
+				process.off('SIGINT', deployAbortHandler);
 			}
 
 			// Show deployment URLs
@@ -1185,15 +1199,18 @@ export const deploySubcommand = createSubcommand({
 						);
 					}
 				} else {
+					// Prefer vanity URLs, fall back to hash-based
+					const deploymentUrl =
+						complete.publicUrls.vanityDeployment ?? complete.publicUrls.deployment;
+					const latestUrl = complete.publicUrls.vanityProject ?? complete.publicUrls.latest;
 					lines.push(
 						`${tui.ICONS.arrow} ${
-							tui.bold(tui.padRight('Deployment:', 12)) +
-							tui.link(complete.publicUrls.deployment)
+							tui.bold(tui.padRight('Deployment:', 12)) + tui.link(deploymentUrl)
 						}`
 					);
 					lines.push(
 						`${tui.ICONS.arrow} ${
-							tui.bold(tui.padRight('Project:', 12)) + tui.link(complete.publicUrls.latest)
+							tui.bold(tui.padRight('Project:', 12)) + tui.link(latestUrl)
 						}`
 					);
 				}
@@ -1222,20 +1239,28 @@ export const deploySubcommand = createSubcommand({
 				logs,
 				urls: complete?.publicUrls
 					? {
-							deployment: complete.publicUrls.deployment,
-							latest: complete.publicUrls.latest,
+							deployment:
+								complete.publicUrls.vanityDeployment ?? complete.publicUrls.deployment,
+							latest: complete.publicUrls.vanityProject ?? complete.publicUrls.latest,
 							custom: complete.publicUrls.custom,
 							dashboard,
 						}
 					: undefined,
 			};
 		} catch (ex) {
+			// Handle step interruption (Ctrl+C during build steps)
+			if (ex instanceof StepInterruptError) {
+				tui.warning('Deployment cancelled');
+				process.exit(ex.exitCode);
+			}
 			collector.addGeneralError('deploy', String(ex), 'DEPLOY004');
 			if (opts.reportFile) {
 				await collector.forceWrite();
 			}
 			clearGlobalCollector();
 			tui.fatal(`unexpected error trying to deploy project. ${ex}`);
+		} finally {
+			process.off('SIGINT', deployAbortHandler);
 		}
 	},
 });

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

@@ -34,6 +34,14 @@ export const listSubcommand = createCommand({
 			orgId: z.string().optional().describe('filter by organization id'),
 			limit: z.coerce.number().optional().describe('Maximum number of queues to return'),
 			offset: z.coerce.number().optional().describe('Offset for pagination'),
+			sort: z
+				.enum(['name', 'created', 'updated'])
+				.optional()
+				.describe('field to sort by (default: created)'),
+			direction: z
+				.enum(['asc', 'desc'])
+				.optional()
+				.describe('sort direction (default: desc)'),
 		}),
 		response: QueueListResponseSchema,
 	},
@@ -48,6 +56,8 @@ export const listSubcommand = createCommand({
 			{
 				limit: opts.limit,
 				offset: opts.offset,
+				sort: opts.sort,
+				direction: opts.direction,
 			},
 			queueOptions
 		);

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

@@ -75,6 +75,14 @@ export const listSubcommand = createCommand({
 			all: z.boolean().optional().describe('List all sandboxes regardless of project context'),
 			limit: z.number().optional().describe('Maximum number of results (default: 50, max: 100)'),
 			offset: z.number().optional().describe('Pagination offset'),
+			sort: z
+				.enum(['name', 'created', 'updated', 'status'])
+				.optional()
+				.describe('field to sort by (default: created)'),
+			direction: z
+				.enum(['asc', 'desc'])
+				.optional()
+				.describe('sort direction (default: desc)'),
 		}),
 		response: SandboxListResponseSchema,
 	},
@@ -94,6 +102,8 @@ export const listSubcommand = createCommand({
 			status: opts.status,
 			limit: opts.limit,
 			offset: opts.offset,
+			sort: opts.sort,
+			direction: opts.direction,
 		});
 
 		// Check if results span multiple orgs

package/src/cmd/cloud/sandbox/runtime/list.ts

@@ -34,6 +34,14 @@ export const listSubcommand = createCommand({
 			limit: z.number().optional().describe('Maximum number of results'),
 			offset: z.number().optional().describe('Offset for pagination'),
 			orgId: z.string().optional().describe('filter by organization id'),
+			sort: z
+				.enum(['name', 'created'])
+				.optional()
+				.describe('field to sort by (default: created)'),
+			direction: z
+				.enum(['asc', 'desc'])
+				.optional()
+				.describe('sort direction (default: desc)'),
 		}),
 		response: RuntimeListResponseSchema,
 	},
@@ -47,6 +55,8 @@ export const listSubcommand = createCommand({
 			orgId: effectiveOrgId,
 			limit: opts.limit,
 			offset: opts.offset,
+			sort: opts.sort,
+			direction: opts.direction,
 		});
 
 		if (!options.json) {

package/src/cmd/cloud/sandbox/snapshot/list.ts

@@ -47,6 +47,14 @@ export const listSubcommand = createCommand({
 			limit: z.number().optional().describe('Maximum number of results'),
 			offset: z.number().optional().describe('Offset for pagination'),
 			orgId: z.string().optional().describe('filter by organization id'),
+			sort: z
+				.enum(['name', 'created', 'size'])
+				.optional()
+				.describe('field to sort by (default: created)'),
+			direction: z
+				.enum(['asc', 'desc'])
+				.optional()
+				.describe('sort direction (default: desc)'),
 		}),
 		response: SnapshotListResponseSchema,
 	},
@@ -61,6 +69,8 @@ export const listSubcommand = createCommand({
 			limit: opts.limit,
 			offset: opts.offset,
 			orgId: effectiveOrgId,
+			sort: opts.sort,
+			direction: opts.direction,
 		});
 
 		if (!options.json) {

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

@@ -46,10 +46,10 @@ const SessionGetResponseSchema = z.object({
 	pending: z.boolean().describe('Pending'),
 	success: z.boolean().describe('Success'),
 	error: z.string().nullable().describe('Error message'),
-	method: z.string().describe('HTTP method'),
-	url: z.string().describe('Request URL'),
-	route_id: z.string().describe('Route ID'),
-	thread_id: z.string().describe('Thread ID'),
+	method: z.string().nullable().describe('HTTP method'),
+	url: z.string().nullable().describe('Request URL'),
+	route_id: z.string().nullable().describe('Route ID'),
+	thread_id: z.string().nullable().describe('Thread ID'),
 	agents: z
 		.array(
 			z.object({
@@ -148,10 +148,10 @@ export const getSubcommand = createSubcommand({
 				pending: session.pending,
 				success: session.success,
 				error: session.error,
-				method: session.method,
-				url: session.url,
-				route_id: session.route_id,
-				thread_id: session.thread_id,
+				method: session.method ?? null,
+				url: session.url ?? null,
+				route_id: session.route_id ?? null,
+				thread_id: session.thread_id ?? null,
 				agents: enriched.agents,
 				eval_runs: enriched.evalRuns.map((run: EvalRun) => ({
 					id: run.id,
@@ -183,8 +183,8 @@ export const getSubcommand = createSubcommand({
 			if (session.duration != null && session.end_time != null) {
 				tableData['Duration'] = `${(session.duration / 1_000_000).toFixed(0)}ms`;
 			}
-			tableData['Method'] = session.method;
-			tableData['URL'] = tui.link(session.url, session.url);
+			tableData['Method'] = session.method ?? '-';
+			tableData['URL'] = session.url ? tui.link(session.url, session.url) : '-';
 			tableData['Trigger'] = session.trigger;
 			if (session.env !== 'production') {
 				tableData['Environment'] = session.env;
@@ -204,9 +204,9 @@ export const getSubcommand = createSubcommand({
 				tableData['Route'] =
 					`${enriched.route.method.toUpperCase()} ${enriched.route.path} ${tui.muted(`(${enriched.route.id})`)}`;
 			} else {
-				tableData['Route ID'] = session.route_id;
+				tableData['Route ID'] = session.route_id ?? '-';
 			}
-			tableData['Thread ID'] = session.thread_id;
+			tableData['Thread ID'] = session.thread_id ?? '-';
 
 			tui.table([tableData], Object.keys(tableData), { layout: 'vertical', padStart: '  ' });