Generated best practices file

fix: add timeout to asyncio.wait during CLI execution to avoid hanging when callback is enabled

.dockerignore

@@ -1,3 +1,4 @@
+.venv/
 venv/
 pr_agent/settings/.secrets.toml
 pics/

.github/workflows/build-and-test.yaml

@@ -14,15 +14,15 @@ jobs:
 
     steps:
       - id: checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - id: dockerx
         name: Setup Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - id: build
         name: Build dev docker
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: ./docker/Dockerfile

.github/workflows/code_coverage.yaml

@@ -15,15 +15,15 @@ jobs:
 
     steps:
       - id: checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - id: dockerx
         name: Setup Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - id: build
         name: Build dev docker
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: ./docker/Dockerfile
@@ -41,7 +41,6 @@ jobs:
           docker cp test_container:/app/coverage.xml coverage.xml
           docker rm test_container
 
-
       - name: Validate coverage report
         run: |
           if [ ! -f coverage.xml ]; then
@@ -49,6 +48,6 @@ jobs:
             exit 1
           fi
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v4.0.1
+        uses: codecov/codecov-action@v5
         with:
           token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/e2e_tests.yaml

@@ -11,14 +11,14 @@ jobs:
     name: PR-Agent E2E GitHub App Test
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Setup Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - id: build
         name: Build dev docker
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: ./docker/Dockerfile
@@ -32,14 +32,13 @@ jobs:
       - id: test1
         name: E2E test github app
         run: |
-           docker run -e GITHUB.USER_TOKEN=${{ secrets.TOKEN_GITHUB }} --rm codiumai/pr-agent:test pytest -v tests/e2e_tests/test_github_app.py
+          docker run -e GITHUB.USER_TOKEN=${{ secrets.TOKEN_GITHUB }} --rm codiumai/pr-agent:test pytest -v tests/e2e_tests/test_github_app.py
 
       - id: test2
         name: E2E gitlab webhook
         run: |
           docker run -e gitlab.PERSONAL_ACCESS_TOKEN=${{ secrets.TOKEN_GITLAB }} --rm codiumai/pr-agent:test pytest -v tests/e2e_tests/test_gitlab_webhook.py
 
-
       - id: test3
         name: E2E bitbucket app
         run: |

.github/workflows/pre-commit.yml

@@ -11,7 +11,7 @@ jobs:
   pre-commit:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
       # SEE https://github.com/pre-commit/action
       - uses: pre-commit/action@v3.0.1

.gitignore

@@ -2,6 +2,7 @@
 .lsp/
 .vscode/
 .env
+.venv/
 venv/
 pr_agent/settings/.secrets.toml
 __pycache__
@@ -11,3 +12,4 @@ build/
 .DS_Store
 docs/.cache/
 .qodo
+poetry.lock

CHANGELOG.md

@@ -1,6 +1,7 @@
 ## 2023-08-03
 
 ### Optimized
+
 - Optimized PR diff processing by introducing caching for diff files, reducing the number of API calls.
 - Refactored `load_large_diff` function to generate a patch only when necessary.
 - Fixed a bug in the GitLab provider where the new file was not retrieved correctly.
@@ -8,6 +9,7 @@
 ## 2023-08-02
 
 ### Enhanced
+
 - Updated several tools in the `pr_agent` package to use commit messages in their functionality.
 - Commit messages are now retrieved and stored in the `vars` dictionary for each tool.
 - Added a section to display the commit messages in the prompts of various tools.
@@ -15,6 +17,7 @@
 ## 2023-08-01
 
 ### Enhanced
+
 - Introduced the ability to retrieve commit messages from pull requests across different git providers.
 - Implemented commit messages retrieval for GitHub and GitLab providers.
 - Updated the PR description template to include a section for commit messages if they exist.
@@ -22,10 +25,10 @@
 - Implemented this feature for both GitHub and GitLab providers.
 - Added a new configuration option 'use_repo_settings_file' to enable or disable the use of a repo-specific settings file.
 
-
 ## 2023-07-30
 
 ### Enhanced
+
 - Added the ability to modify any configuration parameter from 'configuration.toml' on-the-fly.
 - Updated the command line interface and bot commands to accept configuration changes as arguments.
 - Improved the PR agent to handle additional arguments for each action.
@@ -33,6 +36,7 @@
 ## 2023-07-28
 
 ### Improved
+
 - Enhanced error handling and logging in the GitLab provider.
 - Improved handling of inline comments and code suggestions in GitLab.
 - Fixed a bug where an additional unneeded line was added to code suggestions in GitLab.
@@ -40,6 +44,7 @@
 ## 2023-07-26
 
 ### Added
+
 - New feature for updating the CHANGELOG.md based on the contents of a PR.
 - Added support for this feature for the Github provider.
 - New configuration settings and prompts for the changelog update feature.

CODE_OF_CONDUCT.md

@@ -42,4 +42,3 @@ with regard to the reporter of an incident.
 This Code of Conduct is adapted from the
 [Contributor Covenant](https://contributor-covenant.org), version 1.3.0, available at
 [contributor-covenant.org/version/1/3/0/](https://contributor-covenant.org/version/1/3/0/)
-

CONTRIBUTING.md

@@ -1,6 +1,6 @@
 # Contributing to PR-Agent
 
-Thank you for your interest in contributing to the PR-Agent project! 
+Thank you for your interest in contributing to the PR-Agent project!
 
 ## Getting Started
 

Dockerfile.github_action

@@ -1,4 +1,6 @@
-FROM python:3.12 as base
+FROM python:3.12.10-slim AS base
+
+RUN apt-get update && apt-get install --no-install-recommends -y git curl && apt-get clean && rm -rf /var/lib/apt/lists/*
 
 WORKDIR /app
 ADD pyproject.toml .

README.md

@@ -2,7 +2,6 @@
 
 <div align="center">
 
-
 <picture>
   <source media="(prefers-color-scheme: dark)" srcset="https://www.qodo.ai/wp-content/uploads/2025/02/PR-Agent-Purple-2.png">
   <source media="(prefers-color-scheme: light)" srcset="https://www.qodo.ai/wp-content/uploads/2025/02/PR-Agent-Purple-2.png">
@@ -11,9 +10,9 @@
 </picture>
 <br/>
 
- [Installation Guide](https://qodo-merge-docs.qodo.ai/installation/) | 
-[Usage Guide](https://qodo-merge-docs.qodo.ai/usage-guide/) | 
-[Tools Guide](https://qodo-merge-docs.qodo.ai/tools/) | 
+[Installation Guide](https://qodo-merge-docs.qodo.ai/installation/) |
+[Usage Guide](https://qodo-merge-docs.qodo.ai/usage-guide/) |
+[Tools Guide](https://qodo-merge-docs.qodo.ai/tools/) |
 [Qodo Merge](https://qodo-merge-docs.qodo.ai/overview/pr_agent_pro/) 💎
 
 PR-Agent aims to help efficiently review and handle pull requests, by providing AI feedback and suggestions
@@ -22,7 +21,7 @@ PR-Agent aims to help efficiently review and handle pull requests, by providing
 [![Static Badge](https://img.shields.io/badge/Chrome-Extension-violet)](https://chromewebstore.google.com/detail/qodo-merge-ai-powered-cod/ephlnjeghhogofkifjloamocljapahnl)
 [![Static Badge](https://img.shields.io/badge/Pro-App-blue)](https://github.com/apps/qodo-merge-pro/)
 [![Static Badge](https://img.shields.io/badge/OpenSource-App-red)](https://github.com/apps/qodo-merge-pro-for-open-source/)
-[![Discord](https://badgen.net/badge/icon/discord?icon=discord&label&color=purple)](https://discord.com/channels/1057273017547378788/1126104260430528613)
+[![Discord](https://badgen.net/badge/icon/discord?icon=discord&label&color=purple)](https://discord.com/invite/SgSxuQ65GF)
 <a href="https://github.com/Codium-ai/pr-agent/commits/main">
 <img alt="GitHub" src="https://img.shields.io/github/last-commit/Codium-ai/pr-agent/main?style=for-the-badge" height="20">
 </a>
@@ -39,7 +38,6 @@ PR-Agent aims to help efficiently review and handle pull requests, by providing
 [//]: # ()
 [//]: # (- See the [Tools Guide]&#40;https://qodo-merge-docs.qodo.ai/tools/&#41; for a detailed description of the different tools, and the available configurations for each tool.)
 
-
 ## Table of Contents
 
 - [News and Updates](#news-and-updates)
@@ -49,91 +47,92 @@ PR-Agent aims to help efficiently review and handle pull requests, by providing
 - [Qodo Merge](https://qodo-merge-docs.qodo.ai/overview/pr_agent_pro/)
 - [How it works](#how-it-works)
 - [Why use PR-Agent?](#why-use-pr-agent)
+- [Data privacy](#data-privacy)
+- [Contributing](#contributing)
+- [Links](#links)
 
 ## News and Updates
 
-### Feb 28, 2025
-A new version, v0.27, was released. See release notes [here](https://github.com/qodo-ai/pr-agent/releases/tag/v0.27).
+## Apr 30, 2025
 
-### Feb 27, 2025
-- Updated the default model to `o3-mini` for all tools. You can still use the `gpt-4o` as the default model by setting the `model` parameter in the configuration file.
-- Important updates and bug fixes for Azure DevOps, see [here](https://github.com/qodo-ai/pr-agent/pull/1583)
-- Added support for adjusting the [response language](https://qodo-merge-docs.qodo.ai/usage-guide/additional_configurations/#language-settings) of the PR-Agent tools.
+A new feature is now available in the `/improve` tool for Qodo Merge 💎 - Chat on code suggestions.
 
-### Feb 6, 2025
-New design for the `/improve` tool:
+<img width="512" alt="image" src="https://codium.ai/images/pr_agent/improve_chat_on_code_suggestions_ask.png" />
 
-<kbd><img src="https://github.com/user-attachments/assets/26506430-550e-469a-adaa-af0a09b70c6d" width="512"></kbd>
+Read more about it [here](https://qodo-merge-docs.qodo.ai/tools/improve/#chat-on-code-suggestions).
 
-### Jan 25, 2025
+## Apr 16, 2025
 
-The open-source GitHub organization was updated:
-`https://github.com/codium-ai/pr-agent` →
-`https://github.com/qodo-ai/pr-agent`
+New tool for Qodo Merge 💎 - `/scan_repo_discussions`.
 
-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`
+<img width="635" alt="image" src="https://codium.ai/images/pr_agent/scan_repo_discussions_2.png" />
 
+Read more about it [here](https://qodo-merge-docs.qodo.ai/tools/scan_repo_discussions/).
 
-### Jan 2, 2025
+## Apr 14, 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.
+GPT-4.1 is out. And it's quite good on coding tasks...
 
-<kbd><img src="https://www.qodo.ai/images/pr_agent/implement1.png?v=2" width="512"></kbd>
+https://openai.com/index/gpt-4-1/
 
+<img width="512" alt="image" src="https://github.com/user-attachments/assets/a8f4c648-a058-4bdc-9825-2a4bb71a23e5" />
 
-### December 30, 2024
+## March 28, 2025
 
-Following feedback from the community, we have addressed two vulnerabilities identified in the open-source PR-Agent project. The [fixes](https://github.com/qodo-ai/pr-agent/pull/1425) are now included in the newly released version (v0.26), available as of today.
+A new version, v0.28, was released. See release notes [here](https://github.com/qodo-ai/pr-agent/releases/tag/v0.28).
 
+This version includes a new tool, [Help Docs](https://qodo-merge-docs.qodo.ai/tools/help_docs/), which can answer free-text questions based on a documentation folder.
+
+`/help_docs` is now being used to provide immediate automatic feedback to any user who [opens an issue](https://github.com/qodo-ai/pr-agent/issues/1608#issue-2897328825) on PR-Agent's open-source project
 
 ## Overview
+
 <div style="text-align:left;">
 
 Supported commands per platform:
 
-|       |                                                                                                         | 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://qodo-merge-docs.qodo.ai/tools/ask/#ask-lines)                             | ✅ | ✅ |           |              |
-|       | [Update CHANGELOG](https://qodo-merge-docs.qodo.ai/tools/update_changelog/)                             | ✅ | ✅ |     ✅     |      ✅       |
-|       | [Help Docs](https://qodo-merge-docs.qodo.ai/tools/help_docs/?h=auto#auto-approval)                      |   ✅    |   ✅    |   ✅        |            |
-|       | [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/) 💎                                        | ✅ | ✅ |     ✅     |              |
-|       | [Auto-Approve](https://qodo-merge-docs.qodo.ai/tools/improve/?h=auto#auto-approval) 💎                  |   ✅    |   ✅    |   ✅        |            |
-|       |                                                                                                         |                    |                    |           |              |
-| USAGE | [CLI](https://qodo-merge-docs.qodo.ai/usage-guide/automations_and_usage/#local-repo-cli)                | ✅ | ✅ |     ✅     |      ✅       |
-|       | [App / webhook](https://qodo-merge-docs.qodo.ai/usage-guide/automations_and_usage/#github-app)          | ✅ | ✅ |     ✅     |      ✅       |
-|       | [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://qodo-merge-docs.qodo.ai/usage-guide/configuration_options/) 💎 | ✅ | ✅ |     ✅     |              |
-|       | [PR interactive actions](https://www.qodo.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/)
+|       |                                                                                                         | 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://qodo-merge-docs.qodo.ai/tools/ask/#ask-lines)                             |   ✅   |   ✅   |           |              |
+|       | [Update CHANGELOG](https://qodo-merge-docs.qodo.ai/tools/update_changelog/)                             |   ✅   |   ✅   |    ✅     |      ✅      |
+|       | [Help Docs](https://qodo-merge-docs.qodo.ai/tools/help_docs/?h=auto#auto-approval)                      |   ✅   |   ✅   |    ✅     |              |
+|       | [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/) 💎                                        |   ✅   |   ✅   |    ✅     |              |
+|       | [Scan Repo Discussions](https://qodo-merge-docs.qodo.ai/tools/scan_repo_discussions/) 💎                |   ✅   |        |           |              |
+|       | [Auto-Approve](https://qodo-merge-docs.qodo.ai/tools/improve/?h=auto#auto-approval) 💎                  |   ✅   |   ✅   |    ✅     |              |
+|       |                                                                                                         |        |        |           |              |
+| USAGE | [CLI](https://qodo-merge-docs.qodo.ai/usage-guide/automations_and_usage/#local-repo-cli)                |   ✅   |   ✅   |    ✅     |      ✅      |
+|       | [App / webhook](https://qodo-merge-docs.qodo.ai/usage-guide/automations_and_usage/#github-app)          |   ✅   |   ✅   |    ✅     |      ✅      |
+|       | [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://qodo-merge-docs.qodo.ai/usage-guide/configuration_options/) 💎 |   ✅   |   ✅   |    ✅     |              |
+|       | [PR interactive actions](https://www.qodo.ai/images/pr_agent/pr-actions.mp4) 💎                         |   ✅   |   ✅   |           |              |
+|       | [Impact Evaluation](https://qodo-merge-docs.qodo.ai/core-abilities/impact_evaluation/) 💎               |   ✅   |   ✅   |           |              |
+|       | [Code Validation 💎](https://qodo-merge-docs.qodo.ai/core-abilities/code_validation/)                   |   ✅   |   ✅   |    ✅     |      ✅      |
+|       | [Auto Best Practices 💎](https://qodo-merge-docs.qodo.ai/core-abilities/auto_best_practices/)                     |   ✅   |      |         |            |
+- 💎 means this feature is available only in [Qodo Merge](https://www.qodo.ai/pricing/)
 
 [//]: # (- Support for additional git providers is described in [here]&#40;./docs/Full_environments.md&#41;)
 ___
@@ -170,6 +169,7 @@ ___
 ___
 
 ## Example results
+
 </div>
 <h4><a href="https://github.com/Codium-ai/pr-agent/pull/530">/describe</a></h4>
 <div align="center">
@@ -198,40 +198,37 @@ ___
 </p>
 </div>
 
-
 <div align="left">
 
-
 </div>
 <hr>
 
-
 ## Try it now
 
 Try the Claude Sonnet powered PR-Agent instantly on _your public GitHub repository_. Just mention `@CodiumAI-Agent` and add the desired command in any PR comment. The agent will generate a response based on your command.
 For example, add a comment to any pull request with the following text:
+
 ```
 @CodiumAI-Agent /review
 ```
+
 and the agent will respond with a review of your PR.
 
 Note that this is a promotional bot, suitable only for initial experimentation.
 It does not have 'edit' access to your repo, for example, so it cannot update the PR description or add labels (`@CodiumAI-Agent /describe` will publish PR description as a comment). In addition, the bot cannot be used on private repositories, as it does not have access to the files there.
 
-
 ---
 
-
 ## 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.
+
+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.
+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.
 
-
-
 ## How it works
 
 The following diagram illustrates PR-Agent tools and their flow:
@@ -249,8 +246,7 @@ Here are some advantages of PR-Agent:
 - We emphasize **real-life practical usage**. Each tool (review, improve, ask, ...) has a single LLM 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 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, Claude, Deepseek, ...)
-
+- We support **multiple git providers** (GitHub, GitLab, BitBucket), **multiple ways** to use the tool (CLI, GitHub Action, GitHub App, Docker, ...), and **multiple models** (GPT, Claude, Deepseek, ...)
 
 ## Data privacy
 
@@ -271,6 +267,10 @@ https://openai.com/enterprise-privacy
 
 - 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.
 
+## Contributing
+
+To contribute to the project, get started by reading our [Contributing Guide](https://github.com/qodo-ai/pr-agent/blob/b09eec265ef7d36c232063f76553efb6b53979ff/CONTRIBUTING.md).
+
 ## Links
 
 - Discord community: https://discord.gg/kG35uSHDBc

RELEASE_NOTES.md

@@ -1,4 +1,5 @@
 ## [Version 0.11] - 2023-12-07
+
 - codiumai/pr-agent:0.11
 - codiumai/pr-agent:0.11-github_app
 - codiumai/pr-agent:0.11-bitbucket-app
@@ -7,16 +8,18 @@
 - codiumai/pr-agent:0.11-github_action
 
 ### Added::Algo
+
 - New section in `/describe` tool - [PR changes walkthrough](https://github.com/Codium-ai/pr-agent/pull/509)
 - Improving PR Agent [prompts](https://github.com/Codium-ai/pr-agent/pull/501)
 - Persistent tools (`/review`, `/describe`) now send an [update message](https://github.com/Codium-ai/pr-agent/pull/499) after finishing
 - Add Amazon Bedrock [support](https://github.com/Codium-ai/pr-agent/pull/483)
 
 ### Fixed
+
 - Update [dependencies](https://github.com/Codium-ai/pr-agent/pull/503) in requirements.txt for Python 3.12
 
-
 ## [Version 0.10] - 2023-11-15
+
 - codiumai/pr-agent:0.10
 - codiumai/pr-agent:0.10-github_app
 - codiumai/pr-agent:0.10-bitbucket-app
@@ -25,6 +28,7 @@
 - codiumai/pr-agent:0.10-github_action
 
 ### Added::Algo
+
 - Review tool now works with [persistent comments](https://github.com/Codium-ai/pr-agent/pull/451) by default
 - Bitbucket now publishes review suggestions with [code links](https://github.com/Codium-ai/pr-agent/pull/428)
 - Enabling to limit [max number of tokens](https://github.com/Codium-ai/pr-agent/pull/437/files)
@@ -34,11 +38,13 @@
 - Decoupled custom labels from [PR type](https://github.com/Codium-ai/pr-agent/pull/431)
 
 ### Fixed
+
 - Fixed bug in [parsing quotes](https://github.com/Codium-ai/pr-agent/pull/446) in CLI
 - Preserve [user-added labels](https://github.com/Codium-ai/pr-agent/pull/433) in pull requests
 - Bug fixes in GitLab and BitBucket
 
 ## [Version 0.9] - 2023-10-29
+
 - codiumai/pr-agent:0.9
 - codiumai/pr-agent:0.9-github_app
 - codiumai/pr-agent:0.9-bitbucket-app
@@ -47,6 +53,7 @@
 - codiumai/pr-agent:0.9-github_action
 
 ### Added::Algo
+
 - New tool - [generate_labels](https://github.com/Codium-ai/pr-agent/blob/main/docs/GENERATE_CUSTOM_LABELS.md)
 - New ability to use [customize labels](https://github.com/Codium-ai/pr-agent/blob/main/docs/GENERATE_CUSTOM_LABELS.md#how-to-enable-custom-labels) on the `review` and `describe` tools.
 - New tool - [add_docs](https://github.com/Codium-ai/pr-agent/blob/main/docs/ADD_DOCUMENTATION.md)
@@ -56,14 +63,17 @@
 - PR Description default mode is now in [bullet points](https://github.com/Codium-ai/pr-agent/blob/main/pr_agent/settings/configuration.toml#L35).
 
 ### Added::Documentation
+
 Significant documentation updates (see [Installation Guide](https://github.com/Codium-ai/pr-agent/blob/main/INSTALL.md), [Usage Guide](https://github.com/Codium-ai/pr-agent/blob/main/Usage.md), and [Tools Guide](https://github.com/Codium-ai/pr-agent/blob/main/docs/TOOLS_GUIDE.md))
 
 ### Fixed
+
 - Fixed support for BitBucket pipeline (see [link](https://github.com/Codium-ai/pr-agent/pull/386))
 - Fixed a bug in `review -i` tool
 - Added blacklist for specific file extensions in `add_docs` tool (see [link](https://github.com/Codium-ai/pr-agent/pull/385/))
 
 ## [Version 0.8] - 2023-09-27
+
 - codiumai/pr-agent:0.8
 - codiumai/pr-agent:0.8-github_app
 - codiumai/pr-agent:0.8-bitbucket-app
@@ -72,16 +82,18 @@ Significant documentation updates (see [Installation Guide](https://github.com/C
 - codiumai/pr-agent:0.8-github_action
 
 ### Added::Algo
+
 - GitHub Action: Can control which tools will run automatically when a new PR is created. (see usage guide: https://github.com/Codium-ai/pr-agent/blob/main/Usage.md#working-with-github-action)
 - Code suggestion tool: Will try to avoid an 'add comments' suggestion  (see https://github.com/Codium-ai/pr-agent/pull/327)
 
 ### Fixed
-- Gitlab: Fixed a bug of improper usage of pr_id
 
+- Gitlab: Fixed a bug of improper usage of pr_id
 
 ## [Version 0.7] - 2023-09-20
 
 ### Docker Tags
+
 - codiumai/pr-agent:0.7
 - codiumai/pr-agent:0.7-github_app
 - codiumai/pr-agent:0.7-bitbucket-app
@@ -90,14 +102,17 @@ Significant documentation updates (see [Installation Guide](https://github.com/C
 - codiumai/pr-agent:0.7-github_action
 
 ### Added::Algo
+
 - New tool /similar_issue - Currently on GitHub app and CLI: indexes the issues in the repo, find the most similar issues to the target issue.
 - Describe markers: Empower the /describe tool with a templating capability (see more details in https://github.com/Codium-ai/pr-agent/pull/273).
 - New feature in the /review tool - added an estimated effort estimation to the review (https://github.com/Codium-ai/pr-agent/pull/306).
 
 ### Added::Infrastructure
+
 - Implementation of a GitLab webhook.
 - Implementation of a BitBucket app.
 
 ### Fixed
+
 - Protection against no code suggestions generated.
 - Resilience to repositories where the languages cannot be automatically detected.

SECURITY.md

@@ -1,6 +1,6 @@
 # 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. 
+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).
 
@@ -9,13 +9,13 @@ This document describes the security policy of PR-Agent. For Qodo Merge's securi
 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.
@@ -25,6 +25,7 @@ This section outlines which versions of PR-Agent are currently supported with se
 #### Latest Version
 
 For the most recent updates, use our latest Docker image which is automatically built nightly:
+
 ```yaml
 uses: qodo-ai/pr-agent@main
 ```
@@ -46,6 +47,7 @@ steps:
 #### Enhanced Security with Docker Digest
 
 For maximum security, you can specify the Docker image using its digest:
+
 ```yaml
 steps:
   - name: PR Agent action step

best_practices.md

@@ -0,0 +1,206 @@
+
+<b>Pattern 1: Always wrap API calls and potentially error-prone operations with try-except blocks to ensure proper error handling and prevent application crashes.</b>
+
+Example code before:
+```
+response = client.messages.count_tokens(
+    model="claude-3-7-sonnet-20250219",
+    system="system",
+    messages=[{
+        "role": "user",
+        "content": patch
+    }],
+)
+return response.input_tokens
+```
+
+Example code after:
+```
+try:
+    response = client.messages.count_tokens(
+        model="claude-3-7-sonnet-20250219",
+        system="system",
+        messages=[{
+            "role": "user",
+            "content": patch
+        }],
+    )
+    return response.input_tokens
+except Exception as api_error:
+    get_logger().error(f"Error in API call: {api_error}")
+    return fallback_value
+```
+
+<details><summary>Examples for relevant past discussions:</summary>
+
+- https://github.com/qodo-ai/pr-agent/pull/1644#discussion_r2068039198
+- https://github.com/qodo-ai/pr-agent/pull/1644#discussion_r2013912636
+- https://github.com/qodo-ai/pr-agent/pull/1263#discussion_r1782129216
+</details>
+
+
+___
+
+<b>Pattern 2: Replace print statements with proper logging using get_logger() to ensure consistent error tracking and monitoring across the application.</b>
+
+Example code before:
+```
+print(f"Failed to fetch sub-issues. Error: {e}")
+```
+
+Example code after:
+```
+get_logger().error(f"Failed to fetch sub-issues", artifact={"error": e})
+```
+
+<details><summary>Examples for relevant past discussions:</summary>
+
+- https://github.com/qodo-ai/pr-agent/pull/1529#discussion_r1958684550
+- https://github.com/qodo-ai/pr-agent/pull/1529#discussion_r1958686068
+- https://github.com/qodo-ai/pr-agent/pull/1529#discussion_r1964107962
+- https://github.com/qodo-ai/pr-agent/pull/1634#discussion_r2007976915
+</details>
+
+
+___
+
+<b>Pattern 3: Validate input parameters before processing to prevent runtime errors, especially when working with optional or user-provided data.</b>
+
+Example code before:
+```
+if not (comment_id or (file_path and line_number)):
+    return
+```
+
+Example code after:
+```
+# Return if any required parameter is missing
+if not all([comment_id, file_path, line_number]):
+    get_logger().info("Missing required parameters for conversation history")
+    return
+```
+
+<details><summary>Examples for relevant past discussions:</summary>
+
+- https://github.com/qodo-ai/pr-agent/pull/1687#discussion_r2036939244
+- https://github.com/qodo-ai/pr-agent/pull/1290#discussion_r1798939921
+- https://github.com/qodo-ai/pr-agent/pull/1529#discussion_r1958698147
+</details>
+
+
+___
+
+<b>Pattern 4: Use defensive programming when handling external API responses or data structures to account for unexpected formats or missing fields.</b>
+
+Example code before:
+```
+model = get_settings().config.model.lower()
+if force_accurate and 'claude' in model and get_settings(use_context=False).get('anthropic.key'):
+    return self.calc_claude_tokens(patch)
+```
+
+Example code after:
+```
+# Ensure model is a string and not None before operations
+if model is None:
+    get_logger().warning("Model is None, cannot determine model type accurately")
+    return encoder_estimate
+
+if not isinstance(model, str):
+    get_logger().warning(f"Model is not a string type: {type(model)}")
+    return encoder_estimate
+    
+if force_accurate and 'claude' in model.lower() and get_settings(use_context=False).get('anthropic.key'):
+    return self.calc_claude_tokens(patch)
+```
+
+<details><summary>Examples for relevant past discussions:</summary>
+
+- https://github.com/qodo-ai/pr-agent/pull/1644#discussion_r2032621065
+- https://github.com/qodo-ai/pr-agent/pull/1391#discussion_r1879875489
+- https://github.com/qodo-ai/pr-agent/pull/1391#discussion_r1879875496
+</details>
+
+
+___
+
+<b>Pattern 5: Optimize code to reduce unnecessary API calls and improve performance, especially when working with external services or databases.</b>
+
+Example code before:
+```
+# Get the original comment to find its location
+comment = self.pr.get_comment(comment_id)
+if not comment:
+    return []
+    
+# Get all comments
+all_comments = list(self.pr.get_comments())
+```
+
+Example code after:
+```
+# Fetch all comments with a single API call
+all_comments = list(self.pr.get_comments())
+
+# Find the target comment by ID
+target_comment = next((c for c in all_comments if c.id == comment_id), None)
+if not target_comment:
+    return []
+```
+
+<details><summary>Examples for relevant past discussions:</summary>
+
+- https://github.com/qodo-ai/pr-agent/pull/1687#discussion_r2051644060
+- https://github.com/qodo-ai/pr-agent/pull/1555#discussion_r1963228113
+- https://github.com/qodo-ai/pr-agent/pull/1687#discussion_r2051640437
+</details>
+
+
+___
+
+<b>Pattern 6: Ensure proper error logging with context by using structured logging with artifacts parameter rather than string concatenation.</b>
+
+Example code before:
+```
+get_logger().error(f"Failed to get log context: {e}")
+```
+
+Example code after:
+```
+get_logger().error("Failed to get log context", artifact={"error": e})
+```
+
+<details><summary>Examples for relevant past discussions:</summary>
+
+- https://github.com/qodo-ai/pr-agent/pull/1634#discussion_r2007976915
+- https://github.com/qodo-ai/pr-agent/pull/1529#discussion_r1964110734
+- https://github.com/qodo-ai/pr-agent/pull/1529#discussion_r2055606721
+</details>
+
+
+___
+
+<b>Pattern 7: Add clear, descriptive comments for complex logic or non-obvious code to improve maintainability and help future developers understand the code's purpose.</b>
+
+Example code before:
+```
+if not isinstance(issue, dict):
+    continue
+```
+
+Example code after:
+```
+# Skip empty issues or non-dictionary items to ensure valid data structure
+if not isinstance(issue, dict):
+    continue
+```
+
+<details><summary>Examples for relevant past discussions:</summary>
+
+- https://github.com/qodo-ai/pr-agent/pull/1262#discussion_r1782097204
+- https://github.com/qodo-ai/pr-agent/pull/1583#discussion_r1971790979
+- https://github.com/qodo-ai/pr-agent/pull/1687#discussion_r2051641090
+</details>
+
+
+___

docker/Dockerfile

@@ -1,4 +1,6 @@
-FROM python:3.12.3 AS base
+FROM python:3.12.10-slim AS base
+
+RUN apt update && apt install --no-install-recommends -y git curl && apt-get clean && rm -rf /var/lib/apt/lists/*
 
 WORKDIR /app
 ADD pyproject.toml .

docker/Dockerfile.lambda

@@ -1,10 +1,10 @@
-FROM public.ecr.aws/lambda/python:3.10
+FROM public.ecr.aws/lambda/python:3.12
 
-RUN yum update -y && \
-    yum install -y gcc python3-devel git && \
-    yum clean all
+RUN dnf update -y && \
+    dnf install -y gcc python3-devel git && \
+    dnf clean all
 
-ADD pyproject.toml requirements.txt .
+ADD pyproject.toml requirements.txt ./
 RUN pip install --no-cache-dir . && rm pyproject.toml
 RUN pip install --no-cache-dir mangum==0.17.0
 COPY pr_agent/ ${LAMBDA_TASK_ROOT}/pr_agent/

docs/docs/ai_search/index.md

@@ -4,10 +4,10 @@
         Search through our documentation using AI-powered natural language queries.
     </p>
     <div class="search-container">
-        <input 
-            type="text" 
-            id="searchInput" 
-            class="search-input" 
+        <input
+            type="text"
+            id="searchInput"
+            class="search-input"
             placeholder="Enter your search term..."
         >
         <button id="searchButton" class="search-button">Search</button>
@@ -206,13 +206,13 @@ window.addEventListener('load', function() {
         const resultsContainer = document.getElementById('results');
         const spinner = document.getElementById('spinner');
         const searchContainer = document.querySelector('.search-container');
-        
+
         // Hide spinner
         spinner.style.display = 'none';
-        
+
         // Scroll to search bar
         searchContainer.scrollIntoView({ behavior: 'smooth', block: 'start' });
-        
+
         try {
             const results = JSON.parse(responseText);
 
@@ -224,7 +224,7 @@ window.addEventListener('load', function() {
             });
 
             const htmlContent = marked.parse(results.message);
-            
+
             resultsContainer.className = 'markdown-content';
             resultsContainer.innerHTML = htmlContent;
 
@@ -234,7 +234,7 @@ window.addEventListener('load', function() {
                 const offset = 55; // Offset from top in pixels
                 const elementPosition = searchContainer.getBoundingClientRect().top;
                 const offsetPosition = elementPosition + window.pageYOffset - offset;
-                
+
                 window.scrollTo({
                     top: offsetPosition,
                     behavior: 'smooth'
@@ -261,7 +261,7 @@ window.addEventListener('load', function() {
         spinner.style.display = 'flex';
         resultsContainer.innerHTML = '';
 
-        try { 
+        try {
             const data = {
                 "query": searchTerm
             };
@@ -299,11 +299,11 @@ window.addEventListener('load', function() {
     // Add event listeners
     const searchButton = document.getElementById('searchButton');
     const searchInput = document.getElementById('searchInput');
-    
+
     if (searchButton) {
         searchButton.addEventListener('click', performSearch);
     }
-    
+
     if (searchInput) {
         searchInput.addEventListener('keypress', function(e) {
             if (e.key === 'Enter') {
@@ -312,4 +312,4 @@ window.addEventListener('load', function() {
         });
     }
 });
-</script>
+</script>

docs/docs/chrome-extension/features.md

@@ -17,8 +17,8 @@ Qodo Merge constructs a comprehensive context for each pull request, incorporati
 <img src="https://codium.ai/images/pr_agent/pr_chat_1.png" width="768">
 <img src="https://codium.ai/images/pr_agent/pr_chat_2.png" width="768">
 
-
 ### Toolbar extension
+
 With Qodo Merge Chrome extension, it's [easier than ever](https://www.youtube.com/watch?v=gT5tli7X4H4) to interactively configure and experiment with the different tools and configuration options.
 
 For private repositories, after you found the setup that works for you, you can also easily export it as a persistent configuration file, and use it for automatic commands.
@@ -37,7 +37,6 @@ For example, you can choose to present only message from Qodo Merge, or filter t
 
 <img src="https://codium.ai/images/pr_agent/pr_agent_filters2.png" width="256">
 
-
 ### Enhanced code suggestions
 
 Qodo Merge Chrome extension adds the following capabilities to code suggestions tool's comments:
@@ -45,7 +44,6 @@ Qodo Merge Chrome extension adds the following capabilities to code suggestions
 - Auto-expand the table when you are viewing a code block, to avoid clipping.
 - Adding a "quote-and-reply" button, that enables to address and comment on a specific suggestion (for example, asking the author to fix the issue)
 
-
 <img src="https://codium.ai/images/pr_agent/chrome_extension_code_suggestion1.png" width="512">
 
 <img src="https://codium.ai/images/pr_agent/chrome_extension_code_suggestion2.png" width="512">

docs/docs/chrome-extension/index.md

@@ -2,7 +2,7 @@
 
 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.7 Sonnet and o3-mini. All the extension's features are free to use on public repositories.
+The extension is powered by top code models like Claude 3.7 Sonnet and o4-mini. 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"}.

docs/docs/chrome-extension/options.md

@@ -0,0 +1,39 @@
+## Options and Configurations
+
+### Accessing the Options Page
+
+To access the options page for the Qodo Merge Chrome extension:
+
+1. Find the extension icon in your Chrome toolbar (usually in the top-right corner of your browser)
+2. Right-click on the extension icon
+3. Select "Options" from the context menu that appears
+
+Alternatively, you can access the options page directly using this URL:
+
+[chrome-extension://ephlnjeghhogofkifjloamocljapahnl/options.html](chrome-extension://ephlnjeghhogofkifjloamocljapahnl/options.html)
+
+<img src="https://codium.ai/images/pr_agent/chrome_ext_options.png" width="256">
+
+### Configuration Options
+
+<img src="https://codium.ai/images/pr_agent/chrome_ext_settings_page.png" width="512">
+
+#### API Base Host
+
+For single-tenant customers, you can configure the extension to communicate directly with your company's Qodo Merge server instance.
+
+To set this up:
+
+- Enter your organization's Qodo Merge API endpoint in the "API Base Host" field
+- This endpoint should be provided by your Qodo DevOps Team
+
+*Note: The extension does not send your code to the server, but only triggers your previously installed Qodo Merge application.*
+
+#### Interface Options
+
+You can customize the extension's interface by:
+
+- Toggling the "Show Qodo Merge Toolbar" option
+- When disabled, the toolbar will not appear in your Github comment bar
+
+Remember to click "Save Settings" after making any changes.

docs/docs/core-abilities/auto_best_practices.md

@@ -1,4 +1,5 @@
 # Auto Best Practices 💎
+
 `Supported Git Platforms: GitHub`
 
 ## Overview
@@ -9,17 +10,16 @@
 
 ### 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 `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. 
+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.
@@ -33,17 +33,15 @@ This creates a two-phase analysis:
 
 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. 
+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. 
+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
@@ -66,4 +64,4 @@ extra_instructions = ""
 
 # Max number of patterns to be detected
 max_patterns = 5                   
-```
+```

docs/docs/core-abilities/code_validation.md

@@ -0,0 +1,40 @@
+## Introduction
+
+The Git environment usually represents the final stage before code enters production. Hence, Detecting bugs and issues during the review process is critical.
+
+The [`improve`](https://qodo-merge-docs.qodo.ai/tools/improve/) tool provides actionable code suggestions for your pull requests, aiming to help detect and fix bugs and problems.
+By default, suggestions appear as a comment in a table format:
+
+![code_suggestions_as_comment_closed.png](https://codium.ai/images/pr_agent/code_suggestions_as_comment_closed.png){width=512}
+
+![code_suggestions_as_comment_open.png](https://codium.ai/images/pr_agent/code_suggestions_as_comment_open.png){width=512}
+
+## Validation of Code Suggestions
+
+Each suggestion in the table can be "applied" by clicking on the `Apply this suggestion` checkbox, converting it to a committable Git code change that can be committed directly to the PR.
+This approach allows to fix issues without returning to your IDE for manual edits — significantly faster and more convenient.
+
+However, committing a suggestion in a Git environment carries more risk than in a local IDE, as you don't have the opportunity to fully run and test the code before committing.
+
+To balance convenience with safety, Qodo Merge implements a dual validation system for each generated code suggestion:
+
+1) **Localization** - Qodo Merge confirms that the suggestion's line numbers and surrounding code, as predicted by the model, actually match the repo code. This means that the model correctly identified the context and location of the code to be changed.
+
+2) **"Compilation"** - Using static code analysis, Qodo Merge verifies that after applying the suggestion, the modified file will still be valid, meaning tree-sitter syntax processing will not throw an error. This process is relevant for multiple programming languages, see [here](https://pypi.org/project/tree-sitter-languages/) for the full list of supported languages.
+
+When a suggestion fails to meet these validation criteria, it may still provide valuable feedback, but isn't suitable for direct application to the PR.
+In such cases, Qodo Merge will omit the 'apply' checkbox and instead display:
+
+`[To ensure code accuracy, apply this suggestion manually]`
+
+All suggestions that pass these validations undergo a final stage of **self-reflection**, where the AI model evaluates, scores, and re-ranks its own suggestions, eliminating any that are irrelevant or incorrect.
+Read more about this process in the [self-reflection](https://qodo-merge-docs.qodo.ai/core-abilities/self_reflection/) page.
+
+## Conclusion
+
+The validation methods described above enhance the reliability of code suggestions and help PR authors determine which suggestions are safer to apply in the Git environment.
+Of course, additional factors should be considered, such as suggestion complexity and potential code impact.
+
+Human judgment remains essential. After clicking 'apply', Qodo Merge still presents the 'before' and 'after' code snippets for review, allowing you to assess the changes before finalizing the commit.
+
+![improve](https://codium.ai/images/pr_agent/improve.png){width=512}

docs/docs/core-abilities/company_codebase.md

@@ -1,57 +0,0 @@
-# Company Codebase 💎
-`Supported Git Platforms: GitHub`
-
-
-## Overview
-
-### What is Company Codebase?
-
-An organized, semantic database that aggregates all your company’s source code into one searchable repository, enabling efficient code discovery and analysis.
-
-### How does Company Codebase work?
-
-By indexing your company's code and using Retrieval-Augmented Generation (RAG), it retrieves contextual code segments on demand, improving pull request (PR) insights and accelerating review accuracy.
-
-
-## Getting started
-
-!!! info "Prerequisites"
-    - Database setup and codebase indexing must be completed before proceeding. [Contact support](https://www.qodo.ai/contact/) for assistance.
-
-### Configuration options
-
-In order to enable the RAG feature, add the following lines to your configuration file:
-``` toml
-[rag_arguments]
-enable_rag=true 
-```
-
-!!! example "RAG Arguments Options"
-
-    <table>
-      <tr>
-        <td><b>enable_rag</b></td>
-        <td>If set to true, codebase enrichment using RAG will be enabled. Default is false.</td>
-      </tr>
-      <tr>
-        <td><b>rag_repo_list</b></td>
-        <td>A list of repositories that will be used by the semantic search for RAG. Use `['all']` to consider the entire codebase or a select list or repositories, for example: ['my-org/my-repo', ...]. Default: the repository from which the PR was opened.</td>
-      </tr>
-    </table>
-
-
-References from the codebase will be shown in a collapsible bookmark, allowing you to easily access relevant code snippets:
-
-![References](https://codium.ai/images/pr_agent/company_codebase_references.png){width=640}
-
-## Limitations
-
-### Querying the codebase presents significant challenges:
-- **Search Method**: RAG uses natural language queries to find semantically relevant code sections
-- **Result Quality**: No guarantee that RAG results will be useful for all queries
-- **Scope Recommendation**: To reduce noise, avoid using the whole codebase; focus on PR repository instead
-
-### This feature has several requirements and restrictions:
-- **Codebase**: Must be properly indexed for search functionality
-- **Security**: Requires secure and private indexed codebase implementation
-- **Deployment**: Only available for Qodo Merge Enterprise plan using single tenant or on-premises setup

docs/docs/core-abilities/compression_strategy.md

@@ -1,5 +1,6 @@
 
 ## Overview - PR Compression Strategy
+
 There are two scenarios:
 
 1. The PR is small enough to fit in a single prompt (including system and user prompt)
@@ -8,6 +9,7 @@ There are two scenarios:
 For both scenarios, we first use the following strategy
 
 #### Repo language prioritization strategy
+
 We prioritize the languages of the repo based on the following criteria:
 
 1. Exclude binary files and non code files (e.g. images, pdfs, etc)
@@ -15,28 +17,33 @@ We prioritize the languages of the repo based on the following criteria:
 3. We sort the PR files by the most common languages in the repo (in descending order):
    * ```[[file.py, file2.py],[file3.js, file4.jsx],[readme.md]]```
 
-
 ### Small PR
+
 In this case, we can fit the entire PR in a single prompt:
+
 1. Exclude binary files and non code files (e.g. images, pdfs, etc)
 2. We Expand the surrounding context of each patch to 3 lines above and below the patch
 
 ### Large PR
 
 #### Motivation
+
 Pull Requests can be very long and contain a lot of information with varying degree of relevance to the pr-agent.
 We want to be able to pack as much information as possible in a single LMM prompt, while keeping the information relevant to the pr-agent.
 
 #### Compression strategy
-We prioritize additions over deletions:
- - Combine all deleted files into a single list (`deleted files`)
- - File patches are a list of hunks, remove all hunks of type deletion-only from the hunks in the file patch
 
-####  Adaptive and token-aware file patch fitting
+We prioritize additions over deletions:
+
+* Combine all deleted files into a single list (`deleted files`)
+* File patches are a list of hunks, remove all hunks of type deletion-only from the hunks in the file patch
+
+#### Adaptive and token-aware file patch fitting
+
 We use [tiktoken](https://github.com/openai/tiktoken) to tokenize the patches after the modifications described above, and we use the following strategy to fit the patches into the prompt:
 
 1. Within each language we sort the files by the number of tokens in the file (in descending order):
-    - ```[[file2.py, file.py],[file4.jsx, file3.js],[readme.md]]```
+    * ```[[file2.py, file.py],[file4.jsx, file3.js],[readme.md]]```
 2. Iterate through the patches in the order described above
 3. Add the patches to the prompt until the prompt reaches a certain buffer from the max token length
 4. If there are still patches left, add the remaining patches as a list called `other modified files` to the prompt until the prompt reaches the max token length (hard stop), skip the rest of the patches.

docs/docs/core-abilities/dynamic_context.md

@@ -7,7 +7,8 @@ This approach balances providing sufficient context for accurate analysis, while
 ## Introduction
 
 Pull request code changes are retrieved in a unified diff format, showing three lines of context before and after each modified section, with additions marked by '+' and deletions by '-'.
-```
+
+```diff
 @@ -12,5 +12,5 @@ def func1():
  code line that already existed in the file...
  code line that already existed in the file...
@@ -25,7 +26,6 @@ Pull request code changes are retrieved in a unified diff format, showing three
 This unified diff format can be challenging for AI models to interpret accurately, as it provides limited context for understanding the full scope of code changes.
 The presentation of code using '+', '-', and ' ' symbols to indicate additions, deletions, and unchanged lines respectively also differs from the standard code formatting typically used to train AI models.
 
-
 ## Challenges of expanding the context window
 
 While expanding the context window is technically feasible, it presents a more fundamental trade-off:
@@ -43,6 +43,7 @@ Pull requests often encompass multiple changes across many files, potentially sp
 - Increased context expands the token count, increasing processing time and cost, and may prevent the model from processing the entire pull request in a single pass.
 
 ## Asymmetric and dynamic context
+
 To address these challenges, Qodo Merge employs an **asymmetric** and **dynamic** context strategy, providing the model with more focused and relevant context information for each code change.
 
 **Asymmetric:**
@@ -62,7 +63,8 @@ To prevent overwhelming the model with excessive context, we impose a limit on t
 This balance allows for comprehensive understanding while maintaining efficiency and limiting context token usage.
 
 ## Appendix - relevant configuration options
-```
+
+```toml
 [config]
 patch_extension_skip_types =[".md",".txt"]  # Skip files with these extensions when trying to extend the context
 allow_dynamic_context=true                  # Allow dynamic context extension

docs/docs/core-abilities/fetching_ticket_context.md

@@ -1,7 +1,9 @@
 # Fetching Ticket Context for PRs
+
 `Supported Git Platforms: GitHub, GitLab, Bitbucket`
 
 ## Overview
+
 Qodo Merge streamlines code review workflows by seamlessly connecting with multiple ticket management systems.
 This integration enriches the review process by automatically surfacing relevant ticket information and context alongside code changes.
 
@@ -27,16 +29,17 @@ Ticket Recognition Requirements:
 - For Jira tickets, you should follow the instructions in [Jira Integration](https://qodo-merge-docs.qodo.ai/core-abilities/fetching_ticket_context/#jira-integration) in order to authenticate with Jira.
 
 ### Describe tool
+
 Qodo Merge will recognize the ticket and use the ticket content (title, description, labels) to provide additional context for the code changes.
 By understanding the reasoning and intent behind modifications, the LLM can offer more insightful and relevant code analysis.
 
 ### Review tool
+
 Similarly to the `describe` tool, the `review` tool will use the ticket content to provide additional context for the code changes.
 
 In addition, this feature will evaluate how well a Pull Request (PR) adheres to its original purpose/intent as defined by the associated ticket or issue mentioned in the PR description.
 Each ticket will be assigned a label (Compliance/Alignment level), Indicates the degree to which the PR fulfills its original purpose, Options: Fully compliant, Partially compliant or Not compliant.
 
-
 ![Ticket Compliance](https://www.qodo.ai/images/pr_agent/ticket_compliance_review.png){width=768}
 
 By default, the tool will automatically validate if the PR complies with the referenced ticket.
@@ -63,6 +66,7 @@ Since Qodo Merge is integrated with GitHub, it doesn't require any additional co
 We support both Jira Cloud and Jira Server/Data Center.
 
 ### Jira Cloud
+
 There are two ways to authenticate with Jira Cloud:
 
 **1) Jira App Authentication**
@@ -101,7 +105,6 @@ jira_api_token = "YOUR_API_TOKEN"
 jira_api_email = "YOUR_EMAIL"
 ```
 
-
 ### Jira Data Center/Server
 
 [//]: # ()
@@ -163,9 +166,67 @@ jira_api_email = "YOUR_EMAIL"
 
 [//]: # (* You will be redirected back to Qodo Merge and you will see a success message.)
 
-
 [//]: # (Personal Access Token (PAT) Authentication)
-Currently, JIRA integration for Data Center/Server is available via Personal Access Token (PAT) Authentication method 
+
+#### Using Basic Authentication for Jira Data Center/Server
+
+You can use your Jira username and password to authenticate with Jira Data Center/Server.
+
+In your Configuration file/Environment variables/Secrets file, add the following lines:
+
+```toml
+jira_api_email = "your_username"
+jira_api_token = "your_password"
+```
+
+(Note that indeed the 'jira_api_email' field is used for the username, and the 'jira_api_token' field is used for the user password.)
+
+##### Validating Basic authentication via Python script
+
+If you are facing issues retrieving tickets in Qodo Merge with Basic auth, you can validate the flow using a Python script.
+This following steps will help you check if the basic auth is working correctly, and if you can access the Jira ticket details:
+
+1. run `pip install jira==3.8.0`
+
+2. run the following Python script (after replacing the placeholders with your actual values):
+
+??? example "Script to validate basic auth"
+
+    ```python
+    from jira import JIRA
+    
+    
+    if __name__ == "__main__":
+        try:
+            # Jira server URL
+            server = "https://..."
+            # Basic auth
+            username = "..."
+            password = "..."
+            # Jira ticket code (e.g. "PROJ-123")
+            ticket_id = "..."
+    
+            print("Initializing JiraServerTicketProvider with JIRA server")
+            # Initialize JIRA client
+            jira = JIRA(
+                server=server,
+                basic_auth=(username, password),
+                timeout=30
+            )
+            if jira:
+                print(f"JIRA client initialized successfully")
+            else:
+                print("Error initializing JIRA client")
+    
+            # Fetch ticket details
+            ticket = jira.issue(ticket_id)
+            print(f"Ticket title: {ticket.fields.summary}")
+    
+        except Exception as e:
+            print(f"Error fetching JIRA ticket details: {e}")
+    ```
+
+#### Using a Personal Access Token (PAT) for Jira Data Center/Server
 
 1. Create a [Personal Access Token (PAT)](https://confluence.atlassian.com/enterprise/using-personal-access-tokens-1026032365.html) in your Jira account
 2. In your Configuration file/Environment variables/Secrets file, add the following lines:
@@ -176,6 +237,50 @@ jira_base_url = "YOUR_JIRA_BASE_URL" # e.g. https://jira.example.com
 jira_api_token = "YOUR_API_TOKEN"
 ```
 
+##### Validating PAT token via Python script
+
+If you are facing issues retrieving tickets in Qodo Merge with PAT token, you can validate the flow using a Python script.
+This following steps will help you check if the token is working correctly, and if you can access the Jira ticket details:
+
+1. run `pip install jira==3.8.0`
+
+2. run the following Python script (after replacing the placeholders with your actual values):
+
+??? example "Script to validate PAT token"
+
+    ```python
+    from jira import JIRA
+    
+    
+    if __name__ == "__main__":
+        try:
+            # Jira server URL
+            server = "https://..."
+            # Jira PAT token
+            token_auth = "..."
+            # Jira ticket code (e.g. "PROJ-123")
+            ticket_id = "..."
+    
+            print("Initializing JiraServerTicketProvider with JIRA server")
+            # Initialize JIRA client
+            jira = JIRA(
+                server=server,
+                token_auth=token_auth,
+                timeout=30
+            )
+            if jira:
+                print(f"JIRA client initialized successfully")
+            else:
+                print("Error initializing JIRA client")
+    
+            # Fetch ticket details
+            ticket = jira.issue(ticket_id)
+            print(f"Ticket title: {ticket.fields.summary}")
+    
+        except Exception as e:
+            print(f"Error fetching JIRA ticket details: {e}")
+    ```
+
 ### How to link a PR to a Jira ticket
 
 To integrate with Jira, you can link your PR to a ticket using either of these methods:

docs/docs/core-abilities/impact_evaluation.md

@@ -3,22 +3,24 @@
 Demonstrating the return on investment (ROI) of AI-powered initiatives is crucial for modern organizations.
 To address this need, Qodo Merge has developed an AI impact measurement tools and metrics, providing advanced analytics to help businesses quantify the tangible benefits of AI adoption in their PR review process.
 
-
 ## Auto Impact Validator - Real-Time Tracking of Implemented Qodo Merge Suggestions
 
 ### How It Works
+
 When a user pushes a new commit to the pull request, Qodo Merge automatically compares the updated code against the previous suggestions, marking them as implemented if the changes address these recommendations, whether directly or indirectly:
 
 1. **Direct Implementation:** The user directly addresses the suggestion as-is in the PR, either by clicking on the "apply code suggestion" checkbox or by making the changes manually.
 2. **Indirect Implementation:** Qodo Merge recognizes when a suggestion's intent is fulfilled, even if the exact code changes differ from the original recommendation. It marks these suggestions as implemented, acknowledging that users may achieve the same goal through alternative solutions.
 
 ### Real-Time Visual Feedback
+
 Upon confirming that a suggestion was implemented, Qodo Merge automatically adds a ✅ (check mark) to the relevant suggestion, enabling transparent tracking of Qodo Merge's impact analysis.
 Qodo Merge will also add, inside the relevant suggestions, an explanation of how the new code was impacted by each suggestion.
 
 ![Suggestion_checkmark](https://codium.ai/images/pr_agent/auto_suggestion_checkmark.png){width=512}
 
 ### Dashboard Metrics
+
 The dashboard provides macro-level insights into the overall impact of Qodo Merge on the pull-request process with key productivity metrics.
 
 By offering clear, data-driven evidence of Qodo Merge's impact, it empowers leadership teams to make informed decisions about the tool's effectiveness and ROI.
@@ -26,6 +28,7 @@ By offering clear, data-driven evidence of Qodo Merge's impact, it empowers lead
 Here are key metrics that the dashboard tracks:
 
 #### Qodo Merge Impacts per 1K Lines
+
 ![Dashboard](https://codium.ai/images/pr_agent/impacts_per_1k_llines.png){width=512}
 > Explanation: for every 1K lines of code (additions/edits), Qodo Merge had on average ~X suggestions implemented.
 
@@ -36,9 +39,11 @@ Here are key metrics that the dashboard tracks:
 3. **Quantifies Value and ROI:** The metric directly correlates with the value Qodo Merge is providing, showing how frequently it offers improvements relative to the amount of new code being written. This provides a clear, quantifiable way to demonstrate Qodo Merge's return on investment to stakeholders.
 
 #### Suggestion Effectiveness Across Categories
+
 ![Impacted_Suggestion_Score](https://codium.ai/images/pr_agent/impact_by_category.png){width=512}
 > Explanation: This chart illustrates the distribution of implemented suggestions across different categories, enabling teams to better understand Qodo Merge's impact on various aspects of code quality and development practices.
 
 #### Suggestion Score Distribution
+
 ![Impacted_Suggestion_Score](https://codium.ai/images/pr_agent/impacted_score_dist.png){width=512}
 > Explanation: The distribution of the suggestion score for the implemented suggestions, ensuring that higher-scored suggestions truly represent more significant improvements.

docs/docs/core-abilities/index.md

@@ -1,17 +1,18 @@
 # Core Abilities
+
 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/)
+- [Code validation](https://qodo-merge-docs.qodo.ai/core-abilities/code_validation/)
+- [Compression strategy](https://qodo-merge-docs.qodo.ai/core-abilities/compression_strategy/)
 - [Dynamic context](https://qodo-merge-docs.qodo.ai/core-abilities/dynamic_context/)
-- [Self-reflection](https://qodo-merge-docs.qodo.ai/core-abilities/self_reflection/)
+- [Fetching ticket context](https://qodo-merge-docs.qodo.ai/core-abilities/fetching_ticket_context/)
 - [Impact evaluation](https://qodo-merge-docs.qodo.ai/core-abilities/impact_evaluation/)
 - [Interactivity](https://qodo-merge-docs.qodo.ai/core-abilities/interactivity/)
-- [Compression strategy](https://qodo-merge-docs.qodo.ai/core-abilities/compression_strategy/)
-- [Company Codebase](https://qodo-merge-docs.qodo.ai/core-abilities/company_codebase/)
+- [Local and global metadata](https://qodo-merge-docs.qodo.ai/core-abilities/metadata/)
+- [RAG context enrichment](https://qodo-merge-docs.qodo.ai/core-abilities/rag_context_enrichment/)
+- [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/)
-- [Code fine-tuning benchmark](https://qodo-merge-docs.qodo.ai/finetuning_benchmark/)
 
 ## Blogs
 
@@ -19,13 +20,16 @@ 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/)
 
 ### Development Processes
+
 - [Understanding the Challenges and Pain Points of the Pull Request Cycle](https://www.qodo.ai/blog/understanding-the-challenges-and-pain-points-of-the-pull-request-cycle/)
 - [Introduction to Code Coverage Testing](https://www.qodo.ai/blog/introduction-to-code-coverage-testing/)
 
 ### Cost Optimization
+
 - [Reduce Your Costs by 30% When Using GPT for Python Code](https://www.qodo.ai/blog/reduce-your-costs-by-30-when-using-gpt-3-for-python-code/)

docs/docs/core-abilities/interactivity.md

@@ -1,2 +1,41 @@
-## Interactive invocation 💎
-TBD
+# Interactivity
+
+`Supported Git Platforms: GitHub, GitLab`
+
+## Overview
+
+Qodo Merge transforms static code reviews into interactive experiences by enabling direct actions from pull request (PR) comments.
+Developers can immediately trigger actions and apply changes with simple checkbox clicks.
+
+This focused workflow maintains context while dramatically reducing the time between PR creation and final merge.
+The approach eliminates manual steps, provides clear visual indicators, and creates immediate feedback loops all within the same interface.
+
+## Key Interactive Features
+
+### 1\. Interactive `/improve` Tool
+
+The [`/improve`](https://qodo-merge-docs.qodo.ai/tools/improve/) command delivers a comprehensive interactive experience:
+
+- _**Apply this suggestion**_: Clicking this checkbox instantly converts a suggestion into a committable code change. When committed to the PR, changes made to code that was flagged for improvement will be marked with a check mark, allowing developers to easily track and review implemented recommendations.
+
+- _**More**_: Triggers additional suggestions generation while keeping each suggestion focused and relevant as the original set
+
+- _**Update**_: Triggers a re-analysis of the code, providing updated suggestions based on the latest changes
+
+- _**Author self-review**_: Interactive acknowledgment that developers have opened and reviewed collapsed suggestions
+
+### 2\. Interactive `/analyze` Tool
+
+The [`/analyze`](https://qodo-merge-docs.qodo.ai/tools/analyze/) command provides component-level analysis with interactive options for each identified code component:
+
+- Interactive checkboxes to generate tests, documentation, and code suggestions for specific components
+
+- On-demand similar code search that activates when a checkbox is clicked
+
+- Component-specific actions that trigger only for the selected elements, providing focused assistance
+
+### 3\. Interactive `/help` Tool
+
+The [`/help`](https://qodo-merge-docs.qodo.ai/tools/help/) command not only lists available tools and their descriptions but also enables immediate tool invocation through interactive checkboxes.
+When a user checks a tool's checkbox, Qodo Merge instantly triggers that tool without requiring additional commands.
+This transforms the standard help menu into an interactive launch pad for all Qodo Merge capabilities, eliminating context switching by keeping developers within their PR workflow.

docs/docs/core-abilities/metadata.md

@@ -1,4 +1,5 @@
 ## Local and global metadata injection with multi-stage analysis
+
 1\.
 Qodo Merge initially retrieves for each PR the following data:
 
@@ -23,7 +24,7 @@ This effectively enables multi-stage chain-of-thought analysis, without doing an
 
 For example, when generating code suggestions for different files, Qodo Merge can inject the AI-generated ["Changes walkthrough"](https://github.com/Codium-ai/pr-agent/pull/1202#issue-2511546839) file summary in the prompt:
 
-```
+```diff
 ## File: 'src/file1.py'
 ### AI-generated file summary:
 - edited function `func1` that does X
@@ -51,6 +52,5 @@ __old hunk__
 
 3\. The entire PR files that were retrieved are also used to expand and enhance the PR context (see [Dynamic Context](https://qodo-merge-docs.qodo.ai/core-abilities/dynamic_context/)).
 
-
 4\. All the metadata described above represents several level of cumulative analysis - ranging from hunk level, to file level, to PR level, to organization level.
 This comprehensive approach enables Qodo Merge AI models to generate more precise and contextually relevant suggestions and feedback.

docs/docs/core-abilities/rag_context_enrichment.md

@@ -0,0 +1,77 @@
+# RAG Context Enrichment 💎
+
+`Supported Git Platforms: GitHub, Bitbucket Data Center`
+
+!!! info "Prerequisites"
+    - RAG is available only for Qodo enterprise plan users, with single tenant or on-premises setup.
+    - Database setup and codebase indexing must be completed before proceeding. [Contact support](https://www.qodo.ai/contact/) for more information.
+
+## Overview
+
+### What is RAG Context Enrichment?
+
+A feature that enhances AI analysis by retrieving and referencing relevant code patterns from your project, enabling context-aware insights during code reviews.
+
+### How does RAG Context Enrichment work?
+
+Using Retrieval-Augmented Generation (RAG), it searches your configured repositories for contextually relevant code segments, enriching pull request (PR) insights and accelerating review accuracy.
+
+## Getting started
+
+### Configuration options
+
+In order to enable the RAG feature, add the following lines to your configuration file:
+
+```toml
+[rag_arguments]
+enable_rag=true
+```
+
+!!! example "RAG Arguments Options"
+
+    <table>
+      <tr>
+        <td><b>enable_rag</b></td>
+        <td>If set to true, repository enrichment using RAG will be enabled. Default is false.</td>
+      </tr>
+      <tr>
+        <td><b>rag_repo_list</b></td>
+        <td>A list of repositories that will be used by the semantic search for RAG. Use `['all']` to consider the entire codebase or a select list of repositories, for example: ['my-org/my-repo', ...]. Default: the repository from which the PR was opened.</td>
+      </tr>
+    </table>
+
+### Applications
+
+RAG capability is exclusively available in the following tools:
+
+=== "`/review`"
+    The [`/review`](https://qodo-merge-docs.qodo.ai/tools/review/) tool offers the _Focus area from RAG data_ which contains feedback based on the RAG references analysis.
+    The complete list of references found relevant to the PR will be shown in the _References_ section, helping developers understand the broader context by exploring the provided references.
+
+    ![RAGed review tool](https://codium.ai/images/pr_agent/rag_review.png){width=640}
+
+=== "`/implement`"
+    The [`/implement`](https://qodo-merge-docs.qodo.ai/tools/implement/) tool utilizes the RAG feature to provide comprehensive context of the repository codebase, allowing it to generate more refined code output.
+    The _References_ section contains links to the content used to support the code generation.
+
+    ![RAGed implement tool](https://codium.ai/images/pr_agent/rag_implement.png){width=640}
+
+=== "`/ask`"
+    The [`/ask`](https://qodo-merge-docs.qodo.ai/tools/ask/) tool can access broader repository context through the RAG feature when answering questions that go beyond the PR scope alone.
+    The _References_ section displays the additional repository content consulted to formulate the answer.
+
+    ![RAGed ask tool](https://codium.ai/images/pr_agent/rag_ask.png){width=640}
+
+## Limitations
+
+### Querying the codebase presents significant challenges
+
+- **Search Method**: RAG uses natural language queries to find semantically relevant code sections
+- **Result Quality**: No guarantee that RAG results will be useful for all queries
+- **Scope Recommendation**: To reduce noise, focus on the PR repository rather than searching across multiple repositories
+
+### This feature has several requirements and restrictions
+
+- **Codebase**: Must be properly indexed for search functionality
+- **Security**: Requires secure and private indexed codebase implementation
+- **Deployment**: Only available for Qodo Merge Enterprise plan using single tenant or on-premises setup

docs/docs/core-abilities/self_reflection.md

@@ -6,7 +6,6 @@ Configuration options allow users to set a score threshold for further filtering
 
 ## Introduction - Efficient Review with Hierarchical Presentation
 
-
 Given that not all generated code suggestions will be relevant, it is crucial to enable users to review them in a fast and efficient way, allowing quick identification and filtering of non-applicable ones.
 
 To achieve this goal, Qodo Merge offers a dedicated hierarchical structure when presenting suggestions to users:
@@ -42,9 +41,9 @@ This results in a more refined and valuable set of suggestions for the user, sav
 ![self_reflection](https://codium.ai/images/pr_agent/self_reflection1.png){width=768}
 ![self_reflection](https://codium.ai/images/pr_agent/self_reflection2.png){width=768}
 
-
 ## Appendix - Relevant Configuration Options
-```
+
+```toml
 [pr_code_suggestions]
-suggestions_score_threshold	= 0 # Filter out suggestions with a score below this threshold (0-10)
+suggestions_score_threshold = 0 # Filter out suggestions with a score below this threshold (0-10)
 ```

docs/docs/core-abilities/static_code_analysis.md

@@ -7,14 +7,13 @@ It scans the PR code changes, finds all the code components (methods, functions,
 !!! note "Language that are currently supported:"
     Python, Java, C++, JavaScript, TypeScript, C#.
 
-
 ## Capabilities
 
 ### Analyze PR
 
-
 The [`analyze`](https://qodo-merge-docs.qodo.ai/tools/analyze/) tool enables to interactively generate tests, docs, code suggestions and similar code search for each component that changed in the PR.
 It can be invoked manually by commenting on any PR:
+
 ```
 /analyze
 ```
@@ -29,9 +28,11 @@ Clicking on each checkbox will trigger the relevant tool for the selected compon
 
 The [`test`](https://qodo-merge-docs.qodo.ai/tools/test/) tool  generate tests for a selected component, based on the PR code changes.
 It can be invoked manually by commenting on any PR:
+
 ```
 /test component_name
 ```
+
 where 'component_name' is the name of a specific component in the PR,  Or be triggered interactively by using the `analyze` tool.
 
 ![test1](https://codium.ai/images/pr_agent/test1.png){width=768}
@@ -40,6 +41,7 @@ where 'component_name' is the name of a specific component in the PR,  Or be tri
 
 The [`add_docs`](https://qodo-merge-docs.qodo.ai/tools/documentation/) tool scans the PR code changes, and automatically generate docstrings for any code components that changed in the PR.
 It can be invoked manually by commenting on any PR:
+
 ```
 /add_docs component_name
 ```
@@ -49,8 +51,10 @@ Or be triggered interactively by using the `analyze` tool.
 ![Docs single component](https://codium.ai/images/pr_agent/docs_single_component.png){width=768}
 
 ### Generate Code Suggestions for a Component
+
 The [`improve_component`](https://qodo-merge-docs.qodo.ai/tools/improve_component/) tool generates code suggestions for a specific code component that changed in the PR.
 It can be invoked manually by commenting on any PR:
+
 ```
 /improve_component component_name
 ```

docs/docs/finetuning_benchmark/index.md

@@ -1,93 +0,0 @@
-# Qodo Merge Code Fine-tuning Benchmark
-
-On coding tasks, the gap between open-source models and top closed-source models such as GPT-4o is significant.
-<br>
-In practice, open-source models are unsuitable for most real-world code tasks, and require further fine-tuning to produce acceptable results.
-
-_Qodo Merge fine-tuning benchmark_ aims to benchmark open-source models on their ability to be fine-tuned for a coding task.
-Specifically, we chose to fine-tune open-source models on the task of analyzing a pull request, and providing useful feedback and code suggestions.
-
-Here are the results:
-<br>
-<br>
-
-**Model performance:**
-
-| Model name                  | Model size [B] | Better than gpt-4 rate, after fine-tuning [%] |
-|-----------------------------|----------------|----------------------------------------------|
-| **DeepSeek 34B-instruct**   | **34**         | **40.7**                                     |
-| DeepSeek 34B-base           | 34             | 38.2                                         |
-| Phind-34b                   | 34             | 38                                           |
-| Granite-34B                 | 34             | 37.6                                         |
-| Codestral-22B-v0.1          | 22             | 32.7                                         |
-| QWEN-1.5-32B                | 32             | 29                                           |
-|                             |                |                                              |
-| **CodeQwen1.5-7B**          | **7**          | **35.4**                                     |
-| Llama-3.1-8B-Instruct       | 8              | 35.2                                         |
-| Granite-8b-code-instruct    | 8              | 34.2                                         |
-| CodeLlama-7b-hf             | 7              | 31.8                                         |
-| Gemma-7B                    | 7              | 27.2                                         |
-| DeepSeek coder-7b-instruct  | 7              | 26.8                                         |
-| Llama-3-8B-Instruct         | 8              | 26.8                                         |
-| Mistral-7B-v0.1             | 7              | 16.1                                         |
-
-<br>
-
-**Fine-tuning impact:**
-
-| Model name                | Model size [B] | Fine-tuned | Better than gpt-4 rate [%] |
-|---------------------------|----------------|------------|----------------------------|
-| DeepSeek 34B-instruct     | 34             | yes        | 40.7                       |
-| DeepSeek 34B-instruct     | 34             | no         | 3.6                        |
-
-## Results analysis
-
-- **Fine-tuning is a must** - without fine-tuning, open-source models provide poor results on most real-world code tasks, which include complicated prompt and lengthy context. We clearly see that without fine-tuning, deepseek model was 96.4% of the time inferior to GPT-4, while after fine-tuning, it is better 40.7% of the time.
-- **Always start from a code-dedicated model** — When fine-tuning, always start from a code-dedicated model, and not from a general-usage model. The gaps in downstream results are very big.
-- **Don't believe the hype** —newer models, or models from big-tech companies (Llama3, Gemma, Mistral), are not always better for fine-tuning.
-- **The best large model** - For large 34B code-dedicated models, the gaps when doing proper fine-tuning are small. The current top model is **DeepSeek 34B-instruct**
-- **The best small model** - For small 7B code-dedicated models, the gaps when fine-tuning are much larger. **CodeQWEN 1.5-7B** is by far the best model for fine-tuning.
-- **Base vs. instruct** - For the top model (deepseek), we saw small advantage when starting from the instruct version. However, we recommend testing both versions on each specific task, as the base model is generally considered more suitable for fine-tuning.
-
-## The dataset
-
-### Training dataset
-
-Our training dataset comprises 25,000 pull requests, aggregated from permissive license repos. For each pull request, we generated responses for the three main tools of Qodo Merge:
-[Describe](https://qodo-merge-docs.qodo.ai/tools/describe/), [Review](https://qodo-merge-docs.qodo.ai/tools/improve/) and [Improve](https://qodo-merge-docs.qodo.ai/tools/improve/).
-
-On the raw data collected, we employed various automatic and manual cleaning techniques to ensure the outputs were of the highest quality, and suitable for instruct-tuning.
-
-Here are the prompts, and example outputs, used as input-output pairs to fine-tune the models:
-
-| Tool     | Prompt                                                                                                     | Example output |
-|----------|------------------------------------------------------------------------------------------------------------|----------------|
-| Describe | [link](https://github.com/Codium-ai/pr-agent/blob/main/pr_agent/settings/pr_description_prompts.toml) | [link](https://github.com/Codium-ai/pr-agent/pull/910#issue-2303989601)           |
-| Review   | [link](https://github.com/Codium-ai/pr-agent/blob/main/pr_agent/settings/pr_reviewer_prompts.toml) | [link](https://github.com/Codium-ai/pr-agent/pull/910#issuecomment-2118761219)           |
-| Improve  | [link](https://github.com/Codium-ai/pr-agent/blob/main/pr_agent/settings/pr_code_suggestions_prompts.toml) | [link](https://github.com/Codium-ai/pr-agent/pull/910#issuecomment-2118761309)           |
-
-### Evaluation dataset
-
-- For each tool, we aggregated 200 additional examples to be used for evaluation. These examples were not used in the training dataset, and were manually selected to represent diverse real-world use-cases.
-- For each test example, we generated two responses: one from the fine-tuned model, and one from the best code model in the world, `gpt-4-turbo-2024-04-09`.
-
-- We used a third LLM to judge which response better answers the prompt, and will likely be perceived by a human as better response.
-<br>
-
-We experimented with three model as judges: `gpt-4-turbo-2024-04-09`, `gpt-4o`, and `claude-3-opus-20240229`. All three produced similar results, with the same ranking order. This strengthens the validity of our testing protocol.
-The evaluation prompt can be found [here](https://github.com/Codium-ai/pr-agent/blob/main/pr_agent/settings/pr_evaluate_prompt_response.toml)
-
-Here is an example of a judge model feedback:
-
-```
-command: improve
-model1_score: 9,
-model2_score: 6,
-why: |
-  Response 1 is better because it provides more actionable and specific suggestions that directly
-  enhance the code's maintainability, performance, and best practices. For example, it suggests
-  using a variable for reusable widget instances and using named routes for navigation, which
-  are practical improvements. In contrast, Response 2 focuses more on general advice and less
-  actionable suggestions, such as changing variable names and adding comments, which are less
-  critical for immediate code improvement."
-```

docs/docs/index.md

@@ -1,6 +1,6 @@
 # Overview
 
-[PR-Agent](https://github.com/Codium-ai/pr-agent) is an open-source tool to help efficiently review and handle pull requests. 
+[PR-Agent](https://github.com/Codium-ai/pr-agent) is an open-source tool to help efficiently review and handle pull requests.
 Qodo Merge is a hosted version of PR-Agent, designed for companies and teams that require additional features and capabilities
 
 - See the [Installation Guide](./installation/index.md) for instructions on installing and running the tool on different git platforms.
@@ -9,6 +9,7 @@ Qodo Merge is a hosted version of PR-Agent, designed for companies and teams tha
 
 - See the [Tools Guide](./tools/index.md) for a detailed description of the different tools.
 
+- See the [Video Tutorials](https://www.youtube.com/playlist?list=PLRTpyDOSgbwFMA_VBeKMnPLaaZKwjGBFT) for practical demonstrations on how to use the tools.
 
 ## Docs Smart Search
 
@@ -21,67 +22,81 @@ To search the documentation site using natural language:
 
 2) The bot will respond with an [answer](https://github.com/Codium-ai/pr-agent/pull/1241#issuecomment-2365259334) that includes relevant documentation links.
 
+## Features
 
-## 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                                                                                                            |   ✅    |   ✅    |     ✅     |      ✅       |
-|       | [Auto-Approve](https://qodo-merge-docs.qodo.ai/tools/improve/#auto-approval) 💎                                       |   ✅    |   ✅    |   ✅        |            |
-|       | [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                                                                                               |   ✅    |   ✅    |     ✅     |      ✅       |
-|       | [Static code analysis](./core-abilities/static_code_analysis/){:target="_blank"} 💎                                   |   ✅    |   ✅    |           |              |
-|       | [Multiple configuration options](./usage-guide/configuration_options.md){:target="_blank"} 💎                         |   ✅    |   ✅    |     ✅     |      ✅       |
-
-💎 marks a feature available only in [Qodo Merge](https://www.codium.ai/pricing/){:target="_blank"}, and not in the open-source version.
+PR-Agent and Qodo Merge offers extensive pull request functionalities across various git providers:
 
+|       |                                                                                                         | 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://qodo-merge-docs.qodo.ai/tools/ask/#ask-lines)                             |   ✅   |   ✅   |           |              |
+|       | [Update CHANGELOG](https://qodo-merge-docs.qodo.ai/tools/update_changelog/)                             |   ✅   |   ✅   |    ✅     |      ✅      |
+|       | [Help Docs](https://qodo-merge-docs.qodo.ai/tools/help_docs/?h=auto#auto-approval)                      |   ✅   |   ✅   |    ✅     |              |
+|       | [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/) 💎                                        |   ✅   |   ✅   |    ✅     |              |
+|       | [Scan Repo Discussions](https://qodo-merge-docs.qodo.ai/tools/scan_repo_discussions/) 💎                |   ✅   |        |           |              |
+|       | [Auto-Approve](https://qodo-merge-docs.qodo.ai/tools/improve/?h=auto#auto-approval) 💎                  |   ✅   |   ✅   |    ✅     |              |
+|       |                                                                                                         |        |        |           |              |
+| USAGE | [CLI](https://qodo-merge-docs.qodo.ai/usage-guide/automations_and_usage/#local-repo-cli)                |   ✅   |   ✅   |    ✅     |      ✅      |
+|       | [App / webhook](https://qodo-merge-docs.qodo.ai/usage-guide/automations_and_usage/#github-app)          |   ✅   |   ✅   |    ✅     |      ✅      |
+|       | [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://qodo-merge-docs.qodo.ai/usage-guide/configuration_options/) 💎 |   ✅   |   ✅   |    ✅     |              |
+|       | [PR interactive actions](https://www.qodo.ai/images/pr_agent/pr-actions.mp4) 💎                         |   ✅   |   ✅   |           |              |
+|       | [Impact Evaluation](https://qodo-merge-docs.qodo.ai/core-abilities/impact_evaluation/) 💎               |   ✅   |   ✅   |           |              | 
+|       | [Code Validation 💎](https://qodo-merge-docs.qodo.ai/core-abilities/code_validation/)                   |   ✅   |   ✅   |    ✅     |      ✅      |
+|       | [Auto Best Practices 💎](https://qodo-merge-docs.qodo.ai/core-abilities/auto_best_practices/)                     |   ✅   |      |         |            |
+!!! note "💎 means Qodo Merge only"
+      All along the documentation, 💎 marks a feature available only in [Qodo Merge](https://www.codium.ai/pricing/){:target="_blank"}, and not in the open-source version.
 
 ## 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>

docs/docs/installation/azure.md

@@ -1,6 +1,8 @@
 ## Azure DevOps Pipeline
+
 You can use a pre-built Action Docker image to run PR-Agent as an Azure devops pipeline.
 add the following file to your repository under `azure-pipelines.yml`:
+
 ```yaml
 # Opt out of CI triggers
 trigger: none
@@ -49,6 +51,7 @@ stages:
         openai__key: $(OPENAI_KEY)
       displayName: 'Run Qodo Merge'
 ```
+
 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):
 
@@ -61,7 +64,8 @@ Make sure to give pipeline permissions to the `pr_agent` variable group.
 ## Azure DevOps from CLI
 
 To use Azure DevOps provider use the following settings in configuration.toml:
-```
+
+```toml
 [config]
 git_provider="azure"
 ```
@@ -74,7 +78,8 @@ If PAT was chosen, you can assign the value in .secrets.toml.
 If DefaultAzureCredential was chosen, you can assigned the additional env vars like AZURE_CLIENT_SECRET directly,
 or use managed identity/az cli (for local development) without any additional configuration.
 in any case, 'org' value must be assigned in .secrets.toml:
-```
+
+```toml
 [azure_devops]
 org = "https://dev.azure.com/YOUR_ORGANIZATION/"
 # pat = "YOUR_PAT_TOKEN" needed only if using PAT for authentication
@@ -85,11 +90,12 @@ org = "https://dev.azure.com/YOUR_ORGANIZATION/"
 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.
 
-
 For webhook security, create a sporadic username/password pair and configure the webhook username and password on both the server and Azure DevOps webhook. These will be sent as basic Auth data by the webhook with each request:
-```
+
+```toml
 [azure_devops_server]
 webhook_username = "<basic auth user>"
 webhook_password = "<basic auth password>"
 ```
+
 > :warning: **Ensure that the webhook endpoint is only accessible over HTTPS** to mitigate the risk of credential interception when using basic authentication.

docs/docs/installation/bitbucket.md

@@ -1,6 +1,5 @@
 ## Run as a Bitbucket Pipeline
 
-
 You can use the Bitbucket Pipeline system to run PR-Agent on every pull request open or update.
 
 1. Add the following file in your repository bitbucket-pipelines.yml
@@ -11,23 +10,24 @@ pipelines:
       '**':
         - step:
             name: PR Agent Review
-            image: python:3.12
-            services:
-              - docker
+            image: codiumai/pr-agent:latest
             script:
-              - docker run -e CONFIG.GIT_PROVIDER=bitbucket -e OPENAI.KEY=$OPENAI_API_KEY -e BITBUCKET.BEARER_TOKEN=$BITBUCKET_BEARER_TOKEN codiumai/pr-agent:latest --pr_url=https://bitbucket.org/$BITBUCKET_WORKSPACE/$BITBUCKET_REPO_SLUG/pull-requests/$BITBUCKET_PR_ID review
+              - pr-agent --pr_url=https://bitbucket.org/$BITBUCKET_WORKSPACE/$BITBUCKET_REPO_SLUG/pull-requests/$BITBUCKET_PR_ID review
 ```
 
 2. Add the following secure variables to your repository under Repository settings > Pipelines > Repository variables.
-OPENAI_API_KEY: `<your key>`
-BITBUCKET_BEARER_TOKEN: `<your token>`
+
+   - CONFIG__GIT_PROVIDER: `bitbucket`
+   - OPENAI__KEY: `<your key>`
+   - BITBUCKET__AUTH_TYPE: `basic` or `bearer` (default is `bearer`)
+   - BITBUCKET__BEARER_TOKEN: `<your token>` (required when auth_type is bearer)
+   - BITBUCKET__BASIC_TOKEN: `<your token>` (required when auth_type is basic)
 
 You can get a Bitbucket token for your repository by following Repository Settings -> Security -> Access Tokens.
+For basic auth, you can generate a base64 encoded token from your username:password combination.
 
 Note that comments on a PR are not supported in Bitbucket Pipeline.
 
-
-
 ## Bitbucket Server and Data Center
 
 Login into your on-prem instance of Bitbucket with your service account username and password.
@@ -48,6 +48,7 @@ git_provider="bitbucket_server"
 ```
 
 and pass the Pull request URL:
+
 ```shell
 python cli.py --pr_url https://git.onpreminstanceofbitbucket.com/projects/PROJECT/repos/REPO/pull-requests/1 review
 ```
@@ -55,7 +56,8 @@ python cli.py --pr_url https://git.onpreminstanceofbitbucket.com/projects/PROJEC
 ### Run it as service
 
 To run PR-Agent as webhook, build the docker image:
-```
+
+```bash
 docker build . -t codiumai/pr-agent:bitbucket_server_webhook --target bitbucket_server_webhook -f docker/Dockerfile
 docker push codiumai/pr-agent:bitbucket_server_webhook  # Push to your Docker repository
 ```

docs/docs/installation/github.md

@@ -40,6 +40,7 @@ The GITHUB_TOKEN secret is automatically created by GitHub.
 When you open your next PR, you should see a comment from `github-actions` bot with a review of your PR, and instructions on how to use the rest of the tools.
 
 4) You may configure Qodo Merge by adding environment variables under the env section corresponding to any configurable property in the [configuration](https://github.com/Codium-ai/pr-agent/blob/main/pr_agent/settings/configuration.toml) file. Some examples:
+
 ```yaml
       env:
         # ... previous environment values
@@ -47,9 +48,11 @@ When you open your next PR, you should see a comment from `github-actions` bot w
         PR_REVIEWER.REQUIRE_TESTS_REVIEW: "false" # Disable tests review
         PR_CODE_SUGGESTIONS.NUM_CODE_SUGGESTIONS: 6 # Increase number of code suggestions
 ```
+
 See detailed usage instructions in the [USAGE GUIDE](https://qodo-merge-docs.qodo.ai/usage-guide/automations_and_usage/#github-action)
 
 ### Using a specific release
+
 !!! tip ""
     if you want to pin your action to a specific release (v0.23 for example) for stability reasons, use:
     ```yaml
@@ -72,6 +75,7 @@ See detailed usage instructions in the [USAGE GUIDE](https://qodo-merge-docs.qod
     ```
 
 ### Action for GitHub enterprise server
+
 !!! tip ""
     To use the action with a GitHub enterprise server, add an environment variable `GITHUB.BASE_URL` with the API URL of your GitHub server.
 
@@ -82,10 +86,10 @@ See detailed usage instructions in the [USAGE GUIDE](https://qodo-merge-docs.qod
             GITHUB.BASE_URL: "https://github.mycompany.com/api/v3"
     ```
 
-
 ---
 
 ## Run as a GitHub App
+
 Allowing you to automate the review process on your private or public repositories.
 
 1) Create a GitHub App from the [Github Developer Portal](https://docs.github.com/en/developers/apps/creating-a-github-app).
@@ -102,7 +106,7 @@ Allowing you to automate the review process on your private or public repositori
 
 2) Generate a random secret for your app, and save it for later. For example, you can use:
 
-```
+```bash
 WEBHOOK_SECRET=$(python -c "import secrets; print(secrets.token_hex(10))")
 ```
 
@@ -113,28 +117,29 @@ WEBHOOK_SECRET=$(python -c "import secrets; print(secrets.token_hex(10))")
 
 4) Clone this repository:
 
-```
+```bash
 git clone https://github.com/Codium-ai/pr-agent.git
 ```
 
 5) Copy the secrets template file and fill in the following:
 
-```
+```bash
 cp pr_agent/settings/.secrets_template.toml pr_agent/settings/.secrets.toml
 # Edit .secrets.toml file
 ```
 
-   - Your OpenAI key.
-   - Copy your app's private key to the private_key field.
-   - Copy your app's ID to the app_id field.
-   - Copy your app's webhook secret to the webhook_secret field.
-   - Set deployment_type to 'app' in [configuration.toml](https://github.com/Codium-ai/pr-agent/blob/main/pr_agent/settings/configuration.toml)
+- Your OpenAI key.
+- Copy your app's private key to the private_key field.
+- Copy your app's ID to the app_id field.
+- Copy your app's webhook secret to the webhook_secret field.
+- Set deployment_type to 'app' in [configuration.toml](https://github.com/Codium-ai/pr-agent/blob/main/pr_agent/settings/configuration.toml)
 
     > The .secrets.toml file is not copied to the Docker image by default, and is only used for local development.
     > If you want to use the .secrets.toml file in your Docker image, you can add remove it from the .dockerignore file.
     > In most production environments, you would inject the secrets file as environment variables or as mounted volumes.
     > For example, in order to inject a secrets file as a volume in a Kubernetes environment you can update your pod spec to include the following,
     > assuming you have a secret named `pr-agent-settings` with a key named `.secrets.toml`:
+
     ```
            volumes:
             - name: settings-volume
@@ -152,7 +157,7 @@ cp pr_agent/settings/.secrets_template.toml pr_agent/settings/.secrets.toml
 
 6) Build a Docker image for the app and optionally push it to a Docker repository. We'll use Dockerhub as an example:
 
-    ```
+    ```bash
     docker build . -t codiumai/pr-agent:github_app --target github_app -f docker/Dockerfile
     docker push codiumai/pr-agent:github_app  # Push to your Docker repository
     ```
@@ -180,14 +185,19 @@ For example: `GITHUB.WEBHOOK_SECRET` --> `GITHUB__WEBHOOK_SECRET`
 
 1. Follow steps 1-5 from [here](#run-as-a-github-app).
 2. Build a docker image that can be used as a lambda function
+
     ```shell
     docker buildx build --platform=linux/amd64 . -t codiumai/pr-agent:serverless -f docker/Dockerfile.lambda
    ```
+
 3. Push image to ECR
+
     ```shell
-	docker tag codiumai/pr-agent:serverless <AWS_ACCOUNT>.dkr.ecr.<AWS_REGION>.amazonaws.com/codiumai/pr-agent:serverless
-	docker push <AWS_ACCOUNT>.dkr.ecr.<AWS_REGION>.amazonaws.com/codiumai/pr-agent:serverless
+
+ docker tag codiumai/pr-agent:serverless <AWS_ACCOUNT>.dkr.ecr.<AWS_REGION>.amazonaws.com/codiumai/pr-agent:serverless
+ docker push <AWS_ACCOUNT>.dkr.ecr.<AWS_REGION>.amazonaws.com/codiumai/pr-agent:serverless
     ```
+
 4. Create a lambda function that uses the uploaded image. Set the lambda timeout to be at least 3m.
 5. Configure the lambda function to have a Function URL.
 6. In the environment variables of the Lambda function, specify `AZURE_DEVOPS_CACHE_DIR` to a writable location such as /tmp. (see [link](https://github.com/Codium-ai/pr-agent/pull/450#issuecomment-1840242269))
@@ -201,28 +211,27 @@ For example: `GITHUB.WEBHOOK_SECRET` --> `GITHUB__WEBHOOK_SECRET`
 Not all features have been added to CodeCommit yet.  As of right now, CodeCommit has been implemented to run the Qodo Merge CLI on the command line, using AWS credentials stored in environment variables.  (More features will be added in the future.)  The following is a set of instructions to have Qodo Merge do a review of your CodeCommit pull request from the command line:
 
 1. Create an IAM user that you will use to read CodeCommit pull requests and post comments
-    * Note: That user should have CLI access only, not Console access
+    - Note: That user should have CLI access only, not Console access
 2. Add IAM permissions to that user, to allow access to CodeCommit (see IAM Role example below)
 3. Generate an Access Key for your IAM user
 4. Set the Access Key and Secret using environment variables (see Access Key example below)
 5. Set the `git_provider` value to `codecommit` in the `pr_agent/settings/configuration.toml` settings file
 6. Set the `PYTHONPATH` to include your `pr-agent` project directory
-    * Option A: Add `PYTHONPATH="/PATH/TO/PROJECTS/pr-agent` to your `.env` file
-    * Option B: Set `PYTHONPATH` and run the CLI in one command, for example:
-        * `PYTHONPATH="/PATH/TO/PROJECTS/pr-agent python pr_agent/cli.py [--ARGS]`
+    - Option A: Add `PYTHONPATH="/PATH/TO/PROJECTS/pr-agent` to your `.env` file
+    - Option B: Set `PYTHONPATH` and run the CLI in one command, for example:
+        - `PYTHONPATH="/PATH/TO/PROJECTS/pr-agent python pr_agent/cli.py [--ARGS]`
 
 ---
 
-
 #### AWS CodeCommit IAM Role Example
 
 Example IAM permissions to that user to allow access to CodeCommit:
 
-* Note: The following is a working example of IAM permissions that has read access to the repositories and write access to allow posting comments
-* Note: If you only want pr-agent to review your pull requests, you can tighten the IAM permissions further, however this IAM example will work, and allow the pr-agent to post comments to the PR
-* Note: You may want to replace the `"Resource": "*"` with your list of repos, to limit access to only those repos
+- Note: The following is a working example of IAM permissions that has read access to the repositories and write access to allow posting comments
+- Note: If you only want pr-agent to review your pull requests, you can tighten the IAM permissions further, however this IAM example will work, and allow the pr-agent to post comments to the PR
+- Note: You may want to replace the `"Resource": "*"` with your list of repos, to limit access to only those repos
 
-```
+```json
 {
     "Version": "2012-10-17",
     "Statement": [

docs/docs/installation/gitlab.md

@@ -1,7 +1,9 @@
 ## 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.
 
 (1) Add the following file to your repository under `.gitlab-ci.yml`:
+
 ```yaml
 stages:
   - pr_agent
@@ -26,10 +28,10 @@ pr_agent_job:
   rules:
     - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
 ```
+
 This script will run Qodo Merge on every new merge request. You can modify the `rules` section to run Qodo Merge on different events.
 You can also modify the `script` section to run different Qodo Merge commands, or with different parameters by exporting different environment variables.
 
-
 (2) Add the following masked variables to your GitLab repository (CI/CD -> Variables):
 
 - `GITLAB_PERSONAL_ACCESS_TOKEN`: Your GitLab personal access token.
@@ -40,7 +42,6 @@ Note that if your base branches are not protected, don't set the variables as `p
 
 > **Note**: The `$CI_SERVER_FQDN` variable is available starting from GitLab version 16.10. If you're using an earlier version, this variable will not be available. However, you can combine `$CI_SERVER_HOST` and `$CI_SERVER_PORT` to achieve the same result. Please ensure you're using a compatible version or adjust your configuration.
 
-
 ## Run a GitLab webhook server
 
 1. In GitLab create a new user and give it "Reporter" role ("Developer" if using Pro version of the agent) for the intended group or project.
@@ -49,41 +50,41 @@ Note that if your base branches are not protected, don't set the variables as `p
 
 3. Generate a random secret for your app, and save it for later (`shared_secret`). For example, you can use:
 
-```
+```bash
 SHARED_SECRET=$(python -c "import secrets; print(secrets.token_hex(10))")
 ```
 
 4. Clone this repository:
 
-```
+```bash
 git clone https://github.com/qodo-ai/pr-agent.git
 ```
 
 5. Prepare variables and secrets. Skip this step if you plan on setting these as environment variables when running the agent:
-  1. In the configuration file/variables:
+1. In the configuration file/variables:
     - Set `config.git_provider` to "gitlab"
 
-  2. In the secrets file/variables:
+2. In the secrets file/variables:
     - Set your AI model key in the respective section
     - In the [gitlab] section, set `personal_access_token` (with token from step 2) and `shared_secret` (with secret from step 3)
 
 6. Build a Docker image for the app and optionally push it to a Docker repository. We'll use Dockerhub as an example:
-```
+
+```bash
 docker build . -t gitlab_pr_agent --target gitlab_webhook -f docker/Dockerfile
 docker push codiumai/pr-agent:gitlab_webhook  # Push to your Docker repository
 ```
 
 7. Set the environmental variables, the method depends on your docker runtime. Skip this step if you included your secrets/configuration directly in the Docker image.
 
-```
-"CONFIG.GIT_PROVIDER": "gitlab"
-"GITLAB.PERSONAL_ACCESS_TOKEN": "<personal_access_token>"
-"GITLAB.SHARED_SECRET": "<shared_secret>"
-"GITLAB.URL": "https://gitlab.com"
-"OPENAI.KEY": "<your_openai_api_key>"
+```bash
+CONFIG__GIT_PROVIDER=gitlab
+GITLAB__PERSONAL_ACCESS_TOKEN=<personal_access_token>
+GITLAB__SHARED_SECRET=<shared_secret>
+GITLAB__URL=https://gitlab.com
+OPENAI__KEY=<your_openai_api_key>
 ```
 
-8. Create a webhook in your GitLab project. Set the URL to ```http[s]://<PR_AGENT_HOSTNAME>/webhook```, the secret token to the generated secret from step 3, and enable the triggers `push`, `comments` and `merge request events`.
+8. Create a webhook in your GitLab project. Set the URL to `http[s]://<PR_AGENT_HOSTNAME>/webhook`, the secret token to the generated secret from step 3, and enable the triggers `push`, `comments` and `merge request events`.
 
 9. Test your installation by opening a merge request or commenting on a merge request using one of PR Agent's commands.
-

docs/docs/installation/index.md

@@ -11,6 +11,7 @@ There are several ways to use self-hosted PR-Agent:
 - [Azure DevOps integration](./azure.md)
 
 ## Qodo Merge 💎
+
 Qodo Merge, an app hosted by QodoAI 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.

docs/docs/installation/locally.md

@@ -1,37 +1,42 @@
 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 and o3-mini (or a key for other [language models](https://qodo-merge-docs.qodo.ai/usage-guide/changing_a_model/), if you prefer).
+1. An OpenAI key from [here](https://platform.openai.com/api-keys){:target="_blank"}, with access to GPT-4 and o4-mini (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).
+A list of the relevant tools can be found in the [tools guide](../tools/).
 
 To invoke a tool (for example `review`), you can run PR-Agent directly from the Docker image. Here's how:
 
 - For GitHub:
-    ```
+
+    ```bash
     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:
-    ```
+
+    ```bash
     -e GITHUB.BASE_URL=https://github.mycompany.com/api/v3
     ```
 
 - For GitLab:
-    ```
+
+    ```bash
     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:
-    ```
+
+    ```bash
     -e GITLAB.URL=<your gitlab instance url>
     ```
 
 - For BitBucket:
-    ```
+
+    ```bash
     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
     ```
 
@@ -46,7 +51,7 @@ The `<TABLE>` refers to a table/section in a configuration file and `<KEY>=<VALU
 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:
 
-```
+```bash
 CONFIG__GIT_PROVIDER="gitlab"
 GITLAB__URL="<your url>"
 GITLAB__PERSONAL_ACCESS_TOKEN="<your token>"
@@ -76,7 +81,7 @@ Same goes for other providers, make sure to check the [documentation](https://qo
 
 Install the package:
 
-```
+```bash
 pip install pr-agent
 ```
 
@@ -109,18 +114,17 @@ if __name__ == '__main__':
     main()
 ```
 
-
 ## Run from source
 
 1. Clone this repository:
 
-```
+```bash
 git clone https://github.com/Codium-ai/pr-agent.git
 ```
 
 2. Navigate to the `/pr-agent` folder and install the requirements in your favorite virtual environment:
 
-```
+```bash
 pip install -e .
 ```
 
@@ -128,7 +132,7 @@ pip install -e .
 
 3. Copy the secrets template file and fill in your OpenAI key and your GitHub user token:
 
-```
+```bash
 cp pr_agent/settings/.secrets_template.toml pr_agent/settings/.secrets.toml
 chmod 600 pr_agent/settings/.secrets.toml
 # Edit .secrets.toml file
@@ -136,7 +140,7 @@ chmod 600 pr_agent/settings/.secrets.toml
 
 4. Run the cli.py script:
 
-```
+```bash
 python3 -m pr_agent.cli --pr_url <pr_url> review
 python3 -m pr_agent.cli --pr_url <pr_url> ask <your question>
 python3 -m pr_agent.cli --pr_url <pr_url> describe
@@ -148,6 +152,7 @@ python3 -m pr_agent.cli --issue_url <issue_url> similar_issue
 ```
 
 [Optional] Add the pr_agent folder to your PYTHONPATH
-```
+
+```bash
 export PYTHONPATH=$PYTHONPATH:<PATH to pr_agent folder>
 ```

docs/docs/installation/pr_agent.md

@@ -46,4 +46,4 @@ 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/)
+[View Azure DevOps Integration Guide →](https://qodo-merge-docs.qodo.ai/installation/azure/)

docs/docs/installation/qodo_merge.md

@@ -1,9 +1,21 @@
 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.
 
-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.
+## Trial Period and Licensing
+
+### Cloud Users with Teams Account
+
+A complimentary two-week trial is provided to all new users (with three additional grace usages). When the trial period ends, users will stop receiving feedback from Qodo Merge.
+
+Following the trial period, user licenses (seats) are required for continued access. Each user requires an individual seat license.
+After purchasing seats, the team owner can assign them to specific users through the management portal.
+
+With an assigned seat, users can seamlessly deploy the application across any of their code repositories.
+
+### Enterprise Account
+
+For organizations who require an Enterprise account, please [contact](https://www.qodo.ai/contact/#pricing) us to initiate a trial period, and to discuss pricing and licensing options.
+
 
 ## Install Qodo Merge for GitHub
 
@@ -23,7 +35,7 @@ For open-source projects, Qodo Merge is available for free usage. To install Qod
 
 ## Install Qodo Merge for Bitbucket
 
-###  Bitbucket Cloud
+### Bitbucket Cloud
 
 Qodo Merge for Bitbucket Cloud is available for installation through the following [link](https://bitbucket.org/site/addons/authorize?addon_key=d6df813252c37258)
 
@@ -33,8 +45,7 @@ Qodo Merge for Bitbucket Cloud is available for installation through the followi
 
 To use Qodo Merge application on your private Bitbucket Server, you will need to contact us for starting an [Enterprise](https://www.qodo.ai/pricing/) trial.
 
-
-## Install Qodo Merge for GitLab 
+## Install Qodo Merge for GitLab
 
 ### GitLab Cloud
 

docs/docs/overview/data_privacy.md

@@ -10,7 +10,6 @@
 
 - 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.
 
-
 ## Qodo Merge Chrome extension
 
 - The [Qodo Merge Chrome extension](https://chromewebstore.google.com/detail/pr-agent-chrome-extension/ephlnjeghhogofkifjloamocljapahnl) will not send your code to any external servers.

docs/docs/overview/pr_agent_pro.md

@@ -15,34 +15,33 @@ Qodo Merge is designed for companies and teams that require additional features
 
 ### 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 offers, and are not available in the open-source version of PR-Agent:
 
-| Feature                                                                                                              | Description                                                                                                                                                      |
-|----------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| [**Model selection**](https://qodo-merge-docs.qodo.ai/usage-guide/PR_agent_pro_models/)          | Choose the model that best fits your needs, among top models like `Claude Sonnet` and `o3-mini`
-| [**Global and wiki configuration**](https://qodo-merge-docs.qodo.ai/usage-guide/configuration_options/)              | Control configurations for many repositories from a single location; <br>Edit configuration of a single repo without committing code                              |
-| [**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 |
+| Feature                                                                                                              | Description                                                                                                                                            |
+| -------------------------------------------------------------------------------------------------------------------- |--------------------------------------------------------------------------------------------------------------------------------------------------------|
+| [**Model selection**](https://qodo-merge-docs.qodo.ai/usage-guide/PR_agent_pro_models/)                              | Choose the model that best fits your needs, among top models like `Claude Sonnet`, `o4-mini`                                                           |
+| [**Global and wiki configuration**](https://qodo-merge-docs.qodo.ai/usage-guide/configuration_options/)              | Control configurations for many repositories from a single location; <br>Edit configuration of a single repo without committing code                   |
+| [**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 |
-| [**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                                                                                                           |
+| [**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                                                                                                |
 
 ### Additional tools
 
 Here are additional tools that are available only for Qodo Merge users:
 
-| Feature                                                                               | Description |
-|---------------------------------------------------------------------------------------|-------------|
-| [**Custom Prompt Suggestions**](https://qodo-merge-docs.qodo.ai/tools/custom_prompt/) | Generate code suggestions based on custom prompts from the user |
+| Feature                                                                               | Description                                                                                               |
+| ------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------- |
+| [**Custom Prompt Suggestions**](https://qodo-merge-docs.qodo.ai/tools/custom_prompt/) | Generate code suggestions based on custom prompts from the user                                           |
 | [**Analyze PR components**](https://qodo-merge-docs.qodo.ai/tools/analyze/)           | Identify the components that changed in the PR, and enable to interactively apply different tools to them |
-| [**Tests**](https://qodo-merge-docs.qodo.ai/tools/test/)                              | Generate tests for code components that changed in the PR |
-| [**PR documentation**](https://qodo-merge-docs.qodo.ai/tools/documentation/)          | Generate docstring for code components that changed in the PR |
-| [**Improve Component**](https://qodo-merge-docs.qodo.ai/tools/improve_component/)     | Generate code suggestions for code components that changed in the PR |
-| [**Similar code search**](https://qodo-merge-docs.qodo.ai/tools/similar_code/)        | Search for similar code in the repository, organization, or entire GitHub |
-| [**Code implementation**](https://qodo-merge-docs.qodo.ai/tools/implement/)        | Generates implementation code from review suggestions |
-
+| [**Tests**](https://qodo-merge-docs.qodo.ai/tools/test/)                              | Generate tests for code components that changed in the PR                                                 |
+| [**PR documentation**](https://qodo-merge-docs.qodo.ai/tools/documentation/)          | Generate docstring for code components that changed in the PR                                             |
+| [**Improve Component**](https://qodo-merge-docs.qodo.ai/tools/improve_component/)     | Generate code suggestions for code components that changed in the PR                                      |
+| [**Similar code search**](https://qodo-merge-docs.qodo.ai/tools/similar_code/)        | Search for similar code in the repository, organization, or entire GitHub                                 |
+| [**Code implementation**](https://qodo-merge-docs.qodo.ai/tools/implement/)           | Generates implementation code from review suggestions                                                     |
 
 ### Supported languages
 

docs/docs/pr_benchmark/index.md

@@ -0,0 +1,201 @@
+# Qodo Merge Pull Request Benchmark
+
+## Methodology
+
+Qodo Merge PR Benchmark evaluates and compares the performance of two Large Language Models (LLMs) in analyzing pull request code and providing meaningful code suggestions.
+Our diverse dataset comprises of 400 pull requests from over 100 repositories, spanning various programming languages and frameworks to reflect real-world scenarios.
+
+- For each pull request, two distinct LLMs process the same prompt using the Qodo Merge `improve` tool, each generating two sets of responses. The prompt for response generation can be found [here](https://github.com/qodo-ai/pr-agent/blob/main/pr_agent/settings/code_suggestions/pr_code_suggestions_prompts_not_decoupled.toml).
+
+- Subsequently, a high-performing third model (an AI judge) evaluates the responses from the initial two models to determine the superior one. We utilize OpenAI's `o3` model as the judge, though other models have yielded consistent results. The prompt for this comparative judgment is available [here](https://github.com/Codium-ai/pr-agent-settings/tree/main/benchmark).
+
+- We aggregate comparison outcomes across all the pull requests, calculating the win rate for each model. We also analyze the qualitative feedback (the "why" explanations from the judge) to identify each model's comparative strengths and weaknesses.
+This approach provides not just a quantitative score but also a detailed analysis of each model's strengths and weaknesses.
+
+- For each model we build a "Model Card", comparing it against others. To ensure full transparency and enable community scrutiny, we also share the raw code suggestions generated by each model, and the judge's specific feedback. See example for the full output [here](https://github.com/Codium-ai/pr-agent-settings/blob/main/benchmark/sonnet_37_vs_gemini-2.5-pro-preview-05-06.md)
+
+Note that this benchmark focuses on quality: the ability of an LLM to process complex pull request with multiple files and nuanced task to produce high-quality code suggestions.
+Other factors like speed, cost, and availability, while also relevant for model selection, are outside this benchmark's scope.
+
+## TL;DR
+
+Here's a summary of the win rates based on the benchmark:
+
+[//]: # (| Model A                        | Model B                        | Model A Win Rate | Model B Win Rate |)
+
+[//]: # (|:-------------------------------|:-------------------------------|:----------------:|:----------------:|)
+
+[//]: # (| Gemini-2.5-pro-preview-05-06   | GPT-4.1                        |      70.4%       |      29.6%       |)
+
+[//]: # (| Gemini-2.5-pro-preview-05-06   | Sonnet 3.7                     |      78.1%       |      21.9%       |)
+
+[//]: # (| GPT-4.1                        | Sonnet 3.7                     |      61.0%       |      39.0%       |)
+
+<table>
+  <thead>
+    <tr>
+      <th style="text-align:left;">Model A</th>
+      <th style="text-align:left;">Model B</th>
+      <th style="text-align:center;">Model A Win Rate</th> <th style="text-align:center;">Model B Win Rate</th> </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td style="text-align:left;">Gemini-2.5-pro-preview-05-06</td>
+      <td style="text-align:left;">GPT-4.1</td>
+      <td style="text-align:center; color: #1E8449;"><b>70.4%</b></td> <td style="text-align:center; color: #D8000C;"><b>29.6%</b></td> </tr>
+    <tr>
+      <td style="text-align:left;">Gemini-2.5-pro-preview-05-06</td>
+      <td style="text-align:left;">Sonnet 3.7</td>
+      <td style="text-align:center; color: #1E8449;"><b>78.1%</b></td> <td style="text-align:center; color: #D8000C;"><b>21.9%</b></td> </tr>
+    <tr>
+      <td style="text-align:left;">Gemini-2.5-pro-preview-05-06</td>
+      <td style="text-align:left;">Gemini-2.5-flash-preview-04-17</td>
+      <td style="text-align:center; color: #1E8449;"><b>73.0%</b></td> <td style="text-align:center; color: #D8000C;"><b>27.0%</b></td> </tr>
+    <tr>
+      <td style="text-align:left;">Gemini-2.5-flash-preview-04-17</td>
+      <td style="text-align:left;">GPT-4.1</td>
+      <td style="text-align:center; color: #1E8449;"><b>54.6%</b></td> <td style="text-align:center; color: #D8000C;"><b>45.4%</b></td> </tr>
+    <tr>
+      <td style="text-align:left;">Gemini-2.5-flash-preview-04-17</td>
+      <td style="text-align:left;">Sonnet 3.7</td>
+      <td style="text-align:center; color: #1E8449;"><b>60.6%</b></td> <td style="text-align:center; color: #D8000C;"><b>39.4%</b></td> </tr>
+    <tr>
+      <td style="text-align:left;">GPT-4.1</td>
+      <td style="text-align:left;">Sonnet 3.7</td>
+      <td style="text-align:center; color: #1E8449;"><b>61.0%</b></td> <td style="text-align:center; color: #D8000C;"><b>39.0%</b></td> </tr>
+  </tbody>
+</table>
+
+
+## Gemini-2.5-pro-preview-05-06 - Model Card
+
+### Comparison against GPT-4.1
+
+![Comparison](https://codium.ai/images/qodo_merge_benchmark/gpt-4.1_vs_gemini-2.5-pro-preview-05-06_judge_o3.png){width=768}
+
+#### Analysis Summary
+
+Model 'Gemini-2.5-pro-preview-05-06' is generally more useful thanks to wider and more accurate bug detection and concrete patches, but it sacrifices compliance discipline and sometimes oversteps the task rules. Model 'GPT-4.1' is safer and highly rule-abiding, yet often too timid—missing many genuine issues and providing limited insight. An ideal reviewer would combine 'GPT-4.1’ restraint with 'Gemini-2.5-pro-preview-05-06' thoroughness.
+
+#### Detailed Analysis
+
+Gemini-2.5-pro-preview-05-06 strengths:  
+
+- better_bug_coverage: Detects and explains more critical issues, winning in ~70 % of comparisons and achieving a higher average score.  
+- actionable_fixes: Supplies clear code snippets, correct language labels, and often multiple coherent suggestions per diff.  
+- deeper_reasoning: Shows stronger grasp of logic, edge cases, and cross-file implications, leading to broader, high-impact reviews.  
+
+Gemini-2.5-pro-preview-05-06 weaknesses:  
+
+- guideline_violations: More prone to over-eager advice—non-critical tweaks, touching unchanged code, suggesting new imports, or minor format errors.  
+- occasional_overreach: Some fixes are speculative or risky, potentially introducing new bugs.  
+- redundant_or_duplicate: At times repeats the same point or exceeds the required brevity.  
+
+
+### Comparison against Sonnet 3.7
+
+![Comparison](https://codium.ai/images/qodo_merge_benchmark/sonnet_37_vs_gemini-2.5-pro-preview-05-06_judge_o3.png){width=768}
+
+#### Analysis Summary
+
+Model 'Gemini-2.5-pro-preview-05-06' is the stronger reviewer—more frequently identifies genuine, high-impact bugs and provides well-formed, actionable fixes. Model 'Sonnet 3.7' is safer against false positives and tends to be concise but often misses important defects or offers low-value or incorrect suggestions.
+
+See raw results [here](https://github.com/Codium-ai/pr-agent-settings/blob/main/benchmark/sonnet_37_vs_gemini-2.5-pro-preview-05-06.md)
+
+
+#### Detailed Analysis
+
+Gemini-2.5-pro-preview-05-06 strengths:  
+
+- higher_accuracy_and_coverage: finds real critical bugs and supplies actionable patches in most examples (better in 78 % of cases).  
+- guideline_awareness: usually respects new-lines-only scope, ≤3 suggestions, proper YAML, and stays silent when no issues exist.  
+- detailed_reasoning_and_patches: explanations tie directly to the diff and fixes are concrete, often catching multiple related defects that 'Sonnet 3.7' overlooks.
+
+Gemini-2.5-pro-preview-05-06 weaknesses:  
+
+- occasional_rule_violations: sometimes proposes new imports, package-version changes, or edits outside the added lines.  
+- overzealous_suggestions: may add speculative or stylistic fixes that exceed the “critical” scope, or mis-label severity.  
+- sporadic_technical_slips: a few patches contain minor coding errors, oversized snippets, or duplicate/contradicting advice.
+
+## GPT-4.1 - Model Card
+
+### Comparison against Sonnet 3.7
+
+![Comparison](https://codium.ai/images/qodo_merge_benchmark/gpt-4.1_vs_sonnet_3.7_judge_o3.png){width=768}
+
+#### Analysis Summary
+
+Model 'GPT-4.1' is safer and more compliant, preferring silence over speculation, which yields fewer rule breaches and false positives but misses some real bugs.  
+Model 'Sonnet 3.7' is more adventurous and often uncovers important issues that 'GPT-4.1' ignores, yet its aggressive style leads to frequent guideline violations and a higher proportion of incorrect or non-critical advice. 
+
+See raw results [here](https://github.com/Codium-ai/pr-agent-settings/blob/main/benchmark/gpt-4.1_vs_sonnet_3.7_judge_o3.md)
+
+
+#### Detailed Analysis
+
+GPT-4.1 strengths:  
+- Strong guideline adherence: usually stays strictly on `+` lines, avoids non-critical or stylistic advice, and rarely suggests forbidden imports; often outputs an empty list when no real bug exists.  
+- Lower false-positive rate: suggestions are more accurate and seldom introduce new bugs; fixes compile more reliably.  
+- Good schema discipline: YAML is almost always well-formed and fields are populated correctly.  
+
+GPT-4.1 weaknesses:  
+- Misses bugs: often returns an empty list even when a clear critical issue is present, so coverage is narrower.  
+- Sparse feedback: when it does comment, it tends to give fewer suggestions and sometimes lacks depth or completeness.  
+- Occasional metadata/slip-ups (wrong language tags, overly broad code spans), though less harmful than Sonnet 3.7 errors.  
+
+### Comparison against Gemini-2.5-pro-preview-05-06
+
+![Comparison](https://codium.ai/images/qodo_merge_benchmark/gpt-4.1_vs_gemini-2.5-pro-preview-05-06_judge_o3.png){width=768}
+
+#### Analysis Summary
+
+Model 'Gemini-2.5-pro-preview-05-06' is generally more useful thanks to wider and more accurate bug detection and concrete patches, but it sacrifices compliance discipline and sometimes oversteps the task rules. Model 'GPT-4.1' is safer and highly rule-abiding, yet often too timid—missing many genuine issues and providing limited insight. An ideal reviewer would combine 'GPT-4.1’ restraint with 'Gemini-2.5-pro-preview-05-06' thoroughness.
+
+#### Detailed Analysis
+
+GPT-4.1 strengths: 
+- strict_compliance: Usually sticks to the “critical bugs only / new ‘+’ lines only” rule, so outputs rarely violate task constraints.  
+- low_risk: Conservative behaviour avoids harmful or speculative fixes; safer when no obvious issue exists.  
+- concise_formatting: Tends to produce minimal, correctly-structured YAML without extra noise.  
+
+GPT-4.1 weaknesses:
+- under_detection: Frequently returns an empty list even when real bugs are present, missing ~70 % of the time.  
+- shallow_analysis: When it does suggest fixes, coverage is narrow and technical depth is limited, sometimes with wrong language tags or minor format slips.  
+- occasional_inaccuracy: A few suggestions are unfounded or duplicate, and rare guideline breaches (e.g., import advice) still occur.  
+
+
+## Sonnet 3.7 - Model Card
+
+### Comparison against GPT-4.1
+
+![Comparison](https://codium.ai/images/qodo_merge_benchmark/gpt-4.1_vs_sonnet_3.7_judge_o3.png){width=768}
+
+#### Analysis Summary
+
+Model 'GPT-4.1' is safer and more compliant, preferring silence over speculation, which yields fewer rule breaches and false positives but misses some real bugs.  
+Model 'Sonnet 3.7' is more adventurous and often uncovers important issues that 'GPT-4.1' ignores, yet its aggressive style leads to frequent guideline violations and a higher proportion of incorrect or non-critical advice. 
+
+See raw results [here](https://github.com/Codium-ai/pr-agent-settings/blob/main/benchmark/gpt-4.1_vs_sonnet_3.7_judge_o3.md)
+
+#### Detailed Analysis
+
+'Sonnet 3.7' strengths:
+- Better bug discovery breadth: more willing to dive into logic and spot critical problems that 'GPT-4.1' overlooks; often supplies multiple, detailed fixes.  
+- Richer explanations & patches: gives fuller context and, when correct, proposes more functional or user-friendly solutions.  
+- Generally correct language/context tagging and targeted code snippets.  
+
+'Sonnet 3.7' weaknesses:
+- Guideline violations: frequently flags non-critical issues, edits untouched code, or recommends adding imports, breaching task rules.  
+- Higher error rate: suggestions are more speculative and sometimes introduce new defects or duplicate work already done.  
+- Occasional schema or formatting mistakes (missing list value, duplicated suggestions), reducing reliability.  
+
+
+### Comparison against Gemini-2.5-pro-preview-05-06
+
+![Comparison](https://codium.ai/images/qodo_merge_benchmark/sonnet_37_vs_gemini-2.5-pro-preview-05-06_judge_o3.png){width=768}
+
+#### Analysis Summary
+
+Model 'Gemini-2.5-pro-preview-05-06' is the stronger reviewer—more frequently identifies genuine, high-impact bugs and provides well-formed, actionable fixes. Model 'Sonnet 3.7' is safer against false positives and tends to be concise but often misses important defects or offers low-value or incorrect suggestions.
+
+See raw results [here](https://github.com/Codium-ai/pr-agent-settings/blob/main/benchmark/sonnet_37_vs_gemini-2.5-pro-preview-05-06.md)

docs/docs/recent_updates/index.md

@@ -0,0 +1,21 @@
+# Recent Updates and Future Roadmap
+
+`Page last updated: 2025-05-11`
+
+This page summarizes recent enhancements to Qodo Merge (last three months).
+
+It also outlines our development roadmap for the upcoming three months. Please note that the roadmap is subject to change, and features may be adjusted, added, or reprioritized.
+
+=== "Recent Updates"
+    - **Chat on Suggestions**:  Users can now chat with Qodo Merge code suggestions ([Learn more](https://qodo-merge-docs.qodo.ai/tools/improve/#chat-on-code-suggestions))
+    - **Scan Repo Discussions Tool**: A new tool that analyzes past code discussions to generate a `best_practices.md` file, distilling key insights and recommendations. ([Learn more](https://qodo-merge-docs.qodo.ai/tools/scan_repo_discussions/))
+    - **Enhanced Models**: Qodo Merge now defaults to a combination of top models (Claude Sonnet 3.7 and Gemini 2.5 Pro) and incorporates dedicated code validation logic for improved results. ([Details 1](https://qodo-merge-docs.qodo.ai/usage-guide/qodo_merge_models/), [Details 2](https://qodo-merge-docs.qodo.ai/core-abilities/code_validation/))
+    - **Chrome Extension Update**: Qodo Merge Chrome extension now supports single-tenant users. ([Learn more](https://qodo-merge-docs.qodo.ai/chrome-extension/options/#configuration-options/))
+    - **Help Docs Tool**: The help_docs tool can answer free-text questions based on any git documentation folder. ([Learn more](https://qodo-merge-docs.qodo.ai/tools/help_docs/))
+
+=== "Future Roadmap"
+    - **Smart Update**: Upon PR updates, Qodo Merge will offer tailored code suggestions, addressing both the entire PR and the specific incremental changes since the last feedback.
+    - **CLI Endpoint**: A new Qodo Merge endpoint will accept lists of before/after code changes, execute Qodo Merge commands, and return the results.
+    - **Simplified Free Tier**: We plan to transition from a two-week free trial to a free tier offering a limited number of suggestions per month per organization.
+    - **Best Practices Hierarchy**: Introducing support for structured best practices, such as for folders in monorepos or a unified best practice file for a group of repositories.
+    - **Installation Metrics**: Upon installation, Qodo Merge will analyze past PRs for key metrics (e.g., time to merge, time to first reviewer feedback), enabling pre/post-installation comparison to calculate ROI.

docs/docs/tools/analyze.md

@@ -1,9 +1,11 @@
 ## Overview
+
 The `analyze` tool combines advanced static code analysis with LLM capabilities to provide a comprehensive analysis of the PR code changes.
 
 The tool scans the PR code changes, finds the code components (methods, functions, classes) that changed, and enables to interactively generate tests, docs, code suggestions and similar code search for each component.
 
 It can be invoked manually by commenting on any PR:
+
 ```
 /analyze
 ```

docs/docs/tools/ask.md

@@ -2,6 +2,7 @@
 
 The `ask` tool answers questions about the PR, based on the PR code changes. Make sure to be specific and clear in your questions.
 It can be invoked manually by commenting on any PR:
+
 ```
 /ask "..."
 ```
@@ -15,6 +16,7 @@ It can be invoked manually by commenting on any PR:
 ## Ask lines
 
 You can run `/ask` on specific lines of code in the PR from the PR's diff view. The tool will answer questions based on the code changes in the selected lines.
+
 - Click on the '+' sign next to the line number to select the line.
 - To select multiple lines, click on the '+' sign of the first line and then hold and drag to select the rest of the lines.
 - write `/ask "..."` in the comment box and press `Add single comment` button.
@@ -28,11 +30,13 @@ Note that the tool does not have "memory" of previous questions, and answers eac
 You can also ask questions about images that appear in the comment, where the entire PR code will be used as context.
 <br>
 The basic syntax is:
+
 ```
 /ask "..."
 
 [Image](https://real_link_to_image)
 ```
+
 where `https://real_link_to_image` is the direct link to the image.
 
 Note that GitHub has a built-in mechanism of pasting images in comments. However, pasted image does not provide a direct link.
@@ -55,5 +59,4 @@ To get a direct link to an image, we recommend using the following scheme:
 
 ![Ask image5](https://codium.ai/images/pr_agent/ask_images5.png){width=512}
 
-
 See a full video tutorial [here](https://codium.ai/images/pr_agent/ask_image_video.mov)

docs/docs/tools/ci_feedback.md

@@ -18,20 +18,24 @@ The tool analyzes the failed checks and provides several feedbacks:
 ___
 
 In addition to being automatically triggered, the tool can also be invoked manually by commenting on a PR:
+
 ```
 /checks "https://github.com/{repo_name}/actions/runs/{run_number}/job/{job_number}"
 ```
+
 where `{repo_name}` is the name of the repository, `{run_number}` is the run number of the failed check, and `{job_number}` is the job number of the failed check.
 
 ## Disabling the tool from running automatically
 
 If you wish to disable the tool from running automatically, you can do so by adding the following configuration to the configuration file:
+
 ```
 [checks]
 enable_auto_checks_feedback = false
 ```
 
 ## Configuration options
+
 - `enable_auto_checks_feedback` - if set to true, the tool will automatically provide feedback when a check is failed. Default is true.
 - `excluded_checks_list` - a list of checks to exclude from the feedback, for example: ["check1", "check2"]. Default is an empty list.
 - `persistent_comment` - if set to true, the tool will overwrite a previous checks comment with the new feedback. Default is true.

docs/docs/tools/custom_labels.md

@@ -1,7 +1,9 @@
 ## Overview
+
 The `generate_labels` tool scans the PR code changes, and given a list of labels and their descriptions, it automatically suggests labels that match the PR code changes.
 
 It can be invoked manually by commenting on any PR:
+
 ```
 /generate_labels
 ```
@@ -19,21 +21,26 @@ When running the `generate_labels` tool on a PR that includes changes in SQL que
 Note that in addition to the dedicated tool `generate_labels`, the custom labels will also be used by the `describe` tool.
 
 ### How to enable custom labels
+
 There are 3 ways to enable custom labels:
 
 #### 1. CLI (local configuration file)
+
 When working from CLI, you need to apply the [configuration changes](#configuration-options) to the [custom_labels file](https://github.com/Codium-ai/pr-agent/blob/main/pr_agent/settings/custom_labels.toml):
 
 #### 2. Repo configuration file
+
 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
 
 * 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.
 
 b. Add/edit the custom labels. It should be formatted as follows:
+
 * Label name: The name of the custom label.
 * Description: Start the description of with prefix `pr_agent:`, for example: `pr_agent: Description of when AI should suggest this label`.<br>
 The description should be comprehensive and detailed, indicating when to add the desired label.
@@ -45,8 +52,9 @@ c. Now the custom labels will be included in the `generate_labels` tool.
 > This feature is supported in GitHub and GitLab.
 
 ## Configuration options
- - Change `enable_custom_labels` to True: This will turn off the default labels and enable the custom labels provided in the custom_labels.toml file.
- - Add the custom labels. It should be formatted as follows:
+
+* Change `enable_custom_labels` to True: This will turn off the default labels and enable the custom labels provided in the custom_labels.toml file.
+* Add the custom labels. It should be formatted as follows:
 
 ```
 [config]

docs/docs/tools/custom_prompt.md

@@ -1,4 +1,5 @@
 ## Overview
+
 The `custom_prompt` tool scans the PR code changes, and automatically generates suggestions for improving the PR code.
 It shares similarities with the `improve` tool, but with one main difference: the `custom_prompt` tool will **only propose suggestions that follow specific guidelines defined by the prompt** in: `pr_custom_prompt.prompt` configuration.
 
@@ -17,7 +18,7 @@ The code suggestions should focus only on the following:
 
 With a [configuration file](../usage-guide/automations_and_usage.md#github-app), use the following template:
 
-```
+```toml
 [pr_custom_prompt]
 prompt="""\
 The suggestions should focus only on the following:
@@ -33,7 +34,8 @@ You might benefit from several trial-and-error iterations, until you get the cor
 ## Example usage
 
 Here is an example of a possible prompt, defined in the configuration file:
-```
+
+```toml
 [pr_custom_prompt]
 prompt="""\
 The code suggestions should focus only on the following:
@@ -53,6 +55,6 @@ Results obtained with the prompt above:
 
 - `prompt`: the prompt for the tool. It should be a multi-line string.
 
-- `num_code_suggestions_per_chunk`: number of code suggestions provided by the 'custom_prompt' tool, per chunk. Default is 4.
+- `num_code_suggestions_per_chunk`: number of code suggestions provided by the 'custom_prompt' tool, per chunk. Default is 3.
 
 - `enable_help_text`: if set to true, the tool will display a help text in the comment. Default is true.

docs/docs/tools/describe.md

@@ -1,7 +1,9 @@
 ## Overview
+
 The `describe` tool scans the PR code changes, and generates a description for the PR - title, type, summary, walkthrough and labels.
 
 The tool can be triggered automatically every time a new PR is [opened](../usage-guide/automations_and_usage.md#github-app-automatic-tools-when-a-new-pr-is-opened), or it can be invoked manually by commenting on any PR:
+
 ```
 /describe
 ```
@@ -19,6 +21,7 @@ After ~30 seconds, the tool will generate a description for the PR:
 ![Describe New](https://codium.ai/images/pr_agent/describe_new.png){width=512}
 
 If you want to edit [configurations](#configuration-options), add the relevant ones to the command:
+
 ```
 /describe --pr_description.some_config1=... --pr_description.some_config2=...
 ```
@@ -26,6 +29,7 @@ If you want to edit [configurations](#configuration-options), add the relevant o
 ### Automatic triggering
 
 To run the `describe` automatically when a PR is opened, define in a [configuration file](https://qodo-merge-docs.qodo.ai/usage-guide/configuration_options/#wiki-configuration-file):
+
 ```
 [github_app]
 pr_commands = [
@@ -41,6 +45,16 @@ publish_labels = true
 - The `pr_commands` lists commands that will be executed automatically when a PR is opened.
 - The `[pr_description]` section contains the configurations for the `describe` tool you want to edit (if any).
 
+## Preserving the original user description
+
+By default, Qodo Merge preserves your original PR description by placing it above the generated content.
+This requires including your description during the initial PR creation.
+Be aware that if you edit the description while the automated tool is running, a race condition may occur, potentially causing your original description to be lost.
+
+When updating PR descriptions, the `/describe` tool considers everything above the "PR Type" field as user content and will preserve it.
+Everything below this marker is treated as previously auto-generated content and will be replaced.
+
+![Describe comment](https://codium.ai/images/pr_agent/pr_description_user_description.png){width=512}
 
 ## Configuration options
 
@@ -97,7 +111,6 @@ publish_labels = true
       </tr>
     </table>
 
-
 ## Inline file summary 💎
 
 This feature enables you to copy the `changes walkthrough` table to the "Files changed" tab, so you can quickly understand the changes in each file while reviewing the code changes (diff view).
@@ -120,13 +133,13 @@ If you prefer to have the file summaries appear in the "Files changed" tab on ev
 
 **Note**: that this feature is currently available only for GitHub.
 
-
 ## Markers template
 
 To enable markers, set `pr_description.use_description_markers=true`.
 Markers enable to easily integrate user's content and auto-generated content, with a template-like mechanism.
 
 For example, if the PR original description was:
+
 ```
 User content...
 
@@ -139,6 +152,7 @@ pr_agent:summary
 ## PR Walkthrough:
 pr_agent:walkthrough
 ```
+
 The marker `pr_agent:type` will be replaced with the PR type, `pr_agent:summary` will be replaced with the PR summary, and `pr_agent:walkthrough` will be replaced with the PR walkthrough.
 
 ![Describe markers before](https://codium.ai/images/pr_agent/describe_markers_before.png){width=512}
@@ -147,13 +161,13 @@ becomes
 
 ![Describe markers after](https://codium.ai/images/pr_agent/describe_markers_after.png){width=512}
 
-
 **Configuration params**:
 
 - `use_description_markers`: if set to true, the tool will use markers template. It replaces every marker of the form `pr_agent:marker_name` with the relevant content. Default is false.
 - `include_generated_by_header`: if set to true, the tool will add a dedicated header: 'Generated by PR Agent at ...' to any automatic content. Default is true.
 
 ## Custom labels
+
 The default labels of the describe tool are quite generic, since they are meant to be used in any repo: [`Bug fix`, `Tests`, `Enhancement`, `Documentation`, `Other`].
 
 You can define custom labels that are relevant for your repo and use cases.
@@ -163,7 +177,9 @@ Make sure to provide proper title, and a detailed and well-phrased description f
 Each label description should be a **conditional statement**, that indicates if to add the label to the PR or not, according to the PR content.
 
 ### Handle custom labels from a configuration file
+
 Example for a custom labels configuration setup in a configuration file:
+
 ```
 [config]
 enable_custom_labels=true
@@ -182,26 +198,25 @@ description = "use when a PR primarily contains new tests"
 
 You can also control the custom labels that will be suggested by the `describe` tool from the repo's labels page:
 
-* GitHub : go to `https://github.com/{owner}/{repo}/labels` (or click on the "Labels" tab in the issues or PRs page)
-* GitLab : go to `https://gitlab.com/{owner}/{repo}/-/labels` (or click on "Manage" -> "Labels" on the left menu)
+- GitHub : go to `https://github.com/{owner}/{repo}/labels` (or click on the "Labels" tab in the issues or PRs page)
+- GitLab : go to `https://gitlab.com/{owner}/{repo}/-/labels` (or click on "Manage" -> "Labels" on the left menu)
 
 Now add/edit the custom labels. they should be formatted as follows:
 
-* Label name: The name of the custom label.
-* Description: Start the description of with prefix `pr_agent:`, for example: `pr_agent: Description of when AI should suggest this label`.<br>
+- Label name: The name of the custom label.
+- Description: Start the description of with prefix `pr_agent:`, for example: `pr_agent: Description of when AI should suggest this label`.<br>
 
 Examples for custom labels:
 
-  - `Main topic:performance` -  pr_agent:The main topic of this PR is performance
-  - `New endpoint` -  pr_agent:A new endpoint was added in this PR
-  - `SQL query` -  pr_agent:A new SQL query was added in this PR
-  - `Dockerfile changes` - pr_agent:The PR contains changes in the Dockerfile
-  - ...
+- `Main topic:performance` -  pr_agent:The main topic of this PR is performance
+- `New endpoint` -  pr_agent:A new endpoint was added in this PR
+- `SQL query` -  pr_agent:A new SQL query was added in this PR
+- `Dockerfile changes` - pr_agent:The PR contains changes in the Dockerfile
+- ...
 
 The description should be comprehensive and detailed, indicating when to add the desired label. For example:
 ![Add native custom labels](https://codium.ai/images/pr_agent/add_native_custom_labels.png){width=768}
 
-
 ## Usage Tips
 
 !!! tip "Automation"
@@ -211,14 +226,15 @@ The description should be comprehensive and detailed, indicating when to add the
     ```
     meaning the `describe` tool will run automatically on every PR, with the default configurations.
 
+- Markers are an alternative way to control the generated description, to give maximal control to the user. If you set:
 
-   - Markers are an alternative way to control the generated description, to give maximal control to the user. If you set:
    ```
    pr_commands = ["/describe --pr_description.use_description_markers=true", ...]
    ```
+
    the tool will replace every marker of the form `pr_agent:marker_name` in the PR description with the relevant content, where `marker_name` is one of the following:
-         * `type`: the PR type.
+         *`type`: the PR type.
          * `summary`: the PR summary.
          * `walkthrough`: the PR walkthrough.
 
-   - Note that when markers are enabled, if the original PR description does not contain any markers, the tool will not alter the description at all.
+- Note that when markers are enabled, if the original PR description does not contain any markers, the tool will not alter the description at all.

docs/docs/tools/documentation.md

@@ -1,7 +1,9 @@
 ## Overview
+
 The `add_docs` tool scans the PR code changes, and automatically suggests documentation for any code components that changed in the PR (functions, classes, etc.).
 
 It can be invoked manually by commenting on any PR:
+
 ```
 /add_docs
 ```
@@ -19,13 +21,15 @@ The tool will generate documentation for all the components that changed in the
 ![Docs single component](https://codium.ai/images/pr_agent/docs_single_component.png){width=768}
 
 You can state a name of a specific component in the PR to get documentation only for that component:
+
 ```
 /add_docs component_name
 ```
 
 ## Configuration options
- - `docs_style`: The exact style of the documentation (for python docstring). you can choose between: `google`, `numpy`, `sphinx`, `restructuredtext`, `plain`. Default is `sphinx`.
- - `extra_instructions`: Optional extra instructions to the tool. For example: "focus on the changes in the file X. Ignore change in ...".
+
+- `docs_style`: The exact style of the documentation (for python docstring). you can choose between: `google`, `numpy`, `sphinx`, `restructuredtext`, `plain`. Default is `sphinx`.
+- `extra_instructions`: Optional extra instructions to the tool. For example: "focus on the changes in the file X. Ignore change in ...".
 
 !!! note "Notes"
     - The following languages are currently supported: Python, Java, C++, JavaScript, TypeScript, C#.

docs/docs/tools/help.md

@@ -1,13 +1,16 @@
 ## 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.
 
 It can be invoked manually by commenting on any PR:
+
 ```
 /help
 ```
 
 ## Example usage
+
 An example [result](https://github.com/Codium-ai/pr-agent/pull/546#issuecomment-1868524805):
 
 ![Help 1](https://codium.ai/images/pr_agent/help1.png){width=750}

docs/docs/tools/help_docs.md

@@ -3,9 +3,11 @@
 The `help_docs` tool can answer a free-text question based on a git documentation folder.
 
 It can be invoked manually by commenting on any PR or Issue:
+
 ```
 /help_docs "..."
 ```
+
 Or configured to be triggered automatically when a [new issue is opened](#run-as-a-github-action).
 
 The tool assumes by default that the documentation is located in the root of the repository, at `/docs` folder.
@@ -92,8 +94,8 @@ jobs:
 
 3) Following completion of the remaining steps (such as adding secrets and relevant configurations, such as `repo_url` and `docs_path`) merge this change to your main branch.
 When a new issue is opened, you should see a comment from `github-actions` bot with an auto response, assuming the question is related to the documentation of the repository.
----
 
+---
 
 ## Configuration options
 

docs/docs/tools/implement.md

@@ -7,28 +7,31 @@ It leverages LLM technology to transform PR comments and review suggestions into
 
 ## Usage Scenarios
 
-
 ### For Reviewers
 
 Reviewers can request code changes by:
 
 1. Selecting the code block to be modified.
-2. Adding a comment with the syntax: 
+2. Adding a comment with the syntax:
+
 ```
 /implement <code-change-description>
 ```
 
 ![implement1](https://codium.ai/images/pr_agent/implement1.png){width=640}
 
-
 ### For PR Authors
 
 PR authors can implement suggested changes by replying to a review comment using either: <br>
+
 1. Add specific implementation details as described above
+
 ```
 /implement <code-change-description>
 ```
+
 2. Use the original review comment as instructions
+
 ```
 /implement
 ```
@@ -38,6 +41,7 @@ PR authors can implement suggested changes by replying to a review comment using
 ### For Referencing Comments
 
 You can reference and implement changes from any comment by:
+
 ```
 /implement <link-to-review-comment>
 ```
@@ -46,7 +50,6 @@ You can reference and implement changes from any comment by:
 
 Note that the implementation will occur within the review discussion thread.
 
-
 **Configuration options**
 
 - Use `/implement` to implement code change within and based on the review discussion.

docs/docs/tools/improve.md

@@ -1,17 +1,26 @@
 ## Overview
-The `improve` tool scans the PR code changes, and automatically generates [meaningful](https://github.com/Codium-ai/pr-agent/blob/main/pr_agent/settings/pr_code_suggestions_prompts.toml#L41) suggestions for improving the PR code.
+
+The `improve` tool scans the PR code changes, and automatically generates meaningful suggestions for improving the PR code.
 The tool can be triggered automatically every time a new PR is [opened](../usage-guide/automations_and_usage.md#github-app-automatic-tools-when-a-new-pr-is-opened), or it can be invoked manually by commenting on any PR:
+
 ```toml
 /improve
 ```
 
-![code_suggestions_as_comment_closed.png](https://codium.ai/images/pr_agent/code_suggestions_as_comment_closed.png){width=512}
+## How it looks
 
-![code_suggestions_as_comment_open.png](https://codium.ai/images/pr_agent/code_suggestions_as_comment_open.png){width=512}
+=== "Suggestions Overview"
+    ![code_suggestions_as_comment_closed](https://codium.ai/images/pr_agent/code_suggestions_as_comment_closed.png){width=512}
+
+=== "Selecting a specific suggestion"
+    ![code_suggestions_as_comment_open](https://codium.ai/images/pr_agent/code_suggestions_as_comment_open.png){width=512}
+
+___
 
 !!! note "The following features are available only for Qodo Merge 💎 users:"
-    - The `Apply this suggestion` checkbox, which interactively converts a suggestion into a committable code comment
+    - The `Apply / Chat` checkbox, which interactively converts a suggestion into a committable code comment
     - The `More` checkbox to generate additional suggestions
+    - On Bitbucket (Cloud & Data Center) and GitLab Server (v16 and earlier), you can invoke [More Suggestions manually](#manual-more-suggestions)
 
 ## Example usage
 
@@ -19,25 +28,34 @@ The tool can be triggered automatically every time a new PR is [opened](../usage
 
 Invoke the tool manually by commenting `/improve` on any PR. The code suggestions by default are presented as a single comment:
 
-To edit [configurations](#configuration-options) related to the improve tool, use the following template:
+To edit [configurations](#configuration-options) related to the `improve` tool, use the following template:
+
 ```toml
 /improve --pr_code_suggestions.some_config1=... --pr_code_suggestions.some_config2=...
 ```
 
-For example, you can choose to present all the suggestions as commitable code comments, by running the following command:
+For example, you can choose to present all the suggestions as committable code comments, by running the following command:
+
 ```toml
 /improve --pr_code_suggestions.commitable_code_suggestions=true
 ```
 
 ![improve](https://codium.ai/images/pr_agent/improve.png){width=512}
 
-
 As can be seen, a single table comment has a significantly smaller PR footprint. We recommend this mode for most cases.
 Also note that collapsible are not supported in _Bitbucket_. Hence, the suggestions can only be presented in Bitbucket as code comments.
 
+#### Manual more suggestions
+To generate more suggestions (distinct from the ones already generated), for git-providers that don't support interactive checkbox option, you can manually run:
+
+```
+/improve --more_suggestions=true
+```
+
 ### Automatic triggering
 
 To run the `improve` automatically when a PR is opened, define in a [configuration file](https://qodo-merge-docs.qodo.ai/usage-guide/configuration_options/#wiki-configuration-file):
+
 ```toml
 [github_app]
 pr_commands = [
@@ -54,6 +72,7 @@ num_code_suggestions_per_chunk = ...
 - The `[pr_code_suggestions]` section contains the configurations for the `improve` tool you want to edit (if any)
 
 ### Assessing Impact
+
 >`💎 feature`
 
 Qodo Merge tracks two types of implementations for tracking implemented suggestions:
@@ -61,15 +80,16 @@ Qodo Merge tracks two types of implementations for tracking implemented suggesti
 - 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.
 
-![code_suggestions_asses_impact](https://codium.ai/images/pr_agent/code_suggestions_asses_impact.png){width=512}
+![code_suggestions_assess_impact](https://codium.ai/images/pr_agent/code_suggestions_asses_impact.png){width=512}
 
 In post-process, Qodo Merge counts the number of suggestions that were implemented, and provides general statistics and insights about the suggestions' impact on the PR process.
 
-![code_suggestions_asses_impact_stats_1](https://codium.ai/images/pr_agent/code_suggestions_asses_impact_stats_1.png){width=512}
+![code_suggestions_assess_impact_stats_1](https://codium.ai/images/pr_agent/code_suggestions_asses_impact_stats_1.png){width=512}
 
-![code_suggestions_asses_impact_stats_2](https://codium.ai/images/pr_agent/code_suggestions_asses_impact_stats_2.png){width=512}
+![code_suggestions_assess_impact_stats_2](https://codium.ai/images/pr_agent/code_suggestions_asses_impact_stats_2.png){width=512}
 
 ## Suggestion tracking
+
 >`💎 feature. 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.
@@ -107,15 +127,17 @@ You can use the `extra_instructions` configuration option to give the AI model a
 Be specific, clear, and concise in the instructions. With extra instructions, you are the prompter.
 
 Examples for possible instructions:
+
 ```toml
 [pr_code_suggestions]
 extra_instructions="""\
-(1) Answer in japanese
+(1) Answer in Japanese
 (2) Don't suggest to add try-except block
 (3) Ignore changes in toml files
 ...
 """
 ```
+
 Use triple quotes to write multi-line instructions. Use bullet points or numbers to make the instructions more readable.
 
 ### Best practices
@@ -128,7 +150,8 @@ This page can contain a list of best practices, coding standards, and guidelines
 The AI model will use this `best_practices.md` file as a reference, and in case the PR code violates any of the guidelines, it will create additional suggestions, with a dedicated label: `Organization
 best practice`.
 
-Example for a python `best_practices.md` content:
+Example for a Python `best_practices.md` content:
+
 ```markdown
 ## Project best practices
 - Make sure that I/O operations are encapsulated in a try-except block
@@ -145,10 +168,18 @@ Tips for writing an effective `best_practices.md` file:
 - Include brief code examples when helpful
 - Focus on project-specific guidelines, that will result in relevant suggestions you actually want to get
 - Keep the file relatively short, under 800 lines, since:
-    - AI models may not process effectively very long documents
-    - Long files tend to contain generic guidelines already known to AI
+  - AI models may not process effectively very long documents
+  - Long files tend to contain generic guidelines already known to AI
+
+To control the number of best practices suggestions generated by the `improve` tool, give the following configuration:
+
+```toml
+[best_practices]
+num_best_practice_suggestions = 2
+```
 
 #### Local and global best practices
+
 By default, Qodo Merge will look for a local `best_practices.md` in the root of the relevant local repo.
 
 If you want to enable also a global `best_practices.md` file, set first in the global configuration file:
@@ -161,7 +192,8 @@ enable_global_best_practices = true
 Then, create a `best_practices.md` file in the root of [global](https://qodo-merge-docs.qodo.ai/usage-guide/configuration_options/#global-configuration-file) configuration repository,  `pr-agent-settings`.
 
 #### Best practices for multiple languages
-For a git organization working with multiple programming languages, you can maintain a centralized global `best_practices.md` file containing language-specific guidelines. 
+
+For a git organization working with multiple programming languages, you can maintain a centralized global `best_practices.md` file containing language-specific guidelines.
 When reviewing pull requests, Qodo Merge automatically identifies the programming language and applies the relevant best practices from this file.
 
 To do this, structure your `best_practices.md` file using the following format:
@@ -176,7 +208,8 @@ To do this, structure your `best_practices.md` file using the following format:
 ```
 
 #### Dedicated label for best practices suggestions
-Best practice suggestions are labeled as `Organization best practice` by default. 
+
+Best practice suggestions are labeled as `Organization best practice` by default.
 To customize this label, modify it in your configuration file:
 
 ```toml
@@ -186,7 +219,6 @@ organization_name = "..."
 
 And the label will be: `{organization_name} best practice`.
 
-
 #### Example results
 
 ![best_practice](https://codium.ai/images/pr_agent/org_best_practice.png){width=512}
@@ -201,7 +233,7 @@ And the label will be: `{organization_name} best practice`.
 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. 
+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
@@ -227,8 +259,13 @@ extra_instructions = ""
 max_patterns = 5                   
 ```
 
+### Multiple best practices sources
+
+The `improve` tool will combine best practices from all available sources - global configuration, local configuration, and auto-generated files - to provide you with comprehensive recommendations.
+
 
 ### Combining 'extra instructions' and 'best practices'
+
 > `💎 feature`
 
 The `extra instructions` configuration is more related to the `improve` tool prompt. It can be used, for example, to avoid specific suggestions ("Don't suggest to add try-except block", "Ignore changes in toml files", ...) or to emphasize specific aspects or formats ("Answer in Japanese", "Give only short suggestions", ...)
@@ -237,10 +274,10 @@ In contrast, the `best_practices.md` file is a general guideline for the way cod
 
 Using a combination of both can help the AI model to provide relevant and tailored suggestions.
 
-
 ## Usage Tips
 
 ### Implementing the proposed code suggestions
+
 Each generated suggestion consists of three key elements:
 
 1. A single-line summary of the proposed change
@@ -248,14 +285,54 @@ Each generated suggestion consists of three key elements:
 3. A diff snippet showing the recommended code modification (before and after)
 
 We advise users to apply critical analysis and judgment when implementing the proposed suggestions.
-In addition to mistakes (which may happen, but are rare), sometimes the presented code modification may serve more as an _illustrative example_ than a direct applicable solution.
+In addition to mistakes (which may happen, but are rare), sometimes the presented code modification may serve more as an _illustrative example_ than a directly applicable solution.
 In such cases, we recommend prioritizing the suggestion's detailed description, using the diff snippet primarily as a supporting reference.
 
+
+### Chat on code suggestions 
+
+> `💎 feature` Platforms supported: GitHub, GitLab
+
+Qodo Merge implements an orchestrator agent that enables interactive code discussions, listening and responding to comments without requiring explicit tool calls.
+The orchestrator intelligently analyzes your responses to determine if you want to implement a suggestion, ask a question, or request help, then delegates to the appropriate specialized tool.
+
+#### Setup and Activation
+
+Enable interactive code discussions by adding the following to your configuration file (default is `True`):
+
+```toml
+[pr_code_suggestions]
+enable_chat_in_code_suggestions = true
+```
+
+!!! info "Activating Dynamic Responses"
+    To obtain dynamic responses, the following steps are required:
+
+    1. Run the `/improve` command (mostly automatic)
+    2. Tick the `/improve` recommendation checkboxes (_Apply this suggestion_) to have Qodo Merge generate a new inline code suggestion discussion
+    3. The orchestrator agent will then automatically listen and reply to comments within the discussion without requiring additional commands
+
+#### Explore the available interaction patterns:
+
+!!! tip "Tip: Direct the agent with keywords"
+    Use "implement" or "apply" for code generation. Use "explain", "why", or "how" for information and help.
+
+=== "Asking for Details"
+    ![Chat on code suggestions ask](https://codium.ai/images/pr_agent/improve_chat_on_code_suggestions_ask.png){width=512}
+
+=== "Implementing Suggestions"
+    ![Chat on code suggestions implement](https://codium.ai/images/pr_agent/improve_chat_on_code_suggestions_implement.png){width=512}
+
+=== "Providing Additional Help"
+    ![Chat on code suggestions help](https://codium.ai/images/pr_agent/improve_chat_on_code_suggestions_help.png){width=512}
+
+
 ### Dual publishing mode
+
 Our recommended approach for presenting code suggestions is through a [table](https://qodo-merge-docs.qodo.ai/tools/improve/#overview) (`--pr_code_suggestions.commitable_code_suggestions=false`).
 This method significantly reduces the PR footprint and allows for quick and easy digestion of multiple suggestions.
 
-We also offer a complementary **dual publishing mode**. When enabled, suggestions exceeding a certain score threshold are not only displayed in the table, but also presented as commitable PR comments.
+We also offer a complementary **dual publishing mode**. When enabled, suggestions exceeding a certain score threshold are not only displayed in the table, but also presented as committable PR comments.
 This mode helps highlight suggestions deemed more critical.
 
 To activate dual publishing mode, use the following setting:
@@ -265,12 +342,14 @@ To activate dual publishing mode, use the following setting:
 dual_publishing_score_threshold = x
 ```
 
-Where x represents the minimum score threshold (>=) for suggestions to be presented as commitable PR comments in addition to the table. Default is -1 (disabled).
+Where x represents the minimum score threshold (>=) for suggestions to be presented as committable PR comments in addition to the table. Default is -1 (disabled).
 
 ### Self-review
+
 > `💎 feature` Platforms supported: GitHub, GitLab
 
 If you set in a configuration file:
+
 ```toml
 [pr_code_suggestions]
 demand_code_suggestions_self_review = true
@@ -278,6 +357,7 @@ demand_code_suggestions_self_review = true
 
 The `improve` tool will add a checkbox below the suggestions, prompting user to acknowledge that they have reviewed the suggestions.
 You can set the content of the checkbox text via:
+
 ```toml
 [pr_code_suggestions]
 code_suggestions_self_review_text = "... (your text here) ..."
@@ -285,7 +365,6 @@ code_suggestions_self_review_text = "... (your text here) ..."
 
 ![self_review_1](https://codium.ai/images/pr_agent/self_review_1.png){width=512}
 
-
 !!! tip "Tip - Reducing visual footprint after self-review 💎"
 
     The configuration parameter `pr_code_suggestions.fold_suggestions_on_self_review` (default is True)
@@ -293,8 +372,6 @@ code_suggestions_self_review_text = "... (your text here) ..."
 
     This reduces the visual footprint of the suggestions, and also indicates to the PR reviewer that the suggestions have been reviewed by the PR author, and don't require further attention.
 
-
-
 !!! tip "Tip - Demanding self-review from the PR author 💎"
 
     By setting:
@@ -314,12 +391,14 @@ code_suggestions_self_review_text = "... (your text here) ..."
         To prevent unauthorized approvals, this configuration defaults to false, and cannot be altered through online comments; enabling requires a direct update to the configuration file and a commit to the repository. This ensures that utilizing the feature demands a deliberate documented decision by the repository owner.
 
 ### Auto-approval
+
 > `💎 feature. Platforms supported: GitHub, GitLab, Bitbucket`
 
 Under specific conditions, Qodo Merge can auto-approve a PR when a specific comment is invoked, or when the PR meets certain criteria.
 
 **To ensure safety, the auto-approval feature is disabled by default.**
 To enable auto-approval features, you need to actively set one or both of the following options in a pre-defined _configuration file_:
+
 ```toml
 [config]
 enable_comment_approval = true # For approval via comments
@@ -333,20 +412,24 @@ enable_auto_approval = true   # For criteria-based auto-approval
 1\. **Auto-approval by commenting**
 
 To enable auto-approval by commenting, set in the configuration file:
+
 ```toml
 [config]
 enable_comment_approval = true
 ```
 
 After enabling, by commenting on a PR:
+
 ```
 /review auto_approve
 ```
+
 Qodo Merge will automatically approve the PR, and add a comment with the approval.
 
 2\. **Auto-approval when the PR meets certain criteria**
 
 To enable auto-approval based on specific criteria, first, you need to enable the top-level flag:
+
 ```toml
 [config]
 enable_auto_approval = true
@@ -355,30 +438,38 @@ enable_auto_approval = true
 There are two criteria that can be set for auto-approval:
 
 - **Review effort score**
+
 ```toml
 [config]
 enable_auto_approval = true
 auto_approve_for_low_review_effort = X # X is a number between 1 to 5
 ```
+
 When the [review effort score](https://www.qodo.ai/images/pr_agent/review3.png) is lower or equal to X, the PR will be auto-approved.
 
 ___
+
 - **No code suggestions**
+
 ```toml
 [config]
 enable_auto_approval = true
 auto_approve_for_no_suggestions = true
 ```
+
 When no [code suggestion](https://www.qodo.ai/images/pr_agent/code_suggestions_as_comment_closed.png) were found for the PR, the PR will be auto-approved.
 
 ### How many code suggestions are generated?
+
 Qodo Merge uses a dynamic strategy to generate code suggestions based on the size of the pull request (PR). Here's how it works:
 
 #### 1. Chunking large PRs
+
 - Qodo Merge divides large PRs into 'chunks'.
-- Each chunk contains up to `pr_code_suggestions.max_context_tokens` tokens (default: 14,000).
+- Each chunk contains up to `pr_code_suggestions.max_context_tokens` tokens (default: 24,000).
 
 #### 2. Generating suggestions
+
 - For each chunk, Qodo Merge generates up to `pr_code_suggestions.num_code_suggestions_per_chunk` suggestions (default: 4).
 
 This approach has two main benefits:
@@ -386,8 +477,7 @@ This approach has two main benefits:
 - Scalability: The number of suggestions scales with the PR size, rather than being fixed.
 - Quality: By processing smaller chunks, the AI can maintain higher quality suggestions, as larger contexts tend to decrease AI performance.
 
-Note: Chunking is primarily relevant for large PRs. For most PRs (up to 500 lines of code), Qodo Merge will be able to process the entire code in a single call.
-
+Note: Chunking is primarily relevant for large PRs. For most PRs (up to 600 lines of code), Qodo Merge will be able to process the entire code in a single call.
 
 ## Configuration options
 
@@ -400,11 +490,15 @@ Note: Chunking is primarily relevant for large PRs. For most PRs (up to 500 line
       </tr>
       <tr>
         <td><b>commitable_code_suggestions</b></td>
-        <td>If set to true, the tool will display the suggestions as commitable code comments. Default is false.</td>
+        <td>If set to true, the tool will display the suggestions as committable code comments. Default is false.</td>
+      </tr>
+      <tr>
+        <td><b>enable_chat_in_code_suggestions</b></td>
+        <td>If set to true, QM bot will interact with comments made on code changes it has proposed. Default is true.</td>
       </tr>
       <tr>
         <td><b>dual_publishing_score_threshold</b></td>
-        <td>Minimum score threshold for suggestions to be presented as commitable PR comments in addition to the table. Default is -1 (disabled).</td>
+        <td>Minimum score threshold for suggestions to be presented as committable PR comments in addition to the table. Default is -1 (disabled).</td>
       </tr>
       <tr>
         <td><b>focus_only_on_problems</b></td>
@@ -434,6 +528,9 @@ Note: Chunking is primarily relevant for large PRs. For most PRs (up to 500 line
         <td><b>enable_chat_text</b></td>
         <td>If set to true, the tool will display a reference to the PR chat in the comment. Default is true.</td>
       </tr>
+      <tr>
+        <td><b>publish_output_no_suggestions</b></td>
+        <td>If set to true, the tool will publish a comment even if no suggestions were found. Default is true.</td>
       <tr>
         <td><b>wiki_page_accepted_suggestions</b></td>
         <td>If set to true, the tool will automatically track accepted suggestions in a dedicated wiki page called `.pr_agent_accepted_suggestions`. Default is true.</td>
@@ -453,7 +550,7 @@ Note: Chunking is primarily relevant for large PRs. For most PRs (up to 500 line
       </tr>
       <tr>
         <td><b>num_code_suggestions_per_chunk</b></td>
-        <td>Number of code suggestions provided by the 'improve' tool, per chunk. Default is 4.</td>
+        <td>Number of code suggestions provided by the 'improve' tool, per chunk. Default is 3.</td>
       </tr>
       <tr>
         <td><b>max_number_of_calls</b></td>
@@ -468,5 +565,6 @@ Note: Chunking is primarily relevant for large PRs. For most PRs (up to 500 line
     - **Self-reflection:** The suggestions aim to enable developers to _self-reflect_ and improve their pull requests. This process can help to identify blind spots, uncover missed edge cases, and enhance code readability and coherency. Even when a specific code suggestion isn't suitable, the underlying issue it highlights often reveals something important that might deserve attention.
     - **Bug detection:** The suggestions also alert on any _critical bugs_ that may have been identified during the analysis. This provides an additional safety net to catch potential issues before they make it into production. It's perfectly acceptable to implement only the suggestions you find valuable for your specific context.
 - **Hierarchy:** Presenting the suggestions in a structured hierarchical table enables the user to _quickly_ understand them, and to decide which ones are relevant and which are not.
-- **Customization:** To guide the model to suggestions that are more relevant to the specific needs of your project, we recommend to use the [`extra_instructions`](https://qodo-merge-docs.qodo.ai/tools/improve/#extra-instructions-and-best-practices) and [`best practices`](https://qodo-merge-docs.qodo.ai/tools/improve/#best-practices) fields.
+- **Customization:** To guide the model to suggestions that are more relevant to the specific needs of your project, we recommend using the [`extra_instructions`](https://qodo-merge-docs.qodo.ai/tools/improve/#extra-instructions-and-best-practices) and [`best practices`](https://qodo-merge-docs.qodo.ai/tools/improve/#best-practices) fields.
+- **Model Selection:** SaaS users can also [choose](https://qodo-merge-docs.qodo.ai/usage-guide/qodo_merge_models/) between different models. For specific programming languages or use cases, some models may perform better than others.
 - **Interactive usage:** The interactive [PR chat](https://qodo-merge-docs.qodo.ai/chrome-extension/) also provides an easy way to get more tailored suggestions and feedback from the AI model.

docs/docs/tools/improve_component.md

@@ -1,13 +1,14 @@
 ## Overview
+
 The `improve_component` tool generates code suggestions for a specific code component that changed in the PR.
 it can be invoked manually by commenting on any PR:
+
 ```
 /improve_component component_name
 ```
 
 To get a list of the components that changed in the PR and choose the relevant component interactively, use the [`analyze`](./analyze.md) tool.
 
-
 ## Example usage
 
 Invoke the tool manually by commenting `/improve_component` on any PR:
@@ -23,6 +24,7 @@ The tool will generate code suggestions for the selected component (if no compon
     - This tool can also be triggered interactively by using the [`analyze`](./analyze.md) tool.
 
 ## Configuration options
+
 - `num_code_suggestions`: number of code suggestions to provide. Default is 4
 - `extra_instructions`: Optional extra instructions to the tool. For example: "focus on ...".
 - `file`: in case there are several components with the same name, you can specify the relevant file.

docs/docs/tools/index.md

@@ -2,21 +2,23 @@
 
 Here is a list of Qodo Merge tools, each with a dedicated page that explains how to use it:
 
-| Tool                                                                                     | Description                                                                                                                                |
-|------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------|
-| **[PR Description (`/describe`](./describe.md))**                                        | Automatically generating PR description - title, type, summary, code walkthrough and labels                                                |
-| **[PR Review (`/review`](./review.md))**                                                 | Adjustable feedback about the PR, possible issues, security concerns, review effort and more                                               |
-| **[Code Suggestions (`/improve`](./improve.md))**                                        | Code suggestions for improving the PR                                                                                                      |
-| **[Question Answering (`/ask ...`](./ask.md))**                                          | Answering free-text questions about the PR, or on specific code lines                                                                      |
-| **[Update Changelog (`/update_changelog`](./update_changelog.md))**                      | Automatically updating the CHANGELOG.md file with the PR changes                                                                           |
-| **[Help (`/help`](./help.md))**                                                          | Provides a list of all the available tools. Also enables to trigger them interactively (💎)                                                |
-| **💎 [Add Documentation (`/add_docs`](./documentation.md))**                             | Generates documentation to methods/functions/classes that changed in the PR                                                                |
-| **💎 [Generate Custom Labels (`/generate_labels`](./custom_labels.md))**                 | Generates custom labels for the PR, based on specific guidelines defined by the user                                                       |
-| **💎 [Analyze (`/analyze`](./analyze.md))**                                              | Identify code components that changed in the PR, and enables to interactively generate tests, docs, and code suggestions for each component|
-| **💎 [Test (`/test`](./test.md))**                                                       | generate tests for a selected component, based on the PR code changes                                                                      |
-| **💎 [Custom Prompt (`/custom_prompt`](./custom_prompt.md))**                            | Automatically generates custom suggestions for improving the PR code, based on specific guidelines defined by the user                     |
-| **💎 [Generate Tests (`/test component_name`](./test.md))**                              | Automatically generates unit tests for a selected component, based on the PR code changes                                                  |
-| **💎 [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                                                                                      |
+| Tool                                                                                     | Description                                                                                                                                 |
+| ---------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------- |
+| **[PR Description (`/describe`](./describe.md))**                                        | Automatically generating PR description - title, type, summary, code walkthrough and labels                                                 |
+| **[PR Review (`/review`](./review.md))**                                                 | Adjustable feedback about the PR, possible issues, security concerns, review effort and more                                                |
+| **[Code Suggestions (`/improve`](./improve.md))**                                        | Code suggestions for improving the PR                                                                                                       |
+| **[Question Answering (`/ask ...`](./ask.md))**                                          | Answering free-text questions about the PR, or on specific code lines                                                                       |
+| **[Update Changelog (`/update_changelog`](./update_changelog.md))**                      | Automatically updating the CHANGELOG.md file with the PR changes                                                                            |
+| **[Help (`/help`](./help.md))**                                                          | Provides a list of all the available tools. Also enables to trigger them interactively (💎)                                                 |
+| **💎 [Add Documentation (`/add_docs`](./documentation.md))**                             | Generates documentation to methods/functions/classes that changed in the PR                                                                 |
+| **💎 [Generate Custom Labels (`/generate_labels`](./custom_labels.md))**                 | Generates custom labels for the PR, based on specific guidelines defined by the user                                                        |
+| **💎 [Analyze (`/analyze`](./analyze.md))**                                              | Identify code components that changed in the PR, and enables to interactively generate tests, docs, and code suggestions for each component |
+| **💎 [Test (`/test`](./test.md))**                                                       | generate tests for a selected component, based on the PR code changes                                                                       |
+| **💎 [Custom Prompt (`/custom_prompt`](./custom_prompt.md))**                            | Automatically generates custom suggestions for improving the PR code, based on specific guidelines defined by the user                      |
+| **💎 [Generate Tests (`/test component_name`](./test.md))**                              | Automatically generates unit tests for a selected component, based on the PR code changes                                                   |
+| **💎 [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                                                                                       |
+| **💎 [Scan Repo Discussions (`/scan_repo_discussions`](./scan_repo_discussions.md))**    | Generates `best_practices.md` file based on previous discussions in the repository                                                          |
+
 Note that the tools marked with 💎 are available only for Qodo Merge users.

docs/docs/tools/review.md

@@ -1,7 +1,9 @@
 ## Overview
+
 The `review` tool scans the PR code changes, and generates a list of feedbacks about the PR, aiming to aid the reviewing process.
 <br>
 The tool can be triggered automatically every time a new PR is [opened](../usage-guide/automations_and_usage.md#github-app-automatic-tools-when-a-new-pr-is-opened), or can be invoked manually by commenting on any PR:
+
 ```
 /review
 ```
@@ -10,7 +12,6 @@ Note that the main purpose of the `review` tool is to provide the **PR reviewer*
 
 (Read more about the different personas in the PR process and how Qodo Merge aims to assist them in our [blog](https://www.codium.ai/blog/understanding-the-challenges-and-pain-points-of-the-pull-request-cycle/))
 
-
 ## Example usage
 
 ### Manual triggering
@@ -24,6 +25,7 @@ After ~30 seconds, the tool will generate a review for the PR:
 ![review](https://codium.ai/images/pr_agent/review3.png){width=512}
 
 If you want to edit [configurations](#configuration-options), add the relevant ones to the command:
+
 ```
 /review --pr_reviewer.some_config1=... --pr_reviewer.some_config2=...
 ```
@@ -31,6 +33,7 @@ If you want to edit [configurations](#configuration-options), add the relevant o
 ### Automatic triggering
 
 To run the `review` automatically when a PR is opened, define in a [configuration file](https://qodo-merge-docs.qodo.ai/usage-guide/configuration_options/#wiki-configuration-file):
+
 ```
 [github_app]
 pr_commands = [
@@ -46,7 +49,6 @@ extra_instructions = "..."
 - The `pr_commands` lists commands that will be executed automatically when a PR is opened.
 - The `[pr_reviewer]` section contains the configurations for the `review` tool you want to edit (if any).
 
-
 ## Configuration options
 
 !!! example "General options"
@@ -114,7 +116,6 @@ extra_instructions = "..."
       </tr>
     </table>
 
-
 ## Usage Tips
 
 !!! tip "General guidelines"
@@ -164,11 +165,6 @@ extra_instructions = "..."
     ```
     Use triple quotes to write multi-line instructions. Use bullet points to make the instructions more readable.
 
-
-
-
 !!! 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.
-
-    

docs/docs/tools/scan_repo_discussions.md

@@ -0,0 +1,44 @@
+`Platforms supported: GitHub`
+
+## Overview
+
+The `scan_repo_discussions` tool analyzes code discussions (meaning review comments over code lines) from merged pull requests over the past 12 months.
+It processes these discussions alongside other PR metadata to identify recurring patterns related to best practices in team feedback and code reviews, generating a comprehensive [`best_practices.md`](https://github.com/qodo-ai/pr-agent/blob/qodo-merge-best-practices_2025-04-16_1018/best_practices.md) document that distills key insights and recommendations.
+
+This file captures repository-specific patterns derived from your team's actual workflow and discussions, rather than more generic best practices.
+It will be utilized by Qodo Merge to provide tailored suggestions for improving code quality in future pull requests.
+
+!!! note "Active repositories are needed"
+    The tool is designed to work with real-life repositories, as it relies on actual discussions to generate meaningful insights.
+    At least 50 merged PRs are required to generate the `best_practices.md` file.
+
+!!! note "Additional customization"
+    Teams are encouraged to further customize and refine these insights to better align with their specific development priorities and contexts.
+    This can be done by editing the `best_practices.md` file directly when the PR is created, or iteratively over time to enhance the 'best practices' suggestions provided by Qodo Merge.
+
+The tool can be invoked manually by commenting on any PR:
+
+```
+/scan_repo_discussions
+```
+
+As a response, the bot will create a new PR that contains an auto-generated `best_practices.md` file.
+Note that the scan can take several minutes to complete, since up to 250 PRs are scanned.
+
+## Example usage
+
+![scan1](https://codium.ai/images/pr_agent/scan_repo_discussions_1.png){width=640}
+
+The PR created by the bot:
+
+![scan1](https://codium.ai/images/pr_agent/scan_repo_discussions_2.png){width=640}
+
+The `best_practices.md` file in the PR:
+
+![scan1](https://codium.ai/images/pr_agent/scan_repo_discussions_3.png){width=640}
+
+### Configuration options
+
+- Use `/scan_repo_discussions --scan_repo_discussions.force_scan=true` to force generating a PR with a new `best_practices.md` file, even if it already exists (by default, the bot will not generate a new file if it already exists).
+- Use `/scan_repo_discussions --scan_repo_discussions.days_back=X` to specify the number of days back to scan for discussions. The default is 365 days.
+- Use `/scan_repo_discussions --scan_repo_discussions.minimal_number_of_prs=X` to specify the minimum number of merged PRs needed to generate the `best_practices.md` file. The default is 50 PRs.

docs/docs/tools/similar_code.md

@@ -1,4 +1,5 @@
 ## Overview
+
 The similar code tool retrieves the most similar code components from inside the organization's codebase, or from open-source code.
 
 For example:
@@ -7,7 +8,6 @@ For example:
 
 ![similar code global](https://codium.ai/images/pr_agent/similar_code_global2.png){width=768}
 
-
 Qodo Merge will examine the code component and will extract the most relevant keywords to search for similar code:
 
 - `extracted keywords`: the keywords that were extracted from the code by Qodo Merge. the link will open a search page with the extracted keywords, to allow the user to modify the search if needed.
@@ -19,18 +19,20 @@ Search result link example:
 
 ![code search result single](https://codium.ai/images/pr_agent/code_search_result_single.png){width=768}
 
-
 `Organization Search`:
 
 ![similar code org](https://codium.ai/images/pr_agent/similar_code_org.png){width=768}
 
-
 ## How to use
+
 ### Manually
+
 To invoke the `similar code` tool manually, comment on the PR:
+
 ```
 /find_similar_component COMPONENT_NAME
 ```
+
 Where `COMPONENT_NAME` should be the name of a code component in the PR (class, method, function).
 
 If there is a name ambiguity, there are two configurations that will help the tool to find the correct component:
@@ -39,15 +41,19 @@ If there is a name ambiguity, there are two configurations that will help the to
 - `--pr_find_similar_component.class_name`: in case there are several methods with the same name in the same file, you can specify the relevant class name.
 
 example:
+
 ```
 /find_similar_component COMPONENT_NAME --pr_find_similar_component.file=FILE_NAME
 ```
 
 ### Automatically (via Analyze table)
+
 It can be invoked automatically from the analyze table, can be accessed by:
+
 ```
 /analyze
 ```
+
 Choose the components you want to find similar code for, and click on the `similar` checkbox.
 
 ![analyze similar](https://codium.ai/images/pr_agent/analyze_similar.png){width=768}
@@ -56,7 +62,6 @@ You can search for similar code either within the organization's codebase or glo
 
 ![similar code global](https://codium.ai/images/pr_agent/similar_code_global.png){width=768}
 
-
 ## Configuration options
 
 - `search_from_org`: if set to true, the tool will search for similar code in the organization's codebase. Default is false.

docs/docs/tools/similar_issues.md

@@ -1,11 +1,12 @@
 ## Overview
+
 The similar issue tool retrieves the most similar issues to the current issue.
 It can be invoked manually by commenting on any PR:
+
 ```
 /similar_issue
 ```
 
-
 ## Example usage
 
 ![similar_issue_original_issue](https://codium.ai/images/pr_agent/similar_issue_original_issue.png){width=768}
@@ -17,15 +18,18 @@ It can be invoked manually by commenting on any PR:
 Note that to perform retrieval, the `similar_issue` tool indexes all the repo previous issues (once).
 
 ### Selecting a Vector Database
+
 Configure your preferred database by changing the `pr_similar_issue` parameter in `configuration.toml` file.
 
 #### Available Options
+
 Choose from the following Vector Databases:
 
 1. LanceDB
 2. Pinecone
 
 #### Pinecone Configuration
+
 To use Pinecone with the `similar issue` tool, add these credentials to `.secrets.toml` (or set as environment variables):
 
 ```
@@ -33,10 +37,11 @@ To use Pinecone with the `similar issue` tool, add these credentials to `.secret
 api_key = "..."
 environment = "..."
 ```
+
 These parameters can be obtained by registering to [Pinecone](https://app.pinecone.io/?sessionType=signup/).
 
-
 ## How to use
+
 - To invoke the 'similar issue' tool from **CLI**, run:
 `python3 cli.py --issue_url=... similar_issue`
 

docs/docs/tools/test.md

@@ -1,9 +1,12 @@
 ## Overview
+
 By combining LLM abilities with static code analysis, the `test` tool  generate tests for a selected component, based on the PR code changes.
 It can be invoked manually by commenting on any PR:
+
 ```
 /test component_name
 ```
+
 where 'component_name' is the name of a specific component in the PR.
 To get a list of the components that changed in the PR and choose the relevant component interactively, use the [`analyze`](./analyze.md) tool.
 
@@ -14,15 +17,14 @@ The tool will generate tests for the selected component (if no component is stat
 
 ![test1](https://codium.ai/images/pr_agent/test1.png){width=768}
 
-
 (Example taken from [here](https://github.com/Codium-ai/pr-agent/pull/598#issuecomment-1913679429)):
 
 !!! note "Notes"
     - The following languages are currently supported: Python, Java, C++, JavaScript, TypeScript, C#.
     - This tool can also be triggered interactively by using the [`analyze`](./analyze.md) tool.
 
-
 ## Configuration options
+
 - `num_tests`: number of tests to generate. Default is 3.
 - `testing_framework`: the testing framework to use. If not set, for Python it will use `pytest`, for Java it will use `JUnit`, for C++ it will use `Catch2`, and for JavaScript and TypeScript it will use `jest`.
 - `avoid_mocks`: if set to true, the tool will try to avoid using mocks in the generated tests. Note that even if this option is set to true, the tool might still use mocks if it cannot generate a test without them. Default is true.

docs/docs/tools/update_changelog.md

@@ -1,6 +1,8 @@
 ## Overview
+
 The `update_changelog` tool automatically updates the CHANGELOG.md file with the PR changes.
 It can be invoked manually by commenting on any PR:
+
 ```
 /update_changelog
 ```
@@ -15,6 +17,7 @@ It can be invoked manually by commenting on any PR:
 
 Under the section `pr_update_changelog`, the [configuration file](https://github.com/Codium-ai/pr-agent/blob/main/pr_agent/settings/configuration.toml#L50) contains options to customize the 'update changelog' tool:
 
-- `push_changelog_changes`: whether to push the changes to CHANGELOG.md, or just print them. Default is false (print only).
-- `extra_instructions`: Optional extra instructions to the tool. For example: "focus on the changes in the file X. Ignore change in ...
-- `add_pr_link`: whether the model should try to add a link to the PR in the changelog. Default is true.
+- `push_changelog_changes`: whether to push the changes to CHANGELOG.md, or just publish them as a comment. Default is false (publish as comment).
+- `extra_instructions`: Optional extra instructions to the tool. For example: "Use the following structure: ..."
+- `add_pr_link`: whether the model should try to add a link to the PR in the changelog. Default is true.
+- `skip_ci_on_push`: whether the commit message (when `push_changelog_changes` is true) will include the term "[skip ci]", preventing CI tests to be triggered on the changelog commit. Default is true.

docs/docs/usage-guide/EXAMPLE_BEST_PRACTICE.md

@@ -1,7 +1,8 @@
 ## Recommend Python Best Practices
+
 This document outlines a series of recommended best practices for Python development. These guidelines aim to improve code quality, maintainability, and readability.
 
-###  Imports
+### Imports
 
 Use  `import`  statements for packages and modules only, not for individual types, classes, or functions.
 
@@ -9,16 +10,16 @@ Use  `import`  statements for packages and modules only, not for individual type
 
 Reusability mechanism for sharing code from one module to another.
 
-####  Decision
+#### Decision
 
--   Use  `import x`  for importing packages and modules.
--   Use  `from x import y`  where  `x`  is the package prefix and  `y`  is the module name with no prefix.
--   Use  `from x import y as z`  in any of the following circumstances:
-    -   Two modules named  `y`  are to be imported.
-    -   `y`  conflicts with a top-level name defined in the current module.
-    -   `y`  conflicts with a common parameter name that is part of the public API (e.g.,  `features`).
-    -   `y`  is an inconveniently long name, or too generic in the context of your code
--   Use  `import y as z`  only when  `z`  is a standard abbreviation (e.g.,  `import numpy as np`).
+- Use  `import x`  for importing packages and modules.
+- Use  `from x import y`  where  `x`  is the package prefix and  `y`  is the module name with no prefix.
+- Use  `from x import y as z`  in any of the following circumstances:
+  - Two modules named  `y`  are to be imported.
+  - `y`  conflicts with a top-level name defined in the current module.
+  - `y`  conflicts with a common parameter name that is part of the public API (e.g.,  `features`).
+  - `y`  is an inconveniently long name, or too generic in the context of your code
+- Use  `import y as z`  only when  `z`  is a standard abbreviation (e.g.,  `import numpy as np`).
 
 For example the module  `sound.effects.echo`  may be imported as follows:
 
@@ -35,13 +36,13 @@ Do not use relative names in imports. Even if the module is in the same package,
 
 Exemptions from this rule:
 
--   Symbols from the following modules are used to support static analysis and type checking:
-    -   [`typing`  module](https://google.github.io/styleguide/pyguide.html#typing-imports)
-    -   [`collections.abc`  module](https://google.github.io/styleguide/pyguide.html#typing-imports)
-    -   [`typing_extensions`  module](https://github.com/python/typing_extensions/blob/main/README.md)
--   Redirects from the  [six.moves module](https://six.readthedocs.io/#module-six.moves).
+- Symbols from the following modules are used to support static analysis and type checking:
+  - [`typing`  module](https://google.github.io/styleguide/pyguide.html#typing-imports)
+  - [`collections.abc`  module](https://google.github.io/styleguide/pyguide.html#typing-imports)
+  - [`typing_extensions`  module](https://github.com/python/typing_extensions/blob/main/README.md)
+- Redirects from the  [six.moves module](https://six.readthedocs.io/#module-six.moves).
 
-###  Packages
+### Packages
 
 Import each module using the full pathname location of the module.
 
@@ -85,6 +86,7 @@ No:
 The directory the main binary is located in should not be assumed to be in  `sys.path`  despite that happening in some environments. This being the case, code should assume that  `import jodie`  refers to a third-party or top-level package named  `jodie`, not a local  `jodie.py`.
 
 ### Default Iterators and Operators
+
 Use default iterators and operators for types that support them, like lists, dictionaries, and files.
 
 #### Definition
@@ -125,7 +127,7 @@ Okay in most cases.
 
 You can specify values for variables at the end of a function’s parameter list, e.g.,  `def foo(a, b=0):`. If  `foo`  is called with only one argument,  `b`  is set to 0. If it is called with two arguments,  `b`  has the value of the second argument.
 
-####  Decision
+#### Decision
 
 Okay to use with the following caveat:
 
@@ -158,7 +160,6 @@ No:  def foo(a, b: Mapping = {}):  # Could still get passed to unchecked code.
 
 ### True/False Evaluations
 
-
 Use the “implicit” false if possible, e.g.,  `if foo:`  rather than  `if foo != []:`
 
 ### Lexical Scoping
@@ -175,11 +176,11 @@ def get_adder(summand1: float) -> Callable[[float], float]:
 
     return adder
 ```
+
 #### Decision
 
 Okay to use.
 
-
 ### Threading
 
 Do not rely on the atomicity of built-in types.

docs/docs/usage-guide/additional_configurations.md

@@ -1,32 +1,35 @@
 ## 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"}.
 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:
+
 ```
 /config
 ```
 
 ![possible_config1](https://codium.ai/images/pr_agent/possible_config1.png){width=512}
 
-
 To view the **actual** configurations used for a specific tool, after all the user settings are applied, you can add for each tool a `--config.output_relevant_configurations=true` suffix.
 For example:
+
 ```
 /improve --config.output_relevant_configurations=true
 ```
+
 Will output an additional field showing the actual configurations used for the `improve` tool.
 
 ![possible_config2](https://codium.ai/images/pr_agent/possible_config2.png){width=512}
 
-
 ## Ignoring files from analysis
 
 In some cases, you may want to exclude specific files or directories from the analysis performed by Qodo Merge. This can be useful, for example, when you have files that are generated automatically or files that shouldn't be reviewed, like vendor code.
 
 You can ignore files or folders using the following methods:
- - `IGNORE.GLOB`
- - `IGNORE.REGEX`
+
+- `IGNORE.GLOB`
+- `IGNORE.REGEX`
 
 which you can edit to ignore files or folders based on glob or regex patterns.
 
@@ -37,14 +40,15 @@ Let's look at an example where we want to ignore all files with `.py` extension
 To ignore Python files in a PR with online usage, comment on a PR:
 `/review --ignore.glob="['*.py']"`
 
-
 To ignore Python files in all PRs using `glob` pattern, set in a configuration file:
+
 ```
 [ignore]
 glob = ['*.py']
 ```
 
 And to ignore Python files in all PRs using `regex` pattern, set in a configuration file:
+
 ```
 [regex]
 regex = ['.*\.py$']
@@ -53,6 +57,7 @@ regex = ['.*\.py$']
 ## Extra instructions
 
 All Qodo Merge tools have a parameter called `extra_instructions`, that enables to add free-text extra instructions. Example usage:
+
 ```
 /update_changelog --pr_update_changelog.extra_instructions="Make sure to update also the version ..."
 ```
@@ -63,16 +68,16 @@ The default response language for Qodo Merge is **U.S. English**. However, some
 
 To configure this, set the `response_language` parameter in the configuration file. This will prompt the model to respond in the specified language. Use a **standard locale code** based on [ISO 3166](https://en.wikipedia.org/wiki/ISO_3166) (country codes) and [ISO 639](https://en.wikipedia.org/wiki/ISO_639) (language codes) to define a language-country pair. See this [comprehensive list of locale codes](https://simplelocalize.io/data/locales/).  
 
-Example: 
+Example:
 
 ```toml
 [config]
-response_language: "it-IT"
+response_language = "it-IT"
 ```
 
 This will set the response language globally for all the commands to Italian.
 
-> **Important:** Note that only dynamic text generated by the AI model is translated to the configured language. Static text such as labels and table headers that are not part of the AI models response will remain in US English. In addition, the model you are using must have good support for the specified language. 
+> **Important:** Note that only dynamic text generated by the AI model is translated to the configured language. Static text such as labels and table headers that are not part of the AI models response will remain in US English. In addition, the model you are using must have good support for the specified language.
 
 [//]: # (## Working with large PRs)
 
@@ -92,11 +97,10 @@ This will set the response language globally for all the commands to Italian.
 
 [//]: # (which divides the PR into chunks, and processes each chunk separately. With this mode, regardless of the model, no compression will be done (but for large PRs, multiple model calls may occur))
 
-
-
 ## Patch Extra Lines
 
 By default, around any change in your PR, git patch provides three lines of context above and below the change.
+
 ```
 @@ -12,5 +12,5 @@ def func1():
  code line that already existed in the file...
@@ -110,6 +114,7 @@ By default, around any change in your PR, git patch provides three lines of cont
 ```
 
 Qodo Merge will try to increase the number of lines of context, via the parameter:
+
 ```
 [config]
 patch_extra_lines_before=3
@@ -120,30 +125,23 @@ Increasing this number provides more context to the model, but will also increas
 
 If the PR is too large (see [PR Compression strategy](https://github.com/Codium-ai/pr-agent/blob/main/PR_COMPRESSION.md)), Qodo Merge may automatically set this number to 0, and will use the original git patch.
 
+## Log Level
 
-## Editing the prompts
+Qodo Merge allows you to control the verbosity of logging by using the `log_level` configuration parameter. This is particularly useful for troubleshooting and debugging issues with your PR workflows.
 
-The prompts for the various Qodo Merge tools are defined in the `pr_agent/settings` folder.
-In practice, the prompts are loaded and stored as a standard setting object.
-Hence, editing them is similar to editing any other configuration value - just place the relevant key in `.pr_agent.toml`file, and override the default value.
-
-For example, if you want to edit the prompts of the [describe](https://github.com/Codium-ai/pr-agent/blob/main/pr_agent/settings/pr_description_prompts.toml) tool, you can add the following to your `.pr_agent.toml` file:
 ```
-[pr_description_prompt]
-system="""
-...
-"""
-user="""
-...
-"""
+[config]
+log_level = "DEBUG"  # Options: "DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"
 ```
-Note that the new prompt will need to generate an output compatible with the relevant [post-process function](https://github.com/Codium-ai/pr-agent/blob/main/pr_agent/tools/pr_description.py#L137).
+
+The default log level is "DEBUG", which provides detailed output of all operations. If you prefer less verbose logs, you can set higher log levels like "INFO" or "WARNING".
 
 ## Integrating with Logging Observability Platforms
 
 Various logging observability tools can be used out-of-the box when using the default LiteLLM AI Handler. Simply configure the LiteLLM callback settings in `configuration.toml` and set environment variables according to the LiteLLM [documentation](https://docs.litellm.ai/docs/).
 
 For example, to use [LangSmith](https://www.langchain.com/langsmith) you can add the following to your `configuration.toml` file:
+
 ```
 [litellm]
 enable_callbacks = true
@@ -209,7 +207,7 @@ For the configuration above, automatic feedback will only be triggered when the
 
 To ignore PRs containing specific labels, you can add the following to your `configuration.toml` file:
 
-``` 
+```
 [config]
 ignore_pr_labels = ["do-not-merge"]
 ```
@@ -218,7 +216,7 @@ Where the `ignore_pr_labels` is a list of labels that when present in the PR, th
 
 ### Ignoring PRs from specific users
 
-Qodo Merge automatically identifies and ignores pull requests created by bots using:
+Qodo Merge tries to automatically identify and ignore pull requests created by bots using:
 
 - GitHub's native bot detection system
 - Name-based pattern matching
@@ -229,6 +227,7 @@ While this detection is robust, it may not catch all cases, particularly when:
 - Bot names don't match common patterns
 
 To supplement the automatic bot detection, you can manually specify users to ignore. Add the following to your `configuration.toml` file to ignore PRs from specific users:
+
 ```
 [config]
 ignore_pr_authors = ["my-special-bot-user", ...]
@@ -236,3 +235,5 @@ ignore_pr_authors = ["my-special-bot-user", ...]
 
 Where the `ignore_pr_authors` is a list of usernames that you want to ignore.
 
+!!! note
+    There is one specific case where bots will receive an automatic response - when they generated a PR with a _failed test_. In that case, the [`ci_feedback`](https://qodo-merge-docs.qodo.ai/tools/ci_feedback/) tool will be invoked.

docs/docs/usage-guide/automations_and_usage.md

@@ -14,23 +14,26 @@ Examples of invoking the different tools via the CLI:
 **Notes:**
 
 1. in addition to editing your local configuration file, you can also change any configuration value by adding it to the command line:
+
 ```
 python -m pr_agent.cli --pr_url=<pr_url>  /review --pr_reviewer.extra_instructions="focus on the file: ..."
 ```
 
 2. You can print results locally, without publishing them, by setting in `configuration.toml`:
+
 ```
 [config]
 publish_output=false
 verbosity_level=2
 ```
+
 This is useful for debugging or experimenting with different tools.
 
 3. **git provider**: The [git_provider](https://github.com/Codium-ai/pr-agent/blob/main/pr_agent/settings/configuration.toml#L5) field in a configuration file determines the GIT provider that will be used by Qodo Merge. Currently, the following providers are supported:
 `github` **(default)**, `gitlab`, `bitbucket`, `azure`, `codecommit`, `local`, and `gerrit`.
 
-
 ### CLI Health Check
+
 To verify that Qodo Merge has been configured correctly, you can run this health check command from the repository root:
 
 ```bash
@@ -63,18 +66,17 @@ Commands for invoking the different tools via comments:
 - **Ask**:          `/ask "..."`
 - **Update Changelog**:      `/update_changelog`
 
-
 To edit a specific configuration value, just add `--config_path=<value>` to any command.
 For example, if you want to edit the `review` tool configurations, you can run:
+
 ```
 /review --pr_reviewer.extra_instructions="..." --pr_reviewer.require_score_review=false
 ```
+
 Any configuration value in [configuration file](https://github.com/Codium-ai/pr-agent/blob/main/pr_agent/settings/configuration.toml) file can be similarly edited. Comment `/config` to see the list of available configurations.
 
-
 ## Qodo Merge Automatic Feedback
 
-
 ### Disabling all automatic feedback
 
 To easily disable all automatic feedback from Qodo Merge (GitHub App, GitLab Webhook, BitBucket App, Azure DevOps Webhook), set in a configuration file:
@@ -97,6 +99,7 @@ When this parameter is set to `true`, Qodo Merge will not run any automatic tool
 The [github_app](https://github.com/Codium-ai/pr-agent/blob/main/pr_agent/settings/configuration.toml#L220) section defines GitHub app specific configurations.
 
 The configuration parameter `pr_commands` defines the list of tools that will be **run automatically** when a new PR is opened:
+
 ```toml
 [github_app]
 pr_commands = [
@@ -108,6 +111,17 @@ pr_commands = [
 
 This means that when a new PR is opened/reopened or marked as ready for review, Qodo Merge will run the `describe`, `review` and `improve` tools.  
 
+**Draft PRs:** 
+
+By default, draft PRs are not considered for automatic tools, but you can change this by setting the `feedback_on_draft_pr` parameter to `true` in the configuration file.
+
+```toml
+[github_app]
+feedback_on_draft_pr = true
+```
+
+**Changing default tool parameters:**
+
 You can override the default tool parameters by using one the three options for a [configuration file](https://qodo-merge-docs.qodo.ai/usage-guide/configuration_options/): **wiki**, **local**, or **global**.
 For example, if your configuration file contains:
 
@@ -118,8 +132,12 @@ generate_ai_title = true
 
 Every time you run the `describe` tool (including automatic runs) the PR title will be generated by the AI.
 
+
+**Parameters for automated runs:**
+
 You can customize configurations specifically for automated runs by using the `--config_path=<value>` parameter.
 For instance, to modify the `review` tool settings only for newly opened PRs, use:
+
 ```toml
 [github_app]
 pr_commands = [
@@ -135,6 +153,7 @@ In addition to running automatic tools when a PR is opened, the GitHub app can a
 
 The configuration toggle `handle_push_trigger` can be used to enable this feature.
 The configuration parameter `push_commands` defines the list of tools that will be **run automatically** when new code is pushed to the PR.
+
 ```toml
 [github_app]
 handle_push_trigger = true
@@ -143,12 +162,15 @@ push_commands = [
     "/review",
 ]
 ```
+
 This means that when new code is pushed to the PR, the Qodo Merge will run the `describe` and `review` tools, with the specified parameters.
 
 ### GitHub Action
+
 `GitHub Action` is a different way to trigger Qodo Merge tools, and uses a different configuration mechanism than `GitHub App`.<br>
 You can configure settings for `GitHub Action` by adding environment variables under the env section in `.github/workflows/pr_agent.yml` file.
 Specifically, start by setting the following environment variables:
+
 ```yaml
       env:
         OPENAI_KEY: ${{ secrets.OPENAI_KEY }} # Make sure to add your OpenAI key to your repo secrets
@@ -158,6 +180,7 @@ Specifically, start by setting the following environment variables:
         github_action_config.auto_improve: "true" # enable\disable auto improve
         github_action_config.pr_actions: '["opened", "reopened", "ready_for_review", "review_requested"]'
 ```
+
 `github_action_config.auto_review`, `github_action_config.auto_describe` and `github_action_config.auto_improve` are used to enable/disable automatic tools that run when a new PR is opened.
 If not set, the default configuration is for all three tools to run automatically when a new PR is opened.
 
@@ -180,6 +203,7 @@ publish_labels = false
 to prevent Qodo Merge from publishing labels when running the `describe` tool.
 
 ### GitLab Webhook
+
 After setting up a GitLab webhook, to control which commands will run automatically when a new MR is opened, you can set the `pr_commands` parameter in the configuration file, similar to the GitHub App:
 
 ```toml
@@ -194,6 +218,7 @@ pr_commands = [
 the GitLab webhook can also respond to new code that is pushed to an open MR.
 The configuration toggle `handle_push_trigger` can be used to enable this feature.
 The configuration parameter `push_commands` defines the list of tools that will be **run automatically** when new code is pushed to the MR.
+
 ```toml
 [gitlab]
 handle_push_trigger = true
@@ -206,11 +231,13 @@ push_commands = [
 Note that to use the 'handle_push_trigger' feature, you need to give the gitlab webhook also the "Push events" scope.
 
 ### BitBucket App
-Similar to GitHub app, when running Qodo Merge from BitBucket App, the default [configuration file](https://github.com/Codium-ai/pr-agent/blob/main/pr_agent/settings/configuration.toml) from a pre-built docker will be initially loaded.
 
-By uploading a local `.pr_agent.toml` file to the root of the repo's main branch, you can edit and customize any configuration parameter. Note that you need to upload `.pr_agent.toml` prior to creating a PR, in order for the configuration to take effect.
+Similar to GitHub app, when running Qodo Merge from BitBucket App, the default [configuration file](https://github.com/Codium-ai/pr-agent/blob/main/pr_agent/settings/configuration.toml) will be initially loaded.
+
+By uploading a local `.pr_agent.toml` file to the root of the repo's default branch, you can edit and customize any configuration parameter. Note that you need to upload `.pr_agent.toml` prior to creating a PR, in order for the configuration to take effect.
 
 For example, if your local `.pr_agent.toml` file contains:
+
 ```toml
 [pr_reviewer]
 extra_instructions = "Answer in japanese"
@@ -218,12 +245,10 @@ extra_instructions = "Answer in japanese"
 
 Each time you invoke a `/review` tool, it will use the extra instructions you set in the local configuration file.
 
-
 Note that among other limitations, BitBucket provides relatively low rate-limits for applications (up to 1000 requests per hour), and does not provide an API to track the actual rate-limit usage.
 If you experience a lack of responses from Qodo Merge, you might want to set: `bitbucket_app.avoid_full_files=true` in your configuration file.
 This will prevent Qodo Merge from acquiring the full file content, and will only use the diff content. This will reduce the number of requests made to BitBucket, at the cost of small decrease in accuracy, as dynamic context will not be applicable.
 
-
 #### BitBucket Self-Hosted App automatic tools
 
 To control which commands will run automatically when a new PR is opened, you can set the `pr_commands` parameter in the configuration file:
@@ -236,10 +261,12 @@ pr_commands = [
     "/improve --pr_code_suggestions.commitable_code_suggestions=true --pr_code_suggestions.suggestions_score_threshold=7",
 ]
 ```
+
 Note that we set specifically for bitbucket, we recommend using: `--pr_code_suggestions.suggestions_score_threshold=7` and that is the default value we set for bitbucket.
 Since this platform only supports inline code suggestions, we want to limit the number of suggestions, and only present a limited number.
 
 To enable BitBucket app to respond to each **push** to the PR, set (for example):
+
 ```toml
 [bitbucket_app]
 handle_push_trigger = true
@@ -252,6 +279,7 @@ push_commands = [
 ### Azure DevOps provider
 
 To use Azure DevOps provider use the following settings in configuration.toml:
+
 ```toml
 [config]
 git_provider="azure"
@@ -265,6 +293,7 @@ If PAT was chosen, you can assign the value in .secrets.toml.
 If DefaultAzureCredential was chosen, you can assigned the additional env vars like AZURE_CLIENT_SECRET directly,
 or use managed identity/az cli (for local development) without any additional configuration.
 in any case, 'org' value must be assigned in .secrets.toml:
+
 ```
 [azure_devops]
 org = "https://dev.azure.com/YOUR_ORGANIZATION/"
@@ -274,6 +303,7 @@ org = "https://dev.azure.com/YOUR_ORGANIZATION/"
 #### Azure DevOps Webhook
 
 To control which commands will run automatically when a new PR is opened, you can set the `pr_commands` parameter in the configuration file, similar to the GitHub App:
+
 ```toml
 [azure_devops_server]
 pr_commands = [

docs/docs/usage-guide/changing_a_model.md

@@ -1,20 +1,26 @@
 ## Changing a model in PR-Agent
 
 See [here](https://github.com/Codium-ai/pr-agent/blob/main/pr_agent/algo/__init__.py) for a list of available models.
-To use a different model than the default (GPT-4), you need to edit in the [configuration file](https://github.com/Codium-ai/pr-agent/blob/main/pr_agent/settings/configuration.toml#L2) the fields:
-```
+To use a different model than the default (o4-mini), 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:
+
+```toml
 [config]
 model = "..."
 fallback_models = ["..."]
 ```
 
 For models and environments not from OpenAI, you might need to provide additional keys and other parameters.
-You can give parameters via a configuration file (see below for instructions), or from environment variables. See [litellm documentation](https://litellm.vercel.app/docs/proxy/quick_start#supported-llms) for the environment variables relevant per model.
+You can give parameters via a configuration file, or from environment variables.
+
+!!! note "Model-specific environment variables"
+    See [litellm documentation](https://litellm.vercel.app/docs/proxy/quick_start#supported-llms) for the environment variables needed per model, as they may vary and change over time. Our documentation per-model may not always be up-to-date with the latest changes.
+    Failing to set the needed keys of a specific model will usually result in litellm not identifying the model type, and failing to utilize it.
 
 ### Azure
 
 To use Azure, set in your `.secrets.toml` (working from CLI), or in the GitHub `Settings > Secrets and variables` (working from GitHub App or GitHub Action):
-```
+
+```toml
 [openai]
 key = "" # your azure api key
 api_type = "azure"
@@ -24,26 +30,39 @@ deployment_id = ""  # The deployment name you chose when you deployed the engine
 ```
 
 and set in your configuration file:
-```
+
+```toml
 [config]
 model="" # the OpenAI model you've deployed on Azure (e.g. gpt-4o)
 fallback_models=["..."]
 ```
 
-Passing custom headers to the underlying LLM Model API can be done by setting extra_headers parameter to litellm. 
+To use Azure AD (Entra id) based authentication set in your `.secrets.toml` (working from CLI), or in the GitHub `Settings > Secrets and variables` (working from GitHub App or GitHub Action):
+
+```toml
+[azure_ad]
+client_id = ""  # Your Azure AD application client ID
+client_secret = ""  # Your Azure AD application client secret
+tenant_id = ""  # Your Azure AD tenant ID
+api_base = ""  # Your Azure OpenAI service base URL (e.g., https://openai.xyz.com/)
 ```
+
+Passing custom headers to the underlying LLM Model API can be done by setting extra_headers parameter to litellm.
+
+```toml
 [litellm]
 extra_headers='{"projectId": "<authorized projectId >", ...}') #The value of this setting should be a JSON string representing the desired headers, a ValueError is thrown otherwise.
 ```
-This enables users to pass authorization tokens or API keys, when routing requests through an API management gateway.
 
+This enables users to pass authorization tokens or API keys, when routing requests through an API management gateway.
 
 ### Ollama
 
 You can run models locally through either [VLLM](https://docs.litellm.ai/docs/providers/vllm) or [Ollama](https://docs.litellm.ai/docs/providers/ollama)
 
 E.g. to use a new model locally via Ollama, set in `.secrets.toml` or in a configuration file:
-```
+
+```toml
 [config]
 model = "ollama/qwen2.5-coder:32b"
 fallback_models=["ollama/qwen2.5-coder:32b"]
@@ -60,7 +79,7 @@ Please note that the `custom_model_max_tokens` setting should be configured in a
 
 !!! note "Local models vs commercial models"
     Qodo Merge is compatible with almost any AI model, but analyzing complex code repositories and pull requests requires a model specifically optimized for code analysis.
-    
+
     Commercial models such as GPT-4, Claude Sonnet, and Gemini have demonstrated robust capabilities in generating structured output for code analysis tasks with large input. In contrast, most open-source models currently available (as of January 2025) face challenges with these complex tasks.
 
     Based on our testing, local open-source models are suitable for experimentation and learning purposes (mainly for the `ask` command), but they are not suitable for production-level code analysis tasks.
@@ -70,7 +89,8 @@ Please note that the `custom_model_max_tokens` setting should be configured in a
 ### Hugging Face
 
 To use a new model with Hugging Face Inference Endpoints, for example, set:
-```
+
+```toml
 [config] # in configuration.toml
 model = "huggingface/meta-llama/Llama-2-7b-chat-hf"
 fallback_models=["huggingface/meta-llama/Llama-2-7b-chat-hf"]
@@ -80,40 +100,59 @@ custom_model_max_tokens=... # set the maximal input tokens for the model
 key = ... # your Hugging Face api key
 api_base = ... # the base url for your Hugging Face inference endpoint
 ```
+
 (you can obtain a Llama2 key from [here](https://replicate.com/replicate/llama-2-70b-chat/api))
 
 ### Replicate
 
 To use Llama2 model with Replicate, for example, set:
-```
+
+```toml
 [config] # in configuration.toml
 model = "replicate/llama-2-70b-chat:2c1608e18606fad2812020dc541930f2d0495ce32eee50074220b87300bc16e1"
 fallback_models=["replicate/llama-2-70b-chat:2c1608e18606fad2812020dc541930f2d0495ce32eee50074220b87300bc16e1"]
 [replicate] # in .secrets.toml
 key = ...
 ```
-(you can obtain a Llama2 key from [here](https://replicate.com/replicate/llama-2-70b-chat/api))
 
+(you can obtain a Llama2 key from [here](https://replicate.com/replicate/llama-2-70b-chat/api))
 
 Also, review the [AiHandler](https://github.com/Codium-ai/pr-agent/blob/main/pr_agent/algo/ai_handler.py) file for instructions on how to set keys for other models.
 
 ### Groq
 
 To use Llama3 model with Groq, for example, set:
-```
+
+```toml
 [config] # in configuration.toml
 model = "llama3-70b-8192"
 fallback_models = ["groq/llama3-70b-8192"]
 [groq] # in .secrets.toml
 key = ... # your Groq api key
 ```
+
 (you can obtain a Groq key from [here](https://console.groq.com/keys))
 
+### xAI
+
+To use xAI's models with PR-Agent, set:
+
+```toml
+[config] # in configuration.toml
+model = "xai/grok-2-latest"
+fallback_models = ["xai/grok-2-latest"] # or any other model as fallback
+
+[xai] # in .secrets.toml
+key = "..." # your xAI API key
+```
+
+You can obtain an xAI API key from [xAI's console](https://console.x.ai/) by creating an account and navigating to the developer settings page.
+
 ### Vertex AI
 
 To use Google's Vertex AI platform and its associated models (chat-bison/codechat-bison) set:
 
-```
+```toml
 [config] # in configuration.toml
 model = "vertex_ai/codechat-bison"
 fallback_models="vertex_ai/codechat-bison"
@@ -133,8 +172,8 @@ To use [Google AI Studio](https://aistudio.google.com/) models, set the relevant
 
 ```toml
 [config] # in configuration.toml
-model="google_ai_studio/gemini-1.5-flash"
-fallback_models=["google_ai_studio/gemini-1.5-flash"]
+model="gemini/gemini-1.5-flash"
+fallback_models=["gemini/gemini-1.5-flash"]
 
 [google_ai_studio] # in .secrets.toml
 gemini_api_key = "..."
@@ -146,37 +185,37 @@ If you don't want to set the API key in the .secrets.toml file, you can set the
 
 To use Anthropic models, set the relevant models in the configuration section of the configuration file:
 
-```
+```toml
 [config]
 model="anthropic/claude-3-opus-20240229"
 fallback_models=["anthropic/claude-3-opus-20240229"]
 ```
 
 And also set the api key in the .secrets.toml file:
-```
+
+```toml
 [anthropic]
 KEY = "..."
 ```
 
+See [litellm](https://docs.litellm.ai/docs/providers/anthropic#usage) documentation for more information about the environment variables required for Anthropic.
+
 ### Amazon Bedrock
 
 To use Amazon Bedrock and its foundational models, add the below configuration:
 
-```
+```toml
 [config] # in configuration.toml
-model="bedrock/anthropic.claude-3-sonnet-20240229-v1:0"
-fallback_models=["bedrock/anthropic.claude-v2:1"]
+model="bedrock/anthropic.claude-3-5-sonnet-20240620-v1:0"
+fallback_models=["bedrock/anthropic.claude-3-5-sonnet-20240620-v1:0"]
+
+[aws]
+AWS_ACCESS_KEY_ID="..."
+AWS_SECRET_ACCESS_KEY="..."
+AWS_REGION_NAME="..."
 ```
 
-Note that you have to add access to foundational models before using them. Please refer to [this document](https://docs.aws.amazon.com/bedrock/latest/userguide/setting-up.html) for more details.
-
-If you are using the claude-3 model, please configure the following settings as there are parameters incompatible with claude-3.
-```
-[litellm]
-drop_params = true
-```
-
-AWS session is automatically authenticated from your environment, but you can also explicitly set `AWS_ACCESS_KEY_ID`, `AWS_SECRET_ACCESS_KEY` and `AWS_REGION_NAME` environment variables. Please refer to [this document](https://litellm.vercel.app/docs/providers/bedrock) for more details.
+See [litellm](https://docs.litellm.ai/docs/providers/bedrock#usage) documentation for more information about the environment variables required for Amazon Bedrock.
 
 ### DeepSeek
 
@@ -197,51 +236,104 @@ key = ...
 
 (you can obtain a deepseek-chat key from [here](https://platform.deepseek.com))
 
-
 ### DeepInfra
 
 To use DeepSeek model with DeepInfra, for example, set:
-```
+
+```toml
 [config] # in configuration.toml
 model = "deepinfra/deepseek-ai/DeepSeek-R1-Distill-Llama-70B"
 fallback_models = ["deepinfra/deepseek-ai/DeepSeek-R1-Distill-Qwen-32B"]
 [deepinfra] # in .secrets.toml
 key = ... # your DeepInfra api key
 ```
+
 (you can obtain a DeepInfra key from [here](https://deepinfra.com/dash/api_keys))
 
+### Mistral
+
+To use models like Mistral or Codestral with Mistral, for example, set:
+
+```toml
+[config] # in configuration.toml
+model = "mistral/mistral-small-latest"
+fallback_models = ["mistral/mistral-medium-latest"]
+[mistral] # in .secrets.toml
+key = "..." # your Mistral api key
+```
+
+(you can obtain a Mistral key from [here](https://console.mistral.ai/api-keys))
+
+### Codestral
+
+To use Codestral model with Codestral, for example, set:
+
+```toml
+[config] # in configuration.toml
+model = "codestral/codestral-latest"
+fallback_models = ["codestral/codestral-2405"]
+[codestral] # in .secrets.toml
+key = "..." # your Codestral api key
+```
+
+(you can obtain a Codestral key from [here](https://console.mistral.ai/codestral))
+
+### Openrouter
+
+To use model from Openrouter, for example, set:
+
+```toml
+[config] # in configuration.toml 
+model="openrouter/anthropic/claude-3.7-sonnet"
+fallback_models=["openrouter/deepseek/deepseek-chat"]
+custom_model_max_tokens=20000
+
+[openrouter]  # in .secrets.toml or passed an environment variable openrouter__key
+key = "..." # your openrouter api key
+```
+
+(you can obtain an Openrouter API key from [here](https://openrouter.ai/settings/keys))
+
 ### Custom models
 
 If the relevant model doesn't appear [here](https://github.com/Codium-ai/pr-agent/blob/main/pr_agent/algo/__init__.py), you can still use it as a custom model:
 
 1. Set the model name in the configuration file:
-```
+
+```toml
 [config]
 model="custom_model_name"
 fallback_models=["custom_model_name"]
 ```
+
 2. Set the maximal tokens for the model:
-```
+
+```toml
 [config]
 custom_model_max_tokens= ...
 ```
+
 3. Go to [litellm documentation](https://litellm.vercel.app/docs/proxy/quick_start#supported-llms), find the model you want to use, and set the relevant environment variables.
 
-4. Most reasoning models do not support chat-style inputs (`system` and `user` messages) or temperature settings. 
+4. Most reasoning models do not support chat-style inputs (`system` and `user` messages) or temperature settings.
 To bypass chat templates and temperature controls, set `config.custom_reasoning_model = true` in your configuration file.
 
 ## Dedicated parameters
 
 ### OpenAI models
 
+```toml
 [config]
 reasoning_efffort= = "medium" # "low", "medium", "high"
+```
 
-With the OpenAI models that support reasoning effort (eg: o3-mini), you can specify its reasoning effort via `config` section. The default value is `medium`. You can change it to `high` or `low` based on your usage.
+With the OpenAI models that support reasoning effort (eg: o4-mini), you can specify its reasoning effort via `config` section. The default value is `medium`. You can change it to `high` or `low` based on your usage.
 
 ### Anthropic models
 
+```toml
 [config]
 enable_claude_extended_thinking = false # Set to true to enable extended thinking feature
 extended_thinking_budget_tokens = 2048
 extended_thinking_max_output_tokens = 4096
+```

docs/docs/usage-guide/configuration_options.md

@@ -23,7 +23,6 @@ In terms of precedence, wiki configurations will override local configurations,
 With Qodo Merge, you can set configurations by creating a page called `.pr_agent.toml` in the [wiki](https://github.com/Codium-ai/pr-agent/wiki/pr_agent.toml) of the repo.
 The advantage of this method is that it allows to set configurations without needing to commit new content to the repo - just edit the wiki page and **save**.
 
-
 ![wiki_configuration](https://codium.ai/images/pr_agent/wiki_configuration.png){width=512}
 
 Click [here](https://codium.ai/images/pr_agent/wiki_configuration_pr_agent.mp4) to see a short instructional video. We recommend surrounding the configuration content with triple-quotes (or \`\`\`toml), to allow better presentation when displayed in the wiki as markdown.
@@ -40,8 +39,7 @@ Qodo Merge will know to remove the surrounding quotes when reading the configura
 
 `Platforms supported: GitHub, GitLab, Bitbucket, Azure DevOps`
 
-
-By uploading a local `.pr_agent.toml` file to the root of the repo's main branch, you can edit and customize any configuration parameter. Note that you need to upload `.pr_agent.toml` prior to creating a PR, in order for the configuration to take effect.
+By uploading a local `.pr_agent.toml` file to the root of the repo's default branch, you can edit and customize any configuration parameter. Note that you need to upload or update `.pr_agent.toml` before using the PR Agent tools (either at PR creation or via manual trigger) for the configuration to take effect.
 
 For example, if you set in `.pr_agent.toml`:
 
@@ -56,12 +54,11 @@ extra_instructions="""\
 
 Then you can give a list of extra instructions to the `review` tool.
 
-
 ## Global configuration file 💎
 
 `Platforms supported: GitHub, GitLab, Bitbucket`
 
-If you create a repo called `pr-agent-settings` in your **organization**, it's configuration file `.pr_agent.toml` will be used as a global configuration file for any other repo that belongs to the same organization.
+If you create a repo called `pr-agent-settings` in your **organization**, its configuration file `.pr_agent.toml` will be used as a global configuration file for any other repo that belongs to the same organization.
 Parameters from a local `.pr_agent.toml` file, in a specific repo, will override the global configuration parameters.
 
 For example, in the GitHub organization `Codium-ai`:
@@ -71,27 +68,27 @@ For example, in the GitHub organization `Codium-ai`:
 - The repo [`https://github.com/Codium-ai/pr-agent`](https://github.com/Codium-ai/pr-agent/blob/main/.pr_agent.toml) inherits the global configuration file from `pr-agent-settings`.
 
 ### Bitbucket Organization level configuration file 💎
-`Relevant platforms: Bitbucket Cloud, Bitbucket Data Center`
 
-In Bitbucket, there are two levels where you can define a global configuration file:
+`Relevant platforms: Bitbucket Data Center`
 
-* Project-level global configuration:
+In Bitbucket Data Center, there are two levels where you can define a global configuration file:
+
+- Project-level global configuration:
 
 Create a repository named `pr-agent-settings` within a specific project. The configuration file in this repository will apply to all repositories under the same project.
 
-* Organization-level global configuration:
+- Organization-level global configuration:
 
 Create a dedicated project to hold a global configuration file that affects all repositories across all projects in your organization.
 
 **Setting up organization-level global configuration:**
 
-1.	Create a new project with both the name and key: PR_AGENT_SETTINGS.
-2.	Inside the PR_AGENT_SETTINGS project, create a repository named pr-agent-settings.
-3.	In this repository, add a `.pr_agent.toml` configuration file—structured similarly to the global configuration file described above.
-4.	Optionally, you can add organizational-level [global best practices file](https://qodo-merge-docs.qodo.ai/usage-guide/configuration_options/#global-configuration-file).
+1. Create a new project with both the name and key: PR_AGENT_SETTINGS.
+2. Inside the PR_AGENT_SETTINGS project, create a repository named pr-agent-settings.
+3. In this repository, add a `.pr_agent.toml` configuration file—structured similarly to the global configuration file described above.
+4. Optionally, you can add organizational-level [global best practices file](https://qodo-merge-docs.qodo.ai/usage-guide/configuration_options/#global-configuration-file).
 
 Repositories across your entire Bitbucket organization will inherit the configuration from this file.
 
 !!! note "Note"
     If both organization-level and project-level global settings are defined, the project-level settings will take precedence over the organization-level configuration. Additionally, parameters from a repository’s local .pr_agent.toml file will always override both global settings.
-

docs/docs/usage-guide/enabling_a_wiki.md

@@ -1,6 +1,5 @@
 `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: 💎**
@@ -9,7 +8,6 @@ For optimal functionality of Qodo Merge, we recommend enabling a wiki for each r
 - 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:
@@ -27,6 +25,6 @@ To enable a wiki for your repository:
 - 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.
 - 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.
+  - It lives within your repository, making it suitable for code-related documentation
+  - It enables quick updates without the overhead of pull requests
+  - It maintains full Git version control, allowing you to track changes over time.

docs/docs/usage-guide/index.md

@@ -1,9 +1,8 @@
 # Usage guide
 
-This page provides a detailed guide on how to use Qodo Merge.
+This section provides a detailed guide on how to use Qodo Merge.
 It includes information on how to adjust Qodo Merge configurations, define which tools will run automatically, and other advanced configurations.
 
-
 - [Introduction](./introduction.md)
 - [Enabling a Wiki](./enabling_a_wiki)
 - [Configuration File](./configuration_options.md)
@@ -17,11 +16,11 @@ It includes information on how to adjust Qodo Merge configurations, define which
     - [Azure DevOps Provider](./automations_and_usage.md#azure-devops-provider)
 - [Managing Mail Notifications](./mail_notifications.md)
 - [Changing a Model](./changing_a_model.md)
-- [Additional Configurations Walkthrough](./additional_configurations.md)
+- [Additional Configurations](./additional_configurations.md)
     - [Ignoring files from analysis](./additional_configurations.md#ignoring-files-from-analysis)
     - [Extra instructions](./additional_configurations.md#extra-instructions)
     - [Working with large PRs](./additional_configurations.md#working-with-large-prs)
-    - [Changing a model](./additional_configurations.md#changing-a-model)
+    - [Changing a model](https://qodo-merge-docs.qodo.ai/usage-guide/changing_a_model/)
     - [Patch Extra Lines](./additional_configurations.md#patch-extra-lines)
-    - [Editing the prompts](./additional_configurations.md#editing-the-prompts)
+- [FAQ](https://qodo-merge-docs.qodo.ai/faq/)
 - [Qodo Merge Models](./qodo_merge_models)

docs/docs/usage-guide/introduction.md

@@ -5,7 +5,6 @@ After [installation](https://qodo-merge-docs.qodo.ai/installation/), there are t
 2. Online usage - by [commenting](https://github.com/Codium-ai/pr-agent/pull/229#issuecomment-1695021901){:target="_blank"} on a PR
 3. Enabling Qodo Merge tools to run automatically when a new PR is opened
 
-
 Specifically, CLI commands can be issued by invoking a pre-built [docker image](https://qodo-merge-docs.qodo.ai/installation/locally/#using-docker-image), or by invoking a [locally cloned repo](https://qodo-merge-docs.qodo.ai/installation/locally/#run-from-source).
 
 For online usage, you will need to setup either a [GitHub App](https://qodo-merge-docs.qodo.ai/installation/github/#run-as-a-github-app) or a [GitHub Action](https://qodo-merge-docs.qodo.ai/installation/github/#run-as-a-github-action) (GitHub), a [GitLab webhook](https://qodo-merge-docs.qodo.ai/installation/gitlab/#run-a-gitlab-webhook-server) (GitLab), or a [BitBucket App](https://qodo-merge-docs.qodo.ai/installation/bitbucket/#run-using-codiumai-hosted-bitbucket-app) (BitBucket).

docs/docs/usage-guide/mail_notifications.md

@@ -8,10 +8,10 @@ As an alternative, you can filter in your mail provider the notifications specif
 
 ![filter_mail_notifications](https://codium.ai/images/pr_agent/filter_mail_notifications.png){width=512}
 
-
 Another option to reduce the mail overload, yet still receive notifications on Qodo Merge tools, is to disable the help collapsible section in Qodo Merge bot comments.
 This can done by setting `enable_help_text=false` for the relevant tool in the configuration file.
 For example, to disable the help text for the `pr_reviewer` tool, set:
+
 ```
 [pr_reviewer]
 enable_help_text = false

docs/docs/usage-guide/qodo_merge_models.md

@@ -1,32 +1,42 @@
 
-The default model used by Qodo Merge (March 2025) is Claude Sonnet 3.7.
+The default models used by Qodo Merge (April 2025) are a combination of Claude Sonnet 3.7 and Gemini 2.5 Pro.
 
 ### Selecting a Specific Model
 
-Users can configure Qodo Merge to use a specific model by editing the [configuration](https://qodo-merge-docs.qodo.ai/usage-guide/configuration_options/) file.
+Users can configure Qodo Merge to use only 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-7-sonnet` (default)
-- `o3-mini`
-- `gpt-4o`
+- `claude-3-7-sonnet`
+- `o4-mini`
+- `gpt-4.1`
+- `gemini-2.5-pro`
 - `deepseek/r1`
 
-To restrict Qodo Merge to using only `o3-mini`, add this setting:
-```
+To restrict Qodo Merge to using only `o4-mini`, add this setting:
+
+```toml
 [config]
-model="o3-mini"
+model="o4-mini"
 ```
 
-To restrict Qodo Merge to using only `GPT-4o`, add this setting:
-```
+To restrict Qodo Merge to using only `GPT-4.1`, add this setting:
+
+```toml
 [config]
-model="gpt-4o"
+model="gpt-4.1"
 ```
 
+To restrict Qodo Merge to using only `gemini-2.5-pro`, add this setting:
+
+```toml
+[config]
+model="gemini-2.5-pro"
+```
+
+
 To restrict Qodo Merge to using only `deepseek-r1` us-hosted, add this setting:
-```
+
+```toml
 [config]
 model="deepseek/r1"
 ```
-
-

docs/mkdocs.yml

@@ -20,6 +20,7 @@ nav:
     - Managing Mail Notifications: 'usage-guide/mail_notifications.md'
     - Changing a Model: 'usage-guide/changing_a_model.md'
     - Additional Configurations: 'usage-guide/additional_configurations.md'
+    - Frequently Asked Questions: 'faq/index.md'
     - 💎 Qodo Merge Models: 'usage-guide/qodo_merge_models.md'
   - Tools:
     - 'tools/index.md'
@@ -39,25 +40,29 @@ nav:
     - 💎 CI Feedback: 'tools/ci_feedback.md'
     - 💎 Similar Code: 'tools/similar_code.md'
     - 💎 Implement: 'tools/implement.md'
+    - 💎 Scan Repo Discussions: 'tools/scan_repo_discussions.md'
   - 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'
+      - Code validation: 'core-abilities/code_validation.md'
+      - Compression strategy: 'core-abilities/compression_strategy.md'
       - Dynamic context: 'core-abilities/dynamic_context.md'
-      - Self-reflection: 'core-abilities/self_reflection.md'
+      - Fetching ticket context: 'core-abilities/fetching_ticket_context.md'
       - Impact evaluation: 'core-abilities/impact_evaluation.md'
       - Interactivity: 'core-abilities/interactivity.md'
-      - Compression strategy: 'core-abilities/compression_strategy.md'
-      - Company Codebase: 'core-abilities/company_codebase.md'
+      - Local and global metadata: 'core-abilities/metadata.md'
+      - RAG context enrichment: 'core-abilities/rag_context_enrichment.md'
+      - Self-reflection: 'core-abilities/self_reflection.md'
       - Static code analysis: 'core-abilities/static_code_analysis.md'
-      - Code Fine-tuning Benchmark: 'finetuning_benchmark/index.md'
   - Chrome Extension:
       - Qodo Merge Chrome Extension: 'chrome-extension/index.md'
       - Features: 'chrome-extension/features.md'
       - Data Privacy: 'chrome-extension/data_privacy.md'
-  - FAQ:
-      - FAQ: 'faq/index.md'
+      - Options: 'chrome-extension/options.md'
+  - PR Benchmark:
+      - PR Benchmark: 'pr_benchmark/index.md'
+  - Recent Updates:
+      - Recent Updates: 'recent_updates/index.md'
   - AI Docs Search: 'ai_search/index.md'
 #  - Code Fine-tuning Benchmark: 'finetuning_benchmark/index.md'
 
@@ -79,7 +84,6 @@ theme:
     - content.tabs.link
     - content.code.annotation
     - content.code.copy
-    - content.tabs.link
   language: en
   custom_dir: overrides
 
@@ -147,6 +151,8 @@ markdown_extensions:
   - pymdownx.emoji:
       emoji_index: !!python/name:material.extensions.emoji.twemoji
       emoji_generator: !!python/name:material.extensions.emoji.to_svg
+  - pymdownx.tabbed:
+      alternate_style: true
   - toc:
       title: On this page
       toc_depth: 3

pr_agent/agent/pr_agent.py

@@ -84,10 +84,18 @@ class PRAgent:
                 if str(type(setting)) == "<class 'dynaconf.utils.boxing.DynaBox'>":
                     if hasattr(setting, 'extra_instructions'):
                         current_extra_instructions = setting.extra_instructions
-                        if current_extra_instructions:
-                            setting.extra_instructions = current_extra_instructions+ f"\n======\n\nIn addition, Your response MUST be written in the language corresponding to local code: {response_language}. This is crucial."
-                        else:
-                            setting.extra_instructions = f"Your response MUST be written in the language corresponding to locale code: '{response_language}'. This is crucial."
+                        
+                        # Define the language-specific instruction and the separator
+                        lang_instruction_text = f"Your response MUST be written in the language corresponding to locale code: '{response_language}'. This is crucial."
+                        separator_text = "\n======\n\nIn addition, "
+
+                        # Check if the specific language instruction is already present to avoid duplication
+                        if lang_instruction_text not in str(current_extra_instructions):
+                            if current_extra_instructions: # If there's existing text
+                                setting.extra_instructions = str(current_extra_instructions) + separator_text + lang_instruction_text
+                            else: # If extra_instructions was None or empty
+                                setting.extra_instructions = lang_instruction_text
+                        # If lang_instruction_text is already present, do nothing.
 
         action = action.lstrip("/").lower()
         if action not in command2class:

pr_agent/algo/__init__.py

@@ -20,6 +20,14 @@ MAX_TOKENS = {
     'gpt-4o-mini-2024-07-18': 128000,  # 128K, but may be limited by config.max_model_tokens
     'gpt-4o-2024-08-06': 128000,  # 128K, but may be limited by config.max_model_tokens
     'gpt-4o-2024-11-20': 128000,  # 128K, but may be limited by config.max_model_tokens
+    'gpt-4.5-preview': 128000,  # 128K, but may be limited by config.max_model_tokens
+    'gpt-4.5-preview-2025-02-27': 128000,  # 128K, but may be limited by config.max_model_tokens
+    'gpt-4.1': 1047576,
+    'gpt-4.1-2025-04-14': 1047576,
+    'gpt-4.1-mini': 1047576,
+    'gpt-4.1-mini-2025-04-14': 1047576,
+    'gpt-4.1-nano': 1047576,
+    'gpt-4.1-nano-2025-04-14': 1047576,
     'o1-mini': 128000,  # 128K, but may be limited by config.max_model_tokens
     'o1-mini-2024-09-12': 128000,  # 128K, but may be limited by config.max_model_tokens
     'o1-preview': 128000,  # 128K, but may be limited by config.max_model_tokens
@@ -28,6 +36,10 @@ MAX_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
+    'o3': 200000,  # 200K, but may be limited by config.max_model_tokens
+    'o3-2025-04-16': 200000,  # 200K, but may be limited by config.max_model_tokens
+    'o4-mini': 200000, # 200K, but may be limited by config.max_model_tokens
+    'o4-mini-2025-04-16': 200000, # 200K, but may be limited by config.max_model_tokens
     'claude-instant-1': 100000,
     'claude-2': 100000,
     'command-nightly': 4096,
@@ -45,12 +57,15 @@ MAX_TOKENS = {
     'vertex_ai/claude-3-5-sonnet-v2@20241022': 100000,
     'vertex_ai/claude-3-7-sonnet@20250219': 200000,
     'vertex_ai/gemini-1.5-pro': 1048576,
+    'vertex_ai/gemini-2.5-pro-preview-03-25': 1048576,
     'vertex_ai/gemini-1.5-flash': 1048576,
     'vertex_ai/gemini-2.0-flash': 1048576,
+    'vertex_ai/gemini-2.5-flash-preview-04-17': 1048576,
     'vertex_ai/gemma2': 8200,
     'gemini/gemini-1.5-pro': 1048576,
     'gemini/gemini-1.5-flash': 1048576,
     'gemini/gemini-2.0-flash': 1048576,
+    'gemini/gemini-2.5-pro-preview-03-25': 1048576,
     'codechat-bison': 6144,
     'codechat-bison-32k': 32000,
     'anthropic.claude-instant-v1': 100000,
@@ -74,12 +89,21 @@ MAX_TOKENS = {
     "bedrock/us.anthropic.claude-3-5-sonnet-20241022-v2:0": 100000,
     "bedrock/us.anthropic.claude-3-7-sonnet-20250219-v1:0": 200000,
     'claude-3-5-sonnet': 100000,
+    'groq/meta-llama/llama-4-scout-17b-16e-instruct': 131072,
+    'groq/meta-llama/llama-4-maverick-17b-128e-instruct': 131072,
     'groq/llama3-8b-8192': 8192,
     'groq/llama3-70b-8192': 8192,
     'groq/llama-3.1-8b-instant': 8192,
     'groq/llama-3.3-70b-versatile': 128000,
     'groq/mixtral-8x7b-32768': 32768,
     'groq/gemma2-9b-it': 8192,
+    'xai/grok-2': 131072,
+    'xai/grok-2-1212': 131072,
+    'xai/grok-2-latest': 131072,
+    'xai/grok-3-beta': 131072,
+    'xai/grok-3-fast-beta': 131072,
+    'xai/grok-3-mini-beta': 131072,
+    'xai/grok-3-mini-fast-beta': 131072,
     'ollama/llama3': 4096,
     'watsonx/meta-llama/llama-3-8b-instruct': 4096,
     "watsonx/meta-llama/llama-3-70b-instruct": 4096,
@@ -90,6 +114,20 @@ MAX_TOKENS = {
     "deepinfra/deepseek-ai/DeepSeek-R1-Distill-Qwen-32B": 128000,
     "deepinfra/deepseek-ai/DeepSeek-R1-Distill-Llama-70B": 128000,
     "deepinfra/deepseek-ai/DeepSeek-R1": 128000,
+    "mistral/mistral-small-latest": 8191,
+    "mistral/mistral-medium-latest": 8191,
+    "mistral/mistral-large-2407": 128000,
+    "mistral/mistral-large-latest": 128000,
+    "mistral/open-mistral-7b": 8191,
+    "mistral/open-mixtral-8x7b": 8191,
+    "mistral/open-mixtral-8x22b": 8191,
+    "mistral/codestral-latest": 8191,
+    "mistral/open-mistral-nemo": 128000,
+    "mistral/open-mistral-nemo-2407": 128000,
+    "mistral/open-codestral-mamba": 256000,
+    "mistral/codestral-mamba-latest": 256000,
+    "codestral/codestral-latest": 8191,
+    "codestral/codestral-2405": 8191,
 }
 
 USER_MESSAGE_ONLY_MODELS = [
@@ -107,12 +145,20 @@ NO_SUPPORT_TEMPERATURE_MODELS = [
     "o1-2024-12-17",
     "o3-mini",
     "o3-mini-2025-01-31",
-    "o1-preview"
+    "o1-preview",
+    "o3",
+    "o3-2025-04-16",
+    "o4-mini",
+    "o4-mini-2025-04-16",
 ]
 
 SUPPORT_REASONING_EFFORT_MODELS = [
     "o3-mini",
-    "o3-mini-2025-01-31"
+    "o3-mini-2025-01-31",
+    "o3",
+    "o3-2025-04-16",
+    "o4-mini",
+    "o4-mini-2025-04-16",
 ]
 
 CLAUDE_EXTENDED_THINKING_MODELS = [

pr_agent/algo/ai_handlers/litellm_ai_handler.py

@@ -1,5 +1,4 @@
 import os
-
 import litellm
 import openai
 import requests
@@ -31,6 +30,7 @@ class LiteLLMAIHandler(BaseAiHandler):
         self.azure = False
         self.api_base = None
         self.repetition_penalty = None
+        
         if get_settings().get("OPENAI.KEY", None):
             openai.api_key = get_settings().openai.key
             litellm.openai_key = get_settings().openai.key
@@ -67,6 +67,8 @@ class LiteLLMAIHandler(BaseAiHandler):
             litellm.api_key = get_settings().groq.key
         if get_settings().get("REPLICATE.KEY", None):
             litellm.replicate_key = get_settings().replicate.key
+        if get_settings().get("XAI.KEY", None):
+            litellm.api_key = get_settings().xai.key
         if get_settings().get("HUGGINGFACE.KEY", None):
             litellm.huggingface_key = get_settings().huggingface.key
         if get_settings().get("HUGGINGFACE.API_BASE", None) and 'huggingface' in get_settings().config.model:
@@ -95,6 +97,39 @@ class LiteLLMAIHandler(BaseAiHandler):
         if get_settings().get("DEEPINFRA.KEY", None):
             os.environ['DEEPINFRA_API_KEY'] = get_settings().get("DEEPINFRA.KEY")
 
+        # Support mistral models
+        if get_settings().get("MISTRAL.KEY", None):
+            os.environ["MISTRAL_API_KEY"] = get_settings().get("MISTRAL.KEY")
+        
+        # Support codestral models
+        if get_settings().get("CODESTRAL.KEY", None):
+            os.environ["CODESTRAL_API_KEY"] = get_settings().get("CODESTRAL.KEY")
+
+        # Check for Azure AD configuration
+        if get_settings().get("AZURE_AD.CLIENT_ID", None):
+            self.azure = True
+            # Generate access token using Azure AD credentials from settings
+            access_token = self._get_azure_ad_token()
+            litellm.api_key = access_token
+            openai.api_key = access_token
+            
+            # Set API base from settings
+            self.api_base = get_settings().azure_ad.api_base
+            litellm.api_base = self.api_base
+            openai.api_base = self.api_base
+
+        # Support for Openrouter models
+        if get_settings().get("OPENROUTER.KEY", None):
+            openrouter_api_key = get_settings().get("OPENROUTER.KEY", None)
+            os.environ["OPENROUTER_API_KEY"] = openrouter_api_key
+            litellm.api_key = openrouter_api_key
+            openai.api_key = openrouter_api_key
+
+            openrouter_api_base = get_settings().get("OPENROUTER.API_BASE", "https://openrouter.ai/api/v1")
+            os.environ["OPENROUTER_API_BASE"] = openrouter_api_base
+            self.api_base = openrouter_api_base
+            litellm.api_base = openrouter_api_base
+
         # Models that only use user meessage
         self.user_message_only_models = USER_MESSAGE_ONLY_MODELS
 
@@ -107,6 +142,26 @@ class LiteLLMAIHandler(BaseAiHandler):
         # Models that support extended thinking
         self.claude_extended_thinking_models = CLAUDE_EXTENDED_THINKING_MODELS
 
+    def _get_azure_ad_token(self):
+        """
+        Generates an access token using Azure AD credentials from settings.
+        Returns:
+            str: The access token
+        """
+        from azure.identity import ClientSecretCredential
+        try:
+            credential = ClientSecretCredential(
+                tenant_id=get_settings().azure_ad.tenant_id,
+                client_id=get_settings().azure_ad.client_id,
+                client_secret=get_settings().azure_ad.client_secret
+            )
+            # Get token for Azure OpenAI service
+            token = credential.get_token("https://cognitiveservices.azure.com/.default")
+            return token.token
+        except Exception as e:
+            get_logger().error(f"Failed to get Azure AD token: {e}")
+            raise
+
     def prepare_logs(self, response, system, user, resp, finish_reason):
         response_log = response.dict().copy()
         response_log['system'] = system

pr_agent/algo/git_patch_processing.py

@@ -102,20 +102,20 @@ def process_patch_lines(patch_str, original_file_str, patch_extra_lines_before,
                             lines_before_original = file_original_lines[extended_start1 - 1:start1 - 1]
                             lines_before_new = file_new_lines[extended_start2 - 1:start2 - 1]
                             found_header = False
-                            if lines_before_original == lines_before_new: # Making sure no changes from a previous hunk
-                                for i, line, in enumerate(lines_before_original):
-                                    if section_header in line:
+                            for i, line in enumerate(lines_before_original):
+                                if section_header in line:
+                                    # Update start and size in one line each
+                                    extended_start1, extended_start2 = extended_start1 + i, extended_start2 + i
+                                    extended_size1, extended_size2 = extended_size1 - i, extended_size2 - i
+                                    lines_before_original_dynamic_context = lines_before_original[i:]
+                                    lines_before_new_dynamic_context = lines_before_new[i:]
+                                    if lines_before_original_dynamic_context == lines_before_new_dynamic_context:
+                                        # get_logger().debug(f"found dynamic context match for section header: {section_header}")
                                         found_header = True
-                                        # Update start and size in one line each
-                                        extended_start1, extended_start2 = extended_start1 + i, extended_start2 + i
-                                        extended_size1, extended_size2 = extended_size1 - i, extended_size2 - i
-                                        # get_logger().debug(f"Found section header in line {i} before the hunk")
                                         section_header = ''
-                                        break
-                            else:
-                                get_logger().debug(f"Extra lines before hunk are different in original and new file - dynamic context",
-                                                   artifact={"lines_before_original": lines_before_original,
-                                                             "lines_before_new": lines_before_new})
+                                    else:
+                                        pass  # its ok to be here. We cant apply dynamic context if the lines are different if 'old' and 'new' hunks
+                                    break
 
                             if not found_header:
                                 # get_logger().debug(f"Section header not found in the extra lines before the hunk")
@@ -130,14 +130,26 @@ def process_patch_lines(patch_str, original_file_str, patch_extra_lines_before,
                         if file_new_lines:
                             delta_lines_new = [f' {line}' for line in file_new_lines[extended_start2 - 1:start2 - 1]]
                             if delta_lines_original != delta_lines_new:
-                                get_logger().debug(f"Extra lines before hunk are different in original and new file",
-                                                   artifact={"delta_lines_original": delta_lines_original,
-                                                             "delta_lines_new": delta_lines_new})
-                                extended_start1 = start1
-                                extended_size1 = size1
-                                extended_start2 = start2
-                                extended_size2 = size2
-                                delta_lines_original = []
+                                found_mini_match = False
+                                for i in range(len(delta_lines_original)):
+                                    if delta_lines_original[i:] == delta_lines_new[i:]:
+                                        delta_lines_original = delta_lines_original[i:]
+                                        delta_lines_new = delta_lines_new[i:]
+                                        extended_start1 += i
+                                        extended_size1 -= i
+                                        extended_start2 += i
+                                        extended_size2 -= i
+                                        found_mini_match = True
+                                        break
+                                if not found_mini_match:
+                                    extended_start1 = start1
+                                    extended_size1 = size1
+                                    extended_start2 = start2
+                                    extended_size2 = size2
+                                    delta_lines_original = []
+                                    # get_logger().debug(f"Extra lines before hunk are different in original and new file",
+                                    #                    artifact={"delta_lines_original": delta_lines_original,
+                                    #                              "delta_lines_new": delta_lines_new})
 
                         #  logic to remove section header if its in the extra delta lines (in dynamic context, this is also done)
                         if section_header and not allow_dynamic_context:

pr_agent/algo/pr_processing.py

@@ -12,7 +12,7 @@ from pr_agent.algo.git_patch_processing import (
 from pr_agent.algo.language_handler import sort_files_by_main_languages
 from pr_agent.algo.token_handler import TokenHandler
 from pr_agent.algo.types import EDIT_TYPE, FilePatchInfo
-from pr_agent.algo.utils import ModelType, clip_tokens, get_max_tokens, get_weak_model
+from pr_agent.algo.utils import ModelType, clip_tokens, get_max_tokens, get_model
 from pr_agent.config_loader import get_settings
 from pr_agent.git_providers.git_provider import GitProvider
 from pr_agent.log import get_logger
@@ -339,7 +339,11 @@ async def retry_with_fallback_models(f: Callable, model_type: ModelType = ModelT
 
 def _get_all_models(model_type: ModelType = ModelType.REGULAR) -> List[str]:
     if model_type == ModelType.WEAK:
-        model = get_weak_model()
+        model = get_model('model_weak')
+    elif model_type == ModelType.REASONING:
+        model = get_model('model_reasoning')
+    elif model_type == ModelType.REGULAR:
+        model = get_settings().config.model
     else:
         model = get_settings().config.model
     fallback_models = get_settings().config.fallback_models

pr_agent/algo/token_handler.py

@@ -1,7 +1,6 @@
 from threading import Lock
 
 from jinja2 import Environment, StrictUndefined
-from math import ceil
 from tiktoken import encoding_for_model, get_encoding
 
 from pr_agent.config_loader import get_settings
@@ -20,8 +19,11 @@ class TokenEncoder:
             with cls._lock:  # Lock acquisition to ensure thread safety
                 if cls._encoder_instance is None or model != cls._model:
                     cls._model = model
-                    cls._encoder_instance = encoding_for_model(cls._model) if "gpt" in cls._model else get_encoding(
-                        "cl100k_base")
+                    try:
+                        cls._encoder_instance = encoding_for_model(cls._model) if "gpt" in cls._model else get_encoding(
+                            "o200k_base")
+                    except:
+                        cls._encoder_instance = get_encoding("o200k_base")
         return cls._encoder_instance
 
 
@@ -105,6 +107,19 @@ class TokenHandler:
             get_logger().error( f"Error in Anthropic token counting: {e}")
             return MaxTokens
 
+    def estimate_token_count_for_non_anth_claude_models(self, model, default_encoder_estimate):
+        from math import ceil
+        import re
+
+        model_is_from_o_series = re.match(r"^o[1-9](-mini|-preview)?$", model)
+        if ('gpt' in get_settings().config.model.lower() or model_is_from_o_series) and get_settings(use_context=False).get('openai.key'):
+            return default_encoder_estimate
+        #else: Model is not an OpenAI one - therefore, cannot provide an accurate token count and instead, return a higher number as best effort.
+
+        elbow_factor = 1 + get_settings().get('config.model_token_count_estimate_factor', 0)
+        get_logger().warning(f"{model}'s expected token count cannot be accurately estimated. Using {elbow_factor} of encoder output as best effort estimate")
+        return ceil(elbow_factor * default_encoder_estimate)
+
     def count_tokens(self, patch: str, force_accurate=False) -> int:
         """
         Counts the number of tokens in a given patch string.
@@ -116,21 +131,15 @@ class TokenHandler:
         The number of tokens in the patch string.
         """
         encoder_estimate = len(self.encoder.encode(patch, disallowed_special=()))
+
+        #If an estimate is enough (for example, in cases where the maximal allowed tokens is way below the known limits), return it.
         if not force_accurate:
             return encoder_estimate
-        #else, need to provide an accurate estimation:
 
+        #else, force_accurate==True: User requested providing an accurate estimation:
         model = get_settings().config.model.lower()
-        if force_accurate and 'claude' in model and get_settings(use_context=False).get('anthropic.key'):
+        if 'claude' in model and get_settings(use_context=False).get('anthropic.key'):
             return self.calc_claude_tokens(patch) # API call to Anthropic for accurate token counting for Claude models
-        #else: Non Anthropic provided model
 
-        import re
-        model_is_from_o_series = re.match(r"^o[1-9](-mini|-preview)?$", model)
-        if ('gpt' in get_settings().config.model.lower() or model_is_from_o_series) and get_settings(use_context=False).get('openai.key'):
-            return encoder_estimate
-        #else: Model is neither an OpenAI, nor an Anthropic model - therefore, cannot provide an accurate token count and instead, return a higher number as best effort.
-
-        elbow_factor = 1 + get_settings().get('config.model_token_count_estimate_factor', 0)
-        get_logger().warning(f"{model}'s expected token count cannot be accurately estimated. Using {elbow_factor} of encoder output as best effort estimate")
-        return ceil(elbow_factor * encoder_estimate)
+        #else: Non Anthropic provided model:
+        return self.estimate_token_count_for_non_anth_claude_models(model, encoder_estimate)

pr_agent/algo/utils.py

@@ -30,12 +30,13 @@ from pr_agent.config_loader import get_settings, global_settings
 from pr_agent.log import get_logger
 
 
-def get_weak_model() -> str:
-    if get_settings().get("config.model_weak"):
+def get_model(model_type: str = "model_weak") -> str:
+    if model_type == "model_weak" and get_settings().get("config.model_weak"):
         return get_settings().config.model_weak
+    elif model_type == "model_reasoning" and get_settings().get("config.model_reasoning"):
+        return get_settings().config.model_reasoning
     return get_settings().config.model
 
-
 class Range(BaseModel):
     line_start: int  # should be 0-indexed
     line_end: int
@@ -45,6 +46,7 @@ class Range(BaseModel):
 class ModelType(str, Enum):
     REGULAR = "regular"
     WEAK = "weak"
+    REASONING = "reasoning"
 
 class PRReviewHeader(str, Enum):
     REGULAR = "## PR Reviewer Guide"
@@ -878,6 +880,7 @@ def get_max_tokens(model):
     elif settings.config.custom_model_max_tokens > 0:
         max_tokens_model = settings.config.custom_model_max_tokens
     else:
+        get_logger().error(f"Model {model} is not defined in MAX_TOKENS in ./pr_agent/algo/__init__.py and no custom_model_max_tokens is set")
         raise Exception(f"Ensure {model} is defined in MAX_TOKENS in ./pr_agent/algo/__init__.py or set a positive value for it in config.custom_model_max_tokens")
 
     if settings.config.max_model_tokens and settings.config.max_model_tokens > 0:

pr_agent/cli.py

@@ -86,7 +86,13 @@ def run(inargs=None, args=None):
         if get_settings().litellm.get("enable_callbacks", False):
             # There may be additional events on the event queue from the run above. If there are give them time to complete.
             get_logger().debug("Waiting for event queue to complete")
-            await asyncio.wait([task for task in asyncio.all_tasks() if task is not asyncio.current_task()])
+            tasks = [task for task in asyncio.all_tasks() if task is not asyncio.current_task()]
+            if tasks:
+                _, pending = await asyncio.wait(tasks, timeout=30)
+                if pending:
+                    get_logger().warning(
+                        f"{len(pending)} callback tasks({[task.get_coro() for task in pending]}) did not complete within timeout"
+                    )
 
         return result
 

pr_agent/config_loader.py

@@ -29,6 +29,7 @@ global_settings = Dynaconf(
         "settings/custom_labels.toml",
         "settings/pr_help_prompts.toml",
         "settings/pr_help_docs_prompts.toml",
+        "settings/pr_help_docs_headings_prompts.toml",
         "settings/.secrets.toml",
         "settings_prod/.secrets.toml",
     ]]

pr_agent/git_providers/azuredevops_provider.py

@@ -18,14 +18,10 @@ ADO_APP_CLIENT_DEFAULT_ID = "499b84ac-1321-427f-aa17-267ca6975798/.default"
 MAX_PR_DESCRIPTION_AZURE_LENGTH = 4000-1
 
 try:
-    # noinspection PyUnresolvedReferences
     # noinspection PyUnresolvedReferences
     from azure.devops.connection import Connection
     # noinspection PyUnresolvedReferences
-    from azure.devops.v7_1.git.models import (Comment, CommentThread,
-                                              GitPullRequest,
-                                              GitPullRequestIterationChanges,
-                                              GitVersionDescriptor)
+    from azure.devops.released.git import (Comment, CommentThread, GitPullRequest, GitVersionDescriptor, GitClient, CommentThreadContext, CommentPosition)
     # noinspection PyUnresolvedReferences
     from azure.identity import DefaultAzureCredential
     from msrest.authentication import BasicAuthentication
@@ -77,40 +73,13 @@ class AzureDevopsProvider(GitProvider):
                                        f"relevant_lines_start is {relevant_lines_start}")
                 continue
 
-            if relevant_lines_end > relevant_lines_start:
-                post_parameters = {
-                    "body": body,
-                    "path": relevant_file,
-                    "line": relevant_lines_end,
-                    "start_line": relevant_lines_start,
-                    "start_side": "RIGHT",
-                }
-            else:  # API is different for single line comments
-                post_parameters = {
-                    "body": body,
-                    "path": relevant_file,
-                    "line": relevant_lines_start,
-                    "side": "RIGHT",
-                }
-            post_parameters_list.append(post_parameters)
-        if not post_parameters_list:
-            return False
-
-        for post_parameters in post_parameters_list:
+            thread_context = CommentThreadContext(
+                file_path=relevant_file,
+                right_file_start=CommentPosition(offset=1, line=relevant_lines_start),
+                right_file_end=CommentPosition(offset=1, line=relevant_lines_end))
+            comment = Comment(content=body, comment_type=1)
+            thread = CommentThread(comments=[comment], thread_context=thread_context)
             try:
-                comment = Comment(content=post_parameters["body"], comment_type=1)
-                thread = CommentThread(comments=[comment],
-                                       thread_context={
-                                           "filePath": post_parameters["path"],
-                                           "rightFileStart": {
-                                               "line": post_parameters["start_line"],
-                                               "offset": 1,
-                                           },
-                                           "rightFileEnd": {
-                                               "line": post_parameters["line"],
-                                               "offset": 1,
-                                           },
-                                       })
                 self.azure_devops_client.create_thread(
                     comment_thread=thread,
                     project=self.workspace_slug,
@@ -118,34 +87,36 @@ class AzureDevopsProvider(GitProvider):
                     pull_request_id=self.pr_num
                 )
             except Exception as e:
-                get_logger().warning(f"Azure failed to publish code suggestion, error: {e}")
+                get_logger().error(f"Azure failed to publish code suggestion, error: {e}", suggestion=suggestion)
         return True
 
-
+    def reply_to_comment_from_comment_id(self, comment_id: int, body: str, is_temporary: bool = False) -> Comment:
+        # comment_id is actually thread_id
+        return self.reply_to_thread(comment_id, body, is_temporary)
 
     def get_pr_description_full(self) -> str:
         return self.pr.description
 
-    def edit_comment(self, comment, body: str):
+    def edit_comment(self, comment: Comment, body: str):
         try:
             self.azure_devops_client.update_comment(
                 repository_id=self.repo_slug,
                 pull_request_id=self.pr_num,
-                thread_id=comment["thread_id"],
-                comment_id=comment["comment_id"],
+                thread_id=comment.thread_id,
+                comment_id=comment.id,
                 comment=Comment(content=body),
                 project=self.workspace_slug,
             )
         except Exception as e:
             get_logger().exception(f"Failed to edit comment, error: {e}")
 
-    def remove_comment(self, comment):
+    def remove_comment(self, comment: Comment):
         try:
             self.azure_devops_client.delete_comment(
                 repository_id=self.repo_slug,
                 pull_request_id=self.pr_num,
-                thread_id=comment["thread_id"],
-                comment_id=comment["comment_id"],
+                thread_id=comment.thread_id,
+                comment_id=comment.id,
                 project=self.workspace_slug,
             )
         except Exception as e:
@@ -176,10 +147,6 @@ class AzureDevopsProvider(GitProvider):
             return []
 
     def is_supported(self, capability: str) -> bool:
-        if capability in [
-            "get_issue_comments",
-        ]:
-            return False
         return True
 
     def set_pr(self, pr_url: str):
@@ -378,22 +345,30 @@ class AzureDevopsProvider(GitProvider):
             get_logger().exception(f"Failed to get diff files, error: {e}")
             return []
 
-    def publish_comment(self, pr_comment: str, is_temporary: bool = False, thread_context=None):
+    def publish_comment(self, pr_comment: str, is_temporary: bool = False, thread_context=None) -> Comment:
         if is_temporary and not get_settings().config.publish_output_progress:
             get_logger().debug(f"Skipping publish_comment for temporary comment: {pr_comment}")
             return None
         comment = Comment(content=pr_comment)
-        thread = CommentThread(comments=[comment], thread_context=thread_context, status=1)
+        thread = CommentThread(comments=[comment], thread_context=thread_context, status="closed")
         thread_response = self.azure_devops_client.create_thread(
             comment_thread=thread,
             project=self.workspace_slug,
             repository_id=self.repo_slug,
             pull_request_id=self.pr_num,
         )
-        response = {"thread_id": thread_response.id, "comment_id": thread_response.comments[0].id}
+        created_comment = thread_response.comments[0]
+        created_comment.thread_id = thread_response.id
         if is_temporary:
-            self.temp_comments.append(response)
-        return response
+            self.temp_comments.append(created_comment)
+        return created_comment
+
+    def publish_persistent_comment(self, pr_comment: str,
+                                   initial_header: str,
+                                   update_header: bool = True,
+                                   name='review',
+                                   final_update_message=True):
+        return self.publish_persistent_comment_full(pr_comment, initial_header, update_header, name, final_update_message)
 
     def publish_description(self, pr_title: str, pr_body: str):
         if len(pr_body) > MAX_PR_DESCRIPTION_AZURE_LENGTH:
@@ -438,7 +413,6 @@ class AzureDevopsProvider(GitProvider):
     def publish_inline_comment(self, body: str, relevant_file: str, relevant_line_in_file: str, original_suggestion=None):
         self.publish_inline_comments([self.create_inline_comment(body, relevant_file, relevant_line_in_file)])
 
-
     def create_inline_comment(self, body: str, relevant_file: str, relevant_line_in_file: str,
                               absolute_position: int = None):
         position, absolute_position = find_line_number_of_relevant_line_in_file(self.get_diff_files(),
@@ -522,7 +496,7 @@ class AzureDevopsProvider(GitProvider):
     def get_user_id(self):
         return 0
 
-    def get_issue_comments(self):
+    def get_issue_comments(self) -> list[Comment]:
         threads = self.azure_devops_client.get_threads(repository_id=self.repo_slug, pull_request_id=self.pr_num, project=self.workspace_slug)
         threads.reverse()
         comment_list = []
@@ -540,30 +514,59 @@ class AzureDevopsProvider(GitProvider):
     def remove_reaction(self, issue_comment_id: int, reaction_id: int) -> bool:
         return True
 
+    def set_like(self, thread_id: int, comment_id: int, create: bool = True):
+        if create:
+            self.azure_devops_client.create_like(self.repo_slug, self.pr_num, thread_id, comment_id, project=self.workspace_slug)
+        else:
+            self.azure_devops_client.delete_like(self.repo_slug, self.pr_num, thread_id, comment_id, project=self.workspace_slug)
+            
+    def set_thread_status(self, thread_id: int, status: str):
+        try:
+            self.azure_devops_client.update_thread(CommentThread(status=status), self.repo_slug, self.pr_num, thread_id, self.workspace_slug)
+        except Exception as e:
+            get_logger().exception(f"Failed to set thread status, error: {e}")
+            
+    def reply_to_thread(self, thread_id: int, body: str, is_temporary: bool = False) -> Comment:
+        try:
+            comment = Comment(content=body)
+            response = self.azure_devops_client.create_comment(comment, self.repo_slug, self.pr_num, thread_id, self.workspace_slug)
+            response.thread_id = thread_id
+            if is_temporary:
+                self.temp_comments.append(response)
+            return response
+        except Exception as e:
+            get_logger().exception(f"Failed to reply to thread, error: {e}")
+    
+    def get_thread_context(self, thread_id: int) -> CommentThreadContext:
+        try:
+            thread = self.azure_devops_client.get_pull_request_thread(self.repo_slug, self.pr_num, thread_id, self.workspace_slug)
+            return thread.thread_context
+        except Exception as e:
+            get_logger().exception(f"Failed to set thread status, error: {e}")
+    
     @staticmethod
     def _parse_pr_url(pr_url: str) -> Tuple[str, str, int]:
         parsed_url = urlparse(pr_url)
-
         path_parts = parsed_url.path.strip("/").split("/")
-        if "pullrequest" not in path_parts:
-            raise ValueError(
-                "The provided URL does not appear to be a Azure DevOps PR URL"
-            )
-        if len(path_parts) == 6:  # "https://dev.azure.com/organization/project/_git/repo/pullrequest/1"
-            workspace_slug = path_parts[1]
-            repo_slug = path_parts[3]
-            pr_number = int(path_parts[5])
-        elif len(path_parts) == 5:  # 'https://organization.visualstudio.com/project/_git/repo/pullrequest/1'
-            workspace_slug = path_parts[0]
-            repo_slug = path_parts[2]
-            pr_number = int(path_parts[4])
-        else:
-            raise ValueError("The provided URL does not appear to be a Azure DevOps PR URL")
+        num_parts = len(path_parts)
+        if num_parts < 5:
+            raise ValueError("The provided URL has insufficient path components for an Azure DevOps PR URL")
+        
+        # Verify that the second-to-last path component is "pullrequest"
+        if path_parts[num_parts - 2] != "pullrequest":
+            raise ValueError("The provided URL does not follow the expected Azure DevOps PR URL format")
+
+        workspace_slug = path_parts[num_parts - 5]
+        repo_slug = path_parts[num_parts - 3]
+        try:
+            pr_number = int(path_parts[num_parts - 1])
+        except ValueError as e:
+            raise ValueError("Cannot parse PR number in the provided URL") from e
 
         return workspace_slug, repo_slug, pr_number
 
     @staticmethod
-    def _get_azure_devops_client():
+    def _get_azure_devops_client() -> GitClient:
         org = get_settings().azure_devops.get("org", None)
         pat = get_settings().azure_devops.get("pat", None)
 
@@ -623,3 +626,13 @@ class AzureDevopsProvider(GitProvider):
 
     def get_line_link(self, relevant_file: str, relevant_line_start: int, relevant_line_end: int = None) -> str:
         return self.pr_url+f"?_a=files&path={relevant_file}"
+
+    def get_comment_url(self, comment) -> str:
+        return self.pr_url + "?discussionId=" + str(comment.thread_id)
+
+    def get_latest_commit_url(self) -> str:
+        commits = self.azure_devops_client.get_pull_request_commits(self.repo_slug, self.pr_num, self.workspace_slug)
+        last = commits[0]
+        url = self.azure_devops_client.normalized_url + "/" + self.workspace_slug + "/_git/" + self.repo_slug + "/commit/" + last.commit_id
+        return url
+    

pr_agent/git_providers/bitbucket_provider.py

@@ -29,17 +29,36 @@ class BitbucketProvider(GitProvider):
         self, pr_url: Optional[str] = None, incremental: Optional[bool] = False
     ):
         s = requests.Session()
-        try:
-            self.bearer_token = bearer = context.get("bitbucket_bearer_token", None)
-            if not bearer and get_settings().get("BITBUCKET.BEARER_TOKEN", None):
-                self.bearer_token = bearer = get_settings().get("BITBUCKET.BEARER_TOKEN", None)
-            s.headers["Authorization"] = f"Bearer {bearer}"
-        except Exception:
-            self.bearer_token = get_settings().get("BITBUCKET.BEARER_TOKEN", None)
-            s.headers[
-                "Authorization"
-            ] = f'Bearer {self.bearer_token}'
         s.headers["Content-Type"] = "application/json"
+
+        self.auth_type = get_settings().get("BITBUCKET.AUTH_TYPE", "bearer")
+
+        try:
+            def get_token(token_name, auth_type_name):
+                token = get_settings().get(f"BITBUCKET.{token_name.upper()}", None)
+                if not token:
+                    raise ValueError(f"{auth_type_name} auth requires a token")
+                return token
+
+            if self.auth_type == "basic":
+                self.basic_token = get_token("basic_token", "Basic")
+                s.headers["Authorization"] = f"Basic {self.basic_token}"
+            elif self.auth_type == "bearer":
+                try:
+                    self.bearer_token = context.get("bitbucket_bearer_token", None)
+                except:
+                    self.bearer_token = None
+
+                if not self.bearer_token:
+                    self.bearer_token = get_token("bearer_token", "Bearer")
+                s.headers["Authorization"] = f"Bearer {self.bearer_token}"
+            else:
+                 raise ValueError(f"Unsupported auth_type: {self.auth_type}")
+
+        except Exception as e:
+            get_logger().exception(f"Failed to initialize Bitbucket authentication: {e}")
+            raise
+
         self.headers = s.headers
         self.bitbucket_client = Cloud(session=s)
         self.max_comment_length = 31000
@@ -92,7 +111,7 @@ class BitbucketProvider(GitProvider):
                 return ("", "")
             workspace_name, project_name = repo_path.split('/')
         else:
-            desired_branch = self.get_pr_branch()
+            desired_branch = self.get_repo_default_branch()
             parsed_pr_url = urlparse(self.pr_url)
             scheme_and_netloc = parsed_pr_url.scheme + "://" + parsed_pr_url.netloc
             workspace_name, project_name = (self.workspace_slug, self.repo_slug)
@@ -470,6 +489,16 @@ class BitbucketProvider(GitProvider):
     def get_pr_branch(self):
         return self.pr.source_branch
 
+    # This function attempts to get the default branch of the repository. As a fallback, uses the PR destination branch.
+    # Note: Must be running from a PR context.
+    def get_repo_default_branch(self):
+        try:
+            url_repo = f"https://api.bitbucket.org/2.0/repositories/{self.workspace_slug}/{self.repo_slug}/"
+            response_repo = requests.request("GET", url_repo, headers=self.headers).json()
+            return response_repo['mainbranch']['name']
+        except:
+            return self.pr.destination_branch
+
     def get_pr_owner_id(self) -> str | None:
         return self.workspace_slug
 
@@ -598,16 +627,21 @@ class BitbucketProvider(GitProvider):
         if "bitbucket.org" not in repo_url_to_clone:
             get_logger().error("Repo URL is not a valid bitbucket URL.")
             return None
-        bearer_token = self.bearer_token
-        if not bearer_token:
-            get_logger().error("No bearer token provided. Returning None")
-            return None
 
-        #For example: For repo: https://bitbucket.org/codiumai/pr-agent-tests.git
-        #clone url will be: https://x-token-auth:<token>@bitbucket.org/codiumai/pr-agent-tests.git
         (scheme, base_url) = repo_url_to_clone.split("bitbucket.org")
         if not all([scheme, base_url]):
             get_logger().error(f"repo_url_to_clone: {repo_url_to_clone} is not a valid bitbucket URL.")
             return None
-        clone_url = f"{scheme}x-token-auth:{bearer_token}@bitbucket.org{base_url}"
+
+        if self.auth_type == "basic":
+            # Basic auth with token
+            clone_url = f"{scheme}x-token-auth:{self.basic_token}@bitbucket.org{base_url}"
+        elif self.auth_type == "bearer":
+            # Bearer token
+            clone_url = f"{scheme}x-token-auth:{self.bearer_token}@bitbucket.org{base_url}"
+        else:
+            # This case should ideally not be reached if __init__ validates auth_type
+            get_logger().error(f"Unsupported or uninitialized auth_type: {getattr(self, 'auth_type', 'N/A')}. Returning None")
+            return None
+
         return clone_url

pr_agent/git_providers/bitbucket_server_provider.py

@@ -64,9 +64,15 @@ class BitbucketServerProvider(GitProvider):
         workspace_name = None
         project_name = None
         if not repo_git_url:
-            desired_branch = self.get_pr_branch()
             workspace_name = self.workspace_slug
             project_name = self.repo_slug
+            default_branch_dict = self.bitbucket_client.get_default_branch(workspace_name, project_name)
+            if 'displayId' in default_branch_dict:
+                desired_branch = default_branch_dict['displayId']
+            else:
+                get_logger().error(f"Cannot obtain default branch for workspace_name={workspace_name}, "
+                                   f"project_name={project_name}, default_branch_dict={default_branch_dict}")
+                return ("", "")
         elif '.git' in repo_git_url and 'scm/' in repo_git_url:
             repo_path = repo_git_url.split('.git')[0].split('scm/')[-1]
             if repo_path.count('/') == 1:  # Has to have the form <workspace>/<repo>

pr_agent/git_providers/git_provider.py

@@ -133,7 +133,7 @@ class GitProvider(ABC):
     def reply_to_comment_from_comment_id(self, comment_id: int, body: str):
         pass
 
-    def get_pr_description(self, full: bool = True, split_changes_walkthrough=False) -> str or tuple:
+    def get_pr_description(self, full: bool = True, split_changes_walkthrough=False) -> str | tuple:
         from pr_agent.algo.utils import clip_tokens
         from pr_agent.config_loader import get_settings
         max_tokens_description = get_settings().get("CONFIG.MAX_DESCRIPTION_TOKENS", None)
@@ -228,7 +228,7 @@ class GitProvider(ABC):
                                    update_header: bool = True,
                                    name='review',
                                    final_update_message=True):
-        self.publish_comment(pr_comment)
+        return self.publish_comment(pr_comment)
 
     def publish_persistent_comment_full(self, pr_comment: str,
                                    initial_header: str,
@@ -250,14 +250,13 @@ class GitProvider(ABC):
                     # response = self.mr.notes.update(comment.id, {'body': pr_comment_updated})
                     self.edit_comment(comment, pr_comment_updated)
                     if final_update_message:
-                        self.publish_comment(
+                        return self.publish_comment(
                             f"**[Persistent {name}]({comment_url})** updated to latest commit {latest_commit_url}")
-                    return
+                    return comment
         except Exception as e:
             get_logger().exception(f"Failed to update persistent review, error: {e}")
             pass
-        self.publish_comment(pr_comment)
-
+        return self.publish_comment(pr_comment)
 
     @abstractmethod
     def publish_inline_comment(self, body: str, relevant_file: str, relevant_line_in_file: str, original_suggestion=None):
@@ -286,6 +285,9 @@ class GitProvider(ABC):
     def get_comment_url(self, comment) -> str:
         return ""
 
+    def get_review_thread_comments(self, comment_id: int) -> list[dict]:
+        pass
+
     #### labels operations ####
     @abstractmethod
     def publish_labels(self, labels):

pr_agent/git_providers/github_provider.py

@@ -133,7 +133,7 @@ class GithubProvider(GitProvider):
         if (not owner or not repo) and self.repo: #"else" - User did not provide an external git url, or not an issue, use self.repo object
             owner, repo = self.repo.split('/')
             scheme_and_netloc = self.base_url_html
-            desired_branch = self.get_pr_branch()
+            desired_branch = self.repo_obj.default_branch
         if not all([scheme_and_netloc, owner, repo]): #"else": Not invoked from a PR context,but no provided git url for context
             get_logger().error(f"Unable to get canonical url parts since missing context (PR or explicit git url)")
             return ("", "")
@@ -427,7 +427,41 @@ class GithubProvider(GitProvider):
                 self._publish_inline_comments_fallback_with_verification(comments)
             except Exception as e:
                 get_logger().error(f"Failed to publish inline code comments fallback, error: {e}")
-                raise e
+                raise e    
+    
+    def get_review_thread_comments(self, comment_id: int) -> list[dict]:
+        """
+        Retrieves all comments in the same thread as the given comment.
+        
+        Args:
+            comment_id: Review comment ID
+                
+        Returns:
+            List of comments in the same thread
+        """
+        try:
+            # Fetch all comments with a single API call
+            all_comments = list(self.pr.get_comments())
+            
+            # Find the target comment by ID
+            target_comment = next((c for c in all_comments if c.id == comment_id), None)
+            if not target_comment:
+                return []
+        
+            # Get root comment id
+            root_comment_id = target_comment.raw_data.get("in_reply_to_id", target_comment.id)
+            # Build the thread - include the root comment and all replies to it
+            thread_comments = [
+                c for c in all_comments if
+                c.id == root_comment_id or c.raw_data.get("in_reply_to_id") == root_comment_id
+            ]
+        
+        
+            return thread_comments
+                
+        except Exception as e:
+            get_logger().exception(f"Failed to get review comments for an inline ask command", artifact={"comment_id": comment_id, "error": e})
+            return []
 
     def _publish_inline_comments_fallback_with_verification(self, comments: list[dict]):
         """

pr_agent/git_providers/gitlab_provider.py

@@ -87,7 +87,11 @@ class GitLabProvider(GitProvider):
             return ("", "")
         if not repo_git_url: #Use PR url as context
             repo_path = self._get_project_path_from_pr_or_issue_url(self.pr_url)
-            desired_branch = self.get_pr_branch()
+            try:
+                desired_branch = self.gl.projects.get(self.id_project).default_branch
+            except Exception as e:
+                get_logger().exception(f"Cannot get PR: {self.pr_url} default branch. Tried project ID: {self.id_project}")
+                return ("", "")
         else: #Use repo git url
             repo_path = repo_git_url.split('.git')[0].split('.com/')[-1]
         prefix = f"{self.gitlab_url}/{repo_path}/-/blob/{desired_branch}"
@@ -515,7 +519,8 @@ class GitLabProvider(GitProvider):
 
     def get_repo_settings(self):
         try:
-            contents = self.gl.projects.get(self.id_project).files.get(file_path='.pr_agent.toml', ref=self.mr.target_branch).decode()
+            main_branch = self.gl.projects.get(self.id_project).default_branch
+            contents = self.gl.projects.get(self.id_project).files.get(file_path='.pr_agent.toml', ref=main_branch).decode()
             return contents
         except Exception:
             return ""

pr_agent/git_providers/utils.py

@@ -12,6 +12,7 @@ from pr_agent.log import get_logger
 
 
 def apply_repo_settings(pr_url):
+    os.environ["AUTO_CAST_FOR_DYNACONF"] = "false"
     git_provider = get_git_provider_with_context(pr_url)
     if get_settings().config.use_repo_settings_file:
         repo_settings_file = None

pr_agent/log/__init__.py

@@ -1,6 +1,7 @@
+import os
+os.environ["AUTO_CAST_FOR_DYNACONF"] = "false"
 import json
 import logging
-import os
 import sys
 from enum import Enum
 

pr_agent/servers/azuredevops_server_webhook.py

@@ -22,40 +22,73 @@ from starlette_context.middleware import RawContextMiddleware
 from pr_agent.agent.pr_agent import PRAgent, command2class
 from pr_agent.algo.utils import update_settings_from_args
 from pr_agent.config_loader import get_settings
+from pr_agent.git_providers import get_git_provider_with_context
+from pr_agent.git_providers.azuredevops_provider import AzureDevopsProvider
 from pr_agent.git_providers.utils import apply_repo_settings
 from pr_agent.log import LoggingFormat, get_logger, setup_logger
 
-setup_logger(fmt=LoggingFormat.JSON, level="DEBUG")
-security = HTTPBasic()
+setup_logger(fmt=LoggingFormat.JSON, level=get_settings().get("CONFIG.LOG_LEVEL", "DEBUG"))
+security = HTTPBasic(auto_error=False)
 router = APIRouter()
 available_commands_rgx = re.compile(r"^\/(" + "|".join(command2class.keys()) + r")\s*")
 azure_devops_server = get_settings().get("azure_devops_server")
-WEBHOOK_USERNAME = azure_devops_server.get("webhook_username")
-WEBHOOK_PASSWORD = azure_devops_server.get("webhook_password")
+WEBHOOK_USERNAME = azure_devops_server.get("webhook_username", None)
+WEBHOOK_PASSWORD = azure_devops_server.get("webhook_password", None)
 
-async def handle_request_comment( url: str, body: str, log_context: dict
-):
+async def handle_request_comment(url: str, body: str, thread_id: int, comment_id: int, log_context: dict):
     log_context["action"] = body
     log_context["api_url"] = url
-
     try:
         with get_logger().contextualize(**log_context):
-            await PRAgent().handle_request(url, body)
+            agent = PRAgent()
+            provider = get_git_provider_with_context(pr_url=url)
+            body = handle_line_comment(body, thread_id, provider)
+            handled = await agent.handle_request(url, body, notify=lambda: provider.reply_to_thread(thread_id, "On it! ⏳", True))
+            # mark command comment as closed
+            if handled:
+                provider.set_thread_status(thread_id, "closed")
+                provider.remove_initial_comment()
     except Exception as e:
         get_logger().exception(f"Failed to handle webhook", artifact={"url": url, "body": body}, error=str(e))
 
+def handle_line_comment(body: str, thread_id: int, provider: AzureDevopsProvider):
+    body = body.strip()
+    if not body.startswith('/ask '):
+        return body
+    thread_context = provider.get_thread_context(thread_id)
+    if not thread_context:
+        return body
+    
+    path = thread_context.file_path
+    if thread_context.left_file_end or thread_context.left_file_start:
+        start_line = thread_context.left_file_start.line
+        end_line = thread_context.left_file_end.line
+        side = "left"
+    elif thread_context.right_file_end or thread_context.right_file_start:
+        start_line = thread_context.right_file_start.line
+        end_line = thread_context.right_file_end.line
+        side = "right"
+    else:
+        get_logger().info("No line range found in thread context", artifact={"thread_context": thread_context})
+        return body
+    
+    question = body[5:].lstrip() # remove 4 chars: '/ask '
+    return f"/ask_line --line_start={start_line} --line_end={end_line} --side={side} --file_name={path} --comment_id={thread_id} {question}"
 
 # currently only basic auth is supported with azure webhooks
 # for this reason, https must be enabled to ensure the credentials are not sent in clear text
 def authorize(credentials: HTTPBasicCredentials = Depends(security)):
-        is_user_ok = secrets.compare_digest(credentials.username, WEBHOOK_USERNAME)
-        is_pass_ok = secrets.compare_digest(credentials.password, WEBHOOK_PASSWORD)
-        if not (is_user_ok and is_pass_ok):
-            raise HTTPException(
-                status_code=status.HTTP_401_UNAUTHORIZED,
-                detail='Incorrect username or password.',
-                headers={'WWW-Authenticate': 'Basic'},
-            )
+    if WEBHOOK_USERNAME is None or WEBHOOK_PASSWORD is None:
+        return
+    
+    is_user_ok = secrets.compare_digest(credentials.username, WEBHOOK_USERNAME)
+    is_pass_ok = secrets.compare_digest(credentials.password, WEBHOOK_PASSWORD)
+    if not (is_user_ok and is_pass_ok):
+        raise HTTPException(
+            status_code=status.HTTP_401_UNAUTHORIZED,
+            detail='Incorrect username or password.',
+            headers={'WWW-Authenticate': 'Basic'},
+        )
 
 
 async def _perform_commands_azure(commands_conf: str, agent: PRAgent, api_url: str, log_context: dict):
@@ -83,7 +116,6 @@ async def _perform_commands_azure(commands_conf: str, agent: PRAgent, api_url: s
 
 
 async def handle_request_azure(data, log_context):
-    actions = []
     if data["eventType"] == "git.pullrequest.created":
         # API V1 (latest)
         pr_url = unquote(data["resource"]["_links"]["web"]["href"].replace("_apis/git/repositories", "_git"))
@@ -95,11 +127,16 @@ async def handle_request_azure(data, log_context):
             content=jsonable_encoder({"message": "webhook triggered successfully"})
         )
     elif data["eventType"] == "ms.vss-code.git-pullrequest-comment-event" and "content" in data["resource"]["comment"]:
-        if available_commands_rgx.match(data["resource"]["comment"]["content"]):
+        comment = data["resource"]["comment"]
+        if available_commands_rgx.match(comment["content"]):
             if(data["resourceVersion"] == "2.0"):
                 repo = data["resource"]["pullRequest"]["repository"]["webUrl"]
                 pr_url = unquote(f'{repo}/pullrequest/{data["resource"]["pullRequest"]["pullRequestId"]}')
-                actions = [data["resource"]["comment"]["content"]]
+                action = comment["content"]
+                thread_url = comment["_links"]["threads"]["href"]
+                thread_id = int(thread_url.split("/")[-1])
+                comment_id = int(comment["id"])
+                pass
             else:
                 # API V1 not supported as it does not contain the PR URL
                 return JSONResponse(
@@ -119,15 +156,14 @@ async def handle_request_azure(data, log_context):
     log_context["event"] = data["eventType"]
     log_context["api_url"] = pr_url
 
-    for action in actions:
-        try:
-            await handle_request_comment(pr_url, action, log_context)
-        except Exception as e:
-            get_logger().error("Azure DevOps Trigger failed. Error:" + str(e))
-            return JSONResponse(
-                status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
-                content=json.dumps({"message": "Internal server error"}),
-            )
+    try:
+        await handle_request_comment(pr_url, action, thread_id, comment_id, log_context)
+    except Exception as e:
+        get_logger().error("Azure DevOps Trigger failed. Error:" + str(e))
+        return JSONResponse(
+            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
+            content=json.dumps({"message": "Internal server error"}),
+        )
     return JSONResponse(
         status_code=status.HTTP_202_ACCEPTED, content=jsonable_encoder({"message": "webhook triggered successfully"})
     )

pr_agent/servers/bitbucket_app.py

@@ -25,7 +25,7 @@ from pr_agent.identity_providers.identity_provider import Eligibility
 from pr_agent.log import LoggingFormat, get_logger, setup_logger
 from pr_agent.secret_providers import get_secret_provider
 
-setup_logger(fmt=LoggingFormat.JSON, level="DEBUG")
+setup_logger(fmt=LoggingFormat.JSON, level=get_settings().get("CONFIG.LOG_LEVEL", "DEBUG"))
 router = APIRouter()
 secret_provider = get_secret_provider() if get_settings().get("CONFIG.SECRET_PROVIDER") else None
 

pr_agent/servers/bitbucket_server_webhook.py

@@ -21,7 +21,7 @@ from pr_agent.git_providers.utils import apply_repo_settings
 from pr_agent.log import LoggingFormat, get_logger, setup_logger
 from pr_agent.servers.utils import verify_signature
 
-setup_logger(fmt=LoggingFormat.JSON, level="DEBUG")
+setup_logger(fmt=LoggingFormat.JSON, level=get_settings().get("CONFIG.LOG_LEVEL", "DEBUG"))
 router = APIRouter()
 
 

pr_agent/servers/github_app.py

@@ -24,7 +24,7 @@ from pr_agent.identity_providers.identity_provider import Eligibility
 from pr_agent.log import LoggingFormat, get_logger, setup_logger
 from pr_agent.servers.utils import DefaultDictWithTimeout, verify_signature
 
-setup_logger(fmt=LoggingFormat.JSON, level="DEBUG")
+setup_logger(fmt=LoggingFormat.JSON, level=get_settings().get("CONFIG.LOG_LEVEL", "DEBUG"))
 base_path = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
 build_number_path = os.path.join(base_path, "build_number.txt")
 if os.path.exists(build_number_path):

pr_agent/servers/github_polling.py

@@ -13,7 +13,7 @@ from pr_agent.config_loader import get_settings
 from pr_agent.git_providers import get_git_provider
 from pr_agent.log import LoggingFormat, get_logger, setup_logger
 
-setup_logger(fmt=LoggingFormat.JSON, level="DEBUG")
+setup_logger(fmt=LoggingFormat.JSON, level=get_settings().get("CONFIG.LOG_LEVEL", "DEBUG"))
 NOTIFICATION_URL = "https://api.github.com/notifications"
 
 

pr_agent/servers/gitlab_webhook.py

@@ -19,7 +19,7 @@ from pr_agent.git_providers.utils import apply_repo_settings
 from pr_agent.log import LoggingFormat, get_logger, setup_logger
 from pr_agent.secret_providers import get_secret_provider
 
-setup_logger(fmt=LoggingFormat.JSON, level="DEBUG")
+setup_logger(fmt=LoggingFormat.JSON, level=get_settings().get("CONFIG.LOG_LEVEL", "DEBUG"))
 router = APIRouter()
 
 secret_provider = get_secret_provider() if get_settings().get("CONFIG.SECRET_PROVIDER") else None
@@ -86,9 +86,19 @@ def is_draft(data) -> bool:
 def is_draft_ready(data) -> bool:
     try:
         if 'draft' in data.get('changes', {}):
-            if data['changes']['draft']['previous'] == 'true' and data['changes']['draft']['current'] == 'false':
+            # Handle both boolean values and string values for compatibility
+            previous = data['changes']['draft']['previous']
+            current = data['changes']['draft']['current']
+
+            # Convert to boolean if they're strings
+            if isinstance(previous, str):
+                previous = previous.lower() == 'true'
+            if isinstance(current, str):
+                current = current.lower() == 'true'
+
+            if previous is True and current is False:
                 return True
-            
+
         # for gitlab server version before 16
         elif 'title' in data.get('changes', {}):
             if 'Draft:' in data['changes']['title']['previous'] and 'Draft:' not in data['changes']['title']['current']: