gennady 0.1.1 → 0.2.1

package/cli/gennady.js

@@ -1,9 +1,12 @@
+#!/usr/bin/env node
+
 import { readFileSync } from 'fs';
 import { fileURLToPath } from 'url';
 import { dirname, join } from 'path';
 import { CommitGen } from '../src/commit-gen/commit-gen.js';
 import { parseArgs } from '../src/utils/parse-args.js';
 import { style } from '../src/utils/style.js';
+import { getSysLang } from '../src/utils/language.js';
 
 const PROMPTS_DIR = join(
 	typeof __dirname !== 'string' ? dirname(fileURLToPath(import.meta.url)) : __dirname,
@@ -12,22 +15,31 @@ const PROMPTS_DIR = join(
 
 const params = parseArgs(process.argv, {
 	mode: ['mode', 'm'],
+	oneline: ['short', 'one', 'o'],
 	reviewerModel: ['model'],
 	targetBranch: ['branch', 'b'],
 });
 
 const commit = new CommitGen({
 	...params,
-	onelinePromptTemplate: readFileSync(join(PROMPTS_DIR, 'oneline-prompt.md')).toString(),
-	detailedPromptTemplate: readFileSync(join(PROMPTS_DIR, 'detailed-prompt.md')).toString(),
-	composerPromptTemplate: readFileSync(join(PROMPTS_DIR, 'composer-prompt.md')).toString(),
+	basePromptTemplate: readFileSync(join(PROMPTS_DIR, 'base-prompt.md')).toString(),
+	formatOnelinePromptTemplate: readFileSync(join(PROMPTS_DIR, 'format-oneline-prompt.md')).toString(),
+	formatDetailedPromptTemplate: readFileSync(join(PROMPTS_DIR, 'format-detailed-prompt.md')).toString(),
+	translatePromptTemplate: readFileSync(join(PROMPTS_DIR, 'translate-prompt.md')).toString(),
 });
 
 console.info(`🤖`, style.whiteBright.bold(`GENNADY`), `(${style.cyan(commit.reviewerModel)} → ${style.yellow(commit.mode)})`, `🗯️`);
 console.info(style.gray(`-`.repeat(30)));
 
 const msg = await commit.generate();
+if (msg) {
+	console.info(`-`.repeat(40), '\n');
+	console.info(style.whiteBright(msg), '\n');
+	console.info(`^`.repeat(40), '\n');
 
-console.info(`-`.repeat(40), '\n');
-console.info(style.whiteBright(msg), '\n');
-console.info(`^`.repeat(40), '\n');
+	const lang = getSysLang();
+	if (lang !== 'en') {
+		console.info(await commit.translate(msg, lang), '\n');
+		console.info(`^`.repeat(40), '\n');
+	}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gennady",
-  "version": "0.1.1",
+  "version": "0.2.1",
   "author": "Konstantin Lebedev <ibnrubaxa@gmail.com>",
   "description": "Gennady — Generate Next-level Automated Description Intelligence",
   "keywords": [
@@ -13,10 +13,7 @@
   "license": "MIT",
   "repository": "https://github.com/rubaxa/commit-gen",
   "type": "module",
-  "bin": {
-    "gennady": "./cli/gennady.js",
-    "gennadi": "./cli/gennady.js"
-  },
+  "bin": "./cli/gennady.js",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

package/src/commit-gen/commit-gen.js

@@ -1,20 +1,24 @@
-import { execSync as nodeExecSync } from 'node:child_process';
+import { getGitCommitCount, getGitDiff } from '../git/git-cmd.js';
+import { parseGitDiff } from '../git/git-diff.js';
 import { style } from '../utils/style.js';
 
 export class CommitGen {
 	constructor(init) {
 		this.init = {
 			mode: 'auto',
+			oneline: false,
 			reviewerModel: 'llama3:8b',
 			targetBranch: undefined,
-			onelinePromptTemplate: 'Oneline commit: {diff}',
-			detailedPromptTemplate: 'Detailed commit: {diff}',
-			composerPromptTemplate: 'Compose final commit message from parts: {messages}',
 
-			maxInputTokens: init.maxInputTokens || 5000,
+			maxInputTokens: init.maxInputTokens || 4000,
 			ollamaUrl: init.ollamaUrl || 'http://127.0.0.1:11434/api/generate',
 			logger: console,
 
+			basePromptTemplate: undefined,
+			formatOnelinePromptTemplate: undefined,
+			formatDetailedPromptTemplate: undefined,
+			translatePromptTemplate: undefined,
+
 			...init,
 		};
 	}
@@ -35,112 +39,22 @@ export class CommitGen {
 		return this.init.targetBranch;
 	}
 
-	execSync(cmd) {
-		try {
-			return nodeExecSync(cmd, { encoding: 'utf-8'});
-		} catch (e) {
-			return '';
-		}
-	}
-
-	getCommitCount() {
-		const output = this.execSync('git rev-list --count HEAD 2>/dev/null');
-		return parseInt(output, 10) || 0;
-	}
-
-	getDiff() {
-		if (this.init.targetBranch) {
-			return this.execSync(`git diff ${this.init.targetBranch}`);
-		}
-
-		return this.execSync('git diff --cached');
-	}
-
-	parseDiff(diffStr) {
-		const lines = diffStr.split('\n');
-		const files = [];
-		let currentFile = null;
-		
-		lines.forEach((line) => {
-			if (line.startsWith('diff --git')) {
-				if (currentFile) files.push(currentFile);
-				const parts = line.split(' ');
-				const bFile = parts[3] ? parts[3].replace('b/', '') : parts[2].replace('a/', '');
-				currentFile = { filename: bFile, diff: [line] };
-			} else if (currentFile) {
-				currentFile.diff.push(line);
-			}
-		});
-
-		if (currentFile) files.push(currentFile);
-
-		return files;
-	}
-
-	categorizeFiles(files) {
-		const lockFiles = [];
-		const dotFiles = [];
-		const docFiles = [];
-		const renamedFiles = [];
-		const deletedFiles = [];
-		const changedFiles = [];
-		
-		files.forEach((file) => {
-			const isRenamed = file.diff.some(
-				(line) => line.includes('rename from') || line.includes('rename to')
-			);
-			const isDeleted = file.diff.some((line) => line.includes('deleted file mode'));
-			
-			if (/\.md$/.test(file.filename)) {
-				docFiles.push(file);
-			} else if (/^\./.test(file.filename)) {
-				dotFiles.push(file);
-			} else if (/(\.lock|-lock\.json)$/.test(file.filename)) {
-				lockFiles.push(file);
-			} else if (isRenamed) {
-				renamedFiles.push(file);
-			} else if (isDeleted) {
-				deletedFiles.push(file);
-			} else {
-				changedFiles.push(file);
-			}
-		});
-
-		return { dotFiles, docFiles, lockFiles, renamedFiles, deletedFiles, changedFiles };
-	}
-
 	generateDiffText(files) {
 		return files
 			.map((file) => `File: ${file.filename}\n${file.diff.join('\n')}`)
 			.join('\n\n');
 	}
 
-	tokenCount(text) {
-		return text.split(/\s+/).length;
-	}
-
-	splitDiffByTokens(diffText, template, maxTokens) {
-		const templateTokens = this.tokenCount(template.replace('{diff}', ''));
-		const availableTokens = maxTokens - templateTokens;
-		const words = diffText.split(/\s+/);
-		const chunks = [];
-		
-		for (let i = 0; i < words.length; i += availableTokens) {
-			chunks.push(words.slice(i, i + availableTokens).join(' '));
-		}
-
-		return chunks;
-	}
-
-	async generateFromOllama(prompt) {
+	async fetchPrompt(prompt, context) {
 		try {
 			const req = await fetch(this.init.ollamaUrl, {
 				method: 'POST',
 				headers: {'Content-Type': 'application/json'},
 				body: JSON.stringify({
-					prompt,
 					model: this.init.reviewerModel,
 					stream: false,
+					prompt,
+					context,
 				}),
 			});
 			const data = await req.json();
@@ -150,71 +64,101 @@ export class CommitGen {
 			return '';
 		}
 	}
-
-	async generateMessage(prompt) {
-		const msg =  await this.generateFromOllama(prompt);
-		return msg.replace(/(^[\s\S]*<message>|<\/message>[\s\S]*)/g, '').replace(/\n\s*- /, '\n\n- ')
+	async generateCommitMessage(prompt) {
+		const text = await this.fetchPrompt(prompt);
+		return text;
 	}
 
 	async generate() {
-		const commitCount = this.getCommitCount();
-		const diffStr = this.getDiff();
-		const parsedFiles = this.parseDiff(diffStr);
-		const categories = this.categorizeFiles(parsedFiles);
+		const {maxInputTokens} = this.init
+		const commitCount = getGitCommitCount();
+		const diffStr = getGitDiff(this.init.targetBranch);
+		const parsedDiff = parseGitDiff(diffStr).sort((a, b) => a.tokens - b.tokens);
+		const codeChanged = parsedDiff.filter(f => !f.isDeleted && !f.isRenamed && f.programmingLanguage);
+		
+		if (codeChanged.length === 0) {
+			this.logger.warn(`No changes detected, skipping commit message generation.`);
+			return;
+		}
+
+		const tokens = codeChanged.reduce((sum, file) => sum + file.tokens, 0);
+		const maxTokens = codeChanged[codeChanged.length - 1].tokens;
+		const languages = [...new Set(codeChanged.map(f => f.programmingLanguage).filter(Boolean))].join(', ');
 		const mode =
-			this.init.mode === 'auto'
-				? this.init.targetBranch
-					? 'detailed'
-					: commitCount > 1 && categories.changedFiles.length < 5
-					? 'oneline'
-					: 'detailed'
-				: this.init.mode;
+			this.init.oneline
+			? 'oneline'
+			: this.init.mode === 'auto'
+			? this.init.targetBranch
+			? 'detailed'
+			: commitCount > 1 && codeChanged.length < 5
+			? 'oneline'
+			: 'detailed'
+			: this.init.mode;
+
+		this.logger.info(`- Mode: ${style.bold.magentaBright(mode)}`);
+		this.logger.info(`- Languages: ${style.yellow(languages)}`);
+		this.logger.info(`- Tokens: ${style.bold.cyanBright(tokens)} ${style.gray(`(max per file: ${maxTokens})`)}`);
+
+		if (maxTokens > maxInputTokens) {
+			this.logger.error(`TODO: Diff is too large, skipping commit message generation.`);
+			process.exit(1);
+		}
 
-		this.logger.info(`Generating commit message (mode: ${mode}, commits: ${commitCount}):`);
+		const batches = codeChanged.reduce((acc, file) => {
+			if (!acc[0] || acc[0].tokens + file.tokens > maxInputTokens) {
+				if (acc[0]) {
+					acc[0].languages = [...new Set(acc[0].languages)];
+				}
 
-		Object.entries(categories).forEach(([key, value]) => {
-			this.logger.info(`- ${style.bold(key)}:`, style.cyan(value.length + ''));
-		});
+				acc.unshift({tokens: 0, diff: '', languages: []});
+			}
 
-		const diffText = this.generateDiffText(categories.changedFiles);
+			acc[0].tokens += file.tokens;
+			acc[0].diff += `File: ${file.filename}\n${file.diff.hunks.flatMap(h => h.changes).join('\n')}\n\n`;
+			acc[0].languages.push(file.programmingLanguage);
 
-		// this.logger.info(`Diff:`, diffText);
+			return acc;
+		}, []);
 
-		const promptTemplate = (mode === 'oneline'
-			? this.init.onelinePromptTemplate
-			: this.init.detailedPromptTemplate).trim();
+		this.logger.info(`- Queue: ${style.bold.cyan(batches.length)}`);
+		this.logger.info(`-`.repeat(40));
 
-		const fullPrompt = promptTemplate.replace('{diff}', diffText);
-		const totalTokens = this.tokenCount(fullPrompt);
-		let finalMessage = '';
+		const startGenTime = performance.now();
+		const results = await Promise.all(batches.map(async (batch) => {
+			console.info(`- Task:`, batch.tokens, batch.languages);
 
-		this.logger.info(`Total tokens: ${totalTokens}`);
-		
-		if (totalTokens < this.init.maxInputTokens) {
-			finalMessage = await this.generateMessage(fullPrompt);
-		} else {
-			const diffChunks = this.splitDiffByTokens(
-				diffText,
-				promptTemplate,
-				this.init.maxInputTokens,
-			);
-			const partialMessages = [];
-			
-			for (const chunk of diffChunks) {
-				const partPrompt = promptTemplate.replace('{diff}', chunk);
-				const msg = await this.generateMessage(partPrompt);
-
-				partialMessages.push(msg);
-			}
-			
-			const composerPrompt = this.init.composerPromptTemplate.replace(
-				'{messages}',
-				partialMessages.join('\n'),
-			);
-			
-			finalMessage = await this.generateMessage(composerPrompt);
-		}
+			const prompt = this.init.basePromptTemplate
+				.replaceAll('{languages}', batch.languages.join('/'))
+				.replaceAll('{input}', batch.diff);
+
+			const msg = await this.generateCommitMessage(prompt);
+
+			return msg
+		}));
+
+		this.logger.info(`-`.repeat(30));
+		this.logger.info(`- Generation time: ${style.blueBright(((performance.now() - startGenTime) / 1000).toFixed(2))}s`);
+
+		const startFormatTime = performance.now();
+		const formatted = await this.toFormat(
+			mode === 'detailed' ? this.init.formatDetailedPromptTemplate : this.init.formatOnelinePromptTemplate,
+			results.join('\n\n'),
+		);
+		this.logger.info(`- Formatting time: ${style.blueBright(((performance.now() - startFormatTime) / 1000).toFixed(2))}s`);
+
+		return formatted.trim();
+	}
+
+	async toFormat(format, text) {
+		const result = await this.fetchPrompt(format.replaceAll('{input}', text));
+		return result.replace(/(^[\s\S]*<message>|<\/message>[\s\S]*$)/g, '').replace(`\n-`, `\n\n-`);
+	}
+
+	async translate(input, lang) {
+		const result =  await this.fetchPrompt(this.init.translatePromptTemplate
+			.replaceAll('{input}', input)
+			.replaceAll('{lang}', lang));
 
-		return finalMessage;
+		return result.replace(/(^[\s\S]*<message>|<\/message>[\s\S]*)/g, '');
 	}
 }

package/src/git/git-cmd.js

@@ -0,0 +1,32 @@
+import { execSync as nodeExecSync } from 'node:child_process';
+
+const execSync = (cmd) => {
+	try {
+		return nodeExecSync(cmd, { encoding: 'utf-8'});
+	} catch (e) {
+		return '';
+	}
+}
+	
+const detectBaseBranch = () => {
+	const branchesOutput = execSync('git branch --list 2>/dev/null');
+	const match = branchesOutput?.match(/\s*\*?\s*(master|main)$/m);
+	return match?.[1] || 'master';
+}
+
+export const getGitCommitCount = () => {
+	try {
+		const output = execSync(`git rev-list --count HEAD ^${detectBaseBranch()} 2>/dev/null`);
+		return parseInt(output, 10) || 0;
+	} catch {
+		return 0;
+	}
+}
+
+export const getGitDiff = (targetBranch) => {
+	if (targetBranch) {
+		return execSync(`git diff ${targetBranch}`);
+	}
+
+	return execSync('git diff --cached');
+}

package/src/git/git-diff.js

@@ -0,0 +1,146 @@
+import { getProgrammingLanguage } from "../utils/language.js";
+import { countTokens } from "../utils/tokens.js";
+
+const getCategory = (filename, metadata) => {
+	if (metadata && metadata.extra && Array.isArray(metadata.extra)) {
+		for (let line of metadata.extra) {
+			if (/^Binary files? /i.test(line) || /GIT binary patch/i.test(line)) {
+				return 'bin';
+			}
+		}
+	}
+
+	const categories = {
+		bin: /^(exe|dll|so|bin)\b$/i,
+		lock: /^(package-lock\.json|yarn\.lock|npm-shrinkwrap\.json|composer\.lock|podfile\.lock|go\.sum|gemfile\.lock)$/i,
+		json: /\.json$/i,
+		doc: /\.(md|markdown|txt|rst)$/i,
+		cfg: /^(\..+|.*\.(yml|yaml|rc|ini|conf))$/i,
+		img: /\.(png|jpe?g|gif|svg|bmp|tiff|ico)$/i,
+		css: /\.(css|less|scss|sass|styl)$/i,
+		html: /\.(html?)$/i,
+		code: /\.(js|jsx|ts|tsx|java|py|c|cpp|cs|rb|php|go|swift|m|mm|kt)$/i,
+	};
+
+	const category = Object.entries(categories).find(
+		([, regexp]) => regexp.test(filename)
+	)?.[0] || 'other';
+
+	return category;
+};
+
+export const parseGitDiff = (diffText) => {
+	const lines = diffText.split('\n');
+	const result = [];
+	let currentFile = null;
+	let currentHunk = null;
+
+	lines.forEach((line) => {
+		if (line.startsWith('diff --git')) {
+			if (currentFile) {
+				currentFile.diff.tokens = currentFile.diff.hunks.reduce((sum, hunk) => sum + hunk.tokens, 0);
+				currentFile.tokens = currentFile.diff.tokens;
+				const extMatch = currentFile.filename.match(/\.([^.]+)$/);
+				currentFile.ext = extMatch ? extMatch[1].toLowerCase() : '';
+				currentFile.category = getCategory(currentFile.filename, currentFile.metadata);
+				currentFile.programmingLanguage = getProgrammingLanguage(currentFile.ext);
+				result.push(currentFile);
+			}
+
+			const fileMatch = line.match(/^diff --git a\/(.+?) b\/(.+)$/);
+			const oldFilename = fileMatch ? fileMatch[1] : null;
+			const filename = fileMatch ? fileMatch[2] : null;
+
+			currentFile = {
+				isNew: false,
+				isDeleted: false,
+				isRenamed: false,
+				filename,
+				oldFilename,
+				newFileMode: null,
+				deletedFileMode: null,
+				diff: {
+					tokens: 0,
+					hunks: []
+				},
+				tokens: 0,
+				metadata: {},
+				ext: '',
+				category: 'other',
+				programmingLanguage: undefined
+			};
+
+			currentHunk = null;
+		} else if (currentFile && line.startsWith('new file mode')) {
+			const parts = line.split(' ');
+
+			currentFile.isNew = true;
+			currentFile.newFileMode = parts[3] || null;
+			currentFile.metadata.newFileMode = currentFile.newFileMode;
+		} else if (currentFile && line.startsWith('deleted file mode')) {
+			const parts = line.split(' ');
+
+			currentFile.isDeleted = true;
+			currentFile.deletedFileMode = parts[3] || null;
+			currentFile.metadata.deletedFileMode = currentFile.deletedFileMode;
+		} else if (currentFile && line.startsWith('old mode')) {
+			const parts = line.split(' ');
+			currentFile.metadata.oldMode = parts[2] || null;
+		} else if (currentFile && line.startsWith('new mode')) {
+			const parts = line.split(' ');
+			currentFile.metadata.newMode = parts[2] || null;
+		} else if (currentFile && line.startsWith('similarity index')) {
+			const parts = line.split(' ');
+			currentFile.metadata.similarityIndex = parts[2] || null;
+		} else if (currentFile && line.startsWith('rename from')) {
+			const from = line.substring('rename from'.length).trim();
+
+			currentFile.isRenamed = true;
+			currentFile.oldFilename = from;
+			currentFile.metadata.renameFrom = from;
+		} else if (currentFile && line.startsWith('rename to')) {
+			const to = line.substring('rename to'.length).trim();
+
+			currentFile.isRenamed = true;
+			currentFile.filename = to;
+			currentFile.metadata.renameTo = to;
+		} else if (currentFile && line.startsWith('index')) {
+			currentFile.metadata.index = line.substring('index'.length).trim();
+		} else if (currentFile && (line.startsWith('--- ') || line.startsWith('+++ '))) {
+			if (line.startsWith('--- ')) {
+				currentFile.metadata.oldFileMarker = line;
+			} else {
+				currentFile.metadata.newFileMarker = line;
+			}
+		} else if (currentFile && line.startsWith('@@')) {
+			currentHunk = {
+				header: line,
+				changes: [line],
+				tokens: countTokens(line)
+			};
+			currentFile.diff.hunks.push(currentHunk);
+		} else if (currentHunk && (line.startsWith('+') || line.startsWith('-') || line.startsWith(' '))) {
+			currentHunk.changes.push(line);
+			currentHunk.tokens += countTokens(line);
+		} else if (currentFile) {
+			if (!currentFile.metadata.extra) {
+				currentFile.metadata.extra = [];
+			}
+			currentFile.metadata.extra.push(line);
+		}
+	});
+
+	if (currentFile) {
+		const extMatch = currentFile.filename.match(/\.([^.]+)$/);
+
+		currentFile.diff.tokens = currentFile.diff.hunks.reduce((sum, hunk) => sum + hunk.tokens, 0);
+		currentFile.tokens = currentFile.diff.tokens;
+		currentFile.ext = extMatch ? extMatch[1].toLowerCase() : '';
+		currentFile.category = getCategory(currentFile.filename, currentFile.metadata);
+		currentFile.programmingLanguage = getProgrammingLanguage(currentFile.ext);
+
+		result.push(currentFile);
+	}
+
+	return result;
+}

package/src/prompts/base-prompt.md

@@ -0,0 +1,27 @@
+You are {languages} expert tasked with writing a git commit subject and description based on code changes.
+
+**Subject:**  
+- Clearly summarize the key changes in one concise yet informative sentence.  
+- Do not describe changes for each file.  
+- Do not mention stylistic changes or fixed typos.  
+- The subject must provide enough context to understand the commit at a glance.  
+- End with an emoji instead of a period.  
+
+**Description:**  
+- Expand on the changes by listing key modifications as an unordered list.  
+- Do not describe changes for each file.  
+- Do not mention stylistic changes or fixed typos.  
+- Group related changes into single points.  
+- Each list item **must** be less than 140 characters and should not end with a period.  
+
+**Output Format (any deviation from this format is incorrect):**  
+<message>subject emoji
+- description item 1
+- description item 2</message>
+
+**Extremely important:**  
+- The output must contain only commit message inside `<message>` and  `</message>`.
+- Do not add unnecessary words and markup, strictly follow the output format.
+
+**Input:**  
+{input}

package/src/prompts/format-detailed-prompt.md

@@ -0,0 +1,16 @@
+You are a {languages} expert tasked with writing a git commit subject and description based on code changes.  
+
+### **Correct Output Format (no deviations allowed):**  
+<message>
+[Commit subject ending with an emoji]
+- [Description item 1]
+- [Description item 2]
+- [Description item N]
+</message>
+
+### **Fix this incorrect commit message:**
+{input}
+
+**Extremely important:**  
+- The output must contain only commit message inside `<message>` and  `</message>`.
+- Do not add unnecessary words and markup, strictly follow the output format.

package/src/prompts/format-oneline-prompt.md

@@ -0,0 +1,11 @@
+You are a {languages} expert tasked with writing a git commit subject and description based on code changes.  
+
+### **Correct Output Format (no deviations allowed):**  
+<message>Oneline commit message without loss of meaning and important changes and ending with an emoji</message>
+
+### **Fix this incorrect commit message:**
+{input}
+
+**Extremely important:**  
+- The output must contain only commit message inside `<message>` and  `</message>`.
+- Do not add unnecessary words and markup, strictly follow the output format.

package/src/prompts/translate-prompt.md

@@ -0,0 +1,11 @@
+### Translate text inside <message> and </message> tags from English to **{lang}**:
+
+### **Output:**
+<message>Translation result</message>
+
+### **Extremely important:**
+- The translation must be wrapped inside <message> and </message> tags.
+- Do not add unnecessary words and markup, strictly follow the output format.
+
+### **Input:**
+<message>{input}</message>

package/src/utils/language.js

@@ -0,0 +1,39 @@
+import { execSync as nodeExecSync } from 'node:child_process';
+
+const languages = {
+	js: 'JavaScript',
+	jsx: 'JavaScript',
+	ts: 'TypeScript',
+	tsx: 'TypeScript',
+	java: 'Java',
+	py: 'Python',
+	c: 'C',
+	cpp: 'C++',
+	cs: 'C#',
+	rb: 'Ruby',
+	php: 'PHP',
+	go: 'Go',
+	swift: 'Swift',
+	m: 'Objective-C',
+	mm: 'Objective-C++',
+	kt: 'Kotlin',
+	html: 'HTML',
+	css: 'CSS',
+	less: 'Less',
+	scss: 'SCSS',
+	sass: 'Sass'
+};
+
+export const getProgrammingLanguage = (ext) => {
+	return languages[ext] || undefined;
+};
+
+export const getSysLang = () => {
+	try {
+		const values = nodeExecSync("osascript -e 'user locale of (get system info)'").toString().trim().toLowerCase().split('_');
+		const lang = values.filter(v => v !== 'en' && v !== 'us');
+		return lang[0] || 'en';
+	} catch {
+		return 'en';
+	}
+};

package/src/utils/tokens.js

@@ -0,0 +1,4 @@
+export const countTokens = (text) => {
+	const tokens = text.match(/[\p{L}\p{N}_]+|[^\s\p{L}\p{N}_]/gu);
+	return tokens ? tokens.length : 0;
+}

package/src/prompts/composer-prompt.md

@@ -1,7 +0,0 @@
-You are a IT expert tasked with writing a commit message for git based on the provided code changes. Follow these rules:
-
-- Combine and  summarize all messages into one preserving the structure
-- Messages are separated by "---"
-
-**Input:**
-{messages}

package/src/prompts/detailed-prompt.md

@@ -1,32 +0,0 @@
-You are a JavaScript/TypeScript expert tasked with writing a commit message for git based on the provided code changes. Follow these rules carefully:  
-
-**Subject:**  
-- Clearly summarize the key changes in one concise yet informative sentence.  
-- Use **present tense** and **imperative mood** (e.g., "Fix bug", "Add feature").  
-- Do **not** describe changes for each file.  
-- Do **not** mention stylistic changes or fixed typos.  
-- The subject **must** provide enough context to understand the commit at a glance.  
-- End with an **emoji** instead of a period.  
-
-**Description:**  
-- Expand on the changes by listing key modifications as an unordered list.  
-- Do **not** describe changes for each file.  
-- Do **not** mention stylistic changes or fixed typos.  
-- Group related changes into single points.  
-- Each list item **must** be less than 140 characters and should not end with a period.  
-
-**Output Format:**  
-<message>subject emoji
-- description item 1
-- description item 2</message>
-
-
-**Important:**  
-- The description **must** be an unordered list.  
-- Do **not** include introductory phrases like "Here's the commit message".  
-- The output must contain **only** the `<message>` tags and the commit message inside.  
-- The output **must** be wrapped inside `<message>` and `</message>` tags.  
-- Any deviation from this format is incorrect.  
-
-**Input:**  
-{diff}

package/src/prompts/oneline-prompt.md

@@ -1,22 +0,0 @@
-You are a JavaScript/TypeScript expert tasked with writing a commit message for git based on the provided code changes. Follow these rules:
-
-**Online message:**
-- Summarize changes as one sentence of key changes (e.g., broken code, new features).
-- Use present tense, imperative mood.
-- Do not describe changes for each file.
-- Do not mention stylistic changes or fixed typos.
-- Group related changes into a single point.
-
-**Output Format:**
-<message>your commit message here</message>
-
-**Input:**
-{diff}
-
-**Important:**
-- The commit message must be wrapped inside `<message>` and `</message>` tags.
-- The message must be a **single line** with no line breaks, lists, bullet points, or additional formatting.
-- Do not include any additional text, explanations, or commentary.
-- Do not include introductory phrases like "Here's the commit message".
-- The output must contain **only** the `<message>` tags and the commit message inside.
-- **Lists, multiple lines, or extra formatting are strictly forbidden.** Only a single sentence inside `<message>`.