git-coco 0.14.7 → 0.14.9

package/README.md

@@ -83,6 +83,9 @@ coco changelog -r HEAD~5:HEAD
 
 # For a target branch
 coco changelog -b other-branch
+
+# For all commits since the last tag
+coco changelog -t
 ```
 
 ### **`coco recap`**

package/dist/index.d.ts

@@ -150,6 +150,7 @@ interface BaseCommandOptions extends BaseArgvOptions {
 interface ChangelogOptions extends BaseCommandOptions {
     range: string;
     branch: string;
+    sinceLastTag: boolean;
 }
 type ChangelogArgv = Arguments<ChangelogOptions>;
 
@@ -166,6 +167,7 @@ interface CommitOptions extends BaseCommandOptions {
     openInEditor: boolean;
     ignoredFiles: string[];
     ignoredExtensions: string[];
+    withPreviousCommits: number;
 }
 type CommitArgv = Arguments<CommitOptions>;
 
@@ -239,12 +241,14 @@ interface SpinnerOptions {
 }
 interface Config {
     verbose?: boolean;
+    silent?: boolean;
 }
 declare class Logger {
     private config;
     private timerStart;
     private spinner;
     constructor(config: Config);
+    setConfig(config: Config): Logger;
     log(message: string, options?: LoggerOptions): Logger;
     verbose(message: string, options?: LoggerOptions): Logger;
     startTimer(): Logger;

package/dist/index.esm.mjs

@@ -18,7 +18,7 @@ import prettyMilliseconds from 'pretty-ms';
 import { ChatAnthropic } from '@langchain/anthropic';
 import { ChatOllama } from '@langchain/ollama';
 import { ChatOpenAI } from '@langchain/openai';
-import { JsonOutputParser, BaseOutputParser } from '@langchain/core/output_parsers';
+import { JsonOutputParser, BaseOutputParser, StringOutputParser } from '@langchain/core/output_parsers';
 import { simpleGit } from 'simple-git';
 import pQueue from 'p-queue';
 import { Document, BaseDocumentTransformer } from '@langchain/core/documents';
@@ -55,7 +55,7 @@ import * as readline from 'readline';
 /**
  * Current build version from package.json
  */
-const BUILD_VERSION = "0.14.7";
+const BUILD_VERSION = "0.14.9";
 
 const isInteractive = (config) => {
     return config?.mode === 'interactive' || !!config?.interactive;
@@ -1769,7 +1769,17 @@ class Logger {
         this.config = config;
         this.spinner = null;
     }
+    setConfig(config) {
+        this.config = {
+            ...this.config,
+            ...config,
+        };
+        return this;
+    }
     log(message, options = { color: 'blue' }) {
+        if (this.config?.silent) {
+            return this;
+        }
         let outputMessage = message;
         if (options.color) {
             outputMessage = chalk[options.color](outputMessage);
@@ -1778,7 +1788,7 @@ class Logger {
         return this;
     }
     verbose(message, options = {}) {
-        if (!this.config?.verbose) {
+        if (!this.config?.verbose || this.config?.silent) {
             return this;
         }
         this.log(message, options);
@@ -1789,13 +1799,11 @@ class Logger {
         return this;
     }
     stopTimer(message, options = { color: 'yellow' }) {
-        if (!this.config?.verbose || !this.timerStart) {
+        if (!this.config?.verbose || !this.timerStart || this.config?.silent) {
             return this;
         }
         const elapsedTime = prettyMilliseconds(now() - this.timerStart);
-        let outputMessage = message
-            ? `${message} (⏲ ${elapsedTime})`
-            : `⏲ ${elapsedTime}`;
+        let outputMessage = message ? `${message} (⏲ ${elapsedTime})` : `⏲ ${elapsedTime}`;
         if (options.color) {
             outputMessage = chalk[options.color](outputMessage);
         }
@@ -1803,11 +1811,17 @@ class Logger {
         return this;
     }
     startSpinner(message, options = { color: 'green' }) {
+        if (this.config?.silent) {
+            return this;
+        }
         const spinnerMessage = options.color ? chalk[options.color](message) : message;
         this.spinner = ora(spinnerMessage).start();
         return this;
     }
     stopSpinner(message = '', options = { mode: 'succeed', color: 'green' }) {
+        if (this.config?.silent) {
+            return this;
+        }
         const spinnerMessage = options?.color ? chalk[options.color](message) : message;
         this.spinner?.[options.mode || 'succeed'](spinnerMessage);
         this.spinner = null;
@@ -1846,6 +1860,12 @@ const options$4 = {
         alias: 'b',
         description: 'Target branch to compare against',
     },
+    sinceLastTag: {
+        type: 'boolean',
+        alias: 't',
+        description: 'Generate changelog for all commits since the last tag',
+        default: false,
+    },
     i: {
         type: 'boolean',
         alias: 'interactive',
@@ -1898,6 +1918,7 @@ function getPrompt({ template, variables, fallback }) {
         ? new PromptTemplate({
             template,
             inputVariables: variables,
+            templateFormat: 'mustache',
         })
         : fallback);
 }
@@ -1928,6 +1949,35 @@ function extractTicketIdFromBranchName(branchName) {
     return match ? match[0] : null;
 }
 
+/**
+ * Formats a commit log into a readable string format.
+ *
+ * @param commitLog - The commit log result containing an array of commit details.
+ * @returns An array of formatted commit log strings.
+ *
+ * Each formatted string includes:
+ * - The date of the commit in square brackets.
+ * - The commit message.
+ * - The commit body.
+ * - The commit hash in parentheses.
+ * - The author's name and email in angle brackets.
+ */
+const formatCommitLog = (commitLog) => {
+    return commitLog.all.map(({ message, date, body, author_name, hash, author_email }) => `[${date}] ${message}\n${body}\n(${hash}) - ${author_name}<${author_email}>`);
+};
+
+const getChangesSinceLastTag = async ({ git }) => {
+    const tags = await git.tags();
+    if (tags.all.length > 0) {
+        const lastTag = tags.latest;
+        const commitLog = await git.log({ from: lastTag });
+        return formatCommitLog(commitLog);
+    }
+    else {
+        return ['No tags found in the repository.'];
+    }
+};
+
 /**
  * Retrieves the commit log range between two specified commits.
  *
@@ -2061,8 +2111,17 @@ const getRepo = () => {
     return git;
 };
 
-const template$4 = `Write informative git commit message, in the imperative, based on the diffs & file changes provided in the "Diff Summary" section.  
-Commit Messages must have a short description that is less than 50 characters and a longer detailed summary around 300 characters, the shorter and more concise the better. 
+/**
+ * Template for generating git commit messages based on code changes
+ *
+ * Variables:
+ * - summary: Contains the diff summary of staged changes
+ * - format_instructions: Instructions for the output format (JSON with title and body)
+ * - additional_context: Optional user-provided context to guide the commit message generation
+ * - commit_history: Optional history of previous commits for context
+ */
+const template$4 = `Write informative git commit message, in the imperative, based on the diffs & file changes provided in the "Diff Summary" section.
+Commit Messages must have a short description that is less than 50 characters and a longer detailed summary around 300 characters, the shorter and more concise the better.
 
 Please follow the guidelines below when writing your commit message:
 
@@ -2074,13 +2133,16 @@ Please follow the guidelines below when writing your commit message:
 
 {format_instructions}
 
+{commit_history}
+
 """"""
 {summary}
 """"""
 
-{additional}
+{additional_context}
 `;
-const inputVariables$3 = ['summary', 'format_instructions', 'additional'];
+// Define the variables that will be passed to the prompt template
+const inputVariables$3 = ['summary', 'format_instructions', 'additional_context', 'commit_history'];
 const COMMIT_PROMPT = new PromptTemplate({
     template: template$4,
     inputVariables: inputVariables$3,
@@ -2246,9 +2308,16 @@ async function generateAndReviewLoop({ label, factory, parser, noResult, agent,
                 result = '';
                 continue;
             }
+            // Only edit the result in interactive mode if approved
+            result = await editResult(result, options);
+        }
+        else {
+            // In non-interactive mode, we return the result as is to be output to stdout by the caller.
+            const displayResult = reviewParser ? reviewParser(result, options) : result;
+            // In non-interactive mode, ensure we return the properly formatted result
+            result = displayResult;
         }
         // if we're here, we're done.
-        result = await editResult(result, options);
         continueLoop = false;
     }
     return result;
@@ -2271,7 +2340,8 @@ async function handleResult({ result, mode, interactiveModeCallback }) {
             break;
         case 'stdout':
         default:
-            process.stdout.write(result, 'utf8');
+            // Ensure we write the result to stdout in non-interactive mode
+            process.stdout.write(result + '\n', 'utf8');
             break;
     }
     process.exit(0);
@@ -2310,6 +2380,13 @@ 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' });
+            return {
+                branch: branchName,
+                commits: await getChangesSinceLastTag({ git, logger }),
+            };
+        }
         if (config.range && config.range.includes(':')) {
             const [from, to] = config.range.split(':');
             if (!from || !to) {
@@ -2328,7 +2405,7 @@ const handler$4 = async (argv, logger) => {
                 commits: await getCommitLogAgainstBranch({ git, logger, targetBranch: argv.branch }),
             };
         }
-        logger.verbose(`No range or branch provided. Defaulting to current branch`, { color: 'yellow' });
+        logger.verbose(`No range, branch, or tag option provided. Defaulting to current branch`, { color: 'yellow' });
         return {
             branch: branchName,
             commits: await getCommitLogCurrentBranch({ git, logger }),
@@ -2400,7 +2477,7 @@ const handler$4 = async (argv, logger) => {
 
 var changelog = {
     command: command$4,
-    desc: 'Generate a changelog from current or target branch or provided commit range.',
+    desc: 'Generate a changelog from current or target branch, provided commit range, or since the last tag.',
     builder: builder$4,
     handler: commandExecutor(handler$4),
     options: options$4,
@@ -2438,6 +2515,12 @@ const options$3 = {
         type: 'string',
         alias: 'a',
     },
+    withPreviousCommits: {
+        description: 'Include previous commits as context (specify number of commits, 0 for none)',
+        type: 'number',
+        default: 0,
+        alias: 'p',
+    },
 };
 const builder$3 = (yargs) => {
     return yargs.options(options$3).usage(getCommandUsageHeader(command$3));
@@ -6175,6 +6258,48 @@ async function getChanges({ git, options }) {
     };
 }
 
+/**
+ * Format a single commit log entry into a readable string
+ * @param commit - The commit log entry
+ * @returns Formatted commit log string
+ */
+function formatSingleCommit(commit) {
+    const { hash, date, message, body, author_name } = commit;
+    const shortHash = hash.substring(0, 7);
+    return `Commit: ${shortHash}
+Author: ${author_name}
+Date: ${date}
+Message: ${message}
+${body ? `\nDetails: ${body}` : ''}`;
+}
+
+/**
+ * Get the specified number of previous commits
+ * @param options - Options for getting previous commits
+ * @returns Formatted commit logs
+ */
+async function getPreviousCommits(options) {
+    const { git, count = 1 } = options;
+    if (count <= 0) {
+        return '';
+    }
+    try {
+        const logs = await git.log({ maxCount: count });
+        if (!logs || logs.total === 0) {
+            return '';
+        }
+        // Format the commit logs
+        const formattedLogs = logs.all.map((commit) => {
+            return formatSingleCommit(commit);
+        }).join('\n\n');
+        return formattedLogs;
+    }
+    catch (error) {
+        console.error(`Error getting previous commits: ${error.message}`);
+        return '';
+    }
+}
+
 /**
  * Retrieves a TikToken for the specified model.
  *
@@ -6237,10 +6362,13 @@ const handler$3 = async (argv, logger) => {
     }
     const tokenizer = await getTokenCounter(provider === 'openai' ? model : 'gpt-4o');
     const llm = getLlm(provider, model, config);
-    const INTERACTIVE = isInteractive(config);
+    const INTERACTIVE = argv.interactive || isInteractive(config);
     if (INTERACTIVE) {
         logger.log(LOGO);
     }
+    else {
+        logger.setConfig({ silent: true });
+    }
     async function factory() {
         const changes = await getChanges({
             git,
@@ -6285,14 +6413,30 @@ const handler$3 = async (argv, logger) => {
                 fallback: COMMIT_PROMPT,
             });
             const formatInstructions = "Respond with a valid JSON object, containing two fields: 'title' and 'body', both strings.";
-            const additionalContext = argv.additional ? `${argv.additional}` : '';
+            // Get additional context if provided
+            let additional_context = '';
+            if (argv.additional) {
+                additional_context = `## Additional Context\n${argv.additional}`;
+            }
+            // Get commit history if requested
+            let commit_history = '';
+            if (argv.withPreviousCommits > 0) {
+                const commitHistoryData = await getPreviousCommits({
+                    git,
+                    count: argv.withPreviousCommits
+                });
+                if (commitHistoryData) {
+                    commit_history = `## Commit History\n${commitHistoryData}`;
+                }
+            }
             const commitMsg = await executeChain({
                 llm,
                 prompt,
                 variables: {
                     summary: context,
                     format_instructions: formatInstructions,
-                    additional: additionalContext,
+                    additional_context: additional_context,
+                    commit_history: commit_history,
                 },
                 parser,
             });
@@ -6816,40 +6960,11 @@ const builder$1 = (yargs) => {
     return yargs.options(options$1).usage(getCommandUsageHeader(command$1));
 };
 
-/**
- * Formats a commit log into a readable string format.
- *
- * @param commitLog - The commit log result containing an array of commit details.
- * @returns An array of formatted commit log strings.
- *
- * Each formatted string includes:
- * - The date of the commit in square brackets.
- * - The commit message.
- * - The commit body.
- * - The commit hash in parentheses.
- * - The author's name and email in angle brackets.
- */
-const formatCommitLog = (commitLog) => {
-    return commitLog.all.map(({ message, date, body, author_name, hash, author_email }) => `[${date}] ${message}\n${body}\n(${hash}) - ${author_name}<${author_email}>`);
-};
-
 const getChangesByTimestamp = async ({ since, git }) => {
     const commitLog = await git.log({ '--since': since });
     return formatCommitLog(commitLog);
 };
 
-const getChangesSinceLastTag = async ({ git }) => {
-    const tags = await git.tags();
-    if (tags.all.length > 0) {
-        const lastTag = tags.latest;
-        const commitLog = await git.log({ from: lastTag });
-        return formatCommitLog(commitLog);
-    }
-    else {
-        return ['No tags found in the repository.'];
-    }
-};
-
 async function noResult$1({ logger }) {
     logger.log('No repo changes detected. 👀', { color: 'blue' });
 }
@@ -6859,12 +6974,12 @@ The summarization should descibe in a general sense what has changed in the repo
 
 Breaking down the changes into categories (e.g. bug fixes, new features, etc.) with markdown headings is encouraged.
 
-{timeframe}
+{{timeframe}}
 
-{format_instructions}
+{{format_instructions}}
 
-"""{changes}"""`;
-const inputVariables$1 = ['format_instructions', 'changes', 'timeframe'];
+"""{{changes}}"""`;
+const inputVariables$1 = ['timeframe', 'format_instructions', 'changes'];
 const RECAP_PROMPT = new PromptTemplate({
     template: template$1,
     inputVariables: inputVariables$1,
@@ -6881,10 +6996,13 @@ const handler$1 = async (argv, logger) => {
     }
     const tokenizer = await getTokenCounter(provider === 'openai' ? model : 'gpt-4o');
     const llm = getLlm(provider, model, config);
-    const INTERACTIVE = isInteractive(config);
+    const INTERACTIVE = argv.interactive || isInteractive(config);
     if (INTERACTIVE) {
         logger.log(LOGO);
     }
+    else {
+        logger.setConfig({ silent: true });
+    }
     const { 'last-month': lastMonth, 'last-tag': lastTag, yesterday, 'last-week': lastWeek } = argv;
     const timeframe = lastMonth
         ? 'last-month'
@@ -6943,7 +7061,7 @@ const handler$1 = async (argv, logger) => {
     async function parser(changes) {
         return changes.join('\n');
     }
-    await generateAndReviewLoop({
+    const recapResult = await generateAndReviewLoop({
         label: 'recap',
         options: {
             ...config,
@@ -6968,30 +7086,61 @@ const handler$1 = async (argv, logger) => {
         factory,
         parser,
         agent: async (context, options) => {
-            const parser = new JsonOutputParser();
-            const formatInstructions = "Respond with a valid JSON object, containing one field: 'summary', a string.";
+            const formatInstructions = 'Respond in a readable format. Include both high level and detailed information. Use markdown to format the response.';
             const prompt = getPrompt({
                 template: options.prompt,
                 variables: RECAP_PROMPT.inputVariables,
                 fallback: RECAP_PROMPT,
             });
-            const response = await executeChain({
-                llm,
-                prompt,
-                variables: {
-                    changes: context,
-                    format_instructions: formatInstructions,
-                    timeframe,
-                },
-                parser,
-            });
-            return `${response.summary || 'no response'}`;
+            try {
+                const stringParser = new StringOutputParser();
+                const response = (await executeChain({
+                    llm,
+                    prompt,
+                    variables: {
+                        changes: context,
+                        format_instructions: formatInstructions,
+                        timeframe,
+                    },
+                    // NOTE: parser is not optional and JSONOutputParser is expected, however making a union type for `executeChain` breaks type generation downstream.
+                    // In the future, we should consider making the parser optional in `executeChain` and better handle parser types.
+                    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+                    // @ts-expect-error - parser is not optional and JSONOutputParser is expected
+                    parser: stringParser,
+                }));
+                return `${response || 'no response'}`;
+            }
+            catch (error) {
+                const errorMessage = error instanceof Error ? error.message : String(error);
+                // Log the error but don't exit
+                logger.log(`Error parsing LLM response: ${errorMessage}`, { color: 'red' });
+                // Always return a fallback message instead of exiting
+                const fallbackMessage = `
+## Failed to parse the response [timeframe: ${timeframe}]
+- There are changes in the codebase that couldn't be properly summarized due to a technical issue.
+- LLM encountered issues when parsing the changes.
+
+### Error encountered
+
+${errorMessage}
+`;
+                return fallbackMessage;
+            }
         },
         noResult: async () => {
             await noResult$1({ git, logger });
             process.exit(0);
         },
     });
+    // Handle the result based on the mode (interactive or stdout)
+    const MODE = (INTERACTIVE && 'interactive') || (config.recap && 'interactive') || config?.mode || 'stdout'; // Default to stdout
+    handleResult({
+        result: recapResult,
+        interactiveModeCallback: async () => {
+            logSuccess();
+        },
+        mode: MODE,
+    });
 };
 
 var recap = {

package/dist/index.js

@@ -77,7 +77,7 @@ var readline__namespace = /*#__PURE__*/_interopNamespaceDefault(readline$1);
 /**
  * Current build version from package.json
  */
-const BUILD_VERSION = "0.14.7";
+const BUILD_VERSION = "0.14.9";
 
 const isInteractive = (config) => {
     return config?.mode === 'interactive' || !!config?.interactive;
@@ -1791,7 +1791,17 @@ class Logger {
         this.config = config;
         this.spinner = null;
     }
+    setConfig(config) {
+        this.config = {
+            ...this.config,
+            ...config,
+        };
+        return this;
+    }
     log(message, options = { color: 'blue' }) {
+        if (this.config?.silent) {
+            return this;
+        }
         let outputMessage = message;
         if (options.color) {
             outputMessage = chalk[options.color](outputMessage);
@@ -1800,7 +1810,7 @@ class Logger {
         return this;
     }
     verbose(message, options = {}) {
-        if (!this.config?.verbose) {
+        if (!this.config?.verbose || this.config?.silent) {
             return this;
         }
         this.log(message, options);
@@ -1811,13 +1821,11 @@ class Logger {
         return this;
     }
     stopTimer(message, options = { color: 'yellow' }) {
-        if (!this.config?.verbose || !this.timerStart) {
+        if (!this.config?.verbose || !this.timerStart || this.config?.silent) {
             return this;
         }
         const elapsedTime = prettyMilliseconds(now() - this.timerStart);
-        let outputMessage = message
-            ? `${message} (⏲ ${elapsedTime})`
-            : `⏲ ${elapsedTime}`;
+        let outputMessage = message ? `${message} (⏲ ${elapsedTime})` : `⏲ ${elapsedTime}`;
         if (options.color) {
             outputMessage = chalk[options.color](outputMessage);
         }
@@ -1825,11 +1833,17 @@ class Logger {
         return this;
     }
     startSpinner(message, options = { color: 'green' }) {
+        if (this.config?.silent) {
+            return this;
+        }
         const spinnerMessage = options.color ? chalk[options.color](message) : message;
         this.spinner = ora(spinnerMessage).start();
         return this;
     }
     stopSpinner(message = '', options = { mode: 'succeed', color: 'green' }) {
+        if (this.config?.silent) {
+            return this;
+        }
         const spinnerMessage = options?.color ? chalk[options.color](message) : message;
         this.spinner?.[options.mode || 'succeed'](spinnerMessage);
         this.spinner = null;
@@ -1868,6 +1882,12 @@ const options$4 = {
         alias: 'b',
         description: 'Target branch to compare against',
     },
+    sinceLastTag: {
+        type: 'boolean',
+        alias: 't',
+        description: 'Generate changelog for all commits since the last tag',
+        default: false,
+    },
     i: {
         type: 'boolean',
         alias: 'interactive',
@@ -1920,6 +1940,7 @@ function getPrompt({ template, variables, fallback }) {
         ? new prompts$1.PromptTemplate({
             template,
             inputVariables: variables,
+            templateFormat: 'mustache',
         })
         : fallback);
 }
@@ -1950,6 +1971,35 @@ function extractTicketIdFromBranchName(branchName) {
     return match ? match[0] : null;
 }
 
+/**
+ * Formats a commit log into a readable string format.
+ *
+ * @param commitLog - The commit log result containing an array of commit details.
+ * @returns An array of formatted commit log strings.
+ *
+ * Each formatted string includes:
+ * - The date of the commit in square brackets.
+ * - The commit message.
+ * - The commit body.
+ * - The commit hash in parentheses.
+ * - The author's name and email in angle brackets.
+ */
+const formatCommitLog = (commitLog) => {
+    return commitLog.all.map(({ message, date, body, author_name, hash, author_email }) => `[${date}] ${message}\n${body}\n(${hash}) - ${author_name}<${author_email}>`);
+};
+
+const getChangesSinceLastTag = async ({ git }) => {
+    const tags = await git.tags();
+    if (tags.all.length > 0) {
+        const lastTag = tags.latest;
+        const commitLog = await git.log({ from: lastTag });
+        return formatCommitLog(commitLog);
+    }
+    else {
+        return ['No tags found in the repository.'];
+    }
+};
+
 /**
  * Retrieves the commit log range between two specified commits.
  *
@@ -2083,8 +2133,17 @@ const getRepo = () => {
     return git;
 };
 
-const template$4 = `Write informative git commit message, in the imperative, based on the diffs & file changes provided in the "Diff Summary" section.  
-Commit Messages must have a short description that is less than 50 characters and a longer detailed summary around 300 characters, the shorter and more concise the better. 
+/**
+ * Template for generating git commit messages based on code changes
+ *
+ * Variables:
+ * - summary: Contains the diff summary of staged changes
+ * - format_instructions: Instructions for the output format (JSON with title and body)
+ * - additional_context: Optional user-provided context to guide the commit message generation
+ * - commit_history: Optional history of previous commits for context
+ */
+const template$4 = `Write informative git commit message, in the imperative, based on the diffs & file changes provided in the "Diff Summary" section.
+Commit Messages must have a short description that is less than 50 characters and a longer detailed summary around 300 characters, the shorter and more concise the better.
 
 Please follow the guidelines below when writing your commit message:
 
@@ -2096,13 +2155,16 @@ Please follow the guidelines below when writing your commit message:
 
 {format_instructions}
 
+{commit_history}
+
 """"""
 {summary}
 """"""
 
-{additional}
+{additional_context}
 `;
-const inputVariables$3 = ['summary', 'format_instructions', 'additional'];
+// Define the variables that will be passed to the prompt template
+const inputVariables$3 = ['summary', 'format_instructions', 'additional_context', 'commit_history'];
 const COMMIT_PROMPT = new prompts$1.PromptTemplate({
     template: template$4,
     inputVariables: inputVariables$3,
@@ -2268,9 +2330,16 @@ async function generateAndReviewLoop({ label, factory, parser, noResult, agent,
                 result = '';
                 continue;
             }
+            // Only edit the result in interactive mode if approved
+            result = await editResult(result, options);
+        }
+        else {
+            // In non-interactive mode, we return the result as is to be output to stdout by the caller.
+            const displayResult = reviewParser ? reviewParser(result, options) : result;
+            // In non-interactive mode, ensure we return the properly formatted result
+            result = displayResult;
         }
         // if we're here, we're done.
-        result = await editResult(result, options);
         continueLoop = false;
     }
     return result;
@@ -2293,7 +2362,8 @@ async function handleResult({ result, mode, interactiveModeCallback }) {
             break;
         case 'stdout':
         default:
-            process.stdout.write(result, 'utf8');
+            // Ensure we write the result to stdout in non-interactive mode
+            process.stdout.write(result + '\n', 'utf8');
             break;
     }
     process.exit(0);
@@ -2332,6 +2402,13 @@ 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' });
+            return {
+                branch: branchName,
+                commits: await getChangesSinceLastTag({ git, logger }),
+            };
+        }
         if (config.range && config.range.includes(':')) {
             const [from, to] = config.range.split(':');
             if (!from || !to) {
@@ -2350,7 +2427,7 @@ const handler$4 = async (argv, logger) => {
                 commits: await getCommitLogAgainstBranch({ git, logger, targetBranch: argv.branch }),
             };
         }
-        logger.verbose(`No range or branch provided. Defaulting to current branch`, { color: 'yellow' });
+        logger.verbose(`No range, branch, or tag option provided. Defaulting to current branch`, { color: 'yellow' });
         return {
             branch: branchName,
             commits: await getCommitLogCurrentBranch({ git, logger }),
@@ -2422,7 +2499,7 @@ const handler$4 = async (argv, logger) => {
 
 var changelog = {
     command: command$4,
-    desc: 'Generate a changelog from current or target branch or provided commit range.',
+    desc: 'Generate a changelog from current or target branch, provided commit range, or since the last tag.',
     builder: builder$4,
     handler: commandExecutor(handler$4),
     options: options$4,
@@ -2460,6 +2537,12 @@ const options$3 = {
         type: 'string',
         alias: 'a',
     },
+    withPreviousCommits: {
+        description: 'Include previous commits as context (specify number of commits, 0 for none)',
+        type: 'number',
+        default: 0,
+        alias: 'p',
+    },
 };
 const builder$3 = (yargs) => {
     return yargs.options(options$3).usage(getCommandUsageHeader(command$3));
@@ -6197,6 +6280,48 @@ async function getChanges({ git, options }) {
     };
 }
 
+/**
+ * Format a single commit log entry into a readable string
+ * @param commit - The commit log entry
+ * @returns Formatted commit log string
+ */
+function formatSingleCommit(commit) {
+    const { hash, date, message, body, author_name } = commit;
+    const shortHash = hash.substring(0, 7);
+    return `Commit: ${shortHash}
+Author: ${author_name}
+Date: ${date}
+Message: ${message}
+${body ? `\nDetails: ${body}` : ''}`;
+}
+
+/**
+ * Get the specified number of previous commits
+ * @param options - Options for getting previous commits
+ * @returns Formatted commit logs
+ */
+async function getPreviousCommits(options) {
+    const { git, count = 1 } = options;
+    if (count <= 0) {
+        return '';
+    }
+    try {
+        const logs = await git.log({ maxCount: count });
+        if (!logs || logs.total === 0) {
+            return '';
+        }
+        // Format the commit logs
+        const formattedLogs = logs.all.map((commit) => {
+            return formatSingleCommit(commit);
+        }).join('\n\n');
+        return formattedLogs;
+    }
+    catch (error) {
+        console.error(`Error getting previous commits: ${error.message}`);
+        return '';
+    }
+}
+
 /**
  * Retrieves a TikToken for the specified model.
  *
@@ -6259,10 +6384,13 @@ const handler$3 = async (argv, logger) => {
     }
     const tokenizer = await getTokenCounter(provider === 'openai' ? model : 'gpt-4o');
     const llm = getLlm(provider, model, config);
-    const INTERACTIVE = isInteractive(config);
+    const INTERACTIVE = argv.interactive || isInteractive(config);
     if (INTERACTIVE) {
         logger.log(LOGO);
     }
+    else {
+        logger.setConfig({ silent: true });
+    }
     async function factory() {
         const changes = await getChanges({
             git,
@@ -6307,14 +6435,30 @@ const handler$3 = async (argv, logger) => {
                 fallback: COMMIT_PROMPT,
             });
             const formatInstructions = "Respond with a valid JSON object, containing two fields: 'title' and 'body', both strings.";
-            const additionalContext = argv.additional ? `${argv.additional}` : '';
+            // Get additional context if provided
+            let additional_context = '';
+            if (argv.additional) {
+                additional_context = `## Additional Context\n${argv.additional}`;
+            }
+            // Get commit history if requested
+            let commit_history = '';
+            if (argv.withPreviousCommits > 0) {
+                const commitHistoryData = await getPreviousCommits({
+                    git,
+                    count: argv.withPreviousCommits
+                });
+                if (commitHistoryData) {
+                    commit_history = `## Commit History\n${commitHistoryData}`;
+                }
+            }
             const commitMsg = await executeChain({
                 llm,
                 prompt,
                 variables: {
                     summary: context,
                     format_instructions: formatInstructions,
-                    additional: additionalContext,
+                    additional_context: additional_context,
+                    commit_history: commit_history,
                 },
                 parser,
             });
@@ -6838,40 +6982,11 @@ const builder$1 = (yargs) => {
     return yargs.options(options$1).usage(getCommandUsageHeader(command$1));
 };
 
-/**
- * Formats a commit log into a readable string format.
- *
- * @param commitLog - The commit log result containing an array of commit details.
- * @returns An array of formatted commit log strings.
- *
- * Each formatted string includes:
- * - The date of the commit in square brackets.
- * - The commit message.
- * - The commit body.
- * - The commit hash in parentheses.
- * - The author's name and email in angle brackets.
- */
-const formatCommitLog = (commitLog) => {
-    return commitLog.all.map(({ message, date, body, author_name, hash, author_email }) => `[${date}] ${message}\n${body}\n(${hash}) - ${author_name}<${author_email}>`);
-};
-
 const getChangesByTimestamp = async ({ since, git }) => {
     const commitLog = await git.log({ '--since': since });
     return formatCommitLog(commitLog);
 };
 
-const getChangesSinceLastTag = async ({ git }) => {
-    const tags = await git.tags();
-    if (tags.all.length > 0) {
-        const lastTag = tags.latest;
-        const commitLog = await git.log({ from: lastTag });
-        return formatCommitLog(commitLog);
-    }
-    else {
-        return ['No tags found in the repository.'];
-    }
-};
-
 async function noResult$1({ logger }) {
     logger.log('No repo changes detected. 👀', { color: 'blue' });
 }
@@ -6881,12 +6996,12 @@ The summarization should descibe in a general sense what has changed in the repo
 
 Breaking down the changes into categories (e.g. bug fixes, new features, etc.) with markdown headings is encouraged.
 
-{timeframe}
+{{timeframe}}
 
-{format_instructions}
+{{format_instructions}}
 
-"""{changes}"""`;
-const inputVariables$1 = ['format_instructions', 'changes', 'timeframe'];
+"""{{changes}}"""`;
+const inputVariables$1 = ['timeframe', 'format_instructions', 'changes'];
 const RECAP_PROMPT = new prompts$1.PromptTemplate({
     template: template$1,
     inputVariables: inputVariables$1,
@@ -6903,10 +7018,13 @@ const handler$1 = async (argv, logger) => {
     }
     const tokenizer = await getTokenCounter(provider === 'openai' ? model : 'gpt-4o');
     const llm = getLlm(provider, model, config);
-    const INTERACTIVE = isInteractive(config);
+    const INTERACTIVE = argv.interactive || isInteractive(config);
     if (INTERACTIVE) {
         logger.log(LOGO);
     }
+    else {
+        logger.setConfig({ silent: true });
+    }
     const { 'last-month': lastMonth, 'last-tag': lastTag, yesterday, 'last-week': lastWeek } = argv;
     const timeframe = lastMonth
         ? 'last-month'
@@ -6965,7 +7083,7 @@ const handler$1 = async (argv, logger) => {
     async function parser(changes) {
         return changes.join('\n');
     }
-    await generateAndReviewLoop({
+    const recapResult = await generateAndReviewLoop({
         label: 'recap',
         options: {
             ...config,
@@ -6990,30 +7108,61 @@ const handler$1 = async (argv, logger) => {
         factory,
         parser,
         agent: async (context, options) => {
-            const parser = new output_parsers.JsonOutputParser();
-            const formatInstructions = "Respond with a valid JSON object, containing one field: 'summary', a string.";
+            const formatInstructions = 'Respond in a readable format. Include both high level and detailed information. Use markdown to format the response.';
             const prompt = getPrompt({
                 template: options.prompt,
                 variables: RECAP_PROMPT.inputVariables,
                 fallback: RECAP_PROMPT,
             });
-            const response = await executeChain({
-                llm,
-                prompt,
-                variables: {
-                    changes: context,
-                    format_instructions: formatInstructions,
-                    timeframe,
-                },
-                parser,
-            });
-            return `${response.summary || 'no response'}`;
+            try {
+                const stringParser = new output_parsers.StringOutputParser();
+                const response = (await executeChain({
+                    llm,
+                    prompt,
+                    variables: {
+                        changes: context,
+                        format_instructions: formatInstructions,
+                        timeframe,
+                    },
+                    // NOTE: parser is not optional and JSONOutputParser is expected, however making a union type for `executeChain` breaks type generation downstream.
+                    // In the future, we should consider making the parser optional in `executeChain` and better handle parser types.
+                    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+                    // @ts-expect-error - parser is not optional and JSONOutputParser is expected
+                    parser: stringParser,
+                }));
+                return `${response || 'no response'}`;
+            }
+            catch (error) {
+                const errorMessage = error instanceof Error ? error.message : String(error);
+                // Log the error but don't exit
+                logger.log(`Error parsing LLM response: ${errorMessage}`, { color: 'red' });
+                // Always return a fallback message instead of exiting
+                const fallbackMessage = `
+## Failed to parse the response [timeframe: ${timeframe}]
+- There are changes in the codebase that couldn't be properly summarized due to a technical issue.
+- LLM encountered issues when parsing the changes.
+
+### Error encountered
+
+${errorMessage}
+`;
+                return fallbackMessage;
+            }
         },
         noResult: async () => {
             await noResult$1({ git, logger });
             process.exit(0);
         },
     });
+    // Handle the result based on the mode (interactive or stdout)
+    const MODE = (INTERACTIVE && 'interactive') || (config.recap && 'interactive') || config?.mode || 'stdout'; // Default to stdout
+    handleResult({
+        result: recapResult,
+        interactiveModeCallback: async () => {
+            logSuccess();
+        },
+        mode: MODE,
+    });
 };
 
 var recap = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "git-coco",
-  "version": "0.14.7",
+  "version": "0.14.9",
   "description": "zero-effort git commits with coco.",
   "author": "gfargo <ghfargo@gmail.com>",
   "license": "MIT",
@@ -52,8 +52,8 @@
     "@types/async": "^3.2.20",
     "@types/chunk-text": "^1.0.0",
     "@types/common-tags": "^1.8.1",
-    "@types/diff": "^5.0.3",
-    "@types/ini": "^1.3.31",
+    "@types/diff": "^7.0.1",
+    "@types/ini": "^4.1.1",
     "@types/inquirer": "^9.0.3",
     "@types/jest": "^29.5.10",
     "@types/node": "^22.7.5",
@@ -93,14 +93,14 @@
     "ajv": "^8.16.0",
     "ajv-formats": "^3.0.1",
     "chalk": "4.1.2",
-    "diff": "5.2.0",
-    "ini": "4.1.1",
+    "diff": "7.0.0",
+    "ini": "5.0.0",
     "minimatch": "10.0.1",
     "ora": "5.4.1",
     "p-queue": "5.0.0",
     "performance-now": "2.1.0",
     "pretty-ms": "7.0.1",
-    "simple-git": "3.25.0",
+    "simple-git": "3.27.0",
     "tiktoken": "^1.0.17",
     "yargs": "17.7.2"
   }