git-coco 0.21.4 → 0.22.1

package/dist/index.d.ts

@@ -173,6 +173,10 @@ interface ChangelogOptions extends BaseCommandOptions {
     range: string;
     branch: string;
     sinceLastTag: boolean;
+    withDiff?: boolean;
+    onlyDiff?: boolean;
+    additional?: string;
+    author?: boolean;
 }
 type ChangelogArgv = Arguments<ChangelogOptions>;
 

package/dist/index.esm.mjs

@@ -48,7 +48,7 @@ import { pathToFileURL } from 'url';
 /**
  * Current build version from package.json
  */
-const BUILD_VERSION = "0.21.4";
+const BUILD_VERSION = "0.22.1";
 
 const isInteractive = (config) => {
     return config?.mode === 'interactive' || !!config?.interactive;
@@ -1018,6 +1018,10 @@ const schema$1 = {
                         "apiKey": {
                             "type": "string",
                             "description": "API key to use when making requests to OpenAI. Defaults to the value of `OPENAI_API_KEY` environment variable."
+                        },
+                        "verbosity": {
+                            "$ref": "#/definitions/OpenAIVerbosityParam",
+                            "description": "The verbosity of the model's response."
                         }
                     }
                 },
@@ -1590,6 +1594,18 @@ const schema$1 = {
                 "gpt-3.5-turbo-16k-0613"
             ]
         },
+        "OpenAIVerbosityParam": {
+            "type": [
+                "string",
+                "null"
+            ],
+            "enum": [
+                "low",
+                "medium",
+                "high",
+                null
+            ]
+        },
         "OllamaLLMService": {
             "type": "object",
             "additionalProperties": false,
@@ -6054,6 +6070,26 @@ const options$4 = {
         description: 'Generate changelog for all commits since the last tag',
         default: false,
     },
+    withDiff: {
+        type: 'boolean',
+        description: 'Include the diff for each commit in the prompt',
+        default: false,
+    },
+    onlyDiff: {
+        type: 'boolean',
+        description: 'Generate a changelog based only on the diff of the entire branch',
+        default: false,
+    },
+    additional: {
+        type: 'string',
+        alias: 'a',
+        description: 'Add extra contextual information to the prompt',
+    },
+    author: {
+        type: 'boolean',
+        description: 'Include author attribution in the changelog',
+        default: false,
+    },
     i: {
         type: 'boolean',
         alias: 'interactive',
@@ -6958,45 +6994,39 @@ const getChangesSinceLastTag = async ({ git }) => {
 };
 
 /**
- * Retrieves the commit log range between two specified commits (inclusive of both commits).
+ * Retrieves the detailed commit log range between two specified commits (inclusive of both commits).
  *
  * @param from - The starting commit (can be a commit hash, HEAD reference, or branch name). This commit will be included in the results.
  * @param to - The ending commit (can be a commit hash, HEAD reference, or branch name). This commit will be included in the results.
  * @param options - Additional options for retrieving the commit log range.
- * @returns A promise that resolves to an array of commit log messages, including both the 'from' and 'to' commits.
+ * @returns A promise that resolves to an array of commit details objects.
  * @throws If there is an error retrieving the commit log range.
  */
-async function getCommitLogRange(from, to, { noMerges, git }) {
+async function getCommitLogRangeDetails(from, to, { noMerges, git }) {
     try {
-        // Use from^..to to include the 'from' commit in the range
-        // This works because from^..to means "commits reachable from 'to' but not from the parent of 'from'"
         const logOptions = {
             from: `${from}^`,
             to,
             '--no-merges': noMerges
         };
         const commitLog = await git.log(logOptions);
-        return commitLog.all.map(({ message, date, body, author_name, hash, author_email }) => `[${date}] ${message}\n${body}\n(${hash}) - ${author_name}<${author_email}>`);
+        return [...commitLog.all];
     }
     catch (error) {
-        // If from^ fails (e.g., 'from' is the first commit), fall back to using from..to and manually adding the 'from' commit
         if (error instanceof Error && error.message.includes('unknown revision')) {
             try {
-                // Get the 'from' commit separately
                 const fromCommitLog = await git.log({ from: from, maxCount: 1 });
                 const fromCommit = fromCommitLog.latest;
-                // Get the range from..to (excluding 'from')
                 const rangeLogOptions = {
                     from,
                     to,
                     '--no-merges': noMerges
                 };
                 const rangeCommitLog = await git.log(rangeLogOptions);
-                // Combine the 'from' commit with the range commits
                 const allCommits = fromCommit
                     ? [fromCommit, ...rangeCommitLog.all]
-                    : rangeCommitLog.all;
-                return allCommits.map(({ message, date, body, author_name, hash, author_email }) => `[${date}] ${message}\n${body}\n(${hash}) - ${author_name}<${author_email}>`);
+                    : [...rangeCommitLog.all];
+                return allCommits;
             }
             catch (fallbackError) {
                 throw fallbackError;
@@ -7023,7 +7053,7 @@ async function getCurrentBranchName({ git }) {
  * @param {SimpleGit} options.git - The SimpleGit instance.
  * @param {Logger} options.logger - The logger for logging messages.
  * @param {string} options.targetBranch - The target branch to compare against.
- * @returns {Promise<string[]>} The array of commit messages in the commit log.
+ * @returns {Promise<CommitDetails[]>} The array of commit messages in the commit log.
  */
 async function getCommitLogAgainstBranch({ git, logger, targetBranch, }) {
     try {
@@ -7042,7 +7072,7 @@ async function getCommitLogAgainstBranch({ git, logger, targetBranch, }) {
             return [];
         }
         // Retrieve commit log with messages
-        return await getCommitLogRange(firstCommit, lastCommit, { git, noMerges: true });
+        return await getCommitLogRangeDetails(firstCommit, lastCommit, { git, noMerges: true });
     }
     catch (error) {
         logger?.log('Encountered an error getting commit log between branches', { color: 'red' });
@@ -7058,7 +7088,7 @@ async function getCommitLogAgainstBranch({ git, logger, targetBranch, }) {
  * @param {Logger} options.logger - The logger for logging messages.
  * @param {string} [options.comparisonBranch='main'] - The branch to compare against.
  * @param {string} [options.comparisonRemote='origin'] - The remote to compare against.
- * @returns {Promise<string[]>} The array of commit messages in the commit log.
+ * @returns {Promise<CommitDetails[]>} The array of commit messages in the commit log.
  */
 async function getCommitLogCurrentBranch({ git, logger, comparisonBranch = 'main', comparisonRemote = 'origin', }) {
     try {
@@ -7094,7 +7124,7 @@ async function getCommitLogCurrentBranch({ git, logger, comparisonBranch = 'main
             });
             return [];
         }
-        return await getCommitLogRange(firstCommit, lastCommit, { git, noMerges: true });
+        return await getCommitLogRangeDetails(firstCommit, lastCommit, { git, noMerges: true });
     }
     catch (error) {
         logger?.log('Encountered an error getting commit log from current branch', { color: 'red' });
@@ -7460,18 +7490,202 @@ async function handleResult({ result, mode, interactiveModeCallback }) {
     }
 }
 
-const template$3 = `Write informative git changelog, in the imperative, based on a series of individual messages.
+/**
+ * Fetches the diff for the given commit ID.
+ *
+ * @param commitId The commit ID for which the diff is to be retrieved.
+ * @returns A promise that resolves to the diff of the commit.
+ */
+async function getDiffForCommit(commitId, { git, }) {
+    try {
+        return await git.diff(['-p', `${commitId}^..${commitId}`]);
+    }
+    catch (error) {
+        throw new Error(`Error fetching diff for commit ${commitId}: ${error.message}`);
+    }
+}
+
+/**
+ * Determines the status of a file based on its changes in the Git repository.
+ *
+ * @param file - The file to check the status of.
+ * @param location - The location to check the status in ('index' or 'working_dir'). Defaults to 'index'.
+ * @returns The status of the file ('added', 'deleted', 'modified', 'renamed', 'untracked', or 'unknown').
+ * @throws Error if the file type is invalid.
+ */
+function getStatus(file, location = 'index') {
+    if ('index' in file && 'working_dir' in file) {
+        const statusCode = file[location];
+        switch (statusCode) {
+            case 'A':
+                return 'added';
+            case 'D':
+                return 'deleted';
+            case 'M':
+                return 'modified';
+            case 'R':
+                return 'renamed';
+            case '?':
+                return 'untracked';
+            default:
+                return 'unknown';
+        }
+    }
+    else if ('changes' in file && 'binary' in file) {
+        if (file.changes === 0)
+            return 'untracked';
+        if (file.file.includes('=>'))
+            return 'renamed';
+        if (file.deletions === 0 && file.insertions > 0)
+            return 'added';
+        if (file.insertions === 0 && file.deletions > 0)
+            return 'deleted';
+        if ((file.insertions > 0 && file.deletions > 0) || file.changes > 0)
+            return 'modified';
+        return 'unknown';
+    }
+    else {
+        throw new Error('Invalid file type');
+    }
+}
+
+/**
+ * Returns the summary text for a file change.
+ *
+ * @param file - The file status or diff result.
+ * @param change - The partial file change object.
+ * @returns The summary text for the file change.
+ * @throws Error if the file type is invalid.
+ */
+function getSummaryText(file, change) {
+    const status = change.status || getStatus(file);
+    let filePath;
+    if ('path' in file) {
+        filePath = file.path;
+    }
+    else if ('file' in file) {
+        filePath = change?.filePath || file.file;
+    }
+    else {
+        throw new Error('Invalid file type');
+    }
+    if (change.oldFilePath) {
+        return `${status}: ${change.oldFilePath} -> ${filePath}`;
+    }
+    return `${status}: ${filePath}`;
+}
+
+/**
+ * Retrieves the diff between the current branch and a specified target branch.
+ *
+ * @param {Object} options - The options for retrieving the diff.
+ * @param {SimpleGit} options.git - The SimpleGit instance.
+ * @param {Logger} options.logger - The logger for logging messages.
+ * @param {string} options.baseBranch - The base branch to compare against.
+ * @param {string} options.headBranch - The head branch to compare.
+ * @param {string[]} options.ignoredFiles - Array of specific files to ignore.
+ * @param {string[]} options.ignoredExtensions - Array of file extensions to ignore.
+ * @returns {Promise<GetChangesResult>} The diff between the current branch and the target branch.
+ */
+async function getDiffForBranch({ git, logger, baseBranch, headBranch, options, }) {
+    try {
+        logger?.verbose(`Getting diff for branches: baseBranch="${baseBranch}", headBranch="${headBranch}"`, {
+            color: 'blue',
+        });
+        // Validate branch names
+        if (!baseBranch || !headBranch) {
+            throw new Error(`Invalid branch names: baseBranch="${baseBranch}", headBranch="${headBranch}"`);
+        }
+        const { ignoredFiles = [], ignoredExtensions = [] } = options || {};
+        // Prepare ignore patterns
+        const ignorePatterns = [
+            ...ignoredFiles.map((file) => `:!${file}`),
+            ...ignoredExtensions.map((ext) => `:!*${ext}`),
+        ];
+        // Construct the diff command
+        const diffArgs = [`${baseBranch}..${headBranch}`];
+        if (ignorePatterns.length > 0) {
+            diffArgs.push('--');
+            diffArgs.push(...ignorePatterns);
+        }
+        logger?.verbose(`Running git diff with args: ${diffArgs.join(' ')}`, {
+            color: 'blue',
+        });
+        // Get the diff
+        const diff = await git.diff(diffArgs);
+        logger?.verbose(`Generated diff between "${headBranch}" and "${baseBranch}"`, {
+            color: 'blue',
+        });
+        const changes = diff.split('diff --git').slice(1).map((fileDiff) => {
+            const lines = fileDiff.split('\n');
+            const filePathLine = lines[0];
+            const filePath = filePathLine.split('b/')[1]?.split(' ')[0];
+            const oldFilePath = filePathLine.split('a/')[1]?.split(' ')[0];
+            // Determine status based on diff headers
+            let status = 'modified';
+            if (fileDiff.includes('new file mode')) {
+                status = 'added';
+            }
+            else if (fileDiff.includes('deleted file mode')) {
+                status = 'deleted';
+            }
+            else if (fileDiff.includes('rename from')) {
+                status = 'renamed';
+            }
+            return {
+                filePath: filePath || '',
+                oldFilePath: oldFilePath || '',
+                status,
+                summary: getSummaryText({ path: filePath || '', index: '', working_dir: '' }, { filePath: filePath || '', status }),
+            };
+        });
+        return {
+            staged: changes,
+            unstaged: [],
+            untracked: [],
+        };
+    }
+    catch (error) {
+        const errorMessage = error instanceof Error ? error.message : String(error);
+        console.error('Error in getDiffForBranch:', error);
+        logger?.log(`Encountered an error getting diff between branches: ${errorMessage}`, { color: 'red' });
+        logger?.log(`Branch details: baseBranch="${baseBranch}", headBranch="${headBranch}"`, { color: 'red' });
+        // Re-throw the error so the caller can handle it appropriately
+        throw error;
+    }
+}
+
+const template$3 = `You are a highly skilled software engineer tasked with writing a git changelog. Your response should be informative, well-structured, and in the imperative.
 
-- Annotate  each change with the git commit hash as reference, including just the first 7 characters
-- Logically group changes, and if necessary, summarize dependency updates
-- Include a descriptive title for the changelog, to give a high-level overview of the changes
-- Depending on the size of the changes, consider breaking the changelog into sections
-- Avoid generlizations like "various bug fixes" or "improvements" or "enhancements"
+## Input
+You will be provided with a summary of changes. This summary can be one of the following:
+1. A list of commits, each with its author, hash, message, and body.
+2. A list of commits, each with its details AND the full diff of the changes.
+3. A single, comprehensive diff for an entire branch.
 
+## Rules
+- Create a descriptive title for the changelog that gives a high-level overview of the changes.
+- **BREAKING CHANGES**: Identify any commits that introduce breaking changes. These must be listed first under a "### 💥 BREAKING CHANGES" heading.
+- **Grouping**: Logically group related changes under descriptive headings (e.g., ### Features, ### Fixes, ### Refactors).
+- **Dependencies**: Group all dependency updates (e.g., changes to package.json, go.mod) under a "### Dependencies" section.
+- **Summaries**: For each change, provide a concise summary.
+- **Attribution**: {{author_instructions}}
+- **Technical Details**: If provided with diffs, use them to understand the technical details and provide a more accurate and detailed description of the changes.
+- **Clarity**: Avoid generalizations like "various bug fixes," "improvements," or "enhancements." Be specific.
+- **Formatting**: Your entire response must be valid Markdown.
+
+## Formatting Instructions
 {{format_instructions}}
 
+{{additional_context}}
+
 """{{summary}}"""`;
-const inputVariables$2 = ['format_instructions', 'summary'];
+const inputVariables$2 = [
+    'format_instructions',
+    'summary',
+    'additional_context',
+    'author_instructions',
+];
 const CHANGELOG_PROMPT = new PromptTemplate({
     template: template$3,
     inputVariables: inputVariables$2,
@@ -7495,48 +7709,68 @@ const handler$4 = async (argv, logger) => {
     }
     async function factory() {
         const branchName = await getCurrentBranchName({ git });
-        if (config.sinceLastTag) {
-            logger.verbose(`Generating commit log since the last tag`, { color: 'yellow' });
+        if (argv.onlyDiff) {
+            logger.verbose(`Generating changelog based on branch diff`, { color: 'yellow' });
+            const diff = await getDiffForBranch({ git, logger, baseBranch: argv.branch || 'main', headBranch: branchName });
             return {
                 branch: branchName,
-                commits: await getChangesSinceLastTag({ git, logger }),
+                diff: JSON.stringify(diff.staged, null, 2),
             };
         }
-        if (config.range && config.range.includes(':')) {
+        let commits = [];
+        if (config.sinceLastTag) {
+            logger.verbose(`Generating commit log since the last tag`, { color: 'yellow' });
+            // This function returns string[], needs to be adapted or replaced
+            // For now, this path will have limited details.
+            const commitMessages = await getChangesSinceLastTag({ git, logger });
+            commits = commitMessages.map(msg => ({ message: msg }));
+        }
+        else if (config.range && config.range.includes(':')) {
             const [from, to] = config.range.split(':');
             if (!from || !to) {
                 logger.log(`Invalid range provided. Expected format is <from>:<to>`, { color: 'red' });
                 process.exit(1);
             }
-            return {
-                branch: branchName,
-                commits: await getCommitLogRange(from, to, { git, noMerges: true }),
-            };
+            commits = await getCommitLogRangeDetails(from, to, { git, noMerges: true });
         }
-        if (argv.branch) {
+        else if (argv.branch) {
             logger.verbose(`Generating commit log against branch: ${argv.branch}`, { color: 'yellow' });
-            return {
-                branch: branchName,
-                commits: await getCommitLogAgainstBranch({ git, logger, targetBranch: argv.branch }),
-            };
+            commits = await getCommitLogAgainstBranch({ git, logger, targetBranch: argv.branch });
+        }
+        else {
+            logger.verbose(`No range, branch, or tag option provided. Defaulting to current branch`, {
+                color: 'yellow',
+            });
+            commits = await getCommitLogCurrentBranch({ git, logger });
+        }
+        let commitsWithDiffText = commits;
+        if (argv.withDiff) {
+            commitsWithDiffText = await Promise.all(commits.map(async (commit) => ({
+                ...commit,
+                diffText: await getDiffForCommit(commit.hash, { git }),
+            })));
         }
-        logger.verbose(`No range, branch, or tag option provided. Defaulting to current branch`, {
-            color: 'yellow',
-        });
-        const commits = await getCommitLogCurrentBranch({ git, logger });
         return {
             branch: branchName,
-            commits,
+            commits: commitsWithDiffText,
+            withDiff: argv.withDiff,
         };
     }
-    async function parser({ branch, commits }) {
-        let result;
-        if (!commits || commits.length === 0) {
-            result = `## ${branch}\n\nNo commits found.`;
+    async function parser(data) {
+        if (data.diff) {
+            return `## Diff for ${data.branch}\n\n${data.diff}`;
         }
-        else {
-            result = `## ${branch}\n\n${commits.map((commit) => commit.trim()).join('\n\n')}`;
+        if (!data.commits || data.commits.length === 0) {
+            return `## ${data.branch}\n\nNo commits found.`;
         }
+        let result = `## ${data.branch}\n\n`;
+        result += data.commits.map(commit => {
+            let commitStr = `Author: ${commit.author_name}\nCommit: ${commit.hash}\nMessage: ${commit.message}\n${commit.body}`;
+            if (data.withDiff && commit.diffText) {
+                commitStr += `\nDiff:\n${commit.diffText}`;
+            }
+            return commitStr.trim();
+        }).join('\n\n---\n\n');
         return result;
     }
     const changelogMsg = await generateAndReviewLoop({
@@ -7560,12 +7794,21 @@ const handler$4 = async (argv, logger) => {
                 fallback: CHANGELOG_PROMPT,
             });
             const formatInstructions = "Only respond with a valid JSON object, containing two fields: 'title' an escaped string, no more than 65 characters, and 'content' also an escaped string.";
+            let additional_context = '';
+            if (argv.additional) {
+                additional_context = `## Additional Context\n${argv.additional}`;
+            }
+            const author_instructions = argv.author
+                ? 'At the end of each item, attribute the author and include a reference to the commit hash, like this: `by @author_name (f6dbe61)`. Use the first 7 characters of the hash.'
+                : 'At the end of each item, include a reference to the commit hash, like this: `(f6dbe61)`. Use the first 7 characters of the hash.';
             const changelog = await executeChain({
                 llm,
                 prompt,
                 variables: {
                     summary: context,
                     format_instructions: formatInstructions,
+                    additional_context: additional_context,
+                    author_instructions: author_instructions,
                 },
                 parser,
             });
@@ -10877,76 +11120,6 @@ async function createCommit(message, git) {
     return await git.commit(message);
 }
 
-/**
- * Determines the status of a file based on its changes in the Git repository.
- *
- * @param file - The file to check the status of.
- * @param location - The location to check the status in ('index' or 'working_dir'). Defaults to 'index'.
- * @returns The status of the file ('added', 'deleted', 'modified', 'renamed', 'untracked', or 'unknown').
- * @throws Error if the file type is invalid.
- */
-function getStatus(file, location = 'index') {
-    if ('index' in file && 'working_dir' in file) {
-        const statusCode = file[location];
-        switch (statusCode) {
-            case 'A':
-                return 'added';
-            case 'D':
-                return 'deleted';
-            case 'M':
-                return 'modified';
-            case 'R':
-                return 'renamed';
-            case '?':
-                return 'untracked';
-            default:
-                return 'unknown';
-        }
-    }
-    else if ('changes' in file && 'binary' in file) {
-        if (file.changes === 0)
-            return 'untracked';
-        if (file.file.includes('=>'))
-            return 'renamed';
-        if (file.deletions === 0 && file.insertions > 0)
-            return 'added';
-        if (file.insertions === 0 && file.deletions > 0)
-            return 'deleted';
-        if ((file.insertions > 0 && file.deletions > 0) || file.changes > 0)
-            return 'modified';
-        return 'unknown';
-    }
-    else {
-        throw new Error('Invalid file type');
-    }
-}
-
-/**
- * Returns the summary text for a file change.
- *
- * @param file - The file status or diff result.
- * @param change - The partial file change object.
- * @returns The summary text for the file change.
- * @throws Error if the file type is invalid.
- */
-function getSummaryText(file, change) {
-    const status = change.status || getStatus(file);
-    let filePath;
-    if ('path' in file) {
-        filePath = file.path;
-    }
-    else if ('file' in file) {
-        filePath = change?.filePath || file.file;
-    }
-    else {
-        throw new Error('Invalid file type');
-    }
-    if (change.oldFilePath) {
-        return `${status}: ${change.oldFilePath} -> ${filePath}`;
-    }
-    return `${status}: ${filePath}`;
-}
-
 /**
  * Retrieves the changes in the Git repository.
  *
@@ -11264,7 +11437,7 @@ const handler$3 = async (argv, logger) => {
             const schema = USE_CONVENTIONAL_COMMITS
                 ? ConventionalCommitMessageResponseSchema
                 : CommitMessageResponseSchema;
-            const formatInstructions = `You must always return valid JSON fenced by a markdown code block. Do not return any additional text. The JSON object you return should match the following schema:
+            const formatInstructions = `You must always return a valid JSON object. Do not return any additional text. The JSON object you return should match the following schema:
 ${schema.description}
 {
   "title": "The commit title",
@@ -11984,86 +12157,6 @@ const getChangesByTimestamp = async ({ since, git }) => {
     return formatCommitLog(commitLog);
 };
 
-/**
- * Retrieves the diff between the current branch and a specified target branch.
- *
- * @param {Object} options - The options for retrieving the diff.
- * @param {SimpleGit} options.git - The SimpleGit instance.
- * @param {Logger} options.logger - The logger for logging messages.
- * @param {string} options.baseBranch - The base branch to compare against.
- * @param {string} options.headBranch - The head branch to compare.
- * @param {string[]} options.ignoredFiles - Array of specific files to ignore.
- * @param {string[]} options.ignoredExtensions - Array of file extensions to ignore.
- * @returns {Promise<GetChangesResult>} The diff between the current branch and the target branch.
- */
-async function getDiffForBranch({ git, logger, baseBranch, headBranch, options, }) {
-    try {
-        logger?.verbose(`Getting diff for branches: baseBranch="${baseBranch}", headBranch="${headBranch}"`, {
-            color: 'blue',
-        });
-        // Validate branch names
-        if (!baseBranch || !headBranch) {
-            throw new Error(`Invalid branch names: baseBranch="${baseBranch}", headBranch="${headBranch}"`);
-        }
-        const { ignoredFiles = [], ignoredExtensions = [] } = options || {};
-        // Prepare ignore patterns
-        const ignorePatterns = [
-            ...ignoredFiles.map((file) => `:!${file}`),
-            ...ignoredExtensions.map((ext) => `:!*${ext}`),
-        ];
-        // Construct the diff command
-        const diffArgs = [`${baseBranch}..${headBranch}`];
-        if (ignorePatterns.length > 0) {
-            diffArgs.push('--');
-            diffArgs.push(...ignorePatterns);
-        }
-        logger?.verbose(`Running git diff with args: ${diffArgs.join(' ')}`, {
-            color: 'blue',
-        });
-        // Get the diff
-        const diff = await git.diff(diffArgs);
-        logger?.verbose(`Generated diff between "${headBranch}" and "${baseBranch}"`, {
-            color: 'blue',
-        });
-        const changes = diff.split('diff --git').slice(1).map((fileDiff) => {
-            const lines = fileDiff.split('\n');
-            const filePathLine = lines[0];
-            const filePath = filePathLine.split('b/')[1]?.split(' ')[0];
-            const oldFilePath = filePathLine.split('a/')[1]?.split(' ')[0];
-            // Determine status based on diff headers
-            let status = 'modified';
-            if (fileDiff.includes('new file mode')) {
-                status = 'added';
-            }
-            else if (fileDiff.includes('deleted file mode')) {
-                status = 'deleted';
-            }
-            else if (fileDiff.includes('rename from')) {
-                status = 'renamed';
-            }
-            return {
-                filePath: filePath || '',
-                oldFilePath: oldFilePath || '',
-                status,
-                summary: getSummaryText({ path: filePath || '', index: '', working_dir: '' }, { filePath: filePath || '', status }),
-            };
-        });
-        return {
-            staged: changes,
-            unstaged: [],
-            untracked: [],
-        };
-    }
-    catch (error) {
-        const errorMessage = error instanceof Error ? error.message : String(error);
-        console.error('Error in getDiffForBranch:', error);
-        logger?.log(`Encountered an error getting diff between branches: ${errorMessage}`, { color: 'red' });
-        logger?.log(`Branch details: baseBranch="${baseBranch}", headBranch="${headBranch}"`, { color: 'red' });
-        // Re-throw the error so the caller can handle it appropriately
-        throw error;
-    }
-}
-
 async function noResult$1({ logger }) {
     logger.log('No repo changes detected. 👀', { color: 'blue' });
     throw new Error('NO_CHANGES_DETECTED');

package/dist/index.js

@@ -70,7 +70,7 @@ var readline__namespace = /*#__PURE__*/_interopNamespaceDefault(readline);
 /**
  * Current build version from package.json
  */
-const BUILD_VERSION = "0.21.4";
+const BUILD_VERSION = "0.22.1";
 
 const isInteractive = (config) => {
     return config?.mode === 'interactive' || !!config?.interactive;
@@ -1040,6 +1040,10 @@ const schema$1 = {
                         "apiKey": {
                             "type": "string",
                             "description": "API key to use when making requests to OpenAI. Defaults to the value of `OPENAI_API_KEY` environment variable."
+                        },
+                        "verbosity": {
+                            "$ref": "#/definitions/OpenAIVerbosityParam",
+                            "description": "The verbosity of the model's response."
                         }
                     }
                 },
@@ -1612,6 +1616,18 @@ const schema$1 = {
                 "gpt-3.5-turbo-16k-0613"
             ]
         },
+        "OpenAIVerbosityParam": {
+            "type": [
+                "string",
+                "null"
+            ],
+            "enum": [
+                "low",
+                "medium",
+                "high",
+                null
+            ]
+        },
         "OllamaLLMService": {
             "type": "object",
             "additionalProperties": false,
@@ -6076,6 +6092,26 @@ const options$4 = {
         description: 'Generate changelog for all commits since the last tag',
         default: false,
     },
+    withDiff: {
+        type: 'boolean',
+        description: 'Include the diff for each commit in the prompt',
+        default: false,
+    },
+    onlyDiff: {
+        type: 'boolean',
+        description: 'Generate a changelog based only on the diff of the entire branch',
+        default: false,
+    },
+    additional: {
+        type: 'string',
+        alias: 'a',
+        description: 'Add extra contextual information to the prompt',
+    },
+    author: {
+        type: 'boolean',
+        description: 'Include author attribution in the changelog',
+        default: false,
+    },
     i: {
         type: 'boolean',
         alias: 'interactive',
@@ -6980,45 +7016,39 @@ const getChangesSinceLastTag = async ({ git }) => {
 };
 
 /**
- * Retrieves the commit log range between two specified commits (inclusive of both commits).
+ * Retrieves the detailed commit log range between two specified commits (inclusive of both commits).
  *
  * @param from - The starting commit (can be a commit hash, HEAD reference, or branch name). This commit will be included in the results.
  * @param to - The ending commit (can be a commit hash, HEAD reference, or branch name). This commit will be included in the results.
  * @param options - Additional options for retrieving the commit log range.
- * @returns A promise that resolves to an array of commit log messages, including both the 'from' and 'to' commits.
+ * @returns A promise that resolves to an array of commit details objects.
  * @throws If there is an error retrieving the commit log range.
  */
-async function getCommitLogRange(from, to, { noMerges, git }) {
+async function getCommitLogRangeDetails(from, to, { noMerges, git }) {
     try {
-        // Use from^..to to include the 'from' commit in the range
-        // This works because from^..to means "commits reachable from 'to' but not from the parent of 'from'"
         const logOptions = {
             from: `${from}^`,
             to,
             '--no-merges': noMerges
         };
         const commitLog = await git.log(logOptions);
-        return commitLog.all.map(({ message, date, body, author_name, hash, author_email }) => `[${date}] ${message}\n${body}\n(${hash}) - ${author_name}<${author_email}>`);
+        return [...commitLog.all];
     }
     catch (error) {
-        // If from^ fails (e.g., 'from' is the first commit), fall back to using from..to and manually adding the 'from' commit
         if (error instanceof Error && error.message.includes('unknown revision')) {
             try {
-                // Get the 'from' commit separately
                 const fromCommitLog = await git.log({ from: from, maxCount: 1 });
                 const fromCommit = fromCommitLog.latest;
-                // Get the range from..to (excluding 'from')
                 const rangeLogOptions = {
                     from,
                     to,
                     '--no-merges': noMerges
                 };
                 const rangeCommitLog = await git.log(rangeLogOptions);
-                // Combine the 'from' commit with the range commits
                 const allCommits = fromCommit
                     ? [fromCommit, ...rangeCommitLog.all]
-                    : rangeCommitLog.all;
-                return allCommits.map(({ message, date, body, author_name, hash, author_email }) => `[${date}] ${message}\n${body}\n(${hash}) - ${author_name}<${author_email}>`);
+                    : [...rangeCommitLog.all];
+                return allCommits;
             }
             catch (fallbackError) {
                 throw fallbackError;
@@ -7045,7 +7075,7 @@ async function getCurrentBranchName({ git }) {
  * @param {SimpleGit} options.git - The SimpleGit instance.
  * @param {Logger} options.logger - The logger for logging messages.
  * @param {string} options.targetBranch - The target branch to compare against.
- * @returns {Promise<string[]>} The array of commit messages in the commit log.
+ * @returns {Promise<CommitDetails[]>} The array of commit messages in the commit log.
  */
 async function getCommitLogAgainstBranch({ git, logger, targetBranch, }) {
     try {
@@ -7064,7 +7094,7 @@ async function getCommitLogAgainstBranch({ git, logger, targetBranch, }) {
             return [];
         }
         // Retrieve commit log with messages
-        return await getCommitLogRange(firstCommit, lastCommit, { git, noMerges: true });
+        return await getCommitLogRangeDetails(firstCommit, lastCommit, { git, noMerges: true });
     }
     catch (error) {
         logger?.log('Encountered an error getting commit log between branches', { color: 'red' });
@@ -7080,7 +7110,7 @@ async function getCommitLogAgainstBranch({ git, logger, targetBranch, }) {
  * @param {Logger} options.logger - The logger for logging messages.
  * @param {string} [options.comparisonBranch='main'] - The branch to compare against.
  * @param {string} [options.comparisonRemote='origin'] - The remote to compare against.
- * @returns {Promise<string[]>} The array of commit messages in the commit log.
+ * @returns {Promise<CommitDetails[]>} The array of commit messages in the commit log.
  */
 async function getCommitLogCurrentBranch({ git, logger, comparisonBranch = 'main', comparisonRemote = 'origin', }) {
     try {
@@ -7116,7 +7146,7 @@ async function getCommitLogCurrentBranch({ git, logger, comparisonBranch = 'main
             });
             return [];
         }
-        return await getCommitLogRange(firstCommit, lastCommit, { git, noMerges: true });
+        return await getCommitLogRangeDetails(firstCommit, lastCommit, { git, noMerges: true });
     }
     catch (error) {
         logger?.log('Encountered an error getting commit log from current branch', { color: 'red' });
@@ -7482,18 +7512,202 @@ async function handleResult({ result, mode, interactiveModeCallback }) {
     }
 }
 
-const template$3 = `Write informative git changelog, in the imperative, based on a series of individual messages.
+/**
+ * Fetches the diff for the given commit ID.
+ *
+ * @param commitId The commit ID for which the diff is to be retrieved.
+ * @returns A promise that resolves to the diff of the commit.
+ */
+async function getDiffForCommit(commitId, { git, }) {
+    try {
+        return await git.diff(['-p', `${commitId}^..${commitId}`]);
+    }
+    catch (error) {
+        throw new Error(`Error fetching diff for commit ${commitId}: ${error.message}`);
+    }
+}
+
+/**
+ * Determines the status of a file based on its changes in the Git repository.
+ *
+ * @param file - The file to check the status of.
+ * @param location - The location to check the status in ('index' or 'working_dir'). Defaults to 'index'.
+ * @returns The status of the file ('added', 'deleted', 'modified', 'renamed', 'untracked', or 'unknown').
+ * @throws Error if the file type is invalid.
+ */
+function getStatus(file, location = 'index') {
+    if ('index' in file && 'working_dir' in file) {
+        const statusCode = file[location];
+        switch (statusCode) {
+            case 'A':
+                return 'added';
+            case 'D':
+                return 'deleted';
+            case 'M':
+                return 'modified';
+            case 'R':
+                return 'renamed';
+            case '?':
+                return 'untracked';
+            default:
+                return 'unknown';
+        }
+    }
+    else if ('changes' in file && 'binary' in file) {
+        if (file.changes === 0)
+            return 'untracked';
+        if (file.file.includes('=>'))
+            return 'renamed';
+        if (file.deletions === 0 && file.insertions > 0)
+            return 'added';
+        if (file.insertions === 0 && file.deletions > 0)
+            return 'deleted';
+        if ((file.insertions > 0 && file.deletions > 0) || file.changes > 0)
+            return 'modified';
+        return 'unknown';
+    }
+    else {
+        throw new Error('Invalid file type');
+    }
+}
+
+/**
+ * Returns the summary text for a file change.
+ *
+ * @param file - The file status or diff result.
+ * @param change - The partial file change object.
+ * @returns The summary text for the file change.
+ * @throws Error if the file type is invalid.
+ */
+function getSummaryText(file, change) {
+    const status = change.status || getStatus(file);
+    let filePath;
+    if ('path' in file) {
+        filePath = file.path;
+    }
+    else if ('file' in file) {
+        filePath = change?.filePath || file.file;
+    }
+    else {
+        throw new Error('Invalid file type');
+    }
+    if (change.oldFilePath) {
+        return `${status}: ${change.oldFilePath} -> ${filePath}`;
+    }
+    return `${status}: ${filePath}`;
+}
+
+/**
+ * Retrieves the diff between the current branch and a specified target branch.
+ *
+ * @param {Object} options - The options for retrieving the diff.
+ * @param {SimpleGit} options.git - The SimpleGit instance.
+ * @param {Logger} options.logger - The logger for logging messages.
+ * @param {string} options.baseBranch - The base branch to compare against.
+ * @param {string} options.headBranch - The head branch to compare.
+ * @param {string[]} options.ignoredFiles - Array of specific files to ignore.
+ * @param {string[]} options.ignoredExtensions - Array of file extensions to ignore.
+ * @returns {Promise<GetChangesResult>} The diff between the current branch and the target branch.
+ */
+async function getDiffForBranch({ git, logger, baseBranch, headBranch, options, }) {
+    try {
+        logger?.verbose(`Getting diff for branches: baseBranch="${baseBranch}", headBranch="${headBranch}"`, {
+            color: 'blue',
+        });
+        // Validate branch names
+        if (!baseBranch || !headBranch) {
+            throw new Error(`Invalid branch names: baseBranch="${baseBranch}", headBranch="${headBranch}"`);
+        }
+        const { ignoredFiles = [], ignoredExtensions = [] } = options || {};
+        // Prepare ignore patterns
+        const ignorePatterns = [
+            ...ignoredFiles.map((file) => `:!${file}`),
+            ...ignoredExtensions.map((ext) => `:!*${ext}`),
+        ];
+        // Construct the diff command
+        const diffArgs = [`${baseBranch}..${headBranch}`];
+        if (ignorePatterns.length > 0) {
+            diffArgs.push('--');
+            diffArgs.push(...ignorePatterns);
+        }
+        logger?.verbose(`Running git diff with args: ${diffArgs.join(' ')}`, {
+            color: 'blue',
+        });
+        // Get the diff
+        const diff = await git.diff(diffArgs);
+        logger?.verbose(`Generated diff between "${headBranch}" and "${baseBranch}"`, {
+            color: 'blue',
+        });
+        const changes = diff.split('diff --git').slice(1).map((fileDiff) => {
+            const lines = fileDiff.split('\n');
+            const filePathLine = lines[0];
+            const filePath = filePathLine.split('b/')[1]?.split(' ')[0];
+            const oldFilePath = filePathLine.split('a/')[1]?.split(' ')[0];
+            // Determine status based on diff headers
+            let status = 'modified';
+            if (fileDiff.includes('new file mode')) {
+                status = 'added';
+            }
+            else if (fileDiff.includes('deleted file mode')) {
+                status = 'deleted';
+            }
+            else if (fileDiff.includes('rename from')) {
+                status = 'renamed';
+            }
+            return {
+                filePath: filePath || '',
+                oldFilePath: oldFilePath || '',
+                status,
+                summary: getSummaryText({ path: filePath || '', index: '', working_dir: '' }, { filePath: filePath || '', status }),
+            };
+        });
+        return {
+            staged: changes,
+            unstaged: [],
+            untracked: [],
+        };
+    }
+    catch (error) {
+        const errorMessage = error instanceof Error ? error.message : String(error);
+        console.error('Error in getDiffForBranch:', error);
+        logger?.log(`Encountered an error getting diff between branches: ${errorMessage}`, { color: 'red' });
+        logger?.log(`Branch details: baseBranch="${baseBranch}", headBranch="${headBranch}"`, { color: 'red' });
+        // Re-throw the error so the caller can handle it appropriately
+        throw error;
+    }
+}
+
+const template$3 = `You are a highly skilled software engineer tasked with writing a git changelog. Your response should be informative, well-structured, and in the imperative.
 
-- Annotate  each change with the git commit hash as reference, including just the first 7 characters
-- Logically group changes, and if necessary, summarize dependency updates
-- Include a descriptive title for the changelog, to give a high-level overview of the changes
-- Depending on the size of the changes, consider breaking the changelog into sections
-- Avoid generlizations like "various bug fixes" or "improvements" or "enhancements"
+## Input
+You will be provided with a summary of changes. This summary can be one of the following:
+1. A list of commits, each with its author, hash, message, and body.
+2. A list of commits, each with its details AND the full diff of the changes.
+3. A single, comprehensive diff for an entire branch.
 
+## Rules
+- Create a descriptive title for the changelog that gives a high-level overview of the changes.
+- **BREAKING CHANGES**: Identify any commits that introduce breaking changes. These must be listed first under a "### 💥 BREAKING CHANGES" heading.
+- **Grouping**: Logically group related changes under descriptive headings (e.g., ### Features, ### Fixes, ### Refactors).
+- **Dependencies**: Group all dependency updates (e.g., changes to package.json, go.mod) under a "### Dependencies" section.
+- **Summaries**: For each change, provide a concise summary.
+- **Attribution**: {{author_instructions}}
+- **Technical Details**: If provided with diffs, use them to understand the technical details and provide a more accurate and detailed description of the changes.
+- **Clarity**: Avoid generalizations like "various bug fixes," "improvements," or "enhancements." Be specific.
+- **Formatting**: Your entire response must be valid Markdown.
+
+## Formatting Instructions
 {{format_instructions}}
 
+{{additional_context}}
+
 """{{summary}}"""`;
-const inputVariables$2 = ['format_instructions', 'summary'];
+const inputVariables$2 = [
+    'format_instructions',
+    'summary',
+    'additional_context',
+    'author_instructions',
+];
 const CHANGELOG_PROMPT = new prompts$1.PromptTemplate({
     template: template$3,
     inputVariables: inputVariables$2,
@@ -7517,48 +7731,68 @@ const handler$4 = async (argv, logger) => {
     }
     async function factory() {
         const branchName = await getCurrentBranchName({ git });
-        if (config.sinceLastTag) {
-            logger.verbose(`Generating commit log since the last tag`, { color: 'yellow' });
+        if (argv.onlyDiff) {
+            logger.verbose(`Generating changelog based on branch diff`, { color: 'yellow' });
+            const diff = await getDiffForBranch({ git, logger, baseBranch: argv.branch || 'main', headBranch: branchName });
             return {
                 branch: branchName,
-                commits: await getChangesSinceLastTag({ git, logger }),
+                diff: JSON.stringify(diff.staged, null, 2),
             };
         }
-        if (config.range && config.range.includes(':')) {
+        let commits = [];
+        if (config.sinceLastTag) {
+            logger.verbose(`Generating commit log since the last tag`, { color: 'yellow' });
+            // This function returns string[], needs to be adapted or replaced
+            // For now, this path will have limited details.
+            const commitMessages = await getChangesSinceLastTag({ git, logger });
+            commits = commitMessages.map(msg => ({ message: msg }));
+        }
+        else if (config.range && config.range.includes(':')) {
             const [from, to] = config.range.split(':');
             if (!from || !to) {
                 logger.log(`Invalid range provided. Expected format is <from>:<to>`, { color: 'red' });
                 process.exit(1);
             }
-            return {
-                branch: branchName,
-                commits: await getCommitLogRange(from, to, { git, noMerges: true }),
-            };
+            commits = await getCommitLogRangeDetails(from, to, { git, noMerges: true });
         }
-        if (argv.branch) {
+        else if (argv.branch) {
             logger.verbose(`Generating commit log against branch: ${argv.branch}`, { color: 'yellow' });
-            return {
-                branch: branchName,
-                commits: await getCommitLogAgainstBranch({ git, logger, targetBranch: argv.branch }),
-            };
+            commits = await getCommitLogAgainstBranch({ git, logger, targetBranch: argv.branch });
+        }
+        else {
+            logger.verbose(`No range, branch, or tag option provided. Defaulting to current branch`, {
+                color: 'yellow',
+            });
+            commits = await getCommitLogCurrentBranch({ git, logger });
+        }
+        let commitsWithDiffText = commits;
+        if (argv.withDiff) {
+            commitsWithDiffText = await Promise.all(commits.map(async (commit) => ({
+                ...commit,
+                diffText: await getDiffForCommit(commit.hash, { git }),
+            })));
         }
-        logger.verbose(`No range, branch, or tag option provided. Defaulting to current branch`, {
-            color: 'yellow',
-        });
-        const commits = await getCommitLogCurrentBranch({ git, logger });
         return {
             branch: branchName,
-            commits,
+            commits: commitsWithDiffText,
+            withDiff: argv.withDiff,
         };
     }
-    async function parser({ branch, commits }) {
-        let result;
-        if (!commits || commits.length === 0) {
-            result = `## ${branch}\n\nNo commits found.`;
+    async function parser(data) {
+        if (data.diff) {
+            return `## Diff for ${data.branch}\n\n${data.diff}`;
         }
-        else {
-            result = `## ${branch}\n\n${commits.map((commit) => commit.trim()).join('\n\n')}`;
+        if (!data.commits || data.commits.length === 0) {
+            return `## ${data.branch}\n\nNo commits found.`;
         }
+        let result = `## ${data.branch}\n\n`;
+        result += data.commits.map(commit => {
+            let commitStr = `Author: ${commit.author_name}\nCommit: ${commit.hash}\nMessage: ${commit.message}\n${commit.body}`;
+            if (data.withDiff && commit.diffText) {
+                commitStr += `\nDiff:\n${commit.diffText}`;
+            }
+            return commitStr.trim();
+        }).join('\n\n---\n\n');
         return result;
     }
     const changelogMsg = await generateAndReviewLoop({
@@ -7582,12 +7816,21 @@ const handler$4 = async (argv, logger) => {
                 fallback: CHANGELOG_PROMPT,
             });
             const formatInstructions = "Only respond with a valid JSON object, containing two fields: 'title' an escaped string, no more than 65 characters, and 'content' also an escaped string.";
+            let additional_context = '';
+            if (argv.additional) {
+                additional_context = `## Additional Context\n${argv.additional}`;
+            }
+            const author_instructions = argv.author
+                ? 'At the end of each item, attribute the author and include a reference to the commit hash, like this: `by @author_name (f6dbe61)`. Use the first 7 characters of the hash.'
+                : 'At the end of each item, include a reference to the commit hash, like this: `(f6dbe61)`. Use the first 7 characters of the hash.';
             const changelog = await executeChain({
                 llm,
                 prompt,
                 variables: {
                     summary: context,
                     format_instructions: formatInstructions,
+                    additional_context: additional_context,
+                    author_instructions: author_instructions,
                 },
                 parser,
             });
@@ -10899,76 +11142,6 @@ async function createCommit(message, git) {
     return await git.commit(message);
 }
 
-/**
- * Determines the status of a file based on its changes in the Git repository.
- *
- * @param file - The file to check the status of.
- * @param location - The location to check the status in ('index' or 'working_dir'). Defaults to 'index'.
- * @returns The status of the file ('added', 'deleted', 'modified', 'renamed', 'untracked', or 'unknown').
- * @throws Error if the file type is invalid.
- */
-function getStatus(file, location = 'index') {
-    if ('index' in file && 'working_dir' in file) {
-        const statusCode = file[location];
-        switch (statusCode) {
-            case 'A':
-                return 'added';
-            case 'D':
-                return 'deleted';
-            case 'M':
-                return 'modified';
-            case 'R':
-                return 'renamed';
-            case '?':
-                return 'untracked';
-            default:
-                return 'unknown';
-        }
-    }
-    else if ('changes' in file && 'binary' in file) {
-        if (file.changes === 0)
-            return 'untracked';
-        if (file.file.includes('=>'))
-            return 'renamed';
-        if (file.deletions === 0 && file.insertions > 0)
-            return 'added';
-        if (file.insertions === 0 && file.deletions > 0)
-            return 'deleted';
-        if ((file.insertions > 0 && file.deletions > 0) || file.changes > 0)
-            return 'modified';
-        return 'unknown';
-    }
-    else {
-        throw new Error('Invalid file type');
-    }
-}
-
-/**
- * Returns the summary text for a file change.
- *
- * @param file - The file status or diff result.
- * @param change - The partial file change object.
- * @returns The summary text for the file change.
- * @throws Error if the file type is invalid.
- */
-function getSummaryText(file, change) {
-    const status = change.status || getStatus(file);
-    let filePath;
-    if ('path' in file) {
-        filePath = file.path;
-    }
-    else if ('file' in file) {
-        filePath = change?.filePath || file.file;
-    }
-    else {
-        throw new Error('Invalid file type');
-    }
-    if (change.oldFilePath) {
-        return `${status}: ${change.oldFilePath} -> ${filePath}`;
-    }
-    return `${status}: ${filePath}`;
-}
-
 /**
  * Retrieves the changes in the Git repository.
  *
@@ -11286,7 +11459,7 @@ const handler$3 = async (argv, logger) => {
             const schema = USE_CONVENTIONAL_COMMITS
                 ? ConventionalCommitMessageResponseSchema
                 : CommitMessageResponseSchema;
-            const formatInstructions = `You must always return valid JSON fenced by a markdown code block. Do not return any additional text. The JSON object you return should match the following schema:
+            const formatInstructions = `You must always return a valid JSON object. Do not return any additional text. The JSON object you return should match the following schema:
 ${schema.description}
 {
   "title": "The commit title",
@@ -12006,86 +12179,6 @@ const getChangesByTimestamp = async ({ since, git }) => {
     return formatCommitLog(commitLog);
 };
 
-/**
- * Retrieves the diff between the current branch and a specified target branch.
- *
- * @param {Object} options - The options for retrieving the diff.
- * @param {SimpleGit} options.git - The SimpleGit instance.
- * @param {Logger} options.logger - The logger for logging messages.
- * @param {string} options.baseBranch - The base branch to compare against.
- * @param {string} options.headBranch - The head branch to compare.
- * @param {string[]} options.ignoredFiles - Array of specific files to ignore.
- * @param {string[]} options.ignoredExtensions - Array of file extensions to ignore.
- * @returns {Promise<GetChangesResult>} The diff between the current branch and the target branch.
- */
-async function getDiffForBranch({ git, logger, baseBranch, headBranch, options, }) {
-    try {
-        logger?.verbose(`Getting diff for branches: baseBranch="${baseBranch}", headBranch="${headBranch}"`, {
-            color: 'blue',
-        });
-        // Validate branch names
-        if (!baseBranch || !headBranch) {
-            throw new Error(`Invalid branch names: baseBranch="${baseBranch}", headBranch="${headBranch}"`);
-        }
-        const { ignoredFiles = [], ignoredExtensions = [] } = options || {};
-        // Prepare ignore patterns
-        const ignorePatterns = [
-            ...ignoredFiles.map((file) => `:!${file}`),
-            ...ignoredExtensions.map((ext) => `:!*${ext}`),
-        ];
-        // Construct the diff command
-        const diffArgs = [`${baseBranch}..${headBranch}`];
-        if (ignorePatterns.length > 0) {
-            diffArgs.push('--');
-            diffArgs.push(...ignorePatterns);
-        }
-        logger?.verbose(`Running git diff with args: ${diffArgs.join(' ')}`, {
-            color: 'blue',
-        });
-        // Get the diff
-        const diff = await git.diff(diffArgs);
-        logger?.verbose(`Generated diff between "${headBranch}" and "${baseBranch}"`, {
-            color: 'blue',
-        });
-        const changes = diff.split('diff --git').slice(1).map((fileDiff) => {
-            const lines = fileDiff.split('\n');
-            const filePathLine = lines[0];
-            const filePath = filePathLine.split('b/')[1]?.split(' ')[0];
-            const oldFilePath = filePathLine.split('a/')[1]?.split(' ')[0];
-            // Determine status based on diff headers
-            let status = 'modified';
-            if (fileDiff.includes('new file mode')) {
-                status = 'added';
-            }
-            else if (fileDiff.includes('deleted file mode')) {
-                status = 'deleted';
-            }
-            else if (fileDiff.includes('rename from')) {
-                status = 'renamed';
-            }
-            return {
-                filePath: filePath || '',
-                oldFilePath: oldFilePath || '',
-                status,
-                summary: getSummaryText({ path: filePath || '', index: '', working_dir: '' }, { filePath: filePath || '', status }),
-            };
-        });
-        return {
-            staged: changes,
-            unstaged: [],
-            untracked: [],
-        };
-    }
-    catch (error) {
-        const errorMessage = error instanceof Error ? error.message : String(error);
-        console.error('Error in getDiffForBranch:', error);
-        logger?.log(`Encountered an error getting diff between branches: ${errorMessage}`, { color: 'red' });
-        logger?.log(`Branch details: baseBranch="${baseBranch}", headBranch="${headBranch}"`, { color: 'red' });
-        // Re-throw the error so the caller can handle it appropriately
-        throw error;
-    }
-}
-
 async function noResult$1({ logger }) {
     logger.log('No repo changes detected. 👀', { color: 'blue' });
     throw new Error('NO_CHANGES_DETECTED');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "git-coco",
-  "version": "0.21.4",
+  "version": "0.22.1",
   "description": "zero-effort git commits with coco.",
   "author": "gfargo <ghfargo@gmail.com>",
   "license": "MIT",