@commitsage/mcp-server 1.0.0 → 1.1.0

package/dist/server/tools.js

@@ -1,147 +1,47 @@
 /**
  * MCP Tools definitions for CommitSage
  */
-import { z } from 'zod';
-import { AIService } from '../services/aiService.js';
-import { GitService } from '../services/gitService.js';
-import { Logger } from '../utils/logger.js';
-import { ConfigService } from '../utils/config.js';
+import { z } from "zod";
+import { AIService } from "../services/aiService.js";
+import { Logger } from "../utils/logger.js";
+import { ConfigService } from "../utils/config.js";
 // Tool schemas
 export const GenerateCommitMessageSchema = z.object({
-    repoPath: z.string().describe('Path to the git repository'),
-    provider: z
-        .enum(['gemini', 'openai', 'codestral', 'ollama'])
-        .optional()
-        .describe('AI provider to use (defaults to configured provider)'),
-    format: z
-        .enum([
-        'conventional',
-        'angular',
-        'karma',
-        'semantic',
-        'emoji',
-        'emojiKarma',
-        'google',
-        'atom',
-    ])
-        .optional()
-        .describe('Commit message format'),
-    language: z
-        .enum(['english', 'russian', 'chinese', 'japanese', 'spanish'])
-        .optional()
-        .describe('Language for commit message'),
-    onlyStaged: z
-        .boolean()
-        .optional()
-        .describe('Only analyze staged changes (default: false)'),
-    customInstructions: z
+    repoPath: z
         .string()
-        .optional()
-        .describe('Custom instructions for commit message generation'),
-});
-export const AnalyzeChangesSchema = z.object({
-    repoPath: z.string().describe('Path to the git repository'),
-    onlyStaged: z
-        .boolean()
-        .optional()
-        .describe('Only analyze staged changes (default: false)'),
+        .describe("Absolute path to the git repository (e.g. /home/user/project or C:\\Users\\user\\project)"),
 });
-export const ListCommitFormatsSchema = z.object({});
 export const ValidateApiKeySchema = z.object({
     provider: z
-        .enum(['gemini', 'openai', 'codestral', 'ollama'])
-        .describe('Provider to validate'),
-    apiKey: z.string().optional().describe('API key to validate (optional, uses env if not provided)'),
+        .enum(["gemini", "openai", "codestral", "ollama"])
+        .describe("Provider to validate"),
 });
 // Tool handlers
 export async function handleGenerateCommitMessage(args) {
     try {
         Logger.log(`Generating commit message for: ${args.repoPath}`);
-        // Temporarily override config if needed
-        const originalEnv = { ...process.env };
-        if (args.format) {
-            process.env.DEFAULT_COMMIT_FORMAT = args.format;
-        }
-        if (args.language) {
-            process.env.DEFAULT_COMMIT_LANGUAGE = args.language;
-        }
-        if (args.customInstructions) {
-            process.env.USE_CUSTOM_INSTRUCTIONS = 'true';
-            process.env.CUSTOM_INSTRUCTIONS = args.customInstructions;
-        }
-        try {
-            const result = await AIService.generateCommitMessageForRepo(args.repoPath, args.onlyStaged || false, args.provider);
-            return {
-                content: [
-                    {
-                        type: 'text',
-                        text: JSON.stringify({
-                            success: true,
-                            message: result.message,
-                            model: result.model,
-                            provider: args.provider || ConfigService.getProvider(),
-                        }, null, 2),
-                    },
-                ],
-            };
-        }
-        finally {
-            // Restore original env
-            process.env = originalEnv;
-            ConfigService.initialize();
-        }
-    }
-    catch (error) {
-        Logger.error('Error generating commit message:', error);
-        return {
-            content: [
-                {
-                    type: 'text',
-                    text: JSON.stringify({
-                        success: false,
-                        error: error instanceof Error ? error.message : String(error),
-                    }, null, 2),
-                },
-            ],
-            isError: true,
-        };
-    }
-}
-export async function handleAnalyzeChanges(args) {
-    try {
-        Logger.log(`Analyzing changes for: ${args.repoPath}`);
-        await GitService.validateRepository(args.repoPath);
-        const hasStagedChanges = await GitService.hasChanges(args.repoPath, 'staged');
-        const hasUnstagedChanges = await GitService.hasChanges(args.repoPath, 'unstaged');
-        const hasUntrackedFiles = await GitService.hasChanges(args.repoPath, 'untracked');
-        const diff = await GitService.getDiff(args.repoPath, args.onlyStaged || false);
-        const changedFiles = await GitService.getChangedFiles(args.repoPath, args.onlyStaged || false);
+        const onlyStaged = ConfigService.getOnlyStaged();
+        const result = await AIService.generateCommitMessageForRepo(args.repoPath, onlyStaged);
         return {
             content: [
                 {
-                    type: 'text',
+                    type: "text",
                     text: JSON.stringify({
                         success: true,
-                        analysis: {
-                            hasStagedChanges,
-                            hasUnstagedChanges,
-                            hasUntrackedFiles,
-                            changedFilesCount: changedFiles.length,
-                            changedFiles,
-                            diffLength: diff.length,
-                            diffPreview: diff.substring(0, 500),
-                        },
+                        message: result.message,
+                        model: result.model,
+                        provider: ConfigService.getProvider(),
                     }, null, 2),
                 },
             ],
         };
     }
     catch (error) {
-        Logger.error('Error analyzing changes:', error);
+        Logger.error("Error generating commit message:", error);
         return {
             content: [
                 {
-                    type: 'text',
+                    type: "text",
                     text: JSON.stringify({
                         success: false,
                         error: error instanceof Error ? error.message : String(error),
@@ -152,75 +52,19 @@ export async function handleAnalyzeChanges(args) {
         };
     }
 }
-export async function handleListCommitFormats(_args) {
-    const formats = [
-        {
-            name: 'conventional',
-            description: 'Conventional Commits format: type(scope): description',
-            example: 'feat(auth): add OAuth2 authentication',
-        },
-        {
-            name: 'angular',
-            description: 'Angular commit format with type, scope, and summary',
-            example: 'build(deps): update dependency versions',
-        },
-        {
-            name: 'karma',
-            description: 'Karma format: type(scope): message',
-            example: 'fix(parser): handle edge case in tokenizer',
-        },
-        {
-            name: 'semantic',
-            description: 'Semantic format: type: message',
-            example: 'refactor: simplify user authentication flow',
-        },
-        {
-            name: 'emoji',
-            description: 'Emoji-based commit messages',
-            example: ':sparkles: Add dark mode support',
-        },
-        {
-            name: 'emojiKarma',
-            description: 'Combination of emoji and Karma format',
-            example: ':bug: fix(ui): correct button alignment',
-        },
-        {
-            name: 'google',
-            description: 'Google commit format with capitalized type',
-            example: 'Feature: Add user profile page',
-        },
-        {
-            name: 'atom',
-            description: 'Atom editor commit format',
-            example: 'feat(editor): add syntax highlighting',
-        },
-    ];
-    return {
-        content: [
-            {
-                type: 'text',
-                text: JSON.stringify({
-                    success: true,
-                    formats,
-                    currentFormat: ConfigService.getCommitFormat(),
-                }, null, 2),
-            },
-        ],
-    };
-}
 export async function handleValidateApiKey(args) {
     try {
         const provider = args.provider;
         // Ollama doesn't require API key
-        if (provider === 'ollama') {
+        if (provider === "ollama") {
             return {
                 content: [
                     {
-                        type: 'text',
+                        type: "text",
                         text: JSON.stringify({
                             success: true,
                             valid: true,
-                            message: 'Ollama does not require an API key',
+                            message: "Ollama does not require an API key",
                         }),
                     },
                 ],
@@ -231,7 +75,7 @@ export async function handleValidateApiKey(args) {
             return {
                 content: [
                     {
-                        type: 'text',
+                        type: "text",
                         text: JSON.stringify({
                             success: false,
                             valid: false,
@@ -244,7 +88,7 @@ export async function handleValidateApiKey(args) {
         return {
             content: [
                 {
-                    type: 'text',
+                    type: "text",
                     text: JSON.stringify({
                         success: true,
                         valid: true,
@@ -258,7 +102,7 @@ export async function handleValidateApiKey(args) {
         return {
             content: [
                 {
-                    type: 'text',
+                    type: "text",
                     text: JSON.stringify({
                         success: false,
                         error: error instanceof Error ? error.message : String(error),

package/dist/server/tools.js.map

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

package/dist/services/baseAIService.d.ts

@@ -1,46 +1,35 @@
 /**
  * Base AI service utilities
- * Adapted from VSCode extension
  */
-import { HttpUtils } from '../utils/httpUtils.js';
-import { RetryUtils, ApiErrorResult } from '../utils/retryUtils.js';
+import { ApiErrorResult } from "../utils/retryUtils.js";
+import { CommitMessage, ProgressReporter } from "../models/types.js";
+export interface ProviderRequestConfig {
+    url: string;
+    payload: unknown;
+    headers: Record<string, string>;
+    model: string;
+    providerName: string;
+}
 export declare class BaseAIService {
-    /**
-     * Clean commit message
-     */
-    static cleanCommitMessage(message: string): string;
     /**
      * Validate commit message is not empty
      */
     static validateCommitMessage(message: string): string;
-    static createRequestHeaders: typeof HttpUtils.createRequestHeaders;
-    static createRequestConfig: typeof HttpUtils.createRequestConfig;
-    static updateProgressForAttempt: typeof RetryUtils.updateProgressForAttempt;
-    static calculateRetryDelay: typeof RetryUtils.calculateRetryDelay;
-    static delay: typeof RetryUtils.delay;
-    static handleGenerationError: typeof RetryUtils.handleGenerationError;
     /**
      * Extract and validate commit message from response
      */
     static extractAndValidateMessage(content: string | undefined | null, serviceName: string): string;
     /**
-     * Universal HTTP error handler for all AI services
+     * Shared generation method with retry logic for all providers.
+     * Handles: request, response extraction, 401 → ApiKeyInvalidError, retry.
      */
-    static handleHttpError(error: Error, serviceName: string): ApiErrorResult;
+    static generateWithRetry<TResponse>(config: ProviderRequestConfig, extractMessage: (data: TResponse) => string, errorHandler: (error: Error) => ApiErrorResult, progress: ProgressReporter, attempt: number, generateFn: (prompt: string, progress: ProgressReporter, attempt: number) => Promise<CommitMessage>, prompt: string): Promise<CommitMessage>;
     /**
-     * Gemini-specific error handling
-     */
-    static handleGeminiError(error: Error): ApiErrorResult;
-    /**
-     * OpenAI-specific error handling
-     */
-    static handleOpenAIError(error: Error): ApiErrorResult;
-    /**
-     * Codestral-specific error handling
+     * Universal HTTP error handler for all AI services
      */
-    static handleCodestralError(error: Error): ApiErrorResult;
+    static handleHttpError(error: Error, serviceName: string): ApiErrorResult;
     /**
-     * Ollama-specific error handling
+     * Ollama-specific error handling (has extra cases for 404 and connection)
      */
     static handleOllamaError(error: Error): ApiErrorResult;
 }

package/dist/services/baseAIService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"baseAIService.d.ts","sourceRoot":"","sources":["../../src/services/baseAIService.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAWpE,qBAAa,aAAa;IACxB;;OAEG;IACH,MAAM,CAAC,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;IAIlD;;OAEG;IACH,MAAM,CAAC,qBAAqB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;IASrD,MAAM,CAAC,oBAAoB,wCAAkC;IAC7D,MAAM,CAAC,mBAAmB,uCAAiC;IAG3D,MAAM,CAAC,wBAAwB,6CAAuC;IACtE,MAAM,CAAC,mBAAmB,wCAAkC;IAC5D,MAAM,CAAC,KAAK,0BAAoB;IAChC,MAAM,CAAC,qBAAqB,0CAAoC;IAEhE;;OAEG;IACH,MAAM,CAAC,yBAAyB,CAC9B,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,EAClC,WAAW,EAAE,MAAM,GAClB,MAAM;IAOT;;OAEG;IACH,MAAM,CAAC,eAAe,CAAC,KAAK,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,GAAG,cAAc;IA8DzE;;OAEG;IACH,MAAM,CAAC,iBAAiB,CAAC,KAAK,EAAE,KAAK,GAAG,cAAc;IAItD;;OAEG;IACH,MAAM,CAAC,iBAAiB,CAAC,KAAK,EAAE,KAAK,GAAG,cAAc;IAItD;;OAEG;IACH,MAAM,CAAC,oBAAoB,CAAC,KAAK,EAAE,KAAK,GAAG,cAAc;IAWzD;;OAEG;IACH,MAAM,CAAC,iBAAiB,CAAC,KAAK,EAAE,KAAK,GAAG,cAAc;CAyBvD"}
+{"version":3,"file":"baseAIService.d.ts","sourceRoot":"","sources":["../../src/services/baseAIService.ts"],"names":[],"mappings":"AAAA;;GAEG;AAKH,OAAO,EAAc,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAEpE,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAWrE,MAAM,WAAW,qBAAqB;IACpC,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChC,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,qBAAa,aAAa;IACxB;;OAEG;IACH,MAAM,CAAC,qBAAqB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;IAQrD;;OAEG;IACH,MAAM,CAAC,yBAAyB,CAC9B,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,EAClC,WAAW,EAAE,MAAM,GAClB,MAAM;IAOT;;;OAGG;WACU,iBAAiB,CAAC,SAAS,EACtC,MAAM,EAAE,qBAAqB,EAC7B,cAAc,EAAE,CAAC,IAAI,EAAE,SAAS,KAAK,MAAM,EAC3C,YAAY,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,cAAc,EAC9C,QAAQ,EAAE,gBAAgB,EAC1B,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,CACV,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,gBAAgB,EAC1B,OAAO,EAAE,MAAM,KACZ,OAAO,CAAC,aAAa,CAAC,EAC3B,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,aAAa,CAAC;IAwCzB;;OAEG;IACH,MAAM,CAAC,eAAe,CAAC,KAAK,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,GAAG,cAAc;IAgEzE;;OAEG;IACH,MAAM,CAAC,iBAAiB,CAAC,KAAK,EAAE,KAAK,GAAG,cAAc;CAyBvD"}

package/dist/services/baseAIService.js

@@ -1,42 +1,30 @@
 /**
  * Base AI service utilities
- * Adapted from VSCode extension
  */
-import { HttpUtils } from '../utils/httpUtils.js';
-import { RetryUtils } from '../utils/retryUtils.js';
+import axios from "axios";
+import { Logger } from "../utils/logger.js";
+import { HttpUtils } from "../utils/httpUtils.js";
+import { RetryUtils } from "../utils/retryUtils.js";
+import { ApiKeyInvalidError } from "../models/errors.js";
 const errorMessages = {
-    authenticationError: 'Authentication failed. Please check your API key.',
-    paymentRequired: 'Payment required. Please check your account billing.',
-    rateLimitExceeded: 'Rate limit exceeded. Please try again later.',
-    invalidRequest: 'Invalid request. Please check your parameters.',
-    serverError: 'Server error. Please try again later.',
-    apiError: 'API error (status {0})',
+    authenticationError: "Authentication failed. Please check your API key.",
+    paymentRequired: "Payment required. Please check your account billing.",
+    rateLimitExceeded: "Rate limit exceeded. Please try again later.",
+    invalidRequest: "Invalid request. Please check your parameters.",
+    serverError: "Server error. Please try again later.",
+    apiError: "API error (status {0})",
 };
 export class BaseAIService {
-    /**
-     * Clean commit message
-     */
-    static cleanCommitMessage(message) {
-        return message.trim();
-    }
     /**
      * Validate commit message is not empty
      */
     static validateCommitMessage(message) {
-        const cleanMessage = this.cleanCommitMessage(message);
-        if (!cleanMessage.trim()) {
-            throw new Error('Generated commit message is empty.');
+        const cleanMessage = message.trim();
+        if (!cleanMessage) {
+            throw new Error("Generated commit message is empty.");
         }
         return cleanMessage;
     }
-    // Delegate HTTP operations to HttpUtils
-    static createRequestHeaders = HttpUtils.createRequestHeaders;
-    static createRequestConfig = HttpUtils.createRequestConfig;
-    // Delegate retry operations to RetryUtils
-    static updateProgressForAttempt = RetryUtils.updateProgressForAttempt;
-    static calculateRetryDelay = RetryUtils.calculateRetryDelay;
-    static delay = RetryUtils.delay;
-    static handleGenerationError = RetryUtils.handleGenerationError;
     /**
      * Extract and validate commit message from response
      */
@@ -46,6 +34,32 @@ export class BaseAIService {
         }
         return this.validateCommitMessage(content);
     }
+    /**
+     * Shared generation method with retry logic for all providers.
+     * Handles: request, response extraction, 401 → ApiKeyInvalidError, retry.
+     */
+    static async generateWithRetry(config, extractMessage, errorHandler, progress, attempt, generateFn, prompt) {
+        try {
+            Logger.log(`Attempt ${attempt}: Sending request to ${config.providerName}`);
+            await RetryUtils.updateProgressForAttempt(progress, attempt);
+            const requestConfig = HttpUtils.createRequestConfig(config.headers);
+            const response = await axios.post(config.url, config.payload, requestConfig);
+            progress.report({
+                message: "Processing generated message...",
+                increment: 90,
+            });
+            const message = extractMessage(response.data);
+            Logger.log(`Commit message generated using ${config.model} model`);
+            return { message, model: config.model };
+        }
+        catch (error) {
+            const axiosError = error;
+            if (axiosError.response?.status === 401) {
+                throw new ApiKeyInvalidError(config.providerName);
+            }
+            return RetryUtils.handleGenerationError(error, prompt, progress, attempt, generateFn, errorHandler);
+        }
+    }
     /**
      * Universal HTTP error handler for all AI services
      */
@@ -84,68 +98,45 @@ export class BaseAIService {
                 default:
                     const responseData = JSON.stringify(axiosError.response.data);
                     return {
-                        errorMessage: `${errorMessages.apiError.replace('{0}', String(status))}: ${errorMessage || responseData}`,
+                        errorMessage: `${errorMessages.apiError.replace("{0}", String(status))}: ${errorMessage || responseData}`,
                         shouldRetry: status >= 500,
                     };
             }
         }
         // Network errors
-        if (axiosError.code === 'ECONNREFUSED' ||
-            axiosError.code === 'ETIMEDOUT' ||
-            axiosError.message?.includes('ECONNREFUSED') ||
-            axiosError.message?.includes('ETIMEDOUT')) {
+        if (axiosError.code === "ECONNREFUSED" ||
+            axiosError.code === "ETIMEDOUT" ||
+            axiosError.message?.includes("ECONNREFUSED") ||
+            axiosError.message?.includes("ETIMEDOUT")) {
             return {
                 errorMessage: `Could not connect to ${serviceName}. Please check your internet connection.`,
                 shouldRetry: true,
             };
         }
         return {
-            errorMessage: axiosError.message || 'Unknown error',
+            errorMessage: axiosError.message || "Unknown error",
             shouldRetry: false,
         };
     }
     /**
-     * Gemini-specific error handling
-     */
-    static handleGeminiError(error) {
-        return this.handleHttpError(error, 'Gemini API');
-    }
-    /**
-     * OpenAI-specific error handling
-     */
-    static handleOpenAIError(error) {
-        return this.handleHttpError(error, 'OpenAI API');
-    }
-    /**
-     * Codestral-specific error handling
-     */
-    static handleCodestralError(error) {
-        const result = this.handleHttpError(error, 'Codestral API');
-        if (error.response?.status === 401) {
-            result.errorMessage =
-                'Invalid API key. Please check your Codestral API key.';
-        }
-        return result;
-    }
-    /**
-     * Ollama-specific error handling
+     * Ollama-specific error handling (has extra cases for 404 and connection)
      */
     static handleOllamaError(error) {
         const axiosError = error;
         if (axiosError.response?.status === 404) {
             return {
-                errorMessage: 'Model not found. Please check if Ollama is running and the model is installed.',
+                errorMessage: "Model not found. Please check if Ollama is running and the model is installed.",
                 shouldRetry: false,
             };
         }
-        const result = this.handleHttpError(error, 'Ollama');
-        if (result.shouldRetry && error.response?.status === 500) {
+        const result = this.handleHttpError(error, "Ollama");
+        if (result.shouldRetry && axiosError.response?.status === 500) {
             result.errorMessage =
-                'Server error. Please check if Ollama is running properly.';
+                "Server error. Please check if Ollama is running properly.";
         }
-        if (result.shouldRetry && !error.response) {
+        if (result.shouldRetry && !axiosError.response) {
             result.errorMessage =
-                'Could not connect to Ollama. Please make sure Ollama is running.';
+                "Could not connect to Ollama. Please make sure Ollama is running.";
         }
         return result;
     }

package/dist/services/baseAIService.js.map

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

package/dist/services/codestralService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"codestralService.d.ts","sourceRoot":"","sources":["../../src/services/codestralService.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAsBrE,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CACuB;WAExC,qBAAqB,CAChC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,gBAAgB,EAC1B,OAAO,GAAE,MAAU,GAClB,OAAO,CAAC,aAAa,CAAC;IAkDzB,OAAO,CAAC,MAAM,CAAC,oBAAoB;CAIpC"}
+{"version":3,"file":"codestralService.d.ts","sourceRoot":"","sources":["../../src/services/codestralService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAarE,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CACuB;WAExC,qBAAqB,CAChC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,gBAAgB,EAC1B,OAAO,GAAE,MAAU,GAClB,OAAO,CAAC,aAAa,CAAC;IAwBzB,OAAO,CAAC,MAAM,CAAC,oBAAoB;CAIpC"}

package/dist/services/codestralService.js

@@ -1,45 +1,21 @@
-import axios from "axios";
-import { Logger } from "../utils/logger.js";
 import { ConfigService } from "../utils/config.js";
-import { ApiKeyInvalidError } from "../models/errors.js";
 import { BaseAIService } from "./baseAIService.js";
 import { HttpUtils } from "../utils/httpUtils.js";
-import { RetryUtils } from "../utils/retryUtils.js";
-// AI сервис для работы с Mistral Codestral API
-// Реализует интерфейс IAIService со статическими методами
 export class CodestralService {
     static apiUrl = "https://codestral.mistral.ai/v1/chat/completions";
     static async generateCommitMessage(prompt, progress, attempt = 1) {
-        try {
-            const apiKey = ConfigService.getApiKey("codestral");
-            const model = ConfigService.getCodestralModel();
-            const payload = {
-                model: model,
+        const apiKey = ConfigService.getApiKey("codestral");
+        const model = ConfigService.getCodestralModel();
+        return BaseAIService.generateWithRetry({
+            url: this.apiUrl,
+            payload: {
+                model,
                 messages: [{ role: "user", content: prompt }],
-            };
-            void Logger.log(`Attempt ${attempt}: Sending request to Codestral API`);
-            await RetryUtils.updateProgressForAttempt(progress, attempt);
-            const headers = HttpUtils.createRequestHeaders(apiKey);
-            const requestConfig = HttpUtils.createRequestConfig(headers);
-            const response = await axios.post(this.apiUrl, payload, requestConfig);
-            void Logger.log("Codestral API response received successfully");
-            progress.report({
-                message: "Processing generated message...",
-                increment: 90,
-            });
-            const commitMessage = this.extractCommitMessage(response.data);
-            void Logger.log(`Commit message generated using ${model} model`);
-            return { message: commitMessage, model };
-        }
-        catch (error) {
-            // Обработка специальных случаев для Codestral
-            const axiosError = error;
-            if (axiosError.response?.status === 401) {
-                throw new ApiKeyInvalidError("Codestral");
-            }
-            // Используем retry utils для retry логики
-            return RetryUtils.handleGenerationError(error, prompt, progress, attempt, this.generateCommitMessage.bind(this), BaseAIService.handleCodestralError.bind(BaseAIService));
-        }
+            },
+            headers: HttpUtils.createRequestHeaders(apiKey),
+            model,
+            providerName: "Codestral",
+        }, (data) => this.extractCommitMessage(data), (error) => BaseAIService.handleHttpError(error, "Codestral API"), progress, attempt, this.generateCommitMessage.bind(this), prompt);
     }
     static extractCommitMessage(response) {
         const content = response.choices?.[0]?.message?.content;

package/dist/services/codestralService.js.map

@@ -1 +1 @@
-{"version":3,"file":"codestralService.js","sourceRoot":"","sources":["../../src/services/codestralService.ts"],"names":[],"mappings":"AAAA,OAAO,KAAqB,MAAM,OAAO,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAE5C,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAepD,+CAA+C;AAC/C,0DAA0D;AAC1D,MAAM,OAAO,gBAAgB;IACnB,MAAM,CAAU,MAAM,GAC5B,kDAAkD,CAAC;IAErD,MAAM,CAAC,KAAK,CAAC,qBAAqB,CAChC,MAAc,EACd,QAA0B,EAC1B,UAAkB,CAAC;QAEnB,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,aAAa,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;YACpD,MAAM,KAAK,GAAG,aAAa,CAAC,iBAAiB,EAAE,CAAC;YAEhD,MAAM,OAAO,GAAG;gBACd,KAAK,EAAE,KAAK;gBACZ,QAAQ,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;aAC9C,CAAC;YAEF,KAAK,MAAM,CAAC,GAAG,CAAC,WAAW,OAAO,oCAAoC,CAAC,CAAC;YACxE,MAAM,UAAU,CAAC,wBAAwB,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;YAE7D,MAAM,OAAO,GAAG,SAAS,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC;YACvD,MAAM,aAAa,GAAG,SAAS,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC;YAE7D,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,IAAI,CAC/B,IAAI,CAAC,MAAM,EACX,OAAO,EACP,aAAa,CACd,CAAC;YAEF,KAAK,MAAM,CAAC,GAAG,CAAC,8CAA8C,CAAC,CAAC;YAChE,QAAQ,CAAC,MAAM,CAAC;gBACd,OAAO,EAAE,iCAAiC;gBAC1C,SAAS,EAAE,EAAE;aACd,CAAC,CAAC;YAEH,MAAM,aAAa,GAAG,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YAC/D,KAAK,MAAM,CAAC,GAAG,CAAC,kCAAkC,KAAK,QAAQ,CAAC,CAAC;YACjE,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC;QAC3C,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,8CAA8C;YAC9C,MAAM,UAAU,GAAG,KAAmB,CAAC;YACvC,IAAI,UAAU,CAAC,QAAQ,EAAE,MAAM,KAAK,GAAG,EAAE,CAAC;gBACxC,MAAM,IAAI,kBAAkB,CAAC,WAAW,CAAC,CAAC;YAC5C,CAAC;YAED,0CAA0C;YAC1C,OAAO,UAAU,CAAC,qBAAqB,CACrC,KAAc,EACd,MAAM,EACN,QAAQ,EACR,OAAO,EACP,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC,EACrC,aAAa,CAAC,oBAAoB,CAAC,IAAI,CAAC,aAAa,CAAC,CACvD,CAAC;QACJ,CAAC;IACH,CAAC;IAEO,MAAM,CAAC,oBAAoB,CAAC,QAA2B;QAC7D,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC;QACxD,OAAO,aAAa,CAAC,yBAAyB,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IACvE,CAAC"}
+{"version":3,"file":"codestralService.js","sourceRoot":"","sources":["../../src/services/codestralService.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAUlD,MAAM,OAAO,gBAAgB;IACnB,MAAM,CAAU,MAAM,GAC5B,kDAAkD,CAAC;IAErD,MAAM,CAAC,KAAK,CAAC,qBAAqB,CAChC,MAAc,EACd,QAA0B,EAC1B,UAAkB,CAAC;QAEnB,MAAM,MAAM,GAAG,aAAa,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;QACpD,MAAM,KAAK,GAAG,aAAa,CAAC,iBAAiB,EAAE,CAAC;QAEhD,OAAO,aAAa,CAAC,iBAAiB,CACpC;YACE,GAAG,EAAE,IAAI,CAAC,MAAM;YAChB,OAAO,EAAE;gBACP,KAAK;gBACL,QAAQ,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;aAC9C;YACD,OAAO,EAAE,SAAS,CAAC,oBAAoB,CAAC,MAAM,CAAC;YAC/C,KAAK;YACL,YAAY,EAAE,WAAW;SAC1B,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,EACzC,CAAC,KAAK,EAAE,EAAE,CAAC,aAAa,CAAC,eAAe,CAAC,KAAK,EAAE,eAAe,CAAC,EAChE,QAAQ,EACR,OAAO,EACP,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC,EACrC,MAAM,CACP,CAAC;IACJ,CAAC;IAEO,MAAM,CAAC,oBAAoB,CAAC,QAA2B;QAC7D,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC;QACxD,OAAO,aAAa,CAAC,yBAAyB,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IACvE,CAAC"}