mirror/QodeAssist
1
0
Fork 0
mirror of https://github.com/Palm1r/QodeAssist.git synced 2026-04-12 07:42:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

feat: Add chat-agent switcher in chat ui (#247)

Browse Source 
* feat: Add chat-agent switcher in chat ui

fix: qml errors

refactor: Change top bar layout

fix: default value

* fix: update github action for qtc
This commit is contained in:
Petr Mironychev
2025-10-31 16:09:38 +01:00
committed by GitHub
parent 9117572f82
commit db82fb08e8
27 changed files with 244 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build_cmake.yml vendored
View File

@ -199,7 +199,7 @@ jobs:
endif()
- name: Download Qt Creator
uses: qt-creator/install-dev-package@4046eda2efa77c0fe61d4cde7e622c050a4d65af
uses: qt-creator/install-dev-package@1460787a21551eb3d867b0de30e8d3f1aadef5ac
with:
version: ${{ matrix.qt_config.qt_creator_version }}
unzip-to: 'qtcreator'

35
ChatView/ChatRootView.cpp
View File

@ -49,6 +49,7 @@ ChatRootView::ChatRootView(QQuickItem *parent)
, m_promptProvider(LLMCore::PromptTemplateManager::instance())
, m_clientInterface(new ClientInterface(m_chatModel, &m_promptProvider, this))
, m_isRequestInProgress(false)
, m_isAgentMode(false)
{
m_isSyncOpenFiles = Settings::chatAssistantSettings().linkOpenFiles();
connect(
@ -142,12 +143,20 @@ ChatRootView::ChatRootView(QQuickItem *parent)
updateInputTokensCount();
refreshRules();
// Refresh rules when project changes
connect(
ProjectExplorer::ProjectManager::instance(),
&ProjectExplorer::ProjectManager::startupProjectChanged,
this,
&ChatRootView::refreshRules);
QSettings appSettings;
m_isAgentMode = appSettings.value("QodeAssist/Chat/AgentMode", true).toBool();
connect(
&Settings::generalSettings().useTools,
&Utils::BaseAspect::changed,
this,
&ChatRootView::toolsSupportEnabledChanged);
}
ChatModel *ChatRootView::chatModel() const
@ -173,7 +182,7 @@ void ChatRootView::sendMessage(const QString &message)
}
}
m_clientInterface->sendMessage(message, m_attachmentFiles, m_linkedFiles);
m_clientInterface->sendMessage(message, m_attachmentFiles, m_linkedFiles, m_isAgentMode);
clearAttachmentFiles();
setRequestProgressStatus(true);
}
@ -704,4 +713,26 @@ void ChatRootView::refreshRules()
emit activeRulesCountChanged();
}
bool ChatRootView::isAgentMode() const
{
return m_isAgentMode;
}
void ChatRootView::setIsAgentMode(bool newIsAgentMode)
{
if (m_isAgentMode != newIsAgentMode) {
m_isAgentMode = newIsAgentMode;
QSettings settings;
settings.setValue("QodeAssist/Chat/AgentMode", newIsAgentMode);
emit isAgentModeChanged();
}
}
bool ChatRootView::toolsSupportEnabled() const
{
return Settings::generalSettings().useTools();
}
} // namespace QodeAssist::Chat

11
ChatView/ChatRootView.hpp
View File

@ -47,6 +47,9 @@ class ChatRootView : public QQuickItem
Q_PROPERTY(QString lastErrorMessage READ lastErrorMessage NOTIFY lastErrorMessageChanged FINAL)
Q_PROPERTY(QVariantList activeRules READ activeRules NOTIFY activeRulesChanged FINAL)
Q_PROPERTY(int activeRulesCount READ activeRulesCount NOTIFY activeRulesCountChanged FINAL)
Q_PROPERTY(bool isAgentMode READ isAgentMode WRITE setIsAgentMode NOTIFY isAgentModeChanged FINAL)
Q_PROPERTY(
bool toolsSupportEnabled READ toolsSupportEnabled NOTIFY toolsSupportEnabledChanged FINAL)
QML_ELEMENT
@ -107,6 +110,10 @@ public:
Q_INVOKABLE QString getRuleContent(int index);
Q_INVOKABLE void refreshRules();
bool isAgentMode() const;
void setIsAgentMode(bool newIsAgentMode);
bool toolsSupportEnabled() const;
public slots:
void sendMessage(const QString &message);
void copyToClipboard(const QString &text);
@ -134,6 +141,9 @@ signals:
void activeRulesChanged();
void activeRulesCountChanged();
void isAgentModeChanged();
void toolsSupportEnabledChanged();
private:
QString getChatsHistoryDir() const;
QString getSuggestedFileName() const;
@ -152,6 +162,7 @@ private:
bool m_isRequestInProgress;
QString m_lastErrorMessage;
QVariantList m_activeRules;
bool m_isAgentMode;
};
} // namespace QodeAssist::Chat

13
ChatView/ClientInterface.cpp
View File

@ -55,7 +55,10 @@ ClientInterface::ClientInterface(
ClientInterface::~ClientInterface() = default;
void ClientInterface::sendMessage(
const QString &message, const QList<QString> &attachments, const QList<QString> &linkedFiles)
const QString &message,
const QList<QString> &attachments,
const QList<QString> &linkedFiles,
bool useAgentMode)
{
cancelRequest();
m_accumulatedResponses.clear();
@ -83,10 +86,12 @@ void ClientInterface::sendMessage(
LLMCore::ContextData context;
const bool isToolsEnabled = Settings::generalSettings().useTools() && useAgentMode;
if (chatAssistantSettings.useSystemPrompt()) {
QString systemPrompt = chatAssistantSettings.systemPrompt();
if (Settings::generalSettings().useTools()) {
if (isToolsEnabled) {
systemPrompt += "\n\n# Tool Usage Guidelines\n\n"
"**Multi-tool workflows:**\n"
"- Code structure: search_project (symbol mode) → find_and_read_file\n"
@ -140,8 +145,8 @@ void ClientInterface::sendMessage(
config.apiKey = provider->apiKey();
config.provider
->prepareRequest(config.providerRequest, promptTemplate, context, LLMCore::RequestType::Chat);
config.provider->prepareRequest(
config.providerRequest, promptTemplate, context, LLMCore::RequestType::Chat, isToolsEnabled);
QString requestId = QUuid::createUuid().toString();
QJsonObject request{{"id", requestId}};

3
ChatView/ClientInterface.hpp
View File

@ -42,7 +42,8 @@ public:
void sendMessage(
const QString &message,
const QList<QString> &attachments = {},
const QList<QString> &linkedFiles = {});
const QList<QString> &linkedFiles = {},
bool useAgentMode = false);
void clearMessages();
void cancelRequest();

13
ChatView/qml/RootItem.qml
View File

@ -65,7 +65,7 @@ ChatRootView {
id: topBar
Layout.preferredWidth: parent.width
Layout.preferredHeight: 40
Layout.preferredHeight: childrenRect.height + 10
saveButton.onClicked: root.showSaveDialog()
loadButton.onClicked: root.showLoadDialog()
@ -74,7 +74,7 @@ ChatRootView {
text: qsTr("%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")
text: qsTr("Сhat name: %1").arg(root.chatFileName.length > 0 ? root.chatFileName : "Unsaved")
}
openChatHistory.onClicked: root.openChatHistoryFolder()
rulesButton.onClicked: rulesViewer.open()
@ -84,6 +84,13 @@ ChatRootView {
checked: typeof _chatview !== 'undefined' ? _chatview.isPin : false
onCheckedChanged: _chatview.isPin = topBar.pinButton.checked
}
agentModeSwitch {
checked: root.isAgentMode
enabled: root.toolsSupportEnabled
onCheckedChanged: {
root.isAgentMode = agentModeSwitch.checked
}
}
}
ListView {
@ -108,7 +115,7 @@ ChatRootView {
if (model.roleType === ChatModel.Tool) {
return toolMessageComponent
} else if (model.roleType === ChatModel.FileEdit) {
return fileEditSuggestionComponent
return toolMessageComponent
} else {
return chatItemComponent
}

66
ChatView/qml/parts/TopBar.qml
View File

@ -34,21 +34,20 @@ Rectangle {
property alias openChatHistory: openChatHistoryId
property alias pinButton: pinButtonId
property alias rulesButton: rulesButtonId
property alias agentModeSwitch: agentModeSwitchId
property alias activeRulesCount: activeRulesCountId.text
color: palette.window.hslLightness > 0.5 ?
Qt.darker(palette.window, 1.1) :
Qt.lighter(palette.window, 1.1)
RowLayout {
Flow {
anchors {
left: parent.left
leftMargin: 5
right: parent.right
rightMargin: 5
verticalCenter: parent.verticalCenter
margins: 5
}
spacing: 10
QoAButton {
@ -69,6 +68,53 @@ Rectangle {
: qsTr("Pin chat window to the top")
}
QoATextSlider {
id: agentModeSwitchId
leftText: "chat"
rightText: "AI Agent"
ToolTip.visible: hovered
ToolTip.delay: 250
ToolTip.text: {
if (!agentModeSwitchId.enabled) {
return qsTr("Tools are disabled in General Settings")
}
return checked
? qsTr("Agent Mode: AI can use tools to read files, search project, and build code")
: qsTr("Chat Mode: Simple conversation without tool access")
}
}
Item {
height: agentModeSwitchId.height
width: recentPathId.width
Text {
id: recentPathId
anchors.verticalCenter: parent.verticalCenter
width: Math.min(implicitWidth, root.width)
elide: Text.ElideMiddle
color: palette.text
font.pixelSize: 12
MouseArea {
anchors.fill: parent
hoverEnabled: true
ToolTip.visible: containsMouse
ToolTip.delay: 500
ToolTip.text: recentPathId.text
}
}
}
RowLayout {
Layout.preferredWidth: root.width
spacing: 10
QoAButton {
id: saveButtonId
@ -108,13 +154,6 @@ Rectangle {
ToolTip.text: qsTr("Clean chat")
}
Text {
id: recentPathId
elide: Text.ElideMiddle
color: palette.text
}
QoAButton {
id: openChatHistoryId
@ -160,10 +199,6 @@ Rectangle {
}
}
Item {
Layout.fillWidth: true
}
Badge {
id: tokensBadgeId
@ -172,4 +207,5 @@ Rectangle {
ToolTip.text: qsTr("Current amount tokens in chat and LLM limit threshold")
}
}
}
}

3
LLMClientInterface.cpp
View File

@ -292,7 +292,8 @@ void LLMClientInterface::handleCompletion(const QJsonObject &request)
config.providerRequest,
promptTemplate,
updatedContext,
LLMCore::RequestType::CodeCompletion);
LLMCore::RequestType::CodeCompletion,
false);
auto errors = config.provider->validateRequest(config.providerRequest, promptTemplate->type());
if (!errors.isEmpty()) {

6
QuickRefactorHandler.cpp
View File

@ -145,7 +145,11 @@ void QuickRefactorHandler::prepareAndSendRequest(
LLMCore::ContextData context = prepareContext(editor, range, instructions);
provider->prepareRequest(
config.providerRequest, promptTemplate, context, LLMCore::RequestType::QuickRefactoring);
config.providerRequest,
promptTemplate,
context,
LLMCore::RequestType::QuickRefactoring,
false);
QString requestId = QUuid::createUuid().toString();
m_lastRequestId = requestId;

1
UIControls/qml/QoATextSlider.qml
View File

@ -143,7 +143,6 @@ Item {
anchors.fill: parent
hoverEnabled: true
cursorShape: root.enabled ? Qt.PointingHandCursor : Qt.ArrowCursor
enabled: root.enabled
onClicked: {
if (root.enabled) {

3
llmcore/Provider.hpp
View File

@ -52,7 +52,8 @@ public:
QJsonObject &request,
LLMCore::PromptTemplate *prompt,
LLMCore::ContextData context,
LLMCore::RequestType type)
LLMCore::RequestType type,
bool isToolsEnabled)
= 0;
virtual QList<QString> getInstalledModels(const QString &url) = 0;
virtual QList<QString> validateRequest(const QJsonObject &request, TemplateType type) = 0;

6
providers/ClaudeProvider.cpp
View File

@ -75,7 +75,8 @@ void ClaudeProvider::prepareRequest(
QJsonObject &request,
LLMCore::PromptTemplate *prompt,
LLMCore::ContextData context,
LLMCore::RequestType type)
LLMCore::RequestType type,
bool isToolsEnabled)
{
if (!prompt->isSupportProvider(providerID())) {
LOG_MESSAGE(QString("Template %1 doesn't support %2 provider").arg(name(), prompt->name()));
@ -99,8 +100,7 @@ void ClaudeProvider::prepareRequest(
applyModelParams(Settings::chatAssistantSettings());
}
if (supportsTools() && type == LLMCore::RequestType::Chat
&& Settings::generalSettings().useTools()) {
if (isToolsEnabled) {
auto toolsDefinitions = m_toolsManager->getToolsDefinitions(
LLMCore::ToolSchemaFormat::Claude);
if (!toolsDefinitions.isEmpty()) {

3
providers/ClaudeProvider.hpp
View File

@ -41,7 +41,8 @@ public:
QJsonObject &request,
LLMCore::PromptTemplate *prompt,
LLMCore::ContextData context,
LLMCore::RequestType type) override;
LLMCore::RequestType type,
bool isToolsEnabled) override;
QList<QString> getInstalledModels(const QString &url) override;
QList<QString> validateRequest(const QJsonObject &request, LLMCore::TemplateType type) override;
QString apiKey() const override;

6
providers/GoogleAIProvider.cpp
View File

@ -75,7 +75,8 @@ void GoogleAIProvider::prepareRequest(
QJsonObject &request,
LLMCore::PromptTemplate *prompt,
LLMCore::ContextData context,
LLMCore::RequestType type)
LLMCore::RequestType type,
bool isToolsEnabled)
{
if (!prompt->isSupportProvider(providerID())) {
LOG_MESSAGE(QString("Template %1 doesn't support %2 provider").arg(name(), prompt->name()));
@ -102,8 +103,7 @@ void GoogleAIProvider::prepareRequest(
applyModelParams(Settings::chatAssistantSettings());
}
if (supportsTools() && type == LLMCore::RequestType::Chat
&& Settings::generalSettings().useTools()) {
if (isToolsEnabled) {
auto toolsDefinitions = m_toolsManager->getToolsDefinitions(
LLMCore::ToolSchemaFormat::Google);
if (!toolsDefinitions.isEmpty()) {

3
providers/GoogleAIProvider.hpp
View File

@ -40,7 +40,8 @@ public:
QJsonObject &request,
LLMCore::PromptTemplate *prompt,
LLMCore::ContextData context,
LLMCore::RequestType type) override;
LLMCore::RequestType type,
bool isToolsEnabled) override;
QList<QString> getInstalledModels(const QString &url) override;
QList<QString> validateRequest(const QJsonObject &request, LLMCore::TemplateType type) override;
QString apiKey() const override;

6
providers/LMStudioProvider.cpp
View File

@ -222,7 +222,8 @@ void LMStudioProvider::prepareRequest(
QJsonObject &request,
LLMCore::PromptTemplate *prompt,
LLMCore::ContextData context,
LLMCore::RequestType type)
LLMCore::RequestType type,
bool isToolsEnabled)
{
if (!prompt->isSupportProvider(providerID())) {
LOG_MESSAGE(QString("Template %1 doesn't support %2 provider").arg(name(), prompt->name()));
@ -250,8 +251,7 @@ void LMStudioProvider::prepareRequest(
applyModelParams(Settings::chatAssistantSettings());
}
if (supportsTools() && type == LLMCore::RequestType::Chat
&& Settings::generalSettings().useTools()) {
if (isToolsEnabled) {
auto toolsDefinitions = m_toolsManager->getToolsDefinitions(
LLMCore::ToolSchemaFormat::OpenAI);
if (!toolsDefinitions.isEmpty()) {

3
providers/LMStudioProvider.hpp
View File

@ -40,7 +40,8 @@ public:
QJsonObject &request,
LLMCore::PromptTemplate *prompt,
LLMCore::ContextData context,
LLMCore::RequestType type) override;
LLMCore::RequestType type,
bool isToolsEnabled) override;
QList<QString> getInstalledModels(const QString &url) override;
QList<QString> validateRequest(const QJsonObject &request, LLMCore::TemplateType type) override;
QString apiKey() const override;

6
providers/LlamaCppProvider.cpp
View File

@ -73,7 +73,8 @@ void LlamaCppProvider::prepareRequest(
QJsonObject &request,
LLMCore::PromptTemplate *prompt,
LLMCore::ContextData context,
LLMCore::RequestType type)
LLMCore::RequestType type,
bool isToolsEnabled)
{
if (!prompt->isSupportProvider(providerID())) {
LOG_MESSAGE(QString("Template %1 doesn't support %2 provider").arg(name(), prompt->name()));
@ -101,8 +102,7 @@ void LlamaCppProvider::prepareRequest(
applyModelParams(Settings::chatAssistantSettings());
}
if (supportsTools() && type == LLMCore::RequestType::Chat
&& Settings::generalSettings().useTools()) {
if (isToolsEnabled) {
auto toolsDefinitions = m_toolsManager->getToolsDefinitions(
LLMCore::ToolSchemaFormat::OpenAI);
if (!toolsDefinitions.isEmpty()) {

3
providers/LlamaCppProvider.hpp
View File

@ -40,7 +40,8 @@ public:
QJsonObject &request,
LLMCore::PromptTemplate *prompt,
LLMCore::ContextData context,
LLMCore::RequestType type) override;
LLMCore::RequestType type,
bool isToolsEnabled) override;
QList<QString> getInstalledModels(const QString &url) override;
QList<QString> validateRequest(const QJsonObject &request, LLMCore::TemplateType type) override;
QString apiKey() const override;

6
providers/MistralAIProvider.cpp
View File

@ -243,7 +243,8 @@ void MistralAIProvider::prepareRequest(
QJsonObject &request,
LLMCore::PromptTemplate *prompt,
LLMCore::ContextData context,
LLMCore::RequestType type)
LLMCore::RequestType type,
bool isToolsEnabled)
{
if (!prompt->isSupportProvider(providerID())) {
LOG_MESSAGE(QString("Template %1 doesn't support %2 provider").arg(name(), prompt->name()));
@ -271,8 +272,7 @@ void MistralAIProvider::prepareRequest(
applyModelParams(Settings::chatAssistantSettings());
}
if (supportsTools() && type == LLMCore::RequestType::Chat
&& Settings::generalSettings().useTools()) {
if (isToolsEnabled) {
auto toolsDefinitions = m_toolsManager->getToolsDefinitions(
LLMCore::ToolSchemaFormat::OpenAI);
if (!toolsDefinitions.isEmpty()) {

3
providers/MistralAIProvider.hpp
View File

@ -40,7 +40,8 @@ public:
QJsonObject &request,
LLMCore::PromptTemplate *prompt,
LLMCore::ContextData context,
LLMCore::RequestType type) override;
LLMCore::RequestType type,
bool isToolsEnabled) override;
QList<QString> getInstalledModels(const QString &url) override;
QList<QString> validateRequest(const QJsonObject &request, LLMCore::TemplateType type) override;
QString apiKey() const override;

6
providers/OllamaProvider.cpp
View File

@ -74,7 +74,8 @@ void OllamaProvider::prepareRequest(
QJsonObject &request,
LLMCore::PromptTemplate *prompt,
LLMCore::ContextData context,
LLMCore::RequestType type)
LLMCore::RequestType type,
bool isToolsEnabled)
{
if (!prompt->isSupportProvider(providerID())) {
LOG_MESSAGE(QString("Template %1 doesn't support %2 provider").arg(name(), prompt->name()));
@ -107,8 +108,7 @@ void OllamaProvider::prepareRequest(
applySettings(Settings::chatAssistantSettings());
}
if (supportsTools() && type == LLMCore::RequestType::Chat
&& Settings::generalSettings().useTools()) {
if (isToolsEnabled) {
auto toolsDefinitions = m_toolsManager->toolsFactory()->getToolsDefinitions(
LLMCore::ToolSchemaFormat::Ollama);
if (!toolsDefinitions.isEmpty()) {

3
providers/OllamaProvider.hpp
View File

@ -41,7 +41,8 @@ public:
QJsonObject &request,
LLMCore::PromptTemplate *prompt,
LLMCore::ContextData context,
LLMCore::RequestType type) override;
LLMCore::RequestType type,
bool isToolsEnabled) override;
QList<QString> getInstalledModels(const QString &url) override;
QList<QString> validateRequest(const QJsonObject &request, LLMCore::TemplateType type) override;
QString apiKey() const override;

6
providers/OpenAICompatProvider.cpp
View File

@ -73,7 +73,8 @@ void OpenAICompatProvider::prepareRequest(
QJsonObject &request,
LLMCore::PromptTemplate *prompt,
LLMCore::ContextData context,
LLMCore::RequestType type)
LLMCore::RequestType type,
bool isToolsEnabled)
{
if (!prompt->isSupportProvider(providerID())) {
LOG_MESSAGE(QString("Template %1 doesn't support %2 provider").arg(name(), prompt->name()));
@ -101,8 +102,7 @@ void OpenAICompatProvider::prepareRequest(
applyModelParams(Settings::chatAssistantSettings());
}
if (supportsTools() && type == LLMCore::RequestType::Chat
&& Settings::generalSettings().useTools()) {
if (isToolsEnabled) {
auto toolsDefinitions = m_toolsManager->getToolsDefinitions(
LLMCore::ToolSchemaFormat::OpenAI);
if (!toolsDefinitions.isEmpty()) {

3
providers/OpenAICompatProvider.hpp
View File

@ -40,7 +40,8 @@ public:
QJsonObject &request,
LLMCore::PromptTemplate *prompt,
LLMCore::ContextData context,
LLMCore::RequestType type) override;
LLMCore::RequestType type,
bool isToolsEnabled) override;
QList<QString> getInstalledModels(const QString &url) override;
QList<QString> validateRequest(const QJsonObject &request, LLMCore::TemplateType type) override;
QString apiKey() const override;

6
providers/OpenAIProvider.cpp
View File

@ -74,7 +74,8 @@ void OpenAIProvider::prepareRequest(
QJsonObject &request,
LLMCore::PromptTemplate *prompt,
LLMCore::ContextData context,
LLMCore::RequestType type)
LLMCore::RequestType type,
bool isToolsEnabled)
{
if (!prompt->isSupportProvider(providerID())) {
LOG_MESSAGE(QString("Template %1 doesn't support %2 provider").arg(name(), prompt->name()));
@ -102,8 +103,7 @@ void OpenAIProvider::prepareRequest(
applyModelParams(Settings::chatAssistantSettings());
}
if (supportsTools() && type == LLMCore::RequestType::Chat
&& Settings::generalSettings().useTools()) {
if (isToolsEnabled) {
auto toolsDefinitions = m_toolsManager->getToolsDefinitions(
LLMCore::ToolSchemaFormat::OpenAI);
if (!toolsDefinitions.isEmpty()) {

3
providers/OpenAIProvider.hpp
View File

@ -40,7 +40,8 @@ public:
QJsonObject &request,
LLMCore::PromptTemplate *prompt,
LLMCore::ContextData context,
LLMCore::RequestType type) override;
LLMCore::RequestType type,
bool isToolsEnabled) override;
QList<QString> getInstalledModels(const QString &url) override;
QList<QString> validateRequest(const QJsonObject &request, LLMCore::TemplateType type) override;
QString apiKey() const override;