@agentuity/cli 0.0.109 → 0.0.111

package/src/cmd/dev/index.ts

@@ -371,6 +371,7 @@ export const command = createCommand({
 			// Vite stays running and handles frontend changes via HMR
 			let shouldRestart = false;
 			let gravityProcess: ProcessLike | null = null;
+			let gravityHeartbeatInterval: ReturnType<typeof setInterval> | null = null;
 			let stdinListenerRegistered = false; // Track if stdin listener is already registered
 
 			const restartServer = () => {
@@ -395,6 +396,8 @@ export const command = createCommand({
 			let cleaningUp = false;
 			// Track if shutdown was requested (SIGINT/SIGTERM) to break the main loop
 			let shutdownRequested = false;
+			// Store stdin data handler reference for cleanup
+			let stdinDataHandler: ((data: Buffer | string) => void) | null = null;
 
 			/**
 			 * Centralized cleanup function for all resources.
@@ -425,6 +428,12 @@ export const command = createCommand({
 					logger.debug('Error stopping Bun server during cleanup: %s', err);
 				}
 
+				// Stop gravity heartbeat interval
+				if (gravityHeartbeatInterval) {
+					clearInterval(gravityHeartbeatInterval);
+					gravityHeartbeatInterval = null;
+				}
+
 				// Kill gravity client with SIGTERM first, then SIGKILL as fallback
 				if (gravityProcess) {
 					logger.debug('Killing gravity process...');
@@ -479,6 +488,21 @@ export const command = createCommand({
 				if (!exitAfter) {
 					cleaningUp = false;
 				} else {
+					// Clean up stdin keyboard handler right before exiting
+					// This must happen AFTER all async cleanup to keep event loop alive
+					if (stdinListenerRegistered && process.stdin.isTTY) {
+						try {
+							if (stdinDataHandler) {
+								process.stdin.removeListener('data', stdinDataHandler);
+								stdinDataHandler = null;
+							}
+							process.stdin.setRawMode(false);
+							process.stdin.pause();
+							process.stdin.unref();
+						} catch {
+							// Ignore errors during final cleanup
+						}
+					}
 					logger.debug('Exiting with code %d', exitCode);
 					originalExit(exitCode);
 				}
@@ -497,6 +521,12 @@ export const command = createCommand({
 					logger.debug('Error stopping Bun server for restart: %s', err);
 				}
 
+				// Stop gravity heartbeat interval
+				if (gravityHeartbeatInterval) {
+					clearInterval(gravityHeartbeatInterval);
+					gravityHeartbeatInterval = null;
+				}
+
 				// Kill gravity client
 				if (gravityProcess) {
 					try {
@@ -515,23 +545,37 @@ export const command = createCommand({
 
 			// SIGINT/SIGTERM: coordinate shutdown between bundle and dev resources
 			let signalHandlersRegistered = false;
+			let exitingFromSignal = false;
 			if (!signalHandlersRegistered) {
 				signalHandlersRegistered = true;
 
-				const safeExit = async (code: number, reason?: string) => {
+				const safeExit = (code: number, reason?: string) => {
+					// Prevent multiple signal handlers from racing
+					if (exitingFromSignal) return;
+					exitingFromSignal = true;
+
 					if (reason) {
 						logger.debug('DevMode terminating (%d) due to: %s', code, reason);
 					}
 					shutdownRequested = true;
-					await cleanup(true, code);
+					// Run cleanup and ensure we wait for it to complete before exiting
+					cleanup(true, code).catch((err) => {
+						logger.debug('Cleanup error: %s', err);
+						originalExit(1);
+					});
 				};
 
 				process.on('SIGINT', () => {
-					void safeExit(0, 'SIGINT');
+					safeExit(0, 'SIGINT');
 				});
 
 				process.on('SIGTERM', () => {
-					void safeExit(0, 'SIGTERM');
+					safeExit(0, 'SIGTERM');
+				});
+
+				// Handle SIGHUP (terminal closed) - same as SIGINT
+				process.on('SIGHUP', () => {
+					safeExit(0, 'SIGHUP');
 				});
 
 				// Handle uncaught exceptions - clean up and exit rather than limping on
@@ -553,6 +597,20 @@ export const command = createCommand({
 
 			// Ensure resources are always cleaned up on exit (synchronous fallback)
 			process.on('exit', () => {
+				// Clean up stdin keyboard handler
+				if (stdinListenerRegistered && process.stdin.isTTY) {
+					try {
+						if (stdinDataHandler) {
+							process.stdin.removeListener('data', stdinDataHandler);
+						}
+						process.stdin.setRawMode(false);
+						process.stdin.pause();
+						process.stdin.unref();
+					} catch {
+						// Ignore errors during exit cleanup
+					}
+				}
+
 				// Kill gravity client with SIGKILL for immediate termination
 				if (gravityProcess && gravityProcess.exitCode === null) {
 					try {
@@ -622,7 +680,34 @@ export const command = createCommand({
 								);
 							}
 
-							// Step 2: Generate entry file with workbench config
+							// Step 2: Discover agents and routes for registry generation
+							const srcDir = join(rootDir, 'src');
+							const { discoverAgents } = await import('../build/vite/agent-discovery');
+							const { discoverRoutes } = await import('../build/vite/route-discovery');
+							const { generateAgentRegistry, generateRouteRegistry } = await import(
+								'../build/vite/registry-generator'
+							);
+
+							const agentMetadata = await discoverAgents(
+								srcDir,
+								project?.projectId ?? '',
+								deploymentId,
+								logger
+							);
+							const { routes, routeInfoList } = await discoverRoutes(
+								srcDir,
+								project?.projectId ?? '',
+								deploymentId,
+								logger
+							);
+
+							// Generate agent and route registries for type augmentation
+							// (TypeScript needs these files to exist for proper type inference)
+							generateAgentRegistry(srcDir, agentMetadata);
+							generateRouteRegistry(srcDir, routeInfoList);
+							logger.debug('Agent and route registries generated for dev mode');
+
+							// Step 3: Generate entry file with workbench config
 							// Note: vitePort is NOT passed here - the app reads process.env.VITE_PORT at runtime
 							const { generateEntryFile } = await import('../build/entry-generator');
 							await generateEntryFile({
@@ -634,7 +719,7 @@ export const command = createCommand({
 								workbench: workbenchConfigData.enabled ? workbenchConfigData : undefined,
 							});
 
-							// Step 3: Bundle the app with LLM patches (dev mode = no minification)
+							// Step 4: Bundle the app with LLM patches (dev mode = no minification)
 							// This produces .agentuity/app.js with AI Gateway routing patches applied
 							const { installExternalsAndBuild } = await import(
 								'../build/vite/server-bundler'
@@ -646,14 +731,11 @@ export const command = createCommand({
 							});
 
 							// Generate metadata file (needed for eval ID lookup at runtime)
-							const { discoverAgents } = await import('../build/vite/agent-discovery');
-							const { discoverRoutes } = await import('../build/vite/route-discovery');
+							// Reuse agentMetadata and routes from Step 2
 							const { generateMetadata, writeMetadataFile } = await import(
 								'../build/vite/metadata-generator'
 							);
 
-							const srcDir = join(rootDir, 'src');
-
 							const promises: Promise<void>[] = [];
 
 							// Generate/update prompt files (non-blocking)
@@ -664,25 +746,13 @@ export const command = createCommand({
 										logger.warn('Failed to generate prompt files: %s', err.message)
 									)
 							);
-							const agents = await discoverAgents(
-								srcDir,
-								project?.projectId ?? '',
-								deploymentId,
-								logger
-							);
-							const { routes } = await discoverRoutes(
-								srcDir,
-								project?.projectId ?? '',
-								deploymentId,
-								logger
-							);
 
 							const metadata = await generateMetadata({
 								rootDir,
 								projectId: project?.projectId ?? '',
 								orgId: project?.orgId ?? '',
 								deploymentId,
-								agents,
+								agents: agentMetadata,
 								routes,
 								dev: true,
 								logger,
@@ -786,6 +856,7 @@ export const command = createCommand({
 						process.env.AGENTUITY_STREAM_URL = serviceUrls.stream;
 						process.env.AGENTUITY_CLOUD_ORG_ID = project.orgId;
 						process.env.AGENTUITY_CLOUD_PROJECT_ID = project.projectId;
+						process.env.AGENTUITY_CLOUD_DEPLOYMENT_ID = deploymentId;
 					}
 
 					// Set Vite port for asset proxying in bundled app
@@ -862,6 +933,7 @@ export const command = createCommand({
 								project.projectId,
 								'--token',
 								process.env.AGENTUITY_SDK_KEY!, // set above
+								'--health-check',
 							],
 							{
 								cwd: rootDir,
@@ -881,13 +953,46 @@ export const command = createCommand({
 							});
 						}
 
-						// Log gravity output
+						// Log gravity output and detect heartbeat port
 						(async () => {
 							try {
 								if (gravityProcess?.stdout) {
 									for await (const chunk of gravityProcess.stdout) {
 										const text = new TextDecoder().decode(chunk);
-										logger.debug('[gravity] %s', text.trim());
+										const trimmed = text.trim();
+
+										// Check for heartbeat port announcement
+										const match = trimmed.match(/^HEARTBEAT_PORT=(\d+)$/m);
+										if (match) {
+											const heartbeatPort = parseInt(match[1], 10);
+											logger.debug('Gravity heartbeat port detected: %d', heartbeatPort);
+
+											// Start sending heartbeats every 5 seconds
+											if (!gravityHeartbeatInterval) {
+												const sendHeartbeat = async () => {
+													try {
+														await fetch(
+															`http://127.0.0.1:${heartbeatPort}/heartbeat`,
+															{
+																method: 'POST',
+																signal: AbortSignal.timeout(2000),
+															}
+														);
+														logger.trace('Gravity heartbeat sent');
+													} catch (err) {
+														logger.trace('Gravity heartbeat failed: %s', err);
+													}
+												};
+
+												// Send initial heartbeat immediately
+												sendHeartbeat();
+
+												// Then send every 5 seconds
+												gravityHeartbeatInterval = setInterval(sendHeartbeat, 5000);
+											}
+										} else if (trimmed) {
+											logger.debug('[gravity] %s', trimmed);
+										}
 									}
 								}
 							} catch (err) {
@@ -930,12 +1035,23 @@ export const command = createCommand({
 							console.log(tui.muted('  q') + ' - quit\n');
 						};
 
-						process.stdin.on('data', (data) => {
+						// Store handler reference for cleanup
+						stdinDataHandler = (data) => {
 							const key = data.toString();
 
-							// Handle Ctrl+C - send SIGINT to trigger graceful shutdown
-							if (key === '\u0003') {
-								process.kill(process.pid, 'SIGINT');
+							// Handle Ctrl+C or q - trigger graceful shutdown
+							if (key === '\u0003' || key === 'q') {
+								// Remove stdin listener immediately to prevent re-entrancy
+								if (stdinDataHandler) {
+									process.stdin.removeListener('data', stdinDataHandler);
+									stdinDataHandler = null;
+								}
+								// Set shutdown flag and trigger cleanup directly
+								shutdownRequested = true;
+								cleanup(true, 0).catch((err) => {
+									logger.debug('Cleanup error: %s', err);
+									originalExit(1);
+								});
 								return;
 							}
 
@@ -952,14 +1068,12 @@ export const command = createCommand({
 										centerTitle: false,
 									});
 									break;
-								case 'q':
-									void cleanup(true, 0);
-									break;
 								default:
 									process.stdout.write(data);
 									break;
 							}
-						});
+						};
+						process.stdin.on('data', stdinDataHandler);
 					}
 
 					showWelcome();

package/src/cmd/dev/sync.ts

@@ -15,7 +15,7 @@ interface AgentSyncPayload {
 interface EvalSyncPayload {
 	id: string;
 	name: string;
-	evalId: string;
+	identifier: string;
 	description?: string;
 	version: string;
 	filename: string;
@@ -100,7 +100,7 @@ function getEvalsToSync(
 
 					evalsToCreate.push({
 						...evalItem,
-						evalId: evalItem.evalId,
+						identifier: evalItem.identifier,
 						projectId,
 						agentIdentifier: agent.agentId,
 					});
@@ -133,18 +133,28 @@ class DevmodeSyncService implements IDevmodeSyncService {
 		projectId: string,
 		deploymentId: string
 	): Promise<void> {
+		this.logger.debug(
+			'[CLI SYNC] sync() called with projectId=%s, deploymentId=%s',
+			projectId,
+			deploymentId
+		);
+		this.logger.debug(
+			'[CLI SYNC] currentMetadata has %d agents',
+			currentMetadata.agents?.length ?? 0
+		);
+
 		// Build previous agent IDs set
 		const previousAgentIds = new Set<string>();
 		if (previousMetadata) {
 			this.logger.debug(
-				'Previous metadata found with %d agent(s)',
+				'[CLI SYNC] Previous metadata found with %d agent(s)',
 				previousMetadata.agents?.length ?? 0
 			);
 			for (const agent of previousMetadata.agents || []) {
 				previousAgentIds.add(agent.id);
 			}
 		} else {
-			this.logger.debug('No previous metadata, all agents will be treated as new');
+			this.logger.debug('[CLI SYNC] No previous metadata, all agents will be treated as new');
 		}
 
 		// Build previous eval IDs set
@@ -178,9 +188,10 @@ class DevmodeSyncService implements IDevmodeSyncService {
 				);
 				for (const evalItem of agent.evals) {
 					this.logger.debug(
-						'[CLI EVAL SYNC]   - %s (evalId: %s)',
+						'[CLI EVAL SYNC]   - %s (id: %s, identifier: %s)',
 						evalItem.name,
-						evalItem.evalId
+						evalItem.id,
+						evalItem.identifier
 					);
 				}
 			}
@@ -208,13 +219,11 @@ class DevmodeSyncService implements IDevmodeSyncService {
 				agentsToDelete.length
 			);
 		}
-		if (evalsToCreate.length > 0 || evalsToDelete.length > 0) {
-			this.logger.debug(
-				'Bulk syncing %d eval(s) to create, %d eval(s) to delete',
-				evalsToCreate.length,
-				evalsToDelete.length
-			);
-		}
+		this.logger.debug(
+			'[CLI EVAL SYNC] Evals to sync: %d to create, %d to delete',
+			evalsToCreate.length,
+			evalsToDelete.length
+		);
 
 		// Sync both in parallel
 		try {
@@ -273,14 +282,7 @@ class DevmodeSyncService implements IDevmodeSyncService {
 		evalsToDelete: string[],
 		deploymentId: string
 	): Promise<void> {
-		this.logger.debug(
-			'[CLI EVAL SYNC] syncEvals called: %d to create, %d to delete',
-			evals.length,
-			evalsToDelete.length
-		);
-
 		if (evals.length === 0 && evalsToDelete.length === 0) {
-			this.logger.debug('[CLI EVAL SYNC] No evals to sync, skipping');
 			return;
 		}
 
@@ -290,15 +292,10 @@ class DevmodeSyncService implements IDevmodeSyncService {
 			delete: evalsToDelete,
 		};
 
-		this.logger.debug('[CLI EVAL SYNC] Sending payload to POST /cli/devmode/eval:');
-		for (const evalItem of evals) {
-			this.logger.debug(
-				'[CLI EVAL SYNC]   - %s (id: %s, evalId: %s)',
-				evalItem.name,
-				evalItem.id,
-				evalItem.evalId
-			);
-		}
+		this.logger.debug(
+			'[CLI EVAL SYNC] Sending payload to POST /cli/devmode/eval: %s',
+			JSON.stringify(payload, null, 2)
+		);
 
 		try {
 			await this.apiClient.post(
@@ -306,7 +303,6 @@ class DevmodeSyncService implements IDevmodeSyncService {
 				payload,
 				z.object({ success: z.boolean() })
 			);
-			this.logger.debug('[CLI EVAL SYNC] Sync successful');
 		} catch (error) {
 			this.logger.error('[CLI EVAL SYNC] Sync failed: %s', error);
 			throw error;