gitcoach-cli 1.0.15 → 1.1.1

package/README.md

@@ -315,4 +315,5 @@ Built for the [GitHub Copilot CLI Challenge 2026](https://dev.to/challenges/gith
 
 ## License
 
-MIT
+MIT// GitCoach Demo
+

package/dist/i18n/locales/en.json

@@ -225,6 +225,9 @@
       "keepRemote": "Keep the remote version",
       "keepBoth": "Keep both (combine)",
       "editManually": "Edit manually in my editor",
+    "askCopilot": "Ask Copilot AI",
+    "acceptSuggestion": "Accept this suggestion?",
+    "copilotSuggests": "Copilot suggests",
       "fileResolved": "{{file}} resolved ({{current}}/{{total}})",
       "allResolved": "All {{count}} conflict(s) resolved!",
       "finalizeCommit": "Finalize the merge with git commit?",
@@ -559,6 +562,12 @@
     "select": "Select an option",
     "enterValue": "Enter value"
   },
+  "copilot": {
+    "aiExplanation": "Copilot explains",
+    "analyzing": "Analyzing error...",
+    "analyzingChanges": "Analyzing changes...",
+    "diffSummary": "Changes summary"
+  },
   "detachedHead": {
     "title": "Detached HEAD",
     "explanation": "You are in a detached HEAD state.\n\nThis means you are not on any branch. Your commits may be lost if you switch branches.\n\nThis often happens after an interrupted rebase or checking out a specific commit.",

package/dist/i18n/locales/es.json

@@ -225,6 +225,9 @@
       "keepRemote": "Conservar la version remota",
       "keepBoth": "Conservar ambas (combinar)",
       "editManually": "Editar manualmente en mi editor",
+    "askCopilot": "Preguntar a Copilot IA",
+    "acceptSuggestion": "Aceptar esta sugerencia?",
+    "copilotSuggests": "Copilot sugiere",
       "fileResolved": "{{file}} resuelto ({{current}}/{{total}})",
       "allResolved": "Los {{count}} conflicto(s) han sido resueltos!",
       "finalizeCommit": "Finalizar el merge con git commit?",
@@ -559,6 +562,12 @@
     "select": "Selecciona una opcion",
     "enterValue": "Ingresa un valor"
   },
+  "copilot": {
+    "aiExplanation": "Copilot explica",
+    "analyzing": "Analizando error...",
+    "analyzingChanges": "Analizando cambios...",
+    "diffSummary": "Resumen de cambios"
+  },
   "detachedHead": {
     "title": "HEAD Separado",
     "explanation": "Estas en un estado HEAD separado.\n\nEsto significa que no estas en ninguna rama. Tus commits pueden perderse si cambias de rama.\n\nEsto suele ocurrir despues de un rebase interrumpido o al hacer checkout de un commit especifico.",

package/dist/i18n/locales/fr.json

@@ -225,6 +225,9 @@
       "keepRemote": "Garder la version distante",
       "keepBoth": "Garder les deux (combiner)",
       "editManually": "Editer manuellement dans mon editeur",
+    "askCopilot": "Demander a Copilot IA",
+    "acceptSuggestion": "Accepter cette suggestion ?",
+    "copilotSuggests": "Copilot suggere",
       "fileResolved": "{{file}} resolu ({{current}}/{{total}})",
       "allResolved": "Les {{count}} conflit(s) ont ete resolus !",
       "finalizeCommit": "Finaliser le merge avec git commit ?",
@@ -559,6 +562,12 @@
     "select": "Selectionnez une option",
     "enterValue": "Entrez une valeur"
   },
+  "copilot": {
+    "aiExplanation": "Copilot explique",
+    "analyzing": "Analyse de l'erreur...",
+    "analyzingChanges": "Analyse des changements...",
+    "diffSummary": "Resume des changements"
+  },
   "detachedHead": {
     "title": "HEAD Detache",
     "explanation": "Vous etes en etat HEAD detache.\n\nCela signifie que vous n'etes sur aucune branche. Vos commits risquent d'etre perdus si vous changez de branche.\n\nCela arrive souvent apres un rebase interrompu ou un checkout d'un commit specifique.",

package/dist/services/copilot-service.d.ts

@@ -3,8 +3,14 @@ export interface CopilotSuggestion {
     message: string;
     command?: string;
 }
+export interface ConflictResolutionSuggestion {
+    recommendation: 'local' | 'remote' | 'both' | 'custom';
+    explanation: string;
+    customContent?: string;
+}
 declare class CopilotService {
     private available;
+    private getLanguageInstruction;
     isAvailable(): Promise<boolean>;
     resetAvailability(): void;
     /**
@@ -28,7 +34,28 @@ declare class CopilotService {
     /**
      * Explain a Git error and suggest solutions
      */
-    explainGitError(errorMessage: string, command?: string): Promise<CopilotSuggestion>;
+    explainGitError(errorMessage: string, context?: {
+        command?: string;
+        branch?: string;
+        hasUncommitted?: boolean;
+    }): Promise<CopilotSuggestion>;
+    /**
+     * Suggest how to resolve a merge conflict
+     */
+    suggestConflictResolution(fileName: string, localVersion: string, remoteVersion: string, context?: {
+        branch?: string;
+        remoteBranch?: string;
+    }): Promise<ConflictResolutionSuggestion | null>;
+    private parseConflictSuggestion;
+    /**
+     * Summarize staged diff in plain language
+     */
+    summarizeStagedDiff(diff: string): Promise<string | null>;
+    /**
+     * Checks if parsed output looks like a CLI error rather than a real answer.
+     * Returns true when the content should be discarded.
+     */
+    private looksLikeError;
     private executeWithRetry;
     private parseAnswer;
     private parseCommitMessage;

package/dist/services/copilot-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"copilot-service.d.ts","sourceRoot":"","sources":["../../src/services/copilot-service.ts"],"names":[],"mappings":"AAkBA,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,cAAM,cAAc;IAClB,OAAO,CAAC,SAAS,CAAwB;IAEnC,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAwBrC,iBAAiB,IAAI,IAAI;IAIzB;;;OAGG;IACG,iBAAiB,IAAI,OAAO,CAAC;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IAoCnE,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC;IA4DrE,OAAO,CAAC,aAAa;IAuCrB,OAAO,CAAC,cAAc;IAUhB,cAAc,CAClB,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,MAAM,EAAE,EACrB,aAAa,EAAE,MAAM,EAAE,GACtB,OAAO,CAAC,iBAAiB,CAAC;IA+BvB,eAAe,CACnB,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,MAAM,EACrB,cAAc,EAAE,OAAO,GACtB,OAAO,CAAC,iBAAiB,CAAC;IA+BvB,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC;IA8BjE;;OAEG;IACG,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC;IA0ClE;;OAEG;IACG,eAAe,CAAC,YAAY,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC;YA8C3E,gBAAgB;IAiB9B,OAAO,CAAC,WAAW;IAuCnB,OAAO,CAAC,kBAAkB;IAuE1B,OAAO,CAAC,eAAe;CAiCxB;AAED,eAAO,MAAM,cAAc,gBAAuB,CAAC;AACnD,eAAe,cAAc,CAAC"}
+{"version":3,"file":"copilot-service.d.ts","sourceRoot":"","sources":["../../src/services/copilot-service.ts"],"names":[],"mappings":"AAmBA,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,4BAA4B;IAC3C,cAAc,EAAE,OAAO,GAAG,QAAQ,GAAG,MAAM,GAAG,QAAQ,CAAC;IACvD,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,cAAM,cAAc;IAClB,OAAO,CAAC,SAAS,CAAwB;IAEzC,OAAO,CAAC,sBAAsB;IAUxB,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAwBrC,iBAAiB,IAAI,IAAI;IAIzB;;;OAGG;IACG,iBAAiB,IAAI,OAAO,CAAC;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IAoCnE,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC;IA4DrE,OAAO,CAAC,aAAa;IAuCrB,OAAO,CAAC,cAAc;IAUhB,cAAc,CAClB,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,MAAM,EAAE,EACrB,aAAa,EAAE,MAAM,EAAE,GACtB,OAAO,CAAC,iBAAiB,CAAC;IA+BvB,eAAe,CACnB,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,MAAM,EACrB,cAAc,EAAE,OAAO,GACtB,OAAO,CAAC,iBAAiB,CAAC;IA+BvB,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC;IA8BjE;;OAEG;IACG,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC;IA0ClE;;OAEG;IACG,eAAe,CAAC,YAAY,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;QACpD,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,cAAc,CAAC,EAAE,OAAO,CAAC;KAC1B,GAAG,OAAO,CAAC,iBAAiB,CAAC;IA2C9B;;OAEG;IACG,yBAAyB,CAC7B,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,EACpB,aAAa,EAAE,MAAM,EACrB,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,YAAY,CAAC,EAAE,MAAM,CAAA;KAAE,GACnD,OAAO,CAAC,4BAA4B,GAAG,IAAI,CAAC;IAyC/C,OAAO,CAAC,uBAAuB;IAuD/B;;OAEG;IACG,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAwC/D;;;OAGG;IACH,OAAO,CAAC,cAAc;YAwBR,gBAAgB;IAiB9B,OAAO,CAAC,WAAW;IAuCnB,OAAO,CAAC,kBAAkB;IAuE1B,OAAO,CAAC,eAAe;CAiCxB;AAED,eAAO,MAAM,cAAc,gBAAuB,CAAC;AACnD,eAAe,cAAc,CAAC"}

package/dist/services/copilot-service.js

@@ -1,6 +1,7 @@
 import { executeCommand, sleep } from '../utils/helpers.js';
 import { logger } from '../utils/logger.js';
 import { t } from '../i18n/index.js';
+import i18next from 'i18next';
 const COPILOT_TIMEOUT_MS = 30000;
 const COPILOT_RETRY_DELAY_MS = 1000;
 const COPILOT_MAX_RETRIES = 1;
@@ -15,6 +16,15 @@ function getCopilotCommand() {
 }
 class CopilotService {
     available = null;
+    getLanguageInstruction() {
+        const lang = i18next.language || 'en';
+        const langMap = {
+            en: 'English',
+            fr: 'French',
+            es: 'Spanish'
+        };
+        return `Reply in ${langMap[lang] || 'English'}.`;
+    }
     async isAvailable() {
         if (this.available !== null) {
             return this.available;
@@ -90,7 +100,7 @@ class CopilotService {
             // Summarize the diff for the prompt (extract file names only for safety)
             const diffSummary = this.summarizeDiff(diff);
             // Build a simple prompt - keep it clean with only alphanumeric chars
-            const prompt = `Generate a conventional commit message for these file changes: ${diffSummary}. Use format type: description where type is feat fix docs refactor test or chore. Reply with only the commit message.`;
+            const prompt = `Generate a conventional commit message for these file changes: ${diffSummary}. Use format type: description where type is feat fix docs refactor test or chore. Reply with only the commit message. ${this.getLanguageInstruction()}`;
             logger.debug('Copilot prompt:', prompt);
             // Use copilot CLI in non-interactive mode with silent output
             const result = await this.executeWithRetry(`${getCopilotCommand()} -p "${this.escapeForShell(prompt)}" -s`, COPILOT_TIMEOUT_MS);
@@ -171,7 +181,7 @@ class CopilotService {
         }
         try {
             const context = `Branch: ${branch}. Staged files: ${stagedFiles.join(', ') || 'none'}. Modified files: ${modifiedFiles.join(', ') || 'none'}.`;
-            const prompt = `Given this git state: ${context} What should the user do next? Reply with a single brief suggestion in one sentence.`;
+            const prompt = `Given this git state: ${context} What should the user do next? Reply with a single brief suggestion in one sentence. ${this.getLanguageInstruction()}`;
             const { stdout, stderr } = await executeCommand(`${getCopilotCommand()} -p "${this.escapeForShell(prompt)}" -s`, COPILOT_TIMEOUT_MS);
             const suggestion = this.parseSuggestion(stdout, stderr);
             return {
@@ -195,7 +205,7 @@ class CopilotService {
         }
         try {
             const context = `Action: ${action}. Branch: ${currentBranch}. Uncommitted changes: ${hasUncommitted}.`;
-            const prompt = `Will this git action cause problems? ${context} Reply briefly in one sentence.`;
+            const prompt = `Will this git action cause problems? ${context} Reply briefly in one sentence. ${this.getLanguageInstruction()}`;
             const { stdout, stderr } = await executeCommand(`${getCopilotCommand()} -p "${this.escapeForShell(prompt)}" -s`, COPILOT_TIMEOUT_MS);
             const prediction = this.parseSuggestion(stdout, stderr);
             return {
@@ -218,7 +228,7 @@ class CopilotService {
             };
         }
         try {
-            const prompt = `Explain this Git concept briefly for a beginner in 2-3 sentences: ${concept}`;
+            const prompt = `Explain this Git concept briefly for a beginner in 2-3 sentences: ${concept} ${this.getLanguageInstruction()}`;
             const { stdout, stderr } = await executeCommand(`${getCopilotCommand()} -p "${this.escapeForShell(prompt)}" -s`, COPILOT_TIMEOUT_MS);
             const explanation = this.parseSuggestion(stdout, stderr);
             return {
@@ -254,7 +264,7 @@ class CopilotService {
 
 Question: ${question}
 
-Provide a helpful answer in 2-4 sentences. If relevant, include the Git command.`;
+Provide a helpful answer in 2-4 sentences. If relevant, include the Git command. ${this.getLanguageInstruction()}`;
             const { stdout, stderr } = await executeCommand(`${getCopilotCommand()} -p "${this.escapeForShell(prompt)}" -s`, COPILOT_TIMEOUT_MS);
             const answer = this.parseAnswer(stdout, stderr);
             return {
@@ -273,7 +283,7 @@ Provide a helpful answer in 2-4 sentences. If relevant, include the Git command.
     /**
      * Explain a Git error and suggest solutions
      */
-    async explainGitError(errorMessage, command) {
+    async explainGitError(errorMessage, context) {
         if (!(await this.isAvailable())) {
             return {
                 success: false,
@@ -287,30 +297,173 @@ Provide a helpful answer in 2-4 sentences. If relevant, include the Git command.
             };
         }
         try {
-            const commandContext = command ? `Command executed: ${command}\n` : '';
-            const prompt = `You are a Git expert. Explain this Git error simply and provide a solution.
+            const commandLine = context?.command ? `This Git command failed: "${context.command}"\n` : '';
+            const branchLine = context?.branch ? `Current branch: ${context.branch}\n` : '';
+            const uncommittedLine = context?.hasUncommitted !== undefined ? `Has uncommitted changes: ${context.hasUncommitted}\n` : '';
+            const prompt = `${commandLine}Error: "${errorMessage}"
+${branchLine}${uncommittedLine}
+Explain this error in simple terms for a beginner. What happened, why, and how to fix it.
+Reply in 3-4 sentences maximum. No code blocks. ${this.getLanguageInstruction()}`;
+            const { stdout, stderr } = await executeCommand(`${getCopilotCommand()} -p "${this.escapeForShell(prompt)}" -s`, COPILOT_TIMEOUT_MS);
+            const explanation = this.parseAnswer(stdout, stderr);
+            if (!explanation || this.looksLikeError(explanation)) {
+                return { success: false, message: 'Could not explain the error' };
+            }
+            return { success: true, message: explanation };
+        }
+        catch (error) {
+            logger.debug('explainGitError failed:', error);
+            return { success: false, message: 'Could not explain the error' };
+        }
+    }
+    /**
+     * Suggest how to resolve a merge conflict
+     */
+    async suggestConflictResolution(fileName, localVersion, remoteVersion, context) {
+        if (!(await this.isAvailable())) {
+            return null;
+        }
+        try {
+            const branchInfo = context?.branch ? `current branch ${context.branch}` : 'current branch';
+            const remoteBranchInfo = context?.remoteBranch ? `from ${context.remoteBranch}` : 'from remote';
+            const prompt = `Merge conflict in file: ${fileName}
 
-${commandContext}Error message: ${errorMessage}
+LOCAL version (${branchInfo}):
+${localVersion}
 
-1. Explain what this error means in simple terms (1 sentence)
-2. Provide the solution or command to fix it (1-2 sentences)
+REMOTE version (${remoteBranchInfo}):
+${remoteVersion}
 
-Be concise and practical.`;
+Which version should be kept and why? Options: keep LOCAL, keep REMOTE, keep BOTH, or suggest a MERGED version.
+Reply with format:
+RECOMMENDATION: LOCAL|REMOTE|BOTH|CUSTOM
+EXPLANATION: (1-2 sentences why)
+MERGED: (only if CUSTOM, the merged content)
+${this.getLanguageInstruction()}`;
             const { stdout, stderr } = await executeCommand(`${getCopilotCommand()} -p "${this.escapeForShell(prompt)}" -s`, COPILOT_TIMEOUT_MS);
-            const explanation = this.parseAnswer(stdout, stderr);
-            return {
-                success: !!explanation,
-                message: explanation || 'Could not explain the error'
-            };
+            const combined = `${stdout}\n${stderr || ''}`;
+            if (this.looksLikeError(combined)) {
+                return null;
+            }
+            return this.parseConflictSuggestion(stdout, stderr);
         }
         catch (error) {
-            logger.debug('explainGitError failed:', error);
-            return {
-                success: false,
-                message: error instanceof Error ? error.message : t('errors.unknownError')
-            };
+            logger.debug('suggestConflictResolution failed:', error);
+            return null;
         }
     }
+    parseConflictSuggestion(output, stderr) {
+        const combined = `${output}\n${stderr || ''}`.trim();
+        const lines = combined.split('\n');
+        let recommendation = 'local';
+        let explanation = '';
+        let customContent;
+        let foundRecommendation = false;
+        for (const line of lines) {
+            const trimmed = line.trim();
+            const recMatch = trimmed.match(/^\*{0,2}RECOMMENDATION:?\*{0,2}\s*(LOCAL|REMOTE|BOTH|CUSTOM)/i);
+            if (recMatch) {
+                recommendation = recMatch[1].toLowerCase();
+                foundRecommendation = true;
+                continue;
+            }
+            const explMatch = trimmed.match(/^\*{0,2}EXPLANATION:?\*{0,2}\s*(.+)/i);
+            if (explMatch) {
+                explanation = explMatch[1];
+                continue;
+            }
+            const mergedMatch = trimmed.match(/^\*{0,2}MERGED:?\*{0,2}\s*(.+)/i);
+            if (mergedMatch) {
+                customContent = mergedMatch[1];
+                continue;
+            }
+        }
+        if (!foundRecommendation) {
+            // Try to infer from free-text response.
+            // Order matters: check "custom/merge" BEFORE "both/combine" because
+            // a custom-merge suggestion often contains words like "combine both".
+            const lowerCombined = combined.toLowerCase();
+            if (lowerCombined.includes('merged version') || lowerCombined.includes('suggest a merge') || lowerCombined.includes('custom merge') || /\bmerged?\b.*\bboth\b/.test(lowerCombined)) {
+                recommendation = 'custom';
+            }
+            else if (lowerCombined.includes('keep remote') || lowerCombined.includes('remote version')) {
+                recommendation = 'remote';
+            }
+            else if (lowerCombined.includes('keep both') || lowerCombined.includes('combine')) {
+                recommendation = 'both';
+            }
+            explanation = this.parseAnswer(output, stderr) || '';
+        }
+        if (!explanation && !foundRecommendation) {
+            return null;
+        }
+        return {
+            recommendation,
+            explanation: explanation || `Recommended: ${recommendation}`,
+            customContent: recommendation === 'custom' ? customContent : undefined
+        };
+    }
+    /**
+     * Summarize staged diff in plain language
+     */
+    async summarizeStagedDiff(diff) {
+        if (!(await this.isAvailable())) {
+            return null;
+        }
+        if (!diff || diff.trim().length === 0) {
+            return null;
+        }
+        try {
+            const prompt = `Summarize these staged Git changes in plain language for a developer.
+List each modified file with a short description of what changed.
+Format: one line per file, max 60 chars per line.
+No markdown, no code blocks. Keep it concise.
+${this.getLanguageInstruction()}
+
+Changes:
+${diff}`;
+            const result = await this.executeWithRetry(`${getCopilotCommand()} -p "${this.escapeForShell(prompt)}" -s`, COPILOT_TIMEOUT_MS);
+            if (!result) {
+                return null;
+            }
+            const combined = `${result.stdout}\n${result.stderr || ''}`;
+            if (this.looksLikeError(combined)) {
+                return null;
+            }
+            return this.parseAnswer(result.stdout, result.stderr);
+        }
+        catch (error) {
+            logger.debug('summarizeStagedDiff failed:', error);
+            return null;
+        }
+    }
+    /**
+     * Checks if parsed output looks like a CLI error rather than a real answer.
+     * Returns true when the content should be discarded.
+     */
+    looksLikeError(text) {
+        const errorPatterns = [
+            /command failed/i,
+            /not compatible/i,
+            /ENOENT/i,
+            /EPERM/i,
+            /spawn.*failed/i,
+            /is not recognized/i,
+            /not found/i,
+            /no such file/i,
+            /permission denied/i,
+            /timed?\s*out/i,
+            /exit code/i,
+            /errno/i,
+            /^error:/im,
+            /^fatal:/im,
+            /version.*not supported/i,
+            /unexpected token/i,
+            /syntax error/i,
+            /cannot execute/i,
+        ];
+        return errorPatterns.some(p => p.test(text));
+    }
     async executeWithRetry(command, timeout) {
         for (let attempt = 0; attempt <= COPILOT_MAX_RETRIES; attempt++) {
             try {

package/dist/services/copilot-service.js.map

@@ -1 +1 @@
-{"version":3,"file":"copilot-service.js","sourceRoot":"","sources":["../../src/services/copilot-service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"copilot-service.js","sourceRoot":"","sources":["../../src/services/copilot-service.ts"],"names":[],"mappings":"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"}

package/dist/ui/menus/branch-menu.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"branch-menu.d.ts","sourceRoot":"","sources":["../../../src/ui/menus/branch-menu.ts"],"names":[],"mappings":"AAaA,MAAM,MAAM,YAAY,GAAG,MAAM,GAAG,QAAQ,GAAG,QAAQ,GAAG,OAAO,GAAG,QAAQ,GAAG,MAAM,CAAC;AAEtF,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,YAAY,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC;CAClB;AAED,wBAAsB,cAAc,IAAI,OAAO,CAAC,YAAY,CAAC,CA0C5D"}
+{"version":3,"file":"branch-menu.d.ts","sourceRoot":"","sources":["../../../src/ui/menus/branch-menu.ts"],"names":[],"mappings":"AAaA,MAAM,MAAM,YAAY,GAAG,MAAM,GAAG,QAAQ,GAAG,QAAQ,GAAG,OAAO,GAAG,QAAQ,GAAG,MAAM,CAAC;AAEtF,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,YAAY,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC;CAClB;AAED,wBAAsB,cAAc,IAAI,OAAO,CAAC,YAAY,CAAC,CA2C5D"}

package/dist/ui/menus/branch-menu.js

@@ -8,7 +8,7 @@ import { gitService } from '../../services/git-service.js';
 import { preventionService } from '../../services/prevention-service.js';
 import { isValidBranchName } from '../../utils/validators.js';
 import { logger } from '../../utils/logger.js';
-import { mapGitError } from '../../utils/error-mapper.js';
+import { mapGitErrorWithAI } from '../../utils/error-mapper.js';
 import { shouldShowExplanation, shouldConfirm, shouldShowWarning } from '../../utils/level-helper.js';
 export async function showBranchMenu() {
     const theme = getTheme();
@@ -41,7 +41,8 @@ export async function showBranchMenu() {
         }
     }
     catch (error) {
-        logger.error(mapGitError(error));
+        const message = await mapGitErrorWithAI(error, { command: 'git branch' });
+        logger.error(message);
         return { action: 'back', success: false };
     }
 }

package/dist/ui/menus/branch-menu.js.map

@@ -1 +1 @@
-{"version":3,"file":"branch-menu.js","sourceRoot":"","sources":["../../../src/ui/menus/branch-menu.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,qBAAqB,CAAC;AACxC,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACnF,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AACjF,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAC;AACzE,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,qBAAqB,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAUtG,MAAM,CAAC,KAAK,UAAU,cAAc;IAClC,MAAM,KAAK,GAAG,QAAQ,EAAE,CAAC;IAEzB,MAAM,CAAC,GAAG,CAAC,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,uBAAuB,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;IAElE,IAAI,CAAC;QACH,MAAM,aAAa,GAAG,MAAM,UAAU,CAAC,gBAAgB,EAAE,CAAC;QAC1D,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,yBAAyB,EAAE,EAAE,MAAM,EAAE,aAAa,IAAI,SAAS,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;QAEtG,MAAM,MAAM,GAAG,MAAM,YAAY,CAAe,CAAC,CAAC,gBAAgB,CAAC,EAAE;YACnE,EAAE,IAAI,EAAE,CAAC,CAAC,sBAAsB,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE;YAClD,EAAE,IAAI,EAAE,CAAC,CAAC,wBAAwB,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE;YACtD,EAAE,IAAI,EAAE,CAAC,CAAC,wBAAwB,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE;YACtD,EAAE,IAAI,EAAE,CAAC,CAAC,uBAAuB,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE;YACpD,EAAE,IAAI,EAAE,CAAC,CAAC,wBAAwB,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE;YACtD,EAAE,IAAI,EAAE,CAAC,CAAC,WAAW,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE;SACxC,CAAC,CAAC;QAEH,QAAQ,MAAM,EAAE,CAAC;YACf,KAAK,MAAM;gBACT,OAAO,MAAM,YAAY,EAAE,CAAC;YAE9B,KAAK,QAAQ;gBACX,OAAO,MAAM,YAAY,EAAE,CAAC;YAE9B,KAAK,QAAQ;gBACX,OAAO,MAAM,YAAY,EAAE,CAAC;YAE9B,KAAK,OAAO;gBACV,OAAO,MAAM,WAAW,EAAE,CAAC;YAE7B,KAAK,QAAQ;gBACX,OAAO,MAAM,YAAY,EAAE,CAAC;YAE9B,KAAK,MAAM,CAAC;YACZ;gBACE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;QAC7C,CAAC;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC;QACjC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;IAC5C,CAAC;AACH,CAAC;AAED,KAAK,UAAU,YAAY;IACzB,MAAM,KAAK,GAAG,QAAQ,EAAE,CAAC;IAEzB,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IAC7B,MAAM,QAAQ,GAAG,MAAM,UAAU,CAAC,gBAAgB,EAAE,CAAC;IAErD,MAAM,CAAC,GAAG,CAAC,IAAI,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;IACpE,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC;IAElC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;AAC3C,CAAC;AAED,KAAK,UAAU,YAAY;IACzB,MAAM,UAAU,GAAG,MAAM,WAAW,CAClC,CAAC,CAAC,2BAA2B,CAAC,EAC9B,EAAE,EACF,CAAC,KAAK,EAAE,EAAE;QACR,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,EAAE,CAAC;YAC9B,OAAO,CAAC,CAAC,6BAA6B,CAAC,CAAC;QAC1C,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC,CACF,CAAC;IAEF,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;IAC9C,CAAC;IAED,iCAAiC;IACjC,MAAM,QAAQ,GAAG,MAAM,UAAU,CAAC,WAAW,EAAE,CAAC;IAChD,IAAI,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,UAAU,CAAC,EAAE,CAAC;QAC9C,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,qBAAqB,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC;QACvE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;IAC9C,CAAC;IAED,MAAM,CAAC,OAAO,CAAC,mBAAmB,UAAU,EAAE,CAAC,CAAC;IAChD,MAAM,WAAW,CACf,CAAC,CAAC,0BAA0B,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,EACrD,KAAK,IAAI,EAAE;QACT,MAAM,UAAU,CAAC,YAAY,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;IAClD,CAAC,EACD,CAAC,CAAC,+BAA+B,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAC3D,CAAC;IAEF,MAAM,CAAC,GAAG,CAAC,IAAI,GAAG,UAAU,CAC1B,CAAC,CAAC,+BAA+B,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,EAC1D,CAAC,CAAC,eAAe,CAAC,CACnB,CAAC,CAAC;IAEH,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;AACjE,CAAC;AAED,KAAK,UAAU,YAAY;IACzB,MAAM,KAAK,GAAG,QAAQ,EAAE,CAAC;IACzB,MAAM,QAAQ,GAAG,MAAM,UAAU,CAAC,gBAAgB,EAAE,CAAC;IAErD,4BAA4B;IAC5B,MAAM,aAAa,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;IAEvD,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC/B,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,qCAAqC,CAAC,CAAC,CAAC,CAAC;QACjE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;IAC9C,CAAC;IAED,MAAM,cAAc,GAAG,MAAM,YAAY,CACvC,CAAC,CAAC,wBAAwB,CAAC,EAC3B,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QACtB,IAAI,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC;QACrC,KAAK,EAAE,CAAC,CAAC,IAAI;KACd,CAAC,CAAC,CACJ,CAAC;IAEF,gCAAgC;IAChC,MAAM,UAAU,GAAG,MAAM,iBAAiB,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC;IAE5E,IAAI,UAAU,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACnC,6CAA6C;QAC7C,KAAK,MAAM,OAAO,IAAI,UAAU,CAAC,QAAQ,EAAE,CAAC;YAC1C,MAAM,QAAQ,GAAG,OAAO,CAAC,KAAK,KAAK,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC;YACvE,IAAI,iBAAiB,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAChC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;YACzD,CAAC;QACH,CAAC;QAED,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE,CAAC;YAC3B,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;QAC9C,CAAC;QAED,mDAAmD;QACnD,MAAM,kBAAkB,GAAG,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CACtD,iBAAiB,CAAC,CAAC,CAAC,KAAK,KAAK,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC,CACnE,CAAC;QACF,IAAI,kBAAkB,EAAE,CAAC;YACvB,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,CAAC,CAAC,kBAAkB,CAAC,EAAE,KAAK,CAAC,CAAC;YAClE,IAAI,CAAC,OAAO,EAAE,CAAC;gBACb,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;YAC9C,CAAC;QACH,CAAC;IACH,CAAC;IAED,MAAM,CAAC,OAAO,CAAC,gBAAgB,cAAc,EAAE,CAAC,CAAC;IACjD,MAAM,WAAW,CACf,CAAC,CAAC,2BAA2B,EAAE,EAAE,MAAM,EAAE,cAAc,EAAE,CAAC,EAC1D,KAAK,IAAI,EAAE;QACT,MAAM,UAAU,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;IAC5C,CAAC,EACD,CAAC,CAAC,+BAA+B,EAAE,EAAE,MAAM,EAAE,cAAc,EAAE,CAAC,CAC/D,CAAC;IAEF,MAAM,CAAC,GAAG,CAAC,IAAI,GAAG,UAAU,CAC1B,CAAC,CAAC,+BAA+B,EAAE,EAAE,MAAM,EAAE,cAAc,EAAE,CAAC,EAC9D,CAAC,CAAC,eAAe,CAAC,CACnB,CAAC,CAAC;IAEH,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;AACrE,CAAC;AAED,KAAK,UAAU,YAAY;IACzB,MAAM,KAAK,GAAG,QAAQ,EAAE,CAAC;IACzB,MAAM,QAAQ,GAAG,MAAM,UAAU,CAAC,gBAAgB,EAAE,CAAC;IAErD,4BAA4B;IAC5B,MAAM,iBAAiB,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;IAE3D,IAAI,iBAAiB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACnC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,qCAAqC,CAAC,CAAC,CAAC,CAAC;QACjE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;IAC9C,CAAC;IAED,MAAM,cAAc,GAAG,MAAM,YAAY,CACvC,CAAC,CAAC,wBAAwB,CAAC,EAC3B,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QAC1B,IAAI,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC;QACrC,KAAK,EAAE,CAAC,CAAC,IAAI;KACd,CAAC,CAAC,CACJ,CAAC;IAEF,oBAAoB;IACpB,MAAM,UAAU,GAAG,MAAM,iBAAiB,CAAC,oBAAoB,CAAC,cAAc,CAAC,CAAC;IAEhF,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE,CAAC;QAC3B,KAAK,MAAM,OAAO,IAAI,UAAU,CAAC,QAAQ,EAAE,CAAC;YAC1C,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;QACvD,CAAC;QACD,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;IAC9C,CAAC;IAED,mBAAmB;IACnB,MAAM,aAAa,GAAG,MAAM,aAAa,CACvC,CAAC,CAAC,+BAA+B,EAAE,EAAE,MAAM,EAAE,cAAc,EAAE,CAAC,EAC9D,KAAK,CACN,CAAC;IAEF,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;IAC9C,CAAC;IAED,MAAM,CAAC,OAAO,CAAC,iBAAiB,cAAc,EAAE,CAAC,CAAC;IAClD,MAAM,WAAW,CACf,CAAC,CAAC,0BAA0B,EAAE,EAAE,MAAM,EAAE,cAAc,EAAE,CAAC,EACzD,KAAK,IAAI,EAAE;QACT,MAAM,UAAU,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC;IAChD,CAAC,EACD,CAAC,CAAC,+BAA+B,EAAE,EAAE,MAAM,EAAE,cAAc,EAAE,CAAC,CAC/D,CAAC;IAEF,MAAM,CAAC,GAAG,CAAC,IAAI,GAAG,UAAU,CAC1B,CAAC,CAAC,+BAA+B,EAAE,EAAE,MAAM,EAAE,cAAc,EAAE,CAAC,EAC9D,CAAC,CAAC,eAAe,CAAC,CACnB,CAAC,CAAC;IAEH,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;AACrE,CAAC;AAED,KAAK,UAAU,WAAW;IACxB,MAAM,KAAK,GAAG,QAAQ,EAAE,CAAC;IACzB,MAAM,aAAa,GAAG,MAAM,UAAU,CAAC,gBAAgB,EAAE,CAAC;IAC1D,MAAM,QAAQ,GAAG,MAAM,UAAU,CAAC,gBAAgB,EAAE,CAAC;IAErD,4BAA4B;IAC5B,MAAM,aAAa,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;IAEvD,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC/B,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,iCAAiC,CAAC,IAAI,6BAA6B,CAAC,CAAC,CAAC;QAC9F,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;IAC7C,CAAC;IAED,kDAAkD;IAClD,IAAI,qBAAqB,EAAE,EAAE,CAAC;QAC5B,MAAM,CAAC,GAAG,CAAC,IAAI,GAAG,OAAO,CACvB,CAAC,CAAC,8BAA8B,EAAE,EAAE,MAAM,EAAE,aAAa,IAAI,SAAS,EAAE,CAAC,EACzE,CAAC,CAAC,uBAAuB,CAAC,CAC3B,CAAC,CAAC;IACL,CAAC;IAED,MAAM,cAAc,GAAG,MAAM,YAAY,CACvC,CAAC,CAAC,+BAA+B,CAAC,IAAI,yBAAyB,EAC/D,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QACtB,IAAI,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC;QACrC,KAAK,EAAE,CAAC,CAAC,IAAI;KACd,CAAC,CAAC,CACJ,CAAC;IAEF,uBAAuB;IACvB,MAAM,cAAc,GAAG,aAAa,cAAc,EAAE,CAAC;IACrD,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,6BAA6B,CAAC,IAAI,eAAe,IAAI,cAAc,IAAI,CAAC,CAAC,CAAC;IAE5G,sEAAsE;IACtE,IAAI,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC;QACzB,MAAM,YAAY,GAAG,MAAM,aAAa,CACtC,CAAC,CAAC,8BAA8B,EAAE,EAAE,MAAM,EAAE,cAAc,EAAE,CAAC,EAC7D,IAAI,CACL,CAAC;QAEF,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;QAC7C,CAAC;IACH,CAAC;IAED,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;IAE/B,IAAI,CAAC;QACH,MAAM,WAAW,CACf,CAAC,CAAC,yBAAyB,EAAE,EAAE,MAAM,EAAE,cAAc,EAAE,CAAC,IAAI,WAAW,cAAc,KAAK,EAC1F,KAAK,IAAI,EAAE;YACT,MAAM,UAAU,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;QACzC,CAAC,EACD,CAAC,CAAC,8BAA8B,EAAE,EAAE,MAAM,EAAE,cAAc,EAAE,CAAC,CAC9D,CAAC;QAEF,kCAAkC;QAClC,MAAM,YAAY,GAAG,MAAM,UAAU,CAAC,YAAY,EAAE,CAAC;QACrD,IAAI,YAAY,EAAE,CAAC;YACjB,MAAM,eAAe,GAAG,MAAM,UAAU,CAAC,kBAAkB,EAAE,CAAC;YAC9D,MAAM,CAAC,GAAG,CAAC,IAAI,GAAG,QAAQ,CACxB,CAAC,CAAC,gCAAgC,CAAC,IAAI,2BAA2B,EAClE,CAAC,CAAC,gBAAgB,CAAC,CACpB,CAAC,CAAC;YACH,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,iCAAiC,CAAC,IAAI,mBAAmB,CAAC,CAAC,CAAC;YACvF,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;YACpE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;QACrE,CAAC;QAED,MAAM,CAAC,GAAG,CAAC,IAAI,GAAG,UAAU,CAC1B,CAAC,CAAC,8BAA8B,EAAE,EAAE,MAAM,EAAE,cAAc,EAAE,CAAC,EAC7D,CAAC,CAAC,eAAe,CAAC,CACnB,CAAC,CAAC;QAEH,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IACpE,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,iCAAiC;QACjC,MAAM,YAAY,GAAG,MAAM,UAAU,CAAC,YAAY,EAAE,CAAC;QACrD,IAAI,YAAY,EAAE,CAAC;YACjB,MAAM,eAAe,GAAG,MAAM,UAAU,CAAC,kBAAkB,EAAE,CAAC;YAC9D,MAAM,CAAC,GAAG,CAAC,IAAI,GAAG,QAAQ,CACxB,CAAC,CAAC,gCAAgC,CAAC,IAAI,2BAA2B,EAClE,CAAC,CAAC,gBAAgB,CAAC,CACpB,CAAC,CAAC;YACH,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,iCAAiC,CAAC,IAAI,mBAAmB,CAAC,CAAC,CAAC;YACvF,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;YACpE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;QACrE,CAAC;QACD,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC"}
+{"version":3,"file":"branch-menu.js","sourceRoot":"","sources":["../../../src/ui/menus/branch-menu.ts"],"names":[],"mappings":"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"}

package/dist/ui/menus/commit-menu.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"commit-menu.d.ts","sourceRoot":"","sources":["../../../src/ui/menus/commit-menu.ts"],"names":[],"mappings":"AAcA,MAAM,WAAW,YAAY;IAC3B,SAAS,EAAE,OAAO,CAAC;IACnB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAID,wBAAsB,cAAc,IAAI,OAAO,CAAC,YAAY,CAAC,CA6K5D"}
+{"version":3,"file":"commit-menu.d.ts","sourceRoot":"","sources":["../../../src/ui/menus/commit-menu.ts"],"names":[],"mappings":"AAcA,MAAM,WAAW,YAAY;IAC3B,SAAS,EAAE,OAAO,CAAC;IACnB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAID,wBAAsB,cAAc,IAAI,OAAO,CAAC,YAAY,CAAC,CAuM5D"}

package/dist/ui/menus/commit-menu.js

@@ -9,7 +9,7 @@ import { preventionService } from '../../services/prevention-service.js';
 import { userConfig } from '../../config/user-config.js';
 import { isValidCommitMessage, isConventionalCommit } from '../../utils/validators.js';
 import { logger } from '../../utils/logger.js';
-import { mapGitError } from '../../utils/error-mapper.js';
+import { mapGitErrorWithAI } from '../../utils/error-mapper.js';
 import { shouldShowWarning, shouldShowExplanation, shouldConfirm, isLevel } from '../../utils/level-helper.js';
 export async function showCommitMenu() {
     const theme = getTheme();
@@ -22,7 +22,13 @@ export async function showCommitMenu() {
             logger.raw(errorBox(t('commands.commit.conflictsDetected') || 'Merge conflicts detected! Resolve them before committing.', t('errors.title')));
             logger.raw(theme.warning(t('commands.commit.conflictedFiles') || 'Conflicted files:'));
             conflictedFiles.forEach(f => logger.raw(theme.file(f, 'conflict')));
-            return { committed: false };
+            // Auto-launch conflict resolution menu
+            const { showConflictResolutionMenu } = await import('./conflict-resolution-menu.js');
+            const result = await showConflictResolutionMenu();
+            if (!result.resolved) {
+                return { committed: false };
+            }
+            // Conflicts resolved - continue with commit flow
         }
         // Validate we can commit
         const validation = await preventionService.validateCommit();
@@ -49,6 +55,24 @@ export async function showCommitMenu() {
         if (shouldShowExplanation()) {
             logger.raw(infoBox(t('tips.beginner.commit'), t('commands.commit.title')));
         }
+        // Show AI diff summary if Copilot is available
+        if (await copilotService.isAvailable()) {
+            try {
+                const diff = await gitService.getDiff(true);
+                if (diff) {
+                    const spinner = createSpinner({ text: t('copilot.analyzingChanges') });
+                    spinner.start();
+                    const summary = await copilotService.summarizeStagedDiff(diff);
+                    spinner.stop();
+                    if (summary) {
+                        logger.raw(infoBox(`${t('copilot.diffSummary')}:\n\n${summary}`));
+                    }
+                }
+            }
+            catch {
+                logger.debug('Diff summary failed, continuing normally');
+            }
+        }
         let commitMessage = '';
         // Check if Copilot CLI is available
         const copilotAvailable = await copilotService.isAvailable();
@@ -143,7 +167,8 @@ export async function showCommitMenu() {
         };
     }
     catch (error) {
-        logger.error(mapGitError(error));
+        const message = await mapGitErrorWithAI(error, { command: 'git commit' });
+        logger.error(message);
         return { committed: false };
     }
 }

package/dist/ui/menus/commit-menu.js.map

@@ -1 +1 @@
-{"version":3,"file":"commit-menu.js","sourceRoot":"","sources":["../../../src/ui/menus/commit-menu.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"commit-menu.js","sourceRoot":"","sources":["../../../src/ui/menus/commit-menu.ts"],"names":[],"mappings":"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"}

package/dist/ui/menus/conflict-resolution-menu.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"conflict-resolution-menu.d.ts","sourceRoot":"","sources":["../../../src/ui/menus/conflict-resolution-menu.ts"],"names":[],"mappings":"AASA,MAAM,WAAW,aAAa;IAC5B,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;CACjB;AAkBD,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,MAAM,GAAG,aAAa,EAAE,CAwCxE;AAED,wBAAgB,oBAAoB,CAClC,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,aAAa,EACpB,MAAM,EAAE,OAAO,GAAG,QAAQ,GAAG,MAAM,GAClC,MAAM,CAqBR;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAG3D;AAED,wBAAsB,0BAA0B,IAAI,OAAO,CAAC;IAAE,QAAQ,EAAE,OAAO,CAAA;CAAE,CAAC,CA6JjF"}
+{"version":3,"file":"conflict-resolution-menu.d.ts","sourceRoot":"","sources":["../../../src/ui/menus/conflict-resolution-menu.ts"],"names":[],"mappings":"AAWA,MAAM,WAAW,aAAa;IAC5B,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;CACjB;AAkBD,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,MAAM,GAAG,aAAa,EAAE,CAwCxE;AAED,wBAAgB,oBAAoB,CAClC,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,aAAa,EACpB,MAAM,EAAE,OAAO,GAAG,QAAQ,GAAG,MAAM,GAClC,MAAM,CAqBR;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAG3D;AAED,wBAAsB,0BAA0B,IAAI,OAAO,CAAC;IAAE,QAAQ,EAAE,OAAO,CAAA;CAAE,CAAC,CAsMjF"}

package/dist/ui/menus/conflict-resolution-menu.js

@@ -1,9 +1,11 @@
 import { readFileSync, writeFileSync } from 'fs';
 import { t } from '../../i18n/index.js';
 import { getTheme } from '../themes/index.js';
-import { promptSelect, promptInput } from '../components/prompt.js';
+import { promptSelect, promptInput, promptConfirm } from '../components/prompt.js';
 import { successBox, warningBox, errorBox, infoBox } from '../components/box.js';
+import { createSpinner } from '../components/spinner.js';
 import { gitService } from '../../services/git-service.js';
+import { copilotService } from '../../services/copilot-service.js';
 import { logger } from '../../utils/logger.js';
 import { mapGitError } from '../../utils/error-mapper.js';
 const CONFLICT_START = '<<<<<<<';
@@ -124,16 +126,47 @@ export async function showConflictResolutionMenu() {
                 logger.raw(theme.warning(t('commands.conflicts.remoteVersion')));
                 logger.raw(theme.dim('  ' + (block.remoteContent || '(empty)').split('\n').join('\n  ')));
                 logger.raw('');
-                const choice = await promptSelect(t('commands.conflicts.chooseResolution'), [
+                const choices = [
                     { name: t('commands.conflicts.keepLocal'), value: 'local' },
                     { name: t('commands.conflicts.keepRemote'), value: 'remote' },
                     { name: t('commands.conflicts.keepBoth'), value: 'both' },
                     { name: t('commands.conflicts.editManually'), value: 'edit' },
-                    { name: t('menu.back'), value: 'back' }
-                ]);
+                ];
+                if (await copilotService.isAvailable()) {
+                    choices.push({ name: t('commands.conflicts.askCopilot'), value: 'copilot' });
+                }
+                choices.push({ name: t('menu.back'), value: 'back' });
+                const choice = await promptSelect(t('commands.conflicts.chooseResolution'), choices);
                 if (choice === 'back') {
                     return { resolved: false };
                 }
+                if (choice === 'copilot') {
+                    const spinner = createSpinner({ text: t('copilot.analyzing') });
+                    spinner.start();
+                    const suggestion = await copilotService.suggestConflictResolution(file, block.localContent, block.remoteContent);
+                    spinner.stop();
+                    if (suggestion) {
+                        logger.raw(infoBox(`${t('commands.conflicts.copilotSuggests')}: ${suggestion.recommendation.toUpperCase()}\n\n${suggestion.explanation}`));
+                        const accept = await promptConfirm(t('commands.conflicts.acceptSuggestion'), true);
+                        if (accept) {
+                            if (suggestion.recommendation === 'custom' && suggestion.customContent) {
+                                // Replace the block with custom content
+                                const lines = normalizeContent(fileContent).split('\n');
+                                const before = lines.slice(0, block.startLine);
+                                const after = lines.slice(block.endLine + 1);
+                                fileContent = [...before, suggestion.customContent, ...after].join('\n');
+                            }
+                            else if (suggestion.recommendation === 'local' || suggestion.recommendation === 'remote' || suggestion.recommendation === 'both') {
+                                fileContent = resolveConflictBlock(fileContent, block, suggestion.recommendation);
+                            }
+                            continue; // Move to next block
+                        }
+                        // If not accepted, fall through to re-show menu (loop will re-iterate)
+                        continue;
+                    }
+                    // If suggestion is null, fall through to re-show menu
+                    continue;
+                }
                 if (choice === 'edit') {
                     // Manual editing flow
                     logger.raw(infoBox(t('commands.conflicts.editInstructions', { file }), t('commands.conflicts.title')));

package/dist/ui/menus/conflict-resolution-menu.js.map

@@ -1 +1 @@
-{"version":3,"file":"conflict-resolution-menu.js","sourceRoot":"","sources":["../../../src/ui/menus/conflict-resolution-menu.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"conflict-resolution-menu.js","sourceRoot":"","sources":["../../../src/ui/menus/conflict-resolution-menu.ts"],"names":[],"mappings":"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"}

package/dist/ui/menus/pull-menu.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pull-menu.d.ts","sourceRoot":"","sources":["../../../src/ui/menus/pull-menu.ts"],"names":[],"mappings":"AAWA,MAAM,WAAW,UAAU;IACzB,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAOD,wBAAsB,YAAY,IAAI,OAAO,CAAC,UAAU,CAAC,CAiQxD"}
+{"version":3,"file":"pull-menu.d.ts","sourceRoot":"","sources":["../../../src/ui/menus/pull-menu.ts"],"names":[],"mappings":"AAWA,MAAM,WAAW,UAAU;IACzB,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAOD,wBAAsB,YAAY,IAAI,OAAO,CAAC,UAAU,CAAC,CAkQxD"}

package/dist/ui/menus/pull-menu.js

@@ -5,7 +5,7 @@ import { successBox, warningBox, errorBox, infoBox } from '../components/box.js'
 import { withSpinner } from '../components/spinner.js';
 import { gitService } from '../../services/git-service.js';
 import { logger } from '../../utils/logger.js';
-import { mapGitError } from '../../utils/error-mapper.js';
+import { mapGitError, mapGitErrorWithAI } from '../../utils/error-mapper.js';
 import { isValidRemoteUrl } from '../../utils/validators.js';
 import { shouldShowExplanation, shouldConfirm, isLevel } from '../../utils/level-helper.js';
 export async function showPullMenu() {
@@ -179,7 +179,8 @@ export async function showPullMenu() {
         };
     }
     catch (error) {
-        logger.raw(errorBox(mapGitError(error)));
+        const message = await mapGitErrorWithAI(error, { command: 'git pull' });
+        logger.raw(errorBox(message));
         return { pulled: false };
     }
 }
@@ -220,8 +221,9 @@ async function handlePostPullConflicts(theme, error) {
         }
         return { pulled: false };
     }
-    // Not a conflict error - show generic mapped error
-    logger.raw(errorBox(mapGitError(error)));
+    // Not a conflict error - show generic mapped error with AI explanation
+    const message = await mapGitErrorWithAI(error, { command: 'git pull' });
+    logger.raw(errorBox(message));
     return { pulled: false };
 }
 //# sourceMappingURL=pull-menu.js.map

package/dist/ui/menus/pull-menu.js.map

@@ -1 +1 @@
-{"version":3,"file":"pull-menu.js","sourceRoot":"","sources":["../../../src/ui/menus/pull-menu.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"pull-menu.js","sourceRoot":"","sources":["../../../src/ui/menus/pull-menu.ts"],"names":[],"mappings":"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"}

package/dist/ui/menus/push-menu.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"push-menu.d.ts","sourceRoot":"","sources":["../../../src/ui/menus/push-menu.ts"],"names":[],"mappings":"AAcA,MAAM,WAAW,UAAU;IACzB,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAID,wBAAsB,YAAY,IAAI,OAAO,CAAC,UAAU,CAAC,CAiMxD;AAED,wBAAsB,iBAAiB,IAAI,OAAO,CAAC,UAAU,CAAC,CAqD7D"}
+{"version":3,"file":"push-menu.d.ts","sourceRoot":"","sources":["../../../src/ui/menus/push-menu.ts"],"names":[],"mappings":"AAcA,MAAM,WAAW,UAAU;IACzB,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAID,wBAAsB,YAAY,IAAI,OAAO,CAAC,UAAU,CAAC,CAkMxD;AAED,wBAAsB,iBAAiB,IAAI,OAAO,CAAC,UAAU,CAAC,CAsD7D"}

package/dist/ui/menus/push-menu.js

@@ -6,7 +6,7 @@ import { withSpinner } from '../components/spinner.js';
 import { gitService } from '../../services/git-service.js';
 import { preventionService } from '../../services/prevention-service.js';
 import { logger } from '../../utils/logger.js';
-import { mapGitError } from '../../utils/error-mapper.js';
+import { mapGitErrorWithAI } from '../../utils/error-mapper.js';
 import { shouldConfirm, shouldShowWarning, shouldShowExplanation } from '../../utils/level-helper.js';
 import { isValidRemoteUrl } from '../../utils/validators.js';
 export async function showPushMenu() {
@@ -148,7 +148,8 @@ export async function showPushMenu() {
         };
     }
     catch (error) {
-        logger.raw(errorBox(mapGitError(error)));
+        const message = await mapGitErrorWithAI(error, { command: 'git push' });
+        logger.raw(errorBox(message));
         return { pushed: false };
     }
 }
@@ -186,7 +187,8 @@ export async function showForcePushMenu() {
         };
     }
     catch (error) {
-        logger.raw(errorBox(mapGitError(error)));
+        const message = await mapGitErrorWithAI(error, { command: 'git push --force' });
+        logger.raw(errorBox(message));
         return { pushed: false };
     }
 }

package/dist/ui/menus/push-menu.js.map

@@ -1 +1 @@
-{"version":3,"file":"push-menu.js","sourceRoot":"","sources":["../../../src/ui/menus/push-menu.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"push-menu.js","sourceRoot":"","sources":["../../../src/ui/menus/push-menu.ts"],"names":[],"mappings":"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"}

package/dist/utils/error-helper.js

@@ -26,7 +26,7 @@ export async function handleGitError(error, command, autoExplain = false) {
         const spinner = createSpinner({ text: t('errors.analyzing') || 'Analyzing error...' });
         spinner.start();
         try {
-            const explanation = await copilotService.explainGitError(errorMessage, command);
+            const explanation = await copilotService.explainGitError(errorMessage, command ? { command } : undefined);
             if (explanation.success && explanation.message) {
                 spinner.succeed();
                 logger.raw('\n' + infoBox(explanation.message, t('errors.explanation') || 'Explanation'));

package/dist/utils/error-helper.js.map

@@ -1 +1 @@
-{"version":3,"file":"error-helper.js","sourceRoot":"","sources":["../../src/utils/error-helper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,kBAAkB,CAAC;AACrC,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAChE,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,KAAqB,EACrB,OAAgB,EAChB,cAAuB,KAAK;IAE5B,MAAM,YAAY,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC;IAEpE,oBAAoB;IACpB,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,YAAY,EAAE,CAAC,CAAC,cAAc,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC;IAEnE,gCAAgC;IAChC,MAAM,gBAAgB,GAAG,MAAM,cAAc,CAAC,WAAW,EAAE,CAAC;IAE5D,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACtB,OAAO;IACT,CAAC;IAED,sCAAsC;IACtC,IAAI,aAAa,GAAG,WAAW,CAAC;IAEhC,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,aAAa,GAAG,MAAM,aAAa,CACjC,CAAC,CAAC,sBAAsB,CAAC,IAAI,iDAAiD,EAC9E,IAAI,CACL,CAAC;IACJ,CAAC;IAED,IAAI,aAAa,EAAE,CAAC;QAClB,MAAM,OAAO,GAAG,aAAa,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,kBAAkB,CAAC,IAAI,oBAAoB,EAAE,CAAC,CAAC;QACvF,OAAO,CAAC,KAAK,EAAE,CAAC;QAEhB,IAAI,CAAC;YACH,MAAM,WAAW,GAAG,MAAM,cAAc,CAAC,eAAe,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;YAEhF,IAAI,WAAW,CAAC,OAAO,IAAI,WAAW,CAAC,OAAO,EAAE,CAAC;gBAC/C,OAAO,CAAC,OAAO,EAAE,CAAC;gBAClB,MAAM,CAAC,GAAG,CAAC,IAAI,GAAG,OAAO,CACvB,WAAW,CAAC,OAAO,EACnB,CAAC,CAAC,oBAAoB,CAAC,IAAI,aAAa,CACzC,CAAC,CAAC;YACL,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,sBAAsB,CAAC,IAAI,6BAA6B,CAAC,CAAC;YAC3E,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,sBAAsB,CAAC,IAAI,2BAA2B,CAAC,CAAC;QACzE,CAAC;IACH,CAAC;AACH,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,cAAc,CAAC,KAAqB;IAClD,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC;IAE/D,qCAAqC;IACrC,OAAO,OAAO;SACX,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC;SAC1B,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC;SAC1B,OAAO,CAAC,eAAe,EAAE,EAAE,CAAC;SAC5B,IAAI,EAAE,CAAC;AACZ,CAAC"}
+{"version":3,"file":"error-helper.js","sourceRoot":"","sources":["../../src/utils/error-helper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,kBAAkB,CAAC;AACrC,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAChE,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,KAAqB,EACrB,OAAgB,EAChB,cAAuB,KAAK;IAE5B,MAAM,YAAY,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC;IAEpE,oBAAoB;IACpB,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,YAAY,EAAE,CAAC,CAAC,cAAc,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC;IAEnE,gCAAgC;IAChC,MAAM,gBAAgB,GAAG,MAAM,cAAc,CAAC,WAAW,EAAE,CAAC;IAE5D,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACtB,OAAO;IACT,CAAC;IAED,sCAAsC;IACtC,IAAI,aAAa,GAAG,WAAW,CAAC;IAEhC,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,aAAa,GAAG,MAAM,aAAa,CACjC,CAAC,CAAC,sBAAsB,CAAC,IAAI,iDAAiD,EAC9E,IAAI,CACL,CAAC;IACJ,CAAC;IAED,IAAI,aAAa,EAAE,CAAC;QAClB,MAAM,OAAO,GAAG,aAAa,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,kBAAkB,CAAC,IAAI,oBAAoB,EAAE,CAAC,CAAC;QACvF,OAAO,CAAC,KAAK,EAAE,CAAC;QAEhB,IAAI,CAAC;YACH,MAAM,WAAW,GAAG,MAAM,cAAc,CAAC,eAAe,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;YAE1G,IAAI,WAAW,CAAC,OAAO,IAAI,WAAW,CAAC,OAAO,EAAE,CAAC;gBAC/C,OAAO,CAAC,OAAO,EAAE,CAAC;gBAClB,MAAM,CAAC,GAAG,CAAC,IAAI,GAAG,OAAO,CACvB,WAAW,CAAC,OAAO,EACnB,CAAC,CAAC,oBAAoB,CAAC,IAAI,aAAa,CACzC,CAAC,CAAC;YACL,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,sBAAsB,CAAC,IAAI,6BAA6B,CAAC,CAAC;YAC3E,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,sBAAsB,CAAC,IAAI,2BAA2B,CAAC,CAAC;QACzE,CAAC;IACH,CAAC;AACH,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,cAAc,CAAC,KAAqB;IAClD,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC;IAE/D,qCAAqC;IACrC,OAAO,OAAO;SACX,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC;SAC1B,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC;SAC1B,OAAO,CAAC,eAAe,EAAE,EAAE,CAAC;SAC5B,IAAI,EAAE,CAAC;AACZ,CAAC"}

package/dist/utils/error-mapper.d.ts

@@ -4,4 +4,13 @@
  * falling back to the generic error message with the original cleaned text.
  */
 export declare function mapGitError(error: unknown): string;
+/**
+ * Maps a Git error with optional AI-powered contextual explanation.
+ * Returns the static message immediately, enriched with Copilot explanation if available.
+ */
+export declare function mapGitErrorWithAI(error: unknown, context?: {
+    command?: string;
+    branch?: string;
+    hasUncommitted?: boolean;
+}): Promise<string>;
 //# sourceMappingURL=error-mapper.d.ts.map

package/dist/utils/error-mapper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"error-mapper.d.ts","sourceRoot":"","sources":["../../src/utils/error-mapper.ts"],"names":[],"mappings":"AAqFA;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAiBlD"}
+{"version":3,"file":"error-mapper.d.ts","sourceRoot":"","sources":["../../src/utils/error-mapper.ts"],"names":[],"mappings":"AAsFA;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAiBlD;AAED;;;GAGG;AACH,wBAAsB,iBAAiB,CACrC,KAAK,EAAE,OAAO,EACd,OAAO,CAAC,EAAE;IAAE,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,cAAc,CAAC,EAAE,OAAO,CAAA;CAAE,GACxE,OAAO,CAAC,MAAM,CAAC,CAgBjB"}

package/dist/utils/error-mapper.js

@@ -1,5 +1,6 @@
 import { t } from '../i18n/index.js';
 import { logger } from './logger.js';
+import { copilotService } from '../services/copilot-service.js';
 const ERROR_PATTERNS = [
     // Most specific patterns first
     {
@@ -93,4 +94,24 @@ export function mapGitError(error) {
     // Fallback: generic error with cleaned message
     return t('errors.generic', { message: cleaned });
 }
+/**
+ * Maps a Git error with optional AI-powered contextual explanation.
+ * Returns the static message immediately, enriched with Copilot explanation if available.
+ */
+export async function mapGitErrorWithAI(error, context) {
+    const staticMessage = mapGitError(error);
+    try {
+        if (await copilotService.isAvailable()) {
+            const rawMessage = extractErrorMessage(error);
+            const aiResult = await copilotService.explainGitError(rawMessage, context);
+            if (aiResult.success && aiResult.message) {
+                return `${staticMessage}\n\n${t('copilot.aiExplanation')}:\n${aiResult.message}`;
+            }
+        }
+    }
+    catch {
+        logger.debug('AI error explanation failed, using static message');
+    }
+    return staticMessage;
+}
 //# sourceMappingURL=error-mapper.js.map

package/dist/utils/error-mapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"error-mapper.js","sourceRoot":"","sources":["../../src/utils/error-mapper.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"error-mapper.js","sourceRoot":"","sources":["../../src/utils/error-mapper.ts"],"names":[],"mappings":"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"}

package/dist/utils/version.d.ts

@@ -1,2 +1,2 @@
-export declare const APP_VERSION = "1.0.15";
+export declare const APP_VERSION = "1.1.1";
 //# sourceMappingURL=version.d.ts.map

package/dist/utils/version.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../src/utils/version.ts"],"names":[],"mappings":"AACA,eAAO,MAAM,WAAW,WAAW,CAAC"}
+{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../src/utils/version.ts"],"names":[],"mappings":"AACA,eAAO,MAAM,WAAW,UAAU,CAAC"}

package/dist/utils/version.js

@@ -1,3 +1,3 @@
 // Auto-generated by scripts/inject-version.js - DO NOT EDIT
-export const APP_VERSION = '1.0.15';
+export const APP_VERSION = '1.1.1';
 //# sourceMappingURL=version.js.map

package/dist/utils/version.js.map

@@ -1 +1 @@
-{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/utils/version.ts"],"names":[],"mappings":"AAAA,4DAA4D;AAC5D,MAAM,CAAC,MAAM,WAAW,GAAG,QAAQ,CAAC"}
+{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/utils/version.ts"],"names":[],"mappings":"AAAA,4DAA4D;AAC5D,MAAM,CAAC,MAAM,WAAW,GAAG,OAAO,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gitcoach-cli",
-  "version": "1.0.15",
+  "version": "1.1.1",
   "description": "AI-powered Git coach CLI that prevents mistakes before they happen",
   "type": "module",
   "main": "dist/index.js",