Merge branch 'feature/233-implement-openrouter' of https://github.com/landamessenger/git-board-flow into feature/233-implement-openrouter

Author: efraespada

dist/index.js

@@ -129376,9 +129376,12 @@ class AiRepository {
                 (0, logger_1.logError)('Missing required AI configuration');
                 return undefined;
             }
+            (0, logger_1.logDebugInfo)(`🔎 Model: ${model}`);
+            (0, logger_1.logDebugInfo)(`🔎 API Key: ***`);
+            (0, logger_1.logDebugInfo)(`🔎 Provider Routing: ${JSON.stringify(providerRouting, null, 2)}`);
             const url = `https://openrouter.ai/api/v1/chat/completions`;
             try {
-                (0, logger_1.logDebugInfo)(`Sending prompt to ${model}: ${prompt}`);
+                // logDebugInfo(`Sending prompt to ${model}: ${prompt}`);
                 const requestBody = {
                     model: model,
                     messages: [
@@ -129418,6 +129421,18 @@ class AiRepository {
                 return undefined;
             }
         };
+        this.askJson = async (ai, prompt) => {
+            const result = await this.ask(ai, prompt);
+            if (!result) {
+                return undefined;
+            }
+            // Clean the response by removing ```json markers if present
+            const cleanedResult = result
+                .replace(/^```json\n?/, '') // Remove ```json at the start
+                .replace(/\n?```$/, '') // Remove ``` at the end
+                .trim();
+            return JSON.parse(cleanedResult);
+        };
     }
 }
 exports.AiRepository = AiRepository;
@@ -130548,6 +130563,70 @@ class FileRepository {
                 /^\/\*\*$/.test(trimmed) ||
                 /^\*\/$/.test(trimmed));
         };
+        this.getFileTree = async (owner, repository, token, branch, ignoreFiles, progress) => {
+            const fileContents = await this.getRepositoryContent(owner, repository, token, branch, ignoreFiles, progress);
+            // Create root nodes for both trees
+            const rootWithContent = {
+                name: repository,
+                type: 'directory',
+                path: '',
+                children: []
+            };
+            const rootWithoutContent = {
+                name: repository,
+                type: 'directory',
+                path: '',
+                children: []
+            };
+            // Process each file path to build both trees
+            for (const [filePath, content] of fileContents.entries()) {
+                const parts = filePath.split('/');
+                let currentLevelWithContent = rootWithContent;
+                let currentLevelWithoutContent = rootWithoutContent;
+                for (let i = 0; i < parts.length; i++) {
+                    const part = parts[i];
+                    const isLastPart = i === parts.length - 1;
+                    const currentPath = parts.slice(0, i + 1).join('/');
+                    // Find or create the node in the content tree
+                    let nodeWithContent = currentLevelWithContent.children?.find(n => n.name === part);
+                    if (!nodeWithContent) {
+                        nodeWithContent = {
+                            name: part,
+                            type: isLastPart ? 'file' : 'directory',
+                            path: currentPath,
+                            children: isLastPart ? undefined : [],
+                            content: isLastPart ? content : undefined
+                        };
+                        if (!currentLevelWithContent.children) {
+                            currentLevelWithContent.children = [];
+                        }
+                        currentLevelWithContent.children.push(nodeWithContent);
+                    }
+                    // Find or create the node in the no-content tree
+                    let nodeWithoutContent = currentLevelWithoutContent.children?.find(n => n.name === part);
+                    if (!nodeWithoutContent) {
+                        nodeWithoutContent = {
+                            name: part,
+                            type: isLastPart ? 'file' : 'directory',
+                            path: currentPath,
+                            children: isLastPart ? undefined : []
+                        };
+                        if (!currentLevelWithoutContent.children) {
+                            currentLevelWithoutContent.children = [];
+                        }
+                        currentLevelWithoutContent.children.push(nodeWithoutContent);
+                    }
+                    if (!isLastPart) {
+                        currentLevelWithContent = nodeWithContent;
+                        currentLevelWithoutContent = nodeWithoutContent;
+                    }
+                }
+            }
+            return {
+                withContent: rootWithContent,
+                withoutContent: rootWithoutContent
+            };
+        };
     }
     isMediaOrPdfFile(path) {
         const mediaExtensions = [
@@ -132176,23 +132255,36 @@ exports.ConfigurationHandler = ConfigurationHandler;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.AskActionUseCase = void 0;
 const result_1 = __nccwpck_require__(27305);
+const ai_repository_1 = __nccwpck_require__(68307);
 const docker_repository_1 = __nccwpck_require__(19097);
 const file_repository_1 = __nccwpck_require__(81503);
+const issue_repository_1 = __nccwpck_require__(40057);
 const supabase_repository_1 = __nccwpck_require__(79829);
 const logger_1 = __nccwpck_require__(38836);
 class AskActionUseCase {
     constructor() {
         this.taskId = 'AskActionUseCase';
         this.dockerRepository = new docker_repository_1.DockerRepository();
         this.fileRepository = new file_repository_1.FileRepository();
-        this.CODE_INSTRUCTION_BLOCK = "Represent the code for semantic search";
-        this.CODE_INSTRUCTION_LINE = "Represent each line of code for retrieval";
+        this.aiRepository = new ai_repository_1.AiRepository();
+        this.issueRepository = new issue_repository_1.IssueRepository();
         this.CODE_INSTRUCTION_ASK = "Represent the question for retrieving relevant code snippets";
     }
     async invoke(param) {
         (0, logger_1.logInfo)(`Executing ${this.taskId}.`);
         const results = [];
         try {
+            if (param.ai.getOpenRouterModel().length === 0 || param.ai.getOpenRouterApiKey().length === 0) {
+                results.push(new result_1.Result({
+                    id: this.taskId,
+                    success: false,
+                    executed: false,
+                    errors: [
+                        `OpenRouter model or API key not found.`,
+                    ],
+                }));
+                return results;
+            }
             /**
              * Check if the user from the token is found.
              */
@@ -132210,12 +132302,15 @@ class AskActionUseCase {
             /**
              * Get the comment body.
              */
+            let description = '';
             let commentBody = '';
             if (param.issue.isIssueComment) {
                 commentBody = param.issue.commentBody;
+                description = await this.issueRepository.getDescription(param.owner, param.repo, param.issueNumber, param.tokenUser) ?? '';
             }
             else if (param.pullRequest.isPullRequestReviewComment) {
                 commentBody = param.pullRequest.commentBody;
+                description = await this.issueRepository.getDescription(param.owner, param.repo, param.issueNumber, param.tokenUser) ?? '';
             }
             else {
                 (0, logger_1.logError)(`Not a valid comment body.`);
@@ -132266,8 +132361,11 @@ class AskActionUseCase {
             const embeddings = await this.dockerRepository.getEmbedding(param, [
                 [this.CODE_INSTRUCTION_ASK, commentBody]
             ]);
-            (0, logger_1.logInfo)(`🔎 Embeddings: ${JSON.stringify(embeddings, null, 2)}`);
-            const types = ['line', 'block'];
+            // logInfo(`🔎 Embeddings: ${JSON.stringify(embeddings, null, 2)}`);
+            const types = [
+                // 'line',
+                'block'
+            ];
             const chunks = [];
             for (const type of types) {
                 (0, logger_1.logInfo)(`📦 🔎 Matching chunks for ${param.owner}/${param.repo}/${param.commit.branch}`);
@@ -132277,6 +132375,74 @@ class AskActionUseCase {
                 }
                 chunks.push(...foundChunks);
             }
+            const { withContent, withoutContent } = await this.fileRepository.getFileTree(param.owner, param.repo, param.tokens.token, param.commit.branch, param.ai.getAiIgnoreFiles(), (fileName) => {
+                (0, logger_1.logSingleLine)(`Checking file ${fileName}`);
+            });
+            let workComplete = false;
+            let relatedFiles = new Map();
+            let finalResponse = '';
+            while (!workComplete) {
+                const prompt = `
+                You are a highly skilled code analysis assistant. I will provide you with:
+                1. A user's question about a codebase
+                2. A file tree representing the structure of the project
+                3. The most relevant code snippets from the codebase related to their query
+
+                Your tasks are:
+                - Analyze the code snippets in the context of the user's question.
+                - Use the file tree to provide additional context if needed (e.g., to understand module relationships).
+                - Provide your answer **only** in a JSON format, following this structure:
+
+                {
+                    "text_response": "Your detailed analysis or answer here.",
+                    "action": "none" | "analyze_files",
+                    "related_files": ["optional", "list", "of", "files"],
+                    "complete": true | false
+                }
+
+                Explanation:
+                - If the provided code snippets and file tree are sufficient to confidently answer the question, set "complete": true and "action": "none".
+                - If you determine that you need to review additional files to provide a complete and accurate answer, set "complete": false, "action": "analyze_files", and list the related file paths you need to investigate further in "related_files".
+                - Do not invent file paths; only request files that logically relate to the question based on the information available.
+                - Always provide a "text_response" with your reasoning, even if requesting more files.
+
+                Important:
+                - **Respond only with the JSON object**, without any extra commentary or text outside of the JSON.
+
+                Information provided:
+                User's question:
+                ${commentBody}
+
+                File tree:
+                ${JSON.stringify(withoutContent, null, 2)}
+
+                Relevant code snippets:
+                ${relatedFiles.size > 0
+                    ? Array.from(relatedFiles.entries()).map(([path, content]) => `\nFile: ${path}\nCode:\n${content}`).join('\n')
+                    : chunks.map(chunk => `\nFile: ${chunk.path}\nCode:\n${chunk.chunk}`).join('\n')}
+                `;
+                const jsonResponse = await this.aiRepository.askJson(param.ai, prompt);
+                if (!jsonResponse) {
+                    (0, logger_1.logError)(`No result from AI.`);
+                    results.push(new result_1.Result({
+                        id: this.taskId,
+                        success: false,
+                        executed: true,
+                        steps: [
+                            `Error in ${this.taskId}: No result from AI.`,
+                        ],
+                    }));
+                    return results;
+                }
+                (0, logger_1.logInfo)(`🔎 Result: ${JSON.stringify(jsonResponse, null, 2)}`);
+                workComplete = jsonResponse.complete;
+                if (jsonResponse.action === 'analyze_files') {
+                    relatedFiles = this.getRelatedFiles(jsonResponse.related_files, withContent);
+                }
+                else if (jsonResponse.action === 'none') {
+                    finalResponse = jsonResponse.text_response;
+                }
+            }
             const totalDurationSeconds = (Date.now() - startTime) / 1000;
             (0, logger_1.logInfo)(`📦 🔎 Matched chunks for ${param.owner}/${param.repo}/${param.commit.branch}:\n Total duration: ${Math.ceil(totalDurationSeconds)} seconds`);
             results.push(new result_1.Result({
@@ -132304,6 +132470,30 @@ class AskActionUseCase {
         }
         return results;
     }
+    getRelatedFiles(relatedFiles, tree) {
+        const result = new Map();
+        const findFile = (node, targetPath) => {
+            if (node.path === targetPath) {
+                return node;
+            }
+            if (node.children) {
+                for (const child of node.children) {
+                    const found = findFile(child, targetPath);
+                    if (found) {
+                        return found;
+                    }
+                }
+            }
+            return null;
+        };
+        for (const filePath of relatedFiles) {
+            const fileNode = findFile(tree, filePath);
+            if (fileNode && fileNode.type === 'file' && fileNode.content) {
+                result.set(filePath, fileNode.content);
+            }
+        }
+        return result;
+    }
 }
 exports.AskActionUseCase = AskActionUseCase;
 

dist/src/cli.js

@@ -45,6 +45,7 @@ const child_process_1 = require("child_process");
 const boxen_1 = __importDefault(require("boxen"));
 const chalk_1 = __importDefault(require("chalk"));
 const logger_1 = require("./utils/logger");
+const issue_repository_1 = require("./data/repository/issue_repository");
 // Load environment variables from .env file
 dotenv.config();
 const program = new commander_1.Command();
@@ -119,20 +120,33 @@ program
     .option('-b, --branch <name>', 'Branch name', 'master')
     .option('-d, --debug', 'Debug mode', false)
     .option('-t, --token <token>', 'Personal access token', process.env.PERSONAL_ACCESS_TOKEN)
-    .action((options) => {
+    .option('-m, --model <model>', 'OpenRouter model', process.env.OPENROUTER_MODEL)
+    .option('-k, --key <key>', 'OpenRouter API key', process.env.OPENROUTER_API_KEY)
+    .option('-p, --provider <provider>', 'OpenRouter provider', process.env.OPENROUTER_PROVIDER_ORDER)
+    .option('-f, --fallback <fallback>', 'OpenRouter fallback', process.env.OPENROUTER_PROVIDER_ALLOW_FALLBACKS)
+    .option('-r, --require <require>', 'OpenRouter require', process.env.OPENROUTER_PROVIDER_REQUIRE_PARAMETERS)
+    .option('-c, --collection <collection>', 'OpenRouter collection', process.env.OPENROUTER_PROVIDER_DATA_COLLECTION)
+    .option('-q, --question <question>', 'Question', '')
+    .action(async (options) => {
     const gitInfo = getGitInfo();
     if ('error' in gitInfo) {
         console.log(gitInfo.error);
         return;
     }
-    const commentBody = `@landa-bot where is should add new constants?`;
+    const commentBody = options.question;
     const params = {
         [constants_1.INPUT_KEYS.DEBUG]: options.debug.toString(),
         [constants_1.INPUT_KEYS.SINGLE_ACTION]: constants_1.ACTIONS.ASK,
         [constants_1.INPUT_KEYS.SINGLE_ACTION_ISSUE]: options.issue,
         [constants_1.INPUT_KEYS.SUPABASE_URL]: process.env.SUPABASE_URL,
         [constants_1.INPUT_KEYS.SUPABASE_KEY]: process.env.SUPABASE_KEY,
         [constants_1.INPUT_KEYS.TOKEN]: process.env.PERSONAL_ACCESS_TOKEN,
+        [constants_1.INPUT_KEYS.OPENROUTER_API_KEY]: process.env.OPENROUTER_API_KEY,
+        [constants_1.INPUT_KEYS.OPENROUTER_MODEL]: process.env.OPENROUTER_MODEL,
+        [constants_1.INPUT_KEYS.OPENROUTER_PROVIDER_ORDER]: process.env.OPENROUTER_PROVIDER_ORDER,
+        [constants_1.INPUT_KEYS.OPENROUTER_PROVIDER_ALLOW_FALLBACKS]: process.env.OPENROUTER_PROVIDER_ALLOW_FALLBACKS,
+        [constants_1.INPUT_KEYS.OPENROUTER_PROVIDER_REQUIRE_PARAMETERS]: process.env.OPENROUTER_PROVIDER_REQUIRE_PARAMETERS,
+        [constants_1.INPUT_KEYS.OPENROUTER_PROVIDER_DATA_COLLECTION]: process.env.OPENROUTER_PROVIDER_DATA_COLLECTION,
         [constants_1.INPUT_KEYS.AI_IGNORE_FILES]: 'dist/*,bin/*',
         repo: {
             owner: gitInfo.owner,
@@ -141,17 +155,28 @@ program
         commits: {
             ref: `refs/heads/${options.branch}`,
         },
-        eventName: 'issue_comment',
-        comment: {
-            body: commentBody,
-        },
-        pull_request_review_comment: {
+    };
+    const issueRepository = new issue_repository_1.IssueRepository();
+    const isIssue = await issueRepository.isIssue(gitInfo.owner, gitInfo.repo, parseInt(options.issue), process.env.PERSONAL_ACCESS_TOKEN ?? '');
+    const isPullRequest = await issueRepository.isPullRequest(gitInfo.owner, gitInfo.repo, parseInt(options.issue), process.env.PERSONAL_ACCESS_TOKEN ?? '');
+    if (isIssue) {
+        params.eventName = 'issue_comment';
+        params.issue = {
+            number: parseInt(options.issue),
+        };
+        params.comment = {
             body: commentBody,
-        },
-        issue: {
+        };
+    }
+    else if (isPullRequest) {
+        params.eventName = 'pull_request_review_comment';
+        params.issue = {
             number: parseInt(options.issue),
-        },
-    };
+        };
+        params.pull_request_review_comment = {
+            body: commentBody,
+        };
+    }
     (0, logger_1.logInfo)((0, boxen_1.default)(chalk_1.default.cyan('🚀 Asking AI started\n') +
         chalk_1.default.gray(`Asking AI on ${gitInfo.owner}/${gitInfo.repo}/${options.branch}...`), {
         padding: 1,

dist/src/data/model/ai_response.d.ts

@@ -0,0 +1,6 @@
+export interface AiResponse {
+    text_response: string;
+    action: 'none' | 'analyze_files';
+    related_files: string[];
+    complete: boolean;
+}

dist/src/data/model/ai_response.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

dist/src/data/repository/ai_repository.d.ts

@@ -1,4 +1,5 @@
 import { Ai } from '../model/ai';
 export declare class AiRepository {
     ask: (ai: Ai, prompt: string) => Promise<string | undefined>;
+    askJson: (ai: Ai, prompt: string) => Promise<any | undefined>;
 }