git-coco 0.22.8 → 0.22.10

package/dist/index.esm.mjs

@@ -47,7 +47,7 @@ import { pathToFileURL } from 'url';
 /**
  * Current build version from package.json
  */
-const BUILD_VERSION = "0.22.8";
+const BUILD_VERSION = "0.22.10";
 
 const isInteractive = (config) => {
     return config?.mode === 'interactive' || !!config?.interactive;
@@ -7212,6 +7212,8 @@ const CONVENTIONAL_TEMPLATE = `Generate a commit message that strictly adheres t
    - Scope should be a noun in parentheses (e.g., (parser), (ui), (config))
    - Omit scope if the change is broad or affects multiple areas
 
+CRITICAL: You must respond with ONLY valid JSON. All string values must be properly quoted.
+
 Based on the following diff summary, generate a conventional commit message that follows these rules exactly:
 
 """"""
@@ -7838,7 +7840,7 @@ var changelog = {
     options: options$4,
 };
 
-const conventionalTypeRegex = /^(feat|fix|docs|style|refactor|perf|test|build|ci|chore|revert)(\(.+\))?:/;
+const conventionalTypeRegex = /^(feat|fix|docs|style|refactor|perf|test|build|ci|chore|revert)(\(.+\))?!?:/;
 // Regular commit message schema with basic validation
 const CommitMessageResponseSchema = objectType({
     title: stringType().describe("Title of the commit message"),
@@ -7955,6 +7957,55 @@ async function executeChainWithSchema(schema, llm, prompt, variables, options =
     }
 }
 
+/**
+ * Utility to repair common JSON formatting issues that LLMs make
+ * Specifically handles cases where string values are not properly quoted
+ */
+function repairJson(jsonString) {
+    // Remove any markdown code block wrapping
+    let cleaned = jsonString.replace(/```(?:json)?\s*([\s\S]*?)\s*```/g, '$1').trim();
+    // Remove inline code block wrapping
+    cleaned = cleaned.replace(/^`(.*)`$/, '$1').trim();
+    // If it doesn't look like JSON, return as-is
+    if (!cleaned.startsWith('{') || !cleaned.endsWith('}')) {
+        return jsonString;
+    }
+    try {
+        // First try parsing as-is
+        JSON.parse(cleaned);
+        return cleaned;
+    }
+    catch {
+        // Try to repair common issues
+        let repaired = cleaned;
+        // Fix unquoted string values in title and body fields
+        // Pattern: "title": unquoted_value, -> "title": "unquoted_value",
+        repaired = repaired.replace(/"(title|body)":\s*([^",\{\}\[\]]+?)(?=\s*[,\}])/g, (match, field, value) => {
+            // Clean up the value (remove leading/trailing whitespace)
+            const cleanValue = value.trim();
+            // If it's already quoted or looks like a number/boolean, leave it
+            if (cleanValue.startsWith('"') || /^(true|false|\d+)$/.test(cleanValue)) {
+                return match;
+            }
+            // Quote the value
+            return `"${field}": "${cleanValue}"`;
+        });
+        // Fix missing quotes around field names (though this should be rare)
+        repaired = repaired.replace(/([{,]\s*)([a-zA-Z_][a-zA-Z0-9_]*)\s*:/g, '$1"$2":');
+        // Remove trailing commas before closing braces
+        repaired = repaired.replace(/,(\s*[}\]])/g, '$1');
+        try {
+            // Test if the repair worked
+            JSON.parse(repaired);
+            return repaired;
+        }
+        catch {
+            // If repair failed, return original
+            return jsonString;
+        }
+    }
+}
+
 /**
  * Utility function to ensure commit messages are properly formatted as strings
  * rather than JSON objects, whether they come as parsed objects or stringified JSON
@@ -8004,7 +8055,23 @@ function formatCommitMessage(result, options = {}) {
                 }
             }
             catch {
-                // Not valid JSON, continue to fallback
+                // Try to repair the JSON and parse again
+                try {
+                    const repairedJson = repairJson(jsonString);
+                    const parsed = JSON.parse(repairedJson);
+                    if (parsed &&
+                        typeof parsed === 'object' &&
+                        typeof parsed.title === 'string' &&
+                        typeof parsed.body === 'string' &&
+                        parsed.title.length > 0 &&
+                        parsed.body.length > 0) {
+                        // Successfully repaired and parsed JSON
+                        return constructMessage(parsed.title, parsed.body);
+                    }
+                }
+                catch {
+                    // Repair failed, continue to fallback
+                }
             }
         }
         // If no JSON found and it's already formatted, return as-is
@@ -11495,12 +11562,23 @@ const handler$3 = async (argv, logger) => {
             const schema = USE_CONVENTIONAL_COMMITS
                 ? ConventionalCommitMessageResponseSchema
                 : CommitMessageResponseSchema;
-            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:
+            const formatInstructions = `CRITICAL: You must return ONLY a valid JSON object with no additional text, explanations, or markdown formatting.
+
+REQUIRED JSON FORMAT:
 ${schema.description}
+
+EXAMPLE (follow this exact structure):
 {
-  "title": "The commit title",
-  "body": "The commit body"
-}`;
+  "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:
+- ALL string values MUST be enclosed in double quotes
+- 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`;
             // Use conventional commit prompt if enabled
             const promptTemplate = USE_CONVENTIONAL_COMMITS ? CONVENTIONAL_COMMIT_PROMPT : COMMIT_PROMPT;
             const prompt = getPrompt({
@@ -12947,6 +13025,18 @@ function checkCommitlintAvailability() {
         try {
             // Try to resolve the package from the current working directory
             require.resolve(pkg, { paths: [process.cwd(), ...module.paths] });
+            // Additional check: try to actually load the config to catch ES module issues
+            try {
+                require(pkg);
+            }
+            catch (loadError) {
+                const loadErrorMessage = loadError instanceof Error ? loadError.message : String(loadError);
+                // If we can resolve but can't load due to ES module issues, treat as missing
+                if (loadErrorMessage.includes('Directory import') ||
+                    loadErrorMessage.includes('is not supported resolving ES modules')) {
+                    missingPackages.push(pkg);
+                }
+            }
         }
         catch (error) {
             missingPackages.push(pkg);
@@ -12961,6 +13051,15 @@ function checkCommitlintAvailability() {
         missingPackages,
     };
 }
+/**
+ * Check if we're in a pnpm environment with ES module issues
+ */
+function isPnpmEsModuleIssue(error) {
+    const message = error.message;
+    return (message.includes('Directory import') &&
+        message.includes('is not supported resolving ES modules') &&
+        message.includes('@commitlint/config-conventional'));
+}
 /**
  * Load commitlint configuration
  */
@@ -13007,8 +13106,14 @@ async function loadCommitlintConfig() {
         });
     }
     catch (error) {
-        // If @commitlint/config-conventional is not available, return a basic conventional config
-        if (error instanceof Error && error.message.includes('Cannot find module "@commitlint/config-conventional"')) {
+        if (!(error instanceof Error)) {
+            throw error;
+        }
+        // Handle various types of config-conventional loading errors
+        const isConfigConventionalError = error.message.includes('Cannot find module "@commitlint/config-conventional"') ||
+            isPnpmEsModuleIssue(error);
+        if (isConfigConventionalError) {
+            // Return a basic conventional config that matches @commitlint/config-conventional rules
             return await load({
                 rules: {
                     'header-max-length': [2, 'always', 72],
@@ -13137,9 +13242,26 @@ async function validateCommitMessage(message, options = {}) {
         };
     }
     catch (error) {
-        const errorMessage = error.message;
-        // Check if this is a missing dependency error
-        if (errorMessage.includes('Cannot find module "@commitlint/config-conventional"')) {
+        if (!(error instanceof Error)) {
+            return {
+                valid: false,
+                errors: [String(error)],
+                warnings: [],
+            };
+        }
+        // Check if this is a config-conventional related error (including pnpm ES module issues)
+        const isConfigConventionalError = error.message.includes('Cannot find module "@commitlint/config-conventional"') ||
+            isPnpmEsModuleIssue(error);
+        if (isConfigConventionalError) {
+            // For pnpm ES module issues, we should have already fallen back to built-in rules
+            // during config loading, so this shouldn't happen. But if it does, provide helpful info.
+            if (isPnpmEsModuleIssue(error)) {
+                return {
+                    valid: false,
+                    errors: ['pnpm ES module compatibility issue with @commitlint/config-conventional'],
+                    warnings: ['Try: pnpm add -D @commitlint/config-conventional@latest @commitlint/cli@latest'],
+                };
+            }
             return {
                 valid: false,
                 errors: ['Commitlint configuration requires @commitlint/config-conventional to be installed'],
@@ -13149,7 +13271,7 @@ async function validateCommitMessage(message, options = {}) {
         }
         return {
             valid: false,
-            errors: [errorMessage],
+            errors: [error.message],
             warnings: [],
         };
     }

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.8";
+const BUILD_VERSION = "0.22.10";
 
 const isInteractive = (config) => {
     return config?.mode === 'interactive' || !!config?.interactive;
@@ -7234,6 +7234,8 @@ const CONVENTIONAL_TEMPLATE = `Generate a commit message that strictly adheres t
    - Scope should be a noun in parentheses (e.g., (parser), (ui), (config))
    - Omit scope if the change is broad or affects multiple areas
 
+CRITICAL: You must respond with ONLY valid JSON. All string values must be properly quoted.
+
 Based on the following diff summary, generate a conventional commit message that follows these rules exactly:
 
 """"""
@@ -7860,7 +7862,7 @@ var changelog = {
     options: options$4,
 };
 
-const conventionalTypeRegex = /^(feat|fix|docs|style|refactor|perf|test|build|ci|chore|revert)(\(.+\))?:/;
+const conventionalTypeRegex = /^(feat|fix|docs|style|refactor|perf|test|build|ci|chore|revert)(\(.+\))?!?:/;
 // Regular commit message schema with basic validation
 const CommitMessageResponseSchema = objectType({
     title: stringType().describe("Title of the commit message"),
@@ -7977,6 +7979,55 @@ async function executeChainWithSchema(schema, llm, prompt, variables, options =
     }
 }
 
+/**
+ * Utility to repair common JSON formatting issues that LLMs make
+ * Specifically handles cases where string values are not properly quoted
+ */
+function repairJson(jsonString) {
+    // Remove any markdown code block wrapping
+    let cleaned = jsonString.replace(/```(?:json)?\s*([\s\S]*?)\s*```/g, '$1').trim();
+    // Remove inline code block wrapping
+    cleaned = cleaned.replace(/^`(.*)`$/, '$1').trim();
+    // If it doesn't look like JSON, return as-is
+    if (!cleaned.startsWith('{') || !cleaned.endsWith('}')) {
+        return jsonString;
+    }
+    try {
+        // First try parsing as-is
+        JSON.parse(cleaned);
+        return cleaned;
+    }
+    catch {
+        // Try to repair common issues
+        let repaired = cleaned;
+        // Fix unquoted string values in title and body fields
+        // Pattern: "title": unquoted_value, -> "title": "unquoted_value",
+        repaired = repaired.replace(/"(title|body)":\s*([^",\{\}\[\]]+?)(?=\s*[,\}])/g, (match, field, value) => {
+            // Clean up the value (remove leading/trailing whitespace)
+            const cleanValue = value.trim();
+            // If it's already quoted or looks like a number/boolean, leave it
+            if (cleanValue.startsWith('"') || /^(true|false|\d+)$/.test(cleanValue)) {
+                return match;
+            }
+            // Quote the value
+            return `"${field}": "${cleanValue}"`;
+        });
+        // Fix missing quotes around field names (though this should be rare)
+        repaired = repaired.replace(/([{,]\s*)([a-zA-Z_][a-zA-Z0-9_]*)\s*:/g, '$1"$2":');
+        // Remove trailing commas before closing braces
+        repaired = repaired.replace(/,(\s*[}\]])/g, '$1');
+        try {
+            // Test if the repair worked
+            JSON.parse(repaired);
+            return repaired;
+        }
+        catch {
+            // If repair failed, return original
+            return jsonString;
+        }
+    }
+}
+
 /**
  * Utility function to ensure commit messages are properly formatted as strings
  * rather than JSON objects, whether they come as parsed objects or stringified JSON
@@ -8026,7 +8077,23 @@ function formatCommitMessage(result, options = {}) {
                 }
             }
             catch {
-                // Not valid JSON, continue to fallback
+                // Try to repair the JSON and parse again
+                try {
+                    const repairedJson = repairJson(jsonString);
+                    const parsed = JSON.parse(repairedJson);
+                    if (parsed &&
+                        typeof parsed === 'object' &&
+                        typeof parsed.title === 'string' &&
+                        typeof parsed.body === 'string' &&
+                        parsed.title.length > 0 &&
+                        parsed.body.length > 0) {
+                        // Successfully repaired and parsed JSON
+                        return constructMessage(parsed.title, parsed.body);
+                    }
+                }
+                catch {
+                    // Repair failed, continue to fallback
+                }
             }
         }
         // If no JSON found and it's already formatted, return as-is
@@ -11517,12 +11584,23 @@ const handler$3 = async (argv, logger) => {
             const schema = USE_CONVENTIONAL_COMMITS
                 ? ConventionalCommitMessageResponseSchema
                 : CommitMessageResponseSchema;
-            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:
+            const formatInstructions = `CRITICAL: You must return ONLY a valid JSON object with no additional text, explanations, or markdown formatting.
+
+REQUIRED JSON FORMAT:
 ${schema.description}
+
+EXAMPLE (follow this exact structure):
 {
-  "title": "The commit title",
-  "body": "The commit body"
-}`;
+  "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:
+- ALL string values MUST be enclosed in double quotes
+- 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`;
             // Use conventional commit prompt if enabled
             const promptTemplate = USE_CONVENTIONAL_COMMITS ? CONVENTIONAL_COMMIT_PROMPT : COMMIT_PROMPT;
             const prompt = getPrompt({
@@ -12969,6 +13047,18 @@ function checkCommitlintAvailability() {
         try {
             // Try to resolve the package from the current working directory
             require.resolve(pkg, { paths: [process.cwd(), ...module.paths] });
+            // Additional check: try to actually load the config to catch ES module issues
+            try {
+                require(pkg);
+            }
+            catch (loadError) {
+                const loadErrorMessage = loadError instanceof Error ? loadError.message : String(loadError);
+                // If we can resolve but can't load due to ES module issues, treat as missing
+                if (loadErrorMessage.includes('Directory import') ||
+                    loadErrorMessage.includes('is not supported resolving ES modules')) {
+                    missingPackages.push(pkg);
+                }
+            }
         }
         catch (error) {
             missingPackages.push(pkg);
@@ -12983,6 +13073,15 @@ function checkCommitlintAvailability() {
         missingPackages,
     };
 }
+/**
+ * Check if we're in a pnpm environment with ES module issues
+ */
+function isPnpmEsModuleIssue(error) {
+    const message = error.message;
+    return (message.includes('Directory import') &&
+        message.includes('is not supported resolving ES modules') &&
+        message.includes('@commitlint/config-conventional'));
+}
 /**
  * Load commitlint configuration
  */
@@ -13029,8 +13128,14 @@ async function loadCommitlintConfig() {
         });
     }
     catch (error) {
-        // If @commitlint/config-conventional is not available, return a basic conventional config
-        if (error instanceof Error && error.message.includes('Cannot find module "@commitlint/config-conventional"')) {
+        if (!(error instanceof Error)) {
+            throw error;
+        }
+        // Handle various types of config-conventional loading errors
+        const isConfigConventionalError = error.message.includes('Cannot find module "@commitlint/config-conventional"') ||
+            isPnpmEsModuleIssue(error);
+        if (isConfigConventionalError) {
+            // Return a basic conventional config that matches @commitlint/config-conventional rules
             return await load({
                 rules: {
                     'header-max-length': [2, 'always', 72],
@@ -13159,9 +13264,26 @@ async function validateCommitMessage(message, options = {}) {
         };
     }
     catch (error) {
-        const errorMessage = error.message;
-        // Check if this is a missing dependency error
-        if (errorMessage.includes('Cannot find module "@commitlint/config-conventional"')) {
+        if (!(error instanceof Error)) {
+            return {
+                valid: false,
+                errors: [String(error)],
+                warnings: [],
+            };
+        }
+        // Check if this is a config-conventional related error (including pnpm ES module issues)
+        const isConfigConventionalError = error.message.includes('Cannot find module "@commitlint/config-conventional"') ||
+            isPnpmEsModuleIssue(error);
+        if (isConfigConventionalError) {
+            // For pnpm ES module issues, we should have already fallen back to built-in rules
+            // during config loading, so this shouldn't happen. But if it does, provide helpful info.
+            if (isPnpmEsModuleIssue(error)) {
+                return {
+                    valid: false,
+                    errors: ['pnpm ES module compatibility issue with @commitlint/config-conventional'],
+                    warnings: ['Try: pnpm add -D @commitlint/config-conventional@latest @commitlint/cli@latest'],
+                };
+            }
             return {
                 valid: false,
                 errors: ['Commitlint configuration requires @commitlint/config-conventional to be installed'],
@@ -13171,7 +13293,7 @@ async function validateCommitMessage(message, options = {}) {
         }
         return {
             valid: false,
-            errors: [errorMessage],
+            errors: [error.message],
             warnings: [],
         };
     }

package/package.json

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