git-coco 0.23.0 → 0.24.0

package/dist/index.d.ts

@@ -173,6 +173,7 @@ interface BaseCommandOptions extends BaseArgvOptions {
 interface ChangelogOptions extends BaseCommandOptions {
     range: string;
     branch: string;
+    tag: string;
     sinceLastTag: boolean;
     withDiff?: boolean;
     onlyDiff?: boolean;

package/dist/index.esm.mjs

@@ -47,7 +47,7 @@ import { pathToFileURL } from 'url';
 /**
  * Current build version from package.json
  */
-const BUILD_VERSION = "0.23.0";
+const BUILD_VERSION = "0.24.0";
 
 const isInteractive = (config) => {
     return config?.mode === 'interactive' || !!config?.interactive;
@@ -6058,9 +6058,13 @@ const options$4 = {
         alias: 'b',
         description: 'Target branch to compare against',
     },
+    tag: {
+        type: 'string',
+        alias: 't',
+        description: 'Target tag to compare against',
+    },
     sinceLastTag: {
         type: 'boolean',
-        alias: 't',
         description: 'Generate changelog for all commits since the last tag',
         default: false,
     },
@@ -7074,6 +7078,37 @@ async function getCommitLogAgainstBranch({ git, logger, targetBranch, }) {
     return [];
 }
 
+/**
+ * Retrieves the commit log between the current branch and a specified tag.
+ *
+ * @param {Object} options - The options for retrieving the commit log.
+ * @param {SimpleGit} options.git - The SimpleGit instance.
+ * @param {Logger} options.logger - The logger for logging messages.
+ * @param {string} options.targetTag - The tag to compare against.
+ * @returns {Promise<CommitDetails[]>} The array of commit messages in the commit log.
+ */
+async function getCommitLogAgainstTag({ git, logger, targetTag, }) {
+    try {
+        const currentBranch = await getCurrentBranchName({ git });
+        const uniqueCommits = (await git.raw(['rev-list', `${targetTag}..${currentBranch}`]))
+            .split('\n')
+            .filter(Boolean)
+            .reverse();
+        logger?.verbose(`Found ${uniqueCommits.length} unique commits between "${currentBranch}" and tag "${targetTag}"`, { color: 'blue' });
+        const firstCommit = uniqueCommits[0];
+        const lastCommit = uniqueCommits[uniqueCommits.length - 1];
+        if (!firstCommit || !lastCommit) {
+            logger?.log('Unable to determine first and last commit between branch and tag', { color: 'yellow' });
+            return [];
+        }
+        return await getCommitLogRangeDetails(firstCommit, lastCommit, { git, noMerges: true });
+    }
+    catch (error) {
+        logger?.log('Encountered an error getting commit log between branch and tag', { color: 'red' });
+    }
+    return [];
+}
+
 /**
  * Retrieves the commit log for the current branch.
  *
@@ -7692,6 +7727,15 @@ const handler$4 = async (argv, logger) => {
     const git = getRepo();
     const key = getApiKeyForModel(config);
     const { provider, model } = getModelAndProviderFromConfig(config);
+    const exclusiveOptions = [
+        argv.branch ? '--branch' : null,
+        argv.tag ? '--tag' : null,
+        config.sinceLastTag ? '--since-last-tag' : null,
+    ].filter(Boolean);
+    if (exclusiveOptions.length > 1) {
+        logger.log(`Options ${exclusiveOptions.join(', ')} cannot be used together.`, { color: 'red' });
+        process.exit(1);
+    }
     if (config.service.authentication.type !== 'None' && !key) {
         logger.log(`No API Key found. 🗝️🚪`, { color: 'red' });
         process.exit(1);
@@ -7733,6 +7777,10 @@ const handler$4 = async (argv, logger) => {
             logger.verbose(`Generating commit log against branch: ${argv.branch}`, { color: 'yellow' });
             commits = await getCommitLogAgainstBranch({ git, logger, targetBranch: argv.branch });
         }
+        else if (argv.tag) {
+            logger.verbose(`Generating commit log against tag: ${argv.tag}`, { color: 'yellow' });
+            commits = await getCommitLogAgainstTag({ git, logger, targetTag: argv.tag });
+        }
         else {
             logger.verbose(`No range, branch, or tag option provided. Defaulting to current branch`, {
                 color: 'yellow',
@@ -8006,6 +8054,45 @@ function repairJson(jsonString) {
     }
 }
 
+/**
+ * Extract the first complete JSON object from a string by tracking balanced braces
+ */
+function extractFirstJsonObject(text) {
+    const startIndex = text.indexOf('{');
+    if (startIndex === -1)
+        return null;
+    let braceCount = 0;
+    let inString = false;
+    let escapeNext = false;
+    for (let i = startIndex; i < text.length; i++) {
+        const char = text[i];
+        if (escapeNext) {
+            escapeNext = false;
+            continue;
+        }
+        if (char === '\\') {
+            escapeNext = true;
+            continue;
+        }
+        if (char === '"') {
+            inString = !inString;
+            continue;
+        }
+        if (inString)
+            continue;
+        if (char === '{') {
+            braceCount++;
+        }
+        else if (char === '}') {
+            braceCount--;
+            if (braceCount === 0) {
+                // Found the end of the first complete JSON object
+                return text.substring(startIndex, i + 1);
+            }
+        }
+    }
+    return null;
+}
 /**
  * Utility function to ensure commit messages are properly formatted as strings
  * rather than JSON objects, whether they come as parsed objects or stringified JSON
@@ -8024,23 +8111,26 @@ function formatCommitMessage(result, options = {}) {
         if (!result.includes('{') && !result.includes('"title"')) {
             return result;
         }
-        // Handle multiple markdown code block formats
-        const codeBlockPatterns = [
+        // Handle multiple markdown code block formats and embedded JSON
+        const extractionPatterns = [
             /```(?:json)?\s*(\{[\s\S]*?\})\s*```/, // Standard markdown blocks
             /`(\{[\s\S]*?\})`/, // Inline code blocks
-            /^\s*(\{[\s\S]*\})\s*$/ // Raw JSON without blocks
+            /^\s*(\{[\s\S]*\})\s*$/, // Raw JSON without blocks (entire string)
+            /(\{[\s\S]*?\})/ // JSON anywhere in text (fallback)
         ];
         let jsonString = result;
+        let foundMatch = false;
         // Try each pattern to extract JSON
-        for (const pattern of codeBlockPatterns) {
+        for (const pattern of extractionPatterns) {
             const match = result.match(pattern);
             if (match && match[1]) {
                 jsonString = match[1].trim();
+                foundMatch = true;
                 break;
             }
         }
         // Only attempt JSON parsing if we found potential JSON content
-        if (jsonString !== result || jsonString.startsWith('{')) {
+        if (foundMatch || jsonString.startsWith('{')) {
             try {
                 // Try to parse as JSON to see if it's a stringified object
                 const parsed = JSON.parse(jsonString);
@@ -8070,7 +8160,24 @@ function formatCommitMessage(result, options = {}) {
                     }
                 }
                 catch {
-                    // Repair failed, continue to fallback
+                    // Repair failed, try extracting just the first complete JSON object
+                    const firstObject = extractFirstJsonObject(jsonString);
+                    if (firstObject) {
+                        try {
+                            const parsed = JSON.parse(firstObject);
+                            if (parsed &&
+                                typeof parsed === 'object' &&
+                                typeof parsed.title === 'string' &&
+                                typeof parsed.body === 'string' &&
+                                parsed.title.length > 0 &&
+                                parsed.body.length > 0) {
+                                return constructMessage(parsed.title, parsed.body);
+                            }
+                        }
+                        catch {
+                            // Even first object extraction failed, continue to fallback
+                        }
+                    }
                 }
             }
         }
@@ -11571,18 +11678,16 @@ const handler$3 = async (argv, logger) => {
 REQUIRED JSON FORMAT:
 ${schema.description}
 
-EXAMPLE (follow this exact structure):
-{
-  "title": "feat(auth): add user authentication system",
-  "body": "Implement JWT-based authentication with login and logout functionality. Includes password hashing and session management."
-}
+EXAMPLE (follow this EXACT format - compact JSON on a single line or minimal whitespace):
+{"title": "feat(auth): add user authentication system", "body": "Implement JWT-based authentication with login and logout functionality. Includes password hashing and session management."}
 
 IMPORTANT RULES:
+- Return ONLY the JSON object - NO markdown code blocks, NO backticks, NO extra text
 - ALL string values MUST be enclosed in double quotes
+- Use compact JSON format (minimal whitespace) for best compatibility
 - NO trailing commas
 - NO comments or additional text outside the JSON
-- The "title" and "body" values must be properly quoted strings
-- Return ONLY the JSON object, nothing else`;
+- The "title" and "body" values must be properly quoted strings`;
             // Use conventional commit prompt if enabled
             const promptTemplate = USE_CONVENTIONAL_COMMITS ? CONVENTIONAL_COMMIT_PROMPT : COMMIT_PROMPT;
             const prompt = getPrompt({
@@ -11676,10 +11781,33 @@ IMPORTANT RULES:
                             logger.verbose(`Failed to parse commit message (attempt ${attempt}/${maxAttempts}): ${error.message}`, { color: 'yellow' });
                         },
                     },
-                    fallbackParser: (text) => ({
-                        title: text.split('\n')[0] || 'Auto-generated commit',
-                        body: text.split('\n').slice(1).join('\n') || 'Generated commit message',
-                    }),
+                    fallbackParser: (text) => {
+                        // First try to parse as JSON in case it's valid JSON with unusual formatting
+                        try {
+                            // Remove markdown code blocks if present
+                            let cleanText = text.trim();
+                            const codeBlockMatch = cleanText.match(/```(?:json)?\s*(\{[\s\S]*?\})\s*```/);
+                            if (codeBlockMatch && codeBlockMatch[1]) {
+                                cleanText = codeBlockMatch[1].trim();
+                            }
+                            const parsed = JSON.parse(cleanText);
+                            if (parsed &&
+                                typeof parsed === 'object' &&
+                                typeof parsed.title === 'string' &&
+                                typeof parsed.body === 'string' &&
+                                parsed.title.length > 0) {
+                                return parsed;
+                            }
+                        }
+                        catch {
+                            // JSON parsing failed, fall through to text splitting
+                        }
+                        // Fallback to simple text splitting
+                        return {
+                            title: text.split('\n')[0] || 'Auto-generated commit',
+                            body: text.split('\n').slice(1).join('\n') || 'Generated commit message',
+                        };
+                    },
                     onFallback: () => {
                         logger.verbose('Max retry attempts reached. Falling back to simple text output.', {
                             color: 'red',
@@ -11688,11 +11816,15 @@ IMPORTANT RULES:
                 });
                 // Construct the full commit message using the utility function
                 const ticketId = extractTicketIdFromBranchName(branchName);
+                // Debug: Log what commitMsg looks like before formatting
+                logger.verbose(`commitMsg before formatting: ${JSON.stringify(commitMsg)}`, { color: 'blue' });
                 const fullMessage = formatCommitMessage(commitMsg, {
                     append: argv.append,
                     ticketId: ticketId || undefined,
                     appendTicket: argv.appendTicket,
                 });
+                // Debug: Log what fullMessage looks like after formatting
+                logger.verbose(`fullMessage after formatting: ${typeof fullMessage === 'string' ? fullMessage : JSON.stringify(fullMessage)}`, { color: 'blue' });
                 // If commitlint validation is needed and not skipped, validate the message
                 if ((USE_CONVENTIONAL_COMMITS || hasCommitLintConfig) && !shouldSkipCommitlintValidation) {
                     const { validateCommitMessage, CommitlintValidationError } = await Promise.resolve().then(function () { return commitlintValidator; });

package/dist/index.js

@@ -69,7 +69,7 @@ var readline__namespace = /*#__PURE__*/_interopNamespaceDefault(readline);
 /**
  * Current build version from package.json
  */
-const BUILD_VERSION = "0.23.0";
+const BUILD_VERSION = "0.24.0";
 
 const isInteractive = (config) => {
     return config?.mode === 'interactive' || !!config?.interactive;
@@ -6080,9 +6080,13 @@ const options$4 = {
         alias: 'b',
         description: 'Target branch to compare against',
     },
+    tag: {
+        type: 'string',
+        alias: 't',
+        description: 'Target tag to compare against',
+    },
     sinceLastTag: {
         type: 'boolean',
-        alias: 't',
         description: 'Generate changelog for all commits since the last tag',
         default: false,
     },
@@ -7096,6 +7100,37 @@ async function getCommitLogAgainstBranch({ git, logger, targetBranch, }) {
     return [];
 }
 
+/**
+ * Retrieves the commit log between the current branch and a specified tag.
+ *
+ * @param {Object} options - The options for retrieving the commit log.
+ * @param {SimpleGit} options.git - The SimpleGit instance.
+ * @param {Logger} options.logger - The logger for logging messages.
+ * @param {string} options.targetTag - The tag to compare against.
+ * @returns {Promise<CommitDetails[]>} The array of commit messages in the commit log.
+ */
+async function getCommitLogAgainstTag({ git, logger, targetTag, }) {
+    try {
+        const currentBranch = await getCurrentBranchName({ git });
+        const uniqueCommits = (await git.raw(['rev-list', `${targetTag}..${currentBranch}`]))
+            .split('\n')
+            .filter(Boolean)
+            .reverse();
+        logger?.verbose(`Found ${uniqueCommits.length} unique commits between "${currentBranch}" and tag "${targetTag}"`, { color: 'blue' });
+        const firstCommit = uniqueCommits[0];
+        const lastCommit = uniqueCommits[uniqueCommits.length - 1];
+        if (!firstCommit || !lastCommit) {
+            logger?.log('Unable to determine first and last commit between branch and tag', { color: 'yellow' });
+            return [];
+        }
+        return await getCommitLogRangeDetails(firstCommit, lastCommit, { git, noMerges: true });
+    }
+    catch (error) {
+        logger?.log('Encountered an error getting commit log between branch and tag', { color: 'red' });
+    }
+    return [];
+}
+
 /**
  * Retrieves the commit log for the current branch.
  *
@@ -7714,6 +7749,15 @@ const handler$4 = async (argv, logger) => {
     const git = getRepo();
     const key = getApiKeyForModel(config);
     const { provider, model } = getModelAndProviderFromConfig(config);
+    const exclusiveOptions = [
+        argv.branch ? '--branch' : null,
+        argv.tag ? '--tag' : null,
+        config.sinceLastTag ? '--since-last-tag' : null,
+    ].filter(Boolean);
+    if (exclusiveOptions.length > 1) {
+        logger.log(`Options ${exclusiveOptions.join(', ')} cannot be used together.`, { color: 'red' });
+        process.exit(1);
+    }
     if (config.service.authentication.type !== 'None' && !key) {
         logger.log(`No API Key found. 🗝️🚪`, { color: 'red' });
         process.exit(1);
@@ -7755,6 +7799,10 @@ const handler$4 = async (argv, logger) => {
             logger.verbose(`Generating commit log against branch: ${argv.branch}`, { color: 'yellow' });
             commits = await getCommitLogAgainstBranch({ git, logger, targetBranch: argv.branch });
         }
+        else if (argv.tag) {
+            logger.verbose(`Generating commit log against tag: ${argv.tag}`, { color: 'yellow' });
+            commits = await getCommitLogAgainstTag({ git, logger, targetTag: argv.tag });
+        }
         else {
             logger.verbose(`No range, branch, or tag option provided. Defaulting to current branch`, {
                 color: 'yellow',
@@ -8028,6 +8076,45 @@ function repairJson(jsonString) {
     }
 }
 
+/**
+ * Extract the first complete JSON object from a string by tracking balanced braces
+ */
+function extractFirstJsonObject(text) {
+    const startIndex = text.indexOf('{');
+    if (startIndex === -1)
+        return null;
+    let braceCount = 0;
+    let inString = false;
+    let escapeNext = false;
+    for (let i = startIndex; i < text.length; i++) {
+        const char = text[i];
+        if (escapeNext) {
+            escapeNext = false;
+            continue;
+        }
+        if (char === '\\') {
+            escapeNext = true;
+            continue;
+        }
+        if (char === '"') {
+            inString = !inString;
+            continue;
+        }
+        if (inString)
+            continue;
+        if (char === '{') {
+            braceCount++;
+        }
+        else if (char === '}') {
+            braceCount--;
+            if (braceCount === 0) {
+                // Found the end of the first complete JSON object
+                return text.substring(startIndex, i + 1);
+            }
+        }
+    }
+    return null;
+}
 /**
  * Utility function to ensure commit messages are properly formatted as strings
  * rather than JSON objects, whether they come as parsed objects or stringified JSON
@@ -8046,23 +8133,26 @@ function formatCommitMessage(result, options = {}) {
         if (!result.includes('{') && !result.includes('"title"')) {
             return result;
         }
-        // Handle multiple markdown code block formats
-        const codeBlockPatterns = [
+        // Handle multiple markdown code block formats and embedded JSON
+        const extractionPatterns = [
             /```(?:json)?\s*(\{[\s\S]*?\})\s*```/, // Standard markdown blocks
             /`(\{[\s\S]*?\})`/, // Inline code blocks
-            /^\s*(\{[\s\S]*\})\s*$/ // Raw JSON without blocks
+            /^\s*(\{[\s\S]*\})\s*$/, // Raw JSON without blocks (entire string)
+            /(\{[\s\S]*?\})/ // JSON anywhere in text (fallback)
         ];
         let jsonString = result;
+        let foundMatch = false;
         // Try each pattern to extract JSON
-        for (const pattern of codeBlockPatterns) {
+        for (const pattern of extractionPatterns) {
             const match = result.match(pattern);
             if (match && match[1]) {
                 jsonString = match[1].trim();
+                foundMatch = true;
                 break;
             }
         }
         // Only attempt JSON parsing if we found potential JSON content
-        if (jsonString !== result || jsonString.startsWith('{')) {
+        if (foundMatch || jsonString.startsWith('{')) {
             try {
                 // Try to parse as JSON to see if it's a stringified object
                 const parsed = JSON.parse(jsonString);
@@ -8092,7 +8182,24 @@ function formatCommitMessage(result, options = {}) {
                     }
                 }
                 catch {
-                    // Repair failed, continue to fallback
+                    // Repair failed, try extracting just the first complete JSON object
+                    const firstObject = extractFirstJsonObject(jsonString);
+                    if (firstObject) {
+                        try {
+                            const parsed = JSON.parse(firstObject);
+                            if (parsed &&
+                                typeof parsed === 'object' &&
+                                typeof parsed.title === 'string' &&
+                                typeof parsed.body === 'string' &&
+                                parsed.title.length > 0 &&
+                                parsed.body.length > 0) {
+                                return constructMessage(parsed.title, parsed.body);
+                            }
+                        }
+                        catch {
+                            // Even first object extraction failed, continue to fallback
+                        }
+                    }
                 }
             }
         }
@@ -11593,18 +11700,16 @@ const handler$3 = async (argv, logger) => {
 REQUIRED JSON FORMAT:
 ${schema.description}
 
-EXAMPLE (follow this exact structure):
-{
-  "title": "feat(auth): add user authentication system",
-  "body": "Implement JWT-based authentication with login and logout functionality. Includes password hashing and session management."
-}
+EXAMPLE (follow this EXACT format - compact JSON on a single line or minimal whitespace):
+{"title": "feat(auth): add user authentication system", "body": "Implement JWT-based authentication with login and logout functionality. Includes password hashing and session management."}
 
 IMPORTANT RULES:
+- Return ONLY the JSON object - NO markdown code blocks, NO backticks, NO extra text
 - ALL string values MUST be enclosed in double quotes
+- Use compact JSON format (minimal whitespace) for best compatibility
 - NO trailing commas
 - NO comments or additional text outside the JSON
-- The "title" and "body" values must be properly quoted strings
-- Return ONLY the JSON object, nothing else`;
+- The "title" and "body" values must be properly quoted strings`;
             // Use conventional commit prompt if enabled
             const promptTemplate = USE_CONVENTIONAL_COMMITS ? CONVENTIONAL_COMMIT_PROMPT : COMMIT_PROMPT;
             const prompt = getPrompt({
@@ -11698,10 +11803,33 @@ IMPORTANT RULES:
                             logger.verbose(`Failed to parse commit message (attempt ${attempt}/${maxAttempts}): ${error.message}`, { color: 'yellow' });
                         },
                     },
-                    fallbackParser: (text) => ({
-                        title: text.split('\n')[0] || 'Auto-generated commit',
-                        body: text.split('\n').slice(1).join('\n') || 'Generated commit message',
-                    }),
+                    fallbackParser: (text) => {
+                        // First try to parse as JSON in case it's valid JSON with unusual formatting
+                        try {
+                            // Remove markdown code blocks if present
+                            let cleanText = text.trim();
+                            const codeBlockMatch = cleanText.match(/```(?:json)?\s*(\{[\s\S]*?\})\s*```/);
+                            if (codeBlockMatch && codeBlockMatch[1]) {
+                                cleanText = codeBlockMatch[1].trim();
+                            }
+                            const parsed = JSON.parse(cleanText);
+                            if (parsed &&
+                                typeof parsed === 'object' &&
+                                typeof parsed.title === 'string' &&
+                                typeof parsed.body === 'string' &&
+                                parsed.title.length > 0) {
+                                return parsed;
+                            }
+                        }
+                        catch {
+                            // JSON parsing failed, fall through to text splitting
+                        }
+                        // Fallback to simple text splitting
+                        return {
+                            title: text.split('\n')[0] || 'Auto-generated commit',
+                            body: text.split('\n').slice(1).join('\n') || 'Generated commit message',
+                        };
+                    },
                     onFallback: () => {
                         logger.verbose('Max retry attempts reached. Falling back to simple text output.', {
                             color: 'red',
@@ -11710,11 +11838,15 @@ IMPORTANT RULES:
                 });
                 // Construct the full commit message using the utility function
                 const ticketId = extractTicketIdFromBranchName(branchName);
+                // Debug: Log what commitMsg looks like before formatting
+                logger.verbose(`commitMsg before formatting: ${JSON.stringify(commitMsg)}`, { color: 'blue' });
                 const fullMessage = formatCommitMessage(commitMsg, {
                     append: argv.append,
                     ticketId: ticketId || undefined,
                     appendTicket: argv.appendTicket,
                 });
+                // Debug: Log what fullMessage looks like after formatting
+                logger.verbose(`fullMessage after formatting: ${typeof fullMessage === 'string' ? fullMessage : JSON.stringify(fullMessage)}`, { color: 'blue' });
                 // If commitlint validation is needed and not skipped, validate the message
                 if ((USE_CONVENTIONAL_COMMITS || hasCommitLintConfig) && !shouldSkipCommitlintValidation) {
                     const { validateCommitMessage, CommitlintValidationError } = await Promise.resolve().then(function () { return commitlintValidator; });

package/package.json

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