chore: sync upstream v0.61.2 (conflicts — resolve before merging)

Author: github-actions[bot]

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

@@ -1255,7 +1255,6 @@
               settings
               slackbot
               sql-tools
-              store-api
               sync
               system
               task

.github/CODEOWNERS

@@ -12,12 +12,12 @@ enterprise/backend/src/metabase_enterprise/dependencies @metabase/graphy
 enterprise/frontend/src/metabase-enterprise/dependencies @metabase/graphy
 
 # @metabase/embedding
-enterprise/frontend/src/embedding-sdk-package @metabase/embedding
-enterprise/frontend/src/embedding-sdk-bundle @metabase/embedding
-enterprise/frontend/src/embedding-sdk-shared @metabase/embedding
-frontend/src/metabase/embedding-sdk @metabase/embedding
-frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion @metabase/embedding
-frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard @metabase/embedding
+# enterprise/frontend/src/embedding-sdk-package @metabase/embedding
+# enterprise/frontend/src/embedding-sdk-bundle @metabase/embedding
+# enterprise/frontend/src/embedding-sdk-shared @metabase/embedding
+# frontend/src/metabase/embedding-sdk @metabase/embedding
+# frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion @metabase/embedding
+# frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard @metabase/embedding
 
 # @metabase/tech-writers
 docs @metabase/tech-writers

.github/workflows/backend.yml

@@ -56,7 +56,11 @@ jobs:
     timeout-minutes: 15
     name: Eastwood (changed tests only)
     steps:
+<<<<<<< HEAD
       - uses: actions/checkout@v6
+=======
+      - uses: actions/checkout@v4
+>>>>>>> v0.61.2
         with:
           # Enough history for `git merge-base` on a typical PR.
           fetch-depth: 200

.github/workflows/pre-release.yml

@@ -223,7 +223,11 @@ jobs:
           CYPRESS_BROWSER: ${{ steps.cypress-prep.outputs.chrome-path }}
         run: |
           node e2e/runner/run_cypress_ci.js e2e \
+<<<<<<< HEAD
             $CYPRESS_GREP_FLAG grepTags="@prerelease+-@EE" \
+=======
+            --expose grepTags="@prerelease+-@EE" \
+>>>>>>> v0.61.2
             --spec './e2e/test/scenarios/**/*.cy.spec.(js|ts)'
 
       - name: Run a few important EE Cypress tests as sanity check
@@ -232,7 +236,11 @@ jobs:
           CYPRESS_BROWSER: ${{ steps.cypress-prep.outputs.chrome-path }}
         run: |
           node e2e/runner/run_cypress_ci.js e2e \
+<<<<<<< HEAD
             $CYPRESS_GREP_FLAG grepTags="@prerelease+-@OSS" \
+=======
+            --expose grepTags="@prerelease+-@OSS" \
+>>>>>>> v0.61.2
             --spec './e2e/test/scenarios/**/*.cy.spec.(js|ts)'
 
       - name: Upload Cypress Artifacts upon failure

.github/workflows/release-embedding-sdk.yml

@@ -8,9 +8,9 @@ on:
         description: "Branch we want to release the SDK from (to release from other branches use the workflow from those branches)"
         type: choice
         required: true
-        default: "master"
+        default: release-x.61.x
         options:
-          - master
+          - release-x.61.x
 
 concurrency:
   # We want to ensure only one job is running at a time per branch because
@@ -375,15 +375,6 @@ jobs:
           name: metabase-sdk
           path: sdk
 
-      - name: Compute master tag
-        id: compute-tag
-        run: |
-          if [ -n "${{ needs.determine-sdk-version.outputs.pre_release_label }}" ]; then
-            echo "masterTag=${{ needs.determine-sdk-version.outputs.pre_release_label }}" >> $GITHUB_OUTPUT
-          else
-            echo "masterTag=nightly" >> $GITHUB_OUTPUT
-          fi
-
       # Trusted publishing requires npm >= 11.5.1 and Node >= 22.14.0.
       # Node 22.x line bundles npm 10.x, so pin Node 24.x which ships npm 11.x.
       - name: Setup Node.js for npm publish with trusted publishing
@@ -395,15 +386,21 @@ jobs:
       - name: Publish to NPM
         working-directory: sdk
         run: |
-          TAG="${{ steps.compute-tag.outputs.masterTag }}"
-          echo "Resolved npm tag: $TAG"
-          npm publish --tag "$TAG"
+          npm publish --tag 61-stable
+
       # ⚠️ This step should only be executed on the latest stable (gold) release branch.
       # Only uncomment this when the new release branch becomes stable (gold).
+<<<<<<< HEAD
       # - name: Add `latest` tag to the latest release branch (e.g. `release-x.61.x`) deployment
       #   working-directory: sdk
       #   run: |
       #     npm dist-tag add @metabase/embedding-sdk-react@${{ env.sdk_version }} latest
+=======
+      - name: Add `latest` tag to the latest release branch (`release-x.61.x`) deployment
+        working-directory: sdk
+        run: |
+          npm dist-tag add @metabase/embedding-sdk-react@${{ env.sdk_version }} latest
+>>>>>>> v0.61.2
 
   git-tag:
     needs: [publish-npm, determine-sdk-version]

.github/workflows/run-tests.yml

@@ -133,7 +133,11 @@ jobs:
       skip-custom-viz: ${{ needs.create-test-plan.outputs.custom_viz_all != 'true' }}
 
   e2e-tests:
+<<<<<<< HEAD
     needs: [create-test-plan, uberjar]
+=======
+    needs: [files-changed, uberjar]
+>>>>>>> v0.61.2
     # Skip e2e tests when the uberjar build failed or was cancelled — the
     # downstream tests can't fetch a missing artifact, and we don't want to
     # mask the uberjar failure with a wave of misleading e2e errors. We still
@@ -144,7 +148,11 @@ jobs:
     # branch protection blocks the merge as pending.
     if: |
       always() && !cancelled() &&
+<<<<<<< HEAD
       needs.create-test-plan.result == 'success' &&
+=======
+      needs.files-changed.result == 'success' &&
+>>>>>>> v0.61.2
       needs.uberjar.result != 'failure' &&
       needs.uberjar.result != 'cancelled'
     uses: ./.github/workflows/e2e-tests.yml

bun.lock

@@ -13,6 +13,8 @@ _Admin > AI > MCP_
 
 Admins enable the Agent API under **Admin > AI > MCP**.
 
+Admins enable the Agent API under **Admin > AI > MCP**. See [Agent API settings](./settings.md#agent-api-settings).
+
 ## Agent API endpoints and reference
 
 Check out the API endpoint docs: [/api/agent](../api.html#tag/apiagent).

docs/ai/agent-api.md

@@ -41,7 +41,11 @@ The field accepts wildcards (`*`) for subdomains. Changes take effect in about a
 
 ## Connect an MCP client
 
+<<<<<<< HEAD
 If your admin has turned on [your Metabase's MCP server](#enable-mcp-server), all you need to do is point your MCP client at Metabase's MCP endpoint, `/api/mcp`. For example:
+=======
+If your admin has turned on [your Metabase's MCP server](./settings.md#enable-mcp-server), all you need to do is point your MCP client at Metabase's MCP endpoint, `/api/mcp`. For example:
+>>>>>>> v0.61.2
 
 ```
 https://{your-metabase.example.com}/api/mcp
@@ -90,7 +94,11 @@ MCP server requests are handled by whatever AI client you're using (like a deskt
 
 For example, if you ask your AI client to use your Metabase's MCP server "what's our q3 revenue," your client will interact with the MCP server to figure out which tools it needs to field your request. Your AI can decide that it needs to use the tool **construct_query** and **execute_query**, and what those queries might be. Then your client will call those tools for Metabase to run.
 
+<<<<<<< HEAD
 You don't need to have an [AI provider](settings.md#choose-ai-provider) configured in Metabase to use your Metabase's MCP server. If you _do_ have an AI provider configured in Metabase to power Metabot, that provider will _not_ be used for MCP server requests. MCP calls by your local client have no effect on token usage for your Metabase's AI connection.
+=======
+You don't need to have an [AI provider](settings.md#supported-providers) configured in Metabase to use your Metabase's MCP server. If you _do_ have an AI provider configured in Metabase to power Metabot, that provider will _not_ be used for MCP server requests. MCP calls by your local client have no effect on token usage for your Metabase's AI connection.
+>>>>>>> v0.61.2
 
 ## Available tools
 

docs/ai/mcp.md

@@ -1,9 +1,17 @@
 ---
+<<<<<<< HEAD
 title: AI in Metabase overview
 summary: Overview of all the ways you can use AI with Metabase.
 ---
 
 # AI in Metabase overview
+=======
+title: AI in Metabase
+summary: Overview of all the ways you can use AI with Metabase.
+---
+
+# AI in Metabase
+>>>>>>> v0.61.2
 
 AI in Metabase is optional. You can use Metabase without AI at all. But if you do want to use AI to interact with Metabase, we have you covered.