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,14 +6,14 @@
         "llm",
         "ai"
     ],
-    "compatibility": "Qt 6.8.2",
+    "compatibility": "Qt 6.8.3",
     "platforms": [
         "Windows",
         "macOS",
         "Linux"
     ],
     "license": "GPLv3",
-    "version": "0.5.3",
+    "version": "0.5.7",
     "status": "draft",
     "is_pack": false,
     "released_at": null,
@@ -30,8 +30,28 @@
         },
         {
             "version": "0.5.3",
-            "is_latest": true,
+            "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.2
-  QT_CREATOR_VERSION: 16.0.0
-  QT_CREATOR_VERSION_INTERNAL: 16.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"

CMakeLists.txt

@@ -101,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/ChatModel.cpp

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

ChatView/ChatModel.hpp

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

ChatView/ChatRootView.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 Petr Mironychev
+ * Copyright (C) 2024-2025 Petr Mironychev
  *
  * This file is part of QodeAssist.
  *
@@ -464,12 +464,12 @@ void ChatRootView::updateInputTokensCount()
     }
 
     if (!m_attachmentFiles.isEmpty()) {
-        auto attachFiles = Context::ContextManager::instance().getContentFiles(m_attachmentFiles);
+        auto attachFiles = m_clientInterface->contextManager()->getContentFiles(m_attachmentFiles);
         inputTokens += Context::TokenUtils::estimateFilesTokens(attachFiles);
     }
 
     if (!m_linkedFiles.isEmpty()) {
-        auto linkFiles = Context::ContextManager::instance().getContentFiles(m_linkedFiles);
+        auto linkFiles = m_clientInterface->contextManager()->getContentFiles(m_linkedFiles);
         inputTokens += Context::TokenUtils::estimateFilesTokens(linkFiles);
     }
 

ChatView/ChatRootView.hpp

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

ChatView/ChatSerializer.cpp

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

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.
  *

ChatView/ChatWidget.hpp

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

ChatView/ClientInterface.cpp

@@ -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 @@
 #include <texteditor/texteditor.h>
 
 #include "ChatAssistantSettings.hpp"
-#include "ContextManager.hpp"
 #include "GeneralSettings.hpp"
 #include "Logger.hpp"
 #include "ProvidersManager.hpp"
@@ -46,6 +45,7 @@ ClientInterface::ClientInterface(
     , m_requestHandler(new LLMCore::RequestHandler(this))
     , m_chatModel(chatModel)
     , m_promptProvider(promptProvider)
+    , m_contextManager(new Context::ContextManager(this))
 {
     connect(
         m_requestHandler,
@@ -73,7 +73,7 @@ void ClientInterface::sendMessage(
 {
     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();
@@ -200,7 +200,7 @@ QString ClientInterface::getSystemPromptWithLinkedFiles(
     if (!linkedFiles.isEmpty()) {
         updatedPrompt += "\n\nLinked files for reference:\n";
 
-        auto contentFiles = Context::ContextManager::instance().getContentFiles(linkedFiles);
+        auto contentFiles = m_contextManager->getContentFiles(linkedFiles);
         for (const auto &file : contentFiles) {
             updatedPrompt += QString("\nFile: %1\nContent:\n%2\n").arg(file.filename, file.content);
         }
@@ -209,4 +209,9 @@ QString ClientInterface::getSystemPromptWithLinkedFiles(
     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.
  *
@@ -26,6 +26,7 @@
 #include "ChatModel.hpp"
 #include "RequestHandler.hpp"
 #include "llmcore/IPromptProvider.hpp"
+#include <context/ContextManager.hpp>
 
 namespace QodeAssist::Chat {
 
@@ -45,6 +46,8 @@ public:
     void clearMessages();
     void cancelRequest();
 
+    Context::ContextManager *contextManager() const;
+
 signals:
     void errorOccurred(const QString &error);
     void messageReceivedCompletely();
@@ -58,6 +61,7 @@ private:
     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/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.
  *

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.
  *

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.
  *

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.
  *

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.
  *

CodeHandler.cpp

@@ -1,5 +1,5 @@
 /*
- * 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.
@@ -19,6 +19,7 @@
  */
 
 #include "CodeHandler.hpp"
+#include <settings/CodeCompletionSettings.hpp>
 #include <QFileInfo>
 #include <QHash>
 
@@ -32,6 +33,44 @@ struct LanguageProperties
     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 = {
@@ -55,6 +94,8 @@ const QVector<LanguageProperties> &getKnownLanguages()
         {"qml", "//", {"qml"}, {"qml"}},
     };
 
+    knownLanguages.append(customLanguagesFromSettings());
+
     return knownLanguages;
 }
 

CodeHandler.hpp

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

ConfigurationManager.cpp

@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2024 Petr Mironychev
+ * Copyright (C) 2024-2025 Petr Mironychev
  *
  * This file is part of QodeAssist.
  *
@@ -36,6 +36,7 @@ void ConfigurationManager::init()
 {
     setupConnections();
     updateAllTemplateDescriptions();
+    checkAllTemplate();
 }
 
 void ConfigurationManager::updateTemplateDescription(const Utils::StringAspect &templateAspect)
@@ -59,6 +60,26 @@ void ConfigurationManager::updateAllTemplateDescriptions()
     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)
     : QObject(parent)
     , m_generalSettings(Settings::generalSettings())

ConfigurationManager.hpp

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

LLMClientInterface.cpp

@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2024 Petr Mironychev
+ * Copyright (C) 2024-2025 Petr Mironychev
  *
  * This file is part of QodeAssist.
  *
@@ -24,7 +24,6 @@
 #include <QNetworkReply>
 
 #include "CodeHandler.hpp"
-#include "context/ContextManager.hpp"
 #include "context/DocumentContextReader.hpp"
 #include "context/Utils.hpp"
 #include "llmcore/PromptTemplateManager.hpp"
@@ -51,6 +50,7 @@ LLMClientInterface::LLMClientInterface(
     , m_requestHandler(requestHandler)
     , m_documentReader(documentReader)
     , m_performanceLogger(performanceLogger)
+    , m_contextManager(new Context::ContextManager(this))
 {
     connect(
         &m_requestHandler,
@@ -61,7 +61,7 @@ LLMClientInterface::LLMClientInterface(
 
 Utils::FilePath LLMClientInterface::serverDeviceTemplate() const
 {
-    return "Qode Assist";
+    return "QodeAssist";
 }
 
 void LLMClientInterface::startImpl()
@@ -170,8 +170,7 @@ void LLMClientInterface::handleCompletion(const QJsonObject &request)
 
     auto updatedContext = prepareContext(request, documentInfo);
 
-    bool isPreset1Active
-        = Context::ContextManager::isSpecifyCompletion(documentInfo, m_generalSettings);
+    bool isPreset1Active = m_contextManager->isSpecifyCompletion(documentInfo);
 
     const auto providerName = !isPreset1Active ? m_generalSettings.ccProvider()
                                                : m_generalSettings.ccPreset1Provider();
@@ -231,6 +230,19 @@ void LLMClientInterface::handleCompletion(const QJsonObject &request)
     if (updatedContext.fileContext.has_value())
         systemPrompt.append(updatedContext.fileContext.value());
 
+    if (m_completeSettings.useOpenFilesContext()) {
+        if (provider->providerID() == LLMCore::ProviderID::LlamaCpp) {
+            for (const auto openedFilePath : m_contextManager->openedFiles({filePath})) {
+                if (!updatedContext.filesMetadata) {
+                    updatedContext.filesMetadata = QList<LLMCore::FileMetadata>();
+                }
+                updatedContext.filesMetadata->append({openedFilePath.first, openedFilePath.second});
+            }
+        } else {
+            systemPrompt.append(m_contextManager->openedFilesContext({filePath}));
+        }
+    }
+
     updatedContext.systemPrompt = systemPrompt;
 
     if (promptTemplate->type() == LLMCore::TemplateType::Chat) {
@@ -282,8 +294,7 @@ void LLMClientInterface::sendCompletionToClient(
 {
     auto filePath = Context::extractFilePathFromRequest(request);
     auto documentInfo = m_documentReader.readDocument(filePath);
-    bool isPreset1Active
-        = Context::ContextManager::isSpecifyCompletion(documentInfo, m_generalSettings);
+    bool isPreset1Active = m_contextManager->isSpecifyCompletion(documentInfo);
 
     auto templateName = !isPreset1Active ? m_generalSettings.ccTemplate()
                                          : m_generalSettings.ccPreset1Template();
@@ -332,6 +343,4 @@ void LLMClientInterface::sendCompletionToClient(
     emit messageReceived(LanguageServerProtocol::JsonRpcMessage(response));
 }
 
-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,6 +22,7 @@
 #include <languageclient/languageclientinterface.h>
 #include <texteditor/texteditor.h>
 
+#include <context/ContextManager.hpp>
 #include <context/IDocumentReader.hpp>
 #include <context/ProgrammingLanguage.hpp>
 #include <llmcore/ContextData.hpp>
@@ -63,7 +64,6 @@ public:
 
 protected:
     void startImpl() override;
-    void parseCurrentMessage() override;
 
 private:
     void handleInitialize(const QJsonObject &request);
@@ -84,6 +84,7 @@ private:
     Context::IDocumentReader &m_documentReader;
     IRequestPerformanceLogger &m_performanceLogger;
     QElapsedTimer m_completionTimer;
+    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.
  *

QodeAssist.json.in

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

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;
@@ -48,7 +51,7 @@ 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)
@@ -151,6 +161,9 @@ void QodeAssistClient::requestCompletions(TextEditor::TextEditorWidget *editor)
         {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);
@@ -160,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);
@@ -237,6 +271,7 @@ void QodeAssistClient::handleCompletions(
             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()));
@@ -248,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);
 }
@@ -289,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
@@ -26,6 +26,9 @@
 
 #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>
@@ -42,6 +45,8 @@ public:
     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);
@@ -52,6 +57,7 @@ private:
 
     void setupConnections();
     void cleanupConnections();
+    void handleRefactoringResult(const RefactorResult &result);
 
     QHash<TextEditor::TextEditorWidget *, GetCompletionRequest> m_runningRequests;
     QHash<TextEditor::TextEditorWidget *, QTimer *> m_scheduledRequests;
@@ -60,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

@@ -13,15 +13,6 @@
 > - The QodeAssist developer bears no responsibility for any charges incurred
 > - Please carefully review the provider's pricing and your account settings before use
 
-⚠️ **Commercial Support and Custom Development**
-> The QodeAssist developer offers commercial services for:
-> - Adapting the plugin for specific Qt Creator versions
-> - Custom development for particular operating systems
-> - Integration with specific language models
-> - Implementing custom features and modifications
->
-> For commercial inquiries, please contact: qodeassist.dev@pm.me
-
 ## Table of Contents
 1. [Overview](#overview)
 2. [Install plugin to QtCreator](#install-plugin-to-qtcreator)
@@ -43,6 +34,7 @@
 ## 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
@@ -60,7 +52,6 @@
   - 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!
@@ -94,6 +85,8 @@ Join our Discord Community: Have questions or want to discuss QodeAssist? Join o
 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...
@@ -172,7 +165,7 @@ ollama run qwen2.5-coder:32b
 ```
 
 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
@@ -257,6 +250,7 @@ Linked files provide persistent context throughout the conversation:
 - 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
     
@@ -279,7 +273,7 @@ If you need compatiblity with another os, you have to build manualy. our experim
 
 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.
  *

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.
  *

chat/NavigationPanel.hpp

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

context/CMakeLists.txt

@@ -7,6 +7,7 @@ add_library(Context STATIC
     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.
  *

context/ChangesManager.h

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

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.
  *
@@ -24,17 +24,16 @@
 #include <QJsonObject>
 #include <QTextStream>
 
-#include "GeneralSettings.hpp"
+#include "settings/GeneralSettings.hpp"
+#include <coreplugin/editormanager/editormanager.h>
+#include <projectexplorer/project.h>
+#include <projectexplorer/projectnodes.h>
+#include <texteditor/textdocument.h>
+
 #include "Logger.hpp"
 
 namespace QodeAssist::Context {
 
-ContextManager &ContextManager::instance()
-{
-    static ContextManager manager;
-    return manager;
-}
-
 ContextManager::ContextManager(QObject *parent)
     : QObject(parent)
 {}
@@ -59,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;
@@ -68,7 +88,7 @@ ContentFile ContextManager::createContentFile(const QString &filePath) const
     return contentFile;
 }
 
-ProgrammingLanguage ContextManager::getDocumentLanguage(const DocumentInfo &documentInfo)
+ProgrammingLanguage ContextManager::getDocumentLanguage(const DocumentInfo &documentInfo) const
 {
     if (!documentInfo.document) {
         LOG_MESSAGE("Error: Document is not available for" + documentInfo.filePath);
@@ -78,9 +98,10 @@ ProgrammingLanguage ContextManager::getDocumentLanguage(const DocumentInfo &docu
     return Context::ProgrammingLanguageUtils::fromMimeType(documentInfo.mimeType);
 }
 
-bool ContextManager::isSpecifyCompletion(
-    const DocumentInfo &documentInfo, const Settings::GeneralSettings &generalSettings)
+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()));
@@ -88,4 +109,48 @@ bool ContextManager::isSpecifyCompletion(
     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,31 +23,32 @@
 #include <QString>
 
 #include "ContentFile.hpp"
-#include "IDocumentReader.hpp"
+#include "IContextManager.hpp"
 #include "ProgrammingLanguage.hpp"
-#include "settings/GeneralSettings.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;
-
-    static ProgrammingLanguage getDocumentLanguage(const DocumentInfo &documentInfo);
-    static bool isSpecifyCompletion(
-        const DocumentInfo &documentInfo, const Settings::GeneralSettings &generalSettings);
-
-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.
  *
@@ -145,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();
 

context/DocumentContextReader.hpp

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

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/ProgrammingLanguage.cpp

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

context/ProgrammingLanguage.hpp

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

context/TokenUtils.cpp

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

context/TokenUtils.hpp

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

llmcore/ContextData.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 Petr Mironychev
+ * Copyright (C) 2024-2025 Petr Mironychev
  *
  * This file is part of QodeAssist.
  *
@@ -34,6 +34,13 @@ struct Message
     // clang-format on
 };
 
+struct FileMetadata
+{
+    QString filePath;
+    QString content;
+    bool operator==(const FileMetadata &) const = default;
+};
+
 struct ContextData
 {
     std::optional<QString> systemPrompt;
@@ -41,6 +48,7 @@ struct ContextData
     std::optional<QString> suffix;
     std::optional<QString> fileContext;
     std::optional<QVector<Message>> history;
+    std::optional<QList<FileMetadata>> filesMetadata;
 
     bool operator==(const ContextData &) const = default;
 };

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/PromptTemplate.hpp

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

llmcore/PromptTemplateManager.cpp

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

llmcore/PromptTemplateManager.hpp

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

llmcore/Provider.hpp

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

llmcore/ProviderID.hpp

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

llmcore/ProvidersManager.cpp

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

llmcore/ProvidersManager.hpp

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

llmcore/RequestConfig.hpp

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

llmcore/RequestHandler.cpp

@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2024 Petr Mironychev
+ * Copyright (C) 2024-2025 Petr Mironychev
  *
  * This file is part of QodeAssist.
  *
@@ -27,7 +27,6 @@ namespace QodeAssist::LLMCore {
 
 RequestHandler::RequestHandler(QObject *parent)
     : RequestHandlerBase(parent)
-    , m_manager(new QNetworkAccessManager(this))
 {}
 
 void RequestHandler::sendLLMRequest(const LLMConfig &config, const QJsonObject &request)
@@ -38,11 +37,12 @@ void RequestHandler::sendLLMRequest(const LLMConfig &config, const QJsonObject &
                         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());
+        = manager->post(networkRequest, QJsonDocument(config.providerRequest).toJson());
     if (!reply) {
         LOG_MESSAGE("Error: Failed to create network reply");
         return;
@@ -55,19 +55,23 @@ 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 details: %1\nStatus code: %2\nResponse: %3")
-                            .arg(reply->errorString())
-                            .arg(reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt())
-                            .arg(QString(reply->readAll())));
-            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();
     });
 }
 

llmcore/RequestHandler.hpp

@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2024 Petr Mironychev
+ * Copyright (C) 2024-2025 Petr Mironychev
  *
  * This file is part of QodeAssist.
  *
@@ -40,7 +40,6 @@ public:
     void handleLLMResponse(QNetworkReply *reply, const QJsonObject &request, const LLMConfig &config);
 
 private:
-    QNetworkAccessManager *m_manager;
     QMap<QString, QNetworkReply *> m_activeRequests;
     QMap<QNetworkReply *, QString> m_accumulatedResponses;
 

llmcore/RequestHandlerBase.cpp

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

llmcore/RequestHandlerBase.hpp

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

llmcore/RequestType.hpp

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

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.
  *

logger/Logger.cpp

@@ -28,7 +28,7 @@ void Logger::log(const QString &message, bool silent)
     if (!m_loggingEnabled)
         return;
 
-    const QString prefixedMessage = QLatin1String("[Qode Assist] ") + message;
+    const QString prefixedMessage = QLatin1String("[QodeAssist] ") + message;
     if (silent) {
         Core::MessageManager::writeSilently(prefixedMessage);
     } else {
@@ -43,7 +43,7 @@ void Logger::logMessages(const QStringList &messages, bool silent)
 
     QStringList prefixedMessages;
     for (const QString &message : messages) {
-        prefixedMessages << (QLatin1String("[Qode Assist] ") + message);
+        prefixedMessages << (QLatin1String("[QodeAssist] ") + message);
     }
 
     if (silent) {

providers/ClaudeProvider.cpp

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

providers/ClaudeProvider.hpp

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

providers/GoogleAIProvider.cpp

@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2024 Petr Mironychev
+ * Copyright (C) 2024-2025 Petr Mironychev
  *
  * This file is part of QodeAssist.
  *
@@ -30,7 +30,6 @@
 #include "logger/Logger.hpp"
 #include "settings/ChatAssistantSettings.hpp"
 #include "settings/CodeCompletionSettings.hpp"
-#include "settings/GeneralSettings.hpp"
 #include "settings/ProviderSettings.hpp"
 
 namespace QodeAssist::Providers {

providers/GoogleAIProvider.hpp

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

providers/LMStudioProvider.cpp

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

providers/LMStudioProvider.hpp

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

providers/LlamaCppProvider.cpp

@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2024 Petr Mironychev
+ * Copyright (C) 2024-2025 Petr Mironychev
  *
  * This file is part of QodeAssist.
  *
@@ -167,6 +167,7 @@ QList<QString> LlamaCppProvider::validateRequest(
             {"model", {}},
             {"input_prefix", {}},
             {"input_suffix", {}},
+            {"input_extra", {}},
             {"prompt", {}},
             {"temperature", {}},
             {"top_p", {}},

providers/LlamaCppProvider.hpp

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

providers/MistralAIProvider.hpp

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

providers/OllamaProvider.cpp

@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2024 Petr Mironychev
+ * Copyright (C) 2024-2025 Petr Mironychev
  *
  * This file is part of QodeAssist.
  *
@@ -30,6 +30,7 @@
 #include "logger/Logger.hpp"
 #include "settings/ChatAssistantSettings.hpp"
 #include "settings/CodeCompletionSettings.hpp"
+#include "settings/ProviderSettings.hpp"
 
 namespace QodeAssist::Providers {
 
@@ -139,6 +140,7 @@ QList<QString> OllamaProvider::getInstalledModels(const QString &url)
     QList<QString> models;
     QNetworkAccessManager manager;
     QNetworkRequest request(QString("%1%2").arg(url, "/api/tags"));
+    prepareNetworkRequest(request);
     QNetworkReply *reply = manager.get(request);
 
     QEventLoop loop;
@@ -210,6 +212,10 @@ QString OllamaProvider::apiKey() const
 void OllamaProvider::prepareNetworkRequest(QNetworkRequest &networkRequest) const
 {
     networkRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
+    const auto key = Settings::providerSettings().ollamaBasicAuthApiKey();
+    if (!key.isEmpty()) {
+        networkRequest.setRawHeader("Authorization", "Basic " + key.toLatin1());
+    }
 }
 
 LLMCore::ProviderID OllamaProvider::providerID() const

providers/OllamaProvider.hpp

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

providers/OpenAICompatProvider.cpp

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

providers/OpenAICompatProvider.hpp

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

providers/OpenAIProvider.cpp

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

providers/OpenAIProvider.hpp

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

providers/OpenRouterAIProvider.cpp

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

providers/OpenRouterAIProvider.hpp

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

providers/Providers.hpp

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