chore: Upgrade plugin version to 0.9.1

feat: Add dran n drop for chat

.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: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
+custom: ['https://www.paypal.com/paypalme/palm1r', 'https://github.com/Palm1r/QodeAssist#support-the-development-of-qodeassist']

.github/workflows/build_cmake.yml

@@ -50,12 +50,16 @@ jobs:
             qt_creator_version: "16.0.2"
           }
         - {
-            qt_version: "6.8.3",
-            qt_creator_version: "16.0.1"
+            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@v4
+    - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955
 
     - name: Checkout submodules
       id: git
@@ -73,7 +77,7 @@ jobs:
         endif()
 
     - name: Download Ninja and CMake
-      uses: lukka/get-cmake@latest
+      uses: lukka/get-cmake@2ecc21724e5215b0e567bc399a2602d2ecb48541
       with:
         cmakeVersion: ${{ env.CMAKE_VERSION }}
         ninjaVersion: ${{ env.NINJA_VERSION }}
@@ -105,13 +109,18 @@ jobs:
       shell: cmake -P {0}
       run: |
         set(qt_version "${{ matrix.qt_config.qt_version }}")
+        set(qt_creator_version "${{ matrix.qt_config.qt_creator_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")
-          set(qt_package_suffix "-Windows-Windows_11_23H2-MSVC2022-Windows-Windows_11_23H2-X86_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()
         elseif ("${{ runner.os }}" STREQUAL "Linux")
           set(url_os "linux_x64")
           if (qt_version VERSION_LESS "6.7.0")
@@ -120,12 +129,20 @@ jobs:
             set(qt_package_arch_suffix "linux_gcc_64")
           endif()
           set(qt_dir_prefix "${qt_version}/gcc_64")
-          set(qt_package_suffix "-Linux-RHEL_8_10-GCC-Linux-RHEL_8_10-X86_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()
         elseif ("${{ runner.os }}" STREQUAL "macOS")
           set(url_os "mac_x64")
           set(qt_package_arch_suffix "clang_64")
           set(qt_dir_prefix "${qt_version}/macos")
-          set(qt_package_suffix "-MacOS-MacOS_14-Clang-MacOS-MacOS_14-X86_64-ARM64")
+          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()
         endif()
 
         set(qt_base_url "https://download.qt.io/online/qtsdkrepository/${url_os}/desktop/qt6_${qt_version_dotless}/qt6_${qt_version_dotless}")
@@ -148,7 +165,7 @@ jobs:
           execute_process(COMMAND ${CMAKE_COMMAND} -E tar xvf ../${archive} WORKING_DIRECTORY qt6)
         endfunction()
 
-        foreach(package qtbase qtdeclarative)
+        foreach(package qtbase qtdeclarative qttools)
           downloadAndExtract(
             "${qt_base_url}/qt.qt6.${qt_version_dotless}.${qt_package_arch_suffix}/${qt_package_version}${package}${qt_package_suffix}.7z"
             ${package}.7z
@@ -182,7 +199,7 @@ jobs:
         endif()
 
     - name: Download Qt Creator
-      uses: qt-creator/install-dev-package@v2.0
+      uses: qt-creator/install-dev-package@1460787a21551eb3d867b0de30e8d3f1aadef5ac
       with:
         version: ${{ matrix.qt_config.qt_creator_version }}
         unzip-to: 'qtcreator'
@@ -248,7 +265,7 @@ jobs:
         endif()
 
     - name: Upload
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02
       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
@@ -265,7 +282,7 @@ jobs:
 
     steps:
     - name: Download artifacts
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093
       with:
         path: release-with-dirs
 
@@ -274,9 +291,21 @@ jobs:
         mkdir release
         mv release-with-dirs/*/* release/
 
+    - name: Download QodeAssistUpdater
+      run: |
+        # Get latest release info and download assets
+        LATEST_RELEASE=$(curl -s https://api.github.com/repos/Palm1r/QodeAssistUpdater/releases/latest)
+        
+        # Download all assets except .sha256 files
+        echo "$LATEST_RELEASE" | jq -r '.assets[].browser_download_url' | grep -v '\.sha256$' | while read url; do
+          filename=$(basename "$url")
+          echo "Downloading $filename..."
+          curl -L -o "release/$filename" "$url"
+        done
+
     - name: Create Release
       id: create_release
-      uses: softprops/action-gh-release@v2
+      uses: softprops/action-gh-release@6cbd405e2c4e67a21c47fa9e383d020e4e28b836
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:

.github/workflows/check_formatting.yml

@@ -1,24 +0,0 @@
-name: Check formatting
-
-on:
-  push:
-    branches:
-      - main
-  pull_request:
-    branches:
-      - main
-
-jobs:
-  format:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-    - name: Install dependencies
-      run: |
-        sudo apt-get update
-        sudo apt-get install -y clang-format-19
-    - name: Check formatting
-      run: |
-        clang-format-19 --style=file -i $(git ls-files | fgrep .hpp)
-        clang-format-19 --style=file -i $(git ls-files | fgrep .cpp)
-        git diff --exit-code || exit 1

.gitignore

@@ -73,4 +73,8 @@ CMakeLists.txt.user*
 *.dll
 *.exe
 
-/build
+/build
+/.qodeassist
+/.cursor
+/.vscode
+.qtc_clangd/compile_commands.json

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "3rdparty/inja"]
-	path = 3rdparty/inja
-	url = https://github.com/pantor/inja

CMakeLists.txt

@@ -11,9 +11,11 @@ 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 REQUIRED)
+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})
@@ -35,6 +37,7 @@ add_definitions(
 add_subdirectory(llmcore)
 add_subdirectory(settings)
 add_subdirectory(logger)
+add_subdirectory(UIControls)
 add_subdirectory(ChatView)
 add_subdirectory(context)
 if(GTest_FOUND)
@@ -47,6 +50,7 @@ add_qtc_plugin(QodeAssist
     QtCreator::LanguageClient
     QtCreator::TextEditor
     QtCreator::ProjectExplorer
+    QtCreator::CppEditor
   DEPENDS
     Qt::Core
     Qt::Gui
@@ -55,6 +59,7 @@ add_qtc_plugin(QodeAssist
     Qt::Network
     QtCreator::ExtensionSystem
     QtCreator::Utils
+    QtCreator::CPlusPlus
     QodeAssistChatViewplugin
   SOURCES
     .github/workflows/build_cmake.yml
@@ -73,7 +78,7 @@ add_qtc_plugin(QodeAssist
     templates/StarCoder2Fim.hpp
     # templates/DeepSeekCoderFim.hpp
     # templates/CustomFimTemplate.hpp
-    templates/Qwen.hpp
+    templates/Qwen25CoderFIM.hpp
     templates/OpenAICompatible.hpp
     templates/Llama3.hpp
     templates/ChatML.hpp
@@ -82,6 +87,7 @@ add_qtc_plugin(QodeAssist
     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
@@ -96,6 +102,8 @@ add_qtc_plugin(QodeAssist
     QodeAssist.qrc
     LSPCompletion.hpp
     LLMSuggestion.hpp LLMSuggestion.cpp
+    RefactorSuggestion.hpp RefactorSuggestion.cpp
+    RefactorSuggestionHoverHandler.hpp RefactorSuggestionHoverHandler.cpp
     QodeAssistClient.hpp QodeAssistClient.cpp
     chat/ChatOutputPane.h chat/ChatOutputPane.cpp
     chat/NavigationPanel.hpp chat/NavigationPanel.cpp
@@ -103,11 +111,34 @@ add_qtc_plugin(QodeAssist
     CodeHandler.hpp CodeHandler.cpp
     UpdateStatusWidget.hpp UpdateStatusWidget.cpp
     widgets/CompletionProgressHandler.hpp widgets/CompletionProgressHandler.cpp
+    widgets/CompletionErrorHandler.hpp widgets/CompletionErrorHandler.cpp
+    widgets/CompletionHintWidget.hpp widgets/CompletionHintWidget.cpp
+    widgets/CompletionHintHandler.hpp widgets/CompletionHintHandler.cpp
     widgets/ProgressWidget.hpp widgets/ProgressWidget.cpp
+    widgets/ErrorWidget.hpp widgets/ErrorWidget.cpp
     widgets/EditorChatButton.hpp widgets/EditorChatButton.cpp
     widgets/EditorChatButtonHandler.hpp widgets/EditorChatButtonHandler.cpp
     widgets/QuickRefactorDialog.hpp widgets/QuickRefactorDialog.cpp
+    widgets/CustomInstructionsManager.hpp widgets/CustomInstructionsManager.cpp
+    widgets/AddCustomInstructionDialog.hpp widgets/AddCustomInstructionDialog.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)
@@ -126,3 +157,10 @@ if (QtCreatorExecutable)
   )
   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
+)

ChatView/CMakeLists.txt

@@ -6,17 +6,25 @@ qt_policy(SET QTP0004 NEW)
 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/controls/QoAButton.qml
-    qml/parts/TopBar.qml
-    qml/parts/BottomBar.qml
-    qml/parts/AttachedFilesPlace.qml
+
+    qml/chatparts/CodeBlock.qml
+    qml/chatparts/FileEditBlock.qml
+    qml/chatparts/TextBlock.qml
+    qml/chatparts/ThinkingBlock.qml
+    qml/chatparts/ToolBlock.qml
+    qml/chatparts/ChatItem.qml
+
+    qml/controls/AttachedFilesPlace.qml
+    qml/controls/BottomBar.qml
+    qml/controls/FileEditsActionBar.qml
+    qml/controls/RulesViewer.qml
+    qml/controls/Toast.qml
+    qml/controls/TopBar.qml
+    qml/controls/SplitDropZone.qml
 
     RESOURCES
     icons/attach-file-light.svg
@@ -25,6 +33,23 @@ qt_add_qml_module(QodeAssistChatView
     icons/close-light.svg
     icons/link-file-light.svg
     icons/link-file-dark.svg
+    icons/image-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
+    icons/thinking-icon-on.svg
+    icons/thinking-icon-off.svg
+
     SOURCES
     ChatWidget.hpp ChatWidget.cpp
     ChatModel.hpp ChatModel.cpp
@@ -33,6 +58,9 @@ qt_add_qml_module(QodeAssistChatView
     MessagePart.hpp
     ChatUtils.h ChatUtils.cpp
     ChatSerializer.hpp ChatSerializer.cpp
+    ChatView.hpp ChatView.cpp
+    ChatData.hpp
+    FileItem.hpp FileItem.cpp
 )
 
 target_link_libraries(QodeAssistChatView
@@ -46,6 +74,8 @@ target_link_libraries(QodeAssistChatView
     LLMCore
     QodeAssistSettings
     Context
+    QodeAssistUIControlsplugin
+    QodeAssistLogger
 )
 
 target_include_directories(QodeAssistChatView

ChatView/ChatData.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024-2025 Petr Mironychev
+ * Copyright (C) 2025 Petr Mironychev
  *
  * This file is part of QodeAssist.
  *
@@ -17,14 +17,16 @@
  * along with QodeAssist. If not, see <https://www.gnu.org/licenses/>.
  */
 
-import QtQuick
+#pragma once
 
-TextEdit {
-    id: root
+#include <QObject>
+#include <QtQmlIntegration>
 
-    readOnly: true
-    selectByMouse: true
-    wrapMode: Text.WordWrap
-    selectionColor: palette.highlight
-    color: palette.text
-}
+namespace QodeAssist::Chat {
+Q_NAMESPACE
+QML_NAMED_ELEMENT(MessagePartType)
+
+enum class MessagePartType { Code, Text, Image };
+Q_ENUM_NS(MessagePartType)
+
+} // namespace QodeAssist::Chat

ChatView/ChatModel.cpp

@@ -19,10 +19,17 @@
 
 #include "ChatModel.hpp"
 #include <utils/aspects.h>
-#include <QtCore/qjsonobject.h>
+#include <QDateTime>
+#include <QDir>
+#include <QFileInfo>
+#include <QJsonDocument>
+#include <QJsonObject>
+#include <QUrl>
 #include <QtQml>
 
 #include "ChatAssistantSettings.hpp"
+#include "Logger.hpp"
+#include "context/ChangesManager.h"
 
 namespace QodeAssist::Chat {
 
@@ -36,6 +43,21 @@ ChatModel::ChatModel(QObject *parent)
         &Utils::BaseAspect::changed,
         this,
         &ChatModel::tokensThresholdChanged);
+    
+    connect(&Context::ChangesManager::instance(),
+            &Context::ChangesManager::fileEditApplied,
+            this,
+            &ChatModel::onFileEditApplied);
+    
+    connect(&Context::ChangesManager::instance(),
+            &Context::ChangesManager::fileEditRejected,
+            this,
+            &ChatModel::onFileEditRejected);
+    
+    connect(&Context::ChangesManager::instance(),
+            &Context::ChangesManager::fileEditArchived,
+            this,
+            &ChatModel::onFileEditArchived);
 }
 
 int ChatModel::rowCount(const QModelIndex &parent) const
@@ -62,6 +84,33 @@ QVariant ChatModel::data(const QModelIndex &index, int role) const
         }
         return filenames;
     }
+    case Roles::IsRedacted: {
+        return message.isRedacted;
+    }
+    case Roles::Images: {
+        QVariantList imagesList;
+        for (const auto &image : message.images) {
+            QVariantMap imageMap;
+            imageMap["fileName"] = image.fileName;
+            imageMap["storedPath"] = image.storedPath;
+            imageMap["mediaType"] = image.mediaType;
+            
+            // Generate proper file URL for cross-platform compatibility
+            if (!m_chatFilePath.isEmpty()) {
+                QFileInfo fileInfo(m_chatFilePath);
+                QString baseName = fileInfo.completeBaseName();
+                QString dirPath = fileInfo.absolutePath();
+                QString imagesFolder = QDir(dirPath).filePath(baseName + "_images");
+                QString fullPath = QDir(imagesFolder).filePath(image.storedPath);
+                imageMap["imageUrl"] = QUrl::fromLocalFile(fullPath).toString();
+            } else {
+                imageMap["imageUrl"] = QString();
+            }
+            
+            imagesList.append(imageMap);
+        }
+        return imagesList;
+    }
     default:
         return QVariant();
     }
@@ -73,6 +122,8 @@ QHash<int, QByteArray> ChatModel::roleNames() const
     roles[Roles::RoleType] = "roleType";
     roles[Roles::Content] = "content";
     roles[Roles::Attachments] = "attachments";
+    roles[Roles::IsRedacted] = "isRedacted";
+    roles[Roles::Images] = "images";
     return roles;
 }
 
@@ -80,7 +131,8 @@ void ChatModel::addMessage(
     const QString &content,
     ChatRole role,
     const QString &id,
-    const QList<Context::ContentFile> &attachments)
+    const QList<Context::ContentFile> &attachments,
+    const QList<ImageAttachment> &images)
 {
     QString fullContent = content;
     if (!attachments.isEmpty()) {
@@ -91,17 +143,59 @@ void ChatModel::addMessage(
         }
     }
 
-    if (!m_messages.isEmpty() && !id.isEmpty() && m_messages.last().id == id) {
+    if (!m_messages.isEmpty() && !id.isEmpty() && m_messages.last().id == id
+        && m_messages.last().role == role) {
         Message &lastMessage = m_messages.last();
         lastMessage.content = content;
         lastMessage.attachments = attachments;
+        lastMessage.images = images;
         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;
+        newMessage.images = images;
         m_messages.append(newMessage);
         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));
+                        }
+                    }
+                }
+            }
+        }
     }
 }
 
@@ -124,7 +218,6 @@ QList<MessagePart> ChatModel::processMessageContent(const QString &content) cons
     QRegularExpression codeBlockRegex("```(\\w*)\\n?([\\s\\S]*?)```");
     int lastIndex = 0;
     auto blockMatches = codeBlockRegex.globalMatch(content);
-    bool foundCodeBlock = blockMatches.hasNext();
 
     while (blockMatches.hasNext()) {
         auto match = blockMatches.next();
@@ -132,10 +225,19 @@ QList<MessagePart> ChatModel::processMessageContent(const QString &content) cons
             QString textBetween
                 = content.mid(lastIndex, match.capturedStart() - lastIndex).trimmed();
             if (!textBetween.isEmpty()) {
-                parts.append({MessagePart::Text, textBetween, ""});
+                MessagePart part;
+                part.type = MessagePartType::Text;
+                part.text = textBetween;
+                parts.append(part);
             }
         }
-        parts.append({MessagePart::Code, match.captured(2).trimmed(), match.captured(1)});
+
+        MessagePart codePart;
+        codePart.type = MessagePartType::Code;
+        codePart.text = match.captured(2).trimmed();
+        codePart.language = match.captured(1);
+        parts.append(codePart);
+
         lastIndex = match.capturedEnd();
     }
 
@@ -148,13 +250,22 @@ QList<MessagePart> ChatModel::processMessageContent(const QString &content) cons
         if (unclosedMatch.hasMatch()) {
             QString beforeCodeBlock = remainingText.left(unclosedMatch.capturedStart()).trimmed();
             if (!beforeCodeBlock.isEmpty()) {
-                parts.append({MessagePart::Text, beforeCodeBlock, ""});
+                MessagePart part;
+                part.type = MessagePartType::Text;
+                part.text = beforeCodeBlock;
+                parts.append(part);
             }
 
-            parts.append(
-                {MessagePart::Code, unclosedMatch.captured(2).trimmed(), unclosedMatch.captured(1)});
+            MessagePart codePart;
+            codePart.type = MessagePartType::Code;
+            codePart.text = unclosedMatch.captured(2).trimmed();
+            codePart.language = unclosedMatch.captured(1);
+            parts.append(codePart);
         } else if (!remainingText.isEmpty()) {
-            parts.append({MessagePart::Text, remainingText, ""});
+            MessagePart part;
+            part.type = MessagePartType::Text;
+            part.text = remainingText;
+            parts.append(part);
         }
     }
 
@@ -175,6 +286,9 @@ QJsonArray ChatModel::prepareMessagesForRequest(const QString &systemPrompt) con
         case ChatRole::Assistant:
             role = "assistant";
             break;
+        case ChatRole::Tool:
+        case ChatRole::FileEdit:
+            continue;
         default:
             continue;
         }
@@ -222,4 +336,243 @@ void ChatModel::resetModelTo(int index)
     }
 }
 
+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::addThinkingBlock(
+    const QString &requestId, const QString &thinking, const QString &signature)
+{
+    LOG_MESSAGE(QString("Adding thinking block: requestId=%1, thinking length=%2, signature length=%3")
+                    .arg(requestId)
+                    .arg(thinking.length())
+                    .arg(signature.length()));
+
+    QString displayContent = thinking;
+    if (!signature.isEmpty()) {
+        displayContent += "\n[Signature: " + signature.left(40) + "...]";
+    }
+
+    beginInsertRows(QModelIndex(), m_messages.size(), m_messages.size());
+    Message thinkingMessage;
+    thinkingMessage.role = ChatRole::Thinking;
+    thinkingMessage.content = displayContent;
+    thinkingMessage.id = requestId;
+    thinkingMessage.isRedacted = false;
+    thinkingMessage.signature = signature;
+    m_messages.append(thinkingMessage);
+    endInsertRows();
+    LOG_MESSAGE(QString("Added thinking message at index %1 with signature length=%2")
+                    .arg(m_messages.size() - 1).arg(signature.length()));
+}
+
+void ChatModel::addRedactedThinkingBlock(const QString &requestId, const QString &signature)
+{
+    LOG_MESSAGE(
+        QString("Adding redacted thinking block: requestId=%1, signature length=%2")
+            .arg(requestId)
+            .arg(signature.length()));
+
+    QString displayContent = "[Thinking content redacted by safety systems]";
+    if (!signature.isEmpty()) {
+        displayContent += "\n[Signature: " + signature.left(40) + "...]";
+    }
+
+    beginInsertRows(QModelIndex(), m_messages.size(), m_messages.size());
+    Message thinkingMessage;
+    thinkingMessage.role = ChatRole::Thinking;
+    thinkingMessage.content = displayContent;
+    thinkingMessage.id = requestId;
+    thinkingMessage.isRedacted = true;
+    thinkingMessage.signature = signature;
+    m_messages.append(thinkingMessage);
+    endInsertRows();
+    LOG_MESSAGE(QString("Added redacted thinking message at index %1 with signature length=%2")
+                    .arg(m_messages.size() - 1).arg(signature.length()));
+}
+
+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;
+                    }
+                }
+            }
+        }
+    }
+}
+
+void ChatModel::setChatFilePath(const QString &filePath)
+{
+    m_chatFilePath = filePath;
+}
+
+QString ChatModel::chatFilePath() const
+{
+    return m_chatFilePath;
+}
+
 } // namespace QodeAssist::Chat

ChatView/ChatModel.hpp

@@ -37,18 +37,29 @@ class ChatModel : public QAbstractListModel
     QML_ELEMENT
 
 public:
-    enum ChatRole { System, User, Assistant };
+    enum ChatRole { System, User, Assistant, Tool, FileEdit, Thinking };
     Q_ENUM(ChatRole)
 
-    enum Roles { RoleType = Qt::UserRole, Content, Attachments };
+    enum Roles { RoleType = Qt::UserRole, Content, Attachments, IsRedacted, Images };
+    Q_ENUM(Roles)
+
+    struct ImageAttachment
+    {
+        QString fileName;      // Original filename
+        QString storedPath;    // Path to stored image file (relative to chat folder)
+        QString mediaType;     // MIME type
+    };
 
     struct Message
     {
         ChatRole role;
         QString content;
         QString id;
+        bool isRedacted = false;
+        QString signature = QString();
 
         QList<Context::ContentFile> attachments;
+        QList<ImageAttachment> images;
     };
 
     explicit ChatModel(QObject *parent = nullptr);
@@ -61,7 +72,8 @@ public:
         const QString &content,
         ChatRole role,
         const QString &id,
-        const QList<Context::ContentFile> &attachments = {});
+        const QList<Context::ContentFile> &attachments = {},
+        const QList<ImageAttachment> &images = {});
     Q_INVOKABLE void clear();
     Q_INVOKABLE QList<MessagePart> processMessageContent(const QString &content) const;
 
@@ -75,12 +87,39 @@ public:
 
     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 addThinkingBlock(
+        const QString &requestId, const QString &thinking, const QString &signature);
+    void addRedactedThinkingBlock(const QString &requestId, const QString &signature);
+    void updateMessageContent(const QString &messageId, const QString &newContent);
+    
+    void setLoadingFromHistory(bool loading);
+    bool isLoadingFromHistory() const;
+    
+    void setChatFilePath(const QString &filePath);
+    QString chatFilePath() const;
+
 signals:
     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);
+    
     QVector<Message> m_messages;
+    bool m_loadingFromHistory = false;
+    QString m_chatFilePath;
 };
 
 } // namespace QodeAssist::Chat

ChatView/ChatRootView.hpp

@@ -43,6 +43,23 @@ class ChatRootView : public QQuickItem
     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 isThinkingMode READ isThinkingMode WRITE setIsThinkingMode NOTIFY isThinkingModeChanged 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(bool isThinkingSupport READ isThinkingSupport NOTIFY isThinkingSupportChanged FINAL)
+    Q_PROPERTY(QStringList availableConfigurations READ availableConfigurations NOTIFY availableConfigurationsChanged FINAL)
+    Q_PROPERTY(QString currentConfiguration READ currentConfiguration NOTIFY currentConfigurationChanged FINAL)
 
     QML_ELEMENT
 
@@ -60,17 +77,24 @@ public:
 
     void autosave();
     QString getAutosaveFilePath() const;
+    QString getAutosaveFilePath(const QString &firstMessage, const QStringList &attachments) const;
 
     QStringList attachmentFiles() const;
     QStringList linkedFiles() const;
 
     Q_INVOKABLE void showAttachFilesDialog();
+    Q_INVOKABLE void addFilesToAttachList(const QStringList &filePaths);
     Q_INVOKABLE void removeFileFromAttachList(int index);
     Q_INVOKABLE void showLinkFilesDialog();
+    Q_INVOKABLE void addFilesToLinkList(const QStringList &filePaths);
     Q_INVOKABLE void removeFileFromLinkList(int index);
+    Q_INVOKABLE QStringList convertUrlsToLocalPaths(const QVariantList &urls) const;
+    Q_INVOKABLE void showAddImageDialog();
+    Q_INVOKABLE bool isImageFile(const QString &filePath) const;
     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;
@@ -82,6 +106,7 @@ public:
     void onEditorCreated(Core::IEditor *editor, const Utils::FilePath &filePath);
 
     QString chatFileName() const;
+    Q_INVOKABLE QString chatFilePath() const;
     void setRecentFilePath(const QString &filePath);
     bool shouldIgnoreFileForAttach(const Utils::FilePath &filePath);
 
@@ -92,6 +117,45 @@ public:
     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 isThinkingMode() const;
+    void setIsThinkingMode(bool newIsThinkingMode);
+    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);
+    
+    Q_INVOKABLE void applyAllFileEditsForCurrentMessage();
+    Q_INVOKABLE void undoAllFileEditsForCurrentMessage();
+    Q_INVOKABLE void updateCurrentMessageEditsStats();
+
+    Q_INVOKABLE void loadAvailableConfigurations();
+    Q_INVOKABLE void applyConfiguration(const QString &configName);
+    QStringList availableConfigurations() const;
+    QString currentConfiguration() const;
+    
+    int currentMessageTotalEdits() const;
+    int currentMessageAppliedEdits() const;
+    int currentMessagePendingEdits() const;
+    int currentMessageRejectedEdits() const;
+
+    QString lastInfoMessage() const;
+
+    bool isThinkingSupport() const;
+
 public slots:
     void sendMessage(const QString &message);
     void copyToClipboard(const QString &text);
@@ -112,10 +176,29 @@ signals:
     void codeFontSizeChanged();
     void textFontSizeChanged();
     void textFormatChanged();
+    void chatRequestStarted();
+    void isRequestInProgressChanged();
+
+    void lastErrorMessageChanged();
+    void lastInfoMessageChanged();
+    void activeRulesChanged();
+    void activeRulesCountChanged();
+
+    void isAgentModeChanged();
+    void isThinkingModeChanged();
+    void toolsSupportEnabledChanged();
+    void currentMessageEditsStatsChanged();
+
+    void isThinkingSupportChanged();
+    void availableConfigurationsChanged();
+    void currentConfigurationChanged();
 
 private:
+    void updateFileEditStatus(const QString &editId, const QString &status);
     QString getChatsHistoryDir() const;
     QString getSuggestedFileName() const;
+    QString generateChatFileName(const QString &shortMessage, const QString &dir) const;
+    bool hasImageAttachments(const QStringList &attachments) const;
 
     ChatModel *m_chatModel;
     LLMCore::PromptProviderChat m_promptProvider;
@@ -128,6 +211,21 @@ private:
     int m_inputTokensCount{0};
     bool m_isSyncOpenFiles;
     QList<Core::IEditor *> m_currentEditors;
+    bool m_isRequestInProgress;
+    QString m_lastErrorMessage;
+    QVariantList m_activeRules;
+    bool m_isAgentMode;
+    bool m_isThinkingMode;
+    
+    QString m_currentMessageRequestId;
+    int m_currentMessageTotalEdits{0};
+    int m_currentMessageAppliedEdits{0};
+    int m_currentMessagePendingEdits{0};
+    int m_currentMessageRejectedEdits{0};
+    QString m_lastInfoMessage;
+    
+    QStringList m_availableConfigurations;
+    QString m_currentConfiguration;
 };
 
 } // namespace QodeAssist::Chat

ChatView/ChatSerializer.cpp

@@ -20,10 +20,13 @@
 #include "ChatSerializer.hpp"
 #include "Logger.hpp"
 
+#include <QBuffer>
 #include <QDir>
 #include <QFile>
 #include <QFileInfo>
+#include <QJsonArray>
 #include <QJsonDocument>
+#include <QUuid>
 
 namespace QodeAssist::Chat {
 
@@ -35,12 +38,20 @@ SerializationResult ChatSerializer::saveToFile(const ChatModel *model, const QSt
         return {false, "Failed to create directory structure"};
     }
 
+    QString imagesFolder = getChatImagesFolder(filePath);
+    QDir dir;
+    if (!dir.exists(imagesFolder)) {
+        if (!dir.mkpath(imagesFolder)) {
+            LOG_MESSAGE(QString("Warning: Failed to create images folder: %1").arg(imagesFolder));
+        }
+    }
+
     QFile file(filePath);
     if (!file.open(QIODevice::WriteOnly)) {
         return {false, QString("Failed to open file for writing: %1").arg(filePath)};
     }
 
-    QJsonObject root = serializeChat(model);
+    QJsonObject root = serializeChat(model, filePath);
     QJsonDocument doc(root);
 
     if (file.write(doc.toJson(QJsonDocument::Indented)) == -1) {
@@ -70,36 +81,68 @@ SerializationResult ChatSerializer::loadFromFile(ChatModel *model, const QString
         return {false, QString("Unsupported version: %1").arg(version)};
     }
 
-    if (!deserializeChat(model, root)) {
+    if (!deserializeChat(model, root, filePath)) {
         return {false, "Failed to deserialize chat data"};
     }
 
     return {true, QString()};
 }
 
-QJsonObject ChatSerializer::serializeMessage(const ChatModel::Message &message)
+QJsonObject ChatSerializer::serializeMessage(const ChatModel::Message &message, const QString &chatFilePath)
 {
     QJsonObject messageObj;
     messageObj["role"] = static_cast<int>(message.role);
     messageObj["content"] = message.content;
     messageObj["id"] = message.id;
+    messageObj["isRedacted"] = message.isRedacted;
+    if (!message.signature.isEmpty()) {
+        messageObj["signature"] = message.signature;
+    }
+    
+    if (!message.images.isEmpty()) {
+        QJsonArray imagesArray;
+        for (const auto &image : message.images) {
+            QJsonObject imageObj;
+            imageObj["fileName"] = image.fileName;
+            imageObj["storedPath"] = image.storedPath;
+            imageObj["mediaType"] = image.mediaType;
+            imagesArray.append(imageObj);
+        }
+        messageObj["images"] = imagesArray;
+    }
+    
     return messageObj;
 }
 
-ChatModel::Message ChatSerializer::deserializeMessage(const QJsonObject &json)
+ChatModel::Message ChatSerializer::deserializeMessage(const QJsonObject &json, const QString &chatFilePath)
 {
     ChatModel::Message message;
     message.role = static_cast<ChatModel::ChatRole>(json["role"].toInt());
     message.content = json["content"].toString();
     message.id = json["id"].toString();
+    message.isRedacted = json["isRedacted"].toBool(false);
+    message.signature = json["signature"].toString();
+    
+    if (json.contains("images")) {
+        QJsonArray imagesArray = json["images"].toArray();
+        for (const auto &imageValue : imagesArray) {
+            QJsonObject imageObj = imageValue.toObject();
+            ChatModel::ImageAttachment image;
+            image.fileName = imageObj["fileName"].toString();
+            image.storedPath = imageObj["storedPath"].toString();
+            image.mediaType = imageObj["mediaType"].toString();
+            message.images.append(image);
+        }
+    }
+    
     return message;
 }
 
-QJsonObject ChatSerializer::serializeChat(const ChatModel *model)
+QJsonObject ChatSerializer::serializeChat(const ChatModel *model, const QString &chatFilePath)
 {
     QJsonArray messagesArray;
     for (const auto &message : model->getChatHistory()) {
-        messagesArray.append(serializeMessage(message));
+        messagesArray.append(serializeMessage(message, chatFilePath));
     }
 
     QJsonObject root;
@@ -109,20 +152,26 @@ QJsonObject ChatSerializer::serializeChat(const ChatModel *model)
     return root;
 }
 
-bool ChatSerializer::deserializeChat(ChatModel *model, const QJsonObject &json)
+bool ChatSerializer::deserializeChat(ChatModel *model, const QJsonObject &json, const QString &chatFilePath)
 {
     QJsonArray messagesArray = json["messages"].toArray();
     QVector<ChatModel::Message> messages;
     messages.reserve(messagesArray.size());
 
     for (const auto &messageValue : messagesArray) {
-        messages.append(deserializeMessage(messageValue.toObject()));
+        messages.append(deserializeMessage(messageValue.toObject(), chatFilePath));
     }
 
     model->clear();
+    
+    model->setLoadingFromHistory(true);
+    
     for (const auto &message : messages) {
-        model->addMessage(message.content, message.role, message.id);
+        model->addMessage(message.content, message.role, message.id, message.attachments, message.images);
+        LOG_MESSAGE(QString("Loaded message with %1 image(s)").arg(message.images.size()));
     }
+    
+    model->setLoadingFromHistory(false);
 
     return true;
 }
@@ -139,4 +188,73 @@ bool ChatSerializer::validateVersion(const QString &version)
     return version == VERSION;
 }
 
+QString ChatSerializer::getChatImagesFolder(const QString &chatFilePath)
+{
+    QFileInfo fileInfo(chatFilePath);
+    QString baseName = fileInfo.completeBaseName();
+    QString dirPath = fileInfo.absolutePath();
+    return QDir(dirPath).filePath(baseName + "_images");
+}
+
+bool ChatSerializer::saveImageToStorage(const QString &chatFilePath, 
+                                        const QString &fileName,
+                                        const QString &base64Data,
+                                        QString &storedPath)
+{
+    QString imagesFolder = getChatImagesFolder(chatFilePath);
+    QDir dir;
+    if (!dir.exists(imagesFolder)) {
+        if (!dir.mkpath(imagesFolder)) {
+            LOG_MESSAGE(QString("Failed to create images folder: %1").arg(imagesFolder));
+            return false;
+        }
+    }
+    
+    QFileInfo originalFileInfo(fileName);
+    QString extension = originalFileInfo.suffix();
+    QString baseName = originalFileInfo.completeBaseName();
+    QString uniqueName = QString("%1_%2.%3")
+                            .arg(baseName)
+                            .arg(QUuid::createUuid().toString(QUuid::WithoutBraces).left(8))
+                            .arg(extension);
+    
+    QString fullPath = QDir(imagesFolder).filePath(uniqueName);
+    
+    QByteArray imageData = QByteArray::fromBase64(base64Data.toUtf8());
+    QFile file(fullPath);
+    if (!file.open(QIODevice::WriteOnly)) {
+        LOG_MESSAGE(QString("Failed to open file for writing: %1").arg(fullPath));
+        return false;
+    }
+    
+    if (file.write(imageData) == -1) {
+        LOG_MESSAGE(QString("Failed to write image data: %1").arg(file.errorString()));
+        return false;
+    }
+    
+    file.close();
+    
+    storedPath = uniqueName;
+    LOG_MESSAGE(QString("Saved image: %1 to %2").arg(fileName, fullPath));
+    
+    return true;
+}
+
+QString ChatSerializer::loadImageFromStorage(const QString &chatFilePath, const QString &storedPath)
+{
+    QString imagesFolder = getChatImagesFolder(chatFilePath);
+    QString fullPath = QDir(imagesFolder).filePath(storedPath);
+    
+    QFile file(fullPath);
+    if (!file.open(QIODevice::ReadOnly)) {
+        LOG_MESSAGE(QString("Failed to open image file: %1").arg(fullPath));
+        return QString();
+    }
+    
+    QByteArray imageData = file.readAll();
+    file.close();
+    
+    return imageData.toBase64();
+}
+
 } // namespace QodeAssist::Chat

ChatView/ChatSerializer.hpp

@@ -40,10 +40,18 @@ public:
     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);
+    static QJsonObject serializeMessage(const ChatModel::Message &message, const QString &chatFilePath);
+    static ChatModel::Message deserializeMessage(const QJsonObject &json, const QString &chatFilePath);
+    static QJsonObject serializeChat(const ChatModel *model, const QString &chatFilePath);
+    static bool deserializeChat(ChatModel *model, const QJsonObject &json, const QString &chatFilePath);
+
+    // Image management
+    static QString getChatImagesFolder(const QString &chatFilePath);
+    static bool saveImageToStorage(const QString &chatFilePath, 
+                                    const QString &fileName,
+                                    const QString &base64Data,
+                                    QString &storedPath);
+    static QString loadImageFromStorage(const QString &chatFilePath, const QString &storedPath);
 
 private:
     static const QString VERSION;

ChatView/ChatView.cpp

@@ -0,0 +1,106 @@
+/*
+ * 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

ChatView/ChatView.hpp

@@ -0,0 +1,51 @@
+/*
+ * 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

ChatView/ClientInterface.cpp

@@ -20,61 +20,98 @@
 #include "ClientInterface.hpp"
 
 #include <texteditor/textdocument.h>
+#include <QFile>
 #include <QFileInfo>
+#include <QImageReader>
 #include <QJsonArray>
 #include <QJsonDocument>
+#include <QMimeDatabase>
 #include <QUuid>
 
 #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 "ChatSerializer.hpp"
 #include "GeneralSettings.hpp"
+#include "ToolsSettings.hpp"
 #include "Logger.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)
     : QObject(parent)
-    , m_requestHandler(new LLMCore::RequestHandler(this))
     , m_chatModel(chatModel)
     , m_promptProvider(promptProvider)
     , m_contextManager(new Context::ContextManager(this))
-{
-    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);
-            }
-        });
-}
-
-ClientInterface::~ClientInterface() = default;
-
-void ClientInterface::sendMessage(
-    const QString &message, const QList<QString> &attachments, const QList<QString> &linkedFiles)
+ClientInterface::~ClientInterface()
 {
     cancelRequest();
+}
 
-    auto attachFiles = m_contextManager->getContentFiles(attachments);
-    m_chatModel->addMessage(message, ChatModel::ChatRole::User, "", attachFiles);
+void ClientInterface::sendMessage(
+    const QString &message,
+    const QList<QString> &attachments,
+    const QList<QString> &linkedFiles,
+    bool useAgentMode)
+{
+    cancelRequest();
+    m_accumulatedResponses.clear();
+    
+    Context::ChangesManager::instance().archiveAllNonArchivedEdits();
+
+    QList<QString> imageFiles;
+    QList<QString> textFiles;
+    
+    for (const QString &filePath : attachments) {
+        if (isImageFile(filePath)) {
+            imageFiles.append(filePath);
+        } else {
+            textFiles.append(filePath);
+        }
+    }
+
+    auto attachFiles = m_contextManager->getContentFiles(textFiles);
+    
+    QList<ChatModel::ImageAttachment> imageAttachments;
+    if (!imageFiles.isEmpty() && !m_chatFilePath.isEmpty()) {
+        for (const QString &imagePath : imageFiles) {
+            QString base64Data = encodeImageToBase64(imagePath);
+            if (base64Data.isEmpty()) {
+                continue;
+            }
+            
+            QString storedPath;
+            QFileInfo fileInfo(imagePath);
+            if (ChatSerializer::saveImageToStorage(m_chatFilePath, fileInfo.fileName(), base64Data, storedPath)) {
+                ChatModel::ImageAttachment imageAttachment;
+                imageAttachment.fileName = fileInfo.fileName();
+                imageAttachment.storedPath = storedPath;
+                imageAttachment.mediaType = getMediaTypeForImage(imagePath);
+                imageAttachments.append(imageAttachment);
+                
+                LOG_MESSAGE(QString("Stored image %1 as %2").arg(fileInfo.fileName(), storedPath));
+            }
+        }
+    } else if (!imageFiles.isEmpty()) {
+        LOG_MESSAGE(QString("Warning: Chat file path not set, cannot save %1 image(s)").arg(imageFiles.size()));
+    }
+    
+    m_chatModel->addMessage(message, ChatModel::ChatRole::User, "", attachFiles, imageAttachments);
 
     auto &chatAssistantSettings = Settings::chatAssistantSettings();
 
@@ -96,8 +133,27 @@ void ClientInterface::sendMessage(
 
     LLMCore::ContextData context;
 
+    const bool isToolsEnabled = Settings::toolsSettings().useTools() && useAgentMode;
+
     if (chatAssistantSettings.useSystemPrompt()) {
         QString systemPrompt = chatAssistantSettings.systemPrompt();
+
+        auto project = LLMCore::RulesLoader::getActiveProject();
+
+        if (project) {
+            systemPrompt += QString("\n# Active project name: %1").arg(project->displayName());
+            systemPrompt += QString("\n# Active Project path: %1").arg(project->projectDirectory().toUrlishString());
+
+            QString projectRules
+                = LLMCore::RulesLoader::loadRulesForProject(project, LLMCore::RulesContext::Chat);
+
+            if (!projectRules.isEmpty()) {
+                systemPrompt += QString("\n# Project Rules\n\n") + projectRules;
+            }
+        } else {
+            systemPrompt += QString("\n# No active project in IDE");
+        }
+
         if (!linkedFiles.isEmpty()) {
             systemPrompt = getSystemPromptWithLinkedFiles(systemPrompt, linkedFiles);
         }
@@ -106,8 +162,32 @@ void ClientInterface::sendMessage(
 
     QVector<LLMCore::Message> messages;
     for (const auto &msg : m_chatModel->getChatHistory()) {
-        messages.append({msg.role == ChatModel::ChatRole::User ? "user" : "assistant", msg.content});
+        if (msg.role == ChatModel::ChatRole::Tool || msg.role == ChatModel::ChatRole::FileEdit) {
+            continue;
+        }
+        
+        LLMCore::Message apiMessage;
+        apiMessage.role = msg.role == ChatModel::ChatRole::User ? "user" : "assistant";
+        apiMessage.content = msg.content;
+        apiMessage.isThinking = (msg.role == ChatModel::ChatRole::Thinking);
+        apiMessage.isRedacted = msg.isRedacted;
+        apiMessage.signature = msg.signature;
+        
+        if (provider->supportImage() && !m_chatFilePath.isEmpty() && !msg.images.isEmpty()) {
+            auto apiImages = loadImagesFromStorage(msg.images);
+            if (!apiImages.isEmpty()) {
+                apiMessage.images = apiImages;
+            }
+        }
+        
+        messages.append(apiMessage);
     }
+    
+    if (!imageFiles.isEmpty() && !provider->supportImage()) {
+        LOG_MESSAGE(QString("Provider %1 doesn't support images, %2 ignored")
+                        .arg(provider->name(), QString::number(imageFiles.size())));
+    }
+    
     context.history = messages;
 
     LLMCore::LLMConfig config;
@@ -115,8 +195,7 @@ void ClientInterface::sendMessage(
     config.provider = provider;
     config.promptTemplate = promptTemplate;
     if (provider->providerID() == LLMCore::ProviderID::GoogleAI) {
-        QString stream = chatAssistantSettings.stream() ? QString{"streamGenerateContent?alt=sse"}
-                                                        : QString{"generateContent?"};
+        QString stream = QString{"streamGenerateContent?alt=sse"};
         config.url = QUrl(QString("%1/models/%2:%3")
                               .arg(
                                   Settings::generalSettings().caUrl(),
@@ -126,17 +205,76 @@ void ClientInterface::sendMessage(
         config.url
             = QString("%1%2").arg(Settings::generalSettings().caUrl(), provider->chatEndpoint());
         config.providerRequest
-            = {{"model", Settings::generalSettings().caModel()},
-               {"stream", chatAssistantSettings.stream()}};
+            = {{"model", Settings::generalSettings().caModel()}, {"stream", true}};
     }
 
     config.apiKey = provider->apiKey();
 
-    config.provider
-        ->prepareRequest(config.providerRequest, promptTemplate, context, LLMCore::RequestType::Chat);
+    config.provider->prepareRequest(
+        config.providerRequest,
+        promptTemplate,
+        context,
+        LLMCore::RequestType::Chat,
+        isToolsEnabled,
+        Settings::chatAssistantSettings().enableThinkingMode());
 
-    QJsonObject request{{"id", QUuid::createUuid().toString()}};
-    m_requestHandler->sendLLMRequest(config, request);
+    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);
+    connect(
+        provider,
+        &LLMCore::Provider::thinkingBlockReceived,
+        m_chatModel,
+        &ChatModel::addThinkingBlock,
+        Qt::UniqueConnection);
+    connect(
+        provider,
+        &LLMCore::Provider::redactedThinkingBlockReceived,
+        m_chatModel,
+        &ChatModel::addRedactedThinkingBlock,
+        Qt::UniqueConnection);
+
+    provider->sendRequest(requestId, config.url, config.providerRequest);
 }
 
 void ClientInterface::clearMessages()
@@ -147,24 +285,37 @@ void ClientInterface::clearMessages()
 
 void ClientInterface::cancelRequest()
 {
-    auto id = m_chatModel->lastMessageId();
-    m_requestHandler->cancelRequest(id);
+    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");
 }
 
-void ClientInterface::handleLLMResponse(
-    const QString &response, const QJsonObject &request, bool isComplete)
+void ClientInterface::handleLLMResponse(const QString &response, const QJsonObject &request)
 {
     const auto message = response.trimmed();
 
     if (!message.isEmpty()) {
         QString messageId = request["id"].toString();
         m_chatModel->addMessage(message, ChatModel::ChatRole::Assistant, messageId);
-
-        if (isComplete) {
-            LOG_MESSAGE(
-                "Message completed. Final response for message " + messageId + ": " + response);
-            emit messageReceivedCompletely();
-        }
     }
 }
 
@@ -214,4 +365,154 @@ 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);
+}
+
+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));
+    }
+
+    LOG_MESSAGE(
+        "Message completed. Final response for message " + ctx.originalRequest["id"].toString()
+        + ": " + finalText);
+    emit messageReceivedCompletely();
+
+    if (it != m_activeRequests.end()) {
+        m_activeRequests.erase(it);
+    }
+    if (m_accumulatedResponses.contains(requestId)) {
+        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);
+
+    if (it != m_activeRequests.end()) {
+        m_activeRequests.erase(it);
+    }
+    if (m_accumulatedResponses.contains(requestId)) {
+        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));
+}
+
+bool ClientInterface::isImageFile(const QString &filePath) const
+{
+    static const QSet<QString> imageExtensions = {
+        "png", "jpg", "jpeg", "gif", "webp", "bmp", "svg"
+    };
+    
+    QFileInfo fileInfo(filePath);
+    QString extension = fileInfo.suffix().toLower();
+    
+    return imageExtensions.contains(extension);
+}
+
+QString ClientInterface::getMediaTypeForImage(const QString &filePath) const
+{
+    static const QHash<QString, QString> mediaTypes = {
+        {"png", "image/png"},
+        {"jpg", "image/jpeg"},
+        {"jpeg", "image/jpeg"},
+        {"gif", "image/gif"},
+        {"webp", "image/webp"},
+        {"bmp", "image/bmp"},
+        {"svg", "image/svg+xml"}
+    };
+    
+    QFileInfo fileInfo(filePath);
+    QString extension = fileInfo.suffix().toLower();
+    
+    if (mediaTypes.contains(extension)) {
+        return mediaTypes[extension];
+    }
+    
+    QMimeDatabase mimeDb;
+    QMimeType mimeType = mimeDb.mimeTypeForFile(filePath);
+    return mimeType.name();
+}
+
+QString ClientInterface::encodeImageToBase64(const QString &filePath) const
+{
+    QFile file(filePath);
+    if (!file.open(QIODevice::ReadOnly)) {
+        LOG_MESSAGE(QString("Failed to open image file: %1").arg(filePath));
+        return QString();
+    }
+    
+    QByteArray imageData = file.readAll();
+    file.close();
+    
+    return imageData.toBase64();
+}
+
+QVector<LLMCore::ImageAttachment> ClientInterface::loadImagesFromStorage(const QList<ChatModel::ImageAttachment> &storedImages) const
+{
+    QVector<LLMCore::ImageAttachment> apiImages;
+    
+    for (const auto &storedImage : storedImages) {
+        QString base64Data = ChatSerializer::loadImageFromStorage(m_chatFilePath, storedImage.storedPath);
+        if (base64Data.isEmpty()) {
+            LOG_MESSAGE(QString("Warning: Failed to load image: %1").arg(storedImage.storedPath));
+            continue;
+        }
+        
+        LLMCore::ImageAttachment apiImage;
+        apiImage.data = base64Data;
+        apiImage.mediaType = storedImage.mediaType;
+        apiImage.isUrl = false;
+        
+        apiImages.append(apiImage);
+    }
+    
+    return apiImages;
+}
+
+void ClientInterface::setChatFilePath(const QString &filePath)
+{
+    m_chatFilePath = filePath;
+    m_chatModel->setChatFilePath(filePath);
+}
+
+QString ClientInterface::chatFilePath() const
+{
+    return m_chatFilePath;
+}
+
 } // namespace QodeAssist::Chat

ChatView/ClientInterface.hpp

@@ -24,7 +24,7 @@
 #include <QVector>
 
 #include "ChatModel.hpp"
-#include "RequestHandler.hpp"
+#include "Provider.hpp"
 #include "llmcore/IPromptProvider.hpp"
 #include <context/ContextManager.hpp>
 
@@ -42,26 +42,50 @@ public:
     void sendMessage(
         const QString &message,
         const QList<QString> &attachments = {},
-        const QList<QString> &linkedFiles = {});
+        const QList<QString> &linkedFiles = {},
+        bool useAgentMode = false);
     void clearMessages();
     void cancelRequest();
 
     Context::ContextManager *contextManager() const;
+    
+    void setChatFilePath(const QString &filePath);
+    QString chatFilePath() 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);
+    void handleLLMResponse(const QString &response, const QJsonObject &request);
     QString getCurrentFileContext() const;
     QString getSystemPromptWithLinkedFiles(
         const QString &basePrompt, const QList<QString> &linkedFiles) const;
+    bool isImageFile(const QString &filePath) const;
+    QString getMediaTypeForImage(const QString &filePath) const;
+    QString encodeImageToBase64(const QString &filePath) const;
+    QVector<LLMCore::ImageAttachment> loadImagesFromStorage(const QList<ChatModel::ImageAttachment> &storedImages) const;
+
+    struct RequestContext
+    {
+        QJsonObject originalRequest;
+        LLMCore::Provider *provider;
+    };
 
     LLMCore::IPromptProvider *m_promptProvider = nullptr;
     ChatModel *m_chatModel;
-    LLMCore::RequestHandler *m_requestHandler;
     Context::ContextManager *m_contextManager;
+    QString m_chatFilePath;
+
+    QHash<QString, RequestContext> m_activeRequests;
+    QHash<QString, QString> m_accumulatedResponses;
 };
 
 } // namespace QodeAssist::Chat

ChatView/FileItem.cpp

@@ -0,0 +1,76 @@
+/*
+ * 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 "FileItem.hpp"
+
+#include <QDesktopServices>
+#include <QUrl>
+
+#include <coreplugin/editormanager/editormanager.h>
+#include <logger/Logger.hpp>
+#include <utils/filepath.h>
+
+namespace QodeAssist::Chat {
+
+FileItem::FileItem(QQuickItem *parent)
+    : QQuickItem(parent)
+{}
+
+void FileItem::openFileInEditor()
+{
+    if (m_filePath.isEmpty()) {
+        return;
+    }
+
+    Utils::FilePath filePathObj = Utils::FilePath::fromString(m_filePath);
+    Core::IEditor *editor = Core::EditorManager::openEditor(filePathObj);
+
+    if (!editor) {
+        LOG_MESSAGE(QString("Failed to open file in editor: %1").arg(m_filePath));
+    }
+}
+
+void FileItem::openFileInExternalEditor()
+{
+    if (m_filePath.isEmpty()) {
+        return;
+    }
+
+    bool success = QDesktopServices::openUrl(QUrl::fromLocalFile(m_filePath));
+    if (success) {
+        LOG_MESSAGE(QString("Opened file in external application: %1").arg(m_filePath));
+    } else {
+        LOG_MESSAGE(QString("Failed to open file externally: %1").arg(m_filePath));
+    }
+}
+
+QString FileItem::filePath() const
+{
+    return m_filePath;
+}
+
+void FileItem::setFilePath(const QString &newFilePath)
+{
+    if (m_filePath == newFilePath)
+        return;
+    m_filePath = newFilePath;
+    emit filePathChanged();
+}
+
+} // namespace QodeAssist::Chat

ChatView/FileItem.hpp

@@ -0,0 +1,48 @@
+/*
+ * 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 <QQuickItem>
+
+namespace QodeAssist::Chat {
+
+class FileItem: public QQuickItem
+{
+    Q_OBJECT
+    QML_NAMED_ELEMENT(FileItem)
+
+    Q_PROPERTY(QString filePath READ filePath WRITE setFilePath NOTIFY filePathChanged)
+
+public:
+    FileItem(QQuickItem *parent = nullptr);
+
+    Q_INVOKABLE void openFileInEditor();
+    Q_INVOKABLE void openFileInExternalEditor();
+
+    QString filePath() const;
+    void setFilePath(const QString &newFilePath);
+
+signals:
+    void filePathChanged();
+
+private:
+    QString m_filePath;
+};
+}

ChatView/MessagePart.hpp

@@ -19,33 +19,28 @@
 
 #pragma once
 
-#include <qobject.h>
-#include <qqmlintegration.h>
+#include <QObject>
+#include <QtQmlIntegration>
+
+#include "ChatData.hpp"
 
 namespace QodeAssist::Chat {
-Q_NAMESPACE
 
 class MessagePart
 {
     Q_GADGET
-    Q_PROPERTY(PartType type MEMBER type CONSTANT FINAL)
+    Q_PROPERTY(MessagePartType type MEMBER type CONSTANT FINAL)
     Q_PROPERTY(QString text MEMBER text CONSTANT FINAL)
     Q_PROPERTY(QString language MEMBER language CONSTANT FINAL)
+    Q_PROPERTY(QString imageData MEMBER imageData CONSTANT FINAL)
+    Q_PROPERTY(QString mediaType MEMBER mediaType CONSTANT FINAL)
     QML_VALUE_TYPE(messagePart)
 public:
-    enum PartType { Code, Text };
-    Q_ENUM(PartType)
-
-    PartType type;
+    MessagePartType type;
     QString text;
     QString language;
+    QString imageData;    // Base64 data or URL
+    QString mediaType;    // e.g., "image/png", "image/jpeg"
 };
 
-class MessagePartType : public MessagePart
-{
-    Q_GADGET
-};
-
-QML_NAMED_ELEMENT(MessagePart)
-QML_FOREIGN_NAMESPACE(QodeAssist::Chat::MessagePartType)
 } // namespace QodeAssist::Chat

ChatView/icons/apply-changes-button.svg

@@ -0,0 +1,15 @@
+<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>

ChatView/icons/chat-icon.svg

@@ -0,0 +1,10 @@
+<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>

ChatView/icons/chat-pause-icon.svg

@@ -0,0 +1,10 @@
+<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>

ChatView/icons/clean-icon-dark.svg

@@ -0,0 +1,8 @@
+<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>

ChatView/icons/file-in-system.svg

@@ -0,0 +1,12 @@
+<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>

ChatView/icons/image-dark.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+  <rect x="3" y="3" width="18" height="18" rx="2" ry="2"/>
+  <circle cx="8.5" cy="8.5" r="1.5"/>
+  <polyline points="21 15 16 10 5 21"/>
+</svg>
+

ChatView/icons/load-chat-dark.svg

@@ -0,0 +1,5 @@
+<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>

ChatView/icons/open-in-editor.svg

@@ -0,0 +1,17 @@
+<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>

ChatView/icons/reject-changes-button.svg

@@ -0,0 +1,16 @@
+<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>

ChatView/icons/rules-icon.svg

@@ -0,0 +1,9 @@
+<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>

ChatView/icons/save-chat-dark.svg

@@ -0,0 +1,5 @@
+<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>

ChatView/icons/thinking-icon-off.svg

@@ -0,0 +1,4 @@
+<svg width="44" height="44" viewBox="0 0 44 44" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M14.4445 9.32233C17.7036 7.28556 21.8559 7.75441 25.8713 9.68854C27.428 9.4057 30.1744 8.91006 31.6477 9.47565C34.5351 10.5309 36.6339 12.7385 37.0285 14.9805C37.81 15.3756 38.4502 15.9932 38.8635 16.751C39.7282 18.3354 39.8498 19.9232 39.2678 21.2061C39.8159 22.277 39.9974 23.4913 39.7844 24.67C39.663 25.4561 39.3556 26.2047 38.8869 26.8555C38.4183 27.5062 37.8013 28.0419 37.0842 28.42C36.8857 28.5274 34.5887 28.6167 34.3713 28.6885C34.6443 32.2168 30.9868 33.5005 27.8889 32.6602L29.0403 36.586L26.0803 36.6885L23.8713 31.6885L21.8713 29.6885C20.125 30.1697 17.0919 30.168 15.76 28.0831C15.639 27.8916 15.5299 27.693 15.4319 27.4893C15.0931 27.5567 14.7474 27.5909 14.4016 27.5919C13.415 27.5918 11.771 27.3037 10.9358 26.7393C10.2736 26.3112 9.74862 25.7095 9.42014 25.004C7.64097 25.2413 6.13134 24.8334 5.14474 23.8262C3.8951 22.5721 3.72021 18.9738 4.37131 16.751C5.22965 13.7841 7.6818 12.9427 12.8713 11.6885C13.3214 11.1426 13.8387 9.69851 14.4445 9.32233ZM21.2551 15.0001L20.9358 16.1114L19.8723 16.4444L19.3401 15.5557L18.4895 16.3331L19.0217 17.2217L18.383 18.2217L17.2131 18.0001L17.0002 18.8887L18.0637 19.4444V20.5557L17.0002 21.1114L17.2131 22.0001L18.383 21.7774L19.0217 22.7774L18.4895 23.6671L19.3401 24.4444L19.8723 23.5557L20.9358 23.8887L21.2551 25.0001H22.7444L23.0637 23.8887L24.1272 23.5557L24.6594 24.4444L25.511 23.6671L24.9787 22.7774L25.6174 21.7774L26.7873 22.0001L27.0002 21.1114L25.9358 20.5557V19.4444L27.0002 18.8887L26.7873 18.0001L25.6174 18.2217L24.9787 17.2217L25.6174 16.4444L24.6594 15.5557L24.1272 16.4444L23.0637 16.1114L22.7444 15.0001H21.2551Z" fill="black"/>
+<path d="M6 35L38 6" stroke="black" stroke-width="4" stroke-linecap="round"/>
+</svg>

ChatView/icons/thinking-icon-on.svg

@@ -0,0 +1,3 @@
+<svg width="44" height="44" viewBox="0 0 44 44" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M14.4445 9.32233C17.7036 7.28556 21.8559 7.75441 25.8713 9.68854C27.428 9.4057 30.1744 8.91006 31.6477 9.47565C34.5351 10.5309 36.6339 12.7385 37.0285 14.9805C37.81 15.3756 38.4502 15.9932 38.8635 16.751C39.7282 18.3354 39.8498 19.9232 39.2678 21.2061C39.8159 22.277 39.9974 23.4913 39.7844 24.67C39.663 25.4561 39.3556 26.2047 38.8869 26.8555C38.4183 27.5062 37.8013 28.0419 37.0842 28.42C36.8857 28.5274 34.5887 28.6167 34.3713 28.6885C34.6443 32.2168 30.9868 33.5005 27.8889 32.6602L29.0403 36.586L26.0803 36.6885L23.8713 31.6885L21.8713 29.6885C20.125 30.1697 17.0919 30.168 15.76 28.0831C15.639 27.8916 15.5299 27.693 15.4319 27.4893C15.0931 27.5567 14.7474 27.5909 14.4016 27.5919C13.415 27.5918 11.771 27.3037 10.9358 26.7393C10.2736 26.3112 9.74862 25.7095 9.42014 25.004C7.64097 25.2413 6.13134 24.8334 5.14474 23.8262C3.8951 22.5721 3.72021 18.9738 4.37131 16.751C5.22965 13.7841 7.6818 12.9427 12.8713 11.6885C13.3214 11.1426 13.8387 9.69851 14.4445 9.32233ZM21.2551 15.0001L20.9358 16.1114L19.8723 16.4444L19.3401 15.5557L18.4895 16.3331L19.0217 17.2217L18.383 18.2217L17.2131 18.0001L17.0002 18.8887L18.0637 19.4444V20.5557L17.0002 21.1114L17.2131 22.0001L18.383 21.7774L19.0217 22.7774L18.4895 23.6671L19.3401 24.4444L19.8723 23.5557L20.9358 23.8887L21.2551 25.0001H22.7444L23.0637 23.8887L24.1272 23.5557L24.6594 24.4444L25.511 23.6671L24.9787 22.7774L25.6174 21.7774L26.7873 22.0001L27.0002 21.1114L25.9358 20.5557V19.4444L27.0002 18.8887L26.7873 18.0001L25.6174 18.2217L24.9787 17.2217L25.6174 16.4444L24.6594 15.5557L24.1272 16.4444L23.0637 16.1114L22.7444 15.0001H21.2551Z" fill="black"/>
+</svg>

ChatView/icons/undo-changes-button.svg

@@ -0,0 +1,16 @@
+<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>

ChatView/icons/window-lock.svg

@@ -0,0 +1,5 @@
+<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>

ChatView/icons/window-unlock.svg

@@ -0,0 +1,5 @@
+<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>

ChatView/qml/RootItem.qml

@@ -22,8 +22,10 @@ import QtQuick.Controls
 import QtQuick.Controls.Basic as QQC
 import QtQuick.Layouts
 import ChatView
-import "./controls"
-import "./parts"
+import UIControls
+import Qt.labs.platform as Platform
+
+import "./chatparts"
 
 ChatRootView {
     id: root
@@ -56,6 +58,24 @@ ChatRootView {
         color: palette.window
     }
 
+    SplitDropZone {
+        anchors.fill: parent
+
+        onFilesDroppedToAttach: (urlStrings) => {
+            var localPaths = root.convertUrlsToLocalPaths(urlStrings)
+            if (localPaths.length > 0) {
+                root.addFilesToAttachList(localPaths)
+            }
+        }
+
+        onFilesDroppedToLink: (urlStrings) => {
+            var localPaths = root.convertUrlsToLocalPaths(urlStrings)
+            if (localPaths.length > 0) {
+                root.addFilesToLinkList(localPaths)
+            }
+        }
+    }
+
     ColumnLayout {
         anchors.fill: parent
         spacing: 0
@@ -64,52 +84,92 @@ ChatRootView {
             id: topBar
 
             Layout.preferredWidth: parent.width
-            Layout.preferredHeight: 40
+            Layout.preferredHeight: childrenRect.height + 10
 
             saveButton.onClicked: root.showSaveDialog()
             loadButton.onClicked: root.showLoadDialog()
             clearButton.onClicked: root.clearChat()
             tokensBadge {
-                text: qsTr("tokens:%1/%2").arg(root.inputTokensCount).arg(root.chatModel.tokensThreshold)
+                text: qsTr("%1/%2").arg(root.inputTokensCount).arg(root.chatModel.tokensThreshold)
             }
             recentPath {
-                text: qsTr("Latest chat file name: %1").arg(root.chatFileName.length > 0 ? root.chatFileName : "Unsaved")
+                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
+                }
+            }
+            thinkingMode {
+                checked: root.isThinkingMode
+                enabled: root.isThinkingSupport
+                onCheckedChanged: {
+                    root.isThinkingMode = thinkingMode.checked
+                }
+            }
+            configSelector {
+                model: root.availableConfigurations
+                displayText: root.currentConfiguration
+                onActivated: function(index) {
+                    if (index > 0) {
+                        root.applyConfiguration(root.availableConfigurations[index])
+                    }
+                }
+                
+                popup.onAboutToShow: {
+                    root.loadAvailableConfigurations()
+                }
+            }
         }
 
         ListView {
             id: chatListView
 
+            signal hideServiceComponents(int itemIndex)
+
             Layout.fillWidth: true
             Layout.fillHeight: true
             leftMargin: 5
             model: root.chatModel
             clip: true
-            spacing: 10
+            spacing: 0
             boundsBehavior: Flickable.StopAtBounds
             cacheBuffer: 2000
 
-            delegate: ChatItem {
+            delegate: Loader {
+                id: componentLoader
+
                 required property var model
                 required property int index
 
                 width: ListView.view.width - scroll.width
-                msgModel: root.chatModel.processMessageContent(model.content)
-                messageAttachments: model.attachments
-                isUserMessage: model.roleType === ChatModel.User
-                messageIndex: index
-                listViewContentY: chatListView.contentY
-                textFontFamily: root.textFontFamily
-                codeFontFamily: root.codeFontFamily
-                codeFontSize: root.codeFontSize
-                textFontSize: root.textFontSize
-                textFormat: root.textFormat
 
-                onResetChatToMessage: function(index) {
-                    messageInput.text = model.content
-                    messageInput.cursorPosition = model.content.length
-                    root.chatModel.resetModelTo(index)
+                sourceComponent: {
+                    if (model.roleType === ChatModel.Tool) {
+                        return toolMessageComponent
+                    } else if (model.roleType === ChatModel.FileEdit) {
+                        return fileEditMessageComponent
+                    } else if (model.roleType === ChatModel.Thinking) {
+                        return thinkingMessageComponent
+                    } else {
+                        return chatItemComponent
+                    }
+                }
+
+                onLoaded: {
+                    if (componentLoader.sourceComponent == chatItemComponent) {
+                        chatListView.hideServiceComponents(index)
+                    }
                 }
             }
 
@@ -131,6 +191,106 @@ ChatRootView {
                     root.scrollToBottom()
                 }
             }
+
+            Component {
+                id: chatItemComponent
+
+                ChatItem {
+                    id: chatItemInstance
+
+                    width: parent.width
+                    msgModel: root.chatModel.processMessageContent(model.content)
+                    messageAttachments: model.attachments
+                    messageImages: model.images
+                    chatFilePath: root.chatFilePath()
+                    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
+
+                ToolBlock {
+                    id: toolsItem
+
+                    width: parent.width
+                    toolContent: model.content
+
+                    Connections {
+                        target: chatListView
+                        function onHideServiceComponents(itemIndex) {
+                            if (index !== itemIndex) {
+                                toolsItem.headerOpacity = 0.5
+                            }
+                        }
+                    }
+                }
+            }
+
+            Component {
+                id: fileEditMessageComponent
+
+                FileEditBlock {
+                    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)
+                    }
+                }
+            }
+
+            Component {
+                id: thinkingMessageComponent
+
+                ThinkingBlock {
+                    id: thinking
+
+                    width: parent.width
+                    thinkingContent: {
+                        let content = model.content
+                        let signatureStart = content.indexOf("\n[Signature:")
+                        if (signatureStart >= 0) {
+                            return content.substring(0, signatureStart)
+                        }
+                        return content
+                    }
+                    isRedacted: model.isRedacted !== undefined ? model.isRedacted : false
+
+                    Connections {
+                        target: chatListView
+                        function onHideServiceComponents(itemIndex) {
+                            if (index !== itemIndex) {
+                                thinking.headerOpacity = 0.5
+                            }
+                        }
+                    }
+                }
+            }
         }
 
         ScrollView {
@@ -143,7 +303,9 @@ ChatRootView {
             QQC.TextArea {
                 id: messageInput
 
-                placeholderText: qsTr("Type your message here...")
+                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
                 background: Rectangle {
@@ -166,15 +328,53 @@ ChatRootView {
 
                 onTextChanged: root.calculateMessageTokensCount(messageInput.text)
 
-                Keys.onPressed: function(event) {
-                    if ((event.key === Qt.Key_Return || event.key === Qt.Key_Enter) && !(event.modifiers & Qt.ShiftModifier)) {
-                        root.sendChatMessage()
-                        event.accepted = true;
-                    }
+                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
 
@@ -197,23 +397,53 @@ ChatRootView {
             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.sendChatMessage()
-            stopButton.onClicked: root.cancelRequest()
+            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)
             }
             attachFiles.onClicked: root.showAttachFilesDialog()
+            attachImages.onClicked: root.showAddImageDialog()
             linkFiles.onClicked: root.showLinkFilesDialog()
         }
     }
 
+    Shortcut {
+        id: sendMessageShortcut
+
+        sequences: ["Ctrl+Return", "Ctrl+Enter"]
+        context: Qt.WindowShortcut
+        onActivated: {
+            if (messageInput.activeFocus && !Qt.inputMethod.visible) {
+                root.sendChatMessage()
+            }
+        }
+    }
+
     function clearChat() {
         root.chatModel.clear()
         root.clearAttachmentFiles()
@@ -229,4 +459,55 @@ ChatRootView {
         messageInput.text = ""
         scrollToBottom()
     }
+
+    Toast {
+        id: errorToast
+        z: 1000
+
+        color: Qt.rgba(0.8, 0.2, 0.2, 0.9)
+        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.9)
+        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()
+    }
 }

ChatView/qml/chatparts/ChatItem.qml

@@ -19,14 +19,17 @@
 
 import QtQuick
 import ChatView
+import QtQuick.Controls
 import QtQuick.Layouts
-import "./dialog"
+import UIControls
 
 Rectangle {
     id: root
 
     property alias msgModel: msgCreator.model
     property alias messageAttachments: attachmentsModel.model
+    property alias messageImages: imagesModel.model
+    property string chatFilePath: ""
     property string textFontFamily: Qt.application.font.family
     property string codeFontFamily: {
         switch (Qt.platform.os) {
@@ -46,7 +49,6 @@ Rectangle {
 
     property bool isUserMessage: false
     property int messageIndex: -1
-    property real listViewContentY: 0
 
     signal resetChatToMessage(int index)
 
@@ -85,8 +87,8 @@ Rectangle {
                     }
 
                     switch(modelData.type) {
-                        case MessagePart.Text: return textComponent;
-                        case MessagePart.Code: return codeBlockComponent;
+                        case MessagePartType.Text: return textComponent;
+                        case MessagePartType.Code: return codeBlockComponent;
                         default: return textComponent;
                     }
                 }
@@ -102,8 +104,6 @@ Rectangle {
                     id: codeBlockComponent
                     CodeBlockComponent {
                         itemData: msgCreatorDelegate.modelData
-                        blockStart: root.y + msgCreatorDelegate.y
-                        currentContentY: root.listViewContentY
                     }
                 }
             }
@@ -142,6 +142,27 @@ Rectangle {
                 }
             }
         }
+
+        Flow {
+            id: imagesFlow
+
+            Layout.fillWidth: true
+            visible: imagesModel.model && imagesModel.model.length > 0
+            leftPadding: 10
+            rightPadding: 10
+            spacing: 10
+
+            Repeater {
+                id: imagesModel
+
+                delegate: ImageComponent {
+                    required property int index
+                    required property var modelData
+
+                    itemData: modelData
+                }
+            }
+        }
     }
 
     Rectangle {
@@ -163,11 +184,18 @@ Rectangle {
             top: parent.top
         }
 
-        text: qsTr("ResetTo")
+        icon {
+            source: "qrc:/qt/qml/ChatView/icons/undo-changes-button.svg"
+            height: 15
+            width: 15
+        }
         visible: root.isUserMessage && mouse.hovered
         onClicked: function() {
             root.resetChatToMessage(root.messageIndex)
         }
+        ToolTip.visible: hovered
+        ToolTip.text: qsTr("Reset chat to this message and edit")
+        ToolTip.delay: 500
     }
 
     component TextComponent : TextBlock {
@@ -210,4 +238,64 @@ Rectangle {
         codeFontFamily: root.codeFontFamily
         codeFontSize: root.codeFontSize
     }
+
+    component ImageComponent : Rectangle {
+        required property var itemData
+
+        readonly property int maxImageWidth: Math.min(400, root.width - 40)
+        readonly property int maxImageHeight: 300
+
+        width: Math.min(imageDisplay.implicitWidth, maxImageWidth) + 16
+        height: imageDisplay.implicitHeight + fileNameText.implicitHeight + 16
+        radius: 4
+        color: palette.base
+        border.width: 1
+        border.color: palette.mid
+
+        ColumnLayout {
+            anchors.fill: parent
+            anchors.margins: 8
+            spacing: 4
+
+            Image {
+                id: imageDisplay
+                Layout.alignment: Qt.AlignHCenter
+                Layout.maximumWidth: parent.parent.maxImageWidth
+                Layout.maximumHeight: parent.parent.maxImageHeight
+
+                source: itemData.imageUrl ? itemData.imageUrl : ""
+
+                sourceSize.width: parent.parent.maxImageWidth
+                sourceSize.height: parent.parent.maxImageHeight
+                fillMode: Image.PreserveAspectFit
+                cache: true
+                asynchronous: true
+                smooth: true
+                mipmap: true
+
+                BusyIndicator {
+                    anchors.centerIn: parent
+                    running: imageDisplay.status === Image.Loading
+                    visible: running
+                }
+
+                Text {
+                    anchors.centerIn: parent
+                    text: qsTr("Failed to load image")
+                    visible: imageDisplay.status === Image.Error
+                    color: palette.placeholderText
+                }
+            }
+
+            Text {
+                id: fileNameText
+                Layout.fillWidth: true
+                text: itemData.fileName || ""
+                color: palette.text
+                font.pointSize: root.textFontSize - 1
+                elide: Text.ElideMiddle
+                horizontalAlignment: Text.AlignHCenter
+            }
+        }
+    }
 }

ChatView/qml/chatparts/CodeBlock.qml

@@ -0,0 +1,173 @@
+/*
+ * 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 ChatView
+import UIControls
+import Qt.labs.platform as Platform
+
+Rectangle {
+    id: root
+
+    property string code: ""
+    property string language: ""
+    property bool expanded: false
+
+    property alias codeFontFamily: codeText.font.family
+    property alias codeFontSize: codeText.font.pointSize
+    readonly property real collapsedHeight: copyButton.height + 10
+
+    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 }
+    }
+
+    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
+        }
+        text: root.code
+        readOnly: true
+        selectByMouse: true
+        color: parent.color.hslLightness > 0.5 ? "black" : "white"
+        wrapMode: Text.WordWrap
+        selectionColor: palette.highlight
+
+        MouseArea {
+            anchors.fill: parent
+            acceptedButtons: Qt.RightButton
+            onClicked: contextMenu.open()
+        }
+    }
+
+    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
+
+        anchors.right: parent.right
+        anchors.rightMargin: 5
+
+        y: 5
+        text: qsTr("Copy")
+
+        onClicked: {
+            utils.copyToClipboard(root.code)
+            text = qsTr("Copied")
+            copyTimer.start()
+        }
+
+        Timer {
+            id: copyTimer
+            interval: 2000
+            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
+            }
+        }
+    ]
+}

ChatView/qml/chatparts/FileEditBlock.qml

@@ -0,0 +1,469 @@
+/*
+ * 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
+import ChatView
+import Qt.labs.platform as Platform
+
+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
+
+    ChatUtils {
+        id: utils
+    }
+
+    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
+
+                    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
+
+                        MouseArea {
+                            anchors.fill: parent
+                            acceptedButtons: Qt.RightButton
+                            onClicked: oldConentContextMenu.open()
+                        }
+                    }
+
+                    Platform.Menu {
+                        id: oldConentContextMenu
+
+                        Platform.MenuItem {
+                            text: qsTr("Copy")
+                            onTriggered: {
+                                const textToCopy = oldContentText.selectedText || root.oldContent
+                                utils.copyToClipboard(textToCopy)
+                            }
+                        }
+
+                        Platform.MenuSeparator {}
+
+                        Platform.MenuItem {
+                            text: fileEditView.expanded ? qsTr("Collapse") : qsTr("Expand")
+                            onTriggered: fileEditView.expanded = !fileEditView.expanded
+                        }
+                    }
+                }
+            }
+
+            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
+
+                    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
+
+                        MouseArea {
+                            anchors.fill: parent
+                            acceptedButtons: Qt.RightButton
+                            onClicked: newContentContextMenu.open()
+                        }
+                    }
+
+                    Platform.Menu {
+                        id: newContentContextMenu
+
+                        Platform.MenuItem {
+                            text: qsTr("Copy")
+                            onTriggered: {
+                                const textToCopy = newContentText.selectedText || root.newContent
+                                utils.copyToClipboard(textToCopy)
+                            }
+                        }
+
+                        Platform.MenuSeparator {}
+
+                        Platform.MenuItem {
+                            text: fileEditView.expanded ? qsTr("Collapse") : qsTr("Expand")
+                            onTriggered: fileEditView.expanded = !fileEditView.expanded
+                        }
+                    }
+                }
+            }
+
+            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
+            }
+        }
+    }
+}

ChatView/qml/chatparts/TextBlock.qml

@@ -0,0 +1,56 @@
+/*
+ * 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 Qt.labs.platform as Platform
+
+TextEdit {
+    id: root
+
+    readOnly: true
+    selectByMouse: true
+    wrapMode: Text.WordWrap
+    selectionColor: palette.highlight
+    color: palette.text
+
+    onLinkActivated: (link) => Qt.openUrlExternally(link)
+
+    MouseArea {
+        anchors.fill: parent
+        acceptedButtons: Qt.RightButton
+        onClicked: contextMenu.open()
+        cursorShape: root.hoveredLink ? Qt.PointingHandCursor : Qt.IBeamCursor
+    }
+
+    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()
+        }
+    }
+}

ChatView/qml/chatparts/ThinkingBlock.qml

@@ -0,0 +1,183 @@
+/*
+ * 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 thinkingContent: ""
+    // property string signature: ""
+    property bool isRedacted: false
+    property bool expanded: false
+    
+    property alias headerOpacity: headerRow.opacity
+
+    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: root.isRedacted ? qsTr("Thinking (Redacted)")
+                                      : qsTr("Thinking")
+                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
+
+        Text {
+            visible: root.isRedacted
+            width: parent.width
+            text: qsTr("Thinking content was redacted by safety systems")
+            font.pixelSize: 11
+            font.italic: true
+            color: Qt.rgba(0.8, 0.4, 0.4, 1.0)
+            wrapMode: Text.WordWrap
+        }
+
+        TextEdit {
+            id: thinkingText
+
+            visible: !root.isRedacted
+            width: parent.width
+            text: root.thinkingContent
+            readOnly: true
+            selectByMouse: true
+            color: palette.text
+            wrapMode: Text.WordWrap
+            font.family: "monospace"
+            font.pixelSize: 11
+            selectionColor: palette.highlight
+        }
+
+        // Rectangle {
+        //     visible: root.signature.length > 0 && root.expanded
+        //     width: parent.width
+        //     height: signatureText.height + 10
+        //     color: palette.alternateBase
+        //     radius: 4
+
+        //     Text {
+        //         id: signatureText
+
+        //         anchors {
+        //             left: parent.left
+        //             right: parent.right
+        //             verticalCenter: parent.verticalCenter
+        //             margins: 5
+        //         }
+        //         text: qsTr("Signature: %1").arg(root.signature.substring(0, Math.min(40, root.signature.length)) + "...")
+        //         font.pixelSize: 9
+        //         font.family: "monospace"
+        //         color: palette.mid
+        //         elide: Text.ElideRight
+        //     }
+        // }
+    }
+
+    MouseArea {
+        anchors.fill: parent
+        acceptedButtons: Qt.RightButton
+        onClicked: contextMenu.open()
+        propagateComposedEvents: true
+    }
+
+    Platform.Menu {
+        id: contextMenu
+
+        Platform.MenuItem {
+            text: root.expanded ? qsTr("Collapse") : qsTr("Expand")
+            onTriggered: root.expanded = !root.expanded
+        }
+    }
+
+    Rectangle {
+        id: thinkingMarker
+
+        anchors.verticalCenter: parent.verticalCenter
+        width: 3
+        height: root.height - root.radius
+        color: root.isRedacted ? Qt.rgba(0.8, 0.3, 0.3, 0.9)
+                               : (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
+            }
+        }
+    ]
+}
+

ChatView/qml/chatparts/ToolBlock.qml

@@ -0,0 +1,162 @@
+/*
+ * 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
+
+    property alias headerOpacity: headerRow.opacity
+
+    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
+            }
+        }
+    ]
+}

ChatView/qml/controls/AttachedFilesPlace.qml

@@ -40,19 +40,68 @@ Flow {
     Repeater {
         id: attachRepeater
         
-        delegate: Rectangle {
+        delegate: FileItem {
+            id: fileItem
+
             required property int index
             required property string modelData
+
+            filePath: modelData
             
             height: 30
             width: contentRow.width + 10
-            radius: 4
-            color: palette.button
-            border.width: 1
-            border.color: mouse.hovered ? palette.highlight : root.accentColor
 
-            HoverHandler {
+            Rectangle {
+                anchors.fill: parent
+                radius: 4
+                color: palette.button
+                border.width: 1
+                border.color: mouse.containsMouse ? palette.highlight : root.accentColor
+            }
+
+            MouseArea {
                 id: mouse
+
+                anchors.fill: parent
+                hoverEnabled: true
+                acceptedButtons: Qt.LeftButton | Qt.MiddleButton | Qt.RightButton
+                onClicked: (mouse) => {
+                    if (mouse.button === Qt.RightButton) {
+                        contextMenu.popup()
+                    } else if (mouse.button === Qt.MiddleButton ||
+                        (mouse.button === Qt.LeftButton && (mouse.modifiers & Qt.ControlModifier))) {
+                        root.removeFileFromListByIndex(fileItem.index)
+                    } else if (mouse.modifiers & Qt.ShiftModifier) {
+                        fileItem.openFileInExternalEditor()
+                    } else {
+                        fileItem.openFileInEditor()
+                    }
+                }
+
+                ToolTip.visible: containsMouse
+                ToolTip.delay: 500
+                ToolTip.text: "Click: Open in Qt Creator\nShift+Click: Open in external editor\nCtrl+Click / Middle Click: Remove"
+            }
+
+            Menu {
+                id: contextMenu
+
+                MenuItem {
+                    text: "Open in Qt Creator"
+                    onTriggered: fileItem.openFileInEditor()
+                }
+
+                MenuItem {
+                    text: "Open in External Editor"
+                    onTriggered: fileItem.openFileInExternalEditor()
+                }
+
+                MenuSeparator {}
+
+                MenuItem {
+                    text: "Remove"
+                    onTriggered: root.removeFileFromListByIndex(fileItem.index)
+                }
             }
             
             Row {

ChatView/qml/controls/BottomBar.qml

@@ -21,14 +21,15 @@ import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
 import ChatView
+import UIControls
 
 Rectangle {
     id: root
 
     property alias sendButton: sendButtonId
-    property alias stopButton: stopButtonId
     property alias syncOpenFiles: syncOpenFilesId
     property alias attachFiles: attachFilesId
+    property alias attachImages: attachImagesId
     property alias linkFiles: linkFilesId
 
     color: palette.window.hslLightness > 0.5 ?
@@ -51,13 +52,12 @@ Rectangle {
         QoAButton {
             id: sendButtonId
 
-            text: qsTr("Send")
-        }
-
-        QoAButton {
-            id: stopButtonId
-
-            text: qsTr("Stop")
+            icon {
+                height: 15
+                width: 15
+            }
+            ToolTip.visible: hovered
+            ToolTip.delay: 250
         }
 
         QoAButton {
@@ -68,7 +68,22 @@ Rectangle {
                 height: 15
                 width: 8
             }
-            text: qsTr("Attach files")
+            ToolTip.visible: hovered
+            ToolTip.delay: 250
+            ToolTip.text: qsTr("Attach file to message")
+        }
+
+        QoAButton {
+            id: attachImagesId
+
+            icon {
+                source: "qrc:/qt/qml/ChatView/icons/image-dark.svg"
+                height: 15
+                width: 15
+            }
+            ToolTip.visible: hovered
+            ToolTip.delay: 250
+            ToolTip.text: qsTr("Attach image to message")
         }
 
         QoAButton {
@@ -79,7 +94,9 @@ Rectangle {
                 height: 15
                 width: 8
             }
-            text: qsTr("Link files")
+            ToolTip.visible: hovered
+            ToolTip.delay: 250
+            ToolTip.text: qsTr("Link file to context")
         }
 
         CheckBox {

ChatView/qml/controls/FileEditsActionBar.qml

@@ -0,0 +1,161 @@
+/*
+ * 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()
+        }
+    }
+}
+

ChatView/qml/controls/RulesViewer.qml

@@ -0,0 +1,251 @@
+/*
+ * 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
+
+                        TextEdit {
+                            id: ruleContentArea
+
+                            readOnly: true
+                            selectByMouse: true
+                            wrapMode: Text.WordWrap
+                            selectionColor: palette.highlight
+                            color: palette.text
+                            font.family: "monospace"
+                            font.pixelSize: 11
+                        }
+                    }
+                }
+            }
+        }
+
+        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
+        }
+    }
+}

ChatView/qml/controls/SplitDropZone.qml

@@ -0,0 +1,235 @@
+/*
+ * 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
+
+Item {
+    id: root
+
+    signal filesDroppedToAttach(var urlStrings)  // Array of URL strings (file://...)
+    signal filesDroppedToLink(var urlStrings)    // Array of URL strings (file://...)
+
+    property string activeZone: ""
+
+    Item {
+        id: splitDropOverlay
+
+        anchors.fill: parent
+        visible: false
+        z: 999
+
+        Rectangle {
+            anchors.fill: parent
+            color: Qt.rgba(palette.shadow.r, palette.shadow.g, palette.shadow.b, 0.6)
+        }
+
+        Rectangle {
+            id: leftZone
+
+            anchors {
+                left: parent.left
+                top: parent.top
+                bottom: parent.bottom
+            }
+            width: parent.width / 2
+            color: root.activeZone === "left"
+                   ? Qt.rgba(palette.highlight.r, palette.highlight.g, palette.highlight.b, 0.3)
+                   : Qt.rgba(palette.mid.r, palette.mid.g, palette.mid.b, 0.15)
+            border.width: root.activeZone === "left" ? 3 : 2
+            border.color: root.activeZone === "left"
+                          ? palette.highlight
+                          : Qt.rgba(palette.mid.r, palette.mid.g, palette.mid.b, 0.5)
+
+            Column {
+                anchors.centerIn: parent
+                spacing: 15
+
+                Text {
+                    anchors.horizontalCenter: parent.horizontalCenter
+                    text: qsTr("Attach")
+                    font.pixelSize: 24
+                    font.bold: true
+                    color: root.activeZone === "left" ? palette.highlightedText : palette.text
+                }
+
+                Text {
+                    anchors.horizontalCenter: parent.horizontalCenter
+                    text: qsTr("Images & Text Files")
+                    font.pixelSize: 14
+                    color: root.activeZone === "left" ? palette.highlightedText : palette.text
+                    opacity: 0.8
+                }
+            }
+
+            Behavior on color {
+                ColorAnimation { duration: 150 }
+            }
+            
+            Behavior on border.width {
+                NumberAnimation { duration: 150 }
+            }
+            
+            Behavior on border.color {
+                ColorAnimation { duration: 150 }
+            }
+        }
+
+        Rectangle {
+            id: rightZone
+
+            anchors {
+                right: parent.right
+                top: parent.top
+                bottom: parent.bottom
+            }
+            width: parent.width / 2
+            color: root.activeZone === "right"
+                   ? Qt.rgba(palette.highlight.r, palette.highlight.g, palette.highlight.b, 0.3)
+                   : Qt.rgba(palette.mid.r, palette.mid.g, palette.mid.b, 0.15)
+            border.width: root.activeZone === "right" ? 3 : 2
+            border.color: root.activeZone === "right"
+                          ? palette.highlight
+                          : Qt.rgba(palette.mid.r, palette.mid.g, palette.mid.b, 0.5)
+
+            Column {
+                anchors.centerIn: parent
+                spacing: 15
+
+                Text {
+                    anchors.horizontalCenter: parent.horizontalCenter
+                    text: qsTr("LINK")
+                    font.pixelSize: 24
+                    font.bold: true
+                    color: root.activeZone === "right" ? palette.highlightedText : palette.text
+                }
+
+                Text {
+                    anchors.horizontalCenter: parent.horizontalCenter
+                    text: qsTr("Text Files")
+                    font.pixelSize: 14
+                    color: root.activeZone === "right" ? palette.highlightedText : palette.text
+                    opacity: 0.8
+                }
+            }
+
+            Behavior on color {
+                ColorAnimation { duration: 150 }
+            }
+            
+            Behavior on border.width {
+                NumberAnimation { duration: 150 }
+            }
+            
+            Behavior on border.color {
+                ColorAnimation { duration: 150 }
+            }
+        }
+
+        Rectangle {
+            anchors {
+                horizontalCenter: parent.horizontalCenter
+                top: parent.top
+                bottom: parent.bottom
+            }
+            width: 2
+            color: palette.mid
+            opacity: 0.4
+        }
+
+        MouseArea {
+            id: leftDropArea
+
+            anchors {
+                left: parent.left
+                top: parent.top
+                bottom: parent.bottom
+            }
+            width: parent.width / 2
+            hoverEnabled: true
+
+            onEntered: {
+                root.activeZone = "left"
+            }
+        }
+
+        MouseArea {
+            id: rightDropArea
+
+            anchors {
+                right: parent.right
+                top: parent.top
+                bottom: parent.bottom
+            }
+            width: parent.width / 2
+            hoverEnabled: true
+
+            onEntered: {
+                root.activeZone = "right"
+            }
+        }
+    }
+
+    DropArea {
+        id: globalDropArea
+
+        anchors.fill: parent
+        
+        onEntered: (drag) => {
+                       if (drag.hasUrls) {
+                           splitDropOverlay.visible = true
+                           root.activeZone = ""
+                       }
+                   }
+
+        onExited: {
+            splitDropOverlay.visible = false
+            root.activeZone = ""
+        }
+
+        onPositionChanged: (drag) => {
+                               if (drag.x < globalDropArea.width / 2) {
+                                   root.activeZone = "left"
+                               } else {
+                                   root.activeZone = "right"
+                               }
+                           }
+
+        onDropped: (drop) => {
+                       var targetZone = root.activeZone
+                       splitDropOverlay.visible = false
+                       root.activeZone = ""
+
+                       if (drop.hasUrls && drop.urls.length > 0) {
+                           // Convert URLs to array of strings for C++ processing
+                           var urlStrings = []
+                           for (var i = 0; i < drop.urls.length; i++) {
+                               urlStrings.push(drop.urls[i].toString())
+                           }
+                           
+                           if (targetZone === "right") {
+                               root.filesDroppedToLink(urlStrings)
+                           } else {
+                               root.filesDroppedToAttach(urlStrings)
+                           }
+                       }
+                   }
+    }
+}
+

ChatView/qml/controls/Toast.qml

@@ -0,0 +1,103 @@
+/*
+ * 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: 7000
+
+    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()
+    }
+}

ChatView/qml/controls/TopBar.qml

@@ -0,0 +1,255 @@
+/*
+ * 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 thinkingMode: thinkingModeId
+    property alias activeRulesCount: activeRulesCountId.text
+    property alias configSelector: configSelectorId
+
+    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
+
+        Row {
+            height: agentModeSwitchId.height
+            spacing: 10
+
+            QoAButton {
+                id: pinButtonId
+
+                anchors.verticalCenter: parent.verticalCenter
+                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
+
+                anchors.verticalCenter: parent.verticalCenter
+
+                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")
+                }
+            }
+
+            QoAButton {
+                id: thinkingModeId
+
+                anchors.verticalCenter: parent.verticalCenter
+
+                checkable: true
+                opacity: enabled ? 1.0 : 0.2
+
+                icon {
+                    source: checked ? "qrc:/qt/qml/ChatView/icons/thinking-icon-on.svg"
+                                    : "qrc:/qt/qml/ChatView/icons/thinking-icon-off.svg"
+                    color: palette.window.hslLightness > 0.5 ? "#000000" : "#FFFFFF"
+                    height: 15
+                    width: 15
+                }
+
+                ToolTip.visible: hovered
+                ToolTip.delay: 250
+                ToolTip.text: enabled ? (checked ? qsTr("Thinking Mode enabled (Check model list support it)")
+                                                 : qsTr("Thinking Mode disabled"))
+                                      : qsTr("Thinking Mode is not available for this provider")
+            }
+        }
+
+        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")
+            }
+
+            QoAComboBox {
+                id: configSelectorId
+
+                model: []
+                currentIndex: 0
+
+                ToolTip.visible: hovered
+                ToolTip.delay: 250
+                ToolTip.text: qsTr("Switch AI configuration")
+            }
+        }
+    }
+}

ChatView/qml/dialog/CodeBlock.qml

@@ -1,110 +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 ChatView
-
-Rectangle {
-    id: root
-
-    property string code: ""
-    property string language: ""
-
-    property real currentContentY: 0
-    property real blockStart: 0
-
-    property alias codeFontFamily: codeText.font.family
-    property alias codeFontSize: codeText.font.pointSize
-
-    readonly property real buttonTopMargin: 5
-    readonly property real blockEnd: blockStart + root.height
-    readonly property real maxButtonOffset: Math.max(0, root.height - copyButton.height - buttonTopMargin)
-
-    readonly property real buttonPosition: {
-        if (currentContentY > blockEnd) {
-            return buttonTopMargin;
-        }
-        else if (currentContentY > blockStart) {
-            let offset = currentContentY - blockStart;
-            return Math.min(offset, maxButtonOffset);
-        }
-        return buttonTopMargin;
-    }
-
-    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
-    implicitHeight: codeText.implicitHeight + 20
-
-    ChatUtils {
-        id: utils
-    }
-
-    TextEdit {
-        id: codeText
-        anchors.fill: parent
-        anchors.margins: 10
-        text: root.code
-        readOnly: true
-        selectByMouse: true
-        color: parent.color.hslLightness > 0.5 ? "black" : "white"
-        wrapMode: Text.WordWrap
-        selectionColor: palette.highlight
-    }
-
-    TextEdit {
-        anchors.top: parent.top
-        anchors.right: parent.right
-        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: codeText.font.pointSize - 4
-    }
-
-    QoAButton {
-        id: copyButton
-
-        anchors {
-            top: parent.top
-            topMargin: root.buttonPosition
-            right: parent.right
-            rightMargin: root.buttonTopMargin
-        }
-
-        text: qsTr("Copy")
-        onClicked: {
-            utils.copyToClipboard(root.code)
-            text = qsTr("Copied")
-            copyTimer.start()
-        }
-
-        Timer {
-            id: copyTimer
-            interval: 2000
-            onTriggered: parent.text = qsTr("Copy")
-        }
-    }
-}

ChatView/qml/parts/TopBar.qml

@@ -1,88 +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 ChatView
-
-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
-
-    color: palette.window.hslLightness > 0.5 ?
-               Qt.darker(palette.window, 1.1) :
-               Qt.lighter(palette.window, 1.1)
-
-    RowLayout {
-        anchors {
-            left: parent.left
-            leftMargin: 5
-            right: parent.right
-            rightMargin: 5
-            verticalCenter: parent.verticalCenter
-        }
-
-        spacing: 10
-
-        QoAButton {
-            id: saveButtonId
-
-            text: qsTr("Save")
-        }
-
-        QoAButton {
-            id: loadButtonId
-
-            text: qsTr("Load")
-        }
-
-        QoAButton {
-            id: clearButtonId
-
-            text: qsTr("Clear")
-        }
-
-        Text {
-            id: recentPathId
-
-            elide: Text.ElideMiddle
-            color: palette.text
-        }
-
-        QoAButton {
-            id: openChatHistoryId
-
-            text: qsTr("Show in system")
-        }
-
-        Item {
-            Layout.fillWidth: true
-        }
-
-        Badge {
-            id: tokensBadgeId
-        }
-    }
-}

CodeHandler.cpp

@@ -99,6 +99,19 @@ const QVector<LanguageProperties> &getKnownLanguages()
     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;

CodeHandler.hpp

@@ -40,6 +40,11 @@ public:
      */
     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);
 

ConfigurationManager.cpp

@@ -1,5 +1,5 @@
-/* 
- * Copyright (C) 2024-2025 Petr Mironychev
+/*
+ * Copyright (C) 2025 Petr Mironychev
  *
  * This file is part of QodeAssist.
  *
@@ -51,6 +51,8 @@ void ConfigurationManager::updateTemplateDescription(const Utils::StringAspect &
         m_generalSettings.ccTemplateDescription.setValue(templ->description());
     } else if (&templateAspect == &m_generalSettings.caTemplate) {
         m_generalSettings.caTemplateDescription.setValue(templ->description());
+    } else if (&templateAspect == &m_generalSettings.qrTemplate) {
+        m_generalSettings.qrTemplateDescription.setValue(templ->description());
     }
 }
 
@@ -58,6 +60,7 @@ void ConfigurationManager::updateAllTemplateDescriptions()
 {
     updateTemplateDescription(m_generalSettings.ccTemplate);
     updateTemplateDescription(m_generalSettings.caTemplate);
+    updateTemplateDescription(m_generalSettings.qrTemplate);
 }
 
 void ConfigurationManager::checkTemplate(const Utils::StringAspect &templateAspect)
@@ -94,12 +97,16 @@ void ConfigurationManager::setupConnections()
 
     connect(&m_generalSettings.ccSelectProvider, &Button::clicked, this, &Config::selectProvider);
     connect(&m_generalSettings.caSelectProvider, &Button::clicked, this, &Config::selectProvider);
+    connect(&m_generalSettings.qrSelectProvider, &Button::clicked, this, &Config::selectProvider);
     connect(&m_generalSettings.ccSelectModel, &Button::clicked, this, &Config::selectModel);
     connect(&m_generalSettings.caSelectModel, &Button::clicked, this, &Config::selectModel);
+    connect(&m_generalSettings.qrSelectModel, &Button::clicked, this, &Config::selectModel);
     connect(&m_generalSettings.ccSelectTemplate, &Button::clicked, this, &Config::selectTemplate);
     connect(&m_generalSettings.caSelectTemplate, &Button::clicked, this, &Config::selectTemplate);
+    connect(&m_generalSettings.qrSelectTemplate, &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.qrSetUrl, &Button::clicked, this, &Config::selectUrl);
 
     connect(
         &m_generalSettings.ccPreset1SelectProvider, &Button::clicked, this, &Config::selectProvider);
@@ -115,6 +122,10 @@ void ConfigurationManager::setupConnections()
     connect(&m_generalSettings.caTemplate, &Utils::StringAspect::changed, this, [this]() {
         updateTemplateDescription(m_generalSettings.caTemplate);
     });
+
+    connect(&m_generalSettings.qrTemplate, &Utils::StringAspect::changed, this, [this]() {
+        updateTemplateDescription(m_generalSettings.qrTemplate);
+    });
 }
 
 void ConfigurationManager::selectProvider()
@@ -129,6 +140,8 @@ void ConfigurationManager::selectProvider()
                                ? m_generalSettings.ccProvider
                            : settingsButton == &m_generalSettings.ccPreset1SelectProvider
                                ? m_generalSettings.ccPreset1Provider
+                           : settingsButton == &m_generalSettings.qrSelectProvider
+                               ? m_generalSettings.qrProvider
                                : m_generalSettings.caProvider;
 
     QTimer::singleShot(0, this, [this, providersList, &targetSettings] {
@@ -145,17 +158,21 @@ void ConfigurationManager::selectModel()
 
     const bool isCodeCompletion = (settingsButton == &m_generalSettings.ccSelectModel);
     const bool isPreset1 = (settingsButton == &m_generalSettings.ccPreset1SelectModel);
+    const bool isQuickRefactor = (settingsButton == &m_generalSettings.qrSelectModel);
 
     const QString providerName = isCodeCompletion ? m_generalSettings.ccProvider.volatileValue()
                                  : isPreset1 ? m_generalSettings.ccPreset1Provider.volatileValue()
+                                 : isQuickRefactor ? m_generalSettings.qrProvider.volatileValue()
                                              : m_generalSettings.caProvider.volatileValue();
 
     const auto providerUrl = isCodeCompletion ? m_generalSettings.ccUrl.volatileValue()
                              : isPreset1      ? m_generalSettings.ccPreset1Url.volatileValue()
+                             : isQuickRefactor ? m_generalSettings.qrUrl.volatileValue()
                                               : m_generalSettings.caUrl.volatileValue();
 
     auto &targetSettings = isCodeCompletion ? m_generalSettings.ccModel
                            : isPreset1      ? m_generalSettings.ccPreset1Model
+                           : isQuickRefactor ? m_generalSettings.qrModel
                                             : m_generalSettings.caModel;
 
     if (auto provider = m_providersManager.getProviderByName(providerName)) {
@@ -186,8 +203,10 @@ void ConfigurationManager::selectTemplate()
 
     const bool isCodeCompletion = (settingsButton == &m_generalSettings.ccSelectTemplate);
     const bool isPreset1 = (settingsButton == &m_generalSettings.ccPreset1SelectTemplate);
+    const bool isQuickRefactor = (settingsButton == &m_generalSettings.qrSelectTemplate);
     const QString providerName = isCodeCompletion ? m_generalSettings.ccProvider.volatileValue()
                                  : isPreset1 ? m_generalSettings.ccPreset1Provider.volatileValue()
+                                 : isQuickRefactor ? m_generalSettings.qrProvider.volatileValue()
                                              : m_generalSettings.caProvider.volatileValue();
     auto providerID = m_providersManager.getProviderByName(providerName)->providerID();
 
@@ -197,6 +216,7 @@ void ConfigurationManager::selectTemplate()
 
     auto &targetSettings = isCodeCompletion ? m_generalSettings.ccTemplate
                            : isPreset1      ? m_generalSettings.ccPreset1Template
+                           : isQuickRefactor ? m_generalSettings.qrTemplate
                                             : m_generalSettings.caTemplate;
 
     QTimer::singleShot(0, &m_generalSettings, [this, templateList, &targetSettings]() {
@@ -221,6 +241,8 @@ void ConfigurationManager::selectUrl()
     auto &targetSettings = (settingsButton == &m_generalSettings.ccSetUrl) ? m_generalSettings.ccUrl
                            : settingsButton == &m_generalSettings.ccPreset1SetUrl
                                ? m_generalSettings.ccPreset1Url
+                           : settingsButton == &m_generalSettings.qrSetUrl
+                               ? m_generalSettings.qrUrl
                                : m_generalSettings.caUrl;
 
     QTimer::singleShot(0, &m_generalSettings, [this, urls, &targetSettings]() {

ConfigurationManager.hpp

@@ -1,5 +1,5 @@
-/* 
- * Copyright (C) 2024-2025 Petr Mironychev
+/*
+ * Copyright (C) 2025 Petr Mironychev
  *
  * This file is part of QodeAssist.
  *

LLMClientInterface.cpp

@@ -26,12 +26,11 @@
 #include "CodeHandler.hpp"
 #include "context/DocumentContextReader.hpp"
 #include "context/Utils.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 {
 
@@ -40,34 +39,21 @@ LLMClientInterface::LLMClientInterface(
     const Settings::CodeCompletionSettings &completeSettings,
     LLMCore::IProviderRegistry &providerRegistry,
     LLMCore::IPromptProvider *promptProvider,
-    LLMCore::RequestHandlerBase &requestHandler,
     Context::IDocumentReader &documentReader,
     IRequestPerformanceLogger &performanceLogger)
     : m_generalSettings(generalSettings)
     , m_completeSettings(completeSettings)
     , m_providerRegistry(providerRegistry)
     , m_promptProvider(promptProvider)
-    , m_requestHandler(requestHandler)
     , m_documentReader(documentReader)
     , m_performanceLogger(performanceLogger)
     , m_contextManager(new Context::ContextManager(this))
 {
-    connect(
-        &m_requestHandler,
-        &LLMCore::RequestHandler::completionReceived,
-        this,
-        &LLMClientInterface::sendCompletionToClient);
+}
 
-    // TODO handle error
-    // connect(
-    //     &m_requestHandler,
-    //     &LLMCore::RequestHandler::requestFinished,
-    //     this,
-    //     [this](const QString &, bool success, const QString &errorString) {
-    //         if (!success) {
-    //             emit error(errorString);
-    //         }
-    //     });
+LLMClientInterface::~LLMClientInterface()
+{
+    handleCancelRequest();
 }
 
 Utils::FilePath LLMClientInterface::serverDeviceTemplate() const
@@ -80,6 +66,44 @@ 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));
+    
+    // Send LSP error response to client
+    const RequestContext &ctx = it.value();
+    QJsonObject response;
+    response["jsonrpc"] = "2.0";
+    response[LanguageServerProtocol::idKey] = ctx.originalRequest["id"];
+    
+    QJsonObject errorObject;
+    errorObject["code"] = -32603; // Internal error code
+    errorObject["message"] = error;
+    response["error"] = errorObject;
+    
+    emit messageReceived(LanguageServerProtocol::JsonRpcMessage(response));
+    
+    m_activeRequests.erase(it);
+    m_performanceLogger.endTimeMeasurement(requestId);
+}
+
 void LLMClientInterface::sendData(const QByteArray &data)
 {
     QJsonDocument doc = QJsonDocument::fromJson(data);
@@ -101,8 +125,9 @@ void LLMClientInterface::sendData(const QByteArray &data)
         QString requestId = request["id"].toString();
         m_performanceLogger.startTimeMeasurement(requestId);
         handleCompletion(request);
-    } else if (method == "$/cancelRequest") {
-        handleCancelRequest(request);
+    } else if (method == "cancelRequest") {
+        qDebug() << "Cancelling request";
+        handleCancelRequest();
     } else if (method == "exit") {
         // TODO make exit handler
     } else {
@@ -110,14 +135,29 @@ void LLMClientInterface::sendData(const QByteArray &data)
     }
 }
 
-void LLMClientInterface::handleCancelRequest(const QJsonObject &request)
+void LLMClientInterface::handleCancelRequest()
 {
-    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));
+    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();
+
+    LOG_MESSAGE("All requests cancelled and state cleared");
 }
 
 void LLMClientInterface::handleInitialize(const QJsonObject &request)
@@ -170,12 +210,32 @@ void LLMClientInterface::handleExit(const QJsonObject &request)
     emit finished();
 }
 
+void LLMClientInterface::sendErrorResponse(const QJsonObject &request, const QString &errorMessage)
+{
+    QJsonObject response;
+    response["jsonrpc"] = "2.0";
+    response[LanguageServerProtocol::idKey] = request["id"];
+    
+    QJsonObject errorObject;
+    errorObject["code"] = -32603; // Internal error code
+    errorObject["message"] = errorMessage;
+    response["error"] = errorObject;
+    
+    emit messageReceived(LanguageServerProtocol::JsonRpcMessage(response));
+    
+    // End performance measurement if it was started
+    QString requestId = request["id"].toString();
+    m_performanceLogger.endTimeMeasurement(requestId);
+}
+
 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);
+        QString error = QString("Document is not available: %1").arg(filePath);
+        LOG_MESSAGE("Error: " + error);
+        sendErrorResponse(request, error);
         return;
     }
 
@@ -193,7 +253,9 @@ void LLMClientInterface::handleCompletion(const QJsonObject &request)
     const auto provider = m_providerRegistry.getProviderByName(providerName);
 
     if (!provider) {
-        LOG_MESSAGE(QString("No provider found with name: %1").arg(providerName));
+        QString error = QString("No provider found with name: %1").arg(providerName);
+        LOG_MESSAGE(error);
+        sendErrorResponse(request, error);
         return;
     }
 
@@ -203,7 +265,9 @@ void LLMClientInterface::handleCompletion(const QJsonObject &request)
     auto promptTemplate = m_promptProvider->getTemplateByName(templateName);
 
     if (!promptTemplate) {
-        LOG_MESSAGE(QString("No template found with name: %1").arg(templateName));
+        QString error = QString("No template found with name: %1").arg(templateName);
+        LOG_MESSAGE(error);
+        sendErrorResponse(request, error);
         return;
     }
 
@@ -214,15 +278,12 @@ void LLMClientInterface::handleCompletion(const QJsonObject &request)
     config.promptTemplate = promptTemplate;
     // TODO refactor networking
     if (provider->providerID() == LLMCore::ProviderID::GoogleAI) {
-        QString stream = m_completeSettings.stream() ? QString{"streamGenerateContent?alt=sse"}
-                                                     : QString{"generateContent?"};
+        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,
-            promptTemplate->type() == LLMCore::TemplateType::FIM ? provider->completionEndpoint()
-                                                                 : provider->chatEndpoint()));
-        config.providerRequest = {{"model", modelName}, {"stream", m_completeSettings.stream()}};
+        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();
@@ -238,6 +299,18 @@ void LLMClientInterface::handleCompletion(const QJsonObject &request)
                     && promptTemplate->type() == LLMCore::TemplateType::Chat
                 ? m_completeSettings.systemPromptForNonFimModels()
                 : m_completeSettings.systemPrompt());
+
+    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());
 
@@ -275,15 +348,38 @@ void LLMClientInterface::handleCompletion(const QJsonObject &request)
         config.providerRequest,
         promptTemplate,
         updatedContext,
-        LLMCore::RequestType::CodeCompletion);
+        LLMCore::RequestType::CodeCompletion,
+        false,
+        false);
 
     auto errors = config.provider->validateRequest(config.providerRequest, promptTemplate->type());
     if (!errors.isEmpty()) {
-        LOG_MESSAGE("Validate errors for fim request:");
+        QString error = QString("Request validation failed: %1").arg(errors.join("; "));
+        LOG_MESSAGE("Validate errors for request:");
         LOG_MESSAGES(errors);
+        sendErrorResponse(request, error);
         return;
     }
-    m_requestHandler.sendLLMRequest(config, request);
+
+    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);
 }
 
 LLMCore::ContextData LLMClientInterface::prepareContext(
@@ -300,6 +396,26 @@ LLMCore::ContextData LLMClientInterface::prepareContext(
     return reader.prepareContext(lineNumber, cursorPosition, m_completeSettings);
 }
 
+QString LLMClientInterface::endpoint(
+    LLMCore::Provider *provider, LLMCore::TemplateType type, bool isLanguageSpecify)
+{
+    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;
@@ -329,18 +445,36 @@ void LLMClientInterface::sendCompletionToClient(
 
     LOG_MESSAGE(QString("Completions before filter: \n%1").arg(completion));
 
-    QString processedCompletion
-        = promptTemplate->type() == LLMCore::TemplateType::Chat
-                  && m_completeSettings.smartProcessInstuctText()
-              ? CodeHandler::processText(completion, Context::extractFilePathFromRequest(request))
-              : 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;
+    }
+
+    if (processedCompletion.endsWith('\n')) {
+        QString withoutTrailing = processedCompletion.chopped(1);
+        if (!withoutTrailing.contains('\n')) {
+            LOG_MESSAGE(QString("Removed trailing newline from single-line completion"));
+            processedCompletion = withoutTrailing;
+        }
+    }
 
     completionItem[LanguageServerProtocol::textKey] = processedCompletion;
+    
     QJsonObject range;
     range["start"] = position;
-    QJsonObject end = position;
-    end["character"] = position["character"].toInt() + processedCompletion.length();
-    range["end"] = end;
+    range["end"] = position;
+    
     completionItem[LanguageServerProtocol::rangeKey] = range;
     completionItem[LanguageServerProtocol::positionKey] = position;
     completions.append(completionItem);

LLMClientInterface.hpp

@@ -28,7 +28,6 @@
 #include <llmcore/ContextData.hpp>
 #include <llmcore/IPromptProvider.hpp>
 #include <llmcore/IProviderRegistry.hpp>
-#include <llmcore/RequestHandler.hpp>
 #include <logger/IRequestPerformanceLogger.hpp>
 #include <settings/CodeCompletionSettings.hpp>
 #include <settings/GeneralSettings.hpp>
@@ -48,9 +47,9 @@ public:
         const Settings::CodeCompletionSettings &completeSettings,
         LLMCore::IProviderRegistry &providerRegistry,
         LLMCore::IPromptProvider *promptProvider,
-        LLMCore::RequestHandlerBase &requestHandler,
         Context::IDocumentReader &documentReader,
         IRequestPerformanceLogger &performanceLogger);
+    ~LLMClientInterface() override;
 
     Utils::FilePath serverDeviceTemplate() const override;
 
@@ -67,26 +66,38 @@ public:
 protected:
     void startImpl() override;
 
+private slots:
+    void handleFullResponse(const QString &requestId, const QString &fullText);
+    void handleRequestFailed(const QString &requestId, const QString &error);
+
 private:
     void handleInitialize(const QJsonObject &request);
     void handleShutdown(const QJsonObject &request);
     void handleTextDocumentDidOpen(const QJsonObject &request);
     void handleInitialized(const QJsonObject &request);
     void handleExit(const QJsonObject &request);
-    void handleCancelRequest(const QJsonObject &request);
+    void handleCancelRequest();
+    void sendErrorResponse(const QJsonObject &request, const QString &errorMessage);
+
+    struct RequestContext
+    {
+        QJsonObject originalRequest;
+        LLMCore::Provider *provider;
+    };
 
     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;
-    LLMCore::RequestHandlerBase &m_requestHandler;
     Context::IDocumentReader &m_documentReader;
     IRequestPerformanceLogger &m_performanceLogger;
     QElapsedTimer m_completionTimer;
     Context::ContextManager *m_contextManager;
+    QHash<QString, RequestContext> m_activeRequests;
 };
 
 } // namespace QodeAssist

LLMSuggestion.cpp

@@ -29,34 +29,57 @@
 
 namespace QodeAssist {
 
-QString mergeWithRightText(const QString &suggestion, const QString &rightText)
+static QStringList extractTokens(const QString &str)
 {
-    if (suggestion.isEmpty() || rightText.isEmpty()) {
-        return suggestion;
-    }
-
-    int j = 0;
-    QString processed = rightText;
-    QSet<int> matchedPositions;
-
-    for (int i = 0; i < suggestion.length() && j < processed.length(); ++i) {
-        if (suggestion[i] == processed[j]) {
-            matchedPositions.insert(j);
-            ++j;
+    QStringList tokens;
+    QString currentToken;
+    for (const QChar &ch : str) {
+        if (ch.isLetterOrNumber() || ch == '_') {
+            currentToken += ch;
+        } else {
+            if (!currentToken.isEmpty() && currentToken.length() > 1) {
+                tokens.append(currentToken);
+            }
+            currentToken.clear();
         }
     }
+    if (!currentToken.isEmpty() && currentToken.length() > 1) {
+        tokens.append(currentToken);
+    }
+    return tokens;
+}
 
-    if (matchedPositions.isEmpty()) {
-        return suggestion + rightText;
+int LLMSuggestion::calculateReplaceLength(const QString &suggestion, 
+                                         const QString &rightText,
+                                         const QString &entireLine)
+{
+    if (rightText.isEmpty()) {
+        return 0;
     }
 
-    QList<int> positions = matchedPositions.values();
-    std::sort(positions.begin(), positions.end(), std::greater<int>());
-    for (int pos : positions) {
-        processed.remove(pos, 1);
+    QString structuralChars = "{}[]()<>;,";
+    bool hasStructuralOverlap = false;
+    for (const QChar &ch : structuralChars) {
+        if (suggestion.contains(ch) && rightText.contains(ch)) {
+            hasStructuralOverlap = true;
+            break;
+        }
+    }
+    
+    if (hasStructuralOverlap) {
+        return rightText.length();
     }
 
-    return suggestion;
+    const QStringList suggestionTokens = extractTokens(suggestion);
+    const QStringList lineTokens = extractTokens(entireLine);
+    
+    for (const auto &token : suggestionTokens) {
+        if (lineTokens.contains(token)) {
+            return rightText.length();
+        }
+    }
+    
+    return 0;
 }
 
 LLMSuggestion::LLMSuggestion(
@@ -66,10 +89,8 @@ LLMSuggestion::LLMSuggestion(
     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);
     cursor.setPosition(startPos);
@@ -77,17 +98,27 @@ LLMSuggestion::LLMSuggestion(
     QString blockText = block.text();
 
     int cursorPositionInBlock = cursor.positionInBlock();
-
+    QString leftText = blockText.left(cursorPositionInBlock);
     QString rightText = blockText.mid(cursorPositionInBlock);
 
-    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;
+    QString suggestionText = data.text;
+    QString entireLine = blockText;
+
+    if (!suggestionText.contains('\n')) {
+        int replaceLength = calculateReplaceLength(suggestionText, rightText, entireLine);
+        QString remainingRightText = (replaceLength > 0) ? rightText.mid(replaceLength) : rightText;
+        
+        QString displayText = leftText + suggestionText + remainingRightText;
         replacementDocument()->setPlainText(displayText);
     } else {
-        QString displayText = blockText.left(cursorPositionInBlock) + data.text;
+        int firstLineEnd = suggestionText.indexOf('\n');
+        QString firstLine = suggestionText.left(firstLineEnd);
+        QString restOfCompletion = suggestionText.mid(firstLineEnd);
+        
+        int replaceLength = calculateReplaceLength(firstLine, rightText, entireLine);
+        QString remainingRightText = (replaceLength > 0) ? rightText.mid(replaceLength) : rightText;
+        
+        QString displayText = leftText + firstLine + remainingRightText + restOfCompletion;
         replacementDocument()->setPlainText(displayText);
     }
 }
@@ -104,10 +135,12 @@ bool LLMSuggestion::applyLine(TextEditor::TextEditorWidget *widget)
 
 bool LLMSuggestion::applyPart(Part part, TextEditor::TextEditorWidget *widget)
 {
-    const Utils::Text::Range range = suggestions()[currentSuggestion()].range;
+    const auto &currentSuggestions = suggestions();
+    const auto &currentData = currentSuggestions[currentSuggestion()];
+    const Utils::Text::Range range = currentData.range;
     const QTextCursor cursor = range.begin.toTextCursor(sourceDocument());
     QTextCursor currentCursor = widget->textCursor();
-    const QString text = suggestions()[currentSuggestion()].text;
+    const QString text = currentData.text;
 
     const int startPos = currentCursor.positionInBlock() - cursor.positionInBlock()
                          + (cursor.selectionEnd() - cursor.selectionStart());
@@ -131,16 +164,34 @@ bool LLMSuggestion::applyPart(Part part, TextEditor::TextEditorWidget *widget)
         return false;
     }
 
-    QTextBlock currentBlock = currentCursor.block();
-    QString textAfterCursor = currentBlock.text().mid(currentCursor.positionInBlock());
+    if (startPos == 0) {
+        QTextBlock currentBlock = cursor.block();
+        QString textAfterCursor = currentBlock.text().mid(cursor.positionInBlock());
+        QString entireLine = currentBlock.text();
+        
+        int replaceLength = calculateReplaceLength(text, textAfterCursor, entireLine);
+        
+        if (replaceLength > 0) {
+            currentCursor.movePosition(QTextCursor::Right, QTextCursor::KeepAnchor, replaceLength);
+            currentCursor.removeSelectedText();
+        }
+    }
 
     if (!subText.contains('\n')) {
-        QTextCursor deleteCursor = currentCursor;
-        deleteCursor.movePosition(QTextCursor::EndOfBlock, QTextCursor::KeepAnchor);
-        deleteCursor.removeSelectedText();
+        currentCursor.insertText(subText);
 
-        QString mergedText = mergeWithRightText(subText, textAfterCursor);
-        currentCursor.insertText(mergedText);
+        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);
 
@@ -162,34 +213,47 @@ bool LLMSuggestion::applyPart(Part part, TextEditor::TextEditorWidget *widget)
 
 bool LLMSuggestion::apply()
 {
-    const Utils::Text::Range range = suggestions()[currentSuggestion()].range;
+    const auto &currentSuggestions = suggestions();
+    const auto &currentData = currentSuggestions[currentSuggestion()];
+    const Utils::Text::Range range = currentData.range;
     const QTextCursor cursor = range.begin.toTextCursor(sourceDocument());
-    const QString text = suggestions()[currentSuggestion()].text;
+    QString text = currentData.text;
 
     QTextBlock currentBlock = cursor.block();
+    QString textBeforeCursor = currentBlock.text().left(cursor.positionInBlock());
     QString textAfterCursor = currentBlock.text().mid(cursor.positionInBlock());
+    QString entireLine = currentBlock.text();
 
     QTextCursor editCursor = cursor;
+    editCursor.beginEditBlock();
 
     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);
+        int replaceLength = calculateReplaceLength(firstLine, textAfterCursor, entireLine);
+        
+        if (replaceLength > 0) {
+            editCursor.movePosition(QTextCursor::Right, QTextCursor::KeepAnchor, replaceLength);
+            editCursor.removeSelectedText();
+        }
+        
+        editCursor.insertText(firstLine + restOfText);
     } else {
-        editCursor.movePosition(QTextCursor::EndOfBlock, QTextCursor::KeepAnchor);
-        editCursor.removeSelectedText();
-
-        QString mergedText = mergeWithRightText(text, textAfterCursor);
-        editCursor.insertText(mergedText);
+        int replaceLength = calculateReplaceLength(text, textAfterCursor, entireLine);
+        
+        if (replaceLength > 0) {
+            editCursor.movePosition(QTextCursor::Right, QTextCursor::KeepAnchor, replaceLength);
+            editCursor.removeSelectedText();
+        }
+        
+        editCursor.insertText(text);
     }
 
+    editCursor.endEditBlock();
     return true;
 }
 
 } // namespace QodeAssist
+

LLMSuggestion.hpp

@@ -41,5 +41,9 @@ public:
     bool applyLine(TextEditor::TextEditorWidget *widget) override;
     bool applyPart(Part part, TextEditor::TextEditorWidget *widget);
     bool apply() override;
+
+    static int calculateReplaceLength(const QString &suggestion, 
+                                     const QString &rightText,
+                                     const QString &entireLine);
 };
 } // namespace QodeAssist

QodeAssist.json.in

@@ -1,7 +1,8 @@
 {
     "Id" : "qodeassist",
     "Name" : "QodeAssist",
-    "Version" : "0.5.13",
+    "Version" : "0.9.1",
+    "CompatVersion" : "${IDE_VERSION}",
     "Vendor" : "Petr Mironychev",
     "VendorId" : "petrmironychev",
     "Copyright" : "(C) ${IDE_COPYRIGHT_YEAR} Petr Mironychev, (C) ${IDE_COPYRIGHT_YEAR} The Qt Company Ltd",

QodeAssist.qrc

@@ -8,5 +8,7 @@
         <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>

QodeAssistClient.cpp

@@ -24,7 +24,9 @@
 
 #include "QodeAssistClient.hpp"
 
+#include <QApplication>
 #include <QInputDialog>
+#include <QKeyEvent>
 #include <QTimer>
 
 #include <coreplugin/icore.h>
@@ -33,6 +35,8 @@
 
 #include "LLMClientInterface.hpp"
 #include "LLMSuggestion.hpp"
+#include "RefactorSuggestion.hpp"
+#include "RefactorSuggestionHoverHandler.hpp"
 #include "settings/CodeCompletionSettings.hpp"
 #include "settings/GeneralSettings.hpp"
 #include "settings/ProjectSettings.hpp"
@@ -61,11 +65,18 @@ QodeAssistClient::QodeAssistClient(LLMClientInterface *clientInterface)
     setupConnections();
 
     m_typingTimer.start();
+
+    m_hintHideTimer.setSingleShot(true);
+    m_hintHideTimer.setInterval(Settings::codeCompletionSettings().hintHideTimeout());
+    connect(&m_hintHideTimer, &QTimer::timeout, this, [this]() { m_hintHandler.hideHint(); });
+
+    m_refactorHoverHandler = new RefactorSuggestionHoverHandler();
 }
 
 QodeAssistClient::~QodeAssistClient()
 {
     cleanupConnections();
+    delete m_refactorHoverHandler;
 }
 
 void QodeAssistClient::openDocument(TextEditor::TextDocument *document)
@@ -75,6 +86,15 @@ void QodeAssistClient::openDocument(TextEditor::TextDocument *document)
         return;
 
     Client::openDocument(document);
+
+    auto editors = TextEditor::BaseTextEditor::textEditorsForDocument(document);
+    for (auto *editor : editors) {
+        if (auto *widget = editor->editorWidget()) {
+            widget->addHoverHandler(m_refactorHoverHandler);
+            widget->installEventFilter(this);
+        }
+    }
+
     connect(
         document,
         &TextDocument::contentsChangedWithPosition,
@@ -106,6 +126,12 @@ void QodeAssistClient::openDocument(TextEditor::TextDocument *document)
             if (charsRemoved > 0 || charsAdded <= 0) {
                 m_recentCharCount = 0;
                 m_typingTimer.restart();
+                // 0 = Hint-based, 1 = Automatic
+                const int triggerMode = Settings::codeCompletionSettings().completionTriggerMode();
+                if (triggerMode != 1) {
+                    m_hintHideTimer.stop();
+                    m_hintHandler.hideHint();
+                }
                 return;
             }
 
@@ -116,29 +142,37 @@ void QodeAssistClient::openDocument(TextEditor::TextDocument *document)
             if (lastChar.isEmpty() || lastChar[0].isPunct()) {
                 m_recentCharCount = 0;
                 m_typingTimer.restart();
+                // 0 = Hint-based, 1 = Automatic
+                const int triggerMode = Settings::codeCompletionSettings().completionTriggerMode();
+                if (triggerMode != 1) {
+                    m_hintHideTimer.stop();
+                    m_hintHandler.hideHint();
+                }
                 return;
             }
 
-            m_recentCharCount += charsAdded;
+            bool isSpaceOrTab = lastChar[0].isSpace();
+            bool ignoreWhitespace
+                = Settings::codeCompletionSettings().ignoreWhitespaceInCharCount();
+
+            if (!ignoreWhitespace || !isSpaceOrTab) {
+                m_recentCharCount += charsAdded;
+            }
 
             if (m_typingTimer.elapsed()
                 > Settings::codeCompletionSettings().autoCompletionTypingInterval()) {
-                m_recentCharCount = charsAdded;
+                m_recentCharCount = (ignoreWhitespace && isSpaceOrTab) ? 0 : charsAdded;
                 m_typingTimer.restart();
             }
 
-            if (m_recentCharCount
-                > Settings::codeCompletionSettings().autoCompletionCharThreshold()) {
-                scheduleRequest(widget);
+            // 0 = Hint-based, 1 = Automatic
+            const int triggerMode = Settings::codeCompletionSettings().completionTriggerMode();
+            if (triggerMode == 1) {
+                handleAutoRequestTrigger(widget, charsAdded, isSpaceOrTab);
+            } else {
+                handleHintBasedTrigger(widget, charsAdded, isSpaceOrTab, cursor);
             }
         });
-
-    // auto editors = BaseTextEditor::textEditorsForDocument(document);
-    // connect(
-    //     editors.first()->editorWidget(),
-    //     &TextEditorWidget::selectionChanged,
-    //     this,
-    //     [this, editors]() { m_chatButtonHandler.showButton(editors.first()->editorWidget()); });
 }
 
 bool QodeAssistClient::canOpenProject(ProjectExplorer::Project *project)
@@ -153,6 +187,7 @@ void QodeAssistClient::requestCompletions(TextEditor::TextEditorWidget *editor)
     if (!isEnabled(project))
         return;
 
+
     if (m_llmClient->contextManager()
             ->ignoreManager()
             ->shouldIgnore(editor->textDocument()->filePath().toUrlishString(), project)) {
@@ -165,12 +200,23 @@ void QodeAssistClient::requestCompletions(TextEditor::TextEditorWidget *editor)
     if (cursor.hasMultipleCursors() || cursor.hasSelection() || editor->suggestionVisible())
         return;
 
+    const int triggerMode = Settings::codeCompletionSettings().completionTriggerMode();
+
+    if (Settings::codeCompletionSettings().abortAssistOnRequest() && triggerMode == 0) {
+        editor->abortAssist();
+    }
+
     const FilePath filePath = editor->textDocument()->filePath();
     GetCompletionRequest request{
         {TextDocumentIdentifier(hostPathToServerUri(filePath)),
          documentVersion(filePath),
          Position(cursor.mainCursor())}};
     if (Settings::codeCompletionSettings().showProgressWidget()) {
+        m_progressHandler.setCancelCallback([this, editor = QPointer<TextEditorWidget>(editor)]() {
+            if (editor) {
+                cancelRunningRequest(editor);
+            }
+        });
         m_progressHandler.showProgress(editor);
     }
     request.setResponseCallback([this, editor = QPointer<TextEditorWidget>(editor)](
@@ -207,6 +253,12 @@ void QodeAssistClient::requestQuickRefactor(
             &QodeAssistClient::handleRefactoringResult);
     }
 
+    m_progressHandler.setCancelCallback([this, editor = QPointer<TextEditorWidget>(editor)]() {
+        if (editor && m_refactorHandler) {
+            m_refactorHandler->cancelRequest();
+            m_progressHandler.hideProgress();
+        }
+    });
     m_progressHandler.showProgress(editor);
     m_refactorHandler->sendRefactorRequest(editor, instructions);
 }
@@ -233,6 +285,12 @@ void QodeAssistClient::scheduleRequest(TextEditor::TextEditorWidget *editor)
         });
         connect(editor, &TextEditorWidget::cursorPositionChanged, this, [this, editor] {
             cancelRunningRequest(editor);
+            // 0 = Hint-based, 1 = Automatic
+            const int triggerMode = Settings::codeCompletionSettings().completionTriggerMode();
+            if (triggerMode != 1) {
+                m_hintHideTimer.stop();
+                m_hintHandler.hideHint();
+            }
         });
         it = m_scheduledRequests.insert(editor, timer);
     }
@@ -243,8 +301,19 @@ void QodeAssistClient::scheduleRequest(TextEditor::TextEditorWidget *editor)
 void QodeAssistClient::handleCompletions(
     const GetCompletionRequest::Response &response, TextEditor::TextEditorWidget *editor)
 {
-    if (response.error())
+    m_progressHandler.hideProgress();
+    const int triggerMode = Settings::codeCompletionSettings().completionTriggerMode();
+
+    if (Settings::codeCompletionSettings().abortAssistOnRequest() && triggerMode == 1) {
+        editor->abortAssist();
+    }
+
+    if (response.error()) {
         log(*response.error());
+        m_errorHandler
+            .showError(editor, tr("Code completion failed: %1").arg(response.error()->message()));
+        return;
+    }
 
     int requestPosition = -1;
     if (const auto requestParams = m_runningRequests.take(editor).params())
@@ -264,14 +333,13 @@ void QodeAssistClient::handleCompletions(
         QList<Completion> completions
             = Utils::filtered(result->completions().toListOrEmpty(), isValidCompletion);
 
-        // remove trailing whitespaces from the end of the completions
         for (Completion &completion : completions) {
             const LanguageServerProtocol::Range range = completion.range();
             if (range.start().line() != range.end().line())
-                continue; // do not remove trailing whitespaces for multi-line replacements
+                continue;
 
             const QString completionText = completion.text();
-            const int end = int(completionText.size()) - 1; // empty strings have been removed above
+            const int end = int(completionText.size()) - 1;
             int delta = 0;
             while (delta <= end && completionText[end - delta].isSpace())
                 ++delta;
@@ -288,9 +356,11 @@ void QodeAssistClient::handleCompletions(
             Text::Position pos{toTextPos(c.position())};
             return TextSuggestion::Data{range, pos, c.text()};
         });
-        m_progressHandler.hideProgress();
-        if (completions.isEmpty())
+
+        if (completions.isEmpty()) {
+            LOG_MESSAGE("No valid completions received");
             return;
+        }
         editor->insertSuggestion(std::make_unique<LLMSuggestion>(suggestions, editor->document()));
     }
 }
@@ -301,6 +371,12 @@ void QodeAssistClient::cancelRunningRequest(TextEditor::TextEditorWidget *editor
     if (it == m_runningRequests.constEnd())
         return;
     m_progressHandler.hideProgress();
+    // 0 = Hint-based, 1 = Automatic
+    const int triggerMode = Settings::codeCompletionSettings().completionTriggerMode();
+    if (triggerMode != 1) {
+        m_hintHideTimer.stop();
+        m_hintHandler.hideHint();
+    }
     cancelRequest(it->id());
     m_runningRequests.erase(it);
 }
@@ -342,32 +418,224 @@ void QodeAssistClient::cleanupConnections()
     m_scheduledRequests.clear();
 }
 
+bool QodeAssistClient::isHintVisible() const
+{
+    return m_hintHandler.isHintVisible();
+}
+
+void QodeAssistClient::hideHintAndRequestCompletion(TextEditor::TextEditorWidget *editor)
+{
+    m_hintHandler.hideHint();
+    requestCompletions(editor);
+}
+
 void QodeAssistClient::handleRefactoringResult(const RefactorResult &result)
 {
+    m_progressHandler.hideProgress();
+
     if (!result.success) {
+        QString errorMessage = result.errorMessage.isEmpty()
+                                   ? tr("Quick refactor failed")
+                                   : tr("Quick refactor failed: %1").arg(result.errorMessage);
+
+        if (result.editor) {
+            m_errorHandler.showError(result.editor, errorMessage);
+        }
+
         LOG_MESSAGE(QString("Refactoring failed: %1").arg(result.errorMessage));
         return;
     }
 
-    auto editor = BaseTextEditor::currentTextEditor();
-    if (!editor) {
-        LOG_MESSAGE("Refactoring failed: No active editor found");
+    if (!result.editor) {
+        LOG_MESSAGE("Refactoring result has no editor");
         return;
     }
 
-    auto editorWidget = editor->editorWidget();
+    TextEditorWidget *editorWidget = result.editor;
 
-    QTextCursor cursor = editorWidget->textCursor();
-    cursor.beginEditBlock();
+    auto toTextPos = [](const Utils::Text::Position &pos) {
+        return Utils::Text::Position{pos.line, pos.column};
+    };
 
-    int startPos = result.insertRange.begin.toPositionInDocument(editorWidget->document());
-    int endPos = result.insertRange.end.toPositionInDocument(editorWidget->document());
+    Utils::Text::Range range{toTextPos(result.insertRange.begin), toTextPos(result.insertRange.end)};
+    Utils::Text::Position pos = toTextPos(result.insertRange.begin);
 
-    cursor.setPosition(startPos);
-    cursor.setPosition(endPos, QTextCursor::KeepAnchor);
+    int startPos = range.begin.toPositionInDocument(editorWidget->document());
+    int endPos = range.end.toPositionInDocument(editorWidget->document());
 
-    cursor.insertText(result.newText);
-    cursor.endEditBlock();
-    m_progressHandler.hideProgress();
+    if (startPos != endPos) {
+        QTextCursor startCursor(editorWidget->document());
+        startCursor.setPosition(startPos);
+        if (startCursor.positionInBlock() > 0) {
+            startCursor.movePosition(QTextCursor::StartOfBlock);
+        }
+
+        QTextCursor endCursor(editorWidget->document());
+        endCursor.setPosition(endPos);
+        if (endCursor.positionInBlock() > 0) {
+            endCursor.movePosition(QTextCursor::EndOfBlock);
+            if (!endCursor.atEnd()) {
+                endCursor.movePosition(QTextCursor::NextCharacter);
+            }
+        }
+
+        Utils::Text::Position expandedBegin = Utils::Text::Position::fromPositionInDocument(
+            editorWidget->document(), startCursor.position());
+        Utils::Text::Position expandedEnd = Utils::Text::Position::fromPositionInDocument(
+            editorWidget->document(), endCursor.position());
+
+        range = Utils::Text::Range(expandedBegin, expandedEnd);
+    }
+
+    TextEditor::TextSuggestion::Data suggestionData{
+        Utils::Text::Range{toTextPos(result.insertRange.begin), toTextPos(result.insertRange.end)},
+        pos,
+        result.newText};
+    editorWidget->insertSuggestion(
+        std::make_unique<RefactorSuggestion>(suggestionData, editorWidget->document()));
+
+    m_refactorHoverHandler->setSuggestionRange(range);
+
+    m_refactorHoverHandler->setApplyCallback([this, editorWidget]() {
+        QKeyEvent tabEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::NoModifier);
+        QApplication::sendEvent(editorWidget, &tabEvent);
+        m_refactorHoverHandler->clearSuggestionRange();
+    });
+
+    m_refactorHoverHandler->setDismissCallback([this, editorWidget]() {
+        editorWidget->clearSuggestion();
+        m_refactorHoverHandler->clearSuggestionRange();
+    });
+
+    LOG_MESSAGE("Displaying refactoring suggestion with hover handler");
 }
+
+void QodeAssistClient::handleAutoRequestTrigger(TextEditor::TextEditorWidget *widget,
+                                                 int charsAdded,
+                                                 bool isSpaceOrTab)
+{
+    Q_UNUSED(isSpaceOrTab);
+
+    if (m_recentCharCount
+        > Settings::codeCompletionSettings().autoCompletionCharThreshold()) {
+        scheduleRequest(widget);
+    }
+}
+
+void QodeAssistClient::handleHintBasedTrigger(TextEditor::TextEditorWidget *widget,
+                                               int charsAdded,
+                                               bool isSpaceOrTab,
+                                               QTextCursor &cursor)
+{
+    Q_UNUSED(charsAdded);
+
+    const int hintThreshold = Settings::codeCompletionSettings().hintCharThreshold();
+    if (m_recentCharCount >= hintThreshold && !isSpaceOrTab) {
+        const QRect cursorRect = widget->cursorRect(cursor);
+        QPoint globalPos = widget->viewport()->mapToGlobal(cursorRect.topLeft());
+        QPoint localPos = widget->mapFromGlobal(globalPos);
+
+        int fontSize = widget->font().pixelSize();
+        if (fontSize <= 0) {
+            fontSize = widget->fontMetrics().height();
+        }
+
+        QTextCursor textCursor = widget->textCursor();
+
+        if (m_recentCharCount <= hintThreshold) {
+            textCursor
+                .movePosition(QTextCursor::Left, QTextCursor::KeepAnchor, m_recentCharCount);
+        } else {
+            textCursor.movePosition(QTextCursor::Left, QTextCursor::KeepAnchor, hintThreshold);
+        }
+
+        int x = localPos.x() + cursorRect.height();
+        int y = localPos.y() + cursorRect.height() / 4;
+
+        QPoint hintPos(x, y);
+
+        if (!m_hintHandler.isHintVisible()) {
+            m_hintHandler.showHint(widget, hintPos, fontSize);
+        } else {
+            m_hintHandler.updateHintPosition(widget, hintPos);
+        }
+
+        m_hintHideTimer.start();
+    }
+}
+
+bool QodeAssistClient::eventFilter(QObject *watched, QEvent *event)
+{
+    auto *editor = qobject_cast<TextEditor::TextEditorWidget *>(watched);
+    if (!editor)
+        return LanguageClient::Client::eventFilter(watched, event);
+
+    if (event->type() == QEvent::KeyPress) {
+        auto *keyEvent = static_cast<QKeyEvent *>(event);
+
+        // Check hint trigger key (0=Space, 1=Ctrl+Space, 2=Alt+Space, 3=Ctrl+Enter, 4=Tab, 5=Enter)
+        if (m_hintHandler.isHintVisible()) {
+            const int triggerKeyIndex = Settings::codeCompletionSettings().hintTriggerKey();
+            bool isMatchingKey = false;
+            const Qt::KeyboardModifiers modifiers = keyEvent->modifiers();
+
+            switch (triggerKeyIndex) {
+            case 0: // Space
+                isMatchingKey = (keyEvent->key() == Qt::Key_Space 
+                                 && (modifiers == Qt::NoModifier || modifiers == Qt::ShiftModifier));
+                break;
+            case 1: // Ctrl+Space
+                isMatchingKey = (keyEvent->key() == Qt::Key_Space 
+                                 && (modifiers & Qt::ControlModifier));
+                break;
+            case 2: // Alt+Space
+                isMatchingKey = (keyEvent->key() == Qt::Key_Space 
+                                 && (modifiers & Qt::AltModifier));
+                break;
+            case 3: // Ctrl+Enter
+                isMatchingKey = ((keyEvent->key() == Qt::Key_Return || keyEvent->key() == Qt::Key_Enter)
+                                 && (modifiers & Qt::ControlModifier));
+                break;
+            case 4: // Tab
+                isMatchingKey = (keyEvent->key() == Qt::Key_Tab);
+                break;
+            case 5: // Enter
+                isMatchingKey = ((keyEvent->key() == Qt::Key_Return || keyEvent->key() == Qt::Key_Enter)
+                                 && (modifiers == Qt::NoModifier || modifiers == Qt::ShiftModifier));
+                break;
+            }
+
+            if (isMatchingKey) {
+                m_hintHideTimer.stop();
+                m_hintHandler.hideHint();
+                requestCompletions(editor);
+                return true;
+            }
+        }
+
+        if (keyEvent->key() == Qt::Key_Escape) {
+            if (m_runningRequests.contains(editor)) {
+                cancelRunningRequest(editor);
+            }
+
+            if (m_scheduledRequests.contains(editor)) {
+                auto *timer = m_scheduledRequests.value(editor);
+                if (timer && timer->isActive()) {
+                    timer->stop();
+                }
+            }
+
+            if (m_refactorHandler && m_refactorHandler->isProcessing()) {
+                m_refactorHandler->cancelRequest();
+            }
+
+            m_progressHandler.hideProgress();
+            m_hintHideTimer.stop();
+            m_hintHandler.hideHint();
+        }
+    }
+
+    return LanguageClient::Client::eventFilter(watched, event);
+}
+
 } // namespace QodeAssist

QodeAssistClient.hpp

@@ -24,10 +24,15 @@
 
 #pragma once
 
+#include <QObject>
+
 #include "LLMClientInterface.hpp"
 #include "LSPCompletion.hpp"
 #include "QuickRefactorHandler.hpp"
+#include "RefactorSuggestionHoverHandler.hpp"
 #include "widgets/CompletionProgressHandler.hpp"
+#include "widgets/CompletionErrorHandler.hpp"
+#include "widgets/CompletionHintHandler.hpp"
 #include "widgets/EditorChatButtonHandler.hpp"
 #include <languageclient/client.h>
 #include <llmcore/IPromptProvider.hpp>
@@ -37,6 +42,7 @@ namespace QodeAssist {
 
 class QodeAssistClient : public LanguageClient::Client
 {
+    Q_OBJECT
 public:
     explicit QodeAssistClient(LLMClientInterface *clientInterface);
     ~QodeAssistClient() override;
@@ -47,6 +53,12 @@ public:
     void requestCompletions(TextEditor::TextEditorWidget *editor);
     void requestQuickRefactor(
         TextEditor::TextEditorWidget *editor, const QString &instructions = QString());
+    
+    bool isHintVisible() const;
+    void hideHintAndRequestCompletion(TextEditor::TextEditorWidget *editor);
+
+protected:
+    bool eventFilter(QObject *watched, QEvent *event) override;
 
 private:
     void scheduleRequest(TextEditor::TextEditorWidget *editor);
@@ -59,6 +71,9 @@ private:
     void cleanupConnections();
     void handleRefactoringResult(const RefactorResult &result);
 
+    void handleAutoRequestTrigger(TextEditor::TextEditorWidget *widget, int charsAdded, bool isSpaceOrTab);
+    void handleHintBasedTrigger(TextEditor::TextEditorWidget *widget, int charsAdded, bool isSpaceOrTab, QTextCursor &cursor);
+
     QHash<TextEditor::TextEditorWidget *, GetCompletionRequest> m_runningRequests;
     QHash<TextEditor::TextEditorWidget *, QTimer *> m_scheduledRequests;
     QMetaObject::Connection m_documentOpenedConnection;
@@ -66,9 +81,13 @@ private:
 
     QElapsedTimer m_typingTimer;
     int m_recentCharCount;
+    QTimer m_hintHideTimer;
     CompletionProgressHandler m_progressHandler;
+    CompletionErrorHandler m_errorHandler;
+    CompletionHintHandler m_hintHandler;
     EditorChatButtonHandler m_chatButtonHandler;
     QuickRefactorHandler *m_refactorHandler{nullptr};
+    RefactorSuggestionHoverHandler *m_refactorHoverHandler{nullptr};
     LLMClientInterface *m_llmClient;
 };
 

QodeAssist_en_001.ts

@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1" language="en_001"></TS>

QuickRefactorHandler.cpp

@@ -28,38 +28,21 @@
 #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>
+#include <settings/QuickRefactorSettings.hpp>
 
 namespace QodeAssist {
 
 QuickRefactorHandler::QuickRefactorHandler(QObject *parent)
     : QObject(parent)
-    , m_requestHandler(new LLMCore::RequestHandler(this))
     , m_currentEditor(nullptr)
     , m_isRefactoringInProgress(false)
     , m_contextManager(this)
 {
-    connect(
-        m_requestHandler,
-        &LLMCore::RequestHandler::completionReceived,
-        this,
-        &QuickRefactorHandler::handleLLMResponse);
-
-    connect(
-        m_requestHandler,
-        &LLMCore::RequestHandler::requestFinished,
-        this,
-        [this](const QString &requestId, bool success, const QString &errorString) {
-            if (!success && requestId == m_lastRequestId) {
-                m_isRefactoringInProgress = false;
-                RefactorResult result;
-                result.success = false;
-                result.errorMessage = errorString;
-                emit refactoringCompleted(result);
-            }
-        });
 }
 
 QuickRefactorHandler::~QuickRefactorHandler() {}
@@ -128,43 +111,66 @@ void QuickRefactorHandler::prepareAndSendRequest(
     auto &providerRegistry = LLMCore::ProvidersManager::instance();
     auto &promptManager = LLMCore::PromptTemplateManager::instance();
 
-    const auto providerName = settings.caProvider();
+    const auto providerName = settings.qrProvider();
     auto provider = providerRegistry.getProviderByName(providerName);
 
     if (!provider) {
-        LOG_MESSAGE(QString("No provider found with name: %1").arg(providerName));
+        QString error = QString("No provider found with name: %1").arg(providerName);
+        LOG_MESSAGE(error);
         RefactorResult result;
         result.success = false;
-        result.errorMessage = QString("No provider found with name: %1").arg(providerName);
+        result.errorMessage = error;
+        result.editor = editor;
         emit refactoringCompleted(result);
         return;
     }
 
-    const auto templateName = settings.caTemplate();
+    const auto templateName = settings.qrTemplate();
     auto promptTemplate = promptManager.getChatTemplateByName(templateName);
 
     if (!promptTemplate) {
-        LOG_MESSAGE(QString("No template found with name: %1").arg(templateName));
+        QString error = QString("No template found with name: %1").arg(templateName);
+        LOG_MESSAGE(error);
         RefactorResult result;
         result.success = false;
-        result.errorMessage = QString("No template found with name: %1").arg(templateName);
+        result.errorMessage = error;
+        result.editor = editor;
         emit refactoringCompleted(result);
         return;
     }
 
     LLMCore::LLMConfig config;
-    config.requestType = LLMCore::RequestType::Chat;
+    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", Settings::chatAssistantSettings().stream()}};
+    config.url = QString("%1%2").arg(settings.qrUrl(), provider->chatEndpoint());
     config.apiKey = provider->apiKey();
 
+    if (provider->providerID() == LLMCore::ProviderID::GoogleAI) {
+        QString stream = QString{"streamGenerateContent?alt=sse"};
+        config.url = QUrl(QString("%1/models/%2:%3")
+                              .arg(
+                                  Settings::generalSettings().qrUrl(),
+                                  Settings::generalSettings().qrModel(),
+                                  stream));
+    } else {
+        config.url
+            = QString("%1%2").arg(Settings::generalSettings().qrUrl(), provider->chatEndpoint());
+        config.providerRequest
+            = {{"model", Settings::generalSettings().qrModel()}, {"stream", true}};
+    }
+
     LLMCore::ContextData context = prepareContext(editor, range, instructions);
 
-    provider
-        ->prepareRequest(config.providerRequest, promptTemplate, context, LLMCore::RequestType::Chat);
+    bool enableTools = Settings::quickRefactorSettings().useTools();
+    bool enableThinking = Settings::quickRefactorSettings().useThinking();
+    provider->prepareRequest(
+        config.providerRequest,
+        promptTemplate,
+        context,
+        LLMCore::RequestType::QuickRefactoring,
+        enableTools,
+        enableThinking);
 
     QString requestId = QUuid::createUuid().toString();
     m_lastRequestId = requestId;
@@ -172,7 +178,23 @@ void QuickRefactorHandler::prepareAndSendRequest(
 
     m_isRefactoringInProgress = true;
 
-    m_requestHandler->sendLLMRequest(config, request);
+    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(
@@ -194,22 +216,87 @@ LLMCore::ContextData QuickRefactorHandler::prepareContext(
     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;
+    Context::DocumentContextReader
+        reader(documentInfo.document, documentInfo.mimeType, documentInfo.filePath);
+
+    QString taggedContent;
+    bool readFullFile = Settings::quickRefactorSettings().readFullFile();
 
     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>");
+        int selEnd = cursor.selectionEnd();
+
+        QTextBlock startBlock = documentInfo.document->findBlock(selStart);
+        int startLine = startBlock.blockNumber();
+        int startColumn = selStart - startBlock.position();
+
+        QTextBlock endBlock = documentInfo.document->findBlock(selEnd);
+        int endLine = endBlock.blockNumber();
+        int endColumn = selEnd - endBlock.position();
+
+        QString contextBefore;
+        if (readFullFile) {
+            contextBefore = reader.readWholeFileBefore(startLine, startColumn);
+        } else {
+            contextBefore = reader.getContextBefore(
+                startLine, startColumn, Settings::quickRefactorSettings().readStringsBeforeCursor() + 1);
+        }
+
+        QString selectedText = cursor.selectedText();
+        selectedText.replace(QChar(0x2029), "\n");
+
+        QString contextAfter;
+        if (readFullFile) {
+            contextAfter = reader.readWholeFileAfter(endLine, endColumn);
+        } else {
+            contextAfter = reader.getContextAfter(
+                endLine, endColumn, Settings::quickRefactorSettings().readStringsAfterCursor() + 1);
+        }
+
+        taggedContent = contextBefore;
+        if (selStart == cursorPos) {
+            taggedContent += "<cursor><selection_start>" + selectedText + "<selection_end>";
+        } else {
+            taggedContent += "<selection_start>" + selectedText + "<selection_end><cursor>";
+        }
+        taggedContent += contextAfter;
     } else {
-        taggedContent.insert(cursorPos, "<cursor>");
+        QTextBlock block = documentInfo.document->findBlock(cursorPos);
+        int line = block.blockNumber();
+        int column = cursorPos - block.position();
+
+        QString contextBefore;
+        if (readFullFile) {
+            contextBefore = reader.readWholeFileBefore(line, column);
+        } else {
+            contextBefore = reader.getContextBefore(
+                line, column, Settings::quickRefactorSettings().readStringsBeforeCursor() + 1);
+        }
+
+        QString contextAfter;
+        if (readFullFile) {
+            contextAfter = reader.readWholeFileAfter(line, column);
+        } else {
+            contextAfter = reader.getContextAfter(
+                line, column, Settings::quickRefactorSettings().readStringsAfterCursor() + 1);
+        }
+
+        taggedContent = contextBefore + "<cursor>" + contextAfter;
+    }
+
+    QString systemPrompt = Settings::quickRefactorSettings().systemPrompt();
+
+    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");
+        }
     }
 
-    QString systemPrompt = Settings::codeCompletionSettings().quickRefactorSystemPrompt();
     systemPrompt += "\n\nFile information:";
     systemPrompt += "\nLanguage: " + documentInfo.mimeType;
     systemPrompt += "\nFile path: " + documentInfo.filePath;
@@ -250,6 +337,8 @@ void QuickRefactorHandler::handleLLMResponse(
     }
 
     if (isComplete) {
+        m_isRefactoringInProgress = false;
+        
         QString cleanedResponse = response.trimmed();
         if (cleanedResponse.startsWith("```")) {
             int firstNewLine = cleanedResponse.indexOf('\n');
@@ -267,6 +356,7 @@ void QuickRefactorHandler::handleLLMResponse(
         result.newText = cleanedResponse;
         result.insertRange = m_currentRange;
         result.success = true;
+        result.editor = m_currentEditor;
 
         LOG_MESSAGE("Refactoring completed successfully. New code to insert: ");
         LOG_MESSAGE("---------- BEGIN REFACTORED CODE ----------");
@@ -280,7 +370,17 @@ void QuickRefactorHandler::handleLLMResponse(
 void QuickRefactorHandler::cancelRequest()
 {
     if (m_isRefactoringInProgress) {
-        m_requestHandler->cancelRequest(m_lastRequestId);
+        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;
@@ -290,4 +390,26 @@ void QuickRefactorHandler::cancelRequest()
     }
 }
 
+void QuickRefactorHandler::handleFullResponse(const QString &requestId, const QString &fullText)
+{
+    if (requestId == m_lastRequestId) {
+        m_activeRequests.remove(requestId);
+        QJsonObject request{{"id", requestId}};
+        handleLLMResponse(fullText, request, true);
+    }
+}
+
+void QuickRefactorHandler::handleRequestFailed(const QString &requestId, const QString &error)
+{
+    if (requestId == m_lastRequestId) {
+        m_activeRequests.remove(requestId);
+        m_isRefactoringInProgress = false;
+        RefactorResult result;
+        result.success = false;
+        result.errorMessage = error;
+        result.editor = m_currentEditor;
+        emit refactoringCompleted(result);
+    }
+}
+
 } // namespace QodeAssist

QuickRefactorHandler.hpp

@@ -27,7 +27,8 @@
 
 #include <context/ContextManager.hpp>
 #include <context/IDocumentReader.hpp>
-#include <llmcore/RequestHandler.hpp>
+#include <llmcore/ContextData.hpp>
+#include <llmcore/Provider.hpp>
 
 namespace QodeAssist {
 
@@ -37,6 +38,7 @@ struct RefactorResult
     Utils::Text::Range insertRange;
     bool success;
     QString errorMessage;
+    TextEditor::TextEditorWidget *editor{nullptr};
 };
 
 class QuickRefactorHandler : public QObject
@@ -50,10 +52,15 @@ public:
     void sendRefactorRequest(TextEditor::TextEditorWidget *editor, const QString &instructions);
 
     void cancelRequest();
+    bool isProcessing() const { return m_isRefactoringInProgress; }
 
 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,
@@ -66,7 +73,13 @@ private:
         const Utils::Text::Range &range,
         const QString &instructions);
 
-    LLMCore::RequestHandler *m_requestHandler;
+    struct RequestContext
+    {
+        QJsonObject originalRequest;
+        LLMCore::Provider *provider;
+    };
+
+    QHash<QString, RequestContext> m_activeRequests;
     TextEditor::TextEditorWidget *m_currentEditor;
     Utils::Text::Range m_currentRange;
     bool m_isRefactoringInProgress;

README.md

@@ -2,10 +2,9 @@
 [![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.1-brightgreen)
 [![](https://dcbadge.limes.pink/api/server/BGMkUsXUgf?style=flat)](https://discord.gg/BGMkUsXUgf)
 
-![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.
+![qodeassist-icon](https://github.com/user-attachments/assets/dc336712-83cb-440d-8761-8d0a31de898d) QodeAssist is a comprehensive AI-powered coding assistant plugin for Qt Creator. It provides intelligent code completion, interactive chat with multiple interface options, inline quick refactoring, and AI function calling capabilities for C++ and QML development. Supporting both local providers (Ollama, llama.cpp, LM Studio) and cloud services (Claude, OpenAI, Google AI, Mistral AI), QodeAssist enhances your productivity with context-aware AI assistance, project-specific rules, and extensive customization options directly in your Qt development environment.
 
 ⚠️ **Important Notice About Paid Providers**
 > When using paid providers like Claude, OpenRouter or OpenAI-compatible services:
@@ -15,49 +14,30 @@
 
 ## 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. [Install Plugin](#install-plugin-to-qtcreator)
+3. [Configuration](#configuration)
+4. [Features](#features)
+5. [Context Layers](#context-layers)
+6. [QtCreator Version Compatibility](#qtcreator-version-compatibility)
+7. [Hotkeys](#hotkeys)
+8. [Troubleshooting](#troubleshooting)
+9. [Development Progress](#development-progress)
+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
-  - 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)
-- 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)
-- Extensive library of model-specific templates
-- Easy configuration and model selection
+QodeAssist enhances Qt Creator with AI-powered coding assistance:
 
-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!
+- **Code Completion**: Intelligent, context-aware code suggestions for C++ and QML
+- **Chat Assistant**: Multiple interface options (popup window, side panel, bottom panel)
+- **Quick Refactoring**: Inline AI-assisted code improvements directly in editor with custom instructions library
+- **File Context**: Attach or link files for better AI understanding
+- **Tool Calling**: AI can read project files, search code, and access diagnostics
+- **Multiple Providers**: Support for Ollama, Claude, OpenAI, Google AI, Mistral AI, llama.cpp, and more
+- **Customizable**: Project-specific rules, custom instructions, and extensive model templates
+
+**Join our [Discord Community](https://discord.gg/BGMkUsXUgf)** to get support and connect with other users!
 
 <details>
   <summary>Code completion: (click to expand)</summary>
@@ -84,12 +64,53 @@ 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>
+
 <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
+
+### Method 1: Using QodeAssistUpdater (Beta)
+
+QodeAssistUpdater is a command-line utility that automates plugin installation and updates with automatic Qt Creator version detection and checksum verification.
+
+**Features:**
+- Automatic Qt Creator version detection
+- Install, update, or remove plugin with single command
+- List all available plugin versions
+- Install specific plugin version
+- Checksum verification
+- Non-interactive mode for CI/CD
+
+**Installation:**
+
+Download pre-built binary from [QodeAssistUpdater releases](https://github.com/Palm1r/QodeAssistUpdater/releases) or build from source
+
+**Usage:**
+
+```bash
+# Check current status and available updates
+./qodeassist-updater --status
+
+# Install latest version
+./qodeassist-updater --install
+```
+
+For more information, visit the [QodeAssistUpdater repository](https://github.com/Palm1r/QodeAssistUpdater).
+
+### Method 2: Manual Installation
+
 1. Install Latest Qt Creator
 2. Download the QodeAssist plugin for your Qt Creator
    - Remove old version plugin if already was installed
@@ -102,232 +123,263 @@ Join our Discord Community: Have questions or want to discuss QodeAssist? Join o
    - 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
+## Configuration
+
+QodeAssist supports multiple LLM providers. Choose your preferred provider and follow the configuration guide:
+
+### Supported Providers
+
+- **[Ollama](docs/ollama-configuration.md)** - Local LLM provider
+- **[llama.cpp](docs/llamacpp-configuration.md)** - Local LLM server
+- **[Anthropic Claude](docs/claude-configuration.md)** - Сloud provider
+- **[OpenAI](docs/openai-configuration.md)** - Сloud provider
+- **[Mistral AI](docs/mistral-configuration.md)** - Сloud provider
+- **[Google AI](docs/google-ai-configuration.md)** - Сloud provider
+- **LM Studio** - Local LLM provider
+- **OpenAI-compatible** - Custom providers (OpenRouter, etc.)
+
+### Additional Configuration
+
+- **[Project Rules](docs/project-rules.md)** - Customize AI behavior for your project
+- **[Ignoring Files](docs/ignoring-files.md)** - Exclude files from context using `.qodeassistignore`
+
+## Features
+
+### Code Completion
+- AI-powered intelligent code completion
+- Support for C++ and QML
+- Context-aware suggestions
+- Multiline completions
+
+#### Completion Trigger Modes
+
+QodeAssist offers two trigger modes for code completion:
+
+**Hint-based (Default, Recommended)**
+- Shows a hint indicator near cursor when you type 3+ characters
+- Press **Space** (or custom key) to request completion
+- **Best for**: Paid APIs (Claude, OpenAI), conscious control
+- **Benefits**: No unexpected API charges, full control over requests, no workflow interruption
+- **Visual**: Clear indicator shows when completion is ready
+
+**Automatic**
+- Automatically requests completion after typing threshold
+- Works immediately without additional keypresses
+- **Best for**: Local models (Ollama, llama.cpp), maximum automation
+- **Benefits**: Hands-free experience, instant suggestions
+
+💡 **Tip**: Start with Hint-based to avoid unexpected costs. Switch to Automatic if using free local models.
+
+Configure in: `Tools → Options → QodeAssist → Code Completion → General Settings`
+
+### Chat Assistant
+- Multiple chat panels: side panel, bottom panel, and popup window
+- Chat history with auto-save and restore
+- Token usage monitoring
+- **[File Context](docs/file-context.md)** - Attach or link files for better context
+- Automatic syncing with open editor files (optional)
+- Extended thinking mode (Claude, other providers in plan) - Enable deeper reasoning for complex tasks
+
+### Quick Refactoring
+- Inline code refactoring directly in the editor with AI assistance
+- Selection-based improvements with instant code replacement
+- Built-in quick actions (repeat, improve, alternative)
+- **Custom instructions library** with search and autocomplete
+- Create, edit, and manage reusable refactoring templates
+- Combine base instructions with specific details
+- **[Learn more](docs/quick-refactoring.md)**
+
+### Tools & Function Calling
+- Read project files
+- List and search in project
+- Access linter/compiler issues
+- Enabled by default (can be disabled)
+
+## Context Layers
+
+QodeAssist uses a flexible prompt composition system that adapts to different contexts. Here's how prompts are constructed for each feature:
+
 <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>
+  <summary><strong>Code Completion (FIM Models)</strong> - Codestral, Qwen2.5-Coder, DeepSeek-Coder (click to expand)</summary>
 
-## 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:
-
-For standard computers (minimum 8GB RAM):
 ```
-ollama run qwen2.5-coder:7b
-```
-For better performance (16GB+ RAM):
-```
-ollama run qwen2.5-coder:14b
-```
-For high-end systems (32GB+ RAM):
-```
-ollama run qwen2.5-coder:32b
+┌─────────────────────────────────────────────────────────────────────────────┐
+│                         CODE COMPLETION (FIM Models)                        │
+├─────────────────────────────────────────────────────────────────────────────┤
+│  Examples: Codestral, Qwen2.5-Coder, DeepSeek-Coder                        │
+│                                                                              │
+│  1. System Prompt (from Code Completion Settings - FIM variant)            │
+│  2. Project Rules:                                                          │
+│     └─ .qodeassist/rules/completion/*.md                                   │
+│  3. Open Files Context (optional, if enabled):                             │
+│     └─ Currently open editor files                                         │
+│  4. Code Context:                                                           │
+│     ├─ Code before cursor (prefix)                                         │
+│     └─ Code after cursor (suffix)                                          │
+│                                                                              │
+│  Final Prompt: FIM_Template(Prefix: SystemPrompt + Rules + OpenFiles +     │
+│                                     CodeBefore,                             │
+│                             Suffix: CodeAfter)                              │
+└─────────────────────────────────────────────────────────────────────────────┘
 ```
 
-1. Open Qt Creator settings (Edit > Preferences on Linux/Windows, Qt Creator > Preferences on macOS)
-2. Navigate to the "QodeAssist" 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
-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)
 <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" />
+  <summary><strong>Code Completion (Non-FIM Models)</strong> - DeepSeek-Coder-Instruct, Qwen2.5-Coder-Instruct (click to expand)</summary>
+
+```
+┌─────────────────────────────────────────────────────────────────────────────┐
+│                     CODE COMPLETION (Non-FIM/Chat Models)                   │
+├─────────────────────────────────────────────────────────────────────────────┤
+│  Examples: DeepSeek-Coder-Instruct, Qwen2.5-Coder-Instruct                 │
+│                                                                              │
+│  1. System Prompt (from Code Completion Settings - Non-FIM variant)        │
+│     └─ Includes response formatting instructions                           │
+│  2. Project Rules:                                                          │
+│     └─ .qodeassist/rules/completion/*.md                                   │
+│  3. Open Files Context (optional, if enabled):                             │
+│     └─ Currently open editor files                                         │
+│  4. Code Context:                                                           │
+│     ├─ File information (language, path)                                   │
+│     ├─ Code before cursor                                                  │
+│     ├─ <cursor> marker                                                     │
+│     └─ Code after cursor                                                   │
+│  5. User Message: "Complete the code at cursor position"                   │
+│                                                                              │
+│  Final Prompt: [System: SystemPrompt + Rules]                              │
+│                [User: OpenFiles + Context + CompletionRequest]              │
+└─────────────────────────────────────────────────────────────────────────────┘
+```
+
 </details>
 
-## System Prompt Configuration
+<details>
+  <summary><strong>Chat Assistant</strong> - Interactive coding assistant (click to expand)</summary>
 
-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.
+```
+┌─────────────────────────────────────────────────────────────────────────────┐
+│                            CHAT ASSISTANT                                   │
+├─────────────────────────────────────────────────────────────────────────────┤
+│  1. System Prompt (from Chat Assistant Settings)                           │
+│  2. Project Rules:                                                          │
+│     ├─ .qodeassist/rules/common/*.md                                       │
+│     └─ .qodeassist/rules/chat/*.md                                         │
+│  3. File Context (optional):                                               │
+│     ├─ Attached files (manual)                                             │
+│     ├─ Linked files (persistent)                                           │
+│     └─ Open editor files (if auto-sync enabled)                            │
+│  4. Tool Definitions (if enabled):                                         │
+│     ├─ ReadProjectFileByName                                               │
+│     ├─ ListProjectFiles                                                    │
+│     ├─ SearchInProject                                                     │
+│     └─ GetIssuesList                                                       │
+│  5. Conversation History                                                    │
+│  6. User Message                                                            │
+│                                                                              │
+│  Final Prompt: [System: SystemPrompt + Rules + Tools]                      │
+│                [History: Previous messages]                                 │
+│                [User: FileContext + UserMessage]                            │
+└─────────────────────────────────────────────────────────────────────────────┘
+```
 
-## File Context Feature
+</details>
 
-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.
+<details>
+  <summary><strong>Quick Refactoring</strong> - Inline code improvements (click to expand)</summary>
 
-### Attached Files
+```
+┌─────────────────────────────────────────────────────────────────────────────┐
+│                         QUICK REFACTORING                                   │
+├─────────────────────────────────────────────────────────────────────────────┤
+│  1. System Prompt (from Quick Refactor Settings)                           │
+│  2. Project Rules:                                                          │
+│     ├─ .qodeassist/rules/common/*.md                                       │
+│     └─ .qodeassist/rules/quickrefactor/*.md                                │
+│  3. Code Context:                                                           │
+│     ├─ File information (language, path)                                   │
+│     ├─ Code before selection (configurable amount)                         │
+│     ├─ <selection_start> marker                                            │
+│     ├─ Selected code (or current line)                                     │
+│     ├─ <selection_end> marker                                              │
+│     ├─ <cursor> marker (position within selection)                         │
+│     └─ Code after selection (configurable amount)                          │
+│  4. Refactor Instruction:                                                   │
+│     ├─ Built-in (e.g., "Improve Code", "Alternative Solution")             │
+│     ├─ Custom Instruction (from library)                                   │
+│     │  └─ ~/.config/QtProject/qtcreator/qodeassist/                        │
+│     │      quick_refactor/instructions/*.json                              │
+│     └─ Additional Details (optional user input)                            │
+│  5. Tool Definitions (if enabled)                                          │
+│                                                                              │
+│  Final Prompt: [System: SystemPrompt + Rules]                              │
+│                [User: Context + Markers + Instruction + Details]            │
+└─────────────────────────────────────────────────────────────────────────────┘
+```
 
-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
+</details>
 
-### Linked Files
+### Key Points
 
-Linked files provide persistent context throughout the conversation:
+- **Project Rules** are automatically loaded from `.qodeassist/rules/` directory structure
+- **System Prompts** are configured independently for each feature in Settings
+- **FIM vs Non-FIM models** for code completion use different System Prompts:
+  - FIM models: Direct completion prompt
+  - Non-FIM models: Prompt includes response formatting instructions
+- **Quick Refactor** has its own provider/model configuration, independent from Chat
+- **Custom Instructions** provide reusable templates that can be augmented with specific details
+- **Tool Calling** is available for Chat and Quick Refactor when enabled
 
-  - 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]
+See [Project Rules Documentation](docs/project-rules.md) and [Quick Refactoring Guide](docs/quick-refactoring.md) for more details.
 
 ## QtCreator Version Compatibility
 
-- QtCreator 16.0.1 - 0.5.7 - 0.x.x
-- 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
-
-## Development Progress
-
-- [x] Basic plugin with code autocomplete functionality
-- [x] Improve and automate settings
-- [x] Add chat functionality
-- [x] Sharing diff with model
-- [ ] Sharing project source with model
-- [ ] Support for more providers and models
-- [ ] Support MCP
+| Qt Creator Version | QodeAssist Version |
+|-------------------|-------------------|
+| 17.0.0+ | 0.6.0 - 0.x.x |
+| 16.0.2 | 0.5.13 - 0.x.x |
+| 16.0.1 | 0.5.7 - 0.5.13 |
+| 16.0.0 | 0.5.2 - 0.5.6 |
+| 15.0.1 | 0.4.8 - 0.5.1 |
+| 15.0.0 | 0.4.0 - 0.4.7 |
+| 14.0.2 | 0.2.3 - 0.3.x |
+| 14.0.1 | ≤ 0.2.2 |
 
 ## Hotkeys
 
-- 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
+All hotkeys can be customized in Qt Creator Settings. Default hotkeys:
 
-## 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
-
-```
+| Action | macOS | Windows/Linux |
+|--------|-------|--------------|
+| Open chat window | ⌥⌘W | Ctrl+Alt+W |
+| Close chat window | ⌥⌘S | Ctrl+Alt+S |
+| Manual code suggestion | ⌥⌘Q | Ctrl+Alt+Q |
+| Accept full suggestion | Tab | Tab |
+| Accept word | ⌥→ | Alt+→ |
+| Quick refactor | ⌥⌘R | Ctrl+Alt+R |
     
 ## Troubleshooting
 
-If QodeAssist is having problems connecting to the LLM provider, please check the following:
+Having issues with QodeAssist? Check our [detailed troubleshooting guide](docs/troubleshooting.md) for:
 
-1. Verify the IP address and port:
+- Connection issues and provider URLs
+- Model and template compatibility
+- Platform-specific issues (Linux, macOS, Windows)
+- Resetting settings to defaults
+- Common problems and solutions
 
-    - For Ollama, the default is usually http://localhost:11434
-    - For LM Studio, the default is usually http://localhost:1234
+For additional support, join our [Discord Community](https://discord.gg/BGMkUsXUgf) or check [GitHub Issues](https://github.com/Palm1r/QodeAssist/issues).
 
-2. Confirm that the selected model and template are compatible:
+## Development Progress
 
-    Ensure you've chosen the correct model in the "Select Models" option
-    Verify that the selected prompt template matches the model you're using
-
-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
-
-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
-3. Pick settings page for reset
-4. Click on the "Reset Page to Defaults" button
-    - The API key will not reset
-    - Select model after reset
+- [x] Code completion functionality
+- [x] Chat assistant with multiple panels
+- [x] Diff sharing with models
+- [x] Tools/function calling support
+- [x] Project-specific rules
+- [ ] Full project source sharing
+- [ ] Additional provider support
+- [ ] MCP (Model Context Protocol) support
 
 ## Support the development of QodeAssist
 If you find QodeAssist helpful, there are several ways you can support the project:
@@ -348,20 +400,43 @@ Every contribution, no matter how small, is greatly appreciated and helps keep t
 
 ## How to Build
 
-Create a build directory and run
+### Prerequisites
+- CMake 3.16+
+- C++20 compatible compiler
+- Qt Creator development files
 
-    cmake -DCMAKE_PREFIX_PATH=<path_to_qtcreator> -DCMAKE_BUILD_TYPE=RelWithDebInfo <path_to_plugin_source>
-    cmake --build .
+### Build Steps
 
-where `<path_to_qtcreator>` is the relative or absolute path to a Qt Creator build directory, or to a
-combined binary and development package (Windows / Linux), or to the `Qt Creator.app/Contents/Resources/`
-directory of a combined binary and development package (macOS), and `<path_to_plugin_source>` is the
-relative or absolute path to this plugin directory.
+1. Create a build directory:
+
+```bash
+mkdir build && cd build
+```
+
+2. Configure and build:
+
+```bash
+cmake -DCMAKE_PREFIX_PATH=<path_to_qtcreator> -DCMAKE_BUILD_TYPE=RelWithDebInfo <path_to_plugin_source>
+cmake --build .
+```
+
+**Path specifications:**
+- `<path_to_qtcreator>`:
+  - **Windows/Linux**: Qt Creator build directory or combined binary package
+  - **macOS**: `Qt Creator.app/Contents/Resources/`
+- `<path_to_plugin_source>`: Path to this plugin directory
 
 ## For Contributors
 
-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
+### Code Style
+
+- **QML**: Follow [QML Coding Guide](https://github.com/Furkanzmc/QML-Coding-Guide) by @Furkanzmc
+- **C++**: Use `.clang-format` configuration in the project root
+- Run formatting before submitting PRs
+
+### Development Guidelines
+
+For detailed development guidelines, architecture patterns, and best practices, see the [project workspace rules](.cursor/rules.mdc).
 
 ![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)

RefactorSuggestion.cpp

@@ -0,0 +1,202 @@
+/* 
+ * 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 "RefactorSuggestion.hpp"
+#include "LLMSuggestion.hpp"
+
+#include <QTextBlock>
+#include <QTextCursor>
+#include <QTextDocument>
+
+#include <texteditor/texteditor.h>
+#include <logger/Logger.hpp>
+
+namespace QodeAssist {
+
+namespace {
+QString extractLeadingWhitespace(const QString &text)
+{
+    QString indent;
+    int firstLineEnd = text.indexOf('\n');
+    QString firstLine = (firstLineEnd != -1) ? text.left(firstLineEnd) : text;
+    for (int i = 0; i < firstLine.length(); ++i) {
+        if (firstLine[i].isSpace()) {
+            indent += firstLine[i];
+        } else {
+            break;
+        }
+    }
+    return indent;
+}
+} // anonymous namespace
+
+RefactorSuggestion::RefactorSuggestion(const Data &suggestion, QTextDocument *sourceDocument)
+    : TextEditor::TextSuggestion([&suggestion, sourceDocument]() {
+        Data expandedData = suggestion;
+        
+        int startPos = suggestion.range.begin.toPositionInDocument(sourceDocument);
+        int endPos = suggestion.range.end.toPositionInDocument(sourceDocument);
+        startPos = qBound(0, startPos, sourceDocument->characterCount());
+        endPos = qBound(0, endPos, sourceDocument->characterCount());
+        
+        if (startPos != endPos) {
+            QTextCursor startCursor(sourceDocument);
+            startCursor.setPosition(startPos);
+            int startPosInBlock = startCursor.positionInBlock();
+            
+            if (startPosInBlock > 0) {
+                startCursor.movePosition(QTextCursor::StartOfBlock);
+            }
+            
+            QTextCursor endCursor(sourceDocument);
+            endCursor.setPosition(endPos);
+            int endPosInBlock = endCursor.positionInBlock();
+            
+            if (endPosInBlock > 0) {
+                endCursor.movePosition(QTextCursor::EndOfBlock);
+                if (!endCursor.atEnd()) {
+                    endCursor.movePosition(QTextCursor::NextCharacter);
+                }
+            }
+            
+            Utils::Text::Position expandedBegin = Utils::Text::Position::fromPositionInDocument(
+                sourceDocument, startCursor.position());
+            Utils::Text::Position expandedEnd = Utils::Text::Position::fromPositionInDocument(
+                sourceDocument, endCursor.position());
+            
+            expandedData.range = Utils::Text::Range(expandedBegin, expandedEnd);
+        }
+        
+        return expandedData;
+    }(), sourceDocument)
+    , m_suggestionData(suggestion)
+{
+    const QString refactoredText = suggestion.text;
+    
+    int startPos = suggestion.range.begin.toPositionInDocument(sourceDocument);
+    int endPos = suggestion.range.end.toPositionInDocument(sourceDocument);
+    startPos = qBound(0, startPos, sourceDocument->characterCount());
+    endPos = qBound(0, endPos, sourceDocument->characterCount());
+
+    QTextCursor startCursor(sourceDocument);
+    startCursor.setPosition(startPos);
+    
+    if (startPos == endPos) {
+        QTextBlock block = startCursor.block();
+        QString blockText = block.text();
+        int startPosInBlock = startCursor.positionInBlock();
+        
+        QString leftText = blockText.left(startPosInBlock);
+        QString rightText = blockText.mid(startPosInBlock);
+        
+        QString displayText = leftText + refactoredText + rightText;
+        replacementDocument()->setPlainText(displayText);
+        
+    } else {
+        QTextCursor fullLinesCursor(sourceDocument);
+        fullLinesCursor.setPosition(startPos);
+        fullLinesCursor.movePosition(QTextCursor::StartOfBlock);
+        int fullLinesStart = fullLinesCursor.position();
+        
+        fullLinesCursor.setPosition(endPos);
+        fullLinesCursor.movePosition(QTextCursor::EndOfBlock);
+        int fullLinesEnd = fullLinesCursor.position();
+        
+        fullLinesCursor.setPosition(fullLinesStart);
+        fullLinesCursor.setPosition(fullLinesEnd, QTextCursor::KeepAnchor);
+        QString fullLinesText = fullLinesCursor.selectedText();
+        fullLinesText.replace(QChar(0x2029), "\n");
+        
+        QString oldIndent = extractLeadingWhitespace(fullLinesText);
+        QString newIndent = extractLeadingWhitespace(refactoredText);
+        
+        QString displayText = refactoredText;
+        if (newIndent.length() < oldIndent.length()) {
+            QString indentDiff = oldIndent.left(oldIndent.length() - newIndent.length());
+            QStringList lines = refactoredText.split('\n');
+            if (!lines.isEmpty() && !lines[0].trimmed().isEmpty()) {
+                lines[0] = indentDiff + lines[0];
+                displayText = lines.join('\n');
+            }
+        }
+        
+        replacementDocument()->setPlainText(displayText);
+    }
+}
+
+bool RefactorSuggestion::apply()
+{
+    const QString text = m_suggestionData.text;
+    const Utils::Text::Range range = m_suggestionData.range;
+
+    const QTextCursor startCursor = range.begin.toTextCursor(sourceDocument());
+    const QTextCursor endCursor = range.end.toTextCursor(sourceDocument());
+    
+    const int startPos = startCursor.position();
+    const int endPos = endCursor.position();
+    
+    QTextCursor editCursor(sourceDocument());
+    editCursor.beginEditBlock();
+
+    if (startPos == endPos) {
+        editCursor.setPosition(startPos);
+        editCursor.insertText(text);
+    } else {
+        editCursor.setPosition(startPos);
+        editCursor.setPosition(endPos, QTextCursor::KeepAnchor);
+        QString selectedText = editCursor.selectedText();
+        selectedText.replace(QChar(0x2029), "\n");
+        
+        QString oldIndent = extractLeadingWhitespace(selectedText);
+        QString newIndent = extractLeadingWhitespace(text);
+        
+        QString textToInsert = text;
+        if (newIndent.length() < oldIndent.length()) {
+            QString indentDiff = oldIndent.left(oldIndent.length() - newIndent.length());
+            QStringList lines = text.split('\n');
+            if (!lines.isEmpty() && !lines[0].trimmed().isEmpty()) {
+                lines[0] = indentDiff + lines[0];
+                textToInsert = lines.join('\n');
+            }
+        }
+        
+        editCursor.setPosition(startPos);
+        editCursor.setPosition(endPos, QTextCursor::KeepAnchor);
+        editCursor.removeSelectedText();
+        editCursor.insertText(textToInsert);
+    }
+
+    editCursor.endEditBlock();
+    return true;
+}
+
+bool RefactorSuggestion::applyWord(TextEditor::TextEditorWidget *widget)
+{
+    Q_UNUSED(widget)
+    return apply();
+}
+
+bool RefactorSuggestion::applyLine(TextEditor::TextEditorWidget *widget)
+{
+    Q_UNUSED(widget)
+    return apply();
+}
+
+} // namespace QodeAssist
+

RefactorSuggestion.hpp

@@ -0,0 +1,43 @@
+/* 
+ * 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 <texteditor/texteditor.h>
+#include <texteditor/textsuggestion.h>
+
+namespace QodeAssist {
+
+class RefactorSuggestion : public TextEditor::TextSuggestion
+{
+public:
+    RefactorSuggestion(const Data &suggestion, QTextDocument *sourceDocument);
+
+    bool apply() override;
+
+    bool applyWord(TextEditor::TextEditorWidget *widget) override;
+
+    bool applyLine(TextEditor::TextEditorWidget *widget) override;
+
+private:
+    Data m_suggestionData;
+};
+
+} // namespace QodeAssist
+

RefactorSuggestionHoverHandler.cpp

@@ -0,0 +1,210 @@
+/* 
+ * 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 "RefactorSuggestionHoverHandler.hpp"
+#include "RefactorSuggestion.hpp"
+
+#include <QColor>
+#include <QHBoxLayout>
+#include <QPushButton>
+#include <QScopeGuard>
+#include <QTextBlock>
+#include <QTextCursor>
+#include <QWidget>
+
+#include <texteditor/textdocumentlayout.h>
+#include <texteditor/texteditor.h>
+#include <utils/theme/theme.h>
+#include <utils/tooltip/tooltip.h>
+
+#include <logger/Logger.hpp>
+
+namespace QodeAssist {
+
+RefactorSuggestionHoverHandler::RefactorSuggestionHoverHandler()
+{
+    setPriority(Priority_Suggestion);
+}
+
+void RefactorSuggestionHoverHandler::setSuggestionRange(const Utils::Text::Range &range)
+{
+    m_suggestionRange = range;
+    m_hasSuggestion = true;
+}
+
+void RefactorSuggestionHoverHandler::clearSuggestionRange()
+{
+    m_hasSuggestion = false;
+}
+
+void RefactorSuggestionHoverHandler::identifyMatch(
+    TextEditor::TextEditorWidget *editorWidget,
+    int pos,
+    ReportPriority report)
+{
+    
+    QScopeGuard cleanup([&] { report(Priority_None); });
+    
+    if (!editorWidget->suggestionVisible()) {
+        return;
+    }
+
+    QTextCursor cursor(editorWidget->document());
+    cursor.setPosition(pos);
+    m_block = cursor.block();
+    
+#if QODEASSIST_QT_CREATOR_VERSION_MAJOR >= 17
+    auto *suggestion = dynamic_cast<RefactorSuggestion *>(
+        TextEditor::TextBlockUserData::suggestion(m_block));
+#else
+    auto *userData = TextEditor::TextDocumentLayout::textUserData(m_block);
+    if (!userData) {
+        LOG_MESSAGE("RefactorSuggestionHoverHandler: No user data in block");
+        return;
+    }
+    
+    auto *suggestion = dynamic_cast<RefactorSuggestion *>(userData->suggestion());
+#endif
+    
+    if (!suggestion) {
+        return;
+    }
+
+    cleanup.dismiss();
+    report(Priority_Suggestion);
+}
+
+void RefactorSuggestionHoverHandler::operateTooltip(
+    TextEditor::TextEditorWidget *editorWidget,
+    const QPoint &point)
+{
+    Q_UNUSED(point)
+    
+#if QODEASSIST_QT_CREATOR_VERSION_MAJOR >= 17
+    auto *suggestion = dynamic_cast<RefactorSuggestion *>(
+        TextEditor::TextBlockUserData::suggestion(m_block));
+#else
+    auto *userData = TextEditor::TextDocumentLayout::textUserData(m_block);
+    if (!userData) {
+        LOG_MESSAGE("RefactorSuggestionHoverHandler::operateTooltip: No user data in block");
+        return;
+    }
+    
+    auto *suggestion = dynamic_cast<RefactorSuggestion *>(userData->suggestion());
+#endif
+
+    if (!suggestion) {
+        return;
+    }
+
+    auto *widget = new QWidget();
+    auto *layout = new QHBoxLayout(widget);
+    layout->setContentsMargins(4, 3, 4, 3);
+    layout->setSpacing(6);
+
+    const QColor normalBg = Utils::creatorColor(Utils::Theme::BackgroundColorNormal);
+    const QColor hoverBg = Utils::creatorColor(Utils::Theme::BackgroundColorHover);
+    const QColor selectedBg = Utils::creatorColor(Utils::Theme::BackgroundColorSelected);
+    const QColor textColor = Utils::creatorColor(Utils::Theme::TextColorNormal);
+    const QColor borderColor = Utils::creatorColor(Utils::Theme::SplitterColor);
+    const QColor successColor = Utils::creatorColor(Utils::Theme::TextColorNormal);
+    const QColor errorColor = Utils::creatorColor(Utils::Theme::TextColorError);
+
+    auto *applyButton = new QPushButton("✓ Apply", widget);
+    applyButton->setFocusPolicy(Qt::NoFocus);
+    applyButton->setToolTip("Apply refactoring (Tab)");
+    applyButton->setCursor(Qt::PointingHandCursor);
+    applyButton->setStyleSheet(QString(
+        "QPushButton {"
+        "  background-color: %1;"
+        "  color: %2;"
+        "  border: 1px solid %3;"
+        "  border-radius: 3px;"
+        "  padding: 4px 12px;"
+        "  font-weight: bold;"
+        "  font-size: 11px;"
+        "  min-width: 60px;"
+        "}"
+        "QPushButton:hover {"
+        "  background-color: %4;"
+        "  border-color: %2;"
+        "}"
+        "QPushButton:pressed {"
+        "  background-color: %5;"
+        "}")
+        .arg(selectedBg.name())
+        .arg(successColor.name())
+        .arg(borderColor.name())
+        .arg(selectedBg.lighter(110).name())
+        .arg(selectedBg.darker(110).name()));
+    QObject::connect(applyButton, &QPushButton::clicked, widget, [this]() {
+        Utils::ToolTip::hide();
+        if (m_applyCallback) {
+            m_applyCallback();
+        }
+    });
+
+    auto *dismissButton = new QPushButton("✕ Dismiss", widget);
+    dismissButton->setFocusPolicy(Qt::NoFocus);
+    dismissButton->setToolTip("Dismiss refactoring (Esc)");
+    dismissButton->setCursor(Qt::PointingHandCursor);
+    dismissButton->setStyleSheet(QString(
+        "QPushButton {"
+        "  background-color: %1;"
+        "  color: %2;"
+        "  border: 1px solid %3;"
+        "  border-radius: 3px;"
+        "  padding: 4px 12px;"
+        "  font-size: 11px;"
+        "  min-width: 60px;"
+        "}"
+        "QPushButton:hover {"
+        "  background-color: %4;"
+        "  color: %5;"
+        "  border-color: %5;"
+        "}"
+        "QPushButton:pressed {"
+        "  background-color: %6;"
+        "}")
+        .arg(normalBg.name())
+        .arg(textColor.name())
+        .arg(borderColor.name())
+        .arg(hoverBg.name())
+        .arg(errorColor.name())
+        .arg(hoverBg.darker(110).name()));
+    QObject::connect(dismissButton, &QPushButton::clicked, widget, [this]() {
+        Utils::ToolTip::hide();
+        if (m_dismissCallback) {
+            m_dismissCallback();
+        }
+    });
+
+    layout->addWidget(applyButton);
+    layout->addWidget(dismissButton);
+
+    const QRect cursorRect = editorWidget->cursorRect(editorWidget->textCursor());
+    QPoint pos = editorWidget->viewport()->mapToGlobal(cursorRect.topLeft())
+                 - Utils::ToolTip::offsetFromPosition();
+    pos.ry() -= widget->sizeHint().height();
+    
+    Utils::ToolTip::show(pos, widget, editorWidget);
+}
+
+} // namespace QodeAssist
+

RefactorSuggestionHoverHandler.hpp

@@ -0,0 +1,72 @@
+/* 
+ * 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 <functional>
+#include <QTextBlock>
+
+#include <texteditor/basehoverhandler.h>
+#include <utils/textutils.h>
+
+namespace TextEditor {
+class TextEditorWidget;
+}
+
+namespace QodeAssist {
+
+/**
+ * @brief Hover handler for refactoring suggestions
+ * 
+ * Shows interactive tooltip with Apply/Dismiss buttons when hovering over
+ * a refactoring suggestion in the editor.
+ */
+class RefactorSuggestionHoverHandler : public TextEditor::BaseHoverHandler
+{
+public:
+    using ApplyCallback = std::function<void()>;
+    using DismissCallback = std::function<void()>;
+
+    RefactorSuggestionHoverHandler();
+
+    void setSuggestionRange(const Utils::Text::Range &range);
+    void clearSuggestionRange();
+    bool hasSuggestion() const { return m_hasSuggestion; }
+
+    void setApplyCallback(ApplyCallback callback) { m_applyCallback = std::move(callback); }
+    void setDismissCallback(DismissCallback callback) { m_dismissCallback = std::move(callback); }
+
+protected:
+    void identifyMatch(TextEditor::TextEditorWidget *editorWidget,
+                       int pos,
+                       ReportPriority report) override;
+    
+    void operateTooltip(TextEditor::TextEditorWidget *editorWidget, 
+                       const QPoint &point) override;
+
+private:
+    Utils::Text::Range m_suggestionRange;
+    bool m_hasSuggestion = false;
+    ApplyCallback m_applyCallback;
+    DismissCallback m_dismissCallback;
+    QTextBlock m_block;
+};
+
+} // namespace QodeAssist
+

TaskFlow/CMakeLists.txt

@@ -0,0 +1,14 @@
+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
+)

TaskFlow/Editor/CMakeLists.txt

@@ -0,0 +1,41 @@
+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}
+)

TaskFlow/Editor/FlowEditor.cpp

@@ -0,0 +1,120 @@
+/*
+ * 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

TaskFlow/Editor/FlowEditor.hpp

@@ -0,0 +1,86 @@
+/*
+ * 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

TaskFlow/Editor/FlowItem.cpp

@@ -0,0 +1,90 @@
+#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

TaskFlow/Editor/FlowItem.hpp

@@ -0,0 +1,61 @@
+#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

TaskFlow/Editor/FlowsModel.cpp

@@ -0,0 +1,54 @@
+#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

TaskFlow/Editor/FlowsModel.hpp

@@ -0,0 +1,31 @@
+#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

TaskFlow/Editor/GridBackground.cpp

@@ -0,0 +1,98 @@
+/*
+ * 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

TaskFlow/Editor/GridBackground.hpp

@@ -0,0 +1,57 @@
+/*
+ * 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

TaskFlow/Editor/TaskConnectionItem.cpp

@@ -0,0 +1,153 @@
+#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

TaskFlow/Editor/TaskConnectionItem.hpp

@@ -0,0 +1,55 @@
+#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

TaskFlow/Editor/TaskConnectionsModel.cpp

@@ -0,0 +1,29 @@
+#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

TaskFlow/Editor/TaskConnectionsModel.hpp

@@ -0,0 +1,25 @@
+#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

TaskFlow/Editor/TaskItem.cpp

@@ -0,0 +1,69 @@
+#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

TaskFlow/Editor/TaskItem.hpp

@@ -0,0 +1,49 @@
+#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

TaskFlow/Editor/TaskModel.cpp

@@ -0,0 +1,40 @@
+#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

TaskFlow/Editor/TaskModel.hpp

@@ -0,0 +1,25 @@
+#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

TaskFlow/Editor/TaskPortItem.cpp

@@ -0,0 +1,29 @@
+#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

TaskFlow/Editor/TaskPortItem.hpp

@@ -0,0 +1,31 @@
+#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

TaskFlow/Editor/TaskPortModel.cpp

@@ -0,0 +1,39 @@
+#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

TaskFlow/Editor/TaskPortModel.hpp

@@ -0,0 +1,25 @@
+#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

TaskFlow/Editor/qml/Flow.qml

@@ -0,0 +1,134 @@
+import QtQuick
+import TaskFlow.Editor
+
+FlowItem {
+    id: root
+
+    Repeater {
+        id: tasks
+
+        model: root.taskModel
+        delegate: Task {
+            // task: taskData
+        }
+    }
+
+    Repeater {
+        id: connections
+
+        model: root.taskModel
+        delegate: TaskConnection {
+            // task: taskData
+        }
+    }
+
+    // property var qtaskItems: []
+
+    // // Flow container background
+    // Rectangle {
+    //     anchors.fill: parent
+    //     color: palette.alternateBase
+    //     border.color: palette.mid
+    //     border.width: 2
+    //     radius: 8
+
+    //     // Flow header
+    //     Rectangle {
+    //         id: flowHeader
+    //         anchors.top: parent.top
+    //         anchors.left: parent.left
+    //         anchors.right: parent.right
+    //         height: 40
+    //         color: palette.button
+    //         radius: 6
+
+    //         Rectangle {
+    //             anchors.bottom: parent.bottom
+    //             anchors.left: parent.left
+    //             anchors.right: parent.right
+    //             height: parent.radius
+    //             color: parent.color
+    //         }
+
+    //         Text {
+    //             anchors.centerIn: parent
+    //             text: root.flowId
+    //             color: palette.buttonText
+    //             font.pixelSize: 14
+    //             font.bold: true
+    //         }
+    //     }
+
+    //     // // Tasks container
+    //     // Row {
+    //     //     id: tasksRow
+    //     //     anchors.top: flowHeader.bottom
+    //     //     anchors.left: parent.left
+    //     //     anchors.margins: 25
+    //     //     anchors.topMargin: 25
+    //     //     objectName: "FlowTaskRow"
+
+    //     //     spacing: 40
+
+    //     //     Repeater {
+    //     //         model: root.taskModel
+
+    //     //         delegate: Task {
+    //     //             task: taskData
+    //     //         }
+
+    //     //         onItemAdded: function(index, item){
+    //     //             console.log("task added", index, item)
+    //     //             qtaskItems.push(item)
+    //     //             root.insertTaskItem(index, item)
+    //     //         }
+
+    //     //         onItemRemoved: function(index, item){
+    //     //             console.log("task added", index, item)
+    //     //             var idx = qtaskItems.indexOf(item)
+    //     //             if (idx !== -1) qtaskItems.splice(idx, 1)
+    //     //         }
+    //     //     }
+    //     // }
+
+    //     // Repeater {
+    //     //     model: root.connectionsModel
+
+    //     //     delegate: TaskConnection {
+    //     //         connection: connectionData
+    //     //     }
+    //     // }
+    // }
+
+    // // Flow info tooltip
+    // Rectangle {
+    //     id: infoTooltip
+    //     anchors.top: parent.bottom
+    //     anchors.left: parent.left
+    //     anchors.topMargin: 5
+    //     width: infoText.width + 20
+    //     height: infoText.height + 10
+    //     color: palette.base
+    //     border.color: palette.shadow
+    //     border.width: 1
+    //     radius: 4
+    //     visible: false
+
+    //     Text {
+    //         id: infoText
+    //         anchors.centerIn: parent
+    //         text: "Tasks: " + (root.taskModel ? root.taskModel.rowCount() : 0)
+    //         color: palette.text
+    //         font.pixelSize: 10
+    //     }
+    // }
+
+    // MouseArea {
+    //     anchors.fill: parent
+    //     hoverEnabled: true
+
+    //     onEntered: infoTooltip.visible = true
+    //     onExited: infoTooltip.visible = false
+    // }
+
+}

TaskFlow/Editor/qml/FlowEditorView.qml

@@ -0,0 +1,140 @@
+/*
+ * 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 TaskFlow.Editor
+
+FlowEditor {
+    id: root
+
+    width: 1200
+    height: 800
+
+    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
+    }
+
+    // Background with grid pattern
+    Rectangle {
+        anchors.fill: parent
+        color: palette.window
+
+        // Grid pattern using C++ implementation
+        GridBackground {
+            anchors.fill: parent
+            gridSize: 20
+            gridColor: palette.mid
+            opacity: 0.3
+        }
+    }
+
+    // Header panel
+    Rectangle {
+        id: headerPanel
+        anchors.top: parent.top
+        anchors.left: parent.left
+        anchors.right: parent.right
+        height: 60
+        color: palette.base
+        border.color: palette.mid
+        border.width: 1
+
+        Row {
+            anchors.left: parent.left
+            anchors.verticalCenter: parent.verticalCenter
+            anchors.leftMargin: 20
+            spacing: 20
+
+            Text {
+                text: "Flow Editor"
+                color: palette.windowText
+                font.pixelSize: 18
+                font.bold: true
+            }
+
+            Rectangle {
+                width: 2
+                height: 30
+                color: palette.mid
+            }
+
+            Text {
+                text: "Flow:"
+                color: palette.text
+                font.pixelSize: 14
+            }
+
+            ComboBox {
+                id: flowComboBox
+
+                model: root.flowsModel
+                textRole: "flowId"
+                currentIndex: root.currentFlowIndex
+
+                onActivated: {
+                    root.currentFlowIndex = currentIndex
+                }
+            }
+
+            Text {
+                text: "Available Tasks: " + root.availableTaskTypes.join(", ")
+                color: palette.text
+                font.pixelSize: 12
+            }
+        }
+    }
+
+    // Main flow area
+    ScrollView {
+        id: scrollView
+        anchors.top: headerPanel.bottom
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.bottom: parent.bottom
+
+        contentWidth: flow.width
+        contentHeight: flow.height
+
+        Flow {
+            id: flow
+
+            // flow: root.currentFlow
+
+            width: Math.max(root.width, 0)
+            height: Math.min(root.height, 0)
+        }
+    }
+}

TaskFlow/Editor/qml/Task.qml

@@ -0,0 +1,210 @@
+import QtQuick
+import TaskFlow.Editor
+
+TaskItem{
+    id: root
+
+    width: 280
+    height: Math.max(200, contentColumn.height + 40)
+
+    DragHandler {
+        id: dragHandler
+
+        target: root
+        onActiveChanged: {
+            if (active) {
+                root.z = 1000; // Поднять над остальными
+            } else {
+                root.z = 0;
+            }
+        }
+    }
+
+    // Task node background
+    Rectangle {
+        anchors.fill: parent
+        color: palette.window
+        border.color: palette.shadow
+        border.width: 1
+        radius: 6
+
+        // Task header
+        Rectangle {
+            id: taskHeader
+            anchors.top: parent.top
+            anchors.left: parent.left
+            anchors.right: parent.right
+            height: 40
+            color: palette.button
+            radius: 6
+
+            Rectangle {
+                anchors.bottom: parent.bottom
+                anchors.left: parent.left
+                anchors.right: parent.right
+                height: parent.radius
+                color: parent.color
+            }
+
+            Text {
+                anchors.centerIn: parent
+                // text: root.taskType
+                color: palette.buttonText
+                font.pixelSize: 14
+                font.bold: true
+            }
+        }
+
+        // Task content
+        Column {
+            id: contentColumn
+            anchors.top: taskHeader.bottom
+            anchors.left: parent.left
+            anchors.right: parent.right
+            anchors.margins: 10
+            spacing: 8
+
+            // Task ID
+            Text {
+                text: "ID: " + root.taskId
+                color: palette.text
+                font.pixelSize: 11
+                width: parent.width
+                elide: Text.ElideRight
+            }
+
+            // Parameters section
+            Item {
+                width: parent.width
+                height: paramColumn.height
+                // visible: root.parameters && root.parameters.rowCount() > 0
+
+                Column {
+                    id: paramColumn
+                    width: parent.width
+                    spacing: 6
+
+                    Text {
+                        text: "Parameters:"
+                        color: palette.text
+                        font.pixelSize: 10
+                        font.bold: true
+                    }
+
+                    Repeater {
+                        model: root.parameters
+                        delegate: Rectangle {
+                            width: parent.width
+                            height: 24
+                            color: palette.base
+                            radius: 4
+
+                            Row {
+                                anchors.left: parent.left
+                                anchors.verticalCenter: parent.verticalCenter
+                                anchors.leftMargin: 8
+                                spacing: 6
+
+                                Text {
+                                    text: paramKey + ":"
+                                    color: palette.text
+                                    font.pixelSize: 9
+                                    font.bold: true
+                                }
+
+                                Text {
+                                    text: paramValue
+                                    color: palette.windowText
+                                    font.pixelSize: 9
+                                    width: Math.min(150, implicitWidth)
+                                    elide: Text.ElideRight
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    // Input ports section (left side)
+    Column {
+        anchors.left: parent.left
+        anchors.verticalCenter: parent.verticalCenter
+        anchors.leftMargin: -8
+        spacing: 6
+        // visible: root.inputPorts && root.inputPorts.rowCount() > 0
+
+        // Input label
+        Text {
+            text: "IN"
+            color: palette.highlight
+            font.pixelSize: 10
+            font.bold: true
+            anchors.left: parent.left
+            anchors.leftMargin: -20
+        }
+
+        // Repeater {
+        //     model: root.inputPorts
+        //     delegate: Row {
+        //         spacing: 6
+
+        //         Text {
+        //             text: taskPortName
+        //             color: palette.text
+        //             font.pixelSize: 9
+        //             anchors.verticalCenter: parent.verticalCenter
+        //             horizontalAlignment: Text.AlignRight
+        //             width: 60
+        //             elide: Text.ElideLeft
+        //         }
+
+        //         TaskPort {
+        //             port: taskPortData
+        //             isInput: true
+        //         }
+        //     }
+        // }
+    }
+
+    // Output ports section (right side)
+    Column {
+        anchors.right: parent.right
+        anchors.verticalCenter: parent.verticalCenter
+        anchors.rightMargin: -10
+        spacing: 8
+        // visible: root.outputPorts && root.outputPorts.rowCount() > 0
+
+        // Output label
+        Text {
+            text: "OUT"
+            color: palette.highlight
+            font.pixelSize: 10
+            font.bold: true
+            anchors.right: parent.right
+            anchors.rightMargin: -24
+        }
+
+        // Repeater {
+        //     model: root.outputPorts
+        //     delegate: Row {
+        //         spacing: 6
+
+        //         TaskPort {
+        //             port: taskPortData
+        //             isInput: false
+        //         }
+
+        //         Text {
+        //             text: taskPortName
+        //             color: palette.text
+        //             font.pixelSize: 9
+        //             anchors.verticalCenter: parent.verticalCenter
+        //             width: 60
+        //             elide: Text.ElideRight
+        //         }
+        //     }
+        // }
+    }
+}

TaskFlow/Editor/qml/TaskConnection.qml

@@ -0,0 +1,68 @@
+import QtQuick
+import QtQuick.Shapes
+import TaskFlow.Editor
+
+TaskConnectionItem {
+    id: root
+
+    property color connectionColor: "red"
+
+    Rectangle {
+        width: 10
+        height: 10
+        radius: width / 2
+        color: "blue"
+    }
+
+    // width: Math.abs(endPoint.x - startPoint.x) + 40
+    // height: Math.abs(endPoint.y - startPoint.y) + 40
+    // x: Math.min(startPoint.x, endPoint.x) - 20
+    // y: Math.min(startPoint.y, endPoint.y) - 20
+
+    // Shape {
+    //     anchors.fill: parent
+
+    //     ShapePath {
+    //         strokeWidth: 2
+    //         strokeColor: connectionColor
+    //         fillColor: "transparent"
+
+    //         property point localStart: Qt.point(
+    //             root.startPoint.x - root.x,
+    //             root.startPoint.y - root.y
+    //         )
+    //         property point localEnd: Qt.point(
+    //             root.endPoint.x - root.x,
+    //             root.endPoint.y - root.y
+    //         )
+
+    //         // Bezier curve
+    //         property real controlOffset: Math.max(50, Math.abs(localEnd.x - localStart.x) * 0.4)
+
+    //         startX: localStart.x
+    //         startY: localStart.y
+
+    //         PathCubic {
+    //             x: parent.localEnd.x
+    //             y: parent.localEnd.y
+    //             control1X: parent.localStart.x + parent.controlOffset
+    //             control1Y: parent.localStart.y
+    //             control2X: parent.localEnd.x - parent.controlOffset
+    //             control2Y: parent.localEnd.y
+    //         }
+    //     }
+
+    //     // Arrow head
+    //     Rectangle {
+    //         width: 8
+    //         height: 8
+    //         color: connectionColor
+    //         rotation: 45
+    //         x: root.endPoint.x - root.x - 4
+    //         y: root.endPoint.y - root.y - 4
+    //     }
+    // }
+
+    // // Update positions when tasks might have moved
+    // Component.onCompleted: updatePositions()
+}