Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

Rename MCP UI viz scope for metabot consistency (#74820)

Chris Truter3d893c1d7500
diff --git a/src/metabase/agent_api/api.clj b/src/metabase/agent_api/api.clj
index 2107306a84d..c2f4c56187d 100644
--- a/src/metabase/agent_api/api.clj
+++ b/src/metabase/agent_api/api.clj
@@ -615,7 +615,7 @@
Accepts either a JSON body (same shape as /v2/construct-query) or a `continuation_token`
from a previous response. Returns results with column metadata and an optional
`continuation_token` for fetching the next page."
- {:scope "agent:query"
+ {:scope metabot/agent-query
:tool {:name "query"
:title "Query Tables and Metrics"
:description (str "Execute a Metabase query and return results with column "
diff --git a/src/metabase/mcp/resources.clj b/src/metabase/mcp/resources.clj
index 9c96fc760e3..1f94eae1b27 100644
--- a/src/metabase/mcp/resources.clj
+++ b/src/metabase/mcp/resources.clj
@@ -301,7 +301,7 @@
(register-ui-resource!
:visualize-query
"ui://metabase/visualize-query.html"
- "agent:visualize"
+ "agent:viz:mcp-ui:query"
{:name "Visualize Query"
:description "Interactive Metabase SDK visualization for a query"
:prefersBorder true
@@ -310,7 +310,7 @@
(register-ui-resource!
:render-drill-through
"ui://metabase/render-drill-through.html"
- "agent:visualize"
+ "agent:viz:mcp-ui:drill-through"
{:name "Render Drill Through"
:description "Interactive Metabase SDK visualization for a drill-through follow-up"
:prefersBorder true
diff --git a/src/metabase/metabot/core.clj b/src/metabase/metabot/core.clj
index 85ecb871bdd..2547661f838 100644
--- a/src/metabase/metabot/core.clj
+++ b/src/metabase/metabot/core.clj
@@ -15,6 +15,7 @@
agent-dashboard-create
agent-metric-read
agent-question-create
+ agent-query
agent-query-construct
agent-query-execute
agent-search
diff --git a/src/metabase/metabot/scope.clj b/src/metabase/metabot/scope.clj
index b28df573149..cb73afccdfd 100644
--- a/src/metabase/metabot/scope.clj
+++ b/src/metabase/metabot/scope.clj
@@ -69,6 +69,10 @@
(deferred-tru "Edit charts and visualizations"))
(api-scope/defscope agent-viz-navigate "agent:viz:navigate"
(deferred-tru "Navigate to visualizations"))
+(api-scope/defscope agent-viz-mcp-ui-query "agent:viz:mcp-ui:query"
+ (deferred-tru "Render query visualizations in the MCP UI"))
+(api-scope/defscope agent-viz-mcp-ui-drill-through "agent:viz:mcp-ui:drill-through"
+ (deferred-tru "Render drill-through visualizations in the MCP UI"))
;; Alert
(api-scope/defscope agent-alert-create "agent:alert:create"
diff --git a/test/metabase/mcp/api_test.clj b/test/metabase/mcp/api_test.clj
index 03cfba2f195..92a5231ba11 100644
--- a/test/metabase/mcp/api_test.clj
+++ b/test/metabase/mcp/api_test.clj
@@ -1144,7 +1144,7 @@
(deftest check-resource-access-test
(testing "returns :ok for a known URI with matching scope"
- (is (= :ok (mcp.resources/check-resource-access "ui://metabase/visualize-query.html" #{"agent:visualize"}))))
+ (is (= :ok (mcp.resources/check-resource-access "ui://metabase/visualize-query.html" #{"agent:viz:mcp-ui:query"}))))
(testing "returns :ok with wildcard scope"
(is (= :ok (mcp.resources/check-resource-access "ui://metabase/visualize-query.html" #{"agent:*"}))))
(testing "returns :scope-denied for a known URI with non-matching scope"
diff --git a/test/metabase/mcp/resources_test.clj b/test/metabase/mcp/resources_test.clj
index dc360c889e5..ff682209ef9 100644
--- a/test/metabase/mcp/resources_test.clj
+++ b/test/metabase/mcp/resources_test.clj
@@ -90,21 +90,21 @@
:mimeType "text/html;profile=mcp-app"
:_meta {:ui {:prefersBorder true}}}]}
(mcp.resources/read-resource "ui://metabase/visualize-query.html"
- #{"agent:visualize"}
+ #{"agent:viz:mcp-ui:query"}
{}))))))
(deftest drill-through-ui-resource-is-distinct-from-visualize-query-test
(testing "render_drill_through has its own UI resource URI (ChatGPT dedupes the iframe by `_meta.ui.resourceUri`; sharing the URI prevents a fresh widget from mounting on drill)"
- (let [uris (set (map :uri (:resources (mcp.resources/list-resources #{"agent:visualize"}))))]
+ (let [uris (set (map :uri (:resources (mcp.resources/list-resources #{"agent:viz:*"}))))]
(is (contains? uris "ui://metabase/visualize-query.html"))
(is (contains? uris "ui://metabase/render-drill-through.html"))))
(testing "the two UI resources return byte-distinct HTML (ChatGPT's asset CDN appears to dedupe by body hash, so identical bodies cause the second asset to silently 404)"
(mcp.resources/with-fallback-template
(let [viz-html (-> (mcp.resources/read-resource "ui://metabase/visualize-query.html"
- #{"agent:visualize"} {})
+ #{"agent:viz:mcp-ui:query"} {})
:contents first :text)
drill-html (-> (mcp.resources/read-resource "ui://metabase/render-drill-through.html"
- #{"agent:visualize"} {})
+ #{"agent:viz:mcp-ui:drill-through"} {})
:contents first :text)]
(is (string? viz-html))
(is (string? drill-html))
@@ -123,7 +123,7 @@
uri "ui://metabase/visualize-query.html"
read-ui (fn []
(mcp.resources/with-fallback-template
- (mcp.resources/read-resource uri #{"agent:visualize"} {})))]
+ (mcp.resources/read-resource uri #{"agent:viz:mcp-ui:query"} {})))]
(with-redefs [system/site-url (constantly site-url)]
(testing "no request bound → CSP origins still emitted, :domain suppressed"
(with-redefs [config/is-dev? false]