fix: suppress headless stdout leaks

Author: riccardogiorato

src/commands/model.ts

@@ -3,6 +3,8 @@ import { outro, log } from '@clack/prompts';
 import { getConfig, setConfigs } from '../utils/config-runtime.js';
 import { getProvider } from '../feature/providers/index.js';
 import { selectModel } from '../feature/models.js';
+import { KnownError, handleCommandError } from '../utils/error.js';
+import { isInteractive } from '../utils/headless.js';
 
 export default command(
 	{
@@ -15,6 +17,12 @@ export default command(
 	},
 	() => {
 		(async () => {
+			if (!isInteractive()) {
+				throw new KnownError(
+					'Interactive terminal required for model selection.'
+				);
+			}
+
 			const config = await getConfig();
 
 			if (!config.provider) {
@@ -59,9 +67,6 @@ export default command(
 			} else {
 				outro('Model selection cancelled');
 			}
-		})().catch((error) => {
-			console.error(`❌ Model selection failed: ${error.message}`);
-			process.exit(1);
-		});
+		})().catch(handleCommandError);
 	}
 );

src/commands/pr.ts

@@ -9,6 +9,7 @@ import { generateText } from 'ai';
 import { createOpenAI } from '@ai-sdk/openai';
 import { createOpenAICompatible } from '@ai-sdk/openai-compatible';
 import { KnownError, handleCommandError } from '../utils/error.js';
+import { isInteractive } from '../utils/headless.js';
 
 type GitProvider = 'github' | 'gitlab' | 'bitbucket' | 'azure';
 
@@ -80,6 +81,12 @@ export default command(
 	},
 	() => {
 		(async () => {
+			if (!isInteractive()) {
+				throw new KnownError(
+					'Interactive terminal required for PR creation.'
+				);
+			}
+
 			intro(bgCyan(black(' aicommits pr ')));
 
 			await assertGitRepo();

src/commands/prepare-commit-msg-hook.ts

@@ -6,6 +6,7 @@ import { getConfig } from '../utils/config-runtime.js';
 import { getProvider } from '../feature/providers/index.js';
 import { generateCommitMessage } from '../utils/openai.js';
 import { KnownError, handleCommandError } from '../utils/error.js';
+import { isHeadless } from '../utils/headless.js';
 
 const [messageFilePath, commitSource] = process.argv.slice(2);
 
@@ -28,7 +29,10 @@ export default () =>
 			return;
 		}
 
-		intro(bgCyan(black(' aicommits ')));
+		const headless = isHeadless();
+		if (!headless) {
+			intro(bgCyan(black(' aicommits ')));
+		}
 
 		const config = await getConfig({});
 
@@ -60,8 +64,8 @@ export default () =>
 		// Use the unified model or provider default
 		let model = config.OPENAI_MODEL || providerInstance.getDefaultModel();
 
-		const s = spinner();
-		s.start('The AI is analyzing your changes');
+		const s = headless ? null : spinner();
+		s?.start('The AI is analyzing your changes');
 		let messages: string[];
 		try {
 			const result = await generateCommitMessage(
@@ -79,7 +83,7 @@ export default () =>
 			);
 			messages = result.messages;
 		} finally {
-			s.stop('Changes analyzed');
+			s?.stop('Changes analyzed');
 		}
 
 		/**
@@ -119,5 +123,7 @@ export default () =>
 		const newContent = instructions + '\n' + currentContent;
 		await fs.writeFile(messageFilePath, newContent);
 
-		outro(`${green('✔')} Saved commit message!`);
+		if (!headless) {
+			outro(`${green('✔')} Saved commit message!`);
+		}
 	})().catch(handleCommandError);

src/commands/setup.ts

@@ -7,6 +7,8 @@ import {
 	getAvailableProviders,
 	getProviderBaseUrl,
 } from '../feature/providers/index.js';
+import { KnownError, handleCommandError } from '../utils/error.js';
+import { isInteractive } from '../utils/headless.js';
 
 export default command(
 	{
@@ -18,6 +20,12 @@ export default command(
 	},
 	(argv) => {
 		(async () => {
+			if (!isInteractive()) {
+				throw new KnownError(
+					'Interactive terminal required for setup. Run `aicommits setup` in a terminal.'
+				);
+			}
+
 			let config = await getConfig();
 
 			const providerOptions = getAvailableProviders();
@@ -156,9 +164,6 @@ export default command(
 			// 		console.error(`❌ Failed to create git alias: ${(error as Error).message}`);
 			// 	}
 			// }
-		})().catch((error) => {
-			console.error(`❌ Setup failed: ${error.message}`);
-			process.exit(1);
-		});
+		})().catch(handleCommandError);
 	}
 );

src/utils/commit-helpers.ts

@@ -1,4 +1,5 @@
 import { KnownError } from './error.js';
+import { isInteractive } from './headless.js';
 
 export const sleep = (ms: number) => new Promise(resolve => setTimeout(resolve, ms));
 
@@ -21,9 +22,6 @@ export const getCommitMessage = async (
 	const { select, confirm, isCancel } = await import('@clack/prompts');
 	const { dim } = await import('kolorist');
 
-	// Check if interactive prompts are available
-	const isInteractive = process.stdout.isTTY && !process.env.CI;
-
 	// Single message case
 	if (messages.length === 1) {
 		const [message] = messages;
@@ -32,7 +30,7 @@ export const getCommitMessage = async (
 			return message;
 		}
 
-		if (!isInteractive) {
+		if (!isInteractive()) {
 			throw new KnownError('Interactive terminal required for commit message confirmation. Use --yes flag to skip confirmation.');
 		}
 
@@ -49,7 +47,7 @@ export const getCommitMessage = async (
 		return messages[0];
 	}
 
-	if (!isInteractive) {
+	if (!isInteractive()) {
 		throw new KnownError('Interactive terminal required for commit message selection. Use --yes flag to skip selection and use the first message.');
 	}
 
@@ -59,4 +57,4 @@ export const getCommitMessage = async (
 	});
 
 	return isCancel(selected) ? null : (selected as string);
-};
+};

src/utils/headless.ts

@@ -1 +1,4 @@
-export const isHeadless = () => !process.stdout.isTTY;
+export const isHeadless = () => !process.stdin.isTTY || !process.stdout.isTTY;
+
+export const isInteractive = () =>
+	Boolean(process.stdin.isTTY && process.stdout.isTTY && !process.env.CI);

src/utils/openai.ts

@@ -4,6 +4,10 @@ import { createOpenAICompatible } from '@ai-sdk/openai-compatible';
 import { KnownError } from './error.js';
 import type { CommitType } from './config-types.js';
 import { generatePrompt, commitTypeFormats } from './prompt.js';
+import { isHeadless } from './headless.js';
+
+const shouldLogDebug = () =>
+	Boolean(process.env.DEBUG || process.env.AICOMMITS_DEBUG) && !isHeadless();
 
 /**
  * Extracts the actual response from reasoning model outputs.
@@ -82,7 +86,7 @@ export const generateCommitMessage = async (
 	customPrompt?: string,
 	headers?: Record<string, string>
 ) => {
-	if (process.env.DEBUG) {
+	if (shouldLogDebug()) {
 		console.log('Diff being sent to AI:');
 		console.log(diff);
 	}
@@ -164,8 +168,6 @@ export const generateCommitMessage = async (
 	} catch (error) {
 		const errorAsAny = error as any;
 
-		console.log(errorAsAny);
-
 		if (errorAsAny.code === 'ENOTFOUND') {
 			throw new KnownError(
 				`Error connecting to ${errorAsAny.hostname} (${errorAsAny.syscall}). Are you connected to the internet?`
@@ -261,8 +263,6 @@ Do not add thanks, explanations, or any text outside the commit message.`;
 	} catch (error) {
 		const errorAsAny = error as any;
 
-		console.log(errorAsAny);
-
 		throw errorAsAny;
 	}
 };

tests/specs/cli/headless.ts

@@ -0,0 +1,58 @@
+import { testSuite, expect } from 'manten';
+import { createFixture, createGit } from '../../utils.js';
+
+export default testSuite(({ describe }) => {
+	describe('Headless mode', ({ test }) => {
+		test('setup requires an interactive terminal', async () => {
+			const { fixture, aicommits } = await createFixture();
+
+			const { stdout, stderr, exitCode } = await aicommits(['setup'], {
+				reject: false,
+				env: {
+					CI: '1',
+				},
+			});
+
+			expect(exitCode).toBe(1);
+			expect(stdout).toBe('');
+			expect(stderr).toMatch('Interactive terminal required for setup');
+
+			await fixture.rm();
+		});
+
+		test('model requires an interactive terminal', async () => {
+			const { fixture, aicommits } = await createFixture();
+
+			const { stdout, stderr, exitCode } = await aicommits(['model'], {
+				reject: false,
+				env: {
+					CI: '1',
+				},
+			});
+
+			expect(exitCode).toBe(1);
+			expect(stdout).toBe('');
+			expect(stderr).toMatch('Interactive terminal required for model selection');
+
+			await fixture.rm();
+		});
+
+		test('pr requires an interactive terminal', async () => {
+			const { fixture, aicommits } = await createFixture();
+			await createGit(fixture.path);
+
+			const { stdout, stderr, exitCode } = await aicommits(['pr'], {
+				reject: false,
+				env: {
+					CI: '1',
+				},
+			});
+
+			expect(exitCode).toBe(1);
+			expect(stdout).toBe('');
+			expect(stderr).toMatch('Interactive terminal required for PR creation');
+
+			await fixture.rm();
+		});
+	});
+});

tests/specs/cli/index.ts

@@ -3,6 +3,7 @@ import { testSuite } from 'manten';
 export default testSuite(({ describe }) => {
 	describe('CLI', ({ runTestSuite }) => {
 		runTestSuite(import('./error-cases.js'));
+		runTestSuite(import('./headless.js'));
 		runTestSuite(import('./commits.js'));
 		runTestSuite(import('./no-verify.js'));
 	});