2.2.10

refactor(api.ts): replace axios with execa to get the latest version of opencommit from npm registry

.eslintrc.json

@@ -21,8 +21,8 @@
   "rules": {
     "prettier/prettier": "error",
     "no-console": "error",
-    "sort-imports": "off",
     "import/order": "off",
+    "sort-imports": "off",
     "simple-import-sort/imports": "error",
     "simple-import-sort/exports": "error",
     "import/first": "error",

.prettierignore

@@ -1,2 +1,3 @@
 /build
 /dist
+/out

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) Dima Sukharev
+Copyright (c) Dima Sukharev, https://github.com/di-sukharev
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

README.md

@@ -5,7 +5,7 @@
     <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>GPT CLI to auto-generate impressive commits in 1 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>
 </div>
@@ -18,22 +18,16 @@
 
 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 Github Action
+## 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 repository branches are meaningful and not lame like `fix1` or `done2`.
 
-### Automatic 1 click setup
-
-You can simply [setup the action automatically via the GitHub Marketplace](TODO).
-
-### Manual 3 clicks setup
-
 Create a file `.github/workflows/opencommit.yml` with contents below:
 
 ```yml
-name: 'OpenCommit'
+name: 'OpenCommit Action'
 
 on:
   push:
@@ -43,6 +37,7 @@ on:
 
 jobs:
   opencommit:
+    timeout-minutes: 10
     name: OpenCommit
     runs-on: ubuntu-latest
     permissions: write-all
@@ -54,7 +49,7 @@ jobs:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0
-      - uses: di-sukharev/opencommit@github-action
+      - uses: di-sukharev/opencommit@github-action-v1.0.4
         with:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -81,7 +76,7 @@ Interactive rebase (`rebase -i`) changes commit SHA, so commit history in remote
 
 ## Setup OpenCommit as a CLI
 
-You can use OpenCommit by simply running it via CLI like this `oc`. 2 seconds and your staged changes are committed with a meaningful message.
+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:
 
@@ -108,7 +103,7 @@ git add <files...>
 opencommit
 ```
 
-You can also use the `oc` shortcut:
+You can also use the `oco` shortcut:
 
 ```sh
 git add <files...>
@@ -138,19 +133,19 @@ Local config still has more priority as Global config, but you may set `OCO_MODE
 Simply run any of the variable above like this:
 
 ```sh
-oc config set OCO_OPENAI_API_KEY=gpt-4
+oco config set OCO_OPENAI_API_KEY=gpt-4
 ```
 
 Configure [GitMoji](https://gitmoji.dev/) to preface a message.
 
 ```sh
-oc config set OCO_EMOJI=true
+oco config set OCO_EMOJI=true
 ```
 
 To remove preface emoji:
 
 ```sh
-oc config set OCO_EMOJI=false
+oco config set OCO_EMOJI=false
 ```
 
 ### Switch to GPT-4
@@ -160,7 +155,7 @@ By default OpenCommit uses GPT-3.5-turbo (ChatGPT).
 You may switch to GPT-4 which performs better, but costs ~x15 times more 🤠
 
 ```sh
-oc config set OCO_MODEL=gpt-4
+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.
@@ -171,14 +166,14 @@ To globally specify the language used to generate commit messages:
 
 ```sh
 # de, German ,Deutsch
-oc config set OCO_LANGUAGE=de
+oco config set OCO_LANGUAGE=de
-oc config set OCO_LANGUAGE=German
+oco config set OCO_LANGUAGE=German
-oc config set OCO_LANGUAGE=Deutsch
+oco config set OCO_LANGUAGE=Deutsch
 
 # fr, French, française
-oc config set OCO_LANGUAGE=fr
+oco config set OCO_LANGUAGE=fr
-oc config set OCO_LANGUAGE=French
+oco config set OCO_LANGUAGE=French
-oc config set OCO_LANGUAGE=française
+oco config set OCO_LANGUAGE=française
 ```
 
 The default language set is **English**
@@ -186,10 +181,10 @@ All available languages are currently listed in the [i18n](https://github.com/di
 
 ### Git flags
 
-The `opencommit` or `oc` 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 `oc`.
+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
-oc --no-verify
+oco --no-verify
 ```
 
 is translated to :
@@ -218,13 +213,13 @@ You can set OpenCommit as Git [`prepare-commit-msg`](https://git-scm.com/docs/gi
 To set the hook:
 
 ```sh
-oc hook set
+oco hook set
 ```
 
 To unset the hook:
 
 ```sh
-oc hook unset
+oco hook unset
 ```
 
 To use the hook:

action.yml

@@ -1,7 +1,10 @@
-name: 'OpenCommit'
+name: 'OpenCommit — improve commits with AI 🧙'
-description: 'Replaces lame commit messages with meaningful AI-generated messages when you push to remote 🤯🔫'
+description: 'Replaces lame commit messages with meaningful AI-generated messages when you push to remote'
 author: 'https://github.com/di-sukharev'
 repo: 'https://github.com/di-sukharev/opencommit/tree/github-action'
+branding:
+  icon: 'git-commit'
+  color: 'green'
 keywords:
   [
     'git',

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "opencommit",
-  "version": "2.0.15",
+  "version": "2.2.10",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "opencommit",
-      "version": "2.0.15",
+      "version": "2.2.10",
       "license": "MIT",
       "dependencies": {
         "@actions/core": "^1.10.0",
@@ -26,7 +26,6 @@
         "openai": "^3.2.1"
       },
       "bin": {
-        "oc": "out/cli.cjs",
         "oco": "out/cli.cjs",
         "opencommit": "out/cli.cjs"
       },

package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencommit",
-  "version": "2.0.15",
+  "version": "2.2.10",
   "description": "Auto-generate impressive commits in 1 second. Killing lame commits with AI 🤯🔫",
   "keywords": [
     "git",
@@ -17,7 +17,6 @@
   "main": "cli.js",
   "bin": {
     "opencommit": "./out/cli.cjs",
-    "oc": "./out/cli.cjs",
     "oco": "./out/cli.cjs"
   },
   "repository": {
@@ -42,7 +41,8 @@
     "start": "node ./out/cli.cjs",
     "dev": "ts-node ./src/cli.ts",
     "build": "rimraf out && node esbuild.config.js",
-    "deploy": "npm run build && npm version patch && npm publish --tag latest",
+    "deploy": "npm run build:push && git push --tags && npm publish --tag latest",
+    "build:push": "npm run build && git add . && git commit -m 'build' && git push",
     "lint": "eslint src --ext ts && tsc --noEmit",
     "format": "prettier --write src"
   },

src/CommandsEnum.ts

@@ -1,4 +1,4 @@
 export enum COMMANDS {
-  hook = 'hook',
+  config = 'config',
-  config = 'config'
+  hook = 'hook'
 }

src/api.ts

@@ -7,7 +7,14 @@ import {
   OpenAIApi
 } from 'openai';
 
-import { CONFIG_MODES, getConfig } from './commands/config';
+import {
+  CONFIG_MODES,
+  DEFAULT_MODEL_TOKEN_LIMIT,
+  getConfig
+} from './commands/config';
+import { tokenCount } from './utils/tokenCount';
+import { GenerateCommitMessageErrorEnum } from './generateCommitMessageFromGitDiff';
+import { execa } from 'execa';
 
 const config = getConfig();
 
@@ -21,7 +28,7 @@ if (!apiKey && command !== 'config' && mode !== CONFIG_MODES.set) {
   intro('opencommit');
 
   outro(
-    'OCO_OPENAI_API_KEY is not set, please run `oc config set OCO_OPENAI_API_KEY=<your token>. 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'
@@ -56,6 +63,14 @@ class OpenAi {
       max_tokens: maxTokens || 500
     };
     try {
+      const REQUEST_TOKENS = messages
+        .map((msg) => tokenCount(msg.content) + 4)
+        .reduce((a, b) => a + b, 0);
+
+      if (REQUEST_TOKENS > DEFAULT_MODEL_TOKEN_LIMIT - maxTokens) {
+        throw new Error(GenerateCommitMessageErrorEnum.tooMuchTokens);
+      }
+
       const { data } = await this.openAI.createChatCompletion(params);
 
       const message = data.choices[0].message;
@@ -88,10 +103,8 @@ export const getOpenCommitLatestVersion = async (): Promise<
   string | undefined
 > => {
   try {
-    const { data } = await axios.get(
+    const { stdout } = await execa('npm', ['view', 'opencommit', 'version']);
-      'https://unpkg.com/opencommit/package.json'
+    return stdout;
-    );
-    return data.version;
   } catch (_) {
     outro('Error while getting the latest version of opencommit');
     return undefined;

src/cli.ts

@@ -7,7 +7,7 @@ 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';
+import { checkIsLatestVersion } from './utils/checkIsLatestVersion';
 
 const extraArgs = process.argv.slice(2);
 
@@ -21,7 +21,7 @@ cli(
     help: { description: packageJSON.description }
   },
   async () => {
-    // await checkIsLatestVersion();
+    await checkIsLatestVersion();
 
     if (await isHookCalled()) {
       prepareCommitMessageHook();

src/commands/commit.ts

@@ -1,6 +1,5 @@
 import { execa } from 'execa';
 import {
-  GenerateCommitMessageErrorEnum,
   generateCommitMessageByDiff
 } from '../generateCommitMessageFromGitDiff';
 import {
@@ -139,7 +138,7 @@ export async function commit(
 
     if (changedFiles) await gitAdd({ files: changedFiles });
     else {
-      outro('No changes detected, write some code and run `oc` again');
+      outro('No changes detected, write some code and run `oco` again');
       process.exit(1);
     }
   }

src/commands/config.ts

@@ -22,6 +22,8 @@ export enum CONFIG_KEYS {
   OCO_LANGUAGE = 'OCO_LANGUAGE'
 }
 
+export const DEFAULT_MODEL_TOKEN_LIMIT = 4096;
+
 export enum CONFIG_MODES {
   get = 'get',
   set = 'set'
@@ -80,7 +82,7 @@ export const configValidators = {
     }
     validateConfig(
       CONFIG_KEYS.OCO_OPENAI_MAX_TOKENS,
-      typeof value === 'number',
+      value ? typeof value === 'number' : undefined,
       'Must be a number'
     );
 
@@ -117,8 +119,8 @@ export const configValidators = {
 
   [CONFIG_KEYS.OCO_MODEL](value: any) {
     validateConfig(
-      CONFIG_KEYS.OCO_OPENAI_BASE_PATH,
+      CONFIG_KEYS.OCO_MODEL,
-      value === 'gpt-3.5-turbo' || value === 'gpt-4',
+      ['gpt-3.5-turbo', 'gpt-4'].includes(value),
       `${value} is not supported yet, use 'gpt-4' or 'gpt-3.5-turbo' (default)`
     );
     return value;
@@ -134,12 +136,12 @@ const configPath = pathJoin(homedir(), '.opencommit');
 export const getConfig = (): ConfigType | null => {
   const configFromEnv = {
     OCO_OPENAI_API_KEY: process.env.OCO_OPENAI_API_KEY,
-    OCO_OPENAI_MAX_TOKENS: Number(process.env.OCO_OPENAI_MAX_TOKENS),
+    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_DESCRIPTION: process.env.OCO_DESCRIPTION === 'true' ? true : false,
     OCO_EMOJI: process.env.OCO_EMOJI === 'true' ? true : false,
-    OCO_MODEL: process.env.OCO_MODEL,
+    OCO_MODEL: process.env.OCO_MODEL || 'gpt-3.5-turbo',
-    OCO_LANGUAGE: process.env.OCO_LANGUAGE
+    OCO_LANGUAGE: process.env.OCO_LANGUAGE || 'en'
   };
 
   const configExists = existsSync(configPath);
@@ -149,6 +151,10 @@ export const getConfig = (): ConfigType | null => {
   const config = iniParse(configFile);
 
   for (const configKey of Object.keys(config)) {
+    if (!config[configKey] || ['null', 'undefined'].includes(config[configKey])) {
+      config[configKey] = undefined;
+      continue;
+    }
     try {
       const validator = configValidators[configKey as CONFIG_KEYS];
       const validValue = validator(

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

@@ -24,7 +24,7 @@ export const prepareCommitMessageHook = async (
 
       if (changedFiles) await gitAdd({ files: changedFiles });
       else {
-        outro('No changes detected, write some code and run `oc` again');
+        outro('No changes detected, write some code and run `oco` again');
         process.exit(1);
       }
     }

src/generateCommitMessageFromGitDiff.ts

@@ -3,7 +3,7 @@ import {
     ChatCompletionRequestMessageRoleEnum
 } from 'openai';
 import {api} from './api';
-import { getConfig } from './commands/config';
+import {DEFAULT_MODEL_TOKEN_LIMIT, getConfig} from './commands/config';
 import {mergeDiffs} from './utils/mergeDiffs';
 import {i18n, I18nLocals} from './i18n';
 import {tokenCount} from './utils/tokenCount';
@@ -74,27 +74,32 @@ export enum GenerateCommitMessageErrorEnum {
     emptyMessage = 'EMPTY_MESSAGE'
 }
 
-interface GenerateCommitMessageError {
-  error: GenerateCommitMessageErrorEnum;
-}
-
 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;
+const ADJUSTMENT_FACTOR = 20;
 
 export const generateCommitMessageByDiff = async (
     diff: string
 ): Promise<string> => {
     try {
-    if (tokenCount(diff) >= MAX_REQ_TOKENS) {
+        const MAX_REQUEST_TOKENS = DEFAULT_MODEL_TOKEN_LIMIT
+            - ADJUSTMENT_FACTOR
+            - INIT_MESSAGES_PROMPT_LENGTH
+            - config?.OCO_OPENAI_MAX_TOKENS;
+
+        if (tokenCount(diff) >= MAX_REQUEST_TOKENS) {
             const commitMessagePromises = getCommitMsgsPromisesFromFileDiffs(
                 diff,
-        MAX_REQ_TOKENS
+                MAX_REQUEST_TOKENS
             );
 
-      const commitMessages = await Promise.all(commitMessagePromises);
+            const commitMessages = [];
+            for (const promise of commitMessagePromises) {
+                commitMessages.push(await promise);
+                await delay(2000);
+            }
 
             return commitMessages.join('\n\n');
         } else {
@@ -126,9 +131,17 @@ function getMessagesPromisesByChangesInFile(
         maxChangeLength
     );
 
-  const lineDiffsWithHeader = mergedChanges.map(
+    const lineDiffsWithHeader = [];
-    (change) => fileHeader + change
+    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 commitMsgsFromFileLineDiffs = lineDiffsWithHeader.map((lineDiff) => {
         const messages = generateCommitMessageChatCompletionPrompt(
@@ -141,6 +154,39 @@ function getMessagesPromisesByChangesInFile(
     return commitMsgsFromFileLineDiffs;
 }
 
+
+function splitDiff(diff: string, maxChangeLength: number) {
+    const lines = diff.split('\n');
+    const splitDiffs = [];
+    let currentDiff = '';
+
+    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 function getCommitMsgsPromisesFromFileDiffs(
     diff: string,
     maxDiffLength: number
@@ -172,5 +218,11 @@ export function getCommitMsgsPromisesFromFileDiffs(
             commitMessagePromises.push(api.generateCommitMessage(messages));
         }
     }
+
+
     return commitMessagePromises;
 }
+
+function delay(ms: number) {
+    return new Promise(resolve => setTimeout(resolve, ms));
+}

src/utils/checkIsLatestVersion.ts

@@ -1,6 +1,7 @@
 import { getOpenCommitLatestVersion } from '../api';
 import currentPackage from '../../package.json' assert { type: 'json' };
 import chalk from 'chalk';
+import { outro } from '@clack/prompts';
 
 export const checkIsLatestVersion = async () => {
   const latestVersion = await getOpenCommitLatestVersion();
@@ -9,7 +10,7 @@ export const checkIsLatestVersion = async () => {
     const currentVersion = currentPackage.version;
 
     if (currentVersion !== latestVersion) {
-      console.warn(
+      outro(
         chalk.yellow(
           `
 You are not using the latest stable version of OpenCommit with new features and bug fixes.

tsconfig.json

@@ -5,8 +5,8 @@
 
     "module": "ESNext",
     // "rootDir": "./src",
-    "moduleResolution": "node",
     "resolveJsonModule": true,
+    "moduleResolution": "node",
 
     "allowJs": true,