Update config_loader.py

2025-07-14 01:30:37 +08:00 · 2024-05-05 14:54:31 +03:00
136 changed files with 2319 additions and 8000 deletions
--- a/.github/workflows/build-and-test.yaml
+++ b/.github/workflows/build-and-test.yaml
@ -36,6 +36,6 @@ jobs:
      - id: test
        name: Test dev docker
        run: |
-          docker run --rm codiumai/pr-agent:test pytest -v tests/unittest
+          docker run --rm codiumai/pr-agent:test pytest -v
--- a/.github/workflows/code_coverage.yaml
+++ b/.github/workflows/code_coverage.yaml
@ -1,54 +0,0 @@
 name: Code-coverage
 on:
  workflow_dispatch:
  # push:
  #   branches:
  #     - main
  pull_request:
    branches:
      - main
 jobs:
  build-and-test:
    runs-on: ubuntu-latest
    steps:
      - id: checkout
        uses: actions/checkout@v2
      - id: dockerx
        name: Setup Docker Buildx
        uses: docker/setup-buildx-action@v2
      - id: build
        name: Build dev docker
        uses: docker/build-push-action@v2
        with:
          context: .
          file: ./docker/Dockerfile
          push: false
          load: true
          tags: codiumai/pr-agent:test
          cache-from: type=gha,scope=dev
          cache-to: type=gha,mode=max,scope=dev
          target: test
      - id: code_cov
        name: Test dev docker
        run: |
          docker run --name test_container codiumai/pr-agent:test  pytest  tests/unittest --cov=pr_agent --cov-report term --cov-report xml:coverage.xml 
          docker cp test_container:/app/coverage.xml coverage.xml
          docker rm test_container
      - name: Validate coverage report
        run: |
          if [ ! -f coverage.xml ]; then
            echo "Coverage report not found"
            exit 1
          fi
      - name: Upload coverage to Codecov
        uses: codecov/codecov-action@v4.0.1
        with:
          token: ${{ secrets.CODECOV_TOKEN }}
--- a/.github/workflows/e2e_tests.yaml
+++ b/.github/workflows/e2e_tests.yaml
@ -1,46 +0,0 @@
 name: PR-Agent E2E tests
 on:
  workflow_dispatch:
 #  schedule:
 #    - cron: '0 0 * * *' # This cron expression runs the workflow every night at midnight UTC
 jobs:
  pr_agent_job:
    runs-on: ubuntu-latest
    name: PR-Agent E2E GitHub App Test
    steps:
      - name: Checkout repository
        uses: actions/checkout@v2
      - name: Setup Docker Buildx
        uses: docker/setup-buildx-action@v2
      - id: build
        name: Build dev docker
        uses: docker/build-push-action@v2
        with:
          context: .
          file: ./docker/Dockerfile
          push: false
          load: true
          tags: codiumai/pr-agent:test
          cache-from: type=gha,scope=dev
          cache-to: type=gha,mode=max,scope=dev
          target: test
      - 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
      - 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: |
          docker run -e BITBUCKET.USERNAME=${{ secrets.BITBUCKET_USERNAME }}  -e BITBUCKET.PASSWORD=${{ secrets.BITBUCKET_PASSWORD }} --rm codiumai/pr-agent:test pytest -v tests/e2e_tests/test_bitbucket_app.py
--- a/.gitignore
+++ b/.gitignore
@ -1,6 +1,4 @@
 .idea/
 .lsp/
 .vscode/
 venv/
 pr_agent/settings/.secrets.toml
 __pycache__
--- a/.pr_agent.toml
+++ b/.pr_agent.toml
@ -1,3 +1,7 @@
 [pr_reviewer]
 enable_review_labels_effort = true
 enable_auto_approval = true
 [pr_code_suggestions]
 commitable_code_suggestions=false
--- a/Dockerfile.github_action
+++ b/Dockerfile.github_action
@ -1,11 +1,10 @@
-FROM python:3.12 as base
+FROM python:3.10 as base
 WORKDIR /app
 ADD pyproject.toml .
 ADD requirements.txt .
 RUN pip install . && rm pyproject.toml requirements.txt
 ENV PYTHONPATH=/app
 ADD docs docs
 ADD pr_agent pr_agent
 ADD github_action/entrypoint.sh /
 RUN chmod +x /entrypoint.sh
--- a/README.md
+++ b/README.md
@ -10,26 +10,23 @@
 </picture>
 <br/>
-Qode Merge PR-Agent aims to help efficiently review and handle pull requests, by providing AI feedback and suggestions
+CodiumAI PR-Agent aims to help efficiently review and handle pull requests, by providing AI feedbacks and suggestions
 </div>
 [![GitHub license](https://img.shields.io/badge/License-Apache_2.0-blue.svg)](https://github.com/Codium-ai/pr-agent/blob/main/LICENSE)
 [![Static Badge](https://img.shields.io/badge/Chrome-Extension-violet)](https://chromewebstore.google.com/detail/pr-agent-chrome-extension/ephlnjeghhogofkifjloamocljapahnl)
 [![Static Badge](https://img.shields.io/badge/Code-Benchmark-blue)](https://pr-agent-docs.codium.ai/finetuning_benchmark/)
 [![Discord](https://badgen.net/badge/icon/discord?icon=discord&label&color=purple)](https://discord.com/channels/1057273017547378788/1126104260430528613)
 [![Twitter](https://img.shields.io/twitter/follow/codiumai)](https://twitter.com/codiumai)
 [![Cheat Sheet](https://img.shields.io/badge/Cheat-Sheet-red)](https://www.codium.ai/images/pr_agent/cheat_sheet.pdf)
    <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>
 </div>
 ### [Documentation](https://pr-agent-docs.codium.ai/)
- See the [Installation Guide](https://qodo-merge-docs.qodo.ai/installation/) for instructions on installing Qode Merge PR-Agent on different platforms.
+- See the [Installation Guide](https://pr-agent-docs.codium.ai/installation/) for instructions on installing PR-Agent on different platforms.
- See the [Usage Guide](https://qodo-merge-docs.qodo.ai/usage-guide/) for instructions on running Qode Merge PR-Agent tools via different interfaces, such as CLI, PR Comments, or by automatically triggering them when a new PR is opened.
+- See the [Usage Guide](https://pr-agent-docs.codium.ai/usage-guide/) for instructions on running PR-Agent tools via different interfaces, such as CLI, PR Comments, or by automatically triggering them when a new PR is opened.
- See the [Tools Guide](https://qodo-merge-docs.qodo.ai/tools/) for a detailed description of the different tools, and the available configurations for each tool.
+- See the [Tools Guide](https://pr-agent-docs.codium.ai/tools/) for a detailed description of the different tools, and the available configurations for each tool.
 ## Table of Contents
@ -37,49 +34,54 @@ Qode Merge PR-Agent aims to help efficiently review and handle pull requests, by
 - [Overview](#overview)
 - [Example results](#example-results)
 - [Try it now](#try-it-now)
- [PR-Agent Pro 💎](https://pr-agent-docs.codium.ai/overview/pr_agent_pro/)
+- [PR-Agent Pro 💎](#pr-agent-pro-)
 - [How it works](#how-it-works)
 - [Why use PR-Agent?](#why-use-pr-agent)
 ## News and Updates
-### October 27, 2024
+### May 2, 2024
 Check out the new [PR-Agent Chrome Extension](https://chromewebstore.google.com/detail/pr-agent-chrome-extension/ephlnjeghhogofkifjloamocljapahnl) 🚀🚀🚀
-Qodo Merge PR Agent will now automatically document accepted code suggestions in a dedicated wiki page (`.pr_agent_accepted_suggestions`), enabling users to track historical changes, assess the tool's effectiveness, and learn from previously implemented recommendations in the repository.
+This toolbar integrates seamlessly with your GitHub environment, allowing you to access PR-Agent tools [directly from the GitHub interface](https://www.youtube.com/watch?v=gT5tli7X4H4).
 You can also easily export your chosen configuration, and use it for the automatic commands.
-This dedicated wiki page will also serve as a foundation for future AI model improvements, allowing it to learn from historically implemented suggestions and generate more targeted, contextually relevant recommendations.
+<kbd><img src="https://codium.ai/images/pr_agent/toolbar1.png" width="512"></kbd>
 Read more about this novel feature [here](https://qodo-merge-docs.qodo.ai/tools/improve/#suggestion-tracking).
-<kbd><img href="https://qodo.ai/images/pr_agent/pr_agent_accepted_suggestions1.png" src="https://qodo.ai/images/pr_agent/pr_agent_accepted_suggestions1.png" width="768"></kbd>
+<kbd><img src="https://codium.ai/images/pr_agent/toolbar2.png" width="512"></kbd>
 ### April 14, 2024
 You can now ask questions about images that appear in the comment, where the entire PR is considered as the context.
 see [here](https://pr-agent-docs.codium.ai/tools/ask/#ask-on-images) for more details.
-### October 21, 2024
+<kbd><img src="https://codium.ai/images/pr_agent/ask_images5.png" width="512"></kbd>
 **Disable publishing labels by default:** 
-The default setting for `pr_description.publish_labels` has been updated to `false`. This means that labels generated by the `/describe` tool will no longer be published, unless this configuration is explicitly set to `true`.
+### March 24, 2024
 PR-Agent is now available for easy installation via [pip](https://pr-agent-docs.codium.ai/installation/locally/#using-pip-package).
-We constantly strive to balance informative AI analysis with reducing unnecessary noise. User feedback indicated that in many cases, the original PR title alone provides sufficient information, making the generated labels (`enhancement`, `documentation`, `bug fix`, ...) redundant.
+### March 17, 2024
-The [`review_effort`](https://qodo-merge-docs.qodo.ai/tools/review/#configuration-options) label, generated by the `review` tool, will still be published by default, as it provides valuable information enabling reviewers to prioritize small PRs first.
+- A new feature is now available for the review tool: [`require_can_be_split_review`](https://pr-agent-docs.codium.ai/tools/review/#enabledisable-features). 
 If set to true, the tool will add a section that checks if the PR contains several themes, and can be split into smaller PRs.
-However, every user has different preferences. To still publish the `describe` labels, set `pr_description.publish_labels=true` in the [configuration file](https://qodo-merge-docs.qodo.ai/usage-guide/configuration_options/).
+<kbd><img src="https://codium.ai/images/pr_agent/multiple_pr_themes.png" width="512"></kbd>
 For more tailored and relevant labeling, we recommend using the [`custom_labels 💎`](https://qodo-merge-docs.qodo.ai/tools/custom_labels/) tool, that allows generating labels specific to your project's needs.
-<kbd>![image](https://github.com/user-attachments/assets/8f38d222-53b1-4742-b2ec-7ea0a30c9076)</kbd>
+### March 10, 2024
 - A new [knowledge-base website](https://pr-agent-docs.codium.ai/) for PR-Agent is now available. It includes detailed information about the different tools, usage guides and more, in an accessible and organized format.
-→
+### March 8, 2024
-<kbd>![image](https://github.com/user-attachments/assets/8285bd90-0dda-4c7e-9237-bbfde5e21880)</kbd>
+- A new tool, [Find Similar Code](https://pr-agent-docs.codium.ai/tools/similar_code/) 💎 is now available. 
 <br>This tool retrieves the most similar code components from inside the organization's codebase, or from open-source code:
 <kbd><a href="https://codium.ai/images/pr_agent/similar_code.mp4"><img src="https://codium.ai/images/pr_agent/similar_code_global2.png" width="512"></a></kbd>
 (click on the image to see an instructional video)
-### October 14, 2024
+### Feb 29, 2024
-Improved support for GitHub enterprise server with [GitHub Actions](https://qodo-merge-docs.qodo.ai/installation/github/#action-for-github-enterprise-server)
+- You can now use the repo's [wiki page](https://pr-agent-docs.codium.ai/usage-guide/configuration_options/) to set configurations for PR-Agent 💎
-### October 10, 2024
+<kbd><img src="https://codium.ai/images/pr_agent/wiki_configuration.png" width="512"></kbd>
 New ability for the `review` tool - **ticket compliance feedback**. If the PR contains a ticket number, PR-Agent will check if the PR code actually [complies](https://github.com/Codium-ai/pr-agent/pull/1279#issuecomment-2404042130) with the ticket requirements.
 <kbd><img src="https://github.com/user-attachments/assets/4a2a728b-5f47-40fa-80cc-16efd296938c" width="768"></kbd>
 ## Overview
@ -88,38 +90,39 @@ New ability for the `review` tool - **ticket compliance feedback**. If the PR co
 Supported commands per platform:
 |       |                                                                                                                   | GitHub             | Gitlab             | Bitbucket          | Azure DevOps       |
-|-------|---------------------------------------------------------------------------------------------------------|:--------------------:|:--------------------:|:--------------------:|:------------:|
+|-------|-------------------------------------------------------------------------------------------------------------------|:--------------------:|:--------------------:|:--------------------:|:--------------------:|
 | TOOLS | Review                                                                                                            | ✅ | ✅ | ✅ | ✅ |
 |       | ⮑ Incremental                                                                                                     | ✅ |                    |                    |                    |
 |       | ⮑ [SOC2 Compliance](https://pr-agent-docs.codium.ai/tools/review/#soc2-ticket-compliance) 💎            | ✅ | ✅ | ✅ | ✅ |
 |       | Describe                                                                                                          | ✅ | ✅ | ✅ | ✅ |
 |       | ⮑ [Inline File Summary](https://pr-agent-docs.codium.ai/tools/describe#inline-file-summary) 💎          | ✅ |                    |                    |                    |
 |       | Improve                                                                                                           | ✅ | ✅ | ✅ | ✅ |
 |       | ⮑ Extended                                                                                                        | ✅ | ✅ | ✅ | ✅ |
 |       | Ask                                                                                                               | ✅ | ✅ | ✅ | ✅ |
 |       | ⮑ [Ask on code lines](https://pr-agent-docs.codium.ai/tools/ask#ask-lines)                              | ✅ | ✅ |                    |                    |
-|       | [Custom Prompt](https://pr-agent-docs.codium.ai/tools/custom_prompt/) 💎                                | ✅ | ✅ | ✅ |              |
+|       | [Custom Suggestions](https://pr-agent-docs.codium.ai/tools/custom_suggestions/) 💎                      | ✅ | ✅ | ✅ | ✅ |
-|       | [Test](https://pr-agent-docs.codium.ai/tools/test/) 💎                                                  | ✅ | ✅ |                    |              |
+|       | [Test](https://pr-agent-docs.codium.ai/tools/test/) 💎                                                  | ✅ | ✅ |                    | ✅ |
 |       | Reflect and Review                                                                                                | ✅ | ✅ | ✅ | ✅ |
 |       | Update CHANGELOG.md                                                                                               | ✅ | ✅ | ✅ | ✅ |
 |       | Find Similar Issue                                                                                                | ✅ |                    |                    |                    |
-|       | [Add PR Documentation](https://pr-agent-docs.codium.ai/tools/documentation/) 💎                         | ✅ | ✅ |                   |              |
+|       | [Add PR Documentation](https://pr-agent-docs.codium.ai/tools/documentation/) 💎                         | ✅ | ✅ |                   | ✅ |
-|       | [Custom Labels](https://pr-agent-docs.codium.ai/tools/custom_labels/) 💎                                | ✅ | ✅ |                    |              |
+|       | [Custom Labels](https://pr-agent-docs.codium.ai/tools/custom_labels/) 💎                                | ✅ | ✅ |                    | ✅ |
-|       | [Analyze](https://pr-agent-docs.codium.ai/tools/analyze/) 💎                                            | ✅ | ✅ |                    |              |
+|       | [Analyze](https://pr-agent-docs.codium.ai/tools/analyze/) 💎                                            | ✅ | ✅ |                    | ✅ |
 |       | [CI Feedback](https://pr-agent-docs.codium.ai/tools/ci_feedback/) 💎                                    | ✅ |                    |                    |                    |
 |       | [Similar Code](https://pr-agent-docs.codium.ai/tools/similar_code/) 💎                                  | ✅ |                    |                    |                    |
 |       |                                                                                                                   |                    |                    |                    |                    |
 | USAGE | CLI                                                                                                               | ✅ | ✅ | ✅ | ✅ |
 |       | App / webhook                                                                                                     | ✅ | ✅ | ✅ | ✅ |
 |       | Tagging bot                                                                                                       | ✅ |                    |                    |                    |
-|       | Actions                                                                                                 | ✅ |✅| ✅ |✅|
+|       | Actions                                                                                                           | ✅ |                    | ✅ |                    |
 |       |                                                                                                                   |                    |                    |                    |                    |
 | CORE  | PR compression                                                                                                    | ✅ | ✅ | ✅ | ✅ |
 |       | Repo language prioritization                                                                                      | ✅ | ✅ | ✅ | ✅ |
 |       | Adaptive and token-aware file patch fitting                                                                       | ✅ | ✅ | ✅ | ✅ |
 |       | Multiple models support                                                                                           | ✅ | ✅ | ✅ | ✅ |
-|       | [Static code analysis](https://pr-agent-docs.codium.ai/core-abilities/#static-code-analysis) 💎         | ✅ | ✅ | ✅ |              |
+|       | [Static code analysis](https://pr-agent-docs.codium.ai/core-abilities/#static-code-analysis) 💎         | ✅ | ✅ | ✅ | ✅ |
-|       | [Global and wiki configurations](https://pr-agent-docs.codium.ai/usage-guide/configuration_options/) 💎 | ✅ | ✅ | ✅ |              |
+|       | [Global and wiki configurations](https://pr-agent-docs.codium.ai/usage-guide/configuration_options/) 💎 | ✅ | ✅ | ✅ | ✅ |
-|       | [PR interactive actions](https://www.codium.ai/images/pr_agent/pr-actions.mp4) 💎                       | ✅ |        ✅           |                    |              |
+|       | [PR interactive actions](https://www.codium.ai/images/pr_agent/pr-actions.mp4) 💎                                 | ✅ |                    |                    |                    |
 - 💎 means this feature is available only in [PR-Agent Pro](https://www.codium.ai/pricing/)
 [//]: # (- Support for additional git providers is described in [here]&#40;./docs/Full_environments.md&#41;)
@ -143,7 +146,7 @@ ___
 \
 ‣ **Analyze 💎 ([`/analyze`](https://pr-agent-docs.codium.ai/tools/analyze/))**: Identify code components that changed in the PR, and enables to interactively generate tests, docs, and code suggestions for each component.
 \
-‣ **Custom Prompt 💎 ([`/custom_prompt`](https://pr-agent-docs.codium.ai/tools/custom_prompt/))**: Automatically generates custom suggestions for improving the PR code, based on specific guidelines defined by the user.
+‣ **Custom Suggestions 💎 ([`/custom_suggestions`](https://pr-agent-docs.codium.ai/tools/custom_suggestions/))**: Automatically generates custom suggestions for improving the PR code, based on specific guidelines defined by the user.
 \
 ‣ **Generate Tests 💎 ([`/test component_name`](https://pr-agent-docs.codium.ai/tools/test/))**: Generates unit tests for a selected component, based on the PR code changes.
 \
@ -238,11 +241,7 @@ 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.
+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.
 ![Review generation process](https://www.codium.ai/images/demo-2.gif)
@ -252,6 +251,43 @@ Note that when you set your own PR-Agent or use CodiumAI hosted PR-Agent, there
 ---
 [//]: # (## Installation)
 [//]: # (To use your own version of PR-Agent, you first need to acquire two tokens:)
 [//]: # ()
 [//]: # (1. An OpenAI key from [here]&#40;https://platform.openai.com/&#41;, with access to GPT-4.)
 [//]: # (2. A GitHub personal access token &#40;classic&#41; with the repo scope.)
 [//]: # ()
 [//]: # (There are several ways to use PR-Agent:)
 [//]: # ()
 [//]: # (**Locally**)
 [//]: # (- [Using pip package]&#40;https://pr-agent-docs.codium.ai/installation/locally/#using-pip-package&#41;)
 [//]: # (- [Using Docker image]&#40;https://pr-agent-docs.codium.ai/installation/locally/#using-docker-image&#41;)
 [//]: # (- [Run from source]&#40;https://pr-agent-docs.codium.ai/installation/locally/#run-from-source&#41;)
 [//]: # ()
 [//]: # (**GitHub specific methods**)
 [//]: # (- [Run as a GitHub Action]&#40;https://pr-agent-docs.codium.ai/installation/github/#run-as-a-github-action&#41;)
 [//]: # (- [Run as a GitHub App]&#40;https://pr-agent-docs.codium.ai/installation/github/#run-as-a-github-app&#41;)
 [//]: # ()
 [//]: # (**GitLab specific methods**)
 [//]: # (- [Run a GitLab webhook server]&#40;https://pr-agent-docs.codium.ai/installation/gitlab/&#41;)
 [//]: # ()
 [//]: # (**BitBucket specific methods**)
 [//]: # (- [Run as a Bitbucket Pipeline]&#40;https://pr-agent-docs.codium.ai/installation/bitbucket/&#41;)
 ## PR-Agent Pro 💎
 [PR-Agent Pro](https://www.codium.ai/pricing/) is a hosted version of PR-Agent, provided by CodiumAI. It is available for a monthly fee, and provides the following benefits:
@ -259,7 +295,7 @@ Note that when you set your own PR-Agent or use CodiumAI hosted PR-Agent, there
 2. **Improved privacy** - No data will be stored or used to train models. PR-Agent Pro will employ zero data retention, and will use an OpenAI account with zero data retention.
 3. **Improved support** - PR-Agent Pro users will receive priority support, and will be able to request new features and capabilities.
 4. **Extra features** -In addition to the benefits listed above, PR-Agent Pro will emphasize more customization, and the usage of static code analysis, in addition to LLM logic, to improve results. 
-See [here](https://qodo-merge-docs.qodo.ai/overview/pr_agent_pro/) for a list of features available in PR-Agent Pro.
+See [here](https://pr-agent-docs.codium.ai/#pr-agent-pro) for a list of features available in PR-Agent Pro.
@ -285,22 +321,11 @@ Here are some advantages of PR-Agent:
 ## Data privacy
-### Self-hosted PR-Agent
+If you host PR-Agent with your OpenAI API key, it is between you and OpenAI. You can read their API data privacy policy here:
 - If you host PR-Agent with your OpenAI API key, it is between you and OpenAI. You can read their API data privacy policy here:
 https://openai.com/enterprise-privacy
-### CodiumAI-hosted PR-Agent Pro 💎
+When using PR-Agent Pro 💎, hosted by CodiumAI, we will not store any of your data, nor will we use it for training.
-
+You will also benefit from an OpenAI account with zero data retention.
 - When using PR-Agent Pro 💎, hosted by CodiumAI, we will not store any of your data, nor will we use it for training. You will also benefit from an OpenAI account with zero data retention.
 - For certain clients, CodiumAI-hosted PR-Agent Pro will use CodiumAI’s proprietary models — if this is the case, you will be notified.
 - No passive collection of Code and Pull Requests’ data — PR-Agent will be active only when you invoke it, and it will then extract and analyze only data relevant to the executed command and queried pull request.
 ### PR-Agent Chrome extension
 - The [PR-Agent Chrome extension](https://chromewebstore.google.com/detail/pr-agent-chrome-extension/ephlnjeghhogofkifjloamocljapahnl) serves solely to modify the visual appearance of a GitHub PR screen. It does not transmit any user's repo or pull request code. Code is only sent for processing when a user submits a GitHub comment that activates a PR-Agent tool, in accordance with the standard privacy policy of PR-Agent.
 ## Links
--- a/codecov.yml
+++ b/codecov.yml
@ -1,5 +0,0 @@
 comment: false
 coverage:
  status:
    patch: false
    project: false
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@ -1,42 +1,41 @@
-FROM python:3.12.3 AS base
+FROM python:3.10 as base
 WORKDIR /app
 ADD pyproject.toml .
 ADD requirements.txt .
 ADD docs docs
 RUN pip install . && rm pyproject.toml requirements.txt
 ENV PYTHONPATH=/app
-FROM base AS github_app
+FROM base as github_app
 ADD pr_agent pr_agent
-CMD ["python", "-m", "gunicorn", "-k", "uvicorn.workers.UvicornWorker", "-c", "pr_agent/servers/gunicorn_config.py", "--forwarded-allow-ips", "*", "pr_agent.servers.github_app:app"]
+CMD ["python", "pr_agent/servers/github_app.py"]
-FROM base AS bitbucket_app
+FROM base as bitbucket_app
 ADD pr_agent pr_agent
 CMD ["python", "pr_agent/servers/bitbucket_app.py"]
-FROM base AS bitbucket_server_webhook
+FROM base as bitbucket_server_webhook
 ADD pr_agent pr_agent
 CMD ["python", "pr_agent/servers/bitbucket_server_webhook.py"]
-FROM base AS github_polling
+FROM base as github_polling
 ADD pr_agent pr_agent
 CMD ["python", "pr_agent/servers/github_polling.py"]
-FROM base AS gitlab_webhook
+FROM base as gitlab_webhook
 ADD pr_agent pr_agent
 CMD ["python", "pr_agent/servers/gitlab_webhook.py"]
-FROM base AS azure_devops_webhook
+FROM base as azure_devops_webhook
 ADD pr_agent pr_agent
 CMD ["python", "pr_agent/servers/azuredevops_server_webhook.py"]
-FROM base AS test
+FROM base as test
 ADD requirements-dev.txt .
 RUN pip install -r requirements-dev.txt && rm requirements-dev.txt
 ADD pr_agent pr_agent
 ADD tests tests
-FROM base AS cli
+FROM base as cli
 ADD pr_agent pr_agent
 ENTRYPOINT ["python", "pr_agent/cli.py"]
--- a/docs/README.md
+++ b/docs/README.md
@ -1 +1 @@
-# [Visit Our Docs Portal](https://qodo-merge-docs.qodo.ai/)
+# [Visit Our Docs Portal](https://pr-agent-docs.codium.ai/)
--- a/docs/docs/CNAME
+++ b/docs/docs/CNAME
@ -1 +1 @@
-qodo-merge-docs.qodo.ai
+pr-agent-docs.codium.ai
--- a/docs/docs/assets/favicon.ico
+++ b/docs/docs/assets/favicon.ico
--- a/docs/docs/assets/logo.svg
+++ b/docs/docs/assets/logo.svg
@ -1 +1,140 @@
-<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 109.77 81.94"><defs><style>.cls-1{fill:#7968fa;}.cls-1,.cls-2{stroke-width:0px;}.cls-2{fill:#5ae3ae;}</style></defs><path class="cls-2" d="m109.77,40.98c0,22.62-7.11,40.96-15.89,40.96-3.6,0-6.89-3.09-9.58-8.31,6.82-7.46,11.22-19.3,11.22-32.64s-4.4-25.21-11.22-32.67C86.99,3.09,90.29,0,93.89,0c8.78,0,15.89,18.33,15.89,40.97"/><path class="cls-1" d="m95.53,40.99c0,13.35-4.4,25.19-11.23,32.64-3.81-7.46-6.28-19.3-6.28-32.64s2.47-25.21,6.28-32.67c6.83,7.46,11.23,19.32,11.23,32.67"/><path class="cls-2" d="m55.38,78.15c-4.99,2.42-10.52,3.79-16.38,3.79C17.46,81.93,0,63.6,0,40.98S17.46,0,39,0C44.86,0,50.39,1.37,55.38,3.79c-9.69,6.47-16.43,20.69-16.43,37.19s6.73,30.7,16.43,37.17"/><path class="cls-1" d="m78.02,40.99c0,16.48-9.27,30.7-22.65,37.17-9.69-6.47-16.43-20.69-16.43-37.17S45.68,10.28,55.38,3.81c13.37,6.49,22.65,20.69,22.65,37.19"/><path class="cls-2" d="m84.31,73.63c-4.73,5.22-10.64,8.31-17.06,8.31-4.24,0-8.27-1.35-11.87-3.79,13.37-6.48,22.65-20.7,22.65-37.17,0,13.35,2.47,25.19,6.28,32.64"/><path class="cls-2" d="m84.31,8.31c-3.81,7.46-6.28,19.32-6.28,32.67,0-16.5-9.27-30.7-22.65-37.19,3.6-2.45,7.63-3.8,11.87-3.8,6.43,0,12.33,3.09,17.06,8.31"/></svg>
+<?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 28.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="64px" height="64px" viewBox="0 0 64 64" enable-background="new 0 0 64 64" xml:space="preserve">
 <g>
 	<defs>
 		<rect id="SVGID_1_" x="0.4" y="0.1" width="63.4" height="63.4"/>
 	</defs>
 	<clipPath id="SVGID_00000008836131916906499950000015813697852011234749_">
 		<use xlink:href="#SVGID_1_"  overflow="visible"/>
 	</clipPath>
 	<g clip-path="url(#SVGID_00000008836131916906499950000015813697852011234749_)">
 		<path fill="#05E5AD" d="M21.4,9.8c3,0,5.9,0.7,8.5,1.9c-5.7,3.4-9.8,11.1-9.8,20.1c0,9,4,16.7,9.8,20.1c-2.6,1.2-5.5,1.9-8.5,1.9
 			c-11.6,0-21-9.8-21-22S9.8,9.8,21.4,9.8z"/>
 			<radialGradient id="SVGID_00000150822754378345238340000008985053211526864828_" cx="-140.0905" cy="350.1757" r="4.8781" gradientTransform="matrix(-4.7708 -6.961580e-02 -0.1061 7.2704 -601.3099 -2523.8489)" gradientUnits="userSpaceOnUse">
 			<stop  offset="0" style="stop-color:#6447FF"/>
 			<stop  offset="6.666670e-02" style="stop-color:#6348FE"/>
 			<stop  offset="0.1333" style="stop-color:#614DFC"/>
 			<stop  offset="0.2" style="stop-color:#5C54F8"/>
 			<stop  offset="0.2667" style="stop-color:#565EF3"/>
 			<stop  offset="0.3333" style="stop-color:#4E6CEC"/>
 			<stop  offset="0.4" style="stop-color:#447BE4"/>
 			<stop  offset="0.4667" style="stop-color:#3A8DDB"/>
 			<stop  offset="0.5333" style="stop-color:#2F9FD1"/>
 			<stop  offset="0.6" style="stop-color:#25B1C8"/>
 			<stop  offset="0.6667" style="stop-color:#1BC0C0"/>
 			<stop  offset="0.7333" style="stop-color:#13CEB9"/>
 			<stop  offset="0.8" style="stop-color:#0DD8B4"/>
 			<stop  offset="0.8667" style="stop-color:#08DFB0"/>
 			<stop  offset="0.9333" style="stop-color:#06E4AE"/>
 			<stop  offset="1" style="stop-color:#05E5AD"/>
 		</radialGradient>
 		<path fill="url(#SVGID_00000150822754378345238340000008985053211526864828_)" d="M21.4,9.8c3,0,5.9,0.7,8.5,1.9
 			c-5.7,3.4-9.8,11.1-9.8,20.1c0,9,4,16.7,9.8,20.1c-2.6,1.2-5.5,1.9-8.5,1.9c-11.6,0-21-9.8-21-22S9.8,9.8,21.4,9.8z"/>
 			<radialGradient id="SVGID_00000022560571240417802950000012439139323268113305_" cx="-191.7649" cy="385.7387" r="4.8781" gradientTransform="matrix(-2.5514 -0.7616 -0.8125 2.7217 -130.733 -1180.2209)" gradientUnits="userSpaceOnUse">
 			<stop  offset="0" style="stop-color:#6447FF"/>
 			<stop  offset="6.666670e-02" style="stop-color:#6348FE"/>
 			<stop  offset="0.1333" style="stop-color:#614DFC"/>
 			<stop  offset="0.2" style="stop-color:#5C54F8"/>
 			<stop  offset="0.2667" style="stop-color:#565EF3"/>
 			<stop  offset="0.3333" style="stop-color:#4E6CEC"/>
 			<stop  offset="0.4" style="stop-color:#447BE4"/>
 			<stop  offset="0.4667" style="stop-color:#3A8DDB"/>
 			<stop  offset="0.5333" style="stop-color:#2F9FD1"/>
 			<stop  offset="0.6" style="stop-color:#25B1C8"/>
 			<stop  offset="0.6667" style="stop-color:#1BC0C0"/>
 			<stop  offset="0.7333" style="stop-color:#13CEB9"/>
 			<stop  offset="0.8" style="stop-color:#0DD8B4"/>
 			<stop  offset="0.8667" style="stop-color:#08DFB0"/>
 			<stop  offset="0.9333" style="stop-color:#06E4AE"/>
 			<stop  offset="1" style="stop-color:#05E5AD"/>
 		</radialGradient>
 		<path fill="url(#SVGID_00000022560571240417802950000012439139323268113305_)" d="M38,18.3c-2.1-2.8-4.9-5.1-8.1-6.6
 			c2-1.2,4.2-1.9,6.6-1.9c2.2,0,4.3,0.6,6.2,1.7C40.8,12.9,39.2,15.3,38,18.3L38,18.3z"/>
 			<radialGradient id="SVGID_00000143611122169386473660000017673587931016751800_" cx="-194.7918" cy="395.2442" r="4.8781" gradientTransform="matrix(-2.5514 -0.7616 -0.8125 2.7217 -130.733 -1172.9556)" gradientUnits="userSpaceOnUse">
 			<stop  offset="0" style="stop-color:#6447FF"/>
 			<stop  offset="6.666670e-02" style="stop-color:#6348FE"/>
 			<stop  offset="0.1333" style="stop-color:#614DFC"/>
 			<stop  offset="0.2" style="stop-color:#5C54F8"/>
 			<stop  offset="0.2667" style="stop-color:#565EF3"/>
 			<stop  offset="0.3333" style="stop-color:#4E6CEC"/>
 			<stop  offset="0.4" style="stop-color:#447BE4"/>
 			<stop  offset="0.4667" style="stop-color:#3A8DDB"/>
 			<stop  offset="0.5333" style="stop-color:#2F9FD1"/>
 			<stop  offset="0.6" style="stop-color:#25B1C8"/>
 			<stop  offset="0.6667" style="stop-color:#1BC0C0"/>
 			<stop  offset="0.7333" style="stop-color:#13CEB9"/>
 			<stop  offset="0.8" style="stop-color:#0DD8B4"/>
 			<stop  offset="0.8667" style="stop-color:#08DFB0"/>
 			<stop  offset="0.9333" style="stop-color:#06E4AE"/>
 			<stop  offset="1" style="stop-color:#05E5AD"/>
 		</radialGradient>
 		<path fill="url(#SVGID_00000143611122169386473660000017673587931016751800_)" d="M38,45.2c1.2,3,2.9,5.3,4.7,6.8
 			c-1.9,1.1-4,1.7-6.2,1.7c-2.3,0-4.6-0.7-6.6-1.9C33.1,50.4,35.8,48.1,38,45.2L38,45.2z"/>
 		<path fill="#684BFE" d="M20.1,31.8c0-9,4-16.7,9.8-20.1c3.2,1.5,6,3.8,8.1,6.6c-1.5,3.7-2.5,8.4-2.5,13.5s0.9,9.8,2.5,13.5
 			c-2.1,2.8-4.9,5.1-8.1,6.6C24.1,48.4,20.1,40.7,20.1,31.8z"/>
 			<radialGradient id="SVGID_00000147942998054305738810000004710078864578628519_" cx="-212.7358" cy="363.2475" r="4.8781" gradientTransform="matrix(-2.3342 -1.063 -1.623 3.5638 149.3813 -1470.1027)" gradientUnits="userSpaceOnUse">
 			<stop  offset="0" style="stop-color:#6447FF"/>
 			<stop  offset="6.666670e-02" style="stop-color:#6348FE"/>
 			<stop  offset="0.1333" style="stop-color:#614DFC"/>
 			<stop  offset="0.2" style="stop-color:#5C54F8"/>
 			<stop  offset="0.2667" style="stop-color:#565EF3"/>
 			<stop  offset="0.3333" style="stop-color:#4E6CEC"/>
 			<stop  offset="0.4" style="stop-color:#447BE4"/>
 			<stop  offset="0.4667" style="stop-color:#3A8DDB"/>
 			<stop  offset="0.5333" style="stop-color:#2F9FD1"/>
 			<stop  offset="0.6" style="stop-color:#25B1C8"/>
 			<stop  offset="0.6667" style="stop-color:#1BC0C0"/>
 			<stop  offset="0.7333" style="stop-color:#13CEB9"/>
 			<stop  offset="0.8" style="stop-color:#0DD8B4"/>
 			<stop  offset="0.8667" style="stop-color:#08DFB0"/>
 			<stop  offset="0.9333" style="stop-color:#06E4AE"/>
 			<stop  offset="1" style="stop-color:#05E5AD"/>
 		</radialGradient>
 		<path fill="url(#SVGID_00000147942998054305738810000004710078864578628519_)" d="M50.7,42.5c0.6,3.3,1.5,6.1,2.5,8
 			c-1.8,2-3.8,3.1-6,3.1c-1.6,0-3.1-0.6-4.5-1.7C46.1,50.2,48.9,46.8,50.7,42.5L50.7,42.5z"/>
 			<radialGradient id="SVGID_00000083770737908230256670000016126156495859285174_" cx="-208.5327" cy="357.2025" r="4.8781" gradientTransform="matrix(-2.3342 -1.063 -1.623 3.5638 149.3813 -1476.8097)" gradientUnits="userSpaceOnUse">
 			<stop  offset="0" style="stop-color:#6447FF"/>
 			<stop  offset="6.666670e-02" style="stop-color:#6348FE"/>
 			<stop  offset="0.1333" style="stop-color:#614DFC"/>
 			<stop  offset="0.2" style="stop-color:#5C54F8"/>
 			<stop  offset="0.2667" style="stop-color:#565EF3"/>
 			<stop  offset="0.3333" style="stop-color:#4E6CEC"/>
 			<stop  offset="0.4" style="stop-color:#447BE4"/>
 			<stop  offset="0.4667" style="stop-color:#3A8DDB"/>
 			<stop  offset="0.5333" style="stop-color:#2F9FD1"/>
 			<stop  offset="0.6" style="stop-color:#25B1C8"/>
 			<stop  offset="0.6667" style="stop-color:#1BC0C0"/>
 			<stop  offset="0.7333" style="stop-color:#13CEB9"/>
 			<stop  offset="0.8" style="stop-color:#0DD8B4"/>
 			<stop  offset="0.8667" style="stop-color:#08DFB0"/>
 			<stop  offset="0.9333" style="stop-color:#06E4AE"/>
 			<stop  offset="1" style="stop-color:#05E5AD"/>
 		</radialGradient>
 		<path fill="url(#SVGID_00000083770737908230256670000016126156495859285174_)" d="M42.7,11.5c1.4-1.1,2.9-1.7,4.5-1.7
 			c2.2,0,4.3,1.1,6,3.1c-1,2-1.9,4.7-2.5,8C48.9,16.7,46.1,13.4,42.7,11.5L42.7,11.5z"/>
 		<path fill="#684BFE" d="M38,45.2c2.8-3.7,4.4-8.4,4.4-13.5c0-5.1-1.7-9.8-4.4-13.5c1.2-3,2.9-5.3,4.7-6.8c3.4,1.9,6.2,5.3,8,9.5
 			c-0.6,3.2-0.9,6.9-0.9,10.8s0.3,7.6,0.9,10.8c-1.8,4.3-4.6,7.6-8,9.5C40.8,50.6,39.2,48.2,38,45.2L38,45.2z"/>
 		<path fill="#321BB2" d="M38,45.2c-1.5-3.7-2.5-8.4-2.5-13.5S36.4,22,38,18.3c2.8,3.7,4.4,8.4,4.4,13.5S40.8,41.5,38,45.2z"/>
 		<path fill="#05E6AD" d="M53.2,12.9c1.1-2,2.3-3.1,3.6-3.1c3.9,0,7,9.8,7,22s-3.1,22-7,22c-1.3,0-2.6-1.1-3.6-3.1
 			c3.4-3.8,5.7-10.8,5.7-18.8C58.8,23.8,56.6,16.8,53.2,12.9z"/>
 			<radialGradient id="SVGID_00000009565123575973598080000009335550354766300606_" cx="-7.8671" cy="278.2442" r="4.8781" gradientTransform="matrix(1.5187 0 0 -7.8271 69.237 2209.3281)" gradientUnits="userSpaceOnUse">
 			<stop  offset="0" style="stop-color:#05E5AD"/>
 			<stop  offset="0.32" style="stop-color:#05E5AD;stop-opacity:0"/>
 			<stop  offset="0.9028" style="stop-color:#6447FF"/>
 		</radialGradient>
 		<path fill="url(#SVGID_00000009565123575973598080000009335550354766300606_)" d="M53.2,12.9c1.1-2,2.3-3.1,3.6-3.1
 			c3.9,0,7,9.8,7,22s-3.1,22-7,22c-1.3,0-2.6-1.1-3.6-3.1c3.4-3.8,5.7-10.8,5.7-18.8C58.8,23.8,56.6,16.8,53.2,12.9z"/>
 		<path fill="#684BFE" d="M52.8,31.8c0-3.9-0.8-7.6-2.1-10.8c0.6-3.3,1.5-6.1,2.5-8c3.4,3.8,5.7,10.8,5.7,18.8c0,8-2.3,15-5.7,18.8
 			c-1-2-1.9-4.7-2.5-8C52,39.3,52.8,35.7,52.8,31.8z"/>
 		<path fill="#321BB2" d="M50.7,42.5c-0.6-3.2-0.9-6.9-0.9-10.8s0.3-7.6,0.9-10.8c1.3,3.2,2.1,6.9,2.1,10.8S52,39.3,50.7,42.5z"/>
 	</g>
 </g>
 </svg>
--- a/docs/docs/assets/logo_.png
+++ b/docs/docs/assets/logo_.png
--- a/docs/docs/chrome-extension/data_privacy.md
+++ b/docs/docs/chrome-extension/data_privacy.md
@ -1,5 +0,0 @@
 We take your code's security and privacy seriously:
 - The Chrome extension will not send your code to any external servers.
 - For private repositories, we will first validate the user's identity and permissions. After authentication, we generate responses using the existing Qodo Merge Pro integration.
--- a/docs/docs/chrome-extension/features.md
+++ b/docs/docs/chrome-extension/features.md
@ -1,51 +0,0 @@
 ### PR chat
 The PR-Chat feature allows to freely chat with your PR code, within your GitHub environment.
 It will seamlessly use the PR as context to your chat session, and provide AI-powered feedback.
 To enable private chat, simply install the Qodo Merge Chrome extension. After installation, each PR's file-changed tab will include a chat box, where you may ask questions about your code.
 This chat session is **private**, and won't be visible to other users.
 All open-source repositories are supported.
 For private repositories, you will also need to install Qodo Merge Pro, After installation, make sure to open at least one new PR to fully register your organization. Once done, you can chat with both new and existing PRs across all installed repositories.
 #### Context-aware PR chat
 Qodo Merge constructs a comprehensive context for each pull request, incorporating the PR description, commit messages, and code changes with extended dynamic context. This contextual information, along with additional PR-related data, forms the foundation for an AI-powered chat session. The agent then leverages this rich context to provide intelligent, tailored responses to user inquiries about the pull request.
 <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.
 <img src="https://codium.ai/images/pr_agent/toolbar1.png" width="512">
 <img src="https://codium.ai/images/pr_agent/toolbar2.png" width="512">
 ### Qodo Merge filters
 Qodo Merge filters is a sidepanel option. that allows you to filter different message in the conversation tab.
 For example, you can choose to present only message from Qodo Merge, or filter those messages, focusing only on user's comments.
 <img src="https://codium.ai/images/pr_agent/pr_agent_filters1.png" width="256">
 <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:
 - 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">
--- a/docs/docs/chrome-extension/index.md
+++ b/docs/docs/chrome-extension/index.md
@ -1,14 +0,0 @@
 [Qodo Merge Chrome extension](https://chromewebstore.google.com/detail/pr-agent-chrome-extension/ephlnjeghhogofkifjloamocljapahnl) is a collection of tools that integrates seamlessly with your GitHub environment, aiming to enhance your Git usage experience, and providing AI-powered capabilities to your PRs.
 With a single-click installation you will gain access to a context-aware chat on your pull requests code, a toolbar extension with multiple AI feedbacks, Qodo Merge filters, and additional abilities.
 The extension is powered by top code models like Claude 3.5 Sonnet and GPT4. All the extension's features are free to use on public repositories. 
 For private repositories, you will need to install [Qodo Merge Pro](https://github.com/apps/codiumai-pr-agent-pro) in addition to the extension  (Quick GitHub app setup with a 14-day free trial. No credit card needed).
 For a demonstration of how to install Qodo Merge Pro and use it with the Chrome extension, please refer to the tutorial video at the provided [link](https://codium.ai/images/pr_agent/private_repos.mp4).
 <img src="https://codium.ai/images/pr_agent/PR-AgentChat.gif" width="768">
 ### Supported browsers
 The extension is supported on all Chromium-based browsers, including Google Chrome, Arc, Opera, Brave, and Microsoft Edge.
--- a/docs/docs/core-abilities/code_oriented_yaml.md
+++ b/docs/docs/core-abilities/code_oriented_yaml.md
@ -1,2 +0,0 @@
 ## Overview
 TBD
--- a/docs/docs/core-abilities/compression_strategy.md
+++ b/docs/docs/core-abilities/compression_strategy.md
@ -1,47 +0,0 @@
 ## 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)
 2. The PR is too large to fit in a single prompt (including system and user prompt)
 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)
 2. Given the main languages used in the repo
 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 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]]```
 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.
 5. If we haven't reached the max token length, add the `deleted files` to the prompt until the prompt reaches the max token length (hard stop), skip the rest of the patches.
 #### Example
 ![Core Abilities](https://codium.ai/images/git_patch_logic.png){width=768}
--- a/docs/docs/core-abilities/dynamic_context.md
+++ b/docs/docs/core-abilities/dynamic_context.md
@ -1,72 +0,0 @@
 ## TL;DR
 Qodo Merge uses an **asymmetric and dynamic context strategy** to improve AI analysis of code changes in pull requests. 
 It provides more context before changes than after, and dynamically adjusts the context based on code structure (e.g., enclosing functions or classes). 
 This approach balances providing sufficient context for accurate analysis, while avoiding needle-in-the-haystack information overload that could degrade AI performance or exceed token limits.
 ## 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 '-'.
 ```
@@ -12,5 +12,5 @@ def func1():
 code line that already existed in the file...
 code line that already existed in the file...
 code line that already existed in the file....
 -code line that was removed in the PR
 +new code line added in the PR
 code line that already existed in the file...
 code line that already existed in the file...
 code line that already existed in the file...
@@ -26,2 +26,4 @@ def func2():
 ...
 ```
 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:
 Pros:
 - Enhanced context allows the model to better comprehend and localize the code changes, results (potentially) in more precise analysis and suggestions. Without enough context, the model may struggle to understand the code changes and provide relevant feedback.
 Cons:
 - Excessive context may overwhelm the model with extraneous information, creating a "needle in a haystack" scenario where focusing on the relevant details (the code that actually changed) becomes challenging.
 LLM quality is known to degrade when the context gets larger. 
 Pull requests often encompass multiple changes across many files, potentially spanning hundreds of lines of modified code. This complexity presents a genuine risk of overwhelming the model with excessive context.
 - 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:**
 We start by recognizing that the context preceding a code change is typically more crucial for understanding the modification than the context following it. 
 Consequently, Qodo Merge implements an asymmetric context policy, decoupling the context window into two distinct segments: one for the code before the change and another for the code after.
 By independently adjusting each context window, Qodo Merge can supply the model with a more tailored and pertinent context for individual code changes. 
 **Dynamic:**
 We also employ a "dynamic" context strategy.
 We start by recognizing that the optimal context for a code change often corresponds to its enclosing code component (e.g., function, class), rather than a fixed number of lines. 
 Consequently, we dynamically adjust the context window based on the code's structure, ensuring the model receives the most pertinent information for each modification.
 To prevent overwhelming the model with excessive context, we impose a limit on the number of lines searched when identifying the enclosing component. 
 This balance allows for comprehensive understanding while maintaining efficiency and limiting context token usage.
 ## Appendix - relevant configuration options
 ```
 [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
 max_extra_lines_before_dynamic_context = 8  # will try to include up to X extra lines before the hunk in the patch, until we reach an enclosing function or class
 patch_extra_lines_before = 3                # Number of extra lines (+3 default ones) to include before each hunk in the patch
 patch_extra_lines_after = 1                 # Number of extra lines (+3 default ones) to include after each hunk in the patch
 ```
--- a/docs/docs/core-abilities/impact_evaluation.md
+++ b/docs/docs/core-abilities/impact_evaluation.md
@ -1,44 +0,0 @@
 # Overview - Impact Evaluation 💎
 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.
 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.
 **Why This Metric Matters:**
 1. **Standardized and Comparable Measurement:** By measuring impacts per 1K lines of code additions, you create a standardized metric that can be compared across different projects, teams, customers, and time periods. This standardization is crucial for meaningful analysis, benchmarking, and identifying where Qodo Merge is most effective.
 2. **Accounts for PR Variability and Incentivizes Quality:** This metric addresses the fact that "Not all PRs are created equal." By normalizing against lines of code rather than PR count, you account for the variability in PR sizes and focus on the quality and impact of suggestions rather than just the number of PRs affected.
 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. 
--- a/docs/docs/core-abilities/index.md
+++ b/docs/docs/core-abilities/index.md
@ -1,28 +1,52 @@
-# Core Abilities
+## PR Compression Strategy
-Qodo Merge utilizes a variety of core abilities to provide a comprehensive and efficient code review experience. These abilities include:
+There are two scenarios:
- [Local and global metadata](https://qodo-merge-docs.qodo.ai/core-abilities/metadata/)
+1. The PR is small enough to fit in a single prompt (including system and user prompt)
- [Dynamic context](https://qodo-merge-docs.qodo.ai/core-abilities/dynamic_context/)
+2. The PR is too large to fit in a single prompt (including system and user prompt)
 - [Self-reflection](https://qodo-merge-docs.qodo.ai/core-abilities/self_reflection/)
 - [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/)
 - [Code-oriented YAML](https://qodo-merge-docs.qodo.ai/core-abilities/code_oriented_yaml/)
 - [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
+For both scenarios, we first use the following strategy
-Here are some additional technical blogs from Qodo, that delve deeper into the core capabilities and features of Large Language Models (LLMs) when applied to coding tasks. 
+#### Repo language prioritization strategy
-These resources provide more comprehensive insights into leveraging LLMs for software development.
+We prioritize the languages of the repo based on the following criteria:
-### Code Generation and LLMs
+1. Exclude binary files and non code files (e.g. images, pdfs, etc)
- [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/)
+2. Given the main languages used in the repo
- [RAG for a Codebase with 10k Repos](https://www.qodo.ai/blog/rag-for-large-scale-code-repos/)
+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]]```
 ### 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
+### Small PR
- [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/)
+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 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]]```
 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.
 5. If we haven't reached the max token length, add the `deleted files` to the prompt until the prompt reaches the max token length (hard stop), skip the rest of the patches.
 #### Example
 ![Core Abilities](https://codium.ai/images/git_patch_logic.png){width=768}
 ## YAML Prompting
 TBD
 ## Static Code Analysis 💎
 TBD
--- a/docs/docs/core-abilities/interactivity.md
+++ b/docs/docs/core-abilities/interactivity.md
@ -1,2 +0,0 @@
 ## Interactive invocation 💎
 TBD
--- a/docs/docs/core-abilities/metadata.md
+++ b/docs/docs/core-abilities/metadata.md
@ -1,56 +0,0 @@
 ## Local and global metadata injection with multi-stage analysis
 (1)
 Qodo Merge initially retrieves for each PR the following data:
 - PR title and branch name
 - PR original description
 - Commit messages history
 - PR diff patches, in [hunk diff](https://loicpefferkorn.net/2014/02/diff-files-what-are-hunks-and-how-to-extract-them/) format
 - The entire content of the files that were modified in the PR
 !!! tip "Tip: Organization-level metadata"
    In addition to the inputs above, Qodo Merge can incorporate supplementary preferences provided by the user, like [`extra_instructions` and `organization best practices`](https://qodo-merge-docs.qodo.ai/tools/improve/#extra-instructions-and-best-practices). This information can be used to enhance the PR analysis.
 (2)
 By default, the first command that Qodo Merge executes is [`describe`](https://qodo-merge-docs.qodo.ai/tools/describe/), which generates three types of outputs:
 - PR Type (e.g. bug fix, feature, refactor, etc)
 - PR Description - a bullet point summary of the PR
 - Changes walkthrough - for each modified file, provide a one-line summary followed by a detailed bullet point list of the changes.
 These AI-generated outputs are now considered as part of the PR metadata, and can be used in subsequent commands like `review` and `improve`.
 This effectively enables multi-stage chain-of-thought analysis, without doing any additional API calls which will cost time and money.
 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:
 ```
 ## File: 'src/file1.py'
 ### AI-generated file summary:
 - edited function `func1` that does X
 - Removed function `func2` that was not used
 - ....
@@ ... @@ def func1():
 __new hunk__
 11  unchanged code line0 in the PR
 12  unchanged code line1 in the PR
 13 +new code line2 added in the PR
 14  unchanged code line3 in the PR
 __old hunk__
 unchanged code line0
 unchanged code line1
 -old code line2 removed in the PR
 unchanged code line3
@@ ... @@ def func2():
 __new hunk__
 ...
 __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.
--- a/docs/docs/core-abilities/self_reflection.md
+++ b/docs/docs/core-abilities/self_reflection.md
@ -1,51 +0,0 @@
 ## TL;DR
 Qodo Merge implements a **self-reflection** process where the AI model reflects, scores, and re-ranks its own suggestions, eliminating irrelevant or incorrect ones. 
 This approach improves the quality and relevance of suggestions, saving users time and enhancing their experience. 
 Configuration options allow users to set a score threshold for further filtering out suggestions.
 ## 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:
 - A "category" section groups suggestions by their category, allowing users to quickly dismiss irrelevant suggestions.
 - Each suggestion is first described by a one-line summary, which can be expanded to a full description by clicking on a collapsible.
 - Upon expanding a suggestion, the user receives a more comprehensive description, and a code snippet demonstrating the recommendation.
 !!! note "Fast Review"
    This hierarchical structure is designed to facilitate rapid review of each suggestion, with users spending an average of ~5-10 seconds per item.
 ## Self-reflection and Re-ranking
 The AI model is initially tasked with generating suggestions, and outputting them in order of importance.
 However, in practice we observe that models often struggle to simultaneously generate high-quality code suggestions and rank them well in a single pass.
 Furthermore, the initial set of generated suggestions sometimes contains easily identifiable errors.
 To address these issues, we implemented a "self-reflection" process that refines suggestion ranking and eliminates irrelevant or incorrect proposals. 
 This process consists of the following steps:
 1. Presenting the generated suggestions to the model in a follow-up call.
 2. Instructing the model to score each suggestion on a scale of 0-10 and provide a rationale for the assigned score.
 3. Utilizing these scores to re-rank the suggestions and filter out incorrect ones (with a score of 0).
 4. Optionally, filtering out all suggestions below a user-defined score threshold.
 Note that presenting all generated suggestions simultaneously provides the model with a comprehensive context, enabling it to make more informed decisions compared to evaluating each suggestion individually.
 To conclude, the self-reflection process enables Qodo Merge to prioritize suggestions based on their importance, eliminate inaccurate or irrelevant proposals, and optionally exclude suggestions that fall below a specified threshold of significance.
 This results in a more refined and valuable set of suggestions for the user, saving time and improving the overall experience.
 ## Example Results
 ![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
 ```
 [pr_code_suggestions]
 self_reflect_on_suggestions	= true # Enable self-reflection on code suggestions
 suggestions_score_threshold	= 0 # Filter out suggestions with a score below this threshold (0-10)
 ```
--- a/docs/docs/core-abilities/static_code_analysis.md
+++ b/docs/docs/core-abilities/static_code_analysis.md
@ -1,70 +0,0 @@
 ## Overview - Static Code Analysis 💎
 By combining static code analysis with LLM capabilities, Qodo Merge can provide a comprehensive analysis of the PR code changes on a component level.
 It scans the PR code changes, finds all the code components (methods, functions, classes) that changed, and enables to interactively generate tests, docs, code suggestions and similar code search for each component.
 !!! 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
 ```
 An example result:
 ![Analyze 1](https://codium.ai/images/pr_agent/analyze_1.png){width=768}
 Clicking on each checkbox will trigger the relevant tool for the selected component.
 ### Generate Tests
 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}
 ### Generate Docs for a Component
 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
 ```
 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
 ```
 Or be triggered interactively by using the `analyze` tool.
 ![improve_component2](https://codium.ai/images/pr_agent/improve_component2.png){width=768}
 ### Find Similar Code
 The [`similar code`](https://qodo-merge-docs.qodo.ai/tools/similar_code/) tool retrieves the most similar code components from inside the organization's codebase, or from open-source code.
 For example:
 `Global Search` for a method called `chat_completion`:
 ![similar code global](https://codium.ai/images/pr_agent/similar_code_global2.png){width=768}
--- a/docs/docs/css/custom.css
+++ b/docs/docs/css/custom.css
@ -4,34 +4,12 @@
    --md-primary-fg-color: #765bfa;
    --md-accent-fg-color: #AEA1F1;
  }
-
+.md-nav__title, .md-nav__link  {
-.md-nav--primary {
+    font-size: 16px; 
    .md-nav__link {
    font-size: 18px; /* Change the font size as per your preference */
 }
 }
 .md-nav--primary {
    position: relative; /* Ensure the element is positioned */
 }
 .md-nav--primary::before {
    content: "";
    position: absolute;
    top: 0;
    right: 10px; /* Move the border 10 pixels to the right */
    width: 2px;
    height: 100%;
    background-color: #f5f5f5; /* Match the border color */
 }
 /*.md-nav__title, .md-nav__link  {*/
 /*    font-size: 18px;*/
 /*    margin-top: 14px; !* Adjust the space as needed *!*/
 /*    margin-bottom: 14px; !* Adjust the space as needed *!*/
 /*}*/
 .md-tabs__link  {
-    font-size: 18px;
+    font-size: 16px; 
 }
 .md-header__title {
--- a/docs/docs/faq/index.md
+++ b/docs/docs/faq/index.md
@ -1,67 +0,0 @@
 # FAQ
 ??? note "Question: Can Qodo Merge serve as a substitute for a human reviewer?"
    #### Answer:<span style="display:none;">1</span>
    Qodo Merge is designed to assist, not replace, human reviewers.
    Reviewing PRs is a tedious and time-consuming task often seen as a "chore". In addition, the longer the PR – the shorter the relative feedback, since long PRs can overwhelm reviewers, both in terms of technical difficulty, and the actual review time.
    Qodo Merge aims to address these pain points, and to assist and empower both the PR author and reviewer.
    However, Qodo Merge has built-in safeguards to ensure the developer remains in the driver's seat. For example:
    1. Preserves user's original PR header
    2. Places user's description above the AI-generated PR description
    3. Cannot approve PRs; approval remains reviewer's responsibility
    4. The code suggestions are optional, and aim to:
        - Encourage self-review and self-reflection
        - Highlight potential bugs or oversights
        - Enhance code quality and promote best practices
    Read more about this issue in our [blog](https://www.codium.ai/blog/understanding-the-challenges-and-pain-points-of-the-pull-request-cycle/)
 ___
 ??? note "Question: I received an incorrect or irrelevant suggestion. Why?"
    #### Answer:<span style="display:none;">2</span>
    - Modern AI models, like Claude 3.5 Sonnet and GPT-4, are improving rapidly but remain imperfect. Users should critically evaluate all suggestions rather than accepting them automatically.
    - AI errors are rare, but possible. A main value from reviewing the code suggestions lies in their high probability of catching **mistakes or bugs made by the PR author**. We believe it's worth spending 30-60 seconds reviewing suggestions, even if some aren't relevant, as this practice can enhances code quality and prevent bugs in production.
    - The hierarchical structure of the suggestions is designed to help the user to _quickly_ understand them, and to decide which ones are relevant and which are not:
        - Only if the `Category` header is relevant, the user should move to the summarized suggestion description.
        - Only if the summarized suggestion description is relevant, the user should click on the collapsible, to read the full suggestion description with a code preview example.
    - In addition, we recommend to use the [`extra_instructions`](https://qodo-merge-docs.qodo.ai/tools/improve/#extra-instructions-and-best-practices) field to guide the model to suggestions that are more relevant to the specific needs of the project. 
    - 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.
 ___
 ??? note "Question: How can I get more tailored suggestions?"
    #### Answer:<span style="display:none;">3</span>
    See [here](https://qodo-merge-docs.qodo.ai/tools/improve/#extra-instructions-and-best-practices) for more information on how to use the `extra_instructions` and `best_practices` configuration options, to guide the model to more tailored suggestions.
 ___
 ??? note "Question: Will you store my code ? Are you using my code to train models?"
    #### Answer:<span style="display:none;">4</span>
    No. Qodo Merge strict privacy policy ensures that your code is not stored or used for training purposes.
    For a detailed overview of our data privacy policy, please refer to [this link](https://qodo-merge-docs.qodo.ai/overview/data_privacy/)
 ___
 ??? note "Question: Can I use my own LLM keys with Qodo Merge?"
    #### Answer:<span style="display:none;">5</span>
    When you self-host, you use your own keys. 
    Qodo Merge Pro with SaaS deployment is a hosted version of Qodo Merge, where Qodo manages the infrastructure and the keys.
    For enterprise customers, on-prem deployment is also available. [Contact us](https://www.codium.ai/contact/#pricing) for more information.
 ___
--- a/docs/docs/finetuning_benchmark/index.md
+++ b/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 GPT4 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 100 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."
 ```
--- a/docs/docs/index.md
+++ b/docs/docs/index.md
@ -1,46 +1,34 @@
 # Overview
-Qodo Merge is an open-source tool to help efficiently review and handle pull requests.
+CodiumAI PR-Agent is an open-source tool to help efficiently review and handle pull requests.
 - See the [Installation Guide](./installation/index.md) for instructions on installing and running the tool on different git platforms.
- See the [Usage Guide](./usage-guide/index.md) for instructions on running the Qodo Merge commands via different interfaces, including _CLI_, _online usage_, or by _automatically triggering_ them when a new PR is opened.
+- See the [Usage Guide](./usage-guide/index.md) for instructions on running the PR-Agent commands via different interfaces, including _CLI_, _online usage_, or by _automatically triggering_ them when a new PR is opened.
 - See the [Tools Guide](./tools/index.md) for a detailed description of the different tools.
-## Qodo Merge Docs Smart Search
+## PR-Agent Features
-
+PR-Agent offers extensive pull request functionalities across various git providers.
 To search the documentation site using natural language:
 1) Comment `/help "your question"` in either:
   - A pull request where Qodo Merge is installed
   - A [PR Chat](https://qodo-merge-docs.qodo.ai/chrome-extension/features/#pr-chat)
 2) Qodo Merge will respond with an [answer](https://github.com/Codium-ai/pr-agent/pull/1241#issuecomment-2365259334) that includes relevant documentation links.
 ## Qodo Merge Features
 Qodo Merge offers extensive pull request functionalities across various git providers.
 |       |                                                                                                                     | GitHub | Gitlab | Bitbucket | Azure DevOps |
-|-------|-----------------------------------------------------------------------------------------------------------------------|:------:|:------:|:---------:|:------------:|
+|-------|---------------------------------------------------------------------------------------------------------------------|:------:|:------:|:---------:|:------------:|
 | TOOLS | Review                                                                                                              |   ✅    |   ✅    |   ✅       |      ✅      |
 |       | ⮑ Incremental                                                                                                       |   ✅    |        |            |              |
 |       | ⮑ [SOC2 Compliance](https://pr-agent-docs.codium.ai/tools/review/#soc2-ticket-compliance){:target="_blank"} 💎                                     |   ✅    |   ✅    |   ✅        |      ✅      |
 |       | Ask                                                                                                                 |   ✅    |   ✅    |   ✅        |      ✅      |
 |       | Describe                                                                                                            |   ✅    |   ✅    |   ✅        |      ✅      |
-|       | ⮑ [Inline file summary](https://qodo-merge-docs.qodo.ai/tools/describe/#inline-file-summary){:target="_blank"} 💎     |   ✅    |   ✅    |           |              |
+|       | ⮑ [Inline file summary](https://pr-agent-docs.codium.ai/tools/describe/#inline-file-summary){:target="_blank"} 💎                                 |   ✅    |   ✅    |           |      ✅      |
 |       | Improve                                                                                                             |   ✅    |   ✅    |   ✅        |      ✅      |
 |       | ⮑ Extended                                                                                                          |   ✅    |   ✅    |   ✅        |      ✅      |
-|       | [Custom Prompt](./tools/custom_prompt.md){:target="_blank"} 💎                                                        |   ✅    |   ✅    |   ✅        |              |
+|       | [Custom Suggestions](./tools/custom_suggestions.md){:target="_blank"} 💎                                               |   ✅    |   ✅    |   ✅        |      ✅      |
-|       | Reflect and Review                                                                                                    |   ✅    |   ✅    |   ✅        |              |
+|       | Reflect and Review                                                                                                  |   ✅    |   ✅    |   ✅        |      ✅      |
 |       | Update CHANGELOG.md                                                                                                 |   ✅    |   ✅    |   ✅        |      ️       |
 |       | Find Similar Issue                                                                                                  |   ✅    |        |             |      ️       |
-|       | [Add PR Documentation](./tools/documentation.md){:target="_blank"} 💎                                                 |   ✅    |   ✅    |          |              |
+|       | [Add PR Documentation](./tools/documentation.md){:target="_blank"} 💎                                                  |   ✅    |   ✅    |          |      ✅      |
-|       | [Generate Custom Labels](./tools/describe.md#handle-custom-labels-from-the-repos-labels-page-💎){: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"} 💎                                                      |   ✅    |   ✅    |       |              |
+|       | [Analyze PR Components](./tools/analyze.md){:target="_blank"} 💎                                                       |   ✅    |   ✅    |       |      ✅      |
 |       |                                                                                                                     |        |        |            |      ️       |
 | USAGE | CLI                                                                                                                 |   ✅    |   ✅    |   ✅       |      ✅      |
 |       | App / webhook                                                                                                       |   ✅    |   ✅    |    ✅        |      ✅      |
@ -51,10 +39,10 @@ Qodo Merge offers extensive pull request functionalities across various git prov
 |       | Adaptive and token-aware file patch fitting                                                                         |   ✅    |   ✅    |   ✅     |   ✅        |
 |       | Multiple models support                                                                                             |   ✅    |   ✅    |   ✅       |   ✅        |
 |       | Incremental PR review                                                                                               |   ✅    |        |            |           |
-|       | [Static code analysis](./tools/analyze.md/){:target="_blank"} 💎                                                      |   ✅    |   ✅     |    ✅    |              |
+|       | [Static code analysis](./tools/analyze.md/){:target="_blank"} 💎                                                        |   ✅    |   ✅     |    ✅    |   ✅        |
-|       | [Multiple configuration options](./usage-guide/configuration_options.md){:target="_blank"} 💎                         |   ✅    |   ✅     |    ✅    |              |
+|       | [Multiple configuration options](./usage-guide/configuration_options.md){:target="_blank"} 💎                           |   ✅    |   ✅     |    ✅    |   ✅        |
-💎 marks a feature available only in [Qodo Merge Pro](https://www.codium.ai/pricing/){:target="_blank"}
+💎 marks a feature available only in [PR-Agent Pro](https://www.codium.ai/pricing/){:target="_blank"}
 ## Example Results
@ -86,8 +74,40 @@ Qodo Merge offers extensive pull request functionalities across various git prov
 ## How it Works
-The following diagram illustrates Qodo Merge tools and their flow:
+The following diagram illustrates PR-Agent tools and their flow:
-![Qodo Merge Tools](https://codium.ai/images/pr_agent/diagram-v0.9.png)
+![PR-Agent Tools](https://codium.ai/images/pr_agent/diagram-v0.9.png)
-Check out the [core abilities](core-abilities/index.md) page for a comprehensive overview of the variety of core abilities used by Qodo Merge.
+Check out the [PR Compression strategy](core-abilities/index.md) page for more details on how we convert a code diff to a manageable LLM prompt
 ## PR-Agent Pro 💎
 [PR-Agent Pro](https://www.codium.ai/pricing/) is a hosted version of PR-Agent, provided by CodiumAI. It is available for a monthly fee, and provides the following benefits:
 1. **Fully managed** - We take care of everything for you - hosting, models, regular updates, and more. Installation is as simple as signing up and adding the PR-Agent app to your GitHub\GitLab\BitBucket repo.
 2. **Improved privacy** - No data will be stored or used to train models. PR-Agent Pro will employ zero data retention, and will use an OpenAI account with zero data retention.
 3. **Improved support** - PR-Agent Pro users will receive priority support, and will be able to request new features and capabilities.
 4. **Extra features** -In addition to the benefits listed above, PR-Agent Pro will emphasize more customization, and the usage of static code analysis, in addition to LLM logic, to improve results. It has the following additional tools and features:
    - (Tool): [**Analyze PR components**](./tools/analyze.md/)
    - (Tool): [**Custom Code Suggestions**](./tools/custom_suggestions.md/)
    - (Tool): [**Tests**](./tools/test.md/)
    - (Tool): [**PR documentation**](./tools/documentation.md/)
    - (Tool): [**Improve Component**](https://pr-agent-docs.codium.ai/tools/improve_component/)
    - (Tool): [**Similar code search**](https://pr-agent-docs.codium.ai/tools/similar_code/)
    - (Tool): [**CI feedback**](./tools/ci_feedback.md/)
    - (Feature): [**Interactive triggering**](./usage-guide/automations_and_usage.md/#interactive-triggering)
    - (Feature): [**SOC2 compliance check**](./tools/review.md/#soc2-ticket-compliance)
    - (Feature): [**Custom labels**](./tools/describe.md/#handle-custom-labels-from-the-repos-labels-page)
    - (Feature): [**Global and wiki configuration**](./usage-guide/configuration_options.md/#wiki-configuration-file)
    - (Feature): [**Inline file summary**](https://pr-agent-docs.codium.ai/tools/describe/#inline-file-summary)
 ## Data Privacy
 If you host PR-Agent with your OpenAI API key, it is between you and OpenAI. You can read their API data privacy policy here:
 https://openai.com/enterprise-privacy
 When using PR-Agent Pro 💎, hosted by CodiumAI, we will not store any of your data, nor will we use it for training.
 You will also benefit from an OpenAI account with zero data retention.
--- a/docs/docs/installation/azure.md
+++ b/docs/docs/installation/azure.md
@ -1,62 +1,4 @@
-## Azure DevOps Pipeline
+## Azure DevOps provider
 You can use a pre-built Action Docker image to run Qodo Merge as an Azure devops pipeline.
 add the following file to your repository under `azure-pipelines.yml`:
 ```yaml
 # Opt out of CI triggers
 trigger: none
 # Configure PR trigger
 pr:
  branches:
    include:
    - '*'
  autoCancel: true
  drafts: false
 stages:
 - stage: pr_agent
  displayName: 'PR Agent Stage'
  jobs:
  - job: pr_agent_job
    displayName: 'PR Agent Job'
    pool:
      vmImage: 'ubuntu-latest'
    container:
      image: codiumai/pr-agent:latest
      options: --entrypoint ""
    variables:
      - group: pr_agent
    steps:
    - script: |
        echo "Running PR Agent action step"
        # Construct PR_URL
        PR_URL="${SYSTEM_COLLECTIONURI}${SYSTEM_TEAMPROJECT}/_git/${BUILD_REPOSITORY_NAME}/pullrequest/${SYSTEM_PULLREQUEST_PULLREQUESTID}"
        echo "PR_URL=$PR_URL"
        # Extract organization URL from System.CollectionUri
        ORG_URL=$(echo "$(System.CollectionUri)" | sed 's/\/$//') # Remove trailing slash if present
        echo "Organization URL: $ORG_URL"
        export azure_devops__org="$ORG_URL"
        export config__git_provider="azure"
        pr-agent --pr_url="$PR_URL" describe
        pr-agent --pr_url="$PR_URL" review
        pr-agent --pr_url="$PR_URL" improve
      env:
        azure_devops__pat: $(azure_devops_pat)
        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):
 ![Qodo Merge Pro](https://codium.ai/images/pr_agent/azure_devops_pipeline_secrets.png){width=468}
 Make sure to give pipeline permissions to the `pr_agent` variable group.
 ## Azure DevOps from CLI
 To use Azure DevOps provider use the following settings in configuration.toml:
 ```
--- a/docs/docs/installation/bitbucket.md
+++ b/docs/docs/installation/bitbucket.md
@ -1,7 +1,7 @@
 ## Run as a Bitbucket Pipeline
-You can use the Bitbucket Pipeline system to run Qodo Merge on every pull request open or update.
+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
@ -27,9 +27,9 @@ You can get a Bitbucket token for your repository by following Repository Settin
 Note that comments on a PR are not supported in Bitbucket Pipeline.
-## Run using CodiumAI-hosted Bitbucket app 💎
+## Run using CodiumAI-hosted Bitbucket app
-Please contact visit [Qodo Merge Pro](https://www.codium.ai/pricing/) if you're interested in a hosted BitBucket app solution that provides full functionality including PR reviews and comment handling. It's based on the [bitbucket_app.py](https://github.com/Codium-ai/pr-agent/blob/main/pr_agent/git_providers/bitbucket_provider.py) implementation.
+Please contact [support@codium.ai](mailto:support@codium.ai) or visit [CodiumAI pricing page](https://www.codium.ai/pricing/) if you're interested in a hosted BitBucket app solution that provides full functionality including PR reviews and comment handling. It's based on the [bitbucket_app.py](https://github.com/Codium-ai/pr-agent/blob/main/pr_agent/git_providers/bitbucket_provider.py) implementation.
 ## Bitbucket Server and Data Center
@ -58,7 +58,7 @@ python cli.py --pr_url https://git.onpreminstanceofbitbucket.com/projects/PROJEC
 ### Run it as service
-To run Qodo Merge as webhook, build the docker image:
+To run pr-agent as webhook, build the docker image:
 ```
 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
--- a/docs/docs/installation/github.md
+++ b/docs/docs/installation/github.md
@ -1,6 +1,6 @@
 ## Run as a GitHub Action
-You can use our pre-built Github Action Docker image to run Qodo Merge as a Github Action.
+You can use our pre-built Github Action Docker image to run PR-Agent as a Github Action.
 1) Add the following file to your repository under `.github/workflows/pr_agent.yml`:
@ -26,7 +26,15 @@ jobs:
          OPENAI_KEY: ${{ secrets.OPENAI_KEY }}
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 ```
-
+** if you want to pin your action to a specific release (v2.0 for example) for stability reasons, use:
 ```yaml
 ...
    steps:
      - name: PR Agent action step
        id: pragent
        uses: Codium-ai/pr-agent@v2.0
 ...
 ```
 2) Add the following secret to your repository under `Settings > Secrets and variables > Actions > New repository secret > Add secret`:
 ```
@ -39,7 +47,7 @@ The GITHUB_TOKEN secret is automatically created by GitHub.
 3) Merge this change to your main branch.
 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:
+4) You may configure PR-Agent 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,41 +55,7 @@ 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)
+See detailed usage instructions in the [USAGE GUIDE](https://pr-agent-docs.codium.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
    ...
        steps:
          - name: PR Agent action step
            id: pragent
            uses: docker://codiumai/pr-agent:0.23-github_action
    ...
    ```
    For enhanced security, you can also specify the Docker image by its [digest](https://hub.docker.com/repository/docker/codiumai/pr-agent/tags):
    ```yaml
    ...
        steps:
          - name: PR Agent action step
            id: pragent
            uses: docker://codiumai/pr-agent@sha256:14165e525678ace7d9b51cda8652c2d74abb4e1d76b57c4a6ccaeba84663cc64
    ...
    ```
 ### 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.
    For example, if your GitHub server is at `https://github.mycompany.com`, add the following to your workflow file:
    ```yaml
          env:
            # ... previous environment values
            GITHUB.BASE_URL: "https://github.mycompany.com/api/v3"
    ```
 ---
@ -168,7 +142,7 @@ cp pr_agent/settings/.secrets_template.toml pr_agent/settings/.secrets.toml
 9. Install the app by navigating to the "Install App" tab and selecting your desired repositories.
-> **Note:** When running Qodo Merge from GitHub app, the default configuration file (configuration.toml) will be loaded.
+> **Note:** When running PR-Agent from GitHub App, the default configuration file (configuration.toml) will be loaded.
 > However, you can override the default tool parameters by uploading a local configuration file `.pr_agent.toml`
 > For more information please check out the [USAGE GUIDE](../usage-guide/automations_and_usage.md#github-app)
 ---
@ -198,7 +172,7 @@ For example: `GITHUB.WEBHOOK_SECRET` --> `GITHUB__WEBHOOK_SECRET`
 ## AWS CodeCommit Setup
-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:
+Not all features have been added to CodeCommit yet.  As of right now, CodeCommit has been implemented to run the pr-agent 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 pr-agent 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
--- a/docs/docs/installation/gitlab.md
+++ b/docs/docs/installation/gitlab.md
@ -1,45 +1,3 @@
 ## Run as a GitLab Pipeline
 You can use a pre-built Action Docker image to run Qodo Merge as a GitLab pipeline. This is a simple way to get started with Qodo Merge without setting up your own server.
 (1) Add the following file to your repository under `.gitlab-ci.yml`:
 ```yaml
 stages:
  - pr_agent
 pr_agent_job:
  stage: pr_agent
  image:
    name: codiumai/pr-agent:latest
    entrypoint: [""]
  script:
    - cd /app
    - echo "Running PR Agent action step"
    - export MR_URL="$CI_MERGE_REQUEST_PROJECT_URL/merge_requests/$CI_MERGE_REQUEST_IID"
    - echo "MR_URL=$MR_URL"
    - export gitlab__url=$CI_SERVER_PROTOCOL://$CI_SERVER_FQDN
    - export gitlab__PERSONAL_ACCESS_TOKEN=$GITLAB_PERSONAL_ACCESS_TOKEN
    - export config__git_provider="gitlab"
    - export openai__key=$OPENAI_KEY
    - python -m pr_agent.cli --pr_url="$MR_URL" describe
    - python -m pr_agent.cli --pr_url="$MR_URL" review
    - python -m pr_agent.cli --pr_url="$MR_URL" improve
  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.
 - `OPENAI_KEY`: Your OpenAI key.
 Note that if your base branches are not protected, don't set the variables as `protected`, since the pipeline will not have access to them.
 ## Run a GitLab webhook server
 1. From the GitLab workspace or group, create an access token. Enable the "api" scope only.
@ -49,14 +7,14 @@ Note that if your base branches are not protected, don't set the variables as `p
 ```
 WEBHOOK_SECRET=$(python -c "import secrets; print(secrets.token_hex(10))")
 ```
-3. Follow the instructions to build the Docker image, setup a secrets file and deploy on your own server from [here](https://qodo-merge-docs.qodo.ai/installation/github/#run-as-a-github-app) steps 4-7.
+3. Follow the instructions to build the Docker image, setup a secrets file and deploy on your own server from [here](https://pr-agent-docs.codium.ai/installation/github/#run-as-a-github-app) steps 4-7.
 4. In the secrets file, fill in the following:
    - Your OpenAI key.
    - In the [gitlab] section, fill in personal_access_token and shared_secret. The access token can be a personal access token, or a group or project access token.
    - Set deployment_type to 'gitlab' in [configuration.toml](https://github.com/Codium-ai/pr-agent/blob/main/pr_agent/settings/configuration.toml)
-5. Create a webhook in GitLab. Set the URL to ```http[s]://<PR_AGENT_HOSTNAME>/webhook```. Set the secret token to the generated secret from step 2.
+5. Create a webhook in GitLab. Set the URL to the URL of your app's server. Set the secret token to the generated secret from step 2.
 In the "Trigger" section, check the ‘comments’ and ‘merge request events’ boxes.
 6. Test your installation by opening a merge request or commenting or a merge request using one of CodiumAI's commands.
--- a/docs/docs/installation/index.md
+++ b/docs/docs/installation/index.md
@ -1,12 +1,12 @@
 # Installation
-## Self-hosted Qodo Merge
+## Self-hosted PR-Agent
-If you choose to host your own Qodo Merge, you first need to acquire two tokens:
+If you choose to host you own PR-Agent, you first need to acquire two tokens:
-1. An OpenAI key from [here](https://platform.openai.com/api-keys), with access to GPT-4 (or a key for other [language models](https://qodo-merge-docs.qodo.ai/usage-guide/changing_a_model/), if you prefer).
+1. An OpenAI key from [here](https://platform.openai.com/api-keys), with access to GPT-4 (or a key for [other models](../usage-guide/additional_configurations.md/#changing-a-model), if you prefer).
 2. A GitHub\GitLab\BitBucket personal access token (classic), with the repo scope. [GitHub from [here](https://github.com/settings/tokens)]
-There are several ways to use self-hosted Qodo Merge:
+There are several ways to use self-hosted PR-Agent:
 - [Locally](./locally.md)
 - [GitHub](./github.md)
@ -14,8 +14,9 @@ There are several ways to use self-hosted Qodo Merge:
 - [BitBucket](./bitbucket.md)
 - [Azure DevOps](./azure.md)
-## Qodo Merge Pro 💎
+## PR-Agent Pro 💎
-Qodo Merge Pro, an app hosted by CodiumAI for GitHub\GitLab\BitBucket, is also available. 
+PR-Agent Pro, an app for GitHub\GitLab\BitBucket hosted by CodiumAI, is also available. 
 <br>
-With Qodo Merge Pro, installation is as simple as signing up and adding the Qodo Merge app to your relevant repo. 
+With PR-Agent Pro Installation is as simple as signing up and adding the PR-Agent app to your relevant repo.
-See [here](https://qodo-merge-docs.qodo.ai/installation/pr_agent_pro/) for more details.
+<br>
 See [here](./pr_agent_pro.md) for more details.
--- a/docs/docs/installation/locally.md
+++ b/docs/docs/installation/locally.md
@ -16,8 +16,8 @@ from pr_agent.config_loader import get_settings
 def main():
    # Fill in the following values
-    provider = "github" # github/gitlab/bitbucket/azure_devops
+    provider = "github" # GitHub provider
-    user_token = "..."  #  user token
+    user_token = "..."  # GitHub user token
    openai_key = "..."  # OpenAI key
    pr_url = "..."      # PR URL, for example 'https://github.com/Codium-ai/pr-agent/pull/809'
    command = "/review" # Command to run (e.g. '/review', '/describe', '/ask="What is the purpose of this PR?"', ...)
@ -45,20 +45,15 @@ To invoke a tool (for example `review`), you can run directly from the Docker im
 ```
 docker run --rm -it -e OPENAI.KEY=<your key> -e GITHUB.USER_TOKEN=<your token> codiumai/pr-agent:latest --pr_url <pr_url> review
 ```
    If you are using GitHub enterprise server, you need to specify the custom url as variable.    
    For example, if your GitHub server is at `https://github.mycompany.com`, add the following to the command:
    ```
    -e GITHUB.BASE_URL=https://github.mycompany.com/api/v3
    ```
 - For GitLab:
 ```
 docker run --rm -it -e OPENAI.KEY=<your key> -e CONFIG.GIT_PROVIDER=gitlab -e GITLAB.PERSONAL_ACCESS_TOKEN=<your token> codiumai/pr-agent:latest --pr_url <pr_url> review
 ```
-    If you have a dedicated GitLab instance, you need to specify the custom url as variable:
+Note: If you have a dedicated GitLab instance, you need to specify the custom url as variable:
 ```
-    -e GITLAB.URL=<your gitlab instance url> 
+docker run --rm -it -e OPENAI.KEY=<your key> -e CONFIG.GIT_PROVIDER=gitlab -e GITLAB.PERSONAL_ACCESS_TOKEN=<your token> -e GITLAB.URL=<your gitlab instance url> codiumai/pr-agent:latest --pr_url <pr_url> review
 ```
 - For BitBucket:
@ -70,6 +65,19 @@ For other git providers, update CONFIG.GIT_PROVIDER accordingly, and check the `
 ---
 If you want to ensure you're running a specific version of the Docker image, consider using the image's digest:
 ```bash
 docker run --rm -it -e OPENAI.KEY=<your key> -e GITHUB.USER_TOKEN=<your token> codiumai/pr-agent@sha256:71b5ee15df59c745d352d84752d01561ba64b6d51327f97d46152f0c58a5f678 --pr_url <pr_url> review
 ```
 Or you can run a [specific released versions](https://github.com/Codium-ai/pr-agent/blob/main/RELEASE_NOTES.md) of pr-agent, for example:
 ```
 codiumai/pr-agent@v0.9
 ```
 ---
 ## Run from source
 1. Clone this repository:
@ -107,7 +115,7 @@ python3 -m pr_agent.cli --issue_url <issue_url> similar_issue
 ...
 ```
-[Optional] Add the pr_agent folder to your PYTHONPATH
+[Optional] Add the pr_agent folder to your PYTHONPATH
 ```
 export PYTHONPATH=$PYTHONPATH:<PATH to pr_agent folder>
 ```
--- a/docs/docs/installation/pr_agent_pro.md
+++ b/docs/docs/installation/pr_agent_pro.md
@ -1,33 +1,29 @@
-## Getting Started with Qodo Merge Pro
+## Getting Started with PR-Agent Pro
-Qodo Merge Pro is a versatile application compatible with GitHub, GitLab, and BitBucket, hosted by CodiumAI.
+PR-Agent Pro is a versatile application compatible with GitHub, GitLab, and BitBucket, hosted by CodiumAI.
-See [here](https://qodo-merge-docs.qodo.ai/overview/pr_agent_pro/) for more details about the benefits of using Qodo Merge Pro.
+See [here](https://pr-agent-docs.codium.ai/#pr-agent-pro) for more details about the benefits of using PR-Agent Pro.
-Interested parties can subscribe to Qodo Merge Pro through the following [link](https://www.codium.ai/pricing/). 
+Interested parties can subscribe to PR-Agent Pro through the following [link](https://www.codium.ai/pricing/). 
 After subscribing, you are granted the ability to easily install the application across any of your repositories.
-![Qodo Merge Pro](https://codium.ai/images/pr_agent/pr_agent_pro_install.png){width=468}
+![PR Agent Pro](https://codium.ai/images/pr_agent/pr_agent_pro_install.png){width=468}
-Each user who wants to use Qodo Merge pro needs to buy a seat. 
+Each user who wants to use PR-Agent pro needs to buy a seat. 
 Initially, CodiumAI offers a two-week trial period at no cost, after which continued access requires each user to secure a personal seat.
-Once a user acquires a seat, they gain the flexibility to use Qodo Merge Pro across any repository where it was enabled.
+Once a user acquires a seat, they gain the flexibility to use PR-Agent Pro across any repository where it was enabled.
-Users without a purchased seat who interact with a repository featuring Qodo Merge Pro are entitled to receive up to five complimentary feedbacks.
+Users without a purchased seat who interact with a repository featuring PR-Agent Pro are entitled to receive up to five complimentary feedbacks.
-Beyond this limit, Qodo Merge Pro will cease to respond to their inquiries unless a seat is purchased.
+Beyond this limit, PR-Agent Pro will cease to respond to their inquiries unless a seat is purchased.
 ## Install Qodo Merge Pro for GitHub Enterprise Server
 To use Qodo Merge Pro application on your private GitHub Enterprise Server, you will need to contact us for starting an [Enterprise](https://www.codium.ai/pricing/) trial.
-## Install Qodo Merge Pro for GitLab (Teams & Enterprise)
+## Install PR-Agent Pro for GitLab (Teams & Enterprise)
-Since GitLab platform does not support apps, installing Qodo Merge Pro for GitLab is a bit more involved, and requires the following steps:
+Since GitLab platform does not support apps, installing PR-Agent Pro for GitLab is a bit more involved, and requires the following steps:
 ### Step 1
-Acquire a personal, project or group level access token. Enable the “api” scope in order to allow Qodo Merge to read pull requests, comment and respond to requests.
+Acquire a personal, project or group level access token. Enable the “api” scope in order to allow PR-Agent to read pull requests, comment and respond to requests.
 <figure markdown="1">
 ![Step 1](https://www.codium.ai/images/pr_agent/gitlab_pro_pat.png){width=750}
@ -65,4 +61,4 @@ Enable SSL verification: Check the box.
 You’re all set!
-Open a new merge request or add a MR comment with one of Qodo Merge’s commands such as /review, /describe or /improve.
+Open a new merge request or add a MR comment with one of PR-Agent’s commands such as /review, /describe or /improve.
--- a/docs/docs/overview/data_privacy.md
+++ b/docs/docs/overview/data_privacy.md
@ -1,16 +0,0 @@
 ## Self-hosted Qodo Merge
 - If you self-host Qodo Merge with your OpenAI (or other LLM provider) API key, it is between you and the provider. We don't send your code data to Qodo Merge servers.
 ## Qodo Merge Pro 💎
 - When using Qodo Merge Pro 💎, hosted by CodiumAI, we will not store any of your data, nor will we use it for training. You will also benefit from an OpenAI account with zero data retention.
 - For certain clients, CodiumAI-hosted Qodo Merge Pro will use CodiumAI’s proprietary models. If this is the case, you will be notified.
 - No passive collection of Code and Pull Requests’ data — Qodo Merge will be active only when you invoke it, and it will then extract and analyze only data relevant to the executed command and queried pull request.
 ## 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.
--- a/docs/docs/overview/index.md
+++ b/docs/docs/overview/index.md
@ -1,93 +0,0 @@
 # Overview
 Qodo Merge is an open-source tool to help efficiently review and handle pull requests.
 - See the [Installation Guide](./installation/index.md) for instructions on installing and running the tool on different git platforms.
 - See the [Usage Guide](./usage-guide/index.md) for instructions on running the Qodo Merge commands via different interfaces, including _CLI_, _online usage_, or by _automatically triggering_ them when a new PR is opened.
 - See the [Tools Guide](./tools/index.md) for a detailed description of the different tools.
 ## Qodo Merge Docs Smart Search
 To search the documentation site using natural language:
 1) Comment `/help "your question"` in either:
   - A pull request where Qodo Merge is installed
   - A [PR Chat](https://qodo-merge-docs.qodo.ai/chrome-extension/features/#pr-chat)
 2) Qodo Merge will respond with an [answer](https://github.com/Codium-ai/pr-agent/pull/1241#issuecomment-2365259334) that includes relevant documentation links.
 ## Qodo Merge Features
 Qodo Merge offers extensive pull request functionalities across various git providers.
 |       |                                                                                                                       | GitHub | Gitlab | Bitbucket | Azure DevOps |
 |-------|-----------------------------------------------------------------------------------------------------------------------|:------:|:------:|:---------:|:------------:|
 | TOOLS | Review                                                                                                                |   ✅    |   ✅    |   ✅       |      ✅      |
 |       | ⮑ Incremental                                                                                                         |   ✅    |        |            |              |
 |       | Ask                                                                                                                   |   ✅    |   ✅    |   ✅        |      ✅      |
 |       | Describe                                                                                                              |   ✅    |   ✅    |   ✅        |      ✅      |
 |       | ⮑ [Inline file summary](https://qodo-merge-docs.qodo.ai/tools/describe/#inline-file-summary){:target="_blank"} 💎     |   ✅    |   ✅    |           |      ✅      |
 |       | Improve                                                                                                               |   ✅    |   ✅    |   ✅        |      ✅      |
 |       | ⮑ Extended                                                                                                            |   ✅    |   ✅    |   ✅        |      ✅      |
 |       | [Custom Prompt](./tools/custom_prompt.md){:target="_blank"} 💎                                                        |   ✅    |   ✅    |   ✅        |      ✅      |
 |       | Reflect and Review                                                                                                    |   ✅    |   ✅    |   ✅        |      ✅      |
 |       | Update CHANGELOG.md                                                                                                   |   ✅    |   ✅    |   ✅        |      ️       |
 |       | Find Similar Issue                                                                                                    |   ✅    |        |             |      ️       |
 |       | [Add PR Documentation](./tools/documentation.md){:target="_blank"} 💎                                                 |   ✅    |   ✅    |          |      ✅      |
 |       | [Generate Custom Labels](./tools/describe.md#handle-custom-labels-from-the-repos-labels-page-💎){:target="_blank"} 💎 |   ✅    |   ✅    |            |      ✅      |
 |       | [Analyze PR Components](./tools/analyze.md){:target="_blank"} 💎                                                      |   ✅    |   ✅    |       |      ✅      |
 |       |                                                                                                                       |        |        |            |      ️       |
 | USAGE | CLI                                                                                                                   |   ✅    |   ✅    |   ✅       |      ✅      |
 |       | App / webhook                                                                                                         |   ✅    |   ✅    |    ✅        |      ✅      |
 |       | Actions                                                                                                               |   ✅    |        |            |      ️       |
 |       |                                                                                                                       |        |        |            |
 | CORE  | PR compression                                                                                                        |   ✅    |   ✅    |   ✅       |   ✅        |
 |       | Repo language prioritization                                                                                          |   ✅    |   ✅    |   ✅       |   ✅        |
 |       | Adaptive and token-aware file patch fitting                                                                           |   ✅    |   ✅    |   ✅     |   ✅        |
 |       | Multiple models support                                                                                               |   ✅    |   ✅    |   ✅       |   ✅        |
 |       | Incremental PR review                                                                                                 |   ✅    |        |            |           |
 |       | [Static code analysis](./tools/analyze.md/){:target="_blank"} 💎                                                      |   ✅    |   ✅     |    ✅    |   ✅        |
 |       | [Multiple configuration options](./usage-guide/configuration_options.md){:target="_blank"} 💎                         |   ✅    |   ✅     |    ✅    |   ✅        |
 💎 marks a feature available only in [Qodo Merge Pro](https://www.codium.ai/pricing/){:target="_blank"}
 ## Example Results
 <hr>
 #### [/describe](https://github.com/Codium-ai/pr-agent/pull/530)
 <figure markdown="1">
 ![/describe](https://www.codium.ai/images/pr_agent/describe_new_short_main.png){width=512}
 </figure>
 <hr>
 #### [/review](https://github.com/Codium-ai/pr-agent/pull/732#issuecomment-1975099151)
 <figure markdown="1">
 ![/review](https://www.codium.ai/images/pr_agent/review_new_short_main.png){width=512}
 </figure>
 <hr>
 #### [/improve](https://github.com/Codium-ai/pr-agent/pull/732#issuecomment-1975099159)
 <figure markdown="1">
 ![/improve](https://www.codium.ai/images/pr_agent/improve_new_short_main.png){width=512}
 </figure>
 <hr>
 #### [/generate_labels](https://github.com/Codium-ai/pr-agent/pull/530)
 <figure markdown="1">
 ![/generate_labels](https://www.codium.ai/images/pr_agent/geneare_custom_labels_main_short.png){width=300}
 </figure>
 <hr>
 ## How it Works
 The following diagram illustrates Qodo Merge tools and their flow:
 ![Qodo Merge Tools](https://codium.ai/images/pr_agent/diagram-v0.9.png)
 Check out the [PR Compression strategy](core-abilities/index.md) page for more details on how we convert a code diff to a manageable LLM prompt
--- a/docs/docs/overview/pr_agent_pro.md
+++ b/docs/docs/overview/pr_agent_pro.md
@ -1,51 +0,0 @@
 ### Overview
 [Qodo Merge Pro](https://www.codium.ai/pricing/) is a hosted version of Qodo Merge, provided by Qodo. A complimentary two-week trial is offered, followed by a monthly subscription fee.
 Qodo Merge Pro is designed for companies and teams that require additional features and capabilities. It provides the following benefits:
 1. **Fully managed** - We take care of everything for you - hosting, models, regular updates, and more. Installation is as simple as signing up and adding the Qodo Merge app to your GitHub\GitLab\BitBucket repo.
 2. **Improved privacy** - No data will be stored or used to train models. Qodo Merge Pro will employ zero data retention, and will use an OpenAI and Claude accounts with zero data retention.
 3. **Improved support** - Qodo Merge Pro users will receive priority support, and will be able to request new features and capabilities.
 4. **Supporting self-hosted git servers** - Qodo Merge Pro can be installed on GitHub Enterprise Server, GitLab, and BitBucket. For more information, see the [installation guide](https://qodo-merge-docs.qodo.ai/installation/pr_agent_pro/).
 5. **PR Chat** - Qodo Merge Pro allows you to engage in [private chat](https://qodo-merge-docs.qodo.ai/chrome-extension/features/#pr-chat) about your pull requests on private repositories.
 ### Additional features
 Here are some of the additional features and capabilities that Qodo Merge Pro offers:
 | 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 `GPT4` and `Claude-Sonnet-3.5`                                                                 
 | [**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 Pro offers detailed statistics at user, repository, and company levels, including metrics about Qodo Merge usage, and also general statistics and insights |
 | [**Incorporating companies' best practices**](https://qodo-merge-docs.qodo.ai/tools/improve/#best-practices)         | Use the companies' best practices as reference to increase the effectiveness and the relevance of the code suggestions                                           |
 | [**Interactive triggering**](https://qodo-merge-docs.qodo.ai/tools/analyze/#example-usage)                           | Interactively apply different tools via the `analyze` command                                                                                                    |
 | [**Custom labels**](https://qodo-merge-docs.qodo.ai/tools/describe/#handle-custom-labels-from-the-repos-labels-page) | Define custom labels for Qodo Merge to assign to the PR                                                                                                            |
 ### Additional tools
 Here are additional tools that are available only for Qodo Merge Pro 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 |
 | [**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 |
 ### Supported languages
 Qodo Merge Pro leverages the world's leading code models - Claude 3.5 Sonnet and GPT-4. 
 As a result, its primary tools such as `describe`, `review`, and `improve`, as well as the PR-chat feature, support virtually all programming languages.
 For specialized commands that require static code analysis, Qodo Merge Pro offers support for specific languages. For more details about features that require static code analysis, please refer to the [documentation](https://qodo-merge-docs.qodo.ai/tools/analyze/#overview).
--- a/docs/docs/tools/analyze.md
+++ b/docs/docs/tools/analyze.md
@ -1,7 +1,7 @@
 ## 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.
+The tool scans the PR code changes, find 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:
 ```
--- a/docs/docs/tools/custom_labels.md
+++ b/docs/docs/tools/custom_labels.md
@ -25,10 +25,10 @@ There are 3 ways to enable custom labels:
 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.
+To enable custom labels, you need to apply the [configuration changes](#configuration-options) to the local `.pr_agent.toml` file in you repository.
 #### 3. Handle custom labels from the Repo's labels page 💎
-> This feature is available only in Qodo Merge Pro 
+> This feature is available only in PR-Agent Pro 
 * GitHub : `https://github.com/{owner}/{repo}/labels`, or click on the "Labels" tab in the issues or PRs page.
 * GitLab : `https://gitlab.com/{owner}/{repo}/-/labels`, or click on "Manage" -> "Labels" on the left menu.
--- a/docs/docs/tools/custom_suggestions.md
+++ b/docs/docs/tools/custom_suggestions.md
@ -1,14 +1,14 @@
 ## Overview
-The `custom_prompt` tool scans the PR code changes, and automatically generates suggestions for improving the PR code.
+The `custom_suggestions` 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.
+It shares similarities with the `improve` tool, but with one main difference: the `custom_suggestions` tool will **only propose suggestions that follow specific guidelines defined by the prompt** in: `pr_custom_suggestions.prompt` configuration.
 The tool can be triggered [automatically](../usage-guide/automations_and_usage.md#github-app-automatic-tools-when-a-new-pr-is-opened) every time a new PR is opened, or can be invoked manually by commenting on a PR.
 When commenting, use the following template:
 ```
-/custom_prompt --pr_custom_prompt.prompt="
+/custom_suggestions --pr_custom_suggestions.prompt="
-The code suggestions should focus only on the following:
+The suggestions should focus only on the following:
 - ...
 - ...
@ -18,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:
 ```
-[pr_custom_prompt]
+[pr_custom_suggestions]
 prompt="""\
 The suggestions should focus only on the following:
 -...
@ -34,9 +34,9 @@ You might benefit from several trial-and-error iterations, until you get the cor
 Here is an example of a possible prompt, defined in the configuration file:
 ```
-[pr_custom_prompt]
+[pr_custom_suggestions]
 prompt="""\
-The code suggestions should focus only on the following:
+The suggestions should focus only on the following:
 - look for edge cases when implementing a new function
 - make sure every variable has a meaningful name
 - make sure the code is efficient
@ -47,12 +47,15 @@ The code suggestions should focus only on the following:
 Results obtained with the prompt above:
-![Custom prompt results](https://codium.ai/images/pr_agent/custom_suggestions_result.png){width=768}
+[//]: # (![Custom suggestions prompt]&#40;https://codium.ai/images/pr_agent/custom_suggestions_prompt.png&#41;{width=512})
 [//]: # (&rarr;)
 ![Custom suggestions results](https://codium.ai/images/pr_agent/custom_suggestions_result.png){width=768}
 ## Configuration options
 `prompt`: the prompt for the tool. It should be a multi-line string.
-`num_code_suggestions`: number of code suggestions provided by the 'custom_prompt' tool. Default is 4.
+`num_code_suggestions`: number of code suggestions provided by the 'custom_suggestions' tool. Default is 4.
 `enable_help_text`: if set to true, the tool will display a help text in the comment. Default is true.
--- a/docs/docs/tools/describe.md
+++ b/docs/docs/tools/describe.md
@ -25,7 +25,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):
+To run the `describe` automatically when a PR is opened, define in a [configuration file](https://pr-agent-docs.codium.ai/usage-guide/configuration_options/#wiki-configuration-file):
 ```
 [github_app]
 pr_commands = [
@ -34,7 +34,7 @@ pr_commands = [
 ]
 [pr_description]
-publish_labels = true
+publish_labels = ...
 ...
 ```
@ -44,61 +44,33 @@ publish_labels = true
 ## Configuration options
 ### General configurations
 !!! example "Possible configurations"
-<table>
+    - `publish_labels`: if set to true, the tool will publish the labels to the PR. Default is true.
  <tr>
    <td><b>publish_labels</b></td>
    <td>If set to true, the tool will publish labels to the PR. Default is false.</td>
  </tr>
  <tr>
    <td><b>publish_description_as_comment</b></td>
    <td>If set to true, the tool will publish the description as a comment to the PR. If false, it will overwrite the original description. Default is false.</td>
  </tr>
  <tr>
    <td><b>publish_description_as_comment_persistent</b></td>
    <td>If set to true and `publish_description_as_comment` is true, the tool will publish the description as a persistent comment to the PR. Default is true.</td>
  </tr>
  <tr>
    <td><b>add_original_user_description</b></td>
    <td>If set to true, the tool will add the original user description to the generated description. Default is true.</td>
  </tr>
  <tr>
    <td><b>generate_ai_title</b></td>
    <td>If set to true, the tool will also generate an AI title for the PR. Default is false.</td>
  </tr>
  <tr>
    <td><b>extra_instructions</b></td>
    <td>Optional extra instructions to the tool. For example: "focus on the changes in the file X. Ignore change in ..."</td>
  </tr>
  <tr>
    <td><b>enable_pr_type</b></td>
    <td>If set to false, it will not show the `PR type` as a text value in the description content. Default is true.</td>
  </tr>
  <tr>
    <td><b>final_update_message</b></td>
    <td>If set to true, it will add a comment message [`PR Description updated to latest commit...`](https://github.com/Codium-ai/pr-agent/pull/499#issuecomment-1837412176) after finishing calling `/describe`. Default is false.</td>
  </tr>
  <tr>
    <td><b>enable_semantic_files_types</b></td>
    <td>If set to true, "Changes walkthrough" section will be generated. Default is true.</td>
  </tr>
  <tr>
    <td><b>collapsible_file_list</b></td>
    <td>If set to true, the file list in the "Changes walkthrough" section will be collapsible. If set to "adaptive", the file list will be collapsible only if there are more than 8 files. Default is "adaptive".</td>
  </tr>
  <tr>
    <td><b>enable_large_pr_handling</b></td>
    <td>Pro feature. If set to true, in case of a large PR the tool will make several calls to the AI and combine them to be able to cover more files. Default is true.</td>
  </tr>
  <tr>
    <td><b>enable_help_text</b></td>
    <td>If set to true, the tool will display a help text in the comment. Default is false.</td>
  </tr>
 </table>
    - `publish_description_as_comment`: if set to true, the tool will publish the description as a comment to the PR. If false, it will overwrite the original description. Default is false.
-## Inline file summary 💎
+    - `publish_description_as_comment_persistent`: if set to true and `publish_description_as_comment` is true, the tool will publish the description as a persistent comment to the PR. Default is true.
    - `add_original_user_description`: if set to true, the tool will add the original user description to the generated description. Default is true.
    - `generate_ai_title`: if set to true, the tool will also generate an AI title for the PR. Default is false.
    - `extra_instructions`: Optional extra instructions to the tool. For example: "focus on the changes in the file X. Ignore change in ...".
    - To enable `custom labels`, apply the configuration changes described [here](./custom_labels.md#configuration-options)
    - `enable_pr_type`: if set to false, it will not show the `PR type` as a text value in the description content. Default is true.
    - `final_update_message`: if set to true, it will add a comment message [`PR Description updated to latest commit...`](https://github.com/Codium-ai/pr-agent/pull/499#issuecomment-1837412176) after finishing calling `/describe`. Default is true.
    - `enable_semantic_files_types`: if set to true, "Changes walkthrough" section will be generated. Default is true.
    - `collapsible_file_list`: if set to true, the file list in the "Changes walkthrough" section will be collapsible. If set to "adaptive", the file list will be collapsible only if there are more than 8 files. Default is "adaptive".
    - `enable_help_text`: if set to true, the tool will display a help text in the comment. Default is false.
 ### 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).
@ -112,7 +84,7 @@ If you prefer to have the file summaries appear in the "Files changed" tab on ev
 ![Diffview table](https://codium.ai/images/pr_agent/diffview-table.png){width=512}
- `true`: A collapsible file comment with changes title and a changes summary for each file in the PR.
+- `true`: A collapsable file comment with changes title and a changes summary for each file in the PR.
 ![Diffview changes](https://codium.ai/images/pr_agent/diffview_changes.png){width=512}
@ -121,7 +93,7 @@ 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
+### 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.
@ -154,41 +126,11 @@ The marker `pr_agent:type` will be replaced with the PR type, `pr_agent:summary`
 - `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.
-Custom labels can be defined in a [configuration file](https://qodo-merge-docs.qodo.ai/tools/custom_labels/#configuration-options), or directly in the repo's [labels page](#handle-custom-labels-from-the-repos-labels-page).
+Custom labels can be defined in a [configuration file](https://pr-agent-docs.codium.ai/tools/custom_labels/#configuration-options), or directly in the repo's [labels page](#handle-custom-labels-from-the-repos-labels-page).
 Make sure to provide proper title, and a detailed and well-phrased description for each label, so the tool will know when to suggest it.
 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
 [custom_labels."sql_changes"]
 description = "Use when a PR contains changes to SQL queries"
 [custom_labels."test"]
 description = "use when a PR primarily contains new tests"
 ...
 ```
 ### Handle custom labels from the Repo's labels page 💎
 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)
 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>
 Examples for custom labels:
@ -198,6 +140,25 @@ Examples for custom labels:
  - `Dockerfile changes` - pr_agent:The PR contains changes in the Dockerfile
  - ...
 The list above is eclectic, and aims to give an idea of different possibilities. Define custom labels that are relevant for your repo and use cases.
 Note that Labels are not mutually exclusive, so you can add multiple label categories.
 <br>
 Make sure to provide proper title, and a detailed and well-phrased description for each label, so the tool will know when to suggest it.
 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 the Repo's labels page 💎
 You can 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)
 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>
 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}
@ -205,7 +166,7 @@ The description should be comprehensive and detailed, indicating when to add the
 ## Usage Tips
 !!! tip "Automation"
-    - When you first install Qodo Merge app, the [default mode](../usage-guide/automations_and_usage.md#github-app) for the describe tool is:
+    - When you first install PR-Agent app, the [default mode](../usage-guide/automations_and_usage.md#github-app) for the describe tool is:
    ```
    pr_commands = ["/describe", ...]
    ```
--- a/docs/docs/tools/help.md
+++ b/docs/docs/tools/help.md
@ -1,6 +1,6 @@
 ## Overview
 The `help` tool provides a list of all the available tools and their descriptions.
-For Qodo Merge Pro users, it also enables to trigger each tool by checking the relevant box.
+For PR-Agent Pro users, it also enables to trigger each tool by checking the relevant box.
 It can be invoked manually by commenting on any PR:
 ```
--- a/docs/docs/tools/improve.md
+++ b/docs/docs/tools/improve.md
@ -1,43 +1,38 @@
 ## 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 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}
 ![code_suggestions_as_comment_open.png](https://codium.ai/images/pr_agent/code_suggestions_as_comment_open.png){width=512}
 Note that the `Apply this suggestion` checkbox, which interactively converts a suggestion into a commitable code comment, is available only for Qodo Merge Pro 💎 users.
 ## Example usage
 ### Manual triggering
 Invoke the tool manually by commenting `/improve` on any PR. The code suggestions by default are presented as a single comment:
 ![code suggestions as comment](https://codium.ai/images/pr_agent/code_suggestions_as_comment.png){width=512}
 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 the suggestions as commitable 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.
+Note that a single 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.
+Also note that collapsible are not supported in _Bitbucket_. Hence, the suggestions are presented there as code comments.
 ### 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):
+To run the `improve` automatically when a PR is opened, define in a [configuration file](https://pr-agent-docs.codium.ai/usage-guide/configuration_options/#wiki-configuration-file):
-```toml
+```
 [github_app]
 pr_commands = [
    "/improve",
@ -45,295 +40,90 @@ pr_commands = [
 ]
 [pr_code_suggestions]
-num_code_suggestions_per_chunk = ...
+num_code_suggestions = ...
 ...
 ```
 - The `pr_commands` lists commands that will be executed automatically when a PR is opened.
 - The `[pr_code_suggestions]` section contains the configurations for the `improve` tool you want to edit (if any)
 ### Assessing Impact 💎
 Note that Qodo Merge pro tracks two types of implementations:
 - Direct implementation - when the user directly applies the suggestion by clicking the `Apply` checkbox.
 - Indirect implementation - when the user implements the suggestion in their IDE environment. In this case, Qodo Merge will utilize, after each commit, a dedicated logic to identify if a suggestion was implemented, and will mark it as implemented.
 ![code_suggestions_asses_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_asses_impact_stats_2](https://codium.ai/images/pr_agent/code_suggestions_asses_impact_stats_2.png){width=512}
 ## Suggestion tracking 💎
 `Platforms supported: GitHub, GitLab`
 Qodo Merge employs an novel detection system to automatically [identify](https://qodo-merge-docs.qodo.ai/core-abilities/impact_evaluation/) AI code suggestions that PR authors have accepted and implemented.
 Accepted suggestions are also automatically documented in a dedicated wiki page called `.pr_agent_accepted_suggestions`, allowing users to track historical changes, assess the tool's effectiveness, and learn from previously implemented recommendations in the repository.
 An example [result](https://github.com/Codium-ai/pr-agent/wiki/.pr_agent_accepted_suggestions):
 [![pr_agent_accepted_suggestions1.png](https://qodo.ai/images/pr_agent/pr_agent_accepted_suggestions1.png){width=768}](https://github.com/Codium-ai/pr-agent/wiki/.pr_agent_accepted_suggestions)
 This dedicated wiki page will also serve as a foundation for future AI model improvements, allowing it to learn from historically implemented suggestions and generate more targeted, contextually relevant recommendations.
 This feature is controlled by a boolean configuration parameter: `pr_code_suggestions.wiki_page_accepted_suggestions` (default is true).
 !!! note "Wiki must be enabled"
    While the aggregation process is automatic, GitHub repositories require a one-time manual wiki setup.
    To initialize the wiki: navigate to `Wiki`, select `Create the first page`, then click `Save page`. 
    ![pr_agent_accepted_suggestions_create_first_page.png](https://qodo.ai/images/pr_agent/pr_agent_accepted_suggestions_create_first_page.png){width=768}
    Once a wiki repo is created, the tool will automatically use this wiki for tracking suggestions.
 !!! note "Why a wiki page?"
    Your code belongs to you, and we respect your privacy. Hence, we won't store any code suggestions in an external database. 
    Instead, we leverage a dedicated private page, within your repository wiki, to track suggestions. This approach offers convenient secure suggestion tracking while avoiding pull requests or any noise to the main repository.
 ## Usage Tips
 ### Implementing the proposed code suggestions
 Each generated suggestion consists of three key elements:
 1. A single-line summary of the proposed change
 2. An expandable section containing a comprehensive description of the suggestion
 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 such cases, we recommend prioritizing the suggestion's detailed description, using the diff snippet primarily as a supporting reference.
 ### 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. 
 This mode helps highlight suggestions deemed more critical.
 To activate dual publishing mode, use the following setting:
 ```toml
 [pr_code_suggestions]
 dual_publishing_score_threshold = x
 ```
 Where x represents the minimum score threshold (>=) for suggestions to be presented as commitable PR comments in addition to the table. Default is -1 (disabled).
 ### Self-review
 If you set in a configuration file:
 ```toml
 [pr_code_suggestions]
 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) ..."
 ```
 ![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)
    can be used to automatically fold the suggestions after the user clicks the self-review checkbox.
    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:
    ```toml
    [pr_code_suggestions]
    approve_pr_on_self_review = true
    ```
    the tool can automatically add an approval when the PR author clicks the self-review checkbox.
    - If you set the number of required reviewers for a PR to 2, this effectively means that the PR author must click the self-review checkbox before the PR can be merged (in addition to a human reviewer).
    ![self_review_2](https://codium.ai/images/pr_agent/self_review_2.png){width=512}
    - If you keep the number of required reviewers for a PR to 1 and enable this configuration, this effectively means that the PR author can approve the PR by actively clicking the self-review checkbox.
        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.
 ### 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).
 2) Generating suggestions:
 - For each chunk, Qodo Merge generates up to `pr_code_suggestions.num_code_suggestions_per_chunk` suggestions (default: 4).
 This approach has two main benefits:
 - Scalability: The number of suggestions scales with the PR size, rather than being fixed.
 - 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.
 ### 'Extra instructions' and 'best practices'
 #### Extra instructions
 >`Platforms supported: GitHub, GitLab, Bitbucket`
 You can use the `extra_instructions` configuration option to give the AI model additional instructions for the `improve` tool.
 Be specific, clear, and concise in the instructions. With extra instructions, you are the prompter. Specify relevant aspects that you want the model to focus on.
 Examples for possible instructions:
 ```toml
 [pr_code_suggestions]
 extra_instructions="""\
 (1) Answer in japanese
 (2) Don't suggest to add try-excpet 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 💎
 >`Platforms supported: GitHub, GitLab`
 Another option to give additional guidance to the AI model is by creating a dedicated [**wiki page**](https://github.com/Codium-ai/pr-agent/wiki) called `best_practices.md`. 
 This page can contain a list of best practices, coding standards, and guidelines that are specific to your repo/organization.
 The AI model will use this wiki page as a reference, and in case the PR code violates any of the guidelines, it will suggest improvements accordingly, with a dedicated label: `Organization
 best practice`. 
 Example for a `best_practices.md` content can be found [here](https://github.com/Codium-ai/pr-agent/blob/main/docs/docs/usage-guide/EXAMPLE_BEST_PRACTICE.md) (adapted from Google's [pyguide](https://google.github.io/styleguide/pyguide.html)).
 This file is only an example. Since it is used as a prompt for an AI model, we want to emphasize the following:
 - It should be written in a clear and concise manner
 - If needed, it should give short relevant code snippets as examples
 - Recommended to limit the text to 800 lines or fewer. Here’s why:
     1) Extremely long best practices documents may not be fully processed by the AI model.
     2) A lengthy file probably represent a more "**generic**" set of guidelines, which the AI model is already familiar with. The objective is to focus on a more targeted set of guidelines tailored to the specific needs of this project.
 ##### Local and global best practices
 By default, Qodo Merge will look for a local `best_practices.md` wiki file in the root of the relevant local repo.
 If you want to enable also a global `best_practices.md` wiki file, set first in the global configuration file:
 ```toml
 [best_practices]
 enable_global_best_practices = true
 ```
 Then, create a `best_practices.md` wiki file in the root of [global](https://qodo-merge-docs.qodo.ai/usage-guide/configuration_options/#global-configuration-file) configuration repository,  `pr-agent-settings`.
 ##### Example results
 ![best_practice](https://codium.ai/images/pr_agent/org_best_practice.png){width=512}
 #### How to combine `extra instructions` and `best practices`
 The `extra instructions` configuration is more related to the `improve` tool prompt. It can be used, for example, to avoid specific suggestions ("Don't suggest to add try-except block", "Ignore changes in toml files", ...) or to emphasize specific aspects or formats ("Answer in Japanese", "Give only short suggestions", ...)
 In contrast, the `best_practices.md` file is a general guideline for the way code should be written in the repo.
 Using a combination of both can help the AI model to provide relevant and tailored suggestions.
 ## Configuration options
-??? example "General options"
+!!! example "General options"
-    <table>
+    - `num_code_suggestions`: number of code suggestions provided by the 'improve' tool. Default is 4 for CLI, 0 for auto tools.
-      <tr>
+    - `extra_instructions`: Optional extra instructions to the tool. For example: "focus on the changes in the file X. Ignore change in ...".
-        <td><b>extra_instructions</b></td>
+    - `rank_suggestions`: if set to true, the tool will rank the suggestions, based on importance. Default is false.
-        <td>Optional extra instructions to the tool. For example: "focus on the changes in the file X. Ignore change in ...".</td>
+    - `commitable_code_suggestions`: if set to true, the tool will display the suggestions as commitable code comments. Default is false.
-      </tr>
+    - `persistent_comment`: if set to true, the improve comment will be persistent, meaning that every new improve request will edit the previous one. Default is false.
-      <tr>
+    - `enable_help_text`: if set to true, the tool will display a help text in the comment. Default is true.
        <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>
      </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>
      </tr>
      <tr>
        <td><b>persistent_comment</b></td>
        <td>If set to true, the improve comment will be persistent, meaning that every new improve request will edit the previous one. Default is false.</td>
      </tr>
      <tr>
        <td><b>self_reflect_on_suggestions</b></td>
        <td>If set to true, the improve tool will calculate an importance score for each suggestion [1-10], and sort the suggestion labels group based on this score. Default is true.</td>
      </tr>
      <tr>
        <td><b>suggestions_score_threshold</b></td>
        <td> Any suggestion with importance score less than this threshold will be removed. Default is 0. Highly recommend not to set this value above 7-8, since above it may clip relevant suggestions that can be useful. </td>
      </tr>
      <tr>
        <td><b>apply_suggestions_checkbox</b></td>
        <td> Enable the checkbox to create a committable suggestion. Default is true.</td>
      </tr>
      <tr>
        <td><b>enable_help_text</b></td>
        <td>If set to true, the tool will display a help text in the comment. Default is true.</td>
      </tr>
      <tr>
        <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>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>
      </tr>
    </table>
-??? example "Params for number of suggestions and AI calls"
+!!! example "params for '/improve --extended' mode"
-    <table>
+    - `auto_extended_mode`: enable extended mode automatically (no need for the `--extended` option). Default is true.
-      <tr>
+    - `num_code_suggestions_per_chunk`: number of code suggestions provided by the 'improve' tool, per chunk. Default is 5.
-        <td><b>auto_extended_mode</b></td>
+    - `rank_extended_suggestions`: if set to true, the tool will rank the suggestions, based on importance. Default is true.
-        <td>Enable chunking the PR code and running the tool on each chunk. Default is true.</td>
+    - `max_number_of_calls`: maximum number of chunks. Default is 5.
-      </tr>
+    - `final_clip_factor`: factor to remove suggestions with low confidence. Default is 0.9.;
-      <tr>
+
-        <td><b>num_code_suggestions_per_chunk</b></td>
+## Extended mode
-        <td>Number of code suggestions provided by the 'improve' tool, per chunk. Default is 4.</td>
+
-      </tr>
+An extended mode, which does not involve PR Compression and provides more comprehensive suggestions, can be invoked by commenting on any PR:
-      <tr>
+```
-        <td><b>max_number_of_calls</b></td>
+/improve --extended
-        <td>Maximum number of chunks. Default is 3.</td>
+```
-      </tr>
+
-      <tr>
+or by setting:
-        <td><b>rank_extended_suggestions</b></td>
+```
-        <td>If set to true, the tool will rank the suggestions, based on importance. Default is true.</td>
+[pr_code_suggestions]
-      </tr>
+auto_extended_mode=true
-    </table>
+```
 (True by default).
 Note that the extended mode divides the PR code changes into chunks, up to the token limits, where each chunk is handled separately (might use multiple calls to GPT-4 for large PRs).
 Hence, the total number of suggestions is proportional to the number of chunks, i.e., the size of the PR.
 ## Usage Tips
 !!! tip "Extra instructions"
    Extra instructions are very important for the `imrpove` tool, since they enable you to guide the model to suggestions that are more relevant to the specific needs of the project.
    Be specific, clear, and concise in the instructions. With extra instructions, you are the prompter. Specify relevant aspects that you want the model to focus on.
    Examples for extra instructions:
    ```
    [pr_code_suggestions] # /improve #
    extra_instructions="""\
    Emphasize the following aspects:
    - Does the code logic cover relevant edge cases?
    - Is the code logic clear and easy to understand?
    - Is the code logic efficient?
    ...
    """
    ```
    Use triple quotes to write multi-line instructions. Use bullet points to make the instructions more readable.
 !!! tip "Review vs. Improve tools comparison"
    - The [`review`](https://pr-agent-docs.codium.ai/tools/review/) tool includes a section called 'Possible issues', that also provide feedback on the PR Code.
    In this section, the model is instructed to focus **only** on [major bugs and issues](https://github.com/Codium-ai/pr-agent/blob/main/pr_agent/settings/pr_reviewer_prompts.toml#L71).
    - The `improve` tool, on the other hand, has a broader mandate, and in addition to bugs and issues, it can also give suggestions for improving code quality and making the code more efficient, readable, and maintainable (see [here](https://github.com/Codium-ai/pr-agent/blob/main/pr_agent/settings/pr_code_suggestions_prompts.toml#L34)).
    - Hence, if you are interested only in feedback about clear bugs, the `review` tool might suffice. If you want a more detailed feedback, including broader suggestions for improving the PR code, also enable the `improve` tool to run on each PR.
 ## A note on code suggestions quality
- AI models for code are getting better and better (Sonnet-3.5 and GPT-4), but they are not flawless. Not all the suggestions will be perfect, and a user should not accept all of them automatically. Critical reading and judgment are required.
+- While the current AI for code is getting better and better (GPT-4), it's not flawless. Not all the suggestions will be perfect, and a user should not accept all of them automatically. Critical reading and judgment are required.
- While mistakes of the AI are rare but can happen, a real benefit from the suggestions of the `improve` (and [`review`](https://qodo-merge-docs.qodo.ai/tools/review/)) tool is to catch, with high probability, **mistakes or bugs done by the PR author**, when they happen. So, it's a good practice to spend the needed ~30-60 seconds to review the suggestions, even if not all of them are always relevant.
+- While mistakes of the AI are rare but can happen, a real benefit from the suggestions of the `improve` (and [`review`](https://pr-agent-docs.codium.ai/tools/review/)) tool is to catch, with high probability, **mistakes or bugs done by the PR author**, when they happen. So, it's a good practice to spend the needed ~30-60 seconds to review the suggestions, even if not all of them are always relevant.
 - The hierarchical structure of the suggestions is designed to help the user to _quickly_ understand them, and to decide which ones are relevant and which are not:
    - Only if the `Category` header is relevant, the user should move to the summarized suggestion description
    - Only if the summarized suggestion description is relevant, the user should click on the collapsible, to read the full suggestion description with a code preview example.
- In addition, we recommend to use the [`extra_instructions`](https://qodo-merge-docs.qodo.ai/tools/improve/#extra-instructions-and-best-practices) field to guide the model to suggestions that are more relevant to the specific needs of the project. 
+In addition, we recommend to use the `exra_instructions` field to guide the model to suggestions that are more relevant to the specific needs of the project. 
- 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.
+<br>
 Consider also trying the [Custom Suggestions Tool](./custom_suggestions.md) 💎, that will **only** propose suggestions that follow specific guidelines defined by user.
--- a/docs/docs/tools/index.md
+++ b/docs/docs/tools/index.md
@ -1,6 +1,6 @@
 # Tools
-Here is a list of Qodo Merge tools, each with a dedicated page that explains how to use it:
+Here is a list of PR-Agent tools, each with a dedicated page that explains how to use it:
 | Tool                                                                                     | Description                                                                                                                                 |
 |------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------|
@ -14,9 +14,9 @@ Here is a list of Qodo Merge tools, each with a dedicated page that explains how
 | **💎 [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 |
-| **💎 [Custom Prompt (`/custom_prompt`](./custom_prompt.md))**                            | Automatically generates custom suggestions for improving the PR code, based on specific guidelines defined by the user                      |
+| **💎 [Custom Suggestions (`/custom_suggestions`](./custom_suggestions.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                                                                           |
-Note that the tools marked with 💎 are available only for Qodo Merge Pro users.
+Note that the tools marked with 💎 are available only for PR-Agent Pro users.
--- a/docs/docs/tools/review.md
+++ b/docs/docs/tools/review.md
@ -1,16 +1,10 @@
 ## Overview
-The `review` tool scans the PR code changes, and generates a list of feedbacks about the PR, aiming to aid the reviewing process.
+The `review` tool scans the PR code changes, and automatically generates a PR review.
 <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
 ```
 Note that the main purpose of the `review` tool is to provide the **PR reviewer** with useful feedbacks and insights. The PR author, in contrast, may prefer to save time and focus on the output of the [improve](./improve.md) tool, which provides actionable code suggestions.
 (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
@ -30,7 +24,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):
+To run the `review` automatically when a PR is opened, define in a [configuration file](https://pr-agent-docs.codium.ai/usage-guide/configuration_options/#wiki-configuration-file):
 ```
 [github_app]
 pr_commands = [
@ -46,153 +40,96 @@ num_code_suggestions = ...
 - 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).
 [//]: # ()
 [//]: # (### Incremental Mode)
 [//]: # (Incremental review only considers changes since the last Qodo Merge review. This can be useful when working on the PR in an iterative manner, and you want to focus on the changes since the last review instead of reviewing the entire PR again.)
 [//]: # (For invoking the incremental mode, the following command can be used:)
 [//]: # (```)
 [//]: # (/review -i)
 [//]: # (```)
 [//]: # (Note that the incremental mode is only available for GitHub.)
 [//]: # ()
 [//]: # (![incremental review]&#40;https://codium.ai/images/pr_agent/incremental_review_2.png&#41;{width=512})
 [//]: # (### PR Reflection)
 [//]: # ()
 [//]: # (By invoking:)
 [//]: # (```)
 [//]: # (/reflect_and_review)
 [//]: # (```)
 [//]: # (The tool will first ask the author questions about the PR, and will guide the review based on their answers.)
 [//]: # ()
 [//]: # (![reflection questions]&#40;https://codium.ai/images/pr_agent/reflection_questions.png&#41;{width=512})
 [//]: # ()
 [//]: # (![reflection answers]&#40;https://codium.ai/images/pr_agent/reflection_answers.png&#41;{width=512})
 [//]: # ()
 [//]: # (![reflection insights]&#40;https://codium.ai/images/pr_agent/reflection_insights.png&#41;{width=512})
 ## Configuration options
 ### General configurations
 !!! example "General options"
    - <a name="num_code_suggestions"></a>`num_code_suggestions`: number of code suggestions provided by the 'review' tool. For manual comments, default is 4. For [PR-Agent app](https://github.com/Codium-ai/pr-agent/blob/main/pr_agent/settings/configuration.toml#L142) auto tools, default is 0, meaning no code suggestions will be provided by the review tool, unless you manually edit `pr_commands`.
    - <a name="inline_code_comments"></a>`inline_code_comments`: if set to true, the tool will publish the code suggestions as comments on the code diff. Default is false.
    - <a name="persistent_comment"></a>`persistent_comment`: if set to true, the review comment will be persistent, meaning that every new review request will edit the previous one. Default is true.
    - <a name="extra_instructions"></a>`extra_instructions`: Optional extra instructions to the tool. For example: "focus on the changes in the file X. Ignore change in ...".
    - <a name="enable_help_text"></a>`enable_help_text`: if set to true, the tool will display a help text in the comment. Default is true.
-<table>
+!!! example "Enable\\disable sub-sections"
-  <tr>
+    You can enable or disable specific sub-sections of the review tool:
    <td><b>num_code_suggestions</b></td>
    <td>Number of code suggestions provided by the 'review' tool. Default is 0, meaning no code suggestions will be provided by the `review` tool.</td>
  </tr>
  <tr>
    <td><b>inline_code_comments</b></td>
    <td>If set to true, the tool will publish the code suggestions as comments on the code diff. Default is false. Note that you need to set `num_code_suggestions`>0 to get code suggestions </td>
  </tr>
  <tr>
    <td><b>persistent_comment</b></td>
    <td>If set to true, the review comment will be persistent, meaning that every new review request will edit the previous one. Default is true.</td>
  </tr>
  <tr>
    <td><b>extra_instructions</b></td>
    <td>Optional extra instructions to the tool. For example: "focus on the changes in the file X. Ignore change in ...".</td>
  </tr>
  <tr>
    <td><b>enable_help_text</b></td>
    <td>If set to true, the tool will display a help text in the comment. Default is true.</td>
  </tr>
 </table>
-!!! example "Enable\\disable specific sub-sections"
+    - <a name="require_score_review"></a>`require_score_review`: if set to true, the tool will add a section that scores the PR. Default is false.
    - <a name="require_tests_review"></a>`require_tests_review`: if set to true, the tool will add a section that checks if the PR contains tests. Default is true.
    - <a name="require_estimate_effort_to_review"></a>`require_estimate_effort_to_review`: if set to true, the tool will add a section that estimates the effort needed to review the PR. Default is true.
    - <a name="require_can_be_split_review"></a>`require_can_be_split_review`: if set to true, the tool will add a section that checks if the PR contains several themes, and can be split into smaller PRs. Default is false.
-<table>
+!!! example "SOC2 ticket compliance 💎"
-  <tr>
+
-    <td><b>require_score_review</b></td>
+    This sub-tool checks if the PR description properly contains a ticket to a project management system (e.g., Jira, Asana, Trello, etc.), as required by SOC2 compliance. If not, it will add a label to the PR: "Missing SOC2 ticket".
-    <td>If set to true, the tool will add a section that scores the PR. Default is false.</td>
+    
-  </tr>
+    - <a name="require_soc2_ticket"></a>`require_soc2_ticket`: If set to true, the SOC2 ticket checker sub-tool will be enabled. Default is false.
-  <tr>
+    - <a name="soc2_ticket_prompt"></a>`soc2_ticket_prompt`: The prompt for the SOC2 ticket review. Default is: `Does the PR description include a link to ticket in a project management system (e.g., Jira, Asana, Trello, etc.) ?`. Edit this field if your compliance requirements are different.
    <td><b>require_tests_review</b></td>
    <td>If set to true, the tool will add a section that checks if the PR contains tests. Default is true.</td>
  </tr>
  <tr>
    <td><b>require_estimate_effort_to_review</b></td>
    <td>If set to true, the tool will add a section that estimates the effort needed to review the PR. Default is true.</td>
  </tr>
  <tr>
    <td><b>require_can_be_split_review</b></td>
    <td>If set to true, the tool will add a section that checks if the PR contains several themes, and can be split into smaller PRs. Default is false.</td>
  </tr>
  <tr>
    <td><b>require_security_review</b></td>
    <td>If set to true, the tool will add a section that checks if the PR contains a possible security or vulnerability issue. Default is true.</td>
  </tr>
  <tr>
    <td><b>require_ticket_analysis_review</b></td>
    <td>If set to true, and the PR contains a GitHub ticket number, the tool will add a section that checks if the PR in fact fulfilled the ticket requirements. Default is true.</td>
  </tr>
 </table>
 !!! example "Adding PR labels"
    You can enable the tool to add specific labels to the PR:
-You can enable\disable the `review` tool to add specific labels to the PR:
+    - <a name="enable_review_labels_security"></a>`enable_review_labels_security`: if set to true, the tool will publish a 'possible security issue' label if it detects a security issue. Default is true.
-
+    - <a name="enable_review_labels_effort"></a>`enable_review_labels_effort`: if set to true, the tool will publish a 'Review effort [1-5]: x' label. Default is true.
 <table>
  <tr>
    <td><b>enable_review_labels_security</b></td>
    <td>If set to true, the tool will publish a 'possible security issue' label if it detects a security issue. Default is true.</td>
  </tr>
  <tr>
    <td><b>enable_review_labels_effort</b></td>
    <td>If set to true, the tool will publish a 'Review effort [1-5]: x' label. Default is true.</td>
  </tr>
 </table>
 !!! example "Auto-approval"
    The review tool can approve a PR when a specific comment, `/review auto_approve` is invoked.
-If enabled, the `review` tool can approve a PR when a specific comment, `/review auto_approve`, is invoked.
+    - <a name="enable_auto_approval"></a>`enable_auto_approval`: if set to true, the tool will approve the PR when invoked with the 'auto_approve' command. Default is false. This flag can be changed only from configuration file.
    - <a name="maximal_review_effort"></a>`maximal_review_effort`: maximal effort level for auto-approval. If the PR's estimated review effort is above this threshold, the auto-approval will not run. Default is 5.
 ### Incremental Mode
 Incremental review only considers changes since the last PR-Agent review. This can be useful when working on the PR in an iterative manner, and you want to focus on the changes since the last review instead of reviewing the entire PR again.
 For invoking the incremental mode, the following command can be used:
 ```
 /review -i
 ```
 Note that the incremental mode is only available for GitHub.
 ![incremental review](https://codium.ai/images/pr_agent/incremental_review_2.png){width=512}
 ### PR Reflection
 By invoking:
 ```
 /reflect_and_review
 ```
 The tool will first ask the author questions about the PR, and will guide the review based on their answers.
 ![reflection questions](https://codium.ai/images/pr_agent/reflection_questions.png){width=512}
 ![reflection answers](https://codium.ai/images/pr_agent/reflection_answers.png){width=512}
 ![reflection insights](https://codium.ai/images/pr_agent/reflection_insights.png){width=512}
 <table>
  <tr>
    <td><b>enable_auto_approval</b></td>
    <td>If set to true, the tool will approve the PR when invoked with the 'auto_approve' command. Default is false. This flag can be changed only from a configuration file.</td>
  </tr>
  <tr>
    <td><b>maximal_review_effort</b></td>
    <td>Maximal effort level for auto-approval. If the PR's estimated review effort is above this threshold, the auto-approval will not run. Default is 5.</td>
  </tr>
 </table>
 ## Usage Tips
 !!! tip "General guidelines"
-    The `review` tool provides a collection of configurable feedbacks about a PR.
+    The `review` tool provides a collection of possible feedbacks about a PR.
    It is recommended to review the [Configuration options](#configuration-options) section, and choose the relevant options for your use case.
    Some of the features that are disabled by default are quite useful, and should be considered for enabling. For example: 
-    `require_score_review`, and more.
+    `require_score_review`, `require_soc2_ticket`, and more.
    On the other hand, if you find one of the enabled features to be irrelevant for your use case, disable it. No default configuration can fit all use cases.
 !!! tip "Automation"
-    When you first install Qodo Merge app, the [default mode](../usage-guide/automations_and_usage.md#github-app-automatic-tools-when-a-new-pr-is-opened) for the `review` tool is:
+    When you first install PR-Agent app, the [default mode](../usage-guide/automations_and_usage.md#github-app-automatic-tools-when-a-new-pr-is-opened) for the `review` tool is:
    ```
    pr_commands = ["/review --pr_reviewer.num_code_suggestions=0", ...]
    ```
    Meaning the `review` tool will run automatically on every PR, without providing code suggestions.
-    Edit this field to enable/disable the tool, or to change the configurations used.
+    Edit this field to enable/disable the tool, or to change the used configurations.
 !!! tip  "Code suggestions"
    If you set `num_code_suggestions`>0 , the `review` tool will also provide code suggestions.
    Notice If you are interested **only** in the code suggestions, it is recommended to use the [`improve`](./improve.md) feature instead, since it is a dedicated only to code suggestions, and usually gives better results.
    Use the `review` tool if you want to get more comprehensive feedback, which includes code suggestions as well.
 !!! tip "Possible labels from the review tool"
@ -210,7 +147,7 @@ If enabled, the `review` tool can approve a PR when a specific comment, `/review
    Be specific, clear, and concise in the instructions. With extra instructions, you are the prompter. Specify the relevant sub-tool, and the relevant aspects of the PR that you want to emphasize.
-    Examples of extra instructions:
+    Examples for extra instructions:
    ```
    [pr_reviewer]
    extra_instructions="""\
@ -226,7 +163,7 @@ If enabled, the `review` tool can approve a PR when a specific comment, `/review
 !!! tip "Auto-approval"
-    Qodo Merge can approve a PR when a specific comment is invoked.
+    PR-Agent can approve a PR when a specific comment is invoked.
    To ensure safety, the auto-approval feature is disabled by default. To enable auto-approval, you need to actively set in a pre-defined configuration file the following:
    ```
@ -240,7 +177,7 @@ If enabled, the `review` tool can approve a PR when a specific comment, `/review
    ```
    /review auto_approve
    ```
-    Qodo Merge will automatically approve the PR, and add a comment with the approval.
+    PR-Agent will automatically approve the PR, and add a comment with the approval.
    You can also enable auto-approval only if the PR meets certain requirements, such as that the `estimated_review_effort` label is equal or below a certain threshold, by adjusting the flag:
@ -248,14 +185,3 @@ If enabled, the `review` tool can approve a PR when a specific comment, `/review
    [pr_reviewer]
    maximal_review_effort = 5
    ```
 [//]: # (!!! tip  "Code suggestions")
 [//]: # ()
 [//]: # (    If you set `num_code_suggestions`>0 , the `review` tool will also provide code suggestions.)
 [//]: # (    )
 [//]: # (    Notice If you are interested **only** in the code suggestions, it is recommended to use the [`improve`]&#40;./improve.md&#41; feature instead, since it is a dedicated only to code suggestions, and usually gives better results.)
 [//]: # (    Use the `review` tool if you want to get more comprehensive feedback, which includes code suggestions as well.)
--- a/docs/docs/tools/similar_code.md
+++ b/docs/docs/tools/similar_code.md
@ -8,9 +8,9 @@ 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:
+PR-Agent 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.
+- `extracted keywords`: the keywords that were extracted from the code by PR-Agent. the link will open a search page with the extracted keywords, to allow the user to modify the search if needed.
 - `search context`: the context in which the search will be performed, organization's codebase or open-source code (Global).
 - `similar code`: the most similar code components found. the link will open the code component in the relevant file.
 - `relevant repositories`: the open-source repositories in which that are relevant to the searched code component and it's keywords.
--- a/docs/docs/tools/similar_issues.md
+++ b/docs/docs/tools/similar_issues.md
@ -33,7 +33,7 @@ environment = "..."
 These parameters can be obtained by registering to [Pinecone](https://app.pinecone.io/?sessionType=signup/).
-## How to use
+## How to use:
 - To invoke the 'similar issue' tool from **CLI**, run:
 `python3 cli.py --issue_url=... similar_issue`
--- a/docs/docs/tools/test.md
+++ b/docs/docs/tools/test.md
@ -10,10 +10,14 @@ To get a list of the components that changed in the PR and choose the relevant c
 ## Example usage
 Invoke the tool manually by commenting `/test` on any PR:
 ![test1](https://codium.ai/images/pr_agent/test1.png){width=704}
 The tool will generate tests for the selected component (if no component is stated, it will generate tests for largest component):
-![test1](https://codium.ai/images/pr_agent/test1.png){width=768}
+![test2](https://codium.ai/images/pr_agent/test2.png){width=768}
 ![test3](https://codium.ai/images/pr_agent/test3.png){width=768}
 (Example taken from [here](https://github.com/Codium-ai/pr-agent/pull/598#issuecomment-1913679429)):
--- a/docs/docs/usage-guide/EXAMPLE_BEST_PRACTICE.md
+++ b/docs/docs/usage-guide/EXAMPLE_BEST_PRACTICE.md
@ -1,189 +0,0 @@
 ## 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
 Use  `import`  statements for packages and modules only, not for individual types, classes, or functions.
 #### Definition
 Reusability mechanism for sharing code from one module to another.
 ####  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`).
 For example the module  `sound.effects.echo`  may be imported as follows:
 ```
 from sound.effects import echo
 ...
 echo.EchoFilter(input, output, delay=0.7, atten=4)
 ```
 Do not use relative names in imports. Even if the module is in the same package, use the full package name. This helps prevent unintentionally importing a package twice.
 ##### Exemptions
 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).
 ###  Packages
 Import each module using the full pathname location of the module.
 #### Decision
 All new code should import each module by its full package name.
 Imports should be as follows:
 ```
 Yes:
  # Reference absl.flags in code with the complete name (verbose).
  import absl.flags
  from doctor.who import jodie
  _FOO = absl.flags.DEFINE_string(...)
 ```
 ```
 Yes:
  # Reference flags in code with just the module name (common).
  from absl import flags
  from doctor.who import jodie
  _FOO = flags.DEFINE_string(...)
 ```
 _(assume this file lives in  `doctor/who/`  where  `jodie.py`  also exists)_
 ```
 No:
  # Unclear what module the author wanted and what will be imported.  The actual
  # import behavior depends on external factors controlling sys.path.
  # Which possible jodie module did the author intend to import?
  import jodie
 ```
 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
 Container types, like dictionaries and lists, define default iterators and membership test operators (“in” and “not in”).
 #### Decision
 Use default iterators and operators for types that support them, like lists, dictionaries, and files. The built-in types define iterator methods, too. Prefer these methods to methods that return lists, except that you should not mutate a container while iterating over it.
 ```
 Yes:  for key in adict: ...
      if obj in alist: ...
      for line in afile: ...
      for k, v in adict.items(): ...
 ```
 ```
 No:   for key in adict.keys(): ...
      for line in afile.readlines(): ...
 ```
 ### Lambda Functions
 Okay for one-liners. Prefer generator expressions over  `map()`  or  `filter()`  with a  `lambda`.
 #### Decision
 Lambdas are allowed. If the code inside the lambda function spans multiple lines or is longer than 60-80 chars, it might be better to define it as a regular  [nested function](https://google.github.io/styleguide/pyguide.html#lexical-scoping).
 For common operations like multiplication, use the functions from the  `operator`  module instead of lambda functions. For example, prefer  `operator.mul`  to  `lambda x, y: x * y`.
 ### Default Argument Values
 Okay in most cases.
 #### Definition
 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
 Okay to use with the following caveat:
 Do not use mutable objects as default values in the function or method definition.
 ```
 Yes: def foo(a, b=None):
         if b is None:
             b = []
 Yes: def foo(a, b: Sequence | None = None):
         if b is None:
             b = []
 Yes: def foo(a, b: Sequence = ()):  # Empty tuple OK since tuples are immutable.
         ...
 ```
 ```
 from absl import flags
 _FOO = flags.DEFINE_string(...)
 No:  def foo(a, b=[]):
         ...
 No:  def foo(a, b=time.time()):  # Is `b` supposed to represent when this module was loaded?
         ...
 No:  def foo(a, b=_FOO.value):  # sys.argv has not yet been parsed...
         ...
 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
 Okay to use.
 An example of the use of this feature is:
 ```
 def get_adder(summand1: float) -> Callable[[float], float]:
    """Returns a function that adds numbers to a given number."""
    def adder(summand2: float) -> float:
        return summand1 + summand2
    return adder
 ```
 #### Decision
 Okay to use.
 ### Threading
 Do not rely on the atomicity of built-in types.
 While Python’s built-in data types such as dictionaries appear to have atomic operations, there are corner cases where they aren’t atomic (e.g. if  `__hash__`  or  `__eq__`  are implemented as Python methods) and their atomicity should not be relied upon. Neither should you rely on atomic variable assignment (since this in turn depends on dictionaries).
 Use the  `queue`  module’s  `Queue`  data type as the preferred way to communicate data between threads. Otherwise, use the  `threading`  module and its locking primitives. Prefer condition variables and  `threading.Condition`  instead of using lower-level locks.
--- a/docs/docs/usage-guide/PR_agent_pro_models.md
+++ b/docs/docs/usage-guide/PR_agent_pro_models.md
@ -1,18 +0,0 @@
 ## Qodo Merge Pro Models
 The default models used by Qodo Merge Pro are a combination of Claude-3.5-sonnet and  OpenAI's GPT-4 models.
 Users can configure Qodo Merge Pro to use solely a specific model by editing the [configuration](https://qodo-merge-docs.qodo.ai/usage-guide/configuration_options/) file.
 For example, to restrict Qodo Merge Pro to using only `Claude-3.5-sonnet`, add this setting:
 ```
 [config]
 model="claude-3-5-sonnet"
 ```
 Or to restrict Qodo Merge Pro to using only `GPT-4o`, add this setting:
 ```
 [config]
 model="gpt-4o"
 ```
--- a/docs/docs/usage-guide/additional_configurations.md
+++ b/docs/docs/usage-guide/additional_configurations.md
@ -1,58 +1,24 @@
 ## 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).
 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.
+In some cases, you may want to exclude specific files or directories from the analysis performed by CodiumAI PR-Agent. This can be useful, for example, when you have files that are generated automatically or files that shouldn't be reviewed, like vendored code.
 To ignore files or directories, edit the **[ignore.toml](https://github.com/Codium-ai/pr-agent/blob/main/pr_agent/settings/ignore.toml)** configuration file. This setting also exposes the following environment variables:
 You can ignore files or folders using the following methods:
 - `IGNORE.GLOB`
 - `IGNORE.REGEX`
-which you can edit to ignore files or folders based on glob or regex patterns.
+For example, to ignore Python files in a PR with online usage, comment on a PR:
 `/review --ignore.glob=['*.py']`
-### Example usage
+To ignore Python files in all PRs, set in a configuration file:
 Let's look at an example where we want to ignore all files with `.py` extension from the analysis.
 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$']
 ```
 ## Extra instructions
-All Qodo Merge tools have a parameter called `extra_instructions`, that enables to add free-text extra instructions. Example usage:
+All PR-Agent 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 ..."
 ```
@ -64,11 +30,173 @@ This mode provides a very good speed-quality-cost tradeoff, and can handle most
 When the PR is above the token limit, it employs a [PR Compression strategy](../core-abilities/index.md).
 However, for very large PRs, or in case you want to emphasize quality over speed and cost, there are two possible solutions:
-1) [Use a model](https://qodo-merge-docs.qodo.ai/usage-guide/changing_a_model/) with larger context, like GPT-32K, or claude-100K. This solution will be applicable for all the tools.
+1) [Use a model](https://codium-ai.github.io/Docs-PR-Agent/usage-guide/#changing-a-model) with larger context, like GPT-32K, or claude-100K. This solution will be applicable for all the tools.
-2) For the `/improve` tool, there is an ['extended' mode](https://qodo-merge-docs.qodo.ai/tools/improve/) (`/improve --extended`),
+2) For the `/improve` tool, there is an ['extended' mode](https://codium-ai.github.io/Docs-PR-Agent/tools/#improve) (`/improve --extended`),
-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)
+which divides the PR to 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)
 ## Changing a model
 See [here](https://github.com/Codium-ai/pr-agent/blob/main/pr_agent/algo/__init__.py) for the list of available models.
 To use a different model than the default (GPT-4), you need to edit [configuration file](https://github.com/Codium-ai/pr-agent/blob/main/pr_agent/settings/configuration.toml#L2).
 For models and environments not from OPENAI, you might need to provide additional keys and other parameters. See below for instructions.
 ### 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):
 ```
 [openai]
 key = "" # your azure api key
 api_type = "azure"
 api_version = '2023-05-15'  # Check Azure documentation for the current API version
 api_base = ""  # The base URL for your Azure OpenAI resource. e.g. "https://<your resource name>.openai.azure.com"
 deployment_id = ""  # The deployment name you chose when you deployed the engine
 ```
 and set in your configuration file:
 ```
 [config]
 model="" # the OpenAI model you've deployed on Azure (e.g. gpt-3.5-turbo)
 ```
 ### Huggingface
 **Local**
 You can run Huggingface 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 Huggingface model locally via Ollama, set:
 ```
 [__init__.py]
 MAX_TOKENS = {
    "model-name-on-ollama": <max_tokens>
 }
 e.g.
 MAX_TOKENS={
    ...,
    "ollama/llama2": 4096
 }
 [config] # in configuration.toml
 model = "ollama/llama2"
 model_turbo = "ollama/llama2"
 [ollama] # in .secrets.toml
 api_base = ... # the base url for your huggingface inference endpoint
 # e.g. if running Ollama locally, you may use:
 api_base = "http://localhost:11434/"
 ```
 ### Inference Endpoints
 To use a new model with Huggingface Inference Endpoints, for example, set:
 ```
 [__init__.py]
 MAX_TOKENS = {
    "model-name-on-huggingface": <max_tokens>
 }
 e.g.
 MAX_TOKENS={
    ...,
    "meta-llama/Llama-2-7b-chat-hf": 4096
 }
 [config] # in configuration.toml
 model = "huggingface/meta-llama/Llama-2-7b-chat-hf"
 model_turbo = "huggingface/meta-llama/Llama-2-7b-chat-hf"
 [huggingface] # in .secrets.toml
 key = ... # your huggingface api key
 api_base = ... # the base url for your huggingface 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:
 ```
 [config] # in configuration.toml
 model = "replicate/llama-2-70b-chat:2c1608e18606fad2812020dc541930f2d0495ce32eee50074220b87300bc16e1"
 model_turbo = "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))
 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:
 ```
 [config] # in configuration.toml
 model = "llama3-70b-8192"
 model_turbo = "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))
 ### Vertex AI
 To use Google's Vertex AI platform and its associated models (chat-bison/codechat-bison) set:
 ``` 
 [config] # in configuration.toml
 model = "vertex_ai/codechat-bison"
 model_turbo = "vertex_ai/codechat-bison"
 fallback_models="vertex_ai/codechat-bison"
 [vertexai] # in .secrets.toml
 vertex_project = "my-google-cloud-project"
 vertex_location = ""
 ```
 Your [application default credentials](https://cloud.google.com/docs/authentication/application-default-credentials) will be used for authentication so there is no need to set explicit credentials in most environments.
 If you do want to set explicit credentials then you can use the `GOOGLE_APPLICATION_CREDENTIALS` environment variable set to a path to a json credentials file.
 ### Anthropic
 To use Anthropic models, set the relevant models in the configuration section of the configuration file:
 ```
 [config]
 model="anthropic/claude-3-opus-20240229"
 model_turbo="anthropic/claude-3-opus-20240229"
 fallback_models=["anthropic/claude-3-opus-20240229"]
 ```
 And also set the api key in the .secrets.toml file:
 ```
 [anthropic]
 KEY = "..."
 ```
 ### Amazon Bedrock
 To use Amazon Bedrock and its foundational models, add the below configuration:
 ``` 
 [config] # in configuration.toml
 model="bedrock/anthropic.claude-3-sonnet-20240229-v1:0"
 model_turbo="bedrock/anthropic.claude-3-sonnet-20240229-v1:0"
 fallback_models=["bedrock/anthropic.claude-v2:1"]
 [aws] # in .secrets.toml
 bedrock_region = "us-east-1"
 ```
 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` and `AWS_SECRET_ACCESS_KEY` environment variables.
 ## Patch Extra Lines
@ -85,21 +213,19 @@ By default, around any change in your PR, git patch provides three lines of cont
 code line that already existed in the file...
 ```
-Qodo Merge will try to increase the number of lines of context, via the parameter:
+For the `review`, `describe`, `ask` and `add_docs` tools, if the token budget allows, PR-Agent tries to increase the number of lines of context, via the parameter:
 ```
 [config]
-patch_extra_lines_before=3
+patch_extra_lines=3
 patch_extra_lines_after=1
 ```
-Increasing this number provides more context to the model, but will also increase the token budget, and may overwhelm the model with too much information, unrelated to the actual PR code changes.
+Increasing this number provides more context to the model, but will also increase the token budget.
-
+If the PR is too large (see [PR Compression strategy](https://github.com/Codium-ai/pr-agent/blob/main/PR_COMPRESSION.md)), PR-Agent automatically sets this number to 0, using the original git patch.
 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.
 ## Editing the prompts
-The prompts for the various Qodo Merge tools are defined in the `pr_agent/settings` folder.
+The prompts for the various PR-Agent 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.
@ -114,49 +240,3 @@ user="""
 """
 ```
 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).
 ## 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
 success_callback = ["langsmith"]
 failure_callback = ["langsmith"]
 service_callback = []
 ```
 Then set the following environment variables:
 ```
 LANGSMITH_API_KEY=<api_key>
 LANGSMITH_PROJECT=<project>
 LANGSMITH_BASE_URL=<url>
 ```
 ## Ignoring automatic commands in PRs
 In some cases, you may want to automatically ignore specific PRs . Qodo Merge enables you to ignore PR with a specific title, or from/to specific branches (regex matching).
 To ignore PRs with a specific title such as "[Bump]: ...", you can add the following to your `configuration.toml` file:
 ```
 [config]
 ignore_pr_title = ["\\[Bump\\]"]
 ```
 Where the `ignore_pr_title` is a list of regex patterns to match the PR title you want to ignore. Default is `ignore_pr_title = ["^\\[Auto\\]", "^Auto"]`.
 To ignore PRs from specific source or target branches, you can add the following to your `configuration.toml` file:
 ```
 [config]
 ignore_pr_source_branches = ['develop', 'main', 'master', 'stage']
 ignore_pr_target_branches = ["qa"]
 ```
 Where the `ignore_pr_source_branches` and `ignore_pr_target_branches` are lists of regex patterns to match the source and target branches you want to ignore.
 They are not mutually exclusive, you can use them together or separately.
--- a/docs/docs/usage-guide/automations_and_usage.md
+++ b/docs/docs/usage-guide/automations_and_usage.md
@ -1,5 +1,5 @@
 ## Local repo (CLI)
-When running from your locally cloned Qodo Merge repo (CLI), your local configuration file will be used.
+When running from your locally cloned PR-Agent repo (CLI), your local configuration file will be used.
 Examples of invoking the different tools via the CLI:
 - **Review**:       `python -m pr_agent.cli --pr_url=<pr_url>  review`
@ -26,25 +26,15 @@ 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", "gitlab", "bitbucket", "azure", "codecommit", "local", "gerrit"
 `
 Default is "github".
 ### Online usage
-Online usage means invoking Qodo Merge tools by [comments](https://github.com/Codium-ai/pr-agent/pull/229#issuecomment-1695021901) on a PR.
+Online usage means invoking PR-Agent tools by [comments](https://github.com/Codium-ai/pr-agent/pull/229#issuecomment-1695021901) on a PR.
 Commands for invoking the different tools via comments:
 - **Review**:       `/review`
 - **Describe**:     `/describe`
- **Improve**:      `/improve`  (or `/improve_code` for bitbucket, since `/improve` is sometimes reserved)
+- **Improve**:      `/improve`
 - **Ask**:          `/ask "..."`
 - **Reflect**:      `/reflect`
 - **Update Changelog**:      `/update_changelog`
@ -60,8 +50,8 @@ Any configuration value in [configuration file](https://github.com/Codium-ai/pr-
 ## GitHub App
-!!! note "Configurations for Qodo Merge Pro"
+!!! note "Configurations for PR-Agent Pro"
-    Qodo Merge Pro for GitHub is an App, hosted by CodiumAI. So all the instructions below are relevant also for Qodo Merge Pro users.
+    PR-Agent Pro for GitHub is an App, hosted by CodiumAI. So all the instructions below are relevant also for PR-Agent Pro users.
    Same goes for [GitLab webhook](#gitlab-webhook) and [BitBucket App](#bitbucket-app) sections.
 ### GitHub app automatic tools when a new PR is opened
@ -77,10 +67,10 @@ pr_commands = [
    "/improve",
 ]
 ```
-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.  
+This means that when a new PR is opened/reopened or marked as ready for review, PR-Agent will run the `describe`, `review` and `improve` tools.  
 For the `review` tool, for example, the `num_code_suggestions` parameter will be set to 0.
-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**. 
+You can override the default tool parameters by using one the three options for a [configuration file](https://codium-ai.github.io/Docs-PR-Agent/usage-guide/#configuration-options): **wiki**, **local**, or **global**. 
 For example, if your local `.pr_agent.toml` file contains:
 ```
 [pr_description]
@ -91,9 +81,16 @@ Every time you run the `describe` tool, including automatic runs, the PR title w
 To cancel the automatic run of all the tools, set:
 ```
 [github_app]
-pr_commands = []
+handle_pr_actions = []
 ```
 You can also disable automatic runs for PRs with specific titles, by setting the `ignore_pr_titles` parameter with the relevant regex. For example:
 ```
 [github_app]
 ignore_pr_title = ["^[Auto]", ".*ignore.*"]
 ```
 will ignore PRs with titles that start with "Auto" or contain the word "ignore".
 ### GitHub app automatic tools for push actions (commits to an open PR)
 In addition to running automatic tools when a PR is opened, the GitHub app can also respond to new code that is pushed to an open PR.
@ -108,10 +105,10 @@ push_commands = [
    "/review  --pr_reviewer.num_code_suggestions=0 --pr_reviewer.final_update_message=false",
 ]
 ```
-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.
+This means that when new code is pushed to the PR, the PR-Agent 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>
+`GitHub Action` is a different way to trigger PR-Agent 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
@ -121,29 +118,26 @@ Specifically, start by setting the following environment variables:
        github_action_config.auto_review: "true" # enable\disable auto review
        github_action_config.auto_describe: "true" # enable\disable auto describe
        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.enable_output: "true" # enable\disable github actions output parameter
 ```
 `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.
 `github_action_config.pr_actions` is used to configure which `pull_requests` events will trigger the enabled auto flags
 If not set, the default configuration is `["opened", "reopened", "ready_for_review", "review_requested"]`
 `github_action_config.enable_output` are used to enable/disable github actions [output parameter](https://docs.github.com/en/actions/creating-actions/metadata-syntax-for-github-actions#outputs-for-docker-container-and-javascript-actions) (default is `true`). 
 Review result is output as JSON to `steps.{step-id}.outputs.review` property.
 The JSON structure is equivalent to the yaml data structure defined in [pr_reviewer_prompts.toml](https://github.com/idubnori/pr-agent/blob/main/pr_agent/settings/pr_reviewer_prompts.toml).
-Note that you can give additional config parameters by adding environment variables to `.github/workflows/pr_agent.yml`, or by using a `.pr_agent.toml` [configuration file](https://qodo-merge-docs.qodo.ai/usage-guide/configuration_options/#global-configuration-file) in the root of your repo
+Note that you can give additional config parameters by adding environment variables to `.github/workflows/pr_agent.yml`, or by using a `.pr_agent.toml` [configuration file](https://pr-agent-docs.codium.ai/usage-guide/configuration_options/#global-configuration-file) in the root of your repo
 For example, you can set an environment variable: `pr_description.publish_labels=false`, or add a `.pr_agent.toml` file with the following content:
 ```
 [pr_description]
 publish_labels = false
 ```
-to prevent Qodo Merge from publishing labels when running the `describe` tool.
+to prevent PR-Agent 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:
+After setting up a GitLab 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:
 ```
 [gitlab]
 pr_commands = [
@ -153,38 +147,18 @@ 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.
 ```
 [gitlab]
 handle_push_trigger = true
 push_commands = [
    "/describe",
    "/review  --pr_reviewer.num_code_suggestions=0 --pr_reviewer.final_update_message=false",
 ]
 ```
 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.
+Similar to GitHub app, when running PR-Agent 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.
 For example, if your local `.pr_agent.toml` file contains:
 ```
 [pr_reviewer]
-extra_instructions = "Answer in japanese"
+inline_code_comments = true
 ```
-Each time you invoke a `/review` tool, it will use the extra instructions you set in the local configuration file.
+Each time you invoke a `/review` tool, it will use inline code comments.
 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 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
@ -195,11 +169,9 @@ Specifically, set the following values:
 [bitbucket_app]
 pr_commands = [
    "/review --pr_reviewer.num_code_suggestions=0",
-    "/improve --pr_code_suggestions.commitable_code_suggestions=true --pr_code_suggestions.suggestions_score_threshold=7",
+    "/improve --pr_code_suggestions.commitable_code_suggestions=true",
 ]
 ```
 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.
 ## Azure DevOps provider
--- a/docs/docs/usage-guide/changing_a_model.md
+++ b/docs/docs/usage-guide/changing_a_model.md
@ -1,189 +0,0 @@
 ## Changing a model
 See [here](https://github.com/Codium-ai/pr-agent/blob/main/pr_agent/algo/__init__.py) for a list of available models.
 To use a different model than the default (GPT-4), you need to edit in the [configuration file](https://github.com/Codium-ai/pr-agent/blob/main/pr_agent/settings/configuration.toml#L2) the fields:
 ```
 [config]
 model = "..."
 model_turbo = "..."
 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.
 ### 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):
 ```
 [openai]
 key = "" # your azure api key
 api_type = "azure"
 api_version = '2023-05-15'  # Check Azure documentation for the current API version
 api_base = ""  # The base URL for your Azure OpenAI resource. e.g. "https://<your resource name>.openai.azure.com"
 deployment_id = ""  # The deployment name you chose when you deployed the engine
 ```
 and set in your configuration file:
 ```
 [config]
 model="" # the OpenAI model you've deployed on Azure (e.g. gpt-3.5-turbo)
 model_turbo="" # the OpenAI model you've deployed on Azure (e.g. gpt-3.5-turbo)
 fallback_models=["..."] # the OpenAI model you've deployed on Azure (e.g. gpt-3.5-turbo)
 ```
 ### Hugging Face
 **Local**
 You can run Hugging Face 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 Hugging Face model locally via Ollama, set:
 ```
 [__init__.py]
 MAX_TOKENS = {
    "model-name-on-ollama": <max_tokens>
 }
 e.g.
 MAX_TOKENS={
    ...,
    "ollama/llama2": 4096
 }
 [config] # in configuration.toml
 model = "ollama/llama2"
 model_turbo = "ollama/llama2"
 fallback_models=["ollama/llama2"]
 [ollama] # in .secrets.toml
 api_base = ... # the base url for your Hugging Face inference endpoint
 # e.g. if running Ollama locally, you may use:
 api_base = "http://localhost:11434/"
 ```
 ### Inference Endpoints
 To use a new model with Hugging Face Inference Endpoints, for example, set:
 ```
 [__init__.py]
 MAX_TOKENS = {
    "model-name-on-huggingface": <max_tokens>
 }
 e.g.
 MAX_TOKENS={
    ...,
    "meta-llama/Llama-2-7b-chat-hf": 4096
 }
 [config] # in configuration.toml
 model = "huggingface/meta-llama/Llama-2-7b-chat-hf"
 model_turbo = "huggingface/meta-llama/Llama-2-7b-chat-hf"
 fallback_models=["huggingface/meta-llama/Llama-2-7b-chat-hf"]
 [huggingface] # in .secrets.toml
 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:
 ```
 [config] # in configuration.toml
 model = "replicate/llama-2-70b-chat:2c1608e18606fad2812020dc541930f2d0495ce32eee50074220b87300bc16e1"
 model_turbo = "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))
 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:
 ```
 [config] # in configuration.toml
 model = "llama3-70b-8192"
 model_turbo = "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))
 ### Vertex AI
 To use Google's Vertex AI platform and its associated models (chat-bison/codechat-bison) set:
 ``` 
 [config] # in configuration.toml
 model = "vertex_ai/codechat-bison"
 model_turbo = "vertex_ai/codechat-bison"
 fallback_models="vertex_ai/codechat-bison"
 [vertexai] # in .secrets.toml
 vertex_project = "my-google-cloud-project"
 vertex_location = ""
 ```
 Your [application default credentials](https://cloud.google.com/docs/authentication/application-default-credentials) will be used for authentication so there is no need to set explicit credentials in most environments.
 If you do want to set explicit credentials, then you can use the `GOOGLE_APPLICATION_CREDENTIALS` environment variable set to a path to a json credentials file.
 ### Anthropic
 To use Anthropic models, set the relevant models in the configuration section of the configuration file:
 ```
 [config]
 model="anthropic/claude-3-opus-20240229"
 model_turbo="anthropic/claude-3-opus-20240229"
 fallback_models=["anthropic/claude-3-opus-20240229"]
 ```
 And also set the api key in the .secrets.toml file:
 ```
 [anthropic]
 KEY = "..."
 ```
 ### Amazon Bedrock
 To use Amazon Bedrock and its foundational models, add the below configuration:
 ``` 
 [config] # in configuration.toml
 model="bedrock/anthropic.claude-3-sonnet-20240229-v1:0"
 model_turbo="bedrock/anthropic.claude-3-sonnet-20240229-v1:0"
 fallback_models=["bedrock/anthropic.claude-v2:1"]
 ```
 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.
 ### 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:
 ```
 [config]
 model="custom_model_name"
 model_turbo="custom_model_name"
 fallback_models=["custom_model_name"]
 ```
 (2) Set the maximal tokens for the model:
 ```
 [config]
 custom_model_max_tokens= ...
 ```
 (3) Go to [litellm documentation](https://litellm.vercel.app/docs/proxy/quick_start#supported-llms), find the model you want to use, and set the relevant environment variables.
--- a/docs/docs/usage-guide/configuration_options.md
+++ b/docs/docs/usage-guide/configuration_options.md
@ -1,7 +1,7 @@
-The different tools and sub-tools used by Qodo Merge are adjustable via the **[configuration file](https://github.com/Codium-ai/pr-agent/blob/main/pr_agent/settings/configuration.toml)**.
+The different tools and sub-tools used by CodiumAI PR-Agent are adjustable via the **[configuration file](https://github.com/Codium-ai/pr-agent/blob/main/pr_agent/settings/configuration.toml)**.
 In addition to general configuration options, each tool has its own configurations. For example, the `review` tool will use parameters from the [pr_reviewer](https://github.com/Codium-ai/pr-agent/blob/main/pr_agent/settings/configuration.toml#L16) section in the configuration file.
-See the [Tools Guide](https://qodo-merge-docs.qodo.ai/tools/) for a detailed description of the different tools and their configurations.
+See the [Tools Guide](https://codium-ai.github.io/Docs-PR-Agent/tools/) for a detailed description of the different tools and their configurations.
 There are three ways to set persistent configurations:
@ -11,36 +11,25 @@ There are three ways to set persistent configurations:
 In terms of precedence, wiki configurations will override local configurations, and local configurations will override global configurations.
 !!! tip "Tip1: edit only what you need"
    Your configuration file should be minimal, and edit only the relevant values. Don't copy the entire configuration options, since it can lead to legacy problems when something changes.
 !!! tip "Tip2: show relevant configurations"
    If you set `config.output_relevant_configurations=true`, each tool will also output in a collapsible section its relevant configurations. This can be useful for debugging, or getting to know the configurations better.
 ## Wiki configuration file 💎
-`Platforms supported: GitHub, GitLab, Bitbucket`
+Specifically for GitHub, with PR-Agent-Pro you can set configurations by creating a page called `.pr_agent.toml` in the [wiki](https://github.com/Codium-ai/pr-agent/wiki/pr_agent.toml) of the repo. 
 With Qodo Merge Pro, you can set configurations by creating a page called `.pr_agent.toml` in the [wiki](https://github.com/Codium-ai/pr-agent/wiki/pr_agent.toml) of the repo. 
 The advantage of this method is that it allows to set configurations without needing to commit new content to the repo - just edit the wiki page and **save**.
 ![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.
+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, to allow better presentation when displayed in the wiki as markdown.
 An example content:
-```toml
+```
 [pr_description]
 generate_ai_title=true
 ```
-Qodo Merge will know to remove the surrounding quotes when reading the configuration content.
+PR-Agent will know to remove the triple-quotes when reading the configuration content.
 ## Local configuration file
 `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.
 For example, if you set in `.pr_agent.toml`:
@ -59,13 +48,9 @@ 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.
 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`:
-
+- The repo [`https://github.com/Codium-ai/pr-agent-settings`](https://github.com/Codium-ai/pr-agent-settings/blob/main/.pr_agent.toml) contains a `.pr_agent.toml` file that serves as a global configuration file for all the repos in the GitHub organization `Codium-ai`.
 - The file [`https://github.com/Codium-ai/pr-agent-settings/.pr_agent.toml`](https://github.com/Codium-ai/pr-agent-settings/blob/main/.pr_agent.toml)  serves as a global configuration file for all the repos 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`.
--- a/docs/docs/usage-guide/index.md
+++ b/docs/docs/usage-guide/index.md
@ -1,11 +1,10 @@
 # Usage guide
-This page provides a detailed guide on how to use Qodo Merge. 
+This page provides a detailed guide on how to use PR-Agent. It includes information on how to adjust PR-Agent configurations, define which tools will run automatically, manage mail notifications, and other advanced configurations.
 It includes information on how to adjust Qodo Merge configurations, define which tools will run automatically, and other advanced configurations.
 - [Introduction](./introduction.md)
- [Configuration File](./configuration_options.md)
+- [Configuration Options](./configuration_options.md)
 - [Usage and Automation](./automations_and_usage.md)
    - [Local Repo (CLI)](./automations_and_usage.md#local-repo-cli)
    - [Online Usage](./automations_and_usage.md#online-usage)
@ -15,7 +14,6 @@ It includes information on how to adjust Qodo Merge configurations, define which
    - [BitBucket App](./automations_and_usage.md#bitbucket-app)
    - [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)
    - [Ignoring files from analysis](./additional_configurations.md#ignoring-files-from-analysis)
    - [Extra instructions](./additional_configurations.md#extra-instructions)
@ -23,4 +21,3 @@ It includes information on how to adjust Qodo Merge configurations, define which
    - [Changing a model](./additional_configurations.md#changing-a-model)
    - [Patch Extra Lines](./additional_configurations.md#patch-extra-lines)
    - [Editing the prompts](./additional_configurations.md#editing-the-prompts)
 - [Qodo Merge Pro Models](./PR_agent_pro_models.md)
--- a/docs/docs/usage-guide/introduction.md
+++ b/docs/docs/usage-guide/introduction.md
@ -1,13 +1,18 @@
-After [installation](https://qodo-merge-docs.qodo.ai/installation/), there are three basic ways to invoke Qodo Merge:
+After [installation](https://codium-ai.github.io/Docs-PR-Agent/installation/), there are three basic ways to invoke CodiumAI PR-Agent:
 1. Locally running a CLI command
 2. Online usage - by [commenting](https://github.com/Codium-ai/pr-agent/pull/229#issuecomment-1695021901) on a PR
-3. Enabling Qodo Merge tools to run automatically when a new PR is opened
+3. Enabling PR-Agent 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).
+Specifically, CLI commands can be issued by invoking a pre-built [docker image](https://codium-ai.github.io/Docs-PR-Agent/installation/#run-from-source), or by invoking a [locally cloned repo](https://codium-ai.github.io/Docs-PR-Agent/installation/#locally).
 For online usage, you will need to setup either a [GitHub App](https://codium-ai.github.io/Docs-PR-Agent/installation/#run-as-a-github-app), or a [GitHub Action](https://codium-ai.github.io/Docs-PR-Agent/installation/#run-as-a-github-action).
 GitHub App and GitHub Action also enable to run PR-Agent specific tool automatically when a new PR is opened.
-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).
+
-These platforms also enable to run Qodo Merge specific tools automatically when a new PR is opened, or on each push to a branch.
+**git provider**: The [git_provider](https://github.com/Codium-ai/pr-agent/blob/main/pr_agent/settings/configuration.toml#L4) field in the configuration file determines the GIT provider that will be used by PR-Agent. Currently, the following providers are supported:
 `
 "github", "gitlab", "bitbucket", "azure", "codecommit", "local", "gerrit"
 `
--- a/docs/docs/usage-guide/mail_notifications.md
+++ b/docs/docs/usage-guide/mail_notifications.md
@ -1,15 +1,15 @@
 Unfortunately, it is not possible in GitHub to disable mail notifications from a specific user.
-If you are subscribed to notifications for a repo with Qodo Merge, we recommend turning off notifications for PR comments, to avoid lengthy emails:
+If you are subscribed to notifications for a repo with PR-Agent, we recommend turning off notifications for PR comments, to avoid lengthy emails:
 ![notifications](https://codium.ai/images/pr_agent/notifications.png){width=512}
-As an alternative, you can filter in your mail provider the notifications specifically from the Qodo Merge bot, [see how](https://www.quora.com/How-can-you-filter-emails-for-specific-people-in-Gmail#:~:text=On%20the%20Filters%20and%20Blocked,the%20body%20of%20the%20email).
+As an alternative, you can filter in your mail provider the notifications specifically from the PR-Agent bot, [see how](https://www.quora.com/How-can-you-filter-emails-for-specific-people-in-Gmail#:~:text=On%20the%20Filters%20and%20Blocked,the%20body%20of%20the%20email).
 ![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. 
+Another option to reduce the mail overload, yet still receive notifications on PR-Agent tools, is to disable the help collapsible section in PR-Agent 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:
 ```
--- a/docs/mkdocs.yml
+++ b/docs/mkdocs.yml
@ -1,12 +1,9 @@
-site_name: Qodo Merge (formerly known as PR-Agent)
+site_name: PR-Agent Documentation 
 repo_url: https://github.com/Codium-ai/pr-agent
 repo_name: Codium-ai/pr-agent
 nav: 
-  - Overview:
+  - Overview: 'index.md'
    - 'index.md'
    - 💎 Qodo Merge Pro: 'overview/pr_agent_pro.md'
    - Data Privacy: 'overview/data_privacy.md'
  - Installation: 
    - 'installation/index.md'
    - Locally: 'installation/locally.md'
@ -14,16 +11,14 @@ nav:
    - GitLab: 'installation/gitlab.md'
    - BitBucket: 'installation/bitbucket.md'
    - Azure DevOps: 'installation/azure.md'
-    - 💎 Qodo Merge Pro: 'installation/pr_agent_pro.md'
+    - 💎 PR-Agent Pro: 'installation/pr_agent_pro.md'
  - Usage Guide: 
    - 'usage-guide/index.md'
    - Introduction: 'usage-guide/introduction.md'
-    - Configuration File: 'usage-guide/configuration_options.md'
+    - Configuration Options: 'usage-guide/configuration_options.md'
    - Usage and Automation: 'usage-guide/automations_and_usage.md'
    - Managing Mail Notifications: 'usage-guide/mail_notifications.md'
-    - Changing a Model: 'usage-guide/changing_a_model.md'
+    - Usage and Automation: 'usage-guide/automations_and_usage.md'
    - Additional Configurations: 'usage-guide/additional_configurations.md'
    - 💎 Qodo Merge Pro Models: 'usage-guide/PR_agent_pro_models'
  - Tools: 
    - 'tools/index.md'
    - Describe: 'tools/describe.md'
@ -38,27 +33,10 @@ nav:
    - 💎 Improve Component: 'tools/improve_component.md'
    - 💎 Documentation: 'tools/documentation.md'
    - 💎 Custom Labels: 'tools/custom_labels.md'
-    - 💎 Custom Prompt: 'tools/custom_prompt.md'
+    - 💎 Custom Suggestions: 'tools/custom_suggestions.md'
    - 💎 CI Feedback: 'tools/ci_feedback.md'
    - 💎 Similar Code: 'tools/similar_code.md'
-  - Core Abilities:
+  - Core Abilities: 'core-abilities/index.md'
      - 'core-abilities/index.md'
      - Local and global metadata: 'core-abilities/metadata.md'
      - Dynamic context: 'core-abilities/dynamic_context.md'
      - Self-reflection: 'core-abilities/self_reflection.md'
      - Impact evaluation: 'core-abilities/impact_evaluation.md'
      - Interactivity: 'core-abilities/interactivity.md'
      - Compression strategy: 'core-abilities/compression_strategy.md'
      - Code-oriented YAML: 'core-abilities/code_oriented_yaml.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'
 #  - Code Fine-tuning Benchmark: 'finetuning_benchmark/index.md'
 theme:
  logo: assets/logo.svg
@ -78,7 +56,7 @@ theme:
    - content.tabs.link
    - content.code.annotation
    - content.code.copy
-    - content.tabs.link
+    - toc.integrate
  language: en
  custom_dir: overrides
@ -151,6 +129,5 @@ markdown_extensions:
      toc_depth: 3
      permalink: true
 copyright: |
  &copy; 2024 <a href="https://www.codium.ai/"  target="_blank" rel="noopener">CodiumAI</a>
--- a/docs/overrides/partials/footer.html
+++ b/docs/overrides/partials/footer.html
@ -82,11 +82,11 @@
 <footer class="wrapper">
  <div class="container">
-    <p class="footer-text">© 2024 <a href="https://www.qodo.ai/" target="_blank" rel="noopener">Qodo</a></p>
+    <p class="footer-text">© 2024 <a href="https://www.codium.ai/" target="_blank" rel="noopener">CodiumAI</a></p>
    <div class="footer-links">
-      <a href="https://qodo-gen-docs.qodo.ai/">Qodo Gen</a>
+      <a href="https://codiumate-docs.codium.ai/">Codiumate</a>
      <p>|</p>
-      <a href="https://qodo-flow-docs.qodo.ai/">AlphaCodium</a>
+      <a href="https://alpha-codium-docs.codium.ai/">AlphaCodium</a>
    </div>
    <div class="social-icons">
      <a href="https://github.com/Codium-ai" target="_blank" rel="noopener" title="github.com" class="social-link">
@ -95,16 +95,16 @@
      <a href="https://discord.com/invite/SgSxuQ65GF" target="_blank" rel="noopener" title="discord.com" class="social-link">
        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 512"><!--! Font Awesome Free 6.5.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) Copyright 2023 Fonticons, Inc.--><path d="M524.531 69.836a1.5 1.5 0 0 0-.764-.7A485.065 485.065 0 0 0 404.081 32.03a1.816 1.816 0 0 0-1.923.91 337.461 337.461 0 0 0-14.9 30.6 447.848 447.848 0 0 0-134.426 0 309.541 309.541 0 0 0-15.135-30.6 1.89 1.89 0 0 0-1.924-.91 483.689 483.689 0 0 0-119.688 37.107 1.712 1.712 0 0 0-.788.676C39.068 183.651 18.186 294.69 28.43 404.354a2.016 2.016 0 0 0 .765 1.375 487.666 487.666 0 0 0 146.825 74.189 1.9 1.9 0 0 0 2.063-.676A348.2 348.2 0 0 0 208.12 430.4a1.86 1.86 0 0 0-1.019-2.588 321.173 321.173 0 0 1-45.868-21.853 1.885 1.885 0 0 1-.185-3.126 251.047 251.047 0 0 0 9.109-7.137 1.819 1.819 0 0 1 1.9-.256c96.229 43.917 200.41 43.917 295.5 0a1.812 1.812 0 0 1 1.924.233 234.533 234.533 0 0 0 9.132 7.16 1.884 1.884 0 0 1-.162 3.126 301.407 301.407 0 0 1-45.89 21.83 1.875 1.875 0 0 0-1 2.611 391.055 391.055 0 0 0 30.014 48.815 1.864 1.864 0 0 0 2.063.7A486.048 486.048 0 0 0 610.7 405.729a1.882 1.882 0 0 0 .765-1.352c12.264-126.783-20.532-236.912-86.934-334.541ZM222.491 337.58c-28.972 0-52.844-26.587-52.844-59.239s23.409-59.241 52.844-59.241c29.665 0 53.306 26.82 52.843 59.239 0 32.654-23.41 59.241-52.843 59.241Zm195.38 0c-28.971 0-52.843-26.587-52.843-59.239s23.409-59.241 52.843-59.241c29.667 0 53.307 26.82 52.844 59.239 0 32.654-23.177 59.241-52.844 59.241Z"></path></svg>
      </a>
-      <a href="https://www.youtube.com/@QodoAI" target="_blank" rel="noopener" title="www.youtube.com" class="social-link">
+      <a href="https://www.youtube.com/@Codium-AI" target="_blank" rel="noopener" title="www.youtube.com" class="social-link">
        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512"><!--! Font Awesome Free 6.5.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) Copyright 2023 Fonticons, Inc.--><path d="M549.655 124.083c-6.281-23.65-24.787-42.276-48.284-48.597C458.781 64 288 64 288 64S117.22 64 74.629 75.486c-23.497 6.322-42.003 24.947-48.284 48.597-11.412 42.867-11.412 132.305-11.412 132.305s0 89.438 11.412 132.305c6.281 23.65 24.787 41.5 48.284 47.821C117.22 448 288 448 288 448s170.78 0 213.371-11.486c23.497-6.321 42.003-24.171 48.284-47.821 11.412-42.867 11.412-132.305 11.412-132.305s0-89.438-11.412-132.305zm-317.51 213.508V175.185l142.739 81.205-142.739 81.201z"></path></svg>
      </a>
-      <a href="https://www.linkedin.com/company/qodoai" target="_blank" rel="noopener" title="www.linkedin.com" class="social-link">
+      <a href="https://www.linkedin.com/company/codiumai" target="_blank" rel="noopener" title="www.linkedin.com" class="social-link">
        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><!--! Font Awesome Free 6.5.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) Copyright 2023 Fonticons, Inc.--><path d="M416 32H31.9C14.3 32 0 46.5 0 64.3v383.4C0 465.5 14.3 480 31.9 480H416c17.6 0 32-14.5 32-32.3V64.3c0-17.8-14.4-32.3-32-32.3zM135.4 416H69V202.2h66.5V416zm-33.2-243c-21.3 0-38.5-17.3-38.5-38.5S80.9 96 102.2 96c21.2 0 38.5 17.3 38.5 38.5 0 21.3-17.2 38.5-38.5 38.5zm282.1 243h-66.4V312c0-24.8-.5-56.7-34.5-56.7-34.6 0-39.9 27-39.9 54.9V416h-66.4V202.2h63.7v29.2h.9c8.9-16.8 30.6-34.5 62.9-34.5 67.2 0 79.7 44.3 79.7 101.9V416z"></path></svg>
      </a>
-      <a href="https://twitter.com/QodoAI" target="_blank" rel="noopener" title="twitter.com" class="social-link">
+      <a href="https://twitter.com/CodiumAI" target="_blank" rel="noopener" title="twitter.com" class="social-link">
        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!--! Font Awesome Free 6.5.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) Copyright 2023 Fonticons, Inc.--><path d="M459.37 151.716c.325 4.548.325 9.097.325 13.645 0 138.72-105.583 298.558-298.558 298.558-59.452 0-114.68-17.219-161.137-47.106 8.447.974 16.568 1.299 25.34 1.299 49.055 0 94.213-16.568 130.274-44.832-46.132-.975-84.792-31.188-98.112-72.772 6.498.974 12.995 1.624 19.818 1.624 9.421 0 18.843-1.3 27.614-3.573-48.081-9.747-84.143-51.98-84.143-102.985v-1.299c13.969 7.797 30.214 12.67 47.431 13.319-28.264-18.843-46.781-51.005-46.781-87.391 0-19.492 5.197-37.36 14.294-52.954 51.655 63.675 129.3 105.258 216.365 109.807-1.624-7.797-2.599-15.918-2.599-24.04 0-57.828 46.782-104.934 104.934-104.934 30.213 0 57.502 12.67 76.67 33.137 23.715-4.548 46.456-13.32 66.599-25.34-7.798 24.366-24.366 44.833-46.132 57.827 21.117-2.273 41.584-8.122 60.426-16.243-14.292 20.791-32.161 39.308-52.628 54.253z"></path></svg>
      </a>
-      <a href="https://www.instagram.com/qodo_ai" target="_blank" rel="noopener" title="www.instagram.com" class="social-link">
+      <a href="https://www.instagram.com/codiumai/" target="_blank" rel="noopener" title="www.instagram.com" class="social-link">
        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><!--! Font Awesome Free 6.5.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) Copyright 2023 Fonticons, Inc.--><path d="M224.1 141c-63.6 0-114.9 51.3-114.9 114.9s51.3 114.9 114.9 114.9S339 319.5 339 255.9 287.7 141 224.1 141zm0 189.6c-41.1 0-74.7-33.5-74.7-74.7s33.5-74.7 74.7-74.7 74.7 33.5 74.7 74.7-33.6 74.7-74.7 74.7zm146.4-194.3c0 14.9-12 26.8-26.8 26.8-14.9 0-26.8-12-26.8-26.8s12-26.8 26.8-26.8 26.8 12 26.8 26.8zm76.1 27.2c-1.7-35.9-9.9-67.7-36.2-93.9-26.2-26.2-58-34.4-93.9-36.2-37-2.1-147.9-2.1-184.9 0-35.8 1.7-67.6 9.9-93.9 36.1s-34.4 58-36.2 93.9c-2.1 37-2.1 147.9 0 184.9 1.7 35.9 9.9 67.7 36.2 93.9s58 34.4 93.9 36.2c37 2.1 147.9 2.1 184.9 0 35.9-1.7 67.7-9.9 93.9-36.2 26.2-26.2 34.4-58 36.2-93.9 2.1-37 2.1-147.8 0-184.8zM398.8 388c-7.8 19.6-22.9 34.7-42.6 42.6-29.5 11.7-99.5 9-132.1 9s-102.7 2.6-132.1-9c-19.6-7.8-34.7-22.9-42.6-42.6-11.7-29.5-9-99.5-9-132.1s-2.6-102.7 9-132.1c7.8-19.6 22.9-34.7 42.6-42.6 29.5-11.7 99.5-9 132.1-9s102.7-2.6 132.1 9c19.6 7.8 34.7 22.9 42.6 42.6 11.7 29.5 9 99.5 9 132.1s2.7 102.7-9 132.1z"></path></svg>
      </a>
    </div>
--- a/pr_agent/agent/pr_agent.py
+++ b/pr_agent/agent/pr_agent.py
@ -46,7 +46,6 @@ command2class = {
 commands = list(command2class.keys())
 class PRAgent:
    def __init__(self, ai_handler: partial[BaseAiHandler,] = LiteLLMAIHandler):
        self.ai_handler = ai_handler # will be initialized in run_action
@ -69,9 +68,7 @@ class PRAgent:
            for forbidden_arg in self.forbidden_cli_args:
                for arg in args:
                    if forbidden_arg in arg:
-                        get_logger().error(
+                        get_logger().error(f"CLI argument for param '{forbidden_arg}' is forbidden. Use instead a configuration file.")
                            f"CLI argument for param '{forbidden_arg}' is forbidden. Use instead a configuration file."
                        )
                        return False
        args = update_settings_from_args(args)
@ -79,7 +76,7 @@ class PRAgent:
        if action not in command2class:
            get_logger().debug(f"Unknown command: {action}")
            return False
-        with get_logger().contextualize(command=action, pr_url=pr_url):
+        with get_logger().contextualize(command=action):
            get_logger().info("PR-Agent request handler started", analytics=True)
            if action == "reflect_and_review":
                get_settings().pr_reviewer.ask_and_reflect = True
@ -97,3 +94,4 @@ class PRAgent:
            else:
                return False
            return True
--- a/pr_agent/algo/init.py
+++ b/pr_agent/algo/init.py
@ -11,18 +11,9 @@ MAX_TOKENS = {
    'gpt-4-32k': 32000,
    'gpt-4-1106-preview': 128000, # 128K, but may be limited by config.max_model_tokens
    'gpt-4-0125-preview': 128000,  # 128K, but may be limited by config.max_model_tokens
    'gpt-4o': 128000,  # 128K, but may be limited by config.max_model_tokens
    'gpt-4o-2024-05-13': 128000,  # 128K, but may be limited by config.max_model_tokens
    'gpt-4-turbo-preview': 128000,  # 128K, but may be limited by config.max_model_tokens
    'gpt-4-turbo-2024-04-09': 128000,  # 128K, but may be limited by config.max_model_tokens
    'gpt-4-turbo': 128000,  # 128K, but may be limited by config.max_model_tokens
    'gpt-4o-mini': 128000,  # 128K, but may be limited by config.max_model_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
    '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
    'o1-preview-2024-09-12': 128000,  # 128K, but may be limited by config.max_model_tokens
    'claude-instant-1': 100000,
    'claude-2': 100000,
    'command-nightly': 4096,
@ -30,41 +21,17 @@ MAX_TOKENS = {
    'meta-llama/Llama-2-7b-chat-hf': 4096,
    'vertex_ai/codechat-bison': 6144,
    'vertex_ai/codechat-bison-32k': 32000,
    'vertex_ai/claude-3-haiku@20240307': 100000,
    'vertex_ai/claude-3-sonnet@20240229': 100000,
    'vertex_ai/claude-3-opus@20240229': 100000,
    'vertex_ai/claude-3-5-sonnet@20240620': 100000,
    'vertex_ai/claude-3-5-sonnet-v2@20241022': 100000,
    'vertex_ai/gemini-1.5-pro': 1048576,
    'vertex_ai/gemini-1.5-flash': 1048576,
    'vertex_ai/gemma2': 8200,
    'codechat-bison': 6144,
    'codechat-bison-32k': 32000,
    'anthropic.claude-instant-v1': 100000,
    'anthropic.claude-v1': 100000,
    'anthropic.claude-v2': 100000,
    'anthropic/claude-3-opus-20240229': 100000,
    'anthropic/claude-3-5-sonnet-20240620': 100000,
    'anthropic/claude-3-5-sonnet-20241022': 100000,
    'bedrock/anthropic.claude-instant-v1': 100000,
    'bedrock/anthropic.claude-v2': 100000,
    'bedrock/anthropic.claude-v2:1': 100000,
    'bedrock/anthropic.claude-3-sonnet-20240229-v1:0': 100000,
    'bedrock/anthropic.claude-3-haiku-20240307-v1:0': 100000,
    'bedrock/anthropic.claude-3-5-sonnet-20240620-v1:0': 100000,
    'bedrock/anthropic.claude-3-5-sonnet-20241022-v2:0': 100000,
    'claude-3-5-sonnet': 100000,
    'groq/llama3-8b-8192': 8192,
    'groq/llama3-70b-8192': 8192,
    'groq/mixtral-8x7b-32768': 32768,
    'groq/llama-3.1-8b-instant': 131072,
    'groq/llama-3.1-70b-versatile': 131072,
    'groq/llama-3.1-405b-reasoning': 131072,
    'ollama/llama3': 4096,
    'watsonx/meta-llama/llama-3-8b-instruct': 4096,
    "watsonx/meta-llama/llama-3-70b-instruct": 4096,
    "watsonx/meta-llama/llama-3-405b-instruct": 16384,
    "watsonx/ibm/granite-13b-chat-v2": 8191,
    "watsonx/ibm/granite-34b-code-instruct": 8191,
    "watsonx/mistralai/mistral-large": 32768,
 }
--- a/pr_agent/algo/ai_handlers/base_ai_handler.py
+++ b/pr_agent/algo/ai_handlers/base_ai_handler.py
@ -1,6 +1,5 @@
 from abc import ABC, abstractmethod
 class BaseAiHandler(ABC):
    """
    This class defines the interface for an AI handler to be used by the PR Agents.  
@ -26,3 +25,4 @@ class BaseAiHandler(ABC):
            temperature (float): the temperature to use for the chat completion    
        """
        pass
--- a/pr_agent/algo/ai_handlers/langchain_ai_handler.py
+++ b/pr_agent/algo/ai_handlers/langchain_ai_handler.py
@ -1,6 +1,6 @@
 try:
-    from langchain_openai import ChatOpenAI, AzureChatOpenAI
+    from langchain.chat_models import ChatOpenAI, AzureChatOpenAI
-    from langchain_core.messages import SystemMessage, HumanMessage
+    from langchain.schema import SystemMessage, HumanMessage
 except: # we don't enforce langchain as a dependency, so if it's not installed, just move on
    pass
@ -8,25 +8,42 @@ from pr_agent.algo.ai_handlers.base_ai_handler import BaseAiHandler
 from pr_agent.config_loader import get_settings
 from pr_agent.log import get_logger
-from openai import APIError, RateLimitError, Timeout
+from openai.error import APIError, RateLimitError, Timeout, TryAgain
 from retry import retry
 import functools
 OPENAI_RETRIES = 5
 class LangChainOpenAIHandler(BaseAiHandler):
    def __init__(self):
        # Initialize OpenAIHandler specific attributes here
        super().__init__()
        self.azure = get_settings().get("OPENAI.API_TYPE", "").lower() == "azure"
        try:
            if self.azure:
                # using a partial function so we can set the deployment_id later to support fallback_deployments
                # but still need to access the other settings now so we can raise a proper exception if they're missing
                self._chat = functools.partial(
                    lambda **kwargs: AzureChatOpenAI(**kwargs),
                    openai_api_key=get_settings().openai.key,
                    openai_api_base=get_settings().openai.api_base,
                    openai_api_version=get_settings().openai.api_version,
                )
            else:
                self._chat = ChatOpenAI(openai_api_key=get_settings().openai.key)
        except AttributeError as e:
            if getattr(e, "name"):
                raise ValueError(f"OpenAI {e.name} is required") from e
            else:
                raise e
-        # Create a default unused chat object to trigger early validation
+    @property
-        self._create_chat(self.deployment_id)
+    def chat(self):
-
+        if self.azure:
-    def chat(self, messages: list, model: str, temperature: float):
+            # we must set the deployment_id only here (instead of the __init__ method) to support fallback_deployments
-        chat = self._create_chat(self.deployment_id)
+            return self._chat(deployment_name=self.deployment_id)
-        return chat.invoke(input=messages, model=model, temperature=temperature)
+        else:
            return self._chat
    @property
    def deployment_id(self):
@ -34,8 +51,7 @@ class LangChainOpenAIHandler(BaseAiHandler):
        Returns the deployment ID for the OpenAI API.
        """
        return get_settings().get("OPENAI.DEPLOYMENT_ID", None)
-
+    @retry(exceptions=(APIError, Timeout, TryAgain, AttributeError, RateLimitError),
    @retry(exceptions=(APIError, Timeout, AttributeError, RateLimitError),
           tries=OPENAI_RETRIES, delay=2, backoff=2, jitter=(1, 3))
    async def chat_completion(self, model: str, system: str, user: str, temperature: float = 0.2):
        try:
@ -49,28 +65,3 @@ class LangChainOpenAIHandler(BaseAiHandler):
        except (Exception) as e:
            get_logger().error("Unknown error during OpenAI inference: ", e)
            raise e
    def _create_chat(self, deployment_id=None):
        try:
            if self.azure:
                # using a partial function so we can set the deployment_id later to support fallback_deployments
                # but still need to access the other settings now so we can raise a proper exception if they're missing
                return AzureChatOpenAI(
                    openai_api_key=get_settings().openai.key,
                    openai_api_version=get_settings().openai.api_version,
                    azure_deployment=deployment_id,
                    azure_endpoint=get_settings().openai.api_base,
                )
            else:
                # for llms that compatible with openai, should use custom api base
                openai_api_base = get_settings().get("OPENAI.API_BASE", None)
                if openai_api_base is None or len(openai_api_base) == 0:
                    return ChatOpenAI(openai_api_key=get_settings().openai.key)
                else:
                    return ChatOpenAI(openai_api_key=get_settings().openai.key, openai_api_base=openai_api_base)
        except AttributeError as e:
            if getattr(e, "name"):
                raise ValueError(f"OpenAI {e.name} is required") from e
            else:
                raise e
--- a/pr_agent/algo/ai_handlers/litellm_ai_handler.py
+++ b/pr_agent/algo/ai_handlers/litellm_ai_handler.py
@ -1,10 +1,10 @@
 import os
 import requests
 import boto3
 import litellm
 import openai
 from litellm import acompletion
 from tenacity import retry, retry_if_exception_type, stop_after_attempt
 from pr_agent.algo.ai_handlers.base_ai_handler import BaseAiHandler
 from pr_agent.config_loader import get_settings
 from pr_agent.log import get_logger
@ -25,18 +25,12 @@ class LiteLLMAIHandler(BaseAiHandler):
        Raises a ValueError if the OpenAI key is missing.
        """
        self.azure = False
        self.aws_bedrock_client = None
        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
        elif 'OPENAI_API_KEY' not in os.environ:
            litellm.api_key = "dummy_key"
        if get_settings().get("aws.AWS_ACCESS_KEY_ID"):
            assert get_settings().aws.AWS_SECRET_ACCESS_KEY and get_settings().aws.AWS_REGION_NAME, "AWS credentials are incomplete"
            os.environ["AWS_ACCESS_KEY_ID"] = get_settings().aws.AWS_ACCESS_KEY_ID
            os.environ["AWS_SECRET_ACCESS_KEY"] = get_settings().aws.AWS_SECRET_ACCESS_KEY
            os.environ["AWS_REGION_NAME"] = get_settings().aws.AWS_REGION_NAME
        if get_settings().get("litellm.use_client"):
            litellm_token = get_settings().get("litellm.LITELLM_TOKEN")
            assert litellm_token, "LITELLM_TOKEN is required"
@ -44,12 +38,6 @@ class LiteLLMAIHandler(BaseAiHandler):
            litellm.use_client = True
        if get_settings().get("LITELLM.DROP_PARAMS", None):
            litellm.drop_params = get_settings().litellm.drop_params
        if get_settings().get("LITELLM.SUCCESS_CALLBACK", None):
            litellm.success_callback = get_settings().litellm.success_callback
        if get_settings().get("LITELLM.FAILURE_CALLBACK", None):
            litellm.failure_callback = get_settings().litellm.failure_callback
        if get_settings().get("LITELLM.SERVICE_CALLBACK", None):
            litellm.service_callback = get_settings().litellm.service_callback
        if get_settings().get("OPENAI.ORG", None):
            litellm.organization = get_settings().openai.org
        if get_settings().get("OPENAI.API_TYPE", None):
@ -76,13 +64,21 @@ class LiteLLMAIHandler(BaseAiHandler):
        if get_settings().get("OLLAMA.API_BASE", None) :
            litellm.api_base = get_settings().ollama.api_base
            self.api_base = get_settings().ollama.api_base
-        if get_settings().get("HUGGINGFACE.REPETITION_PENALTY", None):
+        if get_settings().get("HUGGINGFACE.REPITITION_PENALTY", None):
            self.repetition_penalty = float(get_settings().huggingface.repetition_penalty)
        if get_settings().get("VERTEXAI.VERTEX_PROJECT", None):
            litellm.vertex_project = get_settings().vertexai.vertex_project
            litellm.vertex_location = get_settings().get(
                "VERTEXAI.VERTEX_LOCATION", None
            )
        if get_settings().get("AWS.BEDROCK_REGION", None):
            litellm.AmazonAnthropicConfig.max_tokens_to_sample = 2000
            litellm.AmazonAnthropicClaude3Config.max_tokens = 2000
            self.aws_bedrock_client = boto3.client(
                service_name="bedrock-runtime",
                region_name=get_settings().aws.bedrock_region,
            )
    def prepare_logs(self, response, system, user, resp, finish_reason):
        response_log = response.dict().copy()
        response_log['system'] = system
@ -95,60 +91,6 @@ class LiteLLMAIHandler(BaseAiHandler):
            response_log['main_pr_language'] = 'unknown'
        return response_log
    def add_litellm_callbacks(selfs, kwargs) -> dict:
        captured_extra = []
        def capture_logs(message):
            # Parsing the log message and context
            record = message.record
            log_entry = {}
            if record.get('extra', None).get('command', None) is not None:
                log_entry.update({"command": record['extra']["command"]})
            if record.get('extra', {}).get('pr_url', None) is not None:
                log_entry.update({"pr_url": record['extra']["pr_url"]})
            # Append the log entry to the captured_logs list
            captured_extra.append(log_entry)
        # Adding the custom sink to Loguru
        handler_id = get_logger().add(capture_logs)
        get_logger().debug("Capturing logs for litellm callbacks")
        get_logger().remove(handler_id)
        context = captured_extra[0] if len(captured_extra) > 0 else None
        command = context.get("command", "unknown")
        pr_url = context.get("pr_url", "unknown")
        git_provider = get_settings().config.git_provider
        metadata = dict()
        callbacks = litellm.success_callback + litellm.failure_callback + litellm.service_callback
        if "langfuse" in callbacks:
            metadata.update({
                "trace_name": command,
                "tags": [git_provider, command],
                "trace_metadata": {
                    "command": command,
                    "pr_url": pr_url,
                },
            })
        if "langsmith" in callbacks:
            metadata.update({
                "run_name": command,
                "tags": [git_provider, command],
                "extra": {
                    "metadata": {
                        "command": command,
                        "pr_url": pr_url,
                    }
                },
            })
        # Adding the captured logs to the kwargs
        kwargs["metadata"] = metadata
        return kwargs
    @property
    def deployment_id(self):
        """
@ -157,7 +99,7 @@ class LiteLLMAIHandler(BaseAiHandler):
        return get_settings().get("OPENAI.DEPLOYMENT_ID", None)
    @retry(
-        retry=retry_if_exception_type((openai.APIError, openai.APIConnectionError, openai.APITimeoutError)), # No retry on RateLimitError
+        retry=retry_if_exception_type((openai.APIError, openai.APIConnectionError, openai.Timeout)), # No retry on RateLimitError
        stop=stop_after_attempt(OPENAI_RETRIES)
    )
    async def chat_completion(self, model: str, system: str, user: str, temperature: float = 0.2, img_path: str = None):
@ -166,12 +108,7 @@ class LiteLLMAIHandler(BaseAiHandler):
            deployment_id = self.deployment_id
            if self.azure:
                model = 'azure/' + model
            if 'claude' in model and not system:
                system = "No system prompt provided"
                get_logger().warning(
                    "Empty system prompt for claude model. Adding a newline character to prevent OpenAI API error.")
            messages = [{"role": "system", "content": system}, {"role": "user", "content": user}]
            if img_path:
                try:
                    # check if the image link is alive
@ -186,41 +123,16 @@ class LiteLLMAIHandler(BaseAiHandler):
                messages[1]["content"] = [{"type": "text", "text": messages[1]["content"]},
                                          {"type": "image_url", "image_url": {"url": img_path}}]
            # Currently O1 does not support separate system and user prompts
            O1_MODEL_PREFIX = 'o1-'
            model_type = model.split('/')[-1] if '/' in model else model
            if model_type.startswith(O1_MODEL_PREFIX):
                user = f"{system}\n\n\n{user}"
                system = ""
                get_logger().info(f"Using O1 model, combining system and user prompts")
                messages = [{"role": "user", "content": user}]
                kwargs = {
                    "model": model,
                    "deployment_id": deployment_id,
                    "messages": messages,
                    "timeout": get_settings().config.ai_timeout,
                    "api_base": self.api_base,
                }
            else:
            kwargs = {
                "model": model,
                "deployment_id": deployment_id,
                "messages": messages,
                "temperature": temperature,
-                    "timeout": get_settings().config.ai_timeout,
+                "force_timeout": get_settings().config.ai_timeout,
                "api_base" : self.api_base,
            }
-
+            if self.aws_bedrock_client:
-            if get_settings().litellm.get("enable_callbacks", False):
+                kwargs["aws_bedrock_client"] = self.aws_bedrock_client
                kwargs = self.add_litellm_callbacks(kwargs)
            seed = get_settings().config.get("seed", -1)
            if temperature > 0 and seed >= 0:
                raise ValueError(f"Seed ({seed}) is not supported with temperature ({temperature}) > 0")
            elif seed >= 0:
                get_logger().info(f"Using fixed seed of {seed}")
                kwargs["seed"] = seed
            if self.repetition_penalty:
                kwargs["repetition_penalty"] = self.repetition_penalty
@ -231,14 +143,14 @@ class LiteLLMAIHandler(BaseAiHandler):
                get_logger().info(f"\nUser prompt:\n{user}")
            response = await acompletion(**kwargs)
-        except (openai.APIError, openai.APITimeoutError) as e:
+        except (openai.APIError, openai.Timeout) as e:
-            get_logger().warning(f"Error during LLM inference: {e}")
+            get_logger().error("Error during OpenAI inference: ", e)
            raise
        except (openai.RateLimitError) as e:
-            get_logger().error(f"Rate limit error during LLM inference: {e}")
+            get_logger().error("Rate limit error during OpenAI inference: ", e)
            raise
        except (Exception) as e:
-            get_logger().warning(f"Unknown error during LLM inference: {e}")
+            get_logger().error("Unknown error during OpenAI inference: ", e)
            raise openai.APIError from e
        if response is None or len(response["choices"]) == 0:
            raise openai.APIError
--- a/pr_agent/algo/ai_handlers/openai_ai_handler.py
+++ b/pr_agent/algo/ai_handlers/openai_ai_handler.py
@ -28,7 +28,6 @@ class OpenAIHandler(BaseAiHandler):
        except AttributeError as e:
            raise ValueError("OpenAI key is required") from e
    @property
    def deployment_id(self):
        """
--- a/pr_agent/algo/file_filter.py
+++ b/pr_agent/algo/file_filter.py
@ -3,8 +3,7 @@ import re
 from pr_agent.config_loader import get_settings
-
+def filter_ignored(files):
 def filter_ignored(files, platform = 'github'):
    """
    Filter out files that match the ignore patterns.
    """
@ -28,36 +27,8 @@ def filter_ignored(files, platform = 'github'):
                pass
        # keep filenames that _don't_ match the ignore regex
        if files and isinstance(files, list):
        for r in compiled_patterns:
                if platform == 'github':
            files = [f for f in files if (f.filename and not r.match(f.filename))]
                elif platform == 'bitbucket':
                    # files = [f for f in files if (f.new.path and not r.match(f.new.path))]
                    files_o = []
                    for f in files:
                        if hasattr(f, 'new'):
                            if f.new and f.new.path and not r.match(f.new.path):
                                files_o.append(f)
                                continue
                        if hasattr(f, 'old'):
                            if f.old and f.old.path and not r.match(f.old.path):
                                files_o.append(f)
                                continue
                    files = files_o
                elif platform == 'gitlab':
                    # files = [f for f in files if (f['new_path'] and not r.match(f['new_path']))]
                    files_o = []
                    for f in files:
                        if 'new_path' in f and f['new_path'] and not r.match(f['new_path']):
                            files_o.append(f)
                            continue
                        if 'old_path' in f and f['old_path'] and not r.match(f['old_path']):
                            files_o.append(f)
                            continue
                    files = files_o
                elif platform == 'azure':
                    files = [f for f in files if not r.match(f)]
    except Exception as e:
        print(f"Could not filter file list: {e}")
--- a/pr_agent/algo/git_patch_processing.py
+++ b/pr_agent/algo/git_patch_processing.py
@ -1,63 +1,31 @@
 from __future__ import annotations
 import re
 import traceback
 from pr_agent.config_loader import get_settings
 from pr_agent.algo.types import EDIT_TYPE, FilePatchInfo
 from pr_agent.log import get_logger
-def extend_patch(original_file_str, patch_str, patch_extra_lines_before=0,
+def extend_patch(original_file_str, patch_str, num_lines) -> str:
-                 patch_extra_lines_after=0, filename: str = "") -> str:
+    """
-    if not patch_str or (patch_extra_lines_before == 0 and patch_extra_lines_after == 0) or not original_file_str:
+    Extends the given patch to include a specified number of surrounding lines.
    Args:
        original_file_str (str): The original file to which the patch will be applied.
        patch_str (str): The patch to be applied to the original file.
        num_lines (int): The number of surrounding lines to include in the extended patch.
    Returns:
        str: The extended patch string.
    """
    if not patch_str or num_lines == 0:
        return patch_str
-    original_file_str = decode_if_bytes(original_file_str)
+    if type(original_file_str) == bytes:
-    if not original_file_str:
+        original_file_str = original_file_str.decode('utf-8')
        return patch_str
    if should_skip_patch(filename):
        return patch_str
    try:
        extended_patch_str = process_patch_lines(patch_str, original_file_str,
                                                 patch_extra_lines_before, patch_extra_lines_after)
    except Exception as e:
        get_logger().warning(f"Failed to extend patch: {e}", artifact={"traceback": traceback.format_exc()})
        return patch_str
    return extended_patch_str
 def decode_if_bytes(original_file_str):
    if isinstance(original_file_str, bytes):
        try:
            return original_file_str.decode('utf-8')
        except UnicodeDecodeError:
            encodings_to_try = ['iso-8859-1', 'latin-1', 'ascii', 'utf-16']
            for encoding in encodings_to_try:
                try:
                    return original_file_str.decode(encoding)
                except UnicodeDecodeError:
                    continue
            return ""
    return original_file_str
 def should_skip_patch(filename):
    patch_extension_skip_types = get_settings().config.patch_extension_skip_types
    if patch_extension_skip_types and filename:
        return any(filename.endswith(skip_type) for skip_type in patch_extension_skip_types)
    return False
 def process_patch_lines(patch_str, original_file_str, patch_extra_lines_before, patch_extra_lines_after):
    allow_dynamic_context = get_settings().config.allow_dynamic_context
    patch_extra_lines_before_dynamic = get_settings().config.max_extra_lines_before_dynamic_context
    original_lines = original_file_str.splitlines()
    len_original_lines = len(original_lines)
    patch_lines = patch_str.splitlines()
    extended_patch_lines = []
@ -68,87 +36,12 @@ def process_patch_lines(patch_str, original_file_str, patch_extra_lines_before,
        for line in patch_lines:
            if line.startswith('@@'):
                match = RE_HUNK_HEADER.match(line)
                # identify hunk header
                if match:
-                    # finish processing previous hunk
+                    # finish previous hunk
-                    if start1 != -1 and patch_extra_lines_after > 0:
+                    if start1 != -1:
-                        delta_lines = [f' {line}' for line in original_lines[start1 + size1 - 1:start1 + size1 - 1 + patch_extra_lines_after]]
+                        extended_patch_lines.extend(
-                        extended_patch_lines.extend(delta_lines)
+                            original_lines[start1 + size1 - 1:start1 + size1 - 1 + num_lines])
                    section_header, size1, size2, start1, start2 = extract_hunk_headers(match)
                    if patch_extra_lines_before > 0 or patch_extra_lines_after > 0:
                        def _calc_context_limits(patch_lines_before):
                            extended_start1 = max(1, start1 - patch_lines_before)
                            extended_size1 = size1 + (start1 - extended_start1) + patch_extra_lines_after
                            extended_start2 = max(1, start2 - patch_lines_before)
                            extended_size2 = size2 + (start2 - extended_start2) + patch_extra_lines_after
                            if extended_start1 - 1 + extended_size1 > len_original_lines:
                                # we cannot extend beyond the original file
                                delta_cap = extended_start1 - 1 + extended_size1 - len_original_lines
                                extended_size1 = max(extended_size1 - delta_cap, size1)
                                extended_size2 = max(extended_size2 - delta_cap, size2)
                            return extended_start1, extended_size1, extended_start2, extended_size2
                        if allow_dynamic_context:
                            extended_start1, extended_size1, extended_start2, extended_size2 = \
                                _calc_context_limits(patch_extra_lines_before_dynamic)
                            lines_before = original_lines[extended_start1 - 1:start1 - 1]
                            found_header = False
                            for i, line, in enumerate(lines_before):
                                if section_header in line:
                                    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
                            if not found_header:
                                # get_logger().debug(f"Section header not found in the extra lines before the hunk")
                                extended_start1, extended_size1, extended_start2, extended_size2 = \
                                    _calc_context_limits(patch_extra_lines_before)
                        else:
                            extended_start1, extended_size1, extended_start2, extended_size2 = \
                                _calc_context_limits(patch_extra_lines_before)
                        delta_lines = [f' {line}' for line in original_lines[extended_start1 - 1:start1 - 1]]
                        #  logic to remove section header if its in the extra delta lines (in dynamic context, this is also done)
                        if section_header and not allow_dynamic_context:
                            for line in delta_lines:
                                if section_header in line:
                                    section_header = ''  # remove section header if it is in the extra delta lines
                                    break
                    else:
                        extended_start1 = start1
                        extended_size1 = size1
                        extended_start2 = start2
                        extended_size2 = size2
                        delta_lines = []
                    extended_patch_lines.append('')
                    extended_patch_lines.append(
                        f'@@ -{extended_start1},{extended_size1} '
                        f'+{extended_start2},{extended_size2} @@ {section_header}')
                    extended_patch_lines.extend(delta_lines)  # one to zero based
                    continue
            extended_patch_lines.append(line)
    except Exception as e:
        get_logger().warning(f"Failed to extend patch: {e}", artifact={"traceback": traceback.format_exc()})
        return patch_str
    # finish processing last hunk
    if start1 != -1 and patch_extra_lines_after > 0:
        delta_lines = original_lines[start1 + size1 - 1:start1 + size1 - 1 + patch_extra_lines_after]
        # add space at the beginning of each extra line
        delta_lines = [f' {line}' for line in delta_lines]
        extended_patch_lines.extend(delta_lines)
    extended_patch_str = '\n'.join(extended_patch_lines)
    return extended_patch_str
 def extract_hunk_headers(match):
                    res = list(match.groups())
                    for i in range(len(res)):
                        if res[i] is None:
@ -159,7 +52,29 @@ def extract_hunk_headers(match):
                        start1, size1, size2 = map(int, res[:3])
                        start2 = 0
                    section_header = res[4]
-    return section_header, size1, size2, start1, start2
+                    extended_start1 = max(1, start1 - num_lines)
                    extended_size1 = size1 + (start1 - extended_start1) + num_lines
                    extended_start2 = max(1, start2 - num_lines)
                    extended_size2 = size2 + (start2 - extended_start2) + num_lines
                    extended_patch_lines.append(
                        f'@@ -{extended_start1},{extended_size1} '
                        f'+{extended_start2},{extended_size2} @@ {section_header}')
                    extended_patch_lines.extend(
                        original_lines[extended_start1 - 1:start1 - 1])  # one to zero based
                    continue
            extended_patch_lines.append(line)
    except Exception as e:
        if get_settings().config.verbosity_level >= 2:
            get_logger().error(f"Failed to extend patch: {e}")
        return patch_str
    # finish previous hunk
    if start1 != -1:
        extended_patch_lines.extend(
            original_lines[start1 + size1 - 1:start1 + size1 - 1 + num_lines])
    extended_patch_str = '\n'.join(extended_patch_lines)
    return extended_patch_str
 def omit_deletion_hunks(patch_lines) -> str:
@ -191,7 +106,6 @@ def omit_deletion_hunks(patch_lines) -> str:
                inside_hunk = True
        else:
            temp_hunk.append(line)
            if line:
            edit_type = line[0]
            if edit_type == '+':
                add_hunk = True
@ -219,7 +133,7 @@ def handle_patch_deletions(patch: str, original_file_content_str: str,
        str: The modified patch with deletion hunks omitted.
    """
-    if not new_file_content_str and (edit_type == EDIT_TYPE.DELETED or edit_type == EDIT_TYPE.UNKNOWN):
+    if not new_file_content_str and edit_type != EDIT_TYPE.ADDED:
        # logic for handling deleted files - don't show patch, just show that the file was deleted
        if get_settings().config.verbosity_level > 0:
            get_logger().info(f"Processing file: {file_name}, minimizing deletion file")
@ -266,11 +180,8 @@ __old hunk__
        line6
           ...
    """
    # if the file was deleted, return a message indicating that the file was deleted
    if hasattr(file, 'edit_type') and file.edit_type == EDIT_TYPE.DELETED:
        return f"\n\n## file '{file.filename.strip()}' was deleted\n"
-    patch_with_lines_str = f"\n\n## File: '{file.filename.strip()}'\n"
+    patch_with_lines_str = f"\n\n## file: '{file.filename.strip()}'\n"
    patch_lines = patch.splitlines()
    RE_HUNK_HEADER = re.compile(
        r"^@@ -(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))? @@[ ]?(.*)")
@ -280,26 +191,21 @@ __old hunk__
    start1, size1, start2, size2 = -1, -1, -1, -1
    prev_header_line = []
    header_line =[]
-    for line_i, line in enumerate(patch_lines):
+    for line in patch_lines:
        if 'no newline at end of file' in line.lower():
            continue
        if line.startswith('@@'):
            header_line = line
            match = RE_HUNK_HEADER.match(line)
-            if match and (new_content_lines or old_content_lines):  # found a new hunk, split the previous lines
+            if match and new_content_lines:  # found a new hunk, split the previous lines
                if new_content_lines:
                    if prev_header_line:
                        patch_with_lines_str += f'\n{prev_header_line}\n'
                is_plus_lines = is_minus_lines = False
                if new_content_lines:
                    is_plus_lines = any([line.startswith('+') for line in new_content_lines])
                if old_content_lines:
                    is_minus_lines = any([line.startswith('-') for line in old_content_lines])
                if is_plus_lines or is_minus_lines: # notice 'True' here - we always present __new hunk__ for section, otherwise LLM gets confused
                    patch_with_lines_str = patch_with_lines_str.rstrip()+'\n__new hunk__\n'
                    for i, line_new in enumerate(new_content_lines):
                        patch_with_lines_str += f"{start2 + i} {line_new}\n"
-                if is_minus_lines:
+                if old_content_lines:
                    patch_with_lines_str = patch_with_lines_str.rstrip()+'\n__old hunk__\n'
                    for line_old in old_content_lines:
                        patch_with_lines_str += f"{line_old}\n"
@ -308,34 +214,32 @@ __old hunk__
            if match:
                prev_header_line = header_line
-            section_header, size1, size2, start1, start2 = extract_hunk_headers(match)
+            res = list(match.groups())
            for i in range(len(res)):
                if res[i] is None:
                    res[i] = 0
            try:
                start1, size1, start2, size2 = map(int, res[:4])
            except: # '@@ -0,0 +1 @@' case
                start1, size1, size2 = map(int, res[:3])
                start2 = 0
        elif line.startswith('+'):
            new_content_lines.append(line)
        elif line.startswith('-'):
            old_content_lines.append(line)
        else:
            if not line and line_i: # if this line is empty and the next line is a hunk header, skip it
                if line_i + 1 < len(patch_lines) and patch_lines[line_i + 1].startswith('@@'):
                    continue
                elif line_i + 1 == len(patch_lines):
                    continue
            new_content_lines.append(line)
            old_content_lines.append(line)
    # finishing last hunk
    if match and new_content_lines:
        patch_with_lines_str += f'\n{header_line}\n'
        is_plus_lines = is_minus_lines = False
        if new_content_lines:
-            is_plus_lines = any([line.startswith('+') for line in new_content_lines])
+            patch_with_lines_str += f'\n{header_line}\n'
        if old_content_lines:
            is_minus_lines = any([line.startswith('-') for line in old_content_lines])
        if is_plus_lines or is_minus_lines:  # notice 'True' here - we always present __new hunk__ for section, otherwise LLM gets confused
            patch_with_lines_str = patch_with_lines_str.rstrip()+ '\n__new hunk__\n'
            for i, line_new in enumerate(new_content_lines):
                patch_with_lines_str += f"{start2 + i} {line_new}\n"
-        if is_minus_lines:
+        if old_content_lines:
            patch_with_lines_str = patch_with_lines_str.rstrip() + '\n__old hunk__\n'
            for line_old in old_content_lines:
                patch_with_lines_str += f"{line_old}\n"
@ -345,7 +249,7 @@ __old hunk__
 def extract_hunk_lines_from_patch(patch: str, file_name, line_start, line_end, side) -> tuple[str, str]:
-    patch_with_lines_str = f"\n\n## File: '{file_name.strip()}'\n\n"
+    patch_with_lines_str = f"\n\n## file: '{file_name.strip()}'\n\n"
    selected_lines = ""
    patch_lines = patch.splitlines()
    RE_HUNK_HEADER = re.compile(
@ -365,7 +269,15 @@ def extract_hunk_lines_from_patch(patch: str, file_name, line_start, line_end, s
            match = RE_HUNK_HEADER.match(line)
-            section_header, size1, size2, start1, start2 = extract_hunk_headers(match)
+            res = list(match.groups())
            for i in range(len(res)):
                if res[i] is None:
                    res[i] = 0
            try:
                start1, size1, start2, size2 = map(int, res[:4])
            except:  # '@@ -0,0 +1 @@' case
                start1, size1, size2 = map(int, res[:3])
                start2 = 0
            # check if line range is in this hunk
            if side.lower() == 'left':
--- a/pr_agent/algo/language_handler.py
+++ b/pr_agent/algo/language_handler.py
@ -5,22 +5,17 @@ from pr_agent.config_loader import get_settings
 def filter_bad_extensions(files):
 # Bad Extensions, source: https://github.com/EleutherAI/github-downloader/blob/345e7c4cbb9e0dc8a0615fd995a08bf9d73b3fe6/download_repo_text.py  # noqa: E501
 bad_extensions = get_settings().bad_extensions.default
 if get_settings().config.use_extra_bad_extensions:
    bad_extensions += get_settings().bad_extensions.extra
    return [f for f in files if f.filename is not None and is_valid_file(f.filename, bad_extensions)]
-def is_valid_file(filename:str, bad_extensions=None) -> bool:
+def filter_bad_extensions(files):
-    if not filename:
+    return [f for f in files if f.filename is not None and is_valid_file(f.filename)]
-        return False
+
-    if not bad_extensions:
+
-        bad_extensions = get_settings().bad_extensions.default
+def is_valid_file(filename):
        if get_settings().config.use_extra_bad_extensions:
            bad_extensions += get_settings().bad_extensions.extra
    return filename.split('.')[-1] not in bad_extensions
--- a/pr_agent/algo/pr_processing.py
+++ b/pr_agent/algo/pr_processing.py
@ -21,32 +21,33 @@ MORE_MODIFIED_FILES_ = "Additional modified files (insufficient token budget to
 ADDED_FILES_ = "Additional added files (insufficient token budget to process):\n"
-OUTPUT_BUFFER_TOKENS_SOFT_THRESHOLD = 1500
+OUTPUT_BUFFER_TOKENS_SOFT_THRESHOLD = 1000
-OUTPUT_BUFFER_TOKENS_HARD_THRESHOLD = 1000
+OUTPUT_BUFFER_TOKENS_HARD_THRESHOLD = 600
 MAX_EXTRA_LINES = 10
 def get_pr_diff(git_provider: GitProvider, token_handler: TokenHandler, model: str,
                add_line_numbers_to_hunks: bool = False, disable_extra_lines: bool = False) -> str:
    """
    Returns a string with the diff of the pull request, applying diff minimization techniques if needed.
-def cap_and_log_extra_lines(value, direction) -> int:
+    Args:
-    if value > MAX_EXTRA_LINES:
+        git_provider (GitProvider): An object of the GitProvider class representing the Git provider used for the pull
-        get_logger().warning(f"patch_extra_lines_{direction} was {value}, capping to {MAX_EXTRA_LINES}")
+        request.
-        return MAX_EXTRA_LINES
+        token_handler (TokenHandler): An object of the TokenHandler class used for handling tokens in the context of the
-    return value
+        pull request.
        model (str): The name of the model used for tokenization.
        add_line_numbers_to_hunks (bool, optional): A boolean indicating whether to add line numbers to the hunks in the
        diff. Defaults to False.
        disable_extra_lines (bool, optional): A boolean indicating whether to disable the extension of each patch with
        extra lines of context. Defaults to False.
    Returns:
        str: A string with the diff of the pull request, applying diff minimization techniques if needed.
    """
 def get_pr_diff(git_provider: GitProvider, token_handler: TokenHandler,
                model: str,
                add_line_numbers_to_hunks: bool = False,
                disable_extra_lines: bool = False,
                large_pr_handling=False,
                return_remaining_files=False):
    if disable_extra_lines:
-        PATCH_EXTRA_LINES_BEFORE = 0
+        PATCH_EXTRA_LINES = 0
        PATCH_EXTRA_LINES_AFTER = 0
    else:
-        PATCH_EXTRA_LINES_BEFORE = get_settings().config.patch_extra_lines_before
+        PATCH_EXTRA_LINES = get_settings().config.patch_extra_lines
        PATCH_EXTRA_LINES_AFTER = get_settings().config.patch_extra_lines_after
        PATCH_EXTRA_LINES_BEFORE = cap_and_log_extra_lines(PATCH_EXTRA_LINES_BEFORE, "before")
        PATCH_EXTRA_LINES_AFTER = cap_and_log_extra_lines(PATCH_EXTRA_LINES_AFTER, "after")
    try:
        diff_files_original = git_provider.get_diff_files()
@ -75,8 +76,7 @@ def get_pr_diff(git_provider: GitProvider, token_handler: TokenHandler,
    # generate a standard diff string, with patch extension
    patches_extended, total_tokens, patches_extended_tokens = pr_generate_extended_diff(
-        pr_languages, token_handler, add_line_numbers_to_hunks,
+        pr_languages, token_handler, add_line_numbers_to_hunks, patch_extra_lines=PATCH_EXTRA_LINES)
        patch_extra_lines_before=PATCH_EXTRA_LINES_BEFORE, patch_extra_lines_after=PATCH_EXTRA_LINES_AFTER)
    # if we are under the limit, return the full diff
    if total_tokens + OUTPUT_BUFFER_TOKENS_SOFT_THRESHOLD < get_max_tokens(model):
@ -84,110 +84,56 @@ def get_pr_diff(git_provider: GitProvider, token_handler: TokenHandler,
                          f"returning full diff.")
        return "\n".join(patches_extended)
-    # if we are over the limit, start pruning (If we got here, we will not extend the patches with extra lines)
+    # if we are over the limit, start pruning
    get_logger().info(f"Tokens: {total_tokens}, total tokens over limit: {get_max_tokens(model)}, "
                      f"pruning diff.")
-    patches_compressed_list, total_tokens_list, deleted_files_list, remaining_files_list, file_dict, files_in_patches_list = \
+    patches_compressed, modified_file_names, deleted_file_names, added_file_names, total_tokens_new = \
-        pr_generate_compressed_diff(pr_languages, token_handler, model, add_line_numbers_to_hunks, large_pr_handling)
+        pr_generate_compressed_diff(pr_languages, token_handler, model, add_line_numbers_to_hunks)
    if large_pr_handling and len(patches_compressed_list) > 1:
        get_logger().info(f"Large PR handling mode, and found {len(patches_compressed_list)} patches with original diff.")
        return "" # return empty string, as we want to generate multiple patches with a different prompt
    # return the first patch
    patches_compressed = patches_compressed_list[0]
    total_tokens_new = total_tokens_list[0]
    files_in_patch = files_in_patches_list[0]
    # Insert additional information about added, modified, and deleted files if there is enough space
    max_tokens = get_max_tokens(model) - OUTPUT_BUFFER_TOKENS_HARD_THRESHOLD
    curr_token = total_tokens_new  # == token_handler.count_tokens(final_diff)+token_handler.prompt_tokens
    final_diff = "\n".join(patches_compressed)
    delta_tokens = 10
-    added_list_str = modified_list_str = deleted_list_str = ""
+    if added_file_names and (max_tokens - curr_token) > delta_tokens:
-    unprocessed_files = []
+        added_list_str = ADDED_FILES_ + "\n".join(added_file_names)
    # generate the added, modified, and deleted files lists
    if (max_tokens - curr_token) > delta_tokens:
        for filename, file_values in file_dict.items():
            if filename in files_in_patch:
                continue
            if file_values['edit_type'] == EDIT_TYPE.ADDED:
                unprocessed_files.append(filename)
                if not added_list_str:
                    added_list_str = ADDED_FILES_ + f"\n{filename}"
                else:
                    added_list_str = added_list_str + f"\n{filename}"
            elif file_values['edit_type'] in [EDIT_TYPE.MODIFIED, EDIT_TYPE.RENAMED]:
                unprocessed_files.append(filename)
                if not modified_list_str:
                    modified_list_str = MORE_MODIFIED_FILES_ + f"\n{filename}"
                else:
                    modified_list_str = modified_list_str + f"\n{filename}"
            elif file_values['edit_type'] == EDIT_TYPE.DELETED:
                # unprocessed_files.append(filename) # not needed here, because the file was deleted, so no need to process it
                if not deleted_list_str:
                    deleted_list_str = DELETED_FILES_ + f"\n{filename}"
                else:
                    deleted_list_str = deleted_list_str + f"\n{filename}"
    # prune the added, modified, and deleted files lists, and add them to the final diff
        added_list_str = clip_tokens(added_list_str, max_tokens - curr_token)
        if added_list_str:
            final_diff = final_diff + "\n\n" + added_list_str
            curr_token += token_handler.count_tokens(added_list_str) + 2
    if modified_file_names and (max_tokens - curr_token) > delta_tokens:
        modified_list_str = MORE_MODIFIED_FILES_ + "\n".join(modified_file_names)
        modified_list_str = clip_tokens(modified_list_str, max_tokens - curr_token)
        if modified_list_str:
            final_diff = final_diff + "\n\n" + modified_list_str
            curr_token += token_handler.count_tokens(modified_list_str) + 2
    if deleted_file_names and (max_tokens - curr_token) > delta_tokens:
        deleted_list_str = DELETED_FILES_ + "\n".join(deleted_file_names)
        deleted_list_str = clip_tokens(deleted_list_str, max_tokens - curr_token)
        if deleted_list_str:
            final_diff = final_diff + "\n\n" + deleted_list_str
-
+    try:
        get_logger().debug(f"After pruning, added_list_str: {added_list_str}, modified_list_str: {modified_list_str}, "
                           f"deleted_list_str: {deleted_list_str}")
-    if not return_remaining_files:
+    except Exception as e:
        pass
    return final_diff
    else:
        return final_diff, remaining_files_list
 def get_pr_diff_multiple_patchs(git_provider: GitProvider, token_handler: TokenHandler, model: str,
                add_line_numbers_to_hunks: bool = False, disable_extra_lines: bool = False):
    try:
        diff_files_original = git_provider.get_diff_files()
    except RateLimitExceededException as e:
        get_logger().error(f"Rate limit exceeded for git provider API. original message {e}")
        raise
    diff_files = filter_ignored(diff_files_original)
    if diff_files != diff_files_original:
        try:
            get_logger().info(f"Filtered out {len(diff_files_original) - len(diff_files)} files")
            new_names = set([a.filename for a in diff_files])
            orig_names = set([a.filename for a in diff_files_original])
            get_logger().info(f"Filtered out files: {orig_names - new_names}")
        except Exception as e:
            pass
    # get pr languages
    pr_languages = sort_files_by_main_languages(git_provider.get_languages(), diff_files)
    if pr_languages:
        try:
            get_logger().info(f"PR main language: {pr_languages[0]['language']}")
        except Exception as e:
            pass
    patches_compressed_list, total_tokens_list, deleted_files_list, remaining_files_list, file_dict, files_in_patches_list = \
        pr_generate_compressed_diff(pr_languages, token_handler, model, add_line_numbers_to_hunks, large_pr_handling=True)
    return patches_compressed_list, total_tokens_list, deleted_files_list, remaining_files_list, file_dict, files_in_patches_list
 def pr_generate_extended_diff(pr_languages: list,
                              token_handler: TokenHandler,
                              add_line_numbers_to_hunks: bool,
-                              patch_extra_lines_before: int = 0,
+                              patch_extra_lines: int = 0) -> Tuple[list, int, list]:
-                              patch_extra_lines_after: int = 0) -> Tuple[list, int, list]:
+    """
    Generate a standard diff string with patch extension, while counting the number of tokens used and applying diff
    minimization techniques if needed.
    Args:
    - pr_languages: A list of dictionaries representing the languages used in the pull request and their corresponding
      files.
    - token_handler: An object of the TokenHandler class used for handling tokens in the context of the pull request.
    - add_line_numbers_to_hunks: A boolean indicating whether to add line numbers to the hunks in the diff.
    """
    total_tokens = token_handler.prompt_tokens  # initial tokens
    patches_extended = []
    patches_extended_tokens = []
@ -199,20 +145,12 @@ def pr_generate_extended_diff(pr_languages: list,
                continue
            # extend each patch with extra lines of context
-            extended_patch = extend_patch(original_file_content_str, patch,
+            extended_patch = extend_patch(original_file_content_str, patch, num_lines=patch_extra_lines)
-                                          patch_extra_lines_before, patch_extra_lines_after, file.filename)
+            full_extended_patch = f"\n\n## {file.filename}\n\n{extended_patch}\n"
            if not extended_patch:
                get_logger().warning(f"Failed to extend patch for file: {file.filename}")
                continue
            full_extended_patch = f"\n\n## {file.filename}\n{extended_patch.rstrip()}\n"
            if add_line_numbers_to_hunks:
                full_extended_patch = convert_to_hunks_with_lines_numbers(extended_patch, file)
            # add AI-summary metadata to the patch
            if file.ai_file_summary and  get_settings().get("config.enable_ai_metadata", False):
                full_extended_patch = add_ai_summary_top_patch(file, full_extended_patch)
            patch_tokens = token_handler.count_tokens(full_extended_patch)
            file.tokens = patch_tokens
            total_tokens += patch_tokens
@ -223,17 +161,41 @@ def pr_generate_extended_diff(pr_languages: list,
 def pr_generate_compressed_diff(top_langs: list, token_handler: TokenHandler, model: str,
-                                convert_hunks_to_line_numbers: bool,
+                                convert_hunks_to_line_numbers: bool) -> Tuple[list, list, list, list, int]:
-                                large_pr_handling: bool) -> Tuple[list, list, list, list, dict, list]:
+    """
-    deleted_files_list = []
+    Generate a compressed diff string for a pull request, using diff minimization techniques to reduce the number of
    tokens used.
    Args:
        top_langs (list): A list of dictionaries representing the languages used in the pull request and their
        corresponding files.
        token_handler (TokenHandler): An object of the TokenHandler class used for handling tokens in the context of the
        pull request.
        model (str): The model used for tokenization.
        convert_hunks_to_line_numbers (bool): A boolean indicating whether to convert hunks to line numbers in the diff.
    Returns:
        Tuple[list, list, list]: A tuple containing the following lists:
            - patches: A list of compressed diff patches for each file in the pull request.
            - modified_files_list: A list of file names that were skipped due to large patch size.
            - deleted_files_list: A list of file names that were deleted in the pull request.
    Minimization techniques to reduce the number of tokens:
    0. Start from the largest diff patch to smaller ones
    1. Don't use extend context lines around diff
    2. Minimize deleted files
    3. Minimize deleted hunks
    4. Minimize all remaining files when you reach token limit
    """
    patches = []
    added_files_list = []
    modified_files_list = []
    deleted_files_list = []
    # sort each one of the languages in top_langs by the number of tokens in the diff
    sorted_files = []
    for lang in top_langs:
        sorted_files.extend(sorted(lang['files'], key=lambda x: x.tokens, reverse=True))
-    # generate patches for each file, and count tokens
+    total_tokens = token_handler.prompt_tokens
    file_dict = {}
    for file in sorted_files:
        original_file_content_str = file.base_file
        new_file_content_str = file.head_file
@ -245,91 +207,55 @@ def pr_generate_compressed_diff(top_langs: list, token_handler: TokenHandler, mo
        patch = handle_patch_deletions(patch, original_file_content_str,
                                       new_file_content_str, file.filename, file.edit_type)
        if patch is None:
            # if not deleted_files_list:
            #     total_tokens += token_handler.count_tokens(DELETED_FILES_)
            if file.filename not in deleted_files_list:
                deleted_files_list.append(file.filename)
            # total_tokens += token_handler.count_tokens(file.filename) + 1
            continue
        if convert_hunks_to_line_numbers:
            patch = convert_to_hunks_with_lines_numbers(patch, file)
        ## add AI-summary metadata to the patch (disabled, since we are in the compressed diff)
        # if file.ai_file_summary and get_settings().config.get('config.is_auto_command', False):
        #     patch = add_ai_summary_top_patch(file, patch)
        new_patch_tokens = token_handler.count_tokens(patch)
        file_dict[file.filename] = {'patch': patch, 'tokens': new_patch_tokens, 'edit_type': file.edit_type}
    max_tokens_model = get_max_tokens(model)
    # first iteration
    files_in_patches_list = []
    remaining_files_list =  [file.filename for file in sorted_files]
    patches_list =[]
    total_tokens_list = []
    total_tokens, patches, remaining_files_list, files_in_patch_list = generate_full_patch(convert_hunks_to_line_numbers, file_dict,
                                       max_tokens_model, remaining_files_list, token_handler)
    patches_list.append(patches)
    total_tokens_list.append(total_tokens)
    files_in_patches_list.append(files_in_patch_list)
    # additional iterations (if needed)
    if large_pr_handling:
        NUMBER_OF_ALLOWED_ITERATIONS = get_settings().pr_description.max_ai_calls - 1 # one more call is to summarize
        for i in range(NUMBER_OF_ALLOWED_ITERATIONS-1):
            if remaining_files_list:
                total_tokens, patches, remaining_files_list, files_in_patch_list = generate_full_patch(convert_hunks_to_line_numbers,
                                                                                 file_dict,
                                                                                  max_tokens_model,
                                                                                  remaining_files_list, token_handler)
                if patches:
                    patches_list.append(patches)
                    total_tokens_list.append(total_tokens)
                    files_in_patches_list.append(files_in_patch_list)
            else:
                break
    return patches_list, total_tokens_list, deleted_files_list, remaining_files_list, file_dict, files_in_patches_list
 def generate_full_patch(convert_hunks_to_line_numbers, file_dict, max_tokens_model,remaining_files_list_prev, token_handler):
    total_tokens = token_handler.prompt_tokens # initial tokens
    patches = []
    remaining_files_list_new = []
    files_in_patch_list = []
    for filename, data in file_dict.items():
        if filename not in remaining_files_list_prev:
            continue
        patch = data['patch']
        new_patch_tokens = data['tokens']
        edit_type = data['edit_type']
        # Hard Stop, no more tokens
-        if total_tokens > max_tokens_model - OUTPUT_BUFFER_TOKENS_HARD_THRESHOLD:
+        if total_tokens > get_max_tokens(model) - OUTPUT_BUFFER_TOKENS_HARD_THRESHOLD:
-            get_logger().warning(f"File was fully skipped, no more tokens: {filename}.")
+            get_logger().warning(f"File was fully skipped, no more tokens: {file.filename}.")
            continue
        # If the patch is too large, just show the file name
-        if total_tokens + new_patch_tokens > max_tokens_model - OUTPUT_BUFFER_TOKENS_SOFT_THRESHOLD:
+        if total_tokens + new_patch_tokens > get_max_tokens(model) - OUTPUT_BUFFER_TOKENS_SOFT_THRESHOLD:
            # Current logic is to skip the patch if it's too large
            # TODO: Option for alternative logic to remove hunks from the patch to reduce the number of tokens
            #  until we meet the requirements
            if get_settings().config.verbosity_level >= 2:
-                get_logger().warning(f"Patch too large, skipping it, {filename}")
+                get_logger().warning(f"Patch too large, minimizing it, {file.filename}")
-            remaining_files_list_new.append(filename)
+            if file.edit_type == EDIT_TYPE.ADDED:
                # if not added_files_list:
                #     total_tokens += token_handler.count_tokens(ADDED_FILES_)
                if file.filename not in added_files_list:
                    added_files_list.append(file.filename)
                # total_tokens += token_handler.count_tokens(file.filename) + 1
            else:
                # if not modified_files_list:
                #     total_tokens += token_handler.count_tokens(MORE_MODIFIED_FILES_)
                if file.filename not in modified_files_list:
                    modified_files_list.append(file.filename)
                # total_tokens += token_handler.count_tokens(file.filename) + 1
            continue
        if patch:
            if not convert_hunks_to_line_numbers:
-                patch_final = f"\n\n## File: '{filename.strip()}\n\n{patch.strip()}\n'"
+                patch_final = f"\n\n## file: '{file.filename.strip()}\n\n{patch.strip()}\n'"
            else:
                patch_final = "\n\n" + patch.strip()
            patches.append(patch_final)
            total_tokens += token_handler.count_tokens(patch_final)
            files_in_patch_list.append(filename)
            if get_settings().config.verbosity_level >= 2:
-                get_logger().info(f"Tokens: {total_tokens}, last filename: {filename}")
+                get_logger().info(f"Tokens: {total_tokens}, last filename: {file.filename}")
-    return total_tokens, patches, remaining_files_list_new, files_in_patch_list
+
    return patches, modified_files_list, deleted_files_list, added_files_list, total_tokens
 async def retry_with_fallback_models(f: Callable, model_type: ModelType = ModelType.REGULAR):
@ -347,9 +273,11 @@ async def retry_with_fallback_models(f: Callable, model_type: ModelType = ModelT
        except:
            get_logger().warning(
                f"Failed to generate prediction with {model}"
                f"{(' from deployment ' + deployment_id) if deployment_id else ''}: "
                f"{traceback.format_exc()}"
            )
            if i == len(all_models) - 1:  # If it's the last iteration
-                raise Exception(f"Failed to generate prediction with any model of {all_models}")
+                raise  # Re-raise the last exception
 def _get_all_models(model_type: ModelType = ModelType.REGULAR) -> List[str]:
@ -415,21 +343,12 @@ def get_pr_multi_diffs(git_provider: GitProvider,
    for lang in pr_languages:
        sorted_files.extend(sorted(lang['files'], key=lambda x: x.tokens, reverse=True))
    # Get the maximum number of extra lines before and after the patch
    PATCH_EXTRA_LINES_BEFORE = get_settings().config.patch_extra_lines_before
    PATCH_EXTRA_LINES_AFTER = get_settings().config.patch_extra_lines_after
    PATCH_EXTRA_LINES_BEFORE = cap_and_log_extra_lines(PATCH_EXTRA_LINES_BEFORE, "before")
    PATCH_EXTRA_LINES_AFTER = cap_and_log_extra_lines(PATCH_EXTRA_LINES_AFTER, "after")
    # try first a single run with standard diff string, with patch extension, and no deletions
    patches_extended, total_tokens, patches_extended_tokens = pr_generate_extended_diff(
-        pr_languages, token_handler, add_line_numbers_to_hunks=True,
+        pr_languages, token_handler, add_line_numbers_to_hunks=True)
        patch_extra_lines_before=PATCH_EXTRA_LINES_BEFORE,
        patch_extra_lines_after=PATCH_EXTRA_LINES_AFTER)
    # if we are under the limit, return the full diff
    if total_tokens + OUTPUT_BUFFER_TOKENS_SOFT_THRESHOLD < get_max_tokens(model):
-        return ["\n".join(patches_extended)] if patches_extended else []
+        return ["\n".join(patches_extended)]
    patches = []
    final_diff_list = []
@ -453,28 +372,9 @@ def get_pr_multi_diffs(git_provider: GitProvider,
            continue
        patch = convert_to_hunks_with_lines_numbers(patch, file)
        # add AI-summary metadata to the patch
        if file.ai_file_summary and get_settings().get("config.enable_ai_metadata", False):
            patch = add_ai_summary_top_patch(file, patch)
        new_patch_tokens = token_handler.count_tokens(patch)
-        if patch and (token_handler.prompt_tokens + new_patch_tokens) > get_max_tokens(
+        if patch and (token_handler.prompt_tokens + new_patch_tokens) > get_max_tokens(model) - OUTPUT_BUFFER_TOKENS_SOFT_THRESHOLD:
                model) - OUTPUT_BUFFER_TOKENS_SOFT_THRESHOLD:
            if get_settings().config.get('large_patch_policy', 'skip') == 'skip':
                get_logger().warning(f"Patch too large, skipping: {file.filename}")
                continue
            elif get_settings().config.get('large_patch_policy') == 'clip':
                delta_tokens = get_max_tokens(model) - OUTPUT_BUFFER_TOKENS_SOFT_THRESHOLD - token_handler.prompt_tokens
                patch_clipped = clip_tokens(patch, delta_tokens, delete_last_line=True, num_input_tokens=new_patch_tokens)
                new_patch_tokens = token_handler.count_tokens(patch_clipped)
                if patch_clipped and (token_handler.prompt_tokens + new_patch_tokens) > get_max_tokens(
                        model) - OUTPUT_BUFFER_TOKENS_SOFT_THRESHOLD:
                    get_logger().warning(f"Patch too large, skipping: {file.filename}")
                    continue
                else:
                    get_logger().info(f"Clipped large patch for file: {file.filename}")
                    patch = patch_clipped
            else:
            get_logger().warning(f"Patch too large, skipping: {file.filename}")
            continue
@ -484,10 +384,6 @@ def get_pr_multi_diffs(git_provider: GitProvider,
            patches = []
            total_tokens = token_handler.prompt_tokens
            call_number += 1
            if call_number > max_calls: # avoid creating new patches
                if get_settings().config.verbosity_level >= 2:
                    get_logger().info(f"Reached max calls ({max_calls})")
                break
            if get_settings().config.verbosity_level >= 2:
                get_logger().info(f"Call number: {call_number}")
@ -503,46 +399,3 @@ def get_pr_multi_diffs(git_provider: GitProvider,
        final_diff_list.append(final_diff)
    return final_diff_list
 def add_ai_metadata_to_diff_files(git_provider, pr_description_files):
    """
    Adds AI metadata to the diff files based on the PR description files (FilePatchInfo.ai_file_summary).
    """
    try:
        if not pr_description_files:
            get_logger().warning(f"PR description files are empty.")
            return
        available_files = {pr_file['full_file_name'].strip(): pr_file for pr_file in pr_description_files}
        diff_files = git_provider.get_diff_files()
        found_any_match = False
        for file in diff_files:
            filename = file.filename.strip()
            if filename in available_files:
                file.ai_file_summary = available_files[filename]
                found_any_match = True
        if not found_any_match:
            get_logger().error(f"Failed to find any matching files between PR description and diff files.",
                               artifact={"pr_description_files": pr_description_files})
    except Exception as e:
        get_logger().error(f"Failed to add AI metadata to diff files: {e}",
                           artifact={"traceback": traceback.format_exc()})
 def add_ai_summary_top_patch(file, full_extended_patch):
    try:
        # below every instance of '## File: ...' in the patch, add the ai-summary metadata
        full_extended_patch_lines = full_extended_patch.split("\n")
        for i, line in enumerate(full_extended_patch_lines):
            if line.startswith("## File:") or line.startswith("## file:"):
                full_extended_patch_lines.insert(i + 1,
                                                 f"### AI-generated changes summary:\n{file.ai_file_summary['long_summary']}")
                full_extended_patch = "\n".join(full_extended_patch_lines)
                return full_extended_patch
        # if no '## File: ...' was found
        return full_extended_patch
    except Exception as e:
        get_logger().error(f"Failed to add AI summary to the top of the patch: {e}",
                           artifact={"traceback": traceback.format_exc()})
        return full_extended_patch
--- a/pr_agent/algo/token_handler.py
+++ b/pr_agent/algo/token_handler.py
@ -3,8 +3,6 @@ from tiktoken import encoding_for_model, get_encoding
 from pr_agent.config_loader import get_settings
 from threading import Lock
 from pr_agent.log import get_logger
 class TokenEncoder:
    _encoder_instance = None
@ -64,16 +62,12 @@ class TokenHandler:
        Returns:
        The sum of the number of tokens in the system and user strings.
        """
        try:
        environment = Environment(undefined=StrictUndefined)
        system_prompt = environment.from_string(system).render(vars)
        user_prompt = environment.from_string(user).render(vars)
        system_prompt_tokens = len(encoder.encode(system_prompt))
        user_prompt_tokens = len(encoder.encode(user_prompt))
        return system_prompt_tokens + user_prompt_tokens
        except Exception as e:
            get_logger().error(f"Error in _get_system_user_tokens: {e}")
            return 0
    def count_tokens(self, patch: str) -> int:
        """
--- a/pr_agent/algo/types.py
+++ b/pr_agent/algo/types.py
@ -21,4 +21,3 @@ class FilePatchInfo:
    old_filename: str = None
    num_plus_lines: int = -1
    num_minus_lines: int = -1
    ai_file_summary: str = None
--- a/pr_agent/algo/utils.py
+++ b/pr_agent/algo/utils.py
@ -1,24 +1,15 @@
 from __future__ import annotations
 import copy
 import difflib
 import hashlib
 import html
 import json
 import os
 import re
 import textwrap
 import time
 import traceback
 from datetime import datetime
 from enum import Enum
 from typing import Any, List, Tuple
 import html2text
 import requests
 import yaml
 from pydantic import BaseModel
 from starlette_context import context
 from pr_agent.algo import MAX_TOKENS
@ -27,22 +18,10 @@ from pr_agent.config_loader import get_settings, global_settings
 from pr_agent.algo.types import FilePatchInfo
 from pr_agent.log import get_logger
 class Range(BaseModel):
    line_start: int  # should be 0-indexed
    line_end: int
    column_start: int = -1
    column_end: int = -1
 class ModelType(str, Enum):
    REGULAR = "regular"
    TURBO = "turbo"
 class PRReviewHeader(str, Enum):
    REGULAR = "## PR Reviewer Guide"
    INCREMENTAL = "## Incremental PR Reviewer Guide"
 def get_setting(key: str) -> Any:
    try:
        key = key.upper()
@ -51,7 +30,7 @@ def get_setting(key: str) -> Any:
        return global_settings.get(key, None)
-def emphasize_header(text: str, only_markdown=False, reference_link=None) -> str:
+def emphasize_header(text: str) -> str:
    try:
        # Finding the position of the first occurrence of ": "
        colon_position = text.find(": ")
@ -59,16 +38,7 @@ def emphasize_header(text: str, only_markdown=False, reference_link=None) -> str
        # Splitting the string and wrapping the first part in <strong> tags
        if colon_position != -1:
            # Everything before the colon (inclusive) is wrapped in <strong> tags
-            if only_markdown:
+            transformed_string = "<strong>" + text[:colon_position + 1] + "</strong>" + text[colon_position + 1:]
                if reference_link:
                    transformed_string = f"[**{text[:colon_position + 1]}**]({reference_link})\n" + text[colon_position + 1:]
                else:
                    transformed_string = f"**{text[:colon_position + 1]}**\n" + text[colon_position + 1:]
            else:
                if reference_link:
                    transformed_string = f"<strong><a href='{reference_link}'>{text[:colon_position + 1]}</a></strong><br>" + text[colon_position + 1:]
                else:
                    transformed_string = "<strong>" + text[:colon_position + 1] + "</strong>" +'<br>' + text[colon_position + 1:]
        else:
            # If there's no ": ", return the original string
            transformed_string = text
@ -90,10 +60,8 @@ def unique_strings(input_list: List[str]) -> List[str]:
            seen.add(item)
    return unique_list
-def convert_to_markdown_v2(output_data: dict,
+
-                           gfm_supported: bool = True,
+def convert_to_markdown(output_data: dict, gfm_supported: bool = True, incremental_review=None) -> str:
                           incremental_review=None,
                           git_provider=None) -> str:
    """
    Convert a dictionary of data into markdown format.
    Args:
@ -104,141 +72,69 @@ def convert_to_markdown_v2(output_data: dict,
    emojis = {
        "Can be split": "🔀",
-        "Key issues to review": "⚡",
+        "Possible issues": "⚡",
        "Recommended focus areas for review": "⚡",
        "Score": "🏅",
        "Relevant tests": "🧪",
        "Focused PR": "✨",
        "Relevant ticket": "🎫",
        "Security concerns": "🔒",
        "Insights from user's answers": "📝",
        "Code feedback": "🤖",
        "Estimated effort to review [1-5]": "⏱️",
        "Ticket compliance check": "🎫",
    }
    markdown_text = ""
    if not incremental_review:
-        markdown_text += f"{PRReviewHeader.REGULAR.value} 🔍\n\n"
+        markdown_text += f"## PR Review 🔍\n\n"
    else:
-        markdown_text += f"{PRReviewHeader.INCREMENTAL.value} 🔍\n\n"
+        markdown_text += f"## Incremental PR Review 🔍 \n\n"
        markdown_text += f"⏮️ Review for commits since previous PR-Agent review {incremental_review}.\n\n"
    if gfm_supported:
        markdown_text += "<table>\n<tr>\n"
        # markdown_text += """<td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Feedback&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td> <td></td></tr>"""
    if not output_data or not output_data.get('review', {}):
        return ""
    if get_settings().get("pr_reviewer.enable_intro_text", False):
        markdown_text += f"Here are some key observations to aid the review process:\n\n"
    if gfm_supported:
        markdown_text += "<table>\n"
    for key, value in output_data['review'].items():
        if value is None or value == '' or value == {} or value == []:
-            if key.lower() not in ['can_be_split', 'key_issues_to_review']:
+            if key.lower() != 'can_be_split':
                continue
        key_nice = key.replace('_', ' ').capitalize()
        emoji = emojis.get(key_nice, "")
        if gfm_supported:
            if 'Estimated effort to review' in key_nice:
-            key_nice = 'Estimated effort to review'
+                key_nice = 'Estimated&nbsp;effort&nbsp;to&nbsp;review [1-5]'
-            value = str(value).strip()
+            if 'security concerns' in key_nice.lower():
            if value.isnumeric():
                value_int = int(value)
            else:
                try:
                    value_int = int(value.split(',')[0])
                except ValueError:
                    continue
            blue_bars = '🔵' * value_int
            white_bars = '⚪' * (5 - value_int)
            value = f"{value_int} {blue_bars}{white_bars}"
            if gfm_supported:
                markdown_text += f"<tr><td>"
                markdown_text += f"{emoji}&nbsp;<strong>{key_nice}</strong>: {value}"
                markdown_text += f"</td></tr>\n"
            else:
                markdown_text += f"### {emoji} {key_nice}: {value}\n\n"
        elif 'relevant tests' in key_nice.lower():
            value = str(value).strip().lower()
            if gfm_supported:
                markdown_text += f"<tr><td>"
                if is_value_no(value):
                    markdown_text += f"{emoji}&nbsp;<strong>No relevant tests</strong>"
                else:
                    markdown_text += f"{emoji}&nbsp;<strong>PR contains tests</strong>"
                markdown_text += f"</td></tr>\n"
            else:
                if is_value_no(value):
                    markdown_text += f'### {emoji} No relevant tests\n\n'
                else:
                    markdown_text += f"### PR contains tests\n\n"
        elif 'ticket compliance check' in key_nice.lower():
            markdown_text = ticket_markdown_logic(emoji, markdown_text, value, gfm_supported)
        elif 'security concerns' in key_nice.lower():
            if gfm_supported:
                markdown_text += f"<tr><td>"
                if is_value_no(value):
                    markdown_text += f"{emoji}&nbsp;<strong>No security concerns identified</strong>"
                else:
                    markdown_text += f"{emoji}&nbsp;<strong>Security concerns</strong><br><br>\n\n"
                value = emphasize_header(value.strip())
-                    markdown_text += f"{value}"
+                markdown_text += f"<tr><td> {emoji}&nbsp;<strong>{key_nice}</strong></td><td>\n\n{value}\n\n</td></tr>\n"
                markdown_text += f"</td></tr>\n"
            else:
                if is_value_no(value):
                    markdown_text += f'### {emoji} No security concerns identified\n\n'
                else:
                    markdown_text += f"### {emoji} Security concerns\n\n"
                    value = emphasize_header(value.strip(), only_markdown=True)
                    markdown_text += f"{value}\n\n"
            elif 'can be split' in key_nice.lower():
            if gfm_supported:
                markdown_text += f"<tr><td>"
                markdown_text += process_can_be_split(emoji, value)
-                markdown_text += f"</td></tr>\n"
+            elif 'possible issues' in key_nice.lower():
-        elif 'key issues to review' in key_nice.lower():
+                value = value.strip()
-            # value is a list of issues
+                issues = value.split('\n- ')
-            if is_value_no(value):
+                for i, _ in enumerate(issues):
-                if gfm_supported:
+                    issues[i] = issues[i].strip().strip('-').strip()
-                    markdown_text += f"<tr><td>"
+                issues = unique_strings(issues) # remove duplicates
-                    markdown_text += f"{emoji}&nbsp;<strong>No major issues detected</strong>"
+                number_of_issues = len(issues)
-                    markdown_text += f"</td></tr>\n"
+                if number_of_issues > 1:
-                else:
+                    markdown_text += f"<tr><td rowspan={number_of_issues}> {emoji}&nbsp;<strong>{key_nice}</strong></td>\n"
                    markdown_text += f"### {emoji} No major issues detected\n\n"
            else:
                issues = value
                if gfm_supported:
                    markdown_text += f"<tr><td>"
                    # markdown_text += f"{emoji}&nbsp;<strong>{key_nice}</strong><br><br>\n\n"
                    markdown_text += f"{emoji}&nbsp;<strong>Recommended focus areas for review</strong><br><br>\n\n"
                else:
                    markdown_text += f"### {emoji} Recommended focus areas for review\n\n#### \n"
                    for i, issue in enumerate(issues):
-                    try:
+                        if not issue:
                        if not issue or not isinstance(issue, dict):
                            continue
-                        relevant_file = issue.get('relevant_file', '').strip()
+                        issue = emphasize_header(issue)
-                        issue_header = issue.get('issue_header', '').strip()
+                        if i == 0:
-                        issue_content = issue.get('issue_content', '').strip()
+                            markdown_text += f"<td>\n\n{issue}</td></tr>\n"
                        start_line = int(str(issue.get('start_line', 0)).strip())
                        end_line = int(str(issue.get('end_line', 0)).strip())
                        reference_link = git_provider.get_line_link(relevant_file, start_line, end_line)
                        if gfm_supported:
                            issue_str = f"<a href='{reference_link}'><strong>{issue_header}</strong></a><br>{issue_content}"
                        else:
-                            issue_str = f"[**{issue_header}**]({reference_link})\n\n{issue_content}\n\n"
+                            markdown_text += f"<tr>\n<td>\n\n{issue}</td></tr>\n"
                        markdown_text += f"{issue_str}\n\n"
                    except Exception as e:
                        get_logger().exception(f"Failed to process 'Recommended focus areas for review': {e}")
                if gfm_supported:
                    markdown_text += f"</td></tr>\n"
                else:
-            if gfm_supported:
+                    value = emphasize_header(value.strip('-').strip())
-                markdown_text += f"<tr><td>"
+                    markdown_text += f"<tr><td> {emoji}&nbsp;<strong>{key_nice}</strong></td><td>\n\n{value}\n\n</td></tr>\n"
                markdown_text += f"{emoji}&nbsp;<strong>{key_nice}</strong>: {value}"
                markdown_text += f"</td></tr>\n"
            else:
-                markdown_text += f"### {emoji} {key_nice}: {value}\n\n"
+                markdown_text += f"<tr><td> {emoji}&nbsp;<strong>{key_nice}</strong></td><td>\n\n{value}\n\n</td></tr>\n"
-
+        else:
            if len(value.split()) > 1:
                markdown_text += f"{emoji} **{key_nice}:**\n\n {value}\n\n"
            else:
                markdown_text += f"{emoji} **{key_nice}:** {value}\n\n"
    if gfm_supported:
        markdown_text += "</table>\n"
@ -248,7 +144,7 @@ def convert_to_markdown_v2(output_data: dict,
            markdown_text += f"<details><summary> <strong>Code feedback:</strong></summary>\n\n"
            markdown_text += "<hr>"
        else:
-            markdown_text += f"\n\n### Code feedback:\n\n"
+            markdown_text += f"\n\n** Code feedback:**\n\n"
        for i, value in enumerate(output_data['code_feedback']):
            if value is None or value == '' or value == {} or value == []:
                continue
@ -257,107 +153,41 @@ def convert_to_markdown_v2(output_data: dict,
            markdown_text = markdown_text[:-4]
        if gfm_supported:
            markdown_text += f"</details>"
-
+    #print(markdown_text)
    return markdown_text
 def ticket_markdown_logic(emoji, markdown_text, value, gfm_supported) -> str:
    ticket_compliance_str = ""
    final_compliance_level = -1
    if isinstance(value, list):
        for v in value:
            ticket_url = v.get('ticket_url', '').strip()
            compliance_level = v.get('overall_compliance_level', '').strip()
            # add emojis, if 'Fully compliant' ✅, 'Partially compliant' 🔶, or 'Not compliant' ❌
            if compliance_level.lower() == 'fully compliant':
                # compliance_level = '✅ Fully compliant'
                final_compliance_level = 2 if final_compliance_level == -1 else 1
            elif compliance_level.lower() == 'partially compliant':
                # compliance_level = '🔶 Partially compliant'
                final_compliance_level = 1
            elif compliance_level.lower() == 'not compliant':
                # compliance_level = '❌ Not compliant'
                final_compliance_level = 0 if final_compliance_level < 1 else 1
            # explanation = v.get('compliance_analysis', '').strip()
            explanation = ''
            fully_compliant_str = v.get('fully_compliant_requirements', '').strip()
            not_compliant_str = v.get('not_compliant_requirements', '').strip()
            if fully_compliant_str:
                explanation += f"Fully compliant requirements:\n{fully_compliant_str}\n\n"
            if not_compliant_str:
                explanation += f"Not compliant requirements:\n{not_compliant_str}\n\n"
            ticket_compliance_str += f"\n\n**[{ticket_url.split('/')[-1]}]({ticket_url}) - {compliance_level}**\n\n{explanation}\n\n"
        if final_compliance_level == 2:
            compliance_level = '✅'
        elif final_compliance_level == 1:
            compliance_level = '🔶'
        else:
            compliance_level = '❌'
        if gfm_supported:
            markdown_text += f"<tr><td>\n\n"
            markdown_text += f"**{emoji} Ticket compliance analysis {compliance_level}**\n\n"
            markdown_text += ticket_compliance_str
            markdown_text += f"</td></tr>\n"
        else:
            markdown_text += f"### {emoji} Ticket compliance analysis {compliance_level}\n\n"
            markdown_text += ticket_compliance_str+"\n\n"
    return markdown_text
 def process_can_be_split(emoji, value):
    try:
    # key_nice = "Can this PR be split?"
    key_nice = "Multiple PR themes"
    markdown_text = ""
    if not value or isinstance(value, list) and len(value) == 1:
        value = "No"
-            # markdown_text += f"<tr><td> {emoji}&nbsp;<strong>{key_nice}</strong></td><td>\n\n{value}\n\n</td></tr>\n"
+        markdown_text += f"<tr><td> {emoji}&nbsp;<strong>{key_nice}</strong></td><td>\n\n{value}\n\n</td></tr>\n"
            # markdown_text += f"### {emoji} No multiple PR themes\n\n"
            markdown_text += f"{emoji} <strong>No multiple PR themes</strong>\n\n"
    else:
-            markdown_text += f"{emoji} <strong>{key_nice}</strong><br><br>\n\n"
+        number_of_splits = len(value)
        markdown_text += f"<tr><td rowspan={number_of_splits}> {emoji}&nbsp;<strong>{key_nice}</strong></td>\n"
        for i, split in enumerate(value):
            title = split.get('title', '')
            relevant_files = split.get('relevant_files', [])
-                markdown_text += f"<details><summary>\nSub-PR theme: <b>{title}</b></summary>\n\n"
+            if i == 0:
-                markdown_text += f"___\n\nRelevant files:\n\n"
+                markdown_text += f"<td><details><summary>\nSub-PR theme: <strong>{title}</strong></summary>\n\n"
                markdown_text += f"<hr>\n"
                markdown_text += f"Relevant files:\n"
                markdown_text += f"<ul>\n"
                for file in relevant_files:
-                    markdown_text += f"- {file}\n"
+                    markdown_text += f"<li>{file}</li>\n"
-                markdown_text += f"___\n\n"
+                markdown_text += f"</ul>\n\n</details></td></tr>\n"
-                markdown_text += f"</details>\n\n"
+            else:
-
+                markdown_text += f"<tr>\n<td><details><summary>\nSub-PR theme: <strong>{title}</strong></summary>\n\n"
-                # markdown_text += f"#### Sub-PR theme: {title}\n\n"
+                markdown_text += f"<hr>\n"
-                # markdown_text += f"Relevant files:\n\n"
+                markdown_text += f"Relevant files:\n"
-                # for file in relevant_files:
+                markdown_text += f"<ul>\n"
-                #     markdown_text += f"- {file}\n"
+                for file in relevant_files:
-                # markdown_text += "\n"
+                    markdown_text += f"<li>{file}</li>\n"
-            # number_of_splits = len(value)
+                markdown_text += f"</ul>\n\n</details></td></tr>\n"
            # markdown_text += f"<tr><td rowspan={number_of_splits}> {emoji}&nbsp;<strong>{key_nice}</strong></td>\n"
            # for i, split in enumerate(value):
            #     title = split.get('title', '')
            #     relevant_files = split.get('relevant_files', [])
            #     if i == 0:
            #         markdown_text += f"<td><details><summary>\nSub-PR theme:<br><strong>{title}</strong></summary>\n\n"
            #         markdown_text += f"<hr>\n"
            #         markdown_text += f"Relevant files:\n"
            #         markdown_text += f"<ul>\n"
            #         for file in relevant_files:
            #             markdown_text += f"<li>{file}</li>\n"
            #         markdown_text += f"</ul>\n\n</details></td></tr>\n"
            #     else:
            #         markdown_text += f"<tr>\n<td><details><summary>\nSub-PR theme:<br><strong>{title}</strong></summary>\n\n"
            #         markdown_text += f"<hr>\n"
            #         markdown_text += f"Relevant files:\n"
            #         markdown_text += f"<ul>\n"
            #         for file in relevant_files:
            #             markdown_text += f"<li>{file}</li>\n"
            #         markdown_text += f"</ul>\n\n</details></td></tr>\n"
    except Exception as e:
        get_logger().exception(f"Failed to process can be split: {e}")
        return ""
    return markdown_text
@ -526,7 +356,7 @@ def convert_str_to_datetime(date_str):
    return datetime.strptime(date_str, datetime_format)
-def load_large_diff(filename, new_file_content_str: str, original_file_content_str: str, show_warning: bool = True) -> str:
+def load_large_diff(filename, new_file_content_str: str, original_file_content_str: str) -> str:
    """
    Generate a patch for a modified file by comparing the original content of the file with the new content provided as
    input.
@ -545,7 +375,7 @@ def load_large_diff(filename, new_file_content_str: str, original_file_content_s
    try:
        diff = difflib.unified_diff(original_file_content_str.splitlines(keepends=True),
                                    new_file_content_str.splitlines(keepends=True))
-        if get_settings().config.verbosity_level >= 2 and show_warning:
+        if get_settings().config.verbosity_level >= 2:
            get_logger().warning(f"File was modified, but no patch was found. Manually creating patch: {filename}.")
        patch = ''.join(diff)
    except Exception:
@ -599,38 +429,28 @@ def _fix_key_value(key: str, value: str):
    return key, value
-def load_yaml(response_text: str, keys_fix_yaml: List[str] = [], first_key="", last_key="") -> dict:
+def load_yaml(response_text: str, keys_fix_yaml: List[str] = []) -> dict:
-    response_text = response_text.strip('\n').removeprefix('```yaml').rstrip().removesuffix('```')
+    response_text = response_text.removeprefix('```yaml').rstrip('`')
    try:
        data = yaml.safe_load(response_text)
    except Exception as e:
-        get_logger().warning(f"Initial failure to parse AI prediction: {e}")
+        get_logger().error(f"Failed to parse AI prediction: {e}")
-        data = try_fix_yaml(response_text, keys_fix_yaml=keys_fix_yaml, first_key=first_key, last_key=last_key)
+        data = try_fix_yaml(response_text, keys_fix_yaml=keys_fix_yaml)
        if not data:
            get_logger().error(f"Failed to parse AI prediction after fallbacks",
                               artifact={'response_text': response_text})
        else:
            get_logger().info(f"Successfully parsed AI prediction after fallbacks",
                              artifact={'response_text': response_text})
    return data
-
+def try_fix_yaml(response_text: str, keys_fix_yaml: List[str] = []) -> dict:
 def try_fix_yaml(response_text: str,
                 keys_fix_yaml: List[str] = [],
                 first_key="",
                 last_key="",) -> dict:
    response_text_lines = response_text.split('\n')
-    keys_yaml = ['relevant line:', 'suggestion content:', 'relevant file:', 'existing code:', 'improved code:']
+    keys = ['relevant line:', 'suggestion content:', 'relevant file:', 'existing code:', 'improved code:']
-    keys_yaml = keys_yaml + keys_fix_yaml
+    keys = keys + keys_fix_yaml
    # first fallback - try to convert 'relevant line: ...' to relevant line: |-\n        ...'
    response_text_lines_copy = response_text_lines.copy()
    for i in range(0, len(response_text_lines_copy)):
-        for key in keys_yaml:
+        for key in keys:
-            if key in response_text_lines_copy[i] and not '|' in response_text_lines_copy[i]:
+            if key in response_text_lines_copy[i] and not '|-' in response_text_lines_copy[i]:
                response_text_lines_copy[i] = response_text_lines_copy[i].replace(f'{key}',
-                                                                                  f'{key} |\n        ')
+                                                                                  f'{key} |-\n        ')
    try:
        data = yaml.safe_load('\n'.join(response_text_lines_copy))
        get_logger().info(f"Successfully parsed AI prediction after adding |-\n")
@ -650,7 +470,6 @@ def try_fix_yaml(response_text: str,
        except:
            pass
     # third fallback - try to remove leading and trailing curly brackets
    response_text_copy = response_text.strip().rstrip().removeprefix('{').removesuffix('}').rstrip(':\n')
    try:
@ -660,28 +479,7 @@ def try_fix_yaml(response_text: str,
    except:
        pass
-
+    # fourth fallback - try to remove last lines
    # forth fallback - try to extract yaml snippet by 'first_key' and 'last_key'
    # note that 'last_key' can be in practice a key that is not the last key in the yaml snippet.
    # it just needs to be some inner key, so we can look for newlines after it
    if first_key and last_key:
        index_start = response_text.find(f"\n{first_key}:")
        if index_start == -1:
            index_start = response_text.find(f"{first_key}:")
        index_last_code = response_text.rfind(f"{last_key}:")
        index_end = response_text.find("\n\n", index_last_code) # look for newlines after last_key
        if index_end == -1:
            index_end = len(response_text)
        response_text_copy = response_text[index_start:index_end].strip().strip('```yaml').strip('`').strip()
        try:
            data = yaml.safe_load(response_text_copy)
            get_logger().info(f"Successfully parsed AI prediction after extracting yaml snippet")
            return data
        except:
            pass
    # fifth fallback - try to remove last lines
    data = {}
    for i in range(1, len(response_text_lines)):
        response_text_lines_tmp = '\n'.join(response_text_lines[:-i])
@ -697,7 +495,7 @@ def set_custom_labels(variables, git_provider=None):
    if not get_settings().config.enable_custom_labels:
        return
-    labels = get_settings().get('custom_labels', {})
+    labels = get_settings().custom_labels
    if not labels:
        # set default labels
        labels = ['Bug fix', 'Tests', 'Bug fix with tests', 'Enhancement', 'Documentation', 'Other']
@ -723,16 +521,14 @@ def get_user_labels(current_labels: List[str] = None):
    Only keep labels that has been added by the user
    """
    try:
        enable_custom_labels = get_settings().config.get('enable_custom_labels', False)
        custom_labels = get_settings().get('custom_labels', [])
        if current_labels is None:
            current_labels = []
        user_labels = []
        for label in current_labels:
            if label.lower() in ['bug fix', 'tests', 'enhancement', 'documentation', 'other']:
                continue
-            if enable_custom_labels:
+            if get_settings().config.enable_custom_labels:
-                if label in custom_labels:
+                if label in get_settings().custom_labels:
                    continue
            user_labels.append(label)
        if user_labels:
@ -744,29 +540,19 @@ def get_user_labels(current_labels: List[str] = None):
 def get_max_tokens(model):
    """
    Get the maximum number of tokens allowed for a model.
    logic:
    (1) If the model is in './pr_agent/algo/__init__.py', use the value from there.
    (2) else, the user needs to define explicitly 'config.custom_model_max_tokens'
    For both cases, we further limit the number of tokens to 'config.max_model_tokens' if it is set.
    This aims to improve the algorithmic quality, as the AI model degrades in performance when the input is too long.
    """
    settings = get_settings()
    if model in MAX_TOKENS:
        max_tokens_model = MAX_TOKENS[model]
    elif settings.config.custom_model_max_tokens > 0:
        max_tokens_model = settings.config.custom_model_max_tokens
    else:
-        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")
+        raise Exception(f"MAX_TOKENS must be set for model {model} in ./pr_agent/algo/__init__.py")
-    if settings.config.max_model_tokens and settings.config.max_model_tokens > 0:
+    if settings.config.max_model_tokens:
        max_tokens_model = min(settings.config.max_model_tokens, max_tokens_model)
        # get_logger().debug(f"limiting max tokens to {max_tokens_model}")
    return max_tokens_model
-def clip_tokens(text: str, max_tokens: int, add_three_dots=True, num_input_tokens=None, delete_last_line=False) -> str:
+def clip_tokens(text: str, max_tokens: int, add_three_dots=True) -> str:
    """
    Clip the number of tokens in a string to a maximum number of tokens.
@ -781,30 +567,16 @@ def clip_tokens(text: str, max_tokens: int, add_three_dots=True, num_input_token
        return text
    try:
        if num_input_tokens is None:
        encoder = TokenEncoder.get_token_encoder()
        num_input_tokens = len(encoder.encode(text))
        if num_input_tokens <= max_tokens:
            return text
        if max_tokens < 0:
            return ""
        # calculate the number of characters to keep
        num_chars = len(text)
        chars_per_token = num_chars / num_input_tokens
-        factor = 0.9  # reduce by 10% to be safe
+        num_output_chars = int(chars_per_token * max_tokens)
        num_output_chars = int(factor * chars_per_token * max_tokens)
        # clip the text
        if num_output_chars > 0:
        clipped_text = text[:num_output_chars]
            if delete_last_line:
                clipped_text = clipped_text.rsplit('\n', 1)[0]
        if add_three_dots:
            clipped_text += "\n...(truncated)"
        else: # if the text is empty
            clipped_text =  ""
        return clipped_text
    except Exception as e:
        get_logger().warning(f"Failed to clip tokens: {e}")
@ -814,7 +586,6 @@ def replace_code_tags(text):
    """
    Replace odd instances of ` with <code> and even instances of ` with </code>
    """
    text = html.escape(text)
    parts = text.split('`')
    for i in range(1, len(parts), 2):
        parts[i] = '<code>' + parts[i] + '</code>'
@ -831,9 +602,6 @@ def find_line_number_of_relevant_line_in_file(diff_files: List[FilePatchInfo],
    re_hunk_header = re.compile(
        r"^@@ -(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))? @@[ ]?(.*)")
    if not diff_files:
        return position, absolute_position
    for file in diff_files:
        if file.filename and (file.filename.strip() == relevant_file):
            patch = file.patch
@ -895,65 +663,6 @@ def find_line_number_of_relevant_line_in_file(diff_files: List[FilePatchInfo],
                            break
    return position, absolute_position
 def get_rate_limit_status(github_token) -> dict:
    GITHUB_API_URL = get_settings(use_context=False).get("GITHUB.BASE_URL", "https://api.github.com").rstrip("/")  # "https://api.github.com"
    # GITHUB_API_URL = "https://api.github.com"
    RATE_LIMIT_URL = f"{GITHUB_API_URL}/rate_limit"
    HEADERS = {
        "Accept": "application/vnd.github.v3+json",
        "Authorization": f"token {github_token}"
    }
    response = requests.get(RATE_LIMIT_URL, headers=HEADERS)
    try:
        rate_limit_info = response.json()
        if rate_limit_info.get('message') == 'Rate limiting is not enabled.':  # for github enterprise
            return {'resources': {}}
        response.raise_for_status()  # Check for HTTP errors
    except:  # retry
        time.sleep(0.1)
        response = requests.get(RATE_LIMIT_URL, headers=HEADERS)
        return response.json()
    return rate_limit_info
 def validate_rate_limit_github(github_token, installation_id=None, threshold=0.1) -> bool:
    try:
        rate_limit_status = get_rate_limit_status(github_token)
        if installation_id:
            get_logger().debug(f"installation_id: {installation_id}, Rate limit status: {rate_limit_status['rate']}")
    # validate that the rate limit is not exceeded
        # validate that the rate limit is not exceeded
        for key, value in rate_limit_status['resources'].items():
            if value['remaining'] < value['limit'] * threshold:
                get_logger().error(f"key: {key}, value: {value}")
                return False
        return True
    except Exception as e:
        get_logger().error(f"Error in rate limit {e}",
                           artifact={"traceback": traceback.format_exc()})
        return True
 def validate_and_await_rate_limit(github_token):
    try:
        rate_limit_status = get_rate_limit_status(github_token)
        # validate that the rate limit is not exceeded
        for key, value in rate_limit_status['resources'].items():
            if value['remaining'] < value['limit'] // 80:
                get_logger().error(f"key: {key}, value: {value}")
                sleep_time_sec = value['reset'] - datetime.now().timestamp()
                sleep_time_hour = sleep_time_sec / 3600.0
                get_logger().error(f"Rate limit exceeded. Sleeping for {sleep_time_hour} hours")
                if sleep_time_sec > 0:
                    time.sleep(sleep_time_sec + 1)
                rate_limit_status = get_rate_limit_status(github_token)
        return rate_limit_status
    except:
        get_logger().error("Error in rate limit")
        return None
 def github_action_output(output_data: dict, key_name: str):
    try:
        if not get_settings().get('github_action_config.enable_output', False):
@ -965,129 +674,3 @@ def github_action_output(output_data: dict, key_name: str):
    except Exception as e:
        get_logger().error(f"Failed to write to GitHub Action output: {e}")
    return
 def show_relevant_configurations(relevant_section: str) -> str:
    skip_keys = ['ai_disclaimer', 'ai_disclaimer_title', 'ANALYTICS_FOLDER', 'secret_provider', "skip_keys", "app_id", "redirect",
                      'trial_prefix_message', 'no_eligible_message', 'identity_provider', 'ALLOWED_REPOS','APP_NAME']
    extra_skip_keys = get_settings().config.get('config.skip_keys', [])
    if extra_skip_keys:
        skip_keys.extend(extra_skip_keys)
    markdown_text = ""
    markdown_text += "\n<hr>\n<details> <summary><strong>🛠️ Relevant configurations:</strong></summary> \n\n"
    markdown_text +="<br>These are the relevant [configurations](https://github.com/Codium-ai/pr-agent/blob/main/pr_agent/settings/configuration.toml) for this tool:\n\n"
    markdown_text += f"**[config**]\n```yaml\n\n"
    for key, value in get_settings().config.items():
        if key in skip_keys:
            continue
        markdown_text += f"{key}: {value}\n"
    markdown_text += "\n```\n"
    markdown_text += f"\n**[{relevant_section}]**\n```yaml\n\n"
    for key, value in get_settings().get(relevant_section, {}).items():
        if key in skip_keys:
            continue
        markdown_text += f"{key}: {value}\n"
    markdown_text += "\n```"
    markdown_text += "\n</details>\n"
    return markdown_text
 def is_value_no(value):
    if not value:
        return True
    value_str = str(value).strip().lower()
    if value_str == 'no' or value_str == 'none' or value_str == 'false':
        return True
    return False
 def set_pr_string(repo_name, pr_number):
    return f"{repo_name}#{pr_number}"
 def string_to_uniform_number(s: str) -> float:
    """
    Convert a string to a uniform number in the range [0, 1].
    The uniform distribution is achieved by the nature of the SHA-256 hash function, which produces a uniformly distributed hash value over its output space.
    """
    # Generate a hash of the string
    hash_object = hashlib.sha256(s.encode())
    # Convert the hash to an integer
    hash_int = int(hash_object.hexdigest(), 16)
    # Normalize the integer to the range [0, 1]
    max_hash_int = 2 ** 256 - 1
    uniform_number = float(hash_int) / max_hash_int
    return uniform_number
 def process_description(description_full: str) -> Tuple[str, List]:
    if not description_full:
        return "", []
    split_str = "### **Changes walkthrough** 📝"
    description_split = description_full.split(split_str)
    base_description_str = description_split[0]
    changes_walkthrough_str = ""
    files = []
    if len(description_split) > 1:
        changes_walkthrough_str = description_split[1]
    else:
        get_logger().debug("No changes walkthrough found")
    try:
        if changes_walkthrough_str:
            # get the end of the table
            if '</table>\n\n___' in changes_walkthrough_str:
                end = changes_walkthrough_str.index("</table>\n\n___")
            elif '\n___' in changes_walkthrough_str:
                end = changes_walkthrough_str.index("\n___")
            else:
                end = len(changes_walkthrough_str)
            changes_walkthrough_str = changes_walkthrough_str[:end]
            h = html2text.HTML2Text()
            h.body_width = 0  # Disable line wrapping
            # find all the files
            pattern = r'<tr>\s*<td>\s*(<details>\s*<summary>(.*?)</summary>(.*?)</details>)\s*</td>'
            files_found = re.findall(pattern, changes_walkthrough_str, re.DOTALL)
            for file_data in files_found:
                try:
                    if isinstance(file_data, tuple):
                        file_data = file_data[0]
                    pattern = r'<details>\s*<summary><strong>(.*?)</strong>\s*<dd><code>(.*?)</code>.*?</summary>\s*<hr>\s*(.*?)\s*<li>(.*?)</details>'
                    res = re.search(pattern, file_data, re.DOTALL)
                    if not res or res.lastindex != 4:
                        pattern_back = r'<details>\s*<summary><strong>(.*?)</strong><dd><code>(.*?)</code>.*?</summary>\s*<hr>\s*(.*?)\n\n\s*(.*?)</details>'
                        res = re.search(pattern_back, file_data, re.DOTALL)
                    if res and res.lastindex == 4:
                        short_filename = res.group(1).strip()
                        short_summary = res.group(2).strip()
                        long_filename = res.group(3).strip()
                        long_summary =  res.group(4).strip()
                        long_summary = long_summary.replace('<br> *', '\n*').replace('<br>','').replace('\n','<br>')
                        long_summary = h.handle(long_summary).strip()
                        if long_summary.startswith('\\-'):
                            long_summary = "* " + long_summary[2:]
                        elif not long_summary.startswith('*'):
                            long_summary = f"* {long_summary}"
                        files.append({
                            'short_file_name': short_filename,
                            'full_file_name': long_filename,
                            'short_summary': short_summary,
                            'long_summary': long_summary
                        })
                    else:
                        if '<code>...</code>' in file_data:
                            pass # PR with many files. some did not get analyzed
                        else:
                            get_logger().error(f"Failed to parse description", artifact={'description': file_data})
                except Exception as e:
                    get_logger().exception(f"Failed to process description: {e}", artifact={'description': file_data})
    except Exception as e:
        get_logger().exception(f"Failed to process description: {e}")
    return base_description_str, files
--- a/pr_agent/cli.py
+++ b/pr_agent/cli.py
@ -4,12 +4,11 @@ import os
 from pr_agent.agent.pr_agent import PRAgent, commands
 from pr_agent.config_loader import get_settings
-from pr_agent.log import setup_logger, get_logger
+from pr_agent.log import setup_logger
 log_level = os.environ.get("LOG_LEVEL", "INFO")
 setup_logger(log_level)
 def set_parser():
    parser = argparse.ArgumentParser(description='AI based pull request analyzer', usage=
    """\
@ -51,7 +50,6 @@ def set_parser():
    parser.add_argument('rest', nargs=argparse.REMAINDER, default=[])
    return parser
 def run_command(pr_url, command):
    # Preparing the command
    run_command_str = f"--pr_url={pr_url} {command.lstrip('/')}"
@ -60,7 +58,6 @@ def run_command(pr_url, command):
    # Run the command. Feedback will appear in GitHub PR comments
    run(args=args)
 def run(inargs=None, args=None):
    parser = set_parser()
    if not args:
@ -71,21 +68,10 @@ def run(inargs=None, args=None):
    command = args.command.lower()
    get_settings().set("CONFIG.CLI_MODE", True)
    async def inner():
    if args.issue_url:
-            result = await asyncio.create_task(PRAgent().handle_request(args.issue_url, [command] + args.rest))
+        result = asyncio.run(PRAgent().handle_request(args.issue_url, [command] + args.rest))
    else:
-            result = await asyncio.create_task(PRAgent().handle_request(args.pr_url, [command] + args.rest))
+        result = asyncio.run(PRAgent().handle_request(args.pr_url, [command] + args.rest))
        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()])
        return result
    result = asyncio.run(inner())
    if not result:
        parser.print_help()
--- a/pr_agent/config_loader.py
+++ b/pr_agent/config_loader.py
@ -21,37 +21,27 @@ global_settings = Dynaconf(
        "settings/pr_line_questions_prompts.toml",
        "settings/pr_description_prompts.toml",
        "settings/pr_code_suggestions_prompts.toml",
        "settings/pr_code_suggestions_reflect_prompts.toml",
        "settings/pr_sort_code_suggestions_prompts.toml",
        "settings/pr_information_from_user_prompts.toml",
        "settings/pr_update_changelog_prompts.toml",
        "settings/pr_custom_labels.toml",
        "settings/pr_add_docs.toml",
        "settings/custom_labels.toml",
        "settings/pr_help_prompts.toml",
        "settings_prod/.secrets.toml",
        "settings/custom_labels.toml"
    ]]
 )
 def get_settings():
    """
    Retrieves the current settings.
    This function attempts to fetch the settings from the starlette_context's context object. If it fails,
    it defaults to the global settings defined outside of this function.
    Returns:
        Dynaconf: The current settings object, either from the context or the global default.
    """
    try:
        return context["settings"]
    except Exception:
        print("error")
        return global_settings
 # Add local configuration from pyproject.toml of the project being reviewed
-def _find_repository_root() -> Optional[Path]:
+def _find_repository_root() -> Path:
    """
    Identify project root directory by recursively searching for the .git directory in the parent directories.
    """
@ -71,7 +61,7 @@ def _find_pyproject() -> Optional[Path]:
    """
    repo_root = _find_repository_root()
    if repo_root:
-        pyproject = repo_root / "pyproject.toml"
+        pyproject = _find_repository_root() / "pyproject.toml"
        return pyproject if pyproject.is_file() else None
    return None
--- a/pr_agent/git_providers/init.py
+++ b/pr_agent/git_providers/init.py
@ -2,13 +2,12 @@ from pr_agent.config_loader import get_settings
 from pr_agent.git_providers.bitbucket_provider import BitbucketProvider
 from pr_agent.git_providers.bitbucket_server_provider import BitbucketServerProvider
 from pr_agent.git_providers.codecommit_provider import CodeCommitProvider
 from pr_agent.git_providers.git_provider import GitProvider
 from pr_agent.git_providers.github_provider import GithubProvider
 from pr_agent.git_providers.gitlab_provider import GitLabProvider
 from pr_agent.git_providers.local_git_provider import LocalGitProvider
 from pr_agent.git_providers.azuredevops_provider import AzureDevopsProvider
 from pr_agent.git_providers.gerrit_provider import GerritProvider
-from starlette_context import context
+
 _GIT_PROVIDERS = {
    'github': GithubProvider,
@ -21,7 +20,6 @@ _GIT_PROVIDERS = {
    'gerrit': GerritProvider,
 }
 def get_git_provider():
    try:
        provider_id = get_settings().config.git_provider
@ -30,33 +28,3 @@ def get_git_provider():
    if provider_id not in _GIT_PROVIDERS:
        raise ValueError(f"Unknown git provider: {provider_id}")
    return _GIT_PROVIDERS[provider_id]
 def get_git_provider_with_context(pr_url) -> GitProvider:
    """
    Get a GitProvider instance for the given PR URL. If the GitProvider instance is already in the context, return it.
    """
    is_context_env = None
    try:
        is_context_env = context.get("settings", None)
    except Exception:
        pass  # we are not in a context environment (CLI)
    # check if context["git_provider"]["pr_url"] exists
    if is_context_env and context.get("git_provider", {}).get("pr_url", {}):
        git_provider = context["git_provider"]["pr_url"]
        # possibly check if the git_provider is still valid, or if some reset is needed
        # ...
        return git_provider
    else:
        try:
            provider_id = get_settings().config.git_provider
            if provider_id not in _GIT_PROVIDERS:
                raise ValueError(f"Unknown git provider: {provider_id}")
            git_provider = _GIT_PROVIDERS[provider_id](pr_url)
            if is_context_env:
                context["git_provider"] = {pr_url: git_provider}
            return git_provider
        except Exception as e:
            raise ValueError(f"Failed to get git provider for {pr_url}") from e
--- a/pr_agent/git_providers/azuredevops_provider.py
+++ b/pr_agent/git_providers/azuredevops_provider.py
@ -2,7 +2,6 @@ import os
 from typing import Optional, Tuple
 from urllib.parse import urlparse
 from ..algo.file_filter import filter_ignored
 from ..log import get_logger
 from ..algo.language_handler import is_valid_file
 from ..algo.utils import clip_tokens, find_line_number_of_relevant_line_in_file, load_large_diff
@ -27,7 +26,6 @@ try:
        CommentThread,
        GitVersionDescriptor,
        GitPullRequest,
        GitPullRequestIterationChanges,
    )
 except ImportError:
    AZURE_DEVOPS_AVAILABLE = False
@ -165,7 +163,7 @@ class AzureDevopsProvider(GitProvider):
                    pull_request_id=self.pr_num,
                )
        except Exception as e:
-            get_logger().warning(f"Failed to publish labels, error: {e}")
+            get_logger().exception(f"Failed to publish labels, error: {e}")
    def get_pr_labels(self, update=False):
        try:
@ -232,73 +230,32 @@ class AzureDevopsProvider(GitProvider):
            base_sha = self.pr.last_merge_target_commit
            head_sha = self.pr.last_merge_source_commit
-            # Get PR iterations
+            commits = self.azure_devops_client.get_pull_request_commits(
-            iterations = self.azure_devops_client.get_pull_request_iterations(
+                project=self.workspace_slug,
                repository_id=self.repo_slug,
                pull_request_id=self.pr_num,
                project=self.workspace_slug
            )
            changes = None
            if iterations:
                iteration_id = iterations[-1].id  # Get the last iteration (most recent changes)
                # Get changes for the iteration
                changes = self.azure_devops_client.get_pull_request_iteration_changes(
                    repository_id=self.repo_slug,
                    pull_request_id=self.pr_num,
                    iteration_id=iteration_id,
                    project=self.workspace_slug
                )
            diff_files = []
            diffs = []
            diff_types = {}
            if changes:
                for change in changes.change_entries:
                    item = change.additional_properties.get('item', {})
                    path = item.get('path', None)
                    if path:
                        diffs.append(path)
                        diff_types[path] = change.additional_properties.get('changeType', 'Unknown')
-            # wrong implementation - gets all the files that were changed in any commit in the PR
+            for c in commits:
-            # commits = self.azure_devops_client.get_pull_request_commits(
+                changes_obj = self.azure_devops_client.get_changes(
-            #     project=self.workspace_slug,
+                    project=self.workspace_slug,
-            #     repository_id=self.repo_slug,
+                    repository_id=self.repo_slug,
-            #     pull_request_id=self.pr_num,
+                    commit_id=c.commit_id,
-            # )
+                )
-            #
+                for i in changes_obj.changes:
-            # diff_files = []
+                    if i["item"]["gitObjectType"] == "tree":
-            # diffs = []
+                        continue
-            # diff_types = {}
+                    diffs.append(i["item"]["path"])
                    diff_types[i["item"]["path"]] = i["changeType"]
-            # for c in commits:
+            diffs = list(set(diffs))
            #     changes_obj = self.azure_devops_client.get_changes(
            #         project=self.workspace_slug,
            #         repository_id=self.repo_slug,
            #         commit_id=c.commit_id,
            #     )
            #     for i in changes_obj.changes:
            #         if i["item"]["gitObjectType"] == "tree":
            #             continue
            #         diffs.append(i["item"]["path"])
            #         diff_types[i["item"]["path"]] = i["changeType"]
            #
            # diffs = list(set(diffs))
            diffs_original = diffs
            diffs = filter_ignored(diffs_original, 'azure')
            if diffs_original != diffs:
                try:
                    get_logger().info(f"Filtered out [ignore] files for pull request:", extra=
                    {"files": diffs_original,  # diffs is just a list of names
                     "filtered_files": diffs})
                except Exception:
                    pass
            invalid_files_names = []
            for file in diffs:
                if not is_valid_file(file):
                    invalid_files_names.append(file)
                    continue
                version = GitVersionDescriptor(
@ -316,13 +273,12 @@ class AzureDevopsProvider(GitProvider):
                    new_file_content_str = new_file_content_str.content
                except Exception as error:
-                    get_logger().error(f"Failed to retrieve new file content of {file} at version {version}", error=error)
+                    get_logger().error(
-                    # get_logger().error(
+                        "Failed to retrieve new file content of %s at version %s. Error: %s",
-                    #     "Failed to retrieve new file content of %s at version %s. Error: %s",
+                        file,
-                    #     file,
+                        version,
-                    #     version,
+                        str(error),
-                    #     str(error),
+                    )
                    # )
                    new_file_content_str = ""
                edit_type = EDIT_TYPE.MODIFIED
@ -336,9 +292,6 @@ class AzureDevopsProvider(GitProvider):
                version = GitVersionDescriptor(
                    version=base_sha.commit_id, version_type="commit"
                )
                if edit_type == EDIT_TYPE.ADDED:
                    original_file_content_str = ""
                else:
                try:
                    original_file_content_str = self.azure_devops_client.get_item(
                        repository_id=self.repo_slug,
@ -350,17 +303,17 @@ class AzureDevopsProvider(GitProvider):
                    )
                    original_file_content_str = original_file_content_str.content
                except Exception as error:
-                        get_logger().error(f"Failed to retrieve original file content of {file} at version {version}", error=error)
+                    get_logger().error(
                        "Failed to retrieve original file content of %s at version %s. Error: %s",
                        file,
                        version,
                        str(error),
                    )
                    original_file_content_str = ""
                patch = load_large_diff(
-                    file, new_file_content_str, original_file_content_str, show_warning=False
+                    file, new_file_content_str, original_file_content_str
-                ).rstrip()
+                )
                # count number of lines added and removed
                patch_lines = patch.splitlines(keepends=True)
                num_plus_lines = len([line for line in patch_lines if line.startswith('+')])
                num_minus_lines = len([line for line in patch_lines if line.startswith('-')])
                diff_files.append(
                    FilePatchInfo(
@ -369,21 +322,17 @@ class AzureDevopsProvider(GitProvider):
                        patch=patch,
                        filename=file,
                        edit_type=edit_type,
                        num_plus_lines=num_plus_lines,
                        num_minus_lines=num_minus_lines,
                    )
                )
            get_logger().info(f"Invalid files: {invalid_files_names}")
            self.diff_files = diff_files
            return diff_files
        except Exception as e:
-            get_logger().exception(f"Failed to get diff files, error: {e}")
+            print(f"Error: {str(e)}")
            return []
    def publish_comment(self, pr_comment: str, is_temporary: bool = False, thread_context=None):
        comment = Comment(content=pr_comment)
-        thread = CommentThread(comments=[comment], thread_context=thread_context, status=5)
+        thread = CommentThread(comments=[comment], thread_context=thread_context, status=1)
        thread_response = self.azure_devops_client.create_thread(
            comment_thread=thread,
            project=self.workspace_slug,
@ -435,7 +384,7 @@ class AzureDevopsProvider(GitProvider):
        except Exception as e:
            get_logger().exception(f"Failed to remove temp comments, error: {e}")
-    def publish_inline_comment(self, body: str, relevant_file: str, relevant_line_in_file: str, original_suggestion=None):
+    def publish_inline_comment(self, body: str, relevant_file: str, relevant_line_in_file: str):
        self.publish_inline_comments([self.create_inline_comment(body, relevant_file, relevant_line_in_file)])
@ -455,7 +404,7 @@ class AzureDevopsProvider(GitProvider):
        return dict(body=body, path=path, position=position, absolute_position=absolute_position) if subject_type == "LINE" else {}
    def publish_inline_comments(self, comments: list[dict], disable_fallback: bool = False):
-            overall_success = True
+            overall_sucess = True
            for comment in comments:
                try:
                    self.publish_comment(comment["body"],
@ -477,8 +426,8 @@ class AzureDevopsProvider(GitProvider):
                except Exception as e:
                    if get_settings().config.verbosity_level >= 2:
                        get_logger().error(f"Failed to publish code suggestion, error: {e}")
-                    overall_success = False
+                    overall_sucess = False
-            return overall_success
+            return overall_sucess
    def get_title(self):
        return self.pr.title
@ -519,20 +468,19 @@ class AzureDevopsProvider(GitProvider):
        source_branch = pr_info.source_ref_name.split("/")[-1]
        return source_branch
    def get_pr_description(self, *, full: bool = True) -> str:
        max_tokens = get_settings().get("CONFIG.MAX_DESCRIPTION_TOKENS", None)
        if max_tokens:
            return clip_tokens(self.pr.description, max_tokens)
        return self.pr.description
    def get_user_id(self):
        return 0
    def get_issue_comments(self):
-        threads = self.azure_devops_client.get_threads(repository_id=self.repo_slug, pull_request_id=self.pr_num, project=self.workspace_slug)
+        raise NotImplementedError(
-        threads.reverse()
+            "Azure DevOps provider does not support issue comments yet"
-        comment_list = []
+        )
        for thread in threads:
            for comment in thread.comments:
                if comment.content and comment not in comment_list:
                    comment.body = comment.content
                    comment.thread_id = thread.id
                    comment_list.append(comment)
        return comment_list
    def add_eyes_reaction(self, issue_comment_id: int, disable_eyes: bool = False) -> Optional[int]:
        return True
@ -545,20 +493,18 @@ class AzureDevopsProvider(GitProvider):
        parsed_url = urlparse(pr_url)
        path_parts = parsed_url.path.strip("/").split("/")
-        if "pullrequest" not in path_parts:
+
        if len(path_parts) < 6 or path_parts[4] != "pullrequest":
            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]
        try:
            pr_number = int(path_parts[5])
-        elif len(path_parts) == 5:  # 'https://organization.visualstudio.com/project/_git/repo/pullrequest/1'
+        except ValueError as e:
-            workspace_slug = path_parts[0]
+            raise ValueError("Unable to convert PR number to integer") from e
            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")
        return workspace_slug, repo_slug, pr_number
@ -618,6 +564,3 @@ class AzureDevopsProvider(GitProvider):
                get_logger().error(f"Failed to get pr id, error: {e}")
            return ""
    def publish_file_comments(self, file_comments: list) -> bool:
        pass
--- a/pr_agent/git_providers/bitbucket_provider.py
+++ b/pr_agent/git_providers/bitbucket_provider.py
@ -7,18 +7,10 @@ from atlassian.bitbucket import Cloud
 from starlette_context import context
 from pr_agent.algo.types import FilePatchInfo, EDIT_TYPE
 from ..algo.file_filter import filter_ignored
 from ..algo.language_handler import is_valid_file
 from ..algo.utils import find_line_number_of_relevant_line_in_file
 from ..config_loader import get_settings
 from ..log import get_logger
-from .git_provider import GitProvider, MAX_FILES_ALLOWED_FULL
+from .git_provider import GitProvider
 def _gef_filename(diff):
    if diff.new.path:
        return diff.new.path
    return diff.old.path
 class BitbucketProvider(GitProvider):
@ -36,7 +28,6 @@ class BitbucketProvider(GitProvider):
        s.headers["Content-Type"] = "application/json"
        self.headers = s.headers
        self.bitbucket_client = Cloud(session=s)
        self.max_comment_length = 31000
        self.workspace_slug = None
        self.repo_slug = None
        self.repo = None
@ -46,7 +37,6 @@ class BitbucketProvider(GitProvider):
        self.temp_comments = []
        self.incremental = incremental
        self.diff_files = None
        self.git_files = None
        if pr_url:
            self.set_pr(pr_url)
        self.bitbucket_comment_api_url = self.pr._BitbucketBase__data["links"]["comments"]["href"]
@ -116,12 +106,8 @@ class BitbucketProvider(GitProvider):
                get_logger().error(f"Failed to publish code suggestion, error: {e}")
            return False
    def publish_file_comments(self, file_comments: list) -> bool:
        pass
    def is_supported(self, capability: str) -> bool:
-        if capability in ['get_issue_comments', 'publish_inline_comments', 'get_labels', 'gfm_markdown',
+        if capability in ['get_issue_comments', 'publish_inline_comments', 'get_labels', 'gfm_markdown']:
                          'publish_file_comments']:
            return False
        return True
@ -130,132 +116,28 @@ class BitbucketProvider(GitProvider):
        self.pr = self._get_pr()
    def get_files(self):
-        try:
+        return [diff.new.path for diff in self.pr.diffstat()]
            git_files = context.get("git_files", None)
            if git_files:
                return git_files
            self.git_files = [_gef_filename(diff) for diff in self.pr.diffstat()]
            context["git_files"] = self.git_files
            return self.git_files
        except Exception:
            if not self.git_files:
                self.git_files = [_gef_filename(diff) for diff in self.pr.diffstat()]
            return self.git_files
    def get_diff_files(self) -> list[FilePatchInfo]:
        if self.diff_files:
            return self.diff_files
-        diffs_original = list(self.pr.diffstat())
+        diffs = self.pr.diffstat()
-        diffs = filter_ignored(diffs_original, 'bitbucket')
+        diff_split = [
-        if diffs != diffs_original:
+            "diff --git%s" % x for x in self.pr.diff().split("diff --git") if x.strip()
-            try:
+        ]
                names_original = [d.new.path for d in diffs_original]
                names_kept = [d.new.path for d in diffs]
                names_filtered = list(set(names_original) - set(names_kept))
                get_logger().info(f"Filtered out [ignore] files for PR", extra={
                    'original_files': names_original,
                    'names_kept': names_kept,
                    'names_filtered': names_filtered
                })
            except Exception as e:
                pass
        # get the pr patches
        try:
            pr_patches = self.pr.diff()
        except Exception as e:
            # Try different encodings if UTF-8 fails
            get_logger().warning(f"Failed to decode PR patch with utf-8, error: {e}")
            encodings_to_try = ['iso-8859-1', 'latin-1', 'ascii', 'utf-16']
            pr_patches = None
            for encoding in encodings_to_try:
                try:
                    pr_patches = self.pr.diff(encoding=encoding)
                    get_logger().info(f"Successfully decoded PR patch with encoding {encoding}")
                    break
                except UnicodeDecodeError:
                    continue
            if pr_patches is None:
                raise ValueError(f"Failed to decode PR patch with encodings {encodings_to_try}")
        diff_split = ["diff --git" + x for x in pr_patches.split("diff --git") if x.strip()]
        # filter all elements of 'diff_split' that are of indices in 'diffs_original' that are not in 'diffs'
        if len(diff_split) > len(diffs) and len(diffs_original) == len(diff_split):
            diff_split = [diff_split[i] for i in range(len(diff_split)) if diffs_original[i] in diffs]
        if len(diff_split) != len(diffs):
            get_logger().error(f"Error - failed to split the diff into {len(diffs)} parts")
            return []
        # bitbucket diff has a header for each file, we need to remove it:
        # "diff --git filename
        # new file mode 100644 (optional)
        #  index caa56f0..61528d7 100644
        #   --- a/pr_agent/cli_pip.py
        #  +++ b/pr_agent/cli_pip.py
        #   @@ -... @@"
        for i, _ in enumerate(diff_split):
            diff_split_lines = diff_split[i].splitlines()
            if (len(diff_split_lines) >= 6) and \
                    ((diff_split_lines[2].startswith("---") and
                      diff_split_lines[3].startswith("+++") and
                      diff_split_lines[4].startswith("@@")) or
                     (diff_split_lines[3].startswith("---") and  # new or deleted file
                      diff_split_lines[4].startswith("+++") and
                      diff_split_lines[5].startswith("@@"))):
                diff_split[i] = "\n".join(diff_split_lines[4:])
            else:
                if diffs[i].data.get('lines_added', 0) == 0 and diffs[i].data.get('lines_removed', 0) == 0:
                    diff_split[i] = ""
                elif len(diff_split_lines) <= 3:
                    diff_split[i] = ""
                    get_logger().info(f"Disregarding empty diff for file {_gef_filename(diffs[i])}")
                else:
                    get_logger().warning(f"Bitbucket failed to get diff for file {_gef_filename(diffs[i])}")
                    diff_split[i] = ""
        invalid_files_names = []
        diff_files = []
        counter_valid = 0
        # get full files
        for index, diff in enumerate(diffs):
            file_path = _gef_filename(diff)
            if not is_valid_file(file_path):
                invalid_files_names.append(file_path)
                continue
            try:
                counter_valid += 1
                if get_settings().get("bitbucket_app.avoid_full_files", False):
                    original_file_content_str = ""
                    new_file_content_str = ""
                elif counter_valid < MAX_FILES_ALLOWED_FULL // 2:  # factor 2 because bitbucket has limited API calls
                    if diff.old.get_data("links"):
            original_file_content_str = self._get_pr_file_content(
-                            diff.old.get_data("links")['self']['href'])
+                diff.old.get_data("links")
-                    else:
+            )
-                        original_file_content_str = ""
+            new_file_content_str = self._get_pr_file_content(diff.new.get_data("links"))
                    if diff.new.get_data("links"):
                        new_file_content_str = self._get_pr_file_content(diff.new.get_data("links")['self']['href'])
                    else:
                        new_file_content_str = ""
                else:
                    if counter_valid == MAX_FILES_ALLOWED_FULL // 2:
                        get_logger().info(
                            f"Bitbucket too many files in PR, will avoid loading full content for rest of files")
                    original_file_content_str = ""
                    new_file_content_str = ""
            except Exception as e:
                get_logger().exception(f"Error - bitbucket failed to get file content, error: {e}")
                original_file_content_str = ""
                new_file_content_str = ""
            file_patch_canonic_structure = FilePatchInfo(
                original_file_content_str,
                new_file_content_str,
                diff_split[index],
-                file_path,
+                diff.new.path,
            )
            if diff.data['status'] == 'added':
@ -268,8 +150,6 @@ class BitbucketProvider(GitProvider):
                file_patch_canonic_structure.edit_type = EDIT_TYPE.RENAMED
            diff_files.append(file_patch_canonic_structure)
        if invalid_files_names:
            get_logger().info(f"Disregarding files with invalid extensions:\n{invalid_files_names}")
        self.diff_files = diff_files
        return diff_files
@ -292,7 +172,7 @@ class BitbucketProvider(GitProvider):
                    latest_commit_url = self.get_latest_commit_url()
                    comment_url = self.get_comment_url(comment)
                    if update_header:
-                        updated_header = f"{initial_header}\n\n#### ({name.capitalize()} updated until commit {latest_commit_url})\n"
+                        updated_header = f"{initial_header}\n\n### ({name.capitalize()} updated until commit {latest_commit_url})\n"
                        pr_comment_updated = pr_comment.replace(initial_header, updated_header)
                    else:
                        pr_comment_updated = pr_comment
@ -309,7 +189,6 @@ class BitbucketProvider(GitProvider):
        self.publish_comment(pr_comment)
    def publish_comment(self, pr_comment: str, is_temporary: bool = False):
        pr_comment = self.limit_output_characters(pr_comment, self.max_comment_length)
        comment = self.pr.comment(pr_comment)
        if is_temporary:
            self.temp_comments.append(comment["id"])
@ -317,7 +196,6 @@ class BitbucketProvider(GitProvider):
    def edit_comment(self, comment, body: str):
        try:
            body = self.limit_output_characters(body, self.max_comment_length)
            comment.update(body)
        except Exception as e:
            get_logger().exception(f"Failed to update comment, error: {e}")
@ -335,14 +213,11 @@ class BitbucketProvider(GitProvider):
        except Exception as e:
            get_logger().exception(f"Failed to remove comment, error: {e}")
-    # function to create_inline_comment
+    # funtion to create_inline_comment
-    def create_inline_comment(self, body: str, relevant_file: str, relevant_line_in_file: str,
+    def create_inline_comment(self, body: str, relevant_file: str, relevant_line_in_file: str, absolute_position: int = None):
                              absolute_position: int = None):
        body = self.limit_output_characters(body, self.max_comment_length)
        position, absolute_position = find_line_number_of_relevant_line_in_file(self.get_diff_files(),
                                                                            relevant_file.strip('`'),
-                                                                                relevant_line_in_file,
+                                                                            relevant_line_in_file, absolute_position)
                                                                                absolute_position)
        if position == -1:
            if get_settings().config.verbosity_level >= 2:
                get_logger().info(f"Could not find position for {relevant_file} {relevant_line_in_file}")
@ -352,8 +227,8 @@ class BitbucketProvider(GitProvider):
        path = relevant_file.strip()
        return dict(body=body, path=path, position=absolute_position) if subject_type == "LINE" else {}
-    def publish_inline_comment(self, comment: str, from_line: int, file: str, original_suggestion=None):
+
-        comment = self.limit_output_characters(comment, self.max_comment_length)
+    def publish_inline_comment(self, comment: str, from_line: int, file: str):
        payload = json.dumps( {
            "content": {
                "raw": comment,
@ -417,9 +292,6 @@ class BitbucketProvider(GitProvider):
    def get_pr_branch(self):
        return self.pr.source_branch
    def get_pr_owner_id(self) -> str | None:
        return self.workspace_slug
    def get_pr_description_full(self):
        return self.pr.description
@ -486,6 +358,7 @@ class BitbucketProvider(GitProvider):
        except Exception:
            return ""
    def create_or_update_pr_file(self, file_path: str, branch: str, contents="", message="") -> None:
        url = (f"https://api.bitbucket.org/2.0/repositories/{self.workspace_slug}/{self.repo_slug}/src/")
        if not message:
@ -505,13 +378,6 @@ class BitbucketProvider(GitProvider):
            get_logger().exception(f"Failed to create empty file {file_path} in branch {branch}")
    def _get_pr_file_content(self, remote_link: str):
        try:
            response = requests.request("GET", remote_link, headers=self.headers)
            if response.status_code == 404:  # not found
                return ""
            contents = response.text
            return contents
        except Exception:
        return ""
    def get_commit_messages(self):
--- a/pr_agent/git_providers/bitbucket_server_provider.py
+++ b/pr_agent/git_providers/bitbucket_server_provider.py
@ -1,13 +1,13 @@
-from distutils.version import LooseVersion
+import json
 from requests.exceptions import HTTPError
 from typing import Optional, Tuple
-from urllib.parse import quote_plus, urlparse
+from urllib.parse import urlparse
 import requests
 from atlassian.bitbucket import Bitbucket
 from starlette_context import context
 from .git_provider import GitProvider
-from ..algo.types import EDIT_TYPE, FilePatchInfo
+from pr_agent.algo.types import FilePatchInfo
 from ..algo.language_handler import is_valid_file
 from ..algo.utils import load_large_diff, find_line_number_of_relevant_line_in_file
 from ..config_loader import get_settings
 from ..log import get_logger
@ -15,9 +15,19 @@ from ..log import get_logger
 class BitbucketServerProvider(GitProvider):
    def __init__(
-            self, pr_url: Optional[str] = None, incremental: Optional[bool] = False,
+        self, pr_url: Optional[str] = None, incremental: Optional[bool] = False
            bitbucket_client: Optional[Bitbucket] = None,
    ):
        s = requests.Session()
        try:
            bearer = context.get("bitbucket_bearer_token", None)
            s.headers["Authorization"] = f"Bearer {bearer}"
        except Exception:
            s.headers[
                "Authorization"
            ] = f'Bearer {get_settings().get("BITBUCKET_SERVER.BEARER_TOKEN", None)}'
        s.headers["Content-Type"] = "application/json"
        self.headers = s.headers
        self.bitbucket_server_url = None
        self.workspace_slug = None
        self.repo_slug = None
@ -31,33 +41,24 @@ class BitbucketServerProvider(GitProvider):
        self.bitbucket_pull_request_api_url = pr_url
        self.bitbucket_server_url = self._parse_bitbucket_server(url=pr_url)
-        self.bitbucket_client = bitbucket_client or Bitbucket(url=self.bitbucket_server_url,
+        self.bitbucket_client = Bitbucket(url=self.bitbucket_server_url,
-                                                              token=get_settings().get("BITBUCKET_SERVER.BEARER_TOKEN",
+                                          token=get_settings().get("BITBUCKET_SERVER.BEARER_TOKEN", None))
                                                                                       None))
        try:
            self.bitbucket_api_version = LooseVersion(self.bitbucket_client.get("rest/api/1.0/application-properties").get('version'))
        except Exception:
            self.bitbucket_api_version = None
        if pr_url:
            self.set_pr(pr_url)
    def get_repo_settings(self):
        try:
-            content = self.bitbucket_client.get_content_of_file(self.workspace_slug, self.repo_slug, ".pr_agent.toml", self.get_pr_branch())
+            url = (f"{self.bitbucket_server_url}/projects/{self.workspace_slug}/repos/{self.repo_slug}/src/"
-
+                   f"{self.pr.destination_branch}/.pr_agent.toml")
-            return content
+            response = requests.request("GET", url, headers=self.headers)
-        except Exception as e:
+            if response.status_code == 404:  # not found
            if isinstance(e, HTTPError):
                if e.response.status_code == 404:  # not found
                return ""
-
+            contents = response.text.encode('utf-8')
-            get_logger().error(f"Failed to load .pr_agent.toml file, error: {e}")
+            return contents
        except Exception:
            return ""
    def get_pr_id(self):
        return self.pr_num
    def publish_code_suggestions(self, code_suggestions: list) -> bool:
        """
        Publishes code suggestions as comments on the PR.
@ -86,8 +87,6 @@ class BitbucketServerProvider(GitProvider):
                continue
            if relevant_lines_end > relevant_lines_start:
                # Bitbucket does not support multi-line suggestions so use a code block instead - https://jira.atlassian.com/browse/BSERV-4553
                body = body.replace("```suggestion", "```")
                post_parameters = {
                    "body": body,
                    "path": relevant_file,
@ -112,11 +111,8 @@ class BitbucketServerProvider(GitProvider):
                get_logger().error(f"Failed to publish code suggestion, error: {e}")
            return False
    def publish_file_comments(self, file_comments: list) -> bool:
        pass
    def is_supported(self, capability: str) -> bool:
-        if capability in ['get_issue_comments', 'get_labels', 'gfm_markdown', 'publish_file_comments']:
+        if capability in ['get_issue_comments', 'get_labels', 'gfm_markdown']:
            return False
        return True
@ -131,7 +127,7 @@ class BitbucketServerProvider(GitProvider):
                                                                     self.repo_slug,
                                                                     path,
                                                                     commit_id)
-        except HTTPError as e:
+        except requests.HTTPError as e:
            get_logger().debug(f"File {path} not found at commit id: {commit_id}")
        return file_content
@ -140,50 +136,18 @@ class BitbucketServerProvider(GitProvider):
        diffstat = [change["path"]['toString'] for change in changes]
        return diffstat
    #gets the best common ancestor: https://git-scm.com/docs/git-merge-base
    @staticmethod
    def get_best_common_ancestor(source_commits_list, destination_commits_list, guaranteed_common_ancestor) -> str:
        destination_commit_hashes = {commit['id'] for commit in destination_commits_list} | {guaranteed_common_ancestor}
        for commit in source_commits_list:
            for parent_commit in commit['parents']:
                if parent_commit['id'] in destination_commit_hashes:
                    return parent_commit['id']
        return guaranteed_common_ancestor
    def get_diff_files(self) -> list[FilePatchInfo]:
        if self.diff_files:
            return self.diff_files
-        head_sha = self.pr.fromRef['latestCommit']
+        commits_in_pr = self.bitbucket_client.get_pull_requests_commits(
        # if Bitbucket api version is >= 8.16 then use the merge-base api for 2-way diff calculation
        if self.bitbucket_api_version is not None and self.bitbucket_api_version >= LooseVersion("8.16"):
            try:
                base_sha = self.bitbucket_client.get(self._get_merge_base())['id']
            except Exception as e:
                get_logger().error(f"Failed to get the best common ancestor for PR: {self.pr_url}, \nerror: {e}")
                raise e
        else:
            source_commits_list = list(self.bitbucket_client.get_pull_requests_commits(
            self.workspace_slug,
            self.repo_slug,
            self.pr_num
-            ))
+        )
-            # if Bitbucket api version is None or < 7.0 then do a simple diff with a guaranteed common ancestor
+
-            base_sha = source_commits_list[-1]['parents'][0]['id']
+        commit_list = list(commits_in_pr)
-            # if Bitbucket api version is 7.0-8.15 then use 2-way diff functionality for the base_sha
+        base_sha, head_sha = commit_list[0]['parents'][0]['id'], commit_list[-1]['id']
            if self.bitbucket_api_version is not None and self.bitbucket_api_version >= LooseVersion("7.0"):
                try:
                    destination_commits = list(
                        self.bitbucket_client.get_commits(self.workspace_slug, self.repo_slug, base_sha,
                                                          self.pr.toRef['latestCommit']))
                    base_sha = self.get_best_common_ancestor(source_commits_list, destination_commits, base_sha)
                except Exception as e:
                    get_logger().error(
                        f"Failed to get the commit list for calculating best common ancestor for PR: {self.pr_url}, \nerror: {e}")
                    raise e
        diff_files = []
        original_file_content_str = ""
@ -192,10 +156,6 @@ class BitbucketServerProvider(GitProvider):
        changes = self.bitbucket_client.get_pull_requests_changes(self.workspace_slug, self.repo_slug, self.pr_num)
        for change in changes:
            file_path = change['path']['toString']
            if not is_valid_file(file_path.split("/")[-1]):
                get_logger().info(f"Skipping a non-code file: {file_path}")
                continue
            match change['type']:
                case 'ADD':
                    edit_type = EDIT_TYPE.ADDED
@ -249,7 +209,7 @@ class BitbucketServerProvider(GitProvider):
    def remove_comment(self, comment):
        pass
-    # function to create_inline_comment
+    # funtion to create_inline_comment
    def create_inline_comment(self, body: str, relevant_file: str, relevant_line_in_file: str,
                              absolute_position: int = None):
@ -268,7 +228,7 @@ class BitbucketServerProvider(GitProvider):
        path = relevant_file.strip()
        return dict(body=body, path=path, position=absolute_position) if subject_type == "LINE" else {}
-    def publish_inline_comment(self, comment: str, from_line: int, file: str, original_suggestion=None):
+    def publish_inline_comment(self, comment: str, from_line: int, file: str):
        payload = {
            "text": comment,
            "severity": "NORMAL",
@ -281,18 +241,8 @@ class BitbucketServerProvider(GitProvider):
            }
        }
-        try:
+        response = requests.post(url=self._get_pr_comments_url(), json=payload, headers=self.headers)
-            self.bitbucket_client.post(self._get_pr_comments_path(), data=payload)
+        return response
        except Exception as e:
            get_logger().error(f"Failed to publish inline comment to '{file}' at line {from_line}, error: {e}")
            raise e
    def get_line_link(self, relevant_file: str, relevant_line_start: int, relevant_line_end: int = None) -> str:
        if relevant_line_start == -1:
            link = f"{self.pr_url}/diff#{quote_plus(relevant_file)}"
        else:
            link = f"{self.pr_url}/diff#{quote_plus(relevant_file)}?t={relevant_line_start}"
        return link
    def generate_link_to_relevant_line_number(self, suggestion) -> str:
        try:
@ -305,37 +255,18 @@ class BitbucketServerProvider(GitProvider):
            position, absolute_position = find_line_number_of_relevant_line_in_file \
                (diff_files, relevant_file, relevant_line_str)
            if absolute_position != -1:
                if self.pr:
                    link = f"{self.pr_url}/diff#{quote_plus(relevant_file)}?t={absolute_position}"
                    return link
                else:
                    if get_settings().config.verbosity_level >= 2:
                        get_logger().info(f"Failed adding line link to '{relevant_file}' since PR not set")
            else:
                if get_settings().config.verbosity_level >= 2:
                    get_logger().info(f"Failed adding line link to '{relevant_file}' since position not found")
            if absolute_position != -1 and self.pr_url:
-                link = f"{self.pr_url}/diff#{quote_plus(relevant_file)}?t={absolute_position}"
+                link = f"{self.pr_url}/#L{relevant_file}T{absolute_position}"
                return link
        except Exception as e:
            if get_settings().config.verbosity_level >= 2:
-                get_logger().info(f"Failed adding line link to '{relevant_file}', error: {e}")
+                get_logger().info(f"Failed adding line link, error: {e}")
        return ""
    def publish_inline_comments(self, comments: list[dict]):
        for comment in comments:
            if 'position' in comment:
            self.publish_inline_comment(comment['body'], comment['position'], comment['path'])
            elif 'start_line' in comment:  # multi-line comment
                # note that bitbucket does not seem to support range - only a comment on a single line - https://community.developer.atlassian.com/t/api-post-endpoint-for-inline-pull-request-comments/60452
                self.publish_inline_comment(comment['body'], comment['start_line'], comment['path'])
            elif 'line' in comment:  # single-line comment
                self.publish_inline_comment(comment['body'], comment['line'], comment['path'])
            else:
                get_logger().error(f"Could not publish inline comment: {comment}")
    def get_title(self):
        return self.pr.title
@ -346,14 +277,8 @@ class BitbucketServerProvider(GitProvider):
    def get_pr_branch(self):
        return self.pr.fromRef['displayId']
    def get_pr_owner_id(self) -> str | None:
        return self.workspace_slug
    def get_pr_description_full(self):
        if hasattr(self.pr, "description"):
        return self.pr.description
        else:
            return None
    def get_user_id(self):
        return 0
@ -371,31 +296,16 @@ class BitbucketServerProvider(GitProvider):
    @staticmethod
    def _parse_bitbucket_server(url: str) -> str:
        # pr url format: f"{bitbucket_server}/projects/{project_name}/repos/{repository_name}/pull-requests/{pr_id}"
        parsed_url = urlparse(url)
        server_path = parsed_url.path.split("/projects/")
        if len(server_path) > 1:
            server_path = server_path[0].strip("/")
            return f"{parsed_url.scheme}://{parsed_url.netloc}/{server_path}".strip("/")
        return f"{parsed_url.scheme}://{parsed_url.netloc}"
    @staticmethod
    def _parse_pr_url(pr_url: str) -> Tuple[str, str, int]:
        # pr url format: f"{bitbucket_server}/projects/{project_name}/repos/{repository_name}/pull-requests/{pr_id}"
        parsed_url = urlparse(pr_url)
        path_parts = parsed_url.path.strip("/").split("/")
-
+        if len(path_parts) < 6 or path_parts[4] != "pull-requests":
        try:
            projects_index = path_parts.index("projects")
        except ValueError as e:
            raise ValueError(f"The provided URL '{pr_url}' does not appear to be a Bitbucket PR URL")
        path_parts = path_parts[projects_index:]
        if len(path_parts) < 6 or path_parts[2] != "repos" or path_parts[4] != "pull-requests":
            raise ValueError(
-                f"The provided URL '{pr_url}' does not appear to be a Bitbucket PR URL"
+                "The provided URL does not appear to be a Bitbucket PR URL"
            )
        workspace_slug = path_parts[1]
@ -403,7 +313,7 @@ class BitbucketServerProvider(GitProvider):
        try:
            pr_number = int(path_parts[5])
        except ValueError as e:
-            raise ValueError(f"Unable to convert PR number '{path_parts[5]}' to integer") from e
+            raise ValueError("Unable to convert PR number to integer") from e
        return workspace_slug, repo_slug, pr_number
@ -413,33 +323,24 @@ class BitbucketServerProvider(GitProvider):
        return self.repo
    def _get_pr(self):
-        try:
+        pr = self.bitbucket_client.get_pull_request(self.workspace_slug, self.repo_slug, pull_request_id=self.pr_num)
            pr = self.bitbucket_client.get_pull_request(self.workspace_slug, self.repo_slug,
                                                        pull_request_id=self.pr_num)
        return type('new_dict', (object,), pr)
        except Exception as e:
            get_logger().error(f"Failed to get pull request, error: {e}")
            raise e
    def _get_pr_file_content(self, remote_link: str):
        return ""
    def get_commit_messages(self):
-        return ""
+        def get_commit_messages(self):
-
+            raise NotImplementedError("Get commit messages function not implemented yet.")
    # bitbucket does not support labels
    def publish_description(self, pr_title: str, description: str):
-        payload = {
+        payload = json.dumps({
            "version": self.pr.version,
            "description": description,
-            "title": pr_title,
+            "title": pr_title
-            "reviewers": self.pr.reviewers  # needs to be sent otherwise gets wiped
+        })
-        }
+
-        try:
+        response = requests.put(url=self.bitbucket_pull_request_api_url, headers=self.headers, data=payload)
-            self.bitbucket_client.update_pull_request(self.workspace_slug, self.repo_slug, str(self.pr_num), payload)
+        return response
        except Exception as e:
            get_logger().error(f"Failed to update pull request, error: {e}")
            raise e
    # bitbucket does not support labels
    def publish_labels(self, pr_types: list):
@ -449,8 +350,5 @@ class BitbucketServerProvider(GitProvider):
    def get_pr_labels(self, update=False):
        pass
-    def _get_pr_comments_path(self):
+    def _get_pr_comments_url(self):
-        return f"rest/api/latest/projects/{self.workspace_slug}/repos/{self.repo_slug}/pull-requests/{self.pr_num}/comments"
+        return f"{self.bitbucket_server_url}/rest/api/latest/projects/{self.workspace_slug}/repos/{self.repo_slug}/pull-requests/{self.pr_num}/comments"
    def _get_merge_base(self):
        return f"rest/api/latest/projects/{self.workspace_slug}/repos/{self.repo_slug}/pull-requests/{self.pr_num}/merge-base"
--- a/pr_agent/git_providers/codecommit_provider.py
+++ b/pr_agent/git_providers/codecommit_provider.py
@ -225,7 +225,7 @@ class CodeCommitProvider(GitProvider):
    def remove_comment(self, comment):
        return ""  # not implemented yet
-    def publish_inline_comment(self, body: str, relevant_file: str, relevant_line_in_file: str, original_suggestion=None):
+    def publish_inline_comment(self, body: str, relevant_file: str, relevant_line_in_file: str):
        # https://boto3.amazonaws.com/v1/documentation/api/latest/reference/services/codecommit/client/post_comment_for_compared_commit.html
        raise NotImplementedError("CodeCommit provider does not support publishing inline comments yet")
--- a/pr_agent/git_providers/gerrit_provider.py
+++ b/pr_agent/git_providers/gerrit_provider.py
@ -376,7 +376,7 @@ class GerritProvider(GitProvider):
            'provider')
    def publish_inline_comment(self, body: str, relevant_file: str,
-                               relevant_line_in_file: str, original_suggestion=None):
+                               relevant_line_in_file: str):
        raise NotImplementedError(
            'Publishing inline comments is not implemented for the gerrit '
            'provider')
--- a/pr_agent/git_providers/git_provider.py
+++ b/pr_agent/git_providers/git_provider.py
@ -3,28 +3,20 @@ from abc import ABC, abstractmethod
 # enum EDIT_TYPE (ADDED, DELETED, MODIFIED, RENAMED)
 from typing import Optional
 from pr_agent.algo.utils import Range, process_description
 from pr_agent.config_loader import get_settings
 from pr_agent.algo.types import FilePatchInfo
 from pr_agent.log import get_logger
-MAX_FILES_ALLOWED_FULL = 50
+
 class GitProvider(ABC):
    @abstractmethod
    def is_supported(self, capability: str) -> bool:
        pass
    @abstractmethod
    def get_files(self) -> list:
        pass
    @abstractmethod
    def get_diff_files(self) -> list[FilePatchInfo]:
        pass
    def get_incremental_commits(self, is_incremental):
        pass
    @abstractmethod
    def publish_description(self, pr_title: str, pr_body: str):
        pass
@ -52,28 +44,16 @@ class GitProvider(ABC):
    def edit_comment(self, comment, body: str):
        pass
    def edit_comment_from_comment_id(self, comment_id: int, body: str):
        pass
    def get_comment_body_from_comment_id(self, comment_id: int) -> str:
        pass
    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) -> str:
        from pr_agent.config_loader import get_settings
        from pr_agent.algo.utils import clip_tokens
        max_tokens_description = get_settings().get("CONFIG.MAX_DESCRIPTION_TOKENS", None)
        description = self.get_pr_description_full() if full else self.get_user_description()
        if split_changes_walkthrough:
            description, files = process_description(description)
        if max_tokens_description:
-                description = clip_tokens(description, max_tokens_description)
+            return clip_tokens(description, max_tokens_description)
            return description, files
        else:
            if max_tokens_description:
                description = clip_tokens(description, max_tokens_description)
        return description
    def get_user_description(self) -> str:
@ -87,7 +67,6 @@ class GitProvider(ABC):
        # if the existing description wasn't generated by the pr-agent, just return it as-is
        if not self._is_generated_by_pr_agent(description_lowercase):
            get_logger().info(f"Existing description was not generated by the pr-agent")
            self.user_description = description
            return description
        # if the existing description was generated by the pr-agent, but it doesn't contain a user description,
@ -134,18 +113,12 @@ class GitProvider(ABC):
    def get_repo_settings(self):
        pass
    def get_workspace_name(self):
        return ""
    def get_pr_id(self):
        return ""
    def get_line_link(self, relevant_file: str, relevant_line_start: int, relevant_line_end: int = None) -> str:
        return ""
    def get_lines_link_original_file(self, filepath:str, component_range: Range) -> str:
        return ""
    #### comments operations ####
    @abstractmethod
    def publish_comment(self, pr_comment: str, is_temporary: bool = False):
@ -158,37 +131,8 @@ class GitProvider(ABC):
                                   final_update_message=True):
        self.publish_comment(pr_comment)
    def publish_persistent_comment_full(self, pr_comment: str,
                                   initial_header: str,
                                   update_header: bool = True,
                                   name='review',
                                   final_update_message=True):
        try:
            prev_comments = list(self.get_issue_comments())
            for comment in prev_comments:
                if comment.body.startswith(initial_header):
                    latest_commit_url = self.get_latest_commit_url()
                    comment_url = self.get_comment_url(comment)
                    if update_header:
                        updated_header = f"{initial_header}\n\n#### ({name.capitalize()} updated until commit {latest_commit_url})\n"
                        pr_comment_updated = pr_comment.replace(initial_header, updated_header)
                    else:
                        pr_comment_updated = pr_comment
                    get_logger().info(f"Persistent mode - updating comment {comment_url} to latest {name} message")
                    # 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(
                            f"**[Persistent {name}]({comment_url})** updated to latest commit {latest_commit_url}")
                    return
        except Exception as e:
            get_logger().exception(f"Failed to update persistent review, error: {e}")
            pass
        self.publish_comment(pr_comment)
    @abstractmethod
-    def publish_inline_comment(self, body: str, relevant_file: str, relevant_line_in_file: str, original_suggestion=None):
+    def publish_inline_comment(self, body: str, relevant_file: str, relevant_line_in_file: str):
        pass
    def create_inline_comment(self, body: str, relevant_file: str, relevant_line_in_file: str,
@ -259,9 +203,6 @@ class GitProvider(ABC):
        except Exception as e:
            return -1
    def limit_output_characters(self, output: str, max_chars: int):
        return output[:max_chars] + '...' if len(output) > max_chars else output
 def get_main_pr_language(languages, files) -> str:
    """
@ -332,8 +273,6 @@ def get_main_pr_language(languages, files) -> str:
    return main_language_str
 class IncrementalPR:
    def __init__(self, is_incremental: bool = False):
        self.is_incremental = is_incremental
--- a/pr_agent/git_providers/github_provider.py
+++ b/pr_agent/git_providers/github_provider.py
@ -1,33 +1,30 @@
 import itertools
 import time
 import hashlib
 import traceback
 from datetime import datetime
 from typing import Optional, Tuple
 from urllib.parse import urlparse
-from github import AppAuthentication, Auth, Github
+
 from github import AppAuthentication, Auth, Github, GithubException
 from retry import retry
 from starlette_context import context
 from ..algo.file_filter import filter_ignored
 from ..algo.language_handler import is_valid_file
-from ..algo.types import EDIT_TYPE
+from ..algo.utils import load_large_diff, clip_tokens, find_line_number_of_relevant_line_in_file
 from ..algo.utils import PRReviewHeader, load_large_diff, clip_tokens, find_line_number_of_relevant_line_in_file, Range
 from ..config_loader import get_settings
 from ..log import get_logger
 from ..servers.utils import RateLimitExceeded
-from .git_provider import FilePatchInfo, GitProvider, IncrementalPR, MAX_FILES_ALLOWED_FULL
+from .git_provider import GitProvider, IncrementalPR
 from pr_agent.algo.types import EDIT_TYPE, FilePatchInfo
 class GithubProvider(GitProvider):
-    def __init__(self, pr_url: Optional[str] = None):
+    def __init__(self, pr_url: Optional[str] = None, incremental=IncrementalPR(False)):
        self.repo_obj = None
        try:
            self.installation_id = context.get("installation_id", None)
        except Exception:
            self.installation_id = None
-        self.max_comment_chars = 65000
+        self.base_url = get_settings().get("GITHUB.BASE_URL", "https://api.github.com").rstrip("/")
        self.base_url = get_settings().get("GITHUB.BASE_URL", "https://api.github.com").rstrip("/") # "https://api.github.com"
        self.base_url_html = self.base_url.split("api/")[0].rstrip("/") if "api/" in self.base_url else "https://github.com"
        self.github_client = self._get_github_client()
        self.repo = None
@ -36,21 +33,18 @@ class GithubProvider(GitProvider):
        self.github_user_id = None
        self.diff_files = None
        self.git_files = None
-        self.incremental = IncrementalPR(False)
+        self.incremental = incremental
        if pr_url and 'pull' in pr_url:
            self.set_pr(pr_url)
            self.pr_commits = list(self.pr.get_commits())
            if self.incremental.is_incremental:
                self.unreviewed_files_set = dict()
                self.get_incremental_commits()
            self.last_commit_id = self.pr_commits[-1]
            self.pr_url = self.get_pr_url() # pr_url for github actions can be as api.github.com, so we need to get the url from the pr object
        else:
            self.pr_commits = None
    def get_incremental_commits(self, incremental=IncrementalPR(False)):
        self.incremental = incremental
        if self.incremental.is_incremental:
            self.unreviewed_files_set = dict()
            self._get_incremental_commits()
    def is_supported(self, capability: str) -> bool:
        return True
@ -61,7 +55,7 @@ class GithubProvider(GitProvider):
        self.repo, self.pr_num = self._parse_pr_url(pr_url)
        self.pr = self._get_pr()
-    def _get_incremental_commits(self):
+    def get_incremental_commits(self):
        if not self.pr_commits:
            self.pr_commits = list(self.pr.get_commits())
@ -98,9 +92,9 @@ class GithubProvider(GitProvider):
            self.comments = list(self.pr.get_issue_comments())
        prefixes = []
        if full:
-            prefixes.append(PRReviewHeader.REGULAR.value)
+            prefixes.append("## PR Review")
        if incremental:
-            prefixes.append(PRReviewHeader.INCREMENTAL.value)
+            prefixes.append("## Incremental PR Review")
        for index in range(len(self.comments) - 1, -1, -1):
            if any(self.comments[index].body.startswith(prefix) for prefix in prefixes):
                return self.comments[index]
@ -112,21 +106,18 @@ class GithubProvider(GitProvider):
            git_files = context.get("git_files", None)
            if git_files:
                return git_files
-            self.git_files = list(self.pr.get_files()) # 'list' to handle pagination
+            self.git_files = self.pr.get_files()
            context["git_files"] = self.git_files
            return self.git_files
        except Exception:
            if not self.git_files:
-                self.git_files = list(self.pr.get_files())
+                self.git_files = self.pr.get_files()
            return self.git_files
    def get_num_of_files(self):
-        if hasattr(self.git_files, "totalCount"):
+        if self.git_files:
            return self.git_files.totalCount
        else:
            try:
                return len(self.git_files)
            except Exception as e:
            return -1
    @retry(exceptions=RateLimitExceeded,
@ -151,49 +142,20 @@ class GithubProvider(GitProvider):
            if self.diff_files:
                return self.diff_files
-            # filter files using [ignore] patterns
+            files = self.get_files()
            files_original = self.get_files()
            files = filter_ignored(files_original)
            if files_original != files:
                try:
                    names_original = [file.filename for file in files_original]
                    names_new = [file.filename for file in files]
                    get_logger().info(f"Filtered out [ignore] files for pull request:", extra=
                    {"files": names_original,
                     "filtered_files": names_new})
                except Exception:
                    pass
            diff_files = []
-            invalid_files_names = []
+
            counter_valid = 0
            for file in files:
                if not is_valid_file(file.filename):
                    invalid_files_names.append(file.filename)
                    continue
                patch = file.patch
                # allow only a limited number of files to be fully loaded. We can manage the rest with diffs only
                counter_valid += 1
                avoid_load = False
                if counter_valid >= MAX_FILES_ALLOWED_FULL and patch and not self.incremental.is_incremental:
                    avoid_load = True
                    if counter_valid == MAX_FILES_ALLOWED_FULL:
                        get_logger().info(f"Too many files in PR, will avoid loading full content for rest of files")
                if avoid_load:
                    new_file_content_str = ""
                else:
                new_file_content_str = self._get_pr_file_content(file, self.pr.head.sha)  # communication with GitHub
                patch = file.patch
                if self.incremental.is_incremental and self.unreviewed_files_set:
                    original_file_content_str = self._get_pr_file_content(file, self.incremental.last_seen_commit_sha)
                    patch = load_large_diff(file.filename, new_file_content_str, original_file_content_str)
                    self.unreviewed_files_set[file.filename] = patch
                else:
                    if avoid_load:
                        original_file_content_str = ""
                else:
                    original_file_content_str = self._get_pr_file_content(file, self.pr.base.sha)
                    if not patch:
@ -220,8 +182,6 @@ class GithubProvider(GitProvider):
                                                               num_plus_lines=num_plus_lines,
                                                               num_minus_lines=num_minus_lines,)
                diff_files.append(file_patch_canonical_structure)
            if invalid_files_names:
                get_logger().info(f"Filtered out files with invalid extensions: {invalid_files_names}")
            self.diff_files = diff_files
            try:
@ -231,9 +191,8 @@ class GithubProvider(GitProvider):
            return diff_files
-        except Exception as e:
+        except GithubException.RateLimitExceededException as e:
-            get_logger().error(f"Failing to get diff files: {e}",
+            get_logger().error(f"Rate limit exceeded for GitHub API. Original message: {e}")
                               artifact={"traceback": traceback.format_exc()})
            raise RateLimitExceeded("Rate limit exceeded for GitHub API.") from e
    def publish_description(self, pr_title: str, pr_body: str):
@ -250,13 +209,30 @@ class GithubProvider(GitProvider):
                                   update_header: bool = True,
                                   name='review',
                                   final_update_message=True):
-        self.publish_persistent_comment_full(pr_comment, initial_header, update_header, name, final_update_message)
+        prev_comments = list(self.pr.get_issue_comments())
        for comment in prev_comments:
            body = comment.body
            if body.startswith(initial_header):
                latest_commit_url = self.get_latest_commit_url()
                comment_url = self.get_comment_url(comment)
                if update_header:
                    updated_header = f"{initial_header}\n\n### ({name.capitalize()} updated until commit {latest_commit_url})\n"
                    pr_comment_updated = pr_comment.replace(initial_header, updated_header)
                else:
                    pr_comment_updated = pr_comment
                get_logger().info(f"Persistent mode- updating comment {comment_url} to latest review message")
                response = comment.edit(pr_comment_updated)
                if final_update_message:
                    self.publish_comment(
                        f"**[Persistent {name}]({comment_url})** updated to latest commit {latest_commit_url}")
                return
        self.publish_comment(pr_comment)
    def publish_comment(self, pr_comment: str, is_temporary: bool = False):
        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
+            return
-        pr_comment = self.limit_output_characters(pr_comment, self.max_comment_chars)
+
        response = self.pr.create_issue_comment(pr_comment)
        if hasattr(response, "user") and hasattr(response.user, "login"):
            self.github_user_id = response.user.login
@ -266,14 +242,12 @@ class GithubProvider(GitProvider):
        self.pr.comments_list.append(response)
        return response
-    def publish_inline_comment(self, body: str, relevant_file: str, relevant_line_in_file: str, original_suggestion=None):
+    def publish_inline_comment(self, body: str, relevant_file: str, relevant_line_in_file: str):
        body = self.limit_output_characters(body, self.max_comment_chars)
        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):
        body = self.limit_output_characters(body, self.max_comment_chars)
        position, absolute_position = find_line_number_of_relevant_line_in_file(self.diff_files,
                                                                                relevant_file.strip('`'),
                                                                                relevant_line_in_file,
@ -446,24 +420,11 @@ class GithubProvider(GitProvider):
            return False
    def edit_comment(self, comment, body: str):
        body = self.limit_output_characters(body, self.max_comment_chars)
        comment.edit(body=body)
    def edit_comment_from_comment_id(self, comment_id: int, body: str):
        try:
            # self.pr.get_issue_comment(comment_id).edit(body)
            body = self.limit_output_characters(body, self.max_comment_chars)
            headers, data_patch = self.pr._requester.requestJsonAndCheck(
                "PATCH", f"{self.base_url}/repos/{self.repo}/issues/comments/{comment_id}",
                input={"body": body}
            )
        except Exception as e:
            get_logger().exception(f"Failed to edit comment, error: {e}")
    def reply_to_comment_from_comment_id(self, comment_id: int, body: str):
        try:
            # self.pr.get_issue_comment(comment_id).edit(body)
            body = self.limit_output_characters(body, self.max_comment_chars)
            headers, data_patch = self.pr._requester.requestJsonAndCheck(
                "POST", f"{self.base_url}/repos/{self.repo}/pulls/{self.pr_num}/comments/{comment_id}/replies",
                input={"body": body}
@ -471,51 +432,6 @@ class GithubProvider(GitProvider):
        except Exception as e:
            get_logger().exception(f"Failed to reply comment, error: {e}")
    def get_comment_body_from_comment_id(self, comment_id: int):
        try:
            # self.pr.get_issue_comment(comment_id).edit(body)
            headers, data_patch = self.pr._requester.requestJsonAndCheck(
                "GET", f"{self.base_url}/repos/{self.repo}/issues/comments/{comment_id}"
            )
            return data_patch.get("body","")
        except Exception as e:
            get_logger().exception(f"Failed to edit comment, error: {e}")
            return None
    def publish_file_comments(self, file_comments: list) -> bool:
        try:
            headers, existing_comments = self.pr._requester.requestJsonAndCheck(
                "GET", f"{self.pr.url}/comments"
            )
            for comment in file_comments:
                comment['commit_id'] = self.last_commit_id.sha
                comment['body'] = self.limit_output_characters(comment['body'], self.max_comment_chars)
                found = False
                for existing_comment in existing_comments:
                    comment['commit_id'] = self.last_commit_id.sha
                    our_app_name = get_settings().get("GITHUB.APP_NAME", "")
                    same_comment_creator = False
                    if self.deployment_type == 'app':
                        same_comment_creator = our_app_name.lower() in existing_comment['user']['login'].lower()
                    elif self.deployment_type == 'user':
                        same_comment_creator = self.github_user_id == existing_comment['user']['login']
                    if existing_comment['subject_type'] == 'file' and comment['path'] == existing_comment['path'] and same_comment_creator:
                        headers, data_patch = self.pr._requester.requestJsonAndCheck(
                            "PATCH", f"{self.base_url}/repos/{self.repo}/pulls/comments/{existing_comment['id']}", input={"body":comment['body']}
                        )
                        found = True
                        break
                if not found:
                    headers, data_post = self.pr._requester.requestJsonAndCheck(
                        "POST", f"{self.pr.url}/comments", input=comment
                    )
            return True
        except Exception as e:
            if get_settings().config.verbosity_level >= 2:
                get_logger().error(f"Failed to publish diffview file summary, error: {e}")
            return False
    def remove_initial_comment(self):
        try:
            for comment in getattr(self.pr, 'comments_list', []):
@ -540,11 +456,6 @@ class GithubProvider(GitProvider):
    def get_pr_branch(self):
        return self.pr.head.ref
    def get_pr_owner_id(self) -> str | None:
        if not self.repo:
            return None
        return self.repo.split('/')[0]
    def get_pr_description_full(self):
        return self.pr.body
@ -579,9 +490,6 @@ class GithubProvider(GitProvider):
        except Exception:
            return ""
    def get_workspace_name(self):
        return self.repo.split('/')[0]
    def add_eyes_reaction(self, issue_comment_id: int, disable_eyes: bool = False) -> Optional[int]:
        if disable_eyes:
            return None
@ -592,7 +500,7 @@ class GithubProvider(GitProvider):
            )
            return data_patch.get("id", None)
        except Exception as e:
-            get_logger().warning(f"Failed to add eyes reaction, error: {e}")
+            get_logger().exception(f"Failed to add eyes reaction, error: {e}")
            return None
    def remove_reaction(self, issue_comment_id: int, reaction_id: str) -> bool:
@ -607,14 +515,15 @@ class GithubProvider(GitProvider):
            get_logger().exception(f"Failed to remove eyes reaction, error: {e}")
            return False
-    def _parse_pr_url(self, pr_url: str) -> Tuple[str, int]:
+    @staticmethod
    def _parse_pr_url(pr_url: str) -> Tuple[str, int]:
        parsed_url = urlparse(pr_url)
-        if parsed_url.path.startswith('/api/v3'):
+        if 'github.com' not in parsed_url.netloc:
-            parsed_url = urlparse(pr_url.replace("/api/v3", ""))
+            raise ValueError("The provided URL is not a valid GitHub URL")
        path_parts = parsed_url.path.strip('/').split('/')
-        if 'api.github.com' in parsed_url.netloc or '/api/v3' in pr_url:
+        if 'api.github.com' in parsed_url.netloc:
            if len(path_parts) < 5 or path_parts[3] != 'pulls':
                raise ValueError("The provided URL does not appear to be a GitHub PR URL")
            repo_name = '/'.join(path_parts[1:3])
@ -635,7 +544,8 @@ class GithubProvider(GitProvider):
        return repo_name, pr_number
-    def _parse_issue_url(self, issue_url: str) -> Tuple[str, int]:
+    @staticmethod
    def _parse_issue_url(issue_url: str) -> Tuple[str, int]:
        parsed_url = urlparse(issue_url)
        if 'github.com' not in parsed_url.netloc:
@ -743,7 +653,7 @@ class GithubProvider(GitProvider):
                "PUT", f"{self.pr.issue_url}/labels", input=post_parameters
            )
        except Exception as e:
-            get_logger().warning(f"Failed to publish labels, error: {e}")
+            get_logger().exception(f"Failed to publish labels, error: {e}")
    def get_pr_labels(self, update=False):
        try:
@ -761,7 +671,7 @@ class GithubProvider(GitProvider):
    def get_repo_labels(self):
        labels = self.repo_obj.get_labels()
-        return [label for label in itertools.islice(labels, 50)]
+        return [label for label in labels]
    def get_commit_messages(self):
        """
@ -816,32 +726,6 @@ class GithubProvider(GitProvider):
            link = f"{self.base_url_html}/{self.repo}/pull/{self.pr_num}/files#diff-{sha_file}R{relevant_line_start}"
        return link
    def get_lines_link_original_file(self, filepath: str, component_range: Range) -> str:
        """
        Returns the link to the original file on GitHub that corresponds to the given filepath and component range.
        Args:
            filepath (str): The path of the file.
            component_range (Range): The range of lines that represent the component.
        Returns:
            str: The link to the original file on GitHub.
        Example:
            >>> filepath = "path/to/file.py"
            >>> component_range = Range(line_start=10, line_end=20)
            >>> link = get_lines_link_original_file(filepath, component_range)
            >>> print(link)
            "https://github.com/{repo}/blob/{commit_sha}/{filepath}/#L11-L21"
        """
        line_start = component_range.line_start + 1
        line_end = component_range.line_end + 1
        # link = (f"https://github.com/{self.repo}/blob/{self.last_commit_id.sha}/{filepath}/"
        #         f"#L{line_start}-L{line_end}")
        link = (f"{self.base_url_html}/{self.repo}/blob/{self.last_commit_id.sha}/{filepath}/"
                f"#L{line_start}-L{line_end}")
        return link
    def get_pr_id(self):
        try:
--- a/pr_agent/git_providers/gitlab_provider.py
+++ b/pr_agent/git_providers/gitlab_provider.py
@ -4,14 +4,12 @@ from typing import Optional, Tuple
 from urllib.parse import urlparse
 import gitlab
 import requests
 from gitlab import GitlabGetError
 from ..algo.file_filter import filter_ignored
 from ..algo.language_handler import is_valid_file
 from ..algo.utils import load_large_diff, clip_tokens, find_line_number_of_relevant_line_in_file
 from ..config_loader import get_settings
-from .git_provider import GitProvider, MAX_FILES_ALLOWED_FULL
+from .git_provider import GitProvider
 from pr_agent.algo.types import EDIT_TYPE, FilePatchInfo
 from ..log import get_logger
@ -26,7 +24,6 @@ class GitLabProvider(GitProvider):
        gitlab_url = get_settings().get("GITLAB.URL", None)
        if not gitlab_url:
            raise ValueError("GitLab URL is not set in the config file")
        self.gitlab_url = gitlab_url
        gitlab_access_token = get_settings().get("GITLAB.PERSONAL_ACCESS_TOKEN", None)
        if not gitlab_access_token:
            raise ValueError("GitLab personal access token is not set in the config file")
@ -34,7 +31,6 @@ class GitLabProvider(GitProvider):
            url=gitlab_url,
            oauth_token=gitlab_access_token
        )
        self.max_comment_chars = 65000
        self.id_project = None
        self.id_mr = None
        self.mr = None
@ -48,8 +44,7 @@ class GitLabProvider(GitProvider):
        self.incremental = incremental
    def is_supported(self, capability: str) -> bool:
-        if capability in ['get_issue_comments', 'create_inline_comment', 'publish_inline_comments',
+        if capability in ['get_issue_comments', 'create_inline_comment', 'publish_inline_comments']: # gfm_markdown is supported in gitlab !
            'publish_file_comments']: # gfm_markdown is supported in gitlab !
            return False
        return True
@ -89,38 +84,12 @@ class GitLabProvider(GitProvider):
        if self.diff_files:
            return self.diff_files
-        # filter files using [ignore] patterns
+        diffs = self.mr.changes()['changes']
        diffs_original = self.mr.changes()['changes']
        diffs = filter_ignored(diffs_original, 'gitlab')
        if diffs != diffs_original:
            try:
                names_original = [diff['new_path'] for diff in diffs_original]
                names_filtered = [diff['new_path'] for diff in diffs]
                get_logger().info(f"Filtered out [ignore] files for merge request {self.id_mr}", extra={
                    'original_files': names_original,
                    'filtered_files': names_filtered
                })
            except Exception as e:
                pass
        diff_files = []
        invalid_files_names = []
        counter_valid = 0
        for diff in diffs:
-            if not is_valid_file(diff['new_path']):
+            if is_valid_file(diff['new_path']):
                invalid_files_names.append(diff['new_path'])
                continue
            # allow only a limited number of files to be fully loaded. We can manage the rest with diffs only
            counter_valid += 1
            if counter_valid < MAX_FILES_ALLOWED_FULL or not diff['diff']:
                original_file_content_str = self.get_pr_file_content(diff['old_path'], self.mr.diff_refs['base_sha'])
                new_file_content_str = self.get_pr_file_content(diff['new_path'], self.mr.diff_refs['head_sha'])
            else:
                if counter_valid == MAX_FILES_ALLOWED_FULL:
                    get_logger().info(f"Too many files in PR, will avoid loading full content for rest of files")
                original_file_content_str = ''
                new_file_content_str = ''
                try:
                    if isinstance(original_file_content_str, bytes):
@ -157,13 +126,11 @@ class GitLabProvider(GitProvider):
                                  old_filename=None if diff['old_path'] == diff['new_path'] else diff['old_path'],
                                  num_plus_lines=num_plus_lines,
                                  num_minus_lines=num_minus_lines, ))
        if invalid_files_names:
            get_logger().info(f"Filtered out files with invalid extensions: {invalid_files_names}")
        self.diff_files = diff_files
        return diff_files
-    def get_files(self) -> list:
+    def get_files(self):
        if not self.git_files:
            self.git_files = [change['new_path'] for change in self.mr.changes()['changes']]
        return self.git_files
@ -187,36 +154,45 @@ class GitLabProvider(GitProvider):
                                   update_header: bool = True,
                                   name='review',
                                   final_update_message=True):
-        self.publish_persistent_comment_full(pr_comment, initial_header, update_header, name, final_update_message)
+        try:
            for comment in self.mr.notes.list(get_all=True)[::-1]:
                if comment.body.startswith(initial_header):
                    latest_commit_url = self.get_latest_commit_url()
                    comment_url = self.get_comment_url(comment)
                    if update_header:
                        updated_header = f"{initial_header}\n\n### ({name.capitalize()} updated until commit {latest_commit_url})\n"
                        pr_comment_updated = pr_comment.replace(initial_header, updated_header)
                    else:
                        pr_comment_updated = pr_comment
                    get_logger().info(f"Persistent mode - updating comment {comment_url} to latest {name} message")
                    response = self.mr.notes.update(comment.id, {'body': pr_comment_updated})
                    if final_update_message:
                        self.publish_comment(
                            f"**[Persistent {name}]({comment_url})** updated to latest commit {latest_commit_url}")
                    return
        except Exception as e:
            get_logger().exception(f"Failed to update persistent review, error: {e}")
            pass
        self.publish_comment(pr_comment)
    def publish_comment(self, mr_comment: str, is_temporary: bool = False):
        mr_comment = self.limit_output_characters(mr_comment, self.max_comment_chars)
        comment = self.mr.notes.create({'body': mr_comment})
        if is_temporary:
            self.temp_comments.append(comment)
        return comment
    def edit_comment(self, comment, body: str):
        body = self.limit_output_characters(body, self.max_comment_chars)
        self.mr.notes.update(comment.id,{'body': body} )
    def edit_comment_from_comment_id(self, comment_id: int, body: str):
        body = self.limit_output_characters(body, self.max_comment_chars)
        comment = self.mr.notes.get(comment_id)
        comment.body = body
        comment.save()
    def reply_to_comment_from_comment_id(self, comment_id: int, body: str):
        body = self.limit_output_characters(body, self.max_comment_chars)
        discussion = self.mr.discussions.get(comment_id)
        discussion.notes.create({'body': body})
-    def publish_inline_comment(self, body: str, relevant_file: str, relevant_line_in_file: str, original_suggestion=None):
+    def publish_inline_comment(self, body: str, relevant_file: str, relevant_line_in_file: str):
        body = self.limit_output_characters(body, self.max_comment_chars)
        edit_type, found, source_line_no, target_file, target_line_no = self.search_line(relevant_file,
                                                                                         relevant_line_in_file)
        self.send_inline_comment(body, edit_type, found, relevant_file, relevant_line_in_file, source_line_no,
-                                 target_file, target_line_no, original_suggestion)
+                                 target_file, target_line_no)
    def create_inline_comment(self, body: str, relevant_file: str, relevant_line_in_file: str, absolute_position: int = None):
        raise NotImplementedError("Gitlab provider does not support creating inline comments yet")
@ -224,14 +200,8 @@ class GitLabProvider(GitProvider):
    def create_inline_comments(self, comments: list[dict]):
        raise NotImplementedError("Gitlab provider does not support publishing inline comments yet")
-    def get_comment_body_from_comment_id(self, comment_id: int):
+    def send_inline_comment(self,body: str,edit_type: str,found: bool,relevant_file: str,relevant_line_in_file: int,
-        comment = self.mr.notes.get(comment_id).body
+                            source_line_no: int, target_file: str,target_line_no: int) -> None:
        return comment
    def send_inline_comment(self, body: str, edit_type: str, found: bool, relevant_file: str,
                            relevant_line_in_file: str,
                            source_line_no: int, target_file: str, target_line_no: int,
                            original_suggestion=None) -> None:
        if not found:
            get_logger().info(f"Could not find position for {relevant_file} {relevant_line_in_file}")
        else:
@ -251,63 +221,14 @@ class GitLabProvider(GitProvider):
            else:
                pos_obj['new_line'] = target_line_no - 1
                pos_obj['old_line'] = source_line_no - 1
-            get_logger().debug(f"Creating comment in MR {self.id_mr} with body {body} and position {pos_obj}")
+            get_logger().debug(f"Creating comment in {self.id_mr} with body {body} and position {pos_obj}")
            try:
                self.mr.discussions.create({'body': body, 'position': pos_obj})
            except Exception as e:
-                try:
+                get_logger().debug(
-                    # fallback - create a general note on the file in the MR
+                    f"Failed to create comment in {self.id_mr} with position {pos_obj} (probably not a '+' line)")
                    if 'suggestion_orig_location' in original_suggestion:
                        line_start = original_suggestion['suggestion_orig_location']['start_line']
                        line_end = original_suggestion['suggestion_orig_location']['end_line']
                        old_code_snippet = original_suggestion['prev_code_snippet']
                        new_code_snippet = original_suggestion['new_code_snippet']
                        content = original_suggestion['suggestion_summary']
                        label = original_suggestion['category']
                        if 'score' in original_suggestion:
                            score = original_suggestion['score']
                        else:
                            score = 7
                    else:
                        line_start = original_suggestion['relevant_lines_start']
                        line_end = original_suggestion['relevant_lines_end']
                        old_code_snippet = original_suggestion['existing_code']
                        new_code_snippet = original_suggestion['improved_code']
                        content = original_suggestion['suggestion_content']
                        label = original_suggestion['label']
                        if 'score' in original_suggestion:
                            score = original_suggestion['score']
                        else:
                            score = 7
-                    if hasattr(self, 'main_language'):
+    def get_relevant_diff(self, relevant_file: str, relevant_line_in_file: int) -> Optional[dict]:
                        language = self.main_language
                    else:
                        language = ''
                    link = self.get_line_link(relevant_file, line_start, line_end)
                    body_fallback =f"**Suggestion:** {content} [{label}, importance: {score}]\n___\n"
                    body_fallback +=f"\n\nReplace  lines ([{line_start}-{line_end}]({link}))\n\n```{language}\n{old_code_snippet}\n````\n\n"
                    body_fallback +=f"with\n\n```{language}\n{new_code_snippet}\n````"
                    body_fallback += f"\n\n___\n\n`(Cannot implement this suggestion directly, as gitlab API does not enable committing to a non -+ line in a PR)`"
                    # Create a general note on the file in the MR
                    self.mr.notes.create({
                        'body': body_fallback,
                        'position': {
                            'base_sha': diff.base_commit_sha,
                            'start_sha': diff.start_commit_sha,
                            'head_sha': diff.head_commit_sha,
                            'position_type': 'text',
                            'file_path': f'{target_file.filename}',
                        }
                    })
                    # get_logger().debug(
                    #     f"Failed to create comment in MR {self.id_mr} with position {pos_obj} (probably not a '+' line)")
                except Exception as e:
                    get_logger().exception(f"Failed to create comment in MR {self.id_mr}")
    def get_relevant_diff(self, relevant_file: str, relevant_line_in_file: str) -> Optional[dict]:
        changes = self.mr.changes()  # Retrieve the changes for the merge request once
        if not changes:
            get_logger().error('No changes found for the merge request.')
@ -327,10 +248,6 @@ class GitLabProvider(GitProvider):
    def publish_code_suggestions(self, code_suggestions: list) -> bool:
        for suggestion in code_suggestions:
            try:
                if suggestion and 'original_suggestion' in suggestion:
                    original_suggestion = suggestion['original_suggestion']
                else:
                    original_suggestion = suggestion
                body = suggestion['body']
                relevant_file = suggestion['relevant_file']
                relevant_lines_start = suggestion['relevant_lines_start']
@ -351,22 +268,19 @@ class GitLabProvider(GitProvider):
                # edit_type, found, source_line_no, target_file, target_line_no = self.find_in_file(target_file,
                #                                                                            relevant_line_in_file)
                # for code suggestions, we want to edit the new code
-                source_line_no = -1
+                source_line_no = None
                target_line_no = relevant_lines_start + 1
                found = True
                edit_type = 'addition'
                self.send_inline_comment(body, edit_type, found, relevant_file, relevant_line_in_file, source_line_no,
-                                         target_file, target_line_no, original_suggestion)
+                                         target_file, target_line_no)
            except Exception as e:
                get_logger().exception(f"Could not publish code suggestion:\nsuggestion: {suggestion}\nerror: {e}")
        # note that we publish suggestions one-by-one. so, if one fails, the rest will still be published
        return True
    def publish_file_comments(self, file_comments: list) -> bool:
        pass
    def search_line(self, relevant_file, relevant_line_in_file):
        target_file = None
@ -444,20 +358,11 @@ class GitLabProvider(GitProvider):
    def get_pr_branch(self):
        return self.mr.source_branch
    def get_pr_owner_id(self) -> str | None:
        if not self.gitlab_url or 'gitlab.com' in self.gitlab_url:
            if not self.id_project:
                return None
            return self.id_project.split('/')[0]
        # extract host name
        host = urlparse(self.gitlab_url).hostname
        return host
    def get_pr_description_full(self):
        return self.mr.description
    def get_issue_comments(self):
-        return self.mr.notes.list(get_all=True)[::-1]
+        raise NotImplementedError("GitLab provider does not support issue comments yet")
    def get_repo_settings(self):
        try:
@ -466,9 +371,6 @@ class GitLabProvider(GitProvider):
        except Exception:
            return ""
    def get_workspace_name(self):
        return self.id_project.split('/')[0]
    def add_eyes_reaction(self, issue_comment_id: int, disable_eyes: bool = False) -> Optional[int]:
        return True
@ -512,7 +414,7 @@ class GitLabProvider(GitProvider):
            self.mr.labels = list(set(pr_types))
            self.mr.save()
        except Exception as e:
-            get_logger().warning(f"Failed to publish labels, error: {e}")
+            get_logger().exception(f"Failed to publish labels, error: {e}")
    def publish_inline_comments(self, comments: list[dict]):
        pass
@ -551,7 +453,7 @@ class GitLabProvider(GitProvider):
        if relevant_line_start == -1:
            link = f"{self.gl.url}/{self.id_project}/-/blob/{self.mr.source_branch}/{relevant_file}?ref_type=heads"
        elif relevant_line_end:
-            link = f"{self.gl.url}/{self.id_project}/-/blob/{self.mr.source_branch}/{relevant_file}?ref_type=heads#L{relevant_line_start}-{relevant_line_end}"
+            link = f"{self.gl.url}/{self.id_project}/-/blob/{self.mr.source_branch}/{relevant_file}?ref_type=heads#L{relevant_line_start}-L{relevant_line_end}"
        else:
            link = f"{self.gl.url}/{self.id_project}/-/blob/{self.mr.source_branch}/{relevant_file}?ref_type=heads#L{relevant_line_start}"
        return link
--- a/pr_agent/git_providers/local_git_provider.py
+++ b/pr_agent/git_providers/local_git_provider.py
@ -119,7 +119,7 @@ class LocalGitProvider(GitProvider):
            # Write the string to the file
            file.write(pr_comment)
-    def publish_inline_comment(self, body: str, relevant_file: str, relevant_line_in_file: str, original_suggestion=None):
+    def publish_inline_comment(self, body: str, relevant_file: str, relevant_line_in_file: str):
        raise NotImplementedError('Publishing inline comments is not implemented for the local git provider')
    def publish_inline_comments(self, comments: list[dict]):
--- a/pr_agent/git_providers/utils.py
+++ b/pr_agent/git_providers/utils.py
@ -5,13 +5,12 @@ import tempfile
 from dynaconf import Dynaconf
 from pr_agent.config_loader import get_settings
-from pr_agent.git_providers import get_git_provider, get_git_provider_with_context
+from pr_agent.git_providers import get_git_provider
 from pr_agent.log import get_logger
 from starlette_context import context
 def apply_repo_settings(pr_url):
    git_provider = get_git_provider_with_context(pr_url)
    if get_settings().config.use_repo_settings_file:
        repo_settings_file = None
        try:
@ -21,17 +20,15 @@ def apply_repo_settings(pr_url):
                repo_settings = None
                pass
            if repo_settings is None:  # None is different from "", which is a valid value
                git_provider = get_git_provider()(pr_url)
                repo_settings = git_provider.get_repo_settings()
                try:
                    context["repo_settings"] = repo_settings
                except Exception:
                    pass
            error_local = None
            if repo_settings:
                repo_settings_file = None
                category = 'local'
                try:
                fd, repo_settings_file = tempfile.mkstemp(suffix='.toml')
                os.write(fd, repo_settings)
                new_settings = Dynaconf(settings_files=[repo_settings_file])
@ -42,12 +39,6 @@ def apply_repo_settings(pr_url):
                    get_settings().unset(section)
                    get_settings().set(section, section_dict, merge=False)
                get_logger().info(f"Applying repo settings:\n{new_settings.as_dict()}")
                except Exception as e:
                    get_logger().warning(f"Failed to apply repo {category} settings, error: {str(e)}")
                    error_local = {'error': str(e), 'settings': repo_settings, 'category': category}
                if error_local:
                    handle_configurations_errors([error_local], git_provider)
        except Exception as e:
            get_logger().exception("Failed to apply repo settings", e)
        finally:
@ -56,47 +47,3 @@ def apply_repo_settings(pr_url):
                    os.remove(repo_settings_file)
                except Exception as e:
                    get_logger().error(f"Failed to remove temporary settings file {repo_settings_file}", e)
    # enable switching models with a short definition
    if get_settings().config.model.lower() == 'claude-3-5-sonnet':
        set_claude_model()
 def handle_configurations_errors(config_errors, git_provider):
    try:
        if not any(config_errors):
            return
        for err in config_errors:
            if err:
                configuration_file_content = err['settings'].decode()
                err_message = err['error']
                config_type = err['category']
                header = f"❌ **PR-Agent failed to apply '{config_type}' repo settings**"
                body = f"{header}\n\nThe configuration file needs to be a valid [TOML](https://qodo-merge-docs.qodo.ai/usage-guide/configuration_options/), please fix it.\n\n"
                body += f"___\n\n**Error message:**\n`{err_message}`\n\n"
                if git_provider.is_supported("gfm_markdown"):
                    body += f"\n\n<details><summary>Configuration content:</summary>\n\n```toml\n{configuration_file_content}\n```\n\n</details>"
                else:
                    body += f"\n\n**Configuration content:**\n\n```toml\n{configuration_file_content}\n```\n\n"
                get_logger().warning(f"Sending a 'configuration error' comment to the PR", artifact={'body': body})
                # git_provider.publish_comment(body)
                if hasattr(git_provider, 'publish_persistent_comment'):
                    git_provider.publish_persistent_comment(body,
                                                            initial_header=header,
                                                            update_header=False,
                                                            final_update_message=False)
                else:
                    git_provider.publish_comment(body)
    except Exception as e:
        get_logger().exception(f"Failed to handle configurations errors", e)
 def set_claude_model():
    """
    set the claude-sonnet-3.5 model easily (even by users), just by stating: --config.model='claude-3-5-sonnet'
    """
    model_claude = "bedrock/anthropic.claude-3-5-sonnet-20240620-v1:0"
    get_settings().set('config.model', model_claude)
    get_settings().set('config.model_turbo', model_claude)
    get_settings().set('config.fallback_models', [model_claude])
--- a/pr_agent/secret_providers/google_cloud_storage_secret_provider.py
+++ b/pr_agent/secret_providers/google_cloud_storage_secret_provider.py
@ -22,7 +22,7 @@ class GoogleCloudStorageSecretProvider(SecretProvider):
            blob = self.bucket.blob(secret_name)
            return blob.download_as_string()
        except Exception as e:
-            get_logger().warning(f"Failed to get secret {secret_name} from Google Cloud Storage: {e}")
+            get_logger().error(f"Failed to get secret {secret_name} from Google Cloud Storage: {e}")
            return ""
    def store_secret(self, secret_name: str, secret_value: str):
--- a/pr_agent/servers/atlassian-connect.json
+++ b/pr_agent/servers/atlassian-connect.json
@ -16,9 +16,8 @@
  },
  "scopes": [
    "account",
-    "repository:write",
+    "repository",
-    "pullrequest:write",
+    "pullrequest"
    "wiki"
  ],
  "contexts": [
    "account"
--- a/pr_agent/servers/azuredevops_server_webhook.py
+++ b/pr_agent/servers/azuredevops_server_webhook.py
@ -26,9 +26,8 @@ from pr_agent.git_providers.utils import apply_repo_settings
 from pr_agent.log import get_logger
 from fastapi import Request, Depends
 from fastapi.security import HTTPBasic, HTTPBasicCredentials
-from pr_agent.log import LoggingFormat, get_logger, setup_logger
+from pr_agent.log import get_logger
 setup_logger(fmt=LoggingFormat.JSON, level="DEBUG")
 security = HTTPBasic()
 router = APIRouter()
 available_commands_rgx = re.compile(r"^\/(" + "|".join(command2class.keys()) + r")\s*")
@ -41,15 +40,8 @@ def handle_request(
 ):
    log_context["action"] = body
    log_context["api_url"] = url
    async def inner():
        try:
    with get_logger().contextualize(**log_context):
-                await PRAgent().handle_request(url, body)
+        background_tasks.add_task(PRAgent().handle_request, url, body)
        except Exception as e:
            get_logger().error(f"Failed to handle webhook: {e}")
    background_tasks.add_task(inner)
 # currently only basic auth is supported with azure webhooks
@ -68,7 +60,6 @@ def authorize(credentials: HTTPBasicCredentials = Depends(security)):
 async def _perform_commands_azure(commands_conf: str, agent: PRAgent, api_url: str, log_context: dict):
    apply_repo_settings(api_url)
    commands = get_settings().get(f"azure_devops_server.{commands_conf}")
    get_settings().set("config.is_auto_command", True)
    for command in commands:
        try:
            split_command = command.split(" ")
@ -132,7 +123,7 @@ async def handle_webhook(background_tasks: BackgroundTasks, request: Request):
                content=json.dumps({"message": "Internal server error"}),
            )
    return JSONResponse(
-        status_code=status.HTTP_202_ACCEPTED, content=jsonable_encoder({"message": "webhook triggered successfully"})
+        status_code=status.HTTP_202_ACCEPTED, content=jsonable_encoder({"message": "webhook triggerd successfully"})
    )
@router.get("/")
--- a/pr_agent/servers/bitbucket_app.py
+++ b/pr_agent/servers/bitbucket_app.py
@ -3,7 +3,6 @@ import copy
 import hashlib
 import json
 import os
 import re
 import time
 import jwt
@ -75,13 +74,9 @@ async def handle_manifest(request: Request, response: Response):
    return JSONResponse(manifest_obj)
-async def _perform_commands_bitbucket(commands_conf: str, agent: PRAgent, api_url: str, log_context: dict, data: dict):
+async def _perform_commands_bitbucket(commands_conf: str, agent: PRAgent, api_url: str, log_context: dict):
    apply_repo_settings(api_url)
    if data.get("event", "") == "pullrequest:created":
        if not should_process_pr_logic(data):
            return
    commands = get_settings().get(f"bitbucket_app.{commands_conf}", {})
    get_settings().set("config.is_auto_command", True)
    for command in commands:
        try:
            split_command = command.split(" ")
@ -96,81 +91,29 @@ async def _perform_commands_bitbucket(commands_conf: str, agent: PRAgent, api_ur
            get_logger().error(f"Failed to perform command {command}: {e}")
 def is_bot_user(data) -> bool:
    try:
        if data["data"]["actor"]["type"] != "user":
            get_logger().info(f"BitBucket actor type is not 'user': {data['data']['actor']['type']}")
            return True
    except Exception as e:
        get_logger().error("Failed 'is_bot_user' logic: {e}")
    return False
 def should_process_pr_logic(data) -> bool:
    try:
        pr_data = data.get("data", {}).get("pullrequest", {})
        title = pr_data.get("title", "")
        source_branch = pr_data.get("source", {}).get("branch", {}).get("name", "")
        target_branch = pr_data.get("destination", {}).get("branch", {}).get("name", "")
        # logic to ignore PRs with specific titles
        if title:
            ignore_pr_title_re = get_settings().get("CONFIG.IGNORE_PR_TITLE", [])
            if not isinstance(ignore_pr_title_re, list):
                ignore_pr_title_re = [ignore_pr_title_re]
            if ignore_pr_title_re and any(re.search(regex, title) for regex in ignore_pr_title_re):
                get_logger().info(f"Ignoring PR with title '{title}' due to config.ignore_pr_title setting")
                return False
        ignore_pr_source_branches = get_settings().get("CONFIG.IGNORE_PR_SOURCE_BRANCHES", [])
        ignore_pr_target_branches = get_settings().get("CONFIG.IGNORE_PR_TARGET_BRANCHES", [])
        if (ignore_pr_source_branches or ignore_pr_target_branches):
            if any(re.search(regex, source_branch) for regex in ignore_pr_source_branches):
                get_logger().info(
                    f"Ignoring PR with source branch '{source_branch}' due to config.ignore_pr_source_branches settings")
                return False
            if any(re.search(regex, target_branch) for regex in ignore_pr_target_branches):
                get_logger().info(
                    f"Ignoring PR with target branch '{target_branch}' due to config.ignore_pr_target_branches settings")
                return False
    except Exception as e:
        get_logger().error(f"Failed 'should_process_pr_logic': {e}")
    return True
@router.post("/webhook")
 async def handle_github_webhooks(background_tasks: BackgroundTasks, request: Request):
-    app_name = get_settings().get("CONFIG.APP_NAME", "Unknown")
+    log_context = {"server_type": "bitbucket_app"}
    log_context = {"server_type": "bitbucket_app", "app_name": app_name}
    get_logger().debug(request.headers)
    jwt_header = request.headers.get("authorization", None)
    if jwt_header:
        input_jwt = jwt_header.split(" ")[1]
    data = await request.json()
    get_logger().debug(data)
    async def inner():
        try:
            # ignore bot users
            if is_bot_user(data):
                return "OK"
            # Check if the PR should be processed
            if data.get("event", "") == "pullrequest:created":
                if not should_process_pr_logic(data):
                    return "OK"
            # Get the username of the sender
            try:
-                username = data["data"]["actor"]["username"]
+                if data["data"]["actor"]["type"] != "user":
                    return "OK"
            except KeyError:
                get_logger().error("Failed to get actor type, check previous logs, this shouldn't happen.")
            try:
-                    username = data["data"]["actor"]["display_name"]
+                owner = data["data"]["repository"]["owner"]["username"]
-                except KeyError:
+            except Exception as e:
-                    username = data["data"]["actor"]["nickname"]
+                get_logger().error(f"Failed to get owner, will continue: {e}")
-            log_context["sender"] = username
+                owner = "unknown"
            sender_id = data["data"]["actor"]["account_id"]
            log_context["sender"] = owner
            log_context["sender_id"] = sender_id
            jwt_parts = input_jwt.split(".")
            claim_part = jwt_parts[1]
@ -196,7 +139,17 @@ async def handle_github_webhooks(background_tasks: BackgroundTasks, request: Req
                        if get_identity_provider().verify_eligibility("bitbucket",
                                                        sender_id, pr_url) is not Eligibility.NOT_ELIGIBLE:
                            if get_settings().get("bitbucket_app.pr_commands"):
-                                await _perform_commands_bitbucket("pr_commands", PRAgent(), pr_url, log_context, data)
+                                await _perform_commands_bitbucket("pr_commands", PRAgent(), pr_url, log_context)
                            else: # backwards compatibility
                                auto_review = get_setting_or_env("BITBUCKET_APP.AUTO_REVIEW", None)
                                if is_true(auto_review):  # by default, auto review is disabled
                                    await PRReviewer(pr_url).run()
                                auto_improve = get_setting_or_env("BITBUCKET_APP.AUTO_IMPROVE", None)
                                if is_true(auto_improve):  # by default, auto improve is disabled
                                    await PRCodeSuggestions(pr_url).run()
                                auto_describe = get_setting_or_env("BITBUCKET_APP.AUTO_DESCRIBE", None)
                                if is_true(auto_describe):  # by default, auto describe is disabled
                                    await PRDescription(pr_url).run()
            elif event == "pullrequest:comment_created":
                pr_url = data["data"]["pullrequest"]["links"]["html"]["href"]
                log_context["api_url"] = pr_url
--- a/pr_agent/servers/bitbucket_server_webhook.py
+++ b/pr_agent/servers/bitbucket_server_webhook.py
@ -1,7 +1,5 @@
 import ast
 import json
 import os
 from typing import List
 import uvicorn
 from fastapi import APIRouter, FastAPI
@ -12,16 +10,12 @@ from starlette.middleware import Middleware
 from starlette.requests import Request
 from starlette.responses import JSONResponse
 from starlette_context.middleware import RawContextMiddleware
 from pr_agent.agent.pr_agent import PRAgent
 from pr_agent.algo.utils import update_settings_from_args
 from pr_agent.config_loader import get_settings
-from pr_agent.git_providers.utils import apply_repo_settings
+from pr_agent.log import get_logger
 from pr_agent.log import LoggingFormat, get_logger, setup_logger
 from pr_agent.servers.utils import verify_signature
 from fastapi.responses import RedirectResponse
 setup_logger(fmt=LoggingFormat.JSON, level="DEBUG")
 router = APIRouter()
@ -30,21 +24,11 @@ def handle_request(
 ):
    log_context["action"] = body
    log_context["api_url"] = url
    async def inner():
        try:
    with get_logger().contextualize(**log_context):
-                await PRAgent().handle_request(url, body)
+        background_tasks.add_task(PRAgent().handle_request, url, body)
        except Exception as e:
            get_logger().error(f"Failed to handle webhook: {e}")
    background_tasks.add_task(inner)
@router.post("/")
 async def redirect_to_webhook():
    return RedirectResponse(url="/webhook")
@router.post("/webhook")
 async def handle_webhook(background_tasks: BackgroundTasks, request: Request):
    log_context = {"server_type": "bitbucket_server"}
    data = await request.json()
@ -53,10 +37,6 @@ async def handle_webhook(background_tasks: BackgroundTasks, request: Request):
    webhook_secret = get_settings().get("BITBUCKET_SERVER.WEBHOOK_SECRET", None)
    if webhook_secret:
        body_bytes = await request.body()
        if body_bytes.decode('utf-8') == '{"test": true}':
            return JSONResponse(
                status_code=status.HTTP_200_OK, content=jsonable_encoder({"message": "connection test successful"})
            )
        signature_header = request.headers.get("x-hub-signature", None)
        verify_signature(body_bytes, webhook_secret, signature_header)
@ -69,81 +49,22 @@ async def handle_webhook(background_tasks: BackgroundTasks, request: Request):
    log_context["api_url"] = pr_url
    log_context["event"] = "pull_request"
    commands_to_run = []
    if data["eventKey"] == "pr:opened":
-        commands_to_run.extend(_get_commands_list_from_settings('BITBUCKET_SERVER.PR_COMMANDS'))
+        body = "review"
    elif data["eventKey"] == "pr:comment:added":
-        commands_to_run.append(data["comment"]["text"])
+        body = data["comment"]["text"]
    else:
        return JSONResponse(
            status_code=status.HTTP_400_BAD_REQUEST,
            content=json.dumps({"message": "Unsupported event"}),
        )
-    async def inner():
+    handle_request(background_tasks, pr_url, body, log_context)
        try:
            await _run_commands_sequentially(commands_to_run, pr_url, log_context)
        except Exception as e:
            get_logger().error(f"Failed to handle webhook: {e}")
    background_tasks.add_task(inner)
    return JSONResponse(
        status_code=status.HTTP_200_OK, content=jsonable_encoder({"message": "success"})
    )
 async def _run_commands_sequentially(commands: List[str], url: str, log_context: dict):
    get_logger().info(f"Running commands sequentially: {commands}")
    if commands is None:
        return
    for command in commands:
        try:
            body = _process_command(command, url)
            log_context["action"] = body
            log_context["api_url"] = url
            with get_logger().contextualize(**log_context):
                await PRAgent().handle_request(url, body)
        except Exception as e:
            get_logger().error(f"Failed to handle command: {command} , error: {e}")
 def _process_command(command: str, url) -> str:
    # don't think we need this
    apply_repo_settings(url)
    # Process the command string
    split_command = command.split(" ")
    command = split_command[0]
    args = split_command[1:]
    # do I need this? if yes, shouldn't this be done in PRAgent?
    other_args = update_settings_from_args(args)
    new_command = ' '.join([command] + other_args)
    return new_command
 def _to_list(command_string: str) -> list:
    try:
        # Use ast.literal_eval to safely parse the string into a list
        commands = ast.literal_eval(command_string)
        # Check if the parsed object is a list of strings
        if isinstance(commands, list) and all(isinstance(cmd, str) for cmd in commands):
            return commands
        else:
            raise ValueError("Parsed data is not a list of strings.")
    except (SyntaxError, ValueError, TypeError) as e:
        raise ValueError(f"Invalid command string: {e}")
 def _get_commands_list_from_settings(setting_key:str ) -> list:
    try:
        return get_settings().get(setting_key, [])
    except ValueError as e:
        get_logger().error(f"Failed to get commands list from settings {setting_key}: {e}")
@router.get("/")
 async def root():
    return {"status": "ok"}
--- a/pr_agent/servers/github_action_runner.py
+++ b/pr_agent/servers/github_action_runner.py
@ -37,7 +37,7 @@ async def run_action():
    OPENAI_KEY = os.environ.get('OPENAI_KEY') or os.environ.get('OPENAI.KEY')
    OPENAI_ORG = os.environ.get('OPENAI_ORG') or os.environ.get('OPENAI.ORG')
    GITHUB_TOKEN = os.environ.get('GITHUB_TOKEN')
-    # get_settings().set("CONFIG.PUBLISH_OUTPUT_PROGRESS", False)
+    get_settings().set("CONFIG.PUBLISH_OUTPUT_PROGRESS", False)
    # Check if required environment variables are set
    if not GITHUB_EVENT_NAME:
@ -80,14 +80,10 @@ async def run_action():
    except Exception as e:
        get_logger().info(f"github action: failed to apply repo settings: {e}")
-    # Handle pull request opened event
+    # Handle pull request event
    if GITHUB_EVENT_NAME == "pull_request":
        action = event_payload.get("action")
-
+        if action in ["opened", "reopened", "ready_for_review", "review_requested"]:
        # Retrieve the list of actions from the configuration
        pr_actions = get_settings().get("GITHUB_ACTION_CONFIG.PR_ACTIONS", ["opened", "reopened", "ready_for_review", "review_requested"])
        if action in pr_actions:
            pr_url = event_payload.get("pull_request", {}).get("url")
            if pr_url:
                # legacy - supporting both GITHUB_ACTION and GITHUB_ACTION_CONFIG
@ -101,11 +97,6 @@ async def run_action():
                if auto_improve is None:
                    auto_improve = get_setting_or_env("GITHUB_ACTION_CONFIG.AUTO_IMPROVE", None)
                # Set the configuration for auto actions
                get_settings().config.is_auto_command = True # Set the flag to indicate that the command is auto
                get_settings().pr_description.final_update_message = False  # No final update message when auto_describe is enabled
                get_logger().info(f"Running auto actions: auto_describe={auto_describe}, auto_review={auto_review}, auto_improve={auto_improve}")
                # invoke by default all three tools
                if auto_describe is None or is_true(auto_describe):
                    await PRDescription(pr_url).run()
@ -147,11 +138,8 @@ async def run_action():
                    comment_id = event_payload.get("comment", {}).get("id")
                    provider = get_git_provider()(pr_url=url)
                    if is_pr:
-                        await PRAgent().handle_request(
+                        await PRAgent().handle_request(url, body,
-                            url, body, notify=lambda: provider.add_eyes_reaction(
+                                    notify=lambda: provider.add_eyes_reaction(comment_id, disable_eyes=disable_eyes))
                                comment_id, disable_eyes=disable_eyes
                            )
                        )
                    else:
                        await PRAgent().handle_request(url, body)
--- a/pr_agent/servers/github_app.py
+++ b/pr_agent/servers/github_app.py
@ -7,7 +7,6 @@ from typing import Any, Dict, Tuple
 import uvicorn
 from fastapi import APIRouter, FastAPI, HTTPException, Request, Response
 from starlette.background import BackgroundTasks
 from starlette.middleware import Middleware
 from starlette_context import context
 from starlette_context.middleware import RawContextMiddleware
@ -15,7 +14,7 @@ from starlette_context.middleware import RawContextMiddleware
 from pr_agent.agent.pr_agent import PRAgent
 from pr_agent.algo.utils import update_settings_from_args
 from pr_agent.config_loader import get_settings, global_settings
-from pr_agent.git_providers import get_git_provider, get_git_provider_with_context
+from pr_agent.git_providers import get_git_provider
 from pr_agent.git_providers.git_provider import IncrementalPR
 from pr_agent.git_providers.utils import apply_repo_settings
 from pr_agent.identity_providers import get_identity_provider
@ -35,7 +34,7 @@ router = APIRouter()
@router.post("/api/v1/github_webhooks")
-async def handle_github_webhooks(background_tasks: BackgroundTasks, request: Request, response: Response):
+async def handle_github_webhooks(request: Request, response: Response):
    """
    Receives and processes incoming GitHub webhook requests.
    Verifies the request signature, parses the request body, and passes it to the handle_request function for further
@ -48,9 +47,9 @@ async def handle_github_webhooks(background_tasks: BackgroundTasks, request: Req
    installation_id = body.get("installation", {}).get("id")
    context["installation_id"] = installation_id
    context["settings"] = copy.deepcopy(global_settings)
-    context["git_provider"] = {}
+
-    background_tasks.add_task(handle_request, body, event=request.headers.get("X-GitHub-Event", None))
+    response = await handle_request(body, event=request.headers.get("X-GitHub-Event", None))
-    return {}
+    return response or {}
@router.post("/api/v1/marketplace_webhooks")
@ -111,7 +110,7 @@ async def handle_comments_on_pr(body: Dict[str, Any],
        return {}
    log_context["api_url"] = api_url
    comment_id = body.get("comment", {}).get("id")
-    provider = get_git_provider_with_context(pr_url=api_url)
+    provider = get_git_provider()(pr_url=api_url)
    with get_logger().contextualize(**log_context):
        if get_identity_provider().verify_eligibility("github", sender_id, api_url) is not Eligibility.NOT_ELIGIBLE:
            get_logger().info(f"Processing comment on PR {api_url=}, comment_body={comment_body}")
@ -129,13 +128,19 @@ async def handle_new_pr_opened(body: Dict[str, Any],
                               agent: PRAgent):
    title = body.get("pull_request", {}).get("title", "")
    # logic to ignore PRs with specific titles (e.g. "[Auto] ...")
    ignore_pr_title_re = get_settings().get("GITHUB_APP.IGNORE_PR_TITLE", [])
    if not isinstance(ignore_pr_title_re, list):
        ignore_pr_title_re = [ignore_pr_title_re]
    if ignore_pr_title_re and any(re.search(regex, title) for regex in ignore_pr_title_re):
        get_logger().info(f"Ignoring PR with title '{title}' due to github_app.ignore_pr_title setting")
        return {}
    pull_request, api_url = _check_pull_request_event(action, body, log_context)
    if not (pull_request and api_url):
        get_logger().info(f"Invalid PR event: {action=} {api_url=}")
        return {}
    if action in get_settings().github_app.handle_pr_actions:  # ['opened', 'reopened', 'ready_for_review']
        # logic to ignore PRs with specific titles (e.g. "[Auto] ...")
        apply_repo_settings(api_url)
        if get_identity_provider().verify_eligibility("github", sender_id, api_url) is not Eligibility.NOT_ELIGIBLE:
            await _perform_auto_commands_github("pr_commands", agent, body, api_url, log_context)
        else:
@ -194,6 +199,11 @@ async def handle_push_trigger_for_new_commits(body: Dict[str, Any],
            get_logger().info(f"Finished waiting to process push trigger for {api_url=} - continue with flow")
    try:
        if get_settings().github_app.push_trigger_wait_for_initial_review and not get_git_provider()(api_url,
                                                                                                     incremental=IncrementalPR(
                                                                                                             True)).previous_review:
            get_logger().info(f"Skipping incremental review because there was no initial review for {api_url=} yet")
            return {}
        if get_identity_provider().verify_eligibility("github", sender_id, api_url) is not Eligibility.NOT_ELIGIBLE:
            get_logger().info(f"Performing incremental review for {api_url=} because of {event=} and {action=}")
            await _perform_auto_commands_github("push_commands", agent, body, api_url, log_context)
@ -237,60 +247,6 @@ def get_log_context(body, event, action, build_number):
    return log_context, sender, sender_id, sender_type
 def is_bot_user(sender, sender_type):
    try:
        # logic to ignore PRs opened by bot
        if get_settings().get("GITHUB_APP.IGNORE_BOT_PR", False) and sender_type == "Bot":
            if 'pr-agent' not in sender:
                get_logger().info(f"Ignoring PR from '{sender=}' because it is a bot")
            return True
    except Exception as e:
        get_logger().error(f"Failed 'is_bot_user' logic: {e}")
    return False
 def should_process_pr_logic(body) -> bool:
    try:
        pull_request = body.get("pull_request", {})
        title = pull_request.get("title", "")
        pr_labels = pull_request.get("labels", [])
        source_branch = pull_request.get("head", {}).get("ref", "")
        target_branch = pull_request.get("base", {}).get("ref", "")
        # logic to ignore PRs with specific titles
        if title:
            ignore_pr_title_re = get_settings().get("CONFIG.IGNORE_PR_TITLE", [])
            if not isinstance(ignore_pr_title_re, list):
                ignore_pr_title_re = [ignore_pr_title_re]
            if ignore_pr_title_re and any(re.search(regex, title) for regex in ignore_pr_title_re):
                get_logger().info(f"Ignoring PR with title '{title}' due to config.ignore_pr_title setting")
                return False
        # logic to ignore PRs with specific labels or source branches or target branches.
        ignore_pr_labels = get_settings().get("CONFIG.IGNORE_PR_LABELS", [])
        if pr_labels and ignore_pr_labels:
            labels = [label['name'] for label in pr_labels]
            if any(label in ignore_pr_labels for label in labels):
                labels_str = ", ".join(labels)
                get_logger().info(f"Ignoring PR with labels '{labels_str}' due to config.ignore_pr_labels settings")
                return False
        ignore_pr_source_branches = get_settings().get("CONFIG.IGNORE_PR_SOURCE_BRANCHES", [])
        ignore_pr_target_branches = get_settings().get("CONFIG.IGNORE_PR_TARGET_BRANCHES", [])
        if pull_request and (ignore_pr_source_branches or ignore_pr_target_branches):
            if any(re.search(regex, source_branch) for regex in ignore_pr_source_branches):
                get_logger().info(
                    f"Ignoring PR with source branch '{source_branch}' due to config.ignore_pr_source_branches settings")
                return False
            if any(re.search(regex, target_branch) for regex in ignore_pr_target_branches):
                get_logger().info(
                    f"Ignoring PR with target branch '{target_branch}' due to config.ignore_pr_target_branches settings")
                return False
    except Exception as e:
        get_logger().error(f"Failed 'should_process_pr_logic': {e}")
    return True
 async def handle_request(body: Dict[str, Any], event: str):
    """
    Handle incoming GitHub webhook requests.
@ -305,28 +261,23 @@ async def handle_request(body: Dict[str, Any], event: str):
    agent = PRAgent()
    log_context, sender, sender_id, sender_type = get_log_context(body, event, action, build_number)
-    # logic to ignore PRs opened by bot, PRs with specific titles, labels, source branches, or target branches
+    # logic to ignore PRs opened by bot
-    if is_bot_user(sender, sender_type) and 'check_run' not in body:
+    if get_settings().get("GITHUB_APP.IGNORE_BOT_PR", False) and sender_type == "Bot":
-        return {}
+        if 'pr-agent' not in sender:
-    if action != 'created' and 'check_run' not in body:
+            get_logger().info(f"Ignoring PR from '{sender=}' because it is a bot")
        if not should_process_pr_logic(body):
        return {}
    if 'check_run' in body:  # handle failed checks
        # get_logger().debug(f'Request body', artifact=body, event=event) # added inside handle_checks
        pass
    # handle comments on PRs
-    elif action == 'created':
+    if action == 'created':
        get_logger().debug(f'Request body', artifact=body, event=event)
        await handle_comments_on_pr(body, event, sender, sender_id, action, log_context, agent)
    # handle new PRs
    elif event == 'pull_request' and action != 'synchronize' and action != 'closed':
        get_logger().debug(f'Request body', artifact=body, event=event)
        await handle_new_pr_opened(body, event, sender, sender_id, action, log_context, agent)
    elif event == "issue_comment" and 'edited' in action:
        pass # handle_checkbox_clicked
    # handle pull_request event with synchronize action - "push trigger" for new commits
    elif event == 'pull_request' and action == 'synchronize':
        get_logger().debug(f'Request body', artifact=body, event=event)
        await handle_push_trigger_for_new_commits(body, event, sender, sender_id, action, log_context, agent)
    elif event == 'pull_request' and action == 'closed':
        if get_settings().get("CONFIG.ANALYTICS_FOLDER", ""):
@ -370,22 +321,20 @@ def _check_pull_request_event(action: str, body: dict, log_context: dict) -> Tup
    return pull_request, api_url
-async def _perform_auto_commands_github(commands_conf: str, agent: PRAgent, body: dict, api_url: str,
+async def _perform_auto_commands_github(commands_conf: str, agent: PRAgent, body: dict, api_url: str, log_context: dict):
                                        log_context: dict):
    apply_repo_settings(api_url)
    if not should_process_pr_logic(body): # Here we already updated the configuration with the repo settings
        return {}
    commands = get_settings().get(f"github_app.{commands_conf}")
    if not commands:
        with get_logger().contextualize(**log_context):
            get_logger().info(f"New PR, but no auto commands configured")
        return
    get_settings().set("config.is_auto_command", True)
    for command in commands:
        split_command = command.split(" ")
        command = split_command[0]
        args = split_command[1:]
        other_args = update_settings_from_args(args)
        new_command = ' '.join([command] + other_args)
        with get_logger().contextualize(**log_context):
            get_logger().info(f"{commands_conf}. Performing auto command '{new_command}', for {api_url=}")
            await agent.handle_request(api_url, new_command)
@ -398,7 +347,7 @@ async def root():
 if get_settings().github_app.override_deployment_type:
    # Override the deployment type to app
    get_settings().set("GITHUB.DEPLOYMENT_TYPE", "app")
-# get_settings().set("CONFIG.PUBLISH_OUTPUT_PROGRESS", False)
+get_settings().set("CONFIG.PUBLISH_OUTPUT_PROGRESS", False)
 middleware = [Middleware(RawContextMiddleware)]
 app = FastAPI(middleware=middleware)
 app.include_router(router)
@ -407,6 +356,5 @@ app.include_router(router)
 def start():
    uvicorn.run(app, host="0.0.0.0", port=int(os.environ.get("PORT", "3000")))
 if __name__ == '__main__':
    start()
--- a/pr_agent/servers/github_polling.py
+++ b/pr_agent/servers/github_polling.py
@ -1,10 +1,6 @@
 import asyncio
 import multiprocessing
 from collections import deque
 import traceback
 from datetime import datetime, timezone
-import time
+
 import requests
 import aiohttp
 from pr_agent.agent.pr_agent import PRAgent
@ -16,15 +12,6 @@ setup_logger(fmt=LoggingFormat.JSON, level="DEBUG")
 NOTIFICATION_URL = "https://api.github.com/notifications"
 async def mark_notification_as_read(headers, notification, session):
    async with session.patch(
            f"https://api.github.com/notifications/threads/{notification['id']}",
            headers=headers) as mark_read_response:
        if mark_read_response.status != 205:
            get_logger().error(
                f"Failed to mark notification as read. Status code: {mark_read_response.status}")
 def now() -> str:
    """
    Get the current UTC time in ISO 8601 format.
@ -36,108 +23,6 @@ def now() -> str:
    now_utc = now_utc.replace("+00:00", "Z")
    return now_utc
 async def async_handle_request(pr_url, rest_of_comment, comment_id, git_provider):
    agent = PRAgent()
    success = await agent.handle_request(
        pr_url,
        rest_of_comment,
        notify=lambda: git_provider.add_eyes_reaction(comment_id)
    )
    return success
 def run_handle_request(pr_url, rest_of_comment, comment_id, git_provider):
    return asyncio.run(async_handle_request(pr_url, rest_of_comment, comment_id, git_provider))
 def process_comment_sync(pr_url, rest_of_comment, comment_id):
    try:
        # Run the async handle_request in a separate function
        git_provider = get_git_provider()(pr_url=pr_url)
        success = run_handle_request(pr_url, rest_of_comment, comment_id, git_provider)
    except Exception as e:
        get_logger().error(f"Error processing comment: {e}", artifact={"traceback": traceback.format_exc()})
 async def process_comment(pr_url, rest_of_comment, comment_id):
    try:
        git_provider = get_git_provider()(pr_url=pr_url)
        git_provider.set_pr(pr_url)
        agent = PRAgent()
        success = await agent.handle_request(
            pr_url,
            rest_of_comment,
            notify=lambda: git_provider.add_eyes_reaction(comment_id)
        )
        get_logger().info(f"Finished processing comment for PR: {pr_url}")
    except Exception as e:
        get_logger().error(f"Error processing comment: {e}", artifact={"traceback": traceback.format_exc()})
 async def is_valid_notification(notification, headers, handled_ids, session, user_id):
    try:
        if 'reason' in notification and notification['reason'] == 'mention':
            if 'subject' in notification and notification['subject']['type'] == 'PullRequest':
                pr_url = notification['subject']['url']
                latest_comment = notification['subject']['latest_comment_url']
                if not latest_comment or not isinstance(latest_comment, str):
                    get_logger().debug(f"no latest_comment")
                    return False, handled_ids
                async with session.get(latest_comment, headers=headers) as comment_response:
                    check_prev_comments = False
                    if comment_response.status == 200:
                        comment = await comment_response.json()
                        if 'id' in comment:
                            if comment['id'] in handled_ids:
                                get_logger().debug(f"comment['id'] in handled_ids")
                                return False, handled_ids
                            else:
                                handled_ids.add(comment['id'])
                        if 'user' in comment and 'login' in comment['user']:
                            if comment['user']['login'] == user_id:
                                get_logger().debug(f"comment['user']['login'] == user_id")
                                check_prev_comments = True
                        comment_body = comment.get('body', '')
                        if not comment_body:
                            get_logger().debug(f"no comment_body")
                            check_prev_comments = True
                        else:
                            user_tag = "@" + user_id
                            if user_tag not in comment_body:
                                get_logger().debug(f"user_tag not in comment_body")
                                check_prev_comments = True
                            else:
                                get_logger().info(f"Polling, pr_url: {pr_url}",
                                                  artifact={"comment": comment_body})
                        if not check_prev_comments:
                            return True, handled_ids, comment, comment_body, pr_url, user_tag
                        else: # we could not find the user tag in the latest comment. Check previous comments
                            # get all comments in the PR
                            requests_url = f"{pr_url}/comments".replace("pulls", "issues")
                            comments_response = requests.get(requests_url, headers=headers)
                            comments = comments_response.json()[::-1]
                            max_comment_to_scan = 4
                            for comment in comments[:max_comment_to_scan]:
                                if 'user' in comment and 'login' in comment['user']:
                                    if comment['user']['login'] == user_id:
                                        continue
                                comment_body = comment.get('body', '')
                                if not comment_body:
                                    continue
                                if user_tag in comment_body:
                                    get_logger().info("found user tag in previous comments")
                                    get_logger().info(f"Polling, pr_url: {pr_url}",
                                                      artifact={"comment": comment_body})
                                    return True, handled_ids, comment, comment_body, pr_url, user_tag
                            get_logger().error(f"Failed to fetch comments for PR: {pr_url}")
                            return False, handled_ids
        return False, handled_ids
    except Exception as e:
        get_logger().error(f"Error processing notification: {e}", artifact={"traceback": traceback.format_exc()})
        return False, handled_ids
 async def polling_loop():
    """
@ -148,8 +33,8 @@ async def polling_loop():
    last_modified = [None]
    git_provider = get_git_provider()()
    user_id = git_provider.get_user_id()
    agent = PRAgent()
    get_settings().set("CONFIG.PUBLISH_OUTPUT_PROGRESS", False)
    get_settings().set("pr_description.publish_description_as_comment", True)
    try:
        deployment_type = get_settings().github.deployment_type
@ -187,52 +72,43 @@ async def polling_loop():
                        notifications = await response.json()
                        if not notifications:
                            continue
                        get_logger().info(f"Received {len(notifications)} notifications")
                        task_queue = deque()
                        for notification in notifications:
                            if not notification:
                                continue
                            # mark notification as read
                            await mark_notification_as_read(headers, notification, session)
                            handled_ids.add(notification['id'])
-                            output = await is_valid_notification(notification, headers, handled_ids, session, user_id)
+                            if 'reason' in notification and notification['reason'] == 'mention':
-                            if output[0]:
+                                if 'subject' in notification and notification['subject']['type'] == 'PullRequest':
-                                _, handled_ids, comment, comment_body, pr_url, user_tag = output
+                                    pr_url = notification['subject']['url']
                                    latest_comment = notification['subject']['latest_comment_url']
                                    async with session.get(latest_comment, headers=headers) as comment_response:
                                        if comment_response.status == 200:
                                            comment = await comment_response.json()
                                            if 'id' in comment:
                                                if comment['id'] in handled_ids:
                                                    continue
                                                else:
                                                    handled_ids.add(comment['id'])
                                            if 'user' in comment and 'login' in comment['user']:
                                                if comment['user']['login'] == user_id:
                                                    continue
                                            comment_body = comment['body'] if 'body' in comment else ''
                                            commenter_github_user = comment['user']['login'] \
                                                if 'user' in comment else ''
                                            get_logger().info(f"Commenter: {commenter_github_user}\nComment: {comment_body}")
                                            user_tag = "@" + user_id
                                            if user_tag not in comment_body:
                                                continue
                                            rest_of_comment = comment_body.split(user_tag)[1].strip()
                                            comment_id = comment['id']
-
+                                            git_provider.set_pr(pr_url)
-                                # Add to the task queue
+                                            success = await agent.handle_request(pr_url, rest_of_comment,
-                                get_logger().info(
+                                                                                 notify=lambda: git_provider.add_eyes_reaction(comment_id))  # noqa E501
-                                    f"Adding comment processing to task queue for PR, {pr_url}, comment_body: {comment_body}")
+                                            if not success:
-                                task_queue.append((process_comment_sync, (pr_url, rest_of_comment, comment_id)))
+                                                git_provider.set_pr(pr_url)
                                get_logger().info(f"Queued comment processing for PR: {pr_url}")
                            else:
                                get_logger().debug(f"Skipping comment processing for PR")
                        max_allowed_parallel_tasks = 10
                        if task_queue:
                            processes = []
                            for i, (func, args) in enumerate(task_queue):  # Create  parallel tasks
                                p = multiprocessing.Process(target=func, args=args)
                                processes.append(p)
                                p.start()
                                if i > max_allowed_parallel_tasks:
                                    get_logger().error(
                                        f"Dropping {len(task_queue) - max_allowed_parallel_tasks} tasks from polling session")
                                    break
                            task_queue.clear()
                            # Dont wait for all processes to complete. Move on to the next iteration
                            # for p in processes:
                            #     p.join()
                    elif response.status != 304:
                        print(f"Failed to fetch notifications. Status code: {response.status}")
            except Exception as e:
-                get_logger().error(f"Polling exception during processing of a notification: {e}",
+                get_logger().error(f"Exception during processing of a notification: {e}")
                                   artifact={"traceback": traceback.format_exc()})
 if __name__ == '__main__':
--- a/pr_agent/servers/gitlab_webhook.py
+++ b/pr_agent/servers/gitlab_webhook.py
@ -1,7 +1,5 @@
 import copy
 import re
 import json
 from datetime import datetime
 import uvicorn
 from fastapi import APIRouter, FastAPI, Request, status
@ -25,46 +23,17 @@ router = APIRouter()
 secret_provider = get_secret_provider() if get_settings().get("CONFIG.SECRET_PROVIDER") else None
-async def get_mr_url_from_commit_sha(commit_sha, gitlab_token, project_id):
+def handle_request(background_tasks: BackgroundTasks, url: str, body: str, log_context: dict):
    try:
        import requests
        headers = {
            'Private-Token': f'{gitlab_token}'
        }
        # API endpoint to find MRs containing the commit
        gitlab_url = get_settings().get("GITLAB.URL", 'https://gitlab.com')
        response = requests.get(
            f'{gitlab_url}/api/v4/projects/{project_id}/repository/commits/{commit_sha}/merge_requests',
            headers=headers
        )
        merge_requests = response.json()
        if merge_requests and response.status_code == 200:
            pr_url = merge_requests[0]['web_url']
            return pr_url
        else:
            get_logger().info(f"No merge requests found for commit: {commit_sha}")
            return None
    except Exception as e:
        get_logger().error(f"Failed to get MR url from commit sha: {e}")
        return None
 async def handle_request(api_url: str, body: str, log_context: dict, sender_id: str):
    log_context["action"] = body
    log_context["event"] = "pull_request" if body == "/review" else "comment"
-    log_context["api_url"] = api_url
+    log_context["api_url"] = url
    log_context["app_name"] = get_settings().get("CONFIG.APP_NAME", "Unknown")
    with get_logger().contextualize(**log_context):
-        await PRAgent().handle_request(api_url, body)
+        background_tasks.add_task(PRAgent().handle_request, url, body)
-async def _perform_commands_gitlab(commands_conf: str, agent: PRAgent, api_url: str,
+async def _perform_commands_gitlab(commands_conf: str, agent: PRAgent, api_url: str, log_context: dict):
                                   log_context: dict, data: dict):
    apply_repo_settings(api_url)
    if not should_process_pr_logic(data): # Here we already updated the configurations
        return
    commands = get_settings().get(f"gitlab.{commands_conf}", {})
    get_settings().set("config.is_auto_command", True)
    for command in commands:
        try:
            split_command = command.split(" ")
@ -79,82 +48,20 @@ async def _perform_commands_gitlab(commands_conf: str, agent: PRAgent, api_url:
            get_logger().error(f"Failed to perform command {command}: {e}")
 def is_bot_user(data) -> bool:
    try:
        # logic to ignore bot users (unlike Github, no direct flag for bot users in gitlab)
        sender_name = data.get("user", {}).get("name", "unknown").lower()
        bot_indicators = ['codium', 'bot_', 'bot-', '_bot', '-bot']
        if any(indicator in sender_name for indicator in bot_indicators):
            get_logger().info(f"Skipping GitLab bot user: {sender_name}")
            return True
    except Exception as e:
        get_logger().error(f"Failed 'is_bot_user' logic: {e}")
    return False
 def should_process_pr_logic(data) -> bool:
    try:
        if not data.get('object_attributes', {}):
            return False
        title = data['object_attributes'].get('title')
        # logic to ignore MRs for titles, labels and source, target branches.
        ignore_mr_title = get_settings().get("CONFIG.IGNORE_PR_TITLE", [])
        ignore_mr_labels = get_settings().get("CONFIG.IGNORE_PR_LABELS", [])
        ignore_mr_source_branches = get_settings().get("CONFIG.IGNORE_PR_SOURCE_BRANCHES", [])
        ignore_mr_target_branches = get_settings().get("CONFIG.IGNORE_PR_TARGET_BRANCHES", [])
        #
        if ignore_mr_source_branches:
            source_branch = data['object_attributes'].get('source_branch')
            if any(re.search(regex, source_branch) for regex in ignore_mr_source_branches):
                get_logger().info(
                    f"Ignoring MR with source branch '{source_branch}' due to gitlab.ignore_mr_source_branches settings")
                return False
        if ignore_mr_target_branches:
            target_branch = data['object_attributes'].get('target_branch')
            if any(re.search(regex, target_branch) for regex in ignore_mr_target_branches):
                get_logger().info(
                    f"Ignoring MR with target branch '{target_branch}' due to gitlab.ignore_mr_target_branches settings")
                return False
        if ignore_mr_labels:
            labels = [label['title'] for label in data['object_attributes'].get('labels', [])]
            if any(label in ignore_mr_labels for label in labels):
                labels_str = ", ".join(labels)
                get_logger().info(f"Ignoring MR with labels '{labels_str}' due to gitlab.ignore_mr_labels settings")
                return False
        if ignore_mr_title:
            if any(re.search(regex, title) for regex in ignore_mr_title):
                get_logger().info(f"Ignoring MR with title '{title}' due to gitlab.ignore_mr_title settings")
                return False
    except Exception as e:
        get_logger().error(f"Failed 'should_process_pr_logic': {e}")
    return True
@router.post("/webhook")
 async def gitlab_webhook(background_tasks: BackgroundTasks, request: Request):
    start_time = datetime.now()
    request_json = await request.json()
    context["settings"] = copy.deepcopy(global_settings)
    async def inner(data: dict):
    log_context = {"server_type": "gitlab_app"}
    get_logger().debug("Received a GitLab webhook")
    # Check if the request is authorized
    if request.headers.get("X-Gitlab-Token") and secret_provider:
        request_token = request.headers.get("X-Gitlab-Token")
        secret = secret_provider.get_secret(request_token)
            if not secret:
                get_logger().warning(f"Empty secret retrieved, request_token: {request_token}")
                return JSONResponse(status_code=status.HTTP_401_UNAUTHORIZED,
                                    content=jsonable_encoder({"message": "unauthorized"}))
        try:
            secret_dict = json.loads(secret)
            gitlab_token = secret_dict["gitlab_token"]
-                log_context["token_id"] = secret_dict.get("token_name", secret_dict.get("id", "unknown"))
+            log_context["sender"] = secret_dict.get("token_name", secret_dict.get("id", "unknown"))
            context["settings"] = copy.deepcopy(global_settings)
            context["settings"].gitlab.personal_access_token = gitlab_token
        except Exception as e:
            get_logger().error(f"Failed to validate secret {request_token}: {e}")
@ -162,77 +69,34 @@ async def gitlab_webhook(background_tasks: BackgroundTasks, request: Request):
    elif get_settings().get("GITLAB.SHARED_SECRET"):
        secret = get_settings().get("GITLAB.SHARED_SECRET")
        if not request.headers.get("X-Gitlab-Token") == secret:
-                get_logger().error("Failed to validate secret")
+            get_logger().error(f"Failed to validate secret")
            return JSONResponse(status_code=status.HTTP_401_UNAUTHORIZED, content=jsonable_encoder({"message": "unauthorized"}))
    else:
-            get_logger().error("Failed to validate secret")
+        get_logger().error(f"Failed to validate secret")
        return JSONResponse(status_code=status.HTTP_401_UNAUTHORIZED, content=jsonable_encoder({"message": "unauthorized"}))
    gitlab_token = get_settings().get("GITLAB.PERSONAL_ACCESS_TOKEN", None)
    if not gitlab_token:
-            get_logger().error("No gitlab token found")
+        get_logger().error(f"No gitlab token found")
        return JSONResponse(status_code=status.HTTP_401_UNAUTHORIZED, content=jsonable_encoder({"message": "unauthorized"}))
    data = await request.json()
    get_logger().info("GitLab data", artifact=data)
        sender = data.get("user", {}).get("username", "unknown")
        sender_id = data.get("user", {}).get("id", "unknown")
        # ignore bot users
        if is_bot_user(data):
            return JSONResponse(status_code=status.HTTP_200_OK, content=jsonable_encoder({"message": "success"}))
        if data.get('event_type') != 'note': # not a comment
            # ignore MRs based on title, labels, source and target branches
            if not should_process_pr_logic(data):
                return JSONResponse(status_code=status.HTTP_200_OK, content=jsonable_encoder({"message": "success"}))
        log_context["sender"] = sender
    if data.get('object_kind') == 'merge_request' and data['object_attributes'].get('action') in ['open', 'reopen']:
            title = data['object_attributes'].get('title')
        url = data['object_attributes'].get('url')
            draft = data['object_attributes'].get('draft')
        get_logger().info(f"New merge request: {url}")
-            if draft:
+        await _perform_commands_gitlab("pr_commands", PRAgent(), url, log_context)
-                get_logger().info(f"Skipping draft MR: {url}")
+    elif data.get('object_kind') == 'note' and data['event_type'] == 'note': # comment on MR
                return JSONResponse(status_code=status.HTTP_200_OK, content=jsonable_encoder({"message": "success"}))
            await _perform_commands_gitlab("pr_commands", PRAgent(), url, log_context, data)
        elif data.get('object_kind') == 'note' and data.get('event_type') == 'note': # comment on MR
        if 'merge_request' in data:
            mr = data['merge_request']
            url = mr.get('url')
            get_logger().info(f"A comment has been added to a merge request: {url}")
            body = data.get('object_attributes', {}).get('note')
            if data.get('object_attributes', {}).get('type') == 'DiffNote' and '/ask' in body: # /ask_line
                body = handle_ask_line(body, data)
-                await handle_request(url, body, log_context, sender_id)
+            handle_request(background_tasks, url, body, log_context)
        elif data.get('object_kind') == 'push' and data.get('event_name') == 'push':
            try:
                project_id = data['project_id']
                commit_sha = data['checkout_sha']
                url = await get_mr_url_from_commit_sha(commit_sha, gitlab_token, project_id)
                if not url:
                    get_logger().info(f"No MR found for commit: {commit_sha}")
                    return JSONResponse(status_code=status.HTTP_200_OK,
                                        content=jsonable_encoder({"message": "success"}))
                # we need first to apply_repo_settings
                apply_repo_settings(url)
                commands_on_push = get_settings().get(f"gitlab.push_commands", {})
                handle_push_trigger = get_settings().get(f"gitlab.handle_push_trigger", False)
                if not commands_on_push or not handle_push_trigger:
                    get_logger().info("Push event, but no push commands found or push trigger is disabled")
                    return JSONResponse(status_code=status.HTTP_200_OK,
                                        content=jsonable_encoder({"message": "success"}))
                get_logger().debug(f'A push event has been received: {url}')
                await _perform_commands_gitlab("push_commands", PRAgent(), url, log_context, data)
            except Exception as e:
                get_logger().error(f"Failed to handle push event: {e}")
    background_tasks.add_task(inner, request_json)
    end_time = datetime.now()
    get_logger().info(f"Processing time: {end_time - start_time}", request=request_json)
    return JSONResponse(status_code=status.HTTP_200_OK, content=jsonable_encoder({"message": "success"}))
@ -249,7 +113,7 @@ def handle_ask_line(body, data):
        path = data['object_attributes']['position']['new_path']
        side = 'RIGHT'  # if line_range_['start']['type'] == 'new' else 'LEFT'
        comment_id = data['object_attributes']["discussion_id"]
-        get_logger().info("Handling line comment")
+        get_logger().info(f"Handling line comment")
        body = f"/ask_line --line_start={start_line} --line_end={end_line} --side={side} --file_name={path} --comment_id={comment_id} {question}"
    except Exception as e:
        get_logger().error(f"Failed to handle ask line comment: {e}")
@ -260,6 +124,7 @@ def handle_ask_line(body, data):
 async def root():
    return {"status": "ok"}
 def start():
    gitlab_url = get_settings().get("GITLAB.URL", None)
    if not gitlab_url:
        raise ValueError("GITLAB.URL is not set")
@ -268,8 +133,6 @@ middleware = [Middleware(RawContextMiddleware)]
    app = FastAPI(middleware=middleware)
    app.include_router(router)
 def start():
    uvicorn.run(app, host="0.0.0.0", port=3000)
--- a/pr_agent/servers/gunicorn_config.py
+++ b/pr_agent/servers/gunicorn_config.py
@ -1,191 +0,0 @@
 import multiprocessing
 import os
 # from prometheus_client import multiprocess
 # Sample Gunicorn configuration file.
 #
 # Server socket
 #
 #   bind - The socket to bind.
 #
 #       A string of the form: 'HOST', 'HOST:PORT', 'unix:PATH'.
 #       An IP is a valid HOST.
 #
 #   backlog - The number of pending connections. This refers
 #       to the number of clients that can be waiting to be
 #       served. Exceeding this number results in the client
 #       getting an error when attempting to connect. It should
 #       only affect servers under significant load.
 #
 #       Must be a positive integer. Generally set in the 64-2048
 #       range.
 #
 # bind = '0.0.0.0:5000'
 bind = '0.0.0.0:3000'
 backlog = 2048
 #
 # Worker processes
 #
 #   workers - The number of worker processes that this server
 #       should keep alive for handling requests.
 #
 #       A positive integer generally in the 2-4 x $(NUM_CORES)
 #       range. You'll want to vary this a bit to find the best
 #       for your particular application's work load.
 #
 #   worker_class - The type of workers to use. The default
 #       sync class should handle most 'normal' types of work
 #       loads. You'll want to read
 #       http://docs.gunicorn.org/en/latest/design.html#choosing-a-worker-type
 #       for information on when you might want to choose one
 #       of the other worker classes.
 #
 #       A string referring to a Python path to a subclass of
 #       gunicorn.workers.base.Worker. The default provided values
 #       can be seen at
 #       http://docs.gunicorn.org/en/latest/settings.html#worker-class
 #
 #   worker_connections - For the eventlet and gevent worker classes
 #       this limits the maximum number of simultaneous clients that
 #       a single process can handle.
 #
 #       A positive integer generally set to around 1000.
 #
 #   timeout - If a worker does not notify the master process in this
 #       number of seconds it is killed and a new worker is spawned
 #       to replace it.
 #
 #       Generally set to thirty seconds. Only set this noticeably
 #       higher if you're sure of the repercussions for sync workers.
 #       For the non sync workers it just means that the worker
 #       process is still communicating and is not tied to the length
 #       of time required to handle a single request.
 #
 #   keepalive - The number of seconds to wait for the next request
 #       on a Keep-Alive HTTP connection.
 #
 #       A positive integer. Generally set in the 1-5 seconds range.
 #
 if os.getenv('GUNICORN_WORKERS', None):
    workers = int(os.getenv('GUNICORN_WORKERS'))
 else:
    cores = multiprocessing.cpu_count()
    workers = cores * 2 + 1
 worker_connections = 1000
 timeout = 240
 keepalive = 2
 #
 #   spew - Install a trace function that spews every line of Python
 #       that is executed when running the server. This is the
 #       nuclear option.
 #
 #       True or False
 #
 spew = False
 #
 # Server mechanics
 #
 #   daemon - Detach the main Gunicorn process from the controlling
 #       terminal with a standard fork/fork sequence.
 #
 #       True or False
 #
 #   raw_env - Pass environment variables to the execution environment.
 #
 #   pidfile - The path to a pid file to write
 #
 #       A path string or None to not write a pid file.
 #
 #   user - Switch worker processes to run as this user.
 #
 #       A valid user id (as an integer) or the name of a user that
 #       can be retrieved with a call to pwd.getpwnam(value) or None
 #       to not change the worker process user.
 #
 #   group - Switch worker process to run as this group.
 #
 #       A valid group id (as an integer) or the name of a user that
 #       can be retrieved with a call to pwd.getgrnam(value) or None
 #       to change the worker processes group.
 #
 #   umask - A mask for file permissions written by Gunicorn. Note that
 #       this affects unix socket permissions.
 #
 #       A valid value for the os.umask(mode) call or a string
 #       compatible with int(value, 0) (0 means Python guesses
 #       the base, so values like "0", "0xFF", "0022" are valid
 #       for decimal, hex, and octal representations)
 #
 #   tmp_upload_dir - A directory to store temporary request data when
 #       requests are read. This will most likely be disappearing soon.
 #
 #       A path to a directory where the process owner can write. Or
 #       None to signal that Python should choose one on its own.
 #
 daemon = False
 raw_env = []
 pidfile = None
 umask = 0
 user = None
 group = None
 tmp_upload_dir = None
 #
 #   Logging
 #
 #   logfile - The path to a log file to write to.
 #
 #       A path string. "-" means log to stdout.
 #
 #   loglevel - The granularity of log output
 #
 #       A string of "debug", "info", "warning", "error", "critical"
 #
 errorlog = '-'
 loglevel = 'info'
 accesslog = None
 access_log_format = '%(h)s %(l)s %(u)s %(t)s "%(r)s" %(s)s %(b)s "%(f)s" "%(a)s"'
 #
 # Process naming
 #
 #   proc_name - A base to use with setproctitle to change the way
 #       that Gunicorn processes are reported in the system process
 #       table. This affects things like 'ps' and 'top'. If you're
 #       going to be running more than one instance of Gunicorn you'll
 #       probably want to set a name to tell them apart. This requires
 #       that you install the setproctitle module.
 #
 #       A string or None to choose a default of something like 'gunicorn'.
 #
 proc_name = None
 #
 # Server hooks
 #
 #   post_fork - Called just after a worker has been forked.
 #
 #       A callable that takes a server and worker instance
 #       as arguments.
 #
 #   pre_fork - Called just prior to forking the worker subprocess.
 #
 #       A callable that accepts the same arguments as after_fork
 #
 #   pre_exec - Called just prior to forking off a secondary
 #       master process during things like config reloading.
 #
 #       A callable that takes a server instance as the sole argument.
 #
--- a/pr_agent/settings/.secrets_template.toml
+++ b/pr_agent/settings/.secrets_template.toml
@ -43,6 +43,9 @@ api_base = "" # the base url for your local Llama 2, Code Llama, and other model
 vertex_project = "" # the google cloud platform project name for your vertexai deployment
 vertex_location = "" # the google cloud platform location for your vertexai deployment
 [aws]
 bedrock_region = "" # the AWS region to call Bedrock APIs
 [github]
 # ---- Set the following only for deployment type == "user"
 user_token = ""  # A GitHub personal access token with 'repo' scope.
@ -67,7 +70,7 @@ bearer_token = ""
 [bitbucket_server]
 # For Bitbucket Server bearer token
-bearer_token = ""
+auth_token = ""
 webhook_secret = ""
 # For Bitbucket app
--- a/pr_agent/settings/configuration.toml
+++ b/pr_agent/settings/configuration.toml
@ -1,48 +1,24 @@
 [config]
 # models
 model="gpt-4-turbo-2024-04-09"
-model_turbo="gpt-4o-2024-08-06"
+model_turbo="gpt-4-turbo-2024-04-09"
-fallback_models=["gpt-4o-2024-05-13"]
+fallback_models=["gpt-4-0125-preview"]
 # CLI
 git_provider="github"
 publish_output=true
 publish_output_progress=true
 verbosity_level=0 # 0,1,2
 use_extra_bad_extensions=false
 # Configurations
 use_wiki_settings_file=true
 use_repo_settings_file=true
 use_global_settings_file=true
 ai_timeout=120 # 2minutes
 skip_keys = []
 # token limits
 max_description_tokens = 500
 max_commits_tokens = 500
 max_model_tokens = 32000 # Limits the maximum number of tokens that can be used by any model, regardless of the model's default capabilities.
-custom_model_max_tokens=-1 # for models not in the default list
+patch_extra_lines = 1
-# patch extension logic
+secret_provider="google_cloud_storage"
 patch_extension_skip_types =[".md",".txt"]
 allow_dynamic_context=true
 max_extra_lines_before_dynamic_context = 8 # will try to include up to 10 extra lines before the hunk in the patch, until we reach an enclosing function or class
 patch_extra_lines_before = 3 # Number of extra lines (+3 default ones) to include before each hunk in the patch
 patch_extra_lines_after = 1 # Number of extra lines (+3 default ones) to include after each hunk in the patch
 secret_provider=""
 cli_mode=false
 ai_disclaimer_title=""  # Pro feature, title for a collapsible disclaimer to AI outputs
 ai_disclaimer=""  # Pro feature, full text for the AI disclaimer
 output_relevant_configurations=false
 large_patch_policy = "clip" # "clip", "skip"
 # seed
 seed=-1 # set positive value to fix the seed (and ensure temperature=0)
 temperature=0.2
 # ignore logic
 ignore_pr_title = ["^\\[Auto\\]", "^Auto"] # a list of regular expressions to match against the PR title to ignore the PR agent
 ignore_pr_target_branches = [] # a list of regular expressions of target branches to ignore from PR agent when an PR is created
 ignore_pr_source_branches = [] # a list of regular expressions of source branches to ignore from PR agent when an PR is created
 ignore_pr_labels = [] # labels to ignore from PR agent when an PR is created
 #
 is_auto_command = false # will be auto-set to true if the command is triggered by an automation
 enable_ai_metadata = false # will enable adding ai metadata
 [pr_reviewer] # /review #
 # enable/disable features
@ -50,10 +26,11 @@ require_score_review=false
 require_tests_review=true
 require_estimate_effort_to_review=true
 require_can_be_split_review=false
-require_security_review=true
+# soc2
-require_ticket_analysis_review=true
+require_soc2_ticket=false
 soc2_ticket_prompt="Does the PR description include a link to ticket in a project management system (e.g., Jira, Asana, Trello, etc.) ?"
 # general options
-num_code_suggestions=0
+num_code_suggestions=4
 inline_code_comments = false
 ask_and_reflect=false
 #automatic_review=true
@ -67,7 +44,6 @@ enable_review_labels_effort=true
 require_all_thresholds_for_incremental_review=false
 minimal_commits_for_incremental_review=0
 minimal_minutes_for_incremental_review=0
 enable_intro_text=true
 enable_help_text=false # Determines whether to include help text in the PR review. Enabled by default.
 # auto approval
 enable_auto_approval=false
@ -75,7 +51,7 @@ maximal_review_effort=5
 [pr_description] # /describe #
-publish_labels=false
+publish_labels=true
 add_original_user_description=true
 generate_ai_title=false
 use_bullet_points=true
@ -94,11 +70,7 @@ inline_file_summary=false # false, true, 'table'
 # markers
 use_description_markers=false
 include_generated_by_header=true
-# large pr mode 💎
+
 enable_large_pr_handling=true
 max_ai_calls=4
 async_ai_calls=true
 mention_extra_files=true
 #custom_labels = ['Bug fix', 'Tests', 'Bug fix with tests', 'Enhancement', 'Documentation', 'Other']
 [pr_questions] # /ask #
@ -106,64 +78,30 @@ enable_help_text=false
 [pr_code_suggestions] # /improve #
-max_context_tokens=14000
+max_context_tokens=8000
-#
+num_code_suggestions=4
 commitable_code_suggestions = false
 dual_publishing_score_threshold=-1 # -1 to disable, [0-10] to set the threshold (>=) for publishing a code suggestion both in a table and as commitable
 #
 extra_instructions = ""
 rank_suggestions = false
 enable_help_text=false
-enable_chat_text=false
+persistent_comment=false
 enable_intro_text=true
 persistent_comment=true
 max_history_len=4
 # enable to apply suggestion 💎
 apply_suggestions_checkbox=true
 # suggestions scoring
 self_reflect_on_suggestions=true
 suggestions_score_threshold=0 # [0-10]| recommend not to set this value above 8, since above it may clip highly relevant suggestions
 # params for '/improve --extended' mode
 auto_extended_mode=true
-num_code_suggestions_per_chunk=4
+num_code_suggestions_per_chunk=5
 max_number_of_calls = 3
 parallel_calls = true
 rank_extended_suggestions = false
 final_clip_factor = 0.8
 # self-review checkbox
 demand_code_suggestions_self_review=false # add a checkbox for the author to self-review the code suggestions
 code_suggestions_self_review_text= "**Author self-review**: I have reviewed the PR code suggestions, and addressed the relevant ones."
 approve_pr_on_self_review=false # Pro feature. if true, the PR will be auto-approved after the author clicks on the self-review checkbox
 fold_suggestions_on_self_review=true # Pro feature. if true, the code suggestions will be folded after the author clicks on the self-review checkbox
 # Suggestion impact 💎
 publish_post_process_suggestion_impact=true
 wiki_page_accepted_suggestions=true
 [pr_custom_prompt] # /custom_prompt #
 prompt = """\
 The code suggestions should focus only on the following:
 - ...
 - ...
 ...
 """
 suggestions_score_threshold=0
 num_code_suggestions_per_chunk=4
 self_reflect_on_custom_suggestions=true
 enable_help_text=false
 [pr_add_docs] # /add_docs #
 extra_instructions = ""
-docs_style = "Sphinx" # "Google Style with Args, Returns, Attributes...etc", "Numpy Style", "Sphinx Style", "PEP257", "reStructuredText"
+docs_style = "Sphinx Style" # "Google Style with Args, Returns, Attributes...etc", "Numpy Style", "Sphinx Style", "PEP257", "reStructuredText"
 file = ""              # in case there are several components with the same name, you can specify the relevant file
 class_name = ""        # in case there are several methods with the same name in the same file, you can specify the relevant class name
 [pr_update_changelog] # /update_changelog #
 push_changelog_changes=false
 extra_instructions = ""
 [pr_analyze] # /analyze #
 enable_help_text=true
 [pr_test] # /test #
 extra_instructions = ""
@ -178,18 +116,15 @@ enable_help_text=false
 num_code_suggestions=4
 extra_instructions = ""
 file = ""              # in case there are several components with the same name, you can specify the relevant file
-class_name = ""        # in case there are several methods with the same name in the same file, you can specify the relevant class name
+class_name = ""
 [checks] # /checks (pro feature) #
 enable_auto_checks_feedback=true
 excluded_checks_list=["lint"] # list of checks to exclude, for example: ["check1", "check2"]
 persistent_comment=true
 enable_help_text=true
 final_update_message = false
 [pr_help] # /help #
 force_local_db=false
 num_retrieved_snippets=5
 [pr_config] # /config #
@ -200,23 +135,20 @@ ratelimit_retries = 5
 base_url = "https://api.github.com"
 publish_inline_comments_fallback_with_verification = true
 try_fix_invalid_inline_comments = true
 app_name = "pr-agent"
 ignore_bot_pr = true
 [github_action_config]
 # auto_review = true    # set as env var in .github/workflows/pr-agent.yaml
 # auto_describe = true  # set as env var in .github/workflows/pr-agent.yaml
 # auto_improve = true   # set as env var in .github/workflows/pr-agent.yaml
-# pr_actions = ['opened', 'reopened', 'ready_for_review', 'review_requested']
+# enable_output = true   # set as env var in .github/workflows/pr-agent.yaml
 [github_app]
 # these toggles allows running the github app from custom deployments
 bot_user = "github-actions[bot]"
 override_deployment_type = true
 # settings for "pull_request" event
 handle_pr_actions = ['opened', 'reopened', 'ready_for_review']
 pr_commands = [
-    "/describe --pr_description.final_update_message=false",
+    "/describe",
    "/review --pr_reviewer.num_code_suggestions=0",
    "/improve",
 ]
@ -231,27 +163,23 @@ push_commands = [
    "/describe",
    "/review --pr_reviewer.num_code_suggestions=0",
 ]
 ignore_pr_title = []
 ignore_bot_pr = true
 [gitlab]
-url = "https://gitlab.com"
+url = "https://gitlab.com" # URL to the gitlab service
 pr_commands = [
    "/describe --pr_description.final_update_message=false",
    "/review --pr_reviewer.num_code_suggestions=0",
    "/improve",
 ]
 handle_push_trigger = false
 push_commands = [
    "/describe",
    "/review --pr_reviewer.num_code_suggestions=0",
    "/improve",
 ]
 [bitbucket_app]
 pr_commands = [
    "/describe --pr_description.final_update_message=false",
    "/review --pr_reviewer.num_code_suggestions=0",
-    "/improve --pr_code_suggestions.commitable_code_suggestions=true --pr_code_suggestions.suggestions_score_threshold=7",
+    "/improve --pr_code_suggestions.commitable_code_suggestions=true",
 ]
-avoid_full_files = false
+
 [local]
 # LocalGitProvider settings - uncomment to use paths other than default
@ -272,19 +200,10 @@ avoid_full_files = false
 # URL to the BitBucket Server instance
 # url = "https://git.bitbucket.com"
 url = ""
 pr_commands = [
    "/describe --pr_description.final_update_message=false",
    "/review --pr_reviewer.num_code_suggestions=0",
    "/improve --pr_code_suggestions.commitable_code_suggestions=true --pr_code_suggestions.suggestions_score_threshold=7",
 ]
 [litellm]
 # use_client = false
 # drop_params = false
 enable_callbacks = false
 success_callback = []
 failure_callback = []
 service_callback = []
 [pr_similar_issue]
 skip_comments = false
@ -292,14 +211,6 @@ force_update_dataset = false
 max_issues_to_scan = 500
 vectordb = "pinecone"
 [pr_find_similar_component]
 class_name = ""
 file = ""
 search_from_org = false
 allow_fallback_less_words = true
 number_of_keywords = 5
 number_of_results = 5
 [pinecone]
 # fill and place in .secrets.toml
 #api_key = ...
@ -307,7 +218,3 @@ number_of_results = 5
 [lancedb]
 uri = "./lancedb"
 [best_practices]
 content = ""
 max_lines_allowed = 800
 enable_global_best_practices = false
--- a/Show More
+++ b/Show More
`@ -1 +1 @@`
	`# [Visit Our Docs Portal](https://qodo-merge-docs.qodo.ai/)`	`# [Visit Our Docs Portal](https://pr-agent-docs.codium.ai/)`
`@ -1 +1 @@`
	`qodo-merge-docs.qodo.ai`	`pr-agent-docs.codium.ai`