Sync to upstream v0.61.4

Author: trevorgowing

.clj-kondo/config.edn

@@ -254,7 +254,6 @@
     (metabase.util.match/match-many)
     (metabase.util.match/replace-in)
     (metabase.util.match/replace)
-    (metabase.driver-api.core/match)
     (metabase.driver-api.core/match-one)
     (metabase.driver-api.core/match-many)
     (metabase.driver-api.core/replace)

.clj-kondo/config/modules/config.edn

@@ -166,6 +166,7 @@
               llm
               metabot
               queries
+              query-permissions
               query-processor
               request
               server

.clj-surgeon.edn

@@ -0,0 +1,27 @@
+{:aliases
+ {;; defendpoint shape: (api.macros/defendpoint METHOD URL DOCSTRING? [args] body)
+  ;; No name slot — synthesize :route [METHOD "path"] from first 2 args.
+  "defendpoint"
+  {:fields {:method (fn [z] (some-> z z/down z/right z/sexpr name str/upper-case))
+            :path   (fn [z] (-> z z/down z/right z/right z/sexpr))}}
+
+  ;; defenterprise shape:
+  ;;   (defenterprise NAME DOCSTRING? EE-NAMESPACE [args] body)
+  "defenterprise"
+  {:fields {:name         ->defn-name
+            :ee-namespace (fn [z]
+                            ;; Skip name + optional docstring; the next
+                            ;; symbol is the EE namespace.
+                            (let [name-z (-> z z/down z/right)
+                                  after-doc (z/right name-z)
+                                  candidate (if (string? (try (z/sexpr after-doc)
+                                                              (catch Exception _ nil)))
+                                              (z/right after-doc)
+                                              after-doc)]
+                              (try (let [v (z/sexpr candidate)]
+                                     (when (symbol? v) v))
+                                   (catch Exception _ nil))))
+            :arglist      ->defn-arg-list}}
+
+  "defsetting"
+  {:fields {:name ->defn-name}}}}

.github/workflows/backend.yml

@@ -40,7 +40,7 @@ jobs:
     # Master / release safety net: lint every backend test namespace.
     if: ${{ !inputs.skip && github.event_name == 'push' && (github.ref_name == 'master' || startsWith(github.ref_name, 'release-')) }}
     runs-on: ${{ vars.DEFAULT_RUNNER_KEY }}
-    timeout-minutes: 30
+    timeout-minutes: 45
     name: Eastwood (tests only)
     steps:
       - uses: actions/checkout@v4

bb.edn

@@ -2,10 +2,9 @@
  ;; we put path as bin, and everything is in the ./mage subdirectory,
  ;; so the namespaces are mage.cli, mage.format, etc.
  :paths ["mage/src" "mage/test" "bin/lint-migrations-file/src"]
- ;; use Cam's fork temporarily until a new release with https://github.com/weavejester/cljfmt/pull/420 is cut
- ;; (release > 0.16.4)
- :deps {dev.weavejester/cljfmt {:git/sha "05886be17744846685e6a733973fdfbd24e1acd5"
-                                :git/url "https://github.com/camsaul/cljfmt"} ;; run cljfmt from bb
+ ;; use Git version of dep temporarily until a new release > 0.16.4 is cut
+ :deps {dev.weavejester/cljfmt {:git/sha "075eae26e3c8dad433b88f05927bcd50e3571328"
+                                :git/url "https://github.com/weavejester/cljfmt"} ;; run cljfmt from bb
         io.github.paintparty/bling {:mvn/version "0.8.8"} ;; printing bells and whistles
         medley/medley {:mvn/version "1.3.0"} ;; utilities
         metosin/malli {:mvn/version "0.17.0"} ;; data validation

bun.lock

@@ -158,6 +158,7 @@ Metabase's reference documentation.
 - [Agent API](./ai/agent-api.md)
 - [MCP server](./ai/mcp.md)
 - [Metabot in Slack](./ai/metabot-slack.md)
+- [AI privacy](./ai/privacy.md)
 
 ### Exploration and organization
 

docs/README.md

@@ -70,7 +70,7 @@ A first-time connection will go something like this:
 3. You're redirected to Metabase to log in (if you aren't already) and approve the connection.
 4. The client receives an access token scoped to the permissions you have in Metabase.
 
-Results returned by the MCP server are sent to your MCP client, which may forward them to an AI provider depending on how the client is configured. See [Privacy](./settings.md#privacy).
+Results returned by the MCP server are sent to your MCP client, which may forward them to an AI provider depending on how the client is configured. See [AI privacy](./privacy.md).
 
 ### Site URL must match the URL your client uses
 

docs/ai/mcp.md

@@ -0,0 +1,42 @@
+---
+title: AI privacy
+summary: What data Metabase sends to AI providers and MCP clients when you use AI features, and what Metabase the company collects.
+---
+
+# AI privacy
+
+AI in Metabase is optional.
+
+If you do use AI (which you can set up in [AI settings](./settings.md)), we need to send some data outside of your Metabase. This page covers what gets sent, and to whom.
+
+## Data sent to the Metabase AI service
+
+When using the Metabase AI service, we don't send the _results_ of your queries to a third-party AI provider, and we don't look at them ourselves.
+
+What we send:
+
+- Your prompts.
+- Metadata (like table and field names), so Metabot knows what to query.
+- A sampling of field values from your database. For example, if you ask Metabot to "Filter everyone from Wisconsin," it might check the values in the state field to see how the data is stored (like "WI" vs "Wisconsin"). See [syncs](../databases/sync-scan.md).
+- For chart analysis, AI won't see the raw timeseries data, but it does see some metrics derived from that data (like slopes, series correlations, etc). AI may also see some categorical values. For example, if a question breaks out orders over time by a product category, the AI could see the category values ("Gadgets", "Widgets", etc).
+
+We, Metabase the company, also collect some of this metadata to gauge usage and improve the AI integration.
+
+## Data sent to your own AI provider
+
+If you're using your own API key, everything listed above is sent to your selected AI provider. Review your provider's data handling and privacy policies.
+
+## Data sent to the MCP client
+
+When using the [MCP server](./mcp.md), query _results_ are sent to the connected MCP client.
+
+## Data sent when submitting feedback
+
+If you [submit feedback](./metabot.md#giving-feedback-on-metabot-responses) on a Metabot response, the context for that conversation, including metadata and your prompts, might be sent to Metabase the company, and may contain sensitive data.
+
+## Further reading
+
+- [AI settings](./settings.md)
+- [Using Metabot](./metabot.md)
+- [MCP server](./mcp.md)
+- [Privacy and GDPR](../installation-and-operation/privacy.md)

docs/ai/privacy.md

@@ -21,8 +21,6 @@ AI features are available on both Metabase Cloud and self-hosted Metabase. To tu
    - Another supported provider. See [bring your own API key](#bring-your-own-api-key).
 3. Once connected, configure [Metabot](#configure-metabot) and other AI features below.
 
-> The Metabase AI add-on only appears in your Metabase Store account after you've connected to the Metabase AI service in **Admin settings > AI**. If you're on a Pro trial and don't see the add-on in **Manage plan**, connect it from Admin first; the Store will reflect it after.
-
 ## Choose AI provider
 
 _Admin > AI_
@@ -42,8 +40,6 @@ Metabase's AI Service is a good option if you don't have a preferred AI provider
 
 If you use Metabase's AI Service, you'll get charge based on token usage (in addition to your regular Metabase Cloud subscription fee). See [Pricing](https://www.metabase.com/pricing).
 
-To enable Metabase's AI Service on Metabase Cloud, you must me logged in to your Metabase instance with the email that matches the email for the admin of your [Metabase Store account](https://store.metabase.com).
-
 To use Metabase AI provider for your Metabot:
 
 1. Go to **Admin > AI > AI settings**.
@@ -56,8 +52,6 @@ To disable Metabase AI provider and stop charges:
 1. Go to **Admin > AI > AI settings**.
 2. Under **Connected to Metabase**, click **Disconnect**.
 
-Any Metabase instance admin can disconnect the Metabase AI Service, even if they lack an admin account in the Metabase store.
-
 ### Bring your own API key
 
 You can specify your own API key and model for Metabot from one of the supported providers. Currently, Metabase only supports models from Anthropic.
@@ -193,28 +187,11 @@ If you're using your own API key, you can track usage and costs through your AI
 
 On Metabase Pro/Enterprise, you also get access to detailed [AI usage auditing](usage-auditing.md) with detailed breakdown of AI usage by user, tool, feature etc.
 
-## Privacy
-
-When using the Metabase AI service, your questions and conversations remain private to your Metabase -- we don't send your data to external services. We do collect some metadata to gauge and improve usage.
-
-If you're using your own API key, your prompts and data are sent to your selected AI provider. Review your provider's data handling and privacy policies. When using the [MCP server](./mcp.md), query results are sent to the connected MCP client.
-
-In both cases, Metabot can't create assets or write data. If you [submit feedback](./metabot.md#giving-feedback-on-metabot-responses), the form you send may contain sensitive data from your conversation.
-
-### What Metabot can see
-
-Metabot has access to your Metabase metadata and some data values to help answer your questions:
-
-- **Table, Question, Model, Dashboard, and Metric metadata**: Metabot can see the structure and configuration of your content.
-- **Sample field values**: When you ask questions like "Filter everyone from Wisconsin," Metabot might check the values in the state field to understand how the data is stored (like "WI" vs "Wisconsin"). See [syncs](../databases/sync-scan.md).
-- **Timeseries data**: For chart analysis, Metabot might see the timeseries data used to draw certain visualizations, depending on the chart type.
-
-When you [submit feedback](./metabot.md#giving-feedback-on-metabot-responses), the context for the conversation - including this metadata and conversation prompts - might be sent to Metabase.
-
 ## Further reading
 
 - [Using Metabot](metabot.md)
 - [MCP server](mcp.md)
+- [AI privacy](privacy.md)
 - [AI access and usage controls](usage-controls.md)
 - [AI usage auditing](usage-auditing.md)
 - [Metabot customization](customization.md)