Update setup.py

2025-07-04 04:40:38 +08:00 · 2025-01-19 08:13:09 +02:00
63 changed files with 469 additions and 1015 deletions
--- a/.github/ISSUE_TEMPLATE/bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@ -1,38 +0,0 @@
-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
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@ -1,10 +0,0 @@
-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
--- a/.github/ISSUE_TEMPLATE/feature-request.yml
+++ b/.github/ISSUE_TEMPLATE/feature-request.yml
@ -1,21 +0,0 @@
-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.
--- a/.github/ISSUE_TEMPLATE/miscellaneous.yml
+++ b/.github/ISSUE_TEMPLATE/miscellaneous.yml
@ -1,36 +0,0 @@
-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
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@ -1,45 +0,0 @@
-# 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/)
-
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -1,38 +0,0 @@
-# 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)
--- a/PULL_REQUEST_TEMPLATE.md
+++ b/PULL_REQUEST_TEMPLATE.md
@ -1,48 +0,0 @@
-## 📌 Pull Request Template
-
-### 1️⃣ Short Description
-<!-- Provide a concise summary of the changes in this PR. -->
-
---
-
-### 2️⃣ Related Open Issue
-<!-- Link the related issue(s) this PR is addressing, e.g., Fixes #123 or Closes #456. -->
-Fixes #
-
---
-
-### 3️⃣ PR Type
-<!-- Select one of the following by marking `[x]` -->
-
- [ ] 🐞 Bug Fix
- [ ] ✨ New Feature
- [ ] 🔄 Refactoring
- [ ] 📖 Documentation Update
-
---
-
-### 4️⃣ Does this PR Introduce a Breaking Change?
-<!-- Mark the applicable option -->
- [ ] ❌ No
- [ ] ⚠️ Yes (Explain below)
-
-If **yes**, describe the impact and necessary migration steps:
-<!-- Provide a short explanation of what needs to be changed. -->
-
---
-
-### 5️⃣ Current Behavior (Before Changes)
-<!-- Describe the existing behavior before applying the changes in this PR. -->
-
---
-
-### 6️⃣ New Behavior (After Changes)
-<!-- Explain how the behavior changes with this PR. -->
-
---
-
-### ✅ Checklist
- [ ] Code follows the project's coding guidelines.
- [ ] Tests have been added or updated (if applicable).
- [ ] Documentation has been updated (if applicable).
- [ ] Ready for review and approval.
--- a/README.md
+++ b/README.md
@ -10,10 +10,10 @@

 </picture>
 <br/>
-PR-Agent aims to help efficiently review and handle pull requests, by providing AI feedback and suggestions
+Qode Merge 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/qodo-merge-ai-powered-cod/ephlnjeghhogofkifjloamocljapahnl)
+[![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/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,45 +22,30 @@ PR-Agent aims to help efficiently review and handle pull requests, by providing
 </a>
 </div>

-### [Documentation](https://qodo-merge-docs.qodo.ai/)
+### [Documentation](https://pr-agent-docs.codium.ai/)
+- See the [Installation Guide](https://qodo-merge-docs.qodo.ai/installation/) for instructions on installing Qode Merge PR-Agent on different platforms.

- See the [Installation Guide](https://qodo-merge-docs.qodo.ai/installation/) for instructions on installing PR-Agent on different platforms.
-
- See the [Usage Guide](https://qodo-merge-docs.qodo.ai/usage-guide/) 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 [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 [Tools Guide](https://qodo-merge-docs.qodo.ai/tools/) 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)
- [Qodo Merge 💎](https://qodo-merge-docs.qodo.ai/overview/pr_agent_pro/)
+- [PR-Agent Pro 💎](https://pr-agent-docs.codium.ai/overview/pr_agent_pro/)
 - [How it works](#how-it-works)
 - [Why use PR-Agent?](#why-use-pr-agent)

 ## News and Updates

-### 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://www.qodo.ai/images/pr_agent/implement1.png" width="512"></kbd>
+<kbd><img src="https://codium.ai/images/pr_agent/implement1.png" width="512"></kbd>


 ### Jan 1, 2025
@ -69,7 +54,7 @@ Update logic and [documentation](https://qodo-merge-docs.qodo.ai/usage-guide/cha

 ### December 30, 2024

-Following feedback 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](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.

 ### December 25, 2024

@ -77,11 +62,11 @@ The `review` tool previously included a legacy feature for providing code sugges

 ### December 2, 2024

-Open-source repositories can now freely use Qodo Merge, and enjoy easy one-click installation using a marketplace [app](https://github.com/apps/qodo-merge-pro-for-open-source).
+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 for private repositories.
+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
@ -116,20 +101,20 @@ Supported commands per platform:
 |       | [Describe](https://qodo-merge-docs.qodo.ai/tools/describe/)                                                                                                | ✅ | ✅ | ✅ |      ✅       |
 |       | [Improve](https://qodo-merge-docs.qodo.ai/tools/improve/)                                                                                                 | ✅ | ✅ | ✅ |      ✅       |
 |       | [Ask](https://qodo-merge-docs.qodo.ai/tools/ask/)                                                                                                     | ✅ | ✅ | ✅ |      ✅       |
-|       | ⮑ [Ask on code lines](https://qodo-merge-docs.qodo.ai/tools/ask/#ask-lines)                              | ✅ | ✅ |                    |              |
+|       | ⮑ [Ask on code lines](https://pr-agent-docs.codium.ai/tools/ask#ask-lines)                              | ✅ | ✅ |                    |              |
 |       | [Update CHANGELOG](https://qodo-merge-docs.qodo.ai/tools/update_changelog/)                                                                                     | ✅ | ✅ | ✅ |      ✅       |
 |       | [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) 💎  | ✅ | ✅ |  ✅                  |   |
 |       | [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) 💎  | ✅ | ✅ |                    |   |
-|       | [CI Feedback](https://qodo-merge-docs.qodo.ai/tools/ci_feedback/) 💎                                    | ✅ |                    |                    |              |
-|       | [PR Documentation](https://qodo-merge-docs.qodo.ai/tools/documentation/) 💎                         | ✅ | ✅ |                   |              |
-|       | [Custom Labels](https://qodo-merge-docs.qodo.ai/tools/custom_labels/) 💎                                | ✅ | ✅ |                    |              |
-|       | [Analyze](https://qodo-merge-docs.qodo.ai/tools/analyze/) 💎                                            | ✅ | ✅ |                    |              |
-|       | [Similar Code](https://qodo-merge-docs.qodo.ai/tools/similar_code/) 💎                                  | ✅ |                    |                    |              |
-|       | [Custom Prompt](https://qodo-merge-docs.qodo.ai/tools/custom_prompt/) 💎                                | ✅ | ✅ | ✅ |              |
-|       | [Test](https://qodo-merge-docs.qodo.ai/tools/test/) 💎                                                  | ✅ | ✅ |                    |              |
-|       | [Implement](https://qodo-merge-docs.qodo.ai/tools/implement/) 💎                                        | ✅ | ✅ |         ✅          |              |
+|       | [CI Feedback](https://pr-agent-docs.codium.ai/tools/ci_feedback/) 💎                                    | ✅ |                    |                    |              |
+|       | [PR Documentation](https://pr-agent-docs.codium.ai/tools/documentation/) 💎                         | ✅ | ✅ |                   |              |
+|       | [Custom Labels](https://pr-agent-docs.codium.ai/tools/custom_labels/) 💎                                | ✅ | ✅ |                    |              |
+|       | [Analyze](https://pr-agent-docs.codium.ai/tools/analyze/) 💎                                            | ✅ | ✅ |                    |              |
+|       | [Similar Code](https://pr-agent-docs.codium.ai/tools/similar_code/) 💎                                  | ✅ |                    |                    |              |
+|       | [Custom Prompt](https://pr-agent-docs.codium.ai/tools/custom_prompt/) 💎                                | ✅ | ✅ | ✅ |              |
+|       | [Test](https://pr-agent-docs.codium.ai/tools/test/) 💎                                                  | ✅ | ✅ |                    |              |
+|       | [Implement](https://pr-agent-docs.codium.ai/tools/implement/) 💎                                        | ✅ | ✅ |         ✅          |              |
 |       |                                                                                                         |                    |                    |                    |              |
 | 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)                                                                                           | ✅ | ✅ | ✅ |      ✅       |
@ -143,41 +128,41 @@ Supported commands per platform:
 |       | [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://qodo-merge-docs.qodo.ai/usage-guide/configuration_options/) 💎 | ✅ | ✅ | ✅ |              |
-|       | [PR interactive actions](https://www.qodo.ai/images/pr_agent/pr-actions.mp4) 💎                       | ✅ |        ✅           |                    |              |
+|       | [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/) 💎  | ✅ | ✅ |                    |   |
- 💎 means this feature is available only in [Qodo-Merge](https://www.qodo.ai/pricing/)
+- 💎 means this feature is available only in [PR-Agent Pro](https://www.codium.ai/pricing/)

 [//]: # (- Support for additional git providers is described in [here]&#40;./docs/Full_environments.md&#41;)
 ___

-‣ **Auto Description ([`/describe`](https://qodo-merge-docs.qodo.ai/tools/describe/))**: Automatically generating PR description - title, type, summary, code walkthrough and labels.
+‣ **Auto Description ([`/describe`](https://pr-agent-docs.codium.ai/tools/describe/))**: Automatically generating PR description - title, type, summary, code walkthrough and labels.
 \
-‣ **Auto Review ([`/review`](https://qodo-merge-docs.qodo.ai/tools/review/))**: Adjustable feedback about the PR, possible issues, security concerns, review effort and more.
+‣ **Auto Review ([`/review`](https://pr-agent-docs.codium.ai/tools/review/))**: Adjustable feedback about the PR, possible issues, security concerns, review effort and more.
 \
-‣ **Code Suggestions ([`/improve`](https://qodo-merge-docs.qodo.ai/tools/improve/))**: Code suggestions for improving the PR.
+‣ **Code Suggestions ([`/improve`](https://pr-agent-docs.codium.ai/tools/improve/))**: Code suggestions for improving the PR.
 \
-‣ **Question Answering ([`/ask ...`](https://qodo-merge-docs.qodo.ai/tools/ask/))**: Answering free-text questions about the PR.
+‣ **Question Answering ([`/ask ...`](https://pr-agent-docs.codium.ai/tools/ask/))**: Answering free-text questions about the PR.
 \
-‣ **Update Changelog ([`/update_changelog`](https://qodo-merge-docs.qodo.ai/tools/update_changelog/))**: Automatically updating the CHANGELOG.md file with the PR changes.
+‣ **Update Changelog ([`/update_changelog`](https://pr-agent-docs.codium.ai/tools/update_changelog/))**: Automatically updating the CHANGELOG.md file with the PR changes.
 \
-‣ **Find Similar Issue ([`/similar_issue`](https://qodo-merge-docs.qodo.ai/tools/similar_issues/))**: Automatically retrieves and presents similar issues.
+‣ **Find Similar Issue ([`/similar_issue`](https://pr-agent-docs.codium.ai/tools/similar_issues/))**: Automatically retrieves and presents similar issues.
 \
-‣ **Add Documentation 💎  ([`/add_docs`](https://qodo-merge-docs.qodo.ai/tools/documentation/))**: Generates documentation to methods/functions/classes that changed in the PR.
+‣ **Add Documentation 💎  ([`/add_docs`](https://pr-agent-docs.codium.ai/tools/documentation/))**: Generates documentation to methods/functions/classes that changed in the PR.
 \
-‣ **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.
+‣ **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.
 \
-‣ **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.
+‣ **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.
 \
-‣ **Test 💎 ([`/test`](https://qodo-merge-docs.qodo.ai/tools/test/))**: Generate tests for a selected component, based on the PR code changes.
+‣ **Test 💎 ([`/test`](https://pr-agent-docs.codium.ai/tools/test/))**: Generate tests for a selected component, based on the PR code changes.
 \
-‣ **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.
+‣ **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.
 \
-‣ **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.
+‣ **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.
 \
-‣ **CI Feedback 💎 ([`/checks ci_job`](https://qodo-merge-docs.qodo.ai/tools/ci_feedback/))**: Automatically generates feedback and analysis for a failed CI job.
+‣ **CI Feedback 💎 ([`/checks ci_job`](https://pr-agent-docs.codium.ai/tools/ci_feedback/))**: Automatically generates feedback and analysis for a failed CI job.
 \
-‣ **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.
+‣ **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.
 \
 ‣ **Implement 💎 ([`/implement`](https://qodo-merge-docs.qodo.ai/tools/implement/))**: Generates implementation code from review suggestions.
 ___
@ -235,19 +220,19 @@ It does not have 'edit' access to your repo, for example, so it cannot update th
 ![Review generation process](https://www.codium.ai/images/demo-2.gif)


-To set up your own PR-Agent, see the [Installation](https://qodo-merge-docs.qodo.ai/installation/) section below.
-Note that when you set your own PR-Agent or use Qodo hosted PR-Agent, there is no need to mention `@CodiumAI-Agent ...`. Instead, directly start with the command, e.g., `/ask ...`.
+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 ...`.

 ---


-## Qodo Merge 💎
-[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 Qodo Merge app to your GitHub\GitLab\BitBucket repo.
-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** - 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, 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 Qodo Merge.
+## PR-Agent Pro 💎
+[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:
+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.
+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.
+3. **Improved support** - PR-Agent Pro 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.
+See [here](https://qodo-merge-docs.qodo.ai/overview/pr_agent_pro/) for a list of features available in PR-Agent Pro.



@ -255,9 +240,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://www.qodo.ai/images/pr_agent/diagram-v0.9.png)
+![PR-Agent Tools](https://codium.ai/images/pr_agent/diagram-v0.9.png)

-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
+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

 ## Why use PR-Agent?

@ -266,7 +251,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://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 [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 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).

@ -278,24 +263,24 @@ 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

-### Qodo-hosted Qodo Merge 💎
+### CodiumAI-hosted PR-Agent Pro 💎

- 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.
+- 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.

- For certain clients, Qodo-hosted Qodo Merge will use Qodo’s proprietary models — if this is the case, you will be notified.
+- For certain clients, CodiumAI-hosted PR-Agent Pro will use CodiumAI’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.
+- 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.

-### Qodo Merge Chrome extension
+### PR-Agent Chrome extension

- 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.
+- 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.

 ## 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
- Qodo site: https://www.qodo.ai/
- Blog: https://www.qodo.ai/blog/
- Troubleshooting: https://www.qodo.ai/blog/technical-faq-and-troubleshooting/
- Support: support@qodo.ai
+- CodiumAI site: https://codium.ai
+- Blog: https://www.codium.ai/blog/
+- Troubleshooting: https://www.codium.ai/blog/technical-faq-and-troubleshooting/
+- Support: support@codium.ai
--- a/SECURITY.md
+++ b/SECURITY.md
@ -1,62 +0,0 @@
-# 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.
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@ -4,7 +4,7 @@ WORKDIR /app
 ADD pyproject.toml .
 ADD requirements.txt .
 ADD docs docs
-RUN pip install --no-cache-dir . && rm pyproject.toml requirements.txt
+RUN pip install . && 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 --no-cache-dir -r requirements-dev.txt && rm requirements-dev.txt
+RUN pip install -r requirements-dev.txt && rm requirements-dev.txt
 ADD pr_agent pr_agent
 ADD tests tests

--- a/docker/Dockerfile.lambda
+++ b/docker/Dockerfile.lambda
@ -5,8 +5,8 @@ RUN yum update -y && \
    yum clean all

 ADD pyproject.toml requirements.txt .
-RUN pip install --no-cache-dir . && rm pyproject.toml
-RUN pip install --no-cache-dir mangum==0.17.0
+RUN pip install . && rm pyproject.toml
+RUN pip install mangum==0.17.0
 COPY pr_agent/ ${LAMBDA_TASK_ROOT}/pr_agent/

 CMD ["pr_agent.servers.serverless.serverless"]
--- a/docs/docs/chrome-extension/data_privacy.md
+++ b/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 integration.
+- 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.
--- a/docs/docs/chrome-extension/features.md
+++ b/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. 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 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.

 #### Context-aware PR chat

--- a/docs/docs/chrome-extension/index.md
+++ b/docs/docs/chrome-extension/index.md
@ -1,11 +1,11 @@
-[Qodo Merge Chrome extension](https://chromewebstore.google.com/detail/pr-agent-chrome-extension/ephlnjeghhogofkifjloamocljapahnl){:target="_blank"} is a collection of tools that integrates seamlessly with your GitHub environment, aiming to enhance your Git usage experience, and providing AI-powered capabilities to your PRs.
+[Qodo Merge Chrome extension](https://chromewebstore.google.com/detail/pr-agent-chrome-extension/ephlnjeghhogofkifjloamocljapahnl) is a collection of tools that integrates seamlessly with your GitHub environment, aiming to enhance your Git usage experience, and providing AI-powered capabilities to your PRs.

 With a single-click installation you will gain access to a context-aware chat on your pull requests code, a toolbar extension with multiple AI feedbacks, Qodo Merge filters, and additional abilities.

 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](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 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 private repositories, you will need to install [Qodo Merge Pro](https://github.com/apps/qodo-merge-pro) 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).

 <img src="https://codium.ai/images/pr_agent/PR-AgentChat.gif" width="768">

--- a/docs/docs/core-abilities/auto_best_practices.md
+++ b/docs/docs/core-abilities/auto_best_practices.md
@ -1,69 +0,0 @@
-# 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                   
-```
--- a/docs/docs/core-abilities/fetching_ticket_context.md
+++ b/docs/docs/core-abilities/fetching_ticket_context.md
@ -1,5 +1,5 @@
 # Fetching Ticket Context for PRs
-`Supported Git Platforms: GitHub, GitLab, Bitbucket`
+`Supported Git Platforms : GitHub, GitLab, Bitbucket`

 ## Overview
 Qodo Merge PR Agent streamlines code review workflows by seamlessly connecting with multiple ticket management systems.
--- a/docs/docs/core-abilities/index.md
+++ b/docs/docs/core-abilities/index.md
@ -2,7 +2,6 @@
 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/)
@ -19,7 +18,6 @@ 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/)

--- a/docs/docs/core-abilities/metadata.md
+++ b/docs/docs/core-abilities/metadata.md
@ -32,14 +32,14 @@ For example, when generating code suggestions for different files, Qodo Merge ca

@@ ... @@ def func1():
 __new hunk__
-11  unchanged code line0
-12  unchanged code line1
-13 +new code line2 added
-14  unchanged code line3
+11  unchanged code line0 in the PR
+12  unchanged code line1 in the PR
+13 +new code line2 added in the PR
+14  unchanged code line3 in the PR
 __old hunk__
 unchanged code line0
 unchanged code line1
-old code line2 removed
+-old code line2 removed in the PR
 unchanged code line3

@@ ... @@ def func2():
--- a/docs/docs/faq/index.md
+++ b/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 with SaaS deployment is a hosted version of Qodo Merge, where Qodo manages the infrastructure and the keys.
+    Qodo Merge Pro 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).
--- a/docs/docs/index.md
+++ b/docs/docs/index.md
@ -1,16 +1,15 @@
 # Overview

-[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
+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 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 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.


-## Docs Smart Search
+## Qodo Merge Docs Smart Search

 To search the documentation site using natural language:

@ -19,45 +18,51 @@ 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) The bot will respond with an [answer](https://github.com/Codium-ai/pr-agent/pull/1241#issuecomment-2365259334) that includes relevant documentation links.
+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:
+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"} 💎                         |   ✅    |   ✅    |    ✅    |   ✅        |
+|       |                                                                                                         | GitHub             | GitLab             | Bitbucket          | Azure DevOps |
+|-------|---------------------------------------------------------------------------------------------------------|:--------------------:|:--------------------:|:--------------------:|:------------:|
+| TOOLS | [Review](https://qodo-merge-docs.qodo.ai/tools/review/)                                                                                                  | ✅ | ✅ | ✅ |      ✅       |
+|       | [Describe](https://qodo-merge-docs.qodo.ai/tools/describe/)                                                                                                | ✅ | ✅ | ✅ |      ✅       |
+|       | [Improve](https://qodo-merge-docs.qodo.ai/tools/improve/)                                                                                                 | ✅ | ✅ | ✅ |      ✅       |
+|       | [Ask](https://qodo-merge-docs.qodo.ai/tools/ask/)                                                                                                     | ✅ | ✅ | ✅ |      ✅       |
+|       | ⮑ [Ask on code lines](https://pr-agent-docs.codium.ai/tools/ask#ask-lines)                              | ✅ | ✅ |                    |              |
+|       | [Update CHANGELOG](https://qodo-merge-docs.qodo.ai/tools/update_changelog/)                                                                                     | ✅ | ✅ | ✅ |      ✅       |
+|       | [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) 💎  | ✅ | ✅ |  ✅                  |   |
+|       | [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) 💎  | ✅ | ✅ |                    |   |
+|       | [CI Feedback](https://pr-agent-docs.codium.ai/tools/ci_feedback/) 💎                                    | ✅ |                    |                    |              |
+|       | [PR Documentation](https://pr-agent-docs.codium.ai/tools/documentation/) 💎                         | ✅ | ✅ |                   |              |
+|       | [Custom Labels](https://pr-agent-docs.codium.ai/tools/custom_labels/) 💎                                | ✅ | ✅ |                    |              |
+|       | [Analyze](https://pr-agent-docs.codium.ai/tools/analyze/) 💎                                            | ✅ | ✅ |                    |              |
+|       | [Similar Code](https://pr-agent-docs.codium.ai/tools/similar_code/) 💎                                  | ✅ |                    |                    |              |
+|       | [Custom Prompt](https://pr-agent-docs.codium.ai/tools/custom_prompt/) 💎                                | ✅ | ✅ | ✅ |              |
+|       | [Test](https://pr-agent-docs.codium.ai/tools/test/) 💎                                                  | ✅ | ✅ |                    |              |
+|       | [Implement](https://pr-agent-docs.codium.ai/tools/implement/) 💎                                                      | ✅ |   ✅    |         ✅          |              |
+|       |                                                                                                         |                    |                    |                    |              |
+| 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)                                                                                           | ✅ | ✅ | ✅ |      ✅       |
+|       | [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                                                             | ✅ | ✅ | ✅ |      ✅       |
+|       | [Multiple models support](https://qodo-merge-docs.qodo.ai/usage-guide/changing_a_model/)                                                                                 | ✅ | ✅ | ✅ |      ✅       |
+|       | [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/)          | ✅ | ✅ | ✅ | ✅             |
+|       | [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](https://www.codium.ai/pricing/){:target="_blank"}, and not in the open-source version.
+💎 marks a feature available only in [Qodo Merge Pro](https://www.qodo.ai/pricing/){:target="_blank"}


 ## Example Results
@ -93,4 +98,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 [PR Compression strategy](core-abilities/index.md) page for more details on how we convert a code diff to a manageable LLM prompt
+Check out the [core abilities](core-abilities/index.md) page for a comprehensive overview of the variety of core abilities used by Qodo Merge.
--- a/docs/docs/installation/azure.md
+++ b/docs/docs/installation/azure.md
@ -1,5 +1,5 @@
 ## Azure DevOps Pipeline
-You can use a pre-built Action Docker image to run PR-Agent as an Azure devops pipeline.
+You can use a pre-built Action Docker image to run Qodo Merge 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](https://codium.ai/images/pr_agent/azure_devops_pipeline_secrets.png){width=468}
+![Qodo Merge Pro](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.
--- a/docs/docs/installation/bitbucket.md
+++ b/docs/docs/installation/bitbucket.md
@ -27,6 +27,10 @@ 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

--- a/docs/docs/installation/github.md
+++ b/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 PR-Agent as a Github Action.
+You can use our pre-built Github Action Docker image to run Qodo Merge 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: qodo-ai/pr-agent@main
+        uses: Codium-ai/pr-agent@main
        env:
          OPENAI_KEY: ${{ secrets.OPENAI_KEY }}
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
--- a/docs/docs/installation/gitlab.md
+++ b/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 PR-Agent 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 Qodo Merge 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
--- a/docs/docs/installation/index.md
+++ b/docs/docs/installation/index.md
@ -1,17 +1,21 @@
 # Installation

-## Self-hosted PR-Agent
+## Self-hosted Qodo Merge
+If you choose to host your own Qodo Merge, you first need to acquire two tokens:

-There are several ways to use self-hosted PR-Agent:
+1. An OpenAI key from [here](https://platform.openai.com/api-keys), 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 GitHub\GitLab\BitBucket personal access token (classic), with the repo scope. [GitHub from [here](https://github.com/settings/tokens)]
+
+There are several ways to use self-hosted Qodo Merge:

 - [Locally](./locally.md)
- [GitHub integration](./github.md)
- [GitLab integration](./gitlab.md)
- [BitBucket integration](./bitbucket.md)
- [Azure DevOps integration](./azure.md)
+- [GitHub](./github.md)
+- [GitLab](./gitlab.md)
+- [BitBucket](./bitbucket.md)
+- [Azure DevOps](./azure.md)

-## Qodo Merge 💎
-Qodo Merge, an app hosted by QodoAI for GitHub\GitLab\BitBucket, is also available.
+## Qodo Merge Pro 💎
+Qodo Merge Pro, an app hosted by CodiumAI for GitHub\GitLab\BitBucket, is also available.
 <br>
-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/qodo_merge/) for more details.
+With Qodo Merge Pro, installation is as simple as signing up and adding the Qodo Merge app to your relevant repo.
+See [here](https://qodo-merge-docs.qodo.ai/installation/pr_agent_pro/) for more details.
--- a/docs/docs/installation/locally.md
+++ b/docs/docs/installation/locally.md
@ -1,77 +1,3 @@
-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:
@ -109,6 +35,63 @@ 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

--- a/docs/docs/installation/pr_agent.md
+++ b/docs/docs/installation/pr_agent.md
@ -1,49 +0,0 @@
-# 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/)
--- a/docs/docs/installation/pr_agent_pro.md
+++ b/docs/docs/installation/pr_agent_pro.md
@ -1,42 +1,42 @@
-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.
+Qodo Merge Pro 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.

 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 for GitHub
+## Install Qodo Merge Pro for GitHub

 ### GitHub Cloud

-Qodo Merge for GitHub cloud is available for installation through the [GitHub Marketplace](https://github.com/apps/qodo-merge-pro).
+Qodo Merge Pro for GitHub cloud is available for installation through the [GitHub Marketplace](https://github.com/apps/qodo-merge-pro).

-![Qodo Merge](https://codium.ai/images/pr_agent/pr_agent_pro_install.png){width=468}
+![Qodo Merge Pro](https://codium.ai/images/pr_agent/pr_agent_pro_install.png){width=468}

 ### GitHub Enterprise Server

-To use Qodo Merge 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 Pro application on your private GitHub Enterprise Server, you will need to contact us for starting an [Enterprise](https://www.codium.ai/pricing/) trial.

 ### GitHub Open Source Projects

-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).
+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).

-## Install Qodo Merge for Bitbucket
+## Install Qodo Merge Pro for Bitbucket

 ###  Bitbucket Cloud

-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 for Bitbucket Cloud is available for installation through the following [link](https://bitbucket.org/site/addons/authorize?addon_key=d6df813252c37258)

-![Qodo Merge](https://qodo.ai/images/pr_agent/pr_agent_pro_bitbucket_install.png){width=468}
+![Qodo Merge Pro](https://qodo.ai/images/pr_agent/pr_agent_pro_bitbucket_install.png){width=468}

 ### Bitbucket Server

-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.
+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.


-## Install Qodo Merge for GitLab (Teams & Enterprise)
+## Install Qodo Merge Pro for GitLab (Teams & Enterprise)

-Since GitLab platform does not support apps, installing Qodo Merge for GitLab is a bit more involved, and requires the following steps:
+Since GitLab platform does not support apps, installing Qodo Merge Pro for GitLab is a bit more involved, and requires the following steps:

 #### Step 1

--- a/docs/docs/overview/data_privacy.md
+++ b/docs/docs/overview/data_privacy.md
@ -1,12 +1,12 @@
-## Self-hosted PR-Agent
+## Self-hosted Qodo Merge

- 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.
+- 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.

-## Qodo Merge 💎
+## Qodo Merge Pro 💎

- 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.
+- 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.

- For certain clients, Qodo Merge will use Qodo’s proprietary models. If this is the case, you will be notified.
+- For certain clients, CodiumAI-hosted Qodo Merge Pro will use CodiumAI’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.

--- a/docs/docs/overview/index.md
+++ b/docs/docs/overview/index.md
@ -0,0 +1,95 @@
+# 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
--- a/docs/docs/overview/pr_agent_pro.md
+++ b/docs/docs/overview/pr_agent_pro.md
@ -1,21 +1,21 @@
 ### Overview

-[Qodo Merge](https://www.codium.ai/pricing/){:target="_blank"} is a 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 is designed for companies and teams that require additional features and capabilities. It provides the following benefits:
+[Qodo Merge Pro](https://www.codium.ai/pricing/) is a hosted version of open-source [Qodo Merge (PR-Agent)](https://github.com/Codium-ai/pr-agent). 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:

 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 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 Pro will employ zero data retention, and will use an OpenAI and Claude accounts with zero data retention.

-3. **Improved support** - Qodo Merge users will receive priority support, and will be able to request new features and capabilities.
+3. **Improved support** - Qodo Merge Pro users will receive priority support, and will be able to request new features and capabilities.

-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/).
+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/).

-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.
+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.

 ### Additional features

-Here are some of the additional features and capabilities that Qodo Merge offers:
+Here are some of the additional features and capabilities that Qodo Merge Pro offers:

 | Feature                                                                                                              | Description                                                                                                                                                      |
 |----------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------|
@ -24,14 +24,14 @@ Here are some of the additional features and capabilities that Qodo Merge offers
 | [**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 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 Pro 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 users:
+Here are additional tools that are available only for Qodo Merge Pro users:

 | Feature                                                                               | Description |
 |---------------------------------------------------------------------------------------|-------------|
@ -46,7 +46,7 @@ Here are additional tools that are available only for Qodo Merge users:

 ### Supported languages

-Qodo Merge leverages the world's leading code models - Claude 3.5 Sonnet and GPT-4.
+Qodo Merge Pro 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 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 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).
--- a/docs/docs/tools/custom_labels.md
+++ b/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
+> This feature is available only in Qodo Merge Pro

 * 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.
--- a/docs/docs/tools/help.md
+++ b/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 users, it also enables to trigger each tool by checking the relevant box.
+For Qodo Merge Pro users, it also enables to trigger each tool by checking the relevant box.

 It can be invoked manually by commenting on any PR:
 ```
--- a/docs/docs/tools/implement.md
+++ b/docs/docs/tools/implement.md
@ -1,5 +1,3 @@
-`Platforms supported: GitHub, GitLab, Bitbucket`
-
 ## Overview

 The `implement` tool converts human code review discussions and feedback into ready-to-commit code changes.
--- a/docs/docs/tools/improve.md
+++ b/docs/docs/tools/improve.md
@ -9,7 +9,7 @@ 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💎 users.
+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.


 ## Example usage
@ -54,7 +54,7 @@ num_code_suggestions_per_chunk = ...

 ### Assessing Impact 💎

-Note that Qodo Merge tracks two types of implementations:
+Note that Qodo Merge pro tracks two types of implementations:

 - 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.
@ -70,7 +70,7 @@ In post-process, Qodo Merge counts the number of suggestions that were implement
 ## Suggestion tracking 💎
 `Platforms supported: GitHub, GitLab`

-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.
+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.

 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):
@ -122,7 +122,7 @@ Use triple quotes to write multi-line instructions. Use bullet points or numbers

 >`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).
+Another option to give additional guidance to the AI model is by creating a dedicated [**wiki page**](https://github.com/Codium-ai/pr-agent/wiki) called `best_practices.md`.
 This page can contain a list of best practices, coding standards, and guidelines that are specific to your repo/organization.

 The AI model will use this wiki page as a reference, and in case the PR code violates any of the guidelines, it will create additional suggestions, with a dedicated label: `Organization
@ -191,44 +191,8 @@ 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 💎

->`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` 💎
+### How to combine `extra instructions` and `best practices`

 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", ...)

--- a/docs/docs/tools/index.md
+++ b/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 users.
+Note that the tools marked with 💎 are available only for Qodo Merge Pro users.
--- a/docs/docs/tools/review.md
+++ b/docs/docs/tools/review.md
@ -123,6 +123,10 @@ If enabled, the `review` tool can approve a PR when a specific comment, `/review
    <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
@ -194,6 +198,12 @@ If enabled, the `review` tool can approve a PR when a specific comment, `/review
    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"

    The `review` tool previously included a legacy feature for providing code suggestions (controlled by `--pr_reviewer.num_code_suggestion`). This functionality has been deprecated and replaced by the [`improve`](./improve.md) tool, which offers higher quality and more actionable code suggestions.
--- a/docs/docs/usage-guide/PR_agent_pro_models.md
+++ b/docs/docs/usage-guide/PR_agent_pro_models.md
@ -1,38 +1,18 @@
-## Qodo Merge Models
+## Qodo Merge Pro Models

-The default models used by Qodo Merge are a combination of Claude-3.5-sonnet and  OpenAI's GPT-4 models.
+The default models used by Qodo Merge Pro are a combination of Claude-3.5-sonnet and  OpenAI's GPT-4 models.

-### Selecting a Specific Model
+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.

-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`
- `deepseek-r1`
- `o3-mini`
-
-To restrict Qodo Merge to using only `Claude-3.5-sonnet`, add this setting:
+For example, to restrict Qodo Merge Pro 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:
+Or to restrict Qodo Merge Pro to using only `GPT-4o`, add this setting:
 ```
 [config]
 model="gpt-4o"
 ```
-
-To restrict Qodo Merge to using only `deepseek-r1`, add this setting:
-```
-[config]
-model="deepseek/r1"
-```
-
-To restrict Qodo Merge to using only `o3-mini`, add this setting:
-```
-[config]
-model="o3-mini"
-```
--- a/docs/docs/usage-guide/additional_configurations.md
+++ b/docs/docs/usage-guide/additional_configurations.md
@ -1,5 +1,5 @@
 ## Show possible configurations
-The possible configurations of Qodo Merge are stored in [here](https://github.com/Codium-ai/pr-agent/blob/main/pr_agent/settings/configuration.toml){:target="_blank"}.
+The possible configurations of Qodo Merge are stored in [here](https://github.com/Codium-ai/pr-agent/blob/main/pr_agent/settings/configuration.toml).
 In the [tools](https://qodo-merge-docs.qodo.ai/tools/) page you can find explanations on how to use these configurations for each tool.

 To print all the available configurations as a comment on your PR, you can use the following command:
--- a/docs/docs/usage-guide/automations_and_usage.md
+++ b/docs/docs/usage-guide/automations_and_usage.md
@ -95,8 +95,8 @@ When this parameter is set to `true`, Qodo Merge will not run any automatic tool

 ### GitHub App

-!!! note "Configurations for Qodo Merge"
-    Qodo Merge for GitHub is an App, hosted by Qodo. So all the instructions below are relevant also for Qodo Merge users.
+!!! note "Configurations for Qodo Merge Pro"
+    Qodo Merge Pro for GitHub is an App, hosted by CodiumAI. So all the instructions below are relevant also for Qodo Merge Pro users.
    Same goes for [GitLab webhook](#gitlab-webhook) and [BitBucket App](#bitbucket-app) sections.

 #### GitHub app automatic tools when a new PR is opened
--- a/docs/docs/usage-guide/changing_a_model.md
+++ b/docs/docs/usage-guide/changing_a_model.md
@ -1,4 +1,4 @@
-## Changing a model in PR-Agent
+## Changing a model

 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:
--- a/docs/docs/usage-guide/configuration_options.md
+++ b/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, 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 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.
 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**.


--- a/docs/docs/usage-guide/enabling_a_wiki.md
+++ b/docs/docs/usage-guide/enabling_a_wiki.md
@ -1,33 +0,0 @@
-`Supported Git Platforms: GitHub, GitLab, Bitbucket`
-
-
-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: 💎**
-
- 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](https://qodo-merge-docs.qodo.ai/core-abilities/auto_best_practices) file
-
-
-**Setup Instructions (GitHub):**
-
-To enable a wiki for your repository:
-
-1. Navigate to your repository's main page on GitHub
-2. Select "Settings" from the top navigation bar
-3. Locate the "Features" section
-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" 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.
--- a/docs/docs/usage-guide/index.md
+++ b/docs/docs/usage-guide/index.md
@ -5,7 +5,6 @@ It includes information on how to adjust Qodo Merge configurations, define which


 - [Introduction](./introduction.md)
- [Enabling a Wiki](./enabling_a_wiki)
 - [Configuration File](./configuration_options.md)
 - [Usage and Automation](./automations_and_usage.md)
    - [Local Repo (CLI)](./automations_and_usage.md#local-repo-cli)
@ -24,4 +23,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 Models](./PR_agent_pro_models.md)
+- [Qodo Merge Pro Models](./PR_agent_pro_models.md)
--- a/docs/docs/usage-guide/introduction.md
+++ b/docs/docs/usage-guide/introduction.md
@ -2,7 +2,7 @@
 After [installation](https://qodo-merge-docs.qodo.ai/installation/), there are three basic ways to invoke Qodo Merge:

 1. Locally running a CLI command
-2. Online usage - by [commenting](https://github.com/Codium-ai/pr-agent/pull/229#issuecomment-1695021901){:target="_blank"} on a PR
+2. Online usage - by [commenting](https://github.com/Codium-ai/pr-agent/pull/229#issuecomment-1695021901) on a PR
 3. Enabling Qodo Merge tools to run automatically when a new PR is opened


--- a/docs/mkdocs.yml
+++ b/docs/mkdocs.yml
@ -1,26 +1,29 @@
-site_name: Qodo Merge (and open-source PR-Agent)
+site_name: Qodo Merge (formerly known as PR-Agent)
 repo_url: https://github.com/Codium-ai/pr-agent
 repo_name: Codium-ai/pr-agent

 nav:
  - Overview:
    - 'index.md'
-    - 💎 Qodo Merge: 'overview/pr_agent_pro.md'
+    - 💎 Qodo Merge Pro: 'overview/pr_agent_pro.md'
    - Data Privacy: 'overview/data_privacy.md'
  - Installation:
    - 'installation/index.md'
-    - PR-Agent: 'installation/pr_agent.md'
-    - 💎 Qodo Merge: 'installation/qodo_merge.md'
+    - Locally: 'installation/locally.md'
+    - GitHub: 'installation/github.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'
-    - Enabling a Wiki: 'usage-guide/enabling_a_wiki.md'
    - Configuration File: 'usage-guide/configuration_options.md'
    - Usage and Automation: 'usage-guide/automations_and_usage.md'
    - 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 Models: 'usage-guide/PR_agent_pro_models'
+    - 💎 Qodo Merge Pro Models: 'usage-guide/PR_agent_pro_models'
  - Tools:
    - 'tools/index.md'
    - Describe: 'tools/describe.md'
@ -42,7 +45,6 @@ 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'
--- a/pr_agent/algo/init.py
+++ b/pr_agent/algo/init.py
@ -26,13 +26,10 @@ 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,
@ -45,7 +42,6 @@ MAX_TOKENS = {
    'vertex_ai/claude-3-5-sonnet-v2@20241022': 100000,
    'vertex_ai/gemini-1.5-pro': 1048576,
    'vertex_ai/gemini-1.5-flash': 1048576,
-    'vertex_ai/gemini-2.0-flash-exp': 1048576,
    'vertex_ai/gemma2': 8200,
    'gemini/gemini-1.5-pro': 1048576,
    'gemini/gemini-1.5-flash': 1048576,
@ -83,13 +79,3 @@ 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",
-    "o1-2024-12-17",
-    "o3-mini",
-    "o3-mini-2025-01-31"
-]
--- a/pr_agent/algo/ai_handlers/litellm_ai_handler.py
+++ b/pr_agent/algo/ai_handlers/litellm_ai_handler.py
@ -6,7 +6,6 @@ import requests
 from litellm import acompletion
 from tenacity import retry, retry_if_exception_type, stop_after_attempt

-from pr_agent.algo import 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.config_loader import get_settings
@ -95,9 +94,6 @@ 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
-
    def prepare_logs(self, response, system, user, resp, finish_reason):
        response_log = response.dict().copy()
        response_log['system'] = system
@ -201,11 +197,13 @@ class LiteLLMAIHandler(BaseAiHandler):
                messages[1]["content"] = [{"type": "text", "text": messages[1]["content"]},
                                          {"type": "image_url", "image_url": {"url": img_path}}]

-            # Currently, some models do not support a separate system and user prompts
-            if self.user_message_only_models and any(entry.lower() in model.lower() for entry in self.user_message_only_models):
+            # Currently, model OpenAI o1 series does not support a separate system and user prompts
+            O1_MODEL_PREFIX = 'o1'
+            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 model {model}, combining system and user prompts")
+                get_logger().info(f"Using O1 model, combining system and user prompts")
                messages = [{"role": "user", "content": user}]
                kwargs = {
                    "model": model,
--- a/pr_agent/algo/utils.py
+++ b/pr_agent/algo/utils.py
@ -316,98 +316,47 @@ 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 = ""
-    compliance_emoji = ''
-    # Track compliance levels across all tickets
-    all_compliance_levels = []
-
+    final_compliance_level = -1
    if isinstance(value, list):
-        for ticket_analysis in value:
-            try:
-                ticket_url = ticket_analysis.get('ticket_url', '').strip()
-                explanation = ''
-                ticket_compliance_level = ''  # Individual ticket compliance
-                fully_compliant_str = ticket_analysis.get('fully_compliant_requirements', '').strip()
-                not_compliant_str = ticket_analysis.get('not_compliant_requirements', '').strip()
-                requires_further_human_verification = ticket_analysis.get('requires_further_human_verification',
-                                                                          '').strip()
+        for v in value:
+            ticket_url = v.get('ticket_url', '').strip()
+            compliance_level = v.get('overall_compliance_level', '').strip()
+            # add emojis, if 'Fully compliant' ✅, 'Partially compliant' 🔶, or 'Not compliant' ❌
+            if compliance_level.lower() == 'fully compliant':
+                # compliance_level = '✅ Fully compliant'
+                final_compliance_level = 2 if final_compliance_level == -1 else 1
+            elif compliance_level.lower() == 'partially compliant':
+                # compliance_level = '🔶 Partially compliant'
+                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

-                if not fully_compliant_str and not not_compliant_str:
-                    get_logger().debug(f"Ticket compliance has no requirements",
-                                       artifact={'ticket_url': ticket_url})
-                    continue
+            # explanation = v.get('compliance_analysis', '').strip()
+            explanation = ''
+            fully_compliant_str = v.get('fully_compliant_requirements', '').strip()
+            not_compliant_str = v.get('not_compliant_requirements', '').strip()
+            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"

-                # Calculate individual ticket compliance level
-                if fully_compliant_str:
-                    if not_compliant_str:
-                        ticket_compliance_level = 'Partially compliant'
-                    else:
-                        if not requires_further_human_verification:
-                            ticket_compliance_level = 'Fully compliant'
-                        else:
-                            ticket_compliance_level = 'PR Code Verified'
-                elif not_compliant_str:
-                    ticket_compliance_level = 'Not compliant'
+            ticket_compliance_str += f"\n\n**[{ticket_url.split('/')[-1]}]({ticket_url}) - {compliance_level}**\n\n{explanation}\n\n"
+        if final_compliance_level == 2:
+            compliance_level = '✅'
+        elif final_compliance_level == 1:
+            compliance_level = '🔶'
+        else:
+            compliance_level = '❌'

-                # 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_emoji}**\n\n"
+            markdown_text += f"**{emoji} Ticket compliance analysis {compliance_level}**\n\n"
            markdown_text += ticket_compliance_str
            markdown_text += f"</td></tr>\n"
        else:
-            markdown_text += f"### {emoji} Ticket compliance analysis {compliance_emoji}\n\n"
-            markdown_text += ticket_compliance_str + "\n\n"
-
+            markdown_text += f"### {emoji} Ticket compliance analysis {compliance_level}\n\n"
+            markdown_text += ticket_compliance_str+"\n\n"
    return markdown_text


@ -735,7 +684,7 @@ def try_fix_yaml(response_text: str,
        get_logger().info(f"Successfully parsed AI prediction after adding |-\n")
        return data
    except:
-        pass
+        get_logger().info(f"Failed to parse AI prediction after adding |-\n")

    # second fallback - try to extract only range from first ```yaml to ````
    snippet_pattern = r'```(yaml)?[\s\S]*?```'
@ -779,18 +728,9 @@ 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)):
-        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

-    # sixth fallback - try to remove last lines
+    # fifth 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:
--- a/pr_agent/git_providers/bitbucket_server_provider.py
+++ b/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, show_warning=False)
+            patch = load_large_diff(file_path, new_file_content_str, original_file_content_str)

            diff_files.append(
                FilePatchInfo(
--- a/pr_agent/git_providers/github_provider.py
+++ b/pr_agent/git_providers/github_provider.py
@ -9,7 +9,7 @@ from datetime import datetime
 from typing import Optional, Tuple
 from urllib.parse import urlparse

-from github import AppAuthentication, Auth, Github, GithubException
+from github import AppAuthentication, Auth, Github
 from retry import retry
 from starlette_context import context

@ -475,17 +475,8 @@ class GithubProvider(GitProvider):
            return False

    def edit_comment(self, comment, body: str):
-        try:
-            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})
+        body = self.limit_output_characters(body, self.max_comment_chars)
+        comment.edit(body=body)

    def edit_comment_from_comment_id(self, comment_id: int, body: str):
        try:
--- a/pr_agent/servers/github_polling.py
+++ b/pr_agent/servers/github_polling.py
@ -130,14 +130,12 @@ 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().warning(f"Failed to fetch comments for PR: {pr_url}",
-                                                    artifact={"comments": comments})
+                            get_logger().error(f"Failed to fetch comments for PR: {pr_url}")
                            return False, handled_ids

        return False, handled_ids
    except Exception as e:
-        get_logger().exception(f"Error processing polling notification",
-                               artifact={"notification": notification, "error": e})
+        get_logger().error(f"Error processing notification: {e}", artifact={"traceback": traceback.format_exc()})
        return False, handled_ids


--- a/pr_agent/settings/configuration.toml
+++ b/pr_agent/settings/configuration.toml
@ -71,6 +71,7 @@ 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 #
@ -121,9 +122,6 @@ 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
@ -310,16 +308,7 @@ 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
--- a/pr_agent/settings/pr_code_suggestions_prompts.toml
+++ b/pr_agent/settings/pr_code_suggestions_prompts.toml
@ -17,36 +17,30 @@ The PR code diff will be in the following structured format:

@@ ... @@ def func1():
 __new hunk__
- unchanged code line0
- unchanged code line1
-+new code line2 added
- unchanged code line3
+ unchanged code line0 in the PR
+ unchanged code line1 in the PR
+new code line2 added in the PR
+ unchanged code line3 in the PR
 __old hunk__
 unchanged code line0
 unchanged code line1
-old code line2 removed
+-old code line2 removed in the PR
 unchanged code line3

@@ ... @@ def func2():
 __new hunk__
 unchanged code line4
-+new code line5 added
+new code line5 removed in the PR
 unchanged code line6

 ## File: 'src/file2.py'
 ...
 ======

-Important notes about the structured diff format above:
-1. Each PR code chunk is decoupled into separate '__new hunk__' and '__old hunk__' sections:
-  - The '__new hunk__' section shows the code chunk AFTER the PR changes.
-  - The '__old hunk__' section shows the code chunk BEFORE the PR changes. If no code was removed from the chunk, the '__old hunk__' section will be omitted.
-2. The diff uses line prefixes to show changes:
-  '+' → new line code added (will appear only in '__new hunk__')
-  '-' → line code removed (will appear only in '__old hunk__')
-  ' ' → unchanged context lines (will appear in both sections)
+- In the format above, the diff is organized into separate '__new hunk__' and '__old hunk__' sections for each code chunk. '__new hunk__' contains the updated code, while '__old hunk__' shows the removed code. If no code was removed in a specific chunk, the __old hunk__ section will be omitted.
+- Code lines are prefixed with symbols: '+' for new code added in the PR, '-' for code removed, and ' ' for unchanged code.
 {%- if is_ai_metadata %}
-3. When available, an AI-generated summary will precede each file's diff, with a high-level overview of the changes. Note that this summary may not be fully accurate or complete.
+- When available, an AI-generated summary will precede each file's diff, with a high-level overview of the changes. Note that this summary may not be fully accurate or complete.
 {%- endif %}


@ -56,17 +50,16 @@ Specific guidelines for generating code suggestions:
 {%- else %}
 - Provide up to {{ num_code_suggestions }} distinct and insightful code suggestions. Return less suggestions if no pertinent ones are applicable.
 {%- endif %}
- DO NOT suggest implementing changes that are already present in the '+' lines compared to the '-' lines.
- Focus your suggestions ONLY on new code introduced in the PR ('+' lines in '__new hunk__' sections).
+- Focus solely on enhancing new code introduced in the PR, identified by '+' prefixes in '__new hunk__' sections.
 {%- if not focus_only_on_problems %}
 - Prioritize suggestions that address potential issues, critical problems, and bugs in the PR code. Avoid repeating changes already implemented in the PR. If no pertinent suggestions are applicable, return an empty list.
 - Don't suggest to add docstring, type hints, or comments, to remove unused imports, or to use more specific exception types.
 {%- else %}
 - Only give suggestions that address critical problems and bugs in the PR code. If no relevant suggestions are applicable, return an empty list.
- Do not suggest to change packages version, add missing import statement, or declare undefined variable.
+- Do not suggest to change packages versions.
 {%- 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 declarations or import statements) that may be defined elsewhere in the codebase.
+- Remember that Pull Request reviews show only changed code segments (diff hunks), not the entire codebase. Without full context, be cautious about suggesting modifications that could duplicate existing functionality (such as error handling) or questioning variable declarations that may exist elsewhere. Keep your review focused on the visible changes, acknowledging they're part of a larger codebase.

 {%- if extra_instructions %}

@ -84,13 +77,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 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.")
+    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.")
    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.")
+    one_sentence_summary: str = Field(description="A concise, single-sentence overview 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 not 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 necessarily on a critical level.")
 {%- endif %}


--- a/pr_agent/settings/pr_code_suggestions_reflect_prompts.toml
+++ b/pr_agent/settings/pr_code_suggestions_reflect_prompts.toml
@ -49,14 +49,14 @@ The PR code diff will be presented in the following structured format:

@@ ... @@ def func1():
 __new hunk__
-11  unchanged code line0
-12  unchanged code line1
-13 +new code line2 added
-14  unchanged code line3
+11  unchanged code line0 in the PR
+12  unchanged code line1 in the PR
+13 +new code line2 added in the PR
+14  unchanged code line3 in the PR
 __old hunk__
 unchanged code line0
 unchanged code line1
-old code line2 removed
+-old code line2 removed in the PR
 unchanged code line3

@@ ... @@ def func2():
--- a/pr_agent/settings/pr_reviewer_prompts.toml
+++ b/pr_agent/settings/pr_reviewer_prompts.toml
@ -16,20 +16,20 @@ The format we will use to present the PR code diff:

@@ ... @@ def func1():
 __new hunk__
-11  unchanged code line0
-12  unchanged code line1
-13 +new code line2 added
-14  unchanged code line3
+11  unchanged code line0 in the PR
+12  unchanged code line1 in the PR
+13 +new code line2 added in the PR
+14  unchanged code line3 in the PR
 __old hunk__
 unchanged code line0
 unchanged code line1
-old code line2 removed
+-old code line2 removed in the PR
 unchanged code line3

@@ ... @@ def func2():
 __new hunk__
 unchanged code line4
-+new code line5 removed
+new code line5 removed in the PR
 unchanged code line6

 ## File: 'src/file2.py'
@ -43,7 +43,7 @@ __new hunk__
 {%- if is_ai_metadata %}
 - If available, an AI-generated summary will appear and provide a high-level overview of the file changes. Note that this summary may not be fully accurate or complete.
 {%- endif %}
- When quoting variables, names or file paths from the code, use backticks (`) instead of single quote (').
+- When quoting variables or names from the code, use backticks (`) instead of single quote (').


 {%- if extra_instructions %}
@ -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 (in bullet points), all the requirements, sub-tasks, DoD, and acceptance criteria raised by the ticket")
-    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="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")
-    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")
+    ticket_requirements: str = Field(description="Repeat, in your own words, all ticket requirements, in bullet points")
+    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")
+    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")
+    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'")
 {%- endif %}

 class Review(BaseModel):
--- a/pr_agent/tools/pr_code_suggestions.py
+++ b/pr_agent/tools/pr_code_suggestions.py
@ -720,7 +720,7 @@ class PRCodeSuggestions:
            header = f"Suggestion"
            delta = 66
            header += "&nbsp; " * delta
-            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 += f"""<thead><tr><td>Category</td><td align=left>{header}</td><td align=center>Score</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}>{label.capitalize()}</td>\n"""
+                pr_body += f"""<tr><td rowspan={num_suggestions}><strong>{label.capitalize()}</strong></td>\n"""
                for i, suggestion in enumerate(suggestions):

                    relevant_file = suggestion['relevant_file'].strip()
@ -794,19 +794,14 @@ class PRCodeSuggestions:

 {example_code.rstrip()}
 """
-                    if suggestion.get('score_why'):
-                        pr_body += f"<details><summary>Suggestion importance[1-10]: {suggestion['score']}</summary>\n\n"
-                        pr_body += f"__\n\nWhy: {suggestion['score_why']}\n\n"
-                        pr_body += f"</details>"
+                    pr_body += f"<details><summary>Suggestion importance[1-10]: {suggestion['score']}</summary>\n\n"
+                    pr_body += f"Why: {suggestion['score_why']}\n\n"
+                    pr_body += f"</details>"

                    pr_body += f"</details>"

                    # # add another column for 'score'
-                    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><td align=center>{suggestion['score']}\n\n"

                    pr_body += f"</td></tr>"
                    counter_suggestions += 1
@ -819,16 +814,6 @@ 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,
--- a/pr_agent/tools/pr_description.py
+++ b/pr_agent/tools/pr_description.py
@ -134,18 +134,8 @@ 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 and self.git_provider.is_supported("gfm_markdown"):
-                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'
+            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):
--- a/pr_agent/tools/pr_help_message.py
+++ b/pr_agent/tools/pr_help_message.py
@ -174,11 +174,10 @@ 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"[IMPLEMENT]({base_path}/implement/) 💎")
+                tool_names.append(f"[SIMILAR ISSUE]({base_path}/similar_issues/)")

                descriptions = []
                descriptions.append("Generates PR description - title, type, summary, code walkthrough and labels")
@ -190,11 +189,10 @@ 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("Generates implementation code from review suggestions")
+                descriptions.append("Automatically retrieves and presents similar issues")

                commands  =[]
                commands.append("`/describe`")
@ -206,11 +204,10 @@ 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("`/implement`")
+                commands.append("`/similar_issue`")

                checkbox_list = []
                checkbox_list.append(" - [ ] Run <!-- /describe -->")
@ -229,7 +226,6 @@ 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>"
--- a/pr_agent/tools/pr_reviewer.py
+++ b/pr_agent/tools/pr_reviewer.py
@ -384,7 +384,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') and not label.lower().startswith(
+                                               not label.lower().startswith('review effort [1-5]:') and not label.lower().startswith(
                                                   'possible security concern')]
                else:
                    current_labels_filtered = []
@ -402,6 +402,20 @@ class PRReviewer:
        Auto-approve a pull request if it meets the conditions for auto-approval.
        """
        if get_settings().pr_reviewer.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")
--- a/pr_agent/tools/ticket_pr_compliance_check.py
+++ b/pr_agent/tools/ticket_pr_compliance_check.py
@ -51,11 +51,6 @@ 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()})
--- a/pyproject.toml
+++ b/pyproject.toml
@ -31,7 +31,7 @@ dynamic = ["dependencies"]
 dependencies = { file = ["requirements.txt"] }

 [project.urls]
-"Homepage" = "https://github.com/qodo-ai/pr-agent"
+"Homepage" = "https://github.com/Codium-ai/pr-agent"
 "Documentation" = "https://pr-agent-docs.codium.ai/"

 [tool.setuptools]
--- a/setup.py
+++ b/setup.py
@ -3,3 +3,4 @@
 from setuptools import setup

 setup()
+print("aaa")