git-coco 0.6.2 → 0.6.3

package/dist/index.d.ts

@@ -1,13 +1,16 @@
 /// <reference types="yargs" />
 import * as yargs from 'yargs';
 import { Argv } from 'yargs';
+import { TiktokenModel } from 'langchain/dist/types/openai-types';
 import { HuggingFaceInference } from 'langchain/llms/hf';
 import { BaseLLMParams } from 'langchain/llms/base';
 import { OpenAIInput, AzureOpenAIInput, OpenAI } from 'langchain/llms/openai';
 import { SimpleGit } from 'simple-git';
 import { Color } from 'chalk';
-import GPT3NodeTokenizer from 'gpt3-tokenizer';
 
+type ServiceProvider = "openai" | "huggingface";
+type ServiceModel = TiktokenModel;
+type Service = `${ServiceProvider}/${ServiceModel}`;
 interface Config$1 {
     /**
      * The LLM model to use for generating results.
@@ -18,7 +21,7 @@ interface Config$1 {
      * @example 'openai/gpt-3.5-turbo'
      * @example 'huggingface/bigscience/bloom'
      **/
-    model: string;
+    service: Service;
     /**
      * The OpenAI API key.
      */
@@ -99,10 +102,10 @@ interface BaseArgvOptions {
 }
 interface BaseCommandOptions extends BaseArgvOptions {
     [x: string]: unknown;
-    model: string;
-    openAIApiKey: string;
-    huggingFaceHubApiKey: string;
-    tokenLimit: number;
+    service: Config$1['service'];
+    openAIApiKey: Config$1['openAIApiKey'];
+    huggingFaceHubApiKey: Config$1['huggingFaceHubApiKey'];
+    tokenLimit: Config$1['tokenLimit'];
 }
 
 interface CommitOptions$1 extends BaseCommandOptions {
@@ -169,7 +172,7 @@ declare const _default: {
  * @param configuration
  * @returns LLM Model
  */
-declare function getModel(name: string, key: string, fields?: (Partial<OpenAIInput> & Partial<AzureOpenAIInput> & BaseLLMParams) | undefined): OpenAI | HuggingFaceInference;
+declare function getLlm(service: Config$1['service'], key: string, fields?: (Partial<OpenAIInput> & Partial<AzureOpenAIInput> & BaseLLMParams) | undefined): OpenAI | HuggingFaceInference;
 
 interface LoggerOptions {
     color?: typeof Color;
@@ -194,14 +197,8 @@ declare class Logger {
     stopSpinner(message?: string | undefined, options?: SpinnerOptions): Logger;
 }
 
-/**
- * Wrapper around GPT3NodeTokenizer to handle default export.
- *
- * @see https://github.com/botisan-ai/gpt3-tokenizer/issues/18
- *
- * @returns {GPT3NodeTokenizer} The GPT3NodeTokenizer instance.
- */
-declare const getTokenizer: () => GPT3NodeTokenizer;
+type TokenCounter = Awaited<ReturnType<typeof getTokenCounter>>;
+declare const getTokenCounter: (modelName: ServiceModel) => Promise<(text: string) => number>;
 
 type FileChangeStatus = 'modified' | 'renamed' | 'added' | 'deleted' | 'untracked' | 'unknown';
 interface FileChange {
@@ -228,8 +225,8 @@ interface DirectoryDiff {
     tokenCount: number;
 }
 interface BaseParserOptions {
-    tokenizer: ReturnType<typeof getTokenizer>;
-    model: ReturnType<typeof getModel>;
+    tokenizer: TokenCounter;
+    llm: ReturnType<typeof getLlm>;
     git: SimpleGit;
     logger: Logger;
 }

package/dist/index.esm.mjs

@@ -8,7 +8,6 @@ import { loadSummarizationChain, LLMChain } from 'langchain/chains';
 import { OpenAI } from 'langchain/llms/openai';
 import { RecursiveCharacterTextSplitter } from 'langchain/text_splitter';
 import { createTwoFilesPatch } from 'diff';
-import GPT3NodeTokenizer from 'gpt3-tokenizer';
 import chalk from 'chalk';
 import ora from 'ora';
 import now from 'performance-now';
@@ -23,6 +22,7 @@ import * as os from 'os';
 import os__default from 'os';
 import * as ini from 'ini';
 import { simpleGit } from 'simple-git';
+import { encoding_for_model } from 'tiktoken';
 
 /**
  * Extract the path from a file path string.
@@ -84,7 +84,7 @@ async function summarizeDirectoryDiff(directory, { chain, textSplitter, tokenize
                 returnIntermediateSteps: true,
             },
         });
-        const newTokenTotal = tokenizer.encode(directorySummary).text.length;
+        const newTokenTotal = tokenizer(directorySummary);
         return {
             diffs: directory.diffs,
             path: directory.path,
@@ -215,9 +215,7 @@ async function collectDiffs(node, getFileDiff, tokenizer, logger) {
     // Collect diffs for the files of the current node
     const diffPromises = node.files.map(async (nodeFile) => {
         const diff = await getFileDiff(nodeFile);
-        // TODO: Swap out the GPT3Tokenizer for LangChain tokenizer
-        const tokenizedDiff = tokenizer.encode(diff).text;
-        const tokenCount = tokenizedDiff.length;
+        const tokenCount = tokenizer(diff);
         logger.verbose(`Collected diff for ${nodeFile.filePath} (${tokenCount} tokens)`, {
             color: 'magenta',
         });
@@ -241,18 +239,29 @@ async function collectDiffs(node, getFileDiff, tokenizer, logger) {
     };
 }
 
+function getModelAndProviderFromService(service) {
+    const [provider, model] = service.split(/\/(.*)/s);
+    if (!model || !provider) {
+        throw new Error(`Invalid service: ${service}`);
+    }
+    return { provider, model };
+}
+function getModelFromService(service) {
+    const { model } = getModelAndProviderFromService(service);
+    return model;
+}
 /**
  * Get LLM Model Based on Configuration
  * @param fields
  * @param configuration
  * @returns LLM Model
  */
-function getModel(name, key, fields) {
-    const [llm, model] = name.split(/\/(.*)/s);
+function getLlm(service, key, fields) {
+    const { provider, model } = getModelAndProviderFromService(service);
     if (!model) {
-        throw new Error(`Invalid model: ${name}`);
+        throw new Error(`Invalid LLM Service: ${service}`);
     }
-    switch (llm) {
+    switch (provider) {
         case 'huggingface':
             return new HuggingFaceInference({
                 model: model,
@@ -271,16 +280,13 @@ function getModel(name, key, fields) {
 }
 /**
  * Retrieve appropriate API key based on selected model
- * @param name
+ * @param service
  * @param options
  * @returns
  */
-function getApiKeyForModel(name, options) {
-    const [llm, model] = name.split(/\/(.*)/s);
-    if (!model) {
-        throw new Error(`Invalid model: ${name}`);
-    }
-    switch (llm) {
+function getApiKeyForModel(service, options) {
+    const { provider } = getModelAndProviderFromService(service);
+    switch (provider) {
         case 'huggingface':
             return options.huggingFaceHubApiKey;
         case 'openai':
@@ -302,7 +308,7 @@ function getTextSplitter(options = {}) {
  * @param options
  * @returns
  */
-function getChain(model, options = { type: 'map_reduce' }) {
+function getSummarizationChain(model, options = { type: 'map_reduce' }) {
     return loadSummarizationChain(model, options);
 }
 function getPrompt({ template, variables, fallback }) {
@@ -402,9 +408,9 @@ async function getDiff(nodeFile, commit, { git, logger, }) {
 }
 
 const MAX_TOKENS_PER_SUMMARY = 2048;
-async function fileChangeParser({ changes, commit, options: { tokenizer, git, model, logger }, }) {
+async function fileChangeParser({ changes, commit, options: { tokenizer, git, llm: model, logger }, }) {
     const textSplitter = getTextSplitter({ chunkSize: 2000, chunkOverlap: 125 });
-    const summarizationChain = getChain(model, {
+    const summarizationChain = getSummarizationChain(model, {
         type: 'map_reduce',
         combineMapPrompt: SUMMARIZE_PROMPT,
         combinePrompt: SUMMARIZE_PROMPT,
@@ -429,28 +435,6 @@ async function fileChangeParser({ changes, commit, options: { tokenizer, git, mo
     return summary;
 }
 
-/**
- * Wrapper around GPT3NodeTokenizer to handle default export.
- *
- * @see https://github.com/botisan-ai/gpt3-tokenizer/issues/18
- *
- * @returns {GPT3NodeTokenizer} The GPT3NodeTokenizer instance.
- */
-const getTokenizer = () => {
-    let tokenizer;
-    // eslint-disable-next-line
-    // @ts-ignore
-    if (GPT3NodeTokenizer.default) {
-        // eslint-disable-next-line
-        // @ts-ignore
-        tokenizer = new GPT3NodeTokenizer.default({ type: 'gpt3' });
-    }
-    else {
-        tokenizer = new GPT3NodeTokenizer({ type: 'gpt3' });
-    }
-    return tokenizer;
-};
-
 class Logger {
     constructor(config) {
         this.config = config;
@@ -591,7 +575,7 @@ function removeUndefined(obj) {
  * @type {Config}
  */
 const DEFAULT_CONFIG = {
-    model: 'openai/gpt-4',
+    service: 'openai/gpt-4',
     verbose: false,
     tokenLimit: 1024,
     summarizePrompt: SUMMARIZE_PROMPT.template,
@@ -602,7 +586,9 @@ const DEFAULT_CONFIG = {
     defaultBranch: 'main',
 };
 /**
- * Config keys
+ * Create a named export of all config keys for use in other modules.
+ *
+ * @see Currently used in `src/lib/config/services/env.ts` to validate all env vars.
  *
  * @type {string[]}
  */
@@ -741,7 +727,7 @@ function loadGitConfig(config) {
         const gitConfigParsed = ini.parse(gitConfigRaw);
         config = {
             ...config,
-            model: gitConfigParsed.coco?.model || config.model,
+            service: gitConfigParsed.coco?.model || config.service,
             openAIApiKey: gitConfigParsed.coco?.openAIApiKey || config.openAIApiKey,
             huggingFaceHubApiKey: gitConfigParsed.coco?.huggingFaceHubApiKey || config.huggingFaceHubApiKey,
             tokenLimit: parseInt(gitConfigParsed.coco?.tokenLimit) || config.tokenLimit,
@@ -995,41 +981,51 @@ async function editResult(result, options) {
     return result;
 }
 
-async function getUserReviewDecision() {
-    return await select({
-        message: 'Would you like to make any changes to the commit message?',
-        choices: [
-            {
-                name: '✨ Looks good!',
-                value: 'approve',
-                description: 'Commit staged changes with generated commit message',
-            },
-            {
-                name: '📝 Edit',
-                value: 'edit',
-                description: 'Edit the commit message before proceeding',
-            },
-            {
-                name: '🪶  Modify Prompt',
-                value: 'modifyPrompt',
-                description: 'Modify the prompt template and regenerate the commit message',
-            },
-            {
-                name: '🔄 Retry - Message Only',
-                value: 'retryMessageOnly',
-                description: 'Restart the function execution from generating the commit message',
-            },
-            {
-                name: '🔄 Retry - Full',
-                value: 'retryFull',
-                description: 'Restart the function execution from the beginning, regenerating both the diff summary and commit message',
-            },
-            {
-                name: '💣 Cancel',
-                value: 'cancel',
-            },
-        ],
+async function getUserReviewDecision({ label, descriptions, enableRetry = true, enableFullRetry = true, enableModifyPrompt = true, }) {
+    const choices = [
+        {
+            name: '✨ Looks good!',
+            value: 'approve',
+            description: descriptions?.approve || `Continue with the generated ${label}`,
+        },
+        {
+            name: '📝 Edit',
+            value: 'edit',
+            description: descriptions?.edit || `Edit the generated ${label} before proceeding`,
+        },
+    ];
+    if (enableModifyPrompt) {
+        choices.push({
+            name: '🪶  Modify Prompt',
+            value: 'modifyPrompt',
+            description: descriptions?.modifyPrompt || `Modify the prompt template and regenerate the ${label}`,
+        });
+    }
+    if (enableRetry) {
+        choices.push({
+            name: '🔄 Retry',
+            value: 'retryMessageOnly',
+            description: descriptions?.retryMessageOnly ||
+                `Restart the function execution from generating the ${label}`,
+        });
+    }
+    if (enableFullRetry) {
+        choices.push({
+            name: '🔄 Retry Full',
+            value: 'retryFull',
+            description: descriptions?.retryFull ||
+                `Restart the function execution from the beginning, regenerating both the summary and ${label}`,
+        });
+    }
+    choices.push({
+        name: '💣 Cancel',
+        value: 'cancel',
+        description: descriptions?.cancel || `Cancel the ${label}`,
     });
+    return (await select({
+        message: `Would you like to make any changes to the ${label}?`,
+        choices,
+    }));
 }
 
 async function editPrompt(options) {
@@ -1082,7 +1078,10 @@ async function generateAndReviewLoop({ label, factory, parser, noResult, agent,
             .stopTimer();
         if (options?.interactive) {
             logResult(label, result);
-            const reviewAnswer = await getUserReviewDecision();
+            const reviewAnswer = await getUserReviewDecision({
+                label,
+                ...options?.review || {},
+            });
             if (reviewAnswer === 'cancel') {
                 process.exit(0);
             }
@@ -1136,20 +1135,20 @@ const executeChain = async ({ llm, prompt, variables }) => {
     return res.text.trim();
 };
 
-async function createCommit(commitMsg, git) {
-    return await git.commit(commitMsg);
-}
-
 const logSuccess = () => {
     console.log(chalk.green(chalk.bold('\nAll set! 🦾🤖')));
 };
 
-const handleResult = async (result, { mode, git }) => {
-    // Handle resulting commit message
+async function handleResult({ result, mode, interactiveHandler }) {
     switch (mode) {
         case 'interactive':
-            await createCommit(result, git);
-            logSuccess();
+            if (interactiveHandler) {
+                await interactiveHandler(result);
+            }
+            else {
+                console.error('No result handler provided for interactive mode');
+                logSuccess();
+            }
             break;
         case 'stdout':
         default:
@@ -1157,7 +1156,7 @@ const handleResult = async (result, { mode, git }) => {
             break;
     }
     process.exit(0);
-};
+}
 
 const getRepo = () => {
     let git;
@@ -1171,17 +1170,32 @@ const getRepo = () => {
     return git;
 };
 
+const getTikToken = async (modelName) => {
+    return await encoding_for_model(modelName);
+};
+const getTokenCounter = async (modelName) => getTikToken(modelName).then((tokenizer) => (text) => {
+    // console.log('Running GetTokenCount', { tokenizer, length: text.length })
+    const tokens = tokenizer.encode(text);
+    // console.log('Tokens', { tokenCount: tokens.length })
+    return tokens.length;
+});
+
+async function createCommit(commitMsg, git) {
+    return await git.commit(commitMsg);
+}
+
 async function handler$2(argv) {
-    const tokenizer = getTokenizer();
     const git = getRepo();
     const options = loadConfig(argv);
+    const { service } = options;
     const logger = new Logger(options);
-    const key = getApiKeyForModel(options.model, options);
+    const key = getApiKeyForModel(service, options);
+    const tokenizer = await getTokenCounter(getModelFromService(service));
     if (!key) {
         logger.log(`No API Key found. 🗝️🚪`, { color: 'red' });
         process.exit(1);
     }
-    const model = getModel(options.model, key, {
+    const llm = getLlm(service, key, {
         temperature: 0.4,
         maxConcurrency: 10,
     });
@@ -1194,16 +1208,16 @@ async function handler$2(argv) {
         return await fileChangeParser({
             changes,
             commit: '--staged',
-            options: { tokenizer, git, model, logger },
+            options: { tokenizer, git, llm, logger },
         });
     }
     const commitMsg = await generateAndReviewLoop({
-        label: 'Commit Message',
+        label: 'commit message',
         factory,
         parser,
         agent: async (context, options) => {
             return await executeChain({
-                llm: model,
+                llm,
                 prompt: getPrompt({
                     template: options.prompt,
                     variables: COMMIT_PROMPT.inputVariables,
@@ -1221,12 +1235,25 @@ async function handler$2(argv) {
             prompt: options.prompt || COMMIT_PROMPT.template,
             logger,
             interactive: INTERACTIVE,
+            review: {
+                descriptions: {
+                    approve: `Commit staged changes with generated commit message`,
+                    edit: 'Edit the commit message before proceeding',
+                    modifyPrompt: 'Modify the prompt template and regenerate the commit message',
+                    retryMessageOnly: 'Restart the function execution from generating the commit message',
+                    retryFull: 'Restart the function execution from the beginning, regenerating both the diff summary and commit message',
+                },
+            },
         },
     });
     const MODE = (INTERACTIVE && 'interactive') || (options.commit && 'interactive') || options?.mode || 'stdout';
-    handleResult(commitMsg, {
+    handleResult({
+        result: commitMsg,
+        interactiveHandler: async (result) => {
+            await createCommit(result, git);
+            logSuccess();
+        },
         mode: MODE,
-        git,
     });
 }
 
@@ -1368,12 +1395,12 @@ async function handler$1(argv) {
     const options = loadConfig(argv);
     const logger = new Logger(options);
     const git = getRepo();
-    const key = getApiKeyForModel(options.model, options);
+    const key = getApiKeyForModel(options.service, options);
     if (!key) {
         logger.log(`No API Key found. 🗝️🚪`, { color: 'red' });
         process.exit(1);
     }
-    const model = getModel(options.model, key, {
+    const model = getLlm(options.service, key, {
         temperature: 0.4,
         maxConcurrency: 10,
     });
@@ -1395,7 +1422,7 @@ async function handler$1(argv) {
         return result;
     }
     const changelogMsg = await generateAndReviewLoop({
-        label: 'Changelog',
+        label: 'changelog',
         factory,
         parser,
         agent: async (context, options) => {
@@ -1423,12 +1450,18 @@ async function handler$1(argv) {
             prompt: options.prompt || CHANGELOG_PROMPT.template,
             logger,
             interactive: INTERACTIVE,
+            review: {
+                enableFullRetry: false,
+            }
         },
     });
     const MODE = (INTERACTIVE && 'interactive') || (options.commit && 'interactive') || options?.mode || 'stdout';
-    handleResult(changelogMsg, {
+    handleResult({
+        result: changelogMsg,
+        interactiveHandler: async () => {
+            logSuccess();
+        },
         mode: MODE,
-        git,
     });
 }
 
@@ -1724,25 +1757,23 @@ var types = /*#__PURE__*/Object.freeze({
   __proto__: null
 });
 
-yargs
-    .scriptName('coco')
-    .usage('$0 <cmd> [args]')
-    .command([commit.command, '$0'], commit.desc, 
+const y = yargs();
+y.scriptName('coco').usage('$0 <cmd> [args]');
+y.command([commit.command, '$0'], commit.desc, 
 // TODO: fix type on builder
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
-commit.builder, commit.handler)
-    .command(changelog.command, changelog.desc, 
+commit.builder, commit.handler);
+y.command(changelog.command, changelog.desc, 
 // TODO: fix type on builder
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
-changelog.builder, changelog.handler)
-    .command(init.command, init.desc, 
+changelog.builder, changelog.handler);
+y.command(init.command, init.desc, 
 // TODO: fix type on builder
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
-init.builder, init.handler)
-    .demandCommand()
-    .help().argv;
+init.builder, init.handler);
+y.parse(process.argv.slice(2));
 
 export { changelog, commit, init, types };

package/dist/index.js

@@ -10,7 +10,6 @@ var chains = require('langchain/chains');
 var openai = require('langchain/llms/openai');
 var text_splitter = require('langchain/text_splitter');
 var diff = require('diff');
-var GPT3NodeTokenizer = require('gpt3-tokenizer');
 var chalk = require('chalk');
 var ora = require('ora');
 var now = require('performance-now');
@@ -22,6 +21,7 @@ var prompts$1 = require('@inquirer/prompts');
 var os = require('os');
 var ini = require('ini');
 var simpleGit = require('simple-git');
+var tiktoken = require('tiktoken');
 
 function _interopNamespaceDefault(e) {
   var n = Object.create(null);
@@ -105,7 +105,7 @@ async function summarizeDirectoryDiff(directory, { chain, textSplitter, tokenize
                 returnIntermediateSteps: true,
             },
         });
-        const newTokenTotal = tokenizer.encode(directorySummary).text.length;
+        const newTokenTotal = tokenizer(directorySummary);
         return {
             diffs: directory.diffs,
             path: directory.path,
@@ -236,9 +236,7 @@ async function collectDiffs(node, getFileDiff, tokenizer, logger) {
     // Collect diffs for the files of the current node
     const diffPromises = node.files.map(async (nodeFile) => {
         const diff = await getFileDiff(nodeFile);
-        // TODO: Swap out the GPT3Tokenizer for LangChain tokenizer
-        const tokenizedDiff = tokenizer.encode(diff).text;
-        const tokenCount = tokenizedDiff.length;
+        const tokenCount = tokenizer(diff);
         logger.verbose(`Collected diff for ${nodeFile.filePath} (${tokenCount} tokens)`, {
             color: 'magenta',
         });
@@ -262,18 +260,29 @@ async function collectDiffs(node, getFileDiff, tokenizer, logger) {
     };
 }
 
+function getModelAndProviderFromService(service) {
+    const [provider, model] = service.split(/\/(.*)/s);
+    if (!model || !provider) {
+        throw new Error(`Invalid service: ${service}`);
+    }
+    return { provider, model };
+}
+function getModelFromService(service) {
+    const { model } = getModelAndProviderFromService(service);
+    return model;
+}
 /**
  * Get LLM Model Based on Configuration
  * @param fields
  * @param configuration
  * @returns LLM Model
  */
-function getModel(name, key, fields) {
-    const [llm, model] = name.split(/\/(.*)/s);
+function getLlm(service, key, fields) {
+    const { provider, model } = getModelAndProviderFromService(service);
     if (!model) {
-        throw new Error(`Invalid model: ${name}`);
+        throw new Error(`Invalid LLM Service: ${service}`);
     }
-    switch (llm) {
+    switch (provider) {
         case 'huggingface':
             return new hf.HuggingFaceInference({
                 model: model,
@@ -292,16 +301,13 @@ function getModel(name, key, fields) {
 }
 /**
  * Retrieve appropriate API key based on selected model
- * @param name
+ * @param service
  * @param options
  * @returns
  */
-function getApiKeyForModel(name, options) {
-    const [llm, model] = name.split(/\/(.*)/s);
-    if (!model) {
-        throw new Error(`Invalid model: ${name}`);
-    }
-    switch (llm) {
+function getApiKeyForModel(service, options) {
+    const { provider } = getModelAndProviderFromService(service);
+    switch (provider) {
         case 'huggingface':
             return options.huggingFaceHubApiKey;
         case 'openai':
@@ -323,7 +329,7 @@ function getTextSplitter(options = {}) {
  * @param options
  * @returns
  */
-function getChain(model, options = { type: 'map_reduce' }) {
+function getSummarizationChain(model, options = { type: 'map_reduce' }) {
     return chains.loadSummarizationChain(model, options);
 }
 function getPrompt({ template, variables, fallback }) {
@@ -423,9 +429,9 @@ async function getDiff(nodeFile, commit, { git, logger, }) {
 }
 
 const MAX_TOKENS_PER_SUMMARY = 2048;
-async function fileChangeParser({ changes, commit, options: { tokenizer, git, model, logger }, }) {
+async function fileChangeParser({ changes, commit, options: { tokenizer, git, llm: model, logger }, }) {
     const textSplitter = getTextSplitter({ chunkSize: 2000, chunkOverlap: 125 });
-    const summarizationChain = getChain(model, {
+    const summarizationChain = getSummarizationChain(model, {
         type: 'map_reduce',
         combineMapPrompt: SUMMARIZE_PROMPT,
         combinePrompt: SUMMARIZE_PROMPT,
@@ -450,28 +456,6 @@ async function fileChangeParser({ changes, commit, options: { tokenizer, git, mo
     return summary;
 }
 
-/**
- * Wrapper around GPT3NodeTokenizer to handle default export.
- *
- * @see https://github.com/botisan-ai/gpt3-tokenizer/issues/18
- *
- * @returns {GPT3NodeTokenizer} The GPT3NodeTokenizer instance.
- */
-const getTokenizer = () => {
-    let tokenizer;
-    // eslint-disable-next-line
-    // @ts-ignore
-    if (GPT3NodeTokenizer.default) {
-        // eslint-disable-next-line
-        // @ts-ignore
-        tokenizer = new GPT3NodeTokenizer.default({ type: 'gpt3' });
-    }
-    else {
-        tokenizer = new GPT3NodeTokenizer({ type: 'gpt3' });
-    }
-    return tokenizer;
-};
-
 class Logger {
     constructor(config) {
         this.config = config;
@@ -612,7 +596,7 @@ function removeUndefined(obj) {
  * @type {Config}
  */
 const DEFAULT_CONFIG = {
-    model: 'openai/gpt-4',
+    service: 'openai/gpt-4',
     verbose: false,
     tokenLimit: 1024,
     summarizePrompt: SUMMARIZE_PROMPT.template,
@@ -623,7 +607,9 @@ const DEFAULT_CONFIG = {
     defaultBranch: 'main',
 };
 /**
- * Config keys
+ * Create a named export of all config keys for use in other modules.
+ *
+ * @see Currently used in `src/lib/config/services/env.ts` to validate all env vars.
  *
  * @type {string[]}
  */
@@ -762,7 +748,7 @@ function loadGitConfig(config) {
         const gitConfigParsed = ini__namespace.parse(gitConfigRaw);
         config = {
             ...config,
-            model: gitConfigParsed.coco?.model || config.model,
+            service: gitConfigParsed.coco?.model || config.service,
             openAIApiKey: gitConfigParsed.coco?.openAIApiKey || config.openAIApiKey,
             huggingFaceHubApiKey: gitConfigParsed.coco?.huggingFaceHubApiKey || config.huggingFaceHubApiKey,
             tokenLimit: parseInt(gitConfigParsed.coco?.tokenLimit) || config.tokenLimit,
@@ -1016,41 +1002,51 @@ async function editResult(result, options) {
     return result;
 }
 
-async function getUserReviewDecision() {
-    return await prompts$1.select({
-        message: 'Would you like to make any changes to the commit message?',
-        choices: [
-            {
-                name: '✨ Looks good!',
-                value: 'approve',
-                description: 'Commit staged changes with generated commit message',
-            },
-            {
-                name: '📝 Edit',
-                value: 'edit',
-                description: 'Edit the commit message before proceeding',
-            },
-            {
-                name: '🪶  Modify Prompt',
-                value: 'modifyPrompt',
-                description: 'Modify the prompt template and regenerate the commit message',
-            },
-            {
-                name: '🔄 Retry - Message Only',
-                value: 'retryMessageOnly',
-                description: 'Restart the function execution from generating the commit message',
-            },
-            {
-                name: '🔄 Retry - Full',
-                value: 'retryFull',
-                description: 'Restart the function execution from the beginning, regenerating both the diff summary and commit message',
-            },
-            {
-                name: '💣 Cancel',
-                value: 'cancel',
-            },
-        ],
+async function getUserReviewDecision({ label, descriptions, enableRetry = true, enableFullRetry = true, enableModifyPrompt = true, }) {
+    const choices = [
+        {
+            name: '✨ Looks good!',
+            value: 'approve',
+            description: descriptions?.approve || `Continue with the generated ${label}`,
+        },
+        {
+            name: '📝 Edit',
+            value: 'edit',
+            description: descriptions?.edit || `Edit the generated ${label} before proceeding`,
+        },
+    ];
+    if (enableModifyPrompt) {
+        choices.push({
+            name: '🪶  Modify Prompt',
+            value: 'modifyPrompt',
+            description: descriptions?.modifyPrompt || `Modify the prompt template and regenerate the ${label}`,
+        });
+    }
+    if (enableRetry) {
+        choices.push({
+            name: '🔄 Retry',
+            value: 'retryMessageOnly',
+            description: descriptions?.retryMessageOnly ||
+                `Restart the function execution from generating the ${label}`,
+        });
+    }
+    if (enableFullRetry) {
+        choices.push({
+            name: '🔄 Retry Full',
+            value: 'retryFull',
+            description: descriptions?.retryFull ||
+                `Restart the function execution from the beginning, regenerating both the summary and ${label}`,
+        });
+    }
+    choices.push({
+        name: '💣 Cancel',
+        value: 'cancel',
+        description: descriptions?.cancel || `Cancel the ${label}`,
     });
+    return (await prompts$1.select({
+        message: `Would you like to make any changes to the ${label}?`,
+        choices,
+    }));
 }
 
 async function editPrompt(options) {
@@ -1103,7 +1099,10 @@ async function generateAndReviewLoop({ label, factory, parser, noResult, agent,
             .stopTimer();
         if (options?.interactive) {
             logResult(label, result);
-            const reviewAnswer = await getUserReviewDecision();
+            const reviewAnswer = await getUserReviewDecision({
+                label,
+                ...options?.review || {},
+            });
             if (reviewAnswer === 'cancel') {
                 process.exit(0);
             }
@@ -1157,20 +1156,20 @@ const executeChain = async ({ llm, prompt, variables }) => {
     return res.text.trim();
 };
 
-async function createCommit(commitMsg, git) {
-    return await git.commit(commitMsg);
-}
-
 const logSuccess = () => {
     console.log(chalk.green(chalk.bold('\nAll set! 🦾🤖')));
 };
 
-const handleResult = async (result, { mode, git }) => {
-    // Handle resulting commit message
+async function handleResult({ result, mode, interactiveHandler }) {
     switch (mode) {
         case 'interactive':
-            await createCommit(result, git);
-            logSuccess();
+            if (interactiveHandler) {
+                await interactiveHandler(result);
+            }
+            else {
+                console.error('No result handler provided for interactive mode');
+                logSuccess();
+            }
             break;
         case 'stdout':
         default:
@@ -1178,7 +1177,7 @@ const handleResult = async (result, { mode, git }) => {
             break;
     }
     process.exit(0);
-};
+}
 
 const getRepo = () => {
     let git;
@@ -1192,17 +1191,32 @@ const getRepo = () => {
     return git;
 };
 
+const getTikToken = async (modelName) => {
+    return await tiktoken.encoding_for_model(modelName);
+};
+const getTokenCounter = async (modelName) => getTikToken(modelName).then((tokenizer) => (text) => {
+    // console.log('Running GetTokenCount', { tokenizer, length: text.length })
+    const tokens = tokenizer.encode(text);
+    // console.log('Tokens', { tokenCount: tokens.length })
+    return tokens.length;
+});
+
+async function createCommit(commitMsg, git) {
+    return await git.commit(commitMsg);
+}
+
 async function handler$2(argv) {
-    const tokenizer = getTokenizer();
     const git = getRepo();
     const options = loadConfig(argv);
+    const { service } = options;
     const logger = new Logger(options);
-    const key = getApiKeyForModel(options.model, options);
+    const key = getApiKeyForModel(service, options);
+    const tokenizer = await getTokenCounter(getModelFromService(service));
     if (!key) {
         logger.log(`No API Key found. 🗝️🚪`, { color: 'red' });
         process.exit(1);
     }
-    const model = getModel(options.model, key, {
+    const llm = getLlm(service, key, {
         temperature: 0.4,
         maxConcurrency: 10,
     });
@@ -1215,16 +1229,16 @@ async function handler$2(argv) {
         return await fileChangeParser({
             changes,
             commit: '--staged',
-            options: { tokenizer, git, model, logger },
+            options: { tokenizer, git, llm, logger },
         });
     }
     const commitMsg = await generateAndReviewLoop({
-        label: 'Commit Message',
+        label: 'commit message',
         factory,
         parser,
         agent: async (context, options) => {
             return await executeChain({
-                llm: model,
+                llm,
                 prompt: getPrompt({
                     template: options.prompt,
                     variables: COMMIT_PROMPT.inputVariables,
@@ -1242,12 +1256,25 @@ async function handler$2(argv) {
             prompt: options.prompt || COMMIT_PROMPT.template,
             logger,
             interactive: INTERACTIVE,
+            review: {
+                descriptions: {
+                    approve: `Commit staged changes with generated commit message`,
+                    edit: 'Edit the commit message before proceeding',
+                    modifyPrompt: 'Modify the prompt template and regenerate the commit message',
+                    retryMessageOnly: 'Restart the function execution from generating the commit message',
+                    retryFull: 'Restart the function execution from the beginning, regenerating both the diff summary and commit message',
+                },
+            },
         },
     });
     const MODE = (INTERACTIVE && 'interactive') || (options.commit && 'interactive') || options?.mode || 'stdout';
-    handleResult(commitMsg, {
+    handleResult({
+        result: commitMsg,
+        interactiveHandler: async (result) => {
+            await createCommit(result, git);
+            logSuccess();
+        },
         mode: MODE,
-        git,
     });
 }
 
@@ -1389,12 +1416,12 @@ async function handler$1(argv) {
     const options = loadConfig(argv);
     const logger = new Logger(options);
     const git = getRepo();
-    const key = getApiKeyForModel(options.model, options);
+    const key = getApiKeyForModel(options.service, options);
     if (!key) {
         logger.log(`No API Key found. 🗝️🚪`, { color: 'red' });
         process.exit(1);
     }
-    const model = getModel(options.model, key, {
+    const model = getLlm(options.service, key, {
         temperature: 0.4,
         maxConcurrency: 10,
     });
@@ -1416,7 +1443,7 @@ async function handler$1(argv) {
         return result;
     }
     const changelogMsg = await generateAndReviewLoop({
-        label: 'Changelog',
+        label: 'changelog',
         factory,
         parser,
         agent: async (context, options) => {
@@ -1444,12 +1471,18 @@ async function handler$1(argv) {
             prompt: options.prompt || CHANGELOG_PROMPT.template,
             logger,
             interactive: INTERACTIVE,
+            review: {
+                enableFullRetry: false,
+            }
         },
     });
     const MODE = (INTERACTIVE && 'interactive') || (options.commit && 'interactive') || options?.mode || 'stdout';
-    handleResult(changelogMsg, {
+    handleResult({
+        result: changelogMsg,
+        interactiveHandler: async () => {
+            logSuccess();
+        },
         mode: MODE,
-        git,
     });
 }
 
@@ -1745,26 +1778,24 @@ var types = /*#__PURE__*/Object.freeze({
   __proto__: null
 });
 
-yargs
-    .scriptName('coco')
-    .usage('$0 <cmd> [args]')
-    .command([commit.command, '$0'], commit.desc, 
+const y = yargs();
+y.scriptName('coco').usage('$0 <cmd> [args]');
+y.command([commit.command, '$0'], commit.desc, 
 // TODO: fix type on builder
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
-commit.builder, commit.handler)
-    .command(changelog.command, changelog.desc, 
+commit.builder, commit.handler);
+y.command(changelog.command, changelog.desc, 
 // TODO: fix type on builder
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
-changelog.builder, changelog.handler)
-    .command(init.command, init.desc, 
+changelog.builder, changelog.handler);
+y.command(init.command, init.desc, 
 // TODO: fix type on builder
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
-init.builder, init.handler)
-    .demandCommand()
-    .help().argv;
+init.builder, init.handler);
+y.parse(process.argv.slice(2));
 
 exports.changelog = changelog;
 exports.commit = commit;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "git-coco",
-  "version": "0.6.2",
+  "version": "0.6.3",
   "description": "zero-effort git commits with coco.",
   "author": "gfargo <ghfargo@gmail.com>",
   "license": "MIT",
@@ -82,7 +82,6 @@
     "@inquirer/prompts": "3.3.0",
     "chalk": "4.1.2",
     "diff": "5.1.0",
-    "gpt3-tokenizer": "1.1.5",
     "ini": "4.1.1",
     "langchain": "0.0.196",
     "minimatch": "9.0.3",
@@ -91,6 +90,7 @@
     "performance-now": "2.1.0",
     "pretty-ms": "7.0.1",
     "simple-git": "3.21.0",
+    "tiktoken": "1.0.11",
     "yargs": "17.7.2"
   }
 }