@agentuity/cli 0.0.107 → 0.0.108

package/src/cmd/dev/index.ts

@@ -14,6 +14,7 @@ import { createDevmodeSyncService } from './sync';
 import { getDevmodeDeploymentId } from '../build/ast';
 import { getDefaultConfigDir, saveConfig, loadProjectSDKKey } from '../../config';
 import type { Config } from '../../types';
+import { typecheck } from '../build/typecheck';
 import { createFileWatcher } from './file-watcher';
 import { regenerateSkillsAsync } from './skills';
 import { prepareDevLock, releaseLockSync } from './dev-lock';
@@ -65,6 +66,8 @@ async function killLingeringGravityProcesses(logger: {
 			logger.debug('Killed lingering gravity processes from previous session');
 			// Brief pause to let processes fully terminate
 			await new Promise((resolve) => setTimeout(resolve, 100));
+		} else if (result.exitCode === 1) {
+			logger.debug('no lingering gravity processes found');
 		}
 	} catch {
 		// pkill not available or failed - not critical, continue
@@ -211,760 +214,813 @@ export const command = createCommand({
 		// This is a fallback for cases where the lockfile was corrupted
 		await killLingeringGravityProcesses(logger);
 
-		// Setup devmode and gravity (if using public URL)
-		const useMockService = process.env.DEVMODE_SYNC_SERVICE_MOCK === 'true';
-		const apiClient = auth ? new APIClient(getAPIBaseURL(config), logger, config) : null;
-		const syncService = apiClient
-			? createDevmodeSyncService({
-					logger,
-					apiClient,
-					mock: useMockService,
-				})
-			: null;
-
-		// Track previous metadata for sync diffing
-		let previousMetadata:
-			| Awaited<ReturnType<typeof import('../build/vite/metadata-generator').generateMetadata>>
-			| undefined;
-
-		let devmode: DevmodeResponse | undefined;
-		let gravityBin: string | undefined;
-		let gravityURL: string | undefined;
-		let appURL: string | undefined;
-
-		if (auth && project && opts.public) {
-			// Generate devmode endpoint for public URL
-			const endpoint = await tui.spinner({
-				message: 'Connecting to Gravity',
-				callback: () => {
-					return generateEndpoint(apiClient!, project.projectId, config?.devmode?.hostname);
-				},
-				clearOnSuccess: true,
-			});
-
-			const _config = { ...config } as Config;
-			_config.devmode = {
-				hostname: endpoint.hostname,
-			};
-			await saveConfig(_config);
-			config = _config;
-			devmode = endpoint;
-			gravityURL = getGravityDevModeURL(project.region, config);
-			appURL = `${getAppBaseURL(config)}/r/${project.projectId}`;
-
-			// Download gravity client
-			const configDir = getDefaultConfigDir();
-			const gravityDir = join(configDir, 'gravity');
-			let mustCheck = true;
-
-			if (
-				config?.gravity?.version &&
-				existsSync(join(gravityDir, config.gravity.version, 'gravity')) &&
-				config?.gravity?.checked
-			) {
-				if (Date.now() - config.gravity.checked < 3.6e6) {
-					mustCheck = false;
-					gravityBin = join(gravityDir, config.gravity.version, 'gravity');
-				}
-			}
+		try {
+			// Setup devmode and gravity (if using public URL)
+			const useMockService = process.env.DEVMODE_SYNC_SERVICE_MOCK === 'true';
+			const apiClient = auth ? new APIClient(getAPIBaseURL(config), logger, config) : null;
+			const syncService = apiClient
+				? createDevmodeSyncService({
+						logger,
+						apiClient,
+						mock: useMockService,
+					})
+				: null;
+
+			// Track previous metadata for sync diffing
+			let previousMetadata:
+				| Awaited<
+						ReturnType<typeof import('../build/vite/metadata-generator').generateMetadata>
+				  >
+				| undefined;
+
+			let devmode: DevmodeResponse | undefined;
+			let gravityBin: string | undefined;
+			let gravityURL: string | undefined;
+			let appURL: string | undefined;
+
+			if (auth && project && opts.public) {
+				// Generate devmode endpoint for public URL
+				const endpoint = await tui.spinner({
+					message: 'Connecting to Gravity',
+					callback: () => {
+						return generateEndpoint(apiClient!, project.projectId, config?.devmode?.hostname);
+					},
+					clearOnSuccess: true,
+				});
 
-			if (mustCheck) {
-				const res = await download(gravityDir);
-				gravityBin = res.filename;
 				const _config = { ...config } as Config;
-				_config.gravity = {
-					checked: Date.now(),
-					version: res.version,
+				_config.devmode = {
+					hostname: endpoint.hostname,
 				};
 				await saveConfig(_config);
 				config = _config;
-			}
-		}
+				devmode = endpoint;
+				gravityURL = getGravityDevModeURL(project.region, config);
+				appURL = `${getAppBaseURL(config)}/r/${project.projectId}`;
 
-		// Get workbench info from config (new Vite approach)
-		const { loadAgentuityConfig, getWorkbenchConfig } = await import(
-			'../build/vite/config-loader'
-		);
-		const agentuityConfig = await loadAgentuityConfig(rootDir, ctx.logger);
-		const workbenchConfigData = getWorkbenchConfig(agentuityConfig, true); // dev mode
-		const workbench = {
-			hasWorkbench: workbenchConfigData.enabled,
-			config: workbenchConfigData.enabled
-				? { route: workbenchConfigData.route, headers: workbenchConfigData.headers }
-				: null,
-		};
-
-		const deploymentId = getDevmodeDeploymentId(project?.projectId ?? '', devmode?.id ?? '');
-
-		// Calculate URLs for banner
-		const padding = 12;
-		const workbenchUrl =
-			auth && project?.projectId
-				? `${getAppBaseURL(config)}/w/${project.projectId}`
-				: `http://127.0.0.1:${opts.port}${workbench.config?.route ?? '/workbench'}`;
-
-		const devmodebody =
-			tui.muted(tui.padRight('Local:', padding)) +
-			tui.link(`http://127.0.0.1:${opts.port}`) +
-			'\n' +
-			tui.muted(tui.padRight('Public:', padding)) +
-			(devmode?.hostname ? tui.link(`https://${devmode.hostname}`) : tui.warn('Disabled')) +
-			'\n' +
-			tui.muted(tui.padRight('Workbench:', padding)) +
-			(workbench.hasWorkbench ? tui.link(workbenchUrl) : tui.warn('Disabled')) +
-			'\n' +
-			tui.muted(tui.padRight('Dashboard:', padding)) +
-			(appURL ? tui.link(appURL) : tui.warn('Disabled')) +
-			'\n' +
-			(interactive
-				? '\n' + tui.muted('Press ') + tui.bold('h') + tui.muted(' for keyboard shortcuts')
-				: '');
-
-		tui.banner('⨺ Agentuity DevMode', devmodebody, {
-			padding: 2,
-			topSpacer: false,
-			bottomSpacer: false,
-			centerTitle: false,
-		});
-
-		// eslint-disable-next-line @typescript-eslint/no-explicit-any
-		const cliVersion = ((global as any).__CLI_SCHEMA__?.version as string) ?? '';
-		if (cliVersion) {
-			regenerateSkillsAsync(rootDir, cliVersion, logger).catch(() => {});
-		}
+				// Download gravity client
+				const configDir = getDefaultConfigDir();
+				const gravityDir = join(configDir, 'gravity');
+				let mustCheck = true;
 
-		// Start Vite asset server ONCE before restart loop
-		// Vite handles frontend HMR independently and stays running across backend restarts
-		let viteServer: ServerLike | null = null;
-		let vitePort: number;
-
-		try {
-			logger.debug('Starting Vite asset server...');
-			const viteResult = await startViteAssetServer({
-				rootDir,
-				logger,
-				workbenchPath: workbench.config?.route,
-			});
-			viteServer = viteResult.server;
-			vitePort = viteResult.port;
+				if (
+					config?.gravity?.version &&
+					existsSync(join(gravityDir, config.gravity.version, 'gravity')) &&
+					config?.gravity?.checked
+				) {
+					if (Date.now() - config.gravity.checked < 3.6e6) {
+						mustCheck = false;
+						gravityBin = join(gravityDir, config.gravity.version, 'gravity');
+					}
+				}
 
-			// Update dev lock with actual Vite port
-			await devLock.updatePorts({ vite: vitePort });
+				if (mustCheck) {
+					const res = await download(gravityDir);
+					gravityBin = res.filename;
+					const _config = { ...config } as Config;
+					_config.gravity = {
+						checked: Date.now(),
+						version: res.version,
+					};
+					await saveConfig(_config);
+					config = _config;
+				}
+			}
 
-			logger.debug(
-				`Vite asset server running on port ${vitePort} (stays running across backend restarts)`
+			// Get workbench info from config (new Vite approach)
+			const { loadAgentuityConfig, getWorkbenchConfig } = await import(
+				'../build/vite/config-loader'
 			);
-		} catch (error) {
-			tui.error(`Failed to start Vite asset server: ${error}`);
-			await devLock.release();
-			originalExit(1);
-			return;
-		}
+			const agentuityConfig = await loadAgentuityConfig(rootDir, ctx.logger);
+			const workbenchConfigData = getWorkbenchConfig(agentuityConfig, true); // dev mode
+			const workbench = {
+				hasWorkbench: workbenchConfigData.enabled,
+				config: workbenchConfigData.enabled
+					? { route: workbenchConfigData.route, headers: workbenchConfigData.headers }
+					: null,
+			};
 
-		// Restart loop - allows BACKEND server to restart on file changes
-		// Vite stays running and handles frontend changes via HMR
-		let shouldRestart = false;
-		let gravityProcess: ProcessLike | null = null;
-		let stdinListenerRegistered = false; // Track if stdin listener is already registered
-
-		const restartServer = () => {
-			shouldRestart = true;
-		};
-
-		const showWelcome = () => {
-			logger.info('DevMode ready 🚀');
-		};
-
-		// Create file watcher for backend hot reload
-		const fileWatcher = createFileWatcher({
-			rootDir,
-			logger,
-			onRestart: restartServer,
-		});
+			const deploymentId = getDevmodeDeploymentId(project?.projectId ?? '', devmode?.id ?? '');
+
+			// Calculate URLs for banner
+			const padding = 12;
+			const workbenchUrl =
+				auth && project?.projectId
+					? `${getAppBaseURL(config)}/w/${project.projectId}`
+					: `http://127.0.0.1:${opts.port}${workbench.config?.route ?? '/workbench'}`;
+
+			const devmodebody =
+				tui.muted(tui.padRight('Local:', padding)) +
+				tui.link(`http://127.0.0.1:${opts.port}`) +
+				'\n' +
+				tui.muted(tui.padRight('Public:', padding)) +
+				(devmode?.hostname ? tui.link(`https://${devmode.hostname}`) : tui.warn('Disabled')) +
+				'\n' +
+				tui.muted(tui.padRight('Workbench:', padding)) +
+				(workbench.hasWorkbench ? tui.link(workbenchUrl) : tui.warn('Disabled')) +
+				'\n' +
+				tui.muted(tui.padRight('Dashboard:', padding)) +
+				(appURL ? tui.link(appURL) : tui.warn('Disabled')) +
+				'\n' +
+				(interactive
+					? '\n' + tui.muted('Press ') + tui.bold('h') + tui.muted(' for keyboard shortcuts')
+					: '');
+
+			tui.banner('⨺ Agentuity DevMode', devmodebody, {
+				padding: 2,
+				topSpacer: false,
+				bottomSpacer: false,
+				centerTitle: false,
+			});
 
-		// Start file watcher (will be paused during builds)
-		fileWatcher.start();
-
-		// Track if cleanup is in progress to avoid duplicate cleanup
-		let cleaningUp = false;
-		// Track if shutdown was requested (SIGINT/SIGTERM) to break the main loop
-		let shutdownRequested = false;
-
-		/**
-		 * Centralized cleanup function for all resources.
-		 * Called on restart, shutdown, and fatal errors.
-		 * @param exitAfter - If true, exit the process after cleanup
-		 * @param exitCode - Exit code to use if exitAfter is true
-		 * @param silent - If true, don't show "Shutting down" message
-		 */
-		const cleanup = async (exitAfter = false, exitCode = 0, silent = false) => {
-			if (cleaningUp) return;
-			cleaningUp = true;
-
-			if (!silent) {
-				tui.info('Shutting down...');
+			// eslint-disable-next-line @typescript-eslint/no-explicit-any
+			const cliVersion = ((global as any).__CLI_SCHEMA__?.version as string) ?? '';
+			if (cliVersion) {
+				regenerateSkillsAsync(rootDir, cliVersion, logger).catch(() => {});
 			}
 
-			// Stop file watcher first to prevent restart triggers during cleanup
-			try {
-				fileWatcher.stop();
-			} catch (err) {
-				logger.debug('Error stopping file watcher: %s', err);
-			}
+			// Start Vite asset server ONCE before restart loop
+			// Vite handles frontend HMR independently and stays running across backend restarts
+			let viteServer: ServerLike | null = null;
+			let vitePort: number;
 
-			// Stop Bun server
 			try {
-				await stopBunServer(opts.port, logger);
-			} catch (err) {
-				logger.debug('Error stopping Bun server during cleanup: %s', err);
+				logger.debug('Starting Vite asset server...');
+				const viteResult = await startViteAssetServer({
+					rootDir,
+					logger,
+					workbenchPath: workbench.config?.route,
+				});
+				viteServer = viteResult.server;
+				vitePort = viteResult.port;
+
+				// Update dev lock with actual Vite port
+				await devLock.updatePorts({ vite: vitePort });
+
+				logger.debug(
+					`Vite asset server running on port ${vitePort} (stays running across backend restarts)`
+				);
+			} catch (error) {
+				tui.error(`Failed to start Vite asset server: ${error}`);
+				await devLock.release();
+				originalExit(1);
+				return;
 			}
 
-			// Kill gravity client with SIGTERM first, then SIGKILL as fallback
-			if (gravityProcess) {
-				logger.debug('Killing gravity process...');
+			// Restart loop - allows BACKEND server to restart on file changes
+			// Vite stays running and handles frontend changes via HMR
+			let shouldRestart = false;
+			let gravityProcess: ProcessLike | null = null;
+			let stdinListenerRegistered = false; // Track if stdin listener is already registered
+
+			const restartServer = () => {
+				shouldRestart = true;
+			};
+
+			const showWelcome = () => {
+				logger.info('DevMode ready 🚀');
+			};
+
+			// Create file watcher for backend hot reload
+			const fileWatcher = createFileWatcher({
+				rootDir,
+				logger,
+				onRestart: restartServer,
+			});
+
+			// Start file watcher (will be paused during builds)
+			fileWatcher.start();
+
+			// Track if cleanup is in progress to avoid duplicate cleanup
+			let cleaningUp = false;
+			// Track if shutdown was requested (SIGINT/SIGTERM) to break the main loop
+			let shutdownRequested = false;
+
+			/**
+			 * Centralized cleanup function for all resources.
+			 * Called on restart, shutdown, and fatal errors.
+			 * @param exitAfter - If true, exit the process after cleanup
+			 * @param exitCode - Exit code to use if exitAfter is true
+			 * @param silent - If true, don't show "Shutting down" message
+			 */
+			const cleanup = async (exitAfter = false, exitCode = 0, silent = false) => {
+				if (cleaningUp) return;
+				cleaningUp = true;
+
+				if (!silent) {
+					tui.info('Shutting down...');
+				}
+
+				// Stop file watcher first to prevent restart triggers during cleanup
 				try {
-					gravityProcess.kill('SIGTERM');
-					// Give it a moment to gracefully shutdown
-					await new Promise((resolve) => setTimeout(resolve, 150));
-					if (gravityProcess.exitCode === null) {
-						gravityProcess.kill('SIGKILL');
-					}
-					logger.debug('Gravity process killed');
+					fileWatcher.stop();
 				} catch (err) {
-					logger.debug('Error killing gravity process: %s', err);
-				} finally {
-					gravityProcess = null;
+					logger.debug('Error stopping file watcher: %s', err);
 				}
-			}
 
-			// Close Vite asset server with timeout to prevent hanging
-			if (viteServer) {
-				logger.debug('Closing Vite server...');
+				// Stop Bun server
 				try {
-					// Use Promise.race with timeout to prevent hanging
-					const closePromise = viteServer.close();
-					const timeoutPromise = new Promise<void>((resolve) => {
-						setTimeout(() => {
-							logger.debug('Vite server close timed out, continuing...');
-							resolve();
-						}, 2000);
-					});
-					await Promise.race([closePromise, timeoutPromise]);
-					logger.debug('Vite server closed');
+					await stopBunServer(opts.port, logger);
 				} catch (err) {
-					logger.debug('Error closing Vite server: %s', err);
-				} finally {
-					viteServer = null;
+					logger.debug('Error stopping Bun server during cleanup: %s', err);
 				}
-			}
 
-			// Release the dev lockfile
-			logger.debug('Releasing dev lock...');
-			try {
-				await devLock.release();
-				logger.debug('Dev lock released');
-			} catch (err) {
-				logger.debug('Error releasing dev lock: %s', err);
-			}
+				// Kill gravity client with SIGTERM first, then SIGKILL as fallback
+				if (gravityProcess) {
+					logger.debug('Killing gravity process...');
+					try {
+						gravityProcess.kill('SIGTERM');
+						// Give it a moment to gracefully shutdown
+						await new Promise((resolve) => setTimeout(resolve, 150));
+						if (gravityProcess.exitCode === null) {
+							gravityProcess.kill('SIGKILL');
+						}
+						logger.debug('Gravity process killed');
+					} catch (err) {
+						logger.debug('Error killing gravity process: %s', err);
+					} finally {
+						gravityProcess = null;
+					}
+				}
 
-			// Reset cleanup flag if not exiting (allows restart)
-			if (!exitAfter) {
-				cleaningUp = false;
-			} else {
-				logger.debug('Exiting with code %d', exitCode);
-				originalExit(exitCode);
-			}
-		};
+				// Close Vite asset server with timeout to prevent hanging
+				if (viteServer) {
+					logger.debug('Closing Vite server...');
+					try {
+						// Use Promise.race with timeout to prevent hanging
+						const closePromise = viteServer.close();
+						const timeoutPromise = new Promise<void>((resolve) => {
+							setTimeout(() => {
+								logger.debug('Vite server close timed out, continuing...');
+								resolve();
+							}, 2000);
+						});
+						await Promise.race([closePromise, timeoutPromise]);
+						logger.debug('Vite server closed');
+					} catch (err) {
+						logger.debug('Error closing Vite server: %s', err);
+					} finally {
+						viteServer = null;
+					}
+				}
 
-		/**
-		 * Cleanup for restart: stops Bun server and Gravity, keeps Vite running
-		 */
-		const cleanupForRestart = async () => {
-			logger.debug('Cleaning up for restart...');
+				// Release the dev lockfile
+				logger.debug('Releasing dev lock...');
+				try {
+					await devLock.release();
+					logger.debug('Dev lock released');
+				} catch (err) {
+					logger.debug('Error releasing dev lock: %s', err);
+				}
 
-			// Stop Bun server
-			try {
-				await stopBunServer(opts.port, logger);
-			} catch (err) {
-				logger.debug('Error stopping Bun server for restart: %s', err);
-			}
+				await killLingeringGravityProcesses(logger);
 
-			// Kill gravity client
-			if (gravityProcess) {
+				// Reset cleanup flag if not exiting (allows restart)
+				if (!exitAfter) {
+					cleaningUp = false;
+				} else {
+					logger.debug('Exiting with code %d', exitCode);
+					originalExit(exitCode);
+				}
+			};
+
+			/**
+			 * Cleanup for restart: stops Bun server and Gravity, keeps Vite running
+			 */
+			const cleanupForRestart = async () => {
+				logger.debug('Cleaning up for restart...');
+
+				// Stop Bun server
 				try {
-					gravityProcess.kill('SIGTERM');
-					await new Promise((resolve) => setTimeout(resolve, 150));
-					if (gravityProcess.exitCode === null) {
-						gravityProcess.kill('SIGKILL');
-					}
+					await stopBunServer(opts.port, logger);
 				} catch (err) {
-					logger.debug('Error killing gravity process for restart: %s', err);
-				} finally {
-					gravityProcess = null;
+					logger.debug('Error stopping Bun server for restart: %s', err);
 				}
-			}
-		};
-
-		// SIGINT/SIGTERM: coordinate shutdown between bundle and dev resources
-		let signalHandlersRegistered = false;
-		if (!signalHandlersRegistered) {
-			signalHandlersRegistered = true;
 
-			const safeExit = async (code: number, reason?: string) => {
-				if (reason) {
-					logger.debug('DevMode terminating (%d) due to: %s', code, reason);
+				// Kill gravity client
+				if (gravityProcess) {
+					try {
+						gravityProcess.kill('SIGTERM');
+						await new Promise((resolve) => setTimeout(resolve, 150));
+						if (gravityProcess.exitCode === null) {
+							gravityProcess.kill('SIGKILL');
+						}
+					} catch (err) {
+						logger.debug('Error killing gravity process for restart: %s', err);
+					} finally {
+						gravityProcess = null;
+					}
 				}
-				shutdownRequested = true;
-				await cleanup(true, code);
 			};
 
-			process.on('SIGINT', () => {
-				void safeExit(0, 'SIGINT');
-			});
+			// SIGINT/SIGTERM: coordinate shutdown between bundle and dev resources
+			let signalHandlersRegistered = false;
+			if (!signalHandlersRegistered) {
+				signalHandlersRegistered = true;
 
-			process.on('SIGTERM', () => {
-				void safeExit(0, 'SIGTERM');
-			});
+				const safeExit = async (code: number, reason?: string) => {
+					if (reason) {
+						logger.debug('DevMode terminating (%d) due to: %s', code, reason);
+					}
+					shutdownRequested = true;
+					await cleanup(true, code);
+				};
 
-			// Handle uncaught exceptions - clean up and exit rather than limping on
-			process.on('uncaughtException', (err) => {
-				tui.error(
-					`Uncaught exception: ${err instanceof Error ? (err.stack ?? err.message) : String(err)}`
-				);
-				void safeExit(1, 'uncaughtException');
-			});
+				process.on('SIGINT', () => {
+					void safeExit(0, 'SIGINT');
+				});
 
-			// Handle unhandled rejections - log but don't exit (usually recoverable)
-			process.on('unhandledRejection', (reason) => {
-				logger.warn(
-					'Unhandled promise rejection: %s',
-					reason instanceof Error ? (reason.stack ?? reason.message) : String(reason)
-				);
-			});
-		}
+				process.on('SIGTERM', () => {
+					void safeExit(0, 'SIGTERM');
+				});
 
-		// Ensure resources are always cleaned up on exit (synchronous fallback)
-		process.on('exit', () => {
-			// Kill gravity client with SIGKILL for immediate termination
-			if (gravityProcess && gravityProcess.exitCode === null) {
-				try {
-					gravityProcess.kill('SIGKILL');
-				} catch {
-					// Ignore errors during exit cleanup
-				}
+				// Handle uncaught exceptions - clean up and exit rather than limping on
+				process.on('uncaughtException', (err) => {
+					tui.error(
+						`Uncaught exception: ${err instanceof Error ? (err.stack ?? err.message) : String(err)}`
+					);
+					void safeExit(1, 'uncaughtException');
+				});
+
+				// Handle unhandled rejections - log but don't exit (usually recoverable)
+				process.on('unhandledRejection', (reason) => {
+					logger.warn(
+						'Unhandled promise rejection: %s',
+						reason instanceof Error ? (reason.stack ?? reason.message) : String(reason)
+					);
+				});
 			}
 
-			// Close Vite server synchronously if possible
-			if (viteServer) {
-				try {
-					viteServer.close();
-				} catch {
-					// Ignore errors during exit cleanup
+			// Ensure resources are always cleaned up on exit (synchronous fallback)
+			process.on('exit', () => {
+				// Kill gravity client with SIGKILL for immediate termination
+				if (gravityProcess && gravityProcess.exitCode === null) {
+					try {
+						gravityProcess.kill('SIGKILL');
+					} catch {
+						// Ignore errors during exit cleanup
+					}
 				}
-			}
 
-			// Stop Bun server synchronously (best effort)
-			// eslint-disable-next-line @typescript-eslint/no-explicit-any
-			const server = (globalThis as any).__AGENTUITY_SERVER__;
-			if (server?.stop) {
-				try {
-					server.stop(true);
-				} catch {
-					// Ignore errors during exit cleanup
+				// Close Vite server synchronously if possible
+				if (viteServer) {
+					try {
+						viteServer.close();
+					} catch {
+						// Ignore errors during exit cleanup
+					}
 				}
-			}
 
-			// Release the dev lockfile synchronously
-			releaseLockSync(rootDir);
-		});
+				// Stop Bun server synchronously (best effort)
+				// eslint-disable-next-line @typescript-eslint/no-explicit-any
+				const server = (globalThis as any).__AGENTUITY_SERVER__;
+				if (server?.stop) {
+					try {
+						server.stop(true);
+					} catch {
+						// Ignore errors during exit cleanup
+					}
+				}
 
-		while (!shutdownRequested) {
-			shouldRestart = false;
+				// Release the dev lockfile synchronously
+				releaseLockSync(rootDir);
+			});
 
-			// Pause file watcher during build to avoid loops
-			fileWatcher.pause();
+			while (!shutdownRequested) {
+				shouldRestart = false;
 
-			try {
-				// Generate entry file and bundle for dev server (with LLM patches)
-				await tui.spinner({
-					message: 'Building dev bundle',
-					callback: async () => {
-						// Step 1: Generate workbench files if enabled (must be done before entry generation)
-						if (workbenchConfigData.enabled) {
-							logger.debug('Workbench enabled, generating source files before bundle...');
-							const { generateWorkbenchFiles } = await import(
-								'../build/vite/workbench-generator'
-							);
-							await generateWorkbenchFiles(
-								rootDir,
-								project?.projectId ?? '',
-								workbenchConfigData,
-								logger
-							);
-						}
+				// Pause file watcher during build to avoid loops
+				fileWatcher.pause();
 
-						// Step 2: 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({
-							rootDir,
-							projectId: project?.projectId ?? '',
-							deploymentId,
-							logger,
-							mode: 'dev',
-							workbench: workbenchConfigData.enabled ? workbenchConfigData : undefined,
-						});
+				try {
+					let typeCheckErrors: string | undefined;
+
+					// Generate entry file and bundle for dev server (with LLM patches)
+					await tui.spinner({
+						message: 'Building dev bundle',
+						callback: async () => {
+							// Step 0: typecheck
+							typeCheckErrors = undefined;
+
+							const typeResult = await typecheck(rootDir);
+							if (!typeResult.success) {
+								typeCheckErrors = typeResult.output;
+								return;
+							}
 
-						// Step 3: 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');
-						await installExternalsAndBuild({
-							rootDir,
-							dev: true, // DevMode: no minification, inline sourcemaps
-							logger,
-						});
+							// Step 1: Generate workbench files if enabled (must be done before entry generation)
+							if (workbenchConfigData.enabled) {
+								logger.debug('Workbench enabled, generating source files before bundle...');
+								const { generateWorkbenchFiles } = await import(
+									'../build/vite/workbench-generator'
+								);
+								await generateWorkbenchFiles(
+									rootDir,
+									project?.projectId ?? '',
+									workbenchConfigData,
+									logger
+								);
+							}
 
-						// 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');
-						const { generateMetadata, writeMetadataFile } = await import(
-							'../build/vite/metadata-generator'
-						);
+							// Step 2: 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({
+								rootDir,
+								projectId: project?.projectId ?? '',
+								deploymentId,
+								logger,
+								mode: 'dev',
+								workbench: workbenchConfigData.enabled ? workbenchConfigData : undefined,
+							});
+
+							// Step 3: 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'
+							);
+							await installExternalsAndBuild({
+								rootDir,
+								dev: true, // DevMode: no minification, inline sourcemaps
+								logger,
+							});
+
+							// 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');
+							const { generateMetadata, writeMetadataFile } = await import(
+								'../build/vite/metadata-generator'
+							);
 
-						const srcDir = join(rootDir, 'src');
+							const srcDir = join(rootDir, 'src');
 
-						const promises: Promise<void>[] = [];
+							const promises: Promise<void>[] = [];
 
-						// Generate/update prompt files (non-blocking)
-						promises.push(
-							import('../build/vite/prompt-generator')
-								.then(({ generatePromptFiles }) => generatePromptFiles(srcDir, logger))
-								.catch((err) =>
-									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
-						);
+							// Generate/update prompt files (non-blocking)
+							promises.push(
+								import('../build/vite/prompt-generator')
+									.then(({ generatePromptFiles }) => generatePromptFiles(srcDir, logger))
+									.catch((err) =>
+										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,
-							routes,
-							dev: true,
-							logger,
-						});
+							const metadata = await generateMetadata({
+								rootDir,
+								projectId: project?.projectId ?? '',
+								orgId: project?.orgId ?? '',
+								deploymentId,
+								agents,
+								routes,
+								dev: true,
+								logger,
+							});
+
+							writeMetadataFile(rootDir, metadata, true, logger);
+
+							// Sync metadata with backend (creates agents and evals in the database)
+							if (syncService && project?.projectId) {
+								promises.push(
+									syncService.sync(
+										metadata,
+										previousMetadata,
+										project.projectId,
+										deploymentId
+									)
+								);
+								previousMetadata = metadata;
+							}
+							await Promise.all(promises);
+						},
+						clearOnSuccess: true,
+					});
 
-						writeMetadataFile(rootDir, metadata, true, logger);
+					if (typeCheckErrors) {
+						console.log('');
+						console.log(typeCheckErrors);
+						console.log('');
+						fileWatcher.resume();
+						// wait for a file change or shutdown to trigger a recompile
+						while (true) {
+							if (shutdownRequested) {
+								return;
+							}
+							if (shouldRestart) {
+								break;
+							}
+							await tui.spinner({
+								message: 'Waiting for changes...',
+								clearOnSuccess: true,
+								callback: () => Bun.sleep(1000),
+							});
+						}
+					}
+				} catch (error) {
+					tui.error(`Failed to build dev bundle: ${error}`);
+					tui.warn('Waiting for file changes to retry...');
+
+					// Resume watcher to detect changes for retry
+					fileWatcher.resume();
+
+					// Wait for next restart trigger
+					await new Promise<void>((resolve) => {
+						const checkRestart = setInterval(() => {
+							if (shouldRestart) {
+								clearInterval(checkRestart);
+								resolve();
+							}
+						}, 100);
+					});
+					continue;
+				}
 
-						// Sync metadata with backend (creates agents and evals in the database)
-						if (syncService && project?.projectId) {
-							promises.push(
-								syncService.sync(
-									metadata,
-									previousMetadata,
-									project.projectId,
-									deploymentId
-								)
+				try {
+					// Set environment variables for LLM provider patches BEFORE starting server
+					// These must be set so the bundled patches can route LLM calls through AI Gateway
+					const serviceUrls = getServiceUrls(project?.region);
+
+					// Load SDK key from project .env files for AI Gateway routing
+					// This must be set so the bundled AI SDK patches can inject the API key
+					if (!process.env.AGENTUITY_SDK_KEY) {
+						const sdkKey = await loadProjectSDKKey(logger, rootDir);
+						if (sdkKey) {
+							process.env.AGENTUITY_SDK_KEY = sdkKey;
+						} else if (project) {
+							tui.warn(
+								'AGENTUITY_SDK_KEY not found in .env file. Numerous features will be unavailable.'
+							);
+							tui.bullet(
+								`Run "${getCommand('cloud env pull')}" to sync your SDK key, or add AGENTUITY_SDK_KEY to your .env file.`
 							);
-							previousMetadata = metadata;
-						}
-						await Promise.all(promises);
-					},
-					clearOnSuccess: true,
-				});
-			} catch (error) {
-				tui.error(`Failed to build dev bundle: ${error}`);
-				tui.warn('Waiting for file changes to retry...');
-
-				// Resume watcher to detect changes for retry
-				fileWatcher.resume();
-
-				// Wait for next restart trigger
-				await new Promise<void>((resolve) => {
-					const checkRestart = setInterval(() => {
-						if (shouldRestart) {
-							clearInterval(checkRestart);
-							resolve();
 						}
-					}, 100);
-				});
-				continue;
-			}
-
-			try {
-				// Set environment variables for LLM provider patches BEFORE starting server
-				// These must be set so the bundled patches can route LLM calls through AI Gateway
-				const serviceUrls = getServiceUrls(project?.region);
-
-				// Load SDK key from project .env files for AI Gateway routing
-				// This must be set so the bundled AI SDK patches can inject the API key
-				if (!process.env.AGENTUITY_SDK_KEY) {
-					const sdkKey = await loadProjectSDKKey(logger, rootDir);
-					if (sdkKey) {
-						process.env.AGENTUITY_SDK_KEY = sdkKey;
-					} else if (project) {
-						tui.warn(
-							'AGENTUITY_SDK_KEY not found in .env file. Numerous features will be unavailable.'
-						);
-						tui.bullet(
-							`Run "${getCommand('cloud env pull')}" to sync your SDK key, or add AGENTUITY_SDK_KEY to your .env file.`
-						);
 					}
-				}
 
-				process.env.AGENTUITY_SDK_DEV_MODE = 'true';
-				process.env.AGENTUITY_ENV = 'development';
-				process.env.NODE_ENV = 'development';
-				if (project?.region) {
-					process.env.AGENTUITY_REGION = project.region;
-				}
-				process.env.PORT = String(opts.port);
-				process.env.AGENTUITY_PORT = process.env.PORT;
-
-				if (project) {
-					process.env.AGENTUITY_TRANSPORT_URL = serviceUrls.catalyst;
-					process.env.AGENTUITY_CATALYST_URL = serviceUrls.catalyst;
-					process.env.AGENTUITY_VECTOR_URL = serviceUrls.vector;
-					process.env.AGENTUITY_KEYVALUE_URL = serviceUrls.keyvalue;
-					process.env.AGENTUITY_SANDBOX_URL = serviceUrls.sandbox;
-					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_SDK_DEV_MODE = 'true';
+					process.env.AGENTUITY_ENV = 'development';
+					process.env.NODE_ENV = 'development';
+					process.env.AGENTUITY_PROJECT_DIR = rootDir;
+					if (project?.region) {
+						process.env.AGENTUITY_REGION = project.region;
+					}
+					process.env.PORT = String(opts.port);
+					process.env.AGENTUITY_PORT = process.env.PORT;
+
+					if (project) {
+						process.env.AGENTUITY_TRANSPORT_URL = serviceUrls.catalyst;
+						process.env.AGENTUITY_CATALYST_URL = serviceUrls.catalyst;
+						process.env.AGENTUITY_VECTOR_URL = serviceUrls.vector;
+						process.env.AGENTUITY_KEYVALUE_URL = serviceUrls.keyvalue;
+						process.env.AGENTUITY_SANDBOX_URL = serviceUrls.sandbox;
+						process.env.AGENTUITY_STREAM_URL = serviceUrls.stream;
+						process.env.AGENTUITY_CLOUD_ORG_ID = project.orgId;
+						process.env.AGENTUITY_CLOUD_PROJECT_ID = project.projectId;
+					}
 
-				// Set Vite port for asset proxying in bundled app
-				process.env.VITE_PORT = String(vitePort);
+					// Set Vite port for asset proxying in bundled app
+					process.env.VITE_PORT = String(vitePort);
 
-				logger.debug('Set VITE_PORT=%s for asset proxying', process.env.VITE_PORT);
+					logger.debug('Set VITE_PORT=%s for asset proxying', process.env.VITE_PORT);
 
-				// Start Bun dev server (Vite already running, just start backend)
-				await startBunDevServer({
-					rootDir,
-					port: opts.port,
-					projectId: project?.projectId,
-					orgId: project?.orgId,
-					deploymentId,
-					logger,
-					vitePort, // Pass port of already-running Vite server
-				});
+					// Start Bun dev server (Vite already running, just start backend)
+					await startBunDevServer({
+						rootDir,
+						port: opts.port,
+						projectId: project?.projectId,
+						orgId: project?.orgId,
+						deploymentId,
+						logger,
+						vitePort, // Pass port of already-running Vite server
+					});
 
-				// Wait for app.ts to finish loading (Vite is ready but app may still be initializing)
-				// Give it 2 seconds to ensure app initialization completes
-				await new Promise((resolve) => setTimeout(resolve, 2000));
+					// Wait for app.ts to finish loading (Vite is ready but app may still be initializing)
+					// Give it 2 seconds to ensure app initialization completes
+					await Bun.sleep(2000);
 
-				// Check if shutdown was requested during startup
-				if (shutdownRequested) {
-					break;
+					// Check if shutdown was requested during startup
+					if (shutdownRequested) {
+						break;
+					}
+				} catch (error) {
+					tui.error(`Failed to start dev server: ${error}`);
+					tui.warn('Waiting for file changes to retry...');
+
+					// Wait for next restart trigger or shutdown
+					await new Promise<void>((resolve) => {
+						const checkRestart = setInterval(() => {
+							if (shouldRestart || shutdownRequested) {
+								clearInterval(checkRestart);
+								resolve();
+							}
+						}, 100);
+					});
+					if (shutdownRequested) {
+						break;
+					}
+					continue;
 				}
-			} catch (error) {
-				tui.error(`Failed to start dev server: ${error}`);
-				tui.warn('Waiting for file changes to retry...');
-
-				// Wait for next restart trigger or shutdown
-				await new Promise<void>((resolve) => {
-					const checkRestart = setInterval(() => {
-						if (shouldRestart || shutdownRequested) {
-							clearInterval(checkRestart);
-							resolve();
-						}
-					}, 100);
-				});
+
+				// Exit early if shutdown was requested
 				if (shutdownRequested) {
 					break;
 				}
-				continue;
-			}
-
-			// Exit early if shutdown was requested
-			if (shutdownRequested) {
-				break;
-			}
 
-			try {
-				// Start gravity client if we have devmode
-				if (gravityBin && gravityURL && devmode) {
-					logger.trace('Starting gravity client: %s', gravityBin);
-					gravityProcess = Bun.spawn(
-						[
+				try {
+					// Start gravity client if we have devmode
+					if (gravityBin && gravityURL && devmode && project) {
+						logger.trace(
+							'Starting gravity client: %s (cwd: %s, id: %s)',
 							gravityBin,
-							'--endpoint-id',
-							devmode.id,
-							'--port',
-							opts.port.toString(),
-							'--url',
-							gravityURL,
-							'--log-level',
-							process.env.AGENTUITY_GRAVITY_LOG_LEVEL ?? 'error',
-						],
-						{
-							cwd: rootDir,
-							stdout: 'pipe',
-							stderr: 'pipe',
-							detached: false, // Ensure gravity dies with parent process
-						}
-					);
+							rootDir,
+							devmode.id
+						);
+						gravityProcess = Bun.spawn(
+							[
+								gravityBin,
+								'--endpoint-id',
+								devmode.id,
+								'--port',
+								opts.port.toString(),
+								'--url',
+								gravityURL,
+								'--log-level',
+								process.env.AGENTUITY_GRAVITY_LOG_LEVEL ?? 'error',
+								'--org-id',
+								project.orgId,
+								'--project-id',
+								project.projectId,
+								'--token',
+								process.env.AGENTUITY_SDK_KEY!, // set above
+							],
+							{
+								cwd: rootDir,
+								stdout: 'pipe',
+								stderr: 'pipe',
+								detached: false, // Ensure gravity dies with parent process
+							}
+						);
 
-					// Register gravity process in dev lock for cleanup tracking
-					const gravityPid = (gravityProcess as { pid?: number }).pid;
-					if (gravityPid) {
-						await devLock.registerChild({
-							pid: gravityPid,
-							type: 'gravity',
-							description: 'Gravity public URL tunnel',
-						});
-					}
+						// Register gravity process in dev lock for cleanup tracking
+						const gravityPid = (gravityProcess as { pid?: number }).pid;
+						if (gravityPid) {
+							await devLock.registerChild({
+								pid: gravityPid,
+								type: 'gravity',
+								description: 'Gravity public URL tunnel',
+							});
+						}
 
-					// Log gravity output
-					(async () => {
-						try {
-							if (gravityProcess?.stdout) {
-								for await (const chunk of gravityProcess.stdout) {
-									const text = new TextDecoder().decode(chunk);
-									logger.debug('[gravity] %s', text.trim());
+						// Log gravity output
+						(async () => {
+							try {
+								if (gravityProcess?.stdout) {
+									for await (const chunk of gravityProcess.stdout) {
+										const text = new TextDecoder().decode(chunk);
+										logger.debug('[gravity] %s', text.trim());
+									}
 								}
+							} catch (err) {
+								logger.error('Error reading gravity stdout: %s', err);
 							}
-						} catch (err) {
-							logger.error('Error reading gravity stdout: %s', err);
-						}
-					})();
-
-					(async () => {
-						try {
-							if (gravityProcess?.stderr) {
-								for await (const chunk of gravityProcess.stderr) {
-									const text = new TextDecoder().decode(chunk);
-									logger.warn('[gravity] %s', text.trim());
+						})();
+
+						(async () => {
+							try {
+								if (gravityProcess?.stderr) {
+									for await (const chunk of gravityProcess.stderr) {
+										const text = new TextDecoder().decode(chunk);
+										logger.warn('[gravity] %s', text.trim());
+									}
 								}
+							} catch (err) {
+								logger.error('Error reading gravity stderr: %s', err);
 							}
-						} catch (err) {
-							logger.error('Error reading gravity stderr: %s', err);
-						}
-					})();
+						})();
 
-					logger.debug('Gravity client started');
-				}
+						logger.debug('Gravity client started');
+					}
 
-				// Sync service integration
-				// TODO: Integrate sync service with Vite's buildStart/buildEnd hooks
-				// The sync service will be called when metadata changes are detected
+					// Handle keyboard shortcuts - only register listener once
+					if (
+						interactive &&
+						process.stdin.isTTY &&
+						process.stdout.isTTY &&
+						!stdinListenerRegistered
+					) {
+						stdinListenerRegistered = true;
+						process.stdin.setRawMode(true);
+						process.stdin.resume();
+						process.stdin.setEncoding('utf8');
+
+						const showHelp = () => {
+							console.log('\n' + tui.bold('Keyboard Shortcuts:'));
+							console.log(tui.muted('  h') + ' - show this help');
+							console.log(tui.muted('  c') + ' - clear console');
+							console.log(tui.muted('  q') + ' - quit\n');
+						};
+
+						process.stdin.on('data', (data) => {
+							const key = data.toString();
+
+							// Handle Ctrl+C - send SIGINT to trigger graceful shutdown
+							if (key === '\u0003') {
+								process.kill(process.pid, 'SIGINT');
+								return;
+							}
 
-				// Handle keyboard shortcuts - only register listener once
-				if (
-					interactive &&
-					process.stdin.isTTY &&
-					process.stdout.isTTY &&
-					!stdinListenerRegistered
-				) {
-					stdinListenerRegistered = true;
-					process.stdin.setRawMode(true);
-					process.stdin.resume();
-					process.stdin.setEncoding('utf8');
-
-					const showHelp = () => {
-						console.log('\n' + tui.bold('Keyboard Shortcuts:'));
-						console.log(tui.muted('  h') + ' - show this help');
-						console.log(tui.muted('  c') + ' - clear console');
-						console.log(tui.muted('  q') + ' - quit\n');
-					};
+							switch (key) {
+								case 'h':
+									showHelp();
+									break;
+								case 'c':
+									console.clear();
+									tui.banner('⨺ Agentuity DevMode', devmodebody, {
+										padding: 2,
+										topSpacer: false,
+										bottomSpacer: false,
+										centerTitle: false,
+									});
+									break;
+								case 'q':
+									void cleanup(true, 0);
+									break;
+								default:
+									process.stdout.write(data);
+									break;
+							}
+						});
+					}
 
-					process.stdin.on('data', (data) => {
-						const key = data.toString();
+					showWelcome();
 
-						// Handle Ctrl+C - send SIGINT to trigger graceful shutdown
-						if (key === '\u0003') {
-							process.kill(process.pid, 'SIGINT');
-							return;
-						}
+					// Start/resume file watcher now that server is ready
+					fileWatcher.resume();
 
-						switch (key) {
-							case 'h':
-								showHelp();
-								break;
-							case 'c':
-								console.clear();
-								tui.banner('⨺ Agentuity DevMode', devmodebody, {
-									padding: 2,
-									topSpacer: false,
-									bottomSpacer: false,
-									centerTitle: false,
-								});
-								break;
-							case 'q':
-								void cleanup(true, 0);
-								break;
-							default:
-								process.stdout.write(data);
-								break;
-						}
+					// Wait for restart signal or shutdown
+					await new Promise<void>((resolve) => {
+						const checkRestart = setInterval(() => {
+							if (shouldRestart || shutdownRequested) {
+								clearInterval(checkRestart);
+								resolve();
+							}
+						}, 100);
 					});
-				}
-
-				showWelcome();
 
-				// Start/resume file watcher now that server is ready
-				fileWatcher.resume();
+					// Exit loop if shutdown was requested
+					if (shutdownRequested) {
+						break;
+					}
 
-				// Wait for restart signal or shutdown
-				await new Promise<void>((resolve) => {
-					const checkRestart = setInterval(() => {
-						if (shouldRestart || shutdownRequested) {
-							clearInterval(checkRestart);
-							resolve();
-						}
-					}, 100);
-				});
+					// Restart triggered - cleanup and loop (Vite stays running)
+					logger.debug('Restarting backend server...');
 
-				// Exit loop if shutdown was requested
-				if (shutdownRequested) {
-					break;
-				}
+					// Clean up Bun server and Gravity (Vite stays running)
+					await cleanupForRestart();
 
-				// Restart triggered - cleanup and loop (Vite stays running)
-				logger.debug('Restarting backend server...');
+					// Brief pause before restart
+					await Bun.sleep(500);
+				} catch (error) {
+					tui.error(`Error during server operation: ${error}`);
+					tui.warn('Waiting for file changes to retry...');
 
-				// Clean up Bun server and Gravity (Vite stays running)
-				await cleanupForRestart();
+					// Cleanup on error (Vite stays running)
+					await cleanupForRestart();
 
-				// Brief pause before restart
-				await new Promise((resolve) => setTimeout(resolve, 500));
-			} catch (error) {
-				tui.error(`Error during server operation: ${error}`);
-				tui.warn('Waiting for file changes to retry...');
+					// Exit if shutdown was requested during error handling
+					if (shutdownRequested) {
+						break;
+					}
 
-				// Cleanup on error (Vite stays running)
-				await cleanupForRestart();
+					// Resume file watcher to detect changes for retry
+					fileWatcher.resume();
 
-				// Exit if shutdown was requested during error handling
-				if (shutdownRequested) {
-					break;
+					// Wait for next restart trigger or shutdown
+					await new Promise<void>((resolve) => {
+						const checkRestart = setInterval(() => {
+							if (shouldRestart || shutdownRequested) {
+								clearInterval(checkRestart);
+								resolve();
+							}
+						}, 100);
+					});
 				}
-
-				// Resume file watcher to detect changes for retry
-				fileWatcher.resume();
-
-				// Wait for next restart trigger or shutdown
-				await new Promise<void>((resolve) => {
-					const checkRestart = setInterval(() => {
-						if (shouldRestart || shutdownRequested) {
-							clearInterval(checkRestart);
-							resolve();
-						}
-					}, 100);
-				});
 			}
+		} finally {
+			/* brute force clean up */
+			await devLock.release();
+			await killLingeringGravityProcesses(logger);
+			releaseLockSync(rootDir);
 		}
 	},
 });