codereview-aia 0.1.4 → 0.2.1

package/dist/clients/openRouterClient.js

@@ -65,6 +65,9 @@ const promptLoader_1 = require("./utils/promptLoader");
 const tokenCounter_1 = require("./utils/tokenCounter");
 // Track if we've initialized a model successfully
 let modelInitialized = false;
+const OPENROUTER_FALLBACK_MODEL = process.env.AI_CODE_REVIEW_FALLBACK_MODEL || 'openrouter:x-ai/grok-4-fast';
+const MAX_ATTEMPTS_PER_MODEL = 3;
+const RETRY_BASE_DELAY_MS = 750;
 /**
  * Determine appropriate max_tokens based on review type and context
  */
@@ -153,6 +156,261 @@ async function initializeAnyOpenRouterModel() {
         return false;
     }
 }
+function extractModelName(identifier) {
+    const trimmed = identifier.trim();
+    if (!trimmed) {
+        return trimmed;
+    }
+    return trimmed.includes(':') ? trimmed.split(':', 2)[1] : trimmed;
+}
+function getModelPriorityList(options) {
+    const configured = options?.model || (0, ConfigurationService_1.getConfig)().model || 'openrouter:moonshotai/kimi-k2-thinking';
+    const preferred = extractModelName(configured);
+    const fallback = extractModelName(OPENROUTER_FALLBACK_MODEL);
+    const models = [preferred];
+    if (fallback && !models.includes(fallback)) {
+        models.push(fallback);
+    }
+    return models.filter(Boolean);
+}
+function shouldEnableReasoning(modelName) {
+    return modelName.toLowerCase().includes('moonshotai/kimi');
+}
+function isRetryableError(error) {
+    if (!error) {
+        return true;
+    }
+    if (error instanceof apiErrorHandler_1.TokenLimitError) {
+        return false;
+    }
+    if (error instanceof apiErrorHandler_1.ApiError) {
+        if (typeof error.statusCode === 'number' && error.statusCode >= 500) {
+            return true;
+        }
+        const detailString = typeof error.details === 'string'
+            ? error.details.toLowerCase()
+            : error.details
+                ? JSON.stringify(error.details).toLowerCase()
+                : '';
+        const message = error.message?.toLowerCase?.() ?? '';
+        if (detailString.includes('upstream request failed') || message.includes('upstream request failed')) {
+            return true;
+        }
+        return false;
+    }
+    if (error instanceof Error) {
+        const message = error.message.toLowerCase();
+        return (message.includes('network') ||
+            message.includes('fetch failed') ||
+            message.includes('upstream request failed') ||
+            message.includes('timeout'));
+    }
+    return false;
+}
+function delay(ms) {
+    return new Promise((resolve) => setTimeout(resolve, ms));
+}
+async function executeWithRetries(buildPayload, meta) {
+    const models = getModelPriorityList(meta.options);
+    let lastError;
+    for (let modelIdx = 0; modelIdx < models.length; modelIdx += 1) {
+        const modelName = models[modelIdx];
+        for (let attempt = 1; attempt <= MAX_ATTEMPTS_PER_MODEL; attempt += 1) {
+            try {
+                const payload = buildPayload(modelName);
+                return await performOpenRouterRequest(modelName, payload, meta);
+            }
+            catch (error) {
+                if (error instanceof apiErrorHandler_1.TokenLimitError) {
+                    throw error;
+                }
+                const shouldRetry = isRetryableError(error) && attempt < MAX_ATTEMPTS_PER_MODEL;
+                if (!shouldRetry) {
+                    lastError = error;
+                    logger_1.default.warn(`[OpenRouter] ${modelName} failed (attempt ${attempt}/${MAX_ATTEMPTS_PER_MODEL}): ${error instanceof Error ? error.message : String(error)}`);
+                    break;
+                }
+                const delayMs = RETRY_BASE_DELAY_MS * Math.pow(2, attempt - 1);
+                logger_1.default.warn(`[OpenRouter] ${modelName} failed (attempt ${attempt}/${MAX_ATTEMPTS_PER_MODEL}): ${error instanceof Error ? error.message : String(error)}. Retrying in ${Math.round(delayMs)}ms`);
+                await delay(delayMs);
+            }
+        }
+        if (modelIdx < models.length - 1) {
+            logger_1.default.warn(`[OpenRouter] Falling back to secondary model after repeated failures with ${models[modelIdx]}`);
+        }
+    }
+    throw lastError instanceof Error
+        ? lastError
+        : new apiErrorHandler_1.ApiError('All configured OpenRouter models failed after retries');
+}
+async function performOpenRouterRequest(modelName, payload, meta) {
+    let cost;
+    const finalPayload = (0, openrouterProxy_1.withProxyMetadata)({
+        ...payload,
+        model: modelName,
+        provider: {
+            sort: 'throughput',
+        },
+        ...(shouldEnableReasoning(modelName) ? { reasoning: { enabled: true } } : {}),
+    });
+    const response = await fetch((0, openrouterProxy_1.resolveOpenRouterProxyUrl)(), {
+        method: 'POST',
+        headers: (0, openrouterProxy_1.buildOpenRouterProxyHeaders)(),
+        body: JSON.stringify(finalPayload),
+    });
+    if (!response.ok) {
+        let errorData;
+        try {
+            errorData = await response.json();
+        }
+        catch {
+            // ignore
+        }
+        const errorMessage = JSON.stringify(errorData || {});
+        const lowered = errorMessage.toLowerCase();
+        if (lowered.includes('token') &&
+            (lowered.includes('limit') || lowered.includes('exceed') || lowered.includes('too long') || lowered.includes('too many'))) {
+            const { countTokens } = await Promise.resolve().then(() => __importStar(require('../tokenizers')));
+            const tokenCount = countTokens(meta.prompt, modelName);
+            throw new apiErrorHandler_1.TokenLimitError(`Token limit exceeded for model ${modelName}. Content has ${tokenCount.toLocaleString()} tokens. Consider using --multi-pass flag for large codebases.`, tokenCount, undefined, response.status, errorData);
+        }
+        throw new apiErrorHandler_1.ApiError(`OpenRouter API error: ${errorMessage}`, response.status, errorData);
+    }
+    const data = await response.json();
+    const finishReason = data.choices?.[0]?.finish_reason;
+    const responseContent = data.choices?.[0]?.message?.content || '';
+    const truncated = isResponseTruncated(responseContent, finishReason);
+    logger_1.default.debug(`[OpenRouter] API Response structure:`, {
+        hasChoices: !!data.choices,
+        choicesLength: data.choices?.length || 0,
+        firstChoiceExists: !!(data.choices && data.choices[0]),
+        firstChoiceMessage: data.choices?.[0]?.message ? 'exists' : 'missing',
+        contentExists: !!responseContent,
+        contentLength: responseContent.length,
+        contentPreview: responseContent.substring(0, 100) || 'N/A',
+        finishReason: finishReason || 'unknown',
+        isTruncated: truncated,
+        maxTokensUsed: getMaxTokensForReviewType(meta.reviewType, meta.isConsolidation) || 'unlimited',
+        fullResponse: JSON.stringify(data).substring(0, 500) + '...',
+    });
+    if (!responseContent || responseContent.trim().length === 0) {
+        logger_1.default.error(`[OpenRouter] CRITICAL: API returned successful response but content is empty!`);
+        logger_1.default.error(`[OpenRouter] Response details:`, {
+            modelName,
+            promptLength: meta.prompt.length,
+            responseStatus: response.status,
+            responseHeaders: Object.fromEntries(response.headers.entries()),
+            fullApiResponse: JSON.stringify(data, null, 2),
+        });
+        throw new apiErrorHandler_1.ApiError(`OpenRouter API returned empty content for model ${modelName}`);
+    }
+    if (finishReason === 'length' || finishReason === 'MAX_TOKENS') {
+        logger_1.default.warn(`[OpenRouter] WARNING: Response truncated due to token limit!`);
+        logger_1.default.warn(`[OpenRouter] Truncation details:`, {
+            modelName,
+            finishReason,
+            contentLength: responseContent.length,
+            maxTokensRequested: getMaxTokensForReviewType(meta.reviewType, meta.isConsolidation) || 'unlimited',
+            reviewType: meta.reviewType,
+            isConsolidation: meta.isConsolidation || false,
+        });
+    }
+    else if (truncated) {
+        logger_1.default.debug(`[OpenRouter] Response appears truncated by heuristics, but finishReason is ${finishReason}. Proceeding to JSON parse.`);
+    }
+    logger_1.default.debug(`Successfully generated review with OpenRouter ${modelName}`);
+    try {
+        cost = (0, tokenCounter_1.getCostInfoFromText)(meta.prompt, responseContent, `openrouter:${modelName}`);
+    }
+    catch (error) {
+        logger_1.default.warn(`Failed to calculate cost information: ${error instanceof Error ? error.message : String(error)}`);
+    }
+    let structuredData = null;
+    try {
+        const jsonExtractionStrategies = [
+            () => {
+                const patterns = [
+                    /```(?:json)?\s*([\s\S]*?)\s*```/,
+                    /```(?:typescript|javascript|ts|js)?\s*([\s\S]*?)\s*```/,
+                ];
+                for (const pattern of patterns) {
+                    const match = responseContent.match(pattern);
+                    if (match && match[1]) {
+                        const extracted = match[1].trim();
+                        if (extracted.startsWith('{') && extracted.endsWith('}')) {
+                            return extracted;
+                        }
+                    }
+                }
+                return null;
+            },
+            () => {
+                const startIdx = responseContent.indexOf('{');
+                if (startIdx === -1)
+                    return null;
+                let depth = 0;
+                let inString = false;
+                let escapeNext = false;
+                for (let i = startIdx; i < responseContent.length; i += 1) {
+                    const char = responseContent[i];
+                    if (escapeNext) {
+                        escapeNext = false;
+                        continue;
+                    }
+                    if (char === '\\') {
+                        escapeNext = true;
+                        continue;
+                    }
+                    if (char === '"' && !escapeNext) {
+                        inString = !inString;
+                        continue;
+                    }
+                    if (!inString) {
+                        if (char === '{')
+                            depth += 1;
+                        else if (char === '}') {
+                            depth -= 1;
+                            if (depth === 0) {
+                                return responseContent.substring(startIdx, i + 1);
+                            }
+                        }
+                    }
+                }
+                if (inString) {
+                    return responseContent.substring(startIdx) + '"}';
+                }
+                return null;
+            },
+            () => responseContent,
+        ];
+        for (const strategy of jsonExtractionStrategies) {
+            try {
+                const extracted = strategy();
+                if (extracted) {
+                    structuredData = JSON.parse(extracted);
+                    logger_1.default.debug('Successfully extracted and parsed JSON');
+                    break;
+                }
+            }
+            catch (err) {
+                logger_1.default.debug(`JSON extraction strategy failed: ${err instanceof Error ? err.message : String(err)}`);
+            }
+        }
+        if (structuredData && !structuredData.summary && !Array.isArray(structuredData.issues)) {
+            logger_1.default.warn('Response is valid JSON but does not have the expected structure');
+        }
+    }
+    catch (parseError) {
+        logger_1.default.warn(`Failed to parse response as JSON after all recovery attempts: ${parseError instanceof Error ? parseError.message : String(parseError)}`);
+        structuredData = null;
+    }
+    return {
+        content: responseContent,
+        structuredData,
+        cost,
+        modelName,
+    };
+}
 /**
  * Generate a code review using the OpenRouter API
  * @param fileContent Content of the file to review
@@ -164,46 +422,16 @@ async function initializeAnyOpenRouterModel() {
  */
 async function generateOpenRouterReview(fileContent, filePath, reviewType, projectDocs, options) {
     try {
-        // Initialize the model if we haven't already
         if (!modelInitialized) {
             await initializeAnyOpenRouterModel();
         }
-        // Use the imported dependencies
-        // Get API key from environment variables
-        let content;
-        let cost;
-        // Get the language from the file extension
-        // const language = getLanguageFromExtension(filePath); // Currently unused
-        // Load the appropriate prompt template
         const promptTemplate = await (0, promptLoader_1.loadPromptTemplate)(reviewType, options);
-        // Format the prompt
         const prompt = (0, promptFormatter_1.formatSingleFileReviewPrompt)(promptTemplate, fileContent, filePath, projectDocs, options?.runContext);
-        // For consolidation mode, use the writer model if specified, otherwise use the review model
-        let modelName;
-        if (options?.isConsolidation) {
-            // During consolidation, the model is already set in the environment by consolidateReview.ts
-            const consolidationModel = process.env.AI_CODE_REVIEW_MODEL || '';
-            const [, model] = consolidationModel.includes(':')
-                ? consolidationModel.split(':')
-                : ['openrouter', consolidationModel];
-            modelName = model;
-            logger_1.default.debug(`[OpenRouter] Using consolidation model for single file: ${modelName}`);
-        }
-        else {
-            // Regular review - use the configured model
-            const result = isOpenRouterModel();
-            modelName = result.modelName;
-            logger_1.default.debug(`[OpenRouter] Using review model for single file: ${modelName}`);
-        }
-        try {
-            logger_1.default.debug(`Generating review with OpenRouter ${modelName}...`);
-            const requestMaxTokens = getMaxTokensForReviewType(reviewType, options?.isConsolidation);
-            const payload = (0, openrouterProxy_1.withProxyMetadata)({
-                model: modelName,
-                messages: [
-                    {
-                        role: 'system',
-                        content: `You are an expert code reviewer. Focus on providing actionable feedback. IMPORTANT: DO NOT REPEAT THE INSTRUCTIONS IN YOUR RESPONSE. DO NOT ASK FOR CODE TO REVIEW. ASSUME THE CODE IS ALREADY PROVIDED IN THE USER MESSAGE. FOCUS ONLY ON PROVIDING THE CODE REVIEW CONTENT.
+        const requestMaxTokens = getMaxTokensForReviewType(reviewType, options?.isConsolidation);
+        const messages = [
+            {
+                role: 'system',
+                content: `You are an expert code reviewer. Focus on providing actionable feedback. IMPORTANT: DO NOT REPEAT THE INSTRUCTIONS IN YOUR RESPONSE. DO NOT ASK FOR CODE TO REVIEW. ASSUME THE CODE IS ALREADY PROVIDED IN THE USER MESSAGE. FOCUS ONLY ON PROVIDING THE CODE REVIEW CONTENT.
 
 IMPORTANT: Your response MUST be in the following JSON format:
 
@@ -233,209 +461,30 @@ IMPORTANT: Your response MUST be in the following JSON format:
 }
 
 Ensure your response is valid JSON. Do not include any text outside the JSON structure.`,
-                    },
-                    {
-                        role: 'user',
-                        content: prompt,
-                    },
-                ],
-                temperature: 0.2,
-                ...(requestMaxTokens ? { max_tokens: requestMaxTokens } : {}),
-            });
-            // Make the API request via proxy
-            const response = await fetch((0, openrouterProxy_1.resolveOpenRouterProxyUrl)(), {
-                method: 'POST',
-                headers: (0, openrouterProxy_1.buildOpenRouterProxyHeaders)(),
-                body: JSON.stringify(payload),
-            });
-            if (!response.ok) {
-                const errorData = await response.json();
-                // Check for token limit errors
-                const errorMessage = JSON.stringify(errorData).toLowerCase();
-                if (errorMessage.includes('token') &&
-                    (errorMessage.includes('limit') ||
-                        errorMessage.includes('exceed') ||
-                        errorMessage.includes('too long') ||
-                        errorMessage.includes('too many'))) {
-                    // Extract token count from prompt if possible
-                    const { countTokens } = await Promise.resolve().then(() => __importStar(require('../tokenizers')));
-                    const tokenCount = countTokens(prompt, modelName);
-                    throw new apiErrorHandler_1.TokenLimitError(`Token limit exceeded for model ${modelName}. Content has ${tokenCount.toLocaleString()} tokens. Consider using --multi-pass flag for large codebases.`, tokenCount, undefined, response.status, errorData);
-                }
-                throw new Error(`OpenRouter API error: ${JSON.stringify(errorData)}`);
-            }
-            const data = await response.json();
-            // Enhanced logging for debugging empty content issue
-            const finishReason = data.choices?.[0]?.finish_reason;
-            const responseContent = data.choices?.[0]?.message?.content || '';
-            const isTruncated = isResponseTruncated(responseContent, finishReason);
-            logger_1.default.debug(`[OpenRouter] API Response structure:`, {
-                hasChoices: !!data.choices,
-                choicesLength: data.choices?.length || 0,
-                firstChoiceExists: !!(data.choices && data.choices[0]),
-                firstChoiceMessage: data.choices?.[0]?.message ? 'exists' : 'missing',
-                contentExists: !!responseContent,
-                contentLength: responseContent.length,
-                contentPreview: responseContent.substring(0, 100) || 'N/A',
-                finishReason: finishReason || 'unknown',
-                isTruncated: isTruncated,
-                maxTokensUsed: getMaxTokensForReviewType(reviewType, options?.isConsolidation) || 'unlimited',
-                fullResponse: JSON.stringify(data).substring(0, 500) + '...',
-            });
-            if (data.choices && data.choices.length > 0) {
-                content = data.choices[0].message.content;
-                // Critical check for empty content
-                if (!content || content.trim().length === 0) {
-                    logger_1.default.error(`[OpenRouter] CRITICAL: API returned successful response but content is empty!`);
-                    logger_1.default.error(`[OpenRouter] Response details:`, {
-                        modelName,
-                        promptLength: prompt.length,
-                        responseStatus: response.status,
-                        responseHeaders: Object.fromEntries(response.headers.entries()),
-                        fullApiResponse: JSON.stringify(data, null, 2),
-                    });
-                    throw new Error(`OpenRouter API returned empty content for model ${modelName}`);
-                }
-                // Check for truncated responses
-                if (isTruncated) {
-                    logger_1.default.warn(`[OpenRouter] WARNING: Response appears to be truncated!`);
-                    logger_1.default.warn(`[OpenRouter] Truncation details:`, {
-                        modelName,
-                        finishReason,
-                        contentLength: content.length,
-                        maxTokensRequested: getMaxTokensForReviewType(reviewType, options?.isConsolidation) || 'unlimited',
-                        reviewType,
-                        isConsolidation: options?.isConsolidation || false,
-                    });
-                    // For now, we'll continue with the truncated response but log it
-                    // In the future, we could implement retry logic with shorter prompts
-                }
-                logger_1.default.debug(`Successfully generated review with OpenRouter ${modelName}`);
-            }
-            else {
-                logger_1.default.error(`[OpenRouter] Invalid response format:`, JSON.stringify(data, null, 2));
-                throw new Error(`Invalid response format from OpenRouter ${modelName}`);
-            }
-            // Calculate cost information
-            try {
-                cost = (0, tokenCounter_1.getCostInfoFromText)(prompt, content, `openrouter:${modelName}`);
-            }
-            catch (error) {
-                logger_1.default.warn(`Failed to calculate cost information: ${error instanceof Error ? error.message : String(error)}`);
-            }
-        }
-        catch (error) {
-            // Re-throw TokenLimitError with additional context
-            if (error instanceof apiErrorHandler_1.TokenLimitError) {
-                throw error;
-            }
-            throw new apiErrorHandler_1.ApiError(`Failed to generate review with OpenRouter ${modelName}: ${error instanceof Error ? error.message : String(error)}`);
-        }
-        // Try to parse the response as JSON with robust error recovery
-        let structuredData = null;
-        try {
-            // Try multiple strategies to extract JSON from the response
-            const jsonExtractionStrategies = [
-                // Strategy 1: Look for JSON in markdown code blocks
-                () => {
-                    const patterns = [
-                        /```(?:json)?\s*([\s\S]*?)\s*```/,
-                        /```(?:typescript|javascript|ts|js)?\s*([\s\S]*?)\s*```/,
-                    ];
-                    for (const pattern of patterns) {
-                        const match = content.match(pattern);
-                        if (match && match[1]) {
-                            const extracted = match[1].trim();
-                            if (extracted.startsWith('{') && extracted.endsWith('}')) {
-                                return extracted;
-                            }
-                        }
-                    }
-                    return null;
-                },
-                // Strategy 2: Find balanced JSON object
-                () => {
-                    const startIdx = content.indexOf('{');
-                    if (startIdx === -1)
-                        return null;
-                    let depth = 0;
-                    let inString = false;
-                    let escapeNext = false;
-                    for (let i = startIdx; i < content.length; i++) {
-                        const char = content[i];
-                        if (escapeNext) {
-                            escapeNext = false;
-                            continue;
-                        }
-                        if (char === '\\') {
-                            escapeNext = true;
-                            continue;
-                        }
-                        if (char === '"' && !escapeNext) {
-                            inString = !inString;
-                            continue;
-                        }
-                        if (!inString) {
-                            if (char === '{')
-                                depth++;
-                            else if (char === '}') {
-                                depth--;
-                                if (depth === 0) {
-                                    return content.substring(startIdx, i + 1);
-                                }
-                            }
-                        }
-                    }
-                    // If we couldn't find balanced braces, try to fix unterminated strings
-                    if (inString) {
-                        // Add a closing quote and try to close the object
-                        return content.substring(startIdx) + '"}';
-                    }
-                    return null;
-                },
-                // Strategy 3: Use the content as-is
-                () => content,
-            ];
-            let jsonContent = null;
-            for (const strategy of jsonExtractionStrategies) {
-                try {
-                    const extracted = strategy();
-                    if (extracted) {
-                        // Try to parse the extracted content
-                        structuredData = JSON.parse(extracted);
-                        // Validate that it has the expected structure
-                        if (structuredData && typeof structuredData === 'object') {
-                            jsonContent = extracted;
-                            logger_1.default.debug('Successfully extracted and parsed JSON');
-                            break;
-                        }
-                    }
-                }
-                catch (err) {
-                    // Continue to next strategy
-                    logger_1.default.debug(`JSON extraction strategy failed: ${err instanceof Error ? err.message : String(err)}`);
-                }
-            }
-            // If we successfully parsed JSON, validate its structure
-            if (structuredData && !structuredData.summary && !Array.isArray(structuredData.issues)) {
-                logger_1.default.warn('Response is valid JSON but does not have the expected structure');
-                // Still keep the structured data as it might have partial information
-            }
-        }
-        catch (parseError) {
-            logger_1.default.warn(`Failed to parse response as JSON after all recovery attempts: ${parseError instanceof Error ? parseError.message : String(parseError)}`);
-            // Keep the original response as content
-            structuredData = null;
-        }
-        // Return the review result
+            },
+            {
+                role: 'user',
+                content: prompt,
+            },
+        ];
+        const callResult = await executeWithRetries(() => ({
+            messages,
+            temperature: 0.2,
+            ...(requestMaxTokens ? { max_tokens: requestMaxTokens } : {}),
+        }), {
+            prompt,
+            reviewType,
+            isConsolidation: options?.isConsolidation,
+            options,
+        });
         return {
-            content,
-            cost,
-            modelUsed: `openrouter:${modelName}`,
+            content: callResult.content,
+            cost: callResult.cost,
+            modelUsed: `openrouter:${callResult.modelName}`,
             filePath,
             reviewType,
             timestamp: new Date().toISOString(),
-            structuredData,
+            structuredData: callResult.structuredData,
         };
     }
     catch (error) {
@@ -454,52 +503,20 @@ Ensure your response is valid JSON. Do not include any text outside the JSON str
  */
 async function generateOpenRouterConsolidatedReview(files, projectName, reviewType, projectDocs, options) {
     try {
-        // Initialize the model if we haven't already
         if (!modelInitialized) {
             await initializeAnyOpenRouterModel();
         }
-        // Use the imported dependencies
-        // Get API key from environment variables
-        let content;
-        let cost;
-        // Load the appropriate prompt template
         const promptTemplate = await (0, promptLoader_1.loadPromptTemplate)(reviewType, options);
-        // Format the prompt
         const prompt = (0, promptFormatter_1.formatConsolidatedReviewPrompt)(promptTemplate, projectName, files.map((file) => ({
             relativePath: file.relativePath || '',
             content: file.content,
             sizeInBytes: file.content.length,
         })), projectDocs, options?.runContext);
-        // For consolidation mode, use the writer model if specified, otherwise use the review model
-        let modelName;
-        if (options?.isConsolidation) {
-            // During consolidation, the model is already set in the environment by consolidateReview.ts
-            const consolidationModel = process.env.AI_CODE_REVIEW_MODEL || '';
-            const [, model] = consolidationModel.includes(':')
-                ? consolidationModel.split(':')
-                : ['openrouter', consolidationModel];
-            modelName = model;
-            logger_1.default.debug(`[OpenRouter] Using consolidation model: ${modelName}`);
-        }
-        else {
-            // Regular review - use the configured model
-            const result = isOpenRouterModel();
-            modelName = result.modelName;
-            logger_1.default.debug(`[OpenRouter] Using review model: ${modelName}`);
-        }
-        // Validate that we have a non-empty model name
-        if (!modelName || modelName.trim() === '') {
-            throw new Error(`Invalid or empty model name: '${modelName}'. Check your model configuration.`);
-        }
-        try {
-            logger_1.default.debug(`Generating consolidated review with OpenRouter ${modelName}...`);
-            const consolidationMaxTokens = getMaxTokensForReviewType(reviewType, options?.isConsolidation);
-            const payload = (0, openrouterProxy_1.withProxyMetadata)({
-                model: modelName,
-                messages: [
-                    {
-                        role: 'system',
-                        content: `You are an expert code reviewer. Focus on providing actionable feedback. IMPORTANT: DO NOT REPEAT THE INSTRUCTIONS IN YOUR RESPONSE. DO NOT ASK FOR CODE TO REVIEW. ASSUME THE CODE IS ALREADY PROVIDED IN THE USER MESSAGE. FOCUS ONLY ON PROVIDING THE CODE REVIEW CONTENT.
+        const requestMaxTokens = getMaxTokensForReviewType(reviewType, options?.isConsolidation);
+        const messages = [
+            {
+                role: 'system',
+                content: `You are an expert code reviewer. Focus on providing actionable feedback. IMPORTANT: DO NOT REPEAT THE INSTRUCTIONS IN YOUR RESPONSE. DO NOT ASK FOR CODE TO REVIEW. ASSUME THE CODE IS ALREADY PROVIDED IN THE USER MESSAGE. FOCUS ONLY ON PROVIDING THE CODE REVIEW CONTENT.
 
 IMPORTANT: Your response MUST be in the following JSON format:
 
@@ -529,205 +546,30 @@ IMPORTANT: Your response MUST be in the following JSON format:
 }
 
 Ensure your response is valid JSON. Do not include any text outside the JSON structure.`,
-                    },
-                    {
-                        role: 'user',
-                        content: prompt,
-                    },
-                ],
-                temperature: 0.2,
-                ...(consolidationMaxTokens ? { max_tokens: consolidationMaxTokens } : {}),
-            });
-            // Make the API request
-            const response = await fetch((0, openrouterProxy_1.resolveOpenRouterProxyUrl)(), {
-                method: 'POST',
-                headers: (0, openrouterProxy_1.buildOpenRouterProxyHeaders)(),
-                body: JSON.stringify(payload),
-            });
-            if (!response.ok) {
-                const errorData = await response.json();
-                // Check for token limit errors
-                const errorMessage = JSON.stringify(errorData).toLowerCase();
-                if (errorMessage.includes('token') &&
-                    (errorMessage.includes('limit') ||
-                        errorMessage.includes('exceed') ||
-                        errorMessage.includes('too long') ||
-                        errorMessage.includes('too many'))) {
-                    // Extract token count from prompt if possible
-                    const { countTokens } = await Promise.resolve().then(() => __importStar(require('../tokenizers')));
-                    const tokenCount = countTokens(prompt, modelName);
-                    throw new apiErrorHandler_1.TokenLimitError(`Token limit exceeded for model ${modelName}. Content has ${tokenCount.toLocaleString()} tokens. Consider using --multi-pass flag for large codebases.`, tokenCount, undefined, response.status, errorData);
-                }
-                throw new Error(`OpenRouter API error: ${JSON.stringify(errorData)}`);
-            }
-            const data = await response.json();
-            // Enhanced logging for debugging empty content issue
-            const finishReason = data.choices?.[0]?.finish_reason;
-            const responseContent = data.choices?.[0]?.message?.content || '';
-            const isTruncated = isResponseTruncated(responseContent, finishReason);
-            logger_1.default.debug(`[OpenRouter] API Response structure:`, {
-                hasChoices: !!data.choices,
-                choicesLength: data.choices?.length || 0,
-                firstChoiceExists: !!(data.choices && data.choices[0]),
-                firstChoiceMessage: data.choices?.[0]?.message ? 'exists' : 'missing',
-                contentExists: !!responseContent,
-                contentLength: responseContent.length,
-                contentPreview: responseContent.substring(0, 100) || 'N/A',
-                finishReason: finishReason || 'unknown',
-                isTruncated: isTruncated,
-                maxTokensUsed: getMaxTokensForReviewType(reviewType, options?.isConsolidation) || 'unlimited',
-                fullResponse: JSON.stringify(data).substring(0, 500) + '...',
-            });
-            if (data.choices && data.choices.length > 0) {
-                content = data.choices[0].message.content;
-                // Critical check for empty content
-                if (!content || content.trim().length === 0) {
-                    logger_1.default.error(`[OpenRouter] CRITICAL: API returned successful response but content is empty!`);
-                    logger_1.default.error(`[OpenRouter] Response details:`, {
-                        modelName,
-                        promptLength: prompt.length,
-                        responseStatus: response.status,
-                        responseHeaders: Object.fromEntries(response.headers.entries()),
-                        fullApiResponse: JSON.stringify(data, null, 2),
-                    });
-                    throw new Error(`OpenRouter API returned empty content for model ${modelName}`);
-                }
-                // Check for truncated responses
-                if (isTruncated) {
-                    logger_1.default.warn(`[OpenRouter] WARNING: Response appears to be truncated!`);
-                    logger_1.default.warn(`[OpenRouter] Truncation details:`, {
-                        modelName,
-                        finishReason,
-                        contentLength: content.length,
-                        maxTokensRequested: getMaxTokensForReviewType(reviewType, options?.isConsolidation) || 'unlimited',
-                        reviewType,
-                        isConsolidation: options?.isConsolidation || false,
-                    });
-                    // For now, we'll continue with the truncated response but log it
-                    // In the future, we could implement retry logic with shorter prompts
-                }
-                logger_1.default.debug(`Successfully generated review with OpenRouter ${modelName}`);
-            }
-            else {
-                logger_1.default.error(`[OpenRouter] Invalid response format:`, JSON.stringify(data, null, 2));
-                throw new Error(`Invalid response format from OpenRouter ${modelName}`);
-            }
-            // Calculate cost information
-            try {
-                cost = (0, tokenCounter_1.getCostInfoFromText)(prompt, content, `openrouter:${modelName}`);
-            }
-            catch (error) {
-                logger_1.default.warn(`Failed to calculate cost information: ${error instanceof Error ? error.message : String(error)}`);
-            }
-        }
-        catch (error) {
-            throw new apiErrorHandler_1.ApiError(`Failed to generate consolidated review with OpenRouter ${modelName}: ${error instanceof Error ? error.message : String(error)}`);
-        }
-        // Try to parse the response as JSON with robust error recovery
-        let structuredData = null;
-        try {
-            // Try multiple strategies to extract JSON from the response
-            const jsonExtractionStrategies = [
-                // Strategy 1: Look for JSON in markdown code blocks
-                () => {
-                    const patterns = [
-                        /```(?:json)?\s*([\s\S]*?)\s*```/,
-                        /```(?:typescript|javascript|ts|js)?\s*([\s\S]*?)\s*```/,
-                    ];
-                    for (const pattern of patterns) {
-                        const match = content.match(pattern);
-                        if (match && match[1]) {
-                            const extracted = match[1].trim();
-                            if (extracted.startsWith('{') && extracted.endsWith('}')) {
-                                return extracted;
-                            }
-                        }
-                    }
-                    return null;
-                },
-                // Strategy 2: Find balanced JSON object
-                () => {
-                    const startIdx = content.indexOf('{');
-                    if (startIdx === -1)
-                        return null;
-                    let depth = 0;
-                    let inString = false;
-                    let escapeNext = false;
-                    for (let i = startIdx; i < content.length; i++) {
-                        const char = content[i];
-                        if (escapeNext) {
-                            escapeNext = false;
-                            continue;
-                        }
-                        if (char === '\\') {
-                            escapeNext = true;
-                            continue;
-                        }
-                        if (char === '"' && !escapeNext) {
-                            inString = !inString;
-                            continue;
-                        }
-                        if (!inString) {
-                            if (char === '{')
-                                depth++;
-                            else if (char === '}') {
-                                depth--;
-                                if (depth === 0) {
-                                    return content.substring(startIdx, i + 1);
-                                }
-                            }
-                        }
-                    }
-                    // If we couldn't find balanced braces, try to fix unterminated strings
-                    if (inString) {
-                        // Add a closing quote and try to close the object
-                        return content.substring(startIdx) + '"}';
-                    }
-                    return null;
-                },
-                // Strategy 3: Use the content as-is
-                () => content,
-            ];
-            let jsonContent = null;
-            for (const strategy of jsonExtractionStrategies) {
-                try {
-                    const extracted = strategy();
-                    if (extracted) {
-                        // Try to parse the extracted content
-                        structuredData = JSON.parse(extracted);
-                        // Validate that it has the expected structure
-                        if (structuredData && typeof structuredData === 'object') {
-                            jsonContent = extracted;
-                            logger_1.default.debug('Successfully extracted and parsed JSON');
-                            break;
-                        }
-                    }
-                }
-                catch (err) {
-                    // Continue to next strategy
-                    logger_1.default.debug(`JSON extraction strategy failed: ${err instanceof Error ? err.message : String(err)}`);
-                }
-            }
-            // If we successfully parsed JSON, validate its structure
-            if (structuredData && !structuredData.summary && !Array.isArray(structuredData.issues)) {
-                logger_1.default.warn('Response is valid JSON but does not have the expected structure');
-                // Still keep the structured data as it might have partial information
-            }
-        }
-        catch (parseError) {
-            logger_1.default.warn(`Failed to parse response as JSON after all recovery attempts: ${parseError instanceof Error ? parseError.message : String(parseError)}`);
-            // Keep the original response as content
-            structuredData = null;
-        }
-        // Return the review result
+            },
+            {
+                role: 'user',
+                content: prompt,
+            },
+        ];
+        const callResult = await executeWithRetries(() => ({
+            messages,
+            temperature: 0.2,
+            ...(requestMaxTokens ? { max_tokens: requestMaxTokens } : {}),
+        }), {
+            prompt,
+            reviewType,
+            isConsolidation: options?.isConsolidation,
+            options,
+        });
         return {
-            content,
-            cost,
-            modelUsed: `openrouter:${modelName}`,
+            content: callResult.content,
+            cost: callResult.cost,
+            modelUsed: `openrouter:${callResult.modelName}`,
             filePath: 'consolidated',
             reviewType,
             timestamp: new Date().toISOString(),
-            structuredData,
+            structuredData: callResult.structuredData,
         };
     }
     catch (error) {