fix(utils/openai,aicommits): pass abortSignal for timeout, fix diff truncation and token usage keys and openrouter headers

Author: riccardogiorato

src/commands/aicommits.ts

@@ -126,6 +126,7 @@ export default async (
 		try {
 			const baseUrl = providerInstance.getBaseUrl();
 			const apiKey = providerInstance.getApiKey() || '';
+			const providerHeaders = providerInstance.getHeaders();
 
 			if (isChunking) {
 				// Split files into chunks
@@ -136,9 +137,9 @@ export default async (
 
 				const chunkMessages: string[] = [];
 				let totalUsage = {
-					promptTokens: 0,
-					completionTokens: 0,
-					totalTokens: 0,
+					prompt_tokens: 0,
+					completion_tokens: 0,
+					total_tokens: 0,
 				};
 
 				for (const chunk of chunks) {
@@ -149,7 +150,7 @@ export default async (
 						let diffToUse = chunkDiff.diff;
 						if (diffToUse.length > maxDiffLength) {
 							diffToUse =
-								diffToUse.substring(diffToUse.length - maxDiffLength) +
+								diffToUse.substring(0, maxDiffLength) +
 								'\n\n[Diff truncated due to size]';
 						}
 						const result = await generateCommitMessage(
@@ -162,15 +163,23 @@ export default async (
 							config['max-length'],
 							config.type,
 							timeout,
-							customPrompt
+							customPrompt,
+							providerHeaders
 						);
 						chunkMessages.push(...result.messages);
 						if (result.usage) {
-							totalUsage.promptTokens +=
-								(result.usage as any).promptTokens || 0;
-							totalUsage.completionTokens +=
-								(result.usage as any).completionTokens || 0;
-							totalUsage.totalTokens += (result.usage as any).totalTokens || 0;
+							totalUsage.prompt_tokens +=
+								(result.usage as any).prompt_tokens ||
+								(result.usage as any).promptTokens ||
+								0;
+							totalUsage.completion_tokens +=
+								(result.usage as any).completion_tokens ||
+								(result.usage as any).completionTokens ||
+								0;
+							totalUsage.total_tokens +=
+								(result.usage as any).total_tokens ||
+								(result.usage as any).totalTokens ||
+								0;
 						}
 					}
 				}
@@ -185,16 +194,23 @@ export default async (
 					config['max-length'],
 					config.type,
 					timeout,
-					customPrompt
+					customPrompt,
+					providerHeaders
 				);
 				messages = combineResult.messages;
 				if (combineResult.usage) {
-					totalUsage.promptTokens +=
-						(combineResult.usage as any).promptTokens || 0;
-					totalUsage.completionTokens +=
-						(combineResult.usage as any).completionTokens || 0;
-					totalUsage.totalTokens +=
-						(combineResult.usage as any).totalTokens || 0;
+					totalUsage.prompt_tokens +=
+						(combineResult.usage as any).prompt_tokens ||
+						(combineResult.usage as any).promptTokens ||
+						0;
+					totalUsage.completion_tokens +=
+						(combineResult.usage as any).completion_tokens ||
+						(combineResult.usage as any).completionTokens ||
+						0;
+					totalUsage.total_tokens +=
+						(combineResult.usage as any).total_tokens ||
+						(combineResult.usage as any).totalTokens ||
+						0;
 				}
 				usage = totalUsage;
 			} else {
@@ -203,7 +219,7 @@ export default async (
 				let diffToUse = staged.diff;
 				if (diffToUse.length > maxDiffLength) {
 					diffToUse =
-						diffToUse.substring(diffToUse.length - maxDiffLength) +
+						diffToUse.substring(0, maxDiffLength) +
 						'\n\n[Diff truncated due to size]';
 				}
 				const result = await generateCommitMessage(
@@ -216,7 +232,8 @@ export default async (
 					config['max-length'],
 					config.type,
 					timeout,
-					customPrompt
+					customPrompt,
+					providerHeaders
 				);
 				messages = result.messages;
 				usage = result.usage;

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

@@ -51,6 +51,7 @@ export default () =>
 
 		const baseUrl = providerInstance.getBaseUrl();
 		const apiKey = providerInstance.getApiKey() || '';
+		const providerHeaders = providerInstance.getHeaders();
 
 		// Use config timeout, or default per provider
 		const timeout =
@@ -72,7 +73,9 @@ export default () =>
 				config.generate,
 				config['max-length'],
 				config.type,
-				timeout
+				timeout,
+				undefined,
+				providerHeaders
 			);
 			messages = result.messages;
 		} finally {

src/feature/providers/base.ts

@@ -9,6 +9,7 @@ export type ProviderDef = {
 	modelsFilter?: (models: any[]) => string[];
 	defaultModels: string[];
 	requiresApiKey: boolean;
+	headers?: Record<string, string>;
 };
 
 export class Provider {
@@ -111,6 +112,10 @@ export class Provider {
 		return this.def.defaultModels;
 	}
 
+	getHeaders(): Record<string, string> | undefined {
+		return this.def.headers;
+	}
+
 	validateConfig(): { valid: boolean; errors: string[] } {
 		const errors: string[] = [];
 		if (this.def.requiresApiKey && !this.getApiKey()) {

src/feature/providers/openrouter.ts

@@ -11,4 +11,8 @@ export const OpenRouterProvider: ProviderDef = {
 			.map((m: any) => m.id),
 	defaultModels: ['openai/gpt-oss-20b:free', 'z-ai/glm-4.5-air:free'],
 	requiresApiKey: true,
+	headers: {
+		'HTTP-Referer': 'https://github.com/nutlope/aicommits',
+		'X-Title': 'aicommits',
+	},
 };

src/utils/openai.ts

@@ -59,6 +59,7 @@ const shortenCommitMessage = async (
 			temperature: 0.2,
 			maxRetries: 2,
 			maxOutputTokens: 500,
+			abortSignal: abortController.signal,
 		});
 		clearTimeout(timeoutId);
 		return sanitizeMessage(result.text);
@@ -78,7 +79,8 @@ export const generateCommitMessage = async (
 	maxLength: number,
 	type: CommitType,
 	timeout: number,
-	customPrompt?: string
+	customPrompt?: string,
+	headers?: Record<string, string>
 ) => {
 	if (process.env.DEBUG) {
 		console.log('Diff being sent to AI:');
@@ -93,6 +95,7 @@ export const generateCommitMessage = async (
 						name: 'custom',
 						apiKey,
 						baseURL: baseUrl,
+						headers,
 				  });
 
 		const abortController = new AbortController();
@@ -106,9 +109,16 @@ export const generateCommitMessage = async (
 				temperature: 0.4,
 				maxRetries: 2,
 				maxOutputTokens: 2000,
-			}).finally(() => clearTimeout(timeoutId))
+				abortSignal: abortController.signal,
+			})
 		);
-		const results = await Promise.all(promises);
+		const results = await (async () => {
+			try {
+				return await Promise.all(promises);
+			} finally {
+				clearTimeout(timeoutId);
+			}
+		})();
 		let texts = results.map((r) => r.text);
 		let messages = deduplicateMessages(
 			texts.map((text: string) => sanitizeMessage(text))
@@ -200,7 +210,8 @@ export const combineCommitMessages = async (
 	maxLength: number,
 	type: CommitType,
 	timeout: number,
-	customPrompt?: string
+	customPrompt?: string,
+	headers?: Record<string, string>
 ) => {
 	try {
 		const provider =
@@ -210,6 +221,7 @@ export const combineCommitMessages = async (
 						name: 'custom',
 						apiKey,
 						baseURL: baseUrl,
+						headers,
 				  });
 
 		const abortController = new AbortController();
@@ -229,6 +241,7 @@ Do not add thanks, explanations, or any text outside the commit message.`;
 			temperature: 0.4,
 			maxRetries: 2,
 			maxOutputTokens: 2000,
+			abortSignal: abortController.signal,
 		});
 
 		clearTimeout(timeoutId);