Skip to content

A platform for community discussion. Free, open, simple.

FIX: Let AI agents resolve Admin Assistant query and workflow tools

Régis Hanol6d3980937107
diff --git a/plugins/discourse-data-explorer/plugin.rb b/plugins/discourse-data-explorer/plugin.rb
index 9509e6fed26..4c1513a8db2 100644
--- a/plugins/discourse-data-explorer/plugin.rb
+++ b/plugins/discourse-data-explorer/plugin.rb
@@ -291,9 +291,11 @@ after_initialize do
DiscourseDataExplorer::AdminAssistant::GenerateQuery,
DiscourseDataExplorer::AdminAssistant::CreateQuery,
]
- register_modifier(:ai_agent_available_tools) { |tools| tools + admin_assistant_tools }
+
register_modifier(:admin_assistant_tools) { |tools, _agent| tools + admin_assistant_tools }
+ DiscourseAi.register_tools(admin_assistant_tools, plugin: self)
+
DiscourseAi.register_feature(
module_name: :data_explorer,
feature: :query_generation,
diff --git a/plugins/discourse-data-explorer/spec/lib/discourse_data_explorer/admin_assistant/query_tools_spec.rb b/plugins/discourse-data-explorer/spec/lib/discourse_data_explorer/admin_assistant/query_tools_spec.rb
index 0e6ad8df9d6..04aa9d54f18 100644
--- a/plugins/discourse-data-explorer/spec/lib/discourse_data_explorer/admin_assistant/query_tools_spec.rb
+++ b/plugins/discourse-data-explorer/spec/lib/discourse_data_explorer/admin_assistant/query_tools_spec.rb
@@ -151,16 +151,17 @@ RSpec.describe DiscourseDataExplorer::AdminAssistant::CreateQuery do
DiscourseDataExplorer::AdminAssistant::QueryDraft.release(token, reviewable_id: reviewable.id)
end
- it "reconstructs a pending tool even when runtime policy now hides it" do
- reviewable = build_reviewable
+ it "resolves the tools by name but hides them at runtime when restricted" do
DiscourseDataExplorer::AdminAssistant::Capability.stubs(:status).returns(:restricted)
runtime_context = DiscourseAi::Agents::BotContext.new(user: admin, messages: [])
expect(
DiscourseAi::Agents::DiscourseAdminAssistant.new.runtime_tools(context: runtime_context),
).not_to include(described_class)
- expect(DiscourseAi::Agents::Agent.all_available_tools).to include(described_class)
- expect { reviewable.perform(other_admin, :approve) }.to raise_error(Discourse::InvalidAccess)
+ expect(DiscourseAi::Agents::Agent.external_tool_by_name("CreateQuery")).to eq(described_class)
+ expect(DiscourseAi::Agents::Agent.external_tool_by_name("GenerateQuery")).to eq(
+ DiscourseDataExplorer::AdminAssistant::GenerateQuery,
+ )
end
end
diff --git a/plugins/discourse-workflows/plugin.rb b/plugins/discourse-workflows/plugin.rb
index 46c08ccb9b5..e49e82bcb26 100644
--- a/plugins/discourse-workflows/plugin.rb
+++ b/plugins/discourse-workflows/plugin.rb
@@ -236,7 +236,7 @@ after_initialize do
DiscourseWorkflows::AdminAssistant::GenerateWorkflow,
DiscourseWorkflows::AdminAssistant::CreateWorkflow,
]
- register_modifier(:ai_agent_available_tools) { |tools| tools + admin_assistant_tools }
+
register_modifier(:admin_assistant_tools) { |tools, _agent| tools + admin_assistant_tools }
DiscourseAi.register_feature(
@@ -248,13 +248,14 @@ after_initialize do
)
DiscourseAi.register_tools(
- [
- DiscourseWorkflows::Ai::Tools::SearchChatChannels,
- DiscourseWorkflows::Ai::Tools::SearchChatIntegrationChannels,
- DiscourseWorkflows::Ai::Tools::DataTableSchema,
- DiscourseWorkflows::Ai::Tools::DataTableQuery,
- DiscourseWorkflows::Ai::Tools::DataTableWrite,
- ],
+ admin_assistant_tools +
+ [
+ DiscourseWorkflows::Ai::Tools::SearchChatChannels,
+ DiscourseWorkflows::Ai::Tools::SearchChatIntegrationChannels,
+ DiscourseWorkflows::Ai::Tools::DataTableSchema,
+ DiscourseWorkflows::Ai::Tools::DataTableQuery,
+ DiscourseWorkflows::Ai::Tools::DataTableWrite,
+ ],
plugin: self,
)
end
diff --git a/plugins/discourse-workflows/spec/lib/discourse_workflows/admin_assistant/workflow_tools_spec.rb b/plugins/discourse-workflows/spec/lib/discourse_workflows/admin_assistant/workflow_tools_spec.rb
index 4ddfaecc978..a52bbc05230 100644
--- a/plugins/discourse-workflows/spec/lib/discourse_workflows/admin_assistant/workflow_tools_spec.rb
+++ b/plugins/discourse-workflows/spec/lib/discourse_workflows/admin_assistant/workflow_tools_spec.rb
@@ -377,7 +377,12 @@ RSpec.describe DiscourseWorkflows::AdminAssistant::CreateWorkflow do
it "registers both workflow tools for the admin assistant and pending replay" do
tools = DiscourseAi::Agents::DiscourseAdminAssistant.new.tools
expect(tools).to include(DiscourseWorkflows::AdminAssistant::GenerateWorkflow, described_class)
- expect(DiscourseAi::Agents::Agent.all_available_tools).to include(described_class)
+ expect(DiscourseAi::Agents::Agent.external_tool_by_name("CreateWorkflow")).to eq(
+ described_class,
+ )
+ expect(DiscourseAi::Agents::Agent.external_tool_by_name("GenerateWorkflow")).to eq(
+ DiscourseWorkflows::AdminAssistant::GenerateWorkflow,
+ )
prompt =
DiscourseAi::Agents::DiscourseAdminAssistant.new.craft_prompt(
DiscourseAi::Agents::BotContext.new(user: admin, messages: []),