chore: Upgrade plugin to QtCreator 16.0.1 (#162)

* feat: Add quick refactor command via context menu
* feat: Add settings for Quick Refactor

.github/scripts/plugin.json

@@ -6,22 +6,52 @@
         "llm",
         "ai"
     ],
-    "compatibility": "Qt 6.8.1",
+    "compatibility": "Qt 6.8.3",
     "platforms": [
         "Windows",
         "macOS",
         "Linux"
     ],
     "license": "GPLv3",
-    "version": "0.4.0",
+    "version": "0.5.7",
     "status": "draft",
     "is_pack": false,
     "released_at": null,
     "version_history": [
         {
             "version": "0.4.0",
-            "is_latest": true,
+            "is_latest": false,
             "released_at": "2024-01-24T15:00:00Z"
+        },
+        {
+            "version": "0.5.2",
+            "is_latest": false,
+            "released_at": "2025-03-13T17:00:00Z"
+        },
+        {
+            "version": "0.5.3",
+            "is_latest": false,
+            "released_at": "2025-03-14T11:00:00Z"
+        },
+        {
+            "version": "0.5.4",
+            "is_latest": false,
+            "released_at": "2025-03-17T03:00:00Z"
+        },
+        {
+            "version": "0.5.5",
+            "is_latest": false,
+            "released_at": "2025-03-20T19:00:00Z"
+        },
+        {
+            "version": "0.5.6",
+            "is_latest": false,
+            "released_at": "2025-04-04T19:00:00Z"
+        },
+        {
+            "version": "0.5.7",
+            "is_latest": true,
+            "released_at": "2025-04-14T01:00:00Z"
         }
     ],
     "icon": "https://github.com/user-attachments/assets/dc336712-83cb-440d-8761-8d0a31de898d",

.github/workflows/build_cmake.yml

@@ -12,9 +12,9 @@ on:
 
 env:
   PLUGIN_NAME: QodeAssist
-  QT_VERSION: 6.8.1
-  QT_CREATOR_VERSION: 15.0.0
-  QT_CREATOR_VERSION_INTERNAL: 15.0.0
+  QT_VERSION: 6.8.3
+  QT_CREATOR_VERSION: 16.0.1
+  QT_CREATOR_VERSION_INTERNAL: 16.0.1
   MACOS_DEPLOYMENT_TARGET: "11.0"
   CMAKE_VERSION: "3.29.6"
   NINJA_VERSION: "1.12.1"
@@ -36,8 +36,8 @@ jobs:
             environment_script: "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvars64.bat",
           }
         - {
-            name: "Ubuntu Latest GCC", artifact: "Linux-x64",
-            os: ubuntu-latest,
+            name: "Ubuntu 22.04 GCC", artifact: "Linux-x64",
+            os: ubuntu-22.04,
             platform: linux_x64,
             cc: "gcc", cxx: "g++"
           }
@@ -70,7 +70,7 @@ jobs:
         cmakeVersion: ${{ env.CMAKE_VERSION }}
         ninjaVersion: ${{ env.NINJA_VERSION }}
 
-    - name: Install system libs
+    - name: Install dependencies
       shell: cmake -P {0}
       run: |
         if ("${{ runner.os }}" STREQUAL "Linux")
@@ -78,7 +78,13 @@ jobs:
             COMMAND sudo apt update
           )
           execute_process(
-            COMMAND sudo apt install libgl1-mesa-dev
+            COMMAND sudo apt install
+              # build dependencies
+              libgl1-mesa-dev libgtest-dev libgmock-dev
+              # runtime dependencies for tests (Qt is downloaded outside package manager,
+              # thus minimal dependencies must be installed explicitly)
+              libsecret-1-0 libxcb-cursor0 libxcb-icccm4 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-render0
+              libxcb-shape0 libxcb-shm0 libxcb-sync1 libxcb-xfixes0 libxcb-xkb1 libxkbcommon-x11-0 xvfb
             RESULT_VARIABLE result
           )
           if (NOT result EQUAL 0)
@@ -240,19 +246,26 @@ jobs:
 
     # The json is the same for all platforms, but we need to save one
     - name: Upload plugin json
-      if: matrix.config.os == 'ubuntu-latest'
+      if: startsWith(matrix.config.os, 'ubuntu')
       uses: actions/upload-artifact@v4
       with:
         name: ${{ env.PLUGIN_NAME }}-origin-json
         path: ./build/build/${{ env.PLUGIN_NAME }}.json
 
+    - name: Run unit tests
+      if: startsWith(matrix.config.os, 'ubuntu')
+      run: |
+        xvfb-run ./build/build/test/QodeAssistTest
+
   update_json:
     if: contains(github.ref, 'tags/v')
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: build
 
     steps:
     - uses: actions/checkout@v4
+      with:
+        submodules: recursive
     - uses: actions/setup-node@v4
       with:
         node-version: '20'

.github/workflows/check_formatting.yml

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

.gitmodules

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

CMakeLists.txt

@@ -8,15 +8,38 @@ set(CMAKE_AUTOUIC ON)
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
+set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
 find_package(QtCreator REQUIRED COMPONENTS Core)
-find_package(Qt6 COMPONENTS Core Gui Quick Widgets Network REQUIRED)
+find_package(Qt6 COMPONENTS Core Gui Quick Widgets Network Test REQUIRED)
+find_package(GTest)
+
+# IDE_VERSION is defined by QtCreator package
+string(REGEX MATCH "([0-9]+)\\.([0-9]+)\\.([0-9]+)" version_match ${IDE_VERSION})
+set(QODEASSIST_QT_CREATOR_VERSION_MAJOR ${CMAKE_MATCH_1})
+set(QODEASSIST_QT_CREATOR_VERSION_MINOR ${CMAKE_MATCH_2})
+set(QODEASSIST_QT_CREATOR_VERSION_PATCH ${CMAKE_MATCH_3})
+
+if(NOT version_match)
+    message(FATAL_ERROR "Failed to parse Qt Creator version string: ${IDE_VERSION}")
+endif()
+
+message(STATUS "Qt Creator Version: ${QODEASSIST_QT_CREATOR_VERSION_MAJOR}.${QODEASSIST_QT_CREATOR_VERSION_MINOR}.${QODEASSIST_QT_CREATOR_VERSION_PATCH}")
+
+add_definitions(
+  -DQODEASSIST_QT_CREATOR_VERSION_MAJOR=${QODEASSIST_QT_CREATOR_VERSION_MAJOR}
+  -DQODEASSIST_QT_CREATOR_VERSION_MINOR=${QODEASSIST_QT_CREATOR_VERSION_MINOR}
+  -DQODEASSIST_QT_CREATOR_VERSION_PATCH=${QODEASSIST_QT_CREATOR_VERSION_PATCH}
+)
 
 add_subdirectory(llmcore)
 add_subdirectory(settings)
 add_subdirectory(logger)
 add_subdirectory(ChatView)
 add_subdirectory(context)
+if(GTest_FOUND)
+  add_subdirectory(test)
+endif()
 
 add_qtc_plugin(QodeAssist
   PLUGIN_DEPENDS
@@ -43,25 +66,32 @@ add_qtc_plugin(QodeAssist
     LLMClientInterface.hpp LLMClientInterface.cpp
     templates/Templates.hpp
     templates/CodeLlamaFim.hpp
-    templates/StarCoder2Fim.hpp
-    templates/DeepSeekCoderFim.hpp
-    templates/CustomFimTemplate.hpp
-    templates/Qwen.hpp
     templates/Ollama.hpp
-    templates/BasicChat.hpp
+    templates/Claude.hpp
+    templates/OpenAI.hpp
+    templates/MistralAI.hpp
+    templates/StarCoder2Fim.hpp
+    # templates/DeepSeekCoderFim.hpp
+    # templates/CustomFimTemplate.hpp
+    templates/Qwen.hpp
+    templates/OpenAICompatible.hpp
     templates/Llama3.hpp
     templates/ChatML.hpp
     templates/Alpaca.hpp
     templates/Llama2.hpp
-    templates/Claude.hpp
-    templates/OpenAI.hpp
+    templates/CodeLlamaQMLFim.hpp
+    templates/GoogleAI.hpp
+    templates/LlamaCppFim.hpp
     providers/Providers.hpp
     providers/OllamaProvider.hpp providers/OllamaProvider.cpp
+    providers/ClaudeProvider.hpp providers/ClaudeProvider.cpp
+    providers/OpenAIProvider.hpp providers/OpenAIProvider.cpp
+    providers/MistralAIProvider.hpp providers/MistralAIProvider.cpp
     providers/LMStudioProvider.hpp providers/LMStudioProvider.cpp
     providers/OpenAICompatProvider.hpp providers/OpenAICompatProvider.cpp
     providers/OpenRouterAIProvider.hpp providers/OpenRouterAIProvider.cpp
-    providers/ClaudeProvider.hpp providers/ClaudeProvider.cpp
-    providers/OpenAIProvider.hpp providers/OpenAIProvider.cpp
+    providers/GoogleAIProvider.hpp providers/GoogleAIProvider.cpp
+    providers/LlamaCppProvider.hpp providers/LlamaCppProvider.cpp
     QodeAssist.qrc
     LSPCompletion.hpp
     LLMSuggestion.hpp LLMSuggestion.cpp
@@ -71,4 +101,26 @@ add_qtc_plugin(QodeAssist
     ConfigurationManager.hpp ConfigurationManager.cpp
     CodeHandler.hpp CodeHandler.cpp
     UpdateStatusWidget.hpp UpdateStatusWidget.cpp
+    widgets/CompletionProgressHandler.hpp widgets/CompletionProgressHandler.cpp
+    widgets/ProgressWidget.hpp widgets/ProgressWidget.cpp
+    widgets/EditorChatButton.hpp widgets/EditorChatButton.cpp
+    widgets/EditorChatButtonHandler.hpp widgets/EditorChatButtonHandler.cpp
+    QuickRefactorHandler.hpp QuickRefactorHandler.cpp
 )
+
+get_target_property(QtCreatorCorePath QtCreator::Core LOCATION)
+find_program(QtCreatorExecutable
+  NAMES
+    qtcreator "Qt Creator"
+  PATHS
+    "${QtCreatorCorePath}/../../../bin"
+    "${QtCreatorCorePath}/../../../MacOS"
+  NO_DEFAULT_PATH
+)
+if (QtCreatorExecutable)
+  add_custom_target(RunQtCreator
+    COMMAND ${QtCreatorExecutable} -pluginpath $<TARGET_FILE_DIR:QodeAssist>
+    DEPENDS QodeAssist
+  )
+  set_target_properties(RunQtCreator PROPERTIES FOLDER "qtc_runnable")
+endif()

ChatView/CMakeLists.txt

@@ -18,9 +18,12 @@ qt_add_qml_module(QodeAssistChatView
     qml/parts/BottomBar.qml
     qml/parts/AttachedFilesPlace.qml
     RESOURCES
-    icons/attach-file.svg
+    icons/attach-file-light.svg
+    icons/attach-file-dark.svg
     icons/close-dark.svg
     icons/close-light.svg
+    icons/link-file-light.svg
+    icons/link-file-dark.svg
     SOURCES
     ChatWidget.hpp ChatWidget.cpp
     ChatModel.hpp ChatModel.cpp

ChatView/ChatModel.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 Petr Mironychev
+ * Copyright (C) 2024-2025 Petr Mironychev
  *
  * This file is part of QodeAssist.
  *
@@ -18,9 +18,9 @@
  */
 
 #include "ChatModel.hpp"
+#include <utils/aspects.h>
 #include <QtCore/qjsonobject.h>
 #include <QtQml>
-#include <utils/aspects.h>
 
 #include "ChatAssistantSettings.hpp"
 
@@ -28,14 +28,14 @@ namespace QodeAssist::Chat {
 
 ChatModel::ChatModel(QObject *parent)
     : QAbstractListModel(parent)
-    , m_totalTokens(0)
 {
     auto &settings = Settings::chatAssistantSettings();
 
-    connect(&settings.chatTokensThreshold,
-            &Utils::BaseAspect::changed,
-            this,
-            &ChatModel::tokensThresholdChanged);
+    connect(
+        &settings.chatTokensThreshold,
+        &Utils::BaseAspect::changed,
+        this,
+        &ChatModel::tokensThresholdChanged);
 }
 
 int ChatModel::rowCount(const QModelIndex &parent) const
@@ -90,26 +90,19 @@ void ChatModel::addMessage(
                                .arg(attachment.filename, attachment.content);
         }
     }
-    int tokenCount = estimateTokenCount(fullContent);
 
     if (!m_messages.isEmpty() && !id.isEmpty() && m_messages.last().id == id) {
         Message &lastMessage = m_messages.last();
-        int oldTokenCount = lastMessage.tokenCount;
         lastMessage.content = content;
         lastMessage.attachments = attachments;
-        lastMessage.tokenCount = tokenCount;
-        m_totalTokens += (tokenCount - oldTokenCount);
         emit dataChanged(index(m_messages.size() - 1), index(m_messages.size() - 1));
     } else {
         beginInsertRows(QModelIndex(), m_messages.size(), m_messages.size());
-        Message newMessage{role, content, tokenCount, id};
+        Message newMessage{role, content, id};
         newMessage.attachments = attachments;
         m_messages.append(newMessage);
-        m_totalTokens += tokenCount;
         endInsertRows();
     }
-
-    emit totalTokensChanged();
 }
 
 QVector<ChatModel::Message> ChatModel::getChatHistory() const
@@ -117,18 +110,11 @@ QVector<ChatModel::Message> ChatModel::getChatHistory() const
     return m_messages;
 }
 
-int ChatModel::estimateTokenCount(const QString &text) const
-{
-    return text.length() / 4;
-}
-
 void ChatModel::clear()
 {
     beginResetModel();
     m_messages.clear();
-    m_totalTokens = 0;
     endResetModel();
-    emit totalTokensChanged();
     emit modelReseted();
 }
 
@@ -142,7 +128,8 @@ QList<MessagePart> ChatModel::processMessageContent(const QString &content) cons
     while (blockMatches.hasNext()) {
         auto match = blockMatches.next();
         if (match.capturedStart() > lastIndex) {
-            QString textBetween = content.mid(lastIndex, match.capturedStart() - lastIndex).trimmed();
+            QString textBetween
+                = content.mid(lastIndex, match.capturedStart() - lastIndex).trimmed();
             if (!textBetween.isEmpty()) {
                 parts.append({MessagePart::Text, textBetween, ""});
             }
@@ -199,11 +186,6 @@ QJsonArray ChatModel::prepareMessagesForRequest(const QString &systemPrompt) con
     return messages;
 }
 
-int ChatModel::totalTokens() const
-{
-    return m_totalTokens;
-}
-
 int ChatModel::tokensThreshold() const
 {
     auto &settings = Settings::chatAssistantSettings();

ChatView/ChatModel.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 Petr Mironychev
+ * Copyright (C) 2024-2025 Petr Mironychev
  *
  * This file is part of QodeAssist.
  *
@@ -33,7 +33,6 @@ namespace QodeAssist::Chat {
 class ChatModel : public QAbstractListModel
 {
     Q_OBJECT
-    Q_PROPERTY(int totalTokens READ totalTokens NOTIFY totalTokensChanged FINAL)
     Q_PROPERTY(int tokensThreshold READ tokensThreshold NOTIFY tokensThresholdChanged FINAL)
     QML_ELEMENT
 
@@ -47,7 +46,6 @@ public:
     {
         ChatRole role;
         QString content;
-        int tokenCount;
         QString id;
 
         QList<Context::ContentFile> attachments;
@@ -70,22 +68,17 @@ public:
     QVector<Message> getChatHistory() const;
     QJsonArray prepareMessagesForRequest(const QString &systemPrompt) const;
 
-    int totalTokens() const;
     int tokensThreshold() const;
 
     QString currentModel() const;
     QString lastMessageId() const;
 
 signals:
-    void totalTokensChanged();
     void tokensThresholdChanged();
     void modelReseted();
 
 private:
-    int estimateTokenCount(const QString &text) const;
-
     QVector<Message> m_messages;
-    int m_totalTokens = 0;
 };
 
 } // namespace QodeAssist::Chat

ChatView/ChatRootView.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 Petr Mironychev
+ * Copyright (C) 2024-2025 Petr Mironychev
  *
  * This file is part of QodeAssist.
  *
@@ -20,9 +20,11 @@
 #include "ChatRootView.hpp"
 
 #include <QClipboard>
+#include <QDesktopServices>
 #include <QFileDialog>
 #include <QMessageBox>
 
+#include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/icore.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/projectexplorer.h>
@@ -35,25 +37,28 @@
 #include "GeneralSettings.hpp"
 #include "Logger.hpp"
 #include "ProjectSettings.hpp"
+#include "context/ContextManager.hpp"
+#include "context/TokenUtils.hpp"
 
 namespace QodeAssist::Chat {
 
 ChatRootView::ChatRootView(QQuickItem *parent)
     : QQuickItem(parent)
     , m_chatModel(new ChatModel(this))
-    , m_clientInterface(new ClientInterface(m_chatModel, this))
+    , m_promptProvider(LLMCore::PromptTemplateManager::instance())
+    , m_clientInterface(new ClientInterface(m_chatModel, &m_promptProvider, this))
 {
+    m_isSyncOpenFiles = Settings::chatAssistantSettings().linkOpenFiles();
+    connect(
+        &Settings::chatAssistantSettings().linkOpenFiles,
+        &Utils::BaseAspect::changed,
+        this,
+        [this]() { setIsSyncOpenFiles(Settings::chatAssistantSettings().linkOpenFiles()); });
+
     auto &settings = Settings::generalSettings();
 
-    connect(&settings.caModel,
-            &Utils::BaseAspect::changed,
-            this,
-            &ChatRootView::currentTemplateChanged);
-
-    connect(&Settings::chatAssistantSettings().sharingCurrentFile,
-            &Utils::BaseAspect::changed,
-            this,
-            &ChatRootView::isSharingCurrentFileChanged);
+    connect(
+        &settings.caModel, &Utils::BaseAspect::changed, this, &ChatRootView::currentTemplateChanged);
 
     connect(
         m_clientInterface,
@@ -61,7 +66,44 @@ ChatRootView::ChatRootView(QQuickItem *parent)
         this,
         &ChatRootView::autosave);
 
-    connect(m_chatModel, &ChatModel::modelReseted, [this]() { m_recentFilePath = QString(); });
+    connect(
+        m_clientInterface,
+        &ClientInterface::messageReceivedCompletely,
+        this,
+        &ChatRootView::updateInputTokensCount);
+
+    connect(m_chatModel, &ChatModel::modelReseted, this, [this]() { setRecentFilePath(QString{}); });
+    connect(this, &ChatRootView::attachmentFilesChanged, &ChatRootView::updateInputTokensCount);
+    connect(this, &ChatRootView::linkedFilesChanged, &ChatRootView::updateInputTokensCount);
+    connect(
+        &Settings::chatAssistantSettings().useSystemPrompt,
+        &Utils::BaseAspect::changed,
+        this,
+        &ChatRootView::updateInputTokensCount);
+    connect(
+        &Settings::chatAssistantSettings().systemPrompt,
+        &Utils::BaseAspect::changed,
+        this,
+        &ChatRootView::updateInputTokensCount);
+
+    auto editors = Core::EditorManager::instance();
+
+    connect(editors, &Core::EditorManager::editorCreated, this, &ChatRootView::onEditorCreated);
+    connect(
+        editors,
+        &Core::EditorManager::editorAboutToClose,
+        this,
+        &ChatRootView::onEditorAboutToClose);
+
+    connect(editors, &Core::EditorManager::currentEditorAboutToChange, this, [this]() {
+        if (m_isSyncOpenFiles) {
+            for (auto editor : std::as_const(m_currentEditors)) {
+                onAppendLinkFileFromEditor(editor);
+            }
+        }
+    });
+
+    updateInputTokensCount();
 }
 
 ChatModel *ChatRootView::chatModel() const
@@ -69,9 +111,9 @@ ChatModel *ChatRootView::chatModel() const
     return m_chatModel;
 }
 
-void ChatRootView::sendMessage(const QString &message, bool sharingCurrentFile)
+void ChatRootView::sendMessage(const QString &message)
 {
-    if (m_chatModel->totalTokens() > m_chatModel->tokensThreshold()) {
+    if (m_inputTokensCount > m_chatModel->tokensThreshold()) {
         QMessageBox::StandardButton reply = QMessageBox::question(
             Core::ICore::dialogParent(),
             tr("Token Limit Exceeded"),
@@ -82,12 +124,12 @@ void ChatRootView::sendMessage(const QString &message, bool sharingCurrentFile)
         if (reply == QMessageBox::Yes) {
             autosave();
             m_chatModel->clear();
-            m_recentFilePath = QString{};
+            setRecentFilePath(QString{});
             return;
         }
     }
 
-    m_clientInterface->sendMessage(message, m_attachmentFiles, sharingCurrentFile);
+    m_clientInterface->sendMessage(message, m_attachmentFiles, m_linkedFiles);
     clearAttachmentFiles();
 }
 
@@ -109,15 +151,24 @@ void ChatRootView::clearAttachmentFiles()
     }
 }
 
+void ChatRootView::clearLinkedFiles()
+{
+    if (!m_linkedFiles.isEmpty()) {
+        m_linkedFiles.clear();
+        emit linkedFilesChanged();
+    }
+}
+
 QString ChatRootView::getChatsHistoryDir() const
 {
     QString path;
 
     if (auto project = ProjectExplorer::ProjectManager::startupProject()) {
         Settings::ProjectSettings projectSettings(project);
-        path = projectSettings.chatHistoryPath().toString();
+        path = projectSettings.chatHistoryPath().toFSPathString();
     } else {
-        path = QString("%1/qodeassist/chat_history").arg(Core::ICore::userResourcePath().toString());
+        path = QString("%1/qodeassist/chat_history")
+                   .arg(Core::ICore::userResourcePath().toFSPathString());
     }
 
     QDir dir(path);
@@ -135,16 +186,13 @@ QString ChatRootView::currentTemplate() const
     return settings.caModel();
 }
 
-bool ChatRootView::isSharingCurrentFile() const
-{
-    return Settings::chatAssistantSettings().sharingCurrentFile();
-}
-
 void ChatRootView::saveHistory(const QString &filePath)
 {
     auto result = ChatSerializer::saveToFile(m_chatModel, filePath);
     if (!result.success) {
         LOG_MESSAGE(QString("Failed to save chat history: %1").arg(result.errorMessage));
+    } else {
+        setRecentFilePath(filePath);
     }
 }
 
@@ -154,8 +202,9 @@ void ChatRootView::loadHistory(const QString &filePath)
     if (!result.success) {
         LOG_MESSAGE(QString("Failed to load chat history: %1").arg(result.errorMessage));
     } else {
-        m_recentFilePath = filePath;
+        setRecentFilePath(filePath);
     }
+    updateInputTokensCount();
 }
 
 void ChatRootView::showSaveDialog()
@@ -214,17 +263,50 @@ QString ChatRootView::getSuggestedFileName() const
 {
     QStringList parts;
 
+    static const QRegularExpression saitizeSymbols = QRegularExpression("[\\/:*?\"<>|\\s]");
+    static const QRegularExpression underSymbols = QRegularExpression("_+");
+
     if (m_chatModel->rowCount() > 0) {
         QString firstMessage
             = m_chatModel->data(m_chatModel->index(0), ChatModel::Content).toString();
         QString shortMessage = firstMessage.split('\n').first().simplified().left(30);
-        shortMessage.replace(QRegularExpression("[^a-zA-Z0-9_-]"), "_");
-        parts << shortMessage;
+
+        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 targetDir = getChatsHistoryDir();
+            QString fullPath = QDir(targetDir).filePath(sanitizedMessage);
+
+            QFileInfo fileInfo(fullPath);
+            if (!fileInfo.exists() && QFileInfo(fileInfo.path()).isWritable()) {
+                parts << sanitizedMessage;
+            }
+        }
     }
 
     parts << QDateTime::currentDateTime().toString("yyyy-MM-dd_HH-mm");
 
-    return parts.join("_");
+    QString fileName = parts.join("_");
+
+    QString fullPath = QDir(getChatsHistoryDir()).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;
 }
 
 void ChatRootView::autosave()
@@ -236,7 +318,7 @@ void ChatRootView::autosave()
     QString filePath = getAutosaveFilePath();
     if (!filePath.isEmpty()) {
         ChatSerializer::saveToFile(m_chatModel, filePath);
-        m_recentFilePath = filePath;
+        setRecentFilePath(filePath);
     }
 }
 
@@ -254,22 +336,205 @@ QString ChatRootView::getAutosaveFilePath() const
     return QDir(dir).filePath(getSuggestedFileName() + ".json");
 }
 
+QStringList ChatRootView::attachmentFiles() const
+{
+    return m_attachmentFiles;
+}
+
+QStringList ChatRootView::linkedFiles() const
+{
+    return m_linkedFiles;
+}
+
 void ChatRootView::showAttachFilesDialog()
 {
     QFileDialog dialog(nullptr, tr("Select Files to Attach"));
     dialog.setFileMode(QFileDialog::ExistingFiles);
 
     if (auto project = ProjectExplorer::ProjectManager::startupProject()) {
-        dialog.setDirectory(project->projectDirectory().toString());
+        dialog.setDirectory(project->projectDirectory().toFSPathString());
     }
 
     if (dialog.exec() == QDialog::Accepted) {
-        QStringList filePaths = dialog.selectedFiles();
-        if (!filePaths.isEmpty()) {
-            m_attachmentFiles = filePaths;
-            emit attachmentFilesChanged();
+        QStringList newFilePaths = dialog.selectedFiles();
+        if (!newFilePaths.isEmpty()) {
+            bool filesAdded = false;
+            for (const QString &filePath : std::as_const(newFilePaths)) {
+                if (!m_attachmentFiles.contains(filePath)) {
+                    m_attachmentFiles.append(filePath);
+                    filesAdded = true;
+                }
+            }
+            if (filesAdded) {
+                emit attachmentFilesChanged();
+            }
         }
     }
 }
 
+void ChatRootView::removeFileFromAttachList(int index)
+{
+    if (index >= 0 && index < m_attachmentFiles.size()) {
+        m_attachmentFiles.removeAt(index);
+        emit attachmentFilesChanged();
+    }
+}
+
+void ChatRootView::showLinkFilesDialog()
+{
+    QFileDialog dialog(nullptr, tr("Select Files to Attach"));
+    dialog.setFileMode(QFileDialog::ExistingFiles);
+
+    if (auto project = ProjectExplorer::ProjectManager::startupProject()) {
+        dialog.setDirectory(project->projectDirectory().toFSPathString());
+    }
+
+    if (dialog.exec() == QDialog::Accepted) {
+        QStringList newFilePaths = dialog.selectedFiles();
+        if (!newFilePaths.isEmpty()) {
+            bool filesAdded = false;
+            for (const QString &filePath : std::as_const(newFilePaths)) {
+                if (!m_linkedFiles.contains(filePath)) {
+                    m_linkedFiles.append(filePath);
+                    filesAdded = true;
+                }
+            }
+            if (filesAdded) {
+                emit linkedFilesChanged();
+            }
+        }
+    }
+}
+
+void ChatRootView::removeFileFromLinkList(int index)
+{
+    if (index >= 0 && index < m_linkedFiles.size()) {
+        m_linkedFiles.removeAt(index);
+        emit linkedFilesChanged();
+    }
+}
+
+void ChatRootView::calculateMessageTokensCount(const QString &message)
+{
+    m_messageTokensCount = Context::TokenUtils::estimateTokens(message);
+    updateInputTokensCount();
+}
+
+void ChatRootView::setIsSyncOpenFiles(bool state)
+{
+    if (m_isSyncOpenFiles != state) {
+        m_isSyncOpenFiles = state;
+        emit isSyncOpenFilesChanged();
+    }
+
+    if (m_isSyncOpenFiles) {
+        for (auto editor : std::as_const(m_currentEditors)) {
+            onAppendLinkFileFromEditor(editor);
+        }
+    }
+}
+
+void ChatRootView::openChatHistoryFolder()
+{
+    QString path;
+    if (auto project = ProjectExplorer::ProjectManager::startupProject()) {
+        Settings::ProjectSettings projectSettings(project);
+        path = projectSettings.chatHistoryPath().toFSPathString();
+    } else {
+        path = QString("%1/qodeassist/chat_history")
+                   .arg(Core::ICore::userResourcePath().toFSPathString());
+    }
+
+    QDir dir(path);
+    if (!dir.exists()) {
+        dir.mkpath(".");
+    }
+
+    QUrl url = QUrl::fromLocalFile(dir.absolutePath());
+    QDesktopServices::openUrl(url);
+}
+
+void ChatRootView::updateInputTokensCount()
+{
+    int inputTokens = m_messageTokensCount;
+    auto &settings = Settings::chatAssistantSettings();
+
+    if (settings.useSystemPrompt()) {
+        inputTokens += Context::TokenUtils::estimateTokens(settings.systemPrompt());
+    }
+
+    if (!m_attachmentFiles.isEmpty()) {
+        auto attachFiles = m_clientInterface->contextManager()->getContentFiles(m_attachmentFiles);
+        inputTokens += Context::TokenUtils::estimateFilesTokens(attachFiles);
+    }
+
+    if (!m_linkedFiles.isEmpty()) {
+        auto linkFiles = m_clientInterface->contextManager()->getContentFiles(m_linkedFiles);
+        inputTokens += Context::TokenUtils::estimateFilesTokens(linkFiles);
+    }
+
+    const auto &history = m_chatModel->getChatHistory();
+    for (const auto &message : history) {
+        inputTokens += Context::TokenUtils::estimateTokens(message.content);
+        inputTokens += 4; // + role
+    }
+
+    m_inputTokensCount = inputTokens;
+    emit inputTokensCountChanged();
+}
+
+int ChatRootView::inputTokensCount() const
+{
+    return m_inputTokensCount;
+}
+
+bool ChatRootView::isSyncOpenFiles() const
+{
+    return m_isSyncOpenFiles;
+}
+
+void ChatRootView::onEditorAboutToClose(Core::IEditor *editor)
+{
+    if (auto document = editor->document(); document && isSyncOpenFiles()) {
+        QString filePath = document->filePath().toFSPathString();
+        m_linkedFiles.removeOne(filePath);
+        emit linkedFilesChanged();
+    }
+
+    if (editor) {
+        m_currentEditors.removeOne(editor);
+    }
+}
+
+void ChatRootView::onAppendLinkFileFromEditor(Core::IEditor *editor)
+{
+    if (auto document = editor->document(); document && isSyncOpenFiles()) {
+        QString filePath = document->filePath().toFSPathString();
+        if (!m_linkedFiles.contains(filePath)) {
+            m_linkedFiles.append(filePath);
+            emit linkedFilesChanged();
+        }
+    }
+}
+
+void ChatRootView::onEditorCreated(Core::IEditor *editor, const Utils::FilePath &filePath)
+{
+    if (editor && editor->document()) {
+        m_currentEditors.append(editor);
+    }
+}
+
+QString ChatRootView::chatFileName() const
+{
+    return QFileInfo(m_recentFilePath).baseName();
+}
+
+void ChatRootView::setRecentFilePath(const QString &filePath)
+{
+    if (m_recentFilePath != filePath) {
+        m_recentFilePath = filePath;
+        emit chatFileNameChanged();
+    }
+}
+
 } // namespace QodeAssist::Chat

ChatView/ChatRootView.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 Petr Mironychev
+ * Copyright (C) 2024-2025 Petr Mironychev
  *
  * This file is part of QodeAssist.
  *
@@ -23,6 +23,8 @@
 
 #include "ChatModel.hpp"
 #include "ClientInterface.hpp"
+#include "llmcore/PromptProviderChat.hpp"
+#include <coreplugin/editormanager/editormanager.h>
 
 namespace QodeAssist::Chat {
 
@@ -31,9 +33,11 @@ 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 isSharingCurrentFile READ isSharingCurrentFile NOTIFY
-                   isSharingCurrentFileChanged FINAL)
-    Q_PROPERTY(QStringList attachmentFiles MEMBER m_attachmentFiles NOTIFY attachmentFilesChanged)
+    Q_PROPERTY(bool isSyncOpenFiles READ isSyncOpenFiles NOTIFY isSyncOpenFilesChanged FINAL)
+    Q_PROPERTY(QStringList attachmentFiles READ attachmentFiles NOTIFY attachmentFilesChanged FINAL)
+    Q_PROPERTY(QStringList linkedFiles READ linkedFiles NOTIFY linkedFilesChanged FINAL)
+    Q_PROPERTY(int inputTokensCount READ inputTokensCount NOTIFY inputTokensCountChanged FINAL)
+    Q_PROPERTY(QString chatFileName READ chatFileName NOTIFY chatFileNameChanged FINAL)
 
     QML_ELEMENT
 
@@ -43,8 +47,6 @@ public:
     ChatModel *chatModel() const;
     QString currentTemplate() const;
 
-    bool isSharingCurrentFile() const;
-
     void saveHistory(const QString &filePath);
     void loadHistory(const QString &filePath);
 
@@ -54,29 +56,60 @@ public:
     void autosave();
     QString getAutosaveFilePath() const;
 
+    QStringList attachmentFiles() const;
+    QStringList linkedFiles() const;
+
     Q_INVOKABLE void showAttachFilesDialog();
+    Q_INVOKABLE void removeFileFromAttachList(int index);
+    Q_INVOKABLE void showLinkFilesDialog();
+    Q_INVOKABLE void removeFileFromLinkList(int index);
+    Q_INVOKABLE void calculateMessageTokensCount(const QString &message);
+    Q_INVOKABLE void setIsSyncOpenFiles(bool state);
+    Q_INVOKABLE void openChatHistoryFolder();
+
+    Q_INVOKABLE void updateInputTokensCount();
+    int inputTokensCount() const;
+
+    bool isSyncOpenFiles() const;
+
+    void onEditorAboutToClose(Core::IEditor *editor);
+    void onAppendLinkFileFromEditor(Core::IEditor *editor);
+    void onEditorCreated(Core::IEditor *editor, const Utils::FilePath &filePath);
+
+    QString chatFileName() const;
+    void setRecentFilePath(const QString &filePath);
 
 public slots:
-    void sendMessage(const QString &message, bool sharingCurrentFile = false);
+    void sendMessage(const QString &message);
     void copyToClipboard(const QString &text);
     void cancelRequest();
     void clearAttachmentFiles();
+    void clearLinkedFiles();
 
 signals:
     void chatModelChanged();
     void currentTemplateChanged();
-    void isSharingCurrentFileChanged();
     void attachmentFilesChanged();
+    void linkedFilesChanged();
+    void inputTokensCountChanged();
+    void isSyncOpenFilesChanged();
+    void chatFileNameChanged();
 
 private:
     QString getChatsHistoryDir() const;
     QString getSuggestedFileName() const;
 
     ChatModel *m_chatModel;
+    LLMCore::PromptProviderChat m_promptProvider;
     ClientInterface *m_clientInterface;
     QString m_currentTemplate;
     QString m_recentFilePath;
     QStringList m_attachmentFiles;
+    QStringList m_linkedFiles;
+    int m_messageTokensCount{0};
+    int m_inputTokensCount{0};
+    bool m_isSyncOpenFiles;
+    QList<Core::IEditor *> m_currentEditors;
 };
 
 } // namespace QodeAssist::Chat

ChatView/ChatSerializer.cpp

@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2024 Petr Mironychev
+ * Copyright (C) 2024-2025 Petr Mironychev
  *
  * This file is part of QodeAssist.
  *
@@ -82,7 +82,6 @@ QJsonObject ChatSerializer::serializeMessage(const ChatModel::Message &message)
     QJsonObject messageObj;
     messageObj["role"] = static_cast<int>(message.role);
     messageObj["content"] = message.content;
-    messageObj["tokenCount"] = message.tokenCount;
     messageObj["id"] = message.id;
     return messageObj;
 }
@@ -92,7 +91,6 @@ ChatModel::Message ChatSerializer::deserializeMessage(const QJsonObject &json)
     ChatModel::Message message;
     message.role = static_cast<ChatModel::ChatRole>(json["role"].toInt());
     message.content = json["content"].toString();
-    message.tokenCount = json["tokenCount"].toInt();
     message.id = json["id"].toString();
     return message;
 }
@@ -107,7 +105,6 @@ QJsonObject ChatSerializer::serializeChat(const ChatModel *model)
     QJsonObject root;
     root["version"] = VERSION;
     root["messages"] = messagesArray;
-    root["totalTokens"] = model->totalTokens();
 
     return root;
 }

ChatView/ChatSerializer.hpp

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

ChatView/ChatUtils.cpp

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

ChatView/ChatUtils.h

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

ChatView/ChatWidget.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 Petr Mironychev
+ * Copyright (C) 2024-2025 Petr Mironychev
  *
  * This file is part of QodeAssist.
  *
@@ -40,4 +40,4 @@ void ChatWidget::scrollToBottom()
 {
     QMetaObject::invokeMethod(rootObject(), "scrollToBottom");
 }
-}
+} // namespace QodeAssist::Chat

ChatView/ChatWidget.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 Petr Mironychev
+ * Copyright (C) 2024-2025 Petr Mironychev
  *
  * This file is part of QodeAssist.
  *
@@ -38,4 +38,4 @@ signals:
     void clearPressed();
 };
 
-}
+} // namespace QodeAssist::Chat

ChatView/ClientInterface.cpp

@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2024 Petr Mironychev
+ * Copyright (C) 2024-2025 Petr Mironychev
  *
  * This file is part of QodeAssist.
  *
@@ -19,11 +19,11 @@
 
 #include "ClientInterface.hpp"
 
+#include <texteditor/textdocument.h>
 #include <QFileInfo>
 #include <QJsonArray>
 #include <QJsonDocument>
 #include <QUuid>
-#include <texteditor/textdocument.h>
 
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/editormanager/ieditor.h>
@@ -33,44 +33,47 @@
 #include <texteditor/texteditor.h>
 
 #include "ChatAssistantSettings.hpp"
-#include "ContextManager.hpp"
 #include "GeneralSettings.hpp"
 #include "Logger.hpp"
-#include "PromptTemplateManager.hpp"
 #include "ProvidersManager.hpp"
 
 namespace QodeAssist::Chat {
 
-ClientInterface::ClientInterface(ChatModel *chatModel, QObject *parent)
+ClientInterface::ClientInterface(
+    ChatModel *chatModel, LLMCore::IPromptProvider *promptProvider, QObject *parent)
     : QObject(parent)
     , m_requestHandler(new LLMCore::RequestHandler(this))
     , m_chatModel(chatModel)
+    , m_promptProvider(promptProvider)
+    , m_contextManager(new Context::ContextManager(this))
 {
-    connect(m_requestHandler,
-            &LLMCore::RequestHandler::completionReceived,
-            this,
-            [this](const QString &completion, const QJsonObject &request, bool isComplete) {
-                handleLLMResponse(completion, request, isComplete);
-            });
+    connect(
+        m_requestHandler,
+        &LLMCore::RequestHandler::completionReceived,
+        this,
+        [this](const QString &completion, const QJsonObject &request, bool isComplete) {
+            handleLLMResponse(completion, request, isComplete);
+        });
 
-    connect(m_requestHandler,
-            &LLMCore::RequestHandler::requestFinished,
-            this,
-            [this](const QString &, bool success, const QString &errorString) {
-                if (!success) {
-                    emit errorOccurred(errorString);
-                }
-            });
+    connect(
+        m_requestHandler,
+        &LLMCore::RequestHandler::requestFinished,
+        this,
+        [this](const QString &, bool success, const QString &errorString) {
+            if (!success) {
+                emit errorOccurred(errorString);
+            }
+        });
 }
 
 ClientInterface::~ClientInterface() = default;
 
 void ClientInterface::sendMessage(
-    const QString &message, const QList<QString> &attachments, bool includeCurrentFile)
+    const QString &message, const QList<QString> &attachments, const QList<QString> &linkedFiles)
 {
     cancelRequest();
 
-    auto attachFiles = Context::ContextManager::instance().getContentFiles(attachments);
+    auto attachFiles = m_contextManager->getContentFiles(attachments);
     m_chatModel->addMessage(message, ChatModel::ChatRole::User, "", attachFiles);
 
     auto &chatAssistantSettings = Settings::chatAssistantSettings();
@@ -84,8 +87,7 @@ void ClientInterface::sendMessage(
     }
 
     auto templateName = Settings::generalSettings().caTemplate();
-    auto promptTemplate = LLMCore::PromptTemplateManager::instance().getChatTemplateByName(
-        templateName);
+    auto promptTemplate = m_promptProvider->getTemplateByName(templateName);
 
     if (!promptTemplate) {
         LOG_MESSAGE(QString("No template found with name: %1").arg(templateName));
@@ -93,54 +95,47 @@ void ClientInterface::sendMessage(
     }
 
     LLMCore::ContextData context;
-    context.prefix = message;
-    context.suffix = "";
 
-    QString systemPrompt;
-    if (chatAssistantSettings.useSystemPrompt())
-        systemPrompt = chatAssistantSettings.systemPrompt();
-
-    if (includeCurrentFile) {
-        QString fileContext = getCurrentFileContext();
-        if (!fileContext.isEmpty()) {
-            systemPrompt = systemPrompt.append(fileContext);
+    if (chatAssistantSettings.useSystemPrompt()) {
+        QString systemPrompt = chatAssistantSettings.systemPrompt();
+        if (!linkedFiles.isEmpty()) {
+            systemPrompt = getSystemPromptWithLinkedFiles(systemPrompt, linkedFiles);
         }
+        context.systemPrompt = systemPrompt;
     }
 
-    QJsonObject providerRequest;
-    providerRequest["model"] = Settings::generalSettings().caModel();
-    providerRequest["stream"] = chatAssistantSettings.stream();
-    providerRequest["messages"] = m_chatModel->prepareMessagesForRequest(systemPrompt);
-
-    if (promptTemplate)
-        promptTemplate->prepareRequest(providerRequest, context);
-    else
-        qWarning("No prompt template found");
-
-    if (provider)
-        provider->prepareRequest(providerRequest, LLMCore::RequestType::Chat);
-    else
-        qWarning("No provider found");
+    QVector<LLMCore::Message> messages;
+    for (const auto &msg : m_chatModel->getChatHistory()) {
+        messages.append({msg.role == ChatModel::ChatRole::User ? "user" : "assistant", msg.content});
+    }
+    context.history = messages;
 
     LLMCore::LLMConfig config;
     config.requestType = LLMCore::RequestType::Chat;
     config.provider = provider;
     config.promptTemplate = promptTemplate;
-    config.url = QString("%1%2").arg(Settings::generalSettings().caUrl(), provider->chatEndpoint());
-    config.providerRequest = providerRequest;
-    config.multiLineCompletion = false;
-    config.apiKey = provider->apiKey();
-
-    QJsonObject request;
-    request["id"] = QUuid::createUuid().toString();
-
-    auto errors = config.provider->validateRequest(config.providerRequest, promptTemplate->type());
-    if (!errors.isEmpty()) {
-        LOG_MESSAGE("Validate errors for chat request:");
-        LOG_MESSAGES(errors);
-        return;
+    if (provider->providerID() == LLMCore::ProviderID::GoogleAI) {
+        QString stream = chatAssistantSettings.stream() ? QString{"streamGenerateContent?alt=sse"}
+                                                        : QString{"generateContent?"};
+        config.url = QUrl(QString("%1/models/%2:%3")
+                              .arg(
+                                  Settings::generalSettings().caUrl(),
+                                  Settings::generalSettings().caModel(),
+                                  stream));
+    } else {
+        config.url
+            = QString("%1%2").arg(Settings::generalSettings().caUrl(), provider->chatEndpoint());
+        config.providerRequest
+            = {{"model", Settings::generalSettings().caModel()},
+               {"stream", chatAssistantSettings.stream()}};
     }
 
+    config.apiKey = provider->apiKey();
+
+    config.provider
+        ->prepareRequest(config.providerRequest, promptTemplate, context, LLMCore::RequestType::Chat);
+
+    QJsonObject request{{"id", QUuid::createUuid().toString()}};
     m_requestHandler->sendLLMRequest(config, request);
 }
 
@@ -156,9 +151,8 @@ void ClientInterface::cancelRequest()
     m_requestHandler->cancelRequest(id);
 }
 
-void ClientInterface::handleLLMResponse(const QString &response,
-                                        const QJsonObject &request,
-                                        bool isComplete)
+void ClientInterface::handleLLMResponse(
+    const QString &response, const QJsonObject &request, bool isComplete)
 {
     const auto message = response.trimmed();
 
@@ -189,13 +183,35 @@ QString ClientInterface::getCurrentFileContext() const
     }
 
     QString fileInfo = QString("Language: %1\nFile: %2\n\n")
-                           .arg(textDocument->mimeType(), textDocument->filePath().toString());
+                           .arg(textDocument->mimeType(), textDocument->filePath().toFSPathString());
 
     QString content = textDocument->document()->toPlainText();
 
-    LOG_MESSAGE(QString("Got context from file: %1").arg(textDocument->filePath().toString()));
+    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
+{
+    return m_contextManager;
+}
+
 } // namespace QodeAssist::Chat

ChatView/ClientInterface.hpp

@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2024 Petr Mironychev
+ * Copyright (C) 2024-2025 Petr Mironychev
  *
  * This file is part of QodeAssist.
  *
@@ -25,6 +25,8 @@
 
 #include "ChatModel.hpp"
 #include "RequestHandler.hpp"
+#include "llmcore/IPromptProvider.hpp"
+#include <context/ContextManager.hpp>
 
 namespace QodeAssist::Chat {
 
@@ -33,16 +35,19 @@ class ClientInterface : public QObject
     Q_OBJECT
 
 public:
-    explicit ClientInterface(ChatModel *chatModel, QObject *parent = nullptr);
+    explicit ClientInterface(
+        ChatModel *chatModel, LLMCore::IPromptProvider *promptProvider, QObject *parent = nullptr);
     ~ClientInterface();
 
     void sendMessage(
         const QString &message,
         const QList<QString> &attachments = {},
-        bool includeCurrentFile = false);
+        const QList<QString> &linkedFiles = {});
     void clearMessages();
     void cancelRequest();
 
+    Context::ContextManager *contextManager() const;
+
 signals:
     void errorOccurred(const QString &error);
     void messageReceivedCompletely();
@@ -50,9 +55,13 @@ signals:
 private:
     void handleLLMResponse(const QString &response, const QJsonObject &request, bool isComplete);
     QString getCurrentFileContext() const;
+    QString getSystemPromptWithLinkedFiles(
+        const QString &basePrompt, const QList<QString> &linkedFiles) const;
 
-    LLMCore::RequestHandler *m_requestHandler;
+    LLMCore::IPromptProvider *m_promptProvider = nullptr;
     ChatModel *m_chatModel;
+    LLMCore::RequestHandler *m_requestHandler;
+    Context::ContextManager *m_contextManager;
 };
 
 } // namespace QodeAssist::Chat

ChatView/MessagePart.hpp

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

ChatView/icons/attach-file-dark.svg

@@ -1,6 +1,7 @@
 <svg width="24" height="48" viewBox="0 0 24 48" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g clip-path="url(#clip0_37_14)">
 <path d="M22 10.1053V36.7368C22 41.8547 17.525 46 12 46C6.475 46 2 41.8547 2 36.7368V7.78947C2 4.59368 4.8 2 8.25 2C11.7 2 15.75 4.59368 15.75 7.78947V35.5789C15.75 36.8526 13.375 39.0526 12 39.0526C10.625 39.0526 8.25 36.8526 8.25 35.5789V21.6842V8.94737" stroke="black" stroke-width="3" stroke-linecap="round"/>
+<path d="M22 10.1053V36.7368C22 41.8547 17.525 46 12 46C6.475 46 2 41.8547 2 36.7368V7.78947C2 4.59368 4.8 2 8.25 2C11.7 2 15.75 4.59368 15.75 7.78947V35.5789C15.75 36.8526 13.375 39.0526 12 39.0526C10.625 39.0526 8.25 36.8526 8.25 35.5789V21.6842V8.94737" stroke="black" stroke-width="3" stroke-linecap="round"/>
 </g>
 <defs>
 <clipPath id="clip0_37_14">

ChatView/icons/attach-file-light.svg

@@ -0,0 +1,11 @@
+<svg width="24" height="48" viewBox="0 0 24 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_51_20)">
+<path d="M22 10.1053V36.7368C22 41.8547 17.525 46 12 46C6.475 46 2 41.8547 2 36.7368V7.78947C2 4.59368 4.8 2 8.25 2C11.7 2 15.75 4.59368 15.75 7.78947V35.5789C15.75 36.8526 13.375 39.0526 12 39.0526C10.625 39.0526 8.25 36.8526 8.25 35.5789V21.6842V8.94737" stroke="white" stroke-width="3" stroke-linecap="round"/>
+<path d="M22 10.1053V36.7368C22 41.8547 17.525 46 12 46C6.475 46 2 41.8547 2 36.7368V7.78947C2 4.59368 4.8 2 8.25 2C11.7 2 15.75 4.59368 15.75 7.78947V35.5789C15.75 36.8526 13.375 39.0526 12 39.0526C10.625 39.0526 8.25 36.8526 8.25 35.5789V21.6842V8.94737" stroke="white" stroke-width="3" stroke-linecap="round"/>
+</g>
+<defs>
+<clipPath id="clip0_51_20">
+<rect width="24" height="48" fill="white"/>
+</clipPath>
+</defs>
+</svg>

ChatView/icons/link-file-dark.svg

@@ -0,0 +1,12 @@
+<svg width="20" height="44" viewBox="0 0 20 44" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_49_24)">
+<path d="M10 12L10 32L10 12Z" fill="black"/>
+<path d="M10 12L10 32" stroke="black" stroke-width="3"/>
+<path d="M1.50001 12.484C1.50001 -1.99999 18.5 -1.99999 18.5 12.484M1.5 31.5334C1.50001 46 18.5 46 18.5 31.5334" stroke="black" stroke-width="3" stroke-linecap="round"/>
+</g>
+<defs>
+<clipPath id="clip0_49_24">
+<rect width="20" height="44" fill="white"/>
+</clipPath>
+</defs>
+</svg>

ChatView/icons/link-file-light.svg

@@ -0,0 +1,12 @@
+<svg width="20" height="44" viewBox="0 0 20 44" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_51_24)">
+<path d="M10 12L10 32Z" fill="white"/>
+<path d="M10 12L10 32" stroke="white" stroke-width="3"/>
+<path d="M1.50001 12.484C1.50001 -1.99999 18.5 -1.99999 18.5 12.484M1.5 31.5334C1.50001 46 18.5 46 18.5 31.5334" stroke="white" stroke-width="3" stroke-linecap="round"/>
+</g>
+<defs>
+<clipPath id="clip0_51_24">
+<rect width="20" height="44" fill="white"/>
+</clipPath>
+</defs>
+</svg>

ChatView/qml/Badge.qml

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

ChatView/qml/ChatItem.qml

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 Petr Mironychev
+ * Copyright (C) 2024-2025 Petr Mironychev
  *
  * This file is part of QodeAssist.
  *
@@ -27,14 +27,18 @@ Rectangle {
 
     property alias msgModel: msgCreator.model
     property alias messageAttachments: attachmentsModel.model
+    property bool isUserMessage: false
 
     height: msgColumn.implicitHeight + 10
     radius: 8
+    color: isUserMessage ? palette.alternateBase
+                         : palette.base
 
     ColumnLayout {
         id: msgColumn
 
-        width: parent.width
+        x: 5
+        width: parent.width - x
         anchors.verticalCenter: parent.verticalCenter
         spacing: 5
 
@@ -113,6 +117,17 @@ Rectangle {
         }
     }
 
+    Rectangle {
+        id: userMessageMarker
+
+        anchors.verticalCenter: parent.verticalCenter
+        width: 3
+        height: root.height - root.radius
+        color: "#92BD6C"
+        radius: root.radius
+        visible: root.isUserMessage
+    }
+
     component TextComponent : TextBlock {
         required property var itemData
         height: implicitHeight + 10

ChatView/qml/RootItem.qml

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 Petr Mironychev
+ * Copyright (C) 2024-2025 Petr Mironychev
  *
  * This file is part of QodeAssist.
  *
@@ -70,8 +70,12 @@ ChatRootView {
             loadButton.onClicked: root.showLoadDialog()
             clearButton.onClicked: root.clearChat()
             tokensBadge {
-                text: qsTr("tokens:%1/%2").arg(root.chatModel.totalTokens).arg(root.chatModel.tokensThreshold)
+                text: qsTr("tokens:%1/%2").arg(root.inputTokensCount).arg(root.chatModel.tokensThreshold)
             }
+            recentPath {
+                text: qsTr("Latest chat file name: %1").arg(root.chatFileName.length > 0 ? root.chatFileName : "Unsaved")
+            }
+            openChatHistory.onClicked: root.openChatHistoryFolder()
         }
 
         ListView {
@@ -92,8 +96,7 @@ ChatRootView {
                 width: ListView.view.width - scroll.width
                 msgModel: root.chatModel.processMessageContent(model.content)
                 messageAttachments: model.attachments
-                color: model.roleType === ChatModel.User ? palette.alternateBase
-                                                         : palette.base
+                isUserMessage: model.roleType === ChatModel.User
             }
 
             header: Item {
@@ -101,7 +104,7 @@ ChatRootView {
                 height: 30
             }
 
-            ScrollBar.vertical: ScrollBar {
+            ScrollBar.vertical: QQC.ScrollBar {
                 id: scroll
             }
 
@@ -147,6 +150,8 @@ ChatRootView {
                     }
                 }
 
+                onTextChanged: root.calculateMessageTokensCount(messageInput.text)
+
                 Keys.onPressed: function(event) {
                     if ((event.key === Qt.Key_Return || event.key === Qt.Key_Enter) && !(event.modifiers & Qt.ShiftModifier)) {
                         root.sendChatMessage()
@@ -161,6 +166,21 @@ ChatRootView {
 
             Layout.fillWidth: true
             attachedFilesModel: root.attachmentFiles
+            iconPath: palette.window.hslLightness > 0.5 ? "qrc:/qt/qml/ChatView/icons/attach-file-dark.svg"
+                                                        : "qrc:/qt/qml/ChatView/icons/attach-file-light.svg"
+            accentColor: Qt.tint(palette.mid, Qt.rgba(0, 0.8, 0.3, 0.4))
+            onRemoveFileFromListByIndex: (index) => root.removeFileFromAttachList(index)
+        }
+
+        AttachedFilesPlace {
+            id: linkedFilesPlace
+
+            Layout.fillWidth: true
+            attachedFilesModel: root.linkedFiles
+            iconPath: palette.window.hslLightness > 0.5 ? "qrc:/qt/qml/ChatView/icons/link-file-dark.svg"
+                                                        : "qrc:/qt/qml/ChatView/icons/link-file-light.svg"
+            accentColor: Qt.tint(palette.mid, Qt.rgba(0, 0.3, 0.8, 0.4))
+            onRemoveFileFromListByIndex: (index) => root.removeFileFromLinkList(index)
         }
 
         BottomBar {
@@ -171,13 +191,19 @@ ChatRootView {
 
             sendButton.onClicked: root.sendChatMessage()
             stopButton.onClicked: root.cancelRequest()
-            sharingCurrentFile.checked: root.isSharingCurrentFile
+            syncOpenFiles {
+                checked: root.isSyncOpenFiles
+                onCheckedChanged: root.setIsSyncOpenFiles(bottomBar.syncOpenFiles.checked)
+            }
             attachFiles.onClicked: root.showAttachFilesDialog()
+            linkFiles.onClicked: root.showLinkFilesDialog()
         }
     }
 
     function clearChat() {
         root.chatModel.clear()
+        root.clearAttachmentFiles()
+        root.updateInputTokensCount()
     }
 
     function scrollToBottom() {
@@ -185,7 +211,7 @@ ChatRootView {
     }
 
     function sendChatMessage() {
-        root.sendMessage(messageInput.text, bottomBar.sharingCurrentFile.checked)
+        root.sendMessage(messageInput.text)
         messageInput.text = ""
         scrollToBottom()
     }

ChatView/qml/controls/QoAButton.qml

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

ChatView/qml/dialog/CodeBlock.qml

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

ChatView/qml/dialog/TextBlock.qml

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

ChatView/qml/parts/AttachedFilesPlace.qml

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 Petr Mironychev
+ * Copyright (C) 2024-2025 Petr Mironychev
  *
  * This file is part of QodeAssist.
  *
@@ -23,9 +23,13 @@ import QtQuick.Layouts
 import ChatView
 
 Flow {
-    id: attachFilesPlace
+    id: root
     
     property alias attachedFilesModel: attachRepeater.model
+    property color accentColor: palette.mid
+    property string iconPath
+
+    signal removeFileFromListByIndex(index: int)
 
     spacing: 5
     leftPadding: 5
@@ -41,17 +45,32 @@ Flow {
             required property string modelData
             
             height: 30
-            width: fileNameText.width + closeButton.width + 20
+            width: contentRow.width + 10
             radius: 4
             color: palette.button
             border.width: 1
-            border.color: palette.mid
+            border.color: mouse.hovered ? palette.highlight : root.accentColor
+
+            HoverHandler {
+                id: mouse
+            }
             
             Row {
+                id: contentRow
+
                 spacing: 5
                 anchors.verticalCenter: parent.verticalCenter
                 anchors.left: parent.left
                 anchors.leftMargin: 5
+
+                Image {
+                    id: icon
+
+                    anchors.verticalCenter: parent.verticalCenter
+                    source: root.iconPath
+                    sourceSize.width: 8
+                    sourceSize.height: 15
+                }
                 
                 Text {
                     id: fileNameText
@@ -69,14 +88,10 @@ Flow {
                     id: closeButton
                     
                     anchors.verticalCenter: parent.verticalCenter
-                    width: closeIcon.width
-                    height: closeButton.width
+                    width: closeIcon.width + 5
+                    height: closeButton.width + 5
                     
-                    onClicked: {
-                        const newList = [...root.attachmentFiles];
-                        newList.splice(index, 1);
-                        root.attachmentFiles = newList;
-                    }
+                    onClicked: root.removeFileFromListByIndex(index)
                     
                     Image {
                         id: closeIcon

ChatView/qml/parts/BottomBar.qml

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 Petr Mironychev
+ * Copyright (C) 2024-2025 Petr Mironychev
  *
  * This file is part of QodeAssist.
  *
@@ -27,8 +27,9 @@ Rectangle {
 
     property alias sendButton: sendButtonId
     property alias stopButton: stopButtonId
-    property alias sharingCurrentFile: sharingCurrentFileId
+    property alias syncOpenFiles: syncOpenFilesId
     property alias attachFiles: attachFilesId
+    property alias linkFiles: linkFilesId
 
     color: palette.window.hslLightness > 0.5 ?
                Qt.darker(palette.window, 1.1) :
@@ -59,23 +60,37 @@ Rectangle {
             text: qsTr("Stop")
         }
 
-        CheckBox {
-            id: sharingCurrentFileId
-
-            text: qsTr("Share current file with models")
-        }
-
         QoAButton {
             id: attachFilesId
 
             icon {
-                source: "qrc:/qt/qml/ChatView/icons/attach-file.svg"
+                source: "qrc:/qt/qml/ChatView/icons/attach-file-dark.svg"
                 height: 15
                 width: 8
             }
             text: qsTr("Attach files")
         }
 
+        QoAButton {
+            id: linkFilesId
+
+            icon {
+                source: "qrc:/qt/qml/ChatView/icons/link-file-dark.svg"
+                height: 15
+                width: 8
+            }
+            text: qsTr("Link files")
+        }
+
+        CheckBox {
+            id: syncOpenFilesId
+
+            text: qsTr("Sync open files")
+
+            ToolTip.visible: syncOpenFilesId.hovered
+            ToolTip.text: qsTr("Automatically synchronize currently opened files with the model context")
+        }
+
         Item {
             Layout.fillWidth: true
         }

ChatView/qml/parts/TopBar.qml

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 Petr Mironychev
+ * Copyright (C) 2024-2025 Petr Mironychev
  *
  * This file is part of QodeAssist.
  *
@@ -28,6 +28,8 @@ Rectangle {
     property alias loadButton: loadButtonId
     property alias clearButton: clearButtonId
     property alias tokensBadge: tokensBadgeId
+    property alias recentPath: recentPathId
+    property alias openChatHistory: openChatHistoryId
 
     color: palette.window.hslLightness > 0.5 ?
                Qt.darker(palette.window, 1.1) :
@@ -62,6 +64,19 @@ Rectangle {
             text: qsTr("Clear")
         }
 
+        Text {
+            id: recentPathId
+
+            elide: Text.ElideMiddle
+            color: palette.text
+        }
+
+        QoAButton {
+            id: openChatHistoryId
+
+            text: qsTr("Show in system")
+        }
+
         Item {
             Layout.fillWidth: true
         }

CodeHandler.cpp

@@ -1,5 +1,6 @@
-/* 
- * Copyright (C) 2024 Petr Mironychev
+/*
+ * Copyright (C) 2024-2025 Petr Mironychev
+ * Copyright (C) 2025 Povilas Kanapickas  <povilas@radix.lt>
  *
  * This file is part of QodeAssist.
  *
@@ -18,41 +19,164 @@
  */
 
 #include "CodeHandler.hpp"
+#include <settings/CodeCompletionSettings.hpp>
+#include <QFileInfo>
 #include <QHash>
 
 namespace QodeAssist {
 
-QString CodeHandler::processText(QString text)
+struct LanguageProperties
+{
+    QString name;
+    QString commentStyle;
+    QVector<QString> namesFromModel;
+    QVector<QString> fileExtensions;
+};
+
+const QVector<LanguageProperties> customLanguagesFromSettings()
+{
+    QVector<LanguageProperties> customLanguages;
+
+    const QStringList customLanguagesList = Settings::codeCompletionSettings().customLanguages();
+    for (const QString &entry : customLanguagesList) {
+        if (entry.trimmed().isEmpty()) {
+            continue;
+        }
+
+        QStringList parts = entry.split(',');
+        if (parts.size() < 4) {
+            continue;
+        }
+
+        QString name = parts[0].trimmed();
+        QString commentStyle = parts[1].trimmed();
+        QStringList modelNamesList = parts[2].trimmed().split(' ', Qt::SkipEmptyParts);
+        QStringList extensionsList = parts[3].trimmed().split(' ', Qt::SkipEmptyParts);
+
+        if (!name.isEmpty() && !commentStyle.isEmpty() && !modelNamesList.isEmpty()
+            && !extensionsList.isEmpty()) {
+            QVector<QString> modelNames;
+            for (const auto &modelName : modelNamesList) {
+                modelNames.append(modelName);
+            }
+
+            QVector<QString> extensions;
+            for (const auto &ext : extensionsList) {
+                extensions.append(ext);
+            }
+
+            customLanguages.append({name, commentStyle, modelNames, extensions});
+        }
+    }
+
+    return customLanguages;
+}
+const QVector<LanguageProperties> &getKnownLanguages()
+{
+    static QVector<LanguageProperties> knownLanguages = {
+        {"python", "#", {"python", "py"}, {"py"}},
+        {"lua", "--", {"lua"}, {"lua"}},
+        {"js", "//", {"js", "javascript"}, {"js", "jsx"}},
+        {"ts", "//", {"ts", "typescript"}, {"ts", "tsx"}},
+        {"c-like", "//", {"c", "c++", "cpp"}, {"c", "h", "cpp", "hpp"}},
+        {"java", "//", {"java"}, {"java"}},
+        {"c#", "//", {"cs", "csharp"}, {"cs"}},
+        {"php", "//", {"php"}, {"php"}},
+        {"ruby", "#", {"rb", "ruby"}, {"rb"}},
+        {"go", "//", {"go"}, {"go"}},
+        {"swift", "//", {"swift"}, {"swift"}},
+        {"kotlin", "//", {"kt", "kotlin"}, {"kt", "kotlin"}},
+        {"scala", "//", {"scala"}, {"scala"}},
+        {"r", "#", {"r"}, {"r"}},
+        {"shell", "#", {"shell", "bash", "sh"}, {"sh", "bash"}},
+        {"perl", "#", {"pl", "perl"}, {"pl"}},
+        {"hs", "--", {"hs", "haskell"}, {"hs"}},
+        {"qml", "//", {"qml"}, {"qml"}},
+    };
+
+    knownLanguages.append(customLanguagesFromSettings());
+
+    return knownLanguages;
+}
+
+static QHash<QString, QString> buildLanguageToCommentPrefixMap()
+{
+    QHash<QString, QString> result;
+    for (const auto &languageProps : getKnownLanguages()) {
+        result[languageProps.name] = languageProps.commentStyle;
+    }
+    return result;
+}
+
+static QHash<QString, QString> buildExtensionToLanguageMap()
+{
+    QHash<QString, QString> result;
+    for (const auto &languageProps : getKnownLanguages()) {
+        for (const auto &extension : languageProps.fileExtensions) {
+            result[extension] = languageProps.name;
+        }
+    }
+    return result;
+}
+
+static QHash<QString, QString> buildModelLanguageNameToLanguageMap()
+{
+    QHash<QString, QString> result;
+    for (const auto &languageProps : getKnownLanguages()) {
+        for (const auto &nameFromModel : languageProps.namesFromModel) {
+            result[nameFromModel] = languageProps.name;
+        }
+    }
+    return result;
+}
+
+QString CodeHandler::processText(QString text, QString currentFilePath)
 {
     QString result;
     QStringList lines = text.split('\n');
     bool inCodeBlock = false;
     QString pendingComments;
-    QString currentLanguage;
+
+    auto currentFileExtension = QFileInfo(currentFilePath).suffix();
+    auto currentLanguage = detectLanguageFromExtension(currentFileExtension);
+
+    auto addPendingCommentsIfAny = [&]() {
+        if (pendingComments.isEmpty()) {
+            return;
+        }
+        QStringList commentLines = pendingComments.split('\n');
+        QString commentPrefix = getCommentPrefix(currentLanguage);
+
+        for (const QString &commentLine : commentLines) {
+            if (!commentLine.trimmed().isEmpty()) {
+                result += commentPrefix + " " + commentLine.trimmed() + "\n";
+            } else {
+                result += "\n";
+            }
+        }
+        pendingComments.clear();
+    };
 
     for (const QString &line : lines) {
         if (line.trimmed().startsWith("```")) {
             if (!inCodeBlock) {
-                currentLanguage = detectLanguage(line);
+                auto lineLanguage = detectLanguageFromLine(line);
+                if (!lineLanguage.isEmpty()) {
+                    currentLanguage = lineLanguage;
+                }
+
+                addPendingCommentsIfAny();
+
+                if (lineLanguage.isEmpty()) {
+                    // language not detected, so add direct output from model, if any
+                    result += line.trimmed().mid(3) + "\n"; // add the remainder of line after ```
+                }
             }
             inCodeBlock = !inCodeBlock;
             continue;
         }
 
         if (inCodeBlock) {
-            if (!pendingComments.isEmpty()) {
-                QStringList commentLines = pendingComments.split('\n');
-                QString commentPrefix = getCommentPrefix(currentLanguage);
-
-                for (const QString &commentLine : commentLines) {
-                    if (!commentLine.trimmed().isEmpty()) {
-                        result += commentPrefix + " " + commentLine.trimmed() + "\n";
-                    } else {
-                        result += "\n";
-                    }
-                }
-                pendingComments.clear();
-            }
             result += line + "\n";
         } else {
             QString trimmed = line.trimmed();
@@ -64,45 +188,27 @@ QString CodeHandler::processText(QString text)
         }
     }
 
-    if (!pendingComments.isEmpty()) {
-        QStringList commentLines = pendingComments.split('\n');
-        QString commentPrefix = getCommentPrefix(currentLanguage);
-
-        for (const QString &commentLine : commentLines) {
-            if (!commentLine.trimmed().isEmpty()) {
-                result += commentPrefix + " " + commentLine.trimmed() + "\n";
-            } else {
-                result += "\n";
-            }
-        }
-    }
+    addPendingCommentsIfAny();
 
     return result;
 }
 
 QString CodeHandler::getCommentPrefix(const QString &language)
 {
-    static const QHash<QString, QString> commentPrefixes
-        = {{"python", "#"},  {"py", "#"},          {"lua", "--"},   {"javascript", "//"},
-           {"js", "//"},     {"typescript", "//"}, {"ts", "//"},    {"cpp", "//"},
-           {"c++", "//"},    {"c", "//"},          {"java", "//"},  {"csharp", "//"},
-           {"cs", "//"},     {"php", "//"},        {"ruby", "#"},   {"rb", "#"},
-           {"rust", "//"},   {"rs", "//"},         {"go", "//"},    {"swift", "//"},
-           {"kotlin", "//"}, {"kt", "//"},         {"scala", "//"}, {"r", "#"},
-           {"shell", "#"},   {"bash", "#"},        {"sh", "#"},     {"perl", "#"},
-           {"pl", "#"},      {"haskell", "--"},    {"hs", "--"}};
-
-    return commentPrefixes.value(language.toLower(), "//");
+    static const auto commentPrefixes = buildLanguageToCommentPrefixMap();
+    return commentPrefixes.value(language, "//");
 }
 
-QString CodeHandler::detectLanguage(const QString &line)
+QString CodeHandler::detectLanguageFromLine(const QString &line)
 {
-    QString trimmed = line.trimmed();
-    if (trimmed.length() <= 3) { // Если только ```
-        return QString();
-    }
+    static const auto modelNameToLanguage = buildModelLanguageNameToLanguageMap();
+    return modelNameToLanguage.value(line.trimmed().mid(3).trimmed(), "");
+}
 
-    return trimmed.mid(3).trimmed();
+QString CodeHandler::detectLanguageFromExtension(const QString &extension)
+{
+    static const auto extensionToLanguage = buildExtensionToLanguageMap();
+    return extensionToLanguage.value(extension.toLower(), "");
 }
 
 const QRegularExpression &CodeHandler::getFullCodeBlockRegex()

CodeHandler.hpp

@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2024 Petr Mironychev
+ * Copyright (C) 2024-2025 Petr Mironychev
  *
  * This file is part of QodeAssist.
  *
@@ -28,11 +28,20 @@ namespace QodeAssist {
 class CodeHandler
 {
 public:
-    static QString processText(QString text);
+    static QString processText(QString text, QString currentFileName);
+
+    /**
+     * Detects language from line, or returns empty string if this was not possible
+     */
+    static QString detectLanguageFromLine(const QString &line);
+
+    /**
+     * Detects language file name, or returns empty string if this was not possible
+     */
+    static QString detectLanguageFromExtension(const QString &extension);
 
 private:
     static QString getCommentPrefix(const QString &language);
-    static QString detectLanguage(const QString &line);
 
     static const QRegularExpression &getFullCodeBlockRegex();
     static const QRegularExpression &getPartialStartBlockRegex();

ConfigurationManager.cpp

@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2024 Petr Mironychev
+ * Copyright (C) 2024-2025 Petr Mironychev
  *
  * This file is part of QodeAssist.
  *
@@ -19,8 +19,8 @@
 
 #include "ConfigurationManager.hpp"
 
-#include <QTimer>
 #include <settings/ButtonAspect.hpp>
+#include <QTimer>
 
 #include "QodeAssisttr.h"
 
@@ -35,6 +35,49 @@ ConfigurationManager &ConfigurationManager::instance()
 void ConfigurationManager::init()
 {
     setupConnections();
+    updateAllTemplateDescriptions();
+    checkAllTemplate();
+}
+
+void ConfigurationManager::updateTemplateDescription(const Utils::StringAspect &templateAspect)
+{
+    LLMCore::PromptTemplate *templ = m_templateManger.getFimTemplateByName(templateAspect.value());
+
+    if (!templ) {
+        return;
+    }
+
+    if (&templateAspect == &m_generalSettings.ccTemplate) {
+        m_generalSettings.ccTemplateDescription.setValue(templ->description());
+    } else if (&templateAspect == &m_generalSettings.caTemplate) {
+        m_generalSettings.caTemplateDescription.setValue(templ->description());
+    }
+}
+
+void ConfigurationManager::updateAllTemplateDescriptions()
+{
+    updateTemplateDescription(m_generalSettings.ccTemplate);
+    updateTemplateDescription(m_generalSettings.caTemplate);
+}
+
+void ConfigurationManager::checkTemplate(const Utils::StringAspect &templateAspect)
+{
+    LLMCore::PromptTemplate *templ = m_templateManger.getFimTemplateByName(templateAspect.value());
+
+    if (templ->name() == templateAspect.value())
+        return;
+
+    if (&templateAspect == &m_generalSettings.ccTemplate) {
+        m_generalSettings.ccTemplate.setValue(templ->name());
+    } else if (&templateAspect == &m_generalSettings.caTemplate) {
+        m_generalSettings.caTemplate.setValue(templ->name());
+    }
+}
+
+void ConfigurationManager::checkAllTemplate()
+{
+    checkTemplate(m_generalSettings.ccTemplate);
+    checkTemplate(m_generalSettings.caTemplate);
 }
 
 ConfigurationManager::ConfigurationManager(QObject *parent)
@@ -57,6 +100,21 @@ void ConfigurationManager::setupConnections()
     connect(&m_generalSettings.caSelectTemplate, &Button::clicked, this, &Config::selectTemplate);
     connect(&m_generalSettings.ccSetUrl, &Button::clicked, this, &Config::selectUrl);
     connect(&m_generalSettings.caSetUrl, &Button::clicked, this, &Config::selectUrl);
+
+    connect(
+        &m_generalSettings.ccPreset1SelectProvider, &Button::clicked, this, &Config::selectProvider);
+    connect(&m_generalSettings.ccPreset1SetUrl, &Button::clicked, this, &Config::selectUrl);
+    connect(&m_generalSettings.ccPreset1SelectModel, &Button::clicked, this, &Config::selectModel);
+    connect(
+        &m_generalSettings.ccPreset1SelectTemplate, &Button::clicked, this, &Config::selectTemplate);
+
+    connect(&m_generalSettings.ccTemplate, &Utils::StringAspect::changed, this, [this]() {
+        updateTemplateDescription(m_generalSettings.ccTemplate);
+    });
+
+    connect(&m_generalSettings.caTemplate, &Utils::StringAspect::changed, this, [this]() {
+        updateTemplateDescription(m_generalSettings.caTemplate);
+    });
 }
 
 void ConfigurationManager::selectProvider()
@@ -69,13 +127,13 @@ void ConfigurationManager::selectProvider()
 
     auto &targetSettings = (settingsButton == &m_generalSettings.ccSelectProvider)
                                ? m_generalSettings.ccProvider
+                           : settingsButton == &m_generalSettings.ccPreset1SelectProvider
+                               ? m_generalSettings.ccPreset1Provider
                                : m_generalSettings.caProvider;
 
     QTimer::singleShot(0, this, [this, providersList, &targetSettings] {
-        m_generalSettings.showSelectionDialog(providersList,
-                                              targetSettings,
-                                              Tr::tr("Select LLM Provider"),
-                                              Tr::tr("Providers:"));
+        m_generalSettings.showSelectionDialog(
+            providersList, targetSettings, Tr::tr("Select LLM Provider"), Tr::tr("Providers:"));
     });
 }
 
@@ -86,14 +144,19 @@ void ConfigurationManager::selectModel()
         return;
 
     const bool isCodeCompletion = (settingsButton == &m_generalSettings.ccSelectModel);
+    const bool isPreset1 = (settingsButton == &m_generalSettings.ccPreset1SelectModel);
 
     const QString providerName = isCodeCompletion ? m_generalSettings.ccProvider.volatileValue()
-                                                  : m_generalSettings.caProvider.volatileValue();
+                                 : isPreset1 ? m_generalSettings.ccPreset1Provider.volatileValue()
+                                             : m_generalSettings.caProvider.volatileValue();
 
     const auto providerUrl = isCodeCompletion ? m_generalSettings.ccUrl.volatileValue()
+                             : isPreset1      ? m_generalSettings.ccPreset1Url.volatileValue()
                                               : m_generalSettings.caUrl.volatileValue();
 
-    auto &targetSettings = isCodeCompletion ? m_generalSettings.ccModel : m_generalSettings.caModel;
+    auto &targetSettings = isCodeCompletion ? m_generalSettings.ccModel
+                           : isPreset1      ? m_generalSettings.ccPreset1Model
+                                            : m_generalSettings.caModel;
 
     if (auto provider = m_providersManager.getProviderByName(providerName)) {
         if (!provider->supportsModelListing()) {
@@ -122,18 +185,23 @@ void ConfigurationManager::selectTemplate()
         return;
 
     const bool isCodeCompletion = (settingsButton == &m_generalSettings.ccSelectTemplate);
+    const bool isPreset1 = (settingsButton == &m_generalSettings.ccPreset1SelectTemplate);
+    const QString providerName = isCodeCompletion ? m_generalSettings.ccProvider.volatileValue()
+                                 : isPreset1 ? m_generalSettings.ccPreset1Provider.volatileValue()
+                                             : m_generalSettings.caProvider.volatileValue();
+    auto providerID = m_providersManager.getProviderByName(providerName)->providerID();
 
-    const auto templateList = isCodeCompletion ? m_templateManger.fimTemplatesNames()
-                                               : m_templateManger.chatTemplatesNames();
+    const auto templateList = isCodeCompletion || isPreset1
+                                  ? m_templateManger.getFimTemplatesForProvider(providerID)
+                                  : m_templateManger.getChatTemplatesForProvider(providerID);
 
     auto &targetSettings = isCodeCompletion ? m_generalSettings.ccTemplate
+                           : isPreset1      ? m_generalSettings.ccPreset1Template
                                             : m_generalSettings.caTemplate;
 
     QTimer::singleShot(0, &m_generalSettings, [this, templateList, &targetSettings]() {
-        m_generalSettings.showSelectionDialog(templateList,
-                                              targetSettings,
-                                              Tr::tr("Select Template"),
-                                              Tr::tr("Templates:"));
+        m_generalSettings.showSelectionDialog(
+            templateList, targetSettings, Tr::tr("Select Template"), Tr::tr("Templates:"));
     });
 }
 
@@ -150,8 +218,9 @@ void ConfigurationManager::selectUrl()
             urls.append(url);
     }
 
-    auto &targetSettings = (settingsButton == &m_generalSettings.ccSetUrl)
-                               ? m_generalSettings.ccUrl
+    auto &targetSettings = (settingsButton == &m_generalSettings.ccSetUrl) ? m_generalSettings.ccUrl
+                           : settingsButton == &m_generalSettings.ccPreset1SetUrl
+                               ? m_generalSettings.ccPreset1Url
                                : m_generalSettings.caUrl;
 
     QTimer::singleShot(0, &m_generalSettings, [this, urls, &targetSettings]() {

ConfigurationManager.hpp

@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2024 Petr Mironychev
+ * Copyright (C) 2024-2025 Petr Mironychev
  *
  * This file is part of QodeAssist.
  *
@@ -36,6 +36,11 @@ public:
 
     void init();
 
+    void updateTemplateDescription(const Utils::StringAspect &templateAspect);
+    void updateAllTemplateDescriptions();
+    void checkTemplate(const Utils::StringAspect &templateAspect);
+    void checkAllTemplate();
+
 public slots:
     void selectProvider();
     void selectModel();

LLMClientInterface.cpp

@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2024 Petr Mironychev
+ * Copyright (C) 2024-2025 Petr Mironychev
  *
  * This file is part of QodeAssist.
  *
@@ -23,32 +23,45 @@
 #include <QNetworkAccessManager>
 #include <QNetworkReply>
 
-#include <llmcore/RequestConfig.hpp>
-#include <texteditor/textdocument.h>
-
 #include "CodeHandler.hpp"
 #include "context/DocumentContextReader.hpp"
-#include "llmcore/MessageBuilder.hpp"
+#include "context/Utils.hpp"
 #include "llmcore/PromptTemplateManager.hpp"
 #include "llmcore/ProvidersManager.hpp"
 #include "logger/Logger.hpp"
 #include "settings/CodeCompletionSettings.hpp"
 #include "settings/GeneralSettings.hpp"
+#include <llmcore/RequestConfig.hpp>
 
 namespace QodeAssist {
 
-LLMClientInterface::LLMClientInterface()
-    : m_requestHandler(this)
+LLMClientInterface::LLMClientInterface(
+    const Settings::GeneralSettings &generalSettings,
+    const Settings::CodeCompletionSettings &completeSettings,
+    LLMCore::IProviderRegistry &providerRegistry,
+    LLMCore::IPromptProvider *promptProvider,
+    LLMCore::RequestHandlerBase &requestHandler,
+    Context::IDocumentReader &documentReader,
+    IRequestPerformanceLogger &performanceLogger)
+    : m_generalSettings(generalSettings)
+    , m_completeSettings(completeSettings)
+    , m_providerRegistry(providerRegistry)
+    , m_promptProvider(promptProvider)
+    , m_requestHandler(requestHandler)
+    , m_documentReader(documentReader)
+    , m_performanceLogger(performanceLogger)
+    , m_contextManager(new Context::ContextManager(this))
 {
-    connect(&m_requestHandler,
-            &LLMCore::RequestHandler::completionReceived,
-            this,
-            &LLMClientInterface::sendCompletionToClient);
+    connect(
+        &m_requestHandler,
+        &LLMCore::RequestHandler::completionReceived,
+        this,
+        &LLMClientInterface::sendCompletionToClient);
 }
 
 Utils::FilePath LLMClientInterface::serverDeviceTemplate() const
 {
-    return "Qode Assist";
+    return "QodeAssist";
 }
 
 void LLMClientInterface::startImpl()
@@ -75,7 +88,7 @@ void LLMClientInterface::sendData(const QByteArray &data)
         handleTextDocumentDidOpen(request);
     } else if (method == "getCompletionsCycling") {
         QString requestId = request["id"].toString();
-        startTimeMeasurement(requestId);
+        m_performanceLogger.startTimeMeasurement(requestId);
         handleCompletion(request);
     } else if (method == "$/cancelRequest") {
         handleCancelRequest(request);
@@ -148,70 +161,110 @@ void LLMClientInterface::handleExit(const QJsonObject &request)
 
 void LLMClientInterface::handleCompletion(const QJsonObject &request)
 {
-    auto updatedContext = prepareContext(request);
-    auto &completeSettings = Settings::codeCompletionSettings();
+    auto filePath = Context::extractFilePathFromRequest(request);
+    auto documentInfo = m_documentReader.readDocument(filePath);
+    if (!documentInfo.document) {
+        LOG_MESSAGE("Error: Document is not available for" + filePath);
+        return;
+    }
 
-    auto providerName = Settings::generalSettings().ccProvider();
-    auto provider = LLMCore::ProvidersManager::instance().getProviderByName(providerName);
+    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) {
         LOG_MESSAGE(QString("No provider found with name: %1").arg(providerName));
         return;
     }
 
-    auto templateName = Settings::generalSettings().ccTemplate();
-    auto promptTemplate = LLMCore::PromptTemplateManager::instance().getFimTemplateByName(
-        templateName);
+    auto templateName = !isPreset1Active ? m_generalSettings.ccTemplate()
+                                         : m_generalSettings.ccPreset1Template();
+
+    auto promptTemplate = m_promptProvider->getTemplateByName(templateName);
 
     if (!promptTemplate) {
         LOG_MESSAGE(QString("No template found with name: %1").arg(templateName));
         return;
     }
 
+    // TODO refactor to dynamic presets system
     LLMCore::LLMConfig config;
     config.requestType = LLMCore::RequestType::CodeCompletion;
     config.provider = provider;
     config.promptTemplate = promptTemplate;
-    config.url = QUrl(QString("%1%2").arg(
-        Settings::generalSettings().ccUrl(),
-        promptTemplate->type() == LLMCore::TemplateType::Fim ? provider->completionEndpoint()
-                                                             : provider->chatEndpoint()));
+    // TODO refactor networking
+    if (provider->providerID() == LLMCore::ProviderID::GoogleAI) {
+        QString stream = m_completeSettings.stream() ? QString{"streamGenerateContent?alt=sse"}
+                                                     : QString{"generateContent?"};
+        config.url = QUrl(QString("%1/models/%2:%3").arg(url, modelName, stream));
+    } else {
+        config.url = QUrl(QString("%1%2").arg(
+            url,
+            promptTemplate->type() == LLMCore::TemplateType::FIM ? provider->completionEndpoint()
+                                                                 : provider->chatEndpoint()));
+        config.providerRequest = {{"model", modelName}, {"stream", m_completeSettings.stream()}};
+    }
     config.apiKey = provider->apiKey();
-
-    config.providerRequest
-        = {{"model", Settings::generalSettings().ccModel()},
-           {"stream", Settings::codeCompletionSettings().stream()}};
-
-    config.multiLineCompletion = completeSettings.multiLineCompletion();
+    config.multiLineCompletion = m_completeSettings.multiLineCompletion();
 
     const auto stopWords = QJsonArray::fromStringList(config.promptTemplate->stopWords());
     if (!stopWords.isEmpty())
         config.providerRequest["stop"] = stopWords;
 
     QString systemPrompt;
-    if (completeSettings.useSystemPrompt())
-        systemPrompt.append(completeSettings.systemPrompt());
-    if (!updatedContext.fileContext.isEmpty())
-        systemPrompt.append(updatedContext.fileContext);
+    if (m_completeSettings.useSystemPrompt())
+        systemPrompt.append(
+            m_completeSettings.useUserMessageTemplateForCC()
+                    && promptTemplate->type() == LLMCore::TemplateType::Chat
+                ? m_completeSettings.systemPromptForNonFimModels()
+                : m_completeSettings.systemPrompt());
+    if (updatedContext.fileContext.has_value())
+        systemPrompt.append(updatedContext.fileContext.value());
 
-    QString userMessage;
-    if (completeSettings.useUserMessageTemplateForCC() && promptTemplate->type() == LLMCore::TemplateType::Chat) {
-        userMessage = completeSettings.userMessageTemplateForCC().arg(updatedContext.prefix, updatedContext.suffix);
-    } else {
-        userMessage = updatedContext.prefix;
+    if (m_completeSettings.useOpenFilesContext()) {
+        if (provider->providerID() == LLMCore::ProviderID::LlamaCpp) {
+            for (const auto openedFilePath : m_contextManager->openedFiles({filePath})) {
+                if (!updatedContext.filesMetadata) {
+                    updatedContext.filesMetadata = QList<LLMCore::FileMetadata>();
+                }
+                updatedContext.filesMetadata->append({openedFilePath.first, openedFilePath.second});
+            }
+        } else {
+            systemPrompt.append(m_contextManager->openedFilesContext({filePath}));
+        }
     }
 
-    auto message = LLMCore::MessageBuilder()
-                       .addSystemMessage(systemPrompt)
-                       .addUserMessage(userMessage)
-                       .addSuffix(updatedContext.suffix)
-                       .addTokenizer(promptTemplate);
+    updatedContext.systemPrompt = systemPrompt;
 
-    message.saveTo(
+    if (promptTemplate->type() == LLMCore::TemplateType::Chat) {
+        QString userMessage;
+        if (m_completeSettings.useUserMessageTemplateForCC()) {
+            userMessage = m_completeSettings.processMessageToFIM(
+                updatedContext.prefix.value_or(""), updatedContext.suffix.value_or(""));
+        } else {
+            userMessage = updatedContext.prefix.value_or("") + updatedContext.suffix.value_or("");
+        }
+
+        // TODO refactor add message
+        QVector<LLMCore::Message> messages;
+        messages.append({"user", userMessage});
+        updatedContext.history = messages;
+    }
+
+    config.provider->prepareRequest(
         config.providerRequest,
-        providerName == "Ollama" ? LLMCore::ProvidersApi::Ollama : LLMCore::ProvidersApi::OpenAI);
-
-    config.provider->prepareRequest(config.providerRequest, LLMCore::RequestType::CodeCompletion);
+        promptTemplate,
+        updatedContext,
+        LLMCore::RequestType::CodeCompletion);
 
     auto errors = config.provider->validateRequest(config.providerRequest, promptTemplate->type());
     if (!errors.isEmpty()) {
@@ -222,37 +275,31 @@ void LLMClientInterface::handleCompletion(const QJsonObject &request)
     m_requestHandler.sendLLMRequest(config, request);
 }
 
-LLMCore::ContextData LLMClientInterface::prepareContext(const QJsonObject &request,
-                                                        const QStringView &accumulatedCompletion)
+LLMCore::ContextData LLMClientInterface::prepareContext(
+    const QJsonObject &request, const Context::DocumentInfo &documentInfo)
 {
     QJsonObject params = request["params"].toObject();
     QJsonObject doc = params["doc"].toObject();
     QJsonObject position = doc["position"].toObject();
-    QString uri = doc["uri"].toString();
-
-    Utils::FilePath filePath = Utils::FilePath::fromString(QUrl(uri).toLocalFile());
-    TextEditor::TextDocument *textDocument = TextEditor::TextDocument::textDocumentForFilePath(
-        filePath);
-
-    if (!textDocument) {
-        LOG_MESSAGE("Error: Document is not available for" + filePath.toString());
-        return LLMCore::ContextData{};
-    }
-
     int cursorPosition = position["character"].toInt();
     int lineNumber = position["line"].toInt();
 
-    Context::DocumentContextReader reader(textDocument);
-    return reader.prepareContext(lineNumber, cursorPosition);
+    Context::DocumentContextReader
+        reader(documentInfo.document, documentInfo.mimeType, documentInfo.filePath);
+    return reader.prepareContext(lineNumber, cursorPosition, m_completeSettings);
 }
 
-void LLMClientInterface::sendCompletionToClient(const QString &completion,
-                                                const QJsonObject &request,
-                                                bool isComplete)
+void LLMClientInterface::sendCompletionToClient(
+    const QString &completion, const QJsonObject &request, bool isComplete)
 {
-    auto templateName = Settings::generalSettings().ccTemplate();
-    auto promptTemplate = LLMCore::PromptTemplateManager::instance().getFimTemplateByName(
-        templateName);
+    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();
 
@@ -264,18 +311,18 @@ void LLMClientInterface::sendCompletionToClient(const QString &completion,
     QJsonArray completions;
     QJsonObject completionItem;
 
+    LOG_MESSAGE(QString("Completions before filter: \n%1").arg(completion));
+
     QString processedCompletion
         = promptTemplate->type() == LLMCore::TemplateType::Chat
-                  && Settings::codeCompletionSettings().smartProcessInstuctText()
-              ? CodeHandler::processText(completion)
+                  && m_completeSettings.smartProcessInstuctText()
+              ? CodeHandler::processText(completion, Context::extractFilePathFromRequest(request))
               : completion;
 
     completionItem[LanguageServerProtocol::textKey] = processedCompletion;
     QJsonObject range;
     range["start"] = position;
-    QJsonObject end = position;
-    end["character"] = position["character"].toInt() + processedCompletion.length();
-    range["end"] = end;
+    range["end"] = position;
     completionItem[LanguageServerProtocol::rangeKey] = range;
     completionItem[LanguageServerProtocol::positionKey] = position;
     completions.append(completionItem);
@@ -287,37 +334,13 @@ void LLMClientInterface::sendCompletionToClient(const QString &completion,
         QString("Completions: \n%1")
             .arg(QString::fromUtf8(QJsonDocument(completions).toJson(QJsonDocument::Indented))));
 
-    LOG_MESSAGE(QString("Full response: \n%1")
-                   .arg(QString::fromUtf8(QJsonDocument(response).toJson(QJsonDocument::Indented))));
+    LOG_MESSAGE(
+        QString("Full response: \n%1")
+            .arg(QString::fromUtf8(QJsonDocument(response).toJson(QJsonDocument::Indented))));
 
     QString requestId = request["id"].toString();
-    endTimeMeasurement(requestId);
+    m_performanceLogger.endTimeMeasurement(requestId);
     emit messageReceived(LanguageServerProtocol::JsonRpcMessage(response));
 }
 
-void LLMClientInterface::startTimeMeasurement(const QString &requestId)
-{
-    m_requestStartTimes[requestId] = QDateTime::currentMSecsSinceEpoch();
-}
-
-void LLMClientInterface::endTimeMeasurement(const QString &requestId)
-{
-    if (m_requestStartTimes.contains(requestId)) {
-        qint64 startTime = m_requestStartTimes[requestId];
-        qint64 endTime = QDateTime::currentMSecsSinceEpoch();
-        qint64 totalTime = endTime - startTime;
-        logPerformance(requestId, "TotalCompletionTime", totalTime);
-        m_requestStartTimes.remove(requestId);
-    }
-}
-
-void LLMClientInterface::logPerformance(const QString &requestId,
-                                        const QString &operation,
-                                        qint64 elapsedMs)
-{
-    LOG_MESSAGE(QString("Performance: %1 %2 took %3 ms").arg(requestId, operation).arg(elapsedMs));
-}
-
-void LLMClientInterface::parseCurrentMessage() {}
-
 } // namespace QodeAssist

LLMClientInterface.hpp

@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2024 Petr Mironychev
+ * Copyright (C) 2024-2025 Petr Mironychev
  *
  * This file is part of QodeAssist.
  *
@@ -22,8 +22,16 @@
 #include <languageclient/languageclientinterface.h>
 #include <texteditor/texteditor.h>
 
+#include <context/ContextManager.hpp>
+#include <context/IDocumentReader.hpp>
+#include <context/ProgrammingLanguage.hpp>
 #include <llmcore/ContextData.hpp>
+#include <llmcore/IPromptProvider.hpp>
+#include <llmcore/IProviderRegistry.hpp>
 #include <llmcore/RequestHandler.hpp>
+#include <logger/IRequestPerformanceLogger.hpp>
+#include <settings/CodeCompletionSettings.hpp>
+#include <settings/GeneralSettings.hpp>
 
 class QNetworkReply;
 class QNetworkAccessManager;
@@ -35,20 +43,27 @@ class LLMClientInterface : public LanguageClient::BaseClientInterface
     Q_OBJECT
 
 public:
-    LLMClientInterface();
+    LLMClientInterface(
+        const Settings::GeneralSettings &generalSettings,
+        const Settings::CodeCompletionSettings &completeSettings,
+        LLMCore::IProviderRegistry &providerRegistry,
+        LLMCore::IPromptProvider *promptProvider,
+        LLMCore::RequestHandlerBase &requestHandler,
+        Context::IDocumentReader &documentReader,
+        IRequestPerformanceLogger &performanceLogger);
 
     Utils::FilePath serverDeviceTemplate() const override;
 
-    void sendCompletionToClient(const QString &completion,
-                                const QJsonObject &request,
-                                bool isComplete);
+    void sendCompletionToClient(
+        const QString &completion, const QJsonObject &request, bool isComplete);
 
     void handleCompletion(const QJsonObject &request);
 
+    // exposed for tests
+    void sendData(const QByteArray &data) override;
+
 protected:
     void startImpl() override;
-    void sendData(const QByteArray &data) override;
-    void parseCurrentMessage() override;
 
 private:
     void handleInitialize(const QJsonObject &request);
@@ -58,16 +73,18 @@ private:
     void handleExit(const QJsonObject &request);
     void handleCancelRequest(const QJsonObject &request);
 
-    LLMCore::ContextData prepareContext(const QJsonObject &request,
-                                        const QStringView &accumulatedCompletion = QString{});
+    LLMCore::ContextData prepareContext(
+        const QJsonObject &request, const Context::DocumentInfo &documentInfo);
 
-    LLMCore::RequestHandler m_requestHandler;
+    const Settings::CodeCompletionSettings &m_completeSettings;
+    const Settings::GeneralSettings &m_generalSettings;
+    LLMCore::IPromptProvider *m_promptProvider = nullptr;
+    LLMCore::IProviderRegistry &m_providerRegistry;
+    LLMCore::RequestHandlerBase &m_requestHandler;
+    Context::IDocumentReader &m_documentReader;
+    IRequestPerformanceLogger &m_performanceLogger;
     QElapsedTimer m_completionTimer;
-    QMap<QString, qint64> m_requestStartTimes;
-
-    void startTimeMeasurement(const QString &requestId);
-    void endTimeMeasurement(const QString &requestId);
-    void logPerformance(const QString &requestId, const QString &operation, qint64 elapsedMs);
+    Context::ContextManager *m_contextManager;
 };
 
 } // namespace QodeAssist

LLMSuggestion.cpp

@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2023 The Qt Company Ltd.
- * Copyright (C) 2024 Petr Mironychev
+ * Copyright (C) 2024-2025 Petr Mironychev
  *
  * This file is part of QodeAssist.
  *

LLMSuggestion.hpp

@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2023 The Qt Company Ltd.
- * Copyright (C) 2024 Petr Mironychev
+ * Copyright (C) 2024-2025 Petr Mironychev
  *
  * This file is part of QodeAssist.
  *

LSPCompletion.hpp

@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2023 The Qt Company Ltd.
- * Copyright (C) 2024 Petr Mironychev
+ * Copyright (C) 2024-2025 Petr Mironychev
  *
  * This file is part of QodeAssist.
  *
@@ -68,9 +68,10 @@ class GetCompletionParams : public LanguageServerProtocol::JsonObject
 public:
     static constexpr LanguageServerProtocol::Key docKey{"doc"};
 
-    GetCompletionParams(const LanguageServerProtocol::TextDocumentIdentifier &document,
-                        int version,
-                        const LanguageServerProtocol::Position &position)
+    GetCompletionParams(
+        const LanguageServerProtocol::TextDocumentIdentifier &document,
+        int version,
+        const LanguageServerProtocol::Position &position)
     {
         setTextDocument(document);
         setVersion(version);

QodeAssist.json.in

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

QodeAssistClient.cpp

@@ -1,8 +1,8 @@
 /*
  * Copyright (C) 2023 The Qt Company Ltd.
- * Copyright (C) 2024 Petr Mironychev
+ * Copyright (C) 2024-2025 Petr Mironychev
  *
- * This file is part of Qode Assist.
+ * This file is part of QodeAssist.
  *
  * The Qt Company portions:
  * SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
@@ -24,8 +24,10 @@
 
 #include "QodeAssistClient.hpp"
 
+#include <QInputDialog>
 #include <QTimer>
 
+#include <coreplugin/icore.h>
 #include <languageclient/languageclientsettings.h>
 #include <projectexplorer/projectmanager.h>
 
@@ -35,6 +37,7 @@
 #include "settings/GeneralSettings.hpp"
 #include "settings/ProjectSettings.hpp"
 #include <context/ChangesManager.h>
+#include <logger/Logger.hpp>
 
 using namespace LanguageServerProtocol;
 using namespace TextEditor;
@@ -44,11 +47,11 @@ using namespace Core;
 
 namespace QodeAssist {
 
-QodeAssistClient::QodeAssistClient()
-    : LanguageClient::Client(new LLMClientInterface())
+QodeAssistClient::QodeAssistClient(LLMClientInterface *clientInterface)
+    : LanguageClient::Client(clientInterface)
     , m_recentCharCount(0)
 {
-    setName("Qode Assist");
+    setName("QodeAssist");
     LanguageClient::LanguageFilter filter;
     filter.mimeTypes = QStringList() << "*";
     setSupportedLanguage(filter);
@@ -128,6 +131,13 @@ void QodeAssistClient::openDocument(TextEditor::TextDocument *document)
                 scheduleRequest(widget);
             }
         });
+
+    // auto editors = BaseTextEditor::textEditorsForDocument(document);
+    // connect(
+    //     editors.first()->editorWidget(),
+    //     &TextEditorWidget::selectionChanged,
+    //     this,
+    //     [this, editors]() { m_chatButtonHandler.showButton(editors.first()->editorWidget()); });
 }
 
 bool QodeAssistClient::canOpenProject(ProjectExplorer::Project *project)
@@ -147,9 +157,13 @@ void QodeAssistClient::requestCompletions(TextEditor::TextEditorWidget *editor)
         return;
 
     const FilePath filePath = editor->textDocument()->filePath();
-    GetCompletionRequest request{{TextDocumentIdentifier(hostPathToServerUri(filePath)),
-                                  documentVersion(filePath),
-                                  Position(cursor.mainCursor())}};
+    GetCompletionRequest request{
+        {TextDocumentIdentifier(hostPathToServerUri(filePath)),
+         documentVersion(filePath),
+         Position(cursor.mainCursor())}};
+    if (Settings::codeCompletionSettings().showProgressWidget()) {
+        m_progressHandler.showProgress(editor);
+    }
     request.setResponseCallback([this, editor = QPointer<TextEditorWidget>(editor)](
                                     const GetCompletionRequest::Response &response) {
         QTC_ASSERT(editor, return);
@@ -159,6 +173,27 @@ void QodeAssistClient::requestCompletions(TextEditor::TextEditorWidget *editor)
     sendMessage(request);
 }
 
+void QodeAssistClient::requestQuickRefactor(
+    TextEditor::TextEditorWidget *editor, const QString &instructions)
+{
+    auto project = ProjectManager::projectForFile(editor->textDocument()->filePath());
+
+    if (!isEnabled(project))
+        return;
+
+    if (!m_refactorHandler) {
+        m_refactorHandler = new QuickRefactorHandler(this);
+        connect(
+            m_refactorHandler,
+            &QuickRefactorHandler::refactoringCompleted,
+            this,
+            &QodeAssistClient::handleRefactoringResult);
+    }
+
+    m_progressHandler.showProgress(editor);
+    m_refactorHandler->sendRefactorRequest(editor, instructions);
+}
+
 void QodeAssistClient::scheduleRequest(TextEditor::TextEditorWidget *editor)
 {
     cancelRunningRequest(editor);
@@ -188,8 +223,8 @@ void QodeAssistClient::scheduleRequest(TextEditor::TextEditorWidget *editor)
     it.value()->setProperty("cursorPosition", editor->textCursor().position());
     it.value()->start(Settings::codeCompletionSettings().startSuggestionTimer());
 }
-void QodeAssistClient::handleCompletions(const GetCompletionRequest::Response &response,
-                                         TextEditor::TextEditorWidget *editor)
+void QodeAssistClient::handleCompletions(
+    const GetCompletionRequest::Response &response, TextEditor::TextEditorWidget *editor)
 {
     if (response.error())
         log(*response.error());
@@ -236,6 +271,7 @@ void QodeAssistClient::handleCompletions(const GetCompletionRequest::Response &r
             Text::Position pos{toTextPos(c.position())};
             return TextSuggestion::Data{range, pos, c.text()};
         });
+        m_progressHandler.hideProgress();
         if (completions.isEmpty())
             return;
         editor->insertSuggestion(std::make_unique<LLMSuggestion>(suggestions, editor->document()));
@@ -247,6 +283,7 @@ void QodeAssistClient::cancelRunningRequest(TextEditor::TextEditorWidget *editor
     const auto it = m_runningRequests.constFind(editor);
     if (it == m_runningRequests.constEnd())
         return;
+    m_progressHandler.hideProgress();
     cancelRequest(it->id());
     m_runningRequests.erase(it);
 }
@@ -267,18 +304,13 @@ void QodeAssistClient::setupConnections()
             openDocument(textDocument);
     };
 
-    m_documentOpenedConnection = connect(EditorManager::instance(),
-                                         &EditorManager::documentOpened,
-                                         this,
-                                         openDoc);
-    m_documentClosedConnection = connect(EditorManager::instance(),
-                                         &EditorManager::documentClosed,
-                                         this,
-                                         [this](IDocument *document) {
-                                             if (auto textDocument = qobject_cast<TextDocument *>(
-                                                     document))
-                                                 closeDocument(textDocument);
-                                         });
+    m_documentOpenedConnection
+        = connect(EditorManager::instance(), &EditorManager::documentOpened, this, openDoc);
+    m_documentClosedConnection = connect(
+        EditorManager::instance(), &EditorManager::documentClosed, this, [this](IDocument *document) {
+            if (auto textDocument = qobject_cast<TextDocument *>(document))
+                closeDocument(textDocument);
+        });
 
     for (IDocument *doc : DocumentModel::openedDocuments())
         openDoc(doc);
@@ -293,4 +325,32 @@ void QodeAssistClient::cleanupConnections()
     m_scheduledRequests.clear();
 }
 
+void QodeAssistClient::handleRefactoringResult(const RefactorResult &result)
+{
+    m_progressHandler.hideProgress();
+    if (!result.success) {
+        LOG_MESSAGE(QString("Refactoring failed: %1").arg(result.errorMessage));
+        return;
+    }
+
+    auto editor = BaseTextEditor::currentTextEditor();
+    if (!editor) {
+        LOG_MESSAGE("Refactoring failed: No active editor found");
+        return;
+    }
+
+    auto editorWidget = editor->editorWidget();
+
+    QTextCursor cursor = editorWidget->textCursor();
+    cursor.beginEditBlock();
+
+    int startPos = result.insertRange.begin.toPositionInDocument(editorWidget->document());
+    int endPos = result.insertRange.end.toPositionInDocument(editorWidget->document());
+
+    cursor.setPosition(startPos);
+    cursor.setPosition(endPos, QTextCursor::KeepAnchor);
+
+    cursor.insertText(result.newText);
+    cursor.endEditBlock();
+}
 } // namespace QodeAssist

QodeAssistClient.hpp

@@ -1,8 +1,8 @@
 /*
  * Copyright (C) 2023 The Qt Company Ltd.
- * Copyright (C) 2024 Petr Mironychev
+ * Copyright (C) 2024-2025 Petr Mironychev
  *
- * This file is part of Qode Assist.
+ * This file is part of QodeAssist.
  *
  * The Qt Company portions:
  * SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
@@ -24,32 +24,40 @@
 
 #pragma once
 
-#include <languageclient/client.h>
-
+#include "LLMClientInterface.hpp"
 #include "LSPCompletion.hpp"
+#include "QuickRefactorHandler.hpp"
+#include "widgets/CompletionProgressHandler.hpp"
+#include "widgets/EditorChatButtonHandler.hpp"
+#include <languageclient/client.h>
+#include <llmcore/IPromptProvider.hpp>
+#include <llmcore/IProviderRegistry.hpp>
 
 namespace QodeAssist {
 
 class QodeAssistClient : public LanguageClient::Client
 {
 public:
-    explicit QodeAssistClient();
+    explicit QodeAssistClient(LLMClientInterface *clientInterface);
     ~QodeAssistClient() override;
 
     void openDocument(TextEditor::TextDocument *document) override;
     bool canOpenProject(ProjectExplorer::Project *project) override;
 
     void requestCompletions(TextEditor::TextEditorWidget *editor);
+    void requestQuickRefactor(
+        TextEditor::TextEditorWidget *editor, const QString &instructions = QString());
 
 private:
     void scheduleRequest(TextEditor::TextEditorWidget *editor);
-    void handleCompletions(const GetCompletionRequest::Response &response,
-                           TextEditor::TextEditorWidget *editor);
+    void handleCompletions(
+        const GetCompletionRequest::Response &response, TextEditor::TextEditorWidget *editor);
     void cancelRunningRequest(TextEditor::TextEditorWidget *editor);
     bool isEnabled(ProjectExplorer::Project *project) const;
 
     void setupConnections();
     void cleanupConnections();
+    void handleRefactoringResult(const RefactorResult &result);
 
     QHash<TextEditor::TextEditorWidget *, GetCompletionRequest> m_runningRequests;
     QHash<TextEditor::TextEditorWidget *, QTimer *> m_scheduledRequests;
@@ -58,6 +66,9 @@ private:
 
     QElapsedTimer m_typingTimer;
     int m_recentCharCount;
+    CompletionProgressHandler m_progressHandler;
+    EditorChatButtonHandler m_chatButtonHandler;
+    QuickRefactorHandler *m_refactorHandler{nullptr};
 };
 
 } // namespace QodeAssist

QodeAssistConstants.hpp

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

QodeAssisttr.h

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

QuickRefactorHandler.cpp

@@ -0,0 +1,293 @@
+/*
+ * Copyright (C) 2025 Petr Mironychev
+ *
+ * This file is part of QodeAssist.
+ *
+ * QodeAssist is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QodeAssist is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QodeAssist. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "QuickRefactorHandler.hpp"
+
+#include <QJsonArray>
+#include <QJsonDocument>
+#include <QUuid>
+
+#include <context/DocumentContextReader.hpp>
+#include <context/DocumentReaderQtCreator.hpp>
+#include <context/Utils.hpp>
+#include <llmcore/PromptTemplateManager.hpp>
+#include <llmcore/ProvidersManager.hpp>
+#include <logger/Logger.hpp>
+#include <settings/ChatAssistantSettings.hpp>
+#include <settings/GeneralSettings.hpp>
+
+namespace QodeAssist {
+
+QuickRefactorHandler::QuickRefactorHandler(QObject *parent)
+    : QObject(parent)
+    , m_requestHandler(new LLMCore::RequestHandler(this))
+    , m_currentEditor(nullptr)
+    , m_isRefactoringInProgress(false)
+    , m_contextManager(this)
+{
+    connect(
+        m_requestHandler,
+        &LLMCore::RequestHandler::completionReceived,
+        this,
+        &QuickRefactorHandler::handleLLMResponse);
+
+    connect(
+        m_requestHandler,
+        &LLMCore::RequestHandler::requestFinished,
+        this,
+        [this](const QString &requestId, bool success, const QString &errorString) {
+            if (!success && requestId == m_lastRequestId) {
+                m_isRefactoringInProgress = false;
+                RefactorResult result;
+                result.success = false;
+                result.errorMessage = errorString;
+                emit refactoringCompleted(result);
+            }
+        });
+}
+
+QuickRefactorHandler::~QuickRefactorHandler() {}
+
+void QuickRefactorHandler::sendRefactorRequest(
+    TextEditor::TextEditorWidget *editor, const QString &instructions)
+{
+    if (m_isRefactoringInProgress) {
+        cancelRequest();
+    }
+
+    m_currentEditor = editor;
+
+    Utils::Text::Range range;
+    if (editor->textCursor().hasSelection()) {
+        QTextCursor cursor = editor->textCursor();
+        int startPos = cursor.selectionStart();
+        int endPos = cursor.selectionEnd();
+
+        QTextBlock startBlock = editor->document()->findBlock(startPos);
+        int startLine = startBlock.blockNumber() + 1;
+        int startColumn = startPos - startBlock.position();
+
+        QTextBlock endBlock = editor->document()->findBlock(endPos);
+        int endLine = endBlock.blockNumber() + 1;
+        int endColumn = endPos - endBlock.position();
+
+        Utils::Text::Position startPosition;
+        startPosition.line = startLine;
+        startPosition.column = startColumn;
+
+        Utils::Text::Position endPosition;
+        endPosition.line = endLine;
+        endPosition.column = endColumn;
+
+        range = Utils::Text::Range();
+        range.begin = startPosition;
+        range.end = endPosition;
+    } else {
+        QTextCursor cursor = editor->textCursor();
+        int cursorPos = cursor.position();
+
+        QTextBlock block = editor->document()->findBlock(cursorPos);
+        int line = block.blockNumber() + 1;
+        int column = cursorPos - block.position();
+
+        Utils::Text::Position cursorPosition;
+        cursorPosition.line = line;
+        cursorPosition.column = column;
+        range = Utils::Text::Range();
+        range.begin = cursorPosition;
+        range.end = cursorPosition;
+    }
+
+    m_currentRange = range;
+    prepareAndSendRequest(editor, instructions, range);
+}
+
+void QuickRefactorHandler::prepareAndSendRequest(
+    TextEditor::TextEditorWidget *editor,
+    const QString &instructions,
+    const Utils::Text::Range &range)
+{
+    auto &settings = Settings::generalSettings();
+
+    auto &providerRegistry = LLMCore::ProvidersManager::instance();
+    auto &promptManager = LLMCore::PromptTemplateManager::instance();
+
+    const auto providerName = settings.caProvider();
+    auto provider = providerRegistry.getProviderByName(providerName);
+
+    if (!provider) {
+        LOG_MESSAGE(QString("No provider found with name: %1").arg(providerName));
+        RefactorResult result;
+        result.success = false;
+        result.errorMessage = QString("No provider found with name: %1").arg(providerName);
+        emit refactoringCompleted(result);
+        return;
+    }
+
+    const auto templateName = settings.caTemplate();
+    auto promptTemplate = promptManager.getChatTemplateByName(templateName);
+
+    if (!promptTemplate) {
+        LOG_MESSAGE(QString("No template found with name: %1").arg(templateName));
+        RefactorResult result;
+        result.success = false;
+        result.errorMessage = QString("No template found with name: %1").arg(templateName);
+        emit refactoringCompleted(result);
+        return;
+    }
+
+    LLMCore::LLMConfig config;
+    config.requestType = LLMCore::RequestType::Chat;
+    config.provider = provider;
+    config.promptTemplate = promptTemplate;
+    config.url = QString("%1%2").arg(settings.caUrl(), provider->chatEndpoint());
+    config.providerRequest
+        = {{"model", settings.caModel()}, {"stream", Settings::chatAssistantSettings().stream()}};
+    config.apiKey = provider->apiKey();
+
+    LLMCore::ContextData context = prepareContext(editor, range, instructions);
+
+    provider
+        ->prepareRequest(config.providerRequest, promptTemplate, context, LLMCore::RequestType::Chat);
+
+    QString requestId = QUuid::createUuid().toString();
+    m_lastRequestId = requestId;
+    QJsonObject request{{"id", requestId}};
+
+    m_isRefactoringInProgress = true;
+
+    m_requestHandler->sendLLMRequest(config, request);
+}
+
+LLMCore::ContextData QuickRefactorHandler::prepareContext(
+    TextEditor::TextEditorWidget *editor,
+    const Utils::Text::Range &range,
+    const QString &instructions)
+{
+    LLMCore::ContextData context;
+
+    auto textDocument = editor->textDocument();
+    Context::DocumentReaderQtCreator documentReader;
+    auto documentInfo = documentReader.readDocument(textDocument->filePath().toUrlishString());
+
+    if (!documentInfo.document) {
+        LOG_MESSAGE("Error: Document is not available");
+        return context;
+    }
+
+    QTextCursor cursor = editor->textCursor();
+    int cursorPos = cursor.position();
+
+    // TODO add selecting content before and after cursor/selection
+    QString fullContent = documentInfo.document->toPlainText();
+    QString taggedContent = fullContent;
+
+    if (cursor.hasSelection()) {
+        int selEnd = cursor.selectionEnd();
+        int selStart = cursor.selectionStart();
+        taggedContent
+            .insert(selEnd, selEnd == cursorPos ? "<selection_end><cursor>" : "<selection_end>");
+        taggedContent.insert(
+            selStart, selStart == cursorPos ? "<cursor><selection_start>" : "<selection_start>");
+    } else {
+        taggedContent.insert(cursorPos, "<cursor>");
+    }
+
+    QString systemPrompt = Settings::codeCompletionSettings().quickRefactorSystemPrompt();
+    systemPrompt += "\n\nFile information:";
+    systemPrompt += "\nLanguage: " + documentInfo.mimeType;
+    systemPrompt += "\nFile path: " + documentInfo.filePath;
+
+    systemPrompt += "\n\nCode context with position markers:";
+    systemPrompt += taggedContent;
+
+    systemPrompt += "\n\nOutput format:";
+    systemPrompt += "\n- Generate ONLY the code that should replace the current selection "
+                    "between<selection_start><selection_end> or be "
+                    "inserted at cursor position<cursor>";
+    systemPrompt += "\n- Do not include any explanations, comments about the code, or markdown "
+                    "code block markers";
+    systemPrompt += "\n- The output should be ready to insert directly into the editor";
+    systemPrompt += "\n- Follow the existing code style and indentation patterns";
+
+    if (Settings::codeCompletionSettings().useOpenFilesInQuickRefactor()) {
+        systemPrompt += "\n\n" + m_contextManager.openedFilesContext({documentInfo.filePath});
+    }
+
+    context.systemPrompt = systemPrompt;
+
+    QVector<LLMCore::Message> messages;
+    messages.append(
+        {"user",
+         instructions.isEmpty() ? "Refactor the code to improve its quality and maintainability."
+                                : instructions});
+    context.history = messages;
+
+    return context;
+}
+
+void QuickRefactorHandler::handleLLMResponse(
+    const QString &response, const QJsonObject &request, bool isComplete)
+{
+    if (request["id"].toString() != m_lastRequestId) {
+        return;
+    }
+
+    if (isComplete) {
+        QString cleanedResponse = response.trimmed();
+        if (cleanedResponse.startsWith("```")) {
+            int firstNewLine = cleanedResponse.indexOf('\n');
+            int lastFence = cleanedResponse.lastIndexOf("```");
+
+            if (firstNewLine != -1 && lastFence > firstNewLine) {
+                cleanedResponse
+                    = cleanedResponse.mid(firstNewLine + 1, lastFence - firstNewLine - 1).trimmed();
+            } else if (lastFence != -1) {
+                cleanedResponse = cleanedResponse.mid(3, lastFence - 3).trimmed();
+            }
+        }
+
+        RefactorResult result;
+        result.newText = cleanedResponse;
+        result.insertRange = m_currentRange;
+        result.success = true;
+
+        LOG_MESSAGE("Refactoring completed successfully. New code to insert: ");
+        LOG_MESSAGE("---------- BEGIN REFACTORED CODE ----------");
+        LOG_MESSAGE(cleanedResponse);
+        LOG_MESSAGE("----------- END REFACTORED CODE -----------");
+
+        emit refactoringCompleted(result);
+    }
+}
+
+void QuickRefactorHandler::cancelRequest()
+{
+    if (m_isRefactoringInProgress) {
+        m_requestHandler->cancelRequest(m_lastRequestId);
+        m_isRefactoringInProgress = false;
+
+        RefactorResult result;
+        result.success = false;
+        result.errorMessage = "Refactoring request was cancelled";
+        emit refactoringCompleted(result);
+    }
+}
+
+} // namespace QodeAssist

QuickRefactorHandler.hpp

@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) 2025 Petr Mironychev
+ *
+ * This file is part of QodeAssist.
+ *
+ * QodeAssist is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QodeAssist is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QodeAssist. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include <QJsonObject>
+#include <QObject>
+
+#include <texteditor/texteditor.h>
+#include <utils/textutils.h>
+
+#include <context/ContextManager.hpp>
+#include <context/IDocumentReader.hpp>
+#include <llmcore/RequestHandler.hpp>
+
+namespace QodeAssist {
+
+struct RefactorResult
+{
+    QString newText;
+    Utils::Text::Range insertRange;
+    bool success;
+    QString errorMessage;
+};
+
+class QuickRefactorHandler : public QObject
+{
+    Q_OBJECT
+
+public:
+    explicit QuickRefactorHandler(QObject *parent = nullptr);
+    ~QuickRefactorHandler() override;
+
+    void sendRefactorRequest(TextEditor::TextEditorWidget *editor, const QString &instructions);
+
+    void cancelRequest();
+
+signals:
+    void refactoringCompleted(const QodeAssist::RefactorResult &result);
+
+private:
+    void prepareAndSendRequest(
+        TextEditor::TextEditorWidget *editor,
+        const QString &instructions,
+        const Utils::Text::Range &range);
+
+    void handleLLMResponse(const QString &response, const QJsonObject &request, bool isComplete);
+    LLMCore::ContextData prepareContext(
+        TextEditor::TextEditorWidget *editor,
+        const Utils::Text::Range &range,
+        const QString &instructions);
+
+    LLMCore::RequestHandler *m_requestHandler;
+    TextEditor::TextEditorWidget *m_currentEditor;
+    Utils::Text::Range m_currentRange;
+    bool m_isRefactoringInProgress;
+    QString m_lastRequestId;
+    Context::ContextManager m_contextManager;
+};
+
+} // namespace QodeAssist

README.md

@@ -2,8 +2,8 @@
 [![Build plugin](https://github.com/Palm1r/QodeAssist/actions/workflows/build_cmake.yml/badge.svg?branch=main)](https://github.com/Palm1r/QodeAssist/actions/workflows/build_cmake.yml)
 ![GitHub Downloads (all assets, all releases)](https://img.shields.io/github/downloads/Palm1r/QodeAssist/total?color=41%2C173%2C71)
 ![GitHub Tag](https://img.shields.io/github/v/tag/Palm1r/QodeAssist)
-![Static Badge](https://img.shields.io/badge/QtCreator-15.0.0-brightgreen)
-![Static Badge](https://img.shields.io/badge/donations:0-brightgreen)
+![Static Badge](https://img.shields.io/badge/QtCreator-16.0.0-brightgreen)
+[![](https://dcbadge.limes.pink/api/server/BGMkUsXUgf?style=flat)](https://discord.gg/BGMkUsXUgf)
 
 ![qodeassist-icon](https://github.com/user-attachments/assets/dc336712-83cb-440d-8761-8d0a31de898d) QodeAssist is an AI-powered coding assistant plugin for Qt Creator. It provides intelligent code completion and suggestions for C++ and QML, leveraging large language models through local providers like Ollama. Enhance your coding productivity with context-aware AI assistance directly in your Qt development environment.
 
@@ -15,33 +15,47 @@
 
 ## Table of Contents
 1. [Overview](#overview)
-2. [Installation for using Ollama](#installation-for-using-Ollama)
-3. [Installation for using Claude](#installation-for-using-Claude)
-3. [Configure Plugin](#configure-plugin)
-4. [Supported LLM Providers](#supported-llm-providers)
-5. [Recommended Models](#recommended-models)
-   - [Ollama](#ollama)
-6. [QtCreator Version Compatibility](#qtcreator-version-compatibility)
-7. [Development Progress](#development-progress)
-8. [Hotkeys](#hotkeys)
-9. [Troubleshooting](#troubleshooting)
-10. [Support the Development](#support-the-development-of-qodeassist)
-11. [How to Build](#how-to-build)
+2. [Install plugin to QtCreator](#install-plugin-to-qtcreator)
+3. [Configure for Anthropic Claude](#configure-for-anthropic-claude)
+4. [Configure for OpenAI](#configure-for-openai)
+5. [Configure for Mistral AI](#configure-for-mistral-ai)
+6. [Configure for Google AI](#configure-for-google-ai)
+7. [Configure for Ollama](#configure-for-ollama)
+8. [Configure for llama.cpp](#configure-for-llamacpp)
+9. [System Prompt Configuration](#system-prompt-configuration)
+10. [File Context Features](#file-context-features)
+11. [QtCreator Version Compatibility](#qtcreator-version-compatibility)
+12. [Development Progress](#development-progress)
+13. [Hotkeys](#hotkeys)
+14. [Troubleshooting](#troubleshooting)
+15. [Support the Development](#support-the-development-of-qodeassist)
+16. [How to Build](#how-to-build)
 
 ## Overview
 
 - AI-powered code completion
+  - Sharing IDE opened files with model context (disabled by default, need enable in settings)
 - Chat functionality:
   - Side and Bottom panels
+  - Chat history autosave and restore
+  - Token usage monitoring and management
+  - Attach files for one-time code analysis
+  - Link files for persistent context with auto update in conversations
+  - Automatic syncing with open editor files (optional)
 - Support for multiple LLM providers:
   - Ollama
-  - Claude
+  - llama.cpp
+  - OpenAI
+  - Anthropic Claude
   - LM Studio
-  - OpenAI-compatible providers(eg. https://openrouter.ai)
+  - Mistral AI
+  - Google AI
+  - OpenAI-compatible providers(eg. llama.cpp, https://openrouter.ai)
 - Extensive library of model-specific templates
-- Custom template support
 - Easy configuration and model selection
 
+Join our Discord Community: Have questions or want to discuss QodeAssist? Join our [Discord server](https://discord.gg/BGMkUsXUgf) to connect with other users and get support!
+
 <details>
   <summary>Code completion: (click to expand)</summary>
   <img src="https://github.com/user-attachments/assets/255a52f1-5cc0-4ca3-b05c-c4cf9cdbe25a" width="600" alt="QodeAssistPreview">
@@ -62,11 +76,80 @@
   <img width="326" alt="QodeAssistBottomPanel" src="https://github.com/user-attachments/assets/4cc64c23-a294-4df8-9153-39ad6fdab34b">
 </details>
 
-## Installation for using Ollama
+<details>
+  <summary>Automatic syncing with open editor files: (click to expand)</summary>
+  <img width="600" alt="OpenedDocumentsSync" src="https://github.com/user-attachments/assets/08efda2f-dc4d-44c3-927c-e6a975090d2f">
+</details>
 
-1. Install Latest QtCreator
-2. Install [Ollama](https://ollama.com). Make sure to review the system requirements before installation.
-3. Install a language models in Ollama via terminal. For example, you can run:
+## Install plugin to QtCreator
+1. Install Latest Qt Creator
+2. Download the QodeAssist plugin for your Qt Creator
+   - Remove old version plugin if already was installed
+      - on macOS for QtCreator 16: ~/Library/Application Support/QtProject/Qt Creator/plugins/16.0.0/petrmironychev.qodeassist
+      - on windows for QtCreator 16: C:\Users\<user>\AppData\Local\QtProject\qtcreator\plugins\16.0.0\petrmironychev.qodeassist\lib\qtcreator\plugins  
+3. Launch Qt Creator and install the plugin:
+   - Go to: 
+     - MacOS: Qt Creator -> About Plugins...
+     - Windows\Linux: Help -> About Plugins...
+   - Click on "Install Plugin..."
+   - Select the downloaded QodeAssist plugin archive file
+
+## Configure for Anthropic Claude
+1. Open Qt Creator settings and navigate to the QodeAssist section
+2. Go to Provider Settings tab and configure Claude api key
+3. Return to General tab and configure:
+   - Set "Claude" as the provider for code completion or/and chat assistant
+   - Set the Claude URL (https://api.anthropic.com)
+   - Select your preferred model (e.g., claude-3-5-sonnet-20241022)
+   - Choose the Claude template for code completion or/and chat
+<details>
+  <summary>Example of Claude settings: (click to expand)</summary>
+<img width="823" alt="Claude Settings" src="https://github.com/user-attachments/assets/828e09ea-e271-4a7a-8271-d3d5dd5c13fd" />
+</details>
+
+## Configure for OpenAI
+1. Open Qt Creator settings and navigate to the QodeAssist section
+2. Go to Provider Settings tab and configure OpenAI api key
+3. Return to General tab and configure:
+   - Set "OpenAI" as the provider for code completion or/and chat assistant
+   - Set the OpenAI URL (https://api.openai.com)
+   - Select your preferred model (e.g., gpt-4o)
+   - Choose the OpenAI template for code completion or/and chat
+<details>
+  <summary>Example of OpenAI settings: (click to expand)</summary>
+  <img width="829" alt="OpenAI Settings" src="https://github.com/user-attachments/assets/4716f790-6159-44d0-a8f4-565ccb6eb713" />
+</details>
+
+## Configure for Mistral AI
+1. Open Qt Creator settings and navigate to the QodeAssist section
+2. Go to Provider Settings tab and configure Mistral AI api key
+3. Return to General tab and configure:
+   - Set "Mistral AI" as the provider for code completion or/and chat assistant
+   - Set the OpenAI URL (https://api.mistral.ai)
+   - Select your preferred model (e.g., mistral-large-latest)
+   - Choose the Mistral AI template for code completion or/and chat
+<details>
+  <summary>Example of Mistral AI settings: (click to expand)</summary>
+  <img width="829" alt="Mistral AI Settings" src="https://github.com/user-attachments/assets/1c5ed13b-a29b-43f7-b33f-2e05fdea540c" />
+</details>
+
+## Configure for Google AI
+1. Open Qt Creator settings and navigate to the QodeAssist section
+2. Go to Provider Settings tab and configure Google AI api key
+3. Return to General tab and configure:
+   - Set "Google AI" as the provider for code completion or/and chat assistant
+   - Set the OpenAI URL (https://generativelanguage.googleapis.com/v1beta)
+   - Select your preferred model (e.g., gemini-2.0-flash)
+   - Choose the Google AI template
+<details>
+  <summary>Example of Google AI settings: (click to expand)</summary>
+  <img width="829" alt="Google AI Settings" src="https://github.com/user-attachments/assets/046ede65-a94d-496c-bc6c-41f3750be12a" />
+</details>
+
+## Configure for Ollama
+
+1. Install [Ollama](https://ollama.com). Make sure to review the system requirements before installation.
+2. Install a language models in Ollama via terminal. For example, you can run:
 
 For standard computers (minimum 8GB RAM):
 ```
@@ -80,107 +163,76 @@ For high-end systems (32GB+ RAM):
 ```
 ollama run qwen2.5-coder:32b
 ```
-4. Download the QodeAssist plugin for your QtCreator.
-5. Launch Qt Creator and install the plugin:
-   - Go to MacOS: Qt Creator -> About Plugins...
-           Windows\Linux: Help -> About Plugins...
-   - Click on "Install Plugin..."
-   - Select the downloaded QodeAssist plugin archive file
-
-## Installation for using Claude
-
-1. Install Latest QtCreator
-2. Download the QodeAssist plugin for your QtCreator.
-3. Launch Qt Creator and install the plugin:
-   - Go to MacOS: Qt Creator -> About Plugins...
-           Windows\Linux: Help -> About Plugins...
-   - Click on "Install Plugin..."
-   - Select the downloaded QodeAssist plugin archive file
-4. Select Claude provider
-5. Select Claude api
-6. Fill in api key for Claude
-5. Select Claude templates for code completion and chat
-6. Enjoy!
-
-## Configure Plugin
-
-QodeAssist comes with default settings that should work immediately after installing a language model. The plugin is pre-configured to use Ollama with standard templates, so you may only need to verify the settings.
 
 1. Open Qt Creator settings (Edit > Preferences on Linux/Windows, Qt Creator > Preferences on macOS)
-2. Navigate to the "Qode Assist" tab
+2. Navigate to the "QodeAssist" tab
 3. On the "General" page, verify:
     - Ollama is selected as your LLM provider
     - The URL is set to http://localhost:11434
     - Your installed model appears in the model selection
-    - The prompt template is Ollama Auto FIM
+    - The prompt template is Ollama Auto FIM or Ollama Auto Chat for chat assistance. You can specify template if it is not work correct
 4. Click Apply if you made any changes
 
 You're all set! QodeAssist is now ready to use in Qt Creator.
+<details>
+  <summary>Example of Ollama settings: (click to expand)</summary>
+  <img width="824" alt="Ollama Settings" src="https://github.com/user-attachments/assets/ed64e03a-a923-467a-aa44-4f790e315b53" />
+</details>
 
-## Supported LLM Providers
-QodeAssist currently supports the following LLM (Large Language Model) providers:
-- [Ollama](https://ollama.com)
-- [LM Studio](https://lmstudio.ai)
-- [OpenRouter](https://openrouter.ai)
-- OpenAI compatible providers
+## Configure for llama.cpp
+1. Open Qt Creator settings and navigate to the QodeAssist section
+2. Go to General tab and configure:
+   - Set "llama.cpp" as the provider for code completion or/and chat assistant
+   - Set the llama.cpp URL (e.g. http://localhost:8080)
+   - Fill in model name
+   - Choose template for model(e.g. llama.cpp FIM for any model with FIM support)
+<details>
+  <summary>Example of llama.cpp settings: (click to expand)</summary>
+  <img width="829" alt="llama.cpp Settings" src="https://github.com/user-attachments/assets/8c75602c-60f3-49ed-a7a9-d3c972061ea2" />
+</details>
 
-## Recommended Models:
-QodeAssist has been thoroughly tested and optimized for use with the following language models:
+## System Prompt Configuration
 
-- Qwen2.5-coder
-- CodeLlama
-- StarCoder2
-- DeepSeek-Coder-V2
+The plugin comes with default system prompts optimized for chat and instruct models, as these currently provide better results for code assistance. If you prefer using FIM (Fill-in-Middle) models, you can easily customize the system prompt in the settings.
 
-### Model Types
+## File Context Features
 
-FIM models (codellama:7b-code, starcoder2:7b, etc.) - Optimized for code completion and suggestions
+QodeAssist provides two powerful ways to include source code files in your chat conversations: Attachments and Linked Files. Each serves a distinct purpose and helps provide better context for the AI assistant.
 
-Instruct models (codellama:7b-instruct, starcoder2:instruct, etc.) - Better for chat assistance, explanations, and code review
+### Attached Files
 
-For best results, use FIM models with code completion and Instruct models with chat features.
+Attachments are designed for one-time code analysis and specific queries:
+  - Files are included only in the current message
+  - Content is discarded after the message is processed
+  - Ideal for:
+    - Getting specific feedback on code changes
+    - Code review requests
+    - Analyzing isolated code segments
+    - Quick implementation questions
+  - Files can be attached using the paperclip icon in the chat interface
+  - Multiple files can be attached to a single message
 
-### Ollama:
-### For autocomplete(FIM)
-```
-ollama run codellama:7b-code
-ollama run starcoder2:7b
-ollama run qwen2.5-coder:7b-base
-ollama run deepseek-coder-v2:16b-lite-base-q3_K_M
-```
-### For chat and instruct
-```
-ollama run codellama:7b-instruct
-ollama run starcoder2:instruct
-ollama run qwen2.5-coder:7b-instruct
-ollama run deepseek-coder-v2
-```
+### Linked Files
 
-### Template-Model Compatibility
+Linked files provide persistent context throughout the conversation:
 
-| Template | Compatible Models | Purpose |
-|----------|------------------|----------|
-| CodeLlama FIM | `codellama:code` | Code completion |
-| DeepSeekCoder FIM | `deepseek-coder-v2`, `deepseek-v2.5` | Code completion |
-| Ollama Auto FIM | `Any Ollama base model` | Code completion |
-| Qwen FIM | `Qwen 2.5 models` | Code completion |
-| StarCoder2 FIM | `starcoder2 base model` | Code completion |
-| Alpaca | `starcoder2:instruct` | Chat assistance |
-| Basic Chat| `Messages without tokens` | Chat assistance |
-| ChatML | `Qwen 2.5 models` | Chat assistance |
-| Llama2 | `llama2 model family`, `codellama:instruct` | Chat assistance |
-| Llama3 | `llama3 model family` | Chat assistance |
-| Ollama Auto Chat | `Any Ollama chat model` | Chat assistance |
-
-> Note: 
-> - FIM (Fill-in-Middle) templates are optimized for code completion
-> - Chat templates are designed for interactive dialogue
-> - The Ollama Auto templates automatically adapt to most Ollama models
-> - Custom Template allows you to define your own prompt format
+  - Files remain accessible for the entire chat session
+  - Content is included in every message exchange
+  - Files are automatically refreshed - always using latest content from disk
+  - Perfect for:
+    - Long-term refactoring discussions
+    - Complex architectural changes
+    - Multi-file implementations
+    - Maintaining context across related questions
+  - Can be managed using the link icon in the chat interface
+  - Supports automatic syncing with open editor files (can be enabled in settings)
+  - Files can be added/removed at any time during the conversation
 
 ## QtCreator Version Compatibility
 
-- QtCreator 15.0.0 - 0.4.x 
+- QtCreator 16.0.0 - 0.5.2 - 0.5.x
+- QtCreator 15.0.1 - 0.4.8 - 0.5.1
+- QtCreator 15.0.0 - 0.4.0 - 0.4.7 
 - QtCreator 14.0.2 - 0.2.3 - 0.3.x 
 - QtCreator 14.0.1 - 0.2.2 plugin version and below
 
@@ -198,6 +250,7 @@ ollama run deepseek-coder-v2
 - To call manual request to suggestion, you can use or change it in settings
     - on Mac: Option + Command + Q
     - on Windows: Ctrl + Alt + Q
+    - on Linux with KDE Plasma: Ctrl + Alt + Q
 - To insert the full suggestion, you can use the TAB key
 - To insert word of suggistion, you can use Alt + Right Arrow for Win/Lin, or Option + Right Arrow for Mac
     
@@ -210,20 +263,17 @@ If QodeAssist is having problems connecting to the LLM provider, please check th
     - For Ollama, the default is usually http://localhost:11434
     - For LM Studio, the default is usually http://localhost:1234
 
-2. Check the endpoint:
+2. Confirm that the selected model and template are compatible:
 
-Make sure the endpoint in the settings matches the one required by your provider
-    - For Ollama, it should be /api/generate
-    - For LM Studio and OpenAI compatible providers, it's usually /v1/chat/completions
+    Ensure you've chosen the correct model in the "Select Models" option
+    Verify that the selected prompt template matches the model you're using
 
-3. Confirm that the selected model and template are compatible:
-
-Ensure you've chosen the correct model in the "Select Models" option
-Verify that the selected prompt template matches the model you're using
+3. On Linux the prebuilt binaries support only ubuntu 22.04+ or simililliar os. 
+If you need compatiblity with another os, you have to build manualy. our experiments and resolution you can check here: https://github.com/Palm1r/QodeAssist/issues/48
 
 If you're still experiencing issues with QodeAssist, you can try resetting the settings to their default values:
 1. Open Qt Creator settings
-2. Navigate to the "Qode Assist" tab
+2. Navigate to the "QodeAssist" tab
 3. Pick settings page for reset
 4. Click on the "Reset Page to Defaults" button
     - The API key will not reset

UpdateStatusWidget.cpp

@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2024 Petr Mironychev
+ * Copyright (C) 2024-2025 Petr Mironychev
  *
  * This file is part of QodeAssist.
  *
@@ -52,10 +52,10 @@ void UpdateStatusWidget::setDefaultAction(QAction *action)
 
 void UpdateStatusWidget::showUpdateAvailable(const QString &version)
 {
-    m_versionLabel->setText(tr("new version: v%1").arg(version));
+    m_versionLabel->setText(tr("New version: v%1").arg(version));
     m_versionLabel->setVisible(true);
     m_updateButton->setVisible(true);
-    m_updateButton->setToolTip(tr("Update QodeAssist to version %1").arg(version));
+    m_updateButton->setToolTip(tr("Check update information"));
 }
 
 void UpdateStatusWidget::hideUpdateInfo()

UpdateStatusWidget.hpp

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

Version.hpp

@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2025 Povilas Kanapickas <povilas@radix.lt>
+ *
+ * This file is part of QodeAssist.
+ *
+ * QodeAssist is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QodeAssist is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QodeAssist. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include <QtGlobal>
+
+#define QODEASSIST_QT_CREATOR_VERSION \
+    QT_VERSION_CHECK( \
+        QODEASSIST_QT_CREATOR_VERSION_MAJOR, \
+        QODEASSIST_QT_CREATOR_VERSION_MINOR, \
+        QODEASSIST_QT_CREATOR_VERSION_PATCH)

chat/ChatOutputPane.cpp

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

chat/ChatOutputPane.h

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

chat/NavigationPanel.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 Petr Mironychev
+ * Copyright (C) 2024-2025 Petr Mironychev
  *
  * This file is part of QodeAssist.
  *
@@ -23,16 +23,15 @@
 
 namespace QodeAssist::Chat {
 
-NavigationPanel::NavigationPanel() {
+NavigationPanel::NavigationPanel()
+{
     setDisplayName(tr("QodeAssist Chat"));
     setPriority(500);
     setId("QodeAssistChat");
     setActivationSequence(QKeySequence(Qt::CTRL | Qt::ALT | Qt::Key_C));
 }
 
-NavigationPanel::~NavigationPanel()
-{
-}
+NavigationPanel::~NavigationPanel() {}
 
 Core::NavigationView NavigationPanel::createWidget()
 {
@@ -42,4 +41,4 @@ Core::NavigationView NavigationPanel::createWidget()
     return view;
 }
 
-}
+} // namespace QodeAssist::Chat

chat/NavigationPanel.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 Petr Mironychev
+ * Copyright (C) 2024-2025 Petr Mironychev
  *
  * This file is part of QodeAssist.
  *
@@ -19,8 +19,8 @@
 
 #pragma once
 
-#include <QObject>
 #include <coreplugin/inavigationwidgetfactory.h>
+#include <QObject>
 
 namespace QodeAssist::Chat {
 
@@ -34,4 +34,4 @@ public:
     Core::NavigationView createWidget() override;
 };
 
-}
+} // namespace QodeAssist::Chat

context/CMakeLists.txt

@@ -3,6 +3,11 @@ add_library(Context STATIC
     ChangesManager.h ChangesManager.cpp
     ContextManager.hpp ContextManager.cpp
     ContentFile.hpp
+    DocumentReaderQtCreator.hpp
+    IDocumentReader.hpp
+    TokenUtils.hpp TokenUtils.cpp
+    ProgrammingLanguage.hpp ProgrammingLanguage.cpp
+    IContextManager.hpp
 )
 
 target_link_libraries(Context

context/ChangesManager.cpp

@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2024 Petr Mironychev
+ * Copyright (C) 2024-2025 Petr Mironychev
  *
  * This file is part of QodeAssist.
  *
@@ -30,17 +30,12 @@ ChangesManager &ChangesManager::instance()
 
 ChangesManager::ChangesManager()
     : QObject(nullptr)
-{
-}
+{}
 
-ChangesManager::~ChangesManager()
-{
-}
+ChangesManager::~ChangesManager() {}
 
-void ChangesManager::addChange(TextEditor::TextDocument *document,
-                               int position,
-                               int charsRemoved,
-                               int charsAdded)
+void ChangesManager::addChange(
+    TextEditor::TextDocument *document, int position, int charsRemoved, int charsAdded)
 {
     auto &documentQueue = m_documentChanges[document];
 
@@ -51,9 +46,10 @@ void ChangesManager::addChange(TextEditor::TextDocument *document,
 
     ChangeInfo change{fileName, lineNumber, lineContent};
 
-    auto it = std::find_if(documentQueue.begin(),
-                           documentQueue.end(),
-                           [lineNumber](const ChangeInfo &c) { return c.lineNumber == lineNumber; });
+    auto it
+        = std::find_if(documentQueue.begin(), documentQueue.end(), [lineNumber](const ChangeInfo &c) {
+              return c.lineNumber == lineNumber;
+          });
 
     if (it != documentQueue.end()) {
         it->lineContent = lineContent;

context/ChangesManager.h

@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2024 Petr Mironychev
+ * Copyright (C) 2024-2025 Petr Mironychev
  *
  * This file is part of QodeAssist.
  *
@@ -19,11 +19,11 @@
 
 #pragma once
 
+#include <texteditor/textdocument.h>
 #include <QDateTime>
 #include <QHash>
 #include <QQueue>
 #include <QTimer>
-#include <texteditor/textdocument.h>
 
 namespace QodeAssist::Context {
 
@@ -41,10 +41,8 @@ public:
 
     static ChangesManager &instance();
 
-    void addChange(TextEditor::TextDocument *document,
-                   int position,
-                   int charsRemoved,
-                   int charsAdded);
+    void addChange(
+        TextEditor::TextDocument *document, int position, int charsRemoved, int charsAdded);
     QString getRecentChangesContext(const TextEditor::TextDocument *currentDocument) const;
 
 private:

context/ContentFile.hpp

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

context/ContextManager.cpp

@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2024 Petr Mironychev
+ * Copyright (C) 2024-2025 Petr Mironychev
  *
  * This file is part of QodeAssist.
  *
@@ -21,15 +21,18 @@
 
 #include <QFile>
 #include <QFileInfo>
+#include <QJsonObject>
 #include <QTextStream>
 
-namespace QodeAssist::Context {
+#include "settings/GeneralSettings.hpp"
+#include <coreplugin/editormanager/editormanager.h>
+#include <projectexplorer/project.h>
+#include <projectexplorer/projectnodes.h>
+#include <texteditor/textdocument.h>
 
-ContextManager &ContextManager::instance()
-{
-    static ContextManager manager;
-    return manager;
-}
+#include "Logger.hpp"
+
+namespace QodeAssist::Context {
 
 ContextManager::ContextManager(QObject *parent)
     : QObject(parent)
@@ -55,6 +58,27 @@ QList<ContentFile> ContextManager::getContentFiles(const QStringList &filePaths)
     return files;
 }
 
+QStringList ContextManager::getProjectSourceFiles(ProjectExplorer::Project *project) const
+{
+    QStringList sourceFiles;
+    if (!project)
+        return sourceFiles;
+
+    auto projectNode = project->rootProjectNode();
+    if (!projectNode)
+        return sourceFiles;
+
+    projectNode->forEachNode(
+        [&sourceFiles, this](ProjectExplorer::FileNode *fileNode) {
+            if (fileNode /*&& shouldProcessFile(fileNode->filePath().toString())*/) {
+                sourceFiles.append(fileNode->filePath().toUrlishString());
+            }
+        },
+        nullptr);
+
+    return sourceFiles;
+}
+
 ContentFile ContextManager::createContentFile(const QString &filePath) const
 {
     ContentFile contentFile;
@@ -64,4 +88,69 @@ ContentFile ContextManager::createContentFile(const QString &filePath) const
     return contentFile;
 }
 
+ProgrammingLanguage ContextManager::getDocumentLanguage(const DocumentInfo &documentInfo) const
+{
+    if (!documentInfo.document) {
+        LOG_MESSAGE("Error: Document is not available for" + documentInfo.filePath);
+        return Context::ProgrammingLanguage::Unknown;
+    }
+
+    return Context::ProgrammingLanguageUtils::fromMimeType(documentInfo.mimeType);
+}
+
+bool ContextManager::isSpecifyCompletion(const DocumentInfo &documentInfo) const
+{
+    const auto &generalSettings = Settings::generalSettings();
+
+    Context::ProgrammingLanguage documentLanguage = getDocumentLanguage(documentInfo);
+    Context::ProgrammingLanguage preset1Language = Context::ProgrammingLanguageUtils::fromString(
+        generalSettings.preset1Language.displayForIndex(generalSettings.preset1Language()));
+
+    return generalSettings.specifyPreset1() && documentLanguage == preset1Language;
+}
+
+QList<QPair<QString, QString>> ContextManager::openedFiles(const QStringList excludeFiles) const
+{
+    auto documents = Core::DocumentModel::openedDocuments();
+
+    QList<QPair<QString, QString>> files;
+
+    for (const auto *document : std::as_const(documents)) {
+        auto textDocument = qobject_cast<const TextEditor::TextDocument *>(document);
+        if (!textDocument)
+            continue;
+
+        auto filePath = textDocument->filePath().toUrlishString();
+        if (!excludeFiles.contains(filePath)) {
+            files.append({filePath, textDocument->plainText()});
+        }
+    }
+
+    return files;
+}
+
+QString ContextManager::openedFilesContext(const QStringList excludeFiles)
+{
+    QString context = "User files context:\n";
+
+    auto documents = Core::DocumentModel::openedDocuments();
+
+    for (const auto *document : documents) {
+        auto textDocument = qobject_cast<const TextEditor::TextDocument *>(document);
+        if (!textDocument)
+            continue;
+
+        auto filePath = textDocument->filePath().toUrlishString();
+        if (excludeFiles.contains(filePath))
+            continue;
+
+        context += QString("File: %1\n").arg(filePath);
+        context += textDocument->plainText();
+
+        context += "\n";
+    }
+
+    return context;
+}
+
 } // namespace QodeAssist::Context

context/ContextManager.hpp

@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2024 Petr Mironychev
+ * Copyright (C) 2025 Petr Mironychev
  *
  * This file is part of QodeAssist.
  *
@@ -23,24 +23,32 @@
 #include <QString>
 
 #include "ContentFile.hpp"
+#include "IContextManager.hpp"
+#include "ProgrammingLanguage.hpp"
+
+namespace ProjectExplorer {
+class Project;
+}
 
 namespace QodeAssist::Context {
 
-class ContextManager : public QObject
+class ContextManager : public QObject, public IContextManager
 {
     Q_OBJECT
 
 public:
-    static ContextManager &instance();
-    QString readFile(const QString &filePath) const;
-    QList<ContentFile> getContentFiles(const QStringList &filePaths) const;
-
-private:
     explicit ContextManager(QObject *parent = nullptr);
-    ~ContextManager() = default;
-    ContextManager(const ContextManager &) = delete;
-    ContextManager &operator=(const ContextManager &) = delete;
-    ContentFile createContentFile(const QString &filePath) const;
+    ~ContextManager() override = default;
+
+    QString readFile(const QString &filePath) const override;
+    QList<ContentFile> getContentFiles(const QStringList &filePaths) const override;
+    QStringList getProjectSourceFiles(ProjectExplorer::Project *project) const override;
+    ContentFile createContentFile(const QString &filePath) const override;
+
+    ProgrammingLanguage getDocumentLanguage(const DocumentInfo &documentInfo) const override;
+    bool isSpecifyCompletion(const DocumentInfo &documentInfo) const override;
+    QList<QPair<QString, QString>> openedFiles(const QStringList excludeFiles = QStringList{}) const;
+    QString openedFilesContext(const QStringList excludeFiles = QStringList{});
 };
 
 } // namespace QodeAssist::Context

context/DocumentContextReader.cpp

@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2024 Petr Mironychev
+ * Copyright (C) 2024-2025 Petr Mironychev
  *
  * This file is part of QodeAssist.
  *
@@ -19,9 +19,9 @@
 
 #include "DocumentContextReader.hpp"
 
+#include <languageserverprotocol/lsptypes.h>
 #include <QFileInfo>
 #include <QTextBlock>
-#include <languageserverprotocol/lsptypes.h>
 
 #include "CodeCompletionSettings.hpp"
 
@@ -41,17 +41,18 @@ const QRegularExpression &getNameRegex()
 
 const QRegularExpression &getCommentRegex()
 {
-    static const QRegularExpression
-        commentRegex(R"((/\*[\s\S]*?\*/|//.*$|#.*$|//{2,}[\s\S]*?//{2,}))",
-                     QRegularExpression::MultilineOption);
+    static const QRegularExpression commentRegex(
+        R"((/\*[\s\S]*?\*/|//.*$|#.*$|//{2,}[\s\S]*?//{2,}))", QRegularExpression::MultilineOption);
     return commentRegex;
 }
 
 namespace QodeAssist::Context {
 
-DocumentContextReader::DocumentContextReader(TextEditor::TextDocument *textDocument)
-    : m_textDocument(textDocument)
-    , m_document(textDocument->document())
+DocumentContextReader::DocumentContextReader(
+    QTextDocument *document, const QString &mimeType, const QString &filePath)
+    : m_document(document)
+    , m_mimeType(mimeType)
+    , m_filePath(filePath)
 {
     m_copyrightInfo = findCopyright();
 }
@@ -80,26 +81,26 @@ QString DocumentContextReader::getLineText(int lineNumber, int cursorPosition) c
     return QString();
 }
 
-QString DocumentContextReader::getContextBefore(int lineNumber,
-                                                int cursorPosition,
-                                                int linesCount) const
+QString DocumentContextReader::getContextBefore(
+    int lineNumber, int cursorPosition, int linesCount) const
 {
-    int effectiveStartLine;
+    int startLine = lineNumber - linesCount + 1;
     if (m_copyrightInfo.found) {
-        effectiveStartLine = qMax(m_copyrightInfo.endLine + 1, lineNumber - linesCount);
-    } else {
-        effectiveStartLine = qMax(0, lineNumber - linesCount);
+        startLine = qMax(m_copyrightInfo.endLine + 1, startLine);
     }
 
-    return getContextBetween(effectiveStartLine, lineNumber, cursorPosition);
+    return getContextBetween(startLine, -1, lineNumber, cursorPosition);
 }
 
-QString DocumentContextReader::getContextAfter(int lineNumber,
-                                               int cursorPosition,
-                                               int linesCount) const
+QString DocumentContextReader::getContextAfter(
+    int lineNumber, int cursorPosition, int linesCount) const
 {
-    int endLine = qMin(m_document->blockCount() - 1, lineNumber + linesCount);
-    return getContextBetween(lineNumber + 1, endLine, cursorPosition);
+    int endLine = lineNumber + linesCount - 1;
+    if (m_copyrightInfo.found && m_copyrightInfo.endLine >= lineNumber) {
+        lineNumber = m_copyrightInfo.endLine + 1;
+        cursorPosition = -1;
+    }
+    return getContextBetween(lineNumber, cursorPosition, endLine, -1);
 }
 
 QString DocumentContextReader::readWholeFileBefore(int lineNumber, int cursorPosition) const
@@ -109,31 +110,26 @@ QString DocumentContextReader::readWholeFileBefore(int lineNumber, int cursorPos
         startLine = m_copyrightInfo.endLine + 1;
     }
 
-    startLine = qMin(startLine, lineNumber);
-
-    QString result = getContextBetween(startLine, lineNumber, cursorPosition);
-
-    return result;
+    return getContextBetween(startLine, -1, lineNumber, cursorPosition);
 }
 
 QString DocumentContextReader::readWholeFileAfter(int lineNumber, int cursorPosition) const
 {
-    return getContextBetween(lineNumber, m_document->blockCount() - 1, cursorPosition);
+    int endLine = m_document->blockCount() - 1;
+    if (m_copyrightInfo.found && m_copyrightInfo.endLine >= lineNumber) {
+        lineNumber = m_copyrightInfo.endLine + 1;
+        cursorPosition = -1;
+    }
+    return getContextBetween(lineNumber, cursorPosition, endLine, -1);
 }
 
 QString DocumentContextReader::getLanguageAndFileInfo() const
 {
-    if (!m_textDocument)
-        return QString();
-
-    QString language = LanguageServerProtocol::TextDocumentItem::mimeTypeToLanguageId(
-        m_textDocument->mimeType());
-    QString mimeType = m_textDocument->mimeType();
-    QString filePath = m_textDocument->filePath().toString();
-    QString fileExtension = QFileInfo(filePath).suffix();
+    QString language = LanguageServerProtocol::TextDocumentItem::mimeTypeToLanguageId(m_mimeType);
+    QString fileExtension = QFileInfo(m_filePath).suffix();
 
     return QString("Language: %1 (MIME: %2) filepath: %3(%4)\n\n")
-        .arg(language, mimeType, filePath, fileExtension);
+        .arg(language, m_mimeType, m_filePath, fileExtension);
 }
 
 CopyrightInfo DocumentContextReader::findCopyright()
@@ -149,9 +145,24 @@ CopyrightInfo DocumentContextReader::findCopyright()
         QRegularExpressionMatch match = matchIterator.next();
         QString matchedText = match.captured().toLower();
 
-        if (matchedText.contains("copyright") || matchedText.contains("(C)")
-            || matchedText.contains("(c)") || matchedText.contains("©")
-            || getYearRegex().match(text).hasMatch() || getNameRegex().match(text).hasMatch()) {
+        bool hasCopyrightIndicator = matchedText.contains("copyright")
+                                     || matchedText.contains("(c)") || matchedText.contains("©")
+                                     || matchedText.contains("copr.")
+                                     || matchedText.contains("all rights reserved")
+                                     || matchedText.contains("proprietary")
+                                     || matchedText.contains("licensed under")
+                                     || matchedText.contains("license:")
+                                     || matchedText.contains("gpl") || matchedText.contains("lgpl")
+                                     || matchedText.contains("mit license")
+                                     || matchedText.contains("apache license")
+                                     || matchedText.contains("bsd license")
+                                     || matchedText.contains("mozilla public license")
+                                     || matchedText.contains("copyleft");
+
+        bool hasYear = getYearRegex().match(matchedText).hasMatch();
+        bool hasName = getNameRegex().match(matchedText).hasMatch();
+
+        if ((hasCopyrightIndicator && (hasYear || hasName)) || (hasYear && hasName)) {
             int startPos = match.capturedStart();
             int endPos = match.capturedEnd();
 
@@ -179,20 +190,74 @@ CopyrightInfo DocumentContextReader::findCopyright()
     return result;
 }
 
-QString DocumentContextReader::getContextBetween(int startLine,
-                                                 int endLine,
-                                                 int cursorPosition) const
+QString DocumentContextReader::getContextBetween(
+    int startLine, int startCursorPosition, int endLine, int endCursorPosition) const
 {
     QString context;
-    for (int i = startLine; i <= endLine; ++i) {
-        QTextBlock block = m_document->findBlockByNumber(i);
+
+    startLine = qMax(startLine, 0);
+    endLine = qMin(endLine, m_document->blockCount() - 1);
+
+    if (startLine > endLine) {
+        return context;
+    }
+
+    if (startLine == endLine) {
+        auto block = m_document->findBlockByNumber(startLine);
         if (!block.isValid()) {
-            break;
+            return context;
         }
-        if (i == endLine) {
-            context += block.text().left(cursorPosition);
+
+        auto text = block.text();
+
+        if (startCursorPosition < 0) {
+            startCursorPosition = 0;
+        }
+        if (endCursorPosition < 0) {
+            endCursorPosition = text.size();
+        }
+
+        if (startCursorPosition >= endCursorPosition) {
+            return context;
+        }
+
+        return text.mid(startCursorPosition, endCursorPosition - startCursorPosition);
+    }
+
+    // first line
+    {
+        auto block = m_document->findBlockByNumber(startLine);
+        if (!block.isValid()) {
+            return context;
+        }
+        auto text = block.text();
+        if (startCursorPosition < 0) {
+            context += text + "\n";
         } else {
-            context += block.text() + "\n";
+            context += text.right(text.size() - startCursorPosition) + "\n";
+        }
+    }
+
+    // intermediate lines, if any
+    for (int i = startLine + 1; i <= endLine - 1; ++i) {
+        auto block = m_document->findBlockByNumber(i);
+        if (!block.isValid()) {
+            return context;
+        }
+        context += block.text() + "\n";
+    }
+
+    // last line
+    {
+        auto block = m_document->findBlockByNumber(endLine);
+        if (!block.isValid()) {
+            return context;
+        }
+        auto text = block.text();
+        if (endCursorPosition < 0) {
+            context += text;
+        } else {
+            context += text.left(endCursorPosition);
         }
     }
 
@@ -204,47 +269,31 @@ CopyrightInfo DocumentContextReader::copyrightInfo() const
     return m_copyrightInfo;
 }
 
-LLMCore::ContextData DocumentContextReader::prepareContext(int lineNumber, int cursorPosition) const
+LLMCore::ContextData DocumentContextReader::prepareContext(
+    int lineNumber, int cursorPosition, const Settings::CodeCompletionSettings &settings) const
 {
-    QString contextBefore = getContextBefore(lineNumber, cursorPosition);
-    QString contextAfter = getContextAfter(lineNumber, cursorPosition);
+    QString contextBefore;
+    QString contextAfter;
+    if (settings.readFullFile()) {
+        contextBefore = readWholeFileBefore(lineNumber, cursorPosition);
+        contextAfter = readWholeFileAfter(lineNumber, cursorPosition);
+    } else {
+        // Note that readStrings{After,Before}Cursor include current line, but linesCount argument of
+        // getContext{After,Before} do not
+        contextBefore
+            = getContextBefore(lineNumber, cursorPosition, settings.readStringsBeforeCursor() + 1);
+        contextAfter
+            = getContextAfter(lineNumber, cursorPosition, settings.readStringsAfterCursor() + 1);
+    }
 
     QString fileContext;
-    if (Settings::codeCompletionSettings().useFilePathInContext())
-        fileContext.append("\n ").append(getLanguageAndFileInfo());
+    fileContext.append("\n ").append(getLanguageAndFileInfo());
 
-    if (Settings::codeCompletionSettings().useProjectChangesCache())
-        fileContext.append("\n ").append(
-            ChangesManager::instance().getRecentChangesContext(m_textDocument));
+    if (settings.useProjectChangesCache())
+        fileContext.append("Recent Project Changes Context:\n ")
+            .append(ChangesManager::instance().getRecentChangesContext(m_textDocument));
 
-    return {contextBefore, contextAfter, fileContext};
-}
-
-QString DocumentContextReader::getContextBefore(int lineNumber, int cursorPosition) const
-{
-    if (Settings::codeCompletionSettings().readFullFile()) {
-        return readWholeFileBefore(lineNumber, cursorPosition);
-    } else {
-        int effectiveStartLine;
-        int beforeCursor = Settings::codeCompletionSettings().readStringsBeforeCursor();
-        if (m_copyrightInfo.found) {
-            effectiveStartLine = qMax(m_copyrightInfo.endLine + 1, lineNumber - beforeCursor);
-        } else {
-            effectiveStartLine = qMax(0, lineNumber - beforeCursor);
-        }
-        return getContextBetween(effectiveStartLine, lineNumber, cursorPosition);
-    }
-}
-
-QString DocumentContextReader::getContextAfter(int lineNumber, int cursorPosition) const
-{
-    if (Settings::codeCompletionSettings().readFullFile()) {
-        return readWholeFileAfter(lineNumber, cursorPosition);
-    } else {
-        int endLine = qMin(m_document->blockCount() - 1,
-                           lineNumber + Settings::codeCompletionSettings().readStringsAfterCursor());
-        return getContextBetween(lineNumber + 1, endLine, -1);
-    }
+    return {.prefix = contextBefore, .suffix = contextAfter, .fileContext = fileContext};
 }
 
 } // namespace QodeAssist::Context

context/DocumentContextReader.hpp

@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2024 Petr Mironychev
+ * Copyright (C) 2024-2025 Petr Mironychev
  *
  * This file is part of QodeAssist.
  *
@@ -23,6 +23,7 @@
 #include <QTextDocument>
 
 #include <llmcore/ContextData.hpp>
+#include <settings/CodeCompletionSettings.hpp>
 
 namespace QodeAssist::Context {
 
@@ -36,28 +37,55 @@ struct CopyrightInfo
 class DocumentContextReader
 {
 public:
-    DocumentContextReader(TextEditor::TextDocument *textDocument);
+    DocumentContextReader(
+        QTextDocument *m_document, const QString &mimeType, const QString &filePath);
 
     QString getLineText(int lineNumber, int cursorPosition = -1) const;
+
+    /**
+     * @brief Retrieves @c linesCount lines of context ending at @c lineNumber at
+     * @c cursorPosition in that line. The line at @c lineNumber is inclusive regardless of
+     * @c cursorPosition.
+     */
     QString getContextBefore(int lineNumber, int cursorPosition, int linesCount) const;
+
+    /**
+     * @brief Retrieves @c linesCount lines of context starting at @c lineNumber at
+     * @c cursorPosition in that line. The line at @c lineNumber is inclusive regardless of
+     * @c cursorPosition.
+     */
     QString getContextAfter(int lineNumber, int cursorPosition, int linesCount) const;
+
+    /**
+     * @brief Retrieves whole file ending at @c lineNumber at @c cursorPosition in that line.
+     */
     QString readWholeFileBefore(int lineNumber, int cursorPosition) const;
+
+    /**
+     * @brief Retrieves whole file starting at @c lineNumber at @c cursorPosition in that line.
+     */
     QString readWholeFileAfter(int lineNumber, int cursorPosition) const;
+
     QString getLanguageAndFileInfo() const;
     CopyrightInfo findCopyright();
-    QString getContextBetween(int startLine, int endLine, int cursorPosition) const;
+    QString getContextBetween(
+        int startLine, int startCursorPosition, int endLine, int endCursorPosition) const;
 
     CopyrightInfo copyrightInfo() const;
 
-    LLMCore::ContextData prepareContext(int lineNumber, int cursorPosition) const;
-
-private:
-    QString getContextBefore(int lineNumber, int cursorPosition) const;
-    QString getContextAfter(int lineNumber, int cursorPosition) const;
+    LLMCore::ContextData prepareContext(
+        int lineNumber, int cursorPosition, const Settings::CodeCompletionSettings &settings) const;
 
 private:
     TextEditor::TextDocument *m_textDocument;
     QTextDocument *m_document;
+    QString m_mimeType;
+    QString m_filePath;
+
+    // Used to omit copyright headers from context. If context would otherwise include copyright
+    // header it is excluded by deleting it from the returned context. This means, that the
+    // returned context may contain less information than requested. If the cursor is within copyright
+    // header, then the context may be empty if the context window is small.
     CopyrightInfo m_copyrightInfo;
 };
 

context/DocumentReaderQtCreator.hpp

@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2025 Povilas Kanapickas
+ *
+ * This file is part of QodeAssist.
+ *
+ * QodeAssist is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QodeAssist is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QodeAssist. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "IDocumentReader.hpp"
+
+#include <texteditor/textdocument.h>
+
+namespace QodeAssist::Context {
+
+class DocumentReaderQtCreator : public IDocumentReader
+{
+public:
+    DocumentInfo readDocument(const QString &path) const override
+    {
+        auto *textDocument = TextEditor::TextDocument::textDocumentForFilePath(
+            Utils::FilePath::fromString(path));
+        if (!textDocument) {
+            return {};
+        }
+        return {
+            .document = textDocument->document(),
+            .mimeType = textDocument->mimeType(),
+            .filePath = path};
+    }
+};
+
+} // namespace QodeAssist::Context

context/IContextManager.hpp

@@ -0,0 +1,49 @@
+/* 
+ * Copyright (C) 2025 Petr Mironychev
+ *
+ * This file is part of QodeAssist.
+ *
+ * QodeAssist is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QodeAssist is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QodeAssist. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include <QObject>
+#include <QString>
+
+#include "ContentFile.hpp"
+#include "IDocumentReader.hpp"
+#include "ProgrammingLanguage.hpp"
+
+namespace ProjectExplorer {
+class Project;
+}
+
+namespace QodeAssist::Context {
+
+class IContextManager
+{
+public:
+    virtual ~IContextManager() = default;
+
+    virtual QString readFile(const QString &filePath) const = 0;
+    virtual QList<ContentFile> getContentFiles(const QStringList &filePaths) const = 0;
+    virtual QStringList getProjectSourceFiles(ProjectExplorer::Project *project) const = 0;
+    virtual ContentFile createContentFile(const QString &filePath) const = 0;
+
+    virtual ProgrammingLanguage getDocumentLanguage(const DocumentInfo &documentInfo) const = 0;
+    virtual bool isSpecifyCompletion(const DocumentInfo &documentInfo) const = 0;
+};
+
+} // namespace QodeAssist::Context

context/IDocumentReader.hpp

@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2025 Povilas Kanapickas
+ *
+ * This file is part of QodeAssist.
+ *
+ * QodeAssist is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QodeAssist is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QodeAssist. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include <QTextDocument>
+
+namespace QodeAssist::Context {
+
+struct DocumentInfo
+{
+    QTextDocument *document = nullptr; // not owned
+    QString mimeType;
+    QString filePath;
+};
+
+class IDocumentReader
+{
+public:
+    virtual ~IDocumentReader() = default;
+
+    virtual DocumentInfo readDocument(const QString &path) const = 0;
+};
+
+} // namespace QodeAssist::Context

context/ProgrammingLanguage.cpp

@@ -0,0 +1,70 @@
+/* 
+ * Copyright (C) 2024-2025 Petr Mironychev
+ *
+ * This file is part of QodeAssist.
+ *
+ * QodeAssist is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QodeAssist is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QodeAssist. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "ProgrammingLanguage.hpp"
+
+namespace QodeAssist::Context {
+
+ProgrammingLanguage ProgrammingLanguageUtils::fromMimeType(const QString &mimeType)
+{
+    if (mimeType == "text/x-qml" || mimeType == "application/javascript"
+        || mimeType == "text/javascript" || mimeType == "text/x-javascript") {
+        return ProgrammingLanguage::QML;
+    }
+    if (mimeType == "text/x-c++src" || mimeType == "text/x-c++hdr" || mimeType == "text/x-csrc"
+        || mimeType == "text/x-chdr") {
+        return ProgrammingLanguage::Cpp;
+    }
+    if (mimeType == "text/x-python") {
+        return ProgrammingLanguage::Python;
+    }
+    return ProgrammingLanguage::Unknown;
+}
+
+QString ProgrammingLanguageUtils::toString(ProgrammingLanguage language)
+{
+    switch (language) {
+    case ProgrammingLanguage::Cpp:
+        return "c/c++";
+    case ProgrammingLanguage::QML:
+        return "qml";
+    case ProgrammingLanguage::Python:
+        return "python";
+    case ProgrammingLanguage::Unknown:
+    default:
+        return QString();
+    }
+}
+
+ProgrammingLanguage ProgrammingLanguageUtils::fromString(const QString &str)
+{
+    QString lower = str.toLower();
+    if (lower == "c/c++") {
+        return ProgrammingLanguage::Cpp;
+    }
+    if (lower == "qml") {
+        return ProgrammingLanguage::QML;
+    }
+    if (lower == "python") {
+        return ProgrammingLanguage::Python;
+    }
+    return ProgrammingLanguage::Unknown;
+}
+
+} // namespace QodeAssist::Context

context/ProgrammingLanguage.hpp

@@ -0,0 +1,43 @@
+/* 
+ * Copyright (C) 2024-2025 Petr Mironychev
+ *
+ * This file is part of QodeAssist.
+ *
+ * QodeAssist is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QodeAssist is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QodeAssist. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include <QString>
+
+namespace QodeAssist::Context {
+
+enum class ProgrammingLanguage {
+    QML, // QML/JavaScript
+    Cpp, // C/C++
+    Python,
+    Unknown,
+};
+
+namespace ProgrammingLanguageUtils {
+
+ProgrammingLanguage fromMimeType(const QString &mimeType);
+
+QString toString(ProgrammingLanguage language);
+
+ProgrammingLanguage fromString(const QString &str);
+
+} // namespace ProgrammingLanguageUtils
+
+} // namespace QodeAssist::Context

context/TokenUtils.cpp

@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2024-2025 Petr Mironychev
+ *
+ * This file is part of QodeAssist.
+ *
+ * QodeAssist is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QodeAssist is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QodeAssist. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "TokenUtils.hpp"
+
+namespace QodeAssist::Context {
+
+int TokenUtils::estimateTokens(const QString &text)
+{
+    if (text.isEmpty()) {
+        return 0;
+    }
+
+    // TODO: need to improve
+    return text.length() / 4;
+}
+
+int TokenUtils::estimateFileTokens(const Context::ContentFile &file)
+{
+    int total = 0;
+
+    total += estimateTokens(file.filename);
+    total += estimateTokens(file.content);
+    total += 5;
+
+    return total;
+}
+
+int TokenUtils::estimateFilesTokens(const QList<Context::ContentFile> &files)
+{
+    int total = 0;
+    for (const auto &file : files) {
+        total += estimateFileTokens(file);
+    }
+    return total;
+}
+
+} // namespace QodeAssist::Context

context/TokenUtils.hpp

@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2024-2025 Petr Mironychev
+ *
+ * This file is part of QodeAssist.
+ *
+ * QodeAssist is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QodeAssist is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QodeAssist. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "ContentFile.hpp"
+#include <QList>
+#include <QString>
+
+namespace QodeAssist::Context {
+
+class TokenUtils
+{
+public:
+    static int estimateTokens(const QString &text);
+    static int estimateFileTokens(const Context::ContentFile &file);
+    static int estimateFilesTokens(const QList<Context::ContentFile> &files);
+};
+
+} // namespace QodeAssist::Context

context/Utils.hpp

@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2025 Povilas Kanapickas  <povilas@radix.lt>
+ *
+ * This file is part of QodeAssist.
+ *
+ * QodeAssist is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QodeAssist is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QodeAssist. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include <QJsonObject>
+
+namespace QodeAssist::Context {
+
+inline QString extractFilePathFromRequest(const QJsonObject &request)
+{
+    QJsonObject params = request["params"].toObject();
+    QJsonObject doc = params["doc"].toObject();
+    QString uri = doc["uri"].toString();
+    return QUrl(uri).toLocalFile();
+}
+
+} // namespace QodeAssist::Context

llmcore/CMakeLists.txt

@@ -3,14 +3,19 @@ add_library(LLMCore STATIC
     Provider.hpp
     ProvidersManager.hpp ProvidersManager.cpp
     ContextData.hpp
+    IPromptProvider.hpp
+    IProviderRegistry.hpp
+    PromptProviderChat.hpp
+    PromptProviderFim.hpp
     PromptTemplate.hpp
     PromptTemplateManager.hpp PromptTemplateManager.cpp
     RequestConfig.hpp
+    RequestHandlerBase.hpp RequestHandlerBase.cpp
     RequestHandler.hpp RequestHandler.cpp
     OllamaMessage.hpp OllamaMessage.cpp
     OpenAIMessage.hpp OpenAIMessage.cpp
     ValidationUtils.hpp ValidationUtils.cpp
-    MessageBuilder.hpp MessageBuilder.cpp
+    ProviderID.hpp
 )
 
 target_link_libraries(LLMCore

llmcore/ContextData.hpp

@@ -1,5 +1,5 @@
-/* 
- * Copyright (C) 2024 Petr Mironychev
+/*
+ * Copyright (C) 2024-2025 Petr Mironychev
  *
  * This file is part of QodeAssist.
  *
@@ -20,14 +20,37 @@
 #pragma once
 
 #include <QString>
+#include <QVector>
 
 namespace QodeAssist::LLMCore {
 
+struct Message
+{
+    QString role;
+    QString content;
+
+    // clang-format off
+    bool operator==(const Message&) const = default;
+    // clang-format on
+};
+
+struct FileMetadata
+{
+    QString filePath;
+    QString content;
+    bool operator==(const FileMetadata &) const = default;
+};
+
 struct ContextData
 {
-    QString prefix;
-    QString suffix;
-    QString fileContext;
+    std::optional<QString> systemPrompt;
+    std::optional<QString> prefix;
+    std::optional<QString> suffix;
+    std::optional<QString> fileContext;
+    std::optional<QVector<Message>> history;
+    std::optional<QList<FileMetadata>> filesMetadata;
+
+    bool operator==(const ContextData &) const = default;
 };
 
 } // namespace QodeAssist::LLMCore

llmcore/IPromptProvider.hpp

@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2025 Povilas Kanapickas <povilas@radix.lt>
+ *
+ * This file is part of QodeAssist.
+ *
+ * QodeAssist is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QodeAssist is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QodeAssist. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "PromptTemplate.hpp"
+#include <QString>
+
+namespace QodeAssist::LLMCore {
+
+class IPromptProvider
+{
+public:
+    virtual ~IPromptProvider() = default;
+
+    virtual PromptTemplate *getTemplateByName(const QString &templateName) const = 0;
+
+    virtual QStringList templatesNames() const = 0;
+
+    virtual QStringList getTemplatesForProvider(ProviderID id) const = 0;
+};
+
+} // namespace QodeAssist::LLMCore

llmcore/IProviderRegistry.hpp

@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2025 Povilas Kanapickas <povilas@radix.lt>
+ *
+ * This file is part of QodeAssist.
+ *
+ * QodeAssist is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QodeAssist is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QodeAssist. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "Provider.hpp"
+
+namespace QodeAssist::LLMCore {
+
+class IProviderRegistry
+{
+public:
+    virtual ~IProviderRegistry() = default;
+
+    virtual Provider *getProviderByName(const QString &providerName) = 0;
+
+    virtual QStringList providersNames() const = 0;
+};
+
+} // namespace QodeAssist::LLMCore

llmcore/MessageBuilder.cpp

@@ -1,93 +0,0 @@
-/* 
- * Copyright (C) 2024 Petr Mironychev
- *
- * This file is part of QodeAssist.
- *
- * QodeAssist is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QodeAssist is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QodeAssist. If not, see <https://www.gnu.org/licenses/>.
- */
-
-#include "MessageBuilder.hpp"
-
-QodeAssist::LLMCore::MessageBuilder &QodeAssist::LLMCore::MessageBuilder::addSystemMessage(
-    const QString &content)
-{
-    m_systemMessage = content;
-    return *this;
-}
-
-QodeAssist::LLMCore::MessageBuilder &QodeAssist::LLMCore::MessageBuilder::addUserMessage(
-    const QString &content)
-{
-    m_messages.append({MessageRole::User, content});
-    return *this;
-}
-
-QodeAssist::LLMCore::MessageBuilder &QodeAssist::LLMCore::MessageBuilder::addSuffix(
-    const QString &content)
-{
-    m_suffix = content;
-    return *this;
-}
-
-QodeAssist::LLMCore::MessageBuilder &QodeAssist::LLMCore::MessageBuilder::addTokenizer(
-    PromptTemplate *promptTemplate)
-{
-    m_promptTemplate = promptTemplate;
-    return *this;
-}
-
-QString QodeAssist::LLMCore::MessageBuilder::roleToString(MessageRole role) const
-{
-    switch (role) {
-    case MessageRole::System:
-        return ROLE_SYSTEM;
-    case MessageRole::User:
-        return ROLE_USER;
-    case MessageRole::Assistant:
-        return ROLE_ASSISTANT;
-    default:
-        return ROLE_USER;
-    }
-}
-
-void QodeAssist::LLMCore::MessageBuilder::saveTo(QJsonObject &request, ProvidersApi api)
-{
-    if (!m_promptTemplate) {
-        return;
-    }
-
-    ContextData context{
-        m_messages.isEmpty() ? QString() : m_messages.last().content, m_suffix, m_systemMessage};
-
-    if (api == ProvidersApi::Ollama) {
-        if (m_promptTemplate->type() == TemplateType::Fim) {
-            request["system"] = m_systemMessage;
-            m_promptTemplate->prepareRequest(request, context);
-        } else {
-            QJsonArray messages;
-
-            messages.append(QJsonObject{{"role", "system"}, {"content", m_systemMessage}});
-            messages.append(QJsonObject{{"role", "user"}, {"content", m_messages.last().content}});
-            request["messages"] = messages;
-            m_promptTemplate->prepareRequest(request, context);
-        }
-    } else if (api == ProvidersApi::OpenAI) {
-        QJsonArray messages;
-
-        messages.append(QJsonObject{{"role", "system"}, {"content", m_systemMessage}});
-        messages.append(QJsonObject{{"role", "user"}, {"content", m_messages.last().content}});
-        request["messages"] = messages;
-        m_promptTemplate->prepareRequest(request, context);
-    }
-}

llmcore/MessageBuilder.hpp

@@ -1,68 +0,0 @@
-/* 
- * Copyright (C) 2024 Petr Mironychev
- *
- * This file is part of QodeAssist.
- *
- * QodeAssist is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QodeAssist is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QodeAssist. If not, see <https://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include <QJsonArray>
-#include <QJsonObject>
-#include <QString>
-#include <QVector>
-
-#include "PromptTemplate.hpp"
-
-namespace QodeAssist::LLMCore {
-
-enum class MessageRole { System, User, Assistant };
-
-enum class OllamaFormat { Messages, Completions };
-
-enum class ProvidersApi { Ollama, OpenAI, Claude };
-
-static const QString ROLE_SYSTEM = "system";
-static const QString ROLE_USER = "user";
-static const QString ROLE_ASSISTANT = "assistant";
-
-struct Message
-{
-    MessageRole role;
-    QString content;
-};
-
-class MessageBuilder
-{
-public:
-    MessageBuilder &addSystemMessage(const QString &content);
-
-    MessageBuilder &addUserMessage(const QString &content);
-
-    MessageBuilder &addSuffix(const QString &content);
-
-    MessageBuilder &addTokenizer(PromptTemplate *promptTemplate);
-
-    QString roleToString(MessageRole role) const;
-
-    void saveTo(QJsonObject &request, ProvidersApi api);
-
-private:
-    QString m_systemMessage;
-    QString m_suffix;
-    QVector<Message> m_messages;
-    PromptTemplate *m_promptTemplate;
-};
-} // namespace QodeAssist::LLMCore

llmcore/OllamaMessage.cpp

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

llmcore/OllamaMessage.hpp

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

llmcore/OpenAIMessage.cpp

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

llmcore/OpenAIMessage.hpp

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

llmcore/PromptProviderChat.hpp

@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2025 Povilas Kanapickas <povilas@radix.lt>
+ *
+ * This file is part of QodeAssist.
+ *
+ * QodeAssist is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QodeAssist is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QodeAssist. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "IPromptProvider.hpp"
+#include "PromptTemplate.hpp"
+#include "PromptTemplateManager.hpp"
+
+namespace QodeAssist::LLMCore {
+
+class PromptProviderChat : public IPromptProvider
+{
+public:
+    explicit PromptProviderChat(PromptTemplateManager &templateManager)
+        : m_templateManager(templateManager)
+    {}
+
+    ~PromptProviderChat() = default;
+
+    PromptTemplate *getTemplateByName(const QString &templateName) const override
+    {
+        return m_templateManager.getChatTemplateByName(templateName);
+    }
+
+    QStringList templatesNames() const override { return m_templateManager.chatTemplatesNames(); }
+
+    QStringList getTemplatesForProvider(ProviderID id) const override
+    {
+        return m_templateManager.getChatTemplatesForProvider(id);
+    }
+
+private:
+    PromptTemplateManager &m_templateManager;
+};
+
+} // namespace QodeAssist::LLMCore

llmcore/PromptProviderFim.hpp

@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2025 Povilas Kanapickas <povilas@radix.lt>
+ *
+ * This file is part of QodeAssist.
+ *
+ * QodeAssist is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QodeAssist is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QodeAssist. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "IPromptProvider.hpp"
+#include "PromptTemplateManager.hpp"
+
+namespace QodeAssist::LLMCore {
+
+class PromptProviderFim : public IPromptProvider
+{
+public:
+    explicit PromptProviderFim(PromptTemplateManager &templateManager)
+        : m_templateManager(templateManager)
+    {}
+
+    ~PromptProviderFim() = default;
+
+    PromptTemplate *getTemplateByName(const QString &templateName) const override
+    {
+        return m_templateManager.getFimTemplateByName(templateName);
+    }
+
+    QStringList templatesNames() const override { return m_templateManager.fimTemplatesNames(); }
+
+    QStringList getTemplatesForProvider(ProviderID id) const override
+    {
+        return m_templateManager.getFimTemplatesForProvider(id);
+    }
+
+private:
+    PromptTemplateManager &m_templateManager;
+};
+
+} // namespace QodeAssist::LLMCore

llmcore/PromptTemplate.hpp

@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2024 Petr Mironychev
+ * Copyright (C) 2024-2025 Petr Mironychev
  *
  * This file is part of QodeAssist.
  *
@@ -24,10 +24,11 @@
 #include <QString>
 
 #include "ContextData.hpp"
+#include "ProviderID.hpp"
 
 namespace QodeAssist::LLMCore {
 
-enum class TemplateType { Chat, Fim };
+enum class TemplateType { Chat, FIM };
 
 class PromptTemplate
 {
@@ -35,9 +36,9 @@ public:
     virtual ~PromptTemplate() = default;
     virtual TemplateType type() const = 0;
     virtual QString name() const = 0;
-    virtual QString promptTemplate() const = 0;
     virtual QStringList stopWords() const = 0;
     virtual void prepareRequest(QJsonObject &request, const ContextData &context) const = 0;
     virtual QString description() const = 0;
+    virtual bool isSupportProvider(ProviderID id) const = 0;
 };
 } // namespace QodeAssist::LLMCore

llmcore/PromptTemplateManager.cpp

@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2024 Petr Mironychev
+ * Copyright (C) 2024-2025 Petr Mironychev
  *
  * This file is part of QodeAssist.
  *
@@ -37,6 +37,32 @@ QStringList PromptTemplateManager::chatTemplatesNames() const
     return m_chatTemplates.keys();
 }
 
+QStringList PromptTemplateManager::getFimTemplatesForProvider(ProviderID id)
+{
+    QStringList templateList;
+
+    for (const auto tmpl : m_fimTemplates) {
+        if (tmpl->isSupportProvider(id)) {
+            templateList.append(tmpl->name());
+        }
+    }
+
+    return templateList;
+}
+
+QStringList PromptTemplateManager::getChatTemplatesForProvider(ProviderID id)
+{
+    QStringList templateList;
+
+    for (const auto tmpl : m_chatTemplates) {
+        if (tmpl->isSupportProvider(id)) {
+            templateList.append(tmpl->name());
+        }
+    }
+
+    return templateList;
+}
+
 PromptTemplateManager::~PromptTemplateManager()
 {
     qDeleteAll(m_fimTemplates);
@@ -44,11 +70,15 @@ PromptTemplateManager::~PromptTemplateManager()
 
 PromptTemplate *PromptTemplateManager::getFimTemplateByName(const QString &templateName)
 {
+    if (!m_fimTemplates.contains(templateName))
+        return m_fimTemplates.first();
     return m_fimTemplates[templateName];
 }
 
 PromptTemplate *PromptTemplateManager::getChatTemplateByName(const QString &templateName)
 {
+    if (!m_chatTemplates.contains(templateName))
+        return m_chatTemplates.first();
     return m_chatTemplates[templateName];
 }
 

llmcore/PromptTemplateManager.hpp

@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2024 Petr Mironychev
+ * Copyright (C) 2024-2025 Petr Mironychev
  *
  * This file is part of QodeAssist.
  *
@@ -35,8 +35,7 @@ public:
     template<typename T>
     void registerTemplate()
     {
-        static_assert(std::is_base_of<PromptTemplate, T>::value,
-                      "T must inherit from PromptTemplate");
+        static_assert(std::is_base_of<PromptTemplate, T>::value, "T must inherit from PromptTemplate");
         T *template_ptr = new T();
         QString name = template_ptr->name();
         m_fimTemplates[name] = template_ptr;
@@ -51,6 +50,9 @@ public:
     QStringList fimTemplatesNames() const;
     QStringList chatTemplatesNames() const;
 
+    QStringList getFimTemplatesForProvider(ProviderID id);
+    QStringList getChatTemplatesForProvider(ProviderID id);
+
 private:
     PromptTemplateManager() = default;
     PromptTemplateManager(const PromptTemplateManager &) = delete;

llmcore/Provider.hpp

@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2024 Petr Mironychev
+ * Copyright (C) 2024-2025 Petr Mironychev
  *
  * This file is part of QodeAssist.
  *
@@ -23,6 +23,7 @@
 #include <QNetworkRequest>
 #include <QString>
 
+#include "ContextData.hpp"
 #include "PromptTemplate.hpp"
 #include "RequestType.hpp"
 
@@ -41,13 +42,18 @@ public:
     virtual QString completionEndpoint() const = 0;
     virtual QString chatEndpoint() const = 0;
     virtual bool supportsModelListing() const = 0;
-
-    virtual void prepareRequest(QJsonObject &request, RequestType type) = 0;
+    virtual void prepareRequest(
+        QJsonObject &request,
+        LLMCore::PromptTemplate *prompt,
+        LLMCore::ContextData context,
+        LLMCore::RequestType type)
+        = 0;
     virtual bool handleResponse(QNetworkReply *reply, QString &accumulatedResponse) = 0;
     virtual QList<QString> getInstalledModels(const QString &url) = 0;
     virtual QList<QString> validateRequest(const QJsonObject &request, TemplateType type) = 0;
     virtual QString apiKey() const = 0;
     virtual void prepareNetworkRequest(QNetworkRequest &networkRequest) const = 0;
+    virtual ProviderID providerID() const = 0;
 };
 
 } // namespace QodeAssist::LLMCore

llmcore/ProviderID.hpp

@@ -0,0 +1,34 @@
+/* 
+ * Copyright (C) 2024-2025 Petr Mironychev
+ *
+ * This file is part of QodeAssist.
+ *
+ * QodeAssist is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QodeAssist is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QodeAssist. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+namespace QodeAssist::LLMCore {
+
+enum class ProviderID {
+    Any,
+    Ollama,
+    LMStudio,
+    Claude,
+    OpenAI,
+    OpenAICompatible,
+    MistralAI,
+    OpenRouter,
+    GoogleAI,
+    LlamaCpp
+};
+}

llmcore/ProvidersManager.cpp

@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2024 Petr Mironychev
+ * Copyright (C) 2024-2025 Petr Mironychev
  *
  * This file is part of QodeAssist.
  *
@@ -39,6 +39,8 @@ ProvidersManager::~ProvidersManager()
 
 Provider *ProvidersManager::getProviderByName(const QString &providerName)
 {
+    if (!m_providers.contains(providerName))
+        return m_providers.first();
     return m_providers[providerName];
 }
 

llmcore/ProvidersManager.hpp

@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2024 Petr Mironychev
+ * Copyright (C) 2024-2025 Petr Mironychev
  *
  * This file is part of QodeAssist.
  *
@@ -21,12 +21,12 @@
 
 #include <QString>
 
+#include "IProviderRegistry.hpp"
 #include <QMap>
-#include "Provider.hpp"
 
 namespace QodeAssist::LLMCore {
 
-class ProvidersManager
+class ProvidersManager : public IProviderRegistry
 {
 public:
     static ProvidersManager &instance();
@@ -41,9 +41,9 @@ public:
         m_providers[name] = provider;
     }
 
-    Provider *getProviderByName(const QString &providerName);
+    Provider *getProviderByName(const QString &providerName) override;
 
-    QStringList providersNames() const;
+    QStringList providersNames() const override;
 
 private:
     ProvidersManager() = default;

llmcore/RequestConfig.hpp

@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2024 Petr Mironychev
+ * Copyright (C) 2024-2025 Petr Mironychev
  *
  * This file is part of QodeAssist.
  *
@@ -19,11 +19,11 @@
 
 #pragma once
 
-#include <QJsonObject>
-#include <QUrl>
 #include "PromptTemplate.hpp"
 #include "Provider.hpp"
 #include "RequestType.hpp"
+#include <QJsonObject>
+#include <QUrl>
 
 namespace QodeAssist::LLMCore {
 

llmcore/RequestHandler.cpp

@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2024 Petr Mironychev
+ * Copyright (C) 2024-2025 Petr Mironychev
  *
  * This file is part of QodeAssist.
  *
@@ -26,22 +26,23 @@
 namespace QodeAssist::LLMCore {
 
 RequestHandler::RequestHandler(QObject *parent)
-    : QObject(parent)
-    , m_manager(new QNetworkAccessManager(this))
+    : RequestHandlerBase(parent)
 {}
 
 void RequestHandler::sendLLMRequest(const LLMConfig &config, const QJsonObject &request)
 {
     LOG_MESSAGE(QString("Sending request to llm: \nurl: %1\nRequest body:\n%2")
-                   .arg(config.url.toString(),
+                    .arg(
+                        config.url.toString(),
                         QString::fromUtf8(
                             QJsonDocument(config.providerRequest).toJson(QJsonDocument::Indented))));
 
+    QNetworkAccessManager *manager = new QNetworkAccessManager();
     QNetworkRequest networkRequest(config.url);
     config.provider->prepareNetworkRequest(networkRequest);
 
-    QNetworkReply *reply = m_manager->post(networkRequest,
-                                           QJsonDocument(config.providerRequest).toJson());
+    QNetworkReply *reply
+        = manager->post(networkRequest, QJsonDocument(config.providerRequest).toJson());
     if (!reply) {
         LOG_MESSAGE("Error: Failed to create network reply");
         return;
@@ -54,22 +55,28 @@ void RequestHandler::sendLLMRequest(const LLMConfig &config, const QJsonObject &
         handleLLMResponse(reply, request, config);
     });
 
-    connect(reply, &QNetworkReply::finished, this, [this, reply, requestId]() {
-        reply->deleteLater();
+    connect(reply, &QNetworkReply::finished, this, [this, reply, requestId, manager]() {
         m_activeRequests.remove(requestId);
         if (reply->error() != QNetworkReply::NoError) {
-            LOG_MESSAGE(QString("Error in QodeAssist request: %1").arg(reply->errorString()));
-            emit requestFinished(requestId, false, reply->errorString());
+            QString errorMessage = reply->errorString();
+            int statusCode = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
+
+            LOG_MESSAGE(
+                QString("Error details: %1\nStatus code: %2").arg(errorMessage).arg(statusCode));
+
+            emit requestFinished(requestId, false, errorMessage);
         } else {
             LOG_MESSAGE("Request finished successfully");
             emit requestFinished(requestId, true, QString());
         }
+
+        reply->deleteLater();
+        manager->deleteLater();
     });
 }
 
-void RequestHandler::handleLLMResponse(QNetworkReply *reply,
-                                       const QJsonObject &request,
-                                       const LLMConfig &config)
+void RequestHandler::handleLLMResponse(
+    QNetworkReply *reply, const QJsonObject &request, const LLMConfig &config)
 {
     QString &accumulatedResponse = m_accumulatedResponses[reply];
 
@@ -82,8 +89,8 @@ void RequestHandler::handleLLMResponse(QNetworkReply *reply,
         }
 
         if (isComplete) {
-            auto cleanedCompletion = removeStopWords(accumulatedResponse,
-                                                     config.promptTemplate->stopWords());
+            auto cleanedCompletion
+                = removeStopWords(accumulatedResponse, config.promptTemplate->stopWords());
 
             emit completionReceived(cleanedCompletion, request, true);
         }
@@ -140,36 +147,4 @@ QString RequestHandler::removeStopWords(const QStringView &completion, const QSt
     return filteredCompletion;
 }
 
-void RequestHandler::removeCodeBlockWrappers(QString &response)
-{
-    static const QRegularExpression
-        fullCodeBlockRegex(R"(```[\w\s]*\n([\s\S]*?)```)", QRegularExpression::MultilineOption);
-    static const QRegularExpression
-        partialStartBlockRegex(R"(```[\w\s]*\n([\s\S]*?)$)", QRegularExpression::MultilineOption);
-    static const QRegularExpression
-        partialEndBlockRegex(R"(^([\s\S]*?)```)", QRegularExpression::MultilineOption);
-
-    QRegularExpressionMatchIterator matchIterator = fullCodeBlockRegex.globalMatch(response);
-    while (matchIterator.hasNext()) {
-        QRegularExpressionMatch match = matchIterator.next();
-        QString codeBlock = match.captured(0);
-        QString codeContent = match.captured(1).trimmed();
-        response.replace(codeBlock, codeContent);
-    }
-
-    QRegularExpressionMatch startMatch = partialStartBlockRegex.match(response);
-    if (startMatch.hasMatch()) {
-        QString partialBlock = startMatch.captured(0);
-        QString codeContent = startMatch.captured(1).trimmed();
-        response.replace(partialBlock, codeContent);
-    }
-
-    QRegularExpressionMatch endMatch = partialEndBlockRegex.match(response);
-    if (endMatch.hasMatch()) {
-        QString partialBlock = endMatch.captured(0);
-        QString codeContent = endMatch.captured(1).trimmed();
-        response.replace(partialBlock, codeContent);
-    }
-}
-
 } // namespace QodeAssist::LLMCore

llmcore/RequestHandler.hpp

@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2024 Petr Mironychev
+ * Copyright (C) 2024-2025 Petr Mironychev
  *
  * This file is part of QodeAssist.
  *
@@ -24,40 +24,31 @@
 #include <QObject>
 
 #include "RequestConfig.hpp"
+#include "RequestHandlerBase.hpp"
 
 class QNetworkReply;
 
 namespace QodeAssist::LLMCore {
 
-class RequestHandler : public QObject
+class RequestHandler : public RequestHandlerBase
 {
-    Q_OBJECT
-
 public:
     explicit RequestHandler(QObject *parent = nullptr);
 
-    void sendLLMRequest(const LLMConfig &config, const QJsonObject &request);
-    void handleLLMResponse(QNetworkReply *reply,
-                           const QJsonObject &request,
-                           const LLMConfig &config);
-    bool cancelRequest(const QString &id);
-
-signals:
-    void completionReceived(const QString &completion, const QJsonObject &request, bool isComplete);
-    void requestFinished(const QString &requestId, bool success, const QString &errorString);
-    void requestCancelled(const QString &id);
+    void sendLLMRequest(const LLMConfig &config, const QJsonObject &request) override;
+    bool cancelRequest(const QString &id) override;
+    void handleLLMResponse(QNetworkReply *reply, const QJsonObject &request, const LLMConfig &config);
 
 private:
-    QNetworkAccessManager *m_manager;
     QMap<QString, QNetworkReply *> m_activeRequests;
     QMap<QNetworkReply *, QString> m_accumulatedResponses;
 
-    bool processSingleLineCompletion(QNetworkReply *reply,
-                                     const QJsonObject &request,
-                                     const QString &accumulatedResponse,
-                                     const LLMConfig &config);
+    bool processSingleLineCompletion(
+        QNetworkReply *reply,
+        const QJsonObject &request,
+        const QString &accumulatedResponse,
+        const LLMConfig &config);
     QString removeStopWords(const QStringView &completion, const QStringList &stopWords);
-    void removeCodeBlockWrappers(QString &response);
 };
 
 } // namespace QodeAssist::LLMCore

llmcore/RequestHandlerBase.cpp

@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2024-2025 Petr Mironychev
+ *
+ * This file is part of QodeAssist.
+ *
+ * QodeAssist is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QodeAssist is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QodeAssist. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "RequestHandlerBase.hpp"
+
+namespace QodeAssist::LLMCore {
+
+RequestHandlerBase::RequestHandlerBase(QObject *parent)
+    : QObject(parent)
+{}
+
+RequestHandlerBase::~RequestHandlerBase() = default;
+
+} // namespace QodeAssist::LLMCore

llmcore/RequestHandlerBase.hpp

@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2024-2025 Petr Mironychev
+ *
+ * This file is part of QodeAssist.
+ *
+ * QodeAssist is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QodeAssist is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QodeAssist. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "RequestConfig.hpp"
+#include <QJsonObject>
+#include <QObject>
+
+namespace QodeAssist::LLMCore {
+
+class RequestHandlerBase : public QObject
+{
+    Q_OBJECT
+
+public:
+    explicit RequestHandlerBase(QObject *parent = nullptr);
+    ~RequestHandlerBase() override;
+
+    virtual void sendLLMRequest(const LLMConfig &config, const QJsonObject &request) = 0;
+    virtual bool cancelRequest(const QString &id) = 0;
+
+signals:
+    void completionReceived(const QString &completion, const QJsonObject &request, bool isComplete);
+    void requestFinished(const QString &requestId, bool success, const QString &errorString);
+    void requestCancelled(const QString &id);
+};
+
+} // namespace QodeAssist::LLMCore

llmcore/RequestType.hpp

@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2024 Petr Mironychev
+ * Copyright (C) 2024-2025 Petr Mironychev
  *
  * This file is part of QodeAssist.
  *
@@ -21,5 +21,5 @@
 
 namespace QodeAssist::LLMCore {
 
-enum RequestType { CodeCompletion, Chat };
+enum RequestType { CodeCompletion, Chat, Embedding };
 }

llmcore/ValidationUtils.cpp

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

llmcore/ValidationUtils.hpp

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