feat: Add support QtCreator 19.0.1

.github/workflows/build_cmake.yml

@@ -27,7 +27,7 @@ jobs:
         config:
         - {
             name: "Windows Latest MSVC", artifact: "Windows-x64",
-            os: windows-2022,
+            os: windows-latest,
             platform: windows_x64,
             cc: "cl", cxx: "cl",
             environment_script: "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvars64.bat",
@@ -51,11 +51,7 @@ jobs:
           }
         - {
             qt_version: "6.10.3",
-            qt_creator_version: "19.0.2"
-          }
-        - {
-            qt_version: "6.11.1",
-            qt_creator_version: "20.0.0"
+            qt_creator_version: "19.0.1"
           }
 
     steps:
@@ -114,14 +110,10 @@ jobs:
         set(qt_creator_version "${{ matrix.qt_config.qt_creator_version }}")
 
         string(REPLACE "." "" qt_version_dotless "${qt_version}")
-        set(qt_repo_dir "qt6_${qt_version_dotless}")
         if ("${{ runner.os }}" STREQUAL "Windows")
           set(url_os "windows_x86")
           set(qt_package_arch_suffix "win64_msvc2022_64")
           set(qt_dir_prefix "${qt_version}/msvc2022_64")
-          if (qt_version VERSION_GREATER_EQUAL "6.11.0")
-            set(qt_repo_dir "qt6_${qt_version_dotless}_msvc2022_64")
-          endif()
           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()
@@ -135,9 +127,7 @@ jobs:
             set(qt_package_arch_suffix "linux_gcc_64")
           endif()
           set(qt_dir_prefix "${qt_version}/gcc_64")
-          if (qt_version VERSION_GREATER_EQUAL "6.11.0")
-            set(qt_package_suffix "-Linux-RHEL_9_6-GCC-Linux-RHEL_9_6-X86_64")
-          elseif (qt_creator_version VERSION_GREATER_EQUAL "18.0.0")
+          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")
@@ -153,7 +143,7 @@ jobs:
           endif()
         endif()
 
-        set(qt_base_url "https://download.qt.io/online/qtsdkrepository/${url_os}/desktop/qt6_${qt_version_dotless}/${qt_repo_dir}")
+        set(qt_base_url "https://download.qt.io/online/qtsdkrepository/${url_os}/desktop/qt6_${qt_version_dotless}/qt6_${qt_version_dotless}")
         file(DOWNLOAD "${qt_base_url}/Updates.xml" ./Updates.xml SHOW_PROGRESS)
 
         file(READ ./Updates.xml updates_xml)
@@ -180,11 +170,7 @@ jobs:
           )
         endforeach()
 
-        set(qt_addon_packages qt5compat qtshadertools)
-        if (qt_version VERSION_GREATER_EQUAL "6.11.0")
-          list(APPEND qt_addon_packages qttasktree)
-        endif()
-        foreach(package ${qt_addon_packages})
+        foreach(package qt5compat qtshadertools)
           downloadAndExtract(
             "${qt_base_url}/qt.qt6.${qt_version_dotless}.addons.${package}.${qt_package_arch_suffix}/${qt_package_version}${package}${qt_package_suffix}.7z"
             ${package}.7z
@@ -250,7 +236,7 @@ jobs:
         endif()
 
         set(build_plugin_py "scripts/build_plugin.py")
-        foreach(dir "share/qtcreator/scripts" "Qt Creator.sdk/share/qtcreator/scripts" "Qt Creator.app/Contents/Resources/scripts" "Contents/Resources/scripts")
+        foreach(dir "share/qtcreator/scripts" "Qt Creator.app/Contents/Resources/scripts" "Contents/Resources/scripts")
           if(EXISTS "${{ steps.qt_creator.outputs.qtc_dir }}/${dir}/build_plugin.py")
             set(build_plugin_py "${dir}/build_plugin.py")
             break()

CMakeLists.txt

@@ -14,9 +14,7 @@ find_package(QtCreator REQUIRED COMPONENTS Core)
 find_package(Qt6 COMPONENTS Core Gui Quick Widgets Network Svg Test LinguistTools REQUIRED)
 find_package(GTest)
 
-qt_standard_project_setup(I18N_TRANSLATED_LANGUAGES
-    en cs zh_CN zh_TW da de fr hr ja pl ru sl sv uk
-)
+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})
@@ -36,9 +34,10 @@ add_definitions(
   -DQODEASSIST_QT_CREATOR_VERSION_PATCH=${QODEASSIST_QT_CREATOR_VERSION_PATCH}
 )
 
-add_subdirectory(sources)
-add_subdirectory(logger)
+add_subdirectory(sources/external/llmqore)
+add_subdirectory(pluginllmcore)
 add_subdirectory(settings)
+add_subdirectory(logger)
 add_subdirectory(UIControls)
 add_subdirectory(ChatView)
 add_subdirectory(context)
@@ -64,9 +63,7 @@ add_qtc_plugin(QodeAssist
     QtCreator::Utils
     QtCreator::CPlusPlus
     LLMQore
-    ProvidersConfig
-    Agents
-    Skills
+    PluginLLMCore
     QodeAssistChatViewplugin
   SOURCES
     .github/workflows/build_cmake.yml
@@ -77,6 +74,49 @@ add_qtc_plugin(QodeAssist
     QodeAssisttr.h
     LLMClientInterface.hpp LLMClientInterface.cpp
     RefactorContextHelper.hpp
+    templates/Templates.hpp
+    templates/CodeLlamaFim.hpp
+    templates/Ollama.hpp
+    templates/Claude.hpp
+    templates/OpenAI.hpp
+    templates/MistralAI.hpp
+    templates/StarCoder2Fim.hpp
+    # templates/DeepSeekCoderFim.hpp
+    # templates/CustomFimTemplate.hpp
+    templates/Qwen25CoderFIM.hpp
+    templates/OpenAICompatible.hpp
+    templates/Llama3.hpp
+    templates/ChatML.hpp
+    templates/Alpaca.hpp
+    templates/Llama2.hpp
+    templates/CodeLlamaQMLFim.hpp
+    templates/GoogleAI.hpp
+    templates/LlamaCppFim.hpp
+    templates/Qwen3CoderFIM.hpp
+    templates/OpenAIResponses.hpp
+    providers/Providers.hpp
+    providers/OllamaProvider.hpp providers/OllamaProvider.cpp
+    providers/OllamaCompatProvider.hpp providers/OllamaCompatProvider.cpp
+    providers/ClaudeProvider.hpp providers/ClaudeProvider.cpp
+    providers/OpenAIProvider.hpp providers/OpenAIProvider.cpp
+    providers/MistralAIProvider.hpp providers/MistralAIProvider.cpp
+    providers/LMStudioProvider.hpp providers/LMStudioProvider.cpp
+    providers/LMStudioResponsesProvider.hpp providers/LMStudioResponsesProvider.cpp
+    providers/OpenAICompatProvider.hpp providers/OpenAICompatProvider.cpp
+    providers/OpenRouterAIProvider.hpp providers/OpenRouterAIProvider.cpp
+    providers/GoogleAIProvider.hpp providers/GoogleAIProvider.cpp
+    providers/LlamaCppProvider.hpp providers/LlamaCppProvider.cpp
+    providers/CodestralProvider.hpp providers/CodestralProvider.cpp
+    providers/OpenAIResponses/ModelRequest.hpp
+    providers/OpenAIResponses/ResponseObject.hpp
+    providers/OpenAIResponses/GetResponseRequest.hpp
+    providers/OpenAIResponses/DeleteResponseRequest.hpp
+    providers/OpenAIResponses/CancelResponseRequest.hpp
+    providers/OpenAIResponses/ListInputItemsRequest.hpp
+    providers/OpenAIResponses/InputTokensRequest.hpp
+    providers/OpenAIResponses/ItemTypesReference.hpp
+    providers/OpenAIResponsesRequestBuilder.hpp
+    providers/OpenAIResponsesProvider.hpp providers/OpenAIResponsesProvider.cpp
     QodeAssist.qrc
     LSPCompletion.hpp
     LLMSuggestion.hpp LLMSuggestion.cpp
@@ -85,15 +125,17 @@ add_qtc_plugin(QodeAssist
     QodeAssistClient.hpp QodeAssistClient.cpp
     chat/ChatOutputPane.h chat/ChatOutputPane.cpp
     chat/NavigationPanel.hpp chat/NavigationPanel.cpp
-    chat/ChatDocument.hpp chat/ChatDocument.cpp
-    chat/ChatEditor.hpp chat/ChatEditor.cpp
-    chat/ChatEditorFactory.hpp chat/ChatEditorFactory.cpp
+    ConfigurationManager.hpp ConfigurationManager.cpp
     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
@@ -115,16 +157,12 @@ add_qtc_plugin(QodeAssist
     tools/ReadFileTool.hpp tools/ReadFileTool.cpp
     tools/FileSearchUtils.hpp tools/FileSearchUtils.cpp
     tools/TodoTool.hpp tools/TodoTool.cpp
-    tools/ReadOriginalHistoryTool.hpp tools/ReadOriginalHistoryTool.cpp
-    tools/SkillTool.hpp tools/SkillTool.cpp
     mcp/McpServerManager.hpp mcp/McpServerManager.cpp
     mcp/McpServerConnection.hpp mcp/McpServerConnection.cpp
     mcp/McpClientsManager.hpp mcp/McpClientsManager.cpp
     settings/McpClientsListAspect.hpp settings/McpClientsListAspect.cpp
 )
 
-target_link_libraries(QodeAssist PRIVATE QodeAssistAgentPipelines Session)
-
 get_target_property(QtCreatorCorePath QtCreator::Core LOCATION)
 find_program(QtCreatorExecutable
   NAMES
@@ -146,5 +184,5 @@ endif()
 qt_add_translations(TARGETS QodeAssist
           TS_FILE_DIR ${CMAKE_CURRENT_LIST_DIR}/resources/translations
           RESOURCE_PREFIX "/translations"
-          LUPDATE_OPTIONS -no-obsolete -locations none
+          LUPDATE_OPTIONS -no-obsolete
 )

ChatView/CMakeLists.txt

@@ -22,11 +22,10 @@ qt_add_qml_module(QodeAssistChatView
     qml/controls/BottomBar.qml
     qml/controls/FileMentionPopup.qml
     qml/controls/FileEditsActionBar.qml
-    qml/controls/SkillCommandPopup.qml
+    qml/controls/ContextViewer.qml
     qml/controls/Toast.qml
     qml/controls/TopBar.qml
     qml/controls/SplitDropZone.qml
-    qml/controls/MessageNavigator.qml
 
     RESOURCES
     icons/attach-file-light.svg
@@ -44,10 +43,9 @@ qt_add_qml_module(QodeAssistChatView
     icons/window-unlock.svg
     icons/chat-icon.svg
     icons/chat-pause-icon.svg
-    icons/warning-icon.svg
-    icons/new-chat-icon.svg
+    icons/rules-icon.svg
+    icons/context-icon.svg
     icons/open-in-editor.svg
-    icons/open-in-window.svg
     icons/apply-changes-button.svg
     icons/undo-changes-button.svg
     icons/reject-changes-button.svg
@@ -57,7 +55,6 @@ qt_add_qml_module(QodeAssistChatView
     icons/tools-icon-off.svg
     icons/settings-icon.svg
     icons/compress-icon.svg
-    icons/open-in-code.svg
 
     SOURCES
     ChatWidget.hpp ChatWidget.cpp
@@ -72,12 +69,7 @@ qt_add_qml_module(QodeAssistChatView
     FileItem.hpp FileItem.cpp
     ChatFileManager.hpp ChatFileManager.cpp
     ChatCompressor.hpp ChatCompressor.cpp
-    ChatAgentController.hpp ChatAgentController.cpp
-    FileEditController.hpp FileEditController.cpp
-    InputTokenCounter.hpp InputTokenCounter.cpp
-    ChatHistoryStore.hpp ChatHistoryStore.cpp
     FileMentionItem.hpp FileMentionItem.cpp
-    SessionFileRegistry.hpp SessionFileRegistry.cpp
 )
 
 target_link_libraries(QodeAssistChatView
@@ -88,16 +80,14 @@ target_link_libraries(QodeAssistChatView
     Qt::Network
     QtCreator::Core
     QtCreator::Utils
+    PluginLLMCore
     QodeAssistSettings
     Context
     QodeAssistUIControlsplugin
     QodeAssistLogger
     LLMQore
-    Skills
-    Agents
-    Session
 )
 
 target_include_directories(QodeAssistChatView
-    PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR}
+    PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
 )

ChatView/ChatAgentController.cpp

@@ -1,108 +0,0 @@
-// Copyright (C) 2024-2026 Petr Mironychev
-// SPDX-License-Identifier: GPL-3.0-or-later
-// Additional attribution terms under GPLv3 §7(b) apply — see LICENSE
-
-#include "ChatAgentController.hpp"
-
-#include <QSettings>
-
-#include <coreplugin/icore.h>
-
-#include <AgentConfig.hpp>
-#include <AgentFactory.hpp>
-#include <sources/settings/PipelinesConfig.hpp>
-
-namespace QodeAssist::Chat {
-
-namespace {
-const char kChatAgentKey[] = "QodeAssist.chatActiveAgent";
-}
-
-ChatAgentController::ChatAgentController(QObject *parent)
-    : QObject(parent)
-{
-    if (auto *settings = Core::ICore::settings())
-        m_currentAgent = settings->value(kChatAgentKey).toString();
-}
-
-void ChatAgentController::setAgentFactory(AgentFactory *factory)
-{
-    m_agentFactory = factory;
-    if (factory)
-        connect(
-            factory,
-            &AgentFactory::agentsChanged,
-            this,
-            &ChatAgentController::reload,
-            Qt::UniqueConnection);
-    reload();
-}
-
-QStringList ChatAgentController::availableAgents() const
-{
-    return m_availableAgents;
-}
-
-QString ChatAgentController::currentAgent() const
-{
-    return m_currentAgent;
-}
-
-void ChatAgentController::setCurrentAgent(const QString &name)
-{
-    if (name == m_currentAgent || !m_availableAgents.contains(name))
-        return;
-
-    applyCurrentAgent(name);
-}
-
-void ChatAgentController::reload()
-{
-    if (!m_agentFactory)
-        return;
-
-    const QStringList all = m_agentFactory->configNames();
-    const QStringList roster = Settings::PipelinesConfig::load().rosters.chatAssistant;
-
-    QStringList filtered;
-    for (const QString &name : roster) {
-        if (all.contains(name))
-            filtered.append(name);
-    }
-
-    if (filtered != m_availableAgents) {
-        m_availableAgents = filtered;
-        emit availableAgentsChanged();
-    }
-    ensureValidCurrent();
-}
-
-void ChatAgentController::ensureValidCurrent()
-{
-    if (m_availableAgents.contains(m_currentAgent))
-        return;
-
-    const QString next = m_availableAgents.isEmpty() ? QString() : m_availableAgents.first();
-    if (next == m_currentAgent)
-        return;
-
-    applyCurrentAgent(next);
-}
-
-void ChatAgentController::applyCurrentAgent(const QString &name)
-{
-    m_currentAgent = name;
-    if (auto *settings = Core::ICore::settings())
-        settings->setValue(kChatAgentKey, m_currentAgent);
-    emit currentAgentChanged();
-}
-
-bool ChatAgentController::currentSupportsTools() const
-{
-    if (!m_agentFactory || m_currentAgent.isEmpty())
-        return false;
-    const AgentConfig *config = m_agentFactory->configByName(m_currentAgent);
-    return config && config->enableTools;
-}
-
-} // namespace QodeAssist::Chat

ChatView/ChatAgentController.hpp

@@ -1,48 +0,0 @@
-// Copyright (C) 2024-2026 Petr Mironychev
-// SPDX-License-Identifier: GPL-3.0-or-later
-// Additional attribution terms under GPLv3 §7(b) apply — see LICENSE
-
-#pragma once
-
-#include <QObject>
-#include <QPointer>
-#include <QString>
-#include <QStringList>
-
-namespace QodeAssist {
-class AgentFactory;
-}
-
-namespace QodeAssist::Chat {
-
-class ChatAgentController : public QObject
-{
-    Q_OBJECT
-    Q_DISABLE_COPY_MOVE(ChatAgentController)
-
-public:
-    explicit ChatAgentController(QObject *parent = nullptr);
-
-    void setAgentFactory(AgentFactory *factory);
-
-    [[nodiscard]] QStringList availableAgents() const;
-    [[nodiscard]] QString currentAgent() const;
-    void setCurrentAgent(const QString &name);
-
-    [[nodiscard]] bool currentSupportsTools() const;
-
-signals:
-    void availableAgentsChanged();
-    void currentAgentChanged();
-
-private:
-    void reload();
-    void ensureValidCurrent();
-    void applyCurrentAgent(const QString &name);
-
-    QPointer<AgentFactory> m_agentFactory;
-    QStringList m_availableAgents;
-    QString m_currentAgent;
-};
-
-} // namespace QodeAssist::Chat

ChatView/ChatCompressor.cpp

@@ -1,34 +1,21 @@
 // Copyright (C) 2024-2026 Petr Mironychev
 // SPDX-License-Identifier: GPL-3.0-or-later
-// Additional attribution terms under GPLv3 §7(b) apply — see LICENSE
 
 #include "ChatCompressor.hpp"
 
-#include <memory>
-
 #include <LLMQore/BaseClient.hpp>
-#include <LLMQore/ContentBlocks.hpp>
-
-#include <projectexplorer/project.h>
-#include <projectexplorer/projectmanager.h>
-
+#include "ChatModel.hpp"
 #include "GeneralSettings.hpp"
+#include "PromptTemplateManager.hpp"
+#include "ProvidersManager.hpp"
 #include "logger/Logger.hpp"
 
-#include <AgentFactory.hpp>
-#include <ContextRenderer.hpp>
-#include <ConversationHistory.hpp>
-#include <Message.hpp>
-#include <Session.hpp>
-#include <SessionManager.hpp>
-
 #include <QDateTime>
 #include <QFile>
 #include <QFileInfo>
 #include <QJsonArray>
 #include <QJsonDocument>
 #include <QJsonObject>
-#include <QStringList>
 #include <QUuid>
 
 namespace QodeAssist::Chat {
@@ -37,18 +24,7 @@ ChatCompressor::ChatCompressor(QObject *parent)
     : QObject(parent)
 {}
 
-void ChatCompressor::setSessionManager(SessionManager *sessionManager)
-{
-    m_sessionManager = sessionManager;
-}
-
-void ChatCompressor::setActiveAgent(const QString &agentName)
-{
-    m_activeAgent = agentName;
-}
-
-void ChatCompressor::startCompression(
-    const QString &chatFilePath, ConversationHistory *sourceHistory)
+void ChatCompressor::startCompression(const QString &chatFilePath, ChatModel *chatModel)
 {
     if (m_isCompressing) {
         emit compressionFailed(tr("Compression already in progress"));
@@ -60,84 +36,47 @@ void ChatCompressor::startCompression(
         return;
     }
 
-    if (!sourceHistory || sourceHistory->isEmpty()) {
+    if (!chatModel || chatModel->rowCount() == 0) {
         emit compressionFailed(tr("Chat is empty, nothing to compress"));
         return;
     }
 
-    if (!m_sessionManager) {
-        emit compressionFailed(tr("Chat session manager is not available"));
+    auto providerName = Settings::generalSettings().caProvider();
+    m_provider = PluginLLMCore::ProvidersManager::instance().getProviderByName(providerName);
+
+    if (!m_provider) {
+        emit compressionFailed(tr("No provider available"));
         return;
     }
 
-    QString sessionError;
-    Session *session = m_sessionManager->acquire(m_activeAgent, &sessionError);
-    if (!session) {
-        emit compressionFailed(
-            sessionError.isEmpty() ? tr("No chat agent selected") : sessionError);
+    auto templateName = Settings::generalSettings().caTemplate();
+    auto promptTemplate = PluginLLMCore::PromptTemplateManager::instance().getChatTemplateByName(
+        templateName);
+
+    if (!promptTemplate) {
+        emit compressionFailed(tr("No template available"));
         return;
     }
 
-    auto *client = session->client();
-    if (!client) {
-        m_sessionManager->removeSession(session);
-        emit compressionFailed(tr("Chat agent has no live client"));
-        return;
-    }
-
-    auto *project = ProjectExplorer::ProjectManager::startupProject();
-    Templates::ContextRenderer::Bindings bindings;
-    bindings.projectDir = project ? project->projectDirectory().toFSPathString() : QString();
-    bindings.configDir = AgentFactory::userConfigDir();
-    session->setContextBindings(bindings);
-
     m_isCompressing = true;
+    m_chatModel = chatModel;
     m_originalChatPath = chatFilePath;
-    m_session = session;
+    m_accumulatedSummary.clear();
 
     emit compressionStarted();
 
-    QStringList transcriptParts;
-    for (const auto &msg : sourceHistory->messages()) {
-        if (msg.role() != Message::Role::User && msg.role() != Message::Role::Assistant)
-            continue;
-        const QString text = msg.text();
-        if (text.trimmed().isEmpty())
-            continue;
+    connectProviderSignals();
 
-        const QString role = msg.role() == Message::Role::User ? QStringLiteral("User")
-                                                               : QStringLiteral("Assistant");
-        transcriptParts.append(QStringLiteral("%1: %2").arg(role, text));
-    }
+    QJsonObject payload{
+        {"model", Settings::generalSettings().caModel()}, {"stream", true}};
 
-    if (transcriptParts.isEmpty()) {
-        handleCompressionError(tr("Chat is empty, nothing to compress"));
-        return;
-    }
+    buildRequestPayload(payload, promptTemplate);
 
-    const QString transcript = transcriptParts.join(QStringLiteral("\n\n"));
-
-    connect(
-        session, &Session::finished, this,
-        [this](const LLMQore::RequestID &id, const QString &) { onCompressionFinished(id); });
-    connect(
-        session, &Session::failed, this,
-        [this](const LLMQore::RequestID &id, const QodeAssist::ErrorInfo &error) {
-            onCompressionFailed(id, error.message);
-        });
-
-    client->setTransferTimeout(
-        static_cast<int>(Settings::generalSettings().requestTimeout() * 1000));
-
-    std::vector<std::unique_ptr<LLMQore::ContentBlock>> blocks;
-    blocks.push_back(std::make_unique<LLMQore::TextContent>(transcript));
-
-    m_currentRequestId = session->send(std::move(blocks));
-    if (m_currentRequestId.isEmpty()) {
-        handleCompressionError(tr("Failed to start compression request: %1")
-                                   .arg(session->lastError().message));
-        return;
-    }
+    const QString customEndpoint = Settings::generalSettings().caCustomEndpoint();
+    const QString endpoint = !customEndpoint.isEmpty() ? customEndpoint
+                                                       : promptTemplate->endpoint();
+    m_currentRequestId = m_provider->sendRequest(
+        QUrl(Settings::generalSettings().caUrl()), payload, endpoint);
     LOG_MESSAGE(QString("Starting compression request: %1").arg(m_currentRequestId));
 }
 
@@ -152,38 +91,44 @@ void ChatCompressor::cancelCompression()
         return;
 
     LOG_MESSAGE("Cancelling compression request");
+
+    if (m_provider && !m_currentRequestId.isEmpty())
+        m_provider->cancelRequest(m_currentRequestId);
+
     cleanupState();
     emit compressionFailed(tr("Compression cancelled"));
 }
 
-void ChatCompressor::onCompressionFinished(const QString &requestId)
+void ChatCompressor::onPartialResponseReceived(const QString &requestId, const QString &partialText)
 {
     if (!m_isCompressing || requestId != m_currentRequestId)
         return;
 
-    QString summary;
-    if (m_session) {
-        if (auto *history = m_session->history(); history && !history->isEmpty())
-            summary = history->messages().back().text();
-    }
+    m_accumulatedSummary += partialText;
+}
 
-    LOG_MESSAGE(QString("Received summary, length: %1 characters").arg(summary.length()));
+void ChatCompressor::onFullResponseReceived(const QString &requestId, const QString &fullText)
+{
+    Q_UNUSED(fullText)
 
-    const QString compressedPath = createCompressedChatPath(m_originalChatPath);
-    const QString sourcePath = m_originalChatPath;
+    if (!m_isCompressing || requestId != m_currentRequestId)
+        return;
 
-    cleanupState();
+    LOG_MESSAGE(
+        QString("Received summary, length: %1 characters").arg(m_accumulatedSummary.length()));
 
-    if (!createCompressedChatFile(sourcePath, compressedPath, summary)) {
-        emit compressionFailed(tr("Failed to save compressed chat"));
+    QString compressedPath = createCompressedChatPath(m_originalChatPath);
+    if (!createCompressedChatFile(m_originalChatPath, compressedPath, m_accumulatedSummary)) {
+        handleCompressionError(tr("Failed to save compressed chat"));
         return;
     }
 
     LOG_MESSAGE(QString("Compression completed: %1").arg(compressedPath));
+    cleanupState();
     emit compressionCompleted(compressedPath);
 }
 
-void ChatCompressor::onCompressionFailed(const QString &requestId, const QString &error)
+void ChatCompressor::onRequestFailed(const QString &requestId, const QString &error)
 {
     if (!m_isCompressing || requestId != m_currentRequestId)
         return;
@@ -206,6 +151,53 @@ QString ChatCompressor::createCompressedChatPath(const QString &originalPath) co
         .arg(fileInfo.absolutePath(), fileInfo.completeBaseName(), hash, fileInfo.suffix());
 }
 
+QString ChatCompressor::buildCompressionPrompt() const
+{
+    return QStringLiteral(
+        "Please create a comprehensive summary of our entire conversation above. "
+        "The summary should:\n"
+        "1. Preserve all important context, decisions, and key information\n"
+        "2. Maintain technical details, code snippets, file references, and specific examples\n"
+        "3. Keep the chronological flow of the discussion\n"
+        "4. Be significantly shorter than the original (aim for 30-40% of original length)\n"
+        "5. Be written in clear, structured format\n"
+        "6. Use markdown formatting for better readability\n\n"
+        "Create the summary now:");
+}
+
+void ChatCompressor::buildRequestPayload(
+    QJsonObject &payload, PluginLLMCore::PromptTemplate *promptTemplate)
+{
+    PluginLLMCore::ContextData context;
+
+    context.systemPrompt = QStringLiteral(
+        "You are a helpful assistant that creates concise summaries of conversations. "
+        "Your summaries preserve key information, technical details, and the flow of discussion.");
+
+    QVector<PluginLLMCore::Message> messages;
+    for (const auto &msg : m_chatModel->getChatHistory()) {
+        if (msg.role == ChatModel::ChatRole::Tool 
+            || msg.role == ChatModel::ChatRole::FileEdit
+            || msg.role == ChatModel::ChatRole::Thinking)
+            continue;
+
+        PluginLLMCore::Message apiMessage;
+        apiMessage.role = (msg.role == ChatModel::ChatRole::User) ? "user" : "assistant";
+        apiMessage.content = msg.content;
+        messages.append(apiMessage);
+    }
+
+    PluginLLMCore::Message compressionRequest;
+    compressionRequest.role = "user";
+    compressionRequest.content = buildCompressionPrompt();
+    messages.append(compressionRequest);
+
+    context.history = messages;
+
+    m_provider->prepareRequest(
+        payload, promptTemplate, context, PluginLLMCore::RequestType::Chat, false, false);
+}
+
 bool ChatCompressor::createCompressedChatFile(
     const QString &sourcePath, const QString &destPath, const QString &summary)
 {
@@ -229,15 +221,13 @@ bool ChatCompressor::createCompressedChatFile(
 
     QJsonObject summaryMessage;
     summaryMessage["role"] = "assistant";
+    summaryMessage["content"] = QString("# Chat Summary\n\n%1").arg(summary);
     summaryMessage["id"] = QUuid::createUuid().toString(QUuid::WithoutBraces);
-    QJsonObject textBlock;
-    textBlock["type"] = "text";
-    textBlock["text"] = QString("# Chat Summary\n\n%1").arg(summary);
-    summaryMessage["blocks"] = QJsonArray{textBlock};
+    summaryMessage["isRedacted"] = false;
+    summaryMessage["attachments"] = QJsonArray();
+    summaryMessage["images"] = QJsonArray();
 
     root["messages"] = QJsonArray{summaryMessage};
-    root["compressedFrom"] = sourcePath;
-    root["compressedAt"] = QDateTime::currentDateTime().toString(Qt::ISODate);
 
     if (QFile::exists(destPath))
         QFile::remove(destPath);
@@ -252,17 +242,49 @@ bool ChatCompressor::createCompressedChatFile(
     return true;
 }
 
+void ChatCompressor::connectProviderSignals()
+{
+    auto *c = m_provider->client();
+
+    m_connections.append(connect(
+        c,
+        &::LLMQore::BaseClient::chunkReceived,
+        this,
+        &ChatCompressor::onPartialResponseReceived,
+        Qt::UniqueConnection));
+
+    m_connections.append(connect(
+        c,
+        &::LLMQore::BaseClient::requestCompleted,
+        this,
+        &ChatCompressor::onFullResponseReceived,
+        Qt::UniqueConnection));
+
+    m_connections.append(connect(
+        c,
+        &::LLMQore::BaseClient::requestFailed,
+        this,
+        &ChatCompressor::onRequestFailed,
+        Qt::UniqueConnection));
+}
+
+void ChatCompressor::disconnectAllSignals()
+{
+    for (const auto &connection : std::as_const(m_connections))
+        disconnect(connection);
+    m_connections.clear();
+}
+
 void ChatCompressor::cleanupState()
 {
-    Session *session = m_session;
+    disconnectAllSignals();
 
     m_isCompressing = false;
     m_currentRequestId.clear();
     m_originalChatPath.clear();
-    m_session = nullptr;
-
-    if (session && m_sessionManager)
-        m_sessionManager->release(session);
+    m_accumulatedSummary.clear();
+    m_chatModel = nullptr;
+    m_provider = nullptr;
 }
 
 } // namespace QodeAssist::Chat

ChatView/ChatCompressor.hpp

@@ -1,22 +1,22 @@
 // Copyright (C) 2024-2026 Petr Mironychev
 // SPDX-License-Identifier: GPL-3.0-or-later
-// Additional attribution terms under GPLv3 §7(b) apply — see LICENSE
 
 #pragma once
 
+#include <QJsonObject>
 #include <QList>
 #include <QObject>
-#include <QPointer>
 #include <QString>
 
-namespace QodeAssist {
-class SessionManager;
-class Session;
-class ConversationHistory;
-}
+namespace QodeAssist::PluginLLMCore {
+class Provider;
+class PromptTemplate;
+} // namespace QodeAssist::PluginLLMCore
 
 namespace QodeAssist::Chat {
 
+class ChatModel;
+
 class ChatCompressor : public QObject
 {
     Q_OBJECT
@@ -24,10 +24,7 @@ class ChatCompressor : public QObject
 public:
     explicit ChatCompressor(QObject *parent = nullptr);
 
-    void setSessionManager(SessionManager *sessionManager);
-    void setActiveAgent(const QString &agentName);
-
-    void startCompression(const QString &chatFilePath, ConversationHistory *sourceHistory);
+    void startCompression(const QString &chatFilePath, ChatModel *chatModel);
 
     bool isCompressing() const;
     void cancelCompression();
@@ -37,22 +34,30 @@ signals:
     void compressionCompleted(const QString &compressedChatPath);
     void compressionFailed(const QString &error);
 
-private:
-    void onCompressionFinished(const QString &requestId);
-    void onCompressionFailed(const QString &requestId, const QString &error);
+private slots:
+    void onPartialResponseReceived(const QString &requestId, const QString &partialText);
+    void onFullResponseReceived(const QString &requestId, const QString &fullText);
+    void onRequestFailed(const QString &requestId, const QString &error);
 
+private:
     QString createCompressedChatPath(const QString &originalPath) const;
+    QString buildCompressionPrompt() const;
     bool createCompressedChatFile(
         const QString &sourcePath, const QString &destPath, const QString &summary);
+    void connectProviderSignals();
+    void disconnectAllSignals();
     void cleanupState();
     void handleCompressionError(const QString &error);
+    void buildRequestPayload(QJsonObject &payload, PluginLLMCore::PromptTemplate *promptTemplate);
 
     bool m_isCompressing = false;
     QString m_currentRequestId;
     QString m_originalChatPath;
-    QPointer<SessionManager> m_sessionManager;
-    QString m_activeAgent;
-    QPointer<Session> m_session;
+    QString m_accumulatedSummary;
+    PluginLLMCore::Provider *m_provider = nullptr;
+    ChatModel *m_chatModel = nullptr;
+
+    QList<QMetaObject::Connection> m_connections;
 };
 
 } // namespace QodeAssist::Chat

ChatView/ChatData.hpp

@@ -1,6 +1,5 @@
 // Copyright (C) 2025-2026 Petr Mironychev
 // SPDX-License-Identifier: GPL-3.0-or-later
-// Additional attribution terms under GPLv3 §7(b) apply — see LICENSE
 
 #pragma once
 

ChatView/ChatFileManager.cpp

@@ -1,6 +1,5 @@
 // Copyright (C) 2024-2026 Petr Mironychev
 // SPDX-License-Identifier: GPL-3.0-or-later
-// Additional attribution terms under GPLv3 §7(b) apply — see LICENSE
 
 #include "ChatFileManager.hpp"
 #include "Logger.hpp"

ChatView/ChatFileManager.hpp

@@ -1,6 +1,5 @@
 // Copyright (C) 2024-2026 Petr Mironychev
 // SPDX-License-Identifier: GPL-3.0-or-later
-// Additional attribution terms under GPLv3 §7(b) apply — see LICENSE
 
 #pragma once
 

ChatView/ChatHistoryStore.cpp

@@ -1,240 +0,0 @@
-// Copyright (C) 2024-2026 Petr Mironychev
-// SPDX-License-Identifier: GPL-3.0-or-later
-// Additional attribution terms under GPLv3 §7(b) apply — see LICENSE
-
-#include "ChatHistoryStore.hpp"
-
-#include <QDateTime>
-#include <QDesktopServices>
-#include <QDir>
-#include <QFileDialog>
-#include <QFileInfo>
-#include <QRegularExpression>
-#include <QUrl>
-
-#include <coreplugin/icore.h>
-#include <projectexplorer/project.h>
-#include <projectexplorer/projectmanager.h>
-
-#include <ConversationHistory.hpp>
-#include <Message.hpp>
-#include <PluginBlocks.hpp>
-
-#include <LLMQore/ContentBlocks.hpp>
-
-#include "Logger.hpp"
-#include "ProjectSettings.hpp"
-
-namespace QodeAssist::Chat {
-
-ChatHistoryStore::ChatHistoryStore(ConversationHistory *history, QObject *parent)
-    : QObject(parent)
-    , m_history(history)
-{}
-
-QString ChatHistoryStore::historyDir() const
-{
-    QString path;
-
-    if (auto project = ProjectExplorer::ProjectManager::startupProject()) {
-        Settings::ProjectSettings projectSettings(project);
-        path = projectSettings.chatHistoryPath().toFSPathString();
-    } else {
-        QDir baseDir(Core::ICore::userResourcePath().toFSPathString());
-        path = baseDir.filePath("qodeassist/chat_history");
-    }
-
-    QDir dir(path);
-    if (!dir.exists() && !dir.mkpath(".")) {
-        LOG_MESSAGE(QString("Failed to create directory: %1").arg(path));
-        return QString();
-    }
-
-    return path;
-}
-
-QString ChatHistoryStore::suggestedFileName() const
-{
-    QString shortMessage;
-
-    if (m_history) {
-        for (const auto &message : m_history->messages()) {
-            if (message.role() != Message::Role::User)
-                continue;
-
-            const QString text = message.text();
-            if (!text.trimmed().isEmpty()) {
-                shortMessage = text.split('\n').first().simplified().left(30);
-            } else {
-                for (const auto &block : message.blocks()) {
-                    if (dynamic_cast<StoredImageContent *>(block.get())) {
-                        shortMessage = "image_chat";
-                        break;
-                    }
-                }
-            }
-            break;
-        }
-    }
-
-    return generateChatFileName(shortMessage, historyDir());
-}
-
-QString ChatHistoryStore::autosaveFilePath(const QString &recentFilePath) const
-{
-    if (!recentFilePath.isEmpty()) {
-        return recentFilePath;
-    }
-
-    QString dir = historyDir();
-    if (dir.isEmpty()) {
-        return QString();
-    }
-
-    return QDir(dir).filePath(suggestedFileName() + ".json");
-}
-
-QString ChatHistoryStore::autosaveFilePath(
-    const QString &recentFilePath, const QString &firstMessage, bool hasImageAttachments) const
-{
-    if (!recentFilePath.isEmpty()) {
-        return recentFilePath;
-    }
-
-    QString dir = historyDir();
-    if (dir.isEmpty()) {
-        return QString();
-    }
-
-    QString shortMessage = firstMessage.split('\n').first().simplified().left(30);
-
-    if (shortMessage.isEmpty() && hasImageAttachments) {
-        shortMessage = "image_chat";
-    }
-
-    QString fileName = generateChatFileName(shortMessage, dir);
-    return QDir(dir).filePath(fileName + ".json");
-}
-
-SerializationResult ChatHistoryStore::save(const QString &filePath) const
-{
-    return ChatSerializer::saveToFile(m_history, filePath);
-}
-
-SerializationResult ChatHistoryStore::load(const QString &filePath) const
-{
-    return ChatSerializer::loadFromFile(m_history, filePath);
-}
-
-void ChatHistoryStore::showSaveDialog()
-{
-    QString initialDir = historyDir();
-
-    QFileDialog *dialog = new QFileDialog(nullptr, tr("Save Chat History"));
-    dialog->setAcceptMode(QFileDialog::AcceptSave);
-    dialog->setFileMode(QFileDialog::AnyFile);
-    dialog->setNameFilter(tr("JSON files (*.json)"));
-    dialog->setDefaultSuffix("json");
-    if (!initialDir.isEmpty()) {
-        dialog->setDirectory(initialDir);
-        dialog->selectFile(suggestedFileName() + ".json");
-    }
-
-    connect(dialog, &QFileDialog::finished, this, [this, dialog](int result) {
-        if (result == QFileDialog::Accepted) {
-            QStringList files = dialog->selectedFiles();
-            if (!files.isEmpty()) {
-                emit saveRequested(files.first());
-            }
-        }
-        dialog->deleteLater();
-    });
-
-    dialog->open();
-}
-
-void ChatHistoryStore::showLoadDialog()
-{
-    QString initialDir = historyDir();
-
-    QFileDialog *dialog = new QFileDialog(nullptr, tr("Load Chat History"));
-    dialog->setAcceptMode(QFileDialog::AcceptOpen);
-    dialog->setFileMode(QFileDialog::ExistingFile);
-    dialog->setNameFilter(tr("JSON files (*.json)"));
-    if (!initialDir.isEmpty()) {
-        dialog->setDirectory(initialDir);
-    }
-
-    connect(dialog, &QFileDialog::finished, this, [this, dialog](int result) {
-        if (result == QFileDialog::Accepted) {
-            QStringList files = dialog->selectedFiles();
-            if (!files.isEmpty()) {
-                emit loadRequested(files.first());
-            }
-        }
-        dialog->deleteLater();
-    });
-
-    dialog->open();
-}
-
-void ChatHistoryStore::openHistoryFolder() const
-{
-    QString path;
-    if (auto project = ProjectExplorer::ProjectManager::startupProject()) {
-        Settings::ProjectSettings projectSettings(project);
-        path = projectSettings.chatHistoryPath().toFSPathString();
-    } else {
-        QDir baseDir(Core::ICore::userResourcePath().toFSPathString());
-        path = baseDir.filePath("qodeassist/chat_history");
-    }
-
-    QDir dir(path);
-    if (!dir.exists()) {
-        dir.mkpath(".");
-    }
-
-    QUrl url = QUrl::fromLocalFile(dir.absolutePath());
-    QDesktopServices::openUrl(url);
-}
-
-QString ChatHistoryStore::generateChatFileName(const QString &shortMessage, const QString &dir) const
-{
-    static const QRegularExpression saitizeSymbols = QRegularExpression("[\\/:*?\"<>|\\s]");
-    static const QRegularExpression underSymbols = QRegularExpression("_+");
-
-    QStringList parts;
-    QString sanitizedMessage = shortMessage;
-    sanitizedMessage.replace(saitizeSymbols, "_");
-    sanitizedMessage.replace(underSymbols, "_");
-    sanitizedMessage = sanitizedMessage.trimmed();
-
-    if (!sanitizedMessage.isEmpty()) {
-        if (sanitizedMessage.startsWith('_')) {
-            sanitizedMessage.remove(0, 1);
-        }
-        if (sanitizedMessage.endsWith('_')) {
-            sanitizedMessage.chop(1);
-        }
-
-        QString fullPath = QDir(dir).filePath(sanitizedMessage);
-        QFileInfo fileInfo(fullPath);
-        if (!fileInfo.exists() && QFileInfo(fileInfo.path()).isWritable()) {
-            parts << sanitizedMessage;
-        }
-    }
-
-    parts << QDateTime::currentDateTime().toString("yyyy-MM-dd_HH-mm");
-
-    QString fileName = parts.join("_");
-    QString fullPath = QDir(dir).filePath(fileName);
-    QFileInfo finalCheck(fullPath);
-
-    if (fileName.isEmpty() || finalCheck.exists() || !QFileInfo(finalCheck.path()).isWritable()) {
-        fileName = QString("chat_%1").arg(QDateTime::currentDateTime().toString("yyyy-MM-dd_HH-mm"));
-    }
-
-    return fileName;
-}
-
-} // namespace QodeAssist::Chat

ChatView/ChatHistoryStore.hpp

@@ -1,50 +0,0 @@
-// Copyright (C) 2024-2026 Petr Mironychev
-// SPDX-License-Identifier: GPL-3.0-or-later
-// Additional attribution terms under GPLv3 §7(b) apply — see LICENSE
-
-#pragma once
-
-#include <QObject>
-#include <QString>
-
-#include "ChatSerializer.hpp"
-
-namespace QodeAssist {
-class ConversationHistory;
-}
-
-namespace QodeAssist::Chat {
-
-class ChatHistoryStore : public QObject
-{
-    Q_OBJECT
-
-public:
-    explicit ChatHistoryStore(ConversationHistory *history, QObject *parent = nullptr);
-
-    QString historyDir() const;
-    QString suggestedFileName() const;
-    QString autosaveFilePath(const QString &recentFilePath) const;
-    QString autosaveFilePath(
-        const QString &recentFilePath,
-        const QString &firstMessage,
-        bool hasImageAttachments) const;
-
-    SerializationResult save(const QString &filePath) const;
-    SerializationResult load(const QString &filePath) const;
-
-    void showSaveDialog();
-    void showLoadDialog();
-    void openHistoryFolder() const;
-
-signals:
-    void saveRequested(const QString &filePath);
-    void loadRequested(const QString &filePath);
-
-private:
-    QString generateChatFileName(const QString &shortMessage, const QString &dir) const;
-
-    ConversationHistory *m_history;
-};
-
-} // namespace QodeAssist::Chat

ChatView/ChatModel.hpp

@@ -1,6 +1,5 @@
 // Copyright (C) 2024-2026 Petr Mironychev
 // SPDX-License-Identifier: GPL-3.0-or-later
-// Additional attribution terms under GPLv3 §7(b) apply — see LICENSE
 
 #pragma once
 
@@ -8,135 +7,107 @@
 #include "MessagePart.hpp"
 
 #include <QAbstractListModel>
-#include <QHash>
 #include <QJsonArray>
-#include <QJsonObject>
-#include <QPointer>
-#include <QVector>
 #include <QtQmlIntegration>
 
-namespace QodeAssist {
-class ConversationHistory;
-}
+#include "context/ContentFile.hpp"
 
 namespace QodeAssist::Chat {
 
 class ChatModel : public QAbstractListModel
 {
     Q_OBJECT
-    Q_PROPERTY(int sessionPromptTokens READ sessionPromptTokens NOTIFY sessionUsageChanged FINAL)
-    Q_PROPERTY(int sessionCompletionTokens READ sessionCompletionTokens NOTIFY sessionUsageChanged FINAL)
-    Q_PROPERTY(int sessionCachedPromptTokens READ sessionCachedPromptTokens NOTIFY sessionUsageChanged FINAL)
+    Q_PROPERTY(int tokensThreshold READ tokensThreshold NOTIFY tokensThresholdChanged FINAL)
     QML_ELEMENT
 
 public:
-    enum ChatRole : int { System, User, Assistant, Tool, FileEdit, Thinking };
+    enum ChatRole { System, User, Assistant, Tool, FileEdit, Thinking };
     Q_ENUM(ChatRole)
 
-    enum Roles : int {
-        RoleType = Qt::UserRole,
-        Content,
-        Attachments,
-        IsRedacted,
-        Images,
-        PromptTokens,
-        CompletionTokens,
-        CachedPromptTokens,
-        ReasoningTokens,
-        TotalTokens
-    };
+    enum Roles { RoleType = Qt::UserRole, Content, Attachments, IsRedacted, Images };
     Q_ENUM(Roles)
 
-    explicit ChatModel(QObject *parent = nullptr);
+    struct ImageAttachment
+    {
+        QString fileName;      // Original filename
+        QString storedPath;    // Path to stored image file (relative to chat folder)
+        QString mediaType;     // MIME type
+    };
 
-    void setHistory(ConversationHistory *history);
+    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);
 
     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;
 
+    Q_INVOKABLE void addMessage(
+        const QString &content,
+        ChatRole role,
+        const QString &id,
+        const QList<Context::ContentFile> &attachments = {},
+        const QList<ImageAttachment> &images = {},
+        bool isRedacted = false,
+        const QString &signature = QString());
     Q_INVOKABLE void clear();
     Q_INVOKABLE QList<MessagePart> processMessageContent(const QString &content) const;
+
+    QVector<Message> getChatHistory() const;
+    QJsonArray prepareMessagesForRequest(const QString &systemPrompt) const;
+
+    int tokensThreshold() const;
+
+    QString currentModel() const;
+    QString lastMessageId() const;
+
     Q_INVOKABLE void resetModelTo(int index);
-    Q_INVOKABLE QVariantList userMessagePreviews(int maxLength = 80) const;
-
-    void setMessageUsage(
-        const QString &messageId,
-        int promptTokens,
-        int completionTokens,
-        int cachedPromptTokens,
-        int reasoningTokens);
-
-    int sessionPromptTokens() const;
-    int sessionCompletionTokens() const;
-    int sessionCachedPromptTokens() const;
 
+    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();
-    void sessionUsageChanged();
 
 private slots:
-    void onHistoryMessageAdded(int index);
-    void onHistoryMessageUpdated(int index);
-    void onHistoryCleared();
-    void onHistoryReset();
-    void onFileEditStatusChanged(const QString &editId);
+    void onFileEditApplied(const QString &editId);
+    void onFileEditRejected(const QString &editId);
+    void onFileEditArchived(const QString &editId);
 
 private:
-    struct AttachmentRef
-    {
-        QString fileName;
-        QString storedPath;
-    };
-    struct ImageRef
-    {
-        QString fileName;
-        QString storedPath;
-        QString mediaType;
-    };
-    struct Row
-    {
-        ChatRole kind = ChatRole::Assistant;
-        int messageIndex = -1;
-        QString messageId;
-        QString content;
-        bool isRedacted = false;
-        QString editId;
-        QString fileEditDisplay;
-        QVector<AttachmentRef> attachments;
-        QVector<ImageRef> images;
-    };
-    struct Usage
-    {
-        int prompt = 0;
-        int completion = 0;
-        int cached = 0;
-        int reasoning = 0;
-    };
-
-    void rebuildAll();
-    void reprojectTail(int startMessageIndex);
-    int startMessageIndexFor(int messageIndex) const;
-    int firstRowForMessage(int messageIndex) const;
-    QHash<QString, QString> buildToolResultMap() const;
-    void mergeToolResultsFromMessage(int messageIndex);
-    void pruneUsageToHistory();
-    void appendRowsForMessage(
-        int messageIndex, const QHash<QString, QString> &toolResults, QVector<Row> &out) const;
-    QString overlayFileEditStatus(const QString &content, const QString &editId) const;
-    QVariantList buildAttachmentList(const QVector<AttachmentRef> &attachments) const;
-    QVariantList buildImageList(const QVector<ImageRef> &images) const;
-
-    QPointer<ConversationHistory> m_history;
-    QVector<Row> m_rows;
-    QHash<QString, QString> m_toolResults;
-    QHash<QString, Usage> m_usageByMessageId;
+    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
-
+Q_DECLARE_METATYPE(QodeAssist::Chat::ChatModel::Message)
 Q_DECLARE_METATYPE(QodeAssist::Chat::MessagePart)

ChatView/ChatRootView.hpp

@@ -1,42 +1,26 @@
 // Copyright (C) 2024-2026 Petr Mironychev
 // SPDX-License-Identifier: GPL-3.0-or-later
-// Additional attribution terms under GPLv3 §7(b) apply — see LICENSE
 
 #pragma once
 
-#include <QPointer>
 #include <QQuickItem>
 #include <QVariantList>
 
 #include "ChatFileManager.hpp"
 #include "ChatModel.hpp"
 #include "ClientInterface.hpp"
+#include "pluginllmcore/PromptProviderChat.hpp"
 #include <coreplugin/editormanager/editormanager.h>
 
-namespace QodeAssist::Skills {
-class SkillsManager;
-}
-
-namespace QodeAssist {
-class AgentFactory;
-class SessionManager;
-class ConversationHistory;
-class Session;
-}
-
 namespace QodeAssist::Chat {
 
 class ChatCompressor;
-class ChatAgentController;
-class FileEditController;
-class InputTokenCounter;
-class ChatHistoryStore;
-class SessionFileRegistry;
 
 class ChatRootView : public QQuickItem
 {
     Q_OBJECT
     Q_PROPERTY(QodeAssist::Chat::ChatModel *chatModel READ chatModel NOTIFY chatModelChanged FINAL)
+    Q_PROPERTY(QString currentTemplate READ currentTemplate NOTIFY currentTemplateChanged FINAL)
     Q_PROPERTY(bool isSyncOpenFiles READ isSyncOpenFiles NOTIFY isSyncOpenFilesChanged FINAL)
     Q_PROPERTY(QStringList attachmentFiles READ attachmentFiles NOTIFY attachmentFilesChanged FINAL)
     Q_PROPERTY(QStringList linkedFiles READ linkedFiles NOTIFY linkedFilesChanged FINAL)
@@ -50,27 +34,32 @@ class ChatRootView : public QQuickItem
     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(bool useTools READ useTools NOTIFY useToolsChanged FINAL)
-    Q_PROPERTY(QString sendShortcutText READ sendShortcutText NOTIFY sendShortcutTextChanged FINAL)
+    Q_PROPERTY(QVariantList activeRules READ activeRules NOTIFY activeRulesChanged FINAL)
+    Q_PROPERTY(int activeRulesCount READ activeRulesCount NOTIFY activeRulesCountChanged FINAL)
+    Q_PROPERTY(bool useTools READ useTools WRITE setUseTools NOTIFY useToolsChanged FINAL)
+    Q_PROPERTY(bool useThinking READ useThinking WRITE setUseThinking NOTIFY useThinkingChanged 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(QStringList availableChatAgents READ availableChatAgents NOTIFY availableChatAgentsChanged FINAL)
-    Q_PROPERTY(QString currentChatAgent READ currentChatAgent WRITE setCurrentChatAgent NOTIFY currentChatAgentChanged 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)
+    Q_PROPERTY(QStringList availableAgentRoles READ availableAgentRoles NOTIFY availableAgentRolesChanged FINAL)
+    Q_PROPERTY(QString currentAgentRole READ currentAgentRole NOTIFY currentAgentRoleChanged FINAL)
+    Q_PROPERTY(QString baseSystemPrompt READ baseSystemPrompt NOTIFY baseSystemPromptChanged FINAL)
+    Q_PROPERTY(QString currentAgentRoleDescription READ currentAgentRoleDescription NOTIFY currentAgentRoleChanged FINAL)
+    Q_PROPERTY(QString currentAgentRoleSystemPrompt READ currentAgentRoleSystemPrompt NOTIFY currentAgentRoleChanged FINAL)
     Q_PROPERTY(bool isCompressing READ isCompressing NOTIFY isCompressingChanged FINAL)
-    Q_PROPERTY(bool canCompress READ canCompress NOTIFY availableChatAgentsChanged FINAL)
-    Q_PROPERTY(bool isInEditor READ isInEditor NOTIFY isInEditorChanged FINAL)
-    Q_PROPERTY(QString chatTitle READ chatTitle NOTIFY chatTitleChanged FINAL)
 
     QML_ELEMENT
 
 public:
     ChatRootView(QQuickItem *parent = nullptr);
-    ~ChatRootView() override;
 
     ChatModel *chatModel() const;
+    QString currentTemplate() const;
 
     void saveHistory(const QString &filePath);
     void loadHistory(const QString &filePath);
@@ -95,19 +84,13 @@ public:
     Q_INVOKABLE void showAddImageDialog();
     Q_INVOKABLE bool isImageFile(const QString &filePath) const;
     Q_INVOKABLE void calculateMessageTokensCount(const QString &message);
-    Q_INVOKABLE bool isSendShortcut(int key, int modifiers) const;
-    QString sendShortcutText() const;
     Q_INVOKABLE void setIsSyncOpenFiles(bool state);
     Q_INVOKABLE void openChatHistoryFolder();
+    Q_INVOKABLE void openRulesFolder();
     Q_INVOKABLE void openSettings();
 
     Q_INVOKABLE void openFileInEditor(const QString &filePath);
 
-    Q_INVOKABLE void relocateToSplit();
-    Q_INVOKABLE void relocateToWindow();
-
-    void consumePendingChatFile();
-
     Q_INVOKABLE void updateInputTokensCount();
     int inputTokensCount() const;
 
@@ -133,10 +116,16 @@ public:
     void setRequestProgressStatus(bool state);
 
     QString lastErrorMessage() const;
-
-    Q_INVOKABLE QVariantList searchSkills(const QString &query) const;
+    
+    QVariantList activeRules() const;
+    int activeRulesCount() const;
+    Q_INVOKABLE QString getRuleContent(int index);
+    Q_INVOKABLE void refreshRules();
 
     bool useTools() const;
+    void setUseTools(bool enabled);
+    bool useThinking() const;
+    void setUseThinking(bool enabled);
 
     Q_INVOKABLE void applyFileEdit(const QString &editId);
     Q_INVOKABLE void rejectFileEdit(const QString &editId);
@@ -145,15 +134,25 @@ public:
     
     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;
 
     Q_INVOKABLE void compressCurrentChat();
     Q_INVOKABLE void cancelCompression();
 
-    Q_INVOKABLE void loadAvailableChatAgents();
-    QStringList availableChatAgents() const;
-    QString currentChatAgent() const;
-    void setCurrentChatAgent(const QString &name);
-
+    Q_INVOKABLE void loadAvailableAgentRoles();
+    Q_INVOKABLE void applyAgentRole(const QString &roleId);
+    Q_INVOKABLE void openAgentRolesSettings();
+    QStringList availableAgentRoles() const;
+    QString currentAgentRole() const;
+    QString baseSystemPrompt() const;
+    QString currentAgentRoleDescription() const;
+    QString currentAgentRoleSystemPrompt() const;
+    
     int currentMessageTotalEdits() const;
     int currentMessageAppliedEdits() const;
     int currentMessagePendingEdits() const;
@@ -161,15 +160,9 @@ public:
 
     QString lastInfoMessage() const;
 
+    bool isThinkingSupport() const;
+    
     bool isCompressing() const;
-    bool canCompress() const;
-
-    bool isInEditor() const;
-    void setInEditor(bool value);
-
-    QString chatTitle() const;
-
-    Q_INVOKABLE void requestNewChat();
 
 public slots:
     void sendMessage(const QString &message);
@@ -181,6 +174,7 @@ public slots:
 
 signals:
     void chatModelChanged();
+    void currentTemplateChanged();
     void attachmentFilesChanged();
     void linkedFilesChanged();
     void inputTokensCountChanged();
@@ -196,81 +190,64 @@ signals:
 
     void lastErrorMessageChanged();
     void lastInfoMessageChanged();
-    void sendShortcutTextChanged();
+    void activeRulesChanged();
+    void activeRulesCountChanged();
 
     void useToolsChanged();
+    void useThinkingChanged();
     void currentMessageEditsStatsChanged();
 
-    void availableChatAgentsChanged();
-    void currentChatAgentChanged();
+    void isThinkingSupportChanged();
+    void availableConfigurationsChanged();
+    void currentConfigurationChanged();
+
+    void availableAgentRolesChanged();
+    void currentAgentRoleChanged();
+    void baseSystemPromptChanged();
 
     void isCompressingChanged();
     void compressionCompleted(const QString &compressedChatPath);
     void compressionFailed(const QString &error);
 
-    void isInEditorChanged();
-    void chatTitleChanged();
-
     void openFilesChanged();
 
-    void closeHostRequested();
-
 private:
-    QString computeChatTitle() const;
-    void triggerOpenChatCommand(Utils::Id commandId);
-    void handOffSession();
-    bool deferSendForAutoCompress(
-        const QString &message,
-        const QStringList &attachments,
-        const QStringList &linkedFiles);
-    void dispatchSend(
-        const QString &message,
-        const QStringList &attachments,
-        const QStringList &linkedFiles);
-    QString configuredCompressionAgent() const;
+    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;
 
-    SessionFileRegistry *sessionFileRegistry() const;
-    Skills::SkillsManager *skillsManager() const;
-    AgentFactory *agentFactory() const;
-    SessionManager *sessionManager() const;
-    QodeAssist::Session *ownerSession();
-
-    QodeAssist::ConversationHistory *m_history;
     ChatModel *m_chatModel;
+    PluginLLMCore::PromptProviderChat m_promptProvider;
     ClientInterface *m_clientInterface;
     ChatFileManager *m_fileManager;
+    QString m_currentTemplate;
     QString m_recentFilePath;
     QStringList m_attachmentFiles;
     QStringList m_linkedFiles;
-
-    struct PendingSend {
-        QString message;
-        QStringList attachments;
-        QStringList linkedFiles;
-        bool active = false;
-    };
-    PendingSend m_pendingSend;
+    int m_messageTokensCount{0};
+    int m_inputTokensCount{0};
     bool m_isSyncOpenFiles;
-    bool m_isInEditor = false;
-    mutable QString m_cachedChatTitle;
     QList<Core::IEditor *> m_currentEditors;
     bool m_isRequestInProgress;
     QString m_lastErrorMessage;
-
+    QVariantList m_activeRules;
+    
+    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;
+
+    QStringList m_availableAgentRoles;
+    QString m_currentAgentRole;
 
     ChatCompressor *m_chatCompressor;
-    ChatAgentController *m_agentController;
-    FileEditController *m_fileEditController;
-    InputTokenCounter *m_tokenCounter;
-    ChatHistoryStore *m_historyStore;
-    mutable QPointer<SessionFileRegistry> m_sessionFileRegistry;
-    mutable bool m_sessionFileRegistryResolved = false;
-    mutable QPointer<Skills::SkillsManager> m_skillsManager;
-    mutable bool m_skillsManagerResolved = false;
-    mutable QPointer<AgentFactory> m_agentFactory;
-    mutable QPointer<SessionManager> m_sessionManager;
 };
 
 } // namespace QodeAssist::Chat

ChatView/ChatSerializer.cpp

@@ -1,12 +1,10 @@
 // Copyright (C) 2024-2026 Petr Mironychev
 // SPDX-License-Identifier: GPL-3.0-or-later
-// Additional attribution terms under GPLv3 §7(b) apply — see LICENSE
 
 #include "ChatSerializer.hpp"
 #include "Logger.hpp"
 
-#include <memory>
-
+#include <QBuffer>
 #include <QDir>
 #include <QFile>
 #include <QFileInfo>
@@ -14,57 +12,12 @@
 #include <QJsonDocument>
 #include <QUuid>
 
-#include <LLMQore/ContentBlocks.hpp>
-
-#include <ConversationHistory.hpp>
-#include <Message.hpp>
-#include <MessageSerializer.hpp>
-#include <PluginBlocks.hpp>
-
-#include "context/ChangesManager.h"
-
 namespace QodeAssist::Chat {
 
-namespace {
+const QString ChatSerializer::VERSION = "0.2";
 
-const QString kFileEditMarker = QStringLiteral("QODEASSIST_FILE_EDIT:");
-
-// Legacy (<= 0.2) per-row ChatRole values, kept only for importing old chat files.
-enum class LegacyRole { System = 0, User = 1, Assistant = 2, Tool = 3, FileEdit = 4, Thinking = 5 };
-
-void registerEditFromResult(const QString &result)
+SerializationResult ChatSerializer::saveToFile(const ChatModel *model, const QString &filePath)
 {
-    const int pos = result.indexOf(kFileEditMarker);
-    if (pos < 0)
-        return;
-    const QString jsonStr = result.mid(pos + kFileEditMarker.length());
-    const QJsonDocument doc = QJsonDocument::fromJson(jsonStr.toUtf8());
-    if (!doc.isObject())
-        return;
-    const QJsonObject obj = doc.object();
-    const QString editId = obj.value("edit_id").toString();
-    const QString filePath = obj.value("file").toString();
-    if (editId.isEmpty() || filePath.isEmpty())
-        return;
-    Context::ChangesManager::instance().addFileEdit(
-        editId,
-        filePath,
-        obj.value("old_content").toString(),
-        obj.value("new_content").toString(),
-        /*autoApply=*/false,
-        /*isFromHistory=*/true);
-}
-
-} // namespace
-
-const QString ChatSerializer::VERSION = "0.3";
-
-SerializationResult ChatSerializer::saveToFile(
-    const ConversationHistory *history, const QString &filePath)
-{
-    if (!history)
-        return {false, "No conversation history"};
-
     if (!ensureDirectoryExists(filePath)) {
         return {false, "Failed to create directory structure"};
     }
@@ -74,7 +27,9 @@ SerializationResult ChatSerializer::saveToFile(
         return {false, QString("Failed to open file for writing: %1").arg(filePath)};
     }
 
-    QJsonDocument doc(serializeChat(history));
+    QJsonObject root = serializeChat(model, filePath);
+    QJsonDocument doc(root);
+
     if (file.write(doc.toJson(QJsonDocument::Indented)) == -1) {
         return {false, QString("Failed to write to file: %1").arg(file.errorString())};
     }
@@ -82,12 +37,8 @@ SerializationResult ChatSerializer::saveToFile(
     return {true, QString()};
 }
 
-SerializationResult ChatSerializer::loadFromFile(
-    ConversationHistory *history, const QString &filePath)
+SerializationResult ChatSerializer::loadFromFile(ChatModel *model, const QString &filePath)
 {
-    if (!history)
-        return {false, "No conversation history"};
-
     QFile file(filePath);
     if (!file.open(QIODevice::ReadOnly)) {
         return {false, QString("Failed to open file for reading: %1").arg(filePath)};
@@ -99,140 +50,145 @@ SerializationResult ChatSerializer::loadFromFile(
         return {false, QString("JSON parse error: %1").arg(error.errorString())};
     }
 
-    const QJsonObject root = doc.object();
-    const QString version = root["version"].toString();
+    QJsonObject root = doc.object();
+    QString version = root["version"].toString();
+
     if (!validateVersion(version)) {
         return {false, QString("Unsupported version: %1").arg(version)};
     }
 
-    if (version == VERSION)
-        return loadCurrent(history, root);
-    return loadLegacy(history, root);
+    if (!deserializeChat(model, root, filePath)) {
+        return {false, "Failed to deserialize chat data"};
+    }
+
+    return {true, QString()};
 }
 
-QJsonObject ChatSerializer::serializeChat(const ConversationHistory *history)
+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;
+
+    if (message.isRedacted) {
+        messageObj["isRedacted"] = true;
+    }
+
+    if (!message.signature.isEmpty()) {
+        messageObj["signature"] = message.signature;
+    }
+
+    if (!message.attachments.isEmpty()) {
+        QJsonArray attachmentsArray;
+        for (const auto &attachment : message.attachments) {
+            QJsonObject attachmentObj;
+            attachmentObj["fileName"] = attachment.filename;
+            attachmentObj["storedPath"] = attachment.content;
+            attachmentsArray.append(attachmentObj);
+        }
+        messageObj["attachments"] = attachmentsArray;
+    }
+
+    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, 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("attachments")) {
+        QJsonArray attachmentsArray = json["attachments"].toArray();
+        for (const auto &attachmentValue : attachmentsArray) {
+            QJsonObject attachmentObj = attachmentValue.toObject();
+            Context::ContentFile attachment;
+            attachment.filename = attachmentObj["fileName"].toString();
+            attachment.content = attachmentObj["storedPath"].toString();
+            message.attachments.append(attachment);
+        }
+    }
+
+    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, const QString &chatFilePath)
 {
     QJsonArray messagesArray;
-    for (const auto &message : history->messages())
-        messagesArray.append(MessageSerializer::toJson(message));
+    for (const auto &message : model->getChatHistory()) {
+        messagesArray.append(serializeMessage(message, chatFilePath));
+    }
 
     QJsonObject root;
     root["version"] = VERSION;
     root["messages"] = messagesArray;
+
     return root;
 }
 
-SerializationResult ChatSerializer::loadCurrent(ConversationHistory *history, const QJsonObject &root)
+bool ChatSerializer::deserializeChat(
+    ChatModel *model, const QJsonObject &json, const QString &chatFilePath)
 {
-    history->clear();
+    QJsonArray messagesArray = json["messages"].toArray();
+    QVector<ChatModel::Message> messages;
+    messages.reserve(messagesArray.size());
 
-    const QJsonArray messagesArray = root["messages"].toArray();
-    for (const auto &value : messagesArray) {
-        bool ok = false;
-        Message message = MessageSerializer::fromJson(value.toObject(), &ok);
-        if (ok)
-            history->append(std::move(message));
+    for (const auto &messageValue : messagesArray) {
+        messages.append(deserializeMessage(messageValue.toObject(), chatFilePath));
     }
 
-    registerHistoricalFileEdits(history);
-    return {true, QString()};
-}
+    model->clear();
 
-SerializationResult ChatSerializer::loadLegacy(ConversationHistory *history, const QJsonObject &root)
-{
-    history->clear();
+    model->setLoadingFromHistory(true);
 
-    const QJsonArray arr = root["messages"].toArray();
-    int i = 0;
-    while (i < arr.size()) {
-        const QJsonObject mj = arr[i].toObject();
-        const auto role = static_cast<LegacyRole>(mj["role"].toInt());
-
-        if (role == LegacyRole::Tool) {
-            Message assistant(Message::Role::Assistant);
-            Message toolResults(Message::Role::User);
-            while (i < arr.size()
-                   && static_cast<LegacyRole>(arr[i].toObject()["role"].toInt()) == LegacyRole::Tool) {
-                const QJsonObject tj = arr[i].toObject();
-                const QString toolName = tj["toolName"].toString();
-                const QString id = tj["id"].toString();
-                if (!toolName.isEmpty()) {
-                    assistant.appendBlock(std::make_unique<LLMQore::ToolUseContent>(
-                        id, toolName, tj["toolArguments"].toObject()));
-                    toolResults.appendBlock(std::make_unique<LLMQore::ToolResultContent>(
-                        id, tj["toolResult"].toString()));
-                }
-                ++i;
-            }
-            if (!assistant.blocks().empty()) {
-                history->append(std::move(assistant));
-                history->append(std::move(toolResults));
-            }
-            continue;
-        }
-
-        ++i;
-
-        if (role == LegacyRole::FileEdit)
-            continue; // derived from the tool result in the new model
-
-        if (role == LegacyRole::Thinking) {
-            const QString content = mj["content"].toString();
-            const QString signature = mj["signature"].toString();
-            Message assistant(Message::Role::Assistant);
-            if (mj["isRedacted"].toBool(false)) {
-                assistant.appendBlock(
-                    std::make_unique<LLMQore::RedactedThinkingContent>(signature));
-            } else {
-                const int sigPos = content.indexOf(QStringLiteral("\n[Signature:"));
-                const QString thinking = sigPos >= 0 ? content.left(sigPos) : content;
-                assistant.appendBlock(
-                    std::make_unique<LLMQore::ThinkingContent>(thinking, signature));
-            }
-            history->append(std::move(assistant));
-            continue;
-        }
-
-        if (role == LegacyRole::User) {
-            Message user(Message::Role::User, mj["id"].toString());
-            user.appendBlock(std::make_unique<LLMQore::TextContent>(mj["content"].toString()));
-            for (const auto &a : mj["attachments"].toArray()) {
-                const QJsonObject ao = a.toObject();
-                user.appendBlock(std::make_unique<StoredAttachmentContent>(
-                    ao["fileName"].toString(), ao["storedPath"].toString()));
-            }
-            for (const auto &im : mj["images"].toArray()) {
-                const QJsonObject io = im.toObject();
-                user.appendBlock(std::make_unique<StoredImageContent>(
-                    io["fileName"].toString(),
-                    io["storedPath"].toString(),
-                    io["mediaType"].toString()));
-            }
-            history->append(std::move(user));
-        } else {
-            const QString content = mj["content"].toString();
-            if (content.trimmed().isEmpty())
-                continue;
-            const Message::Role mapped
-                = role == LegacyRole::System ? Message::Role::System : Message::Role::Assistant;
-            Message message(mapped, mj["id"].toString());
-            message.appendBlock(std::make_unique<LLMQore::TextContent>(content));
-            history->append(std::move(message));
-        }
+    for (const auto &message : messages) {
+        model->addMessage(
+            message.content,
+            message.role,
+            message.id,
+            message.attachments,
+            message.images,
+            message.isRedacted,
+            message.signature);
+        LOG_MESSAGE(QString("Loaded message with %1 image(s), isRedacted=%2, signature length=%3")
+                        .arg(message.images.size())
+                        .arg(message.isRedacted)
+                        .arg(message.signature.length()));
     }
 
-    registerHistoricalFileEdits(history);
-    return {true, QString()};
-}
+    model->setLoadingFromHistory(false);
 
-void ChatSerializer::registerHistoricalFileEdits(const ConversationHistory *history)
-{
-    for (const auto &message : history->messages()) {
-        for (const auto &block : message.blocks()) {
-            if (auto *tr = dynamic_cast<LLMQore::ToolResultContent *>(block.get()))
-                registerEditFromResult(tr->result());
-        }
-    }
+    return true;
 }
 
 bool ChatSerializer::ensureDirectoryExists(const QString &filePath)
@@ -244,7 +200,18 @@ bool ChatSerializer::ensureDirectoryExists(const QString &filePath)
 
 bool ChatSerializer::validateVersion(const QString &version)
 {
-    return version == VERSION || version == "0.2" || version == "0.1";
+    if (version == VERSION) {
+        return true;
+    }
+
+    if (version == "0.1") {
+        LOG_MESSAGE(
+            "Loading chat from old format 0.1 - images folder structure has changed from _images "
+            "to _content");
+        return true;
+    }
+
+    return false;
 }
 
 QString ChatSerializer::getChatContentFolder(const QString &chatFilePath)
@@ -300,20 +267,10 @@ bool ChatSerializer::saveContentToStorage(
     return true;
 }
 
-QString ChatSerializer::loadContentFromStorage(
-    const QString &chatFilePath, const QString &storedPath, StoredContentCache *cache)
+QString ChatSerializer::loadContentFromStorage(const QString &chatFilePath, const QString &storedPath)
 {
-    const QString contentFolder = getChatContentFolder(chatFilePath);
-    const QString fullPath = QDir(contentFolder).filePath(storedPath);
-
-    const QFileInfo info(fullPath);
-    if (cache) {
-        const auto it = cache->constFind(fullPath);
-        if (it != cache->constEnd() && it->modified == info.lastModified()
-            && it->size == info.size()) {
-            return it->base64;
-        }
-    }
+    QString contentFolder = getChatContentFolder(chatFilePath);
+    QString fullPath = QDir(contentFolder).filePath(storedPath);
 
     QFile file(fullPath);
     if (!file.open(QIODevice::ReadOnly)) {
@@ -321,12 +278,10 @@ QString ChatSerializer::loadContentFromStorage(
         return QString();
     }
 
-    const QString base64 = QString::fromUtf8(file.readAll().toBase64());
+    QByteArray contentData = file.readAll();
+    file.close();
 
-    if (cache)
-        cache->insert(fullPath, {info.lastModified(), info.size(), base64});
-
-    return base64;
+    return contentData.toBase64();
 }
 
 } // namespace QodeAssist::Chat

ChatView/ChatSerializer.hpp

@@ -1,17 +1,13 @@
 // Copyright (C) 2024-2026 Petr Mironychev
 // SPDX-License-Identifier: GPL-3.0-or-later
-// Additional attribution terms under GPLv3 §7(b) apply — see LICENSE
 
 #pragma once
 
-#include <QDateTime>
-#include <QHash>
+#include <QJsonArray>
 #include <QJsonObject>
 #include <QString>
 
-namespace QodeAssist {
-class ConversationHistory;
-}
+#include "ChatModel.hpp"
 
 namespace QodeAssist::Chat {
 
@@ -21,41 +17,29 @@ struct SerializationResult
     QString errorMessage;
 };
 
-struct StoredContentEntry
-{
-    QDateTime modified;
-    qint64 size = 0;
-    QString base64;
-};
-
-using StoredContentCache = QHash<QString, StoredContentEntry>;
-
 class ChatSerializer
 {
 public:
-    static SerializationResult saveToFile(
-        const ConversationHistory *history, const QString &filePath);
-    static SerializationResult loadFromFile(ConversationHistory *history, const QString &filePath);
+    static SerializationResult saveToFile(const ChatModel *model, const QString &filePath);
+    static SerializationResult loadFromFile(ChatModel *model, const QString &filePath);
+
+    // Public for testing purposes
+    static QJsonObject serializeMessage(const ChatModel::Message &message, 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);
 
     // Content management (images and text files)
     static QString getChatContentFolder(const QString &chatFilePath);
-    static bool saveContentToStorage(
-        const QString &chatFilePath,
-        const QString &fileName,
-        const QString &base64Data,
-        QString &storedPath);
-    static QString loadContentFromStorage(
-        const QString &chatFilePath,
-        const QString &storedPath,
-        StoredContentCache *cache = nullptr);
+    static bool saveContentToStorage(const QString &chatFilePath, 
+                                      const QString &fileName,
+                                      const QString &base64Data,
+                                      QString &storedPath);
+    static QString loadContentFromStorage(const QString &chatFilePath, const QString &storedPath);
 
 private:
     static const QString VERSION;
-
-    static QJsonObject serializeChat(const ConversationHistory *history);
-    static SerializationResult loadCurrent(ConversationHistory *history, const QJsonObject &root);
-    static SerializationResult loadLegacy(ConversationHistory *history, const QJsonObject &root);
-    static void registerHistoricalFileEdits(const ConversationHistory *history);
+    static constexpr int CURRENT_VERSION = 1;
 
     static bool ensureDirectoryExists(const QString &filePath);
     static bool validateVersion(const QString &version);

ChatView/ChatUtils.cpp

@@ -1,6 +1,5 @@
 // Copyright (C) 2024-2026 Petr Mironychev
 // SPDX-License-Identifier: GPL-3.0-or-later
-// Additional attribution terms under GPLv3 §7(b) apply — see LICENSE
 
 #include "ChatUtils.h"
 
@@ -20,34 +19,22 @@ QString ChatUtils::getSafeMarkdownText(const QString &text) const
         return text;
     }
 
+    bool needsSanitization = false;
+    for (const QChar &ch : text) {
+        if (ch.isNull() || (!ch.isPrint() && ch != '\n' && ch != '\t' && ch != '\r' && ch != ' ')) {
+            needsSanitization = true;
+            break;
+        }
+    }
+
+    if (!needsSanitization) {
+        return text;
+    }
+
     QString safeText;
-    safeText.reserve(text.size() + 16);
-
-    bool inFenced = false;
-    bool inInline = false;
-
-    for (int i = 0; i < text.size(); ++i) {
-        const QChar ch = text[i];
-
-        if (!inInline && i + 2 < text.size()
-            && text[i] == '`' && text[i + 1] == '`' && text[i + 2] == '`') {
-            safeText.append(QStringLiteral("```"));
-            inFenced = !inFenced;
-            i += 2;
-            continue;
-        }
-
-        if (!inFenced && ch == '`') {
-            safeText.append(ch);
-            inInline = !inInline;
-            continue;
-        }
-
-        if (!inFenced && !inInline && ch == '<') {
-            safeText.append(QStringLiteral("&lt;"));
-            continue;
-        }
+    safeText.reserve(text.size());
 
+    for (QChar ch : text) {
         if (ch.isNull()) {
             safeText.append(' ');
         } else if (ch == '\n' || ch == '\t' || ch == '\r' || ch == ' ') {

ChatView/ChatUtils.h

@@ -1,6 +1,5 @@
 // Copyright (C) 2024-2026 Petr Mironychev
 // SPDX-License-Identifier: GPL-3.0-or-later
-// Additional attribution terms under GPLv3 §7(b) apply — see LICENSE
 
 #pragma once
 

ChatView/ChatView.cpp

@@ -1,25 +1,16 @@
 // Copyright (C) 2024-2026 Petr Mironychev
 // SPDX-License-Identifier: GPL-3.0-or-later
-// Additional attribution terms under GPLv3 §7(b) apply — see LICENSE
 
 #include "ChatView.hpp"
 
-#include <QQmlComponent>
 #include <QQmlContext>
 #include <QQmlEngine>
-#include <QQuickItem>
 #include <QSettings>
 #include <QVariantMap>
 
 #include <coreplugin/actionmanager/actionmanager.h>
-#include <coreplugin/actionmanager/command.h>
 #include <logger/Logger.hpp>
 
-#include "ChatRootView.hpp"
-#include "QodeAssistConstants.hpp"
-#include "SessionFileRegistry.hpp"
-#include "sources/skills/SkillsManager.hpp"
-
 namespace {
 constexpr Qt::WindowFlags baseFlags = Qt::Window | Qt::WindowTitleHint | Qt::WindowSystemMenuHint
                                       | Qt::WindowMinimizeButtonHint | Qt::WindowMaximizeButtonHint
@@ -28,65 +19,30 @@ constexpr Qt::WindowFlags baseFlags = Qt::Window | Qt::WindowTitleHint | Qt::Win
 
 namespace QodeAssist::Chat {
 
-ChatView::ChatView(
-    QQmlEngine *engine,
-    SessionFileRegistry *sessionFileRegistry,
-    Skills::SkillsManager *skillsManager)
-    : QQuickView{engine, nullptr}
-    , m_isPin(false)
+ChatView::ChatView()
+    : m_isPin(false)
 {
     setTitle("QodeAssist Chat");
-    /// @note setup quick view content
-    {
-        auto context = new QQmlContext{engine, this};
-        context->setContextProperty("_chatview", this);
-        context->setContextProperty("sessionFileRegistry", sessionFileRegistry);
-        context->setContextProperty("skillsManager", skillsManager);
-
-        auto component = new QQmlComponent{engine, QUrl{"qrc:/qt/qml/ChatView/qml/RootItem.qml"}, this};
-        auto rootItem = component->create(context);
-
-        setContent(component->url(), component, rootItem);
-    }
-
-    if (auto rootView = qobject_cast<ChatRootView *>(rootObject())) {
-        connect(
-            rootView,
-            &ChatRootView::closeHostRequested,
-            this,
-            &QWindow::close,
-            Qt::QueuedConnection);
-    }
-
+    engine()->rootContext()->setContextProperty("_chatview", this);
+    setSource(QUrl("qrc:/qt/qml/ChatView/qml/RootItem.qml"));
     setResizeMode(QQuickView::SizeRootObjectToView);
     setMinimumSize({400, 300});
     setFlags(baseFlags);
 
-    bindCommandShortcut("QodeAssist.CloseChatView", [this] { close(); });
-    bindCommandShortcut(Constants::QODE_ASSIST_CHAT_SEND_MESSAGE, [this] {
-        QMetaObject::invokeMethod(rootObject(), "sendChatMessage");
-    });
-    bindCommandShortcut(Constants::QODE_ASSIST_CHAT_CLEAR_SESSION, [this] {
-        QMetaObject::invokeMethod(rootObject(), "clearChat");
-    });
+    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::bindCommandShortcut(Utils::Id commandId,
-                                   const std::function<void()> &onActivated)
-{
-    auto command = Core::ActionManager::command(commandId);
-    if (!command)
-        return;
-
-    auto shortcut = new QShortcut(command->keySequence(), this);
-    connect(shortcut, &QShortcut::activated, this, onActivated);
-    connect(command, &Core::Command::keySequenceChanged, shortcut, [command, shortcut]() {
-        shortcut->setKey(command->keySequence());
-    });
-}
-
 void ChatView::closeEvent(QCloseEvent *event)
 {
     saveSettings();

ChatView/ChatView.hpp

@@ -1,33 +1,19 @@
 // Copyright (C) 2024-2026 Petr Mironychev
 // SPDX-License-Identifier: GPL-3.0-or-later
-// Additional attribution terms under GPLv3 §7(b) apply — see LICENSE
 
 #pragma once
 
-#include <functional>
-
-#include <utils/id.h>
-
 #include <QQuickView>
 #include <QShortcut>
 
-namespace QodeAssist::Skills {
-class SkillsManager;
-}
-
 namespace QodeAssist::Chat {
 
-class SessionFileRegistry;
-
 class ChatView : public QQuickView
 {
     Q_OBJECT
     Q_PROPERTY(bool isPin READ isPin WRITE setIsPin NOTIFY isPinChanged FINAL)
 public:
-    ChatView(
-        QQmlEngine *engine,
-        SessionFileRegistry *sessionFileRegistry,
-        Skills::SkillsManager *skillsManager);
+    ChatView();
 
     bool isPin() const;
     void setIsPin(bool newIsPin);
@@ -41,9 +27,9 @@ protected:
 private:
     void saveSettings();
     void restoreSettings();
-    void bindCommandShortcut(Utils::Id commandId, const std::function<void()> &onActivated);
 
     bool m_isPin;
+    QShortcut *m_closeShortcut;
 };
 
 } // namespace QodeAssist::Chat

ChatView/ChatWidget.cpp

@@ -1,68 +1,18 @@
 // Copyright (C) 2024-2026 Petr Mironychev
 // SPDX-License-Identifier: GPL-3.0-or-later
-// Additional attribution terms under GPLv3 §7(b) apply — see LICENSE
 
 #include "ChatWidget.hpp"
 
-#include <QApplication>
-#include <QMouseEvent>
 #include <QQmlContext>
 #include <QQmlEngine>
-#include <QQuickItem>
-
-#include <coreplugin/icontext.h>
-#include <coreplugin/icore.h>
-
-#include "QodeAssistConstants.hpp"
-#include "SessionFileRegistry.hpp"
-#include "sources/skills/SkillsManager.hpp"
 
 namespace QodeAssist::Chat {
 
-ChatWidget::ChatWidget(
-    QQmlEngine *engine,
-    SessionFileRegistry *sessionFileRegistry,
-    Skills::SkillsManager *skillsManager,
-    bool registerOwnContext,
-    QWidget *parent)
-    : QQuickWidget{engine, parent}
+ChatWidget::ChatWidget(QWidget *parent)
+    : QQuickWidget(parent)
 {
-    /// @note setup quick view content
-    {
-        auto context = new QQmlContext{engine, this};
-        context->setContextProperty("sessionFileRegistry", sessionFileRegistry);
-        context->setContextProperty("skillsManager", skillsManager);
-        auto component = new QQmlComponent{engine, QUrl{"qrc:/qt/qml/ChatView/qml/RootItem.qml"}, this};
-        auto rootItem = component->create(context);
-
-        setContent(component->url(), component, rootItem);
-    }
+    setSource(QUrl("qrc:/qt/qml/ChatView/qml/RootItem.qml"));
     setResizeMode(QQuickWidget::SizeRootObjectToView);
-    setFocusPolicy(Qt::StrongFocus);
-
-    setAttribute(Qt::WA_NoMousePropagation, true);
-
-    if (registerOwnContext) {
-        auto ideContext = new Core::IContext{this};
-        ideContext->setWidget(this);
-        ideContext->setContext(Core::Context{Constants::QODE_ASSIST_CHAT_CONTEXT});
-        Core::ICore::addContextObject(ideContext);
-    }
-}
-
-void ChatWidget::focusInEvent(QFocusEvent *event)
-{
-    QQuickWidget::focusInEvent(event);
-    if (rootObject())
-        QMetaObject::invokeMethod(rootObject(), "focusInput");
-}
-
-void ChatWidget::mousePressEvent(QMouseEvent *event)
-{
-    if (!hasFocus())
-        setFocus(Qt::MouseFocusReason);
-
-    QQuickWidget::mousePressEvent(event);
 }
 
 void ChatWidget::clear()
@@ -74,35 +24,4 @@ void ChatWidget::scrollToBottom()
 {
     QMetaObject::invokeMethod(rootObject(), "scrollToBottom");
 }
-
-void ChatWidget::focusInput()
-{
-    setFocus(Qt::OtherFocusReason);
-    QMetaObject::invokeMethod(rootObject(), "focusInput");
-}
-
-bool ChatWidget::isChatFocused() const
-{
-    return hasFocus() || (rootObject() && rootObject()->hasActiveFocus());
-}
-
-void ChatWidget::sendMessage()
-{
-    QMetaObject::invokeMethod(rootObject(), "sendChatMessage");
-}
-
-void ChatWidget::clearSession()
-{
-    QMetaObject::invokeMethod(rootObject(), "clearChat");
-}
-
-ChatWidget *ChatWidget::focusedInstance()
-{
-    for (QWidget *widget = QApplication::focusWidget(); widget;
-         widget = widget->parentWidget()) {
-        if (auto chatWidget = qobject_cast<ChatWidget *>(widget))
-            return chatWidget;
-    }
-    return nullptr;
-}
 } // namespace QodeAssist::Chat

ChatView/ChatWidget.hpp

@@ -1,49 +1,25 @@
 // Copyright (C) 2024-2026 Petr Mironychev
 // SPDX-License-Identifier: GPL-3.0-or-later
-// Additional attribution terms under GPLv3 §7(b) apply — see LICENSE
 
 #pragma once
 
 #include <QtQuickWidgets/QtQuickWidgets>
 
-namespace QodeAssist::Skills {
-class SkillsManager;
-}
-
 namespace QodeAssist::Chat {
 
-class SessionFileRegistry;
-
 class ChatWidget : public QQuickWidget
 {
     Q_OBJECT
 
 public:
-    explicit ChatWidget(
-        QQmlEngine *engine,
-        SessionFileRegistry *sessionFileRegistry,
-        Skills::SkillsManager *skillsManager,
-        bool registerOwnContext = true,
-        QWidget *parent = nullptr);
+    explicit ChatWidget(QWidget *parent = nullptr);
     ~ChatWidget() = default;
 
     Q_INVOKABLE void clear();
     Q_INVOKABLE void scrollToBottom();
-    Q_INVOKABLE void focusInput();
-
-    void sendMessage();
-    void clearSession();
-
-    bool isChatFocused() const;
-
-    static ChatWidget *focusedInstance();
 
 signals:
     void clearPressed();
-
-protected:
-    void focusInEvent(QFocusEvent *event) override;
-    void mousePressEvent(QMouseEvent *event) override;
 };
 
 } // namespace QodeAssist::Chat

ChatView/ClientInterface.cpp

@@ -1,75 +1,52 @@
 // Copyright (C) 2024-2026 Petr Mironychev
 // SPDX-License-Identifier: GPL-3.0-or-later
-// Additional attribution terms under GPLv3 §7(b) apply — see LICENSE
 
 #include "ClientInterface.hpp"
 
-#include <memory>
-#include <vector>
-
 #include <LLMQore/BaseClient.hpp>
-#include <LLMQore/ContentBlocks.hpp>
-#include <LLMQore/ToolLoopRunner.hpp>
-#include <LLMQore/ToolsManager.hpp>
+
+#include <projectexplorer/buildconfiguration.h>
+#include <projectexplorer/target.h>
+#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/buildconfiguration.h>
 #include <projectexplorer/project.h>
+#include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/projectmanager.h>
-#include <projectexplorer/target.h>
+
 #include <texteditor/textdocument.h>
 #include <texteditor/texteditor.h>
 
-#include <QDir>
-#include <QFile>
-#include <QFileInfo>
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QMimeDatabase>
-#include <QRegularExpression>
-#include <QUuid>
+#include <LLMQore/ToolsManager.hpp>
 
-#include <AgentFactory.hpp>
-#include <ConversationHistory.hpp>
-#include <ContextRenderer.hpp>
-#include <Message.hpp>
-#include <PluginBlocks.hpp>
-#include <Session.hpp>
-#include <SessionManager.hpp>
-#include <SystemPromptBuilder.hpp>
-
-#include "tools/ReadOriginalHistoryTool.hpp"
 #include "tools/TodoTool.hpp"
-#include "tools/ToolsRegistration.hpp"
 
+#include "ChatAssistantSettings.hpp"
 #include "ChatSerializer.hpp"
 #include "GeneralSettings.hpp"
 #include "Logger.hpp"
-#include "ProjectSettings.hpp"
-#include "SkillsSettings.hpp"
+#include "ProvidersManager.hpp"
 #include "ToolsSettings.hpp"
+#include <RulesLoader.hpp>
 #include <context/ChangesManager.h>
-#include <context/EnvBlockFormatter.hpp>
-#include <sources/skills/SkillsManager.hpp>
 
 namespace QodeAssist::Chat {
 
-namespace {
-struct StoredImage
-{
-    QString fileName;
-    QString storedPath;
-    QString mediaType;
-};
-} // namespace
-
-ClientInterface::ClientInterface(ChatModel *chatModel, QObject *parent)
+ClientInterface::ClientInterface(
+    ChatModel *chatModel, PluginLLMCore::IPromptProvider *promptProvider, QObject *parent)
     : QObject(parent)
     , m_chatModel(chatModel)
+    , m_promptProvider(promptProvider)
     , m_contextManager(new Context::ContextManager(this))
-    , m_contentCache(std::make_shared<StoredContentCache>())
 {}
 
 ClientInterface::~ClientInterface()
@@ -77,96 +54,27 @@ ClientInterface::~ClientInterface()
     cancelRequest();
 }
 
-void ClientInterface::setSkillsManager(Skills::SkillsManager *skillsManager)
-{
-    m_skillsManager = skillsManager;
-}
-
-void ClientInterface::setSessionManager(SessionManager *sessionManager)
-{
-    m_sessionManager = sessionManager;
-}
-
-void ClientInterface::setHistory(ConversationHistory *history)
-{
-    m_history = history;
-}
-
-void ClientInterface::setActiveAgent(const QString &agentName)
-{
-    m_activeAgent = agentName;
-}
-
-Session *ClientInterface::session() const
-{
-    return m_session;
-}
-
-void ClientInterface::ensureSession()
-{
-    if (m_session || !m_sessionManager || !m_history)
-        return;
-
-    m_session = m_sessionManager->createDetachedSession(m_history, this);
-
-    connect(m_session, &Session::event, this, [this](const QodeAssist::ResponseEvent &ev) {
-        onSessionEvent(m_session, ev);
-    });
-    connect(m_session, &Session::finished, this, [this](const LLMQore::RequestID &id, const QString &) {
-        onSessionFinished(id);
-    });
-    connect(
-        m_session,
-        &Session::failed,
-        this,
-        [this](const LLMQore::RequestID &id, const QodeAssist::ErrorInfo &error) {
-            onSessionFailed(id, error);
-        });
-}
-
-bool ClientInterface::ensureAgentBound()
-{
-    if (m_session->hasAgent() && m_boundAgent == m_activeAgent)
-        return true;
-
-    QString agentError;
-    if (!m_sessionManager->rebindAgentByName(m_session, m_activeAgent, &agentError)) {
-        m_boundAgent.clear();
-        const QString error = agentError.isEmpty() ? QStringLiteral("No chat agent selected")
-                                                   : agentError;
-        LOG_MESSAGE(error);
-        emit errorOccurred(error);
-        return false;
-    }
-    m_boundAgent = m_activeAgent;
-
-    if (auto *client = m_session->client())
-        m_sessionManager->toolContributors().contribute(client->tools());
-
-    return true;
-}
-
 void ClientInterface::sendMessage(
     const QString &message,
     const QList<QString> &attachments,
-    const QList<QString> &linkedFiles)
+    const QList<QString> &linkedFiles,
+    bool useTools,
+    bool useThinking)
 {
-    if (message.trimmed().isEmpty() && attachments.isEmpty()) {
-        LOG_MESSAGE("Ignoring empty chat message");
-        return;
-    }
-
     cancelRequest();
+    m_accumulatedResponses.clear();
 
     Context::ChangesManager::instance().archiveAllNonArchivedEdits();
 
-    QStringList imageFiles;
-    QStringList textFiles;
+    QList<QString> imageFiles;
+    QList<QString> textFiles;
+
     for (const QString &filePath : attachments) {
-        if (isImageFile(filePath))
+        if (isImageFile(filePath)) {
             imageFiles.append(filePath);
-        else
+        } else {
             textFiles.append(filePath);
+        }
     }
 
     QList<Context::ContentFile> storedAttachments;
@@ -188,19 +96,24 @@ void ClientInterface::sendMessage(
                         .arg(textFiles.size()));
     }
 
-    QList<StoredImage> storedImages;
+    QList<ChatModel::ImageAttachment> imageAttachments;
     if (!imageFiles.isEmpty() && !m_chatFilePath.isEmpty()) {
         for (const QString &imagePath : imageFiles) {
             QString base64Data = encodeImageToBase64(imagePath);
-            if (base64Data.isEmpty())
+            if (base64Data.isEmpty()) {
                 continue;
+            }
 
             QString storedPath;
             QFileInfo fileInfo(imagePath);
             if (ChatSerializer::saveContentToStorage(
                     m_chatFilePath, fileInfo.fileName(), base64Data, storedPath)) {
-                storedImages.append(
-                    {fileInfo.fileName(), storedPath, getMediaTypeForImage(imagePath)});
+                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));
             }
         }
@@ -209,256 +122,279 @@ void ClientInterface::sendMessage(
                         .arg(imageFiles.size()));
     }
 
-    if (!m_sessionManager) {
-        const QString error = QStringLiteral("Chat session manager is not available");
-        LOG_MESSAGE(error);
-        emit errorOccurred(error);
-        return;
-    }
-    if (!m_history) {
-        const QString error = QStringLiteral("Chat history is not available");
-        LOG_MESSAGE(error);
-        emit errorOccurred(error);
+    m_chatModel->addMessage(message, ChatModel::ChatRole::User, "", storedAttachments, imageAttachments);
+
+    auto &chatAssistantSettings = Settings::chatAssistantSettings();
+
+    auto providerName = Settings::generalSettings().caProvider();
+    auto provider = PluginLLMCore::ProvidersManager::instance().getProviderByName(providerName);
+
+    if (!provider) {
+        LOG_MESSAGE(QString("No provider found with name: %1").arg(providerName));
         return;
     }
 
-    ensureSession();
-    if (!m_session) {
-        const QString error = QStringLiteral("Failed to create chat session");
-        LOG_MESSAGE(error);
-        emit errorOccurred(error);
+    auto templateName = Settings::generalSettings().caTemplate();
+    auto promptTemplate = m_promptProvider->getTemplateByName(templateName);
+
+    if (!promptTemplate) {
+        LOG_MESSAGE(QString("No template found with name: %1").arg(templateName));
         return;
     }
 
-    if (!ensureAgentBound())
-        return;
+    PluginLLMCore::ContextData context;
 
-    auto *client = m_session->client();
-    if (!client) {
-        const QString error = QStringLiteral("Chat agent has no live client");
-        LOG_MESSAGE(error);
-        emit errorOccurred(error);
-        return;
-    }
+    const bool isToolsEnabled = useTools;
 
-    auto *project = ProjectExplorer::ProjectManager::startupProject();
-    Templates::ContextRenderer::Bindings bindings;
-    bindings.projectDir = project ? project->projectDirectory().toFSPathString() : QString();
-    bindings.configDir = AgentFactory::userConfigDir();
-    m_session->setContextBindings(bindings);
+    if (chatAssistantSettings.useSystemPrompt()) {
+        QString systemPrompt = chatAssistantSettings.systemPrompt();
 
-    const QString chatFilePath = m_chatFilePath;
-    m_session->setContentLoader([chatFilePath, cache = m_contentCache](const QString &storedPath) {
-        return ChatSerializer::loadContentFromStorage(chatFilePath, storedPath, cache.get());
-    });
+        const QString lastRoleId = chatAssistantSettings.lastUsedRoleId();
+        if (!lastRoleId.isEmpty()) {
+            const Settings::AgentRole role = Settings::AgentRolesManager::loadRole(lastRoleId);
+            if (!role.id.isEmpty())
+                systemPrompt = systemPrompt + "\n\n" + role.systemPrompt;
+        }
 
-    client->toolLoop()->setMaxRounds(Settings::toolsSettings().maxToolContinuations());
-    client->setTransferTimeout(
-        static_cast<int>(Settings::generalSettings().requestTimeout() * 1000));
+        auto project = PluginLLMCore::RulesLoader::getActiveProject();
 
-    const QString chatContext = buildChatContextLayer();
-    if (chatContext.isEmpty())
-        m_session->systemPrompt()->clearLayer(QStringLiteral("chat.context"));
-    else
-        m_session->systemPrompt()->setLayer(QStringLiteral("chat.context"), chatContext);
+        if (project) {
+            systemPrompt += QString("\n# Active project name: %1").arg(project->displayName());
+            systemPrompt += QString("\n# Active Project path: %1")
+                                .arg(project->projectDirectory().toUrlishString());
 
-    if (linkedFiles.isEmpty()) {
-        m_session->unpinContext(QStringLiteral("chat.files"));
-    } else {
-        m_session->pinContext(
-            QStringLiteral("chat.files"),
-            [contextManager = QPointer<Context::ContextManager>(m_contextManager),
-             linkedFiles]() -> QString {
-                if (!contextManager)
-                    return {};
-                const auto contentFiles = contextManager->getContentFiles(linkedFiles);
-                if (contentFiles.isEmpty())
-                    return {};
-                QString out = QStringLiteral(
-                    "Linked files (current content, refreshed every request):\n");
-                for (const auto &file : contentFiles) {
-                    out += QStringLiteral("\nFile: %1\nContent:\n%2\n")
-                               .arg(file.filename, file.content);
+            if (auto target = project->activeTarget()) {
+                if (auto buildConfig = target->activeBuildConfiguration()) {
+                    systemPrompt += QString("\n# Active Build directory: %1")
+                    .arg(buildConfig->buildDirectory().toUrlishString());
                 }
-                return out;
-            });
-    }
+            }
 
-    std::vector<std::unique_ptr<LLMQore::ContentBlock>> blocks;
-    blocks.push_back(std::make_unique<LLMQore::TextContent>(message));
+            QString projectRules
+                = PluginLLMCore::RulesLoader::loadRulesForProject(project, PluginLLMCore::RulesContext::Chat);
 
-    for (const QString &skillName : invokedSkillNames(message)) {
-        const auto skill = m_skillsManager->findByName(skillName);
-        if (skill && !skill->body.isEmpty())
-            blocks.push_back(std::make_unique<SkillInvocationContent>(skill->name, skill->body));
-    }
-
-    for (const auto &attachment : storedAttachments) {
-        blocks.push_back(
-            std::make_unique<StoredAttachmentContent>(attachment.filename, attachment.content));
-    }
-
-    for (const auto &image : storedImages) {
-        blocks.push_back(std::make_unique<StoredImageContent>(
-            image.fileName, image.storedPath, image.mediaType));
-    }
-
-    if (!m_chatFilePath.isEmpty()) {
-        if (auto *todoTool
-            = qobject_cast<QodeAssist::Tools::TodoTool *>(client->tools()->tool("todo_tool"))) {
-            todoTool->setCurrentSessionId(m_chatFilePath);
+            if (!projectRules.isEmpty()) {
+                systemPrompt += QString("\n# Project Rules\n\n") + projectRules;
+            }
+        } else {
+            systemPrompt += QString("\n# No active project in IDE");
         }
-        if (auto *historyTool = qobject_cast<QodeAssist::Tools::ReadOriginalHistoryTool *>(
-                client->tools()->tool("read_original_history"))) {
-            historyTool->setCurrentSessionId(m_chatFilePath);
+
+        if (!linkedFiles.isEmpty()) {
+            systemPrompt = getSystemPromptWithLinkedFiles(systemPrompt, linkedFiles);
         }
+        context.systemPrompt = systemPrompt;
     }
 
-    const LLMQore::RequestID requestId = m_session->send(std::move(blocks));
-    if (requestId.isEmpty()) {
-        const QString error = QStringLiteral("Failed to start chat request for agent '%1': %2")
-                                  .arg(m_activeAgent, m_session->lastError().message);
-        LOG_MESSAGE(error);
-        emit errorOccurred(error);
-        return;
+    QVector<PluginLLMCore::Message> messages;
+    for (const auto &msg : m_chatModel->getChatHistory()) {
+        if (msg.role == ChatModel::ChatRole::Tool || msg.role == ChatModel::ChatRole::FileEdit) {
+            continue;
+        }
+
+        PluginLLMCore::Message apiMessage;
+        apiMessage.role = msg.role == ChatModel::ChatRole::User ? "user" : "assistant";
+        apiMessage.content = msg.content;
+
+        if (!msg.attachments.isEmpty() && !m_chatFilePath.isEmpty()) {
+            apiMessage.content += "\n\nAttached files:";
+            for (const auto &attachment : msg.attachments) {
+                QString fileContent = ChatSerializer::loadContentFromStorage(m_chatFilePath, attachment.content);
+                if (!fileContent.isEmpty()) {
+                    QString decodedContent = QString::fromUtf8(QByteArray::fromBase64(fileContent.toUtf8()));
+                    apiMessage.content += QString("\n\nFile: %1\n```\n%2\n```")
+                                              .arg(attachment.filename, decodedContent);
+                }
+            }
+        }
+
+        apiMessage.isThinking = (msg.role == ChatModel::ChatRole::Thinking);
+        apiMessage.isRedacted = msg.isRedacted;
+        apiMessage.signature = msg.signature;
+
+        if (provider->capabilities().testFlag(PluginLLMCore::ProviderCapability::Image)
+            && !m_chatFilePath.isEmpty() && !msg.images.isEmpty()) {
+            auto apiImages = loadImagesFromStorage(msg.images);
+            if (!apiImages.isEmpty()) {
+                apiMessage.images = apiImages;
+            }
+        }
+
+        messages.append(apiMessage);
     }
 
-    m_activeRequests[requestId] = {QJsonObject{{"id", requestId}}, m_session};
+    if (!imageFiles.isEmpty()
+        && !provider->capabilities().testFlag(PluginLLMCore::ProviderCapability::Image)) {
+        LOG_MESSAGE(QString("Provider %1 doesn't support images, %2 ignored")
+                        .arg(provider->name(), QString::number(imageFiles.size())));
+    }
+
+    context.history = messages;
+
+    QJsonObject payload{
+        {"model", Settings::generalSettings().caModel()}, {"stream", true}};
+
+    provider->prepareRequest(
+        payload,
+        promptTemplate,
+        context,
+        PluginLLMCore::RequestType::Chat,
+        useTools,
+        useThinking);
+
+    provider->client()->setMaxToolContinuations(
+        Settings::toolsSettings().maxToolContinuations());
+
+    connect(
+        provider->client(),
+        &::LLMQore::BaseClient::chunkReceived,
+        this,
+        &ClientInterface::handlePartialResponse,
+        Qt::UniqueConnection);
+    connect(
+        provider->client(),
+        &::LLMQore::BaseClient::requestCompleted,
+        this,
+        &ClientInterface::handleFullResponse,
+        Qt::UniqueConnection);
+    connect(
+        provider->client(),
+        &::LLMQore::BaseClient::requestFailed,
+        this,
+        &ClientInterface::handleRequestFailed,
+        Qt::UniqueConnection);
+    connect(
+        provider->client(),
+        &::LLMQore::BaseClient::toolStarted,
+        this,
+        &ClientInterface::handleToolExecutionStarted,
+        Qt::UniqueConnection);
+    connect(
+        provider->client(),
+        &::LLMQore::BaseClient::toolResultReady,
+        this,
+        &ClientInterface::handleToolExecutionCompleted,
+        Qt::UniqueConnection);
+    connect(
+        provider->client(),
+        &::LLMQore::BaseClient::thinkingBlockReceived,
+        this,
+        &ClientInterface::handleThinkingBlockReceived,
+        Qt::UniqueConnection);
+
+    const QString customEndpoint = Settings::generalSettings().caCustomEndpoint();
+    const QString endpoint = !customEndpoint.isEmpty() ? customEndpoint
+                                                       : promptTemplate->endpoint();
+    auto requestId
+        = provider->sendRequest(QUrl(Settings::generalSettings().caUrl()), payload, endpoint);
+    QJsonObject request{{"id", requestId}};
+
+    m_activeRequests[requestId] = {request, provider};
 
     emit requestStarted(requestId);
-}
-
-QString ClientInterface::requestIdForSession(Session *session) const
-{
-    for (auto it = m_activeRequests.cbegin(); it != m_activeRequests.cend(); ++it) {
-        if (it.value().session == session)
-            return it.key();
-    }
-    return {};
-}
-
-void ClientInterface::onSessionEvent(Session *session, const QodeAssist::ResponseEvent &ev)
-{
-    if (ev.kind() != ResponseEvent::Kind::Usage)
-        return;
-
-    const auto *usage = ev.as<ResponseEvents::Usage>();
-    if (!usage)
-        return;
-
-    const QString requestId = requestIdForSession(session);
-    if (!requestId.isEmpty()) {
-        m_chatModel->setMessageUsage(
-            requestId,
-            usage->inputTokens,
-            usage->outputTokens,
-            usage->cachedTokens,
-            usage->reasoningTokens);
-    }
-
-    emit messageUsageReceived(
-        usage->inputTokens, usage->outputTokens, usage->cachedTokens, usage->reasoningTokens);
-
-    LOG_MESSAGE(QString("Chat usage [%1]: prompt=%2 completion=%3 cached=%4 reasoning=%5")
-                    .arg(requestId)
-                    .arg(usage->inputTokens)
-                    .arg(usage->outputTokens)
-                    .arg(usage->cachedTokens)
-                    .arg(usage->reasoningTokens));
-}
-
-void ClientInterface::onSessionFinished(const QString &requestId)
-{
-    auto it = m_activeRequests.find(requestId);
-    if (it == m_activeRequests.end())
-        return;
-
-    QString applyError;
-    if (!Context::ChangesManager::instance().applyPendingEditsForRequest(requestId, &applyError)) {
-        LOG_MESSAGE(QString("Some edits for request %1 were not auto-applied: %2")
-                        .arg(requestId, applyError));
-    }
-
-    emit messageReceivedCompletely();
-
-    m_activeRequests.erase(it);
-}
-
-void ClientInterface::onSessionFailed(const QString &requestId, const QodeAssist::ErrorInfo &error)
-{
-    auto it = m_activeRequests.find(requestId);
-    if (it == m_activeRequests.end())
-        return;
-
-    LOG_MESSAGE(QString("Chat request %1 failed: %2").arg(requestId, error.message));
-    emit errorOccurred(error.message);
-
-    m_activeRequests.erase(it);
-}
-
-QStringList ClientInterface::invokedSkillNames(const QString &message) const
-{
-    QStringList names;
-    if (!m_skillsManager || !Settings::skillsSettings().enableSkills())
-        return names;
-
-    static const QRegularExpression skillCommand(
-        QStringLiteral("(?:^|\\s)/([a-z0-9][a-z0-9-]*)"));
-    auto skillMatch = skillCommand.globalMatch(message);
-    while (skillMatch.hasNext()) {
-        const QString skillName = skillMatch.next().captured(1);
-        if (!names.contains(skillName))
-            names << skillName;
-    }
-    return names;
-}
-
-QString ClientInterface::buildChatContextLayer() const
-{
-    QString context
-        = Context::EnvBlockFormatter::formatProject(Context::EnvBlockFormatter::currentProject());
-
-    auto *project = ProjectExplorer::ProjectManager::startupProject();
-    if (m_skillsManager && Settings::skillsSettings().enableSkills()) {
-        QStringList projectSkillDirs;
-        if (project) {
-            Settings::ProjectSettings projectSettings(project);
-            projectSkillDirs
-                = Settings::SkillsSettings::splitLines(projectSettings.projectSkillDirs());
+    
+    if (provider->capabilities().testFlag(PluginLLMCore::ProviderCapability::Tools)
+        && provider->toolsManager()) {
+        if (auto *todoTool = qobject_cast<QodeAssist::Tools::TodoTool *>(
+                provider->toolsManager()->tool("todo_tool"))) {
+            todoTool->setCurrentSessionId(m_chatFilePath);
         }
-        m_skillsManager->configure(
-            project ? project->projectDirectory().toFSPathString() : QString(),
-            Settings::SkillsSettings::splitPaths(Settings::skillsSettings().globalSkillRoots()),
-            projectSkillDirs);
-
-        const QString alwaysOnSkills = m_skillsManager->alwaysOnBodies();
-        if (!alwaysOnSkills.isEmpty())
-            context += QString("\n\n") + alwaysOnSkills;
-
-        const QString skillsCatalog = m_skillsManager->catalogText();
-        if (!skillsCatalog.isEmpty())
-            context += QString("\n\n") + skillsCatalog;
     }
-
-    return context;
 }
 
 void ClientInterface::clearMessages()
 {
-    if (m_session)
-        m_session->cancel();
-    m_activeRequests.clear();
-    if (m_history)
-        m_history->clear();
+    const auto providerName = Settings::generalSettings().caProvider();
+    auto *provider = PluginLLMCore::ProvidersManager::instance().getProviderByName(providerName);
+
+    if (provider && !m_chatFilePath.isEmpty()
+        && provider->capabilities().testFlag(PluginLLMCore::ProviderCapability::Tools)
+        && provider->toolsManager()) {
+        if (auto *todoTool = qobject_cast<QodeAssist::Tools::TodoTool *>(
+                provider->toolsManager()->tool("todo_tool"))) {
+            todoTool->clearSession(m_chatFilePath);
+        }
+    }
+
+    m_chatModel->clear();
 }
 
 void ClientInterface::cancelRequest()
 {
-    m_activeRequests.clear();
-    if (m_session)
-        m_session->cancel();
+    QSet<PluginLLMCore::Provider *> providers;
+    for (auto it = m_activeRequests.begin(); it != m_activeRequests.end(); ++it) {
+        if (it.value().provider) {
+            providers.insert(it.value().provider);
+        }
+    }
 
-    LOG_MESSAGE("All chat requests cancelled and state cleared");
+    for (auto *provider : providers) {
+        disconnect(provider->client(), 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();
+    m_awaitingContinuation.clear();
+
+    LOG_MESSAGE("All requests cancelled and state cleared");
+}
+
+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);
+    }
+}
+
+QString ClientInterface::getCurrentFileContext() const
+{
+    auto currentEditor = Core::EditorManager::currentEditor();
+    if (!currentEditor) {
+        LOG_MESSAGE("No active editor found");
+        return QString();
+    }
+
+    auto textDocument = qobject_cast<TextEditor::TextDocument *>(currentEditor->document());
+    if (!textDocument) {
+        LOG_MESSAGE("Current document is not a text document");
+        return QString();
+    }
+
+    QString fileInfo = QString("Language: %1\nFile: %2\n\n")
+                           .arg(textDocument->mimeType(), textDocument->filePath().toFSPathString());
+
+    QString content = textDocument->document()->toPlainText();
+
+    LOG_MESSAGE(QString("Got context from file: %1").arg(textDocument->filePath().toFSPathString()));
+
+    return QString("Current file context:\n%1\nFile content:\n%2").arg(fileInfo, content);
+}
+
+QString ClientInterface::getSystemPromptWithLinkedFiles(
+    const QString &basePrompt, const QList<QString> &linkedFiles) const
+{
+    QString updatedPrompt = basePrompt;
+
+    if (!linkedFiles.isEmpty()) {
+        updatedPrompt += "\n\nLinked files for reference:\n";
+
+        auto contentFiles = m_contextManager->getContentFiles(linkedFiles);
+        for (const auto &file : contentFiles) {
+            updatedPrompt += QString("\nFile: %1\nContent:\n%2\n").arg(file.filename, file.content);
+        }
+    }
+
+    return updatedPrompt;
 }
 
 Context::ContextManager *ClientInterface::contextManager() const
@@ -466,6 +402,114 @@ 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;
+
+    if (m_awaitingContinuation.remove(requestId)) {
+        m_accumulatedResponses[requestId].clear();
+        LOG_MESSAGE(
+            QString("Cleared accumulated responses for continuation request %1").arg(requestId));
+    }
+
+    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();
+
+    m_activeRequests.erase(it);
+    m_accumulatedResponses.remove(requestId);
+    m_awaitingContinuation.remove(requestId);
+}
+
+void ClientInterface::handleRequestFailed(const QString &requestId, const QString &error)
+{
+    auto it = m_activeRequests.find(requestId);
+    if (it == m_activeRequests.end())
+        return;
+
+    LOG_MESSAGE(QString("Chat request %1 failed: %2").arg(requestId, error));
+    emit errorOccurred(error);
+
+    m_activeRequests.erase(it);
+    m_accumulatedResponses.remove(requestId);
+    m_awaitingContinuation.remove(requestId);
+}
+
+void ClientInterface::handleThinkingBlockReceived(
+    const QString &requestId, const QString &thinking, const QString &signature)
+{
+    if (!m_activeRequests.contains(requestId)) {
+        LOG_MESSAGE(QString("Ignoring thinking block for non-chat request: %1").arg(requestId));
+        return;
+    }
+
+    if (m_awaitingContinuation.remove(requestId)) {
+        m_accumulatedResponses[requestId].clear();
+        LOG_MESSAGE(
+            QString("Cleared accumulated responses for continuation request %1").arg(requestId));
+    }
+
+    if (thinking.isEmpty()) {
+        m_chatModel->addRedactedThinkingBlock(requestId, signature);
+    } else {
+        m_chatModel->addThinkingBlock(requestId, thinking, signature);
+    }
+}
+
+void ClientInterface::handleToolExecutionStarted(
+    const QString &requestId, const QString &toolId, const QString &toolName)
+{
+    if (!m_activeRequests.contains(requestId)) {
+        LOG_MESSAGE(QString("Ignoring tool execution start for non-chat request: %1").arg(requestId));
+        return;
+    }
+
+    m_chatModel->addToolExecutionStatus(requestId, toolId, toolName);
+    m_awaitingContinuation.insert(requestId);
+}
+
+void ClientInterface::handleToolExecutionCompleted(
+    const QString &requestId,
+    const QString &toolId,
+    const QString &toolName,
+    const QString &toolOutput)
+{
+    if (!m_activeRequests.contains(requestId)) {
+        LOG_MESSAGE(QString("Ignoring tool execution result for non-chat request: %1").arg(requestId));
+        return;
+    }
+
+    m_chatModel->updateToolResult(requestId, toolId, toolName, toolOutput);
+}
+
 bool ClientInterface::isImageFile(const QString &filePath) const
 {
     static const QSet<QString> imageExtensions = {"png", "jpg", "jpeg", "gif", "webp", "bmp", "svg"};
@@ -513,10 +557,46 @@ QString ClientInterface::encodeImageToBase64(const QString &filePath) const
     return imageData.toBase64();
 }
 
+QVector<PluginLLMCore::ImageAttachment> ClientInterface::loadImagesFromStorage(
+    const QList<ChatModel::ImageAttachment> &storedImages) const
+{
+    QVector<PluginLLMCore::ImageAttachment> apiImages;
+
+    for (const auto &storedImage : storedImages) {
+        QString base64Data
+            = ChatSerializer::loadContentFromStorage(m_chatFilePath, storedImage.storedPath);
+        if (base64Data.isEmpty()) {
+            LOG_MESSAGE(QString("Warning: Failed to load image: %1").arg(storedImage.storedPath));
+            continue;
+        }
+
+        PluginLLMCore::ImageAttachment apiImage;
+        apiImage.data = base64Data;
+        apiImage.mediaType = storedImage.mediaType;
+        apiImage.isUrl = false;
+
+        apiImages.append(apiImage);
+    }
+
+    return apiImages;
+}
+
 void ClientInterface::setChatFilePath(const QString &filePath)
 {
-    if (m_chatFilePath != filePath)
-        m_contentCache->clear();
+    if (!m_chatFilePath.isEmpty() && m_chatFilePath != filePath) {
+        const auto providerName = Settings::generalSettings().caProvider();
+        auto *provider = PluginLLMCore::ProvidersManager::instance().getProviderByName(providerName);
+
+        if (provider
+            && provider->capabilities().testFlag(PluginLLMCore::ProviderCapability::Tools)
+            && provider->toolsManager()) {
+            if (auto *todoTool = qobject_cast<QodeAssist::Tools::TodoTool *>(
+                    provider->toolsManager()->tool("todo_tool"))) {
+                todoTool->clearSession(m_chatFilePath);
+            }
+        }
+    }
+
     m_chatFilePath = filePath;
     m_chatModel->setChatFilePath(filePath);
 }

ChatView/ClientInterface.hpp

@@ -1,33 +1,18 @@
 // Copyright (C) 2024-2026 Petr Mironychev
 // SPDX-License-Identifier: GPL-3.0-or-later
-// Additional attribution terms under GPLv3 §7(b) apply — see LICENSE
 
 #pragma once
 
 #include <QObject>
-#include <QPointer>
+#include <QSet>
 #include <QString>
-#include <QStringList>
-
-#include <memory>
+#include <QVector>
 
 #include "ChatModel.hpp"
-#include "ChatSerializer.hpp"
-#include <ErrorInfo.hpp>
-#include <LLMQore/BaseClient.hpp>
-#include <ResponseEvent.hpp>
+#include "Provider.hpp"
+#include "pluginllmcore/IPromptProvider.hpp"
 #include <context/ContextManager.hpp>
 
-namespace QodeAssist {
-class SessionManager;
-class Session;
-class ConversationHistory;
-}
-
-namespace QodeAssist::Skills {
-class SkillsManager;
-}
-
 namespace QodeAssist::Chat {
 
 class ClientInterface : public QObject
@@ -35,68 +20,67 @@ class ClientInterface : public QObject
     Q_OBJECT
 
 public:
-    explicit ClientInterface(ChatModel *chatModel, QObject *parent = nullptr);
+    explicit ClientInterface(
+        ChatModel *chatModel, PluginLLMCore::IPromptProvider *promptProvider, QObject *parent = nullptr);
     ~ClientInterface();
 
-    void setSkillsManager(Skills::SkillsManager *skillsManager);
-    void setSessionManager(SessionManager *sessionManager);
-    void setHistory(ConversationHistory *history);
-    void setActiveAgent(const QString &agentName);
-
     void sendMessage(
         const QString &message,
         const QList<QString> &attachments = {},
-        const QList<QString> &linkedFiles = {});
+        const QList<QString> &linkedFiles = {},
+        bool useTools = false,
+        bool useThinking = false);
     void clearMessages();
     void cancelRequest();
 
     Context::ContextManager *contextManager() const;
-
+    
     void setChatFilePath(const QString &filePath);
     QString chatFilePath() const;
 
-    void ensureSession();
-    Session *session() const;
-
 signals:
     void errorOccurred(const QString &error);
     void messageReceivedCompletely();
     void requestStarted(const QString &requestId);
-    void messageUsageReceived(
-        int promptTokens, int completionTokens, int cachedPromptTokens, int reasoningTokens);
+
+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 handleThinkingBlockReceived(
+        const QString &requestId, const QString &thinking, const QString &signature);
+    void handleToolExecutionStarted(
+        const QString &requestId, const QString &toolId, const QString &toolName);
+    void handleToolExecutionCompleted(
+        const QString &requestId,
+        const QString &toolId,
+        const QString &toolName,
+        const QString &toolOutput);
 
 private:
-    bool ensureAgentBound();
-
-    void onSessionEvent(Session *session, const QodeAssist::ResponseEvent &ev);
-    void onSessionFinished(const QString &requestId);
-    void onSessionFailed(const QString &requestId, const QodeAssist::ErrorInfo &error);
-
-    QStringList invokedSkillNames(const QString &message) const;
-    QString buildChatContextLayer() const;
-    QString requestIdForSession(Session *session) const;
+    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<PluginLLMCore::ImageAttachment> loadImagesFromStorage(const QList<ChatModel::ImageAttachment> &storedImages) const;
 
     struct RequestContext
     {
         QJsonObject originalRequest;
-        QPointer<Session> session;
+        PluginLLMCore::Provider *provider;
     };
 
+    PluginLLMCore::IPromptProvider *m_promptProvider = nullptr;
     ChatModel *m_chatModel;
     Context::ContextManager *m_contextManager;
-    QPointer<ConversationHistory> m_history;
-    Skills::SkillsManager *m_skillsManager = nullptr;
-    QPointer<SessionManager> m_sessionManager;
-    QPointer<Session> m_session;
-    QString m_activeAgent;
-    QString m_boundAgent;
     QString m_chatFilePath;
-    std::shared_ptr<StoredContentCache> m_contentCache;
 
     QHash<QString, RequestContext> m_activeRequests;
+    QHash<QString, QString> m_accumulatedResponses;
+    QSet<QString> m_awaitingContinuation;
 };
 
 } // namespace QodeAssist::Chat

ChatView/FileEditController.cpp

@@ -1,278 +0,0 @@
-// Copyright (C) 2024-2026 Petr Mironychev
-// SPDX-License-Identifier: GPL-3.0-or-later
-// Additional attribution terms under GPLv3 §7(b) apply — see LICENSE
-
-#include "FileEditController.hpp"
-
-#include <QJsonDocument>
-#include <QJsonObject>
-
-#include <coreplugin/editormanager/editormanager.h>
-#include <texteditor/texteditor.h>
-
-#include "Logger.hpp"
-#include "context/ChangesManager.h"
-
-namespace QodeAssist::Chat {
-
-FileEditController::FileEditController(QObject *parent)
-    : QObject(parent)
-{
-    auto &changes = Context::ChangesManager::instance();
-    connect(&changes, &Context::ChangesManager::fileEditAdded, this, [this](const QString &) {
-        updateStats();
-    });
-    connect(&changes, &Context::ChangesManager::fileEditApplied, this, [this](const QString &) {
-        updateStats();
-    });
-    connect(&changes, &Context::ChangesManager::fileEditRejected, this, [this](const QString &) {
-        updateStats();
-    });
-    connect(&changes, &Context::ChangesManager::fileEditUndone, this, [this](const QString &) {
-        updateStats();
-    });
-    connect(&changes, &Context::ChangesManager::fileEditArchived, this, [this](const QString &) {
-        updateStats();
-    });
-}
-
-void FileEditController::setCurrentRequestId(const QString &requestId)
-{
-    if (!m_currentRequestId.isEmpty()) {
-        LOG_MESSAGE(QString("Clearing previous message requestId: %1").arg(m_currentRequestId));
-    }
-
-    m_currentRequestId = requestId;
-    LOG_MESSAGE(QString("New message request started: %1").arg(requestId));
-    updateStats();
-}
-
-void FileEditController::clearCurrentRequestId()
-{
-    m_currentRequestId.clear();
-    updateStats();
-}
-
-int FileEditController::totalEdits() const
-{
-    return m_totalEdits;
-}
-
-int FileEditController::appliedEdits() const
-{
-    return m_appliedEdits;
-}
-
-int FileEditController::pendingEdits() const
-{
-    return m_pendingEdits;
-}
-
-int FileEditController::rejectedEdits() const
-{
-    return m_rejectedEdits;
-}
-
-void FileEditController::applyFileEdit(const QString &editId)
-{
-    LOG_MESSAGE(QString("Applying file edit: %1").arg(editId));
-    if (Context::ChangesManager::instance().applyFileEdit(editId)) {
-        emit infoMessage(QString("File edit applied successfully"));
-    } else {
-        auto edit = Context::ChangesManager::instance().getFileEdit(editId);
-        emit errorOccurred(
-            edit.statusMessage.isEmpty()
-                ? QString("Failed to apply file edit")
-                : QString("Failed to apply file edit: %1").arg(edit.statusMessage));
-    }
-}
-
-void FileEditController::rejectFileEdit(const QString &editId)
-{
-    LOG_MESSAGE(QString("Rejecting file edit: %1").arg(editId));
-    if (Context::ChangesManager::instance().rejectFileEdit(editId)) {
-        emit infoMessage(QString("File edit rejected"));
-    } else {
-        auto edit = Context::ChangesManager::instance().getFileEdit(editId);
-        emit errorOccurred(
-            edit.statusMessage.isEmpty()
-                ? QString("Failed to reject file edit")
-                : QString("Failed to reject file edit: %1").arg(edit.statusMessage));
-    }
-}
-
-void FileEditController::undoFileEdit(const QString &editId)
-{
-    LOG_MESSAGE(QString("Undoing file edit: %1").arg(editId));
-    if (Context::ChangesManager::instance().undoFileEdit(editId)) {
-        emit infoMessage(QString("File edit undone successfully"));
-    } else {
-        auto edit = Context::ChangesManager::instance().getFileEdit(editId);
-        emit errorOccurred(
-            edit.statusMessage.isEmpty()
-                ? QString("Failed to undo file edit")
-                : QString("Failed to undo file edit: %1").arg(edit.statusMessage));
-    }
-}
-
-void FileEditController::openFileEditInEditor(const QString &editId)
-{
-    LOG_MESSAGE(QString("Opening file edit in editor: %1").arg(editId));
-
-    auto edit = Context::ChangesManager::instance().getFileEdit(editId);
-    if (edit.editId.isEmpty()) {
-        emit errorOccurred(QString("File edit not found: %1").arg(editId));
-        return;
-    }
-
-    Utils::FilePath filePath = Utils::FilePath::fromString(edit.filePath);
-
-    Core::IEditor *editor = Core::EditorManager::openEditor(filePath);
-    if (!editor) {
-        emit errorOccurred(QString("Failed to open file in editor: %1").arg(edit.filePath));
-        return;
-    }
-
-    auto *textEditor = qobject_cast<TextEditor::BaseTextEditor *>(editor);
-    if (textEditor && textEditor->editorWidget()) {
-        QTextDocument *doc = textEditor->editorWidget()->document();
-        if (doc) {
-            QString currentContent = doc->toPlainText();
-            int position = -1;
-
-            if (edit.status == Context::ChangesManager::Applied && !edit.newContent.isEmpty()) {
-                position = currentContent.indexOf(edit.newContent);
-            } else if (!edit.oldContent.isEmpty()) {
-                position = currentContent.indexOf(edit.oldContent);
-            }
-
-            if (position >= 0) {
-                QTextCursor cursor(doc);
-                cursor.setPosition(position);
-                textEditor->editorWidget()->setTextCursor(cursor);
-                textEditor->editorWidget()->centerCursor();
-            }
-        }
-    }
-
-    LOG_MESSAGE(QString("Opened file in editor: %1").arg(edit.filePath));
-}
-
-void FileEditController::applyAllForCurrentMessage()
-{
-    if (m_currentRequestId.isEmpty()) {
-        emit errorOccurred(QString("No active message with file edits"));
-        return;
-    }
-
-    LOG_MESSAGE(QString("Applying all file edits for message: %1").arg(m_currentRequestId));
-
-    QString errorMsg;
-    bool success = Context::ChangesManager::instance()
-                       .reapplyAllEditsForRequest(m_currentRequestId, &errorMsg);
-
-    if (success) {
-        emit infoMessage(QString("All file edits applied successfully"));
-    } else {
-        emit errorOccurred(
-            errorMsg.isEmpty()
-                ? QString("Failed to apply some file edits")
-                : QString("Failed to apply some file edits:\n%1").arg(errorMsg));
-    }
-
-    updateStats();
-}
-
-void FileEditController::undoAllForCurrentMessage()
-{
-    if (m_currentRequestId.isEmpty()) {
-        emit errorOccurred(QString("No active message with file edits"));
-        return;
-    }
-
-    LOG_MESSAGE(QString("Undoing all file edits for message: %1").arg(m_currentRequestId));
-
-    QString errorMsg;
-    bool success = Context::ChangesManager::instance()
-                       .undoAllEditsForRequest(m_currentRequestId, &errorMsg);
-
-    if (success) {
-        emit infoMessage(QString("All file edits undone successfully"));
-    } else {
-        emit errorOccurred(
-            errorMsg.isEmpty()
-                ? QString("Failed to undo some file edits")
-                : QString("Failed to undo some file edits:\n%1").arg(errorMsg));
-    }
-
-    updateStats();
-}
-
-void FileEditController::updateStats()
-{
-    if (m_currentRequestId.isEmpty()) {
-        if (m_totalEdits != 0 || m_appliedEdits != 0 || m_pendingEdits != 0
-            || m_rejectedEdits != 0) {
-            m_totalEdits = 0;
-            m_appliedEdits = 0;
-            m_pendingEdits = 0;
-            m_rejectedEdits = 0;
-            emit statsChanged();
-        }
-        return;
-    }
-
-    auto edits = Context::ChangesManager::instance().getEditsForRequest(m_currentRequestId);
-
-    int total = edits.size();
-    int applied = 0;
-    int pending = 0;
-    int rejected = 0;
-
-    for (const auto &edit : edits) {
-        switch (edit.status) {
-        case Context::ChangesManager::Applied:
-            applied++;
-            break;
-        case Context::ChangesManager::Pending:
-            pending++;
-            break;
-        case Context::ChangesManager::Rejected:
-            rejected++;
-            break;
-        case Context::ChangesManager::Archived:
-            total--;
-            break;
-        }
-    }
-
-    bool changed = false;
-    if (m_totalEdits != total) {
-        m_totalEdits = total;
-        changed = true;
-    }
-    if (m_appliedEdits != applied) {
-        m_appliedEdits = applied;
-        changed = true;
-    }
-    if (m_pendingEdits != pending) {
-        m_pendingEdits = pending;
-        changed = true;
-    }
-    if (m_rejectedEdits != rejected) {
-        m_rejectedEdits = rejected;
-        changed = true;
-    }
-
-    if (changed) {
-        LOG_MESSAGE(
-            QString("Updated message edits stats: total=%1, applied=%2, pending=%3, rejected=%4")
-                .arg(total)
-                .arg(applied)
-                .arg(pending)
-                .arg(rejected));
-        emit statsChanged();
-    }
-}
-
-} // namespace QodeAssist::Chat

ChatView/FileEditController.hpp

@@ -1,49 +0,0 @@
-// Copyright (C) 2024-2026 Petr Mironychev
-// SPDX-License-Identifier: GPL-3.0-or-later
-// Additional attribution terms under GPLv3 §7(b) apply — see LICENSE
-
-#pragma once
-
-#include <QObject>
-#include <QString>
-
-namespace QodeAssist::Chat {
-
-class FileEditController : public QObject
-{
-    Q_OBJECT
-
-public:
-    explicit FileEditController(QObject *parent = nullptr);
-
-    void setCurrentRequestId(const QString &requestId);
-    void clearCurrentRequestId();
-
-    int totalEdits() const;
-    int appliedEdits() const;
-    int pendingEdits() const;
-    int rejectedEdits() const;
-
-    void applyFileEdit(const QString &editId);
-    void rejectFileEdit(const QString &editId);
-    void undoFileEdit(const QString &editId);
-    void openFileEditInEditor(const QString &editId);
-
-    void applyAllForCurrentMessage();
-    void undoAllForCurrentMessage();
-    void updateStats();
-
-signals:
-    void statsChanged();
-    void infoMessage(const QString &message);
-    void errorOccurred(const QString &error);
-
-private:
-    QString m_currentRequestId;
-    int m_totalEdits{0};
-    int m_appliedEdits{0};
-    int m_pendingEdits{0};
-    int m_rejectedEdits{0};
-};
-
-} // namespace QodeAssist::Chat

ChatView/FileItem.cpp

@@ -1,6 +1,5 @@
 // Copyright (C) 2025-2026 Petr Mironychev
 // SPDX-License-Identifier: GPL-3.0-or-later
-// Additional attribution terms under GPLv3 §7(b) apply — see LICENSE
 
 #include "FileItem.hpp"
 

ChatView/FileItem.hpp

@@ -1,6 +1,5 @@
 // Copyright (C) 2025-2026 Petr Mironychev
 // SPDX-License-Identifier: GPL-3.0-or-later
-// Additional attribution terms under GPLv3 §7(b) apply — see LICENSE
 
 #pragma once
 

ChatView/FileMentionItem.cpp

@@ -1,6 +1,5 @@
 // Copyright (C) 2026 Petr Mironychev
 // SPDX-License-Identifier: GPL-3.0-or-later
-// Additional attribution terms under GPLv3 §7(b) apply — see LICENSE
 
 #include "FileMentionItem.hpp"
 
@@ -88,6 +87,22 @@ void FileMentionItem::moveDown()
     }
 }
 
+void FileMentionItem::selectCurrent()
+{
+    if (m_currentIndex < 0 || m_currentIndex >= m_searchResults.size())
+        return;
+
+    const QVariantMap item = m_searchResults[m_currentIndex].toMap();
+    if (item.value("isProject").toBool()) {
+        emit projectSelected(item.value("projectName").toString());
+    } else {
+        emit fileSelected(
+            item.value("absolutePath").toString(),
+            item.value("relativePath").toString(),
+            item.value("projectName").toString());
+    }
+}
+
 void FileMentionItem::dismiss()
 {
     m_searchResults.clear();

ChatView/FileMentionItem.hpp

@@ -1,6 +1,5 @@
 // Copyright (C) 2026 Petr Mironychev
 // SPDX-License-Identifier: GPL-3.0-or-later
-// Additional attribution terms under GPLv3 §7(b) apply — see LICENSE
 
 #pragma once
 
@@ -29,6 +28,7 @@ public:
     Q_INVOKABLE void refreshSearch();
     Q_INVOKABLE void moveUp();
     Q_INVOKABLE void moveDown();
+    Q_INVOKABLE void selectCurrent();
     Q_INVOKABLE void dismiss();
 
     Q_INVOKABLE QVariantMap handleFileSelection(

ChatView/InputTokenCounter.cpp

@@ -1,116 +0,0 @@
-// Copyright (C) 2024-2026 Petr Mironychev
-// SPDX-License-Identifier: GPL-3.0-or-later
-// Additional attribution terms under GPLv3 §7(b) apply — see LICENSE
-
-#include "InputTokenCounter.hpp"
-
-#include "context/ContextManager.hpp"
-#include "context/TokenUtils.hpp"
-
-#include <ConversationHistory.hpp>
-#include <Message.hpp>
-
-namespace QodeAssist::Chat {
-
-InputTokenCounter::InputTokenCounter(
-    ConversationHistory *history, Context::ContextManager *contextManager, QObject *parent)
-    : QObject(parent)
-    , m_history(history)
-    , m_contextManager(contextManager)
-{
-    recompute();
-}
-
-int InputTokenCounter::inputTokens() const
-{
-    return m_inputTokens;
-}
-
-void InputTokenCounter::setMessage(const QString &message)
-{
-    m_messageTokens = Context::TokenUtils::estimateTokens(message);
-    recompute();
-}
-
-void InputTokenCounter::setAttachments(const QStringList &attachments)
-{
-    m_attachments = attachments;
-    recompute();
-}
-
-void InputTokenCounter::setLinkedFiles(const QStringList &linkedFiles)
-{
-    m_linkedFiles = linkedFiles;
-    recompute();
-}
-
-void InputTokenCounter::recompute()
-{
-    const auto splitImageEstimate = [](const QStringList &paths, QStringList &textPaths) {
-        int imageTokens = 0;
-        for (const QString &p : paths) {
-            if (Context::TokenUtils::isImageFilePath(p))
-                imageTokens += Context::TokenUtils::estimateImageAttachmentTokens(p);
-            else
-                textPaths.append(p);
-        }
-        return imageTokens;
-    };
-
-    int pendingTokens = m_messageTokens;
-    if (!m_attachments.isEmpty()) {
-        QStringList textPaths;
-        pendingTokens += splitImageEstimate(m_attachments, textPaths);
-        if (!textPaths.isEmpty()) {
-            auto attachFiles = m_contextManager->getContentFiles(textPaths);
-            pendingTokens += Context::TokenUtils::estimateFilesTokens(attachFiles);
-        }
-    }
-
-    if (m_hasServerUsage && m_history && !m_history->isEmpty()) {
-        m_inputTokens = m_serverInputTokens + pendingTokens;
-        emit inputTokensChanged();
-        return;
-    }
-
-    int inputTokens = pendingTokens;
-
-    if (!m_linkedFiles.isEmpty()) {
-        QStringList textPaths;
-        inputTokens += splitImageEstimate(m_linkedFiles, textPaths);
-        if (!textPaths.isEmpty()) {
-            auto linkFiles = m_contextManager->getContentFiles(textPaths);
-            inputTokens += Context::TokenUtils::estimateFilesTokens(linkFiles);
-        }
-    }
-
-    if (m_history) {
-        for (const auto &message : m_history->messages()) {
-            inputTokens += Context::TokenUtils::estimateTokens(message.text());
-            inputTokens += 4; // + role
-        }
-    }
-
-    m_inputTokens = inputTokens;
-    emit inputTokensChanged();
-}
-
-void InputTokenCounter::recordServerUsage(int promptTokens, int cachedTokens)
-{
-    const int serverInput = promptTokens + cachedTokens;
-    if (serverInput <= 0)
-        return;
-
-    m_serverInputTokens = serverInput;
-    m_hasServerUsage = true;
-    recompute();
-}
-
-void InputTokenCounter::resetServerUsage()
-{
-    m_serverInputTokens = 0;
-    m_hasServerUsage = false;
-    recompute();
-}
-
-} // namespace QodeAssist::Chat

ChatView/InputTokenCounter.hpp

@@ -1,55 +0,0 @@
-// Copyright (C) 2024-2026 Petr Mironychev
-// SPDX-License-Identifier: GPL-3.0-or-later
-// Additional attribution terms under GPLv3 §7(b) apply — see LICENSE
-
-#pragma once
-
-#include <QObject>
-#include <QStringList>
-
-namespace QodeAssist {
-class ConversationHistory;
-}
-
-namespace QodeAssist::Context {
-class ContextManager;
-}
-
-namespace QodeAssist::Chat {
-
-class InputTokenCounter : public QObject
-{
-    Q_OBJECT
-
-public:
-    InputTokenCounter(
-        ConversationHistory *history,
-        Context::ContextManager *contextManager,
-        QObject *parent = nullptr);
-
-    int inputTokens() const;
-
-    void setMessage(const QString &message);
-    void setAttachments(const QStringList &attachments);
-    void setLinkedFiles(const QStringList &linkedFiles);
-    void recompute();
-
-    void recordServerUsage(int promptTokens, int cachedTokens);
-    void resetServerUsage();
-
-signals:
-    void inputTokensChanged();
-
-private:
-    ConversationHistory *m_history;
-    Context::ContextManager *m_contextManager;
-
-    QStringList m_attachments;
-    QStringList m_linkedFiles;
-    int m_messageTokens{0};
-    int m_inputTokens{0};
-    int m_serverInputTokens{0};
-    bool m_hasServerUsage{false};
-};
-
-} // namespace QodeAssist::Chat

ChatView/MessagePart.hpp

@@ -1,6 +1,5 @@
 // Copyright (C) 2024-2026 Petr Mironychev
 // SPDX-License-Identifier: GPL-3.0-or-later
-// Additional attribution terms under GPLv3 §7(b) apply — see LICENSE
 
 #pragma once
 

ChatView/SessionFileRegistry.cpp

@@ -1,82 +0,0 @@
-// Copyright (C) 2024-2026 Petr Mironychev
-// SPDX-License-Identifier: GPL-3.0-or-later
-// Additional attribution terms under GPLv3 §7(b) apply — see LICENSE
-
-#include "SessionFileRegistry.hpp"
-
-#include <utility>
-
-#include <QFileInfo>
-
-#include <Session.hpp>
-
-namespace QodeAssist::Chat {
-
-SessionFileRegistry::SessionFileRegistry(QObject *parent)
-    : QObject(parent)
-{}
-
-SessionFileRegistry::~SessionFileRegistry() = default;
-
-bool SessionFileRegistry::isLocked(const QString &path) const
-{
-    return !path.isEmpty() && !m_locks.value(path).isNull();
-}
-
-bool SessionFileRegistry::isLockedByOther(const QString &path, QodeAssist::Session *self) const
-{
-    if (path.isEmpty())
-        return false;
-    const auto owner = m_locks.value(path);
-    return !owner.isNull() && owner != self;
-}
-
-bool SessionFileRegistry::lock(const QString &path, QodeAssist::Session *owner)
-{
-    if (path.isEmpty())
-        return false;
-    const auto existing = m_locks.value(path);
-    if (!existing.isNull() && existing != owner)
-        return false;
-    m_locks.insert(path, owner);
-    return true;
-}
-
-void SessionFileRegistry::release(const QString &path)
-{
-    m_locks.remove(path);
-}
-
-void SessionFileRegistry::setPendingChatFile(const QString &path)
-{
-    m_pendingChatFile = path;
-}
-
-QString SessionFileRegistry::takePendingChatFile()
-{
-    return std::exchange(m_pendingChatFile, QString{});
-}
-
-QString SessionFileRegistry::uniqueFreePath(const QString &desiredPath) const
-{
-    if (desiredPath.isEmpty() || !isLocked(desiredPath)) {
-        return desiredPath;
-    }
-
-    const QFileInfo info(desiredPath);
-    const QString dir = info.path();
-    const QString base = info.completeBaseName();
-    const QString suffix = info.suffix();
-
-    for (int counter = 2;; ++counter) {
-        QString candidate = dir + '/' + base + '_' + QString::number(counter);
-        if (!suffix.isEmpty()) {
-            candidate += '.' + suffix;
-        }
-        if (!isLocked(candidate)) {
-            return candidate;
-        }
-    }
-}
-
-} // namespace QodeAssist::Chat

ChatView/SessionFileRegistry.hpp

@@ -1,46 +0,0 @@
-// Copyright (C) 2024-2026 Petr Mironychev
-// SPDX-License-Identifier: GPL-3.0-or-later
-// Additional attribution terms under GPLv3 §7(b) apply — see LICENSE
-
-#pragma once
-
-#include <QHash>
-#include <QObject>
-#include <QPointer>
-#include <QString>
-
-namespace QodeAssist {
-class Session;
-}
-
-namespace QodeAssist::Chat {
-
-// Shared registry mapping each chat (autosave) file to the live Session that owns it, so a
-// file is busy only while its owning Session is alive (a destroyed Session frees it — the
-// QPointer goes null). Keeps two chat views from autosaving into the same path.
-class SessionFileRegistry : public QObject
-{
-    Q_OBJECT
-
-public:
-    explicit SessionFileRegistry(QObject *parent = nullptr);
-    ~SessionFileRegistry() override;
-
-    bool isLocked(const QString &path) const;
-    bool isLockedByOther(const QString &path, QodeAssist::Session *self) const;
-    bool lock(const QString &path, QodeAssist::Session *owner);
-    void release(const QString &path);
-
-    QString uniqueFreePath(const QString &desiredPath) const;
-
-    // Handoff slot for relocating a live chat between hosts (split <-> window): the source
-    // chat stores its history file here, the freshly created host picks it up exactly once.
-    void setPendingChatFile(const QString &path);
-    QString takePendingChatFile();
-
-private:
-    QHash<QString, QPointer<QodeAssist::Session>> m_locks;
-    QString m_pendingChatFile;
-};
-
-} // namespace QodeAssist::Chat

ChatView/icons/context-icon.svg

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor">
+  <path d="M3 5h18v2H3V5zm0 6h18v2H3v-2zm0 6h12v2H3v-2z"/>
+  <circle cx="19" cy="17" r="3" fill="none" stroke="currentColor" stroke-width="2"/>
+</svg>
+

ChatView/icons/new-chat-icon.svg

@@ -1,5 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-  <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"/>
-  <rect x="11" y="5" width="2" height="9" rx="0.5" fill="black"/>
-  <rect x="7.5" y="8.5" width="9" height="2" rx="0.5" fill="black"/>
-</svg>

ChatView/icons/open-in-code.svg

@@ -1,17 +0,0 @@
-<svg width="44" height="44" viewBox="0 0 44 44" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_74_52)">
-<mask id="mask0_74_52" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="0" y="0" width="44" height="44">
-<path d="M44 0H0V44H44V0Z" fill="white"/>
-</mask>
-<g mask="url(#mask0_74_52)">
-<path d="M18 31C25.1797 31 31 25.1797 31 18C31 10.8203 25.1797 5 18 5C10.8203 5 5 10.8203 5 18C5 25.1797 10.8203 31 18 31Z" stroke="black" stroke-width="3.5"/>
-<path d="M27 27L38 38" stroke="black" stroke-width="3.5" stroke-linecap="round"/>
-<path d="M16.375 23L18.2841 11.3636H20.1023L18.1932 23H16.375ZM11.1648 20.1136L11.4659 18.2955H20.5568L20.2557 20.1136H11.1648ZM12.2841 23L14.1932 11.3636H16.0114L14.1023 23H12.2841ZM11.8295 16.0682L12.1364 14.25H21.2273L20.9205 16.0682H11.8295Z" fill="black"/>
-</g>
-</g>
-<defs>
-<clipPath id="clip0_74_52">
-<rect width="44" height="44" fill="white"/>
-</clipPath>
-</defs>
-</svg>

ChatView/icons/open-in-editor.svg

@@ -1,6 +1,17 @@
-<svg width="44" height="44" viewBox="0 0 44 44" xmlns="http://www.w3.org/2000/svg">
-  <g transform="translate(10 8) skewX(-15)" stroke="black" stroke-width="2" stroke-linejoin="round">
-    <rect x="10" y="0" width="22" height="15" rx="3" ry="3" fill="black"/>
-    <rect x="0" y="12" width="22" height="15" rx="3" ry="3" fill="none"/>
-  </g>
+<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/open-in-window.svg

@@ -1,6 +0,0 @@
-<svg width="44" height="44" viewBox="0 0 44 44" xmlns="http://www.w3.org/2000/svg">
-  <g transform="translate(10 8) skewX(-15)" stroke="black" stroke-width="2" stroke-linejoin="round">
-    <rect x="10" y="0" width="22" height="15" rx="3" ry="3" fill="none"/>
-    <rect x="0" y="12" width="22" height="15" rx="3" ry="3" fill="black"/>
-  </g>
-</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/warning-icon.svg

@@ -1,5 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12 3L22 20H2L12 3Z" stroke="black" stroke-width="2" stroke-linejoin="round"/>
-<path d="M12 10V14" stroke="black" stroke-width="2" stroke-linecap="round"/>
-<path d="M12 17H12.01" stroke="black" stroke-width="2.4" stroke-linecap="round"/>
-</svg>

ChatView/qml/RootItem.qml

@@ -1,6 +1,5 @@
 // Copyright (C) 2024-2026 Petr Mironychev
 // SPDX-License-Identifier: GPL-3.0-or-later
-// Additional attribution terms under GPLv3 §7(b) apply — see LICENSE
 
 import QtQuick
 import QtQuick.Controls
@@ -20,9 +19,6 @@ ChatRootView {
         colorGroup: SystemPalette.Active
     }
 
-    property bool hasActiveError: false
-    readonly property color errorColor: "#d32f2f"
-
     palette {
         window: sysPalette.window
         windowText: sysPalette.windowText
@@ -91,110 +87,77 @@ ChatRootView {
             Layout.preferredWidth: parent.width
             Layout.preferredHeight: childrenRect.height + 10
 
-            isInEditor: root.isInEditor
             saveButton.onClicked: root.showSaveDialog()
             loadButton.onClicked: root.showLoadDialog()
             clearButton.onClicked: root.clearChat()
-            newChatButton.onClicked: root.requestNewChat()
             tokensBadge {
-                readonly property int sessionPrompt: root.chatModel.sessionPromptTokens || 0
-                readonly property int sessionCompletion: root.chatModel.sessionCompletionTokens || 0
-                readonly property int sessionCached: root.chatModel.sessionCachedPromptTokens || 0
-                text: sessionCached > 0
-                    ? qsTr("next ~%1  ·  session ↑%2 ↓%3 ↻%4")
-                          .arg(root.inputTokensCount)
-                          .arg(sessionPrompt)
-                          .arg(sessionCompletion)
-                          .arg(sessionCached)
-                    : qsTr("next ~%1  ·  session ↑%2 ↓%3")
-                          .arg(root.inputTokensCount)
-                          .arg(sessionPrompt)
-                          .arg(sessionCompletion)
-                ToolTip.text: sessionCached > 0
-                    ? qsTr("next request (estimate)  ·  session prompt ↑ / completion ↓ / cached ↻ (provider cache hits)")
-                    : qsTr("next request (estimate)  ·  session prompt ↑ / completion ↓")
+                text: qsTr("%1/%2").arg(root.inputTokensCount).arg(root.chatModel.tokensThreshold)
             }
             recentPath {
                 text: qsTr("Сhat name: %1").arg(root.chatFileName.length > 0 ? root.chatFileName : "Unsaved")
             }
             openChatHistory.onClicked: root.openChatHistoryFolder()
+            contextButton.onClicked: contextViewer.open()
             pinButton {
                 visible: typeof _chatview !== 'undefined'
                 checked: typeof _chatview !== 'undefined' ? _chatview.isPin : false
                 onCheckedChanged: _chatview.isPin = topBar.pinButton.checked
             }
-            relocateButton {
-                icon.source: (typeof _chatview !== 'undefined')
-                             ? "qrc:/qt/qml/ChatView/icons/open-in-editor.svg"
-                             : "qrc:/qt/qml/ChatView/icons/open-in-window.svg"
-                onClicked: {
-                    if (typeof _chatview !== 'undefined')
-                        root.relocateToSplit()
-                    else
-                        root.relocateToWindow()
+            toolsButton {
+                checked: root.useTools
+                onCheckedChanged: {
+                    root.useTools = toolsButton.checked
                 }
             }
-            relocateTooltip.text: (typeof _chatview !== 'undefined')
-                                   ? qsTr("Move this chat to an editor tab")
-                                   : qsTr("Move this chat to a separate window")
-            settingsButton.onClicked: root.openSettings()
-            agentSelector {
-                model: root.availableChatAgents
-                displayText: root.currentChatAgent
-                onActivated: function(index) {
-                    root.currentChatAgent = root.availableChatAgents[index]
+            thinkingMode {
+                checked: root.useThinking
+                enabled: root.isThinkingSupport
+                onCheckedChanged: {
+                    root.useThinking = thinkingMode.checked
                 }
-
-                Component.onCompleted: root.loadAvailableChatAgents()
-
+            }
+            settingsButton.onClicked: root.openSettings()
+            configSelector {
+                model: root.availableConfigurations
+                displayText: root.currentConfiguration
+                onActivated: function(index) {
+                    if (index > 0) {
+                        root.applyConfiguration(root.availableConfigurations[index])
+                    }
+                }
+                
                 popup.onAboutToShow: {
-                    root.loadAvailableChatAgents()
+                    root.loadAvailableConfigurations()
+                }
+            }
+            
+            roleSelector {
+                model: root.availableAgentRoles
+                displayText: root.currentAgentRole
+                onActivated: function(index) {
+                    root.applyAgentRole(root.availableAgentRoles[index])
+                }
+                
+                popup.onAboutToShow: {
+                    root.loadAvailableAgentRoles()
                 }
             }
         }
 
-        RowLayout {
-            Layout.fillWidth: true
-            Layout.fillHeight: true
-            spacing: 2
-
-            MessageNavigator {
-                id: messageNavigator
-
-                Layout.preferredWidth: 16
-                Layout.fillHeight: true
-                Layout.topMargin: 4
-                Layout.bottomMargin: 4
-
-                chatModel: root.chatModel
-
-                onMessageClicked: function(messageIndex) {
-                    chatListView.userScrolledUp = true
-                    chatListView.positionViewAtIndex(messageIndex, ListView.Beginning)
-                }
-            }
-
         ListView {
             id: chatListView
 
             property bool userScrolledUp: false
 
-            function syncNavigatorCurrent() {
-                const top = indexAt(10, contentY + 4)
-                messageNavigator.updateCurrentFromModelIndex(top)
-            }
-
             Layout.fillWidth: true
             Layout.fillHeight: true
-            leftMargin: 3
+            leftMargin: 5
             model: root.chatModel
             clip: true
             spacing: 0
             boundsBehavior: Flickable.StopAtBounds
             cacheBuffer: 2000
 
-            onContentYChanged: Qt.callLater(syncNavigatorCurrent)
-
             onMovingChanged: {
                 if (moving) {
                     userScrolledUp = !atYEnd
@@ -281,7 +244,6 @@ ChatRootView {
                 if (!userScrolledUp) {
                     root.scrollToBottom()
                 }
-                Qt.callLater(syncNavigatorCurrent)
             }
 
             onContentHeightChanged: {
@@ -297,7 +259,6 @@ ChatRootView {
                     id: chatItemInstance
 
                     width: parent.width
-                    chatViewport: chatListView
                     msgModel: root.chatModel.processMessageContent(model.content)
                     messageAttachments: model.attachments
                     messageImages: model.images
@@ -309,10 +270,6 @@ ChatRootView {
                     codeFontSize: root.codeFontSize
                     textFontSize: root.textFontSize
                     textFormat: root.textFormat
-                    promptTokens: model.promptTokens || 0
-                    completionTokens: model.completionTokens || 0
-                    cachedPromptTokens: model.cachedPromptTokens || 0
-                    reasoningTokens: model.reasoningTokens || 0
 
                     onResetChatToMessage: function(idx) {
                         messageInput.text = model.content
@@ -377,7 +334,6 @@ ChatRootView {
                 }
             }
         }
-        }
 
         ScrollView {
             id: view
@@ -389,10 +345,11 @@ ChatRootView {
             QQC.TextArea {
                 id: messageInput
 
-                placeholderText: qsTr("Type your message here... (%1 to send)").arg(root.sendShortcutText)
+                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
-                wrapMode: TextArea.Wrap
                 background: Rectangle {
                     radius: 2
                     color: palette.base
@@ -415,31 +372,15 @@ ChatRootView {
                     root.calculateMessageTokensCount(messageInput.text)
                     var cursorPos = messageInput.cursorPosition
                     var textBefore = messageInput.text.substring(0, cursorPos)
-
                     var atIndex = textBefore.lastIndexOf('@')
                     if (atIndex >= 0) {
                         var query = textBefore.substring(atIndex + 1)
                         if (query.indexOf(' ') === -1 && query.indexOf('\n') === -1) {
                             fileMentionPopup.updateSearch(query)
-                            skillCommandPopup.dismiss()
                             return
                         }
                     }
                     fileMentionPopup.dismiss()
-
-                    const slashIndex = textBefore.lastIndexOf('/')
-                    if (slashIndex >= 0) {
-                        const beforeSlash = slashIndex === 0
-                                            ? ' '
-                                            : textBefore.charAt(slashIndex - 1)
-                        const skillQuery = textBefore.substring(slashIndex + 1)
-                        if ((beforeSlash === ' ' || beforeSlash === '\n')
-                                && /^[a-z0-9-]*$/.test(skillQuery)) {
-                            skillCommandPopup.updateSearch(skillQuery)
-                            return
-                        }
-                    }
-                    skillCommandPopup.dismiss()
                 }
 
                 Keys.onPressed: function(event) {
@@ -457,23 +398,6 @@ ChatRootView {
                             fileMentionPopup.dismiss()
                             event.accepted = true
                         }
-                    } else if (skillCommandPopup.visible) {
-                        if (event.key === Qt.Key_Down) {
-                            skillCommandPopup.moveDown()
-                            event.accepted = true
-                        } else if (event.key === Qt.Key_Up) {
-                            skillCommandPopup.moveUp()
-                            event.accepted = true
-                        } else if (event.key === Qt.Key_Return || event.key === Qt.Key_Enter) {
-                            root.applySkillSelection()
-                            event.accepted = true
-                        } else if (event.key === Qt.Key_Escape) {
-                            skillCommandPopup.dismiss()
-                            event.accepted = true
-                        }
-                    } else if (root.isSendShortcut(event.key, event.modifiers)) {
-                        root.sendChatMessage()
-                        event.accepted = true
                     }
                 }
 
@@ -566,25 +490,13 @@ ChatRootView {
             Layout.preferredHeight: 40
 
             isCompressing: root.isCompressing
-            isProcessing: root.isRequestInProgress
-            canCompress: root.canCompress
-            canSend: root.currentChatAgent !== ""
             sendButton.onClicked: !root.isRequestInProgress ? root.sendChatMessage()
                                                             : root.cancelRequest()
-            sendButton.icon.source: root.isRequestInProgress
-                                    ? ""
-                                    : (root.hasActiveError ? "qrc:/qt/qml/ChatView/icons/warning-icon.svg"
-                                                           : "qrc:/qt/qml/ChatView/icons/chat-icon.svg")
-            sendButton.text: root.isRequestInProgress ? qsTr("Stop") : qsTr("Send")
-            sendButton.accentColor: (root.hasActiveError && !root.isRequestInProgress)
-                                    ? root.errorColor : "transparent"
-            sendButtonTooltip.text: root.isRequestInProgress
-                                    ? qsTr("Stop")
-                                    : (root.currentChatAgent === ""
-                                       ? qsTr("Assign a chat agent in the Pipelines settings")
-                                       : (root.hasActiveError
-                                          ? root.lastErrorMessage
-                                          : qsTr("Send message to LLM %1").arg(root.sendShortcutText)))
+            sendButton.icon.source: !root.isRequestInProgress ? "qrc:/qt/qml/ChatView/icons/chat-icon.svg"
+                                                              : "qrc:/qt/qml/ChatView/icons/chat-pause-icon.svg"
+            sendButton.text: !root.isRequestInProgress ? qsTr("Send") : qsTr("Stop")
+            sendButton.ToolTip.text: !root.isRequestInProgress ? qsTr("Send message to LLM %1").arg(Qt.platform.os === "osx" ? "Cmd+Return" : "Ctrl+Return")
+                                                               : qsTr("Stop")
             compressButton.onClicked: compressConfirmDialog.open()
             cancelCompressButton.onClicked: root.cancelCompression()
             syncOpenFiles {
@@ -597,6 +509,15 @@ ChatRootView {
         }
     }
 
+    Shortcut {
+        id: sendMessageShortcut
+
+        sequences: ["Ctrl+Return", "Ctrl+Enter"]
+        context: Qt.WindowShortcut
+        enabled: messageInput.activeFocus && !Qt.inputMethod.visible && !fileMentionPopup.visible
+        onActivated: root.sendChatMessage()
+    }
+
     function clearChat() {
         root.clearMessages()
         root.clearAttachmentFiles()
@@ -607,31 +528,6 @@ ChatRootView {
         Qt.callLater(chatListView.positionViewAtEnd)
     }
 
-    function focusInput() {
-        messageInput.forceActiveFocus()
-    }
-
-    property Item focusGuard: Window.activeFocusItem
-    onFocusGuardChanged: Qt.callLater(returnFocusToInputIfNeeded)
-
-    function returnFocusToInputIfNeeded() {
-        var item = Window.activeFocusItem
-        if (!item || item === messageInput)
-            return
-        if (item.cursorVisible !== undefined || item.selectByMouse !== undefined)
-            return
-        if (item.popup !== undefined)
-            return
-        var p = item
-        while (p) {
-            if (p === root) {
-                messageInput.forceActiveFocus()
-                return
-            }
-            p = p.parent
-        }
-    }
-
     function applyMentionSelection() {
         var result = fileMentionPopup.applyCurrentSelection(
             messageInput.text, messageInput.cursorPosition, root.useTools)
@@ -641,25 +537,7 @@ ChatRootView {
         }
     }
 
-    function applySkillSelection() {
-        const name = skillCommandPopup.currentName()
-        if (name === "")
-            return
-        const cursorPos = messageInput.cursorPosition
-        const textBefore = messageInput.text.substring(0, cursorPos)
-        const slashIndex = textBefore.lastIndexOf('/')
-        if (slashIndex < 0)
-            return
-        const before = messageInput.text.substring(0, slashIndex)
-        const after = messageInput.text.substring(cursorPos)
-        const token = '/' + name + ' '
-        messageInput.text = before + token + after
-        messageInput.cursorPosition = before.length + token.length
-        skillCommandPopup.dismiss()
-    }
-
     function sendChatMessage() {
-        root.hasActiveError = false
         root.sendMessage(fileMentionPopup.expandMentions(messageInput.text))
         messageInput.text = ""
         fileMentionPopup.clearMentions()
@@ -682,122 +560,13 @@ ChatRootView {
         onAccepted: root.compressCurrentChat()
     }
 
-    Rectangle {
-        id: errorBanner
-
+    Toast {
+        id: errorToast
         z: 1000
-        visible: root.hasActiveError && root.lastErrorMessage.length > 0
 
-        width: parent.width / 2
-        anchors.right: parent.right
-        anchors.bottom: parent.bottom
-        anchors.rightMargin: 10
-        anchors.bottomMargin: bottomBar.height + 48
-
-        height: visible ? errorRow.implicitHeight + 12 : 0
-
-        color: Qt.rgba(0.83, 0.18, 0.18, 0.96)
-        radius: 6
-        border.color: Qt.darker(color, 1.3)
-        border.width: 1
-
-        RowLayout {
-            id: errorRow
-
-            anchors.left: parent.left
-            anchors.right: parent.right
-            anchors.verticalCenter: parent.verticalCenter
-            anchors.leftMargin: 10
-            anchors.rightMargin: 6
-            spacing: 8
-
-            TextEdit {
-                Layout.fillWidth: true
-                text: root.lastErrorMessage
-                color: "#FFFFFF"
-                font.pixelSize: 12
-                wrapMode: TextEdit.Wrap
-                readOnly: true
-                selectByMouse: true
-                selectionColor: Qt.darker(errorBanner.color, 1.3)
-            }
-
-            Rectangle {
-                id: copyErrorButton
-
-                property bool copied: false
-
-                Layout.alignment: Qt.AlignTop
-                implicitWidth: copyErrorLabel.implicitWidth + 18
-                implicitHeight: 22
-                radius: 4
-                color: copyErrorMouse.containsMouse ? Qt.rgba(1, 1, 1, 0.28)
-                                                    : Qt.rgba(1, 1, 1, 0.16)
-                border.color: Qt.rgba(1, 1, 1, 0.45)
-                border.width: 1
-
-                Behavior on color { ColorAnimation { duration: 120 } }
-
-                Text {
-                    id: copyErrorLabel
-
-                    anchors.centerIn: parent
-                    text: copyErrorButton.copied ? qsTr("Copied") : qsTr("Copy")
-                    color: "#FFFFFF"
-                    font.pixelSize: 12
-                }
-
-                MouseArea {
-                    id: copyErrorMouse
-
-                    anchors.fill: parent
-                    hoverEnabled: true
-                    cursorShape: Qt.PointingHandCursor
-                    onClicked: {
-                        root.copyToClipboard(root.lastErrorMessage)
-                        copyErrorButton.copied = true
-                        copyErrorResetTimer.restart()
-                    }
-                }
-
-                Timer {
-                    id: copyErrorResetTimer
-
-                    interval: 1500
-                    onTriggered: copyErrorButton.copied = false
-                }
-            }
-
-            Rectangle {
-                id: closeErrorButton
-
-                Layout.alignment: Qt.AlignTop
-                implicitWidth: 22
-                implicitHeight: 22
-                radius: 4
-                color: closeErrorMouse.containsMouse ? Qt.rgba(1, 1, 1, 0.28) : "transparent"
-                border.color: Qt.rgba(1, 1, 1, 0.45)
-                border.width: closeErrorMouse.containsMouse ? 1 : 0
-
-                Behavior on color { ColorAnimation { duration: 120 } }
-
-                Text {
-                    anchors.centerIn: parent
-                    text: "✕"
-                    color: "#FFFFFF"
-                    font.pixelSize: 12
-                }
-
-                MouseArea {
-                    id: closeErrorMouse
-
-                    anchors.fill: parent
-                    hoverEnabled: true
-                    cursorShape: Qt.PointingHandCursor
-                    onClicked: root.hasActiveError = false
-                }
-            }
-        }
+        color: Qt.rgba(0.8, 0.2, 0.2, 0.9)
+        border.color: Qt.darker(infoToast.color, 1.3)
+        toastTextColor: "#FFFFFF"
     }
 
     Toast {
@@ -809,11 +578,35 @@ ChatRootView {
         toastTextColor: "#FFFFFF"
     }
 
+    ContextViewer {
+        id: contextViewer
+
+        width: Math.min(parent.width * 0.85, 800)
+        height: Math.min(parent.height * 0.85, 700)
+        x: (parent.width - width) / 2
+        y: (parent.height - height) / 2
+
+        baseSystemPrompt: root.baseSystemPrompt
+        currentAgentRole: root.currentAgentRole
+        currentAgentRoleDescription: root.currentAgentRoleDescription
+        currentAgentRoleSystemPrompt: root.currentAgentRoleSystemPrompt
+        activeRules: root.activeRules
+        activeRulesCount: root.activeRulesCount
+
+        onOpenSettings: root.openSettings()
+        onOpenAgentRolesSettings: root.openAgentRolesSettings()
+        onOpenRulesFolder: root.openRulesFolder()
+        onRefreshRules: root.refreshRules()
+        onRuleSelected: function(index) {
+            contextViewer.selectedRuleContent = root.getRuleContent(index)
+        }
+    }
+
     Connections {
         target: root
         function onLastErrorMessageChanged() {
             if (root.lastErrorMessage.length > 0) {
-                root.hasActiveError = true
+                errorToast.show(root.lastErrorMessage)
             }
         }
         function onLastInfoMessageChanged() {
@@ -843,21 +636,7 @@ ChatRootView {
         }
     }
 
-    SkillCommandPopup {
-        id: skillCommandPopup
-
-        z: 999
-        width: Math.min(480, root.width - 20)
-
-        x: Math.max(5, Math.min(view.x + 5, root.width - width - 5))
-        y: view.y - height - 4
-
-        skillProvider: root
-
-        onSelectionRequested: root.applySkillSelection()
-    }
-
     Component.onCompleted: {
-        focusInput()
+        messageInput.forceActiveFocus()
     }
 }

ChatView/qml/chatparts/ChatItem.qml

@@ -1,6 +1,5 @@
 // Copyright (C) 2024-2026 Petr Mironychev
 // SPDX-License-Identifier: GPL-3.0-or-later
-// Additional attribution terms under GPLv3 §7(b) apply — see LICENSE
 
 import QtQuick
 import ChatView
@@ -31,16 +30,10 @@ Rectangle {
     property int textFontSize: Qt.application.font.pointSize
     property int codeFontSize: Qt.application.font.pointSize
     property int textFormat: 0
-    property Flickable chatViewport: null
 
     property bool isUserMessage: false
     property int messageIndex: -1
 
-    property int promptTokens: 0
-    property int completionTokens: 0
-    property int cachedPromptTokens: 0
-    property int reasoningTokens: 0
-
     signal resetChatToMessage(int index)
     signal openFileRequested(string filePath)
 
@@ -142,39 +135,6 @@ Rectangle {
                 }
             }
         }
-
-        RowLayout {
-            id: usageBadge
-
-            Layout.fillWidth: true
-            Layout.leftMargin: 10
-            Layout.rightMargin: 10
-            spacing: 8
-            visible: !root.isUserMessage
-                     && (root.promptTokens > 0 || root.completionTokens > 0)
-
-            Item { Layout.fillWidth: true }
-
-            Text {
-                text: root.cachedPromptTokens > 0
-                          ? qsTr("↑ %1 (cached %2)").arg(root.promptTokens).arg(root.cachedPromptTokens)
-                          : qsTr("↑ %1").arg(root.promptTokens)
-                color: palette.placeholderText
-                font.pointSize: Math.max(root.textFontSize - 2, 7)
-            }
-            Text {
-                text: root.reasoningTokens > 0
-                          ? qsTr("↓ %1 (reasoning %2)").arg(root.completionTokens).arg(root.reasoningTokens)
-                          : qsTr("↓ %1").arg(root.completionTokens)
-                color: palette.placeholderText
-                font.pointSize: Math.max(root.textFontSize - 2, 7)
-            }
-            Text {
-                text: qsTr("Σ %1").arg(root.promptTokens + root.completionTokens)
-                color: palette.placeholderText
-                font.pointSize: Math.max(root.textFontSize - 2, 7)
-            }
-        }
     }
 
     Rectangle {
@@ -261,7 +221,6 @@ Rectangle {
         language: itemData.language
         codeFontFamily: root.codeFontFamily
         codeFontSize: root.codeFontSize
-        viewport: root.chatViewport
     }
 
     component AttachmentComponent : Rectangle {
@@ -356,9 +315,10 @@ Rectangle {
                 smooth: true
                 mipmap: true
 
-                QoABusyIndicator {
+                BusyIndicator {
                     anchors.centerIn: parent
                     running: imageDisplay.status === Image.Loading
+                    visible: running
                 }
 
                 Text {

ChatView/qml/chatparts/CodeBlock.qml

@@ -1,6 +1,5 @@
 // Copyright (C) 2024-2026 Petr Mironychev
 // SPDX-License-Identifier: GPL-3.0-or-later
-// Additional attribution terms under GPLv3 §7(b) apply — see LICENSE
 
 import QtQuick
 import QtQuick.Controls
@@ -14,7 +13,6 @@ Rectangle {
     property string code: ""
     property string language: ""
     property bool expanded: false
-    property Flickable viewport: null
 
     property alias codeFontFamily: codeText.font.family
     property alias codeFontSize: codeText.font.pointSize
@@ -124,16 +122,7 @@ Rectangle {
         anchors.right: parent.right
         anchors.rightMargin: 5
 
-        y: {
-            if (!root.expanded || !root.viewport)
-                return 5
-            const flick = root.viewport
-            const topInContent = root.mapToItem(flick.contentItem, 0, 0).y
-            const topInView = topInContent - flick.contentY
-            const desired = topInView < 0 ? (-topInView + 5) : 5
-            const maxY = Math.max(5, root.height - copyButton.height - 5)
-            return Math.max(5, Math.min(desired, maxY))
-        }
+        y: 5
         text: qsTr("Copy")
 
         onClicked: {

ChatView/qml/chatparts/FileEditBlock.qml

@@ -1,6 +1,5 @@
 // Copyright (C) 2025-2026 Petr Mironychev
 // SPDX-License-Identifier: GPL-3.0-or-later
-// Additional attribution terms under GPLv3 §7(b) apply — see LICENSE
 
 import QtQuick
 import QtQuick.Controls
@@ -194,24 +193,9 @@ Rectangle {
                     color: root.statusColor
                 }
 
-                QoAButton {
-                    icon {
-                        source: "qrc:/qt/qml/ChatView/icons/open-in-code.svg"
-                        height: 15
-                        width: 15
-                    }
-                    hoverEnabled: true
-                    onClicked: root.openInEditor(editData.edit_id)
-
-                    QoAToolTip {
-                        visible: parent.hovered
-                        delay: 500
-                        text: qsTr("Open file in editor and navigate to changes")
-                    }
-                }
-
                 Text {
                     id: headerText
+                    Layout.fillWidth: true
                     text: {
                         var modeText = root.oldContent.length > 0 ? qsTr("Replace") : qsTr("Append")
                         if (root.oldContent.length > 0) {
@@ -239,19 +223,6 @@ Rectangle {
                     color: palette.mid
                 }
 
-                Item { Layout.fillWidth: true }
-            }
-
-            RowLayout {
-                id: actionButtons
-
-                anchors {
-                    right: parent.right
-                    rightMargin: 5
-                    verticalCenter: parent.verticalCenter
-                }
-                spacing: 6
-
                 Rectangle {
                     visible: !root.isPending
                     Layout.preferredWidth: badgeText.width + 12
@@ -268,6 +239,31 @@ Rectangle {
                         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 {

ChatView/qml/chatparts/TextBlock.qml

@@ -1,6 +1,5 @@
 // Copyright (C) 2024-2026 Petr Mironychev
 // SPDX-License-Identifier: GPL-3.0-or-later
-// Additional attribution terms under GPLv3 §7(b) apply — see LICENSE
 
 import QtQuick
 import Qt.labs.platform as Platform

ChatView/qml/chatparts/ThinkingBlock.qml

@@ -1,6 +1,5 @@
 // Copyright (C) 2025-2026 Petr Mironychev
 // SPDX-License-Identifier: GPL-3.0-or-later
-// Additional attribution terms under GPLv3 §7(b) apply — see LICENSE
 
 import QtQuick
 import Qt.labs.platform as Platform

ChatView/qml/chatparts/ToolBlock.qml

@@ -1,6 +1,5 @@
 // Copyright (C) 2025-2026 Petr Mironychev
 // SPDX-License-Identifier: GPL-3.0-or-later
-// Additional attribution terms under GPLv3 §7(b) apply — see LICENSE
 
 import QtQuick
 import Qt.labs.platform as Platform

ChatView/qml/controls/AttachedFilesPlace.qml

@@ -1,17 +1,15 @@
 // Copyright (C) 2024-2026 Petr Mironychev
 // SPDX-License-Identifier: GPL-3.0-or-later
-// Additional attribution terms under GPLv3 §7(b) apply — see LICENSE
 
 import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
-import Qt.labs.platform as Platform
 import ChatView
 import UIControls
 
 Flow {
     id: root
-
+    
     property alias attachedFilesModel: attachRepeater.model
     property color accentColor: palette.mid
     property string iconPath
@@ -23,10 +21,10 @@ Flow {
     rightPadding: 5
     topPadding: attachRepeater.model.length > 0 ? 2 : 0
     bottomPadding: attachRepeater.model.length > 0 ? 2 : 0
-
+    
     Repeater {
         id: attachRepeater
-
+        
         delegate: FileItem {
             id: fileItem
 
@@ -34,7 +32,7 @@ Flow {
             required property string modelData
 
             filePath: modelData
-
+            
             height: 30
             width: contentRow.width + 10
 
@@ -54,7 +52,7 @@ Flow {
                 acceptedButtons: Qt.LeftButton | Qt.MiddleButton | Qt.RightButton
                 onClicked: (mouse) => {
                     if (mouse.button === Qt.RightButton) {
-                        contextMenu.open()
+                        contextMenu.popup()
                     } else if (mouse.button === Qt.MiddleButton ||
                         (mouse.button === Qt.LeftButton && (mouse.modifiers & Qt.ControlModifier))) {
                         root.removeFileFromListByIndex(fileItem.index)
@@ -72,27 +70,27 @@ Flow {
                 }
             }
 
-            Platform.Menu {
+            Menu {
                 id: contextMenu
 
-                Platform.MenuItem {
-                    text: qsTr("Open in Qt Creator")
+                MenuItem {
+                    text: "Open in Qt Creator"
                     onTriggered: fileItem.openFileInEditor()
                 }
 
-                Platform.MenuItem {
-                    text: qsTr("Open in External Editor")
+                MenuItem {
+                    text: "Open in External Editor"
                     onTriggered: fileItem.openFileInExternalEditor()
                 }
 
-                Platform.MenuSeparator {}
+                MenuSeparator {}
 
-                Platform.MenuItem {
-                    text: qsTr("Remove")
+                MenuItem {
+                    text: "Remove"
                     onTriggered: root.removeFileFromListByIndex(fileItem.index)
                 }
             }
-
+            
             Row {
                 id: contentRow
 
@@ -109,31 +107,31 @@ Flow {
                     sourceSize.width: 8
                     sourceSize.height: 15
                 }
-
+                
                 Text {
                     id: fileNameText
-
+                    
                     anchors.verticalCenter: parent.verticalCenter
                     color: palette.buttonText
-
+                    
                     text: {
                         const parts = modelData.split('/');
                         return parts[parts.length - 1];
                     }
                 }
-
+                
                 MouseArea {
                     id: closeButton
-
+                    
                     anchors.verticalCenter: parent.verticalCenter
                     width: closeIcon.width + 5
                     height: closeButton.width + 5
-
+                    
                     onClicked: root.removeFileFromListByIndex(index)
-
+                    
                     Image {
                         id: closeIcon
-
+                        
                         anchors.centerIn: parent
                         source: palette.window.hslLightness > 0.5 ? "qrc:/qt/qml/ChatView/icons/close-dark.svg"
                                                                   : "qrc:/qt/qml/ChatView/icons/close-light.svg"

ChatView/qml/controls/BottomBar.qml

@@ -1,6 +1,5 @@
 // Copyright (C) 2024-2026 Petr Mironychev
 // SPDX-License-Identifier: GPL-3.0-or-later
-// Additional attribution terms under GPLv3 §7(b) apply — see LICENSE
 
 import QtQuick
 import QtQuick.Controls
@@ -20,10 +19,6 @@ Rectangle {
     property alias cancelCompressButton: cancelCompressButtonId
 
     property bool isCompressing: false
-    property bool isProcessing: false
-    property bool canCompress: true
-    property bool canSend: true
-    property alias sendButtonTooltip: sendButtonTooltipId
 
     color: palette.window.hslLightness > 0.5 ?
                Qt.darker(palette.window, 1.1) :
@@ -50,12 +45,9 @@ Rectangle {
                 height: 15
                 width: 8
             }
-
-            QoAToolTip {
-                visible: attachFilesId.hovered
-                delay: 250
-                text: qsTr("Attach file to message")
-            }
+            ToolTip.visible: hovered
+            ToolTip.delay: 250
+            ToolTip.text: qsTr("Attach file to message")
         }
 
         QoAButton {
@@ -66,12 +58,9 @@ Rectangle {
                 height: 15
                 width: 15
             }
-
-            QoAToolTip {
-                visible: attachImagesId.hovered
-                delay: 250
-                text: qsTr("Attach image to message")
-            }
+            ToolTip.visible: hovered
+            ToolTip.delay: 250
+            ToolTip.text: qsTr("Attach image to message")
         }
 
         QoAButton {
@@ -82,12 +71,9 @@ Rectangle {
                 height: 15
                 width: 8
             }
-
-            QoAToolTip {
-                visible: linkFilesId.hovered
-                delay: 250
-                text: qsTr("Link file to context")
-            }
+            ToolTip.visible: hovered
+            ToolTip.delay: 250
+            ToolTip.text: qsTr("Link file to context")
         }
 
         CheckBox {
@@ -95,10 +81,8 @@ Rectangle {
 
             text: qsTr("Sync open files")
 
-            QoAToolTip {
-                visible: syncOpenFilesId.hovered
-                text: qsTr("Automatically synchronize currently opened files with the model context")
-            }
+            ToolTip.visible: syncOpenFilesId.hovered
+            ToolTip.text: qsTr("Automatically synchronize currently opened files with the model context")
         }
 
         Item {
@@ -111,7 +95,7 @@ Rectangle {
             visible: root.isCompressing
             spacing: 6
 
-            QoABusyIndicator {
+            BusyIndicator {
                 id: compressBusyIndicator
 
                 anchors.verticalCenter: parent.verticalCenter
@@ -133,88 +117,37 @@ Rectangle {
                 anchors.verticalCenter: parent.verticalCenter
                 text: qsTr("Cancel")
 
-                QoAToolTip {
-                    visible: cancelCompressButtonId.hovered
-                    delay: 250
-                    text: qsTr("Cancel compression")
-                }
+                ToolTip.visible: hovered
+                ToolTip.delay: 250
+                ToolTip.text: qsTr("Cancel compression")
             }
         }
 
-        Item {
-            id: compressButtonContainer
+        QoAButton {
+            id: compressButtonId
 
             visible: !root.isCompressing
-            implicitWidth: compressButtonId.implicitWidth
-            implicitHeight: compressButtonId.implicitHeight
+            text: qsTr("Compress")
 
-            QoAButton {
-                id: compressButtonId
-
-                anchors.fill: parent
-                enabled: root.canCompress
-                text: qsTr("Compress")
-
-                icon {
-                    source: "qrc:/qt/qml/ChatView/icons/compress-icon.svg"
-                    height: 15
-                    width: 15
-                }
-            }
-
-            HoverHandler {
-                id: compressHoverHandler
-            }
-
-            QoAToolTip {
-                visible: compressHoverHandler.hovered
-                delay: 250
-                text: root.canCompress
-                      ? qsTr("Compress chat (create summarized copy using LLM)")
-                      : qsTr("Assign a compression agent in the Pipelines settings")
+            icon {
+                source: "qrc:/qt/qml/ChatView/icons/compress-icon.svg"
+                height: 15
+                width: 15
             }
+            ToolTip.visible: hovered
+            ToolTip.delay: 250
+            ToolTip.text: qsTr("Compress chat (create summarized copy using LLM)")
         }
 
-        Item {
-            id: sendButtonContainer
+        QoAButton {
+            id: sendButtonId
 
-            implicitWidth: sendButtonId.implicitWidth
-            implicitHeight: sendButtonId.implicitHeight
-
-            QoAButton {
-                id: sendButtonId
-
-                anchors.fill: parent
-                enabled: root.isProcessing || root.canSend
-                leftPadding: root.isProcessing ? 22 : 4
-
-                icon {
-                    height: 15
-                    width: 15
-                }
-
-                QoABusyIndicator {
-                    id: sendBusyIndicator
-
-                    anchors.left: parent.left
-                    anchors.leftMargin: 5
-                    anchors.verticalCenter: parent.verticalCenter
-                    width: 14
-                    height: 14
-                    running: root.isProcessing
-                }
-            }
-
-            HoverHandler {
-                id: sendHoverHandler
-            }
-
-            QoAToolTip {
-                id: sendButtonTooltipId
-
-                visible: sendHoverHandler.hovered
-                delay: 250
+            icon {
+                height: 15
+                width: 15
             }
+            ToolTip.visible: hovered
+            ToolTip.delay: 250
         }
     }
 }

ChatView/qml/controls/ContextViewer.qml

@@ -0,0 +1,542 @@
+// Copyright (C) 2025-2026 Petr Mironychev
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtQuick.Controls.Basic as QQC
+
+import UIControls
+import ChatView
+
+Popup {
+    id: root
+
+    property string baseSystemPrompt
+    property string currentAgentRole
+    property string currentAgentRoleDescription
+    property string currentAgentRoleSystemPrompt
+    property var activeRules
+    property int activeRulesCount
+    property string selectedRuleContent
+
+    signal openSettings()
+    signal openAgentRolesSettings()
+    signal openRulesFolder()
+    signal refreshRules()
+    signal ruleSelected(int index)
+
+    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: 8
+
+        RowLayout {
+            Layout.fillWidth: true
+            spacing: 10
+
+            Text {
+                text: qsTr("Chat Context")
+                font.pixelSize: 16
+                font.bold: true
+                color: palette.text
+                Layout.fillWidth: true
+            }
+
+            QoAButton {
+                text: qsTr("Refresh")
+                onClicked: root.refreshRules()
+            }
+
+            QoAButton {
+                text: qsTr("Close")
+                onClicked: root.close()
+            }
+        }
+
+        Rectangle {
+            Layout.fillWidth: true
+            height: 1
+            color: palette.mid
+        }
+
+        Flickable {
+            id: mainFlickable
+
+            Layout.fillWidth: true
+            Layout.fillHeight: true
+            contentHeight: sectionsColumn.implicitHeight
+            clip: true
+            boundsBehavior: Flickable.StopAtBounds
+
+            ColumnLayout {
+                id: sectionsColumn
+
+                width: mainFlickable.width
+                spacing: 8
+
+                CollapsibleSection {
+                    id: systemPromptSection
+
+                    Layout.fillWidth: true
+                    title: qsTr("Base System Prompt")
+                    badge: root.baseSystemPrompt.length > 0 ? qsTr("Active") : qsTr("Empty")
+                    badgeColor: root.baseSystemPrompt.length > 0 ? Qt.rgba(0.2, 0.6, 0.3, 1.0) : palette.mid
+
+                    sectionContent: ColumnLayout {
+                        spacing: 5
+
+                        Rectangle {
+                            Layout.fillWidth: true
+                            Layout.preferredHeight: Math.min(Math.max(systemPromptText.implicitHeight + 16, 50), 200)
+                            color: palette.base
+                            border.color: palette.mid
+                            border.width: 1
+                            radius: 2
+
+                            Flickable {
+                                id: systemPromptFlickable
+
+                                anchors.fill: parent
+                                anchors.margins: 8
+                                contentHeight: systemPromptText.implicitHeight
+                                clip: true
+                                boundsBehavior: Flickable.StopAtBounds
+
+                                TextEdit {
+                                    id: systemPromptText
+
+                                    width: systemPromptFlickable.width
+                                    text: root.baseSystemPrompt.length > 0 ? root.baseSystemPrompt : qsTr("No system prompt configured")
+                                    readOnly: true
+                                    selectByMouse: true
+                                    wrapMode: Text.WordWrap
+                                    color: root.baseSystemPrompt.length > 0 ? palette.text : palette.mid
+                                    font.family: "monospace"
+                                    font.pixelSize: 11
+                                }
+
+                                QQC.ScrollBar.vertical: QQC.ScrollBar {
+                                    policy: systemPromptFlickable.contentHeight > systemPromptFlickable.height ? QQC.ScrollBar.AsNeeded : QQC.ScrollBar.AlwaysOff
+                                }
+                            }
+                        }
+
+                        RowLayout {
+                            Layout.fillWidth: true
+
+                            Item { Layout.fillWidth: true }
+
+                            QoAButton {
+                                text: qsTr("Copy")
+                                enabled: root.baseSystemPrompt.length > 0
+                                onClicked: utils.copyToClipboard(root.baseSystemPrompt)
+                            }
+
+                            QoAButton {
+                                text: qsTr("Edit in Settings")
+                                onClicked: {
+                                    root.openSettings()
+                                    root.close()
+                                }
+                            }
+                        }
+                    }
+                }
+
+                CollapsibleSection {
+                    id: agentRoleSection
+
+                    Layout.fillWidth: true
+                    title: qsTr("Agent Role")
+                    badge: root.currentAgentRole
+                    badgeColor: root.currentAgentRoleSystemPrompt.length > 0 ? Qt.rgba(0.3, 0.4, 0.7, 1.0) : palette.mid
+
+                    sectionContent: ColumnLayout {
+                        spacing: 8
+
+                        Text {
+                            text: root.currentAgentRoleDescription
+                            font.pixelSize: 11
+                            font.italic: true
+                            color: palette.mid
+                            wrapMode: Text.WordWrap
+                            Layout.fillWidth: true
+                            visible: root.currentAgentRoleDescription.length > 0
+                        }
+
+                        Rectangle {
+                            Layout.fillWidth: true
+                            Layout.preferredHeight: Math.min(Math.max(agentPromptText.implicitHeight + 16, 50), 200)
+                            color: palette.base
+                            border.color: palette.mid
+                            border.width: 1
+                            radius: 2
+                            visible: root.currentAgentRoleSystemPrompt.length > 0
+
+                            Flickable {
+                                id: agentPromptFlickable
+
+                                anchors.fill: parent
+                                anchors.margins: 8
+                                contentHeight: agentPromptText.implicitHeight
+                                clip: true
+                                boundsBehavior: Flickable.StopAtBounds
+
+                                TextEdit {
+                                    id: agentPromptText
+
+                                    width: agentPromptFlickable.width
+                                    text: root.currentAgentRoleSystemPrompt
+                                    readOnly: true
+                                    selectByMouse: true
+                                    wrapMode: Text.WordWrap
+                                    color: palette.text
+                                    font.family: "monospace"
+                                    font.pixelSize: 11
+                                }
+
+                                QQC.ScrollBar.vertical: QQC.ScrollBar {
+                                    policy: agentPromptFlickable.contentHeight > agentPromptFlickable.height ? QQC.ScrollBar.AsNeeded : QQC.ScrollBar.AlwaysOff
+                                }
+                            }
+                        }
+
+                        Text {
+                            text: qsTr("No role selected. Using base system prompt only.")
+                            font.pixelSize: 11
+                            color: palette.mid
+                            wrapMode: Text.WordWrap
+                            Layout.fillWidth: true
+                            visible: root.currentAgentRoleSystemPrompt.length === 0
+                        }
+
+                        RowLayout {
+                            Layout.fillWidth: true
+
+                            Item { Layout.fillWidth: true }
+
+                            QoAButton {
+                                text: qsTr("Copy")
+                                enabled: root.currentAgentRoleSystemPrompt.length > 0
+                                onClicked: utils.copyToClipboard(root.currentAgentRoleSystemPrompt)
+                            }
+
+                            QoAButton {
+                                text: qsTr("Manage Roles")
+                                onClicked: {
+                                    root.openAgentRolesSettings()
+                                    root.close()
+                                }
+                            }
+                        }
+                    }
+                }
+
+                CollapsibleSection {
+                    id: projectRulesSection
+
+                    Layout.fillWidth: true
+                    title: qsTr("Project Rules")
+                    badge: root.activeRulesCount > 0 ? qsTr("%1 active").arg(root.activeRulesCount) : qsTr("None")
+                    badgeColor: root.activeRulesCount > 0 ? Qt.rgba(0.6, 0.5, 0.2, 1.0) : palette.mid
+
+                    sectionContent: ColumnLayout {
+                        spacing: 8
+
+                        SplitView {
+                            Layout.fillWidth: true
+                            Layout.preferredHeight: 220
+                            orientation: Qt.Horizontal
+                            visible: root.activeRulesCount > 0
+
+                            Rectangle {
+                                SplitView.minimumWidth: 120
+                                SplitView.preferredWidth: 180
+                                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 (%1)").arg(rulesList.count)
+                                        font.pixelSize: 11
+                                        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
+                                        boundsBehavior: Flickable.StopAtBounds
+
+                                        delegate: ItemDelegate {
+                                            required property var modelData
+                                            required property int index
+
+                                            width: ListView.view.width
+                                            height: ruleItemContent.implicitHeight + 8
+                                            highlighted: ListView.isCurrentItem
+
+                                            background: Rectangle {
+                                                color: {
+                                                    if (parent.highlighted)
+                                                        return palette.highlight
+                                                    if (parent.hovered)
+                                                        return Qt.tint(palette.base, Qt.rgba(0, 0, 0, 0.05))
+                                                    return "transparent"
+                                                }
+                                                radius: 2
+                                            }
+
+                                            contentItem: ColumnLayout {
+                                                id: ruleItemContent
+                                                spacing: 2
+
+                                                Text {
+                                                    text: modelData.fileName
+                                                    font.pixelSize: 10
+                                                    color: parent.parent.highlighted ? palette.highlightedText : palette.text
+                                                    elide: Text.ElideMiddle
+                                                    Layout.fillWidth: true
+                                                }
+
+                                                Text {
+                                                    text: modelData.category
+                                                    font.pixelSize: 9
+                                                    color: parent.parent.highlighted ? palette.highlightedText : palette.mid
+                                                    Layout.fillWidth: true
+                                                }
+                                            }
+
+                                            onClicked: {
+                                                rulesList.currentIndex = index
+                                                root.ruleSelected(index)
+                                            }
+                                        }
+
+                                        QQC.ScrollBar.vertical: QQC.ScrollBar {
+                                            policy: rulesList.contentHeight > rulesList.height ? QQC.ScrollBar.AsNeeded : QQC.ScrollBar.AlwaysOff
+                                        }
+                                    }
+                                }
+                            }
+
+                            Rectangle {
+                                SplitView.fillWidth: true
+                                SplitView.minimumWidth: 200
+                                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: 11
+                                            font.bold: true
+                                            color: palette.text
+                                            Layout.fillWidth: true
+                                        }
+
+                                        QoAButton {
+                                            text: qsTr("Copy")
+                                            enabled: root.selectedRuleContent.length > 0
+                                            onClicked: utils.copyToClipboard(root.selectedRuleContent)
+                                        }
+                                    }
+
+                                    Flickable {
+                                        id: ruleContentFlickable
+
+                                        Layout.fillWidth: true
+                                        Layout.fillHeight: true
+                                        contentHeight: ruleContentArea.implicitHeight
+                                        clip: true
+                                        boundsBehavior: Flickable.StopAtBounds
+
+                                        TextEdit {
+                                            id: ruleContentArea
+
+                                            width: ruleContentFlickable.width
+                                            text: root.selectedRuleContent
+                                            readOnly: true
+                                            selectByMouse: true
+                                            wrapMode: Text.WordWrap
+                                            selectionColor: palette.highlight
+                                            color: palette.text
+                                            font.family: "monospace"
+                                            font.pixelSize: 11
+                                        }
+
+                                        QQC.ScrollBar.vertical: QQC.ScrollBar {
+                                            policy: ruleContentFlickable.contentHeight > ruleContentFlickable.height ? QQC.ScrollBar.AsNeeded : QQC.ScrollBar.AlwaysOff
+                                        }
+                                    }
+                                }
+                            }
+                        }
+
+                        Text {
+                            text: qsTr("No project rules found.\nCreate .md files in .qodeassist/rules/common/ or .qodeassist/rules/chat/")
+                            font.pixelSize: 11
+                            color: palette.mid
+                            wrapMode: Text.WordWrap
+                            horizontalAlignment: Text.AlignHCenter
+                            Layout.fillWidth: true
+                            visible: root.activeRulesCount === 0
+                        }
+
+                        RowLayout {
+                            Layout.fillWidth: true
+
+                            Item { Layout.fillWidth: true }
+
+                            QoAButton {
+                                text: qsTr("Open Rules Folder")
+                                onClicked: root.openRulesFolder()
+                            }
+                        }
+                    }
+                }
+            }
+
+            QQC.ScrollBar.vertical: QQC.ScrollBar {
+                policy: mainFlickable.contentHeight > mainFlickable.height ? QQC.ScrollBar.AsNeeded : QQC.ScrollBar.AlwaysOff
+            }
+        }
+
+        Rectangle {
+            Layout.fillWidth: true
+            height: 1
+            color: palette.mid
+        }
+
+        Text {
+            text: qsTr("Final prompt: Base System Prompt + Agent Role + Project Info + Project Rules + Linked Files")
+            font.pixelSize: 9
+            color: palette.mid
+            wrapMode: Text.WordWrap
+            Layout.fillWidth: true
+        }
+    }
+
+    component CollapsibleSection: ColumnLayout {
+        id: sectionRoot
+
+        property string title
+        property string badge
+        property color badgeColor: palette.mid
+        property Component sectionContent: null
+        property bool expanded: false
+
+        spacing: 0
+
+        Rectangle {
+            Layout.fillWidth: true
+            Layout.preferredHeight: 32
+            color: sectionMouseArea.containsMouse ? Qt.tint(palette.button, Qt.rgba(0, 0, 0, 0.05)) : palette.button
+            border.color: palette.mid
+            border.width: 1
+            radius: 2
+
+            MouseArea {
+                id: sectionMouseArea
+
+                anchors.fill: parent
+                hoverEnabled: true
+                cursorShape: Qt.PointingHandCursor
+                onClicked: sectionRoot.expanded = !sectionRoot.expanded
+            }
+
+            RowLayout {
+                anchors.fill: parent
+                anchors.leftMargin: 8
+                anchors.rightMargin: 8
+                spacing: 8
+
+                Text {
+                    text: sectionRoot.expanded ? "▼" : "▶"
+                    font.pixelSize: 10
+                    color: palette.text
+                }
+
+                Text {
+                    text: sectionRoot.title
+                    font.pixelSize: 12
+                    font.bold: true
+                    color: palette.text
+                    Layout.fillWidth: true
+                }
+
+                Rectangle {
+                    implicitWidth: badgeText.implicitWidth + 12
+                    implicitHeight: 18
+                    color: sectionRoot.badgeColor
+                    radius: 3
+
+                    Text {
+                        id: badgeText
+
+                        anchors.centerIn: parent
+                        text: sectionRoot.badge
+                        font.pixelSize: 10
+                        color: "#FFFFFF"
+                    }
+                }
+            }
+        }
+
+        Loader {
+            id: contentLoader
+
+            Layout.fillWidth: true
+            Layout.leftMargin: 12
+            Layout.topMargin: 8
+            Layout.bottomMargin: 4
+            sourceComponent: sectionRoot.sectionContent
+            visible: sectionRoot.expanded
+            active: sectionRoot.expanded
+        }
+    }
+
+    onOpened: {
+        if (root.activeRulesCount > 0) {
+            root.ruleSelected(0)
+        }
+    }
+}

ChatView/qml/controls/FileEditsActionBar.qml

@@ -1,6 +1,5 @@
 // Copyright (C) 2025-2026 Petr Mironychev
 // SPDX-License-Identifier: GPL-3.0-or-later
-// Additional attribution terms under GPLv3 §7(b) apply — see LICENSE
 
 import QtQuick
 import QtQuick.Controls
@@ -118,14 +117,12 @@ Rectangle {
             text: root.hasPendingEdits 
                 ? qsTr("Apply All (%1)").arg(root.pendingEdits + root.rejectedEdits)
                 : qsTr("Reapply All (%1)").arg(root.rejectedEdits)
-
-            QoAToolTip {
-                visible: applyAllButton.hovered
-                delay: 250
-                text: root.hasPendingEdits
-                    ? qsTr("Apply all pending and rejected edits in this message")
-                    : qsTr("Reapply all rejected edits in this message")
-            }
+            
+            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()
         }
@@ -136,12 +133,10 @@ Rectangle {
             visible: root.hasAppliedEdits
             enabled: root.hasAppliedEdits
             text: qsTr("Undo All (%1)").arg(root.appliedEdits)
-
-            QoAToolTip {
-                visible: undoAllButton.hovered
-                delay: 250
-                text: qsTr("Undo all applied edits in this message")
-            }
+            
+            ToolTip.visible: hovered
+            ToolTip.delay: 250
+            ToolTip.text: qsTr("Undo all applied edits in this message")
 
             onClicked: root.undoAllClicked()
         }

ChatView/qml/controls/FileMentionPopup.qml

@@ -1,6 +1,5 @@
 // Copyright (C) 2026 Petr Mironychev
 // SPDX-License-Identifier: GPL-3.0-or-later
-// Additional attribution terms under GPLv3 §7(b) apply — see LICENSE
 
 import QtQuick
 import QtQuick.Controls

ChatView/qml/controls/MessageNavigator.qml

@@ -1,188 +0,0 @@
-// Copyright (C) 2024-2026 Petr Mironychev
-// SPDX-License-Identifier: GPL-3.0-or-later
-// Additional attribution terms under GPLv3 §7(b) apply — see LICENSE
-
-import QtQuick
-import QtQuick.Controls
-import ChatView
-import UIControls
-
-Item {
-    id: nav
-
-    property var chatModel
-    property var entries: []
-    property color dotColor: "#92BD6C"
-    property int currentMessageIndex: -1
-
-    readonly property int dotCount: entries.length
-    readonly property int verticalPadding: 8
-    readonly property int minDotSpacing: 18
-    readonly property real availableHeight: Math.max(0, height - 2 * verticalPadding)
-    readonly property real naturalHeight: dotCount > 1 ? (dotCount - 1) * minDotSpacing : 0
-    readonly property bool needsScrolling: naturalHeight > availableHeight
-    readonly property real contentHeight: needsScrolling
-        ? naturalHeight + 2 * verticalPadding
-        : Math.max(height, 2 * verticalPadding)
-
-    signal messageClicked(int messageIndex)
-
-    implicitWidth: 16
-
-    function rebuild() {
-        entries = chatModel ? chatModel.userMessagePreviews(80) : []
-        Qt.callLater(scrollCurrentIntoView)
-    }
-
-    function updateCurrentFromModelIndex(modelIdx) {
-        if (modelIdx < 0) {
-            currentMessageIndex = -1
-            return
-        }
-        let best = -1
-        for (let i = 0; i < entries.length; ++i) {
-            const e = entries[i]
-            if (!e)
-                continue
-            const mi = e.messageIndex
-            if (mi <= modelIdx)
-                best = mi
-            else
-                break
-        }
-        currentMessageIndex = best
-    }
-
-    function uiIndexOf(messageIndex) {
-        for (let i = 0; i < entries.length; ++i) {
-            const e = entries[i]
-            if (e && e.messageIndex === messageIndex)
-                return i
-        }
-        return -1
-    }
-
-    function dotCenterY(uiIndex) {
-        const count = dotCount
-        if (count <= 1)
-            return contentHeight / 2
-        const spacing = needsScrolling
-            ? minDotSpacing
-            : availableHeight / (count - 1)
-        return verticalPadding + spacing * uiIndex
-    }
-
-    function scrollCurrentIntoView() {
-        if (!needsScrolling || currentMessageIndex < 0)
-            return
-        const ui = uiIndexOf(currentMessageIndex)
-        if (ui < 0)
-            return
-        const y = dotCenterY(ui)
-        const margin = 24
-        if (y < flick.contentY + margin)
-            flick.contentY = Math.max(0, y - margin)
-        else if (y > flick.contentY + flick.height - margin)
-            flick.contentY = Math.min(
-                Math.max(0, flick.contentHeight - flick.height),
-                y - flick.height + margin)
-    }
-
-    onChatModelChanged: rebuild()
-    onCurrentMessageIndexChanged: scrollCurrentIntoView()
-    Component.onCompleted: rebuild()
-
-    Connections {
-        target: nav.chatModel
-        ignoreUnknownSignals: true
-        function onRowsInserted() { nav.rebuild() }
-        function onRowsRemoved() { nav.rebuild() }
-        function onModelReset() { nav.rebuild() }
-        function onModelReseted() { nav.rebuild() }
-        function onDataChanged() { nav.rebuild() }
-    }
-
-    Flickable {
-        id: flick
-
-        anchors.fill: parent
-        contentWidth: width
-        contentHeight: nav.contentHeight
-        interactive: nav.needsScrolling
-        clip: true
-        boundsBehavior: Flickable.StopAtBounds
-
-        Rectangle {
-            id: spine
-
-            visible: nav.dotCount > 1
-            anchors.horizontalCenter: parent.horizontalCenter
-            y: nav.verticalPadding
-            width: 1
-            height: Math.max(0, flick.contentHeight - 2 * nav.verticalPadding)
-            color: palette.mid
-            opacity: 0.4
-        }
-
-        Repeater {
-            model: nav.entries
-
-            delegate: Item {
-                id: dotItem
-
-                required property var modelData
-                required property int index
-
-                readonly property int msgIndex: modelData && modelData.messageIndex !== undefined
-                                                ? modelData.messageIndex : -1
-                readonly property string preview: modelData && modelData.preview !== undefined
-                                                  ? modelData.preview : ""
-                readonly property bool isCurrent: nav.currentMessageIndex === msgIndex
-
-                width: 16
-                height: 14
-                anchors.horizontalCenter: parent.horizontalCenter
-                y: nav.dotCenterY(index) - height / 2
-
-                Rectangle {
-                    id: dot
-
-                    anchors.centerIn: parent
-                    width: dotItem.isCurrent ? 11 : (dotArea.containsMouse ? 10 : 7)
-                    height: width
-                    radius: width / 2
-                    color: dotArea.containsMouse
-                           ? Qt.lighter(nav.dotColor, 1.2)
-                           : nav.dotColor
-                    border.color: dotItem.isCurrent
-                                  ? Qt.darker(nav.dotColor, 1.7)
-                                  : Qt.darker(nav.dotColor, 1.4)
-                    border.width: dotItem.isCurrent ? 2 : 1
-                    opacity: dotItem.isCurrent || dotArea.containsMouse ? 1.0 : 0.55
-
-                    Behavior on width { NumberAnimation { duration: 120 } }
-                    Behavior on opacity { NumberAnimation { duration: 120 } }
-                    Behavior on color { ColorAnimation { duration: 120 } }
-                }
-
-                MouseArea {
-                    id: dotArea
-
-                    anchors.fill: parent
-                    hoverEnabled: true
-                    cursorShape: Qt.PointingHandCursor
-                    onClicked: nav.messageClicked(dotItem.msgIndex)
-
-                    QoAToolTip {
-                        visible: dotArea.containsMouse
-                        delay: 350
-                        text: dotItem.preview.length > 0
-                              ? qsTr("#%1  ·  %2").arg(dotItem.index + 1).arg(dotItem.preview)
-                              : qsTr("Jump to message #%1").arg(dotItem.index + 1)
-                    }
-                }
-            }
-        }
-    }
-
-}

ChatView/qml/controls/SkillCommandPopup.qml

@@ -1,126 +0,0 @@
-// Copyright (C) 2026 Petr Mironychev
-// SPDX-License-Identifier: GPL-3.0-or-later
-// Additional attribution terms under GPLv3 §7(b) apply — see LICENSE
-
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Layouts
-
-Rectangle {
-    id: root
-
-    // Object exposing Q_INVOKABLE QVariantList searchSkills(query).
-    property var skillProvider: null
-    property var searchResults: []
-    property int currentIndex: 0
-
-    signal selectionRequested()
-
-    visible: searchResults.length > 0
-    height: Math.min(searchResults.length * 40, 40 * 6) + 2
-
-    color: palette.window
-    border.color: palette.mid
-    border.width: 1
-    radius: 4
-
-    function updateSearch(query) {
-        searchResults = skillProvider ? skillProvider.searchSkills(query) : []
-        currentIndex = 0
-    }
-
-    function dismiss() {
-        searchResults = []
-        currentIndex = 0
-    }
-
-    function moveUp() {
-        if (currentIndex > 0)
-            currentIndex--
-    }
-
-    function moveDown() {
-        if (currentIndex < searchResults.length - 1)
-            currentIndex++
-    }
-
-    function currentName() {
-        if (currentIndex >= 0 && currentIndex < searchResults.length)
-            return searchResults[currentIndex].name
-        return ""
-    }
-
-    onCurrentIndexChanged: listView.positionViewAtIndex(currentIndex, ListView.Contain)
-
-    ListView {
-        id: listView
-
-        anchors.fill: parent
-        anchors.margins: 1
-        model: root.searchResults
-        currentIndex: root.currentIndex
-        clip: true
-
-        ScrollBar.vertical: ScrollBar {
-            policy: ScrollBar.AsNeeded
-        }
-
-        delegate: Rectangle {
-            id: delegateItem
-
-            required property int index
-            required property var modelData
-
-            width: listView.width
-            height: 40
-            color: index === root.currentIndex
-                   ? palette.highlight
-                   : (hoverArea.containsMouse
-                      ? Qt.rgba(palette.highlight.r, palette.highlight.g, palette.highlight.b, 0.25)
-                      : "transparent")
-
-            ColumnLayout {
-                anchors.fill: parent
-                anchors.leftMargin: 10
-                anchors.rightMargin: 10
-                anchors.topMargin: 4
-                anchors.bottomMargin: 4
-                spacing: 1
-
-                Text {
-                    Layout.fillWidth: true
-                    text: "/" + delegateItem.modelData.name
-                    color: delegateItem.index === root.currentIndex
-                           ? palette.highlightedText
-                           : palette.text
-                    font.bold: true
-                    elide: Text.ElideRight
-                }
-
-                Text {
-                    Layout.fillWidth: true
-                    text: delegateItem.modelData.description
-                    color: delegateItem.index === root.currentIndex
-                           ? Qt.rgba(palette.highlightedText.r,
-                                     palette.highlightedText.g,
-                                     palette.highlightedText.b, 0.7)
-                           : palette.mid
-                    font.pixelSize: 11
-                    elide: Text.ElideRight
-                }
-            }
-
-            MouseArea {
-                id: hoverArea
-
-                anchors.fill: parent
-                hoverEnabled: true
-                onClicked: {
-                    root.currentIndex = delegateItem.index
-                    root.selectionRequested()
-                }
-                onEntered: root.currentIndex = delegateItem.index
-            }
-        }
-    }
-}

ChatView/qml/controls/SplitDropZone.qml

@@ -1,6 +1,5 @@
 // Copyright (C) 2025-2026 Petr Mironychev
 // SPDX-License-Identifier: GPL-3.0-or-later
-// Additional attribution terms under GPLv3 §7(b) apply — see LICENSE
 
 import QtQuick
 import QtQuick.Controls

ChatView/qml/controls/Toast.qml

@@ -1,6 +1,5 @@
 // Copyright (C) 2025-2026 Petr Mironychev
 // SPDX-License-Identifier: GPL-3.0-or-later
-// Additional attribution terms under GPLv3 §7(b) apply — see LICENSE
 
 import QtQuick
 

ChatView/qml/controls/TopBar.qml

@@ -1,6 +1,5 @@
 // Copyright (C) 2024-2026 Petr Mironychev
 // SPDX-License-Identifier: GPL-3.0-or-later
-// Additional attribution terms under GPLv3 §7(b) apply — see LICENSE
 
 import QtQuick
 import QtQuick.Layouts
@@ -11,20 +10,19 @@ import UIControls
 Rectangle {
     id: root
 
-    property bool isInEditor: false
-
     property alias saveButton: saveButtonId
     property alias loadButton: loadButtonId
     property alias clearButton: clearButtonId
-    property alias newChatButton: newChatButtonId
     property alias tokensBadge: tokensBadgeId
     property alias recentPath: recentPathId
     property alias openChatHistory: openChatHistoryId
     property alias pinButton: pinButtonId
-    property alias relocateButton: relocateButtonId
+    property alias contextButton: contextButtonId
+    property alias toolsButton: toolsButtonId
+    property alias thinkingMode: thinkingModeId
     property alias settingsButton: settingsButtonId
-    property alias agentSelector: agentSelectorId
-    property alias relocateTooltip: relocateTooltipId
+    property alias configSelector: configSelectorId
+    property alias roleSelector: roleSelector
 
     color: palette.window.hslLightness > 0.5 ?
                Qt.darker(palette.window, 1.1) :
@@ -57,98 +55,93 @@ Rectangle {
                     height: 15
                     width: 15
                 }
-
-                QoAToolTip {
-                    visible: pinButtonId.hovered
-                    delay: 250
-                    text: pinButtonId.checked ? qsTr("Unpin chat window")
-                                              : qsTr("Pin chat window to the top")
-                }
-            }
-
-            QoAButton {
-                id: relocateButtonId
-
-                anchors.verticalCenter: parent.verticalCenter
-
-                icon {
-                    source: "qrc:/qt/qml/ChatView/icons/open-in-editor.svg"
-                    color: palette.window.hslLightness > 0.5 ? "#000000" : "#FFFFFF"
-                    height: 15
-                    width: 15
-                }
-
-                QoAToolTip {
-                    id: relocateTooltipId
-
-                    visible: relocateButtonId.hovered
-                    delay: 250
-                }
-            }
-
-            QoASeparator {
-                anchors.verticalCenter: parent.verticalCenter
-            }
-
-            QoAButton {
-                id: clearButtonId
-
-                icon {
-                    source: "qrc:/qt/qml/ChatView/icons/clean-icon-dark.svg"
-                    height: 15
-                    width: 8
-                }
-
-                QoAToolTip {
-                    visible: clearButtonId.hovered
-                    delay: 250
-                    text: qsTr("Clean chat")
-                }
-            }
-
-            QoASeparator {
-                anchors.verticalCenter: parent.verticalCenter
-            }
-
-            QoAButton {
-                id: newChatButtonId
-
-                visible: root.isInEditor
-
-                icon {
-                    source: "qrc:/qt/qml/ChatView/icons/new-chat-icon.svg"
-                    color: palette.window.hslLightness > 0.5 ? "#000000" : "#FFFFFF"
-                    height: 15
-                    width: 15
-                }
-
-                QoAToolTip {
-                    visible: newChatButtonId.hovered
-                    delay: 250
-                    text: qsTr("Open new chat in a new tab")
-                }
+                ToolTip.visible: hovered
+                ToolTip.delay: 250
+                ToolTip.text: checked ? qsTr("Unpin chat window")
+                                      : qsTr("Pin chat window to the top")
             }
 
             QoAComboBox {
-                id: agentSelectorId
+                id: configSelectorId
 
                 implicitHeight: 25
 
                 model: []
                 currentIndex: 0
 
-                QoAToolTip {
-                    visible: agentSelectorId.hovered
-                    delay: 250
-                    text: qsTr("Select chat agent (provider and model come from the agent)")
-                }
+                ToolTip.visible: hovered
+                ToolTip.delay: 250
+                ToolTip.text: qsTr("Switch saved AI configuration")
             }
 
+            QoAComboBox {
+                id: roleSelector
+
+                implicitHeight: 25
+
+                model: []
+                currentIndex: 0
+
+                ToolTip.visible: hovered
+                ToolTip.delay: 250
+                ToolTip.text: qsTr("Switch agent role (different system prompts)")
+            }
         }
 
         Row {
             spacing: 10
 
+            QoAButton {
+                id: toolsButtonId
+
+                anchors.verticalCenter: parent.verticalCenter
+
+                checkable: true
+                opacity: enabled ? 1.0 : 0.2
+
+                icon {
+                    source: checked ? "qrc:/qt/qml/ChatView/icons/tools-icon-on.svg"
+                                    : "qrc:/qt/qml/ChatView/icons/tools-icon-off.svg"
+                    color: palette.window.hslLightness > 0.5 ? "#000000" : "#FFFFFF"
+                    height: 15
+                    width: 15
+                }
+
+                ToolTip.visible: hovered
+                ToolTip.delay: 250
+                ToolTip.text: {
+                    if (!toolsButtonId.enabled) {
+                        return qsTr("Tools are disabled in General Settings")
+                    }
+                    return checked
+                            ? qsTr("Tools enabled: AI can use tools to read files, search project, and build code")
+                            : qsTr("Tools disabled: 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")
+            }
+
             QoAButton {
                 id: settingsButtonId
 
@@ -161,11 +154,9 @@ Rectangle {
                     width: 15
                 }
 
-                QoAToolTip {
-                    visible: settingsButtonId.hovered
-                    delay: 250
-                    text: qsTr("Open Chat Assistant Settings")
-                }
+                ToolTip.visible: hovered
+                ToolTip.delay: 250
+                ToolTip.text: qsTr("Open Chat Assistant Settings")
             }
 
             QoASeparator {
@@ -191,11 +182,9 @@ Rectangle {
                     anchors.fill: parent
                     hoverEnabled: true
 
-                    QoAToolTip {
-                        visible: parent.containsMouse && recentPathId.text.length > 0
-                        text: recentPathId.text
-                        delay: 500
-                    }
+                    ToolTip.visible: containsMouse
+                    ToolTip.delay: 500
+                    ToolTip.text: recentPathId.text
                 }
             }
         }
@@ -216,12 +205,9 @@ Rectangle {
                     height: 15
                     width: 8
                 }
-
-                QoAToolTip {
-                    visible: saveButtonId.hovered
-                    delay: 250
-                    text: qsTr("Save chat to *.json file")
-                }
+                ToolTip.visible: hovered
+                ToolTip.delay: 250
+                ToolTip.text: qsTr("Save chat to *.json file")
             }
 
             QoAButton {
@@ -232,12 +218,9 @@ Rectangle {
                     height: 15
                     width: 8
                 }
-
-                QoAToolTip {
-                    visible: loadButtonId.hovered
-                    delay: 250
-                    text: qsTr("Load chat from *.json file")
-                }
+                ToolTip.visible: hovered
+                ToolTip.delay: 250
+                ToolTip.text: qsTr("Load chat from *.json file")
             }
 
             QoAButton {
@@ -248,16 +231,28 @@ Rectangle {
                     height: 15
                     width: 15
                 }
-
-                QoAToolTip {
-                    visible: openChatHistoryId.hovered
-                    delay: 250
-                    text: qsTr("Show in system")
-                }
+                ToolTip.visible: hovered
+                ToolTip.delay: 250
+                ToolTip.text: qsTr("Show in system")
             }
 
             QoASeparator {}
 
+            QoAButton {
+                id: contextButtonId
+
+                icon {
+                    source: "qrc:/qt/qml/ChatView/icons/context-icon.svg"
+                    color: palette.window.hslLightness > 0.5 ? "#000000" : "#FFFFFF"
+                    height: 15
+                    width: 15
+                }
+
+                ToolTip.visible: hovered
+                ToolTip.delay: 250
+                ToolTip.text: qsTr("View chat context (system prompt, role, rules)")
+            }
+
             Badge {
                 id: tokensBadgeId
 
@@ -265,6 +260,21 @@ Rectangle {
                 ToolTip.delay: 250
                 ToolTip.text: qsTr("Current amount tokens in chat and LLM limit threshold")
             }
+
+            QoASeparator {}
+
+            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")
+            }
         }
     }
 }

CodeHandler.cpp

@@ -1,7 +1,6 @@
 // Copyright (C) 2024-2026 Petr Mironychev
 // Copyright (C) 2025 Povilas Kanapickas <povilas@radix.lt>
 // SPDX-License-Identifier: GPL-3.0-or-later
-// Additional attribution terms under GPLv3 §7(b) apply — see LICENSE
 
 #include "CodeHandler.hpp"
 #include <settings/CodeCompletionSettings.hpp>
@@ -209,4 +208,24 @@ QString CodeHandler::detectLanguageFromExtension(const QString &extension)
     return extensionToLanguage.value(extension.toLower(), "");
 }
 
+const QRegularExpression &CodeHandler::getFullCodeBlockRegex()
+{
+    static const QRegularExpression
+        regex(R"(```[\w\s]*\n([\s\S]*?)```)", QRegularExpression::MultilineOption);
+    return regex;
+}
+
+const QRegularExpression &CodeHandler::getPartialStartBlockRegex()
+{
+    static const QRegularExpression
+        regex(R"(```[\w\s]*\n([\s\S]*?)$)", QRegularExpression::MultilineOption);
+    return regex;
+}
+
+const QRegularExpression &CodeHandler::getPartialEndBlockRegex()
+{
+    static const QRegularExpression regex(R"(^([\s\S]*?)```)", QRegularExpression::MultilineOption);
+    return regex;
+}
+
 } // namespace QodeAssist

CodeHandler.hpp

@@ -1,6 +1,5 @@
 // Copyright (C) 2024-2026 Petr Mironychev
 // SPDX-License-Identifier: GPL-3.0-or-later
-// Additional attribution terms under GPLv3 §7(b) apply — see LICENSE
 
 #pragma once
 
@@ -32,6 +31,10 @@ public:
 
 private:
     static QString getCommentPrefix(const QString &language);
+
+    static const QRegularExpression &getFullCodeBlockRegex();
+    static const QRegularExpression &getPartialStartBlockRegex();
+    static const QRegularExpression &getPartialEndBlockRegex();
 };
 
 } // namespace QodeAssist

ConfigurationManager.cpp

@@ -0,0 +1,235 @@
+// Copyright (C) 2025-2026 Petr Mironychev
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#include "ConfigurationManager.hpp"
+
+#include <settings/ButtonAspect.hpp>
+#include <QTimer>
+
+#include "QodeAssisttr.h"
+
+namespace QodeAssist {
+
+ConfigurationManager &ConfigurationManager::instance()
+{
+    static ConfigurationManager instance;
+    return instance;
+}
+
+void ConfigurationManager::init()
+{
+    setupConnections();
+    updateAllTemplateDescriptions();
+    checkAllTemplate();
+}
+
+void ConfigurationManager::updateTemplateDescription(const Utils::StringAspect &templateAspect)
+{
+    PluginLLMCore::PromptTemplate *templ = m_templateManger.getFimTemplateByName(templateAspect.value());
+
+    if (!templ) {
+        return;
+    }
+
+    if (&templateAspect == &m_generalSettings.ccTemplate) {
+        m_generalSettings.ccTemplateDescription.setValue(templ->description());
+    } else if (&templateAspect == &m_generalSettings.caTemplate) {
+        m_generalSettings.caTemplateDescription.setValue(templ->description());
+    } else if (&templateAspect == &m_generalSettings.qrTemplate) {
+        m_generalSettings.qrTemplateDescription.setValue(templ->description());
+    }
+}
+
+void ConfigurationManager::updateAllTemplateDescriptions()
+{
+    updateTemplateDescription(m_generalSettings.ccTemplate);
+    updateTemplateDescription(m_generalSettings.caTemplate);
+    updateTemplateDescription(m_generalSettings.qrTemplate);
+}
+
+void ConfigurationManager::checkTemplate(const Utils::StringAspect &templateAspect)
+{
+    PluginLLMCore::PromptTemplate *templ = m_templateManger.getFimTemplateByName(templateAspect.value());
+
+    if (templ->name() == templateAspect.value())
+        return;
+
+    if (&templateAspect == &m_generalSettings.ccTemplate) {
+        m_generalSettings.ccTemplate.setValue(templ->name());
+    } else if (&templateAspect == &m_generalSettings.caTemplate) {
+        m_generalSettings.caTemplate.setValue(templ->name());
+    }
+}
+
+void ConfigurationManager::checkAllTemplate()
+{
+    checkTemplate(m_generalSettings.ccTemplate);
+    checkTemplate(m_generalSettings.caTemplate);
+}
+
+ConfigurationManager::ConfigurationManager(QObject *parent)
+    : QObject(parent)
+    , m_generalSettings(Settings::generalSettings())
+    , m_providersManager(PluginLLMCore::ProvidersManager::instance())
+    , m_templateManger(PluginLLMCore::PromptTemplateManager::instance())
+{}
+
+void ConfigurationManager::setupConnections()
+{
+    using Config = ConfigurationManager;
+    using Button = ButtonAspect;
+
+    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);
+    connect(&m_generalSettings.ccPreset1SetUrl, &Button::clicked, this, &Config::selectUrl);
+    connect(&m_generalSettings.ccPreset1SelectModel, &Button::clicked, this, &Config::selectModel);
+    connect(
+        &m_generalSettings.ccPreset1SelectTemplate, &Button::clicked, this, &Config::selectTemplate);
+
+    connect(&m_generalSettings.ccTemplate, &Utils::StringAspect::changed, this, [this]() {
+        updateTemplateDescription(m_generalSettings.ccTemplate);
+    });
+
+    connect(&m_generalSettings.caTemplate, &Utils::StringAspect::changed, this, [this]() {
+        updateTemplateDescription(m_generalSettings.caTemplate);
+    });
+
+    connect(&m_generalSettings.qrTemplate, &Utils::StringAspect::changed, this, [this]() {
+        updateTemplateDescription(m_generalSettings.qrTemplate);
+    });
+}
+
+void ConfigurationManager::selectProvider()
+{
+    const auto providersList = m_providersManager.providersNames();
+
+    auto *settingsButton = qobject_cast<ButtonAspect *>(sender());
+    if (!settingsButton)
+        return;
+
+    auto &targetSettings = (settingsButton == &m_generalSettings.ccSelectProvider)
+                               ? 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] {
+        m_generalSettings.showSelectionDialog(
+            providersList, targetSettings, Tr::tr("Select LLM Provider"), Tr::tr("Providers:"));
+    });
+}
+
+void ConfigurationManager::selectModel()
+{
+    auto *settingsButton = qobject_cast<ButtonAspect *>(sender());
+    if (!settingsButton)
+        return;
+
+    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)) {
+        if (!provider->capabilities().testFlag(PluginLLMCore::ProviderCapability::ModelListing)) {
+            m_generalSettings.showModelsNotSupportedDialog(*targetSettings);
+            return;
+        }
+
+        provider->getInstalledModels(providerUrl)
+            .then(this, [this, targetSettings](const QList<QString> &modelList) {
+                if (modelList.isEmpty()) {
+                    m_generalSettings.showModelsNotFoundDialog(*targetSettings);
+                    return;
+                }
+                m_generalSettings.showSelectionDialog(
+                    modelList, *targetSettings, Tr::tr("Select LLM Model"), Tr::tr("Models:"));
+            });
+    }
+}
+
+void ConfigurationManager::selectTemplate()
+{
+    auto *settingsButton = qobject_cast<ButtonAspect *>(sender());
+    if (!settingsButton)
+        return;
+
+    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();
+
+    const auto templateList = isCodeCompletion || isPreset1
+                                  ? m_templateManger.getFimTemplatesForProvider(providerID)
+                                  : m_templateManger.getChatTemplatesForProvider(providerID);
+
+    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]() {
+        m_generalSettings.showSelectionDialog(
+            templateList, targetSettings, Tr::tr("Select Template"), Tr::tr("Templates:"));
+    });
+}
+
+void ConfigurationManager::selectUrl()
+{
+    auto *settingsButton = qobject_cast<ButtonAspect *>(sender());
+    if (!settingsButton)
+        return;
+
+    QStringList urls;
+    for (const auto &name : m_providersManager.providersNames()) {
+        const auto url = m_providersManager.getProviderByName(name)->url();
+        if (!urls.contains(url))
+            urls.append(url);
+    }
+
+    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]() {
+        m_generalSettings.showUrlSelectionDialog(targetSettings, urls);
+    });
+}
+
+} // namespace QodeAssist

ConfigurationManager.hpp

@@ -0,0 +1,47 @@
+// Copyright (C) 2025-2026 Petr Mironychev
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#pragma once
+
+#include <QObject>
+
+#include "pluginllmcore/PromptTemplateManager.hpp"
+#include "pluginllmcore/ProvidersManager.hpp"
+#include "settings/GeneralSettings.hpp"
+
+namespace QodeAssist {
+
+class ConfigurationManager : public QObject
+{
+    Q_OBJECT
+
+public:
+    static ConfigurationManager &instance();
+
+    void init();
+
+    void updateTemplateDescription(const Utils::StringAspect &templateAspect);
+    void updateAllTemplateDescriptions();
+    void checkTemplate(const Utils::StringAspect &templateAspect);
+    void checkAllTemplate();
+
+public slots:
+    void selectProvider();
+    void selectModel();
+    void selectTemplate();
+    void selectUrl();
+
+private:
+    explicit ConfigurationManager(QObject *parent = nullptr);
+    ~ConfigurationManager() = default;
+    ConfigurationManager(const ConfigurationManager &) = delete;
+    ConfigurationManager &operator=(const ConfigurationManager &) = delete;
+
+    Settings::GeneralSettings &m_generalSettings;
+    PluginLLMCore::ProvidersManager &m_providersManager;
+    PluginLLMCore::PromptTemplateManager &m_templateManger;
+
+    void setupConnections();
+};
+
+} // namespace QodeAssist

LICENSE

@@ -1,24 +1,3 @@
-===============================================================
-ADDITIONAL TERMS UNDER GPLv3 SECTION 7(b)
-===============================================================
-
-In accordance with Section 7(b) of the GNU General Public License v3.0,
-the following additional attribution term applies to QodeAssist:
-
-  You must preserve all author attributions, copyright notices, and the
-  project name "QodeAssist" in all copies and modified versions,
-  including in source file headers, the plugin metadata
-  (QodeAssist.json.in), and the About dialog or equivalent user-facing
-  identification. Modified versions must be clearly marked as different
-  from the original.
-
-This is a reasonable attribution requirement permitted under GPLv3
-§7(b) and §7(c). It supplements the notice-preservation obligations of
-§4 and §5.
-
-Copyright (C) 2024-2026 Petr Mironychev
-===============================================================
-
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 

LLMClientInterface.cpp

@@ -1,61 +1,39 @@
 // Copyright (C) 2024-2026 Petr Mironychev
 // SPDX-License-Identifier: GPL-3.0-or-later
-// Additional attribution terms under GPLv3 §7(b) apply — see LICENSE
 
 #include "LLMClientInterface.hpp"
 
 #include <LLMQore/BaseClient.hpp>
-#include <QDir>
-#include <QFileInfo>
 #include <QJsonDocument>
 #include <QNetworkAccessManager>
 #include <QNetworkReply>
 
-#include <projectexplorer/project.h>
-#include <projectexplorer/projectmanager.h>
-#include <utils/filepath.h>
-
-#include "sources/common/ContextData.hpp"
-#include <Agent.hpp>
-#include <AgentConfig.hpp>
-#include <AgentFactory.hpp>
-#include <AgentRouter.hpp>
-#include <ConversationHistory.hpp>
-#include <PluginBlocks.hpp>
-#include <Session.hpp>
-#include <SessionManager.hpp>
-#include <SystemPromptBuilder.hpp>
-
-#include <LLMQore/ContentBlocks.hpp>
-
-#include <memory>
-#include <vector>
-
 #include "CodeHandler.hpp"
 #include "context/DocumentContextReader.hpp"
 #include "context/Utils.hpp"
 #include "logger/Logger.hpp"
 #include "settings/CodeCompletionSettings.hpp"
 #include "settings/GeneralSettings.hpp"
-#include "sources/settings/PipelinesConfig.hpp"
+#include <pluginllmcore/RulesLoader.hpp>
 
 namespace QodeAssist {
 
 LLMClientInterface::LLMClientInterface(
     const Settings::GeneralSettings &generalSettings,
     const Settings::CodeCompletionSettings &completeSettings,
-    AgentFactory &agentFactory,
-    SessionManager &sessionManager,
+    PluginLLMCore::IProviderRegistry &providerRegistry,
+    PluginLLMCore::IPromptProvider *promptProvider,
     Context::IDocumentReader &documentReader,
     IRequestPerformanceLogger &performanceLogger)
     : m_generalSettings(generalSettings)
     , m_completeSettings(completeSettings)
-    , m_agentFactory(agentFactory)
-    , m_sessionManager(sessionManager)
+    , m_providerRegistry(providerRegistry)
+    , m_promptProvider(promptProvider)
     , m_documentReader(documentReader)
     , m_performanceLogger(performanceLogger)
     , m_contextManager(new Context::ContextManager(this))
-{}
+{
+}
 
 LLMClientInterface::~LLMClientInterface()
 {
@@ -72,56 +50,43 @@ void LLMClientInterface::startImpl()
     emit started();
 }
 
-void LLMClientInterface::onCompletionFinished(const QString &requestId)
+void LLMClientInterface::handleFullResponse(const QString &requestId, const QString &fullText)
 {
     auto it = m_activeRequests.find(requestId);
     if (it == m_activeRequests.end())
         return;
 
-    QString fullText;
-    if (Session *session = it.value().session) {
-        if (auto *history = session->history(); history && !history->isEmpty())
-            fullText = history->messages().back().text();
-    }
-    const QJsonObject originalRequest = it.value().originalRequest;
+    const RequestContext &ctx = it.value();
+    sendCompletionToClient(fullText, ctx.originalRequest, true);
 
-    sendCompletionToClient(fullText, originalRequest, true);
-    finishRequest(requestId);
+    m_activeRequests.erase(it);
+    m_performanceLogger.endTimeMeasurement(requestId);
 }
 
-void LLMClientInterface::onCompletionFailed(const QString &requestId, const QString &error)
+void LLMClientInterface::handleRequestFailed(const QString &requestId, const QString &error)
 {
     auto it = m_activeRequests.find(requestId);
     if (it == m_activeRequests.end())
         return;
 
+    const RequestContext &ctx = it.value();
+
     LOG_MESSAGE(QString("Request %1 failed: %2").arg(requestId, error));
 
+    // Send LSP error response to client
     QJsonObject response;
     response["jsonrpc"] = "2.0";
-    response[LanguageServerProtocol::idKey] = it.value().originalRequest["id"];
+    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));
-    finishRequest(requestId);
-}
-
-void LLMClientInterface::finishRequest(const QString &requestId)
-{
-    auto it = m_activeRequests.find(requestId);
-    if (it == m_activeRequests.end())
-        return;
-
-    Session *session = it.value().session;
+    
     m_activeRequests.erase(it);
     m_performanceLogger.endTimeMeasurement(requestId);
-
-    if (session)
-        m_sessionManager.release(session);
 }
 
 void LLMClientInterface::sendData(const QByteArray &data)
@@ -154,15 +119,26 @@ void LLMClientInterface::sendData(const QByteArray &data)
 
 void LLMClientInterface::handleCancelRequest()
 {
-    const auto requests = m_activeRequests;
-    m_activeRequests.clear();
-
-    for (auto it = requests.begin(); it != requests.end(); ++it) {
-        m_performanceLogger.endTimeMeasurement(it.key());
-        if (Session *session = it.value().session)
-            m_sessionManager.release(session);
+    QSet<PluginLLMCore::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->client(), 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");
 }
 
@@ -201,19 +177,34 @@ void LLMClientInterface::handleShutdown(const QJsonObject &request)
 
 void LLMClientInterface::handleTextDocumentDidOpen(const QJsonObject &request) {}
 
+void LLMClientInterface::handleInitialized(const QJsonObject &request)
+{
+    QJsonObject response;
+    response["jsonrpc"] = "2.0";
+    response["method"] = "initialized";
+    response["params"] = QJsonObject();
+
+    emit messageReceived(LanguageServerProtocol::JsonRpcMessage(response));
+}
+
+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);
@@ -230,103 +221,124 @@ void LLMClientInterface::handleCompletion(const QJsonObject &request)
         return;
     }
 
-    const QString agentName = pickCompletionAgent(filePath);
-    if (agentName.isEmpty()) {
-        QString error = QString("No code completion agent matches: %1").arg(filePath);
+    auto updatedContext = prepareContext(request, documentInfo);
+
+    bool isPreset1Active = m_contextManager->isSpecifyCompletion(documentInfo);
+
+    const auto providerName = !isPreset1Active ? m_generalSettings.ccProvider()
+                                               : m_generalSettings.ccPreset1Provider();
+    const auto modelName = !isPreset1Active ? m_generalSettings.ccModel()
+                                            : m_generalSettings.ccPreset1Model();
+    const auto url = !isPreset1Active ? m_generalSettings.ccUrl()
+                                      : m_generalSettings.ccPreset1Url();
+
+    const auto provider = m_providerRegistry.getProviderByName(providerName);
+
+    if (!provider) {
+        QString error = QString("No provider found with name: %1").arg(providerName);
         LOG_MESSAGE(error);
         sendErrorResponse(request, error);
         return;
     }
 
-    QString sessionError;
-    Session *session = m_sessionManager.acquire(agentName, &sessionError);
-    if (!session) {
-        LOG_MESSAGE(sessionError);
-        sendErrorResponse(request, sessionError);
-        return;
-    }
+    auto templateName = !isPreset1Active ? m_generalSettings.ccTemplate()
+                                         : m_generalSettings.ccPreset1Template();
 
-    Templates::ContextRenderer::Bindings bindings;
-    if (auto *project = ProjectExplorer::ProjectManager::projectForFile(
-            Utils::FilePath::fromString(filePath)))
-        bindings.projectDir = project->projectDirectory().toFSPathString();
-    bindings.configDir = AgentFactory::userConfigDir();
-    bindings.language = CodeHandler::detectLanguageFromExtension(QFileInfo(filePath).suffix());
-    session->setContextBindings(bindings);
+    auto promptTemplate = m_promptProvider->getTemplateByName(templateName);
 
-    Templates::ContextData context = prepareContext(request, documentInfo);
-
-    QString editorContext;
-    if (context.fileContext.has_value())
-        editorContext.append(context.fileContext.value());
-
-    if (m_completeSettings.useOpenFilesContext())
-        editorContext.append(m_contextManager->openedFilesContext({filePath}));
-
-    if (!editorContext.isEmpty())
-        session->systemPrompt()->setLayer(QStringLiteral("completion.context"), editorContext);
-
-    connect(
-        session,
-        &Session::finished,
-        this,
-        [this, session](const LLMQore::RequestID &, const QString &) {
-            onCompletionFinished(requestIdForSession(session));
-        });
-    connect(
-        session,
-        &Session::failed,
-        this,
-        [this, session](const LLMQore::RequestID &, const QodeAssist::ErrorInfo &error) {
-            onCompletionFailed(requestIdForSession(session), error.message);
-        });
-
-    if (auto *client = session->client())
-        client->setTransferTimeout(static_cast<int>(m_generalSettings.requestTimeout() * 1000));
-
-    std::vector<std::unique_ptr<LLMQore::ContentBlock>> blocks;
-    blocks.push_back(
-        std::make_unique<CompletionContent>(
-            context.prefix.value_or(QString()), context.suffix.value_or(QString())));
-    const LLMQore::RequestID requestId = session->send(std::move(blocks));
-    if (requestId.isEmpty()) {
-        QString error = QString("Failed to start completion request for agent '%1': %2")
-                            .arg(agentName, session->lastError().message);
-        m_sessionManager.removeSession(session);
+    if (!promptTemplate) {
+        QString error = QString("No template found with name: %1").arg(templateName);
         LOG_MESSAGE(error);
         sendErrorResponse(request, error);
         return;
     }
 
-    m_activeRequests[requestId] = {request, session};
+    QJsonObject payload{{"model", modelName}, {"stream", true}};
+
+    const auto stopWords = QJsonArray::fromStringList(promptTemplate->stopWords());
+    if (!stopWords.isEmpty())
+        payload["stop"] = stopWords;
+
+    QString systemPrompt;
+    if (m_completeSettings.useSystemPrompt())
+        systemPrompt.append(
+            m_completeSettings.useUserMessageTemplateForCC()
+                    && promptTemplate->type() == PluginLLMCore::TemplateType::Chat
+                ? m_completeSettings.systemPromptForNonFimModels()
+                : m_completeSettings.systemPrompt());
+
+    auto project = PluginLLMCore::RulesLoader::getActiveProject();
+    if (project) {
+        QString projectRules
+            = PluginLLMCore::RulesLoader::loadRulesForProject(project, PluginLLMCore::RulesContext::Completions);
+
+        if (!projectRules.isEmpty()) {
+            systemPrompt += "\n\n# Project Rules\n\n" + projectRules;
+            LOG_MESSAGE("Loaded project rules for completion");
+        }
+    }
+
+    if (updatedContext.fileContext.has_value())
+        systemPrompt.append(updatedContext.fileContext.value());
+
+    if (m_completeSettings.useOpenFilesContext()) {
+        if (provider->providerID() == PluginLLMCore::ProviderID::LlamaCpp) {
+            for (const auto openedFilePath : m_contextManager->openedFiles({filePath})) {
+                if (!updatedContext.filesMetadata) {
+                    updatedContext.filesMetadata = QList<PluginLLMCore::FileMetadata>();
+                }
+                updatedContext.filesMetadata->append({openedFilePath.first, openedFilePath.second});
+            }
+        } else {
+            systemPrompt.append(m_contextManager->openedFilesContext({filePath}));
+        }
+    }
+
+    updatedContext.systemPrompt = systemPrompt;
+
+    if (promptTemplate->type() == PluginLLMCore::TemplateType::Chat) {
+        QString userMessage;
+        if (m_completeSettings.useUserMessageTemplateForCC()) {
+            userMessage = m_completeSettings.processMessageToFIM(
+                updatedContext.prefix.value_or(""), updatedContext.suffix.value_or(""));
+        } else {
+            userMessage = updatedContext.prefix.value_or("") + updatedContext.suffix.value_or("");
+        }
+
+        // TODO refactor add message
+        QVector<PluginLLMCore::Message> messages;
+        messages.append({"user", userMessage});
+        updatedContext.history = messages;
+    }
+
+    provider->prepareRequest(
+        payload,
+        promptTemplate,
+        updatedContext,
+        PluginLLMCore::RequestType::CodeCompletion,
+        false,
+        false);
+
+    connect(
+        provider->client(),
+        &::LLMQore::BaseClient::requestCompleted,
+        this,
+        &LLMClientInterface::handleFullResponse,
+        Qt::UniqueConnection);
+    connect(
+        provider->client(),
+        &::LLMQore::BaseClient::requestFailed,
+        this,
+        &LLMClientInterface::handleRequestFailed,
+        Qt::UniqueConnection);
+
+    auto requestId
+        = provider->sendRequest(QUrl(url), payload, resolveEndpoint(promptTemplate, isPreset1Active));
+    m_activeRequests[requestId] = {request, provider};
     m_performanceLogger.startTimeMeasurement(requestId);
 }
 
-QString LLMClientInterface::pickCompletionAgent(const QString &filePath) const
-{
-    const QStringList roster = Settings::PipelinesConfig::loadCached().rosters.codeCompletion;
-    if (roster.isEmpty())
-        return {};
-
-    AgentRouter::Context ctx;
-    ctx.filePath = filePath;
-    if (auto *project = ProjectExplorer::ProjectManager::projectForFile(
-            Utils::FilePath::fromString(filePath)))
-        ctx.projectName = project->displayName();
-
-    return AgentRouter::pickAgent(roster, ctx, m_agentFactory);
-}
-
-QString LLMClientInterface::requestIdForSession(Session *session) const
-{
-    for (auto it = m_activeRequests.cbegin(); it != m_activeRequests.cend(); ++it) {
-        if (it.value().session == session)
-            return it.key();
-    }
-    return {};
-}
-
-Templates::ContextData LLMClientInterface::prepareContext(
+PluginLLMCore::ContextData LLMClientInterface::prepareContext(
     const QJsonObject &request, const Context::DocumentInfo &documentInfo)
 {
     QJsonObject params = request["params"].toObject();
@@ -340,6 +352,14 @@ Templates::ContextData LLMClientInterface::prepareContext(
     return reader.prepareContext(lineNumber, cursorPosition, m_completeSettings);
 }
 
+QString LLMClientInterface::resolveEndpoint(
+    PluginLLMCore::PromptTemplate *promptTemplate, bool isLanguageSpecify) const
+{
+    const QString custom = isLanguageSpecify ? m_generalSettings.ccPreset1CustomEndpoint()
+                                             : m_generalSettings.ccCustomEndpoint();
+    return !custom.isEmpty() ? custom : promptTemplate->endpoint();
+}
+
 Context::ContextManager *LLMClientInterface::contextManager() const
 {
     return m_contextManager;
@@ -348,6 +368,15 @@ Context::ContextManager *LLMClientInterface::contextManager() const
 void LLMClientInterface::sendCompletionToClient(
     const QString &completion, const QJsonObject &request, bool isComplete)
 {
+    auto filePath = Context::extractFilePathFromRequest(request);
+    auto documentInfo = m_documentReader.readDocument(filePath);
+    bool isPreset1Active = m_contextManager->isSpecifyCompletion(documentInfo);
+
+    auto templateName = !isPreset1Active ? m_generalSettings.ccTemplate()
+                                         : m_generalSettings.ccPreset1Template();
+
+    auto promptTemplate = m_promptProvider->getTemplateByName(templateName);
+
     QJsonObject position = request["params"].toObject()["doc"].toObject()["position"].toObject();
 
     QJsonObject response;
@@ -366,13 +395,14 @@ void LLMClientInterface::sendCompletionToClient(
     if (outputHandler == "Raw text") {
         processedCompletion = completion;
     } else if (outputHandler == "Force processing") {
-        processedCompletion
-            = CodeHandler::processText(completion, Context::extractFilePathFromRequest(request));
+        processedCompletion = CodeHandler::processText(completion,
+                                                       Context::extractFilePathFromRequest(request));
     } else { // "Auto"
-        processedCompletion
-            = CodeHandler::hasCodeBlocks(completion)
-                  ? CodeHandler::processText(completion, Context::extractFilePathFromRequest(request))
-                  : completion;
+        processedCompletion = CodeHandler::hasCodeBlocks(completion)
+                                  ? CodeHandler::processText(completion,
+                                                             Context::extractFilePathFromRequest(
+                                                                 request))
+                                  : completion;
     }
 
     if (processedCompletion.endsWith('\n')) {
@@ -384,11 +414,11 @@ void LLMClientInterface::sendCompletionToClient(
     }
 
     completionItem[LanguageServerProtocol::textKey] = processedCompletion;
-
+    
     QJsonObject range;
     range["start"] = position;
     range["end"] = position;
-
+    
     completionItem[LanguageServerProtocol::rangeKey] = range;
     completionItem[LanguageServerProtocol::positionKey] = position;
     completions.append(completionItem);

LLMClientInterface.hpp

@@ -1,18 +1,17 @@
 // Copyright (C) 2024-2026 Petr Mironychev
 // SPDX-License-Identifier: GPL-3.0-or-later
-// Additional attribution terms under GPLv3 §7(b) apply — see LICENSE
 
 #pragma once
 
-#include <LLMQore/BaseClient.hpp>
 #include <languageclient/languageclientinterface.h>
 #include <texteditor/texteditor.h>
 
-#include <QPointer>
-
 #include <context/ContextManager.hpp>
 #include <context/IDocumentReader.hpp>
 #include <context/ProgrammingLanguage.hpp>
+#include <pluginllmcore/ContextData.hpp>
+#include <pluginllmcore/IPromptProvider.hpp>
+#include <pluginllmcore/IProviderRegistry.hpp>
 #include <logger/IRequestPerformanceLogger.hpp>
 #include <settings/CodeCompletionSettings.hpp>
 #include <settings/GeneralSettings.hpp>
@@ -22,14 +21,6 @@ class QNetworkAccessManager;
 
 namespace QodeAssist {
 
-class AgentFactory;
-class Session;
-class SessionManager;
-
-namespace Templates {
-struct ContextData;
-}
-
 class LLMClientInterface : public LanguageClient::BaseClientInterface
 {
     Q_OBJECT
@@ -38,8 +29,8 @@ public:
     LLMClientInterface(
         const Settings::GeneralSettings &generalSettings,
         const Settings::CodeCompletionSettings &completeSettings,
-        AgentFactory &agentFactory,
-        SessionManager &sessionManager,
+        PluginLLMCore::IProviderRegistry &providerRegistry,
+        PluginLLMCore::IPromptProvider *promptProvider,
         Context::IDocumentReader &documentReader,
         IRequestPerformanceLogger &performanceLogger);
     ~LLMClientInterface() override;
@@ -59,33 +50,35 @@ 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();
     void sendErrorResponse(const QJsonObject &request, const QString &errorMessage);
 
-    void onCompletionFinished(const QString &requestId);
-    void onCompletionFailed(const QString &requestId, const QString &error);
-    void finishRequest(const QString &requestId);
-    QString requestIdForSession(Session *session) const;
-
     struct RequestContext
     {
         QJsonObject originalRequest;
-        QPointer<Session> session;
+        PluginLLMCore::Provider *provider;
     };
 
-    Templates::ContextData prepareContext(
+    PluginLLMCore::ContextData prepareContext(
         const QJsonObject &request, const Context::DocumentInfo &documentInfo);
 
-    QString pickCompletionAgent(const QString &filePath) const;
+    QString resolveEndpoint(
+        PluginLLMCore::PromptTemplate *promptTemplate, bool isLanguageSpecify) const;
 
     const Settings::CodeCompletionSettings &m_completeSettings;
     const Settings::GeneralSettings &m_generalSettings;
-    AgentFactory &m_agentFactory;
-    SessionManager &m_sessionManager;
+    PluginLLMCore::IPromptProvider *m_promptProvider = nullptr;
+    PluginLLMCore::IProviderRegistry &m_providerRegistry;
     Context::IDocumentReader &m_documentReader;
     IRequestPerformanceLogger &m_performanceLogger;
     QElapsedTimer m_completionTimer;

LLMSuggestion.cpp

@@ -1,7 +1,6 @@
 // Copyright (C) 2023 The Qt Company Ltd.
 // Copyright (C) 2024-2026 Petr Mironychev
 // SPDX-License-Identifier: GPL-3.0-or-later
-// Additional attribution terms under GPLv3 §7(b) apply — see LICENSE
 
 #include "LLMSuggestion.hpp"
 #include <texteditor/texteditor.h>

LLMSuggestion.hpp

@@ -20,8 +20,6 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with QodeAssist. If not, see <https://www.gnu.org/licenses/>.
- *
- * Additional attribution terms under GPLv3 §7(b) apply — see LICENSE
  */
 
 #pragma once

LSPCompletion.hpp

@@ -20,8 +20,6 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with QodeAssist. If not, see <https://www.gnu.org/licenses/>.
- *
- * Additional attribution terms under GPLv3 §7(b) apply — see LICENSE
  */
 
 #pragma once
@@ -35,6 +33,7 @@ namespace QodeAssist {
 class Completion : public LanguageServerProtocol::JsonObject
 {
     static constexpr LanguageServerProtocol::Key displayTextKey{"displayText"};
+    static constexpr LanguageServerProtocol::Key uuidKey{"uuid"};
 
 public:
     using JsonObject::JsonObject;
@@ -54,6 +53,7 @@ public:
     }
     QString text() const { return typedValue<QString>(LanguageServerProtocol::textKey); }
     void setText(const QString &text) { insert(LanguageServerProtocol::textKey, text); }
+    QString uuid() const { return typedValue<QString>(uuidKey); }
 
     bool isValid() const override
     {

QodeAssist.json.in

@@ -1,12 +1,12 @@
 {
     "Id" : "qodeassist",
     "Name" : "QodeAssist",
-    "Version" : "0.9.21",
+    "Version" : "0.9.12",
     "CompatVersion" : "${IDE_VERSION}",
     "Vendor" : "Petr Mironychev",
     "VendorId" : "petrmironychev",
     "Copyright" : "(C) ${IDE_COPYRIGHT_YEAR} Petr Mironychev, (C) ${IDE_COPYRIGHT_YEAR} The Qt Company Ltd",
-    "License" : "GPLv3 with additional attribution terms (§7b) — see LICENSE",
+    "License" : "GPLv3",
     "Description": "QodeAssist is an AI-powered coding assistant for Qt Creator. It provides intelligent code completion and suggestions for your code. Prerequisites: Requires one of the supported LLM providers installed (e.g., Ollama or LM Studio) and a compatible large language model downloaded for your chosen provider (e.g., CodeLlama, StarCoder2).",
     "Url" : "https://github.com/Palm1r/QodeAssist",
     "DocumentationUrl" : "https://github.com/Palm1r/QodeAssist",

QodeAssistClient.cpp

@@ -20,8 +20,6 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with QodeAssist. If not, see <https://www.gnu.org/licenses/>.
- *
- * Additional attribution terms under GPLv3 §7(b) apply — see LICENSE
  */
 
 #include "QodeAssistClient.hpp"
@@ -159,16 +157,6 @@ QodeAssistClient::QodeAssistClient(LLMClientInterface *clientInterface)
     m_refactorWidgetHandler = new RefactorWidgetHandler(this);
 }
 
-void QodeAssistClient::setSessionManager(SessionManager *sessionManager)
-{
-    m_sessionManager = sessionManager;
-}
-
-void QodeAssistClient::setAgentFactory(AgentFactory *agentFactory)
-{
-    m_agentFactory = agentFactory;
-}
-
 QodeAssistClient::~QodeAssistClient()
 {
     cleanupConnections();
@@ -273,8 +261,9 @@ void QodeAssistClient::requestCompletions(TextEditor::TextEditorWidget *editor)
         return;
 
 
-    if (m_llmClient->contextManager()->shouldIgnore(
-            editor->textDocument()->filePath().toUrlishString())) {
+    if (m_llmClient->contextManager()
+            ->ignoreManager()
+            ->shouldIgnore(editor->textDocument()->filePath().toUrlishString(), project)) {
         LOG_MESSAGE(QString("Ignoring file due to .qodeassistignore: %1")
                         .arg(editor->textDocument()->filePath().toUrlishString()));
         return;
@@ -318,8 +307,9 @@ void QodeAssistClient::requestQuickRefactor(
     if (!isEnabled(project))
         return;
 
-    if (m_llmClient->contextManager()->shouldIgnore(
-            editor->textDocument()->filePath().toUrlishString())) {
+    if (m_llmClient->contextManager()
+            ->ignoreManager()
+            ->shouldIgnore(editor->textDocument()->filePath().toUrlishString(), project)) {
         LOG_MESSAGE(QString("Ignoring file due to .qodeassistignore: %1")
                         .arg(editor->textDocument()->filePath().toUrlishString()));
         return;
@@ -327,8 +317,6 @@ void QodeAssistClient::requestQuickRefactor(
 
     if (!m_refactorHandler) {
         m_refactorHandler = new QuickRefactorHandler(this);
-        m_refactorHandler->setSessionManager(m_sessionManager);
-        m_refactorHandler->setAgentFactory(m_agentFactory);
         connect(
             m_refactorHandler,
             &QuickRefactorHandler::refactoringCompleted,

QodeAssistClient.hpp

@@ -1,12 +1,10 @@
 // Copyright (C) 2023 The Qt Company Ltd.
 // Copyright (C) 2024-2026 Petr Mironychev
 // SPDX-License-Identifier: GPL-3.0-or-later
-// Additional attribution terms under GPLv3 §7(b) apply — see LICENSE
 
 #pragma once
 
 #include <QObject>
-#include <QPointer>
 
 #include "LLMClientInterface.hpp"
 #include "LSPCompletion.hpp"
@@ -14,14 +12,14 @@
 #include "RefactorSuggestionHoverHandler.hpp"
 #include "widgets/CompletionProgressHandler.hpp"
 #include "widgets/CompletionErrorHandler.hpp"
+#include "widgets/EditorChatButtonHandler.hpp"
 #include "widgets/RefactorWidgetHandler.hpp"
 #include <languageclient/client.h>
+#include <pluginllmcore/IPromptProvider.hpp>
+#include <pluginllmcore/IProviderRegistry.hpp>
 
 namespace QodeAssist {
 
-class SessionManager;
-class AgentFactory;
-
 class QodeAssistClient : public LanguageClient::Client
 {
     Q_OBJECT
@@ -29,9 +27,6 @@ public:
     explicit QodeAssistClient(LLMClientInterface *clientInterface);
     ~QodeAssistClient() override;
 
-    void setSessionManager(SessionManager *sessionManager);
-    void setAgentFactory(AgentFactory *agentFactory);
-
     void openDocument(TextEditor::TextDocument *document) override;
     bool canOpenProject(ProjectExplorer::Project *project) override;
 
@@ -67,12 +62,11 @@ private:
     int m_recentCharCount;
     CompletionProgressHandler m_progressHandler;
     CompletionErrorHandler m_errorHandler;
+    EditorChatButtonHandler m_chatButtonHandler;
     QuickRefactorHandler *m_refactorHandler{nullptr};
     RefactorSuggestionHoverHandler *m_refactorHoverHandler{nullptr};
     RefactorWidgetHandler *m_refactorWidgetHandler{nullptr};
     LLMClientInterface *m_llmClient;
-    SessionManager *m_sessionManager{nullptr};
-    AgentFactory *m_agentFactory{nullptr};
 };
 
 } // namespace QodeAssist

QodeAssistConstants.hpp

@@ -1,6 +1,5 @@
 // Copyright (C) 2024-2026 Petr Mironychev
 // SPDX-License-Identifier: GPL-3.0-or-later
-// Additional attribution terms under GPLv3 §7(b) apply — see LICENSE
 
 #pragma once
 
@@ -11,16 +10,4 @@ const char MENU_ID[] = "QodeAssist.Menu";
 
 const char QODE_ASSIST_REQUEST_SUGGESTION[] = "QodeAssist.RequestSuggestion";
 
-const char QODE_ASSIST_CHAT_CONTEXT[] = "QodeAssist.ChatContext";
-const char QODE_ASSIST_CHAT_NAV_ID[] = "QodeAssistChat";
-const char QODE_ASSIST_CHAT_EDITOR_ID[] = "QodeAssist.ChatEditor";
-
-const char QODE_ASSIST_SHOW_CHAT_ACTION[] = "QodeAssist.ShowChatView";
-const char QODE_ASSIST_OPEN_CHAT_WINDOW_ACTION[] = "QodeAssist.OpenChatWindow";
-const char QODE_ASSIST_NEW_CHAT_ACTION[] = "QodeAssist.NewChat";
-
-const char QODE_ASSIST_CHAT_SEND_MESSAGE[] = "QodeAssist.Chat.SendMessage";
-const char QODE_ASSIST_CHAT_CLEAR_SESSION[] = "QodeAssist.Chat.ClearSession";
-const char QODE_ASSIST_CHAT_SHOW_IN_RIGHT[] = "QodeAssist.Chat.ShowInRightSidebar";
-
 } // namespace QodeAssist::Constants

QodeAssisttr.h

@@ -1,6 +1,5 @@
 // Copyright (C) 2024-2026 Petr Mironychev
 // SPDX-License-Identifier: GPL-3.0-or-later
-// Additional attribution terms under GPLv3 §7(b) apply — see LICENSE
 
 #pragma once
 

QuickRefactorHandler.cpp

@@ -1,46 +1,26 @@
 // Copyright (C) 2025-2026 Petr Mironychev
 // SPDX-License-Identifier: GPL-3.0-or-later
-// Additional attribution terms under GPLv3 §7(b) apply — see LICENSE
 
 #include "QuickRefactorHandler.hpp"
 
-#include <memory>
-
 #include <LLMQore/BaseClient.hpp>
-#include <LLMQore/ContentBlocks.hpp>
-#include <LLMQore/ToolLoopRunner.hpp>
-#include <LLMQore/ToolsManager.hpp>
 #include <QJsonArray>
 #include <QJsonDocument>
 #include <QUuid>
 
-#include <projectexplorer/project.h>
-#include <projectexplorer/projectmanager.h>
-#include <utils/filepath.h>
-
 #include <context/DocumentContextReader.hpp>
+#include <pluginllmcore/ResponseCleaner.hpp>
 #include <context/DocumentReaderQtCreator.hpp>
-#include <context/EnvBlockFormatter.hpp>
 #include <context/Utils.hpp>
+#include <pluginllmcore/PromptTemplateManager.hpp>
+#include <pluginllmcore/ProvidersManager.hpp>
+#include <pluginllmcore/RulesLoader.hpp>
 #include <logger/Logger.hpp>
-#include <sources/common/ResponseCleaner.hpp>
+#include <settings/ChatAssistantSettings.hpp>
 #include <settings/GeneralSettings.hpp>
 #include <settings/QuickRefactorSettings.hpp>
 #include <settings/ToolsSettings.hpp>
 
-#include "sources/common/ContextData.hpp"
-
-#include <AgentConfig.hpp>
-#include <AgentFactory.hpp>
-#include <ContextRenderer.hpp>
-#include <ConversationHistory.hpp>
-#include <Session.hpp>
-#include <SessionManager.hpp>
-#include <SystemPromptBuilder.hpp>
-
-#include "sources/settings/PipelinesConfig.hpp"
-#include "tools/ToolsRegistration.hpp"
-
 namespace QodeAssist {
 
 QuickRefactorHandler::QuickRefactorHandler(QObject *parent)
@@ -53,16 +33,6 @@ QuickRefactorHandler::QuickRefactorHandler(QObject *parent)
 
 QuickRefactorHandler::~QuickRefactorHandler() {}
 
-void QuickRefactorHandler::setSessionManager(SessionManager *sessionManager)
-{
-    m_sessionManager = sessionManager;
-}
-
-void QuickRefactorHandler::setAgentFactory(AgentFactory *agentFactory)
-{
-    m_agentFactory = agentFactory;
-}
-
 void QuickRefactorHandler::sendRefactorRequest(
     TextEditor::TextEditorWidget *editor, const QString &instructions)
 {
@@ -117,114 +87,95 @@ void QuickRefactorHandler::sendRefactorRequest(
     prepareAndSendRequest(editor, instructions, range);
 }
 
-QString QuickRefactorHandler::configuredAgent(AgentFactory *agentFactory)
-{
-    const QString configured = Settings::PipelinesConfig::load().rosters.quickRefactor;
-    if (configured.isEmpty() || !agentFactory || !agentFactory->configByName(configured))
-        return {};
-    return configured;
-}
-
-QString QuickRefactorHandler::pickRefactorAgent() const
-{
-    return configuredAgent(m_agentFactory);
-}
-
 void QuickRefactorHandler::prepareAndSendRequest(
     TextEditor::TextEditorWidget *editor,
     const QString &instructions,
     const Utils::Text::Range &range)
 {
-    const auto emitError = [this, editor](const QString &error) {
+    auto &settings = Settings::generalSettings();
+
+    auto &providerRegistry = PluginLLMCore::ProvidersManager::instance();
+    auto &promptManager = PluginLLMCore::PromptTemplateManager::instance();
+
+    const auto providerName = settings.qrProvider();
+    auto provider = providerRegistry.getProviderByName(providerName);
+
+    if (!provider) {
+        QString error = QString("No provider found with name: %1").arg(providerName);
         LOG_MESSAGE(error);
         RefactorResult result;
         result.success = false;
         result.errorMessage = error;
         result.editor = editor;
         emit refactoringCompleted(result);
-    };
-
-    if (!m_sessionManager) {
-        emitError(QStringLiteral("Quick refactor session manager is not available"));
         return;
     }
 
-    const QString agentName = pickRefactorAgent();
-    if (agentName.isEmpty()) {
-        emitError(QStringLiteral(
-            "No quick refactor agent configured. Set one in QodeAssist > General."));
+    const auto templateName = settings.qrTemplate();
+    auto promptTemplate = promptManager.getChatTemplateByName(templateName);
+
+    if (!promptTemplate) {
+        QString error = QString("No template found with name: %1").arg(templateName);
+        LOG_MESSAGE(error);
+        RefactorResult result;
+        result.success = false;
+        result.errorMessage = error;
+        result.editor = editor;
+        emit refactoringCompleted(result);
         return;
     }
 
-    QString sessionError;
-    Session *session = m_sessionManager->acquire(agentName, &sessionError);
-    if (!session) {
-        emitError(sessionError.isEmpty() ? QStringLiteral("No quick refactor agent selected")
-                                         : sessionError);
-        return;
-    }
+    QJsonObject payload{
+        {"model", Settings::generalSettings().qrModel()}, {"stream", true}};
 
-    auto *client = session->client();
-    if (!client) {
-        m_sessionManager->removeSession(session);
-        emitError(QStringLiteral("Quick refactor agent has no live client"));
-        return;
-    }
+    PluginLLMCore::ContextData context = prepareContext(editor, range, instructions);
 
-    auto *project = ProjectExplorer::ProjectManager::startupProject();
-    Templates::ContextRenderer::Bindings bindings;
-    bindings.projectDir = project ? project->projectDirectory().toFSPathString() : QString();
-    bindings.configDir = AgentFactory::userConfigDir();
-    session->setContextBindings(bindings);
+    bool enableTools = Settings::quickRefactorSettings().useTools();
+    bool enableThinking = Settings::quickRefactorSettings().useThinking();
+    provider->prepareRequest(
+        payload,
+        promptTemplate,
+        context,
+        PluginLLMCore::RequestType::QuickRefactoring,
+        enableTools,
+        enableThinking);
 
-    const AgentConfig *agentConfig
-        = m_agentFactory ? m_agentFactory->configByName(agentName) : nullptr;
-    if (agentConfig && agentConfig->enableTools) {
-        m_sessionManager->toolContributors().contribute(client->tools());
-        client->toolLoop()->setMaxRounds(Settings::toolsSettings().maxToolContinuations());
-    }
-
-    session->systemPrompt()->setLayer(
-        QStringLiteral("refactor"), buildContextLayer(editor, range));
-
-    client->setTransferTimeout(
-        static_cast<int>(Settings::generalSettings().requestTimeout() * 1000));
+    provider->client()->setMaxToolContinuations(
+        Settings::toolsSettings().maxToolContinuations());
 
     m_isRefactoringInProgress = true;
 
     connect(
-        session, &Session::finished, this,
-        [this](const LLMQore::RequestID &id, const QString &) { onRefactorFinished(id); });
+        provider->client(),
+        &::LLMQore::BaseClient::requestCompleted,
+        this,
+        &QuickRefactorHandler::handleFullResponse,
+        Qt::UniqueConnection);
+
     connect(
-        session, &Session::failed, this,
-        [this](const LLMQore::RequestID &id, const QodeAssist::ErrorInfo &error) {
-            onRefactorFailed(id, error);
-        });
-
-    std::vector<std::unique_ptr<LLMQore::ContentBlock>> blocks;
-    const QString userMessage = instructions.isEmpty()
-        ? QStringLiteral("Refactor the code to improve its quality and maintainability.")
-        : instructions;
-    blocks.push_back(std::make_unique<LLMQore::TextContent>(userMessage));
-
-    const LLMQore::RequestID requestId = session->send(std::move(blocks));
-    if (requestId.isEmpty()) {
-        m_isRefactoringInProgress = false;
-        const QString reason = session->lastError().message;
-        m_sessionManager->removeSession(session);
-        emitError(QStringLiteral("Failed to start quick refactor request for agent '%1': %2")
-                      .arg(agentName, reason));
-        return;
-    }
+        provider->client(),
+        &::LLMQore::BaseClient::requestFailed,
+        this,
+        &QuickRefactorHandler::handleRequestFailed,
+        Qt::UniqueConnection);
 
+    const QString customEndpoint = Settings::generalSettings().qrCustomEndpoint();
+    const QString endpoint = !customEndpoint.isEmpty() ? customEndpoint
+                                                       : promptTemplate->endpoint();
+    auto requestId
+        = provider->sendRequest(QUrl(Settings::generalSettings().qrUrl()), payload, endpoint);
     m_lastRequestId = requestId;
-    m_activeRequests[requestId] = {QJsonObject{{"id", requestId}}, session};
+    QJsonObject request{{"id", requestId}};
+
+    m_activeRequests[requestId] = {request, provider};
 }
 
-QString QuickRefactorHandler::buildContextLayer(
-    TextEditor::TextEditorWidget *editor, const Utils::Text::Range &range)
+PluginLLMCore::ContextData QuickRefactorHandler::prepareContext(
+    TextEditor::TextEditorWidget *editor,
+    const Utils::Text::Range &range,
+    const QString &instructions)
 {
-    Q_UNUSED(range)
+    PluginLLMCore::ContextData context;
 
     auto textDocument = editor->textDocument();
     Context::DocumentReaderQtCreator documentReader;
@@ -232,7 +183,7 @@ QString QuickRefactorHandler::buildContextLayer(
 
     if (!documentInfo.document) {
         LOG_MESSAGE("Error: Document is not available");
-        return {};
+        return context;
     }
 
     QTextCursor cursor = editor->textCursor();
@@ -306,20 +257,43 @@ QString QuickRefactorHandler::buildContextLayer(
         taggedContent = contextBefore + "<cursor>" + contextAfter;
     }
 
-    QString contextLayer = Context::EnvBlockFormatter::formatFile(
-        {documentInfo.filePath, documentInfo.mimeType});
+    QString systemPrompt = Settings::quickRefactorSettings().systemPrompt();
 
-    contextLayer += "\n# Code Context with Position Markers\n" + taggedContent;
+    auto project = PluginLLMCore::RulesLoader::getActiveProject();
+    if (project) {
+        QString projectRules = PluginLLMCore::RulesLoader::loadRulesForProject(
+            project, PluginLLMCore::RulesContext::QuickRefactor);
 
-    contextLayer += "\n\n# What to Generate:";
-    contextLayer += cursor.hasSelection()
+        if (!projectRules.isEmpty()) {
+            systemPrompt += "\n\n# Project Rules\n\n" + projectRules;
+            LOG_MESSAGE("Loaded project rules for quick refactor");
+        }
+    }
+
+    systemPrompt += "\n\nFile information:";
+    systemPrompt += "\nLanguage: " + documentInfo.mimeType;
+    systemPrompt += "\nFile path: " + documentInfo.filePath;
+
+    systemPrompt += "\n\n# Code Context with Position Markers\n" + taggedContent;
+
+    systemPrompt += "\n\n# Output Requirements\n## What to Generate:";
+    systemPrompt += cursor.hasSelection()
         ? "\n- Generate ONLY the code that should REPLACE the selected text between "
           "<selection_start> and <selection_end> markers"
           "\n- Your output will completely replace the selected code"
         : "\n- Generate ONLY the code that should be INSERTED at the <cursor> position"
           "\n- Your output will be inserted at the cursor location";
-
-    QString indentNote;
+    
+    systemPrompt += "\n\n## Formatting Rules:"
+                    "\n- Output ONLY the code itself, without ANY explanations or descriptions"
+                    "\n- Do NOT include markdown code blocks (no ```, no language tags)"
+                    "\n- Do NOT add comments explaining what you changed"
+                    "\n- Do NOT repeat existing code, be precise with context"
+                    "\n- Do NOT send in answer <cursor> or </cursor> and other tags"
+                    "\n- The output must be ready to insert directly into the editor as-is";
+    
+    systemPrompt += "\n\n## Indentation and Whitespace:";
+    
     if (cursor.hasSelection()) {
         QTextBlock startBlock = documentInfo.document->findBlock(cursor.selectionStart());
         int leadingSpaces = 0;
@@ -329,12 +303,12 @@ QString QuickRefactorHandler::buildContextLayer(
             else break;
         }
         if (leadingSpaces > 0) {
-            indentNote = QString("\n- CRITICAL: The code to replace starts with %1 spaces of indentation"
-                                 "\n- Your output MUST start with exactly %1 spaces (or equivalent tabs)"
-                                 "\n- Each line in your output must maintain this base indentation")
-                             .arg(leadingSpaces);
+            systemPrompt += QString("\n- CRITICAL: The code to replace starts with %1 spaces of indentation"
+                                   "\n- Your output MUST start with exactly %1 spaces (or equivalent tabs)"
+                                   "\n- Each line in your output must maintain this base indentation")
+                               .arg(leadingSpaces);
         }
-        indentNote += "\n- PRESERVE all indentation from the original code";
+        systemPrompt += "\n- PRESERVE all indentation from the original code";
     } else {
         QTextBlock block = documentInfo.document->findBlock(cursorPos);
         QString lineText = block.text();
@@ -345,105 +319,106 @@ QString QuickRefactorHandler::buildContextLayer(
             else break;
         }
         if (leadingSpaces > 0) {
-            indentNote = QString("\n- CRITICAL: Current line has %1 spaces of indentation"
-                                 "\n- If generating multiline code, EVERY line must start with at least %1 spaces"
-                                 "\n- If generating single-line code, it will be inserted inline (no indentation needed)")
-                             .arg(leadingSpaces);
+            systemPrompt += QString("\n- CRITICAL: Current line has %1 spaces of indentation"
+                                   "\n- If generating multiline code, EVERY line must start with at least %1 spaces"
+                                   "\n- If generating single-line code, it will be inserted inline (no indentation needed)")
+                               .arg(leadingSpaces);
         }
     }
-    if (!indentNote.isEmpty())
-        contextLayer += "\n\n## Indentation:" + indentNote;
+    
+    systemPrompt += "\n- Use the same indentation style (spaces or tabs) as the surrounding code"
+                    "\n- Maintain consistent indentation for nested blocks"
+                    "\n- Do NOT remove or reduce the base indentation level"
+                    "\n\n## Code Style:"
+                    "\n- Match the coding style of the surrounding code (naming, spacing, braces, etc.)"
+                    "\n- Preserve the original code structure when possible"
+                    "\n- Only change what is necessary to fulfill the user's request";
 
     if (Settings::quickRefactorSettings().useOpenFilesInQuickRefactor()) {
-        contextLayer += "\n\n" + m_contextManager.openedFilesContext({documentInfo.filePath});
+        systemPrompt += "\n\n" + m_contextManager.openedFilesContext({documentInfo.filePath});
     }
 
-    return contextLayer;
+    context.systemPrompt = systemPrompt;
+
+    QVector<PluginLLMCore::Message> messages;
+    messages.append(
+        {"user",
+         instructions.isEmpty() ? "Refactor the code to improve its quality and maintainability."
+                                : instructions});
+    context.history = messages;
+
+    return context;
+}
+
+void QuickRefactorHandler::handleLLMResponse(
+    const QString &response, const QJsonObject &request, bool isComplete)
+{
+    if (request["id"].toString() != m_lastRequestId) {
+        return;
+    }
+
+    if (isComplete) {
+        m_isRefactoringInProgress = false;
+        QString cleanedResponse = PluginLLMCore::ResponseCleaner::clean(response);
+
+        RefactorResult result;
+        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 ----------");
+        LOG_MESSAGE(cleanedResponse);
+        LOG_MESSAGE("----------- END REFACTORED CODE -----------");
+
+        emit refactoringCompleted(result);
+    }
 }
 
 void QuickRefactorHandler::cancelRequest()
 {
-    if (!m_isRefactoringInProgress)
-        return;
+    if (m_isRefactoringInProgress) {
+        auto id = m_lastRequestId;
 
-    const auto id = m_lastRequestId;
-    m_isRefactoringInProgress = false;
-    m_lastRequestId.clear();
+        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;
+            }
+        }
 
-    auto it = m_activeRequests.find(id);
-    if (it != m_activeRequests.end()) {
-        Session *session = it.value().session;
-        m_activeRequests.erase(it);
-        if (session && m_sessionManager)
-            m_sessionManager->release(session);
+        m_isRefactoringInProgress = false;
+
+        RefactorResult result;
+        result.success = false;
+        result.errorMessage = "Refactoring request was cancelled";
+        emit refactoringCompleted(result);
     }
-
-    RefactorResult result;
-    result.success = false;
-    result.errorMessage = "Refactoring request was cancelled";
-    emit refactoringCompleted(result);
 }
 
-void QuickRefactorHandler::onRefactorFinished(const QString &requestId)
+void QuickRefactorHandler::handleFullResponse(const QString &requestId, const QString &fullText)
 {
-    if (requestId != m_lastRequestId)
-        return;
-
-    auto it = m_activeRequests.find(requestId);
-    Session *session = (it != m_activeRequests.end()) ? it.value().session.data() : nullptr;
-    if (it != m_activeRequests.end())
-        m_activeRequests.erase(it);
-
-    QString fullText;
-    if (session) {
-        if (auto *history = session->history(); history && !history->isEmpty())
-            fullText = history->messages().back().text();
+    if (requestId == m_lastRequestId) {
+        m_activeRequests.remove(requestId);
+        QJsonObject request{{"id", requestId}};
+        handleLLMResponse(fullText, request, true);
     }
-
-    m_isRefactoringInProgress = false;
-    m_lastRequestId.clear();
-
-    const QString cleanedResponse = ResponseCleaner::clean(fullText);
-
-    RefactorResult result;
-    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 ----------");
-    LOG_MESSAGE(cleanedResponse);
-    LOG_MESSAGE("----------- END REFACTORED CODE -----------");
-
-    emit refactoringCompleted(result);
-
-    if (session && m_sessionManager)
-        m_sessionManager->release(session);
 }
 
-void QuickRefactorHandler::onRefactorFailed(
-    const QString &requestId, const QodeAssist::ErrorInfo &error)
+void QuickRefactorHandler::handleRequestFailed(const QString &requestId, const QString &error)
 {
-    if (requestId != m_lastRequestId)
-        return;
-
-    auto it = m_activeRequests.find(requestId);
-    Session *session = (it != m_activeRequests.end()) ? it.value().session.data() : nullptr;
-    if (it != m_activeRequests.end())
-        m_activeRequests.erase(it);
-
-    m_isRefactoringInProgress = false;
-    m_lastRequestId.clear();
-
-    RefactorResult result;
-    result.success = false;
-    result.errorMessage = error.message;
-    result.editor = m_currentEditor;
-    emit refactoringCompleted(result);
-
-    if (session && m_sessionManager)
-        m_sessionManager->release(session);
+    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

@@ -1,34 +1,28 @@
 // Copyright (C) 2025-2026 Petr Mironychev
 // SPDX-License-Identifier: GPL-3.0-or-later
-// Additional attribution terms under GPLv3 §7(b) apply — see LICENSE
 
 #pragma once
 
 #include <QJsonObject>
 #include <QObject>
-#include <QPointer>
 
-#include <LLMQore/BaseClient.hpp>
 #include <texteditor/texteditor.h>
 #include <utils/textutils.h>
 
-#include <ErrorInfo.hpp>
 #include <context/ContextManager.hpp>
 #include <context/IDocumentReader.hpp>
+#include <pluginllmcore/ContextData.hpp>
+#include <pluginllmcore/Provider.hpp>
 
 namespace QodeAssist {
 
-class SessionManager;
-class Session;
-class AgentFactory;
-
 struct RefactorResult
 {
     QString newText;
     Utils::Text::Range insertRange;
     bool success;
     QString errorMessage;
-    QPointer<TextEditor::TextEditorWidget> editor;
+    TextEditor::TextEditorWidget *editor{nullptr};
 };
 
 class QuickRefactorHandler : public QObject
@@ -39,41 +33,38 @@ public:
     explicit QuickRefactorHandler(QObject *parent = nullptr);
     ~QuickRefactorHandler() override;
 
-    void setSessionManager(SessionManager *sessionManager);
-    void setAgentFactory(AgentFactory *agentFactory);
-
     void sendRefactorRequest(TextEditor::TextEditorWidget *editor, const QString &instructions);
 
     void cancelRequest();
     bool isProcessing() const { return m_isRefactoringInProgress; }
 
-    static QString configuredAgent(AgentFactory *agentFactory);
-
 signals:
     void refactoringCompleted(const QodeAssist::RefactorResult &result);
 
+private slots:
+    void handleFullResponse(const QString &requestId, const QString &fullText);
+    void handleRequestFailed(const QString &requestId, const QString &error);
+
 private:
     void prepareAndSendRequest(
         TextEditor::TextEditorWidget *editor,
         const QString &instructions,
         const Utils::Text::Range &range);
 
-    void onRefactorFinished(const QString &requestId);
-    void onRefactorFailed(const QString &requestId, const QodeAssist::ErrorInfo &error);
-    QString buildContextLayer(
-        TextEditor::TextEditorWidget *editor, const Utils::Text::Range &range);
-    QString pickRefactorAgent() const;
+    void handleLLMResponse(const QString &response, const QJsonObject &request, bool isComplete);
+    PluginLLMCore::ContextData prepareContext(
+        TextEditor::TextEditorWidget *editor,
+        const Utils::Text::Range &range,
+        const QString &instructions);
 
     struct RequestContext
     {
         QJsonObject originalRequest;
-        QPointer<Session> session;
+        PluginLLMCore::Provider *provider;
     };
 
-    QPointer<SessionManager> m_sessionManager;
-    QPointer<AgentFactory> m_agentFactory;
     QHash<QString, RequestContext> m_activeRequests;
-    QPointer<TextEditor::TextEditorWidget> m_currentEditor;
+    TextEditor::TextEditorWidget *m_currentEditor;
     Utils::Text::Range m_currentRange;
     bool m_isRefactoringInProgress;
     QString m_lastRequestId;

README.md

@@ -6,7 +6,7 @@
 [![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
 [![Discord](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** brings a full AI coding workflow to Qt Creator for C++ and QML — smart code completion, multi-panel chat, inline quick refactoring, and project-aware tool calling. It works with local runtimes (Ollama, llama.cpp, LM Studio) and cloud providers (Claude, OpenAI, Google AI, Mistral, Qwen, DeepSeek), can run as an **MCP server** so other clients reuse its project context, and can also act as an **MCP client** to consume tools from external MCP servers (authenticated MCP servers are not supported yet).
+![qodeassist-icon](https://github.com/user-attachments/assets/dc336712-83cb-440d-8761-8d0a31de898d) **QodeAssist** brings a full AI coding workflow to Qt Creator for C++ and QML — smart code completion, multi-panel chat, inline quick refactoring, and project-aware tool calling. It works with local runtimes (Ollama, llama.cpp, LM Studio) and cloud providers (Claude, OpenAI, Google AI, Mistral), can run as an **MCP server** so other clients reuse its project context, and can also act as an **MCP client** to consume tools from external MCP servers (authenticated MCP servers are not supported yet).
 
 ⚠️ **Important Notice About Paid Providers**
 > When using paid providers like Claude, OpenRouter or OpenAI-compatible services:
@@ -35,13 +35,11 @@ QodeAssist enhances Qt Creator with AI-powered coding assistance:
 - **Chat Assistant** — side panel, bottom panel, or detached window; history with auto-save, token monitoring, extended thinking
 - **Quick Refactoring** — inline AI-assisted edits directly in the editor with a searchable custom-instructions library
 - **Agent Tools** — read, search, create and edit files; build the project; run terminal commands; access linter/compiler issues; manage TODOs
-- **Agent Skills** — reusable folders of specialized instructions loaded on demand; discovered from `.qodeassist/skills/` and `.claude/skills/`, invoked automatically, with `/skill`, or always-on
 - **MCP Server** — expose QodeAssist's project-aware tools to external MCP clients (Claude Code, VS Code, Claude Desktop via bridge)
 - **MCP Client Hub** — connect QodeAssist to external MCP servers and use their tools in Chat and Quick Refactor (authenticated MCP servers are not supported yet)
 - **File Context** — attach, link, or auto-sync open editor files for richer prompts
-- **Many Providers** — Ollama, llama.cpp, LM Studio (Chat + Responses), Claude, OpenAI (Chat + Responses), Google AI, Mistral, Codestral, OpenRouter, Qwen (OpenAI + Responses), DeepSeek, any OpenAI-compatible endpoint
-- **Reasoning / Thinking** — streamed chain-of-thought is shown for reasoning models across Claude, Google, OpenAI Responses, and any OpenAI-compatible endpoint that returns `reasoning_content` (DeepSeek, Qwen QwQ/Qwen3-Thinking, LM Studio, OpenRouter, …)
-- **Customizable** — per-agent personas (agent TOML `system_prompt`), reusable refactor templates, full prompt-template control
+- **Many Providers** — Ollama, llama.cpp, LM Studio (Chat + Responses), Claude, OpenAI (Chat + Responses), Google AI, Mistral, Codestral, OpenRouter, any OpenAI-compatible endpoint
+- **Customizable** — per-project rules (`.qodeassist/rules/`), agent roles, reusable refactor templates, full prompt-template control
 
 **Join our [Discord Community](https://discord.gg/BGMkUsXUgf)** to get support and connect with other users!
 
@@ -55,11 +53,6 @@ QodeAssist enhances Qt Creator with AI-powered coding assistance:
   <img src="https://github.com/user-attachments/assets/4a9092e0-429f-41eb-8723-cbb202fd0a8c" width="600" alt="QodeAssistPreview">
 </details>
 
-<details>
-  <summary>Chat View Mode: (click to expand)</summary>
-  <img src="https://github.com/user-attachments/assets/5914dd78-c8a4-4d35-889a-10ec493d4c4b" width="600" alt="QodeAssistChat2">
-</details>
-
 <details>
   <summary>Multiline Code completion: (click to expand)</summary>
   <img src="https://github.com/user-attachments/assets/c18dfbd2-8c54-4a7b-90d1-66e3bb51adb0" width="600" alt="QodeAssistPreview">
@@ -92,28 +85,7 @@ QodeAssist enhances Qt Creator with AI-powered coding assistance:
 
 ## Install plugin to QtCreator
 
-### Method 1: Using the Extension Registry (Recommended)
-
-You can install and update QodeAssist directly from within Qt Creator by adding the QodeAssist registry as an external extension repository.
-
-1. Open the Extensions page (`Qt Creator → Extensions`) and switch to the **Browser** tab
-2. Enable **Use External Repository**
-3. Next to **Repository URLs**, click **Add** and paste the registry archive URL matching your Qt Creator version:
-   - **Latest (up to date to QtCreator release)**: `https://github.com/Palm1r/extension-registry/archive/refs/heads/qodeassist.tar.gz`
-   - **QtC 20**: `https://github.com/Palm1r/extension-registry/archive/refs/heads/qodeassist-qtc20.tar.gz`
-   - **QtC 19**: `https://github.com/Palm1r/extension-registry/archive/refs/heads/qodeassist-qtc19.tar.gz`
-   - **QtC 18**: `https://github.com/Palm1r/extension-registry/archive/refs/heads/qodeassist-qtc18.tar.gz`
-<details>
-  <summary>Example of extension registry: (click to expand)</summary>
-  <img width="600" alt="RegistryExample" src="https://github.com/user-attachments/assets/8ab8cf10-72e7-4961-8c5a-21d530378a05">
-</details>
-
-4. Click **Apply** — QodeAssist will appear in the extensions list, where you can **Install** it
-5. Updates can be installed from the same screen when a new version is published
-
-> **Note:** This is an external repository not maintained by The Qt Company. By adding it you accept responsibility for managing the associated risks, as stated in the Extensions page.
-
-### Method 2: Using QodeAssistUpdater (Beta)
+### 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.
 
@@ -141,7 +113,7 @@ Download pre-built binary from [QodeAssistUpdater releases](https://github.com/P
 
 For more information, visit the [QodeAssistUpdater repository](https://github.com/Palm1r/QodeAssistUpdater).
 
-### Method 3: Manual Installation
+### Method 2: Manual Installation
 
 1. Install Latest Qt Creator
 2. Download the QodeAssist plugin for your Qt Creator
@@ -171,8 +143,6 @@ The Quick Setup feature provides one-click configuration for popular cloud AI mo
    - **OpenAI** (gpt-5.2-codex)
    - **Mistral AI** (Codestral 2501)
    - **Google AI** (Gemini 2.5 Flash)
-   - **Qwen** (Qwen3.6 Plus, Qwen3.7 Max)
-   - **DeepSeek** (DeepSeek V4 Flash, DeepSeek V4 Pro)
 3. **Configure API Key** - Click "Configure API Key" button and enter your API key in Provider Settings
 
 All settings (provider, model, template, URL) are configured automatically. Just add your API key and you're ready to go!
@@ -193,8 +163,6 @@ For advanced users or local models, choose your preferred provider and follow th
 - **[OpenAI](docs/openai-configuration.md)** — Chat Completions and Responses API
 - **[Mistral AI](docs/mistral-configuration.md)** / **Codestral**
 - **[Google AI](docs/google-ai-configuration.md)** — Gemini
-- **Qwen (Alibaba)** — DashScope OpenAI-compatible Chat and Responses endpoints
-- **DeepSeek** — `deepseek-chat` and `deepseek-reasoner` (reasoning shown as thinking)
 - **OpenAI-compatible** — OpenRouter and any custom endpoint
 
 ### Recommended Models for Best Experience
@@ -217,8 +185,9 @@ For optimal coding assistance, we recommend using these top-tier models:
 
 ### Additional Configuration
 
-- **[Creating and Extending Agents](docs/creating-agents.md)** - Add custom agents (including personas via `system_prompt`) with TOML profiles
+- **[Agent Roles](docs/agent-roles.md)** - Create AI personas with specialized system prompts
 - **[Chat Summarization](docs/chat-summarization.md)** - Compress conversations to save context tokens
+- **[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
@@ -254,11 +223,11 @@ Configure in: `Tools → Options → QodeAssist → Code Completion → General
 - Multiple chat panels: side panel, bottom panel, and popup window
 - Chat history with auto-save and restore
 - Token usage monitoring
-- AI personas via agent `system_prompt` — switch personas by switching agents (see [Creating Agents](docs/creating-agents.md))
+- **[Agent Roles](docs/agent-roles.md)** - Switch between AI personas (Developer, Reviewer, custom roles)
 - **[Chat Summarization](docs/chat-summarization.md)** - Compress long conversations into AI-generated summaries
 - **[File Context](docs/file-context.md)** - Attach or link files for better context
 - Automatic syncing with open editor files (optional)
-- Extended thinking / reasoning mode - shows streamed chain-of-thought for reasoning models (Claude, Google, OpenAI Responses, and OpenAI-compatible endpoints returning `reasoning_content` such as DeepSeek, Qwen, LM Studio, OpenRouter)
+- 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
@@ -284,41 +253,6 @@ Chat and Quick Refactor can call tools to inspect and modify your project. Each
 | `execute_terminal_command` | Run a shell command (with confirmation) |
 | `todo_tool` | Track multi-step task progress during a conversation |
 
-### Skills
-
-**Agent Skills** package specialized instructions and workflows into reusable folders the AI loads on demand. QodeAssist implements the open [Agent Skills](https://agentskills.io) format, so skills authored for Claude Code, Cursor, or other agents work as-is.
-
-A skill is a folder containing a `SKILL.md` file — YAML frontmatter (`name`, `description`) plus Markdown instructions:
-
-```
-my-skill/
-└── SKILL.md
-```
-
-```markdown
----
-name: my-skill
-description: What the skill does and when to use it.
----
-
-# My Skill
-
-Step-by-step instructions for the task...
-```
-
-**Where skills are discovered:**
-- **Project skills** — project-relative subdirectories (default `.qodeassist/skills/` and `.claude/skills/`), configured in `Projects → QodeAssist → Skills`. Project skills win over global ones on a name collision.
-- **Global skills** — absolute directories shared across all projects (default includes `~/.claude/skills/`), configured in `Tools → Options → QodeAssist → Skills`.
-
-Both settings pages show the list of currently discovered skills.
-
-**How skills are used in Chat:**
-- **Automatically** — each skill's name and description is added to the system prompt; when a request matches, the model loads the full instructions via the `load_skill` tool (requires a tool-calling model).
-- **Explicitly** — type `/` in the chat input and pick a skill from the popup; its instructions are injected into that one message. Works with any model.
-- **Always-on** — a skill whose frontmatter has `metadata: always-on: "true"` is injected into every chat request automatically.
-
-Enable or disable the whole feature in `Tools → Options → QodeAssist → Skills`.
-
 ### MCP Server
 
 QodeAssist can run an **MCP (Model Context Protocol) server** on `localhost`, exposing the tools above to external clients — so you can use QodeAssist's project awareness from Claude Code CLI, VS Code, Cursor, Claude Desktop, or any other MCP-capable client.
@@ -348,16 +282,18 @@ QodeAssist uses a flexible prompt composition system that adapts to different co
 ├─────────────────────────────────────────────────────────────────────────────┤
 │  Examples: Codestral, Qwen2.5-Coder, DeepSeek-Coder                        │
 │                                                                              │
-│  1. Editor Context:                                                         │
-│     ├─ File information (language, path)                                   │
-│     ├─ Recent project changes (optional, if enabled)                       │
-│     └─ Open editor files (optional, if enabled)                            │
-│  2. Code Context:                                                           │
+│  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 Request: the agent's TOML [body] template renders prefix/suffix     │
-│                 into the provider's native FIM fields                       │
+│  Final Prompt: FIM_Template(Prefix: SystemPrompt + Rules + OpenFiles +     │
+│                                     CodeBefore,                             │
+│                             Suffix: CodeAfter)                              │
 └─────────────────────────────────────────────────────────────────────────────┘
 ```
 
@@ -372,19 +308,21 @@ QodeAssist uses a flexible prompt composition system that adapts to different co
 ├─────────────────────────────────────────────────────────────────────────────┤
 │  Examples: DeepSeek-Coder-Instruct, Qwen2.5-Coder-Instruct                 │
 │                                                                              │
-│  1. Completion Instructions (from the agent's TOML profile)                │
-│     └─ Includes response formatting rules                                  │
-│  2. Editor Context:                                                         │
+│  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)                                   │
-│     ├─ Recent project changes (optional, if enabled)                       │
-│     └─ Open editor files (optional, if enabled)                            │
-│  3. Code Context:                                                           │
 │     ├─ Code before cursor                                                  │
 │     ├─ <cursor> marker                                                     │
 │     └─ Code after cursor                                                   │
+│  5. User Message: "Complete the code at cursor position"                   │
 │                                                                              │
-│  Final Prompt: [System: Instructions + EditorContext]                      │
-│                [User: Code around cursor as a completion request]           │
+│  Final Prompt: [System: SystemPrompt + Rules]                              │
+│                [User: OpenFiles + Context + CompletionRequest]              │
 └─────────────────────────────────────────────────────────────────────────────┘
 ```
 
@@ -397,22 +335,27 @@ QodeAssist uses a flexible prompt composition system that adapts to different co
 ┌─────────────────────────────────────────────────────────────────────────────┐
 │                            CHAT ASSISTANT                                   │
 ├─────────────────────────────────────────────────────────────────────────────┤
-│  1. Agent System Prompt (persona, from the agent's TOML profile)           │
-│  2. Project Info + Skills (catalog and always-on skills)                   │
-│  3. Tool Definitions (if the agent enables tools)                          │
-│  4. Conversation History:                                                   │
-│     ├─ Previous messages and tool calls/results                            │
-│     ├─ Attachments stay with the message they were sent with               │
-│     └─ /skill instructions persist for the whole conversation              │
-│  5. Linked Files + Open Editor Files (if auto-sync enabled):               │
-│     └─ FRESH snapshot of current file content, re-read on every            │
-│        request and placed next to your latest message — never              │
-│        duplicated into the history                                          │
-│  6. User Message (+ this turn's attachments and images)                    │
+│  1. System Prompt (from Chat Assistant Settings)                           │
+│  2. Agent Role (optional, from role selector):                             │
+│     └─ Role-specific system prompt (Developer, Reviewer, custom)           │
+│  3. Project Rules:                                                          │
+│     ├─ .qodeassist/rules/common/*.md                                       │
+│     └─ .qodeassist/rules/chat/*.md                                         │
+│  4. File Context (optional):                                               │
+│     ├─ Attached files (manual)                                             │
+│     ├─ Linked files (persistent)                                           │
+│     └─ Open editor files (if auto-sync enabled)                            │
+│  5. Tool Definitions (if enabled):                                         │
+│     ├─ ReadProjectFileByName                                               │
+│     ├─ ListProjectFiles                                                    │
+│     ├─ SearchInProject                                                     │
+│     └─ GetIssuesList                                                       │
+│  6. Conversation History                                                    │
+│  7. User Message                                                            │
 │                                                                              │
-│  Final Prompt: [System: Persona + ProjectInfo + Skills]                    │
+│  Final Prompt: [System: SystemPrompt + AgentRole + Rules + Tools]          │
 │                [History: Previous messages]                                 │
-│                [User: CurrentFilesSnapshot + UserMessage + Attachments]     │
+│                [User: FileContext + UserMessage]                            │
 └─────────────────────────────────────────────────────────────────────────────┘
 ```
 
@@ -425,26 +368,28 @@ QodeAssist uses a flexible prompt composition system that adapts to different co
 ┌─────────────────────────────────────────────────────────────────────────────┐
 │                         QUICK REFACTORING                                   │
 ├─────────────────────────────────────────────────────────────────────────────┤
-│  1. Agent System Prompt (persona, from the agent's TOML profile)           │
-│  2. Code Context (generated):                                               │
+│  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)                          │
-│     └─ Output formatting and indentation rules                             │
-│  3. Refactor Instruction (the user message):                               │
+│     └─ 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)                            │
-│  4. Tool Definitions (if the agent enables tools)                          │
+│  5. Tool Definitions (if enabled)                                          │
 │                                                                              │
-│  Final Prompt: [System: Persona + CodeContext + Rules]                     │
-│                [User: Instruction + Details]                                │
+│  Final Prompt: [System: SystemPrompt + Rules]                              │
+│                [User: Context + Markers + Instruction + Details]            │
 └─────────────────────────────────────────────────────────────────────────────┘
 ```
 
@@ -452,15 +397,17 @@ QodeAssist uses a flexible prompt composition system that adapts to different co
 
 ### Key Points
 
-- **System Prompts** live in the agent's TOML profile (`system_prompt`); switch personas by switching agents
-- **Linked and open-synced files are always current**: their content is not stored in the conversation — every request re-reads the files and sends a fresh snapshot next to your latest message. Editing a linked file between messages never leaves a stale copy in the context, and changing it does not invalidate the provider's prompt cache for the whole conversation
-- **One-time attachments are different**: they are saved with the message they were sent with and stay in the history as sent
-- **FIM vs Non-FIM** for code completion is the agent's choice: a FIM agent renders prefix/suffix into native FIM fields, an instruct agent sends a chat-shaped request — pick the agent that matches your model
-- **Quick Refactor** has its own agent roster, independent from Chat
+- **Project Rules** are automatically loaded from `.qodeassist/rules/` directory structure
+- **System Prompts** are configured independently for each feature in Settings
+- **Agent Roles** add role-specific prompts on top of the base system prompt (Chat only)
+- **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 the agent enables it; tool rounds per request are limited (configurable in `Settings → Tools`)
+- **Tool Calling** is available for Chat and Quick Refactor when enabled
 
-See the [Quick Refactoring Guide](docs/quick-refactoring.md) for more details.
+See [Project Rules Documentation](docs/project-rules.md), [Agent Roles Guide](docs/agent-roles.md), and [Quick Refactoring Guide](docs/quick-refactoring.md) for more details.
 
 ## QtCreator Version Compatibility
 
@@ -507,7 +454,7 @@ For additional support, join our [Discord Community](https://discord.gg/BGMkUsXU
 - [x] Quick refactoring with custom-instructions library
 - [x] Diff sharing with models
 - [x] Tools / function calling (file I/O, build, terminal, diagnostics)
-- [x] Agent Skills (project + global directories, `/skill` commands, always-on, `load_skill` tool)
+- [x] Project-specific rules (`.qodeassist/rules/`)
 - [x] MCP (Model Context Protocol) — QodeAssist as a server
 - [x] MCP — QodeAssist as a client (consume external MCP tools; authenticated MCP servers not yet supported)
 - [ ] Full project source sharing
@@ -518,12 +465,11 @@ If you find QodeAssist helpful, there are several ways you can support the proje
 
 1. **Report Issues**: If you encounter any bugs or have suggestions for improvements, please [open an issue](https://github.com/Palm1r/qodeassist/issues) on our GitHub repository.
 
-2. **Contribute**: Feel free to submit pull requests with bug fixes or new features. The easiest contribution is an agent preset for a provider or model you use — it's a single TOML file, no C++ required; see [Contributing your agent](docs/creating-agents.md#contributing-your-agent-to-qodeassist).
+2. **Contribute**: Feel free to submit pull requests with bug fixes or new features.
 
 3. **Spread the Word**: Star our GitHub repository and share QodeAssist with your fellow developers.
 
 4. **Financial Support**: If you'd like to support the development financially, you can make a donation using one of the following:
-   - Paypal: [my paypalme page](https://www.paypal.com/paypalme/palm1r)
    - Bitcoin (BTC): `bc1qndq7f0mpnlya48vk7kugvyqj5w89xrg4wzg68t`
    - Ethereum (ETH): `0xA5e8c37c94b24e25F9f1f292a01AF55F03099D8D`
    - Litecoin (LTC): `ltc1qlrxnk30s2pcjchzx4qrxvdjt5gzuervy5mv0vy`
@@ -566,10 +512,6 @@ cmake --build .
 
 ## For Contributors
 
-### Adding an agent preset
-
-New provider/model presets are plain TOML — extend a provider base, register the file in `agents.qrc`, and the test suite validates it automatically. Step-by-step guide: [docs/creating-agents.md](docs/creating-agents.md#contributing-your-agent-to-qodeassist).
-
 ### Code Style
 
 - **QML**: Follow [QML Coding Guide](https://github.com/Furkanzmc/QML-Coding-Guide) by @Furkanzmc
@@ -578,46 +520,7 @@ New provider/model presets are plain TOML — extend a provider base, register t
 
 ### Development Guidelines
 
-For detailed development guidelines and architecture patterns, see [docs/architecture.md](docs/architecture.md) and [docs/target-architecture.md](docs/target-architecture.md).
-
-## License
-
-QodeAssist is licensed under the **GNU General Public License v3.0**
-(see [`LICENSE`](LICENSE)), with **additional attribution terms under
-GPLv3 Section 7(b)**.
-
-You are free to use, modify, and redistribute QodeAssist under GPL-3.0,
-but you **must preserve** the original author attribution, copyright
-notices, and project identification — including in source file headers,
-the plugin metadata (`QodeAssist.json.in`), and the About dialog or
-equivalent user-facing identification. Modified versions must be clearly
-marked as different from the original.
-
-### Commercial licensing
-
-QodeAssist is also available under a separate commercial license for use
-in proprietary or closed-source products without GPL-3.0 obligations.
-For commercial licensing inquiries, contact **palm1r-github-dev@pm.me**.
-
-### Qt Creator components and attributions
-
-QodeAssist is a plugin for Qt Creator and incorporates certain components
-(plugin templates, API headers, and related boilerplate) originating from
-Qt Creator, which are copyright (C) The Qt Company Ltd.
-
-These components are provided by The Qt Company under the GNU General
-Public License version 3, annotated with **The Qt Company GPL Exception
-1.0**. This exception permits the development and distribution of Qt
-Creator plugins under licenses of the plugin author's own choosing,
-notwithstanding the GPL's general linking requirements. It is this
-exception that allows QodeAssist to be offered under both GPL-3.0 and a
-separate commercial license.
-
-The original copyright and license notices of The Qt Company are
-preserved in the relevant source files and must not be removed.
-
-For Qt Creator's licensing terms, see
-[LICENSE.GPL3-EXCEPT](https://github.com/qt-creator/qt-creator/blob/master/LICENSES/LICENSE.GPL3-EXCEPT).
+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)

RefactorContextHelper.hpp

@@ -1,6 +1,5 @@
 // Copyright (C) 2025-2026 Petr Mironychev
 // SPDX-License-Identifier: GPL-3.0-or-later
-// Additional attribution terms under GPLv3 §7(b) apply — see LICENSE
 
 #pragma once
 

RefactorSuggestion.cpp

@@ -1,6 +1,5 @@
 // Copyright (C) 2024-2026 Petr Mironychev
 // SPDX-License-Identifier: GPL-3.0-or-later
-// Additional attribution terms under GPLv3 §7(b) apply — see LICENSE
 
 #include "RefactorSuggestion.hpp"
 #include "LLMSuggestion.hpp"

RefactorSuggestion.hpp

@@ -1,6 +1,5 @@
 // Copyright (C) 2024-2026 Petr Mironychev
 // SPDX-License-Identifier: GPL-3.0-or-later
-// Additional attribution terms under GPLv3 §7(b) apply — see LICENSE
 
 #pragma once
 

RefactorSuggestionHoverHandler.cpp

@@ -1,6 +1,5 @@
 // Copyright (C) 2025-2026 Petr Mironychev
 // SPDX-License-Identifier: GPL-3.0-or-later
-// Additional attribution terms under GPLv3 §7(b) apply — see LICENSE
 
 #include "RefactorSuggestionHoverHandler.hpp"
 #include "RefactorSuggestion.hpp"

RefactorSuggestionHoverHandler.hpp

@@ -1,6 +1,5 @@
 // Copyright (C) 2025-2026 Petr Mironychev
 // SPDX-License-Identifier: GPL-3.0-or-later
-// Additional attribution terms under GPLv3 §7(b) apply — see LICENSE
 
 #pragma once
 
@@ -32,6 +31,7 @@ public:
 
     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); }

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,104 @@
+// Copyright (C) 2025-2026 Petr Mironychev
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#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,70 @@
+// Copyright (C) 2025-2026 Petr Mironychev
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#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,82 @@
+// Copyright (C) 2025-2026 Petr Mironychev
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#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,41 @@
+// Copyright (C) 2025-2026 Petr Mironychev
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#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