git-coco 0.22.5 → 0.22.6

package/dist/index.esm.mjs

@@ -47,7 +47,7 @@ import { pathToFileURL } from 'url';
 /**
  * Current build version from package.json
  */
-const BUILD_VERSION = "0.22.5";
+const BUILD_VERSION = "0.22.6";
 
 const isInteractive = (config) => {
     return config?.mode === 'interactive' || !!config?.interactive;
@@ -7966,31 +7966,64 @@ async function executeChainWithSchema(schema, llm, prompt, variables, options =
  */
 function formatCommitMessage(result, options = {}) {
     const { append, ticketId, appendTicket } = options;
-    // If it's a string, check if it contains a JSON object
+    // Helper function to construct the final message with appends
+    const constructMessage = (title, body) => {
+        const appendedText = append ? `\n\n${append}` : '';
+        const ticketFooter = appendTicket && ticketId ? `\n\nPart of **${ticketId}**` : '';
+        return `${title}\n\n${body}${appendedText}${ticketFooter}`;
+    };
+    // If it's a string, check if it contains a JSON object (including markdown code blocks)
     if (typeof result === 'string') {
-        try {
-            // Try to parse as JSON to see if it's a stringified object
-            const parsed = JSON.parse(result);
-            if (parsed && typeof parsed === 'object' && parsed.title && parsed.body) {
-                // It's a stringified JSON object, format it properly
-                const appendedText = append ? `\n\n${append}` : '';
-                const ticketFooter = appendTicket && ticketId ? `\n\nPart of **${ticketId}**` : '';
-                return `${parsed.title}\n\n${parsed.body}${appendedText}${ticketFooter}`;
+        // Early return if string clearly doesn't contain JSON-like content
+        if (!result.includes('{') && !result.includes('"title"')) {
+            return result;
+        }
+        // Handle multiple markdown code block formats
+        const codeBlockPatterns = [
+            /```(?:json)?\s*(\{[\s\S]*?\})\s*```/, // Standard markdown blocks
+            /`(\{[\s\S]*?\})`/, // Inline code blocks
+            /^\s*(\{[\s\S]*\})\s*$/ // Raw JSON without blocks
+        ];
+        let jsonString = result;
+        // Try each pattern to extract JSON
+        for (const pattern of codeBlockPatterns) {
+            const match = result.match(pattern);
+            if (match && match[1]) {
+                jsonString = match[1].trim();
+                break;
             }
         }
-        catch {
-            // Not valid JSON, treat as regular string
+        // Only attempt JSON parsing if we found potential JSON content
+        if (jsonString !== result || jsonString.startsWith('{')) {
+            try {
+                // Try to parse as JSON to see if it's a stringified object
+                const parsed = JSON.parse(jsonString);
+                if (parsed &&
+                    typeof parsed === 'object' &&
+                    typeof parsed.title === 'string' &&
+                    typeof parsed.body === 'string' &&
+                    parsed.title.length > 0 &&
+                    parsed.body.length > 0) {
+                    // It's a valid stringified JSON object, format it properly
+                    return constructMessage(parsed.title, parsed.body);
+                }
+            }
+            catch {
+                // Not valid JSON, continue to fallback
+            }
         }
+        // If no JSON found and it's already formatted, return as-is
         return result;
     }
     // If it's already an object with title and body, format it
-    if (typeof result === 'object' && result !== null && 'title' in result && 'body' in result) {
+    if (typeof result === 'object' && result !== null &&
+        'title' in result && 'body' in result) {
         const commitMsgObj = result;
-        const appendedText = append ? `\n\n${append}` : '';
-        const ticketFooter = appendTicket && ticketId ? `\n\nPart of **${ticketId}**` : '';
-        return `${commitMsgObj.title}\n\n${commitMsgObj.body}${appendedText}${ticketFooter}`;
+        if (typeof commitMsgObj.title === 'string' && typeof commitMsgObj.body === 'string') {
+            return constructMessage(commitMsgObj.title, commitMsgObj.body);
+        }
     }
-    // Fallback - convert to string
+    // Fallback - convert to string and return as-is
     return String(result);
 }
 
@@ -11579,11 +11612,13 @@ ${schema.description}
                         });
                     },
                 });
-                // Construct the full commit message
-                const appendedText = argv.append ? `\n\n${argv.append}` : '';
+                // Construct the full commit message using the utility function
                 const ticketId = extractTicketIdFromBranchName(branchName);
-                const ticketFooter = argv.appendTicket && ticketId ? `\n\nPart of **${ticketId}**` : '';
-                const fullMessage = `${commitMsg.title}\n\n${commitMsg.body}${appendedText}${ticketFooter}`;
+                const fullMessage = formatCommitMessage(commitMsg, {
+                    append: argv.append,
+                    ticketId: ticketId || undefined,
+                    appendTicket: argv.appendTicket,
+                });
                 // 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; });
@@ -11666,13 +11701,8 @@ ${schema.description}
                     logger.verbose(`Retrying commit message generation (attempt ${attempt}): ${error.message}`, { color: 'yellow' });
                 },
             });
-            // Ensure we always return a properly formatted commit message string
-            const ticketId = extractTicketIdFromBranchName(branchName);
-            return formatCommitMessage(result, {
-                append: argv.append,
-                ticketId: ticketId || undefined,
-                appendTicket: argv.appendTicket,
-            });
+            // Return the result which is already a properly formatted commit message string
+            return result;
         },
         noResult: async () => {
             await noResult$2({ git, logger });

package/dist/index.js

@@ -69,7 +69,7 @@ var readline__namespace = /*#__PURE__*/_interopNamespaceDefault(readline);
 /**
  * Current build version from package.json
  */
-const BUILD_VERSION = "0.22.5";
+const BUILD_VERSION = "0.22.6";
 
 const isInteractive = (config) => {
     return config?.mode === 'interactive' || !!config?.interactive;
@@ -7988,31 +7988,64 @@ async function executeChainWithSchema(schema, llm, prompt, variables, options =
  */
 function formatCommitMessage(result, options = {}) {
     const { append, ticketId, appendTicket } = options;
-    // If it's a string, check if it contains a JSON object
+    // Helper function to construct the final message with appends
+    const constructMessage = (title, body) => {
+        const appendedText = append ? `\n\n${append}` : '';
+        const ticketFooter = appendTicket && ticketId ? `\n\nPart of **${ticketId}**` : '';
+        return `${title}\n\n${body}${appendedText}${ticketFooter}`;
+    };
+    // If it's a string, check if it contains a JSON object (including markdown code blocks)
     if (typeof result === 'string') {
-        try {
-            // Try to parse as JSON to see if it's a stringified object
-            const parsed = JSON.parse(result);
-            if (parsed && typeof parsed === 'object' && parsed.title && parsed.body) {
-                // It's a stringified JSON object, format it properly
-                const appendedText = append ? `\n\n${append}` : '';
-                const ticketFooter = appendTicket && ticketId ? `\n\nPart of **${ticketId}**` : '';
-                return `${parsed.title}\n\n${parsed.body}${appendedText}${ticketFooter}`;
+        // Early return if string clearly doesn't contain JSON-like content
+        if (!result.includes('{') && !result.includes('"title"')) {
+            return result;
+        }
+        // Handle multiple markdown code block formats
+        const codeBlockPatterns = [
+            /```(?:json)?\s*(\{[\s\S]*?\})\s*```/, // Standard markdown blocks
+            /`(\{[\s\S]*?\})`/, // Inline code blocks
+            /^\s*(\{[\s\S]*\})\s*$/ // Raw JSON without blocks
+        ];
+        let jsonString = result;
+        // Try each pattern to extract JSON
+        for (const pattern of codeBlockPatterns) {
+            const match = result.match(pattern);
+            if (match && match[1]) {
+                jsonString = match[1].trim();
+                break;
             }
         }
-        catch {
-            // Not valid JSON, treat as regular string
+        // Only attempt JSON parsing if we found potential JSON content
+        if (jsonString !== result || jsonString.startsWith('{')) {
+            try {
+                // Try to parse as JSON to see if it's a stringified object
+                const parsed = JSON.parse(jsonString);
+                if (parsed &&
+                    typeof parsed === 'object' &&
+                    typeof parsed.title === 'string' &&
+                    typeof parsed.body === 'string' &&
+                    parsed.title.length > 0 &&
+                    parsed.body.length > 0) {
+                    // It's a valid stringified JSON object, format it properly
+                    return constructMessage(parsed.title, parsed.body);
+                }
+            }
+            catch {
+                // Not valid JSON, continue to fallback
+            }
         }
+        // If no JSON found and it's already formatted, return as-is
         return result;
     }
     // If it's already an object with title and body, format it
-    if (typeof result === 'object' && result !== null && 'title' in result && 'body' in result) {
+    if (typeof result === 'object' && result !== null &&
+        'title' in result && 'body' in result) {
         const commitMsgObj = result;
-        const appendedText = append ? `\n\n${append}` : '';
-        const ticketFooter = appendTicket && ticketId ? `\n\nPart of **${ticketId}**` : '';
-        return `${commitMsgObj.title}\n\n${commitMsgObj.body}${appendedText}${ticketFooter}`;
+        if (typeof commitMsgObj.title === 'string' && typeof commitMsgObj.body === 'string') {
+            return constructMessage(commitMsgObj.title, commitMsgObj.body);
+        }
     }
-    // Fallback - convert to string
+    // Fallback - convert to string and return as-is
     return String(result);
 }
 
@@ -11601,11 +11634,13 @@ ${schema.description}
                         });
                     },
                 });
-                // Construct the full commit message
-                const appendedText = argv.append ? `\n\n${argv.append}` : '';
+                // Construct the full commit message using the utility function
                 const ticketId = extractTicketIdFromBranchName(branchName);
-                const ticketFooter = argv.appendTicket && ticketId ? `\n\nPart of **${ticketId}**` : '';
-                const fullMessage = `${commitMsg.title}\n\n${commitMsg.body}${appendedText}${ticketFooter}`;
+                const fullMessage = formatCommitMessage(commitMsg, {
+                    append: argv.append,
+                    ticketId: ticketId || undefined,
+                    appendTicket: argv.appendTicket,
+                });
                 // 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; });
@@ -11688,13 +11723,8 @@ ${schema.description}
                     logger.verbose(`Retrying commit message generation (attempt ${attempt}): ${error.message}`, { color: 'yellow' });
                 },
             });
-            // Ensure we always return a properly formatted commit message string
-            const ticketId = extractTicketIdFromBranchName(branchName);
-            return formatCommitMessage(result, {
-                append: argv.append,
-                ticketId: ticketId || undefined,
-                appendTicket: argv.appendTicket,
-            });
+            // Return the result which is already a properly formatted commit message string
+            return result;
         },
         noResult: async () => {
             await noResult$2({ git, logger });

package/package.json

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