chore: Upgrade plugin to 0.4.12

- Add button to show chat history folder in system viewer

.github/workflows/build_cmake.yml

@@ -13,8 +13,8 @@ on:
 env:
   PLUGIN_NAME: QodeAssist
   QT_VERSION: 6.8.1
-  QT_CREATOR_VERSION: 15.0.0
-  QT_CREATOR_VERSION_INTERNAL: 15.0.0
+  QT_CREATOR_VERSION: 15.0.1
+  QT_CREATOR_VERSION_INTERNAL: 15.0.1
   MACOS_DEPLOYMENT_TARGET: "11.0"
   CMAKE_VERSION: "3.29.6"
   NINJA_VERSION: "1.12.1"
@@ -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

@@ -55,6 +55,7 @@ add_qtc_plugin(QodeAssist
     templates/Llama2.hpp
     templates/Claude.hpp
     templates/OpenAI.hpp
+    templates/CodeLlamaQMLFim.hpp
     providers/Providers.hpp
     providers/OllamaProvider.hpp providers/OllamaProvider.cpp
     providers/LMStudioProvider.hpp providers/LMStudioProvider.cpp

ChatView/CMakeLists.txt

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

ChatView/ChatModel.cpp

@@ -28,7 +28,6 @@ namespace QodeAssist::Chat {
 
 ChatModel::ChatModel(QObject *parent)
     : QAbstractListModel(parent)
-    , m_totalTokens(0)
 {
     auto &settings = Settings::chatAssistantSettings();
 
@@ -90,26 +89,19 @@ void ChatModel::addMessage(
                                .arg(attachment.filename, attachment.content);
         }
     }
-    int tokenCount = estimateTokenCount(fullContent);
 
     if (!m_messages.isEmpty() && !id.isEmpty() && m_messages.last().id == id) {
         Message &lastMessage = m_messages.last();
-        int oldTokenCount = lastMessage.tokenCount;
         lastMessage.content = content;
         lastMessage.attachments = attachments;
-        lastMessage.tokenCount = tokenCount;
-        m_totalTokens += (tokenCount - oldTokenCount);
         emit dataChanged(index(m_messages.size() - 1), index(m_messages.size() - 1));
     } else {
         beginInsertRows(QModelIndex(), m_messages.size(), m_messages.size());
-        Message newMessage{role, content, tokenCount, id};
+        Message newMessage{role, content, id};
         newMessage.attachments = attachments;
         m_messages.append(newMessage);
-        m_totalTokens += tokenCount;
         endInsertRows();
     }
-
-    emit totalTokensChanged();
 }
 
 QVector<ChatModel::Message> ChatModel::getChatHistory() const
@@ -117,18 +109,11 @@ QVector<ChatModel::Message> ChatModel::getChatHistory() const
     return m_messages;
 }
 
-int ChatModel::estimateTokenCount(const QString &text) const
-{
-    return text.length() / 4;
-}
-
 void ChatModel::clear()
 {
     beginResetModel();
     m_messages.clear();
-    m_totalTokens = 0;
     endResetModel();
-    emit totalTokensChanged();
     emit modelReseted();
 }
 
@@ -199,11 +184,6 @@ QJsonArray ChatModel::prepareMessagesForRequest(const QString &systemPrompt) con
     return messages;
 }
 
-int ChatModel::totalTokens() const
-{
-    return m_totalTokens;
-}
-
 int ChatModel::tokensThreshold() const
 {
     auto &settings = Settings::chatAssistantSettings();

ChatView/ChatModel.hpp

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

ChatView/ChatRootView.cpp

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

ChatView/ChatRootView.hpp

@@ -23,6 +23,7 @@
 
 #include "ChatModel.hpp"
 #include "ClientInterface.hpp"
+#include <coreplugin/editormanager/editormanager.h>
 
 namespace QodeAssist::Chat {
 
@@ -31,9 +32,11 @@ class ChatRootView : public QQuickItem
     Q_OBJECT
     Q_PROPERTY(QodeAssist::Chat::ChatModel *chatModel READ chatModel NOTIFY chatModelChanged FINAL)
     Q_PROPERTY(QString currentTemplate READ currentTemplate NOTIFY currentTemplateChanged FINAL)
-    Q_PROPERTY(bool isSharingCurrentFile READ isSharingCurrentFile NOTIFY
-                   isSharingCurrentFileChanged FINAL)
-    Q_PROPERTY(QStringList attachmentFiles MEMBER m_attachmentFiles NOTIFY attachmentFilesChanged)
+    Q_PROPERTY(bool isSyncOpenFiles READ isSyncOpenFiles NOTIFY isSyncOpenFilesChanged FINAL)
+    Q_PROPERTY(QStringList attachmentFiles READ attachmentFiles NOTIFY attachmentFilesChanged FINAL)
+    Q_PROPERTY(QStringList linkedFiles READ linkedFiles NOTIFY linkedFilesChanged FINAL)
+    Q_PROPERTY(int inputTokensCount READ inputTokensCount NOTIFY inputTokensCountChanged FINAL)
+    Q_PROPERTY(QString chatFileName READ chatFileName NOTIFY chatFileNameChanged FINAL)
 
     QML_ELEMENT
 
@@ -43,8 +46,6 @@ public:
     ChatModel *chatModel() const;
     QString currentTemplate() const;
 
-    bool isSharingCurrentFile() const;
-
     void saveHistory(const QString &filePath);
     void loadHistory(const QString &filePath);
 
@@ -54,19 +55,44 @@ public:
     void autosave();
     QString getAutosaveFilePath() const;
 
+    QStringList attachmentFiles() const;
+    QStringList linkedFiles() const;
+
     Q_INVOKABLE void showAttachFilesDialog();
+    Q_INVOKABLE void removeFileFromAttachList(int index);
+    Q_INVOKABLE void showLinkFilesDialog();
+    Q_INVOKABLE void removeFileFromLinkList(int index);
+    Q_INVOKABLE void calculateMessageTokensCount(const QString &message);
+    Q_INVOKABLE void setIsSyncOpenFiles(bool state);
+    Q_INVOKABLE void openChatHistoryFolder();
+
+    Q_INVOKABLE void updateInputTokensCount();
+    int inputTokensCount() const;
+
+    bool isSyncOpenFiles() const;
+
+    void onEditorAboutToClose(Core::IEditor *editor);
+    void onAppendLinkFileFromEditor(Core::IEditor *editor);
+    void onEditorCreated(Core::IEditor *editor, const Utils::FilePath &filePath);
+
+    QString chatFileName() const;
+    void setRecentFilePath(const QString &filePath);
 
 public slots:
-    void sendMessage(const QString &message, bool sharingCurrentFile = false);
+    void sendMessage(const QString &message);
     void copyToClipboard(const QString &text);
     void cancelRequest();
     void clearAttachmentFiles();
+    void clearLinkedFiles();
 
 signals:
     void chatModelChanged();
     void currentTemplateChanged();
-    void isSharingCurrentFileChanged();
     void attachmentFilesChanged();
+    void linkedFilesChanged();
+    void inputTokensCountChanged();
+    void isSyncOpenFilesChanged();
+    void chatFileNameChanged();
 
 private:
     QString getChatsHistoryDir() const;
@@ -77,6 +103,11 @@ private:
     QString m_currentTemplate;
     QString m_recentFilePath;
     QStringList m_attachmentFiles;
+    QStringList m_linkedFiles;
+    int m_messageTokensCount{0};
+    int m_inputTokensCount{0};
+    bool m_isSyncOpenFiles;
+    QList<Core::IEditor *> m_currentEditors;
 };
 
 } // namespace QodeAssist::Chat

ChatView/ChatSerializer.cpp

@@ -82,7 +82,6 @@ QJsonObject ChatSerializer::serializeMessage(const ChatModel::Message &message)
     QJsonObject messageObj;
     messageObj["role"] = static_cast<int>(message.role);
     messageObj["content"] = message.content;
-    messageObj["tokenCount"] = message.tokenCount;
     messageObj["id"] = message.id;
     return messageObj;
 }
@@ -92,7 +91,6 @@ ChatModel::Message ChatSerializer::deserializeMessage(const QJsonObject &json)
     ChatModel::Message message;
     message.role = static_cast<ChatModel::ChatRole>(json["role"].toInt());
     message.content = json["content"].toString();
-    message.tokenCount = json["tokenCount"].toInt();
     message.id = json["id"].toString();
     return message;
 }
@@ -107,7 +105,6 @@ QJsonObject ChatSerializer::serializeChat(const ChatModel *model)
     QJsonObject root;
     root["version"] = VERSION;
     root["messages"] = messagesArray;
-    root["totalTokens"] = model->totalTokens();
 
     return root;
 }

ChatView/ClientInterface.cpp

@@ -66,7 +66,7 @@ ClientInterface::ClientInterface(ChatModel *chatModel, QObject *parent)
 ClientInterface::~ClientInterface() = default;
 
 void ClientInterface::sendMessage(
-    const QString &message, const QList<QString> &attachments, bool includeCurrentFile)
+    const QString &message, const QList<QString> &attachments, const QList<QString> &linkedFiles)
 {
     cancelRequest();
 
@@ -100,11 +100,8 @@ void ClientInterface::sendMessage(
     if (chatAssistantSettings.useSystemPrompt())
         systemPrompt = chatAssistantSettings.systemPrompt();
 
-    if (includeCurrentFile) {
-        QString fileContext = getCurrentFileContext();
-        if (!fileContext.isEmpty()) {
-            systemPrompt = systemPrompt.append(fileContext);
-        }
+    if (!linkedFiles.isEmpty()) {
+        systemPrompt = getSystemPromptWithLinkedFiles(systemPrompt, linkedFiles);
     }
 
     QJsonObject providerRequest;
@@ -198,4 +195,21 @@ QString ClientInterface::getCurrentFileContext() const
     return QString("Current file context:\n%1\nFile content:\n%2").arg(fileInfo, content);
 }
 
+QString ClientInterface::getSystemPromptWithLinkedFiles(const QString &basePrompt, const QList<QString> &linkedFiles) const
+{
+    QString updatedPrompt = basePrompt;
+
+    if (!linkedFiles.isEmpty()) {
+        updatedPrompt += "\n\nLinked files for reference:\n";
+
+        auto contentFiles = Context::ContextManager::instance().getContentFiles(linkedFiles);
+        for (const auto &file : contentFiles) {
+            updatedPrompt += QString("\nFile: %1\nContent:\n%2\n")
+            .arg(file.filename, file.content);
+        }
+    }
+
+    return updatedPrompt;
+}
+
 } // namespace QodeAssist::Chat

ChatView/ClientInterface.hpp

@@ -39,7 +39,7 @@ public:
     void sendMessage(
         const QString &message,
         const QList<QString> &attachments = {},
-        bool includeCurrentFile = false);
+        const QList<QString> &linkedFiles = {});
     void clearMessages();
     void cancelRequest();
 
@@ -50,6 +50,9 @@ signals:
 private:
     void handleLLMResponse(const QString &response, const QJsonObject &request, bool isComplete);
     QString getCurrentFileContext() const;
+    QString getSystemPromptWithLinkedFiles(
+        const QString &basePrompt,
+        const QList<QString> &linkedFiles) const;
 
     LLMCore::RequestHandler *m_requestHandler;
     ChatModel *m_chatModel;

ChatView/icons/attach-file-dark.svg

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

ChatView/icons/attach-file-light.svg

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

ChatView/icons/link-file-dark.svg

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

ChatView/icons/link-file-light.svg

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

ChatView/qml/RootItem.qml

@@ -70,8 +70,12 @@ ChatRootView {
             loadButton.onClicked: root.showLoadDialog()
             clearButton.onClicked: root.clearChat()
             tokensBadge {
-                text: qsTr("tokens:%1/%2").arg(root.chatModel.totalTokens).arg(root.chatModel.tokensThreshold)
+                text: qsTr("tokens:%1/%2").arg(root.inputTokensCount).arg(root.chatModel.tokensThreshold)
             }
+            recentPath {
+                text: qsTr("Latest chat file name: %1").arg(root.chatFileName.length > 0 ? root.chatFileName : "Unsaved")
+            }
+            openChatHistory.onClicked: root.openChatHistoryFolder()
         }
 
         ListView {
@@ -101,7 +105,7 @@ ChatRootView {
                 height: 30
             }
 
-            ScrollBar.vertical: ScrollBar {
+            ScrollBar.vertical: QQC.ScrollBar {
                 id: scroll
             }
 
@@ -147,6 +151,8 @@ ChatRootView {
                     }
                 }
 
+                onTextChanged: root.calculateMessageTokensCount(messageInput.text)
+
                 Keys.onPressed: function(event) {
                     if ((event.key === Qt.Key_Return || event.key === Qt.Key_Enter) && !(event.modifiers & Qt.ShiftModifier)) {
                         root.sendChatMessage()
@@ -161,6 +167,21 @@ ChatRootView {
 
             Layout.fillWidth: true
             attachedFilesModel: root.attachmentFiles
+            iconPath: palette.window.hslLightness > 0.5 ? "qrc:/qt/qml/ChatView/icons/attach-file-dark.svg"
+                                                        : "qrc:/qt/qml/ChatView/icons/attach-file-light.svg"
+            accentColor: Qt.tint(palette.mid, Qt.rgba(0, 0.8, 0.3, 0.4))
+            onRemoveFileFromListByIndex: (index) => root.removeFileFromAttachList(index)
+        }
+
+        AttachedFilesPlace {
+            id: linkedFilesPlace
+
+            Layout.fillWidth: true
+            attachedFilesModel: root.linkedFiles
+            iconPath: palette.window.hslLightness > 0.5 ? "qrc:/qt/qml/ChatView/icons/link-file-dark.svg"
+                                                        : "qrc:/qt/qml/ChatView/icons/link-file-light.svg"
+            accentColor: Qt.tint(palette.mid, Qt.rgba(0, 0.3, 0.8, 0.4))
+            onRemoveFileFromListByIndex: (index) => root.removeFileFromLinkList(index)
         }
 
         BottomBar {
@@ -171,13 +192,19 @@ ChatRootView {
 
             sendButton.onClicked: root.sendChatMessage()
             stopButton.onClicked: root.cancelRequest()
-            sharingCurrentFile.checked: root.isSharingCurrentFile
+            syncOpenFiles {
+                checked: root.isSyncOpenFiles
+                onCheckedChanged: root.setIsSyncOpenFiles(bottomBar.syncOpenFiles.checked)
+            }
             attachFiles.onClicked: root.showAttachFilesDialog()
+            linkFiles.onClicked: root.showLinkFilesDialog()
         }
     }
 
     function clearChat() {
         root.chatModel.clear()
+        root.clearAttachmentFiles()
+        root.updateInputTokensCount()
     }
 
     function scrollToBottom() {
@@ -185,7 +212,7 @@ ChatRootView {
     }
 
     function sendChatMessage() {
-        root.sendMessage(messageInput.text, bottomBar.sharingCurrentFile.checked)
+        root.sendMessage(messageInput.text)
         messageInput.text = ""
         scrollToBottom()
     }

ChatView/qml/parts/AttachedFilesPlace.qml

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

ChatView/qml/parts/BottomBar.qml

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

ChatView/qml/parts/TopBar.qml

@@ -28,6 +28,8 @@ Rectangle {
     property alias loadButton: loadButtonId
     property alias clearButton: clearButtonId
     property alias tokensBadge: tokensBadgeId
+    property alias recentPath: recentPathId
+    property alias openChatHistory: openChatHistoryId
 
     color: palette.window.hslLightness > 0.5 ?
                Qt.darker(palette.window, 1.1) :
@@ -62,6 +64,19 @@ Rectangle {
             text: qsTr("Clear")
         }
 
+        Text {
+            id: recentPathId
+
+            elide: Text.ElideMiddle
+            color: palette.text
+        }
+
+        QoAButton {
+            id: openChatHistoryId
+
+            text: qsTr("Show in system")
+        }
+
         Item {
             Layout.fillWidth: true
         }

QodeAssist.json.in

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

README.md

@@ -2,7 +2,7 @@
 [![Build plugin](https://github.com/Palm1r/QodeAssist/actions/workflows/build_cmake.yml/badge.svg?branch=main)](https://github.com/Palm1r/QodeAssist/actions/workflows/build_cmake.yml)
 ![GitHub Downloads (all assets, all releases)](https://img.shields.io/github/downloads/Palm1r/QodeAssist/total?color=41%2C173%2C71)
 ![GitHub Tag](https://img.shields.io/github/v/tag/Palm1r/QodeAssist)
-![Static Badge](https://img.shields.io/badge/QtCreator-15.0.0-brightgreen)
+![Static Badge](https://img.shields.io/badge/QtCreator-15.0.1-brightgreen)
 ![Static Badge](https://img.shields.io/badge/donations:0-brightgreen)
 
 ![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.
@@ -13,29 +13,45 @@
 > - The QodeAssist developer bears no responsibility for any charges incurred
 > - Please carefully review the provider's pricing and your account settings before use
 
+⚠️ **Commercial Support and Custom Development**
+> The QodeAssist developer offers commercial services for:
+> - Adapting the plugin for specific Qt Creator versions
+> - Custom development for particular operating systems
+> - Integration with specific language models
+> - Implementing custom features and modifications
+>
+> For commercial inquiries, please contact: qodeassist.dev@pm.me
+
 ## Table of Contents
 1. [Overview](#overview)
-2. [Installation for using Ollama](#installation-for-using-Ollama)
-3. [Installation for using Claude](#installation-for-using-Claude)
-3. [Configure Plugin](#configure-plugin)
-4. [Supported LLM Providers](#supported-llm-providers)
-5. [Recommended Models](#recommended-models)
-   - [Ollama](#ollama)
-6. [QtCreator Version Compatibility](#qtcreator-version-compatibility)
-7. [Development Progress](#development-progress)
-8. [Hotkeys](#hotkeys)
-9. [Troubleshooting](#troubleshooting)
-10. [Support the Development](#support-the-development-of-qodeassist)
-11. [How to Build](#how-to-build)
+2. [Install plugin to QtCreator](#install-plugin-to-qtcreator)
+3. [Configure for Anthropic Claude](#configure-for-anthropic-claude)
+4. [Configure for OpenAI](#configure-for-openai)
+5. [Configure for using Ollama](#configure-for-using-ollama)
+6. [System Prompt Configuration](#system-prompt-configuration)
+7. [File Context Features](#file-context-features)
+8. [Template-Model Compatibility](#template-model-compatibility)
+9. [QtCreator Version Compatibility](#qtcreator-version-compatibility)
+10. [Development Progress](#development-progress)
+11. [Hotkeys](#hotkeys)
+12. [Troubleshooting](#troubleshooting)
+13. [Support the Development](#support-the-development-of-qodeassist)
+14. [How to Build](#how-to-build)
 
 ## Overview
 
 - AI-powered code completion
 - Chat functionality:
   - Side and Bottom panels
+  - Chat history autosave and restore
+  - Token usage monitoring and management
+  - Attach files for one-time code analysis
+  - Link files for persistent context with auto update in conversations
+  - Automatic syncing with open editor files (optional)
 - Support for multiple LLM providers:
   - Ollama
-  - Claude
+  - OpenAI
+  - Anthropic Claude
   - LM Studio
   - OpenAI-compatible providers(eg. https://openrouter.ai)
 - Extensive library of model-specific templates
@@ -62,11 +78,52 @@
   <img width="326" alt="QodeAssistBottomPanel" src="https://github.com/user-attachments/assets/4cc64c23-a294-4df8-9153-39ad6fdab34b">
 </details>
 
-## Installation for using Ollama
+<details>
+  <summary>Automatic syncing with open editor files: (click to expand)</summary>
+  <img width="600" alt="OpenedDocumentsSync" src="https://github.com/user-attachments/assets/08efda2f-dc4d-44c3-927c-e6a975090d2f">
+</details>
 
-1. Install Latest QtCreator
-2. Install [Ollama](https://ollama.com). Make sure to review the system requirements before installation.
-3. Install a language models in Ollama via terminal. For example, you can run:
+## Install plugin to QtCreator
+1. Install Latest Qt Creator
+2. Download the QodeAssist plugin for your Qt Creator
+   - Remove old version plugin if already was installed
+3. Launch Qt Creator and install the plugin:
+   - Go to: 
+     - MacOS: Qt Creator -> About Plugins...
+     - Windows\Linux: Help -> About Plugins...
+   - Click on "Install Plugin..."
+   - Select the downloaded QodeAssist plugin archive file
+
+## Configure for Anthropic Claude
+1. Open Qt Creator settings and navigate to the QodeAssist section
+2. Go to Provider Settings tab and configure Claude api key
+3. Return to General tab and configure:
+   - Set "Claude" as the provider for code completion or/and chat assistant
+   - Set the Claude URL (https://api.anthropic.com)
+   - Select your preferred model (e.g., claude-3-5-sonnet-20241022)
+   - Choose the Claude template for code completion or/and chat
+<details>
+  <summary>Example of Claude settings: (click to expand)</summary>
+<img width="823" alt="Claude Settings" src="https://github.com/user-attachments/assets/828e09ea-e271-4a7a-8271-d3d5dd5c13fd" />
+</details>
+
+## Configure for OpenAI
+1. Open Qt Creator settings and navigate to the QodeAssist section
+2. Go to Provider Settings tab and configure OpenAI api key
+3. Return to General tab and configure:
+   - Set "OpenAI" as the provider for code completion or/and chat assistant
+   - Set the OpenAI URL (https://api.openai.com)
+   - Select your preferred model (e.g., gpt-4o)
+   - Choose the OpenAI template for code completion or/and chat
+<details>
+  <summary>Example of OpenAI settings: (click to expand)</summary>
+  <img width="829" alt="OpenAI Settings" src="https://github.com/user-attachments/assets/4716f790-6159-44d0-a8f4-565ccb6eb713" />
+</details>
+
+## Configure for 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):
 ```
@@ -80,31 +137,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
-
-## Installation for using Claude
-
-1. Install Latest QtCreator
-2. Download the QodeAssist plugin for your QtCreator.
-3. Launch Qt Creator and install the plugin:
-   - Go to MacOS: Qt Creator -> About Plugins...
-           Windows\Linux: Help -> About Plugins...
-   - Click on "Install Plugin..."
-   - Select the downloaded QodeAssist plugin archive file
-4. Select Claude provider
-5. Select Claude api
-6. Fill in api key for Claude
-5. Select Claude templates for code completion and chat
-6. Enjoy!
-
-## Configure Plugin
-
-QodeAssist comes with default settings that should work immediately after installing a language model. The plugin is pre-configured to use Ollama with standard templates, so you may only need to verify the settings.
 
 1. Open Qt Creator settings (Edit > Preferences on Linux/Windows, Qt Creator > Preferences on macOS)
 2. Navigate to the "Qode Assist" tab
@@ -112,75 +144,72 @@ 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
+## File Context Features
 
-### Model Types
+QodeAssist provides two powerful ways to include source code files in your chat conversations: Attachments and Linked Files. Each serves a distinct purpose and helps provide better context for the AI assistant.
 
-FIM models (codellama:7b-code, starcoder2:7b, etc.) - Optimized for code completion and suggestions
+### Attached Files
 
-Instruct models (codellama:7b-instruct, starcoder2:instruct, etc.) - Better for chat assistance, explanations, and code review
+Attachments are designed for one-time code analysis and specific queries:
+  - Files are included only in the current message
+  - Content is discarded after the message is processed
+  - Ideal for:
+    - Getting specific feedback on code changes
+    - Code review requests
+    - Analyzing isolated code segments
+    - Quick implementation questions
+  - Files can be attached using the paperclip icon in the chat interface
+  - Multiple files can be attached to a single message
 
-For best results, use FIM models with code completion and Instruct models with chat features.
+### Linked Files
 
-### Ollama:
-### For autocomplete(FIM)
-```
-ollama run codellama:7b-code
-ollama run starcoder2:7b
-ollama run qwen2.5-coder:7b-base
-ollama run deepseek-coder-v2:16b-lite-base-q3_K_M
-```
-### For chat and instruct
-```
-ollama run codellama:7b-instruct
-ollama run starcoder2:instruct
-ollama run qwen2.5-coder:7b-instruct
-ollama run deepseek-coder-v2
-```
+Linked files provide persistent context throughout the conversation:
 
-### Template-Model Compatibility
+  - Files remain accessible for the entire chat session
+  - Content is included in every message exchange
+  - Files are automatically refreshed - always using latest content from disk
+  - Perfect for:
+    - Long-term refactoring discussions
+    - Complex architectural changes
+    - Multi-file implementations
+    - Maintaining context across related questions
+  - Can be managed using the link icon in the chat interface
+  - Supports automatic syncing with open editor files (can be enabled in settings)
+  - Files can be added/removed at any time during the conversation
+
+## Template-Model Compatibility
 
 | Template | Compatible Models | Purpose |
 |----------|------------------|----------|
 | CodeLlama FIM | `codellama:code` | Code completion |
 | DeepSeekCoder FIM | `deepseek-coder-v2`, `deepseek-v2.5` | Code completion |
-| Ollama Auto FIM | `Any Ollama base model` | Code completion |
-| Qwen FIM | `Qwen 2.5 models` | Code completion |
+| Ollama Auto FIM | `Any Ollama base/fim models` | Code completion |
+| Qwen FIM | `Qwen 2.5 models(exclude instruct)` | Code completion |
 | StarCoder2 FIM | `starcoder2 base model` | Code completion |
 | Alpaca | `starcoder2:instruct` | Chat assistance |
 | Basic Chat| `Messages without tokens` | Chat assistance |
-| ChatML | `Qwen 2.5 models` | Chat assistance |
+| ChatML | `Qwen 2.5 models(exclude base models)` | Chat assistance |
 | Llama2 | `llama2 model family`, `codellama:instruct` | Chat assistance |
 | Llama3 | `llama3 model family` | Chat assistance |
-| Ollama Auto Chat | `Any Ollama chat model` | Chat assistance |
-
-> Note: 
-> - FIM (Fill-in-Middle) templates are optimized for code completion
-> - Chat templates are designed for interactive dialogue
-> - The Ollama Auto templates automatically adapt to most Ollama models
-> - Custom Template allows you to define your own prompt format
+| Ollama Auto Chat | `Any Ollama chat/instruct models` | Chat assistance |
 
 ## QtCreator Version Compatibility
 
-- QtCreator 15.0.0 - 0.4.x 
+- QtCreator 15.0.1 - 0.4.8 - 0.4.x
+- QtCreator 15.0.0 - 0.4.0 - 0.4.7 
 - QtCreator 14.0.2 - 0.2.3 - 0.3.x 
 - QtCreator 14.0.1 - 0.2.2 plugin version and below
 

context/CMakeLists.txt

@@ -3,6 +3,7 @@ add_library(Context STATIC
     ChangesManager.h ChangesManager.cpp
     ContextManager.hpp ContextManager.cpp
     ContentFile.hpp
+    TokenUtils.hpp TokenUtils.cpp
 )
 
 target_link_libraries(Context

context/TokenUtils.cpp

@@ -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/>.
+ */
+
+#include "TokenUtils.hpp"
+
+namespace QodeAssist::Context {
+
+int TokenUtils::estimateTokens(const QString& text)
+{
+    if (text.isEmpty()) {
+        return 0;
+    }
+
+    // TODO: need to improve
+    return text.length() / 4;
+}
+
+int TokenUtils::estimateFileTokens(const Context::ContentFile& file)
+{
+    int total = 0;
+
+    total += estimateTokens(file.filename);
+    total += estimateTokens(file.content);
+    total += 5;
+
+    return total;
+}
+
+int TokenUtils::estimateFilesTokens(const QList<Context::ContentFile>& files)
+{
+    int total = 0;
+    for (const auto& file : files) {
+        total += estimateFileTokens(file);
+    }
+    return total;
+}
+
+}

context/TokenUtils.hpp

@@ -0,0 +1,36 @@
+/*
+ * 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 <QString>
+#include "ContentFile.hpp"
+#include <QList>
+
+namespace QodeAssist::Context {
+
+class TokenUtils
+{
+public:
+    static int estimateTokens(const QString& text);
+    static int estimateFileTokens(const Context::ContentFile& file);
+    static int estimateFilesTokens(const QList<Context::ContentFile>& files);
+};
+
+}

qodeassist.cpp

@@ -155,7 +155,9 @@ private:
 
     void handleUpdateCheckResult(const PluginUpdater::UpdateInfo &info)
     {
-        if (!info.isUpdateAvailable)
+        if (!info.isUpdateAvailable
+            || QVersionNumber::fromString(info.currentIdeVersion)
+                   > QVersionNumber::fromString(info.targetIdeVersion))
             return;
 
         if (m_statusWidget)

settings/ChatAssistantSettings.cpp

@@ -44,15 +44,15 @@ ChatAssistantSettings::ChatAssistantSettings()
 
     // Chat Settings
     chatTokensThreshold.setSettingsKey(Constants::CA_TOKENS_THRESHOLD);
-    chatTokensThreshold.setLabelText(Tr::tr("Chat History Token Limit:"));
+    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(1, 900000);
     chatTokensThreshold.setDefaultValue(8000);
 
-    sharingCurrentFile.setSettingsKey(Constants::CA_SHARING_CURRENT_FILE);
-    sharingCurrentFile.setLabelText(Tr::tr("Share Current File With Assistant by Default"));
-    sharingCurrentFile.setDefaultValue(true);
+    linkOpenFiles.setSettingsKey(Constants::CA_LINK_OPEN_FILES);
+    linkOpenFiles.setLabelText(Tr::tr("Sync open files with assistant by default"));
+    linkOpenFiles.setDefaultValue(false);
 
     stream.setSettingsKey(Constants::CA_STREAM);
     stream.setDefaultValue(true);
@@ -171,7 +171,7 @@ ChatAssistantSettings::ChatAssistantSettings()
             Space{8},
             Group{
                 title(Tr::tr("Chat Settings")),
-                Column{Row{chatTokensThreshold, Stretch{1}}, sharingCurrentFile, stream, autosave}},
+                Column{Row{chatTokensThreshold, Stretch{1}}, linkOpenFiles, stream, autosave}},
             Space{8},
             Group{
                 title(Tr::tr("General Parameters")),
@@ -227,6 +227,7 @@ void ChatAssistantSettings::resetSettingsToDefaults()
         resetAspect(systemPrompt);
         resetAspect(ollamaLivetime);
         resetAspect(contextWindow);
+        resetAspect(linkOpenFiles);
     }
 }
 

settings/ChatAssistantSettings.hpp

@@ -34,7 +34,7 @@ public:
 
     // Chat settings
     Utils::IntegerAspect chatTokensThreshold{this};
-    Utils::BoolAspect sharingCurrentFile{this};
+    Utils::BoolAspect linkOpenFiles{this};
     Utils::BoolAspect stream{this};
     Utils::BoolAspect autosave{this};
 

settings/CodeCompletionSettings.cpp

@@ -153,16 +153,16 @@ CodeCompletionSettings::CodeCompletionSettings()
     systemPrompt.setDisplayStyle(Utils::StringAspect::TextEditDisplay);
     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."
+        "suggestions that seamlessly integrate with existing code. Do not repeat code from position "
+        "before or after <cursor>. You will receive a code context with specified insertion points. "
+        "Your goal is to complete only one code block."
         "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.");
+        "your code suggestion.");
 
     useUserMessageTemplateForCC.setSettingsKey(Constants::CC_USE_USER_TEMPLATE);
     useUserMessageTemplateForCC.setDefaultValue(true);
@@ -310,6 +310,7 @@ void CodeCompletionSettings::resetSettingsToDefaults()
         resetAspect(autoCompletion);
         resetAspect(multiLineCompletion);
         resetAspect(stream);
+        resetAspect(smartProcessInstuctText);
         resetAspect(temperature);
         resetAspect(maxTokens);
         resetAspect(useTopP);

settings/PluginUpdater.cpp

@@ -90,7 +90,7 @@ void PluginUpdater::handleUpdateResponse(QNetworkReply *reply)
 #elif defined(Q_OS_MACOS)
             if (name.contains("macOS"))
 #else
-            if (name.contains("Linux"))
+            if (name.contains("Linux") && !name.contains("experimental"))
 #endif
             {
                 info.downloadUrl = asset.toObject()["browser_download_url"].toString();
@@ -160,12 +160,18 @@ void PluginUpdater::handleDownloadFinished()
     }
 
     QString downloadPath = QStandardPaths::writableLocation(QStandardPaths::DownloadLocation)
-                           + QDir::separator() + "qodeassisttemp";
+                           + QDir::separator() + "QodeAssist_v" + m_lastUpdateInfo.version;
     QDir().mkpath(downloadPath);
 
-    QString filePath = downloadPath + "/" + m_lastUpdateInfo.fileName;
-    QFile file(filePath);
+    QString filePath = downloadPath + QDir::separator() + m_lastUpdateInfo.fileName;
 
+    if (QFile::exists(filePath)) {
+        emit downloadError(tr("Update file already exists: %1").arg(filePath));
+        reply->deleteLater();
+        return;
+    }
+
+    QFile file(filePath);
     if (!file.open(QIODevice::WriteOnly)) {
         emit downloadError(tr("Could not save the update file"));
         reply->deleteLater();
@@ -175,17 +181,7 @@ void PluginUpdater::handleDownloadFinished()
     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();
-    }
-
+    emit downloadFinished(filePath);
     reply->deleteLater();
 }
 

settings/SettingsConstants.hpp

@@ -62,7 +62,7 @@ const char CC_STREAM[] = "QodeAssist.ccStream";
 const char CC_SMART_PROCESS_INSTRUCT_TEXT[] = "QodeAssist.ccSmartProcessInstructText";
 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_LINK_OPEN_FILES[] = "QodeAssist.caLinkOpenFiles";
 const char CA_STREAM[] = "QodeAssist.caStream";
 const char CA_AUTOSAVE[] = "QodeAssist.caAutosave";
 

settings/UpdateDialog.cpp

@@ -19,6 +19,11 @@
 
 #include "UpdateDialog.hpp"
 
+#include <coreplugin/icore.h>
+#include <extensionsystem/pluginmanager.h>
+#include <extensionsystem/pluginspec.h>
+#include <QDesktopServices>
+
 namespace QodeAssist {
 
 UpdateDialog::UpdateDialog(QWidget *parent)
@@ -60,6 +65,12 @@ UpdateDialog::UpdateDialog(QWidget *parent)
     m_versionLabel->setAlignment(Qt::AlignCenter);
     m_layout->addWidget(m_versionLabel);
 
+    m_releaseLink = new QLabel(this);
+    m_releaseLink->setOpenExternalLinks(true);
+    m_releaseLink->setTextFormat(Qt::RichText);
+    m_releaseLink->setAlignment(Qt::AlignCenter);
+    m_layout->addWidget(m_releaseLink);
+
     if (!m_changelogLabel) {
         m_changelogLabel = new QLabel(tr("Release Notes:"), this);
         m_layout->addWidget(m_changelogLabel);
@@ -75,7 +86,7 @@ UpdateDialog::UpdateDialog(QWidget *parent)
     m_layout->addWidget(m_progress);
 
     auto *buttonLayout = new QHBoxLayout;
-    m_downloadButton = new QPushButton(tr("Download and Install"), this);
+    m_downloadButton = new QPushButton(tr("Download"), this);
     m_downloadButton->setEnabled(false);
     buttonLayout->addWidget(m_downloadButton);
 
@@ -104,6 +115,10 @@ void UpdateDialog::checkForUpdatesAndShow(QWidget *parent)
 
 void UpdateDialog::handleUpdateInfo(const PluginUpdater::UpdateInfo &info)
 {
+    m_releaseLink->setText(
+        tr("<a href='https://github.com/Palm1r/QodeAssist/releases'>You can also download "
+           "from GitHub Releases</a>"));
+
     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"
@@ -156,11 +171,32 @@ void UpdateDialog::updateProgress(qint64 received, qint64 total)
 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."));
+
+    QMessageBox msgBox(this);
+    msgBox.setWindowTitle(tr("Update Downloaded"));
+    msgBox.setText(tr("The update has been downloaded successfully.\n"
+                      "Would you like to close Qt Creator now and open the plugin folder?"));
+    msgBox.setInformativeText(tr("To complete the update:\n\n"
+                                 "1. Close Qt Creator completely\n"
+                                 "2. Navigate to the plugin folder\n"
+                                 "3. Remove the old version of QodeAssist plugin\n"
+                                 "4. Install plugin as usual via About plugin menu"));
+    msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
+    msgBox.setDefaultButton(QMessageBox::Yes);
+    msgBox.setIcon(QMessageBox::Information);
+
+    if (msgBox.exec() == QMessageBox::Yes) {
+        const auto pluginSpecs = ExtensionSystem::PluginManager::plugins();
+        for (const ExtensionSystem::PluginSpec *spec : pluginSpecs) {
+            if (spec->name() == QLatin1String("QodeAssist")) {
+                const auto pluginPath = spec->filePath().path();
+                QFileInfo fileInfo(pluginPath);
+                QDesktopServices::openUrl(QUrl::fromLocalFile(fileInfo.absolutePath()));
+                Core::ICore::exit();
+                break;
+            }
+        }
+    }
     accept();
 }
 

settings/UpdateDialog.hpp

@@ -52,6 +52,7 @@ private:
     QVBoxLayout *m_layout;
     QLabel *m_titleLabel;
     QLabel *m_versionLabel;
+    QLabel *m_releaseLink;
     QLabel *m_changelogLabel{nullptr};
     QTextEdit *m_changelogText{nullptr};
     QProgressBar *m_progress;

templates/CodeLlamaQMLFim.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 "llmcore/PromptTemplate.hpp"
+
+namespace QodeAssist::Templates {
+
+class CodeLlamaQMLFim : public LLMCore::PromptTemplate
+{
+public:
+    LLMCore::TemplateType type() const override { return LLMCore::TemplateType::Fim; }
+    QString name() const override { return "CodeLlama QML FIM"; }
+    QString promptTemplate() const override { return "<SUF>%1<PRE>%2<MID>"; }
+    QStringList stopWords() const override
+    {
+        return QStringList() << "<SUF>" << "<PRE>" << "</PRE>" << "</SUF>" << "< EOT >" << "\\end"
+                             << "<MID>" << "</MID>" << "##";
+    }
+    void prepareRequest(QJsonObject &request, const LLMCore::ContextData &context) const override
+    {
+        QString formattedPrompt = promptTemplate().arg(context.suffix, context.prefix);
+        request["prompt"] = formattedPrompt;
+    }
+    QString description() const override
+    {
+        return "The message will contain the following tokens: <SUF>%1<PRE>%2<MID>";
+    }
+};
+
+} // namespace QodeAssist::Templates

templates/Templates.hpp

@@ -25,6 +25,7 @@
 #include "templates/ChatML.hpp"
 #include "templates/Claude.hpp"
 #include "templates/CodeLlamaFim.hpp"
+#include "templates/CodeLlamaQMLFim.hpp"
 #include "templates/CustomFimTemplate.hpp"
 #include "templates/DeepSeekCoderFim.hpp"
 #include "templates/Llama2.hpp"
@@ -53,6 +54,7 @@ inline void registerTemplates()
     templateManager.registerTemplate<Llama2>();
     templateManager.registerTemplate<Claude>();
     templateManager.registerTemplate<OpenAI>();
+    templateManager.registerTemplate<CodeLlamaQMLFim>();
 }
 
 } // namespace QodeAssist::Templates