chore: Upgrade version to 0.4.6

- Add files to existing list instead of replacing when using attach dialog
- Prevent duplicate files from being added to attachment list

.github/ISSUE_TEMPLATE/bug_report.md

@@ -2,7 +2,7 @@
 name: Bug report
 about: Create a report to help us improve
 title: ''
-labels: ''
+labels: bug
 assignees: ''
 
 ---
@@ -23,16 +23,6 @@ A clear and concise description of what you expected to happen.
 **Screenshots**
 If applicable, add screenshots to help explain your problem.
 
-**Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
- - Version [e.g. 22]
-
-**Smartphone (please complete the following information):**
- - Device: [e.g. iPhone6]
- - OS: [e.g. iOS8.1]
- - Browser [e.g. stock browser, safari]
- - Version [e.g. 22]
-
+**Log**
 **Additional context**
 Add any other context about the problem here.

.github/workflows/build_cmake.yml

@@ -41,6 +41,12 @@ jobs:
             platform: linux_x64,
             cc: "gcc", cxx: "g++"
           }
+        - {
+            name: "Ubuntu 22.04 GCC", artifact: "Linux-x64(Ubuntu-22.04-experimental)",
+            os: ubuntu-22.04,
+            platform: linux_x64,
+            cc: "gcc", cxx: "g++"
+          }
         - {
             name: "macOS Latest Clang", artifact: "macOS-universal",
             os: macos-latest,

CMakeLists.txt

@@ -16,6 +16,7 @@ add_subdirectory(llmcore)
 add_subdirectory(settings)
 add_subdirectory(logger)
 add_subdirectory(ChatView)
+add_subdirectory(context)
 
 add_qtc_plugin(QodeAssist
   PLUGIN_DEPENDS
@@ -52,20 +53,22 @@ add_qtc_plugin(QodeAssist
     templates/ChatML.hpp
     templates/Alpaca.hpp
     templates/Llama2.hpp
+    templates/Claude.hpp
+    templates/OpenAI.hpp
     providers/Providers.hpp
     providers/OllamaProvider.hpp providers/OllamaProvider.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
     QodeAssist.qrc
     LSPCompletion.hpp
     LLMSuggestion.hpp LLMSuggestion.cpp
     QodeAssistClient.hpp QodeAssistClient.cpp
-    DocumentContextReader.hpp DocumentContextReader.cpp
-    utils/CounterTooltip.hpp utils/CounterTooltip.cpp
-    core/ChangesManager.h core/ChangesManager.cpp
     chat/ChatOutputPane.h chat/ChatOutputPane.cpp
     chat/NavigationPanel.hpp chat/NavigationPanel.cpp
     ConfigurationManager.hpp ConfigurationManager.cpp
     CodeHandler.hpp CodeHandler.cpp
+    UpdateStatusWidget.hpp UpdateStatusWidget.cpp
 )

ChatView/CMakeLists.txt

@@ -1,8 +1,8 @@
 qt_add_library(QodeAssistChatView STATIC)
 
 qt_policy(SET QTP0001 NEW)
+qt_policy(SET QTP0004 NEW)
 
-# URI name should match the subdirectory name to suppress the warning
 qt_add_qml_module(QodeAssistChatView
     URI ChatView
     VERSION 1.0
@@ -13,6 +13,14 @@ qt_add_qml_module(QodeAssistChatView
     qml/Badge.qml
     qml/dialog/CodeBlock.qml
     qml/dialog/TextBlock.qml
+    qml/controls/QoAButton.qml
+    qml/parts/TopBar.qml
+    qml/parts/BottomBar.qml
+    qml/parts/AttachedFilesPlace.qml
+    RESOURCES
+    icons/attach-file.svg
+    icons/close-dark.svg
+    icons/close-light.svg
     SOURCES
     ChatWidget.hpp ChatWidget.cpp
     ChatModel.hpp ChatModel.cpp
@@ -20,6 +28,7 @@ qt_add_qml_module(QodeAssistChatView
     ClientInterface.hpp ClientInterface.cpp
     MessagePart.hpp
     ChatUtils.h ChatUtils.cpp
+    ChatSerializer.hpp ChatSerializer.cpp
 )
 
 target_link_libraries(QodeAssistChatView
@@ -32,6 +41,7 @@ target_link_libraries(QodeAssistChatView
     QtCreator::Utils
     LLMCore
     QodeAssistSettings
+    Context
 )
 
 target_include_directories(QodeAssistChatView

ChatView/ChatModel.cpp

@@ -55,6 +55,13 @@ QVariant ChatModel::data(const QModelIndex &index, int role) const
     case Roles::Content: {
         return message.content;
     }
+    case Roles::Attachments: {
+        QStringList filenames;
+        for (const auto &attachment : message.attachments) {
+            filenames << attachment.filename;
+        }
+        return filenames;
+    }
     default:
         return QVariant();
     }
@@ -65,28 +72,43 @@ QHash<int, QByteArray> ChatModel::roleNames() const
     QHash<int, QByteArray> roles;
     roles[Roles::RoleType] = "roleType";
     roles[Roles::Content] = "content";
+    roles[Roles::Attachments] = "attachments";
     return roles;
 }
 
-void ChatModel::addMessage(const QString &content, ChatRole role, const QString &id)
+void ChatModel::addMessage(
+    const QString &content,
+    ChatRole role,
+    const QString &id,
+    const QList<Context::ContentFile> &attachments)
 {
-    int tokenCount = estimateTokenCount(content);
+    QString fullContent = content;
+    if (!attachments.isEmpty()) {
+        fullContent += "\n\nAttached files list:";
+        for (const auto &attachment : attachments) {
+            fullContent += QString("\nname: %1\nfile content:\n%2")
+                               .arg(attachment.filename, attachment.content);
+        }
+    }
+    int tokenCount = estimateTokenCount(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());
-        m_messages.append({role, content, tokenCount, id});
+        Message newMessage{role, content, tokenCount, id};
+        newMessage.attachments = attachments;
+        m_messages.append(newMessage);
         m_totalTokens += tokenCount;
         endInsertRows();
     }
 
-    trim();
     emit totalTokensChanged();
 }
 
@@ -95,20 +117,6 @@ QVector<ChatModel::Message> ChatModel::getChatHistory() const
     return m_messages;
 }
 
-void ChatModel::trim()
-{
-    while (m_totalTokens > tokensThreshold()) {
-        if (!m_messages.isEmpty()) {
-            m_totalTokens -= m_messages.first().tokenCount;
-            beginRemoveRows(QModelIndex(), 0, 0);
-            m_messages.removeFirst();
-            endRemoveRows();
-        } else {
-            break;
-        }
-    }
-}
-
 int ChatModel::estimateTokenCount(const QString &text) const
 {
     return text.length() / 4;
@@ -121,6 +129,7 @@ void ChatModel::clear()
     m_totalTokens = 0;
     endResetModel();
     emit totalTokensChanged();
+    emit modelReseted();
 }
 
 QList<MessagePart> ChatModel::processMessageContent(const QString &content) const
@@ -155,7 +164,6 @@ QList<MessagePart> ChatModel::processMessageContent(const QString &content) cons
 QJsonArray ChatModel::prepareMessagesForRequest(const QString &systemPrompt) const
 {
     QJsonArray messages;
-
     messages.append(QJsonObject{{"role", "system"}, {"content", systemPrompt}});
 
     for (const auto &message : m_messages) {
@@ -170,7 +178,22 @@ QJsonArray ChatModel::prepareMessagesForRequest(const QString &systemPrompt) con
         default:
             continue;
         }
-        messages.append(QJsonObject{{"role", role}, {"content", message.content}});
+
+        QString content
+            = message.attachments.isEmpty()
+                  ? message.content
+                  : message.content + "\n\nAttached files list:"
+                        + std::accumulate(
+                            message.attachments.begin(),
+                            message.attachments.end(),
+                            QString(),
+                            [](QString acc, const Context::ContentFile &attachment) {
+                                return acc
+                                       + QString("\nname: %1\nfile content:\n%2")
+                                             .arg(attachment.filename, attachment.content);
+                            });
+
+        messages.append(QJsonObject{{"role", role}, {"content", content}});
     }
 
     return messages;

ChatView/ChatModel.hpp

@@ -26,6 +26,8 @@
 #include <QJsonArray>
 #include <QtQmlIntegration>
 
+#include "context/ContentFile.hpp"
+
 namespace QodeAssist::Chat {
 
 class ChatModel : public QAbstractListModel
@@ -36,17 +38,19 @@ class ChatModel : public QAbstractListModel
     QML_ELEMENT
 
 public:
-    enum Roles { RoleType = Qt::UserRole, Content };
-
     enum ChatRole { System, User, Assistant };
     Q_ENUM(ChatRole)
 
+    enum Roles { RoleType = Qt::UserRole, Content, Attachments };
+
     struct Message
     {
         ChatRole role;
         QString content;
         int tokenCount;
         QString id;
+
+        QList<Context::ContentFile> attachments;
     };
 
     explicit ChatModel(QObject *parent = nullptr);
@@ -55,7 +59,11 @@ public:
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
     QHash<int, QByteArray> roleNames() const override;
 
-    Q_INVOKABLE void addMessage(const QString &content, ChatRole role, const QString &id);
+    Q_INVOKABLE void addMessage(
+        const QString &content,
+        ChatRole role,
+        const QString &id,
+        const QList<Context::ContentFile> &attachments = {});
     Q_INVOKABLE void clear();
     Q_INVOKABLE QList<MessagePart> processMessageContent(const QString &content) const;
 
@@ -71,9 +79,9 @@ public:
 signals:
     void totalTokensChanged();
     void tokensThresholdChanged();
+    void modelReseted();
 
 private:
-    void trim();
     int estimateTokenCount(const QString &text) const;
 
     QVector<Message> m_messages;

ChatView/ChatRootView.cpp

@@ -18,12 +18,23 @@
  */
 
 #include "ChatRootView.hpp"
-#include <QtGui/qclipboard.h>
+
+#include <QClipboard>
+#include <QFileDialog>
+#include <QMessageBox>
+
+#include <coreplugin/icore.h>
+#include <projectexplorer/project.h>
+#include <projectexplorer/projectexplorer.h>
+#include <projectexplorer/projectmanager.h>
 #include <utils/theme/theme.h>
 #include <utils/utilsicons.h>
 
 #include "ChatAssistantSettings.hpp"
+#include "ChatSerializer.hpp"
 #include "GeneralSettings.hpp"
+#include "Logger.hpp"
+#include "ProjectSettings.hpp"
 
 namespace QodeAssist::Chat {
 
@@ -44,7 +55,13 @@ ChatRootView::ChatRootView(QQuickItem *parent)
             this,
             &ChatRootView::isSharingCurrentFileChanged);
 
-    generateColors();
+    connect(
+        m_clientInterface,
+        &ClientInterface::messageReceivedCompletely,
+        this,
+        &ChatRootView::autosave);
+
+    connect(m_chatModel, &ChatModel::modelReseted, [this]() { m_recentFilePath = QString(); });
 }
 
 ChatModel *ChatRootView::chatModel() const
@@ -52,14 +69,26 @@ ChatModel *ChatRootView::chatModel() const
     return m_chatModel;
 }
 
-QColor ChatRootView::backgroundColor() const
+void ChatRootView::sendMessage(const QString &message, bool sharingCurrentFile)
 {
-    return Utils::creatorColor(Utils::Theme::BackgroundColorNormal);
-}
+    if (m_chatModel->totalTokens() > m_chatModel->tokensThreshold()) {
+        QMessageBox::StandardButton reply = QMessageBox::question(
+            Core::ICore::dialogParent(),
+            tr("Token Limit Exceeded"),
+            tr("The chat history has exceeded the token limit.\n"
+               "Would you like to create new chat?"),
+            QMessageBox::Yes | QMessageBox::No);
 
-void ChatRootView::sendMessage(const QString &message, bool sharingCurrentFile) const
-{
-    m_clientInterface->sendMessage(message, sharingCurrentFile);
+        if (reply == QMessageBox::Yes) {
+            autosave();
+            m_chatModel->clear();
+            m_recentFilePath = QString{};
+            return;
+        }
+    }
+
+    m_clientInterface->sendMessage(message, m_attachmentFiles, sharingCurrentFile);
+    clearAttachmentFiles();
 }
 
 void ChatRootView::copyToClipboard(const QString &text)
@@ -72,47 +101,32 @@ void ChatRootView::cancelRequest()
     m_clientInterface->cancelRequest();
 }
 
-void ChatRootView::generateColors()
+void ChatRootView::clearAttachmentFiles()
 {
-    QColor baseColor = backgroundColor();
-    bool isDarkTheme = baseColor.lightness() < 128;
-
-    if (isDarkTheme) {
-        m_primaryColor = generateColor(baseColor, 0.1, 1.2, 1.4);
-        m_secondaryColor = generateColor(baseColor, -0.1, 1.1, 1.2);
-        m_codeColor = generateColor(baseColor, 0.05, 0.8, 1.1);
-    } else {
-        m_primaryColor = generateColor(baseColor, 0.05, 1.05, 1.1);
-        m_secondaryColor = generateColor(baseColor, -0.05, 1.1, 1.2);
-        m_codeColor = generateColor(baseColor, 0.02, 0.95, 1.05);
+    if (!m_attachmentFiles.isEmpty()) {
+        m_attachmentFiles.clear();
+        emit attachmentFilesChanged();
     }
 }
 
-QColor ChatRootView::generateColor(const QColor &baseColor,
-                                   float hueShift,
-                                   float saturationMod,
-                                   float lightnessMod)
+QString ChatRootView::getChatsHistoryDir() const
 {
-    float h, s, l, a;
-    baseColor.getHslF(&h, &s, &l, &a);
-    bool isDarkTheme = l < 0.5;
+    QString path;
 
-    h = fmod(h + hueShift + 1.0, 1.0);
-
-    s = qBound(0.0f, s * saturationMod, 1.0f);
-
-    if (isDarkTheme) {
-        l = qBound(0.0f, l * lightnessMod, 1.0f);
+    if (auto project = ProjectExplorer::ProjectManager::startupProject()) {
+        Settings::ProjectSettings projectSettings(project);
+        path = projectSettings.chatHistoryPath().toString();
     } else {
-        l = qBound(0.0f, l / lightnessMod, 1.0f);
+        path = QString("%1/qodeassist/chat_history").arg(Core::ICore::userResourcePath().toString());
     }
 
-    h = qBound(0.0f, h, 1.0f);
-    s = qBound(0.0f, s, 1.0f);
-    l = qBound(0.0f, l, 1.0f);
-    a = qBound(0.0f, a, 1.0f);
+    QDir dir(path);
+    if (!dir.exists() && !dir.mkpath(".")) {
+        LOG_MESSAGE(QString("Failed to create directory: %1").arg(path));
+        return QString();
+    }
 
-    return QColor::fromHslF(h, s, l, a);
+    return path;
 }
 
 QString ChatRootView::currentTemplate() const
@@ -121,24 +135,149 @@ QString ChatRootView::currentTemplate() const
     return settings.caModel();
 }
 
-QColor ChatRootView::primaryColor() const
-{
-    return m_primaryColor;
-}
-
-QColor ChatRootView::secondaryColor() const
-{
-    return m_secondaryColor;
-}
-
-QColor ChatRootView::codeColor() const
-{
-    return m_codeColor;
-}
-
 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));
+    }
+}
+
+void ChatRootView::loadHistory(const QString &filePath)
+{
+    auto result = ChatSerializer::loadFromFile(m_chatModel, filePath);
+    if (!result.success) {
+        LOG_MESSAGE(QString("Failed to load chat history: %1").arg(result.errorMessage));
+    } else {
+        m_recentFilePath = filePath;
+    }
+}
+
+void ChatRootView::showSaveDialog()
+{
+    QString initialDir = getChatsHistoryDir();
+
+    QFileDialog *dialog = new QFileDialog(nullptr, tr("Save Chat History"));
+    dialog->setAcceptMode(QFileDialog::AcceptSave);
+    dialog->setFileMode(QFileDialog::AnyFile);
+    dialog->setNameFilter(tr("JSON files (*.json)"));
+    dialog->setDefaultSuffix("json");
+    if (!initialDir.isEmpty()) {
+        dialog->setDirectory(initialDir);
+        dialog->selectFile(getSuggestedFileName() + ".json");
+    }
+
+    connect(dialog, &QFileDialog::finished, this, [this, dialog](int result) {
+        if (result == QFileDialog::Accepted) {
+            QStringList files = dialog->selectedFiles();
+            if (!files.isEmpty()) {
+                saveHistory(files.first());
+            }
+        }
+        dialog->deleteLater();
+    });
+
+    dialog->open();
+}
+
+void ChatRootView::showLoadDialog()
+{
+    QString initialDir = getChatsHistoryDir();
+
+    QFileDialog *dialog = new QFileDialog(nullptr, tr("Load Chat History"));
+    dialog->setAcceptMode(QFileDialog::AcceptOpen);
+    dialog->setFileMode(QFileDialog::ExistingFile);
+    dialog->setNameFilter(tr("JSON files (*.json)"));
+    if (!initialDir.isEmpty()) {
+        dialog->setDirectory(initialDir);
+    }
+
+    connect(dialog, &QFileDialog::finished, this, [this, dialog](int result) {
+        if (result == QFileDialog::Accepted) {
+            QStringList files = dialog->selectedFiles();
+            if (!files.isEmpty()) {
+                loadHistory(files.first());
+            }
+        }
+        dialog->deleteLater();
+    });
+
+    dialog->open();
+}
+
+QString ChatRootView::getSuggestedFileName() const
+{
+    QStringList parts;
+
+    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;
+    }
+
+    parts << QDateTime::currentDateTime().toString("yyyy-MM-dd_HH-mm");
+
+    return parts.join("_");
+}
+
+void ChatRootView::autosave()
+{
+    if (m_chatModel->rowCount() == 0 || !Settings::chatAssistantSettings().autosave()) {
+        return;
+    }
+
+    QString filePath = getAutosaveFilePath();
+    if (!filePath.isEmpty()) {
+        ChatSerializer::saveToFile(m_chatModel, filePath);
+        m_recentFilePath = filePath;
+    }
+}
+
+QString ChatRootView::getAutosaveFilePath() const
+{
+    if (!m_recentFilePath.isEmpty()) {
+        return m_recentFilePath;
+    }
+
+    QString dir = getChatsHistoryDir();
+    if (dir.isEmpty()) {
+        return QString();
+    }
+
+    return QDir(dir).filePath(getSuggestedFileName() + ".json");
+}
+
+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());
+    }
+
+    if (dialog.exec() == QDialog::Accepted) {
+        QStringList newFilePaths = dialog.selectedFiles();
+        if (!newFilePaths.isEmpty()) {
+            bool filesAdded = false;
+            for (const QString &filePath : newFilePaths) {
+                if (!m_attachmentFiles.contains(filePath)) {
+                    m_attachmentFiles.append(filePath);
+                    filesAdded = true;
+                }
+            }
+            if (filesAdded) {
+                emit attachmentFilesChanged();
+            }
+        }
+    }
+}
+
 } // namespace QodeAssist::Chat

ChatView/ChatRootView.hpp

@@ -29,18 +29,12 @@ namespace QodeAssist::Chat {
 class ChatRootView : public QQuickItem
 {
     Q_OBJECT
-    // Possibly Qt bug: QTBUG-131004
-    // The class type name must be fully qualified
-    // including the namespace.
-    // Otherwise qmlls can't find it.
     Q_PROPERTY(QodeAssist::Chat::ChatModel *chatModel READ chatModel NOTIFY chatModelChanged FINAL)
     Q_PROPERTY(QString currentTemplate READ currentTemplate NOTIFY currentTemplateChanged FINAL)
-    Q_PROPERTY(QColor backgroundColor READ backgroundColor CONSTANT FINAL)
-    Q_PROPERTY(QColor primaryColor READ primaryColor CONSTANT FINAL)
-    Q_PROPERTY(QColor secondaryColor READ secondaryColor CONSTANT FINAL)
-    Q_PROPERTY(QColor codeColor READ codeColor CONSTANT FINAL)
     Q_PROPERTY(bool isSharingCurrentFile READ isSharingCurrentFile NOTIFY
                    isSharingCurrentFileChanged FINAL)
+    Q_PROPERTY(QStringList attachmentFiles MEMBER m_attachmentFiles NOTIFY attachmentFilesChanged)
+
     QML_ELEMENT
 
 public:
@@ -49,38 +43,40 @@ public:
     ChatModel *chatModel() const;
     QString currentTemplate() const;
 
-    QColor backgroundColor() const;
-    QColor primaryColor() const;
-    QColor secondaryColor() const;
-
-    QColor codeColor() const;
-
     bool isSharingCurrentFile() const;
 
+    void saveHistory(const QString &filePath);
+    void loadHistory(const QString &filePath);
+
+    Q_INVOKABLE void showSaveDialog();
+    Q_INVOKABLE void showLoadDialog();
+
+    void autosave();
+    QString getAutosaveFilePath() const;
+
+    Q_INVOKABLE void showAttachFilesDialog();
+
 public slots:
-    void sendMessage(const QString &message, bool sharingCurrentFile = false) const;
+    void sendMessage(const QString &message, bool sharingCurrentFile = false);
     void copyToClipboard(const QString &text);
     void cancelRequest();
+    void clearAttachmentFiles();
 
 signals:
     void chatModelChanged();
     void currentTemplateChanged();
-
     void isSharingCurrentFileChanged();
+    void attachmentFilesChanged();
 
 private:
-    void generateColors();
-    QColor generateColor(const QColor &baseColor,
-                         float hueShift,
-                         float saturationMod,
-                         float lightnessMod);
+    QString getChatsHistoryDir() const;
+    QString getSuggestedFileName() const;
 
     ChatModel *m_chatModel;
     ClientInterface *m_clientInterface;
     QString m_currentTemplate;
-    QColor m_primaryColor;
-    QColor m_secondaryColor;
-    QColor m_codeColor;
+    QString m_recentFilePath;
+    QStringList m_attachmentFiles;
 };
 
 } // namespace QodeAssist::Chat

ChatView/ChatSerializer.cpp

@@ -0,0 +1,145 @@
+/* 
+ * 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 "ChatSerializer.hpp"
+#include "Logger.hpp"
+
+#include <QDir>
+#include <QFile>
+#include <QFileInfo>
+#include <QJsonDocument>
+
+namespace QodeAssist::Chat {
+
+const QString ChatSerializer::VERSION = "0.1";
+
+SerializationResult ChatSerializer::saveToFile(const ChatModel *model, const QString &filePath)
+{
+    if (!ensureDirectoryExists(filePath)) {
+        return {false, "Failed to create directory structure"};
+    }
+
+    QFile file(filePath);
+    if (!file.open(QIODevice::WriteOnly)) {
+        return {false, QString("Failed to open file for writing: %1").arg(filePath)};
+    }
+
+    QJsonObject root = serializeChat(model);
+    QJsonDocument doc(root);
+
+    if (file.write(doc.toJson(QJsonDocument::Indented)) == -1) {
+        return {false, QString("Failed to write to file: %1").arg(file.errorString())};
+    }
+
+    return {true, QString()};
+}
+
+SerializationResult ChatSerializer::loadFromFile(ChatModel *model, const QString &filePath)
+{
+    QFile file(filePath);
+    if (!file.open(QIODevice::ReadOnly)) {
+        return {false, QString("Failed to open file for reading: %1").arg(filePath)};
+    }
+
+    QJsonParseError error;
+    QJsonDocument doc = QJsonDocument::fromJson(file.readAll(), &error);
+    if (error.error != QJsonParseError::NoError) {
+        return {false, QString("JSON parse error: %1").arg(error.errorString())};
+    }
+
+    QJsonObject root = doc.object();
+    QString version = root["version"].toString();
+
+    if (!validateVersion(version)) {
+        return {false, QString("Unsupported version: %1").arg(version)};
+    }
+
+    if (!deserializeChat(model, root)) {
+        return {false, "Failed to deserialize chat data"};
+    }
+
+    return {true, QString()};
+}
+
+QJsonObject ChatSerializer::serializeMessage(const ChatModel::Message &message)
+{
+    QJsonObject messageObj;
+    messageObj["role"] = static_cast<int>(message.role);
+    messageObj["content"] = message.content;
+    messageObj["tokenCount"] = message.tokenCount;
+    messageObj["id"] = message.id;
+    return messageObj;
+}
+
+ChatModel::Message ChatSerializer::deserializeMessage(const QJsonObject &json)
+{
+    ChatModel::Message message;
+    message.role = static_cast<ChatModel::ChatRole>(json["role"].toInt());
+    message.content = json["content"].toString();
+    message.tokenCount = json["tokenCount"].toInt();
+    message.id = json["id"].toString();
+    return message;
+}
+
+QJsonObject ChatSerializer::serializeChat(const ChatModel *model)
+{
+    QJsonArray messagesArray;
+    for (const auto &message : model->getChatHistory()) {
+        messagesArray.append(serializeMessage(message));
+    }
+
+    QJsonObject root;
+    root["version"] = VERSION;
+    root["messages"] = messagesArray;
+    root["totalTokens"] = model->totalTokens();
+
+    return root;
+}
+
+bool ChatSerializer::deserializeChat(ChatModel *model, const QJsonObject &json)
+{
+    QJsonArray messagesArray = json["messages"].toArray();
+    QVector<ChatModel::Message> messages;
+    messages.reserve(messagesArray.size());
+
+    for (const auto &messageValue : messagesArray) {
+        messages.append(deserializeMessage(messageValue.toObject()));
+    }
+
+    model->clear();
+    for (const auto &message : messages) {
+        model->addMessage(message.content, message.role, message.id);
+    }
+
+    return true;
+}
+
+bool ChatSerializer::ensureDirectoryExists(const QString &filePath)
+{
+    QFileInfo fileInfo(filePath);
+    QDir dir = fileInfo.dir();
+    return dir.exists() || dir.mkpath(".");
+}
+
+bool ChatSerializer::validateVersion(const QString &version)
+{
+    return version == VERSION;
+}
+
+} // namespace QodeAssist::Chat

ChatView/ChatSerializer.hpp

@@ -0,0 +1,56 @@
+/* 
+ * 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 "ChatModel.hpp"
+
+namespace QodeAssist::Chat {
+
+struct SerializationResult
+{
+    bool success{false};
+    QString errorMessage;
+};
+
+class ChatSerializer
+{
+public:
+    static SerializationResult saveToFile(const ChatModel *model, const QString &filePath);
+    static SerializationResult loadFromFile(ChatModel *model, const QString &filePath);
+
+    // Public for testing purposes
+    static QJsonObject serializeMessage(const ChatModel::Message &message);
+    static ChatModel::Message deserializeMessage(const QJsonObject &json);
+    static QJsonObject serializeChat(const ChatModel *model);
+    static bool deserializeChat(ChatModel *model, const QJsonObject &json);
+
+private:
+    static const QString VERSION;
+    static constexpr int CURRENT_VERSION = 1;
+
+    static bool ensureDirectoryExists(const QString &filePath);
+    static bool validateVersion(const QString &version);
+};
+
+} // namespace QodeAssist::Chat

ChatView/ChatUtils.h

@@ -23,7 +23,6 @@
 #include <qqmlintegration.h>
 
 namespace QodeAssist::Chat {
-// Q_NAMESPACE
 
 class ChatUtils : public QObject
 {

ChatView/ClientInterface.cpp

@@ -33,6 +33,7 @@
 #include <texteditor/texteditor.h>
 
 #include "ChatAssistantSettings.hpp"
+#include "ContextManager.hpp"
 #include "GeneralSettings.hpp"
 #include "Logger.hpp"
 #include "PromptTemplateManager.hpp"
@@ -64,11 +65,13 @@ ClientInterface::ClientInterface(ChatModel *chatModel, QObject *parent)
 
 ClientInterface::~ClientInterface() = default;
 
-void ClientInterface::sendMessage(const QString &message, bool includeCurrentFile)
+void ClientInterface::sendMessage(
+    const QString &message, const QList<QString> &attachments, bool includeCurrentFile)
 {
     cancelRequest();
 
-    m_chatModel->addMessage(message, ChatModel::ChatRole::User, "");
+    auto attachFiles = Context::ContextManager::instance().getContentFiles(attachments);
+    m_chatModel->addMessage(message, ChatModel::ChatRole::User, "", attachFiles);
 
     auto &chatAssistantSettings = Settings::chatAssistantSettings();
 
@@ -126,7 +129,7 @@ void ClientInterface::sendMessage(const QString &message, bool includeCurrentFil
     config.url = QString("%1%2").arg(Settings::generalSettings().caUrl(), provider->chatEndpoint());
     config.providerRequest = providerRequest;
     config.multiLineCompletion = false;
-    config.apiKey = Settings::chatAssistantSettings().apiKey();
+    config.apiKey = provider->apiKey();
 
     QJsonObject request;
     request["id"] = QUuid::createUuid().toString();
@@ -166,6 +169,7 @@ void ClientInterface::handleLLMResponse(const QString &response,
         if (isComplete) {
             LOG_MESSAGE(
                 "Message completed. Final response for message " + messageId + ": " + response);
+            emit messageReceivedCompletely();
         }
     }
 }

ChatView/ClientInterface.hpp

@@ -36,12 +36,16 @@ public:
     explicit ClientInterface(ChatModel *chatModel, QObject *parent = nullptr);
     ~ClientInterface();
 
-    void sendMessage(const QString &message, bool includeCurrentFile = false);
+    void sendMessage(
+        const QString &message,
+        const QList<QString> &attachments = {},
+        bool includeCurrentFile = false);
     void clearMessages();
     void cancelRequest();
 
 signals:
     void errorOccurred(const QString &error);
+    void messageReceivedCompletely();
 
 private:
     void handleLLMResponse(const QString &response, const QJsonObject &request, bool isComplete);

ChatView/icons/attach-file.svg

@@ -0,0 +1,10 @@
+<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"/>
+</g>
+<defs>
+<clipPath id="clip0_37_14">
+<rect width="24" height="48" fill="white"/>
+</clipPath>
+</defs>
+</svg>

ChatView/icons/close-dark.svg

@@ -0,0 +1,10 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_41_14)">
+<path d="M0 0L24 24M0 24L24 0" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</g>
+<defs>
+<clipPath id="clip0_41_14">
+<rect width="24" height="24" fill="white"/>
+</clipPath>
+</defs>
+</svg>

ChatView/icons/close-light.svg

@@ -0,0 +1,10 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_41_14)">
+<path d="M0 0L24 24M0 24L24 0" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</g>
+<defs>
+<clipPath id="clip0_41_14">
+<rect width="24" height="24" fill="white"/>
+</clipPath>
+</defs>
+</svg>

ChatView/qml/Badge.qml

@@ -23,18 +23,18 @@ Rectangle {
     id: root
 
     property alias text: badgeText.text
-    property alias fontColor: badgeText.color
 
-    width: badgeText.implicitWidth + radius
-    height: badgeText.implicitHeight + 6
-    color: "lightgreen"
-    radius: height / 2
+    implicitWidth: badgeText.implicitWidth + root.radius
+    implicitHeight: badgeText.implicitHeight + 6
+    color: palette.button
+    radius: root.height / 2
+    border.color: palette.mid
     border.width: 1
-    border.color: "gray"
 
     Text {
         id: badgeText
 
         anchors.centerIn: parent
+        color: palette.buttonText
     }
 }

ChatView/qml/ChatItem.qml

@@ -17,28 +17,25 @@
  * along with QodeAssist. If not, see <https://www.gnu.org/licenses/>.
  */
 
-pragma ComponentBehavior: Bound
-
 import QtQuick
 import ChatView
+import QtQuick.Layouts
 import "./dialog"
 
 Rectangle {
     id: root
 
     property alias msgModel: msgCreator.model
-    property color fontColor
-    property color codeBgColor
-    property color selectionColor
+    property alias messageAttachments: attachmentsModel.model
 
-    height: msgColumn.height
+    height: msgColumn.implicitHeight + 10
     radius: 8
 
-    Column {
+    ColumnLayout {
         id: msgColumn
 
-        anchors.verticalCenter: parent.verticalCenter
         width: parent.width
+        anchors.verticalCenter: parent.verticalCenter
         spacing: 5
 
         Repeater {
@@ -49,7 +46,7 @@ Rectangle {
                 // why does `required property MessagePart modelData` not work?
                 required property var modelData
 
-                width: parent.width
+                Layout.preferredWidth: root.width
                 sourceComponent: {
                     // If `required property MessagePart modelData` is used
                     // and conversion to MessagePart fails, you're left
@@ -80,6 +77,40 @@ Rectangle {
                 }
             }
         }
+
+        Flow {
+            id: attachmentsFlow
+
+            Layout.fillWidth: true
+            visible: attachmentsModel.model && attachmentsModel.model.length > 0
+            leftPadding: 10
+            rightPadding: 10
+            spacing: 5
+
+            Repeater {
+                id: attachmentsModel
+
+                delegate: Rectangle {
+                    required property int index
+                    required property var modelData
+
+                    height: attachText.implicitHeight + 8
+                    width: attachText.implicitWidth + 16
+                    radius: 4
+                    color: palette.button
+                    border.width: 1
+                    border.color: palette.mid
+
+                    Text {
+                        id: attachText
+
+                        anchors.centerIn: parent
+                        text: modelData
+                        color: palette.text
+                    }
+                }
+            }
+        }
     }
 
     component TextComponent : TextBlock {
@@ -88,8 +119,6 @@ Rectangle {
         verticalAlignment: Text.AlignVCenter
         leftPadding: 10
         text: itemData.text
-        color: root.fontColor
-        selectionColor: root.selectionColor
     }
 
 
@@ -104,8 +133,5 @@ Rectangle {
 
         code: itemData.text
         language: itemData.language
-        color: root.codeBgColor
-        selectionColor: root.selectionColor
     }
-
 }

ChatView/qml/RootItem.qml

@@ -17,28 +17,62 @@
  * along with QodeAssist. If not, see <https://www.gnu.org/licenses/>.
  */
 
-pragma ComponentBehavior: Bound
-
 import QtQuick
 import QtQuick.Controls
 import QtQuick.Controls.Basic as QQC
 import QtQuick.Layouts
 import ChatView
+import "./controls"
+import "./parts"
 
 ChatRootView {
     id: root
 
+    property SystemPalette sysPalette: SystemPalette {
+        colorGroup: SystemPalette.Active
+    }
+
+    palette {
+        window: sysPalette.window
+        windowText: sysPalette.windowText
+        base: sysPalette.base
+        alternateBase: sysPalette.alternateBase
+        text: sysPalette.text
+        button: sysPalette.button
+        buttonText: sysPalette.buttonText
+        highlight: sysPalette.highlight
+        highlightedText: sysPalette.highlightedText
+        light: sysPalette.light
+        mid: sysPalette.mid
+        dark: sysPalette.dark
+        shadow: sysPalette.shadow
+        brightText: sysPalette.brightText
+    }
+
     Rectangle {
         id: bg
+
         anchors.fill: parent
-        color: root.backgroundColor
+        color: palette.window
     }
 
     ColumnLayout {
-        anchors {
-            fill: parent
+        anchors.fill: parent
+        spacing: 0
+
+        TopBar {
+            id: topBar
+
+            Layout.preferredWidth: parent.width
+            Layout.preferredHeight: 40
+
+            saveButton.onClicked: root.showSaveDialog()
+            loadButton.onClicked: root.showLoadDialog()
+            clearButton.onClicked: root.clearChat()
+            tokensBadge {
+                text: qsTr("tokens:%1/%2").arg(root.chatModel.totalTokens).arg(root.chatModel.tokensThreshold)
+            }
         }
-        spacing: 10
 
         ListView {
             id: chatListView
@@ -54,14 +88,12 @@ ChatRootView {
 
             delegate: ChatItem {
                 required property var model
+
                 width: ListView.view.width - scroll.width
                 msgModel: root.chatModel.processMessageContent(model.content)
-                color: model.roleType === ChatModel.User ? root.primaryColor : root.secondaryColor
-                fontColor: root.primaryColor.hslLightness > 0.5 ? "black" : "white"
-                codeBgColor: root.codeColor
-                selectionColor: root.primaryColor.hslLightness > 0.5 ? Qt.darker(root.primaryColor, 1.5)
-                                                                     : Qt.lighter(root.primaryColor, 1.5)
-
+                messageAttachments: model.attachments
+                color: model.roleType === ChatModel.User ? palette.alternateBase
+                                                         : palette.base
             }
 
             header: Item {
@@ -95,15 +127,26 @@ ChatRootView {
                 id: messageInput
 
                 placeholderText: qsTr("Type your message here...")
-                placeholderTextColor: "#888"
-                color: root.primaryColor.hslLightness > 0.5 ? "black" : "white"
+                placeholderTextColor: palette.mid
+                color: palette.text
                 background: Rectangle {
                     radius: 2
-                    color: root.primaryColor
-                    border.color: root.primaryColor.hslLightness > 0.5 ? Qt.lighter(root.primaryColor, 1.5)
-                                                                       : Qt.darker(root.primaryColor, 1.5)
+                    color: palette.base
+                    border.color:  messageInput.activeFocus ? palette.highlight : palette.button
                     border.width: 1
+
+                    Behavior on border.color {
+                        ColorAnimation { duration: 150 }
+                    }
+
+                    Rectangle {
+                        anchors.fill: parent
+                        color: palette.highlight
+                        opacity: messageInput.hovered ? 0.1 : 0
+                        radius: parent.radius
+                    }
                 }
+
                 Keys.onPressed: function(event) {
                     if ((event.key === Qt.Key_Return || event.key === Qt.Key_Enter) && !(event.modifiers & Qt.ShiftModifier)) {
                         root.sendChatMessage()
@@ -113,60 +156,23 @@ ChatRootView {
             }
         }
 
-        RowLayout {
+        AttachedFilesPlace {
+            id: attachedFilesPlace
+
             Layout.fillWidth: true
-            spacing: 5
-
-            Button {
-                id: sendButton
-
-                Layout.alignment: Qt.AlignBottom
-                text: qsTr("Send")
-                onClicked: root.sendChatMessage()
-            }
-
-            Button {
-                id: stopButton
-
-                Layout.alignment: Qt.AlignBottom
-                text: qsTr("Stop")
-                onClicked: root.cancelRequest()
-            }
-
-            Button {
-                id: clearButton
-
-                Layout.alignment: Qt.AlignBottom
-                text: qsTr("Clear Chat")
-                onClicked: root.clearChat()
-            }
-
-            CheckBox {
-                id: sharingCurrentFile
-
-                text: "Share current file with models"
-                checked: root.isSharingCurrentFile
-            }
+            attachedFilesModel: root.attachmentFiles
         }
-    }
 
-    Row {
-        id: bar
+        BottomBar {
+            id: bottomBar
 
-        layoutDirection: Qt.RightToLeft
+            Layout.preferredWidth: parent.width
+            Layout.preferredHeight: 40
 
-        anchors {
-            left: parent.left
-            leftMargin: 5
-            right: parent.right
-            rightMargin: scroll.width
-        }
-        spacing: 10
-
-        Badge {
-            text: qsTr("tokens:%1/%2").arg(root.chatModel.totalTokens).arg(root.chatModel.tokensThreshold)
-            color: root.codeColor
-            fontColor: root.primaryColor.hslLightness > 0.5 ? "black" : "white"
+            sendButton.onClicked: root.sendChatMessage()
+            stopButton.onClicked: root.cancelRequest()
+            sharingCurrentFile.checked: root.isSharingCurrentFile
+            attachFiles.onClicked: root.showAttachFilesDialog()
         }
     }
 
@@ -179,7 +185,7 @@ ChatRootView {
     }
 
     function sendChatMessage() {
-        root.sendMessage(messageInput.text, sharingCurrentFile.checked)
+        root.sendMessage(messageInput.text, bottomBar.sharingCurrentFile.checked)
         messageInput.text = ""
         scrollToBottom()
     }

ChatView/qml/controls/QoAButton.qml

@@ -0,0 +1,54 @@
+/*
+ * 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/>.
+ */
+
+import QtQuick
+import QtQuick.Controls.Basic
+
+Button {
+    id: control
+
+    padding: 4
+
+    icon.width: 16
+    icon.height: 16
+
+    contentItem.height: 20
+
+    background: Rectangle {
+        id: bg
+
+        implicitHeight: 20
+
+        color: !control.enabled || !control.down ? control.palette.button : control.palette.dark
+        border.color: !control.enabled || (!control.hovered && !control.visualFocus) ? control.palette.mid : control.palette.highlight
+        border.width: 1
+        radius: 4
+
+        Rectangle {
+            anchors.fill: bg
+            radius: bg.radius
+            gradient: Gradient {
+                GradientStop { position: 0.0; color: Qt.alpha(control.palette.highlight, 0.4) }
+                GradientStop { position: 1.0; color: Qt.alpha(control.palette.highlight, 0.2) }
+            }
+            opacity: control.hovered ? 0.3 : 0.01
+            Behavior on opacity {NumberAnimation{duration: 250}}
+        }
+    }
+}

ChatView/qml/dialog/CodeBlock.qml

@@ -26,7 +26,6 @@ Rectangle {
 
     property string code: ""
     property string language: ""
-    property color selectionColor
 
     readonly property string monospaceFont: {
         switch (Qt.platform.os) {
@@ -41,6 +40,7 @@ Rectangle {
         }
     }
 
+    color: palette.alternateBase
     border.color: root.color.hslLightness > 0.5 ? Qt.darker(root.color, 1.3)
                                                 : Qt.lighter(root.color, 1.3)
     border.width: 2
@@ -62,10 +62,10 @@ Rectangle {
         readOnly: true
         selectByMouse: true
         font.family: root.monospaceFont
-        font.pointSize: 12
+        font.pointSize: Qt.application.font.pointSize
         color: parent.color.hslLightness > 0.5 ? "black" : "white"
         wrapMode: Text.WordWrap
-        selectionColor: root.selectionColor
+        selectionColor: palette.highlight
     }
 
     TextEdit {
@@ -80,7 +80,7 @@ Rectangle {
         font.pointSize: 8
     }
 
-    Button {
+    QoAButton {
         anchors.top: parent.top
         anchors.right: parent.right
         anchors.margins: 5

ChatView/qml/dialog/TextBlock.qml

@@ -26,4 +26,6 @@ TextEdit {
     selectByMouse: true
     wrapMode: Text.WordWrap
     textFormat: Text.StyledText
+    selectionColor: palette.highlight
+    color: palette.text
 }

ChatView/qml/parts/AttachedFilesPlace.qml

@@ -0,0 +1,94 @@
+/*
+ * 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/>.
+ */
+
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import ChatView
+
+Flow {
+    id: attachFilesPlace
+    
+    property alias attachedFilesModel: attachRepeater.model
+
+    spacing: 5
+    leftPadding: 5
+    rightPadding: 5
+    topPadding: attachRepeater.model.length > 0 ? 2 : 0
+    bottomPadding: attachRepeater.model.length > 0 ? 2 : 0
+    
+    Repeater {
+        id: attachRepeater
+        
+        delegate: Rectangle {
+            required property int index
+            required property string modelData
+            
+            height: 30
+            width: fileNameText.width + closeButton.width + 20
+            radius: 4
+            color: palette.button
+            border.width: 1
+            border.color: palette.mid
+            
+            Row {
+                spacing: 5
+                anchors.verticalCenter: parent.verticalCenter
+                anchors.left: parent.left
+                anchors.leftMargin: 5
+                
+                Text {
+                    id: fileNameText
+                    
+                    anchors.verticalCenter: parent.verticalCenter
+                    color: palette.buttonText
+                    
+                    text: {
+                        const parts = modelData.split('/');
+                        return parts[parts.length - 1];
+                    }
+                }
+                
+                MouseArea {
+                    id: closeButton
+                    
+                    anchors.verticalCenter: parent.verticalCenter
+                    width: closeIcon.width
+                    height: closeButton.width
+                    
+                    onClicked: {
+                        const newList = [...root.attachmentFiles];
+                        newList.splice(index, 1);
+                        root.attachmentFiles = newList;
+                    }
+                    
+                    Image {
+                        id: closeIcon
+                        
+                        anchors.centerIn: parent
+                        source: palette.window.hslLightness > 0.5 ? "qrc:/qt/qml/ChatView/icons/close-dark.svg"
+                                                                  : "qrc:/qt/qml/ChatView/icons/close-light.svg"
+                        width: 6
+                        height: 6
+                    }
+                }
+            }
+        }
+    }
+}

ChatView/qml/parts/BottomBar.qml

@@ -0,0 +1,83 @@
+/*
+ * 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/>.
+ */
+
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import ChatView
+
+Rectangle {
+    id: root
+
+    property alias sendButton: sendButtonId
+    property alias stopButton: stopButtonId
+    property alias sharingCurrentFile: sharingCurrentFileId
+    property alias attachFiles: attachFilesId
+
+    color: palette.window.hslLightness > 0.5 ?
+               Qt.darker(palette.window, 1.1) :
+               Qt.lighter(palette.window, 1.1)
+
+    RowLayout {
+        id: bottomBar
+
+        anchors {
+            left: parent.left
+            leftMargin: 5
+            right: parent.right
+            rightMargin: 5
+            verticalCenter: parent.verticalCenter
+        }
+
+        spacing: 10
+
+        QoAButton {
+            id: sendButtonId
+
+            text: qsTr("Send")
+        }
+
+        QoAButton {
+            id: stopButtonId
+
+            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"
+                height: 15
+                width: 8
+            }
+            text: qsTr("Attach files")
+        }
+
+        Item {
+            Layout.fillWidth: true
+        }
+    }
+}

ChatView/qml/parts/TopBar.qml

@@ -0,0 +1,73 @@
+/*
+ * 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/>.
+ */
+
+import QtQuick
+import QtQuick.Layouts
+import ChatView
+
+Rectangle {
+    id: root
+
+    property alias saveButton: saveButtonId
+    property alias loadButton: loadButtonId
+    property alias clearButton: clearButtonId
+    property alias tokensBadge: tokensBadgeId
+
+    color: palette.window.hslLightness > 0.5 ?
+               Qt.darker(palette.window, 1.1) :
+               Qt.lighter(palette.window, 1.1)
+
+    RowLayout {
+        anchors {
+            left: parent.left
+            leftMargin: 5
+            right: parent.right
+            rightMargin: 5
+            verticalCenter: parent.verticalCenter
+        }
+
+        spacing: 10
+
+        QoAButton {
+            id: saveButtonId
+
+            text: qsTr("Save")
+        }
+
+        QoAButton {
+            id: loadButtonId
+
+            text: qsTr("Load")
+        }
+
+        QoAButton {
+            id: clearButtonId
+
+            text: qsTr("Clear")
+        }
+
+        Item {
+            Layout.fillWidth: true
+        }
+
+        Badge {
+            id: tokensBadgeId
+        }
+    }
+}

CodeHandler.cpp

@@ -64,6 +64,19 @@ 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";
+            }
+        }
+    }
+
     return result;
 }
 

LLMClientInterface.cpp

@@ -27,7 +27,7 @@
 #include <texteditor/textdocument.h>
 
 #include "CodeHandler.hpp"
-#include "DocumentContextReader.hpp"
+#include "context/DocumentContextReader.hpp"
 #include "llmcore/MessageBuilder.hpp"
 #include "llmcore/PromptTemplateManager.hpp"
 #include "llmcore/ProvidersManager.hpp"
@@ -176,7 +176,7 @@ void LLMClientInterface::handleCompletion(const QJsonObject &request)
         Settings::generalSettings().ccUrl(),
         promptTemplate->type() == LLMCore::TemplateType::Fim ? provider->completionEndpoint()
                                                              : provider->chatEndpoint()));
-    config.apiKey = Settings::codeCompletionSettings().apiKey();
+    config.apiKey = provider->apiKey();
 
     config.providerRequest
         = {{"model", Settings::generalSettings().ccModel()},
@@ -194,11 +194,18 @@ void LLMClientInterface::handleCompletion(const QJsonObject &request)
     if (!updatedContext.fileContext.isEmpty())
         systemPrompt.append(updatedContext.fileContext);
 
+    QString userMessage;
+    if (completeSettings.useUserMessageTemplateForCC() && promptTemplate->type() == LLMCore::TemplateType::Chat) {
+        userMessage = completeSettings.userMessageTemplateForCC().arg(updatedContext.prefix, updatedContext.suffix);
+    } else {
+        userMessage = updatedContext.prefix;
+    }
+
     auto message = LLMCore::MessageBuilder()
                        .addSystemMessage(systemPrompt)
-                       .addUserMessage(updatedContext.prefix)
+                       .addUserMessage(userMessage)
                        .addSuffix(updatedContext.suffix)
-                       .addtTokenizer(promptTemplate);
+                       .addTokenizer(promptTemplate);
 
     message.saveTo(
         config.providerRequest,
@@ -235,7 +242,7 @@ LLMCore::ContextData LLMClientInterface::prepareContext(const QJsonObject &reque
     int cursorPosition = position["character"].toInt();
     int lineNumber = position["line"].toInt();
 
-    DocumentContextReader reader(textDocument);
+    Context::DocumentContextReader reader(textDocument);
     return reader.prepareContext(lineNumber, cursorPosition);
 }
 

QodeAssist.json.in

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

QodeAssistClient.cpp

@@ -31,9 +31,10 @@
 
 #include "LLMClientInterface.hpp"
 #include "LLMSuggestion.hpp"
-#include "core/ChangesManager.h"
 #include "settings/CodeCompletionSettings.hpp"
 #include "settings/GeneralSettings.hpp"
+#include "settings/ProjectSettings.hpp"
+#include <context/ChangesManager.h>
 
 using namespace LanguageServerProtocol;
 using namespace TextEditor;
@@ -70,48 +71,63 @@ void QodeAssistClient::openDocument(TextEditor::TextDocument *document)
         return;
 
     Client::openDocument(document);
-    connect(document,
-            &TextDocument::contentsChangedWithPosition,
-            this,
-            [this, document](int position, int charsRemoved, int charsAdded) {
-                Q_UNUSED(charsRemoved)
-                if (!Settings::codeCompletionSettings().autoCompletion())
-                    return;
+    connect(
+        document,
+        &TextDocument::contentsChangedWithPosition,
+        this,
+        [this, document](int position, int charsRemoved, int charsAdded) {
+            if (!Settings::codeCompletionSettings().autoCompletion())
+                return;
 
-                auto project = ProjectManager::projectForFile(document->filePath());
-                if (!isEnabled(project))
-                    return;
+            auto project = ProjectManager::projectForFile(document->filePath());
+            if (!isEnabled(project))
+                return;
 
-                auto textEditor = BaseTextEditor::currentTextEditor();
-                if (!textEditor || textEditor->document() != document)
-                    return;
+            auto textEditor = BaseTextEditor::currentTextEditor();
+            if (!textEditor || textEditor->document() != document)
+                return;
 
-                if (Settings::codeCompletionSettings().useProjectChangesCache())
-                    ChangesManager::instance().addChange(document,
-                                                         position,
-                                                         charsRemoved,
-                                                         charsAdded);
+            if (Settings::codeCompletionSettings().useProjectChangesCache())
+                Context::ChangesManager::instance()
+                    .addChange(document, position, charsRemoved, charsAdded);
 
-                TextEditorWidget *widget = textEditor->editorWidget();
-                if (widget->isReadOnly() || widget->multiTextCursor().hasMultipleCursors())
-                    return;
-                const int cursorPosition = widget->textCursor().position();
-                if (cursorPosition < position || cursorPosition > position + charsAdded)
-                    return;
+            TextEditorWidget *widget = textEditor->editorWidget();
+            if (widget->isReadOnly() || widget->multiTextCursor().hasMultipleCursors())
+                return;
 
-                m_recentCharCount += charsAdded;
+            const int cursorPosition = widget->textCursor().position();
+            if (cursorPosition < position || cursorPosition > position + charsAdded)
+                return;
 
-                if (m_typingTimer.elapsed()
-                    > Settings::codeCompletionSettings().autoCompletionTypingInterval()) {
-                    m_recentCharCount = charsAdded;
-                    m_typingTimer.restart();
-                }
+            if (charsRemoved > 0 || charsAdded <= 0) {
+                m_recentCharCount = 0;
+                m_typingTimer.restart();
+                return;
+            }
 
-                if (m_recentCharCount
-                    > Settings::codeCompletionSettings().autoCompletionCharThreshold()) {
-                    scheduleRequest(widget);
-                }
-            });
+            QTextCursor cursor = widget->textCursor();
+            cursor.movePosition(QTextCursor::Left, QTextCursor::KeepAnchor, 1);
+            QString lastChar = cursor.selectedText();
+
+            if (lastChar.isEmpty() || lastChar[0].isPunct()) {
+                m_recentCharCount = 0;
+                m_typingTimer.restart();
+                return;
+            }
+
+            m_recentCharCount += charsAdded;
+
+            if (m_typingTimer.elapsed()
+                > Settings::codeCompletionSettings().autoCompletionTypingInterval()) {
+                m_recentCharCount = charsAdded;
+                m_typingTimer.restart();
+            }
+
+            if (m_recentCharCount
+                > Settings::codeCompletionSettings().autoCompletionCharThreshold()) {
+                scheduleRequest(widget);
+            }
+        });
 }
 
 bool QodeAssistClient::canOpenProject(ProjectExplorer::Project *project)
@@ -237,7 +253,11 @@ void QodeAssistClient::cancelRunningRequest(TextEditor::TextEditorWidget *editor
 
 bool QodeAssistClient::isEnabled(ProjectExplorer::Project *project) const
 {
-    return Settings::generalSettings().enableQodeAssist();
+    if (!project)
+        return Settings::generalSettings().enableQodeAssist();
+
+    Settings::ProjectSettings settings(project);
+    return settings.isEnabled();
 }
 
 void QodeAssistClient::setupConnections()

README.md

@@ -1,5 +1,4 @@
 # QodeAssist - AI-powered coding assistant plugin for Qt Creator
-[![Discord](https://dcbadge.limes.pink/api/server/https://discord.gg/DGgMtTteAD?style=flat?theme=discord)](https://discord.gg/DGgMtTteAD)
 [![Build plugin](https://github.com/Palm1r/QodeAssist/actions/workflows/build_cmake.yml/badge.svg?branch=main)](https://github.com/Palm1r/QodeAssist/actions/workflows/build_cmake.yml)
 ![GitHub Downloads (all assets, all releases)](https://img.shields.io/github/downloads/Palm1r/QodeAssist/total?color=41%2C173%2C71)
 ![GitHub Tag](https://img.shields.io/github/v/tag/Palm1r/QodeAssist)
@@ -8,19 +7,26 @@
 
 ![qodeassist-icon](https://github.com/user-attachments/assets/dc336712-83cb-440d-8761-8d0a31de898d) QodeAssist is an AI-powered coding assistant plugin for Qt Creator. It provides intelligent code completion and suggestions for C++ and QML, leveraging large language models through local providers like Ollama. Enhance your coding productivity with context-aware AI assistance directly in your Qt development environment.
 
+⚠️ **Important Notice About Paid Providers**
+> When using paid providers like Claude, OpenRouter or OpenAI-compatible services:
+> - These services will consume API tokens which may result in charges to your account
+> - The QodeAssist developer bears no responsibility for any charges incurred
+> - Please carefully review the provider's pricing and your account settings before use
+
 ## Table of Contents
 1. [Overview](#overview)
-2. [Installation](#installation)
-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 using Ollama](#configure-for-using-ollama)
+6. [System Prompt Configuration](#system-prompt-configuration)
+7. [Template-Model Compatibility](#template-model-compatibility)
+8. [QtCreator Version Compatibility](#qtcreator-version-compatibility)
+9. [Development Progress](#development-progress)
+10. [Hotkeys](#hotkeys)
+11. [Troubleshooting](#troubleshooting)
+12. [Support the Development](#support-the-development-of-qodeassist)
+13. [How to Build](#how-to-build)
 
 ## Overview
 
@@ -29,6 +35,8 @@
   - Side and Bottom panels
 - Support for multiple LLM providers:
   - Ollama
+  - OpenAI
+  - Anthropic Claude
   - LM Studio
   - OpenAI-compatible providers(eg. https://openrouter.ai)
 - Extensive library of model-specific templates
@@ -55,11 +63,46 @@
   <img width="326" alt="QodeAssistBottomPanel" src="https://github.com/user-attachments/assets/4cc64c23-a294-4df8-9153-39ad6fdab34b">
 </details>
 
-## Installation
+## Install plugin to QtCreator
+1. Install Latest Qt Creator
+2. Download the QodeAssist plugin for your Qt Creator
+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
 
-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:
+## 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 using 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):
 ```
@@ -73,16 +116,6 @@ For high-end systems (32GB+ RAM):
 ```
 ollama run qwen2.5-coder:32b
 ```
-4. Download the QodeAssist plugin for your QtCreator.
-5. Launch Qt Creator and install the plugin:
-   - Go to MacOS: Qt Creator -> About Plugins...
-           Windows\Linux: Help -> About Plugins...
-   - Click on "Install Plugin..."
-   - Select the downloaded QodeAssist plugin archive file
-
-## Configure Plugin
-
-QodeAssist comes with default settings that should work immediately after installing a language model. The plugin is pre-configured to use Ollama with standard templates, so you may only need to verify the settings.
 
 1. Open Qt Creator settings (Edit > Preferences on Linux/Windows, Qt Creator > Preferences on macOS)
 2. Navigate to the "Qode Assist" tab
@@ -90,51 +123,20 @@ QodeAssist comes with default settings that should work immediately after instal
     - 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
+## System Prompt Configuration
 
-## Recommended Models:
-QodeAssist has been thoroughly tested and optimized for use with the following language models:
+The plugin comes with default system prompts optimized for chat and instruct models, as these currently provide better results for code assistance. If you prefer using FIM (Fill-in-Middle) models, you can easily customize the system prompt in the settings.
 
-- Qwen2.5-coder
-- CodeLlama
-- StarCoder2
-- DeepSeek-Coder-V2
-
-### Model Types
-
-FIM models (codellama:7b-code, starcoder2:7b, etc.) - Optimized for code completion and suggestions
-
-Instruct models (codellama:7b-instruct, starcoder2:instruct, etc.) - Better for chat assistance, explanations, and code review
-
-For best results, use FIM models with code completion and Instruct models with chat features.
-
-### 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
-```
-
-### Template-Model Compatibility
+## Template-Model Compatibility
 
 | Template | Compatible Models | Purpose |
 |----------|------------------|----------|
@@ -150,12 +152,6 @@ ollama run deepseek-coder-v2
 | 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
-
 ## QtCreator Version Compatibility
 
 - QtCreator 15.0.0 - 0.4.x 

UpdateStatusWidget.cpp

@@ -0,0 +1,72 @@
+/* 
+ * 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 "UpdateStatusWidget.hpp"
+
+namespace QodeAssist {
+
+UpdateStatusWidget::UpdateStatusWidget(QWidget *parent)
+    : QFrame(parent)
+{
+    setFrameStyle(QFrame::NoFrame);
+
+    auto layout = new QHBoxLayout(this);
+    layout->setContentsMargins(4, 0, 4, 0);
+    layout->setSpacing(4);
+
+    m_actionButton = new QToolButton(this);
+    m_actionButton->setToolButtonStyle(Qt::ToolButtonIconOnly);
+
+    m_versionLabel = new QLabel(this);
+    m_versionLabel->setVisible(false);
+
+    m_updateButton = new QPushButton(tr("Update"), this);
+    m_updateButton->setVisible(false);
+    m_updateButton->setStyleSheet("QPushButton { padding: 2px 8px; }");
+
+    layout->addWidget(m_actionButton);
+    layout->addWidget(m_versionLabel);
+    layout->addWidget(m_updateButton);
+}
+
+void UpdateStatusWidget::setDefaultAction(QAction *action)
+{
+    m_actionButton->setDefaultAction(action);
+}
+
+void UpdateStatusWidget::showUpdateAvailable(const QString &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));
+}
+
+void UpdateStatusWidget::hideUpdateInfo()
+{
+    m_versionLabel->setVisible(false);
+    m_updateButton->setVisible(false);
+}
+
+QPushButton *UpdateStatusWidget::updateButton() const
+{
+    return m_updateButton;
+}
+
+} // namespace QodeAssist

UpdateStatusWidget.hpp

@@ -17,32 +17,31 @@
  * along with QodeAssist. If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include "CounterTooltip.hpp"
+#pragma once
+
+#include <QFrame>
+#include <QLabel>
+#include <QLayout>
+#include <QPushButton>
+#include <QToolButton>
 
 namespace QodeAssist {
 
-CounterTooltip::CounterTooltip(int count)
-    : m_count(count)
+class UpdateStatusWidget : public QFrame
 {
-    m_label = new QLabel(this);
-    addWidget(m_label);
-    updateLabel();
+    Q_OBJECT
+public:
+    explicit UpdateStatusWidget(QWidget *parent = nullptr);
 
-    m_timer = new QTimer(this);
-    m_timer->setSingleShot(true);
-    m_timer->setInterval(2000);
+    void setDefaultAction(QAction *action);
+    void showUpdateAvailable(const QString &version);
+    void hideUpdateInfo();
 
-    connect(m_timer, &QTimer::timeout, this, [this] { emit finished(m_count); });
-
-    m_timer->start();
-}
-
-CounterTooltip::~CounterTooltip() {}
-
-void CounterTooltip::updateLabel()
-{
-    const auto hotkey = QKeySequence(QKeySequence::MoveToNextWord).toString();
-    m_label->setText(QString("Insert Next %1 line(s) (%2)").arg(m_count).arg(hotkey));
-}
+    QPushButton *updateButton() const;
 
+private:
+    QToolButton *m_actionButton;
+    QLabel *m_versionLabel;
+    QPushButton *m_updateButton;
+};
 } // namespace QodeAssist

context/CMakeLists.txt

@@ -0,0 +1,20 @@
+add_library(Context STATIC
+    DocumentContextReader.hpp DocumentContextReader.cpp
+    ChangesManager.h ChangesManager.cpp
+    ContextManager.hpp ContextManager.cpp
+    ContentFile.hpp
+)
+
+target_link_libraries(Context
+    PUBLIC
+    Qt::Core
+    QtCreator::Core
+    QtCreator::TextEditor
+    QtCreator::Utils
+    QtCreator::ProjectExplorer
+    PRIVATE
+    LLMCore
+    QodeAssistSettings
+)
+
+target_include_directories(Context PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR})

context/ChangesManager.cpp

@@ -18,9 +18,9 @@
  */
 
 #include "ChangesManager.h"
-#include "settings/CodeCompletionSettings.hpp"
+#include "CodeCompletionSettings.hpp"
 
-namespace QodeAssist {
+namespace QodeAssist::Context {
 
 ChangesManager &ChangesManager::instance()
 {
@@ -79,4 +79,4 @@ QString ChangesManager::getRecentChangesContext(const TextEditor::TextDocument *
     return context;
 }
 
-} // namespace QodeAssist
+} // namespace QodeAssist::Context

context/ChangesManager.h

@@ -25,7 +25,7 @@
 #include <QTimer>
 #include <texteditor/textdocument.h>
 
-namespace QodeAssist {
+namespace QodeAssist::Context {
 
 class ChangesManager : public QObject
 {
@@ -58,4 +58,4 @@ private:
     QHash<TextEditor::TextDocument *, QQueue<ChangeInfo>> m_documentChanges;
 };
 
-} // namespace QodeAssist
+} // namespace QodeAssist::Context

context/ContentFile.hpp

@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2024 Petr Mironychev
  *
  * This file is part of QodeAssist.
@@ -19,30 +19,14 @@
 
 #pragma once
 
-#include <QLabel>
-#include <QTimer>
-#include <QToolBar>
-#include <QWidget>
+#include <QString>
 
-namespace QodeAssist {
+namespace QodeAssist::Context {
 
-class CounterTooltip : public QToolBar
+struct ContentFile
 {
-    Q_OBJECT
-
-public:
-    CounterTooltip(int count);
-    ~CounterTooltip();
-
-signals:
-    void finished(int count);
-
-private:
-    void updateLabel();
-
-    QLabel *m_label;
-    QTimer *m_timer;
-    int m_count;
+    QString filename;
+    QString content;
 };
 
-} // namespace QodeAssist
+} // namespace QodeAssist::Context

context/ContextManager.cpp

@@ -0,0 +1,67 @@
+/* 
+ * 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 "ContextManager.hpp"
+
+#include <QFile>
+#include <QFileInfo>
+#include <QTextStream>
+
+namespace QodeAssist::Context {
+
+ContextManager &ContextManager::instance()
+{
+    static ContextManager manager;
+    return manager;
+}
+
+ContextManager::ContextManager(QObject *parent)
+    : QObject(parent)
+{}
+
+QString ContextManager::readFile(const QString &filePath) const
+{
+    QFile file(filePath);
+    if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
+        return QString();
+
+    QTextStream in(&file);
+    return in.readAll();
+}
+
+QList<ContentFile> ContextManager::getContentFiles(const QStringList &filePaths) const
+{
+    QList<ContentFile> files;
+    for (const QString &path : filePaths) {
+        ContentFile contentFile = createContentFile(path);
+        files.append(contentFile);
+    }
+    return files;
+}
+
+ContentFile ContextManager::createContentFile(const QString &filePath) const
+{
+    ContentFile contentFile;
+    QFileInfo fileInfo(filePath);
+    contentFile.filename = fileInfo.fileName();
+    contentFile.content = readFile(filePath);
+    return contentFile;
+}
+
+} // namespace QodeAssist::Context

context/ContextManager.hpp

@@ -0,0 +1,46 @@
+/* 
+ * 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 <QObject>
+#include <QString>
+
+#include "ContentFile.hpp"
+
+namespace QodeAssist::Context {
+
+class ContextManager : public QObject
+{
+    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;
+};
+
+} // namespace QodeAssist::Context

context/DocumentContextReader.cpp

@@ -23,8 +23,9 @@
 #include <QTextBlock>
 #include <languageserverprotocol/lsptypes.h>
 
-#include "core/ChangesManager.h"
-#include "settings/CodeCompletionSettings.hpp"
+#include "CodeCompletionSettings.hpp"
+
+#include "ChangesManager.h"
 
 const QRegularExpression &getYearRegex()
 {
@@ -46,7 +47,7 @@ const QRegularExpression &getCommentRegex()
     return commentRegex;
 }
 
-namespace QodeAssist {
+namespace QodeAssist::Context {
 
 DocumentContextReader::DocumentContextReader(TextEditor::TextDocument *textDocument)
     : m_textDocument(textDocument)
@@ -246,4 +247,4 @@ QString DocumentContextReader::getContextAfter(int lineNumber, int cursorPositio
     }
 }
 
-} // namespace QodeAssist
+} // namespace QodeAssist::Context

context/DocumentContextReader.hpp

@@ -19,12 +19,12 @@
 
 #pragma once
 
-#include <QTextDocument>
 #include <texteditor/textdocument.h>
+#include <QTextDocument>
 
 #include <llmcore/ContextData.hpp>
 
-namespace QodeAssist {
+namespace QodeAssist::Context {
 
 struct CopyrightInfo
 {
@@ -61,4 +61,4 @@ private:
     CopyrightInfo m_copyrightInfo;
 };
 
-} // namespace QodeAssist
+} // namespace QodeAssist::Context

llmcore/MessageBuilder.cpp

@@ -40,7 +40,7 @@ QodeAssist::LLMCore::MessageBuilder &QodeAssist::LLMCore::MessageBuilder::addSuf
     return *this;
 }
 
-QodeAssist::LLMCore::MessageBuilder &QodeAssist::LLMCore::MessageBuilder::addtTokenizer(
+QodeAssist::LLMCore::MessageBuilder &QodeAssist::LLMCore::MessageBuilder::addTokenizer(
     PromptTemplate *promptTemplate)
 {
     m_promptTemplate = promptTemplate;
@@ -72,6 +72,7 @@ void QodeAssist::LLMCore::MessageBuilder::saveTo(QJsonObject &request, Providers
 
     if (api == ProvidersApi::Ollama) {
         if (m_promptTemplate->type() == TemplateType::Fim) {
+            request["system"] = m_systemMessage;
             m_promptTemplate->prepareRequest(request, context);
         } else {
             QJsonArray messages;

llmcore/MessageBuilder.hpp

@@ -32,7 +32,7 @@ enum class MessageRole { System, User, Assistant };
 
 enum class OllamaFormat { Messages, Completions };
 
-enum class ProvidersApi { Ollama, OpenAI };
+enum class ProvidersApi { Ollama, OpenAI, Claude };
 
 static const QString ROLE_SYSTEM = "system";
 static const QString ROLE_USER = "user";
@@ -53,7 +53,7 @@ public:
 
     MessageBuilder &addSuffix(const QString &content);
 
-    MessageBuilder &addtTokenizer(PromptTemplate *promptTemplate);
+    MessageBuilder &addTokenizer(PromptTemplate *promptTemplate);
 
     QString roleToString(MessageRole role) const;
 

llmcore/Provider.hpp

@@ -19,8 +19,9 @@
 
 #pragma once
 
-#include <QString>
 #include <utils/environment.h>
+#include <QNetworkRequest>
+#include <QString>
 
 #include "PromptTemplate.hpp"
 #include "RequestType.hpp"
@@ -45,6 +46,8 @@ public:
     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;
 };
 
 } // namespace QodeAssist::LLMCore

llmcore/RequestHandler.cpp

@@ -38,7 +38,7 @@ void RequestHandler::sendLLMRequest(const LLMConfig &config, const QJsonObject &
                             QJsonDocument(config.providerRequest).toJson(QJsonDocument::Indented))));
 
     QNetworkRequest networkRequest(config.url);
-    prepareNetworkRequest(networkRequest, config.apiKey);
+    config.provider->prepareNetworkRequest(networkRequest);
 
     QNetworkReply *reply = m_manager->post(networkRequest,
                                            QJsonDocument(config.providerRequest).toJson());
@@ -108,16 +108,6 @@ bool RequestHandler::cancelRequest(const QString &id)
     return false;
 }
 
-void RequestHandler::prepareNetworkRequest(
-    QNetworkRequest &networkRequest, const QString &apiKey) const
-{
-    networkRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
-
-    if (!apiKey.isEmpty()) {
-        networkRequest.setRawHeader("Authorization", QString("Bearer %1").arg(apiKey).toUtf8());
-    }
-}
-
 bool RequestHandler::processSingleLineCompletion(
     QNetworkReply *reply,
     const QJsonObject &request,

llmcore/RequestHandler.hpp

@@ -52,7 +52,6 @@ private:
     QMap<QString, QNetworkReply *> m_activeRequests;
     QMap<QNetworkReply *, QString> m_accumulatedResponses;
 
-    void prepareNetworkRequest(QNetworkRequest &networkRequest, const QString &apiKey) const;
     bool processSingleLineCompletion(QNetworkReply *reply,
                                      const QJsonObject &request,
                                      const QString &accumulatedResponse,

providers/ClaudeProvider.cpp

@@ -0,0 +1,238 @@
+/* 
+ * 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 "ClaudeProvider.hpp"
+
+#include <QEventLoop>
+#include <QJsonArray>
+#include <QJsonDocument>
+#include <QJsonObject>
+#include <QNetworkReply>
+#include <QUrlQuery>
+
+#include "llmcore/ValidationUtils.hpp"
+#include "logger/Logger.hpp"
+#include "settings/ChatAssistantSettings.hpp"
+#include "settings/CodeCompletionSettings.hpp"
+#include "settings/GeneralSettings.hpp"
+#include "settings/ProviderSettings.hpp"
+
+namespace QodeAssist::Providers {
+
+ClaudeProvider::ClaudeProvider() {}
+
+QString ClaudeProvider::name() const
+{
+    return "Claude";
+}
+
+QString ClaudeProvider::url() const
+{
+    return "https://api.anthropic.com";
+}
+
+QString ClaudeProvider::completionEndpoint() const
+{
+    return "/v1/messages";
+}
+
+QString ClaudeProvider::chatEndpoint() const
+{
+    return "/v1/messages";
+}
+
+bool ClaudeProvider::supportsModelListing() const
+{
+    return true;
+}
+
+void ClaudeProvider::prepareRequest(QJsonObject &request, LLMCore::RequestType type)
+{
+    auto prepareMessages = [](QJsonObject &req) -> QJsonArray {
+        QJsonArray messages;
+        if (req.contains("messages")) {
+            QJsonArray origMessages = req["messages"].toArray();
+            for (const auto &msg : origMessages) {
+                QJsonObject message = msg.toObject();
+                if (message["role"].toString() == "system") {
+                    req["system"] = message["content"];
+                } else {
+                    messages.append(message);
+                }
+            }
+        } else {
+            if (req.contains("system")) {
+                req["system"] = req["system"].toString();
+            }
+            if (req.contains("prompt")) {
+                messages.append(
+                    QJsonObject{{"role", "user"}, {"content", req.take("prompt").toString()}});
+            }
+        }
+        return messages;
+    };
+
+    auto applyModelParams = [&request](const auto &settings) {
+        request["max_tokens"] = settings.maxTokens();
+        request["temperature"] = settings.temperature();
+        if (settings.useTopP())
+            request["top_p"] = settings.topP();
+        if (settings.useTopK())
+            request["top_k"] = settings.topK();
+        request["stream"] = true;
+    };
+
+    QJsonArray messages = prepareMessages(request);
+    if (!messages.isEmpty()) {
+        request["messages"] = std::move(messages);
+    }
+
+    if (type == LLMCore::RequestType::CodeCompletion) {
+        applyModelParams(Settings::codeCompletionSettings());
+    } else {
+        applyModelParams(Settings::chatAssistantSettings());
+    }
+}
+
+bool ClaudeProvider::handleResponse(QNetworkReply *reply, QString &accumulatedResponse)
+{
+    bool isComplete = false;
+    QString tempResponse;
+
+    while (reply->canReadLine()) {
+        QByteArray line = reply->readLine().trimmed();
+        if (line.isEmpty()) {
+            continue;
+        }
+
+        if (!line.startsWith("data:")) {
+            continue;
+        }
+
+        line = line.mid(6);
+
+        QJsonDocument jsonResponse = QJsonDocument::fromJson(line);
+        if (jsonResponse.isNull()) {
+            continue;
+        }
+
+        QJsonObject responseObj = jsonResponse.object();
+        QString eventType = responseObj["type"].toString();
+
+        if (eventType == "message_delta") {
+            if (responseObj.contains("delta")) {
+                QJsonObject delta = responseObj["delta"].toObject();
+                if (delta.contains("stop_reason")) {
+                    isComplete = true;
+                }
+            }
+        } else if (eventType == "content_block_delta") {
+            QJsonObject delta = responseObj["delta"].toObject();
+            if (delta["type"].toString() == "text_delta") {
+                tempResponse += delta["text"].toString();
+            }
+        }
+    }
+
+    if (!tempResponse.isEmpty()) {
+        accumulatedResponse += tempResponse;
+    }
+
+    return isComplete;
+}
+
+QList<QString> ClaudeProvider::getInstalledModels(const QString &baseUrl)
+{
+    QList<QString> models;
+    QNetworkAccessManager manager;
+
+    QUrl url(baseUrl + "/v1/models");
+    QUrlQuery query;
+    query.addQueryItem("limit", "1000");
+    url.setQuery(query);
+
+    QNetworkRequest request(url);
+    request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
+    request.setRawHeader("anthropic-version", "2023-06-01");
+
+    if (!apiKey().isEmpty()) {
+        request.setRawHeader("x-api-key", apiKey().toUtf8());
+    }
+
+    QNetworkReply *reply = manager.get(request);
+    QEventLoop loop;
+    QObject::connect(reply, &QNetworkReply::finished, &loop, &QEventLoop::quit);
+    loop.exec();
+
+    if (reply->error() == QNetworkReply::NoError) {
+        QByteArray responseData = reply->readAll();
+        QJsonDocument jsonResponse = QJsonDocument::fromJson(responseData);
+        QJsonObject jsonObject = jsonResponse.object();
+
+        if (jsonObject.contains("data")) {
+            QJsonArray modelArray = jsonObject["data"].toArray();
+            for (const QJsonValue &value : modelArray) {
+                QJsonObject modelObject = value.toObject();
+                if (modelObject.contains("id")) {
+                    QString modelId = modelObject["id"].toString();
+                    models.append(modelId);
+                }
+            }
+        }
+    } else {
+        LOG_MESSAGE(QString("Error fetching Claude models: %1").arg(reply->errorString()));
+    }
+
+    reply->deleteLater();
+    return models;
+}
+
+QList<QString> ClaudeProvider::validateRequest(const QJsonObject &request, LLMCore::TemplateType type)
+{
+    const auto templateReq = QJsonObject{
+        {"model", {}},
+        {"system", {}},
+        {"messages", QJsonArray{{QJsonObject{{"role", {}}, {"content", {}}}}}},
+        {"temperature", {}},
+        {"max_tokens", {}},
+        {"anthropic-version", {}},
+        {"top_p", {}},
+        {"top_k", {}},
+        {"stop", QJsonArray{}},
+        {"stream", {}}};
+
+    return LLMCore::ValidationUtils::validateRequestFields(request, templateReq);
+}
+
+QString ClaudeProvider::apiKey() const
+{
+    return Settings::providerSettings().claudeApiKey();
+}
+
+void ClaudeProvider::prepareNetworkRequest(QNetworkRequest &networkRequest) const
+{
+    networkRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
+
+    if (!apiKey().isEmpty()) {
+        networkRequest.setRawHeader("x-api-key", apiKey().toUtf8());
+        networkRequest.setRawHeader("anthropic-version", "2023-06-01");
+    }
+}
+
+} // namespace QodeAssist::Providers

providers/ClaudeProvider.hpp

@@ -0,0 +1,44 @@
+/* 
+ * 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 "llmcore/Provider.hpp"
+
+namespace QodeAssist::Providers {
+
+class ClaudeProvider : public LLMCore::Provider
+{
+public:
+    ClaudeProvider();
+
+    QString name() const override;
+    QString url() const override;
+    QString completionEndpoint() const override;
+    QString chatEndpoint() const override;
+    bool supportsModelListing() const override;
+    void prepareRequest(QJsonObject &request, LLMCore::RequestType type) override;
+    bool handleResponse(QNetworkReply *reply, QString &accumulatedResponse) override;
+    QList<QString> getInstalledModels(const QString &url) override;
+    QList<QString> validateRequest(const QJsonObject &request, LLMCore::TemplateType type) override;
+    QString apiKey() const override;
+    void prepareNetworkRequest(QNetworkRequest &networkRequest) const override;
+};
+
+} // namespace QodeAssist::Providers

providers/LMStudioProvider.cpp

@@ -108,15 +108,22 @@ bool LMStudioProvider::handleResponse(QNetworkReply *reply, QString &accumulated
         return false;
     }
 
-    QByteArrayList chunks = data.split('\n');
-    for (const QByteArray &chunk : chunks) {
-        if (chunk.trimmed().isEmpty() || chunk == "data: [DONE]") {
+    bool isDone = false;
+    QByteArrayList lines = data.split('\n');
+
+    for (const QByteArray &line : lines) {
+        if (line.trimmed().isEmpty()) {
             continue;
         }
 
-        QByteArray jsonData = chunk;
-        if (chunk.startsWith("data: ")) {
-            jsonData = chunk.mid(6);
+        if (line == "data: [DONE]") {
+            isDone = true;
+            continue;
+        }
+
+        QByteArray jsonData = line;
+        if (line.startsWith("data: ")) {
+            jsonData = line.mid(6);
         }
 
         QJsonParseError error;
@@ -128,15 +135,21 @@ bool LMStudioProvider::handleResponse(QNetworkReply *reply, QString &accumulated
 
         auto message = LLMCore::OpenAIMessage::fromJson(doc.object());
         if (message.hasError()) {
-            LOG_MESSAGE("Error in LMStudioProvider response: " + message.error);
+            LOG_MESSAGE("Error in OpenAI response: " + message.error);
             continue;
         }
 
-        accumulatedResponse += message.getContent();
-        return message.isDone();
+        QString content = message.getContent();
+        if (!content.isEmpty()) {
+            accumulatedResponse += content;
+        }
+
+        if (message.isDone()) {
+            isDone = true;
+        }
     }
 
-    return false;
+    return isDone;
 }
 
 QList<QString> LMStudioProvider::getInstalledModels(const QString &url)
@@ -188,4 +201,14 @@ QList<QString> LMStudioProvider::validateRequest(
     return LLMCore::ValidationUtils::validateRequestFields(request, templateReq);
 }
 
+QString LMStudioProvider::apiKey() const
+{
+    return {};
+}
+
+void LMStudioProvider::prepareNetworkRequest(QNetworkRequest &networkRequest) const
+{
+    networkRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
+}
+
 } // namespace QodeAssist::Providers

providers/LMStudioProvider.hpp

@@ -37,6 +37,8 @@ public:
     bool handleResponse(QNetworkReply *reply, QString &accumulatedResponse) override;
     QList<QString> getInstalledModels(const QString &url) override;
     QList<QString> validateRequest(const QJsonObject &request, LLMCore::TemplateType type) override;
+    QString apiKey() const override;
+    void prepareNetworkRequest(QNetworkRequest &networkRequest) const override;
 };
 
 } // namespace QodeAssist::Providers

providers/OllamaProvider.cpp

@@ -95,18 +95,36 @@ bool OllamaProvider::handleResponse(QNetworkReply *reply, QString &accumulatedRe
         return false;
     }
 
-    const QString endpoint = reply->url().path();
-    auto messageType = endpoint == completionEndpoint() ? LLMCore::OllamaMessage::Type::Generate
-                                                        : LLMCore::OllamaMessage::Type::Chat;
+    QByteArrayList lines = data.split('\n');
+    bool isDone = false;
 
-    auto message = LLMCore::OllamaMessage::fromJson(data, messageType);
-    if (message.hasError()) {
-        LOG_MESSAGE("Error in Ollama response: " + message.error);
-        return false;
+    for (const QByteArray &line : lines) {
+        if (line.trimmed().isEmpty()) {
+            continue;
+        }
+
+        const QString endpoint = reply->url().path();
+        auto messageType = endpoint == completionEndpoint()
+                               ? LLMCore::OllamaMessage::Type::Generate
+                               : LLMCore::OllamaMessage::Type::Chat;
+
+        auto message = LLMCore::OllamaMessage::fromJson(line, messageType);
+        if (message.hasError()) {
+            LOG_MESSAGE("Error in Ollama response: " + message.error);
+            continue;
+        }
+
+        QString content = message.getContent();
+        if (!content.isEmpty()) {
+            accumulatedResponse += content;
+        }
+
+        if (message.done) {
+            isDone = true;
+        }
     }
 
-    accumulatedResponse += message.getContent();
-    return message.done;
+    return isDone;
 }
 
 QList<QString> OllamaProvider::getInstalledModels(const QString &url)
@@ -175,6 +193,16 @@ QList<QString> OllamaProvider::validateRequest(const QJsonObject &request, LLMCo
 
     return LLMCore::ValidationUtils::validateRequestFields(
         request, type == LLMCore::TemplateType::Fim ? fimReq : messageReq);
+}
+
+QString OllamaProvider::apiKey() const
+{
+    return {};
+}
+
+void OllamaProvider::prepareNetworkRequest(QNetworkRequest &networkRequest) const
+{
+    networkRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
 };
 
 } // namespace QodeAssist::Providers

providers/OllamaProvider.hpp

@@ -37,6 +37,8 @@ public:
     bool handleResponse(QNetworkReply *reply, QString &accumulatedResponse) override;
     QList<QString> getInstalledModels(const QString &url) override;
     QList<QString> validateRequest(const QJsonObject &request, LLMCore::TemplateType type) override;
+    QString apiKey() const override;
+    void prepareNetworkRequest(QNetworkRequest &networkRequest) const override;
 };
 
 } // namespace QodeAssist::Providers

providers/OpenAICompatProvider.cpp

@@ -18,8 +18,10 @@
  */
 
 #include "OpenAICompatProvider.hpp"
+
 #include "settings/ChatAssistantSettings.hpp"
 #include "settings/CodeCompletionSettings.hpp"
+#include "settings/ProviderSettings.hpp"
 
 #include <QJsonArray>
 #include <QJsonDocument>
@@ -107,15 +109,22 @@ bool OpenAICompatProvider::handleResponse(QNetworkReply *reply, QString &accumul
         return false;
     }
 
-    QByteArrayList chunks = data.split('\n');
-    for (const QByteArray &chunk : chunks) {
-        if (chunk.trimmed().isEmpty() || chunk == "data: [DONE]") {
+    bool isDone = false;
+    QByteArrayList lines = data.split('\n');
+
+    for (const QByteArray &line : lines) {
+        if (line.trimmed().isEmpty()) {
             continue;
         }
 
-        QByteArray jsonData = chunk;
-        if (chunk.startsWith("data: ")) {
-            jsonData = chunk.mid(6);
+        if (line == "data: [DONE]") {
+            isDone = true;
+            continue;
+        }
+
+        QByteArray jsonData = line;
+        if (line.startsWith("data: ")) {
+            jsonData = line.mid(6);
         }
 
         QJsonParseError error;
@@ -131,11 +140,17 @@ bool OpenAICompatProvider::handleResponse(QNetworkReply *reply, QString &accumul
             continue;
         }
 
-        accumulatedResponse += message.getContent();
-        return message.isDone();
+        QString content = message.getContent();
+        if (!content.isEmpty()) {
+            accumulatedResponse += content;
+        }
+
+        if (message.isDone()) {
+            isDone = true;
+        }
     }
 
-    return false;
+    return isDone;
 }
 
 QList<QString> OpenAICompatProvider::getInstalledModels(const QString &url)
@@ -161,4 +176,18 @@ QList<QString> OpenAICompatProvider::validateRequest(
     return LLMCore::ValidationUtils::validateRequestFields(request, templateReq);
 }
 
+QString OpenAICompatProvider::apiKey() const
+{
+    return Settings::providerSettings().openAiCompatApiKey();
+}
+
+void OpenAICompatProvider::prepareNetworkRequest(QNetworkRequest &networkRequest) const
+{
+    networkRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
+
+    if (!apiKey().isEmpty()) {
+        networkRequest.setRawHeader("Authorization", QString("Bearer %1").arg(apiKey()).toUtf8());
+    }
+}
+
 } // namespace QodeAssist::Providers

providers/OpenAICompatProvider.hpp

@@ -37,6 +37,8 @@ public:
     bool handleResponse(QNetworkReply *reply, QString &accumulatedResponse) override;
     QList<QString> getInstalledModels(const QString &url) override;
     QList<QString> validateRequest(const QJsonObject &request, LLMCore::TemplateType type) override;
+    QString apiKey() const override;
+    void prepareNetworkRequest(QNetworkRequest &networkRequest) const override;
 };
 
 } // namespace QodeAssist::Providers

providers/OpenAIProvider.cpp

@@ -0,0 +1,229 @@
+/*
+ * 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 "OpenAIProvider.hpp"
+
+#include "settings/ChatAssistantSettings.hpp"
+#include "settings/CodeCompletionSettings.hpp"
+#include "settings/ProviderSettings.hpp"
+
+#include <QEventLoop>
+#include <QJsonArray>
+#include <QJsonDocument>
+#include <QJsonObject>
+#include <QNetworkReply>
+
+#include "llmcore/OpenAIMessage.hpp"
+#include "llmcore/ValidationUtils.hpp"
+#include "logger/Logger.hpp"
+
+namespace QodeAssist::Providers {
+
+OpenAIProvider::OpenAIProvider() {}
+
+QString OpenAIProvider::name() const
+{
+    return "OpenAI";
+}
+
+QString OpenAIProvider::url() const
+{
+    return "https://api.openai.com";
+}
+
+QString OpenAIProvider::completionEndpoint() const
+{
+    return "/v1/chat/completions";
+}
+
+QString OpenAIProvider::chatEndpoint() const
+{
+    return "/v1/chat/completions";
+}
+
+bool OpenAIProvider::supportsModelListing() const
+{
+    return true;
+}
+
+void OpenAIProvider::prepareRequest(QJsonObject &request, LLMCore::RequestType type)
+{
+    auto prepareMessages = [](QJsonObject &req) -> QJsonArray {
+        QJsonArray messages;
+        if (req.contains("system")) {
+            messages.append(
+                QJsonObject{{"role", "system"}, {"content", req.take("system").toString()}});
+        }
+        if (req.contains("prompt")) {
+            messages.append(
+                QJsonObject{{"role", "user"}, {"content", req.take("prompt").toString()}});
+        }
+        return messages;
+    };
+
+    auto applyModelParams = [&request](const auto &settings) {
+        request["max_tokens"] = settings.maxTokens();
+        request["temperature"] = settings.temperature();
+
+        if (settings.useTopP())
+            request["top_p"] = settings.topP();
+        if (settings.useTopK())
+            request["top_k"] = settings.topK();
+        if (settings.useFrequencyPenalty())
+            request["frequency_penalty"] = settings.frequencyPenalty();
+        if (settings.usePresencePenalty())
+            request["presence_penalty"] = settings.presencePenalty();
+    };
+
+    QJsonArray messages = prepareMessages(request);
+    if (!messages.isEmpty()) {
+        request["messages"] = std::move(messages);
+    }
+
+    if (type == LLMCore::RequestType::CodeCompletion) {
+        applyModelParams(Settings::codeCompletionSettings());
+    } else {
+        applyModelParams(Settings::chatAssistantSettings());
+    }
+}
+
+bool OpenAIProvider::handleResponse(QNetworkReply *reply, QString &accumulatedResponse)
+{
+    QByteArray data = reply->readAll();
+    if (data.isEmpty()) {
+        return false;
+    }
+
+    bool isDone = false;
+    QByteArrayList lines = data.split('\n');
+
+    for (const QByteArray &line : lines) {
+        if (line.trimmed().isEmpty()) {
+            continue;
+        }
+
+        if (line == "data: [DONE]") {
+            isDone = true;
+            continue;
+        }
+
+        QByteArray jsonData = line;
+        if (line.startsWith("data: ")) {
+            jsonData = line.mid(6);
+        }
+
+        QJsonParseError error;
+        QJsonDocument doc = QJsonDocument::fromJson(jsonData, &error);
+
+        if (doc.isNull()) {
+            continue;
+        }
+
+        auto message = LLMCore::OpenAIMessage::fromJson(doc.object());
+        if (message.hasError()) {
+            LOG_MESSAGE("Error in OpenAI response: " + message.error);
+            continue;
+        }
+
+        QString content = message.getContent();
+        if (!content.isEmpty()) {
+            accumulatedResponse += content;
+        }
+
+        if (message.isDone()) {
+            isDone = true;
+        }
+    }
+
+    return isDone;
+}
+
+QList<QString> OpenAIProvider::getInstalledModels(const QString &url)
+{
+    QList<QString> models;
+    QNetworkAccessManager manager;
+    QNetworkRequest request(QString("%1/v1/models").arg(url));
+
+    request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
+    if (!apiKey().isEmpty()) {
+        request.setRawHeader("Authorization", QString("Bearer %1").arg(apiKey()).toUtf8());
+    }
+
+    QNetworkReply *reply = manager.get(request);
+    QEventLoop loop;
+    QObject::connect(reply, &QNetworkReply::finished, &loop, &QEventLoop::quit);
+    loop.exec();
+
+    if (reply->error() == QNetworkReply::NoError) {
+        QByteArray responseData = reply->readAll();
+        QJsonDocument jsonResponse = QJsonDocument::fromJson(responseData);
+        QJsonObject jsonObject = jsonResponse.object();
+
+        if (jsonObject.contains("data")) {
+            QJsonArray modelArray = jsonObject["data"].toArray();
+            for (const QJsonValue &value : modelArray) {
+                QJsonObject modelObject = value.toObject();
+                if (modelObject.contains("id")) {
+                    QString modelId = modelObject["id"].toString();
+                    if (modelId.startsWith("gpt")) {
+                        models.append(modelId);
+                    }
+                }
+            }
+        }
+    } else {
+        LOG_MESSAGE(QString("Error fetching ChatGPT models: %1").arg(reply->errorString()));
+    }
+
+    reply->deleteLater();
+    return models;
+}
+
+QList<QString> OpenAIProvider::validateRequest(const QJsonObject &request, LLMCore::TemplateType type)
+{
+    const auto templateReq = QJsonObject{
+        {"model", {}},
+        {"messages", QJsonArray{{QJsonObject{{"role", {}}, {"content", {}}}}}},
+        {"temperature", {}},
+        {"max_tokens", {}},
+        {"top_p", {}},
+        {"top_k", {}},
+        {"frequency_penalty", {}},
+        {"presence_penalty", {}},
+        {"stop", QJsonArray{}},
+        {"stream", {}}};
+
+    return LLMCore::ValidationUtils::validateRequestFields(request, templateReq);
+}
+
+QString OpenAIProvider::apiKey() const
+{
+    return Settings::providerSettings().openAiApiKey();
+}
+
+void OpenAIProvider::prepareNetworkRequest(QNetworkRequest &networkRequest) const
+{
+    networkRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
+
+    if (!apiKey().isEmpty()) {
+        networkRequest.setRawHeader("Authorization", QString("Bearer %1").arg(apiKey()).toUtf8());
+    }
+}
+
+} // namespace QodeAssist::Providers

providers/OpenAIProvider.hpp

@@ -0,0 +1,44 @@
+/*
+ * 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 "llmcore/Provider.hpp"
+
+namespace QodeAssist::Providers {
+
+class OpenAIProvider : public LLMCore::Provider
+{
+public:
+    OpenAIProvider();
+
+    QString name() const override;
+    QString url() const override;
+    QString completionEndpoint() const override;
+    QString chatEndpoint() const override;
+    bool supportsModelListing() const override;
+    void prepareRequest(QJsonObject &request, LLMCore::RequestType type) override;
+    bool handleResponse(QNetworkReply *reply, QString &accumulatedResponse) override;
+    QList<QString> getInstalledModels(const QString &url) override;
+    QList<QString> validateRequest(const QJsonObject &request, LLMCore::TemplateType type) override;
+    QString apiKey() const override;
+    void prepareNetworkRequest(QNetworkRequest &networkRequest) const override;
+};
+
+} // namespace QodeAssist::Providers

providers/OpenRouterAIProvider.cpp

@@ -18,8 +18,10 @@
  */
 
 #include "OpenRouterAIProvider.hpp"
+
 #include "settings/ChatAssistantSettings.hpp"
 #include "settings/CodeCompletionSettings.hpp"
+#include "settings/ProviderSettings.hpp"
 
 #include <QJsonArray>
 #include <QJsonDocument>
@@ -91,16 +93,22 @@ bool OpenRouterProvider::handleResponse(QNetworkReply *reply, QString &accumulat
         return false;
     }
 
-    QByteArrayList chunks = data.split('\n');
-    for (const QByteArray &chunk : chunks) {
-        if (chunk.trimmed().isEmpty() || chunk.contains("OPENROUTER PROCESSING")
-            || chunk == "data: [DONE]") {
+    bool isDone = false;
+    QByteArrayList lines = data.split('\n');
+
+    for (const QByteArray &line : lines) {
+        if (line.trimmed().isEmpty() || line.contains("OPENROUTER PROCESSING")) {
             continue;
         }
 
-        QByteArray jsonData = chunk;
-        if (chunk.startsWith("data: ")) {
-            jsonData = chunk.mid(6);
+        if (line == "data: [DONE]") {
+            isDone = true;
+            continue;
+        }
+
+        QByteArray jsonData = line;
+        if (line.startsWith("data: ")) {
+            jsonData = line.mid(6);
         }
 
         QJsonParseError error;
@@ -112,15 +120,26 @@ bool OpenRouterProvider::handleResponse(QNetworkReply *reply, QString &accumulat
 
         auto message = LLMCore::OpenAIMessage::fromJson(doc.object());
         if (message.hasError()) {
-            LOG_MESSAGE("Error in OpenRouter response: " + message.error);
+            LOG_MESSAGE("Error in OpenAI response: " + message.error);
             continue;
         }
 
-        accumulatedResponse += message.getContent();
-        return message.isDone();
+        QString content = message.getContent();
+        if (!content.isEmpty()) {
+            accumulatedResponse += content;
+        }
+
+        if (message.isDone()) {
+            isDone = true;
+        }
     }
 
-    return false;
+    return isDone;
+}
+
+QString OpenRouterProvider::apiKey() const
+{
+    return Settings::providerSettings().openRouterApiKey();
 }
 
 } // namespace QodeAssist::Providers

providers/OpenRouterAIProvider.hpp

@@ -33,6 +33,7 @@ public:
     QString url() const override;
     void prepareRequest(QJsonObject &request, LLMCore::RequestType type) override;
     bool handleResponse(QNetworkReply *reply, QString &accumulatedResponse) override;
+    QString apiKey() const override;
 };
 
 } // namespace QodeAssist::Providers

providers/Providers.hpp

@@ -20,9 +20,11 @@
 #pragma once
 
 #include "llmcore/ProvidersManager.hpp"
+#include "providers/ClaudeProvider.hpp"
 #include "providers/LMStudioProvider.hpp"
 #include "providers/OllamaProvider.hpp"
 #include "providers/OpenAICompatProvider.hpp"
+#include "providers/OpenAIProvider.hpp"
 #include "providers/OpenRouterAIProvider.hpp"
 
 namespace QodeAssist::Providers {
@@ -34,6 +36,8 @@ inline void registerProviders()
     providerManager.registerProvider<LMStudioProvider>();
     providerManager.registerProvider<OpenAICompatProvider>();
     providerManager.registerProvider<OpenRouterProvider>();
+    providerManager.registerProvider<ClaudeProvider>();
+    providerManager.registerProvider<OpenAIProvider>();
 }
 
 } // namespace QodeAssist::Providers

qodeassist.cpp

@@ -19,6 +19,8 @@
 
 #include "QodeAssistConstants.hpp"
 #include "QodeAssisttr.h"
+#include "settings/PluginUpdater.hpp"
+#include "settings/UpdateDialog.hpp"
 
 #include <coreplugin/actionmanager/actioncontainer.h>
 #include <coreplugin/actionmanager/actionmanager.h>
@@ -32,18 +34,21 @@
 #include <extensionsystem/iplugin.h>
 #include <languageclient/languageclientmanager.h>
 
+#include <texteditor/texteditor.h>
+#include <utils/icon.h>
 #include <QAction>
 #include <QMainWindow>
 #include <QMenu>
 #include <QMessageBox>
-#include <texteditor/texteditor.h>
-#include <utils/icon.h>
 
 #include "ConfigurationManager.hpp"
 #include "QodeAssistClient.hpp"
 #include "chat/ChatOutputPane.h"
 #include "chat/NavigationPanel.hpp"
+#include "settings/GeneralSettings.hpp"
+#include "settings/ProjectSettingsPanel.hpp"
 
+#include "UpdateStatusWidget.hpp"
 #include "providers/Providers.hpp"
 #include "templates/Templates.hpp"
 
@@ -60,8 +65,8 @@ class QodeAssistPlugin final : public ExtensionSystem::IPlugin
 
 public:
     QodeAssistPlugin()
-    {
-    }
+        : m_updater(new PluginUpdater(this))
+    {}
 
     ~QodeAssistPlugin() final
     {
@@ -95,31 +100,36 @@ public:
             }
         });
 
-        auto toggleButton = new QToolButton;
-        toggleButton->setDefaultAction(requestAction.contextAction());
-        StatusBarManager::addStatusBarWidget(toggleButton, StatusBarManager::RightCorner);
+        m_statusWidget = new UpdateStatusWidget;
+        m_statusWidget->setDefaultAction(requestAction.contextAction());
+        StatusBarManager::addStatusBarWidget(m_statusWidget, StatusBarManager::RightCorner);
+
+        connect(m_statusWidget->updateButton(), &QPushButton::clicked, this, [this]() {
+            UpdateDialog::checkForUpdatesAndShow(Core::ICore::mainWindow());
+        });
 
         m_chatOutputPane = new Chat::ChatOutputPane(this);
         m_navigationPanel = new Chat::NavigationPanel();
 
+        Settings::setupProjectPanel();
         ConfigurationManager::instance().init();
+
+        if (Settings::generalSettings().enableCheckUpdate()) {
+            QTimer::singleShot(3000, this, &QodeAssistPlugin::checkForUpdates);
+        }
     }
 
-    void extensionsInitialized() final
-    {
-    }
+    void extensionsInitialized() final {}
 
     void restartClient()
     {
         LanguageClient::LanguageClientManager::shutdownClient(m_qodeAssistClient);
-
         m_qodeAssistClient = new QodeAssistClient();
     }
 
     bool delayedInitialize() final
     {
         restartClient();
-
         return true;
     }
 
@@ -127,17 +137,36 @@ public:
     {
         if (!m_qodeAssistClient)
             return SynchronousShutdown;
-        connect(m_qodeAssistClient,
-                &QObject::destroyed,
-                this,
-                &IPlugin::asynchronousShutdownFinished);
+        connect(m_qodeAssistClient, &QObject::destroyed, this, &IPlugin::asynchronousShutdownFinished);
         return AsynchronousShutdown;
     }
 
 private:
+    void checkForUpdates()
+    {
+        connect(
+            m_updater,
+            &PluginUpdater::updateCheckFinished,
+            this,
+            &QodeAssistPlugin::handleUpdateCheckResult,
+            Qt::UniqueConnection);
+        m_updater->checkForUpdates();
+    }
+
+    void handleUpdateCheckResult(const PluginUpdater::UpdateInfo &info)
+    {
+        if (!info.isUpdateAvailable)
+            return;
+
+        if (m_statusWidget)
+            m_statusWidget->showUpdateAvailable(info.version);
+    }
+
     QPointer<QodeAssistClient> m_qodeAssistClient;
     QPointer<Chat::ChatOutputPane> m_chatOutputPane;
     QPointer<Chat::NavigationPanel> m_navigationPanel;
+    QPointer<PluginUpdater> m_updater;
+    UpdateStatusWidget *m_statusWidget{nullptr};
 };
 
 } // namespace QodeAssist::Internal

rawPromptExamples/OllamaStarCoder2FIM.json

@@ -1,19 +0,0 @@
-{
-  "prompt": "{{QODE_INSTRUCTIONS}}<fim_prefix>{{QODE_PREFIX}}<fim_suffix>{{QODE_SUFFIX}}<fim_middle>",
-  "options": {
-    "temperature": 0.7,
-    "top_p": 0.95,
-    "top_k": 40,
-    "num_predict": 175,
-    "stop": [
-      "<|endoftext|>",
-      "<file_sep>",
-      "<fim_prefix>",
-      "<fim_suffix>",
-      "<fim_middle>"
-    ],
-    "frequency_penalty": 0,
-    "presence_penalty": 0
-  },
-  "stream": true
-}

rawPromptExamples/OpenAICodeqwenChat.json

@@ -1,16 +0,0 @@
-{
-  "max_tokens": 150,
-  "messages": [
-    {
-      "content": "{{QODE_INSTRUCTIONS}}\n### Instruction:{{QODE_PREFIX}}{{QODE_SUFFIX}} ### Response:\n",
-      "role": "user"
-    }
-  ],
-  "stop": [
-    "### Instruction:",
-    "### Response:",
-    "\n\n### "
-  ],
-  "stream": true,
-  "temperature": 0.2
-}

settings/CMakeLists.txt

@@ -8,6 +8,11 @@ add_library(QodeAssistSettings STATIC
     CodeCompletionSettings.hpp CodeCompletionSettings.cpp
     ChatAssistantSettings.hpp ChatAssistantSettings.cpp
     SettingsDialog.hpp SettingsDialog.cpp
+    ProjectSettings.hpp ProjectSettings.cpp
+    ProjectSettingsPanel.hpp ProjectSettingsPanel.cpp
+    ProviderSettings.hpp ProviderSettings.cpp
+    PluginUpdater.hpp PluginUpdater.cpp
+    UpdateDialog.hpp UpdateDialog.cpp
 )
 
 target_link_libraries(QodeAssistSettings

settings/ChatAssistantSettings.cpp

@@ -47,7 +47,7 @@ ChatAssistantSettings::ChatAssistantSettings()
     chatTokensThreshold.setLabelText(Tr::tr("Chat History Token Limit:"));
     chatTokensThreshold.setToolTip(Tr::tr("Maximum number of tokens in chat history. When "
                                           "exceeded, oldest messages will be removed."));
-    chatTokensThreshold.setRange(1000, 16000);
+    chatTokensThreshold.setRange(1, 900000);
     chatTokensThreshold.setDefaultValue(8000);
 
     sharingCurrentFile.setSettingsKey(Constants::CA_SHARING_CURRENT_FILE);
@@ -58,6 +58,10 @@ ChatAssistantSettings::ChatAssistantSettings()
     stream.setDefaultValue(true);
     stream.setLabelText(Tr::tr("Enable stream option"));
 
+    autosave.setSettingsKey(Constants::CA_AUTOSAVE);
+    autosave.setDefaultValue(true);
+    autosave.setLabelText(Tr::tr("Enable autosave when message received"));
+
     // General Parameters Settings
     temperature.setSettingsKey(Constants::CA_TEMPERATURE);
     temperature.setLabelText(Tr::tr("Temperature:"));
@@ -135,7 +139,7 @@ ChatAssistantSettings::ChatAssistantSettings()
 
     // API Configuration Settings
     apiKey.setSettingsKey(Constants::CA_API_KEY);
-    apiKey.setLabelText(Tr::tr("API Key:"));
+    apiKey.setLabelText(Tr::tr("[Deprecated, see Provider Settings]API Key:"));
     apiKey.setDisplayStyle(Utils::StringAspect::LineEditDisplay);
     apiKey.setPlaceHolderText(Tr::tr("Enter your API key here"));
 
@@ -167,7 +171,7 @@ ChatAssistantSettings::ChatAssistantSettings()
             Space{8},
             Group{
                 title(Tr::tr("Chat Settings")),
-                Column{Row{chatTokensThreshold, Stretch{1}}, sharingCurrentFile, stream}},
+                Column{Row{chatTokensThreshold, Stretch{1}}, sharingCurrentFile, stream, autosave}},
             Space{8},
             Group{
                 title(Tr::tr("General Parameters")),

settings/ChatAssistantSettings.hpp

@@ -36,6 +36,7 @@ public:
     Utils::IntegerAspect chatTokensThreshold{this};
     Utils::BoolAspect sharingCurrentFile{this};
     Utils::BoolAspect stream{this};
+    Utils::BoolAspect autosave{this};
 
     // General Parameters Settings
     Utils::DoubleAspect temperature{this};

settings/CodeCompletionSettings.cpp

@@ -62,7 +62,7 @@ CodeCompletionSettings::CodeCompletionSettings()
     startSuggestionTimer.setSettingsKey(Constants::СС_START_SUGGESTION_TIMER);
     startSuggestionTimer.setLabelText(Tr::tr("with delay(ms)"));
     startSuggestionTimer.setRange(10, 10000);
-    startSuggestionTimer.setDefaultValue(500);
+    startSuggestionTimer.setDefaultValue(350);
 
     autoCompletionCharThreshold.setSettingsKey(Constants::СС_AUTO_COMPLETION_CHAR_THRESHOLD);
     autoCompletionCharThreshold.setLabelText(Tr::tr("AI suggestion triggers after typing"));
@@ -70,7 +70,7 @@ CodeCompletionSettings::CodeCompletionSettings()
         Tr::tr("The number of characters that need to be typed within the typing interval "
                "before an AI suggestion request is sent."));
     autoCompletionCharThreshold.setRange(0, 10);
-    autoCompletionCharThreshold.setDefaultValue(0);
+    autoCompletionCharThreshold.setDefaultValue(1);
 
     autoCompletionTypingInterval.setSettingsKey(Constants::СС_AUTO_COMPLETION_TYPING_INTERVAL);
     autoCompletionTypingInterval.setLabelText(Tr::tr("character(s) within(ms)"));
@@ -78,7 +78,7 @@ CodeCompletionSettings::CodeCompletionSettings()
         Tr::tr("The time window (in milliseconds) during which the character threshold "
                "must be met to trigger an AI suggestion request."));
     autoCompletionTypingInterval.setRange(500, 5000);
-    autoCompletionTypingInterval.setDefaultValue(2000);
+    autoCompletionTypingInterval.setDefaultValue(1200);
 
     // General Parameters Settings
     temperature.setSettingsKey(Constants::CC_TEMPERATURE);
@@ -89,7 +89,7 @@ CodeCompletionSettings::CodeCompletionSettings()
 
     maxTokens.setSettingsKey(Constants::CC_MAX_TOKENS);
     maxTokens.setLabelText(Tr::tr("Max Tokens:"));
-    maxTokens.setRange(-1, 10000);
+    maxTokens.setRange(-1, 900000);
     maxTokens.setDefaultValue(50);
 
     // Advanced Parameters
@@ -151,8 +151,27 @@ CodeCompletionSettings::CodeCompletionSettings()
 
     systemPrompt.setSettingsKey(Constants::CC_SYSTEM_PROMPT);
     systemPrompt.setDisplayStyle(Utils::StringAspect::TextEditDisplay);
-    systemPrompt.setDefaultValue("You are an expert C++, Qt, and QML code completion AI. Answer "
-                                 "should be ONLY in CODE and without repeating current.");
+    systemPrompt.setDefaultValue(
+        "You are an expert in C++, Qt, and QML programming. Your task is to provide code "
+        "suggestions that seamlessly integrate with existing code. You will receive a code context "
+        "with specified insertion points. Your goal is to complete only one logic expression "
+        "within these points."
+        "Here is the code context with insertion points:<code_context>Before: {{variable}}After: "
+        "{{variable}}</code_context> Instructions: 1. Carefully analyze the provided code context. "
+        "2. Consider the existing code and the specified insertion points.3. Generate a code "
+        "suggestion that completes one logic expression between the 'Before' and 'After' points. "
+        "4. Ensure your suggestion does not repeat any existing code. 5. Format your suggestion as "
+        "a code block using triple backticks. 6. Do not include any comments or descriptions with "
+        "your code suggestion. Remember to include only the new code to be inserted.");
+
+    useUserMessageTemplateForCC.setSettingsKey(Constants::CC_USE_USER_TEMPLATE);
+    useUserMessageTemplateForCC.setDefaultValue(true);
+    useUserMessageTemplateForCC.setLabelText(Tr::tr("Use User Template for code completion message for non-FIM models"));
+
+    userMessageTemplateForCC.setSettingsKey(Constants::CC_USER_TEMPLATE);
+    userMessageTemplateForCC.setDisplayStyle(Utils::StringAspect::TextEditDisplay);
+    userMessageTemplateForCC.setDefaultValue("Here is the code context with insertion points: <code_context>"
+                                             "\nBefore: %1After: %2\n </code_context>");
 
     useFilePathInContext.setSettingsKey(Constants::CC_USE_FILE_PATH_IN_CONTEXT);
     useFilePathInContext.setDefaultValue(true);
@@ -182,7 +201,7 @@ CodeCompletionSettings::CodeCompletionSettings()
 
     // API Configuration Settings
     apiKey.setSettingsKey(Constants::CC_API_KEY);
-    apiKey.setLabelText(Tr::tr("API Key:"));
+    apiKey.setLabelText(Tr::tr("[Deprecated, see Provider Settings]API Key:"));
     apiKey.setDisplayStyle(Utils::StringAspect::LineEditDisplay);
     apiKey.setPlaceHolderText(Tr::tr("Enter your API key here"));
 
@@ -218,6 +237,8 @@ CodeCompletionSettings::CodeCompletionSettings()
         auto contextItem = Column{Row{contextGrid, Stretch{1}},
                                   Row{useSystemPrompt, Stretch{1}},
                                   systemPrompt,
+                                  Row{useUserMessageTemplateForCC, Stretch{1}},
+                                  userMessageTemplateForCC,
                                   Row{useFilePathInContext, Stretch{1}},
                                   Row{useProjectChangesCache, maxChangesCacheSize, Stretch{1}}};
 

settings/CodeCompletionSettings.hpp

@@ -66,6 +66,8 @@ public:
     Utils::IntegerAspect readStringsAfterCursor{this};
     Utils::BoolAspect useSystemPrompt{this};
     Utils::StringAspect systemPrompt{this};
+    Utils::BoolAspect useUserMessageTemplateForCC{this};
+    Utils::StringAspect userMessageTemplateForCC{this};
     Utils::BoolAspect useFilePathInContext{this};
     Utils::BoolAspect useProjectChangesCache{this};
     Utils::IntegerAspect maxChangesCacheSize{this};

settings/GeneralSettings.cpp

@@ -37,6 +37,7 @@
 #include "SettingsDialog.hpp"
 #include "SettingsTr.hpp"
 #include "SettingsUtils.hpp"
+#include "UpdateDialog.hpp"
 
 namespace QodeAssist::Settings {
 
@@ -60,7 +61,12 @@ GeneralSettings::GeneralSettings()
     enableLogging.setLabelText(TrConstants::ENABLE_LOG);
     enableLogging.setDefaultValue(false);
 
+    enableCheckUpdate.setSettingsKey(Constants::ENABLE_CHECK_UPDATE);
+    enableCheckUpdate.setLabelText(TrConstants::ENABLE_CHECK_UPDATE_ON_START);
+    enableCheckUpdate.setDefaultValue(true);
+
     resetToDefaults.m_buttonText = TrConstants::RESET_TO_DEFAULTS;
+    checkUpdate.m_buttonText = TrConstants::CHECK_UPDATE;
 
     initStringAspect(ccProvider, Constants::CC_PROVIDER, TrConstants::PROVIDER, "Ollama");
     ccProvider.setReadOnly(true);
@@ -129,13 +135,15 @@ GeneralSettings::GeneralSettings()
         auto ccGroup = Group{title(TrConstants::CODE_COMPLETION), ccGrid};
         auto caGroup = Group{title(TrConstants::CHAT_ASSISTANT), caGrid};
 
-        auto rootLayout = Column{Row{enableQodeAssist, Stretch{1}, resetToDefaults},
-                                 Row{enableLogging, Stretch{1}},
-                                 Space{8},
-                                 ccGroup,
-                                 Space{8},
-                                 caGroup,
-                                 Stretch{1}};
+        auto rootLayout = Column{
+            Row{enableQodeAssist, Stretch{1}, Row{checkUpdate, resetToDefaults}},
+            Row{enableLogging, Stretch{1}},
+            Row{enableCheckUpdate, Stretch{1}},
+            Space{8},
+            ccGroup,
+            Space{8},
+            caGroup,
+            Stretch{1}};
 
         return rootLayout;
     });
@@ -295,6 +303,9 @@ void GeneralSettings::setupConnections()
         Logger::instance().setLoggingEnabled(enableLogging.volatileValue());
     });
     connect(&resetToDefaults, &ButtonAspect::clicked, this, &GeneralSettings::resetPageToDefaults);
+    connect(&checkUpdate, &ButtonAspect::clicked, this, [this]() {
+        QodeAssist::UpdateDialog::checkForUpdatesAndShow(Core::ICore::dialogParent());
+    });
 }
 
 void GeneralSettings::resetPageToDefaults()
@@ -316,6 +327,7 @@ void GeneralSettings::resetPageToDefaults()
         resetAspect(caModel);
         resetAspect(caTemplate);
         resetAspect(caUrl);
+        resetAspect(enableCheckUpdate);
         writeSettings();
     }
 }

settings/GeneralSettings.hpp

@@ -35,6 +35,8 @@ public:
 
     Utils::BoolAspect enableQodeAssist{this};
     Utils::BoolAspect enableLogging{this};
+    Utils::BoolAspect enableCheckUpdate{this};
+    ButtonAspect checkUpdate{this};
     ButtonAspect resetToDefaults{this};
 
     // code completion setttings

settings/PluginUpdater.cpp

@@ -0,0 +1,192 @@
+/* 
+ * 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 "PluginUpdater.hpp"
+
+#include <coreplugin/coreconstants.h>
+#include <coreplugin/coreplugin.h>
+#include <extensionsystem/pluginmanager.h>
+#include <extensionsystem/pluginspec.h>
+#include <QJsonArray>
+#include <QJsonDocument>
+#include <QStandardPaths>
+
+namespace QodeAssist {
+
+PluginUpdater::PluginUpdater(QObject *parent)
+    : QObject(parent)
+    , m_networkManager(new QNetworkAccessManager(this))
+{}
+
+void PluginUpdater::checkForUpdates()
+{
+    if (m_isCheckingUpdate)
+        return;
+
+    m_isCheckingUpdate = true;
+    QNetworkRequest request((QUrl(getUpdateUrl())));
+    request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
+
+    QNetworkReply *reply = m_networkManager->get(request);
+
+    connect(reply, &QNetworkReply::finished, this, [this, reply]() {
+        handleUpdateResponse(reply);
+        m_isCheckingUpdate = false;
+        reply->deleteLater();
+    });
+}
+
+void PluginUpdater::handleUpdateResponse(QNetworkReply *reply)
+{
+    UpdateInfo info;
+
+    if (reply->error() != QNetworkReply::NoError) {
+        emit downloadError(reply->errorString());
+        return;
+    }
+
+    QJsonDocument doc = QJsonDocument::fromJson(reply->readAll());
+    QJsonObject obj = doc.object();
+
+    info.version = obj["tag_name"].toString();
+    if (info.version.startsWith('v'))
+        info.version.remove(0, 1);
+
+    QString qtcVersionStr = Core::ICore::versionString().split(' ').last();
+    QVersionNumber qtcVersion = QVersionNumber::fromString(qtcVersionStr);
+    info.currentIdeVersion = qtcVersionStr;
+
+    auto assets = obj["assets"].toArray();
+    for (const auto &asset : assets) {
+        QString name = asset.toObject()["name"].toString();
+
+        if (name.startsWith("QodeAssist-")) {
+            QString assetVersionStr = name.section('-', 1, 1);
+            QVersionNumber assetVersion = QVersionNumber::fromString(assetVersionStr);
+            info.targetIdeVersion = assetVersionStr;
+
+            if (assetVersion != qtcVersion) {
+                continue;
+            }
+
+#if defined(Q_OS_WIN)
+            if (name.contains("Windows"))
+#elif defined(Q_OS_MACOS)
+            if (name.contains("macOS"))
+#else
+            if (name.contains("Linux") && !name.contains("experimental"))
+#endif
+            {
+                info.downloadUrl = asset.toObject()["browser_download_url"].toString();
+                info.fileName = name;
+                break;
+            }
+        }
+    }
+
+    if (info.downloadUrl.isEmpty()) {
+        info.incompatibleIdeVersion = true;
+        emit updateCheckFinished(info);
+        return;
+    }
+
+    info.changeLog = obj["body"].toString();
+    info.isUpdateAvailable = QVersionNumber::fromString(info.version)
+                             > QVersionNumber::fromString(currentVersion());
+
+    m_lastUpdateInfo = info;
+    emit updateCheckFinished(info);
+}
+
+void PluginUpdater::downloadUpdate(const QString &url)
+{
+    QNetworkRequest request(url);
+    QNetworkReply *reply = m_networkManager->get(request);
+
+    connect(reply, &QNetworkReply::downloadProgress, this, &PluginUpdater::handleDownloadProgress);
+    connect(reply, &QNetworkReply::finished, this, &PluginUpdater::handleDownloadFinished);
+}
+
+QString PluginUpdater::currentVersion() const
+{
+    const auto pluginSpecs = ExtensionSystem::PluginManager::plugins();
+    for (const ExtensionSystem::PluginSpec *spec : pluginSpecs) {
+        if (spec->name() == QLatin1String("QodeAssist"))
+            return spec->version();
+    }
+    return QString();
+}
+
+bool PluginUpdater::isUpdateAvailable() const
+{
+    return m_lastUpdateInfo.isUpdateAvailable;
+}
+
+QString PluginUpdater::getUpdateUrl() const
+{
+    return "https://api.github.com/repos/Palm1r/qodeassist/releases/latest";
+}
+
+void PluginUpdater::handleDownloadProgress(qint64 bytesReceived, qint64 bytesTotal)
+{
+    emit downloadProgress(bytesReceived, bytesTotal);
+}
+
+void PluginUpdater::handleDownloadFinished()
+{
+    auto reply = qobject_cast<QNetworkReply *>(sender());
+    QTC_ASSERT(reply, return);
+
+    if (reply->error() != QNetworkReply::NoError) {
+        emit downloadError(reply->errorString());
+        reply->deleteLater();
+        return;
+    }
+
+    QString downloadPath = QStandardPaths::writableLocation(QStandardPaths::DownloadLocation)
+                           + QDir::separator() + "qodeassisttemp";
+    QDir().mkpath(downloadPath);
+
+    QString filePath = downloadPath + "/" + m_lastUpdateInfo.fileName;
+    QFile file(filePath);
+
+    if (!file.open(QIODevice::WriteOnly)) {
+        emit downloadError(tr("Could not save the update file"));
+        reply->deleteLater();
+        return;
+    }
+
+    file.write(reply->readAll());
+    file.close();
+
+    if (!Core::executePluginInstallWizard(Utils::FilePath::fromString(filePath))) {
+        emit downloadError(tr("Failed to install the update"));
+    } else {
+        emit downloadFinished(filePath);
+    }
+
+    auto tempDir = QDir(downloadPath);
+    if (tempDir.exists()) {
+        tempDir.removeRecursively();
+    }
+
+    reply->deleteLater();
+}
+
+} // namespace QodeAssist

settings/PluginUpdater.hpp

@@ -0,0 +1,72 @@
+/* 
+ * 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 <coreplugin/icore.h>
+#include <coreplugin/plugininstallwizard.h>
+#include <QNetworkAccessManager>
+#include <QNetworkReply>
+#include <QObject>
+#include <QVersionNumber>
+
+namespace QodeAssist {
+
+class PluginUpdater : public QObject
+{
+    Q_OBJECT
+public:
+    struct UpdateInfo
+    {
+        QString version;
+        QString downloadUrl;
+        QString changeLog;
+        QString fileName;
+        bool isUpdateAvailable;
+        bool incompatibleIdeVersion{false};
+        QString targetIdeVersion;
+        QString currentIdeVersion;
+    };
+
+    explicit PluginUpdater(QObject *parent = nullptr);
+    ~PluginUpdater() = default;
+
+    void checkForUpdates();
+    void downloadUpdate(const QString &url);
+    QString currentVersion() const;
+    bool isUpdateAvailable() const;
+
+signals:
+    void updateCheckFinished(const UpdateInfo &info);
+    void downloadProgress(qint64 bytesReceived, qint64 bytesTotal);
+    void downloadFinished(const QString &filePath);
+    void downloadError(const QString &error);
+
+private:
+    void handleUpdateResponse(QNetworkReply *reply);
+    void handleDownloadProgress(qint64 bytesReceived, qint64 bytesTotal);
+    void handleDownloadFinished();
+    QString getUpdateUrl() const;
+
+    QNetworkAccessManager *m_networkManager;
+    UpdateInfo m_lastUpdateInfo;
+    bool m_isCheckingUpdate{false};
+};
+
+} // namespace QodeAssist

settings/ProjectSettings.cpp

@@ -0,0 +1,81 @@
+/* 
+ * 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 "ProjectSettings.hpp"
+
+#include "GeneralSettings.hpp"
+#include "SettingsConstants.hpp"
+#include "SettingsTr.hpp"
+#include <coreplugin/icore.h>
+#include <projectexplorer/project.h>
+
+namespace QodeAssist::Settings {
+
+ProjectSettings::ProjectSettings(ProjectExplorer::Project *project)
+{
+    setAutoApply(true);
+
+    useGlobalSettings.setSettingsKey(Constants::QODE_ASSIST_USE_GLOBAL_SETTINGS);
+    useGlobalSettings.setDefaultValue(true);
+
+    enableQodeAssist.setSettingsKey(Constants::QODE_ASSIST_ENABLE_IN_PROJECT);
+    enableQodeAssist.setDisplayName(Tr::tr("Enable Qode Assist"));
+    enableQodeAssist.setLabelText(Tr::tr("Enable Qode Assist"));
+    enableQodeAssist.setDefaultValue(false);
+
+    chatHistoryPath.setSettingsKey(Constants::QODE_ASSIST_CHAT_HISTORY_PATH);
+    chatHistoryPath.setExpectedKind(Utils::PathChooser::ExistingDirectory);
+    chatHistoryPath.setLabelText(Tr::tr("Chat History Path:"));
+
+    QString projectChatHistoryPath
+        = QString("%1/qodeassist/chat_history").arg(Core::ICore::userResourcePath().toString());
+
+    chatHistoryPath.setDefaultValue(projectChatHistoryPath);
+
+    Utils::Store map = Utils::storeFromVariant(
+        project->namedSettings(Constants::QODE_ASSIST_PROJECT_SETTINGS_ID));
+    fromMap(map);
+
+    enableQodeAssist.addOnChanged(this, [this, project] { save(project); });
+    useGlobalSettings.addOnChanged(this, [this, project] { save(project); });
+    chatHistoryPath.addOnChanged(this, [this, project] { save(project); });
+}
+
+void ProjectSettings::setUseGlobalSettings(bool useGlobal)
+{
+    useGlobalSettings.setValue(useGlobal);
+}
+
+bool ProjectSettings::isEnabled() const
+{
+    if (useGlobalSettings())
+        return generalSettings().enableQodeAssist();
+    return enableQodeAssist();
+}
+
+void ProjectSettings::save(ProjectExplorer::Project *project)
+{
+    Utils::Store map;
+    toMap(map);
+    project
+        ->setNamedSettings(Constants::QODE_ASSIST_PROJECT_SETTINGS_ID, Utils::variantFromStore(map));
+    generalSettings().apply();
+}
+
+} // namespace QodeAssist::Settings

settings/ProjectSettings.hpp

@@ -0,0 +1,44 @@
+/* 
+ * 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 <utils/aspects.h>
+
+namespace ProjectExplorer {
+class Project;
+}
+
+namespace QodeAssist::Settings {
+
+class ProjectSettings : public Utils::AspectContainer
+{
+public:
+    explicit ProjectSettings(ProjectExplorer::Project *project);
+    void save(ProjectExplorer::Project *project);
+
+    void setUseGlobalSettings(bool useGlobalSettings);
+    bool isEnabled() const;
+
+    Utils::BoolAspect enableQodeAssist{this};
+    Utils::BoolAspect useGlobalSettings{this};
+    Utils::FilePathAspect chatHistoryPath{this};
+};
+
+} // namespace QodeAssist::Settings

settings/ProjectSettingsPanel.cpp

@@ -0,0 +1,93 @@
+/* 
+ * 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 "ProjectSettingsPanel.hpp"
+
+#include <projectexplorer/project.h>
+#include <projectexplorer/projectpanelfactory.h>
+#include <projectexplorer/projectsettingswidget.h>
+#include <utils/layoutbuilder.h>
+
+#include "ProjectSettings.hpp"
+#include "SettingsConstants.hpp"
+#include "SettingsTr.hpp"
+
+using namespace ProjectExplorer;
+
+namespace QodeAssist::Settings {
+
+class ProjectSettingsWidget final : public ProjectExplorer::ProjectSettingsWidget
+{
+public:
+    ProjectSettingsWidget()
+    {
+        setGlobalSettingsId(Constants::QODE_ASSIST_GENERAL_OPTIONS_ID);
+        setUseGlobalSettingsCheckBoxVisible(true);
+    }
+};
+
+static ProjectSettingsWidget *createProjectPanel(Project *project)
+{
+    using namespace Layouting;
+
+    auto widget = new ProjectSettingsWidget;
+    auto settings = new ProjectSettings(project);
+    settings->setParent(widget);
+
+    QObject::connect(
+        widget,
+        &ProjectSettingsWidget::useGlobalSettingsChanged,
+        settings,
+        &ProjectSettings::setUseGlobalSettings);
+
+    widget->setUseGlobalSettings(settings->useGlobalSettings());
+    widget->setEnabled(!settings->useGlobalSettings());
+
+    QObject::connect(
+        widget, &ProjectSettingsWidget::useGlobalSettingsChanged, widget, [widget](bool useGlobal) {
+            widget->setEnabled(!useGlobal);
+        });
+
+    Column{
+        settings->enableQodeAssist,
+        Space{8},
+        settings->chatHistoryPath,
+    }
+        .attachTo(widget);
+
+    return widget;
+}
+
+class ProjectPanelFactory final : public ProjectExplorer::ProjectPanelFactory
+{
+public:
+    ProjectPanelFactory()
+    {
+        setPriority(1000);
+        setDisplayName(Tr::tr("Qode Assist"));
+        setCreateWidgetFunction(&createProjectPanel);
+    }
+};
+
+void setupProjectPanel()
+{
+    static ProjectPanelFactory theProjectPanelFactory;
+}
+
+} // namespace QodeAssist::Settings

settings/ProjectSettingsPanel.hpp

@@ -0,0 +1,26 @@
+/* 
+ * 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
+
+namespace QodeAssist::Settings {
+
+void setupProjectPanel();
+
+} // namespace QodeAssist::Settings

settings/ProviderSettings.cpp

@@ -0,0 +1,148 @@
+/* 
+ * 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 "ProviderSettings.hpp"
+
+#include <coreplugin/dialogs/ioptionspage.h>
+#include <coreplugin/icore.h>
+#include <utils/layoutbuilder.h>
+#include <QMessageBox>
+
+#include "SettingsConstants.hpp"
+#include "SettingsTr.hpp"
+#include "SettingsUtils.hpp"
+
+namespace QodeAssist::Settings {
+
+ProviderSettings &providerSettings()
+{
+    static ProviderSettings settings;
+    return settings;
+}
+
+ProviderSettings::ProviderSettings()
+{
+    setAutoApply(false);
+
+    setDisplayName(Tr::tr("Provider Settings"));
+
+    // OpenRouter Settings
+    openRouterApiKey.setSettingsKey(Constants::OPEN_ROUTER_API_KEY);
+    openRouterApiKey.setLabelText(Tr::tr("OpenRouter API Key:"));
+    openRouterApiKey.setDisplayStyle(Utils::StringAspect::LineEditDisplay);
+    openRouterApiKey.setPlaceHolderText(Tr::tr("Enter your API key here"));
+    openRouterApiKey.setHistoryCompleter(Constants::OPEN_ROUTER_API_KEY_HISTORY);
+    openRouterApiKey.setDefaultValue("");
+    openRouterApiKey.setAutoApply(true);
+
+    // OpenAI Compatible Settings
+    openAiCompatApiKey.setSettingsKey(Constants::OPEN_AI_COMPAT_API_KEY);
+    openAiCompatApiKey.setLabelText(Tr::tr("OpenAI Compatible API Key:"));
+    openAiCompatApiKey.setDisplayStyle(Utils::StringAspect::LineEditDisplay);
+    openAiCompatApiKey.setPlaceHolderText(Tr::tr("Enter your API key here"));
+    openAiCompatApiKey.setHistoryCompleter(Constants::OPEN_AI_COMPAT_API_KEY_HISTORY);
+    openAiCompatApiKey.setDefaultValue("");
+    openAiCompatApiKey.setAutoApply(true);
+
+    // Claude Compatible Settings
+    claudeApiKey.setSettingsKey(Constants::CLAUDE_API_KEY);
+    claudeApiKey.setLabelText(Tr::tr("Claude API Key:"));
+    claudeApiKey.setDisplayStyle(Utils::StringAspect::LineEditDisplay);
+    claudeApiKey.setPlaceHolderText(Tr::tr("Enter your API key here"));
+    claudeApiKey.setHistoryCompleter(Constants::CLAUDE_API_KEY_HISTORY);
+    claudeApiKey.setDefaultValue("");
+    claudeApiKey.setAutoApply(true);
+
+    openAiApiKey.setSettingsKey(Constants::OPEN_AI_API_KEY);
+    openAiApiKey.setLabelText(Tr::tr("OpenAI API Key:"));
+    openAiApiKey.setDisplayStyle(Utils::StringAspect::LineEditDisplay);
+    openAiApiKey.setPlaceHolderText(Tr::tr("Enter your API key here"));
+    openAiApiKey.setHistoryCompleter(Constants::OPEN_AI_API_KEY_HISTORY);
+    openAiApiKey.setDefaultValue("");
+    openAiApiKey.setAutoApply(true);
+
+    resetToDefaults.m_buttonText = Tr::tr("Reset Page to Defaults");
+
+    readSettings();
+
+    setupConnections();
+
+    setLayouter([this]() {
+        using namespace Layouting;
+
+        return Column{
+            Row{Stretch{1}, resetToDefaults},
+            Space{8},
+            Group{title(Tr::tr("OpenRouter Settings")), Column{openRouterApiKey}},
+            Space{8},
+            Group{title(Tr::tr("OpenAI Settings")), Column{openAiApiKey}},
+            Space{8},
+            Group{title(Tr::tr("OpenAI Compatible Settings")), Column{openAiCompatApiKey}},
+            Space{8},
+            Group{title(Tr::tr("Claude Settings")), Column{claudeApiKey}},
+            Stretch{1}};
+    });
+}
+
+void ProviderSettings::setupConnections()
+{
+    connect(
+        &resetToDefaults, &ButtonAspect::clicked, this, &ProviderSettings::resetSettingsToDefaults);
+    connect(&openRouterApiKey, &ButtonAspect::changed, this, [this]() {
+        openRouterApiKey.writeSettings();
+    });
+    connect(&openAiCompatApiKey, &ButtonAspect::changed, this, [this]() {
+        openAiCompatApiKey.writeSettings();
+    });
+    connect(&claudeApiKey, &ButtonAspect::changed, this, [this]() { claudeApiKey.writeSettings(); });
+    connect(&openAiApiKey, &ButtonAspect::changed, this, [this]() { openAiApiKey.writeSettings(); });
+}
+
+void ProviderSettings::resetSettingsToDefaults()
+{
+    QMessageBox::StandardButton reply;
+    reply = QMessageBox::question(
+        Core::ICore::dialogParent(),
+        Tr::tr("Reset Settings"),
+        Tr::tr("Are you sure you want to reset all settings to default values?"),
+        QMessageBox::Yes | QMessageBox::No);
+
+    if (reply == QMessageBox::Yes) {
+        resetAspect(openRouterApiKey);
+        resetAspect(openAiCompatApiKey);
+        resetAspect(claudeApiKey);
+        resetAspect(openAiApiKey);
+    }
+}
+
+class ProviderSettingsPage : public Core::IOptionsPage
+{
+public:
+    ProviderSettingsPage()
+    {
+        setId(Constants::QODE_ASSIST_PROVIDER_SETTINGS_PAGE_ID);
+        setDisplayName(Tr::tr("Provider Settings"));
+        setCategory(Constants::QODE_ASSIST_GENERAL_OPTIONS_CATEGORY);
+        setSettingsProvider([] { return &providerSettings(); });
+    }
+};
+
+const ProviderSettingsPage providerSettingsPage;
+
+} // namespace QodeAssist::Settings

settings/ProviderSettings.hpp

@@ -0,0 +1,48 @@
+/* 
+ * 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 <utils/aspects.h>
+
+#include "ButtonAspect.hpp"
+
+namespace QodeAssist::Settings {
+
+class ProviderSettings : public Utils::AspectContainer
+{
+public:
+    ProviderSettings();
+
+    ButtonAspect resetToDefaults{this};
+
+    // API Keys
+    Utils::StringAspect openRouterApiKey{this};
+    Utils::StringAspect openAiCompatApiKey{this};
+    Utils::StringAspect claudeApiKey{this};
+    Utils::StringAspect openAiApiKey{this};
+
+private:
+    void setupConnections();
+    void resetSettingsToDefaults();
+};
+
+ProviderSettings &providerSettings();
+
+} // namespace QodeAssist::Settings

settings/SettingsConstants.hpp

@@ -24,6 +24,13 @@ namespace QodeAssist::Constants {
 const char ACTION_ID[] = "QodeAssist.Action";
 const char MENU_ID[] = "QodeAssist.Menu";
 
+// project settings
+
+const char QODE_ASSIST_PROJECT_SETTINGS_ID[] = "QodeAssist.ProjectSettings";
+const char QODE_ASSIST_USE_GLOBAL_SETTINGS[] = "QodeAssist.UseGlobalSettings";
+const char QODE_ASSIST_ENABLE_IN_PROJECT[] = "QodeAssist.EnableInProject";
+const char QODE_ASSIST_CHAT_HISTORY_PATH[] = "QodeAssist.ChatHistoryPath";
+
 // new settings
 const char CC_PROVIDER[] = "QodeAssist.ccProvider";
 const char CC_MODEL[] = "QodeAssist.ccModel";
@@ -43,6 +50,8 @@ const char CA_URL_HISTORY[] = "QodeAssist.caUrlHistory";
 const char ENABLE_QODE_ASSIST[] = "QodeAssist.enableQodeAssist";
 const char CC_AUTO_COMPLETION[] = "QodeAssist.ccAutoCompletion";
 const char ENABLE_LOGGING[] = "QodeAssist.enableLogging";
+const char ENABLE_CHECK_UPDATE[] = "QodeAssist.enableCheckUpdate";
+
 const char PROVIDER_PATHS[] = "QodeAssist.providerPaths";
 const char СС_START_SUGGESTION_TIMER[] = "QodeAssist.startSuggestionTimer";
 const char СС_AUTO_COMPLETION_CHAR_THRESHOLD[] = "QodeAssist.autoCompletionCharThreshold";
@@ -55,6 +64,7 @@ const char CUSTOM_JSON_TEMPLATE[] = "QodeAssist.customJsonTemplate";
 const char CA_TOKENS_THRESHOLD[] = "QodeAssist.caTokensThreshold";
 const char CA_SHARING_CURRENT_FILE[] = "QodeAssist.caSharingCurrentFile";
 const char CA_STREAM[] = "QodeAssist.caStream";
+const char CA_AUTOSAVE[] = "QodeAssist.caAutosave";
 
 const char QODE_ASSIST_GENERAL_OPTIONS_ID[] = "QodeAssist.GeneralOptions";
 const char QODE_ASSIST_GENERAL_SETTINGS_PAGE_ID[] = "QodeAssist.1GeneralSettingsPageId";
@@ -69,6 +79,19 @@ const char QODE_ASSIST_GENERAL_OPTIONS_DISPLAY_CATEGORY[] = "Qode Assist";
 
 const char QODE_ASSIST_REQUEST_SUGGESTION[] = "QodeAssist.RequestSuggestion";
 
+// Provider Settings Page ID
+const char QODE_ASSIST_PROVIDER_SETTINGS_PAGE_ID[] = "QodeAssist.5ProviderSettingsPageId";
+
+// Provider API Keys
+const char OPEN_ROUTER_API_KEY[] = "QodeAssist.openRouterApiKey";
+const char OPEN_ROUTER_API_KEY_HISTORY[] = "QodeAssist.openRouterApiKeyHistory";
+const char OPEN_AI_COMPAT_API_KEY[] = "QodeAssist.openAiCompatApiKey";
+const char OPEN_AI_COMPAT_API_KEY_HISTORY[] = "QodeAssist.openAiCompatApiKeyHistory";
+const char CLAUDE_API_KEY[] = "QodeAssist.claudeApiKey";
+const char CLAUDE_API_KEY_HISTORY[] = "QodeAssist.claudeApiKeyHistory";
+const char OPEN_AI_API_KEY[] = "QodeAssist.openAiApiKey";
+const char OPEN_AI_API_KEY_HISTORY[] = "QodeAssist.openAiApiKeyHistory";
+
 // context settings
 const char CC_READ_FULL_FILE[] = "QodeAssist.ccReadFullFile";
 const char CC_READ_STRINGS_BEFORE_CURSOR[] = "QodeAssist.ccReadStringsBeforeCursor";
@@ -76,6 +99,8 @@ const char CC_READ_STRINGS_AFTER_CURSOR[] = "QodeAssist.ccReadStringsAfterCursor
 const char CC_USE_SYSTEM_PROMPT[] = "QodeAssist.ccUseSystemPrompt";
 const char CC_USE_FILE_PATH_IN_CONTEXT[] = "QodeAssist.ccUseFilePathInContext";
 const char CC_SYSTEM_PROMPT[] = "QodeAssist.ccSystemPrompt";
+const char CC_USE_USER_TEMPLATE[] = "QodeAssist.ccUseUserTemplate";
+const char CC_USER_TEMPLATE[] = "QodeAssist.ccUserTemplate";
 const char CC_USE_PROJECT_CHANGES_CACHE[] = "QodeAssist.ccUseProjectChangesCache";
 const char CC_MAX_CHANGES_CACHE_SIZE[] = "QodeAssist.ccMaxChangesCacheSize";
 const char CA_USE_SYSTEM_PROMPT[] = "QodeAssist.useChatSystemPrompt";

settings/SettingsTr.hpp

@@ -28,6 +28,7 @@ inline const char *ENABLE_QODE_ASSIST = QT_TRANSLATE_NOOP("QtC::QodeAssist", "En
 inline const char *GENERAL = QT_TRANSLATE_NOOP("QtC::QodeAssist", "General");
 inline const char *RESET_TO_DEFAULTS = QT_TRANSLATE_NOOP("QtC::QodeAssist",
                                                          "Reset Page to Defaults");
+inline const char *CHECK_UPDATE = QT_TRANSLATE_NOOP("QtC::QodeAssist", "Check Update");
 inline const char *SELECT = QT_TRANSLATE_NOOP("QtC::QodeAssist", "Select...");
 inline const char *PROVIDER = QT_TRANSLATE_NOOP("QtC::QodeAssist", "Provider:");
 inline const char *MODEL = QT_TRANSLATE_NOOP("QtC::QodeAssist", "Model:");
@@ -36,6 +37,9 @@ inline const char *URL = QT_TRANSLATE_NOOP("QtC::QodeAssist", "URL:");
 inline const char *STATUS = QT_TRANSLATE_NOOP("QtC::QodeAssist", "Status:");
 inline const char *TEST = QT_TRANSLATE_NOOP("QtC::QodeAssist", "Test");
 inline const char *ENABLE_LOG = QT_TRANSLATE_NOOP("QtC::QodeAssist", "Enable Logging");
+inline const char *ENABLE_CHECK_UPDATE_ON_START
+    = QT_TRANSLATE_NOOP("QtC::QodeAssist", "Check for updates when Qt Creator starts");
+
 inline const char *CODE_COMPLETION = QT_TRANSLATE_NOOP("QtC::QodeAssist", "Code Completion");
 inline const char *CHAT_ASSISTANT = QT_TRANSLATE_NOOP("QtC::QodeAssist", "Chat Assistant");
 inline const char *RESET_SETTINGS = QT_TRANSLATE_NOOP("QtC::QodeAssist", "Reset Settings");

settings/UpdateDialog.cpp

@@ -0,0 +1,174 @@
+/* 
+ * 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 "UpdateDialog.hpp"
+
+namespace QodeAssist {
+
+UpdateDialog::UpdateDialog(QWidget *parent)
+    : QDialog(parent)
+    , m_updater(new PluginUpdater(this))
+{
+    setWindowTitle(tr("QodeAssist Update"));
+    setMinimumWidth(400);
+    setMinimumHeight(500);
+
+    m_layout = new QVBoxLayout(this);
+    m_layout->setSpacing(12);
+
+    auto *supportLabel = new QLabel(
+        tr("QodeAssist is an open-source project that helps\n"
+           "developers write better code. If you find it useful, please"),
+        this);
+    supportLabel->setAlignment(Qt::AlignCenter);
+    m_layout->addWidget(supportLabel);
+
+    auto *supportLink = new QLabel(
+        tr("<a href='https://ko-fi.com/qodeassist' style='color: #0066cc;'>Support on Ko-fi "
+           "☕</a>"),
+        this);
+    supportLink->setOpenExternalLinks(true);
+    supportLink->setTextFormat(Qt::RichText);
+    supportLink->setAlignment(Qt::AlignCenter);
+    m_layout->addWidget(supportLink);
+
+    m_layout->addSpacing(20);
+
+    m_titleLabel = new QLabel(tr("A new version of QodeAssist is available!"), this);
+    m_titleLabel->setStyleSheet("font-weight: bold; font-size: 14px;");
+    m_titleLabel->setAlignment(Qt::AlignCenter);
+    m_layout->addWidget(m_titleLabel);
+
+    m_versionLabel = new QLabel(
+        tr("Version %1 is now available - you have %2").arg(m_updater->currentVersion()), this);
+    m_versionLabel->setAlignment(Qt::AlignCenter);
+    m_layout->addWidget(m_versionLabel);
+
+    if (!m_changelogLabel) {
+        m_changelogLabel = new QLabel(tr("Release Notes:"), this);
+        m_layout->addWidget(m_changelogLabel);
+
+        m_changelogText = new QTextEdit(this);
+        m_changelogText->setReadOnly(true);
+        m_changelogText->setMinimumHeight(100);
+        m_layout->addWidget(m_changelogText);
+    }
+
+    m_progress = new QProgressBar(this);
+    m_progress->setVisible(false);
+    m_layout->addWidget(m_progress);
+
+    auto *buttonLayout = new QHBoxLayout;
+    m_downloadButton = new QPushButton(tr("Download and Install"), this);
+    m_downloadButton->setEnabled(false);
+    buttonLayout->addWidget(m_downloadButton);
+
+    m_closeButton = new QPushButton(tr("Close"), this);
+    buttonLayout->addWidget(m_closeButton);
+
+    m_layout->addLayout(buttonLayout);
+
+    connect(m_updater, &PluginUpdater::updateCheckFinished, this, &UpdateDialog::handleUpdateInfo);
+    connect(m_updater, &PluginUpdater::downloadProgress, this, &UpdateDialog::updateProgress);
+    connect(m_updater, &PluginUpdater::downloadFinished, this, &UpdateDialog::handleDownloadFinished);
+    connect(m_updater, &PluginUpdater::downloadError, this, &UpdateDialog::handleDownloadError);
+
+    connect(m_downloadButton, &QPushButton::clicked, this, &UpdateDialog::startDownload);
+    connect(m_closeButton, &QPushButton::clicked, this, &QDialog::reject);
+
+    m_updater->checkForUpdates();
+}
+
+void UpdateDialog::checkForUpdatesAndShow(QWidget *parent)
+{
+    auto *dialog = new UpdateDialog(parent);
+    dialog->setAttribute(Qt::WA_DeleteOnClose);
+    dialog->show();
+}
+
+void UpdateDialog::handleUpdateInfo(const PluginUpdater::UpdateInfo &info)
+{
+    if (info.incompatibleIdeVersion) {
+        m_titleLabel->setText(tr("Incompatible Qt Creator Version"));
+        m_versionLabel->setText(tr("This update requires Qt Creator %1, current is %2.\n"
+                                   "Please upgrade Qt Creator to use this version of QodeAssist.")
+                                    .arg(info.targetIdeVersion, info.currentIdeVersion));
+        m_downloadButton->setEnabled(false);
+        return;
+    }
+
+    if (!info.isUpdateAvailable) {
+        m_titleLabel->setText(tr("QodeAssist is up to date"));
+        m_downloadButton->setEnabled(false);
+        return;
+    }
+
+    m_titleLabel->setText(tr("A new version of QodeAssist is available!"));
+    m_versionLabel->setText(tr("Version %1 is now available - you have %2")
+                                .arg(info.version, m_updater->currentVersion()));
+
+    if (!info.changeLog.isEmpty()) {
+        if (!m_changelogLabel) {
+            m_changelogLabel = new QLabel(tr("Release Notes:"), this);
+            m_layout->insertWidget(2, m_changelogLabel);
+
+            m_changelogText = new QTextEdit(this);
+            m_changelogText->setReadOnly(true);
+            m_changelogText->setMaximumHeight(200);
+            m_layout->insertWidget(3, m_changelogText);
+        }
+        m_changelogText->setText(info.changeLog);
+    }
+
+    m_downloadButton->setEnabled(true);
+    m_updateInfo = info;
+}
+
+void UpdateDialog::startDownload()
+{
+    m_downloadButton->setEnabled(false);
+    m_progress->setVisible(true);
+    m_updater->downloadUpdate(m_updateInfo.downloadUrl);
+}
+
+void UpdateDialog::updateProgress(qint64 received, qint64 total)
+{
+    m_progress->setMaximum(total);
+    m_progress->setValue(received);
+}
+
+void UpdateDialog::handleDownloadFinished(const QString &path)
+{
+    m_progress->setVisible(false);
+    QMessageBox::information(
+        this,
+        tr("Update Successful"),
+        tr("Update has been downloaded and installed. "
+           "Please restart Qt Creator to apply changes."));
+    accept();
+}
+
+void UpdateDialog::handleDownloadError(const QString &error)
+{
+    m_progress->setVisible(false);
+    m_downloadButton->setEnabled(true);
+    QMessageBox::critical(this, tr("Update Error"), tr("Failed to update: %1").arg(error));
+}
+
+} // namespace QodeAssist

settings/UpdateDialog.hpp

@@ -0,0 +1,63 @@
+/* 
+ * 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 <QDialog>
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QMessageBox>
+#include <QProgressBar>
+#include <QPushButton>
+#include <QTextEdit>
+#include <QVBoxLayout>
+
+#include "PluginUpdater.hpp"
+
+namespace QodeAssist {
+
+class UpdateDialog : public QDialog
+{
+    Q_OBJECT
+public:
+    explicit UpdateDialog(QWidget *parent = nullptr);
+
+    static void checkForUpdatesAndShow(QWidget *parent = nullptr);
+
+private slots:
+    void handleUpdateInfo(const PluginUpdater::UpdateInfo &info);
+    void startDownload();
+    void updateProgress(qint64 received, qint64 total);
+    void handleDownloadFinished(const QString &path);
+    void handleDownloadError(const QString &error);
+
+private:
+    PluginUpdater *m_updater;
+    QVBoxLayout *m_layout;
+    QLabel *m_titleLabel;
+    QLabel *m_versionLabel;
+    QLabel *m_changelogLabel{nullptr};
+    QTextEdit *m_changelogText{nullptr};
+    QProgressBar *m_progress;
+    QPushButton *m_downloadButton;
+    QPushButton *m_closeButton;
+    PluginUpdater::UpdateInfo m_updateInfo;
+};
+
+} // namespace QodeAssist

templates/Claude.hpp

@@ -0,0 +1,39 @@
+/* 
+ * 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 "llmcore/PromptTemplate.hpp"
+
+namespace QodeAssist::Templates {
+
+class Claude : public LLMCore::PromptTemplate
+{
+public:
+    LLMCore::TemplateType type() const override { return LLMCore::TemplateType::Chat; }
+    QString name() const override { return "Claude"; }
+    QString promptTemplate() const override { return {}; }
+    QStringList stopWords() const override { return QStringList(); }
+    void prepareRequest(QJsonObject &request, const LLMCore::ContextData &context) const override {}
+    QString description() const override { return "Claude"; }
+};
+
+} // namespace QodeAssist::Templates

templates/Ollama.hpp

@@ -50,14 +50,6 @@ public:
 
     void prepareRequest(QJsonObject &request, const LLMCore::ContextData &context) const override
     {
-        QJsonArray messages = request["messages"].toArray();
-
-        QJsonObject newMessage;
-        newMessage["role"] = "user";
-        newMessage["content"] = context.prefix;
-        messages.append(newMessage);
-
-        request["messages"] = messages;
     }
     QString description() const override { return "template will take from ollama modelfile"; }
 };

templates/OpenAI.hpp

@@ -0,0 +1,39 @@
+/* 
+ * 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 "llmcore/PromptTemplate.hpp"
+
+namespace QodeAssist::Templates {
+
+class OpenAI : public LLMCore::PromptTemplate
+{
+public:
+    LLMCore::TemplateType type() const override { return LLMCore::TemplateType::Chat; }
+    QString name() const override { return "OpenAI"; }
+    QString promptTemplate() const override { return {}; }
+    QStringList stopWords() const override { return QStringList(); }
+    void prepareRequest(QJsonObject &request, const LLMCore::ContextData &context) const override {}
+    QString description() const override { return "OpenAI"; }
+};
+
+} // namespace QodeAssist::Templates

templates/Templates.hpp

@@ -23,12 +23,14 @@
 #include "templates/Alpaca.hpp"
 #include "templates/BasicChat.hpp"
 #include "templates/ChatML.hpp"
+#include "templates/Claude.hpp"
 #include "templates/CodeLlamaFim.hpp"
 #include "templates/CustomFimTemplate.hpp"
 #include "templates/DeepSeekCoderFim.hpp"
 #include "templates/Llama2.hpp"
 #include "templates/Llama3.hpp"
 #include "templates/Ollama.hpp"
+#include "templates/OpenAI.hpp"
 #include "templates/Qwen.hpp"
 #include "templates/StarCoder2Fim.hpp"
 
@@ -49,6 +51,8 @@ inline void registerTemplates()
     templateManager.registerTemplate<ChatML>();
     templateManager.registerTemplate<Alpaca>();
     templateManager.registerTemplate<Llama2>();
+    templateManager.registerTemplate<Claude>();
+    templateManager.registerTemplate<OpenAI>();
 }
 
 } // namespace QodeAssist::Templates