🔧 update: address PR review feedback on code quality

Co-authored-by: warengonzaga <15052701+warengonzaga@users.noreply.github.com>

Author: Copilot

source/cli.js

@@ -12,6 +12,7 @@ import {
 } from './commands/auth.js';
 import {showConfig, resetConfig} from './commands/config.js';
 import {setConvention} from './utils/config-manager.js';
+import {CONVENTIONS} from './utils/commit-conventions.js';
 
 const program = new Command();
 
@@ -92,7 +93,7 @@ configCmd
 	.command('set-convention <type>')
 	.description('Set default commit convention')
 	.action(type => {
-		const validConventions = ['clean', 'conventional', 'gitmoji', 'simple'];
+		const validConventions = Object.keys(CONVENTIONS);
 		if (!validConventions.includes(type)) {
 			showError(`Invalid convention: ${type}`);
 			console.log(`Available: ${validConventions.join(', ')}`);

source/commands/commit.js

@@ -139,8 +139,11 @@ export async function processFilesInteractively(aiProvider, options = {}) {
 
 		let currentConvention = options.convention || getConvention();
 		let fileProcessed = false;
+		let attempts = 0;
+		const maxAttempts = 5;
 
-		while (!fileProcessed) {
+		while (!fileProcessed && attempts < maxAttempts) {
+			attempts++;
 			try {
 				const message = await aiProvider.generateCommitMessage(diff, file, {
 					...options,
@@ -188,6 +191,15 @@ export async function processFilesInteractively(aiProvider, options = {}) {
 				fileProcessed = true;
 			}
 		}
+
+		// Check if max attempts reached without processing
+		if (!fileProcessed && attempts >= maxAttempts) {
+			showWarning(
+				`Maximum regeneration attempts (${maxAttempts}) reached for ${file}`,
+			);
+			await unstageFile(file);
+			skipped++;
+		}
 	}
 
 	// Show summary

source/providers/ai-provider.js

@@ -64,10 +64,13 @@ export class AIProvider {
 	 */
 	async generateWithCopilot(prompt, options = {}) {
 		let client;
+		let clientStarted = false;
+
 		try {
 			// Create and start the Copilot client
 			client = new CopilotClient();
 			await client.start();
+			clientStarted = true;
 
 			// Create session with model
 			const session = await client.createSession({
@@ -79,25 +82,30 @@ export class AIProvider {
 				prompt,
 			});
 
-			// Clean up
-			await client.stop();
+			// Extract the content from response, handling multiple possible shapes
+			let content = null;
+
+			if (typeof response === 'string') {
+				content = response;
+			} else {
+				content =
+					// Preserve original expected shape first
+					response?.data?.content ??
+					// Common OpenAI / chat-like shapes under data
+					response?.data?.choices?.[0]?.message?.content ??
+					response?.data?.choices?.[0]?.content ??
+					// Or directly on the response object
+					response?.choices?.[0]?.message?.content ??
+					response?.choices?.[0]?.content ??
+					response?.content;
+			}
 
-			// Extract the content from response
-			if (response?.data?.content) {
-				return response.data.content.trim();
+			if (typeof content === 'string' && content.trim()) {
+				return content.trim();
 			}
 
 			throw new Error('No response from Copilot');
 		} catch (error) {
-			// Clean up client if it was created
-			if (client) {
-				try {
-					await client.stop();
-				} catch {
-					// Ignore cleanup errors
-				}
-			}
-
 			console.error('Copilot error:', error.message);
 
 			// Fallback to OpenAI if available
@@ -114,6 +122,15 @@ export class AIProvider {
 					'3. GitHub CLI installed and in PATH\n\n' +
 					'Or set OpenAI key as fallback: magicc auth openai <key>',
 			);
+		} finally {
+			// Clean up client if it was started
+			if (client && clientStarted) {
+				try {
+					await client.stop();
+				} catch {
+					// Ignore cleanup errors
+				}
+			}
 		}
 	}
 

source/utils/config-manager.js

@@ -18,20 +18,13 @@ export function getAuthMode() {
 
 // Token management
 export function setToken(provider, token) {
-	if (provider === 'copilot' || provider === 'github') {
-		config.set('githubToken', token);
-	} else if (provider === 'openai') {
+	if (provider === 'openai') {
 		config.set('openai', token);
+		config.set('authenticatedAt', new Date().toISOString());
 	}
-
-	config.set('authenticatedAt', new Date().toISOString());
 }
 
 export function getToken(provider) {
-	if (provider === 'copilot' || provider === 'github') {
-		return config.get('githubToken');
-	}
-
 	if (provider === 'openai') {
 		return config.get('openai');
 	}

test.js

@@ -31,12 +31,8 @@ test('config manager stores and retrieves tokens', t => {
 	setToken('openai', 'sk-test-key');
 	t.is(getToken('openai'), 'sk-test-key');
 
-	setToken('github', 'ghp-test-token');
-	t.is(getToken('github'), 'ghp-test-token');
-
 	clearAll();
 	t.is(getToken('openai'), undefined);
-	t.is(getToken('github'), undefined);
 });
 
 test('config manager stores and retrieves convention', t => {