Add "Tools" settings page

Where you can select which tools should be used by the assistant.

Also the "Enable Tools" state from the chat input is reflected in the
Chat settings page.

Author: cristianadam

CMakeLists.txt

@@ -97,6 +97,7 @@ add_qtc_plugin(LlamaCpp
     tools/run_project_tool.cpp tools/run_project_tool.h
     tools/open_project_tool.cpp tools/open_project_tool.h
     tools/tool.cpp tools/tool.h
+    toolsettingswidget.cpp toolsettingswidget.h
 )
 
 add_subdirectory(tests)

llamachatinput.cpp

@@ -15,6 +15,7 @@
 #include <utils/fsengine/fileiconprovider.h>
 
 #include "llamachatinput.h"
+#include "llamasettings.h"
 #include "llamatheme.h"
 #include "llamatr.h"
 
@@ -83,8 +84,15 @@ void ChatInput::buildUI()
     m_toolsButton = new QToolButton(this);
     m_toolsButton->setText("O");
     m_toolsButton->setCheckable(true);
-    m_toolsButton->setToolTip(Tr::tr("Enable Tools usage"));
+    const bool toolsInitiallyEnabled = settings().toolsEnabled();
+    m_toolsButton->setChecked(toolsInitiallyEnabled);
+    m_toolsButton->setToolTip(toolsInitiallyEnabled
+                                  ? Tr::tr("Disable Tools usage")
+                                  : Tr::tr("Enable Tools usage"));
     connect(m_toolsButton, &QToolButton::clicked, this, [this](bool checked) {
+        settings().toolsEnabled.setValue(checked);
+        settings().writeSettings();
+
         m_toolsButton->setToolTip(checked ? Tr::tr("Disable Tools usage")
                                           : Tr::tr("Enable Tools usage"));
         emit toolsSupportEnabled(checked);

llamachatmanager.cpp

@@ -51,21 +51,41 @@ static void addCommonPayloadParams(QJsonObject &payload)
 
 static void addToolsToPayload(QJsonObject &payload)
 {
-    if (settings().tools.value().isEmpty())
-        return;
+    const QStringList enabledTools = settings().enabledToolsList();
+
+    const QStringList creatorsList = ToolFactory::instance().creatorsList();
+    QStringList toolDefinitions;
+    for (const QString &toolName : creatorsList) {
+        std::unique_ptr<Tool> tool = ToolFactory::instance().create(toolName);
+        toolDefinitions << tool->toolDefinition();
+    }
 
     QJsonArray toolsArr;
-    for (const QString &toolStr : settings().tools.value()) {
+    for (const QString &toolStr : std::as_const(toolDefinitions)) {
         QJsonParseError err;
         QJsonDocument doc = QJsonDocument::fromJson(toolStr.toUtf8(), &err);
         if (err.error != QJsonParseError::NoError || !doc.isObject()) {
             qWarning() << "Invalid tool JSON:" << err.errorString();
             continue;
         }
-        toolsArr.append(doc.object());
+
+        // Extract the tool name so we can check whether it is enabled.
+        const QJsonObject root = doc.object();
+        const QJsonObject functionObj = root.value(QStringLiteral("function")).toObject();
+        const QString toolName = functionObj.value(QStringLiteral("name")).toString();
+
+        if (!enabledTools.contains(toolName)) {
+            // Skip disabled tools – they must never be advertised to the server.
+            qCInfo(llamaChatTools).nospace()
+                << "Tool '" << toolName << "' is disabled, not adding it to payload.";
+            continue;
+        }
+
+        toolsArr.append(root);
     }
 
-    payload["tools"] = toolsArr;
+    if (!toolsArr.isEmpty())
+        payload["tools"] = toolsArr;
 }
 
 ChatManager &ChatManager::instance()
@@ -774,6 +794,30 @@ void ChatManager::executeToolAndSendResult(const QString &convId,
                                            const ToolCall &tool,
                                            std::function<void(qint64)> onChunk)
 {
+    // Check whether the requested tool is enabled.
+    if (!settings().enabledToolsList().contains(tool.name)) {
+        qCWarning(llamaChatTools) << "Tool" << tool.name
+                                  << "was called but is disabled – skipping.";
+
+        // Insert a synthetic “failed” tool‑result so the conversation can continue.
+        Message toolMsg = createToolMessage(assistantMsg);
+        QJsonObject toolJsonMsg;
+        toolJsonMsg["role"] = "tool";
+        toolJsonMsg["tool_call_id"] = tool.id;
+        toolJsonMsg["name"] = tool.name;
+        toolJsonMsg["content"] = QStringLiteral("Tool disabled");
+        QVariantMap toolResultExtra;
+        toolResultExtra["tool_result"] = toolJsonMsg;
+        toolResultExtra["tool_status"] = QStringLiteral("failed");
+        toolMsg.extra << toolResultExtra;
+        m_storage->appendMsg(toolMsg, assistantMsg.id);
+        onChunk(toolMsg.id);
+
+        // Continue the conversation as if the tool had returned an error.
+        generateMessage(convId, toolMsg.id, onChunk);
+        return;
+    }
+
     QJsonParseError err;
     QJsonDocument doc = QJsonDocument::fromJson(tool.arguments.toUtf8(), &err);
     if (err.error != QJsonParseError::NoError) {

llamasettings.cpp

@@ -3,6 +3,7 @@
 #include "llamatr.h"
 #include "tools/factory.h"
 #include "tools/tool.h"
+#include "toolsettingswidget.h"
 
 #include <coreplugin/dialogs/ioptionspage.h>
 #include <projectexplorer/project.h>
@@ -14,6 +15,17 @@ using namespace Utils;
 
 namespace LlamaCpp {
 
+ToolsSettingsPage::ToolsSettingsPage()
+{
+    setId("LlamaCpp.Tools");         // unique identifier
+    setDisplayName(Tr::tr("Tools")); // title shown in the Settings dialog
+    setCategory(Constants::LLAMACPP_GENERAL_OPTIONS_CATEGORY);
+    setSettingsProvider([] { return &LlamaCpp::settings(); });
+    setWidgetCreator([] { return new LlamaCpp::ToolsSettingsWidget; });
+}
+
+// The static instance makes the page appear automatically.
+
 static void initEnableAspect(BoolAspect &enableLlamaCpp)
 {
     enableLlamaCpp.setSettingsKey(Constants::ENABLE_LLAMACPP);
@@ -25,6 +37,8 @@ static void initEnableAspect(BoolAspect &enableLlamaCpp)
 
 LlamaSettings &settings()
 {
+    static ToolsSettingsPage theToolsPage;
+
     static LlamaSettings settings;
     return settings;
 }
@@ -372,16 +386,19 @@ LlamaSettings::LlamaSettings()
     showTokensPerSecond.setDefaultValue(false);
     showTokensPerSecond.setToolTip(Tr::tr("Show tokens per second in the chat UI."));
 
-    tools.setSettingsKey("LlamaCpp.Tools");
-
+    //
+    // Tools
+    //
     const QStringList creatorsList = ToolFactory::instance().creatorsList();
-    QStringList toolDefinitions;
-    for (const QString &toolName : creatorsList) {
-        std::unique_ptr<Tool> tool = ToolFactory::instance().create(toolName);
-        toolDefinitions << tool->toolDefinition();
-    }
+    enabledToolsList.setSettingsKey("EnabledToolsList");
+    enabledToolsList.setDefaultValue(creatorsList);
 
-    tools.setDefaultValue(toolDefinitions);
+    toolsEnabled.setSettingsKey("ToolsEnabled");
+    toolsEnabled.setDefaultValue(false);
+    toolsEnabled.setDisplayName(Tr::tr("Enable Tools in Chat"));
+    toolsEnabled.setLabelText(Tr::tr("Enable Tools in Chat"));
+    toolsEnabled.setToolTip(
+        Tr::tr("If checked the chat will start with the Tools button turned on."));
 
     initEnableAspect(enableLlamaCpp);
 
@@ -428,6 +445,7 @@ LlamaSettings::LlamaSettings()
     dry_penalty_last_n.setEnabler(&enableLlamaCpp);
     max_tokens.setEnabler(&enableLlamaCpp);
     customJson.setEnabler(&enableLlamaCpp);
+    toolsEnabled.setEnabler(&enableLlamaCpp);
 
     setLayouter([this] {
         using namespace Layouting;
@@ -484,6 +502,7 @@ LlamaSettings::LlamaSettings()
                 Row {dry_penalty_last_n}, br,
                 hr, br,
                 showTokensPerSecond, br,
+                toolsEnabled, br,
                 customJson, br,
             },
         };

llamasettings.h

@@ -1,5 +1,6 @@
 #pragma once
 
+#include <coreplugin/dialogs/ioptionspage.h>
 #include <utils/aspects.h>
 
 namespace ProjectExplorer {
@@ -61,7 +62,8 @@ class LlamaSettings : public Utils::AspectContainer
     Utils::StringAspect customJson{this};
     Utils::BoolAspect showTokensPerSecond{this};
 
-    Utils::StringListAspect tools{this};
+    Utils::StringListAspect enabledToolsList{this};
+    Utils::BoolAspect toolsEnabled{this};
 };
 
 LlamaSettings &settings();
@@ -80,4 +82,10 @@ class LlamaProjectSettings : public Utils::AspectContainer
     Utils::BoolAspect useGlobalSettings{this};
 };
 
+class ToolsSettingsPage : public Core::IOptionsPage
+{
+public:
+    ToolsSettingsPage();
+};
+
 } // namespace LlamaCpp