2.2.4

2026-01-12 23:28:16 -05:00 · 2023-05-26 12:51:59 +08:00
71 changed files with 11378 additions and 77383 deletions
--- a/.dockerignore
+++ b/.dockerignore
@@ -1 +0,0 @@
-.env
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -9,7 +9,7 @@ Thanks for considering contributing to the project.
 3. Create a new branch for your changes.
 4. Make your changes and commit them with descriptive commit messages.
 5. Push your changes to your forked repository.
-6. Create a pull request from your branch to the `dev` branch. Not `master` branch, PR to `dev` branch, please.
+6. Create a pull request from your branch to the `dev` branch.

 ## Getting started

--- a/.github/github-mark-white.png
+++ b/.github/github-mark-white.png
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -0,0 +1,28 @@
+# This workflow warns and then closes issues and PRs that have had no activity for a specified amount of time.
+#
+# You can adjust the behavior by modifying this file.
+# For more information, see:
+# https://github.com/actions/stale
+name: Mark stale issues and pull requests
+
+on:
+  schedule:
+  - cron: '27 21 * * *'
+
+jobs:
+  stale:
+
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write
+
+    steps:
+    - uses: actions/stale@v5
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        days-before-stale: 40
+        stale-issue-message: 'Stale issue message'
+        stale-pr-message: 'Stale pull request message'
+        stale-issue-label: 'no-issue-activity'
+        stale-pr-label: 'no-pr-activity'
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,46 +0,0 @@
-name: Testing
-
-on: [pull_request]
-
-jobs:
-  unit-test:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        node-version: [20.x]
-    steps:
-    - uses: actions/checkout@v2
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v2
-      with:
-        node-version: ${{ matrix.node-version }}
-    - name: Install dependencies
-      run: npm install
-    - name: Run Unit Tests
-      run: npm run test:unit
-  e2e-test:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        node-version: [20.x]
-    steps:
-    - uses: actions/checkout@v2
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v2
-      with:
-        node-version: ${{ matrix.node-version }}
-    - name: Install git
-      run: |
-        sudo apt-get update
-        sudo apt-get install -y git
-        git --version
-    - name: Setup git
-      run: |
-        git config --global user.email "test@example.com"
-        git config --global user.name "Test User"
-    - name: Install dependencies
-      run: npm install
-    - name: Build
-      run: npm run build
-    - name: Run E2E Tests
-      run: npm run test:e2e
--- a/.npmignore
+++ b/.npmignore
@@ -1 +0,0 @@
-out/github-action.cjs
--- a/.opencommitignore
+++ b/.opencommitignore
@@ -1 +0,0 @@
-out
--- a/.prettierrc
+++ b/.prettierrc
@@ -1,4 +1,4 @@
 {
-  "trailingComma": "none",
-  "singleQuote": true
+  "singleQuote": true,
+  "trailingComma": "none"
 }
--- a/README.md
+++ b/README.md
@@ -2,12 +2,12 @@
  <div>
    <img src=".github/logo-grad.svg" alt="OpenCommit logo"/>
    <h1 align="center">OpenCommit</h1>
-    <h4 align="center">Follow the bird <a href="https://twitter.com/_sukharev_"><img src="https://img.shields.io/twitter/follow/_sukharev_?style=flat&label=_sukharev_&logo=twitter&color=0bf&logoColor=fff" align="center"></a>
+    <h4 align="center">Follow the bird <a href="https://twitter.com/io_Y_oi"><img src="https://img.shields.io/twitter/follow/io_Y_oi?style=flat&label=io_Y_oi&logo=twitter&color=0bf&logoColor=fff" align="center"></a>
+    </h4>
  </div>
-	<h2>Auto-generate meaningful commits in a second</h2>
+	<h2>Auto-generate meaningful commits in 1 second</h2>
 	<p>Killing lame commits with AI 🤯🔫</p>
 	<a href="https://www.npmjs.com/package/opencommit"><img src="https://img.shields.io/npm/v/opencommit" alt="Current version"></a>
-  <h4 align="center">🪩 Winner of <a href="https://twitter.com/_sukharev_/status/1683448136973582336">GitHub 2023 hackathon</a> 🪩</h4>
 </div>

 ---
@@ -16,341 +16,15 @@
    <img src=".github/opencommit-example.png" alt="OpenCommit example"/>
 </div>

-All the commits in this repo are authored by OpenCommit — look at [the commits](https://github.com/di-sukharev/opencommit/commit/eae7618d575ee8d2e9fff5de56da79d40c4bc5fc) to see how OpenCommit works. Emojis and long commit descriptions are configurable.
+All the commits in this repo are done with OpenCommit — look into [the commits](https://github.com/di-sukharev/opencommit/commit/eae7618d575ee8d2e9fff5de56da79d40c4bc5fc) to see how OpenCommit works. Emoji and long commit description text is configurable.

-## Setup OpenCommit as a CLI tool
-
-You can use OpenCommit by simply running it via the CLI like this `oco`. 2 seconds and your staged changes are committed with a meaningful message.
-
-1. Install OpenCommit globally to use in any repository:
-
-   ```sh
-   npm install -g opencommit
-   ```
-
-   Alternatively run it via `npx opencommit` or `bunx opencommit`
-
-   MacOS may ask to run the command with `sudo` when installing a package globally.
-
-2. Get your API key from [OpenAI](https://platform.openai.com/account/api-keys). Make sure that you add your payment details, so the API works.
-
-3. Set the key to OpenCommit config:
-
-   ```sh
-   oco config set OCO_OPENAI_API_KEY=<your_api_key>
-   ```
-
-   Your API key is stored locally in the `~/.opencommit` config file.
-
-## Usage
-
-You can call OpenCommit directly to generate a commit message for your staged changes:
-
-```sh
-git add <files...>
-opencommit
-```
-
-You can also use the `oco` shortcut:
-
-```sh
-git add <files...>
-oco
-```
-
-### Running locally with Ollama
-
-You can also run it with local model through ollama:
-
- install and start ollama
- run `ollama run mistral` (do this only once, to pull model)
- run (in your project directory):
-
-```sh
-git add <files...>
-OCO_AI_PROVIDER='ollama' opencommit
-```
-
-If you want to use a model other than mistral, you can do so by setting the `OCO_AI_PROVIDER` environment variable as follows:
-
-```sh
-OCO_AI_PROVIDER='ollama/llama3:8b' opencommit
-```
-
-if you have ollama that is set up in docker/ on another machine with GPUs (not locally), you can change the default endpoint url.
-You can do so by setting the `OCO_OLLAMA_API_URL` environment variable as follows:
-
-```sh
-OCO_OLLAMA_API_URL='http://192.168.1.10:11434/api/chat' opencommit
-```
-
-where 192.168.1.10 is example of endpoint URL, where you have ollama set up.
-
-### Flags
-
-There are multiple optional flags that can be used with the `oco` command:
-
-#### Use Full GitMoji Specification
-
-Link to the GitMoji specification: https://gitmoji.dev/
-
-This flag can only be used if the `OCO_EMOJI` configuration item is set to `true`. This flag allows users to use all emojis in the GitMoji specification, By default, the GitMoji full specification is set to `false`, which only includes 10 emojis (🐛✨📝🚀✅♻️⬆️🔧🌐💡).
-This is due to limit the number of tokens sent in each request. However, if you would like to use the full GitMoji specification, you can use the `--fgm` flag.
-
-```
-oco --fgm
-```
-
-#### Skip Commit Confirmation
-
-This flag allows users to automatically commit the changes without having to manually confirm the commit message. This is useful for users who want to streamline the commit process and avoid additional steps. To use this flag, you can run the following command:
-
-```
-oco --yes
-```
-
-## Configuration
-
-### Local per repo configuration
-
-Create a `.env` file and add OpenCommit config variables there like this:
-
-```env
-OCO_OPENAI_API_KEY=<your OpenAI API token>
-OCO_TOKENS_MAX_INPUT=<max model token limit (default: 4096)>
-OCO_TOKENS_MAX_OUTPUT=<max response tokens (default: 500)>
-OCO_OPENAI_BASE_PATH=<may be used to set proxy path to OpenAI api>
-OCO_DESCRIPTION=<postface a message with ~3 sentences description of the changes>
-OCO_EMOJI=<boolean, add GitMoji>
-OCO_MODEL=<either 'gpt-4o', 'gpt-4', 'gpt-4-turbo', 'gpt-3.5-turbo' (default), 'gpt-3.5-turbo-0125', 'gpt-4-1106-preview', 'gpt-4-turbo-preview' or 'gpt-4-0125-preview'>
-OCO_LANGUAGE=<locale, scroll to the bottom to see options>
-OCO_MESSAGE_TEMPLATE_PLACEHOLDER=<message template placeholder, default: '$msg'>
-OCO_PROMPT_MODULE=<either conventional-commit or @commitlint, default: conventional-commit>
-OCO_ONE_LINE_COMMIT=<one line commit message, default: false>
-OCO_AI_PROVIDER=<anthropic, azure, ollama or ollama/model default ollama model: mistral>
-```
-
-### Global config for all repos
-
-Local config still has more priority than Global config, but you may set `OCO_MODEL` and `OCO_LOCALE` globally and set local configs for `OCO_EMOJI` and `OCO_DESCRIPTION` per repo which is more convenient.
-
-Simply set any of the variables above like this:
-
-```sh
-oco config set OCO_MODEL=gpt-4o
-```
-
-Configure [GitMoji](https://gitmoji.dev/) to preface a message.
-
-```sh
-oco config set OCO_EMOJI=true
-```
-
-To remove preface emojis:
-
-```sh
-oco config set OCO_EMOJI=false
-```
-
-### Switch to GPT-4 or other models
-
-By default, OpenCommit uses `gpt-4o` model.
-
-You may switch to GPT-4 which performs better, but costs ~x15 times more 🤠
-
-```sh
-oco config set OCO_MODEL=gpt-4
-```
-
-or for as a cheaper option:
-
-```sh
-oco config set OCO_MODEL=gpt-4o-mini
-```
-
-### Switch to Azure OpenAI
-
-By default OpenCommit uses [OpenAI](https://openai.com).
-
-You could switch to [Azure OpenAI Service](https://learn.microsoft.com/azure/cognitive-services/openai/)🚀
-
-```sh
-opencommit config set OCO_AI_PROVIDER=azure
-```
-
-Of course need to set 'OPENAI_API_KEY'. And also need to set the
-'OPENAI_BASE_PATH' for the endpoint and set the deployment name to
-'model'.
-
-### Locale configuration
-
-To globally specify the language used to generate commit messages:
-
-```sh
-# de, German ,Deutsch
-oco config set OCO_LANGUAGE=de
-oco config set OCO_LANGUAGE=German
-oco config set OCO_LANGUAGE=Deutsch
-
-# fr, French, française
-oco config set OCO_LANGUAGE=fr
-oco config set OCO_LANGUAGE=French
-oco config set OCO_LANGUAGE=française
-```
-
-The default language setting is **English**
-All available languages are currently listed in the [i18n](https://github.com/di-sukharev/opencommit/tree/master/src/i18n) folder
-
-### Push to git
-
-Pushing to git is on by default but if you would like to turn it off just use:
-
-```sh
-oco config set OCO_GITPUSH=false
-```
-
-### Switch to `@commitlint`
-
-OpenCommit allows you to choose the prompt module used to generate commit messages. By default, OpenCommit uses its conventional-commit message generator. However, you can switch to using the `@commitlint` prompt module if you prefer. This option lets you generate commit messages in respect with the local config.
-
-You can set this option by running the following command:
-
-```sh
-oco config set OCO_PROMPT_MODULE=<module>
-```
-
-Replace `<module>` with either `conventional-commit` or `@commitlint`.
-
-#### Example:
-
-To switch to using the `'@commitlint` prompt module, run:
-
-```sh
-oco config set OCO_PROMPT_MODULE=@commitlint
-```
-
-To switch back to the default conventional-commit message generator, run:
-
-```sh
-oco config set OCO_PROMPT_MODULE=conventional-commit
-```
-
-#### Integrating with `@commitlint`
-
-The integration between `@commitlint` and OpenCommit is done automatically the first time OpenCommit is run with `OCO_PROMPT_MODULE` set to `@commitlint`. However, if you need to force set or reset the configuration for `@commitlint`, you can run the following command:
-
-```sh
-oco commitlint force
-```
-
-To view the generated configuration for `@commitlint`, you can use this command:
-
-```sh
-oco commitlint get
-```
-
-This allows you to ensure that the configuration is set up as desired.
-
-Additionally, the integration creates a file named `.opencommit-commitlint` which contains the prompts used for the local `@commitlint` configuration. You can modify this file to fine-tune the example commit message generated by OpenAI. This gives you the flexibility to make adjustments based on your preferences or project guidelines.
-
-OpenCommit generates a file named `.opencommit-commitlint` in your project directory which contains the prompts used for the local `@commitlint` configuration. You can modify this file to fine-tune the example commit message generated by OpenAI. If the local `@commitlint` configuration changes, this file will be updated the next time OpenCommit is run.
-
-This offers you greater control over the generated commit messages, allowing for customization that aligns with your project's conventions.
-
-## Git flags
-
-The `opencommit` or `oco` commands can be used in place of the `git commit -m "${generatedMessage}"` command. This means that any regular flags that are used with the `git commit` command will also be applied when using `opencommit` or `oco`.
-
-```sh
-oco --no-verify
-```
-
-is translated to :
-
-```sh
-git commit -m "${generatedMessage}" --no-verify
-```
-
-To include a message in the generated message, you can utilize the template function, for instance:
-
-```sh
-oco '#205: $msg’
-```
-
-> opencommit examines placeholders in the parameters, allowing you to append additional information before and after the placeholders, such as the relevant Issue or Pull Request. Similarly, you have the option to customize the OCO_MESSAGE_TEMPLATE_PLACEHOLDER configuration item, for example, simplifying it to $m!"
-
-### Message Template Placeholder Config
-
-#### Overview
-
-The `OCO_MESSAGE_TEMPLATE_PLACEHOLDER` feature in the `opencommit` tool allows users to embed a custom message within the generated commit message using a template function. This configuration is designed to enhance the flexibility and customizability of commit messages, making it easier for users to include relevant information directly within their commits.
-
-#### Implementation Details
-
-In our codebase, the implementation of this feature can be found in the following segment:
-
-```javascript
-commitMessage = messageTemplate.replace(
-  config?.OCO_MESSAGE_TEMPLATE_PLACEHOLDER,
-  commitMessage
-);
-```
-
-This line is responsible for replacing the placeholder in the `messageTemplate` with the actual `commitMessage`.
-
-#### Usage
-
-For instance, using the command `oco '$msg #205’`, users can leverage this feature. The provided code represents the backend mechanics of such commands, ensuring that the placeholder is replaced with the appropriate commit message.
-
-#### Committing with the Message
-
-Once users have generated their desired commit message, they can proceed to commit using the generated message. By understanding the feature's full potential and its implementation details, users can confidently use the generated messages for their commits.
-
-### Ignore files
-
-You can remove files from being sent to OpenAI by creating a `.opencommitignore` file. For example:
-
-```ignorelang
-path/to/large-asset.zip
-**/*.jpg
-```
-
-This helps prevent opencommit from uploading artifacts and large files.
-
-By default, opencommit ignores files matching: `*-lock.*` and `*.lock`
-
-## Git hook (KILLER FEATURE)
-
-You can set OpenCommit as Git [`prepare-commit-msg`](https://git-scm.com/docs/githooks#_prepare_commit_msg) hook. Hook integrates with your IDE Source Control and allows you to edit the message before committing.
-
-To set the hook:
-
-```sh
-oco hook set
-```
-
-To unset the hook:
-
-```sh
-oco hook unset
-```
-
-To use the hook:
-
-```sh
-git add <files...>
-git commit
-```
-
-Or follow the process of your IDE Source Control feature, when it calls `git commit` command — OpenCommit will integrate into the flow.
-
-## Setup OpenCommit as a GitHub Action (BETA) 🔥
+## Setup OpenCommit as a Github Action 🔥

 OpenCommit is now available as a GitHub Action which automatically improves all new commits messages when you push to remote!

-This is great if you want to make sure all of the commits in all of your repository branches are meaningful and not lame like `fix1` or `done2`.
+This is great if you want to make sure all of the commits in all of repository branches are meaningful and not lame like `fix1` or `done2`.

-Create a file `.github/workflows/opencommit.yml` with the contents below:
+Create a file `.github/workflows/opencommit.yml` with contents below:

 ```yml
 name: 'OpenCommit Action'
@@ -386,28 +60,177 @@ jobs:
          OCO_OPENAI_API_KEY: ${{ secrets.OCO_OPENAI_API_KEY }}

          # customization
-          OCO_TOKENS_MAX_INPUT: 4096
-          OCO_TOKENS_MAX_OUTPUT: 500
+          OCO_OPENAI_MAX_TOKENS: 500
          OCO_OPENAI_BASE_PATH: ''
          OCO_DESCRIPTION: false
          OCO_EMOJI: false
-          OCO_MODEL: gpt-4o
+          OCO_MODEL: gpt-3.5-turbo
          OCO_LANGUAGE: en
-          OCO_PROMPT_MODULE: conventional-commit
 ```

-That is it. Now when you push to any branch in your repo — all NEW commits are being improved by your never-tired AI.
+That is it. Now when you push to any branch in your repo — all NEW commits are being improved by never-tired-AI.

-Make sure you exclude public collaboration branches (`main`, `dev`, `etc`) in `branches-ignore`, so OpenCommit does not rebase commits there while improving the messages.
+Make sure you exclude public collaboration branches (`main`, `dev`, `etc`) in `branches-ignore`, so OpenCommit does not rebase commits there when improving the messages.

-Interactive rebase (`rebase -i`) changes commits' SHA, so the commit history in remote becomes different from your local branch history. This is okay if you work on the branch alone, but may be inconvenient for other collaborators.
+Interactive rebase (`rebase -i`) changes commit SHA, so commit history in remote becomes different with your local branch history. It's ok when you work on the branch alone, but may be inconvenient for other collaborators.
+
+## Setup OpenCommit as a CLI
+
+You can use OpenCommit by simply running it via CLI like this `oco`. 2 seconds and your staged changes are committed with a meaningful message.
+
+1. Install OpenCommit globally to use in any repository:
+
+   ```sh
+   npm install -g opencommit
+   ```
+
+2. Get your API key from [OpenAI](https://platform.openai.com/account/api-keys). Make sure you add payment details, so API works.
+
+3. Set the key to OpenCommit config:
+
+   ```sh
+   opencommit config set OCO_OPENAI_API_KEY=<your_api_key>
+   ```
+
+   Your api key is stored locally in `~/.opencommit` config file.
+
+## Usage
+
+You can call OpenCommit directly to generate a commit message for your staged changes:
+
+```sh
+git add <files...>
+opencommit
+```
+
+You can also use the `oco` shortcut:
+
+```sh
+git add <files...>
+oc
+```
+
+## Configuration
+
+### Local per repo configuration
+
+Create an `.env` file and add OpenCommit config variables there like this:
+
+```env
+OCO_OPENAI_API_KEY=<your openAI API token>
+OCO_OPENAI_MAX_TOKENS=<max response tokens from openAI API>
+OCO_OPENAI_BASE_PATH=<may be used to set proxy path to openAI api>
+OCO_DESCRIPTION=<postface a message with ~3 sentences description>
+OCO_EMOJI=<add GitMoji>
+OCO_MODEL=<either gpt-3.5-turbo or gpt-4>
+OCO_LANGUAGE=<locale, scroll to the bottom to see options>
+```
+
+### Global config for all repos
+
+Local config still has more priority as Global config, but you may set `OCO_MODEL` and `OCO_LOCALE` globally and set local configs for `OCO_EMOJI` and `OCO_DESCRIPTION` per repo which is more convenient.
+
+Simply run any of the variable above like this:
+
+```sh
+oco config set OCO_OPENAI_API_KEY=gpt-4
+```
+
+Configure [GitMoji](https://gitmoji.dev/) to preface a message.
+
+```sh
+oco config set OCO_EMOJI=true
+```
+
+To remove preface emoji:
+
+```sh
+oco config set OCO_EMOJI=false
+```
+
+### Switch to GPT-4
+
+By default OpenCommit uses GPT-3.5-turbo (ChatGPT).
+
+You may switch to GPT-4 which performs better, but costs ~x15 times more 🤠
+
+```sh
+oco config set OCO_MODEL=gpt-4
+```
+
+Make sure you do lowercase `gpt-4` and you have API access to the 4th model. Even if you have ChatGPT+ it doesn't necessarily mean that you have API access to GPT-4.
+
+## Locale configuration
+
+To globally specify the language used to generate commit messages:
+
+```sh
+# de, German ,Deutsch
+oco config set OCO_LANGUAGE=de
+oco config set OCO_LANGUAGE=German
+oco config set OCO_LANGUAGE=Deutsch
+
+# fr, French, française
+oco config set OCO_LANGUAGE=fr
+oco config set OCO_LANGUAGE=French
+oco config set OCO_LANGUAGE=française
+```
+
+The default language set is **English**
+All available languages are currently listed in the [i18n](https://github.com/di-sukharev/opencommit/tree/master/src/i18n) folder
+
+### Git flags
+
+The `opencommit` or `oco` commands can be used in place of the `git commit -m "${generatedMessage}"` command. This means that any regular flags that are used with the `git commit` command will also be applied when using `opencommit` or `oco`.
+
+```sh
+oco --no-verify
+```
+
+is translated to :
+
+```sh
+git commit -m "${generatedMessage}" --no-verify
+```
+
+### Ignore files
+
+You can ignore files from submission to OpenAI by creating a `.opencommitignore` file. For example:
+
+```ignorelang
+path/to/large-asset.zip
+**/*.jpg
+```
+
+This is useful for preventing opencommit from uploading artifacts and large files.
+
+By default, opencommit ignores files matching: `*-lock.*` and `*.lock`
+
+## Git hook (KILLER FEATURE)
+
+You can set OpenCommit as Git [`prepare-commit-msg`](https://git-scm.com/docs/githooks#_prepare_commit_msg) hook. Hook integrates with you IDE Source Control and allows you edit the message before commit.
+
+To set the hook:
+
+```sh
+oco hook set
+```
+
+To unset the hook:
+
+```sh
+oco hook unset
+```
+
+To use the hook:
+
+```sh
+git add <files...>
+git commit
+```
+
+Or follow the process of your IDE Source Control feature, when it calls `git commit` command — OpenCommit will integrate into the flow.

 ## Payments

-You pay for your requests to OpenAI API on your own.
-
-OpenCommit stores your key locally.
-
-OpenCommit by default uses 3.5-turbo model, it should not exceed $0.10 per casual working day.
-
-You may switch to gpt-4, it's better, but more expensive.
+You pay for your own requests to OpenAI API. OpenCommit uses ChatGPT (3.5-turbo) official model, that is ~15x times cheaper than GPT-4.
--- a/example.txt
+++ b/example.txt
--- a/jest.config.ts
+++ b/jest.config.ts
@@ -1,28 +0,0 @@
-/**
- * For a detailed explanation regarding each configuration property, visit:
- * https://jestjs.io/docs/configuration
- */
-
-import type { Config } from 'jest';
-
-const config: Config = {
-  testTimeout: 100_000,
-  coverageProvider: 'v8',
-  moduleDirectories: ['node_modules', 'src'],
-  preset: 'ts-jest/presets/js-with-ts-esm',
-  setupFilesAfterEnv: ['<rootDir>/test/jest-setup.ts'],
-  testEnvironment: 'node',
-  testRegex: ['.*\\.test\\.ts$'],
-  transformIgnorePatterns: ['node_modules/(?!cli-testing-library)'],
-  transform: {
-    '^.+\\.(ts|tsx)$': [
-      'ts-jest',
-      {
-        diagnostics: false,
-        useESM: true
-      }
-    ]
-  }
-};
-
-export default config;
--- a/out/cli.cjs
+++ b/out/cli.cjs
--- a/out/github-action.cjs
+++ b/out/github-action.cjs
--- a/out/tiktoken_bg.wasm
+++ b/out/tiktoken_bg.wasm
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "opencommit",
-  "version": "3.0.20",
+  "version": "2.2.4",
  "description": "Auto-generate impressive commits in 1 second. Killing lame commits with AI 🤯🔫",
  "keywords": [
    "git",
@@ -12,8 +12,7 @@
    "aicommit",
    "aicommits",
    "gptcommit",
-    "commit",
-    "ollama"
+    "commit"
  ],
  "main": "cli.js",
  "bin": {
@@ -27,8 +26,7 @@
  "author": "https://github.com/di-sukharev",
  "license": "MIT",
  "files": [
-    "out/cli.cjs",
-    "out/tiktoken_bg.wasm"
+    "out/**/*"
  ],
  "release": {
    "branches": [
@@ -41,39 +39,24 @@
  "scripts": {
    "watch": "npm run -S build -- --sourcemap --watch",
    "start": "node ./out/cli.cjs",
-    "ollama:start": "OCO_AI_PROVIDER='ollama' node ./out/cli.cjs",
    "dev": "ts-node ./src/cli.ts",
-    "dev:gemini": "OCO_AI_PROVIDER='gemini' ts-node ./src/cli.ts",
    "build": "rimraf out && node esbuild.config.js",
+    "deploy": "npm run build:push && npm version patch && npm run postversion",
    "build:push": "npm run build && git add . && git commit -m 'build' && git push",
-    "deploy": "npm run build:push && git push --tags && npm publish --tag latest",
-    "deploy:patch": "npm version patch && npm run deploy",
+    "postversion": "npm run build && git add . && git commit --amend --no-edit && git push && git push --tags && npm publish --tag latest",
    "lint": "eslint src --ext ts && tsc --noEmit",
-    "format": "prettier --write src",
-    "test": "node --no-warnings --experimental-vm-modules $( [ -f ./node_modules/.bin/jest ] && echo ./node_modules/.bin/jest || which jest ) test/unit",
-    "test:all": "npm run test:unit:docker && npm run test:e2e:docker",
-    "test:docker-build": "docker build -t oco-test -f test/Dockerfile .",
-    "test:unit": "NODE_OPTIONS=--experimental-vm-modules jest test/unit",
-    "test:unit:docker": "npm run test:docker-build && DOCKER_CONTENT_TRUST=0 docker run --rm oco-test npm run test:unit",
-    "test:e2e": "npm run test:e2e:setup && jest test/e2e",
-    "test:e2e:setup": "sh test/e2e/setup.sh",
-    "test:e2e:docker": "npm run test:docker-build && DOCKER_CONTENT_TRUST=0 docker run --rm oco-test npm run test:e2e"
+    "format": "prettier --write src"
  },
  "devDependencies": {
-    "@commitlint/types": "^17.4.4",
    "@types/ini": "^1.3.31",
    "@types/inquirer": "^9.0.3",
-    "@types/jest": "^29.5.12",
    "@types/node": "^16.18.14",
    "@typescript-eslint/eslint-plugin": "^5.45.0",
    "@typescript-eslint/parser": "^5.45.0",
-    "cli-testing-library": "^2.0.2",
    "dotenv": "^16.0.3",
    "esbuild": "^0.15.18",
    "eslint": "^8.28.0",
-    "jest": "^29.7.0",
    "prettier": "^2.8.4",
-    "ts-jest": "^29.1.2",
    "ts-node": "^10.9.1",
    "typescript": "^4.9.3"
  },
@@ -81,25 +64,17 @@
    "@actions/core": "^1.10.0",
    "@actions/exec": "^1.1.1",
    "@actions/github": "^5.1.1",
-    "@azure/openai": "^1.0.0-beta.12",
-    "@anthropic-ai/sdk": "^0.19.2",
    "@clack/prompts": "^0.6.1",
    "@dqbd/tiktoken": "^1.0.2",
-    "@google/generative-ai": "^0.11.4",
    "@octokit/webhooks-schemas": "^6.11.0",
    "@octokit/webhooks-types": "^6.11.0",
-    "ai": "^2.2.14",
    "axios": "^1.3.4",
    "chalk": "^5.2.0",
    "cleye": "^1.3.2",
-    "crypto": "^1.0.1",
    "execa": "^7.0.0",
    "ignore": "^5.2.4",
    "ini": "^3.0.1",
    "inquirer": "^9.1.4",
    "openai": "^3.2.1"
-  },
-  "overrides": {
-    "whatwg-url": "13.0.0"
  }
 }
--- a/src/CommandsEnum.ts
+++ b/src/CommandsEnum.ts
@@ -1,5 +1,4 @@
 export enum COMMANDS {
-  config = 'config',
  hook = 'hook',
-  commitlint = 'commitlint'
+  config = 'config'
 }
--- a/src/engine/openAi.ts
+++ b/src/engine/openAi.ts
@@ -1,49 +1,27 @@
+import { intro, outro } from '@clack/prompts';
 import axios from 'axios';
 import chalk from 'chalk';
-import { execa } from 'execa';
-
 import {
  ChatCompletionRequestMessage,
  Configuration as OpenAiApiConfiguration,
  OpenAIApi
 } from 'openai';

-import { intro, outro } from '@clack/prompts';
-
-import {
-  CONFIG_MODES,
-  DEFAULT_TOKEN_LIMITS,
-  getConfig
-} from '../commands/config';
-import { GenerateCommitMessageErrorEnum } from '../generateCommitMessageFromGitDiff';
-import { tokenCount } from '../utils/tokenCount';
-import { AiEngine } from './Engine';
-import { MODEL_LIST } from '../commands/config';
+import { CONFIG_MODES, getConfig } from './commands/config';

 const config = getConfig();

-const MAX_TOKENS_OUTPUT =
-  config?.OCO_TOKENS_MAX_OUTPUT ||
-  DEFAULT_TOKEN_LIMITS.DEFAULT_MAX_TOKENS_OUTPUT;
-const MAX_TOKENS_INPUT =
-  config?.OCO_TOKENS_MAX_INPUT || DEFAULT_TOKEN_LIMITS.DEFAULT_MAX_TOKENS_INPUT;
+let maxTokens = config?.OCO_OPENAI_MAX_TOKENS;
 let basePath = config?.OCO_OPENAI_BASE_PATH;
 let apiKey = config?.OCO_OPENAI_API_KEY;

 const [command, mode] = process.argv.slice(2);

-const provider = config?.OCO_AI_PROVIDER;
-
-if (
-  provider === 'openai' &&
-  !apiKey &&
-  command !== 'config' &&
-  mode !== CONFIG_MODES.set
-) {
+if (!apiKey && command !== 'config' && mode !== CONFIG_MODES.set) {
  intro('opencommit');

  outro(
-    'OCO_OPENAI_API_KEY is not set, please run `oco config set OCO_OPENAI_API_KEY=<your token> . If you are using GPT, make sure you add payment details, so API works.`'
+    'OCO_OPENAI_API_KEY is not set, please run `oco config set OCO_OPENAI_API_KEY=<your token>. Make sure you add payment details, so API works.`'
  );
  outro(
    'For help look into README https://github.com/di-sukharev/opencommit#setup'
@@ -53,18 +31,8 @@ if (
 }

 const MODEL = config?.OCO_MODEL || 'gpt-3.5-turbo';
-if (provider === 'openai' &&
-  typeof MODEL !== 'string' && 
-    command !== 'config' &&
-    mode !== CONFIG_MODES.set) {
-  outro(
-    `${chalk.red('✖')} Unsupported model ${MODEL}. The model can be any string, but the current configuration is not supported.`
-  );
-  process.exit(1);
-}

-export class OpenAi implements AiEngine {
-  
+class OpenAi {
  private openAiApiConfiguration = new OpenAiApiConfiguration({
    apiKey: apiKey
  });
@@ -85,17 +53,9 @@ export class OpenAi implements AiEngine {
      messages,
      temperature: 0,
      top_p: 0.1,
-      max_tokens: MAX_TOKENS_OUTPUT
+      max_tokens: maxTokens || 500
    };
    try {
-      const REQUEST_TOKENS = messages
-        .map((msg) => tokenCount(msg.content as string) + 4)
-        .reduce((a, b) => a + b, 0);
-
-      if (REQUEST_TOKENS > MAX_TOKENS_INPUT - MAX_TOKENS_OUTPUT) {
-        throw new Error(GenerateCommitMessageErrorEnum.tooMuchTokens);
-      }
-
      const { data } = await this.openAI.createChatCompletion(params);

      const message = data.choices[0].message;
@@ -122,6 +82,20 @@ export class OpenAi implements AiEngine {
      throw err;
    }
  };
-  
 }

+export const getOpenCommitLatestVersion = async (): Promise<
+  string | undefined
+> => {
+  try {
+    const { data } = await axios.get(
+      'https://unpkg.com/opencommit/package.json'
+    );
+    return data.version;
+  } catch (_) {
+    outro('Error while getting the latest version of opencommit');
+    return undefined;
+  }
+};
+
+export const api = new OpenAi();
--- a/src/cli.ts
+++ b/src/cli.ts
@@ -1,13 +1,12 @@
 #!/usr/bin/env node

 import { cli } from 'cleye';
+import packageJSON from '../package.json' assert { type: 'json' };

-import packageJSON from '../package.json';
-import { commit } from './commands/commit';
-import { commitlintConfigCommand } from './commands/commitlint';
 import { configCommand } from './commands/config';
 import { hookCommand, isHookCalled } from './commands/githook.js';
 import { prepareCommitMessageHook } from './commands/prepare-commit-msg-hook';
+import { commit } from './commands/commit';
 import { checkIsLatestVersion } from './utils/checkIsLatestVersion';

 const extraArgs = process.argv.slice(2);
@@ -16,26 +15,18 @@ cli(
  {
    version: packageJSON.version,
    name: 'opencommit',
-    commands: [configCommand, hookCommand, commitlintConfigCommand],
-    flags: {
-      fgm: Boolean,
-      yes: {
-        type: Boolean,
-        alias: 'y',
-        description: 'Skip commit confirmation prompt',
-        default: false
-      }
-    },
+    commands: [configCommand, hookCommand],
+    flags: {},
    ignoreArgv: (type) => type === 'unknown-flag' || type === 'argument',
    help: { description: packageJSON.description }
  },
-  async ({ flags }) => {
+  async () => {
    await checkIsLatestVersion();

    if (await isHookCalled()) {
      prepareCommitMessageHook();
    } else {
-      commit(extraArgs, false, flags.fgm, flags.yes);
+      commit(extraArgs);
    }
  },
  extraArgs
--- a/src/commands/README.md
+++ b/src/commands/README.md
@@ -1,9 +0,0 @@
-# @commitlint Module for opencommit
-
-1. Load commitlint configuration within tree.
-2. Generate a commit with commitlint prompt:
-   - Will not run if hash is the same.
-   - Infer a prompt for each commitlint rule.
-   - Ask OpenAI to generate consistency with embedded commitlint rules.
-   - Store configuration close to commitlint configuration.
-3. Replace conventional-commit prompt with commitlint prompt.
--- a/src/commands/commit.ts
+++ b/src/commands/commit.ts
@@ -1,17 +1,7 @@
-import chalk from 'chalk';
 import { execa } from 'execa';
-
 import {
-  confirm,
-  intro,
-  isCancel,
-  multiselect,
-  outro,
-  select,
-  spinner
-} from '@clack/prompts';
-
-import { generateCommitMessageByDiff } from '../generateCommitMessageFromGitDiff';
+  generateCommitMessageByDiff
+} from '../generateCommitMessageFromGitDiff';
 import {
  assertGitRepo,
  getChangedFiles,
@@ -19,65 +9,44 @@ import {
  getStagedFiles,
  gitAdd
 } from '../utils/git';
+import {
+  spinner,
+  confirm,
+  outro,
+  isCancel,
+  intro,
+  multiselect,
+  select
+} from '@clack/prompts';
+import chalk from 'chalk';
 import { trytm } from '../utils/trytm';
-import { getConfig } from './config';
-
-const config = getConfig();

 const getGitRemotes = async () => {
  const { stdout } = await execa('git', ['remote']);
  return stdout.split('\n').filter((remote) => Boolean(remote.trim()));
 };

-// Check for the presence of message templates
-const checkMessageTemplate = (extraArgs: string[]): string | false => {
-  for (const key in extraArgs) {
-    if (extraArgs[key].includes(config?.OCO_MESSAGE_TEMPLATE_PLACEHOLDER))
-      return extraArgs[key];
-  }
-  return false;
-};
-
 const generateCommitMessageFromGitDiff = async (
  diff: string,
-  extraArgs: string[],
-  fullGitMojiSpec: boolean,
-  skipCommitConfirmation: boolean
+  extraArgs: string[]
 ): Promise<void> => {
  await assertGitRepo();
+
  const commitSpinner = spinner();
  commitSpinner.start('Generating the commit message');
-
  try {
-    let commitMessage = await generateCommitMessageByDiff(
-      diff,
-      fullGitMojiSpec
-    );
-
-    const messageTemplate = checkMessageTemplate(extraArgs);
-    if (
-      config?.OCO_MESSAGE_TEMPLATE_PLACEHOLDER &&
-      typeof messageTemplate === 'string'
-    ) {
-      const messageTemplateIndex = extraArgs.indexOf(messageTemplate);
-      extraArgs.splice(messageTemplateIndex, 1);
-
-      commitMessage = messageTemplate.replace(
-        config?.OCO_MESSAGE_TEMPLATE_PLACEHOLDER,
-        commitMessage
-      );
-    }
+    const commitMessage = await generateCommitMessageByDiff(diff);

    commitSpinner.stop('📝 Commit message generated');

    outro(
-      `Generated commit message:
+      `Commit message:
 ${chalk.grey('——————————————————')}
 ${commitMessage}
 ${chalk.grey('——————————————————')}`
    );

-    const isCommitConfirmedByUser = skipCommitConfirmation || await confirm({
+    const isCommitConfirmedByUser = await confirm({
      message: 'Confirm the commit message?'
    });

@@ -95,17 +64,13 @@ ${chalk.grey('——————————————————')}`

      const remotes = await getGitRemotes();

-      // user isn't pushing, return early
-      if (config?.OCO_GITPUSH === false)
-          return
-
      if (!remotes.length) {
        const { stdout } = await execa('git', ['push']);
        if (stdout) outro(stdout);
        process.exit(0);
      }

-      if (remotes.length === 1 && config?.OCO_GITPUSH !== true) {
+      if (remotes.length === 1) {
        const isPushConfirmedByUser = await confirm({
          message: 'Do you want to run `git push`?'
        });
@@ -113,7 +78,7 @@ ${chalk.grey('——————————————————')}`
        if (isPushConfirmedByUser && !isCancel(isPushConfirmedByUser)) {
          const pushSpinner = spinner();

-          pushSpinner.start(`Running 'git push ${remotes[0]}'`);
+          pushSpinner.start(`Running \`git push ${remotes[0]}\``);

          const { stdout } = await execa('git', [
            'push',
@@ -141,7 +106,7 @@ ${chalk.grey('——————————————————')}`
        if (!isCancel(selectedRemote)) {
          const pushSpinner = spinner();

-          pushSpinner.start(`Running 'git push ${selectedRemote}'`);
+          pushSpinner.start(`Running \`git push ${selectedRemote}\``);

          const { stdout } = await execa('git', ['push', selectedRemote]);

@@ -155,18 +120,6 @@ ${chalk.grey('——————————————————')}`
        } else outro(`${chalk.gray('✖')} process cancelled`);
      }
    }
-    if (!isCommitConfirmedByUser && !isCancel(isCommitConfirmedByUser)) {
-      const regenerateMessage = await confirm({
-        message: 'Do you want to regenerate the message ?'
-      });
-      if (regenerateMessage && !isCancel(isCommitConfirmedByUser)) {
-        await generateCommitMessageFromGitDiff(
-          diff,
-          extraArgs,
-          fullGitMojiSpec
-        )
-      }
-    }
  } catch (error) {
    commitSpinner.stop('📝 Commit message generated');

@@ -178,9 +131,7 @@ ${chalk.grey('——————————————————')}`

 export async function commit(
  extraArgs: string[] = [],
-  isStageAllFlag: Boolean = false,
-  fullGitMojiSpec: boolean = false,
-  skipCommitConfirmation: boolean = false
+  isStageAllFlag: Boolean = false
 ) {
  if (isStageAllFlag) {
    const changedFiles = await getChangedFiles();
@@ -220,7 +171,7 @@ export async function commit(
      isStageAllAndCommitConfirmedByUser &&
      !isCancel(isStageAllAndCommitConfirmedByUser)
    ) {
-      await commit(extraArgs, true, fullGitMojiSpec);
+      await commit(extraArgs, true);
      process.exit(1);
    }

@@ -238,7 +189,7 @@ export async function commit(
      await gitAdd({ files });
    }

-    await commit(extraArgs, false, fullGitMojiSpec);
+    await commit(extraArgs, false);
    process.exit(1);
  }

@@ -251,9 +202,7 @@ export async function commit(
  const [, generateCommitError] = await trytm(
    generateCommitMessageFromGitDiff(
      await getDiff({ files: stagedFiles }),
-      extraArgs,
-      fullGitMojiSpec,
-      skipCommitConfirmation
+      extraArgs
    )
  );

--- a/src/commands/commitlint.ts
+++ b/src/commands/commitlint.ts
@@ -1,46 +0,0 @@
-import chalk from 'chalk';
-import { command } from 'cleye';
-
-import { intro, outro } from '@clack/prompts';
-
-import { COMMANDS } from '../CommandsEnum';
-import { configureCommitlintIntegration } from '../modules/commitlint/config';
-import { getCommitlintLLMConfig } from '../modules/commitlint/utils';
-
-export enum CONFIG_MODES {
-  get = 'get',
-  force = 'force'
-}
-
-export const commitlintConfigCommand = command(
-  {
-    name: COMMANDS.commitlint,
-    parameters: ['<mode>']
-  },
-  async (argv) => {
-    intro('opencommit — configure @commitlint');
-    try {
-      const { mode } = argv._;
-
-      if (mode === CONFIG_MODES.get) {
-        const commitLintConfig = await getCommitlintLLMConfig();
-
-        outro(commitLintConfig.toString());
-
-        return;
-      }
-
-      if (mode === CONFIG_MODES.force) {
-        await configureCommitlintIntegration(true);
-        return;
-      }
-
-      throw new Error(
-        `Unsupported mode: ${mode}. Valid modes are: "force" and "get"`
-      );
-    } catch (error) {
-      outro(`${chalk.red('✖')} ${error}`);
-      process.exit(1);
-    }
-  }
-);
--- a/src/commands/config.ts
+++ b/src/commands/config.ts
@@ -1,41 +1,25 @@
-import chalk from 'chalk';
 import { command } from 'cleye';
-import * as dotenv from 'dotenv';
-import { existsSync, readFileSync, writeFileSync } from 'fs';
+import { join as pathJoin } from 'path';
 import { parse as iniParse, stringify as iniStringify } from 'ini';
+import { existsSync, writeFileSync, readFileSync } from 'fs';
 import { homedir } from 'os';
-import { join as pathJoin, resolve as pathResolve } from 'path';
-
 import { intro, outro } from '@clack/prompts';
-
+import chalk from 'chalk';
 import { COMMANDS } from '../CommandsEnum';
 import { getI18nLocal } from '../i18n';
-import { TEST_MOCK_TYPES } from '../engine/testAi';
+
+import * as dotenv from 'dotenv';
+
+dotenv.config();

 export enum CONFIG_KEYS {
  OCO_OPENAI_API_KEY = 'OCO_OPENAI_API_KEY',
-  OCO_ANTHROPIC_API_KEY = 'OCO_ANTHROPIC_API_KEY',
-  OCO_AZURE_API_KEY = 'OCO_AZURE_API_KEY',
-  OCO_GEMINI_API_KEY = 'OCO_GEMINI_API_KEY',
-  OCO_GEMINI_BASE_PATH = 'OCO_GEMINI_BASE_PATH',
-  OCO_TOKENS_MAX_INPUT = 'OCO_TOKENS_MAX_INPUT',
-  OCO_TOKENS_MAX_OUTPUT = 'OCO_TOKENS_MAX_OUTPUT',
+  OCO_OPENAI_MAX_TOKENS = 'OCO_OPENAI_MAX_TOKENS',
  OCO_OPENAI_BASE_PATH = 'OCO_OPENAI_BASE_PATH',
  OCO_DESCRIPTION = 'OCO_DESCRIPTION',
  OCO_EMOJI = 'OCO_EMOJI',
  OCO_MODEL = 'OCO_MODEL',
-  OCO_LANGUAGE = 'OCO_LANGUAGE',
-  OCO_MESSAGE_TEMPLATE_PLACEHOLDER = 'OCO_MESSAGE_TEMPLATE_PLACEHOLDER',
-  OCO_PROMPT_MODULE = 'OCO_PROMPT_MODULE',
-  OCO_AI_PROVIDER = 'OCO_AI_PROVIDER',
-  OCO_GITPUSH = 'OCO_GITPUSH',
-  OCO_ONE_LINE_COMMIT = 'OCO_ONE_LINE_COMMIT',
-  OCO_AZURE_ENDPOINT = 'OCO_AZURE_ENDPOINT',
-  OCO_TEST_MOCK_TYPE = 'OCO_TEST_MOCK_TYPE',
-  OCO_API_URL = 'OCO_API_URL',
-  OCO_OLLAMA_API_URL = 'OCO_OLLAMA_API_URL',
-  OCO_FLOWISE_ENDPOINT = 'OCO_FLOWISE_ENDPOINT',
-  OCO_FLOWISE_API_KEY = 'OCO_FLOWISE_API_KEY'
+  OCO_LANGUAGE = 'OCO_LANGUAGE'
 }

 export enum CONFIG_MODES {
@@ -43,70 +27,6 @@ export enum CONFIG_MODES {
  set = 'set'
 }

-export const MODEL_LIST = {
-  openai: [
-    'gpt-4o-mini',
-    'gpt-3.5-turbo',
-    'gpt-3.5-turbo-instruct',
-    'gpt-3.5-turbo-0613',
-    'gpt-3.5-turbo-0301',
-    'gpt-3.5-turbo-1106',
-    'gpt-3.5-turbo-0125',
-    'gpt-3.5-turbo-16k',
-    'gpt-3.5-turbo-16k-0613',
-    'gpt-3.5-turbo-16k-0301',
-    'gpt-4',
-    'gpt-4-0314',
-    'gpt-4-0613',
-    'gpt-4-1106-preview',
-    'gpt-4-0125-preview',
-    'gpt-4-turbo-preview',
-    'gpt-4-vision-preview',
-    'gpt-4-1106-vision-preview',
-    'gpt-4-turbo',
-    'gpt-4-turbo-2024-04-09',
-    'gpt-4-32k',
-    'gpt-4-32k-0314',
-    'gpt-4-32k-0613',
-    'gpt-4o',
-    'gpt-4o-2024-05-13',
-    'gpt-4o-mini-2024-07-18'
-  ],
-
-  anthropic: [
-    'claude-3-5-sonnet-20240620',
-    'claude-3-opus-20240229',
-    'claude-3-sonnet-20240229',
-    'claude-3-haiku-20240307'
-  ],
-
-  gemini: [
-    'gemini-1.5-flash',
-    'gemini-1.5-pro',
-    'gemini-1.0-pro',
-    'gemini-pro-vision',
-    'text-embedding-004'
-  ]
-};
-
-const getDefaultModel = (provider: string | undefined): string => {
-  switch (provider) {
-    case 'ollama':
-      return '';
-    case 'anthropic':
-      return MODEL_LIST.anthropic[0];
-    case 'gemini':
-      return MODEL_LIST.gemini[0];
-    default:
-      return MODEL_LIST.openai[0];
-  }
-};
-
-export enum DEFAULT_TOKEN_LIMITS {
-  DEFAULT_MAX_TOKENS_INPUT = 4096,
-  DEFAULT_MAX_TOKENS_OUTPUT = 500
-}
-
 const validateConfig = (
  key: string,
  condition: any,
@@ -122,76 +42,17 @@ const validateConfig = (
 };

 export const configValidators = {
-  [CONFIG_KEYS.OCO_OPENAI_API_KEY](value: any, config: any = {}) {
-    if (config.OCO_AI_PROVIDER == 'gemini') return value;
-
-    //need api key unless running locally with ollama
+  [CONFIG_KEYS.OCO_OPENAI_API_KEY](value: any) {
+    validateConfig(CONFIG_KEYS.OCO_OPENAI_API_KEY, value, 'Cannot be empty');
    validateConfig(
-      'OpenAI API_KEY',
-      value ||
-        config.OCO_ANTHROPIC_API_KEY ||
-        config.OCO_AI_PROVIDER.startsWith('ollama') ||
-        config.OCO_AZURE_API_KEY ||
-        config.OCO_AI_PROVIDER == 'test' ||
-        config.OCO_AI_PROVIDER == 'flowise',
-      'You need to provide an OpenAI/Anthropic/Azure or other provider API key via `oco config set OCO_OPENAI_API_KEY=your_key`, for help refer to docs https://github.com/di-sukharev/opencommit'
+      CONFIG_KEYS.OCO_OPENAI_API_KEY,
+      value.startsWith('sk-'),
+      'Must start with "sk-"'
    );
    validateConfig(
      CONFIG_KEYS.OCO_OPENAI_API_KEY,
-      value.startsWith('sk-') || config.OCO_AI_PROVIDER != 'openai',
-      'Must start with "sk-" for openai provider'
-    );
-
-    return value;
-  },
-
-  [CONFIG_KEYS.OCO_AZURE_API_KEY](value: any, config: any = {}) {
-    validateConfig(
-      'ANTHROPIC_API_KEY',
-      value ||
-        config.OCO_OPENAI_API_KEY ||
-        config.OCO_AZURE_API_KEY ||
-        config.OCO_AI_PROVIDER == 'ollama' ||
-        config.OCO_AI_PROVIDER == 'test' ||
-        config.OCO_AI_PROVIDER == 'flowise',
-      'You need to provide an OpenAI/Anthropic/Azure API key'
-    );
-
-    return value;
-  },
-
-  [CONFIG_KEYS.OCO_GEMINI_API_KEY](value: any, config: any = {}) {
-    // only need to check for gemini api key if using gemini
-    if (config.OCO_AI_PROVIDER != 'gemini') return value;
-
-    validateConfig(
-      'Gemini API Key',
-      value || config.OCO_GEMINI_API_KEY || config.OCO_AI_PROVIDER == 'test',
-      'You need to provide an Gemini API key'
-    );
-
-    return value;
-  },
-
-  [CONFIG_KEYS.OCO_ANTHROPIC_API_KEY](value: any, config: any = {}) {
-    validateConfig(
-      'ANTHROPIC_API_KEY',
-      value ||
-        config.OCO_OPENAI_API_KEY ||
-        config.OCO_AI_PROVIDER == 'ollama' ||
-        config.OCO_AI_PROVIDER == 'test' ||
-        config.OCO_AI_PROVIDER == 'flowise',
-      'You need to provide an OpenAI/Anthropic API key'
-    );
-
-    return value;
-  },
-
-  [CONFIG_KEYS.OCO_FLOWISE_API_KEY](value: any, config: any = {}) {
-    validateConfig(
-      CONFIG_KEYS.OCO_FLOWISE_API_KEY,
-      value || config.OCO_AI_PROVIDER != 'flowise',
-      'You need to provide a flowise API key'
+      value.length === 51,
+      'Must be 51 characters long'
    );

    return value;
@@ -207,37 +68,18 @@ export const configValidators = {
    return value;
  },

-  [CONFIG_KEYS.OCO_TOKENS_MAX_INPUT](value: any) {
+  [CONFIG_KEYS.OCO_OPENAI_MAX_TOKENS](value: any) {
    // If the value is a string, convert it to a number.
    if (typeof value === 'string') {
      value = parseInt(value);
      validateConfig(
-        CONFIG_KEYS.OCO_TOKENS_MAX_INPUT,
+        CONFIG_KEYS.OCO_OPENAI_MAX_TOKENS,
        !isNaN(value),
        'Must be a number'
      );
    }
    validateConfig(
-      CONFIG_KEYS.OCO_TOKENS_MAX_INPUT,
-      value ? typeof value === 'number' : undefined,
-      'Must be a number'
-    );
-
-    return value;
-  },
-
-  [CONFIG_KEYS.OCO_TOKENS_MAX_OUTPUT](value: any) {
-    // If the value is a string, convert it to a number.
-    if (typeof value === 'string') {
-      value = parseInt(value);
-      validateConfig(
-        CONFIG_KEYS.OCO_TOKENS_MAX_OUTPUT,
-        !isNaN(value),
-        'Must be a number'
-      );
-    }
-    validateConfig(
-      CONFIG_KEYS.OCO_TOKENS_MAX_OUTPUT,
+      CONFIG_KEYS.OCO_OPENAI_MAX_TOKENS,
      value ? typeof value === 'number' : undefined,
      'Must be a number'
    );
@@ -273,110 +115,11 @@ export const configValidators = {
    return value;
  },

-  [CONFIG_KEYS.OCO_MODEL](value: any, config: any = {}) {
+  [CONFIG_KEYS.OCO_MODEL](value: any) {
    validateConfig(
      CONFIG_KEYS.OCO_MODEL,
-      typeof value === 'string',
-      `${value} is not supported yet, use:\n\n ${[
-        ...MODEL_LIST.openai,
-        ...MODEL_LIST.anthropic,
-        ...MODEL_LIST.gemini
-      ].join('\n')}`
-    );
-    return value;
-  },
-
-  [CONFIG_KEYS.OCO_MESSAGE_TEMPLATE_PLACEHOLDER](value: any) {
-    validateConfig(
-      CONFIG_KEYS.OCO_MESSAGE_TEMPLATE_PLACEHOLDER,
-      value.startsWith('$'),
-      `${value} must start with $, for example: '$msg'`
-    );
-    return value;
-  },
-
-  [CONFIG_KEYS.OCO_PROMPT_MODULE](value: any) {
-    validateConfig(
-      CONFIG_KEYS.OCO_PROMPT_MODULE,
-      ['conventional-commit', '@commitlint'].includes(value),
-      `${value} is not supported yet, use '@commitlint' or 'conventional-commit' (default)`
-    );
-    return value;
-  },
-
-  [CONFIG_KEYS.OCO_GITPUSH](value: any) {
-    validateConfig(
-      CONFIG_KEYS.OCO_GITPUSH,
-      typeof value === 'boolean',
-      'Must be true or false'
-    );
-    return value;
-  },
-
-  [CONFIG_KEYS.OCO_AI_PROVIDER](value: any) {
-    validateConfig(
-      CONFIG_KEYS.OCO_AI_PROVIDER,
-      [
-        '',
-        'openai',
-        'anthropic',
-        'gemini',
-        'azure',
-        'test',
-        'flowise'
-      ].includes(value) || value.startsWith('ollama'),
-      `${value} is not supported yet, use 'ollama', 'anthropic', 'azure', 'gemini', 'flowise' or 'openai' (default)`
-    );
-    return value;
-  },
-
-  [CONFIG_KEYS.OCO_ONE_LINE_COMMIT](value: any) {
-    validateConfig(
-      CONFIG_KEYS.OCO_ONE_LINE_COMMIT,
-      typeof value === 'boolean',
-      'Must be true or false'
-    );
-
-    return value;
-  },
-
-  [CONFIG_KEYS.OCO_AZURE_ENDPOINT](value: any) {
-    validateConfig(
-      CONFIG_KEYS.OCO_AZURE_ENDPOINT,
-      value.includes('openai.azure.com'),
-      'Must be in format "https://<resource name>.openai.azure.com/"'
-    );
-
-    return value;
-  },
-
-  [CONFIG_KEYS.OCO_FLOWISE_ENDPOINT](value: any) {
-    validateConfig(
-      CONFIG_KEYS.OCO_FLOWISE_ENDPOINT,
-      typeof value === 'string' && value.includes(':'),
-      'Value must be string and should include both I.P. and port number' // Considering the possibility of DNS lookup or feeding the I.P. explicitely, there is no pattern to verify, except a column for the port number
-    );
-
-    return value;
-  },
-
-  [CONFIG_KEYS.OCO_TEST_MOCK_TYPE](value: any) {
-    validateConfig(
-      CONFIG_KEYS.OCO_TEST_MOCK_TYPE,
-      TEST_MOCK_TYPES.includes(value),
-      `${value} is not supported yet, use ${TEST_MOCK_TYPES.map(
-        (t) => `'${t}'`
-      ).join(', ')}`
-    );
-    return value;
-  },
-
-  [CONFIG_KEYS.OCO_OLLAMA_API_URL](value: any) {
-    // add simple api validator
-    validateConfig(
-      CONFIG_KEYS.OCO_API_URL,
-      typeof value === 'string' && value.startsWith('http'),
-      `${value} is not a valid URL`
+      ['gpt-3.5-turbo', 'gpt-4'].includes(value),
+      `${value} is not supported yet, use 'gpt-4' or 'gpt-3.5-turbo' (default)`
    );
    return value;
  }
@@ -386,47 +129,19 @@ export type ConfigType = {
  [key in CONFIG_KEYS]?: any;
 };

-const defaultConfigPath = pathJoin(homedir(), '.opencommit');
-const defaultEnvPath = pathResolve(process.cwd(), '.env');
-export const getConfig = ({
-  configPath = defaultConfigPath,
-  envPath = defaultEnvPath
-}: {
-  configPath?: string;
-  envPath?: string;
-} = {}): ConfigType | null => {
-  dotenv.config({ path: envPath });
+const configPath = pathJoin(homedir(), '.opencommit');
+
+export const getConfig = (): ConfigType | null => {
  const configFromEnv = {
    OCO_OPENAI_API_KEY: process.env.OCO_OPENAI_API_KEY,
-    OCO_ANTHROPIC_API_KEY: process.env.OCO_ANTHROPIC_API_KEY,
-    OCO_AZURE_API_KEY: process.env.OCO_AZURE_API_KEY,
-    OCO_GEMINI_API_KEY: process.env.OCO_GEMINI_API_KEY,
-    OCO_TOKENS_MAX_INPUT: process.env.OCO_TOKENS_MAX_INPUT
-      ? Number(process.env.OCO_TOKENS_MAX_INPUT)
-      : undefined,
-    OCO_TOKENS_MAX_OUTPUT: process.env.OCO_TOKENS_MAX_OUTPUT
-      ? Number(process.env.OCO_TOKENS_MAX_OUTPUT)
-      : undefined,
+    OCO_OPENAI_MAX_TOKENS: process.env.OCO_OPENAI_MAX_TOKENS ? Number(process.env.OCO_OPENAI_MAX_TOKENS) : undefined,
    OCO_OPENAI_BASE_PATH: process.env.OCO_OPENAI_BASE_PATH,
-    OCO_GEMINI_BASE_PATH: process.env.OCO_GEMINI_BASE_PATH,
    OCO_DESCRIPTION: process.env.OCO_DESCRIPTION === 'true' ? true : false,
    OCO_EMOJI: process.env.OCO_EMOJI === 'true' ? true : false,
-    OCO_MODEL:
-      process.env.OCO_MODEL || getDefaultModel(process.env.OCO_AI_PROVIDER),
-    OCO_LANGUAGE: process.env.OCO_LANGUAGE || 'en',
-    OCO_MESSAGE_TEMPLATE_PLACEHOLDER:
-      process.env.OCO_MESSAGE_TEMPLATE_PLACEHOLDER || '$msg',
-    OCO_PROMPT_MODULE: process.env.OCO_PROMPT_MODULE || 'conventional-commit',
-    OCO_AI_PROVIDER: process.env.OCO_AI_PROVIDER || 'openai',
-    OCO_GITPUSH: process.env.OCO_GITPUSH === 'false' ? false : true,
-    OCO_ONE_LINE_COMMIT:
-      process.env.OCO_ONE_LINE_COMMIT === 'true' ? true : false,
-    OCO_AZURE_ENDPOINT: process.env.OCO_AZURE_ENDPOINT || undefined,
-    OCO_TEST_MOCK_TYPE: process.env.OCO_TEST_MOCK_TYPE || 'commit-message',
-    OCO_FLOWISE_ENDPOINT: process.env.OCO_FLOWISE_ENDPOINT || ':',
-    OCO_FLOWISE_API_KEY: process.env.OCO_FLOWISE_API_KEY || undefined,
-    OCO_OLLAMA_API_URL: process.env.OCO_OLLAMA_API_URL || undefined
+    OCO_MODEL: process.env.OCO_MODEL || 'gpt-3.5-turbo',
+    OCO_LANGUAGE: process.env.OCO_LANGUAGE || 'en'
  };
+
  const configExists = existsSync(configPath);
  if (!configExists) return configFromEnv;

@@ -434,24 +149,24 @@ export const getConfig = ({
  const config = iniParse(configFile);

  for (const configKey of Object.keys(config)) {
-    if (['null', 'undefined'].includes(config[configKey])) {
+    if (!config[configKey] || ['null', 'undefined'].includes(config[configKey])) {
      config[configKey] = undefined;
      continue;
    }
    try {
      const validator = configValidators[configKey as CONFIG_KEYS];
      const validValue = validator(
-        config[configKey] ?? configFromEnv[configKey as CONFIG_KEYS],
-        config
+        config[configKey] ?? configFromEnv[configKey as CONFIG_KEYS]
      );

      config[configKey] = validValue;
    } catch (error) {
-      outro(`Unknown '${configKey}' config option or missing validator.`);
+      outro(
+        `'${configKey}' name is invalid, it should be either 'OCO_${configKey.toUpperCase()}' or it doesn't exist.`
+      );
      outro(
        `Manually fix the '.env' file or global '~/.opencommit' config file.`
      );
-
      process.exit(1);
    }
  }
@@ -459,10 +174,7 @@ export const getConfig = ({
  return config;
 };

-export const setConfig = (
-  keyValues: [key: string, value: string][],
-  configPath: string = defaultConfigPath
-) => {
+export const setConfig = (keyValues: [key: string, value: string][]) => {
  const config = getConfig() || {};

  for (const [configKey, configValue] of keyValues) {
--- a/src/commands/githook.ts
+++ b/src/commands/githook.ts
@@ -1,13 +1,11 @@
-import chalk from 'chalk';
-import { command } from 'cleye';
-import { existsSync } from 'fs';
 import fs from 'fs/promises';
 import path from 'path';
-
-import { intro, outro } from '@clack/prompts';
-
-import { COMMANDS } from '../CommandsEnum.js';
+import { command } from 'cleye';
 import { assertGitRepo, getCoreHooksPath } from '../utils/git.js';
+import { existsSync } from 'fs';
+import chalk from 'chalk';
+import { intro, outro } from '@clack/prompts';
+import { COMMANDS } from '../CommandsEnum.js';

 const HOOK_NAME = 'prepare-commit-msg';
 const DEFAULT_SYMLINK_URL = path.join('.git', 'hooks', HOOK_NAME);
@@ -94,7 +92,7 @@ export const hookCommand = command(
      }

      throw new Error(
-        `Unsupported mode: ${mode}. Supported modes are: 'set' or 'unset', do: \`oco hook set\``
+        `Unsupported mode: ${mode}. Supported modes are: 'set' or 'unset'`
      );
    } catch (error) {
      outro(`${chalk.red('✖')} ${error}`);
--- a/src/commands/prepare-commit-msg-hook.ts
+++ b/src/commands/prepare-commit-msg-hook.ts
@@ -1,11 +1,9 @@
-import chalk from 'chalk';
 import fs from 'fs/promises';
-
+import chalk from 'chalk';
 import { intro, outro, spinner } from '@clack/prompts';
-
-import { generateCommitMessageByDiff } from '../generateCommitMessageFromGitDiff';
 import { getChangedFiles, getDiff, getStagedFiles, gitAdd } from '../utils/git';
 import { getConfig } from './config';
+import { generateCommitMessageByDiff } from '../generateCommitMessageFromGitDiff';

 const [messageFilePath, commitSource] = process.argv.slice(2);

@@ -39,9 +37,9 @@ export const prepareCommitMessageHook = async (

    const config = getConfig();

-    if (!config?.OCO_OPENAI_API_KEY && !config?.OCO_ANTHROPIC_API_KEY && !config?.OCO_AZURE_API_KEY) {
+    if (!config?.OCO_OPENAI_API_KEY) {
      throw new Error(
-        'No OPEN_AI_API or OCO_ANTHROPIC_API_KEY or OCO_AZURE_API_KEY exists. Set your key in ~/.opencommit'
+        'No OPEN_AI_API exists. Set your OPEN_AI_API=<key> in ~/.opencommit'
      );
    }

--- a/src/engine/Engine.ts
+++ b/src/engine/Engine.ts
@@ -1,7 +0,0 @@
-import { ChatCompletionRequestMessage } from 'openai';
-
-export interface AiEngine {
-  generateCommitMessage(
-    messages: Array<ChatCompletionRequestMessage>
-  ): Promise<string | undefined>;
-}
--- a/src/engine/anthropic.ts
+++ b/src/engine/anthropic.ts
@@ -1,120 +0,0 @@
-import axios from 'axios';
-import chalk from 'chalk';
-
-import Anthropic from '@anthropic-ai/sdk';
-import {ChatCompletionRequestMessage} from 'openai'
-import { MessageCreateParamsNonStreaming, MessageParam } from '@anthropic-ai/sdk/resources';
-
-import { intro, outro } from '@clack/prompts';
-
-import {
-  CONFIG_MODES,
-  DEFAULT_TOKEN_LIMITS,
-  getConfig
-} from '../commands/config';
-import { GenerateCommitMessageErrorEnum } from '../generateCommitMessageFromGitDiff';
-import { tokenCount } from '../utils/tokenCount';
-import { AiEngine } from './Engine';
-import { MODEL_LIST } from '../commands/config';
-
-const config = getConfig();
-
-const MAX_TOKENS_OUTPUT =
-  config?.OCO_TOKENS_MAX_OUTPUT ||
-  DEFAULT_TOKEN_LIMITS.DEFAULT_MAX_TOKENS_OUTPUT;
-const MAX_TOKENS_INPUT =
-  config?.OCO_TOKENS_MAX_INPUT || DEFAULT_TOKEN_LIMITS.DEFAULT_MAX_TOKENS_INPUT;
-
-let provider = config?.OCO_AI_PROVIDER;
-let apiKey = config?.OCO_ANTHROPIC_API_KEY;
-const [command, mode] = process.argv.slice(2);
-if (
-  provider === 'anthropic' &&
-  !apiKey &&
-  command !== 'config' &&
-  mode !== CONFIG_MODES.set
-) {
-  intro('opencommit');
-
-  outro(
-    'OCO_ANTHROPIC_API_KEY is not set, please run `oco config set OCO_ANTHROPIC_API_KEY=<your token> . If you are using Claude, make sure you add payment details, so API works.`'
-  );
-  outro(
-    'For help look into README https://github.com/di-sukharev/opencommit#setup'
-  );
-
-  process.exit(1);
-}
-
-const MODEL = config?.OCO_MODEL;
-if (provider === 'anthropic' &&
-  typeof MODEL !== 'string' && 
-  command !== 'config' &&
-  mode !== CONFIG_MODES.set) {
-outro(
-  `${chalk.red('✖')} Unsupported model ${MODEL}. The model can be any string, but the current configuration is not supported.`
-);
-process.exit(1);
-}
-
-export class AnthropicAi implements AiEngine {
-  private anthropicAiApiConfiguration = {
-    apiKey: apiKey
-  };
-  private anthropicAI!: Anthropic;
-
-  constructor() {
-    this.anthropicAI = new Anthropic(this.anthropicAiApiConfiguration);
-  }
-
-  public generateCommitMessage = async (
-    messages: Array<ChatCompletionRequestMessage>
-  ): Promise<string | undefined> => {
-
-    const systemMessage = messages.find(msg => msg.role === 'system')?.content as string;
-    const restMessages = messages.filter((msg) => msg.role !== 'system') as MessageParam[];
-
-    const params: MessageCreateParamsNonStreaming = {
-      model: MODEL,
-      system: systemMessage,
-      messages: restMessages,
-      temperature: 0,
-      top_p: 0.1,
-      max_tokens: MAX_TOKENS_OUTPUT
-    };
-    try {
-      const REQUEST_TOKENS = messages
-        .map((msg) => tokenCount(msg.content as string) + 4)
-        .reduce((a, b) => a + b, 0);
-
-      if (REQUEST_TOKENS > MAX_TOKENS_INPUT - MAX_TOKENS_OUTPUT) {
-        throw new Error(GenerateCommitMessageErrorEnum.tooMuchTokens);
-      }
-
-      const data  = await this.anthropicAI.messages.create(params);
-
-      const message = data?.content[0].text;
-
-      return message;
-    } catch (error) {
-      outro(`${chalk.red('✖')} ${JSON.stringify(params)}`);
-
-      const err = error as Error;
-      outro(`${chalk.red('✖')} ${err?.message || err}`);
-
-      if (
-        axios.isAxiosError<{ error?: { message: string } }>(error) &&
-        error.response?.status === 401
-      ) {
-        const anthropicAiError = error.response.data.error;
-
-        if (anthropicAiError?.message) outro(anthropicAiError.message);
-        outro(
-          'For help look into README https://github.com/di-sukharev/opencommit#setup'
-        );
-      }
-
-      throw err;
-    }
-  };
-}
--- a/src/engine/azure.ts
+++ b/src/engine/azure.ts
@@ -1,109 +0,0 @@
-import axios from 'axios';
-import chalk from 'chalk';
-import { execa } from 'execa';
-import {
-  ChatCompletionRequestMessage,
-} from 'openai';
-
-import { OpenAIClient, AzureKeyCredential } from '@azure/openai';
-
-import { intro, outro } from '@clack/prompts';
-
-import {
-  CONFIG_MODES,
-  DEFAULT_TOKEN_LIMITS,
-  getConfig
-} from '../commands/config';
-import { GenerateCommitMessageErrorEnum } from '../generateCommitMessageFromGitDiff';
-import { tokenCount } from '../utils/tokenCount';
-import { AiEngine } from './Engine';
-
-const config = getConfig();
-
-const MAX_TOKENS_OUTPUT =
-  config?.OCO_TOKENS_MAX_OUTPUT ||
-  DEFAULT_TOKEN_LIMITS.DEFAULT_MAX_TOKENS_OUTPUT;
-const MAX_TOKENS_INPUT =
-  config?.OCO_TOKENS_MAX_INPUT || DEFAULT_TOKEN_LIMITS.DEFAULT_MAX_TOKENS_INPUT;
-let basePath = config?.OCO_OPENAI_BASE_PATH;
-let apiKey = config?.OCO_AZURE_API_KEY;
-let apiEndpoint = config?.OCO_AZURE_ENDPOINT;
-
-const [command, mode] = process.argv.slice(2);
-
-const provider = config?.OCO_AI_PROVIDER;
-
-if (
-  provider === 'azure' &&
-  !apiKey &&
-  !apiEndpoint &&
-  command !== 'config' &&
-  mode !== CONFIG_MODES.set
-) {
-  intro('opencommit');
-
-  outro(
-    'OCO_AZURE_API_KEY or OCO_AZURE_ENDPOINT are not set, please run `oco config set OCO_AZURE_API_KEY=<your token> . If you are using GPT, make sure you add payment details, so API works.`'
-  );
-  outro(
-    'For help look into README https://github.com/di-sukharev/opencommit#setup'
-  );
-
-  process.exit(1);
-}
-
-const MODEL = config?.OCO_MODEL || 'gpt-3.5-turbo';
-
-export class Azure implements AiEngine {
-  private openAI!: OpenAIClient;
-
-  constructor() {
-    if (provider === 'azure') {
-      this.openAI = new OpenAIClient(apiEndpoint, new AzureKeyCredential(apiKey));
-    }
-  }
-
-  public generateCommitMessage = async (
-    messages: Array<ChatCompletionRequestMessage>
-  ): Promise<string | undefined> => {
-    try {
-      const REQUEST_TOKENS = messages
-        .map((msg) => tokenCount(msg.content) + 4)
-        .reduce((a, b) => a + b, 0);
-
-      if (REQUEST_TOKENS > MAX_TOKENS_INPUT - MAX_TOKENS_OUTPUT) {
-        throw new Error(GenerateCommitMessageErrorEnum.tooMuchTokens);
-      }
-
-      const data = await this.openAI.getChatCompletions(MODEL, messages);
-
-      const message = data.choices[0].message;
-
-      if (message?.content === null) {
-        return undefined;
-      }
-      return message?.content;
-    } catch (error) {
-      outro(`${chalk.red('✖')} ${MODEL}`);
-
-      const err = error as Error;
-      outro(`${chalk.red('✖')} ${err?.message || err}`);
-
-      if (
-        axios.isAxiosError<{ error?: { message: string } }>(error) &&
-        error.response?.status === 401
-      ) {
-        const openAiError = error.response.data.error;
-
-        if (openAiError?.message) outro(openAiError.message);
-        outro(
-          'For help look into README https://github.com/di-sukharev/opencommit#setup'
-        );
-      }
-
-      throw err;
-    }
-  };
-}
-
-export const azure = new Azure();
--- a/src/engine/flowise.ts
+++ b/src/engine/flowise.ts
@@ -1,43 +0,0 @@
-import axios, { AxiosError } from 'axios';
-import { ChatCompletionRequestMessage } from 'openai';
-import { AiEngine } from './Engine';
-
-import {
-  getConfig
-} from '../commands/config';
-
-const config = getConfig();
-
-export class FlowiseAi implements AiEngine {
-
-  async generateCommitMessage(
-    messages: Array<ChatCompletionRequestMessage>
-  ): Promise<string | undefined> {
-
-    const gitDiff = messages[ messages.length - 1 ]?.content?.replace(/\\/g, '\\\\')  
-                                                            .replace(/"/g, '\\"')    
-                                                            .replace(/\n/g, '\\n')   
-                                                            .replace(/\r/g, '\\r')   
-                                                            .replace(/\t/g, '\\t');  
-    const url = `http://${config?.OCO_FLOWISE_ENDPOINT}/api/v1/prediction/${config?.OCO_FLOWISE_API_KEY}`; 
-    const payload = {
-        question : gitDiff,
-        overrideConfig : {
-          systemMessagePrompt: messages[0]?.content,
-        },
-        history : messages.slice( 1, -1 ) 
-    }
-    try {
-      const response = await axios.post(url, payload, {
-        headers: {
-          'Content-Type': 'application/json'
-        }
-      });
-      const message = response.data;
-      return message?.text;
-    } catch (err: any) {
-      const message = err.response?.data?.error ?? err.message;
-      throw new Error('local model issues. details: ' + message);
-    }
-  }
-}
--- a/src/engine/gemini.ts
+++ b/src/engine/gemini.ts
@@ -1,133 +0,0 @@
-import { ChatCompletionRequestMessage } from 'openai';
-import { AiEngine } from './Engine';
-import { Content, GenerativeModel, GoogleGenerativeAI, HarmBlockThreshold, HarmCategory, Part } from '@google/generative-ai';
-import { CONFIG_MODES, ConfigType, DEFAULT_TOKEN_LIMITS, getConfig, MODEL_LIST } from '../commands/config';
-import { intro, outro } from '@clack/prompts';
-import chalk from 'chalk';
-import axios from 'axios';
-
-
-export class Gemini implements AiEngine {
-
-  private readonly config: ConfigType;
-  private readonly googleGenerativeAi: GoogleGenerativeAI;
-  private ai: GenerativeModel;
-
-  // vars 
-  private maxTokens = {
-    input: DEFAULT_TOKEN_LIMITS.DEFAULT_MAX_TOKENS_INPUT,
-    output: DEFAULT_TOKEN_LIMITS.DEFAULT_MAX_TOKENS_OUTPUT
-  };
-  private basePath: string;
-  private apiKey: string;
-  private model: string;
-
-  constructor() {
-    this.config = getConfig() as ConfigType;
-    this.googleGenerativeAi = new GoogleGenerativeAI(this.config.OCO_GEMINI_API_KEY);
-    
-    this.warmup();
-  }
-
-  async generateCommitMessage(messages: ChatCompletionRequestMessage[]): Promise<string | undefined> {
-    const systemInstruction = messages.filter(m => m.role === 'system')
-      .map(m => m.content)
-      .join('\n');
-    
-    this.ai = this.googleGenerativeAi.getGenerativeModel({
-      model: this.model,
-      systemInstruction,
-    });
-    
-    const contents = messages.filter(m => m.role !== 'system')
-      .map(m => ({ parts: [{ text: m.content } as Part], role: m.role == 'user' ? m.role : 'model', } as Content));
-      
-    try {
-      const result = await this.ai.generateContent({
-        contents, 
-        safetySettings: [
-          { 
-            category: HarmCategory.HARM_CATEGORY_DANGEROUS_CONTENT, 
-            threshold: HarmBlockThreshold.BLOCK_LOW_AND_ABOVE, 
-          },
-          {
-            category: HarmCategory.HARM_CATEGORY_HARASSMENT, 
-            threshold: HarmBlockThreshold.BLOCK_LOW_AND_ABOVE
-          },
-          {
-            category: HarmCategory.HARM_CATEGORY_HATE_SPEECH, 
-            threshold: HarmBlockThreshold.BLOCK_LOW_AND_ABOVE
-          },
-          {
-            category: HarmCategory.HARM_CATEGORY_SEXUALLY_EXPLICIT, 
-            threshold: HarmBlockThreshold.BLOCK_LOW_AND_ABOVE
-          },
-        ],
-        generationConfig: {
-          maxOutputTokens: this.maxTokens.output,
-          temperature: 0,
-          topP: 0.1,
-        },
-      });
-      
-      return result.response.text();
-    } catch (error) {
-      const err = error as Error;
-      outro(`${chalk.red('✖')} ${err?.message || err}`);
-      
-      if (
-        axios.isAxiosError<{ error?: { message: string } }>(error) &&
-        error.response?.status === 401
-      ) {
-        const geminiError = error.response.data.error;
-
-        if (geminiError?.message) outro(geminiError.message);
-        outro(
-          'For help look into README https://github.com/di-sukharev/opencommit#setup'
-        );
-      }
-      
-      throw err;
-    }
-  }
-
-  private warmup(): void {
-    if (this.config.OCO_TOKENS_MAX_INPUT !== undefined) this.maxTokens.input = this.config.OCO_TOKENS_MAX_INPUT;
-    if (this.config.OCO_TOKENS_MAX_OUTPUT !== undefined) this.maxTokens.output = this.config.OCO_TOKENS_MAX_OUTPUT;
-    this.basePath = this.config.OCO_GEMINI_BASE_PATH;
-    this.apiKey = this.config.OCO_GEMINI_API_KEY;
-
-    const [command, mode] = process.argv.slice(2);
-
-    const provider = this.config.OCO_AI_PROVIDER;
-
-    if (provider === 'gemini' && !this.apiKey &&
-      command !== 'config' && mode !== 'set') {
-      intro('opencommit');
-
-      outro('OCO_GEMINI_API_KEY is not set, please run `oco config set OCO_GEMINI_API_KEY=<your token> . If you are using GPT, make sure you add payment details, so API works.');
-
-      outro(
-        'For help look into README https://github.com/di-sukharev/opencommit#setup'
-      );
-
-      process.exit(1);
-    }
-    
-    this.model = this.config.OCO_MODEL || MODEL_LIST.gemini[0];
-    
-    if (provider === 'gemini' &&
-      !MODEL_LIST.gemini.includes(this.model) &&
-      command !== 'config' &&
-      mode !== CONFIG_MODES.set) {
-      outro(
-        `${chalk.red('✖')} Unsupported model ${this.model} for Gemini. Supported models are: ${MODEL_LIST.gemini.join(
-          ', '
-        )}`
-      );
-
-      process.exit(1);
-    }
-  }
-
-}
--- a/src/engine/ollama.ts
+++ b/src/engine/ollama.ts
@@ -1,52 +0,0 @@
-import axios, { AxiosError } from 'axios';
-import { ChatCompletionRequestMessage } from 'openai';
-import { AiEngine } from './Engine';
-
-import {
-  getConfig
-} from '../commands/config';
-
-const config = getConfig();
-
-export class OllamaAi implements AiEngine {
-  private model = "mistral"; // as default model of Ollama
-  private url = "http://localhost:11434/api/chat"; // default URL of Ollama API
-
-  setModel(model: string) {
-    this.model = model ?? config?.OCO_MODEL ?? 'mistral';
-  }
-  
-  setUrl(url: string) {
-    this.url = url ?? config?.OCO_OLLAMA_API_URL ?? 'http://localhost:11434/api/chat';
-  }
-  async generateCommitMessage(
-    messages: Array<ChatCompletionRequestMessage>
-  ): Promise<string | undefined> {
-    const model = this.model;
-
-    //console.log(messages);
-    //process.exit()
-
-    const url = this.url;
-    const p = {
-      model,
-      messages,
-      options: { temperature: 0, top_p: 0.1 },
-      stream: false
-    };
-    try {
-      const response = await axios.post(url, p, {
-        headers: {
-          'Content-Type': 'application/json'
-        }
-      });
-
-      const message = response.data.message;
-
-      return message?.content;
-    } catch (err: any) {
-      const message = err.response?.data?.error ?? err.message;
-      throw new Error('local model issues. details: ' + message);
-    }
-  }
-}
--- a/src/engine/testAi.ts
+++ b/src/engine/testAi.ts
@@ -1,31 +0,0 @@
-import { ChatCompletionRequestMessage } from 'openai';
-import { AiEngine } from './Engine';
-import { getConfig } from '../commands/config';
-
-export const TEST_MOCK_TYPES = [
-  'commit-message',
-  'prompt-module-commitlint-config',
-] as const
-type TestMockType = typeof TEST_MOCK_TYPES[number];
-
-export class TestAi implements AiEngine {
-  async generateCommitMessage(
-    _messages: Array<ChatCompletionRequestMessage>
-  ): Promise<string | undefined> {
-    const config = getConfig();
-    switch (config?.OCO_TEST_MOCK_TYPE as TestMockType | undefined) {
-      case 'commit-message':
-        return 'fix(testAi.ts): test commit message';
-      case 'prompt-module-commitlint-config':
-        return `{\n` +
-          `  "localLanguage": "english",\n` +
-          `  "commitFix": "fix(server): Change 'port' variable to uppercase 'PORT'",\n` +
-          `  "commitFeat": "feat(server): Allow server to listen on a port specified through environment variable",\n` +
-          `  "commitDescription": "Change 'port' variable to uppercase 'PORT'. Allow server to listen on a port specified through environment variable."\n` +
-          `}`
-      default:
-        throw Error('unsupported test mock type')
-    }
-  }
-}
-
--- a/src/generateCommitMessageFromGitDiff.ts
+++ b/src/generateCommitMessageFromGitDiff.ts
@@ -2,26 +2,62 @@ import {
  ChatCompletionRequestMessage,
  ChatCompletionRequestMessageRoleEnum
 } from 'openai';
-
-import { DEFAULT_TOKEN_LIMITS, getConfig } from './commands/config';
-import { getMainCommitPrompt } from './prompts';
+import { api } from './api';
+import { getConfig } from './commands/config';
 import { mergeDiffs } from './utils/mergeDiffs';
+import { i18n, I18nLocals } from './i18n';
 import { tokenCount } from './utils/tokenCount';
-import { getEngine } from './utils/engine';

 const config = getConfig();
-const MAX_TOKENS_INPUT =
-  config?.OCO_TOKENS_MAX_INPUT || DEFAULT_TOKEN_LIMITS.DEFAULT_MAX_TOKENS_INPUT;
-const MAX_TOKENS_OUTPUT =
-  config?.OCO_TOKENS_MAX_OUTPUT ||
-  DEFAULT_TOKEN_LIMITS.DEFAULT_MAX_TOKENS_OUTPUT;
+const translation = i18n[(config?.OCO_LANGUAGE as I18nLocals) || 'en'];

-const generateCommitMessageChatCompletionPrompt = async (
-  diff: string,
-  fullGitMojiSpec: boolean
-): Promise<Array<ChatCompletionRequestMessage>> => {
-  const INIT_MESSAGES_PROMPT = await getMainCommitPrompt(fullGitMojiSpec);
+const INIT_MESSAGES_PROMPT: Array<ChatCompletionRequestMessage> = [
+  {
+    role: ChatCompletionRequestMessageRoleEnum.System,
+    // prettier-ignore
+    content: `You are to act as the author of a commit message in git. Your mission is to create clean and comprehensive commit messages in the conventional commit convention and explain WHAT were the changes and WHY the changes were done. I'll send you an output of 'git diff --staged' command, and you convert it into a commit message.
+${config?.OCO_EMOJI ? 'Use GitMoji convention to preface the commit.': 'Do not preface the commit with anything.'}
+${config?.OCO_DESCRIPTION  ? 'Add a short description of WHY the changes are done after the commit message. Don\'t start it with "This commit", just describe the changes.': "Don't add any descriptions to the commit, only commit message."}
+Use the present tense. Lines must not be longer than 74 characters. Use ${translation.localLanguage} to answer.`
+  },
+  {
+    role: ChatCompletionRequestMessageRoleEnum.User,
+    content: `diff --git a/src/server.ts b/src/server.ts
+index ad4db42..f3b18a9 100644
+--- a/src/server.ts
+++ b/src/server.ts
+@@ -10,7 +10,7 @@
+import {
+  initWinstonLogger();
+  
+  const app = express();
+ -const port = 7799;
+ +const PORT = 7799;
+  
+  app.use(express.json());
+  
+@@ -34,6 +34,6 @@
+app.use((_, res, next) => {
+  // ROUTES
+  app.use(PROTECTED_ROUTER_URL, protectedRouter);
+  
+ -app.listen(port, () => {
+ -  console.log(\`Server listening on port \${port}\`);
+ +app.listen(process.env.PORT || PORT, () => {
+ +  console.log(\`Server listening on port \${PORT}\`);
+  });`
+  },
+  {
+    role: ChatCompletionRequestMessageRoleEnum.Assistant,
+    content: `${config?.OCO_EMOJI ? '🐛 ' : ''}${translation.commitFix}
+${config?.OCO_EMOJI ? '✨ ' : ''}${translation.commitFeat}
+${config?.OCO_DESCRIPTION ? translation.commitDescription : ''}`
+  }
+];

+const generateCommitMessageChatCompletionPrompt = (
+  diff: string
+): Array<ChatCompletionRequestMessage> => {
  const chatContextAsCompletionRequest = [...INIT_MESSAGES_PROMPT];

  chatContextAsCompletionRequest.push({
@@ -35,57 +71,39 @@ const generateCommitMessageChatCompletionPrompt = async (
 export enum GenerateCommitMessageErrorEnum {
  tooMuchTokens = 'TOO_MUCH_TOKENS',
  internalError = 'INTERNAL_ERROR',
-  emptyMessage = 'EMPTY_MESSAGE',
-  outputTokensTooHigh = `Token limit exceeded, OCO_TOKENS_MAX_OUTPUT must not be much higher than the default ${DEFAULT_TOKEN_LIMITS.DEFAULT_MAX_TOKENS_OUTPUT} tokens.`
+  emptyMessage = 'EMPTY_MESSAGE'
 }

-const ADJUSTMENT_FACTOR = 20;
+
+const INIT_MESSAGES_PROMPT_LENGTH = INIT_MESSAGES_PROMPT.map(
+  (msg) => tokenCount(msg.content) + 4
+).reduce((a, b) => a + b, 0);
+
+const MAX_REQ_TOKENS = 3000 - INIT_MESSAGES_PROMPT_LENGTH;

 export const generateCommitMessageByDiff = async (
-  diff: string,
-  fullGitMojiSpec: boolean
+  diff: string
 ): Promise<string> => {
  try {
-    const INIT_MESSAGES_PROMPT = await getMainCommitPrompt(fullGitMojiSpec);
-
-    const INIT_MESSAGES_PROMPT_LENGTH = INIT_MESSAGES_PROMPT.map(
-      (msg) => tokenCount(msg.content as string) + 4
-    ).reduce((a, b) => a + b, 0);
-
-    const MAX_REQUEST_TOKENS =
-      MAX_TOKENS_INPUT -
-      ADJUSTMENT_FACTOR -
-      INIT_MESSAGES_PROMPT_LENGTH -
-      MAX_TOKENS_OUTPUT;
-
-    if (tokenCount(diff) >= MAX_REQUEST_TOKENS) {
-      const commitMessagePromises = await getCommitMsgsPromisesFromFileDiffs(
+    if (tokenCount(diff) >= MAX_REQ_TOKENS) {
+      const commitMessagePromises = getCommitMsgsPromisesFromFileDiffs(
        diff,
-        MAX_REQUEST_TOKENS,
-        fullGitMojiSpec
+        MAX_REQ_TOKENS
      );

-      const commitMessages = [] as string[];
-      for (const promise of commitMessagePromises) {
-        commitMessages.push((await promise) as string);
-        await delay(2000);
-      }
+      const commitMessages = await Promise.all(commitMessagePromises);

      return commitMessages.join('\n\n');
+    } else {
+      const messages = generateCommitMessageChatCompletionPrompt(diff);
+
+      const commitMessage = await api.generateCommitMessage(messages);
+
+      if (!commitMessage)
+        throw new Error(GenerateCommitMessageErrorEnum.emptyMessage);
+
+      return commitMessage;
    }
-
-    const messages = await generateCommitMessageChatCompletionPrompt(
-      diff,
-      fullGitMojiSpec
-    );
-
-    const engine = getEngine();
-    const commitMessage = await engine.generateCommitMessage(messages);
-
-    if (!commitMessage)
-      throw new Error(GenerateCommitMessageErrorEnum.emptyMessage);
-
-    return commitMessage;
  } catch (error) {
    throw error;
  }
@@ -94,8 +112,7 @@ export const generateCommitMessageByDiff = async (
 function getMessagesPromisesByChangesInFile(
  fileDiff: string,
  separator: string,
-  maxChangeLength: number,
-  fullGitMojiSpec: boolean
+  maxChangeLength: number
 ) {
  const hunkHeaderSeparator = '@@ ';
  const [fileHeader, ...fileDiffByLines] = fileDiff.split(hunkHeaderSeparator);
@@ -106,74 +123,25 @@ function getMessagesPromisesByChangesInFile(
    maxChangeLength
  );

-  const lineDiffsWithHeader = [] as string[];
-  for (const change of mergedChanges) {
-    const totalChange = fileHeader + change;
-    if (tokenCount(totalChange) > maxChangeLength) {
-      // If the totalChange is too large, split it into smaller pieces
-      const splitChanges = splitDiff(totalChange, maxChangeLength);
-      lineDiffsWithHeader.push(...splitChanges);
-    } else {
-      lineDiffsWithHeader.push(totalChange);
-    }
-  }
-
-  const engine = getEngine();
-  const commitMsgsFromFileLineDiffs = lineDiffsWithHeader.map(
-    async (lineDiff) => {
-      const messages = await generateCommitMessageChatCompletionPrompt(
-        separator + lineDiff,
-        fullGitMojiSpec
-      );
-
-      return engine.generateCommitMessage(messages);
-    }
+  const lineDiffsWithHeader = mergedChanges.map(
+    (change) => fileHeader + change
  );

+  const commitMsgsFromFileLineDiffs = lineDiffsWithHeader.map((lineDiff) => {
+    const messages = generateCommitMessageChatCompletionPrompt(
+      separator + lineDiff
+    );
+
+    return api.generateCommitMessage(messages);
+  });
+
  return commitMsgsFromFileLineDiffs;
 }

-function splitDiff(diff: string, maxChangeLength: number) {
-  const lines = diff.split('\n');
-  const splitDiffs = [] as string[];
-  let currentDiff = '';
-
-  if (maxChangeLength <= 0) {
-    throw new Error(GenerateCommitMessageErrorEnum.outputTokensTooHigh);
-  }
-
-  for (let line of lines) {
-    // If a single line exceeds maxChangeLength, split it into multiple lines
-    while (tokenCount(line) > maxChangeLength) {
-      const subLine = line.substring(0, maxChangeLength);
-      line = line.substring(maxChangeLength);
-      splitDiffs.push(subLine);
-    }
-
-    // Check the tokenCount of the currentDiff and the line separately
-    if (tokenCount(currentDiff) + tokenCount('\n' + line) > maxChangeLength) {
-      // If adding the next line would exceed the maxChangeLength, start a new diff
-      splitDiffs.push(currentDiff);
-      currentDiff = line;
-    } else {
-      // Otherwise, add the line to the current diff
-      currentDiff += '\n' + line;
-    }
-  }
-
-  // Add the last diff
-  if (currentDiff) {
-    splitDiffs.push(currentDiff);
-  }
-
-  return splitDiffs;
-}
-
-export const getCommitMsgsPromisesFromFileDiffs = async (
+export function getCommitMsgsPromisesFromFileDiffs(
  diff: string,
-  maxDiffLength: number,
-  fullGitMojiSpec: boolean
-) => {
+  maxDiffLength: number
+) {
  const separator = 'diff --git ';

  const diffByFiles = diff.split(separator).slice(1);
@@ -181,7 +149,7 @@ export const getCommitMsgsPromisesFromFileDiffs = async (
  // merge multiple files-diffs into 1 prompt to save tokens
  const mergedFilesDiffs = mergeDiffs(diffByFiles, maxDiffLength);

-  const commitMessagePromises = [] as Promise<string | undefined>[];
+  const commitMessagePromises = [];

  for (const fileDiff of mergedFilesDiffs) {
    if (tokenCount(fileDiff) >= maxDiffLength) {
@@ -189,25 +157,17 @@ export const getCommitMsgsPromisesFromFileDiffs = async (
      const messagesPromises = getMessagesPromisesByChangesInFile(
        fileDiff,
        separator,
-        maxDiffLength,
-        fullGitMojiSpec
+        maxDiffLength
      );

      commitMessagePromises.push(...messagesPromises);
    } else {
-      const messages = await generateCommitMessageChatCompletionPrompt(
-        separator + fileDiff,
-        fullGitMojiSpec
+      const messages = generateCommitMessageChatCompletionPrompt(
+        separator + fileDiff
      );

-      const engine = getEngine();
-      commitMessagePromises.push(engine.generateCommitMessage(messages));
+      commitMessagePromises.push(api.generateCommitMessage(messages));
    }
  }
-
  return commitMessagePromises;
-};
-
-function delay(ms: number) {
-  return new Promise((resolve) => setTimeout(resolve, ms));
 }
--- a/src/github-action.ts
+++ b/src/github-action.ts
@@ -1,14 +1,12 @@
-import { unlinkSync, writeFileSync } from 'fs';
-
 import core from '@actions/core';
-import exec from '@actions/exec';
 import github from '@actions/github';
+import exec from '@actions/exec';
 import { intro, outro } from '@clack/prompts';
 import { PushEvent } from '@octokit/webhooks-types';
-
 import { generateCommitMessageByDiff } from './generateCommitMessageFromGitDiff';
-import { randomIntFromInterval } from './utils/randomIntFromInterval';
 import { sleep } from './utils/sleep';
+import { randomIntFromInterval } from './utils/randomIntFromInterval';
+import { unlinkSync, writeFileSync } from 'fs';

 // This should be a token with access to your repository scoped in as a secret.
 // The YML workflow will need to set GITHUB_TOKEN with the GitHub Secret Token
@@ -135,16 +133,6 @@ async function improveCommitMessages(
    improvedMessagesWithSHAs
  );

-  // Check if there are actually any changes in the commit messages
-  const messagesChanged = improvedMessagesWithSHAs.some(
-    ({ sha, msg }, index) => msg !== commitsToImprove[index].message
-  );
-
-  if (!messagesChanged) {
-    console.log('No changes in commit messages detected, skipping rebase');
-    return;
-  }
-
  const createCommitMessageFile = (message: string, index: number) =>
    writeFileSync(`./commit-${index}.txt`, message);
  improvedMessagesWithSHAs.forEach(({ msg }, i) =>
--- a/src/i18n/index.ts
+++ b/src/i18n/index.ts
@@ -1,22 +1,22 @@
-import cs from '../i18n/cs.json';
-import de from '../i18n/de.json';
-import en from '../i18n/en.json';
-import es_ES from '../i18n/es_ES.json';
-import fr from '../i18n/fr.json';
-import id_ID from '../i18n/id_ID.json';
-import it from '../i18n/it.json';
-import ja from '../i18n/ja.json';
-import ko from '../i18n/ko.json';
-import nl from '../i18n/nl.json';
-import pl from '../i18n/pl.json';
-import pt_br from '../i18n/pt_br.json';
-import ru from '../i18n/ru.json';
-import sv from '../i18n/sv.json';
-import th from '../i18n/th.json';
-import tr from '../i18n/tr.json';
-import vi_VN from '../i18n/vi_VN.json';
-import zh_CN from '../i18n/zh_CN.json';
-import zh_TW from '../i18n/zh_TW.json';
+import en from '../i18n/en.json' assert { type: 'json' };
+import cs from '../i18n/cs.json' assert { type: 'json' };
+import de from '../i18n/de.json' assert { type: 'json' };
+import fr from '../i18n/fr.json' assert { type: 'json' };
+import it from '../i18n/it.json' assert { type: 'json' };
+import ko from '../i18n/ko.json' assert { type: 'json' };
+import zh_CN from '../i18n/zh_CN.json' assert { type: 'json' };
+import zh_TW from '../i18n/zh_TW.json' assert { type: 'json' };
+import ja from '../i18n/ja.json' assert { type: 'json' };
+import pt_br from '../i18n/pt_br.json' assert { type: 'json' };
+import vi_VN from '../i18n/vi_VN.json' assert { type: 'json' };
+import es_ES from '../i18n/es_ES.json' assert { type: 'json' };
+import sv from '../i18n/sv.json' assert { type: 'json' };
+import nl from '../i18n/nl.json' assert { type: 'json' };
+import ru from '../i18n/ru.json' assert { type: 'json' };
+import id_ID from '../i18n/id_ID.json' assert { type: 'json' };
+import pl from '../i18n/pl.json' assert { type: 'json' };
+import tr from '../i18n/tr.json' assert { type: 'json' };
+import th from '../i18n/th.json' assert { type: 'json' };

 export enum I18nLocals {
  'en' = 'en',
@@ -36,7 +36,7 @@ export enum I18nLocals {
  'id_ID' = 'id_ID',
  'pl' = 'pl',
  'tr' = 'tr',
-  'th' = 'th'
+  'th' = 'th',
 }

 export const i18n = {
--- a/src/i18n/zh_CN.json
+++ b/src/i18n/zh_CN.json
@@ -1,6 +1,6 @@
 {
  "localLanguage": "简体中文",
-  "commitFix": "fix(server.ts)：将端口变量从小写port改为大写PORT",
-  "commitFeat": "feat(server.ts)：添加对process.env.PORT环境变量的支持",
+  "commitFix": "修复(server.ts)：将端口变量从小写port改为大写PORT",
+  "commitFeat": "功能(server.ts)：添加对process.env.PORT环境变量的支持",
  "commitDescription": "现在端口变量被命名为PORT，这提高了命名约定的一致性，因为PORT是一个常量。环境变量的支持使应用程序更加灵活，因为它现在可以通过process.env.PORT环境变量在任何可用端口上运行。"
 }
--- a/src/modules/commitlint/config.ts
+++ b/src/modules/commitlint/config.ts
@@ -1,93 +0,0 @@
-import { spinner } from '@clack/prompts';
-
-import { getConfig } from '../../commands/config';
-import { i18n, I18nLocals } from '../../i18n';
-import { COMMITLINT_LLM_CONFIG_PATH } from './constants';
-import { computeHash } from './crypto';
-import { commitlintPrompts, inferPromptsFromCommitlintConfig } from './prompts';
-import { getCommitLintPWDConfig } from './pwd-commitlint';
-import { CommitlintLLMConfig } from './types';
-import * as utils from './utils';
-import { getEngine } from '../../utils/engine';
-
-const config = getConfig();
-const translation = i18n[(config?.OCO_LANGUAGE as I18nLocals) || 'en'];
-
-export const configureCommitlintIntegration = async (force = false) => {
-  const spin = spinner();
-  spin.start('Loading @commitlint configuration');
-
-  const fileExists = await utils.commitlintLLMConfigExists();
-
-  const commitLintConfig = await getCommitLintPWDConfig();
-  if (commitLintConfig === null) {
-    throw new Error(
-      `Failed to load @commitlint config. Please check the following:
-      * @commitlint >= 9.0.0 is installed in the local directory.
-      * 'node_modules/@commitlint/load' package exists.
-      * A valid @commitlint configuration exists.
-      `,
-    );
-  }
-
-  // debug complete @commitlint configuration
-  // await fs.writeFile(
-  //   `${OPENCOMMIT_COMMITLINT_CONFIG}-commitlint-debug`,
-  //   JSON.stringify(commitLintConfig, null, 2)
-  // );
-
-  const hash = await computeHash(JSON.stringify(commitLintConfig));
-
-  spin.stop(`Read @commitlint configuration (hash: ${hash})`);
-
-  if (fileExists) {
-    // Check if we need to update the prompts.
-    const { hash: existingHash } = await utils.getCommitlintLLMConfig();
-    if (hash === existingHash && !force) {
-      spin.stop(
-        'Hashes are the same, no need to update the config. Run "force" command to bypass.'
-      );
-      return;
-    }
-  }
-
-  spin.start('Generating consistency with given @commitlint rules');
-
-  const prompts = inferPromptsFromCommitlintConfig(commitLintConfig);
-
-  const consistencyPrompts =
-    commitlintPrompts.GEN_COMMITLINT_CONSISTENCY_PROMPT(prompts);
-
-  // debug prompt which will generate a consistency
-  // await fs.writeFile(
-  //   `${COMMITLINT_LLM_CONFIG}-debug`,
-  //   consistencyPrompts.map((p) => p.content)
-  // );
-
-  const engine = getEngine();
-  let consistency =
-    (await engine.generateCommitMessage(consistencyPrompts)) || '{}';
-
-  // Cleanup the consistency answer. Sometimes 'gpt-3.5-turbo' sends rule's back.
-  prompts.forEach((prompt) => (consistency = consistency.replace(prompt, '')));
-
-  // sometimes consistency is preceded by explanatory text like "Here is your JSON:"
-  consistency = utils.getJSONBlock(consistency);
-
-  // ... remaining might be extra set of "\n"
-  consistency = utils.removeDoubleNewlines(consistency);
-
-  const commitlintLLMConfig: CommitlintLLMConfig = {
-    hash,
-    prompts,
-    consistency: {
-      [translation.localLanguage]: {
-        ...JSON.parse(consistency as string)
-      }
-    }
-  };
-
-  await utils.writeCommitlintLLMConfig(commitlintLLMConfig);
-
-  spin.stop(`Done - please review contents of ${COMMITLINT_LLM_CONFIG_PATH}`);
-};
--- a/src/modules/commitlint/constants.ts
+++ b/src/modules/commitlint/constants.ts
@@ -1 +0,0 @@
-export const COMMITLINT_LLM_CONFIG_PATH = `${process.env.PWD}/.opencommit-commitlint`;
--- a/src/modules/commitlint/crypto.ts
+++ b/src/modules/commitlint/crypto.ts
@@ -1,15 +0,0 @@
-import crypto from 'crypto';
-
-export const computeHash = async (
-  content: string,
-  algorithm: string = 'sha256'
-): Promise<string> => {
-  try {
-    const hash = crypto.createHash(algorithm);
-    hash.update(content);
-    return hash.digest('hex');
-  } catch (error) {
-    console.error('Error while computing hash:', error);
-    throw error;
-  }
-};
--- a/src/modules/commitlint/prompts.ts
+++ b/src/modules/commitlint/prompts.ts
@@ -1,284 +0,0 @@
-import chalk from 'chalk';
-import {
-  ChatCompletionRequestMessage,
-  ChatCompletionRequestMessageRoleEnum
-} from 'openai';
-
-import { outro } from '@clack/prompts';
-import {
-  PromptConfig,
-  QualifiedConfig,
-  RuleConfigSeverity,
-  RuleConfigTuple
-} from '@commitlint/types';
-
-import { getConfig } from '../../commands/config';
-import { i18n, I18nLocals } from '../../i18n';
-import { IDENTITY, INIT_DIFF_PROMPT } from '../../prompts';
-
-const config = getConfig();
-const translation = i18n[(config?.OCO_LANGUAGE as I18nLocals) || 'en'];
-
-type DeepPartial<T> = {
-  [P in keyof T]?: {
-    [K in keyof T[P]]?: T[P][K];
-  };
-};
-
-type PromptFunction = (
-  applicable: string,
-  value: any,
-  prompt: DeepPartial<PromptConfig>
-) => string;
-
-type PromptResolverFunction = (
-  key: string,
-  applicable: string,
-  value: any,
-  prompt?: DeepPartial<PromptConfig>
-) => string;
-
-/**
- * Extracts more contexte for each type-enum.
- * IDEA: replicate the concept for scopes and refactor to a generic feature.
- */
-const getTypeRuleExtraDescription = (
-  type: string,
-  prompt?: DeepPartial<PromptConfig>
-) => prompt?.questions?.type?.enum?.[type]?.description;
-
-/*
-IDEA: Compress llm readable prompt for each section of commit message: one line for header, one line for scope, etc.
-  - The type must be in lowercase and should be one of the following values: featuring, fixing, documenting, styling, refactoring, testing, chores, perf, build, ci, revert.
-  - The scope should not be empty and provide context for the change (e.g., module or file changed).
-  - The subject should not be empty, should not end with a period, and should provide a concise description of the change. It should not be in sentence-case, start-case, pascal-case, or upper-case.
-*/
-const llmReadableRules: {
-  [ruleName: string]: PromptResolverFunction;
-} = {
-  blankline: (key, applicable) =>
-    `There should ${applicable} be a blank line at the beginning of the ${key}.`,
-  caseRule: (key, applicable, value: string | Array<string>) =>
-    `The ${key} should ${applicable} be in ${
-      Array.isArray(value)
-        ? `one of the following case: 
-  - ${value.join('\n  - ')}.`
-        : `${value} case.`
-    }`,
-  emptyRule: (key, applicable) => `The ${key} should ${applicable} be empty.`,
-  enumRule: (key, applicable, value: string | Array<string>) =>
-    `The ${key} should ${applicable} be one of the following values: 
-  - ${Array.isArray(value) ? value.join('\n  - ') : value}.`,
-  enumTypeRule: (key, applicable, value: string | Array<string>, prompt) =>
-    `The ${key} should ${applicable} be one of the following values: 
-  - ${
-    Array.isArray(value)
-      ? value
-          .map((v) => {
-            const description = getTypeRuleExtraDescription(v, prompt);
-            if (description) {
-              return `${v} (${description})`;
-            } else return v;
-          })
-          .join('\n  - ')
-      : value
-  }.`,
-  fullStopRule: (key, applicable, value: string) =>
-    `The ${key} should ${applicable} end with '${value}'.`,
-  maxLengthRule: (key, applicable, value: string) =>
-    `The ${key} should ${applicable} have ${value} characters or less.`,
-  minLengthRule: (key, applicable, value: string) =>
-    `The ${key} should ${applicable} have ${value} characters or more.`
-};
-
-/**
- * TODO: Validate rules to every rule in the @commitlint configuration.
- * IDEA: Plugins can extend the list of rule. Provide user with a way to infer or extend when "No prompt handler for rule".
- */
-const rulesPrompts: {
-  [ruleName: string]: PromptFunction;
-} = {
-  'body-case': (applicable: string, value: string | Array<string>) =>
-    llmReadableRules.caseRule('body', applicable, value),
-  'body-empty': (applicable: string) =>
-    llmReadableRules.emptyRule('body', applicable, undefined),
-  'body-full-stop': (applicable: string, value: string) =>
-    llmReadableRules.fullStopRule('body', applicable, value),
-  'body-leading-blank': (applicable: string) =>
-    llmReadableRules.blankline('body', applicable, undefined),
-  'body-max-length': (applicable: string, value: string) =>
-    llmReadableRules.maxLengthRule('body', applicable, value),
-  'body-max-line-length': (applicable: string, value: string) =>
-    `Each line of the body should ${applicable} have ${value} characters or less.`,
-  'body-min-length': (applicable: string, value: string) =>
-    llmReadableRules.minLengthRule('body', applicable, value),
-  'footer-case': (applicable: string, value: string | Array<string>) =>
-    llmReadableRules.caseRule('footer', applicable, value),
-  'footer-empty': (applicable: string) =>
-    llmReadableRules.emptyRule('footer', applicable, undefined),
-  'footer-leading-blank': (applicable: string) =>
-    llmReadableRules.blankline('footer', applicable, undefined),
-  'footer-max-length': (applicable: string, value: string) =>
-    llmReadableRules.maxLengthRule('footer', applicable, value),
-  'footer-max-line-length': (applicable: string, value: string) =>
-    `Each line of the footer should ${applicable} have ${value} characters or less.`,
-  'footer-min-length': (applicable: string, value: string) =>
-    llmReadableRules.minLengthRule('footer', applicable, value),
-  'header-case': (applicable: string, value: string | Array<string>) =>
-    llmReadableRules.caseRule('header', applicable, value),
-  'header-full-stop': (applicable: string, value: string) =>
-    llmReadableRules.fullStopRule('header', applicable, value),
-  'header-max-length': (applicable: string, value: string) =>
-    llmReadableRules.maxLengthRule('header', applicable, value),
-  'header-min-length': (applicable: string, value: string) =>
-    llmReadableRules.minLengthRule('header', applicable, value),
-  'references-empty': (applicable: string) =>
-    llmReadableRules.emptyRule('references section', applicable, undefined),
-  'scope-case': (applicable: string, value: string | Array<string>) =>
-    llmReadableRules.caseRule('scope', applicable, value),
-  'scope-empty': (applicable: string) =>
-    llmReadableRules.emptyRule('scope', applicable, undefined),
-  'scope-enum': (applicable: string, value: string | Array<string>) =>
-    llmReadableRules.enumRule('type', applicable, value),
-  'scope-max-length': (applicable: string, value: string) =>
-    llmReadableRules.maxLengthRule('scope', applicable, value),
-  'scope-min-length': (applicable: string, value: string) =>
-    llmReadableRules.minLengthRule('scope', applicable, value),
-  'signed-off-by': (applicable: string, value: string) =>
-    `The commit message should ${applicable} have a "Signed-off-by" line with the value "${value}".`,
-  'subject-case': (applicable: string, value: string | Array<string>) =>
-    llmReadableRules.caseRule('subject', applicable, value),
-  'subject-empty': (applicable: string) =>
-    llmReadableRules.emptyRule('subject', applicable, undefined),
-  'subject-full-stop': (applicable: string, value: string) =>
-    llmReadableRules.fullStopRule('subject', applicable, value),
-  'subject-max-length': (applicable: string, value: string) =>
-    llmReadableRules.maxLengthRule('subject', applicable, value),
-  'subject-min-length': (applicable: string, value: string) =>
-    llmReadableRules.minLengthRule('subject', applicable, value),
-  'type-case': (applicable: string, value: string | Array<string>) =>
-    llmReadableRules.caseRule('type', applicable, value),
-  'type-empty': (applicable: string) =>
-    llmReadableRules.emptyRule('type', applicable, undefined),
-  'type-enum': (applicable: string, value: string | Array<string>, prompt) =>
-    llmReadableRules.enumTypeRule('type', applicable, value, prompt),
-  'type-max-length': (applicable: string, value: string) =>
-    llmReadableRules.maxLengthRule('type', applicable, value),
-  'type-min-length': (applicable: string, value: string) =>
-    llmReadableRules.minLengthRule('type', applicable, value)
-};
-
-const getPrompt = (
-  ruleName: string,
-  ruleConfig: RuleConfigTuple<unknown>,
-  prompt: DeepPartial<PromptConfig>
-) => {
-  const [severity, applicable, value] = ruleConfig;
-
-  // Should we exclude "Disabled" properties?
-  // Is this used to disable a subjacent rule when extending presets?
-  if (severity === RuleConfigSeverity.Disabled) return null;
-
-  const promptFn = rulesPrompts[ruleName];
-  if (promptFn) {
-    return promptFn(applicable, value, prompt);
-  }
-
-  // Plugins may add their custom rules.
-  // We might want to call OpenAI to build this rule's llm-readable prompt.
-  outro(`${chalk.red('✖')} No prompt handler for rule "${ruleName}".`);
-  return `Please manualy set the prompt for rule "${ruleName}".`;
-};
-
-export const inferPromptsFromCommitlintConfig = (
-  config: QualifiedConfig
-): string[] => {
-  const { rules, prompt } = config;
-  if (!rules) return [];
-  return Object.keys(rules)
-    .map((ruleName) =>
-      getPrompt(ruleName, rules[ruleName] as RuleConfigTuple<unknown>, prompt)
-    )
-    .filter((prompt) => prompt !== null) as string[];
-};
-
-/**
- * Breaking down commit message structure for conventional commit, and mapping bits with
- * ubiquitous language from @commitlint.
- * While gpt-4 does this on it self, gpt-3.5 can't map this on his own atm.
- */
-const STRUCTURE_OF_COMMIT = `
- Header of commit is composed of type, scope, subject: <type-of-commit>(<scope-of-commit>): <subject-of-commit>
- Description of commit is composed of body and footer (optional): <body-of-commit>\n<footer(s)-of-commit>`;
-
-// Prompt to generate LLM-readable rules based on @commitlint rules.
-const GEN_COMMITLINT_CONSISTENCY_PROMPT = (
-  prompts: string[]
-): ChatCompletionRequestMessage[] => [
-  {
-    role: ChatCompletionRequestMessageRoleEnum.Assistant,
-    // prettier-ignore
-    content: `${IDENTITY} Your mission is to create clean and comprehensive commit messages for two different changes in a single codebase and output them in the provided JSON format: one for a bug fix and another for a new feature. 
-
-Here are the specific requirements and conventions that should be strictly followed:
-
-Commit Message Conventions:
- The commit message consists of three parts: Header, Body, and Footer.
- Header: 
-  - Format: \`<type>(<scope>): <subject>\`
- ${prompts.join('\n- ')}
-
-JSON Output Format:
- The JSON output should contain the commit messages for a bug fix and a new feature in the following format:
-\`\`\`json
-{
-  "localLanguage": "${translation.localLanguage}",
-  "commitFix": "<Header of commit for bug fix>",
-  "commitFeat": "<Header of commit for feature>",
-  "commitDescription": "<Description of commit for both the bug fix and the feature>"
-}
-\`\`\`
- The "commitDescription" should not include the commit message’s header, only the description.
- Description should not be more than 74 characters.
-
-Additional Details:
- Changing the variable 'port' to uppercase 'PORT' is considered a bug fix. 
- Allowing the server to listen on a port specified through the environment variable is considered a new feature. 
-
-Example Git Diff is to follow:`
-  },
-  INIT_DIFF_PROMPT
-];
-
-/**
- * Prompt to have LLM generate a message using @commitlint rules.
- *
- * @param language
- * @param prompts
- * @returns
- */
-const INIT_MAIN_PROMPT = (
-  language: string,
-  prompts: string[]
-): ChatCompletionRequestMessage => ({
-  role: ChatCompletionRequestMessageRoleEnum.System,
-  // prettier-ignore
-  content: `${IDENTITY} Your mission is to create clean and comprehensive commit messages in the given @commitlint convention and explain WHAT were the changes and WHY the changes were done. I'll send you an output of 'git diff --staged' command, and you convert it into a commit message.
-${config?.OCO_EMOJI ? 'Use GitMoji convention to preface the commit.' : 'Do not preface the commit with anything.'}
-${config?.OCO_DESCRIPTION ? 'Add a short description of WHY the changes are done after the commit message. Don\'t start it with "This commit", just describe the changes.' : "Don't add any descriptions to the commit, only commit message."}
-Use the present tense. Use ${language} to answer.
-${ config?.OCO_ONE_LINE_COMMIT ? 'Craft a concise commit message that encapsulates all changes made, with an emphasis on the primary updates. If the modifications share a common theme or scope, mention it succinctly; otherwise, leave the scope out to maintain focus. The goal is to provide a clear and unified overview of the changes in a one single message, without diverging into a list of commit per file change.' : ""}
-    
-You will strictly follow the following conventions to generate the content of the commit message:
- ${prompts.join('\n- ')}
-
-The conventions refers to the following structure of commit message:
-${STRUCTURE_OF_COMMIT}
-    
-    `
-});
-
-export const commitlintPrompts = {
-  INIT_MAIN_PROMPT,
-  GEN_COMMITLINT_CONSISTENCY_PROMPT
-};
--- a/src/modules/commitlint/pwd-commitlint.ts
+++ b/src/modules/commitlint/pwd-commitlint.ts
@@ -1,62 +0,0 @@
-import fs from 'fs/promises';
-import path from 'path';
-
-const getCommitLintModuleType = async (): Promise<'cjs' | 'esm'> => {
-  const packageFile = 'node_modules/@commitlint/load/package.json';
-  const packageJsonPath = path.join(
-    process.env.PWD || process.cwd(),
-    packageFile,
-  );
-  const packageJson = JSON.parse(await fs.readFile(packageJsonPath, 'utf8'));
-  if (!packageJson) {
-    throw new Error(`Failed to parse ${packageFile}`);
-  }
-
-  return packageJson.type === 'module' ? 'esm' : 'cjs';
-};
-
-/**
- * QualifiedConfig from any version of @commitlint/types
- * @see https://github.com/conventional-changelog/commitlint/blob/master/@commitlint/types/src/load.ts
- */
-type QualifiedConfigOnAnyVersion = { [key:string]: unknown };
-
-/**
- *  This code is loading the configuration for the `@commitlint` package from the current working
- * directory (`process.env.PWD`) by requiring the `load` module from the `@commitlint` package.
- *
- * @returns
- */
-export const getCommitLintPWDConfig = async (): Promise<QualifiedConfigOnAnyVersion | null> => {
-  let load, nodeModulesPath;
-  switch (await getCommitLintModuleType()) {
-    case 'cjs':
-      /**
-       * CommonJS (<= commitlint@v18.x.x.)
-       */
-      nodeModulesPath = path.join(
-        process.env.PWD || process.cwd(),
-        'node_modules/@commitlint/load',
-      );
-      load = require(nodeModulesPath).default;
-      break;
-    case 'esm':
-      /**
-       * ES Module (commitlint@v19.x.x. <= )
-       * Directory import is not supported in ES Module resolution, so import the file directly
-       */
-      nodeModulesPath = path.join(
-        process.env.PWD || process.cwd(),
-        'node_modules/@commitlint/load/lib/load.js',
-      );
-      load = (await import(nodeModulesPath)).default;
-      break;
-  }
-
-  if (load && typeof load === 'function') {
-    return await load();
-  }
-
-  // @commitlint/load is not a function
-  return null;
-};
--- a/src/modules/commitlint/types.ts
+++ b/src/modules/commitlint/types.ts
@@ -1,11 +0,0 @@
-import { i18n } from '../../i18n';
-
-export type ConsistencyPrompt = (typeof i18n)[keyof typeof i18n];
-
-export type CommitlintLLMConfig = {
-  hash: string;
-  prompts: string[];
-  consistency: {
-    [key: string]: ConsistencyPrompt;
-  };
-};
--- a/src/modules/commitlint/utils.ts
+++ b/src/modules/commitlint/utils.ts
@@ -1,57 +0,0 @@
-import fs from 'fs/promises';
-
-import { COMMITLINT_LLM_CONFIG_PATH } from './constants';
-import { CommitlintLLMConfig } from './types';
-
-/**
- * Removes the "\n" only if occurring twice
- */
-export const removeDoubleNewlines = (input: string): string => {
-  const pattern = /\\n\\n/g;
-  if (pattern.test(input)) {
-    const newInput = input.replace(pattern, '');
-    return removeDoubleNewlines(newInput);
-  }
-
-  return input;
-};
-
-export const getJSONBlock = (input: string): string => {
-  const jsonIndex = input.search('```json');
-  if (jsonIndex > -1) {
-    input = input.slice(jsonIndex + 8);
-    const endJsonIndex = input.search('```');
-    input = input.slice(0, endJsonIndex); 
-  }
-  return input;
-};
-
-export const commitlintLLMConfigExists = async (): Promise<boolean> => {
-  let exists;
-  try {
-    await fs.access(COMMITLINT_LLM_CONFIG_PATH);
-    exists = true;
-  } catch (e) {
-    exists = false;
-  }
-
-  return exists;
-};
-
-export const writeCommitlintLLMConfig = async (
-  commitlintLLMConfig: CommitlintLLMConfig
-): Promise<void> => {
-  await fs.writeFile(
-    COMMITLINT_LLM_CONFIG_PATH,
-    JSON.stringify(commitlintLLMConfig, null, 2)
-  );
-};
-
-export const getCommitlintLLMConfig =
-  async (): Promise<CommitlintLLMConfig> => {
-    const content = await fs.readFile(COMMITLINT_LLM_CONFIG_PATH);
-    const commitLintLLMConfig = JSON.parse(
-      content.toString()
-    ) as CommitlintLLMConfig;
-    return commitLintLLMConfig;
-  };
--- a/src/prompts.ts
+++ b/src/prompts.ts
@@ -1,207 +0,0 @@
-import {
-  ChatCompletionRequestMessage,
-  ChatCompletionRequestMessageRoleEnum
-} from 'openai';
-
-import { note } from '@clack/prompts';
-
-import { getConfig } from './commands/config';
-import { i18n, I18nLocals } from './i18n';
-import { configureCommitlintIntegration } from './modules/commitlint/config';
-import { commitlintPrompts } from './modules/commitlint/prompts';
-import { ConsistencyPrompt } from './modules/commitlint/types';
-import * as utils from './modules/commitlint/utils';
-import { removeConventionalCommitWord } from './utils/removeConventionalCommitWord';
-
-const config = getConfig();
-const translation = i18n[(config?.OCO_LANGUAGE as I18nLocals) || 'en'];
-
-export const IDENTITY =
-  'You are to act as the author of a commit message in git.';
-
-const INIT_MAIN_PROMPT = (
-  language: string,
-  fullGitMojiSpec: boolean
-): ChatCompletionRequestMessage => ({
-  role: ChatCompletionRequestMessageRoleEnum.System,
-  content: `${IDENTITY} Your mission is to create clean and comprehensive commit messages as per the ${
-    fullGitMojiSpec ? 'GitMoji specification' : 'conventional commit convention'
-  } and explain WHAT were the changes and mainly WHY the changes were done. I'll send you an output of 'git diff --staged' command, and you are to convert it into a commit message.
-  ${
-    config?.OCO_EMOJI
-      ? 'Use GitMoji convention to preface the commit. Here are some help to choose the right emoji (emoji, description): ' +
-        '🐛, Fix a bug; ' +
-        '✨, Introduce new features; ' +
-        '📝, Add or update documentation; ' +
-        '🚀, Deploy stuff; ' +
-        '✅, Add, update, or pass tests; ' +
-        '♻️, Refactor code; ' +
-        '⬆️, Upgrade dependencies; ' +
-        '🔧, Add or update configuration files; ' +
-        '🌐, Internationalization and localization; ' +
-        '💡, Add or update comments in source code; ' +
-        `${
-          fullGitMojiSpec
-            ? '🎨, Improve structure / format of the code; ' +
-              '⚡️, Improve performance; ' +
-              '🔥, Remove code or files; ' +
-              '🚑️, Critical hotfix; ' +
-              '💄, Add or update the UI and style files; ' +
-              '🎉, Begin a project; ' +
-              '🔒️, Fix security issues; ' +
-              '🔐, Add or update secrets; ' +
-              '🔖, Release / Version tags; ' +
-              '🚨, Fix compiler / linter warnings; ' +
-              '🚧, Work in progress; ' +
-              '💚, Fix CI Build; ' +
-              '⬇️, Downgrade dependencies; ' +
-              '📌, Pin dependencies to specific versions; ' +
-              '👷, Add or update CI build system; ' +
-              '📈, Add or update analytics or track code; ' +
-              '➕, Add a dependency; ' +
-              '➖, Remove a dependency; ' +
-              '🔨, Add or update development scripts; ' +
-              '✏️, Fix typos; ' +
-              '💩, Write bad code that needs to be improved; ' +
-              '⏪️, Revert changes; ' +
-              '🔀, Merge branches; ' +
-              '📦️, Add or update compiled files or packages; ' +
-              '👽️, Update code due to external API changes; ' +
-              '🚚, Move or rename resources (e.g.: files, paths, routes); ' +
-              '📄, Add or update license; ' +
-              '💥, Introduce breaking changes; ' +
-              '🍱, Add or update assets; ' +
-              '♿️, Improve accessibility; ' +
-              '🍻, Write code drunkenly; ' +
-              '💬, Add or update text and literals; ' +
-              '🗃️, Perform database related changes; ' +
-              '🔊, Add or update logs; ' +
-              '🔇, Remove logs; ' +
-              '👥, Add or update contributor(s); ' +
-              '🚸, Improve user experience / usability; ' +
-              '🏗️, Make architectural changes; ' +
-              '📱, Work on responsive design; ' +
-              '🤡, Mock things; ' +
-              '🥚, Add or update an easter egg; ' +
-              '🙈, Add or update a .gitignore file; ' +
-              '📸, Add or update snapshots; ' +
-              '⚗️, Perform experiments; ' +
-              '🔍️, Improve SEO; ' +
-              '🏷️, Add or update types; ' +
-              '🌱, Add or update seed files; ' +
-              '🚩, Add, update, or remove feature flags; ' +
-              '🥅, Catch errors; ' +
-              '💫, Add or update animations and transitions; ' +
-              '🗑️, Deprecate code that needs to be cleaned up; ' +
-              '🛂, Work on code related to authorization, roles and permissions; ' +
-              '🩹, Simple fix for a non-critical issue; ' +
-              '🧐, Data exploration/inspection; ' +
-              '⚰️, Remove dead code; ' +
-              '🧪, Add a failing test; ' +
-              '👔, Add or update business logic; ' +
-              '🩺, Add or update healthcheck; ' +
-              '🧱, Infrastructure related changes; ' +
-              '🧑‍💻, Improve developer experience; ' +
-              '💸, Add sponsorships or money related infrastructure; ' +
-              '🧵, Add or update code related to multithreading or concurrency; ' +
-              '🦺, Add or update code related to validation.'
-            : ''
-        }`
-      : 'Do not preface the commit with anything. Conventional commit keywords:' +
-        'fix, feat, build, chore, ci, docs, style, refactor, perf, test.'
-  }  
-    ${
-      config?.OCO_DESCRIPTION
-        ? 'Add a short description of WHY the changes are done after the commit message. Don\'t start it with "This commit", just describe the changes.'
-        : "Don't add any descriptions to the commit, only commit message."
-    }
-    ${
-      config?.OCO_ONE_LINE_COMMIT
-        ? 'Craft a concise commit message that encapsulates all changes made, with an emphasis on the primary updates. If the modifications share a common theme or scope, mention it succinctly; otherwise, leave the scope out to maintain focus. The goal is to provide a clear and unified overview of the changes in a one single message, without diverging into a list of commit per file change.'
-        : ''
-    }
-    Use the present tense. Lines must not be longer than 74 characters. Use ${language} for the commit message.`
-});
-
-export const INIT_DIFF_PROMPT: ChatCompletionRequestMessage = {
-  role: ChatCompletionRequestMessageRoleEnum.User,
-  content: `diff --git a/src/server.ts b/src/server.ts
-    index ad4db42..f3b18a9 100644
-    --- a/src/server.ts
-    +++ b/src/server.ts
-    @@ -10,7 +10,7 @@
-    import {
-        initWinstonLogger();
-        
-        const app = express();
-        -const port = 7799;
-        +const PORT = 7799;
-        
-        app.use(express.json());
-        
-        @@ -34,6 +34,6 @@
-        app.use((_, res, next) => {
-            // ROUTES
-            app.use(PROTECTED_ROUTER_URL, protectedRouter);
-            
-            -app.listen(port, () => {
-                -  console.log(\`Server listening on port \${port}\`);
-                +app.listen(process.env.PORT || PORT, () => {
-                    +  console.log(\`Server listening on port \${PORT}\`);
-                });`
-};
-
-const INIT_CONSISTENCY_PROMPT = (
-  translation: ConsistencyPrompt
-): ChatCompletionRequestMessage => ({
-  role: ChatCompletionRequestMessageRoleEnum.Assistant,
-  content: `${
-    config?.OCO_EMOJI
-      ? `🐛 ${removeConventionalCommitWord(translation.commitFix)}`
-      : translation.commitFix
-  }
-${
-  config?.OCO_EMOJI
-    ? `✨ ${removeConventionalCommitWord(translation.commitFeat)}`
-    : translation.commitFeat
-}
-${config?.OCO_DESCRIPTION ? translation.commitDescription : ''}`
-});
-
-export const getMainCommitPrompt = async (
-  fullGitMojiSpec: boolean
-): Promise<ChatCompletionRequestMessage[]> => {
-  switch (config?.OCO_PROMPT_MODULE) {
-    case '@commitlint':
-      if (!(await utils.commitlintLLMConfigExists())) {
-        note(
-          `OCO_PROMPT_MODULE is @commitlint but you haven't generated consistency for this project yet.`
-        );
-        await configureCommitlintIntegration();
-      }
-
-      // Replace example prompt with a prompt that's generated by OpenAI for the commitlint config.
-      const commitLintConfig = await utils.getCommitlintLLMConfig();
-
-      return [
-        commitlintPrompts.INIT_MAIN_PROMPT(
-          translation.localLanguage,
-          commitLintConfig.prompts
-        ),
-        INIT_DIFF_PROMPT,
-        INIT_CONSISTENCY_PROMPT(
-          commitLintConfig.consistency[
-            translation.localLanguage
-          ] as ConsistencyPrompt
-        )
-      ];
-
-    default:
-      // conventional-commit
-      return [
-        INIT_MAIN_PROMPT(translation.localLanguage, fullGitMojiSpec),
-        INIT_DIFF_PROMPT,
-        INIT_CONSISTENCY_PROMPT(translation)
-      ];
-  }
-};
--- a/src/utils/checkIsLatestVersion.ts
+++ b/src/utils/checkIsLatestVersion.ts
@@ -1,10 +1,7 @@
+import { getOpenCommitLatestVersion } from '../api';
+import currentPackage from '../../package.json' assert { type: 'json' };
 import chalk from 'chalk';

-import { outro } from '@clack/prompts';
-
-import currentPackage from '../../package.json';
-import { getOpenCommitLatestVersion } from '../version';
-
 export const checkIsLatestVersion = async () => {
  const latestVersion = await getOpenCommitLatestVersion();

@@ -12,7 +9,7 @@ export const checkIsLatestVersion = async () => {
    const currentVersion = currentPackage.version;

    if (currentVersion !== latestVersion) {
-      outro(
+      console.warn(
        chalk.yellow(
          `
 You are not using the latest stable version of OpenCommit with new features and bug fixes.
--- a/src/utils/engine.ts
+++ b/src/utils/engine.ts
@@ -1,37 +0,0 @@
-import { AiEngine } from '../engine/Engine';
-import { OpenAi } from '../engine/openAi';
-import { Gemini } from '../engine/gemini';
-import { getConfig } from '../commands/config';
-import { OllamaAi } from '../engine/ollama';
-import { AnthropicAi } from '../engine/anthropic'
-import { TestAi } from '../engine/testAi';
-import { Azure } from '../engine/azure';
-import { FlowiseAi } from '../engine/flowise'
-
-export function getEngine(): AiEngine {
-  const config = getConfig();
-  const provider = config?.OCO_AI_PROVIDER;
-  
-  if (provider?.startsWith('ollama')) {
-    const ollamaAi = new OllamaAi();
-    const model = provider.substring('ollama/'.length);
-    if (model) {
-      ollamaAi.setModel(model);
-      ollamaAi.setUrl(config?.OCO_OLLAMA_API_URL);
-    }
-    return ollamaAi;
-  } else if (provider == 'anthropic') {
-    return new AnthropicAi();
-  } else if (provider == 'test') {
-    return new TestAi();
-  } else if (provider == 'gemini') {
-    return new Gemini();  
-  } else if (provider == 'azure') {
-  	return new Azure();
-  } else if( provider == 'flowise'){
-    return new FlowiseAi();
-  }
-  
-  //open ai gpt by default
-  return new OpenAi();
-}
--- a/src/utils/git.ts
+++ b/src/utils/git.ts
@@ -1,9 +1,8 @@
 import { execa } from 'execa';
+import { outro, spinner } from '@clack/prompts';
 import { readFileSync } from 'fs';
 import ignore, { Ignore } from 'ignore';

-import { outro, spinner } from '@clack/prompts';
-
 export const assertGitRepo = async () => {
  try {
    await execa('git', ['rev-parse']);
@@ -26,11 +25,13 @@ export const getOpenCommitIgnore = (): Ignore => {
  return ig;
 };

-export const getCoreHooksPath = async (): Promise<string> => {
-  const { stdout } = await execa('git', ['config', 'core.hooksPath']);
+export const getCoreHooksPath = async(): Promise<string> => {
+  const { stdout } = await execa('git', [
+    'config',
+    'core.hooksPath']);

  return stdout;
-};
+}

 export const getStagedFiles = async (): Promise<string[]> => {
  const { stdout: gitDir } = await execa('git', [
@@ -75,30 +76,19 @@ export const getChangedFiles = async (): Promise<string[]> => {

 export const gitAdd = async ({ files }: { files: string[] }) => {
  const gitAddSpinner = spinner();
-
  gitAddSpinner.start('Adding files to commit');
-
  await execa('git', ['add', ...files]);
-
  gitAddSpinner.stop('Done');
 };

 export const getDiff = async ({ files }: { files: string[] }) => {
  const lockFiles = files.filter(
-    (file) =>
-      file.includes('.lock') ||
-      file.includes('-lock.') ||
-      file.includes('.svg') ||
-      file.includes('.png') ||
-      file.includes('.jpg') ||
-      file.includes('.jpeg') ||
-      file.includes('.webp') ||
-      file.includes('.gif')
+    (file) => file.includes('.lock') || file.includes('-lock.')
  );

  if (lockFiles.length) {
    outro(
-      `Some files are excluded by default from 'git diff'. No commit messages are generated for this files:\n${lockFiles.join(
+      `Some files are '.lock' files which are excluded by default from 'git diff'. No commit messages are generated for this files:\n${lockFiles.join(
        '\n'
      )}`
    );
--- a/src/utils/mergeDiffs.ts
+++ b/src/utils/mergeDiffs.ts
@@ -1,5 +1,4 @@
 import { tokenCount } from './tokenCount';
-
 export function mergeDiffs(arr: string[], maxStringLength: number): string[] {
  const mergedArr: string[] = [];
  let currentItem: string = arr[0];
--- a/src/utils/removeConventionalCommitWord.ts
+++ b/src/utils/removeConventionalCommitWord.ts
@@ -1,3 +0,0 @@
-export function removeConventionalCommitWord(message: string): string {
-  return message.replace(/^(fix|feat)\((.+?)\):/, '($2):');
-}
--- a/src/utils/tokenCount.ts
+++ b/src/utils/tokenCount.ts
@@ -1,5 +1,5 @@
-import cl100k_base from '@dqbd/tiktoken/encoders/cl100k_base.json';
 import { Tiktoken } from '@dqbd/tiktoken/lite';
+import cl100k_base from '@dqbd/tiktoken/encoders/cl100k_base.json' assert { type: 'json' };

 export function tokenCount(content: string): number {
  const encoding = new Tiktoken(
--- a/src/version.ts
+++ b/src/version.ts
@@ -1,14 +0,0 @@
-import { outro } from '@clack/prompts';
-import { execa } from 'execa';
-
-export const getOpenCommitLatestVersion = async (): Promise<
-  string | undefined
-> => {
-  try {
-    const { stdout } = await execa('npm', ['view', 'opencommit', 'version']);
-    return stdout;
-  } catch (_) {
-    outro('Error while getting the latest version of opencommit');
-    return undefined;
-  }
-};
--- a/test/Dockerfile
+++ b/test/Dockerfile
@@ -1,22 +0,0 @@
-FROM ubuntu:latest
-
-RUN apt-get update && apt-get install -y curl git
-
-# Install Node.js v20
-RUN curl -fsSL https://deb.nodesource.com/setup_20.x | bash -
-RUN apt-get install -y nodejs
-
-# Setup git
-RUN git config --global user.email "test@example.com"
-RUN git config --global user.name "Test User"
-
-WORKDIR /app
-COPY package.json /app/
-COPY package-lock.json /app/
-
-RUN ls -la
-
-RUN npm ci
-COPY . /app
-RUN ls -la
-RUN npm run build
--- a/test/e2e/noChanges.test.ts
+++ b/test/e2e/noChanges.test.ts
@@ -1,12 +0,0 @@
-import { resolve } from 'path'
-import { render } from 'cli-testing-library'
-import 'cli-testing-library/extend-expect';
-import { prepareEnvironment } from './utils';
-
-it('cli flow when there are no changes', async () => {
-  const { gitDir, cleanup } = await prepareEnvironment();
-  const { findByText } = await render(`OCO_AI_PROVIDER='test' node`, [resolve('./out/cli.cjs')], { cwd: gitDir });
-  expect(await findByText('No changes detected')).toBeInTheConsole();
-
-  await cleanup();
-});
--- a/test/e2e/oneFile.test.ts
+++ b/test/e2e/oneFile.test.ts
@@ -1,55 +0,0 @@
-import { resolve } from 'path'
-import { render } from 'cli-testing-library'
-import 'cli-testing-library/extend-expect';
-import { prepareEnvironment } from './utils';
-
-it('cli flow to generate commit message for 1 new file (staged)', async () => {
-  const { gitDir, cleanup } = await prepareEnvironment();
-
-  await render('echo' ,[`'console.log("Hello World");' > index.ts`], { cwd: gitDir });
-  await render('git' ,['add index.ts'], { cwd: gitDir });
-
-  const { queryByText, findByText, userEvent } = await render(`OCO_AI_PROVIDER='test' node`, [resolve('./out/cli.cjs')], { cwd: gitDir });
-  expect(await queryByText('No files are staged')).not.toBeInTheConsole();
-  expect(await queryByText('Do you want to stage all files and generate commit message?')).not.toBeInTheConsole();
-
-  expect(await findByText('Generating the commit message')).toBeInTheConsole();
-  expect(await findByText('Confirm the commit message?')).toBeInTheConsole();
-  userEvent.keyboard('[Enter]');
-
-  expect(await findByText('Choose a remote to push to')).toBeInTheConsole();
-  userEvent.keyboard('[Enter]');
-
-  expect(await findByText('Successfully pushed all commits to origin')).toBeInTheConsole();
-
-  await cleanup();
-});
-
-it('cli flow to generate commit message for 1 changed file (not staged)', async () => {
-  const { gitDir, cleanup } = await prepareEnvironment();
-
-  await render('echo' ,[`'console.log("Hello World");' > index.ts`], { cwd: gitDir });
-  await render('git' ,['add index.ts'], { cwd: gitDir });
-  await render('git' ,[`commit -m 'add new file'`], { cwd: gitDir });
-
-  await render('echo' ,[`'console.log("Good night World");' >> index.ts`], { cwd: gitDir });
-
-  const { findByText, userEvent } = await render(`OCO_AI_PROVIDER='test' node`, [resolve('./out/cli.cjs')], { cwd: gitDir });
-
-  expect(await findByText('No files are staged')).toBeInTheConsole();
-  expect(await findByText('Do you want to stage all files and generate commit message?')).toBeInTheConsole();
-  userEvent.keyboard('[Enter]');
-
-  expect(await findByText('Generating the commit message')).toBeInTheConsole();
-  expect(await findByText('Confirm the commit message?')).toBeInTheConsole();
-  userEvent.keyboard('[Enter]');
-
-  expect(await findByText('Successfully committed')).toBeInTheConsole();
-
-  expect(await findByText('Choose a remote to push to')).toBeInTheConsole();
-  userEvent.keyboard('[Enter]');
-
-  expect(await findByText('Successfully pushed all commits to origin')).toBeInTheConsole();
-
-  await cleanup();
-});
--- a/test/e2e/prompt-module/commitlint.test.ts
+++ b/test/e2e/prompt-module/commitlint.test.ts
@@ -1,224 +0,0 @@
-import { resolve } from 'path';
-import { render } from 'cli-testing-library';
-import 'cli-testing-library/extend-expect';
-import { prepareEnvironment, wait } from '../utils';
-import path from 'path';
-
-function getAbsolutePath(relativePath: string) {
-  const scriptDir = path.dirname(__filename);
-  return path.resolve(scriptDir, relativePath);
-}
-async function setupCommitlint(dir: string, ver: 9 | 18 | 19) {
-  let packagePath, packageJsonPath, configPath;
-  switch (ver) {
-    case 9:
-      packagePath = getAbsolutePath('./data/commitlint_9/node_modules');
-      packageJsonPath = getAbsolutePath('./data/commitlint_9/package.json');
-      configPath = getAbsolutePath('./data/commitlint_9/commitlint.config.js');
-      break;
-    case 18:
-      packagePath = getAbsolutePath('./data/commitlint_18/node_modules');
-      packageJsonPath = getAbsolutePath('./data/commitlint_18/package.json');
-      configPath = getAbsolutePath('./data/commitlint_18/commitlint.config.js');
-      break;
-    case 19:
-      packagePath = getAbsolutePath('./data/commitlint_19/node_modules');
-      packageJsonPath = getAbsolutePath('./data/commitlint_19/package.json');
-      configPath = getAbsolutePath('./data/commitlint_19/commitlint.config.js');
-      break;
-  }
-  await render('cp', ['-r', packagePath, '.'], { cwd: dir });
-  await render('cp', [packageJsonPath, '.'], { cwd: dir });
-  await render('cp', [configPath, '.'], { cwd: dir });
-  await wait(3000); // Avoid flakiness by waiting
-}
-
-describe('cli flow to run "oco commitlint force"', () => {
-  it('on commitlint@9 using CJS', async () => {
-    const { gitDir, cleanup } = await prepareEnvironment();
-
-    await setupCommitlint(gitDir, 9);
-    const npmList = await render('npm', ['list', '@commitlint/load'], {
-      cwd: gitDir
-    });
-    expect(await npmList.findByText('@commitlint/load@9')).toBeInTheConsole();
-
-    const { findByText } = await render(
-      `
-      OCO_TEST_MOCK_TYPE='prompt-module-commitlint-config' \
-      OCO_PROMPT_MODULE='@commitlint'  \
-      OCO_AI_PROVIDER='test'  \
-      node ${resolve('./out/cli.cjs')} commitlint force \
-    `,
-      [],
-      { cwd: gitDir }
-    );
-
-    expect(
-      await findByText('opencommit — configure @commitlint')
-    ).toBeInTheConsole();
-    expect(
-      await findByText('Read @commitlint configuration')
-    ).toBeInTheConsole();
-
-    expect(
-      await findByText('Generating consistency with given @commitlint rules')
-    ).toBeInTheConsole();
-    expect(
-      await findByText('Done - please review contents of')
-    ).toBeInTheConsole();
-
-    await cleanup();
-  });
-  it('on commitlint@18 using CJS', async () => {
-    const { gitDir, cleanup } = await prepareEnvironment();
-
-    await setupCommitlint(gitDir, 18);
-    const npmList = await render('npm', ['list', '@commitlint/load'], {
-      cwd: gitDir
-    });
-    expect(await npmList.findByText('@commitlint/load@18')).toBeInTheConsole();
-
-    const { findByText } = await render(
-      `
-      OCO_TEST_MOCK_TYPE='prompt-module-commitlint-config' \
-      OCO_PROMPT_MODULE='@commitlint'  \
-      OCO_AI_PROVIDER='test'  \
-      node ${resolve('./out/cli.cjs')} commitlint force \
-    `,
-      [],
-      { cwd: gitDir }
-    );
-
-    expect(
-      await findByText('opencommit — configure @commitlint')
-    ).toBeInTheConsole();
-    expect(
-      await findByText('Read @commitlint configuration')
-    ).toBeInTheConsole();
-
-    expect(
-      await findByText('Generating consistency with given @commitlint rules')
-    ).toBeInTheConsole();
-    expect(
-      await findByText('Done - please review contents of')
-    ).toBeInTheConsole();
-
-    await cleanup();
-  });
-  it('on commitlint@19 using ESM', async () => {
-    const { gitDir, cleanup } = await prepareEnvironment();
-
-    await setupCommitlint(gitDir, 19);
-    const npmList = await render('npm', ['list', '@commitlint/load'], {
-      cwd: gitDir
-    });
-    expect(await npmList.findByText('@commitlint/load@19')).toBeInTheConsole();
-
-    const { findByText } = await render(
-      `
-      OCO_TEST_MOCK_TYPE='prompt-module-commitlint-config' \
-      OCO_PROMPT_MODULE='@commitlint'  \
-      OCO_AI_PROVIDER='test'  \
-      node ${resolve('./out/cli.cjs')} commitlint force \
-    `,
-      [],
-      { cwd: gitDir }
-    );
-
-    expect(
-      await findByText('opencommit — configure @commitlint')
-    ).toBeInTheConsole();
-    expect(
-      await findByText('Read @commitlint configuration')
-    ).toBeInTheConsole();
-
-    expect(
-      await findByText('Generating consistency with given @commitlint rules')
-    ).toBeInTheConsole();
-    expect(
-      await findByText('Done - please review contents of')
-    ).toBeInTheConsole();
-
-    await cleanup();
-  });
-});
-
-describe('cli flow to generate commit message using @commitlint prompt-module', () => {
-  it('on commitlint@19 using ESM', async () => {
-    const { gitDir, cleanup } = await prepareEnvironment();
-
-    // Setup commitlint@19
-    await setupCommitlint(gitDir, 19);
-    const npmList = await render('npm', ['list', '@commitlint/load'], {
-      cwd: gitDir
-    });
-    expect(await npmList.findByText('@commitlint/load@19')).toBeInTheConsole();
-
-    // Run `oco commitlint force`
-    const commitlintForce = await render(
-      `
-      OCO_TEST_MOCK_TYPE='prompt-module-commitlint-config' \
-      OCO_PROMPT_MODULE='@commitlint'  \
-      OCO_AI_PROVIDER='test'  \
-      node ${resolve('./out/cli.cjs')} commitlint force \
-    `,
-      [],
-      { cwd: gitDir }
-    );
-    expect(
-      await commitlintForce.findByText('Done - please review contents of')
-    ).toBeInTheConsole();
-
-    // Run `oco commitlint get`
-    const commitlintGet = await render(
-      `
-      OCO_TEST_MOCK_TYPE='prompt-module-commitlint-config' \
-      OCO_PROMPT_MODULE='@commitlint'  \
-      OCO_AI_PROVIDER='test'  \
-      node ${resolve('./out/cli.cjs')} commitlint get \
-    `,
-      [],
-      { cwd: gitDir }
-    );
-    expect(
-      await commitlintGet.findByText('[object Object]')
-    ).toBeInTheConsole();
-
-    // Run 'oco' using .opencommit-commitlint
-    await render('echo', [`'console.log("Hello World");' > index.ts`], {
-      cwd: gitDir
-    });
-    await render('git', ['add index.ts'], { cwd: gitDir });
-
-    const oco = await render(
-      `
-      OCO_TEST_MOCK_TYPE='commit-message' \
-      OCO_PROMPT_MODULE='@commitlint'  \
-      OCO_AI_PROVIDER='test' \
-      node ${resolve('./out/cli.cjs')} \
-    `,
-      [],
-      { cwd: gitDir }
-    );
-
-    expect(
-      await oco.findByText('Generating the commit message')
-    ).toBeInTheConsole();
-    expect(
-      await oco.findByText('Confirm the commit message?')
-    ).toBeInTheConsole();
-    oco.userEvent.keyboard('[Enter]');
-
-    expect(
-      await oco.findByText('Choose a remote to push to')
-    ).toBeInTheConsole();
-    oco.userEvent.keyboard('[Enter]');
-
-    expect(
-      await oco.findByText('Successfully pushed all commits to origin')
-    ).toBeInTheConsole();
-
-    await cleanup();
-  });
-});
--- a/test/e2e/prompt-module/data/commitlint_18/commitlint.config.js
+++ b/test/e2e/prompt-module/data/commitlint_18/commitlint.config.js
@@ -1,3 +0,0 @@
-module.exports = {
-  extends: ['@commitlint/config-conventional']
-};
--- a/test/e2e/prompt-module/data/commitlint_18/package-lock.json
+++ b/test/e2e/prompt-module/data/commitlint_18/package-lock.json
--- a/test/e2e/prompt-module/data/commitlint_18/package.json
+++ b/test/e2e/prompt-module/data/commitlint_18/package.json
@@ -1,15 +0,0 @@
-{
-  "name": "commitlint-test",
-  "version": "1.0.0",
-  "description": "",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "author": "",
-  "license": "ISC",
-  "devDependencies": {
-    "@commitlint/cli": "^18.0.0",
-    "@commitlint/config-conventional": "^18.0.0"
-  }
-}
--- a/test/e2e/prompt-module/data/commitlint_19/commitlint.config.js
+++ b/test/e2e/prompt-module/data/commitlint_19/commitlint.config.js
@@ -1,3 +0,0 @@
-export default {
-  extends: ['@commitlint/config-conventional']
-};
--- a/test/e2e/prompt-module/data/commitlint_19/package-lock.json
+++ b/test/e2e/prompt-module/data/commitlint_19/package-lock.json
--- a/test/e2e/prompt-module/data/commitlint_19/package.json
+++ b/test/e2e/prompt-module/data/commitlint_19/package.json
@@ -1,16 +0,0 @@
-{
-  "name": "commitlint-test",
-  "version": "1.0.0",
-  "description": "",
-  "main": "index.js",
-  "type": "module",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "author": "",
-  "license": "ISC",
-  "devDependencies": {
-    "@commitlint/cli": "^19.0.0",
-    "@commitlint/config-conventional": "^19.0.0"
-  }
-}
--- a/test/e2e/prompt-module/data/commitlint_9/commitlint.config.js
+++ b/test/e2e/prompt-module/data/commitlint_9/commitlint.config.js
@@ -1,3 +0,0 @@
-module.exports = {
-  extends: ['@commitlint/config-conventional']
-};
--- a/test/e2e/prompt-module/data/commitlint_9/package-lock.json
+++ b/test/e2e/prompt-module/data/commitlint_9/package-lock.json
--- a/test/e2e/prompt-module/data/commitlint_9/package.json
+++ b/test/e2e/prompt-module/data/commitlint_9/package.json
@@ -1,15 +0,0 @@
-{
-  "name": "commitlint-test",
-  "version": "1.0.0",
-  "description": "",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "author": "",
-  "license": "ISC",
-  "devDependencies": {
-    "@commitlint/cli": "^9.0.0",
-    "@commitlint/config-conventional": "^9.0.0"
-  }
-}
--- a/test/e2e/setup.sh
+++ b/test/e2e/setup.sh
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-current_dir=$(pwd)
-setup_dir="$(cd "$(dirname "$0")" && pwd)"
-
-# Set up for prompt-module/commitlint
-cd $setup_dir && cd prompt-module/data/commitlint_9 && npm ci
-cd $setup_dir && cd prompt-module/data/commitlint_18 && npm ci
-cd $setup_dir && cd prompt-module/data/commitlint_19 && npm ci
-
-cd $current_dir
--- a/test/e2e/utils.ts
+++ b/test/e2e/utils.ts
@@ -1,33 +0,0 @@
-import path from 'path'
-import { mkdtemp, rm } from 'fs'
-import { promisify } from 'util';
-import { tmpdir } from 'os';
-import { exec } from 'child_process';
-const fsMakeTempDir = promisify(mkdtemp);
-const fsExec = promisify(exec);
-const fsRemove = promisify(rm);
-
-/**
- * Prepare the environment for the test
- * Create a temporary git repository in the temp directory
- */
-export const prepareEnvironment = async (): Promise<{
-  gitDir: string;
-  cleanup: () => Promise<void>;
-}> => {
-  const tempDir = await fsMakeTempDir(path.join(tmpdir(), 'opencommit-test-'));
-  // Create a remote git repository int the temp directory. This is necessary to execute the `git push` command
-  await fsExec('git init --bare remote.git', { cwd: tempDir }); 
-  await fsExec('git clone remote.git test', { cwd: tempDir });
-  const gitDir = path.resolve(tempDir, 'test');
-
-  const cleanup = async () => {
-    return fsRemove(tempDir, { recursive: true });
-  }
-  return {
-    gitDir,
-    cleanup,
-  }
-}
-
-export const wait = (ms: number) => new Promise(resolve => setTimeout(resolve, ms));
--- a/test/jest-setup.ts
+++ b/test/jest-setup.ts
@@ -1,10 +0,0 @@
-import 'cli-testing-library/extend-expect'
-import { configure } from 'cli-testing-library'
-import { jest } from '@jest/globals';
-
-global.jest = jest;
-
-/**
- * Adjusted the wait time for waitFor/findByText to 2000ms, because the default 1000ms makes the test results flaky
- */
-configure({ asyncUtilTimeout: 2000 })
--- a/test/unit/config.test.ts
+++ b/test/unit/config.test.ts
@@ -1,105 +0,0 @@
-import { getConfig } from '../../src/commands/config';
-import { prepareFile } from './utils';
-
-describe('getConfig', () => {
-  const originalEnv = { ...process.env };
-  function resetEnv(env: NodeJS.ProcessEnv) {
-    Object.keys(process.env).forEach((key) => {
-      if (!(key in env)) {
-        delete process.env[key];
-      } else {
-        process.env[key] = env[key];
-      }
-    });
-  }
-
-  beforeEach(() => {
-    resetEnv(originalEnv);
-  });
-
-  afterAll(() => {
-    resetEnv(originalEnv);
-  });
-
-  it('return config values from the global config file', async () => {
-    const configFile = await prepareFile(
-      '.opencommit',
-      `
-OCO_OPENAI_API_KEY="sk-key"
-OCO_ANTHROPIC_API_KEY="secret-key"
-OCO_TOKENS_MAX_INPUT="8192"
-OCO_TOKENS_MAX_OUTPUT="1000"
-OCO_OPENAI_BASE_PATH="/openai/api"
-OCO_DESCRIPTION="true"
-OCO_EMOJI="true"
-OCO_MODEL="gpt-4"
-OCO_LANGUAGE="de"
-OCO_MESSAGE_TEMPLATE_PLACEHOLDER="$m"
-OCO_PROMPT_MODULE="@commitlint"
-OCO_AI_PROVIDER="ollama"
-OCO_GITPUSH="false"
-OCO_ONE_LINE_COMMIT="true"
-`
-    );
-    const config = getConfig({ configPath: configFile.filePath, envPath: '' });
-
-    expect(config).not.toEqual(null);
-    expect(config!['OCO_OPENAI_API_KEY']).toEqual('sk-key');
-    expect(config!['OCO_ANTHROPIC_API_KEY']).toEqual('secret-key');
-    expect(config!['OCO_TOKENS_MAX_INPUT']).toEqual(8192);
-    expect(config!['OCO_TOKENS_MAX_OUTPUT']).toEqual(1000);
-    expect(config!['OCO_OPENAI_BASE_PATH']).toEqual('/openai/api');
-    expect(config!['OCO_DESCRIPTION']).toEqual(true);
-    expect(config!['OCO_EMOJI']).toEqual(true);
-    expect(config!['OCO_MODEL']).toEqual('gpt-4');
-    expect(config!['OCO_LANGUAGE']).toEqual('de');
-    expect(config!['OCO_MESSAGE_TEMPLATE_PLACEHOLDER']).toEqual('$m');
-    expect(config!['OCO_PROMPT_MODULE']).toEqual('@commitlint');
-    expect(() => ['ollama', 'gemini'].includes(config!['OCO_AI_PROVIDER'])).toBeTruthy();
-    expect(config!['OCO_GITPUSH']).toEqual(false);
-    expect(config!['OCO_ONE_LINE_COMMIT']).toEqual(true);
-
-    await configFile.cleanup();
-  });
-
-  it('return config values from the local env file', async () => {
-    const envFile = await prepareFile(
-      '.env',
-      `
-OCO_OPENAI_API_KEY="sk-key"
-OCO_ANTHROPIC_API_KEY="secret-key"
-OCO_TOKENS_MAX_INPUT="8192"
-OCO_TOKENS_MAX_OUTPUT="1000"
-OCO_OPENAI_BASE_PATH="/openai/api"
-OCO_DESCRIPTION="true"
-OCO_EMOJI="true"
-OCO_MODEL="gpt-4"
-OCO_LANGUAGE="de"
-OCO_MESSAGE_TEMPLATE_PLACEHOLDER="$m"
-OCO_PROMPT_MODULE="@commitlint"
-OCO_AI_PROVIDER="ollama"
-OCO_GITPUSH="false"
-OCO_ONE_LINE_COMMIT="true"
-    `
-    );
-    const config = getConfig({ configPath: '', envPath: envFile.filePath });
-
-    expect(config).not.toEqual(null);
-    expect(config!['OCO_OPENAI_API_KEY']).toEqual('sk-key');
-    expect(config!['OCO_ANTHROPIC_API_KEY']).toEqual('secret-key');
-    expect(config!['OCO_TOKENS_MAX_INPUT']).toEqual(8192);
-    expect(config!['OCO_TOKENS_MAX_OUTPUT']).toEqual(1000);
-    expect(config!['OCO_OPENAI_BASE_PATH']).toEqual('/openai/api');
-    expect(config!['OCO_DESCRIPTION']).toEqual(true);
-    expect(config!['OCO_EMOJI']).toEqual(true);
-    expect(config!['OCO_MODEL']).toEqual('gpt-4');
-    expect(config!['OCO_LANGUAGE']).toEqual('de');
-    expect(config!['OCO_MESSAGE_TEMPLATE_PLACEHOLDER']).toEqual('$m');
-    expect(config!['OCO_PROMPT_MODULE']).toEqual('@commitlint');
-    expect(() => ['ollama', 'gemini'].includes(config!['OCO_AI_PROVIDER'])).toBeTruthy();
-    expect(config!['OCO_GITPUSH']).toEqual(false);
-    expect(config!['OCO_ONE_LINE_COMMIT']).toEqual(true);
-
-    await envFile.cleanup();
-  });
-});
--- a/test/unit/gemini.test.ts
+++ b/test/unit/gemini.test.ts
@@ -1,105 +0,0 @@
-import { Gemini } from '../../src/engine/gemini';
-import { ChatCompletionRequestMessage } from 'openai';
-import { GenerativeModel, GoogleGenerativeAI } from '@google/generative-ai';
-import { ConfigType, getConfig } from '../../src/commands/config';
-
-describe('Gemini', () => {
-  let gemini: Gemini;
-  let mockConfig: ConfigType;
-  let mockGoogleGenerativeAi: GoogleGenerativeAI;
-  let mockGenerativeModel: GenerativeModel;
-  let mockExit: jest.SpyInstance<never, [code?: number | undefined], any>;
-  let mockWarmup: jest.SpyInstance<any, unknown[], any>;
-  
-  const noop: (code?: number | undefined) => never = (code?: number | undefined) => {};
-  
-  const mockGemini = () => {
-    gemini = new Gemini();
-  }
-  
-  const oldEnv = process.env;
-
-  beforeEach(() => {
-    jest.resetModules();
-    process.env = { ...oldEnv };
-    
-    jest.mock('@google/generative-ai');
-    jest.mock('../src/commands/config');
-    
-    jest.mock('@clack/prompts', () => ({
-      intro: jest.fn(),
-      outro: jest.fn(),
-    }));
-    
-    if (mockWarmup) mockWarmup.mockRestore();
-    
-    mockExit = jest.spyOn(process, 'exit').mockImplementation();
-    mockConfig = getConfig() as ConfigType;
-    
-    mockConfig.OCO_AI_PROVIDER = 'gemini';
-    mockConfig.OCO_GEMINI_API_KEY = 'mock-api-key';
-    mockConfig.OCO_MODEL = 'gemini-1.5-flash';
-    
-    mockGoogleGenerativeAi = new GoogleGenerativeAI(mockConfig.OCO_GEMINI_API_KEY);    
-    mockGenerativeModel = mockGoogleGenerativeAi.getGenerativeModel({ model: mockConfig.OCO_MODEL, });
-  });
-  
-  afterEach(() => {
-    gemini = undefined as any;
-  })
-  
-  afterAll(() => {
-    mockExit.mockRestore();
-    process.env = oldEnv;
-  });
-
-  it('should initialize with correct config', () => {
-    mockGemini();
-    // gemini = new Gemini();
-    expect(gemini).toBeDefined();
-  });
-
-  it('should warmup correctly', () => {
-    mockWarmup = jest.spyOn(Gemini.prototype as any, 'warmup').mockImplementation(noop);
-    mockGemini();
-    expect(gemini).toBeDefined();
-  });
-
-  it('should exit process if OCO_GEMINI_API_KEY is not set and command is not config', () => {
-    process.env.OCO_GEMINI_API_KEY = undefined;
-    process.env.OCO_AI_PROVIDER = 'gemini';
-    
-    mockGemini();
-    
-    expect(mockExit).toHaveBeenCalledWith(1);
-  });
-
-  it('should exit process if model is not supported and command is not config', () => {
-    process.env.OCO_GEMINI_API_KEY = undefined;
-    process.env.OCO_AI_PROVIDER = 'gemini';
-
-    mockGemini();
-
-    expect(mockExit).toHaveBeenCalledWith(1);
-  });
-  
-  it('should generate commit message', async () => {
-    const mockGenerateContent = jest.fn().mockResolvedValue({ response: { text: () => 'generated content' } });
-    mockGenerativeModel.generateContent = mockGenerateContent;
-    
-    mockWarmup = jest.spyOn(Gemini.prototype as any, 'warmup').mockImplementation(noop);
-    mockGemini();
-    
-    const messages: ChatCompletionRequestMessage[] = [
-      { role: 'system', content: 'system message' },
-      { role: 'assistant', content: 'assistant message' },
-    ];
-    
-    jest.spyOn(gemini, 'generateCommitMessage').mockImplementation(async () => 'generated content');
-    const result = await gemini.generateCommitMessage(messages);
-
-    expect(result).toEqual('generated content');
-    expect(mockWarmup).toHaveBeenCalled();
-  });
-  
-});
--- a/test/unit/utils.ts
+++ b/test/unit/utils.ts
@@ -1,29 +0,0 @@
-import path from 'path';
-import { mkdtemp, rm, writeFile } from 'fs';
-import { promisify } from 'util';
-import { tmpdir } from 'os';
-const fsMakeTempDir = promisify(mkdtemp);
-const fsRemove = promisify(rm);
-const fsWriteFile = promisify(writeFile);
-
-/**
- * Prepare tmp file for the test
- */
-export async function prepareFile(
-  fileName: string,
-  content: string
-): Promise<{
-  filePath: string;
-  cleanup: () => Promise<void>;
-}> {
-  const tempDir = await fsMakeTempDir(path.join(tmpdir(), 'opencommit-test-'));
-  const filePath = path.resolve(tempDir, fileName);
-  await fsWriteFile(filePath, content);
-  const cleanup = async () => {
-    return fsRemove(tempDir, { recursive: true });
-  };
-  return {
-    filePath,
-    cleanup
-  };
-}
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,12 +1,12 @@
 {
  "compilerOptions": {
-    "target": "ES2020",
-    "lib": ["ES6", "ES2020"],
+    "target": "ESNext",
+    "lib": ["ES5", "ES6"],

-    "module": "CommonJS",
-    
+    "module": "ESNext",
+    // "rootDir": "./src",
    "resolveJsonModule": true,
-    "moduleResolution": "Node",
+    "moduleResolution": "node",

    "allowJs": true,

@@ -21,9 +21,6 @@

    "skipLibCheck": true
  },
-  "include": [
-    "test/jest-setup.ts"
-  ],
  "exclude": ["node_modules"],
  "ts-node": {
    "esm": true,
				`@@ -1 +0,0 @@`
				export const COMMITLINT_LLM_CONFIG_PATH = `${process.env.PWD}/.opencommit-commitlint`;