@agentuity/cli 1.0.10 → 1.0.12

package/src/steps.ts

@@ -11,6 +11,19 @@ import { ValidationInputError, ValidationOutputError, type IssuesType } from '@a
 import { clearLastLines, isTTYLike } from './tui';
 import { appendLog, isLogCollectionEnabled } from './log-collector';
 
+/**
+ * Error thrown when step execution is interrupted by a signal (e.g., Ctrl+C).
+ * Callers can catch this to perform cleanup before exiting.
+ */
+export class StepInterruptError extends Error {
+	public readonly exitCode: number;
+	constructor(exitCode = 130) {
+		super('Step execution interrupted');
+		this.name = 'StepInterruptError';
+		this.exitCode = exitCode;
+	}
+}
+
 // Spinner frames
 const FRAMES = ['◐', '◓', '◑', '◒'];
 
@@ -77,6 +90,7 @@ export const stepError = (message: string, cause?: Error, output?: string[]): St
  */
 export interface StepContext {
 	progress: (n: number) => void;
+	signal: AbortSignal;
 }
 
 /**
@@ -300,14 +314,6 @@ export function pauseStepUI(clear = false): () => void {
 	};
 }
 
-/**
- * Get exit function (Bun.exit or process.exit)
- */
-function getExitFn(): (code: number) => never {
-	const bunExit = (globalThis as { Bun?: { exit?: (code: number) => never } }).Bun?.exit;
-	return typeof bunExit === 'function' ? bunExit : process.exit.bind(process);
-}
-
 /**
  * Install interrupt handlers (SIGINT/SIGTERM + raw mode)
  */
@@ -367,19 +373,24 @@ async function runStepsTUI(steps: Step[]): Promise<void> {
 	let currentStepIndex = -1;
 	let currentFrameIndex = 0;
 
+	// Create abort controller for cooperative cancellation
+	const abortController = new AbortController();
+
 	// Hide cursor
 	process.stdout.write('\x1B[?25l');
 
 	// Set up interrupt handler
-	const exit = getExitFn();
+	let restoreInterrupts: (() => void) | null = null;
 	const onInterrupt = () => {
 		if (interrupted) return;
 		interrupted = true;
+		abortController.abort();
 		if (activeInterval) clearInterval(activeInterval);
+		restoreInterrupts?.();
+		restoreInterrupts = null;
 		process.stdout.write('\x1B[?25h\n'); // Show cursor
-		exit(130);
 	};
-	const restoreInterrupts = installInterruptHandlers(onInterrupt);
+	restoreInterrupts = installInterruptHandlers(onInterrupt);
 
 	// Force re-render function
 	const forceRerender = (skipMove = false) => {
@@ -476,7 +487,10 @@ async function runStepsTUI(steps: Step[]): Promise<void> {
 
 			// Run the step
 			try {
-				const outcome = await step.run({ progress: progressCallback });
+				const outcome = await step.run({
+					progress: progressCallback,
+					signal: abortController.signal,
+				});
 
 				// Update state from outcome
 				if (outcome.status === 'success') {
@@ -493,6 +507,11 @@ async function runStepsTUI(steps: Step[]): Promise<void> {
 					stepState.output = outcome.output;
 				}
 			} catch (err) {
+				// If the step was aborted due to cancellation, treat as interrupt
+				if (err instanceof Error && err.name === 'AbortError') {
+					interrupted = true;
+					throw new StepInterruptError();
+				}
 				stepState.status = 'error';
 				stepState.errorMessage = err instanceof Error ? err.message : String(err);
 				stepState.errorCause = err instanceof Error ? err : undefined;
@@ -522,6 +541,14 @@ async function runStepsTUI(steps: Step[]): Promise<void> {
 
 			// Handle errors
 			if (stepState.status === 'error') {
+				// If the error is due to abort/cancellation, treat as interrupt
+				if (
+					stepState.errorCause instanceof Error &&
+					stepState.errorCause.name === 'AbortError'
+				) {
+					interrupted = true;
+					throw new StepInterruptError();
+				}
 				const errorColor = getColor('red');
 				const errorMsg = stepState.errorMessage || 'An unknown error occurred';
 				console.error(`\n${errorColor}Error: ${errorMsg}${COLORS.reset}`);
@@ -537,13 +564,19 @@ async function runStepsTUI(steps: Step[]): Promise<void> {
 			}
 		}
 
+		// If interrupted during step execution, throw so callers' finally blocks run
+		if (interrupted) {
+			throw new StepInterruptError();
+		}
+
 		// Show cursor
 		process.stdout.write('\x1B[?25h');
 	} catch (err) {
 		process.stdout.write('\x1B[?25h');
 		throw err;
 	} finally {
-		restoreInterrupts();
+		restoreInterrupts?.();
+		restoreInterrupts = null;
 		getTotalLinesFn = null; // Clear pause capability
 		forceRerenderFn = null;
 	}
@@ -558,76 +591,108 @@ async function runStepsPlain(steps: Step[]): Promise<void> {
 	const yellowColor = getColor('yellow');
 	const redColor = getColor('red');
 
-	for (const step of steps) {
-		let outcome: StepOutcome;
-
-		try {
-			outcome = await step.run({ progress: () => {} });
-		} catch (err) {
-			outcome = {
-				status: 'error',
-				message: err instanceof Error ? err.message : String(err),
-				cause: err instanceof Error ? err : undefined,
-			};
-		}
+	const abortController = new AbortController();
+	let interrupted = false;
+	const onInterrupt = () => {
+		if (interrupted) return;
+		interrupted = true;
+		abortController.abort();
+	};
+	process.on('SIGINT', onInterrupt);
+	process.on('SIGTERM', onInterrupt);
 
-		// Build step state for clean log emission
-		const stepState: StepState = {
-			label: step.label,
-			status: outcome.status,
-			output: outcome.output,
-			skipReason: outcome.status === 'skipped' ? outcome.reason : undefined,
-			errorMessage: outcome.status === 'error' ? outcome.message : undefined,
-			errorCause: outcome.status === 'error' ? outcome.cause : undefined,
-		};
+	try {
+		for (const step of steps) {
+			if (abortController.signal.aborted) break;
 
-		// Emit clean log for this step
-		emitCleanStepLog(stepState);
+			let outcome: StepOutcome;
 
-		// Print final state
-		if (outcome.status === 'success') {
-			console.log(`${greenColor}${ICONS.success}${COLORS.reset} ${step.label}`);
-			if (outcome.output && outcome.output.length > 0) {
-				console.log(`${grayColor}╭─ Output${COLORS.reset}`);
-				for (const line of outcome.output) {
-					console.log(`${grayColor}│${COLORS.reset} ${line}`);
+			try {
+				outcome = await step.run({ progress: () => {}, signal: abortController.signal });
+			} catch (err) {
+				// If the step was aborted due to cancellation, treat as interrupt
+				if (err instanceof Error && err.name === 'AbortError') {
+					interrupted = true;
+					throw new StepInterruptError();
 				}
-				console.log(`${grayColor}╰─${COLORS.reset}`);
-				console.log('');
+				outcome = {
+					status: 'error',
+					message: err instanceof Error ? err.message : String(err),
+					cause: err instanceof Error ? err : undefined,
+				};
 			}
-		} else if (outcome.status === 'skipped') {
-			const reason = outcome.reason ? ` ${grayColor}(${outcome.reason})${COLORS.reset}` : '';
-			console.log(`${yellowColor}${ICONS.skipped}${COLORS.reset} ${step.label}${reason}`);
-			if (outcome.output && outcome.output.length > 0) {
-				console.log(`${grayColor}╭─ Output${COLORS.reset}`);
-				for (const line of outcome.output) {
-					console.log(`${grayColor}│${COLORS.reset} ${line}`);
+
+			// Build step state for clean log emission
+			const stepState: StepState = {
+				label: step.label,
+				status: outcome.status,
+				output: outcome.output,
+				skipReason: outcome.status === 'skipped' ? outcome.reason : undefined,
+				errorMessage: outcome.status === 'error' ? outcome.message : undefined,
+				errorCause: outcome.status === 'error' ? outcome.cause : undefined,
+			};
+
+			// Emit clean log for this step
+			emitCleanStepLog(stepState);
+
+			// Print final state
+			if (outcome.status === 'success') {
+				console.log(`${greenColor}${ICONS.success}${COLORS.reset} ${step.label}`);
+				if (outcome.output && outcome.output.length > 0) {
+					console.log(`${grayColor}╭─ Output${COLORS.reset}`);
+					for (const line of outcome.output) {
+						console.log(`${grayColor}│${COLORS.reset} ${line}`);
+					}
+					console.log(`${grayColor}╰─${COLORS.reset}`);
+					console.log('');
 				}
-				console.log(`${grayColor}╰─${COLORS.reset}`);
-				console.log('');
-			}
-		} else {
-			console.log(`${redColor}${ICONS.error}${COLORS.reset} ${step.label}`);
-			if (outcome.output && outcome.output.length > 0) {
-				console.log(`${grayColor}╭─ Output${COLORS.reset}`);
-				for (const line of outcome.output) {
-					console.log(`${grayColor}│${COLORS.reset} ${line}`);
+			} else if (outcome.status === 'skipped') {
+				const reason = outcome.reason ? ` ${grayColor}(${outcome.reason})${COLORS.reset}` : '';
+				console.log(`${yellowColor}${ICONS.skipped}${COLORS.reset} ${step.label}${reason}`);
+				if (outcome.output && outcome.output.length > 0) {
+					console.log(`${grayColor}╭─ Output${COLORS.reset}`);
+					for (const line of outcome.output) {
+						console.log(`${grayColor}│${COLORS.reset} ${line}`);
+					}
+					console.log(`${grayColor}╰─${COLORS.reset}`);
+					console.log('');
 				}
-				console.log(`${grayColor}╰─${COLORS.reset}`);
-				console.log('');
-			}
-			const errorColor = getColor('red');
-			const errorMsg = outcome.message || 'An unknown error occurred';
-			console.error(`\n${errorColor}Error: ${errorMsg}${COLORS.reset}`);
-			if (
-				outcome.cause instanceof ValidationInputError ||
-				outcome.cause instanceof ValidationOutputError
-			) {
-				printValidationIssues(outcome.cause.issues);
+			} else {
+				// If the error is due to abort/cancellation, treat as interrupt
+				if (outcome.cause instanceof Error && outcome.cause.name === 'AbortError') {
+					interrupted = true;
+					throw new StepInterruptError();
+				}
+				console.log(`${redColor}${ICONS.error}${COLORS.reset} ${step.label}`);
+				if (outcome.output && outcome.output.length > 0) {
+					console.log(`${grayColor}╭─ Output${COLORS.reset}`);
+					for (const line of outcome.output) {
+						console.log(`${grayColor}│${COLORS.reset} ${line}`);
+					}
+					console.log(`${grayColor}╰─${COLORS.reset}`);
+					console.log('');
+				}
+				const errorColor = getColor('red');
+				const errorMsg = outcome.message || 'An unknown error occurred';
+				console.error(`\n${errorColor}Error: ${errorMsg}${COLORS.reset}`);
+				if (
+					outcome.cause instanceof ValidationInputError ||
+					outcome.cause instanceof ValidationOutputError
+				) {
+					printValidationIssues(outcome.cause.issues);
+				}
+				console.error('');
+				process.exit(1);
 			}
-			console.error('');
-			process.exit(1);
 		}
+
+		// If interrupted during step execution, throw so callers' finally blocks run
+		if (interrupted) {
+			throw new StepInterruptError();
+		}
+	} finally {
+		process.off('SIGINT', onInterrupt);
+		process.off('SIGTERM', onInterrupt);
 	}
 }
 

package/src/tui.ts

@@ -737,7 +737,7 @@ export function banner(title: string, body: string, options?: BannerOptions): vo
 /**
  * Wait for any key press before continuing
  * Displays a prompt message and waits for user input
- * Exits with code 1 if CTRL+C is pressed
+ * Raises SIGINT if CTRL+C is pressed
  */
 export async function waitForAnyKey(message = 'Press Enter to continue...'): Promise<void> {
 	process.stdout.write(muted(message));
@@ -765,7 +765,8 @@ export async function waitForAnyKey(message = 'Press Enter to continue...'): Pro
 			// Check for CTRL+C (character code 3)
 			if (data.length === 1 && data[0] === 3) {
 				console.log('\n');
-				process.exit(1);
+				process.kill(process.pid, 'SIGINT');
+				return;
 			}
 
 			console.log('');
@@ -777,7 +778,7 @@ export async function waitForAnyKey(message = 'Press Enter to continue...'): Pro
 /**
  * Prompts user with a yes/no question
  * Returns true for yes, false for no
- * Exits with code 1 if CTRL+C is pressed
+ * Raises SIGINT if CTRL+C is pressed
  */
 export async function confirm(message: string, defaultValue = true): Promise<boolean> {
 	const suffix = defaultValue ? '[Y/n]' : '[y/N]';
@@ -805,7 +806,8 @@ export async function confirm(message: string, defaultValue = true): Promise<boo
 			// Check for CTRL+C (character code 3)
 			if (data.length === 1 && data[0] === 3) {
 				console.log('\n');
-				process.exit(1);
+				process.kill(process.pid, 'SIGINT');
+				return;
 			}
 
 			const input = data.toString().trim().toLowerCase();

package/src/version-check.ts

@@ -4,7 +4,6 @@ import { fetchLatestVersion } from './cmd/upgrade';
 import { getVersion, getCompareUrl, getReleaseUrl, toTag } from './version';
 import * as tui from './tui';
 import { saveConfig } from './config';
-import { $ } from 'bun';
 import { tmpdir } from 'node:os';
 import { getExecutingAgent } from './agent-detection';
 
@@ -174,13 +173,14 @@ async function performUpgrade(logger: Logger, targetVersion: string): Promise<vo
 
 		// Use bun to install the specific version globally with retry for CDN propagation delays
 		// Run from tmpdir to avoid interference from any local package.json/node_modules
-		const { installWithRetry } = await import('./cmd/upgrade/npm-availability');
+		const { installWithRetry, spawnWithTimeout } = await import('./cmd/upgrade/npm-availability');
 		await installWithRetry(
 			async () => {
-				const result = await $`bun add -g @agentuity/cli@${npmVersion}`
-					.cwd(tmpdir())
-					.quiet()
-					.nothrow();
+				// spawnWithTimeout kills the process if it exceeds 30s
+				const result = await spawnWithTimeout(
+					['bun', 'add', '-g', `@agentuity/cli@${npmVersion}`],
+					{ cwd: tmpdir(), timeout: 30_000 }
+				);
 				return { exitCode: result.exitCode, stderr: result.stderr };
 			},
 			{