fix: improve null safety in GitLab webhook handler

docs: add language configuration documentation and update changelog

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -0,0 +1,38 @@
+name: "\U0001FAB2 Bug Report"
+description: Submit a bug report
+labels: ["bug"]
+body:
+
+  - type: dropdown
+    id: information-git-provider
+    attributes:
+      label: Git provider
+      description: 'The problem arises when using:'
+      options:
+        - "Github Cloud"
+        - "Github Enterprise"
+        - "Gitlab"
+        - "Bitbucket Cloud"
+        - "Bitbucket Server"
+        - "Azure"
+        - "Other"
+    validations:
+      required: true
+
+  - type: textarea
+    id: system-info
+    attributes:
+      label: System Info
+      description: Please share your system info with us.
+      placeholder: model used, deployment type (action/app/cli/...), etc...
+    validations:
+      required: true
+
+  - type: textarea
+    id: bug-details
+    attributes:
+      label: Bug details
+      description: Please describe the problem.
+      placeholder: Describe the problem
+    validations:
+      required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,10 @@
+blank_issues_enabled: false
+version: 0.1
+contact_links:
+  - name: Discussions
+    url: https://github.com/qodo-ai/pr-agent/discussions
+    about: GitHub Discussions
+
+  - name: Discord community
+    url: https://discord.com/channels/1057273017547378788/1126104260430528613
+    about: Join our discord community

.github/ISSUE_TEMPLATE/feature-request.yml

@@ -0,0 +1,21 @@
+name: "\U0001F4A1 Feature request"
+description: Submit a proposal/request for a new PR-Agent feature
+labels: ["feature"]
+body:
+  - type: textarea
+    id: feature-request
+    validations:
+      required: true
+    attributes:
+      label: Feature request
+      description: |
+        Description of the feature proposal.
+
+  - type: textarea
+    id: motivation
+    validations:
+      required: true
+    attributes:
+      label: Motivation
+      description: |
+        Outline the motivation for the proposal.

.github/ISSUE_TEMPLATE/miscellaneous.yml

@@ -0,0 +1,36 @@
+name: "❔ General Issue"
+description: Submit a general issue
+labels: ["general"]
+body:
+
+  - type: dropdown
+    id: information-git-provider
+    attributes:
+      label: Git provider (optional)
+      description: 'Git Provider:'
+      options:
+        - "Github Cloud"
+        - "Github Enterprise"
+        - "Gitlab"
+        - "Bitbucket Cloud"
+        - "Bitbucket Server"
+        - "Azure"
+        - "Other"
+
+  - type: textarea
+    id: system-info
+    attributes:
+      label: System Info (optional)
+      description: Please share your system info with us.
+      placeholder: model used, deployment type (action/app/cli/...), etc...
+    validations:
+      required: false
+
+  - type: textarea
+    id: issues-details
+    attributes:
+      label: Issues details
+      description: Please share the issues details.
+      placeholder: Describe the issue
+    validations:
+      required: true

CODE_OF_CONDUCT.md

@@ -0,0 +1,45 @@
+# Contributor Code of Conduct
+
+As contributors and maintainers of this project, and in the interest of fostering an open
+and welcoming community, we pledge to respect all people who contribute through reporting
+issues, posting feature requests, updating documentation, submitting pull requests or
+patches, and other activities.
+
+We are committed to making participation in this project a harassment-free experience for
+everyone, regardless of level of experience, gender, gender identity and expression,
+sexual orientation, disability, personal appearance, body size, race, ethnicity, age,
+religion, or nationality.
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery
+* Personal attacks
+* Trolling or insulting/derogatory comments
+* Public or private harassment
+* Publishing other's private information, such as physical or electronic addresses,
+  without explicit permission
+* Other unethical or unprofessional conduct
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments,
+commits, code, wiki edits, issues, and other contributions that are not aligned to this
+Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors
+that they deem inappropriate, threatening, offensive, or harmful.
+
+By adopting this Code of Conduct, project maintainers commit themselves to fairly and
+consistently applying these principles to every aspect of managing this project. Project
+maintainers who do not follow or enforce the Code of Conduct may be permanently removed
+from the project team.
+
+This Code of Conduct applies both within project spaces and in public spaces when an
+individual is representing the project or its community.
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by
+contacting a project maintainer at tal.r@qodo.ai . All complaints will
+be reviewed and investigated and will result in a response that is deemed necessary and
+appropriate to the circumstances. Maintainers are obligated to maintain confidentiality
+with regard to the reporter of an incident.
+
+This Code of Conduct is adapted from the
+[Contributor Covenant](https://contributor-covenant.org), version 1.3.0, available at
+[contributor-covenant.org/version/1/3/0/](https://contributor-covenant.org/version/1/3/0/)
+

CONTRIBUTING.md

@@ -0,0 +1,38 @@
+# Contributing to PR-Agent
+
+Thank you for your interest in contributing to the PR-Agent project! 
+
+## Getting Started
+
+1. Fork the repository and clone your fork
+2. Install Python 3.10 or higher
+3. Install dependencies (`requirements.txt` and `requirements-dev.txt`)
+4. Create a new branch for your contribution:
+   - For new features: `git checkout -b feature/your-feature-name`
+   - For bug fixes: `git checkout -b fix/issue-description`
+5. Make your changes
+6. Write or update tests as needed
+7. Run tests locally to ensure everything passes
+8. Commit your changes using conventional commit messages
+9. Push to your fork and submit a pull request
+
+## Development Guidelines
+
+- Keep pull requests focused on a single feature or fix
+- Follow the existing code style and formatting conventions
+- Add unit tests for any new functionality using pytest
+- Ensure test coverage for your changes
+- Update documentation as needed
+
+## Pull Request Process
+
+1. Ensure your PR includes a clear description of the changes
+2. Link any related issues
+3. Update the README.md if needed
+4. Wait for review from maintainers
+
+## Questions or Need Help?
+
+- Join our [Discord community](https://discord.com/channels/1057273017547378788/1126104260430528613) for questions and discussions
+- Check the [documentation](https://qodo-merge-docs.qodo.ai/) for detailed information
+- Report bugs or request features through [GitHub Issues](https://github.com/qodo-ai/pr-agent/issues)

Dockerfile.github_action

@@ -3,7 +3,7 @@ FROM python:3.12 as base
 WORKDIR /app
 ADD pyproject.toml .
 ADD requirements.txt .
-RUN pip install . && rm pyproject.toml requirements.txt
+RUN pip install --no-cache-dir . && rm pyproject.toml requirements.txt
 ENV PYTHONPATH=/app
 ADD docs docs
 ADD pr_agent pr_agent

README.md

@@ -4,16 +4,22 @@
 
 
 <picture>
-  <source media="(prefers-color-scheme: dark)" srcset="https://codium.ai/images/pr_agent/logo-dark.png" width="330">
+  <source media="(prefers-color-scheme: dark)" srcset="https://www.qodo.ai/wp-content/uploads/2025/02/PR-Agent-Purple-2.png">
-  <source media="(prefers-color-scheme: light)" srcset="https://codium.ai/images/pr_agent/logo-light.png" width="330">
+  <source media="(prefers-color-scheme: light)" srcset="https://www.qodo.ai/wp-content/uploads/2025/02/PR-Agent-Purple-2.png">
   <img src="https://codium.ai/images/pr_agent/logo-light.png" alt="logo" width="330">
 
 </picture>
 <br/>
-Qode Merge PR-Agent aims to help efficiently review and handle pull requests, by providing AI feedback and suggestions
+
+ [Installation Guide](https://qodo-merge-docs.qodo.ai/installation/) | 
+[Usage Guide](https://qodo-merge-docs.qodo.ai/usage-guide/) | 
+[Tools Guide](https://qodo-merge-docs.qodo.ai/tools/) | 
+[Qodo Merge](https://qodo-merge-docs.qodo.ai/overview/pr_agent_pro/) 💎
+
+PR-Agent aims to help efficiently review and handle pull requests, by providing AI feedback and suggestions
 </div>
 
-[![Static Badge](https://img.shields.io/badge/Chrome-Extension-violet)](https://chromewebstore.google.com/detail/pr-agent-chrome-extension/ephlnjeghhogofkifjloamocljapahnl)
+[![Static Badge](https://img.shields.io/badge/Chrome-Extension-violet)](https://chromewebstore.google.com/detail/qodo-merge-ai-powered-cod/ephlnjeghhogofkifjloamocljapahnl)
 [![Static Badge](https://img.shields.io/badge/Pro-App-blue)](https://github.com/apps/qodo-merge-pro/)
 [![Static Badge](https://img.shields.io/badge/OpenSource-App-red)](https://github.com/apps/qodo-merge-pro-for-open-source/)
 [![Discord](https://badgen.net/badge/icon/discord?icon=discord&label&color=purple)](https://discord.com/channels/1057273017547378788/1126104260430528613)
@@ -22,30 +28,58 @@ Qode Merge PR-Agent aims to help efficiently review and handle pull requests, by
 </a>
 </div>
 
-### [Documentation](https://pr-agent-docs.codium.ai/)
+[//]: # (### [Documentation]&#40;https://qodo-merge-docs.qodo.ai/&#41;)
-- See the [Installation Guide](https://qodo-merge-docs.qodo.ai/installation/) for instructions on installing Qode Merge PR-Agent on different platforms.
 
-- See the [Usage Guide](https://qodo-merge-docs.qodo.ai/usage-guide/) for instructions on running Qode Merge PR-Agent tools via different interfaces, such as CLI, PR Comments, or by automatically triggering them when a new PR is opened.
+[//]: # ()
+[//]: # (- See the [Installation Guide]&#40;https://qodo-merge-docs.qodo.ai/installation/&#41; for instructions on installing PR-Agent on different platforms.)
 
-- See the [Tools Guide](https://qodo-merge-docs.qodo.ai/tools/) for a detailed description of the different tools, and the available configurations for each tool.
+[//]: # ()
+[//]: # (- See the [Usage Guide]&#40;https://qodo-merge-docs.qodo.ai/usage-guide/&#41; for instructions on running PR-Agent tools via different interfaces, such as CLI, PR Comments, or by automatically triggering them when a new PR is opened.)
+
+[//]: # ()
+[//]: # (- See the [Tools Guide]&#40;https://qodo-merge-docs.qodo.ai/tools/&#41; for a detailed description of the different tools, and the available configurations for each tool.)
 
 
 ## Table of Contents
+
 - [News and Updates](#news-and-updates)
 - [Overview](#overview)
 - [Example results](#example-results)
 - [Try it now](#try-it-now)
-- [PR-Agent Pro 💎](https://pr-agent-docs.codium.ai/overview/pr_agent_pro/)
+- [Qodo Merge](https://qodo-merge-docs.qodo.ai/overview/pr_agent_pro/)
 - [How it works](#how-it-works)
 - [Why use PR-Agent?](#why-use-pr-agent)
 
 ## News and Updates
 
+### Feb 27, 2025
+- Updated the default model to `o3-mini` for all tools. You can still use the `gpt-4o` as the default model by setting the `model` parameter in the configuration file.
+- Important updates and bug fixes for Azure DevOps, see [here](https://github.com/qodo-ai/pr-agent/pull/1583)
+- Added support for adjusting the [response language](https://qodo-merge-docs.qodo.ai/usage-guide/additional_configurations/#language-settings) of the PR-Agent tools.
+
+### Feb 6, 2025
+New design for the `/improve` tool:
+
+<kbd><img src="https://github.com/user-attachments/assets/26506430-550e-469a-adaa-af0a09b70c6d" width="512"></kbd>
+
+### Jan 25, 2025
+
+The open-source GitHub organization was updated:
+`https://github.com/codium-ai/pr-agent` →
+`https://github.com/qodo-ai/pr-agent`
+
+The docker should be redirected automatically to the new location. 
+However, if you have any issues, please update the GitHub action docker image from
+`uses: Codium-ai/pr-agent@main`
+to
+`uses: qodo-ai/pr-agent@main`
+
+
 ### Jan 2, 2025
 
 New tool  [/Implement](https://qodo-merge-docs.qodo.ai/tools/implement/) (💎), which converts human code review discussions and feedback into ready-to-commit code changes.
 
-<kbd><img src="https://codium.ai/images/pr_agent/implement1.png" width="512"></kbd>
+<kbd><img src="https://www.qodo.ai/images/pr_agent/implement1.png?v=2" width="512"></kbd>
 
 
 ### Jan 1, 2025
@@ -54,40 +88,7 @@ Update logic and [documentation](https://qodo-merge-docs.qodo.ai/usage-guide/cha
 
 ### December 30, 2024
 
-Following [feedback](https://research.kudelskisecurity.com/2024/08/29/careful-where-you-code-multiple-vulnerabilities-in-ai-powered-pr-agent/) from the community, we have addressed two vulnerabilities identified in the open-source PR-Agent project. The fixes are now included in the newly released version (v0.26), available as of today.
+Following feedback from the community, we have addressed two vulnerabilities identified in the open-source PR-Agent project. The [fixes](https://github.com/qodo-ai/pr-agent/pull/1425) are now included in the newly released version (v0.26), available as of today.
-
-### December 25, 2024
-
-The `review` tool previously included a legacy feature for providing code suggestions (controlled by '--pr_reviewer.num_code_suggestion'). This functionality has been deprecated. Use instead the [`improve`](https://qodo-merge-docs.qodo.ai/tools/improve/) tool, which offers higher quality and more actionable code suggestions.
-
-### December 2, 2024
-
-Open-source repositories can now freely use Qodo Merge Pro, and enjoy easy one-click installation using a marketplace [app](https://github.com/apps/qodo-merge-pro-for-open-source).
-
-<kbd><img src="https://github.com/user-attachments/assets/b0838724-87b9-43b0-ab62-73739a3a855c" width="512"></kbd>
-
-See [here](https://qodo-merge-docs.qodo.ai/installation/pr_agent_pro/) for more details about installing Qodo Merge Pro for private repositories.
-
-
-### November 18, 2024
-
-A new mode was enabled by default for code suggestions - `--pr_code_suggestions.focus_only_on_problems=true`:
-
-- This option reduces the number of code suggestions received
-- The suggestions will focus more on identifying and fixing code problems, rather than style considerations like best practices, maintainability, or readability.
-- The suggestions will be categorized into just two groups: "Possible Issues" and "General".
-
-Still, if you prefer the previous mode, you can set `--pr_code_suggestions.focus_only_on_problems=false` in the [configuration file](https://qodo-merge-docs.qodo.ai/usage-guide/configuration_options/).
-
-**Example results:**
-
-Original mode
-
-<kbd><img src="https://qodo.ai/images/pr_agent/code_suggestions_original_mode.png" width="512"></kbd>
-
-Focused mode
-
-<kbd><img src="https://qodo.ai/images/pr_agent/code_suggestions_focused_mode.png" width="512"></kbd>
 
 
 ## Overview
@@ -95,74 +96,75 @@ Focused mode
 
 Supported commands per platform:
 
-|       |                                                                                                         | GitHub             | GitLab             | Bitbucket          | Azure DevOps |
+|       |                                                                                                         | GitHub             | GitLab             | Bitbucket | Azure DevOps |
-|-------|---------------------------------------------------------------------------------------------------------|:--------------------:|:--------------------:|:--------------------:|:------------:|
+|-------|---------------------------------------------------------------------------------------------------------|:--------------------:|:--------------------:|:---------:|:------------:|
-| TOOLS | [Review](https://qodo-merge-docs.qodo.ai/tools/review/)                                                                                                  | ✅ | ✅ | ✅ |      ✅       |
+| TOOLS | [Review](https://qodo-merge-docs.qodo.ai/tools/review/)                                                                                                  | ✅ | ✅ |     ✅     |      ✅       |
-|       | [Describe](https://qodo-merge-docs.qodo.ai/tools/describe/)                                                                                                | ✅ | ✅ | ✅ |      ✅       |
+|       | [Describe](https://qodo-merge-docs.qodo.ai/tools/describe/)                                                                                                | ✅ | ✅ |     ✅     |      ✅       |
-|       | [Improve](https://qodo-merge-docs.qodo.ai/tools/improve/)                                                                                                 | ✅ | ✅ | ✅ |      ✅       |
+|       | [Improve](https://qodo-merge-docs.qodo.ai/tools/improve/)                                                                                                 | ✅ | ✅ |     ✅     |      ✅       |
-|       | [Ask](https://qodo-merge-docs.qodo.ai/tools/ask/)                                                                                                     | ✅ | ✅ | ✅ |      ✅       |
+|       | [Ask](https://qodo-merge-docs.qodo.ai/tools/ask/)                                                                                                     | ✅ | ✅ |     ✅     |      ✅       |
-|       | ⮑ [Ask on code lines](https://pr-agent-docs.codium.ai/tools/ask#ask-lines)                              | ✅ | ✅ |                    |              |
+|       | ⮑ [Ask on code lines](https://qodo-merge-docs.qodo.ai/tools/ask/#ask-lines)                              | ✅ | ✅ |           |              |
-|       | [Update CHANGELOG](https://qodo-merge-docs.qodo.ai/tools/update_changelog/)                                                                                     | ✅ | ✅ | ✅ |      ✅       |
+|       | [Update CHANGELOG](https://qodo-merge-docs.qodo.ai/tools/update_changelog/)                                                                                     | ✅ | ✅ |     ✅     |      ✅       |
-|       | [Ticket Context](https://qodo-merge-docs.qodo.ai/core-abilities/fetching_ticket_context/) 💎  | ✅ | ✅ |  ✅                  |   |
+|       | [Ticket Context](https://qodo-merge-docs.qodo.ai/core-abilities/fetching_ticket_context/) 💎  | ✅ | ✅ |     ✅     |   |
-|       | [Utilizing Best Practices](https://qodo-merge-docs.qodo.ai/tools/improve/#best-practices) 💎  | ✅ | ✅ |  ✅                  |   |
+|       | [Utilizing Best Practices](https://qodo-merge-docs.qodo.ai/tools/improve/#best-practices) 💎  | ✅ | ✅ |     ✅     |   |
-|       | [PR Chat](https://qodo-merge-docs.qodo.ai/chrome-extension/features/#pr-chat) 💎  | ✅ |  |                    |   |
+|       | [PR Chat](https://qodo-merge-docs.qodo.ai/chrome-extension/features/#pr-chat) 💎  | ✅ |  |           |   |
-|       | [Suggestion Tracking](https://qodo-merge-docs.qodo.ai/tools/improve/#suggestion-tracking) 💎  | ✅ | ✅ |                    |   |
+|       | [Suggestion Tracking](https://qodo-merge-docs.qodo.ai/tools/improve/#suggestion-tracking) 💎  | ✅ | ✅ |           |   |
-|       | [CI Feedback](https://pr-agent-docs.codium.ai/tools/ci_feedback/) 💎                                    | ✅ |                    |                    |              |
+|       | [CI Feedback](https://qodo-merge-docs.qodo.ai/tools/ci_feedback/) 💎                                    | ✅ |                    |           |              |
-|       | [PR Documentation](https://pr-agent-docs.codium.ai/tools/documentation/) 💎                         | ✅ | ✅ |                   |              |
+|       | [PR Documentation](https://qodo-merge-docs.qodo.ai/tools/documentation/) 💎                         | ✅ | ✅ |           |              |
-|       | [Custom Labels](https://pr-agent-docs.codium.ai/tools/custom_labels/) 💎                                | ✅ | ✅ |                    |              |
+|       | [Custom Labels](https://qodo-merge-docs.qodo.ai/tools/custom_labels/) 💎                                | ✅ | ✅ |           |              |
-|       | [Analyze](https://pr-agent-docs.codium.ai/tools/analyze/) 💎                                            | ✅ | ✅ |                    |              |
+|       | [Analyze](https://qodo-merge-docs.qodo.ai/tools/analyze/) 💎                                            | ✅ | ✅ |           |              |
-|       | [Similar Code](https://pr-agent-docs.codium.ai/tools/similar_code/) 💎                                  | ✅ |                    |                    |              |
+|       | [Similar Code](https://qodo-merge-docs.qodo.ai/tools/similar_code/) 💎                                  | ✅ |                    |           |              |
-|       | [Custom Prompt](https://pr-agent-docs.codium.ai/tools/custom_prompt/) 💎                                | ✅ | ✅ | ✅ |              |
+|       | [Custom Prompt](https://qodo-merge-docs.qodo.ai/tools/custom_prompt/) 💎                                | ✅ | ✅ |     ✅     |              |
-|       | [Test](https://pr-agent-docs.codium.ai/tools/test/) 💎                                                  | ✅ | ✅ |                    |              |
+|       | [Test](https://qodo-merge-docs.qodo.ai/tools/test/) 💎                                                  | ✅ | ✅ |           |              |
-|       | [Implement](https://pr-agent-docs.codium.ai/tools/implement/) 💎                                        | ✅ | ✅ |         ✅          |              |
+|       | [Implement](https://qodo-merge-docs.qodo.ai/tools/implement/) 💎                                        | ✅ | ✅ |     ✅     |              |
-|       |                                                                                                         |                    |                    |                    |              |
+|       | [Auto-Approve](https://qodo-merge-docs.qodo.ai/tools/improve/?h=auto#auto-approval) 💎                  |   ✅    |   ✅    |   ✅        |            |
-| USAGE | [CLI](https://qodo-merge-docs.qodo.ai/usage-guide/automations_and_usage/#local-repo-cli)                                                                                                     | ✅ | ✅ | ✅ |      ✅       |
+|       |                                                                                                         |                    |                    |           |              |
-|       | [App / webhook](https://qodo-merge-docs.qodo.ai/usage-guide/automations_and_usage/#github-app)                                                                                           | ✅ | ✅ | ✅ |      ✅       |
+| USAGE | [CLI](https://qodo-merge-docs.qodo.ai/usage-guide/automations_and_usage/#local-repo-cli)                                                                                                     | ✅ | ✅ |     ✅     |      ✅       |
-|       | [Tagging bot](https://github.com/Codium-ai/pr-agent#try-it-now)                                                                                             | ✅ |                    |                    |              |
+|       | [App / webhook](https://qodo-merge-docs.qodo.ai/usage-guide/automations_and_usage/#github-app)                                                                                           | ✅ | ✅ |     ✅     |      ✅       |
-|       | [Actions](https://qodo-merge-docs.qodo.ai/installation/github/#run-as-a-github-action)                                                                                                 | ✅ |✅| ✅ |✅|
+|       | [Tagging bot](https://github.com/Codium-ai/pr-agent#try-it-now)                                                                                             | ✅ |                    |           |              |
-|       |                                                                                                         |                    |                    |                    |              |
+|       | [Actions](https://qodo-merge-docs.qodo.ai/installation/github/#run-as-a-github-action)                                                                                                 | ✅ |✅|     ✅     |✅|
-| CORE  | [PR compression](https://qodo-merge-docs.qodo.ai/core-abilities/compression_strategy/)                                                                  | ✅ | ✅ | ✅ |      ✅       |
+|       |                                                                                                         |                    |                    |           |              |
-|       | Adaptive and token-aware file patch fitting                                                             | ✅ | ✅ | ✅ |      ✅       |
+| CORE  | [PR compression](https://qodo-merge-docs.qodo.ai/core-abilities/compression_strategy/)                                                                  | ✅ | ✅ |     ✅     |      ✅       |
-|       | [Multiple models support](https://qodo-merge-docs.qodo.ai/usage-guide/changing_a_model/)                                                                                 | ✅ | ✅ | ✅ |      ✅       |
+|       | Adaptive and token-aware file patch fitting                                                             | ✅ | ✅ |     ✅     |      ✅       |
-|       | [Local and global metadata](https://qodo-merge-docs.qodo.ai/core-abilities/metadata/)          | ✅ | ✅ | ✅ | ✅             |
+|       | [Multiple models support](https://qodo-merge-docs.qodo.ai/usage-guide/changing_a_model/)                                                                                 | ✅ | ✅ |     ✅     |      ✅       |
-|       | [Dynamic context](https://qodo-merge-docs.qodo.ai/core-abilities/dynamic_context/)          | ✅ | ✅ | ✅ | ✅             |
+|       | [Local and global metadata](https://qodo-merge-docs.qodo.ai/core-abilities/metadata/)          | ✅ | ✅ |     ✅     | ✅             |
-|       | [Self reflection](https://qodo-merge-docs.qodo.ai/core-abilities/self_reflection/)          | ✅ | ✅ | ✅ | ✅             |
+|       | [Dynamic context](https://qodo-merge-docs.qodo.ai/core-abilities/dynamic_context/)          | ✅ | ✅ |     ✅     | ✅             |
-|       | [Static code analysis](https://qodo-merge-docs.qodo.ai/core-abilities/static_code_analysis/) 💎         | ✅ | ✅ | ✅ |              |
+|       | [Self reflection](https://qodo-merge-docs.qodo.ai/core-abilities/self_reflection/)          | ✅ | ✅ |     ✅     | ✅             |
-|       | [Global and wiki configurations](https://pr-agent-docs.codium.ai/usage-guide/configuration_options/) 💎 | ✅ | ✅ | ✅ |              |
+|       | [Static code analysis](https://qodo-merge-docs.qodo.ai/core-abilities/static_code_analysis/) 💎         | ✅ | ✅ |           |              |
-|       | [PR interactive actions](https://www.codium.ai/images/pr_agent/pr-actions.mp4) 💎                       | ✅ |        ✅           |                    |              |
+|       | [Global and wiki configurations](https://qodo-merge-docs.qodo.ai/usage-guide/configuration_options/) 💎 | ✅ | ✅ |     ✅     |              |
-|       | [Impact Evaluation](https://qodo-merge-docs.qodo.ai/core-abilities/impact_evaluation/) 💎  | ✅ | ✅ |                    |   |
+|       | [PR interactive actions](https://www.qodo.ai/images/pr_agent/pr-actions.mp4) 💎                       | ✅ |        ✅           |           |              |
-- 💎 means this feature is available only in [PR-Agent Pro](https://www.codium.ai/pricing/)
+|       | [Impact Evaluation](https://qodo-merge-docs.qodo.ai/core-abilities/impact_evaluation/) 💎  | ✅ | ✅ |           |   |
+- 💎 means this feature is available only in [Qodo-Merge](https://www.qodo.ai/pricing/)
 
 [//]: # (- Support for additional git providers is described in [here]&#40;./docs/Full_environments.md&#41;)
 ___
 
-‣ **Auto Description ([`/describe`](https://pr-agent-docs.codium.ai/tools/describe/))**: Automatically generating PR description - title, type, summary, code walkthrough and labels.
+‣ **Auto Description ([`/describe`](https://qodo-merge-docs.qodo.ai/tools/describe/))**: Automatically generating PR description - title, type, summary, code walkthrough and labels.
 \
-‣ **Auto Review ([`/review`](https://pr-agent-docs.codium.ai/tools/review/))**: Adjustable feedback about the PR, possible issues, security concerns, review effort and more.
+‣ **Auto Review ([`/review`](https://qodo-merge-docs.qodo.ai/tools/review/))**: Adjustable feedback about the PR, possible issues, security concerns, review effort and more.
 \
-‣ **Code Suggestions ([`/improve`](https://pr-agent-docs.codium.ai/tools/improve/))**: Code suggestions for improving the PR.
+‣ **Code Suggestions ([`/improve`](https://qodo-merge-docs.qodo.ai/tools/improve/))**: Code suggestions for improving the PR.
 \
-‣ **Question Answering ([`/ask ...`](https://pr-agent-docs.codium.ai/tools/ask/))**: Answering free-text questions about the PR.
+‣ **Question Answering ([`/ask ...`](https://qodo-merge-docs.qodo.ai/tools/ask/))**: Answering free-text questions about the PR.
 \
-‣ **Update Changelog ([`/update_changelog`](https://pr-agent-docs.codium.ai/tools/update_changelog/))**: Automatically updating the CHANGELOG.md file with the PR changes.
+‣ **Update Changelog ([`/update_changelog`](https://qodo-merge-docs.qodo.ai/tools/update_changelog/))**: Automatically updating the CHANGELOG.md file with the PR changes.
 \
-‣ **Find Similar Issue ([`/similar_issue`](https://pr-agent-docs.codium.ai/tools/similar_issues/))**: Automatically retrieves and presents similar issues.
+‣ **Find Similar Issue ([`/similar_issue`](https://qodo-merge-docs.qodo.ai/tools/similar_issues/))**: Automatically retrieves and presents similar issues.
 \
-‣ **Add Documentation 💎  ([`/add_docs`](https://pr-agent-docs.codium.ai/tools/documentation/))**: Generates documentation to methods/functions/classes that changed in the PR.
+‣ **Add Documentation 💎  ([`/add_docs`](https://qodo-merge-docs.qodo.ai/tools/documentation/))**: Generates documentation to methods/functions/classes that changed in the PR.
 \
-‣ **Generate Custom Labels 💎 ([`/generate_labels`](https://pr-agent-docs.codium.ai/tools/custom_labels/))**: Generates custom labels for the PR, based on specific guidelines defined by the user.
+‣ **Generate Custom Labels 💎 ([`/generate_labels`](https://qodo-merge-docs.qodo.ai/tools/custom_labels/))**: Generates custom labels for the PR, based on specific guidelines defined by the user.
 \
-‣ **Analyze 💎 ([`/analyze`](https://pr-agent-docs.codium.ai/tools/analyze/))**: Identify code components that changed in the PR, and enables to interactively generate tests, docs, and code suggestions for each component.
+‣ **Analyze 💎 ([`/analyze`](https://qodo-merge-docs.qodo.ai/tools/analyze/))**: Identify code components that changed in the PR, and enables to interactively generate tests, docs, and code suggestions for each component.
 \
-‣ **Test 💎 ([`/test`](https://pr-agent-docs.codium.ai/tools/test/))**: Generate tests for a selected component, based on the PR code changes.
+‣ **Test 💎 ([`/test`](https://qodo-merge-docs.qodo.ai/tools/test/))**: Generate tests for a selected component, based on the PR code changes.
 \
-‣ **Custom Prompt 💎 ([`/custom_prompt`](https://pr-agent-docs.codium.ai/tools/custom_prompt/))**: Automatically generates custom suggestions for improving the PR code, based on specific guidelines defined by the user.
+‣ **Custom Prompt 💎 ([`/custom_prompt`](https://qodo-merge-docs.qodo.ai/tools/custom_prompt/))**: Automatically generates custom suggestions for improving the PR code, based on specific guidelines defined by the user.
 \
-‣ **Generate Tests 💎 ([`/test component_name`](https://pr-agent-docs.codium.ai/tools/test/))**: Generates unit tests for a selected component, based on the PR code changes.
+‣ **Generate Tests 💎 ([`/test component_name`](https://qodo-merge-docs.qodo.ai/tools/test/))**: Generates unit tests for a selected component, based on the PR code changes.
 \
-‣ **CI Feedback 💎 ([`/checks ci_job`](https://pr-agent-docs.codium.ai/tools/ci_feedback/))**: Automatically generates feedback and analysis for a failed CI job.
+‣ **CI Feedback 💎 ([`/checks ci_job`](https://qodo-merge-docs.qodo.ai/tools/ci_feedback/))**: Automatically generates feedback and analysis for a failed CI job.
 \
-‣ **Similar Code 💎 ([`/find_similar_component`](https://pr-agent-docs.codium.ai/tools/similar_code/))**: Retrieves the most similar code components from inside the organization's codebase, or from open-source code.
+‣ **Similar Code 💎 ([`/find_similar_component`](https://qodo-merge-docs.qodo.ai/tools/similar_code/))**: Retrieves the most similar code components from inside the organization's codebase, or from open-source code.
 \
 ‣ **Implement 💎 ([`/implement`](https://qodo-merge-docs.qodo.ai/tools/implement/))**: Generates implementation code from review suggestions.
 ___
@@ -217,22 +219,16 @@ Note that this is a promotional bot, suitable only for initial experimentation.
 It does not have 'edit' access to your repo, for example, so it cannot update the PR description or add labels (`@CodiumAI-Agent /describe` will publish PR description as a comment). In addition, the bot cannot be used on private repositories, as it does not have access to the files there.
 
 
-![Review generation process](https://www.codium.ai/images/demo-2.gif)
-
-
-To set up your own PR-Agent, see the [Installation](https://pr-agent-docs.codium.ai/installation/) section below.
-Note that when you set your own PR-Agent or use CodiumAI hosted PR-Agent, there is no need to mention `@CodiumAI-Agent ...`. Instead, directly start with the command, e.g., `/ask ...`.
-
 ---
 
 
-## PR-Agent Pro 💎
+## Qodo Merge 💎
-[PR-Agent Pro](https://www.codium.ai/pricing/) is a hosted version of PR-Agent, provided by CodiumAI. It is available for a monthly fee, and provides the following benefits:
+[Qodo Merge](https://www.qodo.ai/pricing/) is a hosted version of PR-Agent, provided by Qodo. It is available for a monthly fee, and provides the following benefits:
-1. **Fully managed** - We take care of everything for you - hosting, models, regular updates, and more. Installation is as simple as signing up and adding the PR-Agent app to your GitHub\GitLab\BitBucket repo.
+1. **Fully managed** - We take care of everything for you - hosting, models, regular updates, and more. Installation is as simple as signing up and adding the Qodo Merge app to your GitHub\GitLab\BitBucket repo.
-2. **Improved privacy** - No data will be stored or used to train models. PR-Agent Pro will employ zero data retention, and will use an OpenAI account with zero data retention.
+2. **Improved privacy** - No data will be stored or used to train models. Qodo Merge will employ zero data retention, and will use an OpenAI account with zero data retention.
-3. **Improved support** - PR-Agent Pro users will receive priority support, and will be able to request new features and capabilities.
+3. **Improved support** - Qodo Merge users will receive priority support, and will be able to request new features and capabilities.
-4. **Extra features** -In addition to the benefits listed above, PR-Agent Pro will emphasize more customization, and the usage of static code analysis, in addition to LLM logic, to improve results.
+4. **Extra features** -In addition to the benefits listed above, Qodo Merge will emphasize more customization, and the usage of static code analysis, in addition to LLM logic, to improve results.
-See [here](https://qodo-merge-docs.qodo.ai/overview/pr_agent_pro/) for a list of features available in PR-Agent Pro.
+See [here](https://qodo-merge-docs.qodo.ai/overview/pr_agent_pro/) for a list of features available in Qodo Merge.
 
 
 
@@ -240,9 +236,9 @@ See [here](https://qodo-merge-docs.qodo.ai/overview/pr_agent_pro/) for a list of
 
 The following diagram illustrates PR-Agent tools and their flow:
 
-![PR-Agent Tools](https://codium.ai/images/pr_agent/diagram-v0.9.png)
+![PR-Agent Tools](https://www.qodo.ai/images/pr_agent/diagram-v0.9.png)
 
-Check out the [PR Compression strategy](https://pr-agent-docs.codium.ai/core-abilities/#pr-compression-strategy) page for more details on how we convert a code diff to a manageable LLM prompt
+Check out the [PR Compression strategy](https://qodo-merge-docs.qodo.ai/core-abilities/#pr-compression-strategy) page for more details on how we convert a code diff to a manageable LLM prompt
 
 ## Why use PR-Agent?
 
@@ -251,7 +247,7 @@ A reasonable question that can be asked is: `"Why use PR-Agent? What makes it st
 Here are some advantages of PR-Agent:
 
 - We emphasize **real-life practical usage**. Each tool (review, improve, ask, ...) has a single GPT-4 call, no more. We feel that this is critical for realistic team usage - obtaining an answer quickly (~30 seconds) and affordably.
-- Our [PR Compression strategy](https://pr-agent-docs.codium.ai/core-abilities/#pr-compression-strategy)  is a core ability that enables to effectively tackle both short and long PRs.
+- Our [PR Compression strategy](https://qodo-merge-docs.qodo.ai/core-abilities/#pr-compression-strategy)  is a core ability that enables to effectively tackle both short and long PRs.
 - Our JSON prompting strategy enables to have **modular, customizable tools**. For example, the '/review' tool categories can be controlled via the [configuration](pr_agent/settings/configuration.toml) file. Adding additional categories is easy and accessible.
 - We support **multiple git providers** (GitHub, Gitlab, Bitbucket), **multiple ways** to use the tool (CLI, GitHub Action, GitHub App, Docker, ...), and **multiple models** (GPT-4, GPT-3.5, Anthropic, Cohere, Llama2).
 
@@ -263,24 +259,22 @@ Here are some advantages of PR-Agent:
 - If you host PR-Agent with your OpenAI API key, it is between you and OpenAI. You can read their API data privacy policy here:
 https://openai.com/enterprise-privacy
 
-### CodiumAI-hosted PR-Agent Pro 💎
+### Qodo-hosted Qodo Merge 💎
 
-- When using PR-Agent Pro 💎, hosted by CodiumAI, we will not store any of your data, nor will we use it for training. You will also benefit from an OpenAI account with zero data retention.
+- When using Qodo Merge 💎, hosted by Qodo, we will not store any of your data, nor will we use it for training. You will also benefit from an OpenAI account with zero data retention.
 
-- For certain clients, CodiumAI-hosted PR-Agent Pro will use CodiumAI’s proprietary models — if this is the case, you will be notified.
+- For certain clients, Qodo-hosted Qodo Merge will use Qodo’s proprietary models — if this is the case, you will be notified.
 
-- No passive collection of Code and Pull Requests’ data — PR-Agent will be active only when you invoke it, and it will then extract and analyze only data relevant to the executed command and queried pull request.
+- No passive collection of Code and Pull Requests’ data — Qodo Merge will be active only when you invoke it, and it will then extract and analyze only data relevant to the executed command and queried pull request.
 
-### PR-Agent Chrome extension
+### Qodo Merge Chrome extension
 
-- The [PR-Agent Chrome extension](https://chromewebstore.google.com/detail/pr-agent-chrome-extension/ephlnjeghhogofkifjloamocljapahnl) serves solely to modify the visual appearance of a GitHub PR screen. It does not transmit any user's repo or pull request code. Code is only sent for processing when a user submits a GitHub comment that activates a PR-Agent tool, in accordance with the standard privacy policy of PR-Agent.
+- The [Qodo Merge Chrome extension](https://chromewebstore.google.com/detail/qodo-merge-ai-powered-cod/ephlnjeghhogofkifjloamocljapahnl) serves solely to modify the visual appearance of a GitHub PR screen. It does not transmit any user's repo or pull request code. Code is only sent for processing when a user submits a GitHub comment that activates a PR-Agent tool, in accordance with the standard privacy policy of Qodo-Merge.
 
 ## Links
 
-[![Join our Discord community](https://raw.githubusercontent.com/Codium-ai/codiumai-vscode-release/main/media/docs/Joincommunity.png)](https://discord.gg/kG35uSHDBc)
-
 - Discord community: https://discord.gg/kG35uSHDBc
-- CodiumAI site: https://codium.ai
+- Qodo site: https://www.qodo.ai/
-- Blog: https://www.codium.ai/blog/
+- Blog: https://www.qodo.ai/blog/
-- Troubleshooting: https://www.codium.ai/blog/technical-faq-and-troubleshooting/
+- Troubleshooting: https://www.qodo.ai/blog/technical-faq-and-troubleshooting/
-- Support: support@codium.ai
+- Support: support@qodo.ai

SECURITY.md

@@ -0,0 +1,62 @@
+# Security Policy
+
+PR-Agent is an open-source tool to help efficiently review and handle pull requests. Qodo Merge is a paid version of PR-Agent, designed for companies and teams that require additional features and capabilities. 
+
+This document describes the security policy of PR-Agent. For Qodo Merge's security policy, see [here](https://qodo-merge-docs.qodo.ai/overview/data_privacy/#qodo-merge).
+
+## PR-Agent Self-Hosted Solutions
+
+When using PR-Agent with your OpenAI (or other LLM provider) API key, the security relationship is directly between you and the provider. We do not send your code to Qodo servers.
+
+Types of [self-hosted solutions](https://qodo-merge-docs.qodo.ai/installation):
+- Locally
+- GitHub integration
+- GitLab integration
+- BitBucket integration
+- Azure DevOps integration
+
+
+## PR-Agent Supported Versions
+
+This section outlines which versions of PR-Agent are currently supported with security updates.
+
+### Docker Deployment Options
+
+#### Latest Version
+
+For the most recent updates, use our latest Docker image which is automatically built nightly:
+```yaml
+uses: qodo-ai/pr-agent@main
+```
+
+#### Specific Release Version
+
+For a fixed version, you can pin your action to a specific release version. Browse available releases at:
+[PR-Agent Releases](https://github.com/qodo-ai/pr-agent/releases)
+
+For example, to github action:
+
+```yaml
+steps:
+  - name: PR Agent action step
+    id: pragent
+    uses: docker://codiumai/pr-agent:0.26-github_action
+```
+
+#### Enhanced Security with Docker Digest
+
+For maximum security, you can specify the Docker image using its digest:
+```yaml
+steps:
+  - name: PR Agent action step
+    id: pragent
+    uses: docker://codiumai/pr-agent@sha256:14165e525678ace7d9b51cda8652c2d74abb4e1d76b57c4a6ccaeba84663cc64
+```
+
+## Reporting a Vulnerability
+
+We take the security of PR-Agent seriously. If you discover a security vulnerability, please report it immediately to:
+
+Email: tal.r@qodo.ai
+
+Please include a description of the vulnerability, steps to reproduce, and the affected PR-Agent version.

docker/Dockerfile

@@ -4,7 +4,7 @@ WORKDIR /app
 ADD pyproject.toml .
 ADD requirements.txt .
 ADD docs docs
-RUN pip install . && rm pyproject.toml requirements.txt
+RUN pip install --no-cache-dir . && rm pyproject.toml requirements.txt
 ENV PYTHONPATH=/app
 
 FROM base AS github_app
@@ -33,7 +33,7 @@ CMD ["python", "pr_agent/servers/azuredevops_server_webhook.py"]
 
 FROM base AS test
 ADD requirements-dev.txt .
-RUN pip install -r requirements-dev.txt && rm requirements-dev.txt
+RUN pip install --no-cache-dir -r requirements-dev.txt && rm requirements-dev.txt
 ADD pr_agent pr_agent
 ADD tests tests
 

docker/Dockerfile.lambda

@@ -5,8 +5,8 @@ RUN yum update -y && \
     yum clean all
 
 ADD pyproject.toml requirements.txt .
-RUN pip install . && rm pyproject.toml
+RUN pip install --no-cache-dir . && rm pyproject.toml
-RUN pip install mangum==0.17.0
+RUN pip install --no-cache-dir mangum==0.17.0
 COPY pr_agent/ ${LAMBDA_TASK_ROOT}/pr_agent/
 
 CMD ["pr_agent.servers.serverless.serverless"]

docs/docs/ai_search/index.md

@@ -0,0 +1,315 @@
+<div class="search-section">
+    <h1>AI Docs Search</h1>
+    <p class="search-description">
+        Search through our documentation using AI-powered natural language queries.
+    </p>
+    <div class="search-container">
+        <input 
+            type="text" 
+            id="searchInput" 
+            class="search-input" 
+            placeholder="Enter your search term..."
+        >
+        <button id="searchButton" class="search-button">Search</button>
+    </div>
+    <div id="spinner" class="spinner-container" style="display: none;">
+        <div class="spinner"></div>
+    </div>
+    <div id="results" class="results-container"></div>
+</div>
+
+<style>
+Untitled
+.search-section {
+    max-width: 800px;
+    margin: 0 auto;
+    padding: 0 1rem 2rem;
+}
+
+h1 {
+    color: #666;
+    font-size: 2.125rem;
+    font-weight: normal;
+    margin-bottom: 1rem;
+}
+
+.search-description {
+    color: #666;
+    font-size: 1rem;
+    line-height: 1.5;
+    margin-bottom: 2rem;
+    max-width: 800px;
+}
+
+.search-container {
+    display: flex;
+    gap: 1rem;
+    max-width: 800px;
+    margin: 0;  /* Changed from auto to 0 to align left */
+}
+
+.search-input {
+    flex: 1;
+    padding: 0 0.875rem;
+    border: 1px solid #ddd;
+    border-radius: 4px;
+    font-size: 0.9375rem;
+    outline: none;
+    height: 40px;  /* Explicit height */
+}
+
+.search-input:focus {
+    border-color: #6c63ff;
+}
+
+.search-button {
+    padding: 0 1.25rem;
+    background-color: #2196F3;
+    color: white;
+    border: none;
+    border-radius: 4px;
+    cursor: pointer;
+    font-size: 0.875rem;
+    transition: background-color 0.2s;
+    height: 40px;  /* Match the height of search input */
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+
+.search-button:hover {
+    background-color: #1976D2;
+}
+
+.spinner-container {
+    display: flex;
+    justify-content: center;
+    margin-top: 2rem;
+}
+
+.spinner {
+    width: 40px;
+    height: 40px;
+    border: 4px solid #f3f3f3;
+    border-top: 4px solid #2196F3;
+    border-radius: 50%;
+    animation: spin 1s linear infinite;
+}
+
+@keyframes spin {
+    0% { transform: rotate(0deg); }
+    100% { transform: rotate(360deg); }
+}
+
+.results-container {
+    margin-top: 2rem;
+    max-width: 800px;
+}
+
+.result-item {
+    padding: 1rem;
+    border: 1px solid #ddd;
+    border-radius: 4px;
+    margin-bottom: 1rem;
+}
+
+.result-title {
+    font-size: 1.2rem;
+    color: #2196F3;
+    margin-bottom: 0.5rem;
+}
+
+.result-description {
+    color: #666;
+}
+
+.error-message {
+    color: #dc3545;
+    padding: 1rem;
+    border: 1px solid #dc3545;
+    border-radius: 4px;
+    margin-top: 1rem;
+}
+
+.markdown-content {
+    line-height: 1.6;
+    color: var(--md-typeset-color);
+    background: var(--md-default-bg-color);
+    border: 1px solid var(--md-default-fg-color--lightest);
+    border-radius: 12px;
+    padding: 1.5rem;
+    box-shadow: 0 2px 4px rgba(0,0,0,0.05);
+    position: relative;
+    margin-top: 2rem;
+}
+
+.markdown-content::before {
+    content: '';
+    position: absolute;
+    top: -8px;
+    left: 24px;
+    width: 16px;
+    height: 16px;
+    background: var(--md-default-bg-color);
+    border-left: 1px solid var(--md-default-fg-color--lightest);
+    border-top: 1px solid var(--md-default-fg-color--lightest);
+    transform: rotate(45deg);
+}
+
+.markdown-content > *:first-child {
+    margin-top: 0;
+    padding-top: 0;
+}
+
+.markdown-content p {
+    margin-bottom: 1rem;
+}
+
+.markdown-content p:last-child {
+    margin-bottom: 0;
+}
+
+.markdown-content code {
+    background: var(--md-code-bg-color);
+    color: var(--md-code-fg-color);
+    padding: 0.2em 0.4em;
+    border-radius: 3px;
+    font-size: 0.9em;
+    font-family: ui-monospace, SFMono-Regular, SF Mono, Menlo, Consolas, Liberation Mono, monospace;
+}
+
+.markdown-content pre {
+    background: var(--md-code-bg-color);
+    padding: 1rem;
+    border-radius: 6px;
+    overflow-x: auto;
+    margin: 1rem 0;
+}
+
+.markdown-content pre code {
+    background: none;
+    padding: 0;
+    font-size: 0.9em;
+}
+
+[data-md-color-scheme="slate"] .markdown-content {
+    box-shadow: 0 2px 4px rgba(0,0,0,0.1);
+}
+
+</style>
+
+<script src="https://cdnjs.cloudflare.com/ajax/libs/marked/9.1.6/marked.min.js"></script>
+
+<script>
+window.addEventListener('load', function() {
+    function displayResults(responseText) {
+        const resultsContainer = document.getElementById('results');
+        const spinner = document.getElementById('spinner');
+        const searchContainer = document.querySelector('.search-container');
+        
+        // Hide spinner
+        spinner.style.display = 'none';
+        
+        // Scroll to search bar
+        searchContainer.scrollIntoView({ behavior: 'smooth', block: 'start' });
+        
+        try {
+            const results = JSON.parse(responseText);
+
+            marked.setOptions({
+                breaks: true,
+                gfm: true,
+                headerIds: false,
+                sanitize: false
+            });
+
+            const htmlContent = marked.parse(results.message);
+            
+            resultsContainer.className = 'markdown-content';
+            resultsContainer.innerHTML = htmlContent;
+
+            // Scroll after content is rendered
+            setTimeout(() => {
+                const searchContainer = document.querySelector('.search-container');
+                const offset = 55; // Offset from top in pixels
+                const elementPosition = searchContainer.getBoundingClientRect().top;
+                const offsetPosition = elementPosition + window.pageYOffset - offset;
+                
+                window.scrollTo({
+                    top: offsetPosition,
+                    behavior: 'smooth'
+                });
+            }, 100);
+        } catch (error) {
+            console.error('Error parsing results:', error);
+            resultsContainer.innerHTML = '<div class="error-message">Error processing results</div>';
+        }
+    }
+
+    async function performSearch() {
+        const searchInput = document.getElementById('searchInput');
+        const resultsContainer = document.getElementById('results');
+        const spinner = document.getElementById('spinner');
+        const searchTerm = searchInput.value.trim();
+
+        if (!searchTerm) {
+            resultsContainer.innerHTML = '<div class="error-message">Please enter a search term</div>';
+            return;
+        }
+
+        // Show spinner, clear results
+        spinner.style.display = 'flex';
+        resultsContainer.innerHTML = '';
+
+        try { 
+            const data = {
+                "query": searchTerm
+            };
+
+            const options = {
+                method: 'POST',
+                headers: {
+                    'accept': 'text/plain',
+                    'content-type': 'application/json',
+                },
+                body: JSON.stringify(data)
+            };
+
+            // const API_ENDPOINT = 'http://0.0.0.0:3000/api/v1/docs_help';
+            const API_ENDPOINT = 'https://help.merge.qodo.ai/api/v1/docs_help';
+
+            const response = await fetch(API_ENDPOINT, options);
+
+            if (!response.ok) {
+                throw new Error(`HTTP error! status: ${response.status}`);
+            }
+
+            const responseText = await response.text();
+            displayResults(responseText);
+        } catch (error) {
+            spinner.style.display = 'none';
+            resultsContainer.innerHTML = `
+                <div class="error-message">
+                    An error occurred while searching. Please try again later.
+                </div>
+            `;
+        }
+    }
+
+    // Add event listeners
+    const searchButton = document.getElementById('searchButton');
+    const searchInput = document.getElementById('searchInput');
+    
+    if (searchButton) {
+        searchButton.addEventListener('click', performSearch);
+    }
+    
+    if (searchInput) {
+        searchInput.addEventListener('keypress', function(e) {
+            if (e.key === 'Enter') {
+                performSearch();
+            }
+        });
+    }
+});
+</script>

docs/docs/chrome-extension/data_privacy.md

@@ -1,4 +1,4 @@
 We take your code's security and privacy seriously:
 
 - The Chrome extension will not send your code to any external servers.
-- For private repositories, we will first validate the user's identity and permissions. After authentication, we generate responses using the existing Qodo Merge Pro integration.
+- For private repositories, we will first validate the user's identity and permissions. After authentication, we generate responses using the existing Qodo Merge integration.

docs/docs/chrome-extension/features.md

@@ -8,7 +8,7 @@ To enable private chat, simply install the Qodo Merge Chrome extension. After in
 This chat session is **private**, and won't be visible to other users.
 
 All open-source repositories are supported.
-For private repositories, you will also need to install Qodo Merge Pro, After installation, make sure to open at least one new PR to fully register your organization. Once done, you can chat with both new and existing PRs across all installed repositories.
+For private repositories, you will also need to install Qodo Merge. After installation, make sure to open at least one new PR to fully register your organization. Once done, you can chat with both new and existing PRs across all installed repositories.
 
 #### Context-aware PR chat
 

docs/docs/chrome-extension/index.md

@@ -4,8 +4,8 @@ With a single-click installation you will gain access to a context-aware chat on
 
 The extension is powered by top code models like Claude 3.5 Sonnet and GPT4. All the extension's features are free to use on public repositories.
 
-For private repositories, you will need to install [Qodo Merge Pro](https://github.com/apps/qodo-merge-pro){:target="_blank"} in addition to the extension  (Quick GitHub app setup with a 14-day free trial. No credit card needed).
+For private repositories, you will need to install [Qodo Merge](https://github.com/apps/qodo-merge-pro){:target="_blank"} in addition to the extension  (Quick GitHub app setup with a 14-day free trial. No credit card needed).
-For a demonstration of how to install Qodo Merge Pro and use it with the Chrome extension, please refer to the tutorial video at the provided [link](https://codium.ai/images/pr_agent/private_repos.mp4){:target="_blank"}.
+For a demonstration of how to install Qodo Merge and use it with the Chrome extension, please refer to the tutorial video at the provided [link](https://codium.ai/images/pr_agent/private_repos.mp4){:target="_blank"}.
 
 <img src="https://codium.ai/images/pr_agent/PR-AgentChat.gif" width="768">
 

docs/docs/core-abilities/auto_best_practices.md

@@ -0,0 +1,69 @@
+# Auto Best Practices 💎
+`Supported Git Platforms: GitHub`
+
+## Overview
+
+![Auto best practice suggestion graph](https://www.qodo.ai/images/pr_agent/auto_best_practices_graph.png){width=684}
+
+> Note - enabling a [Wiki](https://qodo-merge-docs.qodo.ai/usage-guide/enabling_a_wiki/) is required for this feature.
+
+### Finding Code Problems - Exploration Phase
+
+The `improve` tool identifies potential issues, problems and bugs in Pull Request (PR) code changes. 
+Rather than focusing on minor issues like code style or formatting, the tool intelligently analyzes code to detect meaningful problems. 
+
+The analysis intentionally takes a flexible, _exploratory_ approach to identify meaningful potential issues, allowing the tool to surface relevant code suggestions without being constrained by predefined categories.
+
+### Tracking Implemented Suggestions
+
+Qodo Merge features a novel [tracking system](https://qodo-merge-docs.qodo.ai/tools/improve/#suggestion-tracking) that automatically detects when PR authors implement AI-generated code suggestions. 
+All accepted suggestions are aggregated in a repository-specific wiki page called [`.pr_agent_accepted_suggestions`](https://github.com/qodo-ai/pr-agent/wiki/.pr_agent_accepted_suggestions)
+
+
+### Learning and Applying Auto Best Practices
+
+Monthly, Qodo Merge analyzes the collection of accepted suggestions to generate repository-specific best practices, stored in [`.pr_agent_auto_best_practices`](https://github.com/qodo-ai/pr-agent/wiki/.pr_agent_auto_best_practices) wiki file.
+These best practices reflect recurring patterns in accepted code improvements.
+
+The `improve` tool will incorporate these best practices as an additional analysis layer, checking PR code changes against known patterns of previously accepted improvements.
+This creates a two-phase analysis:
+
+1. Open exploration for general code issues
+2. Targeted checking against established best practices - exploiting the knowledge gained from past suggestions
+
+By keeping these phases decoupled, the tool remains free to discover new or unseen issues and problems, while also learning from past experiences.
+
+
+When presenting the suggestions generated by the `improve` tool, Qodo Merge will add a dedicated label for each suggestion generated from the auto best practices - 'Learned best practice':
+
+![Auto best practice suggestion](https://www.qodo.ai/images/pr_agent/auto_best_practices.png){width=684}
+
+
+## Auto Best Practices vs Custom Best Practices
+
+Teams and companies can also manually define their own [custom best practices](https://qodo-merge-docs.qodo.ai/tools/improve/#best-practices) in Qodo Merge. 
+
+When custom best practices exist, Qodo Merge will still generate an 'auto best practices' wiki file, though it won't be used by the `improve` tool. 
+However, this auto-generated file can still serve two valuable purposes:
+
+1. It can help enhance your custom best practices with additional insights derived from suggestions your team found valuable enough to implement
+2. It demonstrates effective patterns for writing AI-friendly best practices
+
+Even when using custom best practices, we recommend regularly reviewing the auto best practices file to refine your custom rules.
+
+## Relevant configurations
+
+```toml
+[auto_best_practices]
+# Disable all auto best practices usage or generation
+enable_auto_best_practices = true  
+
+# Disable usage of auto best practices file in the 'improve' tool
+utilize_auto_best_practices = true 
+
+# Extra instructions to the auto best practices generation prompt
+extra_instructions = ""            
+
+# Max number of patterns to be detected
+max_patterns = 5                   
+```

docs/docs/core-abilities/index.md

@@ -2,6 +2,7 @@
 Qodo Merge utilizes a variety of core abilities to provide a comprehensive and efficient code review experience. These abilities include:
 
 - [Fetching ticket context](https://qodo-merge-docs.qodo.ai/core-abilities/fetching_ticket_context/)
+- [Auto best practices](https://qodo-merge-docs.qodo.ai/core-abilities/auto_best_practices/)
 - [Local and global metadata](https://qodo-merge-docs.qodo.ai/core-abilities/metadata/)
 - [Dynamic context](https://qodo-merge-docs.qodo.ai/core-abilities/dynamic_context/)
 - [Self-reflection](https://qodo-merge-docs.qodo.ai/core-abilities/self_reflection/)
@@ -18,6 +19,7 @@ Here are some additional technical blogs from Qodo, that delve deeper into the c
 These resources provide more comprehensive insights into leveraging LLMs for software development.
 
 ### Code Generation and LLMs
+- [Effective AI code suggestions: less is more](https://www.qodo.ai/blog/effective-code-suggestions-llms-less-is-more/)
 - [State-of-the-art Code Generation with AlphaCodium – From Prompt Engineering to Flow Engineering](https://www.qodo.ai/blog/qodoflow-state-of-the-art-code-generation-for-code-contests/)
 - [RAG for a Codebase with 10k Repos](https://www.qodo.ai/blog/rag-for-large-scale-code-repos/)
 

docs/docs/core-abilities/metadata.md

@@ -1,5 +1,5 @@
 ## Local and global metadata injection with multi-stage analysis
-(1)
+1\.
 Qodo Merge initially retrieves for each PR the following data:
 
 - PR title and branch name
@@ -11,7 +11,7 @@ Qodo Merge initially retrieves for each PR the following data:
 !!! tip "Tip: Organization-level metadata"
     In addition to the inputs above, Qodo Merge can incorporate supplementary preferences provided by the user, like [`extra_instructions` and `organization best practices`](https://qodo-merge-docs.qodo.ai/tools/improve/#extra-instructions-and-best-practices). This information can be used to enhance the PR analysis.
 
-(2)
+2\.
 By default, the first command that Qodo Merge executes is [`describe`](https://qodo-merge-docs.qodo.ai/tools/describe/), which generates three types of outputs:
 
 - PR Type (e.g. bug fix, feature, refactor, etc)
@@ -49,8 +49,8 @@ __old hunk__
 ...
 ```
 
-(3) The entire PR files that were retrieved are also used to expand and enhance the PR context (see [Dynamic Context](https://qodo-merge-docs.qodo.ai/core-abilities/dynamic_context/)).
+3\. The entire PR files that were retrieved are also used to expand and enhance the PR context (see [Dynamic Context](https://qodo-merge-docs.qodo.ai/core-abilities/dynamic_context/)).
 
 
-(4) All the metadata described above represents several level of cumulative analysis - ranging from hunk level, to file level, to PR level, to organization level.
+4\. All the metadata described above represents several level of cumulative analysis - ranging from hunk level, to file level, to PR level, to organization level.
 This comprehensive approach enables Qodo Merge AI models to generate more precise and contextually relevant suggestions and feedback.

docs/docs/faq/index.md

@@ -61,11 +61,11 @@ ___
 
     When you self-host the [open-source](https://github.com/Codium-ai/pr-agent) version, you use your own keys.
 
-    Qodo Merge Pro with SaaS deployment is a hosted version of Qodo Merge, where Qodo manages the infrastructure and the keys.
+    Qodo Merge with SaaS deployment is a hosted version of Qodo Merge, where Qodo manages the infrastructure and the keys.
     For enterprise customers, on-prem deployment is also available. [Contact us](https://www.codium.ai/contact/#pricing) for more information.
 ___
 
-??? note "Q: Can Qodo Merge  review draft/offline PRs?"
+??? note "Q: Can Qodo Merge review draft/offline PRs?"
     #### Answer:<span style="display:none;">5</span>
 
     Yes. While Qodo Merge won't automatically review draft PRs, you can still get feedback by manually requesting it through [online commenting](https://qodo-merge-docs.qodo.ai/usage-guide/automations_and_usage/#online-usage).

docs/docs/index.md

@@ -1,15 +1,16 @@
 # Overview
 
-Qodo Merge is an open-source tool to help efficiently review and handle pull requests.
+[PR-Agent](https://github.com/Codium-ai/pr-agent) is an open-source tool to help efficiently review and handle pull requests. 
+Qodo Merge is a hosted version of PR-Agent, designed for companies and teams that require additional features and capabilities
 
 - See the [Installation Guide](./installation/index.md) for instructions on installing and running the tool on different git platforms.
 
-- See the [Usage Guide](./usage-guide/index.md) for instructions on running the Qodo Merge commands via different interfaces, including _CLI_, _online usage_, or by _automatically triggering_ them when a new PR is opened.
+- See the [Usage Guide](./usage-guide/index.md) for instructions on running commands via different interfaces, including _CLI_, _online usage_, or by _automatically triggering_ them when a new PR is opened.
 
 - See the [Tools Guide](./tools/index.md) for a detailed description of the different tools.
 
 
-## Qodo Merge Docs Smart Search
+## Docs Smart Search
 
 To search the documentation site using natural language:
 
@@ -18,51 +19,45 @@ To search the documentation site using natural language:
    - A pull request where Qodo Merge is installed
    - A [PR Chat](https://qodo-merge-docs.qodo.ai/chrome-extension/features/#pr-chat)
 
-2) Qodo Merge will respond with an [answer](https://github.com/Codium-ai/pr-agent/pull/1241#issuecomment-2365259334) that includes relevant documentation links.
+2) The bot will respond with an [answer](https://github.com/Codium-ai/pr-agent/pull/1241#issuecomment-2365259334) that includes relevant documentation links.
 
 
 ## Qodo Merge Features
 
-Qodo Merge offers extensive pull request functionalities across various git providers.
+Qodo Merge offers extensive pull request functionalities across various git providers:
 
-|       |                                                                                                         | GitHub             | GitLab             | Bitbucket          | Azure DevOps |
+|       |                                                                                                                       | GitHub | Gitlab | Bitbucket | Azure DevOps |
-|-------|---------------------------------------------------------------------------------------------------------|:--------------------:|:--------------------:|:--------------------:|:------------:|
+|-------|-----------------------------------------------------------------------------------------------------------------------|:------:|:------:|:---------:|:------------:|
-| TOOLS | [Review](https://qodo-merge-docs.qodo.ai/tools/review/)                                                                                                  | ✅ | ✅ | ✅ |      ✅       |
+| TOOLS | Review                                                                                                                |   ✅    |   ✅    |     ✅     |      ✅       |
-|       | [Describe](https://qodo-merge-docs.qodo.ai/tools/describe/)                                                                                                | ✅ | ✅ | ✅ |      ✅       |
+|       | ⮑ Incremental                                                                                                         |   ✅    |        |           |              |
-|       | [Improve](https://qodo-merge-docs.qodo.ai/tools/improve/)                                                                                                 | ✅ | ✅ | ✅ |      ✅       |
+|       | Ask                                                                                                                   |   ✅    |   ✅    |     ✅     |      ✅       |
-|       | [Ask](https://qodo-merge-docs.qodo.ai/tools/ask/)                                                                                                     | ✅ | ✅ | ✅ |      ✅       |
+|       | Describe                                                                                                              |   ✅    |   ✅    |     ✅     |      ✅       |
-|       | ⮑ [Ask on code lines](https://pr-agent-docs.codium.ai/tools/ask#ask-lines)                              | ✅ | ✅ |                    |              |
+|       | ⮑ [Inline file summary](https://qodo-merge-docs.qodo.ai/tools/describe/#inline-file-summary){:target="_blank"} 💎     |   ✅    |   ✅    |           |      ✅       |
-|       | [Update CHANGELOG](https://qodo-merge-docs.qodo.ai/tools/update_changelog/)                                                                                     | ✅ | ✅ | ✅ |      ✅       |
+|       | Improve                                                                                                               |   ✅    |   ✅    |     ✅     |      ✅       |
-|       | [Ticket Context](https://qodo-merge-docs.qodo.ai/core-abilities/fetching_ticket_context/) 💎  | ✅ | ✅ |  ✅                  |   |
+|       | ⮑ Extended                                                                                                            |   ✅    |   ✅    |     ✅     |      ✅       |
-|       | [Utilizing Best Practices](https://qodo-merge-docs.qodo.ai/tools/improve/#best-practices) 💎  | ✅ | ✅ |  ✅                  |   |
+|       | [Auto-Approve](https://qodo-merge-docs.qodo.ai/tools/improve/#auto-approval) 💎                                       |   ✅    |   ✅    |   ✅        |            |
-|       | [PR Chat](https://qodo-merge-docs.qodo.ai/chrome-extension/features/#pr-chat) 💎  | ✅ |  |                    |   |
+|       | [Custom Prompt](./tools/custom_prompt.md){:target="_blank"} 💎                                                        |   ✅    |   ✅    |     ✅     |      ✅       |
-|       | [Suggestion Tracking](https://qodo-merge-docs.qodo.ai/tools/improve/#suggestion-tracking) 💎  | ✅ | ✅ |                    |   |
+|       | Reflect and Review                                                                                                    |   ✅    |   ✅    |     ✅     |      ✅       |
-|       | [CI Feedback](https://pr-agent-docs.codium.ai/tools/ci_feedback/) 💎                                    | ✅ |                    |                    |              |
+|       | Update CHANGELOG.md                                                                                                   |   ✅    |   ✅    |     ✅     |      ️       |
-|       | [PR Documentation](https://pr-agent-docs.codium.ai/tools/documentation/) 💎                         | ✅ | ✅ |                   |              |
+|       | Find Similar Issue                                                                                                    |   ✅    |        |           |      ️       |
-|       | [Custom Labels](https://pr-agent-docs.codium.ai/tools/custom_labels/) 💎                                | ✅ | ✅ |                    |              |
+|       | [Add PR Documentation](./tools/documentation.md){:target="_blank"} 💎                                                 |   ✅    |   ✅    |           |      ✅       |
-|       | [Analyze](https://pr-agent-docs.codium.ai/tools/analyze/) 💎                                            | ✅ | ✅ |                    |              |
+|       | [Generate Custom Labels](./tools/describe.md#handle-custom-labels-from-the-repos-labels-page-💎){:target="_blank"} 💎 |   ✅    |   ✅    |           |      ✅       |
-|       | [Similar Code](https://pr-agent-docs.codium.ai/tools/similar_code/) 💎                                  | ✅ |                    |                    |              |
+|       | [Analyze PR Components](./tools/analyze.md){:target="_blank"} 💎                                                      |   ✅    |   ✅    |           |      ✅       |
-|       | [Custom Prompt](https://pr-agent-docs.codium.ai/tools/custom_prompt/) 💎                                | ✅ | ✅ | ✅ |              |
+|       | [Test](https://pr-agent-docs.codium.ai/tools/test/) 💎                                                                | ✅ |   ✅    |           |              |
-|       | [Test](https://pr-agent-docs.codium.ai/tools/test/) 💎                                                  | ✅ | ✅ |                    |              |
+|       | [Implement](https://pr-agent-docs.codium.ai/tools/implement/) 💎                                                      | ✅ |   ✅    |     ✅     |              |
-|       | [Implement](https://pr-agent-docs.codium.ai/tools/implement/) 💎                                                      | ✅ |   ✅    |         ✅          |              |
+|       |                                                                                                                       |        |        |           |      ️       |
-|       |                                                                                                         |                    |                    |                    |              |
+| USAGE | CLI                                                                                                                   |   ✅    |   ✅    |     ✅     |      ✅       |
-| USAGE | [CLI](https://qodo-merge-docs.qodo.ai/usage-guide/automations_and_usage/#local-repo-cli)                                                                                                     | ✅ | ✅ | ✅ |      ✅       |
+|       | App / webhook                                                                                                         |   ✅    |   ✅    |     ✅     |      ✅       |
-|       | [App / webhook](https://qodo-merge-docs.qodo.ai/usage-guide/automations_and_usage/#github-app)                                                                                           | ✅ | ✅ | ✅ |      ✅       |
+|       | Actions                                                                                                               |   ✅    |        |           |      ️       |
-|       | [Tagging bot](https://github.com/Codium-ai/pr-agent#try-it-now)                                                                                             | ✅ |                    |                    |              |
+|       |                                                                                                                       |        |        |           |
-|       | [Actions](https://qodo-merge-docs.qodo.ai/installation/github/#run-as-a-github-action)                                                                                                 | ✅ |✅| ✅ |✅|
+| CORE  | PR compression                                                                                                        |   ✅    |   ✅    |     ✅     |      ✅       |
-|       |                                                                                                         |                    |                    |                    |              |
+|       | Repo language prioritization                                                                                          |   ✅    |   ✅    |     ✅     |      ✅       |
-| CORE  | [PR compression](https://qodo-merge-docs.qodo.ai/core-abilities/compression_strategy/)                                                                  | ✅ | ✅ | ✅ |      ✅       |
+|       | Adaptive and token-aware file patch fitting                                                                           |   ✅    |   ✅    |     ✅     |      ✅       |
-|       | Adaptive and token-aware file patch fitting                                                             | ✅ | ✅ | ✅ |      ✅       |
+|       | Multiple models support                                                                                               |   ✅    |   ✅    |     ✅     |      ✅       |
-|       | [Multiple models support](https://qodo-merge-docs.qodo.ai/usage-guide/changing_a_model/)                                                                                 | ✅ | ✅ | ✅ |      ✅       |
+|       | [Static code analysis](./core-abilities/static_code_analysis/){:target="_blank"} 💎                                   |   ✅    |   ✅    |           |              |
-|       | [Local and global metadata](https://qodo-merge-docs.qodo.ai/core-abilities/metadata/)          | ✅ | ✅ | ✅ | ✅             |
+|       | [Multiple configuration options](./usage-guide/configuration_options.md){:target="_blank"} 💎                         |   ✅    |   ✅    |     ✅     |      ✅       |
-|       | [Dynamic context](https://qodo-merge-docs.qodo.ai/core-abilities/dynamic_context/)          | ✅ | ✅ | ✅ | ✅             |
-|       | [Self reflection](https://qodo-merge-docs.qodo.ai/core-abilities/self_reflection/)          | ✅ | ✅ | ✅ | ✅             |
-|       | [Static code analysis](https://qodo-merge-docs.qodo.ai/core-abilities/static_code_analysis/) 💎         | ✅ | ✅ | ✅ |              |
-|       | [Global and wiki configurations](https://pr-agent-docs.codium.ai/usage-guide/configuration_options/) 💎 | ✅ | ✅ | ✅ |              |
-|       | [PR interactive actions](https://www.codium.ai/images/pr_agent/pr-actions.mp4) 💎                       | ✅ |        ✅           |                    |              |
-|       | [Impact Evaluation](https://qodo-merge-docs.qodo.ai/core-abilities/impact_evaluation/) 💎  | ✅ | ✅ |                    |   |
 
-💎 marks a feature available only in [Qodo Merge Pro](https://www.qodo.ai/pricing/){:target="_blank"}
+💎 marks a feature available only in [Qodo Merge](https://www.codium.ai/pricing/){:target="_blank"}, and not in the open-source version.
 
 
 ## Example Results
@@ -98,4 +93,4 @@ The following diagram illustrates Qodo Merge tools and their flow:
 
 ![Qodo Merge Tools](https://codium.ai/images/pr_agent/diagram-v0.9.png)
 
-Check out the [core abilities](core-abilities/index.md) page for a comprehensive overview of the variety of core abilities used by Qodo Merge.
+Check out the [PR Compression strategy](core-abilities/index.md) page for more details on how we convert a code diff to a manageable LLM prompt

docs/docs/installation/azure.md

@@ -1,5 +1,5 @@
 ## Azure DevOps Pipeline
-You can use a pre-built Action Docker image to run Qodo Merge as an Azure devops pipeline.
+You can use a pre-built Action Docker image to run PR-Agent as an Azure devops pipeline.
 add the following file to your repository under `azure-pipelines.yml`:
 ```yaml
 # Opt out of CI triggers
@@ -52,7 +52,7 @@ stages:
 This script will run Qodo Merge on every new merge request, with the `improve`, `review`, and `describe` commands.
 Note that you need to export the `azure_devops__pat` and `OPENAI_KEY` variables in the Azure DevOps pipeline settings (Pipelines -> Library -> + Variable group):
 
-![Qodo Merge Pro](https://codium.ai/images/pr_agent/azure_devops_pipeline_secrets.png){width=468}
+![Qodo Merge](https://codium.ai/images/pr_agent/azure_devops_pipeline_secrets.png){width=468}
 
 Make sure to give pipeline permissions to the `pr_agent` variable group.
 
@@ -80,7 +80,7 @@ org = "https://dev.azure.com/YOUR_ORGANIZATION/"
 # pat = "YOUR_PAT_TOKEN" needed only if using PAT for authentication
 ```
 
-### Azure DevOps Webhook
+## Azure DevOps Webhook
 
 To trigger from an Azure webhook, you need to manually [add a webhook](https://learn.microsoft.com/en-us/azure/devops/service-hooks/services/webhooks?view=azure-devops).
 Use the "Pull request created" type to trigger a review, or "Pull request commented on" to trigger any supported comment with /<command> <args> comment on the relevant PR. Note that for the "Pull request commented on" trigger, only API v2.0 is supported.

docs/docs/installation/bitbucket.md

@@ -27,10 +27,6 @@ You can get a Bitbucket token for your repository by following Repository Settin
 Note that comments on a PR are not supported in Bitbucket Pipeline.
 
 
-## Run using CodiumAI-hosted Bitbucket app 💎
-
-Please contact visit [Qodo Merge Pro](https://www.codium.ai/pricing/) if you're interested in a hosted BitBucket app solution that provides full functionality including PR reviews and comment handling. It's based on the [bitbucket_app.py](https://github.com/Codium-ai/pr-agent/blob/main/pr_agent/git_providers/bitbucket_provider.py) implementation.
-
 
 ## Bitbucket Server and Data Center
 

docs/docs/installation/github.md

@@ -1,6 +1,6 @@
 ## Run as a GitHub Action
 
-You can use our pre-built Github Action Docker image to run Qodo Merge as a Github Action.
+You can use our pre-built Github Action Docker image to run PR-Agent as a Github Action.
 
 1) Add the following file to your repository under `.github/workflows/pr_agent.yml`:
 
@@ -21,7 +21,7 @@ jobs:
     steps:
       - name: PR Agent action step
         id: pragent
-        uses: Codium-ai/pr-agent@main
+        uses: qodo-ai/pr-agent@main
         env:
           OPENAI_KEY: ${{ secrets.OPENAI_KEY }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

docs/docs/installation/gitlab.md

@@ -1,5 +1,5 @@
 ## Run as a GitLab Pipeline
-You can use a pre-built Action Docker image to run Qodo Merge as a GitLab pipeline. This is a simple way to get started with Qodo Merge without setting up your own server.
+You can use a pre-built Action Docker image to run PR-Agent as a GitLab pipeline. This is a simple way to get started with Qodo Merge without setting up your own server.
 
 (1) Add the following file to your repository under `.gitlab-ci.yml`:
 ```yaml

docs/docs/installation/index.md

@@ -1,21 +1,17 @@
 # Installation
 
-## Self-hosted Qodo Merge
+## Self-hosted PR-Agent
-If you choose to host your own Qodo Merge, you first need to acquire two tokens:
 
-1. An OpenAI key from [here](https://platform.openai.com/api-keys){:target="_blank"}, with access to GPT-4 (or a key for other [language models](https://qodo-merge-docs.qodo.ai/usage-guide/changing_a_model/), if you prefer).
+There are several ways to use self-hosted PR-Agent:
-2. A GitHub\GitLab\BitBucket personal access token (classic), with the repo scope. [GitHub from [here](https://github.com/settings/tokens){:target="_blank"}]
-
-There are several ways to use self-hosted Qodo Merge:
 
 - [Locally](./locally.md)
-- [GitHub](./github.md)
+- [GitHub integration](./github.md)
-- [GitLab](./gitlab.md)
+- [GitLab integration](./gitlab.md)
-- [BitBucket](./bitbucket.md)
+- [BitBucket integration](./bitbucket.md)
-- [Azure DevOps](./azure.md)
+- [Azure DevOps integration](./azure.md)
 
-## Qodo Merge Pro 💎
+## Qodo Merge 💎
-Qodo Merge Pro, an app hosted by CodiumAI for GitHub\GitLab\BitBucket, is also available.
+Qodo Merge, an app hosted by QodoAI for GitHub\GitLab\BitBucket, is also available.
 <br>
-With Qodo Merge Pro, installation is as simple as signing up and adding the Qodo Merge app to your relevant repo.
+With Qodo Merge, installation is as simple as adding the Qodo Merge app to your relevant repositories.
-See [here](https://qodo-merge-docs.qodo.ai/installation/pr_agent_pro/) for more details.
+See [here](https://qodo-merge-docs.qodo.ai/installation/qodo_merge/) for more details.

docs/docs/installation/locally.md

@@ -1,3 +1,77 @@
+To run PR-Agent locally, you first need to acquire two keys:
+
+1. An OpenAI key from [here](https://platform.openai.com/api-keys){:target="_blank"}, with access to GPT-4 (or a key for other [language models](https://qodo-merge-docs.qodo.ai/usage-guide/changing_a_model/), if you prefer).
+2. A personal access token from your Git platform (GitHub, GitLab, BitBucket) with repo scope. GitHub token, for example, can be issued from [here](https://github.com/settings/tokens){:target="_blank"}
+
+
+## Using Docker image
+
+A list of the relevant tools can be found in the [tools guide](../tools/ask.md).
+
+To invoke a tool (for example `review`), you can run PR-Agent directly from the Docker image. Here's how:
+
+- For GitHub:
+    ```
+    docker run --rm -it -e OPENAI.KEY=<your key> -e GITHUB.USER_TOKEN=<your token> codiumai/pr-agent:latest --pr_url <pr_url> review
+    ```
+    If you are using GitHub enterprise server, you need to specify the custom url as variable.
+    For example, if your GitHub server is at `https://github.mycompany.com`, add the following to the command:
+    ```
+    -e GITHUB.BASE_URL=https://github.mycompany.com/api/v3
+    ```
+
+- For GitLab:
+    ```
+    docker run --rm -it -e OPENAI.KEY=<your key> -e CONFIG.GIT_PROVIDER=gitlab -e GITLAB.PERSONAL_ACCESS_TOKEN=<your token> codiumai/pr-agent:latest --pr_url <pr_url> review
+    ```
+
+    If you have a dedicated GitLab instance, you need to specify the custom url as variable:
+    ```
+    -e GITLAB.URL=<your gitlab instance url>
+    ```
+
+- For BitBucket:
+    ```
+    docker run --rm -it -e CONFIG.GIT_PROVIDER=bitbucket -e OPENAI.KEY=$OPENAI_API_KEY -e BITBUCKET.BEARER_TOKEN=$BITBUCKET_BEARER_TOKEN codiumai/pr-agent:latest --pr_url=<pr_url> review
+    ```
+
+For other git providers, update `CONFIG.GIT_PROVIDER` accordingly and check the [`pr_agent/settings/.secrets_template.toml`](https://github.com/Codium-ai/pr-agent/blob/main/pr_agent/settings/.secrets_template.toml) file for environment variables expected names and values.
+
+### Utilizing environment variables
+
+It is also possible to provide or override the configuration by setting the corresponding environment variables.
+You can define the corresponding environment variables by following this convention: `<TABLE>__<KEY>=<VALUE>` or `<TABLE>.<KEY>=<VALUE>`.
+The `<TABLE>` refers to a table/section in a configuration file and `<KEY>=<VALUE>` refers to the key/value pair of a setting in the configuration file.
+
+For example, suppose you want to run `pr_agent` that connects to a self-hosted GitLab instance similar to an example above.
+You can define the environment variables in a plain text file named `.env` with the following content:
+
+```
+CONFIG__GIT_PROVIDER="gitlab"
+GITLAB__URL="<your url>"
+GITLAB__PERSONAL_ACCESS_TOKEN="<your token>"
+OPENAI__KEY="<your key>"
+```
+
+Then, you can run `pr_agent` using Docker with the following command:
+
+```shell
+docker run --rm -it --env-file .env codiumai/pr-agent:latest <tool> <tool parameter>
+```
+
+---
+
+### I get an error when running the Docker image. What should I do?
+
+If you encounter an error when running the Docker image, it is almost always due to a misconfiguration of api keys or tokens.
+
+Note that litellm, which is used by pr-agent, sometimes returns non-informative error messages such as `APIError: OpenAIException - Connection error.`
+Carefully check the api keys and tokens you provided and make sure they are correct.
+Adjustments may be needed depending on your llm provider.
+
+For example, for Azure OpenAI, additional keys are [needed](https://qodo-merge-docs.qodo.ai/usage-guide/changing_a_model/#azure).
+Same goes for other providers, make sure to check the [documentation](https://qodo-merge-docs.qodo.ai/usage-guide/changing_a_model/#changing-a-model)
+
 ## Using pip package
 
 Install the package:
@@ -35,63 +109,6 @@ if __name__ == '__main__':
     main()
 ```
 
-## Using Docker image
-
-A list of the relevant tools can be found in the [tools guide](../tools/ask.md).
-
-To invoke a tool (for example `review`), you can run directly from the Docker image. Here's how:
-
-- For GitHub:
-    ```
-    docker run --rm -it -e OPENAI.KEY=<your key> -e GITHUB.USER_TOKEN=<your token> codiumai/pr-agent:latest --pr_url <pr_url> review
-    ```
-    If you are using GitHub enterprise server, you need to specify the custom url as variable.
-    For example, if your GitHub server is at `https://github.mycompany.com`, add the following to the command:
-    ```
-    -e GITHUB.BASE_URL=https://github.mycompany.com/api/v3
-    ```
-
-- For GitLab:
-    ```
-    docker run --rm -it -e OPENAI.KEY=<your key> -e CONFIG.GIT_PROVIDER=gitlab -e GITLAB.PERSONAL_ACCESS_TOKEN=<your token> codiumai/pr-agent:latest --pr_url <pr_url> review
-    ```
-
-    If you have a dedicated GitLab instance, you need to specify the custom url as variable:
-    ```
-    -e GITLAB.URL=<your gitlab instance url>
-    ```
-
-- For BitBucket:
-    ```
-    docker run --rm -it -e CONFIG.GIT_PROVIDER=bitbucket -e OPENAI.KEY=$OPENAI_API_KEY -e BITBUCKET.BEARER_TOKEN=$BITBUCKET_BEARER_TOKEN codiumai/pr-agent:latest --pr_url=<pr_url> review
-    ```
-
-For other git providers, update `CONFIG.GIT_PROVIDER` accordingly and check the `pr_agent/settings/.secrets_template.toml` file for environment variables expected names and values.
-The `pr_agent` uses [Dynaconf](https://www.dynaconf.com/) to load settings from configuration files.
-
-It is also possible to provide or override the configuration by setting the corresponding environment variables.
-You can define the corresponding environment variables by following this convention: `<TABLE>__<KEY>=<VALUE>` or `<TABLE>.<KEY>=<VALUE>`.
-The `<TABLE>` refers to a table/section in a configuration file and `<KEY>=<VALUE>` refers to the key/value pair of a setting in the configuration file.
-
-For example, suppose you want to run `pr_agent` that connects to a self-hosted GitLab instance similar to an example above.
-You can define the environment variables in a plain text file named `.env` with the following content:
-
-> Warning: Never commit the `.env` file to version control system as it might contains sensitive credentials!
-
-```
-CONFIG__GIT_PROVIDER="gitlab"
-GITLAB__URL="<your url>"
-GITLAB__PERSONAL_ACCESS_TOKEN="<your token>"
-OPENAI__KEY="<your key>"
-```
-
-Then, you can run `pr_agent` using Docker with the following command:
-
-```shell
-docker run --rm -it --env-file .env codiumai/pr-agent:latest <tool> <tool parameter>
-```
-
----
 
 ## Run from source
 

docs/docs/installation/pr_agent.md

@@ -0,0 +1,49 @@
+# PR-Agent Installation Guide
+
+PR-Agent can be deployed in various environments and platforms. Choose the installation method that best suits your needs:
+
+## 🖥️ Local Installation
+
+Learn how to run PR-Agent locally using:
+
+- Docker image
+- pip package
+- CLI from source code
+
+[View Local Installation Guide →](https://qodo-merge-docs.qodo.ai/installation/locally/)
+
+## 🐙 GitHub Integration
+
+Set up PR-Agent with GitHub as:
+
+- GitHub Action
+- Local GitHub App
+
+[View GitHub Integration Guide →](https://qodo-merge-docs.qodo.ai/installation/github/)
+
+## 🦊 GitLab Integration
+
+Deploy PR-Agent on GitLab as:
+
+- GitLab pipeline job
+- Local GitLab webhook server
+
+[View GitLab Integration Guide →](https://qodo-merge-docs.qodo.ai/installation/gitlab/)
+
+## 🟦 BitBucket Integration
+
+Implement PR-Agent in BitBucket as:
+
+- BitBucket pipeline job
+- Local BitBucket server
+
+[View BitBucket Integration Guide →](https://qodo-merge-docs.qodo.ai/installation/bitbucket/)
+
+## 🔷  Azure DevOps Integration
+
+Configure PR-Agent with Azure DevOps as:
+
+- Azure DevOps pipeline job
+- Local Azure DevOps webhook
+
+[View Azure DevOps Integration Guide →](https://qodo-merge-docs.qodo.ai/installation/azure/)

docs/docs/installation/qodo_merge.md

@@ -1,42 +1,44 @@
-Qodo Merge Pro is a versatile application compatible with GitHub, GitLab, and BitBucket, hosted by QodoAI.
+Qodo Merge is a versatile application compatible with GitHub, GitLab, and BitBucket, hosted by QodoAI.
-See [here](https://qodo-merge-docs.qodo.ai/overview/pr_agent_pro/) for more details about the benefits of using Qodo Merge Pro.
+See [here](https://qodo-merge-docs.qodo.ai/overview/pr_agent_pro/) for more details about the benefits of using Qodo Merge.
 
 A complimentary two-week trial is provided to all new users. Following the trial period, user licenses (seats) are required for continued access.
 To purchase user licenses, please visit our [pricing page](https://www.qodo.ai/pricing/).
 Once subscribed, users can seamlessly deploy the application across any of their code repositories.
 
-## Install Qodo Merge Pro for GitHub
+## Install Qodo Merge for GitHub
 
 ### GitHub Cloud
 
-Qodo Merge Pro for GitHub cloud is available for installation through the [GitHub Marketplace](https://github.com/apps/qodo-merge-pro).
+Qodo Merge for GitHub cloud is available for installation through the [GitHub Marketplace](https://github.com/apps/qodo-merge-pro).
 
-![Qodo Merge Pro](https://codium.ai/images/pr_agent/pr_agent_pro_install.png){width=468}
+![Qodo Merge](https://codium.ai/images/pr_agent/pr_agent_pro_install.png){width=468}
 
 ### GitHub Enterprise Server
 
-To use Qodo Merge Pro application on your private GitHub Enterprise Server, you will need to contact us for starting an [Enterprise](https://www.codium.ai/pricing/) trial.
+To use Qodo Merge application on your private GitHub Enterprise Server, you will need to [contact](https://www.qodo.ai/contact/#pricing) Qodo for starting an Enterprise trial.
 
 ### GitHub Open Source Projects
 
-For open-source projects, Qodo Merge Pro is available for free usage. To install Qodo Merge Pro for your open-source repositories, use the following marketplace [link](https://github.com/apps/qodo-merge-pro-for-open-source).
+For open-source projects, Qodo Merge is available for free usage. To install Qodo Merge for your open-source repositories, use the following marketplace [link](https://github.com/apps/qodo-merge-pro-for-open-source).
 
-## Install Qodo Merge Pro for Bitbucket
+## Install Qodo Merge for Bitbucket
 
 ###  Bitbucket Cloud
 
-Qodo Merge Pro for Bitbucket Cloud is available for installation through the following [link](https://bitbucket.org/site/addons/authorize?addon_key=d6df813252c37258)
+Qodo Merge for Bitbucket Cloud is available for installation through the following [link](https://bitbucket.org/site/addons/authorize?addon_key=d6df813252c37258)
 
-![Qodo Merge Pro](https://qodo.ai/images/pr_agent/pr_agent_pro_bitbucket_install.png){width=468}
+![Qodo Merge](https://qodo.ai/images/pr_agent/pr_agent_pro_bitbucket_install.png){width=468}
 
 ### Bitbucket Server
 
-To use Qodo Merge Pro application on your private Bitbucket Server, you will need to contact us for starting an [Enterprise](https://www.codium.ai/pricing/) trial.
+To use Qodo Merge application on your private Bitbucket Server, you will need to contact us for starting an [Enterprise](https://www.qodo.ai/pricing/) trial.
 
 
-## Install Qodo Merge Pro for GitLab (Teams & Enterprise)
+## Install Qodo Merge for GitLab 
 
-Since GitLab platform does not support apps, installing Qodo Merge Pro for GitLab is a bit more involved, and requires the following steps:
+### GitLab Cloud
+
+Since GitLab platform does not support apps, installing Qodo Merge for GitLab is a bit more involved, and requires the following steps:
 
 #### Step 1
 
@@ -79,3 +81,7 @@ Enable SSL verification: Check the box.
 You’re all set!
 
 Open a new merge request or add a MR comment with one of Qodo Merge’s commands such as /review, /describe or /improve.
+
+### GitLab Server
+
+For a trial period of two weeks on your private GitLab Server, the same [installation steps](#gitlab-cloud) as for GitLab Cloud apply. After the trial period, you will need to [contact](https://www.qodo.ai/contact/#pricing) Qodo for moving to an Enterprise account.

docs/docs/overview/data_privacy.md

@@ -1,12 +1,12 @@
-## Self-hosted Qodo Merge
+## Self-hosted PR-Agent
 
-- If you self-host Qodo Merge with your OpenAI (or other LLM provider) API key, it is between you and the provider. We don't send your code data to Qodo Merge servers.
+- If you self-host PR-Agent with your OpenAI (or other LLM provider) API key, it is between you and the provider. We don't send your code data to Qodo servers.
 
-## Qodo Merge Pro 💎
+## Qodo Merge 💎
 
-- When using Qodo Merge Pro 💎, hosted by CodiumAI, we will not store any of your data, nor will we use it for training. You will also benefit from an OpenAI account with zero data retention.
+- When using Qodo Merge💎, hosted by Qodo, we will not store any of your data, nor will we use it for training. You will also benefit from an OpenAI account with zero data retention.
 
-- For certain clients, CodiumAI-hosted Qodo Merge Pro will use CodiumAI’s proprietary models. If this is the case, you will be notified.
+- For certain clients, Qodo Merge will use Qodo’s proprietary models. If this is the case, you will be notified.
 
 - No passive collection of Code and Pull Requests’ data — Qodo Merge will be active only when you invoke it, and it will then extract and analyze only data relevant to the executed command and queried pull request.
 

docs/docs/overview/index.md

@@ -1,95 +0,0 @@
-# Overview
-
-Qodo Merge is an open-source tool to help efficiently review and handle pull requests.
-
-- See the [Installation Guide](./installation/index.md) for instructions on installing and running the tool on different git platforms.
-
-- See the [Usage Guide](./usage-guide/index.md) for instructions on running the Qodo Merge commands via different interfaces, including _CLI_, _online usage_, or by _automatically triggering_ them when a new PR is opened.
-
-- See the [Tools Guide](./tools/index.md) for a detailed description of the different tools.
-
-
-## Qodo Merge Docs Smart Search
-
-To search the documentation site using natural language:
-
-1) Comment `/help "your question"` in either:
-
-   - A pull request where Qodo Merge is installed
-   - A [PR Chat](https://qodo-merge-docs.qodo.ai/chrome-extension/features/#pr-chat)
-
-2) Qodo Merge will respond with an [answer](https://github.com/Codium-ai/pr-agent/pull/1241#issuecomment-2365259334) that includes relevant documentation links.
-
-
-## Qodo Merge Features
-
-Qodo Merge offers extensive pull request functionalities across various git providers.
-
-|       |                                                                                                                       | GitHub | Gitlab | Bitbucket | Azure DevOps |
-|-------|-----------------------------------------------------------------------------------------------------------------------|:------:|:------:|:---------:|:------------:|
-| TOOLS | Review                                                                                                                |   ✅    |   ✅    |   ✅       |      ✅      |
-|       | ⮑ Incremental                                                                                                         |   ✅    |        |            |              |
-|       | Ask                                                                                                                   |   ✅    |   ✅    |   ✅        |      ✅      |
-|       | Describe                                                                                                              |   ✅    |   ✅    |   ✅        |      ✅      |
-|       | ⮑ [Inline file summary](https://qodo-merge-docs.qodo.ai/tools/describe/#inline-file-summary){:target="_blank"} 💎     |   ✅    |   ✅    |           |      ✅      |
-|       | Improve                                                                                                               |   ✅    |   ✅    |   ✅        |      ✅      |
-|       | ⮑ Extended                                                                                                            |   ✅    |   ✅    |   ✅        |      ✅      |
-|       | [Custom Prompt](./tools/custom_prompt.md){:target="_blank"} 💎                                                        |   ✅    |   ✅    |   ✅        |      ✅      |
-|       | Reflect and Review                                                                                                    |   ✅    |   ✅    |   ✅        |      ✅      |
-|       | Update CHANGELOG.md                                                                                                   |   ✅    |   ✅    |   ✅        |      ️       |
-|       | Find Similar Issue                                                                                                    |   ✅    |        |             |      ️       |
-|       | [Add PR Documentation](./tools/documentation.md){:target="_blank"} 💎                                                 |   ✅    |   ✅    |          |      ✅      |
-|       | [Generate Custom Labels](./tools/describe.md#handle-custom-labels-from-the-repos-labels-page-💎){:target="_blank"} 💎 |   ✅    |   ✅    |            |      ✅      |
-|       | [Analyze PR Components](./tools/analyze.md){:target="_blank"} 💎                                                      |   ✅    |   ✅    |       |      ✅      |
-|       | [Test](https://pr-agent-docs.codium.ai/tools/test/) 💎                                                                | ✅ |   ✅    |                    |              |
-|       | [Implement](https://pr-agent-docs.codium.ai/tools/implement/) 💎                                                      | ✅ |   ✅    |          ✅         |              |
-|       |                                                                                                                       |        |        |            |      ️       |
-| USAGE | CLI                                                                                                                   |   ✅    |   ✅    |   ✅       |      ✅      |
-|       | App / webhook                                                                                                         |   ✅    |   ✅    |    ✅        |      ✅      |
-|       | Actions                                                                                                               |   ✅    |        |            |      ️       |
-|       |                                                                                                                       |        |        |            |
-| CORE  | PR compression                                                                                                        |   ✅    |   ✅    |   ✅       |   ✅        |
-|       | Repo language prioritization                                                                                          |   ✅    |   ✅    |   ✅       |   ✅        |
-|       | Adaptive and token-aware file patch fitting                                                                           |   ✅    |   ✅    |   ✅     |   ✅        |
-|       | Multiple models support                                                                                               |   ✅    |   ✅    |   ✅       |   ✅        |
-|       | Incremental PR review                                                                                                 |   ✅    |        |            |           |
-|       | [Static code analysis](./tools/analyze.md/){:target="_blank"} 💎                                                      |   ✅    |   ✅    |    ✅    |   ✅        |
-|       | [Multiple configuration options](./usage-guide/configuration_options.md){:target="_blank"} 💎                         |   ✅    |   ✅    |    ✅    |   ✅        |
-
-💎 marks a feature available only in [Qodo Merge Pro](https://www.codium.ai/pricing/){:target="_blank"}
-
-
-## Example Results
-<hr>
-
-#### [/describe](https://github.com/Codium-ai/pr-agent/pull/530)
-<figure markdown="1">
-![/describe](https://www.codium.ai/images/pr_agent/describe_new_short_main.png){width=512}
-</figure>
-<hr>
-
-#### [/review](https://github.com/Codium-ai/pr-agent/pull/732#issuecomment-1975099151)
-<figure markdown="1">
-![/review](https://www.codium.ai/images/pr_agent/review_new_short_main.png){width=512}
-</figure>
-<hr>
-
-#### [/improve](https://github.com/Codium-ai/pr-agent/pull/732#issuecomment-1975099159)
-<figure markdown="1">
-![/improve](https://www.codium.ai/images/pr_agent/improve_new_short_main.png){width=512}
-</figure>
-<hr>
-
-#### [/generate_labels](https://github.com/Codium-ai/pr-agent/pull/530)
-<figure markdown="1">
-![/generate_labels](https://www.codium.ai/images/pr_agent/geneare_custom_labels_main_short.png){width=300}
-</figure>
-<hr>
-
-## How it Works
-
-The following diagram illustrates Qodo Merge tools and their flow:
-
-![Qodo Merge Tools](https://codium.ai/images/pr_agent/diagram-v0.9.png)
-
-Check out the [PR Compression strategy](core-abilities/index.md) page for more details on how we convert a code diff to a manageable LLM prompt

docs/docs/overview/pr_agent_pro.md

@@ -1,21 +1,21 @@
 ### Overview
 
-[Qodo Merge Pro](https://www.codium.ai/pricing/){:target="_blank"} is a hosted version of open-source [Qodo Merge (PR-Agent)](https://github.com/Codium-ai/pr-agent){:target="_blank"}. A complimentary two-week trial is offered, followed by a monthly subscription fee.
+[Qodo Merge](https://www.codium.ai/pricing/){:target="_blank"} is a paid, hosted version of open-source [PR-Agent](https://github.com/Codium-ai/pr-agent){:target="_blank"}. A complimentary two-week trial is offered, followed by a monthly subscription fee.
-Qodo Merge Pro is designed for companies and teams that require additional features and capabilities. It provides the following benefits:
+Qodo Merge is designed for companies and teams that require additional features and capabilities. It provides the following benefits:
 
 1. **Fully managed** - We take care of everything for you - hosting, models, regular updates, and more. Installation is as simple as signing up and adding the Qodo Merge app to your GitHub\GitLab\BitBucket repo.
 
-2. **Improved privacy** - No data will be stored or used to train models. Qodo Merge Pro will employ zero data retention, and will use an OpenAI and Claude accounts with zero data retention.
+2. **Improved privacy** - No data will be stored or used to train models. Qodo Merge will employ zero data retention, and will use an OpenAI and Claude accounts with zero data retention.
 
-3. **Improved support** - Qodo Merge Pro users will receive priority support, and will be able to request new features and capabilities.
+3. **Improved support** - Qodo Merge users will receive priority support, and will be able to request new features and capabilities.
 
-4. **Supporting self-hosted git servers** - Qodo Merge Pro can be installed on GitHub Enterprise Server, GitLab, and BitBucket. For more information, see the [installation guide](https://qodo-merge-docs.qodo.ai/installation/pr_agent_pro/).
+4. **Supporting self-hosted git servers** - Qodo Merge can be installed on GitHub Enterprise Server, GitLab, and BitBucket. For more information, see the [installation guide](https://qodo-merge-docs.qodo.ai/installation/pr_agent_pro/).
 
-5. **PR Chat** - Qodo Merge Pro allows you to engage in [private chat](https://qodo-merge-docs.qodo.ai/chrome-extension/features/#pr-chat) about your pull requests on private repositories.
+5. **PR Chat** - Qodo Merge allows you to engage in [private chat](https://qodo-merge-docs.qodo.ai/chrome-extension/features/#pr-chat) about your pull requests on private repositories.
 
 ### Additional features
 
-Here are some of the additional features and capabilities that Qodo Merge Pro offers:
+Here are some of the additional features and capabilities that Qodo Merge offers:
 
 | Feature                                                                                                              | Description                                                                                                                                                      |
 |----------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------|
@@ -24,14 +24,14 @@ Here are some of the additional features and capabilities that Qodo Merge Pro of
 | [**Apply suggestions**](https://qodo-merge-docs.qodo.ai/tools/improve/#overview)                                     | Generate committable code from the relevant suggestions interactively by clicking on a checkbox                                                                   |
 | [**Suggestions impact**](https://qodo-merge-docs.qodo.ai/tools/improve/#assessing-impact)                         | Automatically mark suggestions that were implemented by the user (either directly in GitHub, or indirectly in the IDE) to enable tracking of the impact of the suggestions |
 | [**CI feedback**](https://qodo-merge-docs.qodo.ai/tools/ci_feedback/) | Automatically analyze failed CI checks on GitHub and provide actionable feedback in the PR conversation, helping to resolve issues quickly |
-| [**Advanced usage statistics**](https://www.codium.ai/contact/#/)                                                    | Qodo Merge Pro offers detailed statistics at user, repository, and company levels, including metrics about Qodo Merge usage, and also general statistics and insights |
+| [**Advanced usage statistics**](https://www.codium.ai/contact/#/)                                                    | Qodo Merge offers detailed statistics at user, repository, and company levels, including metrics about Qodo Merge usage, and also general statistics and insights |
 | [**Incorporating companies' best practices**](https://qodo-merge-docs.qodo.ai/tools/improve/#best-practices)         | Use the companies' best practices as reference to increase the effectiveness and the relevance of the code suggestions                                           |
 | [**Interactive triggering**](https://qodo-merge-docs.qodo.ai/tools/analyze/#example-usage)                           | Interactively apply different tools via the `analyze` command                                                                                                    |
-| [**Custom labels**](https://qodo-merge-docs.qodo.ai/tools/describe/#handle-custom-labels-from-the-repos-labels-page) | Define custom labels for Qodo Merge to assign to the PR                                                                                                            |
+| [**Custom labels**](https://qodo-merge-docs.qodo.ai/tools/describe/#handle-custom-labels-from-the-repos-labels-page) | Define custom labels for Qodo Merge to assign to the PR                                                                                                           |
 
 ### Additional tools
 
-Here are additional tools that are available only for Qodo Merge Pro users:
+Here are additional tools that are available only for Qodo Merge users:
 
 | Feature                                                                               | Description |
 |---------------------------------------------------------------------------------------|-------------|
@@ -46,7 +46,7 @@ Here are additional tools that are available only for Qodo Merge Pro users:
 
 ### Supported languages
 
-Qodo Merge Pro leverages the world's leading code models - Claude 3.5 Sonnet and GPT-4.
+Qodo Merge leverages the world's leading code models - Claude 3.5 Sonnet and GPT-4.
 As a result, its primary tools such as `describe`, `review`, and `improve`, as well as the PR-chat feature, support virtually all programming languages.
 
-For specialized commands that require static code analysis, Qodo Merge Pro offers support for specific languages. For more details about features that require static code analysis, please refer to the [documentation](https://qodo-merge-docs.qodo.ai/tools/analyze/#overview).
+For specialized commands that require static code analysis, Qodo Merge offers support for specific languages. For more details about features that require static code analysis, please refer to the [documentation](https://qodo-merge-docs.qodo.ai/tools/analyze/#overview).

docs/docs/tools/analyze.md

@@ -14,6 +14,5 @@ An example result:
 
 ![Analyze 1](https://codium.ai/images/pr_agent/analyze_1.png){width=750}
 
-**Notes**
+!!! note "Language that are currently supported:"
-
+    Python, Java, C++, JavaScript, TypeScript, C#.
-- Language that are currently supported: Python, Java, C++, JavaScript, TypeScript, C#.

docs/docs/tools/ask.md

@@ -38,20 +38,20 @@ where `https://real_link_to_image` is the direct link to the image.
 Note that GitHub has a built-in mechanism of pasting images in comments. However, pasted image does not provide a direct link.
 To get a direct link to an image, we recommend using the following scheme:
 
-1) First, post a comment that contains **only** the image:
+1\. First, post a comment that contains **only** the image:
 
 ![Ask image1](https://codium.ai/images/pr_agent/ask_images1.png){width=512}
 
-2) Quote reply to that comment:
+2\. Quote reply to that comment:
 
 ![Ask image2](https://codium.ai/images/pr_agent/ask_images2.png){width=512}
 
-3) In the screen opened, type the question below the image:
+3\. In the screen opened, type the question below the image:
 
 ![Ask image3](https://codium.ai/images/pr_agent/ask_images3.png){width=512}
 ![Ask image4](https://codium.ai/images/pr_agent/ask_images4.png){width=512}
 
-4) Post the comment, and receive the answer:
+4\. Post the comment, and receive the answer:
 
 ![Ask image5](https://codium.ai/images/pr_agent/ask_images5.png){width=512}
 

docs/docs/tools/custom_labels.md

@@ -28,7 +28,7 @@ When working from CLI, you need to apply the [configuration changes](#configurat
 To enable custom labels, you need to apply the [configuration changes](#configuration-options) to the local `.pr_agent.toml` file in your repository.
 
 #### 3. Handle custom labels from the Repo's labels page 💎
-> This feature is available only in Qodo Merge Pro
+> This feature is available only in Qodo Merge
 
 * GitHub : `https://github.com/{owner}/{repo}/labels`, or click on the "Labels" tab in the issues or PRs page.
 * GitLab : `https://gitlab.com/{owner}/{repo}/-/labels`, or click on "Manage" -> "Labels" on the left menu.

docs/docs/tools/custom_prompt.md

@@ -51,8 +51,8 @@ Results obtained with the prompt above:
 
 ## Configuration options
 
-`prompt`: the prompt for the tool. It should be a multi-line string.
+- `prompt`: the prompt for the tool. It should be a multi-line string.
 
-`num_code_suggestions`: number of code suggestions provided by the 'custom_prompt' tool. Default is 4.
+- `num_code_suggestions_per_chunk`: number of code suggestions provided by the 'custom_prompt' tool, per chunk. Default is 4.
 
-`enable_help_text`: if set to true, the tool will display a help text in the comment. Default is true.
+- `enable_help_text`: if set to true, the tool will display a help text in the comment. Default is true.

docs/docs/tools/describe.md

@@ -143,7 +143,7 @@ The marker `pr_agent:type` will be replaced with the PR type, `pr_agent:summary`
 
 ![Describe markers before](https://codium.ai/images/pr_agent/describe_markers_before.png){width=512}
 
-→
+becomes
 
 ![Describe markers after](https://codium.ai/images/pr_agent/describe_markers_after.png){width=512}
 

docs/docs/tools/documentation.md

@@ -27,7 +27,6 @@ You can state a name of a specific component in the PR to get documentation only
  - `docs_style`: The exact style of the documentation (for python docstring). you can choose between: `google`, `numpy`, `sphinx`, `restructuredtext`, `plain`. Default is `sphinx`.
  - `extra_instructions`: Optional extra instructions to the tool. For example: "focus on the changes in the file X. Ignore change in ...".
 
-**Notes**
+!!! note "Notes"
-
+    - The following languages are currently supported: Python, Java, C++, JavaScript, TypeScript, C#.
-- Language that are currently fully supported: Python, Java, C++, JavaScript, TypeScript, C#.
+    - This tool can also be triggered interactively by using the [`analyze`](./analyze.md) tool.
-- This tool can also be triggered interactively by using the [`analyze`](./analyze.md) tool.

docs/docs/tools/help.md

@@ -1,6 +1,6 @@
 ## Overview
 The `help` tool provides a list of all the available tools and their descriptions.
-For Qodo Merge Pro users, it also enables to trigger each tool by checking the relevant box.
+For Qodo Merge users, it also enables to trigger each tool by checking the relevant box.
 
 It can be invoked manually by commenting on any PR:
 ```

docs/docs/tools/implement.md

@@ -1,3 +1,5 @@
+`Platforms supported: GitHub, GitLab, Bitbucket`
+
 ## Overview
 
 The `implement` tool converts human code review discussions and feedback into ready-to-commit code changes.
@@ -8,8 +10,9 @@ It leverages LLM technology to transform PR comments and review suggestions into
 
 ### For Reviewers
 
-Reviewers can request code changes by: <br>
+Reviewers can request code changes by:
-1. Selecting the code block to be modified. <br>
+
+1. Selecting the code block to be modified.
 2. Adding a comment with the syntax: 
 ```
 /implement <code-change-description>
@@ -44,7 +47,8 @@ You can reference and implement changes from any comment by:
 Note that the implementation will occur within the review discussion thread.
 
 
-**Configuration options** <br>
+**Configuration options**
-- Use `/implement` to implement code change within and based on the review discussion. <br>
+
-- Use `/implement <code-change-description>` inside a review discussion to implement specific instructions. <br>
+- Use `/implement` to implement code change within and based on the review discussion.
-- Use `/implement <link-to-review-comment>` to indirectly call the tool from any comment. <br>
+- Use `/implement <code-change-description>` inside a review discussion to implement specific instructions.
+- Use `/implement <link-to-review-comment>` to indirectly call the tool from any comment.

docs/docs/tools/improve.md

@@ -9,8 +9,9 @@ The tool can be triggered automatically every time a new PR is [opened](../usage
 
 ![code_suggestions_as_comment_open.png](https://codium.ai/images/pr_agent/code_suggestions_as_comment_open.png){width=512}
 
-Note that the `Apply this suggestion` checkbox, which interactively converts a suggestion into a commitable code comment, is available only for Qodo Merge Pro 💎 users.
+!!! note "The following features are available only for Qodo Merge 💎 users:"
-
+    - The `Apply this suggestion` checkbox, which interactively converts a suggestion into a committable code comment
+    - The `More` checkbox to generate additional suggestions
 
 ## Example usage
 
@@ -52,9 +53,10 @@ num_code_suggestions_per_chunk = ...
 - The `pr_commands` lists commands that will be executed automatically when a PR is opened.
 - The `[pr_code_suggestions]` section contains the configurations for the `improve` tool you want to edit (if any)
 
-### Assessing Impact 💎
+### Assessing Impact
+>`💎 feature`
 
-Note that Qodo Merge pro tracks two types of implementations:
+Qodo Merge tracks two types of implementations for tracking implemented suggestions:
 
 - Direct implementation - when the user directly applies the suggestion by clicking the `Apply` checkbox.
 - Indirect implementation - when the user implements the suggestion in their IDE environment. In this case, Qodo Merge will utilize, after each commit, a dedicated logic to identify if a suggestion was implemented, and will mark it as implemented.
@@ -67,10 +69,10 @@ In post-process, Qodo Merge counts the number of suggestions that were implement
 
 ![code_suggestions_asses_impact_stats_2](https://codium.ai/images/pr_agent/code_suggestions_asses_impact_stats_2.png){width=512}
 
-## Suggestion tracking 💎
+## Suggestion tracking
-`Platforms supported: GitHub, GitLab`
+>`💎 feature. Platforms supported: GitHub, GitLab`
 
-Qodo Merge employs an novel detection system to automatically [identify](https://qodo-merge-docs.qodo.ai/core-abilities/impact_evaluation/) AI code suggestions that PR authors have accepted and implemented.
+Qodo Merge employs a novel detection system to automatically [identify](https://qodo-merge-docs.qodo.ai/core-abilities/impact_evaluation/) AI code suggestions that PR authors have accepted and implemented.
 
 Accepted suggestions are also automatically documented in a dedicated wiki page called `.pr_agent_accepted_suggestions`, allowing users to track historical changes, assess the tool's effectiveness, and learn from previously implemented recommendations in the repository.
 An example [result](https://github.com/Codium-ai/pr-agent/wiki/.pr_agent_accepted_suggestions):
@@ -101,8 +103,6 @@ The `improve` tool can be further customized by providing additional instruction
 
 ### Extra instructions
 
->`Platforms supported: GitHub, GitLab, Bitbucket, Azure DevOps`
-
 You can use the `extra_instructions` configuration option to give the AI model additional instructions for the `improve` tool.
 Be specific, clear, and concise in the instructions. With extra instructions, you are the prompter.
 
@@ -118,9 +118,9 @@ extra_instructions="""\
 ```
 Use triple quotes to write multi-line instructions. Use bullet points or numbers to make the instructions more readable.
 
-### Best practices 💎
+### Best practices
 
->`Platforms supported: GitHub, GitLab, Bitbucket`
+> `💎 feature. Platforms supported: GitHub, GitLab, Bitbucket`
 
 Another option to give additional guidance to the AI model is by creating a `best_practices.md` file, either in your repository's root directory or as a [**wiki page**](https://github.com/Codium-ai/pr-agent/wiki) (we recommend the wiki page, as editing and maintaining it over time is easier).
 This page can contain a list of best practices, coding standards, and guidelines that are specific to your repo/organization.
@@ -191,8 +191,45 @@ And the label will be: `{organization_name} best practice`.
 
 ![best_practice](https://codium.ai/images/pr_agent/org_best_practice.png){width=512}
 
+### Auto best practices
 
-### How to combine `extra instructions` and `best practices`
+>`💎 feature. Platforms supported: GitHub.`
+
+`Auto best practices` is a novel Qodo Merge capability that:
+
+1. Identifies recurring patterns from accepted suggestions
+2. **Automatically** generates [best practices page](https://github.com/qodo-ai/pr-agent/wiki/.pr_agent_auto_best_practices) based on what your team consistently values
+3. Applies these learned patterns to future code reviews
+
+This creates an automatic feedback loop where the system continuously learns from your team's choices to provide increasingly relevant suggestions. 
+The system maintains two analysis phases:
+
+- Open exploration for new issues
+- Targeted checking against established best practices
+
+Note that when a [custom best practices](https://qodo-merge-docs.qodo.ai/tools/improve/#best-practices) exist, Qodo Merge will still generate an 'auto best practices' wiki file, though it won't use it in the `improve` tool.
+Learn more about utilizing 'auto best practices' in our [detailed guide](https://qodo-merge-docs.qodo.ai/core-abilities/auto_best_practices/).
+
+#### Relevant configurations
+
+```toml
+[auto_best_practices]
+# Disable all auto best practices usage or generation
+enable_auto_best_practices = true  
+
+# Disable usage of auto best practices file in the 'improve' tool
+utilize_auto_best_practices = true 
+
+# Extra instructions to the auto best practices generation prompt
+extra_instructions = ""            
+
+# Max number of patterns to be detected
+max_patterns = 5                   
+```
+
+
+### Combining 'extra instructions' and 'best practices'
+> `💎 feature`
 
 The `extra instructions` configuration is more related to the `improve` tool prompt. It can be used, for example, to avoid specific suggestions ("Don't suggest to add try-except block", "Ignore changes in toml files", ...) or to emphasize specific aspects or formats ("Answer in Japanese", "Give only short suggestions", ...)
 
@@ -231,6 +268,8 @@ dual_publishing_score_threshold = x
 Where x represents the minimum score threshold (>=) for suggestions to be presented as commitable PR comments in addition to the table. Default is -1 (disabled).
 
 ### Self-review
+> `💎 feature`
+
 If you set in a configuration file:
 ```toml
 [pr_code_suggestions]
@@ -274,21 +313,56 @@ code_suggestions_self_review_text = "... (your text here) ..."
 
         To prevent unauthorized approvals, this configuration defaults to false, and cannot be altered through online comments; enabling requires a direct update to the configuration file and a commit to the repository. This ensures that utilizing the feature demands a deliberate documented decision by the repository owner.
 
+### Auto-approval
+> `💎 feature. Platforms supported: GitHub, GitLab, Bitbucket`
+
+Under specific conditions, Qodo Merge can auto-approve a PR when a specific comment is invoked, or when the PR meets certain criteria.
+
+To ensure safety, the auto-approval feature is disabled by default. To enable auto-approval, you need to actively set, in a pre-defined _configuration file_, the following:
+```toml
+[config]
+enable_auto_approval = true
+```
+Note that this specific flag cannot be set with a command line argument, only in the configuration file, committed to the repository.
+This ensures that enabling auto-approval is a deliberate decision by the repository owner.
+
+**(1) Auto-approval by commenting**
+
+After enabling, by commenting on a PR:
+```
+/review auto_approve
+```
+Qodo Merge will automatically approve the PR, and add a comment with the approval.
+
+**(2) Auto-approval when the PR meets certain criteria**
+
+There are two criteria that can be set for auto-approval:
+
+- **Review effort score**
+```toml
+[config]
+auto_approve_for_low_review_effort = X # X is a number between 1 to 5
+```
+When the [review effort score](https://www.qodo.ai/images/pr_agent/review3.png) is lower or equal to X, the PR will be auto-approved.
+
+___
+- **No code suggestions**
+```toml
+[config]
+auto_approve_for_no_suggestions = true
+```
+When no [code suggestion](https://www.qodo.ai/images/pr_agent/code_suggestions_as_comment_closed.png) were found for the PR, the PR will be auto-approved.
 
 ### How many code suggestions are generated?
 Qodo Merge uses a dynamic strategy to generate code suggestions based on the size of the pull request (PR). Here's how it works:
 
-1) Chunking large PRs:
+#### 1. Chunking large PRs
-
 - Qodo Merge divides large PRs into 'chunks'.
 - Each chunk contains up to `pr_code_suggestions.max_context_tokens` tokens (default: 14,000).
 
-
+#### 2. Generating suggestions
-2) Generating suggestions:
-
 - For each chunk, Qodo Merge generates up to `pr_code_suggestions.num_code_suggestions_per_chunk` suggestions (default: 4).
 
-
 This approach has two main benefits:
 
 - Scalability: The number of suggestions scales with the PR size, rather than being fixed.
@@ -330,6 +404,10 @@ Note: Chunking is primarily relevant for large PRs. For most PRs (up to 500 line
         <td><b>apply_suggestions_checkbox</b></td>
         <td> Enable the checkbox to create a committable suggestion. Default is true.</td>
       </tr>
+      <tr>
+        <td><b>enable_more_suggestions_checkbox</b></td>
+        <td> Enable the checkbox to generate more suggestions. Default is true.</td>
+      </tr>
       <tr>
         <td><b>enable_help_text</b></td>
         <td>If set to true, the tool will display a help text in the comment. Default is true.</td>

docs/docs/tools/improve_component.md

@@ -18,9 +18,9 @@ The tool will generate code suggestions for the selected component (if no compon
 
 ![improve_component2](https://codium.ai/images/pr_agent/improve_component2.png){width=768}
 
-**Notes**
+!!! note "Notes"
-- Language that are currently supported by the tool: Python, Java, C++, JavaScript, TypeScript, C#.
+    - Language that are currently supported by the tool: Python, Java, C++, JavaScript, TypeScript, C#.
-- This tool can also be triggered interactively by using the [`analyze`](./analyze.md) tool.
+    - This tool can also be triggered interactively by using the [`analyze`](./analyze.md) tool.
 
 ## Configuration options
 - `num_code_suggestions`: number of code suggestions to provide. Default is 4

docs/docs/tools/index.md

@@ -20,4 +20,4 @@ Here is a list of Qodo Merge tools, each with a dedicated page that explains how
 | **💎 [Improve Component (`/improve_component component_name`](./improve_component.md))** | Generates code suggestions for a specific code component that changed in the PR                                                            |
 | **💎 [CI Feedback (`/checks ci_job`](./ci_feedback.md))**                                | Automatically generates feedback and analysis for a failed CI job                                                                          |
 | **💎 [Implement (`/implement`](./implement.md))**                                        | Generates implementation code from review suggestions                                                                                      |
-Note that the tools marked with 💎 are available only for Qodo Merge Pro users.
+Note that the tools marked with 💎 are available only for Qodo Merge users.

docs/docs/tools/review.md

@@ -114,20 +114,6 @@ You can enable\disable the `review` tool to add specific labels to the PR:
   </tr>
 </table>
 
-!!! example "Auto-approval"
-
-If enabled, the `review` tool can approve a PR when a specific comment, `/review auto_approve`, is invoked.
-
-<table>
-  <tr>
-    <td><b>enable_auto_approval</b></td>
-    <td>If set to true, the tool will approve the PR when invoked with the 'auto_approve' command. Default is false. This flag can be changed only from a configuration file.</td>
-  </tr>
-  <tr>
-    <td><b>maximal_review_effort</b></td>
-    <td>Maximal effort level for auto-approval. If the PR's estimated review effort is above this threshold, the auto-approval will not run. Default is 5.</td>
-  </tr>
-</table>
 
 ## Usage Tips
 
@@ -179,30 +165,7 @@ If enabled, the `review` tool can approve a PR when a specific comment, `/review
     Use triple quotes to write multi-line instructions. Use bullet points to make the instructions more readable.
 
 
-!!! tip "Auto-approval"
 
-    Qodo Merge can approve a PR when a specific comment is invoked.
-
-    To ensure safety, the auto-approval feature is disabled by default. To enable auto-approval, you need to actively set in a pre-defined configuration file the following:
-    ```
-    [pr_reviewer]
-    enable_auto_approval = true
-    ```
-    (this specific flag cannot be set with a command line argument, only in the configuration file, committed to the repository)
-
-
-    After enabling, by commenting on a PR:
-    ```
-    /review auto_approve
-    ```
-    Qodo Merge will automatically approve the PR, and add a comment with the approval.
-
-
-    You can also enable auto-approval only if the PR meets certain requirements, such as that the `estimated_review_effort` label is equal or below a certain threshold, by adjusting the flag:
-    ```
-    [pr_reviewer]
-    maximal_review_effort = 5
-    ```
 
 !!! tip  "Code suggestions"
 

docs/docs/tools/similar_issues.md

@@ -16,14 +16,17 @@ It can be invoked manually by commenting on any PR:
 
 Note that to perform retrieval, the `similar_issue` tool indexes all the repo previous issues (once).
 
+### Selecting a Vector Database
+Configure your preferred database by changing the `pr_similar_issue` parameter in `configuration.toml` file.
 
-**Select VectorDBs** by changing `pr_similar_issue` parameter in `configuration.toml` file
+#### Available Options
+Choose from the following Vector Databases:
 
-2 VectorDBs are available to switch in
 1. LanceDB
 2. Pinecone
 
-To enable usage of the '**similar issue**' tool for Pinecone, you need to set the following keys in `.secrets.toml` (or in the relevant environment variables):
+#### Pinecone Configuration
+To use Pinecone with the `similar issue` tool, add these credentials to `.secrets.toml` (or set as environment variables):
 
 ```
 [pinecone]

docs/docs/tools/test.md

@@ -17,9 +17,9 @@ The tool will generate tests for the selected component (if no component is stat
 
 (Example taken from [here](https://github.com/Codium-ai/pr-agent/pull/598#issuecomment-1913679429)):
 
-**Notes** <br>
+!!! note "Notes"
-- The following languages are currently supported: Python, Java, C++, JavaScript, TypeScript, C#. <br>
+    - The following languages are currently supported: Python, Java, C++, JavaScript, TypeScript, C#.
-- This tool can also be triggered interactively by using the [`analyze`](./analyze.md) tool.
+    - This tool can also be triggered interactively by using the [`analyze`](./analyze.md) tool.
 
 
 ## Configuration options

docs/docs/usage-guide/PR_agent_pro_models.md

@@ -1,18 +0,0 @@
-## Qodo Merge Pro Models
-
-The default models used by Qodo Merge Pro are a combination of Claude-3.5-sonnet and  OpenAI's GPT-4 models.
-
-Users can configure Qodo Merge Pro to use solely a specific model by editing the [configuration](https://qodo-merge-docs.qodo.ai/usage-guide/configuration_options/) file.
-
-For example, to restrict Qodo Merge Pro to using only `Claude-3.5-sonnet`, add this setting:
-
-```
-[config]
-model="claude-3-5-sonnet"
-```
-
-Or to restrict Qodo Merge Pro to using only `GPT-4o`, add this setting:
-```
-[config]
-model="gpt-4o"
-```

docs/docs/usage-guide/additional_configurations.md

@@ -57,6 +57,23 @@ All Qodo Merge tools have a parameter called `extra_instructions`, that enables
 /update_changelog --pr_update_changelog.extra_instructions="Make sure to update also the version ..."
 ```
 
+## Language Settings
+
+The default response language for Qodo Merge is **U.S. English**. However, some development teams may prefer to display information in a different language. For example, your team's workflow might improve if PR descriptions and code suggestions are set to your country's native language.  
+
+To configure this, set the `response_language` parameter in the configuration file. This will prompt the model to respond in the specified language. Use a **standard locale code** based on [ISO 3166](https://en.wikipedia.org/wiki/ISO_3166) (country codes) and [ISO 639](https://en.wikipedia.org/wiki/ISO_639) (language codes) to define a language-country pair. See this [comprehensive list of locale codes](https://simplelocalize.io/data/locales/).  
+
+Example: 
+
+```toml
+[config]
+response_language: "it-IT"
+```
+
+This will set the response language globally for all the commands to Italian.
+
+> **Important:** Note that only dynamic text generated by the AI model is translated to the configured language. Static text such as labels and table headers that are not part of the AI models response will remain in US English. In addition, the model you are using must have good support for the specified language. 
+
 ## Working with large PRs
 
 The default mode of CodiumAI is to have a single call per tool, using GPT-4, which has a token limit of 8000 tokens.
@@ -142,13 +159,11 @@ Qodo Merge allows you to automatically ignore certain PRs based on various crite
 
 - PRs with specific titles (using regex matching)
 - PRs between specific branches (using regex matching)
-- PRs that don't include changes from specific folders (using regex matching)
+- PRs not from specific folders
 - PRs containing specific labels
 - PRs opened by specific users
 
-### Example usage
+### Ignoring PRs with specific titles
-
-#### Ignoring PRs with specific titles
 
 To ignore PRs with a specific title such as "[Bump]: ...", you can add the following to your `configuration.toml` file:
 
@@ -159,7 +174,7 @@ ignore_pr_title = ["\\[Bump\\]"]
 
 Where the `ignore_pr_title` is a list of regex patterns to match the PR title you want to ignore. Default is `ignore_pr_title = ["^\\[Auto\\]", "^Auto"]`.
 
-#### Ignoring PRs between specific branches
+### Ignoring PRs between specific branches
 
 To ignore PRs from specific source or target branches, you can add the following to your `configuration.toml` file:
 
@@ -172,7 +187,7 @@ ignore_pr_target_branches = ["qa"]
 Where the `ignore_pr_source_branches` and `ignore_pr_target_branches` are lists of regex patterns to match the source and target branches you want to ignore.
 They are not mutually exclusive, you can use them together or separately.
 
-#### Ignoring PRs that don't include changes from specific folders
+### Ignoring PRs not from specific folders
 
 To allow only specific folders (often needed in large monorepos), set:
 
@@ -181,9 +196,9 @@ To allow only specific folders (often needed in large monorepos), set:
 allow_only_specific_folders=['folder1','folder2']
 ```
 
-For the configuration above, automatic feedback will only be triggered when the PR changes include files from 'folder1' or 'folder2'
+For the configuration above, automatic feedback will only be triggered when the PR changes include files where 'folder1' or 'folder2' is in the file path
 
-#### Ignoring PRs containg specific labels
+### Ignoring PRs containing specific labels
 
 To ignore PRs containg specific labels, you can add the following to your `configuration.toml` file:
 
@@ -194,7 +209,7 @@ ignore_pr_labels = ["do-not-merge"]
 
 Where the `ignore_pr_labels` is a list of labels that when present in the PR, the PR will be ignored.
 
-#### Ignoring PRs from specific users
+### Ignoring PRs from specific users
 
 Qodo Merge automatically identifies and ignores pull requests created by bots using:
 

docs/docs/usage-guide/automations_and_usage.md

@@ -14,12 +14,12 @@ Examples of invoking the different tools via the CLI:
 
 **Notes:**
 
-(1) in addition to editing your local configuration file, you can also change any configuration value by adding it to the command line:
+1. in addition to editing your local configuration file, you can also change any configuration value by adding it to the command line:
 ```
 python -m pr_agent.cli --pr_url=<pr_url>  /review --pr_reviewer.extra_instructions="focus on the file: ..."
 ```
 
-(2) You can print results locally, without publishing them, by setting in `configuration.toml`:
+2. You can print results locally, without publishing them, by setting in `configuration.toml`:
 ```
 [config]
 publish_output=false
@@ -27,14 +27,9 @@ verbosity_level=2
 ```
 This is useful for debugging or experimenting with different tools.
 
-(3)
+3. **git provider**: The [git_provider](https://github.com/Codium-ai/pr-agent/blob/main/pr_agent/settings/configuration.toml#L5) field in a configuration file determines the GIT provider that will be used by Qodo Merge. Currently, the following providers are supported:
+`github` **(default)**, `gitlab`, `bitbucket`, `azure`, `codecommit`, `local`, and `gerrit`.
 
-**git provider**: The [git_provider](https://github.com/Codium-ai/pr-agent/blob/main/pr_agent/settings/configuration.toml#L5) field in a configuration file determines the GIT provider that will be used by Qodo Merge. Currently, the following providers are supported:
-`
-"github", "gitlab", "bitbucket", "azure", "codecommit", "local", "gerrit"
-`
-
-Default is "github".
 
 ### CLI Health Check
 To verify that Qodo Merge has been configured correctly, you can run this health check command from the repository root:
@@ -95,8 +90,8 @@ When this parameter is set to `true`, Qodo Merge will not run any automatic tool
 
 ### GitHub App
 
-!!! note "Configurations for Qodo Merge Pro"
+!!! note "Configurations for Qodo Merge"
-    Qodo Merge Pro for GitHub is an App, hosted by CodiumAI. So all the instructions below are relevant also for Qodo Merge Pro users.
+    Qodo Merge for GitHub is an App, hosted by Qodo. So all the instructions below are relevant also for Qodo Merge users.
     Same goes for [GitLab webhook](#gitlab-webhook) and [BitBucket App](#bitbucket-app) sections.
 
 #### GitHub app automatic tools when a new PR is opened

docs/docs/usage-guide/changing_a_model.md

@@ -1,4 +1,4 @@
-## Changing a model
+## Changing a model in PR-Agent
 
 See [here](https://github.com/Codium-ai/pr-agent/blob/main/pr_agent/algo/__init__.py) for a list of available models.
 To use a different model than the default (GPT-4), you need to edit in the [configuration file](https://github.com/Codium-ai/pr-agent/blob/main/pr_agent/settings/configuration.toml#L2) the fields:
@@ -30,6 +30,14 @@ model="" # the OpenAI model you've deployed on Azure (e.g. gpt-4o)
 fallback_models=["..."]
 ```
 
+Passing custom headers to the underlying LLM Model API can be done by setting extra_headers parameter to litellm. 
+```
+[litellm]
+extra_headers='{"projectId": "<authorized projectId >", ...}') #The value of this setting should be a JSON string representing the desired headers, a ValueError is thrown otherwise.
+```
+This enables users to pass authorization tokens or API keys, when routing requests through an API management gateway.
+
+
 ### Ollama
 
 You can run models locally through either [VLLM](https://docs.litellm.ai/docs/providers/vllm) or [Ollama](https://docs.litellm.ai/docs/providers/ollama)
@@ -51,7 +59,7 @@ api_base = "http://localhost:11434" # or whatever port you're running Ollama on
     
     Commercial models such as GPT-4, Claude Sonnet, and Gemini have demonstrated robust capabilities in generating structured output for code analysis tasks with large input. In contrast, most open-source models currently available (as of January 2025) face challenges with these complex tasks.
 
-    Based on our testing, local open-source models are suitable for experimentation and learning purposes, but they are not suitable for production-level code analysis tasks.
+    Based on our testing, local open-source models are suitable for experimentation and learning purposes (mainly for the `ask` command), but they are not suitable for production-level code analysis tasks.
     
     Hence, for production workflows and real-world usage, we recommend using commercial models.
 
@@ -189,15 +197,27 @@ key = ...
 
 If the relevant model doesn't appear [here](https://github.com/Codium-ai/pr-agent/blob/main/pr_agent/algo/__init__.py), you can still use it as a custom model:
 
-(1) Set the model name in the configuration file:
+1. Set the model name in the configuration file:
 ```
 [config]
 model="custom_model_name"
 fallback_models=["custom_model_name"]
 ```
-(2) Set the maximal tokens for the model:
+2. Set the maximal tokens for the model:
 ```
 [config]
 custom_model_max_tokens= ...
 ```
-(3) Go to [litellm documentation](https://litellm.vercel.app/docs/proxy/quick_start#supported-llms), find the model you want to use, and set the relevant environment variables.
+3. Go to [litellm documentation](https://litellm.vercel.app/docs/proxy/quick_start#supported-llms), find the model you want to use, and set the relevant environment variables.
+
+4. Most reasoning models do not support chat-style inputs (`system` and `user` messages) or temperature settings. 
+To bypass chat templates and temperature controls, set `config.custom_reasoning_model = true` in your configuration file.
+
+## Dedicated parameters
+
+### OpenAI models
+
+[config]
+reasoning_efffort= = "medium" # "low", "medium", "high"
+
+With the OpenAI models that support reasoning effort (eg: o3-mini), you can specify its reasoning effort via `config` section. The default value is `medium`. You can change it to `high` or `low` based on your usage.

docs/docs/usage-guide/configuration_options.md

@@ -20,7 +20,7 @@ In terms of precedence, wiki configurations will override local configurations,
 
 `Platforms supported: GitHub, GitLab, Bitbucket`
 
-With Qodo Merge Pro, you can set configurations by creating a page called `.pr_agent.toml` in the [wiki](https://github.com/Codium-ai/pr-agent/wiki/pr_agent.toml) of the repo.
+With Qodo Merge, you can set configurations by creating a page called `.pr_agent.toml` in the [wiki](https://github.com/Codium-ai/pr-agent/wiki/pr_agent.toml) of the repo.
 The advantage of this method is that it allows to set configurations without needing to commit new content to the repo - just edit the wiki page and **save**.
 
 

docs/docs/usage-guide/enabling_a_wiki.md

@@ -3,12 +3,12 @@
 
 For optimal functionality of Qodo Merge, we recommend enabling a wiki for each repository where Qodo Merge is installed. The wiki serves several important purposes:
 
-**Key Wiki Features:**
+**Key Wiki Features: 💎**
 
 - Storing a [configuration file](https://qodo-merge-docs.qodo.ai/usage-guide/configuration_options/#wiki-configuration-file)
 - Defining a [`best_practices.md`](https://qodo-merge-docs.qodo.ai/tools/improve/#best-practices) file
 - Track [accepted suggestions](https://qodo-merge-docs.qodo.ai/tools/improve/#suggestion-tracking)
-- Facilitates learning over time by creating an [auto_best_practices.md]() file
+- Facilitates learning over time by creating an [auto_best_practices.md](https://qodo-merge-docs.qodo.ai/core-abilities/auto_best_practices) file
 
 
 **Setup Instructions (GitHub):**
@@ -21,4 +21,13 @@ To enable a wiki for your repository:
 4. Enable the "Wikis" option by checking the corresponding box
 5. Return to your repository's main page
 6. Look for the newly added "Wiki" tab in the top navigation
-7. Initialize your wiki by clicking "Create the first page" (this step is important - without creating an initial page, the wiki will not be fully functional)
+7. Initialize your wiki by clicking "Create the first page" and saving (this step is important - without creating an initial page, the wiki will not be fully functional)
+
+### Why Wiki?
+
+- Your code (and its derivatives, including accepted code suggestions) is yours. Qodo Merge will never store it on external servers.
+- Repository changes typically require pull requests, which create overhead and are time-consuming. This process is too cumbersome for auto data aggregation, and is not very convenient even for managing frequently updated content like configuration files and best practices.
+- A repository wiki page provides an ideal balance:
+    - It lives within your repository, making it suitable for code-related documentation
+    - It enables quick updates without the overhead of pull requests
+    - It maintains full Git version control, allowing you to track changes over time.

docs/docs/usage-guide/index.md

@@ -24,4 +24,4 @@ It includes information on how to adjust Qodo Merge configurations, define which
     - [Changing a model](./additional_configurations.md#changing-a-model)
     - [Patch Extra Lines](./additional_configurations.md#patch-extra-lines)
     - [Editing the prompts](./additional_configurations.md#editing-the-prompts)
-- [Qodo Merge Pro Models](./PR_agent_pro_models.md)
+- [Qodo Merge Models](./qodo_merge_models)

docs/docs/usage-guide/qodo_merge_models.md

@@ -0,0 +1,36 @@
+
+The default models used by Qodo Merge are a combination of Claude-3.5-sonnet and  OpenAI's GPT-4 models.
+
+### Selecting a Specific Model
+
+Users can configure Qodo Merge to use a specific model by editing the [configuration](https://qodo-merge-docs.qodo.ai/usage-guide/configuration_options/) file.
+The models supported by Qodo Merge are:
+
+- `claude-3-5-sonnet`
+- `gpt-4o`
+- `o3-mini`
+
+To restrict Qodo Merge to using only `Claude-3.5-sonnet`, add this setting:
+
+```
+[config]
+model="claude-3-5-sonnet"
+```
+
+To restrict Qodo Merge to using only `GPT-4o`, add this setting:
+```
+[config]
+model="gpt-4o"
+```
+
+[//]: # (To restrict Qodo Merge to using only `deepseek-r1` us-hosted, add this setting:)
+[//]: # (```)
+[//]: # ([config])
+[//]: # (model="deepseek/r1")
+[//]: # (```)
+
+To restrict Qodo Merge to using only `o3-mini`, add this setting:
+```
+[config]
+model="o3-mini"
+```

docs/mkdocs.yml

@@ -1,20 +1,16 @@
-site_name: Qodo Merge (formerly known as PR-Agent)
+site_name: Qodo Merge (and open-source PR-Agent)
-repo_url: https://github.com/Codium-ai/pr-agent
+repo_url: https://github.com/qodo-ai/pr-agent
-repo_name: Codium-ai/pr-agent
+repo_name: Qodo-ai/pr-agent
 
 nav:
   - Overview:
     - 'index.md'
-    - 💎 Qodo Merge Pro: 'overview/pr_agent_pro.md'
+    - 💎 Qodo Merge: 'overview/pr_agent_pro.md'
     - Data Privacy: 'overview/data_privacy.md'
   - Installation:
     - 'installation/index.md'
-    - Locally: 'installation/locally.md'
+    - PR-Agent: 'installation/pr_agent.md'
-    - GitHub: 'installation/github.md'
+    - 💎 Qodo Merge: 'installation/qodo_merge.md'
-    - GitLab: 'installation/gitlab.md'
-    - BitBucket: 'installation/bitbucket.md'
-    - Azure DevOps: 'installation/azure.md'
-    - 💎 Qodo Merge Pro: 'installation/pr_agent_pro.md'
   - Usage Guide:
     - 'usage-guide/index.md'
     - Introduction: 'usage-guide/introduction.md'
@@ -24,7 +20,7 @@ nav:
     - Managing Mail Notifications: 'usage-guide/mail_notifications.md'
     - Changing a Model: 'usage-guide/changing_a_model.md'
     - Additional Configurations: 'usage-guide/additional_configurations.md'
-    - 💎 Qodo Merge Pro Models: 'usage-guide/PR_agent_pro_models'
+    - 💎 Qodo Merge Models: 'usage-guide/qodo_merge_models.md'
   - Tools:
     - 'tools/index.md'
     - Describe: 'tools/describe.md'
@@ -46,6 +42,7 @@ nav:
   - Core Abilities:
       - 'core-abilities/index.md'
       - Fetching ticket context: 'core-abilities/fetching_ticket_context.md'
+      - Auto best practices: 'core-abilities/auto_best_practices.md'
       - Local and global metadata: 'core-abilities/metadata.md'
       - Dynamic context: 'core-abilities/dynamic_context.md'
       - Self-reflection: 'core-abilities/self_reflection.md'
@@ -61,6 +58,7 @@ nav:
       - Data Privacy: 'chrome-extension/data_privacy.md'
   - FAQ:
       - FAQ: 'faq/index.md'
+  - AI Docs Search: 'ai_search/index.md'
 #  - Code Fine-tuning Benchmark: 'finetuning_benchmark/index.md'
 
 theme:
@@ -156,4 +154,4 @@ markdown_extensions:
 
 
 copyright: |
-  &copy; 2024 <a href="https://www.codium.ai/"  target="_blank" rel="noopener">CodiumAI</a>
+  &copy; 2025 <a href="https://www.codium.ai/"  target="_blank" rel="noopener">QodoAI</a>

docs/overrides/partials/footer.html

@@ -82,7 +82,7 @@
 
 <footer class="wrapper">
   <div class="container">
-    <p class="footer-text">© 2024 <a href="https://www.qodo.ai/" target="_blank" rel="noopener">Qodo</a></p>
+    <p class="footer-text">© 2025 <a href="https://www.qodo.ai/" target="_blank" rel="noopener">Qodo</a></p>
     <div class="footer-links">
       <a href="https://qodo-gen-docs.qodo.ai/">Qodo Gen</a>
       <p>|</p>

pr_agent/agent/pr_agent.py

@@ -3,6 +3,7 @@ from functools import partial
 
 from pr_agent.algo.ai_handlers.base_ai_handler import BaseAiHandler
 from pr_agent.algo.ai_handlers.litellm_ai_handler import LiteLLMAIHandler
+from pr_agent.algo.cli_args import CliArgs
 from pr_agent.algo.utils import update_settings_from_args
 from pr_agent.config_loader import get_settings
 from pr_agent.git_providers.utils import apply_repo_settings
@@ -43,6 +44,7 @@ command2class = {
 commands = list(command2class.keys())
 
 
+
 class PRAgent:
     def __init__(self, ai_handler: partial[BaseAiHandler,] = LiteLLMAIHandler):
         self.ai_handler = ai_handler  # will be initialized in run_action
@@ -60,27 +62,31 @@ class PRAgent:
         else:
             action, *args = request
 
-        forbidden_cli_args = ['enable_auto_approval', 'approve_pr_on_self_review', 'base_url', 'url', 'app_name', 'secret_provider',
+        # validate args
-                              'git_provider', 'skip_keys', 'openai.key', 'ANALYTICS_FOLDER', 'uri', 'app_id', 'webhook_secret',
+        is_valid, arg = CliArgs.validate_user_args(args)
-                              'bearer_token', 'PERSONAL_ACCESS_TOKEN', 'override_deployment_type', 'private_key',
+        if not is_valid:
-                              'local_cache_path', 'enable_local_cache', 'jira_base_url', 'api_base', 'api_type', 'api_version',
+            get_logger().error(
-                              'skip_keys']
+                f"CLI argument for param '{arg}' is forbidden. Use instead a configuration file."
-        if args:
+            )
-            for arg in args:
+            return False
-                if arg.startswith('--'):
+
-                    arg_word = arg.lower()
+        # Update settings from args
-                    arg_word = arg_word.replace('__', '.')  # replace double underscore with dot, e.g. --openai__key -> --openai.key
-                    for forbidden_arg in forbidden_cli_args:
-                        forbidden_arg_word = forbidden_arg.lower()
-                        if '.' not in forbidden_arg_word:
-                            forbidden_arg_word = '.' + forbidden_arg_word
-                        if forbidden_arg_word in arg_word:
-                            get_logger().error(
-                                f"CLI argument for param '{forbidden_arg}' is forbidden. Use instead a configuration file."
-                            )
-                            return False
         args = update_settings_from_args(args)
 
+        # Append the response language in the extra instructions
+        response_language = get_settings().config.get('response_language', 'en-us')
+        if response_language.lower() != 'en-us':
+            get_logger().info(f'User has set the response language to: {response_language}')
+            for key in get_settings():
+                setting = get_settings().get(key)
+                if str(type(setting)) == "<class 'dynaconf.utils.boxing.DynaBox'>":
+                    if hasattr(setting, 'extra_instructions'):
+                        current_extra_instructions = setting.extra_instructions
+                        if current_extra_instructions:
+                            setting.extra_instructions = current_extra_instructions+ f"\n======\n\nIn addition, Your response MUST be written in the language corresponding to local code: {response_language}. This is crucial."
+                        else:
+                            setting.extra_instructions = f"Your response MUST be written in the language corresponding to locale code: '{response_language}'. This is crucial."
+
         action = action.lstrip("/").lower()
         if action not in command2class:
             get_logger().error(f"Unknown command: {action}")

pr_agent/algo/__init__.py

@@ -26,10 +26,13 @@ MAX_TOKENS = {
     'o1-preview-2024-09-12': 128000,  # 128K, but may be limited by config.max_model_tokens
     'o1-2024-12-17': 204800,  # 200K, but may be limited by config.max_model_tokens
     'o1': 204800,  # 200K, but may be limited by config.max_model_tokens
+    'o3-mini': 204800,  # 200K, but may be limited by config.max_model_tokens
+    'o3-mini-2025-01-31': 204800,  # 200K, but may be limited by config.max_model_tokens
     'claude-instant-1': 100000,
     'claude-2': 100000,
     'command-nightly': 4096,
     'deepseek/deepseek-chat': 128000,  # 128K, but may be limited by config.max_model_tokens
+    'deepseek/deepseek-reasoner': 64000,  # 64K, but may be limited by config.max_model_tokens
     'replicate/llama-2-70b-chat:2c1608e18606fad2812020dc541930f2d0495ce32eee50074220b87300bc16e1': 4096,
     'meta-llama/Llama-2-7b-chat-hf': 4096,
     'vertex_ai/codechat-bison': 6144,
@@ -40,13 +43,14 @@ MAX_TOKENS = {
     'vertex_ai/claude-3-opus@20240229': 100000,
     'vertex_ai/claude-3-5-sonnet@20240620': 100000,
     'vertex_ai/claude-3-5-sonnet-v2@20241022': 100000,
+    'vertex_ai/claude-3-7-sonnet@20250219': 200000,
     'vertex_ai/gemini-1.5-pro': 1048576,
     'vertex_ai/gemini-1.5-flash': 1048576,
-    'vertex_ai/gemini-2.0-flash-exp': 1048576,
+    'vertex_ai/gemini-2.0-flash': 1048576,
     'vertex_ai/gemma2': 8200,
     'gemini/gemini-1.5-pro': 1048576,
     'gemini/gemini-1.5-flash': 1048576,
-    'gemini/gemini-2.0-flash-exp': 1048576,
+    'gemini/gemini-2.0-flash': 1048576,
     'codechat-bison': 6144,
     'codechat-bison-32k': 32000,
     'anthropic.claude-instant-v1': 100000,
@@ -55,6 +59,7 @@ MAX_TOKENS = {
     'anthropic/claude-3-opus-20240229': 100000,
     'anthropic/claude-3-5-sonnet-20240620': 100000,
     'anthropic/claude-3-5-sonnet-20241022': 100000,
+    'anthropic/claude-3-7-sonnet-20250219': 200000,
     'anthropic/claude-3-5-haiku-20241022': 100000,
     'bedrock/anthropic.claude-instant-v1': 100000,
     'bedrock/anthropic.claude-v2': 100000,
@@ -64,6 +69,7 @@ MAX_TOKENS = {
     'bedrock/anthropic.claude-3-5-haiku-20241022-v1:0': 100000,
     'bedrock/anthropic.claude-3-5-sonnet-20240620-v1:0': 100000,
     'bedrock/anthropic.claude-3-5-sonnet-20241022-v2:0': 100000,
+    'bedrock/anthropic.claude-3-7-sonnet-20250219-v1:0': 200000,
     "bedrock/us.anthropic.claude-3-5-sonnet-20241022-v2:0": 100000,
     'claude-3-5-sonnet': 100000,
     'groq/llama3-8b-8192': 8192,
@@ -80,3 +86,26 @@ MAX_TOKENS = {
     "watsonx/ibm/granite-34b-code-instruct": 8191,
     "watsonx/mistralai/mistral-large": 32768,
 }
+
+USER_MESSAGE_ONLY_MODELS = [
+    "deepseek/deepseek-reasoner",
+    "o1-mini",
+    "o1-mini-2024-09-12",
+    "o1-preview"
+]
+
+NO_SUPPORT_TEMPERATURE_MODELS = [
+    "deepseek/deepseek-reasoner",
+    "o1-mini",
+    "o1-mini-2024-09-12",
+    "o1",
+    "o1-2024-12-17",
+    "o3-mini",
+    "o3-mini-2025-01-31",
+    "o1-preview"
+]
+
+SUPPORT_REASONING_EFFORT_MODELS = [
+    "o3-mini",
+    "o3-mini-2025-01-31"
+]

pr_agent/algo/ai_handlers/litellm_ai_handler.py

@@ -6,10 +6,12 @@ import requests
 from litellm import acompletion
 from tenacity import retry, retry_if_exception_type, stop_after_attempt
 
+from pr_agent.algo import NO_SUPPORT_TEMPERATURE_MODELS, SUPPORT_REASONING_EFFORT_MODELS, USER_MESSAGE_ONLY_MODELS
 from pr_agent.algo.ai_handlers.base_ai_handler import BaseAiHandler
-from pr_agent.algo.utils import get_version
+from pr_agent.algo.utils import ReasoningEffort, get_version
 from pr_agent.config_loader import get_settings
 from pr_agent.log import get_logger
+import json
 
 OPENAI_RETRIES = 5
 
@@ -94,6 +96,15 @@ class LiteLLMAIHandler(BaseAiHandler):
         if get_settings().get("DEEPSEEK.KEY", None):
             os.environ['DEEPSEEK_API_KEY'] = get_settings().get("DEEPSEEK.KEY")
 
+        # Models that only use user meessage
+        self.user_message_only_models = USER_MESSAGE_ONLY_MODELS
+
+        # Model that doesn't support temperature argument
+        self.no_support_temperature_models = NO_SUPPORT_TEMPERATURE_MODELS
+
+        # Models that support reasoning effort
+        self.support_reasoning_models = SUPPORT_REASONING_EFFORT_MODELS
+
     def prepare_logs(self, response, system, user, resp, finish_reason):
         response_log = response.dict().copy()
         response_log['system'] = system
@@ -197,13 +208,11 @@ class LiteLLMAIHandler(BaseAiHandler):
                 messages[1]["content"] = [{"type": "text", "text": messages[1]["content"]},
                                           {"type": "image_url", "image_url": {"url": img_path}}]
 
-            # Currently, model OpenAI o1 series does not support a separate system and user prompts
+            # Currently, some models do not support a separate system and user prompts
-            O1_MODEL_PREFIX = 'o1'
+            if model in self.user_message_only_models or get_settings().config.custom_reasoning_model:
-            model_type = model.split('/')[-1] if '/' in model else model
-            if model_type.startswith(O1_MODEL_PREFIX):
                 user = f"{system}\n\n\n{user}"
                 system = ""
-                get_logger().info(f"Using O1 model, combining system and user prompts")
+                get_logger().info(f"Using model {model}, combining system and user prompts")
                 messages = [{"role": "user", "content": user}]
                 kwargs = {
                     "model": model,
@@ -217,11 +226,22 @@ class LiteLLMAIHandler(BaseAiHandler):
                     "model": model,
                     "deployment_id": deployment_id,
                     "messages": messages,
-                    "temperature": temperature,
                     "timeout": get_settings().config.ai_timeout,
                     "api_base": self.api_base,
                 }
 
+            # Add temperature only if model supports it
+            if model not in self.no_support_temperature_models and not get_settings().config.custom_reasoning_model:
+                # get_logger().info(f"Adding temperature with value {temperature} to model {model}.")
+                kwargs["temperature"] = temperature
+
+            # Add reasoning_effort if model supports it
+            if (model in self.support_reasoning_models):
+                supported_reasoning_efforts = [ReasoningEffort.HIGH.value, ReasoningEffort.MEDIUM.value, ReasoningEffort.LOW.value]
+                reasoning_effort = get_settings().config.reasoning_effort if (get_settings().config.reasoning_effort in supported_reasoning_efforts) else ReasoningEffort.MEDIUM.value
+                get_logger().info(f"Adding reasoning_effort with value {reasoning_effort} to model {model}.")
+                kwargs["reasoning_effort"] = reasoning_effort
+
             if get_settings().litellm.get("enable_callbacks", False):
                 kwargs = self.add_litellm_callbacks(kwargs)
 
@@ -235,12 +255,22 @@ class LiteLLMAIHandler(BaseAiHandler):
             if self.repetition_penalty:
                 kwargs["repetition_penalty"] = self.repetition_penalty
 
+            #Added support for extra_headers while using litellm to call underlying model, via a api management gateway, would allow for passing custom headers for security and authorization
+            if get_settings().get("LITELLM.EXTRA_HEADERS", None):
+                try:
+                    litellm_extra_headers = json.loads(get_settings().litellm.extra_headers)
+                    if not isinstance(litellm_extra_headers, dict):
+                        raise ValueError("LITELLM.EXTRA_HEADERS must be a JSON object")
+                except json.JSONDecodeError as e:
+                    raise ValueError(f"LITELLM.EXTRA_HEADERS contains invalid JSON: {str(e)}")
+                kwargs["extra_headers"] = litellm_extra_headers
+            
             get_logger().debug("Prompts", artifact={"system": system, "user": user})
-
+            
             if get_settings().config.verbosity_level >= 2:
                 get_logger().info(f"\nSystem prompt:\n{system}")
                 get_logger().info(f"\nUser prompt:\n{user}")
-
+                
             response = await acompletion(**kwargs)
         except (openai.APIError, openai.APITimeoutError) as e:
             get_logger().warning(f"Error during LLM inference: {e}")

pr_agent/algo/cli_args.py

@@ -0,0 +1,34 @@
+from base64 import b64decode
+import hashlib
+
+class CliArgs:
+    @staticmethod
+    def validate_user_args(args: list) -> (bool, str):
+        try:
+            if not args:
+                return True, ""
+
+            # decode forbidden args
+            _encoded_args = 'ZW5hYmxlX2F1dG9fYXBwcm92YWw=:YXBwcm92ZV9wcl9vbl9zZWxmX3Jldmlldw==:YmFzZV91cmw=:dXJs:YXBwX25hbWU=:c2VjcmV0X3Byb3ZpZGVy:Z2l0X3Byb3ZpZGVy:c2tpcF9rZXlz:b3BlbmFpLmtleQ==:QU5BTFlUSUNTX0ZPTERFUg==:dXJp:YXBwX2lk:d2ViaG9va19zZWNyZXQ=:YmVhcmVyX3Rva2Vu:UEVSU09OQUxfQUNDRVNTX1RPS0VO:b3ZlcnJpZGVfZGVwbG95bWVudF90eXBl:cHJpdmF0ZV9rZXk=:bG9jYWxfY2FjaGVfcGF0aA==:ZW5hYmxlX2xvY2FsX2NhY2hl:amlyYV9iYXNlX3VybA==:YXBpX2Jhc2U=:YXBpX3R5cGU=:YXBpX3ZlcnNpb24=:c2tpcF9rZXlz'
+            forbidden_cli_args = []
+            for e in _encoded_args.split(':'):
+                forbidden_cli_args.append(b64decode(e).decode())
+
+            # lowercase all forbidden args
+            for i, _ in enumerate(forbidden_cli_args):
+                forbidden_cli_args[i] = forbidden_cli_args[i].lower()
+                if '.' not in forbidden_cli_args[i]:
+                    forbidden_cli_args[i] = '.' + forbidden_cli_args[i]
+
+            for arg in args:
+                if arg.startswith('--'):
+                    arg_word = arg.lower()
+                    arg_word = arg_word.replace('__', '.')  # replace double underscore with dot, e.g. --openai__key -> --openai.key
+                    for forbidden_arg_word in forbidden_cli_args:
+                        if forbidden_arg_word in arg_word:
+                            return False, forbidden_arg_word
+            return True, ""
+        except Exception as e:
+            return False, str(e)
+
+

pr_agent/algo/git_patch_processing.py

@@ -9,11 +9,12 @@ from pr_agent.log import get_logger
 
 
 def extend_patch(original_file_str, patch_str, patch_extra_lines_before=0,
-                 patch_extra_lines_after=0, filename: str = "") -> str:
+                 patch_extra_lines_after=0, filename: str = "", new_file_str="") -> str:
     if not patch_str or (patch_extra_lines_before == 0 and patch_extra_lines_after == 0) or not original_file_str:
         return patch_str
 
     original_file_str = decode_if_bytes(original_file_str)
+    new_file_str = decode_if_bytes(new_file_str)
     if not original_file_str:
         return patch_str
 
@@ -22,7 +23,7 @@ def extend_patch(original_file_str, patch_str, patch_extra_lines_before=0,
 
     try:
         extended_patch_str = process_patch_lines(patch_str, original_file_str,
-                                                 patch_extra_lines_before, patch_extra_lines_after)
+                                                 patch_extra_lines_before, patch_extra_lines_after, new_file_str)
     except Exception as e:
         get_logger().warning(f"Failed to extend patch: {e}", artifact={"traceback": traceback.format_exc()})
         return patch_str
@@ -52,12 +53,13 @@ def should_skip_patch(filename):
     return False
 
 
-def process_patch_lines(patch_str, original_file_str, patch_extra_lines_before, patch_extra_lines_after):
+def process_patch_lines(patch_str, original_file_str, patch_extra_lines_before, patch_extra_lines_after, new_file_str=""):
     allow_dynamic_context = get_settings().config.allow_dynamic_context
     patch_extra_lines_before_dynamic = get_settings().config.max_extra_lines_before_dynamic_context
 
-    original_lines = original_file_str.splitlines()
+    file_original_lines = original_file_str.splitlines()
-    len_original_lines = len(original_lines)
+    file_new_lines = new_file_str.splitlines() if new_file_str else []
+    len_original_lines = len(file_original_lines)
     patch_lines = patch_str.splitlines()
     extended_patch_lines = []
 
@@ -73,12 +75,12 @@ def process_patch_lines(patch_str, original_file_str, patch_extra_lines_before,
                 if match:
                     # finish processing previous hunk
                     if is_valid_hunk and (start1 != -1 and patch_extra_lines_after > 0):
-                        delta_lines = [f' {line}' for line in original_lines[start1 + size1 - 1:start1 + size1 - 1 + patch_extra_lines_after]]
+                        delta_lines_original = [f' {line}' for line in file_original_lines[start1 + size1 - 1:start1 + size1 - 1 + patch_extra_lines_after]]
-                        extended_patch_lines.extend(delta_lines)
+                        extended_patch_lines.extend(delta_lines_original)
 
                     section_header, size1, size2, start1, start2 = extract_hunk_headers(match)
 
-                    is_valid_hunk = check_if_hunk_lines_matches_to_file(i, original_lines, patch_lines, start1)
+                    is_valid_hunk = check_if_hunk_lines_matches_to_file(i, file_original_lines, patch_lines, start1)
 
                     if is_valid_hunk and (patch_extra_lines_before > 0 or patch_extra_lines_after > 0):
                         def _calc_context_limits(patch_lines_before):
@@ -93,20 +95,28 @@ def process_patch_lines(patch_str, original_file_str, patch_extra_lines_before,
                                 extended_size2 = max(extended_size2 - delta_cap, size2)
                             return extended_start1, extended_size1, extended_start2, extended_size2
 
-                        if allow_dynamic_context:
+                        if allow_dynamic_context and file_new_lines:
                             extended_start1, extended_size1, extended_start2, extended_size2 = \
                                 _calc_context_limits(patch_extra_lines_before_dynamic)
-                            lines_before = original_lines[extended_start1 - 1:start1 - 1]
+
+                            lines_before_original = file_original_lines[extended_start1 - 1:start1 - 1]
+                            lines_before_new = file_new_lines[extended_start2 - 1:start2 - 1]
                             found_header = False
-                            for i, line, in enumerate(lines_before):
+                            if lines_before_original == lines_before_new: # Making sure no changes from a previous hunk
-                                if section_header in line:
+                                for i, line, in enumerate(lines_before_original):
-                                    found_header = True
+                                    if section_header in line:
-                                    # Update start and size in one line each
+                                        found_header = True
-                                    extended_start1, extended_start2 = extended_start1 + i, extended_start2 + i
+                                        # Update start and size in one line each
-                                    extended_size1, extended_size2 = extended_size1 - i, extended_size2 - i
+                                        extended_start1, extended_start2 = extended_start1 + i, extended_start2 + i
-                                    # get_logger().debug(f"Found section header in line {i} before the hunk")
+                                        extended_size1, extended_size2 = extended_size1 - i, extended_size2 - i
-                                    section_header = ''
+                                        # get_logger().debug(f"Found section header in line {i} before the hunk")
-                                    break
+                                        section_header = ''
+                                        break
+                            else:
+                                get_logger().debug(f"Extra lines before hunk are different in original and new file - dynamic context",
+                                                   artifact={"lines_before_original": lines_before_original,
+                                                             "lines_before_new": lines_before_new})
+
                             if not found_header:
                                 # get_logger().debug(f"Section header not found in the extra lines before the hunk")
                                 extended_start1, extended_size1, extended_start2, extended_size2 = \
@@ -115,11 +125,23 @@ def process_patch_lines(patch_str, original_file_str, patch_extra_lines_before,
                             extended_start1, extended_size1, extended_start2, extended_size2 = \
                                 _calc_context_limits(patch_extra_lines_before)
 
-                        delta_lines = [f' {line}' for line in original_lines[extended_start1 - 1:start1 - 1]]
+                        # check if extra lines before hunk are different in original and new file
+                        delta_lines_original = [f' {line}' for line in file_original_lines[extended_start1 - 1:start1 - 1]]
+                        if file_new_lines:
+                            delta_lines_new = [f' {line}' for line in file_new_lines[extended_start2 - 1:start2 - 1]]
+                            if delta_lines_original != delta_lines_new:
+                                get_logger().debug(f"Extra lines before hunk are different in original and new file",
+                                                   artifact={"delta_lines_original": delta_lines_original,
+                                                             "delta_lines_new": delta_lines_new})
+                                extended_start1 = start1
+                                extended_size1 = size1
+                                extended_start2 = start2
+                                extended_size2 = size2
+                                delta_lines_original = []
 
                         #  logic to remove section header if its in the extra delta lines (in dynamic context, this is also done)
                         if section_header and not allow_dynamic_context:
-                            for line in delta_lines:
+                            for line in delta_lines_original:
                                 if section_header in line:
                                     section_header = ''  # remove section header if it is in the extra delta lines
                                     break
@@ -128,12 +150,12 @@ def process_patch_lines(patch_str, original_file_str, patch_extra_lines_before,
                         extended_size1 = size1
                         extended_start2 = start2
                         extended_size2 = size2
-                        delta_lines = []
+                        delta_lines_original = []
                     extended_patch_lines.append('')
                     extended_patch_lines.append(
                         f'@@ -{extended_start1},{extended_size1} '
                         f'+{extended_start2},{extended_size2} @@ {section_header}')
-                    extended_patch_lines.extend(delta_lines)  # one to zero based
+                    extended_patch_lines.extend(delta_lines_original)  # one to zero based
                     continue
             extended_patch_lines.append(line)
     except Exception as e:
@@ -142,15 +164,14 @@ def process_patch_lines(patch_str, original_file_str, patch_extra_lines_before,
 
     # finish processing last hunk
     if start1 != -1 and patch_extra_lines_after > 0 and is_valid_hunk:
-        delta_lines = original_lines[start1 + size1 - 1:start1 + size1 - 1 + patch_extra_lines_after]
+        delta_lines_original = file_original_lines[start1 + size1 - 1:start1 + size1 - 1 + patch_extra_lines_after]
         # add space at the beginning of each extra line
-        delta_lines = [f' {line}' for line in delta_lines]
+        delta_lines_original = [f' {line}' for line in delta_lines_original]
-        extended_patch_lines.extend(delta_lines)
+        extended_patch_lines.extend(delta_lines_original)
 
     extended_patch_str = '\n'.join(extended_patch_lines)
     return extended_patch_str
 
-
 def check_if_hunk_lines_matches_to_file(i, original_lines, patch_lines, start1):
     """
     Check if the hunk lines match the original file content. We saw cases where the hunk header line doesn't match the original file content, and then
@@ -160,8 +181,18 @@ def check_if_hunk_lines_matches_to_file(i, original_lines, patch_lines, start1):
     try:
         if i + 1 < len(patch_lines) and patch_lines[i + 1][0] == ' ': # an existing line in the file
             if patch_lines[i + 1].strip() != original_lines[start1 - 1].strip():
+                # check if different encoding is needed
+                original_line = original_lines[start1 - 1].strip()
+                for encoding in ['iso-8859-1', 'latin-1', 'ascii', 'utf-16']:
+                    try:
+                        if original_line.encode(encoding).decode().strip() == patch_lines[i + 1].strip():
+                            get_logger().info(f"Detected different encoding in hunk header line {start1}, needed encoding: {encoding}")
+                            return False # we still want to avoid extending the hunk. But we don't want to log an error
+                    except:
+                        pass
+
                 is_valid_hunk = False
-                get_logger().error(
+                get_logger().info(
                     f"Invalid hunk in PR, line {start1} in hunk header doesn't match the original file content")
     except:
         pass
@@ -288,7 +319,7 @@ __old hunk__
     """
     # if the file was deleted, return a message indicating that the file was deleted
     if hasattr(file, 'edit_type') and file.edit_type == EDIT_TYPE.DELETED:
-        return f"\n\n## file '{file.filename.strip()}' was deleted\n"
+        return f"\n\n## File '{file.filename.strip()}' was deleted\n"
 
     patch_with_lines_str = f"\n\n## File: '{file.filename.strip()}'\n"
     patch_lines = patch.splitlines()
@@ -363,7 +394,7 @@ __old hunk__
     return patch_with_lines_str.rstrip()
 
 
-def extract_hunk_lines_from_patch(patch: str, file_name, line_start, line_end, side) -> tuple[str, str]:
+def extract_hunk_lines_from_patch(patch: str, file_name, line_start, line_end, side, remove_trailing_chars: bool = True) -> tuple[str, str]:
     try:
         patch_with_lines_str = f"\n\n## File: '{file_name.strip()}'\n\n"
         selected_lines = ""
@@ -411,4 +442,8 @@ def extract_hunk_lines_from_patch(patch: str, file_name, line_start, line_end, s
         get_logger().error(f"Failed to extract hunk lines from patch: {e}", artifact={"traceback": traceback.format_exc()})
         return "", ""
 
-    return patch_with_lines_str.rstrip(), selected_lines.rstrip()
+    if remove_trailing_chars:
+        patch_with_lines_str = patch_with_lines_str.rstrip()
+        selected_lines = selected_lines.rstrip()
+
+    return patch_with_lines_str, selected_lines

pr_agent/algo/pr_processing.py

@@ -195,13 +195,15 @@ def pr_generate_extended_diff(pr_languages: list,
     for lang in pr_languages:
         for file in lang['files']:
             original_file_content_str = file.base_file
+            new_file_content_str = file.head_file
             patch = file.patch
             if not patch:
                 continue
 
             # extend each patch with extra lines of context
             extended_patch = extend_patch(original_file_content_str, patch,
-                                          patch_extra_lines_before, patch_extra_lines_after, file.filename)
+                                          patch_extra_lines_before, patch_extra_lines_after, file.filename,
+                                          new_file_str=new_file_content_str)
             if not extended_patch:
                 get_logger().warning(f"Failed to extend patch for file: {file.filename}")
                 continue
@@ -212,7 +214,7 @@ def pr_generate_extended_diff(pr_languages: list,
                 full_extended_patch = f"\n\n## File: '{file.filename.strip()}'\n{extended_patch.rstrip()}\n"
 
             # add AI-summary metadata to the patch
-            if file.ai_file_summary and  get_settings().get("config.enable_ai_metadata", False):
+            if file.ai_file_summary and get_settings().get("config.enable_ai_metadata", False):
                 full_extended_patch = add_ai_summary_top_patch(file, full_extended_patch)
 
             patch_tokens = token_handler.count_tokens(full_extended_patch)
@@ -384,7 +386,8 @@ def _get_all_deployments(all_models: List[str]) -> List[str]:
 def get_pr_multi_diffs(git_provider: GitProvider,
                        token_handler: TokenHandler,
                        model: str,
-                       max_calls: int = 5) -> List[str]:
+                       max_calls: int = 5,
+                       add_line_numbers: bool = True) -> List[str]:
     """
     Retrieves the diff files from a Git provider, sorts them by main language, and generates patches for each file.
     The patches are split into multiple groups based on the maximum number of tokens allowed for the given model.
@@ -425,7 +428,8 @@ def get_pr_multi_diffs(git_provider: GitProvider,
 
     # try first a single run with standard diff string, with patch extension, and no deletions
     patches_extended, total_tokens, patches_extended_tokens = pr_generate_extended_diff(
-        pr_languages, token_handler, add_line_numbers_to_hunks=True,
+        pr_languages, token_handler,
+        add_line_numbers_to_hunks=add_line_numbers,
         patch_extra_lines_before=PATCH_EXTRA_LINES_BEFORE,
         patch_extra_lines_after=PATCH_EXTRA_LINES_AFTER)
 
@@ -454,7 +458,12 @@ def get_pr_multi_diffs(git_provider: GitProvider,
         if patch is None:
             continue
 
-        patch = convert_to_hunks_with_lines_numbers(patch, file)
+        # Add line numbers and metadata to the patch
+        if add_line_numbers:
+            patch = convert_to_hunks_with_lines_numbers(patch, file)
+        else:
+            patch = f"\n\n## File: '{file.filename.strip()}'\n\n{patch.strip()}\n"
+
         # add AI-summary metadata to the patch
         if file.ai_file_summary and get_settings().get("config.enable_ai_metadata", False):
             patch = add_ai_summary_top_patch(file, patch)

pr_agent/algo/utils.py

@@ -50,6 +50,11 @@ class PRReviewHeader(str, Enum):
     REGULAR = "## PR Reviewer Guide"
     INCREMENTAL = "## Incremental PR Reviewer Guide"
 
+class ReasoningEffort(str, Enum):
+    HIGH = "high"
+    MEDIUM = "medium"
+    LOW = "low"
+
 
 class PRDescriptionHeader(str, Enum):
     CHANGES_WALKTHROUGH = "### **Changes walkthrough** 📝"
@@ -245,7 +250,7 @@ def convert_to_markdown_v2(output_data: dict,
                         if gfm_supported:
                             if reference_link is not None and len(reference_link) > 0:
                                 if relevant_lines_str:
-                                    issue_str = f"<details><summary><a href='{reference_link}'><strong>{issue_header}</strong></a>\n\n{issue_content}</summary>\n\n{relevant_lines_str}\n\n</details>"
+                                    issue_str = f"<details><summary><a href='{reference_link}'><strong>{issue_header}</strong></a>\n\n{issue_content}\n</summary>\n\n{relevant_lines_str}\n\n</details>"
                                 else:
                                     issue_str = f"<a href='{reference_link}'><strong>{issue_header}</strong></a><br>{issue_content}"
                             else:
@@ -316,47 +321,98 @@ def extract_relevant_lines_str(end_line, files, relevant_file, start_line, deden
 
 def ticket_markdown_logic(emoji, markdown_text, value, gfm_supported) -> str:
     ticket_compliance_str = ""
-    final_compliance_level = -1
+    compliance_emoji = ''
+    # Track compliance levels across all tickets
+    all_compliance_levels = []
+
     if isinstance(value, list):
-        for v in value:
+        for ticket_analysis in value:
-            ticket_url = v.get('ticket_url', '').strip()
+            try:
-            compliance_level = v.get('overall_compliance_level', '').strip()
+                ticket_url = ticket_analysis.get('ticket_url', '').strip()
-            # add emojis, if 'Fully compliant' ✅, 'Partially compliant' 🔶, or 'Not compliant' ❌
+                explanation = ''
-            if compliance_level.lower() == 'fully compliant':
+                ticket_compliance_level = ''  # Individual ticket compliance
-                # compliance_level = '✅ Fully compliant'
+                fully_compliant_str = ticket_analysis.get('fully_compliant_requirements', '').strip()
-                final_compliance_level = 2 if final_compliance_level == -1 else 1
+                not_compliant_str = ticket_analysis.get('not_compliant_requirements', '').strip()
-            elif compliance_level.lower() == 'partially compliant':
+                requires_further_human_verification = ticket_analysis.get('requires_further_human_verification',
-                # compliance_level = '🔶 Partially compliant'
+                                                                          '').strip()
-                final_compliance_level = 1
-            elif compliance_level.lower() == 'not compliant':
-                # compliance_level = '❌ Not compliant'
-                final_compliance_level = 0 if final_compliance_level < 1 else 1
 
-            # explanation = v.get('compliance_analysis', '').strip()
+                if not fully_compliant_str and not not_compliant_str:
-            explanation = ''
+                    get_logger().debug(f"Ticket compliance has no requirements",
-            fully_compliant_str = v.get('fully_compliant_requirements', '').strip()
+                                       artifact={'ticket_url': ticket_url})
-            not_compliant_str = v.get('not_compliant_requirements', '').strip()
+                    continue
-            if fully_compliant_str:
-                explanation += f"Fully compliant requirements:\n{fully_compliant_str}\n\n"
-            if not_compliant_str:
-                explanation += f"Not compliant requirements:\n{not_compliant_str}\n\n"
 
-            ticket_compliance_str += f"\n\n**[{ticket_url.split('/')[-1]}]({ticket_url}) - {compliance_level}**\n\n{explanation}\n\n"
+                # Calculate individual ticket compliance level
-        if final_compliance_level == 2:
+                if fully_compliant_str:
-            compliance_level = '✅'
+                    if not_compliant_str:
-        elif final_compliance_level == 1:
+                        ticket_compliance_level = 'Partially compliant'
-            compliance_level = '🔶'
+                    else:
-        else:
+                        if not requires_further_human_verification:
-            compliance_level = '❌'
+                            ticket_compliance_level = 'Fully compliant'
+                        else:
+                            ticket_compliance_level = 'PR Code Verified'
+                elif not_compliant_str:
+                    ticket_compliance_level = 'Not compliant'
 
+                # Store the compliance level for aggregation
+                if ticket_compliance_level:
+                    all_compliance_levels.append(ticket_compliance_level)
+
+                # build compliance string
+                if fully_compliant_str:
+                    explanation += f"Compliant requirements:\n\n{fully_compliant_str}\n\n"
+                if not_compliant_str:
+                    explanation += f"Non-compliant requirements:\n\n{not_compliant_str}\n\n"
+                if requires_further_human_verification:
+                    explanation += f"Requires further human verification:\n\n{requires_further_human_verification}\n\n"
+                ticket_compliance_str += f"\n\n**[{ticket_url.split('/')[-1]}]({ticket_url}) - {ticket_compliance_level}**\n\n{explanation}\n\n"
+
+                # for debugging
+                if requires_further_human_verification:
+                    get_logger().debug(f"Ticket compliance requires further human verification",
+                                       artifact={'ticket_url': ticket_url,
+                                                 'requires_further_human_verification': requires_further_human_verification,
+                                                 'compliance_level': ticket_compliance_level})
+
+            except Exception as e:
+                get_logger().exception(f"Failed to process ticket compliance: {e}")
+                continue
+
+        # Calculate overall compliance level and emoji
+        if all_compliance_levels:
+            if all(level == 'Fully compliant' for level in all_compliance_levels):
+                compliance_level = 'Fully compliant'
+                compliance_emoji = '✅'
+            elif all(level == 'PR Code Verified' for level in all_compliance_levels):
+                compliance_level = 'PR Code Verified'
+                compliance_emoji = '✅'
+            elif any(level == 'Not compliant' for level in all_compliance_levels):
+                # If there's a mix of compliant and non-compliant tickets
+                if any(level in ['Fully compliant', 'PR Code Verified'] for level in all_compliance_levels):
+                    compliance_level = 'Partially compliant'
+                    compliance_emoji = '🔶'
+                else:
+                    compliance_level = 'Not compliant'
+                    compliance_emoji = '❌'
+            elif any(level == 'Partially compliant' for level in all_compliance_levels):
+                compliance_level = 'Partially compliant'
+                compliance_emoji = '🔶'
+            else:
+                compliance_level = 'PR Code Verified'
+                compliance_emoji = '✅'
+
+            # Set extra statistics outside the ticket loop
+            get_settings().set('config.extra_statistics', {'compliance_level': compliance_level})
+
+        # editing table row for ticket compliance analysis
         if gfm_supported:
             markdown_text += f"<tr><td>\n\n"
-            markdown_text += f"**{emoji} Ticket compliance analysis {compliance_level}**\n\n"
+            markdown_text += f"**{emoji} Ticket compliance analysis {compliance_emoji}**\n\n"
             markdown_text += ticket_compliance_str
             markdown_text += f"</td></tr>\n"
         else:
-            markdown_text += f"### {emoji} Ticket compliance analysis {compliance_level}\n\n"
+            markdown_text += f"### {emoji} Ticket compliance analysis {compliance_emoji}\n\n"
-            markdown_text += ticket_compliance_str+"\n\n"
+            markdown_text += ticket_compliance_str + "\n\n"
+
     return markdown_text
 
 
@@ -684,7 +740,7 @@ def try_fix_yaml(response_text: str,
         get_logger().info(f"Successfully parsed AI prediction after adding |-\n")
         return data
     except:
-        get_logger().info(f"Failed to parse AI prediction after adding |-\n")
+        pass
 
     # second fallback - try to extract only range from first ```yaml to ````
     snippet_pattern = r'```(yaml)?[\s\S]*?```'
@@ -728,9 +784,19 @@ def try_fix_yaml(response_text: str,
         except:
             pass
 
+    # fifth fallback - try to remove leading '+' (sometimes added by AI for 'existing code' and 'improved code')
+    response_text_lines_copy = response_text_lines.copy()
+    for i in range(0, len(response_text_lines_copy)):
+        if response_text_lines_copy[i].startswith('+'):
+            response_text_lines_copy[i] = ' ' + response_text_lines_copy[i][1:]
+    try:
+        data = yaml.safe_load('\n'.join(response_text_lines_copy))
+        get_logger().info(f"Successfully parsed AI prediction after removing leading '+'")
+        return data
+    except:
+        pass
 
-    # fifth fallback - try to remove last lines
+    # sixth fallback - try to remove last lines
-    data = {}
     for i in range(1, len(response_text_lines)):
         response_text_lines_tmp = '\n'.join(response_text_lines[:-i])
         try:

pr_agent/config_loader.py

@@ -34,7 +34,7 @@ global_settings = Dynaconf(
 )
 
 
-def get_settings():
+def get_settings(use_context=False):
     """
     Retrieves the current settings.
 

pr_agent/git_providers/azuredevops_provider.py

@@ -183,6 +183,7 @@ class AzureDevopsProvider(GitProvider):
         return True
 
     def set_pr(self, pr_url: str):
+        self.pr_url = pr_url
         self.workspace_slug, self.repo_slug, self.pr_num = self._parse_pr_url(pr_url)
         self.pr = self._get_pr()
 
@@ -614,8 +615,11 @@ class AzureDevopsProvider(GitProvider):
             return pr_id
         except Exception as e:
             if get_settings().config.verbosity_level >= 2:
-                get_logger().error(f"Failed to get pr id, error: {e}")
+                get_logger().info(f"Failed to get pr id, error: {e}")
             return ""
 
     def publish_file_comments(self, file_comments: list) -> bool:
         pass
+
+    def get_line_link(self, relevant_file: str, relevant_line_start: int, relevant_line_end: int = None) -> str:
+        return self.pr_url+f"?_a=files&path={relevant_file}"

pr_agent/git_providers/bitbucket_server_provider.py

@@ -234,7 +234,7 @@ class BitbucketServerProvider(GitProvider):
                     new_file_content_str = self.get_file(file_path, head_sha)
                     new_file_content_str = decode_if_bytes(new_file_content_str)
 
-            patch = load_large_diff(file_path, new_file_content_str, original_file_content_str)
+            patch = load_large_diff(file_path, new_file_content_str, original_file_content_str, show_warning=False)
 
             diff_files.append(
                 FilePatchInfo(

pr_agent/git_providers/github_provider.py

@@ -5,11 +5,12 @@ import itertools
 import re
 import time
 import traceback
+import json
 from datetime import datetime
 from typing import Optional, Tuple
 from urllib.parse import urlparse
 
-from github import AppAuthentication, Auth, Github
+from github import AppAuthentication, Auth, Github, GithubException
 from retry import retry
 from starlette_context import context
 
@@ -475,8 +476,17 @@ class GithubProvider(GitProvider):
             return False
 
     def edit_comment(self, comment, body: str):
-        body = self.limit_output_characters(body, self.max_comment_chars)
+        try:
-        comment.edit(body=body)
+            body = self.limit_output_characters(body, self.max_comment_chars)
+            comment.edit(body=body)
+        except GithubException as e:
+            if hasattr(e, "status") and e.status == 403:
+                # Log as warning for permission-related issues (usually due to polling)
+                get_logger().warning(
+                    "Failed to edit github comment due to permission restrictions",
+                    artifact={"error": e})
+            else:
+                get_logger().exception(f"Failed to edit github comment", artifact={"error": e})
 
     def edit_comment_from_comment_id(self, comment_id: int, body: str):
         try:
@@ -878,6 +888,84 @@ class GithubProvider(GitProvider):
         except:
             return ""
 
+    def fetch_sub_issues(self, issue_url):
+        """
+        Fetch sub-issues linked to the given GitHub issue URL using GraphQL via PyGitHub.
+        """
+        sub_issues = set()
+
+        # Extract owner, repo, and issue number from URL
+        parts = issue_url.rstrip("/").split("/")
+        owner, repo, issue_number = parts[-4], parts[-3], parts[-1]
+
+        try:
+            # Gets Issue ID from Issue Number
+            query = f"""
+            query {{
+                repository(owner: "{owner}", name: "{repo}") {{
+                    issue(number: {issue_number}) {{
+                        id
+                    }}
+                }}
+            }}
+            """
+            response_tuple = self.github_client._Github__requester.requestJson("POST", "/graphql",
+                                                                               input={"query": query})
+
+            # Extract the JSON response from the tuple and parses it
+            if isinstance(response_tuple, tuple) and len(response_tuple) == 3:
+                response_json = json.loads(response_tuple[2])
+            else:
+                get_logger().error(f"Unexpected response format: {response_tuple}")
+                return sub_issues
+
+
+            issue_id = response_json.get("data", {}).get("repository", {}).get("issue", {}).get("id")
+
+            if not issue_id:
+                get_logger().warning(f"Issue ID not found for {issue_url}")
+                return sub_issues
+
+            # Fetch Sub-Issues
+            sub_issues_query = f"""
+            query {{
+                node(id: "{issue_id}") {{
+                    ... on Issue {{
+                        subIssues(first: 10) {{
+                            nodes {{
+                                url
+                            }}
+                        }}
+                    }}
+                }}
+            }}
+            """
+            sub_issues_response_tuple = self.github_client._Github__requester.requestJson("POST", "/graphql", input={
+                "query": sub_issues_query})
+
+            # Extract the JSON response from the tuple and parses it
+            if isinstance(sub_issues_response_tuple, tuple) and len(sub_issues_response_tuple) == 3:
+                sub_issues_response_json = json.loads(sub_issues_response_tuple[2])
+            else:
+                get_logger().error("Unexpected sub-issues response format", artifact={"response": sub_issues_response_tuple})
+                return sub_issues
+
+            if not sub_issues_response_json.get("data", {}).get("node", {}).get("subIssues"):
+                get_logger().error("Invalid sub-issues response structure")
+                return sub_issues
+    
+            nodes = sub_issues_response_json.get("data", {}).get("node", {}).get("subIssues", {}).get("nodes", [])
+            get_logger().info(f"Github Sub-issues fetched: {len(nodes)}", artifact={"nodes": nodes})
+
+            for sub_issue in nodes:
+                if "url" in sub_issue:
+                    sub_issues.add(sub_issue["url"])
+
+        except Exception as e:
+            get_logger().exception(f"Failed to fetch sub-issues. Error: {e}")
+
+        return sub_issues
+
     def auto_approve(self) -> bool:
         try:
             res = self.pr.create_review(event="APPROVE")

pr_agent/git_providers/gitlab_provider.py

@@ -181,7 +181,13 @@ class GitLabProvider(GitProvider):
             get_logger().exception(f"Could not update merge request {self.id_mr} description: {e}")
 
     def get_latest_commit_url(self):
-        return self.mr.commits().next().web_url
+        try:
+            return self.mr.commits().next().web_url
+        except StopIteration: # no commits
+            return ""
+        except Exception as e:
+            get_logger().exception(f"Could not get latest commit URL: {e}")
+            return ""
 
     def get_comment_url(self, comment):
         return f"{self.mr.web_url}#note_{comment.id}"

pr_agent/servers/azuredevops_server_webhook.py

@@ -33,20 +33,16 @@ azure_devops_server = get_settings().get("azure_devops_server")
 WEBHOOK_USERNAME = azure_devops_server.get("webhook_username")
 WEBHOOK_PASSWORD = azure_devops_server.get("webhook_password")
 
-def handle_request(
+async def handle_request_comment( url: str, body: str, log_context: dict
-    background_tasks: BackgroundTasks, url: str, body: str, log_context: dict
 ):
     log_context["action"] = body
     log_context["api_url"] = url
 
-    async def inner():
+    try:
-        try:
+        with get_logger().contextualize(**log_context):
-            with get_logger().contextualize(**log_context):
+            await PRAgent().handle_request(url, body)
-                await PRAgent().handle_request(url, body)
+    except Exception as e:
-        except Exception as e:
+        get_logger().exception(f"Failed to handle webhook", artifact={"url": url, "body": body}, error=str(e))
-            get_logger().error(f"Failed to handle webhook: {e}")
-
-    background_tasks.add_task(inner)
 
 
 # currently only basic auth is supported with azure webhooks
@@ -68,6 +64,9 @@ async def _perform_commands_azure(commands_conf: str, agent: PRAgent, api_url: s
         get_logger().info(f"Auto feedback is disabled, skipping auto commands for PR {api_url=}", **log_context)
         return
     commands = get_settings().get(f"azure_devops_server.{commands_conf}")
+    if not commands:
+        return
+
     get_settings().set("config.is_auto_command", True)
     for command in commands:
         try:
@@ -83,12 +82,7 @@ async def _perform_commands_azure(commands_conf: str, agent: PRAgent, api_url: s
             get_logger().error(f"Failed to perform command {command}: {e}")
 
 
-@router.post("/", dependencies=[Depends(authorize)])
+async def handle_request_azure(data, log_context):
-async def handle_webhook(background_tasks: BackgroundTasks, request: Request):
-    log_context = {"server_type": "azure_devops_server"}
-    data = await request.json()
-    get_logger().info(json.dumps(data))
-
     actions = []
     if data["eventType"] == "git.pullrequest.created":
         # API V1 (latest)
@@ -96,7 +90,10 @@ async def handle_webhook(background_tasks: BackgroundTasks, request: Request):
         log_context["event"] = data["eventType"]
         log_context["api_url"] = pr_url
         await _perform_commands_azure("pr_commands", PRAgent(), pr_url, log_context)
-        return
+        return JSONResponse(
+            status_code=status.HTTP_202_ACCEPTED,
+            content=jsonable_encoder({"message": "webhook triggered successfully"})
+        )
     elif data["eventType"] == "ms.vss-code.git-pullrequest-comment-event" and "content" in data["resource"]["comment"]:
         if available_commands_rgx.match(data["resource"]["comment"]["content"]):
             if(data["resourceVersion"] == "2.0"):
@@ -124,7 +121,7 @@ async def handle_webhook(background_tasks: BackgroundTasks, request: Request):
 
     for action in actions:
         try:
-            handle_request(background_tasks, pr_url, action, log_context)
+            await handle_request_comment(pr_url, action, log_context)
         except Exception as e:
             get_logger().error("Azure DevOps Trigger failed. Error:" + str(e))
             return JSONResponse(
@@ -135,6 +132,18 @@ async def handle_webhook(background_tasks: BackgroundTasks, request: Request):
         status_code=status.HTTP_202_ACCEPTED, content=jsonable_encoder({"message": "webhook triggered successfully"})
     )
 
+@router.post("/", dependencies=[Depends(authorize)])
+async def handle_webhook(background_tasks: BackgroundTasks, request: Request):
+    log_context = {"server_type": "azure_devops_server"}
+    data = await request.json()
+    # get_logger().info(json.dumps(data))
+
+    background_tasks.add_task(handle_request_azure, data, log_context)
+
+    return JSONResponse(
+        status_code=status.HTTP_202_ACCEPTED, content=jsonable_encoder({"message": "webhook triggered successfully"})
+    )
+
 @router.get("/")
 async def root():
     return {"status": "ok"}

pr_agent/servers/github_action_runner.py

@@ -81,7 +81,7 @@ async def run_action():
         get_logger().info(f"github action: failed to apply repo settings: {e}")
 
     # Handle pull request opened event
-    if GITHUB_EVENT_NAME == "pull_request":
+    if GITHUB_EVENT_NAME == "pull_request" or GITHUB_EVENT_NAME == "pull_request_target":
         action = event_payload.get("action")
 
         # Retrieve the list of actions from the configuration

pr_agent/servers/github_polling.py

@@ -130,12 +130,14 @@ async def is_valid_notification(notification, headers, handled_ids, session, use
                                                       artifact={"comment": comment_body})
                                     return True, handled_ids, comment, comment_body, pr_url, user_tag
 
-                            get_logger().error(f"Failed to fetch comments for PR: {pr_url}")
+                            get_logger().warning(f"Failed to fetch comments for PR: {pr_url}",
+                                                    artifact={"comments": comments})
                             return False, handled_ids
 
         return False, handled_ids
     except Exception as e:
-        get_logger().error(f"Error processing notification: {e}", artifact={"traceback": traceback.format_exc()})
+        get_logger().exception(f"Error processing polling notification",
+                               artifact={"notification": notification, "error": e})
         return False, handled_ids
 
 

pr_agent/servers/gitlab_webhook.py

@@ -25,29 +25,6 @@ router = APIRouter()
 secret_provider = get_secret_provider() if get_settings().get("CONFIG.SECRET_PROVIDER") else None
 
 
-async def get_mr_url_from_commit_sha(commit_sha, gitlab_token, project_id):
-    try:
-        import requests
-        headers = {
-            'Private-Token': f'{gitlab_token}'
-        }
-        # API endpoint to find MRs containing the commit
-        gitlab_url = get_settings().get("GITLAB.URL", 'https://gitlab.com')
-        response = requests.get(
-            f'{gitlab_url}/api/v4/projects/{project_id}/repository/commits/{commit_sha}/merge_requests',
-            headers=headers
-        )
-        merge_requests = response.json()
-        if merge_requests and response.status_code == 200:
-            pr_url = merge_requests[0]['web_url']
-            return pr_url
-        else:
-            get_logger().info(f"No merge requests found for commit: {commit_sha}")
-            return None
-    except Exception as e:
-        get_logger().error(f"Failed to get MR url from commit sha: {e}")
-        return None
-
 async def handle_request(api_url: str, body: str, log_context: dict, sender_id: str):
     log_context["action"] = body
     log_context["event"] = "pull_request" if body == "/review" else "comment"
@@ -94,6 +71,31 @@ def is_bot_user(data) -> bool:
         get_logger().error(f"Failed 'is_bot_user' logic: {e}")
     return False
 
+def is_draft(data) -> bool:
+    try:
+        if 'draft' in data.get('object_attributes', {}):
+            return data['object_attributes']['draft']
+
+        # for gitlab server version before 16
+        elif 'Draft:' in data.get('object_attributes', {}).get('title'):
+            return True
+    except Exception as e:
+        get_logger().error(f"Failed 'is_draft' logic: {e}")
+    return False
+
+def is_draft_ready(data) -> bool:
+    try:
+        if 'draft' in data.get('changes', {}):
+            if data['changes']['draft']['previous'] == 'true' and data['changes']['draft']['current'] == 'false':
+                return True
+            
+        # for gitlab server version before 16
+        elif 'title' in data.get('changes', {}):
+            if 'Draft:' in data['changes']['title']['previous'] and 'Draft:' not in data['changes']['title']['current']:
+                return True
+    except Exception as e:
+        get_logger().error(f"Failed 'is_draft_ready' logic: {e}")
+    return False
 
 def should_process_pr_logic(data) -> bool:
     try:
@@ -190,22 +192,48 @@ async def gitlab_webhook(background_tasks: BackgroundTasks, request: Request):
         # ignore bot users
         if is_bot_user(data):
             return JSONResponse(status_code=status.HTTP_200_OK, content=jsonable_encoder({"message": "success"}))
-        if data.get('event_type') != 'note': # not a comment
+
+        log_context["sender"] = sender
+        if data.get('object_kind') == 'merge_request':
             # ignore MRs based on title, labels, source and target branches
             if not should_process_pr_logic(data):
                 return JSONResponse(status_code=status.HTTP_200_OK, content=jsonable_encoder({"message": "success"}))
+            object_attributes = data.get('object_attributes', {})
+            if object_attributes.get('action') in ['open', 'reopen']:
+                url = object_attributes.get('url')
+                get_logger().info(f"New merge request: {url}")
+                if is_draft(data):
+                    get_logger().info(f"Skipping draft MR: {url}")
+                    return JSONResponse(status_code=status.HTTP_200_OK, content=jsonable_encoder({"message": "success"}))
 
-        log_context["sender"] = sender
+                await _perform_commands_gitlab("pr_commands", PRAgent(), url, log_context, data)
-        if data.get('object_kind') == 'merge_request' and data['object_attributes'].get('action') in ['open', 'reopen']:
+
-            title = data['object_attributes'].get('title')
+            # for push event triggered merge requests
-            url = data['object_attributes'].get('url')
+            elif object_attributes.get('action') == 'update' and object_attributes.get('oldrev'):
-            draft = data['object_attributes'].get('draft')
+                url = object_attributes.get('url')
-            get_logger().info(f"New merge request: {url}")
+                get_logger().info(f"New merge request: {url}")
-            if draft:
+                if is_draft(data):
-                get_logger().info(f"Skipping draft MR: {url}")
+                    get_logger().info(f"Skipping draft MR: {url}")
-                return JSONResponse(status_code=status.HTTP_200_OK, content=jsonable_encoder({"message": "success"}))
+                    return JSONResponse(status_code=status.HTTP_200_OK, content=jsonable_encoder({"message": "success"}))
+
+                commands_on_push = get_settings().get(f"gitlab.push_commands", {})
+                handle_push_trigger = get_settings().get(f"gitlab.handle_push_trigger", False)
+                if not commands_on_push or not handle_push_trigger:
+                    get_logger().info("Push event, but no push commands found or push trigger is disabled")
+                    return JSONResponse(status_code=status.HTTP_200_OK,
+                                        content=jsonable_encoder({"message": "success"}))
+
+                get_logger().debug(f'A push event has been received: {url}')
+                await _perform_commands_gitlab("push_commands", PRAgent(), url, log_context, data)
+                
+            # for draft to ready triggered merge requests
+            elif object_attributes.get('action') == 'update' and is_draft_ready(data):
+                url = object_attributes.get('url')
+                get_logger().info(f"Draft MR is ready: {url}")
+
+                # same as open MR
+                await _perform_commands_gitlab("pr_commands", PRAgent(), url, log_context, data)
 
-            await _perform_commands_gitlab("pr_commands", PRAgent(), url, log_context, data)
         elif data.get('object_kind') == 'note' and data.get('event_type') == 'note': # comment on MR
             if 'merge_request' in data:
                 mr = data['merge_request']
@@ -217,29 +245,6 @@ async def gitlab_webhook(background_tasks: BackgroundTasks, request: Request):
                     body = handle_ask_line(body, data)
 
                 await handle_request(url, body, log_context, sender_id)
-        elif data.get('object_kind') == 'push' and data.get('event_name') == 'push':
-            try:
-                project_id = data['project_id']
-                commit_sha = data['checkout_sha']
-                url = await get_mr_url_from_commit_sha(commit_sha, gitlab_token, project_id)
-                if not url:
-                    get_logger().info(f"No MR found for commit: {commit_sha}")
-                    return JSONResponse(status_code=status.HTTP_200_OK,
-                                        content=jsonable_encoder({"message": "success"}))
-
-                # we need first to apply_repo_settings
-                apply_repo_settings(url)
-                commands_on_push = get_settings().get(f"gitlab.push_commands", {})
-                handle_push_trigger = get_settings().get(f"gitlab.handle_push_trigger", False)
-                if not commands_on_push or not handle_push_trigger:
-                    get_logger().info("Push event, but no push commands found or push trigger is disabled")
-                    return JSONResponse(status_code=status.HTTP_200_OK,
-                                        content=jsonable_encoder({"message": "success"}))
-
-                get_logger().debug(f'A push event has been received: {url}')
-                await _perform_commands_gitlab("push_commands", PRAgent(), url, log_context, data)
-            except Exception as e:
-                get_logger().error(f"Failed to handle push event: {e}")
 
     background_tasks.add_task(inner, request_json)
     end_time = datetime.now()

pr_agent/settings/configuration.toml

@@ -1,8 +1,13 @@
+# Important: This file contains all available configuration options.
+# Do not copy this entire file to your repository configuration.
+# Your repository configuration should only include options you wish to override from the defaults.
+
 [config]
 # models
-model="gpt-4o-2024-11-20"
+model="o3-mini"
-fallback_models=["gpt-4o-2024-08-06"]
+fallback_models=["gpt-4o-2024-11-20"]
 #model_weak="gpt-4o-mini-2024-07-18" # optional, a weaker model to use for some easier tasks
+response_language="en-US" # Language locales code for PR responses in ISO 3166 and ISO 639 format (e.g., "en-US", "it-IT", "zh-CN", ...)
 # CLI
 git_provider="github"
 publish_output=true
@@ -17,6 +22,7 @@ use_global_settings_file=true
 disable_auto_feedback = false
 ai_timeout=120 # 2minutes
 skip_keys = []
+custom_reasoning_model = false # when true, disables system messages and temperature controls for models that don't support chat-style inputs
 # token limits
 max_description_tokens = 500
 max_commits_tokens = 500
@@ -47,6 +53,12 @@ ignore_pr_authors = [] # authors to ignore from PR agent when an PR is created
 #
 is_auto_command = false # will be auto-set to true if the command is triggered by an automation
 enable_ai_metadata = false # will enable adding ai metadata
+reasoning_effort = "medium" # "low", "medium", "high"
+# auto approval 💎
+enable_auto_approval=false # Set to true to enable auto-approval of PRs under certain conditions
+auto_approve_for_low_review_effort=-1 # -1 to disable, [1-5] to set the threshold for auto-approval
+auto_approve_for_no_suggestions=false # If true, the PR will be auto-approved if there are no suggestions
+
 
 [pr_reviewer] # /review #
 # enable/disable features
@@ -69,10 +81,6 @@ minimal_commits_for_incremental_review=0
 minimal_minutes_for_incremental_review=0
 enable_intro_text=true
 enable_help_text=false # Determines whether to include help text in the PR review. Enabled by default.
-# auto approval
-enable_auto_approval=false
-maximal_review_effort=5
-
 
 [pr_description] # /describe #
 publish_labels=false
@@ -122,6 +130,9 @@ max_history_len=4
 apply_suggestions_checkbox=true
 # suggestions scoring
 suggestions_score_threshold=0 # [0-10]| recommend not to set this value above 8, since above it may clip highly relevant suggestions
+new_score_mechanism=true
+new_score_mechanism_th_high=9
+new_score_mechanism_th_medium=7
 # params for '/improve --extended' mode
 auto_extended_mode=true
 num_code_suggestions_per_chunk=4
@@ -308,7 +319,24 @@ number_of_results = 5
 
 [lancedb]
 uri = "./lancedb"
+
 [best_practices]
 content = ""
+organization_name = ""
 max_lines_allowed = 800
 enable_global_best_practices = false
+
+[auto_best_practices]
+enable_auto_best_practices = true # public - general flag to disable all auto best practices usage
+utilize_auto_best_practices = true # public - disable usage of auto best practices in the 'improve' tool
+extra_instructions = "" # public - extra instructions to the auto best practices generation prompt
+content = ""
+max_patterns = 5 # max number of patterns to be detected
+
+
+[azure_devops_server]
+pr_commands = [
+    "/describe",
+    "/review",
+    "/improve",
+]

pr_agent/settings/pr_code_suggestions_prompts.toml

@@ -30,7 +30,7 @@ __old hunk__
 @@ ... @@ def func2():
 __new hunk__
  unchanged code line4
-+new code line5 removed
++new code line5 added
  unchanged code line6
 
 ## File: 'src/file2.py'
@@ -66,7 +66,7 @@ Specific guidelines for generating code suggestions:
 - Do not suggest to change packages version, add missing import statement, or declare undefined variable.
 {%- endif %}
 - When mentioning code elements (variables, names, or files) in your response, surround them with backticks (`). For example: "verify that `user_id` is..."
-- Note that you only see changed code segments (diff hunks in a PR), not the entire codebase. Avoid suggestions that might duplicate existing functionality or questioning code elements (like variables declerations or import statements) that may be defined elsewhere in the codebase.
+- Note that you only see changed code segments (diff hunks in a PR), not the entire codebase. Avoid suggestions that might duplicate existing functionality or questioning code elements (like variables declarations or import statements) that may be defined elsewhere in the codebase.
 
 {%- if extra_instructions %}
 
@@ -84,13 +84,13 @@ class CodeSuggestion(BaseModel):
     relevant_file: str = Field(description="Full path of the relevant file")
     language: str = Field(description="Programming language used by the relevant file")
     suggestion_content: str = Field(description="An actionable suggestion to enhance, improve or fix the new code introduced in the PR. Don't present here actual code snippets, just the suggestion. Be short and concise")
-    existing_code: str = Field(description="A short code snippet from a '__new hunk__' section that the suggestion aims to enhance or fix. Include only complete code lines. Use ellipsis (...) for brevity if needed. This snippet should represent the specific PR code targeted for improvement.")
+    existing_code: str = Field(description="A short code snippet, from a '__new hunk__' section after the PR changes, that the suggestion aims to enhance or fix. Include only complete code lines. Use ellipsis (...) for brevity if needed. This snippet should represent the specific PR code targeted for improvement.")
     improved_code: str = Field(description="A refined code snippet that replaces the 'existing_code' snippet after implementing the suggestion.")
     one_sentence_summary: str = Field(description="A concise, single-sentence overview (up to 6 words) of the suggested improvement. Focus on the 'what'. Be general, and avoid method or variable names.")
 {%- if not focus_only_on_problems %}
     label: str = Field(description="A single, descriptive label that best characterizes the suggestion type. Possible labels include 'security', 'possible bug', 'possible issue', 'performance', 'enhancement', 'best practice', 'maintainability', 'typo'. Other relevant labels are also acceptable.")
 {%- else %}
-    label: str = Field(description="A single, descriptive label that best characterizes the suggestion type. Possible labels include 'security', 'critical bug', 'general'. The 'general' section should be used for suggestions that address a major issue, but are necessarily on a critical level.")
+    label: str = Field(description="A single, descriptive label that best characterizes the suggestion type. Possible labels include 'security', 'critical bug', 'general'. The 'general' section should be used for suggestions that address a major issue, but are not necessarily on a critical level.")
 {%- endif %}
 
 

pr_agent/settings/pr_help_prompts.toml

@@ -13,7 +13,7 @@ The output must be a YAML object equivalent to type $DocHelper, according to the
 =====
 class relevant_section(BaseModel):
     file_name: str = Field(description="The name of the relevant file")
-    relevant_section_header_string: str = Field(description="From the relevant file, exact text of the relevant section heading. If no markdown heading is relevant, return empty string")
+    relevant_section_header_string: str = Field(description="The exact text of the relevant markdown section heading from the relevant file  (starting with '#', '##', etc.). Return empty string if the entire file is the relevant section, or if the relevant section has no heading")
 
 class DocHelper(BaseModel):
     user_question: str = Field(description="The user's question")

pr_agent/settings/pr_reviewer_prompts.toml

@@ -75,10 +75,10 @@ class KeyIssuesComponentLink(BaseModel):
 
 class TicketCompliance(BaseModel):
     ticket_url: str = Field(description="Ticket URL or ID")
-    ticket_requirements: str = Field(description="Repeat, in your own words, all ticket requirements, in bullet points")
+    ticket_requirements: str = Field(description="Repeat, in your own words (in bullet points), all the requirements, sub-tasks, DoD, and acceptance criteria raised by the ticket")
-    fully_compliant_requirements: str = Field(description="A list, in bullet points, of which requirements are met by the PR code. Don't explain how the requirements are met, just list them shortly. Can be empty")
+    fully_compliant_requirements: str = Field(description="Bullet-point list of items from the  'ticket_requirements' section above that are fulfilled by the PR code. Don't explain how the requirements are met, just list them shortly. Can be empty")
-    not_compliant_requirements: str = Field(description="A list, in bullet points, of which requirements are not met by the PR code. Don't explain how the requirements are not met, just list them shortly. Can be empty")
+    not_compliant_requirements: str = Field(description="Bullet-point list of items from the 'ticket_requirements' section above that are not fulfilled by the PR code. Don't explain how the requirements are not met, just list them shortly. Can be empty")
-    overall_compliance_level: str = Field(description="Overall give this PR one of these three values in relation to the ticket: 'Fully compliant', 'Partially compliant', or 'Not compliant'")
+    requires_further_human_verification: str = Field(description="Bullet-point list of items from the 'ticket_requirements' section above that cannot be assessed through code review alone, are unclear, or need further human review (e.g., browser testing, UI checks). Leave empty if all 'ticket_requirements' were marked as fully compliant or not compliant")
 {%- endif %}
 
 class Review(BaseModel):
@@ -187,6 +187,10 @@ Ticket Description:
 
 
 --PR Info--
+{%- if date %}
+
+Today's Date: {{date}}
+{%- endif %}
 
 Title: '{{title}}'
 

pr_agent/tools/pr_code_suggestions.py

@@ -720,7 +720,7 @@ class PRCodeSuggestions:
             header = f"Suggestion"
             delta = 66
             header += "  " * delta
-            pr_body += f"""<thead><tr><td>Category</td><td align=left>{header}</td><td align=center>Score</td></tr>"""
+            pr_body += f"""<thead><tr><td><strong>Category</strong></td><td align=left><strong>{header}</strong></td><td align=center><strong>Impact</strong></td></tr>"""
             pr_body += """<tbody>"""
             suggestions_labels = dict()
             # add all suggestions related to each label
@@ -740,7 +740,7 @@ class PRCodeSuggestions:
             counter_suggestions = 0
             for label, suggestions in suggestions_labels.items():
                 num_suggestions = len(suggestions)
-                pr_body += f"""<tr><td rowspan={num_suggestions}><strong>{label.capitalize()}</strong></td>\n"""
+                pr_body += f"""<tr><td rowspan={num_suggestions}>{label.capitalize()}</td>\n"""
                 for i, suggestion in enumerate(suggestions):
 
                     relevant_file = suggestion['relevant_file'].strip()
@@ -794,14 +794,19 @@ class PRCodeSuggestions:
 
 {example_code.rstrip()}
 """
-                    pr_body += f"<details><summary>Suggestion importance[1-10]: {suggestion['score']}</summary>\n\n"
+                    if suggestion.get('score_why'):
-                    pr_body += f"Why: {suggestion['score_why']}\n\n"
+                        pr_body += f"<details><summary>Suggestion importance[1-10]: {suggestion['score']}</summary>\n\n"
-                    pr_body += f"</details>"
+                        pr_body += f"__\n\nWhy: {suggestion['score_why']}\n\n"
+                        pr_body += f"</details>"
 
                     pr_body += f"</details>"
 
                     # # add another column for 'score'
-                    pr_body += f"</td><td align=center>{suggestion['score']}\n\n"
+                    score_int = int(suggestion.get('score', 0))
+                    score_str = f"{score_int}"
+                    if get_settings().pr_code_suggestions.new_score_mechanism:
+                        score_str = self.get_score_str(score_int)
+                    pr_body += f"</td><td align=center>{score_str}\n\n"
 
                     pr_body += f"</td></tr>"
                     counter_suggestions += 1
@@ -814,6 +819,16 @@ class PRCodeSuggestions:
             get_logger().info(f"Failed to publish summarized code suggestions, error: {e}")
             return ""
 
+    def get_score_str(self, score: int) -> str:
+        th_high = get_settings().pr_code_suggestions.get('new_score_mechanism_th_high', 9)
+        th_medium = get_settings().pr_code_suggestions.get('new_score_mechanism_th_medium', 7)
+        if score >= th_high:
+            return "High"
+        elif score >= th_medium:
+            return "Medium"
+        else:  # score < 7
+            return "Low"
+
     async def self_reflect_on_suggestions(self,
                                           suggestion_list: List,
                                           patches_diff: str,

pr_agent/tools/pr_description.py

@@ -134,8 +134,18 @@ class PRDescription:
                 pr_body += "<hr>\n\n<details> <summary><strong>✨ Describe tool usage guide:</strong></summary><hr> \n\n"
                 pr_body += HelpMessage.get_describe_usage_guide()
                 pr_body += "\n</details>\n"
-            elif get_settings().pr_description.enable_help_comment:
+            elif get_settings().pr_description.enable_help_comment and self.git_provider.is_supported("gfm_markdown"):
-                pr_body += '\n\n___\n\n> 💡 **PR-Agent usage**: Comment `/help "your question"` on any pull request to receive relevant information'
+                if isinstance(self.git_provider, GithubProvider):
+                    pr_body += ('\n\n___\n\n> <details> <summary>  Need help?</summary><li>Type <code>/help how to ...</code> '
+                                'in the comments thread for any questions about PR-Agent usage.</li><li>Check out the '
+                                '<a href="https://qodo-merge-docs.qodo.ai/usage-guide/">documentation</a> '
+                                'for more information.</li></details>')
+                else: # gitlab
+                    pr_body += ("\n\n___\n\n<details><summary>Need help?</summary>- Type <code>/help how to ...</code> in the comments "
+                                "thread for any questions about PR-Agent usage.<br>- Check out the "
+                                "<a href='https://qodo-merge-docs.qodo.ai/usage-guide/'>documentation</a> for more information.</details>")
+            # elif get_settings().pr_description.enable_help_comment:
+            #     pr_body += '\n\n___\n\n> 💡 **PR-Agent usage**: Comment `/help "your question"` on any pull request to receive relevant information'
 
             # Output the relevant configurations if enabled
             if get_settings().get('config', {}).get('output_relevant_configurations', False):
@@ -318,7 +328,10 @@ class PRDescription:
                 original_prediction_dict = {"pr_files": original_prediction_loaded}
             else:
                 original_prediction_dict = original_prediction_loaded
-            filenames_predicted = [file['filename'].strip() for file in original_prediction_dict.get('pr_files', [])]
+            if original_prediction_dict:
+                filenames_predicted = [file.get('filename', '').strip() for file in original_prediction_dict.get('pr_files', [])]
+            else:
+                filenames_predicted = []
 
             # extend the prediction with additional files not included in the original prediction
             pr_files = self.git_provider.get_diff_files()
@@ -358,8 +371,12 @@ class PRDescription:
             if counter_extra_files > 0:
                 get_logger().info(f"Adding {counter_extra_files} unprocessed extra files to table prediction")
                 prediction_extra_dict = load_yaml(prediction_extra, keys_fix_yaml=self.keys_fix)
-                if isinstance(original_prediction_dict, dict) and isinstance(prediction_extra_dict, dict):
+                if original_prediction_dict and isinstance(original_prediction_dict, dict) and \
-                    original_prediction_dict["pr_files"].extend(prediction_extra_dict["pr_files"])
+                        isinstance(prediction_extra_dict, dict) and "pr_files" in prediction_extra_dict:
+                    if "pr_files" in original_prediction_dict:
+                        original_prediction_dict["pr_files"].extend(prediction_extra_dict["pr_files"])
+                    else:
+                        original_prediction_dict["pr_files"] = prediction_extra_dict["pr_files"]
                     new_yaml = yaml.dump(original_prediction_dict)
                     if load_yaml(new_yaml, keys_fix_yaml=self.keys_fix):
                         prediction = new_yaml
@@ -368,7 +385,7 @@ class PRDescription:
 
             return prediction
         except Exception as e:
-            get_logger().error(f"Error extending uncovered files {self.pr_id}: {e}")
+            get_logger().exception(f"Error extending uncovered files {self.pr_id}", artifact={"error": e})
             return original_prediction
 
 
@@ -673,8 +690,9 @@ class PRDescription:
                         filename = filename.strip()
                         link = self.git_provider.get_line_link(filename, relevant_line_start=-1)
                     if (not link or not diff_plus_minus) and ('additional files' not in filename.lower()):
-                        get_logger().warning(f"Error getting line link for '{filename}'")
+                        # get_logger().warning(f"Error getting line link for '{filename}'")
-                        continue
+                        link = ""
+                        # continue
 
                     # Add file data to the PR body
                     file_change_description_br = insert_br_after_x_chars(file_change_description, x=(delta - 5))

pr_agent/tools/pr_help_message.py

@@ -1,4 +1,5 @@
 import copy
+import re
 from functools import partial
 from pathlib import Path
 
@@ -9,10 +10,9 @@ from pr_agent.algo.ai_handlers.base_ai_handler import BaseAiHandler
 from pr_agent.algo.ai_handlers.litellm_ai_handler import LiteLLMAIHandler
 from pr_agent.algo.pr_processing import retry_with_fallback_models
 from pr_agent.algo.token_handler import TokenHandler
-from pr_agent.algo.utils import ModelType, clip_tokens, load_yaml
+from pr_agent.algo.utils import ModelType, clip_tokens, load_yaml, get_max_tokens
 from pr_agent.config_loader import get_settings
-from pr_agent.git_providers import (BitbucketServerProvider, GithubProvider,
+from pr_agent.git_providers import BitbucketServerProvider, GithubProvider, get_git_provider_with_context
-                                    get_git_provider_with_context)
 from pr_agent.log import get_logger
 
 
@@ -30,10 +30,11 @@ def extract_header(snippet):
     return res
 
 class PRHelpMessage:
-    def __init__(self, pr_url: str, args=None, ai_handler: partial[BaseAiHandler,] = LiteLLMAIHandler):
+    def __init__(self, pr_url: str, args=None, ai_handler: partial[BaseAiHandler,] = LiteLLMAIHandler, return_as_string=False):
         self.git_provider = get_git_provider_with_context(pr_url)
         self.ai_handler = ai_handler()
         self.question_str = self.parse_args(args)
+        self.return_as_string = return_as_string
         self.num_retrieved_snippets = get_settings().get('pr_help.num_retrieved_snippets', 5)
         if self.question_str:
             self.vars = {
@@ -65,6 +66,34 @@ class PRHelpMessage:
             question_str = ""
         return question_str
 
+    def format_markdown_header(self, header: str) -> str:
+        try:
+            # First, strip common characters from both ends
+            cleaned = header.strip('# 💎\n')
+
+            # Define all characters to be removed/replaced in a single pass
+            replacements = {
+                "'": '',
+                "`": '',
+                '(': '',
+                ')': '',
+                ',': '',
+                '.': '',
+                '?': '',
+                '!': '',
+                ' ': '-'
+            }
+
+            # Compile regex pattern for characters to remove
+            pattern = re.compile('|'.join(map(re.escape, replacements.keys())))
+
+            # Perform replacements in a single pass and convert to lowercase
+            return pattern.sub(lambda m: replacements[m.group()], cleaned).lower()
+        except Exception:
+            get_logger().exception(f"Error while formatting markdown header", artifacts={'header': header})
+            return ""
+
+
     async def run(self):
         try:
             if self.question_str:
@@ -106,7 +135,10 @@ class PRHelpMessage:
                 get_logger().debug(f"Token count of full documentation website: {token_count}")
 
                 model = get_settings().config.model
-                max_tokens_full = MAX_TOKENS[model] # note - here we take the actual max tokens, without any reductions. we do aim to get the full documentation website in the prompt
+                if model in MAX_TOKENS:
+                    max_tokens_full = MAX_TOKENS[model] # note - here we take the actual max tokens, without any reductions. we do aim to get the full documentation website in the prompt
+                else:
+                    max_tokens_full = get_max_tokens(model)
                 delta_output = 2000
                 if token_count > max_tokens_full - delta_output:
                     get_logger().info(f"Token count {token_count} exceeds the limit {max_tokens_full - delta_output}. Skipping the PR Help message.")
@@ -114,8 +146,16 @@ class PRHelpMessage:
                 self.vars['snippets'] = docs_prompt.strip()
 
                 # run the AI model
-                response = await retry_with_fallback_models(self._prepare_prediction, model_type=ModelType.WEAK)
+                response = await retry_with_fallback_models(self._prepare_prediction, model_type=ModelType.REGULAR)
                 response_yaml = load_yaml(response)
+                if isinstance(response_yaml, str):
+                    get_logger().warning(f"failing to parse response: {response_yaml}, publishing the response as is")
+                    if get_settings().config.publish_output:
+                        answer_str = f"### Question: \n{self.question_str}\n\n"
+                        answer_str += f"### Answer:\n\n"
+                        answer_str += response_yaml
+                        self.git_provider.publish_comment(answer_str)
+                    return ""
                 response_str = response_yaml.get('response')
                 relevant_sections = response_yaml.get('relevant_sections')
 
@@ -138,7 +178,7 @@ class PRHelpMessage:
                     for section in relevant_sections:
                         file = section.get('file_name').strip().removesuffix('.md')
                         if str(section['relevant_section_header_string']).strip():
-                            markdown_header = section['relevant_section_header_string'].strip().strip('#').strip().lower().replace(' ', '-').replace("'", '').replace('(', '').replace(')', '').replace(',', '').replace('.', '').replace('?', '').replace('!', '')
+                            markdown_header = self.format_markdown_header(section['relevant_section_header_string'])
                             answer_str += f"> - {base_path}{file}#{markdown_header}\n"
                         else:
                             answer_str += f"> - {base_path}{file}\n"
@@ -174,10 +214,11 @@ class PRHelpMessage:
                 tool_names.append(f"[IMPROVE COMPONENT]({base_path}/improve_component/) 💎")
                 tool_names.append(f"[ANALYZE]({base_path}/analyze/) 💎")
                 tool_names.append(f"[ASK]({base_path}/ask/)")
+                tool_names.append(f"[SIMILAR ISSUE]({base_path}/similar_issues/)")
                 tool_names.append(f"[GENERATE CUSTOM LABELS]({base_path}/custom_labels/) 💎")
                 tool_names.append(f"[CI FEEDBACK]({base_path}/ci_feedback/) 💎")
                 tool_names.append(f"[CUSTOM PROMPT]({base_path}/custom_prompt/) 💎")
-                tool_names.append(f"[SIMILAR ISSUE]({base_path}/similar_issues/)")
+                tool_names.append(f"[IMPLEMENT]({base_path}/implement/) 💎")
 
                 descriptions = []
                 descriptions.append("Generates PR description - title, type, summary, code walkthrough and labels")
@@ -189,10 +230,11 @@ class PRHelpMessage:
                 descriptions.append("Code suggestions for a specific component that changed in the PR")
                 descriptions.append("Identifies code components that changed in the PR, and enables to interactively generate tests, docs, and code suggestions for each component")
                 descriptions.append("Answering free-text questions about the PR")
+                descriptions.append("Automatically retrieves and presents similar issues")
                 descriptions.append("Generates custom labels for the PR, based on specific guidelines defined by the user")
                 descriptions.append("Generates feedback and analysis for a failed CI job")
                 descriptions.append("Generates custom suggestions for improving the PR code, derived only from a specific guidelines prompt defined by the user")
-                descriptions.append("Automatically retrieves and presents similar issues")
+                descriptions.append("Generates implementation code from review suggestions")
 
                 commands  =[]
                 commands.append("`/describe`")
@@ -204,10 +246,11 @@ class PRHelpMessage:
                 commands.append("`/improve_component`")
                 commands.append("`/analyze`")
                 commands.append("`/ask`")
+                commands.append("`/similar_issue`")
                 commands.append("`/generate_labels`")
                 commands.append("`/checks`")
                 commands.append("`/custom_prompt`")
-                commands.append("`/similar_issue`")
+                commands.append("`/implement`")
 
                 checkbox_list = []
                 checkbox_list.append(" - [ ] Run <!-- /describe -->")
@@ -226,6 +269,7 @@ class PRHelpMessage:
                 checkbox_list.append("[*]")
                 checkbox_list.append("[*]")
                 checkbox_list.append("[*]")
+                checkbox_list.append("[*]")
 
                 if isinstance(self.git_provider, GithubProvider) and not get_settings().config.get('disable_checkboxes', False):
                     pr_comment += f"<table><tr align='left'><th align='left'>Tool</th><th align='left'>Description</th><th align='left'>Trigger Interactively :gem:</th></tr>"

pr_agent/tools/pr_reviewer.py

@@ -95,6 +95,7 @@ class PRReviewer:
             "is_ai_metadata":  get_settings().get("config.enable_ai_metadata", False),
             "related_tickets": get_settings().get('related_tickets', []),
             'duplicate_prompt_examples': get_settings().config.get('duplicate_prompt_examples', False),
+            "date": datetime.datetime.now().strftime('%Y-%m-%d'),
         }
 
         self.token_handler = TokenHandler(
@@ -122,10 +123,10 @@ class PRReviewer:
             if self.incremental.is_incremental and not self._can_run_incremental_review():
                 return None
 
-            if isinstance(self.args, list) and self.args and self.args[0] == 'auto_approve':
+            # if isinstance(self.args, list) and self.args and self.args[0] == 'auto_approve':
-                get_logger().info(f'Auto approve flow PR: {self.pr_url} ...')
+            #     get_logger().info(f'Auto approve flow PR: {self.pr_url} ...')
-                self.auto_approve_logic()
+            #     self.auto_approve_logic()
-                return None
+            #     return None
 
             get_logger().info(f'Reviewing PR: {self.pr_url} ...')
             relevant_configs = {'pr_reviewer': dict(get_settings().pr_reviewer),
@@ -371,7 +372,7 @@ class PRReviewer:
                     else:
                         get_logger().warning(f"Unexpected type for estimated_effort: {type(estimated_effort)}")
                     if 1 <= estimated_effort_number <= 5:  # 1, because ...
-                        review_labels.append(f'Review effort [1-5]: {estimated_effort_number}')
+                        review_labels.append(f'Review effort {estimated_effort_number}/5')
                 if get_settings().pr_reviewer.enable_review_labels_security and get_settings().pr_reviewer.require_security_review:
                     security_concerns = data['review']['security_concerns']  # yes, because ...
                     security_concerns_bool = 'yes' in security_concerns.lower() or 'true' in security_concerns.lower()
@@ -384,7 +385,7 @@ class PRReviewer:
                 get_logger().debug(f"Current labels:\n{current_labels}")
                 if current_labels:
                     current_labels_filtered = [label for label in current_labels if
-                                               not label.lower().startswith('review effort [1-5]:') and not label.lower().startswith(
+                                               not label.lower().startswith('review effort') and not label.lower().startswith(
                                                    'possible security concern')]
                 else:
                     current_labels_filtered = []
@@ -401,21 +402,7 @@ class PRReviewer:
         """
         Auto-approve a pull request if it meets the conditions for auto-approval.
         """
-        if get_settings().pr_reviewer.enable_auto_approval:
+        if get_settings().config.enable_auto_approval:
-            maximal_review_effort = get_settings().pr_reviewer.maximal_review_effort
-            if maximal_review_effort < 5:
-                current_labels = self.git_provider.get_pr_labels()
-                for label in current_labels:
-                    if label.lower().startswith('review effort [1-5]:'):
-                        effort = int(label.split(':')[1].strip())
-                        if effort > maximal_review_effort:
-                            get_logger().info(
-                                f"Auto-approve error: PR review effort ({effort}) is higher than the maximal review effort "
-                                f"({maximal_review_effort}) allowed")
-                            self.git_provider.publish_comment(
-                                f"Auto-approve error: PR review effort ({effort}) is higher than the maximal review effort "
-                                f"({maximal_review_effort}) allowed")
-                            return
             is_auto_approved = self.git_provider.auto_approve()
             if is_auto_approved:
                 get_logger().info("Auto-approved PR")

pr_agent/tools/ticket_pr_compliance_check.py

@@ -51,6 +51,11 @@ def extract_ticket_links_from_pr_description(pr_description, repo_path, base_url
                 issue_number = match[5][1:]  # remove #
                 if issue_number.isdigit() and len(issue_number) < 5 and repo_path:
                     github_tickets.add(f'{base_url_html.strip("/")}/{repo_path}/issues/{issue_number}')
+
+        if len(github_tickets) > 3:
+            get_logger().info(f"Too many tickets found in PR description: {len(github_tickets)}")
+            # Limit the number of tickets to 3
+            github_tickets = set(list(github_tickets)[:3])
     except Exception as e:
         get_logger().error(f"Error extracting tickets error= {e}",
                            artifact={"traceback": traceback.format_exc()})
@@ -65,41 +70,65 @@ async def extract_tickets(git_provider):
             user_description = git_provider.get_user_description()
             tickets = extract_ticket_links_from_pr_description(user_description, git_provider.repo, git_provider.base_url_html)
             tickets_content = []
+
             if tickets:
+
                 for ticket in tickets:
-                    # extract ticket number and repo name
                     repo_name, original_issue_number = git_provider._parse_issue_url(ticket)
 
-                    # get the ticket object
                     try:
                         issue_main = git_provider.repo_obj.get_issue(original_issue_number)
                     except Exception as e:
-                        get_logger().error(f"Error getting issue_main error= {e}",
+                        get_logger().error(f"Error getting main issue: {e}",
                                            artifact={"traceback": traceback.format_exc()})
                         continue
 
-                    # clip issue_main.body max length
+                    issue_body_str = issue_main.body or ""
-                    issue_body_str = issue_main.body
-                    if not issue_body_str:
-                        issue_body_str = ""
                     if len(issue_body_str) > MAX_TICKET_CHARACTERS:
                         issue_body_str = issue_body_str[:MAX_TICKET_CHARACTERS] + "..."
 
-                    # extract labels
+                    # Extract sub-issues
+                    sub_issues_content = []
+                    try:
+                        sub_issues = git_provider.fetch_sub_issues(ticket)
+                        for sub_issue_url in sub_issues:
+                            try:
+                                sub_repo, sub_issue_number = git_provider._parse_issue_url(sub_issue_url)
+                                sub_issue = git_provider.repo_obj.get_issue(sub_issue_number)
+
+                                sub_body = sub_issue.body or ""
+                                if len(sub_body) > MAX_TICKET_CHARACTERS:
+                                    sub_body = sub_body[:MAX_TICKET_CHARACTERS] + "..."
+
+                                sub_issues_content.append({
+                                    'ticket_url': sub_issue_url,
+                                    'title': sub_issue.title,
+                                    'body': sub_body
+                                })
+                            except Exception as e:
+                                get_logger().warning(f"Failed to fetch sub-issue content for {sub_issue_url}: {e}")
+
+                    except Exception as e:
+                        get_logger().warning(f"Failed to fetch sub-issues for {ticket}: {e}")
+
+                    # Extract labels
                     labels = []
                     try:
                         for label in issue_main.labels:
-                            if isinstance(label, str):
+                            labels.append(label.name if hasattr(label, 'name') else label)
-                                labels.append(label)
-                            else:
-                                labels.append(label.name)
                     except Exception as e:
                         get_logger().error(f"Error extracting labels error= {e}",
                                            artifact={"traceback": traceback.format_exc()})
-                    tickets_content.append(
+
-                        {'ticket_id': issue_main.number,
+                    tickets_content.append({
-                         'ticket_url': ticket, 'title': issue_main.title, 'body': issue_body_str,
+                        'ticket_id': issue_main.number,
-                         'labels': ", ".join(labels)})
+                        'ticket_url': ticket,
+                        'title': issue_main.title,
+                        'body': issue_body_str,
+                        'labels': ", ".join(labels),
+                        'sub_issues': sub_issues_content  # Store sub-issues content
+                    })
+
                 return tickets_content
 
     except Exception as e:
@@ -110,14 +139,27 @@ async def extract_tickets(git_provider):
 async def extract_and_cache_pr_tickets(git_provider, vars):
     if not get_settings().get('pr_reviewer.require_ticket_analysis_review', False):
         return
+
     related_tickets = get_settings().get('related_tickets', [])
+
     if not related_tickets:
         tickets_content = await extract_tickets(git_provider)
+
         if tickets_content:
-            get_logger().info("Extracted tickets from PR description", artifact={"tickets": tickets_content})
+            # Store sub-issues along with main issues
-            vars['related_tickets'] = tickets_content
+            for ticket in tickets_content:
-            get_settings().set('related_tickets', tickets_content)
+                if "sub_issues" in ticket and ticket["sub_issues"]:
-    else:  # if tickets are already cached
+                    for sub_issue in ticket["sub_issues"]:
+                        related_tickets.append(sub_issue)  # Add sub-issues content
+
+                related_tickets.append(ticket)
+
+            get_logger().info("Extracted tickets and sub-issues from PR description",
+                              artifact={"tickets": related_tickets})
+
+            vars['related_tickets'] = related_tickets
+            get_settings().set('related_tickets', related_tickets)
+    else:
         get_logger().info("Using cached tickets", artifact={"tickets": related_tickets})
         vars['related_tickets'] = related_tickets
 

pyproject.toml

@@ -31,7 +31,7 @@ dynamic = ["dependencies"]
 dependencies = { file = ["requirements.txt"] }
 
 [project.urls]
-"Homepage" = "https://github.com/Codium-ai/pr-agent"
+"Homepage" = "https://github.com/qodo-ai/pr-agent"
 "Documentation" = "https://pr-agent-docs.codium.ai/"
 
 [tool.setuptools]

requirements.txt

@@ -1,5 +1,5 @@
 aiohttp==3.9.5
-anthropic[vertex]==0.39.0
+anthropic[vertex]==0.47.1
 atlassian-python-api==3.41.4
 azure-devops==7.1.0b3
 azure-identity==1.15.0

tests/unittest/test_extend_patch.py

@@ -5,12 +5,11 @@ from pr_agent.algo.pr_processing import pr_generate_extended_diff
 from pr_agent.algo.token_handler import TokenHandler
 from pr_agent.algo.utils import load_large_diff
 from pr_agent.config_loader import get_settings
+get_settings().set("CONFIG.CLI_MODE", True)
+get_settings().config.allow_dynamic_context = False
 
 
 class TestExtendPatch:
-    def setUp(self):
-        get_settings().config.allow_dynamic_context = False
-
     # Tests that the function works correctly with valid input
     def test_happy_path(self):
         original_file_str = 'line1\nline2\nline3\nline4\nline5'
@@ -75,41 +74,46 @@ class TestExtendPatch:
         actual_output = extend_patch(original_file_str, patch_str,
                                      patch_extra_lines_before=num_lines, patch_extra_lines_after=num_lines)
         assert actual_output == expected_output
-        get_settings().config.allow_dynamic_context = original_allow_dynamic_context
+        get_settings(use_context=False).config.allow_dynamic_context = original_allow_dynamic_context
 
 
     def test_dynamic_context(self):
-        get_settings().config.max_extra_lines_before_dynamic_context = 10
+        get_settings(use_context=False).config.max_extra_lines_before_dynamic_context = 10
         original_file_str = "def foo():"
         for i in range(9):
             original_file_str += f"\n    line({i})"
-        patch_str ="@@ -11,1 +11,1 @@ def foo():\n-    line(9)\n+    new_line(9)"
+        patch_str ="@@ -10,1 +10,1 @@ def foo():\n-    line(8)\n+    new_line(8)"
+        new_file_str = "\n".join(original_file_str.splitlines()[:-1] + ["    new_line(8)"])
         num_lines=1
 
-        get_settings().config.allow_dynamic_context = True
+        get_settings(use_context=False).config.allow_dynamic_context = True
         actual_output = extend_patch(original_file_str, patch_str,
-                                     patch_extra_lines_before=num_lines, patch_extra_lines_after=num_lines)
+                                     patch_extra_lines_before=num_lines, patch_extra_lines_after=num_lines, new_file_str=new_file_str)
-        expected_output='\n@@ -1,10 +1,10 @@ \n def foo():\n     line(0)\n     line(1)\n     line(2)\n     line(3)\n     line(4)\n     line(5)\n     line(6)\n     line(7)\n     line(8)\n-    line(9)\n+    new_line(9)'
+        expected_output='\n@@ -1,10 +1,10 @@ \n def foo():\n     line(0)\n     line(1)\n     line(2)\n     line(3)\n     line(4)\n     line(5)\n     line(6)\n     line(7)\n-    line(8)\n+    new_line(8)'
         assert actual_output == expected_output
 
-        get_settings().config.allow_dynamic_context = False
+        get_settings(use_context=False).config.allow_dynamic_context = False
         actual_output2 = extend_patch(original_file_str, patch_str,
-                                     patch_extra_lines_before=num_lines, patch_extra_lines_after=num_lines)
+                                     patch_extra_lines_before=1, patch_extra_lines_after=1)
-        expected_output_no_dynamic_context = '\n@@ -10,1 +10,1 @@ def foo():\n     line(8)\n-    line(9)\n+    new_line(9)'
+        expected_output_no_dynamic_context = '\n@@ -9,2 +9,2 @@ def foo():\n     line(7)\n-    line(8)\n+    new_line(8)'
         assert actual_output2 == expected_output_no_dynamic_context
 
+        get_settings(use_context=False).config.allow_dynamic_context = False
+        actual_output3 = extend_patch(original_file_str, patch_str,
+                                     patch_extra_lines_before=3, patch_extra_lines_after=3)
+        expected_output_no_dynamic_context = '\n@@ -7,4 +7,4 @@ def foo():\n     line(5)\n     line(6)\n     line(7)\n-    line(8)\n+    new_line(8)'
+        assert actual_output3 == expected_output_no_dynamic_context
+
 
 
 
 
 class TestExtendedPatchMoreLines:
-    def setUp(self):
-        get_settings().config.allow_dynamic_context = False
-
     class File:
-        def __init__(self, base_file, patch, filename, ai_file_summary=None):
+        def __init__(self, base_file, patch, head_file, filename, ai_file_summary=None):
             self.base_file = base_file
             self.patch = patch
+            self.head_file = head_file
             self.filename = filename
             self.ai_file_summary = ai_file_summary
 
@@ -128,9 +132,11 @@ class TestExtendedPatchMoreLines:
                 'files': [
                     self.File(base_file="line000\nline00\nline0\nline1\noriginal content\nline2\nline3\nline4\nline5\nline6\nline7\nline8\nline9\nline10",
                               patch="@@ -5,5 +5,5 @@\n-original content\n+modified content\n line2\n line3\n line4\n line5",
+                              head_file="line000\nline00\nline0\nline1\nmodified content\nline2\nline3\nline4\nline5\nline6\nline7\nline8\nline9\nline10",
                               filename="file1"),
                     self.File(base_file="original content\nline2\nline3\nline4\nline5\nline6\nline7\nline8\nline9\nline10",
                               patch="@@ -6,5 +6,5 @@\nline6\nline7\nline8\n-line9\n+modified line9\nline10",
+                              head_file="original content\nline2\nline3\nline4\nline5\nline6\nline7\nline8\nmodified line9\nline10",
                               filename="file2")
                 ]
             }
@@ -155,11 +161,9 @@ class TestExtendedPatchMoreLines:
             patch_extra_lines_after=1
         )
 
-
         p0_extended = patches_extended_with_extra_lines[0].strip()
         assert p0_extended == "## File: 'file1'\n\n@@ -3,8 +3,8 @@ \n line0\n line1\n-original content\n+modified content\n line2\n line3\n line4\n line5\n line6"
 
-
 class TestLoadLargeDiff:
     def test_no_newline(self):
         patch = load_large_diff("test.py",

tests/unittest/test_fetching_sub_issues.py

@@ -0,0 +1,121 @@
+# Currently doing API calls - wrong !
+
+
+# import unittest
+# import asyncio
+# from unittest.mock import AsyncMock, patch
+# from pr_agent.tools.ticket_pr_compliance_check import extract_tickets, extract_and_cache_pr_tickets
+# from pr_agent.git_providers.github_provider import GithubProvider
+#
+#
+# class TestTicketCompliance(unittest.TestCase):
+#
+#     @patch.object(GithubProvider, 'get_user_description', return_value="Fixes #1 and relates to #2")
+#     @patch.object(GithubProvider, '_parse_issue_url', side_effect=lambda url: ("WonOfAKind/KimchiBot", int(url.split('#')[-1])))
+#     @patch.object(GithubProvider, 'repo_obj')
+#     async def test_extract_tickets(self, mock_repo, mock_parse_issue_url, mock_user_desc):
+#         """
+#         Test extract_tickets() to ensure it extracts tickets correctly
+#         and fetches their content.
+#         """
+#         github_provider = GithubProvider()
+#         github_provider.repo = "WonOfAKind/KimchiBot"
+#         github_provider.base_url_html = "https://github.com"
+#
+#         # Mock issue retrieval
+#         mock_issue = AsyncMock()
+#         mock_issue.number = 1
+#         mock_issue.title = "Sample Issue"
+#         mock_issue.body = "This is a test issue body."
+#         mock_issue.labels = ["bug", "high priority"]
+#
+#         # Mock repo object
+#         mock_repo.get_issue.return_value = mock_issue
+#
+#         tickets = await extract_tickets(github_provider)
+#
+#         # Verify tickets were extracted correctly
+#         self.assertIsInstance(tickets, list)
+#         self.assertGreater(len(tickets), 0, "Expected at least one ticket!")
+#
+#         # Verify ticket structure
+#         first_ticket = tickets[0]
+#         self.assertIn("ticket_id", first_ticket)
+#         self.assertIn("ticket_url", first_ticket)
+#         self.assertIn("title", first_ticket)
+#         self.assertIn("body", first_ticket)
+#         self.assertIn("labels", first_ticket)
+#
+#         print("\n Test Passed: extract_tickets() successfully retrieved ticket info!")
+#
+#     @patch.object(GithubProvider, 'get_user_description', return_value="Fixes #1 and relates to #2")
+#     @patch.object(GithubProvider, '_parse_issue_url', side_effect=lambda url: ("WonOfAKind/KimchiBot", int(url.split('#')[-1])))
+#     @patch.object(GithubProvider, 'repo_obj')
+#     async def test_extract_and_cache_pr_tickets(self, mock_repo, mock_parse_issue_url, mock_user_desc):
+#         """
+#         Test extract_and_cache_pr_tickets() to ensure tickets are extracted and cached correctly.
+#         """
+#         github_provider = GithubProvider()
+#         github_provider.repo = "WonOfAKind/KimchiBot"
+#         github_provider.base_url_html = "https://github.com"
+#
+#         vars = {}  # Simulate the dictionary to store results
+#
+#         # Mock issue retrieval
+#         mock_issue = AsyncMock()
+#         mock_issue.number = 1
+#         mock_issue.title = "Sample Issue"
+#         mock_issue.body = "This is a test issue body."
+#         mock_issue.labels = ["bug", "high priority"]
+#
+#         # Mock repo object
+#         mock_repo.get_issue.return_value = mock_issue
+#
+#         # Run function
+#         await extract_and_cache_pr_tickets(github_provider, vars)
+#
+#         # Ensure tickets are cached
+#         self.assertIn("related_tickets", vars)
+#         self.assertIsInstance(vars["related_tickets"], list)
+#         self.assertGreater(len(vars["related_tickets"]), 0, "Expected at least one cached ticket!")
+#
+#         print("\n Test Passed: extract_and_cache_pr_tickets() successfully cached ticket data!")
+#
+#     def test_fetch_sub_issues(self):
+#         """
+#         Test fetch_sub_issues() to ensure sub-issues are correctly retrieved.
+#         """
+#         github_provider = GithubProvider()
+#         issue_url = "https://github.com/WonOfAKind/KimchiBot/issues/1"  # Known issue with sub-issues
+#         result = github_provider.fetch_sub_issues(issue_url)
+#
+#         print("Fetched sub-issues:", result)
+#
+#         self.assertIsInstance(result, set)  # Ensure result is a set
+#         self.assertGreater(len(result), 0, "Expected at least one sub-issue but found none!")
+#
+#         print("\n Test Passed: fetch_sub_issues() retrieved sub-issues correctly!")
+#
+#     def test_fetch_sub_issues_with_no_results(self):
+#         """
+#         Test fetch_sub_issues() to ensure an empty set is returned for an issue with no sub-issues.
+#         """
+#         github_provider = GithubProvider()
+#         issue_url = "https://github.com/qodo-ai/pr-agent/issues/1499"  # Likely non-existent issue
+#         result = github_provider.fetch_sub_issues(issue_url)
+#
+#         print("Fetched sub-issues for non-existent issue:", result)
+#
+#         self.assertIsInstance(result, set)  # Ensure result is a set
+#         self.assertEqual(len(result), 0, "Expected no sub-issues but some were found!")
+#
+#         print("\n Test Passed: fetch_sub_issues_with_no_results() correctly returned an empty set!")
+#
+#
+# if __name__ == "__main__":
+#     asyncio.run(unittest.main())
+#
+#
+#
+#
+#