🐛 fix: Set content type for requests

2026-06-13 09:49:12 -04:00 · 2024-12-12 15:55:27 +01:00
320 changed files with 2363 additions and 29342 deletions
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -12,4 +12,4 @@ lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cl
 polar: # Replace with a single Polar username
 buy_me_a_coffee: # Replace with a single Buy Me a Coffee username
 thanks_dev: # Replace with a single thanks.dev username
-custom: ['https://www.paypal.com/paypalme/palm1r', 'https://github.com/Palm1r/QodeAssist#support-the-development-of-qodeassist']
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -2,7 +2,7 @@
 name: Bug report
 about: Create a report to help us improve
 title: ''
-labels: bug
+labels: ''
 assignees: ''

 ---
@@ -23,6 +23,16 @@ A clear and concise description of what you expected to happen.
 **Screenshots**
 If applicable, add screenshots to help explain your problem.

-**Log**
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. iPhone6]
+ - OS: [e.g. iOS8.1]
+ - Browser [e.g. stock browser, safari]
+ - Version [e.g. 22]
+
 **Additional context**
 Add any other context about the problem here.
--- a/.github/scripts/plugin.json
+++ b/.github/scripts/plugin.json
@@ -1,109 +0,0 @@
-{
-    "name": "QodeAssist",
-    "vendor": "Petr Mironychev",
-    "tags": [
-        "code assistant",
-        "llm",
-        "ai"
-    ],
-    "compatibility": "Qt 6.8.3",
-    "platforms": [
-        "Windows",
-        "macOS",
-        "Linux"
-    ],
-    "license": "GPLv3",
-    "version": "0.5.11",
-    "status": "draft",
-    "is_pack": false,
-    "released_at": null,
-    "version_history": [
-        {
-            "version": "0.4.0",
-            "is_latest": false,
-            "released_at": "2024-01-24T15:00:00Z"
-        },
-        {
-            "version": "0.5.2",
-            "is_latest": false,
-            "released_at": "2025-03-13T17:00:00Z"
-        },
-        {
-            "version": "0.5.3",
-            "is_latest": false,
-            "released_at": "2025-03-14T11:00:00Z"
-        },
-        {
-            "version": "0.5.4",
-            "is_latest": false,
-            "released_at": "2025-03-17T03:00:00Z"
-        },
-        {
-            "version": "0.5.5",
-            "is_latest": false,
-            "released_at": "2025-03-20T19:00:00Z"
-        },
-        {
-            "version": "0.5.6",
-            "is_latest": false,
-            "released_at": "2025-04-04T19:00:00Z"
-        },
-        {
-            "version": "0.5.7",
-            "is_latest": false,
-            "released_at": "2025-04-14T01:00:00Z"
-        },
-        {
-            "version": "0.5.8",
-            "is_latest": false,
-            "released_at": "2025-04-17T10:00:00Z"
-        },
-        {
-            "version": "0.5.9",
-            "is_latest": false,
-            "released_at": "2025-04-21T10:00:00Z"
-        },
-        {
-            "version": "0.5.10",
-            "is_latest": false,
-            "released_at": "2025-04-24T10:00:00Z"
-        },
-        {
-            "version": "0.5.11",
-            "is_latest": false,
-            "released_at": "2025-04-24T21:00:00Z"
-        },
-        {
-            "version": "0.5.12",
-            "is_latest": true,
-            "released_at": "2025-05-01T17:00:00Z"
-        }
-    ],
-    "icon": "https://github.com/user-attachments/assets/dc336712-83cb-440d-8761-8d0a31de898d",
-    "small_icon": "https://github.com/user-attachments/assets/8ec241bf-3186-452e-b8db-8d70543c2f41",
-    "description_paragraphs": [
-        {
-            "header": "Description",
-            "text": [
-                "QodeAssist is an AI-powered coding assistant plugin for Qt Creator. It provides intelligent code completion and suggestions for C++ and QML, leveraging large language models through local providers like Ollama. Enhance your coding productivity with context-aware AI assistance directly in your Qt development environment."
-            ]
-        }
-    ],
-    "description_links": [
-        {
-            "url": "https://github.com/Palm1r/QodeAssist",
-            "link_text": "Site"
-        }
-    ],
-    "description_images": [
-        {
-            "url": "https://github.com/user-attachments/assets/255a52f1-5cc0-4ca3-b05c-c4cf9cdbe25a",
-            "image_label": "Code Completion"
-        }
-    ],
-    "copyright": "(C) Petr Mironychev",
-    "download_history": {
-        "download_count": 0
-    },
-    "plugin_sets": []
-}
--- a/.github/scripts/registerPlugin.js
+++ b/.github/scripts/registerPlugin.js
@@ -1,147 +0,0 @@
-const fs = require('fs');
-const path = require('path');
-
-const updatePluginData = (plugin, env, pluginQtcData) => {
-  const dictionary_platform = {
-    'Windows': `${env.PLUGIN_DOWNLOAD_URL}/${env.PLUGIN_NAME}-${env.QT_CREATOR_VERSION}-Windows-x64.7z`,
-    'Linux': `${env.PLUGIN_DOWNLOAD_URL}/${env.PLUGIN_NAME}-${env.QT_CREATOR_VERSION}-Linux-x64.7z`,
-    'macOS': `${env.PLUGIN_DOWNLOAD_URL}/${env.PLUGIN_NAME}-${env.QT_CREATOR_VERSION}-macOS-universal.7z`
-  };
-
-  plugin.core_compat_version = env.QT_CREATOR_VERSION_INTERNAL;
-  plugin.core_version = env.QT_CREATOR_VERSION_INTERNAL;
-  plugin.status = "draft";
-
-  plugin.plugins.forEach(pluginsEntry => {
-    pluginsEntry.url = dictionary_platform[plugin.host_os];
-    pluginsEntry.meta_data = pluginQtcData;
-  });
-  return plugin;
-};
-
-const createNewPluginData = (env, platform, pluginQtcData) => {
-  const pluginJson = {
-    "status": "draft",
-    "core_compat_version": "<placeholder>",
-    "core_version": "<placeholder>",
-    "host_os": platform,
-    "host_os_version": "0", // TODO: pass the real data
-    "host_os_architecture": "x86_64", // TODO: pass the real data
-    "plugins": [
-      {
-        "url": "",
-        "size": 5000, // TODO: check if it is needed, pass the real data
-        "meta_data": {},
-        "dependencies": []
-      }
-    ]
-  };
-
-  updatePluginData(pluginJson, env, pluginQtcData);
-  return pluginJson;
-}
-
-const updateServerPluginJson = (endJsonData, pluginQtcData, env) => {
-  // Update the global data in mainData
-  endJsonData.name = pluginQtcData.Name;
-  endJsonData.vendor = pluginQtcData.Vendor;
-  endJsonData.version = pluginQtcData.Version;
-  endJsonData.copyright = pluginQtcData.Copyright;
-  endJsonData.status = "draft";
-
-  endJsonData.version_history[0].version = pluginQtcData.Version;
-
-  endJsonData.description_paragraphs = [
-    {
-      header: "Description",
-      text: [
-        pluginQtcData.Description
-      ]
-    }
-  ];
-
-  let found = false;
-  // Update or Add the plugin data for the current Qt Creator version
-  for (const plugin of endJsonData.plugin_sets) {
-    if (plugin.core_compat_version === env.QT_CREATOR_VERSION_INTERNAL) {
-      updatePluginData(plugin, env, pluginQtcData);
-      found = true;
-    }
-  }
-
-  if (!found)  {
-    for (const platform of ['Windows', 'Linux', 'macOS']) {
-      endJsonData.plugin_sets.push(createNewPluginData(env, platform, pluginQtcData));
-    }
-  }
-
-  // Save the updated JSON file
-  const serverPluginJsonPath = path.join(__dirname, `${env.PLUGIN_NAME}.json`);
-  fs.writeFileSync(serverPluginJsonPath, JSON.stringify(endJsonData, null, 2), 'utf8');
-};
-
-const request = async (type, url, token, data) => {
-  const response = await fetch(url, {
-    method: type,
-    headers: {
-      'Authorization': `Bearer ${token}`,
-      'accept': 'application/json',
-      'Content-Type': 'application/json'
-    },
-    body: data ? JSON.stringify(data) : undefined
-  });
-  if (!response.ok) {
-    const errorResponse = await response.json();
-    console.error(`${type} Request Error Response:`, errorResponse); // Log the error response
-    throw new Error(`HTTP error! status: ${response.status}`);
-  }
-  return await response.json();
-}
-
-const put = (url, token, data) => request('PUT', url, token, data)
-const post = (url, token, data) => request('POST', url, token, data)
-const get = (url, token) => request('GET', url, token)
-
-const purgeCache = async (env) => {
-  try {
-    await post(`${env.API_URL}api/v1/cache/purgeall`, env.TOKEN, {});
-    console.log('Cache purged successfully');
-  } catch (error) {
-    console.error('Error:', error);
-  }
-};
-
-async function main() {
-  const env = {
-    PLUGIN_DOWNLOAD_URL: process.env.PLUGIN_DOWNLOAD_URL || process.argv[2],
-    PLUGIN_NAME: process.env.PLUGIN_NAME || process.argv[3],
-    QT_CREATOR_VERSION: process.env.QT_CREATOR_VERSION || process.argv[4],
-    QT_CREATOR_VERSION_INTERNAL: process.env.QT_CREATOR_VERSION_INTERNAL || process.argv[5],
-    TOKEN: process.env.TOKEN || process.argv[6],
-    API_URL: process.env.API_URL || process.argv[7] || ''
-  };
-
-  const pluginQtcData = require(`../../${env.PLUGIN_NAME}-origin/${env.PLUGIN_NAME}.json`);
-  const templateFileData = require('./plugin.json');
-
-  if (env.API_URL === '') {
-    updateServerPluginJson(templateFileData, pluginQtcData, env);
-    process.exit(0);
-  }
-
-  const response = await get(`${env.API_URL}api/v1/admin/extensions?search=${env.PLUGIN_NAME}`, env.TOKEN);
-  if (response.items.length > 0 && response.items[0].extension_id !== '') {
-    const pluginId = response.items[0].extension_id;
-    console.log('Plugin found. Updating the plugin');
-    updateServerPluginJson(response.items[0], pluginQtcData, env);
-
-    await put(`${env.API_URL}api/v1/admin/extensions/${pluginId}`, env.TOKEN, response.items[0]);
-  } else {
-    console.log('No plugin found. Creating a new plugin');
-    updateServerPluginJson(templateFileData, pluginQtcData, env);
-    await post(`${env.API_URL}api/v1/admin/extensions`, env.TOKEN, templateFileData);
-  }
-  // await purgeCache(env);
-}
-
-main().then(() => console.log('JSON file updated successfully'));
--- a/.github/workflows/build_cmake.yml
+++ b/.github/workflows/build_cmake.yml
@@ -9,16 +9,18 @@ on:
  pull_request:
    branches:
      - main
-
 env:
  PLUGIN_NAME: QodeAssist
+  QT_VERSION: 6.7.3
+  QT_CREATOR_VERSION: 14.0.2
+  QT_CREATOR_SNAPSHOT: NO
  MACOS_DEPLOYMENT_TARGET: "11.0"
  CMAKE_VERSION: "3.29.6"
  NINJA_VERSION: "1.12.1"

 jobs:
  build:
-    name: ${{ matrix.config.name }} (Qt ${{ matrix.qt_config.qt_version }}, QtC ${{ matrix.qt_config.qt_creator_version }})
+    name: ${{ matrix.config.name }}
    runs-on: ${{ matrix.config.os }}
    outputs:
        tag: ${{ steps.git.outputs.tag }}
@@ -28,61 +30,76 @@ jobs:
        - {
            name: "Windows Latest MSVC", artifact: "Windows-x64",
            os: windows-latest,
-            platform: windows_x64,
            cc: "cl", cxx: "cl",
            environment_script: "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvars64.bat",
          }
        - {
-            name: "Ubuntu 22.04 GCC", artifact: "Linux-x64",
-            os: ubuntu-22.04,
-            platform: linux_x64,
+            name: "Ubuntu Latest GCC", artifact: "Linux-x64",
+            os: ubuntu-latest,
            cc: "gcc", cxx: "g++"
          }
        - {
            name: "macOS Latest Clang", artifact: "macOS-universal",
            os: macos-latest,
-            platform: mac_x64,
            cc: "clang", cxx: "clang++"
          }
-        qt_config:
-        - {
-            qt_version: "6.8.3",
-            qt_creator_version: "16.0.2"
-          }
-        - {
-            qt_version: "6.9.2",
-            qt_creator_version: "17.0.2"
-          }
-        - {
-            qt_version: "6.10.0",
-            qt_creator_version: "18.0.0"
-          }

    steps:
-    - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955
-
+    - uses: actions/checkout@v4
    - name: Checkout submodules
      id: git
      shell: cmake -P {0}
      run: |
        if (${{github.ref}} MATCHES "tags/v(.*)")
-            file(APPEND "$ENV{GITHUB_OUTPUT}" "tag=${CMAKE_MATCH_1}")
+            file(APPEND "$ENV{GITHUB_OUTPUT}" "tag=${CMAKE_MATCH_1}\n")
        else()
-            execute_process(
-                COMMAND git rev-parse --short HEAD
-                OUTPUT_VARIABLE short_sha
-                OUTPUT_STRIP_TRAILING_WHITESPACE
-            )
-            file(APPEND "$ENV{GITHUB_OUTPUT}" "tag=${short_sha}")
+            file(APPEND "$ENV{GITHUB_OUTPUT}" "tag=${{github.run_id}}\n")
        endif()

    - name: Download Ninja and CMake
-      uses: lukka/get-cmake@2ecc21724e5215b0e567bc399a2602d2ecb48541
-      with:
-        cmakeVersion: ${{ env.CMAKE_VERSION }}
-        ninjaVersion: ${{ env.NINJA_VERSION }}
+      shell: cmake -P {0}
+      run: |
+        set(cmake_version "$ENV{CMAKE_VERSION}")
+        set(ninja_version "$ENV{NINJA_VERSION}")

-    - name: Install dependencies
+        if ("${{ runner.os }}" STREQUAL "Windows")
+          set(ninja_suffix "win.zip")
+          set(cmake_suffix "windows-x86_64.zip")
+          set(cmake_dir "cmake-${cmake_version}-windows-x86_64/bin")
+        elseif ("${{ runner.os }}" STREQUAL "Linux")
+          set(ninja_suffix "linux.zip")
+          set(cmake_suffix "linux-x86_64.tar.gz")
+          set(cmake_dir "cmake-${cmake_version}-linux-x86_64/bin")
+        elseif ("${{ runner.os }}" STREQUAL "macOS")
+          set(ninja_suffix "mac.zip")
+          set(cmake_suffix "macos-universal.tar.gz")
+          set(cmake_dir "cmake-${cmake_version}-macos-universal/CMake.app/Contents/bin")
+        endif()
+
+        set(ninja_url "https://github.com/ninja-build/ninja/releases/download/v${ninja_version}/ninja-${ninja_suffix}")
+        file(DOWNLOAD "${ninja_url}" ./ninja.zip SHOW_PROGRESS)
+        execute_process(COMMAND ${CMAKE_COMMAND} -E tar xvf ./ninja.zip)
+
+        set(cmake_url "https://github.com/Kitware/CMake/releases/download/v${cmake_version}/cmake-${cmake_version}-${cmake_suffix}")
+        file(DOWNLOAD "${cmake_url}" ./cmake.zip SHOW_PROGRESS)
+        execute_process(COMMAND ${CMAKE_COMMAND} -E tar xvf ./cmake.zip)
+
+        # Add to PATH environment variable
+        file(TO_CMAKE_PATH "$ENV{GITHUB_WORKSPACE}/${cmake_dir}" cmake_dir)
+        set(path_separator ":")
+        if ("${{ runner.os }}" STREQUAL "Windows")
+          set(path_separator ";")
+        endif()
+        file(APPEND "$ENV{GITHUB_PATH}" "$ENV{GITHUB_WORKSPACE}${path_separator}${cmake_dir}")
+
+        if (NOT "${{ runner.os }}" STREQUAL "Windows")
+          execute_process(
+            COMMAND chmod +x ninja
+            COMMAND chmod +x ${cmake_dir}/cmake
+          )
+        endif()
+
+    - name: Install system libs
      shell: cmake -P {0}
      run: |
        if ("${{ runner.os }}" STREQUAL "Linux")
@@ -90,13 +107,7 @@ jobs:
            COMMAND sudo apt update
          )
          execute_process(
-            COMMAND sudo apt install
-              # build dependencies
-              libgl1-mesa-dev libgtest-dev libgmock-dev
-              # runtime dependencies for tests (Qt is downloaded outside package manager,
-              # thus minimal dependencies must be installed explicitly)
-              libsecret-1-0 libxcb-cursor0 libxcb-icccm4 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-render0
-              libxcb-shape0 libxcb-shm0 libxcb-sync1 libxcb-xfixes0 libxcb-xkb1 libxkbcommon-x11-0 xvfb
+            COMMAND sudo apt install libgl1-mesa-dev libcups2-dev
            RESULT_VARIABLE result
          )
          if (NOT result EQUAL 0)
@@ -108,19 +119,14 @@ jobs:
      id: qt
      shell: cmake -P {0}
      run: |
-        set(qt_version "${{ matrix.qt_config.qt_version }}")
-        set(qt_creator_version "${{ matrix.qt_config.qt_creator_version }}")
+        set(qt_version "$ENV{QT_VERSION}")

        string(REPLACE "." "" qt_version_dotless "${qt_version}")
        if ("${{ runner.os }}" STREQUAL "Windows")
          set(url_os "windows_x86")
-          set(qt_package_arch_suffix "win64_msvc2022_64")
-          set(qt_dir_prefix "${qt_version}/msvc2022_64")
-          if (qt_creator_version VERSION_GREATER_EQUAL "18.0.0")
-            set(qt_package_suffix "-Windows-Windows_11_24H2-MSVC2022-Windows-Windows_11_24H2-X86_64")
-          else()
-            set(qt_package_suffix "-Windows-Windows_11_23H2-MSVC2022-Windows-Windows_11_23H2-X86_64")
-          endif()
+          set(qt_package_arch_suffix "win64_msvc2019_64")
+          set(qt_dir_prefix "${qt_version}/msvc2019_64")
+          set(qt_package_suffix "-Windows-Windows_10_22H2-MSVC2019-Windows-Windows_10_22H2-X86_64")
        elseif ("${{ runner.os }}" STREQUAL "Linux")
          set(url_os "linux_x64")
          if (qt_version VERSION_LESS "6.7.0")
@@ -129,23 +135,15 @@ jobs:
            set(qt_package_arch_suffix "linux_gcc_64")
          endif()
          set(qt_dir_prefix "${qt_version}/gcc_64")
-          if (qt_creator_version VERSION_GREATER_EQUAL "18.0.0")
-            set(qt_package_suffix "-Linux-RHEL_9_4-GCC-Linux-RHEL_9_4-X86_64")
-          else()
-            set(qt_package_suffix "-Linux-RHEL_8_10-GCC-Linux-RHEL_8_10-X86_64")
-          endif()
+          set(qt_package_suffix "-Linux-RHEL_8_8-GCC-Linux-RHEL_8_8-X86_64")
        elseif ("${{ runner.os }}" STREQUAL "macOS")
          set(url_os "mac_x64")
          set(qt_package_arch_suffix "clang_64")
          set(qt_dir_prefix "${qt_version}/macos")
-          if (qt_version VERSION_LESS "6.9.1")
-            set(qt_package_suffix "-MacOS-MacOS_14-Clang-MacOS-MacOS_14-X86_64-ARM64")
-          else()
-            set(qt_package_suffix "-MacOS-MacOS_15-Clang-MacOS-MacOS_15-X86_64-ARM64")
-          endif()
+          set(qt_package_suffix "-MacOS-MacOS_13-Clang-MacOS-MacOS_13-X86_64-ARM64")
        endif()

-        set(qt_base_url "https://download.qt.io/online/qtsdkrepository/${url_os}/desktop/qt6_${qt_version_dotless}/qt6_${qt_version_dotless}")
+        set(qt_base_url "https://download.qt.io/online/qtsdkrepository/${url_os}/desktop/qt6_${qt_version_dotless}")
        file(DOWNLOAD "${qt_base_url}/Updates.xml" ./Updates.xml SHOW_PROGRESS)

        file(READ ./Updates.xml updates_xml)
@@ -155,7 +153,7 @@ jobs:
        file(MAKE_DIRECTORY qt6)

        # Save the path for other steps
-        file(TO_CMAKE_PATH "$ENV{GITHUB_WORKSPACE}/qt6" qt_dir)
+        file(TO_CMAKE_PATH "$ENV{GITHUB_WORKSPACE}/qt6/${qt_dir_prefix}" qt_dir)
        file(APPEND "$ENV{GITHUB_OUTPUT}" "qt_dir=${qt_dir}")

        message("Downloading Qt to ${qt_dir}")
@@ -165,7 +163,7 @@ jobs:
          execute_process(COMMAND ${CMAKE_COMMAND} -E tar xvf ../${archive} WORKING_DIRECTORY qt6)
        endfunction()

-        foreach(package qtbase qtdeclarative qttools)
+        foreach(package qtbase qtdeclarative)
          downloadAndExtract(
            "${qt_base_url}/qt.qt6.${qt_version_dotless}.${qt_package_arch_suffix}/${qt_package_version}${package}${qt_package_suffix}.7z"
            ${package}.7z
@@ -174,17 +172,11 @@ jobs:

        foreach(package qt5compat qtshadertools)
          downloadAndExtract(
-            "${qt_base_url}/qt.qt6.${qt_version_dotless}.addons.${package}.${qt_package_arch_suffix}/${qt_package_version}${package}${qt_package_suffix}.7z"
+            "${qt_base_url}/qt.qt6.${qt_version_dotless}.${package}.${qt_package_arch_suffix}/${qt_package_version}${package}${qt_package_suffix}.7z"
            ${package}.7z
          )
        endforeach()

-        function(downloadAndExtractLibicu url archive)
-          message("Downloading ${url}")
-          file(DOWNLOAD "${url}" ./${archive} SHOW_PROGRESS)
-          execute_process(COMMAND ${CMAKE_COMMAND} -E tar xvf ../../${archive} WORKING_DIRECTORY qt6/lib)
-        endfunction()
-
        # uic depends on libicu*.so
        if ("${{ runner.os }}" STREQUAL "Linux")
          if (qt_version VERSION_LESS "6.7.0")
@@ -192,26 +184,47 @@ jobs:
          else()
            set(uic_suffix "Rhel8.6-x86_64")
          endif()
-          downloadAndExtractLibicu(
+          downloadAndExtract(
            "${qt_base_url}/qt.qt6.${qt_version_dotless}.${qt_package_arch_suffix}/${qt_package_version}icu-linux-${uic_suffix}.7z"
            icu.7z
          )
        endif()

    - name: Download Qt Creator
-      uses: qt-creator/install-dev-package@1460787a21551eb3d867b0de30e8d3f1aadef5ac
-      with:
-        version: ${{ matrix.qt_config.qt_creator_version }}
-        unzip-to: 'qtcreator'
-        platform: ${{ matrix.config.platform }}
-
-    - name: Extract Qt Creator
      id: qt_creator
      shell: cmake -P {0}
      run: |
+        string(REGEX MATCH "([0-9]+.[0-9]+).[0-9]+" outvar "$ENV{QT_CREATOR_VERSION}")
+
+        set(qtc_base_url "https://download.qt.io/official_releases/qtcreator/${CMAKE_MATCH_1}/$ENV{QT_CREATOR_VERSION}/installer_source")
+        set(qtc_snapshot "$ENV{QT_CREATOR_SNAPSHOT}")
+        if (qtc_snapshot)
+          set(qtc_base_url "https://download.qt.io/snapshots/qtcreator/${CMAKE_MATCH_1}/$ENV{QT_CREATOR_VERSION}/installer_source/${qtc_snapshot}")
+        endif()
+
+        if ("${{ runner.os }}" STREQUAL "Windows")
+          set(qtc_platform "windows_x64")
+        elseif ("${{ runner.os }}" STREQUAL "Linux")
+          set(qtc_platform "linux_x64")
+        elseif ("${{ runner.os }}" STREQUAL "macOS")
+          set(qtc_platform "mac_x64")
+        endif()
+
        file(TO_CMAKE_PATH "$ENV{GITHUB_WORKSPACE}/qtcreator" qtc_dir)
+        # Save the path for other steps
        file(APPEND "$ENV{GITHUB_OUTPUT}" "qtc_dir=${qtc_dir}")

+        file(MAKE_DIRECTORY qtcreator)
+
+        message("Downloading Qt Creator from ${qtc_base_url}/${qtc_platform}")
+
+        foreach(package qtcreator qtcreator_dev)
+          file(DOWNLOAD
+            "${qtc_base_url}/${qtc_platform}/${package}.7z" ./${package}.7z SHOW_PROGRESS)
+          execute_process(COMMAND
+            ${CMAKE_COMMAND} -E tar xvf ../${package}.7z WORKING_DIRECTORY qtcreator)
+        endforeach()
+
    - name: Build
      shell: cmake -P {0}
      run: |
@@ -249,7 +262,7 @@ jobs:
          COMMAND python
            -u
            "${{ steps.qt_creator.outputs.qtc_dir }}/${build_plugin_py}"
-            --name "$ENV{PLUGIN_NAME}-v${{ steps.git.outputs.tag }}-QtC${{ matrix.qt_config.qt_creator_version }}-${{ matrix.config.artifact }}"
+            --name "$ENV{PLUGIN_NAME}-$ENV{QT_CREATOR_VERSION}-${{ matrix.config.artifact }}"
            --src .
            --build build
            --qt-path "${{ steps.qt.outputs.qt_dir }}"
@@ -265,24 +278,19 @@ jobs:
        endif()

    - name: Upload
-      uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02
+      uses: actions/upload-artifact@v4
      with:
-        path: ./${{ env.PLUGIN_NAME }}-v${{ steps.git.outputs.tag }}-QtC${{ matrix.qt_config.qt_creator_version }}-${{ matrix.config.artifact }}.7z
-        name: ${{ env.PLUGIN_NAME}}-v${{ steps.git.outputs.tag }}-QtC${{ matrix.qt_config.qt_creator_version }}-${{ matrix.config.artifact }}.7z
-
-    - name: Run unit tests
-      if: startsWith(matrix.config.os, 'ubuntu')
-      run: |
-        xvfb-run ./build/build/test/QodeAssistTest
+        path: ./${{ env.PLUGIN_NAME }}-${{ env.QT_CREATOR_VERSION }}-${{ matrix.config.artifact }}.7z
+        name: ${{ env.PLUGIN_NAME}}-${{ env.QT_CREATOR_VERSION }}-${{ matrix.config.artifact }}.7z

  release:
    if: contains(github.ref, 'tags/v')
-    runs-on: ubuntu-22.04
-    needs: [build]
+    runs-on: ubuntu-latest
+    needs: build

    steps:
    - name: Download artifacts
-      uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093
+      uses: actions/download-artifact@v4
      with:
        path: release-with-dirs

@@ -293,7 +301,7 @@ jobs:

    - name: Create Release
      id: create_release
-      uses: softprops/action-gh-release@6cbd405e2c4e67a21c47fa9e383d020e4e28b836
+      uses: softprops/action-gh-release@v2
      env:
        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
      with:
--- a/.gitignore
+++ b/.gitignore
@@ -73,8 +73,4 @@ CMakeLists.txt.user*
 *.dll
 *.exe

-/build
-/.qodeassist
-/.cursor
-/.vscode
-.qtc_clangd/compile_commands.json
+/build
--- a/.gitmodules
+++ b/.gitmodules
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,41 +8,14 @@ set(CMAKE_AUTOUIC ON)
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
-set(CMAKE_POSITION_INDEPENDENT_CODE ON)

 find_package(QtCreator REQUIRED COMPONENTS Core)
-find_package(Qt6 COMPONENTS Core Gui Quick Widgets Network Test LinguistTools REQUIRED)
-find_package(GTest)
-
-qt_standard_project_setup(I18N_TRANSLATED_LANGUAGES en)
-
-# IDE_VERSION is defined by QtCreator package
-string(REGEX MATCH "([0-9]+)\\.([0-9]+)\\.([0-9]+)" version_match ${IDE_VERSION})
-set(QODEASSIST_QT_CREATOR_VERSION_MAJOR ${CMAKE_MATCH_1})
-set(QODEASSIST_QT_CREATOR_VERSION_MINOR ${CMAKE_MATCH_2})
-set(QODEASSIST_QT_CREATOR_VERSION_PATCH ${CMAKE_MATCH_3})
-
-if(NOT version_match)
-    message(FATAL_ERROR "Failed to parse Qt Creator version string: ${IDE_VERSION}")
-endif()
-
-message(STATUS "Qt Creator Version: ${QODEASSIST_QT_CREATOR_VERSION_MAJOR}.${QODEASSIST_QT_CREATOR_VERSION_MINOR}.${QODEASSIST_QT_CREATOR_VERSION_PATCH}")
-
-add_definitions(
-  -DQODEASSIST_QT_CREATOR_VERSION_MAJOR=${QODEASSIST_QT_CREATOR_VERSION_MAJOR}
-  -DQODEASSIST_QT_CREATOR_VERSION_MINOR=${QODEASSIST_QT_CREATOR_VERSION_MINOR}
-  -DQODEASSIST_QT_CREATOR_VERSION_PATCH=${QODEASSIST_QT_CREATOR_VERSION_PATCH}
-)
+find_package(Qt6 COMPONENTS Core Gui Quick Widgets Network REQUIRED)

 add_subdirectory(llmcore)
 add_subdirectory(settings)
 add_subdirectory(logger)
-add_subdirectory(UIControls)
 add_subdirectory(ChatView)
-add_subdirectory(context)
-if(GTest_FOUND)
-  add_subdirectory(test)
-endif()

 add_qtc_plugin(QodeAssist
  PLUGIN_DEPENDS
@@ -50,7 +23,6 @@ add_qtc_plugin(QodeAssist
    QtCreator::LanguageClient
    QtCreator::TextEditor
    QtCreator::ProjectExplorer
-    QtCreator::CppEditor
  DEPENDS
    Qt::Core
    Qt::Gui
@@ -59,7 +31,6 @@ add_qtc_plugin(QodeAssist
    Qt::Network
    QtCreator::ExtensionSystem
    QtCreator::Utils
-    QtCreator::CPlusPlus
    QodeAssistChatViewplugin
  SOURCES
    .github/workflows/build_cmake.yml
@@ -71,87 +42,31 @@ add_qtc_plugin(QodeAssist
    LLMClientInterface.hpp LLMClientInterface.cpp
    templates/Templates.hpp
    templates/CodeLlamaFim.hpp
-    templates/Ollama.hpp
-    templates/Claude.hpp
-    templates/OpenAI.hpp
-    templates/MistralAI.hpp
    templates/StarCoder2Fim.hpp
-    # templates/DeepSeekCoderFim.hpp
-    # templates/CustomFimTemplate.hpp
-    templates/Qwen25CoderFIM.hpp
-    templates/OpenAICompatible.hpp
+    templates/DeepSeekCoderFim.hpp
+    templates/CustomFimTemplate.hpp
+
+
+    templates/Qwen.hpp
+
+    templates/Ollama.hpp
+    templates/BasicChat.hpp
    templates/Llama3.hpp
    templates/ChatML.hpp
    templates/Alpaca.hpp
    templates/Llama2.hpp
-    templates/CodeLlamaQMLFim.hpp
-    templates/GoogleAI.hpp
-    templates/LlamaCppFim.hpp
-    templates/Qwen3CoderFIM.hpp
    providers/Providers.hpp
    providers/OllamaProvider.hpp providers/OllamaProvider.cpp
-    providers/ClaudeProvider.hpp providers/ClaudeProvider.cpp
-    providers/OpenAIProvider.hpp providers/OpenAIProvider.cpp
-    providers/MistralAIProvider.hpp providers/MistralAIProvider.cpp
    providers/LMStudioProvider.hpp providers/LMStudioProvider.cpp
    providers/OpenAICompatProvider.hpp providers/OpenAICompatProvider.cpp
-    providers/OpenRouterAIProvider.hpp providers/OpenRouterAIProvider.cpp
-    providers/GoogleAIProvider.hpp providers/GoogleAIProvider.cpp
-    providers/LlamaCppProvider.hpp providers/LlamaCppProvider.cpp
-    providers/CodestralProvider.hpp providers/CodestralProvider.cpp
    QodeAssist.qrc
    LSPCompletion.hpp
    LLMSuggestion.hpp LLMSuggestion.cpp
    QodeAssistClient.hpp QodeAssistClient.cpp
+    DocumentContextReader.hpp DocumentContextReader.cpp
+    utils/CounterTooltip.hpp utils/CounterTooltip.cpp
+    core/ChangesManager.h core/ChangesManager.cpp
    chat/ChatOutputPane.h chat/ChatOutputPane.cpp
    chat/NavigationPanel.hpp chat/NavigationPanel.cpp
    ConfigurationManager.hpp ConfigurationManager.cpp
-    CodeHandler.hpp CodeHandler.cpp
-    UpdateStatusWidget.hpp UpdateStatusWidget.cpp
-    widgets/CompletionProgressHandler.hpp widgets/CompletionProgressHandler.cpp
-    widgets/ProgressWidget.hpp widgets/ProgressWidget.cpp
-    widgets/EditorChatButton.hpp widgets/EditorChatButton.cpp
-    widgets/EditorChatButtonHandler.hpp widgets/EditorChatButtonHandler.cpp
-    widgets/QuickRefactorDialog.hpp widgets/QuickRefactorDialog.cpp
-    QuickRefactorHandler.hpp QuickRefactorHandler.cpp
-    tools/ToolsFactory.hpp tools/ToolsFactory.cpp
-    tools/ReadVisibleFilesTool.hpp tools/ReadVisibleFilesTool.cpp
-    tools/ToolHandler.hpp tools/ToolHandler.cpp
-    tools/ListProjectFilesTool.hpp tools/ListProjectFilesTool.cpp
-    tools/ToolsManager.hpp tools/ToolsManager.cpp
-    tools/GetIssuesListTool.hpp tools/GetIssuesListTool.cpp
-    tools/CreateNewFileTool.hpp tools/CreateNewFileTool.cpp
-    tools/EditFileTool.hpp tools/EditFileTool.cpp
-    tools/BuildProjectTool.hpp tools/BuildProjectTool.cpp
-    tools/ProjectSearchTool.hpp tools/ProjectSearchTool.cpp
-    tools/FindAndReadFileTool.hpp tools/FindAndReadFileTool.cpp
-    tools/FileSearchUtils.hpp tools/FileSearchUtils.cpp
-    providers/ClaudeMessage.hpp providers/ClaudeMessage.cpp
-    providers/OpenAIMessage.hpp providers/OpenAIMessage.cpp
-    providers/OllamaMessage.hpp providers/OllamaMessage.cpp
-    providers/GoogleMessage.hpp providers/GoogleMessage.cpp
-)
-
-get_target_property(QtCreatorCorePath QtCreator::Core LOCATION)
-find_program(QtCreatorExecutable
-  NAMES
-    qtcreator "Qt Creator"
-  PATHS
-    "${QtCreatorCorePath}/../../../bin"
-    "${QtCreatorCorePath}/../../../MacOS"
-  NO_DEFAULT_PATH
-)
-if (QtCreatorExecutable)
-  add_custom_target(RunQtCreator
-    COMMAND ${QtCreatorExecutable} -pluginpath $<TARGET_FILE_DIR:QodeAssist>
-    DEPENDS QodeAssist
-  )
-  set_target_properties(RunQtCreator PROPERTIES FOLDER "qtc_runnable")
-endif()
-
-#TODO change to TS_OUTPUT_DIRECTORY after removing Qt6.8
-qt_add_translations(TARGETS QodeAssist
-          TS_FILE_DIR ${CMAKE_CURRENT_LIST_DIR}/resources/translations
-          RESOURCE_PREFIX "/translations"
-          LUPDATE_OPTIONS -no-obsolete
 )
--- a/ChatView/CMakeLists.txt
+++ b/ChatView/CMakeLists.txt
@@ -1,48 +1,18 @@
 qt_add_library(QodeAssistChatView STATIC)

 qt_policy(SET QTP0001 NEW)
-qt_policy(SET QTP0004 NEW)

+# URI name should match the subdirectory name to suppress the warning
 qt_add_qml_module(QodeAssistChatView
    URI ChatView
    VERSION 1.0
-    DEPENDENCIES
-    QtQuick
+    DEPENDENCIES QtQuick
    QML_FILES
    qml/RootItem.qml
    qml/ChatItem.qml
+    qml/Badge.qml
    qml/dialog/CodeBlock.qml
    qml/dialog/TextBlock.qml
-    qml/parts/TopBar.qml
-    qml/parts/BottomBar.qml
-    qml/parts/AttachedFilesPlace.qml
-    qml/parts/Toast.qml
-    qml/ToolStatusItem.qml
-    qml/FileEditItem.qml
-    qml/parts/RulesViewer.qml
-    qml/parts/FileEditsActionBar.qml
-
-    RESOURCES
-    icons/attach-file-light.svg
-    icons/attach-file-dark.svg
-    icons/close-dark.svg
-    icons/close-light.svg
-    icons/link-file-light.svg
-    icons/link-file-dark.svg
-    icons/load-chat-dark.svg
-    icons/save-chat-dark.svg
-    icons/clean-icon-dark.svg
-    icons/file-in-system.svg
-    icons/window-lock.svg
-    icons/window-unlock.svg
-    icons/chat-icon.svg
-    icons/chat-pause-icon.svg
-    icons/rules-icon.svg
-    icons/open-in-editor.svg
-    icons/apply-changes-button.svg
-    icons/undo-changes-button.svg
-    icons/reject-changes-button.svg
-
    SOURCES
    ChatWidget.hpp ChatWidget.cpp
    ChatModel.hpp ChatModel.cpp
@@ -50,10 +20,6 @@ qt_add_qml_module(QodeAssistChatView
    ClientInterface.hpp ClientInterface.cpp
    MessagePart.hpp
    ChatUtils.h ChatUtils.cpp
-    ChatSerializer.hpp ChatSerializer.cpp
-    ChatView.hpp ChatView.cpp
-    ChatData.hpp
-
 )

 target_link_libraries(QodeAssistChatView
@@ -66,9 +32,6 @@ target_link_libraries(QodeAssistChatView
    QtCreator::Utils
    LLMCore
    QodeAssistSettings
-    Context
-    QodeAssistUIControlsplugin
-    QodeAssistLogger
 )

 target_include_directories(QodeAssistChatView
--- a/ChatView/ChatData.hpp
+++ b/ChatView/ChatData.hpp
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2025 Petr Mironychev
- *
- * This file is part of QodeAssist.
- *
- * QodeAssist is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QodeAssist is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QodeAssist. If not, see <https://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include <QObject>
-#include <QtQmlIntegration>
-
-namespace QodeAssist::Chat {
-Q_NAMESPACE
-QML_NAMED_ELEMENT(MessagePartType)
-
-enum class MessagePartType { Code, Text };
-Q_ENUM_NS(MessagePartType)
-
-} // namespace QodeAssist::Chat
--- a/ChatView/ChatModel.cpp
+++ b/ChatView/ChatModel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024-2025 Petr Mironychev
+ * Copyright (C) 2024 Petr Mironychev
 *
 * This file is part of QodeAssist.
 *
@@ -18,43 +18,24 @@
 */

 #include "ChatModel.hpp"
-#include <utils/aspects.h>
-#include <QDateTime>
-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QtCore/qjsonobject.h>
 #include <QtQml>
+#include <utils/aspects.h>

 #include "ChatAssistantSettings.hpp"
-#include "Logger.hpp"
-#include "context/ChangesManager.h"

 namespace QodeAssist::Chat {

 ChatModel::ChatModel(QObject *parent)
    : QAbstractListModel(parent)
+    , m_totalTokens(0)
 {
    auto &settings = Settings::chatAssistantSettings();

-    connect(
-        &settings.chatTokensThreshold,
-        &Utils::BaseAspect::changed,
-        this,
-        &ChatModel::tokensThresholdChanged);
-    
-    connect(&Context::ChangesManager::instance(),
-            &Context::ChangesManager::fileEditApplied,
+    connect(&settings.chatTokensThreshold,
+            &Utils::BaseAspect::changed,
            this,
-            &ChatModel::onFileEditApplied);
-    
-    connect(&Context::ChangesManager::instance(),
-            &Context::ChangesManager::fileEditRejected,
-            this,
-            &ChatModel::onFileEditRejected);
-    
-    connect(&Context::ChangesManager::instance(),
-            &Context::ChangesManager::fileEditArchived,
-            this,
-            &ChatModel::onFileEditArchived);
+            &ChatModel::tokensThresholdChanged);
 }

 int ChatModel::rowCount(const QModelIndex &parent) const
@@ -74,13 +55,6 @@ QVariant ChatModel::data(const QModelIndex &index, int role) const
    case Roles::Content: {
        return message.content;
    }
-    case Roles::Attachments: {
-        QStringList filenames;
-        for (const auto &attachment : message.attachments) {
-            filenames << attachment.filename;
-        }
-        return filenames;
-    }
    default:
        return QVariant();
    }
@@ -91,77 +65,29 @@ QHash<int, QByteArray> ChatModel::roleNames() const
    QHash<int, QByteArray> roles;
    roles[Roles::RoleType] = "roleType";
    roles[Roles::Content] = "content";
-    roles[Roles::Attachments] = "attachments";
    return roles;
 }

-void ChatModel::addMessage(
-    const QString &content,
-    ChatRole role,
-    const QString &id,
-    const QList<Context::ContentFile> &attachments)
+void ChatModel::addMessage(const QString &content, ChatRole role, const QString &id)
 {
-    QString fullContent = content;
-    if (!attachments.isEmpty()) {
-        fullContent += "\n\nAttached files list:";
-        for (const auto &attachment : attachments) {
-            fullContent += QString("\nname: %1\nfile content:\n%2")
-                               .arg(attachment.filename, attachment.content);
-        }
-    }
+    int tokenCount = estimateTokenCount(content);

-    if (!m_messages.isEmpty() && !id.isEmpty() && m_messages.last().id == id
-        && m_messages.last().role == role) {
+    if (!m_messages.isEmpty() && !id.isEmpty() && m_messages.last().id == id) {
        Message &lastMessage = m_messages.last();
+        int oldTokenCount = lastMessage.tokenCount;
        lastMessage.content = content;
-        lastMessage.attachments = attachments;
+        lastMessage.tokenCount = tokenCount;
+        m_totalTokens += (tokenCount - oldTokenCount);
        emit dataChanged(index(m_messages.size() - 1), index(m_messages.size() - 1));
    } else {
        beginInsertRows(QModelIndex(), m_messages.size(), m_messages.size());
-        Message newMessage{role, content, id};
-        newMessage.attachments = attachments;
-        m_messages.append(newMessage);
+        m_messages.append({role, content, tokenCount, id});
+        m_totalTokens += tokenCount;
        endInsertRows();
-        
-        if (m_loadingFromHistory && role == ChatRole::FileEdit) {
-            const QString marker = "QODEASSIST_FILE_EDIT:";
-            if (content.contains(marker)) {
-                int markerPos = content.indexOf(marker);
-                int jsonStart = markerPos + marker.length();
-                
-                if (jsonStart < content.length()) {
-                    QString jsonStr = content.mid(jsonStart);
-                    QJsonDocument doc = QJsonDocument::fromJson(jsonStr.toUtf8());
-                    
-                    if (doc.isObject()) {
-                        QJsonObject editData = doc.object();
-                        QString editId = editData.value("edit_id").toString();
-                        QString filePath = editData.value("file").toString();
-                        QString oldContent = editData.value("old_content").toString();
-                        QString newContent = editData.value("new_content").toString();
-                        QString originalStatus = editData.value("status").toString();
-                        
-                        if (!editId.isEmpty() && !filePath.isEmpty()) {
-                            Context::ChangesManager::instance().addFileEdit(
-                                editId, filePath, oldContent, newContent, false, true);
-                            
-                            editData["status"] = "archived";
-                            editData["status_message"] = "Loaded from chat history";
-                            
-                            QString updatedContent = marker 
-                                + QString::fromUtf8(QJsonDocument(editData).toJson(QJsonDocument::Compact));
-                            m_messages.last().content = updatedContent;
-                            
-                            emit dataChanged(index(m_messages.size() - 1), index(m_messages.size() - 1));
-                            
-                            LOG_MESSAGE(QString("Registered historical file edit: %1 (original status: %2, now: archived)")
-                                            .arg(editId, originalStatus));
-                        }
-                    }
-                }
-            }
-        }
    }
+
+    trim();
+    emit totalTokensChanged();
 }

 QVector<ChatModel::Message> ChatModel::getChatHistory() const
@@ -169,12 +95,32 @@ QVector<ChatModel::Message> ChatModel::getChatHistory() const
    return m_messages;
 }

+void ChatModel::trim()
+{
+    while (m_totalTokens > tokensThreshold()) {
+        if (!m_messages.isEmpty()) {
+            m_totalTokens -= m_messages.first().tokenCount;
+            beginRemoveRows(QModelIndex(), 0, 0);
+            m_messages.removeFirst();
+            endRemoveRows();
+        } else {
+            break;
+        }
+    }
+}
+
+int ChatModel::estimateTokenCount(const QString &text) const
+{
+    return text.length() / 4;
+}
+
 void ChatModel::clear()
 {
    beginResetModel();
    m_messages.clear();
+    m_totalTokens = 0;
    endResetModel();
-    emit modelReseted();
+    emit totalTokensChanged();
 }

 QList<MessagePart> ChatModel::processMessageContent(const QString &content) const
@@ -187,50 +133,19 @@ QList<MessagePart> ChatModel::processMessageContent(const QString &content) cons
    while (blockMatches.hasNext()) {
        auto match = blockMatches.next();
        if (match.capturedStart() > lastIndex) {
-            QString textBetween
-                = content.mid(lastIndex, match.capturedStart() - lastIndex).trimmed();
+            QString textBetween = content.mid(lastIndex, match.capturedStart() - lastIndex).trimmed();
            if (!textBetween.isEmpty()) {
-                MessagePart part;
-                part.type = MessagePartType::Text;
-                part.text = textBetween;
-                parts.append(part);
+                parts.append({MessagePart::Text, textBetween, ""});
            }
        }
-
-        MessagePart codePart;
-        codePart.type = MessagePartType::Code;
-        codePart.text = match.captured(2).trimmed();
-        codePart.language = match.captured(1);
-        parts.append(codePart);
-
+        parts.append({MessagePart::Code, match.captured(2).trimmed(), match.captured(1)});
        lastIndex = match.capturedEnd();
    }

    if (lastIndex < content.length()) {
        QString remainingText = content.mid(lastIndex).trimmed();
-
-        QRegularExpression unclosedBlockRegex("```(\\w*)\\n?([\\s\\S]*)$");
-        auto unclosedMatch = unclosedBlockRegex.match(remainingText);
-
-        if (unclosedMatch.hasMatch()) {
-            QString beforeCodeBlock = remainingText.left(unclosedMatch.capturedStart()).trimmed();
-            if (!beforeCodeBlock.isEmpty()) {
-                MessagePart part;
-                part.type = MessagePartType::Text;
-                part.text = beforeCodeBlock;
-                parts.append(part);
-            }
-
-            MessagePart codePart;
-            codePart.type = MessagePartType::Code;
-            codePart.text = unclosedMatch.captured(2).trimmed();
-            codePart.language = unclosedMatch.captured(1);
-            parts.append(codePart);
-        } else if (!remainingText.isEmpty()) {
-            MessagePart part;
-            part.type = MessagePartType::Text;
-            part.text = remainingText;
-            parts.append(part);
+        if (!remainingText.isEmpty()) {
+            parts.append({MessagePart::Text, remainingText, ""});
        }
    }

@@ -240,6 +155,7 @@ QList<MessagePart> ChatModel::processMessageContent(const QString &content) cons
 QJsonArray ChatModel::prepareMessagesForRequest(const QString &systemPrompt) const
 {
    QJsonArray messages;
+
    messages.append(QJsonObject{{"role", "system"}, {"content", systemPrompt}});

    for (const auto &message : m_messages) {
@@ -251,33 +167,20 @@ QJsonArray ChatModel::prepareMessagesForRequest(const QString &systemPrompt) con
        case ChatRole::Assistant:
            role = "assistant";
            break;
-        case ChatRole::Tool:
-        case ChatRole::FileEdit:
-            continue;
        default:
            continue;
        }
-
-        QString content
-            = message.attachments.isEmpty()
-                  ? message.content
-                  : message.content + "\n\nAttached files list:"
-                        + std::accumulate(
-                            message.attachments.begin(),
-                            message.attachments.end(),
-                            QString(),
-                            [](QString acc, const Context::ContentFile &attachment) {
-                                return acc
-                                       + QString("\nname: %1\nfile content:\n%2")
-                                             .arg(attachment.filename, attachment.content);
-                            });
-
-        messages.append(QJsonObject{{"role", role}, {"content", content}});
+        messages.append(QJsonObject{{"role", role}, {"content", message.content}});
    }

    return messages;
 }

+int ChatModel::totalTokens() const
+{
+    return m_totalTokens;
+}
+
 int ChatModel::tokensThreshold() const
 {
    auto &settings = Settings::chatAssistantSettings();
@@ -289,194 +192,4 @@ QString ChatModel::lastMessageId() const
    return !m_messages.isEmpty() ? m_messages.last().id : "";
 }

-void ChatModel::resetModelTo(int index)
-{
-    if (index < 0 || index >= m_messages.size())
-        return;
-
-    if (index < m_messages.size()) {
-        beginRemoveRows(QModelIndex(), index, m_messages.size() - 1);
-        m_messages.remove(index, m_messages.size() - index);
-        endRemoveRows();
-    }
-}
-
-void ChatModel::addToolExecutionStatus(
-    const QString &requestId, const QString &toolId, const QString &toolName)
-{
-    QString content = toolName;
-
-    LOG_MESSAGE(QString("Adding tool execution status: requestId=%1, toolId=%2, toolName=%3")
-                    .arg(requestId, toolId, toolName));
-
-    if (!m_messages.isEmpty() && !toolId.isEmpty() && m_messages.last().id == toolId
-        && m_messages.last().role == ChatRole::Tool) {
-        Message &lastMessage = m_messages.last();
-        lastMessage.content = content;
-        LOG_MESSAGE(QString("Updated existing tool message at index %1").arg(m_messages.size() - 1));
-        emit dataChanged(index(m_messages.size() - 1), index(m_messages.size() - 1));
-    } else {
-        beginInsertRows(QModelIndex(), m_messages.size(), m_messages.size());
-        Message newMessage{ChatRole::Tool, content, toolId};
-        m_messages.append(newMessage);
-        endInsertRows();
-        LOG_MESSAGE(QString("Created new tool message at index %1 with toolId=%2")
-                        .arg(m_messages.size() - 1)
-                        .arg(toolId));
-    }
-}
-
-void ChatModel::updateToolResult(
-    const QString &requestId, const QString &toolId, const QString &toolName, const QString &result)
-{
-    if (m_messages.isEmpty() || toolId.isEmpty()) {
-        LOG_MESSAGE(QString("Cannot update tool result: messages empty=%1, toolId empty=%2")
-                        .arg(m_messages.isEmpty())
-                        .arg(toolId.isEmpty()));
-        return;
-    }
-
-    LOG_MESSAGE(
-        QString("Updating tool result: requestId=%1, toolId=%2, toolName=%3, result length=%4")
-            .arg(requestId, toolId, toolName)
-            .arg(result.length()));
-
-    bool toolMessageFound = false;
-    for (int i = m_messages.size() - 1; i >= 0; --i) {
-        if (m_messages[i].id == toolId && m_messages[i].role == ChatRole::Tool) {
-            m_messages[i].content = toolName + "\n" + result;
-            emit dataChanged(index(i), index(i));
-            toolMessageFound = true;
-            LOG_MESSAGE(QString("Updated tool result at index %1").arg(i));
-            break;
-        }
-    }
-
-    if (!toolMessageFound) {
-        LOG_MESSAGE(QString("WARNING: Tool message with requestId=%1 toolId=%2 not found!")
-                        .arg(requestId, toolId));
-    }
-
-    const QString marker = "QODEASSIST_FILE_EDIT:";
-    if (result.contains(marker)) {
-        LOG_MESSAGE(QString("File edit marker detected in tool result"));
-
-        int markerPos = result.indexOf(marker);
-        int jsonStart = markerPos + marker.length();
-
-        if (jsonStart < result.length()) {
-            QString jsonStr = result.mid(jsonStart);
-
-            QJsonParseError parseError;
-            QJsonDocument doc = QJsonDocument::fromJson(jsonStr.toUtf8(), &parseError);
-
-            if (parseError.error != QJsonParseError::NoError) {
-                LOG_MESSAGE(QString("ERROR: Failed to parse file edit JSON at offset %1: %2")
-                                .arg(parseError.offset)
-                                .arg(parseError.errorString()));
-            } else if (!doc.isObject()) {
-                LOG_MESSAGE(
-                    QString("ERROR: Parsed JSON is not an object, is array=%1").arg(doc.isArray()));
-            } else {
-                QJsonObject editData = doc.object();
-                
-                QString editId = editData.value("edit_id").toString();
-                
-                if (editId.isEmpty()) {
-                    editId = QString("edit_%1").arg(QDateTime::currentMSecsSinceEpoch());
-                }
-
-                LOG_MESSAGE(QString("Adding FileEdit message, editId=%1").arg(editId));
-
-                beginInsertRows(QModelIndex(), m_messages.size(), m_messages.size());
-                Message fileEditMsg;
-                fileEditMsg.role = ChatRole::FileEdit;
-                fileEditMsg.content = result;
-                fileEditMsg.id = editId;
-                m_messages.append(fileEditMsg);
-                endInsertRows();
-
-                LOG_MESSAGE(QString("Added FileEdit message with editId=%1").arg(editId));
-            }
-        }
-    }
-}
-
-void ChatModel::updateMessageContent(const QString &messageId, const QString &newContent)
-{
-    for (int i = 0; i < m_messages.size(); ++i) {
-        if (m_messages[i].id == messageId) {
-            m_messages[i].content = newContent;
-            emit dataChanged(index(i), index(i));
-            LOG_MESSAGE(QString("Updated message content for id: %1").arg(messageId));
-            break;
-        }
-    }
-}
-
-void ChatModel::setLoadingFromHistory(bool loading)
-{
-    m_loadingFromHistory = loading;
-    LOG_MESSAGE(QString("ChatModel loading from history: %1").arg(loading ? "true" : "false"));
-}
-
-bool ChatModel::isLoadingFromHistory() const
-{
-    return m_loadingFromHistory;
-}
-
-void ChatModel::onFileEditApplied(const QString &editId)
-{
-    updateFileEditStatus(editId, "applied", "Successfully applied");
-}
-
-void ChatModel::onFileEditRejected(const QString &editId)
-{
-    updateFileEditStatus(editId, "rejected", "Rejected by user");
-}
-
-void ChatModel::onFileEditArchived(const QString &editId)
-{
-    updateFileEditStatus(editId, "archived", "Archived (from previous conversation turn)");
-}
-
-void ChatModel::updateFileEditStatus(const QString &editId, const QString &status, const QString &statusMessage)
-{
-    const QString marker = "QODEASSIST_FILE_EDIT:";
-    
-    for (int i = 0; i < m_messages.size(); ++i) {
-        if (m_messages[i].role == ChatRole::FileEdit && m_messages[i].id == editId) {
-            const QString &content = m_messages[i].content;
-            
-            if (content.contains(marker)) {
-                int markerPos = content.indexOf(marker);
-                int jsonStart = markerPos + marker.length();
-                
-                if (jsonStart < content.length()) {
-                    QString jsonStr = content.mid(jsonStart);
-                    QJsonDocument doc = QJsonDocument::fromJson(jsonStr.toUtf8());
-                    
-                    if (doc.isObject()) {
-                        QJsonObject editData = doc.object();
-                        
-                        editData["status"] = status;
-                        editData["status_message"] = statusMessage;
-                        
-                        QString updatedContent = marker 
-                            + QString::fromUtf8(QJsonDocument(editData).toJson(QJsonDocument::Compact));
-                        
-                        m_messages[i].content = updatedContent;
-                        
-                        emit dataChanged(index(i), index(i));
-                        
-                        LOG_MESSAGE(QString("Updated FileEdit message status: editId=%1, status=%2")
-                                        .arg(editId, status));
-                        break;
-                    }
-                }
-            }
-        }
-    }
-}
-
 } // namespace QodeAssist::Chat
--- a/ChatView/ChatModel.hpp
+++ b/ChatView/ChatModel.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024-2025 Petr Mironychev
+ * Copyright (C) 2024 Petr Mironychev
 *
 * This file is part of QodeAssist.
 *
@@ -26,30 +26,27 @@
 #include <QJsonArray>
 #include <QtQmlIntegration>

-#include "context/ContentFile.hpp"
-
 namespace QodeAssist::Chat {

 class ChatModel : public QAbstractListModel
 {
    Q_OBJECT
+    Q_PROPERTY(int totalTokens READ totalTokens NOTIFY totalTokensChanged FINAL)
    Q_PROPERTY(int tokensThreshold READ tokensThreshold NOTIFY tokensThresholdChanged FINAL)
    QML_ELEMENT

 public:
-    enum ChatRole { System, User, Assistant, Tool, FileEdit };
-    Q_ENUM(ChatRole)
+    enum Roles { RoleType = Qt::UserRole, Content };

-    enum Roles { RoleType = Qt::UserRole, Content, Attachments };
-    Q_ENUM(Roles)
+    enum ChatRole { System, User, Assistant };
+    Q_ENUM(ChatRole)

    struct Message
    {
        ChatRole role;
        QString content;
+        int tokenCount;
        QString id;
-
-        QList<Context::ContentFile> attachments;
    };

    explicit ChatModel(QObject *parent = nullptr);
@@ -58,50 +55,29 @@ public:
    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
    QHash<int, QByteArray> roleNames() const override;

-    Q_INVOKABLE void addMessage(
-        const QString &content,
-        ChatRole role,
-        const QString &id,
-        const QList<Context::ContentFile> &attachments = {});
+    Q_INVOKABLE void addMessage(const QString &content, ChatRole role, const QString &id);
    Q_INVOKABLE void clear();
    Q_INVOKABLE QList<MessagePart> processMessageContent(const QString &content) const;

    QVector<Message> getChatHistory() const;
    QJsonArray prepareMessagesForRequest(const QString &systemPrompt) const;

+    int totalTokens() const;
    int tokensThreshold() const;

    QString currentModel() const;
    QString lastMessageId() const;

-    Q_INVOKABLE void resetModelTo(int index);
-
-    void addToolExecutionStatus(
-        const QString &requestId, const QString &toolId, const QString &toolName);
-    void updateToolResult(
-        const QString &requestId,
-        const QString &toolId,
-        const QString &toolName,
-        const QString &result);
-    void updateMessageContent(const QString &messageId, const QString &newContent);
-    
-    void setLoadingFromHistory(bool loading);
-    bool isLoadingFromHistory() const;
-
 signals:
+    void totalTokensChanged();
    void tokensThresholdChanged();
-    void modelReseted();
-
-private slots:
-    void onFileEditApplied(const QString &editId);
-    void onFileEditRejected(const QString &editId);
-    void onFileEditArchived(const QString &editId);

 private:
-    void updateFileEditStatus(const QString &editId, const QString &status, const QString &statusMessage);
-    
+    void trim();
+    int estimateTokenCount(const QString &text) const;
+
    QVector<Message> m_messages;
-    bool m_loadingFromHistory = false;
+    int m_totalTokens = 0;
 };

 } // namespace QodeAssist::Chat
--- a/ChatView/ChatRootView.cpp
+++ b/ChatView/ChatRootView.cpp
--- a/ChatView/ChatRootView.hpp
+++ b/ChatView/ChatRootView.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024-2025 Petr Mironychev
+ * Copyright (C) 2024 Petr Mironychev
 *
 * This file is part of QodeAssist.
 *
@@ -23,40 +23,24 @@

 #include "ChatModel.hpp"
 #include "ClientInterface.hpp"
-#include "llmcore/PromptProviderChat.hpp"
-#include <coreplugin/editormanager/editormanager.h>

 namespace QodeAssist::Chat {

 class ChatRootView : public QQuickItem
 {
    Q_OBJECT
+    // Possibly Qt bug: QTBUG-131004
+    // The class type name must be fully qualified
+    // including the namespace.
+    // Otherwise qmlls can't find it.
    Q_PROPERTY(QodeAssist::Chat::ChatModel *chatModel READ chatModel NOTIFY chatModelChanged FINAL)
    Q_PROPERTY(QString currentTemplate READ currentTemplate NOTIFY currentTemplateChanged FINAL)
-    Q_PROPERTY(bool isSyncOpenFiles READ isSyncOpenFiles NOTIFY isSyncOpenFilesChanged FINAL)
-    Q_PROPERTY(QStringList attachmentFiles READ attachmentFiles NOTIFY attachmentFilesChanged FINAL)
-    Q_PROPERTY(QStringList linkedFiles READ linkedFiles NOTIFY linkedFilesChanged FINAL)
-    Q_PROPERTY(int inputTokensCount READ inputTokensCount NOTIFY inputTokensCountChanged FINAL)
-    Q_PROPERTY(QString chatFileName READ chatFileName NOTIFY chatFileNameChanged FINAL)
-    Q_PROPERTY(QString textFontFamily READ textFontFamily NOTIFY textFamilyChanged FINAL)
-    Q_PROPERTY(QString codeFontFamily READ codeFontFamily NOTIFY codeFamilyChanged FINAL)
-    Q_PROPERTY(int codeFontSize READ codeFontSize NOTIFY codeFontSizeChanged FINAL)
-    Q_PROPERTY(int textFontSize READ textFontSize NOTIFY textFontSizeChanged FINAL)
-    Q_PROPERTY(int textFormat READ textFormat NOTIFY textFormatChanged FINAL)
-    Q_PROPERTY(bool isRequestInProgress READ isRequestInProgress NOTIFY isRequestInProgressChanged FINAL)
-    Q_PROPERTY(QString lastErrorMessage READ lastErrorMessage NOTIFY lastErrorMessageChanged FINAL)
-    Q_PROPERTY(QString lastInfoMessage READ lastInfoMessage NOTIFY lastInfoMessageChanged FINAL)
-    Q_PROPERTY(QVariantList activeRules READ activeRules NOTIFY activeRulesChanged FINAL)
-    Q_PROPERTY(int activeRulesCount READ activeRulesCount NOTIFY activeRulesCountChanged FINAL)
-    Q_PROPERTY(bool isAgentMode READ isAgentMode WRITE setIsAgentMode NOTIFY isAgentModeChanged FINAL)
-    Q_PROPERTY(
-        bool toolsSupportEnabled READ toolsSupportEnabled NOTIFY toolsSupportEnabledChanged FINAL)
-    
-    Q_PROPERTY(int currentMessageTotalEdits READ currentMessageTotalEdits NOTIFY currentMessageEditsStatsChanged FINAL)
-    Q_PROPERTY(int currentMessageAppliedEdits READ currentMessageAppliedEdits NOTIFY currentMessageEditsStatsChanged FINAL)
-    Q_PROPERTY(int currentMessagePendingEdits READ currentMessagePendingEdits NOTIFY currentMessageEditsStatsChanged FINAL)
-    Q_PROPERTY(int currentMessageRejectedEdits READ currentMessageRejectedEdits NOTIFY currentMessageEditsStatsChanged FINAL)
-
+    Q_PROPERTY(QColor backgroundColor READ backgroundColor CONSTANT FINAL)
+    Q_PROPERTY(QColor primaryColor READ primaryColor CONSTANT FINAL)
+    Q_PROPERTY(QColor secondaryColor READ secondaryColor CONSTANT FINAL)
+    Q_PROPERTY(QColor codeColor READ codeColor CONSTANT FINAL)
+    Q_PROPERTY(bool isSharingCurrentFile READ isSharingCurrentFile NOTIFY
+                   isSharingCurrentFileChanged FINAL)
    QML_ELEMENT

 public:
@@ -65,137 +49,38 @@ public:
    ChatModel *chatModel() const;
    QString currentTemplate() const;

-    void saveHistory(const QString &filePath);
-    void loadHistory(const QString &filePath);
+    QColor backgroundColor() const;
+    QColor primaryColor() const;
+    QColor secondaryColor() const;

-    Q_INVOKABLE void showSaveDialog();
-    Q_INVOKABLE void showLoadDialog();
+    QColor codeColor() const;

-    void autosave();
-    QString getAutosaveFilePath() const;
-
-    QStringList attachmentFiles() const;
-    QStringList linkedFiles() const;
-
-    Q_INVOKABLE void showAttachFilesDialog();
-    Q_INVOKABLE void removeFileFromAttachList(int index);
-    Q_INVOKABLE void showLinkFilesDialog();
-    Q_INVOKABLE void removeFileFromLinkList(int index);
-    Q_INVOKABLE void calculateMessageTokensCount(const QString &message);
-    Q_INVOKABLE void setIsSyncOpenFiles(bool state);
-    Q_INVOKABLE void openChatHistoryFolder();
-    Q_INVOKABLE void openRulesFolder();
-
-    Q_INVOKABLE void updateInputTokensCount();
-    int inputTokensCount() const;
-
-    bool isSyncOpenFiles() const;
-
-    void onEditorAboutToClose(Core::IEditor *editor);
-    void onAppendLinkFileFromEditor(Core::IEditor *editor);
-    void onEditorCreated(Core::IEditor *editor, const Utils::FilePath &filePath);
-
-    QString chatFileName() const;
-    void setRecentFilePath(const QString &filePath);
-    bool shouldIgnoreFileForAttach(const Utils::FilePath &filePath);
-
-    QString textFontFamily() const;
-    QString codeFontFamily() const;
-
-    int codeFontSize() const;
-    int textFontSize() const;
-    int textFormat() const;
-
-    bool isRequestInProgress() const;
-    void setRequestProgressStatus(bool state);
-
-    QString lastErrorMessage() const;
-    
-    QVariantList activeRules() const;
-    int activeRulesCount() const;
-    Q_INVOKABLE QString getRuleContent(int index);
-    Q_INVOKABLE void refreshRules();
-
-    bool isAgentMode() const;
-    void setIsAgentMode(bool newIsAgentMode);
-    bool toolsSupportEnabled() const;
-
-    Q_INVOKABLE void applyFileEdit(const QString &editId);
-    Q_INVOKABLE void rejectFileEdit(const QString &editId);
-    Q_INVOKABLE void undoFileEdit(const QString &editId);
-    Q_INVOKABLE void openFileEditInEditor(const QString &editId);
-    
-    // Mass file edit operations for current message
-    Q_INVOKABLE void applyAllFileEditsForCurrentMessage();
-    Q_INVOKABLE void undoAllFileEditsForCurrentMessage();
-    Q_INVOKABLE void updateCurrentMessageEditsStats();
-    
-    int currentMessageTotalEdits() const;
-    int currentMessageAppliedEdits() const;
-    int currentMessagePendingEdits() const;
-    int currentMessageRejectedEdits() const;
-
-    QString lastInfoMessage() const;
+    bool isSharingCurrentFile() const;

 public slots:
-    void sendMessage(const QString &message);
+    void sendMessage(const QString &message, bool sharingCurrentFile = false) const;
    void copyToClipboard(const QString &text);
    void cancelRequest();
-    void clearAttachmentFiles();
-    void clearLinkedFiles();

 signals:
    void chatModelChanged();
    void currentTemplateChanged();
-    void attachmentFilesChanged();
-    void linkedFilesChanged();
-    void inputTokensCountChanged();
-    void isSyncOpenFilesChanged();
-    void chatFileNameChanged();
-    void textFamilyChanged();
-    void codeFamilyChanged();
-    void codeFontSizeChanged();
-    void textFontSizeChanged();
-    void textFormatChanged();
-    void chatRequestStarted();
-    void isRequestInProgressChanged();

-    void lastErrorMessageChanged();
-    void lastInfoMessageChanged();
-    void activeRulesChanged();
-    void activeRulesCountChanged();
-
-    void isAgentModeChanged();
-    void toolsSupportEnabledChanged();
-    void currentMessageEditsStatsChanged();
+    void isSharingCurrentFileChanged();

 private:
-    void updateFileEditStatus(const QString &editId, const QString &status);
-    QString getChatsHistoryDir() const;
-    QString getSuggestedFileName() const;
+    void generateColors();
+    QColor generateColor(const QColor &baseColor,
+                         float hueShift,
+                         float saturationMod,
+                         float lightnessMod);

    ChatModel *m_chatModel;
-    LLMCore::PromptProviderChat m_promptProvider;
    ClientInterface *m_clientInterface;
    QString m_currentTemplate;
-    QString m_recentFilePath;
-    QStringList m_attachmentFiles;
-    QStringList m_linkedFiles;
-    int m_messageTokensCount{0};
-    int m_inputTokensCount{0};
-    bool m_isSyncOpenFiles;
-    QList<Core::IEditor *> m_currentEditors;
-    bool m_isRequestInProgress;
-    QString m_lastErrorMessage;
-    QVariantList m_activeRules;
-    bool m_isAgentMode;
-    
-    QString m_currentMessageRequestId;
-    int m_currentMessageTotalEdits{0};
-    int m_currentMessageAppliedEdits{0};
-    int m_currentMessagePendingEdits{0};
-    int m_currentMessageRejectedEdits{0};
-    QString m_lastInfoMessage;
+    QColor m_primaryColor;
+    QColor m_secondaryColor;
+    QColor m_codeColor;
 };

 } // namespace QodeAssist::Chat
--- a/ChatView/ChatSerializer.cpp
+++ b/ChatView/ChatSerializer.cpp
@@ -1,147 +0,0 @@
-/* 
- * Copyright (C) 2024-2025 Petr Mironychev
- *
- * This file is part of QodeAssist.
- *
- * QodeAssist is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QodeAssist is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QodeAssist. If not, see <https://www.gnu.org/licenses/>.
- */
-
-#include "ChatSerializer.hpp"
-#include "Logger.hpp"
-
-#include <QDir>
-#include <QFile>
-#include <QFileInfo>
-#include <QJsonDocument>
-
-namespace QodeAssist::Chat {
-
-const QString ChatSerializer::VERSION = "0.1";
-
-SerializationResult ChatSerializer::saveToFile(const ChatModel *model, const QString &filePath)
-{
-    if (!ensureDirectoryExists(filePath)) {
-        return {false, "Failed to create directory structure"};
-    }
-
-    QFile file(filePath);
-    if (!file.open(QIODevice::WriteOnly)) {
-        return {false, QString("Failed to open file for writing: %1").arg(filePath)};
-    }
-
-    QJsonObject root = serializeChat(model);
-    QJsonDocument doc(root);
-
-    if (file.write(doc.toJson(QJsonDocument::Indented)) == -1) {
-        return {false, QString("Failed to write to file: %1").arg(file.errorString())};
-    }
-
-    return {true, QString()};
-}
-
-SerializationResult ChatSerializer::loadFromFile(ChatModel *model, const QString &filePath)
-{
-    QFile file(filePath);
-    if (!file.open(QIODevice::ReadOnly)) {
-        return {false, QString("Failed to open file for reading: %1").arg(filePath)};
-    }
-
-    QJsonParseError error;
-    QJsonDocument doc = QJsonDocument::fromJson(file.readAll(), &error);
-    if (error.error != QJsonParseError::NoError) {
-        return {false, QString("JSON parse error: %1").arg(error.errorString())};
-    }
-
-    QJsonObject root = doc.object();
-    QString version = root["version"].toString();
-
-    if (!validateVersion(version)) {
-        return {false, QString("Unsupported version: %1").arg(version)};
-    }
-
-    if (!deserializeChat(model, root)) {
-        return {false, "Failed to deserialize chat data"};
-    }
-
-    return {true, QString()};
-}
-
-QJsonObject ChatSerializer::serializeMessage(const ChatModel::Message &message)
-{
-    QJsonObject messageObj;
-    messageObj["role"] = static_cast<int>(message.role);
-    messageObj["content"] = message.content;
-    messageObj["id"] = message.id;
-    return messageObj;
-}
-
-ChatModel::Message ChatSerializer::deserializeMessage(const QJsonObject &json)
-{
-    ChatModel::Message message;
-    message.role = static_cast<ChatModel::ChatRole>(json["role"].toInt());
-    message.content = json["content"].toString();
-    message.id = json["id"].toString();
-    return message;
-}
-
-QJsonObject ChatSerializer::serializeChat(const ChatModel *model)
-{
-    QJsonArray messagesArray;
-    for (const auto &message : model->getChatHistory()) {
-        messagesArray.append(serializeMessage(message));
-    }
-
-    QJsonObject root;
-    root["version"] = VERSION;
-    root["messages"] = messagesArray;
-
-    return root;
-}
-
-bool ChatSerializer::deserializeChat(ChatModel *model, const QJsonObject &json)
-{
-    QJsonArray messagesArray = json["messages"].toArray();
-    QVector<ChatModel::Message> messages;
-    messages.reserve(messagesArray.size());
-
-    for (const auto &messageValue : messagesArray) {
-        messages.append(deserializeMessage(messageValue.toObject()));
-    }
-
-    model->clear();
-    
-    model->setLoadingFromHistory(true);
-    
-    for (const auto &message : messages) {
-        model->addMessage(message.content, message.role, message.id);
-    }
-    
-    model->setLoadingFromHistory(false);
-
-    return true;
-}
-
-bool ChatSerializer::ensureDirectoryExists(const QString &filePath)
-{
-    QFileInfo fileInfo(filePath);
-    QDir dir = fileInfo.dir();
-    return dir.exists() || dir.mkpath(".");
-}
-
-bool ChatSerializer::validateVersion(const QString &version)
-{
-    return version == VERSION;
-}
-
-} // namespace QodeAssist::Chat
--- a/ChatView/ChatSerializer.hpp
+++ b/ChatView/ChatSerializer.hpp
@@ -1,56 +0,0 @@
-/* 
- * Copyright (C) 2024-2025 Petr Mironychev
- *
- * This file is part of QodeAssist.
- *
- * QodeAssist is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QodeAssist is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QodeAssist. If not, see <https://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include <QJsonArray>
-#include <QJsonObject>
-#include <QString>
-
-#include "ChatModel.hpp"
-
-namespace QodeAssist::Chat {
-
-struct SerializationResult
-{
-    bool success{false};
-    QString errorMessage;
-};
-
-class ChatSerializer
-{
-public:
-    static SerializationResult saveToFile(const ChatModel *model, const QString &filePath);
-    static SerializationResult loadFromFile(ChatModel *model, const QString &filePath);
-
-    // Public for testing purposes
-    static QJsonObject serializeMessage(const ChatModel::Message &message);
-    static ChatModel::Message deserializeMessage(const QJsonObject &json);
-    static QJsonObject serializeChat(const ChatModel *model);
-    static bool deserializeChat(ChatModel *model, const QJsonObject &json);
-
-private:
-    static const QString VERSION;
-    static constexpr int CURRENT_VERSION = 1;
-
-    static bool ensureDirectoryExists(const QString &filePath);
-    static bool validateVersion(const QString &version);
-};
-
-} // namespace QodeAssist::Chat
--- a/ChatView/ChatUtils.cpp
+++ b/ChatView/ChatUtils.cpp
@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2024-2025 Petr Mironychev
+ * Copyright (C) 2024 Petr Mironychev
 *
 * This file is part of QodeAssist.
 *
@@ -29,40 +29,4 @@ void ChatUtils::copyToClipboard(const QString &text)
    QGuiApplication::clipboard()->setText(text);
 }

-QString ChatUtils::getSafeMarkdownText(const QString &text) const
-{
-    if (text.isEmpty()) {
-        return text;
-    }
-
-    bool needsSanitization = false;
-    for (const QChar &ch : text) {
-        if (ch.isNull() || (!ch.isPrint() && ch != '\n' && ch != '\t' && ch != '\r' && ch != ' ')) {
-            needsSanitization = true;
-            break;
-        }
-    }
-
-    if (!needsSanitization) {
-        return text;
-    }
-
-    QString safeText;
-    safeText.reserve(text.size());
-
-    for (QChar ch : text) {
-        if (ch.isNull()) {
-            safeText.append(' ');
-        } else if (ch == '\n' || ch == '\t' || ch == '\r' || ch == ' ') {
-            safeText.append(ch);
-        } else if (ch.isPrint()) {
-            safeText.append(ch);
-        } else {
-            safeText.append(QChar(0xFFFD));
-        }
-    }
-
-    return safeText;
-}
-
 } // namespace QodeAssist::Chat
--- a/ChatView/ChatUtils.h
+++ b/ChatView/ChatUtils.h
@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2024-2025 Petr Mironychev
+ * Copyright (C) 2024 Petr Mironychev
 *
 * This file is part of QodeAssist.
 *
@@ -23,6 +23,7 @@
 #include <qqmlintegration.h>

 namespace QodeAssist::Chat {
+// Q_NAMESPACE

 class ChatUtils : public QObject
 {
@@ -34,7 +35,6 @@ public:
        : QObject(parent) {};

    Q_INVOKABLE void copyToClipboard(const QString &text);
-    Q_INVOKABLE QString getSafeMarkdownText(const QString &text) const;
 };

 } // namespace QodeAssist::Chat
--- a/ChatView/ChatView.cpp
+++ b/ChatView/ChatView.cpp
@@ -1,106 +0,0 @@
-/*
- * Copyright (C) 2024-2025 Petr Mironychev
- *
- * This file is part of QodeAssist.
- *
- * QodeAssist is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QodeAssist is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QodeAssist. If not, see <https://www.gnu.org/licenses/>.
- */
-
-#include "ChatView.hpp"
-
-#include <QQmlContext>
-#include <QQmlEngine>
-#include <QSettings>
-#include <QVariantMap>
-
-#include <coreplugin/actionmanager/actionmanager.h>
-#include <logger/Logger.hpp>
-
-namespace {
-constexpr Qt::WindowFlags baseFlags = Qt::Window | Qt::WindowTitleHint | Qt::WindowSystemMenuHint
-                                      | Qt::WindowMinimizeButtonHint | Qt::WindowMaximizeButtonHint
-                                      | Qt::WindowCloseButtonHint;
-}
-
-namespace QodeAssist::Chat {
-
-ChatView::ChatView()
-    : m_isPin(false)
-{
-    setTitle("QodeAssist Chat");
-    engine()->rootContext()->setContextProperty("_chatview", this);
-    setSource(QUrl("qrc:/qt/qml/ChatView/qml/RootItem.qml"));
-    setResizeMode(QQuickView::SizeRootObjectToView);
-    setMinimumSize({400, 300});
-    setFlags(baseFlags);
-
-    if (auto action = Core::ActionManager::command("QodeAssist.CloseChatView")) {
-        m_closeShortcut = new QShortcut(action->keySequence(), this);
-        connect(m_closeShortcut, &QShortcut::activated, this, &QQuickView::close);
-
-        connect(action, &Core::Command::keySequenceChanged, this, [action, this]() {
-            if (m_closeShortcut) {
-                m_closeShortcut->setKey(action->keySequence());
-            }
-        });
-    }
-
-    restoreSettings();
-}
-
-void ChatView::closeEvent(QCloseEvent *event)
-{
-    saveSettings();
-    event->accept();
-}
-
-void ChatView::saveSettings()
-{
-    QSettings settings;
-    settings.setValue("QodeAssist/ChatView/geometry", geometry());
-    settings.setValue("QodeAssist/ChatView/pinned", m_isPin);
-}
-
-void ChatView::restoreSettings()
-{
-    QSettings settings;
-    const QRect savedGeometry
-        = settings.value("QodeAssist/ChatView/geometry", QRect(100, 100, 800, 600)).toRect();
-    setGeometry(savedGeometry);
-
-    const bool pinned = settings.value("QodeAssist/ChatView/pinned", false).toBool();
-    setIsPin(pinned);
-}
-
-bool ChatView::isPin() const
-{
-    return m_isPin;
-}
-
-void ChatView::setIsPin(bool newIsPin)
-{
-    if (m_isPin == newIsPin)
-        return;
-    m_isPin = newIsPin;
-
-    if (m_isPin) {
-        setFlags(baseFlags | Qt::WindowStaysOnTopHint);
-    } else {
-        setFlags(baseFlags);
-    }
-
-    emit isPinChanged();
-}
-
-} // namespace QodeAssist::Chat
--- a/ChatView/ChatView.hpp
+++ b/ChatView/ChatView.hpp
@@ -1,51 +0,0 @@
-/*
- * Copyright (C) 2024-2025 Petr Mironychev
- *
- * This file is part of QodeAssist.
- *
- * QodeAssist is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QodeAssist is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QodeAssist. If not, see <https://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include <QQuickView>
-#include <QShortcut>
-
-namespace QodeAssist::Chat {
-
-class ChatView : public QQuickView
-{
-    Q_OBJECT
-    Q_PROPERTY(bool isPin READ isPin WRITE setIsPin NOTIFY isPinChanged FINAL)
-public:
-    ChatView();
-
-    bool isPin() const;
-    void setIsPin(bool newIsPin);
-
-signals:
-    void isPinChanged();
-
-protected:
-    void closeEvent(QCloseEvent *event) override;
-
-private:
-    void saveSettings();
-    void restoreSettings();
-
-    bool m_isPin;
-    QShortcut *m_closeShortcut;
-};
-
-} // namespace QodeAssist::Chat
--- a/ChatView/ChatWidget.cpp
+++ b/ChatView/ChatWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024-2025 Petr Mironychev
+ * Copyright (C) 2024 Petr Mironychev
 *
 * This file is part of QodeAssist.
 *
@@ -40,4 +40,4 @@ void ChatWidget::scrollToBottom()
 {
    QMetaObject::invokeMethod(rootObject(), "scrollToBottom");
 }
-} // namespace QodeAssist::Chat
+}
--- a/ChatView/ChatWidget.hpp
+++ b/ChatView/ChatWidget.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024-2025 Petr Mironychev
+ * Copyright (C) 2024 Petr Mironychev
 *
 * This file is part of QodeAssist.
 *
@@ -38,4 +38,4 @@ signals:
    void clearPressed();
 };

-} // namespace QodeAssist::Chat
+}
--- a/ChatView/ClientInterface.cpp
+++ b/ChatView/ClientInterface.cpp
@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2024-2025 Petr Mironychev
+ * Copyright (C) 2024 Petr Mironychev
 *
 * This file is part of QodeAssist.
 *
@@ -19,59 +19,56 @@

 #include "ClientInterface.hpp"

-#include <texteditor/textdocument.h>
 #include <QFileInfo>
 #include <QJsonArray>
 #include <QJsonDocument>
 #include <QUuid>
+#include <texteditor/textdocument.h>

 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/editormanager/ieditor.h>
 #include <coreplugin/idocument.h>
-#include <projectexplorer/project.h>
-#include <projectexplorer/projectexplorer.h>
-#include <projectexplorer/projectmanager.h>

 #include <texteditor/textdocument.h>
 #include <texteditor/texteditor.h>

 #include "ChatAssistantSettings.hpp"
 #include "GeneralSettings.hpp"
-#include "ToolsSettings.hpp"
 #include "Logger.hpp"
+#include "PromptTemplateManager.hpp"
 #include "ProvidersManager.hpp"
-#include "RequestConfig.hpp"
-#include <context/ChangesManager.h>
-#include <RulesLoader.hpp>

 namespace QodeAssist::Chat {

-ClientInterface::ClientInterface(
-    ChatModel *chatModel, LLMCore::IPromptProvider *promptProvider, QObject *parent)
+ClientInterface::ClientInterface(ChatModel *chatModel, QObject *parent)
    : QObject(parent)
+    , m_requestHandler(new LLMCore::RequestHandler(this))
    , m_chatModel(chatModel)
-    , m_promptProvider(promptProvider)
-    , m_contextManager(new Context::ContextManager(this))
-{}
-
-ClientInterface::~ClientInterface()
 {
-    cancelRequest();
+    connect(m_requestHandler,
+            &LLMCore::RequestHandler::completionReceived,
+            this,
+            [this](const QString &completion, const QJsonObject &request, bool isComplete) {
+                handleLLMResponse(completion, request, isComplete);
+            });
+
+    connect(m_requestHandler,
+            &LLMCore::RequestHandler::requestFinished,
+            this,
+            [this](const QString &, bool success, const QString &errorString) {
+                if (!success) {
+                    emit errorOccurred(errorString);
+                }
+            });
 }

-void ClientInterface::sendMessage(
-    const QString &message,
-    const QList<QString> &attachments,
-    const QList<QString> &linkedFiles,
-    bool useAgentMode)
+ClientInterface::~ClientInterface() = default;
+
+void ClientInterface::sendMessage(const QString &message, bool includeCurrentFile)
 {
    cancelRequest();
-    m_accumulatedResponses.clear();
-    
-    Context::ChangesManager::instance().archiveAllNonArchivedEdits();

-    auto attachFiles = m_contextManager->getContentFiles(attachments);
-    m_chatModel->addMessage(message, ChatModel::ChatRole::User, "", attachFiles);
+    m_chatModel->addMessage(message, ChatModel::ChatRole::User, "");

    auto &chatAssistantSettings = Settings::chatAssistantSettings();

@@ -84,7 +81,8 @@ void ClientInterface::sendMessage(
    }

    auto templateName = Settings::generalSettings().caTemplate();
-    auto promptTemplate = m_promptProvider->getTemplateByName(templateName);
+    auto promptTemplate = LLMCore::PromptTemplateManager::instance().getChatTemplateByName(
+        templateName);

    if (!promptTemplate) {
        LOG_MESSAGE(QString("No template found with name: %1").arg(templateName));
@@ -92,105 +90,48 @@ void ClientInterface::sendMessage(
    }

    LLMCore::ContextData context;
+    context.prefix = message;
+    context.suffix = "";

-    const bool isToolsEnabled = Settings::toolsSettings().useTools() && useAgentMode;
+    QString systemPrompt;
+    if (chatAssistantSettings.useSystemPrompt())
+        systemPrompt = chatAssistantSettings.systemPrompt();

-    if (chatAssistantSettings.useSystemPrompt()) {
-        QString systemPrompt = chatAssistantSettings.systemPrompt();
-
-        auto project = LLMCore::RulesLoader::getActiveProject();
-        if (project) {
-            QString projectRules
-                = LLMCore::RulesLoader::loadRulesForProject(project, LLMCore::RulesContext::Chat);
-
-            if (!projectRules.isEmpty()) {
-                systemPrompt += "\n# Project Rules\n\n" + projectRules;
-            }
+    if (includeCurrentFile) {
+        QString fileContext = getCurrentFileContext();
+        if (!fileContext.isEmpty()) {
+            systemPrompt = systemPrompt.append(fileContext);
        }
-
-        if (!linkedFiles.isEmpty()) {
-            systemPrompt = getSystemPromptWithLinkedFiles(systemPrompt, linkedFiles);
-        }
-        context.systemPrompt = systemPrompt;
    }

-    QVector<LLMCore::Message> messages;
-    for (const auto &msg : m_chatModel->getChatHistory()) {
-        if (msg.role == ChatModel::ChatRole::Tool || msg.role == ChatModel::ChatRole::FileEdit) {
-            continue;
-        }
-        messages.append({msg.role == ChatModel::ChatRole::User ? "user" : "assistant", msg.content});
-    }
-    context.history = messages;
+    QJsonObject providerRequest;
+    providerRequest["model"] = Settings::generalSettings().caModel();
+    providerRequest["stream"] = true;
+    providerRequest["messages"] = m_chatModel->prepareMessagesForRequest(systemPrompt);
+
+    if (promptTemplate)
+        promptTemplate->prepareRequest(providerRequest, context);
+    else
+        qWarning("No prompt template found");
+
+    if (provider)
+        provider->prepareRequest(providerRequest, LLMCore::RequestType::Chat);
+    else
+        qWarning("No provider found");

    LLMCore::LLMConfig config;
    config.requestType = LLMCore::RequestType::Chat;
    config.provider = provider;
    config.promptTemplate = promptTemplate;
-    if (provider->providerID() == LLMCore::ProviderID::GoogleAI) {
-        QString stream = QString{"streamGenerateContent?alt=sse"};
-        config.url = QUrl(QString("%1/models/%2:%3")
-                              .arg(
-                                  Settings::generalSettings().caUrl(),
-                                  Settings::generalSettings().caModel(),
-                                  stream));
-    } else {
-        config.url
-            = QString("%1%2").arg(Settings::generalSettings().caUrl(), provider->chatEndpoint());
-        config.providerRequest
-            = {{"model", Settings::generalSettings().caModel()}, {"stream", true}};
-    }
+    config.url = QString("%1%2").arg(Settings::generalSettings().caUrl(), provider->chatEndpoint());
+    config.providerRequest = providerRequest;
+    config.multiLineCompletion = false;
+    config.apiKey = Settings::chatAssistantSettings().apiKey();

-    config.apiKey = provider->apiKey();
+    QJsonObject request;
+    request["id"] = QUuid::createUuid().toString();

-    config.provider->prepareRequest(
-        config.providerRequest, promptTemplate, context, LLMCore::RequestType::Chat, isToolsEnabled);
-
-    QString requestId = QUuid::createUuid().toString();
-    QJsonObject request{{"id", requestId}};
-
-    m_activeRequests[requestId] = {request, provider};
-    
-    emit requestStarted(requestId);
-
-    connect(
-        provider,
-        &LLMCore::Provider::partialResponseReceived,
-        this,
-        &ClientInterface::handlePartialResponse,
-        Qt::UniqueConnection);
-    connect(
-        provider,
-        &LLMCore::Provider::fullResponseReceived,
-        this,
-        &ClientInterface::handleFullResponse,
-        Qt::UniqueConnection);
-    connect(
-        provider,
-        &LLMCore::Provider::requestFailed,
-        this,
-        &ClientInterface::handleRequestFailed,
-        Qt::UniqueConnection);
-    connect(
-        provider,
-        &LLMCore::Provider::toolExecutionStarted,
-        m_chatModel,
-        &ChatModel::addToolExecutionStatus,
-        Qt::UniqueConnection);
-    connect(
-        provider,
-        &LLMCore::Provider::toolExecutionCompleted,
-        m_chatModel,
-        &ChatModel::updateToolResult,
-        Qt::UniqueConnection);
-    connect(
-        provider,
-        &LLMCore::Provider::continuationStarted,
-        this,
-        &ClientInterface::handleCleanAccumulatedData,
-        Qt::UniqueConnection);
-
-    provider->sendRequest(requestId, config.url, config.providerRequest);
+    m_requestHandler->sendLLMRequest(config, request);
 }

 void ClientInterface::clearMessages()
@@ -201,32 +142,13 @@ void ClientInterface::clearMessages()

 void ClientInterface::cancelRequest()
 {
-    QSet<LLMCore::Provider *> providers;
-    for (auto it = m_activeRequests.begin(); it != m_activeRequests.end(); ++it) {
-        if (it.value().provider) {
-            providers.insert(it.value().provider);
-        }
-    }
-
-    for (auto *provider : providers) {
-        disconnect(provider, nullptr, this, nullptr);
-    }
-
-    for (auto it = m_activeRequests.begin(); it != m_activeRequests.end(); ++it) {
-        const RequestContext &ctx = it.value();
-        if (ctx.provider) {
-            ctx.provider->cancelRequest(it.key());
-        }
-    }
-
-    m_activeRequests.clear();
-    m_accumulatedResponses.clear();
-
-    LOG_MESSAGE("All requests cancelled and state cleared");
+    auto id = m_chatModel->lastMessageId();
+    m_requestHandler->cancelRequest(id);
 }

-void ClientInterface::handleLLMResponse(
-    const QString &response, const QJsonObject &request, bool isComplete)
+void ClientInterface::handleLLMResponse(const QString &response,
+                                        const QJsonObject &request,
+                                        bool isComplete)
 {
    const auto message = response.trimmed();

@@ -237,7 +159,6 @@ void ClientInterface::handleLLMResponse(
        if (isComplete) {
            LOG_MESSAGE(
                "Message completed. Final response for message " + messageId + ": " + response);
-            emit messageReceivedCompletely();
        }
    }
 }
@@ -257,91 +178,13 @@ QString ClientInterface::getCurrentFileContext() const
    }

    QString fileInfo = QString("Language: %1\nFile: %2\n\n")
-                           .arg(textDocument->mimeType(), textDocument->filePath().toFSPathString());
+                           .arg(textDocument->mimeType(), textDocument->filePath().toString());

    QString content = textDocument->document()->toPlainText();

-    LOG_MESSAGE(QString("Got context from file: %1").arg(textDocument->filePath().toFSPathString()));
+    LOG_MESSAGE(QString("Got context from file: %1").arg(textDocument->filePath().toString()));

    return QString("Current file context:\n%1\nFile content:\n%2").arg(fileInfo, content);
 }

-QString ClientInterface::getSystemPromptWithLinkedFiles(
-    const QString &basePrompt, const QList<QString> &linkedFiles) const
-{
-    QString updatedPrompt = basePrompt;
-
-    if (!linkedFiles.isEmpty()) {
-        updatedPrompt += "\n\nLinked files for reference:\n";
-
-        auto contentFiles = m_contextManager->getContentFiles(linkedFiles);
-        for (const auto &file : contentFiles) {
-            updatedPrompt += QString("\nFile: %1\nContent:\n%2\n").arg(file.filename, file.content);
-        }
-    }
-
-    return updatedPrompt;
-}
-
-Context::ContextManager *ClientInterface::contextManager() const
-{
-    return m_contextManager;
-}
-
-void ClientInterface::handlePartialResponse(const QString &requestId, const QString &partialText)
-{
-    auto it = m_activeRequests.find(requestId);
-    if (it == m_activeRequests.end())
-        return;
-
-    m_accumulatedResponses[requestId] += partialText;
-
-    const RequestContext &ctx = it.value();
-    handleLLMResponse(m_accumulatedResponses[requestId], ctx.originalRequest, false);
-}
-
-void ClientInterface::handleFullResponse(const QString &requestId, const QString &fullText)
-{
-    auto it = m_activeRequests.find(requestId);
-    if (it == m_activeRequests.end())
-        return;
-
-    const RequestContext &ctx = it.value();
-
-    QString finalText = !fullText.isEmpty() ? fullText : m_accumulatedResponses[requestId];
-    
-    QString applyError;
-    bool applySuccess = Context::ChangesManager::instance()
-                           .applyPendingEditsForRequest(requestId, &applyError);
-    
-    if (!applySuccess) {
-        LOG_MESSAGE(QString("Some edits for request %1 were not auto-applied: %2")
-                       .arg(requestId, applyError));
-    }
-    
-    handleLLMResponse(finalText, ctx.originalRequest, true);
-
-    m_activeRequests.erase(it);
-    m_accumulatedResponses.remove(requestId);
-}
-
-void ClientInterface::handleRequestFailed(const QString &requestId, const QString &error)
-{
-    auto it = m_activeRequests.find(requestId);
-    if (it == m_activeRequests.end())
-        return;
-
-    LOG_MESSAGE(QString("Chat request %1 failed: %2").arg(requestId, error));
-    emit errorOccurred(error);
-
-    m_activeRequests.erase(it);
-    m_accumulatedResponses.remove(requestId);
-}
-
-void ClientInterface::handleCleanAccumulatedData(const QString &requestId)
-{
-    m_accumulatedResponses[requestId].clear();
-    LOG_MESSAGE(QString("Cleared accumulated responses for continuation request %1").arg(requestId));
-}
-
 } // namespace QodeAssist::Chat
--- a/ChatView/ClientInterface.hpp
+++ b/ChatView/ClientInterface.hpp
@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2024-2025 Petr Mironychev
+ * Copyright (C) 2024 Petr Mironychev
 *
 * This file is part of QodeAssist.
 *
@@ -24,9 +24,7 @@
 #include <QVector>

 #include "ChatModel.hpp"
-#include "Provider.hpp"
-#include "llmcore/IPromptProvider.hpp"
-#include <context/ContextManager.hpp>
+#include "RequestHandler.hpp"

 namespace QodeAssist::Chat {

@@ -35,49 +33,22 @@ class ClientInterface : public QObject
    Q_OBJECT

 public:
-    explicit ClientInterface(
-        ChatModel *chatModel, LLMCore::IPromptProvider *promptProvider, QObject *parent = nullptr);
+    explicit ClientInterface(ChatModel *chatModel, QObject *parent = nullptr);
    ~ClientInterface();

-    void sendMessage(
-        const QString &message,
-        const QList<QString> &attachments = {},
-        const QList<QString> &linkedFiles = {},
-        bool useAgentMode = false);
+    void sendMessage(const QString &message, bool includeCurrentFile = false);
    void clearMessages();
    void cancelRequest();

-    Context::ContextManager *contextManager() const;
-
 signals:
    void errorOccurred(const QString &error);
-    void messageReceivedCompletely();
-    void requestStarted(const QString &requestId);
-
-private slots:
-    void handlePartialResponse(const QString &requestId, const QString &partialText);
-    void handleFullResponse(const QString &requestId, const QString &fullText);
-    void handleRequestFailed(const QString &requestId, const QString &error);
-    void handleCleanAccumulatedData(const QString &requestId);

 private:
    void handleLLMResponse(const QString &response, const QJsonObject &request, bool isComplete);
    QString getCurrentFileContext() const;
-    QString getSystemPromptWithLinkedFiles(
-        const QString &basePrompt, const QList<QString> &linkedFiles) const;

-    struct RequestContext
-    {
-        QJsonObject originalRequest;
-        LLMCore::Provider *provider;
-    };
-
-    LLMCore::IPromptProvider *m_promptProvider = nullptr;
+    LLMCore::RequestHandler *m_requestHandler;
    ChatModel *m_chatModel;
-    Context::ContextManager *m_contextManager;
-
-    QHash<QString, RequestContext> m_activeRequests;
-    QHash<QString, QString> m_accumulatedResponses;
 };

 } // namespace QodeAssist::Chat
--- a/ChatView/MessagePart.hpp
+++ b/ChatView/MessagePart.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024-2025 Petr Mironychev
+ * Copyright (C) 2024 Petr Mironychev
 *
 * This file is part of QodeAssist.
 *
@@ -19,24 +19,33 @@

 #pragma once

-#include <QObject>
-#include <QtQmlIntegration>
-
-#include "ChatData.hpp"
+#include <qobject.h>
+#include <qqmlintegration.h>

 namespace QodeAssist::Chat {
+Q_NAMESPACE

 class MessagePart
 {
    Q_GADGET
-    Q_PROPERTY(MessagePartType type MEMBER type CONSTANT FINAL)
+    Q_PROPERTY(PartType type MEMBER type CONSTANT FINAL)
    Q_PROPERTY(QString text MEMBER text CONSTANT FINAL)
    Q_PROPERTY(QString language MEMBER language CONSTANT FINAL)
    QML_VALUE_TYPE(messagePart)
 public:
-    MessagePartType type;
+    enum PartType { Code, Text };
+    Q_ENUM(PartType)
+
+    PartType type;
    QString text;
    QString language;
 };

+class MessagePartType : public MessagePart
+{
+    Q_GADGET
+};
+
+QML_NAMED_ELEMENT(MessagePart)
+QML_FOREIGN_NAMESPACE(QodeAssist::Chat::MessagePartType)
 } // namespace QodeAssist::Chat
--- a/ChatView/icons/apply-changes-button.svg
+++ b/ChatView/icons/apply-changes-button.svg
@@ -1,15 +0,0 @@
-<svg width="44" height="44" viewBox="0 0 44 44" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_74_61)">
-<mask id="mask0_74_61" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="0" y="0" width="44" height="44">
-<path d="M44 0H0V44H44V0Z" fill="white"/>
-</mask>
-<g mask="url(#mask0_74_61)">
-<path d="M8 22L18 32L36 12" stroke="black" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-</g>
-<defs>
-<clipPath id="clip0_74_61">
-<rect width="44" height="44" fill="white"/>
-</clipPath>
-</defs>
-</svg>
--- a/ChatView/icons/attach-file-dark.svg
+++ b/ChatView/icons/attach-file-dark.svg
@@ -1,11 +0,0 @@
-<svg width="24" height="48" viewBox="0 0 24 48" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_37_14)">
-<path d="M22 10.1053V36.7368C22 41.8547 17.525 46 12 46C6.475 46 2 41.8547 2 36.7368V7.78947C2 4.59368 4.8 2 8.25 2C11.7 2 15.75 4.59368 15.75 7.78947V35.5789C15.75 36.8526 13.375 39.0526 12 39.0526C10.625 39.0526 8.25 36.8526 8.25 35.5789V21.6842V8.94737" stroke="black" stroke-width="3" stroke-linecap="round"/>
-<path d="M22 10.1053V36.7368C22 41.8547 17.525 46 12 46C6.475 46 2 41.8547 2 36.7368V7.78947C2 4.59368 4.8 2 8.25 2C11.7 2 15.75 4.59368 15.75 7.78947V35.5789C15.75 36.8526 13.375 39.0526 12 39.0526C10.625 39.0526 8.25 36.8526 8.25 35.5789V21.6842V8.94737" stroke="black" stroke-width="3" stroke-linecap="round"/>
-</g>
-<defs>
-<clipPath id="clip0_37_14">
-<rect width="24" height="48" fill="white"/>
-</clipPath>
-</defs>
-</svg>
--- a/ChatView/icons/attach-file-light.svg
+++ b/ChatView/icons/attach-file-light.svg
@@ -1,11 +0,0 @@
-<svg width="24" height="48" viewBox="0 0 24 48" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_51_20)">
-<path d="M22 10.1053V36.7368C22 41.8547 17.525 46 12 46C6.475 46 2 41.8547 2 36.7368V7.78947C2 4.59368 4.8 2 8.25 2C11.7 2 15.75 4.59368 15.75 7.78947V35.5789C15.75 36.8526 13.375 39.0526 12 39.0526C10.625 39.0526 8.25 36.8526 8.25 35.5789V21.6842V8.94737" stroke="white" stroke-width="3" stroke-linecap="round"/>
-<path d="M22 10.1053V36.7368C22 41.8547 17.525 46 12 46C6.475 46 2 41.8547 2 36.7368V7.78947C2 4.59368 4.8 2 8.25 2C11.7 2 15.75 4.59368 15.75 7.78947V35.5789C15.75 36.8526 13.375 39.0526 12 39.0526C10.625 39.0526 8.25 36.8526 8.25 35.5789V21.6842V8.94737" stroke="white" stroke-width="3" stroke-linecap="round"/>
-</g>
-<defs>
-<clipPath id="clip0_51_20">
-<rect width="24" height="48" fill="white"/>
-</clipPath>
-</defs>
-</svg>
--- a/ChatView/icons/chat-icon.svg
+++ b/ChatView/icons/chat-icon.svg
@@ -1,10 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_5_6)">
-<path d="M21.6 0H2.4C1.08 0 0 1.08 0 2.4V16.8C0 18.12 1.08 19.2 2.4 19.2H7.2V22.8C7.2 23.46 7.74 24 8.4 24H9C9.3 24 9.6 23.88 9.84 23.652L14.28 19.2H21.6C22.92 19.2 24 18.12 24 16.8V2.4C24 1.08 22.92 0 21.6 0ZM21.6 16.8H13.44L8.76 21.48L8.4 21.6V16.8H2.4V2.4H21.6V16.8Z" fill="black"/>
-</g>
-<defs>
-<clipPath id="clip0_5_6">
-<rect width="24" height="24" fill="white"/>
-</clipPath>
-</defs>
-</svg>
--- a/ChatView/icons/chat-pause-icon.svg
+++ b/ChatView/icons/chat-pause-icon.svg
@@ -1,10 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_5_17)">
-<path d="M21.6 0H2.4C1.08 0 0 1.08 0 2.4V16.8C0 18.12 1.08 19.2 2.4 19.2H7.2V22.8C7.2 23.46 7.74 24 8.4 24H9C9.3 24 9.6 23.88 9.84 23.652L14.28 19.2H21.6C22.92 19.2 24 18.12 24 16.8V2.4C24 1.08 22.92 0 21.6 0ZM21.6 16.8H13.44L8.76 21.48L8.4 21.6V16.8H2.4V2.4H21.6V16.8ZM8.4 6H15.6V13.2H8.4V6Z" fill="black"/>
-</g>
-<defs>
-<clipPath id="clip0_5_17">
-<rect width="24" height="24" fill="white"/>
-</clipPath>
-</defs>
-</svg>
--- a/ChatView/icons/clean-icon-dark.svg
+++ b/ChatView/icons/clean-icon-dark.svg
@@ -1,8 +0,0 @@
-<svg width="20" height="44" viewBox="0 0 20 44" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M16.75 15H3.25C2.00736 15 1 16.0074 1 17.25V39.75C1 40.9926 2.00736 42 3.25 42H16.75C17.9926 42 19 40.9926 19 39.75V17.25C19 16.0074 17.9926 15 16.75 15Z" stroke="black" stroke-width="2"/>
-<path d="M1.04316 11.015L18.9554 8.90787" stroke="black" stroke-width="2" stroke-linecap="round"/>
-<path d="M7.19462 10.363L7.02032 8.59516C6.92446 7.62284 8.18688 6.64116 9.8257 6.41365C11.4645 6.18615 12.8838 6.79555 12.9797 7.76787L13.154 9.53573" stroke="black" stroke-width="2"/>
-<path d="M6 24V34" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
-<path d="M10 24V34" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
-<path d="M14 24V34" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
-</svg>
--- a/ChatView/icons/close-dark.svg
+++ b/ChatView/icons/close-dark.svg
@@ -1,10 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_41_14)">
-<path d="M0 0L24 24M0 24L24 0" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-<defs>
-<clipPath id="clip0_41_14">
-<rect width="24" height="24" fill="white"/>
-</clipPath>
-</defs>
-</svg>
--- a/ChatView/icons/close-light.svg
+++ b/ChatView/icons/close-light.svg
@@ -1,10 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_41_14)">
-<path d="M0 0L24 24M0 24L24 0" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-<defs>
-<clipPath id="clip0_41_14">
-<rect width="24" height="24" fill="white"/>
-</clipPath>
-</defs>
-</svg>
--- a/ChatView/icons/file-in-system.svg
+++ b/ChatView/icons/file-in-system.svg
@@ -1,12 +0,0 @@
-<svg width="44" height="44" viewBox="0 0 44 44" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_59_114)">
-<path d="M2 8H12L16 4H40C42 4 44 6 44 8V36C44 38 42 40 40 40H6C4 40 2 38 2 36V8Z" fill="black" fill-opacity="0.1" stroke="black" stroke-width="3"/>
-<path d="M25 37C32.732 37 39 30.732 39 23C39 15.268 32.732 9 25 9C17.268 9 11 15.268 11 23C11 30.732 17.268 37 25 37Z" stroke="black" stroke-width="4"/>
-<path d="M33 35L42 44" stroke="black" stroke-width="4" stroke-linecap="round"/>
-</g>
-<defs>
-<clipPath id="clip0_59_114">
-<rect width="44" height="44" fill="white"/>
-</clipPath>
-</defs>
-</svg>
--- a/ChatView/icons/link-file-dark.svg
+++ b/ChatView/icons/link-file-dark.svg
@@ -1,12 +0,0 @@
-<svg width="20" height="44" viewBox="0 0 20 44" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_49_24)">
-<path d="M10 12L10 32L10 12Z" fill="black"/>
-<path d="M10 12L10 32" stroke="black" stroke-width="3"/>
-<path d="M1.50001 12.484C1.50001 -1.99999 18.5 -1.99999 18.5 12.484M1.5 31.5334C1.50001 46 18.5 46 18.5 31.5334" stroke="black" stroke-width="3" stroke-linecap="round"/>
-</g>
-<defs>
-<clipPath id="clip0_49_24">
-<rect width="20" height="44" fill="white"/>
-</clipPath>
-</defs>
-</svg>
--- a/ChatView/icons/link-file-light.svg
+++ b/ChatView/icons/link-file-light.svg
@@ -1,12 +0,0 @@
-<svg width="20" height="44" viewBox="0 0 20 44" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_51_24)">
-<path d="M10 12L10 32Z" fill="white"/>
-<path d="M10 12L10 32" stroke="white" stroke-width="3"/>
-<path d="M1.50001 12.484C1.50001 -1.99999 18.5 -1.99999 18.5 12.484M1.5 31.5334C1.50001 46 18.5 46 18.5 31.5334" stroke="white" stroke-width="3" stroke-linecap="round"/>
-</g>
-<defs>
-<clipPath id="clip0_51_24">
-<rect width="20" height="44" fill="white"/>
-</clipPath>
-</defs>
-</svg>
--- a/ChatView/icons/load-chat-dark.svg
+++ b/ChatView/icons/load-chat-dark.svg
@@ -1,5 +0,0 @@
-<svg width="20" height="44" viewBox="0 0 20 44" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M5 8H15" stroke="black" stroke-width="2.5" stroke-linecap="round"/>
-<path d="M10 16V36" stroke="black" stroke-width="2.5" stroke-linecap="round"/>
-<path d="M5 21L10 16L15 21" stroke="black" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
--- a/ChatView/icons/open-in-editor.svg
+++ b/ChatView/icons/open-in-editor.svg
@@ -1,17 +0,0 @@
-<svg width="44" height="44" viewBox="0 0 44 44" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_74_52)">
-<mask id="mask0_74_52" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="0" y="0" width="44" height="44">
-<path d="M44 0H0V44H44V0Z" fill="white"/>
-</mask>
-<g mask="url(#mask0_74_52)">
-<path d="M18 31C25.1797 31 31 25.1797 31 18C31 10.8203 25.1797 5 18 5C10.8203 5 5 10.8203 5 18C5 25.1797 10.8203 31 18 31Z" stroke="black" stroke-width="3.5"/>
-<path d="M27 27L38 38" stroke="black" stroke-width="3.5" stroke-linecap="round"/>
-<path d="M16.375 23L18.2841 11.3636H20.1023L18.1932 23H16.375ZM11.1648 20.1136L11.4659 18.2955H20.5568L20.2557 20.1136H11.1648ZM12.2841 23L14.1932 11.3636H16.0114L14.1023 23H12.2841ZM11.8295 16.0682L12.1364 14.25H21.2273L20.9205 16.0682H11.8295Z" fill="black"/>
-</g>
-</g>
-<defs>
-<clipPath id="clip0_74_52">
-<rect width="44" height="44" fill="white"/>
-</clipPath>
-</defs>
-</svg>
--- a/ChatView/icons/reject-changes-button.svg
+++ b/ChatView/icons/reject-changes-button.svg
@@ -1,16 +0,0 @@
-<svg width="44" height="44" viewBox="0 0 44 44" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_74_76)">
-<mask id="mask0_74_76" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="0" y="0" width="44" height="44">
-<path d="M44 0H0V44H44V0Z" fill="white"/>
-</mask>
-<g mask="url(#mask0_74_76)">
-<path d="M12 12L32 32" stroke="black" stroke-width="4" stroke-linecap="round"/>
-<path d="M32 12L12 32" stroke="black" stroke-width="4" stroke-linecap="round"/>
-</g>
-</g>
-<defs>
-<clipPath id="clip0_74_76">
-<rect width="44" height="44" fill="white"/>
-</clipPath>
-</defs>
-</svg>
--- a/ChatView/icons/rules-icon.svg
+++ b/ChatView/icons/rules-icon.svg
@@ -1,9 +0,0 @@
-<svg width="44" height="44" viewBox="0 0 44 44" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M35.75 2.75H8.25C6.73122 2.75 5.5 3.98122 5.5 5.5V38.5C5.5 40.0188 6.73122 41.25 8.25 41.25H35.75C37.2688 41.25 38.5 40.0188 38.5 38.5V5.5C38.5 3.98122 37.2688 2.75 35.75 2.75Z" stroke="black" stroke-width="4"/>
-<path d="M13.75 14.4375C14.8891 14.4375 15.8125 13.5141 15.8125 12.375C15.8125 11.2359 14.8891 10.3125 13.75 10.3125C12.6109 10.3125 11.6875 11.2359 11.6875 12.375C11.6875 13.5141 12.6109 14.4375 13.75 14.4375Z" fill="black"/>
-<path d="M19.25 12.375H33" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
-<path d="M13.75 24.0625C14.8891 24.0625 15.8125 23.1391 15.8125 22C15.8125 20.8609 14.8891 19.9375 13.75 19.9375C12.6109 19.9375 11.6875 20.8609 11.6875 22C11.6875 23.1391 12.6109 24.0625 13.75 24.0625Z" fill="black"/>
-<path d="M19.25 22H33" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
-<path d="M13.75 33.6875C14.8891 33.6875 15.8125 32.7641 15.8125 31.625C15.8125 30.4859 14.8891 29.5625 13.75 29.5625C12.6109 29.5625 11.6875 30.4859 11.6875 31.625C11.6875 32.7641 12.6109 33.6875 13.75 33.6875Z" fill="black"/>
-<path d="M19.25 31.625H27.5" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
-</svg>
--- a/ChatView/icons/save-chat-dark.svg
+++ b/ChatView/icons/save-chat-dark.svg
@@ -1,5 +0,0 @@
-<svg width="20" height="44" viewBox="0 0 20 44" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10 8V28" stroke="black" stroke-width="2.5" stroke-linecap="round"/>
-<path d="M5 23L10 28L15 23" stroke="black" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M5 36H15" stroke="black" stroke-width="2.5" stroke-linecap="round"/>
-</svg>
--- a/ChatView/icons/undo-changes-button.svg
+++ b/ChatView/icons/undo-changes-button.svg
@@ -1,16 +0,0 @@
-<svg width="44" height="44" viewBox="0 0 44 44" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_74_68)">
-<mask id="mask0_74_68" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="0" y="0" width="44" height="44">
-<path d="M44 0H0V44H44V0Z" fill="white"/>
-</mask>
-<g mask="url(#mask0_74_68)">
-<path d="M12 12L6 18L12 24" stroke="black" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M6 18H28C33 18 38 23 38 28C38 33 33 38 28 38H22" stroke="black" stroke-width="4" stroke-linecap="round"/>
-</g>
-</g>
-<defs>
-<clipPath id="clip0_74_68">
-<rect width="44" height="44" fill="white"/>
-</clipPath>
-</defs>
-</svg>
--- a/ChatView/icons/window-lock.svg
+++ b/ChatView/icons/window-lock.svg
@@ -1,5 +0,0 @@
-<svg width="44" height="44" viewBox="0 0 44 44" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M31 18H13C11.3431 18 10 19.3431 10 21V37C10 38.6569 11.3431 40 13 40H31C32.6569 40 34 38.6569 34 37V21C34 19.3431 32.6569 18 31 18Z" fill="black" fill-opacity="0.3" stroke="black" stroke-width="4"/>
-<path d="M14 18V10C14 5.6 17.6 2 22 2C26.4 2 30 5.6 30 10V18" stroke="black" stroke-width="4"/>
-<path d="M22 32C23.6569 32 25 30.6569 25 29C25 27.3431 23.6569 26 22 26C20.3431 26 19 27.3431 19 29C19 30.6569 20.3431 32 22 32Z" fill="black"/>
-</svg>
--- a/ChatView/icons/window-unlock.svg
+++ b/ChatView/icons/window-unlock.svg
@@ -1,5 +0,0 @@
-<svg width="44" height="44" viewBox="0 0 44 44" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M31 18H13C11.3431 18 10 19.3431 10 21V37C10 38.6569 11.3431 40 13 40H31C32.6569 40 34 38.6569 34 37V21C34 19.3431 32.6569 18 31 18Z" fill="black" fill-opacity="0.1" stroke="black" stroke-width="4"/>
-<path d="M14 17V9.5C14 5.375 17.15 2 21 2C24.85 2 27.5 2.875 27.5 7" stroke="black" stroke-width="4"/>
-<path d="M22 32C23.6569 32 25 30.6569 25 29C25 27.3431 23.6569 26 22 26C20.3431 26 19 27.3431 19 29C19 30.6569 20.3431 32 22 32Z" fill="black"/>
-</svg>
--- a/UIControls/qml/Badge.qml
+++ b/UIControls/qml/Badge.qml
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024-2025 Petr Mironychev
+ * Copyright (C) 2024 Petr Mironychev
 *
 * This file is part of QodeAssist.
 *
@@ -23,25 +23,18 @@ Rectangle {
    id: root

    property alias text: badgeText.text
-    property alias hovered: mouse.hovered
+    property alias fontColor: badgeText.color

-    implicitWidth: badgeText.implicitWidth + root.radius
-    implicitHeight: badgeText.implicitHeight + 6
-    color: palette.button
-    radius: root.height / 2
-    border.color: palette.mid
+    width: badgeText.implicitWidth + radius
+    height: badgeText.implicitHeight + 6
+    color: "lightgreen"
+    radius: height / 2
    border.width: 1
+    border.color: "gray"

    Text {
        id: badgeText

        anchors.centerIn: parent
-        color: palette.buttonText
-    }
-
-    HoverHandler {
-        id: mouse
-
-        acceptedDevices: PointerDevice.Mouse | PointerDevice.TouchPad
    }
 }
--- a/ChatView/qml/ChatItem.qml
+++ b/ChatView/qml/ChatItem.qml
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024-2025 Petr Mironychev
+ * Copyright (C) 2024 Petr Mironychev
 *
 * This file is part of QodeAssist.
 *
@@ -17,55 +17,28 @@
 * along with QodeAssist. If not, see <https://www.gnu.org/licenses/>.
 */

+pragma ComponentBehavior: Bound
+
 import QtQuick
 import ChatView
-import QtQuick.Layouts
-import UIControls
-
 import "./dialog"

 Rectangle {
    id: root

    property alias msgModel: msgCreator.model
-    property alias messageAttachments: attachmentsModel.model
-    property string textFontFamily: Qt.application.font.family
-    property string codeFontFamily: {
-        switch (Qt.platform.os) {
-        case "windows":
-            return "Consolas";
-        case "osx":
-            return "Menlo";
-        case "linux":
-            return "DejaVu Sans Mono";
-        default:
-            return "monospace";
-        }
-    }
-    property int textFontSize: Qt.application.font.pointSize
-    property int codeFontSize: Qt.application.font.pointSize
-    property int textFormat: 0
+    property color fontColor
+    property color codeBgColor
+    property color selectionColor

-    property bool isUserMessage: false
-    property int messageIndex: -1
-
-    signal resetChatToMessage(int index)
-
-    height: msgColumn.implicitHeight + 10
+    height: msgColumn.height
    radius: 8
-    color: isUserMessage ? palette.alternateBase
-                         : palette.base

-    HoverHandler {
-        id: mouse
-    }
-
-    ColumnLayout {
+    Column {
        id: msgColumn

-        x: 5
-        width: parent.width - x
        anchors.verticalCenter: parent.verticalCenter
+        width: parent.width
        spacing: 5

        Repeater {
@@ -76,7 +49,7 @@ Rectangle {
                // why does `required property MessagePart modelData` not work?
                required property var modelData

-                Layout.preferredWidth: root.width
+                width: parent.width
                sourceComponent: {
                    // If `required property MessagePart modelData` is used
                    // and conversion to MessagePart fails, you're left
@@ -86,8 +59,8 @@ Rectangle {
                    }

                    switch(modelData.type) {
-                        case MessagePartType.Text: return textComponent;
-                        case MessagePartType.Code: return codeBlockComponent;
+                        case MessagePart.Text: return textComponent;
+                        case MessagePart.Code: return codeBlockComponent;
                        default: return textComponent;
                    }
                }
@@ -107,66 +80,6 @@ Rectangle {
                }
            }
        }
-
-        Flow {
-            id: attachmentsFlow
-
-            Layout.fillWidth: true
-            visible: attachmentsModel.model && attachmentsModel.model.length > 0
-            leftPadding: 10
-            rightPadding: 10
-            spacing: 5
-
-            Repeater {
-                id: attachmentsModel
-
-                delegate: Rectangle {
-                    required property int index
-                    required property var modelData
-
-                    height: attachText.implicitHeight + 8
-                    width: attachText.implicitWidth + 16
-                    radius: 4
-                    color: palette.button
-                    border.width: 1
-                    border.color: palette.mid
-
-                    Text {
-                        id: attachText
-
-                        anchors.centerIn: parent
-                        text: modelData
-                        color: palette.text
-                    }
-                }
-            }
-        }
-    }
-
-    Rectangle {
-        id: userMessageMarker
-
-        anchors.verticalCenter: parent.verticalCenter
-        width: 3
-        height: root.height - root.radius
-        color: "#92BD6C"
-        radius: root.radius
-        visible: root.isUserMessage
-    }
-
-    QoAButton {
-        id: stopButtonId
-
-        anchors {
-            right: parent.right
-            top: parent.top
-        }
-
-        text: qsTr("ResetTo")
-        visible: root.isUserMessage && mouse.hovered
-        onClicked: function() {
-            root.resetChatToMessage(root.messageIndex)
-        }
    }

    component TextComponent : TextBlock {
@@ -174,28 +87,13 @@ Rectangle {
        height: implicitHeight + 10
        verticalAlignment: Text.AlignVCenter
        leftPadding: 10
-        text: textFormat == Text.MarkdownText ? utils.getSafeMarkdownText(itemData.text)
-                                              : itemData.text
-        font.family: root.textFontFamily
-        font.pointSize: root.textFontSize
-        textFormat: {
-            if (root.textFormat == 0) {
-                return Text.MarkdownText
-            } else if (root.textFormat == 1) {
-                return Text.RichText
-            } else {
-                return Text.PlainText
-            }
-        }
-
-        ChatUtils {
-            id: utils
-        }
+        text: itemData.text
+        color: root.fontColor
+        selectionColor: root.selectionColor
    }

-    component CodeBlockComponent : CodeBlock {
-        id: codeblock

+    component CodeBlockComponent : CodeBlock {
        required property var itemData
        anchors {
            left: parent.left
@@ -206,7 +104,8 @@ Rectangle {

        code: itemData.text
        language: itemData.language
-        codeFontFamily: root.codeFontFamily
-        codeFontSize: root.codeFontSize
+        color: root.codeBgColor
+        selectionColor: root.selectionColor
    }
+
 }
--- a/ChatView/qml/FileEditItem.qml
+++ b/ChatView/qml/FileEditItem.qml
@@ -1,423 +0,0 @@
-/*
- * Copyright (C) 2025 Petr Mironychev
- *
- * This file is part of QodeAssist.
- *
- * QodeAssist is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QodeAssist is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QodeAssist. If not, see <https://www.gnu.org/licenses/>.
- */
-
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Layouts
-import UIControls
-
-Rectangle {
-    id: root
-
-    property string editContent: ""
-
-    readonly property var editData: parseEditData(editContent)
-    readonly property string filePath: editData.file || ""
-    readonly property string fileName: getFileName(filePath)
-    readonly property string editStatus: editData.status || "pending"
-    readonly property string statusMessage: editData.status_message || ""
-    readonly property string oldContent: editData.old_content || ""
-    readonly property string newContent: editData.new_content || ""
-
-    signal applyEdit(string editId)
-    signal rejectEdit(string editId)
-    signal undoEdit(string editId)
-    signal openInEditor(string editId)
-
-    readonly property int borderRadius: 4
-    readonly property int contentMargin: 10
-    readonly property int contentBottomPadding: 20
-    readonly property int headerPadding: 8
-    readonly property int statusIndicatorWidth: 4
-
-    readonly property bool isPending: editStatus === "pending"
-    readonly property bool isApplied: editStatus === "applied"
-    readonly property bool isRejected: editStatus === "rejected"
-    readonly property bool isArchived: editStatus === "archived"
-
-    readonly property color appliedColor: Qt.rgba(0.2, 0.8, 0.2, 0.8)
-    readonly property color revertedColor: Qt.rgba(0.8, 0.6, 0.2, 0.8)
-    readonly property color rejectedColor: Qt.rgba(0.8, 0.2, 0.2, 0.8)
-    readonly property color archivedColor: Qt.rgba(0.5, 0.5, 0.5, 0.8)
-    readonly property color pendingColor: palette.highlight
-
-    readonly property color appliedBgColor: Qt.rgba(0.2, 0.8, 0.2, 0.3)
-    readonly property color revertedBgColor: Qt.rgba(0.8, 0.6, 0.2, 0.3)
-    readonly property color rejectedBgColor: Qt.rgba(0.8, 0.2, 0.2, 0.3)
-    readonly property color archivedBgColor: Qt.rgba(0.5, 0.5, 0.5, 0.3)
-
-    readonly property string codeFontFamily: {
-        switch (Qt.platform.os) {
-        case "windows": return "Consolas"
-        case "osx": return "Menlo"
-        case "linux": return "DejaVu Sans Mono"
-        default: return "monospace"
-        }
-    }
-    readonly property int codeFontSize: Qt.application.font.pointSize
-
-    readonly property color statusColor: {
-        if (isArchived) return archivedColor
-        if (isApplied) return appliedColor
-        if (isRejected) return rejectedColor
-        return pendingColor
-    }
-
-    readonly property color statusBgColor: {
-        if (isArchived) return archivedBgColor
-        if (isApplied) return appliedBgColor
-        if (isRejected) return rejectedBgColor
-        return palette.button
-    }
-
-    readonly property string statusText: {
-        if (isArchived) return qsTr("ARCHIVED")
-        if (isApplied) return qsTr("APPLIED")
-        if (isRejected) return qsTr("REJECTED")
-        return qsTr("PENDING")
-    }
-
-    readonly property int addedLines: countLines(newContent)
-    readonly property int removedLines: countLines(oldContent)
-
-    function parseEditData(content) {
-        try {
-            const marker = "QODEASSIST_FILE_EDIT:";
-            let jsonStr = content;
-            if (content.indexOf(marker) >= 0) {
-                jsonStr = content.substring(content.indexOf(marker) + marker.length);
-            }
-            return JSON.parse(jsonStr);
-        } catch (e) {
-            return {
-                edit_id: "",
-                file: "",
-                old_content: "",
-                new_content: "",
-                status: "error",
-                status_message: ""
-            };
-        }
-    }
-
-    function getFileName(path) {
-        if (!path) return "";
-        const parts = path.split('/');
-        return parts[parts.length - 1];
-    }
-
-    function countLines(text) {
-        if (!text) return 0;
-        return text.split('\n').length;
-    }
-
-    implicitHeight: fileEditView.implicitHeight
-
-    Rectangle {
-        id: fileEditView
-
-        property bool expanded: false
-
-        anchors.fill: parent
-        implicitHeight: expanded ? headerArea.height + contentColumn.implicitHeight + root.contentBottomPadding + root.contentMargin * 2
-                                 : headerArea.height
-        radius: root.borderRadius
-
-        color: palette.base
-
-        border.width: 1
-        border.color: root.isPending
-            ? (color.hslLightness > 0.5 ? Qt.darker(color, 1.3) : Qt.lighter(color, 1.3))
-            : Qt.alpha(root.statusColor, 0.6)
-
-        clip: true
-
-        Behavior on implicitHeight {
-            NumberAnimation {
-                duration: 200
-                easing.type: Easing.InOutQuad
-            }
-        }
-
-        states: [
-            State {
-                name: "expanded"
-                when: fileEditView.expanded
-                PropertyChanges { target: contentColumn; opacity: 1 }
-            },
-            State {
-                name: "collapsed"
-                when: !fileEditView.expanded
-                PropertyChanges { target: contentColumn; opacity: 0 }
-            }
-        ]
-
-        transitions: Transition {
-            NumberAnimation {
-                properties: "opacity"
-                duration: 200
-                easing.type: Easing.InOutQuad
-            }
-        }
-
-        MouseArea {
-            id: headerArea
-            width: parent.width
-            height: headerRow.height + 16
-            cursorShape: Qt.PointingHandCursor
-            onClicked: fileEditView.expanded = !fileEditView.expanded
-
-            RowLayout {
-                id: headerRow
-
-                anchors {
-                    verticalCenter: parent.verticalCenter
-                    left: parent.left
-                    right: actionButtons.left
-                    leftMargin: root.contentMargin
-                    rightMargin: root.contentMargin
-                }
-                spacing: root.headerPadding
-
-                Rectangle {
-                    width: root.statusIndicatorWidth
-                    height: headerText.height
-                    radius: 2
-                    color: root.statusColor
-                }
-
-                Text {
-                    id: headerText
-                    Layout.fillWidth: true
-                    text: {
-                        var modeText = root.oldContent.length > 0 ? qsTr("Replace") : qsTr("Append")
-                        if (root.oldContent.length > 0) {
-                            return qsTr("%1: %2 (+%3 -%4)")
-                                .arg(modeText)
-                                .arg(root.fileName)
-                                .arg(root.addedLines)
-                                .arg(root.removedLines)
-                        } else {
-                            return qsTr("%1: %2 (+%3)")
-                                .arg(modeText)
-                                .arg(root.fileName)
-                                .arg(root.addedLines)
-                        }
-                    }
-                    font.pixelSize: 12
-                    font.bold: true
-                    color: palette.text
-                    elide: Text.ElideMiddle
-                }
-
-                Text {
-                    text: fileEditView.expanded ? "▼" : "▶"
-                    font.pixelSize: 10
-                    color: palette.mid
-                }
-
-                Rectangle {
-                    visible: !root.isPending
-                    Layout.preferredWidth: badgeText.width + 12
-                    Layout.preferredHeight: badgeText.height + 4
-                    color: root.statusBgColor
-                    radius: 3
-
-                    Text {
-                        id: badgeText
-                        anchors.centerIn: parent
-                        text: root.statusText
-                        font.pixelSize: 9
-                        font.bold: true
-                        color: root.isArchived ? Qt.rgba(0.6, 0.6, 0.6, 1.0) : palette.text
-                    }
-                }
-            }
-
-            Row {
-                id: actionButtons
-
-                anchors {
-                    right: parent.right
-                    rightMargin: 5
-                    verticalCenter: parent.verticalCenter
-                }
-                spacing: 6
-
-                QoAButton {
-                    icon {
-                        source: "qrc:/qt/qml/ChatView/icons/open-in-editor.svg"
-                        height: 15
-                        width: 15
-                    }
-                    hoverEnabled: true
-                    onClicked: root.openInEditor(editData.edit_id)
-                    
-                    ToolTip.visible: hovered
-                    ToolTip.text: qsTr("Open file in editor and navigate to changes")
-                    ToolTip.delay: 500
-                }
-
-                QoAButton {
-                    icon {
-                        source: "qrc:/qt/qml/ChatView/icons/apply-changes-button.svg"
-                        height: 15
-                        width: 15
-                    }                    enabled: (root.isPending || root.isRejected) && !root.isArchived
-                    visible: !root.isApplied && !root.isArchived
-                    onClicked: root.applyEdit(editData.edit_id)
-                }
-
-                QoAButton {
-                    icon {
-                        source: "qrc:/qt/qml/ChatView/icons/undo-changes-button.svg"
-                        height: 15
-                        width: 15
-                    }
-                    enabled: root.isApplied && !root.isArchived
-                    visible: root.isApplied && !root.isArchived
-                    onClicked: root.undoEdit(editData.edit_id)
-                }
-
-                QoAButton {
-                    icon {
-                        source: "qrc:/qt/qml/ChatView/icons/reject-changes-button.svg"
-                        height: 15
-                        width: 15
-                    }
-                    enabled: root.isPending && !root.isArchived
-                    visible: root.isPending && !root.isArchived
-                    onClicked: root.rejectEdit(editData.edit_id)
-                }
-            }
-        }
-
-        ColumnLayout {
-            id: contentColumn
-
-            anchors {
-                left: parent.left
-                right: parent.right
-                top: headerArea.bottom
-                margins: root.contentMargin
-            }
-            spacing: 8
-            visible: opacity > 0
-
-            Text {
-                Layout.fillWidth: true
-                text: root.filePath
-                font.pixelSize: 10
-                color: palette.mid
-                elide: Text.ElideMiddle
-            }
-
-            Rectangle {
-                Layout.fillWidth: true
-                Layout.preferredHeight: oldContentColumn.implicitHeight + 12
-                color: Qt.rgba(1, 0.2, 0.2, 0.1)
-                radius: 4
-                border.width: 1
-                border.color: Qt.rgba(1, 0.2, 0.2, 0.3)
-                visible: root.oldContent.length > 0
-
-                Column {
-                    id: oldContentColumn
-                    width: parent.width
-                    x: 6
-                    y: 6
-                    spacing: 4
-
-                    Text {
-                        text: qsTr("- Removed:")
-                        font.pixelSize: 10
-                        font.bold: true
-                        color: Qt.rgba(1, 0.2, 0.2, 0.9)
-                    }
-
-                    TextEdit {
-                        id: oldContentText
-                        width: parent.width - 12
-                        height: contentHeight
-                        text: root.oldContent
-                        font.family: root.codeFontFamily
-                        font.pixelSize: root.codeFontSize
-                        color: palette.text
-                        wrapMode: TextEdit.Wrap
-                        readOnly: true
-                        selectByMouse: true
-                        selectByKeyboard: true
-                        textFormat: TextEdit.PlainText
-                    }
-                }
-            }
-
-            Rectangle {
-                Layout.fillWidth: true
-                Layout.preferredHeight: newContentColumn.implicitHeight + 12
-                color: Qt.rgba(0.2, 0.8, 0.2, 0.1)
-                radius: 4
-                border.width: 1
-                border.color: Qt.rgba(0.2, 0.8, 0.2, 0.3)
-
-                Column {
-                    id: newContentColumn
-                    width: parent.width
-                    x: 6
-                    y: 6
-                    spacing: 4
-
-                    Text {
-                        text: qsTr("+ Added:")
-                        font.pixelSize: 10
-                        font.bold: true
-                        color: Qt.rgba(0.2, 0.8, 0.2, 0.9)
-                    }
-
-                    TextEdit {
-                        id: newContentText
-                        width: parent.width - 12
-                        height: contentHeight
-                        text: root.newContent
-                        font.family: root.codeFontFamily
-                        font.pixelSize: root.codeFontSize
-                        color: palette.text
-                        wrapMode: TextEdit.Wrap
-                        readOnly: true
-                        selectByMouse: true
-                        selectByKeyboard: true
-                        textFormat: TextEdit.PlainText
-                    }
-                }
-            }
-
-            Text {
-                Layout.fillWidth: true
-                visible: root.statusMessage.length > 0
-                text: root.statusMessage
-                font.pixelSize: 10
-                font.italic: true
-                color: root.isApplied
-                    ? Qt.rgba(0.2, 0.6, 0.2, 1)
-                    : Qt.rgba(0.8, 0.2, 0.2, 1)
-                wrapMode: Text.WordWrap
-            }
-        }
-    }
-}
--- a/ChatView/qml/RootItem.qml
+++ b/ChatView/qml/RootItem.qml
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024-2025 Petr Mironychev
+ * Copyright (C) 2024 Petr Mironychev
 *
 * This file is part of QodeAssist.
 *
@@ -17,81 +17,28 @@
 * along with QodeAssist. If not, see <https://www.gnu.org/licenses/>.
 */

+pragma ComponentBehavior: Bound
+
 import QtQuick
 import QtQuick.Controls
 import QtQuick.Controls.Basic as QQC
 import QtQuick.Layouts
 import ChatView
-import UIControls
-import Qt.labs.platform as Platform
-import "./parts"

 ChatRootView {
    id: root

-    property SystemPalette sysPalette: SystemPalette {
-        colorGroup: SystemPalette.Active
-    }
-
-    palette {
-        window: sysPalette.window
-        windowText: sysPalette.windowText
-        base: sysPalette.base
-        alternateBase: sysPalette.alternateBase
-        text: sysPalette.text
-        button: sysPalette.button
-        buttonText: sysPalette.buttonText
-        highlight: sysPalette.highlight
-        highlightedText: sysPalette.highlightedText
-        light: sysPalette.light
-        mid: sysPalette.mid
-        dark: sysPalette.dark
-        shadow: sysPalette.shadow
-        brightText: sysPalette.brightText
-    }
-
    Rectangle {
        id: bg
-
        anchors.fill: parent
-        color: palette.window
+        color: root.backgroundColor
    }

    ColumnLayout {
-        anchors.fill: parent
-        spacing: 0
-
-        TopBar {
-            id: topBar
-
-            Layout.preferredWidth: parent.width
-            Layout.preferredHeight: childrenRect.height + 10
-
-            saveButton.onClicked: root.showSaveDialog()
-            loadButton.onClicked: root.showLoadDialog()
-            clearButton.onClicked: root.clearChat()
-            tokensBadge {
-                text: qsTr("%1/%2").arg(root.inputTokensCount).arg(root.chatModel.tokensThreshold)
-            }
-            recentPath {
-                text: qsTr("Сhat name: %1").arg(root.chatFileName.length > 0 ? root.chatFileName : "Unsaved")
-            }
-            openChatHistory.onClicked: root.openChatHistoryFolder()
-            rulesButton.onClicked: rulesViewer.open()
-            activeRulesCount: root.activeRulesCount
-            pinButton {
-                visible: typeof _chatview !== 'undefined'
-                checked: typeof _chatview !== 'undefined' ? _chatview.isPin : false
-                onCheckedChanged: _chatview.isPin = topBar.pinButton.checked
-            }
-            agentModeSwitch {
-                checked: root.isAgentMode
-                enabled: root.toolsSupportEnabled
-                onToggled: {
-                    root.isAgentMode = agentModeSwitch.checked
-                }
-            }
+        anchors {
+            fill: parent
        }
+        spacing: 10

        ListView {
            id: chatListView
@@ -105,21 +52,16 @@ ChatRootView {
            boundsBehavior: Flickable.StopAtBounds
            cacheBuffer: 2000

-            delegate: Loader {
+            delegate: ChatItem {
                required property var model
-                required property int index
-
                width: ListView.view.width - scroll.width
+                msgModel: root.chatModel.processMessageContent(model.content)
+                color: model.roleType === ChatModel.User ? root.primaryColor : root.secondaryColor
+                fontColor: root.primaryColor.hslLightness > 0.5 ? "black" : "white"
+                codeBgColor: root.codeColor
+                selectionColor: root.primaryColor.hslLightness > 0.5 ? Qt.darker(root.primaryColor, 1.5)
+                                                                     : Qt.lighter(root.primaryColor, 1.5)

-                sourceComponent: {
-                    if (model.roleType === ChatModel.Tool) {
-                        return toolMessageComponent
-                    } else if (model.roleType === ChatModel.FileEdit) {
-                        return fileEditMessageComponent
-                    } else {
-                        return chatItemComponent
-                    }
-                }
            }

            header: Item {
@@ -127,7 +69,7 @@ ChatRootView {
                height: 30
            }

-            ScrollBar.vertical: QQC.ScrollBar {
+            ScrollBar.vertical: ScrollBar {
                id: scroll
            }

@@ -140,65 +82,6 @@ ChatRootView {
                    root.scrollToBottom()
                }
            }
-
-            Component {
-                id: chatItemComponent
-
-                ChatItem {
-                    id: chatItemInstance
-
-                    width: parent.width
-                    msgModel: root.chatModel.processMessageContent(model.content)
-                    messageAttachments: model.attachments
-                    isUserMessage: model.roleType === ChatModel.User
-                    messageIndex: index
-                    textFontFamily: root.textFontFamily
-                    codeFontFamily: root.codeFontFamily
-                    codeFontSize: root.codeFontSize
-                    textFontSize: root.textFontSize
-                    textFormat: root.textFormat
-
-                    onResetChatToMessage: function(idx) {
-                        messageInput.text = model.content
-                        messageInput.cursorPosition = model.content.length
-                        root.chatModel.resetModelTo(idx)
-                    }
-                }
-            }
-
-            Component {
-                id: toolMessageComponent
-
-                ToolStatusItem {
-                    width: parent.width
-                    toolContent: model.content
-                }
-            }
-
-            Component {
-                id: fileEditMessageComponent
-
-                FileEditItem {
-                    width: parent.width
-                    editContent: model.content
-
-                    onApplyEdit: function(editId) {
-                        root.applyFileEdit(editId)
-                    }
-
-                    onRejectEdit: function(editId) {
-                        root.rejectFileEdit(editId)
-                    }
-
-                    onUndoEdit: function(editId) {
-                        root.undoFileEdit(editId)
-                    }
-
-                    onOpenInEditor: function(editId) {
-                        root.openFileEditInEditor(editId)
-                    }
-                }
-            }
        }

        ScrollView {
@@ -211,150 +94,84 @@ ChatRootView {
            QQC.TextArea {
                id: messageInput

-                placeholderText: Qt.platform.os === "osx"
-                                 ? qsTr("Type your message here... (⌘+↩ to send)")
-                                 : qsTr("Type your message here... (Ctrl+Enter to send)")
-                placeholderTextColor: palette.mid
-                color: palette.text
+                placeholderText: qsTr("Type your message here...")
+                placeholderTextColor: "#888"
+                color: root.primaryColor.hslLightness > 0.5 ? "black" : "white"
                background: Rectangle {
                    radius: 2
-                    color: palette.base
-                    border.color:  messageInput.activeFocus ? palette.highlight : palette.button
+                    color: root.primaryColor
+                    border.color: root.primaryColor.hslLightness > 0.5 ? Qt.lighter(root.primaryColor, 1.5)
+                                                                       : Qt.darker(root.primaryColor, 1.5)
                    border.width: 1
-
-                    Behavior on border.color {
-                        ColorAnimation { duration: 150 }
-                    }
-
-                    Rectangle {
-                        anchors.fill: parent
-                        color: palette.highlight
-                        opacity: messageInput.hovered ? 0.1 : 0
-                        radius: parent.radius
+                }
+                Keys.onPressed: function(event) {
+                    if ((event.key === Qt.Key_Return || event.key === Qt.Key_Enter) && !(event.modifiers & Qt.ShiftModifier)) {
+                        root.sendChatMessage()
+                        event.accepted = true;
                    }
                }
-
-                onTextChanged: root.calculateMessageTokensCount(messageInput.text)
-
-                MouseArea {
-                    anchors.fill: parent
-                    acceptedButtons: Qt.RightButton
-                    onClicked: messageContextMenu.open()
-                    propagateComposedEvents: true
-                }
            }
        }

-        Platform.Menu {
-            id: messageContextMenu
-
-            Platform.MenuItem {
-                text: qsTr("Cut")
-                enabled: messageInput.selectedText.length > 0
-                onTriggered: messageInput.cut()
-            }
-
-            Platform.MenuItem {
-                text: qsTr("Copy")
-                enabled: messageInput.selectedText.length > 0
-                onTriggered: messageInput.copy()
-            }
-
-            Platform.MenuItem {
-                text: qsTr("Paste")
-                enabled: messageInput.canPaste
-                onTriggered: messageInput.paste()
-            }
-
-            Platform.MenuSeparator {}
-
-            Platform.MenuItem {
-                text: qsTr("Select All")
-                enabled: messageInput.text.length > 0
-                onTriggered: messageInput.selectAll()
-            }
-
-            Platform.MenuSeparator {}
-
-            Platform.MenuItem {
-                text: qsTr("Clear")
-                enabled: messageInput.text.length > 0
-                onTriggered: messageInput.clear()
-            }
-        }
-
-        AttachedFilesPlace {
-            id: attachedFilesPlace
-
+        RowLayout {
            Layout.fillWidth: true
-            attachedFilesModel: root.attachmentFiles
-            iconPath: palette.window.hslLightness > 0.5 ? "qrc:/qt/qml/ChatView/icons/attach-file-dark.svg"
-                                                        : "qrc:/qt/qml/ChatView/icons/attach-file-light.svg"
-            accentColor: Qt.tint(palette.mid, Qt.rgba(0, 0.8, 0.3, 0.4))
-            onRemoveFileFromListByIndex: (index) => root.removeFileFromAttachList(index)
-        }
+            spacing: 5

-        AttachedFilesPlace {
-            id: linkedFilesPlace
+            Button {
+                id: sendButton

-            Layout.fillWidth: true
-            attachedFilesModel: root.linkedFiles
-            iconPath: palette.window.hslLightness > 0.5 ? "qrc:/qt/qml/ChatView/icons/link-file-dark.svg"
-                                                        : "qrc:/qt/qml/ChatView/icons/link-file-light.svg"
-            accentColor: Qt.tint(palette.mid, Qt.rgba(0, 0.3, 0.8, 0.4))
-            onRemoveFileFromListByIndex: (index) => root.removeFileFromLinkList(index)
-        }
-
-        FileEditsActionBar {
-            id: fileEditsActionBar
-
-            Layout.fillWidth: true
-            totalEdits: root.currentMessageTotalEdits
-            appliedEdits: root.currentMessageAppliedEdits
-            pendingEdits: root.currentMessagePendingEdits
-            rejectedEdits: root.currentMessageRejectedEdits
-
-            onApplyAllClicked: root.applyAllFileEditsForCurrentMessage()
-            onUndoAllClicked: root.undoAllFileEditsForCurrentMessage()
-        }
-
-        BottomBar {
-            id: bottomBar
-
-            Layout.preferredWidth: parent.width
-            Layout.preferredHeight: 40
-
-            sendButton.onClicked: !root.isRequestInProgress ? root.sendChatMessage()
-                                                            : root.cancelRequest()
-            sendButton.icon.source: !root.isRequestInProgress ? "qrc:/qt/qml/ChatView/icons/chat-icon.svg"
-                                                              : "qrc:/qt/qml/ChatView/icons/chat-pause-icon.svg"
-            sendButton.ToolTip.text: !root.isRequestInProgress ? qsTr("Send message to LLM %1").arg(Qt.platform.os === "osx" ? "Cmd+Return" : "Ctrl+Return")
-                                                               : qsTr("Stop")
-            syncOpenFiles {
-                checked: root.isSyncOpenFiles
-                onCheckedChanged: root.setIsSyncOpenFiles(bottomBar.syncOpenFiles.checked)
+                Layout.alignment: Qt.AlignBottom
+                text: qsTr("Send")
+                onClicked: root.sendChatMessage()
+            }
+
+            Button {
+                id: stopButton
+
+                Layout.alignment: Qt.AlignBottom
+                text: qsTr("Stop")
+                onClicked: root.cancelRequest()
+            }
+
+            Button {
+                id: clearButton
+
+                Layout.alignment: Qt.AlignBottom
+                text: qsTr("Clear Chat")
+                onClicked: root.clearChat()
+            }
+
+            CheckBox {
+                id: sharingCurrentFile
+
+                text: "Share current file with models"
+                checked: root.isSharingCurrentFile
            }
-            attachFiles.onClicked: root.showAttachFilesDialog()
-            linkFiles.onClicked: root.showLinkFilesDialog()
        }
    }

-    Shortcut {
-        id: sendMessageShortcut
+    Row {
+        id: bar

-        sequences: ["Ctrl+Return", "Ctrl+Enter"]
-        context: Qt.WindowShortcut
-        onActivated: {
-            if (messageInput.activeFocus && !Qt.inputMethod.visible) {
-                root.sendChatMessage()
-            }
+        layoutDirection: Qt.RightToLeft
+
+        anchors {
+            left: parent.left
+            leftMargin: 5
+            right: parent.right
+            rightMargin: scroll.width
+        }
+        spacing: 10
+
+        Badge {
+            text: qsTr("tokens:%1/%2").arg(root.chatModel.totalTokens).arg(root.chatModel.tokensThreshold)
+            color: root.codeColor
+            fontColor: root.primaryColor.hslLightness > 0.5 ? "black" : "white"
        }
    }

    function clearChat() {
        root.chatModel.clear()
-        root.clearAttachmentFiles()
-        root.updateInputTokensCount()
    }

    function scrollToBottom() {
@@ -362,59 +179,8 @@ ChatRootView {
    }

    function sendChatMessage() {
-        root.sendMessage(messageInput.text)
+        root.sendMessage(messageInput.text, sharingCurrentFile.checked)
        messageInput.text = ""
        scrollToBottom()
    }
-
-    Toast {
-        id: errorToast
-        z: 1000
-
-        color: Qt.rgba(0.8, 0.2, 0.2, 0.7)
-        border.color: Qt.darker(infoToast.color, 1.3)
-        toastTextColor: "#FFFFFF"
-    }
-
-    Toast {
-        id: infoToast
-        z: 1000
-
-        color: Qt.rgba(0.2, 0.8, 0.2, 0.7)
-        border.color: Qt.darker(infoToast.color, 1.3)
-        toastTextColor: "#FFFFFF"
-    }
-
-    RulesViewer {
-        id: rulesViewer
-
-        width: parent.width * 0.8
-        height: parent.height * 0.8
-        x: (parent.width - width) / 2
-        y: (parent.height - height) / 2
-
-        activeRules: root.activeRules
-        ruleContentAreaText: root.getRuleContent(rulesViewer.rulesCurrentIndex)
-        
-        onRefreshRules: root.refreshRules()
-        onOpenRulesFolder: root.openRulesFolder()
-    }
-
-    Connections {
-        target: root
-        function onLastErrorMessageChanged() {
-            if (root.lastErrorMessage.length > 0) {
-                errorToast.show(root.lastErrorMessage)
-            }
-        }
-        function onLastInfoMessageChanged() {
-            if (root.lastInfoMessage.length > 0) {
-                infoToast.show(root.lastInfoMessage)
-            }
-        }
-    }
-
-    Component.onCompleted: {
-        messageInput.forceActiveFocus()
-    }
 }
--- a/ChatView/qml/ToolStatusItem.qml
+++ b/ChatView/qml/ToolStatusItem.qml
@@ -1,160 +0,0 @@
-/*
- * Copyright (C) 2025 Petr Mironychev
- *
- * This file is part of QodeAssist.
- *
- * QodeAssist is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QodeAssist is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QodeAssist. If not, see <https://www.gnu.org/licenses/>.
- */
-
-import QtQuick
-import Qt.labs.platform as Platform
-
-Rectangle {
-    id: root
-
-    property string toolContent: ""
-    property bool expanded: false
-
-    readonly property int firstNewline: toolContent.indexOf('\n')
-    readonly property string toolName: firstNewline > 0 ? toolContent.substring(0, firstNewline) : toolContent
-    readonly property string toolResult: firstNewline > 0 ? toolContent.substring(firstNewline + 1) : ""
-
-    radius: 6
-    color: palette.base
-    clip: true
-
-    Behavior on implicitHeight {
-        NumberAnimation { duration: 200; easing.type: Easing.InOutQuad }
-    }
-
-    MouseArea {
-        id: header
-
-        width: parent.width
-        height: headerRow.height + 10
-        cursorShape: Qt.PointingHandCursor
-        onClicked: root.expanded = !root.expanded
-
-        Row {
-            id: headerRow
-
-            anchors {
-                verticalCenter: parent.verticalCenter
-                left: parent.left
-                leftMargin: 10
-            }
-            width: parent.width
-            spacing: 8
-
-            Text {
-                text: qsTr("Tool: %1").arg(root.toolName)
-                font.pixelSize: 13
-                font.bold: true
-                color: palette.text
-            }
-
-            Text {
-                anchors.verticalCenter: parent.verticalCenter
-                text: root.expanded ? "▼" : "▶"
-                font.pixelSize: 10
-                color: palette.mid
-            }
-        }
-    }
-
-    Column {
-        id: contentColumn
-
-        anchors {
-            left: parent.left
-            right: parent.right
-            top: header.bottom
-            margins: 10
-        }
-        spacing: 8
-
-        TextEdit {
-            id: resultText
-
-            width: parent.width
-            text: root.toolResult
-            readOnly: true
-            selectByMouse: true
-            color: palette.text
-            wrapMode: Text.WordWrap
-            font.family: "monospace"
-            font.pixelSize: 11
-            selectionColor: palette.highlight
-        }
-    }
-
-    MouseArea {
-        anchors.fill: parent
-        acceptedButtons: Qt.RightButton
-        onClicked: contextMenu.open()
-        propagateComposedEvents: true
-    }
-
-    Platform.Menu {
-        id: contextMenu
-
-        Platform.MenuItem {
-            text: qsTr("Copy")
-            enabled: resultText.selectedText.length > 0
-            onTriggered: resultText.copy()
-        }
-
-        Platform.MenuItem {
-            text: qsTr("Select All")
-            enabled: resultText.text.length > 0
-            onTriggered: resultText.selectAll()
-        }
-
-        Platform.MenuSeparator {}
-
-        Platform.MenuItem {
-            text: root.expanded ? qsTr("Collapse") : qsTr("Expand")
-            onTriggered: root.expanded = !root.expanded
-        }
-    }
-
-    Rectangle {
-        id: messageMarker
-
-        anchors.verticalCenter: parent.verticalCenter
-        width: 3
-        height: root.height - root.radius
-        color: root.color.hslLightness > 0.5 ? Qt.darker(palette.alternateBase, 1.3)
-                                             : Qt.lighter(palette.alternateBase, 1.3)
-        radius: root.radius
-    }
-
-
-    states: [
-        State {
-            when: !root.expanded
-            PropertyChanges {
-                target: root
-                implicitHeight: header.height
-            }
-        },
-        State {
-            when: root.expanded
-            PropertyChanges {
-                target: root
-                implicitHeight: header.height + contentColumn.height + 20
-            }
-        }
-    ]
-}
--- a/ChatView/qml/dialog/CodeBlock.qml
+++ b/ChatView/qml/dialog/CodeBlock.qml
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024-2025 Petr Mironychev
+ * Copyright (C) 2024 Petr Mironychev
 *
 * This file is part of QodeAssist.
 *
@@ -20,127 +20,71 @@
 import QtQuick
 import QtQuick.Controls
 import ChatView
-import UIControls
-import Qt.labs.platform as Platform

 Rectangle {
    id: root

    property string code: ""
    property string language: ""
-    property bool expanded: false
+    property color selectionColor

-    property alias codeFontFamily: codeText.font.family
-    property alias codeFontSize: codeText.font.pointSize
-    readonly property real collapsedHeight: copyButton.height + 10
+    readonly property string monospaceFont: {
+        switch (Qt.platform.os) {
+            case "windows":
+                return "Consolas";
+            case "osx":
+                return "Menlo";
+            case "linux":
+                return "DejaVu Sans Mono";
+            default:
+                return "monospace";
+        }
+    }

-    color: palette.alternateBase
    border.color: root.color.hslLightness > 0.5 ? Qt.darker(root.color, 1.3)
                                                : Qt.lighter(root.color, 1.3)
    border.width: 2
    radius: 4
-    implicitWidth: parent.width
-    clip: true

-    Behavior on implicitHeight {
-        NumberAnimation { duration: 200; easing.type: Easing.InOutQuad }
-    }
+    implicitWidth: parent.width
+    implicitHeight: codeText.implicitHeight + 20

    ChatUtils {
        id: utils
    }

-    HoverHandler {
-        id: hoverHandler
-        enabled: true
-    }
-
-    MouseArea {
-        id: header
-
-        width: parent.width
-        height: root.collapsedHeight
-        cursorShape: Qt.PointingHandCursor
-        onClicked: root.expanded = !root.expanded
-
-        Row {
-            id: headerRow
-
-            anchors {
-                verticalCenter: parent.verticalCenter
-                left: parent.left
-                leftMargin: 10
-            }
-            spacing: 6
-
-            Text {
-                text: root.language ? qsTr("Code (%1)").arg(root.language) :
-                                      qsTr("Code")
-                font.pixelSize: 12
-                font.bold: true
-                color: palette.text
-            }
-
-            Text {
-                anchors.verticalCenter: parent.verticalCenter
-                text: root.expanded ? "▼" : "▶"
-                font.pixelSize: 10
-                color: palette.mid
-            }
-        }
-    }
-
    TextEdit {
        id: codeText

-        anchors {
-            left: parent.left
-            right: parent.right
-            top: header.bottom
-            margins: 10
-        }
+        anchors.fill: parent
+        anchors.margins: 10
        text: root.code
        readOnly: true
        selectByMouse: true
+        font.family: root.monospaceFont
+        font.pointSize: 12
        color: parent.color.hslLightness > 0.5 ? "black" : "white"
        wrapMode: Text.WordWrap
-        selectionColor: palette.highlight
-
-        MouseArea {
-            anchors.fill: parent
-            acceptedButtons: Qt.RightButton
-            onClicked: contextMenu.open()
-        }
+        selectionColor: root.selectionColor
    }

-    Platform.Menu {
-        id: contextMenu
-
-        Platform.MenuItem {
-            text: qsTr("Copy")
-            onTriggered: {
-                const textToCopy = codeText.selectedText || root.code
-                utils.copyToClipboard(textToCopy)
-            }
-        }
-
-        Platform.MenuSeparator {}
-
-        Platform.MenuItem {
-            text: root.expanded ? qsTr("Collapse") : qsTr("Expand")
-            onTriggered: root.expanded = !root.expanded
-        }
-    }
-
-    QoAButton {
-        id: copyButton
-
+    TextEdit {
+        anchors.top: parent.top
        anchors.right: parent.right
-        anchors.rightMargin: 5
-
-        y: 5
-        text: qsTr("Copy")
+        anchors.margins: 5
+        readOnly: true
+        selectByMouse: true
+        text: root.language
+        color: root.color.hslLightness > 0.5 ? Qt.darker(root.color, 1.1)
+                                             : Qt.lighter(root.color, 1.1)
+        font.pointSize: 8
+    }

+    Button {
+        anchors.top: parent.top
+        anchors.right: parent.right
+        anchors.margins: 5
+        text: "Copy"
        onClicked: {
            utils.copyToClipboard(root.code)
            text = qsTr("Copied")
@@ -153,21 +97,4 @@ Rectangle {
            onTriggered: parent.text = qsTr("Copy")
        }
    }
-
-    states: [
-        State {
-            when: !root.expanded
-            PropertyChanges {
-                target: root
-                implicitHeight: root.collapsedHeight
-            }
-        },
-        State {
-            when: root.expanded
-            PropertyChanges {
-                target: root
-                implicitHeight: header.height + codeText.implicitHeight + 10
-            }
-        }
-    ]
 }
--- a/ChatView/qml/dialog/TextBlock.qml
+++ b/ChatView/qml/dialog/TextBlock.qml
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024-2025 Petr Mironychev
+ * Copyright (C) 2024 Petr Mironychev
 *
 * This file is part of QodeAssist.
 *
@@ -18,7 +18,6 @@
 */

 import QtQuick
-import Qt.labs.platform as Platform

 TextEdit {
    id: root
@@ -26,29 +25,5 @@ TextEdit {
    readOnly: true
    selectByMouse: true
    wrapMode: Text.WordWrap
-    selectionColor: palette.highlight
-    color: palette.text
-
-    MouseArea {
-        anchors.fill: parent
-        acceptedButtons: Qt.RightButton
-        onClicked: contextMenu.open()
-        propagateComposedEvents: true
-    }
-
-    Platform.Menu {
-        id: contextMenu
-
-        Platform.MenuItem {
-            text: qsTr("Copy")
-            enabled: root.selectedText.length > 0
-            onTriggered: root.copy()
-        }
-
-        Platform.MenuItem {
-            text: qsTr("Select All")
-            enabled: root.text.length > 0
-            onTriggered: root.selectAll()
-        }
-    }
+    textFormat: Text.StyledText
 }
--- a/ChatView/qml/parts/AttachedFilesPlace.qml
+++ b/ChatView/qml/parts/AttachedFilesPlace.qml
@@ -1,109 +0,0 @@
-/*
- * Copyright (C) 2024-2025 Petr Mironychev
- *
- * This file is part of QodeAssist.
- *
- * QodeAssist is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QodeAssist is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QodeAssist. If not, see <https://www.gnu.org/licenses/>.
- */
-
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Layouts
-import ChatView
-
-Flow {
-    id: root
-    
-    property alias attachedFilesModel: attachRepeater.model
-    property color accentColor: palette.mid
-    property string iconPath
-
-    signal removeFileFromListByIndex(index: int)
-
-    spacing: 5
-    leftPadding: 5
-    rightPadding: 5
-    topPadding: attachRepeater.model.length > 0 ? 2 : 0
-    bottomPadding: attachRepeater.model.length > 0 ? 2 : 0
-    
-    Repeater {
-        id: attachRepeater
-        
-        delegate: Rectangle {
-            required property int index
-            required property string modelData
-            
-            height: 30
-            width: contentRow.width + 10
-            radius: 4
-            color: palette.button
-            border.width: 1
-            border.color: mouse.hovered ? palette.highlight : root.accentColor
-
-            HoverHandler {
-                id: mouse
-            }
-            
-            Row {
-                id: contentRow
-
-                spacing: 5
-                anchors.verticalCenter: parent.verticalCenter
-                anchors.left: parent.left
-                anchors.leftMargin: 5
-
-                Image {
-                    id: icon
-
-                    anchors.verticalCenter: parent.verticalCenter
-                    source: root.iconPath
-                    sourceSize.width: 8
-                    sourceSize.height: 15
-                }
-                
-                Text {
-                    id: fileNameText
-                    
-                    anchors.verticalCenter: parent.verticalCenter
-                    color: palette.buttonText
-                    
-                    text: {
-                        const parts = modelData.split('/');
-                        return parts[parts.length - 1];
-                    }
-                }
-                
-                MouseArea {
-                    id: closeButton
-                    
-                    anchors.verticalCenter: parent.verticalCenter
-                    width: closeIcon.width + 5
-                    height: closeButton.width + 5
-                    
-                    onClicked: root.removeFileFromListByIndex(index)
-                    
-                    Image {
-                        id: closeIcon
-                        
-                        anchors.centerIn: parent
-                        source: palette.window.hslLightness > 0.5 ? "qrc:/qt/qml/ChatView/icons/close-dark.svg"
-                                                                  : "qrc:/qt/qml/ChatView/icons/close-light.svg"
-                        width: 6
-                        height: 6
-                    }
-                }
-            }
-        }
-    }
-}
--- a/ChatView/qml/parts/BottomBar.qml
+++ b/ChatView/qml/parts/BottomBar.qml
@@ -1,102 +0,0 @@
-/*
- * Copyright (C) 2024-2025 Petr Mironychev
- *
- * This file is part of QodeAssist.
- *
- * QodeAssist is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QodeAssist is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QodeAssist. If not, see <https://www.gnu.org/licenses/>.
- */
-
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Layouts
-import ChatView
-import UIControls
-
-Rectangle {
-    id: root
-
-    property alias sendButton: sendButtonId
-    property alias syncOpenFiles: syncOpenFilesId
-    property alias attachFiles: attachFilesId
-    property alias linkFiles: linkFilesId
-
-
-    color: palette.window.hslLightness > 0.5 ?
-               Qt.darker(palette.window, 1.1) :
-               Qt.lighter(palette.window, 1.1)
-
-    RowLayout {
-        id: bottomBar
-
-        anchors {
-            left: parent.left
-            leftMargin: 5
-            right: parent.right
-            rightMargin: 5
-            verticalCenter: parent.verticalCenter
-        }
-
-        spacing: 10
-
-        QoAButton {
-            id: sendButtonId
-
-            icon {
-                height: 15
-                width: 15
-            }
-            ToolTip.visible: hovered
-            ToolTip.delay: 250
-        }
-
-        QoAButton {
-            id: attachFilesId
-
-            icon {
-                source: "qrc:/qt/qml/ChatView/icons/attach-file-dark.svg"
-                height: 15
-                width: 8
-            }
-            ToolTip.visible: hovered
-            ToolTip.delay: 250
-            ToolTip.text: qsTr("Attach file to message")
-        }
-
-        QoAButton {
-            id: linkFilesId
-
-            icon {
-                source: "qrc:/qt/qml/ChatView/icons/link-file-dark.svg"
-                height: 15
-                width: 8
-            }
-            ToolTip.visible: hovered
-            ToolTip.delay: 250
-            ToolTip.text: qsTr("Link file to context")
-        }
-
-        CheckBox {
-            id: syncOpenFilesId
-
-            text: qsTr("Sync open files")
-
-            ToolTip.visible: syncOpenFilesId.hovered
-            ToolTip.text: qsTr("Automatically synchronize currently opened files with the model context")
-        }
-
-        Item {
-            Layout.fillWidth: true
-        }
-    }
-}
--- a/ChatView/qml/parts/FileEditsActionBar.qml
+++ b/ChatView/qml/parts/FileEditsActionBar.qml
@@ -1,161 +0,0 @@
-/*
- * Copyright (C) 2025 Petr Mironychev
- *
- * This file is part of QodeAssist.
- *
- * QodeAssist is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QodeAssist is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QodeAssist. If not, see <https://www.gnu.org/licenses/>.
- */
-
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Layouts
-import UIControls
-
-Rectangle {
-    id: root
-
-    property int totalEdits: 0
-    property int appliedEdits: 0
-    property int pendingEdits: 0
-    property int rejectedEdits: 0
-    property bool hasAppliedEdits: appliedEdits > 0
-    property bool hasRejectedEdits: rejectedEdits > 0
-    property bool hasPendingEdits: pendingEdits > 0
-
-    signal applyAllClicked()
-    signal undoAllClicked()
-
-    visible: totalEdits > 0
-    implicitHeight: visible ? 40 : 0
-
-    color: palette.window.hslLightness > 0.5 ?
-               Qt.darker(palette.window, 1.05) :
-               Qt.lighter(palette.window, 1.05)
-
-    border.width: 1
-    border.color: palette.mid
-
-    Behavior on implicitHeight {
-        NumberAnimation {
-            duration: 200
-            easing.type: Easing.InOutQuad
-        }
-    }
-
-    RowLayout {
-        anchors {
-            left: parent.left
-            leftMargin: 10
-            right: parent.right
-            rightMargin: 10
-            verticalCenter: parent.verticalCenter
-        }
-        spacing: 10
-
-        Rectangle {
-            Layout.preferredWidth: 24
-            Layout.preferredHeight: 24
-            radius: 12
-            color: {
-                if (root.hasPendingEdits) return Qt.rgba(0.2, 0.6, 1.0, 0.2)
-                if (root.hasAppliedEdits) return Qt.rgba(0.2, 0.8, 0.2, 0.2)
-                return Qt.rgba(0.8, 0.6, 0.2, 0.2)
-            }
-            border.width: 2
-            border.color: {
-                if (root.hasPendingEdits) return Qt.rgba(0.2, 0.6, 1.0, 0.8)
-                if (root.hasAppliedEdits) return Qt.rgba(0.2, 0.8, 0.2, 0.8)
-                return Qt.rgba(0.8, 0.6, 0.2, 0.8)
-            }
-
-            Text {
-                anchors.centerIn: parent
-                text: root.totalEdits
-                font.pixelSize: 10
-                font.bold: true
-                color: palette.text
-            }
-        }
-
-        // Status text
-        ColumnLayout {
-            spacing: 2
-
-            Text {
-                text: root.totalEdits === 1 
-                    ? qsTr("File Edit in Current Message")
-                    : qsTr("%1 File Edits in Current Message").arg(root.totalEdits)
-                font.pixelSize: 11
-                font.bold: true
-                color: palette.text
-            }
-
-            Text {
-                visible: root.totalEdits > 0
-                text: {
-                    let parts = [];
-                    if (root.appliedEdits > 0) {
-                        parts.push(qsTr("%1 applied").arg(root.appliedEdits));
-                    }
-                    if (root.pendingEdits > 0) {
-                        parts.push(qsTr("%1 pending").arg(root.pendingEdits));
-                    }
-                    if (root.rejectedEdits > 0) {
-                        parts.push(qsTr("%1 rejected").arg(root.rejectedEdits));
-                    }
-                    return parts.join(", ");
-                }
-                font.pixelSize: 9
-                color: palette.mid
-            }
-        }
-
-        Item {
-            Layout.fillWidth: true
-        }
-
-        QoAButton {
-            id: applyAllButton
-
-            visible: root.hasPendingEdits || root.hasRejectedEdits
-            enabled: root.hasPendingEdits || root.hasRejectedEdits
-            text: root.hasPendingEdits 
-                ? qsTr("Apply All (%1)").arg(root.pendingEdits + root.rejectedEdits)
-                : qsTr("Reapply All (%1)").arg(root.rejectedEdits)
-            
-            ToolTip.visible: hovered
-            ToolTip.delay: 250
-            ToolTip.text: root.hasPendingEdits
-                ? qsTr("Apply all pending and rejected edits in this message")
-                : qsTr("Reapply all rejected edits in this message")
-
-            onClicked: root.applyAllClicked()
-        }
-
-        QoAButton {
-            id: undoAllButton
-
-            visible: root.hasAppliedEdits
-            enabled: root.hasAppliedEdits
-            text: qsTr("Undo All (%1)").arg(root.appliedEdits)
-            
-            ToolTip.visible: hovered
-            ToolTip.delay: 250
-            ToolTip.text: qsTr("Undo all applied edits in this message")
-
-            onClicked: root.undoAllClicked()
-        }
-    }
-}
-
--- a/ChatView/qml/parts/RulesViewer.qml
+++ b/ChatView/qml/parts/RulesViewer.qml
@@ -1,259 +0,0 @@
-/*
- * Copyright (C) 2025 Petr Mironychev
- *
- * This file is part of QodeAssist.
- *
- * QodeAssist is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QodeAssist is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QodeAssist. If not, see <https://www.gnu.org/licenses/>.
- */
-
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Layouts
-import QtQuick.Controls.Basic as QQC
-
-import UIControls
-import ChatView
-
-Popup {
-    id: root
-
-    property var activeRules
-
-    property alias rulesCurrentIndex: rulesList.currentIndex
-    property alias ruleContentAreaText: ruleContentArea.text
-
-    signal refreshRules()
-    signal openRulesFolder()
-
-    modal: true
-    focus: true
-    closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutside
-
-    background: Rectangle {
-        color: palette.window
-        border.color: palette.mid
-        border.width: 1
-        radius: 4
-    }
-
-    ChatUtils {
-        id: utils
-    }
-
-    ColumnLayout {
-        anchors.fill: parent
-        anchors.margins: 10
-        spacing: 10
-
-        RowLayout {
-            Layout.fillWidth: true
-            spacing: 10
-
-            Text {
-                text: qsTr("Active Project Rules")
-                font.pixelSize: 16
-                font.bold: true
-                color: palette.text
-                Layout.fillWidth: true
-            }
-
-            QoAButton {
-                text: qsTr("Open Folder")
-                onClicked: root.openRulesFolder()
-            }
-
-            QoAButton {
-                text: qsTr("Refresh")
-                onClicked: root.refreshRules()
-            }
-
-            QoAButton {
-                text: qsTr("Close")
-                onClicked: root.close()
-            }
-        }
-
-        Rectangle {
-            Layout.fillWidth: true
-            height: 1
-            color: palette.mid
-        }
-
-        SplitView {
-            Layout.fillWidth: true
-            Layout.fillHeight: true
-            orientation: Qt.Horizontal
-
-            Rectangle {
-                SplitView.minimumWidth: 200
-                SplitView.preferredWidth: parent.width * 0.3
-                color: palette.base
-                border.color: palette.mid
-                border.width: 1
-                radius: 2
-
-                ColumnLayout {
-                    anchors.fill: parent
-                    anchors.margins: 5
-                    spacing: 5
-
-                    Text {
-                        text: qsTr("Rules Files (%1)").arg(rulesList.count)
-                        font.pixelSize: 12
-                        font.bold: true
-                        color: palette.text
-                        Layout.fillWidth: true
-                    }
-
-                    ListView {
-                        id: rulesList
-
-                        Layout.fillWidth: true
-                        Layout.fillHeight: true
-                        clip: true
-                        model: root.activeRules
-                        currentIndex: 0
-
-                        delegate: ItemDelegate {
-                            required property var modelData
-                            required property int index
-
-                            width: ListView.view.width
-                            highlighted: ListView.isCurrentItem
-
-                            background: Rectangle {
-                                color: {
-                                    if (parent.highlighted) {
-                                        return palette.highlight
-                                    } else if (parent.hovered) {
-                                        return Qt.tint(palette.base, Qt.rgba(0, 0, 0, 0.05))
-                                    }
-                                    return "transparent"
-                                }
-                                radius: 2
-                            }
-
-                            contentItem: ColumnLayout {
-                                spacing: 2
-
-                                Text {
-                                    text: modelData.fileName
-                                    font.pixelSize: 11
-                                    color: parent.parent.highlighted ? palette.highlightedText : palette.text
-                                    elide: Text.ElideMiddle
-                                    Layout.fillWidth: true
-                                }
-
-                                Text {
-                                    text: qsTr("Category: %1").arg(modelData.category)
-                                    font.pixelSize: 9
-                                    color: parent.parent.highlighted ? palette.highlightedText : palette.mid
-                                    Layout.fillWidth: true
-                                }
-                            }
-
-                            onClicked: {
-                                rulesList.currentIndex = index
-                            }
-                        }
-
-                        ScrollBar.vertical: QQC.ScrollBar {
-                            id: scroll
-                        }
-                    }
-
-                    Text {
-                        visible: rulesList.count === 0
-                        text: qsTr("No rules found.\nCreate .md files in:\n.qodeassist/rules/common/\n.qodeassist/rules/chat/")
-                        font.pixelSize: 10
-                        color: palette.mid
-                        horizontalAlignment: Text.AlignHCenter
-                        wrapMode: Text.WordWrap
-                        Layout.fillWidth: true
-                        Layout.fillHeight: true
-                        Layout.alignment: Qt.AlignCenter
-                    }
-                }
-            }
-
-            Rectangle {
-                SplitView.fillWidth: true
-                color: palette.base
-                border.color: palette.mid
-                border.width: 1
-                radius: 2
-
-                ColumnLayout {
-                    anchors.fill: parent
-                    anchors.margins: 5
-                    spacing: 5
-
-                    RowLayout {
-                        Layout.fillWidth: true
-                        spacing: 5
-
-                        Text {
-                            text: qsTr("Content")
-                            font.pixelSize: 12
-                            font.bold: true
-                            color: palette.text
-                            Layout.fillWidth: true
-                        }
-
-                        QoAButton {
-                            text: qsTr("Copy")
-                            enabled: ruleContentArea.text.length > 0
-                            onClicked: utils.copyToClipboard(ruleContentArea.text)
-                        }
-                    }
-
-                    ScrollView {
-                        Layout.fillWidth: true
-                        Layout.fillHeight: true
-                        clip: true
-
-                        QQC.TextArea {
-                            id: ruleContentArea
-
-                            readOnly: true
-                            wrapMode: TextArea.Wrap
-                            selectByMouse: true
-                            color: palette.text
-                            font.family: "monospace"
-                            font.pixelSize: 11
-
-                            background: Rectangle {
-                                color: Qt.darker(palette.base, 1.02)
-                                border.color: palette.mid
-                                border.width: 1
-                                radius: 2
-                            }
-
-                            placeholderText: qsTr("Select a rule file to view its content")
-                        }
-                    }
-                }
-            }
-        }
-
-        Text {
-            text: qsTr("Rules are loaded from .qodeassist/rules/ directory in your project.\n" +
-                      "Common rules apply to all contexts, chat rules apply only to chat assistant.")
-            font.pixelSize: 9
-            color: palette.mid
-            wrapMode: Text.WordWrap
-            Layout.fillWidth: true
-        }
-    }
-}
--- a/ChatView/qml/parts/Toast.qml
+++ b/ChatView/qml/parts/Toast.qml
@@ -1,103 +0,0 @@
-/*
- * Copyright (C) 2025 Petr Mironychev
- *
- * This file is part of QodeAssist.
- *
- * QodeAssist is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QodeAssist is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QodeAssist. If not, see <https://www.gnu.org/licenses/>.
- */
-
-import QtQuick
-
-Rectangle {
-    id: root
-
-    property alias toastTextItem: textItem
-    property alias toastTextColor: textItem.color
-
-    property string errorText: ""
-    property int displayDuration: 5000
-
-    width: Math.min(parent.width - 40, textItem.implicitWidth + radius)
-    height: visible ? (textItem.implicitHeight + 12) : 0
-    anchors.horizontalCenter: parent.horizontalCenter
-    anchors.top: parent.top
-    anchors.topMargin: 10
-
-    color: "#d32f2f"
-    radius: height / 2
-    border.color: "#b71c1c"
-    border.width: 1
-    visible: false
-    opacity: 0
-
-    TextEdit {
-        id: textItem
-
-        anchors.centerIn: parent
-        anchors.margins: 6
-        text: root.errorText
-        color: palette.text
-        font.pixelSize: 13
-        wrapMode: TextEdit.Wrap
-        width: Math.min(implicitWidth, root.parent.width - 60)
-        horizontalAlignment: TextEdit.AlignHCenter
-        readOnly: true
-        selectByMouse: true
-        selectByKeyboard: true
-        selectionColor: "#b71c1c"
-    }
-
-    function show(message) {
-        errorText = message
-        visible = true
-        showAnimation.start()
-        hideTimer.restart()
-    }
-
-    function hide() {
-        hideAnimation.start()
-    }
-
-    NumberAnimation {
-        id: showAnimation
-
-        target: root
-        property: "opacity"
-        from: 0
-        to: 1
-        duration: 200
-        easing.type: Easing.OutQuad
-    }
-
-    NumberAnimation {
-        id: hideAnimation
-
-        target: root
-        property: "opacity"
-        from: 1
-        to: 0
-        duration: 200
-        easing.type: Easing.InQuad
-        onFinished: root.visible = false
-    }
-
-    Timer {
-        id: hideTimer
-
-        interval: root.displayDuration
-        running: false
-        repeat: false
-        onTriggered: root.hide()
-    }
-}
--- a/ChatView/qml/parts/TopBar.qml
+++ b/ChatView/qml/parts/TopBar.qml
@@ -1,211 +0,0 @@
-/*
- * Copyright (C) 2024-2025 Petr Mironychev
- *
- * This file is part of QodeAssist.
- *
- * QodeAssist is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QodeAssist is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QodeAssist. If not, see <https://www.gnu.org/licenses/>.
- */
-
-import QtQuick
-import QtQuick.Layouts
-import QtQuick.Controls
-import ChatView
-import UIControls
-
-Rectangle {
-    id: root
-
-    property alias saveButton: saveButtonId
-    property alias loadButton: loadButtonId
-    property alias clearButton: clearButtonId
-    property alias tokensBadge: tokensBadgeId
-    property alias recentPath: recentPathId
-    property alias openChatHistory: openChatHistoryId
-    property alias pinButton: pinButtonId
-    property alias rulesButton: rulesButtonId
-    property alias agentModeSwitch: agentModeSwitchId
-    property alias activeRulesCount: activeRulesCountId.text
-
-    color: palette.window.hslLightness > 0.5 ?
-               Qt.darker(palette.window, 1.1) :
-               Qt.lighter(palette.window, 1.1)
-
-    Flow {
-        anchors {
-            left: parent.left
-            right: parent.right
-            verticalCenter: parent.verticalCenter
-            margins: 5
-        }
-        spacing: 10
-
-        QoAButton {
-            id: pinButtonId
-
-            checkable: true
-
-            icon {
-                source: checked ? "qrc:/qt/qml/ChatView/icons/window-lock.svg"
-                                : "qrc:/qt/qml/ChatView/icons/window-unlock.svg"
-                color: palette.window.hslLightness > 0.5 ? "#000000" : "#FFFFFF"
-                height: 15
-                width: 15
-            }
-            ToolTip.visible: hovered
-            ToolTip.delay: 250
-            ToolTip.text: checked ? qsTr("Unpin chat window")
-                                  : qsTr("Pin chat window to the top")
-        }
-
-        QoATextSlider {
-            id: agentModeSwitchId
-
-            leftText: "chat"
-            rightText: "AI Agent"
-
-            ToolTip.visible: hovered
-            ToolTip.delay: 250
-            ToolTip.text: {
-                if (!agentModeSwitchId.enabled) {
-                    return qsTr("Tools are disabled in General Settings")
-                }
-                return checked
-                        ? qsTr("Agent Mode: AI can use tools to read files, search project, and build code")
-                        : qsTr("Chat Mode: Simple conversation without tool access")
-            }
-        }
-
-        Item {
-            height: agentModeSwitchId.height
-            width: recentPathId.width
-
-            Text {
-                id: recentPathId
-
-                anchors.verticalCenter: parent.verticalCenter
-                width: Math.min(implicitWidth, root.width)
-                elide: Text.ElideMiddle
-                color: palette.text
-                font.pixelSize: 12
-
-                MouseArea {
-                    anchors.fill: parent
-                    hoverEnabled: true
-
-                    ToolTip.visible: containsMouse
-                    ToolTip.delay: 500
-                    ToolTip.text: recentPathId.text
-                }
-            }
-        }
-
-        RowLayout {
-            Layout.preferredWidth: root.width
-
-            spacing: 10
-
-            QoAButton {
-                id: saveButtonId
-
-                icon {
-                    source: "qrc:/qt/qml/ChatView/icons/save-chat-dark.svg"
-                    height: 15
-                    width: 8
-                }
-                ToolTip.visible: hovered
-                ToolTip.delay: 250
-                ToolTip.text: qsTr("Save chat to *.json file")
-            }
-
-            QoAButton {
-                id: loadButtonId
-
-                icon {
-                    source: "qrc:/qt/qml/ChatView/icons/load-chat-dark.svg"
-                    height: 15
-                    width: 8
-                }
-                ToolTip.visible: hovered
-                ToolTip.delay: 250
-                ToolTip.text: qsTr("Load chat from *.json file")
-            }
-
-            QoAButton {
-                id: clearButtonId
-
-                icon {
-                    source: "qrc:/qt/qml/ChatView/icons/clean-icon-dark.svg"
-                    height: 15
-                    width: 8
-                }
-                ToolTip.visible: hovered
-                ToolTip.delay: 250
-                ToolTip.text: qsTr("Clean chat")
-            }
-
-            QoAButton {
-                id: openChatHistoryId
-
-                icon {
-                    source: "qrc:/qt/qml/ChatView/icons/file-in-system.svg"
-                    height: 15
-                    width: 15
-                }
-                ToolTip.visible: hovered
-                ToolTip.delay: 250
-                ToolTip.text: qsTr("Show in system")
-            }
-
-            QoAButton {
-                id: rulesButtonId
-
-                icon {
-                    source: "qrc:/qt/qml/ChatView/icons/rules-icon.svg"
-                    height: 15
-                    width: 15
-                }
-                text: " "
-
-                ToolTip.visible: hovered
-                ToolTip.delay: 250
-                ToolTip.text: root.activeRulesCount > 0
-                              ? qsTr("View active project rules (%1)").arg(root.activeRulesCount)
-                              : qsTr("View active project rules (no rules found)")
-
-                Text {
-                    id: activeRulesCountId
-
-                    anchors {
-                        bottom: parent.bottom
-                        bottomMargin: 2
-                        right: parent.right
-                        rightMargin: 4
-                    }
-
-                    color: palette.text
-                    font.pixelSize: 10
-                    font.bold: true
-                }
-            }
-
-            Badge {
-                id: tokensBadgeId
-
-                ToolTip.visible: hovered
-                ToolTip.delay: 250
-                ToolTip.text: qsTr("Current amount tokens in chat and LLM limit threshold")
-            }
-        }
-    }
-}
--- a/CodeHandler.cpp
+++ b/CodeHandler.cpp
@@ -1,247 +0,0 @@
-/*
- * Copyright (C) 2024-2025 Petr Mironychev
- * Copyright (C) 2025 Povilas Kanapickas  <povilas@radix.lt>
- *
- * This file is part of QodeAssist.
- *
- * QodeAssist is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QodeAssist is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QodeAssist. If not, see <https://www.gnu.org/licenses/>.
- */
-
-#include "CodeHandler.hpp"
-#include <settings/CodeCompletionSettings.hpp>
-#include <QFileInfo>
-#include <QHash>
-
-namespace QodeAssist {
-
-struct LanguageProperties
-{
-    QString name;
-    QString commentStyle;
-    QVector<QString> namesFromModel;
-    QVector<QString> fileExtensions;
-};
-
-const QVector<LanguageProperties> customLanguagesFromSettings()
-{
-    QVector<LanguageProperties> customLanguages;
-
-    const QStringList customLanguagesList = Settings::codeCompletionSettings().customLanguages();
-    for (const QString &entry : customLanguagesList) {
-        if (entry.trimmed().isEmpty()) {
-            continue;
-        }
-
-        QStringList parts = entry.split(',');
-        if (parts.size() < 4) {
-            continue;
-        }
-
-        QString name = parts[0].trimmed();
-        QString commentStyle = parts[1].trimmed();
-        QStringList modelNamesList = parts[2].trimmed().split(' ', Qt::SkipEmptyParts);
-        QStringList extensionsList = parts[3].trimmed().split(' ', Qt::SkipEmptyParts);
-
-        if (!name.isEmpty() && !commentStyle.isEmpty() && !modelNamesList.isEmpty()
-            && !extensionsList.isEmpty()) {
-            QVector<QString> modelNames;
-            for (const auto &modelName : modelNamesList) {
-                modelNames.append(modelName);
-            }
-
-            QVector<QString> extensions;
-            for (const auto &ext : extensionsList) {
-                extensions.append(ext);
-            }
-
-            customLanguages.append({name, commentStyle, modelNames, extensions});
-        }
-    }
-
-    return customLanguages;
-}
-const QVector<LanguageProperties> &getKnownLanguages()
-{
-    static QVector<LanguageProperties> knownLanguages = {
-        {"python", "#", {"python", "py"}, {"py"}},
-        {"lua", "--", {"lua"}, {"lua"}},
-        {"js", "//", {"js", "javascript"}, {"js", "jsx"}},
-        {"ts", "//", {"ts", "typescript"}, {"ts", "tsx"}},
-        {"c-like", "//", {"c", "c++", "cpp"}, {"c", "h", "cpp", "hpp"}},
-        {"java", "//", {"java"}, {"java"}},
-        {"c#", "//", {"cs", "csharp"}, {"cs"}},
-        {"php", "//", {"php"}, {"php"}},
-        {"ruby", "#", {"rb", "ruby"}, {"rb"}},
-        {"go", "//", {"go"}, {"go"}},
-        {"swift", "//", {"swift"}, {"swift"}},
-        {"kotlin", "//", {"kt", "kotlin"}, {"kt", "kotlin"}},
-        {"scala", "//", {"scala"}, {"scala"}},
-        {"r", "#", {"r"}, {"r"}},
-        {"shell", "#", {"shell", "bash", "sh"}, {"sh", "bash"}},
-        {"perl", "#", {"pl", "perl"}, {"pl"}},
-        {"hs", "--", {"hs", "haskell"}, {"hs"}},
-        {"qml", "//", {"qml"}, {"qml"}},
-    };
-
-    knownLanguages.append(customLanguagesFromSettings());
-
-    return knownLanguages;
-}
-
-bool CodeHandler::hasCodeBlocks(const QString &text)
-{
-    QStringList lines = text.split('\n');
-
-    for (const QString &line : lines) {
-        if (line.trimmed().startsWith("```")) {
-            return true;
-        }
-    }
-
-    return false;
-}
-
-static QHash<QString, QString> buildLanguageToCommentPrefixMap()
-{
-    QHash<QString, QString> result;
-    for (const auto &languageProps : getKnownLanguages()) {
-        result[languageProps.name] = languageProps.commentStyle;
-    }
-    return result;
-}
-
-static QHash<QString, QString> buildExtensionToLanguageMap()
-{
-    QHash<QString, QString> result;
-    for (const auto &languageProps : getKnownLanguages()) {
-        for (const auto &extension : languageProps.fileExtensions) {
-            result[extension] = languageProps.name;
-        }
-    }
-    return result;
-}
-
-static QHash<QString, QString> buildModelLanguageNameToLanguageMap()
-{
-    QHash<QString, QString> result;
-    for (const auto &languageProps : getKnownLanguages()) {
-        for (const auto &nameFromModel : languageProps.namesFromModel) {
-            result[nameFromModel] = languageProps.name;
-        }
-    }
-    return result;
-}
-
-QString CodeHandler::processText(QString text, QString currentFilePath)
-{
-    QString result;
-    QStringList lines = text.split('\n');
-    bool inCodeBlock = false;
-    QString pendingComments;
-
-    auto currentFileExtension = QFileInfo(currentFilePath).suffix();
-    auto currentLanguage = detectLanguageFromExtension(currentFileExtension);
-
-    auto addPendingCommentsIfAny = [&]() {
-        if (pendingComments.isEmpty()) {
-            return;
-        }
-        QStringList commentLines = pendingComments.split('\n');
-        QString commentPrefix = getCommentPrefix(currentLanguage);
-
-        for (const QString &commentLine : commentLines) {
-            if (!commentLine.trimmed().isEmpty()) {
-                result += commentPrefix + " " + commentLine.trimmed() + "\n";
-            } else {
-                result += "\n";
-            }
-        }
-        pendingComments.clear();
-    };
-
-    for (const QString &line : lines) {
-        if (line.trimmed().startsWith("```")) {
-            if (!inCodeBlock) {
-                auto lineLanguage = detectLanguageFromLine(line);
-                if (!lineLanguage.isEmpty()) {
-                    currentLanguage = lineLanguage;
-                }
-
-                addPendingCommentsIfAny();
-
-                if (lineLanguage.isEmpty()) {
-                    // language not detected, so add direct output from model, if any
-                    result += line.trimmed().mid(3) + "\n"; // add the remainder of line after ```
-                }
-            }
-            inCodeBlock = !inCodeBlock;
-            continue;
-        }
-
-        if (inCodeBlock) {
-            result += line + "\n";
-        } else {
-            QString trimmed = line.trimmed();
-            if (!trimmed.isEmpty()) {
-                pendingComments += trimmed + "\n";
-            } else {
-                pendingComments += "\n";
-            }
-        }
-    }
-
-    addPendingCommentsIfAny();
-
-    return result;
-}
-
-QString CodeHandler::getCommentPrefix(const QString &language)
-{
-    static const auto commentPrefixes = buildLanguageToCommentPrefixMap();
-    return commentPrefixes.value(language, "//");
-}
-
-QString CodeHandler::detectLanguageFromLine(const QString &line)
-{
-    static const auto modelNameToLanguage = buildModelLanguageNameToLanguageMap();
-    return modelNameToLanguage.value(line.trimmed().mid(3).trimmed(), "");
-}
-
-QString CodeHandler::detectLanguageFromExtension(const QString &extension)
-{
-    static const auto extensionToLanguage = buildExtensionToLanguageMap();
-    return extensionToLanguage.value(extension.toLower(), "");
-}
-
-const QRegularExpression &CodeHandler::getFullCodeBlockRegex()
-{
-    static const QRegularExpression
-        regex(R"(```[\w\s]*\n([\s\S]*?)```)", QRegularExpression::MultilineOption);
-    return regex;
-}
-
-const QRegularExpression &CodeHandler::getPartialStartBlockRegex()
-{
-    static const QRegularExpression
-        regex(R"(```[\w\s]*\n([\s\S]*?)$)", QRegularExpression::MultilineOption);
-    return regex;
-}
-
-const QRegularExpression &CodeHandler::getPartialEndBlockRegex()
-{
-    static const QRegularExpression regex(R"(^([\s\S]*?)```)", QRegularExpression::MultilineOption);
-    return regex;
-}
-
-} // namespace QodeAssist
--- a/CodeHandler.hpp
+++ b/CodeHandler.hpp
@@ -1,56 +0,0 @@
-/* 
- * Copyright (C) 2024-2025 Petr Mironychev
- *
- * This file is part of QodeAssist.
- *
- * QodeAssist is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QodeAssist is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QodeAssist. If not, see <https://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include <QObject>
-#include <QRegularExpression>
-#include <QString>
-
-namespace QodeAssist {
-
-class CodeHandler
-{
-public:
-    static QString processText(QString text, QString currentFileName);
-
-    /**
-     * Detects language from line, or returns empty string if this was not possible
-     */
-    static QString detectLanguageFromLine(const QString &line);
-
-    /**
-     * Detects language file name, or returns empty string if this was not possible
-     */
-    static QString detectLanguageFromExtension(const QString &extension);
-
-    /**
-     * Detects if text contains code blocks, or returns false if this was not possible
-     */
-    static bool hasCodeBlocks(const QString &text);
-
-private:
-    static QString getCommentPrefix(const QString &language);
-
-    static const QRegularExpression &getFullCodeBlockRegex();
-    static const QRegularExpression &getPartialStartBlockRegex();
-    static const QRegularExpression &getPartialEndBlockRegex();
-};
-
-} // namespace QodeAssist
--- a/ConfigurationManager.cpp
+++ b/ConfigurationManager.cpp
@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2024-2025 Petr Mironychev
+ * Copyright (C) 2024 Petr Mironychev
 *
 * This file is part of QodeAssist.
 *
@@ -19,8 +19,8 @@

 #include "ConfigurationManager.hpp"

-#include <settings/ButtonAspect.hpp>
 #include <QTimer>
+#include <settings/ButtonAspect.hpp>

 #include "QodeAssisttr.h"

@@ -35,49 +35,6 @@ ConfigurationManager &ConfigurationManager::instance()
 void ConfigurationManager::init()
 {
    setupConnections();
-    updateAllTemplateDescriptions();
-    checkAllTemplate();
-}
-
-void ConfigurationManager::updateTemplateDescription(const Utils::StringAspect &templateAspect)
-{
-    LLMCore::PromptTemplate *templ = m_templateManger.getFimTemplateByName(templateAspect.value());
-
-    if (!templ) {
-        return;
-    }
-
-    if (&templateAspect == &m_generalSettings.ccTemplate) {
-        m_generalSettings.ccTemplateDescription.setValue(templ->description());
-    } else if (&templateAspect == &m_generalSettings.caTemplate) {
-        m_generalSettings.caTemplateDescription.setValue(templ->description());
-    }
-}
-
-void ConfigurationManager::updateAllTemplateDescriptions()
-{
-    updateTemplateDescription(m_generalSettings.ccTemplate);
-    updateTemplateDescription(m_generalSettings.caTemplate);
-}
-
-void ConfigurationManager::checkTemplate(const Utils::StringAspect &templateAspect)
-{
-    LLMCore::PromptTemplate *templ = m_templateManger.getFimTemplateByName(templateAspect.value());
-
-    if (templ->name() == templateAspect.value())
-        return;
-
-    if (&templateAspect == &m_generalSettings.ccTemplate) {
-        m_generalSettings.ccTemplate.setValue(templ->name());
-    } else if (&templateAspect == &m_generalSettings.caTemplate) {
-        m_generalSettings.caTemplate.setValue(templ->name());
-    }
-}
-
-void ConfigurationManager::checkAllTemplate()
-{
-    checkTemplate(m_generalSettings.ccTemplate);
-    checkTemplate(m_generalSettings.caTemplate);
 }

 ConfigurationManager::ConfigurationManager(QObject *parent)
@@ -100,21 +57,6 @@ void ConfigurationManager::setupConnections()
    connect(&m_generalSettings.caSelectTemplate, &Button::clicked, this, &Config::selectTemplate);
    connect(&m_generalSettings.ccSetUrl, &Button::clicked, this, &Config::selectUrl);
    connect(&m_generalSettings.caSetUrl, &Button::clicked, this, &Config::selectUrl);
-
-    connect(
-        &m_generalSettings.ccPreset1SelectProvider, &Button::clicked, this, &Config::selectProvider);
-    connect(&m_generalSettings.ccPreset1SetUrl, &Button::clicked, this, &Config::selectUrl);
-    connect(&m_generalSettings.ccPreset1SelectModel, &Button::clicked, this, &Config::selectModel);
-    connect(
-        &m_generalSettings.ccPreset1SelectTemplate, &Button::clicked, this, &Config::selectTemplate);
-
-    connect(&m_generalSettings.ccTemplate, &Utils::StringAspect::changed, this, [this]() {
-        updateTemplateDescription(m_generalSettings.ccTemplate);
-    });
-
-    connect(&m_generalSettings.caTemplate, &Utils::StringAspect::changed, this, [this]() {
-        updateTemplateDescription(m_generalSettings.caTemplate);
-    });
 }

 void ConfigurationManager::selectProvider()
@@ -127,13 +69,13 @@ void ConfigurationManager::selectProvider()

    auto &targetSettings = (settingsButton == &m_generalSettings.ccSelectProvider)
                               ? m_generalSettings.ccProvider
-                           : settingsButton == &m_generalSettings.ccPreset1SelectProvider
-                               ? m_generalSettings.ccPreset1Provider
                               : m_generalSettings.caProvider;

    QTimer::singleShot(0, this, [this, providersList, &targetSettings] {
-        m_generalSettings.showSelectionDialog(
-            providersList, targetSettings, Tr::tr("Select LLM Provider"), Tr::tr("Providers:"));
+        m_generalSettings.showSelectionDialog(providersList,
+                                              targetSettings,
+                                              Tr::tr("Select LLM Provider"),
+                                              Tr::tr("Providers:"));
    });
 }

@@ -144,19 +86,14 @@ void ConfigurationManager::selectModel()
        return;

    const bool isCodeCompletion = (settingsButton == &m_generalSettings.ccSelectModel);
-    const bool isPreset1 = (settingsButton == &m_generalSettings.ccPreset1SelectModel);

    const QString providerName = isCodeCompletion ? m_generalSettings.ccProvider.volatileValue()
-                                 : isPreset1 ? m_generalSettings.ccPreset1Provider.volatileValue()
-                                             : m_generalSettings.caProvider.volatileValue();
+                                                  : m_generalSettings.caProvider.volatileValue();

    const auto providerUrl = isCodeCompletion ? m_generalSettings.ccUrl.volatileValue()
-                             : isPreset1      ? m_generalSettings.ccPreset1Url.volatileValue()
                                              : m_generalSettings.caUrl.volatileValue();

-    auto &targetSettings = isCodeCompletion ? m_generalSettings.ccModel
-                           : isPreset1      ? m_generalSettings.ccPreset1Model
-                                            : m_generalSettings.caModel;
+    auto &targetSettings = isCodeCompletion ? m_generalSettings.ccModel : m_generalSettings.caModel;

    if (auto provider = m_providersManager.getProviderByName(providerName)) {
        if (!provider->supportsModelListing()) {
@@ -185,23 +122,18 @@ void ConfigurationManager::selectTemplate()
        return;

    const bool isCodeCompletion = (settingsButton == &m_generalSettings.ccSelectTemplate);
-    const bool isPreset1 = (settingsButton == &m_generalSettings.ccPreset1SelectTemplate);
-    const QString providerName = isCodeCompletion ? m_generalSettings.ccProvider.volatileValue()
-                                 : isPreset1 ? m_generalSettings.ccPreset1Provider.volatileValue()
-                                             : m_generalSettings.caProvider.volatileValue();
-    auto providerID = m_providersManager.getProviderByName(providerName)->providerID();

-    const auto templateList = isCodeCompletion || isPreset1
-                                  ? m_templateManger.getFimTemplatesForProvider(providerID)
-                                  : m_templateManger.getChatTemplatesForProvider(providerID);
+    const auto templateList = isCodeCompletion ? m_templateManger.fimTemplatesNames()
+                                               : m_templateManger.chatTemplatesNames();

    auto &targetSettings = isCodeCompletion ? m_generalSettings.ccTemplate
-                           : isPreset1      ? m_generalSettings.ccPreset1Template
                                            : m_generalSettings.caTemplate;

    QTimer::singleShot(0, &m_generalSettings, [this, templateList, &targetSettings]() {
-        m_generalSettings.showSelectionDialog(
-            templateList, targetSettings, Tr::tr("Select Template"), Tr::tr("Templates:"));
+        m_generalSettings.showSelectionDialog(templateList,
+                                              targetSettings,
+                                              Tr::tr("Select Template"),
+                                              Tr::tr("Templates:"));
    });
 }

@@ -218,9 +150,8 @@ void ConfigurationManager::selectUrl()
            urls.append(url);
    }

-    auto &targetSettings = (settingsButton == &m_generalSettings.ccSetUrl) ? m_generalSettings.ccUrl
-                           : settingsButton == &m_generalSettings.ccPreset1SetUrl
-                               ? m_generalSettings.ccPreset1Url
+    auto &targetSettings = (settingsButton == &m_generalSettings.ccSetUrl)
+                               ? m_generalSettings.ccUrl
                               : m_generalSettings.caUrl;

    QTimer::singleShot(0, &m_generalSettings, [this, urls, &targetSettings]() {
--- a/ConfigurationManager.hpp
+++ b/ConfigurationManager.hpp
@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2024-2025 Petr Mironychev
+ * Copyright (C) 2024 Petr Mironychev
 *
 * This file is part of QodeAssist.
 *
@@ -36,11 +36,6 @@ public:

    void init();

-    void updateTemplateDescription(const Utils::StringAspect &templateAspect);
-    void updateAllTemplateDescriptions();
-    void checkTemplate(const Utils::StringAspect &templateAspect);
-    void checkAllTemplate();
-
 public slots:
    void selectProvider();
    void selectModel();
--- a/DocumentContextReader.cpp
+++ b/DocumentContextReader.cpp
@@ -0,0 +1,249 @@
+/* 
+ * Copyright (C) 2024 Petr Mironychev
+ *
+ * This file is part of QodeAssist.
+ *
+ * QodeAssist is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QodeAssist is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QodeAssist. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "DocumentContextReader.hpp"
+
+#include <QFileInfo>
+#include <QTextBlock>
+#include <languageserverprotocol/lsptypes.h>
+
+#include "core/ChangesManager.h"
+#include "settings/CodeCompletionSettings.hpp"
+
+const QRegularExpression &getYearRegex()
+{
+    static const QRegularExpression yearRegex("\\b(19|20)\\d{2}\\b");
+    return yearRegex;
+}
+
+const QRegularExpression &getNameRegex()
+{
+    static const QRegularExpression nameRegex("\\b[A-Z][a-z.]+ [A-Z][a-z.]+\\b");
+    return nameRegex;
+}
+
+const QRegularExpression &getCommentRegex()
+{
+    static const QRegularExpression
+        commentRegex(R"((/\*[\s\S]*?\*/|//.*$|#.*$|//{2,}[\s\S]*?//{2,}))",
+                     QRegularExpression::MultilineOption);
+    return commentRegex;
+}
+
+namespace QodeAssist {
+
+DocumentContextReader::DocumentContextReader(TextEditor::TextDocument *textDocument)
+    : m_textDocument(textDocument)
+    , m_document(textDocument->document())
+{
+    m_copyrightInfo = findCopyright();
+}
+
+QString DocumentContextReader::getLineText(int lineNumber, int cursorPosition) const
+{
+    if (!m_document || lineNumber < 0)
+        return QString();
+
+    QTextBlock block = m_document->begin();
+    int currentLine = 0;
+
+    while (block.isValid()) {
+        if (currentLine == lineNumber) {
+            QString text = block.text();
+            if (cursorPosition >= 0 && cursorPosition <= text.length()) {
+                text = text.left(cursorPosition);
+            }
+            return text;
+        }
+
+        block = block.next();
+        currentLine++;
+    }
+
+    return QString();
+}
+
+QString DocumentContextReader::getContextBefore(int lineNumber,
+                                                int cursorPosition,
+                                                int linesCount) const
+{
+    int effectiveStartLine;
+    if (m_copyrightInfo.found) {
+        effectiveStartLine = qMax(m_copyrightInfo.endLine + 1, lineNumber - linesCount);
+    } else {
+        effectiveStartLine = qMax(0, lineNumber - linesCount);
+    }
+
+    return getContextBetween(effectiveStartLine, lineNumber, cursorPosition);
+}
+
+QString DocumentContextReader::getContextAfter(int lineNumber,
+                                               int cursorPosition,
+                                               int linesCount) const
+{
+    int endLine = qMin(m_document->blockCount() - 1, lineNumber + linesCount);
+    return getContextBetween(lineNumber + 1, endLine, cursorPosition);
+}
+
+QString DocumentContextReader::readWholeFileBefore(int lineNumber, int cursorPosition) const
+{
+    int startLine = 0;
+    if (m_copyrightInfo.found) {
+        startLine = m_copyrightInfo.endLine + 1;
+    }
+
+    startLine = qMin(startLine, lineNumber);
+
+    QString result = getContextBetween(startLine, lineNumber, cursorPosition);
+
+    return result;
+}
+
+QString DocumentContextReader::readWholeFileAfter(int lineNumber, int cursorPosition) const
+{
+    return getContextBetween(lineNumber, m_document->blockCount() - 1, cursorPosition);
+}
+
+QString DocumentContextReader::getLanguageAndFileInfo() const
+{
+    if (!m_textDocument)
+        return QString();
+
+    QString language = LanguageServerProtocol::TextDocumentItem::mimeTypeToLanguageId(
+        m_textDocument->mimeType());
+    QString mimeType = m_textDocument->mimeType();
+    QString filePath = m_textDocument->filePath().toString();
+    QString fileExtension = QFileInfo(filePath).suffix();
+
+    return QString("Language: %1 (MIME: %2) filepath: %3(%4)\n\n")
+        .arg(language, mimeType, filePath, fileExtension);
+}
+
+CopyrightInfo DocumentContextReader::findCopyright()
+{
+    CopyrightInfo result = {-1, -1, false};
+
+    QString text = m_document->toPlainText();
+    QRegularExpressionMatchIterator matchIterator = getCommentRegex().globalMatch(text);
+
+    QList<CopyrightInfo> copyrightBlocks;
+
+    while (matchIterator.hasNext()) {
+        QRegularExpressionMatch match = matchIterator.next();
+        QString matchedText = match.captured().toLower();
+
+        if (matchedText.contains("copyright") || matchedText.contains("(C)")
+            || matchedText.contains("(c)") || matchedText.contains("©")
+            || getYearRegex().match(text).hasMatch() || getNameRegex().match(text).hasMatch()) {
+            int startPos = match.capturedStart();
+            int endPos = match.capturedEnd();
+
+            CopyrightInfo info;
+            info.startLine = m_document->findBlock(startPos).blockNumber();
+            info.endLine = m_document->findBlock(endPos).blockNumber();
+            info.found = true;
+
+            copyrightBlocks.append(info);
+        }
+    }
+
+    for (int i = 0; i < copyrightBlocks.size() - 1; ++i) {
+        if (copyrightBlocks[i].endLine + 1 >= copyrightBlocks[i + 1].startLine) {
+            copyrightBlocks[i].endLine = copyrightBlocks[i + 1].endLine;
+            copyrightBlocks.removeAt(i + 1);
+            --i;
+        }
+    }
+
+    if (!copyrightBlocks.isEmpty()) { // temproary solution, need cache
+        return copyrightBlocks.first();
+    }
+
+    return result;
+}
+
+QString DocumentContextReader::getContextBetween(int startLine,
+                                                 int endLine,
+                                                 int cursorPosition) const
+{
+    QString context;
+    for (int i = startLine; i <= endLine; ++i) {
+        QTextBlock block = m_document->findBlockByNumber(i);
+        if (!block.isValid()) {
+            break;
+        }
+        if (i == endLine) {
+            context += block.text().left(cursorPosition);
+        } else {
+            context += block.text() + "\n";
+        }
+    }
+
+    return context;
+}
+
+CopyrightInfo DocumentContextReader::copyrightInfo() const
+{
+    return m_copyrightInfo;
+}
+
+LLMCore::ContextData DocumentContextReader::prepareContext(int lineNumber, int cursorPosition) const
+{
+    QString contextBefore = getContextBefore(lineNumber, cursorPosition);
+    QString contextAfter = getContextAfter(lineNumber, cursorPosition);
+
+    QString fileContext;
+    if (Settings::codeCompletionSettings().useFilePathInContext())
+        fileContext.append("\n ").append(getLanguageAndFileInfo());
+
+    if (Settings::codeCompletionSettings().useProjectChangesCache())
+        fileContext.append("\n ").append(
+            ChangesManager::instance().getRecentChangesContext(m_textDocument));
+
+    return {contextBefore, contextAfter, fileContext};
+}
+
+QString DocumentContextReader::getContextBefore(int lineNumber, int cursorPosition) const
+{
+    if (Settings::codeCompletionSettings().readFullFile()) {
+        return readWholeFileBefore(lineNumber, cursorPosition);
+    } else {
+        int effectiveStartLine;
+        int beforeCursor = Settings::codeCompletionSettings().readStringsBeforeCursor();
+        if (m_copyrightInfo.found) {
+            effectiveStartLine = qMax(m_copyrightInfo.endLine + 1, lineNumber - beforeCursor);
+        } else {
+            effectiveStartLine = qMax(0, lineNumber - beforeCursor);
+        }
+        return getContextBetween(effectiveStartLine, lineNumber, cursorPosition);
+    }
+}
+
+QString DocumentContextReader::getContextAfter(int lineNumber, int cursorPosition) const
+{
+    if (Settings::codeCompletionSettings().readFullFile()) {
+        return readWholeFileAfter(lineNumber, cursorPosition);
+    } else {
+        int endLine = qMin(m_document->blockCount() - 1,
+                           lineNumber + Settings::codeCompletionSettings().readStringsAfterCursor());
+        return getContextBetween(lineNumber + 1, endLine, -1);
+    }
+}
+
+} // namespace QodeAssist
--- a/DocumentContextReader.hpp
+++ b/DocumentContextReader.hpp
@@ -0,0 +1,64 @@
+/* 
+ * Copyright (C) 2024 Petr Mironychev
+ *
+ * This file is part of QodeAssist.
+ *
+ * QodeAssist is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QodeAssist is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QodeAssist. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include <QTextDocument>
+#include <texteditor/textdocument.h>
+
+#include <llmcore/ContextData.hpp>
+
+namespace QodeAssist {
+
+struct CopyrightInfo
+{
+    int startLine;
+    int endLine;
+    bool found;
+};
+
+class DocumentContextReader
+{
+public:
+    DocumentContextReader(TextEditor::TextDocument *textDocument);
+
+    QString getLineText(int lineNumber, int cursorPosition = -1) const;
+    QString getContextBefore(int lineNumber, int cursorPosition, int linesCount) const;
+    QString getContextAfter(int lineNumber, int cursorPosition, int linesCount) const;
+    QString readWholeFileBefore(int lineNumber, int cursorPosition) const;
+    QString readWholeFileAfter(int lineNumber, int cursorPosition) const;
+    QString getLanguageAndFileInfo() const;
+    CopyrightInfo findCopyright();
+    QString getContextBetween(int startLine, int endLine, int cursorPosition) const;
+
+    CopyrightInfo copyrightInfo() const;
+
+    LLMCore::ContextData prepareContext(int lineNumber, int cursorPosition) const;
+
+private:
+    QString getContextBefore(int lineNumber, int cursorPosition) const;
+    QString getContextAfter(int lineNumber, int cursorPosition) const;
+
+private:
+    TextEditor::TextDocument *m_textDocument;
+    QTextDocument *m_document;
+    CopyrightInfo m_copyrightInfo;
+};
+
+} // namespace QodeAssist
--- a/LLMClientInterface.cpp
+++ b/LLMClientInterface.cpp
@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2024-2025 Petr Mironychev
+ * Copyright (C) 2024 Petr Mironychev
 *
 * This file is part of QodeAssist.
 *
@@ -23,42 +23,30 @@
 #include <QNetworkAccessManager>
 #include <QNetworkReply>

-#include "CodeHandler.hpp"
-#include "context/DocumentContextReader.hpp"
-#include "context/Utils.hpp"
+#include <llmcore/RequestConfig.hpp>
+#include <texteditor/textdocument.h>
+
+#include "DocumentContextReader.hpp"
+#include "llmcore/PromptTemplateManager.hpp"
+#include "llmcore/ProvidersManager.hpp"
 #include "logger/Logger.hpp"
 #include "settings/CodeCompletionSettings.hpp"
 #include "settings/GeneralSettings.hpp"
-#include <llmcore/RequestConfig.hpp>
-#include <llmcore/RulesLoader.hpp>

 namespace QodeAssist {

-LLMClientInterface::LLMClientInterface(
-    const Settings::GeneralSettings &generalSettings,
-    const Settings::CodeCompletionSettings &completeSettings,
-    LLMCore::IProviderRegistry &providerRegistry,
-    LLMCore::IPromptProvider *promptProvider,
-    Context::IDocumentReader &documentReader,
-    IRequestPerformanceLogger &performanceLogger)
-    : m_generalSettings(generalSettings)
-    , m_completeSettings(completeSettings)
-    , m_providerRegistry(providerRegistry)
-    , m_promptProvider(promptProvider)
-    , m_documentReader(documentReader)
-    , m_performanceLogger(performanceLogger)
-    , m_contextManager(new Context::ContextManager(this))
+LLMClientInterface::LLMClientInterface()
+    : m_requestHandler(this)
 {
-}
-
-LLMClientInterface::~LLMClientInterface()
-{
-    handleCancelRequest();
+    connect(&m_requestHandler,
+            &LLMCore::RequestHandler::completionReceived,
+            this,
+            &LLMClientInterface::sendCompletionToClient);
 }

 Utils::FilePath LLMClientInterface::serverDeviceTemplate() const
 {
-    return "QodeAssist";
+    return "Qode Assist";
 }

 void LLMClientInterface::startImpl()
@@ -66,29 +54,6 @@ void LLMClientInterface::startImpl()
    emit started();
 }

-void LLMClientInterface::handleFullResponse(const QString &requestId, const QString &fullText)
-{
-    auto it = m_activeRequests.find(requestId);
-    if (it == m_activeRequests.end())
-        return;
-
-    const RequestContext &ctx = it.value();
-    sendCompletionToClient(fullText, ctx.originalRequest, true);
-
-    m_activeRequests.erase(it);
-    m_performanceLogger.endTimeMeasurement(requestId);
-}
-
-void LLMClientInterface::handleRequestFailed(const QString &requestId, const QString &error)
-{
-    auto it = m_activeRequests.find(requestId);
-    if (it == m_activeRequests.end())
-        return;
-
-    LOG_MESSAGE(QString("Request %1 failed: %2").arg(requestId, error));
-    m_activeRequests.erase(it);
-}
-
 void LLMClientInterface::sendData(const QByteArray &data)
 {
    QJsonDocument doc = QJsonDocument::fromJson(data);
@@ -108,10 +73,10 @@ void LLMClientInterface::sendData(const QByteArray &data)
        handleTextDocumentDidOpen(request);
    } else if (method == "getCompletionsCycling") {
        QString requestId = request["id"].toString();
-        m_performanceLogger.startTimeMeasurement(requestId);
+        startTimeMeasurement(requestId);
        handleCompletion(request);
    } else if (method == "$/cancelRequest") {
-        handleCancelRequest();
+        handleCancelRequest(request);
    } else if (method == "exit") {
        // TODO make exit handler
    } else {
@@ -119,29 +84,14 @@ void LLMClientInterface::sendData(const QByteArray &data)
    }
 }

-void LLMClientInterface::handleCancelRequest()
+void LLMClientInterface::handleCancelRequest(const QJsonObject &request)
 {
-    QSet<LLMCore::Provider *> providers;
-    for (auto it = m_activeRequests.begin(); it != m_activeRequests.end(); ++it) {
-        if (it.value().provider) {
-            providers.insert(it.value().provider);
-        }
+    QString id = request["params"].toObject()["id"].toString();
+    if (m_requestHandler.cancelRequest(id)) {
+        LOG_MESSAGE(QString("Request %1 cancelled successfully").arg(id));
+    } else {
+        LOG_MESSAGE(QString("Request %1 not found").arg(id));
    }
-
-    for (auto *provider : providers) {
-        disconnect(provider, nullptr, this, nullptr);
-    }
-
-    for (auto it = m_activeRequests.begin(); it != m_activeRequests.end(); ++it) {
-        const RequestContext &ctx = it.value();
-        if (ctx.provider) {
-            ctx.provider->cancelRequest(it.key());
-        }
-    }
-
-    m_activeRequests.clear();
-
-    LOG_MESSAGE("All requests cancelled and state cleared");
 }

 void LLMClientInterface::handleInitialize(const QJsonObject &request)
@@ -196,233 +146,97 @@ void LLMClientInterface::handleExit(const QJsonObject &request)

 void LLMClientInterface::handleCompletion(const QJsonObject &request)
 {
-    auto filePath = Context::extractFilePathFromRequest(request);
-    auto documentInfo = m_documentReader.readDocument(filePath);
-    if (!documentInfo.document) {
-        LOG_MESSAGE("Error: Document is not available for" + filePath);
-        return;
-    }
+    auto updatedContext = prepareContext(request);
+    auto &completeSettings = Settings::codeCompletionSettings();

-    auto updatedContext = prepareContext(request, documentInfo);
-
-    bool isPreset1Active = m_contextManager->isSpecifyCompletion(documentInfo);
-
-    const auto providerName = !isPreset1Active ? m_generalSettings.ccProvider()
-                                               : m_generalSettings.ccPreset1Provider();
-    const auto modelName = !isPreset1Active ? m_generalSettings.ccModel()
-                                            : m_generalSettings.ccPreset1Model();
-    const auto url = !isPreset1Active ? m_generalSettings.ccUrl()
-                                      : m_generalSettings.ccPreset1Url();
-
-    const auto provider = m_providerRegistry.getProviderByName(providerName);
+    auto providerName = Settings::generalSettings().ccProvider();
+    auto provider = LLMCore::ProvidersManager::instance().getProviderByName(providerName);

    if (!provider) {
        LOG_MESSAGE(QString("No provider found with name: %1").arg(providerName));
        return;
    }

-    auto templateName = !isPreset1Active ? m_generalSettings.ccTemplate()
-                                         : m_generalSettings.ccPreset1Template();
-
-    auto promptTemplate = m_promptProvider->getTemplateByName(templateName);
+    auto templateName = Settings::generalSettings().ccTemplate();
+    auto promptTemplate = LLMCore::PromptTemplateManager::instance().getFimTemplateByName(
+        templateName);

    if (!promptTemplate) {
        LOG_MESSAGE(QString("No template found with name: %1").arg(templateName));
        return;
    }

-    // TODO refactor to dynamic presets system
    LLMCore::LLMConfig config;
-    config.requestType = LLMCore::RequestType::CodeCompletion;
+    config.requestType = LLMCore::RequestType::Fim;
    config.provider = provider;
    config.promptTemplate = promptTemplate;
-    // TODO refactor networking
-    if (provider->providerID() == LLMCore::ProviderID::GoogleAI) {
-        QString stream = QString{"streamGenerateContent?alt=sse"};
-        config.url = QUrl(QString("%1/models/%2:%3").arg(url, modelName, stream));
-    } else {
-        config.url = QUrl(
-            QString("%1%2").arg(url, endpoint(provider, promptTemplate->type(), isPreset1Active)));
-        config.providerRequest = {{"model", modelName}, {"stream", true}};
-    }
-    config.apiKey = provider->apiKey();
-    config.multiLineCompletion = m_completeSettings.multiLineCompletion();
+    config.url = QUrl(
+        QString("%1%2").arg(Settings::generalSettings().ccUrl(), provider->completionEndpoint()));
+    config.apiKey = Settings::codeCompletionSettings().apiKey();
+
+    config.providerRequest = {{"model", Settings::generalSettings().ccModel()}, {"stream", true}};
+
+    config.multiLineCompletion = completeSettings.multiLineCompletion();
+
+    QString systemPrompt;
+    if (completeSettings.useSystemPrompt())
+        systemPrompt.append(completeSettings.systemPrompt());
+    if (!updatedContext.fileContext.isEmpty())
+        systemPrompt.append(updatedContext.fileContext);
+    if (!systemPrompt.isEmpty())
+        config.providerRequest["system"] = systemPrompt;

    const auto stopWords = QJsonArray::fromStringList(config.promptTemplate->stopWords());
    if (!stopWords.isEmpty())
        config.providerRequest["stop"] = stopWords;

-    QString systemPrompt;
-    if (m_completeSettings.useSystemPrompt())
-        systemPrompt.append(
-            m_completeSettings.useUserMessageTemplateForCC()
-                    && promptTemplate->type() == LLMCore::TemplateType::Chat
-                ? m_completeSettings.systemPromptForNonFimModels()
-                : m_completeSettings.systemPrompt());
+    config.promptTemplate->prepareRequest(config.providerRequest, updatedContext);
+    config.provider->prepareRequest(config.providerRequest, LLMCore::RequestType::Fim);

-    auto project = LLMCore::RulesLoader::getActiveProject();
-    if (project) {
-        QString projectRules
-            = LLMCore::RulesLoader::loadRulesForProject(project, LLMCore::RulesContext::Completions);
-
-        if (!projectRules.isEmpty()) {
-            systemPrompt += "\n\n# Project Rules\n\n" + projectRules;
-            LOG_MESSAGE("Loaded project rules for completion");
-        }
-    }
-
-    if (updatedContext.fileContext.has_value())
-        systemPrompt.append(updatedContext.fileContext.value());
-
-    if (m_completeSettings.useOpenFilesContext()) {
-        if (provider->providerID() == LLMCore::ProviderID::LlamaCpp) {
-            for (const auto openedFilePath : m_contextManager->openedFiles({filePath})) {
-                if (!updatedContext.filesMetadata) {
-                    updatedContext.filesMetadata = QList<LLMCore::FileMetadata>();
-                }
-                updatedContext.filesMetadata->append({openedFilePath.first, openedFilePath.second});
-            }
-        } else {
-            systemPrompt.append(m_contextManager->openedFilesContext({filePath}));
-        }
-    }
-
-    updatedContext.systemPrompt = systemPrompt;
-
-    if (promptTemplate->type() == LLMCore::TemplateType::Chat) {
-        QString userMessage;
-        if (m_completeSettings.useUserMessageTemplateForCC()) {
-            userMessage = m_completeSettings.processMessageToFIM(
-                updatedContext.prefix.value_or(""), updatedContext.suffix.value_or(""));
-        } else {
-            userMessage = updatedContext.prefix.value_or("") + updatedContext.suffix.value_or("");
-        }
-
-        // TODO refactor add message
-        QVector<LLMCore::Message> messages;
-        messages.append({"user", userMessage});
-        updatedContext.history = messages;
-    }
-
-    config.provider->prepareRequest(
-        config.providerRequest,
-        promptTemplate,
-        updatedContext,
-        LLMCore::RequestType::CodeCompletion,
-        false);
-
-    auto errors = config.provider->validateRequest(config.providerRequest, promptTemplate->type());
-    if (!errors.isEmpty()) {
-        LOG_MESSAGE("Validate errors for fim request:");
-        LOG_MESSAGES(errors);
-        return;
-    }
-
-    QString requestId = request["id"].toString();
-    m_performanceLogger.startTimeMeasurement(requestId);
-
-    m_activeRequests[requestId] = {request, provider};
-
-    connect(
-        provider,
-        &LLMCore::Provider::fullResponseReceived,
-        this,
-        &LLMClientInterface::handleFullResponse,
-        Qt::UniqueConnection);
-    connect(
-        provider,
-        &LLMCore::Provider::requestFailed,
-        this,
-        &LLMClientInterface::handleRequestFailed,
-        Qt::UniqueConnection);
-
-    provider->sendRequest(requestId, config.url, config.providerRequest);
+    m_requestHandler.sendLLMRequest(config, request);
 }

-LLMCore::ContextData LLMClientInterface::prepareContext(
-    const QJsonObject &request, const Context::DocumentInfo &documentInfo)
+LLMCore::ContextData LLMClientInterface::prepareContext(const QJsonObject &request,
+                                                        const QStringView &accumulatedCompletion)
 {
    QJsonObject params = request["params"].toObject();
    QJsonObject doc = params["doc"].toObject();
    QJsonObject position = doc["position"].toObject();
+    QString uri = doc["uri"].toString();
+
+    Utils::FilePath filePath = Utils::FilePath::fromString(QUrl(uri).toLocalFile());
+    TextEditor::TextDocument *textDocument = TextEditor::TextDocument::textDocumentForFilePath(
+        filePath);
+
+    if (!textDocument) {
+        LOG_MESSAGE("Error: Document is not available for" + filePath.toString());
+        return LLMCore::ContextData{};
+    }
+
    int cursorPosition = position["character"].toInt();
    int lineNumber = position["line"].toInt();

-    Context::DocumentContextReader
-        reader(documentInfo.document, documentInfo.mimeType, documentInfo.filePath);
-    return reader.prepareContext(lineNumber, cursorPosition, m_completeSettings);
+    DocumentContextReader reader(textDocument);
+    return reader.prepareContext(lineNumber, cursorPosition);
 }

-QString LLMClientInterface::endpoint(
-    LLMCore::Provider *provider, LLMCore::TemplateType type, bool isLanguageSpecify)
+void LLMClientInterface::sendCompletionToClient(const QString &completion,
+                                                const QJsonObject &request,
+                                                bool isComplete)
 {
-    QString endpoint;
-    auto endpointMode = isLanguageSpecify ? m_generalSettings.ccPreset1EndpointMode.stringValue()
-                                          : m_generalSettings.ccEndpointMode.stringValue();
-    if (endpointMode == "Auto") {
-        endpoint = type == LLMCore::TemplateType::FIM ? provider->completionEndpoint()
-                                                      : provider->chatEndpoint();
-    } else if (endpointMode == "Custom") {
-        endpoint = isLanguageSpecify ? m_generalSettings.ccPreset1CustomEndpoint()
-                                     : m_generalSettings.ccCustomEndpoint();
-    } else if (endpointMode == "FIM") {
-        endpoint = provider->completionEndpoint();
-    } else if (endpointMode == "Chat") {
-        endpoint = provider->chatEndpoint();
-    }
-    return endpoint;
-}
-
-Context::ContextManager *LLMClientInterface::contextManager() const
-{
-    return m_contextManager;
-}
-
-void LLMClientInterface::sendCompletionToClient(
-    const QString &completion, const QJsonObject &request, bool isComplete)
-{
-    auto filePath = Context::extractFilePathFromRequest(request);
-    auto documentInfo = m_documentReader.readDocument(filePath);
-    bool isPreset1Active = m_contextManager->isSpecifyCompletion(documentInfo);
-
-    auto templateName = !isPreset1Active ? m_generalSettings.ccTemplate()
-                                         : m_generalSettings.ccPreset1Template();
-
-    auto promptTemplate = m_promptProvider->getTemplateByName(templateName);
-
    QJsonObject position = request["params"].toObject()["doc"].toObject()["position"].toObject();

    QJsonObject response;
    response["jsonrpc"] = "2.0";
    response[LanguageServerProtocol::idKey] = request["id"];
-
    QJsonObject result;
    QJsonArray completions;
    QJsonObject completionItem;
-
-    LOG_MESSAGE(QString("Completions before filter: \n%1").arg(completion));
-
-    QString outputHandler = m_completeSettings.modelOutputHandler.stringValue();
-    QString processedCompletion;
-
-    if (outputHandler == "Raw text") {
-        processedCompletion = completion;
-    } else if (outputHandler == "Force processing") {
-        processedCompletion = CodeHandler::processText(completion,
-                                                       Context::extractFilePathFromRequest(request));
-    } else { // "Auto"
-        processedCompletion = CodeHandler::hasCodeBlocks(completion)
-                                  ? CodeHandler::processText(completion,
-                                                             Context::extractFilePathFromRequest(
-                                                                 request))
-                                  : completion;
-    }
-
-    completionItem[LanguageServerProtocol::textKey] = processedCompletion;
+    completionItem[LanguageServerProtocol::textKey] = completion;
    QJsonObject range;
    range["start"] = position;
    QJsonObject end = position;
-    end["character"] = position["character"].toInt() + processedCompletion.length();
+    end["character"] = position["character"].toInt() + completion.length();
    range["end"] = end;
    completionItem[LanguageServerProtocol::rangeKey] = range;
    completionItem[LanguageServerProtocol::positionKey] = position;
@@ -435,13 +249,37 @@ void LLMClientInterface::sendCompletionToClient(
        QString("Completions: \n%1")
            .arg(QString::fromUtf8(QJsonDocument(completions).toJson(QJsonDocument::Indented))));

-    LOG_MESSAGE(
-        QString("Full response: \n%1")
-            .arg(QString::fromUtf8(QJsonDocument(response).toJson(QJsonDocument::Indented))));
+    LOG_MESSAGE(QString("Full response: \n%1")
+                   .arg(QString::fromUtf8(QJsonDocument(response).toJson(QJsonDocument::Indented))));

    QString requestId = request["id"].toString();
-    m_performanceLogger.endTimeMeasurement(requestId);
+    endTimeMeasurement(requestId);
    emit messageReceived(LanguageServerProtocol::JsonRpcMessage(response));
 }

+void LLMClientInterface::startTimeMeasurement(const QString &requestId)
+{
+    m_requestStartTimes[requestId] = QDateTime::currentMSecsSinceEpoch();
+}
+
+void LLMClientInterface::endTimeMeasurement(const QString &requestId)
+{
+    if (m_requestStartTimes.contains(requestId)) {
+        qint64 startTime = m_requestStartTimes[requestId];
+        qint64 endTime = QDateTime::currentMSecsSinceEpoch();
+        qint64 totalTime = endTime - startTime;
+        logPerformance(requestId, "TotalCompletionTime", totalTime);
+        m_requestStartTimes.remove(requestId);
+    }
+}
+
+void LLMClientInterface::logPerformance(const QString &requestId,
+                                        const QString &operation,
+                                        qint64 elapsedMs)
+{
+    LOG_MESSAGE(QString("Performance: %1 %2 took %3 ms").arg(requestId, operation).arg(elapsedMs));
+}
+
+void LLMClientInterface::parseCurrentMessage() {}
+
 } // namespace QodeAssist
--- a/LLMClientInterface.hpp
+++ b/LLMClientInterface.hpp
@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2024-2025 Petr Mironychev
+ * Copyright (C) 2024 Petr Mironychev
 *
 * This file is part of QodeAssist.
 *
@@ -22,15 +22,8 @@
 #include <languageclient/languageclientinterface.h>
 #include <texteditor/texteditor.h>

-#include <context/ContextManager.hpp>
-#include <context/IDocumentReader.hpp>
-#include <context/ProgrammingLanguage.hpp>
 #include <llmcore/ContextData.hpp>
-#include <llmcore/IPromptProvider.hpp>
-#include <llmcore/IProviderRegistry.hpp>
-#include <logger/IRequestPerformanceLogger.hpp>
-#include <settings/CodeCompletionSettings.hpp>
-#include <settings/GeneralSettings.hpp>
+#include <llmcore/RequestHandler.hpp>

 class QNetworkReply;
 class QNetworkAccessManager;
@@ -42,33 +35,20 @@ class LLMClientInterface : public LanguageClient::BaseClientInterface
    Q_OBJECT

 public:
-    LLMClientInterface(
-        const Settings::GeneralSettings &generalSettings,
-        const Settings::CodeCompletionSettings &completeSettings,
-        LLMCore::IProviderRegistry &providerRegistry,
-        LLMCore::IPromptProvider *promptProvider,
-        Context::IDocumentReader &documentReader,
-        IRequestPerformanceLogger &performanceLogger);
-    ~LLMClientInterface() override;
+    LLMClientInterface();

    Utils::FilePath serverDeviceTemplate() const override;

-    void sendCompletionToClient(
-        const QString &completion, const QJsonObject &request, bool isComplete);
+    void sendCompletionToClient(const QString &completion,
+                                const QJsonObject &request,
+                                bool isComplete);

    void handleCompletion(const QJsonObject &request);

-    // exposed for tests
-    void sendData(const QByteArray &data) override;
-
-    Context::ContextManager *contextManager() const;
-
 protected:
    void startImpl() override;
-
-private slots:
-    void handleFullResponse(const QString &requestId, const QString &fullText);
-    void handleRequestFailed(const QString &requestId, const QString &error);
+    void sendData(const QByteArray &data) override;
+    void parseCurrentMessage() override;

 private:
    void handleInitialize(const QJsonObject &request);
@@ -76,27 +56,18 @@ private:
    void handleTextDocumentDidOpen(const QJsonObject &request);
    void handleInitialized(const QJsonObject &request);
    void handleExit(const QJsonObject &request);
-    void handleCancelRequest();
+    void handleCancelRequest(const QJsonObject &request);

-    struct RequestContext
-    {
-        QJsonObject originalRequest;
-        LLMCore::Provider *provider;
-    };
+    LLMCore::ContextData prepareContext(const QJsonObject &request,
+                                        const QStringView &accumulatedCompletion = QString{});

-    LLMCore::ContextData prepareContext(
-        const QJsonObject &request, const Context::DocumentInfo &documentInfo);
-    QString endpoint(LLMCore::Provider *provider, LLMCore::TemplateType type, bool isLanguageSpecify);
-
-    const Settings::CodeCompletionSettings &m_completeSettings;
-    const Settings::GeneralSettings &m_generalSettings;
-    LLMCore::IPromptProvider *m_promptProvider = nullptr;
-    LLMCore::IProviderRegistry &m_providerRegistry;
-    Context::IDocumentReader &m_documentReader;
-    IRequestPerformanceLogger &m_performanceLogger;
+    LLMCore::RequestHandler m_requestHandler;
    QElapsedTimer m_completionTimer;
-    Context::ContextManager *m_contextManager;
-    QHash<QString, RequestContext> m_activeRequests;
+    QMap<QString, qint64> m_requestStartTimes;
+
+    void startTimeMeasurement(const QString &requestId);
+    void endTimeMeasurement(const QString &requestId);
+    void logPerformance(const QString &requestId, const QString &operation, qint64 elapsedMs);
 };

 } // namespace QodeAssist
--- a/LLMSuggestion.cpp
+++ b/LLMSuggestion.cpp
@@ -1,13 +1,8 @@
-/*
- * Copyright (C) 2023 The Qt Company Ltd.
- * Copyright (C) 2024-2025 Petr Mironychev
+/* 
+ * Copyright (C) 2024 Petr Mironychev
 *
 * This file is part of QodeAssist.
 *
- * The Qt Company portions:
- * SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
- *
- * Petr Mironychev portions:
 * QodeAssist is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation, either version 3 of the License, or
@@ -23,178 +18,107 @@
 */

 #include "LLMSuggestion.hpp"
+
+#include <QTextCursor>
+#include <QtWidgets/qtoolbar.h>
 #include <texteditor/texteditor.h>
 #include <utils/stringutils.h>
 #include <utils/tooltip/tooltip.h>

 namespace QodeAssist {

-QString mergeWithRightText(const QString &suggestion, const QString &rightText)
+LLMSuggestion::LLMSuggestion(const Completion &completion, QTextDocument *origin)
+    : m_completion(completion)
+    , m_linesCount(0)
 {
-    if (suggestion.isEmpty() || rightText.isEmpty()) {
-        return suggestion;
-    }
+    int startPos = completion.range().start().toPositionInDocument(origin);
+    int endPos = completion.range().end().toPositionInDocument(origin);

-    int j = 0;
-    QString processed = rightText;
-    QSet<int> matchedPositions;
+    startPos = qBound(0, startPos, origin->characterCount() - 1);
+    endPos = qBound(startPos, endPos, origin->characterCount() - 1);

-    for (int i = 0; i < suggestion.length() && j < processed.length(); ++i) {
-        if (suggestion[i] == processed[j]) {
-            matchedPositions.insert(j);
-            ++j;
-        }
-    }
+    m_start = QTextCursor(origin);
+    m_start.setPosition(startPos);
+    m_start.setKeepPositionOnInsert(true);

-    if (matchedPositions.isEmpty()) {
-        return suggestion + rightText;
-    }
-
-    QList<int> positions = matchedPositions.values();
-    std::sort(positions.begin(), positions.end(), std::greater<int>());
-    for (int pos : positions) {
-        processed.remove(pos, 1);
-    }
-
-    return suggestion;
-}
-
-LLMSuggestion::LLMSuggestion(
-    const QList<Data> &suggestions, QTextDocument *sourceDocument, int currentCompletion)
-    : TextEditor::CyclicSuggestion(suggestions, sourceDocument, currentCompletion)
-{
-    const auto &data = suggestions[currentCompletion];
-
-    int startPos = data.range.begin.toPositionInDocument(sourceDocument);
-    int endPos = data.range.end.toPositionInDocument(sourceDocument);
-
-    startPos = qBound(0, startPos, sourceDocument->characterCount());
-    endPos = qBound(startPos, endPos, sourceDocument->characterCount());
-
-    QTextCursor cursor(sourceDocument);
+    QTextCursor cursor(origin);
    cursor.setPosition(startPos);
+    cursor.setPosition(endPos, QTextCursor::KeepAnchor);
+
    QTextBlock block = cursor.block();
    QString blockText = block.text();

-    int cursorPositionInBlock = cursor.positionInBlock();
+    int startPosInBlock = startPos - block.position();
+    int endPosInBlock = endPos - block.position();

-    QString rightText = blockText.mid(cursorPositionInBlock);
+    blockText.replace(startPosInBlock, endPosInBlock - startPosInBlock, completion.text());

-    if (!data.text.contains('\n')) {
-        QString processedRightText = mergeWithRightText(data.text, rightText);
-        processedRightText = processedRightText.mid(data.text.length());
-        QString displayText = blockText.left(cursorPositionInBlock) + data.text
-                              + processedRightText;
-        replacementDocument()->setPlainText(displayText);
-    } else {
-        QString displayText = blockText.left(cursorPositionInBlock) + data.text;
-        replacementDocument()->setPlainText(displayText);
-    }
-}
+    document()->setPlainText(blockText);

-bool LLMSuggestion::applyWord(TextEditor::TextEditorWidget *widget)
-{
-    return applyPart(Word, widget);
-}
-
-bool LLMSuggestion::applyLine(TextEditor::TextEditorWidget *widget)
-{
-    return applyPart(Line, widget);
-}
-
-bool LLMSuggestion::applyPart(Part part, TextEditor::TextEditorWidget *widget)
-{
-    const Utils::Text::Range range = suggestions()[currentSuggestion()].range;
-    const QTextCursor cursor = range.begin.toTextCursor(sourceDocument());
-    QTextCursor currentCursor = widget->textCursor();
-    const QString text = suggestions()[currentSuggestion()].text;
-
-    const int startPos = currentCursor.positionInBlock() - cursor.positionInBlock()
-                         + (cursor.selectionEnd() - cursor.selectionStart());
-
-    int next = part == Word ? Utils::endOfNextWord(text, startPos) : text.indexOf('\n', startPos);
-
-    if (next == -1) {
-        if (part == Line) {
-            next = text.length();
-        } else {
-            return apply();
-        }
-    }
-
-    if (part == Line)
-        ++next;
-
-    QString subText = text.mid(startPos, next - startPos);
-
-    if (subText.isEmpty()) {
-        return false;
-    }
-
-    if (!subText.contains('\n')) {
-        currentCursor.insertText(subText);
-
-        const QString remainingText = text.mid(next);
-        if (!remainingText.isEmpty()) {
-            QTextCursor newCursor = widget->textCursor();
-            const Utils::Text::Position newStart = Utils::Text::Position::fromPositionInDocument(
-                newCursor.document(), newCursor.position());
-            const Utils::Text::Position
-                newEnd{newStart.line, newStart.column + int(remainingText.length())};
-            const Utils::Text::Range newRange{newStart, newEnd};
-            const QList<Data> newSuggestion{{newRange, newStart, remainingText}};
-            widget->insertSuggestion(
-                std::make_unique<LLMSuggestion>(newSuggestion, widget->document(), 0));
-        }
-    } else {
-        currentCursor.insertText(subText);
-
-        if (const int seperatorPos = subText.lastIndexOf('\n'); seperatorPos >= 0) {
-            const QString newCompletionText = text.mid(startPos + seperatorPos + 1);
-            if (!newCompletionText.isEmpty()) {
-                const Utils::Text::Position newStart{int(range.begin.line + subText.count('\n')), 0};
-                const Utils::Text::Position newEnd{newStart.line, int(newCompletionText.length())};
-                const Utils::Text::Range newRange{newStart, newEnd};
-                const QList<Data> newSuggestion{{newRange, newEnd, newCompletionText}};
-                widget->insertSuggestion(
-                    std::make_unique<LLMSuggestion>(newSuggestion, widget->document(), 0));
-            }
-        }
-    }
-
-    return false;
+    setCurrentPosition(m_start.position());
 }

 bool LLMSuggestion::apply()
 {
-    const Utils::Text::Range range = suggestions()[currentSuggestion()].range;
-    const QTextCursor cursor = range.begin.toTextCursor(sourceDocument());
-    const QString text = suggestions()[currentSuggestion()].text;
-
-    QTextBlock currentBlock = cursor.block();
-    QString textAfterCursor = currentBlock.text().mid(cursor.positionInBlock());
-
-    QTextCursor editCursor = cursor;
-
-    int firstLineEnd = text.indexOf('\n');
-    if (firstLineEnd != -1) {
-        QString firstLine = text.left(firstLineEnd);
-        QString restOfText = text.mid(firstLineEnd);
-
-        editCursor.movePosition(QTextCursor::EndOfBlock, QTextCursor::KeepAnchor);
-        editCursor.removeSelectedText();
-
-        QString mergedFirstLine = mergeWithRightText(firstLine, textAfterCursor);
-        editCursor.insertText(mergedFirstLine + restOfText);
-    } else {
-        editCursor.movePosition(QTextCursor::EndOfBlock, QTextCursor::KeepAnchor);
-        editCursor.removeSelectedText();
-
-        QString mergedText = mergeWithRightText(text, textAfterCursor);
-        editCursor.insertText(mergedText);
-    }
-
+    QTextCursor cursor = m_completion.range().toSelection(m_start.document());
+    cursor.beginEditBlock();
+    cursor.removeSelectedText();
+    cursor.insertText(m_completion.text());
+    cursor.endEditBlock();
    return true;
 }

+bool LLMSuggestion::applyWord(TextEditor::TextEditorWidget *widget)
+{
+    return applyNextLine(widget);
+}
+
+bool LLMSuggestion::applyNextLine(TextEditor::TextEditorWidget *widget)
+{
+    const QString text = m_completion.text();
+    QStringList lines = text.split('\n');
+
+    if (m_linesCount < lines.size())
+        m_linesCount++;
+
+    showTooltip(widget, m_linesCount);
+
+    return m_linesCount == lines.size() && !Utils::ToolTip::isVisible();
+}
+
+void LLMSuggestion::onCounterFinished(int count)
+{
+    Utils::ToolTip::hide();
+    m_linesCount = 0;
+    QTextCursor cursor = m_completion.range().toSelection(m_start.document());
+    cursor.beginEditBlock();
+    cursor.removeSelectedText();
+
+    QStringList lines = m_completion.text().split('\n');
+    QString textToInsert = lines.mid(0, count).join('\n');
+
+    cursor.insertText(textToInsert);
+    cursor.endEditBlock();
+}
+
+void LLMSuggestion::reset()
+{
+    m_start.removeSelectedText();
+}
+
+int LLMSuggestion::position()
+{
+    return m_start.position();
+}
+
+void LLMSuggestion::showTooltip(TextEditor::TextEditorWidget *widget, int count)
+{
+    Utils::ToolTip::hide();
+    QPoint pos = widget->mapToGlobal(widget->cursorRect().topRight());
+    pos += QPoint(-10, -50);
+    m_counterTooltip = new CounterTooltip(count);
+    Utils::ToolTip::show(pos, m_counterTooltip, widget);
+    connect(m_counterTooltip, &CounterTooltip::finished, this, &LLMSuggestion::onCounterFinished);
+}
+
 } // namespace QodeAssist
--- a/LLMSuggestion.hpp
+++ b/LLMSuggestion.hpp
@@ -1,13 +1,8 @@
-/*
- * Copyright (C) 2023 The Qt Company Ltd.
- * Copyright (C) 2024-2025 Petr Mironychev
+/* 
+ * Copyright (C) 2024 Petr Mironychev
 *
 * This file is part of QodeAssist.
 *
- * The Qt Company portions:
- * SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
- *
- * Petr Mironychev portions:
 * QodeAssist is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation, either version 3 of the License, or
@@ -24,22 +19,37 @@

 #pragma once

-#include <texteditor/texteditor.h>
-#include <texteditor/textsuggestion.h>
+#include <QObject>
+#include "LSPCompletion.hpp"
+#include <texteditor/textdocumentlayout.h>
+
+#include "utils/CounterTooltip.hpp"

 namespace QodeAssist {

-class LLMSuggestion : public TextEditor::CyclicSuggestion
+class LLMSuggestion final : public QObject, public TextEditor::TextSuggestion
 {
+    Q_OBJECT
 public:
-    enum Part { Word, Line };
+    LLMSuggestion(const Completion &completion, QTextDocument *origin);

-    LLMSuggestion(
-        const QList<Data> &suggestions, QTextDocument *sourceDocument, int currentCompletion = 0);
+    bool apply() final;
+    bool applyWord(TextEditor::TextEditorWidget *widget) final;
+    bool applyNextLine(TextEditor::TextEditorWidget *widget);
+    void reset() final;
+    int position() final;

-    bool applyWord(TextEditor::TextEditorWidget *widget) override;
-    bool applyLine(TextEditor::TextEditorWidget *widget) override;
-    bool applyPart(Part part, TextEditor::TextEditorWidget *widget);
-    bool apply() override;
+    const Completion &completion() const { return m_completion; }
+
+    void showTooltip(TextEditor::TextEditorWidget *widget, int count);
+    void onCounterFinished(int count);
+
+private:
+    Completion m_completion;
+    QTextCursor m_start;
+    int m_linesCount;
+
+    CounterTooltip *m_counterTooltip = nullptr;
 };
+
 } // namespace QodeAssist
--- a/LSPCompletion.hpp
+++ b/LSPCompletion.hpp
@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2023 The Qt Company Ltd.
- * Copyright (C) 2024-2025 Petr Mironychev
+ * Copyright (C) 2024 Petr Mironychev
 *
 * This file is part of QodeAssist.
 *
@@ -68,10 +68,9 @@ class GetCompletionParams : public LanguageServerProtocol::JsonObject
 public:
    static constexpr LanguageServerProtocol::Key docKey{"doc"};

-    GetCompletionParams(
-        const LanguageServerProtocol::TextDocumentIdentifier &document,
-        int version,
-        const LanguageServerProtocol::Position &position)
+    GetCompletionParams(const LanguageServerProtocol::TextDocumentIdentifier &document,
+                        int version,
+                        const LanguageServerProtocol::Position &position)
    {
        setTextDocument(document);
        setVersion(version);
--- a/QodeAssist.json.in
+++ b/QodeAssist.json.in
@@ -1,14 +1,16 @@
 {
-    "Id" : "qodeassist",
    "Name" : "QodeAssist",
-    "Version" : "0.8.0",
-    "CompatVersion" : "${IDE_VERSION}",
+    "Version" : "0.3.10",
+    "CompatVersion" : "${IDE_VERSION_COMPAT}",
    "Vendor" : "Petr Mironychev",
-    "VendorId" : "petrmironychev",
    "Copyright" : "(C) ${IDE_COPYRIGHT_YEAR} Petr Mironychev, (C) ${IDE_COPYRIGHT_YEAR} The Qt Company Ltd",
-    "License" : "GPLv3",
-    "Description": "QodeAssist is an AI-powered coding assistant for Qt Creator. It provides intelligent code completion and suggestions for your code. Prerequisites: Requires one of the supported LLM providers installed (e.g., Ollama or LM Studio) and a compatible large language model downloaded for your chosen provider (e.g., CodeLlama, StarCoder2).",
+    "License" : "GNU General Public License Usage
+
+Alternatively, this file may be used under the terms of the GNU General Public License version 3 as published by the Free Software Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT included in the packaging of this file. Please review the following information to ensure the GNU General Public License requirements will be met: https://www.gnu.org/licenses/gpl-3.0.html.",
+    "Description" : ["QodeAssist is an AI-powered coding assistant for Qt Creator. It provides intelligent code completion and suggestions for your code",
+    "Prerequisites:",
+        "- One of the supported LLM providers installed (e.g., Ollama or LM Studio)",
+        "- A compatible large language model downloaded for your chosen provider (e.g., CodeLlama, StarCoder2)"],
    "Url" : "https://github.com/Palm1r/QodeAssist",
-    "DocumentationUrl" : "https://github.com/Palm1r/QodeAssist",
    ${IDE_PLUGIN_DEPENDENCIES}
 }
--- a/QodeAssist.qrc
+++ b/QodeAssist.qrc
@@ -2,13 +2,5 @@
    <qresource prefix="/">
        <file>resources/images/qoderassist-icon@2x.png</file>
        <file>resources/images/qoderassist-icon.png</file>
-        <file>resources/images/repeat-last-instruct-icon@2x.png</file>
-        <file>resources/images/repeat-last-instruct-icon.png</file>
-        <file>resources/images/improve-current-code-icon@2x.png</file>
-        <file>resources/images/improve-current-code-icon.png</file>
-        <file>resources/images/suggest-new-icon.png</file>
-        <file>resources/images/suggest-new-icon@2x.png</file>
-        <file>resources/images/qode-assist-chat-icon.png</file>
-        <file>resources/images/qode-assist-chat-icon@2x.png</file>
    </qresource>
 </RCC>
--- a/QodeAssistClient.cpp
+++ b/QodeAssistClient.cpp
@@ -1,8 +1,8 @@
 /*
 * Copyright (C) 2023 The Qt Company Ltd.
- * Copyright (C) 2024-2025 Petr Mironychev
+ * Copyright (C) 2024 Petr Mironychev
 *
- * This file is part of QodeAssist.
+ * This file is part of Qode Assist.
 *
 * The Qt Company portions:
 * SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
@@ -24,20 +24,16 @@

 #include "QodeAssistClient.hpp"

-#include <QInputDialog>
 #include <QTimer>

-#include <coreplugin/icore.h>
 #include <languageclient/languageclientsettings.h>
 #include <projectexplorer/projectmanager.h>

 #include "LLMClientInterface.hpp"
 #include "LLMSuggestion.hpp"
+#include "core/ChangesManager.h"
 #include "settings/CodeCompletionSettings.hpp"
 #include "settings/GeneralSettings.hpp"
-#include "settings/ProjectSettings.hpp"
-#include <context/ChangesManager.h>
-#include <logger/Logger.hpp>

 using namespace LanguageServerProtocol;
 using namespace TextEditor;
@@ -47,12 +43,11 @@ using namespace Core;

 namespace QodeAssist {

-QodeAssistClient::QodeAssistClient(LLMClientInterface *clientInterface)
-    : LanguageClient::Client(clientInterface)
-    , m_llmClient(clientInterface)
+QodeAssistClient::QodeAssistClient()
+    : LanguageClient::Client(new LLMClientInterface())
    , m_recentCharCount(0)
 {
-    setName("QodeAssist");
+    setName("Qode Assist");
    LanguageClient::LanguageFilter filter;
    filter.mimeTypes = QStringList() << "*";
    setSupportedLanguage(filter);
@@ -75,70 +70,48 @@ void QodeAssistClient::openDocument(TextEditor::TextDocument *document)
        return;

    Client::openDocument(document);
-    connect(
-        document,
-        &TextDocument::contentsChangedWithPosition,
-        this,
-        [this, document](int position, int charsRemoved, int charsAdded) {
-            if (!Settings::codeCompletionSettings().autoCompletion())
-                return;
+    connect(document,
+            &TextDocument::contentsChangedWithPosition,
+            this,
+            [this, document](int position, int charsRemoved, int charsAdded) {
+                Q_UNUSED(charsRemoved)
+                if (!Settings::codeCompletionSettings().autoCompletion())
+                    return;

-            auto project = ProjectManager::projectForFile(document->filePath());
-            if (!isEnabled(project))
-                return;
+                auto project = ProjectManager::projectForFile(document->filePath());
+                if (!isEnabled(project))
+                    return;

-            auto textEditor = BaseTextEditor::currentTextEditor();
-            if (!textEditor || textEditor->document() != document)
-                return;
+                auto textEditor = BaseTextEditor::currentTextEditor();
+                if (!textEditor || textEditor->document() != document)
+                    return;

-            if (Settings::codeCompletionSettings().useProjectChangesCache())
-                Context::ChangesManager::instance()
-                    .addChange(document, position, charsRemoved, charsAdded);
+                if (Settings::codeCompletionSettings().useProjectChangesCache())
+                    ChangesManager::instance().addChange(document,
+                                                         position,
+                                                         charsRemoved,
+                                                         charsAdded);

-            TextEditorWidget *widget = textEditor->editorWidget();
-            if (widget->isReadOnly() || widget->multiTextCursor().hasMultipleCursors())
-                return;
+                TextEditorWidget *widget = textEditor->editorWidget();
+                if (widget->isReadOnly() || widget->multiTextCursor().hasMultipleCursors())
+                    return;
+                const int cursorPosition = widget->textCursor().position();
+                if (cursorPosition < position || cursorPosition > position + charsAdded)
+                    return;

-            const int cursorPosition = widget->textCursor().position();
-            if (cursorPosition < position || cursorPosition > position + charsAdded)
-                return;
+                m_recentCharCount += charsAdded;

-            if (charsRemoved > 0 || charsAdded <= 0) {
-                m_recentCharCount = 0;
-                m_typingTimer.restart();
-                return;
-            }
+                if (m_typingTimer.elapsed()
+                    > Settings::codeCompletionSettings().autoCompletionTypingInterval()) {
+                    m_recentCharCount = charsAdded;
+                    m_typingTimer.restart();
+                }

-            QTextCursor cursor = widget->textCursor();
-            cursor.movePosition(QTextCursor::Left, QTextCursor::KeepAnchor, 1);
-            QString lastChar = cursor.selectedText();
-
-            if (lastChar.isEmpty() || lastChar[0].isPunct()) {
-                m_recentCharCount = 0;
-                m_typingTimer.restart();
-                return;
-            }
-
-            m_recentCharCount += charsAdded;
-
-            if (m_typingTimer.elapsed()
-                > Settings::codeCompletionSettings().autoCompletionTypingInterval()) {
-                m_recentCharCount = charsAdded;
-                m_typingTimer.restart();
-            }
-
-            if (m_recentCharCount
-                > Settings::codeCompletionSettings().autoCompletionCharThreshold()) {
-                scheduleRequest(widget);
-            }
-        });
-
-    // auto editors = BaseTextEditor::textEditorsForDocument(document);
-    // connect(
-    //     editors.first()->editorWidget(),
-    //     &TextEditorWidget::selectionChanged,
-    //     this,
-    //     [this, editors]() { m_chatButtonHandler.showButton(editors.first()->editorWidget()); });
+                if (m_recentCharCount
+                    > Settings::codeCompletionSettings().autoCompletionCharThreshold()) {
+                    scheduleRequest(widget);
+                }
+            });
 }

 bool QodeAssistClient::canOpenProject(ProjectExplorer::Project *project)
@@ -153,26 +126,14 @@ void QodeAssistClient::requestCompletions(TextEditor::TextEditorWidget *editor)
    if (!isEnabled(project))
        return;

-    if (m_llmClient->contextManager()
-            ->ignoreManager()
-            ->shouldIgnore(editor->textDocument()->filePath().toUrlishString(), project)) {
-        LOG_MESSAGE(QString("Ignoring file due to .qodeassistignore: %1")
-                        .arg(editor->textDocument()->filePath().toUrlishString()));
-        return;
-    }
-
    MultiTextCursor cursor = editor->multiTextCursor();
    if (cursor.hasMultipleCursors() || cursor.hasSelection() || editor->suggestionVisible())
        return;

    const FilePath filePath = editor->textDocument()->filePath();
-    GetCompletionRequest request{
-        {TextDocumentIdentifier(hostPathToServerUri(filePath)),
-         documentVersion(filePath),
-         Position(cursor.mainCursor())}};
-    if (Settings::codeCompletionSettings().showProgressWidget()) {
-        m_progressHandler.showProgress(editor);
-    }
+    GetCompletionRequest request{{TextDocumentIdentifier(hostPathToServerUri(filePath)),
+                                  documentVersion(filePath),
+                                  Position(cursor.mainCursor())}};
    request.setResponseCallback([this, editor = QPointer<TextEditorWidget>(editor)](
                                    const GetCompletionRequest::Response &response) {
        QTC_ASSERT(editor, return);
@@ -182,35 +143,6 @@ void QodeAssistClient::requestCompletions(TextEditor::TextEditorWidget *editor)
    sendMessage(request);
 }

-void QodeAssistClient::requestQuickRefactor(
-    TextEditor::TextEditorWidget *editor, const QString &instructions)
-{
-    auto project = ProjectManager::projectForFile(editor->textDocument()->filePath());
-
-    if (!isEnabled(project))
-        return;
-
-    if (m_llmClient->contextManager()
-            ->ignoreManager()
-            ->shouldIgnore(editor->textDocument()->filePath().toUrlishString(), project)) {
-        LOG_MESSAGE(QString("Ignoring file due to .qodeassistignore: %1")
-                        .arg(editor->textDocument()->filePath().toUrlishString()));
-        return;
-    }
-
-    if (!m_refactorHandler) {
-        m_refactorHandler = new QuickRefactorHandler(this);
-        connect(
-            m_refactorHandler,
-            &QuickRefactorHandler::refactoringCompleted,
-            this,
-            &QodeAssistClient::handleRefactoringResult);
-    }
-
-    m_progressHandler.showProgress(editor);
-    m_refactorHandler->sendRefactorRequest(editor, instructions);
-}
-
 void QodeAssistClient::scheduleRequest(TextEditor::TextEditorWidget *editor)
 {
    cancelRunningRequest(editor);
@@ -240,8 +172,8 @@ void QodeAssistClient::scheduleRequest(TextEditor::TextEditorWidget *editor)
    it.value()->setProperty("cursorPosition", editor->textCursor().position());
    it.value()->start(Settings::codeCompletionSettings().startSuggestionTimer());
 }
-void QodeAssistClient::handleCompletions(
-    const GetCompletionRequest::Response &response, TextEditor::TextEditorWidget *editor)
+void QodeAssistClient::handleCompletions(const GetCompletionRequest::Response &response,
+                                         TextEditor::TextEditorWidget *editor)
 {
    if (response.error())
        log(*response.error());
@@ -261,8 +193,8 @@ void QodeAssistClient::handleCompletions(
        auto isValidCompletion = [](const Completion &completion) {
            return completion.isValid() && !completion.text().trimmed().isEmpty();
        };
-        QList<Completion> completions
-            = Utils::filtered(result->completions().toListOrEmpty(), isValidCompletion);
+        QList<Completion> completions = Utils::filtered(result->completions().toListOrEmpty(),
+                                                        isValidCompletion);

        // remove trailing whitespaces from the end of the completions
        for (Completion &completion : completions) {
@@ -279,19 +211,10 @@ void QodeAssistClient::handleCompletions(
            if (delta > 0)
                completion.setText(completionText.chopped(delta));
        }
-        auto suggestions = Utils::transform(completions, [](const Completion &c) {
-            auto toTextPos = [](const LanguageServerProtocol::Position pos) {
-                return Text::Position{pos.line() + 1, pos.character()};
-            };
-
-            Text::Range range{toTextPos(c.range().start()), toTextPos(c.range().end())};
-            Text::Position pos{toTextPos(c.position())};
-            return TextSuggestion::Data{range, pos, c.text()};
-        });
-        m_progressHandler.hideProgress();
        if (completions.isEmpty())
            return;
-        editor->insertSuggestion(std::make_unique<LLMSuggestion>(suggestions, editor->document()));
+        editor->insertSuggestion(
+            std::make_unique<LLMSuggestion>(completions.first(), editor->document()));
    }
 }

@@ -300,18 +223,13 @@ void QodeAssistClient::cancelRunningRequest(TextEditor::TextEditorWidget *editor
    const auto it = m_runningRequests.constFind(editor);
    if (it == m_runningRequests.constEnd())
        return;
-    m_progressHandler.hideProgress();
    cancelRequest(it->id());
    m_runningRequests.erase(it);
 }

 bool QodeAssistClient::isEnabled(ProjectExplorer::Project *project) const
 {
-    if (!project)
-        return Settings::generalSettings().enableQodeAssist();
-
-    Settings::ProjectSettings settings(project);
-    return settings.isEnabled();
+    return Settings::generalSettings().enableQodeAssist();
 }

 void QodeAssistClient::setupConnections()
@@ -321,13 +239,18 @@ void QodeAssistClient::setupConnections()
            openDocument(textDocument);
    };

-    m_documentOpenedConnection
-        = connect(EditorManager::instance(), &EditorManager::documentOpened, this, openDoc);
-    m_documentClosedConnection = connect(
-        EditorManager::instance(), &EditorManager::documentClosed, this, [this](IDocument *document) {
-            if (auto textDocument = qobject_cast<TextDocument *>(document))
-                closeDocument(textDocument);
-        });
+    m_documentOpenedConnection = connect(EditorManager::instance(),
+                                         &EditorManager::documentOpened,
+                                         this,
+                                         openDoc);
+    m_documentClosedConnection = connect(EditorManager::instance(),
+                                         &EditorManager::documentClosed,
+                                         this,
+                                         [this](IDocument *document) {
+                                             if (auto textDocument = qobject_cast<TextDocument *>(
+                                                     document))
+                                                 closeDocument(textDocument);
+                                         });

    for (IDocument *doc : DocumentModel::openedDocuments())
        openDoc(doc);
@@ -342,32 +265,4 @@ void QodeAssistClient::cleanupConnections()
    m_scheduledRequests.clear();
 }

-void QodeAssistClient::handleRefactoringResult(const RefactorResult &result)
-{
-    if (!result.success) {
-        LOG_MESSAGE(QString("Refactoring failed: %1").arg(result.errorMessage));
-        return;
-    }
-
-    auto editor = BaseTextEditor::currentTextEditor();
-    if (!editor) {
-        LOG_MESSAGE("Refactoring failed: No active editor found");
-        return;
-    }
-
-    auto editorWidget = editor->editorWidget();
-
-    QTextCursor cursor = editorWidget->textCursor();
-    cursor.beginEditBlock();
-
-    int startPos = result.insertRange.begin.toPositionInDocument(editorWidget->document());
-    int endPos = result.insertRange.end.toPositionInDocument(editorWidget->document());
-
-    cursor.setPosition(startPos);
-    cursor.setPosition(endPos, QTextCursor::KeepAnchor);
-
-    cursor.insertText(result.newText);
-    cursor.endEditBlock();
-    m_progressHandler.hideProgress();
-}
 } // namespace QodeAssist
--- a/QodeAssistClient.hpp
+++ b/QodeAssistClient.hpp
@@ -1,8 +1,8 @@
 /*
 * Copyright (C) 2023 The Qt Company Ltd.
- * Copyright (C) 2024-2025 Petr Mironychev
+ * Copyright (C) 2024 Petr Mironychev
 *
- * This file is part of QodeAssist.
+ * This file is part of Qode Assist.
 *
 * The Qt Company portions:
 * SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
@@ -24,43 +24,32 @@

 #pragma once

-#include <QObject>
-
-#include "LLMClientInterface.hpp"
-#include "LSPCompletion.hpp"
-#include "QuickRefactorHandler.hpp"
-#include "widgets/CompletionProgressHandler.hpp"
-#include "widgets/EditorChatButtonHandler.hpp"
 #include <languageclient/client.h>
-#include <llmcore/IPromptProvider.hpp>
-#include <llmcore/IProviderRegistry.hpp>
+
+#include "LSPCompletion.hpp"

 namespace QodeAssist {

 class QodeAssistClient : public LanguageClient::Client
 {
-    Q_OBJECT
 public:
-    explicit QodeAssistClient(LLMClientInterface *clientInterface);
+    explicit QodeAssistClient();
    ~QodeAssistClient() override;

    void openDocument(TextEditor::TextDocument *document) override;
    bool canOpenProject(ProjectExplorer::Project *project) override;

    void requestCompletions(TextEditor::TextEditorWidget *editor);
-    void requestQuickRefactor(
-        TextEditor::TextEditorWidget *editor, const QString &instructions = QString());

 private:
    void scheduleRequest(TextEditor::TextEditorWidget *editor);
-    void handleCompletions(
-        const GetCompletionRequest::Response &response, TextEditor::TextEditorWidget *editor);
+    void handleCompletions(const GetCompletionRequest::Response &response,
+                           TextEditor::TextEditorWidget *editor);
    void cancelRunningRequest(TextEditor::TextEditorWidget *editor);
    bool isEnabled(ProjectExplorer::Project *project) const;

    void setupConnections();
    void cleanupConnections();
-    void handleRefactoringResult(const RefactorResult &result);

    QHash<TextEditor::TextEditorWidget *, GetCompletionRequest> m_runningRequests;
    QHash<TextEditor::TextEditorWidget *, QTimer *> m_scheduledRequests;
@@ -69,10 +58,6 @@ private:

    QElapsedTimer m_typingTimer;
    int m_recentCharCount;
-    CompletionProgressHandler m_progressHandler;
-    EditorChatButtonHandler m_chatButtonHandler;
-    QuickRefactorHandler *m_refactorHandler{nullptr};
-    LLMClientInterface *m_llmClient;
 };

 } // namespace QodeAssist
--- a/QodeAssistConstants.hpp
+++ b/QodeAssistConstants.hpp
@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2024-2025 Petr Mironychev
+ * Copyright (C) 2024 Petr Mironychev
 *
 * This file is part of QodeAssist.
 *
--- a/QodeAssist_en_001.ts
+++ b/QodeAssist_en_001.ts
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="en_001"></TS>
--- a/QodeAssisttr.h
+++ b/QodeAssisttr.h
@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2024-2025 Petr Mironychev
+ * Copyright (C) 2024 Petr Mironychev
 *
 * This file is part of QodeAssist.
 *
--- a/QuickRefactorHandler.cpp
+++ b/QuickRefactorHandler.cpp
@@ -1,335 +0,0 @@
-/*
- * Copyright (C) 2025 Petr Mironychev
- *
- * This file is part of QodeAssist.
- *
- * QodeAssist is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QodeAssist is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QodeAssist. If not, see <https://www.gnu.org/licenses/>.
- */
-
-#include "QuickRefactorHandler.hpp"
-
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QUuid>
-
-#include <context/DocumentContextReader.hpp>
-#include <context/DocumentReaderQtCreator.hpp>
-#include <context/Utils.hpp>
-#include <llmcore/PromptTemplateManager.hpp>
-#include <llmcore/ProvidersManager.hpp>
-#include <llmcore/RequestConfig.hpp>
-#include <llmcore/RulesLoader.hpp>
-#include <logger/Logger.hpp>
-#include <settings/ChatAssistantSettings.hpp>
-#include <settings/GeneralSettings.hpp>
-
-namespace QodeAssist {
-
-QuickRefactorHandler::QuickRefactorHandler(QObject *parent)
-    : QObject(parent)
-    , m_currentEditor(nullptr)
-    , m_isRefactoringInProgress(false)
-    , m_contextManager(this)
-{
-}
-
-QuickRefactorHandler::~QuickRefactorHandler() {}
-
-void QuickRefactorHandler::sendRefactorRequest(
-    TextEditor::TextEditorWidget *editor, const QString &instructions)
-{
-    if (m_isRefactoringInProgress) {
-        cancelRequest();
-    }
-
-    m_currentEditor = editor;
-
-    Utils::Text::Range range;
-    if (editor->textCursor().hasSelection()) {
-        QTextCursor cursor = editor->textCursor();
-        int startPos = cursor.selectionStart();
-        int endPos = cursor.selectionEnd();
-
-        QTextBlock startBlock = editor->document()->findBlock(startPos);
-        int startLine = startBlock.blockNumber() + 1;
-        int startColumn = startPos - startBlock.position();
-
-        QTextBlock endBlock = editor->document()->findBlock(endPos);
-        int endLine = endBlock.blockNumber() + 1;
-        int endColumn = endPos - endBlock.position();
-
-        Utils::Text::Position startPosition;
-        startPosition.line = startLine;
-        startPosition.column = startColumn;
-
-        Utils::Text::Position endPosition;
-        endPosition.line = endLine;
-        endPosition.column = endColumn;
-
-        range = Utils::Text::Range();
-        range.begin = startPosition;
-        range.end = endPosition;
-    } else {
-        QTextCursor cursor = editor->textCursor();
-        int cursorPos = cursor.position();
-
-        QTextBlock block = editor->document()->findBlock(cursorPos);
-        int line = block.blockNumber() + 1;
-        int column = cursorPos - block.position();
-
-        Utils::Text::Position cursorPosition;
-        cursorPosition.line = line;
-        cursorPosition.column = column;
-        range = Utils::Text::Range();
-        range.begin = cursorPosition;
-        range.end = cursorPosition;
-    }
-
-    m_currentRange = range;
-    prepareAndSendRequest(editor, instructions, range);
-}
-
-void QuickRefactorHandler::prepareAndSendRequest(
-    TextEditor::TextEditorWidget *editor,
-    const QString &instructions,
-    const Utils::Text::Range &range)
-{
-    auto &settings = Settings::generalSettings();
-
-    auto &providerRegistry = LLMCore::ProvidersManager::instance();
-    auto &promptManager = LLMCore::PromptTemplateManager::instance();
-
-    const auto providerName = settings.caProvider();
-    auto provider = providerRegistry.getProviderByName(providerName);
-
-    if (!provider) {
-        LOG_MESSAGE(QString("No provider found with name: %1").arg(providerName));
-        RefactorResult result;
-        result.success = false;
-        result.errorMessage = QString("No provider found with name: %1").arg(providerName);
-        emit refactoringCompleted(result);
-        return;
-    }
-
-    const auto templateName = settings.caTemplate();
-    auto promptTemplate = promptManager.getChatTemplateByName(templateName);
-
-    if (!promptTemplate) {
-        LOG_MESSAGE(QString("No template found with name: %1").arg(templateName));
-        RefactorResult result;
-        result.success = false;
-        result.errorMessage = QString("No template found with name: %1").arg(templateName);
-        emit refactoringCompleted(result);
-        return;
-    }
-
-    LLMCore::LLMConfig config;
-    config.requestType = LLMCore::RequestType::QuickRefactoring;
-    config.provider = provider;
-    config.promptTemplate = promptTemplate;
-    config.url = QString("%1%2").arg(settings.caUrl(), provider->chatEndpoint());
-    config.providerRequest = {{"model", settings.caModel()}, {"stream", true}};
-    config.apiKey = provider->apiKey();
-
-    LLMCore::ContextData context = prepareContext(editor, range, instructions);
-
-    provider->prepareRequest(
-        config.providerRequest,
-        promptTemplate,
-        context,
-        LLMCore::RequestType::QuickRefactoring,
-        false);
-
-    QString requestId = QUuid::createUuid().toString();
-    m_lastRequestId = requestId;
-    QJsonObject request{{"id", requestId}};
-
-    m_isRefactoringInProgress = true;
-
-    m_activeRequests[requestId] = {request, provider};
-
-    connect(
-        provider,
-        &LLMCore::Provider::fullResponseReceived,
-        this,
-        &QuickRefactorHandler::handleFullResponse,
-        Qt::UniqueConnection);
-
-    connect(
-        provider,
-        &LLMCore::Provider::requestFailed,
-        this,
-        &QuickRefactorHandler::handleRequestFailed,
-        Qt::UniqueConnection);
-
-    provider->sendRequest(requestId, config.url, config.providerRequest);
-}
-
-LLMCore::ContextData QuickRefactorHandler::prepareContext(
-    TextEditor::TextEditorWidget *editor,
-    const Utils::Text::Range &range,
-    const QString &instructions)
-{
-    LLMCore::ContextData context;
-
-    auto textDocument = editor->textDocument();
-    Context::DocumentReaderQtCreator documentReader;
-    auto documentInfo = documentReader.readDocument(textDocument->filePath().toUrlishString());
-
-    if (!documentInfo.document) {
-        LOG_MESSAGE("Error: Document is not available");
-        return context;
-    }
-
-    QTextCursor cursor = editor->textCursor();
-    int cursorPos = cursor.position();
-
-    // TODO add selecting content before and after cursor/selection
-    QString fullContent = documentInfo.document->toPlainText();
-    QString taggedContent = fullContent;
-
-    if (cursor.hasSelection()) {
-        int selEnd = cursor.selectionEnd();
-        int selStart = cursor.selectionStart();
-        taggedContent
-            .insert(selEnd, selEnd == cursorPos ? "<selection_end><cursor>" : "<selection_end>");
-        taggedContent.insert(
-            selStart, selStart == cursorPos ? "<cursor><selection_start>" : "<selection_start>");
-    } else {
-        taggedContent.insert(cursorPos, "<cursor>");
-    }
-
-    QString systemPrompt = Settings::codeCompletionSettings().quickRefactorSystemPrompt();
-
-    auto project = LLMCore::RulesLoader::getActiveProject();
-    if (project) {
-        QString projectRules = LLMCore::RulesLoader::loadRulesForProject(
-            project, LLMCore::RulesContext::QuickRefactor);
-
-        if (!projectRules.isEmpty()) {
-            systemPrompt += "\n\n# Project Rules\n\n" + projectRules;
-            LOG_MESSAGE("Loaded project rules for quick refactor");
-        }
-    }
-
-    systemPrompt += "\n\nFile information:";
-    systemPrompt += "\nLanguage: " + documentInfo.mimeType;
-    systemPrompt += "\nFile path: " + documentInfo.filePath;
-
-    systemPrompt += "\n\nCode context with position markers:";
-    systemPrompt += taggedContent;
-
-    systemPrompt += "\n\nOutput format:";
-    systemPrompt += "\n- Generate ONLY the code that should replace the current selection "
-                    "between<selection_start><selection_end> or be "
-                    "inserted at cursor position<cursor>";
-    systemPrompt += "\n- Do not include any explanations, comments about the code, or markdown "
-                    "code block markers";
-    systemPrompt += "\n- The output should be ready to insert directly into the editor";
-    systemPrompt += "\n- Follow the existing code style and indentation patterns";
-
-    if (Settings::codeCompletionSettings().useOpenFilesInQuickRefactor()) {
-        systemPrompt += "\n\n" + m_contextManager.openedFilesContext({documentInfo.filePath});
-    }
-
-    context.systemPrompt = systemPrompt;
-
-    QVector<LLMCore::Message> messages;
-    messages.append(
-        {"user",
-         instructions.isEmpty() ? "Refactor the code to improve its quality and maintainability."
-                                : instructions});
-    context.history = messages;
-
-    return context;
-}
-
-void QuickRefactorHandler::handleLLMResponse(
-    const QString &response, const QJsonObject &request, bool isComplete)
-{
-    if (request["id"].toString() != m_lastRequestId) {
-        return;
-    }
-
-    if (isComplete) {
-        QString cleanedResponse = response.trimmed();
-        if (cleanedResponse.startsWith("```")) {
-            int firstNewLine = cleanedResponse.indexOf('\n');
-            int lastFence = cleanedResponse.lastIndexOf("```");
-
-            if (firstNewLine != -1 && lastFence > firstNewLine) {
-                cleanedResponse
-                    = cleanedResponse.mid(firstNewLine + 1, lastFence - firstNewLine - 1).trimmed();
-            } else if (lastFence != -1) {
-                cleanedResponse = cleanedResponse.mid(3, lastFence - 3).trimmed();
-            }
-        }
-
-        RefactorResult result;
-        result.newText = cleanedResponse;
-        result.insertRange = m_currentRange;
-        result.success = true;
-
-        LOG_MESSAGE("Refactoring completed successfully. New code to insert: ");
-        LOG_MESSAGE("---------- BEGIN REFACTORED CODE ----------");
-        LOG_MESSAGE(cleanedResponse);
-        LOG_MESSAGE("----------- END REFACTORED CODE -----------");
-
-        emit refactoringCompleted(result);
-    }
-}
-
-void QuickRefactorHandler::cancelRequest()
-{
-    if (m_isRefactoringInProgress) {
-        auto id = m_lastRequestId;
-
-        for (auto it = m_activeRequests.begin(); it != m_activeRequests.end(); ++it) {
-            if (it.key() == id) {
-                const RequestContext &ctx = it.value();
-                ctx.provider->cancelRequest(id);
-                m_activeRequests.erase(it);
-                break;
-            }
-        }
-
-        m_isRefactoringInProgress = false;
-
-        RefactorResult result;
-        result.success = false;
-        result.errorMessage = "Refactoring request was cancelled";
-        emit refactoringCompleted(result);
-    }
-}
-
-void QuickRefactorHandler::handleFullResponse(const QString &requestId, const QString &fullText)
-{
-    if (requestId == m_lastRequestId) {
-        QJsonObject request{{"id", requestId}};
-        handleLLMResponse(fullText, request, true);
-    }
-}
-
-void QuickRefactorHandler::handleRequestFailed(const QString &requestId, const QString &error)
-{
-    if (requestId == m_lastRequestId) {
-        m_isRefactoringInProgress = false;
-        RefactorResult result;
-        result.success = false;
-        result.errorMessage = error;
-        emit refactoringCompleted(result);
-    }
-}
-
-} // namespace QodeAssist
--- a/QuickRefactorHandler.hpp
+++ b/QuickRefactorHandler.hpp
@@ -1,88 +0,0 @@
-/*
- * Copyright (C) 2025 Petr Mironychev
- *
- * This file is part of QodeAssist.
- *
- * QodeAssist is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QodeAssist is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QodeAssist. If not, see <https://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include <QJsonObject>
-#include <QObject>
-
-#include <texteditor/texteditor.h>
-#include <utils/textutils.h>
-
-#include <context/ContextManager.hpp>
-#include <context/IDocumentReader.hpp>
-#include <llmcore/ContextData.hpp>
-#include <llmcore/Provider.hpp>
-
-namespace QodeAssist {
-
-struct RefactorResult
-{
-    QString newText;
-    Utils::Text::Range insertRange;
-    bool success;
-    QString errorMessage;
-};
-
-class QuickRefactorHandler : public QObject
-{
-    Q_OBJECT
-
-public:
-    explicit QuickRefactorHandler(QObject *parent = nullptr);
-    ~QuickRefactorHandler() override;
-
-    void sendRefactorRequest(TextEditor::TextEditorWidget *editor, const QString &instructions);
-
-    void cancelRequest();
-
-signals:
-    void refactoringCompleted(const QodeAssist::RefactorResult &result);
-
-private slots:
-    void handleFullResponse(const QString &requestId, const QString &fullText);
-    void handleRequestFailed(const QString &requestId, const QString &error);
-
-private:
-    void prepareAndSendRequest(
-        TextEditor::TextEditorWidget *editor,
-        const QString &instructions,
-        const Utils::Text::Range &range);
-
-    void handleLLMResponse(const QString &response, const QJsonObject &request, bool isComplete);
-    LLMCore::ContextData prepareContext(
-        TextEditor::TextEditorWidget *editor,
-        const Utils::Text::Range &range,
-        const QString &instructions);
-
-    struct RequestContext
-    {
-        QJsonObject originalRequest;
-        LLMCore::Provider *provider;
-    };
-
-    QHash<QString, RequestContext> m_activeRequests;
-    TextEditor::TextEditorWidget *m_currentEditor;
-    Utils::Text::Range m_currentRange;
-    bool m_isRefactoringInProgress;
-    QString m_lastRequestId;
-    Context::ContextManager m_contextManager;
-};
-
-} // namespace QodeAssist
--- a/README.md
+++ b/README.md
@@ -1,82 +1,45 @@
 # QodeAssist - AI-powered coding assistant plugin for Qt Creator
+[![Discord](https://dcbadge.limes.pink/api/server/https://discord.gg/DGgMtTteAD?style=flat?theme=discord)](https://discord.gg/DGgMtTteAD)
 [![Build plugin](https://github.com/Palm1r/QodeAssist/actions/workflows/build_cmake.yml/badge.svg?branch=main)](https://github.com/Palm1r/QodeAssist/actions/workflows/build_cmake.yml)
 ![GitHub Downloads (all assets, all releases)](https://img.shields.io/github/downloads/Palm1r/QodeAssist/total?color=41%2C173%2C71)
 ![GitHub Tag](https://img.shields.io/github/v/tag/Palm1r/QodeAssist)
-![Static Badge](https://img.shields.io/badge/QtCreator-16.0.2-brightgreen)
-![Static Badge](https://img.shields.io/badge/QtCreator-17.0.2-brightgreen)
-[![](https://dcbadge.limes.pink/api/server/BGMkUsXUgf?style=flat)](https://discord.gg/BGMkUsXUgf)
+![Static Badge](https://img.shields.io/badge/QtCreator-14.0.2-brightgreen)

-![qodeassist-icon](https://github.com/user-attachments/assets/dc336712-83cb-440d-8761-8d0a31de898d) QodeAssist is an AI-powered coding assistant plugin for Qt Creator. It provides intelligent code completion and suggestions for C++ and QML, leveraging large language models through local providers like Ollama. Enhance your coding productivity with context-aware AI assistance directly in your Qt development environment.
-
-⚠️ **Important Notice About Paid Providers**
-> When using paid providers like Claude, OpenRouter or OpenAI-compatible services:
-> - These services will consume API tokens which may result in charges to your account
-> - The QodeAssist developer bears no responsibility for any charges incurred
-> - Please carefully review the provider's pricing and your account settings before use
+QodeAssist is an AI-powered coding assistant plugin for Qt Creator. It provides intelligent code completion and suggestions for C++ and QML, leveraging large language models through local providers like Ollama. Enhance your coding productivity with context-aware AI assistance directly in your Qt development environment.

 ## Table of Contents
 1. [Overview](#overview)
-2. [Install plugin to QtCreator](#install-plugin-to-qtcreator)
-3. [Configure for Anthropic Claude](#configure-for-anthropic-claude)
-4. [Configure for OpenAI](#configure-for-openai)
-5. [Configure for Mistral AI](#configure-for-mistral-ai)
-6. [Configure for Google AI](#configure-for-google-ai)
-7. [Configure for Ollama](#configure-for-ollama)
-8. [Configure for llama.cpp](#configure-for-llamacpp)
-9. [System Prompt Configuration](#system-prompt-configuration)
-10. [File Context Feature](#file-context-feature)
-11. [Quick Refactoring Feature](#quick-refactoring-feature)
-12. [QtCreator Version Compatibility](#qtcreator-version-compatibility)
-13. [Development Progress](#development-progress)
-14. [Hotkeys](#hotkeys)
-15. [Ignoring Files](#ignoring-files)
-14. [Troubleshooting](#troubleshooting)
-15. [Support the Development](#support-the-development-of-qodeassist)
-16. [How to Build](#how-to-build)
+2. [Installation](#installation)
+3. [Configure Plugin](#configure-plugin)
+4. [Supported LLM Providers](#supported-llm-providers)
+5. [Recommended Models](#recommended-models)
+   - [Ollama](#ollama)
+   - [LM Studio](#lm-studio)
+6. [QtCreator Version Compatibility](#qtcreator-version-compatibility)
+7. [Development Progress](#development-progress)
+8. [Hotkeys](#hotkeys)
+9. [Troubleshooting](#troubleshooting)
+10. [Support the Development](#support-the-development-of-qodeassist)
+11. [How to Build](#how-to-build)

 ## Overview

 - AI-powered code completion
-  - Sharing IDE opened files with model context (disabled by default, need enable in settings)
-  - Quick refactor code via fast chat command and opened files
 - Chat functionality:
-  - Side and Bottom panels(enabling in chat settings due stability reason with QQuickWidget problem)
-  - Chat in additional popup window with pinning(recommended)
-  - Chat history autosave and restore
-  - Token usage monitoring and management
-  - Attach files for one-time code analysis
-  - Link files for persistent context with auto update in conversations
-  - Automatic syncing with open editor files (optional)
+  - Side and Bottom panels
 - Support for multiple LLM providers:
  - Ollama
-  - llama.cpp
-  - OpenAI
-  - Anthropic Claude
  - LM Studio
-  - Mistral AI
-  - Google AI
-  - OpenAI-compatible providers (eg. llama.cpp, https://openrouter.ai)
+  - OpenAI-compatible providers(eg. https://openrouter.ai)
 - Extensive library of model-specific templates
+- Custom template support
 - Easy configuration and model selection
- Support tools/function calling (enabled by default)
-
-Join our Discord Community: Have questions or want to discuss QodeAssist? Join our [Discord server](https://discord.gg/BGMkUsXUgf) to connect with other users and get support!

 <details>
  <summary>Code completion: (click to expand)</summary>
  <img src="https://github.com/user-attachments/assets/255a52f1-5cc0-4ca3-b05c-c4cf9cdbe25a" width="600" alt="QodeAssistPreview">
 </details>

-<details>
-  <summary>Quick refactor in code: (click to expand)</summary>
-  <img src="https://github.com/user-attachments/assets/4a9092e0-429f-41eb-8723-cbb202fd0a8c" width="600" alt="QodeAssistPreview">
-</details>
-
-<details>
-  <summary>Multiline Code completion: (click to expand)</summary>
-  <img src="https://github.com/user-attachments/assets/c18dfbd2-8c54-4a7b-90d1-66e3bb51adb0" width="600" alt="QodeAssistPreview">
-</details>
-
 <details>
  <summary>Chat with LLM models in side panels: (click to expand)</summary>
  <img src="https://github.com/user-attachments/assets/ead5a5d9-b40a-4f17-af05-77fa2bcb3a61" width="600" alt="QodeAssistChat">
@@ -87,90 +50,11 @@ Join our Discord Community: Have questions or want to discuss QodeAssist? Join o
  <img width="326" alt="QodeAssistBottomPanel" src="https://github.com/user-attachments/assets/4cc64c23-a294-4df8-9153-39ad6fdab34b">
 </details>

-<details>
-  <summary>Chat in addtional window: (click to expand)</summary>
-  <img width="851" height="865" alt="image" src="https://github.com/user-attachments/assets/a68894b7-886e-4501-a61b-7161ae34b427" />
-</details>
+## Installation

-<details>
-  <summary>Automatic syncing with open editor files: (click to expand)</summary>
-  <img width="600" alt="OpenedDocumentsSync" src="https://github.com/user-attachments/assets/08efda2f-dc4d-44c3-927c-e6a975090d2f">
-</details>
-
-<details>
-  <summary>Example how tools works: (click to expand)</summary>
-  <img width="600" alt="ToolsDemo" src="https://github.com/user-attachments/assets/cf6273ad-d5c8-47fc-81e6-23d929547f6c">
-</details>
-
-## Install plugin to QtCreator
-1. Install Latest Qt Creator
-2. Download the QodeAssist plugin for your Qt Creator
-   - Remove old version plugin if already was installed
-      - on macOS for QtCreator 16: ~/Library/Application Support/QtProject/Qt Creator/plugins/16.0.0/petrmironychev.qodeassist
-      - on windows for QtCreator 16: C:\Users\<user>\AppData\Local\QtProject\qtcreator\plugins\16.0.0\petrmironychev.qodeassist\lib\qtcreator\plugins  
-3. Launch Qt Creator and install the plugin:
-   - Go to: 
-     - MacOS: Qt Creator -> About Plugins...
-     - Windows\Linux: Help -> About Plugins...
-   - Click on "Install Plugin..."
-   - Select the downloaded QodeAssist plugin archive file
-
-## Configure for Anthropic Claude
-1. Open Qt Creator settings and navigate to the QodeAssist section
-2. Go to Provider Settings tab and configure Claude api key
-3. Return to General tab and configure:
-   - Set "Claude" as the provider for code completion or/and chat assistant
-   - Set the Claude URL (https://api.anthropic.com)
-   - Select your preferred model (e.g., claude-3-5-sonnet-20241022)
-   - Choose the Claude template for code completion or/and chat
-<details>
-  <summary>Example of Claude settings: (click to expand)</summary>
-<img width="823" alt="Claude Settings" src="https://github.com/user-attachments/assets/828e09ea-e271-4a7a-8271-d3d5dd5c13fd" />
-</details>
-
-## Configure for OpenAI
-1. Open Qt Creator settings and navigate to the QodeAssist section
-2. Go to Provider Settings tab and configure OpenAI api key
-3. Return to General tab and configure:
-   - Set "OpenAI" as the provider for code completion or/and chat assistant
-   - Set the OpenAI URL (https://api.openai.com)
-   - Select your preferred model (e.g., gpt-4o)
-   - Choose the OpenAI template for code completion or/and chat
-<details>
-  <summary>Example of OpenAI settings: (click to expand)</summary>
-  <img width="829" alt="OpenAI Settings" src="https://github.com/user-attachments/assets/4716f790-6159-44d0-a8f4-565ccb6eb713" />
-</details>
-
-## Configure for Mistral AI
-1. Open Qt Creator settings and navigate to the QodeAssist section
-2. Go to Provider Settings tab and configure Mistral AI api key
-3. Return to General tab and configure:
-   - Set "Mistral AI" as the provider for code completion or/and chat assistant
-   - Set the OpenAI URL (https://api.mistral.ai)
-   - Select your preferred model (e.g., mistral-large-latest)
-   - Choose the Mistral AI template for code completion or/and chat
-<details>
-  <summary>Example of Mistral AI settings: (click to expand)</summary>
-  <img width="829" alt="Mistral AI Settings" src="https://github.com/user-attachments/assets/1c5ed13b-a29b-43f7-b33f-2e05fdea540c" />
-</details>
-
-## Configure for Google AI
-1. Open Qt Creator settings and navigate to the QodeAssist section
-2. Go to Provider Settings tab and configure Google AI api key
-3. Return to General tab and configure:
-   - Set "Google AI" as the provider for code completion or/and chat assistant
-   - Set the OpenAI URL (https://generativelanguage.googleapis.com/v1beta)
-   - Select your preferred model (e.g., gemini-2.0-flash)
-   - Choose the Google AI template
-<details>
-  <summary>Example of Google AI settings: (click to expand)</summary>
-  <img width="829" alt="Google AI Settings" src="https://github.com/user-attachments/assets/046ede65-a94d-496c-bc6c-41f3750be12a" />
-</details>
-
-## Configure for Ollama
-
-1. Install [Ollama](https://ollama.com). Make sure to review the system requirements before installation.
-2. Install a language models in Ollama via terminal. For example, you can run:
+1. Install Latest QtCreator
+2. Install [Ollama](https://ollama.com). Make sure to review the system requirements before installation.
+3. Install a language models in Ollama via terminal. For example, you can run:

 For standard computers (minimum 8GB RAM):
 ```
@@ -184,121 +68,82 @@ For high-end systems (32GB+ RAM):
 ```
 ollama run qwen2.5-coder:32b
 ```
+4. Download the QodeAssist plugin for your QtCreator.
+5. Launch Qt Creator and install the plugin:
+   - Go to MacOS: Qt Creator -> About Plugins...
+           Windows\Linux: Help -> About Plugins...
+   - Click on "Install Plugin..."
+   - Select the downloaded QodeAssist plugin archive file
+
+## Configure Plugin
+
+QodeAssist comes with default settings that should work immediately after installing a language model. The plugin is pre-configured to use Ollama with standard templates, so you may only need to verify the settings.

 1. Open Qt Creator settings (Edit > Preferences on Linux/Windows, Qt Creator > Preferences on macOS)
-2. Navigate to the "QodeAssist" tab
+2. Navigate to the "Qode Assist" tab
 3. On the "General" page, verify:
    - Ollama is selected as your LLM provider
    - The URL is set to http://localhost:11434
    - Your installed model appears in the model selection
-    - The prompt template is Ollama Auto FIM or Ollama Auto Chat for chat assistance. You can specify template if it is not work correct
-    - Disable using tools if your model doesn't support tooling
+    - The prompt template is Ollama Auto FIM
 4. Click Apply if you made any changes

 You're all set! QodeAssist is now ready to use in Qt Creator.
-<details>
-  <summary>Example of Ollama settings: (click to expand)</summary>
-  <img width="824" alt="Ollama Settings" src="https://github.com/user-attachments/assets/ed64e03a-a923-467a-aa44-4f790e315b53" />
-</details>

-## Configure for llama.cpp
-1. Open Qt Creator settings and navigate to the QodeAssist section
-2. Go to General tab and configure:
-   - Set "llama.cpp" as the provider for code completion or/and chat assistant
-   - Set the llama.cpp URL (e.g. http://localhost:8080)
-   - Fill in model name
-   - Choose template for model(e.g. llama.cpp FIM for any model with FIM support)
-   - Disable using tools if your model doesn't support tooling
-<details>
-  <summary>Example of llama.cpp settings: (click to expand)</summary>
-  <img width="829" alt="llama.cpp Settings" src="https://github.com/user-attachments/assets/8c75602c-60f3-49ed-a7a9-d3c972061ea2" />
-</details>
+## Supported LLM Providers
+QodeAssist currently supports the following LLM (Large Language Model) providers:
+- [Ollama](https://ollama.com)
+- [LM Studio](https://lmstudio.ai) (experimental)
+- OpenAI compatible providers (experimental)

-## System Prompt Configuration
+## Recommended Models:
+QodeAssist has been thoroughly tested and optimized for use with the following language models:

-The plugin comes with default system prompts optimized for chat and instruct models, as these currently provide better results for code assistance. If you prefer using FIM (Fill-in-Middle) models, you can easily customize the system prompt in the settings.
+- Qwen2.5-coder
+- CodeLlama
+- StarCoder2
+- DeepSeek-Coder-V2

-## Project Rules Configuration
-
-QodeAssist supports project-specific rules to customize AI behavior for your codebase. Create a `.qodeassist/rules/` directory in your project root.
-
-### Quick Start
-```bash
-mkdir -p .qodeassist/rules/{common,completion,chat,quickrefactor}
+### Ollama:
+### For autocomplete(FIM)
 ```
+ollama run codellama:7b-code
+ollama run starcoder2:7b
+ollama run qwen2.5-coder:7b-base
+ollama run deepseek-coder-v2:16b-lite-base-q3_K_M
 ```
-.qodeassist/
-└── rules/
-    ├── common/           # Applied to all contexts
-    ├── completion/       # Code completion only
-    ├── chat/            # Chat assistant only
-    └── quickrefactor/   # Quick refactor only
+### For chat
 ```
-All .md files in each directory are automatically loaded and added to the system prompt.
-
-Example
-Create .qodeassist/rules/common/general.md:
-```markdown
-# Project Guidelines
- Use snake_case for private members
- Prefix interfaces with 'I'
- Always document public APIs
- Prefer Qt containers over STL
+ollama run codellama:7b-instruct
+ollama run starcoder2:instruct
+ollama run qwen2.5-coder:7b-instruct
+ollama run deepseek-coder-v2
 ```

-## File Context Feature
+### Template-Model Compatibility

-QodeAssist provides two powerful ways to include source code files in your chat conversations: Attachments and Linked Files. Each serves a distinct purpose and helps provide better context for the AI assistant.
+| Template | Compatible Models | Purpose |
+|----------|------------------|----------|
+| CodeLlama FIM | `codellama:code` | Code completion |
+| DeepSeekCoder FIM | `deepseek-coder-v2`, `deepseek-v2.5` | Code completion |
+| Ollama Auto FIM | `Any Ollama base model` | Code completion |
+| Qwen FIM | `Qwen 2.5 models` | Code completion |
+| StarCoder2 FIM | `starcoder2 base model` | Code completion |
+| Alpaca | `starcoder2:instruct` | Chat assistance |
+| Basic Chat| `Messages without tokens` | Chat assistance |
+| ChatML | `Qwen 2.5 models` | Chat assistance |
+| Llama2 | `llama2 model family`, `codellama:instruct` | Chat assistance |
+| Llama3 | `llama3 model family` | Chat assistance |
+| Ollama Auto Chat | `Any Ollama chat model` | Chat assistance |

-### Attached Files
-
-Attachments are designed for one-time code analysis and specific queries:
-  - Files are included only in the current message
-  - Content is discarded after the message is processed
-  - Ideal for:
-    - Getting specific feedback on code changes
-    - Code review requests
-    - Analyzing isolated code segments
-    - Quick implementation questions
-  - Files can be attached using the paperclip icon in the chat interface
-  - Multiple files can be attached to a single message
-
-### Linked Files
-
-Linked files provide persistent context throughout the conversation:
-
-  - Files remain accessible for the entire chat session
-  - Content is included in every message exchange
-  - Files are automatically refreshed - always using latest content from disk
-  - Perfect for:
-    - Long-term refactoring discussions
-    - Complex architectural changes
-    - Multi-file implementations
-    - Maintaining context across related questions
-  - Can be managed using the link icon in the chat interface
-  - Supports automatic syncing with open editor files (can be enabled in settings)
-  - Files can be added/removed at any time during the conversation
-
-## Quick Refactoring Feature
-### Setup
-  Since this is actually a small chat with redirected output, the main settings of the provider, model and template are taken from the chat settings
-### Using
-  The request to model consist of instructions to model, selection code and cursor position
-  The default instruction is: "Refactor the code to improve its quality and maintainability." and sending if text field is empty
-  Also there buttons to quick call instractions:
-  * Repeat latest instruction, will activate after sending first request in QtCreator session
-  * Improve current selection code
-  * Suggestion alternative variant of selection code
-  * Other instructions[TBD]
+> Note: 
+> - FIM (Fill-in-Middle) templates are optimized for code completion
+> - Chat templates are designed for interactive dialogue
+> - The Ollama Auto templates automatically adapt to most Ollama models
+> - Custom Template allows you to define your own prompt format

 ## QtCreator Version Compatibility

- QtCreator 17.0.0 - 0.6.0 - 0.x.x
- QtCreator 16.0.2 - 0.5.13 - 0.x.x
- QtCreator 16.0.1 - 0.5.7 - 0.5.13
- QtCreator 16.0.0 - 0.5.2 - 0.5.6
- QtCreator 15.0.1 - 0.4.8 - 0.5.1
- QtCreator 15.0.0 - 0.4.0 - 0.4.7 
 - QtCreator 14.0.2 - 0.2.3 - 0.3.x 
 - QtCreator 14.0.1 - 0.2.2 plugin version and below

@@ -310,53 +155,16 @@ Linked files provide persistent context throughout the conversation:
 - [x] Sharing diff with model
 - [ ] Sharing project source with model
 - [ ] Support for more providers and models
- [ ] Support MCP

 ## Hotkeys
-All hotkeys available in QtCreator Settings
-Also you can find default hotkeys here:
- To call chat with llm in separate window, you can use:
-    - on Mac: Option + Command + W
-    - on Windows: Ctrl + Alt + W
-    - on Linux: Ctrl + Alt + W
- To close chat with llm in separate window, you can use:
-    - on Mac: Option + Command + S
-    - on Windows: Ctrl + Alt + S
-    - on Linux: Ctrl + Alt + S
+
 - To call manual request to suggestion, you can use or change it in settings
    - on Mac: Option + Command + Q
    - on Windows: Ctrl + Alt + Q
-    - on Linux with KDE Plasma: Ctrl + Alt + Q
 - To insert the full suggestion, you can use the TAB key
- To insert word of suggistion, you can use Alt + Right Arrow for Win/Lin, or Option + Right Arrow for Mac
- To call Quick Refactor dialog, select some code or place cursor and press
-    - on Mac: Option + Command + R
-    - on Windows: Ctrl + Alt + R
-    - on Linux with KDE Plasma: Ctrl + Alt + R
-
-## Ignoring Files
-QodeAssist supports the ability to ignore files in context using a .qodeassistignore file. This allows you to exclude specific files from the context during code completion and in the chat assistant, which is especially useful for large projects.
-
-### How to Use .qodeassistignore
- Create a .qodeassistignore file in the root directory of your project near CMakeLists.txt or pro.
- Add patterns for files and directories that should be excluded from the context.
- QodeAssist will automatically detect this file and apply the exclusion rules.
-
-### .qodeassistignore File Format
-The file format is similar to .gitignore:
- Each pattern is written on a separate line
- Empty lines are ignored
- Lines starting with # are considered comments
- Standard wildcards work the same as in .gitignore
- To negate a pattern, use ! at the beginning of the line
-```
-# Ignore all files in the build directory
-/build
-*.tmp
-# Ignore a specific file
-src/generated/autogen.cpp
-
-```
+- To insert line by line, you can use the "Move cursor word right" shortcut:
+    - On Mac: Option + Right Arrow
+    - On Windows: Alt + Right Arrow
    
 ## Troubleshooting

@@ -367,17 +175,20 @@ If QodeAssist is having problems connecting to the LLM provider, please check th
    - For Ollama, the default is usually http://localhost:11434
    - For LM Studio, the default is usually http://localhost:1234

-2. Confirm that the selected model and template are compatible:
+2. Check the endpoint:

-    Ensure you've chosen the correct model in the "Select Models" option
-    Verify that the selected prompt template matches the model you're using
+Make sure the endpoint in the settings matches the one required by your provider
+    - For Ollama, it should be /api/generate
+    - For LM Studio and OpenAI compatible providers, it's usually /v1/chat/completions

-3. On Linux the prebuilt binaries support only ubuntu 22.04+ or simililliar os. 
-If you need compatiblity with another os, you have to build manualy. our experiments and resolution you can check here: https://github.com/Palm1r/QodeAssist/issues/48
+3. Confirm that the selected model and template are compatible:
+
+Ensure you've chosen the correct model in the "Select Models" option
+Verify that the selected prompt template matches the model you're using

 If you're still experiencing issues with QodeAssist, you can try resetting the settings to their default values:
 1. Open Qt Creator settings
-2. Navigate to the "QodeAssist" tab
+2. Navigate to the "Qode Assist" tab
 3. Pick settings page for reset
 4. Click on the "Reset Page to Defaults" button
    - The API key will not reset
@@ -416,7 +227,3 @@ relative or absolute path to this plugin directory.

 QML code style: Preferably follow the following guidelines https://github.com/Furkanzmc/QML-Coding-Guide, thank you @Furkanzmc for collect them
 C++ code style: check use .clang-fortmat in project
-
-![qodeassist-icon](https://github.com/user-attachments/assets/dc336712-83cb-440d-8761-8d0a31de898d)
-![qodeassist-icon-small](https://github.com/user-attachments/assets/8ec241bf-3186-452e-b8db-8d70543c2f41)
-
--- a/TaskFlow/CMakeLists.txt
+++ b/TaskFlow/CMakeLists.txt
@@ -1,14 +0,0 @@
-add_subdirectory(core)
-add_subdirectory(Editor)
-# add_subdirectory(serialization)
-# add_subdirectory(tasks)
-
-qt_add_library(TaskFlow STATIC)
-
-target_link_libraries(TaskFlow
-    PUBLIC
-    TaskFlowCore
-    TaskFlowEditorplugin
-    # TaskFlowSerialization
-    # TaskFlowTasks
-)
--- a/TaskFlow/Editor/CMakeLists.txt
+++ b/TaskFlow/Editor/CMakeLists.txt
@@ -1,41 +0,0 @@
-qt_add_library(TaskFlowEditor STATIC)
-
-qt_policy(SET QTP0001 NEW)
-qt_policy(SET QTP0004 NEW)
-
-qt_add_qml_module(TaskFlowEditor
-    URI TaskFlow.Editor
-    VERSION 1.0
-    DEPENDENCIES QtQuick
-    RESOURCES
-    QML_FILES
-    qml/FlowEditorView.qml
-    qml/Flow.qml
-    qml/Task.qml
-    qml/TaskPort.qml
-    qml/TaskParameter.qml
-    qml/TaskConnection.qml
-    SOURCES
-    FlowEditor.hpp FlowEditor.cpp
-    FlowsModel.hpp FlowsModel.cpp
-    TaskItem.hpp TaskItem.cpp
-    FlowItem.hpp FlowItem.cpp
-    TaskModel.hpp TaskModel.cpp
-    TaskPortItem.hpp TaskPortItem.cpp
-    TaskPortModel.hpp TaskPortModel.cpp
-    TaskConnectionsModel.hpp TaskConnectionsModel.cpp
-    TaskConnectionItem.hpp TaskConnectionItem.cpp
-    GridBackground.hpp GridBackground.cpp
-)
-
-target_link_libraries(TaskFlowEditor
-    PUBLIC
-    Qt::Quick
-    PRIVATE
-    TaskFlowCore
-)
-
-target_include_directories(TaskFlowEditor
-    PUBLIC
-    ${CMAKE_CURRENT_LIST_DIR}
-)
--- a/TaskFlow/Editor/FlowEditor.cpp
+++ b/TaskFlow/Editor/FlowEditor.cpp
@@ -1,120 +0,0 @@
-/*
- * Copyright (C) 2025 Petr Mironychev
- *
- * This file is part of QodeAssist.
- *
- * QodeAssist is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QodeAssist is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QodeAssist. If not, see <https:
- */
-
-#include "FlowEditor.hpp"
-
-namespace QodeAssist::TaskFlow {
-
-FlowEditor::FlowEditor(QQuickItem *parent)
-    : QQuickItem(parent)
-{}
-
-void FlowEditor::initialize()
-{
-    emit availableTaskTypesChanged();
-    emit availableFlowsChanged();
-
-    m_flowsModel = new FlowsModel(m_flowManager, this);
-
-    emit flowsModelChanged();
-
-    if (m_flowsModel->rowCount() > 0) {
-        setCurrentFlowIndex(0);
-    }
-
-    // setCurrentFlowId(m_flowManager->flows().begin().value()->flowId());
-    m_currentFlow = m_flowManager->getFlow();
-    emit currentFlowChanged();
-}
-
-QString FlowEditor::currentFlowId() const
-{
-    return m_currentFlowId;
-}
-
-void FlowEditor::setCurrentFlowId(const QString &newCurrentFlowId)
-{
-    if (m_currentFlowId == newCurrentFlowId)
-        return;
-    m_currentFlowId = newCurrentFlowId;
-    emit currentFlowIdChanged();
-}
-
-QStringList FlowEditor::availableTaskTypes() const
-{
-    if (m_flowManager)
-        return m_flowManager->getAvailableTasksTypes();
-    else {
-        return {"No flow manager"};
-    }
-}
-
-QStringList FlowEditor::availableFlows() const
-{
-    if (m_flowManager) {
-        auto flows = m_flowManager->getAvailableFlows();
-        return flows.size() > 0 ? flows : QStringList{"No flows"};
-    } else {
-        return {"No flow manager"};
-    }
-}
-
-void FlowEditor::setFlowManager(FlowManager *newFlowManager)
-{
-    if (m_flowManager == newFlowManager)
-        return;
-    m_flowManager = newFlowManager;
-
-    initialize();
-}
-
-FlowsModel *FlowEditor::flowsModel() const
-{
-    return m_flowsModel;
-}
-
-int FlowEditor::currentFlowIndex() const
-{
-    return m_currentFlowIndex;
-}
-
-void FlowEditor::setCurrentFlowIndex(int newCurrentFlowIndex)
-{
-    if (m_currentFlowIndex == newCurrentFlowIndex)
-        return;
-    m_currentFlowIndex = newCurrentFlowIndex;
-    emit currentFlowIndexChanged();
-}
-
-Flow *FlowEditor::getFlow(const QString &flowName)
-{
-    return m_flowManager->getFlow(flowName);
-}
-
-Flow *FlowEditor::getCurrentFlow()
-{
-    return m_flowManager->getFlow(m_currentFlowId);
-}
-
-Flow *FlowEditor::currentFlow() const
-{
-    return m_currentFlow;
-}
-
-} // namespace QodeAssist::TaskFlow
--- a/TaskFlow/Editor/FlowEditor.hpp
+++ b/TaskFlow/Editor/FlowEditor.hpp
@@ -1,86 +0,0 @@
-/*
- * Copyright (C) 2025 Petr Mironychev
- *
- * This file is part of QodeAssist.
- *
- * QodeAssist is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QodeAssist is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QodeAssist. If not, see <https:
- */
-
-#pragma once
-
-#include <QQuickItem>
-
-#include "FlowsModel.hpp"
-#include <FlowManager.hpp>
-
-namespace QodeAssist::TaskFlow {
-
-class FlowEditor : public QQuickItem
-{
-    Q_OBJECT
-    QML_ELEMENT
-
-    Q_PROPERTY(
-        QString currentFlowId READ currentFlowId WRITE setCurrentFlowId NOTIFY currentFlowIdChanged)
-    Q_PROPERTY(
-        QStringList availableTaskTypes READ availableTaskTypes NOTIFY availableTaskTypesChanged)
-    Q_PROPERTY(QStringList availableFlows READ availableFlows NOTIFY availableFlowsChanged)
-    Q_PROPERTY(FlowsModel *flowsModel READ flowsModel NOTIFY flowsModelChanged)
-    Q_PROPERTY(int currentFlowIndex READ currentFlowIndex WRITE setCurrentFlowIndex NOTIFY
-                   currentFlowIndexChanged)
-
-    Q_PROPERTY(Flow *currentFlow READ currentFlow NOTIFY currentFlowChanged FINAL)
-
-public:
-    FlowEditor(QQuickItem *parent = nullptr);
-
-    void initialize();
-
-    QString currentFlowId() const;
-    void setCurrentFlowId(const QString &newCurrentFlowId);
-
-    QStringList availableTaskTypes() const;
-    QStringList availableFlows() const;
-
-    void setFlowManager(FlowManager *newFlowManager);
-
-    FlowsModel *flowsModel() const;
-
-    int currentFlowIndex() const;
-    void setCurrentFlowIndex(int newCurrentFlowIndex);
-
-    Q_INVOKABLE Flow *getFlow(const QString &flowName);
-    Q_INVOKABLE Flow *getCurrentFlow();
-
-    Flow *currentFlow() const;
-
-signals:
-    void currentFlowIdChanged();
-    void availableTaskTypesChanged();
-    void availableFlowsChanged();
-    void flowsModelChanged();
-
-    void currentFlowIndexChanged();
-
-    void currentFlowChanged();
-
-private:
-    FlowManager *m_flowManager = nullptr;
-    QString m_currentFlowId;
-    FlowsModel *m_flowsModel;
-    int m_currentFlowIndex;
-    Flow *m_currentFlow = nullptr;
-};
-
-} // namespace QodeAssist::TaskFlow
--- a/TaskFlow/Editor/FlowItem.cpp
+++ b/TaskFlow/Editor/FlowItem.cpp
@@ -1,90 +0,0 @@
-#include "FlowItem.hpp"
-
-namespace QodeAssist::TaskFlow {
-
-FlowItem::FlowItem(QQuickItem *parent)
-    : QQuickItem(parent)
-{
-    connect(this, &QQuickItem::childrenChanged, this, [this]() { updateFlowLayout(); });
-}
-
-QString FlowItem::flowId() const
-{
-    if (!m_flow)
-        return {"no flow"};
-    return m_flow->flowId();
-}
-
-void FlowItem::setFlowId(const QString &newFlowId)
-{
-    if (m_flow->flowId() == newFlowId)
-        return;
-    m_flow->setFlowId(newFlowId);
-    emit flowIdChanged();
-}
-
-Flow *FlowItem::flow() const
-{
-    return m_flow;
-}
-
-void FlowItem::setFlow(Flow *newFlow)
-{
-    if (m_flow == newFlow)
-        return;
-    m_flow = newFlow;
-    emit flowChanged();
-    emit flowIdChanged();
-    qDebug() << "FlowItem::setFlow" << m_flow->flowId() << newFlow;
-
-    m_taskModel = new TaskModel(m_flow, this);
-    m_connectionsModel = new TaskConnectionsModel(m_flow, this);
-
-    emit taskModelChanged();
-    emit connectionsModelChanged();
-}
-
-TaskModel *FlowItem::taskModel() const
-{
-    return m_taskModel;
-}
-
-TaskConnectionsModel *FlowItem::connectionsModel() const
-{
-    return m_connectionsModel;
-}
-
-QVariantList FlowItem::taskItems() const
-{
-    return m_taskItems;
-}
-
-void FlowItem::setTaskItems(const QVariantList &newTaskItems)
-{
-    qDebug() << "FlowItem::setTaskItems" << newTaskItems;
-    if (m_taskItems == newTaskItems)
-        return;
-    m_taskItems = newTaskItems;
-    emit taskItemsChanged();
-}
-
-void FlowItem::updateFlowLayout()
-{
-    auto allItems = this->childItems();
-
-    for (auto child : allItems) {
-        if (child->objectName() == QString("TaskItem")) {
-            qDebug() << "Found TaskItem:" << child;
-            auto taskItem = qobject_cast<TaskItem *>(child);
-            m_taskItemsList.insert(taskItem, taskItem->task());
-        }
-
-        if (child->objectName() == QString("TaskConnectionItem")) {
-            qDebug() << "Found TaskConnectionItem:" << child;
-            auto connectionItem = qobject_cast<TaskConnectionItem *>(child);
-            m_taskConnectionsList.insert(connectionItem, connectionItem->connection());
-        }
-    }
-}
-
-} // namespace QodeAssist::TaskFlow
--- a/TaskFlow/Editor/FlowItem.hpp
+++ b/TaskFlow/Editor/FlowItem.hpp
@@ -1,61 +0,0 @@
-#pragma once
-
-#include <QQuickItem>
-
-#include "TaskConnectionItem.hpp"
-#include "TaskConnectionsModel.hpp"
-#include "TaskItem.hpp"
-#include "TaskModel.hpp"
-#include <Flow.hpp>
-#include <TaskConnection.hpp>
-
-namespace QodeAssist::TaskFlow {
-
-class FlowItem : public QQuickItem
-{
-    Q_OBJECT
-    QML_ELEMENT
-
-    Q_PROPERTY(QString flowId READ flowId WRITE setFlowId NOTIFY flowIdChanged)
-    Q_PROPERTY(Flow *flow READ flow WRITE setFlow NOTIFY flowChanged)
-    Q_PROPERTY(TaskModel *taskModel READ taskModel NOTIFY taskModelChanged)
-    Q_PROPERTY(
-        TaskConnectionsModel *connectionsModel READ connectionsModel NOTIFY connectionsModelChanged)
-    Q_PROPERTY(QVariantList taskItems READ taskItems WRITE setTaskItems NOTIFY taskItemsChanged)
-
-public:
-    explicit FlowItem(QQuickItem *parent = nullptr);
-
-    QString flowId() const;
-    void setFlowId(const QString &newFlowId);
-
-    Flow *flow() const;
-    void setFlow(Flow *newFlow);
-
-    TaskModel *taskModel() const;
-
-    TaskConnectionsModel *connectionsModel() const;
-
-    QVariantList taskItems() const;
-    void setTaskItems(const QVariantList &newTaskItems);
-
-    void updateFlowLayout();
-
-signals:
-    void flowIdChanged();
-    void flowChanged();
-    void taskModelChanged();
-    void connectionsModelChanged();
-    void taskItemsChanged();
-
-private:
-    Flow *m_flow = nullptr;
-    TaskModel *m_taskModel = nullptr;
-    TaskConnectionsModel *m_connectionsModel = nullptr;
-    QVariantList m_taskItems;
-
-    QHash<TaskItem *, BaseTask *> m_taskItemsList;
-    QHash<TaskConnectionItem *, TaskConnection *> m_taskConnectionsList;
-};
-
-} // namespace QodeAssist::TaskFlow
--- a/TaskFlow/Editor/FlowsModel.cpp
+++ b/TaskFlow/Editor/FlowsModel.cpp
@@ -1,54 +0,0 @@
-#include "FlowsModel.hpp"
-
-#include "FlowManager.hpp"
-
-namespace QodeAssist::TaskFlow {
-
-FlowsModel::FlowsModel(FlowManager *flowManager, QObject *parent)
-    : QAbstractListModel(parent)
-    , m_flowManager(flowManager)
-{
-    connect(m_flowManager, &FlowManager::flowAdded, this, &FlowsModel::onFlowAdded);
-}
-
-int FlowsModel::rowCount(const QModelIndex &parent) const
-{
-    return m_flowManager->flows().size();
-}
-
-QVariant FlowsModel::data(const QModelIndex &index, int role) const
-{
-    if (!index.isValid() || !m_flowManager || index.row() >= m_flowManager->flows().size())
-        return QVariant();
-
-    const auto flows = m_flowManager->flows().values();
-
-    switch (role) {
-    case FlowRoles::FlowIdRole:
-        return flows.at(index.row())->flowId();
-    case FlowRoles::FlowDataRole:
-        return QVariant::fromValue(flows.at(index.row()));
-    default:
-        return QVariant();
-    }
-}
-
-QHash<int, QByteArray> FlowsModel::roleNames() const
-{
-    QHash<int, QByteArray> roles;
-    roles[FlowRoles::FlowIdRole] = "flowId";
-    roles[FlowRoles::FlowDataRole] = "flowData";
-    return roles;
-}
-
-void FlowsModel::onFlowAdded(const QString &flowId)
-{
-    // qDebug() << "FlowsModel::Flow added: " << flowId;
-    // int newIndex = m_flowManager->flows().size();
-    // beginInsertRows(QModelIndex(), newIndex, newIndex);
-    // endInsertRows();
-}
-
-void FlowsModel::onFlowRemoved(const QString &flowId) {}
-
-} // namespace QodeAssist::TaskFlow
--- a/TaskFlow/Editor/FlowsModel.hpp
+++ b/TaskFlow/Editor/FlowsModel.hpp
@@ -1,31 +0,0 @@
-#pragma once
-
-#include <QAbstractListModel>
-#include <QObject>
-
-// #include "tasks/Flow.hpp"
-#include <FlowManager.hpp>
-
-namespace QodeAssist::TaskFlow {
-
-class FlowsModel : public QAbstractListModel
-{
-    Q_OBJECT
-public:
-    enum FlowRoles { FlowIdRole = Qt::UserRole, FlowDataRole };
-
-    FlowsModel(FlowManager *flowManager, QObject *parent = nullptr);
-
-    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
-    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
-    QHash<int, QByteArray> roleNames() const override;
-
-public slots:
-    void onFlowAdded(const QString &flowId);
-    void onFlowRemoved(const QString &flowId);
-
-private:
-    FlowManager *m_flowManager;
-};
-
-} // namespace QodeAssist::TaskFlow
--- a/TaskFlow/Editor/GridBackground.cpp
+++ b/TaskFlow/Editor/GridBackground.cpp
@@ -1,98 +0,0 @@
-/*
- * Copyright (C) 2025 Petr Mironychev
- *
- * This file is part of QodeAssist.
- *
- * QodeAssist is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QodeAssist is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QodeAssist. If not, see <https://www.gnu.org/licenses/>.
- */
-
-#include "GridBackground.hpp"
-#include <QPainter>
-#include <QPixmap>
-#include <QQuickWindow>
-#include <QSGSimpleRectNode>
-#include <QSGSimpleTextureNode>
-
-namespace QodeAssist::TaskFlow {
-
-GridBackground::GridBackground(QQuickItem *parent)
-    : QQuickItem(parent)
-{
-    setFlag(QQuickItem::ItemHasContents, true);
-}
-
-int GridBackground::gridSize() const
-{
-    return m_gridSize;
-}
-
-void GridBackground::setGridSize(int size)
-{
-    if (m_gridSize != size) {
-        m_gridSize = size;
-        update();
-        emit gridSizeChanged();
-    }
-}
-
-QColor GridBackground::gridColor() const
-{
-    return m_gridColor;
-}
-
-void GridBackground::setGridColor(const QColor &color)
-{
-    if (m_gridColor != color) {
-        m_gridColor = color;
-        update();
-        emit gridColorChanged();
-    }
-}
-
-QSGNode *GridBackground::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *)
-{
-    QSGSimpleTextureNode *node = static_cast<QSGSimpleTextureNode *>(oldNode);
-    if (!node) {
-        node = new QSGSimpleTextureNode();
-    }
-
-    QPixmap pixmap(width(), height());
-    pixmap.fill(Qt::transparent);
-
-    QPainter painter(&pixmap);
-    painter.setRenderHint(QPainter::Antialiasing, false);
-
-    QPen pen(m_gridColor);
-    pen.setWidth(1);
-    painter.setPen(pen);
-    painter.setOpacity(this->opacity());
-
-    for (int x = 0; x < width(); x += m_gridSize) {
-        painter.drawLine(x, 0, x, height());
-    }
-
-    for (int y = 0; y < height(); y += m_gridSize) {
-        painter.drawLine(0, y, width(), y);
-    }
-
-    painter.end();
-
-    QSGTexture *texture = window()->createTextureFromImage(pixmap.toImage());
-    node->setTexture(texture);
-    node->setRect(boundingRect());
-
-    return node;
-}
-
-} // namespace QodeAssist::TaskFlow
--- a/TaskFlow/Editor/GridBackground.hpp
+++ b/TaskFlow/Editor/GridBackground.hpp
@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2025 Petr Mironychev
- *
- * This file is part of QodeAssist.
- *
- * QodeAssist is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QodeAssist is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QodeAssist. If not, see <https://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include <QColor>
-#include <QPainter>
-#include <QQuickItem>
-
-namespace QodeAssist::TaskFlow {
-
-class GridBackground : public QQuickItem
-{
-    Q_OBJECT
-    QML_ELEMENT
-
-    Q_PROPERTY(int gridSize READ gridSize WRITE setGridSize NOTIFY gridSizeChanged)
-    Q_PROPERTY(QColor gridColor READ gridColor WRITE setGridColor NOTIFY gridColorChanged)
-
-public:
-    explicit GridBackground(QQuickItem *parent = nullptr);
-
-    int gridSize() const;
-    void setGridSize(int size);
-
-    QColor gridColor() const;
-    void setGridColor(const QColor &color);
-
-signals:
-    void gridSizeChanged();
-    void gridColorChanged();
-
-protected:
-    QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *) override;
-
-private:
-    int m_gridSize = 20;
-    QColor m_gridColor = QColor(128, 128, 128);
-};
-
-} // namespace QodeAssist::TaskFlow
--- a/TaskFlow/Editor/TaskConnectionItem.cpp
+++ b/TaskFlow/Editor/TaskConnectionItem.cpp
@@ -1,153 +0,0 @@
-#include "TaskConnectionItem.hpp"
-#include "TaskItem.hpp"
-#include "TaskPortItem.hpp"
-#include <QDebug>
-
-namespace QodeAssist::TaskFlow {
-
-TaskConnectionItem::TaskConnectionItem(QQuickItem *parent)
-    : QQuickItem(parent)
-{
-    setObjectName("TaskConnectionItem");
-}
-
-void TaskConnectionItem::setConnection(TaskConnection *connection)
-{
-    if (m_connection == connection)
-        return;
-
-    m_connection = connection;
-    emit connectionChanged();
-
-    calculatePositions();
-}
-
-void TaskConnectionItem::updatePositions()
-{
-    // calculatePositions();
-}
-
-void TaskConnectionItem::calculatePositions()
-{
-    if (!m_connection) {
-        return;
-    }
-
-    // Find source task item
-    QQuickItem *sourceTaskItem = findTaskItem(m_connection->sourceTask());
-    QQuickItem *targetTaskItem = findTaskItem(m_connection->targetTask());
-
-    if (!sourceTaskItem || !targetTaskItem) {
-        return;
-    }
-
-    // Find port items within tasks
-    QQuickItem *sourcePortItem = findPortItem(sourceTaskItem, m_connection->sourcePort());
-    QQuickItem *targetPortItem = findPortItem(targetTaskItem, m_connection->targetPort());
-
-    if (!sourcePortItem || !targetPortItem) {
-        return;
-    }
-
-    // Calculate global positions
-    QPointF sourceGlobal
-        = sourcePortItem
-              ->mapToItem(parentItem(), sourcePortItem->width() / 2, sourcePortItem->height() / 2);
-    QPointF targetGlobal
-        = targetPortItem
-              ->mapToItem(parentItem(), targetPortItem->width() / 2, targetPortItem->height() / 2);
-
-    if (m_startPoint != sourceGlobal) {
-        m_startPoint = sourceGlobal;
-        emit startPointChanged();
-    }
-
-    if (m_endPoint != targetGlobal) {
-        m_endPoint = targetGlobal;
-        emit endPointChanged();
-    }
-}
-
-QQuickItem *TaskConnectionItem::findTaskItem(BaseTask *task)
-{
-    for (const QVariant &item : m_taskItems) {
-        QQuickItem *taskItem = qvariant_cast<QQuickItem *>(item);
-        if (!taskItem)
-            continue;
-
-        QVariant taskProp = taskItem->property("task");
-        if (taskProp.isValid() && taskProp.value<BaseTask *>() == task) {
-            return taskItem;
-        }
-    }
-    return nullptr;
-}
-
-QQuickItem *TaskConnectionItem::findTaskItemRecursive(QQuickItem *item, BaseTask *task)
-{
-    // Проверяем objectName и task property
-    if (item->objectName() == "TaskItem") {
-        QVariant taskProp = item->property("task");
-        if (taskProp.isValid()) {
-            BaseTask *itemTask = taskProp.value<BaseTask *>();
-            if (itemTask == task) {
-                return item;
-            }
-        }
-    }
-
-    // Рекурсивно ищем в детях
-    auto children = item->childItems();
-
-    for (QQuickItem *child : children) {
-        if (QQuickItem *found = findTaskItemRecursive(child, task)) {
-            return found;
-        }
-    }
-
-    return nullptr;
-}
-
-QQuickItem *TaskConnectionItem::findPortItem(QQuickItem *taskItem, TaskPort *port)
-{
-    std::function<QQuickItem *(QQuickItem *)> findPortRecursive =
-        [&](QQuickItem *item) -> QQuickItem * {
-        // Проверяем objectName и port property
-        if (item->objectName() == "TaskPortItem") {
-            QVariant portProp = item->property("port");
-            if (portProp.isValid()) {
-                TaskPort *itemPort = portProp.value<TaskPort *>();
-                if (itemPort == port) {
-                    return item;
-                }
-            }
-        }
-
-        // Рекурсивно ищем в детях
-        for (QQuickItem *child : item->childItems()) {
-            if (QQuickItem *found = findPortRecursive(child)) {
-                return found;
-            }
-        }
-        return nullptr;
-    };
-
-    return findPortRecursive(taskItem);
-}
-
-QVariantList TaskConnectionItem::taskItems() const
-{
-    return m_taskItems;
-}
-
-void TaskConnectionItem::setTaskItems(const QVariantList &newTaskItems)
-{
-    if (m_taskItems == newTaskItems)
-        return;
-    m_taskItems = newTaskItems;
-    emit taskItemsChanged();
-
-    calculatePositions();
-}
-
-} // namespace QodeAssist::TaskFlow
--- a/TaskFlow/Editor/TaskConnectionItem.hpp
+++ b/TaskFlow/Editor/TaskConnectionItem.hpp
@@ -1,55 +0,0 @@
-#pragma once
-
-#include "TaskConnection.hpp"
-#include <QPointF>
-#include <QQuickItem>
-
-namespace QodeAssist::TaskFlow {
-
-class TaskConnectionItem : public QQuickItem
-{
-    Q_OBJECT
-    QML_ELEMENT
-
-    Q_PROPERTY(QPointF startPoint READ startPoint NOTIFY startPointChanged)
-    Q_PROPERTY(QPointF endPoint READ endPoint NOTIFY endPointChanged)
-    Q_PROPERTY(
-        TaskConnection *connection READ connection WRITE setConnection NOTIFY connectionChanged)
-
-    Q_PROPERTY(QVariantList taskItems READ taskItems WRITE setTaskItems NOTIFY taskItemsChanged)
-
-public:
-    TaskConnectionItem(QQuickItem *parent = nullptr);
-
-    QPointF startPoint() const { return m_startPoint; }
-    QPointF endPoint() const { return m_endPoint; }
-
-    TaskConnection *connection() const { return m_connection; }
-    void setConnection(TaskConnection *connection);
-
-    Q_INVOKABLE void updatePositions();
-
-    QVariantList taskItems() const;
-    void setTaskItems(const QVariantList &newTaskItems);
-
-signals:
-    void startPointChanged();
-    void endPointChanged();
-    void connectionChanged();
-
-    void taskItemsChanged();
-
-private:
-    void calculatePositions();
-    QQuickItem *findTaskItem(BaseTask *task);
-    QQuickItem *findTaskItemRecursive(QQuickItem *item, BaseTask *task);
-    QQuickItem *findPortItem(QQuickItem *taskItem, TaskPort *port);
-
-private:
-    TaskConnection *m_connection = nullptr;
-    QPointF m_startPoint;
-    QPointF m_endPoint;
-    QVariantList m_taskItems;
-};
-
-} // namespace QodeAssist::TaskFlow
--- a/TaskFlow/Editor/TaskConnectionsModel.cpp
+++ b/TaskFlow/Editor/TaskConnectionsModel.cpp
@@ -1,29 +0,0 @@
-#include "TaskConnectionsModel.hpp"
-
-namespace QodeAssist::TaskFlow {
-
-TaskConnectionsModel::TaskConnectionsModel(Flow *flow, QObject *parent)
-    : QAbstractListModel(parent)
-    , m_flow(flow)
-{}
-
-int TaskConnectionsModel::rowCount(const QModelIndex &parent) const
-{
-    return m_flow->connections().size();
-}
-
-QVariant TaskConnectionsModel::data(const QModelIndex &index, int role) const
-{
-    if (role == TaskConnectionsRoles::TaskConnectionsRole)
-        return QVariant::fromValue(m_flow->connections().at(index.row()));
-    return QVariant();
-}
-
-QHash<int, QByteArray> TaskConnectionsModel::roleNames() const
-{
-    QHash<int, QByteArray> roles;
-    roles[TaskConnectionsRoles::TaskConnectionsRole] = "connectionData";
-    return roles;
-}
-
-} // namespace QodeAssist::TaskFlow
--- a/TaskFlow/Editor/TaskConnectionsModel.hpp
+++ b/TaskFlow/Editor/TaskConnectionsModel.hpp
@@ -1,25 +0,0 @@
-#pragma once
-
-#include <QAbstractListModel>
-#include <QObject>
-
-#include <Flow.hpp>
-
-namespace QodeAssist::TaskFlow {
-
-class TaskConnectionsModel : public QAbstractListModel
-{
-public:
-    enum TaskConnectionsRoles { TaskConnectionsRole = Qt::UserRole };
-
-    explicit TaskConnectionsModel(Flow *flow, QObject *parent = nullptr);
-
-    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
-    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
-    QHash<int, QByteArray> roleNames() const override;
-
-private:
-    Flow *m_flow;
-};
-
-} // namespace QodeAssist::TaskFlow
--- a/TaskFlow/Editor/TaskItem.cpp
+++ b/TaskFlow/Editor/TaskItem.cpp
@@ -1,69 +0,0 @@
-#include "TaskItem.hpp"
-
-namespace QodeAssist::TaskFlow {
-
-TaskItem::TaskItem(QQuickItem *parent)
-    : QQuickItem(parent)
-{
-    setObjectName("TaskItem");
-}
-
-QString TaskItem::taskId() const
-{
-    return m_taskId;
-}
-
-void TaskItem::setTaskId(const QString &newTaskId)
-{
-    if (m_taskId == newTaskId)
-        return;
-    m_taskId = newTaskId;
-    emit taskIdChanged();
-}
-
-QString TaskItem::taskType() const
-{
-    return m_task ? m_task->taskType() : QString();
-}
-
-BaseTask *TaskItem::task() const
-{
-    return m_task;
-}
-
-void TaskItem::setTask(BaseTask *newTask)
-{
-    if (m_task == newTask)
-        return;
-
-    m_task = newTask;
-
-    if (m_task) {
-        m_taskId = m_task->taskId();
-
-        // Обновляем модели портов
-        m_inputPorts = new TaskPortModel(m_task->getInputPorts(), this);
-        m_outputPorts = new TaskPortModel(m_task->getOutputPorts(), this);
-    } else {
-        m_inputPorts = nullptr;
-        m_outputPorts = nullptr;
-    }
-
-    emit taskChanged();
-    emit inputPortsChanged();
-    emit outputPortsChanged();
-    emit taskIdChanged();
-    emit taskTypeChanged();
-}
-
-TaskPortModel *TaskItem::inputPorts() const
-{
-    return m_inputPorts;
-}
-
-TaskPortModel *TaskItem::outputPorts() const
-{
-    return m_outputPorts;
-}
-
-} // namespace QodeAssist::TaskFlow
--- a/TaskFlow/Editor/TaskItem.hpp
+++ b/TaskFlow/Editor/TaskItem.hpp
@@ -1,49 +0,0 @@
-#pragma once
-
-#include <QQuickItem>
-
-#include "TaskPortModel.hpp"
-#include <BaseTask.hpp>
-#include <TaskPort.hpp>
-
-namespace QodeAssist::TaskFlow {
-
-class TaskItem : public QQuickItem
-{
-    Q_OBJECT
-    QML_ELEMENT
-
-    Q_PROPERTY(QString taskId READ taskId WRITE setTaskId NOTIFY taskIdChanged)
-    Q_PROPERTY(QString taskType READ taskType NOTIFY taskTypeChanged)
-    Q_PROPERTY(BaseTask *task READ task WRITE setTask NOTIFY taskChanged)
-    Q_PROPERTY(TaskPortModel *inputPorts READ inputPorts NOTIFY inputPortsChanged)
-    Q_PROPERTY(TaskPortModel *outputPorts READ outputPorts NOTIFY outputPortsChanged)
-
-public:
-    TaskItem(QQuickItem *parent = nullptr);
-
-    QString taskId() const;
-    void setTaskId(const QString &newTaskId);
-    QString taskType() const;
-
-    BaseTask *task() const;
-    void setTask(BaseTask *newTask);
-
-    TaskPortModel *inputPorts() const;
-    TaskPortModel *outputPorts() const;
-
-signals:
-    void taskIdChanged();
-    void taskTypeChanged();
-    void taskChanged();
-    void inputPortsChanged();
-    void outputPortsChanged();
-
-private:
-    QString m_taskId;
-    BaseTask *m_task = nullptr;
-    TaskPortModel *m_inputPorts = nullptr;
-    TaskPortModel *m_outputPorts = nullptr;
-};
-
-} // namespace QodeAssist::TaskFlow
--- a/TaskFlow/Editor/TaskModel.cpp
+++ b/TaskFlow/Editor/TaskModel.cpp
@@ -1,40 +0,0 @@
-#include "TaskModel.hpp"
-
-namespace QodeAssist::TaskFlow {
-
-TaskModel::TaskModel(Flow *flow, QObject *parent)
-    : QAbstractListModel(parent)
-    , m_flow(flow)
-{}
-
-int TaskModel::rowCount(const QModelIndex &parent) const
-{
-    return m_flow->tasks().size();
-}
-
-QVariant TaskModel::data(const QModelIndex &index, int role) const
-{
-    if (!index.isValid() || !m_flow || index.row() >= m_flow->tasks().size())
-        return QVariant();
-
-    const auto &task = m_flow->tasks().values();
-
-    switch (role) {
-    case TaskRoles::TaskIdRole:
-        return task.at(index.row())->taskId();
-    case TaskRoles::TaskDataRole:
-        return QVariant::fromValue(task.at(index.row()));
-    default:
-        return QVariant();
-    }
-}
-
-QHash<int, QByteArray> TaskModel::roleNames() const
-{
-    QHash<int, QByteArray> roles;
-    roles[TaskRoles::TaskIdRole] = "taskId";
-    roles[TaskRoles::TaskDataRole] = "taskData";
-    return roles;
-}
-
-} // namespace QodeAssist::TaskFlow
--- a/TaskFlow/Editor/TaskModel.hpp
+++ b/TaskFlow/Editor/TaskModel.hpp
@@ -1,25 +0,0 @@
-#pragma once
-
-#include <QAbstractListModel>
-
-#include <Flow.hpp>
-
-namespace QodeAssist::TaskFlow {
-
-class TaskModel : public QAbstractListModel
-{
-    Q_OBJECT
-public:
-    enum TaskRoles { TaskIdRole = Qt::UserRole, TaskDataRole };
-
-    TaskModel(Flow *flow, QObject *parent);
-
-    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
-    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
-    QHash<int, QByteArray> roleNames() const override;
-
-private:
-    Flow *m_flow;
-};
-
-} // namespace QodeAssist::TaskFlow
--- a/TaskFlow/Editor/TaskPortItem.cpp
+++ b/TaskFlow/Editor/TaskPortItem.cpp
@@ -1,29 +0,0 @@
-#include "TaskPortItem.hpp"
-
-namespace QodeAssist::TaskFlow {
-
-TaskPortItem::TaskPortItem(QQuickItem *parent)
-    : QQuickItem(parent)
-{
-    setObjectName("TaskPortItem");
-}
-
-TaskPort *TaskPortItem::port() const
-{
-    return m_port;
-}
-
-void TaskPortItem::setPort(TaskPort *newPort)
-{
-    if (m_port == newPort)
-        return;
-    m_port = newPort;
-    emit portChanged();
-}
-
-QString TaskPortItem::name() const
-{
-    return m_port->name();
-}
-
-} // namespace QodeAssist::TaskFlow
--- a/TaskFlow/Editor/TaskPortItem.hpp
+++ b/TaskFlow/Editor/TaskPortItem.hpp
@@ -1,31 +0,0 @@
-#pragma once
-
-#include <TaskPort.hpp>
-#include <QQuickItem>
-
-namespace QodeAssist::TaskFlow {
-
-class TaskPortItem : public QQuickItem
-{
-    Q_OBJECT
-    QML_ELEMENT
-
-    Q_PROPERTY(TaskPort *port READ port WRITE setPort NOTIFY portChanged)
-    Q_PROPERTY(QString name READ name CONSTANT)
-
-public:
-    TaskPortItem(QQuickItem *parent = nullptr);
-
-    TaskPort *port() const;
-    void setPort(TaskPort *newPort);
-
-    QString name() const;
-
-signals:
-    void portChanged();
-
-private:
-    TaskPort *m_port = nullptr;
-};
-
-} // namespace QodeAssist::TaskFlow
--- a/TaskFlow/Editor/TaskPortModel.cpp
+++ b/TaskFlow/Editor/TaskPortModel.cpp
@@ -1,39 +0,0 @@
-#include "TaskPortModel.hpp"
-#include "TaskPort.hpp"
-
-namespace QodeAssist::TaskFlow {
-
-TaskPortModel::TaskPortModel(const QList<TaskPort *> &ports, QObject *parent)
-    : QAbstractListModel(parent)
-    , m_ports(ports)
-{}
-
-int TaskPortModel::rowCount(const QModelIndex &parent) const
-{
-    return m_ports.size();
-}
-
-QVariant TaskPortModel::data(const QModelIndex &index, int role) const
-{
-    if (!index.isValid() || index.row() >= m_ports.size())
-        return QVariant();
-
-    switch (role) {
-    case TaskPortRoles::TaskPortNameRole:
-        return m_ports.at(index.row())->name();
-    case TaskPortRoles::TaskPortDataRole:
-        return QVariant::fromValue(m_ports.at(index.row()));
-    default:
-        return QVariant();
-    }
-}
-
-QHash<int, QByteArray> TaskPortModel::roleNames() const
-{
-    QHash<int, QByteArray> roles;
-    roles[TaskPortRoles::TaskPortNameRole] = "taskPortName";
-    roles[TaskPortRoles::TaskPortDataRole] = "taskPortData";
-    return roles;
-}
-
-} // namespace QodeAssist::TaskFlow
--- a/TaskFlow/Editor/TaskPortModel.hpp
+++ b/TaskFlow/Editor/TaskPortModel.hpp
@@ -1,25 +0,0 @@
-#pragma once
-
-#include <QAbstractListModel>
-
-#include <BaseTask.hpp>
-
-namespace QodeAssist::TaskFlow {
-
-class TaskPortModel : public QAbstractListModel
-{
-    Q_OBJECT
-public:
-    enum TaskPortRoles { TaskPortNameRole = Qt::UserRole, TaskPortDataRole };
-
-    TaskPortModel(const QList<TaskPort *> &ports, QObject *parent = nullptr);
-
-    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
-    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
-    QHash<int, QByteArray> roleNames() const override;
-
-private:
-    QList<TaskPort *> m_ports;
-};
-
-} // namespace QodeAssist::TaskFlow
--- a/Show More
+++ b/Show More