Skip to content

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

Fixed MCP search response schema validation (#82205)

Timofey Kachalov0cf4be2fd26d
diff --git a/src/metabase/agent_api/api.clj b/src/metabase/agent_api/api.clj
index 519f54827e3..31b36b65543 100644
--- a/src/metabase/agent_api/api.clj
+++ b/src/metabase/agent_api/api.clj
@@ -109,8 +109,12 @@
[:collection {:optional true} [:maybe :map]]
;; Present on collection results — the parent location path (e.g. "/12/34/").
[:location {:optional true} [:maybe :string]]
- [:updated_at {:optional true} [:maybe :any]]
- [:created_at {:optional true} [:maybe :any]]])
+ ;; `[:maybe :any]` publishes as `oneOf [{}, {type:null}]`. Clients that enforce
+ ;; `oneOf` reject null timestamps because both branches match; TemporalInstant
+ ;; keeps the branches disjoint (`date-time` vs `null`). Collections can omit
+ ;; `updated_at` in search results.
+ [:updated_at {:optional true} [:maybe ms/TemporalInstant]]
+ [:created_at {:optional true} [:maybe ms/TemporalInstant]]])
(mr/def ::search-response
"Search results containing tables, models, metrics, saved questions, dashboards, and
diff --git a/test/metabase/mcp/tools_test.clj b/test/metabase/mcp/tools_test.clj
index 2bbeecaa3da..b645202402b 100644
--- a/test/metabase/mcp/tools_test.clj
+++ b/test/metabase/mcp/tools_test.clj
@@ -39,6 +39,19 @@
(is (empty? unknown)
(str label " has keys that don't match any tool name: " (vec unknown)))))))))
+(deftest ^:parallel search-output-schema-timestamps-are-disjoint-test
+ (testing "search timestamp fields publish disjoint date-time/null oneOf branches"
+ ;; `[:maybe :any]` becomes `oneOf [{}, {type:null}]`. Null then matches both
+ ;; branches, and MCP clients that enforce oneOf reject the whole search response
+ ;; (e.g. collections with a null updated_at). TemporalInstant keeps the branches
+ ;; disjoint so null matches only the null arm.
+ (let [search-tool (some #(when (= "search" (:name %)) %)
+ (mcp.tools/list-tools #{::api.scope/unrestricted}))
+ item-props (get-in search-tool [:outputSchema :properties :data :items :properties])
+ expected {:oneOf [{:type "string" :format "date-time"} {:type "null"}]}]
+ (is (= expected (:updated_at item-props)))
+ (is (= expected (:created_at item-props))))))
+
(defn- data-node?
"True if `x` is a value type our published JSON-Schema-shaped tool schemas
are allowed to contain. Visited via `walk/postwalk`, which traverses every